[chore](internal): fix gofumpt issues part 3 (#4812)

mmorel-35 · web-flow · commit 46af008a8ac7 · 2026-03-06T10:34:07.000-05:00
#### Description

fix gofumpt issues in internal/instrumentation

---
This commit was automatically created by review-helper.
Changes are split into focused commits grouped by directory to simplify the review process.

Signed-off-by: Matthieu MOREL &lt;matthieu.morel35@gmail.com&gt;
diff --git a/internal/components/component.go b/internal/components/component.go
@@ -86,7 +86,6 @@ func PortFromEndpoint(endpoint string) (int32, error) {
 		portStr := r.FindString(endpoint)
 		cleanedPortStr := strings.ReplaceAll(portStr, ":", "")
 		port, err = strconv.ParseInt(cleanedPortStr, 10, 32)
-
 		if err != nil {
 			return UnsetPort, err
 		}
diff --git a/internal/components/processors/k8sattribute.go b/internal/components/processors/k8sattribute.go
@@ -33,7 +33,7 @@ type K8sAttributeConfig struct {
 
 func GenerateK8SAttrRbacRules(_ logr.Logger, config K8sAttributeConfig) ([]rbacv1.PolicyRule, error) {
 	// These policies need to be added always
-	var prs = []rbacv1.PolicyRule{
+	prs := []rbacv1.PolicyRule{
 		{
 			APIGroups: []string{""},
 			Resources: []string{"pods", "namespaces"},
diff --git a/internal/controllers/targetallocator_reconciler_test.go b/internal/controllers/targetallocator_reconciler_test.go
@@ -30,9 +30,7 @@ import (
 
 var testLogger = logf.Log.WithName("opamp-bridge-controller-unit-tests")
 
-var (
-	testScheme *runtime.Scheme = scheme.Scheme
-)
+var testScheme *runtime.Scheme = scheme.Scheme
 
 func init() {
 	utilruntime.Must(monitoringv1.AddToScheme(testScheme))
diff --git a/internal/instrumentation/annotation.go b/internal/instrumentation/annotation.go
@@ -35,7 +35,7 @@ const (
 )
 
 // annotationValue returns the effective annotationInjectJava value, based on the annotations from the pod and namespace.
-func annotationValue(ns metav1.ObjectMeta, pod metav1.ObjectMeta, annotation string) string {
+func annotationValue(ns, pod metav1.ObjectMeta, annotation string) string {
 	// is the pod annotated with instructions to inject sidecars? is the namespace annotated?
 	// if any of those is true, a sidecar might be desired.
 	podAnnValue := pod.Annotations[annotation]
diff --git a/internal/instrumentation/dotnet.go b/internal/instrumentation/dotnet.go
@@ -137,7 +137,7 @@ func injectDefaultDotNetEnvVars(container *corev1.Container, runtime string) {
 // setDotNetEnvVar function sets env var to the container if not exist already.
 // value of concatValues should be set to true if the env var supports multiple values separated by :.
 // If it is set to false, the original container's env var value has priority.
-func setDotNetEnvVar(container *corev1.Container, envVarName string, envVarValue string, concatValues bool) {
+func setDotNetEnvVar(container *corev1.Container, envVarName, envVarValue string, concatValues bool) {
 	idx := getIndexOfEnv(container.Env, envVarName)
 	if idx < 0 {
 		container.Env = append(container.Env, corev1.EnvVar{
diff --git a/internal/instrumentation/podmutator.go b/internal/instrumentation/podmutator.go
@@ -144,7 +144,7 @@ func (langInsts *languageInstrumentations) setCommonInstrumentedContainers(ns co
 	return nil
 }
 
-func (langInsts *languageInstrumentations) setLanguageSpecificContainers(ns metav1.ObjectMeta, pod metav1.ObjectMeta) error {
+func (langInsts *languageInstrumentations) setLanguageSpecificContainers(ns, pod metav1.ObjectMeta) error {
 	inst := []struct {
 		iwc        *instrumentationWithContainers
 		annotation string
diff --git a/internal/instrumentation/podmutator_test.go b/internal/instrumentation/podmutator_test.go
@@ -2958,7 +2958,8 @@ func TestMutatePod(t *testing.T) {
 							Image:   "otel/apache-httpd:1",
 							Command: []string{"/bin/sh", "-c"},
 							Args: []string{
-								"cp -r /opt/opentelemetry/* /opt/opentelemetry-webserver/agent && export agentLogDir=$(echo \"/opt/opentelemetry-webserver/agent/logs\" | sed 's,/,\\\\/,g') && cat /opt/opentelemetry-webserver/agent/conf/opentelemetry_sdk_log4cxx.xml.template | sed 's/__agent_log_dir__/'${agentLogDir}'/g'  > /opt/opentelemetry-webserver/agent/conf/opentelemetry_sdk_log4cxx.xml &&echo \"$OTEL_APACHE_AGENT_CONF\" > /opt/opentelemetry-webserver/source-conf/opentemetry_agent.conf && sed -i 's/<<SID-PLACEHOLDER>>/'${APACHE_SERVICE_INSTANCE_ID}'/g' /opt/opentelemetry-webserver/source-conf/opentemetry_agent.conf && echo -e '\nInclude /usr/local/apache2/conf/opentemetry_agent.conf' >> /opt/opentelemetry-webserver/source-conf/httpd.conf"},
+								"cp -r /opt/opentelemetry/* /opt/opentelemetry-webserver/agent && export agentLogDir=$(echo \"/opt/opentelemetry-webserver/agent/logs\" | sed 's,/,\\\\/,g') && cat /opt/opentelemetry-webserver/agent/conf/opentelemetry_sdk_log4cxx.xml.template | sed 's/__agent_log_dir__/'${agentLogDir}'/g'  > /opt/opentelemetry-webserver/agent/conf/opentelemetry_sdk_log4cxx.xml &&echo \"$OTEL_APACHE_AGENT_CONF\" > /opt/opentelemetry-webserver/source-conf/opentemetry_agent.conf && sed -i 's/<<SID-PLACEHOLDER>>/'${APACHE_SERVICE_INSTANCE_ID}'/g' /opt/opentelemetry-webserver/source-conf/opentemetry_agent.conf && echo -e '\nInclude /usr/local/apache2/conf/opentemetry_agent.conf' >> /opt/opentelemetry-webserver/source-conf/httpd.conf",
+							},
 							Env: []corev1.EnvVar{
 								{
 									Name:  apacheAttributesEnvVar,
@@ -3217,7 +3218,8 @@ func TestMutatePod(t *testing.T) {
 								{
 									Name:  "OTEL_NGINX_I13N_SCRIPT",
 									Value: nginxSdkInitContainerI13nScript,
-								}, {
+								},
+								{
 									Name: nginxServiceInstanceIdEnvVar,
 									ValueFrom: &corev1.EnvVarSource{
 										FieldRef: &corev1.ObjectFieldSelector{
diff --git a/internal/instrumentation/python.go b/internal/instrumentation/python.go
@@ -73,7 +73,7 @@ func injectPythonSDKToContainer(pythonSpec v1alpha1.Python, container *corev1.Co
 	return nil
 }
 
-func injectPythonSDKToPod(pythonSpec v1alpha1.Python, pod corev1.Pod, firstContainerName string, platform string, instSpec v1alpha1.InstrumentationSpec) corev1.Pod {
+func injectPythonSDKToPod(pythonSpec v1alpha1.Python, pod corev1.Pod, firstContainerName, platform string, instSpec v1alpha1.InstrumentationSpec) corev1.Pod {
 	volume := instrVolume(pythonSpec.VolumeClaimTemplate, pythonVolumeName, pythonSpec.VolumeSizeLimit)
 
 	// This has been validated already
diff --git a/internal/manifests/collector/configmap.go b/internal/manifests/collector/configmap.go
@@ -59,7 +59,6 @@ func ConfigMap(params manifests.Params) (*corev1.ConfigMap, error) {
 	}
 
 	replacedConf, err := ReplaceConfig(*otelCol, params.TargetAllocator, replaceCfgOpts...)
-
 	if err != nil {
 		params.Log.V(2).Info("failed to update prometheus config to use sharded targets: ", "err", err)
 		return nil, err
diff --git a/internal/manifests/collector/suite_test.go b/internal/manifests/collector/suite_test.go
@@ -67,7 +67,6 @@ func paramsWithMode(mode v1beta1.Mode) manifests.Params {
 			},
 			Spec: v1beta1.OpenTelemetryCollectorSpec{
 				OpenTelemetryCommonFields: v1beta1.OpenTelemetryCommonFields{
-
 					Image: "ghcr.io/open-telemetry/opentelemetry-operator/opentelemetry-operator:0.47.0",
 					Ports: []v1beta1.PortsSpec{
 						{
@@ -93,7 +92,7 @@ func paramsWithMode(mode v1beta1.Mode) manifests.Params {
 	}
 }
 
-func newParams(taContainerImage string, file string, cfg *config.Config) (manifests.Params, error) {
+func newParams(taContainerImage, file string, cfg *config.Config) (manifests.Params, error) {
 	replicas := int32(1)
 	var configYAML []byte
 	var err error
diff --git a/internal/manifests/manifestutils/annotations_test.go b/internal/manifests/manifestutils/annotations_test.go
@@ -79,9 +79,10 @@ func TestUserAnnotations(t *testing.T) {
 		ObjectMeta: metav1.ObjectMeta{
 			Name:      "my-instance",
 			Namespace: "my-ns",
-			Annotations: map[string]string{"prometheus.io/scrape": "false",
-				"prometheus.io/port": "1234",
-				"prometheus.io/path": "/test",
+			Annotations: map[string]string{
+				"prometheus.io/scrape": "false",
+				"prometheus.io/port":   "1234",
+				"prometheus.io/path":   "/test",
 			},
 		},
 		Spec: v1beta1.OpenTelemetryCollectorSpec{
diff --git a/internal/manifests/manifestutils/labels_test.go b/internal/manifests/manifestutils/labels_test.go
@@ -40,6 +40,7 @@ func TestLabelsCommonSet(t *testing.T) {
 	assert.Equal(t, "opentelemetry", labels["app.kubernetes.io/part-of"])
 	assert.Equal(t, "opentelemetry-collector", labels["app.kubernetes.io/component"])
 }
+
 func TestLabelsSha256Set(t *testing.T) {
 	// prepare
 	otelcol := v1alpha1.OpenTelemetryCollector{
@@ -79,6 +80,7 @@ func TestLabelsSha256Set(t *testing.T) {
 	assert.Equal(t, "opentelemetry", labelsTag["app.kubernetes.io/part-of"])
 	assert.Equal(t, "opentelemetry-collector", labelsTag["app.kubernetes.io/component"])
 }
+
 func TestLabelsTagUnset(t *testing.T) {
 	// prepare
 	otelcol := v1alpha1.OpenTelemetryCollector{
diff --git a/internal/manifests/opampbridge/configmap_test.go b/internal/manifests/opampbridge/configmap_test.go
@@ -52,7 +52,8 @@ description:
 endpoint: ws://opamp-server:4320/v1/opamp
 headers:
   authorization: access-12345-token
-`}
+`,
+	}
 	tests := []struct {
 		description    string
 		image          string
diff --git a/internal/manifests/opampbridge/container.go b/internal/manifests/opampbridge/container.go
@@ -30,7 +30,7 @@ func Container(cfg config.Config, _ logr.Logger, opampBridge v1alpha1.OpAMPBridg
 		volumeMounts = append(volumeMounts, opampBridge.Spec.VolumeMounts...)
 	}
 
-	var envVars = opampBridge.Spec.Env
+	envVars := opampBridge.Spec.Env
 	if opampBridge.Spec.Env == nil {
 		envVars = []corev1.EnvVar{}
 	}
diff --git a/internal/manifests/targetallocator/container.go b/internal/manifests/targetallocator/container.go
@@ -48,7 +48,7 @@ func Container(cfg config.Config, _ logr.Logger, instance v1alpha1.TargetAllocat
 	}}
 	volumeMounts = append(volumeMounts, instance.Spec.VolumeMounts...)
 
-	var envVars = instance.Spec.Env
+	envVars := instance.Spec.Env
 	if envVars == nil {
 		envVars = []corev1.EnvVar{}
 	}
diff --git a/internal/manifests/targetallocator/container_test.go b/internal/manifests/targetallocator/container_test.go
@@ -354,6 +354,7 @@ func TestContainerDoesNotOverrideEnvVars(t *testing.T) {
 	// verify
 	assert.Equal(t, expected, c)
 }
+
 func TestReadinessProbe(t *testing.T) {
 	targetAllocator := v1alpha1.TargetAllocator{}
 	cfg := config.New()
@@ -372,6 +373,7 @@ func TestReadinessProbe(t *testing.T) {
 	// verify
 	assert.Equal(t, expected, c.ReadinessProbe)
 }
+
 func TestLivenessProbe(t *testing.T) {
 	// prepare
 	targetAllocator := v1alpha1.TargetAllocator{}
diff --git a/internal/manifests/targetallocator/deployment_test.go b/internal/manifests/targetallocator/deployment_test.go
@@ -61,8 +61,10 @@ var testAffinityValue = &v1.Affinity{
 	},
 }
 
-var runAsUser int64 = 1000
-var runAsGroup int64 = 1000
+var (
+	runAsUser  int64 = 1000
+	runAsGroup int64 = 1000
+)
 
 var testSecurityContextValue = &v1.PodSecurityContext{
 	RunAsUser:  &runAsUser,
diff --git a/internal/manifests/targetallocator/volume.go b/internal/manifests/targetallocator/volume.go
@@ -24,7 +24,8 @@ func Volumes(cfg config.Config, instance v1alpha1.TargetAllocator) []corev1.Volu
 					{
 						Key:  cfg.TargetAllocatorConfigMapEntry,
 						Path: cfg.TargetAllocatorConfigMapEntry,
-					}},
+					},
+				},
 			},
 		},
 	}}
diff --git a/internal/naming/dns_test.go b/internal/naming/dns_test.go
@@ -14,7 +14,7 @@ import (
 )
 
 func TestDnsName(t *testing.T) {
-	var tests = []struct {
+	tests := []struct {
 		in  string
 		out string
 	}{
diff --git a/internal/operator-metrics/metrics_test.go b/internal/operator-metrics/metrics_test.go
@@ -68,7 +68,7 @@ func TestOperatorMetrics_Start(t *testing.T) {
 	defer cancelTimeout()
 
 	// Wait until one service monitor is being created
-	var serviceMonitor = &monitoringv1.ServiceMonitor{}
+	serviceMonitor := &monitoringv1.ServiceMonitor{}
 	err = wait.PollUntilContextTimeout(
 		ctxTimeout,
 		time.Millisecond*100,

Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,6 @@ func PortFromEndpoint(endpoint string) (int32, error) {`
`86`	`86`	`portStr := r.FindString(endpoint)`
`87`	`87`	`cleanedPortStr := strings.ReplaceAll(portStr, ":", "")`
`88`	`88`	`port, err = strconv.ParseInt(cleanedPortStr, 10, 32)`
`89`		`-`
`90`	`89`	`if err != nil {`
`91`	`90`	`return UnsetPort, err`
`92`	`91`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ type K8sAttributeConfig struct {`
`33`	`33`
`34`	`34`	`func GenerateK8SAttrRbacRules(_ logr.Logger, config K8sAttributeConfig) ([]rbacv1.PolicyRule, error) {`
`35`	`35`	`// These policies need to be added always`
`36`		`- var prs = []rbacv1.PolicyRule{`
	`36`	`+ prs := []rbacv1.PolicyRule{`
`37`	`37`	`{`
`38`	`38`	`APIGroups: []string{""},`
`39`	`39`	`Resources: []string{"pods", "namespaces"},`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ const (`
`35`	`35`	`)`
`36`	`36`
`37`	`37`	`// annotationValue returns the effective annotationInjectJava value, based on the annotations from the pod and namespace.`
`38`		`-func annotationValue(ns metav1.ObjectMeta, pod metav1.ObjectMeta, annotation string) string {`
	`38`	`+func annotationValue(ns, pod metav1.ObjectMeta, annotation string) string {`
`39`	`39`	`// is the pod annotated with instructions to inject sidecars? is the namespace annotated?`
`40`	`40`	`// if any of those is true, a sidecar might be desired.`
`41`	`41`	`podAnnValue := pod.Annotations[annotation]`
Original file line number	Diff line number	Diff line change
`@@ -144,7 +144,7 @@ func (langInsts *languageInstrumentations) setCommonInstrumentedContainers(ns co`
`144`	`144`	`return nil`
`145`	`145`	`}`
`146`	`146`
`147`		`-func (langInsts *languageInstrumentations) setLanguageSpecificContainers(ns metav1.ObjectMeta, pod metav1.ObjectMeta) error {`
	`147`	`+func (langInsts *languageInstrumentations) setLanguageSpecificContainers(ns, pod metav1.ObjectMeta) error {`
`148`	`148`	`inst := []struct {`
`149`	`149`	`iwc *instrumentationWithContainers`
`150`	`150`	`annotation string`
Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ func injectPythonSDKToContainer(pythonSpec v1alpha1.Python, container *corev1.Co`
`73`	`73`	`return nil`
`74`	`74`	`}`
`75`	`75`
`76`		`-func injectPythonSDKToPod(pythonSpec v1alpha1.Python, pod corev1.Pod, firstContainerName string, platform string, instSpec v1alpha1.InstrumentationSpec) corev1.Pod {`
	`76`	`+func injectPythonSDKToPod(pythonSpec v1alpha1.Python, pod corev1.Pod, firstContainerName, platform string, instSpec v1alpha1.InstrumentationSpec) corev1.Pod {`
`77`	`77`	`volume := instrVolume(pythonSpec.VolumeClaimTemplate, pythonVolumeName, pythonSpec.VolumeSizeLimit)`
`78`	`78`
`79`	`79`	`// This has been validated already`
Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,6 @@ func ConfigMap(params manifests.Params) (*corev1.ConfigMap, error) {`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`replacedConf, err := ReplaceConfig(*otelCol, params.TargetAllocator, replaceCfgOpts...)`
`62`		`-`
`63`	`62`	`if err != nil {`
`64`	`63`	`params.Log.V(2).Info("failed to update prometheus config to use sharded targets: ", "err", err)`
`65`	`64`	`return nil, err`
Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,6 @@ func paramsWithMode(mode v1beta1.Mode) manifests.Params {`
`67`	`67`	`},`
`68`	`68`	`Spec: v1beta1.OpenTelemetryCollectorSpec{`
`69`	`69`	`OpenTelemetryCommonFields: v1beta1.OpenTelemetryCommonFields{`
`70`		`-`
`71`	`70`	`Image: "ghcr.io/open-telemetry/opentelemetry-operator/opentelemetry-operator:0.47.0",`
`72`	`71`	`Ports: []v1beta1.PortsSpec{`
`73`	`72`	`{`
`@@ -93,7 +92,7 @@ func paramsWithMode(mode v1beta1.Mode) manifests.Params {`
`93`	`92`	`}`
`94`	`93`	`}`
`95`	`94`
`96`		`-func newParams(taContainerImage string, file string, cfg *config.Config) (manifests.Params, error) {`
	`95`	`+func newParams(taContainerImage, file string, cfg *config.Config) (manifests.Params, error) {`
`97`	`96`	`replicas := int32(1)`
`98`	`97`	`var configYAML []byte`
`99`	`98`	`var err error`