Skip to content

Commit 2486516

Browse files
S-mishinajinja2
andauthored
Add optional propagators configuration for trace context propagation (#1664)
* Add optional propagators configuration for trace context propagation Signed-off-by: S-mishina <[email protected]> * fix values.schema Signed-off-by: S-mishina <[email protected]> * Enable support for custom propagators in Instrumentation Configuration Signed-off-by: S-mishina <[email protected]> * Update .chloggen/featureaddoptionalpropagatorsconfig.yaml Co-authored-by: Jina Jain <[email protected]> --------- Signed-off-by: S-mishina <[email protected]> Co-authored-by: Jina Jain <[email protected]>
1 parent cbe843a commit 2486516

File tree

4 files changed

+46
-4
lines changed

4 files changed

+46
-4
lines changed
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
2+
change_type: "enhancement"
3+
# The name of the component, or a single word describing the area of concern, (e.g. agent, clusterReceiver, gateway, operator, chart, other)
4+
component: "chart"
5+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
6+
note: "Enable support for custom propagators in `spec.propagators` within Instrumentation Configuration."
7+
# One or more tracking issues related to the change
8+
issues: [1663]
9+
# (Optional) One or more lines of additional information to render under the primary note.
10+
# These lines will be padded with 2 spaces and then inserted directly into the document.
11+
# Use pipe (|) for multiline entries.
12+
subtext:
13+
This change allows users to specify custom propagators in `spec.propagators` when configuring OpenTelemetry Instrumentation.

helm-charts/splunk-otel-collector/templates/operator/instrumentation.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ metadata:
2121
spec:
2222
exporter:
2323
endpoint: {{ include "splunk-otel-collector.operator.instrumentation-exporter-endpoint" . }}
24+
{{- with .Values.instrumentation.propagators }}
2425
propagators:
25-
- tracecontext
26-
- baggage
27-
- b3
26+
{{- toYaml . | nindent 4 }}
27+
{{- end }}
2828
{{- with .Values.instrumentation.sampler }}
2929
sampler:
3030
{{- toYaml . | nindent 4 }}

helm-charts/splunk-otel-collector/values.schema.json

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1500,6 +1500,23 @@
15001500
"type": "string",
15011501
"description": "Optional endpoint parameter for exporting data to a specific target."
15021502
},
1503+
"propagators": {
1504+
"type": "array",
1505+
"description": "Optional propagators parameter for enabling trace context propagation.",
1506+
"items": {
1507+
"type": "string",
1508+
"enum": [
1509+
"tracecontext",
1510+
"baggage",
1511+
"b3",
1512+
"b3multi",
1513+
"jaeger",
1514+
"ottrace",
1515+
"xray",
1516+
"none"
1517+
]
1518+
}
1519+
},
15031520
"sampler": {
15041521
"type": "object",
15051522
"description": "Optional sampler parameter for enabling trace sampling.",

helm-charts/splunk-otel-collector/values.yaml

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1238,7 +1238,19 @@ instrumentation:
12381238
endpoint: ""
12391239
# endpoint: http://$(SPLUNK_OTEL_AGENT):4317
12401240
# endpoint: http://splunk-otel-collector:4317
1241-
1241+
# Optional "propagators" parameter for enabling trace context propagation, see: https://opentelemetry.io/docs/languages/sdk-configuration/general/#otel_propagators
1242+
propagators:
1243+
- tracecontext
1244+
- baggage
1245+
- b3
1246+
# "tracecontext": W3C Trace Context
1247+
# "baggage": W3C Baggage
1248+
# "b3": B3 Single
1249+
# "b3multi": B3 Multi
1250+
# "jaeger": Jaeger
1251+
# "xray": AWS X-Ray (third party)
1252+
# "ottrace": OT Trace (third party)
1253+
# "none": No automatically configured propagator.
12421254
# Optional "sampler" parameter for enabling trace sampling, see: https://opentelemetry.io/docs/concepts/sdk-configuration/general-sdk-configuration/#otel_traces_sampler
12431255
sampler: {}
12441256
# type: traceidratio

0 commit comments

Comments
 (0)