Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[library-configuration] Expose config file path for wasm dependencies #860

Merged
merged 2 commits into from
Feb 6, 2025
Merged

[library-configuration] Expose config file path for wasm dependencies #860

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e4d9bb2
* Add Target enum with platform detection
paullegranddc Feb 6, 2025
dd97994
Rename APM TRACING ENABLED configuration to correct name
paullegranddc Feb 6, 2025
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 library-config-ffi/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ pub extern "C" fn ddog_library_configurator_get(
pub extern "C" fn ddog_library_config_name_to_env(name: LibraryConfigName) -> ffi::CStr<'static> {
use LibraryConfigName::*;
ffi::CStr::from_std(match name {
DdTraceApmEnabled => ddcommon::cstr!("DD_TRACE_ENABLED"),
DdApmTracingEnabled => ddcommon::cstr!("DD_APM_TRACING_ENABLED"),
DdRuntimeMetricsEnabled => ddcommon::cstr!("DD_RUNTIME_METRICS_ENABLED"),
DdLogsInjection => ddcommon::cstr!("DD_LOGS_INJECTION"),
DdProfilingEnabled => ddcommon::cstr!("DD_PROFILING_ENABLED"),
Expand Down
72 changes: 45 additions & 27 deletions library-config/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@ impl ProcessInfo {
#[allow(clippy::enum_variant_names)]
pub enum LibraryConfigName {
// Phase 1: product enablement
DdTraceApmEnabled,
DdApmTracingEnabled,
DdRuntimeMetricsEnabled,
DdLogsInjection,
DdProfilingEnabled,
Expand All @@ -276,7 +276,7 @@ impl LibraryConfigName {
pub fn to_str(&self) -> &'static str {
use LibraryConfigName::*;
match self {
DdTraceApmEnabled => "DD_TRACE_ENABLED",
DdApmTracingEnabled => "DD_APM_TRACING_ENABLED",
DdRuntimeMetricsEnabled => "DD_RUNTIME_METRICS_ENABLED",
DdLogsInjection => "DD_LOGS_INJECTION",
DdProfilingEnabled => "DD_PROFILING_ENABLED",
Expand Down Expand Up @@ -417,36 +417,54 @@ pub struct Configurator {
debug_logs: bool,
}

impl Configurator {
pub const FLEET_STABLE_CONFIGURATION_PATH: &'static str = {
pub enum Target {
Linux,
Macos,
Windows,
}

impl Target {
#[cfg(any(target_os = "linux", target_os = "macos", windows))]
const fn current() -> Self {
#[cfg(target_os = "linux")]
{
"/etc/datadog-agent/managed/datadog-agent/stable/application_monitoring.yaml"
Self::Linux
}
#[cfg(target_os = "macos")]
{
"/opt/datadog-agent/etc/stable/application_monitoring.yaml"
Self::Macos
}
#[cfg(windows)]
{
"C:\\ProgramData\\Datadog\\managed\\datadog-agent\\stable\\application_monitoring.yaml"
Self::Windows
}
};
}
}

pub const LOCAL_STABLE_CONFIGURATION_PATH: &'static str = {
#[cfg(target_os = "linux")]
{
"/etc/datadog-agent/application_monitoring.yaml"
}
#[cfg(target_os = "macos")]
{
"/opt/datadog-agent/etc/application_monitoring.yaml"
impl Configurator {
#[cfg(any(target_os = "linux", target_os = "macos", windows))]
pub const FLEET_STABLE_CONFIGURATION_PATH: &'static str =
Self::fleet_stable_configuration_path(Target::current());

#[cfg(any(target_os = "linux", target_os = "macos", windows))]
pub const LOCAL_STABLE_CONFIGURATION_PATH: &'static str =
Self::local_stable_configuration_path(Target::current());

pub const fn local_stable_configuration_path(target: Target) -> &'static str {
match target {
Target::Linux => "/etc/datadog-agent/managed/datadog-agent/stable/application_monitoring.yaml",
Target::Macos => "/opt/datadog-agent/etc/stable/application_monitoring.yaml",
Target::Windows => "C:\\ProgramData\\Datadog\\managed\\datadog-agent\\stable\\application_monitoring.yaml",
}
#[cfg(windows)]
{
"C:\\ProgramData\\Datadog\\application_monitoring.yaml"
}

pub const fn fleet_stable_configuration_path(target: Target) -> &'static str {
match target {
Target::Linux => "/etc/datadog-agent/application_monitoring.yaml",
Target::Macos => "/opt/datadog-agent/etc/application_monitoring.yaml",
Target::Windows => "C:\\ProgramData\\Datadog\\application_monitoring.yaml",
}
};
}

pub fn new(debug_logs: bool) -> Self {
Self { debug_logs }
Expand Down Expand Up @@ -730,7 +748,7 @@ mod tests {
test_config(
b"
apm_configuration_default:
DD_TRACE_APM_ENABLED: true
DD_APM_TRACING_ENABLED: true
DD_RUNTIME_METRICS_ENABLED: true
DD_LOGS_INJECTION: true
DD_PROFILING_ENABLED: true
Expand All @@ -744,7 +762,7 @@ apm_configuration_default:
b"",
vec![
LibraryConfig {
name: DdTraceApmEnabled,
name: DdApmTracingEnabled,
value: "true".to_owned(),
source: LocalStableConfig,
config_id: None,
Expand Down Expand Up @@ -816,7 +834,7 @@ apm_configuration_default:
b"
config_id: abc
apm_configuration_default:
DD_TRACE_APM_ENABLED: true
DD_APM_TRACING_ENABLED: true
DD_RUNTIME_METRICS_ENABLED: true
DD_LOGS_INJECTION: true
DD_PROFILING_ENABLED: true
Expand All @@ -829,7 +847,7 @@ apm_configuration_default:
",
vec![
LibraryConfig {
name: DdTraceApmEnabled,
name: DdApmTracingEnabled,
value: "true".to_owned(),
source: FleetStableConfig,
config_id: Some("abc".to_owned()),
Expand Down Expand Up @@ -900,20 +918,20 @@ apm_configuration_default:
test_config(
b"
apm_configuration_default:
DD_TRACE_APM_ENABLED: true
DD_APM_TRACING_ENABLED: true
DD_RUNTIME_METRICS_ENABLED: true
DD_PROFILING_ENABLED: true
",
b"
config_id: abc
apm_configuration_default:
DD_TRACE_APM_ENABLED: true
DD_APM_TRACING_ENABLED: true
DD_LOGS_INJECTION: true
DD_PROFILING_ENABLED: false
",
vec![
LibraryConfig {
name: DdTraceApmEnabled,
name: DdApmTracingEnabled,
value: "true".to_owned(),
source: FleetStableConfig,
config_id: Some("abc".to_owned()),
Expand Down
Loading