Skip to content

Commit aee4d9d

Browse files
mccullsmcculls
committed
Cleanup OTel constants
1 parent d4bc02d commit aee4d9d

File tree

3 files changed

+18
-20
lines changed

3 files changed

+18
-20
lines changed

‎dd-trace-api/src/main/java/datadog/trace/api/config/OtelMetricsConfig.java‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,11 @@
33
public final class OtelMetricsConfig {
44

55
public static final String METRICS_OTEL_ENABLED = "metrics.otel.enabled";
6-
public static final String OTEL_RESOURCE_ATTRIBUTES = "otel.resource.attributes";
6+
77
public static final String OTEL_METRICS_EXPORTER = "otel.metrics.exporter";
88
public static final String OTEL_METRIC_EXPORT_INTERVAL = "otel.metric.export.interval";
99
public static final String OTEL_METRIC_EXPORT_TIMEOUT = "otel.metric.export.timeout";
10+
1011
public static final String OTEL_EXPORTER_OTLP_ENDPOINT = "otel.exporter.otlp.endpoint";
1112
public static final String OTEL_EXPORTER_OTLP_HEADERS = "otel.exporter.otlp.headers";
1213
public static final String OTEL_EXPORTER_OTLP_PROTOCOL = "otel.exporter.otlp.protocol";
@@ -22,25 +23,25 @@ public final class OtelMetricsConfig {
2223
public static final String OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE =
2324
"otel.exporter.otlp.metrics.temporality.preference";
2425

25-
public static final String OTEL_METRIC_DEFAULT_ENDPOINT_SUFFIX = "v1/metrics";
26-
public static final String OTEL_METRIC_DEFAULT_ENDPOINT_HTTP_PORT = "4318";
27-
public static final String OTEL_METRIC_DEFAULT_ENDPOINT_GRPC_PORT = "4317";
26+
public static final String DEFAULT_OTEL_METRIC_ENDPOINT_SUFFIX = "v1/metrics";
27+
public static final String DEFAULT_OTEL_METRIC_ENDPOINT_HTTP_PORT = "4318";
28+
public static final String DEFAULT_OTEL_METRIC_ENDPOINT_GRPC_PORT = "4317";
2829

2930
public enum Temporality {
3031
CUMULATIVE,
3132
DELTA,
32-
LOWMEMORY;
33+
LOWMEMORY
3334
}
3435

3536
public enum Exporter {
3637
OTLP,
37-
NONE;
38+
NONE
3839
}
3940

4041
public enum Protocol {
4142
GRPC,
4243
HTTP_PROTOBUF,
43-
HTTP_JSON;
44+
HTTP_JSON
4445
}
4546

4647
private OtelMetricsConfig() {}

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -454,9 +454,9 @@
454454
import static datadog.trace.api.config.OtelMetricsConfig.OTEL_EXPORTER_OTLP_PROTOCOL;
455455
import static datadog.trace.api.config.OtelMetricsConfig.OTEL_EXPORTER_OTLP_TIMEOUT;
456456
import static datadog.trace.api.config.OtelMetricsConfig.OTEL_METRICS_EXPORTER;
457-
import static datadog.trace.api.config.OtelMetricsConfig.OTEL_METRIC_DEFAULT_ENDPOINT_GRPC_PORT;
458-
import static datadog.trace.api.config.OtelMetricsConfig.OTEL_METRIC_DEFAULT_ENDPOINT_HTTP_PORT;
459-
import static datadog.trace.api.config.OtelMetricsConfig.OTEL_METRIC_DEFAULT_ENDPOINT_SUFFIX;
457+
import static datadog.trace.api.config.OtelMetricsConfig.DEFAULT_OTEL_METRIC_ENDPOINT_GRPC_PORT;
458+
import static datadog.trace.api.config.OtelMetricsConfig.DEFAULT_OTEL_METRIC_ENDPOINT_HTTP_PORT;
459+
import static datadog.trace.api.config.OtelMetricsConfig.DEFAULT_OTEL_METRIC_ENDPOINT_SUFFIX;
460460
import static datadog.trace.api.config.OtelMetricsConfig.OTEL_METRIC_EXPORT_INTERVAL;
461461
import static datadog.trace.api.config.OtelMetricsConfig.OTEL_METRIC_EXPORT_TIMEOUT;
462462
import static datadog.trace.api.config.ProfilingConfig.PROFILING_AGENTLESS;
@@ -1930,14 +1930,14 @@ private Config(final ConfigProvider configProvider, final InstrumenterConfig ins
19301930
? "http://"
19311931
+ endpointHost
19321932
+ ":"
1933-
+ OTEL_METRIC_DEFAULT_ENDPOINT_HTTP_PORT
1933+
+ DEFAULT_OTEL_METRIC_ENDPOINT_HTTP_PORT
19341934
+ "/"
1935-
+ OTEL_METRIC_DEFAULT_ENDPOINT_SUFFIX
1936-
: "http://" + endpointHost + ":" + OTEL_METRIC_DEFAULT_ENDPOINT_GRPC_PORT;
1935+
+ DEFAULT_OTEL_METRIC_ENDPOINT_SUFFIX
1936+
: "http://" + endpointHost + ":" + DEFAULT_OTEL_METRIC_ENDPOINT_GRPC_PORT;
19371937
} else {
19381938
tmpOtelExporterOtlpMetricsEndpoint =
19391939
isHttp
1940-
? tmpOtelExporterOtlpEndpoint.concat(OTEL_METRIC_DEFAULT_ENDPOINT_SUFFIX)
1940+
? tmpOtelExporterOtlpEndpoint.concat(DEFAULT_OTEL_METRIC_ENDPOINT_SUFFIX)
19411941
: tmpOtelExporterOtlpEndpoint;
19421942
}
19431943
}

‎internal-api/src/test/groovy/datadog/trace/api/ConfigTest.groovy‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,6 @@ import static datadog.trace.api.config.OtelMetricsConfig.Exporter.OTLP
144144
import static datadog.trace.api.config.OtelMetricsConfig.Temporality.CUMULATIVE
145145
import static datadog.trace.api.config.OtelMetricsConfig.Temporality.DELTA
146146
import static datadog.trace.api.config.OtelMetricsConfig.METRICS_OTEL_ENABLED
147-
import static datadog.trace.api.config.OtelMetricsConfig.OTEL_RESOURCE_ATTRIBUTES
148147
import static datadog.trace.api.config.OtelMetricsConfig.OTEL_EXPORTER_OTLP_ENDPOINT
149148
import static datadog.trace.api.config.OtelMetricsConfig.OTEL_METRICS_EXPORTER
150149
import static datadog.trace.api.config.OtelMetricsConfig.OTEL_METRIC_EXPORT_INTERVAL
@@ -194,8 +193,6 @@ class ConfigTest extends DDSpecification {
194193
private static final DD_LLMOBS_ML_APP_ENV = "DD_LLMOBS_ML_APP"
195194
private static final DD_LLMOBS_AGENTLESS_ENABLED_ENV = "DD_LLMOBS_AGENTLESS_ENABLED"
196195

197-
198-
199196
private static final DD_METRICS_OTEL_ENABLED_ENV = "DD_METRICS_OTEL_ENABLED"
200197
private static final OTEL_RESOURCE_ATTRIBUTES_ENV = "OTEL_RESOURCE_ATTRIBUTES"
201198
private static final OTEL_METRICS_EXPORTER_ENV = "OTEL_METRICS_EXPORTER"
@@ -489,7 +486,7 @@ class ConfigTest extends DDSpecification {
489486
def "otel generic config via system properties - metrics enabled"() {
490487
setup:
491488
System.setProperty(PREFIX + METRICS_OTEL_ENABLED, "true")
492-
System.setProperty(OTEL_RESOURCE_ATTRIBUTES, "service.name=my=app,service.version=1.0.0,deployment.environment=production, message=blahblah")
489+
System.setProperty(OTEL_RESOURCE_ATTRIBUTES_ENV, "service.name=my=app,service.version=1.0.0,deployment.environment=production, message=blahblah")
493490
System.setProperty("otel.log.level", "warning")
494491

495492
when:
@@ -509,7 +506,7 @@ class ConfigTest extends DDSpecification {
509506
def "otel generic config via system properties - trace enabled"() {
510507
setup:
511508
System.setProperty(PREFIX + TRACE_OTEL_ENABLED, "true")
512-
System.setProperty(OTEL_RESOURCE_ATTRIBUTES, "service.name=my=app,service.version=1.0.0,deployment.environment=production, message=blahblah")
509+
System.setProperty(OTEL_RESOURCE_ATTRIBUTES_ENV, "service.name=my=app,service.version=1.0.0,deployment.environment=production, message=blahblah")
513510
System.setProperty("otel.log.level", "warning")
514511

515512
when:
@@ -707,7 +704,7 @@ class ConfigTest extends DDSpecification {
707704
System.setProperty(PREFIX + TRACE_X_DATADOG_TAGS_MAX_LENGTH, "128")
708705

709706
System.setProperty(PREFIX + METRICS_OTEL_ENABLED, "True")
710-
System.setProperty(OTEL_RESOURCE_ATTRIBUTES, "service.name=my=app,service.version=1.0.0,deployment.environment=production")
707+
System.setProperty(OTEL_RESOURCE_ATTRIBUTES_ENV, "service.name=my=app,service.version=1.0.0,deployment.environment=production")
711708
System.setProperty(OTEL_METRICS_EXPORTER, "otlp")
712709
System.setProperty(OTEL_METRIC_EXPORT_INTERVAL, "11000")
713710
System.setProperty(OTEL_METRIC_EXPORT_TIMEOUT, "9000")

0 commit comments

Comments
 (0)