Wire extended heartbeat interval through sidecar (#3800)

khanayan123 · claude · web-flow · commit 3df62fdf0bdd · 2026-04-21T18:22:05.000+02:00
* Wire extended heartbeat interval through sidecar for PHP telemetry

The libdatadog telemetry worker already supports
telemetry_extended_heartbeat_interval in its Config, but the sidecar's
SessionConfig and FFI layer did not expose it. This meant PHP (and any
other sidecar consumer) could not configure the extended heartbeat
interval, preventing app-extended-heartbeat events from being emitted
at the desired cadence.

Changes:
- libdatadog sidecar: add telemetry_extended_heartbeat_interval to
  SessionConfig and propagate it into the telemetry Config inside
  modify_telemetry_config
- libdatadog sidecar-ffi: add telemetry_extended_heartbeat_interval_millis
  parameter to ddog_sidecar_session_set_config
- PHP ext: add DD_TELEMETRY_EXTENDED_HEARTBEAT_INTERVAL config (default
  86400 s = 24 h) and pass it through the FFI call
- C header: update ddog_sidecar_session_set_config signature

Co-Authored-By: Claude Opus 4.6 (1M context) &lt;noreply@anthropic.com&gt;

* Regenerate supported-configurations.json

Add DD_TELEMETRY_EXTENDED_HEARTBEAT_INTERVAL entry to keep
metadata in sync with ext/configuration.h.

Co-Authored-By: Claude Opus 4.6 (1M context) &lt;noreply@anthropic.com&gt;
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/components-rs/common.h b/components-rs/common.h
@@ -1078,6 +1078,9 @@ typedef enum ddog_TelemetryWorkerBuilderStrProperty {
   DDOG_TELEMETRY_WORKER_BUILDER_STR_PROPERTY_HOST_KERNEL_RELEASE,
   DDOG_TELEMETRY_WORKER_BUILDER_STR_PROPERTY_HOST_KERNEL_VERSION,
   DDOG_TELEMETRY_WORKER_BUILDER_STR_PROPERTY_RUNTIME_ID,
+  DDOG_TELEMETRY_WORKER_BUILDER_STR_PROPERTY_SESSION_ID,
+  DDOG_TELEMETRY_WORKER_BUILDER_STR_PROPERTY_PARENT_SESSION_ID,
+  DDOG_TELEMETRY_WORKER_BUILDER_STR_PROPERTY_ROOT_SESSION_ID,
 } ddog_TelemetryWorkerBuilderStrProperty;
 
 typedef struct ddog_TelemetryWorkerBuilder ddog_TelemetryWorkerBuilder;
diff --git a/components-rs/sidecar.h b/components-rs/sidecar.h
@@ -200,6 +200,7 @@ ddog_MaybeError ddog_sidecar_session_set_config(struct ddog_SidecarTransport **t
                                                 uint32_t flush_interval_milliseconds,
                                                 uint32_t remote_config_poll_interval_millis,
                                                 uint32_t telemetry_heartbeat_interval_millis,
+                                                uint64_t telemetry_extended_heartbeat_interval_millis,
                                                 uintptr_t force_flush_size,
                                                 uintptr_t force_drop_size,
                                                 ddog_CharSlice log_level,
diff --git a/components-rs/telemetry.h b/components-rs/telemetry.h
@@ -123,6 +123,15 @@ ddog_MaybeError ddog_telemetry_builder_with_str_host_kernel_version(struct ddog_
 ddog_MaybeError ddog_telemetry_builder_with_str_runtime_id(struct ddog_TelemetryWorkerBuilder *telemetry_builder,
                                                            ddog_CharSlice param);
 
+ddog_MaybeError ddog_telemetry_builder_with_str_session_id(struct ddog_TelemetryWorkerBuilder *telemetry_builder,
+                                                           ddog_CharSlice param);
+
+ddog_MaybeError ddog_telemetry_builder_with_str_parent_session_id(struct ddog_TelemetryWorkerBuilder *telemetry_builder,
+                                                                  ddog_CharSlice param);
+
+ddog_MaybeError ddog_telemetry_builder_with_str_root_session_id(struct ddog_TelemetryWorkerBuilder *telemetry_builder,
+                                                                ddog_CharSlice param);
+
 /**
  *      Sets a property from it's string value.
  *
@@ -150,6 +159,12 @@ ddog_MaybeError ddog_telemetry_builder_with_str_runtime_id(struct ddog_Telemetry
  *
  *     * runtime_id
  *
+ *     * session_id
+ *
+ *     * parent_session_id
+ *
+ *     * root_session_id
+ *
  *
  */
 ddog_MaybeError ddog_telemetry_builder_with_property_str(struct ddog_TelemetryWorkerBuilder *telemetry_builder,
@@ -183,6 +198,12 @@ ddog_MaybeError ddog_telemetry_builder_with_property_str(struct ddog_TelemetryWo
  *
  *     * runtime_id
  *
+ *     * session_id
+ *
+ *     * parent_session_id
+ *
+ *     * root_session_id
+ *
  *
  */
 ddog_MaybeError ddog_telemetry_builder_with_str_named_property(struct ddog_TelemetryWorkerBuilder *telemetry_builder,
diff --git a/ext/configuration.h b/ext/configuration.h
@@ -204,6 +204,8 @@ enum ddtrace_sidecar_connection_mode {
     CONFIG(INT, DD_TRACE_AGENT_FLUSH_INTERVAL, DD_CFG_EXPSTR(DD_TRACE_AGENT_FLUSH_INTERVAL_VAL),               \
            .ini_change = zai_config_system_ini_change)                                                         \
     CONFIG(INT, DD_TELEMETRY_HEARTBEAT_INTERVAL, "60", .ini_change = zai_config_system_ini_change)             \
+    CONFIG(INT, DD_TELEMETRY_EXTENDED_HEARTBEAT_INTERVAL, "86400",                                            \
+           .ini_change = zai_config_system_ini_change)                                                        \
     CONFIG(INT, DD_TRACE_AGENT_FLUSH_AFTER_N_REQUESTS, "0")                                                    \
     CONFIG(INT, DD_TRACE_SHUTDOWN_TIMEOUT, "5000", .ini_change = zai_config_system_ini_change)                 \
     CONFIG(BOOL, DD_TRACE_STARTUP_LOGS, "true")                                                                \
diff --git a/ext/sidecar.c b/ext/sidecar.c
@@ -113,6 +113,8 @@ static void dd_sidecar_post_connect(ddog_SidecarTransport **transport, bool is_f
                                     (int)(get_global_DD_REMOTE_CONFIG_POLL_INTERVAL_SECONDS() * 1000),
                                     // for historical reasons in seconds
                                     get_global_DD_TELEMETRY_HEARTBEAT_INTERVAL() * 1000,
+                                    // extended heartbeat interval, also in seconds
+                                    (uint64_t)get_global_DD_TELEMETRY_EXTENDED_HEARTBEAT_INTERVAL() * 1000,
                                     get_global_DD_TRACE_BUFFER_SIZE(),
                                     get_global_DD_TRACE_AGENT_STACK_BACKLOG() * get_global_DD_TRACE_AGENT_MAX_PAYLOAD_SIZE(),
                                     get_global_DD_TRACE_DEBUG() ? DDOG_CHARSLICE_C("debug") : dd_zend_string_to_CharSlice(get_global_DD_TRACE_LOG_LEVEL()),
diff --git a/libdatadog b/libdatadog
@@ -1 +1 @@
-Subproject commit ecb561ae05004ba1e41d33c95ab184492144b7e9
+Subproject commit c03245d4e11b55533955bb4043572f9613dced60
diff --git a/metadata/supported-configurations.json b/metadata/supported-configurations.json
@@ -644,6 +644,13 @@
         "default": ""
       }
     ],
+    "DD_TELEMETRY_EXTENDED_HEARTBEAT_INTERVAL": [
+      {
+        "implementation": "A",
+        "type": "int",
+        "default": "86400"
+      }
+    ],
     "DD_TELEMETRY_HEARTBEAT_INTERVAL": [
       {
         "implementation": "C",

Original file line number	Diff line number	Diff line change
`@@ -123,6 +123,15 @@ ddog_MaybeError ddog_telemetry_builder_with_str_host_kernel_version(struct ddog_`
`123`	`123`	`ddog_MaybeError ddog_telemetry_builder_with_str_runtime_id(struct ddog_TelemetryWorkerBuilder *telemetry_builder,`
`124`	`124`	`ddog_CharSlice param);`
`125`	`125`
	`126`	`+ddog_MaybeError ddog_telemetry_builder_with_str_session_id(struct ddog_TelemetryWorkerBuilder *telemetry_builder,`
	`127`	`+ ddog_CharSlice param);`
	`128`	`+`
	`129`	`+ddog_MaybeError ddog_telemetry_builder_with_str_parent_session_id(struct ddog_TelemetryWorkerBuilder *telemetry_builder,`
	`130`	`+ ddog_CharSlice param);`
	`131`	`+`
	`132`	`+ddog_MaybeError ddog_telemetry_builder_with_str_root_session_id(struct ddog_TelemetryWorkerBuilder *telemetry_builder,`
	`133`	`+ ddog_CharSlice param);`
	`134`	`+`
`126`	`135`	`/**`
`127`	`136`	`* Sets a property from it's string value.`
`128`	`137`	`*`
`@@ -150,6 +159,12 @@ ddog_MaybeError ddog_telemetry_builder_with_str_runtime_id(struct ddog_Telemetry`
`150`	`159`	`*`
`151`	`160`	`* * runtime_id`
`152`	`161`	`*`
	`162`	`+ * * session_id`
	`163`	`+ *`
	`164`	`+ * * parent_session_id`
	`165`	`+ *`
	`166`	`+ * * root_session_id`
	`167`	`+ *`
`153`	`168`	`*`
`154`	`169`	`*/`
`155`	`170`	`ddog_MaybeError ddog_telemetry_builder_with_property_str(struct ddog_TelemetryWorkerBuilder *telemetry_builder,`
`@@ -183,6 +198,12 @@ ddog_MaybeError ddog_telemetry_builder_with_property_str(struct ddog_TelemetryWo`
`183`	`198`	`*`
`184`	`199`	`* * runtime_id`
`185`	`200`	`*`
	`201`	`+ * * session_id`
	`202`	`+ *`
	`203`	`+ * * parent_session_id`
	`204`	`+ *`
	`205`	`+ * * root_session_id`
	`206`	`+ *`
`186`	`207`	`*`
`187`	`208`	`*/`
`188`	`209`	`ddog_MaybeError ddog_telemetry_builder_with_str_named_property(struct ddog_TelemetryWorkerBuilder *telemetry_builder,`
Original file line number	Diff line number	Diff line change
`@@ -644,6 +644,13 @@`
`644`	`644`	`"default": ""`
`645`	`645`	`}`
`646`	`646`	`],`
	`647`	`+ "DD_TELEMETRY_EXTENDED_HEARTBEAT_INTERVAL": [`
	`648`	`+ {`
	`649`	`+ "implementation": "A",`
	`650`	`+ "type": "int",`
	`651`	`+ "default": "86400"`
	`652`	`+ }`
	`653`	`+ ],`
`647`	`654`	`"DD_TELEMETRY_HEARTBEAT_INTERVAL": [`
`648`	`655`	`{`
`649`	`656`	`"implementation": "C",`