From 7cf42b1377131b7855ad944eeddc60a5c5e6999b Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Fri, 11 Sep 2020 01:38:50 -0700 Subject: [PATCH] Remove old kotlin coroutine instrumentation (#1185) --- .../auto/javaconcurrent/AbstractExecutorInstrumentation.java | 1 - .../javaconcurrent/NonStandardExecutorInstrumentation.java | 5 ----- 2 files changed, 6 deletions(-) diff --git a/instrumentation/java-concurrent/src/main/java/io/opentelemetry/instrumentation/auto/javaconcurrent/AbstractExecutorInstrumentation.java b/instrumentation/java-concurrent/src/main/java/io/opentelemetry/instrumentation/auto/javaconcurrent/AbstractExecutorInstrumentation.java index 9a5a479c7a1f..38003ec9eede 100644 --- a/instrumentation/java-concurrent/src/main/java/io/opentelemetry/instrumentation/auto/javaconcurrent/AbstractExecutorInstrumentation.java +++ b/instrumentation/java-concurrent/src/main/java/io/opentelemetry/instrumentation/auto/javaconcurrent/AbstractExecutorInstrumentation.java @@ -96,7 +96,6 @@ public AbstractExecutorInstrumentation(String... additionalNames) { "java.util.concurrent.ForkJoinPool", "java.util.concurrent.ScheduledThreadPoolExecutor", "java.util.concurrent.ThreadPoolExecutor", - "kotlinx.coroutines.scheduling.CoroutineScheduler", "org.eclipse.jetty.util.thread.QueuedThreadPool", "org.eclipse.jetty.util.thread.ReservedThreadExecutor", "org.glassfish.grizzly.threadpool.GrizzlyExecutorService", diff --git a/instrumentation/java-concurrent/src/main/java/io/opentelemetry/instrumentation/auto/javaconcurrent/NonStandardExecutorInstrumentation.java b/instrumentation/java-concurrent/src/main/java/io/opentelemetry/instrumentation/auto/javaconcurrent/NonStandardExecutorInstrumentation.java index 395195c36533..86b9fdc05f35 100644 --- a/instrumentation/java-concurrent/src/main/java/io/opentelemetry/instrumentation/auto/javaconcurrent/NonStandardExecutorInstrumentation.java +++ b/instrumentation/java-concurrent/src/main/java/io/opentelemetry/instrumentation/auto/javaconcurrent/NonStandardExecutorInstrumentation.java @@ -44,11 +44,6 @@ public Map contextStore() { @Override public Map, String> transformers() { Map, String> transformers = new HashMap<>(); - transformers.put( // kotlinx.coroutines.scheduling.CoroutineScheduler - named("dispatch") - .and(takesArgument(0, Runnable.class)) - .and(takesArgument(1, named("kotlinx.coroutines.scheduling.TaskContext"))), - JavaExecutorInstrumentation.class.getName() + "$SetExecuteRunnableStateAdvice"); transformers.put( // org.eclipse.jetty.util.thread.QueuedThreadPool named("dispatch").and(takesArguments(1)).and(takesArgument(0, Runnable.class)),