diff --git a/dd-java-agent/agent-tooling/src/main/resources/datadog/trace/agent/tooling/bytebuddy/matcher/ignored_class_name.trie b/dd-java-agent/agent-tooling/src/main/resources/datadog/trace/agent/tooling/bytebuddy/matcher/ignored_class_name.trie
index 49c9b5e095e..df1d38cd392 100644
--- a/dd-java-agent/agent-tooling/src/main/resources/datadog/trace/agent/tooling/bytebuddy/matcher/ignored_class_name.trie
+++ b/dd-java-agent/agent-tooling/src/main/resources/datadog/trace/agent/tooling/bytebuddy/matcher/ignored_class_name.trie
@@ -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
diff --git a/dd-java-agent/instrumentation/grpc-1.5/src/test/groovy/GrpcTest.groovy b/dd-java-agent/instrumentation/grpc-1.5/src/test/groovy/GrpcTest.groovy
index 2e0a05544e0..2fae55c5e7e 100644
--- a/dd-java-agent/instrumentation/grpc-1.5/src/test/groovy/GrpcTest.groovy
+++ b/dd-java-agent/instrumentation/grpc-1.5/src/test/groovy/GrpcTest.groovy
@@ -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()) {
@@ -689,12 +690,6 @@ class GrpcDataStreamsEnabledV0Test extends GrpcDataStreamsEnabledForkedTest {
 
 class GrpcDataStreamsEnabledV1ForkedTest extends GrpcDataStreamsEnabledForkedTest {
 
-  @Override
-  protected void configurePreAgent() {
-    super.configurePreAgent()
-    codeOriginSetup()
-  }
-
   @Override
   int version() {
     return 1
diff --git a/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/test/groovy/KafkaClientTestBase.groovy b/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/test/groovy/KafkaClientTestBase.groovy
index 7dbd5e60473..78d1d8f70de 100644
--- a/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/test/groovy/KafkaClientTestBase.groovy
+++ b/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/test/groovy/KafkaClientTestBase.groovy
@@ -65,7 +65,7 @@ abstract class KafkaClientTestBase extends VersionedNamingTestBase {
   @Override
   void configurePreAgent() {
     super.configurePreAgent()
-
+    codeOriginSetup()
     injectSysConfig("dd.kafka.e2e.duration.enabled", "true")
   }
 
@@ -1024,12 +1024,6 @@ class KafkaClientV0ForkedTest extends KafkaClientForkedTest {
 }
 
 class KafkaClientV1ForkedTest extends KafkaClientForkedTest {
-  @Override
-  void configurePreAgent() {
-    super.configurePreAgent()
-    codeOriginSetup()
-  }
-
   @Override
   int version() {
     1
diff --git a/dd-trace-api/src/main/java/datadog/trace/api/ConfigDefaults.java b/dd-trace-api/src/main/java/datadog/trace/api/ConfigDefaults.java
index 8ac6de1cf0b..6c0990f7510 100644
--- a/dd-trace-api/src/main/java/datadog/trace/api/ConfigDefaults.java
+++ b/dd-trace-api/src/main/java/datadog/trace/api/ConfigDefaults.java
@@ -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;
diff --git a/internal-api/src/main/java/datadog/trace/api/Config.java b/internal-api/src/main/java/datadog/trace/api/Config.java
index b22778171d5..86eb20be367 100644
--- a/internal-api/src/main/java/datadog/trace/api/Config.java
+++ b/internal-api/src/main/java/datadog/trace/api/Config.java
@@ -4342,7 +4342,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";
     }
   }
 
diff --git a/internal-api/src/test/groovy/datadog/trace/api/debugger/DebuggerConfigBridgeTest.groovy b/internal-api/src/test/groovy/datadog/trace/api/debugger/DebuggerConfigBridgeTest.groovy
index 92cee34409a..851bf581f42 100644
--- a/internal-api/src/test/groovy/datadog/trace/api/debugger/DebuggerConfigBridgeTest.groovy
+++ b/internal-api/src/test/groovy/datadog/trace/api/debugger/DebuggerConfigBridgeTest.groovy
@@ -15,7 +15,7 @@ class DebuggerConfigBridgeTest extends Specification {
     then:
     !DebuggerConfigBridge.isDynamicInstrumentationEnabled()
     !DebuggerConfigBridge.isExceptionReplayEnabled()
-    !DebuggerConfigBridge.isCodeOriginEnabled()
+    DebuggerConfigBridge.isCodeOriginEnabled()
     !DebuggerConfigBridge.isDistributedDebuggerEnabled()
 
     when: