Support keyword 'target' parameter when wrapping GRPC channels #946
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
|
@asnr For testing, can you factorize the test function and call it once with |
jd
suggested changes
May 20, 2019
|
@jd I've factorised one |
|
That's exactly what I meant, thanks @asnr |
jd
previously approved these changes
May 21, 2019
brettlangdon
previously approved these changes
May 21, 2019
ddtrace/contrib/grpc/patch.py
Outdated
| @@ -30,15 +30,25 @@ def unpatch(): | |||
|
|
|||
| def _insecure_channel_with_interceptor(wrapped, instance, args, kwargs): | |||
| channel = wrapped(*args, **kwargs) | |||
| target = args[0] | |||
|
|
|||
| if kwargs.get('target'): | |||
There was a problem hiding this comment.
We might want to do if 'target' in kwargs: instead. In case kwargs['target'] is falsey.
There was a problem hiding this comment.
Good call, I'll make that change.
jd
approved these changes
May 22, 2019
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.
The
targetfor a GRPC channel can be specified with a keyword argument instead of a positional argument in both the functiongrpc.insecure_channelandgrpc.secure_channel. See, for example, this usage in the official google pubsub client.Currently, the datadog patch only uses the positional argument to get the
targetparameter, which throws the following exception if the keyword argument is used by a client:For a simple example of client code that reproduces this error, see this gist.
Testing
I wasn't sure what the best way of testing this behaviour was. I settled on changing two existing tests to specify
targetusing a keyword argument, but there might be a better way. I'd be happy to hear any suggestions.