From af2cf166357f35ae9d56fbd895a64b05aa0a3215 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 6 Sep 2026 23:06:30 -0400 Subject: [PATCH 1/2] libdatadog update to 64ad2ed5 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/135760047 Full CI result: ❌ 5 job(s) failed --- Cargo.lock | 92 +++++++++++++++++----------------- Cargo.toml | 4 +- Makefile | 4 +- cbindgen.toml | 4 +- components-rs/remote_config.rs | 10 ++-- libdatadog | 2 +- 6 files changed, 58 insertions(+), 58 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 4a2dbe45d9..cb16cb21b3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1232,47 +1232,6 @@ version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d7a1e2f27636f116493b8b860f5546edb47c8d8f8ea73e1d2a20be88e28d1fea" -[[package]] -name = "datadog-live-debugger" -version = "0.0.1" -dependencies = [ - "anyhow", - "bytes", - "constcat", - "futures", - "http 1.4.2", - "libdd-capabilities", - "libdd-capabilities-impl", - "libdd-common", - "libdd-data-pipeline", - "libdd-remote-config", - "percent-encoding", - "serde", - "serde_json", - "smallvec", - "strum", - "strum_macros", - "sys-info", - "tokio", - "uuid", -] - -[[package]] -name = "datadog-live-debugger-ffi" -version = "0.0.1" -dependencies = [ - "build_common", - "datadog-live-debugger", - "libdd-common", - "libdd-common-ffi", - "log", - "percent-encoding", - "serde_json", - "tokio", - "tokio-util", - "uuid", -] - [[package]] name = "datadog-php" version = "0.0.1" @@ -1289,8 +1248,6 @@ dependencies = [ "criterion-perf-events", "crossbeam-channel", "dashmap", - "datadog-live-debugger", - "datadog-live-debugger-ffi", "datadog-sidecar", "datadog-sidecar-ffi", "ddtrace-sidecar", @@ -1311,6 +1268,8 @@ dependencies = [ "libdd-ipc", "libdd-library-config", "libdd-library-config-ffi", + "libdd-live-debugger", + "libdd-live-debugger-ffi", "libdd-profiling", "libdd-remote-config", "libdd-telemetry", @@ -1355,7 +1314,6 @@ dependencies = [ "chrono", "console-subscriber", "crossbeam-utils", - "datadog-live-debugger", "datadog-sidecar-macros", "futures", "http 1.4.2", @@ -1373,6 +1331,7 @@ dependencies = [ "libdd-ffe", "libdd-ipc", "libdd-ipc-macros", + "libdd-live-debugger", "libdd-remote-config", "libdd-telemetry", "libdd-tinybytes", @@ -1410,7 +1369,6 @@ dependencies = [ name = "datadog-sidecar-ffi" version = "0.0.1" dependencies = [ - "datadog-live-debugger", "datadog-sidecar", "http 1.4.2", "libc 0.2.186", @@ -1420,6 +1378,7 @@ dependencies = [ "libdd-crashtracker-ffi", "libdd-dogstatsd-client", "libdd-ipc", + "libdd-live-debugger", "libdd-remote-config", "libdd-telemetry", "libdd-telemetry-ffi", @@ -3059,7 +3018,7 @@ dependencies = [ [[package]] name = "libdd-data-pipeline-core" -version = "1.0.0" +version = "0.1.0" dependencies = [ "bytes", "futures", @@ -3224,6 +3183,47 @@ dependencies = [ "paste", ] +[[package]] +name = "libdd-live-debugger" +version = "0.1.0" +dependencies = [ + "anyhow", + "bytes", + "constcat", + "futures", + "http 1.4.2", + "libdd-capabilities", + "libdd-capabilities-impl", + "libdd-common", + "libdd-data-pipeline", + "libdd-remote-config", + "percent-encoding", + "serde", + "serde_json", + "smallvec", + "strum", + "strum_macros", + "sys-info", + "tokio", + "uuid", +] + +[[package]] +name = "libdd-live-debugger-ffi" +version = "0.0.1" +dependencies = [ + "build_common", + "libdd-common", + "libdd-common-ffi", + "libdd-live-debugger", + "log", + "percent-encoding", + "serde_json", + "tokio", + "tokio-util", + "uuid", +] + [[package]] name = "libdd-log" version = "1.0.0" diff --git a/Cargo.toml b/Cargo.toml index b84f097489..fc8f7e3f9f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -51,8 +51,8 @@ libdd-common = { path = "libdatadog/libdd-common", features = ["cgroup_testing"] libdd-common-ffi = { path = "libdatadog/libdd-common-ffi", default-features = false } libdd-telemetry = { path = "libdatadog/libdd-telemetry" } libdd-telemetry-ffi = { path = "libdatadog/libdd-telemetry-ffi", default-features = false } -datadog-live-debugger = { path = "libdatadog/datadog-live-debugger" } -datadog-live-debugger-ffi = { path = "libdatadog/datadog-live-debugger-ffi", default-features = false } +libdd-live-debugger = { path = "libdatadog/libdd-live-debugger" } +libdd-live-debugger-ffi = { path = "libdatadog/libdd-live-debugger-ffi", default-features = false } libdd-ipc = { path = "libdatadog/libdd-ipc" } datadog-ffe = { package = "libdd-ffe", path = "libdatadog/libdd-ffe" } libdd-remote-config = { path = "libdatadog/libdd-remote-config" } diff --git a/Makefile b/Makefile index ec877d56f9..b7afc45944 100644 --- a/Makefile +++ b/Makefile @@ -456,8 +456,8 @@ generate_cbindgen: cbindgen_binary # Regenerate components-rs/datadog.h componen $(command rustup && echo run nightly --) cbindgen --crate libdd-common-ffi \ --config libdd-common-ffi/cbindgen.toml \ --output $(PROJECT_ROOT)/components-rs/common.h; \ - $(command rustup && echo run nightly --) cbindgen --crate datadog-live-debugger-ffi \ - --config datadog-live-debugger-ffi/cbindgen.toml \ + $(command rustup && echo run nightly --) cbindgen --crate libdd-live-debugger-ffi \ + --config libdd-live-debugger-ffi/cbindgen.toml \ --output $(PROJECT_ROOT)/components-rs/live-debugger.h; \ $(command rustup && echo run nightly --) cbindgen --crate libdd-telemetry-ffi \ --config libdd-telemetry-ffi/cbindgen.toml \ diff --git a/cbindgen.toml b/cbindgen.toml index 50508ed52b..dd4223ffb7 100644 --- a/cbindgen.toml +++ b/cbindgen.toml @@ -46,8 +46,8 @@ include = [ "datadog-crashtracker-ffi", "datadog-sidecar", "libdd-ipc", - "datadog-live-debugger", - "datadog-live-debugger-ffi", + "libdd-live-debugger", + "libdd-live-debugger-ffi", "libdd-remote-config", "uuid" ] diff --git a/components-rs/remote_config.rs b/components-rs/remote_config.rs index 2bed8f0d67..eadb02b017 100644 --- a/components-rs/remote_config.rs +++ b/components-rs/remote_config.rs @@ -1,11 +1,11 @@ use crate::bytes::{dangling_zend_string, OwnedZendString, ZendString}; use crate::sidecar::MaybeShmLimiter; use datadog_ffe::rules_based::{Configuration, UniversalFlagConfig}; -use datadog_live_debugger::debugger_defs::{DebuggerData, DebuggerPayload}; -use datadog_live_debugger::{FilterList, LiveDebuggingData, ServiceConfiguration}; -use datadog_live_debugger_ffi::data::Probe; -use datadog_live_debugger_ffi::evaluator::{ddog_register_expr_evaluator, Evaluator}; -use datadog_live_debugger_ffi::send_data::{ +use libdd_live_debugger::debugger_defs::{DebuggerData, DebuggerPayload}; +use libdd_live_debugger::{FilterList, LiveDebuggingData, ServiceConfiguration}; +use libdd_live_debugger_ffi::data::Probe; +use libdd_live_debugger_ffi::evaluator::{ddog_register_expr_evaluator, Evaluator}; +use libdd_live_debugger_ffi::send_data::{ ddog_debugger_diagnostics_create_unboxed, ddog_snapshot_redacted_type, }; use datadog_sidecar::service::blocking::SidecarTransport; diff --git a/libdatadog b/libdatadog index 8134078c4d..64ad2ed5c7 160000 --- a/libdatadog +++ b/libdatadog @@ -1 +1 @@ -Subproject commit 8134078c4d4301029aed608acc0fa88c5f2b2cf2 +Subproject commit 64ad2ed5c793ce0b2550239734bb48c9ce442116 From 09eb84854a768836e7226cb5e8e4907751aa2ea3 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 7 Sep 2026 01:03:50 -0400 Subject: [PATCH 2/2] libdatadog update to 64ad2ed5 [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/135765896 Full CI result: ❌ 31 job(s) failed