Skip to content

Make checks for propagation headers case insensitive #294

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Make checks for propagation headers case insensitive #294

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions ...main/java/org/eclipse/microprofile/telemetry/tracing/tck/rest/B3MultiPropagationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")));
}
}
3 changes: 2 additions & 1 deletion .../src/main/java/org/eclipse/microprofile/telemetry/tracing/tck/rest/B3PropagationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")));

}
}
6 changes: 4 additions & 2 deletions .../main/java/org/eclipse/microprofile/telemetry/tracing/tck/rest/JaegerPropagationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)));
}
}
6 changes: 4 additions & 2 deletions ...in/java/org/eclipse/microprofile/telemetry/tracing/tck/rest/W3BaggagePropagationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")));
}
}
3 changes: 2 additions & 1 deletion .../src/main/java/org/eclipse/microprofile/telemetry/tracing/tck/rest/W3PropagationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")));
}
}