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

Merge pull request #316 from DataDog/tyler/async-flag 

Enable async tracking for some non-async frameworks
This commit is contained in:
Tyler Benson 2018-05-11 09:30:17 +10:00 committed by GitHub
parent dbaea3f41a b9db79e251
commit 632d9b8da4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 61 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dd-java-agent/instrumentation/jetty-8/src/main/java/datadog/trace/instrumentation/jetty8/HandlerInstrumentation.java
View File

@ -15,6 +15,7 @@ import datadog.trace.agent.tooling.HelperInjector;
import datadog.trace.agent.tooling.Instrumenter; import datadog.trace.agent.tooling.Instrumenter;
import datadog.trace.api.DDSpanTypes; import datadog.trace.api.DDSpanTypes;
import datadog.trace.api.DDTags; import datadog.trace.api.DDTags;
import datadog.trace.context.TraceScope;
import io.opentracing.Scope; import io.opentracing.Scope;
import io.opentracing.Span; import io.opentracing.Span;
import io.opentracing.SpanContext; import io.opentracing.SpanContext;
@ -94,6 +95,10 @@ public final class HandlerInstrumentation extends Instrumenter.Configurable {
.withTag("span.origin.type", source.getClass().getName()) .withTag("span.origin.type", source.getClass().getName())
.startActive(false); .startActive(false);
if (scope instanceof TraceScope) {
((TraceScope) scope).setAsyncPropagation(true);
}
final Span span = scope.span(); final Span span = scope.span();
Tags.HTTP_METHOD.set(span, req.getMethod()); Tags.HTTP_METHOD.set(span, req.getMethod());
Tags.HTTP_URL.set(span, req.getRequestURL().toString()); Tags.HTTP_URL.set(span, req.getRequestURL().toString());

28
dd-java-agent/instrumentation/jms-1/src/main/java/datadog/trace/instrumentation/jms1/JMS1MessageListenerInstrumentation.java
View File

@ -17,6 +17,7 @@ import datadog.trace.agent.tooling.DDTransformers;
import datadog.trace.agent.tooling.Instrumenter; import datadog.trace.agent.tooling.Instrumenter;
import datadog.trace.api.DDSpanTypes; import datadog.trace.api.DDSpanTypes;
import datadog.trace.api.DDTags; import datadog.trace.api.DDTags;
import datadog.trace.context.TraceScope;
import datadog.trace.instrumentation.jms.util.MessagePropertyTextMap; import datadog.trace.instrumentation.jms.util.MessagePropertyTextMap;
import io.opentracing.Scope; import io.opentracing.Scope;
import io.opentracing.Span; import io.opentracing.Span;
@ -64,16 +65,23 @@ public final class JMS1MessageListenerInstrumentation extends Instrumenter.Confi
final SpanContext extractedContext = final SpanContext extractedContext =
GlobalTracer.get().extract(Format.Builtin.TEXT_MAP, new MessagePropertyTextMap(message)); GlobalTracer.get().extract(Format.Builtin.TEXT_MAP, new MessagePropertyTextMap(message));
return GlobalTracer.get() final Scope scope =
.buildSpan("jms.onMessage") GlobalTracer.get()
.asChildOf(extractedContext) .buildSpan("jms.onMessage")
.withTag(DDTags.SERVICE_NAME, "jms") .asChildOf(extractedContext)
.withTag(DDTags.SPAN_TYPE, DDSpanTypes.MESSAGE_CONSUMER) .withTag(DDTags.SERVICE_NAME, "jms")
.withTag(DDTags.RESOURCE_NAME, "Received from " + toResourceName(message, null)) .withTag(DDTags.SPAN_TYPE, DDSpanTypes.MESSAGE_CONSUMER)
.withTag(Tags.COMPONENT.getKey(), "jms1") .withTag(DDTags.RESOURCE_NAME, "Received from " + toResourceName(message, null))
.withTag(Tags.SPAN_KIND.getKey(), Tags.SPAN_KIND_CONSUMER) .withTag(Tags.COMPONENT.getKey(), "jms1")
.withTag("span.origin.type", listener.getClass().getName()) .withTag(Tags.SPAN_KIND.getKey(), Tags.SPAN_KIND_CONSUMER)
.startActive(true); .withTag("span.origin.type", listener.getClass().getName())
.startActive(true);
if (scope instanceof TraceScope) {
((TraceScope) scope).setAsyncPropagation(true);
}
return scope;
} }
@Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)

28
dd-java-agent/instrumentation/jms-2/src/main/java/datadog/trace/instrumentation/jms2/JMS2MessageListenerInstrumentation.java
View File

@ -17,6 +17,7 @@ import datadog.trace.agent.tooling.DDTransformers;
import datadog.trace.agent.tooling.Instrumenter; import datadog.trace.agent.tooling.Instrumenter;
import datadog.trace.api.DDSpanTypes; import datadog.trace.api.DDSpanTypes;
import datadog.trace.api.DDTags; import datadog.trace.api.DDTags;
import datadog.trace.context.TraceScope;
import datadog.trace.instrumentation.jms.util.MessagePropertyTextMap; import datadog.trace.instrumentation.jms.util.MessagePropertyTextMap;
import io.opentracing.Scope; import io.opentracing.Scope;
import io.opentracing.Span; import io.opentracing.Span;
@ -64,16 +65,23 @@ public final class JMS2MessageListenerInstrumentation extends Instrumenter.Confi
final SpanContext extractedContext = final SpanContext extractedContext =
GlobalTracer.get().extract(Format.Builtin.TEXT_MAP, new MessagePropertyTextMap(message)); GlobalTracer.get().extract(Format.Builtin.TEXT_MAP, new MessagePropertyTextMap(message));
return GlobalTracer.get() final Scope scope =
.buildSpan("jms.onMessage") GlobalTracer.get()
.asChildOf(extractedContext) .buildSpan("jms.onMessage")
.withTag(DDTags.SERVICE_NAME, "jms") .asChildOf(extractedContext)
.withTag(DDTags.SPAN_TYPE, DDSpanTypes.MESSAGE_CONSUMER) .withTag(DDTags.SERVICE_NAME, "jms")
.withTag(DDTags.RESOURCE_NAME, "Received from " + toResourceName(message, null)) .withTag(DDTags.SPAN_TYPE, DDSpanTypes.MESSAGE_CONSUMER)
.withTag(Tags.COMPONENT.getKey(), "jms2") .withTag(DDTags.RESOURCE_NAME, "Received from " + toResourceName(message, null))
.withTag(Tags.SPAN_KIND.getKey(), Tags.SPAN_KIND_CONSUMER) .withTag(Tags.COMPONENT.getKey(), "jms2")
.withTag("span.origin.type", listener.getClass().getName()) .withTag(Tags.SPAN_KIND.getKey(), Tags.SPAN_KIND_CONSUMER)
.startActive(true); .withTag("span.origin.type", listener.getClass().getName())
.startActive(true);
if (scope instanceof TraceScope) {
((TraceScope) scope).setAsyncPropagation(true);
}
return scope;
} }
@Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)

5
dd-java-agent/instrumentation/servlet-2/src/main/java/datadog/trace/instrumentation/servlet2/FilterChain2Instrumentation.java
View File

@ -16,6 +16,7 @@ import datadog.trace.agent.tooling.DDTransformers;
import datadog.trace.agent.tooling.Instrumenter; import datadog.trace.agent.tooling.Instrumenter;
import datadog.trace.api.DDSpanTypes; import datadog.trace.api.DDSpanTypes;
import datadog.trace.api.DDTags; import datadog.trace.api.DDTags;
import datadog.trace.context.TraceScope;
import io.opentracing.Scope; import io.opentracing.Scope;
import io.opentracing.Span; import io.opentracing.Span;
import io.opentracing.SpanContext; import io.opentracing.SpanContext;
@ -84,6 +85,10 @@ public final class FilterChain2Instrumentation extends Instrumenter.Configurable
.withTag(DDTags.SPAN_TYPE, DDSpanTypes.WEB_SERVLET) .withTag(DDTags.SPAN_TYPE, DDSpanTypes.WEB_SERVLET)
.startActive(true); .startActive(true);
if (scope instanceof TraceScope) {
((TraceScope) scope).setAsyncPropagation(true);
}
final Span span = scope.span(); final Span span = scope.span();
Tags.COMPONENT.set(span, "java-web-servlet"); Tags.COMPONENT.set(span, "java-web-servlet");
Tags.HTTP_METHOD.set(span, ((HttpServletRequest) req).getMethod()); Tags.HTTP_METHOD.set(span, ((HttpServletRequest) req).getMethod());

5
dd-java-agent/instrumentation/servlet-2/src/main/java/datadog/trace/instrumentation/servlet2/HttpServlet2Instrumentation.java
View File

@ -17,6 +17,7 @@ import datadog.trace.agent.tooling.HelperInjector;
import datadog.trace.agent.tooling.Instrumenter; import datadog.trace.agent.tooling.Instrumenter;
import datadog.trace.api.DDSpanTypes; import datadog.trace.api.DDSpanTypes;
import datadog.trace.api.DDTags; import datadog.trace.api.DDTags;
import datadog.trace.context.TraceScope;
import io.opentracing.Scope; import io.opentracing.Scope;
import io.opentracing.Span; import io.opentracing.Span;
import io.opentracing.SpanContext; import io.opentracing.SpanContext;
@ -86,6 +87,10 @@ public final class HttpServlet2Instrumentation extends Instrumenter.Configurable
.withTag(DDTags.SPAN_TYPE, DDSpanTypes.WEB_SERVLET) .withTag(DDTags.SPAN_TYPE, DDSpanTypes.WEB_SERVLET)
.startActive(true); .startActive(true);
if (scope instanceof TraceScope) {
((TraceScope) scope).setAsyncPropagation(true);
}
final Span span = scope.span(); final Span span = scope.span();
Tags.COMPONENT.set(span, "java-web-servlet"); Tags.COMPONENT.set(span, "java-web-servlet");
Tags.HTTP_METHOD.set(span, req.getMethod()); Tags.HTTP_METHOD.set(span, req.getMethod());

5
dd-java-agent/instrumentation/servlet-3/src/main/java/datadog/trace/instrumentation/servlet3/FilterChain3Instrumentation.java
View File

@ -17,6 +17,7 @@ import datadog.trace.agent.tooling.HelperInjector;
import datadog.trace.agent.tooling.Instrumenter; import datadog.trace.agent.tooling.Instrumenter;
import datadog.trace.api.DDSpanTypes; import datadog.trace.api.DDSpanTypes;
import datadog.trace.api.DDTags; import datadog.trace.api.DDTags;
import datadog.trace.context.TraceScope;
import io.opentracing.Scope; import io.opentracing.Scope;
import io.opentracing.Span; import io.opentracing.Span;
import io.opentracing.SpanContext; import io.opentracing.SpanContext;
@ -89,6 +90,10 @@ public final class FilterChain3Instrumentation extends Instrumenter.Configurable
.withTag(DDTags.SPAN_TYPE, DDSpanTypes.WEB_SERVLET) .withTag(DDTags.SPAN_TYPE, DDSpanTypes.WEB_SERVLET)
.startActive(false); .startActive(false);
if (scope instanceof TraceScope) {
((TraceScope) scope).setAsyncPropagation(true);
}
final Span span = scope.span(); final Span span = scope.span();
Tags.COMPONENT.set(span, "java-web-servlet"); Tags.COMPONENT.set(span, "java-web-servlet");
Tags.HTTP_METHOD.set(span, ((HttpServletRequest) req).getMethod()); Tags.HTTP_METHOD.set(span, ((HttpServletRequest) req).getMethod());

5
dd-java-agent/instrumentation/servlet-3/src/main/java/datadog/trace/instrumentation/servlet3/HttpServlet3Instrumentation.java
View File

@ -17,6 +17,7 @@ import datadog.trace.agent.tooling.HelperInjector;
import datadog.trace.agent.tooling.Instrumenter; import datadog.trace.agent.tooling.Instrumenter;
import datadog.trace.api.DDSpanTypes; import datadog.trace.api.DDSpanTypes;
import datadog.trace.api.DDTags; import datadog.trace.api.DDTags;
import datadog.trace.context.TraceScope;
import io.opentracing.Scope; import io.opentracing.Scope;
import io.opentracing.Span; import io.opentracing.Span;
import io.opentracing.SpanContext; import io.opentracing.SpanContext;
@ -85,6 +86,10 @@ public final class HttpServlet3Instrumentation extends Instrumenter.Configurable
.withTag(DDTags.SPAN_TYPE, DDSpanTypes.WEB_SERVLET) .withTag(DDTags.SPAN_TYPE, DDSpanTypes.WEB_SERVLET)
.startActive(false); .startActive(false);
if (scope instanceof TraceScope) {
((TraceScope) scope).setAsyncPropagation(true);
}
final Span span = scope.span(); final Span span = scope.span();
Tags.COMPONENT.set(span, "java-web-servlet"); Tags.COMPONENT.set(span, "java-web-servlet");
Tags.HTTP_METHOD.set(span, req.getMethod()); Tags.HTTP_METHOD.set(span, req.getMethod());