Update prometheus to v0.50.1 and remove enable_protobuf_negotiation #30934
Conversation
This file contains 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
github-actions
bot
added
cmd/configschema
tomasmota
pushed a commit
to tomasmota/opentelemetry-collector
that referenced
this pull request
Mar 14, 2024
Long story, but i'm working on updating the prometheus dependency: open-telemetry/opentelemetry-collector-contrib#30934 As part of that update, we need to adapt to a change that makes the prometheus servers' self-observability metrics independent. See prometheus/prometheus#13507 and prometheus/prometheus#13610 One way to adapt to this change is by adding a label to each receivers' metrics to differentiate one Prometheus receiver from another. I've tried taking that approach in open-telemetry/opentelemetry-collector-contrib#30934, but the current issue is that the NoOp components all have the same name, which causes the self-observability metrics to collide. I can work around this in the prometheus receiver's own tests, but I can't work around the issue in the `generated_component_test.go` tests, since those are generated. This PR makes the ID returned by `NewNopCreateSettings` unique by giving it a unique name. **Link to tracking Issue:** Part of open-telemetry/opentelemetry-collector-contrib#30883 cc @Aneurysm9 --------- Co-authored-by: Alex Boten <223565+codeboten@users.noreply.github.com>
This was referenced Mar 14, 2024
Closed
dashpole
force-pushed
the
update_prometheus
branch
2 times, most recently
from
bfec640 to
a5be091
Compare
|
@Aneurysm9 I think this is finally ready |
Aneurysm9
approved these changes
Mar 21, 2024
|
@dashpole please rebase |
dashpole
changed the title
dashpole
force-pushed
the
update_prometheus
branch
2 times, most recently
from
7bb9797 to
568d301
Compare
|
@dmitryax rebased |
|
@dashpole looks like, |
dashpole
force-pushed
the
update_prometheus
branch
from
568d301 to
366d46a
Compare
|
|
|
@dmitryax passing now |
dashpole
added
ready to merge
dashpole
force-pushed
the
update_prometheus
branch
from
f6254ce to
1a83876
Compare
dashpole
added
the
ready to merge
ptodev
added a commit
to grafana/opentelemetry-collector-contrib
that referenced
this pull request
Sep 24, 2024
Similar to open-telemetry#30934
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.
Fixes #30883
Prometheus PR we need to adapt to: prometheus/prometheus#12738
The configuration option we were using to enable protobuf has been removed, so this PR removes the
enable_protobuf_negotiationconfiguration on the prometheus receiver. In its place, the prometheus server now has a config option,scrape_protocols, which specifies which protocols it uses, including protobuf. Useconfig.global.scrape_protocols = [ PrometheusProto, OpenMetricsText1.0.0, OpenMetricsText0.0.1, PrometheusText0.0.4 ]to enable protobuf scraping instead of using our option.Prometheus PR we need to adapt to: prometheus/prometheus#12958
We now need to pass a prometheus.Registerer to the scrape manager to collect metrics about scrapes. This PR disables the collection of these scrape metrics from the prometheus server. We did not use the default registry, so we were previously collecting these metrics and never exposing them. This PR passes a no-op registerer to prevent using memory to store those metrics. In the future, we can consider using the prometheus -> OTel bridge to export these with the self-observability pipeline.