-
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 extra trace attributes from downward API #13544
Open
sfleen
wants to merge
1
commit into
linkerd:main
Choose a base branch
from
sfleen:trace_args
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
adleong
reviewed
Jan 11, 2025
jaeger/injector/mutator/patch.go
Outdated
"path": "/spec/{{.ProxyPath}}/env/-", | ||
"value": { | ||
"name": "LINKERD2_PROXY_TRACE_EXTRA_ATTRIBUTES", | ||
"value": "k8s.pod.uid=$(_pod_uid),k8s.container.name=$(_pod_containerName)" |
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.
Where are the _pod_uid
and _pod_containerName
env variables set?
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.
They're set in the proxy environment here:
- name: _pod_uid |
sfleen
force-pushed
the
trace_args
branch
2 times, most recently
from
January 13, 2025 16:59
a770ed6
to
795a330
Compare
adleong
approved these changes
Jan 13, 2025
This allows us to specify extra trace attribute key-value pairs from the downward API without needing to pull from the pods annotations or labels. This lets us keep the proxy decoupled from k8s concepts. Signed-off-by: Scott Fleener <[email protected]>
sfleen
added a commit
to sfleen/linkerd2-proxy
that referenced
this pull request
Jan 14, 2025
This allows us to include arbitrary values from the k8s downward API beyond just the pod labels that are included in the trace attributes file. See linkerd/linkerd2#13544 for the corresponding control plane change. Signed-off-by: Scott Fleener <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This allows us to specify extra trace attribute key-value pairs from the downward API without needing to pull from the pods annotations or labels. This lets us keep the proxy decoupled from k8s concepts.