Skip to content

Commit 80dcbb1

Browse files
authored
Set correct default port for tracing (#13937)
Now that the default tracing protocol is OpenTelemetry, this changes the default port for traces to the OpenTelemetry port on the collector instead of the OpenCensus one. The current default port, matched with the current default trace protocol of OpenTelemetry, is currently broken as it causes traces to be sent to a collector port that expects OpenCensus traces. This is technically a breaking change, but it is less breaking than the change of the default protocol to OpenTelemetry. More explicitly, if a user only used the defaults, this change brings them from a broken state to a working state. If a user brings their own tracing infrastructure with a custom collector address, this change doesn't affect them at all. The only users that may be broken by this are ones that explicitly set the protocol to OpenCensus, but we expect this to be rare as OpenCensus as a protocol has been sunset for a few years now.
1 parent 332bf62 commit 80dcbb1

File tree

7 files changed

+8
-8
lines changed

7 files changed

+8
-8
lines changed

BUILD.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ and their proxies by using the `--set controlPlaneTracing=true` installation
204204
flag.
205205

206206
This will configure all the components to send the traces at
207-
`collector.{{.Values.controlPlaneTracingNamespace}}.svc.{{.Values.ClusterDomain}}:55678`
207+
`collector.{{.Values.controlPlaneTracingNamespace}}.svc.{{.Values.ClusterDomain}}:4317`
208208

209209
```bash
210210

charts/partials/templates/_trace.tpl

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{{ define "partials.linkerd.trace" -}}
22
{{ if .Values.controlPlaneTracing -}}
3-
- -trace-collector=collector.{{.Values.controlPlaneTracingNamespace}}.svc.{{.Values.clusterDomain}}:55678
3+
- -trace-collector=collector.{{.Values.controlPlaneTracingNamespace}}.svc.{{.Values.clusterDomain}}:4317
44
{{ end -}}
55
{{- end }}

cli/cmd/testdata/install_controlplane_tracing_output.golden

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

jaeger/charts/linkerd-jaeger/values.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,7 @@ webhook:
292292

293293
# -- collector service address for the proxies to send trace data.
294294
# Points by default to the linkerd-jaeger collector
295-
collectorSvcAddr: collector.linkerd-jaeger:55678
295+
collectorSvcAddr: collector.linkerd-jaeger:4317
296296
# -- protocol proxies should use to send trace data.
297297
# Can be `opencensus` or `opentelemetry` (default)
298298
collectorTraceProtocol: opentelemetry

jaeger/cmd/testdata/install_collector_disabled.golden

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

jaeger/cmd/testdata/install_default.golden

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

jaeger/cmd/testdata/install_jaeger_disabled.golden

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)