Zero pad the tid and exclude it from OTel tracestate

As per our specification.

Signed-off-by: Bob Weinand <[email protected]>

Author: bwoebi

ext/handlers_http.h

@@ -40,6 +40,11 @@ static inline zend_string *ddtrace_format_tracestate(zend_string *tracestate, ze
             if (last_separator) {
                 next_equals = ':';
                 cur += strlen("_dd.p");
+                // drop the tid from otel tracestate
+                if (cur + strlen(".tid=") + 16 /* 16 byte tid */ <= end && memcmp(cur, ".tid=", strlen(".tid=")) == 0) {
+                    cur += strlen(".tid=") + 16;
+                    continue;
+                }
                 smart_str_appendc(&str, 't');
             }
             signed char chr = *cur;

ext/tracer_tag_propagation/tracer_tag_propagation.c

@@ -122,7 +122,7 @@ zend_string *ddtrace_format_propagated_tags(zend_array *propagated, zend_array *
 
     ddtrace_trace_id trace_id = ddtrace_peek_trace_id();
     if (trace_id.high) {
-        smart_str_append_printf(&taglist, "_dd.p.tid=%" PRIx64, trace_id.high);
+        smart_str_append_printf(&taglist, "_dd.p.tid=%016" PRIx64, trace_id.high);
     }
 
     zend_string *tagname;

tests/ext/distributed_tracestate_consumption.phpt

@@ -28,5 +28,5 @@ array(2) {
   ["traceparent"]=>
   string(55) "00-%sc151df7d6ee5e2d6-a3978fb9b92502a8-01"
   ["tracestate"]=>
-  string(75) "dd=t.tid:%s;t.dm:-1;t.congo:t61rcWkgMzE,rojo=00f067aa0ba902b7"
+  string(52) "dd=t.dm:-1;t.congo:t61rcWkgMzE,rojo=00f067aa0ba902b7"
 }

tests/ext/integrations/curl/distributed_tracing_curl_drop_dm.phpt

@@ -8,7 +8,7 @@ ddtrace.request_init_hook={PWD}/distributed_tracing_curl_inject.inc
 --ENV--
 DD_TRACE_DEBUG=1
 DD_TRACE_GENERATE_ROOT_SPAN=0
-HTTP_TRACEPARENT=00-12345678901234567890123456789012-1234567890123456-00
+HTTP_TRACEPARENT=00-00000012345678907890123456789012-1234567890123456-00
 HTTP_TRACESTATE=foo=1,dd=s:1;t.dm:-0;t.usr.id:baz64~~;t.url:http://localhost
 DD_PROPAGATION_STYLE=tracecontext,Datadog
 --FILE--
@@ -43,10 +43,10 @@ echo 'Done.' . PHP_EOL;
 
 ?>
 --EXPECTF--
-traceparent: 00-12345678901234567890123456789012-1234567890123456-00
-tracestate: dd=t.tid:1234567890123456;t.usr.id:baz64~~;t.url:http://localhost,foo=1
+traceparent: 00-00000012345678907890123456789012-1234567890123456-00
+tracestate: dd=t.usr.id:baz64~~;t.url:http://localhost,foo=1
 x-datadog-parent-id: 1311768467284833366
-x-datadog-tags: _dd.p.tid=1234567890123456,_dd.p.usr.id=baz64==,_dd.p.url=http://localhost
+x-datadog-tags: _dd.p.tid=0000001234567890,_dd.p.usr.id=baz64==,_dd.p.url=http://localhost
 x-datadog-trace-id: 8687463697196027922
 bool(false)
 Done.

tests/ext/integrations/curl/distributed_tracing_curl_invalid_tags.phpt

@@ -44,7 +44,7 @@ echo 'Done.' . PHP_EOL;
 --EXPECTF--
 b3: %s248869c998246a2e-248869c998246a2e-1
 traceparent: 00-%s248869c998246a2e-248869c998246a2e-01
-tracestate: dd=o:_______~_: ;t.tid:%s;t.escaped:_~_: ;t.dm:-0
+tracestate: dd=o:_______~_: ;t.escaped:_~_: ;t.dm:-0
 x-datadog-origin: ∂~,=;:
 x-datadog-tags: _dd.p.tid=%s,_dd.p.escaped=_=;: ,_dd.p.dm=-0
 bool(false)

tests/ext/integrations/curl/distributed_tracing_curl_tracestate.phpt

@@ -45,7 +45,7 @@ echo 'Done.' . PHP_EOL;
 --EXPECTF--
 b3: 12345678901234567890123456789012-6543210987654321-d
 traceparent: 00-12345678901234567890123456789012-6543210987654321-01
-tracestate: dd=o:phpt-test;s:2;t.tid:1234567890123456;t.test:qvalue;t.dm:-0;unknown1:val;unknown2:1,foo=bar:;=,baz=qux
+tracestate: dd=o:phpt-test;s:2;t.test:qvalue;t.dm:-0;unknown1:val;unknown2:1,foo=bar:;=,baz=qux
 x-datadog-origin: phpt-test
 x-datadog-tags: _dd.p.tid=1234567890123456,_dd.p.test=qvalue,_dd.p.dm=-0
 bool(false)