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.
This commit is contained in:
Scott Fleener 2025-04-16 11:20:06 -04:00 committed by GitHub
parent 332bf62503
commit 80dcbb1688
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 8 additions and 8 deletions

View File

@ -204,7 +204,7 @@ and their proxies by using the `--set controlPlaneTracing=true` installation
flag.
This will configure all the components to send the traces at
`collector.{{.Values.controlPlaneTracingNamespace}}.svc.{{.Values.ClusterDomain}}:55678`
`collector.{{.Values.controlPlaneTracingNamespace}}.svc.{{.Values.ClusterDomain}}:4317`
```bash

View File

@ -1,5 +1,5 @@
{{ define "partials.linkerd.trace" -}}
{{ if .Values.controlPlaneTracing -}}
- -trace-collector=collector.{{.Values.controlPlaneTracingNamespace}}.svc.{{.Values.clusterDomain}}:55678
- -trace-collector=collector.{{.Values.controlPlaneTracingNamespace}}.svc.{{.Values.clusterDomain}}:4317
{{ end -}}
{{- end }}

View File

@ -958,7 +958,7 @@ spec:
- -enable-pprof=false
- -kube-apiclient-qps=100
- -kube-apiclient-burst=200
- -trace-collector=collector.linkerd-jaeger.svc.cluster.local:55678
- -trace-collector=collector.linkerd-jaeger.svc.cluster.local:4317
env:
- name: LINKERD_DISABLED
value: "linkerd-await cannot block the identity controller"
@ -1564,7 +1564,7 @@ spec:
- -enable-ipv6=false
- -enable-pprof=false
- --meshed-http2-client-params={"keep_alive":{"interval":{"seconds":10},"timeout":{"seconds":3},"while_idle":true}}
- -trace-collector=collector.linkerd-jaeger.svc.cluster.local:55678
- -trace-collector=collector.linkerd-jaeger.svc.cluster.local:4317
image: cr.l5d.io/linkerd/controller:install-control-plane-version
imagePullPolicy: IfNotPresent
livenessProbe:

View File

@ -292,7 +292,7 @@ webhook:
# -- collector service address for the proxies to send trace data.
# Points by default to the linkerd-jaeger collector
collectorSvcAddr: collector.linkerd-jaeger:55678
collectorSvcAddr: collector.linkerd-jaeger:4317
# -- protocol proxies should use to send trace data.
# Can be `opencensus` or `opentelemetry` (default)
collectorTraceProtocol: opentelemetry

View File

@ -46,7 +46,7 @@ spec:
automountServiceAccountToken: false
containers:
- args:
- -collector-svc-addr=collector.linkerd-jaeger:55678
- -collector-svc-addr=collector.linkerd-jaeger:4317
- -collector-trace-protocol=opentelemetry
- -collector-trace-svc-name=linkerd-proxy
- -collector-svc-account=collector

View File

@ -46,7 +46,7 @@ spec:
automountServiceAccountToken: false
containers:
- args:
- -collector-svc-addr=collector.linkerd-jaeger:55678
- -collector-svc-addr=collector.linkerd-jaeger:4317
- -collector-trace-protocol=opentelemetry
- -collector-trace-svc-name=linkerd-proxy
- -collector-svc-account=collector

View File

@ -46,7 +46,7 @@ spec:
automountServiceAccountToken: false
containers:
- args:
- -collector-svc-addr=collector.linkerd-jaeger:55678
- -collector-svc-addr=collector.linkerd-jaeger:4317
- -collector-trace-protocol=opentelemetry
- -collector-trace-svc-name=linkerd-proxy
- -collector-svc-account=collector