Fix integration with jersey-client 2.30 #2071
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
laurit
requested review from
anuraaga,
iNikem,
jkwatson,
mateuszrzeszutek,
trask and
tylerbenson
as code owners
mateuszrzeszutek
approved these changes
Jan 18, 2021
.../main/java/io/opentelemetry/javaagent/instrumentation/jaxrsclient/v2_0/JerseyClientUtil.java
Outdated
Show resolved
Hide resolved
laurit
changed the title
anuraaga
reviewed
Jan 19, 2021
| return future; | ||
| } | ||
|
|
||
| public static void handleException(ClientRequest context, Throwable exception) { |
There was a problem hiding this comment.
We generally add instrumentation-specific handling to the *Tracer classes themselves instead of separating utils, would that work here?
There was a problem hiding this comment.
Tracer class is in a different module jaxrs-client-2.0-common adding these methods there would also require moving WrappedFuture there. Adding a tracer to jaxrs-client-2.0-jersey-2.0 also doesn't seem like a good option because this module doesn't really have any specialised tracing code.
trask
approved these changes
Jan 19, 2021
.../jaxrs-client-2.0/jaxrs-client-2.0-common/javaagent/jaxrs-client-2.0-common-javaagent.gradle
Outdated
Show resolved
Hide resolved
…-common/javaagent/jaxrs-client-2.0-common-javaagent.gradle Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>
iNikem
approved these changes
Jan 19, 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.
Fixes #2031
We can't use WrappedFuture on jersey-client 2.30 as jersey-client attempts to cast it to CompletableFuture.