rename otlp -> otel

Author: mtoffl01

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

@@ -15,7 +15,7 @@ public final class OtlpConfig {
   public static final String OTLP_METRICS_TEMPORALITY_PREFERENCE =
       "otlp.metrics.temporality.preference";
 
-  public static final String OTLP_TRACES_EXPORTER = "otlp.traces.exporter";
+  public static final String OTEL_TRACES_EXPORTER = "otel.traces.exporter";
 
   public enum Protocol {
     GRPC,

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

@@ -449,13 +449,13 @@
 import static datadog.trace.api.config.OtlpConfig.METRICS_OTEL_ENABLED;
 import static datadog.trace.api.config.OtlpConfig.METRICS_OTEL_INTERVAL;
 import static datadog.trace.api.config.OtlpConfig.METRICS_OTEL_TIMEOUT;
+import static datadog.trace.api.config.OtlpConfig.OTEL_TRACES_EXPORTER;
 import static datadog.trace.api.config.OtlpConfig.OTLP_METRICS_COMPRESSION;
 import static datadog.trace.api.config.OtlpConfig.OTLP_METRICS_ENDPOINT;
 import static datadog.trace.api.config.OtlpConfig.OTLP_METRICS_HEADERS;
 import static datadog.trace.api.config.OtlpConfig.OTLP_METRICS_PROTOCOL;
 import static datadog.trace.api.config.OtlpConfig.OTLP_METRICS_TEMPORALITY_PREFERENCE;
 import static datadog.trace.api.config.OtlpConfig.OTLP_METRICS_TIMEOUT;
-import static datadog.trace.api.config.OtlpConfig.OTLP_TRACES_EXPORTER;
 import static datadog.trace.api.config.ProfilingConfig.PROFILING_AGENTLESS;
 import static datadog.trace.api.config.ProfilingConfig.PROFILING_AGENTLESS_DEFAULT;
 import static datadog.trace.api.config.ProfilingConfig.PROFILING_API_KEY_FILE_OLD;
@@ -1892,7 +1892,7 @@ private Config(final ConfigProvider configProvider, final InstrumenterConfig ins
     statsDClientSocketBuffer = configProvider.getInteger(STATSD_CLIENT_SOCKET_BUFFER);
     statsDClientSocketTimeout = configProvider.getInteger(STATSD_CLIENT_SOCKET_TIMEOUT);
 
-    otlpTracesExporter = configProvider.getString(OTLP_TRACES_EXPORTER);
+    otlpTracesExporter = configProvider.getString(OTEL_TRACES_EXPORTER);
 
     metricsOtelEnabled =
         configProvider.getBoolean(METRICS_OTEL_ENABLED, DEFAULT_METRICS_OTEL_ENABLED);

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

@@ -9,7 +9,7 @@ import static datadog.trace.api.config.GeneralConfig.RUNTIME_METRICS_ENABLED
 import static datadog.trace.api.config.GeneralConfig.SERVICE_NAME
 import static datadog.trace.api.config.GeneralConfig.TAGS
 import static datadog.trace.api.config.GeneralConfig.VERSION
-import static datadog.trace.api.config.OtlpConfig.OTLP_TRACES_EXPORTER
+import static datadog.trace.api.config.OtlpConfig.OTEL_TRACES_EXPORTER
 import static datadog.trace.api.config.TraceInstrumentationConfig.TRACE_ENABLED
 import static datadog.trace.api.config.TraceInstrumentationConfig.TRACE_EXTENSIONS_PATH
 import static datadog.trace.api.config.TraceInstrumentationConfig.TRACE_OTEL_ENABLED
@@ -243,7 +243,7 @@ class OtelEnvironmentConfigSourceTest extends DDSpecification {
 
     then:
     source.get(TRACE_ENABLED) == null
-    source.get(OTLP_TRACES_EXPORTER) == 'otlp'
+    source.get(OTEL_TRACES_EXPORTER) == 'otlp'
   }
 
   def "otel traces exporter otlp environment variable is mapped"() {
@@ -256,7 +256,7 @@ class OtelEnvironmentConfigSourceTest extends DDSpecification {
 
     then:
     source.get(TRACE_ENABLED) == null
-    source.get(OTLP_TRACES_EXPORTER) == 'otlp'
+    source.get(OTEL_TRACES_EXPORTER) == 'otlp'
   }
 
   def "otel traces exporter none still disables tracing"() {
@@ -269,7 +269,7 @@ class OtelEnvironmentConfigSourceTest extends DDSpecification {
 
     then:
     source.get(TRACE_ENABLED) == 'false'
-    source.get(OTLP_TRACES_EXPORTER) == null
+    source.get(OTEL_TRACES_EXPORTER) == 'none'
   }
 
   def "otel resource attributes system property is mapped"() {

utils/config-utils/src/main/java/datadog/trace/bootstrap/config/provider/OtelEnvironmentConfigSource.java

@@ -12,13 +12,13 @@
 import static datadog.trace.api.config.OtlpConfig.METRICS_OTEL_ENABLED;
 import static datadog.trace.api.config.OtlpConfig.METRICS_OTEL_INTERVAL;
 import static datadog.trace.api.config.OtlpConfig.METRICS_OTEL_TIMEOUT;
+import static datadog.trace.api.config.OtlpConfig.OTEL_TRACES_EXPORTER;
 import static datadog.trace.api.config.OtlpConfig.OTLP_METRICS_COMPRESSION;
 import static datadog.trace.api.config.OtlpConfig.OTLP_METRICS_ENDPOINT;
 import static datadog.trace.api.config.OtlpConfig.OTLP_METRICS_HEADERS;
 import static datadog.trace.api.config.OtlpConfig.OTLP_METRICS_PROTOCOL;
 import static datadog.trace.api.config.OtlpConfig.OTLP_METRICS_TEMPORALITY_PREFERENCE;
 import static datadog.trace.api.config.OtlpConfig.OTLP_METRICS_TIMEOUT;
-import static datadog.trace.api.config.OtlpConfig.OTLP_TRACES_EXPORTER;
 import static datadog.trace.api.config.TraceInstrumentationConfig.TRACE_ENABLED;
 import static datadog.trace.api.config.TraceInstrumentationConfig.TRACE_EXTENSIONS_PATH;
 import static datadog.trace.api.config.TraceInstrumentationConfig.TRACE_OTEL_ENABLED;
@@ -135,7 +135,7 @@ private void setupTraceOtelEnvironment() {
     capture(TRACE_PROPAGATION_STYLE, mapPropagationStyle(propagators));
     capture(TRACE_SAMPLE_RATE, mapSampleRate(tracesSampler));
     capture(TRACE_ENABLED, mapDataCollection("traces"));
-    capture(OTLP_TRACES_EXPORTER, mapTracesExporter());
+    capture(OTEL_TRACES_EXPORTER, mapTracesExporter());
     capture(REQUEST_HEADER_TAGS, mapHeaderTags("http.request.header.", requestHeaders));
     capture(RESPONSE_HEADER_TAGS, mapHeaderTags("http.response.header.", responseHeaders));
     capture(TRACE_EXTENSIONS_PATH, extensions);