receiver/prometheus: remove assumption that scraped metrics share a resource #36479
+122
−23
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
…esource This change removes as assumption that all metrics in a single scrape come from the same resource. This is indeed not true when `honor_labels` is set to `true` AND when the scraped metrics contain a `job` or `instance` label.
ridwanmsharif
force-pushed
the
ridwanmsharif/adjuster-resource-fix
branch
from
4a675f9
to
b4af9c7
Compare
dehaansa
reviewed
Nov 24, 2024
| for i := 0; i < metrics.ResourceMetrics().Len(); i++ { | ||
| rm := metrics.ResourceMetrics().At(i) | ||
| job, found := rm.Resource().Attributes().Get(semconv.AttributeServiceName) | ||
| if !found { | ||
| return errors.New("adjusting metrics without job") |
There was a problem hiding this comment.
This does have the potential to be functionally different than the previous implementation - if one or more resources at the beginning of the slice have the appropriate attributes, and later resources do not have the appropriate attributes, some metrics will be adjusted, and some will not.
Should we iterate through all resources first and confirm they all have the appropriate attributes? From what I can tell the pmetric.Metrics object isn't re-used after Commit() fails, but in case of future updates changing that behavior it may be worth ensuring we don't partially modify the metrics.
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.
Description
This change removes as assumption that all metrics in a single scrape come from the same resource. This is indeed not true when
honor_labelsis set totrueAND when the scraped metrics contain ajoborinstancelabel.Link to tracking issue
Fixes #36477
Testing
Added unit tests
Documentation
N/A