replace instrumentationupgrade initialization

Author: changexd

main.go

@@ -346,18 +346,12 @@ func addDependencies(_ context.Context, mgr ctrl.Manager, cfg config.Config, v v
 
 	// adds the upgrade mechanism to be executed once the manager is ready
 	err = mgr.Add(manager.RunnableFunc(func(c context.Context) error {
-		u := &instrumentationupgrade.InstrumentationUpgrade{
-			Logger:                     ctrl.Log.WithName("instrumentation-upgrade"),
-			DefaultAutoInstJava:        cfg.AutoInstrumentationJavaImage(),
-			DefaultAutoInstNodeJS:      cfg.AutoInstrumentationNodeJSImage(),
-			DefaultAutoInstPython:      cfg.AutoInstrumentationPythonImage(),
-			DefaultAutoInstDotNet:      cfg.AutoInstrumentationDotNetImage(),
-			DefaultAutoInstGo:          cfg.AutoInstrumentationDotNetImage(),
-			DefaultAutoInstApacheHttpd: cfg.AutoInstrumentationApacheHttpdImage(),
-			DefaultAutoInstNginx:       cfg.AutoInstrumentationNginxImage(),
-			Client:                     mgr.GetClient(),
-			Recorder:                   mgr.GetEventRecorderFor("opentelemetry-operator"),
-		}
+		u := instrumentationupgrade.NewInstrumentationUpgrade(
+			mgr.GetClient(),
+			ctrl.Log.WithName("instrumentation-upgrade"),
+			mgr.GetEventRecorderFor("opentelemetry-operator"),
+			cfg,
+		)
 		return u.ManagedInstances(c)
 	}))
 	if err != nil {

pkg/instrumentation/upgrade/upgrade.go

@@ -22,7 +22,6 @@ import (
 	"github.com/go-logr/logr"
 	featuregate2 "go.opentelemetry.io/collector/featuregate"
 	"k8s.io/client-go/tools/record"
-	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	"github.com/open-telemetry/opentelemetry-operator/apis/v1alpha1"
@@ -61,14 +60,14 @@ type InstrumentationUpgrade struct {
 	defaultAnnotationToConfig  map[string]autoInstConfig
 }
 
-func NewInstrumentationUpgrade(client client.Client, recorder record.EventRecorder, cfg config.Config) *InstrumentationUpgrade {
+func NewInstrumentationUpgrade(client client.Client, logger logr.Logger, recorder record.EventRecorder, cfg config.Config) *InstrumentationUpgrade {
 	defaultAnnotationToConfig := map[string]autoInstConfig{
 		constants.AnnotationDefaultAutoInstrumentationApacheHttpd: autoInstConfig{constants.ApacheHttpd, cfg.EnableApacheHTTPAutoInstrumentation()},
 	}
 
 	return &InstrumentationUpgrade{
 		Client:                     client,
-		Logger:                     ctrl.Log.WithName("instrumentation-upgrade"),
+		Logger:                     logger,
 		DefaultAutoInstJava:        cfg.AutoInstrumentationJavaImage(),
 		DefaultAutoInstNodeJS:      cfg.AutoInstrumentationNodeJSImage(),
 		DefaultAutoInstPython:      cfg.AutoInstrumentationPythonImage(),

pkg/instrumentation/upgrade/upgrade_test.go

@@ -27,6 +27,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/client-go/tools/record"
+	ctrl "sigs.k8s.io/controller-runtime"
 
 	"github.com/open-telemetry/opentelemetry-operator/apis/v1alpha1"
 	"github.com/open-telemetry/opentelemetry-operator/internal/config"
@@ -101,7 +102,7 @@ func TestUpgrade(t *testing.T) {
 		config.WithAutoInstrumentationNginxImage("nginx:2"),
 		config.WithEnableApacheHTTPInstrumentation(true),
 	)
-	up := NewInstrumentationUpgrade(k8sClient, &record.FakeRecorder{}, cfg)
+	up := NewInstrumentationUpgrade(k8sClient, ctrl.Log.WithName("instrumentation-upgrade"), &record.FakeRecorder{}, cfg)
 
 	err = up.ManagedInstances(context.Background())
 	require.NoError(t, err)