Skip to content

Commit ac8c62c

Browse files
authored
[collector] add ability to automatically configure otel sdk for collector internal telemetry (#1541)
* [collector] add ability to automatically configure otel sdk * add example * remove unneeded files * Update to be signal specific * revert accidental change * Make headers conditional * remove debug
1 parent fc1d632 commit ac8c62c

File tree

71 files changed

+574
-76
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

71 files changed

+574
-76
lines changed

charts/opentelemetry-collector/Chart.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
apiVersion: v2
22
name: opentelemetry-collector
3-
version: 0.117.3
3+
version: 0.118.0
44
description: OpenTelemetry Collector Helm chart for Kubernetes
55
type: application
66
home: https://opentelemetry.io/
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
mode: deployment
2+
3+
image:
4+
repository: "otel/opentelemetry-collector-k8s"
5+
6+
resources:
7+
limits:
8+
cpu: 100m
9+
memory: 200M
10+
11+
internalTelemetryViaOTLP:
12+
endpoint: "http://localhost:4318"
13+
headers:
14+
- name: "x-opentelemetry-customer"
15+
value: "a value"
16+
traces:
17+
enabled: true
18+
metrics:
19+
enabled: true
20+
logs:
21+
enabled: true

charts/opentelemetry-collector/examples/alternate-config/rendered/clusterrole.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ kind: ClusterRole
55
metadata:
66
name: example-opentelemetry-collector
77
labels:
8-
helm.sh/chart: opentelemetry-collector-0.117.3
8+
helm.sh/chart: opentelemetry-collector-0.118.0
99
app.kubernetes.io/name: opentelemetry-collector
1010
app.kubernetes.io/instance: example
1111
app.kubernetes.io/version: "0.120.0"

charts/opentelemetry-collector/examples/alternate-config/rendered/clusterrolebinding.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ kind: ClusterRoleBinding
55
metadata:
66
name: example-opentelemetry-collector
77
labels:
8-
helm.sh/chart: opentelemetry-collector-0.117.3
8+
helm.sh/chart: opentelemetry-collector-0.118.0
99
app.kubernetes.io/name: opentelemetry-collector
1010
app.kubernetes.io/instance: example
1111
app.kubernetes.io/version: "0.120.0"

charts/opentelemetry-collector/examples/alternate-config/rendered/configmap.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
name: example-opentelemetry-collector
77
namespace: default
88
labels:
9-
helm.sh/chart: opentelemetry-collector-0.117.3
9+
helm.sh/chart: opentelemetry-collector-0.118.0
1010
app.kubernetes.io/name: opentelemetry-collector
1111
app.kubernetes.io/instance: example
1212
app.kubernetes.io/version: "0.120.0"

charts/opentelemetry-collector/examples/alternate-config/rendered/deployment.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
name: example-opentelemetry-collector
77
namespace: default
88
labels:
9-
helm.sh/chart: opentelemetry-collector-0.117.3
9+
helm.sh/chart: opentelemetry-collector-0.118.0
1010
app.kubernetes.io/name: opentelemetry-collector
1111
app.kubernetes.io/instance: example
1212
app.kubernetes.io/version: "0.120.0"
@@ -25,7 +25,7 @@ spec:
2525
template:
2626
metadata:
2727
annotations:
28-
checksum/config: d8ab93768222704732f1e11344e719fb977e823ed904a005168bf109ac569828
28+
checksum/config: f2e9560bf4282a04e5a02bd223e3e7459a284fa758c73fa2328daf0cdd9c89b5
2929

3030
labels:
3131
app.kubernetes.io/name: opentelemetry-collector

charts/opentelemetry-collector/examples/alternate-config/rendered/service.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
name: example-opentelemetry-collector
77
namespace: default
88
labels:
9-
helm.sh/chart: opentelemetry-collector-0.117.3
9+
helm.sh/chart: opentelemetry-collector-0.118.0
1010
app.kubernetes.io/name: opentelemetry-collector
1111
app.kubernetes.io/instance: example
1212
app.kubernetes.io/version: "0.120.0"

charts/opentelemetry-collector/examples/alternate-config/rendered/serviceaccount.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
name: example-opentelemetry-collector
77
namespace: default
88
labels:
9-
helm.sh/chart: opentelemetry-collector-0.117.3
9+
helm.sh/chart: opentelemetry-collector-0.118.0
1010
app.kubernetes.io/name: opentelemetry-collector
1111
app.kubernetes.io/instance: example
1212
app.kubernetes.io/version: "0.120.0"

charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/configmap-agent.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
name: example-opentelemetry-collector-agent
77
namespace: default
88
labels:
9-
helm.sh/chart: opentelemetry-collector-0.117.3
9+
helm.sh/chart: opentelemetry-collector-0.118.0
1010
app.kubernetes.io/name: opentelemetry-collector
1111
app.kubernetes.io/instance: example
1212
app.kubernetes.io/version: "0.120.0"

charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/configmap.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
name: example-opentelemetry-collector
77
namespace: default
88
labels:
9-
helm.sh/chart: opentelemetry-collector-0.117.3
9+
helm.sh/chart: opentelemetry-collector-0.118.0
1010
app.kubernetes.io/name: opentelemetry-collector
1111
app.kubernetes.io/instance: example
1212
app.kubernetes.io/version: "0.120.0"

charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/daemonset.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
name: example-opentelemetry-collector-agent
77
namespace: default
88
labels:
9-
helm.sh/chart: opentelemetry-collector-0.117.3
9+
helm.sh/chart: opentelemetry-collector-0.118.0
1010
app.kubernetes.io/name: opentelemetry-collector
1111
app.kubernetes.io/instance: example
1212
app.kubernetes.io/version: "0.120.0"
@@ -23,7 +23,7 @@ spec:
2323
template:
2424
metadata:
2525
annotations:
26-
checksum/config: 84b1735cec1ed47c377bf6eb178faac7a67892518277eb87ea7dd2c1bb6eee2e
26+
checksum/config: 78951dc9e68a998731ad71b6ce0531ed538f11203fb1913375a1071536391fde
2727

2828
labels:
2929
app.kubernetes.io/name: opentelemetry-collector

charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/deployment.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
name: example-opentelemetry-collector
77
namespace: default
88
labels:
9-
helm.sh/chart: opentelemetry-collector-0.117.3
9+
helm.sh/chart: opentelemetry-collector-0.118.0
1010
app.kubernetes.io/name: opentelemetry-collector
1111
app.kubernetes.io/instance: example
1212
app.kubernetes.io/version: "0.120.0"
@@ -25,7 +25,7 @@ spec:
2525
template:
2626
metadata:
2727
annotations:
28-
checksum/config: 44fefef2d32b8c4a4c97a13778c7990da7a9b112b9c5a27c3c1eb25e8f822028
28+
checksum/config: a74591eb106a6412de7bc40fcb2acbdb6fb45ac47ca4468c23f204de1dd8bd57
2929

3030
labels:
3131
app.kubernetes.io/name: opentelemetry-collector

charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/service.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
name: example-opentelemetry-collector
77
namespace: default
88
labels:
9-
helm.sh/chart: opentelemetry-collector-0.117.3
9+
helm.sh/chart: opentelemetry-collector-0.118.0
1010
app.kubernetes.io/name: opentelemetry-collector
1111
app.kubernetes.io/instance: example
1212
app.kubernetes.io/version: "0.120.0"

charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/serviceaccount.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
name: example-opentelemetry-collector
77
namespace: default
88
labels:
9-
helm.sh/chart: opentelemetry-collector-0.117.3
9+
helm.sh/chart: opentelemetry-collector-0.118.0
1010
app.kubernetes.io/name: opentelemetry-collector
1111
app.kubernetes.io/instance: example
1212
app.kubernetes.io/version: "0.120.0"

charts/opentelemetry-collector/examples/daemonset-collector-logs/rendered/configmap-agent.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
name: example-opentelemetry-collector-agent
77
namespace: default
88
labels:
9-
helm.sh/chart: opentelemetry-collector-0.117.3
9+
helm.sh/chart: opentelemetry-collector-0.118.0
1010
app.kubernetes.io/name: opentelemetry-collector
1111
app.kubernetes.io/instance: example
1212
app.kubernetes.io/version: "0.120.0"

charts/opentelemetry-collector/examples/daemonset-collector-logs/rendered/daemonset.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
name: example-opentelemetry-collector-agent
77
namespace: default
88
labels:
9-
helm.sh/chart: opentelemetry-collector-0.117.3
9+
helm.sh/chart: opentelemetry-collector-0.118.0
1010
app.kubernetes.io/name: opentelemetry-collector
1111
app.kubernetes.io/instance: example
1212
app.kubernetes.io/version: "0.120.0"
@@ -23,7 +23,7 @@ spec:
2323
template:
2424
metadata:
2525
annotations:
26-
checksum/config: b9e97006de6b447ee707daee9b3c519c417cd748b2c565ed0991502b3720a01e
26+
checksum/config: e32678e8846bfc20f576340411020ad88d7aaa2e4e4adaf7d9663600e911de21
2727

2828
labels:
2929
app.kubernetes.io/name: opentelemetry-collector

charts/opentelemetry-collector/examples/daemonset-collector-logs/rendered/serviceaccount.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
name: example-opentelemetry-collector
77
namespace: default
88
labels:
9-
helm.sh/chart: opentelemetry-collector-0.117.3
9+
helm.sh/chart: opentelemetry-collector-0.118.0
1010
app.kubernetes.io/name: opentelemetry-collector
1111
app.kubernetes.io/instance: example
1212
app.kubernetes.io/version: "0.120.0"

charts/opentelemetry-collector/examples/daemonset-hostmetrics/rendered/configmap-agent.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
name: example-opentelemetry-collector-agent
77
namespace: default
88
labels:
9-
helm.sh/chart: opentelemetry-collector-0.117.3
9+
helm.sh/chart: opentelemetry-collector-0.118.0
1010
app.kubernetes.io/name: opentelemetry-collector
1111
app.kubernetes.io/instance: example
1212
app.kubernetes.io/version: "0.120.0"

charts/opentelemetry-collector/examples/daemonset-hostmetrics/rendered/daemonset.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
name: example-opentelemetry-collector-agent
77
namespace: default
88
labels:
9-
helm.sh/chart: opentelemetry-collector-0.117.3
9+
helm.sh/chart: opentelemetry-collector-0.118.0
1010
app.kubernetes.io/name: opentelemetry-collector
1111
app.kubernetes.io/instance: example
1212
app.kubernetes.io/version: "0.120.0"
@@ -23,7 +23,7 @@ spec:
2323
template:
2424
metadata:
2525
annotations:
26-
checksum/config: 7ea0a8502a487d0f5d31ec4759d949edd55a95016686423f2cc1a5ae25097e40
26+
checksum/config: c0fee9df3e2f0c59262e1d95a0cfcbc16ac6118266a9f9c913e995edf9932b5a
2727

2828
labels:
2929
app.kubernetes.io/name: opentelemetry-collector

charts/opentelemetry-collector/examples/daemonset-hostmetrics/rendered/serviceaccount.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
name: example-opentelemetry-collector
77
namespace: default
88
labels:
9-
helm.sh/chart: opentelemetry-collector-0.117.3
9+
helm.sh/chart: opentelemetry-collector-0.118.0
1010
app.kubernetes.io/name: opentelemetry-collector
1111
app.kubernetes.io/instance: example
1212
app.kubernetes.io/version: "0.120.0"

charts/opentelemetry-collector/examples/daemonset-lifecycle-hooks/rendered/configmap-agent.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
name: example-opentelemetry-collector-agent
77
namespace: default
88
labels:
9-
helm.sh/chart: opentelemetry-collector-0.117.3
9+
helm.sh/chart: opentelemetry-collector-0.118.0
1010
app.kubernetes.io/name: opentelemetry-collector
1111
app.kubernetes.io/instance: example
1212
app.kubernetes.io/version: "0.120.0"

charts/opentelemetry-collector/examples/daemonset-lifecycle-hooks/rendered/daemonset.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
name: example-opentelemetry-collector-agent
77
namespace: default
88
labels:
9-
helm.sh/chart: opentelemetry-collector-0.117.3
9+
helm.sh/chart: opentelemetry-collector-0.118.0
1010
app.kubernetes.io/name: opentelemetry-collector
1111
app.kubernetes.io/instance: example
1212
app.kubernetes.io/version: "0.120.0"
@@ -23,7 +23,7 @@ spec:
2323
template:
2424
metadata:
2525
annotations:
26-
checksum/config: c0738097d89246f9d13f124760e45e4aa49bd63329ae6366a562c2bbfd647a1e
26+
checksum/config: baede8dab6354d36f3897ad607da781a3d81532594ac73c83a3e8f12acfa35dc
2727

2828
labels:
2929
app.kubernetes.io/name: opentelemetry-collector

charts/opentelemetry-collector/examples/daemonset-lifecycle-hooks/rendered/serviceaccount.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
name: example-opentelemetry-collector
77
namespace: default
88
labels:
9-
helm.sh/chart: opentelemetry-collector-0.117.3
9+
helm.sh/chart: opentelemetry-collector-0.118.0
1010
app.kubernetes.io/name: opentelemetry-collector
1111
app.kubernetes.io/instance: example
1212
app.kubernetes.io/version: "0.120.0"

charts/opentelemetry-collector/examples/daemonset-only/rendered/configmap-agent.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
name: example-opentelemetry-collector-agent
77
namespace: default
88
labels:
9-
helm.sh/chart: opentelemetry-collector-0.117.3
9+
helm.sh/chart: opentelemetry-collector-0.118.0
1010
app.kubernetes.io/name: opentelemetry-collector
1111
app.kubernetes.io/instance: example
1212
app.kubernetes.io/version: "0.120.0"

charts/opentelemetry-collector/examples/daemonset-only/rendered/daemonset.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
name: example-opentelemetry-collector-agent
77
namespace: default
88
labels:
9-
helm.sh/chart: opentelemetry-collector-0.117.3
9+
helm.sh/chart: opentelemetry-collector-0.118.0
1010
app.kubernetes.io/name: opentelemetry-collector
1111
app.kubernetes.io/instance: example
1212
app.kubernetes.io/version: "0.120.0"
@@ -23,7 +23,7 @@ spec:
2323
template:
2424
metadata:
2525
annotations:
26-
checksum/config: c0738097d89246f9d13f124760e45e4aa49bd63329ae6366a562c2bbfd647a1e
26+
checksum/config: baede8dab6354d36f3897ad607da781a3d81532594ac73c83a3e8f12acfa35dc
2727

2828
labels:
2929
app.kubernetes.io/name: opentelemetry-collector

charts/opentelemetry-collector/examples/daemonset-only/rendered/serviceaccount.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
name: example-opentelemetry-collector
77
namespace: default
88
labels:
9-
helm.sh/chart: opentelemetry-collector-0.117.3
9+
helm.sh/chart: opentelemetry-collector-0.118.0
1010
app.kubernetes.io/name: opentelemetry-collector
1111
app.kubernetes.io/instance: example
1212
app.kubernetes.io/version: "0.120.0"

charts/opentelemetry-collector/examples/deployment-only/rendered/configmap.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
name: example-opentelemetry-collector
77
namespace: default
88
labels:
9-
helm.sh/chart: opentelemetry-collector-0.117.3
9+
helm.sh/chart: opentelemetry-collector-0.118.0
1010
app.kubernetes.io/name: opentelemetry-collector
1111
app.kubernetes.io/instance: example
1212
app.kubernetes.io/version: "0.120.0"

charts/opentelemetry-collector/examples/deployment-only/rendered/deployment.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
name: example-opentelemetry-collector
77
namespace: default
88
labels:
9-
helm.sh/chart: opentelemetry-collector-0.117.3
9+
helm.sh/chart: opentelemetry-collector-0.118.0
1010
app.kubernetes.io/name: opentelemetry-collector
1111
app.kubernetes.io/instance: example
1212
app.kubernetes.io/version: "0.120.0"
@@ -25,7 +25,7 @@ spec:
2525
template:
2626
metadata:
2727
annotations:
28-
checksum/config: 44fefef2d32b8c4a4c97a13778c7990da7a9b112b9c5a27c3c1eb25e8f822028
28+
checksum/config: a74591eb106a6412de7bc40fcb2acbdb6fb45ac47ca4468c23f204de1dd8bd57
2929

3030
labels:
3131
app.kubernetes.io/name: opentelemetry-collector

charts/opentelemetry-collector/examples/deployment-only/rendered/service.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
name: example-opentelemetry-collector
77
namespace: default
88
labels:
9-
helm.sh/chart: opentelemetry-collector-0.117.3
9+
helm.sh/chart: opentelemetry-collector-0.118.0
1010
app.kubernetes.io/name: opentelemetry-collector
1111
app.kubernetes.io/instance: example
1212
app.kubernetes.io/version: "0.120.0"

charts/opentelemetry-collector/examples/deployment-only/rendered/serviceaccount.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
name: example-opentelemetry-collector
77
namespace: default
88
labels:
9-
helm.sh/chart: opentelemetry-collector-0.117.3
9+
helm.sh/chart: opentelemetry-collector-0.118.0
1010
app.kubernetes.io/name: opentelemetry-collector
1111
app.kubernetes.io/instance: example
1212
app.kubernetes.io/version: "0.120.0"

charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/configmap.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
name: example-opentelemetry-collector
77
namespace: default
88
labels:
9-
helm.sh/chart: opentelemetry-collector-0.117.3
9+
helm.sh/chart: opentelemetry-collector-0.118.0
1010
app.kubernetes.io/name: opentelemetry-collector
1111
app.kubernetes.io/instance: example
1212
app.kubernetes.io/version: "0.120.0"

charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/deployment.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
name: example-opentelemetry-collector
77
namespace: default
88
labels:
9-
helm.sh/chart: opentelemetry-collector-0.117.3
9+
helm.sh/chart: opentelemetry-collector-0.118.0
1010
app.kubernetes.io/name: opentelemetry-collector
1111
app.kubernetes.io/instance: example
1212
app.kubernetes.io/version: "0.120.0"
@@ -25,7 +25,7 @@ spec:
2525
template:
2626
metadata:
2727
annotations:
28-
checksum/config: 2698604c447629761fbde742645cca51edf51ac8f8d4cb39ec74efa5cf28b5a1
28+
checksum/config: 4ca195348d27253aebedfd12764ca60291364cc1ff761ed424ffa3e291d2f927
2929

3030
labels:
3131
app.kubernetes.io/name: opentelemetry-collector

charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/service.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
name: example-opentelemetry-collector
77
namespace: default
88
labels:
9-
helm.sh/chart: opentelemetry-collector-0.117.3
9+
helm.sh/chart: opentelemetry-collector-0.118.0
1010
app.kubernetes.io/name: opentelemetry-collector
1111
app.kubernetes.io/instance: example
1212
app.kubernetes.io/version: "0.120.0"

charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/serviceaccount.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
name: example-opentelemetry-collector
77
namespace: default
88
labels:
9-
helm.sh/chart: opentelemetry-collector-0.117.3
9+
helm.sh/chart: opentelemetry-collector-0.118.0
1010
app.kubernetes.io/name: opentelemetry-collector
1111
app.kubernetes.io/instance: example
1212
app.kubernetes.io/version: "0.120.0"

0 commit comments

Comments
 (0)