Skip to content

Commit 58ffdd2

Browse files
PerfectSlayerPerfectSlayer
authored
Merge pull request #6655 from DataDog/bbujon/fix-test-names
Use pool class name to get fixed test names
2 parents 7f47fae + 8821f72 commit 58ffdd2

6 files changed

Lines changed: 29 additions & 12 deletions

File tree

‎dd-java-agent/instrumentation/akka-concurrent/src/test/groovy/AkkaExecutorInstrumentationTest.groovy‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ class AkkaExecutorInstrumentationTest extends AgentTestRunner {
3636
@Shared
3737
def akkaInvokeForkJoinTask = { e, c -> e.invoke((ForkJoinTask) c) }
3838

39-
def "#poolImpl '#name' propagates"() {
39+
def "#poolName '#name' propagates"() {
4040
setup:
4141
def pool = poolImpl
4242
def m = method
@@ -88,6 +88,8 @@ class AkkaExecutorInstrumentationTest extends AgentTestRunner {
8888
"submit Callable" | submitCallable | new ForkJoinExecutorConfigurator.AkkaForkJoinPool(2, ForkJoinPool.defaultForkJoinWorkerThreadFactory, null, true)
8989
"submit ForkJoinTask" | akkaSubmitForkJoinTask | new ForkJoinExecutorConfigurator.AkkaForkJoinPool(2, ForkJoinPool.defaultForkJoinWorkerThreadFactory, null, true)
9090
"invoke ForkJoinTask" | akkaInvokeForkJoinTask | new ForkJoinExecutorConfigurator.AkkaForkJoinPool(2, ForkJoinPool.defaultForkJoinWorkerThreadFactory, null, true)
91+
92+
poolName = poolImpl.class.simpleName
9193
}
9294

9395
def "dispatcher propagates context" () {
@@ -119,7 +121,7 @@ class AkkaExecutorInstrumentationTest extends AgentTestRunner {
119121
trace.get(1).parentId == trace.get(0).spanId
120122
}
121123

122-
def "#poolImpl '#name' reports after canceled jobs"() {
124+
def "#poolName '#name' reports after canceled jobs"() {
123125
setup:
124126
def pool = poolImpl
125127
def m = method
@@ -170,5 +172,6 @@ class AkkaExecutorInstrumentationTest extends AgentTestRunner {
170172
name | method | poolImpl
171173
"submit Runnable" | submitRunnable | new ForkJoinPool()
172174
"submit Callable" | submitCallable | new ForkJoinPool()
175+
poolName = poolImpl.class.simpleName
173176
}
174177
}

‎dd-java-agent/instrumentation/java-concurrent/lambda-testing/src/test/groovy/ExecutorLambdaTest.groovy‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ class ExecutorLambdaTest extends AgentTestRunner {
2121
@Shared
2222
def scheduleCallable = { e, c -> e.schedule((Callable) c, 10, TimeUnit.MILLISECONDS) }
2323

24-
def "#poolImpl '#name' wrap lambdas"() {
24+
def "#poolName '#name' wrap lambdas"() {
2525
setup:
2626
def pool = poolImpl
2727
def m = method
@@ -61,5 +61,7 @@ class ExecutorLambdaTest extends AgentTestRunner {
6161
"execute Runnable" | executeRunnable | { LambdaGenerator.wrapRunnable(it) } | new ThreadPoolExecutor(1, 1, 5, TimeUnit.SECONDS, new TaskQueue())
6262
"submit Runnable" | submitRunnable | { LambdaGenerator.wrapRunnable(it) } | new ThreadPoolExecutor(1, 1, 5, TimeUnit.SECONDS, new TaskQueue())
6363
"submit Callable" | submitCallable | { LambdaGenerator.wrapCallable(it) } | new ThreadPoolExecutor(1, 1, 5, TimeUnit.SECONDS, new TaskQueue())
64+
65+
poolName = poolImpl.class.simpleName
6466
}
6567
}

‎dd-java-agent/instrumentation/java-concurrent/src/test/groovy/ExecutorInstrumentationTest.groovy‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ abstract class ExecutorInstrumentationTest extends AgentTestRunner {
6969
}
7070

7171
@Unroll
72-
def "#poolImpl '#name' propagates"() {
72+
def "#poolName '#name' propagates"() {
7373
setup:
7474
assumeTrue(poolImpl != null) // skip for Java 7 CompletableFuture, non-Linux Netty EPoll
7575
def pool = poolImpl
@@ -237,10 +237,11 @@ abstract class ExecutorInstrumentationTest extends AgentTestRunner {
237237
"schedule Runnable" | scheduleRunnable | MoreExecutors.listeningDecorator(Executors.newSingleThreadScheduledExecutor())
238238
"schedule Callable" | scheduleCallable | MoreExecutors.listeningDecorator(Executors.newSingleThreadScheduledExecutor())
239239
// spotless:on
240+
poolName = poolImpl.class.simpleName
240241
}
241242

242243
@Unroll
243-
def "#poolImpl '#name' doesn't propagate"() {
244+
def "#poolName '#name' doesn't propagate"() {
244245
setup:
245246
def pool = poolImpl
246247
def m = method
@@ -304,6 +305,7 @@ abstract class ExecutorInstrumentationTest extends AgentTestRunner {
304305
"schedule at fixed rate" | scheduleAtFixedRate | new ScheduledThreadPoolExecutor(1)
305306
"schedule with fixed delay" | scheduleWithFixedDelay | new ScheduledThreadPoolExecutor(1)
306307
// spotless:on
308+
poolName = poolImpl.class.simpleName
307309
}
308310

309311
def "excluded ToBeIgnoredExecutor doesn't propagate"() {
@@ -354,7 +356,7 @@ abstract class ExecutorInstrumentationTest extends AgentTestRunner {
354356
}
355357

356358
@Unroll
357-
def "#poolImpl '#name' wraps"() {
359+
def "#poolName '#name' wraps"() {
358360
setup:
359361
def pool = poolImpl
360362
def m = method
@@ -388,10 +390,11 @@ abstract class ExecutorInstrumentationTest extends AgentTestRunner {
388390
"execute Runnable" | executeRunnable | { new RunnableWrapper(it) } | new ScheduledThreadPoolExecutor(1)
389391
"submit Runnable" | submitRunnable | { new RunnableWrapper(it) } | new ScheduledThreadPoolExecutor(1)
390392
"schedule Runnable" | scheduleRunnable | { new RunnableWrapper(it) } | new ScheduledThreadPoolExecutor(1)
393+
poolName = poolImpl.class.simpleName
391394
}
392395

393396
@Unroll
394-
def "#poolImpl '#name' reports after canceled jobs"() {
397+
def "#poolName '#name' reports after canceled jobs"() {
395398
setup:
396399
assumeTrue(poolImpl != null) // skip for non-Linux Netty EPoll
397400
def pool = poolImpl
@@ -481,6 +484,8 @@ abstract class ExecutorInstrumentationTest extends AgentTestRunner {
481484
// "submit Callable" | submitCallable | MoreExecutors.listeningDecorator(Executors.newSingleThreadScheduledExecutor())
482485
// "schedule Runnable" | scheduleRunnable | MoreExecutors.listeningDecorator(Executors.newSingleThreadScheduledExecutor())
483486
// "schedule Callable" | scheduleCallable | MoreExecutors.listeningDecorator(Executors.newSingleThreadScheduledExecutor())
487+
488+
poolName = poolImpl.class.simpleName
484489
}
485490

486491
static class ToBeIgnoredExecutor extends ThreadPoolExecutor {

‎dd-java-agent/instrumentation/java-concurrent/src/test/groovy/NettyExecutorInstrumentationTest.groovy‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ class NettyExecutorInstrumentationTest extends AgentTestRunner {
5252
@Shared
5353
def scheduleCallable = { e, c -> e.schedule((Callable) c, 10, TimeUnit.MILLISECONDS) }
5454

55-
def "#poolImpl '#name' propagates"() {
55+
def "#poolName '#name' propagates"() {
5656
setup:
5757
assumeTrue(poolImpl != null) // skip for non-Linux Netty EPoll
5858
def pool = poolImpl
@@ -195,9 +195,10 @@ class NettyExecutorInstrumentationTest extends AgentTestRunner {
195195
"schedule Runnable" | scheduleRunnable | localEventLoopGroup
196196
"schedule Callable" | scheduleCallable | localEventLoopGroup
197197

198+
poolName = poolImpl.class.simpleName
198199
}
199200

200-
def "#poolImpl '#name' reports after canceled jobs"() {
201+
def "#poolName '#name' reports after canceled jobs"() {
201202
setup:
202203
assumeTrue(poolImpl != null) // skip for non-Linux Netty EPoll
203204
def pool = poolImpl
@@ -272,6 +273,8 @@ class NettyExecutorInstrumentationTest extends AgentTestRunner {
272273
"submit Callable" | submitCallable | localEventLoopGroup.next()
273274
"schedule Runnable" | scheduleRunnable | localEventLoopGroup.next()
274275
"schedule Callable" | scheduleCallable | localEventLoopGroup.next()
276+
277+
poolName = poolImpl.class.simpleName
275278
}
276279

277280
def epollExecutor() {

‎dd-java-agent/instrumentation/jetty-util/src/test/groovy/JettyExecutorInstrumentationTest.groovy‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ class JettyExecutorInstrumentationTest extends AgentTestRunner {
3535
@Shared
3636
def invokeAny = { e, c -> e.invokeAny([(Callable) c]) }
3737

38-
def "#poolImpl '#name' propagates"() {
38+
def "#poolName '#name' propagates"() {
3939
setup:
4040
assumeTrue(poolImpl != null) // skip for Java 7 CompletableFuture, non-Linux Netty EPoll
4141
def pool = poolImpl
@@ -74,5 +74,6 @@ class JettyExecutorInstrumentationTest extends AgentTestRunner {
7474
"execute Runnable" | executeRunnable | new MonitoredQueuedThreadPool(8)
7575
"execute Runnable" | executeRunnable | new QueuedThreadPool(8)
7676
"execute Runnable" | executeRunnable | new ReservedThreadExecutor(delegate(), 1)
77+
poolName = poolImpl.class.simpleName
7778
}
7879
}

‎dd-java-agent/instrumentation/scala-concurrent/src/test/groovy/ScalaExecutorInstrumentationTest.groovy‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ class ScalaExecutorInstrumentationTest extends AgentTestRunner {
3434
@Shared
3535
def scalaInvokeForkJoinTask = { e, c -> e.invoke((ForkJoinTask) c) }
3636

37-
def "#poolImpl '#name' propagates"() {
37+
def "#poolName '#name' propagates"() {
3838
setup:
3939
def pool = poolImpl
4040
def m = method
@@ -79,9 +79,11 @@ class ScalaExecutorInstrumentationTest extends AgentTestRunner {
7979
"submit Callable" | submitCallable | new ForkJoinPool()
8080
"submit ForkJoinTask" | scalaSubmitForkJoinTask | new ForkJoinPool()
8181
"invoke ForkJoinTask" | scalaInvokeForkJoinTask | new ForkJoinPool()
82+
83+
poolName = poolImpl.class.simpleName
8284
}
8385

84-
def "#poolImpl '#name' reports after canceled jobs"() {
86+
def "#poolName '#name' reports after canceled jobs"() {
8587
setup:
8688
def pool = poolImpl
8789
def m = method
@@ -132,5 +134,6 @@ class ScalaExecutorInstrumentationTest extends AgentTestRunner {
132134
name | method | poolImpl
133135
"submit Runnable" | submitRunnable | new ForkJoinPool()
134136
"submit Callable" | submitCallable | new ForkJoinPool()
137+
poolName = poolImpl.class.simpleName
135138
}
136139
}

0 commit comments

Comments
 (0)