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

Guard against null HttpContext (#6792) 

Resolves #6787

Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>
This commit is contained in:
jason plumb 2022-10-06 16:03:03 -07:00 committed by GitHub
parent f4c5719c99
commit d9b25d34df
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
instrumentation/apache-httpasyncclient-4.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpasyncclient/ApacheHttpAsyncClientInstrumentation.java
View File

@ -20,6 +20,7 @@ import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer; import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
import java.io.IOException; import java.io.IOException;
import java.util.logging.Logger; import java.util.logging.Logger;
import javax.annotation.Nullable;
import net.bytebuddy.asm.Advice; import net.bytebuddy.asm.Advice;
import net.bytebuddy.description.type.TypeDescription; import net.bytebuddy.description.type.TypeDescription;
import net.bytebuddy.matcher.ElementMatcher; import net.bytebuddy.matcher.ElementMatcher;
@ -148,7 +149,7 @@ public class ApacheHttpAsyncClientInstrumentation implements TypeInstrumentation
private static final Logger logger = Logger.getLogger(WrappedFutureCallback.class.getName()); private static final Logger logger = Logger.getLogger(WrappedFutureCallback.class.getName());
private final Context parentContext; private final Context parentContext;
private final HttpContext httpContext; @Nullable private final HttpContext httpContext;
private final FutureCallback<T> delegate; private final FutureCallback<T> delegate;
private volatile Context context; private volatile Context context;
@ -171,7 +172,7 @@ public class ApacheHttpAsyncClientInstrumentation implements TypeInstrumentation
return; return;
} }
instrumenter().end(context, otelRequest, getResponse(httpContext), null); instrumenter().end(context, otelRequest, getResponseFromHttpContext(), null);
if (parentContext == null) { if (parentContext == null) {
completeDelegate(result); completeDelegate(result);
@ -193,7 +194,7 @@ public class ApacheHttpAsyncClientInstrumentation implements TypeInstrumentation
} }
// end span before calling delegate // end span before calling delegate
instrumenter().end(context, otelRequest, getResponse(httpContext), ex); instrumenter().end(context, otelRequest, getResponseFromHttpContext(), ex);
if (parentContext == null) { if (parentContext == null) {
failDelegate(ex); failDelegate(ex);
@ -216,7 +217,7 @@ public class ApacheHttpAsyncClientInstrumentation implements TypeInstrumentation
// TODO (trask) add "canceled" span attribute // TODO (trask) add "canceled" span attribute
// end span before calling delegate // end span before calling delegate
instrumenter().end(context, otelRequest, getResponse(httpContext), null); instrumenter().end(context, otelRequest, getResponseFromHttpContext(), null);
if (parentContext == null) { if (parentContext == null) {
cancelDelegate(); cancelDelegate();
@ -246,8 +247,12 @@ public class ApacheHttpAsyncClientInstrumentation implements TypeInstrumentation
} }
} }
private static HttpResponse getResponse(HttpContext context) { @Nullable
return (HttpResponse) context.getAttribute(HttpCoreContext.HTTP_RESPONSE); private HttpResponse getResponseFromHttpContext() {
if (httpContext == null) {
return null;
}
return (HttpResponse) httpContext.getAttribute(HttpCoreContext.HTTP_RESPONSE);
} }
} }
} }

18
instrumentation/apache-httpclient/apache-httpclient-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v5_0/ApacheHttpAsyncClientInstrumentation.java
View File

@ -21,6 +21,7 @@ import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer; import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
import java.io.IOException; import java.io.IOException;
import java.util.logging.Logger; import java.util.logging.Logger;
import javax.annotation.Nullable;
import net.bytebuddy.asm.Advice; import net.bytebuddy.asm.Advice;
import net.bytebuddy.description.type.TypeDescription; import net.bytebuddy.description.type.TypeDescription;
import net.bytebuddy.matcher.ElementMatcher; import net.bytebuddy.matcher.ElementMatcher;
@ -32,6 +33,7 @@ import org.apache.hc.core5.http.HttpResponse;
import org.apache.hc.core5.http.nio.AsyncRequestProducer; import org.apache.hc.core5.http.nio.AsyncRequestProducer;
import org.apache.hc.core5.http.nio.DataStreamChannel; import org.apache.hc.core5.http.nio.DataStreamChannel;
import org.apache.hc.core5.http.nio.RequestChannel; import org.apache.hc.core5.http.nio.RequestChannel;
import org.apache.hc.core5.http.protocol.BasicHttpContext;
import org.apache.hc.core5.http.protocol.HttpContext; import org.apache.hc.core5.http.protocol.HttpContext;
import org.apache.hc.core5.http.protocol.HttpCoreContext; import org.apache.hc.core5.http.protocol.HttpCoreContext;
@ -67,10 +69,13 @@ class ApacheHttpAsyncClientInstrumentation implements TypeInstrumentation {
@Advice.OnMethodEnter(suppress = Throwable.class) @Advice.OnMethodEnter(suppress = Throwable.class)
public static void methodEnter( public static void methodEnter(
@Advice.Argument(value = 0, readOnly = false) AsyncRequestProducer requestProducer, @Advice.Argument(value = 0, readOnly = false) AsyncRequestProducer requestProducer,
@Advice.Argument(3) HttpContext httpContext, @Advice.Argument(value = 3, readOnly = false) HttpContext httpContext,
@Advice.Argument(value = 4, readOnly = false) FutureCallback<?> futureCallback) { @Advice.Argument(value = 4, readOnly = false) FutureCallback<?> futureCallback) {
Context parentContext = currentContext(); Context parentContext = currentContext();
if (httpContext == null) {
httpContext = new BasicHttpContext();
}
WrappedFutureCallback<?> wrappedFutureCallback = WrappedFutureCallback<?> wrappedFutureCallback =
new WrappedFutureCallback<>(parentContext, httpContext, futureCallback); new WrappedFutureCallback<>(parentContext, httpContext, futureCallback);
@ -182,7 +187,7 @@ class ApacheHttpAsyncClientInstrumentation implements TypeInstrumentation {
return; return;
} }
instrumenter().end(context, httpRequest, getResponse(httpContext), null); instrumenter().end(context, httpRequest, getResponseFromHttpContext(), null);
if (parentContext == null) { if (parentContext == null) {
completeDelegate(result); completeDelegate(result);
@ -204,7 +209,7 @@ class ApacheHttpAsyncClientInstrumentation implements TypeInstrumentation {
} }
// end span before calling delegate // end span before calling delegate
instrumenter().end(context, httpRequest, getResponse(httpContext), ex); instrumenter().end(context, httpRequest, getResponseFromHttpContext(), ex);
if (parentContext == null) { if (parentContext == null) {
failDelegate(ex); failDelegate(ex);
@ -227,7 +232,7 @@ class ApacheHttpAsyncClientInstrumentation implements TypeInstrumentation {
// TODO (trask) add "canceled" span attribute // TODO (trask) add "canceled" span attribute
// end span before calling delegate // end span before calling delegate
instrumenter().end(context, httpRequest, getResponse(httpContext), null); instrumenter().end(context, httpRequest, getResponseFromHttpContext(), null);
if (parentContext == null) { if (parentContext == null) {
cancelDelegate(); cancelDelegate();
@ -257,8 +262,9 @@ class ApacheHttpAsyncClientInstrumentation implements TypeInstrumentation {
} }
} }
private static HttpResponse getResponse(HttpContext context) { @Nullable
return (HttpResponse) context.getAttribute(HttpCoreContext.HTTP_RESPONSE); private HttpResponse getResponseFromHttpContext() {
return (HttpResponse) httpContext.getAttribute(HttpCoreContext.HTTP_RESPONSE);
} }
} }
} }