Skip to content

Commit 3491bc1

Browse files
committed
test(auto-instrumentation): add E2E and unit tests for spec.env propagation fix
Signed-off-by: Praful Khanduri <99384392+Horiodino@users.noreply.github.com>
1 parent cc185b6 commit 3491bc1

24 files changed

+349
-110
lines changed
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
2+
change_type: bug_fix
3+
4+
# The name of the component, or a single word describing the area of concern
5+
component: auto-instrumentation
6+
7+
# A brief description of the change
8+
note: Fixes the precedence of `spec.env` in Instrumentation CR so global env vars correctly override defaults.
9+
10+
# One or more tracking issues related to the change
11+
issues: [4068]
12+
13+
# (Optional) One or more lines of additional information to render under the primary note
14+
subtext: |
15+
Previously, environment variables set under `spec.env` were ignored in favor of default instrumentation config,
16+
unless duplicated in each language block. This change ensures the correct order of precedence is applied:
17+
language-specific env vars > spec.env > defaults.

bundle/community/manifests/opentelemetry-operator.clusterserviceversion.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ metadata:
9999
categories: Logging & Tracing,Monitoring
100100
certified: "false"
101101
containerImage: ghcr.io/open-telemetry/opentelemetry-operator/opentelemetry-operator
102-
createdAt: "2025-08-28T15:18:33Z"
102+
createdAt: "2025-09-01T15:37:48Z"
103103
description: Provides the OpenTelemetry components, including the Collector
104104
operators.operatorframework.io/builder: operator-sdk-v1.29.0
105105
operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
@@ -540,7 +540,7 @@ spec:
540540
valueFrom:
541541
fieldRef:
542542
fieldPath: metadata.namespace
543-
image: ghcr.io/open-telemetry/opentelemetry-operator/opentelemetry-operator:0.131.0
543+
image: ghcr.io/open-telemetry/opentelemetry-operator/opentelemetry-operator:0.131.0-43-g5880a9eb
544544
livenessProbe:
545545
httpGet:
546546
path: /healthz

bundle/community/manifests/opentelemetry.io_instrumentations.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
22
kind: CustomResourceDefinition
33
metadata:
44
annotations:
5-
controller-gen.kubebuilder.io/version: v0.19.0
5+
controller-gen.kubebuilder.io/version: v0.18.0
66
creationTimestamp: null
77
labels:
88
app.kubernetes.io/name: opentelemetry-operator

bundle/community/manifests/opentelemetry.io_opampbridges.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
22
kind: CustomResourceDefinition
33
metadata:
44
annotations:
5-
controller-gen.kubebuilder.io/version: v0.19.0
5+
controller-gen.kubebuilder.io/version: v0.18.0
66
creationTimestamp: null
77
labels:
88
app.kubernetes.io/name: opentelemetry-operator

bundle/community/manifests/opentelemetry.io_opentelemetrycollectors.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ kind: CustomResourceDefinition
33
metadata:
44
annotations:
55
cert-manager.io/inject-ca-from: opentelemetry-operator-system/opentelemetry-operator-serving-cert
6-
controller-gen.kubebuilder.io/version: v0.19.0
6+
controller-gen.kubebuilder.io/version: v0.18.0
77
creationTimestamp: null
88
labels:
99
app.kubernetes.io/name: opentelemetry-operator

bundle/community/manifests/opentelemetry.io_targetallocators.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
22
kind: CustomResourceDefinition
33
metadata:
44
annotations:
5-
controller-gen.kubebuilder.io/version: v0.19.0
5+
controller-gen.kubebuilder.io/version: v0.18.0
66
creationTimestamp: null
77
labels:
88
app.kubernetes.io/name: opentelemetry-operator

bundle/openshift/manifests/opentelemetry-operator.clusterserviceversion.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ metadata:
9999
categories: Logging & Tracing,Monitoring
100100
certified: "false"
101101
containerImage: ghcr.io/open-telemetry/opentelemetry-operator/opentelemetry-operator
102-
createdAt: "2025-08-28T15:18:33Z"
102+
createdAt: "2025-09-01T15:37:53Z"
103103
description: Provides the OpenTelemetry components, including the Collector
104104
operators.operatorframework.io/builder: operator-sdk-v1.29.0
105105
operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
@@ -545,7 +545,7 @@ spec:
545545
valueFrom:
546546
fieldRef:
547547
fieldPath: metadata.namespace
548-
image: ghcr.io/open-telemetry/opentelemetry-operator/opentelemetry-operator:0.131.0
548+
image: ghcr.io/open-telemetry/opentelemetry-operator/opentelemetry-operator:0.131.0-43-g5880a9eb
549549
livenessProbe:
550550
httpGet:
551551
path: /healthz

bundle/openshift/manifests/opentelemetry.io_instrumentations.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
22
kind: CustomResourceDefinition
33
metadata:
44
annotations:
5-
controller-gen.kubebuilder.io/version: v0.19.0
5+
controller-gen.kubebuilder.io/version: v0.18.0
66
creationTimestamp: null
77
labels:
88
app.kubernetes.io/name: opentelemetry-operator

bundle/openshift/manifests/opentelemetry.io_opampbridges.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
22
kind: CustomResourceDefinition
33
metadata:
44
annotations:
5-
controller-gen.kubebuilder.io/version: v0.19.0
5+
controller-gen.kubebuilder.io/version: v0.18.0
66
creationTimestamp: null
77
labels:
88
app.kubernetes.io/name: opentelemetry-operator

bundle/openshift/manifests/opentelemetry.io_opentelemetrycollectors.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
22
kind: CustomResourceDefinition
33
metadata:
44
annotations:
5-
controller-gen.kubebuilder.io/version: v0.19.0
5+
controller-gen.kubebuilder.io/version: v0.18.0
66
creationTimestamp: null
77
labels:
88
app.kubernetes.io/name: opentelemetry-operator

0 commit comments

Comments
 (0)