Skip to content

Commit 71e7de7

Browse files
committed
fix tests
1 parent 151cb17 commit 71e7de7

File tree

5 files changed

+5
-15
lines changed

5 files changed

+5
-15
lines changed

dd-java-agent/agent-tooling/src/main/resources/datadog/trace/agent/tooling/bytebuddy/matcher/ignored_class_name.trie

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -269,6 +269,7 @@
269269
0 org.springframework.boot.SpringApplicationRunListeners
270270
1 org.springframework.boot.SpringApplicationShutdownHook$Handlers
271271
1 org.springframework.boot.autoconfigure.ssl.FileWatcher$WatcherThread
272+
1 org.springframework.boot.autoconfigure.web.servlet.error.BasicErrorController
272273
2 org.springframework.boot.*
273274
0 org.apache.xalan.transformer.TransformerImpl
274275
# More runnables to deal with

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

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ abstract class GrpcTest extends VersionedNamingTestBase {
7474
@Override
7575
protected void configurePreAgent() {
7676
super.configurePreAgent()
77+
codeOriginSetup()
7778
injectSysConfig("dd.trace.grpc.ignored.inbound.methods", "example.Greeter/IgnoreInbound")
7879
injectSysConfig("dd.trace.grpc.ignored.outbound.methods", "example.Greeter/Ignore")
7980
if (hasClientMessageSpans()) {
@@ -689,12 +690,6 @@ class GrpcDataStreamsEnabledV0Test extends GrpcDataStreamsEnabledForkedTest {
689690

690691
class GrpcDataStreamsEnabledV1ForkedTest extends GrpcDataStreamsEnabledForkedTest {
691692

692-
@Override
693-
protected void configurePreAgent() {
694-
super.configurePreAgent()
695-
codeOriginSetup()
696-
}
697-
698693
@Override
699694
int version() {
700695
return 1

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

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ abstract class KafkaClientTestBase extends VersionedNamingTestBase {
6565
@Override
6666
void configurePreAgent() {
6767
super.configurePreAgent()
68-
68+
codeOriginSetup()
6969
injectSysConfig("dd.kafka.e2e.duration.enabled", "true")
7070
}
7171

@@ -1024,12 +1024,6 @@ class KafkaClientV0ForkedTest extends KafkaClientForkedTest {
10241024
}
10251025
10261026
class KafkaClientV1ForkedTest extends KafkaClientForkedTest {
1027-
@Override
1028-
void configurePreAgent() {
1029-
super.configurePreAgent()
1030-
codeOriginSetup()
1031-
}
1032-
10331027
@Override
10341028
int version() {
10351029
1

internal-api/src/main/java/datadog/trace/api/Config.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4263,7 +4263,7 @@ public String getFinalDebuggerSnapshotUrl() {
42634263
} else if (isCiVisibilityAgentlessEnabled()) {
42644264
return Intake.LOGS.getAgentlessUrl(this) + "logs";
42654265
} else {
4266-
throw new IllegalArgumentException("Cannot find snapshot endpoint on datadog agent");
4266+
return getFinalDebuggerBaseUrl() + "/debugger/v1/diagnostics";
42674267
}
42684268
}
42694269

internal-api/src/test/groovy/datadog/trace/api/debugger/DebuggerConfigBridgeTest.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ class DebuggerConfigBridgeTest extends Specification {
1515
then:
1616
!DebuggerConfigBridge.isDynamicInstrumentationEnabled()
1717
!DebuggerConfigBridge.isExceptionReplayEnabled()
18-
!DebuggerConfigBridge.isCodeOriginEnabled()
18+
DebuggerConfigBridge.isCodeOriginEnabled()
1919
!DebuggerConfigBridge.isDistributedDebuggerEnabled()
2020

2121
when:

0 commit comments

Comments
 (0)