-
Notifications
You must be signed in to change notification settings - Fork 1.3k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add configuration for proxy trace service name #13130
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This looks good to me, but testing is giving me some headaches, that don't look that are related to these changes...
Say you have linkerd+linkerd-jaeger in your cluster with emojivoto, and add the annotation config.linkerd.io/trace-collector-name: voting-linkerd-proxy
to the voting pod template. Then if you bounce the web workload you'll see it gets injected with LINKERD2_PROXY_TRACE_SERVICE_NAME=voting-linkerd-proxy
! Somehow the annotations are getting commingled. Can you try replicating that?
I managed to replicate that locally, that's really weird behavior, I'll see if I can track down what's happening. |
The jaeger injector seems to be leaking annotation overrides to its view of the namespace's annotations, which causes any admission after one with an annotation override to include these overrides erroneously. Should be a pretty easy fix. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM! 🚢
Companion to linkerd/linkerd2-proxy#3245, exposes the configuration for the tracing service name in the proxy to the general linkerd config. Similar in concept to linkerd#12371, except the configuration lives entirely within the tracing injector config instead of going through the control plane. Fixes linkerd#11157 Signed-off-by: Scott Fleener <[email protected]>
Companion to linkerd/linkerd2-proxy#3245, exposes the configuration for the tracing service name in the proxy to the general linkerd config.
Similar in concept to #12371, except the configuration lives entirely within the tracing injector config instead of going through the control plane.
Fixes #11157