From bde0d0e8458e3a78acde1a607d7b4a0e59182ded Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 19 Jun 2026 01:00:59 -0400 Subject: [PATCH 1/3] libdatadog update to b10b1d46 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Automated update by CI pipeline https://gitlab.ddbuild.io/DataDog/apm-reliability/dd-trace-php/-/pipelines/119877674 Full CI result: ❌ 17 job(s) failed --- components-rs/remote_config.rs | 4 ++-- components-rs/telemetry.rs | 2 +- libdatadog | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/components-rs/remote_config.rs b/components-rs/remote_config.rs index 553f670a73c..5b08de64a81 100644 --- a/components-rs/remote_config.rs +++ b/components-rs/remote_config.rs @@ -246,7 +246,7 @@ fn bool_config(value: &bool) -> Cow<'static, str> { fn map_config_name(config: &Configs) -> &'static str { match config { Configs::TracingHeaderTags(_) => "datadog.trace.header_tags", - Configs::TracingSampleRate(_) => "datadog.trace.sample_rate", + Configs::TracingSamplingRate(_) => "datadog.trace.sample_rate", Configs::LogInjectionEnabled(_) => "datadog.logs_injection", Configs::TracingTags(_) => "datadog.tags", Configs::TracingEnabled(_) => "datadog.trace.enabled", @@ -260,7 +260,7 @@ fn map_config_name(config: &Configs) -> &'static str { fn map_config_value(config: &Configs) -> Cow<'_, str> { match config { Configs::TracingHeaderTags(tags) => tags.iter().map(|(k, _)| k).join(",").into(), - Configs::TracingSampleRate(rate) => rate.to_string().into(), + Configs::TracingSamplingRate(rate) => rate.to_string().into(), Configs::LogInjectionEnabled(enabled) => bool_config(enabled), Configs::TracingTags(tags) => tags.join(",").into(), Configs::TracingEnabled(enabled) => bool_config(enabled), diff --git a/components-rs/telemetry.rs b/components-rs/telemetry.rs index 8d2f818b940..737f3a9521a 100644 --- a/components-rs/telemetry.rs +++ b/components-rs/telemetry.rs @@ -7,7 +7,7 @@ use std::path::PathBuf; use std::time::Duration; use datadog_ipc::platform::NamedShmHandle; -use datadog_sidecar::one_way_shared_memory::{open_named_shm, OneWayShmReader}; +use datadog_ipc::one_way_shared_memory::{open_named_shm, OneWayShmReader}; use datadog_sidecar::service::{ blocking::{self, SidecarTransport}, InstanceId, QueueId, SidecarAction, diff --git a/libdatadog b/libdatadog index 952c2ef75cd..b10b1d46577 160000 --- a/libdatadog +++ b/libdatadog @@ -1 +1 @@ -Subproject commit 952c2ef75cdf7b2895d7152100ea61c12ccf4439 +Subproject commit b10b1d46577e95e057bd2b310641f965e6167d58 From 9ba8bcc54377e93f09b823e5df1eb3cd64e3054a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 19 Jun 2026 01:33:24 -0400 Subject: [PATCH 2/3] libdatadog update to b10b1d46 [no-ci-feedback] MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Automated update by CI pipeline https://gitlab.ddbuild.io/DataDog/apm-reliability/dd-trace-php/-/pipelines/119878822 Full CI result: ❌ 197 job(s) failed --- components-rs/telemetry.rs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/components-rs/telemetry.rs b/components-rs/telemetry.rs index 737f3a9521a..2c55aa53f7f 100644 --- a/components-rs/telemetry.rs +++ b/components-rs/telemetry.rs @@ -322,7 +322,11 @@ unsafe fn ddog_sidecar_telemetry_cache_get_or_update<'a>( } let shm_path = path_for_telemetry(&service_str, &env_str); - let reader = OneWayShmReader::::new(open_named_shm(&shm_path).ok(), shm_path); + let reader = OneWayShmReader::::new_with_opener( + open_named_shm(&shm_path).ok(), + shm_path, + |path| open_named_shm(path).ok(), + ); let cached_entry = cache.entry(ShmCacheKey(service_str.into(), env_str.into())).insert(ShmCache { reader, shared: TelemetryCachedClientShmData::default(), From 155c2a9474cf401dbf046afcda8fa4125956a4f6 Mon Sep 17 00:00:00 2001 From: Bob Weinand Date: Fri, 19 Jun 2026 14:29:41 +0200 Subject: [PATCH 3/3] More renames to tracing_sampling_rate Signed-off-by: Bob Weinand --- Cargo.lock | 5 ++++- tests/ext/remote_config/dynamic_config_multiconfig.phpt | 4 ++-- tests/ext/remote_config/dynamic_config_update.phpt | 2 +- tests/ext/shm_data_internal_fns.phpt | 2 +- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 796ee621b27..e99f11eddf4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2346,7 +2346,6 @@ dependencies = [ "hyper", "hyper-util", "rustls", - "rustls-native-certs", "rustls-pki-types", "tokio", "tokio-rustls", @@ -2811,6 +2810,7 @@ dependencies = [ "reqwest", "rustls", "rustls-native-certs", + "rustls-platform-verifier", "serde", "static_assertions", "tempfile", @@ -3090,6 +3090,8 @@ dependencies = [ "serde_json", "serde_with", "sha2", + "strum", + "strum_macros", "thiserror 2.0.12", "time", "tokio", @@ -3273,6 +3275,7 @@ dependencies = [ "rmp", "rmp-serde", "rmpv", + "rustc-hash 2.1.2", "serde", "serde_json", "tempfile", diff --git a/tests/ext/remote_config/dynamic_config_multiconfig.phpt b/tests/ext/remote_config/dynamic_config_multiconfig.phpt index bb433031252..e63d09148c4 100644 --- a/tests/ext/remote_config/dynamic_config_multiconfig.phpt +++ b/tests/ext/remote_config/dynamic_config_multiconfig.phpt @@ -24,11 +24,11 @@ $rr = new RequestReplayer(); // Org-level: sets sample_rate=0.3 and log_injection=true. // Specific service+env: overrides sample_rate=0.7, does not set log_injection. $org_path = put_wildcard_dynamic_config_file([ - "tracing_sample_rate" => 0.3, + "tracing_sampling_rate" => 0.3, "log_injection_enabled" => true, ]); $specific_path = put_dynamic_config_file([ - "tracing_sample_rate" => 0.7, + "tracing_sampling_rate" => 0.7, ]); dd_trace_internal_fn("await_remote_config"); diff --git a/tests/ext/remote_config/dynamic_config_update.phpt b/tests/ext/remote_config/dynamic_config_update.phpt index fafc5e48696..b0fab20842d 100644 --- a/tests/ext/remote_config/dynamic_config_update.phpt +++ b/tests/ext/remote_config/dynamic_config_update.phpt @@ -19,7 +19,7 @@ reset_request_replayer(); $rr = new RequestReplayer(); put_dynamic_config_file([ - "tracing_sample_rate" => 0.5, + "tracing_sampling_rate" => 0.5, "tracing_header_tags" => [["header" => "foo", "tag_name" => "bar"], ["header" => "other", "tag_name" => "baz"]], "log_injection_enabled" => true, "tracing_tags" => ["foo:bar", "baz:qux"], diff --git a/tests/ext/shm_data_internal_fns.phpt b/tests/ext/shm_data_internal_fns.phpt index cd85e14ba44..b33ea03c8c2 100644 --- a/tests/ext/shm_data_internal_fns.phpt +++ b/tests/ext/shm_data_internal_fns.phpt @@ -73,7 +73,7 @@ var_dump(is_array($sampling)); var_dump(isset($sampling['rate_by_service'])); var_dump((float)($sampling['rate_by_service']['service:shm_data_test,env:test'] ?? -1)); -$apmPath = put_dynamic_config_file(['tracing_sample_rate' => 0.5], 'shm_data_test', 'test'); +$apmPath = put_dynamic_config_file(['tracing_sampling_rate' => 0.5], 'shm_data_test', 'test'); $probeId = "log1a2b3c4d-0000-0000-0000-000000000001"; put_rc_file( "datadog/2/LIVE_DEBUGGING/logProbe_{$probeId}/config",