-
Notifications
You must be signed in to change notification settings - Fork 4.9k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[chore] Update prometheus to match OTel v0.120.0 #42748
base: main
Are you sure you want to change the base?
[chore] Update prometheus to match OTel v0.120.0 #42748
Conversation
Update performed by running `go get github.com/prometheus/prometheus@v0.300.1` which matches https://github.com/elastic/elastic-agent/pull/6912/files#diff-33ef32bf6c23acb95f5902d7097b7a1d5128ca061167ec0716715b0b9eeaa5f6R496.
This pull request does not have a backport label.
To fixup this pull request, you need to add the backport labels for the needed
|
Pinging @elastic/elastic-agent-control-plane (Team:Elastic-Agent-Control-Plane) |
cc @blakerouse for 👀 as you created a similar PR before. |
Added `fallbackType == ""` and `skipOMCTSeries == false`. OMCT series are OpenMetrics CreatedTimestamp timeseries, and I believe the default for this is false.
I've pushed a commit to fix the compilation error by adding missing parameters to the See textparse.New@v0.54.1 (before this change) and textparse.New@v0.300.1 (after this change). I've set |
Pinging @elastic/elastic-agent-data-plane (Team:Elastic-Agent-Data-Plane) |
Pinging @elastic/obs-infraobs-integrations as they own the prometheus integration that depends on this and are most likely to know how to test any impact this might have. https://github.com/elastic/integrations/blob/119156a21359b7a56756e91743b18d6970b9c643/packages/prometheus/manifest.yml#L35 |
In https://github.com/elastic/beats/blob/26fecc126fe80b648471e401a7b175cf2165ab1b/metricbeat/mb/testing/testdata.go#L119C6-L119C23 the default content type is
is not supported as mediaType. For the same behaviour as in previous versions we could use |
…:andrzej-stencel/beats into update-prometheus-to-match-otel-v0.120.0
@pkoutsovasilis before we merge this, I have a concern regarding one test that is Flaky. The test timeouts and it is something that is never happening in the main branch. The test uses the The test breaks when one node loses the leader lock but stopLeading is not executed. That is weird and I tested multiple times and this signal is never received. |
Thanks for the heads up @MichaelKatsoulis! I saw the CI green and the code changes made sense to me thus I didn't assume that there isn't any Flaky tests in it 🙂 Please hold your horses people on merging this one. @MichaelKatsoulis please let us know when you are confident about this one |
applicationJson = "application/json" | ||
textPlain = "text/plain" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Not a big deal because it's a test, but why was the content type changed?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
#42748 (comment) looks like it explains this
@MichaelKatsoulis have you been able to reproduce this test failure locally? I tried on |
…:andrzej-stencel/beats into update-prometheus-to-match-otel-v0.120.0
@swiatekm
Also the PR ci was failing almost every time. Check one buildkite output that shows exactly that. I updated the test logic because I think it was faulty in the part that it was forcing the lease renewals. |
For me the PR is good to be merged! |
Proposed commit message
Update
github.com/prometheus/prometheus
dependency to v0.300.1by running
go get github.com/prometheus/prometheus@v0.300.1
.This version matches the version used in OTel v0.120.0,
and this update is needed to include OTel v0.120.0 in Elastic Agent.
See https://github.com/elastic/elastic-agent/pull/6912/files#diff-33ef32bf6c23acb95f5902d7097b7a1d5128ca061167ec0716715b0b9eeaa5f6R496.
Checklist
[ ] I have commented my code, particularly in hard-to-understand areas[ ] I have made corresponding changes to the documentation[ ] I have made corresponding change to the default configuration files[ ] I have added tests that prove my fix is effective or that my feature works[ ] I have added an entry inCHANGELOG.next.asciidoc
orCHANGELOG-developer.next.asciidoc
.