Place _dd.apm.enabled:0 in every span

cataphract · cataphract · commit 4d240b103340 · 2026-07-23T12:20:14.000+01:00
diff --git a/tests/ext/distributed_tracing/distributed_trace_asm_standalone_01.phpt b/tests/ext/distributed_tracing/distributed_trace_asm_standalone_01.phpt
@@ -79,7 +79,7 @@ array(2) {
     }
   }
   [1]=>
-  array(10) {
+  array(11) {
     ["trace_id"]=>
     string(2) "42"
     ["span_id"]=>
@@ -103,5 +103,10 @@ array(2) {
       ["_dd.origin"]=>
       string(7) "datadog"
     }
+    ["metrics"]=>
+    array(1) {
+      ["_dd.apm.enabled"]=>
+      float(0)
+    }
   }
 }
diff --git a/tests/ext/distributed_tracing/distributed_trace_asm_standalone_02.phpt b/tests/ext/distributed_tracing/distributed_trace_asm_standalone_02.phpt
@@ -75,7 +75,7 @@ array(2) {
     }
   }
   [1]=>
-  array(10) {
+  array(11) {
     ["trace_id"]=>
     string(2) "42"
     ["span_id"]=>
@@ -99,5 +99,10 @@ array(2) {
       ["_dd.origin"]=>
       string(7) "datadog"
     }
+    ["metrics"]=>
+    array(1) {
+      ["_dd.apm.enabled"]=>
+      float(0)
+    }
   }
-}
+}
diff --git a/tracer/serializer.c b/tracer/serializer.c
@@ -1832,9 +1832,10 @@ ddog_SpanBytes *ddtrace_serialize_span_to_rust_span(ddtrace_span_data *span, ddo
             }
             ddog_add_span_metrics_str(rust_span, "_sampling_priority_v1", sampling_priority);
         }
-        if(!get_global_DD_APM_TRACING_ENABLED()) {
-            ddog_add_span_metrics_str(rust_span, "_dd.apm.enabled", 0);
-        }
+    }
+
+    if (!get_global_DD_APM_TRACING_ENABLED()) {
+        ddog_add_span_metrics_str(rust_span, "_dd.apm.enabled", 0);
     }
 
     if (DATADOG_G(sidecar) && get_DD_TRACE_STATS_COMPUTATION_ENABLED() && !is_inferred_span) {

Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ array(2) {`
`79`	`79`	`}`
`80`	`80`	`}`
`81`	`81`	`[1]=>`
`82`		`- array(10) {`
	`82`	`+ array(11) {`
`83`	`83`	`["trace_id"]=>`
`84`	`84`	`string(2) "42"`
`85`	`85`	`["span_id"]=>`
`@@ -103,5 +103,10 @@ array(2) {`
`103`	`103`	`["_dd.origin"]=>`
`104`	`104`	`string(7) "datadog"`
`105`	`105`	`}`
	`106`	`+ ["metrics"]=>`
	`107`	`+ array(1) {`
	`108`	`+ ["_dd.apm.enabled"]=>`
	`109`	`+ float(0)`
	`110`	`+ }`
`106`	`111`	`}`
`107`	`112`	`}`
Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ array(2) {`
`75`	`75`	`}`
`76`	`76`	`}`
`77`	`77`	`[1]=>`
`78`		`- array(10) {`
	`78`	`+ array(11) {`
`79`	`79`	`["trace_id"]=>`
`80`	`80`	`string(2) "42"`
`81`	`81`	`["span_id"]=>`
`@@ -99,5 +99,10 @@ array(2) {`
`99`	`99`	`["_dd.origin"]=>`
`100`	`100`	`string(7) "datadog"`
`101`	`101`	`}`
	`102`	`+ ["metrics"]=>`
	`103`	`+ array(1) {`
	`104`	`+ ["_dd.apm.enabled"]=>`
	`105`	`+ float(0)`
	`106`	`+ }`
`102`	`107`	`}`
`103`		`-}`
	`108`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -1832,9 +1832,10 @@ ddog_SpanBytes ddtrace_serialize_span_to_rust_span(ddtrace_span_data span, ddo`
`1832`	`1832`	`}`
`1833`	`1833`	`ddog_add_span_metrics_str(rust_span, "_sampling_priority_v1", sampling_priority);`
`1834`	`1834`	`}`
`1835`		`- if(!get_global_DD_APM_TRACING_ENABLED()) {`
`1836`		`- ddog_add_span_metrics_str(rust_span, "_dd.apm.enabled", 0);`
`1837`		`- }`
	`1835`	`+ }`
	`1836`	`+`
	`1837`	`+ if (!get_global_DD_APM_TRACING_ENABLED()) {`
	`1838`	`+ ddog_add_span_metrics_str(rust_span, "_dd.apm.enabled", 0);`
`1838`	`1839`	`}`
`1839`	`1840`
`1840`	`1841`	`if (DATADOG_G(sidecar) && get_DD_TRACE_STATS_COMPUTATION_ENABLED() && !is_inferred_span) {`