Fix

Signed-off-by: Pavol Loffay <[email protected]>

Author: pavolloffay

pkg/instrumentation/javaagent.go

@@ -30,7 +30,7 @@ const (
 	javaInstrMountPath    = "/otel-auto-instrumentation-java"
 )
 
-func injectJavaagent(javaSpec v1alpha1.Java, pod corev1.Pod, index int) (corev1.Pod, error) {
+func injectJavaagent(javaSpec v1alpha1.Java, pod corev1.Pod, index int) corev1.Pod {
 	// caller checks if there is at least one container.
 	container := &pod.Spec.Containers[index]
 
@@ -96,5 +96,5 @@ func injectJavaagent(javaSpec v1alpha1.Java, pod corev1.Pod, index int) (corev1.
 		}
 
 	}
-	return pod, nil
+	return pod
 }

pkg/instrumentation/javaagent_test.go

@@ -29,7 +29,6 @@ func TestInjectJavaagent(t *testing.T) {
 		v1alpha1.Java
 		pod      corev1.Pod
 		expected corev1.Pod
-		err      error
 	}{
 		{
 			name: "JAVA_TOOL_OPTIONS not defined",
@@ -82,7 +81,6 @@ func TestInjectJavaagent(t *testing.T) {
 					},
 				},
 			},
-			err: nil,
 		},
 		{
 			name: "add extensions to JAVA_TOOL_OPTIONS",
@@ -156,7 +154,6 @@ func TestInjectJavaagent(t *testing.T) {
 					},
 				},
 			},
-			err: nil,
 		},
 		{
 			name: "JAVA_TOOL_OPTIONS defined",
@@ -221,7 +218,6 @@ func TestInjectJavaagent(t *testing.T) {
 					},
 				},
 			},
-			err: nil,
 		},
 		{
 			name: "JAVA_TOOL_OPTIONS defined as ValueFrom",
@@ -291,9 +287,8 @@ func TestInjectJavaagent(t *testing.T) {
 
 	for _, test := range tests {
 		t.Run(test.name, func(t *testing.T) {
-			pod, err := injectJavaagent(test.Java, test.pod, 0)
+			pod := injectJavaagent(test.Java, test.pod, 0)
 			assert.Equal(t, test.expected, pod)
-			assert.Equal(t, test.err, err)
 		})
 	}
 }

pkg/instrumentation/sdk.go

@@ -59,7 +59,6 @@ func (i *sdkInjector) inject(ctx context.Context, insts languageInstrumentations
 	}
 	if insts.Java.Instrumentation != nil {
 		otelinst := *insts.Java.Instrumentation
-		var err error
 		i.logger.V(1).Info("injecting Java instrumentation into pod", "otelinst-namespace", otelinst.Namespace, "otelinst-name", otelinst.Name)
 
 		if len(insts.Java.Containers) == 0 {
@@ -68,14 +67,10 @@ func (i *sdkInjector) inject(ctx context.Context, insts languageInstrumentations
 
 		for _, container := range insts.Java.Containers {
 			index := getContainerIndex(container, pod)
-			pod, err = injectJavaagent(otelinst.Spec.Java, pod, index)
-			if err != nil {
-				i.logger.Info("Skipping javaagent injection", "reason", err.Error(), "container", pod.Spec.Containers[index].Name)
-			} else {
-				pod = i.injectCommonEnvVar(otelinst, pod, index)
-				pod = i.injectCommonSDKConfig(ctx, otelinst, ns, pod, index, index)
-				pod = i.setInitContainerSecurityContext(pod, pod.Spec.Containers[index].SecurityContext, javaInitContainerName)
-			}
+			pod = injectJavaagent(otelinst.Spec.Java, pod, index)
+			pod = i.injectCommonEnvVar(otelinst, pod, index)
+			pod = i.injectCommonSDKConfig(ctx, otelinst, ns, pod, index, index)
+			pod = i.setInitContainerSecurityContext(pod, pod.Spec.Containers[index].SecurityContext, javaInitContainerName)
 		}
 	}
 	if insts.NodeJS.Instrumentation != nil {