Skip to content

Conversation

krajorama
Copy link
Contributor

Ref: https://github.com/prometheus/client_golang/releases/tag/v1.20.5

Cherry-pick of upstream 4271670

Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com>
@krajorama krajorama enabled auto-merge October 16, 2024 13:51
@krajorama krajorama disabled auto-merge October 16, 2024 13:51
@krajorama krajorama enabled auto-merge (squash) October 16, 2024 13:52
@krajorama krajorama merged commit 5e9a771 into main Oct 16, 2024
9 checks passed
@krajorama krajorama deleted the krajo/update-client-golang branch October 16, 2024 14:03
krajorama added a commit to grafana/mimir that referenced this pull request Oct 16, 2024
To get grafana/mimir-prometheus#718
client_golang update to 1.20.5 to revert breaking changes to
test utils.

Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com>
krajorama added a commit to grafana/mimir that referenced this pull request Oct 16, 2024
* Test client_golang 1.20.5

Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com>

* Revert "Add tests for pkg/util/test.AssertGatherAndCompare (#9543)"

This reverts commit e78254e.

* Revert "Update module github.com/prometheus/client_golang to v1.20.4 (main) (#9307)"

This reverts commit cd1294b.

# Conflicts:
#	go.sum
#	vendor/github.com/prometheus/client_golang/prometheus/testutil/testutil.go
#	vendor/modules.txt

* Clear go.mod replace

Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com>

* Update mimir-prometheus at 5e9a771537ba

To get grafana/mimir-prometheus#718
client_golang update to 1.20.5 to revert breaking changes to
test utils.

Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com>

* Apply suggestions from code review

Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>

* Apply suggestions

Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com>

---------

Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants