Test common standardized settings

Add the log.injection.enabled setting with the log.injection alias

Author: ygree

dd-trace-api/src/main/java/datadog/trace/api/config/TraceInstrumentationConfig.java

@@ -66,7 +66,9 @@ public final class TraceInstrumentationConfig {
   public static final String SERIALVERSIONUID_FIELD_INJECTION =
       "trace.serialversionuid.field.injection";
 
-  public static final String LOGS_INJECTION_ENABLED = "logs.injection";
+  public static final String LOGS_INJECTION_ENABLED = "logs.injection.enabled";
+  public static final String LOGS_INJECTION_ALIAS = "logs.injection";
+
   public static final String TRACE_128_BIT_TRACEID_LOGGING_ENABLED =
       "trace.128.bit.traceid.logging.enabled";
 

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

@@ -362,6 +362,7 @@
 import static datadog.trace.api.config.TraceInstrumentationConfig.JMS_UNACKNOWLEDGED_MAX_AGE;
 import static datadog.trace.api.config.TraceInstrumentationConfig.KAFKA_CLIENT_BASE64_DECODING_ENABLED;
 import static datadog.trace.api.config.TraceInstrumentationConfig.KAFKA_CLIENT_PROPAGATION_DISABLED_TOPICS;
+import static datadog.trace.api.config.TraceInstrumentationConfig.LOGS_INJECTION_ALIAS;
 import static datadog.trace.api.config.TraceInstrumentationConfig.LOGS_INJECTION_ENABLED;
 import static datadog.trace.api.config.TraceInstrumentationConfig.MESSAGE_BROKER_SPLIT_BY_DESTINATION;
 import static datadog.trace.api.config.TraceInstrumentationConfig.OBFUSCATION_QUERY_STRING_REGEXP;
@@ -1328,7 +1329,8 @@ private Config(final ConfigProvider configProvider, final InstrumenterConfig ins
     clockSyncPeriod = configProvider.getInteger(CLOCK_SYNC_PERIOD, DEFAULT_CLOCK_SYNC_PERIOD);
 
     logsInjectionEnabled =
-        configProvider.getBoolean(LOGS_INJECTION_ENABLED, DEFAULT_LOGS_INJECTION_ENABLED);
+        configProvider.getBoolean(
+            LOGS_INJECTION_ENABLED, DEFAULT_LOGS_INJECTION_ENABLED, LOGS_INJECTION_ALIAS);
 
     dogStatsDNamedPipe = configProvider.getString(DOGSTATSD_NAMED_PIPE);
 

internal-api/src/test/groovy/datadog/trace/api/ConfigCollectorTest.groovy

@@ -9,7 +9,6 @@ import datadog.trace.api.config.TraceInstrumentationConfig
 import datadog.trace.api.config.TracerConfig
 import datadog.trace.api.iast.telemetry.Verbosity
 import datadog.trace.api.naming.SpanNaming
-import datadog.trace.bootstrap.config.provider.ConfigProvider
 import datadog.trace.test.util.DDSpecification
 import datadog.trace.util.Strings
 
@@ -154,4 +153,60 @@ class ConfigCollectorTest extends DDSpecification {
     then:
     ConfigCollector.get().collect().get('DD_API_KEY').value == '<hidden>'
   }
+
+  def "collects common setting default values"() {
+    when:
+    def settings = ConfigCollector.get().collect()
+
+    then:
+    def setting = settings.get(key)
+
+    setting.key == key
+    setting.value == value
+    setting.origin == ConfigOrigin.DEFAULT
+
+    where:
+    key                      | value
+    "trace.enabled"          | true
+    "profiling.enabled"      | false
+    "appsec.enabled"         | "inactive" //TODO false
+    "data.streams.enabled"   | false
+    "tags"                   | null // TODO trace.tags ""
+    "trace.header.tags"      | null // TODO ""
+    "logs.injection.enabled" | true // TODO false
+    "trace.sample.rate"      | null // TODO 1.0
+  }
+
+  def "collects common setting overridden values"() {
+    setup:
+    injectEnvConfig("DD_TRACE_ENABLED", "false")
+    injectEnvConfig("DD_PROFILING_ENABLED", "true")
+    injectEnvConfig("DD_APPSEC_ENABLED", "false")
+    injectEnvConfig("DD_DATA_STREAMS_ENABLED", "true")
+    injectEnvConfig("DD_TAGS", "team:apm,component:web")
+    injectEnvConfig("DD_TRACE_HEADER_TAGS", "X-Header-Tag-1:header_tag_1,X-Header-Tag-2:header_tag_2")
+    injectEnvConfig("DD_LOGS_INJECTION", "false")
+    injectEnvConfig("DD_TRACE_SAMPLE_RATE", "0.3")
+
+    when:
+    def settings = ConfigCollector.get().collect()
+
+    then:
+    def setting = settings.get(key)
+
+    setting.key == key
+    setting.value == value
+    setting.origin == ConfigOrigin.ENV
+
+    where:
+    key                      | value
+    "trace.enabled"          | "false"
+    "profiling.enabled"      | "true"
+    "appsec.enabled"         | "false"
+    "data.streams.enabled"   | "true"
+    "tags"                   | "component:web,team:apm" // TODO should it preserve ordering? "team:apm,component:web"
+    "trace.header.tags"      | "X-Header-Tag-1:header_tag_1,X-Header-Tag-2:header_tag_2".toLowerCase() // TODO should it preserve case?
+    "logs.injection.enabled" | "false"
+    "trace.sample.rate"      | "0.3"
+  }
 }