Config changes that may impact precedence order for overlapping config defined in multiple places.

.gitignore

@@ -57,6 +57,7 @@ derby.log
 hs_err_pid*
 replay_pid*
 
+**/src/*/generated/*
 !dd-java-agent/benchmark/releases/*.jar
 
 # Magic for local JMC built

.palantir/revapi.yml

@@ -617,3 +617,13 @@ acceptedBreaks:
       old: "method void java.lang.Object::wait(long, int) throws java.lang.InterruptedException\
         \ @ datadog.trace.common.writer.ddagent.TraceMapper"
       justification: "it's always revapi"
+  "0.61.0":
+    com.datadoghq:dd-trace-ot:
+    - code: "java.method.removed"
+      old: "method java.lang.Boolean datadog.trace.api.Config::getBooleanSettingFromEnvironment(java.lang.String,\
+        \ java.lang.Boolean)"
+      justification: "config cleanup"
+    - code: "java.method.removed"
+      old: "method java.lang.Float datadog.trace.api.Config::getFloatSettingFromEnvironment(java.lang.String,\
+        \ java.lang.Float)"
+      justification: "config cleanup"

dd-java-agent/instrumentation/couchbase-2.0/src/test/groovy/util/AbstractCouchbaseTest.groovy

@@ -23,8 +23,8 @@ import spock.lang.Shared
 
 import java.util.concurrent.TimeUnit
 
-import static datadog.trace.api.Config.PREFIX
 import static datadog.trace.api.config.TraceInstrumentationConfig.DB_CLIENT_HOST_SPLIT_BY_INSTANCE
+import static datadog.trace.bootstrap.config.provider.SystemPropertiesConfigSource.PREFIX
 
 abstract class AbstractCouchbaseTest extends AgentTestRunner {
 

dd-java-agent/instrumentation/jedis-1.4/src/test/groovy/JedisClientTest.groovy

@@ -6,8 +6,8 @@ import redis.clients.jedis.Jedis
 import redis.embedded.RedisServer
 import spock.lang.Shared
 
-import static datadog.trace.api.Config.PREFIX
 import static datadog.trace.api.config.TraceInstrumentationConfig.DB_CLIENT_HOST_SPLIT_BY_INSTANCE
+import static datadog.trace.bootstrap.config.provider.SystemPropertiesConfigSource.PREFIX
 
 class JedisClientTest extends AgentTestRunner {
 

dd-java-agent/instrumentation/jedis-3.0/src/test/groovy/Jedis30ClientTest.groovy

@@ -6,8 +6,8 @@ import redis.clients.jedis.Jedis
 import redis.embedded.RedisServer
 import spock.lang.Shared
 
-import static datadog.trace.api.Config.PREFIX
 import static datadog.trace.api.config.TraceInstrumentationConfig.DB_CLIENT_HOST_SPLIT_BY_INSTANCE
+import static datadog.trace.bootstrap.config.provider.SystemPropertiesConfigSource.PREFIX
 
 class Jedis30ClientTest extends AgentTestRunner {
 

dd-java-agent/instrumentation/rediscala-1.8.0/src/test/groovy/RediscalaClientTest.groovy

@@ -13,8 +13,8 @@ import scala.concurrent.Await
 import scala.concurrent.duration.Duration
 import spock.lang.Shared
 
-import static datadog.trace.api.Config.PREFIX
 import static datadog.trace.api.config.TraceInstrumentationConfig.DB_CLIENT_HOST_SPLIT_BY_INSTANCE
+import static datadog.trace.bootstrap.config.provider.SystemPropertiesConfigSource.PREFIX
 
 class RediscalaClientTest extends AgentTestRunner {
 

dd-java-agent/instrumentation/spymemcached-2.12/src/test/groovy/datadog/trace/instrumentation/spymemcached/SpymemcachedTest.groovy

@@ -27,8 +27,8 @@ import static CompletionListener.COMPONENT_NAME
 import static CompletionListener.OPERATION_NAME
 import static CompletionListener.SERVICE_NAME
 import static datadog.trace.agent.test.utils.TraceUtils.runUnderTrace
-import static datadog.trace.api.Config.PREFIX
 import static datadog.trace.api.config.TraceInstrumentationConfig.DB_CLIENT_HOST_SPLIT_BY_INSTANCE
+import static datadog.trace.bootstrap.config.provider.SystemPropertiesConfigSource.PREFIX
 import static net.spy.memcached.ConnectionFactoryBuilder.Protocol.BINARY
 
 // Do not run tests locally on Java7 since testcontainers are not compatible with Java7

dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/log/injection/LogContextInjectionTestBase.groovy

@@ -9,8 +9,8 @@ import datadog.trace.bootstrap.instrumentation.api.Tags
 
 import java.util.concurrent.atomic.AtomicReference
 
-import static datadog.trace.api.Config.PREFIX
 import static datadog.trace.api.config.GeneralConfig.TAGS
+import static datadog.trace.bootstrap.config.provider.SystemPropertiesConfigSource.PREFIX
 import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan
 import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan
 

dd-java-agent/testing/src/test/groovy/context/FieldBackedProviderTest.groovy

@@ -23,6 +23,7 @@ import static context.ContextTestInstrumentation.IncorrectContextClassUsageKeyCl
 import static context.ContextTestInstrumentation.IncorrectKeyClassUsageKeyClass
 import static context.ContextTestInstrumentation.KeyClass
 import static context.ContextTestInstrumentation.UntransformableKeyClass
+import static datadog.trace.bootstrap.config.provider.SystemPropertiesConfigSource.PREFIX
 
 class FieldBackedProviderTest extends AgentTestRunner {
 
@@ -190,7 +191,7 @@ class FieldBackedProviderTest extends AgentTestRunner {
  * Unfortunately we cannot set system properties here early enough for AgentTestRunner to see.
  * Instead we have to configure this via Gradle. Ideally we should not have to do this.
  */
-@Requires({ "true" == System.getProperty(Config.PREFIX + Config.RUNTIME_CONTEXT_FIELD_INJECTION) })
+@Requires({ "true" == System.getProperty(PREFIX + Config.RUNTIME_CONTEXT_FIELD_INJECTION) })
 class FieldBackedProviderFieldInjectionDisabledTest extends AgentTestRunner {
   def "Check that structure is not modified when structure modification is disabled"() {
     setup:

dd-trace-api/src/main/java/datadog/trace/api/ConfigDefaults.java

@@ -35,7 +35,6 @@ public final class ConfigDefaults {
   static final boolean DEFAULT_HTTP_CLIENT_TAG_QUERY_STRING = false;
   static final boolean DEFAULT_HTTP_CLIENT_SPLIT_BY_DOMAIN = false;
   static final boolean DEFAULT_DB_CLIENT_HOST_SPLIT_BY_INSTANCE = false;
-  static final String DEFAULT_SPLIT_BY_TAGS = "";
   static final int DEFAULT_SCOPE_DEPTH_LIMIT = 100;
   static final int DEFAULT_PARTIAL_FLUSH_MIN_SPANS = 1000;
   static final String DEFAULT_PROPAGATION_STYLE_EXTRACT = PropagationStyle.DATADOG.name();
@@ -66,7 +65,6 @@ public final class ConfigDefaults {
   static final boolean DEFAULT_TRACE_REPORT_HOSTNAME = false;
   static final String DEFAULT_TRACE_ANNOTATIONS = null;
   static final boolean DEFAULT_TRACE_EXECUTORS_ALL = false;
-  static final String DEFAULT_TRACE_EXECUTORS = "";
   static final String DEFAULT_TRACE_METHODS = null;
   static final boolean DEFAULT_TRACE_ANALYTICS_ENABLED = false;
   static final float DEFAULT_ANALYTICS_SAMPLE_RATE = 1.0f;

dd-trace-core/src/test/groovy/datadog/trace/core/CoreTracerTest.groovy

@@ -20,14 +20,14 @@ import org.junit.contrib.java.lang.system.RestoreSystemProperties
 import spock.lang.Timeout
 
 import static datadog.trace.agent.test.utils.ConfigUtils.withConfigOverride
-import static datadog.trace.api.Config.PREFIX
 import static datadog.trace.api.config.GeneralConfig.HEALTH_METRICS_ENABLED
 import static datadog.trace.api.config.TracerConfig.AGENT_UNIX_DOMAIN_SOCKET
 import static datadog.trace.api.config.TracerConfig.HEADER_TAGS
 import static datadog.trace.api.config.TracerConfig.PRIORITY_SAMPLING
 import static datadog.trace.api.config.TracerConfig.SERVICE_MAPPING
 import static datadog.trace.api.config.TracerConfig.SPAN_TAGS
 import static datadog.trace.api.config.TracerConfig.WRITER_TYPE
+import static datadog.trace.bootstrap.config.provider.SystemPropertiesConfigSource.PREFIX
 
 @Timeout(10)
 class CoreTracerTest extends DDSpecification {

internal-api/internal-api.gradle

@@ -1,6 +1,7 @@
 apply from: "$rootDir/gradle/java.gradle"
 
-minimumBranchCoverage = 0.8
+minimumBranchCoverage = 0.7
+minimumInstructionCoverage = 0.8
 
 excludedClassesCoverage += [
   "datadog.trace.bootstrap.instrumentation.api.Tags",