Skip to content

Make Code Origin for Spans default on #9873

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Make Code Origin for Spans default on #9873

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
151cb17
Make Code Origin for Spans default on
jpbempel Oct 28, 2025
71e7de7
fix tests
jpbempel Oct 29, 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
1 change: 1 addition & 0 deletions .../src/main/resources/datadog/trace/agent/tooling/bytebuddy/matcher/ignored_class_name.trie
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,6 +269,7 @@
0 org.springframework.boot.SpringApplicationRunListeners
1 org.springframework.boot.SpringApplicationShutdownHook$Handlers
1 org.springframework.boot.autoconfigure.ssl.FileWatcher$WatcherThread
1 org.springframework.boot.autoconfigure.web.servlet.error.BasicErrorController
2 org.springframework.boot.*
0 org.apache.xalan.transformer.TransformerImpl
# More runnables to deal with
Expand Down
7 changes: 1 addition & 6 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
Expand Up @@ -74,6 +74,7 @@ abstract class GrpcTest extends VersionedNamingTestBase {
@Override
protected void configurePreAgent() {
super.configurePreAgent()
codeOriginSetup()
injectSysConfig("dd.trace.grpc.ignored.inbound.methods", "example.Greeter/IgnoreInbound")
injectSysConfig("dd.trace.grpc.ignored.outbound.methods", "example.Greeter/Ignore")
if (hasClientMessageSpans()) {
Expand Down Expand Up @@ -689,12 +690,6 @@ class GrpcDataStreamsEnabledV0Test extends GrpcDataStreamsEnabledForkedTest {

class GrpcDataStreamsEnabledV1ForkedTest extends GrpcDataStreamsEnabledForkedTest {

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

@Override
int version() {
return 1
Expand Down
8 changes: 1 addition & 7 deletions ...-agent/instrumentation/kafka/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 @@ -65,7 +65,7 @@ abstract class KafkaClientTestBase extends VersionedNamingTestBase {
@Override
void configurePreAgent() {
super.configurePreAgent()

codeOriginSetup()
injectSysConfig("dd.kafka.e2e.duration.enabled", "true")
}

Expand Down Expand Up @@ -1024,12 +1024,6 @@ class KafkaClientV0ForkedTest extends KafkaClientForkedTest {
}

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

@Override
int version() {
1
Expand Down
2 changes: 1 addition & 1 deletion dd-trace-api/src/main/java/datadog/trace/api/ConfigDefaults.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ public final class ConfigDefaults {
static final boolean DEFAULT_WRITER_BAGGAGE_INJECT = true;
static final String DEFAULT_SITE = "datadoghq.com";

static final boolean DEFAULT_CODE_ORIGIN_FOR_SPANS_ENABLED = false;
static final boolean DEFAULT_CODE_ORIGIN_FOR_SPANS_ENABLED = true;
static final int DEFAULT_CODE_ORIGIN_MAX_USER_FRAMES = 8;
static final boolean DEFAULT_TRACE_SPAN_ORIGIN_ENRICHED = false;
static final boolean DEFAULT_TRACE_ENABLED = true;
Expand Down
2 changes: 1 addition & 1 deletion internal-api/src/main/java/datadog/trace/api/Config.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4263,7 +4263,7 @@ public String getFinalDebuggerSnapshotUrl() {
} else if (isCiVisibilityAgentlessEnabled()) {
return Intake.LOGS.getAgentlessUrl(this) + "logs";
} else {
throw new IllegalArgumentException("Cannot find snapshot endpoint on datadog agent");
return getFinalDebuggerBaseUrl() + "/debugger/v1/diagnostics";
}
}

Expand Down
2 changes: 1 addition & 1 deletion internal-api/src/test/groovy/datadog/trace/api/debugger/DebuggerConfigBridgeTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ class DebuggerConfigBridgeTest extends Specification {
then:
!DebuggerConfigBridge.isDynamicInstrumentationEnabled()
!DebuggerConfigBridge.isExceptionReplayEnabled()
!DebuggerConfigBridge.isCodeOriginEnabled()
DebuggerConfigBridge.isCodeOriginEnabled()
!DebuggerConfigBridge.isDistributedDebuggerEnabled()

when:
Expand Down