Skip to content

Commit 9d1b892

Browse files
committed
Put defaults in consistent location
1 parent aee4d9d commit 9d1b892

File tree

3 files changed

+6
-7
lines changed

3 files changed

+6
-7
lines changed

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,9 @@ public final class ConfigDefaults {
109109
static final Integer DEFAULT_OTEL_METRIC_EXPORT_INTERVAL = 10000;
110110
// WARNING: This defies the OpenTelemetry specification’s default value of 30000 (30s)
111111
static final Integer DEFAULT_OTEL_METRIC_EXPORT_TIMEOUT = 7500;
112+
static final String DEFAULT_OTEL_METRIC_ENDPOINT_SUFFIX = "v1/metrics";
113+
static final String DEFAULT_OTEL_METRIC_ENDPOINT_HTTP_PORT = "4318";
114+
static final String DEFAULT_OTEL_METRIC_ENDPOINT_GRPC_PORT = "4317";
112115
static final Protocol DEFAULT_OTEL_EXPORTER_OTLP_METRICS_PROTOCOL = Protocol.GRPC;
113116
static final int DEFAULT_OTEL_EXPORTER_OTLP_METRICS_TIMEOUT = 10000;
114117

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,6 @@ public final class OtelMetricsConfig {
2323
public static final String OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE =
2424
"otel.exporter.otlp.metrics.temporality.preference";
2525

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";
29-
3026
public enum Temporality {
3127
CUMULATIVE,
3228
DELTA,

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,9 @@
118118
import static datadog.trace.api.ConfigDefaults.DEFAULT_OTEL_EXPORTER_OTLP_METRICS_PROTOCOL;
119119
import static datadog.trace.api.ConfigDefaults.DEFAULT_OTEL_EXPORTER_OTLP_METRICS_TIMEOUT;
120120
import static datadog.trace.api.ConfigDefaults.DEFAULT_OTEL_METRICS_EXPORTER;
121+
import static datadog.trace.api.ConfigDefaults.DEFAULT_OTEL_METRIC_ENDPOINT_GRPC_PORT;
122+
import static datadog.trace.api.ConfigDefaults.DEFAULT_OTEL_METRIC_ENDPOINT_HTTP_PORT;
123+
import static datadog.trace.api.ConfigDefaults.DEFAULT_OTEL_METRIC_ENDPOINT_SUFFIX;
121124
import static datadog.trace.api.ConfigDefaults.DEFAULT_OTEL_METRIC_EXPORT_INTERVAL;
122125
import static datadog.trace.api.ConfigDefaults.DEFAULT_OTEL_METRIC_EXPORT_TIMEOUT;
123126
import static datadog.trace.api.ConfigDefaults.DEFAULT_PARTIAL_FLUSH_MIN_SPANS;
@@ -454,9 +457,6 @@
454457
import static datadog.trace.api.config.OtelMetricsConfig.OTEL_EXPORTER_OTLP_PROTOCOL;
455458
import static datadog.trace.api.config.OtelMetricsConfig.OTEL_EXPORTER_OTLP_TIMEOUT;
456459
import static datadog.trace.api.config.OtelMetricsConfig.OTEL_METRICS_EXPORTER;
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;

0 commit comments

Comments
 (0)