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

go.mod: upgrade prometheus, grpc, and protobuf #8411

Merged
merged 1 commit into from
Jul 6, 2021
Merged

go.mod: upgrade prometheus, grpc, and protobuf #8411

merged 1 commit into from
Jul 6, 2021

Conversation

derekperkins
Copy link
Member

@derekperkins derekperkins commented Jul 4, 2021 •
edited
Loading

it appears that the wrong log package got imported twice, and now that github.com/prometheus/common/log has been removed, it is blocking upgrades. I upgraded these two packages manually, which also upgraded grpc / protobuf. It probably needs a 👍 from @vmg to make sure that doesn't impact his work.

github.com/prometheus/common
github.com/grpc-ecosystem/go-grpc-prometheus

@derekperkins
go.mod: upgrade prometheus, grpc, and protobuf
caf0da5 
it appears that the wrong log package got imported twice, and now that github.com/prometheus/common/log has been removed, it is blocking upgrades

Signed-off-by: Derek Perkins <[email protected]>
@derekperkins derekperkins requested a review from vmg July 4, 2021 01:03
@derekperkins derekperkins added Component: Observability Pull requests that touch tracing/metrics/monitoring Type: Internal Cleanup labels Jul 4, 2021
@derekperkins
Copy link
Member Author

derekperkins commented Jul 4, 2021 •
edited
Loading

I've rerun the failing test about 10 times and it hasn't passed, but it also doesn't seem to be related to this.

--- FAIL: TestConsolidatorMemoryLimits (0.56s)
    --- FAIL: TestConsolidatorMemoryLimits/two-phase_consolidation_(time) (0.11s)
        stream_consolidator_test.go:339: 
            	Error Trace:	stream_consolidator_test.go:339
            	Error:      	Not equal: 
            	            	expected: 2
            	            	actual  : 1
            	Test:       	TestConsolidatorMemoryLimits/two-phase_consolidation_(time)

Finally passed after ~15 runs

vmg
vmg approved these changes Jul 6, 2021
View reviewed changes
Copy link
Collaborator

@vmg vmg left a comment

Choose a reason for hiding this comment

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

Oh nice, this includes my connerror fix in GRPC 1.39.0. A welcome upgrade!

@vmg vmg merged commit 94da78c into vitessio:main Jul 6, 2021
@derekperkins derekperkins deleted the upgrade-prometheus branch July 6, 2021 16:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@vmg vmg vmg approved these changes

@harshit-gangal harshit-gangal Awaiting requested review from harshit-gangal harshit-gangal is a code owner

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

Assignees
No one assigned
Labels
Component: Observability Pull requests that touch tracing/metrics/monitoring Type: Internal Cleanup
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@derekperkins @vmg