adding configs and updating specific tests to TEST strictness

Author: mhlidd

components/environment/src/generator/resources/supported-configurations.json

@@ -277,10 +277,15 @@
     "DD_PROFILING_ASYNC_CPU_INTERVAL_MS": ["A"],
     "DD_PROFILING_ASYNC_CSTACK": ["A"],
     "DD_PROFILING_ASYNC_DEBUG_LIB": ["A"],
+    "DD_PROFILING_EXPERIMENTAL_ASYNC_WALL_JVMTI": ["A"],
+    "DD_PROFILING_ASYNC_LINENUMBERS": ["A"],
     "DD_PROFILING_ASYNC_LIVEHEAP_CAPACITY": ["A"],
     "DD_PROFILING_ASYNC_LIVEHEAP_INTERVAL": ["A"],
     "DD_PROFILING_ASYNC_LIVEHEAP_SAMPLE_PERCENT": ["A"],
+    "DD_PROFILING_ASYNC_LOGLEVEL": ["A"],
     "DD_PROFILING_ASYNC_SAFEMODE": ["A"],
+    "DD_PROFILING_ASYNC_WALL_COLLAPSING": ["A"],
+    "DD_PROFILING_ASYNC_WALL_CONTEXT_FILTER": ["A"],
     "DD_PROFILING_ASYNC_WALL_INTERVAL_MS": ["A"],
     "DD_PROFILING_AUXILIARY": ["A"],
     "DD_PROFILING_BACKPRESSURE_SAMPLE_LIMIT": ["A"],
@@ -515,7 +520,7 @@
     "DD_TRACE_ARMERIA_JETTY_ENABLED": ["A"],
     "DD_TRACE_AUTH0_JWT_ENABLED": ["A"],
     "DD_TRACE_AVRO_ENABLED": ["A"],
-    "DD_TRACE_AWS_ADD_SPAN_POINTERS": ["A"],
+    "DD_TRACE_AWSADD_SPAN_POINTERS": ["A"],
     "DD_TRACE_AWS_DYNAMODB_ENABLED": ["A"],
     "DD_TRACE_AWS_LAMBDA_ENABLED": ["A"],
     "DD_TRACE_AWS_PROPAGATION_ENABLED": ["A"],
@@ -1304,11 +1309,14 @@
     "OTEL_INSTRUMENTATION_HTTP_SERVER_CAPTURE_RESPONSE_HEADERS": ["A"],
     "OTEL_JAVAAGENT_CONFIGURATION_FILE": ["A"],
     "OTEL_JAVAAGENT_EXTENSIONS": ["A"],
+    "OTEL_LOGS_EXPORTER": ["A"],
     "OTEL_LOG_LEVEL": ["A"],
+    "OTEL_METRICS_EXPORTER": ["A"],
     "OTEL_PROPAGATORS": ["A"],
     "OTEL_RESOURCE_ATTRIBUTES": ["A"],
     "OTEL_SDK_DISABLED": ["A"],
     "OTEL_SERVICE_NAME": ["A"],
+    "OTEL_TRACES_EXPORTER": ["A"],
     "OTEL_TRACES_SAMPLER": ["A"]
   },
   "aliases": {
@@ -1360,6 +1368,7 @@
     "DD_TRACE_ARMERIA_JETTY_ENABLED": ["DD_TRACE_INTEGRATION_ARMERIA_JETTY_ENABLED","DD_INTEGRATION_ARMERIA_JETTY_ENABLED"],
     "DD_TRACE_AUTH0_JWT_ENABLED": ["DD_TRACE_INTEGRATION_AUTH0_JWT_ENABLED","DD_INTEGRATION_AUTH0_JWT_ENABLED"],
     "DD_TRACE_AVRO_ENABLED": ["DD_TRACE_INTEGRATION_AVRO_ENABLED","DD_INTEGRATION_AVRO_ENABLED"],
+    "DD_TRACE_AWSADD_SPAN_POINTERS": ["DD_AWSADD_SPAN_POINTERS"],
     "DD_TRACE_AWS_DYNAMODB_ENABLED": ["DD_TRACE_INTEGRATION_AWS_DYNAMODB_ENABLED","DD_INTEGRATION_AWS_DYNAMODB_ENABLED"],
     "DD_TRACE_AWS_LAMBDA_ENABLED": ["DD_TRACE_INTEGRATION_AWS_LAMBDA_ENABLED","DD_INTEGRATION_AWS_LAMBDA_ENABLED"],
     "DD_TRACE_AWS_PROPAGATION_ENABLED": ["DD_TRACE_INTEGRATION_AWS_PROPAGATION_ENABLED","DD_INTEGRATION_AWS_PROPAGATION_ENABLED"],
@@ -1569,6 +1578,7 @@
     "DD_TRACE_KAFKA_STREAMS_ENABLED": ["DD_TRACE_INTEGRATION_KAFKA_STREAMS_ENABLED","DD_INTEGRATION_KAFKA_STREAMS_ENABLED"],
     "DD_TRACE_KARATE_ENABLED": ["DD_TRACE_INTEGRATION_KARATE_ENABLED","DD_INTEGRATION_KARATE_ENABLED"],
     "DD_TRACE_KOTLIN_COROUTINE_ENABLED": ["DD_TRACE_INTEGRATION_KOTLIN_COROUTINE_ENABLED","DD_INTEGRATION_KOTLIN_COROUTINE_ENABLED"],
+    "DD_TRACE_LEGACY_E2E_DURATION_ENABLED": ["DD_LEGACY_E2E_DURATION_ENABLED"],
     "DD_TRACE_LETTUCE_4_ASYNC_ENABLED": ["DD_TRACE_INTEGRATION_LETTUCE_4_ASYNC_ENABLED","DD_INTEGRATION_LETTUCE_4_ASYNC_ENABLED"],
     "DD_TRACE_LETTUCE_4_ENABLED": ["DD_TRACE_INTEGRATION_LETTUCE_4_ENABLED","DD_INTEGRATION_LETTUCE_4_ENABLED"],
     "DD_TRACE_LETTUCE_5_ASYNC_ENABLED": ["DD_TRACE_INTEGRATION_LETTUCE_5_ASYNC_ENABLED","DD_INTEGRATION_LETTUCE_5_ASYNC_ENABLED"],
@@ -1717,9 +1727,11 @@
     "DD_TRACE_SERVICETALK_ENABLED": ["DD_TRACE_INTEGRATION_SERVICETALK_ENABLED","DD_INTEGRATION_SERVICETALK_ENABLED"],
     "DD_TRACE_SERVLET_2_ANALYTICS_SAMPLE_RATE": ["DD_SERVLET_2_ANALYTICS_SAMPLE_RATE"],
     "DD_TRACE_SERVLET_2_ENABLED": ["DD_TRACE_INTEGRATION_SERVLET_2_ENABLED","DD_INTEGRATION_SERVLET_2_ENABLED"],
+    "DD_TRACE_SERVLET_3_ANALYTICS_ENABLED": ["DD_SERVLET_3_ANALYTICS_ENABLED"],
     "DD_TRACE_SERVLET_3_ANALYTICS_SAMPLE_RATE": ["DD_SERVLET_3_ANALYTICS_SAMPLE_RATE"],
     "DD_TRACE_SERVLET_3_ENABLED": ["DD_TRACE_INTEGRATION_SERVLET_3_ENABLED","DD_INTEGRATION_SERVLET_3_ENABLED"],
     "DD_TRACE_SERVLET_5_ENABLED": ["DD_TRACE_INTEGRATION_SERVLET_5_ENABLED","DD_INTEGRATION_SERVLET_5_ENABLED"],
+    "DD_TRACE_SERVLET_ANALYTICS_ENABLED": ["DD_SERVLET_ANALYTICS_ENABLED"],
     "DD_TRACE_SERVLET_ANALYTICS_SAMPLE_RATE": ["DD_SERVLET_ANALYTICS_SAMPLE_RATE"],
     "DD_TRACE_SERVLET_COOKIE_ENABLED": ["DD_TRACE_INTEGRATION_SERVLET_COOKIE_ENABLED","DD_INTEGRATION_SERVLET_COOKIE_ENABLED"],
     "DD_TRACE_SERVLET_DISPATCHER_ANALYTICS_SAMPLE_RATE": ["DD_SERVLET_DISPATCHER_ANALYTICS_SAMPLE_RATE"],
@@ -1773,6 +1785,7 @@
     "DD_TRACE_SPRING_WEBFLUX_CLIENT_ENABLED": ["DD_TRACE_INTEGRATION_SPRING_WEBFLUX_CLIENT_ENABLED","DD_INTEGRATION_SPRING_WEBFLUX_CLIENT_ENABLED"],
     "DD_TRACE_SPRING_WEBFLUX_ENABLED": ["DD_TRACE_INTEGRATION_SPRING_WEBFLUX_ENABLED","DD_INTEGRATION_SPRING_WEBFLUX_ENABLED"],
     "DD_TRACE_SPRING_WEBFLUX_FUNCTIONAL_ENABLED": ["DD_TRACE_INTEGRATION_SPRING_WEBFLUX_FUNCTIONAL_ENABLED","DD_INTEGRATION_SPRING_WEBFLUX_FUNCTIONAL_ENABLED"],
+    "DD_TRACE_SPRING_WEB_ANALYTICS_ENABLED": ["DD_SPRING_WEB_ANALYTICS_ENABLED"],
     "DD_TRACE_SPRING_WEB_ANALYTICS_SAMPLE_RATE": ["DD_SPRING_WEB_ANALYTICS_SAMPLE_RATE"],
     "DD_TRACE_SPRING_WEB_CODE_ORIGIN_ENABLED": ["DD_TRACE_INTEGRATION_SPRING_WEB_CODE_ORIGIN_ENABLED","DD_INTEGRATION_SPRING_WEB_CODE_ORIGIN_ENABLED"],
     "DD_TRACE_SPRING_WEB_ENABLED": ["DD_TRACE_INTEGRATION_SPRING_WEB_ENABLED","DD_INTEGRATION_SPRING_WEB_ENABLED"],
@@ -1808,8 +1821,10 @@
     "DD_TRACE_TOMCAT_CLASSLOADING_ENABLED": ["DD_TRACE_INTEGRATION_TOMCAT_CLASSLOADING_ENABLED","DD_INTEGRATION_TOMCAT_CLASSLOADING_ENABLED"],
     "DD_TRACE_TOMCAT_ENABLED": ["DD_TRACE_INTEGRATION_TOMCAT_ENABLED","DD_INTEGRATION_TOMCAT_ENABLED"],
     "DD_TRACE_TOMCAT_WEBSOCKET_ENABLED": ["DD_TRACE_INTEGRATION_TOMCAT_WEBSOCKET_ENABLED","DD_INTEGRATION_TOMCAT_WEBSOCKET_ENABLED"],
+    "DD_TRACE_TRACE_ANNOTATION_ANALYTICS_ENABLED": ["DD_TRACE_ANNOTATION_ANALYTICS_ENABLED"],
     "DD_TRACE_TRACE_ANNOTATION_ANALYTICS_SAMPLE_RATE": ["DD_TRACE_ANNOTATION_ANALYTICS_SAMPLE_RATE"],
     "DD_TRACE_TRACE_ANNOTATION_ENABLED": ["DD_TRACE_INTEGRATION_TRACE_ANNOTATION_ENABLED","DD_INTEGRATION_TRACE_ANNOTATION_ENABLED"],
+    "DD_TRACE_TRACE_CONFIG_ANALYTICS_ENABLED": ["DD_TRACE_CONFIG_ANALYTICS_ENABLED"],
     "DD_TRACE_TRACE_CONFIG_ANALYTICS_SAMPLE_RATE": ["DD_TRACE_CONFIG_ANALYTICS_SAMPLE_RATE"],
     "DD_TRACE_TRACE_CONFIG_ENABLED": ["DD_TRACE_INTEGRATION_TRACE_CONFIG_ENABLED","DD_INTEGRATION_TRACE_CONFIG_ENABLED"],
     "DD_TRACE_TRACE_ENABLED": ["DD_TRACE_INTEGRATION_TRACE_ENABLED","DD_INTEGRATION_TRACE_ENABLED"],
@@ -1818,8 +1833,11 @@
     "DD_TRACE_UNDERTOW_2_0_ENABLED": ["DD_TRACE_INTEGRATION_UNDERTOW_2_0_ENABLED","DD_INTEGRATION_UNDERTOW_2_0_ENABLED"],
     "DD_TRACE_UNDERTOW_2_2_ENABLED": ["DD_TRACE_INTEGRATION_UNDERTOW_2_2_ENABLED","DD_INTEGRATION_UNDERTOW_2_2_ENABLED"],
     "DD_TRACE_UNDERTOW_ENABLED": ["DD_TRACE_INTEGRATION_UNDERTOW_ENABLED","DD_INTEGRATION_UNDERTOW_ENABLED"],
+    "DD_TRACE_UNDERTOW_HTTP_ANALYTICS_ENABLED": ["DD_UNDERTOW_HTTP_ANALYTICS_ENABLED"],
     "DD_TRACE_UNDERTOW_HTTP_ANALYTICS_SAMPLE_RATE": ["DD_UNDERTOW_HTTP_ANALYTICS_SAMPLE_RATE"],
+    "DD_TRACE_UNDERTOW_HTTP_SERVER_ANALYTICS_ENABLED": ["DD_UNDERTOW_HTTP_SERVER_ANALYTICS_ENABLED"],
     "DD_TRACE_UNDERTOW_HTTP_SERVER_ANALYTICS_SAMPLE_RATE": ["DD_UNDERTOW_HTTP_SERVER_ANALYTICS_SAMPLE_RATE"],
+    "DD_TRACE_UNDERTOW_LEGACY_TRACING_ENABLED": ["DD_UNDERTOW_LEGACY_TRACING_ENABLED"],
     "DD_TRACE_UNDERTOW_REQUEST_PARSE_ENABLED": ["DD_TRACE_INTEGRATION_UNDERTOW_REQUEST_PARSE_ENABLED","DD_INTEGRATION_UNDERTOW_REQUEST_PARSE_ENABLED"],
     "DD_TRACE_URLCONNECTION_ANALYTICS_SAMPLE_RATE": ["DD_URLCONNECTION_ANALYTICS_SAMPLE_RATE"],
     "DD_TRACE_URLCONNECTION_ENABLED": ["DD_TRACE_INTEGRATION_URLCONNECTION_ENABLED","DD_INTEGRATION_URLCONNECTION_ENABLED"],

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

@@ -38,7 +38,7 @@ public final class TracerConfig {
       "trace.experimental.features.enabled";
 
   public static final String SPAN_TAGS = "trace.span.tags";
-  public static final String TRACE_ANALYTICS_ENABLED = "trace.analytics.enabled";
+  public static final String TRACE_ANALYTICS_ENABLED = "trace.1analytics.enabled";
 
   @Deprecated
   public static final String TRACE_SAMPLING_SERVICE_RULES = "trace.sampling.service.rules";

internal-api/src/test/groovy/datadog/trace/api/telemetry/OtelEnvMetricCollectorTest.groovy

@@ -1,8 +1,6 @@
 package datadog.trace.api.telemetry
 
 import datadog.trace.test.util.DDSpecification
-import datadog.environment.ConfigHelper
-import datadog.trace.api.ConfigInversionStrictStyle
 
 // PLEASE READ
 // When a metric is generated, it's duplicated in these tests. We call twice setupOteEnvironment() because of the separation of the configuration done in the rebuild function of DDSpecification between datadog/trace/api/InstrumenterConfig.java and internal-api/src/main/java/datadog/trace/api/Config.java.
@@ -12,16 +10,6 @@ import datadog.trace.api.ConfigInversionStrictStyle
 
 
 class OtelEnvMetricCollectorTest extends DDSpecification {
-  //  def strictness
-  //  def setup() {
-  //    strictness = ConfigHelper.configInversionStrictFlag()
-  //    ConfigHelper.setConfigInversionStrict(ConfigInversionStrictStyle.TEST)
-  //  }
-  //
-  //  def cleanup(){
-  //    ConfigHelper.setConfigInversionStrict(strictness)
-  //  }
-
   def "otel disabled - no metric"() {
     setup:
     injectEnvConfig('DD_SERVICE_NAME', 'DD_TEST_SERVICE', false)
@@ -213,5 +201,4 @@ class OtelEnvMetricCollectorTest extends DDSpecification {
     'OTEL_TRACES_EXPORTER'  | 'otlp'          || 'count'      | 1            | 'tracers'        | 'otel.env.unsupported' | 'config_opentelemetry:otel_traces_exporter'
     'OTEL_LOGS_EXPORTER'    | 'otlp'          || 'count'      | 1            | 'tracers'        | 'otel.env.unsupported' | 'config_opentelemetry:otel_logs_exporter'
   }
-
 }

internal-api/src/test/groovy/datadog/trace/bootstrap/config/provider/ConfigProviderTest.groovy

@@ -2,6 +2,8 @@ package datadog.trace.bootstrap.config.provider
 
 import datadog.trace.test.util.DDSpecification
 import spock.lang.Shared
+import datadog.trace.api.ConfigInversionStrictStyle
+import datadog.environment.ConfigHelper
 
 import static datadog.trace.api.config.TracerConfig.TRACE_HTTP_SERVER_PATH_RESOURCE_NAME_MAPPING
 
@@ -29,13 +31,18 @@ class ConfigProviderTest extends DDSpecification {
     injectEnvConfig("CONFIG_NAME", configNameValue)
     injectEnvConfig("CONFIG_ALIAS1", configAlias1Value)
     injectEnvConfig("CONFIG_ALIAS2", configAlias2Value)
+    def strictness = ConfigHelper.configInversionStrictFlag()
+    ConfigHelper.setConfigInversionStrict(ConfigInversionStrictStyle.TEST)
 
     when:
     def config = configProvider.getString("CONFIG_NAME", null, "CONFIG_ALIAS1", "CONFIG_ALIAS2")
 
     then:
     config == expected
 
+    cleanup:
+    ConfigHelper.setConfigInversionStrict(strictness)
+
     where:
     configNameValue | configAlias1Value | configAlias2Value | expected
     "default"       | null              | null              | "default"

internal-api/src/test/groovy/datadog/trace/bootstrap/config/provider/StableConfigParserTest.groovy

@@ -1,4 +1,7 @@
 package datadog.trace.bootstrap.config.provider
+
+import datadog.environment.ConfigHelper
+import datadog.trace.api.ConfigInversionStrictStyle
 import datadog.trace.test.util.DDSpecification
 import java.nio.file.Files
 import java.nio.file.Path
@@ -233,10 +236,15 @@ apm_configuration_rules:
     if (envKey != null) {
       injectEnvConfig(envKey, envVal)
     }
+    def strictness = ConfigHelper.configInversionStrictFlag()
+    ConfigHelper.setConfigInversionStrict(ConfigInversionStrictStyle.TEST)
 
     then:
     StableConfigParser.processTemplate(templateVar) == expect
 
+    cleanup:
+    ConfigHelper.setConfigInversionStrict(strictness)
+
     where:
     templateVar                                                                                                 | envKey   | envVal  | expect
     "{{environment_variables['DD_KEY']}}"                                                                       | "DD_KEY" | "value" | "value"