diff --git a/tck/tracing/src/main/java/org/eclipse/microprofile/telemetry/tracing/tck/rest/B3MultiPropagationTest.java b/tck/tracing/src/main/java/org/eclipse/microprofile/telemetry/tracing/tck/rest/B3MultiPropagationTest.java index 632ce70..0996fe4 100644 --- a/tck/tracing/src/main/java/org/eclipse/microprofile/telemetry/tracing/tck/rest/B3MultiPropagationTest.java +++ b/tck/tracing/src/main/java/org/eclipse/microprofile/telemetry/tracing/tck/rest/B3MultiPropagationTest.java @@ -112,8 +112,11 @@ void b3MultiPropagation() { Assert.assertNull(server.getAttributes().get(BAGGAGE_METADATA_ATTR)); // Assert that the expected headers were used - Assert.assertTrue(server.getAttributes().get(PROPAGATION_HEADERS_ATTR).contains("X-B3-TraceId")); - Assert.assertTrue(server.getAttributes().get(PROPAGATION_HEADERS_ATTR).contains("X-B3-SpanId")); - Assert.assertTrue(server.getAttributes().get(PROPAGATION_HEADERS_ATTR).contains("X-B3-Sampled")); + Assert.assertTrue(server.getAttributes().get(PROPAGATION_HEADERS_ATTR).stream() + .anyMatch(x -> x.equalsIgnoreCase("X-B3-TraceId"))); + Assert.assertTrue(server.getAttributes().get(PROPAGATION_HEADERS_ATTR).stream() + .anyMatch(x -> x.equalsIgnoreCase("X-B3-SpanId"))); + Assert.assertTrue(server.getAttributes().get(PROPAGATION_HEADERS_ATTR).stream() + .anyMatch(x -> x.equalsIgnoreCase("X-B3-Sampled"))); } } diff --git a/tck/tracing/src/main/java/org/eclipse/microprofile/telemetry/tracing/tck/rest/B3PropagationTest.java b/tck/tracing/src/main/java/org/eclipse/microprofile/telemetry/tracing/tck/rest/B3PropagationTest.java index 8871993..09236d4 100644 --- a/tck/tracing/src/main/java/org/eclipse/microprofile/telemetry/tracing/tck/rest/B3PropagationTest.java +++ b/tck/tracing/src/main/java/org/eclipse/microprofile/telemetry/tracing/tck/rest/B3PropagationTest.java @@ -111,7 +111,8 @@ void b3Propagation() { // Assert that the expected headers were used Assert.assertTrue( - server.getAttributes().get(AttributeKey.stringArrayKey("test.propagation.headers")).contains("b3")); + server.getAttributes().get(AttributeKey.stringArrayKey("test.propagation.headers")).stream() + .anyMatch(x -> x.equalsIgnoreCase("b3"))); } } diff --git a/tck/tracing/src/main/java/org/eclipse/microprofile/telemetry/tracing/tck/rest/JaegerPropagationTest.java b/tck/tracing/src/main/java/org/eclipse/microprofile/telemetry/tracing/tck/rest/JaegerPropagationTest.java index 34a2c57..1b5331c 100644 --- a/tck/tracing/src/main/java/org/eclipse/microprofile/telemetry/tracing/tck/rest/JaegerPropagationTest.java +++ b/tck/tracing/src/main/java/org/eclipse/microprofile/telemetry/tracing/tck/rest/JaegerPropagationTest.java @@ -112,7 +112,9 @@ void jaegerPropagation() { Assert.assertEquals(server.getAttributes().get(BAGGAGE_METADATA_ATTR), ""); // assert that the expected headers were used - Assert.assertTrue(server.getAttributes().get(PROPAGATION_HEADERS_ATTR).contains("uber-trace-id")); - Assert.assertTrue(server.getAttributes().get(PROPAGATION_HEADERS_ATTR).contains("uberctx-" + BAGGAGE_KEY)); + Assert.assertTrue(server.getAttributes().get(PROPAGATION_HEADERS_ATTR).stream() + .anyMatch(x -> x.equalsIgnoreCase("uber-trace-id"))); + Assert.assertTrue(server.getAttributes().get(PROPAGATION_HEADERS_ATTR).stream() + .anyMatch(x -> x.equalsIgnoreCase("uberctx-" + BAGGAGE_KEY))); } } diff --git a/tck/tracing/src/main/java/org/eclipse/microprofile/telemetry/tracing/tck/rest/W3BaggagePropagationTest.java b/tck/tracing/src/main/java/org/eclipse/microprofile/telemetry/tracing/tck/rest/W3BaggagePropagationTest.java index f67afd9..75d75e5 100644 --- a/tck/tracing/src/main/java/org/eclipse/microprofile/telemetry/tracing/tck/rest/W3BaggagePropagationTest.java +++ b/tck/tracing/src/main/java/org/eclipse/microprofile/telemetry/tracing/tck/rest/W3BaggagePropagationTest.java @@ -111,7 +111,9 @@ void span() { Assert.assertEquals(server.getAttributes().get(BAGGAGE_METADATA_ATTR), BAGGAGE_METADATA); // Assert that the expected headers were used - Assert.assertTrue(server.getAttributes().get(PROPAGATION_HEADERS_ATTR).contains("traceparent")); - Assert.assertTrue(server.getAttributes().get(PROPAGATION_HEADERS_ATTR).contains("baggage")); + Assert.assertTrue(server.getAttributes().get(PROPAGATION_HEADERS_ATTR).stream() + .anyMatch(x -> x.equalsIgnoreCase("traceparent"))); + Assert.assertTrue(server.getAttributes().get(PROPAGATION_HEADERS_ATTR).stream() + .anyMatch(x -> x.equalsIgnoreCase("baggage"))); } } diff --git a/tck/tracing/src/main/java/org/eclipse/microprofile/telemetry/tracing/tck/rest/W3PropagationTest.java b/tck/tracing/src/main/java/org/eclipse/microprofile/telemetry/tracing/tck/rest/W3PropagationTest.java index ed0245b..bc9f91e 100644 --- a/tck/tracing/src/main/java/org/eclipse/microprofile/telemetry/tracing/tck/rest/W3PropagationTest.java +++ b/tck/tracing/src/main/java/org/eclipse/microprofile/telemetry/tracing/tck/rest/W3PropagationTest.java @@ -112,6 +112,7 @@ void span() { Assert.assertNull(server.getAttributes().get(BAGGAGE_METADATA_ATTR)); // Assert that the expected headers were used - Assert.assertTrue(server.getAttributes().get(PROPAGATION_HEADERS_ATTR).contains("traceparent")); + Assert.assertTrue(server.getAttributes().get(PROPAGATION_HEADERS_ATTR).stream() + .anyMatch(x -> x.equalsIgnoreCase("traceparent"))); } }