From b896ff338ca77a06d6489c34a46edb54aca2c626 Mon Sep 17 00:00:00 2001
From: Bob Weinand <bob.weinand@datadoghq.com>
Date: Fri, 11 Oct 2024 15:52:36 +0200
Subject: [PATCH] Submit root span data when service/env/version ini is changed

Signed-off-by: Bob Weinand <bob.weinand@datadoghq.com>
---
 ext/ddtrace.c |  2 ++
 libdatadog    |  2 +-
 package.xml   | 51 +++++++--------------------------------------------
 3 files changed, 10 insertions(+), 45 deletions(-)

diff --git a/ext/ddtrace.c b/ext/ddtrace.c
index 76ca41bbee0..54fc6287f0f 100644
--- a/ext/ddtrace.c
+++ b/ext/ddtrace.c
@@ -382,6 +382,8 @@ static inline bool dd_alter_prop(size_t prop_offset, zval *old_value, zval *new_
         pspan = pspan->parent;
     }
 
+    ddtrace_sidecar_submit_root_span_data();
+
     return true;
 }
 
diff --git a/libdatadog b/libdatadog
index cb1856c6007..356f76a818d 160000
--- a/libdatadog
+++ b/libdatadog
@@ -1 +1 @@
-Subproject commit cb1856c60073eb48bb3e0f41f478adb38dc33756
+Subproject commit 356f76a818d164c954d2a09e54e2e8c41537a053
diff --git a/package.xml b/package.xml
index 1558e260a27..e35a2217e88 100644
--- a/package.xml
+++ b/package.xml
@@ -70,58 +70,21 @@
         <![CDATA[
 ## Tracer
 
-The default value for datadog.trace.cli_enabled is now set to true (except for composer), meaning that CLI processes will be traced by default.
-
-### Added
-- Dynamic configuration #2796
-- Dynamic instrumentation #2796
-  - Can be enabled with datadog.dynamic_instrumentation.enabled=1.
-- Exception replay #2796
-  - Can be enabled with datadog.exception_replay_enabled=1.
-- Track peak memory usage in root span metrics #2840
-
-### Changed
-- Enable sidecar trace sender on PHP 8.3 #2729
-- Optimize sending traces via sidecar Datadog/libdatadog#598
-- Add new ini config datadog.crashtracking_enabled #2850
-- Add ionCube to the list of incompatible extensions + add INI setting to ignore incompatible extensions #2858
-- Enable CLI by default #2871
-
 ### Fixed
-- Crashtracker: fix a use-after-free error #2843
-- Fix curl integration race condition #2847
-- Fix memory leak with sidecar trace sender #2875
-- OpenTelemetry: Missing addLink method and Fiber handling #2849
-- Mongodb: Deprecated exception in v1.20+ #2870
-- Fix leaking sidecar sessions Datadog/libdatadog#642
-- Implement deadlock watchdog for sidecar Datadog/libdatadog#647
-
-### Internal
-- Fix testsuite flakiness #2841, #2846, #2848, #2867
-- Fix telemetry metric name Datadog/libdatadog#666
-
-### SSI Loader changes
-- Add SSI requirements.json file #2813
-- Disable the tracer in case of a potential incompatibility (extension/jit) #2853
+- Fix: MongoDBIntegration condition typo #2884
+- Fix crash in profiler when span stack switch causes GC run #2885
+- Support build with disabled zend signals #2886
+- Send git tags via remote config #2890
 
 ## Profiling
 
-### Internal
-- bump to Rust 1.76 #2876
+### Fixed
+- Fix profiler ZTS build on alpine #2887
 
 ## Application Security Management
 
-### Changed
-- Move helper to sidecar remote config #2864
-
 ### Fixed
-- Fix improper symbol exports in appsec ext/helper #2854
-- Remove gid from socket/lock path of helper #2855
-- appsec ext: retry on connection refused #2860
-- Fix orderly helper appsec shutdown #2859
-
-### Internal changes
-- Add appsec benchmarks #2791
+- AppSec: improve behavior with empty DD_SERVICE/DD_ENV #2888
 
 ]]></notes>
     <contents>