update compiler

Author: alexgallotta

bottlecap/src/bin/bottlecap/main.rs

@@ -43,12 +43,14 @@ use bottlecap::{
 };
 use datadog_trace_obfuscation::obfuscation_config;
 use decrypt::resolve_secrets;
+use dogstatsd::datadog::{MetricsIntakeUrlPrefix, Site};
+use dogstatsd::flusher::FlusherConfig;
 use dogstatsd::metric::{SortedTags, EMPTY_TAGS};
 use dogstatsd::{
     aggregator::Aggregator as MetricsAggregator,
     constants::CONTEXTS,
     dogstatsd::{DogStatsD, DogStatsDConfig},
-    flusher::{build_fqdn_metrics, Flusher as MetricsFlusher},
+    flusher::Flusher as MetricsFlusher,
 };
 use reqwest::Client;
 use serde::Deserialize;
@@ -284,13 +286,17 @@ async fn extension_loop_active(
         )
         .expect("failed to create aggregator"),
     ));
-    let mut metrics_flusher = MetricsFlusher::new(
-        resolved_api_key.clone(),
-        Arc::clone(&metrics_aggr),
-        build_fqdn_metrics(config.site.clone()),
-        config.https_proxy.clone(),
-        Duration::from_secs(config.flush_timeout),
-    );
+    let mut metrics_flusher = MetricsFlusher::new(FlusherConfig {
+        api_key: resolved_api_key.clone(),
+        aggregator: Arc::clone(&metrics_aggr),
+        metrics_intake_url_prefix: MetricsIntakeUrlPrefix::new(
+            Some(Site::new(config.site.clone()).expect("Failed to parse site")),
+            None,
+        )
+        .expect("Failed to create intake URL prefix"),
+        https_proxy: config.https_proxy.clone(),
+        timeout: Duration::from_secs(config.flush_timeout),
+    });
 
     let trace_flusher = Arc::new(trace_flusher::ServerlessTraceFlusher {
         buffer: Arc::new(TokioMutex::new(Vec::new())),

bottlecap/tests/metrics_integration_test.rs

@@ -1,7 +1,8 @@
 use bottlecap::config::Config;
 use bottlecap::metrics::enhanced::lambda::Lambda as enhanced_metrics;
 use dogstatsd::aggregator::Aggregator as MetricsAggregator;
-use dogstatsd::flusher::Flusher as MetricsFlusher;
+use dogstatsd::datadog::MetricsIntakeUrlPrefix;
+use dogstatsd::flusher::{Flusher as MetricsFlusher, FlusherConfig};
 use dogstatsd::metric::SortedTags;
 use httpmock::prelude::*;
 use std::sync::{Arc, Mutex};
@@ -36,13 +37,14 @@ async fn test_enhanced_metrics() {
         MetricsAggregator::new(SortedTags::parse("aTagKey:aTagValue").unwrap(), 1024)
             .expect("failed to create aggregator"),
     ));
-    let mut metrics_flusher = MetricsFlusher::new(
-        dd_api_key.to_string(),
-        metrics_aggr.clone(),
-        server.base_url(),
-        None,
-        std::time::Duration::from_secs(5),
-    );
+    let mut metrics_flusher = MetricsFlusher::new(FlusherConfig {
+        api_key: dd_api_key.to_string(),
+        aggregator: Arc::clone(&metrics_aggr),
+        metrics_intake_url_prefix: MetricsIntakeUrlPrefix::new(None, None)
+            .expect("failed to create intake url prefix"),
+        https_proxy: None,
+        timeout: std::time::Duration::from_secs(5),
+    });
     let lambda_enhanced_metrics =
         enhanced_metrics::new(Arc::clone(&metrics_aggr), Arc::clone(&arc_config));
 

rust-toolchain.toml

@@ -1,4 +1,4 @@
 [toolchain]
-channel = "1.78.0"
+channel = "1.81.0"
 components = [ "rustfmt", "clippy" ]
 profile = "minimal"