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

chore(deps): vendor update mimir-prometheus at 5e9a771537ba #9622

Merged
merged 8 commits into from
Oct 16, 2024
Merged

chore(deps): vendor update mimir-prometheus at 5e9a771537ba #9622

merged 8 commits into from
Oct 16, 2024

Conversation

krajorama
Copy link
Contributor

@krajorama krajorama commented Oct 15, 2024 •
edited
Loading

What this PR does

Get https://github.com/prometheus/client_golang/releases/tag/v1.20.5
Reverts #9543
Reverts #9307

Which issue(s) this PR fixes or relates to

N/A

Checklist

  • Tests updated.
  • Documentation added.
  • CHANGELOG.md updated - the order of entries should be [CHANGE], [FEATURE], [ENHANCEMENT], [BUGFIX].
  • about-versioning.md updated with experimental features.

krajorama and others added 3 commits October 15, 2024 10:59
@krajorama
Test client_golang 1.20.5
5c6bd74 
Signed-off-by: György Krajcsovits <[email protected]>
@krajorama
Revert "Add tests for pkg/util/test.AssertGatherAndCompare (#9543)"
8478fdc 
This reverts commit e78254e.
@renovate @krajorama
Revert "Update module github.com/prometheus/client_golang to v1.20.4 …
a4b9d32 
…(main) (#9307)"

This reverts commit cd1294b.

# Conflicts:
#	go.sum
#	vendor/github.com/prometheus/client_golang/prometheus/testutil/testutil.go
#	vendor/modules.txt
@krajorama krajorama requested review from stevesg, grafanabot and a team as code owners October 15, 2024 09:04
@krajorama krajorama marked this pull request as draft October 15, 2024 09:04
@krajorama krajorama mentioned this pull request Oct 15, 2024
Closed
4 tasks
@krajorama
Clear go.mod replace
0c69d9a 
Signed-off-by: György Krajcsovits <[email protected]>
@krajorama
Merge branch 'main' into krajo/test-client-golang-1.20.5
24ca009
@krajorama
Update mimir-prometheus at 5e9a771537ba
c39087e 
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 <[email protected]>
@krajorama krajorama changed the title Krajo/test client golang 1.20.5 chore(deps): vendor update mimir-prometheus at 5e9a771537ba Oct 16, 2024
@krajorama krajorama marked this pull request as ready for review October 16, 2024 14:26
aknuds1
aknuds1 reviewed Oct 16, 2024
View reviewed changes
Copy link
Contributor

@aknuds1 aknuds1 left a comment

Choose a reason for hiding this comment

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

Please see comments.

pkg/ingester/ingester_test.go Outdated Show resolved Hide resolved
pkg/querier/tenantfederation/merge_queryable_test.go Outdated Show resolved Hide resolved
pkg/querier/tenantfederation/merge_queryable_test.go Outdated Show resolved Hide resolved
pkg/querier/tenantfederation/merge_queryable_test.go Outdated Show resolved Hide resolved
pkg/storage/ingest/partition_offset_client_test.go Outdated Show resolved Hide resolved
krajorama and others added 2 commits October 16, 2024 16:52
@krajorama @aknuds1
Apply suggestions from code review
bed59db 
Co-authored-by: Arve Knudsen <[email protected]>
@krajorama
Apply suggestions
b15e54f 
Signed-off-by: György Krajcsovits <[email protected]>
aknuds1
aknuds1 approved these changes Oct 16, 2024
View reviewed changes
Copy link
Contributor

@aknuds1 aknuds1 left a comment

Choose a reason for hiding this comment

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

LGTM, thanks!

@krajorama krajorama merged commit c17264e into main Oct 16, 2024
29 checks passed
@krajorama krajorama deleted the krajo/test-client-golang-1.20.5 branch October 16, 2024 15:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@aknuds1 aknuds1 aknuds1 approved these changes

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

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

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@krajorama @aknuds1