diff --git a/hadoop-hdds/common/pom.xml b/hadoop-hdds/common/pom.xml index 8f93610111a1..590032749206 100644 --- a/hadoop-hdds/common/pom.xml +++ b/hadoop-hdds/common/pom.xml @@ -166,6 +166,21 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> junit-jupiter-api test + + org.junit.jupiter + junit-jupiter-engine + test + + + org.junit.vintage + junit-vintage-engine + test + + + org.junit.platform + junit-platform-launcher + test + io.jaegertracing jaeger-client diff --git a/hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/tracing/TestStringCodec.java b/hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/tracing/TestStringCodec.java index f756008a4ccc..f77e84a1dbe2 100644 --- a/hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/tracing/TestStringCodec.java +++ b/hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/tracing/TestStringCodec.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -23,7 +23,7 @@ import org.apache.ozone.test.LambdaTestUtils; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; class TestStringCodec { @@ -44,9 +44,17 @@ void testExtract() throws Exception { "String does not match tracer state format", () -> codec.extract(sb)); sb.append(":66"); + JaegerSpanContext context = codec.extract(sb); - String expectedContextString = "123:456:789:66"; - assertTrue(context.getTraceId().equals("123")); - assertTrue(context.toString().equals(expectedContextString)); + StringBuilder injected = new StringBuilder(); + codec.inject(context, injected); + + String expectedTraceId = pad("123"); + assertEquals(expectedTraceId, context.getTraceId()); + assertEquals(expectedTraceId + ":456:789:66", injected.toString()); + } + + private static String pad(String s) { + return "0000000000000000".substring(s.length()) + s; } } \ No newline at end of file