Skip to content
Merged
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
1 change: 1 addition & 0 deletions Cargo.lock

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

2 changes: 2 additions & 0 deletions datadog-remote-config/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,15 @@ client = [
"tracing"
]
live-debugger = ["datadog-live-debugger"]
ffe = ["datadog-ffe"]
test = ["hyper/server", "hyper-util"]

[dependencies]
anyhow = { version = "1.0" }
libdd-common = { path = "../libdd-common"}
libdd-trace-protobuf = { path = "../libdd-trace-protobuf", optional = true }
datadog-live-debugger = { path = "../datadog-live-debugger", optional = true }
datadog-ffe = { path = "../datadog-ffe", optional = true }
hyper = { workspace = true, optional = true }
http-body-util = {version = "0.1", optional = true }
http = { version = "1.0", optional = true }
Expand Down
1 change: 1 addition & 0 deletions datadog-remote-config/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -81,4 +81,5 @@ pub enum RemoteConfigCapabilities {
ApmTracingEnableLiveDebugging = 41,
AsmDdMulticonfig = 42,
AsmTraceTaggingRules = 43,
FfeFlagConfigurationRules = 46,
}
10 changes: 10 additions & 0 deletions datadog-remote-config/src/parse.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ use crate::{
},
RemoteConfigPath, RemoteConfigProduct, RemoteConfigSource,
};
#[cfg(feature = "ffe")]
use datadog_ffe::rules_based::UniversalFlagConfig;
#[cfg(feature = "live-debugger")]
use datadog_live_debugger::LiveDebuggingData;

Expand All @@ -17,6 +19,8 @@ pub enum RemoteConfigData {
LiveDebugger(LiveDebuggingData),
TracerFlareConfig(AgentConfigFile),
TracerFlareTask(AgentTaskFile),
#[cfg(feature = "ffe")]
FfeFlags(UniversalFlagConfig),
Ignored(RemoteConfigProduct),
}

Expand All @@ -40,6 +44,10 @@ impl RemoteConfigData {
let parsed = datadog_live_debugger::parse_json(&String::from_utf8_lossy(data))?;
RemoteConfigData::LiveDebugger(parsed)
}
#[cfg(feature = "ffe")]
RemoteConfigProduct::FfeFlags => {
RemoteConfigData::FfeFlags(UniversalFlagConfig::from_json(data.to_vec())?)
}
_ => RemoteConfigData::Ignored(product),
})
}
Expand All @@ -53,6 +61,8 @@ impl From<&RemoteConfigData> for RemoteConfigProduct {
RemoteConfigData::LiveDebugger(_) => RemoteConfigProduct::LiveDebugger,
RemoteConfigData::TracerFlareConfig(_) => RemoteConfigProduct::AgentConfig,
RemoteConfigData::TracerFlareTask(_) => RemoteConfigProduct::AgentTask,
#[cfg(feature = "ffe")]
RemoteConfigData::FfeFlags(_) => RemoteConfigProduct::FfeFlags,
RemoteConfigData::Ignored(product) => *product,
}
}
Expand Down
3 changes: 3 additions & 0 deletions datadog-remote-config/src/path.rs
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ pub enum RemoteConfigProduct {
AsmData,
AsmDD,
AsmFeatures,
FfeFlags,
#[cfg(feature = "live-debugger")]
LiveDebugger,
}
Expand All @@ -37,6 +38,7 @@ impl Display for RemoteConfigProduct {
RemoteConfigProduct::AsmData => "ASM_DATA",
RemoteConfigProduct::AsmDD => "ASM_DD",
RemoteConfigProduct::AsmFeatures => "ASM_FEATURES",
RemoteConfigProduct::FfeFlags => "FFE_FLAGS",
#[cfg(feature = "live-debugger")]
RemoteConfigProduct::LiveDebugger => "LIVE_DEBUGGING",
};
Expand Down Expand Up @@ -87,6 +89,7 @@ impl RemoteConfigPath {
"ASM_DATA" => RemoteConfigProduct::AsmData,
"ASM_DD" => RemoteConfigProduct::AsmDD,
"ASM_FEATURES" => RemoteConfigProduct::AsmFeatures,
"FFE_FLAGS" => RemoteConfigProduct::FfeFlags,
#[cfg(feature = "live-debugger")]
"LIVE_DEBUGGING" => RemoteConfigProduct::LiveDebugger,
product => anyhow::bail!("Unknown product {}", product),
Expand Down
Loading