removed labels

Signed-off-by: Caleb Metz <caleb.metz@datadoghq.com>

Author: cmetz100

CHANGELOG.md

@@ -26,9 +26,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - dogstatsd generator can be configured to use metric names, tag names and tag
   values from a configured list. Configured with `metric_names`, `tag_names` and
   `tag_values`.
-- All blackholes now emit a `total_bytes_received` metric with a single
-  `component:blackhole` label, providing an aggregated byte count across all
-  blackhole types and IDs.
+- All blackholes now emit a `total_bytes_received` metric (no labels),
+  providing an aggregated byte count across all blackhole types and IDs.
 ## Fixed
 - Fixed a race condition in `lading_signal` that caused lading to hang on shutdown.
 

lading/src/blackhole/common.rs

@@ -16,12 +16,6 @@ use tokio::{
 };
 use tracing::{debug, error, info, warn};
 
-/// Labels shared by all blackholes to ensure a single aggregated `total_bytes_received` series.
-///
-/// Note: the meaning of "bytes" varies by transport — HTTP-based blackholes report wire bytes,
-/// while gRPC-based blackholes (OTLP gRPC, Datadog Stateful Logs) report protobuf `encoded_len()`.
-pub(super) static COMMON_BLACKHOLE_LABELS: &[(&str, &str)] = &[("component", "blackhole")];
-
 #[derive(thiserror::Error, Debug)]
 pub enum Error {
     /// Wrapper for [`std::io::Error`].

lading/src/blackhole/datadog.rs

@@ -45,7 +45,6 @@ use tokio::net::TcpListener;
 use tracing::{debug, error, info, trace, warn};
 
 use super::General;
-use crate::blackhole::common::COMMON_BLACKHOLE_LABELS;
 use crate::proto::datadog::intake::metrics::MetricPayload;
 
 #[derive(thiserror::Error, Debug)]
@@ -221,7 +220,7 @@ async fn handle_request(
 
     let body_len = whole_body.len() as u64;
     counter!("bytes_received", labels).increment(body_len);
-    counter!("total_bytes_received", COMMON_BLACKHOLE_LABELS).increment(body_len);
+    counter!("total_bytes_received").increment(body_len);
 
     let content_type = headers
         .get(header::CONTENT_TYPE)

lading/src/blackhole/datadog_stateful_logs.rs

@@ -30,7 +30,6 @@ use tonic::{Request, Response, Status, transport};
 use tracing::{error, info};
 
 use super::General;
-use crate::blackhole::common::COMMON_BLACKHOLE_LABELS;
 
 #[derive(thiserror::Error, Debug)]
 /// Errors produced by [`DatadogStatefulLogs`].
@@ -188,7 +187,7 @@ impl StatefulLogsService for StatefulLogsServiceImpl {
                         let size = batch.encoded_len() as u64;
 
                         counter!("bytes_received", &labels).increment(size);
-                        counter!("total_bytes_received", COMMON_BLACKHOLE_LABELS).increment(size);
+                        counter!("total_bytes_received").increment(size);
                         counter!("batches_received", &labels).increment(1);
 
                         // Count data items in the batch

lading/src/blackhole/http.rs

@@ -20,7 +20,7 @@ use std::{net::SocketAddr, time::Duration};
 use tracing::error;
 
 use super::General;
-use crate::blackhole::common::{self, COMMON_BLACKHOLE_LABELS};
+use crate::blackhole::common;
 
 fn default_concurrent_requests_max() -> usize {
     100
@@ -163,7 +163,7 @@ async fn srv(
 
     let body_len = body.len() as u64;
     counter!("bytes_received", &metric_labels).increment(body_len);
-    counter!("total_bytes_received", COMMON_BLACKHOLE_LABELS).increment(body_len);
+    counter!("total_bytes_received").increment(body_len);
 
     let mut labels_with_path = metric_labels.clone();
     labels_with_path.push(("path".to_string(), path));

lading/src/blackhole/otlp/grpc.rs

@@ -1,6 +1,5 @@
 //! gRPC implementation of the OTLP blackhole.
 
-use crate::blackhole::common::COMMON_BLACKHOLE_LABELS;
 use metrics::counter;
 use opentelemetry_proto::tonic::collector::logs::v1::{
     ExportLogsServiceRequest, ExportLogsServiceResponse,
@@ -87,7 +86,7 @@ impl MetricsService for OtlpMetricsService {
         let size = request.encoded_len() as u64;
 
         counter!("bytes_received", &self.labels).increment(size);
-        counter!("total_bytes_received", COMMON_BLACKHOLE_LABELS).increment(size);
+        counter!("total_bytes_received").increment(size);
         counter!("requests_received", &self.labels).increment(1);
 
         let mut total_points: u64 = 0;
@@ -137,7 +136,7 @@ impl TraceService for OtlpTracesService {
         let size = request.encoded_len() as u64;
 
         counter!("bytes_received", &self.labels).increment(size);
-        counter!("total_bytes_received", COMMON_BLACKHOLE_LABELS).increment(size);
+        counter!("total_bytes_received").increment(size);
         counter!("requests_received", &self.labels).increment(1);
 
         let mut total_spans: u64 = 0;
@@ -177,7 +176,7 @@ impl LogsService for OtlpLogsService {
         let size = request.encoded_len() as u64;
 
         counter!("bytes_received", &self.labels).increment(size);
-        counter!("total_bytes_received", COMMON_BLACKHOLE_LABELS).increment(size);
+        counter!("total_bytes_received").increment(size);
         counter!("requests_received", &self.labels).increment(1);
 
         let mut total_logs: u64 = 0;

lading/src/blackhole/otlp/http.rs

@@ -21,7 +21,7 @@ use std::time::Duration;
 use tokio::task::JoinHandle;
 use tracing::{error, info};
 
-use crate::blackhole::common::{self, COMMON_BLACKHOLE_LABELS};
+use crate::blackhole::common;
 
 /// Run the HTTP server for OTLP
 pub(crate) fn run_server(
@@ -197,7 +197,7 @@ impl OtlpHttpHandler {
             && length == 0
         {
             counter!("bytes_received", &self.labels).increment(0);
-            counter!("total_bytes_received", COMMON_BLACKHOLE_LABELS).increment(0);
+            counter!("total_bytes_received").increment(0);
 
             let (response_bytes, content_type) = match (path_ref, response_format) {
                 ("/v1/metrics", ResponseFormat::Json) => (
@@ -239,7 +239,7 @@ impl OtlpHttpHandler {
 
         let body_len = body_bytes.len() as u64;
         counter!("bytes_received", &self.labels).increment(body_len);
-        counter!("total_bytes_received", COMMON_BLACKHOLE_LABELS).increment(body_len);
+        counter!("total_bytes_received").increment(body_len);
 
         let response_bytes =
             match crate::codec::decode(content_encoding.as_ref(), body_bytes.clone()) {

lading/src/blackhole/splunk_hec.rs

@@ -20,7 +20,7 @@ use rustc_hash::FxHashMap;
 use serde::{Deserialize, Serialize};
 
 use super::General;
-use crate::blackhole::common::{self, COMMON_BLACKHOLE_LABELS};
+use crate::blackhole::common;
 
 static ACK_ID: AtomicU64 = AtomicU64::new(0);
 
@@ -105,7 +105,7 @@ async fn srv(
     let bytes = body.boxed().collect().await?.to_bytes();
     let bytes_len = bytes.len() as u64;
     counter!("bytes_received", &*labels).increment(bytes_len);
-    counter!("total_bytes_received", COMMON_BLACKHOLE_LABELS).increment(bytes_len);
+    counter!("total_bytes_received").increment(bytes_len);
 
     match crate::codec::decode(parts.headers.get(hyper::header::CONTENT_ENCODING), bytes) {
         Err(response) => Ok(*response),

lading/src/blackhole/sqs.rs

@@ -17,7 +17,7 @@ use std::{fmt::Write, net::SocketAddr};
 use tracing::{debug, error};
 
 use super::General;
-use crate::blackhole::common::{self, COMMON_BLACKHOLE_LABELS};
+use crate::blackhole::common;
 
 #[derive(thiserror::Error, Debug)]
 /// Errors produced by [`Sqs`]
@@ -238,7 +238,7 @@ async fn srv(
     let bytes = body.boxed().collect().await?.to_bytes();
     let bytes_len = bytes.len() as u64;
     counter!("bytes_received", &metric_labels).increment(bytes_len);
-    counter!("total_bytes_received", COMMON_BLACKHOLE_LABELS).increment(bytes_len);
+    counter!("total_bytes_received").increment(bytes_len);
 
     let action = match serde_qs::from_bytes::<Action>(&bytes) {
         Ok(a) => a,

lading/src/blackhole/tcp.rs

@@ -18,7 +18,6 @@ use tokio_util::io::ReaderStream;
 use tracing::info;
 
 use super::General;
-use crate::blackhole::common::COMMON_BLACKHOLE_LABELS;
 
 #[derive(thiserror::Error, Debug)]
 /// Errors emitted by [`Tcp`]
@@ -89,7 +88,7 @@ impl Tcp {
             if let Ok(msg) = msg {
                 let len = msg.len() as u64;
                 counter!("bytes_received", labels).increment(len);
-                counter!("total_bytes_received", COMMON_BLACKHOLE_LABELS).increment(len);
+                counter!("total_bytes_received").increment(len);
             }
         }
     }