fix(grpc): parse target for ipv6 and missing port (backport #2298) #2431
Conversation
This file contains hidden or 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
* fix(grpc): add snapshot test for method service metadata * revert change to host parsing * fix(grpc): parse target for ipv6 and missing port Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> (cherry picked from commit de40640) # Conflicts: # ddtrace/contrib/grpc/client_interceptor.py # ddtrace/contrib/grpc/utils.py # tests/contrib/grpc/test_grpc.py # tests/snapshots/tests.contrib.grpc.test_grpc.test_method_service.snap
4 tasks
jd
suggested changes
May 12, 2021
Contributor
Author
|
@mergify[bot] this pull request is now in conflict 😩 |
Co-authored-by: Julien Danjou <julien.danjou@datadoghq.com>
P403n1x87
previously approved these changes
May 13, 2021
brettlangdon
previously approved these changes
May 13, 2021
Member
|
hmm looks like there's another backport needed.. |
Member
|
Ah it's the internalization of compat - I think we can just use the public compat module |
majorgreys
force-pushed
the
mergify/bp/0.48/pr-2298
branch
from
0b5a1a0 to
8eabcd8
Compare
Kyle-Verhoog
approved these changes
May 13, 2021
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.
This is an automatic backport of pull request #2298 done by Mergify.
Cherry-pick of de40640 has failed:
To fix up this pull request, you can check it out locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/
Mergify commands and options
More conditions and actions can be found in the documentation.
You can also trigger Mergify actions by commenting on this pull request:
@Mergifyio refreshwill re-evaluate the rules@Mergifyio rebasewill rebase this PR on its base branch@Mergifyio updatewill merge the base branch into this PR@Mergifyio backport <destination>will backport this PR on<destination>branchAdditionally, on Mergify dashboard you can:
Finally, you can contact us on https://mergify.io/