fix(w3c): fix traceparent validation

ddtrace/propagation/http.py

@@ -552,16 +552,18 @@ def _get_traceparent_values(tp):
         """
 
         version, trace_id_hex, span_id_hex, trace_flags_hex = tp.strip().split("-")
-        # check version is a valid hexadecimal, if not it's invalid we will move on to the next prop method
-        int(version, 16)
+        # ensure traceparent values are valid hexadecimals, if not it's invalid we will move on
+        # to the next prop method
+        for val in [version, trace_id_hex, span_id_hex, trace_flags_hex]:
+            int(val, 16)
         # https://www.w3.org/TR/trace-context/#version
         if version == "ff":
             raise ValueError("'ff' is an invalid traceparent version")
         # currently 00 is the only version format, but if future versions come up we may need to add changes
         if version != "00":
             log.warning("unsupported traceparent version:%r, still attempting to parse", version)
 
-        if len(trace_id_hex) == 32 and len(span_id_hex) == 16 and len(trace_flags_hex) >= 2:
+        if len(version) == 2 and len(trace_id_hex) == 32 and len(span_id_hex) == 16 and len(trace_flags_hex) == 2:
             trace_id = _hex_id_to_dd_id(trace_id_hex)
             span_id = _hex_id_to_dd_id(span_id_hex)
 
@@ -646,7 +648,7 @@ def _extract(headers):
                 return None
             # uppercase char in tp makes it invalid:
             # https://www.w3.org/TR/trace-context/#traceparent-header-field-values
-            if not tp.islower():
+            if any(x.isupper() for x in tp):
                 raise ValueError("uppercase characters are not allowed in traceparent")
             trace_id, span_id, sampling_priority = _TraceContext._get_traceparent_values(tp)
         except (ValueError, AssertionError):

tests/tracer/test_propagation.py

@@ -449,16 +449,13 @@ def test_tracecontext_get_sampling_priority(sampling_priority_tp, sampling_prior
             # tp, trace_id, span_id, sampling_priority
             (11803532876627986230, 67667974448284343, 1),
             ["unsupported traceparent version:'0', still attempting to parse"],
-            None,
+            ValueError,
         ),
         (
             "00-f92f3577b34da6a3ce929d0e0e4736-00f067aa0ba902b7-01",
             # tp, trace_id, span_id, sampling_priority
             None,
-            [
-                "received invalid w3c traceparent: 00-f92f3577b34da6a3ce929d0e0e4736-00f067aa0ba902b7-01.",
-                "W3C traceparent hex length incorrect: 00-f92f3577b34da6a3ce929d0e0e4736-00f067aa0ba902b7-01",
-            ],
+            [],
             ValueError,
         ),
         (  # we still parse the trace flag and analyze the it as a bit field
@@ -489,9 +486,10 @@ def test_extract_traceparent(caplog, headers, expected_tuple, expected_logging,
         else:
             traceparent_values = _TraceContext._get_traceparent_values(headers)
             assert traceparent_values == expected_tuple
-            if caplog.text or expected_logging:
-                for expected_log in expected_logging:
-                    assert expected_log in caplog.text
+
+        if caplog.text or expected_logging:
+            for expected_log in expected_logging:
+                assert expected_log in caplog.text
 
 
 @pytest.mark.parametrize(