[chore][receiver/prometheus]: remove workaround for Prom issue 16217#41125
Merged
songy23 merged 1 commit intoJul 8, 2025
Merged
Conversation
Upstream has the fix for prometheus/prometheus#16217 I didn't remember if I had a test for this, so reverted to 929f5f9 before Bump prometheus to 0.304.1 (open-telemetry#40397) There tests fail without the fix in TestNativeVsClassicHistogramScrapeViaProtobuf/feature_disabled_scrape_classic_on/target1/target1 (re-run 1) (0.00s) metrics_receiver_protobuf_test.go:312: Error: Not equal: expected: 1 actual : 3 Now tests don't fail without the workaround anymore. Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com>
dashpole
approved these changes
Jul 7, 2025
iblancasa
approved these changes
Jul 8, 2025
constanca-m
pushed a commit
to constanca-m/opentelemetry-collector-contrib
that referenced
this pull request
Jul 21, 2025
…pen-telemetry#41125) #### Description Upstream has the fix for prometheus/prometheus#16217 , so time to remove the workaround. I didn't remember if I had a test for this, so reverted to 929f5f9 before Bump prometheus to 0.304.1 (open-telemetry#40397) There tests fail without the fix in ``` TestNativeVsClassicHistogramScrapeViaProtobuf/feature_disabled_scrape_classic_on/target1/target1 (re-run 1) (0.00s) metrics_receiver_protobuf_test.go:312: Error: Not equal: expected: 1 actual : 3 ``` Now tests don't fail without the workaround anymore. #### Link to tracking issue N/A #### Testing Unit tests pass. #### Documentation N/A Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com>
Dylan-M
pushed a commit
to Dylan-M/opentelemetry-collector-contrib
that referenced
this pull request
Aug 5, 2025
…pen-telemetry#41125) #### Description Upstream has the fix for prometheus/prometheus#16217 , so time to remove the workaround. I didn't remember if I had a test for this, so reverted to 929f5f9 before Bump prometheus to 0.304.1 (open-telemetry#40397) There tests fail without the fix in ``` TestNativeVsClassicHistogramScrapeViaProtobuf/feature_disabled_scrape_classic_on/target1/target1 (re-run 1) (0.00s) metrics_receiver_protobuf_test.go:312: Error: Not equal: expected: 1 actual : 3 ``` Now tests don't fail without the workaround anymore. #### Link to tracking issue N/A #### Testing Unit tests pass. #### Documentation N/A Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com>
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
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
Upstream has the fix for prometheus/prometheus#16217 , so time to remove the workaround.
I didn't remember if I had a test for this, so reverted to 929f5f9 before
Bump prometheus to 0.304.1 (#40397)
There tests fail without the fix in
Now tests don't fail without the workaround anymore.
Link to tracking issue
N/A
Testing
Unit tests pass.
Documentation
N/A