-
Notifications
You must be signed in to change notification settings - Fork 2.7k
Fix flaky metrics 7617 #7720
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
Open
chinmay3012
wants to merge
2
commits into
jaegertracing:main
Choose a base branch
from
chinmay3012:fix-flaky-metrics-7617
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.
+23
−0
Open
Fix flaky metrics 7617 #7720
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
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 hidden or 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 |
|---|---|---|
|
|
@@ -10,6 +10,20 @@ | |
|
|
||
| # Configuration for transient labels that should be normalized during comparison | ||
| TRANSIENT_LABEL_PATTERNS = { | ||
| 'GLOBAL': { | ||
| 'otel_scope_version': { | ||
| 'pattern': r'.*', | ||
| 'replacement': 'version' | ||
| }, | ||
| 'k8s_namespace_name': { | ||
| 'pattern': r'.*', | ||
| 'replacement': 'namespace' | ||
| }, | ||
| 'namespace': { | ||
| 'pattern': r'.*', | ||
| 'replacement': 'namespace' | ||
| } | ||
| }, | ||
| 'kafka': { | ||
| 'topic': { | ||
| 'pattern': r'jaeger-spans-\d+', | ||
|
|
@@ -38,8 +52,17 @@ def suppress_transient_labels(metric_name, labels): | |
| Dictionary of labels with transient values normalized | ||
| """ | ||
| labels_copy = labels.copy() | ||
|
|
||
| # Apply global patterns first | ||
| if 'GLOBAL' in TRANSIENT_LABEL_PATTERNS: | ||
yurishkuro marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| for label_name, pattern_config in TRANSIENT_LABEL_PATTERNS['GLOBAL'].items(): | ||
| if label_name in labels_copy: | ||
| # For global patterns, directly replace the value | ||
| labels_copy[label_name] = pattern_config['replacement'] | ||
|
|
||
| for service_pattern, label_configs in TRANSIENT_LABEL_PATTERNS.items(): | ||
| if service_pattern == 'GLOBAL': | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Python dicts guarantee the order of keys to respect the order of declaration, so GLOBAL always comes in first. You can add a comment in its declaration clarifying that it must be first. |
||
| continue | ||
| if service_pattern in metric_name: | ||
| for label_name, pattern_config in label_configs.items(): | ||
| if label_name in labels_copy: | ||
|
|
||
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.
what is the meaning of
namespacelabel? In which context does it come up? If it's specific to some of the storage implementations then it should not be in GLOBAL but in its own category