Skip to content

fix(observability): correct emitted metrics #17562

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.

Sign up for GitHub

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

Merged
StephenWakely merged 1 commit into from
Jun 1, 2023
Merged

fix(observability): correct emitted metrics #17562

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion src/sinks/redis.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,10 +290,11 @@ fn encode_event(
transformer.transform(&mut event);

let mut bytes = BytesMut::new();
let byte_size = bytes.len();

// Errors are handled by `Encoder`.
encoder.encode(event, &mut bytes).ok()?;

let byte_size = bytes.len();
let value = bytes.freeze();

let event = EncodedEvent::new(RedisKvEntry { key, value }, byte_size, event_byte_size);
Expand Down
8 changes: 6 additions & 2 deletions src/sinks/vector/sink.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ use tower::Service;
use vector_common::json_size::JsonSize;
use vector_core::{
stream::{BatcherSettings, DriverResponse},
ByteSizeOf,
ByteSizeOf, EstimatedJsonEncodedSizeOf,
};

use super::service::VectorRequest;
Expand All @@ -20,6 +20,7 @@ use crate::{
/// Data for a single event.
struct EventData {
byte_size: usize,
json_byte_size: JsonSize,
finalizers: EventFinalizers,
wrapper: EventWrapper,
}
Expand All @@ -30,6 +31,7 @@ struct EventCollection {
pub finalizers: EventFinalizers,
pub events: Vec<EventWrapper>,
pub events_byte_size: usize,
pub events_json_byte_size: JsonSize,
}

pub struct VectorSink<S> {
Expand All @@ -48,6 +50,7 @@ where
input
.map(|mut event| EventData {
byte_size: event.size_of(),
json_byte_size: event.estimated_json_encoded_size_of(),
finalizers: event.take_finalizers(),
wrapper: EventWrapper::from(event),
})
Expand All @@ -57,13 +60,14 @@ where
event_collection.finalizers.merge(item.finalizers);
event_collection.events.push(item.wrapper);
event_collection.events_byte_size += item.byte_size;
event_collection.events_json_byte_size += item.json_byte_size;
},
))
.map(|event_collection| {
let builder = RequestMetadataBuilder::new(
event_collection.events.len(),
event_collection.events_byte_size,
JsonSize::new(event_collection.events_byte_size), // this is fine as it isn't being used
event_collection.events_json_byte_size,
);

let encoded_events = proto_vector::PushEventsRequest {
Expand Down