Skip to content

Revert "fix(deps): update module github.com/prometheus/common to v0.63.0 (#12656)"#12673

Merged
mx-psi merged 2 commits into
open-telemetry:mainfrom
jade-guiton-dd:revert-12656
Mar 19, 2025
Merged

Revert "fix(deps): update module github.com/prometheus/common to v0.63.0 (#12656)"#12673
mx-psi merged 2 commits into
open-telemetry:mainfrom
jade-guiton-dd:revert-12656

Conversation

@jade-guiton-dd
Copy link
Copy Markdown
Contributor

@jade-guiton-dd jade-guiton-dd commented Mar 19, 2025

Description

Contrib tests are currently failing on main with the following build error:

Error: /home/runner/go/pkg/mod/github.com/prometheus/prometheus@v0.300.1/util/logging/file.go:42:23: undefined: promslog.AllowedFormat

I believe this is because of the update in #12656: there is a breaking change in github.com/prometheus/common 0.63.0 that is incompatible with the version of github.com/prometheus used in some contrib modules. While the latter package has been updated on main, the updated version hasn't been released yet, so I this the only solution is to revert this PR until then.

@jade-guiton-dd jade-guiton-dd requested a review from a team as a code owner March 19, 2025 11:26
@jade-guiton-dd jade-guiton-dd requested a review from jmacd March 19, 2025 11:26
@jade-guiton-dd jade-guiton-dd added the Skip Changelog PRs that do not require a CHANGELOG.md entry label Mar 19, 2025
@codecov
Copy link
Copy Markdown

codecov Bot commented Mar 19, 2025

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 91.63%. Comparing base (665b35f) to head (0638a91).
Report is 1 commits behind head on main.

Additional details and impacted files
@@           Coverage Diff           @@
##             main   #12673   +/-   ##
=======================================
  Coverage   91.63%   91.63%           
=======================================
  Files         479      479           
  Lines       26423    26423           
=======================================
  Hits        24214    24214           
  Misses       1749     1749           
  Partials      460      460           

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

🚀 New features to boost your workflow:
  • Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@mx-psi mx-psi added this pull request to the merge queue Mar 19, 2025
@github-merge-queue github-merge-queue Bot removed this pull request from the merge queue due to a conflict with the base branch Mar 19, 2025
@mx-psi
Copy link
Copy Markdown
Member

mx-psi commented Mar 19, 2025

@jade-guiton-dd could you fix the merge conflict?

@mx-psi mx-psi enabled auto-merge March 19, 2025 12:41
Copy link
Copy Markdown
Member

@songy23 songy23 left a comment

Choose a reason for hiding this comment

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

@mx-psi mx-psi added this pull request to the merge queue Mar 19, 2025
Copy link
Copy Markdown
Member

@ArthurSens ArthurSens left a comment

Choose a reason for hiding this comment

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

Yes, please revert! Sorry I didn't see the original PR on core. I've mentioned in contrib that we can't move forward with this upgrade yet. open-telemetry/opentelemetry-collector-contrib#38745 (comment)

I wonder why CI caught the problem on contrib, but not on core 🤔

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Skip Changelog PRs that do not require a CHANGELOG.md entry

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants