Use native rust spans instead of manually serializing to msgpack

Makefile

@@ -437,7 +437,7 @@ generate_cbindgen: cbindgen_binary # Regenerate components-rs/ddtrace.h componen
 			mkdir -pv "$(BUILD_DIR)"; \
 			export CARGO_TARGET_DIR="$(BUILD_DIR)/target"; \
 		fi; \
-		cargo run -p tools -- $(PROJECT_ROOT)/components-rs/common.h $(PROJECT_ROOT)/components-rs/ddtrace.h $(PROJECT_ROOT)/components-rs/live-debugger.h $(PROJECT_ROOT)/components-rs/telemetry.h $(PROJECT_ROOT)/components-rs/sidecar.h $(PROJECT_ROOT)/components-rs/crashtracker.h $(PROJECT_ROOT)/components-rs/library-config.h  \
+		cargo run -p tools -- $(PROJECT_ROOT)/components-rs/common.h $(PROJECT_ROOT)/components-rs/ddtrace.h $(PROJECT_ROOT)/components-rs/live-debugger.h $(PROJECT_ROOT)/components-rs/telemetry.h $(PROJECT_ROOT)/components-rs/sidecar.h $(PROJECT_ROOT)/components-rs/crashtracker.h $(PROJECT_ROOT)/components-rs/library-config.h \
 	)
 
 cbindgen_binary:

appsec/tests/extension/client_init_record_span_tags.phpt

@@ -61,6 +61,7 @@ echo "tags:\n";
 ksort($tags);
 print_r($tags);
 echo "metrics:\n";
+ksort($metrics);
 print_r($metrics);
 
 $helper->finished_with_commands();
@@ -104,12 +105,12 @@ metrics:
 Array
 (
     [%s] => %d
-    [metric_1] => 2
-    [metric_2] => 10
     [_dd.appsec.enabled] => 1
-    [_dd.agent_psr] => 1
     [_sampling_priority_v1] => 1
+    [metric_1] => 2
+    [metric_2] => 10
     [php.compilation.total_time_ms] => %f
-    [php.memory.peak_usage_bytes] => %f
     [php.memory.peak_real_usage_bytes] => %f
+    [php.memory.peak_usage_bytes] => %f
+    [process_id] => %d
 )

appsec/tests/extension/ddtrace_basic.phpt

@@ -70,6 +70,7 @@ echo 'sent trace id is the same as \DDTrace\trace_id(): ',
     $trace_id == $sent_trace_id ? 'yes' : 'no', "\n";
 
 echo "tags:\n";
+ksort($tags);
 print_r($tags);
 
 mlog(DEBUG, "Call finished_with_commands");
@@ -101,8 +102,8 @@ sent trace id is the same as \DDTrace\trace_id(): yes
 tags:
 Array
 (
-    [runtime-id] => %s
-    [ddappsec] => true
     [_dd.p.dm] => -0
     [_dd.p.tid] => %s
-)
+    [ddappsec] => true
+    [runtime-id] => %s
+)

appsec/tests/extension/rinit_record_span_tags.phpt

@@ -56,6 +56,7 @@ echo "tags:\n";
 ksort($tags);
 print_r($tags);
 echo "metrics:\n";
+ksort($metrics);
 print_r($metrics);
 
 $helper->finished_with_commands();
@@ -98,11 +99,11 @@ metrics:
 Array
 (
     [%s] => %d
-    [rshutdown_metric] => 2.1
     [_dd.appsec.enabled] => 1
-    [_dd.agent_psr] => 1
     [_sampling_priority_v1] => 1
     [php.compilation.total_time_ms] => %f
-    [php.memory.peak_usage_bytes] => %f
     [php.memory.peak_real_usage_bytes] => %f
-)
+    [php.memory.peak_usage_bytes] => %f
+    [process_id] => %d
+    [rshutdown_metric] => 2.1
+)

appsec/tests/extension/rinit_record_span_tags_fail.phpt

@@ -37,6 +37,7 @@ $commands = $helper->get_commands();
 $tags = $commands[0]['payload'][0][0]['meta'];
 
 echo "tags:\n";
+ksort($tags);
 print_r($tags);
 
 $helper->finished_with_commands();
@@ -52,7 +53,7 @@ bool(true)
 tags:
 Array
 (
-    [runtime-id] => %s
     [_dd.p.dm] => -0
     [_dd.p.tid] => %s
-)
+    [runtime-id] => %s
+)

appsec/tests/extension/root_span_add_tag.phpt

@@ -47,28 +47,28 @@ array(1) {
     string(3) "cli"
     ["meta"]=>
     array(4) {
-      ["runtime-id"]=>
-      string(%d) %s
-      ["after"]=>
-      string(9) "root_span"
       ["_dd.p.dm"]=>
       string(2) "-0"
       ["_dd.p.tid"]=>
       string(16) "%s"
+      ["after"]=>
+      string(9) "root_span"
+      ["runtime-id"]=>
+      string(%d) %s
     }
     ["metrics"]=>
     array(6) {
       [%s"]=>
       float(%d)
-      ["_dd.agent_psr"]=>
-      float(1)
       ["_sampling_priority_v1"]=>
       float(1)
       ["php.compilation.total_time_ms"]=>
       float(%s)
+      ["php.memory.peak_real_usage_bytes"]=>
+      float(%f)
       ["php.memory.peak_usage_bytes"]=>
       float(%f)
-      ["php.memory.peak_real_usage_bytes"]=>
+      ["process_id"]=>
       float(%f)
     }
   }

appsec/tests/extension/root_span_add_tag_with_intermediate_spans.phpt

@@ -49,6 +49,7 @@ echo "tags:\n";
 ksort($tags);
 print_r($tags);
 echo "metrics:\n";
+ksort($metrics);
 print_r($metrics);
 
 $helper->finished_with_commands();
@@ -77,11 +78,11 @@ Array
 metrics:
 Array
 (
-    [process_id] => %d
-    [_dd.appsec.enabled] => 1
     [_dd.agent_psr] => 1
+    [_dd.appsec.enabled] => 1
     [_sampling_priority_v1] => 1
     [php.compilation.total_time_ms] => %s
-    [php.memory.peak_usage_bytes] => %f
     [php.memory.peak_real_usage_bytes] => %f
+    [php.memory.peak_usage_bytes] => %f
+    [process_id] => %d
 )

cbindgen.toml

@@ -2,6 +2,9 @@ language = "C"
 tab_width = 2
 include_guard = "DDTRACE_PHP_H"
 style = "both"
+header = """
+struct _zend_string;
+"""
 
 no_includes = true
 sys_includes = ["stdbool.h", "stddef.h", "stdint.h"]
@@ -17,6 +20,7 @@ rename_types = "PascalCase"
 [export.rename]
 "ParseTagsResult" = "ddog_Vec_Tag_ParseResult"
 "PushTagResult" = "ddog_Vec_Tag_PushResult"
+"ZendString" = "_zend_string"
 "FILE" = "FILE"
 
 [enum]

components-rs/Cargo.toml

@@ -18,6 +18,8 @@ datadog-ipc = { path = "../libdatadog/datadog-ipc" }
 datadog-remote-config = { path = "../libdatadog/datadog-remote-config" }
 datadog-sidecar = { path = "../libdatadog/datadog-sidecar" }
 datadog-sidecar-ffi = { path = "../libdatadog/datadog-sidecar-ffi" }
+tinybytes = { path = "../libdatadog/tinybytes" }
+datadog-trace-utils = { path = "../libdatadog/datadog-trace-utils" }
 datadog-crashtracker-ffi = { path = "../libdatadog/datadog-crashtracker-ffi", default-features = false, features = ["collector"] }
 datadog-library-config-ffi = { path = "../libdatadog/datadog-library-config-ffi", default-features = false }
 spawn_worker = { path = "../libdatadog/spawn_worker" }