Skip to content

Commit 9bd19d3

Browse files
authored
Minimize changes needed to test code origin on instrumentations (#8577)
1 parent 1b1f8bc commit 9bd19d3

File tree

6 files changed

+50
-394
lines changed

6 files changed

+50
-394
lines changed

dd-java-agent/instrumentation/grpc-1.5/src/test/groovy/GrpcCodeOriginTest.groovy

-199
This file was deleted.

dd-java-agent/instrumentation/grpc-1.5/src/test/groovy/GrpcTest.groovy

+8
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import static datadog.trace.agent.test.asserts.TagsAssert.codeOriginTags
12
import static datadog.trace.api.config.TraceInstrumentationConfig.GRPC_SERVER_ERROR_STATUSES
23

34
import com.google.common.util.concurrent.MoreExecutors
@@ -150,6 +151,7 @@ abstract class GrpcTest extends VersionedNamingTestBase {
150151

151152
then:
152153
response.message == "Hello $name"
154+
codeOriginTags(TEST_WRITER)
153155
assertTraces(2) {
154156
trace(hasClientMessageSpans() ? 3 : 2) {
155157
basicSpan(it, "parent")
@@ -680,6 +682,12 @@ class GrpcDataStreamsEnabledV0Test extends GrpcDataStreamsEnabledForkedTest {
680682

681683
class GrpcDataStreamsEnabledV1ForkedTest extends GrpcDataStreamsEnabledForkedTest {
682684

685+
@Override
686+
protected void configurePreAgent() {
687+
super.configurePreAgent()
688+
codeOriginSetup()
689+
}
690+
683691
@Override
684692
int version() {
685693
return 1

dd-java-agent/instrumentation/kafka-clients-3.8/src/test/groovy/KafkaClientTestBase.groovy

+12-2
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,9 @@ import org.springframework.kafka.test.utils.KafkaTestUtils
3232

3333
import java.util.concurrent.ExecutionException
3434
import java.util.concurrent.Future
35+
36+
import static datadog.trace.agent.test.asserts.TagsAssert.codeOriginTags
37+
3538
import java.util.concurrent.LinkedBlockingQueue
3639
import java.util.concurrent.TimeUnit
3740

@@ -227,8 +230,9 @@ abstract class KafkaClientTestBase extends VersionedNamingTestBase {
227230
int nTraces = isDataStreamsEnabled() ? 3 : 2
228231
int produceTraceIdx = nTraces - 1
229232
TEST_WRITER.waitForTraces(nTraces)
230-
def traces = (Arrays.asList(TEST_WRITER.toArray()) as List<List<DDSpan>>)
231-
Collections.sort(traces, new SortKafkaTraces())
233+
def traces = new ArrayList<>(TEST_WRITER)
234+
traces.sort(new SortKafkaTraces())
235+
codeOriginTags(TEST_WRITER)
232236
assertTraces(nTraces, new SortKafkaTraces()) {
233237
if (hasQueueSpan()) {
234238
trace(2) {
@@ -1040,6 +1044,12 @@ class KafkaClientV0ForkedTest extends KafkaClientForkedTest {
10401044
}
10411045
10421046
class KafkaClientV1ForkedTest extends KafkaClientForkedTest {
1047+
@Override
1048+
void configurePreAgent() {
1049+
super.configurePreAgent()
1050+
codeOriginSetup()
1051+
}
1052+
10431053
@Override
10441054
int version() {
10451055
1

0 commit comments

Comments
 (0)