Skip to content

Wire extended heartbeat interval through sidecar #3800

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bwoebi merged 7 commits into from
Apr 21, 2026
+40 −3
Merged

Wire extended heartbeat interval through sidecar #3800

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c472c78
Wire extended heartbeat interval through sidecar for PHP telemetry
khanayan123 Apr 15, 2026
c038e78
Regenerate supported-configurations.json
khanayan123 Apr 15, 2026
f2effff
Update libdatadog
bwoebi Apr 20, 2026
be8ef4f
Update libdatadog submodule to latest main
khanayan123 Apr 21, 2026
17dd8d5
Merge branch 'master' into ayan.khan/wire-extended-heartbeat-sidecar
khanayan123 Apr 21, 2026
7a8e2a4
Retrigger CI after infra flakes (kafka, image registry 502)
khanayan123 Apr 21, 2026
4438b5a
Retrigger CI — Laravel8xTests.groovy:152 wait-predicate race
khanayan123 Apr 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions components-rs/common.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 1 addition & 0 deletions components-rs/sidecar.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
21 changes: 21 additions & 0 deletions components-rs/telemetry.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
*
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down
2 changes: 2 additions & 0 deletions ext/configuration.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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") \
Expand Down
2 changes: 2 additions & 0 deletions ext/sidecar.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()),
Expand Down
2 changes: 1 addition & 1 deletion libdatadog
Open in desktop
Submodule libdatadog updated 1010 files
7 changes: 7 additions & 0 deletions metadata/supported-configurations.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -644,6 +644,13 @@
"default": ""
}
],
"DD_TELEMETRY_EXTENDED_HEARTBEAT_INTERVAL": [
{
"implementation": "A",
"type": "int",
"default": "86400"
}
],
"DD_TELEMETRY_HEARTBEAT_INTERVAL": [
{
"implementation": "C",
Expand Down
Loading