diff --git a/Makefile b/Makefile index ee306a66..18619742 100644 --- a/Makefile +++ b/Makefile @@ -199,7 +199,7 @@ ifeq ($(shell test -n "$(DD_API_KEY)" || echo not-found), not-found) endif @echo "[*] Running ADP..." @DD_DOGSTATSD_PORT=9191 DD_DOGSTATSD_SOCKET=/tmp/adp-dogstatsd-dgram.sock DD_DOGSTATSD_STREAM_SOCKET=/tmp/adp-dogstatsd-stream.sock \ - DD_TELEMETRY_ENABLED=true DD_PROMETHEUS_LISTEN_ADDR=tcp://127.0.0.1:5101 \ + DD_TELEMETRY_ENABLED=true DD_PROMETHEUS_LISTEN_ADDR=tcp://127.0.0.1:5102 \ DD_AUTH_TOKEN_FILE_PATH=/etc/datadog-agent/auth_token \ target/debug/agent-data-plane @@ -214,7 +214,7 @@ ifeq ($(shell test -n "$(DD_API_KEY)" || echo not-found), not-found) endif @echo "[*] Running ADP..." @DD_DOGSTATSD_PORT=9191 DD_DOGSTATSD_SOCKET=/tmp/adp-dogstatsd-dgram.sock DD_DOGSTATSD_STREAM_SOCKET=/tmp/adp-dogstatsd-stream.sock \ - DD_TELEMETRY_ENABLED=true DD_PROMETHEUS_LISTEN_ADDR=tcp://127.0.0.1:5101 \ + DD_TELEMETRY_ENABLED=true DD_PROMETHEUS_LISTEN_ADDR=tcp://127.0.0.1:5102 \ DD_AUTH_TOKEN_FILE_PATH=/etc/datadog-agent/auth_token \ target/release/agent-data-plane @@ -225,7 +225,7 @@ run-adp-standalone: ## Runs ADP locally in standalone mode (debug) @DD_ADP_STANDALONE_MODE=true \ DD_API_KEY=api-key-adp-standalone DD_HOSTNAME=adp-standalone \ DD_DOGSTATSD_PORT=9191 DD_DOGSTATSD_SOCKET=/tmp/adp-dogstatsd-dgram.sock DD_DOGSTATSD_STREAM_SOCKET=/tmp/adp-dogstatsd-stream.sock \ - DD_TELEMETRY_ENABLED=true DD_PROMETHEUS_LISTEN_ADDR=tcp://127.0.0.1:5101 \ + DD_TELEMETRY_ENABLED=true DD_PROMETHEUS_LISTEN_ADDR=tcp://127.0.0.1:5102 \ target/debug/agent-data-plane .PHONY: run-adp-standalone-release @@ -235,7 +235,7 @@ run-adp-standalone-release: ## Runs ADP locally in standalone mode (release) @DD_ADP_STANDALONE_MODE=true \ DD_API_KEY=api-key-adp-standalone DD_HOSTNAME=adp-standalone \ DD_DOGSTATSD_PORT=9191 DD_DOGSTATSD_SOCKET=/tmp/adp-dogstatsd-dgram.sock DD_DOGSTATSD_STREAM_SOCKET=/tmp/adp-dogstatsd-stream.sock \ - DD_TELEMETRY_ENABLED=true DD_PROMETHEUS_LISTEN_ADDR=tcp://127.0.0.1:5101 \ + DD_TELEMETRY_ENABLED=true DD_PROMETHEUS_LISTEN_ADDR=tcp://127.0.0.1:5102 \ target/release/agent-data-plane .PHONY: run-dsd-basic-udp @@ -456,7 +456,7 @@ endif @DD_API_KEY=api-key-adp-profiling DD_HOSTNAME=adp-profiling DD_DD_URL=http://127.0.0.1:9095 \ DD_ADP_STANDALONE_MODE=true \ DD_DOGSTATSD_PORT=9191 DD_DOGSTATSD_SOCKET=/tmp/adp-dogstatsd-dgram.sock DD_DOGSTATSD_STREAM_SOCKET=/tmp/adp-dogstatsd-stream.sock \ - DD_TELEMETRY_ENABLED=true DD_PROMETHEUS_LISTEN_ADDR=tcp://127.0.0.1:5101 \ + DD_TELEMETRY_ENABLED=true DD_PROMETHEUS_LISTEN_ADDR=tcp://127.0.0.1:5102 \ ./test/ddprof/bin/ddprof --service adp --environment local --service-version $(GIT_COMMIT) \ --url unix:///var/run/datadog/apm.socket \ --inlined-functions true --timeline --upload-period 10 --preset cpu_live_heap \ diff --git a/bin/agent-data-plane/src/main.rs b/bin/agent-data-plane/src/main.rs index 3db2cabd..a6358eff 100644 --- a/bin/agent-data-plane/src/main.rs +++ b/bin/agent-data-plane/src/main.rs @@ -111,19 +111,17 @@ async fn run(started: Instant, logging_api_handler: LoggingAPIHandler) -> Result // and a Datadog Metrics destination that forwards aggregated buckets to the Datadog Platform. let blueprint = create_topology(&configuration, env_provider, &component_registry).await?; - // Build our administrative API server. - let primary_api_listen_address = configuration - .try_get_typed("api_listen_address") - .error_context("Failed to get API listen address.")? - .unwrap_or_else(|| ListenAddress::Tcp(([0, 0, 0, 0], 5100).into())); - - let remote_agent_service = new_remote_agent_service()?; - - let primary_api = APIBuilder::new() + // Build our unprivileged and privileged API server. + // + // The unprivileged API is purely for things like health checks or read-only information. The privileged API is + // meant for sensitive information or actions that require elevated permissions. + let unprivileged_api = APIBuilder::new() .with_handler(health_registry.api_handler()) - .with_handler(component_registry.api_handler()) - .with_grpc_service(remote_agent_service) + .with_handler(component_registry.api_handler()); + + let privileged_api = APIBuilder::new() .with_self_signed_tls() + .with_grpc_service(new_remote_agent_service()) .with_handler(logging_api_handler); // Run memory bounds validation to ensure that we can launch the topology with our configured memory limit, if any. @@ -137,12 +135,9 @@ async fn run(started: Instant, logging_api_handler: LoggingAPIHandler) -> Result // Spawn the health checker. health_registry.spawn().await?; - // Run the API server now that we've been able to launch the topology. - // - // TODO: Use something better than `pending()`... perhaps something like a more generalized - // `ComponentShutdownCoordinator` that allows for triggering and waiting for all attached tasks to signal that - // they've shutdown. - primary_api.serve(primary_api_listen_address, pending()).await?; + // Spawn both of our API servers. + spawn_unprivileged_api(&configuration, unprivileged_api).await?; + spawn_privileged_api(&configuration, privileged_api).await?; let startup_time = started.elapsed(); @@ -249,6 +244,11 @@ async fn create_topology( // When internal telemetry is enabled, expose a Prometheus scrape endpoint that the Datadog Agent will pull from. if telemetry_enabled { let prometheus_config = PrometheusConfiguration::from_configuration(configuration)?; + info!( + "Serving telemetry scrape endpoint on {}.", + prometheus_config.listen_address() + ); + blueprint .add_destination("internal_metrics_out", prometheus_config)? .connect_component("internal_metrics_out", ["internal_metrics_remap"])?; @@ -256,3 +256,47 @@ async fn create_topology( Ok(blueprint) } + +async fn spawn_unprivileged_api( + configuration: &GenericConfiguration, api_builder: APIBuilder, +) -> Result<(), GenericError> { + let api_listen_address = configuration + .try_get_typed("api_listen_address") + .error_context("Failed to get API listen address.")? + .unwrap_or_else(|| ListenAddress::Tcp(([0, 0, 0, 0], 5100).into())); + + // TODO: Use something better than `pending()`... perhaps something like a more generalized + // `ComponentShutdownCoordinator` that allows for triggering and waiting for all attached tasks to signal that + // they've shutdown. + tokio::spawn(async move { + info!("Serving unprivileged API on {}.", api_listen_address); + + if let Err(e) = api_builder.serve(api_listen_address, pending()).await { + error!("Failed to serve unprivileged API: {}", e); + } + }); + + Ok(()) +} + +async fn spawn_privileged_api( + configuration: &GenericConfiguration, api_builder: APIBuilder, +) -> Result<(), GenericError> { + let api_listen_address = configuration + .try_get_typed("secure_api_listen_address") + .error_context("Failed to get secure API listen address.")? + .unwrap_or_else(|| ListenAddress::Tcp(([0, 0, 0, 0], 5101).into())); + + // TODO: Use something better than `pending()`... perhaps something like a more generalized + // `ComponentShutdownCoordinator` that allows for triggering and waiting for all attached tasks to signal that + // they've shutdown. + tokio::spawn(async move { + info!("Serving privileged API on {}.", api_listen_address); + + if let Err(e) = api_builder.serve(api_listen_address, pending()).await { + error!("Failed to serve privileged API: {}", e); + } + }); + + Ok(()) +} diff --git a/bin/correctness/ground-truth/src/runner.rs b/bin/correctness/ground-truth/src/runner.rs index 4a217aa7..24aa5e70 100644 --- a/bin/correctness/ground-truth/src/runner.rs +++ b/bin/correctness/ground-truth/src/runner.rs @@ -89,7 +89,7 @@ impl TestRunner { .with_env_var("DD_API_KEY", "dummy-api-key-correctness-testing") .with_env_var("DD_ADP_STANDALONE_MODE", "true") .with_env_var("DD_TELEMETRY_ENABLED", "true") - .with_env_var("DD_PROMETHEUS_LISTEN_ADDR", "tcp://0.0.0.0:5101") + .with_env_var("DD_PROMETHEUS_LISTEN_ADDR", "tcp://0.0.0.0:5102") .with_exposed_port("tcp", 6000); group_runner diff --git a/lib/saluki-app/src/api.rs b/lib/saluki-app/src/api.rs index 31fce1e9..83dd6cbd 100644 --- a/lib/saluki-app/src/api.rs +++ b/lib/saluki-app/src/api.rs @@ -18,7 +18,6 @@ use saluki_io::net::{ use tokio::select; use tonic::{body::BoxBody, server::NamedService, service::RoutesBuilder}; use tower::Service; -use tracing::error; /// An API builder. /// @@ -140,14 +139,12 @@ impl APIBuilder { // Wait for our shutdown signal, which we'll forward to the listener to stop accepting new connections... or // capture any errors thrown by the listener itself. - tokio::spawn(async move { - select! { - _ = shutdown => shutdown_handle.shutdown(), - maybe_err = error_handle => if let Some(err) = maybe_err { - error!(error = ?err, "Failed to serve API connection."); - }, - } - }); + select! { + _ = shutdown => shutdown_handle.shutdown(), + maybe_err = error_handle => if let Some(e) = maybe_err { + return Err(GenericError::from(e)) + }, + } Ok(()) } diff --git a/lib/saluki-components/src/destinations/datadog/status_flare/mod.rs b/lib/saluki-components/src/destinations/datadog/status_flare/mod.rs index 1c566d33..ce76c101 100644 --- a/lib/saluki-components/src/destinations/datadog/status_flare/mod.rs +++ b/lib/saluki-components/src/destinations/datadog/status_flare/mod.rs @@ -23,18 +23,18 @@ use tokio::time::{interval, MissedTickBehavior}; use tracing::debug; use uuid::Uuid; -const DEFAULT_API_LISTEN_PORT: NonZeroUsize = unsafe { NonZeroUsize::new_unchecked(5100) }; +// TODO: This should really come from the binary itself, since we don't actually control the server where our +// `RemoteAgent` gRPC service is exposed from... but it would be very clunky to pass that around so we're just aligning +// the default port here _for now_. +const DEFAULT_API_LISTEN_PORT: NonZeroUsize = unsafe { NonZeroUsize::new_unchecked(5101) }; /// Datadog Status and Flare Destination /// /// Registers ADP as a remote agent to the Core Agent. pub struct DatadogStatusFlareConfiguration { id: String, - display_name: String, - api_listen_port: NonZeroUsize, - client: RemoteAgentClient, } @@ -88,11 +88,8 @@ impl MemoryBounds for DatadogStatusFlareConfiguration { pub struct DatadogStatusFlare { id: String, - display_name: String, - api_listen_port: NonZeroUsize, - client: RemoteAgentClient, } @@ -132,7 +129,8 @@ impl Destination for DatadogStatusFlare { // Time to (re)register with the Core Agent. // - // TODO: Consider spawning the registration as a task so that the component can keep polling and not slow down the accepting of events and responding of health checks. + // TODO: Consider spawning the registration as a task so that the component can keep polling and not + // slow down the accepting of events and responding of health checks. _ = register_agent.tick() => { match client.register_remote_agent_request(&id, &display_name, &api_endpoint, &auth_token).await { Ok(resp) => { @@ -183,7 +181,7 @@ impl RemoteAgent for RemoteAgentImpl { } /// Create the RemoteAgent service. -pub fn new_remote_agent_service() -> Result, GenericError> { +pub fn new_remote_agent_service() -> RemoteAgentServer { let remote_agent = RemoteAgentImpl { started: Utc::now() }; - Ok(RemoteAgentServer::new(remote_agent)) + RemoteAgentServer::new(remote_agent) } diff --git a/lib/saluki-components/src/destinations/prometheus/mod.rs b/lib/saluki-components/src/destinations/prometheus/mod.rs index 818ad061..30e5ceec 100644 --- a/lib/saluki-components/src/destinations/prometheus/mod.rs +++ b/lib/saluki-components/src/destinations/prometheus/mod.rs @@ -61,6 +61,11 @@ impl PrometheusConfiguration { pub fn from_configuration(config: &GenericConfiguration) -> Result { Ok(config.as_typed()?) } + + /// Returns the listen address for the Prometheus scrape endpoint. + pub fn listen_address(&self) -> &ListenAddress { + &self.listen_addr + } } #[async_trait] diff --git a/test/smp/regression/saluki/cases/dsd_uds_100mb_250k_contexts/experiment.yaml b/test/smp/regression/saluki/cases/dsd_uds_100mb_250k_contexts/experiment.yaml index 471c079c..48b5b759 100644 --- a/test/smp/regression/saluki/cases/dsd_uds_100mb_250k_contexts/experiment.yaml +++ b/test/smp/regression/saluki/cases/dsd_uds_100mb_250k_contexts/experiment.yaml @@ -26,7 +26,7 @@ target: # Enable internal telemetry endpoint. DD_TELEMETRY_ENABLED: "true" - DD_PROMETHEUS_LISTEN_ADDR: tcp://127.0.0.1:5101 + DD_PROMETHEUS_LISTEN_ADDR: tcp://127.0.0.1:5102 # Test out using allowing up to two concurrent requests when forwarding. DD_FORWARDER_NUM_WORKERS: "2" diff --git a/test/smp/regression/saluki/cases/dsd_uds_100mb_250k_contexts/lading/lading.yaml b/test/smp/regression/saluki/cases/dsd_uds_100mb_250k_contexts/lading/lading.yaml index cd4175de..8912bdf3 100644 --- a/test/smp/regression/saluki/cases/dsd_uds_100mb_250k_contexts/lading/lading.yaml +++ b/test/smp/regression/saluki/cases/dsd_uds_100mb_250k_contexts/lading/lading.yaml @@ -48,4 +48,4 @@ blackhole: target_metrics: - prometheus: - uri: "http://127.0.0.1:5101/scrape" + uri: "http://127.0.0.1:5102/scrape" diff --git a/test/smp/regression/saluki/cases/dsd_uds_100mb_3k_contexts/experiment.yaml b/test/smp/regression/saluki/cases/dsd_uds_100mb_3k_contexts/experiment.yaml index 0ed9d44b..137c8899 100644 --- a/test/smp/regression/saluki/cases/dsd_uds_100mb_3k_contexts/experiment.yaml +++ b/test/smp/regression/saluki/cases/dsd_uds_100mb_3k_contexts/experiment.yaml @@ -23,4 +23,4 @@ target: # Enable internal telemetry endpoint. DD_TELEMETRY_ENABLED: "true" - DD_PROMETHEUS_LISTEN_ADDR: tcp://127.0.0.1:5101 + DD_PROMETHEUS_LISTEN_ADDR: tcp://127.0.0.1:5102 diff --git a/test/smp/regression/saluki/cases/dsd_uds_100mb_3k_contexts/lading/lading.yaml b/test/smp/regression/saluki/cases/dsd_uds_100mb_3k_contexts/lading/lading.yaml index d469b2c8..f0954331 100644 --- a/test/smp/regression/saluki/cases/dsd_uds_100mb_3k_contexts/lading/lading.yaml +++ b/test/smp/regression/saluki/cases/dsd_uds_100mb_3k_contexts/lading/lading.yaml @@ -48,4 +48,4 @@ blackhole: target_metrics: - prometheus: - uri: "http://127.0.0.1:5101/scrape" + uri: "http://127.0.0.1:5102/scrape" diff --git a/test/smp/regression/saluki/cases/dsd_uds_100mb_3k_contexts_distributions_only/experiment.yaml b/test/smp/regression/saluki/cases/dsd_uds_100mb_3k_contexts_distributions_only/experiment.yaml index e0d05bb4..fa5a90fe 100644 --- a/test/smp/regression/saluki/cases/dsd_uds_100mb_3k_contexts_distributions_only/experiment.yaml +++ b/test/smp/regression/saluki/cases/dsd_uds_100mb_3k_contexts_distributions_only/experiment.yaml @@ -23,4 +23,4 @@ target: # Enable internal telemetry endpoint. DD_TELEMETRY_ENABLED: "true" - DD_PROMETHEUS_LISTEN_ADDR: tcp://127.0.0.1:5101 + DD_PROMETHEUS_LISTEN_ADDR: tcp://127.0.0.1:5102 diff --git a/test/smp/regression/saluki/cases/dsd_uds_100mb_3k_contexts_distributions_only/lading/lading.yaml b/test/smp/regression/saluki/cases/dsd_uds_100mb_3k_contexts_distributions_only/lading/lading.yaml index 1766652f..3737b94e 100644 --- a/test/smp/regression/saluki/cases/dsd_uds_100mb_3k_contexts_distributions_only/lading/lading.yaml +++ b/test/smp/regression/saluki/cases/dsd_uds_100mb_3k_contexts_distributions_only/lading/lading.yaml @@ -47,4 +47,4 @@ blackhole: target_metrics: - prometheus: - uri: "http://127.0.0.1:5101/scrape" + uri: "http://127.0.0.1:5102/scrape" diff --git a/test/smp/regression/saluki/cases/dsd_uds_10mb_3k_contexts/experiment.yaml b/test/smp/regression/saluki/cases/dsd_uds_10mb_3k_contexts/experiment.yaml index 0ed9d44b..137c8899 100644 --- a/test/smp/regression/saluki/cases/dsd_uds_10mb_3k_contexts/experiment.yaml +++ b/test/smp/regression/saluki/cases/dsd_uds_10mb_3k_contexts/experiment.yaml @@ -23,4 +23,4 @@ target: # Enable internal telemetry endpoint. DD_TELEMETRY_ENABLED: "true" - DD_PROMETHEUS_LISTEN_ADDR: tcp://127.0.0.1:5101 + DD_PROMETHEUS_LISTEN_ADDR: tcp://127.0.0.1:5102 diff --git a/test/smp/regression/saluki/cases/dsd_uds_10mb_3k_contexts/lading/lading.yaml b/test/smp/regression/saluki/cases/dsd_uds_10mb_3k_contexts/lading/lading.yaml index eea4a072..c6e4cc44 100644 --- a/test/smp/regression/saluki/cases/dsd_uds_10mb_3k_contexts/lading/lading.yaml +++ b/test/smp/regression/saluki/cases/dsd_uds_10mb_3k_contexts/lading/lading.yaml @@ -48,4 +48,4 @@ blackhole: target_metrics: - prometheus: - uri: "http://127.0.0.1:5101/scrape" + uri: "http://127.0.0.1:5102/scrape" diff --git a/test/smp/regression/saluki/cases/dsd_uds_1mb_3k_contexts/experiment.yaml b/test/smp/regression/saluki/cases/dsd_uds_1mb_3k_contexts/experiment.yaml index 0ed9d44b..137c8899 100644 --- a/test/smp/regression/saluki/cases/dsd_uds_1mb_3k_contexts/experiment.yaml +++ b/test/smp/regression/saluki/cases/dsd_uds_1mb_3k_contexts/experiment.yaml @@ -23,4 +23,4 @@ target: # Enable internal telemetry endpoint. DD_TELEMETRY_ENABLED: "true" - DD_PROMETHEUS_LISTEN_ADDR: tcp://127.0.0.1:5101 + DD_PROMETHEUS_LISTEN_ADDR: tcp://127.0.0.1:5102 diff --git a/test/smp/regression/saluki/cases/dsd_uds_1mb_3k_contexts/lading/lading.yaml b/test/smp/regression/saluki/cases/dsd_uds_1mb_3k_contexts/lading/lading.yaml index b19afc1a..dbb66389 100644 --- a/test/smp/regression/saluki/cases/dsd_uds_1mb_3k_contexts/lading/lading.yaml +++ b/test/smp/regression/saluki/cases/dsd_uds_1mb_3k_contexts/lading/lading.yaml @@ -48,4 +48,4 @@ blackhole: target_metrics: - prometheus: - uri: "http://127.0.0.1:5101/scrape" + uri: "http://127.0.0.1:5102/scrape" diff --git a/test/smp/regression/saluki/cases/dsd_uds_1mb_3k_contexts_dualship/experiment.yaml b/test/smp/regression/saluki/cases/dsd_uds_1mb_3k_contexts_dualship/experiment.yaml index 405b920a..70cdc0d6 100644 --- a/test/smp/regression/saluki/cases/dsd_uds_1mb_3k_contexts_dualship/experiment.yaml +++ b/test/smp/regression/saluki/cases/dsd_uds_1mb_3k_contexts_dualship/experiment.yaml @@ -26,4 +26,4 @@ target: # Enable internal telemetry endpoint. DD_TELEMETRY_ENABLED: "true" - DD_PROMETHEUS_LISTEN_ADDR: tcp://127.0.0.1:5101 + DD_PROMETHEUS_LISTEN_ADDR: tcp://127.0.0.1:5102 diff --git a/test/smp/regression/saluki/cases/dsd_uds_1mb_3k_contexts_dualship/lading/lading.yaml b/test/smp/regression/saluki/cases/dsd_uds_1mb_3k_contexts_dualship/lading/lading.yaml index 912d2544..a149f753 100644 --- a/test/smp/regression/saluki/cases/dsd_uds_1mb_3k_contexts_dualship/lading/lading.yaml +++ b/test/smp/regression/saluki/cases/dsd_uds_1mb_3k_contexts_dualship/lading/lading.yaml @@ -50,4 +50,4 @@ blackhole: target_metrics: - prometheus: - uri: "http://127.0.0.1:5101/scrape" + uri: "http://127.0.0.1:5102/scrape" diff --git a/test/smp/regression/saluki/cases/dsd_uds_1mb_50k_contexts/experiment.yaml b/test/smp/regression/saluki/cases/dsd_uds_1mb_50k_contexts/experiment.yaml index e7b38c49..ab772e47 100644 --- a/test/smp/regression/saluki/cases/dsd_uds_1mb_50k_contexts/experiment.yaml +++ b/test/smp/regression/saluki/cases/dsd_uds_1mb_50k_contexts/experiment.yaml @@ -23,4 +23,4 @@ target: # Enable internal telemetry endpoint. DD_TELEMETRY_ENABLED: "true" - DD_PROMETHEUS_LISTEN_ADDR: tcp://127.0.0.1:5101 + DD_PROMETHEUS_LISTEN_ADDR: tcp://127.0.0.1:5102 diff --git a/test/smp/regression/saluki/cases/dsd_uds_1mb_50k_contexts/lading/lading.yaml b/test/smp/regression/saluki/cases/dsd_uds_1mb_50k_contexts/lading/lading.yaml index f41b8260..02cafac3 100644 --- a/test/smp/regression/saluki/cases/dsd_uds_1mb_50k_contexts/lading/lading.yaml +++ b/test/smp/regression/saluki/cases/dsd_uds_1mb_50k_contexts/lading/lading.yaml @@ -47,4 +47,4 @@ blackhole: target_metrics: - prometheus: - uri: "http://127.0.0.1:5101/scrape" + uri: "http://127.0.0.1:5102/scrape" diff --git a/test/smp/regression/saluki/cases/dsd_uds_1mb_50k_contexts_memlimit/experiment.yaml b/test/smp/regression/saluki/cases/dsd_uds_1mb_50k_contexts_memlimit/experiment.yaml index b6d58211..7888a104 100644 --- a/test/smp/regression/saluki/cases/dsd_uds_1mb_50k_contexts_memlimit/experiment.yaml +++ b/test/smp/regression/saluki/cases/dsd_uds_1mb_50k_contexts_memlimit/experiment.yaml @@ -32,4 +32,4 @@ target: # Enable internal telemetry endpoint. DD_TELEMETRY_ENABLED: "true" - DD_PROMETHEUS_LISTEN_ADDR: tcp://127.0.0.1:5101 + DD_PROMETHEUS_LISTEN_ADDR: tcp://127.0.0.1:5102 diff --git a/test/smp/regression/saluki/cases/dsd_uds_1mb_50k_contexts_memlimit/lading/lading.yaml b/test/smp/regression/saluki/cases/dsd_uds_1mb_50k_contexts_memlimit/lading/lading.yaml index f41b8260..02cafac3 100644 --- a/test/smp/regression/saluki/cases/dsd_uds_1mb_50k_contexts_memlimit/lading/lading.yaml +++ b/test/smp/regression/saluki/cases/dsd_uds_1mb_50k_contexts_memlimit/lading/lading.yaml @@ -47,4 +47,4 @@ blackhole: target_metrics: - prometheus: - uri: "http://127.0.0.1:5101/scrape" + uri: "http://127.0.0.1:5102/scrape" diff --git a/test/smp/regression/saluki/cases/dsd_uds_40mb_12k_contexts_40_senders/experiment.yaml b/test/smp/regression/saluki/cases/dsd_uds_40mb_12k_contexts_40_senders/experiment.yaml index db40dba2..70d91d9f 100644 --- a/test/smp/regression/saluki/cases/dsd_uds_40mb_12k_contexts_40_senders/experiment.yaml +++ b/test/smp/regression/saluki/cases/dsd_uds_40mb_12k_contexts_40_senders/experiment.yaml @@ -23,4 +23,4 @@ target: # Enable internal telemetry endpoint. DD_TELEMETRY_ENABLED: "true" - DD_PROMETHEUS_LISTEN_ADDR: tcp://127.0.0.1:5101 + DD_PROMETHEUS_LISTEN_ADDR: tcp://127.0.0.1:5102 diff --git a/test/smp/regression/saluki/cases/dsd_uds_40mb_12k_contexts_40_senders/lading/lading.yaml b/test/smp/regression/saluki/cases/dsd_uds_40mb_12k_contexts_40_senders/lading/lading.yaml index dd0d93c6..88ed546e 100644 --- a/test/smp/regression/saluki/cases/dsd_uds_40mb_12k_contexts_40_senders/lading/lading.yaml +++ b/test/smp/regression/saluki/cases/dsd_uds_40mb_12k_contexts_40_senders/lading/lading.yaml @@ -1766,4 +1766,4 @@ blackhole: target_metrics: - prometheus: - uri: "http://127.0.0.1:5101/scrape" + uri: "http://127.0.0.1:5102/scrape" diff --git a/test/smp/regression/saluki/cases/dsd_uds_500mb_3k_contexts/experiment.yaml b/test/smp/regression/saluki/cases/dsd_uds_500mb_3k_contexts/experiment.yaml index 0ed9d44b..137c8899 100644 --- a/test/smp/regression/saluki/cases/dsd_uds_500mb_3k_contexts/experiment.yaml +++ b/test/smp/regression/saluki/cases/dsd_uds_500mb_3k_contexts/experiment.yaml @@ -23,4 +23,4 @@ target: # Enable internal telemetry endpoint. DD_TELEMETRY_ENABLED: "true" - DD_PROMETHEUS_LISTEN_ADDR: tcp://127.0.0.1:5101 + DD_PROMETHEUS_LISTEN_ADDR: tcp://127.0.0.1:5102 diff --git a/test/smp/regression/saluki/cases/dsd_uds_500mb_3k_contexts/lading/lading.yaml b/test/smp/regression/saluki/cases/dsd_uds_500mb_3k_contexts/lading/lading.yaml index 61b75a60..76836adb 100644 --- a/test/smp/regression/saluki/cases/dsd_uds_500mb_3k_contexts/lading/lading.yaml +++ b/test/smp/regression/saluki/cases/dsd_uds_500mb_3k_contexts/lading/lading.yaml @@ -48,4 +48,4 @@ blackhole: target_metrics: - prometheus: - uri: "http://127.0.0.1:5101/scrape" + uri: "http://127.0.0.1:5102/scrape" diff --git a/test/smp/regression/saluki/cases/dsd_uds_50mb_10k_contexts_no_inlining/experiment.yaml b/test/smp/regression/saluki/cases/dsd_uds_50mb_10k_contexts_no_inlining/experiment.yaml index a76242bc..278fe77c 100644 --- a/test/smp/regression/saluki/cases/dsd_uds_50mb_10k_contexts_no_inlining/experiment.yaml +++ b/test/smp/regression/saluki/cases/dsd_uds_50mb_10k_contexts_no_inlining/experiment.yaml @@ -37,4 +37,4 @@ target: # Enable internal telemetry endpoint. DD_TELEMETRY_ENABLED: "true" - DD_PROMETHEUS_LISTEN_ADDR: tcp://127.0.0.1:5101 + DD_PROMETHEUS_LISTEN_ADDR: tcp://127.0.0.1:5102 diff --git a/test/smp/regression/saluki/cases/dsd_uds_50mb_10k_contexts_no_inlining/lading/lading.yaml b/test/smp/regression/saluki/cases/dsd_uds_50mb_10k_contexts_no_inlining/lading/lading.yaml index 75c8b6ec..f5b4203f 100644 --- a/test/smp/regression/saluki/cases/dsd_uds_50mb_10k_contexts_no_inlining/lading/lading.yaml +++ b/test/smp/regression/saluki/cases/dsd_uds_50mb_10k_contexts_no_inlining/lading/lading.yaml @@ -47,4 +47,4 @@ blackhole: target_metrics: - prometheus: - uri: "http://127.0.0.1:5101/scrape" + uri: "http://127.0.0.1:5102/scrape" diff --git a/test/smp/regression/saluki/cases/dsd_uds_50mb_10k_contexts_no_inlining_no_allocs/experiment.yaml b/test/smp/regression/saluki/cases/dsd_uds_50mb_10k_contexts_no_inlining_no_allocs/experiment.yaml index 35b0ecd4..3afcfb07 100644 --- a/test/smp/regression/saluki/cases/dsd_uds_50mb_10k_contexts_no_inlining_no_allocs/experiment.yaml +++ b/test/smp/regression/saluki/cases/dsd_uds_50mb_10k_contexts_no_inlining_no_allocs/experiment.yaml @@ -38,4 +38,4 @@ target: # Enable internal telemetry endpoint. DD_TELEMETRY_ENABLED: "true" - DD_PROMETHEUS_LISTEN_ADDR: tcp://127.0.0.1:5101 + DD_PROMETHEUS_LISTEN_ADDR: tcp://127.0.0.1:5102 diff --git a/test/smp/regression/saluki/cases/dsd_uds_50mb_10k_contexts_no_inlining_no_allocs/lading/lading.yaml b/test/smp/regression/saluki/cases/dsd_uds_50mb_10k_contexts_no_inlining_no_allocs/lading/lading.yaml index 75c8b6ec..f5b4203f 100644 --- a/test/smp/regression/saluki/cases/dsd_uds_50mb_10k_contexts_no_inlining_no_allocs/lading/lading.yaml +++ b/test/smp/regression/saluki/cases/dsd_uds_50mb_10k_contexts_no_inlining_no_allocs/lading/lading.yaml @@ -47,4 +47,4 @@ blackhole: target_metrics: - prometheus: - uri: "http://127.0.0.1:5101/scrape" + uri: "http://127.0.0.1:5102/scrape" diff --git a/test/smp/regression/saluki/cases/dsd_uds_512kb_3k_contexts/experiment.yaml b/test/smp/regression/saluki/cases/dsd_uds_512kb_3k_contexts/experiment.yaml index 0ed9d44b..137c8899 100644 --- a/test/smp/regression/saluki/cases/dsd_uds_512kb_3k_contexts/experiment.yaml +++ b/test/smp/regression/saluki/cases/dsd_uds_512kb_3k_contexts/experiment.yaml @@ -23,4 +23,4 @@ target: # Enable internal telemetry endpoint. DD_TELEMETRY_ENABLED: "true" - DD_PROMETHEUS_LISTEN_ADDR: tcp://127.0.0.1:5101 + DD_PROMETHEUS_LISTEN_ADDR: tcp://127.0.0.1:5102 diff --git a/test/smp/regression/saluki/cases/dsd_uds_512kb_3k_contexts/lading/lading.yaml b/test/smp/regression/saluki/cases/dsd_uds_512kb_3k_contexts/lading/lading.yaml index bae9c2bf..d8d3ca36 100644 --- a/test/smp/regression/saluki/cases/dsd_uds_512kb_3k_contexts/lading/lading.yaml +++ b/test/smp/regression/saluki/cases/dsd_uds_512kb_3k_contexts/lading/lading.yaml @@ -48,4 +48,4 @@ blackhole: target_metrics: - prometheus: - uri: "http://127.0.0.1:5101/scrape" + uri: "http://127.0.0.1:5102/scrape" diff --git a/test/smp/regression/saluki/cases/quality_gates_idle_rss/experiment.yaml b/test/smp/regression/saluki/cases/quality_gates_idle_rss/experiment.yaml index fbef744d..fdf017d8 100644 --- a/test/smp/regression/saluki/cases/quality_gates_idle_rss/experiment.yaml +++ b/test/smp/regression/saluki/cases/quality_gates_idle_rss/experiment.yaml @@ -23,7 +23,7 @@ target: # Enable internal telemetry endpoint. DD_TELEMETRY_ENABLED: "true" - DD_PROMETHEUS_LISTEN_ADDR: tcp://127.0.0.1:5101 + DD_PROMETHEUS_LISTEN_ADDR: tcp://127.0.0.1:5102 DD_PRINT_JEMALLOC_STATS: "true" diff --git a/test/smp/regression/saluki/cases/quality_gates_idle_rss/lading/lading.yaml b/test/smp/regression/saluki/cases/quality_gates_idle_rss/lading/lading.yaml index 0ee90f12..e55c957f 100644 --- a/test/smp/regression/saluki/cases/quality_gates_idle_rss/lading/lading.yaml +++ b/test/smp/regression/saluki/cases/quality_gates_idle_rss/lading/lading.yaml @@ -6,4 +6,4 @@ blackhole: target_metrics: - prometheus: - uri: "http://127.0.0.1:5101/scrape" + uri: "http://127.0.0.1:5102/scrape"