diff --git a/components-rs/ffe.rs b/components-rs/ffe.rs index 0812c8c5cd..76f3b52340 100644 --- a/components-rs/ffe.rs +++ b/components-rs/ffe.rs @@ -215,6 +215,7 @@ fn result_from_assignment(assignment: Result) allocation_key: Some(assignment.allocation_key.as_str().into()), reason: match assignment.reason { AssignmentReason::Static => REASON_STATIC, + AssignmentReason::Default => REASON_DEFAULT, AssignmentReason::TargetingMatch => REASON_TARGETING_MATCH, AssignmentReason::Split => REASON_SPLIT, }, diff --git a/components-rs/sidecar.h b/components-rs/sidecar.h index eb0b5be058..27edede5e9 100644 --- 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 ddog_CharSlice language_version, ddog_CharSlice tracer_version, uint32_t flush_interval_milliseconds, + uint32_t retry_interval_milliseconds, uint32_t remote_config_poll_interval_millis, uint32_t telemetry_heartbeat_interval_millis, uint64_t telemetry_extended_heartbeat_interval_millis, diff --git a/ext/sidecar.c b/ext/sidecar.c index 860db78e9d..2dd1bd81dc 100644 --- a/ext/sidecar.c +++ b/ext/sidecar.c @@ -110,6 +110,8 @@ static void dd_sidecar_post_connect(ddog_SidecarTransport **transport, bool is_f php_version_rt, DDOG_CHARSLICE_C(PHP_DDTRACE_VERSION), get_global_DD_TRACE_AGENT_FLUSH_INTERVAL(), + // trace send retry interval; 100ms matches libdatadog's prior default + 100, (int)(get_global_DD_REMOTE_CONFIG_POLL_INTERVAL_SECONDS() * 1000), // for historical reasons in seconds get_global_DD_TELEMETRY_HEARTBEAT_INTERVAL() * 1000, diff --git a/libdatadog b/libdatadog index 6760faaeed..c79d783f79 160000 --- a/libdatadog +++ b/libdatadog @@ -1 +1 @@ -Subproject commit 6760faaeeda1cfcf634410105f93cf7149265592 +Subproject commit c79d783f79f4a2d1e637906f3323600c6e2b5b17