Merge branch 'main' into rashmi/keepequal-fix

Author: rashmichandrashekar

.chloggen/fix-truncated-description-crd.yaml

@@ -0,0 +1,16 @@
+# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
+change_type: bug_fix
+
+# The name of the component, or a single word describing the area of concern, (e.g. operator, target allocator, github action)
+component: documentation
+
+# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: The description for some fields was truncated in the documentation.
+
+# One or more tracking issues related to the change
+issues: [2563]
+
+# (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:

.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: Support Java auto-instrumentation 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:

Makefile

@@ -171,7 +171,7 @@ release-artifacts: set-image-controller
 # Generate manifests e.g. CRD, RBAC etc.
 .PHONY: manifests
 manifests: controller-gen
-	$(CONTROLLER_GEN) $(CRD_OPTIONS) rbac:roleName=manager-role webhook paths="./..." output:crd:artifacts:config=config/crd/bases
+	$(CONTROLLER_GEN) $(CRD_OPTIONS) rbac:roleName=manager-role webhook paths="./..." output:crd:artifacts:config=$(MANIFEST_DIR)
 
 # Run tests
 # setup-envtest uses KUBEBUILDER_ASSETS which points to a directory with binaries (api-server, etcd and kubectl)
@@ -475,8 +475,11 @@ bundle-push:
 api-docs: crdoc kustomize
 	@{ \
 	set -e ;\
+	TMP_MANIFEST_DIR=$$(mktemp -d) ; \
+	cp -r config/crd/* $$TMP_MANIFEST_DIR; \
+	$(MAKE) CRD_OPTIONS=$(CRD_OPTIONS),maxDescLen=1200 MANIFEST_DIR=$$TMP_MANIFEST_DIR/bases manifests ;\
 	TMP_DIR=$$(mktemp -d) ; \
-	$(KUSTOMIZE) build config/crd -o $$TMP_DIR/crd-output.yaml ;\
+	$(KUSTOMIZE) build $$TMP_MANIFEST_DIR -o $$TMP_DIR/crd-output.yaml ;\
 	$(CRDOC) --resources $$TMP_DIR/crd-output.yaml --output docs/api.md ;\
 	}
 

apis/v1alpha1/instrumentation_types.go

@@ -133,6 +133,19 @@ type Java struct {
 	// Resources describes the compute resource requirements.
 	// +optional
 	Resources corev1.ResourceRequirements `json:"resources,omitempty"`
+
+	// Extensions defines java specific extensions.
+	// All extensions are copied to a single directory; if a JAR with the same name exists, it will be overwritten.
+	// +optional
+	Extensions []Extensions `json:"extensions,omitempty"`
+}
+
+type Extensions struct {
+	// Image is a container image with extensions auto-instrumentation JAR.
+	Image string `json:"image"`
+
+	// Dir is a directory with extensions auto-instrumentation JAR.
+	Dir string `json:"dir"`
 }
 
 // NodeJS defines NodeJS SDK and instrumentation configuration.

apis/v1alpha1/zz_generated.deepcopy.go

@@ -919,6 +919,25 @@ spec:
                       - name
                       type: object
                     type: array
+                  extensions:
+                    description: |-
+                      Extensions defines java specific extensions.
+                      All extensions are copied to a single directory; if a JAR with the same name exists, it will be overwritten.
+                    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.

bundle/manifests/opentelemetry.io_instrumentations.yaml

@@ -917,6 +917,25 @@ spec:
                       - name
                       type: object
                     type: array
+                  extensions:
+                    description: |-
+                      Extensions defines java specific extensions.
+                      All extensions are copied to a single directory; if a JAR with the same name exists, it will be overwritten.
+                    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.