Skip to content

Commit 2b72fff

Browse files
committed
feat(otel): Migrate test to JUnit
1 parent 6631e15 commit 2b72fff

File tree

6 files changed

+7
-12
lines changed

6 files changed

+7
-12
lines changed

dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/test/java/opentelemetry14/AbstractOpenTelemetry14Test.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,7 @@ void checkOtelContextAndCleanup() {
4343

4444
private static void clearContextStorage() {
4545
try {
46-
Class<?> storageClass =
47-
Class.forName("io.opentelemetry.context.ThreadLocalContextStorage");
46+
Class<?> storageClass = Class.forName("io.opentelemetry.context.ThreadLocalContextStorage");
4847
Field field = storageClass.getDeclaredField("THREAD_LOCAL_STORAGE");
4948
field.setAccessible(true);
5049
((ThreadLocal<?>) field.get(null)).remove();

dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/test/java/opentelemetry14/OpenTelemetry14ConventionsTest.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -308,10 +308,7 @@ void testSpanHttpResponseStatusCodeSpecificTag(
308308

309309
assertTraces(
310310
trace(
311-
span()
312-
.root()
313-
.operationName("internal")
314-
.tags(tagMatchers.toArray(new TagsMatcher[0]))));
311+
span().root().operationName("internal").tags(tagMatchers.toArray(new TagsMatcher[0]))));
315312
}
316313

317314
static Map<String, String> attributes(String... keyValues) {

dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/test/java/opentelemetry14/context/propagation/B3MultiPropagatorTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ class B3MultiPropagatorTest extends AgentPropagatorTest {
1919
private static final String SAMPLING_PRIORITY_KEY = "X-B3-Sampled";
2020

2121
static Stream<Arguments> values() {
22-
// splotless:off
22+
// spotless:off
2323
return Stream.of(
2424
arguments(
2525
headers(TRACE_ID_KEY, "1", SPAN_ID_KEY, "2"),

dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/test/java/opentelemetry14/context/propagation/B3SinglePropagatorTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ class B3SinglePropagatorTest extends AgentPropagatorTest {
1717
private static final String B3_KEY = "b3";
1818

1919
static Stream<Arguments> values() {
20-
// splotless:off
20+
// spotless:off
2121
return Stream.of(
2222
arguments(headers(B3_KEY, "1-2"),
2323
"1",
@@ -43,7 +43,7 @@ static Stream<Arguments> values() {
4343
"11111111111111111111111111111111",
4444
"2222222222222222",
4545
SAMPLER_KEEP));
46-
// splotless:on
46+
// spotless:on
4747
}
4848

4949
@Override

dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/test/java/opentelemetry14/context/propagation/DatadogPropagatorTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ class DatadogPropagatorTest extends AgentPropagatorTest {
2020
static Stream<Arguments> values() {
2121
String traceIdDecimal = Long.toString(Long.parseLong("1111111111111111", 16));
2222
String parentIdDecimal = Long.toString(Long.parseLong("2222222222222222", 16));
23-
// splotless:off
23+
// spotless:off
2424
return Stream.of(
2525
arguments(
2626
headers(
@@ -63,7 +63,7 @@ static Stream<Arguments> values() {
6363
"11111111111111111111111111111111",
6464
"2222222222222222",
6565
SAMPLER_DROP));
66-
// splotless:on
66+
// spotless:on
6767
}
6868

6969
@Override

dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/test/java/opentelemetry14/context/propagation/W3cPropagatorTracestateTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,5 +55,4 @@ void testTracestatePropagation(String tracestate) {
5555
assertEquals(members[i], injectedMembers[i + 1]);
5656
}
5757
}
58-
5958
}

0 commit comments

Comments
 (0)