Skip to content

camel-telemetry: fix trace context propagation for messaging components (backport 4.18.x) #22545

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

Merged
Croway merged 1 commit into from
Apr 13, 2026
Merged

camel-telemetry: fix trace context propagation for messaging components (backport 4.18.x) #22545

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
14 changes: 11 additions & 3 deletions ...a/org/apache/camel/telemetry/propagation/CamelHeadersSpanContextPropagationExtractor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
*/
package org.apache.camel.telemetry.propagation;

import java.nio.charset.StandardCharsets;
import java.util.Iterator;
import java.util.Map;
import java.util.Set;
Expand All @@ -27,9 +28,16 @@ public final class CamelHeadersSpanContextPropagationExtractor implements SpanCo
private final Map<String, Object> map = new CaseInsensitiveMap();

public CamelHeadersSpanContextPropagationExtractor(final Map<String, Object> map) {
// Extract string valued map entries
map.entrySet().stream().filter(e -> e.getValue() instanceof String)
.forEach(e -> this.map.put(e.getKey(), e.getValue()));
// Extract string and byte[] valued map entries.
// Messaging transports (Kafka, AMQP, etc.) may deliver headers as byte arrays,
// so we convert them to String for the W3C propagator to extract trace context.
map.entrySet().stream().filter(e -> e.getValue() instanceof String || e.getValue() instanceof byte[]).forEach(e -> {
if (e.getValue() instanceof byte[] bytes) {
this.map.put(e.getKey(), new String(bytes, StandardCharsets.UTF_8));
} else {
this.map.put(e.getKey(), e.getValue());
}
});
}

@Override
Expand Down
37 changes: 37 additions & 0 deletions .../src/test/java/org/apache/camel/telemetry/propagation/CamelHeadersExtractAdapterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
*/
package org.apache.camel.telemetry.propagation;

import java.nio.charset.StandardCharsets;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
Expand All @@ -26,6 +27,8 @@

import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertTrue;

public class CamelHeadersExtractAdapterTest {

Expand Down Expand Up @@ -69,4 +72,38 @@ public void keyWithDifferentCase() {
SpanContextPropagationExtractor adapter = new CamelHeadersSpanContextPropagationExtractor(map);
assertEquals("value", adapter.get("KeY"));
}

@Test
public void byteArrayProperty() {
map.put("traceparent", "00-abc123-def456-01".getBytes(StandardCharsets.UTF_8));
SpanContextPropagationExtractor adapter = new CamelHeadersSpanContextPropagationExtractor(map);
assertEquals("00-abc123-def456-01", adapter.get("traceparent"));
}

@Test
public void mixedStringAndByteArrayProperties() {
map.put("traceparent", "00-abc123-def456-01".getBytes(StandardCharsets.UTF_8));
map.put("custom-header", "custom-value");
SpanContextPropagationExtractor adapter = new CamelHeadersSpanContextPropagationExtractor(map);
assertEquals("00-abc123-def456-01", adapter.get("traceparent"));
assertEquals("custom-value", adapter.get("custom-header"));
}

@Test
public void nonStringNonByteArrayPropertyIsFiltered() {
map.put("integer-header", 42);
map.put("key", "value");
SpanContextPropagationExtractor adapter = new CamelHeadersSpanContextPropagationExtractor(map);
assertNull(adapter.get("integer-header"));
assertEquals("value", adapter.get("key"));
assertTrue(adapter.keys().contains("key"));
assertFalse(adapter.keys().contains("integer-header"));
}

@Test
public void byteArrayKeyWithDifferentCase() {
map.put("traceparent", "00-abc123-def456-01".getBytes(StandardCharsets.UTF_8));
SpanContextPropagationExtractor adapter = new CamelHeadersSpanContextPropagationExtractor(map);
assertEquals("00-abc123-def456-01", adapter.get("TraceParent"));
}
}
Loading