From 8bd013441e2cb282e24f4450b37d00de4ea0e278 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 10 Aug 2026 22:48:06 -0400 Subject: [PATCH 1/2] libdatadog update to 130ed6b2 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/130112183 Full CI result: ❌ 1 job(s) failed --- libdatadog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libdatadog b/libdatadog index 95610de06a..130ed6b2e6 160000 --- a/libdatadog +++ b/libdatadog @@ -1 +1 @@ -Subproject commit 95610de06a776b8d645fe77ad8b8e1848ecd53b7 +Subproject commit 130ed6b2e61831cc1b70b6577b66af154a9b57af From 74e6164ccbf7c2cde6b2dcb66d6d57f7709e8873 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 10 Aug 2026 23:11:24 -0400 Subject: [PATCH 2/2] libdatadog update to 130ed6b2 [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/130113937 Full CI result: ❌ 233 job(s) failed --- Cargo.lock | 52 ++++++++++++++++++---------------- Makefile | 2 +- components-rs/Cargo.toml | 2 +- components-rs/ffe.rs | 2 +- components-rs/remote_config.rs | 2 +- 5 files changed, 31 insertions(+), 29 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 7d190dfa02..3744c92a14 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1208,30 +1208,6 @@ version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d7a1e2f27636f116493b8b860f5546edb47c8d8f8ea73e1d2a20be88e28d1fea" -[[package]] -name = "datadog-ffe" -version = "1.0.0" -dependencies = [ - "chrono", - "derive_more", - "faststr", - "libdd-common", - "libdd-remote-config", - "libdd-trace-protobuf", - "log", - "lru", - "md5", - "prost", - "pyo3", - "semver", - "serde", - "serde-bool", - "serde_json", - "serde_with", - "thiserror 2.0.18", - "url", -] - [[package]] name = "datadog-ipc" version = "0.1.0" @@ -1322,7 +1298,6 @@ dependencies = [ "bincode", "cbindgen 0.27.0", "const-str", - "datadog-ffe", "datadog-ipc", "datadog-live-debugger", "datadog-live-debugger-ffi", @@ -2985,6 +2960,33 @@ dependencies = [ "tracing", ] +[[package]] +name = "libdd-ffe" +version = "0.1.0" +dependencies = [ + "chrono", + "derive_more", + "faststr", + "http", + "libdd-capabilities", + "libdd-common", + "libdd-remote-config", + "libdd-trace-protobuf", + "log", + "lru", + "md5", + "prost", + "pyo3", + "semver", + "serde", + "serde-bool", + "serde_json", + "serde_with", + "thiserror 2.0.18", + "tokio", + "url", +] + [[package]] name = "libdd-library-config" version = "3.0.0" diff --git a/Makefile b/Makefile index aa1ba9dad6..e4b4006401 100644 --- a/Makefile +++ b/Makefile @@ -48,7 +48,7 @@ RUN_TESTS_CMD := DD_SERVICE= DD_ENV= REPORT_EXIT_STATUS=1 TEST_PHP_SRCDIR=$(PROJ C_FILES = $(shell find components components-rs ext src/dogstatsd tracer zend_abstract_interface -name '*.c' -o -name '*.h' | awk '{ printf "$(BUILD_DIR)/%s\n", $$1 }' ) TEST_FILES = $(shell find tests/ext -name '*.php*' -o -name '*.inc' -o -name '*.json' -o -name '*.yaml' -o -name 'CONFLICTS' | awk '{ printf "$(BUILD_DIR)/%s\n", $$1 }' ) -RUST_FILES = $(BUILD_DIR)/Cargo.toml $(BUILD_DIR)/Cargo.lock $(shell find components-rs -name '*.c' -o -name '*.rs' -o -name 'Cargo.toml' | awk '{ printf "$(BUILD_DIR)/%s\n", $$1 }' ) $(shell find libdatadog/{build-common,datadog-ffe,datadog-ipc,datadog-ipc-macros,datadog-live-debugger,datadog-live-debugger-ffi,libdd-remote-config,datadog-sidecar,datadog-sidecar-ffi,datadog-sidecar-macros,libdd-alloc,libdd-capabilities,libdd-capabilities-impl,libdd-common,libdd-common-ffi,libdd-crashtracker,libdd-crashtracker-ffi,libdd-data-pipeline,libdd-ddsketch,libdd-dogstatsd-client,libdd-library-config,libdd-library-config-ffi,libdd-log,libdd-shared-runtime,libdd-telemetry,libdd-telemetry-ffi,libdd-tinybytes,libdd-trace-*,spawn_worker,tools/{cc_utils,sidecar_mockgen},libdd-trace-*,Cargo.toml} \( -type l -o -type f \) \( -path "*/src*" -o -path "*/examples*" -o -path "*Cargo.toml" -o -path "*/build.rs" -o -path "*/tests/dataservice.rs" -o -path "*/tests/service_functional.rs" \) -not -path "*/datadog-ipc/build.rs" -not -path "*/datadog-sidecar-ffi/build.rs") +RUST_FILES = $(BUILD_DIR)/Cargo.toml $(BUILD_DIR)/Cargo.lock $(shell find components-rs -name '*.c' -o -name '*.rs' -o -name 'Cargo.toml' | awk '{ printf "$(BUILD_DIR)/%s\n", $$1 }' ) $(shell find libdatadog/{build-common,libdd-ffe,datadog-ipc,datadog-ipc-macros,datadog-live-debugger,datadog-live-debugger-ffi,libdd-remote-config,datadog-sidecar,datadog-sidecar-ffi,datadog-sidecar-macros,libdd-alloc,libdd-capabilities,libdd-capabilities-impl,libdd-common,libdd-common-ffi,libdd-crashtracker,libdd-crashtracker-ffi,libdd-data-pipeline,libdd-ddsketch,libdd-dogstatsd-client,libdd-library-config,libdd-library-config-ffi,libdd-log,libdd-shared-runtime,libdd-telemetry,libdd-telemetry-ffi,libdd-tinybytes,libdd-trace-*,spawn_worker,tools/{cc_utils,sidecar_mockgen},libdd-trace-*,Cargo.toml} \( -type l -o -type f \) \( -path "*/src*" -o -path "*/examples*" -o -path "*Cargo.toml" -o -path "*/build.rs" -o -path "*/tests/dataservice.rs" -o -path "*/tests/service_functional.rs" \) -not -path "*/datadog-ipc/build.rs" -not -path "*/datadog-sidecar-ffi/build.rs") ALL_OBJECT_FILES = $(C_FILES) $(RUST_FILES) $(BUILD_DIR)/Makefile TEST_OPCACHE_FILES = $(shell find tests/opcache -name '*.php*' -o -name '.gitkeep' | awk '{ printf "$(BUILD_DIR)/%s\n", $$1 }' ) TEST_STUB_FILES = $(shell find tests/ext -type d -name 'stubs' -exec find '{}' -type f \; | awk '{ printf "$(BUILD_DIR)/%s\n", $$1 }' ) diff --git a/components-rs/Cargo.toml b/components-rs/Cargo.toml index 7c78ff2cad..c3337ef511 100644 --- a/components-rs/Cargo.toml +++ b/components-rs/Cargo.toml @@ -15,7 +15,7 @@ libdd-telemetry-ffi = { path = "../libdatadog/libdd-telemetry-ffi", default-feat datadog-live-debugger = { path = "../libdatadog/datadog-live-debugger" } datadog-live-debugger-ffi = { path = "../libdatadog/datadog-live-debugger-ffi", default-features = false } datadog-ipc = { path = "../libdatadog/datadog-ipc" } -datadog-ffe = { path = "../libdatadog/datadog-ffe" } +libdd-ffe = { path = "../libdatadog/libdd-ffe" } libdd-remote-config = { path = "../libdatadog/libdd-remote-config" } datadog-sidecar = { path = "../libdatadog/datadog-sidecar" } datadog-sidecar-ffi = { path = "../libdatadog/datadog-sidecar-ffi" } diff --git a/components-rs/ffe.rs b/components-rs/ffe.rs index 4964bc7b0b..fa611c5568 100644 --- a/components-rs/ffe.rs +++ b/components-rs/ffe.rs @@ -1,5 +1,5 @@ use crate::bytes::MaybeOwnedZendString; -use datadog_ffe::rules_based::{ +use libdd_ffe::rules_based::{ self as ffe, AssignmentReason, AssignmentValue, Attribute, Configuration, EvaluationContext, EvaluationError, ExpectedFlagType, Str, UniversalFlagConfig, }; diff --git a/components-rs/remote_config.rs b/components-rs/remote_config.rs index 6e085848f6..b0d95f195a 100644 --- a/components-rs/remote_config.rs +++ b/components-rs/remote_config.rs @@ -1,5 +1,5 @@ use crate::sidecar::MaybeShmLimiter; -use datadog_ffe::rules_based::{Configuration, UniversalFlagConfig}; +use libdd_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;