Skip to content

chore(datadog_logs sink): Output truncated messages as strings #26635

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

Open
bruceg wants to merge 1 commit into
base: master
Choose a base branch
from
+11 −6
Open

chore(datadog_logs sink): Output truncated messages as strings #26635

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
17 changes: 11 additions & 6 deletions src/sinks/datadog/logs/sink.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
use std::{collections::VecDeque, fmt::Debug, io, sync::Arc};

use bytes::Bytes;
use itertools::Itertools;
use snafu::Snafu;
use tracing::Instrument;
Expand Down Expand Up @@ -496,12 +495,18 @@ fn set_truncated_message(
body_len: usize,
conforms_as_agent: bool,
) {
let marker = TRUNCATION_MARKER.as_bytes();
let mut truncated = Vec::with_capacity(body_len + marker.len());
truncated.extend_from_slice(&message.as_bytes()[..body_len]);
truncated.extend_from_slice(marker);
// The current caller supplies a character boundary because `select_message_body_len`
// advances via `char_indices`; keep the clamp as a defensive guard for future callers.
let body_len = message.floor_char_boundary(body_len);
let mut truncated = String::with_capacity(body_len + TRUNCATION_MARKER.len());
#[expect(
clippy::string_slice,
reason = "floor_char_boundary guarantees a valid char boundary"
)]
truncated.push_str(&message[..body_len]);
truncated.push_str(TRUNCATION_MARKER);
*message_value_mut(log, conforms_as_agent).expect("the message was previously found") =
Value::Bytes(Bytes::from(truncated));
Value::from(truncated);
}

fn ensure_truncated_tag(log: &mut LogEvent, encoded_size: usize) -> io::Result<usize> {
Expand Down
Loading