Skip to content

Commit 8c8d4f6

Browse files
iblancasaiblancasa
committed
Fix ci
Signed-off-by: Israel Blancas <iblancasa@gmail.com>
1 parent f720257 commit 8c8d4f6

7 files changed

Lines changed: 67 additions & 67 deletions

File tree

‎otel-integration/k8s-helm/README.md‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,6 +214,8 @@ Java and .NET use OTLP/gRPC to `http://$(OTEL_NODE_IP):4317`. Python uses OTLP H
214214

215215
The `inject-sdk` annotation enables SDK-only injection mode for applications that are already manually instrumented or cannot be auto-instrumented with language-specific agents. This mode injects only OpenTelemetry SDK environment variables without adding init containers or modifying the application binary.
216216

217+
SDK-only injection uses the common environment variables configured in `opentelemetry-autoinstrumentation.manager.config.instrumentations.spec.env` along with the exporter and sampler configuration from `spec.exporter` and `spec.sampler` in the Helm values.
218+
217219
Use this mode when:
218220
- Your application is already instrumented with OpenTelemetry SDK
219221
- You want centralized configuration of SDK behavior via Kubernetes annotations
@@ -227,7 +229,9 @@ metadata:
227229
instrumentation.opentelemetry.io/inject-sdk: "true"
228230
```
229231

230-
The injected environment variables will configure the SDK to send telemetry to the `opentelemetry-agent` DaemonSet on the same node using `http://$(OTEL_NODE_IP):4317`.
232+
The injected environment variables will configure the SDK to send telemetry to the `opentelemetry-agent` DaemonSet on the same node using the endpoint from `spec.exporter.endpoint` (default: `http://$(OTEL_NODE_IP):4317`).
233+
234+
For more details, see the [OpenTelemetry Operator SDK-only documentation](https://github.com/open-telemetry/opentelemetry-operator/blob/main/docs/auto-instrumentation/languages/sdk-only.md).
231235

232236
> [!IMPORTANT]
233237
>

‎otel-integration/k8s-helm/e2e-test/run-all.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -764,7 +764,7 @@ run_workflow_mode() {
764764

765765
log_test "========================================"
766766
# Base package only; supervisor tests require different chart values and run below.
767-
log_test "Workflow Mode (Base): go test -v -run='^TestE2E.*' -skip='^(TestE2E_TargetAllocator_ServiceMonitorMetrics|TestE2E_InstrumentationWebhookNoCRDs)$' ."
767+
log_test "Workflow Mode (Base): go test -v -run='^TestE2E.*' -skip='^(TestE2E_TargetAllocator_ServiceMonitorMetrics|TestE2E_InstrumentationWebhookNoCRDs|TestE2E_SDKInjection)$' ."
768768
log_test "========================================"
769769

770770
export KUBECONFIG="${KUBECONFIG_PATH}"
@@ -777,7 +777,7 @@ run_workflow_mode() {
777777
(
778778
cd "${E2E_TEST_DIR}" || exit 1
779779
go clean -testcache
780-
go test -v -run='^TestE2E.*' -skip='^(TestE2E_TargetAllocator_ServiceMonitorMetrics|TestE2E_InstrumentationWebhookNoCRDs)$' $(go list ./... | rg -v '/supervisor$')
780+
go test -v -run='^TestE2E.*' -skip='^(TestE2E_TargetAllocator_ServiceMonitorMetrics|TestE2E_InstrumentationWebhookNoCRDs|TestE2E_SDKInjection)$' $(go list ./... | rg -v '/supervisor$')
781781
)
782782
local exit_code=$?
783783
local workflow_end_time

‎otel-integration/k8s-helm/tests/golden/ebpf-profiler.yaml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -184,14 +184,14 @@ data:
184184
timeout: 10s
185185
logs:
186186
headers:
187-
X-Coralogix-Distribution: helm-otel-integration/0.0.325
187+
X-Coralogix-Distribution: helm-otel-integration/0.0.326
188188
metrics:
189189
headers:
190-
X-Coralogix-Distribution: helm-otel-integration/0.0.325
190+
X-Coralogix-Distribution: helm-otel-integration/0.0.326
191191
private_key: ${env:CORALOGIX_PRIVATE_KEY}
192192
profiles:
193193
headers:
194-
X-Coralogix-Distribution: helm-otel-integration/0.0.325
194+
X-Coralogix-Distribution: helm-otel-integration/0.0.326
195195
x-coralogix-ingress: otlp/v1.10.0
196196
sending_queue:
197197
batch:
@@ -213,13 +213,13 @@ data:
213213
timeout: 30s
214214
traces:
215215
headers:
216-
X-Coralogix-Distribution: helm-otel-integration/0.0.325
216+
X-Coralogix-Distribution: helm-otel-integration/0.0.326
217217
coralogix/resource_catalog:
218218
application_name: resource
219219
domain: eu2.coralogix.com
220220
logs:
221221
headers:
222-
X-Coralogix-Distribution: helm-otel-integration/0.0.325
222+
X-Coralogix-Distribution: helm-otel-integration/0.0.326
223223
x-coralogix-ingress: metadata-as-otlp-logs/v1
224224
private_key: ${CORALOGIX_PRIVATE_KEY}
225225
sending_queue:
@@ -1034,14 +1034,14 @@ data:
10341034
timeout: 10s
10351035
logs:
10361036
headers:
1037-
X-Coralogix-Distribution: helm-otel-integration/0.0.325
1037+
X-Coralogix-Distribution: helm-otel-integration/0.0.326
10381038
metrics:
10391039
headers:
1040-
X-Coralogix-Distribution: helm-otel-integration/0.0.325
1040+
X-Coralogix-Distribution: helm-otel-integration/0.0.326
10411041
private_key: ${env:CORALOGIX_PRIVATE_KEY}
10421042
profiles:
10431043
headers:
1044-
X-Coralogix-Distribution: helm-otel-integration/0.0.325
1044+
X-Coralogix-Distribution: helm-otel-integration/0.0.326
10451045
x-coralogix-ingress: otlp/v1.10.0
10461046
sending_queue:
10471047
batch:
@@ -1063,13 +1063,13 @@ data:
10631063
timeout: 30s
10641064
traces:
10651065
headers:
1066-
X-Coralogix-Distribution: helm-otel-integration/0.0.325
1066+
X-Coralogix-Distribution: helm-otel-integration/0.0.326
10671067
coralogix/resource_catalog:
10681068
application_name: resource
10691069
domain: eu2.coralogix.com
10701070
logs:
10711071
headers:
1072-
X-Coralogix-Distribution: helm-otel-integration/0.0.325
1072+
X-Coralogix-Distribution: helm-otel-integration/0.0.326
10731073
x-coralogix-ingress: metadata-as-otlp-logs/v1
10741074
private_key: ${CORALOGIX_PRIVATE_KEY}
10751075
sending_queue:
@@ -2011,7 +2011,7 @@ spec:
20112011
template:
20122012
metadata:
20132013
annotations:
2014-
checksum/config: 7ea0993a7ca6f6644a6dccd2dfe5541b4f2f029e5c5828a6623bb36cf0b49335
2014+
checksum/config: 342b22bd9d827833d5ad12f386c2e45e2998a5ef583c059ddda06cde589b1763
20152015

20162016
labels:
20172017
app.kubernetes.io/name: opentelemetry-agent
@@ -2198,7 +2198,7 @@ spec:
21982198
template:
21992199
metadata:
22002200
annotations:
2201-
checksum/config: 98e3590411fa46f4d272087fdcd52ce06f86242a980ab2bfc56ec2d7e4efedcd
2201+
checksum/config: 9c973b33188574e5fc2c05d2c51369698aed079e4ebd0b003b7a060229f5fd27
22022202

22032203
labels:
22042204
app.kubernetes.io/name: opentelemetry-cluster-collector

‎otel-integration/k8s-helm/tests/golden/eks-fargate.yaml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -55,14 +55,14 @@ data:
5555
timeout: 10s
5656
logs:
5757
headers:
58-
X-Coralogix-Distribution: helm-otel-integration/0.0.325
58+
X-Coralogix-Distribution: helm-otel-integration/0.0.326
5959
metrics:
6060
headers:
61-
X-Coralogix-Distribution: helm-otel-integration/0.0.325
61+
X-Coralogix-Distribution: helm-otel-integration/0.0.326
6262
private_key: ${env:CORALOGIX_PRIVATE_KEY}
6363
profiles:
6464
headers:
65-
X-Coralogix-Distribution: helm-otel-integration/0.0.325
65+
X-Coralogix-Distribution: helm-otel-integration/0.0.326
6666
x-coralogix-ingress: otlp/v1.10.0
6767
sending_queue:
6868
batch:
@@ -87,7 +87,7 @@ data:
8787
timeout: 30s
8888
traces:
8989
headers:
90-
X-Coralogix-Distribution: helm-otel-integration/0.0.325
90+
X-Coralogix-Distribution: helm-otel-integration/0.0.326
9191
debug: {}
9292
extensions:
9393
health_check:
@@ -332,14 +332,14 @@ data:
332332
timeout: 10s
333333
logs:
334334
headers:
335-
X-Coralogix-Distribution: helm-otel-integration/0.0.325
335+
X-Coralogix-Distribution: helm-otel-integration/0.0.326
336336
metrics:
337337
headers:
338-
X-Coralogix-Distribution: helm-otel-integration/0.0.325
338+
X-Coralogix-Distribution: helm-otel-integration/0.0.326
339339
private_key: ${env:CORALOGIX_PRIVATE_KEY}
340340
profiles:
341341
headers:
342-
X-Coralogix-Distribution: helm-otel-integration/0.0.325
342+
X-Coralogix-Distribution: helm-otel-integration/0.0.326
343343
x-coralogix-ingress: otlp/v1.10.0
344344
sending_queue:
345345
batch:
@@ -364,7 +364,7 @@ data:
364364
timeout: 30s
365365
traces:
366366
headers:
367-
X-Coralogix-Distribution: helm-otel-integration/0.0.325
367+
X-Coralogix-Distribution: helm-otel-integration/0.0.326
368368
debug: {}
369369
extensions:
370370
health_check:
@@ -809,7 +809,7 @@ spec:
809809
template:
810810
metadata:
811811
annotations:
812-
checksum/config: 4c179e15aa55485f168fa7c1b67eef68bfcd469ac45960dde51c0c54857bcaa8
812+
checksum/config: 4a44a3f7877fdffed1619f02aad363bd9e79bbd25af41ae85b0caf6f95a5b7a9
813813

814814
labels:
815815
app.kubernetes.io/name: opentelemetry-agent-eks-fargate-monitoring
@@ -924,7 +924,7 @@ spec:
924924
template:
925925
metadata:
926926
annotations:
927-
checksum/config: e1193ffc39fe7eb612b53f3cdd085be67d52349106c8d3e0c7fbcb1c8e867d2a
927+
checksum/config: 136a7e95b3c77b7272304478fb7876837b01208e3d356d649b8be1233c00ee76
928928

929929
labels:
930930
app.kubernetes.io/name: opentelemetry-agent-eks-fargate

‎otel-integration/k8s-helm/tests/golden/tail-sampling.yaml‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -188,14 +188,14 @@ data:
188188
timeout: 10s
189189
logs:
190190
headers:
191-
X-Coralogix-Distribution: helm-otel-integration/0.0.325
191+
X-Coralogix-Distribution: helm-otel-integration/0.0.326
192192
metrics:
193193
headers:
194-
X-Coralogix-Distribution: helm-otel-integration/0.0.325
194+
X-Coralogix-Distribution: helm-otel-integration/0.0.326
195195
private_key: ${env:CORALOGIX_PRIVATE_KEY}
196196
profiles:
197197
headers:
198-
X-Coralogix-Distribution: helm-otel-integration/0.0.325
198+
X-Coralogix-Distribution: helm-otel-integration/0.0.326
199199
x-coralogix-ingress: otlp/v1.10.0
200200
sending_queue:
201201
batch:
@@ -217,13 +217,13 @@ data:
217217
timeout: 30s
218218
traces:
219219
headers:
220-
X-Coralogix-Distribution: helm-otel-integration/0.0.325
220+
X-Coralogix-Distribution: helm-otel-integration/0.0.326
221221
coralogix/resource_catalog:
222222
application_name: resource
223223
domain: eu2.coralogix.com
224224
logs:
225225
headers:
226-
X-Coralogix-Distribution: helm-otel-integration/0.0.325
226+
X-Coralogix-Distribution: helm-otel-integration/0.0.326
227227
x-coralogix-ingress: metadata-as-otlp-logs/v1
228228
private_key: ${CORALOGIX_PRIVATE_KEY}
229229
sending_queue:
@@ -1035,14 +1035,14 @@ data:
10351035
timeout: 10s
10361036
logs:
10371037
headers:
1038-
X-Coralogix-Distribution: helm-otel-integration/0.0.325
1038+
X-Coralogix-Distribution: helm-otel-integration/0.0.326
10391039
metrics:
10401040
headers:
1041-
X-Coralogix-Distribution: helm-otel-integration/0.0.325
1041+
X-Coralogix-Distribution: helm-otel-integration/0.0.326
10421042
private_key: ${env:CORALOGIX_PRIVATE_KEY}
10431043
profiles:
10441044
headers:
1045-
X-Coralogix-Distribution: helm-otel-integration/0.0.325
1045+
X-Coralogix-Distribution: helm-otel-integration/0.0.326
10461046
x-coralogix-ingress: otlp/v1.10.0
10471047
sending_queue:
10481048
batch:
@@ -1064,13 +1064,13 @@ data:
10641064
timeout: 30s
10651065
traces:
10661066
headers:
1067-
X-Coralogix-Distribution: helm-otel-integration/0.0.325
1067+
X-Coralogix-Distribution: helm-otel-integration/0.0.326
10681068
coralogix/resource_catalog:
10691069
application_name: resource
10701070
domain: eu2.coralogix.com
10711071
logs:
10721072
headers:
1073-
X-Coralogix-Distribution: helm-otel-integration/0.0.325
1073+
X-Coralogix-Distribution: helm-otel-integration/0.0.326
10741074
x-coralogix-ingress: metadata-as-otlp-logs/v1
10751075
private_key: ${CORALOGIX_PRIVATE_KEY}
10761076
sending_queue:
@@ -1725,14 +1725,14 @@ data:
17251725
timeout: 10s
17261726
logs:
17271727
headers:
1728-
X-Coralogix-Distribution: helm-otel-integration/0.0.325
1728+
X-Coralogix-Distribution: helm-otel-integration/0.0.326
17291729
metrics:
17301730
headers:
1731-
X-Coralogix-Distribution: helm-otel-integration/0.0.325
1731+
X-Coralogix-Distribution: helm-otel-integration/0.0.326
17321732
private_key: ${env:CORALOGIX_PRIVATE_KEY}
17331733
profiles:
17341734
headers:
1735-
X-Coralogix-Distribution: helm-otel-integration/0.0.325
1735+
X-Coralogix-Distribution: helm-otel-integration/0.0.326
17361736
x-coralogix-ingress: otlp/v1.10.0
17371737
sending_queue:
17381738
batch:
@@ -1754,7 +1754,7 @@ data:
17541754
timeout: 30s
17551755
traces:
17561756
headers:
1757-
X-Coralogix-Distribution: helm-otel-integration/0.0.325
1757+
X-Coralogix-Distribution: helm-otel-integration/0.0.326
17581758
debug: {}
17591759
extensions:
17601760
health_check:
@@ -2195,7 +2195,7 @@ spec:
21952195
template:
21962196
metadata:
21972197
annotations:
2198-
checksum/config: d16de15db9dc378bda61a30beb3cdbd3309096943795f4f350b345273b7e942f
2198+
checksum/config: d544d3943fdf3fc1ddb3606426d227069f30b98d586b82fc19877b78f9ca5eb0
21992199

22002200
labels:
22012201
app.kubernetes.io/name: opentelemetry-agent
@@ -2382,7 +2382,7 @@ spec:
23822382
template:
23832383
metadata:
23842384
annotations:
2385-
checksum/config: 251d7a796aa3f541684ede766d6d00822b5d628842464abe3ba0bc6db58f929d
2385+
checksum/config: 850af852828b7d81e983e67b9e2158e70cf6289aac939dfe8dd04154b5cb4214
23862386

23872387
labels:
23882388
app.kubernetes.io/name: opentelemetry-cluster-collector
@@ -2506,7 +2506,7 @@ spec:
25062506
template:
25072507
metadata:
25082508
annotations:
2509-
checksum/config: 49130ee3725d85c19f9ec984d40460ad0dd3d00134b836c2eecbb851b071cbad
2509+
checksum/config: 023d80d9f99afd22e7f92027bfdd510d61e5c61732b84d590aeb52fb566ec8b0
25102510

25112511
labels:
25122512
app.kubernetes.io/name: opentelemetry-gateway

0 commit comments

Comments
 (0)