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
8 changes: 8 additions & 0 deletions components-rs/ffe.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,14 @@ use std::collections::HashMap;
use std::sync::Arc;
use tracing::debug;

pub(crate) const DEPENDENT_FLAG_VARIANT_KEY_V1: &str = "dependent-flag-variant-key-v1";

// Opt-in requires support in both the linked evaluator and the PHP binding's
// error propagation and exposure reporting. Declaring an RC enum is insufficient.
pub(crate) fn evaluator_capabilities() -> &'static [&'static str] {
&[]
}

struct FfeState {
config: Option<Configuration>,
version: u64,
Expand Down
45 changes: 43 additions & 2 deletions components-rs/remote_config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,14 @@ pub struct RemoteConfigFlags {
pub ffe_enabled: bool,
}

fn ffe_capabilities(evaluator_capabilities: &[&str]) -> Vec<RemoteConfigCapabilities> {
let mut capabilities = vec![RemoteConfigCapabilities::FfeFlagConfigurationRules];
if evaluator_capabilities.contains(&crate::ffe::DEPENDENT_FLAG_VARIANT_KEY_V1) {
capabilities.push(RemoteConfigCapabilities::FfeFlagDependentFlagVariantKeyV1);
}
capabilities
}

#[no_mangle]
#[allow(static_mut_refs)]
pub unsafe extern "C" fn ddog_init_remote_config(flags: RemoteConfigFlags) {
Expand Down Expand Up @@ -164,8 +172,9 @@ pub unsafe extern "C" fn ddog_init_remote_config(flags: RemoteConfigFlags) {

if ffe_enabled {
DATADOG_REMOTE_CONFIG_PRODUCTS.push(RemoteConfigProduct::FfeFlags);
DATADOG_REMOTE_CONFIG_CAPABILITIES
.push(RemoteConfigCapabilities::FfeFlagConfigurationRules);
for capability in ffe_capabilities(crate::ffe::evaluator_capabilities()) {
DATADOG_REMOTE_CONFIG_CAPABILITIES.push(capability);
}
}

if live_debugging_enabled {
Expand Down Expand Up @@ -938,3 +947,35 @@ pub unsafe extern "C" fn ddog_send_debugger_diagnostics<'a>(

ddog_sidecar_send_debugger_diagnostics(transport, payload)
}

#[cfg(test)]
mod capability_tests {
use super::*;

#[test]
fn dependent_flags_require_explicit_evaluator_support() {
for (reported, expected) in [
(vec![], vec![46]),
(vec!["unknown-v1"], vec![46]),
(vec!["dependent-flag-variant-key-v1"], vec![46, 50]),
(
vec!["unknown-v1", "dependent-flag-variant-key-v1"],
vec![46, 50],
),
] {
let actual: Vec<_> = ffe_capabilities(&reported)
.into_iter()
.map(|capability| capability as u32)
.collect();
assert_eq!(actual, expected);
}
}

#[test]
fn linked_evaluator_does_not_advertise_dependent_flags() {
assert!(crate::ffe::evaluator_capabilities().is_empty());
let capabilities = ffe_capabilities(crate::ffe::evaluator_capabilities());
assert_eq!(capabilities.len(), 1);
assert_eq!(capabilities[0] as u32, 46);
}
}
Loading