update to latest changes, mainly config.Load()

Author: dpaasman00

cmd/opampsupervisor/main.go

@@ -30,17 +30,18 @@ func runInteractive() error {
 	cfg, err := config.Load(*configFlag)
 	if err != nil {
 		logger.Error(err.Error())
-		os.Exit(-1)
-		return
+		return err
 	}
 
 	supervisor, err := supervisor.NewSupervisor(logger, cfg)
 	if err != nil {
+		logger.Error(err.Error())
 		return err
 	}
 
 	err = supervisor.Start()
 	if err != nil {
+		logger.Error(err.Error())
 		return err
 	}
 

cmd/opampsupervisor/supervisor/supervisor_windows.go

@@ -9,6 +9,7 @@ import (
 	"flag"
 	"fmt"
 
+	"github.com/open-telemetry/opentelemetry-collector-contrib/cmd/opampsupervisor/supervisor/config"
 	"go.uber.org/zap"
 	"go.uber.org/zap/zapcore"
 	"golang.org/x/sys/windows"
@@ -69,7 +70,12 @@ func (ws *windowsService) start(elog *eventlog.Log) error {
 
 	logger, _ := zap.NewDevelopment(zap.WrapCore(withWindowsCore(elog)))
 
-	sup, err := NewSupervisor(logger, *configFlag)
+	cfg, err := config.Load(*configFlag)
+	if err != nil {
+		return fmt.Errorf("load config: %w", err)
+	}
+
+	sup, err := NewSupervisor(logger, cfg)
 	if err != nil {
 		return fmt.Errorf("new supervisor: %w", err)
 	}