fix with cr

crossoverJie · crossoverJie · commit 3214fef9e6d7 · 2024-03-15T22:50:27.000+08:00
diff --git a/.chloggen/support-extensions.yaml b/.chloggen/support-extensions.yaml
@@ -0,0 +1,16 @@
+# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
+change_type: enhancement
+
+# The name of the component, or a single word describing the area of concern, (e.g. collector, target allocator, auto-instrumentation, opamp, github action)
+component: auto-instrumentation
+
+# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: Instrumentations support Java extensions
+
+# One or more tracking issues related to the change
+issues: [1785]
+
+# (Optional) One or more lines of additional information to render under the primary note.
+# These lines will be padded with 2 spaces and then inserted directly into the document.
+# Use pipe (|) for multiline entries.
+subtext:
diff --git a/apis/v1alpha1/instrumentation_types.go b/apis/v1alpha1/instrumentation_types.go
@@ -136,7 +136,7 @@ type Java struct {
 
 	// Extensions defines java specific extensions.
 	// +optional
-	Extensions *Extensions `json:"extensions,omitempty"`
+	Extensions []Extensions `json:"extensions,omitempty"`
 }
 
 type Extensions struct {
diff --git a/apis/v1alpha1/zz_generated.deepcopy.go b/apis/v1alpha1/zz_generated.deepcopy.go
diff --git a/bundle/manifests/opentelemetry.io_instrumentations.yaml b/bundle/manifests/opentelemetry.io_instrumentations.yaml
@@ -921,19 +921,21 @@ spec:
                     type: array
                   extensions:
                     description: Extensions defines java specific extensions.
-                    properties:
-                      dir:
-                        description: Dir is a directory with extensions auto-instrumentation
-                          JAR.
-                        type: string
-                      image:
-                        description: Image is a container image with extensions auto-instrumentation
-                          JAR.
-                        type: string
-                    required:
-                    - dir
-                    - image
-                    type: object
+                    items:
+                      properties:
+                        dir:
+                          description: Dir is a directory with extensions auto-instrumentation
+                            JAR.
+                          type: string
+                        image:
+                          description: Image is a container image with extensions
+                            auto-instrumentation JAR.
+                          type: string
+                      required:
+                      - dir
+                      - image
+                      type: object
+                    type: array
                   image:
                     description: Image is a container image with javaagent auto-instrumentation
                       JAR.
diff --git a/config/crd/bases/opentelemetry.io_instrumentations.yaml b/config/crd/bases/opentelemetry.io_instrumentations.yaml
@@ -919,19 +919,21 @@ spec:
                     type: array
                   extensions:
                     description: Extensions defines java specific extensions.
-                    properties:
-                      dir:
-                        description: Dir is a directory with extensions auto-instrumentation
-                          JAR.
-                        type: string
-                      image:
-                        description: Image is a container image with extensions auto-instrumentation
-                          JAR.
-                        type: string
-                    required:
-                    - dir
-                    - image
-                    type: object
+                    items:
+                      properties:
+                        dir:
+                          description: Dir is a directory with extensions auto-instrumentation
+                            JAR.
+                          type: string
+                        image:
+                          description: Image is a container image with extensions
+                            auto-instrumentation JAR.
+                          type: string
+                      required:
+                      - dir
+                      - image
+                      type: object
+                    type: array
                   image:
                     description: Image is a container image with javaagent auto-instrumentation
                       JAR.
diff --git a/docs/api.md b/docs/api.md
@@ -1907,8 +1907,8 @@ Java defines configuration for java auto-instrumentation.
         </td>
         <td>false</td>
       </tr><tr>
-        <td><b><a href="#instrumentationspecjavaextensions">extensions</a></b></td>
-        <td>object</td>
+        <td><b><a href="#instrumentationspecjavaextensionsindex">extensions</a></b></td>
+        <td>[]object</td>
         <td>
           Extensions defines java specific extensions.<br/>
         </td>
@@ -2195,12 +2195,12 @@ TODO: Add other useful fields. apiVersion, kind, uid?<br/>
 </table>
 
 
-### Instrumentation.spec.java.extensions
+### Instrumentation.spec.java.extensions[index]
 <sup><sup>[↩ Parent](#instrumentationspecjava)</sup></sup>
 
 
 
-Extensions defines java specific extensions.
+
 
 <table>
     <thead>
diff --git a/pkg/instrumentation/javaagent.go b/pkg/instrumentation/javaagent.go
@@ -16,7 +16,6 @@ package instrumentation
 
 import (
 	"fmt"
-
 	corev1 "k8s.io/api/core/v1"
 
 	"github.com/open-telemetry/opentelemetry-operator/apis/v1alpha1"
@@ -48,7 +47,7 @@ func injectJavaagent(javaSpec v1alpha1.Java, pod corev1.Pod, index int) (corev1.
 	}
 
 	javaJVMArgument := javaAgent
-	if javaSpec.Extensions != nil {
+	if len(javaSpec.Extensions) > 0 {
 		javaJVMArgument = javaAgent + fmt.Sprintf(" -Dotel.javaagent.extensions=%s/extensions", javaInstrMountPath)
 	}
 
@@ -88,11 +87,11 @@ func injectJavaagent(javaSpec v1alpha1.Java, pod corev1.Pod, index int) (corev1.
 			}},
 		})
 
-		if javaSpec.Extensions != nil {
+		for i, extension := range javaSpec.Extensions {
 			pod.Spec.InitContainers = append(pod.Spec.InitContainers, corev1.Container{
-				Name:      initContainerName + "-extensions",
-				Image:     javaSpec.Extensions.Image,
-				Command:   []string{"cp", "-r", javaSpec.Extensions.Dir, javaInstrMountPath + "/extensions"},
+				Name:      initContainerName + fmt.Sprintf("-extension-%d", i),
+				Image:     extension.Image,
+				Command:   []string{"cp", "-r", extension.Dir + "/.", javaInstrMountPath + "/extensions"},
 				Resources: javaSpec.Resources,
 				VolumeMounts: []corev1.VolumeMount{{
 					Name:      javaVolumeName,
diff --git a/pkg/instrumentation/javaagent_test.go b/pkg/instrumentation/javaagent_test.go
@@ -87,7 +87,10 @@ func TestInjectJavaagent(t *testing.T) {
 		},
 		{
 			name: "add extensions to JAVA_TOOL_OPTIONS",
-			Java: v1alpha1.Java{Image: "foo/bar:1", Extensions: &v1alpha1.Extensions{Image: "ex/ex:1", Dir: "/ex"}},
+			Java: v1alpha1.Java{Image: "foo/bar:1", Extensions: []v1alpha1.Extensions{
+				{Image: "ex/ex:0", Dir: "/ex0"},
+				{Image: "ex/ex:1", Dir: "/ex1"},
+			}},
 			pod: corev1.Pod{
 				Spec: corev1.PodSpec{
 					Containers: []corev1.Container{
@@ -118,9 +121,18 @@ func TestInjectJavaagent(t *testing.T) {
 							}},
 						},
 						{
-							Name:    "opentelemetry-auto-instrumentation-extensions",
+							Name:    "opentelemetry-auto-instrumentation-extension-0",
+							Image:   "ex/ex:0",
+							Command: []string{"cp", "-r", "/ex0/.", "/otel-auto-instrumentation-java/extensions"},
+							VolumeMounts: []corev1.VolumeMount{{
+								Name:      "opentelemetry-auto-instrumentation-java",
+								MountPath: "/otel-auto-instrumentation-java",
+							}},
+						},
+						{
+							Name:    "opentelemetry-auto-instrumentation-extension-1",
 							Image:   "ex/ex:1",
-							Command: []string{"cp", "-r", "/ex", "/otel-auto-instrumentation-java/extensions"},
+							Command: []string{"cp", "-r", "/ex1/.", "/otel-auto-instrumentation-java/extensions"},
 							VolumeMounts: []corev1.VolumeMount{{
 								Name:      "opentelemetry-auto-instrumentation-java",
 								MountPath: "/otel-auto-instrumentation-java",

Original file line number	Diff line number	Diff line change
`@@ -136,7 +136,7 @@ type Java struct {`
`136`	`136`
`137`	`137`	`// Extensions defines java specific extensions.`
`138`	`138`	`// +optional`
`139`		- Extensions *Extensions `json:"extensions,omitempty"`
	`139`	+ Extensions []Extensions `json:"extensions,omitempty"`
`140`	`140`	`}`
`141`	`141`
`142`	`142`	`type Extensions struct {`