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

Merge pull request #746 from DataDog/mar-kolya/fix-canceled-jobs-tests 

Fix tests that verify that cancelling job cancels continuation
This commit is contained in:
Nikolay Martynov 2019-02-28 19:14:19 -05:00 committed by GitHub
parent 339784c4eb 65cb8af873
commit 28f9080a03
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dd-java-agent/instrumentation/java-concurrent/akka-2.5-testing/src/test/groovy/AkkaExecutorInstrumentationTest.groovy
View File

@ -5,7 +5,6 @@ import datadog.opentracing.scopemanager.ContinuableScope
import datadog.trace.agent.test.AgentTestRunner import datadog.trace.agent.test.AgentTestRunner
import datadog.trace.api.Trace import datadog.trace.api.Trace
import io.opentracing.util.GlobalTracer import io.opentracing.util.GlobalTracer
import spock.lang.Retry
import spock.lang.Shared import spock.lang.Shared
import java.lang.reflect.InvocationTargetException import java.lang.reflect.InvocationTargetException
@ -20,7 +19,6 @@ import java.util.concurrent.TimeUnit
* Test executor instrumentation for Akka specific classes. * Test executor instrumentation for Akka specific classes.
* This is to large extent a copy of ExecutorInstrumentationTest. * This is to large extent a copy of ExecutorInstrumentationTest.
*/ */
@Retry
class AkkaExecutorInstrumentationTest extends AgentTestRunner { class AkkaExecutorInstrumentationTest extends AgentTestRunner {
@Shared @Shared
@ -102,10 +100,10 @@ class AkkaExecutorInstrumentationTest extends AgentTestRunner {
// we do not really have a good way for attributing work to correct parent span // we do not really have a good way for attributing work to correct parent span
// if we reuse Callable/Runnable. // if we reuse Callable/Runnable.
// Solution for now is to never reuse a Callable/Runnable. // Solution for now is to never reuse a Callable/Runnable.
final AkkaAsyncChild child = new AkkaAsyncChild(true, true) final AkkaAsyncChild child = new AkkaAsyncChild(false, true)
children.add(child) children.add(child)
try { try {
Future f = m(pool, new AkkaAsyncChild()) Future f = m(pool, child)
jobFutures.add(f) jobFutures.add(f)
} catch (InvocationTargetException e) { } catch (InvocationTargetException e) {
throw e.getCause() throw e.getCause()

6
dd-java-agent/instrumentation/java-concurrent/scala-testing/src/test/groovy/ScalaExecutorInstrumentationTest.groovy
View File

@ -5,7 +5,6 @@ import datadog.trace.api.Trace
import io.opentracing.util.GlobalTracer import io.opentracing.util.GlobalTracer
import scala.concurrent.forkjoin.ForkJoinPool import scala.concurrent.forkjoin.ForkJoinPool
import scala.concurrent.forkjoin.ForkJoinTask import scala.concurrent.forkjoin.ForkJoinTask
import spock.lang.Retry
import spock.lang.Shared import spock.lang.Shared
import java.lang.reflect.InvocationTargetException import java.lang.reflect.InvocationTargetException
@ -20,7 +19,6 @@ import java.util.concurrent.TimeUnit
* Test executor instrumentation for Scala specific classes. * Test executor instrumentation for Scala specific classes.
* This is to large extent a copy of ExecutorInstrumentationTest. * This is to large extent a copy of ExecutorInstrumentationTest.
*/ */
@Retry
class ScalaExecutorInstrumentationTest extends AgentTestRunner { class ScalaExecutorInstrumentationTest extends AgentTestRunner {
@Shared @Shared
@ -102,10 +100,10 @@ class ScalaExecutorInstrumentationTest extends AgentTestRunner {
// we do not really have a good way for attributing work to correct parent span // we do not really have a good way for attributing work to correct parent span
// if we reuse Callable/Runnable. // if we reuse Callable/Runnable.
// Solution for now is to never reuse a Callable/Runnable. // Solution for now is to never reuse a Callable/Runnable.
final ScalaAsyncChild child = new ScalaAsyncChild(true, true) final ScalaAsyncChild child = new ScalaAsyncChild(false, true)
children.add(child) children.add(child)
try { try {
Future f = m(pool, new ScalaAsyncChild()) Future f = m(pool, child)
jobFutures.add(f) jobFutures.add(f)
} catch (InvocationTargetException e) { } catch (InvocationTargetException e) {
throw e.getCause() throw e.getCause()

6
dd-java-agent/instrumentation/java-concurrent/src/test/groovy/ExecutorInstrumentationTest.groovy
View File

@ -5,7 +5,6 @@ import datadog.trace.api.Trace
import datadog.trace.bootstrap.instrumentation.java.concurrent.CallableWrapper import datadog.trace.bootstrap.instrumentation.java.concurrent.CallableWrapper
import datadog.trace.bootstrap.instrumentation.java.concurrent.RunnableWrapper import datadog.trace.bootstrap.instrumentation.java.concurrent.RunnableWrapper
import io.opentracing.util.GlobalTracer import io.opentracing.util.GlobalTracer
import spock.lang.Retry
import spock.lang.Shared import spock.lang.Shared
import java.lang.reflect.InvocationTargetException import java.lang.reflect.InvocationTargetException
@ -19,7 +18,6 @@ import java.util.concurrent.ScheduledThreadPoolExecutor
import java.util.concurrent.ThreadPoolExecutor import java.util.concurrent.ThreadPoolExecutor
import java.util.concurrent.TimeUnit import java.util.concurrent.TimeUnit
@Retry
class ExecutorInstrumentationTest extends AgentTestRunner { class ExecutorInstrumentationTest extends AgentTestRunner {
@Shared @Shared
@ -176,10 +174,10 @@ class ExecutorInstrumentationTest extends AgentTestRunner {
// we do not really have a good way for attributing work to correct parent span // we do not really have a good way for attributing work to correct parent span
// if we reuse Callable/Runnable. // if we reuse Callable/Runnable.
// Solution for now is to never reuse a Callable/Runnable. // Solution for now is to never reuse a Callable/Runnable.
final JavaAsyncChild child = new JavaAsyncChild(true, true) final JavaAsyncChild child = new JavaAsyncChild(false, true)
children.add(child) children.add(child)
try { try {
Future f = m(pool, new JavaAsyncChild()) Future f = m(pool, child)
jobFutures.add(f) jobFutures.add(f)
} catch (InvocationTargetException e) { } catch (InvocationTargetException e) {
throw e.getCause() throw e.getCause()