Skip to content

Commit 726a5f0

Browse files
committed
Add otel metrics enable config but doesn't use it
1 parent 29ddda6 commit 726a5f0

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.47/src/main/java/datadog/trace/instrumentation/opentelemetry147/OpenTelemetryInstrumentation.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ public OpenTelemetryInstrumentation() {
2525

2626
@Override
2727
protected boolean defaultEnabled() {
28+
// Not activated yet to prevent NPE
2829
// return InstrumenterConfig.get().isMetricsOtelEnabled();
2930
return false;
3031
}

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

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import static datadog.trace.api.ConfigDefaults.DEFAULT_INTEGRATIONS_ENABLED;
88
import static datadog.trace.api.ConfigDefaults.DEFAULT_LLM_OBS_ENABLED;
99
import static datadog.trace.api.ConfigDefaults.DEFAULT_MEASURE_METHODS;
10+
import static datadog.trace.api.ConfigDefaults.DEFAULT_METRICS_OTEL_ENABLED;
1011
import static datadog.trace.api.ConfigDefaults.DEFAULT_RESOLVER_RESET_INTERVAL;
1112
import static datadog.trace.api.ConfigDefaults.DEFAULT_RUM_ENABLED;
1213
import static datadog.trace.api.ConfigDefaults.DEFAULT_RUNTIME_CONTEXT_FIELD_INJECTION;
@@ -29,6 +30,7 @@
2930
import static datadog.trace.api.config.GeneralConfig.TRIAGE_REPORT_TRIGGER;
3031
import static datadog.trace.api.config.IastConfig.IAST_ENABLED;
3132
import static datadog.trace.api.config.LlmObsConfig.LLMOBS_ENABLED;
33+
import static datadog.trace.api.config.OtlpConfig.METRICS_OTEL_ENABLED;
3234
import static datadog.trace.api.config.ProfilingConfig.PROFILING_DIRECT_ALLOCATION_ENABLED;
3335
import static datadog.trace.api.config.ProfilingConfig.PROFILING_DIRECT_ALLOCATION_ENABLED_DEFAULT;
3436
import static datadog.trace.api.config.ProfilingConfig.PROFILING_ENABLED;
@@ -91,9 +93,6 @@
9193
import java.util.Map;
9294
import java.util.Set;
9395

94-
// import static datadog.trace.api.config.OtelConfig.METRICS_OTEL_ENABLED;
95-
// import static datadog.trace.api.ConfigDefaults.DEFAULT_METRICS_OTEL_ENABLED;
96-
9796
/**
9897
* This config is needed before instrumentation is applied
9998
*
@@ -119,7 +118,7 @@ public class InstrumenterConfig {
119118
private final boolean codeOriginEnabled;
120119
private final boolean traceEnabled;
121120
private final boolean traceOtelEnabled;
122-
// private final boolean metricsOtelEnabled;
121+
private final boolean metricsOtelEnabled;
123122
private final ProfilingEnablement profilingEnabled;
124123
private final boolean ciVisibilityEnabled;
125124
private final ProductActivation appSecActivation;
@@ -213,8 +212,8 @@ private InstrumenterConfig() {
213212
CODE_ORIGIN_FOR_SPANS_ENABLED, DEFAULT_CODE_ORIGIN_FOR_SPANS_ENABLED);
214213
traceEnabled = configProvider.getBoolean(TRACE_ENABLED, DEFAULT_TRACE_ENABLED);
215214
traceOtelEnabled = configProvider.getBoolean(TRACE_OTEL_ENABLED, DEFAULT_TRACE_OTEL_ENABLED);
216-
// metricsOtelEnabled = configProvider.getBoolean(METRICS_OTEL_ENABLED,
217-
// DEFAULT_METRICS_OTEL_ENABLED);
215+
metricsOtelEnabled =
216+
configProvider.getBoolean(METRICS_OTEL_ENABLED, DEFAULT_METRICS_OTEL_ENABLED);
218217

219218
profilingEnabled =
220219
ProfilingEnablement.of(
@@ -379,9 +378,9 @@ public boolean isTraceOtelEnabled() {
379378
return traceOtelEnabled;
380379
}
381380

382-
// public boolean isMetricsOtelEnabled() {
383-
// return metricsOtelEnabled;
384-
// }
381+
public boolean isMetricsOtelEnabled() {
382+
return metricsOtelEnabled;
383+
}
385384

386385
public boolean isProfilingEnabled() {
387386
return profilingEnabled.isActive();
@@ -636,8 +635,8 @@ public String toString() {
636635
+ traceEnabled
637636
+ ", traceOtelEnabled="
638637
+ traceOtelEnabled
639-
// + ", metricsOtelEnabled="
640-
// + metricsOtelEnabled
638+
+ ", metricsOtelEnabled="
639+
+ metricsOtelEnabled
641640
+ ", profilingEnabled="
642641
+ profilingEnabled
643642
+ ", ciVisibilityEnabled="

0 commit comments

Comments
 (0)