From a7b327e72eb41737e27be3848928e5d6450e8300 Mon Sep 17 00:00:00 2001 From: Tyler Benson Date: Fri, 13 Mar 2020 14:56:45 -0700 Subject: [PATCH] Add check to ensure value isn't empty Otherwise split on an empty string will return an empty array. --- .../main/java/datadog/trace/agent/tooling/OpenTracing32.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/OpenTracing32.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/OpenTracing32.java index 3c10737cea..55b17b5d35 100644 --- a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/OpenTracing32.java +++ b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/OpenTracing32.java @@ -301,7 +301,9 @@ public final class OpenTracing32 implements TracerAPI { // extracted header value String s = getter.get(carrier, key); // in case of multiple values in the header, need to parse - if (s != null) s = s.split(",")[0].trim(); + if (s != null && !s.isEmpty()) { + s = s.split(",")[0].trim(); + } extracted.put(key, s); } }