Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adjust splunk_hec to distinguish decoded and raw bytes received #1167

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
3 changes: 2 additions & 1 deletion lading/src/blackhole/splunk_hec.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Loading