From 5096ac35b6d33f939e02ab03660da65954288e93 Mon Sep 17 00:00:00 2001 From: Marco Ferrer <35935108+marcoferrer@users.noreply.github.com> Date: Mon, 21 Jan 2019 14:12:44 -0500 Subject: [PATCH] address ci errors --- .../groovy/KotlinCoroutineInstrumentationTest.groovy | 2 +- .../java/concurrent/ExecutorInstrumentation.java | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dd-java-agent/instrumentation/java-concurrent/kotlin-testing/src/test/groovy/KotlinCoroutineInstrumentationTest.groovy b/dd-java-agent/instrumentation/java-concurrent/kotlin-testing/src/test/groovy/KotlinCoroutineInstrumentationTest.groovy index 51a2f51775..b38e6dd387 100644 --- a/dd-java-agent/instrumentation/java-concurrent/kotlin-testing/src/test/groovy/KotlinCoroutineInstrumentationTest.groovy +++ b/dd-java-agent/instrumentation/java-concurrent/kotlin-testing/src/test/groovy/KotlinCoroutineInstrumentationTest.groovy @@ -5,7 +5,7 @@ import kotlinx.coroutines.ThreadPoolDispatcherKt class KotlinCoroutineInstrumentationTest extends AgentTestRunner { - static def dispatchersToTest = [ + static dispatchersToTest = [ Dispatchers.Default, Dispatchers.IO, Dispatchers.Unconfined, diff --git a/dd-java-agent/instrumentation/java-concurrent/src/main/java/datadog/trace/instrumentation/java/concurrent/ExecutorInstrumentation.java b/dd-java-agent/instrumentation/java-concurrent/src/main/java/datadog/trace/instrumentation/java/concurrent/ExecutorInstrumentation.java index f6a342e6e6..c01a963622 100644 --- a/dd-java-agent/instrumentation/java-concurrent/src/main/java/datadog/trace/instrumentation/java/concurrent/ExecutorInstrumentation.java +++ b/dd-java-agent/instrumentation/java-concurrent/src/main/java/datadog/trace/instrumentation/java/concurrent/ExecutorInstrumentation.java @@ -160,11 +160,10 @@ public final class ExecutorInstrumentation extends Instrumenter.Default { nameMatches("invoke(Any|All)$").and(takesArgument(0, Callable.class)), SetCallableStateForCallableCollectionAdvice.class.getName()); transformers.put( // kotlinx.coroutines.scheduling.CoroutineScheduler - named("dispatch") - .and(takesArgument(0, Runnable.class)) - .and(takesArgument(1, named("kotlinx.coroutines.scheduling.TaskContext"))), - SetExecuteRunnableStateAdvice.class.getName()); - + named("dispatch") + .and(takesArgument(0, Runnable.class)) + .and(takesArgument(1, named("kotlinx.coroutines.scheduling.TaskContext"))), + SetExecuteRunnableStateAdvice.class.getName()); return transformers; }