Issue-1034 Short XRay Trace (#1036)

open-telemetry · Sep 16, 2024 · 75db558 · 75db558
1 parent 41c8891
commit 75db558
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/...opagator/src/main/java/io/opentelemetry/contrib/awsxray/propagator/AwsXrayPropagator.java b/...opagator/src/main/java/io/opentelemetry/contrib/awsxray/propagator/AwsXrayPropagator.java
@@ -290,7 +290,8 @@ private static String parseShortTraceId(String xrayTraceId) {
     int secondDelimiter = xrayTraceId.indexOf(TRACE_ID_DELIMITER, firstDelimiter + 2);
     if (firstDelimiter != TRACE_ID_DELIMITER_INDEX_1
         || secondDelimiter == -1
-        || secondDelimiter > TRACE_ID_DELIMITER_INDEX_2) {
+        || secondDelimiter > TRACE_ID_DELIMITER_INDEX_2
+        || xrayTraceId.length() < secondDelimiter + 25) {
       return TraceId.getInvalid();
     }
 

diff --git a/...ator/src/test/java/io/opentelemetry/contrib/awsxray/propagator/AwsXrayPropagatorTest.java b/...ator/src/test/java/io/opentelemetry/contrib/awsxray/propagator/AwsXrayPropagatorTest.java
@@ -297,7 +297,7 @@ void extract_InvalidTraceId() {
   }
 
   @Test
-  void extract_InvalidTraceId_Size() {
+  void extract_InvalidTraceId_Size_TooBig() {
     Map<String, String> invalidHeaders = new LinkedHashMap<>();
     invalidHeaders.put(
         TRACE_HEADER_KEY,
@@ -306,6 +306,16 @@ void extract_InvalidTraceId_Size() {
     verifyInvalidBehavior(invalidHeaders);
   }
 
+  @Test
+  void extract_InvalidTraceId_Size_TooShort() {
+    Map<String, String> invalidHeaders = new LinkedHashMap<>();
+    invalidHeaders.put(
+        TRACE_HEADER_KEY,
+        "Root=1-64fbd5a9-2202432c9dfed25ae1e6996;Parent=53995c3f42cd8ad8;Sampled=0");
+
+    verifyInvalidBehavior(invalidHeaders);
+  }
+
   @Test
   void extract_InvalidSpanId() {
     Map<String, String> invalidHeaders = new LinkedHashMap<>();