Merge remote-tracking branch 'origin/master' into dependabot/github_actions/actions-4a3a8eedec

Author: pront

Cargo.lock

@@ -510,7 +510,7 @@ clean: ## Clean everything
 
 .PHONY: generate-kubernetes-manifests
 generate-kubernetes-manifests: ## Generate Kubernetes manifests from the latest (or CHART_VERSION) Helm chart
-	$(VDEV) build manifests -- $(if $(CHART_VERSION),--chart-version $(CHART_VERSION))
+	$(VDEV) build manifests $(if $(CHART_VERSION),--chart-version "$(CHART_VERSION)")
 
 .PHONY: generate-component-docs
 generate-component-docs: ## Generate per-component Cue docs from the configuration schema.

Makefile

@@ -0,0 +1,3 @@
+The `kubernetes_logs` source no longer drops Namespace and Node labels from the Vector log namespace metadata (`%kubernetes_logs.namespace_labels` and `%kubernetes_logs.node_labels`) when `namespace_annotation_fields.namespace_labels` or `node_annotation_fields.node_labels` is set to `""`. An empty path now only suppresses the legacy event field, matching how `pod_annotation_fields` behaves.
+
+authors: srstrickland

changelog.d/25970_k8s_labels_log_namespace.fix.md

@@ -0,0 +1,3 @@
+The `kubernetes_logs` source now enriches events with the owning Namespace's annotations, in addition to its labels. Add `namespace_annotation_fields.namespace_annotations` to customize or suppress the output field (default: `.kubernetes.namespace_annotations`).
+
+authors: srstrickland

changelog.d/k8s_namespace_annotations.feature.md

@@ -0,0 +1,3 @@
+Fixes an issue where components selected for an explicit reload remained selected for later configuration reloads. This could unnecessarily restart unchanged components and reset their in-memory state.
+
+authors: arunpidugu

changelog.d/pending_component_reloads.fix.md

@@ -51,8 +51,9 @@ fn decoding(c: &mut Criterion) {
                         let framer = Framer::CharacterDelimited(
                             param
                                 .max_length
-                                .map(|ml| CharacterDelimitedDecoder::new_with_max_length(b'a', ml))
-                                .unwrap_or(CharacterDelimitedDecoder::new(b'a')),
+                                .map_or(CharacterDelimitedDecoder::new(b'a'), |ml| {
+                                    CharacterDelimitedDecoder::new_with_max_length(b'a', ml)
+                                }),
                         );
                         let deserializer = Deserializer::Bytes(BytesDeserializer);
                         let decoder = Decoder::new(framer, deserializer);
@@ -61,15 +62,15 @@ fn decoding(c: &mut Criterion) {
                     },
                     |(mut decoder, mut input)| loop {
                         match decoder.decode_eof(&mut input) {
-                            Ok(Some(_)) => continue,
+                            Ok(Some(_)) => {}
                             Ok(None) => break,
                             Err(_) => {
                                 unreachable!()
                             }
                         }
                     },
                     BatchSize::SmallInput,
-                )
+                );
             },
         );
     }
@@ -79,7 +80,7 @@ criterion_group!(
     name = benches;
     config = Criterion::default()
         .warm_up_time(Duration::from_secs(5))
-        .measurement_time(Duration::from_secs(120))
+        .measurement_time(Duration::from_mins(2))
         // degree of noise to ignore in measurements, here 1%
         .noise_threshold(0.01)
         // likelihood of noise registering as difference, here 5%

lib/codecs/benches/codecs/character_delimited_bytes.rs

@@ -54,7 +54,7 @@ fn encoder(c: &mut Criterion) {
                 bytes.put_u8(b'\n');
             },
             BatchSize::SmallInput,
-        )
+        );
     });
 
     group.throughput(Throughput::Bytes(input.size_of() as u64));
@@ -67,7 +67,7 @@ fn encoder(c: &mut Criterion) {
                 bytes.put_u8(b'\n');
             },
             BatchSize::SmallInput,
-        )
+        );
     });
 
     group.throughput(Throughput::Bytes(input.size_of() as u64));
@@ -80,7 +80,7 @@ fn encoder(c: &mut Criterion) {
                 bytes.put_u8(b'\n');
             },
             BatchSize::SmallInput,
-        )
+        );
     });
 
     group.throughput(Throughput::Bytes(input.size_of() as u64));
@@ -97,7 +97,7 @@ fn encoder(c: &mut Criterion) {
                 encoder.encode(input.clone(), &mut bytes).unwrap();
             },
             BatchSize::SmallInput,
-        )
+        );
     });
 }
 

lib/codecs/benches/codecs/encoder.rs

@@ -1,3 +1,5 @@
+#![warn(clippy::pedantic)]
+
 use criterion::criterion_main;
 
 mod character_delimited_bytes;

lib/codecs/benches/codecs/main.rs

@@ -61,15 +61,15 @@ fn decoding(c: &mut Criterion) {
                     },
                     |(mut decoder, mut input)| loop {
                         match decoder.decode_eof(&mut input) {
-                            Ok(Some(_)) => continue,
+                            Ok(Some(_)) => {}
                             Ok(None) => break,
                             Err(_) => {
                                 unreachable!()
                             }
                         }
                     },
                     BatchSize::SmallInput,
-                )
+                );
             },
         );
     }
@@ -79,7 +79,7 @@ criterion_group!(
     name = benches;
     config = Criterion::default()
         .warm_up_time(Duration::from_secs(5))
-        .measurement_time(Duration::from_secs(120))
+        .measurement_time(Duration::from_mins(2))
         // degree of noise to ignore in measurements, here 1%
         .noise_threshold(0.01)
         // likelihood of noise registering as difference, here 5%

lib/codecs/benches/codecs/newline_bytes.rs

@@ -60,7 +60,7 @@ impl LengthDelimitedCoderOptions {
             builder.big_endian();
         } else {
             builder.little_endian();
-        };
+        }
         builder.new_codec()
     }
 }