Skip to content

Commit 7f5d704

Browse files
authored
Support DD_METRICS_OTEL_ENABLED feature-flag (#10685)
Support DD_METRICS_OTEL_ENABLED feature-flag Merge branch 'master' into mcculls/otel-metrics-enabled-flag Co-authored-by: stuart.mcculloch <stuart.mcculloch@datadoghq.com>
1 parent 969d21d commit 7f5d704

3 files changed

Lines changed: 4 additions & 5 deletions

File tree

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import datadog.opentelemetry.shim.metrics.OtelMeterProvider;
1111
import datadog.trace.agent.tooling.Instrumenter;
1212
import datadog.trace.agent.tooling.InstrumenterModule;
13+
import datadog.trace.api.InstrumenterConfig;
1314
import io.opentelemetry.api.metrics.MeterProvider;
1415
import net.bytebuddy.asm.Advice;
1516
import net.bytebuddy.description.type.TypeDescription;
@@ -31,8 +32,7 @@ public OpenTelemetryMetricsInstrumentation() {
3132

3233
@Override
3334
protected boolean defaultEnabled() {
34-
// TODO: return InstrumenterConfig.get().isMetricsOtelEnabled(); when fully implemented
35-
return false;
35+
return InstrumenterConfig.get().isMetricsOtelEnabled();
3636
}
3737

3838
@Override

dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.47/src/test/groovy/OpenTelemetry147ActivationTest.groovy

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,7 @@ class OpenTelemetry147ActivationByOtelRfcNameForkedTest extends OpenTelemetry147
4343

4444
@Override
4545
boolean shouldBeInjected() {
46-
// TODO: true when OTel metrics fully implemented
47-
return false
46+
return true
4847
}
4948
}
5049

dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.47/src/test/groovy/opentelemetry147/metrics/MetricsTest.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ class MetricsTest extends InstrumentationSpecification {
2424
void configurePreAgent() {
2525
super.configurePreAgent()
2626

27-
injectSysConfig("dd.integration.opentelemetry-metrics.enabled", "true")
27+
injectSysConfig("dd.metrics.otel.enabled", "true")
2828
}
2929

3030
@Shared

0 commit comments

Comments
 (0)