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

Skip instrumenting slick thread pool

This commit is contained in:
Andrew Kent 2018-05-18 11:14:24 -07:00
parent f74710a3bc
commit 1641c54448
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
dd-java-agent/instrumentation/java-concurrent/src/main/java/datadog/trace/instrumentation/java/concurrent/ExecutorInstrumentation.java
View File

@ -137,12 +137,13 @@ public final class ExecutorInstrumentation extends Instrumenter.Configurable {
public static class WrapRunnableAdvice { public static class WrapRunnableAdvice {
@Advice.OnMethodEnter(suppress = Throwable.class) @Advice.OnMethodEnter(suppress = Throwable.class)
public static DatadogWrapper wrapJob( public static DatadogWrapper wrapJob(
@Advice.Argument(value = 0, readOnly = false) Runnable task) { @Advice.This Object dis, @Advice.Argument(value = 0, readOnly = false) Runnable task) {
final Scope scope = GlobalTracer.get().scopeManager().active(); final Scope scope = GlobalTracer.get().scopeManager().active();
if (scope instanceof TraceScope if (scope instanceof TraceScope
&& ((TraceScope) scope).isAsyncPropagating() && ((TraceScope) scope).isAsyncPropagating()
&& task != null && task != null
&& !(task instanceof DatadogWrapper)) { && !(task instanceof DatadogWrapper)
&& (!dis.getClass().getName().startsWith("slick.util.AsyncExecutor"))) {
task = new RunnableWrapper(task, (TraceScope) scope); task = new RunnableWrapper(task, (TraceScope) scope);
return (RunnableWrapper) task; return (RunnableWrapper) task;
} }
@ -161,12 +162,13 @@ public final class ExecutorInstrumentation extends Instrumenter.Configurable {
public static class WrapCallableAdvice { public static class WrapCallableAdvice {
@Advice.OnMethodEnter(suppress = Throwable.class) @Advice.OnMethodEnter(suppress = Throwable.class)
public static DatadogWrapper wrapJob( public static DatadogWrapper wrapJob(
@Advice.Argument(value = 0, readOnly = false) Callable<?> task) { @Advice.This Object dis, @Advice.Argument(value = 0, readOnly = false) Callable<?> task) {
final Scope scope = GlobalTracer.get().scopeManager().active(); final Scope scope = GlobalTracer.get().scopeManager().active();
if (scope instanceof TraceScope if (scope instanceof TraceScope
&& ((TraceScope) scope).isAsyncPropagating() && ((TraceScope) scope).isAsyncPropagating()
&& task != null && task != null
&& !(task instanceof DatadogWrapper)) { && !(task instanceof DatadogWrapper)
&& (!dis.getClass().getName().startsWith("slick.util.AsyncExecutor"))) {
task = new CallableWrapper<>(task, (TraceScope) scope); task = new CallableWrapper<>(task, (TraceScope) scope);
return (CallableWrapper) task; return (CallableWrapper) task;
} }
@ -185,9 +187,12 @@ public final class ExecutorInstrumentation extends Instrumenter.Configurable {
public static class WrapCallableCollectionAdvice { public static class WrapCallableCollectionAdvice {
@Advice.OnMethodEnter(suppress = Throwable.class) @Advice.OnMethodEnter(suppress = Throwable.class)
public static Collection<?> wrapJob( public static Collection<?> wrapJob(
@Advice.This Object dis,
@Advice.Argument(value = 0, readOnly = false) Collection<? extends Callable<?>> tasks) { @Advice.Argument(value = 0, readOnly = false) Collection<? extends Callable<?>> tasks) {
final Scope scope = GlobalTracer.get().scopeManager().active(); final Scope scope = GlobalTracer.get().scopeManager().active();
if (scope instanceof TraceScope && ((TraceScope) scope).isAsyncPropagating()) { if (scope instanceof TraceScope
&& ((TraceScope) scope).isAsyncPropagating()
&& (!dis.getClass().getName().startsWith("slick.util.AsyncExecutor"))) {
final Collection<Callable<?>> wrappedTasks = new ArrayList<>(tasks.size()); final Collection<Callable<?>> wrappedTasks = new ArrayList<>(tasks.size());
for (Callable<?> task : tasks) { for (Callable<?> task : tasks) {
if (task != null) { if (task != null) {