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

address ci errors

This commit is contained in:
Marco Ferrer 2019-01-21 14:12:44 -05:00
parent 7819430620
commit 5096ac35b6
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dd-java-agent/instrumentation/java-concurrent/kotlin-testing/src/test/groovy/KotlinCoroutineInstrumentationTest.groovy
View File

@ -5,7 +5,7 @@ import kotlinx.coroutines.ThreadPoolDispatcherKt
class KotlinCoroutineInstrumentationTest extends AgentTestRunner { class KotlinCoroutineInstrumentationTest extends AgentTestRunner {
static def dispatchersToTest = [ static dispatchersToTest = [
Dispatchers.Default, Dispatchers.Default,
Dispatchers.IO, Dispatchers.IO,
Dispatchers.Unconfined, Dispatchers.Unconfined,

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

@ -160,11 +160,10 @@ public final class ExecutorInstrumentation extends Instrumenter.Default {
nameMatches("invoke(Any|All)$").and(takesArgument(0, Callable.class)), nameMatches("invoke(Any|All)$").and(takesArgument(0, Callable.class)),
SetCallableStateForCallableCollectionAdvice.class.getName()); SetCallableStateForCallableCollectionAdvice.class.getName());
transformers.put( // kotlinx.coroutines.scheduling.CoroutineScheduler transformers.put( // kotlinx.coroutines.scheduling.CoroutineScheduler
named("dispatch") named("dispatch")
.and(takesArgument(0, Runnable.class)) .and(takesArgument(0, Runnable.class))
.and(takesArgument(1, named("kotlinx.coroutines.scheduling.TaskContext"))), .and(takesArgument(1, named("kotlinx.coroutines.scheduling.TaskContext"))),
SetExecuteRunnableStateAdvice.class.getName()); SetExecuteRunnableStateAdvice.class.getName());
return transformers; return transformers;
} }