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

Small cleanups to executor tests (#2677)

This commit is contained in:
Anuraag Agrawal 2021-03-31 21:36:51 +09:00 committed by GitHub
parent 08d8d4c57d
commit 87c9ad0523
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
instrumentation/executors/javaagent/executors-javaagent.gradle
View File

@ -8,4 +8,5 @@ muzzle {
tasks.withType(Test) { tasks.withType(Test) {
jvmArgs "-Dotel.instrumentation.executors.include=ExecutorInstrumentationTest\$CustomThreadPoolExecutor" jvmArgs "-Dotel.instrumentation.executors.include=ExecutorInstrumentationTest\$CustomThreadPoolExecutor"
jvmArgs "-Djava.awt.headless=true"
} }

17
instrumentation/executors/javaagent/src/test/groovy/ExecutorInstrumentationTest.groovy
View File

@ -52,7 +52,7 @@ class ExecutorInstrumentationTest extends AgentInstrumentationSpecification {
@Shared @Shared
def scheduleCallable = { e, c -> e.schedule((Callable) c, 10, TimeUnit.MILLISECONDS) } def scheduleCallable = { e, c -> e.schedule((Callable) c, 10, TimeUnit.MILLISECONDS) }
def "#poolImpl '#name' propagates"() { def "#poolName '#name' propagates"() {
setup: setup:
def pool = poolImpl def pool = poolImpl
def m = method def m = method
@ -82,8 +82,9 @@ class ExecutorInstrumentationTest extends AgentInstrumentationSpecification {
} }
cleanup: cleanup:
if (pool?.hasProperty("shutdown")) { if (pool.hasProperty("shutdown")) {
pool?.shutdown() pool.shutdown()
pool.awaitTermination(10, TimeUnit.SECONDS)
} }
// Unfortunately, there's no simple way to test the cross product of methods/pools. // Unfortunately, there's no simple way to test the cross product of methods/pools.
@ -131,9 +132,10 @@ class ExecutorInstrumentationTest extends AgentInstrumentationSpecification {
// Internal executor used by CompletableFuture // Internal executor used by CompletableFuture
"execute Runnable" | executeRunnable | new CompletableFuture.ThreadPerTaskExecutor() "execute Runnable" | executeRunnable | new CompletableFuture.ThreadPerTaskExecutor()
poolName = poolImpl.class.simpleName
} }
def "#poolImpl '#name' wrap lambdas"() { def "#poolName '#name' wrap lambdas"() {
setup: setup:
ExecutorService pool = poolImpl ExecutorService pool = poolImpl
def m = method def m = method
@ -162,6 +164,7 @@ class ExecutorInstrumentationTest extends AgentInstrumentationSpecification {
cleanup: cleanup:
pool.shutdown() pool.shutdown()
pool.awaitTermination(10, TimeUnit.SECONDS)
where: where:
name | method | wrap | poolImpl name | method | wrap | poolImpl
@ -170,9 +173,10 @@ class ExecutorInstrumentationTest extends AgentInstrumentationSpecification {
"submit Callable" | submitCallable | { LambdaGen.wrapCallable(it) } | new ScheduledThreadPoolExecutor(1) "submit Callable" | submitCallable | { LambdaGen.wrapCallable(it) } | new ScheduledThreadPoolExecutor(1)
"schedule Runnable" | scheduleRunnable | { LambdaGen.wrapRunnable(it) } | new ScheduledThreadPoolExecutor(1) "schedule Runnable" | scheduleRunnable | { LambdaGen.wrapRunnable(it) } | new ScheduledThreadPoolExecutor(1)
"schedule Callable" | scheduleCallable | { LambdaGen.wrapCallable(it) } | new ScheduledThreadPoolExecutor(1) "schedule Callable" | scheduleCallable | { LambdaGen.wrapCallable(it) } | new ScheduledThreadPoolExecutor(1)
poolName = poolImpl.class.simpleName
} }
def "#poolImpl '#name' reports after canceled jobs"() { def "#poolName '#name' reports after canceled jobs"() {
setup: setup:
ExecutorService pool = poolImpl ExecutorService pool = poolImpl
def m = method def m = method
@ -217,8 +221,6 @@ class ExecutorInstrumentationTest extends AgentInstrumentationSpecification {
expect: expect:
waitForTraces(1).size() == 1 waitForTraces(1).size() == 1
// Wait for shutdown since we didn't wait on task completion and want to confirm any pending
// ones clean up context.
pool.shutdown() pool.shutdown()
pool.awaitTermination(10, TimeUnit.SECONDS) pool.awaitTermination(10, TimeUnit.SECONDS)
@ -236,6 +238,7 @@ class ExecutorInstrumentationTest extends AgentInstrumentationSpecification {
// ForkJoinPool has additional set of method overloads for ForkJoinTask to deal with // ForkJoinPool has additional set of method overloads for ForkJoinTask to deal with
"submit Runnable" | submitRunnable | new ForkJoinPool() "submit Runnable" | submitRunnable | new ForkJoinPool()
"submit Callable" | submitCallable | new ForkJoinPool() "submit Callable" | submitCallable | new ForkJoinPool()
poolName = poolImpl.class.simpleName
} }
static class CustomThreadPoolExecutor extends AbstractExecutorService { static class CustomThreadPoolExecutor extends AbstractExecutorService {