fix lint

Author: dpaasman00

cmd/opampsupervisor/main_windows.go

@@ -9,9 +9,10 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/open-telemetry/opentelemetry-collector-contrib/cmd/opampsupervisor/supervisor"
 	"golang.org/x/sys/windows"
 	"golang.org/x/sys/windows/svc"
+
+	"github.com/open-telemetry/opentelemetry-collector-contrib/cmd/opampsupervisor/supervisor"
 )
 
 var (
@@ -35,7 +36,7 @@ func run() error {
 			// this means that the process is not running as a service, so run interactively.
 
 			// deallocate console if we're not running as service
-			if err := freeConsole(); err != nil {
+			if err = freeConsole(); err != nil {
 				return fmt.Errorf("free console: %w", err)
 			}
 			return runInteractive()

cmd/opampsupervisor/supervisor/commander/commander_windows.go

@@ -16,9 +16,7 @@ import (
 var (
 	kernel32API = windows.NewLazySystemDLL("kernel32.dll")
 
-	ctrlEventProc    = kernel32API.NewProc("GenerateConsoleCtrlEvent")
-	allocConsoleProc = kernel32API.NewProc("AllocConsole")
-	freeConsoleProc  = kernel32API.NewProc("FreeConsole")
+	ctrlEventProc = kernel32API.NewProc("GenerateConsoleCtrlEvent")
 )
 
 func sendShutdownSignal(process *os.Process) error {
@@ -41,23 +39,3 @@ func sysProcAttrs() *syscall.SysProcAttr {
 		CreationFlags: syscall.CREATE_NEW_PROCESS_GROUP,
 	}
 }
-
-func allocConsole() error {
-	// windows services don't get created with a console
-	// need to allocate a console in order to send CTRL_BREAK_EVENT to agent sub process
-	ret, _, err := allocConsoleProc.Call()
-	if ret == 0 {
-		return err
-	}
-	return nil
-}
-
-func freeConsole() error {
-	// windows services don't run with console, so we want to clean it up
-	// only keep console around while it is strictly necessary
-	ret, _, err := freeConsoleProc.Call()
-	if ret == 0 {
-		return err
-	}
-	return nil
-}

cmd/opampsupervisor/supervisor/supervisor_windows.go

@@ -38,7 +38,7 @@ func (ws *windowsService) Execute(args []string, requests <-chan svc.ChangeReque
 
 	changes <- svc.Status{State: svc.StartPending}
 	if err = ws.start(elog); err != nil {
-		elog.Error(3, fmt.Sprintf("failed to start service: %v", err))
+		_ = elog.Error(3, fmt.Sprintf("failed to start service: %v", err))
 		return false, uint32(windows.ERROR_EXCEPTION_IN_SERVICE) // 1064: ERROR_EXCEPTION_IN_SERVICE
 	}
 	changes <- svc.Status{State: svc.Running, Accepts: svc.AcceptStop | svc.AcceptShutdown}
@@ -55,7 +55,7 @@ func (ws *windowsService) Execute(args []string, requests <-chan svc.ChangeReque
 			return false, 0
 
 		default:
-			elog.Error(3, fmt.Sprintf("unexpected service control request #%d", req.Cmd))
+			_ = elog.Error(3, fmt.Sprintf("unexpected service control request #%d", req.Cmd))
 			return false, uint32(windows.ERROR_INVALID_SERVICE_CONTROL) // 1052: ERROR_INVALID_SERVICE_CONTROL
 		}
 	}
@@ -126,7 +126,7 @@ func (w windowsEventLogCore) Check(ent zapcore.Entry, ce *zapcore.CheckedEntry)
 func (w windowsEventLogCore) Write(ent zapcore.Entry, fields []zapcore.Field) error {
 	buf, err := w.encoder.EncodeEntry(ent, fields)
 	if err != nil {
-		w.elog.Warning(2, fmt.Sprintf("failed encoding log entry %v\r\n", err))
+		_ = w.elog.Warning(2, fmt.Sprintf("failed encoding log entry %v\r\n", err))
 		return err
 	}
 	msg := buf.String()

cmd/opampsupervisor/supervisor/supervisor_windows_service_test.go

@@ -12,10 +12,11 @@ import (
 	"testing"
 	"time"
 
-	"github.com/open-telemetry/opentelemetry-collector-contrib/cmd/opampsupervisor/supervisor/healthchecker"
 	"github.com/stretchr/testify/require"
 	"golang.org/x/sys/windows/svc"
 	"golang.org/x/sys/windows/svc/mgr"
+
+	"github.com/open-telemetry/opentelemetry-collector-contrib/cmd/opampsupervisor/supervisor/healthchecker"
 )
 
 const (