Skip to content

Commit 36f5715

Browse files
committed
Clean up helper methods
1 parent 6b1df6f commit 36f5715

File tree

4 files changed

+4
-9
lines changed

4 files changed

+4
-9
lines changed

dd-java-agent/instrumentation/play-2.3/src/test/groovy/datadog/trace/instrumentation/play23/test/client/PlayWSClientTest.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ class PlayWSClientTest extends HttpClientTest implements TestingNettyHttpNamingC
9494
tagsAssert.tag("error.stack", String)
9595
tagsAssert.tag("error.message", String)
9696
} else {
97-
assertErrorTags(tagsAssert, exception)
97+
super.assertErrorTags(tagsAssert, exception)
9898
}
9999
}
100100
}

dd-java-agent/instrumentation/play-2.4/src/test/groovy/datadog/trace/instrumentation/play25/client/PlayWSClientTest.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ abstract class PlayWSClientTest extends HttpClientTest {
7272
tagsAssert.tag("error.stack", String)
7373
tagsAssert.tag("error.message", String)
7474
} else {
75-
assertErrorTags(tagsAssert, exception)
75+
super.assertErrorTags(tagsAssert, exception)
7676
}
7777
}
7878
}

dd-java-agent/instrumentation/play-ws-1/src/test/groovy/PlayWSClientTest.groovy

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -113,12 +113,7 @@ class PlayScalaStreamedWSClientTest extends PlayWSClientTestBase {
113113
.withHttpHeaders(JavaConverters.mapAsScalaMap(headers).toSeq())
114114
.stream()
115115
.transform({ theTry ->
116-
if (callback != null) {
117-
// Execute callback in a separate thread to clear trace context
118-
def thread = new Thread({ callback.call() })
119-
thread.start()
120-
thread.join()
121-
}
116+
runInAdHocThread(callback)
122117
theTry
123118
}, ExecutionContext.global())
124119

dd-java-agent/instrumentation/play-ws/src/test/groovy/PlayWSClientTestBase.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ abstract class PlayWSClientTestBase extends HttpClientTest {
9696
tagsAssert.tag("error.stack", String)
9797
tagsAssert.tag("error.message", String)
9898
} else {
99-
assertErrorTags(tagsAssert, exception)
99+
super.assertErrorTags(tagsAssert, exception)
100100
}
101101
}
102102

0 commit comments

Comments
 (0)