Skip to content

Commit

Permalink
Adjust how bytes_received is calculated in the HTTP blackhole (#1166)
Browse files Browse the repository at this point in the history
### What does this PR do?

This commit adjusts `bytes_received` to measure the bytes received over the wire
before decoding. This allows lading to make assertions about the efficacy of
compression by targets, matching the behavior of the other lading blackholes. We
preserve the decoded metric by renaming it `decoded_bytes_received`.
  • Loading branch information
blt authored Dec 17, 2024
1 parent 8db113f commit 6acfcdb
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 1 deletion.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file.
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`.

## [0.25.1]
## Removed
- Revert PR #1148
Expand Down
3 changes: 2 additions & 1 deletion lading/src/blackhole/http.rs
Original file line number Diff line number Diff line change
Expand Up @@ -138,11 +138,12 @@ async fn srv(
let (parts, body) = req.into_parts();

let bytes = body.collect().await?.to_bytes();
counter!("bytes_received", &metric_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", &metric_labels).increment(body.len() as u64);
counter!("decoded_bytes_received", &metric_labels).increment(body.len() as u64);

tokio::time::sleep(response_delay).await;

Expand Down

0 comments on commit 6acfcdb

Please sign in to comment.