open-telemetry
/
opentelemetry-java-instrumentation
mirror of https://github.com/open-telemetry/opentelemetry-java-instrumentation.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Simplify HttpUrlConnection instrumentation (#5673)

This commit is contained in:
Lauri Tulmin 2022-03-23 18:39:45 +02:00 committed by GitHub
parent 854f3eb3dc
commit 875b7fe3ad
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
instrumentation/http-url-connection/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/httpurlconnection/HttpUrlConnectionInstrumentation.java
View File

@ -69,10 +69,6 @@ public class HttpUrlConnectionInstrumentation implements TypeInstrumentation {
// top-level HttpURLConnection calls
return;
}
// double increment on first entry is used to prevent infinite recursion in case end()
// captures response headers due to HttpUrlConnection.getHeaderField() calling
// HttpUrlConnection.getInputStream() which then enters this advice again
callDepth.getAndIncrement();
Context parentContext = currentContext();
if (!instrumenter().shouldStart(parentContext, connection)) {
@ -108,16 +104,16 @@ public class HttpUrlConnectionInstrumentation implements TypeInstrumentation {
@Advice.Local("otelHttpUrlState") HttpUrlState httpUrlState,
@Advice.Local("otelScope") Scope scope,
@Advice.Local("otelCallDepth") CallDepth callDepth) {
// checking against 1 instead of against 0, because of the double increment which is used to
// prevent infinite recursion in case end() captures response headers
if (callDepth.decrementAndGet() > 1) {
if (callDepth.decrementAndGet() > 0) {
return;
}
if (scope == null) {
// need to perform the second decrement here since bailing out early
callDepth.decrementAndGet();
return;
}
// prevent infinite recursion in case end() captures response headers due to
// HttpUrlConnection.getHeaderField() calling HttpUrlConnection.getInputStream() which then
// enters this advice again
callDepth.getAndIncrement();
try {
scope.close();
@ -144,8 +140,6 @@ public class HttpUrlConnectionInstrumentation implements TypeInstrumentation {
httpUrlState.finished = true;
}
} finally {
// double increment is used to prevent infinite recursion in case end() captures response
// headers
callDepth.decrementAndGet();
}
}