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.

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

Prometheus: Upgrades http client to 1.30 #53901

Merged
merged 1 commit into from Aug 18, 2022
Merged

Conversation

bergquist
Copy link
Contributor

@bergquist bergquist commented Aug 18, 2022

Creating a new PR was easier then resolving all merge conflicts in #47707

Contains the fix in prometheus/client_golang#1022

Signed-off-by: bergquist carl.bergquist@gmail.com

Signed-off-by: bergquist <carl.bergquist@gmail.com>
@bergquist bergquist added add to changelog backport v9.1.x Bot will automatically open backport PR labels Aug 18, 2022
@bergquist bergquist added this to the 9.2.0 milestone Aug 18, 2022
@bergquist bergquist requested a review from a team as a code owner August 18, 2022 14:52
@bergquist bergquist requested review from zserge, mildwonkey and yangkb09 and removed request for a team August 18, 2022 14:52
@bergquist bergquist changed the title Prometheus: upgrades http client to 1.30 Prometheus: Upgrades http client to 1.30 Aug 18, 2022
@bergquist bergquist enabled auto-merge (squash) August 18, 2022 14:58
Copy link
Contributor

@bboreham bboreham left a comment

Choose a reason for hiding this comment

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

PR LGTM, but there were a lot of changes between 12.1 and 13.0 of the Prometheus client library so I recommend careful testing.

@bergquist bergquist merged commit a746810 into main Aug 18, 2022
@bergquist bergquist deleted the upgrade_prom_client branch August 18, 2022 17:44
@grafanabot
Copy link
Contributor

The backport to v9.1.x failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new branch
git switch --create backport-53901-to-v9.1.x origin/v9.1.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x a74681036e1d455fee0543d1ae1481cee32f655d
# Push it to GitHub
git push --set-upstream origin backport-53901-to-v9.1.x
git switch main
# Remove the local backport branch
git branch -D backport-53901-to-v9.1.x

Then, create a pull request where the base branch is v9.1.x and the compare/head branch is backport-53901-to-v9.1.x.

@bergquist
Copy link
Contributor Author

Good point. lets run it internally for a while until we backport it to 9.1.x

@bergquist bergquist removed the backport v9.1.x Bot will automatically open backport PR label Aug 19, 2022
@bboreham
Copy link
Contributor

FYI prometheus/client_golang#1117

@hairyhenderson
Copy link
Member

prometheus/client_golang#1117 is fixed now, so we should wait for v1.13.1 (or whatever's next) before backporting

ryantxu pushed a commit that referenced this pull request Aug 22, 2022
Signed-off-by: bergquist <carl.bergquist@gmail.com>
@dsotirakis dsotirakis modified the milestones: 9.2.0, 9.2.0-beta1 Sep 22, 2022
@marefr marefr requested review from hairyhenderson and removed request for hairyhenderson November 7, 2022 17:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants