From fdcd881704fbb1e7bea00c681668fe7e7069682b Mon Sep 17 00:00:00 2001 From: "Brian L. Troutwine" Date: Tue, 17 Dec 2024 14:59:39 -0800 Subject: [PATCH] Adjust splunk_hec to distinguish decoded and raw bytes received (#1167) ### What does this PR do? Similar to #1166 this commit adds a `decoded_bytes_received` so that the telemetry from this blackhole matches the others in the project, measuring the raw/wire bytes in `bytes_received`. --- CHANGELOG.md | 5 ++--- lading/src/blackhole/splunk_hec.rs | 3 ++- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 53e6abfb9..e99d5973a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,9 +5,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ## [Unreleased] -## Changed -- The `bytes_received` metric in the HTTP blackhole now tracks wire bytes, the - former metric is preserved with `decoded_bytes_received`. +- The `bytes_received` metric in the HTTP and splunk_hec blackholes now tracks + wire bytes, the former metric is preserved with `decoded_bytes_received`. - Base image is now bookworm, updated from bullseye. ## [0.25.1] diff --git a/lading/src/blackhole/splunk_hec.rs b/lading/src/blackhole/splunk_hec.rs index abee12179..e3f279d3a 100644 --- a/lading/src/blackhole/splunk_hec.rs +++ b/lading/src/blackhole/splunk_hec.rs @@ -96,11 +96,12 @@ async fn srv( let (parts, body) = req.into_parts(); let bytes = body.collect().await?.to_bytes(); + counter!("bytes_received", &*labels).increment(bytes.len() as u64); match crate::codec::decode(parts.headers.get(hyper::header::CONTENT_ENCODING), bytes) { Err(response) => Ok(response), Ok(body) => { - counter!("bytes_received", &*labels).increment(body.len() as u64); + counter!("decoded_bytes_received", &*labels).increment(body.len() as u64); let mut okay = Response::default(); *okay.status_mut() = StatusCode::OK;