From 28720cb69b6b5c37ddd3b5141ceb9c38c60b0b7e Mon Sep 17 00:00:00 2001 From: Stuart McCulloch Date: Wed, 18 Feb 2026 13:18:04 +0000 Subject: [PATCH] Fix OTel activation tests --- .../test/groovy/OpenTelemetry14ActivationTest.groovy | 12 ++++++------ .../groovy/OpenTelemetry147ActivationTest.groovy | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/test/groovy/OpenTelemetry14ActivationTest.groovy b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/test/groovy/OpenTelemetry14ActivationTest.groovy index 93ec40f92ac..50115948222 100644 --- a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/test/groovy/OpenTelemetry14ActivationTest.groovy +++ b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/test/groovy/OpenTelemetry14ActivationTest.groovy @@ -14,13 +14,13 @@ abstract class OpenTelemetry14ActivationTest extends InstrumentationSpecificatio expect: if (shouldBeInjected()) { - tracer.class.name.endsWith(".OtelTracer") - builder.class.name.endsWith(".OtelSpanBuilder") - result.class.name.endsWith(".OtelSpan") - context.class.name.endsWith(".OtelContext") + assert tracer.class.name.endsWith(".OtelTracer") + assert builder.class.name.endsWith(".OtelSpanBuilder") + assert result.class.name.endsWith(".OtelSpan") + assert context.class.name.endsWith(".OtelContext") } else { - tracer.class.name.endsWith(".DefaultTracer") - context.class.name.endsWith(".ArrayBasedContext") + assert tracer.class.name.endsWith(".DefaultTracer") + assert context.class.name.endsWith(".ArrayBasedContext") } } } diff --git a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.47/src/test/groovy/OpenTelemetry147ActivationTest.groovy b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.47/src/test/groovy/OpenTelemetry147ActivationTest.groovy index 48f398ba037..47fc205b138 100644 --- a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.47/src/test/groovy/OpenTelemetry147ActivationTest.groovy +++ b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.47/src/test/groovy/OpenTelemetry147ActivationTest.groovy @@ -10,9 +10,9 @@ abstract class OpenTelemetry147ActivationTest extends InstrumentationSpecificati expect: if (shouldBeInjected()) { - meter.class.name.endsWith(".OtelMeter") + assert meter.class.name.endsWith(".OtelMeter") } else { - meter.class.name.endsWith(".DefaultTracer") + assert meter.class.name.endsWith(".DefaultMeter") } } } @@ -25,7 +25,7 @@ class OpenTelemetry147ActivationByInstrumentationNameForkedTest extends OpenTele @Override void configurePreAgent() { super.configurePreAgent() - injectSysConfig("integration.opentelemetry.metrics.enabled", "true") + injectSysConfig("integration.opentelemetry-metrics.enabled", "true") } @Override