Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Update Prometheus to latest #7115

Merged
merged 5 commits into from
Jan 17, 2022
Merged

Update Prometheus to latest #7115

merged 5 commits into from
Jan 17, 2022

Conversation

gouthamve
Copy link
Member

@gouthamve gouthamve commented Jan 10, 2022 •
edited by jpkrohling
Loading

This updates the Prometheus dependency to the latest version

This allows us to import some exporters as libraries into my own projects.

Closes #7162

Signed-off-by: Goutham Veeramachaneni gouthamve@gmail.com

@gouthamve gouthamve requested a review from a team January 10, 2022 12:36
@linux-foundation-easycla
Copy link

linux-foundation-easycla bot commented Jan 10, 2022 •
edited
Loading

CLA Signed

The committers are authorized under a signed CLA.

  • ✅ Goutham Veeramachaneni (422a931262d141c19ee78fc4d1d7fbf3d1c218c2)

@jpkrohling
Copy link
Member

@Aneurysm9, would you mind taking a look at this one?

dashpole
dashpole approved these changes Jan 10, 2022
View reviewed changes
Copy link
Contributor

@dashpole dashpole left a comment

Choose a reason for hiding this comment

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

As a note, this does not enable the new "extra scrape metrics": https://prometheus.io/docs/prometheus/latest/feature_flags/#extra-scrape-metrics, which could be done via scrape.Options{} in metrics_receiver.go.

@jpkrohling
Copy link
Member

@gouthamve, could you take a look at the CI failures?

@Aneurysm9
Copy link
Member

This requires updates to the go.mod files of each module using the new dependency.

What about the prometheusexporter?

@Aneurysm9
Copy link
Member

Please run make gotidy. That should fix the issues the CI process is having.

@Aneurysm9 Aneurysm9 mentioned this pull request Jan 13, 2022
Closed
@Aneurysm9 Aneurysm9 linked an issue Jan 13, 2022 that may be closed by this pull request
[prometheusreceiver] Update Prometheus libraries to latest versions in prometheus receivers. #7162
Closed
@jpkrohling jpkrohling added the Skip Changelog PRs that do not require a CHANGELOG.md entry label Jan 13, 2022
@jpkrohling
Copy link
Member

jpkrohling commented Jan 17, 2022 •
edited
Loading

Unfortunately, there are go.mod conflicts. Once they are fixed, I'll re-run the tests and merge on green.

@jpkrohling jpkrohling enabled auto-merge (squash) January 17, 2022 13:09
codeboten
codeboten reviewed Jan 17, 2022
View reviewed changes
Copy link
Contributor

@codeboten codeboten left a comment

Choose a reason for hiding this comment

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

Looks like it needs one more make gotidy

go test -race -v -timeout 300s --tags="" ./...
go: updates to go.mod needed; to update it:
	go mod tidy

auto-merge was automatically disabled January 17, 2022 16:50

Head branch was pushed to by a user without write access

@jpkrohling jpkrohling enabled auto-merge (squash) January 17, 2022 17:25
@gouthamve @jpkrohling
Update Prometheus to latest
ca70298 
This updates the Prometheus dependency to the latest version

This allows us to import some exporters as libraries into my own projects.

Signed-off-by: Goutham Veeramachaneni <gouthamve@gmail.com>
@gouthamve @jpkrohling
Update go.mod for all relevant modules
ec7159c 
Signed-off-by: Goutham Veeramachaneni <gouthamve@gmail.com>
@gouthamve @jpkrohling
More go.mod updates
18c821b 
Signed-off-by: Goutham Veeramachaneni <gouthamve@gmail.com>
@gouthamve @jpkrohling
Reduce timeout to interval to pass
dbc22c4 
Tests fail because of new check introduced by Prometheus:
https://github.com/prometheus/prometheus/blob/a56f2856ed91edbc2b12e02d8202d7f6620060ad/config/config.go#L288-L290

Signed-off-by: Goutham Veeramachaneni <gouthamve@gmail.com>
@gouthamve @jpkrohling
Hopefully last go mod update
a0d5c91 
Signed-off-by: Goutham Veeramachaneni <gouthamve@gmail.com>
@jpkrohling jpkrohling merged commit fff0a08 into open-telemetry:main Jan 17, 2022
@jpkrohling jpkrohling mentioned this pull request Jan 17, 2022
Merged
@gouthamve gouthamve mentioned this pull request Jun 21, 2022
Closed
6 tasks
animetauren pushed a commit to animetauren/opentelemetry-collector-contrib that referenced this pull request Apr 4, 2023
@dmitryax
[chore] [pdata] Add test coverage for slices Sort method (open-teleme…
0f6a174 
…try#7115)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@codeboten codeboten codeboten left review comments

@dashpole dashpole dashpole approved these changes

@Aneurysm9 Aneurysm9 Awaiting requested review from Aneurysm9

@jpkrohling jpkrohling Awaiting requested review from jpkrohling jpkrohling is a code owner

@alolita alolita Awaiting requested review from alolita

@anuraaga anuraaga Awaiting requested review from anuraaga

@dmitryax dmitryax Awaiting requested review from dmitryax

Assignees

@codeboten codeboten

Labels
Skip Changelog PRs that do not require a CHANGELOG.md entry
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

[prometheusreceiver] Update Prometheus libraries to latest versions in prometheus receivers.
5 participants
@gouthamve @jpkrohling @Aneurysm9 @codeboten @dashpole