Merge release/v0.130.x into main#13452
Merged
Merged
Conversation
<!--Ex. Fixing a bug - Describe the bug and how this fixes the issue. Ex. Adding a feature - Explain what this achieves.--> #### Description Downgrades opentelemetry-go dependencies effectively reverting #13289 and others ### ❗ Known Issues ❗ - Due to a [bug](open-telemetry/opentelemetry-go#7039) in the prometheus exporter, if you are configuring a prometheus exporter, the collector's internal metrics will be emitted with an unexpected suffix in its name. For example, the metric `otelcol_exporter_sent_spans__spans__total` instead of `otelcol_exporter_sent_spans_total`. The workaround is to manually configure `without_units: true` in your prometheus exporter config ```yaml service: telemetry: metrics: readers: - pull: exporter: prometheus: host: 0.0.0.0 port: 8888 without_units: true ``` If you are using the collector's default Prometheus exporter for exporting internal metrics you are unaffected. --------- Signed-off-by: alex boten <223565+codeboten@users.noreply.github.com> Co-authored-by: alex boten <223565+codeboten@users.noreply.github.com> Co-authored-by: Yang Song <songy23@users.noreply.github.com>
Reverts #13429 so that we can bump to the to-be-released bugfix version that adds open-telemetry/opentelemetry-go/pull/7044
<!--Ex. Fixing a bug - Describe the bug and how this fixes the issue. Ex. Adding a feature - Explain what this achieves.--> #### Description Updates #13381 Relates to open-telemetry/opentelemetry-go#7039
<!--Ex. Fixing a bug - Describe the bug and how this fixes the issue. Ex. Adding a feature - Explain what this achieves.--> #### Description Prepares release v0.130.1/v1.36.1 to release #13429 <!-- Issue number if applicable --> #### Link to tracking issue Updates #13381 Relates to open-telemetry/opentelemetry-go/issues/7039 --------- Co-authored-by: opentelemetrybot <107717825+opentelemetrybot@users.noreply.github.com>
mx-psi
requested review from
a team,
andrzej-stencel,
bogdandrutu,
dmathieu,
dmitryax and
evan-bradley
as code owners
Member
Author
|
@open-telemetry/admins I need some help to follow step 5 of the bugfix release guidelines:
Can somebody help me disable the merge queue temporarily on this repository so that I can merge this? Thank you |
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #13452 +/- ##
==========================================
+ Coverage 91.53% 91.76% +0.22%
==========================================
Files 528 533 +5
Lines 29469 30040 +571
==========================================
+ Hits 26974 27565 +591
+ Misses 1969 1944 -25
- Partials 526 531 +5 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
dmathieu
approved these changes
Jul 22, 2025
jade-guiton-dd
approved these changes
Jul 22, 2025
andrzej-stencel
approved these changes
Jul 22, 2025
Member
|
merge queue is disabled |
Member
|
merge queue is re-enabled |
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
Follow step 3 from the bugfix release procedure:
This includes #13449 in main
Link to tracking issue
Updates #13381
Relates to open-telemetry/opentelemetry-go/issues/7039