Fix gRPC over cmux and add unit tests #1758
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Yuri Shkuro <ys@uber.com>
yurishkuro
requested review from
black-adder,
jpkrohling,
objectiser,
pavolloffay,
tiffon and
vprithvi
as code owners
annanay25
reviewed
Aug 25, 2019
cmd/query/app/server_test.go
Outdated
| server := NewServer(flagsSvc, querySvc, &QueryOptions{Port: ports.QueryAdminHTTP, | ||
| BearerTokenPropagation: true}, tracer) | ||
| server := NewServer(flagsSvc, querySvc, | ||
| &QueryOptions{Port: ports.QueryAdminHTTP, BearerTokenPropagation: true}, |
There was a problem hiding this comment.
Changing the listening port here to -
&QueryOptions{Port: ports.QueryHTTP, BearerTokenPropagation: true},
.. and using cmuxServer.MatchWithWriters(...) as suggested by @32leaves seems to work for me.
We definitely needed an integration test with cmux though, thanks for pointing out!
breaking change: grpc/grpc-go#2406 workaround described in: - soheilhy/cmux#64 - https://github.com/soheilhy/cmux#limitations Signed-off-by: Christian Weichel <christian.weichel@typefox.io>
Signed-off-by: Yuri Shkuro <ys@uber.com>
Signed-off-by: Yuri Shkuro <ys@uber.com>
Signed-off-by: Yuri Shkuro <ys@uber.com>
Signed-off-by: Yuri Shkuro <ys@uber.com>
Codecov Report
@@ Coverage Diff @@
## master #1758 +/- ##
==========================================
+ Coverage 98.26% 98.26% +<.01%
==========================================
Files 195 195
Lines 9533 9534 +1
==========================================
+ Hits 9368 9369 +1
Misses 131 131
Partials 34 34
Continue to review full report at Codecov.
|
|
@pavolloffay can you review? |
yurishkuro
changed the title
pavolloffay
approved these changes
Sep 2, 2019
bookmoons
pushed a commit
to bookmoons/jaeger
that referenced
this pull request
Sep 10, 2019
* Add unit test for gRPC over cmux Signed-off-by: Yuri Shkuro <ys@uber.com> * Fix tests Signed-off-by: Yuri Shkuro <ys@uber.com> * Fix gRPC query service cmux breaking change: grpc/grpc-go#2406 workaround described in: - soheilhy/cmux#64 - https://github.com/soheilhy/cmux#limitations Signed-off-by: Christian Weichel <christian.weichel@typefox.io> * Fix asertions Signed-off-by: Yuri Shkuro <ys@uber.com> * Use DialContext Signed-off-by: Yuri Shkuro <ys@uber.com> * Clean-up timeouts Signed-off-by: Yuri Shkuro <ys@uber.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Resolves #1754
Includes the main commit by @32leaves from #1756