diff --git a/instrumentation/rabbitmq-2.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/TextMapExtractAdapter.java b/instrumentation/rabbitmq-2.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/TextMapExtractAdapter.java index 75f0f90bc7..9288cf48d2 100644 --- a/instrumentation/rabbitmq-2.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/TextMapExtractAdapter.java +++ b/instrumentation/rabbitmq-2.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/TextMapExtractAdapter.java @@ -6,6 +6,7 @@ package io.opentelemetry.javaagent.instrumentation.rabbitmq; import io.opentelemetry.context.propagation.TextMapGetter; +import java.util.Collections; import java.util.Map; public class TextMapExtractAdapter implements TextMapGetter> { @@ -14,12 +15,16 @@ public class TextMapExtractAdapter implements TextMapGetter> @Override public Iterable keys(Map carrier) { - return carrier.keySet(); + return carrier != null ? carrier.keySet() : Collections.emptyList(); } @Override public String get(Map carrier, String key) { - Object obj = carrier.get(key); - return obj == null ? null : obj.toString(); + if (carrier != null) { + Object obj = carrier.get(key); + return obj == null ? null : obj.toString(); + } else { + return null; + } } }