Skip to content

Minimize changes needed to test code origin on instrumentations #8577

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 20, 2025
Merged

Minimize changes needed to test code origin on instrumentations #8577

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ede71ff
minimize changes needed to test code origin on instrumentations
evanchooly Mar 13, 2025
98a473e
remove empty file. rebase victim?
evanchooly Mar 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
199 changes: 0 additions & 199 deletions dd-java-agent/instrumentation/grpc-1.5/src/test/groovy/GrpcCodeOriginTest.groovy
View file
Open in desktop

This file was deleted.

8 changes: 8 additions & 0 deletions dd-java-agent/instrumentation/grpc-1.5/src/test/groovy/GrpcTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import static datadog.trace.agent.test.asserts.TagsAssert.codeOriginTags
import static datadog.trace.api.config.TraceInstrumentationConfig.GRPC_SERVER_ERROR_STATUSES

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

then:
response.message == "Hello $name"
codeOriginTags(TEST_WRITER)
assertTraces(2) {
trace(hasClientMessageSpans() ? 3 : 2) {
basicSpan(it, "parent")
Expand Down Expand Up @@ -680,6 +682,12 @@ class GrpcDataStreamsEnabledV0Test extends GrpcDataStreamsEnabledForkedTest {

class GrpcDataStreamsEnabledV1ForkedTest extends GrpcDataStreamsEnabledForkedTest {

@Override
protected void configurePreAgent() {
super.configurePreAgent()
codeOriginSetup()
}

@Override
int version() {
return 1
Expand Down
14 changes: 12 additions & 2 deletions dd-java-agent/instrumentation/kafka-clients-3.8/src/test/groovy/KafkaClientTestBase.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,9 @@ import org.springframework.kafka.test.utils.KafkaTestUtils

import java.util.concurrent.ExecutionException
import java.util.concurrent.Future

import static datadog.trace.agent.test.asserts.TagsAssert.codeOriginTags

import java.util.concurrent.LinkedBlockingQueue
import java.util.concurrent.TimeUnit

Expand Down Expand Up @@ -227,8 +230,9 @@ abstract class KafkaClientTestBase extends VersionedNamingTestBase {
int nTraces = isDataStreamsEnabled() ? 3 : 2
int produceTraceIdx = nTraces - 1
TEST_WRITER.waitForTraces(nTraces)
def traces = (Arrays.asList(TEST_WRITER.toArray()) as List<List<DDSpan>>)
Collections.sort(traces, new SortKafkaTraces())
def traces = new ArrayList<>(TEST_WRITER)
traces.sort(new SortKafkaTraces())
codeOriginTags(TEST_WRITER)
assertTraces(nTraces, new SortKafkaTraces()) {
if (hasQueueSpan()) {
trace(2) {
Expand Down Expand Up @@ -1040,6 +1044,12 @@ class KafkaClientV0ForkedTest extends KafkaClientForkedTest {
}

class KafkaClientV1ForkedTest extends KafkaClientForkedTest {
@Override
void configurePreAgent() {
super.configurePreAgent()
codeOriginSetup()
}

@Override
int version() {
1
Expand Down
Loading