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

feat: add k6 gRPC stream middleware #142

Merged
merged 1 commit into from
Mar 4, 2025

Conversation

devgianlu
Copy link
Contributor

@devgianlu devgianlu commented Feb 28, 2025

This PR adds a gRPC stream middleware to the K6 extension.

@devgianlu devgianlu requested review from a team as code owners February 28, 2025 11:01
@CLAassistant
Copy link

CLAassistant commented Feb 28, 2025

CLA assistant check
All committers have signed the CLA.

@CLAassistant
Copy link

CLA assistant check
Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you sign our Contributor License Agreement before we can accept your contribution.
You have signed the CLA already but the status is still pending? Let us recheck it.

Copy link
Contributor

@bryanhuhta bryanhuhta left a comment

Choose a reason for hiding this comment

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

Thanks for this contribution! You will need to sign the CLA before I can merge this.

The core change LGTM. Can you fix up the dependencies to get the test CI to run?

x/k6/go.mod Outdated
@@ -14,14 +14,15 @@ require (
require (
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/grafana/pyroscope-go/godeltaprof v0.1.8 // indirect
github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 // indirect
Copy link
Contributor

Choose a reason for hiding this comment

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

I think you need to do a go mod tidy on this, as github.com/grpc-ecosystem/go-grpc-middleware is a direct dependency.

Also, we need to use github.com/grpc-ecosystem/go-grpc-middleware/v2 instead, to avoid other dependency conflicts with google.golang.org/grpc.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Should be good now!

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Used the make target, should be good for real :)

Copy link
Contributor

Choose a reason for hiding this comment

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

Unfortunately the make target doesn't sync x/k6. See #142 (comment) for next steps to get CI to go green. I'll open a separate PR to improve the make target for the future.

@bryanhuhta bryanhuhta self-assigned this Feb 28, 2025
@devgianlu devgianlu force-pushed the k6-grpc-stream branch 2 times, most recently from 366421e to fd325af Compare February 28, 2025 19:19
@devgianlu
Copy link
Contributor Author

Thanks for this contribution! You will need to sign the CLA before I can merge this.

I have signed the CLA, not sure why it displays both signed and pending.

@bryanhuhta
Copy link
Contributor

@devgianlu I apologize for more book keeping requests, but it looks like github.com/grpc-ecosystem/go-grpc-middleware/[email protected] is requiring an update of github.com/stretchr/testify to v1.10.0 (formerly v1.9.0 was required by the project).

Would you be able to run go work sync inside ./x/k6?

After that, CI should go green and I can merge this 👍

@devgianlu
Copy link
Contributor Author

Third time's the charm?

@devgianlu
Copy link
Contributor Author

Synced github.com/grafana/pyroscope-go/godeltaprof/compat too

Copy link
Contributor

@bryanhuhta bryanhuhta 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 for this contribution 🎉

@bryanhuhta bryanhuhta merged commit 6825735 into grafana:main Mar 4, 2025
7 of 8 checks passed
@devgianlu devgianlu deleted the k6-grpc-stream branch March 4, 2025 16:22
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.

3 participants