Upgrade Prometheus to v0.302.1 #40103
Merged
Conversation
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
npordash
requested review from
a team,
fatsheep9146,
dashpole,
ArthurSens,
dehaansa,
mx-psi,
songy23,
evan-bradley,
atoulme and
tigrannajaryan
as code owners
github-actions
bot
added
testbed
receiver/simpleprometheus
receiver/purefb
receiver/purefa
receiver/prometheusremotewrite
receiver/prometheus
github-actions
bot
requested review from
srprash,
tomaz-s1,
wangzlei,
yotamloe and
zdaratom-s1
npordash
force-pushed
the
prometheus_v0.303.1
branch
from
cf42107 to
595ef6f
Compare
iblancasa
approved these changes
May 21, 2025
1 task
songy23
added
dependencies
…abelNameLimitConfig` since it is deprecated
npordash
force-pushed
the
prometheus_v0.303.1
branch
from
595ef6f to
4201547
Compare
@songy23 done |
|
pinging prometheus receiver code owners @Aneurysm9, @dashpole, @ArthurSens, @krajorama for approval |
ArthurSens
approved these changes
May 22, 2025
dragonlord93
pushed a commit
to dragonlord93/opentelemetry-collector-contrib
that referenced
this pull request
May 23, 2025
#### Description This PR superseeds open-telemetry#38530 (as it went stale)~~, but goes to `v0.303.1` instead of `v0.302.x`~~. In order to workaround the behavior change when calling `prometheus.config.GetScrapeConfigs()` (mentioned [here](open-telemetry#38530 (comment))) I've made the following changes in `prometheusreceiver`: 1. Added a `reloadPromConfig` func that will marshal an input as yaml and then load it using `prometheus.config.Load` to ensure that the un-exported field `loaded` is set to `true` 2. Updated `PromConfig.Unmarshal` to delegate to `reloadPromConfig` 3. Added `PromConfig.Reload` which delegates to `reloadPromConfig` to reload itself 4. Updated `newPrometheusReceiver` to call `PromConfig.Reload` to ensure the Prometheus config is `loaded` 5. Updated `Config.Validate` to only check if scrape configs or files have been set instead of calling `GetScrapeConfigs` since it's not necessary they get built here 6. Updated `PromConfig.Validate` to only call `GetScrapeConfigs` if any where configured
1 task
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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
This PR superseeds #38530 (as it went stale)
, but goes to.v0.303.1instead ofv0.302.xIn order to workaround the behavior change when calling
prometheus.config.GetScrapeConfigs()(mentioned here) I've made the following changes inprometheusreceiver:reloadPromConfigfunc that will marshal an input as yaml and then load it usingprometheus.config.Loadto ensure that the un-exported fieldloadedis set totruePromConfig.Unmarshalto delegate toreloadPromConfigPromConfig.Reloadwhich delegates toreloadPromConfigto reload itselfnewPrometheusReceiverto callPromConfig.Reloadto ensure the Prometheus config isloadedConfig.Validateto only check if scrape configs or files have been set instead of callingGetScrapeConfigssince it's not necessary they get built herePromConfig.Validateto only callGetScrapeConfigsif any where configured