chore(agent-data-plane): include bootstrap base configuration when using configstream from Core Agent (#1020)

Author: tobz

bin/agent-data-plane/src/cli/run.rs

@@ -1,4 +1,7 @@
-use std::time::{Duration, Instant};
+use std::{
+    path::PathBuf,
+    time::{Duration, Instant},
+};
 
 use memory_accounting::{ComponentBounds, ComponentRegistry};
 use saluki_app::{
@@ -32,7 +35,9 @@ use tracing::{error, info, warn};
 use crate::env_provider::ADPEnvironmentProvider;
 use crate::internal::{spawn_control_plane, spawn_internal_observability_topology};
 
-pub async fn run(started: Instant, bootstrap_config: GenericConfiguration) -> Result<(), GenericError> {
+pub async fn run(
+    started: Instant, bootstrap_config_path: PathBuf, bootstrap_config: GenericConfiguration,
+) -> Result<(), GenericError> {
     let app_details = saluki_metadata::get_app_details();
     info!(
         version = app_details.version().raw(),
@@ -58,6 +63,8 @@ pub async fn run(started: Instant, bootstrap_config: GenericConfiguration) -> Re
         // configuration source, but with environment variables on top of that to allow for ADP-specific overriding: log
         // level, etc.
         let dynamic_config = ConfigurationLoader::default()
+            .from_yaml(&bootstrap_config_path)
+            .error_context("Failed to load Datadog Agent configuration file.")?
             .with_dynamic_configuration(config_updates_receiver)
             .from_environment(crate::internal::platform::DATADOG_AGENT_ENV_VAR_PREFIX)?
             .with_default_secrets_resolution()

bin/agent-data-plane/src/main.rs

@@ -44,11 +44,11 @@ async fn main() -> Result<(), GenericError> {
 
     // Load our "bootstrap" configuration -- static configuration on disk or from environment variables -- so we can
     // initialize basic subsystems before executing the given subcommand.
+    let bootstrap_config_path = cli
+        .config_file
+        .unwrap_or_else(|| self::internal::platform::DATADOG_AGENT_CONF_YAML.into());
     let bootstrap_config = ConfigurationLoader::default()
-        .from_yaml(
-            cli.config_file
-                .unwrap_or_else(|| self::internal::platform::DATADOG_AGENT_CONF_YAML.into()),
-        )
+        .from_yaml(&bootstrap_config_path)
         .error_context("Failed to load Datadog Agent configuration file.")?
         .from_environment(self::internal::platform::DATADOG_AGENT_ENV_VAR_PREFIX)
         .error_context("Environment variable prefix should not be empty.")?
@@ -81,7 +81,7 @@ async fn main() -> Result<(), GenericError> {
                 }
             }
 
-            let exit_code = match run(started, bootstrap_config).await {
+            let exit_code = match run(started, bootstrap_config_path, bootstrap_config).await {
                 Ok(()) => {
                     info!("Agent Data Plane stopped.");
                     0