From 80dcbb1688826a8256d9976a51ca8da66908b505 Mon Sep 17 00:00:00 2001 From: Scott Fleener Date: Wed, 16 Apr 2025 11:20:06 -0400 Subject: [PATCH] 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. --- BUILD.md | 2 +- charts/partials/templates/_trace.tpl | 2 +- cli/cmd/testdata/install_controlplane_tracing_output.golden | 4 ++-- jaeger/charts/linkerd-jaeger/values.yaml | 2 +- jaeger/cmd/testdata/install_collector_disabled.golden | 2 +- jaeger/cmd/testdata/install_default.golden | 2 +- jaeger/cmd/testdata/install_jaeger_disabled.golden | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/BUILD.md b/BUILD.md index 7ac65a3ff..0bb4b56fc 100644 --- a/BUILD.md +++ b/BUILD.md @@ -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 diff --git a/charts/partials/templates/_trace.tpl b/charts/partials/templates/_trace.tpl index dee059541..8981e54f6 100644 --- a/charts/partials/templates/_trace.tpl +++ b/charts/partials/templates/_trace.tpl @@ -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 }} diff --git a/cli/cmd/testdata/install_controlplane_tracing_output.golden b/cli/cmd/testdata/install_controlplane_tracing_output.golden index b510f4d31..a84afcda3 100644 --- a/cli/cmd/testdata/install_controlplane_tracing_output.golden +++ b/cli/cmd/testdata/install_controlplane_tracing_output.golden @@ -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: diff --git a/jaeger/charts/linkerd-jaeger/values.yaml b/jaeger/charts/linkerd-jaeger/values.yaml index 0a107f359..cab7237dc 100644 --- a/jaeger/charts/linkerd-jaeger/values.yaml +++ b/jaeger/charts/linkerd-jaeger/values.yaml @@ -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 diff --git a/jaeger/cmd/testdata/install_collector_disabled.golden b/jaeger/cmd/testdata/install_collector_disabled.golden index 21b2c59c8..289a83d90 100644 --- a/jaeger/cmd/testdata/install_collector_disabled.golden +++ b/jaeger/cmd/testdata/install_collector_disabled.golden @@ -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 diff --git a/jaeger/cmd/testdata/install_default.golden b/jaeger/cmd/testdata/install_default.golden index 365f87316..4ea3846e9 100644 --- a/jaeger/cmd/testdata/install_default.golden +++ b/jaeger/cmd/testdata/install_default.golden @@ -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 diff --git a/jaeger/cmd/testdata/install_jaeger_disabled.golden b/jaeger/cmd/testdata/install_jaeger_disabled.golden index 5186e0488..f40b34427 100644 --- a/jaeger/cmd/testdata/install_jaeger_disabled.golden +++ b/jaeger/cmd/testdata/install_jaeger_disabled.golden @@ -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