Skip to content

Commit badeb4a

Browse files
prontpront
authored
chore(dev): bump Rust to 1.89 (vectordotdev#23650)
* chore(dev): bump Rust to 1.89 * ran cargo fmt * more fixes * guard windows imports * fmt * chore(vdev): apply vdev rust check fixes * compile out tcpmetrics * chore(vdev): apply vdev rust check fixes * remove unused PoisonPillMultiEventRecord * fmt * remove unused file * ran cargo fmt * never ending fixes * fixes * ran cargo fmt * more feature gates * ran cargo fmt * make generate-component-docs * msrv bump, and feature gates.. * ran cargo fmt * auto-fixes * fmt * fix comment * add exception for pre-existing issues * fix more failing tests * auto-fixes * fmt on linux
1 parent 904ed1d commit badeb4a

File tree

151 files changed

+1074
-1147
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

151 files changed

+1074
-1147
lines changed

‎Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ default-run = "vector"
1212
autobenches = false # our benchmarks are not runnable on their own either way
1313
# Minimum supported rust version
1414
# See docs/DEVELOPING.md for policy
15-
rust-version = "1.86"
15+
rust-version = "1.88"
1616

1717
[[bin]]
1818
name = "vector"

‎lib/codecs/src/decoding/framing/chunked_gelf.rs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -178,11 +178,11 @@ impl ChunkedGelfDecompression {
178178

179179
if data.starts_with(ZLIB_MAGIC) {
180180
// Based on https://datatracker.ietf.org/doc/html/rfc1950#section-2.2
181-
if let Some([first_byte, second_byte]) = data.get(0..2) {
182-
if (*first_byte as u16 * 256 + *second_byte as u16) % 31 == 0 {
183-
trace!("Detected Zlib compression");
184-
return Self::Zlib;
185-
}
181+
if let Some([first_byte, second_byte]) = data.get(0..2)
182+
&& (*first_byte as u16 * 256 + *second_byte as u16) % 31 == 0
183+
{
184+
trace!("Detected Zlib compression");
185+
return Self::Zlib;
186186
};
187187

188188
warn!(

‎lib/codecs/src/decoding/framing/octet_counting.rs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -232,13 +232,13 @@ impl OctetCountingDecoder {
232232
&mut self,
233233
src: &mut BytesMut,
234234
) -> Option<Result<Option<Bytes>, LinesCodecError>> {
235-
if let Some(&first_byte) = src.first() {
236-
if (49..=57).contains(&first_byte) {
237-
// First character is non zero number so we can assume that
238-
// octet count framing is used.
239-
trace!("Octet counting encoded event detected.");
240-
self.octet_decoding = Some(State::NotDiscarding);
241-
}
235+
if let Some(&first_byte) = src.first()
236+
&& (49..=57).contains(&first_byte)
237+
{
238+
// First character is non zero number so we can assume that
239+
// octet count framing is used.
240+
trace!("Octet counting encoded event detected.");
241+
self.octet_decoding = Some(State::NotDiscarding);
242242
}
243243

244244
self.octet_decoding

‎lib/codecs/src/encoding/format/gelf.rs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -141,13 +141,13 @@ fn coerce_required_fields(mut log: LogEvent) -> vector_common::Result<LogEvent>
141141
err_missing_field(HOST)?;
142142
}
143143

144-
if !log.contains(&GELF_TARGET_PATHS.short_message) {
145-
if let Some(message_key) = log_schema().message_key_target_path() {
146-
if log.contains(message_key) {
147-
log.rename_key(message_key, &GELF_TARGET_PATHS.short_message);
148-
} else {
149-
err_missing_field(SHORT_MESSAGE)?;
150-
}
144+
if !log.contains(&GELF_TARGET_PATHS.short_message)
145+
&& let Some(message_key) = log_schema().message_key_target_path()
146+
{
147+
if log.contains(message_key) {
148+
log.rename_key(message_key, &GELF_TARGET_PATHS.short_message);
149+
} else {
150+
err_missing_field(SHORT_MESSAGE)?;
151151
}
152152
}
153153
Ok(log)

‎lib/dnstap-parser/src/parser.rs‎

Lines changed: 8 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -147,21 +147,14 @@ impl DnstapParser {
147147
dnstap_data_type.clone(),
148148
);
149149

150-
if dnstap_data_type == "Message" {
151-
if let Some(message) = proto_msg.message {
152-
if let Err(err) =
153-
DnstapParser::parse_dnstap_message(event, &root, message, parsing_options)
154-
{
155-
emit!(DnstapParseWarning { error: &err });
156-
need_raw_data = true;
157-
DnstapParser::insert(
158-
event,
159-
&root,
160-
&DNSTAP_VALUE_PATHS.error,
161-
err.to_string(),
162-
);
163-
}
164-
}
150+
if dnstap_data_type == "Message"
151+
&& let Some(message) = proto_msg.message
152+
&& let Err(err) =
153+
DnstapParser::parse_dnstap_message(event, &root, message, parsing_options)
154+
{
155+
emit!(DnstapParseWarning { error: &err });
156+
need_raw_data = true;
157+
DnstapParser::insert(event, &root, &DNSTAP_VALUE_PATHS.error, err.to_string());
165158
}
166159
} else {
167160
emit!(DnstapParseWarning {

‎lib/enrichment/src/vrl_util.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ impl DiagnosticMessage for Error {
3838
}
3939

4040
/// Evaluates the condition object to search the enrichment tables with.
41-
pub(crate) fn evaluate_condition(key: &str, value: Value) -> ExpressionResult<Condition> {
41+
pub(crate) fn evaluate_condition(key: &str, value: Value) -> ExpressionResult<Condition<'_>> {
4242
Ok(match value {
4343
Value::Object(map) if map.contains_key("from") && map.contains_key("to") => {
4444
Condition::BetweenDates {

‎lib/file-source-common/src/checkpointer.rs‎

Lines changed: 19 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -128,10 +128,10 @@ impl CheckpointsView {
128128
match state {
129129
State::V1 { checkpoints } => {
130130
for checkpoint in checkpoints {
131-
if let Some(ignore_before) = ignore_before {
132-
if checkpoint.modified < ignore_before {
133-
continue;
134-
}
131+
if let Some(ignore_before) = ignore_before
132+
&& checkpoint.modified < ignore_before
133+
{
134+
continue;
135135
}
136136
self.load(checkpoint);
137137
}
@@ -179,20 +179,18 @@ impl CheckpointsView {
179179
self.update(fng, pos);
180180
}
181181

182-
if self.checkpoints.get(&fng).is_none() {
183-
if let Ok(Some(fingerprint)) =
182+
if self.checkpoints.get(&fng).is_none()
183+
&& let Ok(Some(fingerprint)) =
184184
fingerprinter.get_legacy_checksum(path, fingerprint_buffer)
185-
{
186-
if let Some((_, pos)) = self.checkpoints.remove(&fingerprint) {
187-
self.update(fng, pos);
188-
}
185+
{
186+
if let Some((_, pos)) = self.checkpoints.remove(&fingerprint) {
187+
self.update(fng, pos);
189188
}
190189
if let Ok(Some(fingerprint)) =
191190
fingerprinter.get_legacy_first_lines_checksum(path, fingerprint_buffer)
191+
&& let Some((_, pos)) = self.checkpoints.remove(&fingerprint)
192192
{
193-
if let Some((_, pos)) = self.checkpoints.remove(&fingerprint) {
194-
self.update(fng, pos);
195-
}
193+
self.update(fng, pos);
196194
}
197195
}
198196
}
@@ -405,15 +403,15 @@ impl Checkpointer {
405403
fn read_legacy_checkpoints(&mut self, ignore_before: Option<DateTime<Utc>>) {
406404
for path in glob(&self.glob_string).unwrap().flatten() {
407405
let mut mtime = None;
408-
if let Some(ignore_before) = ignore_before {
409-
if let Ok(Ok(modified)) = fs::metadata(&path).map(|metadata| metadata.modified()) {
410-
let modified = DateTime::<Utc>::from(modified);
411-
if modified < ignore_before {
412-
fs::remove_file(path).ok();
413-
continue;
414-
}
415-
mtime = Some(modified);
406+
if let Some(ignore_before) = ignore_before
407+
&& let Ok(Ok(modified)) = fs::metadata(&path).map(|metadata| metadata.modified())
408+
{
409+
let modified = DateTime::<Utc>::from(modified);
410+
if modified < ignore_before {
411+
fs::remove_file(path).ok();
412+
continue;
416413
}
414+
mtime = Some(modified);
417415
}
418416
let (fng, pos) = self.decode(&path);
419417
self.checkpoints.checkpoints.insert(fng, pos);

‎lib/file-source-common/src/fingerprinter.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,9 +122,9 @@ impl UncompressedReader for UncompressedReaderImpl {
122122
fp.seek(SeekFrom::Start(0))?;
123123
let result = fp.read_exact(&mut magic);
124124

125-
if result.is_err() {
125+
if let Err(e) = result {
126126
fp.seek(SeekFrom::Start(0))?;
127-
return Err(result.unwrap_err());
127+
return Err(e);
128128
}
129129

130130
if magic == magic_header_bytes {

‎lib/file-source/src/file_server.rs‎

Lines changed: 20 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -211,15 +211,14 @@ where
211211
if let (Ok(old_modified_time), Ok(new_modified_time)) = (
212212
fs::metadata(old_path).and_then(|m| m.modified()),
213213
fs::metadata(new_path).and_then(|m| m.modified()),
214-
) {
215-
if old_modified_time < new_modified_time {
216-
info!(
217-
message = "Switching to watch most recently modified file.",
218-
new_modified_time = ?new_modified_time,
219-
old_modified_time = ?old_modified_time,
220-
);
221-
watcher.update_path(path).ok(); // ok if this fails: might fix next cycle
222-
}
214+
) && old_modified_time < new_modified_time
215+
{
216+
info!(
217+
message = "Switching to watch most recently modified file.",
218+
new_modified_time = ?new_modified_time,
219+
old_modified_time = ?old_modified_time,
220+
);
221+
watcher.update_path(path).ok(); // ok if this fails: might fix next cycle
223222
}
224223
}
225224
} else {
@@ -307,18 +306,18 @@ where
307306
global_bytes_read = global_bytes_read.saturating_add(bytes_read);
308307
} else {
309308
// Should the file be removed
310-
if let Some(grace_period) = self.remove_after {
311-
if watcher.last_read_success().elapsed() >= grace_period {
312-
// Try to remove
313-
match remove_file(&watcher.path) {
314-
Ok(()) => {
315-
self.emitter.emit_file_deleted(&watcher.path);
316-
watcher.set_dead();
317-
}
318-
Err(error) => {
319-
// We will try again after some time.
320-
self.emitter.emit_file_delete_error(&watcher.path, error);
321-
}
309+
if let Some(grace_period) = self.remove_after
310+
&& watcher.last_read_success().elapsed() >= grace_period
311+
{
312+
// Try to remove
313+
match remove_file(&watcher.path) {
314+
Ok(()) => {
315+
self.emitter.emit_file_deleted(&watcher.path);
316+
watcher.set_dead();
317+
}
318+
Err(error) => {
319+
// We will try again after some time.
320+
self.emitter.emit_file_delete_error(&watcher.path, error);
322321
}
323322
}
324323
}

‎lib/opentelemetry-proto/src/logs.rs‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -116,16 +116,16 @@ impl ResourceLog {
116116
}
117117

118118
// Optional fields
119-
if let Some(resource) = self.resource {
120-
if !resource.attributes.is_empty() {
121-
log_namespace.insert_source_metadata(
122-
SOURCE_NAME,
123-
&mut log,
124-
Some(LegacyKey::Overwrite(path!(RESOURCE_KEY))),
125-
path!(RESOURCE_KEY),
126-
kv_list_into_value(resource.attributes),
127-
);
128-
}
119+
if let Some(resource) = self.resource
120+
&& !resource.attributes.is_empty()
121+
{
122+
log_namespace.insert_source_metadata(
123+
SOURCE_NAME,
124+
&mut log,
125+
Some(LegacyKey::Overwrite(path!(RESOURCE_KEY))),
126+
path!(RESOURCE_KEY),
127+
kv_list_into_value(resource.attributes),
128+
);
129129
}
130130
if !self.log_record.attributes.is_empty() {
131131
log_namespace.insert_source_metadata(

0 commit comments

Comments
 (0)