migrate more http clients to indy-ready #13897
Merged
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
…nstrumentation into indy-migration-2
…nstrumentation into indy-migration-2
…nstrumentation into indy-migration-2
SylvainJuge
changed the title
SylvainJuge
commented
May 23, 2025
| @SuppressWarnings("unused") | ||
| public static class JettyHttpClient12SendAdvice { | ||
|
|
||
| public static class AdviceLocals { |
Contributor
Author
There was a problem hiding this comment.
[for reviewer] when leaving it as "locals storage" only, we keep the AdviceLocals class name, we could also use the AdviceScope like in other places for consistency.
Contributor
There was a problem hiding this comment.
I prefer to keep it as AdviceLocals in this case.
Contributor
Author
There was a problem hiding this comment.
I agree with you on keeping the naming AdviceLocals here when it's just a way to carry the previously advice-local variables, what I meant was more: should we make this an AdviceScope, including moving parts of the logic from advice code ?
| public final Context context; | ||
| public final Scope scope; | ||
|
|
||
| public AdviceLocals(Context context, Scope scope) { |
Contributor
Author
There was a problem hiding this comment.
[for reviewer] same here we could migrate this to AdviceScope for better consistency with other changes.
JonasKunz
reviewed
May 26, 2025
.../opentelemetry/javaagent/instrumentation/asynchttpclient/v1_9/AsyncHttpClientSingletons.java
Outdated
Show resolved
Hide resolved
.../opentelemetry/javaagent/instrumentation/asynchttpclient/v1_9/AsyncHttpClientSingletons.java
Outdated
Show resolved
Hide resolved
.../opentelemetry/javaagent/instrumentation/asynchttpclient/v2_0/AsyncHttpClientSingletons.java
Outdated
Show resolved
Hide resolved
...entelemetry/javaagent/instrumentation/googlehttpclient/GoogleHttpRequestInstrumentation.java
Outdated
Show resolved
Hide resolved
...entelemetry/javaagent/instrumentation/googlehttpclient/GoogleHttpRequestInstrumentation.java
Outdated
Show resolved
Hide resolved
...ava/io/opentelemetry/javaagent/instrumentation/javahttpclient/HttpClientInstrumentation.java
Outdated
Show resolved
Hide resolved
...ava/io/opentelemetry/javaagent/instrumentation/javahttpclient/HttpClientInstrumentation.java
Outdated
Show resolved
Hide resolved
...ava/io/opentelemetry/javaagent/instrumentation/javahttpclient/HttpClientInstrumentation.java
Outdated
Show resolved
Hide resolved
| @SuppressWarnings("unused") | ||
| public static class JettyHttpClient12SendAdvice { | ||
|
|
||
| public static class AdviceLocals { |
Contributor
There was a problem hiding this comment.
I prefer to keep it as AdviceLocals in this case.
...lemetry/javaagent/instrumentation/jetty/httpclient/v9_2/JettyHttpClient9Instrumentation.java
Outdated
Show resolved
Hide resolved
SylvainJuge
commented
May 26, 2025
Comment on lines
114
to
137
| public boolean end(@Nullable HttpResponse<?> response, @Nullable Throwable throwable) { | ||
| // non-null call depth only used for async to prevent recursion | ||
| if (callDepth != null) { | ||
| if (callDepth.decrementAndGet() > 0) { | ||
| // async end nested call | ||
| return false; | ||
| } | ||
|
|
||
| scope.close(); | ||
| if (throwable != null) { | ||
| // async end with exception: ending span and no wrapping needed | ||
| instrumenter().end(context, request, response, throwable); | ||
| return false; | ||
| } | ||
|
|
||
| // async end without exception: | ||
| return true; | ||
| } | ||
|
|
||
| // synchronous end | ||
| scope.close(); | ||
| instrumenter().end(context, httpRequest, httpResponse, throwable); | ||
| instrumenter().end(context, request, response, throwable); | ||
| return false; | ||
| } |
Contributor
Author
There was a problem hiding this comment.
making a single end method requires to handle both the synchronous and asynchronous cases here, we use the fact that callDepth is null when doing synchronous calls and not when doing asynchronous calls.
laurit
reviewed
May 27, 2025
...entelemetry/javaagent/instrumentation/googlehttpclient/GoogleHttpRequestInstrumentation.java
Outdated
Show resolved
Hide resolved
laurit
reviewed
May 27, 2025
...telemetry/javaagent/instrumentation/asynchttpclient/v2_0/AsyncHttpClientInstrumentation.java
Outdated
Show resolved
Hide resolved
laurit
reviewed
May 27, 2025
...io/opentelemetry/javaagent/instrumentation/asynchttpclient/v1_9/ResponseInstrumentation.java
Outdated
Show resolved
Hide resolved
laurit
reviewed
May 27, 2025
...nt/instrumentation/jetty/httpclient/v12_0/JettyClient12ResponseListenersInstrumentation.java
Show resolved
Hide resolved
laurit
reviewed
May 27, 2025
...nt/instrumentation/jetty/httpclient/v12_0/JettyClient12ResponseListenersInstrumentation.java
Show resolved
Hide resolved
laurit
reviewed
May 27, 2025
...nt/instrumentation/jetty/httpclient/v12_0/JettyClient12ResponseListenersInstrumentation.java
Show resolved
Hide resolved
Co-authored-by: Lauri Tulmin <[email protected]>
laurit
reviewed
May 27, 2025
...nt/instrumentation/jetty/httpclient/v12_0/JettyClient12ResponseListenersInstrumentation.java
Outdated
Show resolved
Hide resolved
laurit
reviewed
May 27, 2025
...metry/javaagent/instrumentation/jetty/httpclient/v12_0/JettyHttpClient12Instrumentation.java
Outdated
Show resolved
Hide resolved
laurit
reviewed
May 27, 2025
| @Advice.Local("otelScope") Scope scope) { | ||
| if (scope == null) { | ||
| @Advice.Enter @Nullable AdviceLocals locals) { | ||
|
|
laurit
reviewed
May 27, 2025
...metry/javaagent/instrumentation/jetty/httpclient/v12_0/JettyHttpClient12Instrumentation.java
Outdated
Show resolved
Hide resolved
laurit
reviewed
May 27, 2025
...lemetry/javaagent/instrumentation/jetty/httpclient/v9_2/JettyHttpClient9Instrumentation.java
Outdated
Show resolved
Hide resolved
laurit
reviewed
May 27, 2025
...lemetry/javaagent/instrumentation/jetty/httpclient/v9_2/JettyHttpClient9Instrumentation.java
Outdated
Show resolved
Hide resolved
Co-authored-by: Lauri Tulmin <[email protected]>
…nstrumentation into indy-migration-2
laurit
reviewed
May 27, 2025
...ava/io/opentelemetry/javaagent/instrumentation/javahttpclient/HttpClientInstrumentation.java
Outdated
Show resolved
Hide resolved
…nt/src/main/java/io/opentelemetry/javaagent/instrumentation/jetty/httpclient/v12_0/JettyClient12ResponseListenersInstrumentation.java Co-authored-by: Lauri Tulmin <[email protected]>
…nt/src/main/java/io/opentelemetry/javaagent/instrumentation/jetty/httpclient/v12_0/JettyHttpClient12Instrumentation.java Co-authored-by: Lauri Tulmin <[email protected]>
…nt/src/main/java/io/opentelemetry/javaagent/instrumentation/jetty/httpclient/v12_0/JettyHttpClient12Instrumentation.java Co-authored-by: Lauri Tulmin <[email protected]>
…nstrumentation into indy-migration-2
laurit
approved these changes
May 29, 2025
jackshirazi
approved these changes
May 29, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
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.
Migrate the following http clients instrumentations to be indy-ready:
async-http-clientgoogle-http-clientjava-http-clientjetty-httpclientpart of #13031