Default log injection to true

randomanderson · randomanderson · commit 867a25a32395 · 2021-02-08T12:48:11.000-05:00
diff --git a/dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/log/injection/LogContextInjectionTestBase.groovy b/dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/log/injection/LogContextInjectionTestBase.groovy
@@ -42,7 +42,6 @@ abstract class LogContextInjectionTestBase extends AgentTestRunner {
   @Override
   void configurePreAgent() {
     super.configurePreAgent()
-    injectSysConfig("dd.logs.injection", "true")
     injectSysConfig("dd.logs.mdc.tags.injection", "true")
     injectSysConfig(TAGS, "env:${TEST_ENV},version:${TEST_VERSION}")
   }
diff --git a/dd-smoke-tests/log-injection/src/test/groovy/datadog/smoketest/LogInjectionSmokeTest.groovy b/dd-smoke-tests/log-injection/src/test/groovy/datadog/smoketest/LogInjectionSmokeTest.groovy
@@ -44,7 +44,6 @@ abstract class LogInjectionSmokeTest extends AbstractSmokeTest {
     command.addAll(defaultJavaProperties)
     command.add("-Ddd.test.logfile=${outputLogFile.absolutePath}" as String)
     command.add("-Ddd.test.jsonlogfile=${outputJsonLogFile.absolutePath}" as String)
-    command.add("-Ddd.logs.injection=true")
     command.addAll(additionalArguments())
     command.addAll((String[]) ["-jar", loggingJar])
 
diff --git a/dd-smoke-tests/quarkus/src/test/groovy/datadog/smoketest/QuarkusSmokeTest.groovy b/dd-smoke-tests/quarkus/src/test/groovy/datadog/smoketest/QuarkusSmokeTest.groovy
@@ -18,7 +18,6 @@ abstract class QuarkusSmokeTest extends AbstractServerSmokeTest {
     command.addAll(defaultJavaProperties)
     command.addAll((String[]) [
       "-Ddd.writer.type=MultiWriter:TraceStructureWriter:${output.getAbsolutePath()},DDAgentWriter",
-      "-Ddd.logs.injection=true",
       "-Ddd.app.customlogmanager=true",
       "-Dquarkus.http.port=${httpPort}",
       "-jar",
diff --git a/dd-smoke-tests/slf4j-mdc/src/test/groovy/datadog/smoketest/Slf4jMDCSmokeTest.groovy b/dd-smoke-tests/slf4j-mdc/src/test/groovy/datadog/smoketest/Slf4jMDCSmokeTest.groovy
@@ -34,7 +34,6 @@ class Slf4jMDCSmokeTest extends Specification {
     command.add("-XX:ErrorFile=/tmp/hs_err_pid%p.log")
     command.add("-Ddd.writer.type=TraceStructureWriter")
     command.add("-Ddd.trace.debug=true")
-    command.add("-Ddd.logs.injection=true")
     command.add("-Dorg.slf4j.simpleLogger.defaultLogLevel=DEBUG")
     command.add("-Dorg.slf4j.simpleLogger.showThreadName=false")
     command.add("-jar")
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
@@ -52,7 +52,7 @@ public final class ConfigDefaults {
   static final boolean DEFAULT_PERF_METRICS_ENABLED = false;
   // No default constants for metrics statsd support -- falls back to jmxfetch values
 
-  static final boolean DEFAULT_LOGS_INJECTION_ENABLED = false;
+  static final boolean DEFAULT_LOGS_INJECTION_ENABLED = true;
 
   static final boolean DEFAULT_PROFILING_ENABLED = false;
   static final int DEFAULT_PROFILING_START_DELAY = 10;

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,6 @@ abstract class LogContextInjectionTestBase extends AgentTestRunner {`
`42`	`42`	`@Override`
`43`	`43`	`void configurePreAgent() {`
`44`	`44`	`super.configurePreAgent()`
`45`		`- injectSysConfig("dd.logs.injection", "true")`
`46`	`45`	`injectSysConfig("dd.logs.mdc.tags.injection", "true")`
`47`	`46`	`injectSysConfig(TAGS, "env:${TEST_ENV},version:${TEST_VERSION}")`
`48`	`47`	`}`