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

Fix gRPC over cmux and add unit tests #1758

Merged

Conversation

yurishkuro
Copy link
Member

@yurishkuro yurishkuro commented Aug 24, 2019

Resolves #1754

Includes the main commit by @32leaves from #1756

Signed-off-by: Yuri Shkuro <ys@uber.com>
server := NewServer(flagsSvc, querySvc, &QueryOptions{Port: ports.QueryAdminHTTP,
BearerTokenPropagation: true}, tracer)
server := NewServer(flagsSvc, querySvc,
&QueryOptions{Port: ports.QueryAdminHTTP, BearerTokenPropagation: true},
Copy link
Member

Choose a reason for hiding this comment

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

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!

Yuri Shkuro and others added 6 commits August 25, 2019 15:04
Signed-off-by: Yuri Shkuro <ys@uber.com>
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
Copy link

codecov bot commented Aug 25, 2019

Codecov Report

Merging #1758 into master will increase coverage by <.01%.
The diff coverage is 100%.

Impacted file tree graph

@@            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
Impacted Files Coverage Δ
cmd/query/app/server.go 90.9% <100%> (+0.13%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 4978c15...fecc9e9. Read the comment docs.

@yurishkuro
Copy link
Member Author

@pavolloffay can you review?

@yurishkuro yurishkuro changed the title Add unit test for gRPC over cmux Fix gRPC over cmux and add unit tests Aug 31, 2019
@pavolloffay pavolloffay mentioned this pull request Aug 31, 2019
1 task
@pavolloffay pavolloffay merged commit 701f138 into jaegertracing:master 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
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Cannot connect to query-service via gRPC
3 participants