Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ datadog-ffe-ffi @Datadog/feature-flagging-and-experimentati
datadog-ipc*/ @Datadog/libdatadog-php
libdd-live-debugger*/ @Datadog/libdatadog-php @Datadog/libdatadog-apm
datadog-profiling-replayer @Datadog/libdatadog-profiling
datadog-remote-config @Datadog/libdatadog-php @Datadog/libdatadog-apm @Datadog/remote-config
libdd-remote-config @Datadog/libdatadog-php @Datadog/libdatadog-apm @Datadog/remote-config
datadog-sidecar @Datadog/libdatadog-php @Datadog/libdatadog-apm
datadog-sidecar-ffi @Datadog/libdatadog-php @Datadog/libdatadog-apm
datadog-sidecar-macros @Datadog/libdatadog-php
Expand Down
62 changes: 31 additions & 31 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ members = [
"libdd-profiling-ffi",
"libdd-profiling-protobuf",
"datadog-profiling-replayer",
"datadog-remote-config",
"libdd-remote-config",
"datadog-sidecar",
"datadog-sidecar-ffi",
"datadog-sidecar-macros",
Expand Down
2 changes: 1 addition & 1 deletion LICENSE-3rdparty.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
root_name: builder, build_common, tools, libdd-alloc, libdd-crashtracker, libdd-common, libdd-telemetry, libdd-ddsketch, libdd-crashtracker-ffi, libdd-common-ffi, datadog-ffe, datadog-ffe-ffi, datadog-ipc, datadog-ipc-macros, libdd-tinybytes, tarpc, tarpc-plugins, spawn_worker, cc_utils, libdd-library-config, libdd-library-config-ffi, libdd-live-debugger, libdd-data-pipeline, libdd-dogstatsd-client, libdd-trace-protobuf, libdd-trace-stats, libdd-trace-utils, libdd-trace-normalization, libdd-log, libdd-live-debugger-ffi, libdd-profiling, libdd-profiling-protobuf, libdd-profiling-ffi, libdd-data-pipeline-ffi, libdd-ddsketch-ffi, libdd-log-ffi, libdd-telemetry-ffi, symbolizer-ffi, datadog-profiling-replayer, datadog-remote-config, datadog-sidecar, datadog-sidecar-macros, datadog-sidecar-ffi, libdd-trace-obfuscation, datadog-tracer-flare, sidecar_mockgen, test_spawn_from_lib
root_name: builder, build_common, tools, libdd-alloc, libdd-crashtracker, libdd-common, libdd-telemetry, libdd-ddsketch, libdd-crashtracker-ffi, libdd-common-ffi, datadog-ffe, datadog-ffe-ffi, datadog-ipc, datadog-ipc-macros, libdd-tinybytes, tarpc, tarpc-plugins, spawn_worker, cc_utils, libdd-library-config, libdd-library-config-ffi, libdd-live-debugger, libdd-data-pipeline, libdd-dogstatsd-client, libdd-trace-protobuf, libdd-trace-stats, libdd-trace-utils, libdd-trace-normalization, libdd-log, libdd-live-debugger-ffi, libdd-profiling, libdd-profiling-protobuf, libdd-profiling-ffi, libdd-data-pipeline-ffi, libdd-ddsketch-ffi, libdd-log-ffi, libdd-telemetry-ffi, symbolizer-ffi, datadog-profiling-replayer, libdd-remote-config, datadog-sidecar, datadog-sidecar-macros, datadog-sidecar-ffi, libdd-trace-obfuscation, datadog-tracer-flare, sidecar_mockgen, test_spawn_from_lib
third_party_libraries:
- package_name: addr2line
package_version: 0.24.2
Expand Down
2 changes: 1 addition & 1 deletion datadog-sidecar-ffi/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ datadog-ipc = { path = "../datadog-ipc" }
libdd-common = { path = "../libdd-common" }
libdd-common-ffi = { path = "../libdd-common-ffi", default-features = false }
libdd-telemetry-ffi = { path = "../libdd-telemetry-ffi", default-features = false }
datadog-remote-config = { path = "../datadog-remote-config" }
libdd-remote-config = { path = "../libdd-remote-config" }
libdd-live-debugger = { path = "../libdd-live-debugger" }
libdd-dogstatsd-client = { path = "../libdd-dogstatsd-client" }
libdd-tinybytes = { path = "../libdd-tinybytes", features = ["bytes_string"] }
Expand Down
2 changes: 1 addition & 1 deletion datadog-sidecar-ffi/cbindgen.toml
Original file line number Diff line number Diff line change
Expand Up @@ -44,4 +44,4 @@ must_use = "DDOG_CHECK_RETURN"

[parse]
parse_deps = true
include = ["libdd-common", "libdd-telemetry", "datadog-sidecar", "libdd-telemetry-ffi", "libdd-common-ffi", "datadog-ipc", "libdd-live-debugger", "datadog-remote-config"]
include = ["libdd-common", "libdd-telemetry", "datadog-sidecar", "libdd-telemetry-ffi", "libdd-common-ffi", "datadog-ipc", "libdd-live-debugger", "libdd-remote-config"]
4 changes: 2 additions & 2 deletions datadog-sidecar-ffi/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@ use crate::span::TracesBytes;
use datadog_ipc::platform::{
FileBackedHandle, MappedMem, NamedShmHandle, PlatformHandle, ShmHandle,
};
use datadog_remote_config::fetch::ConfigInvariants;
use datadog_remote_config::{RemoteConfigCapabilities, RemoteConfigProduct, Target};
use datadog_sidecar::agent_remote_config::{
new_reader, reader_from_shm, AgentRemoteConfigEndpoint, AgentRemoteConfigWriter,
};
Expand All @@ -39,6 +37,8 @@ use libdd_common_ffi::{self as ffi, MaybeError};
use libdd_crashtracker_ffi::Metadata;
use libdd_dogstatsd_client::DogStatsDActionOwned;
use libdd_live_debugger::debugger_defs::DebuggerPayload;
use libdd_remote_config::fetch::ConfigInvariants;
use libdd_remote_config::{RemoteConfigCapabilities, RemoteConfigProduct, Target};
use libdd_telemetry::{
data::{self, Dependency, Integration},
worker::{LifecycleAction, LogIdentifier, TelemetryActions},
Expand Down
4 changes: 2 additions & 2 deletions datadog-sidecar/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ datadog-sidecar-macros = { path = "../datadog-sidecar-macros" }
libdd-telemetry = { path = "../libdd-telemetry", features = ["tracing"] }
libdd-data-pipeline = { path = "../libdd-data-pipeline" }
libdd-trace-utils = { path = "../libdd-trace-utils" }
datadog-remote-config = { path = "../datadog-remote-config" , features = ["live-debugger"]}
libdd-remote-config = { path = "../libdd-remote-config" , features = ["live-debugger"]}
libdd-live-debugger = { path = "../libdd-live-debugger" }
libdd-crashtracker = { path = "../libdd-crashtracker" }
libdd-dogstatsd-client = { path = "../libdd-dogstatsd-client" }
Expand Down Expand Up @@ -101,7 +101,7 @@ microseh = "0.1.1"
libc = { version = "0.2" }
tempfile = { version = "3.3" }
httpmock = "0.8.0-alpha.1"
datadog-remote-config = { path = "../datadog-remote-config", features = ["test"] }
libdd-remote-config = { path = "../libdd-remote-config", features = ["test"] }
libdd-trace-utils = { path = "../libdd-trace-utils", features = ["test-utils"] }

[lints.rust]
Expand Down
2 changes: 1 addition & 1 deletion datadog-sidecar/src/service/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@

// imports for structs defined in this file
use crate::config;
use datadog_remote_config::{RemoteConfigCapabilities, RemoteConfigProduct};
use libdd_common::tag::Tag;
use libdd_common::Endpoint;
use libdd_remote_config::{RemoteConfigCapabilities, RemoteConfigProduct};
use libdd_telemetry::metrics::MetricContext;
use libdd_telemetry::worker::TelemetryActions;
use serde::{Deserialize, Serialize};
Expand Down
4 changes: 2 additions & 2 deletions datadog-sidecar/src/service/remote_configs.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@

use crate::service::DynamicInstrumentationConfigState;
use crate::shm_remote_config::{ShmRemoteConfigs, ShmRemoteConfigsGuard};
use datadog_remote_config::fetch::{
use libdd_common::{tag::Tag, MutexExt};
use libdd_remote_config::fetch::{
ConfigInvariants, ConfigOptions, MultiTargetStats, NotifyTarget, ProductCapabilities,
};
use libdd_common::{tag::Tag, MutexExt};
use std::collections::hash_map::Entry;
use std::fmt::Debug;
use std::sync::{Arc, Mutex};
Expand Down
2 changes: 1 addition & 1 deletion datadog-sidecar/src/service/session_info.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ use futures::future;

use crate::log::{MultiEnvFilterGuard, MultiWriterGuard};
use crate::{spawn_map_err, tracer};
use datadog_remote_config::fetch::ConfigOptions;
use libdd_common::MutexExt;
use libdd_live_debugger::sender::{DebuggerType, PayloadSender};
use libdd_remote_config::fetch::ConfigOptions;
use tracing::log::warn;
use tracing::{debug, error, info, trace};

Expand Down
2 changes: 1 addition & 1 deletion datadog-sidecar/src/service/sidecar_server.rs
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,10 @@ use crate::service::tracing::trace_flusher::TraceFlusherStats;
use crate::tokio_util::run_or_spawn_shared;
use datadog_ipc::platform::FileBackedHandle;
use datadog_ipc::tarpc::server::{Channel, InFlightRequest};
use datadog_remote_config::fetch::{ConfigInvariants, ConfigOptions, MultiTargetStats};
use libdd_common::tag::Tag;
use libdd_dogstatsd_client::{new, DogStatsDActionOwned};
use libdd_live_debugger::sender::{agent_info_supports_dedicated_snapshots_endpoint, DebuggerType};
use libdd_remote_config::fetch::{ConfigInvariants, ConfigOptions, MultiTargetStats};
use libdd_telemetry::config::Config;
use libdd_tinybytes as tinybytes;
use libdd_trace_utils::tracer_header_tags::TracerHeaderTags;
Expand Down
14 changes: 7 additions & 7 deletions datadog-sidecar/src/shm_remote_config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@ use base64::prelude::BASE64_URL_SAFE_NO_PAD;
use base64::Engine;
use datadog_ipc::platform::{FileBackedHandle, MappedMem, NamedShmHandle};
use datadog_ipc::rate_limiter::ShmLimiter;
use datadog_remote_config::config::dynamic::{parse_json, Configs};
use datadog_remote_config::fetch::{
use libdd_common::{tag::Tag, MutexExt};
use libdd_remote_config::config::dynamic::{parse_json, Configs};
use libdd_remote_config::fetch::{
ConfigInvariants, FileRefcountData, FileStorage, MultiTargetFetcher, MultiTargetHandlers,
MultiTargetStats, NotifyTarget, ProductCapabilities, RefcountedFile,
};
use datadog_remote_config::{RemoteConfigPath, RemoteConfigProduct, RemoteConfigValue, Target};
use libdd_common::{tag::Tag, MutexExt};
use libdd_remote_config::{RemoteConfigPath, RemoteConfigProduct, RemoteConfigValue, Target};
use priority_queue::PriorityQueue;
use sha2::{Digest, Sha224};
use std::cmp::Reverse;
Expand Down Expand Up @@ -750,9 +750,9 @@ impl RemoteConfigManager {
#[cfg(test)]
mod tests {
use super::*;
use datadog_remote_config::config::dynamic::{tests::dummy_dynamic_config, Configs};
use datadog_remote_config::fetch::test_server::RemoteConfigServer;
use datadog_remote_config::{RemoteConfigData, RemoteConfigProduct, RemoteConfigSource};
use libdd_remote_config::config::dynamic::{tests::dummy_dynamic_config, Configs};
use libdd_remote_config::fetch::test_server::RemoteConfigServer;
use libdd_remote_config::{RemoteConfigData, RemoteConfigProduct, RemoteConfigSource};
use manual_future::ManualFuture;
use std::sync::LazyLock;

Expand Down
6 changes: 3 additions & 3 deletions datadog-tracer-flare/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ publish = false
[dependencies]
anyhow = "1.0"
libdd-common = { path = "../libdd-common" }
datadog-remote-config = { path = "../datadog-remote-config", default-features = false }
libdd-remote-config = { path = "../libdd-remote-config", default-features = false }
libdd-trace-utils = { path = "../libdd-trace-utils" }
hyper = { workspace = true}
tokio = { version = "1.36.0", features = ["time"] }
Expand All @@ -23,8 +23,8 @@ tempfile = "3.8"
bench = false

[dev-dependencies]
datadog-remote-config = { path = "../datadog-remote-config", features = ["test"] }
libdd-remote-config = { path = "../libdd-remote-config", features = ["test"] }

[features]
default = ["listener"]
listener = ["datadog-remote-config/client"]
listener = ["libdd-remote-config/client"]
8 changes: 4 additions & 4 deletions datadog-tracer-flare/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,18 @@ use std::{
},
};

use datadog_remote_config::{config::agent_task::AgentTaskFile, RemoteConfigData};
use libdd_remote_config::{config::agent_task::AgentTaskFile, RemoteConfigData};

use crate::error::FlareError;
#[cfg(feature = "listener")]
use {
datadog_remote_config::{
libdd_common::Endpoint,
libdd_remote_config::{
fetch::{ConfigInvariants, ConfigOptions, SingleChangesFetcher},
file_change_tracker::Change,
file_storage::{ParsedFileStorage, RawFile, RawFileStorage},
RemoteConfigProduct, Target,
},
libdd_common::Endpoint,
std::str::FromStr,
};

Expand Down Expand Up @@ -506,7 +506,7 @@ mod tests {
use crate::ReturnAction;
use crate::{FlareError, LogLevel};
#[cfg(feature = "listener")]
use datadog_remote_config::{
use libdd_remote_config::{
config::{
agent_config::{AgentConfig, AgentConfigFile},
agent_task::{AgentTask, AgentTaskFile},
Expand Down
4 changes: 2 additions & 2 deletions datadog-tracer-flare/src/zip.rs
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
// Copyright 2025-Present Datadog, Inc. https://www.datadoghq.com/
// SPDX-License-Identifier: Apache-2.0

use datadog_remote_config::config::agent_task::AgentTaskFile;
use hyper::{body::Bytes, Method};
use libdd_common::{hyper_migration, Endpoint, MutexExt};
use libdd_remote_config::config::agent_task::AgentTaskFile;
use std::{
collections::HashMap,
fs::File,
Expand Down Expand Up @@ -232,7 +232,7 @@ impl TracerFlareManager {
///
/// ```rust no_run
/// use datadog_tracer_flare::{TracerFlareManager, ReturnAction};
/// use datadog_remote_config::config::agent_task::{AgentTaskFile, AgentTask};
/// use libdd_remote_config::config::agent_task::{AgentTaskFile, AgentTask};
/// use std::num::NonZeroU64;
///
/// #[tokio::main]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
[package]
edition = "2021"
license = "Apache 2.0"
name = "datadog-remote-config"
version = "0.0.1"
publish = false
name = "libdd-remote-config"
version = "1.0.0"
description = "A Rust client library that fetches and delivers dynamic configuration updates from Datadog's backend for multiple products at runtime."
repository = "https://github.com/DataDog/libdatadog/tree/main/libdd-remote-config"
edition.workspace = true
rust-version.workspace = true
license.workspace = true
authors.workspace = true

[features]
default = ["client"]
Expand Down Expand Up @@ -51,7 +54,7 @@ hyper-util = { workspace = true, features = ["service"], optional = true }

[dev-dependencies]
futures = "0.3"
datadog-remote-config = { path = ".", features = ["test"] }
libdd-remote-config = { path = ".", features = ["test"] }

[lib]
bench = false
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
// Copyright 2021-Present Datadog, Inc. https://www.datadoghq.com/
// SPDX-License-Identifier: Apache-2.0

use datadog_remote_config::fetch::{ConfigInvariants, ConfigOptions, SingleChangesFetcher};
use datadog_remote_config::file_change_tracker::{Change, FilePath};
use datadog_remote_config::file_storage::ParsedFileStorage;
use datadog_remote_config::RemoteConfigProduct::ApmTracing;
use datadog_remote_config::{RemoteConfigData, Target};
use libdd_common::tag::Tag;
use libdd_common::Endpoint;
use libdd_remote_config::fetch::{ConfigInvariants, ConfigOptions, SingleChangesFetcher};
use libdd_remote_config::file_change_tracker::{Change, FilePath};
use libdd_remote_config::file_storage::ParsedFileStorage;
use libdd_remote_config::RemoteConfigProduct::ApmTracing;
use libdd_remote_config::{RemoteConfigData, Target};
use std::time::Duration;
use tokio::time::sleep;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ pub struct AgentConfig {
/// # Examples
///
/// ```
/// use datadog_remote_config::config::agent_config::parse_json;
/// use libdd_remote_config::config::agent_config::parse_json;
///
/// let json_data = r#"{
/// "name": "flare-log-level.debug",
Expand Down
Loading
Loading