Skip to content

Avoid NPE when inspecting spring messaging headers #10254

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
amarziali merged 1 commit into from
Dec 19, 2025
Merged

Avoid NPE when inspecting spring messaging headers #10254

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
8 changes: 7 additions & 1 deletion .../main/java/datadog/trace/instrumentation/springmessaging/SpringMessageExtractAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import java.util.Map;
import java.util.function.Function;
import org.springframework.messaging.Message;
import org.springframework.messaging.MessageHeaders;

public final class SpringMessageExtractAdapter
implements AgentPropagation.ContextVisitor<Message<?>> {
Expand All @@ -33,7 +34,12 @@ public String apply(String key) {

@Override
public void forEachKey(Message<?> carrier, AgentPropagation.KeyClassifier classifier) {
for (Map.Entry<String, ?> header : carrier.getHeaders().entrySet()) {
final MessageHeaders messageHeaders = carrier.getHeaders();
if (messageHeaders == null || messageHeaders.isEmpty()) {
return;
}

for (Map.Entry<String, ?> header : messageHeaders.entrySet()) {
Object headerValue = header.getValue();
if ("_datadog".equals(header.getKey())) {
if (headerValue instanceof String) {
Expand Down