[chore] Backport 0.120.1 into main#38057
Closed
jpkrohling wants to merge 3 commits into
Closed
Conversation
…dation (open-telemetry#38018) #### Description During the release process, we noticed a breaking change in the Prometheus receiver caused by open-telemetry#36873. In that PR, I tried adding a fallback scrape protocol by default everytime the PrometheusReceiver was built, but it turned out that config validation happened even before the component was created. And the collector fails startup with invalid configuration This PR moves the addition of scrape protocol to the validation step. <!-- Issue number (e.g. #1234) or full URL to issue, if applicable. --> #### Link to tracking issue Fixes open-telemetry#37902 <!--Describe what testing was performed and which tests were added.--> #### Testing <!--Describe the documentation added.--> #### Documentation <!--Please delete paragraphs that you did not use before submitting.-->
The following commands were run to prepare this release: - make chlog-update VERSION=v0.120.1 - sed -i.bak s/0\.120\.0/0.120.1/g versions.yaml - make multimod-prerelease - make multimod-sync
jpkrohling
requested review from
a team,
ChrsMark,
MovieStoreGuy,
TylerHelmuth,
andrzej-stencel,
atoulme,
bogdandrutu,
codeboten,
crobert-1,
dashpole,
dehaansa,
djaglowski,
dmitryax,
evan-bradley,
fatsheep9146,
jsuereth,
mwear,
mx-psi,
songy23,
tigrannajaryan and
yurishkuro
as code owners
github-actions
Bot
added
cmd/otelcontribcol
github-actions
Bot
added
exporter/dataset
exporter/doris
exporter/elasticsearch
exporter/file
exporter/googlemanagedprometheus
songy23
approved these changes
Feb 19, 2025
codeboten
approved these changes
Feb 19, 2025
Contributor
codeboten
left a comment
codeboten
left a comment
There was a problem hiding this comment.
The important piece of this PR is ensuring that the first 2 commits make it into main without being squashed, i've enabled merge commits for the repo.
Please make sure to use it once CI has completed
Member
|
The same test is failing on main https://github.com/open-telemetry/opentelemetry-collector-contrib/actions/runs/13415755416/job/37476233796?pr=38057 cc @ArthurSens |
Member
|
This is weird, the test was removed in the previous PR 🤔 |
Member
|
seems a bad merge: the merge commit does not contain these diffs https://github.com/open-telemetry/opentelemetry-collector-contrib/pull/38018/files#diff-8d0532921a098f2bf8b280acabe5c8efe6e320f38ccb8b61b2ca28d54377b033L67-L83 |
Member
Author
|
I'm closing this and check what's wrong later. |
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
Link to tracking issue
Fixes
Testing
Documentation