Skip to content
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.

Sign up for GitHub

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

Jump to bottom

feat: update otel versions for prometheus to 0.26 #2183

Merged
merged 11 commits into from
Oct 21, 2024
Merged

feat: update otel versions for prometheus to 0.26 #2183

merged 11 commits into from
Oct 21, 2024

Conversation

ouertani
Copy link
Contributor

@ouertani ouertani commented Oct 8, 2024 •
edited
Loading

Fixes #
Design discussion issue (if applicable) #
align opentelemetry-prometheus to 0.26.0 version

Changes

Please provide a brief description of the changes here.

Merge requirement checklist

  • CONTRIBUTING guidelines followed
  • [ x] Unit tests added/updated (if applicable)
  • Appropriate CHANGELOG.md files updated for non-trivial, user-facing changes
  • Changes in public API reviewed (if applicable)

@ouertani ouertani requested a review from a team as a code owner October 8, 2024 17:18
@linux-foundation-easycla Linux Foundation: EasyCLA
Copy link

linux-foundation-easycla bot commented Oct 8, 2024 •
edited
Loading

CLA Signed

The committers listed above are authorized under a signed CLA.

cijothomas
cijothomas approved these changes Oct 8, 2024
View reviewed changes
Copy link
Member

@cijothomas cijothomas left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks. Please update changelog.md too.

Also, see #1957 (review)
No change in Prometheus status - it may not work in next release! if it works, they good, but no guarantees.

@ouertani ouertani force-pushed the feat/otel_0.26_promo branch from cd704e3 to e91f7f2 Compare October 8, 2024 17:42
@cijothomas cijothomas changed the title feat: update otel versions for promo to 0.26 feat: update otel versions for prometheus to 0.26 Oct 8, 2024
@codecov Codecov
Copy link

codecov bot commented Oct 10, 2024 •
edited
Loading

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 79.1%. Comparing base (84c151c) to head (d16a03c).
Report is 1 commits behind head on main.

Additional details and impacted files 
@@           Coverage Diff           @@
##            main   #2183     +/-   ##
=======================================
- Coverage   79.3%   79.1%   -0.2%     
=======================================
  Files        121     121             
  Lines      20944   20933     -11     
=======================================
- Hits       16612   16562     -50     
- Misses      4332    4371     +39

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@cijothomas cijothomas mentioned this pull request Oct 13, 2024
Closed
4 tasks
@lalitb
Copy link
Member

lalitb commented Oct 15, 2024

@ouertani Do you want to look into the CI tests for Prometheus which are failing right now ?

@ouertani
Copy link
Contributor Author

@ouertani Do you want to look into the CI tests for Prometheus which are failing right now ?

Yes, I will try to fix

@ouertani ouertani mentioned this pull request Oct 21, 2024
Closed
2 tasks
@ouertani
Copy link
Contributor Author

@lalitb this pr is required to fix the tests #2224 seems introduced with this pr #2018

@cijothomas
Copy link
Member

@lalitb this pr is required to fix the tests #2224 seems introduced with this pr #2018

See #2224 (review)
To unblock this PR, you may Ignore the test about duplicate attributes, and re-enable once we fix the issue in the sdk.

@ouertani
Copy link
Contributor Author

fix: ignore prometheus_exporter_integration until fixed with sdk

fix: ignore prometheus_exporter_integration until fixed with sdk

cijothomas
cijothomas reviewed Oct 21, 2024
View reviewed changes
opentelemetry-prometheus/tests/integration_test.rs Outdated
@@ -15,6 +15,7 @@ use opentelemetry_sdk::Resource;
use opentelemetry_semantic_conventions::resource::{SERVICE_NAME, TELEMETRY_SDK_VERSION};
use prometheus::{Encoder, TextEncoder};

#[ignore]
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please point to the issue or the PRs trying to fix this for easy referenc.e

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I add the pr link

@lalitb lalitb merged commit e911383 into open-telemetry:main Oct 21, 2024
25 checks passed
@ouertani ouertani deleted the feat/otel_0.26_promo branch October 21, 2024 19:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@cijothomas cijothomas cijothomas approved these changes

@lalitb lalitb lalitb approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@ouertani @lalitb @cijothomas