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..cf426fd4ee 100644 --- a/components-rs/remote_config.rs +++ b/components-rs/remote_config.rs @@ -1,13 +1,6 @@ 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::{ - ddog_debugger_diagnostics_create_unboxed, ddog_snapshot_redacted_type, -}; use datadog_sidecar::service::blocking::SidecarTransport; use datadog_sidecar::service::{InstanceId, QueueId}; use datadog_sidecar::shm_remote_config::{RemoteConfigManager, RemoteConfigUpdate}; @@ -17,6 +10,13 @@ use libdd_common::tag::Tag; use libdd_common::Endpoint; use libdd_common_ffi::slice::AsBytes; use libdd_common_ffi::{CharSlice, MaybeError}; +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 libdd_remote_config::config::dynamic::{ Configs, DynamicConfigFile, TracingSamplingRuleProvenance, }; diff --git a/libdatadog b/libdatadog index 8134078c4d..50bcdb7b8d 160000 --- a/libdatadog +++ b/libdatadog @@ -1 +1 @@ -Subproject commit 8134078c4d4301029aed608acc0fa88c5f2b2cf2 +Subproject commit 50bcdb7b8d3adc7df35614abbd1f65791583c3cf