fix: align Datadog-Client-Computed-Stats header with ddog_agent_has_stats_computation gate

Leiyks · Leiyks · commit 509ad2e3408f · 2026-04-23T14:41:17.000+02:00
The header was still sent unconditionally based on the INI flag alone in
ext/coms.c and ext/auto_flush.c, while serializer.c already gates actual
stats computation on ddog_agent_has_stats_computation(). Add the same
agent-capability check to both header-emission sites so the header value
matches the serializer behaviour and the TRACE_STATS_COMPUTATION_CLIENT_DROP_P0S_FALSE
system test passes.
diff --git a/ext/auto_flush.c b/ext/auto_flush.c
@@ -15,6 +15,7 @@
 #include "ddshared.h"
 #include "standalone_limiter.h"
 #include <main/SAPI.h>
+#include <components-rs/ddtrace.h>
 #include <components-rs/sidecar.h>
 
 ZEND_EXTERN_MODULE_GLOBALS(ddtrace);
@@ -57,7 +58,7 @@ ZEND_RESULT_CODE ddtrace_flush_tracer(bool force_on_startup, bool collect_cycles
                     .tracer_version = DDOG_CHARSLICE_C_BARE(PHP_DDTRACE_VERSION),
                     .lang_version = php_version_rt,
                     .client_computed_top_level = get_DD_TRACE_STATS_COMPUTATION_ENABLED(),
-                    .client_computed_stats = !get_global_DD_APM_TRACING_ENABLED() || get_DD_TRACE_STATS_COMPUTATION_ENABLED(),
+                    .client_computed_stats = !get_global_DD_APM_TRACING_ENABLED() || (get_DD_TRACE_STATS_COMPUTATION_ENABLED() && ddog_agent_has_stats_computation()),
                 },
                 .transport = DDTRACE_G(sidecar),
                 .instance_id = ddtrace_sidecar_instance_id,
diff --git a/ext/coms.c b/ext/coms.c
@@ -771,7 +771,7 @@ static struct curl_slist *dd_agent_headers_alloc(void) {
     dd_append_header(&list, "Datadog-Meta-Lang-Interpreter", sapi_module.name, strlen(sapi_module.name));
     dd_append_header(&list, "Datadog-Meta-Lang-Version", php_version_rt.ptr, php_version_rt.len);
     dd_append_header(&list, "Datadog-Meta-Tracer-Version", ZEND_STRL(PHP_DDTRACE_VERSION));
-    if (!get_global_DD_APM_TRACING_ENABLED() || (ddtrace_sidecar_for_signal && get_global_DD_TRACE_STATS_COMPUTATION_ENABLED())) {
+    if (!get_global_DD_APM_TRACING_ENABLED() || (ddtrace_sidecar_for_signal && get_global_DD_TRACE_STATS_COMPUTATION_ENABLED() && ddog_agent_has_stats_computation())) {
         dd_append_header(&list, "Datadog-Client-Computed-Stats", ZEND_STRL("true"));
     }
     if (ddtrace_sidecar_for_signal && get_global_DD_TRACE_STATS_COMPUTATION_ENABLED()) {

Original file line number	Diff line number	Diff line change
`@@ -771,7 +771,7 @@ static struct curl_slist *dd_agent_headers_alloc(void) {`
`771`	`771`	`dd_append_header(&list, "Datadog-Meta-Lang-Interpreter", sapi_module.name, strlen(sapi_module.name));`
`772`	`772`	`dd_append_header(&list, "Datadog-Meta-Lang-Version", php_version_rt.ptr, php_version_rt.len);`
`773`	`773`	`dd_append_header(&list, "Datadog-Meta-Tracer-Version", ZEND_STRL(PHP_DDTRACE_VERSION));`
`774`		`- if (!get_global_DD_APM_TRACING_ENABLED() \|\| (ddtrace_sidecar_for_signal && get_global_DD_TRACE_STATS_COMPUTATION_ENABLED())) {`
	`774`	`+ if (!get_global_DD_APM_TRACING_ENABLED() \|\| (ddtrace_sidecar_for_signal && get_global_DD_TRACE_STATS_COMPUTATION_ENABLED() && ddog_agent_has_stats_computation())) {`
`775`	`775`	`dd_append_header(&list, "Datadog-Client-Computed-Stats", ZEND_STRL("true"));`
`776`	`776`	`}`
`777`	`777`	`if (ddtrace_sidecar_for_signal && get_global_DD_TRACE_STATS_COMPUTATION_ENABLED()) {`