Skip to content

Commit a93dac2

Browse files
authored
Fix OTel activation tests (#10621)
Fix OTel activation tests Co-authored-by: stuart.mcculloch <stuart.mcculloch@datadoghq.com>
1 parent 9b2d256 commit a93dac2

2 files changed

Lines changed: 9 additions & 9 deletions

File tree

dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/test/groovy/OpenTelemetry14ActivationTest.groovy

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@ abstract class OpenTelemetry14ActivationTest extends InstrumentationSpecificatio
1414

1515
expect:
1616
if (shouldBeInjected()) {
17-
tracer.class.name.endsWith(".OtelTracer")
18-
builder.class.name.endsWith(".OtelSpanBuilder")
19-
result.class.name.endsWith(".OtelSpan")
20-
context.class.name.endsWith(".OtelContext")
17+
assert tracer.class.name.endsWith(".OtelTracer")
18+
assert builder.class.name.endsWith(".OtelSpanBuilder")
19+
assert result.class.name.endsWith(".OtelSpan")
20+
assert context.class.name.endsWith(".OtelContext")
2121
} else {
22-
tracer.class.name.endsWith(".DefaultTracer")
23-
context.class.name.endsWith(".ArrayBasedContext")
22+
assert tracer.class.name.endsWith(".DefaultTracer")
23+
assert context.class.name.endsWith(".ArrayBasedContext")
2424
}
2525
}
2626
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ abstract class OpenTelemetry147ActivationTest extends InstrumentationSpecificati
1010

1111
expect:
1212
if (shouldBeInjected()) {
13-
meter.class.name.endsWith(".OtelMeter")
13+
assert meter.class.name.endsWith(".OtelMeter")
1414
} else {
15-
meter.class.name.endsWith(".DefaultTracer")
15+
assert meter.class.name.endsWith(".DefaultMeter")
1616
}
1717
}
1818
}
@@ -25,7 +25,7 @@ class OpenTelemetry147ActivationByInstrumentationNameForkedTest extends OpenTele
2525
@Override
2626
void configurePreAgent() {
2727
super.configurePreAgent()
28-
injectSysConfig("integration.opentelemetry.metrics.enabled", "true")
28+
injectSysConfig("integration.opentelemetry-metrics.enabled", "true")
2929
}
3030

3131
@Override

0 commit comments

Comments
 (0)