Skip to content

Commit 22e24a8

Browse files
NageshbansalNageshbansal
authored
chore(k8s-infra): bump the otel-collector version to 0.139.0 (#790)
Related: SigNoz/platform-pod#1304 <!-- This is an auto-generated comment: release notes by coderabbit.ai --> ## Summary by CodeRabbit * **Chores** * Upgraded OpenTelemetry components to v0.139.0. * Standardized self-telemetry endpoint formatting and TLS/insecure behavior with unified defaults. * Renamed telemetry auth header to signoz-ingestion-key. * Removed explicit internal metrics address exposures and related insecure env vars from templates. * Updated tests and expectations to reflect endpoint/header and metrics-address changes. * **New Features** * Added a configurable self-telemetry preset for centralized telemetry settings. <!-- end of auto-generated comment: release notes by coderabbit.ai -->
1 parent b4fef57 commit 22e24a8

17 files changed

+843
-879
lines changed

‎charts/k8s-infra/Chart.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ apiVersion: v2
22
name: k8s-infra
33
description: Helm chart for collecting metrics and logs in K8s
44
type: application
5-
version: 0.14.2
6-
appVersion: "0.109.0"
5+
version: 0.15.0
6+
appVersion: "0.139.0"
77
home: https://signoz.io
88
icon: https://signoz.io/img/SigNozLogo-orange.svg
99
keywords:

‎charts/k8s-infra/README.md‎

Lines changed: 775 additions & 768 deletions
Large diffs are not rendered by default.

‎charts/k8s-infra/README.md.gotmpl‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,14 @@ kubectl delete namespace platform
107107
```
108108
> [!WARNING]
109109
> ### Breaking Changes
110+
> #### Version 0.15.0
111+
> The following changes have been introduced in this version:
112+
> - Upgraded the OpenTelemetry Collector to version `0.139.0`
113+
> - Removed deprecated variables from the OpenTelemetry Collector configuration to ensure compatibility with the latest version
110114
>
115+
> Please refer to the [upgrade guide](https://signoz.io/docs/opentelemetry-collection-agents/k8s/k8s-infra/user-guides/upgrade-k8s-infra-v0.15) for detailed instructions on upgrading k8s-infra to v0.15.0
116+
>
117+
>
111118
> #### Version 0.14.1
112119
>
113120
> **Configuration Migration Required:**
@@ -137,6 +144,7 @@ kubectl delete namespace platform
137144
> samplingThereafter: 500
138145
> ```
139146

147+
140148
{{ define "chart.valueDefaultColumnRender" }}
141149
{{- $defaultValue := (default .Default .AutoDefault) -}}
142150
{{- if (and (hasPrefix "" $defaultValue) (hasSuffix "" $defaultValue) ) -}}

‎charts/k8s-infra/templates/_config.tpl‎

Lines changed: 12 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -217,21 +217,12 @@ exporters:
217217
{{- define "opentelemetry-collector.otlpExporterSelfTelemetryConfig" -}}
218218
exporters:
219219
otlphttp/self_telemetry:
220-
{{- if .Values.presets.selfTelemetry.endpoint }}
221-
endpoint: http{{ if not .Values.presets.selfTelemetry.insecure }}s{{ end }}://{{ .Values.presets.selfTelemetry.endpoint }}
220+
endpoint: {{ if .Values.presets.selfTelemetry.endpoint -}}{{ .Values.presets.selfTelemetry.endpoint }}{{- else -}}${env:OTEL_EXPORTER_OTLP_ENDPOINT}{{- end }}
222221
tls:
223-
insecure: {{ .Values.presets.selfTelemetry.insecure }}
224-
insecure_skip_verify: {{ .Values.presets.selfTelemetry.insecureSkipVerify }}
222+
insecure: {{ if .Values.presets.selfTelemetry.endpoint }}{{ .Values.presets.selfTelemetry.insecure }}{{ else }}{{ .Values.otelInsecure }}{{ end }}
223+
insecure_skip_verify: {{ if .Values.presets.selfTelemetry.endpoint }}{{ .Values.presets.selfTelemetry.insecureSkipVerify }}{{ else }}{{ .Values.insecureSkipVerify }}{{ end }}
225224
headers:
226-
"signoz-access-token": "${env:SIGNOZ_SELF_TELEMETRY_API_KEY}"
227-
{{- else }}
228-
endpoint: http{{ if not .Values.otelInsecure }}s{{ end }}://${env:OTEL_EXPORTER_OTLP_ENDPOINT}
229-
tls:
230-
insecure: ${env:OTEL_EXPORTER_OTLP_INSECURE}
231-
insecure_skip_verify: ${env:OTEL_EXPORTER_OTLP_INSECURE_SKIP_VERIFY}
232-
headers:
233-
"signoz-access-token": ${env:SIGNOZ_SELF_TELEMETRY_API_KEY}
234-
{{- end }}
225+
"signoz-ingestion-key": "${env:SIGNOZ_SELF_TELEMETRY_API_KEY}"
235226
{{- end }}
236227

237228
{{/*
@@ -247,11 +238,11 @@ service:
247238
exporter:
248239
otlp:
249240
protocol: http/protobuf
250-
endpoint: {{ if .Values.presets.selfTelemetry.endpoint }}http{{ if not .Values.presets.selfTelemetry.insecure }}s{{ end }}://{{ .Values.presets.selfTelemetry.endpoint }}{{ else }}http{{ if not .Values.otelInsecure }}s{{ end }}://${env:OTEL_EXPORTER_OTLP_ENDPOINT}{{ end }}
251-
insecure: {{ if .Values.presets.selfTelemetry.endpoint }}{{ .Values.presets.selfTelemetry.insecure }}{{ else }}${env:OTEL_EXPORTER_OTLP_INSECURE}{{ end }}
241+
endpoint: {{ if .Values.presets.selfTelemetry.endpoint -}}{{ .Values.presets.selfTelemetry.endpoint }}{{- else -}}${env:OTEL_EXPORTER_OTLP_ENDPOINT}{{ end }}
242+
insecure: {{ if .Values.presets.selfTelemetry.endpoint -}}{{ .Values.presets.selfTelemetry.insecure }}{{- else -}}{{ .Values.otelInsecure }}{{ end }}
252243
compression: gzip
253244
headers:
254-
"signoz-access-token": "${env:SIGNOZ_SELF_TELEMETRY_API_KEY}"
245+
"signoz-ingestion-key": "${env:SIGNOZ_SELF_TELEMETRY_API_KEY}"
255246
propagators:
256247
- tracecontext
257248
- b3
@@ -271,15 +262,11 @@ service:
271262
exporter:
272263
otlp:
273264
protocol: http/protobuf
274-
endpoint: {{ if .Values.presets.selfTelemetry.endpoint -}}
275-
http{{ if not .Values.presets.selfTelemetry.insecure }}s{{ end }}://{{ .Values.presets.selfTelemetry.endpoint }}
276-
{{- else -}}
277-
http{{ if not .Values.otelInsecure }}s{{ end }}://${env:OTEL_EXPORTER_OTLP_ENDPOINT}
278-
{{- end }}
279-
insecure: {{ if .Values.presets.selfTelemetry.endpoint }}{{ .Values.presets.selfTelemetry.insecure }}{{ else }}${env:OTEL_EXPORTER_OTLP_INSECURE}{{ end }}
265+
endpoint: {{ if .Values.presets.selfTelemetry.endpoint -}}{{ .Values.presets.selfTelemetry.endpoint }}{{- else -}}${env:OTEL_EXPORTER_OTLP_ENDPOINT}{{ end }}
266+
insecure: {{ if .Values.presets.selfTelemetry.endpoint -}}{{ .Values.presets.selfTelemetry.insecure }}{{- else -}}{{ .Values.otelInsecure }}{{ end }}
280267
compression: gzip
281268
headers:
282-
"signoz-access-token": "${env:SIGNOZ_SELF_TELEMETRY_API_KEY}"
269+
"signoz-ingestion-key": "${env:SIGNOZ_SELF_TELEMETRY_API_KEY}"
283270
{{- end }}
284271

285272
{{/*
@@ -340,8 +327,8 @@ exporters:
340327
{{- end}}
341328
endpoint: ${env:OTEL_EXPORTER_OTLP_ENDPOINT}
342329
tls:
343-
insecure: ${env:OTEL_EXPORTER_OTLP_INSECURE}
344-
insecure_skip_verify: ${env:OTEL_EXPORTER_OTLP_INSECURE_SKIP_VERIFY}
330+
insecure: {{ .Values.otelInsecure}}
331+
insecure_skip_verify: {{ .Values.insecureSkipVerify }}
345332
{{- if .Values.otelTlsSecrets.enabled }}
346333
cert_file: ${env:OTEL_SECRETS_PATH}/cert.pem
347334
key_file: ${env:OTEL_SECRETS_PATH}/key.pem

‎charts/k8s-infra/templates/_helpers.tpl‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -399,8 +399,6 @@ OTLP exporter environment variables used by OtelAgent and OtelDeployment.
399399
{{- define "snippet.otlp-env" }}
400400
- name: OTEL_EXPORTER_OTLP_ENDPOINT
401401
value: {{ include "otel.endpoint" . }}
402-
- name: OTEL_EXPORTER_OTLP_INSECURE
403-
value: {{ include "otel.insecure" . }}
404402
{{- if or .Values.apiKeyExistingSecretName .Values.signozApiKey }}
405403
- name: SIGNOZ_API_KEY
406404
valueFrom:
@@ -415,8 +413,6 @@ OTLP exporter environment variables used by OtelAgent and OtelDeployment.
415413
name: {{ include "otel.selfTelemetry.apiKey.secretName" . }}
416414
key: {{ include "otel.selfTelemetry.apiKey.secretKey" . }}
417415
{{- end }}
418-
- name: OTEL_EXPORTER_OTLP_INSECURE_SKIP_VERIFY
419-
value: {{ include "otel.insecureSkipVerify" . }}
420416
- name: OTEL_SECRETS_PATH
421417
value: {{ include "otel.secretsPath" . }}
422418
- name: K8S_CLUSTER_NAME

‎charts/k8s-infra/tests/otel-agent_autogke_kubelet_test.yaml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,5 +110,3 @@ tests:
110110
telemetry:
111111
logs:
112112
encoding: json
113-
metrics:
114-
address: 0.0.0.0:8888

‎charts/k8s-infra/tests/otel-agent_debug_exporter_test.yaml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,6 @@ tests:
9696
telemetry:
9797
logs:
9898
encoding: json
99-
metrics:
100-
address: 0.0.0.0:8888
10199
102100
# Test case 2: Verify debug exporter is enabled when set to true with custom settings
103101
- it: should have debug enabled is enabled with custom settings
@@ -166,8 +164,6 @@ tests:
166164
telemetry:
167165
logs:
168166
encoding: json
169-
metrics:
170-
address: 0.0.0.0:8888
171167
172168
# Test case 3: Verify debug exporter is enabled when set to true with custom settings
173169
- it: should have logging exporter enabled is enabled with custom settings
@@ -236,5 +232,3 @@ tests:
236232
telemetry:
237233
logs:
238234
encoding: json
239-
metrics:
240-
address: 0.0.0.0:8888

‎charts/k8s-infra/tests/otel-agent_host_metrics_test.yaml‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -136,8 +136,6 @@ tests:
136136
telemetry:
137137
logs:
138138
encoding: json
139-
metrics:
140-
address: 0.0.0.0:8888
141139
template: otel-agent/configmap.yaml
142140
- contains:
143141
path: spec.template.spec.volumes
@@ -269,8 +267,6 @@ tests:
269267
telemetry:
270268
logs:
271269
encoding: json
272-
metrics:
273-
address: 0.0.0.0:8888
274270
template: otel-agent/configmap.yaml
275271
- contains:
276272
path: spec.template.spec.volumes
@@ -400,8 +396,6 @@ tests:
400396
telemetry:
401397
logs:
402398
encoding: json
403-
metrics:
404-
address: 0.0.0.0:8888
405399
template: otel-agent/configmap.yaml
406400
- notContains:
407401
path: spec.template.spec.volumes
@@ -533,8 +527,6 @@ tests:
533527
telemetry:
534528
logs:
535529
encoding: json
536-
metrics:
537-
address: 0.0.0.0:8888
538530
template: otel-agent/configmap.yaml
539531
- contains:
540532
path: spec.template.spec.volumes

‎charts/k8s-infra/tests/otel-agent_log_collection_test.yaml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,5 +78,3 @@ tests:
7878
telemetry:
7979
logs:
8080
encoding: json
81-
metrics:
82-
address: 0.0.0.0:8888

‎charts/k8s-infra/tests/otel-agent_logs_collection_mulitline_test.yaml‎

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@ tests:
4242
value: |-
4343
exporters:
4444
otlphttp/self_telemetry:
45-
endpoint: http://test-endpoint:4317
45+
endpoint: test-endpoint:4317
4646
headers:
47-
signoz-access-token: ${env:SIGNOZ_SELF_TELEMETRY_API_KEY}
47+
signoz-ingestion-key: ${env:SIGNOZ_SELF_TELEMETRY_API_KEY}
4848
tls:
4949
insecure: true
5050
insecure_skip_verify: true
@@ -111,8 +111,6 @@ tests:
111111
telemetry:
112112
logs:
113113
encoding: json
114-
metrics:
115-
address: 0.0.0.0:8888
116114
117115
- it: multiline (line_start_pattern) is rendered correctly
118116
set:
@@ -126,9 +124,9 @@ tests:
126124
value: |-
127125
exporters:
128126
otlphttp/self_telemetry:
129-
endpoint: http://test-endpoint:4317
127+
endpoint: test-endpoint:4317
130128
headers:
131-
signoz-access-token: ${env:SIGNOZ_SELF_TELEMETRY_API_KEY}
129+
signoz-ingestion-key: ${env:SIGNOZ_SELF_TELEMETRY_API_KEY}
132130
tls:
133131
insecure: true
134132
insecure_skip_verify: true
@@ -199,8 +197,6 @@ tests:
199197
telemetry:
200198
logs:
201199
encoding: json
202-
metrics:
203-
address: 0.0.0.0:8888
204200
- it: multiline (line_end_pattern) is rendered correctly
205201
set:
206202
presets:
@@ -213,9 +209,9 @@ tests:
213209
value: |-
214210
exporters:
215211
otlphttp/self_telemetry:
216-
endpoint: http://test-endpoint:4317
212+
endpoint: test-endpoint:4317
217213
headers:
218-
signoz-access-token: ${env:SIGNOZ_SELF_TELEMETRY_API_KEY}
214+
signoz-ingestion-key: ${env:SIGNOZ_SELF_TELEMETRY_API_KEY}
219215
tls:
220216
insecure: true
221217
insecure_skip_verify: true
@@ -286,5 +282,3 @@ tests:
286282
telemetry:
287283
logs:
288284
encoding: json
289-
metrics:
290-
address: 0.0.0.0:8888

0 commit comments

Comments
 (0)