-
Notifications
You must be signed in to change notification settings - Fork 414
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
Instrumentations support select #2778
Open
crossoverJie
wants to merge
21
commits into
open-telemetry:main
Choose a base branch
from
crossoverJie:instrumentation-support-label
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
Changes from 9 commits
Commits
Show all changes
21 commits
Select commit
Hold shift + click to select a range
377b51f
Instrumentations support select
crossoverJie 686f1c6
use LabelSelector instead of map
crossoverJie 4f69d5b
reset
crossoverJie 1a53108
fix cr
crossoverJie 04badc2
reset
crossoverJie 4025131
Update .chloggen/instrumentation-support-select.yaml
crossoverJie 50ab7a2
Merge branch 'main' into instrumentation-support-label
crossoverJie bac91bf
Update apis/v1alpha1/instrumentation_types.go
crossoverJie 60540f0
fix wrong Inst when having multi Inst
crossoverJie 8d25853
fix import
crossoverJie fff0c2a
Merge branch 'main' into instrumentation-support-label
crossoverJie 0a7d640
fix select document.
crossoverJie 8b7609a
fix e2e test
crossoverJie 80bc887
Merge branch 'main' into instrumentation-support-label
crossoverJie b11cb13
merge main to current branch
crossoverJie 787e7fe
Merge branch 'main' into instrumentation-support-label
crossoverJie f531eb9
Merge branch 'main' into instrumentation-support-label
crossoverJie efd91de
Merge branch 'main' into instrumentation-support-label
crossoverJie 73eb99e
merge main to current branch
crossoverJie a4500da
Merge branch 'main' into instrumentation-support-label
crossoverJie 7b754f4
Merge branch 'main' into instrumentation-support-label
crossoverJie File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' | ||
change_type: enhancement | ||
|
||
# The name of the component, or a single word describing the area of concern, (e.g. collector, target allocator, auto-instrumentation, opamp, github action) | ||
component: auto-instrumentation | ||
|
||
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). | ||
note: Support label selectors in the Instrumentation CR | ||
|
||
# One or more tracking issues related to the change | ||
issues: [2744] | ||
|
||
# (Optional) One or more lines of additional information to render under the primary note. | ||
# These lines will be padded with 2 spaces and then inserted directly into the document. | ||
# Use pipe (|) for multiline entries. | ||
subtext: |
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
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
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.
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.
Are all pods from all namespaces matched?
What is the precedence order when annotation
instrumentation.opentelemetry.io/
is also present on the pod/namespace?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.
I believe this feature only comes into play when the annotation is not set and we try to pick an Instrumentation from the namespace the Pod is in. The annotation has precedence. But we should document this behaviour somewhere.
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.
opentelemetry-operator/pkg/instrumentation/podmutator.go
Lines 368 to 377 in c65629b
Did I understand it wrong? I think the premise for this feature to take effect is that the
instrumentation.opentelemetry.io/inject-xx
is equal to true.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.
What I meant to say was that this mechanism only applies if the annotation doesn't specify which instrumentation should be used. Apologies for the confusion.
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.
Thanks; I understand that the documentation has been supplemented.