From 91245a4dd9ac2be20acb9ce53d2d59905e3513bb Mon Sep 17 00:00:00 2001
From: simplepad <35456194+simplepad@users.noreply.github.com>
Date: Fri, 9 May 2025 17:05:49 +0300
Subject: [PATCH 001/305] feat(config): add `wildcard_matching` config option
 (#23011)

* add relaxed_wildcart_matching config option

* allow empty results for glob inputs if relaxed_wildcard_matching is enabled

* optimize condition

* fix fmt

* fix clippy

* remove option

* fix fmt

* Revert "remove option"

This reverts commit 901cf08d46c349c7d16d2df710fc1078a99c9e89.

* generate docs

* add changelog fragment

* fix typo

* add tests

* add config example to changelog

* use enum instead of boolean

* regenerate docs

* update changelog
---
 ...1_add_relaxed_wildcard_matching.feature.md | 24 ++++++
 lib/vector-core/src/config/global_options.rs  | 29 +++++++
 lib/vector-core/src/config/mod.rs             |  2 +-
 lib/vector-lib/src/lib.rs                     |  2 +-
 src/config/compiler.rs                        |  8 +-
 src/config/graph.rs                           | 82 +++++++++++++++++--
 src/config/mod.rs                             |  2 +-
 src/config/unit_test/mod.rs                   |  6 ++
 website/cue/reference/base/configuration.cue  | 14 ++++
 9 files changed, 156 insertions(+), 13 deletions(-)
 create mode 100644 changelog.d/23011_add_relaxed_wildcard_matching.feature.md

diff --git a/changelog.d/23011_add_relaxed_wildcard_matching.feature.md b/changelog.d/23011_add_relaxed_wildcard_matching.feature.md
new file mode 100644
index 0000000000000..adaf44fd03177
--- /dev/null
+++ b/changelog.d/23011_add_relaxed_wildcard_matching.feature.md
@@ -0,0 +1,24 @@
+Added `wildcard_matching` global config option to set wildcard matching mode for inputs. Relaxed mode allows configurations with wildcards that do not match any inputs to be accepted without causing an error.
+
+Example config:
+
+```yaml
+wildcard_matching: relaxed
+
+sources:
+  stdin:
+    type: stdin
+
+# note - no transforms
+
+sinks:
+  stdout:
+    type: console
+    encoding:
+      codec: json
+    inputs:
+      - "runtime-added-transform-*"
+
+```
+
+authors: simplepad
diff --git a/lib/vector-core/src/config/global_options.rs b/lib/vector-core/src/config/global_options.rs
index 80e7316f023bc..121a5bcd2c0a5 100644
--- a/lib/vector-core/src/config/global_options.rs
+++ b/lib/vector-core/src/config/global_options.rs
@@ -31,6 +31,19 @@ pub(crate) enum DataDirError {
     },
 }
 
+/// Specifies the wildcard matching mode, relaxed allows configurations where wildcard doesn not match any existing inputs
+#[configurable_component]
+#[derive(Clone, Debug, Copy, PartialEq, Eq, Default)]
+#[serde(rename_all = "lowercase")]
+pub enum WildcardMatching {
+    /// Strict matching (must match at least one existing input)
+    #[default]
+    Strict,
+
+    /// Relaxed matching (must match 0 or more inputs)
+    Relaxed,
+}
+
 /// Global configuration options.
 //
 // If this is modified, make sure those changes are reflected in the `ConfigBuilder::append`
@@ -48,6 +61,14 @@ pub struct GlobalOptions {
     #[configurable(metadata(docs::common = false))]
     pub data_dir: Option<PathBuf>,
 
+    /// Set wildcard matching mode for inputs
+    ///
+    /// Setting this to "relaxed" allows configurations with wildcards that do not match any inputs
+    /// to be accepted without causing an error.
+    #[serde(skip_serializing_if = "crate::serde::is_default")]
+    #[configurable(metadata(docs::common = false, docs::required = false))]
+    pub wildcard_matching: Option<WildcardMatching>,
+
     /// Default log schema for all events.
     ///
     /// This is used if a component does not have its own specific log schema. All events use a log
@@ -182,6 +203,13 @@ impl GlobalOptions {
     pub fn merge(&self, with: Self) -> Result<Self, Vec<String>> {
         let mut errors = Vec::new();
 
+        if conflicts(
+            self.wildcard_matching.as_ref(),
+            with.wildcard_matching.as_ref(),
+        ) {
+            errors.push("conflicting values for 'wildcard_matching' found".to_owned());
+        }
+
         if conflicts(self.proxy.http.as_ref(), with.proxy.http.as_ref()) {
             errors.push("conflicting values for 'proxy.http' found".to_owned());
         }
@@ -250,6 +278,7 @@ impl GlobalOptions {
         if errors.is_empty() {
             Ok(Self {
                 data_dir,
+                wildcard_matching: self.wildcard_matching.or(with.wildcard_matching),
                 log_schema,
                 telemetry,
                 acknowledgements: self.acknowledgements.merge_default(&with.acknowledgements),
diff --git a/lib/vector-core/src/config/mod.rs b/lib/vector-core/src/config/mod.rs
index 074b8c5fa3cab..7b47e3dbbe94d 100644
--- a/lib/vector-core/src/config/mod.rs
+++ b/lib/vector-core/src/config/mod.rs
@@ -13,7 +13,7 @@ pub mod proxy;
 mod telemetry;
 
 use crate::event::LogEvent;
-pub use global_options::GlobalOptions;
+pub use global_options::{GlobalOptions, WildcardMatching};
 pub use log_schema::{init_log_schema, log_schema, LogSchema};
 use lookup::{lookup_v2::ValuePath, path, PathPrefix};
 pub use output_id::OutputId;
diff --git a/lib/vector-lib/src/lib.rs b/lib/vector-lib/src/lib.rs
index f7bda363cc6b7..3d2628c90e80d 100644
--- a/lib/vector-lib/src/lib.rs
+++ b/lib/vector-lib/src/lib.rs
@@ -34,7 +34,7 @@ pub mod config {
         clone_input_definitions, init_log_schema, init_telemetry, log_schema, proxy, telemetry,
         AcknowledgementsConfig, DataType, GlobalOptions, Input, LegacyKey, LogNamespace, LogSchema,
         OutputId, SourceAcknowledgementsConfig, SourceOutput, Tags, Telemetry, TransformOutput,
-        MEMORY_BUFFER_DEFAULT_MAX_EVENTS,
+        WildcardMatching, MEMORY_BUFFER_DEFAULT_MAX_EVENTS,
     };
 }
 
diff --git a/src/config/compiler.rs b/src/config/compiler.rs
index 686572e6e56e3..bffb51bcaa93a 100644
--- a/src/config/compiler.rs
+++ b/src/config/compiler.rs
@@ -71,7 +71,13 @@ pub fn compile(mut builder: ConfigBuilder) -> Result<(Config, Vec<String>), Vec<
         )
         .collect::<IndexMap<_, _>>();
 
-    let graph = match Graph::new(&sources_and_table_sources, &transforms, &all_sinks, schema) {
+    let graph = match Graph::new(
+        &sources_and_table_sources,
+        &transforms,
+        &all_sinks,
+        schema,
+        global.wildcard_matching.unwrap_or_default(),
+    ) {
         Ok(graph) => graph,
         Err(graph_errors) => {
             errors.extend(graph_errors);
diff --git a/src/config/graph.rs b/src/config/graph.rs
index 9ed1af6ff17fe..3943aefead147 100644
--- a/src/config/graph.rs
+++ b/src/config/graph.rs
@@ -1,6 +1,6 @@
 use super::{
     schema, ComponentKey, DataType, OutputId, SinkOuter, SourceOuter, SourceOutput, TransformOuter,
-    TransformOutput,
+    TransformOutput, WildcardMatching,
 };
 use indexmap::{set::IndexSet, IndexMap};
 use std::collections::{HashMap, HashSet, VecDeque};
@@ -65,8 +65,9 @@ impl Graph {
         transforms: &IndexMap<ComponentKey, TransformOuter<String>>,
         sinks: &IndexMap<ComponentKey, SinkOuter<String>>,
         schema: schema::Options,
+        wildcard_matching: WildcardMatching,
     ) -> Result<Self, Vec<String>> {
-        Self::new_inner(sources, transforms, sinks, false, schema)
+        Self::new_inner(sources, transforms, sinks, false, schema, wildcard_matching)
     }
 
     pub fn new_unchecked(
@@ -74,8 +75,10 @@ impl Graph {
         transforms: &IndexMap<ComponentKey, TransformOuter<String>>,
         sinks: &IndexMap<ComponentKey, SinkOuter<String>>,
         schema: schema::Options,
+        wildcard_matching: WildcardMatching,
     ) -> Self {
-        Self::new_inner(sources, transforms, sinks, true, schema).expect("errors ignored")
+        Self::new_inner(sources, transforms, sinks, true, schema, wildcard_matching)
+            .expect("errors ignored")
     }
 
     fn new_inner(
@@ -84,6 +87,7 @@ impl Graph {
         sinks: &IndexMap<ComponentKey, SinkOuter<String>>,
         ignore_errors: bool,
         schema: schema::Options,
+        wildcard_matching: WildcardMatching,
     ) -> Result<Self, Vec<String>> {
         let mut graph = Graph::default();
         let mut errors = Vec::new();
@@ -127,7 +131,7 @@ impl Graph {
 
         for (id, config) in transforms.iter() {
             for input in config.inputs.iter() {
-                if let Err(e) = graph.add_input(input, id, &available_inputs) {
+                if let Err(e) = graph.add_input(input, id, &available_inputs, wildcard_matching) {
                     errors.push(e);
                 }
             }
@@ -135,7 +139,7 @@ impl Graph {
 
         for (id, config) in sinks {
             for input in config.inputs.iter() {
-                if let Err(e) = graph.add_input(input, id, &available_inputs) {
+                if let Err(e) = graph.add_input(input, id, &available_inputs, wildcard_matching) {
                     errors.push(e);
                 }
             }
@@ -153,6 +157,7 @@ impl Graph {
         from: &str,
         to: &ComponentKey,
         available_inputs: &HashMap<String, OutputId>,
+        wildcard_matching: WildcardMatching,
     ) -> Result<(), String> {
         if let Some(output_id) = available_inputs.get(from) {
             self.edges.push(Edge {
@@ -166,6 +171,18 @@ impl Graph {
                 Some(Node::Sink { .. }) => "sink",
                 _ => panic!("only transforms and sinks have inputs"),
             };
+            // allow empty result if relaxed wildcard matching is enabled
+            match wildcard_matching {
+                WildcardMatching::Relaxed => {
+                    // using value != glob::Pattern::escape(value) to check if value is a glob
+                    // TODO: replace with proper check when https://github.com/rust-lang/glob/issues/72 is resolved
+                    if from != glob::Pattern::escape(from) {
+                        info!("Input \"{from}\" for {output_type} \"{to}\" didn’t match any components, but this was ignored because `relaxed_wildcard_matching` is enabled.");
+                        return Ok(());
+                    }
+                }
+                WildcardMatching::Strict => {}
+            }
             info!(
                 "Available components:\n{}",
                 self.nodes
@@ -472,9 +489,14 @@ mod test {
             }
         }
 
-        fn test_add_input(&mut self, node: &str, input: &str) -> Result<(), String> {
+        fn test_add_input(
+            &mut self,
+            node: &str,
+            input: &str,
+            wildcard_matching: WildcardMatching,
+        ) -> Result<(), String> {
             let available_inputs = self.input_map().unwrap();
-            self.add_input(input, &node.into(), &available_inputs)
+            self.add_input(input, &node.into(), &available_inputs, wildcard_matching)
         }
     }
 
@@ -655,14 +677,22 @@ mod test {
         // make sure we're good with dotted paths
         assert_eq!(
             Ok(()),
-            graph.test_add_input("errored_log_sink", "log_to_log.errors")
+            graph.test_add_input(
+                "errored_log_sink",
+                "log_to_log.errors",
+                WildcardMatching::Strict
+            )
         );
 
         // make sure that we're not cool with an unknown dotted path
         let expected = "Input \"log_to_log.not_errors\" for sink \"bad_log_sink\" doesn't match any components.".to_string();
         assert_eq!(
             Err(expected),
-            graph.test_add_input("bad_log_sink", "log_to_log.not_errors")
+            graph.test_add_input(
+                "bad_log_sink",
+                "log_to_log.not_errors",
+                WildcardMatching::Strict
+            )
         );
     }
 
@@ -745,6 +775,40 @@ mod test {
         );
     }
 
+    #[test]
+    fn wildcard_matching() {
+        let mut graph = Graph::default();
+        graph.add_source("log_source", DataType::Log);
+
+        // don't add inputs to these yet since they're not validated via these helpers
+        graph.add_sink("sink", DataType::Log, vec![]);
+
+        // make sure we're not good with non existing inputs with relaxed wildcard matching disabled
+        let wildcard_matching = WildcardMatching::Strict;
+        let expected =
+            "Input \"bad_source-*\" for sink \"sink\" doesn't match any components.".to_string();
+        assert_eq!(
+            Err(expected),
+            graph.test_add_input("sink", "bad_source-*", wildcard_matching)
+        );
+
+        // make sure we're good with non existing inputs with relaxed wildcard matching enabled
+        let wildcard_matching = WildcardMatching::Relaxed;
+        assert_eq!(
+            Ok(()),
+            graph.test_add_input("sink", "bad_source-*", wildcard_matching)
+        );
+
+        // make sure we're not good with non existing inputs that are not wildcards even when relaxed wildcard matching is enabled
+        let wildcard_matching = WildcardMatching::Relaxed;
+        let expected =
+            "Input \"bad_source-1\" for sink \"sink\" doesn't match any components.".to_string();
+        assert_eq!(
+            Err(expected),
+            graph.test_add_input("sink", "bad_source-1", wildcard_matching)
+        );
+    }
+
     #[test]
     fn paths_to_sink_simple() {
         let mut graph = Graph::default();
diff --git a/src/config/mod.rs b/src/config/mod.rs
index 6478203229475..d42d87c9753af 100644
--- a/src/config/mod.rs
+++ b/src/config/mod.rs
@@ -21,7 +21,7 @@ use serde::Serialize;
 use vector_config::configurable_component;
 pub use vector_lib::config::{
     AcknowledgementsConfig, DataType, GlobalOptions, Input, LogNamespace,
-    SourceAcknowledgementsConfig, SourceOutput, TransformOutput,
+    SourceAcknowledgementsConfig, SourceOutput, TransformOutput, WildcardMatching,
 };
 pub use vector_lib::configurable::component::{
     GenerateConfig, SinkDescription, TransformDescription,
diff --git a/src/config/unit_test/mod.rs b/src/config/unit_test/mod.rs
index deafeff02cfcb..4e5b12b658c78 100644
--- a/src/config/unit_test/mod.rs
+++ b/src/config/unit_test/mod.rs
@@ -385,6 +385,10 @@ async fn build_unit_test(
         &transform_only_config.transforms,
         &transform_only_config.sinks,
         transform_only_config.schema,
+        transform_only_config
+            .global
+            .wildcard_matching
+            .unwrap_or_default(),
     );
     let test = test.resolve_outputs(&transform_only_graph)?;
 
@@ -401,6 +405,7 @@ async fn build_unit_test(
         &config_builder.transforms,
         &config_builder.sinks,
         config_builder.schema,
+        config_builder.global.wildcard_matching.unwrap_or_default(),
     );
 
     let mut valid_components = get_relevant_test_components(
@@ -432,6 +437,7 @@ async fn build_unit_test(
         &config_builder.transforms,
         &config_builder.sinks,
         config_builder.schema,
+        config_builder.global.wildcard_matching.unwrap_or_default(),
     );
     let valid_inputs = graph.input_map()?;
     for (_, transform) in config_builder.transforms.iter_mut() {
diff --git a/website/cue/reference/base/configuration.cue b/website/cue/reference/base/configuration.cue
index 4bd38192b11b7..41650b84adf79 100644
--- a/website/cue/reference/base/configuration.cue
+++ b/website/cue/reference/base/configuration.cue
@@ -901,4 +901,18 @@ base: configuration: configuration: {
 		required: false
 		type: string: examples: ["local", "America/New_York", "EST5EDT"]
 	}
+	wildcard_matching: {
+		common: false
+		description: """
+			Set wildcard matching mode for inputs
+
+			Setting this to "relaxed" allows configurations with wildcards that do not match any inputs
+			to be accepted without causing an error.
+			"""
+		required: false
+		type: string: enum: {
+			relaxed: "Relaxed matching (must match 0 or more inputs)"
+			strict:  "Strict matching (must match at least one existing input)"
+		}
+	}
 }

From 9129d95c56ad530989c238dd0d380de6a0c95ca8 Mon Sep 17 00:00:00 2001
From: Jed Laundry <jlaundry@jlaundry.com>
Date: Tue, 13 May 2025 07:31:55 +1200
Subject: [PATCH 002/305] docs(sinks): Remove slash from max_bytes text
 (#23035)

Signed-off-by: Jed Laundry <jlaundry@jlaundry.com>
---
 src/sinks/util/batch.rs                                         | 2 +-
 website/cue/reference/components/sinks/base/appsignal.cue       | 2 +-
 .../cue/reference/components/sinks/base/aws_cloudwatch_logs.cue | 2 +-
 .../reference/components/sinks/base/aws_cloudwatch_metrics.cue  | 2 +-
 .../reference/components/sinks/base/aws_kinesis_firehose.cue    | 2 +-
 .../cue/reference/components/sinks/base/aws_kinesis_streams.cue | 2 +-
 website/cue/reference/components/sinks/base/aws_s3.cue          | 2 +-
 website/cue/reference/components/sinks/base/axiom.cue           | 2 +-
 website/cue/reference/components/sinks/base/azure_blob.cue      | 2 +-
 .../cue/reference/components/sinks/base/azure_monitor_logs.cue  | 2 +-
 website/cue/reference/components/sinks/base/clickhouse.cue      | 2 +-
 website/cue/reference/components/sinks/base/databend.cue        | 2 +-
 website/cue/reference/components/sinks/base/datadog_logs.cue    | 2 +-
 website/cue/reference/components/sinks/base/datadog_metrics.cue | 2 +-
 website/cue/reference/components/sinks/base/datadog_traces.cue  | 2 +-
 website/cue/reference/components/sinks/base/elasticsearch.cue   | 2 +-
 .../components/sinks/base/gcp_chronicle_unstructured.cue        | 2 +-
 .../cue/reference/components/sinks/base/gcp_cloud_storage.cue   | 2 +-
 website/cue/reference/components/sinks/base/gcp_pubsub.cue      | 2 +-
 .../reference/components/sinks/base/gcp_stackdriver_logs.cue    | 2 +-
 .../reference/components/sinks/base/gcp_stackdriver_metrics.cue | 2 +-
 website/cue/reference/components/sinks/base/greptimedb.cue      | 2 +-
 website/cue/reference/components/sinks/base/greptimedb_logs.cue | 2 +-
 .../cue/reference/components/sinks/base/greptimedb_metrics.cue  | 2 +-
 website/cue/reference/components/sinks/base/honeycomb.cue       | 2 +-
 website/cue/reference/components/sinks/base/http.cue            | 2 +-
 website/cue/reference/components/sinks/base/humio_logs.cue      | 2 +-
 website/cue/reference/components/sinks/base/humio_metrics.cue   | 2 +-
 website/cue/reference/components/sinks/base/influxdb_logs.cue   | 2 +-
 .../cue/reference/components/sinks/base/influxdb_metrics.cue    | 2 +-
 website/cue/reference/components/sinks/base/kafka.cue           | 2 +-
 website/cue/reference/components/sinks/base/keep.cue            | 2 +-
 website/cue/reference/components/sinks/base/logdna.cue          | 2 +-
 website/cue/reference/components/sinks/base/loki.cue            | 2 +-
 website/cue/reference/components/sinks/base/mezmo.cue           | 2 +-
 website/cue/reference/components/sinks/base/new_relic.cue       | 2 +-
 website/cue/reference/components/sinks/base/opentelemetry.cue   | 2 +-
 website/cue/reference/components/sinks/base/postgres.cue        | 2 +-
 .../reference/components/sinks/base/prometheus_remote_write.cue | 2 +-
 website/cue/reference/components/sinks/base/redis.cue           | 2 +-
 website/cue/reference/components/sinks/base/sematext_logs.cue   | 2 +-
 .../cue/reference/components/sinks/base/sematext_metrics.cue    | 2 +-
 website/cue/reference/components/sinks/base/splunk_hec_logs.cue | 2 +-
 .../cue/reference/components/sinks/base/splunk_hec_metrics.cue  | 2 +-
 website/cue/reference/components/sinks/base/statsd.cue          | 2 +-
 website/cue/reference/components/sinks/base/vector.cue          | 2 +-
 website/cue/reference/components/sinks/base/webhdfs.cue         | 2 +-
 47 files changed, 47 insertions(+), 47 deletions(-)

diff --git a/src/sinks/util/batch.rs b/src/sinks/util/batch.rs
index b6fdb77463704..e192360b3874a 100644
--- a/src/sinks/util/batch.rs
+++ b/src/sinks/util/batch.rs
@@ -101,7 +101,7 @@ where
     /// The maximum size of a batch that is processed by a sink.
     ///
     /// This is based on the uncompressed size of the batched events, before they are
-    /// serialized/compressed.
+    /// serialized or compressed.
     #[serde(default = "default_max_bytes::<D>")]
     #[configurable(metadata(docs::type_unit = "bytes"))]
     pub max_bytes: Option<usize>,
diff --git a/website/cue/reference/components/sinks/base/appsignal.cue b/website/cue/reference/components/sinks/base/appsignal.cue
index f786a1fa97acb..30ce8edf72077 100644
--- a/website/cue/reference/components/sinks/base/appsignal.cue
+++ b/website/cue/reference/components/sinks/base/appsignal.cue
@@ -36,7 +36,7 @@ base: components: sinks: appsignal: configuration: {
 					The maximum size of a batch that is processed by a sink.
 
 					This is based on the uncompressed size of the batched events, before they are
-					serialized/compressed.
+					serialized or compressed.
 					"""
 				required: false
 				type: uint: {
diff --git a/website/cue/reference/components/sinks/base/aws_cloudwatch_logs.cue b/website/cue/reference/components/sinks/base/aws_cloudwatch_logs.cue
index 7b53d05fa3455..e0f57c6ce0730 100644
--- a/website/cue/reference/components/sinks/base/aws_cloudwatch_logs.cue
+++ b/website/cue/reference/components/sinks/base/aws_cloudwatch_logs.cue
@@ -150,7 +150,7 @@ base: components: sinks: aws_cloudwatch_logs: configuration: {
 					The maximum size of a batch that is processed by a sink.
 
 					This is based on the uncompressed size of the batched events, before they are
-					serialized/compressed.
+					serialized or compressed.
 					"""
 				required: false
 				type: uint: {
diff --git a/website/cue/reference/components/sinks/base/aws_cloudwatch_metrics.cue b/website/cue/reference/components/sinks/base/aws_cloudwatch_metrics.cue
index c2ced75b95861..2f587a9ab0ae9 100644
--- a/website/cue/reference/components/sinks/base/aws_cloudwatch_metrics.cue
+++ b/website/cue/reference/components/sinks/base/aws_cloudwatch_metrics.cue
@@ -150,7 +150,7 @@ base: components: sinks: aws_cloudwatch_metrics: configuration: {
 					The maximum size of a batch that is processed by a sink.
 
 					This is based on the uncompressed size of the batched events, before they are
-					serialized/compressed.
+					serialized or compressed.
 					"""
 				required: false
 				type: uint: unit: "bytes"
diff --git a/website/cue/reference/components/sinks/base/aws_kinesis_firehose.cue b/website/cue/reference/components/sinks/base/aws_kinesis_firehose.cue
index b3319428648ba..66fc0c718bf69 100644
--- a/website/cue/reference/components/sinks/base/aws_kinesis_firehose.cue
+++ b/website/cue/reference/components/sinks/base/aws_kinesis_firehose.cue
@@ -150,7 +150,7 @@ base: components: sinks: aws_kinesis_firehose: configuration: {
 					The maximum size of a batch that is processed by a sink.
 
 					This is based on the uncompressed size of the batched events, before they are
-					serialized/compressed.
+					serialized or compressed.
 					"""
 				required: false
 				type: uint: {
diff --git a/website/cue/reference/components/sinks/base/aws_kinesis_streams.cue b/website/cue/reference/components/sinks/base/aws_kinesis_streams.cue
index fb53b59f1b3d1..fe0c944ef400d 100644
--- a/website/cue/reference/components/sinks/base/aws_kinesis_streams.cue
+++ b/website/cue/reference/components/sinks/base/aws_kinesis_streams.cue
@@ -150,7 +150,7 @@ base: components: sinks: aws_kinesis_streams: configuration: {
 					The maximum size of a batch that is processed by a sink.
 
 					This is based on the uncompressed size of the batched events, before they are
-					serialized/compressed.
+					serialized or compressed.
 					"""
 				required: false
 				type: uint: {
diff --git a/website/cue/reference/components/sinks/base/aws_s3.cue b/website/cue/reference/components/sinks/base/aws_s3.cue
index c7ebd5f2fe1ba..625daa2730ac5 100644
--- a/website/cue/reference/components/sinks/base/aws_s3.cue
+++ b/website/cue/reference/components/sinks/base/aws_s3.cue
@@ -225,7 +225,7 @@ base: components: sinks: aws_s3: configuration: {
 					The maximum size of a batch that is processed by a sink.
 
 					This is based on the uncompressed size of the batched events, before they are
-					serialized/compressed.
+					serialized or compressed.
 					"""
 				required: false
 				type: uint: {
diff --git a/website/cue/reference/components/sinks/base/axiom.cue b/website/cue/reference/components/sinks/base/axiom.cue
index 789be7e72085e..ce0f396bfac30 100644
--- a/website/cue/reference/components/sinks/base/axiom.cue
+++ b/website/cue/reference/components/sinks/base/axiom.cue
@@ -30,7 +30,7 @@ base: components: sinks: axiom: configuration: {
 					The maximum size of a batch that is processed by a sink.
 
 					This is based on the uncompressed size of the batched events, before they are
-					serialized/compressed.
+					serialized or compressed.
 					"""
 				required: false
 				type: uint: {
diff --git a/website/cue/reference/components/sinks/base/azure_blob.cue b/website/cue/reference/components/sinks/base/azure_blob.cue
index 08b9b6d6aa9c5..0bd8b0f494979 100644
--- a/website/cue/reference/components/sinks/base/azure_blob.cue
+++ b/website/cue/reference/components/sinks/base/azure_blob.cue
@@ -36,7 +36,7 @@ base: components: sinks: azure_blob: configuration: {
 					The maximum size of a batch that is processed by a sink.
 
 					This is based on the uncompressed size of the batched events, before they are
-					serialized/compressed.
+					serialized or compressed.
 					"""
 				required: false
 				type: uint: {
diff --git a/website/cue/reference/components/sinks/base/azure_monitor_logs.cue b/website/cue/reference/components/sinks/base/azure_monitor_logs.cue
index 18a81b5f0d122..bce585a0c5325 100644
--- a/website/cue/reference/components/sinks/base/azure_monitor_logs.cue
+++ b/website/cue/reference/components/sinks/base/azure_monitor_logs.cue
@@ -45,7 +45,7 @@ base: components: sinks: azure_monitor_logs: configuration: {
 					The maximum size of a batch that is processed by a sink.
 
 					This is based on the uncompressed size of the batched events, before they are
-					serialized/compressed.
+					serialized or compressed.
 					"""
 				required: false
 				type: uint: {
diff --git a/website/cue/reference/components/sinks/base/clickhouse.cue b/website/cue/reference/components/sinks/base/clickhouse.cue
index e93b7e417bf07..c472c8736c682 100644
--- a/website/cue/reference/components/sinks/base/clickhouse.cue
+++ b/website/cue/reference/components/sinks/base/clickhouse.cue
@@ -205,7 +205,7 @@ base: components: sinks: clickhouse: configuration: {
 					The maximum size of a batch that is processed by a sink.
 
 					This is based on the uncompressed size of the batched events, before they are
-					serialized/compressed.
+					serialized or compressed.
 					"""
 				required: false
 				type: uint: {
diff --git a/website/cue/reference/components/sinks/base/databend.cue b/website/cue/reference/components/sinks/base/databend.cue
index 54033a7968da8..0fa20d0dd1d62 100644
--- a/website/cue/reference/components/sinks/base/databend.cue
+++ b/website/cue/reference/components/sinks/base/databend.cue
@@ -200,7 +200,7 @@ base: components: sinks: databend: configuration: {
 					The maximum size of a batch that is processed by a sink.
 
 					This is based on the uncompressed size of the batched events, before they are
-					serialized/compressed.
+					serialized or compressed.
 					"""
 				required: false
 				type: uint: {
diff --git a/website/cue/reference/components/sinks/base/datadog_logs.cue b/website/cue/reference/components/sinks/base/datadog_logs.cue
index 5169c434610b8..7f9853614b4d9 100644
--- a/website/cue/reference/components/sinks/base/datadog_logs.cue
+++ b/website/cue/reference/components/sinks/base/datadog_logs.cue
@@ -36,7 +36,7 @@ base: components: sinks: datadog_logs: configuration: {
 					The maximum size of a batch that is processed by a sink.
 
 					This is based on the uncompressed size of the batched events, before they are
-					serialized/compressed.
+					serialized or compressed.
 					"""
 				required: false
 				type: uint: {
diff --git a/website/cue/reference/components/sinks/base/datadog_metrics.cue b/website/cue/reference/components/sinks/base/datadog_metrics.cue
index 1b4f0b3f68e53..8acd1569f57f5 100644
--- a/website/cue/reference/components/sinks/base/datadog_metrics.cue
+++ b/website/cue/reference/components/sinks/base/datadog_metrics.cue
@@ -36,7 +36,7 @@ base: components: sinks: datadog_metrics: configuration: {
 					The maximum size of a batch that is processed by a sink.
 
 					This is based on the uncompressed size of the batched events, before they are
-					serialized/compressed.
+					serialized or compressed.
 					"""
 				required: false
 				type: uint: unit: "bytes"
diff --git a/website/cue/reference/components/sinks/base/datadog_traces.cue b/website/cue/reference/components/sinks/base/datadog_traces.cue
index 05f0ab9b6d272..c60bd879e881e 100644
--- a/website/cue/reference/components/sinks/base/datadog_traces.cue
+++ b/website/cue/reference/components/sinks/base/datadog_traces.cue
@@ -36,7 +36,7 @@ base: components: sinks: datadog_traces: configuration: {
 					The maximum size of a batch that is processed by a sink.
 
 					This is based on the uncompressed size of the batched events, before they are
-					serialized/compressed.
+					serialized or compressed.
 					"""
 				required: false
 				type: uint: {
diff --git a/website/cue/reference/components/sinks/base/elasticsearch.cue b/website/cue/reference/components/sinks/base/elasticsearch.cue
index c2340f11a1340..aa29493a59583 100644
--- a/website/cue/reference/components/sinks/base/elasticsearch.cue
+++ b/website/cue/reference/components/sinks/base/elasticsearch.cue
@@ -231,7 +231,7 @@ base: components: sinks: elasticsearch: configuration: {
 					The maximum size of a batch that is processed by a sink.
 
 					This is based on the uncompressed size of the batched events, before they are
-					serialized/compressed.
+					serialized or compressed.
 					"""
 				required: false
 				type: uint: {
diff --git a/website/cue/reference/components/sinks/base/gcp_chronicle_unstructured.cue b/website/cue/reference/components/sinks/base/gcp_chronicle_unstructured.cue
index e99f99c3b23c2..1b9edc8daea52 100644
--- a/website/cue/reference/components/sinks/base/gcp_chronicle_unstructured.cue
+++ b/website/cue/reference/components/sinks/base/gcp_chronicle_unstructured.cue
@@ -52,7 +52,7 @@ base: components: sinks: gcp_chronicle_unstructured: configuration: {
 					The maximum size of a batch that is processed by a sink.
 
 					This is based on the uncompressed size of the batched events, before they are
-					serialized/compressed.
+					serialized or compressed.
 					"""
 				required: false
 				type: uint: {
diff --git a/website/cue/reference/components/sinks/base/gcp_cloud_storage.cue b/website/cue/reference/components/sinks/base/gcp_cloud_storage.cue
index aee9855b7fcf5..45e175ee58aee 100644
--- a/website/cue/reference/components/sinks/base/gcp_cloud_storage.cue
+++ b/website/cue/reference/components/sinks/base/gcp_cloud_storage.cue
@@ -107,7 +107,7 @@ base: components: sinks: gcp_cloud_storage: configuration: {
 					The maximum size of a batch that is processed by a sink.
 
 					This is based on the uncompressed size of the batched events, before they are
-					serialized/compressed.
+					serialized or compressed.
 					"""
 				required: false
 				type: uint: {
diff --git a/website/cue/reference/components/sinks/base/gcp_pubsub.cue b/website/cue/reference/components/sinks/base/gcp_pubsub.cue
index 2537ce1867417..17e23079783ae 100644
--- a/website/cue/reference/components/sinks/base/gcp_pubsub.cue
+++ b/website/cue/reference/components/sinks/base/gcp_pubsub.cue
@@ -52,7 +52,7 @@ base: components: sinks: gcp_pubsub: configuration: {
 					The maximum size of a batch that is processed by a sink.
 
 					This is based on the uncompressed size of the batched events, before they are
-					serialized/compressed.
+					serialized or compressed.
 					"""
 				required: false
 				type: uint: {
diff --git a/website/cue/reference/components/sinks/base/gcp_stackdriver_logs.cue b/website/cue/reference/components/sinks/base/gcp_stackdriver_logs.cue
index a2a1aa714bc30..e313a849aa81f 100644
--- a/website/cue/reference/components/sinks/base/gcp_stackdriver_logs.cue
+++ b/website/cue/reference/components/sinks/base/gcp_stackdriver_logs.cue
@@ -52,7 +52,7 @@ base: components: sinks: gcp_stackdriver_logs: configuration: {
 					The maximum size of a batch that is processed by a sink.
 
 					This is based on the uncompressed size of the batched events, before they are
-					serialized/compressed.
+					serialized or compressed.
 					"""
 				required: false
 				type: uint: {
diff --git a/website/cue/reference/components/sinks/base/gcp_stackdriver_metrics.cue b/website/cue/reference/components/sinks/base/gcp_stackdriver_metrics.cue
index 63157aa821a65..1e1703d6b0820 100644
--- a/website/cue/reference/components/sinks/base/gcp_stackdriver_metrics.cue
+++ b/website/cue/reference/components/sinks/base/gcp_stackdriver_metrics.cue
@@ -52,7 +52,7 @@ base: components: sinks: gcp_stackdriver_metrics: configuration: {
 					The maximum size of a batch that is processed by a sink.
 
 					This is based on the uncompressed size of the batched events, before they are
-					serialized/compressed.
+					serialized or compressed.
 					"""
 				required: false
 				type: uint: unit: "bytes"
diff --git a/website/cue/reference/components/sinks/base/greptimedb.cue b/website/cue/reference/components/sinks/base/greptimedb.cue
index 42f8739e7422b..29cd94ff45e41 100644
--- a/website/cue/reference/components/sinks/base/greptimedb.cue
+++ b/website/cue/reference/components/sinks/base/greptimedb.cue
@@ -36,7 +36,7 @@ base: components: sinks: greptimedb: configuration: {
 					The maximum size of a batch that is processed by a sink.
 
 					This is based on the uncompressed size of the batched events, before they are
-					serialized/compressed.
+					serialized or compressed.
 					"""
 				required: false
 				type: uint: unit: "bytes"
diff --git a/website/cue/reference/components/sinks/base/greptimedb_logs.cue b/website/cue/reference/components/sinks/base/greptimedb_logs.cue
index 5b55f78f86265..777f9890bab87 100644
--- a/website/cue/reference/components/sinks/base/greptimedb_logs.cue
+++ b/website/cue/reference/components/sinks/base/greptimedb_logs.cue
@@ -36,7 +36,7 @@ base: components: sinks: greptimedb_logs: configuration: {
 					The maximum size of a batch that is processed by a sink.
 
 					This is based on the uncompressed size of the batched events, before they are
-					serialized/compressed.
+					serialized or compressed.
 					"""
 				required: false
 				type: uint: unit: "bytes"
diff --git a/website/cue/reference/components/sinks/base/greptimedb_metrics.cue b/website/cue/reference/components/sinks/base/greptimedb_metrics.cue
index 6444afceb9aa9..be9d9ae854a7b 100644
--- a/website/cue/reference/components/sinks/base/greptimedb_metrics.cue
+++ b/website/cue/reference/components/sinks/base/greptimedb_metrics.cue
@@ -36,7 +36,7 @@ base: components: sinks: greptimedb_metrics: configuration: {
 					The maximum size of a batch that is processed by a sink.
 
 					This is based on the uncompressed size of the batched events, before they are
-					serialized/compressed.
+					serialized or compressed.
 					"""
 				required: false
 				type: uint: unit: "bytes"
diff --git a/website/cue/reference/components/sinks/base/honeycomb.cue b/website/cue/reference/components/sinks/base/honeycomb.cue
index d34c539436672..0834f68ac4aea 100644
--- a/website/cue/reference/components/sinks/base/honeycomb.cue
+++ b/website/cue/reference/components/sinks/base/honeycomb.cue
@@ -41,7 +41,7 @@ base: components: sinks: honeycomb: configuration: {
 					The maximum size of a batch that is processed by a sink.
 
 					This is based on the uncompressed size of the batched events, before they are
-					serialized/compressed.
+					serialized or compressed.
 					"""
 				required: false
 				type: uint: {
diff --git a/website/cue/reference/components/sinks/base/http.cue b/website/cue/reference/components/sinks/base/http.cue
index 402db85cfc8da..5cf6181e34e96 100644
--- a/website/cue/reference/components/sinks/base/http.cue
+++ b/website/cue/reference/components/sinks/base/http.cue
@@ -205,7 +205,7 @@ base: components: sinks: http: configuration: {
 					The maximum size of a batch that is processed by a sink.
 
 					This is based on the uncompressed size of the batched events, before they are
-					serialized/compressed.
+					serialized or compressed.
 					"""
 				required: false
 				type: uint: {
diff --git a/website/cue/reference/components/sinks/base/humio_logs.cue b/website/cue/reference/components/sinks/base/humio_logs.cue
index 3924d1c44735f..153dfa5324fdc 100644
--- a/website/cue/reference/components/sinks/base/humio_logs.cue
+++ b/website/cue/reference/components/sinks/base/humio_logs.cue
@@ -36,7 +36,7 @@ base: components: sinks: humio_logs: configuration: {
 					The maximum size of a batch that is processed by a sink.
 
 					This is based on the uncompressed size of the batched events, before they are
-					serialized/compressed.
+					serialized or compressed.
 					"""
 				required: false
 				type: uint: {
diff --git a/website/cue/reference/components/sinks/base/humio_metrics.cue b/website/cue/reference/components/sinks/base/humio_metrics.cue
index 89ff9ec8d5033..fd0e65f6daa6b 100644
--- a/website/cue/reference/components/sinks/base/humio_metrics.cue
+++ b/website/cue/reference/components/sinks/base/humio_metrics.cue
@@ -36,7 +36,7 @@ base: components: sinks: humio_metrics: configuration: {
 					The maximum size of a batch that is processed by a sink.
 
 					This is based on the uncompressed size of the batched events, before they are
-					serialized/compressed.
+					serialized or compressed.
 					"""
 				required: false
 				type: uint: {
diff --git a/website/cue/reference/components/sinks/base/influxdb_logs.cue b/website/cue/reference/components/sinks/base/influxdb_logs.cue
index 1667d06b84f83..f8885c040730f 100644
--- a/website/cue/reference/components/sinks/base/influxdb_logs.cue
+++ b/website/cue/reference/components/sinks/base/influxdb_logs.cue
@@ -36,7 +36,7 @@ base: components: sinks: influxdb_logs: configuration: {
 					The maximum size of a batch that is processed by a sink.
 
 					This is based on the uncompressed size of the batched events, before they are
-					serialized/compressed.
+					serialized or compressed.
 					"""
 				required: false
 				type: uint: {
diff --git a/website/cue/reference/components/sinks/base/influxdb_metrics.cue b/website/cue/reference/components/sinks/base/influxdb_metrics.cue
index 4f09582867523..093b79ba83e41 100644
--- a/website/cue/reference/components/sinks/base/influxdb_metrics.cue
+++ b/website/cue/reference/components/sinks/base/influxdb_metrics.cue
@@ -36,7 +36,7 @@ base: components: sinks: influxdb_metrics: configuration: {
 					The maximum size of a batch that is processed by a sink.
 
 					This is based on the uncompressed size of the batched events, before they are
-					serialized/compressed.
+					serialized or compressed.
 					"""
 				required: false
 				type: uint: unit: "bytes"
diff --git a/website/cue/reference/components/sinks/base/kafka.cue b/website/cue/reference/components/sinks/base/kafka.cue
index d43a10408c8b1..1f88e96d23741 100644
--- a/website/cue/reference/components/sinks/base/kafka.cue
+++ b/website/cue/reference/components/sinks/base/kafka.cue
@@ -36,7 +36,7 @@ base: components: sinks: kafka: configuration: {
 					The maximum size of a batch that is processed by a sink.
 
 					This is based on the uncompressed size of the batched events, before they are
-					serialized/compressed.
+					serialized or compressed.
 					"""
 				required: false
 				type: uint: unit: "bytes"
diff --git a/website/cue/reference/components/sinks/base/keep.cue b/website/cue/reference/components/sinks/base/keep.cue
index d7dfd13b4cfde..3cae9b1b1cbfe 100644
--- a/website/cue/reference/components/sinks/base/keep.cue
+++ b/website/cue/reference/components/sinks/base/keep.cue
@@ -41,7 +41,7 @@ base: components: sinks: keep: configuration: {
 					The maximum size of a batch that is processed by a sink.
 
 					This is based on the uncompressed size of the batched events, before they are
-					serialized/compressed.
+					serialized or compressed.
 					"""
 				required: false
 				type: uint: {
diff --git a/website/cue/reference/components/sinks/base/logdna.cue b/website/cue/reference/components/sinks/base/logdna.cue
index 075465a7916dc..63f3d81553417 100644
--- a/website/cue/reference/components/sinks/base/logdna.cue
+++ b/website/cue/reference/components/sinks/base/logdna.cue
@@ -41,7 +41,7 @@ base: components: sinks: logdna: configuration: {
 					The maximum size of a batch that is processed by a sink.
 
 					This is based on the uncompressed size of the batched events, before they are
-					serialized/compressed.
+					serialized or compressed.
 					"""
 				required: false
 				type: uint: {
diff --git a/website/cue/reference/components/sinks/base/loki.cue b/website/cue/reference/components/sinks/base/loki.cue
index e846d91dfb300..0641330c99865 100644
--- a/website/cue/reference/components/sinks/base/loki.cue
+++ b/website/cue/reference/components/sinks/base/loki.cue
@@ -205,7 +205,7 @@ base: components: sinks: loki: configuration: {
 					The maximum size of a batch that is processed by a sink.
 
 					This is based on the uncompressed size of the batched events, before they are
-					serialized/compressed.
+					serialized or compressed.
 					"""
 				required: false
 				type: uint: {
diff --git a/website/cue/reference/components/sinks/base/mezmo.cue b/website/cue/reference/components/sinks/base/mezmo.cue
index db22b664e657a..8a8eefb22732f 100644
--- a/website/cue/reference/components/sinks/base/mezmo.cue
+++ b/website/cue/reference/components/sinks/base/mezmo.cue
@@ -41,7 +41,7 @@ base: components: sinks: mezmo: configuration: {
 					The maximum size of a batch that is processed by a sink.
 
 					This is based on the uncompressed size of the batched events, before they are
-					serialized/compressed.
+					serialized or compressed.
 					"""
 				required: false
 				type: uint: {
diff --git a/website/cue/reference/components/sinks/base/new_relic.cue b/website/cue/reference/components/sinks/base/new_relic.cue
index e1e51404f4c2b..7e3895b02cd27 100644
--- a/website/cue/reference/components/sinks/base/new_relic.cue
+++ b/website/cue/reference/components/sinks/base/new_relic.cue
@@ -50,7 +50,7 @@ base: components: sinks: new_relic: configuration: {
 					The maximum size of a batch that is processed by a sink.
 
 					This is based on the uncompressed size of the batched events, before they are
-					serialized/compressed.
+					serialized or compressed.
 					"""
 				required: false
 				type: uint: {
diff --git a/website/cue/reference/components/sinks/base/opentelemetry.cue b/website/cue/reference/components/sinks/base/opentelemetry.cue
index de87314957157..4d7a2d4b5228d 100644
--- a/website/cue/reference/components/sinks/base/opentelemetry.cue
+++ b/website/cue/reference/components/sinks/base/opentelemetry.cue
@@ -208,7 +208,7 @@ base: components: sinks: opentelemetry: configuration: protocol: {
 						The maximum size of a batch that is processed by a sink.
 
 						This is based on the uncompressed size of the batched events, before they are
-						serialized/compressed.
+						serialized or compressed.
 						"""
 					required: false
 					type: uint: {
diff --git a/website/cue/reference/components/sinks/base/postgres.cue b/website/cue/reference/components/sinks/base/postgres.cue
index bc20d87ae14f2..d3fa9af9d9e52 100644
--- a/website/cue/reference/components/sinks/base/postgres.cue
+++ b/website/cue/reference/components/sinks/base/postgres.cue
@@ -47,7 +47,7 @@ base: components: sinks: postgres: configuration: {
 					The maximum size of a batch that is processed by a sink.
 
 					This is based on the uncompressed size of the batched events, before they are
-					serialized/compressed.
+					serialized or compressed.
 					"""
 				required: false
 				type: uint: {
diff --git a/website/cue/reference/components/sinks/base/prometheus_remote_write.cue b/website/cue/reference/components/sinks/base/prometheus_remote_write.cue
index 4ca726cbd445b..62b12a901aa80 100644
--- a/website/cue/reference/components/sinks/base/prometheus_remote_write.cue
+++ b/website/cue/reference/components/sinks/base/prometheus_remote_write.cue
@@ -216,7 +216,7 @@ base: components: sinks: prometheus_remote_write: configuration: {
 					The maximum size of a batch that is processed by a sink.
 
 					This is based on the uncompressed size of the batched events, before they are
-					serialized/compressed.
+					serialized or compressed.
 					"""
 				required: false
 				type: uint: unit: "bytes"
diff --git a/website/cue/reference/components/sinks/base/redis.cue b/website/cue/reference/components/sinks/base/redis.cue
index f958ee2f8c53d..e93567ba823fd 100644
--- a/website/cue/reference/components/sinks/base/redis.cue
+++ b/website/cue/reference/components/sinks/base/redis.cue
@@ -36,7 +36,7 @@ base: components: sinks: redis: configuration: {
 					The maximum size of a batch that is processed by a sink.
 
 					This is based on the uncompressed size of the batched events, before they are
-					serialized/compressed.
+					serialized or compressed.
 					"""
 				required: false
 				type: uint: unit: "bytes"
diff --git a/website/cue/reference/components/sinks/base/sematext_logs.cue b/website/cue/reference/components/sinks/base/sematext_logs.cue
index 502dbeda2a449..45e2e2962fc2c 100644
--- a/website/cue/reference/components/sinks/base/sematext_logs.cue
+++ b/website/cue/reference/components/sinks/base/sematext_logs.cue
@@ -36,7 +36,7 @@ base: components: sinks: sematext_logs: configuration: {
 					The maximum size of a batch that is processed by a sink.
 
 					This is based on the uncompressed size of the batched events, before they are
-					serialized/compressed.
+					serialized or compressed.
 					"""
 				required: false
 				type: uint: {
diff --git a/website/cue/reference/components/sinks/base/sematext_metrics.cue b/website/cue/reference/components/sinks/base/sematext_metrics.cue
index 9eb884a6707e3..c5d5571f2d4d2 100644
--- a/website/cue/reference/components/sinks/base/sematext_metrics.cue
+++ b/website/cue/reference/components/sinks/base/sematext_metrics.cue
@@ -36,7 +36,7 @@ base: components: sinks: sematext_metrics: configuration: {
 					The maximum size of a batch that is processed by a sink.
 
 					This is based on the uncompressed size of the batched events, before they are
-					serialized/compressed.
+					serialized or compressed.
 					"""
 				required: false
 				type: uint: unit: "bytes"
diff --git a/website/cue/reference/components/sinks/base/splunk_hec_logs.cue b/website/cue/reference/components/sinks/base/splunk_hec_logs.cue
index 5fc88d51533fc..0c8187c067592 100644
--- a/website/cue/reference/components/sinks/base/splunk_hec_logs.cue
+++ b/website/cue/reference/components/sinks/base/splunk_hec_logs.cue
@@ -77,7 +77,7 @@ base: components: sinks: splunk_hec_logs: configuration: {
 					The maximum size of a batch that is processed by a sink.
 
 					This is based on the uncompressed size of the batched events, before they are
-					serialized/compressed.
+					serialized or compressed.
 					"""
 				required: false
 				type: uint: {
diff --git a/website/cue/reference/components/sinks/base/splunk_hec_metrics.cue b/website/cue/reference/components/sinks/base/splunk_hec_metrics.cue
index 603e2dedb62d5..80376f7cfe0c0 100644
--- a/website/cue/reference/components/sinks/base/splunk_hec_metrics.cue
+++ b/website/cue/reference/components/sinks/base/splunk_hec_metrics.cue
@@ -63,7 +63,7 @@ base: components: sinks: splunk_hec_metrics: configuration: {
 					The maximum size of a batch that is processed by a sink.
 
 					This is based on the uncompressed size of the batched events, before they are
-					serialized/compressed.
+					serialized or compressed.
 					"""
 				required: false
 				type: uint: {
diff --git a/website/cue/reference/components/sinks/base/statsd.cue b/website/cue/reference/components/sinks/base/statsd.cue
index 485984af972ca..f411bf70f4df3 100644
--- a/website/cue/reference/components/sinks/base/statsd.cue
+++ b/website/cue/reference/components/sinks/base/statsd.cue
@@ -48,7 +48,7 @@ base: components: sinks: statsd: configuration: {
 					The maximum size of a batch that is processed by a sink.
 
 					This is based on the uncompressed size of the batched events, before they are
-					serialized/compressed.
+					serialized or compressed.
 					"""
 				required: false
 				type: uint: {
diff --git a/website/cue/reference/components/sinks/base/vector.cue b/website/cue/reference/components/sinks/base/vector.cue
index 85dd15172cd23..50c254bf90416 100644
--- a/website/cue/reference/components/sinks/base/vector.cue
+++ b/website/cue/reference/components/sinks/base/vector.cue
@@ -47,7 +47,7 @@ base: components: sinks: vector: configuration: {
 					The maximum size of a batch that is processed by a sink.
 
 					This is based on the uncompressed size of the batched events, before they are
-					serialized/compressed.
+					serialized or compressed.
 					"""
 				required: false
 				type: uint: unit: "bytes"
diff --git a/website/cue/reference/components/sinks/base/webhdfs.cue b/website/cue/reference/components/sinks/base/webhdfs.cue
index 4401e42da0b5c..a011bc24262e5 100644
--- a/website/cue/reference/components/sinks/base/webhdfs.cue
+++ b/website/cue/reference/components/sinks/base/webhdfs.cue
@@ -36,7 +36,7 @@ base: components: sinks: webhdfs: configuration: {
 					The maximum size of a batch that is processed by a sink.
 
 					This is based on the uncompressed size of the batched events, before they are
-					serialized/compressed.
+					serialized or compressed.
 					"""
 				required: false
 				type: uint: {

From a39d60acbfb60a3b740c3da45a3fadfc3e1052a4 Mon Sep 17 00:00:00 2001
From: StormStake <59213963+StormStake@users.noreply.github.com>
Date: Wed, 14 May 2025 12:42:31 -0500
Subject: [PATCH 003/305] feat(new source): Initial MQTT Source, #19931
 (#22752)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* wip

* add mqtt source cue reference

* add changelog

* Update src/sources/mqtt/config.rs

Co-authored-by: Stephen Wakely <stephen@lisp.space>

* rustfmt

* honor shutdown signa

* git rm .vscode/settings.json

* add deny warnings back

* use new_maybe_logs

* fix type, changelog, rename bad creds

* add fowllow up github issue

* common config WIP

* Consolidated MQTT error types

* More deduplication in MQTT error types

* Deduplicated MQTT connector type

* Formatting fixes for tests

* Fixed docs tests

* Fixed metrics and integration tests for MQTT

* Added to changelog authorship

* Fixed cue docs formating

* Formatting fix on errors

* Added topic metadata

---------

Co-authored-by: David Mládek <david.mladek.cz@gmail.com>
Co-authored-by: Stephen Wakely <stephen@lisp.space>
Co-authored-by: Pavlos Rontidis <pavlos.rontidis@gmail.com>
---
 Cargo.toml                                    |   4 +-
 changelog.d/19931_add_mqtt_source.feature.md  |   3 +
 scripts/integration/mqtt/test.yaml            |   1 +
 src/common/mod.rs                             |   4 +
 src/common/mqtt.rs                            | 123 ++++
 src/sinks/mqtt/config.rs                      |  77 +--
 src/sinks/mqtt/integration_tests.rs           |  10 +-
 src/sinks/mqtt/sink.rs                        |  43 +-
 src/sources/mod.rs                            |   2 +
 src/sources/mqtt/config.rs                    | 175 ++++++
 src/sources/mqtt/integration_tests.rs         | 117 ++++
 src/sources/mqtt/mod.rs                       |   5 +
 src/sources/mqtt/source.rs                    | 124 ++++
 src/sources/util/mod.rs                       |  12 +-
 .../reference/configuration/sources/mqtt.md   |  14 +
 .../reference/components/sinks/base/mqtt.cue  |   2 +-
 .../components/sources/base/mqtt.cue          | 584 ++++++++++++++++++
 .../cue/reference/components/sources/mqtt.cue |  99 +++
 18 files changed, 1296 insertions(+), 103 deletions(-)
 create mode 100644 changelog.d/19931_add_mqtt_source.feature.md
 create mode 100644 src/common/mqtt.rs
 create mode 100644 src/sources/mqtt/config.rs
 create mode 100644 src/sources/mqtt/integration_tests.rs
 create mode 100644 src/sources/mqtt/mod.rs
 create mode 100644 src/sources/mqtt/source.rs
 create mode 100644 website/content/en/docs/reference/configuration/sources/mqtt.md
 create mode 100644 website/cue/reference/components/sources/base/mqtt.cue
 create mode 100644 website/cue/reference/components/sources/mqtt.cue

diff --git a/Cargo.toml b/Cargo.toml
index fdbcfb5e25eed..42c75a7de7a8d 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -580,6 +580,7 @@ sources-logs = [
   "sources-kafka",
   "sources-kubernetes_logs",
   "sources-logstash",
+  "sources-mqtt",
   "sources-nats",
   "sources-opentelemetry",
   "sources-pulsar",
@@ -635,6 +636,7 @@ sources-kafka = ["dep:rdkafka"]
 sources-kubernetes_logs = ["vector-lib/file-source", "kubernetes", "transforms-reduce"]
 sources-logstash = ["sources-utils-net-tcp", "tokio-util/net"]
 sources-mongodb_metrics = ["dep:mongodb"]
+sources-mqtt = ["dep:rumqttc"]
 sources-nats = ["dep:async-nats", "dep:nkeys"]
 sources-nginx_metrics = ["dep:nom"]
 sources-opentelemetry = ["dep:hex", "vector-lib/opentelemetry", "dep:prost", "dep:prost-types", "sources-http_server", "sources-utils-http", "sources-utils-http-headers", "sources-vector"]
@@ -934,7 +936,7 @@ kafka-integration-tests = ["sinks-kafka", "sources-kafka"]
 logstash-integration-tests = ["docker", "sources-logstash"]
 loki-integration-tests = ["sinks-loki"]
 mongodb_metrics-integration-tests = ["sources-mongodb_metrics"]
-mqtt-integration-tests = ["sinks-mqtt"]
+mqtt-integration-tests = ["sinks-mqtt", "sources-mqtt"]
 nats-integration-tests = ["sinks-nats", "sources-nats"]
 nginx-integration-tests = ["sources-nginx_metrics"]
 opentelemetry-integration-tests = ["sources-opentelemetry", "dep:prost"]
diff --git a/changelog.d/19931_add_mqtt_source.feature.md b/changelog.d/19931_add_mqtt_source.feature.md
new file mode 100644
index 0000000000000..24e9dbebc6aed
--- /dev/null
+++ b/changelog.d/19931_add_mqtt_source.feature.md
@@ -0,0 +1,3 @@
+Adds a new `mqtt` source enabling Vector to receive logs from a MQTT broker.
+
+authors: mladedav pront StormStake
diff --git a/scripts/integration/mqtt/test.yaml b/scripts/integration/mqtt/test.yaml
index 607da45eeb5e1..ec0c637e094d1 100644
--- a/scripts/integration/mqtt/test.yaml
+++ b/scripts/integration/mqtt/test.yaml
@@ -10,3 +10,4 @@ paths:
 - "src/internal_events/mqtt.rs"
 - "src/sinks/mqtt/**"
 - "src/sinks/util/**"
+- "src/sources/mqtt/**"
diff --git a/src/common/mod.rs b/src/common/mod.rs
index cfaf80c4f9354..9caf79b8c7fbd 100644
--- a/src/common/mod.rs
+++ b/src/common/mod.rs
@@ -18,6 +18,10 @@ pub(crate) mod sqs;
 #[cfg(any(feature = "sources-aws_s3", feature = "sinks-aws_s3"))]
 pub(crate) mod s3;
 
+#[cfg(any(feature = "sources-mqtt", feature = "sinks-mqtt",))]
+/// Common MQTT configuration shared by MQTT components.
+pub mod mqtt;
+
 #[cfg(any(feature = "transforms-log_to_metric", feature = "sinks-loki"))]
 pub(crate) mod expansion;
 
diff --git a/src/common/mqtt.rs b/src/common/mqtt.rs
new file mode 100644
index 0000000000000..35f3c27812bcc
--- /dev/null
+++ b/src/common/mqtt.rs
@@ -0,0 +1,123 @@
+use rumqttc::{AsyncClient, EventLoop, MqttOptions};
+use snafu::Snafu;
+use vector_config_macros::configurable_component;
+use vector_lib::tls::{TlsEnableableConfig, TlsError};
+
+use crate::template::TemplateParseError;
+
+/// Shared MQTT configuration for sources and sinks.
+#[configurable_component]
+#[derive(Clone, Debug, Derivative)]
+#[derivative(Default)]
+#[serde(deny_unknown_fields)]
+pub struct MqttCommonConfig {
+    /// MQTT server address (The broker’s domain name or IP address).
+    #[configurable(metadata(docs::examples = "mqtt.example.com", docs::examples = "127.0.0.1"))]
+    pub host: String,
+
+    /// TCP port of the MQTT server to connect to.
+    #[configurable(derived)]
+    #[serde(default = "default_port")]
+    #[derivative(Default(value = "default_port()"))]
+    pub port: u16,
+
+    /// MQTT username.
+    #[serde(default)]
+    #[configurable(derived)]
+    pub user: Option<String>,
+
+    /// MQTT password.
+    #[serde(default)]
+    #[configurable(derived)]
+    pub password: Option<String>,
+
+    /// MQTT client ID.
+    #[serde(default)]
+    #[configurable(derived)]
+    pub client_id: Option<String>,
+
+    /// Connection keep-alive interval.
+    #[serde(default = "default_keep_alive")]
+    #[derivative(Default(value = "default_keep_alive()"))]
+    pub keep_alive: u16,
+
+    /// TLS configuration.
+    #[configurable(derived)]
+    pub tls: Option<TlsEnableableConfig>,
+}
+
+const fn default_port() -> u16 {
+    1883
+}
+
+const fn default_keep_alive() -> u16 {
+    60
+}
+
+/// MQTT Error Types
+#[derive(Debug, Snafu)]
+#[snafu(visibility(pub))]
+pub enum MqttError {
+    /// Topic template parsing failed
+    #[snafu(display("invalid topic template: {source}"))]
+    TopicTemplate {
+        /// Source of error
+        source: TemplateParseError,
+    },
+    /// TLS error
+    #[snafu(display("TLS error: {source}"))]
+    Tls {
+        /// Source of error
+        source: TlsError,
+    },
+    /// Configuration error
+    #[snafu(display("MQTT configuration error: {source}"))]
+    Configuration {
+        /// Source of error
+        source: ConfigurationError,
+    },
+}
+
+/// MQTT Configuration error types
+#[derive(Clone, Debug, Eq, PartialEq, Snafu)]
+pub enum ConfigurationError {
+    /// Empty client ID error
+    #[snafu(display("Client ID is not allowed to be empty."))]
+    EmptyClientId,
+    /// Invalid credentials provided error
+    #[snafu(display("Username and password must be either both provided or both missing."))]
+    InvalidCredentials,
+    /// Invalid client ID provied error
+    #[snafu(display(
+        "Client ID must be 1-23 characters long and must consist of only alphanumeric characters."
+    ))]
+    InvalidClientId,
+    /// Credentials provided were incomplete
+    #[snafu(display("Username and password must be either both or neither provided."))]
+    IncompleteCredentials,
+}
+
+#[derive(Clone)]
+/// Mqtt connector wrapper
+pub struct MqttConnector {
+    /// Mqtt connection options
+    pub options: MqttOptions,
+}
+
+impl MqttConnector {
+    /// Creates a new MqttConnector
+    pub const fn new(options: MqttOptions) -> Self {
+        Self { options }
+    }
+
+    /// Connects the connector and generates a client and eventloop
+    pub fn connect(&self) -> (AsyncClient, EventLoop) {
+        let (client, eventloop) = AsyncClient::new(self.options.clone(), 1024);
+        (client, eventloop)
+    }
+
+    /// TODO: Right now there is no way to implement the healthcheck properly: <https://github.com/bytebeamio/rumqtt/issues/562>
+    pub async fn healthcheck(&self) -> crate::Result<()> {
+        Ok(())
+    }
+}
diff --git a/src/sinks/mqtt/config.rs b/src/sinks/mqtt/config.rs
index a518375a7f584..8c67c4acadf76 100644
--- a/src/sinks/mqtt/config.rs
+++ b/src/sinks/mqtt/config.rs
@@ -2,53 +2,32 @@ use std::time::Duration;
 
 use rand::Rng;
 use rumqttc::{MqttOptions, QoS, TlsConfiguration, Transport};
-use snafu::{ResultExt, Snafu};
+use snafu::ResultExt;
 use vector_lib::codecs::JsonSerializerConfig;
 
 use crate::template::Template;
 use crate::{
     codecs::EncodingConfig,
-    config::{AcknowledgementsConfig, Input, SinkConfig, SinkContext},
-    sinks::{
-        mqtt::sink::{ConfigurationSnafu, MqttConnector, MqttError, MqttSink, TlsSnafu},
-        prelude::*,
-        Healthcheck, VectorSink,
+    common::mqtt::{
+        ConfigurationError, ConfigurationSnafu, MqttCommonConfig, MqttConnector, MqttError,
+        TlsSnafu,
     },
-    tls::{MaybeTlsSettings, TlsEnableableConfig},
+    config::{AcknowledgementsConfig, Input, SinkConfig, SinkContext},
+    sinks::{mqtt::sink::MqttSink, prelude::*, Healthcheck, VectorSink},
+    tls::MaybeTlsSettings,
 };
 
 /// Configuration for the `mqtt` sink
 #[configurable_component(sink("mqtt"))]
 #[derive(Clone, Debug)]
 pub struct MqttSinkConfig {
-    /// MQTT server address (The broker’s domain name or IP address).
-    #[configurable(metadata(docs::examples = "mqtt.example.com", docs::examples = "127.0.0.1"))]
-    pub host: String,
-
-    /// TCP port of the MQTT server to connect to.
-    #[serde(default = "default_port")]
-    pub port: u16,
-
-    /// MQTT username.
-    pub user: Option<String>,
-
-    /// MQTT password.
-    pub password: Option<String>,
-
-    /// MQTT client ID.
-    pub client_id: Option<String>,
-
-    /// Connection keep-alive interval.
-    #[serde(default = "default_keep_alive")]
-    pub keep_alive: u16,
+    #[serde(flatten)]
+    pub common: MqttCommonConfig,
 
     /// If set to true, the MQTT session is cleaned on login.
     #[serde(default = "default_clean_session")]
     pub clean_session: bool,
 
-    #[configurable(derived)]
-    pub tls: Option<TlsEnableableConfig>,
-
     /// MQTT publish topic (templates allowed)
     pub topic: Template,
 
@@ -100,14 +79,6 @@ impl From<MqttQoS> for QoS {
     }
 }
 
-const fn default_port() -> u16 {
-    1883
-}
-
-const fn default_keep_alive() -> u16 {
-    60
-}
-
 const fn default_clean_session() -> bool {
     false
 }
@@ -123,14 +94,9 @@ const fn default_retain() -> bool {
 impl Default for MqttSinkConfig {
     fn default() -> Self {
         Self {
-            host: "localhost".into(),
-            port: default_port(),
-            user: None,
-            password: None,
-            client_id: None,
-            keep_alive: default_keep_alive(),
+            common: MqttCommonConfig::default(),
             clean_session: default_clean_session(),
-            tls: None,
+
             topic: Template::try_from("vector").expect("Cannot parse as a template"),
             retain: default_retain(),
             encoding: JsonSerializerConfig::default().into(),
@@ -164,17 +130,9 @@ impl SinkConfig for MqttSinkConfig {
     }
 }
 
-#[derive(Clone, Debug, Eq, PartialEq, Snafu)]
-pub enum ConfigurationError {
-    #[snafu(display("Client ID is not allowed to be empty."))]
-    EmptyClientId,
-    #[snafu(display("Username and password must be either both provided or both missing."))]
-    InvalidCredentials,
-}
-
 impl MqttSinkConfig {
     fn build_connector(&self) -> Result<MqttConnector, MqttError> {
-        let client_id = self.client_id.clone().unwrap_or_else(|| {
+        let client_id = self.common.client_id.clone().unwrap_or_else(|| {
             let hash = rand::rng()
                 .sample_iter(&rand_distr::Alphanumeric)
                 .take(6)
@@ -186,11 +144,12 @@ impl MqttSinkConfig {
         if client_id.is_empty() {
             return Err(ConfigurationError::EmptyClientId).context(ConfigurationSnafu);
         }
-        let tls = MaybeTlsSettings::from_config(self.tls.as_ref(), false).context(TlsSnafu)?;
-        let mut options = MqttOptions::new(&client_id, &self.host, self.port);
-        options.set_keep_alive(Duration::from_secs(self.keep_alive.into()));
+        let tls =
+            MaybeTlsSettings::from_config(self.common.tls.as_ref(), false).context(TlsSnafu)?;
+        let mut options = MqttOptions::new(&client_id, &self.common.host, self.common.port);
+        options.set_keep_alive(Duration::from_secs(self.common.keep_alive.into()));
         options.set_clean_session(self.clean_session);
-        match (&self.user, &self.password) {
+        match (&self.common.user, &self.common.password) {
             (Some(user), Some(password)) => {
                 options.set_credentials(user, password);
             }
@@ -211,7 +170,7 @@ impl MqttSinkConfig {
                 alpn,
             }));
         }
-        MqttConnector::new(options, self.topic.to_string())
+        Ok(MqttConnector::new(options))
     }
 }
 
diff --git a/src/sinks/mqtt/integration_tests.rs b/src/sinks/mqtt/integration_tests.rs
index cce25c0b81b10..6ef78bdeb9cb3 100644
--- a/src/sinks/mqtt/integration_tests.rs
+++ b/src/sinks/mqtt/integration_tests.rs
@@ -1,3 +1,4 @@
+use crate::common::mqtt::MqttCommonConfig;
 use crate::config::{SinkConfig, SinkContext};
 use crate::sinks::mqtt::config::MqttQoS;
 use crate::sinks::mqtt::MqttSinkConfig;
@@ -25,16 +26,21 @@ async fn mqtt_happy() {
     trace_init();
 
     let topic = "test";
-    let cnf = MqttSinkConfig {
+    let common = MqttCommonConfig {
         host: mqtt_broker_address(),
         port: mqtt_broker_port(),
+        ..Default::default()
+    };
+
+    let config = MqttSinkConfig {
+        common,
         topic: Template::try_from(topic).expect("Cannot parse the topic template"),
         quality_of_service: MqttQoS::AtLeastOnce,
         ..Default::default()
     };
 
     let cx = SinkContext::default();
-    let (sink, healthcheck) = cnf.build(cx).await.expect("Cannot build the sink");
+    let (sink, healthcheck) = config.build(cx).await.expect("Cannot build the sink");
     healthcheck.await.expect("Health check failed");
 
     // prepare consumer
diff --git a/src/sinks/mqtt/sink.rs b/src/sinks/mqtt/sink.rs
index d220cf8af2d40..a0f07e3f97151 100644
--- a/src/sinks/mqtt/sink.rs
+++ b/src/sinks/mqtt/sink.rs
@@ -1,56 +1,22 @@
 use async_trait::async_trait;
 use futures::{stream::BoxStream, StreamExt};
-use rumqttc::{AsyncClient, EventLoop, MqttOptions};
-use snafu::{ResultExt, Snafu};
-use vector_lib::tls::TlsError;
 
+use crate::common::mqtt::MqttConnector;
 use crate::internal_events::MqttConnectionError;
 use crate::sinks::prelude::*;
 
 use super::{
-    config::{ConfigurationError, MqttQoS},
+    config::MqttQoS,
     request_builder::{MqttEncoder, MqttRequestBuilder},
     service::MqttService,
     MqttSinkConfig,
 };
 
-#[derive(Debug, Snafu)]
-#[snafu(visibility(pub))]
-pub enum MqttError {
-    #[snafu(display("invalid topic template: {}", source))]
-    TopicTemplate { source: TemplateParseError },
-    #[snafu(display("TLS error: {}", source))]
-    Tls { source: TlsError },
-    #[snafu(display("MQTT configuration error: {}", source))]
-    Configuration { source: ConfigurationError },
-}
-
-#[derive(Clone)]
-pub struct MqttConnector {
-    options: MqttOptions,
-    topic: Template,
-}
-
-impl MqttConnector {
-    pub fn new(options: MqttOptions, topic: String) -> Result<Self, MqttError> {
-        let topic = Template::try_from(topic).context(TopicTemplateSnafu)?;
-        Ok(Self { options, topic })
-    }
-
-    fn connect(&self) -> (AsyncClient, EventLoop) {
-        AsyncClient::new(self.options.clone(), 1024)
-    }
-
-    pub async fn healthcheck(&self) -> crate::Result<()> {
-        // TODO: Right now there is no way to implement the healthcheck properly: https://github.com/bytebeamio/rumqtt/issues/562
-        Ok(())
-    }
-}
-
 pub struct MqttSink {
     transformer: Transformer,
     encoder: Encoder<()>,
     connector: MqttConnector,
+    topic: Template,
     quality_of_service: MqttQoS,
     retain: bool,
 }
@@ -64,12 +30,14 @@ impl MqttSink {
     pub fn new(config: &MqttSinkConfig, connector: MqttConnector) -> crate::Result<Self> {
         let transformer = config.encoding.transformer();
         let serializer = config.encoding.build()?;
+        let topic = config.topic.clone();
         let encoder = Encoder::<()>::new(serializer);
 
         Ok(Self {
             transformer,
             encoder,
             connector,
+            topic,
             quality_of_service: config.quality_of_service,
             retain: config.retain,
         })
@@ -77,7 +45,6 @@ impl MqttSink {
 
     fn make_mqtt_event(&self, event: Event) -> Option<MqttEvent> {
         let topic = self
-            .connector
             .topic
             .render_string(&event)
             .map_err(|missing_keys| {
diff --git a/src/sources/mod.rs b/src/sources/mod.rs
index 8a86d9d6343d0..91e6c333d3705 100644
--- a/src/sources/mod.rs
+++ b/src/sources/mod.rs
@@ -58,6 +58,8 @@ pub mod kubernetes_logs;
 pub mod logstash;
 #[cfg(feature = "sources-mongodb_metrics")]
 pub mod mongodb_metrics;
+#[cfg(feature = "sources-mqtt")]
+pub mod mqtt;
 #[cfg(feature = "sources-nats")]
 pub mod nats;
 #[cfg(feature = "sources-nginx_metrics")]
diff --git a/src/sources/mqtt/config.rs b/src/sources/mqtt/config.rs
new file mode 100644
index 0000000000000..4e8c7187edd3a
--- /dev/null
+++ b/src/sources/mqtt/config.rs
@@ -0,0 +1,175 @@
+use std::time::Duration;
+
+use rand::Rng;
+use rumqttc::{MqttOptions, TlsConfiguration, Transport};
+use snafu::ResultExt;
+use vector_lib::{
+    codecs::decoding::{DeserializerConfig, FramingConfig},
+    config::{LegacyKey, LogNamespace},
+    configurable::configurable_component,
+    lookup::lookup_v2::OptionalValuePath,
+    lookup::owned_value_path,
+    tls::MaybeTlsSettings,
+};
+use vrl::value::Kind;
+
+use crate::{
+    codecs::DecodingConfig,
+    common::mqtt::{
+        ConfigurationError, ConfigurationSnafu, MqttCommonConfig, MqttConnector, MqttError,
+        TlsSnafu,
+    },
+    config::{SourceConfig, SourceContext, SourceOutput},
+    serde::{default_decoding, default_framing_message_based},
+};
+
+use super::source::MqttSource;
+
+/// Configuration for the `mqtt` source.
+#[configurable_component(source("mqtt", "Collect logs from MQTT."))]
+#[derive(Clone, Debug, Derivative)]
+#[derivative(Default)]
+#[serde(deny_unknown_fields)]
+pub struct MqttSourceConfig {
+    #[serde(flatten)]
+    pub common: MqttCommonConfig,
+
+    /// MQTT topic from which messages are to be read.
+    #[configurable(derived)]
+    #[serde(default = "default_topic")]
+    #[derivative(Default(value = "default_topic()"))]
+    pub topic: String,
+
+    #[configurable(derived)]
+    #[serde(default = "default_framing_message_based")]
+    #[derivative(Default(value = "default_framing_message_based()"))]
+    pub framing: FramingConfig,
+
+    #[configurable(derived)]
+    #[serde(default = "default_decoding")]
+    #[derivative(Default(value = "default_decoding()"))]
+    pub decoding: DeserializerConfig,
+
+    /// The namespace to use for logs. This overrides the global setting.
+    #[configurable(metadata(docs::hidden))]
+    #[serde(default)]
+    pub log_namespace: Option<bool>,
+
+    /// Overrides the name of the log field used to add the topic to each event.
+    ///
+    /// The value is the topic from which the MQTT message was published to.
+    ///
+    /// By default, `"topic"` is used.
+    #[serde(default = "default_topic_key")]
+    #[configurable(metadata(docs::examples = "topic"))]
+    pub topic_key: OptionalValuePath,
+}
+
+fn default_topic() -> String {
+    "vector".to_owned()
+}
+
+fn default_topic_key() -> OptionalValuePath {
+    OptionalValuePath::from(owned_value_path!("topic"))
+}
+
+#[async_trait::async_trait]
+#[typetag::serde(name = "mqtt")]
+impl SourceConfig for MqttSourceConfig {
+    async fn build(&self, cx: SourceContext) -> crate::Result<crate::sources::Source> {
+        let log_namespace = cx.log_namespace(self.log_namespace);
+
+        let connector = self.build_connector()?;
+
+        let decoder =
+            DecodingConfig::new(self.framing.clone(), self.decoding.clone(), log_namespace)
+                .build()?;
+
+        let sink = MqttSource::new(connector.clone(), decoder, log_namespace, self.clone())?;
+        Ok(Box::pin(sink.run(cx.out, cx.shutdown)))
+    }
+
+    fn outputs(&self, global_log_namespace: LogNamespace) -> Vec<SourceOutput> {
+        let schema_definition = self
+            .decoding
+            .schema_definition(global_log_namespace.merge(self.log_namespace))
+            .with_standard_vector_source_metadata()
+            .with_source_metadata(
+                Self::NAME,
+                Some(LegacyKey::Overwrite(owned_value_path!("timestamp"))),
+                &owned_value_path!("timestamp"),
+                Kind::timestamp().or_undefined(),
+                Some("timestamp"),
+            );
+
+        vec![SourceOutput::new_maybe_logs(
+            self.decoding.output_type(),
+            schema_definition,
+        )]
+    }
+
+    fn can_acknowledge(&self) -> bool {
+        false
+    }
+}
+
+impl MqttSourceConfig {
+    fn build_connector(&self) -> Result<MqttConnector, MqttError> {
+        let client_id = self.common.client_id.clone().unwrap_or_else(|| {
+            let hash = rand::rng()
+                .sample_iter(&rand_distr::Alphanumeric)
+                .take(6)
+                .map(char::from)
+                .collect::<String>();
+            format!("vectorSource{hash}")
+        });
+
+        if client_id.is_empty() {
+            return Err(ConfigurationError::InvalidClientId).context(ConfigurationSnafu);
+        }
+
+        let tls =
+            MaybeTlsSettings::from_config(self.common.tls.as_ref(), false).context(TlsSnafu)?;
+        let mut options = MqttOptions::new(client_id, &self.common.host, self.common.port);
+        options.set_keep_alive(Duration::from_secs(self.common.keep_alive.into()));
+
+        options.set_clean_session(false);
+        match (&self.common.user, &self.common.password) {
+            (Some(user), Some(password)) => {
+                options.set_credentials(user, password);
+            }
+            (None, None) => {
+                // Credentials were not provided
+            }
+            _ => {
+                // We need either both username and password, or neither. MQTT also allows for providing only password, but rumqttc does not allow that so we cannot either.
+                return Err(ConfigurationError::IncompleteCredentials).context(ConfigurationSnafu);
+            }
+        }
+
+        if let Some(tls) = tls.tls() {
+            let ca = tls.authorities_pem().flatten().collect();
+            let client_auth = None;
+            let alpn = Some(vec!["mqtt".into()]);
+            options.set_transport(Transport::Tls(TlsConfiguration::Simple {
+                ca,
+                client_auth,
+                alpn,
+            }));
+        }
+
+        Ok(MqttConnector::new(options))
+    }
+}
+
+impl_generate_config_from_default!(MqttSourceConfig);
+
+#[cfg(test)]
+mod test {
+    use super::*;
+
+    #[test]
+    fn generate_config() {
+        crate::test_util::test_generate_config::<MqttSourceConfig>();
+    }
+}
diff --git a/src/sources/mqtt/integration_tests.rs b/src/sources/mqtt/integration_tests.rs
new file mode 100644
index 0000000000000..cdc2c41fde5ab
--- /dev/null
+++ b/src/sources/mqtt/integration_tests.rs
@@ -0,0 +1,117 @@
+#![cfg(feature = "mqtt-integration-tests")]
+#![cfg(test)]
+
+use crate::common::mqtt::MqttCommonConfig;
+use crate::test_util::trace_init;
+use crate::test_util::{components::SOURCE_TAGS, random_lines_with_stream, random_string};
+use rumqttc::{AsyncClient, MqttOptions, QoS};
+use std::{collections::HashSet, time::Duration};
+
+use futures::StreamExt;
+use tokio::time::timeout;
+
+use super::MqttSourceConfig;
+use crate::{
+    config::{log_schema, SourceConfig, SourceContext},
+    event::Event,
+    test_util::components::assert_source_compliance,
+    SourceSender,
+};
+
+fn mqtt_broker_address() -> String {
+    std::env::var("MQTT_BROKER_ADDRESS").unwrap_or_else(|_| "emqx".into())
+}
+
+fn mqtt_broker_port() -> u16 {
+    std::env::var("MQTT_BROKER_PORT")
+        .unwrap_or_else(|_| "1883".into())
+        .parse::<u16>()
+        .expect("Cannot parse as u16")
+}
+
+async fn send_test_events(client: &AsyncClient, topic: &str, messages: &Vec<String>) {
+    for message in messages {
+        client
+            .publish(topic, QoS::AtLeastOnce, false, message.as_bytes())
+            .await
+            .unwrap();
+    }
+}
+
+async fn get_mqtt_client() -> AsyncClient {
+    let mut mqtt_options = MqttOptions::new(
+        "integration-test-producer",
+        mqtt_broker_address(),
+        mqtt_broker_port(),
+    );
+    mqtt_options.set_keep_alive(Duration::from_secs(5));
+
+    let (client, mut eventloop) = AsyncClient::new(mqtt_options, 10);
+
+    tokio::spawn(async move {
+        loop {
+            eventloop.poll().await.unwrap();
+        }
+    });
+
+    client
+}
+
+#[tokio::test]
+async fn mqtt_happy() {
+    trace_init();
+    let topic = "source-test";
+    // We always want new client ID. If it were stable, subsequent tests could receive data sent in previous runs.
+    let client_id = format!("sourceTest{}", random_string(6));
+    let num_events = 10;
+    let (input, _events) = random_lines_with_stream(100, num_events, None);
+
+    assert_source_compliance(&SOURCE_TAGS, async {
+        let common = MqttCommonConfig {
+            host: mqtt_broker_address(),
+            port: mqtt_broker_port(),
+            client_id: Some(client_id),
+            ..Default::default()
+        };
+
+        let config = MqttSourceConfig {
+            common,
+            topic: topic.to_owned(),
+            ..MqttSourceConfig::default()
+        };
+
+        let (tx, rx) = SourceSender::new_test();
+        tokio::spawn(async move {
+            config
+                .build(SourceContext::new_test(tx, None))
+                .await
+                .unwrap()
+                .await
+                .unwrap()
+        });
+
+        tokio::time::sleep(Duration::from_millis(100)).await;
+
+        let client = get_mqtt_client().await;
+        send_test_events(&client, topic, &input).await;
+
+        let mut expected_messages: HashSet<_> = input.into_iter().collect();
+
+        let events: Vec<Event> = timeout(Duration::from_secs(2), rx.take(num_events).collect())
+            .await
+            .unwrap();
+
+        for event in events {
+            let message = event
+                .as_log()
+                .get(log_schema().message_key_target_path().unwrap())
+                .unwrap()
+                .to_string_lossy();
+            if !expected_messages.remove(message.as_ref()) {
+                panic!("Received unexpected message: {:?}", message);
+            }
+        }
+        assert!(expected_messages.is_empty());
+    })
+    .await;
+}
diff --git a/src/sources/mqtt/mod.rs b/src/sources/mqtt/mod.rs
new file mode 100644
index 0000000000000..a1cd149779be8
--- /dev/null
+++ b/src/sources/mqtt/mod.rs
@@ -0,0 +1,5 @@
+mod config;
+mod integration_tests;
+mod source;
+
+pub use config::MqttSourceConfig;
diff --git a/src/sources/mqtt/source.rs b/src/sources/mqtt/source.rs
new file mode 100644
index 0000000000000..62b379a75812a
--- /dev/null
+++ b/src/sources/mqtt/source.rs
@@ -0,0 +1,124 @@
+use itertools::Itertools;
+use vector_lib::config::LogNamespace;
+use vector_lib::internal_event::EventsReceived;
+
+use crate::{
+    codecs::Decoder,
+    common::mqtt::MqttConnector,
+    event::BatchNotifier,
+    event::Event,
+    internal_events::{EndpointBytesReceived, StreamClosedError},
+    shutdown::ShutdownSignal,
+    sources::mqtt::MqttSourceConfig,
+    sources::util,
+    SourceSender,
+};
+use rumqttc::{Event as MqttEvent, Incoming, Publish, QoS};
+use vector_lib::config::LegacyKey;
+use vector_lib::lookup::path;
+
+pub struct MqttSource {
+    connector: MqttConnector,
+    decoder: Decoder,
+    log_namespace: LogNamespace,
+    config: MqttSourceConfig,
+}
+
+impl MqttSource {
+    pub fn new(
+        connector: MqttConnector,
+        decoder: Decoder,
+        log_namespace: LogNamespace,
+        config: MqttSourceConfig,
+    ) -> crate::Result<Self> {
+        Ok(Self {
+            connector,
+            decoder,
+            log_namespace,
+            config,
+        })
+    }
+
+    pub async fn run(self, mut out: SourceSender, shutdown: ShutdownSignal) -> Result<(), ()> {
+        let (client, mut connection) = self.connector.connect();
+
+        client
+            .subscribe(&self.config.topic, QoS::AtLeastOnce)
+            .await
+            .map_err(|_| ())?;
+
+        loop {
+            tokio::select! {
+                _ = shutdown.clone() => return Ok(()),
+                mqtt_event = connection.poll() => {
+                    // If an error is returned here there is currently no way to tie this back
+                    // to the event that was posted which means we can't accurately provide
+                    // delivery guarantees.
+                    // We need this issue resolved first:
+                    // https://github.com/bytebeamio/rumqtt/issues/349
+                    match mqtt_event {
+                        Ok(MqttEvent::Incoming(Incoming::Publish(publish))) => {
+                            self.process_message(publish, &mut out).await;
+                        }
+                        Ok(MqttEvent::Incoming(
+                            Incoming::PubAck(_) | Incoming::PubRec(_) | Incoming::PubComp(_),
+                        )) => {
+                            // TODO Handle acknowledgement - https://github.com/vectordotdev/vector/issues/21967
+                        }
+                        _ => {}
+                    }
+                }
+            }
+        }
+    }
+
+    async fn process_message(&self, publish: Publish, out: &mut SourceSender) {
+        emit!(EndpointBytesReceived {
+            byte_size: publish.payload.len(),
+            protocol: "mqtt",
+            endpoint: &self.connector.options.broker_address().0,
+        });
+        let events_received = register!(EventsReceived);
+
+        let (batch, _batch_receiver) = BatchNotifier::maybe_new_with_receiver(false);
+        // Error is logged by `crate::codecs::Decoder`, no further handling
+        // is needed here.
+        let decoded = util::decode_message(
+            self.decoder.clone(),
+            "mqtt",
+            &publish.payload,
+            None,
+            &batch,
+            self.log_namespace,
+            &events_received,
+        )
+        .map(|mut event| {
+            self.apply_metadata(&publish, &mut event);
+            event
+        })
+        .collect_vec();
+
+        let count = decoded.len();
+
+        match out.send_batch(decoded).await {
+            Ok(()) => {}
+            Err(_) => emit!(StreamClosedError { count }),
+        }
+    }
+
+    fn apply_metadata(&self, publish: &Publish, event: &mut Event) {
+        if let Event::Log(ref mut log) = event {
+            self.log_namespace.insert_source_metadata(
+                MqttSourceConfig::NAME,
+                log,
+                self.config
+                    .topic_key
+                    .path
+                    .as_ref()
+                    .map(LegacyKey::Overwrite),
+                path!("topic"),
+                publish.topic.clone(),
+            );
+        }
+    }
+}
diff --git a/src/sources/util/mod.rs b/src/sources/util/mod.rs
index 45e773316c4cb..f7e103d2dd848 100644
--- a/src/sources/util/mod.rs
+++ b/src/sources/util/mod.rs
@@ -16,7 +16,11 @@ pub mod grpc;
 pub mod http;
 #[cfg(any(feature = "sources-http_client", feature = "sources-prometheus-scrape",))]
 pub mod http_client;
-#[cfg(any(feature = "sources-aws_sqs", feature = "sources-gcp_pubsub"))]
+#[cfg(any(
+    feature = "sources-aws_sqs",
+    feature = "sources-gcp_pubsub",
+    feature = "sources-mqtt"
+))]
 mod message_decoding;
 pub mod multiline_config;
 #[cfg(any(feature = "sources-utils-net-tcp", feature = "sources-utils-net-udp"))]
@@ -60,7 +64,11 @@ pub use self::http::add_query_parameters;
 pub use self::http::decode;
 #[cfg(feature = "sources-utils-http-prelude")]
 pub use self::http::HttpSource;
-#[cfg(any(feature = "sources-aws_sqs", feature = "sources-gcp_pubsub"))]
+#[cfg(any(
+    feature = "sources-aws_sqs",
+    feature = "sources-gcp_pubsub",
+    feature = "sources-mqtt"
+))]
 pub use self::message_decoding::decode_message;
 
 /// Extract a tag and it's value from input string delimited by a colon character.
diff --git a/website/content/en/docs/reference/configuration/sources/mqtt.md b/website/content/en/docs/reference/configuration/sources/mqtt.md
new file mode 100644
index 0000000000000..179b0bce2e9d5
--- /dev/null
+++ b/website/content/en/docs/reference/configuration/sources/mqtt.md
@@ -0,0 +1,14 @@
+---
+title: MQTT
+description: Receive logs from an [MQTT](https://mqtt.org) broker
+kind: source
+layout: component
+tags: ["mqtt", "component", "source"]
+---
+
+{{/*
+This doc is generated using:
+
+1. The template in layouts/docs/component.html
+2. The relevant CUE data in cue/reference/components/...
+*/}}
diff --git a/website/cue/reference/components/sinks/base/mqtt.cue b/website/cue/reference/components/sinks/base/mqtt.cue
index 74770fef3b5ef..12bed930db3c8 100644
--- a/website/cue/reference/components/sinks/base/mqtt.cue
+++ b/website/cue/reference/components/sinks/base/mqtt.cue
@@ -419,7 +419,7 @@ base: components: sinks: mqtt: configuration: {
 		type: bool: default: false
 	}
 	tls: {
-		description: "Configures the TLS options for incoming/outgoing connections."
+		description: "TLS configuration."
 		required:    false
 		type: object: options: {
 			alpn_protocols: {
diff --git a/website/cue/reference/components/sources/base/mqtt.cue b/website/cue/reference/components/sources/base/mqtt.cue
new file mode 100644
index 0000000000000..9ace00d90fb5f
--- /dev/null
+++ b/website/cue/reference/components/sources/base/mqtt.cue
@@ -0,0 +1,584 @@
+package metadata
+
+base: components: sources: mqtt: configuration: {
+	client_id: {
+		description: "MQTT client ID."
+		required:    false
+		type: string: {}
+	}
+	decoding: {
+		description: "Configures how events are decoded from raw bytes."
+		required:    false
+		type: object: options: {
+			avro: {
+				description:   "Apache Avro-specific encoder options."
+				relevant_when: "codec = \"avro\""
+				required:      true
+				type: object: options: {
+					schema: {
+						description: """
+																The Avro schema definition.
+																Please note that the following [`apache_avro::types::Value`] variants are currently *not* supported:
+																* `Date`
+																* `Decimal`
+																* `Duration`
+																* `Fixed`
+																* `TimeMillis`
+																"""
+						required: true
+						type: string: examples: ["{ \"type\": \"record\", \"name\": \"log\", \"fields\": [{ \"name\": \"message\", \"type\": \"string\" }] }"]
+					}
+					strip_schema_id_prefix: {
+						description: """
+																For Avro datum encoded in Kafka messages, the bytes are prefixed with the schema ID.  Set this to true to strip the schema ID prefix.
+																According to [Confluent Kafka's document](https://docs.confluent.io/platform/current/schema-registry/fundamentals/serdes-develop/index.html#wire-format).
+																"""
+						required: true
+						type: bool: {}
+					}
+				}
+			}
+			codec: {
+				description: "The codec to use for decoding events."
+				required:    false
+				type: string: {
+					default: "bytes"
+					enum: {
+						avro: """
+															Decodes the raw bytes as as an [Apache Avro][apache_avro] message.
+
+															[apache_avro]: https://avro.apache.org/
+															"""
+						bytes: "Uses the raw bytes as-is."
+						gelf: """
+															Decodes the raw bytes as a [GELF][gelf] message.
+
+															This codec is experimental for the following reason:
+
+															The GELF specification is more strict than the actual Graylog receiver.
+															Vector's decoder currently adheres more strictly to the GELF spec, with
+															the exception that some characters such as `@`  are allowed in field names.
+
+															Other GELF codecs such as Loki's, use a [Go SDK][implementation] that is maintained
+															by Graylog, and is much more relaxed than the GELF spec.
+
+															Going forward, Vector will use that [Go SDK][implementation] as the reference implementation, which means
+															the codec may continue to relax the enforcement of specification.
+
+															[gelf]: https://docs.graylog.org/docs/gelf
+															[implementation]: https://github.com/Graylog2/go-gelf/blob/v2/gelf/reader.go
+															"""
+						influxdb: """
+															Decodes the raw bytes as an [Influxdb Line Protocol][influxdb] message.
+
+															[influxdb]: https://docs.influxdata.com/influxdb/cloud/reference/syntax/line-protocol
+															"""
+						json: """
+															Decodes the raw bytes as [JSON][json].
+
+															[json]: https://www.json.org/
+															"""
+						native: """
+															Decodes the raw bytes as [native Protocol Buffers format][vector_native_protobuf].
+
+															This codec is **[experimental][experimental]**.
+
+															[vector_native_protobuf]: https://github.com/vectordotdev/vector/blob/master/lib/vector-core/proto/event.proto
+															[experimental]: https://vector.dev/highlights/2022-03-31-native-event-codecs
+															"""
+						native_json: """
+															Decodes the raw bytes as [native JSON format][vector_native_json].
+
+															This codec is **[experimental][experimental]**.
+
+															[vector_native_json]: https://github.com/vectordotdev/vector/blob/master/lib/codecs/tests/data/native_encoding/schema.cue
+															[experimental]: https://vector.dev/highlights/2022-03-31-native-event-codecs
+															"""
+						protobuf: """
+															Decodes the raw bytes as [protobuf][protobuf].
+
+															[protobuf]: https://protobuf.dev/
+															"""
+						syslog: """
+															Decodes the raw bytes as a Syslog message.
+
+															Decodes either as the [RFC 3164][rfc3164]-style format ("old" style) or the
+															[RFC 5424][rfc5424]-style format ("new" style, includes structured data).
+
+															[rfc3164]: https://www.ietf.org/rfc/rfc3164.txt
+															[rfc5424]: https://www.ietf.org/rfc/rfc5424.txt
+															"""
+						vrl: """
+															Decodes the raw bytes as a string and passes them as input to a [VRL][vrl] program.
+
+															[vrl]: https://vector.dev/docs/reference/vrl
+															"""
+					}
+				}
+			}
+			gelf: {
+				description:   "GELF-specific decoding options."
+				relevant_when: "codec = \"gelf\""
+				required:      false
+				type: object: options: lossy: {
+					description: """
+						Determines whether or not to replace invalid UTF-8 sequences instead of failing.
+
+						When true, invalid UTF-8 sequences are replaced with the [`U+FFFD REPLACEMENT CHARACTER`][U+FFFD].
+
+						[U+FFFD]: https://en.wikipedia.org/wiki/Specials_(Unicode_block)#Replacement_character
+						"""
+					required: false
+					type: bool: default: true
+				}
+			}
+			influxdb: {
+				description:   "Influxdb-specific decoding options."
+				relevant_when: "codec = \"influxdb\""
+				required:      false
+				type: object: options: lossy: {
+					description: """
+						Determines whether or not to replace invalid UTF-8 sequences instead of failing.
+
+						When true, invalid UTF-8 sequences are replaced with the [`U+FFFD REPLACEMENT CHARACTER`][U+FFFD].
+
+						[U+FFFD]: https://en.wikipedia.org/wiki/Specials_(Unicode_block)#Replacement_character
+						"""
+					required: false
+					type: bool: default: true
+				}
+			}
+			json: {
+				description:   "JSON-specific decoding options."
+				relevant_when: "codec = \"json\""
+				required:      false
+				type: object: options: lossy: {
+					description: """
+						Determines whether or not to replace invalid UTF-8 sequences instead of failing.
+
+						When true, invalid UTF-8 sequences are replaced with the [`U+FFFD REPLACEMENT CHARACTER`][U+FFFD].
+
+						[U+FFFD]: https://en.wikipedia.org/wiki/Specials_(Unicode_block)#Replacement_character
+						"""
+					required: false
+					type: bool: default: true
+				}
+			}
+			native_json: {
+				description:   "Vector's native JSON-specific decoding options."
+				relevant_when: "codec = \"native_json\""
+				required:      false
+				type: object: options: lossy: {
+					description: """
+						Determines whether or not to replace invalid UTF-8 sequences instead of failing.
+
+						When true, invalid UTF-8 sequences are replaced with the [`U+FFFD REPLACEMENT CHARACTER`][U+FFFD].
+
+						[U+FFFD]: https://en.wikipedia.org/wiki/Specials_(Unicode_block)#Replacement_character
+						"""
+					required: false
+					type: bool: default: true
+				}
+			}
+			protobuf: {
+				description:   "Protobuf-specific decoding options."
+				relevant_when: "codec = \"protobuf\""
+				required:      false
+				type: object: options: {
+					desc_file: {
+						description: """
+																The path to the protobuf descriptor set file.
+
+																This file is the output of `protoc -I <include path> -o <desc output path> <proto>`
+
+																You can read more [here](https://buf.build/docs/reference/images/#how-buf-images-work).
+																"""
+						required: false
+						type: string: default: ""
+					}
+					message_type: {
+						description: "The name of the message type to use for serializing."
+						required:    false
+						type: string: {
+							default: ""
+							examples: ["package.Message"]
+						}
+					}
+				}
+			}
+			syslog: {
+				description:   "Syslog-specific decoding options."
+				relevant_when: "codec = \"syslog\""
+				required:      false
+				type: object: options: lossy: {
+					description: """
+						Determines whether or not to replace invalid UTF-8 sequences instead of failing.
+
+						When true, invalid UTF-8 sequences are replaced with the [`U+FFFD REPLACEMENT CHARACTER`][U+FFFD].
+
+						[U+FFFD]: https://en.wikipedia.org/wiki/Specials_(Unicode_block)#Replacement_character
+						"""
+					required: false
+					type: bool: default: true
+				}
+			}
+			vrl: {
+				description:   "VRL-specific decoding options."
+				relevant_when: "codec = \"vrl\""
+				required:      true
+				type: object: options: {
+					source: {
+						description: """
+																The [Vector Remap Language][vrl] (VRL) program to execute for each event.
+																Note that the final contents of the `.` target will be used as the decoding result.
+																Compilation error or use of 'abort' in a program will result in a decoding error.
+
+																[vrl]: https://vector.dev/docs/reference/vrl
+																"""
+						required: true
+						type: string: {}
+					}
+					timezone: {
+						description: """
+																The name of the timezone to apply to timestamp conversions that do not contain an explicit
+																time zone. The time zone name may be any name in the [TZ database][tz_database], or `local`
+																to indicate system local time.
+
+																If not set, `local` will be used.
+
+																[tz_database]: https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
+																"""
+						required: false
+						type: string: examples: ["local", "America/New_York", "EST5EDT"]
+					}
+				}
+			}
+		}
+	}
+	framing: {
+		description: """
+			Framing configuration.
+
+			Framing handles how events are separated when encoded in a raw byte form, where each event is
+			a frame that must be prefixed, or delimited, in a way that marks where an event begins and
+			ends within the byte stream.
+			"""
+		required: false
+		type: object: options: {
+			character_delimited: {
+				description:   "Options for the character delimited decoder."
+				relevant_when: "method = \"character_delimited\""
+				required:      true
+				type: object: options: {
+					delimiter: {
+						description: "The character that delimits byte sequences."
+						required:    true
+						type: ascii_char: {}
+					}
+					max_length: {
+						description: """
+																The maximum length of the byte buffer.
+
+																This length does *not* include the trailing delimiter.
+
+																By default, there is no maximum length enforced. If events are malformed, this can lead to
+																additional resource usage as events continue to be buffered in memory, and can potentially
+																lead to memory exhaustion in extreme cases.
+
+																If there is a risk of processing malformed data, such as logs with user-controlled input,
+																consider setting the maximum length to a reasonably large value as a safety net. This
+																ensures that processing is not actually unbounded.
+																"""
+						required: false
+						type: uint: {}
+					}
+				}
+			}
+			chunked_gelf: {
+				description:   "Options for the chunked GELF decoder."
+				relevant_when: "method = \"chunked_gelf\""
+				required:      false
+				type: object: options: {
+					decompression: {
+						description: "Decompression configuration for GELF messages."
+						required:    false
+						type: string: {
+							default: "Auto"
+							enum: {
+								Auto: "Automatically detect the decompression method based on the magic bytes of the message."
+								Gzip: "Use Gzip decompression."
+								None: "Do not decompress the message."
+								Zlib: "Use Zlib decompression."
+							}
+						}
+					}
+					max_length: {
+						description: """
+																The maximum length of a single GELF message, in bytes. Messages longer than this length will
+																be dropped. If this option is not set, the decoder does not limit the length of messages and
+																the per-message memory is unbounded.
+
+																Note that a message can be composed of multiple chunks and this limit is applied to the whole
+																message, not to individual chunks.
+
+																This limit takes only into account the message's payload and the GELF header bytes are excluded from the calculation.
+																The message's payload is the concatenation of all the chunks' payloads.
+																"""
+						required: false
+						type: uint: {}
+					}
+					pending_messages_limit: {
+						description: """
+																The maximum number of pending incomplete messages. If this limit is reached, the decoder starts
+																dropping chunks of new messages, ensuring the memory usage of the decoder's state is bounded.
+																If this option is not set, the decoder does not limit the number of pending messages and the memory usage
+																of its messages buffer can grow unbounded. This matches Graylog Server's behavior.
+																"""
+						required: false
+						type: uint: {}
+					}
+					timeout_secs: {
+						description: """
+																The timeout, in seconds, for a message to be fully received. If the timeout is reached, the
+																decoder drops all the received chunks of the timed out message.
+																"""
+						required: false
+						type: float: default: 5.0
+					}
+				}
+			}
+			length_delimited: {
+				description:   "Options for the length delimited decoder."
+				relevant_when: "method = \"length_delimited\""
+				required:      true
+				type: object: options: {
+					length_field_is_big_endian: {
+						description: "Length field byte order (little or big endian)"
+						required:    false
+						type: bool: default: true
+					}
+					length_field_length: {
+						description: "Number of bytes representing the field length"
+						required:    false
+						type: uint: default: 4
+					}
+					length_field_offset: {
+						description: "Number of bytes in the header before the length field"
+						required:    false
+						type: uint: default: 0
+					}
+					max_frame_length: {
+						description: "Maximum frame length"
+						required:    false
+						type: uint: default: 8388608
+					}
+				}
+			}
+			method: {
+				description: "The framing method."
+				required:    false
+				type: string: {
+					default: "bytes"
+					enum: {
+						bytes:               "Byte frames are passed through as-is according to the underlying I/O boundaries (for example, split between messages or stream segments)."
+						character_delimited: "Byte frames which are delimited by a chosen character."
+						chunked_gelf: """
+															Byte frames which are chunked GELF messages.
+
+															[chunked_gelf]: https://go2docs.graylog.org/current/getting_in_log_data/gelf.html
+															"""
+						length_delimited:  "Byte frames which are prefixed by an unsigned big-endian 32-bit integer indicating the length."
+						newline_delimited: "Byte frames which are delimited by a newline character."
+						octet_counting: """
+															Byte frames according to the [octet counting][octet_counting] format.
+
+															[octet_counting]: https://tools.ietf.org/html/rfc6587#section-3.4.1
+															"""
+					}
+				}
+			}
+			newline_delimited: {
+				description:   "Options for the newline delimited decoder."
+				relevant_when: "method = \"newline_delimited\""
+				required:      false
+				type: object: options: max_length: {
+					description: """
+						The maximum length of the byte buffer.
+
+						This length does *not* include the trailing delimiter.
+
+						By default, there is no maximum length enforced. If events are malformed, this can lead to
+						additional resource usage as events continue to be buffered in memory, and can potentially
+						lead to memory exhaustion in extreme cases.
+
+						If there is a risk of processing malformed data, such as logs with user-controlled input,
+						consider setting the maximum length to a reasonably large value as a safety net. This
+						ensures that processing is not actually unbounded.
+						"""
+					required: false
+					type: uint: {}
+				}
+			}
+			octet_counting: {
+				description:   "Options for the octet counting decoder."
+				relevant_when: "method = \"octet_counting\""
+				required:      false
+				type: object: options: max_length: {
+					description: "The maximum length of the byte buffer."
+					required:    false
+					type: uint: {}
+				}
+			}
+		}
+	}
+	host: {
+		description: "MQTT server address (The broker’s domain name or IP address)."
+		required:    true
+		type: string: examples: ["mqtt.example.com", "127.0.0.1"]
+	}
+	keep_alive: {
+		description: "Connection keep-alive interval."
+		required:    false
+		type: uint: default: 60
+	}
+	password: {
+		description: "MQTT password."
+		required:    false
+		type: string: {}
+	}
+	port: {
+		description: "TCP port of the MQTT server to connect to."
+		required:    false
+		type: uint: default: 1883
+	}
+	tls: {
+		description: "TLS configuration."
+		required:    false
+		type: object: options: {
+			alpn_protocols: {
+				description: """
+					Sets the list of supported ALPN protocols.
+
+					Declare the supported ALPN protocols, which are used during negotiation with a peer. They are prioritized in the order
+					that they are defined.
+					"""
+				required: false
+				type: array: items: type: string: examples: ["h2"]
+			}
+			ca_file: {
+				description: """
+					Absolute path to an additional CA certificate file.
+
+					The certificate must be in the DER or PEM (X.509) format. Additionally, the certificate can be provided as an inline string in PEM format.
+					"""
+				required: false
+				type: string: examples: ["/path/to/certificate_authority.crt"]
+			}
+			crt_file: {
+				description: """
+					Absolute path to a certificate file used to identify this server.
+
+					The certificate must be in DER, PEM (X.509), or PKCS#12 format. Additionally, the certificate can be provided as
+					an inline string in PEM format.
+
+					If this is set _and_ is not a PKCS#12 archive, `key_file` must also be set.
+					"""
+				required: false
+				type: string: examples: ["/path/to/host_certificate.crt"]
+			}
+			enabled: {
+				description: """
+					Whether or not to require TLS for incoming or outgoing connections.
+
+					When enabled and used for incoming connections, an identity certificate is also required. See `tls.crt_file` for
+					more information.
+					"""
+				required: false
+				type: bool: {}
+			}
+			key_file: {
+				description: """
+					Absolute path to a private key file used to identify this server.
+
+					The key must be in DER or PEM (PKCS#8) format. Additionally, the key can be provided as an inline string in PEM format.
+					"""
+				required: false
+				type: string: examples: ["/path/to/host_certificate.key"]
+			}
+			key_pass: {
+				description: """
+					Passphrase used to unlock the encrypted key file.
+
+					This has no effect unless `key_file` is set.
+					"""
+				required: false
+				type: string: examples: ["${KEY_PASS_ENV_VAR}", "PassWord1"]
+			}
+			server_name: {
+				description: """
+					Server name to use when using Server Name Indication (SNI).
+
+					Only relevant for outgoing connections.
+					"""
+				required: false
+				type: string: examples: ["www.example.com"]
+			}
+			verify_certificate: {
+				description: """
+					Enables certificate verification. For components that create a server, this requires that the
+					client connections have a valid client certificate. For components that initiate requests,
+					this validates that the upstream has a valid certificate.
+
+					If enabled, certificates must not be expired and must be issued by a trusted
+					issuer. This verification operates in a hierarchical manner, checking that the leaf certificate (the
+					certificate presented by the client/server) is not only valid, but that the issuer of that certificate is also valid, and
+					so on, until the verification process reaches a root certificate.
+
+					Do NOT set this to `false` unless you understand the risks of not verifying the validity of certificates.
+					"""
+				required: false
+				type: bool: {}
+			}
+			verify_hostname: {
+				description: """
+					Enables hostname verification.
+
+					If enabled, the hostname used to connect to the remote host must be present in the TLS certificate presented by
+					the remote host, either as the Common Name or as an entry in the Subject Alternative Name extension.
+
+					Only relevant for outgoing connections.
+
+					Do NOT set this to `false` unless you understand the risks of not verifying the remote hostname.
+					"""
+				required: false
+				type: bool: {}
+			}
+		}
+	}
+	topic: {
+		description: "MQTT topic from which messages are to be read."
+		required:    false
+		type: string: default: "vector"
+	}
+	topic_key: {
+		description: """
+			Overrides the name of the log field used to add the topic to each event.
+
+			The value is the topic from which the MQTT message was published to.
+
+			By default, `"topic"` is used.
+			"""
+		required: false
+		type: string: {
+			default: "topic"
+			examples: [
+				"topic",
+			]
+		}
+	}
+	user: {
+		description: "MQTT username."
+		required:    false
+		type: string: {}
+	}
+}
diff --git a/website/cue/reference/components/sources/mqtt.cue b/website/cue/reference/components/sources/mqtt.cue
new file mode 100644
index 0000000000000..8cdf9b7429b55
--- /dev/null
+++ b/website/cue/reference/components/sources/mqtt.cue
@@ -0,0 +1,99 @@
+package metadata
+
+components: sources: mqtt: {
+	title: "MQTT"
+
+	features: {
+		auto_generated:   true
+		acknowledgements: false
+		collect: {
+			checkpoint: enabled: false
+			from: {
+				service: services.mqtt
+				interface: {
+					socket: {
+						api: {
+							title: "MQTT protocol"
+							url:   urls.mqtt
+						}
+						direction: "incoming"
+						port:      1883
+						protocols: ["tcp"]
+						ssl: "optional"
+					}
+				}
+			}
+		}
+		multiline: enabled: false
+	}
+
+	classes: {
+		commonly_used: false
+		deployment_roles: ["aggregator"]
+		delivery:      "best_effort"
+		development:   "beta"
+		egress_method: "stream"
+		stateful:      false
+	}
+
+	support: {
+		targets: {
+			"aarch64-unknown-linux-gnu":      true
+			"aarch64-unknown-linux-musl":     true
+			"armv7-unknown-linux-gnueabihf":  true
+			"armv7-unknown-linux-musleabihf": true
+			"x86_64-apple-darwin":            true
+			"x86_64-pc-windows-msv":          true
+			"x86_64-unknown-linux-gnu":       true
+			"x86_64-unknown-linux-musl":      true
+		}
+		requirements: []
+		warnings: []
+		notices: []
+	}
+
+	configuration: base.components.sources.mqtt.configuration
+
+	installation: {
+		platform_name: null
+	}
+
+	output: logs: record: {
+		description: "An individual MQTT message."
+		fields: {
+			message: {
+				description: "The raw line from the MQTT message."
+				required:    true
+				type: string: {
+					examples: ["53.126.150.246 - - [01/Oct/2020:11:25:58 -0400] \"GET /disintermediate HTTP/2.0\" 401 20308"]
+					syntax: "literal"
+				}
+			}
+			timestamp: fields._current_timestamp & {
+				description: "The current time when the message has been received."
+			}
+			topic: {
+				description: "The MQTT topic that the message came from."
+				required:    true
+				type: string: {
+					examples: ["topic/logs"]
+					syntax: "literal"
+				}
+			}
+		}
+	}
+
+	how_it_works: components._amqp.how_it_works
+
+	telemetry: metrics: {
+		open_connections:                 components.sources.internal_metrics.output.metrics.open_connections
+		connection_shutdown_total:        components.sources.internal_metrics.output.metrics.connection_shutdown_total
+		component_errors_total:           components.sources.internal_metrics.output.metrics.component_errors_total
+		component_received_events_total:  components.sources.internal_metrics.output.metrics.component_received_events_total
+		component_sent_events_total:      components.sources.internal_metrics.output.metrics.component_sent_events_total
+		component_sent_bytes_total:       components.sources.internal_metrics.output.metrics.component_sent_bytes_total
+		component_sent_events_total:      components.sources.internal_metrics.output.metrics.component_sent_events_total
+		component_sent_events_total:      components.sources.internal_metrics.output.metrics.component_sent_events_total
+		component_sent_event_bytes_total: components.sources.internal_metrics.output.metrics.component_sent_event_bytes_total
+	}
+}

From 689a65d51a2f8034f220afcf5e65e1b924019687 Mon Sep 17 00:00:00 2001
From: Pavlos Rontidis <pavlos.rontidis@gmail.com>
Date: Wed, 14 May 2025 14:45:15 -0400
Subject: [PATCH 004/305] fix(ci): e2e dd logs failure (#23038)

* wip

* bump to stable debian

* fix bug with docker ARG evaluation

* more dbg statements

* try with more recent docker.io/datadog/fakeintake

* test with bigger timeout

* make test runner usable locally

* add retries

* more tweaks to config

* cleanup
---
 .github/workflows/ci-integration-review.yml   |  6 +--
 .github/workflows/e2e.yml                     |  4 +-
 .github/workflows/integration.yml             |  2 +-
 scripts/e2e/datadog-logs/compose.yaml         |  4 +-
 .../{ci-int-e2e-test.sh => int-e2e-test.sh}   | 12 ++---
 tests/data/e2e/datadog/logs/agent_only.yaml   |  3 ++
 tests/data/e2e/datadog/logs/agent_vector.yaml |  3 ++
 tests/e2e/datadog/logs/mod.rs                 | 47 ++++++++++++-------
 8 files changed, 50 insertions(+), 31 deletions(-)
 rename scripts/{ci-int-e2e-test.sh => int-e2e-test.sh} (82%)

diff --git a/.github/workflows/ci-integration-review.yml b/.github/workflows/ci-integration-review.yml
index 1371bac1ed337..b75bc701fba03 100644
--- a/.github/workflows/ci-integration-review.yml
+++ b/.github/workflows/ci-integration-review.yml
@@ -113,7 +113,7 @@ jobs:
         with:
           timeout_minutes: 30
           max_attempts: 3
-          command: bash scripts/ci-int-e2e-test.sh int ${{ matrix.service }}
+          command: bash scripts/int-e2e-test.sh int ${{ matrix.service }}
 
   e2e-tests:
     needs: prep-pr
@@ -136,7 +136,7 @@ jobs:
         with:
           timeout_minutes: 35
           max_attempts: 3
-          command: bash scripts/ci-int-e2e-test.sh e2e datadog-logs
+          command: bash scripts/int-e2e-test.sh e2e datadog-logs
 
       - name: datadog-e2e-metrics
         if: ${{ startsWith(github.event.review.body, '/ci-run-e2e-datadog-metrics')
@@ -146,7 +146,7 @@ jobs:
         with:
           timeout_minutes: 35
           max_attempts: 3
-          command: bash scripts/ci-int-e2e-test.sh e2e datadog-metrics
+          command: bash scripts/int-e2e-test.sh e2e datadog-metrics
 
   update-pr-status:
     name: Signal result to PR
diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
index cdba1faec680f..e5d322d2b8cc9 100644
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -89,7 +89,7 @@ jobs:
         with:
           timeout_minutes: 35
           max_attempts: 3
-          command: bash scripts/ci-int-e2e-test.sh e2e datadog-logs
+          command: bash scripts/int-e2e-test.sh e2e datadog-logs
 
       - if: (github.event_name == 'schedule' || needs.changes.outputs.all-e2e == 'true' || needs.changes.outputs.e2e-datadog-metrics == 'true') &&
           (github.event_name != 'pull_request' || env.PR_HAS_ACCESS_TO_SECRETS == 'true')
@@ -98,7 +98,7 @@ jobs:
         with:
           timeout_minutes: 35
           max_attempts: 3
-          command: bash scripts/ci-int-e2e-test.sh e2e datadog-metrics
+          command: bash scripts/int-e2e-test.sh e2e datadog-metrics
 
 
   e2e-test-suite:
diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
index f8920e80f5d08..e5374cc084e14 100644
--- a/.github/workflows/integration.yml
+++ b/.github/workflows/integration.yml
@@ -148,7 +148,7 @@ jobs:
                   "${{ needs.changes.outputs.all-int }}" == "true" || \
                   "$should_run" == "true" ]]; then
               echo "Running test for ${{ matrix.service }}"
-              bash scripts/ci-int-e2e-test.sh int ${{ matrix.service }}
+              bash scripts/int-e2e-test.sh int ${{ matrix.service }}
             else
               echo "Skipping ${{ matrix.service }} test as the value is false or conditions not met."
             fi
diff --git a/scripts/e2e/datadog-logs/compose.yaml b/scripts/e2e/datadog-logs/compose.yaml
index 56fb68350c004..fe0bafc869012 100644
--- a/scripts/e2e/datadog-logs/compose.yaml
+++ b/scripts/e2e/datadog-logs/compose.yaml
@@ -85,13 +85,13 @@ services:
   # which does the validation of consistency with the other fakeintake service.
   fakeintake-agent:
     # TODO: temporarily pegging the image as latest results in failures
-    image: docker.io/datadog/fakeintake:v77a06f2b
+    image: docker.io/datadog/fakeintake:ved764626
 
   # Receives log data from the `datadog-agent-vector` service. Is queried by the test runner
   # which does the validation of consistency with the other fakeintake service.
   fakeintake-vector:
     # TODO: temporarily pegging the image as latest results in failures
-    image: docker.io/datadog/fakeintake:v77a06f2b
+    image: docker.io/datadog/fakeintake:ved764626
 
 networks:
   default:
diff --git a/scripts/ci-int-e2e-test.sh b/scripts/int-e2e-test.sh
similarity index 82%
rename from scripts/ci-int-e2e-test.sh
rename to scripts/int-e2e-test.sh
index 3b569db530f5f..f795c352e3d8e 100755
--- a/scripts/ci-int-e2e-test.sh
+++ b/scripts/int-e2e-test.sh
@@ -6,11 +6,6 @@
 
 set -u
 
-if [[ -z "${CI:-}" ]]; then
-  echo "Aborted: this script is for use in CI." >&2
-  exit 1
-fi
-
 if [ $# -ne 2 ]
 then
   echo "usage: $0 [int|e2e] TEST_NAME"
@@ -27,5 +22,10 @@ sleep 30
 cargo vdev -v "${TEST_TYPE}" test --retries 2 -a "${TEST_NAME}"
 RET=$?
 cargo vdev -v "${TEST_TYPE}" stop -a "${TEST_NAME}"
-./scripts/upload-test-results.sh
+
+# Only upload test results if CI is defined
+if [[ -n "${CI:-}" ]]; then
+  ./scripts/upload-test-results.sh
+fi
+
 exit $RET
diff --git a/tests/data/e2e/datadog/logs/agent_only.yaml b/tests/data/e2e/datadog/logs/agent_only.yaml
index dcdfcab9b40dd..b92e08db48f05 100644
--- a/tests/data/e2e/datadog/logs/agent_only.yaml
+++ b/tests/data/e2e/datadog/logs/agent_only.yaml
@@ -27,3 +27,6 @@ logs_config:
   logs_no_ssl: true
   force_use_http: true
   batch_wait: 1
+
+# Required per https://github.com/DataDog/datadog-agent/tree/main/test/fakeintake#docker
+dd_url: 'http://fakeintake-agent:80'
diff --git a/tests/data/e2e/datadog/logs/agent_vector.yaml b/tests/data/e2e/datadog/logs/agent_vector.yaml
index 411da03025e0c..57ca8bff2d5e7 100644
--- a/tests/data/e2e/datadog/logs/agent_vector.yaml
+++ b/tests/data/e2e/datadog/logs/agent_vector.yaml
@@ -32,3 +32,6 @@ vector:
   logs:
     enabled: true
     url: "http://vector:8181"
+
+# Required per https://github.com/DataDog/datadog-agent/tree/main/test/fakeintake#docker
+dd_url: 'http://fakeintake-agent:80'
diff --git a/tests/e2e/datadog/logs/mod.rs b/tests/e2e/datadog/logs/mod.rs
index de9210388ed39..952d55d3e1d2c 100644
--- a/tests/e2e/datadog/logs/mod.rs
+++ b/tests/e2e/datadog/logs/mod.rs
@@ -1,11 +1,13 @@
 use serde_json::Value;
 use tracing::info;
 
-use vector::test_util::trace_init;
-
 use super::*;
+use std::time::Duration;
+use vector::test_util::trace_init;
 
 const LOGS_ENDPOINT: &str = "/api/v2/logs";
+const MAX_RETRIES: usize = 10;
+const WAIT_INTERVAL: Duration = Duration::from_secs(1);
 
 fn expected_log_events() -> usize {
     std::env::var("EXPECTED_LOG_EVENTS")
@@ -70,25 +72,36 @@ fn reduce_to_data(payloads: Vec<FakeIntakePayload<Value>>) -> Vec<Value> {
 async fn validate() {
     trace_init();
 
-    // Even with configuring docker service dependencies, we need a small buffer of time
-    // to ensure events flow through to fakeintake before asking for them
-    std::thread::sleep(std::time::Duration::from_secs(2));
-
+    // Retry until we have log payloads or hit max retries.
+    // This is to ensure events flow through to fakeintake before asking for them.
     info!("getting log payloads from agent-only pipeline");
-    let mut agent_payloads = get_fakeintake_payloads::<FakeIntakeResponseJson>(
-        &fake_intake_agent_address(),
-        LOGS_ENDPOINT,
-    )
-    .await
-    .payloads;
-
-    // the logs endpoint receives an empty healthcheck payload in the beginning
-    if !agent_payloads.is_empty() {
-        agent_payloads.retain(|raw_payload| !raw_payload.data.as_array().unwrap().is_empty())
+    let mut agent_payloads = Vec::new();
+    for _ in 0..MAX_RETRIES {
+        agent_payloads = get_fakeintake_payloads::<FakeIntakeResponseJson>(
+            &fake_intake_agent_address(),
+            LOGS_ENDPOINT,
+        )
+        .await
+        .payloads;
+
+        if !agent_payloads.is_empty() {
+            break;
+        }
+
+        info!("No valid payloads yet, retrying...");
+        tokio::time::sleep(WAIT_INTERVAL).await;
     }
 
-    let mut agent_payloads = reduce_to_data(agent_payloads);
+    // If we still don't have valid payloads after retries, fail the test
+    assert!(
+        !agent_payloads.is_empty(),
+        "Failed to get valid log payloads from agent pipeline after {MAX_RETRIES} retries"
+    );
+
+    // The logs endpoint receives an empty healthcheck payload in the beginning
+    agent_payloads.retain(|raw_payload| !raw_payload.data.as_array().unwrap().is_empty());
 
+    let mut agent_payloads = reduce_to_data(agent_payloads);
     common_assertions(&mut agent_payloads);
 
     info!("getting log payloads from agent-vector pipeline");

From 822ed0d3f6a752637a33c60b983bd158ad27cce6 Mon Sep 17 00:00:00 2001
From: Pavlos Rontidis <pavlos.rontidis@gmail.com>
Date: Wed, 14 May 2025 16:48:00 -0400
Subject: [PATCH 005/305] fix(azure service): revert deps bump (#23039)

* fix(azure service): revert deps bump

* also revert common config file changes
---
 .github/workflows/integration.yml |   3 +-
 Cargo.lock                        | 140 ++++++++++--------------------
 Cargo.toml                        |  16 ++--
 LICENSE-3rdparty.csv              |   3 +-
 src/sinks/azure_common/config.rs  |  12 ++-
 5 files changed, 60 insertions(+), 114 deletions(-)

diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
index e5374cc084e14..74eb0bebaa696 100644
--- a/.github/workflows/integration.yml
+++ b/.github/workflows/integration.yml
@@ -111,11 +111,10 @@ jobs:
     if: ${{ needs.setup.outputs.can_access_secrets == 'true' }}
     strategy:
       matrix:
-        # TODO: Add "azure" back one https://github.com/vectordotdev/vector/issues/22777 is fixed.
         # TODO: Add "splunk" back once https://github.com/vectordotdev/vector/issues/22379 is fixed.
         # If you modify this list, please also update the `int_tests` job in changes.yml.
         service: [
-          "amqp", "appsignal", "axiom", "aws", "clickhouse", "databend", "datadog-agent",
+          "amqp", "appsignal", "axiom", "aws", "azure", "clickhouse", "databend", "datadog-agent",
           "datadog-logs", "datadog-metrics", "datadog-traces", "dnstap", "docker-logs", "elasticsearch",
           "eventstoredb", "fluent", "gcp", "greptimedb", "http-client", "influxdb", "kafka", "logstash",
           "loki", "mongodb", "nats", "nginx", "opentelemetry", "postgres", "prometheus", "pulsar",
diff --git a/Cargo.lock b/Cargo.lock
index e207d60a00ce8..24d055bbce81a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -407,18 +407,6 @@ dependencies = [
  "futures-core",
 ]
 
-[[package]]
-name = "async-channel"
-version = "2.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a"
-dependencies = [
- "concurrent-queue",
- "event-listener-strategy",
- "futures-core",
- "pin-project-lite",
-]
-
 [[package]]
 name = "async-compression"
 version = "0.4.23"
@@ -467,7 +455,7 @@ version = "2.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f1b6f5d7df27bd294849f8eec66ecfc63d11814df7a4f5d74168a2394467b776"
 dependencies = [
- "async-channel 1.9.0",
+ "async-channel",
  "async-executor",
  "async-io 1.13.0",
  "async-lock 2.8.0",
@@ -692,25 +680,6 @@ dependencies = [
  "windows-sys 0.48.0",
 ]
 
-[[package]]
-name = "async-process"
-version = "2.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "63255f1dc2381611000436537bbedfe83183faa303a5a0edaf191edef06526bb"
-dependencies = [
- "async-channel 2.3.1",
- "async-io 2.4.0",
- "async-lock 3.4.0",
- "async-signal",
- "async-task",
- "blocking",
- "cfg-if",
- "event-listener 5.3.1",
- "futures-lite 2.6.0",
- "rustix 0.38.40",
- "tracing 0.1.41",
-]
-
 [[package]]
 name = "async-reactor-trait"
 version = "1.1.0"
@@ -1537,110 +1506,94 @@ dependencies = [
 
 [[package]]
 name = "azure_core"
-version = "0.21.0"
+version = "0.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b552ad43a45a746461ec3d3a51dfb6466b4759209414b439c165eb6a6b7729e"
+checksum = "4ccd63c07d1fbfb3d4543d7ea800941bf5a30db1911b9b9e4db3b2c4210a434f"
 dependencies = [
  "async-trait",
- "base64 0.22.1",
+ "base64 0.21.7",
  "bytes 1.10.1",
  "dyn-clone",
  "futures 0.3.31",
  "getrandom 0.2.15",
- "hmac",
  "http-types",
- "once_cell",
+ "log",
  "paste",
  "pin-project",
  "quick-xml 0.31.0",
  "rand 0.8.5",
- "reqwest 0.12.9",
+ "reqwest 0.11.26",
  "rustc_version 0.4.1",
  "serde",
  "serde_json",
- "sha2",
  "time",
- "tracing 0.1.41",
  "url",
  "uuid",
 ]
 
 [[package]]
 name = "azure_identity"
-version = "0.21.0"
+version = "0.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88ddd80344317c40c04b603807b63a5cefa532f1b43522e72f480a988141f744"
+checksum = "8bd7ea32ca7eb66ff4757f83baac702ff11d469e5de365b6bc6f79f9c25d3436"
 dependencies = [
  "async-lock 3.4.0",
- "async-process 2.3.0",
  "async-trait",
  "azure_core",
  "futures 0.3.31",
+ "log",
  "oauth2",
  "pin-project",
  "serde",
+ "serde_json",
  "time",
- "tracing 0.1.41",
+ "tz-rs",
  "url",
  "uuid",
 ]
 
 [[package]]
 name = "azure_storage"
-version = "0.21.0"
+version = "0.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59f838159f4d29cb400a14d9d757578ba495ae64feb07a7516bf9e4415127126"
+checksum = "83ca0a07f89fd72a006da4713e93af3d6c44a693e61a1c3c2e7985de39c182e8"
 dependencies = [
  "RustyXML",
- "async-lock 3.4.0",
  "async-trait",
  "azure_core",
  "bytes 1.10.1",
+ "futures 0.3.31",
+ "hmac",
+ "log",
  "serde",
  "serde_derive",
+ "serde_json",
+ "sha2",
  "time",
- "tracing 0.1.41",
  "url",
  "uuid",
 ]
 
 [[package]]
 name = "azure_storage_blobs"
-version = "0.21.0"
+version = "0.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97e83c3636ae86d9a6a7962b2112e3b19eb3903915c50ce06ff54ff0a2e6a7e4"
+checksum = "8096c04d370118323c42b2752aa1883e4880a56ef65239f317b359f263b6e194"
 dependencies = [
  "RustyXML",
  "azure_core",
  "azure_storage",
- "azure_svc_blobstorage",
  "bytes 1.10.1",
  "futures 0.3.31",
+ "log",
  "serde",
  "serde_derive",
  "serde_json",
  "time",
- "tracing 0.1.41",
  "url",
  "uuid",
 ]
 
-[[package]]
-name = "azure_svc_blobstorage"
-version = "0.21.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e6c6f20c5611b885ba94c7bae5e02849a267381aecb8aee577e8c35ff4064c6"
-dependencies = [
- "azure_core",
- "bytes 1.10.1",
- "futures 0.3.31",
- "log",
- "once_cell",
- "serde",
- "serde_json",
- "time",
-]
-
 [[package]]
 name = "backoff"
 version = "0.4.0"
@@ -1815,7 +1768,7 @@ version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8c36a4d0d48574b3dd360b4b7d95cc651d2b6557b6402848a27d4b228a473e2a"
 dependencies = [
- "async-channel 1.9.0",
+ "async-channel",
  "async-lock 2.8.0",
  "async-task",
  "fastrand 2.3.0",
@@ -2510,6 +2463,12 @@ version = "0.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "28c122c3980598d243d63d9a704629a2d748d101f278052ff068be5a4423ab6f"
 
+[[package]]
+name = "const_fn"
+version = "0.4.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2f8a2ca5ac02d09563609681103aada9e1777d54fc57a5acd7a41404f9c93b6e"
+
 [[package]]
 name = "convert_case"
 version = "0.4.0"
@@ -3970,10 +3929,7 @@ version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f5edaec856126859abb19ed65f39e90fea3a9574b9707f13539acf4abf7eb532"
 dependencies = [
- "fastrand 2.3.0",
  "futures-core",
- "futures-io",
- "parking",
  "pin-project-lite",
 ]
 
@@ -4721,7 +4677,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6e9b187a72d63adbfba487f48095306ac823049cb504ee195541e91c7775f5ad"
 dependencies = [
  "anyhow",
- "async-channel 1.9.0",
+ "async-channel",
  "base64 0.13.1",
  "futures-lite 1.13.0",
  "infer",
@@ -4769,7 +4725,7 @@ dependencies = [
  "httpdate",
  "itoa",
  "pin-project-lite",
- "socket2 0.4.10",
+ "socket2 0.5.9",
  "tokio",
  "tower-service",
  "tracing 0.1.41",
@@ -4957,22 +4913,6 @@ dependencies = [
  "tokio-native-tls",
 ]
 
-[[package]]
-name = "hyper-tls"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0"
-dependencies = [
- "bytes 1.10.1",
- "http-body-util",
- "hyper 1.4.1",
- "hyper-util",
- "native-tls",
- "tokio",
- "tokio-native-tls",
- "tower-service",
-]
-
 [[package]]
 name = "hyper-util"
 version = "0.1.9"
@@ -8591,7 +8531,7 @@ dependencies = [
  "http-body 0.4.5",
  "hyper 0.14.28",
  "hyper-rustls 0.24.2",
- "hyper-tls 0.5.0",
+ "hyper-tls",
  "ipnet",
  "js-sys",
  "log",
@@ -8610,10 +8550,12 @@ dependencies = [
  "tokio",
  "tokio-native-tls",
  "tokio-rustls 0.24.1",
+ "tokio-util",
  "tower-service",
  "url",
  "wasm-bindgen",
  "wasm-bindgen-futures",
+ "wasm-streams",
  "web-sys",
  "webpki-roots 0.25.2",
  "winreg",
@@ -8634,14 +8576,12 @@ dependencies = [
  "http-body-util",
  "hyper 1.4.1",
  "hyper-rustls 0.27.5",
- "hyper-tls 0.6.0",
  "hyper-util",
  "ipnet",
  "js-sys",
  "log",
  "mime",
  "mime_guess",
- "native-tls",
  "once_cell",
  "percent-encoding",
  "pin-project-lite",
@@ -8654,7 +8594,6 @@ dependencies = [
  "serde_urlencoded",
  "sync_wrapper 1.0.1",
  "tokio",
- "tokio-native-tls",
  "tokio-rustls 0.26.2",
  "tokio-util",
  "tower-service",
@@ -9645,13 +9584,13 @@ version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "13f2b548cd8447f8de0fdf1c592929f70f4fc7039a05e47404b0d096ec6987a1"
 dependencies = [
- "async-channel 1.9.0",
+ "async-channel",
  "async-executor",
  "async-fs",
  "async-io 1.13.0",
  "async-lock 2.8.0",
  "async-net",
- "async-process 1.8.1",
+ "async-process",
  "blocking",
  "futures-lite 1.13.0",
 ]
@@ -11244,6 +11183,15 @@ dependencies = [
  "syn 2.0.101",
 ]
 
+[[package]]
+name = "tz-rs"
+version = "0.6.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "33851b15c848fad2cf4b105c6bb66eb9512b6f6c44a4b13f57c53c73c707e2b4"
+dependencies = [
+ "const_fn",
+]
+
 [[package]]
 name = "ua-parser"
 version = "0.2.0"
diff --git a/Cargo.toml b/Cargo.toml
index 42c75a7de7a8d..c999e7b270d74 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -256,10 +256,10 @@ aws-smithy-runtime-api = { version = "1.7.3", default-features = false, optional
 aws-smithy-types = { version = "1.2.11", default-features = false, features = ["rt-tokio"], optional = true }
 
 # Azure
-azure_core = { version = "0.21", default-features = false, features = ["hmac_rust", "enable_reqwest"], optional = true }
-azure_identity = { version = "0.21", default-features = false, features = ["enable_reqwest"], optional = true }
-azure_storage = { version = "0.21", default-features = false, optional = true }
-azure_storage_blobs = { version = "0.21", default-features = false, optional = true }
+azure_core = { version = "0.17", default-features = false, features = ["enable_reqwest"], optional = true }
+azure_identity = { version = "0.17", default-features = false, features = ["enable_reqwest"], optional = true }
+azure_storage = { version = "0.17", default-features = false, optional = true }
+azure_storage_blobs = { version = "0.17", default-features = false, optional = true }
 
 # OpenDAL
 opendal = { version = "0.53", default-features = false, features = ["services-webhdfs"], optional = true }
@@ -428,10 +428,10 @@ openssl-src = { version = "300", default-features = false, features = ["force-en
 approx = "0.5.1"
 assert_cmd = { version = "2.0.17", default-features = false }
 aws-smithy-runtime = { version = "1.8.3", default-features = false, features = ["tls-rustls"] }
-azure_core = { version = "0.21", default-features = false, features = ["enable_reqwest", "azurite_workaround"] }
-azure_identity = { version = "0.21", default-features = false, features = ["enable_reqwest"] }
-azure_storage_blobs = { version = "0.21", default-features = false, features = ["azurite_workaround"] }
-azure_storage = { version = "0.21", default-features = false }
+azure_core = { version = "0.17", default-features = false, features = ["enable_reqwest", "azurite_workaround"] }
+azure_identity = { version = "0.17", default-features = false, features = ["enable_reqwest"] }
+azure_storage_blobs = { version = "0.17", default-features = false, features = ["azurite_workaround"] }
+azure_storage = { version = "0.17", default-features = false }
 base64 = "0.22.1"
 criterion = { version = "0.5.1", features = ["html_reports", "async_tokio"] }
 itertools = { version = "0.14.0", default-features = false, features = ["use_alloc"] }
diff --git a/LICENSE-3rdparty.csv b/LICENSE-3rdparty.csv
index 7f7cb766ac1b3..dbe0a174c9ec3 100644
--- a/LICENSE-3rdparty.csv
+++ b/LICENSE-3rdparty.csv
@@ -84,7 +84,6 @@ azure_core,https://github.com/azure/azure-sdk-for-rust,MIT,Microsoft Corp.
 azure_identity,https://github.com/azure/azure-sdk-for-rust,MIT,Microsoft Corp.
 azure_storage,https://github.com/azure/azure-sdk-for-rust,MIT,Microsoft Corp.
 azure_storage_blobs,https://github.com/azure/azure-sdk-for-rust,MIT,Microsoft Corp.
-azure_svc_blobstorage,https://github.com/azure/azure-sdk-for-rust,MIT,The azure_svc_blobstorage Authors
 backoff,https://github.com/ihrwein/backoff,MIT OR Apache-2.0,Tibor Benke <ihrwein@gmail.com>
 backon,https://github.com/Xuanwo/backon,Apache-2.0,The backon Authors
 backtrace,https://github.com/rust-lang/backtrace-rs,MIT OR Apache-2.0,The Rust Project Developers
@@ -146,6 +145,7 @@ community-id,https://github.com/traceflight/rs-community-id,MIT OR Apache-2.0,Ju
 compact_str,https://github.com/ParkMyCar/compact_str,MIT,Parker Timmerman <parker@parkertimmerman.com>
 concurrent-queue,https://github.com/smol-rs/concurrent-queue,Apache-2.0 OR MIT,"Stjepan Glavina <stjepang@gmail.com>, Taiki Endo <te316e89@gmail.com>, John Nunley <dev@notgull.net>"
 const-oid,https://github.com/RustCrypto/formats/tree/master/const-oid,Apache-2.0 OR MIT,RustCrypto Developers
+const_fn,https://github.com/taiki-e/const_fn,Apache-2.0 OR MIT,The const_fn Authors
 convert_case,https://github.com/rutrum/convert-case,MIT,David Purdum <purdum41@gmail.com>
 convert_case,https://github.com/rutrum/convert-case,MIT,rutrum <dave@rutrum.net>
 cookie-factory,https://github.com/rust-bakery/cookie-factory,MIT,"Geoffroy Couprie <geo.couprie@gmail.com>, Pierre Chifflier <chifflier@wzdftpd.net>"
@@ -677,6 +677,7 @@ twox-hash,https://github.com/shepmaster/twox-hash,MIT,Jake Goulding <jake.gouldi
 typed-builder,https://github.com/idanarye/rust-typed-builder,MIT OR Apache-2.0,"IdanArye <idanarye@gmail.com>, Chris Morgan <me@chrismorgan.info>"
 typenum,https://github.com/paholg/typenum,MIT OR Apache-2.0,"Paho Lurie-Gregg <paho@paholg.com>, Andre Bogus <bogusandre@gmail.com>"
 typetag,https://github.com/dtolnay/typetag,MIT OR Apache-2.0,David Tolnay <dtolnay@gmail.com>
+tz-rs,https://github.com/x-hgg-x/tz-rs,MIT OR Apache-2.0,x-hgg-x
 ua-parser,https://github.com/ua-parser/uap-rust,Apache-2.0,The ua-parser Authors
 ucd-trie,https://github.com/BurntSushi/ucd-generate,MIT OR Apache-2.0,Andrew Gallant <jamslam@gmail.com>
 unarray,https://github.com/cameron1024/unarray,MIT OR Apache-2.0,The unarray Authors
diff --git a/src/sinks/azure_common/config.rs b/src/sinks/azure_common/config.rs
index b0d1dbd9cf5d3..5e10ea797c305 100644
--- a/src/sinks/azure_common/config.rs
+++ b/src/sinks/azure_common/config.rs
@@ -1,6 +1,7 @@
 use std::sync::Arc;
 
 use azure_core::{error::HttpError, RetryOptions};
+use azure_identity::{AutoRefreshingTokenCredential, DefaultAzureCredential};
 use azure_storage::{prelude::*, CloudLocation, ConnectionString};
 use azure_storage_blobs::{blob::operations::PutBlockBlobResponse, prelude::*};
 use bytes::Bytes;
@@ -141,7 +142,6 @@ pub fn build_client(
                 // generate the storage API endpoint
                 Some(uri) => ClientBuilder::with_location(
                     CloudLocation::Custom {
-                        account: "".to_string(),
                         uri: uri.to_string(),
                     },
                     connection_string.storage_credentials()?,
@@ -160,17 +160,15 @@ pub fn build_client(
             .container_client(container_name);
         }
         (None, Some(storage_account_p)) => {
-            let creds = azure_identity::create_default_credential()?;
-            let storage_credentials = StorageCredentials::token_credential(creds);
+            let creds = std::sync::Arc::new(DefaultAzureCredential::default());
+            let auto_creds = std::sync::Arc::new(AutoRefreshingTokenCredential::new(creds));
+            let storage_credentials = StorageCredentials::token_credential(auto_creds);
 
             client = match endpoint {
                 // If a blob_endpoint is provided in the configuration, use it with a Custom
                 // CloudLocation, to allow overriding the blob storage API endpoint
                 Some(endpoint) => ClientBuilder::with_location(
-                    CloudLocation::Custom {
-                        account: storage_account_p,
-                        uri: endpoint,
-                    },
+                    CloudLocation::Custom { uri: endpoint },
                     storage_credentials,
                 ),
                 // Use the storage_account configuration parameter and assume we are in Azure

From 346b1ba993f7cdb4e1608fcfb730267c90a85496 Mon Sep 17 00:00:00 2001
From: Miro Prasil <mprasil@users.noreply.github.com>
Date: Wed, 14 May 2025 19:46:54 +0000
Subject: [PATCH 006/305] fix(codecs): gelf encoder error message (#23021)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix(gelf encoder): gelf encoder error message

The error message in case the field name contains incorrect characters is misleading and can cause
quite an confusion.

The issue can be reproduced with following Vector config:

```yaml
sources:
  test:
    type: demo_logs
    format: shuffle
    decoding:
      codec: json
    count: 1
    lines:
      - '{"foo:baz": "baz", "short_message": "x"}'
sinks:
  console:
    type: console
    encoding:
      codec: gelf
    inputs:
      - test
```

With current version of vector I got:

```sh
❯ vector -c /tmp/vector.yaml -q
2025-05-09T19:55:47.827681Z ERROR sink{component_kind="sink" component_id=console component_type=console}: vector::internal_events::codecs: Failed serializing frame. error=LogEvent does not contain required field: "foo:baz" error_code="encoder_serialize" error_type="encoder_failed" stage="sending" internal_log_rate_limit=true
2025-05-09T19:55:47.827769Z ERROR sink{component_kind="sink" component_id=console component_type=console}: vector_common::internal_event::component_events_dropped: Events dropped intentional=false count=1 reason="Failed serializing frame." internal_log_rate_limit=true
2025-05-09T19:55:47.827800Z ERROR sink{component_kind="sink" component_id=console component_type=console}: vector::topology: An error occurred that Vector couldn't handle: the task completed with an error.
```

The part where it says `LogEvent does not contain required field: "foo:baz"` is quite confusing,
because the field is there and it's certainly not required. (though that might not be obvious for
less unusual field name)

It looks like the error message was there since early gelf implementation and not really
intentional. (possibly a placeholder that was never replaced)

The fixed version generates pretty straightforward message:

```
❯ vector -c /tmp/vector.yaml -q
2025-05-09T20:22:13.387678Z ERROR sink{component_kind="sink" component_id=console component_type=console}: vector::internal_events::codecs: Failed serializing frame. error=LogEvent contains field with invalid character in name: "foo:baz" error_code="encoder_serialize" error_type="encoder_failed" stage="sending" internal_log_rate_limit=true
2025-05-09T20:22:13.388008Z ERROR sink{component_kind="sink" component_id=console component_type=console}: vector_common::internal_event::component_events_dropped: Events dropped intentional=false count=1 reason="Failed serializing frame." internal_log_rate_limit=true
2025-05-09T20:22:13.388544Z ERROR sink{component_kind="sink" component_id=console component_type=console}: vector::topology: An error occurred that Vector couldn't handle: the task completed with an error.
```

This should hopefully be much easier to troubleshoot.

* Implement changes suggested in PR

- Rename the Snafu struct to `InvalidField`
- Make the Error message more specific by showing the pattern used to check field name
- Rename the changelog fragment to match the expected '<unique_name>.<fragment_type>.md' format.

* Fix rustfmt issue
---
 changelog.d/gelf-error.fix.md          | 3 +++
 lib/codecs/src/encoding/format/gelf.rs | 9 ++++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)
 create mode 100644 changelog.d/gelf-error.fix.md

diff --git a/changelog.d/gelf-error.fix.md b/changelog.d/gelf-error.fix.md
new file mode 100644
index 0000000000000..9f0133e6d550c
--- /dev/null
+++ b/changelog.d/gelf-error.fix.md
@@ -0,0 +1,3 @@
+Fixed misleading error message for invalid field name in gelf encoder.
+
+authors: mprasil
diff --git a/lib/codecs/src/encoding/format/gelf.rs b/lib/codecs/src/encoding/format/gelf.rs
index be5c861548822..ddd08e7d151f4 100644
--- a/lib/codecs/src/encoding/format/gelf.rs
+++ b/lib/codecs/src/encoding/format/gelf.rs
@@ -25,6 +25,12 @@ use vector_core::{
 pub enum GelfSerializerError {
     #[snafu(display(r#"LogEvent does not contain required field: "{}""#, field))]
     MissingField { field: KeyString },
+    #[snafu(display(
+        r#"LogEvent contains field with invalid name not matching pattern '{}': "{}""#,
+        pattern,
+        field,
+    ))]
+    InvalidField { field: KeyString, pattern: String },
     #[snafu(display(
         r#"LogEvent contains a value with an invalid type. field = "{}" type = "{}" expected type = "{}""#,
         field,
@@ -190,8 +196,9 @@ fn coerce_field_names_and_values(
                 _ => {
                     // additional fields must be only word chars, dashes and periods.
                     if !VALID_FIELD_REGEX.is_match(field) {
-                        return MissingFieldSnafu {
+                        return InvalidFieldSnafu {
                             field: field.clone(),
+                            pattern: VALID_FIELD_REGEX.to_string(),
                         }
                         .fail()
                         .map_err(|e| e.to_string().into());

From 1a1050dbe585bf4a79c37b2183d075ac49bbf254 Mon Sep 17 00:00:00 2001
From: Pavlos Rontidis <pavlos.rontidis@gmail.com>
Date: Wed, 14 May 2025 16:10:33 -0400
Subject: [PATCH 007/305] fix(ci): request ARG in every build stage (#23049)

---
 scripts/e2e/Dockerfile | 5 ++---
 tilt/Dockerfile        | 1 +
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/e2e/Dockerfile b/scripts/e2e/Dockerfile
index 495c69275cad4..d709f4158e29d 100644
--- a/scripts/e2e/Dockerfile
+++ b/scripts/e2e/Dockerfile
@@ -1,8 +1,7 @@
 ARG RUST_VERSION
 ARG FEATURES
-ARG DEBIAN_RELEASE=slim-bookworm
 
-FROM docker.io/rust:${RUST_VERSION}-${DEBIAN_RELEASE}
+FROM docker.io/rust:${RUST_VERSION}-slim-bookworm
 
 RUN apt-get update && apt-get -y --no-install-recommends install \
     build-essential \
@@ -28,7 +27,7 @@ RUN git clone https://github.com/rui314/mold.git \
     && cmake --build . -j $(nproc) \
     && cmake --install .
 
-RUN rustup run "${RUST_VERSION}" cargo install cargo-nextest --version 0.9.72 --locked
+RUN cargo install cargo-nextest --version 0.9.72 --locked
 
 COPY scripts/environment/install-protoc.sh /
 COPY tests/data/ca/certs /certs
diff --git a/tilt/Dockerfile b/tilt/Dockerfile
index dcdcaca0abe7c..379979efd159d 100644
--- a/tilt/Dockerfile
+++ b/tilt/Dockerfile
@@ -31,6 +31,7 @@ RUN --mount=type=cache,target=/vector/target \
 #
 # TARGET
 #
+ARG DEBIAN_RELEASE
 FROM docker.io/debian:${DEBIAN_RELEASE}-slim
 RUN apt-get update && apt-get -y --no-install-recommends install zlib1g && rm -rf /var/lib/apt/lists/*
 COPY --from=builder /vector/vector /usr/bin/vector

From 8f10b37a38daaec7bf48f91f00ebea6afa4eb183 Mon Sep 17 00:00:00 2001
From: Pavlos Rontidis <pavlos.rontidis@gmail.com>
Date: Thu, 15 May 2025 08:37:20 -0400
Subject: [PATCH 008/305] chore(ci): disable E2E datadog-logs test (#23055)

---
 .github/workflows/e2e.yml | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
index e5d322d2b8cc9..17df0426cb9ed 100644
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -82,14 +82,15 @@ jobs:
             echo "PR_HAS_ACCESS_TO_SECRETS=false" >> "$GITHUB_ENV"
           fi
 
-      - if: (github.event_name == 'schedule' || needs.changes.outputs.all-e2e == 'true' || needs.changes.outputs.e2e-datadog-logs == 'true') &&
-          (github.event_name != 'pull_request' || env.PR_HAS_ACCESS_TO_SECRETS == 'true')
-        name: e2e-datadog-logs
-        uses: nick-fields/retry@v3
-        with:
-          timeout_minutes: 35
-          max_attempts: 3
-          command: bash scripts/int-e2e-test.sh e2e datadog-logs
+      # Re-enable when https://github.com/vectordotdev/vector/issues/23054 is fixed.
+      #      - if: (github.event_name == 'schedule' || needs.changes.outputs.all-e2e == 'true' || needs.changes.outputs.e2e-datadog-logs == 'true') &&
+      #          (github.event_name != 'pull_request' || env.PR_HAS_ACCESS_TO_SECRETS == 'true')
+      #        name: e2e-datadog-logs
+      #        uses: nick-fields/retry@v3
+      #        with:
+      #          timeout_minutes: 35
+      #          max_attempts: 3
+      #          command: bash scripts/int-e2e-test.sh e2e datadog-logs
 
       - if: (github.event_name == 'schedule' || needs.changes.outputs.all-e2e == 'true' || needs.changes.outputs.e2e-datadog-metrics == 'true') &&
           (github.event_name != 'pull_request' || env.PR_HAS_ACCESS_TO_SECRETS == 'true')

From c1cf664ecbbdf5abe945a0b0c74001829a25fea5 Mon Sep 17 00:00:00 2001
From: Pavlos Rontidis <pavlos.rontidis@gmail.com>
Date: Thu, 15 May 2025 08:54:10 -0400
Subject: [PATCH 009/305] chore(ci): temporarily disable failing AMQP tests
 (#23057)

---
 .github/workflows/integration.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
index 74eb0bebaa696..35ba4e186dc5a 100644
--- a/.github/workflows/integration.yml
+++ b/.github/workflows/integration.yml
@@ -111,10 +111,11 @@ jobs:
     if: ${{ needs.setup.outputs.can_access_secrets == 'true' }}
     strategy:
       matrix:
+        # TODO: Add "amqp" back once https://github.com/vectordotdev/vector/issues/22379 is fixed.
         # TODO: Add "splunk" back once https://github.com/vectordotdev/vector/issues/22379 is fixed.
         # If you modify this list, please also update the `int_tests` job in changes.yml.
         service: [
-          "amqp", "appsignal", "axiom", "aws", "azure", "clickhouse", "databend", "datadog-agent",
+          "appsignal", "axiom", "aws", "azure", "clickhouse", "databend", "datadog-agent",
           "datadog-logs", "datadog-metrics", "datadog-traces", "dnstap", "docker-logs", "elasticsearch",
           "eventstoredb", "fluent", "gcp", "greptimedb", "http-client", "influxdb", "kafka", "logstash",
           "loki", "mongodb", "nats", "nginx", "opentelemetry", "postgres", "prometheus", "pulsar",

From f2b4e29191e5cbdd6d94111dec1122dc3f9da5d7 Mon Sep 17 00:00:00 2001
From: Pavlos Rontidis <pavlos.rontidis@gmail.com>
Date: Thu, 15 May 2025 09:13:27 -0400
Subject: [PATCH 010/305] chore(ci): remove redundant rustup prefix (#23059)

---
 scripts/integration/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/integration/Dockerfile b/scripts/integration/Dockerfile
index 07ffd19738823..587897d20bd7e 100644
--- a/scripts/integration/Dockerfile
+++ b/scripts/integration/Dockerfile
@@ -16,7 +16,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
     git \
   && rm -rf /var/lib/apt/lists/*
 
-RUN rustup run "${RUST_VERSION}" cargo install cargo-nextest --version 0.9.72 --locked
+RUN cargo install cargo-nextest --version 0.9.72 --locked
 
 COPY scripts/environment/install-protoc.sh /
 COPY tests/data/ca/certs /certs

From 4643acd78cdaf051c3088f7fc46be1488c109563 Mon Sep 17 00:00:00 2001
From: Pavlos Rontidis <pavlos.rontidis@gmail.com>
Date: Thu, 15 May 2025 09:22:23 -0400
Subject: [PATCH 011/305] chore(ci): provide default RUST_VERSION if one is not
 specified (#23060)

---
 scripts/e2e/Dockerfile         | 2 +-
 scripts/integration/Dockerfile | 2 +-
 tilt/Dockerfile                | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/e2e/Dockerfile b/scripts/e2e/Dockerfile
index d709f4158e29d..8de9c2834d67a 100644
--- a/scripts/e2e/Dockerfile
+++ b/scripts/e2e/Dockerfile
@@ -1,4 +1,4 @@
-ARG RUST_VERSION
+ARG RUST_VERSION=1.85
 ARG FEATURES
 
 FROM docker.io/rust:${RUST_VERSION}-slim-bookworm
diff --git a/scripts/integration/Dockerfile b/scripts/integration/Dockerfile
index 587897d20bd7e..a50808aba751b 100644
--- a/scripts/integration/Dockerfile
+++ b/scripts/integration/Dockerfile
@@ -1,4 +1,4 @@
-ARG RUST_VERSION
+ARG RUST_VERSION=1.85
 FROM docker.io/rust:${RUST_VERSION}-slim-bookworm
 
 RUN apt-get update && apt-get install -y --no-install-recommends \
diff --git a/tilt/Dockerfile b/tilt/Dockerfile
index 379979efd159d..2831d165d4166 100644
--- a/tilt/Dockerfile
+++ b/tilt/Dockerfile
@@ -1,4 +1,4 @@
-ARG RUST_VERSION
+ARG RUST_VERSION=1.85
 ARG DEBIAN_RELEASE=bookworm
 # Features required for both Agent and Aggregator Helm chart configurations
 ARG FEATURES=api,api-client,sources-datadog_agent,sources-fluent,sources-host_metrics,sources-internal_metrics,sources-kubernetes_logs,sources-logstash,sources-splunk_hec,sources-statsd,sources-syslog,sources-vector,sinks-console,sinks-prometheus,sinks-vector

From 84e5fe9bec1221c58e663602a2aef10e90c146d5 Mon Sep 17 00:00:00 2001
From: Pavlos Rontidis <pavlos.rontidis@gmail.com>
Date: Thu, 15 May 2025 09:57:56 -0400
Subject: [PATCH 012/305] chore(ci): bump nextest to latest version (#23058)

---
 scripts/e2e/Dockerfile                         | 2 +-
 scripts/environment/bootstrap-windows-2022.ps1 | 2 +-
 scripts/environment/prepare.sh                 | 4 ++--
 scripts/integration/Dockerfile                 | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/scripts/e2e/Dockerfile b/scripts/e2e/Dockerfile
index 8de9c2834d67a..c0726c94e5935 100644
--- a/scripts/e2e/Dockerfile
+++ b/scripts/e2e/Dockerfile
@@ -27,7 +27,7 @@ RUN git clone https://github.com/rui314/mold.git \
     && cmake --build . -j $(nproc) \
     && cmake --install .
 
-RUN cargo install cargo-nextest --version 0.9.72 --locked
+RUN cargo install cargo-nextest --version 0.9.95 --locked
 
 COPY scripts/environment/install-protoc.sh /
 COPY tests/data/ca/certs /certs
diff --git a/scripts/environment/bootstrap-windows-2022.ps1 b/scripts/environment/bootstrap-windows-2022.ps1
index 27b35d9ff55b9..7af1123b2df35 100644
--- a/scripts/environment/bootstrap-windows-2022.ps1
+++ b/scripts/environment/bootstrap-windows-2022.ps1
@@ -10,7 +10,7 @@ echo "CARGO_BUILD_JOBS=$N_JOBS" | Out-File -FilePath $env:GITHUB_ENV -Encoding u
 if ($env:RELEASE_BUILDER -ne "true")
 {
     # Ensure we have cargo-next test installed.
-    rustup run stable cargo install cargo-nextest --version 0.9.72 --locked
+    rustup run stable cargo install cargo-nextest --version 0.9.95 --locked
 }
 
 # Enable retries to avoid transient network issues.
diff --git a/scripts/environment/prepare.sh b/scripts/environment/prepare.sh
index f7b0f2508516b..a42daaf8c427d 100755
--- a/scripts/environment/prepare.sh
+++ b/scripts/environment/prepare.sh
@@ -11,8 +11,8 @@ fi
 if [[ "$(cross --version | grep cross)" != "cross 0.2.5" ]] ; then
   rustup run stable cargo install cross --version 0.2.5 --force --locked
 fi
-if [[ "$(cargo-nextest --version)" != "cargo-nextest 0.9.72" ]] ; then
-  rustup run stable cargo install cargo-nextest --version 0.9.72 --force --locked
+if [[ "$(cargo-nextest --version)" != "cargo-nextest 0.9.95" ]] ; then
+  rustup run stable cargo install cargo-nextest --version 0.9.95 --force --locked
 fi
 if [[ "$(cargo-deny --version)" != "cargo-deny 0.16.1" ]] ; then
   rustup run stable cargo install cargo-deny --version 0.16.1 --force --locked
diff --git a/scripts/integration/Dockerfile b/scripts/integration/Dockerfile
index a50808aba751b..3e6b68dbfb669 100644
--- a/scripts/integration/Dockerfile
+++ b/scripts/integration/Dockerfile
@@ -16,7 +16,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
     git \
   && rm -rf /var/lib/apt/lists/*
 
-RUN cargo install cargo-nextest --version 0.9.72 --locked
+RUN cargo install cargo-nextest --version 0.9.95 --locked
 
 COPY scripts/environment/install-protoc.sh /
 COPY tests/data/ca/certs /certs

From 2c63454e394cdd18451bd3432b87f1b65d516ede Mon Sep 17 00:00:00 2001
From: Burkov Egor <xwooffie@gmail.com>
Date: Thu, 15 May 2025 16:07:01 +0300
Subject: [PATCH 013/305] fix(parsing): Handling wrong timestamps in
 dnstap-parser (#23048)

* fix(parsing): Handling wrong timestamps in dnstap-parser

* Add tests and changelog
---
 .../23048_fix_arith_logic_dnstap_parse.fix.md |  3 ++
 lib/dnstap-parser/src/parser.rs               | 54 +++++++++++++++++--
 2 files changed, 52 insertions(+), 5 deletions(-)
 create mode 100644 changelog.d/23048_fix_arith_logic_dnstap_parse.fix.md

diff --git a/changelog.d/23048_fix_arith_logic_dnstap_parse.fix.md b/changelog.d/23048_fix_arith_logic_dnstap_parse.fix.md
new file mode 100644
index 0000000000000..1a213d2bd4e4a
--- /dev/null
+++ b/changelog.d/23048_fix_arith_logic_dnstap_parse.fix.md
@@ -0,0 +1,3 @@
+Added checks for integer operations with timestamps which used in `dnstap-parser::DnstapParser::parse`.
+
+authors: wooffie
diff --git a/lib/dnstap-parser/src/parser.rs b/lib/dnstap-parser/src/parser.rs
index 6a950c1a152b7..939f45a0b340d 100644
--- a/lib/dnstap-parser/src/parser.rs
+++ b/lib/dnstap-parser/src/parser.rs
@@ -236,7 +236,7 @@ impl DnstapParser {
                 dnstap_message_type_id,
                 dnstap_message.query_message.as_ref(),
                 &DNSTAP_MESSAGE_REQUEST_TYPE_IDS,
-            );
+            )?;
         }
 
         if let Some(response_time_sec) = dnstap_message.response_time_sec {
@@ -248,7 +248,7 @@ impl DnstapParser {
                 dnstap_message_type_id,
                 dnstap_message.response_message.as_ref(),
                 &DNSTAP_MESSAGE_RESPONSE_TYPE_IDS,
-            );
+            )?;
         }
 
         DnstapParser::parse_dnstap_message_type(
@@ -366,10 +366,29 @@ impl DnstapParser {
         dnstap_message_type_id: i32,
         message: Option<&Vec<u8>>,
         type_ids: &HashSet<i32>,
-    ) {
+    ) -> Result<()> {
+        if time_sec > i64::MAX as u64 {
+            return Err(Error::from("Cannot parse timestamp"));
+        }
+
         let (time_in_nanosec, query_time_nsec) = match time_nsec {
-            Some(nsec) => (time_sec as i64 * 1_000_000_000_i64 + nsec as i64, nsec),
-            None => (time_sec as i64 * 1_000_000_000_i64, 0),
+            Some(nsec) => {
+                if let Some(time_in_ns) = (time_sec as i64)
+                    .checked_mul(1_000_000_000)
+                    .and_then(|v| v.checked_add(nsec as i64))
+                {
+                    (time_in_ns, nsec)
+                } else {
+                    return Err(Error::from("Cannot parse timestamp"));
+                }
+            }
+            None => {
+                if let Some(time_in_ns) = (time_sec as i64).checked_mul(1_000_000_000) {
+                    (time_in_ns, 0)
+                } else {
+                    return Err(Error::from("Cannot parse timestamp"));
+                }
+            }
         };
 
         if type_ids.contains(&dnstap_message_type_id) {
@@ -392,6 +411,7 @@ impl DnstapParser {
                 "ns",
             );
         }
+        Ok(())
     }
 
     fn parse_dnstap_message_socket_family<'a>(
@@ -1321,6 +1341,30 @@ mod tests {
         assert!(e.to_string().contains("Protobuf message"));
     }
 
+    #[test]
+    fn test_parse_dnstap_data_with_invalid_timestamp() {
+        fn test_one_timestamp_parse(time_sec: u64, time_nsec: Option<u32>) -> Result<()> {
+            let mut event = LogEvent::default();
+            let root = owned_value_path!();
+            let type_ids = HashSet::new();
+            DnstapParser::parse_dnstap_message_time(
+                &mut event, &root, time_sec, time_nsec, 0, None, &type_ids,
+            )
+        }
+        // okay case
+        assert!(test_one_timestamp_parse(1337, Some(42)).is_ok());
+        // overflow in cast (u64 -> i64)
+        assert!(test_one_timestamp_parse(u64::MAX, Some(42)).is_err());
+        assert!(test_one_timestamp_parse(u64::MAX, None).is_err());
+        // overflow in multiplication
+        assert!(test_one_timestamp_parse(i64::MAX as u64, Some(42)).is_err());
+        assert!(test_one_timestamp_parse(i64::MAX as u64, None).is_err());
+        // overflow in add
+        assert!(
+            test_one_timestamp_parse((i64::MAX / 1_000_000_000) as u64, Some(u32::MAX)).is_err()
+        )
+    }
+
     #[test]
     fn test_get_socket_family_name() {
         assert_eq!("INET", to_socket_family_name(1).unwrap());

From ace0dd21b542cfd522a18f3f3943a643a91e0e79 Mon Sep 17 00:00:00 2001
From: Burkov Egor <xwooffie@gmail.com>
Date: Thu, 15 May 2025 16:42:26 +0300
Subject: [PATCH 014/305] fix(parsing): Handle underflow in A6 parsing (#23047)

* fix(parsing): Handle underflow in A6 parsing

* Add tests and changelog

* Change changelog filename for spelling
---
 ...47_add_a6_prefix_check_in_dns_parsing.fix.md |  3 +++
 lib/dnsmsg-parser/src/dns_message_parser.rs     | 17 +++++++++++++++++
 2 files changed, 20 insertions(+)
 create mode 100644 changelog.d/23047_add_a6_prefix_check_in_dns_parsing.fix.md

diff --git a/changelog.d/23047_add_a6_prefix_check_in_dns_parsing.fix.md b/changelog.d/23047_add_a6_prefix_check_in_dns_parsing.fix.md
new file mode 100644
index 0000000000000..7de9609bce5d7
--- /dev/null
+++ b/changelog.d/23047_add_a6_prefix_check_in_dns_parsing.fix.md
@@ -0,0 +1,3 @@
+Fixed a bug that allowed a record to be transmitted with an IPv6 prefix larger than allowed (128) in `dnsmsg_parser::DnsMessageParser` parse functions.
+
+authors: wooffie
diff --git a/lib/dnsmsg-parser/src/dns_message_parser.rs b/lib/dnsmsg-parser/src/dns_message_parser.rs
index f7d6ba033dc45..fadb27109ae63 100644
--- a/lib/dnsmsg-parser/src/dns_message_parser.rs
+++ b/lib/dnsmsg-parser/src/dns_message_parser.rs
@@ -263,6 +263,11 @@ impl DnsMessageParser {
         let mut decoder = BinDecoder::new(raw_rdata);
         let prefix = parse_u8(&mut decoder)?;
         let ipv6_address = {
+            if prefix > 128 {
+                return Err(DnsMessageParserError::SimpleError {
+                    cause: String::from("IPV6 prefix can't be greater than 128."),
+                });
+            }
             let address_length = (128 - prefix) / 8;
             let mut address_vec = parse_vec(&mut decoder, address_length)?;
             if address_vec.len() < 16 {
@@ -1534,6 +1539,18 @@ mod tests {
             .is_err());
     }
 
+    #[test]
+    fn test_parse_bad_prefix_value() {
+        // this testcase have prefix value of 160,
+        let raw_dns_message = "oAAAMgABAAAAAAABAAABAAAAACYAAC8BAAAAAaAAAAAAAA==";
+        let raw_query_message = BASE64
+            .decode(raw_dns_message.as_bytes())
+            .expect("Invalid base64 encoded data.");
+        assert!(DnsMessageParser::new(raw_query_message)
+            .parse_as_query_message()
+            .is_err());
+    }
+
     #[test]
     fn test_parse_as_update_message() {
         let raw_dns_message = "xjUoAAABAAAAAQAAB2V4YW1wbGUDY29tAAAGAAECaDXADAD/AP8AAAAAAAA=";

From 9cdab60b320ad14c06214b4cf7b7e0f8a441f373 Mon Sep 17 00:00:00 2001
From: nekorro <nekorro@gmail.com>
Date: Thu, 15 May 2025 17:26:16 +0300
Subject: [PATCH 015/305] feat(remap transform): make `--watch-config` watch
 external VRL files in `remap` transforms (#23010)

* feat(transforms): add files_to_watch support for transforms

Invoke the `files_to_watch` function for applicable transforms to
collect external file paths that should be watched for changes.

* feat(remap transfrom): add files_to_watch to track VRL files

Add a `files_to_watch` function to the remap transform to collect file
paths from the `file` and `files` fields. This allows to watch these
files for changes and trigger reloads when the VRL code is modified.

* fix(config): relative path handling for external files when `--watch-config` enabled

Relative paths to external files in the configuration are now correctly
resolved when using --watch-config.
Previously, changes to such files not trigger a reload if the path
provided in the config was relative. This fix ensures that relative
paths are canonicalized, allowing file changes to be properly detected.
---
 .../9819_watch_remap_external_vrl.enhancement.md      |  3 +++
 src/app.rs                                            | 11 +++++++++++
 src/config/mod.rs                                     | 10 ++++++++--
 src/config/transform.rs                               |  6 ++++++
 src/transforms/remap.rs                               |  7 +++++++
 5 files changed, 35 insertions(+), 2 deletions(-)
 create mode 100644 changelog.d/9819_watch_remap_external_vrl.enhancement.md

diff --git a/changelog.d/9819_watch_remap_external_vrl.enhancement.md b/changelog.d/9819_watch_remap_external_vrl.enhancement.md
new file mode 100644
index 0000000000000..a77b4c1809d7f
--- /dev/null
+++ b/changelog.d/9819_watch_remap_external_vrl.enhancement.md
@@ -0,0 +1,3 @@
+Files specified in the `file` and `files` fields of `remap` transforms are now watched when `--watch-config` is enabled. Changes to these files automatically trigger a configuration reload, so there's no need to restart Vector.
+
+authors: nekorro
diff --git a/src/app.rs b/src/app.rs
index 3707071041510..04023ebba4bab 100644
--- a/src/app.rs
+++ b/src/app.rs
@@ -533,6 +533,13 @@ pub async fn load_configs(
     let mut watched_component_paths = Vec::new();
 
     if let Some(watcher_conf) = watcher_conf {
+        for (name, transform) in config.transforms() {
+            let files = transform.inner.files_to_watch();
+            let component_config =
+                ComponentConfig::new(files.into_iter().cloned().collect(), name.clone());
+            watched_component_paths.push(component_config);
+        }
+
         for (name, sink) in config.sinks() {
             let files = sink.inner.files_to_watch();
             let component_config =
@@ -544,6 +551,10 @@ pub async fn load_configs(
             message = "Starting watcher.",
             paths = ?watched_paths
         );
+        info!(
+            message = "Components to watch.",
+            paths = ?watched_component_paths
+        );
 
         // Start listening for config changes.
         config::watcher::spawn_thread(
diff --git a/src/config/mod.rs b/src/config/mod.rs
index d42d87c9753af..8da0ce75c4255 100644
--- a/src/config/mod.rs
+++ b/src/config/mod.rs
@@ -2,6 +2,7 @@
 use std::{
     collections::{HashMap, HashSet},
     fmt::{self, Display, Formatter},
+    fs,
     hash::Hash,
     net::SocketAddr,
     path::PathBuf,
@@ -83,9 +84,14 @@ pub struct ComponentConfig {
 }
 
 impl ComponentConfig {
-    pub const fn new(config_paths: Vec<PathBuf>, component_key: ComponentKey) -> Self {
+    pub fn new(config_paths: Vec<PathBuf>, component_key: ComponentKey) -> Self {
+        let canonicalized_paths = config_paths
+            .into_iter()
+            .filter_map(|p| fs::canonicalize(p).ok())
+            .collect();
+
         Self {
-            config_paths,
+            config_paths: canonicalized_paths,
             component_key,
         }
     }
diff --git a/src/config/transform.rs b/src/config/transform.rs
index 4ab7e21f99573..b1a32534edc8a 100644
--- a/src/config/transform.rs
+++ b/src/config/transform.rs
@@ -1,5 +1,6 @@
 use std::cell::RefCell;
 use std::collections::{HashMap, HashSet};
+use std::path::PathBuf;
 
 use async_trait::async_trait;
 use dyn_clone::DynClone;
@@ -253,6 +254,11 @@ pub trait TransformConfig: DynClone + NamedComponent + core::fmt::Debug + Send +
     fn nestable(&self, _parents: &HashSet<&'static str>) -> bool {
         true
     }
+
+    /// Gets the files to watch to trigger reload
+    fn files_to_watch(&self) -> Vec<&PathBuf> {
+        Vec::new()
+    }
 }
 
 dyn_clone::clone_trait_object!(TransformConfig);
diff --git a/src/transforms/remap.rs b/src/transforms/remap.rs
index 27973b3eb40f3..9f92a9a61b26b 100644
--- a/src/transforms/remap.rs
+++ b/src/transforms/remap.rs
@@ -383,6 +383,13 @@ impl TransformConfig for RemapConfig {
     fn enable_concurrency(&self) -> bool {
         true
     }
+
+    fn files_to_watch(&self) -> Vec<&PathBuf> {
+        self.file
+            .iter()
+            .chain(self.files.iter().flatten())
+            .collect()
+    }
 }
 
 #[derive(Debug, Clone)]

From 914d1568dd1363d2d95b9e8dc4b2b1a808885d12 Mon Sep 17 00:00:00 2001
From: Pavlos Rontidis <pavlos.rontidis@gmail.com>
Date: Fri, 16 May 2025 12:59:37 -0400
Subject: [PATCH 016/305] chore(ci): install mold (no need to build it)
 (#23064)

---
 scripts/e2e/Dockerfile | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/scripts/e2e/Dockerfile b/scripts/e2e/Dockerfile
index c0726c94e5935..3af5d83489c27 100644
--- a/scripts/e2e/Dockerfile
+++ b/scripts/e2e/Dockerfile
@@ -16,16 +16,8 @@ RUN apt-get update && apt-get -y --no-install-recommends install \
     libxxhash-dev \
     unzip \
     zlib1g-dev \
-    zlib1g
-
-RUN git clone https://github.com/rui314/mold.git \
-    && mkdir mold/build \
-    && cd mold/build \
-    && git checkout v2.0.0 \
-    && ../install-build-deps.sh \
-    && cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_COMPILER=c++ .. \
-    && cmake --build . -j $(nproc) \
-    && cmake --install .
+    zlib1g \
+    mold
 
 RUN cargo install cargo-nextest --version 0.9.95 --locked
 
@@ -40,6 +32,6 @@ ARG FEATURES
 RUN --mount=type=cache,target=/vector/target \
     --mount=type=cache,target=/usr/local/cargo/registry \
     --mount=type=cache,target=/usr/local/cargo/git \
-    /usr/local/bin/mold -run cargo build --tests --lib --bin vector \
+    /usr/bin/mold -run cargo build --tests --lib --bin vector \
     --no-default-features --features $FEATURES && \
     cp target/debug/vector /usr/bin/vector

From 1d232fb5057786b704b5ac953aa0fd7a74493c26 Mon Sep 17 00:00:00 2001
From: Nick Wang <nickywang100@gmail.com>
Date: Fri, 16 May 2025 10:53:31 -0700
Subject: [PATCH 017/305] enhancement(enriching): add from and to date search
 to enrichment tables (#22926)

* add from and to to evaluate_condition and add_index

* add FromDate and ToDate to enum Condition

* add conditions to row_equals and unit tests

* update website

* add changelog entry

* Update comment in lib/enrichment/src/lib.rs

Co-authored-by: Pavlos Rontidis <pavlos.rontidis@gmail.com>

* Update comment in lib/enrichment/src/lib.rs

Co-authored-by: Pavlos Rontidis <pavlos.rontidis@gmail.com>

* Update changelog.d/22926_enrichment_function_single_bounded_date_range_search.enhancement.md

Co-authored-by: Pavlos Rontidis <pavlos.rontidis@gmail.com>

* remove trailing space

fixes failing check https://github.com/vectordotdev/vector/actions/runs/14868558637/job/41959755638

---------

Co-authored-by: Pavlos Rontidis <pavlos.rontidis@gmail.com>
---
 ...e_bounded_date_range_search.enhancement.md |   3 +
 lib/enrichment/src/lib.rs                     |  10 ++
 lib/enrichment/src/vrl_util.rs                |  23 ++-
 src/enrichment_tables/file.rs                 | 142 +++++++++++++++++-
 website/cue/reference/remap/functions.cue     |   2 +-
 5 files changed, 177 insertions(+), 3 deletions(-)
 create mode 100644 changelog.d/22926_enrichment_function_single_bounded_date_range_search.enhancement.md

diff --git a/changelog.d/22926_enrichment_function_single_bounded_date_range_search.enhancement.md b/changelog.d/22926_enrichment_function_single_bounded_date_range_search.enhancement.md
new file mode 100644
index 0000000000000..e20a27c160a15
--- /dev/null
+++ b/changelog.d/22926_enrichment_function_single_bounded_date_range_search.enhancement.md
@@ -0,0 +1,3 @@
+The [enrichment functions](https://vector.dev/docs/reference/vrl/functions/#enrichment-functions) now support bounded date range filtering using optional `from` and `to` parameters. There are no changes to the function signatures.
+
+authors: nzxwang
diff --git a/lib/enrichment/src/lib.rs b/lib/enrichment/src/lib.rs
index 52f2a547f50f1..91195aa77338b 100644
--- a/lib/enrichment/src/lib.rs
+++ b/lib/enrichment/src/lib.rs
@@ -26,6 +26,16 @@ pub enum Condition<'a> {
         from: chrono::DateTime<chrono::Utc>,
         to: chrono::DateTime<chrono::Utc>,
     },
+    /// The date in the field is greater than or equal to `from`.
+    FromDate {
+        field: &'a str,
+        from: chrono::DateTime<chrono::Utc>,
+    },
+    /// The date in the field is less than or equal to `to`.
+    ToDate {
+        field: &'a str,
+        to: chrono::DateTime<chrono::Utc>,
+    },
 }
 
 #[derive(Clone, Copy, Debug, PartialEq, Eq)]
diff --git a/lib/enrichment/src/vrl_util.rs b/lib/enrichment/src/vrl_util.rs
index 61e7044c53c99..df40824cb17c6 100644
--- a/lib/enrichment/src/vrl_util.rs
+++ b/lib/enrichment/src/vrl_util.rs
@@ -55,6 +55,22 @@ pub(crate) fn evaluate_condition(key: &str, value: Value) -> ExpressionResult<Co
                     .ok_or("to in condition must be a timestamp")?,
             }
         }
+        Value::Object(map) if map.contains_key("from") => Condition::FromDate {
+            field: key,
+            from: *map
+                .get("from")
+                .expect("should contain from")
+                .as_timestamp()
+                .ok_or("from in condition must be a timestamp")?,
+        },
+        Value::Object(map) if map.contains_key("to") => Condition::ToDate {
+            field: key,
+            to: *map
+                .get("to")
+                .expect("should contain to")
+                .as_timestamp()
+                .ok_or("to in condition must be a timestamp")?,
+        },
         _ => Condition::Equals { field: key, value },
     })
 }
@@ -71,7 +87,12 @@ pub(crate) fn add_index(
         .filter_map(|(field, value)| match value {
             expression::Expr::Container(expression::Container {
                 variant: expression::Variant::Object(map),
-            }) if map.contains_key("from") && map.contains_key("to") => None,
+            }) if (map.contains_key("from") && map.contains_key("to"))
+                || map.contains_key("from")
+                || map.contains_key("to") =>
+            {
+                None
+            }
             _ => Some(field.as_ref()),
         })
         .collect::<Vec<_>>();
diff --git a/src/enrichment_tables/file.rs b/src/enrichment_tables/file.rs
index 32ec9318b88e0..20abb4fa8a4d1 100644
--- a/src/enrichment_tables/file.rs
+++ b/src/enrichment_tables/file.rs
@@ -317,6 +317,20 @@ impl File {
                     _ => false,
                 },
             },
+            Condition::FromDate { field, from } => match self.column_index(field) {
+                None => false,
+                Some(idx) => match row[idx] {
+                    Value::Timestamp(date) => from <= &date,
+                    _ => false,
+                },
+            },
+            Condition::ToDate { field, to } => match self.column_index(field) {
+                None => false,
+                Some(idx) => match row[idx] {
+                    Value::Timestamp(date) => &date <= to,
+                    _ => false,
+                },
+            },
         })
     }
 
@@ -1030,7 +1044,7 @@ mod tests {
     }
 
     #[test]
-    fn finds_row_with_dates() {
+    fn finds_row_between_dates() {
         let mut file = File::new(
             Default::default(),
             FileData {
@@ -1096,6 +1110,132 @@ mod tests {
         );
     }
 
+    #[test]
+    fn finds_row_from_date() {
+        let mut file = File::new(
+            Default::default(),
+            FileData {
+                modified: SystemTime::now(),
+                data: vec![
+                    vec![
+                        "zip".into(),
+                        Value::Timestamp(
+                            chrono::Utc
+                                .with_ymd_and_hms(2015, 12, 7, 0, 0, 0)
+                                .single()
+                                .expect("invalid timestamp"),
+                        ),
+                    ],
+                    vec![
+                        "zip".into(),
+                        Value::Timestamp(
+                            chrono::Utc
+                                .with_ymd_and_hms(2016, 12, 7, 0, 0, 0)
+                                .single()
+                                .expect("invalid timestamp"),
+                        ),
+                    ],
+                ],
+                headers: vec!["field1".to_string(), "field2".to_string()],
+            },
+        );
+
+        let handle = file.add_index(Case::Sensitive, &["field1"]).unwrap();
+
+        let conditions = [
+            Condition::Equals {
+                field: "field1",
+                value: "zip".into(),
+            },
+            Condition::FromDate {
+                field: "field2",
+                from: chrono::Utc
+                    .with_ymd_and_hms(2016, 1, 1, 0, 0, 0)
+                    .single()
+                    .expect("invalid timestamp"),
+            },
+        ];
+
+        assert_eq!(
+            Ok(ObjectMap::from([
+                ("field1".into(), Value::from("zip")),
+                (
+                    "field2".into(),
+                    Value::Timestamp(
+                        chrono::Utc
+                            .with_ymd_and_hms(2016, 12, 7, 0, 0, 0)
+                            .single()
+                            .expect("invalid timestamp")
+                    )
+                )
+            ])),
+            file.find_table_row(Case::Sensitive, &conditions, None, Some(handle))
+        );
+    }
+
+    #[test]
+    fn finds_row_to_date() {
+        let mut file = File::new(
+            Default::default(),
+            FileData {
+                modified: SystemTime::now(),
+                data: vec![
+                    vec![
+                        "zip".into(),
+                        Value::Timestamp(
+                            chrono::Utc
+                                .with_ymd_and_hms(2015, 12, 7, 0, 0, 0)
+                                .single()
+                                .expect("invalid timestamp"),
+                        ),
+                    ],
+                    vec![
+                        "zip".into(),
+                        Value::Timestamp(
+                            chrono::Utc
+                                .with_ymd_and_hms(2016, 12, 7, 0, 0, 0)
+                                .single()
+                                .expect("invalid timestamp"),
+                        ),
+                    ],
+                ],
+                headers: vec!["field1".to_string(), "field2".to_string()],
+            },
+        );
+
+        let handle = file.add_index(Case::Sensitive, &["field1"]).unwrap();
+
+        let conditions = [
+            Condition::Equals {
+                field: "field1",
+                value: "zip".into(),
+            },
+            Condition::ToDate {
+                field: "field2",
+                to: chrono::Utc
+                    .with_ymd_and_hms(2016, 1, 1, 0, 0, 0)
+                    .single()
+                    .expect("invalid timestamp"),
+            },
+        ];
+
+        assert_eq!(
+            Ok(ObjectMap::from([
+                ("field1".into(), Value::from("zip")),
+                (
+                    "field2".into(),
+                    Value::Timestamp(
+                        chrono::Utc
+                            .with_ymd_and_hms(2015, 12, 7, 0, 0, 0)
+                            .single()
+                            .expect("invalid timestamp")
+                    )
+                )
+            ])),
+            file.find_table_row(Case::Sensitive, &conditions, None, Some(handle))
+        );
+    }
+
     #[test]
     fn doesnt_find_row() {
         let file = File::new(
diff --git a/website/cue/reference/remap/functions.cue b/website/cue/reference/remap/functions.cue
index d739d474fec60..18ed9457a673c 100644
--- a/website/cue/reference/remap/functions.cue
+++ b/website/cue/reference/remap/functions.cue
@@ -74,7 +74,7 @@ remap: {
 		   performance perspective.
 
 		2. **Date range search**. The given field must be greater than or equal to the `from` date
-		   and less than or equal to the `to` date. A date range search involves
+		   and/or less than or equal to the `to` date. A date range search involves
 		   sequentially scanning through the rows that have been located using any exact match
 		   criteria. This can be an expensive operation if there are many rows returned by any exact
 		   match criteria. Therefore, use date ranges as the _only_ criteria when the enrichment

From c9791e3db80659a5f763e51b4ad0824e366cbf1f Mon Sep 17 00:00:00 2001
From: Pavlos Rontidis <pavlos.rontidis@gmail.com>
Date: Fri, 16 May 2025 17:15:42 -0400
Subject: [PATCH 018/305] fix(ci): path resolution for docker compose files
 (#23066)

* fix(ci): path resolution for docker compose files

* yaml spaces...
---
 .github/workflows/e2e.yml                | 17 +++++++-------
 .github/workflows/integration.yml        |  3 +--
 scripts/e2e/datadog-logs/compose.yaml    | 28 ++++++++++++------------
 scripts/e2e/datadog-metrics/compose.yaml | 12 +++++-----
 scripts/integration/amqp/compose.yaml    |  3 +--
 5 files changed, 30 insertions(+), 33 deletions(-)

diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
index 17df0426cb9ed..e5d322d2b8cc9 100644
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -82,15 +82,14 @@ jobs:
             echo "PR_HAS_ACCESS_TO_SECRETS=false" >> "$GITHUB_ENV"
           fi
 
-      # Re-enable when https://github.com/vectordotdev/vector/issues/23054 is fixed.
-      #      - if: (github.event_name == 'schedule' || needs.changes.outputs.all-e2e == 'true' || needs.changes.outputs.e2e-datadog-logs == 'true') &&
-      #          (github.event_name != 'pull_request' || env.PR_HAS_ACCESS_TO_SECRETS == 'true')
-      #        name: e2e-datadog-logs
-      #        uses: nick-fields/retry@v3
-      #        with:
-      #          timeout_minutes: 35
-      #          max_attempts: 3
-      #          command: bash scripts/int-e2e-test.sh e2e datadog-logs
+      - if: (github.event_name == 'schedule' || needs.changes.outputs.all-e2e == 'true' || needs.changes.outputs.e2e-datadog-logs == 'true') &&
+          (github.event_name != 'pull_request' || env.PR_HAS_ACCESS_TO_SECRETS == 'true')
+        name: e2e-datadog-logs
+        uses: nick-fields/retry@v3
+        with:
+          timeout_minutes: 35
+          max_attempts: 3
+          command: bash scripts/int-e2e-test.sh e2e datadog-logs
 
       - if: (github.event_name == 'schedule' || needs.changes.outputs.all-e2e == 'true' || needs.changes.outputs.e2e-datadog-metrics == 'true') &&
           (github.event_name != 'pull_request' || env.PR_HAS_ACCESS_TO_SECRETS == 'true')
diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
index 35ba4e186dc5a..74eb0bebaa696 100644
--- a/.github/workflows/integration.yml
+++ b/.github/workflows/integration.yml
@@ -111,11 +111,10 @@ jobs:
     if: ${{ needs.setup.outputs.can_access_secrets == 'true' }}
     strategy:
       matrix:
-        # TODO: Add "amqp" back once https://github.com/vectordotdev/vector/issues/22379 is fixed.
         # TODO: Add "splunk" back once https://github.com/vectordotdev/vector/issues/22379 is fixed.
         # If you modify this list, please also update the `int_tests` job in changes.yml.
         service: [
-          "appsignal", "axiom", "aws", "azure", "clickhouse", "databend", "datadog-agent",
+          "amqp", "appsignal", "axiom", "aws", "azure", "clickhouse", "databend", "datadog-agent",
           "datadog-logs", "datadog-metrics", "datadog-traces", "dnstap", "docker-logs", "elasticsearch",
           "eventstoredb", "fluent", "gcp", "greptimedb", "http-client", "influxdb", "kafka", "logstash",
           "loki", "mongodb", "nats", "nginx", "opentelemetry", "postgres", "prometheus", "pulsar",
diff --git a/scripts/e2e/datadog-logs/compose.yaml b/scripts/e2e/datadog-logs/compose.yaml
index fe0bafc869012..61a9f8f2da1ae 100644
--- a/scripts/e2e/datadog-logs/compose.yaml
+++ b/scripts/e2e/datadog-logs/compose.yaml
@@ -32,12 +32,12 @@ services:
     - DD_ENABLE_PAYLOADS_SERVICE_CHECKS=false
     - DD_CONTAINER_EXCLUDE="name:.*"
     volumes:
-    # The Agent config file
-    - ${PWD}/tests/data/e2e/datadog/logs/agent_only.yaml:/etc/datadog-agent/datadog.yaml
-    # The custom logs check
-    - ${PWD}/tests/data/e2e/datadog/logs/logs.conf.d:/conf.d:ro
-    # The custom log to tail, created by the `log_generator` service
-    - log_path:/var/log/
+      # The Agent config file
+      - ../../../tests/data/e2e/datadog/logs/agent_only.yaml:/etc/datadog-agent/datadog.yaml
+      # The custom logs check
+      - ../../../tests/data/e2e/datadog/logs/logs.conf.d:/conf.d:ro
+      # The custom log to tail, created by the `log_generator` service
+      - log_path:/var/log/
 
   # Tails a custom log created by `log_generator` and sends log data to
   # the `vector` service
@@ -52,12 +52,12 @@ services:
     - DD_ENABLE_PAYLOADS_SERVICE_CHECKS=false
     - DD_CONTAINER_EXCLUDE="name:.*"
     volumes:
-    # The Agent config file
-    - ${PWD}/tests/data/e2e/datadog/logs/agent_vector.yaml:/etc/datadog-agent/datadog.yaml
-    # The custom logs check
-    - ${PWD}/tests/data/e2e/datadog/logs/logs.conf.d:/conf.d:ro
-    # The custom log to tail, created by the `log_generator` service
-    - log_path:/var/log/
+      # The Agent config file
+      - ../../../tests/data/e2e/datadog/logs/agent_vector.yaml:/etc/datadog-agent/datadog.yaml
+      # The custom logs check
+      - ../../../tests/data/e2e/datadog/logs/logs.conf.d:/conf.d:ro
+      # The custom log to tail, created by the `log_generator` service
+      - log_path:/var/log/
 
   # Receives log data from the `datadog-agent-vector` service and sends
   # to the `fakeintake-vector` service.
@@ -65,7 +65,7 @@ services:
     depends_on:
       - fakeintake-vector
     build:
-      context: ${PWD}
+      context: ../../..
     # re-using the integration test runner image since it already has
     # compiled vector on it.
     image: ${CONFIG_VECTOR_IMAGE}
@@ -79,7 +79,7 @@ services:
       - "-c"
       - "/home/vector/tests/data/e2e/datadog/logs/vector.toml"
     volumes:
-      - ${PWD}:/home/vector
+      - ../../..:/home/vector
 
   # Receives log data from the `datadog-agent` service. Is queried by the test runner
   # which does the validation of consistency with the other fakeintake service.
diff --git a/scripts/e2e/datadog-metrics/compose.yaml b/scripts/e2e/datadog-metrics/compose.yaml
index 5942fda1011e9..80523ac8144f4 100644
--- a/scripts/e2e/datadog-metrics/compose.yaml
+++ b/scripts/e2e/datadog-metrics/compose.yaml
@@ -27,8 +27,8 @@ services:
     - DD_API_KEY=${TEST_DATADOG_API_KEY:?TEST_DATADOG_API_KEY required}
     - DD_HOSTNAME=datadog-agent
     volumes:
-    # The Agent config file
-    - ${PWD}/tests/data/e2e/datadog/metrics/agent_only.yaml:/etc/datadog-agent/datadog.yaml
+      # The Agent config file
+      - ../../../tests/data/e2e/datadog/metrics/agent_only.yaml:/etc/datadog-agent/datadog.yaml
 
   # Sends metric data received from the Emitter to the `vector` service
   datadog-agent-vector:
@@ -39,8 +39,8 @@ services:
     - DD_API_KEY=${TEST_DATADOG_API_KEY:?TEST_DATADOG_API_KEY required}
     - DD_HOSTNAME=datadog-agent-vector
     volumes:
-    # The Agent config file
-    - ${PWD}/tests/data/e2e/datadog/metrics/agent_vector.yaml:/etc/datadog-agent/datadog.yaml
+      # The Agent config file
+      - ../../../tests/data/e2e/datadog/metrics/agent_vector.yaml:/etc/datadog-agent/datadog.yaml
 
   # Receives metric data from the `datadog-agent-vector` service and sends
   # to the `fakeintake-vector` service.
@@ -48,7 +48,7 @@ services:
     depends_on:
       - fakeintake-vector
     build:
-      context: ${PWD}
+      context: ../../..
     # re-using the integration test runner image since it already has
     # compiled vector on it.
     image: ${CONFIG_VECTOR_IMAGE}
@@ -62,7 +62,7 @@ services:
       - "-c"
       - "/home/vector/tests/data/e2e/datadog/metrics/vector.toml"
     volumes:
-      - ${PWD}:/home/vector
+      - ../../..:/home/vector
 
   # Receives metric data from the `datadog-agent` service. Is queried by the test runner
   # which does the validation of consistency with the other fakeintake service.
diff --git a/scripts/integration/amqp/compose.yaml b/scripts/integration/amqp/compose.yaml
index 865c35266f15f..a60a27155df0b 100644
--- a/scripts/integration/amqp/compose.yaml
+++ b/scripts/integration/amqp/compose.yaml
@@ -12,5 +12,4 @@ services:
       - RABBITMQ_SSL_CACERTFILE=/code/tests/data/ca/intermediate_server/certs/ca-chain.cert.pem
       - RABBITMQ_SSL_FAIL_IF_NO_PEER_CERT=false
     volumes:
-      - ${PWD}:/code
-
+      - ../../..:/code

From 968f3c91c3db6c1b57f4a329cb03f1978744b18d Mon Sep 17 00:00:00 2001
From: Pavlos Rontidis <pavlos.rontidis@gmail.com>
Date: Fri, 16 May 2025 17:33:24 -0400
Subject: [PATCH 019/305] chore(releasing): relax prepare script branch
 creation (#23067)

---
 vdev/src/commands/release/prepare.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/vdev/src/commands/release/prepare.rs b/vdev/src/commands/release/prepare.rs
index 62bbbeb6da732..d2f67bce5a3f8 100644
--- a/vdev/src/commands/release/prepare.rs
+++ b/vdev/src/commands/release/prepare.rs
@@ -115,12 +115,12 @@ impl Prepare {
         git::run_and_check_output(&["fetch"])?;
         git::checkout_main_branch()?;
 
-        git::create_branch(self.release_branch.as_str())?;
+        git::checkout_or_create_branch(self.release_branch.as_str())?;
         git::push_and_set_upstream(self.release_branch.as_str())?;
 
         // Step 2: Create a new release preparation branch
         //         The branch website contains 'website' to generate vector.dev preview.
-        git::create_branch(self.release_preparation_branch.as_str())?;
+        git::checkout_or_create_branch(self.release_preparation_branch.as_str())?;
         git::push_and_set_upstream(self.release_preparation_branch.as_str())?;
         Ok(())
     }

From e76f18ec820cf381716eca16c51ccdd11963af17 Mon Sep 17 00:00:00 2001
From: Burkov Egor <eburkov@rvision.ru>
Date: Mon, 19 May 2025 17:07:29 +0300
Subject: [PATCH 020/305] fix(parsing): Handling bad addresses in dsntap
 (#23071)

* fix(parsing): Handling bad addresses in dsntap

* Fix clippy warning
---
 .../fix_dnstap_extract_address_logic.fix.md   |  3 ++
 lib/dnstap-parser/src/parser.rs               | 54 ++++++++++++++++++-
 2 files changed, 56 insertions(+), 1 deletion(-)
 create mode 100644 changelog.d/fix_dnstap_extract_address_logic.fix.md

diff --git a/changelog.d/fix_dnstap_extract_address_logic.fix.md b/changelog.d/fix_dnstap_extract_address_logic.fix.md
new file mode 100644
index 0000000000000..60701f5b7d1d1
--- /dev/null
+++ b/changelog.d/fix_dnstap_extract_address_logic.fix.md
@@ -0,0 +1,3 @@
+Added checks to avoid possible panic while parsing address in `dnstap-parser::DnstapParser::parse_dnstap_message_socket_family`.
+
+authors: wooffie
diff --git a/lib/dnstap-parser/src/parser.rs b/lib/dnstap-parser/src/parser.rs
index 939f45a0b340d..14443ef581e76 100644
--- a/lib/dnstap-parser/src/parser.rs
+++ b/lib/dnstap-parser/src/parser.rs
@@ -438,9 +438,15 @@ impl DnstapParser {
 
         if let Some(query_address) = dnstap_message.query_address.as_ref() {
             let source_address = if socket_family == 1 {
+                if query_address.len() < 4 {
+                    return Err(Error::from("Cannot parse query_address"));
+                }
                 let address_buffer: [u8; 4] = query_address[0..4].try_into()?;
                 IpAddr::V4(Ipv4Addr::from(address_buffer))
             } else {
+                if query_address.len() < 16 {
+                    return Err(Error::from("Cannot parse query_address"));
+                }
                 let address_buffer: [u8; 16] = query_address[0..16].try_into()?;
                 IpAddr::V6(Ipv6Addr::from(address_buffer))
             };
@@ -464,9 +470,15 @@ impl DnstapParser {
 
         if let Some(response_address) = dnstap_message.response_address.as_ref() {
             let response_addr = if socket_family == 1 {
+                if response_address.len() < 4 {
+                    return Err(Error::from("Cannot parse response_address"));
+                }
                 let address_buffer: [u8; 4] = response_address[0..4].try_into()?;
                 IpAddr::V4(Ipv4Addr::from(address_buffer))
             } else {
+                if response_address.len() < 16 {
+                    return Err(Error::from("Cannot parse response_address"));
+                }
                 let address_buffer: [u8; 16] = response_address[0..16].try_into()?;
                 IpAddr::V6(Ipv6Addr::from(address_buffer))
             };
@@ -1038,7 +1050,7 @@ mod tests {
     use super::*;
     use chrono::DateTime;
     use dnsmsg_parser::dns_message_parser::DnsParserOptions;
-    use std::collections::BTreeMap;
+    use std::{collections::BTreeMap, vec};
 
     #[test]
     fn test_parse_dnstap_data_with_query_message() {
@@ -1365,6 +1377,46 @@ mod tests {
         )
     }
 
+    #[test]
+    fn test_parse_dnstap_message_socket_family_bad_addr() {
+        // while parsing address is optional, but in this function assume otherwise
+        fn test_one_input(socket_family: i32, msg: DnstapMessage) -> Result<()> {
+            let mut event = LogEvent::default();
+            let root = owned_value_path!();
+            DnstapParser::parse_dnstap_message_socket_family(&mut event, &root, socket_family, &msg)
+        }
+        // all bad cases which can panic
+        {
+            let message = DnstapMessage {
+                query_address: Some(vec![]),
+                ..Default::default()
+            };
+            assert!(test_one_input(1, message).is_err());
+        }
+        {
+            let message = DnstapMessage {
+                query_address: Some(vec![]),
+                ..Default::default()
+            };
+            assert!(test_one_input(2, message).is_err());
+        }
+
+        {
+            let message = DnstapMessage {
+                response_address: Some(vec![]),
+                ..Default::default()
+            };
+            assert!(test_one_input(1, message).is_err());
+        }
+        {
+            let message = DnstapMessage {
+                response_address: Some(vec![]),
+                ..Default::default()
+            };
+            assert!(test_one_input(2, message).is_err());
+        }
+    }
+
     #[test]
     fn test_get_socket_family_name() {
         assert_eq!("INET", to_socket_family_name(1).unwrap());

From bf57582d5855cf7beae12eb88bf21e911680489c Mon Sep 17 00:00:00 2001
From: Pavlos Rontidis <pavlos.rontidis@gmail.com>
Date: Mon, 19 May 2025 16:03:23 -0400
Subject: [PATCH 021/305] chore(releasing): update VRL changelog block
 insertion (#23075)

---
 vdev/src/commands/release/prepare.rs | 145 +++++++++++++++++----------
 1 file changed, 91 insertions(+), 54 deletions(-)

diff --git a/vdev/src/commands/release/prepare.rs b/vdev/src/commands/release/prepare.rs
index d2f67bce5a3f8..5b333e25ab438 100644
--- a/vdev/src/commands/release/prepare.rs
+++ b/vdev/src/commands/release/prepare.rs
@@ -4,7 +4,6 @@
 use crate::git;
 use crate::util::run_command;
 use anyhow::{anyhow, Result};
-use indoc::indoc;
 use reqwest::blocking::Client;
 use semver::Version;
 use std::fs::File;
@@ -364,65 +363,25 @@ impl Prepare {
 
     fn append_vrl_changelog_to_release_cue(&self) -> Result<()> {
         debug!("append_vrl_changelog_to_release_cue");
-        let releases_path = &self.repo_root.join("website").join("cue").join("reference").join("releases");
-        let vector_version = &self.new_vector_version;
-        let release_cue_path = releases_path.join(format!("{vector_version}.cue"));
-        if !release_cue_path.is_file() {
-            return Err(anyhow!("{release_cue_path:?} not found"));
+
+        let releases_path = self.repo_root.join("website/cue/reference/releases");
+        let version = &self.new_vector_version;
+        let cue_path = releases_path.join(format!("{version}.cue"));
+        if !cue_path.is_file() {
+            return Err(anyhow!("{cue_path:?} not found"));
         }
 
         let vrl_changelog = get_latest_vrl_tag_and_changelog()?;
+        let vrl_changelog_block = format_vrl_changelog_block(&vrl_changelog);
 
-        let temp_file_path = releases_path.join(format!("{vector_version}.cue.tmp"));
-        let input_file = File::open(&release_cue_path)?;
-        let reader = BufReader::new(input_file);
-        let mut output_file = File::create(&temp_file_path)?;
-
-        let indent = "\t".repeat(5);
-        let processed_changelog: String = vrl_changelog
-            .lines()
-            .map(|line| {
-                let line = line.trim();
-                if line.starts_with('#') {
-                    format!("{indent}#{line}")
-                } else {
-                    format!("{indent}{line}")
-                }
-            })
-            .collect::<Vec<String>>()
-            .join("\n");
-
-        // Format the new changelog entry
-        let vrl_cue_block = format!(
-            indoc! {r#"
-            {{
-                type: "feat"
-                description: """
-            {}
-                    """
-            }},
-        "#},
-            processed_changelog
-        );
-
-        let mut found_changelog = false;
-        let changelog_marker = "changelog: [";
+        let original = fs::read_to_string(&cue_path)?;
+        let updated = insert_block_after_changelog(&original, &vrl_changelog_block);
 
-        // Read and write line by line
-        for line in reader.lines() {
-            let line = line?;
-            writeln!(output_file, "{line}")?;
-
-            // Check if this is the changelog line
-            if !found_changelog && line.trim().starts_with(changelog_marker) {
-                // Insert the new entry after the changelog opening
-                writeln!(output_file, "{vrl_cue_block}")?;
-                found_changelog = true;
-            }
-        }
+        let tmp_path = cue_path.with_extension("cue.tmp");
+        fs::write(&tmp_path, &updated)?;
+        fs::rename(&tmp_path, &cue_path)?;
 
-        fs::rename(&temp_file_path, &release_cue_path)?;
-        run_command(&format!("cue fmt {release_cue_path:?}"));
+        run_command(&format!("cue fmt {}", cue_path.display()));
         debug!("Successfully added VRL changelog to the release cue file.");
         Ok(())
     }
@@ -445,6 +404,45 @@ fn get_latest_version_from_vector_tags() -> Result<Version> {
         .map_err(|e| anyhow::anyhow!("Failed to parse version from tag '{latest_tag}': {e}"))
 }
 
+fn format_vrl_changelog_block(changelog: &str) -> String {
+    let double_tab = "\t\t";
+    let body = changelog
+        .lines()
+        .map(|line| {
+            let line = line.trim();
+            if line.starts_with('#') {
+                format!("{double_tab}#{line}")
+            } else {
+                format!("{double_tab}{line}")
+            }
+        })
+        .collect::<Vec<_>>()
+        .join("\n");
+
+    let opening = "\tvrl_changelog: \"\"\"";
+    let closing = format!("{double_tab}\"\"\"");
+
+    format!("{opening}\n{body}\n{closing}")
+}
+
+fn insert_block_after_changelog(original: &str, block: &str) -> String {
+    let mut result = Vec::new();
+    let mut inserted = false;
+
+    for line in original.lines() {
+        result.push(line.to_string());
+
+        // Insert *after* the line containing only the closing `]` (end of changelog array)
+        if !inserted && line.trim() == "]" {
+            result.push(String::new()); // empty line before
+            result.push(block.to_string());
+            inserted = true;
+        }
+    }
+
+    result.join("\n")
+}
+
 fn get_latest_vrl_tag_and_changelog() -> Result<String> {
     let client = Client::new();
 
@@ -497,3 +495,42 @@ fn get_latest_vrl_tag_and_changelog() -> Result<String> {
 
     Ok(section.join("\n"))
 }
+
+#[cfg(test)]
+mod tests {
+    use crate::commands::release::prepare::{format_vrl_changelog_block, insert_block_after_changelog};
+    use indoc::indoc;
+
+    #[test]
+    fn test_insert_block_after_changelog() {
+        let vrl_changelog = "### [0.2.0]\n- Feature\n- Fix";
+        let vrl_changelog_block = format_vrl_changelog_block(vrl_changelog);
+
+        let expected = concat!(
+        "\tvrl_changelog: \"\"\"\n",
+        "\t\t#### [0.2.0]\n",
+        "\t\t- Feature\n",
+        "\t\t- Fix\n",
+        "\t\t\"\"\""
+        );
+
+        assert_eq!(vrl_changelog_block, expected);
+
+        let original = indoc! {r#"
+            version: "1.2.3"
+            changelog: [
+                {
+                    type: "fix"
+                    description: "Some fix"
+                },
+            ]
+        "#};
+        let updated = insert_block_after_changelog(original, &vrl_changelog_block);
+
+        // Assert the last 5 lines match the VRL changelog block
+        let expected_lines_len = 5;
+        let updated_tail: Vec<&str> = updated.lines().rev().take(expected_lines_len).collect::<Vec<_>>().into_iter().rev().collect();
+        let expected_lines: Vec<&str> = vrl_changelog_block.lines().collect();
+        assert_eq!(updated_tail, expected_lines);
+    }
+}

From eb12304ebd8b2b06fd50df242d660b056a33b8a3 Mon Sep 17 00:00:00 2001
From: Pavlos Rontidis <pavlos.rontidis@gmail.com>
Date: Tue, 20 May 2025 11:51:36 -0400
Subject: [PATCH 022/305] fix(ci): update git repo url for homebrew release
 (#23081)

---
 vdev/src/commands/release/homebrew.rs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/vdev/src/commands/release/homebrew.rs b/vdev/src/commands/release/homebrew.rs
index ea08786dfb9fd..213e6ce1c5ed3 100644
--- a/vdev/src/commands/release/homebrew.rs
+++ b/vdev/src/commands/release/homebrew.rs
@@ -42,9 +42,10 @@ impl Cli {
 fn clone_and_setup_git(username: &str) -> Result<()> {
     let github_token = env::var("GITHUB_TOKEN")?;
     let homebrew_repo = format!(
-        "https://{github_token}@github.com/{username}/homebrew-brew.git",
+        "https://{username}:{github_token}@github.com/{username}/homebrew-brew.git"
     );
 
+
     git::clone(&homebrew_repo)?;
     env::set_current_dir("homebrew-brew")?;
     git::set_config_value("user.name", "vic")?;

From 0ce2de7527170e2b9792a7916391a8d5483bc949 Mon Sep 17 00:00:00 2001
From: Pavlos Rontidis <pavlos.rontidis@gmail.com>
Date: Tue, 20 May 2025 16:03:02 -0400
Subject: [PATCH 023/305] chore(releasing): improve release templates (#23080)

* chore(releasing): improve release guide

* easier setup

* more improvements

* reorganize release prep steps

* lint

* improve titles

* typo
---
 .github/ISSUE_TEMPLATE/minor-release.md | 68 ++++++++++++++++++-------
 .github/ISSUE_TEMPLATE/patch-release.md | 36 ++++++++-----
 2 files changed, 73 insertions(+), 31 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/minor-release.md b/.github/ISSUE_TEMPLATE/minor-release.md
index 50dabfcc72139..fe1dc999ba9a7 100644
--- a/.github/ISSUE_TEMPLATE/minor-release.md
+++ b/.github/ISSUE_TEMPLATE/minor-release.md
@@ -5,25 +5,44 @@ title: "Vector [version] release"
 labels: "domain: releasing"
 ---
 
-The week before the release:
+
+# Setup and Automation
+
+Note the preparation steps are now automated. You can run:
+
+```shell
+export NEW_VERSION=0.47.0 # replace this with the actual new version
+export MINOR_VERSION=$(echo "$NEW_VERSION" | cut -d. -f2)
+export PREP_BRANCH=prepare-v-0-"${MINOR_VERSION}"-"${NEW_VERSION}"-website
+export RELEASE_BRANCH=v0."${MINOR_VERSION}"
+export NEW_VRL_VERSION=0.42.0 # replace this with the actual new VRL version
+```
+
+# The week before the release
+
+## 1. Manual Steps
 
 - [ ] Cut a new release of [VRL](https://github.com/vectordotdev/vrl) if needed
-- [ ] Check for any outstanding deprecation actions in [DEPRECATIONS.md](https://github.com/vectordotdev/vector/blob/master/docs/DEPRECATIONS.md) and
-      take them (or have someone help you take them)
+  - VRL release steps: https://github.com/vectordotdev/vrl/blob/main/release/README.md
+
+## 2. Automated Steps
+
+Run the following:
+
+```shell
+vdev release prepare --version "${NEW_VERSION_NUMBER}" --vrl-version NEW_VRL_VERSION
+```
+
+Automated steps include:
 - [ ] Create a new release branch from master to freeze commits
-  - `git fetch && git checkout origin/master && git checkout -b v0.<new version number> && git push -u`
+  - `git fetch && git checkout origin/master && git checkout -b "{RELEASE_BRANCH}" && git push -u`
 - [ ] Create a new release preparation branch from `master`
-  - `git checkout -b website-prepare-v0.<new version number> && git push -u`
+  - `git checkout -b "${PREP_BRANCH}" && git push -u`
 - [ ] Pin VRL to latest released version rather than `main`
 - [ ] Check if there is a newer version of [Alpine](https://alpinelinux.org/releases/) or
       [Debian](https://www.debian.org/releases/) available to update the release images in
       `distribution/docker/`. Update if so.
 - [ ] Run `cargo vdev build release-cue` to generate a new cue file for the release
-  - [ ] Add description key to the generated cue file with a description of the release (see
-        previous releases for examples).
-  - [ ] Ensure any breaking changes are highlighted in the release upgrade guide
-  - [ ] Ensure any deprecations are highlighted in the release upgrade guide
-  - [ ] Review generated changelog entries to ensure they are understandable to end-users
   - [ ] Copy VRL changelogs from the VRL version in the last Vector release as a new changelog entry
         ([example](https://github.com/vectordotdev/vector/blob/9c67bba358195f5018febca2f228dfcb2be794b5/website/cue/reference/releases/0.41.0.cue#L33-L64))
 - [ ] Update version number in `website/cue/reference/administration/interfaces/kubectl.cue`
@@ -32,29 +51,40 @@ The week before the release:
 - [ ] Create new release md file by copying an existing one in `./website/content/en/releases/` and
       updating version number
 - [ ] Commit these changes
-- [ ] Open PR against the release branch (`v0.<new version number>`) for review
-- [ ] PR approval
+- [ ] Open PR against the release branch (`"${RELEASE_BRANCH}"`) for review
+
+## 3. Manual Steps
+
+- [ ] Edit `website/cue/reference/releases/"${NEW_VERSION_NUMBER}".cue`
+  - [ ] Add description key to the generated cue file with a description of the release (see
+        previous releases for examples).
+  - [ ] Ensure any breaking changes are highlighted in the release upgrade guide
+  - [ ] Ensure any deprecations are highlighted in the release upgrade guide
+  - [ ] Review generated changelog entries to ensure they are understandable to end-users
+- [ ] Check for any outstanding deprecation actions in [DEPRECATIONS.md](https://github.com/vectordotdev/vector/blob/master/docs/DEPRECATIONS.md) and
+    take them (or have someone help you take them)
+- [ ] PR review & approval
 
-On the day of release:
+# On the day of release
 
 - [ ] Rebase the release preparation branch on the release branch
     - [ ] Squash the release preparation commits (but not the cherry-picked commits!) to a single
-        commit. This makes it easier to cherry-pick to master after the release. 
+        commit. This makes it easier to cherry-pick to master after the release.
     - [ ] Ensure release date in cue matches current date.
 - [ ] Merge release preparation branch into the release branch
-    - `git co v0.<new version number> && git merge --ff-only prepare-v0.<new version number>`
+    - `git switch "${RELEASE_BRANCH}" && git merge --ff-only "${PREP_BRANCH}"`
 - [ ] Tag new release
-  - [ ] `git tag v0.<minor>.0 -a -m v0.<minor>.0`
-  - [ ] `git push origin v0.<minor>.0`
+  - [ ] `git tag v"${NEW_VERSION_NUMBER}" -a -m v"${NEW_VERSION_NUMBER}"`
+  - [ ] `git push origin v"${NEW_VERSION_NUMBER}"`
 - [ ] Wait for release workflow to complete
   - Discoverable via [https://github.com/timberio/vector/actions/workflows/release.yml](https://github.com/timberio/vector/actions/workflows/release.yml)
 - [ ] Reset the `website` branch to the `HEAD` of the release branch to update https://vector.dev
-  - [ ] `git checkout website && git reset --hard origin/v0.<new version number> && git push`
+  - [ ] `git switch website && git reset --hard origin/"{RELEASE_BRANCH}" && git push`
   - [ ] Confirm that the release changelog was published to https://vector.dev/releases/
     - The deployment is done by Amplify. You can see
       the [deployment logs here](https://dd-corpsite.datadoghq.com/logs?query=service%3Awebsites-vector%20branch%3Awebsite&agg_m=count&agg_m_source=base&agg_t=count&cols=host%2Cservice&fromUser=true&messageDisplay=inline&refresh_mode=sliding&storage=hot&stream_sort=time%2Casc&viz=stream).
 - [ ] Release Linux packages. See [`vector-release` usage](https://github.com/DataDog/vector-release#usage).
-  - Note: the pipeline inputs are the version number `v0.<new version number>` and a personal GitHub token.
+  - Note: the pipeline inputs are the version number `v"${NEW_VERSION_NUMBER}"` and a personal GitHub token.
   - [ ] Manually trigger the `trigger-package-release-pipeline-prod-stable` job.
 - [ ] Release updated Helm chart. See [releasing Helm chart](https://github.com/vectordotdev/helm-charts#releasing).
 - [ ] Once Helm chart is released, updated Vector manifests
diff --git a/.github/ISSUE_TEMPLATE/patch-release.md b/.github/ISSUE_TEMPLATE/patch-release.md
index 185d5beff7917..afc5d8d826423 100644
--- a/.github/ISSUE_TEMPLATE/patch-release.md
+++ b/.github/ISSUE_TEMPLATE/patch-release.md
@@ -5,10 +5,22 @@ title: "Vector [version] release"
 labels: "domain: releasing"
 ---
 
-Before the release:
+# Setup environment
+
+```shell
+export CURRENT_MINOR_VERSION = <current minor version> # e.g. 47
+export CURRENT_PATCH_VERSION = <current patch version> # e.g. 0
+export CURRENT_VERSION="${RELEASE_BRANCH}"."${CURRENT_PATCH_VERSION}"
+export NEW_PATCH_VERSION = <new patch version> # e.g. 1
+export NEW_VERSION="${RELEASE_BRANCH}"."${NEW_PATCH_VERSION}"
+export RELEASE_BRANCH=v0."${CURRENT_MINOR_VERSION}"
+export PREP_BRANCH=prepare-v-0-"${CURRENT_MINOR_VERSION}"-"${NEW_PATCH_VERSION}"-website
+```
+
+# Before the release
 
 - [ ] Create a new release preparation branch from the current release branch
-  - `git fetch --all && git checkout v0.<current minor version> && git checkout -b website-prepare-v0-<current minor version>-<new patch>
+  - `git fetch --all && git checkout "${RELEASE_BRANCH}" && git checkout -b "${PREP_BRANCH}""`
 - [ ] Cherry-pick in all commits to be released from the associated release milestone
   - If any merge conflicts occur, attempt to solve them and if needed enlist the aid of those familiar with the conflicting commits.
 - [ ] Bump the release number in the `Cargo.toml` to the current version number
@@ -18,31 +30,31 @@ Before the release:
 - [ ] Update version number in `distribution/install.sh`
 - [ ] Add new version to `website/cue/reference/versions.cue`
 - [ ] Create new release md file by copying an existing one in `./website/content/en/releases/`.
-  - Update the version number to `v0.<current minor version>.<patch>` and increase the `weight` by 1.
+  - Update the version number to `"${NEW_VERSION}"` and increase the `weight` by 1.
 - [ ] Run `cargo check` to regenerate `Cargo.lock` file
 - [ ] Commit these changes
-- [ ] Open PR against the release branch (`v0.<current minor version>`) for review
+- [ ] Open PR against the release branch (`"${RELEASE_BRANCH}"`) for review
 - [ ] PR approval
 
-On the day of release:
+# On the day of release
 
 - [ ] Ensure release date in cue matches current date.
 - [ ] Rebase the release preparation branch on the release branch
   - Squash the release preparation commits (but not the cherry-picked commits!) to a single
     commit. This makes it easier to cherry-pick to master after the release.
-  - `git fetch --all && git checkout website-prepare-v0-<current minor version>-<new patch> && git rebase -i v0.<current minor version>`
+  - `git fetch --all && git checkout website-prepare-v0-"${CURRENT_MINOR_VERSION}"-"${NEW_PATCH_VERSION}" && git rebase -i "${RELEASE_BRANCH}"`
 - [ ] Merge release preparation branch into the release branch
-  - `git checkout v0.<current minor version> && git merge --ff-only website-prepare-v0-<current minor version>-<new patch>`
+  - `git checkout "${RELEASE_BRANCH}" && git merge --ff-only website-prepare-v0-"${CURRENT_MINOR_VERSION}"-"${NEW_PATCH_VERSION}"`
 - [ ] Tag new release
-  - [ ] `git tag v0.<minor>.<patch> -a -m v0.<minor>.<patch>`
-  - [ ] `git push origin v0.<minor>.<patch>`
+  - [ ] `git tag "${NEW_VERSION}" -a -m "${NEW_VERSION}"`
+  - [ ] `git push origin "${NEW_VERSION}"`
 - [ ] Wait for release workflow to complete
   - Discoverable via [https://github.com/timberio/vector/actions/workflows/release.yml](https://github.com/timberio/vector/actions/workflows/release.yml)
 - [ ] Release Linux packages. See [`vector-release` usage](https://github.com/DataDog/vector-release#usage).
-  - Note: the pipeline inputs are the version number `v0.<new version number>` and a personal GitHub token.
+  - Note: the pipeline inputs are the version number `"${CURRENT_VERSION}"` and a personal GitHub token.
   - [ ] Manually trigger the `trigger-package-release-pipeline-prod-stable` job.
 - [ ] Push the release branch to update the remote (This should close the preparation branch PR).
-  - `git checkout v0.<current minor version> && git push`
+  - `git checkout "${RELEASE_BRANCH}" && git push`
 - [ ] Release updated Helm chart. See [releasing Helm chart](https://github.com/vectordotdev/helm-charts#releasing).
 - [ ] Once Helm chart is released, updated Vector manifests
   - Run `cargo vdev build manifests` and open a PR with changes
@@ -50,5 +62,5 @@ On the day of release:
   - Follow the [instructions at the top of the mirror.yaml file](https://github.com/DataDog/images/blob/fbf12868e90d52e513ebca0389610dea8a3c7e1a/mirror.yaml#L33-L49).
 - [ ] Cherry-pick any release commits from the release branch that are not on `master`, to `master`
 - [ ] Reset the `website` branch to the `HEAD` of the release branch to update https://vector.dev
-  - [ ] `git checkout website && git reset --hard origin/v0.<current minor version>.<patch> && git push`
+  - [ ] `git checkout website && git reset --hard origin/"${RELEASE_BRANCH}" && git push`
 - [ ] Kick-off post-mortems for any regressions resolved by the release

From 34db5b0d784392e8d1c687edb6682ca980dcace8 Mon Sep 17 00:00:00 2001
From: Pavlos Rontidis <pavlos.rontidis@gmail.com>
Date: Tue, 20 May 2025 17:20:19 -0400
Subject: [PATCH 024/305] chore(releasing): final release steps (#23085)

* chore(releasing): final release steps

* chore(releasing): Pinned VRL version to 0.24.0

chore(releasing): Generated release CUE file

chore(releasing): Updated website/cue/reference/administration/interfaces/kubectl.cue vector version to 0.47.0

chore(releasing): Updated distribution/install.sh vector version to 0.47.0

chore(releasing): Add 0.47.0 to versions.cue

chore(releasing): Created release md file

changelog editing

user facing text, rm accidentally comitted files

Apply suggestions from code review

Co-authored-by: domalessi <111786334+domalessi@users.noreply.github.com>

Apply suggestions from code review

Co-authored-by: domalessi <111786334+domalessi@users.noreply.github.com>

Apply suggestions from code review

Co-authored-by: domalessi <111786334+domalessi@users.noreply.github.com>

Update website/cue/reference/releases/0.47.0.cue

Co-authored-by: domalessi <111786334+domalessi@users.noreply.github.com>

wording

merge sentences

bump the date

* bump vector version
---
 .gitignore                                    |   3 +
 Cargo.lock                                    |  10 +-
 Cargo.toml                                    |   4 +-
 .../14082_add_mermaid_support.feature.md      |   3 -
 ...group_id_groups_max_limit_increased.fix.md |   3 -
 changelog.d/19931_add_mqtt_source.feature.md  |   3 -
 changelog.d/22125.feature.md                  |   3 -
 .../22212_fluent_unix_socket.feature.md       |   3 -
 changelog.d/22533_zlib-rs.enhancement.md      |   3 -
 ...et_server_buffering_ack_support.feature.md |   3 -
 .../22651_greptimedb_logs_headers.breaking.md |  32 --
 .../22656_statsd_timer_conversion.feature.md  |   3 -
 .../22786_remove_empty_file_after_secs.fix.md |   3 -
 ...2827_cloudwatch_auth_missing_region.fix.md |   3 -
 ...rease_cloudwatch_log_event_max_size.fix.md |   3 -
 ...2850_custom_auth_address_access.feature.md |   3 -
 ...cket_server_subprotocol_support.feature.md |   3 -
 ...57_junit_reports_for_unit_tests.feature.md |   3 -
 .../22865_framing_performance.enhancement.md  |   3 -
 ...is_sink_supports_encoding_input.feature.md |   3 -
 ...remove_limit_if_use_apiserver_cache.fix.md |   3 -
 ...2922_healthcheck_timeout_config.feature.md |   3 -
 ...e_bounded_date_range_search.enhancement.md |   3 -
 ...1_add_relaxed_wildcard_matching.feature.md |  24 -
 ..._add_a6_prefix_check_in_dns_parsing.fix.md |   3 -
 .../23048_fix_arith_logic_dnstap_parse.fix.md |   3 -
 ...19_watch_remap_external_vrl.enhancement.md |   3 -
 .../add_priority_amqp_sink.enhancement.md     |   3 -
 changelog.d/datadog_agent_http_header.fix.md  |  31 --
 .../datadog_logs_sink_logs_namespace.fix.md   |   3 -
 changelog.d/gelf-error.fix.md                 |   3 -
 changelog.d/opentelemetry_metrics.feature.md  |   3 -
 .../s3-source-defer-or-delete.enhancement.md  |   3 -
 changelog.d/window-transform.feature.md       |   5 -
 distribution/install.sh                       |   2 +-
 .../kubernetes/vector-agent/README.md         |   2 +-
 .../kubernetes/vector-agent/configmap.yaml    |   2 +-
 .../kubernetes/vector-agent/daemonset.yaml    |   4 +-
 .../kubernetes/vector-agent/rbac.yaml         |   4 +-
 .../vector-agent/service-headless.yaml        |   2 +-
 .../vector-agent/serviceaccount.yaml          |   2 +-
 .../kubernetes/vector-aggregator/README.md    |   2 +-
 .../vector-aggregator/configmap.yaml          |   2 +-
 .../vector-aggregator/service-headless.yaml   |   2 +-
 .../kubernetes/vector-aggregator/service.yaml |   2 +-
 .../vector-aggregator/serviceaccount.yaml     |   2 +-
 .../vector-aggregator/statefulset.yaml        |   4 +-
 .../vector-stateless-aggregator/README.md     |   2 +-
 .../configmap.yaml                            |   2 +-
 .../deployment.yaml                           |   4 +-
 .../service-headless.yaml                     |   2 +-
 .../vector-stateless-aggregator/service.yaml  |   2 +-
 .../serviceaccount.yaml                       |   2 +-
 docker_logs.txt                               |   0
 .../reference/configuration/sources/mqtt.md   |   2 +-
 website/content/en/releases/0.47.0.md         |   4 +
 .../administration/interfaces/kubectl.cue     |   2 +-
 website/cue/reference/releases/0.47.0.cue     | 419 ++++++++++++++++++
 website/cue/reference/versions.cue            |   1 +
 website/layouts/releases/single.html          |  11 +-
 60 files changed, 465 insertions(+), 210 deletions(-)
 delete mode 100644 changelog.d/14082_add_mermaid_support.feature.md
 delete mode 100644 changelog.d/17294_allocation_group_id_groups_max_limit_increased.fix.md
 delete mode 100644 changelog.d/19931_add_mqtt_source.feature.md
 delete mode 100644 changelog.d/22125.feature.md
 delete mode 100644 changelog.d/22212_fluent_unix_socket.feature.md
 delete mode 100644 changelog.d/22533_zlib-rs.enhancement.md
 delete mode 100644 changelog.d/22540_websocket_server_buffering_ack_support.feature.md
 delete mode 100644 changelog.d/22651_greptimedb_logs_headers.breaking.md
 delete mode 100644 changelog.d/22656_statsd_timer_conversion.feature.md
 delete mode 100644 changelog.d/22786_remove_empty_file_after_secs.fix.md
 delete mode 100644 changelog.d/22827_cloudwatch_auth_missing_region.fix.md
 delete mode 100644 changelog.d/22831_increase_cloudwatch_log_event_max_size.fix.md
 delete mode 100644 changelog.d/22850_custom_auth_address_access.feature.md
 delete mode 100644 changelog.d/22854_websocket_server_subprotocol_support.feature.md
 delete mode 100644 changelog.d/22857_junit_reports_for_unit_tests.feature.md
 delete mode 100644 changelog.d/22865_framing_performance.enhancement.md
 delete mode 100644 changelog.d/22909_redis_sink_supports_encoding_input.feature.md
 delete mode 100644 changelog.d/22921_remove_limit_if_use_apiserver_cache.fix.md
 delete mode 100644 changelog.d/22922_healthcheck_timeout_config.feature.md
 delete mode 100644 changelog.d/22926_enrichment_function_single_bounded_date_range_search.enhancement.md
 delete mode 100644 changelog.d/23011_add_relaxed_wildcard_matching.feature.md
 delete mode 100644 changelog.d/23047_add_a6_prefix_check_in_dns_parsing.fix.md
 delete mode 100644 changelog.d/23048_fix_arith_logic_dnstap_parse.fix.md
 delete mode 100644 changelog.d/9819_watch_remap_external_vrl.enhancement.md
 delete mode 100644 changelog.d/add_priority_amqp_sink.enhancement.md
 delete mode 100644 changelog.d/datadog_agent_http_header.fix.md
 delete mode 100644 changelog.d/datadog_logs_sink_logs_namespace.fix.md
 delete mode 100644 changelog.d/gelf-error.fix.md
 delete mode 100644 changelog.d/opentelemetry_metrics.feature.md
 delete mode 100644 changelog.d/s3-source-defer-or-delete.enhancement.md
 delete mode 100644 changelog.d/window-transform.feature.md
 create mode 100644 docker_logs.txt
 create mode 100644 website/content/en/releases/0.47.0.md
 create mode 100644 website/cue/reference/releases/0.47.0.cue

diff --git a/.gitignore b/.gitignore
index 24b0593d51d6c..2a57f31cc6f40 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,3 +22,6 @@ tilt_modules/
 
 # Jetbrains
 .idea/
+
+# Ignore generated temporary Docker Compose files
+**/compose-temp-*.yaml
diff --git a/Cargo.lock b/Cargo.lock
index 24d055bbce81a..3c465db7ff350 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -11434,7 +11434,7 @@ dependencies = [
 
 [[package]]
 name = "vector"
-version = "0.47.0"
+version = "0.48.0"
 dependencies = [
  "apache-avro",
  "approx",
@@ -11994,8 +11994,9 @@ checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d"
 
 [[package]]
 name = "vrl"
-version = "0.23.0"
-source = "git+https://github.com/vectordotdev/vrl?branch=main#7f8ed50af55b936c6da62a19dbbd966a8af903b6"
+version = "0.24.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f9ceadaa40aef567a26079ff014ca7a567ba85344f1b81090b5ec7d7bb16a219"
 dependencies = [
  "aes",
  "aes-siv",
@@ -12003,7 +12004,7 @@ dependencies = [
  "arbitrary",
  "base16",
  "base62",
- "base64 0.22.1",
+ "base64-simd",
  "bytes 1.10.1",
  "cbc",
  "cfb-mode",
@@ -12022,7 +12023,6 @@ dependencies = [
  "crypto_secretbox",
  "csv",
  "ctr",
- "data-encoding",
  "digest",
  "dns-lookup",
  "domain",
diff --git a/Cargo.toml b/Cargo.toml
index c999e7b270d74..4bf10447c73ac 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "vector"
-version = "0.47.0"
+version = "0.48.0"
 authors = ["Vector Contributors <vector@datadoghq.com>"]
 edition = "2021"
 description = "A lightweight and ultra-fast tool for building observability pipelines"
@@ -174,7 +174,7 @@ vector-lib = { path = "lib/vector-lib", default-features = false, features = ["v
 vector-config = { path = "lib/vector-config" }
 vector-config-common = { path = "lib/vector-config-common" }
 vector-config-macros = { path = "lib/vector-config-macros" }
-vrl = { git = "https://github.com/vectordotdev/vrl", branch = "main", features = ["arbitrary", "cli", "test", "test_framework"] }
+vrl = { features = ["arbitrary", "cli", "test", "test_framework"], version = "0.24.0" }
 
 [dependencies]
 cfg-if.workspace = true
diff --git a/changelog.d/14082_add_mermaid_support.feature.md b/changelog.d/14082_add_mermaid_support.feature.md
deleted file mode 100644
index 912652f9bc0d8..0000000000000
--- a/changelog.d/14082_add_mermaid_support.feature.md
+++ /dev/null
@@ -1,3 +0,0 @@
-Add support for rendering to Mermaid format in `vector graph`
-
-authors: Firehed
diff --git a/changelog.d/17294_allocation_group_id_groups_max_limit_increased.fix.md b/changelog.d/17294_allocation_group_id_groups_max_limit_increased.fix.md
deleted file mode 100644
index 58791882556ba..0000000000000
--- a/changelog.d/17294_allocation_group_id_groups_max_limit_increased.fix.md
+++ /dev/null
@@ -1,3 +0,0 @@
-Fix a Vector crash that occurred when the internal metrics generated a lot of  groups by increasing groups max limit from 128 to 256.
-
-authors: triggerhappy17
diff --git a/changelog.d/19931_add_mqtt_source.feature.md b/changelog.d/19931_add_mqtt_source.feature.md
deleted file mode 100644
index 24e9dbebc6aed..0000000000000
--- a/changelog.d/19931_add_mqtt_source.feature.md
+++ /dev/null
@@ -1,3 +0,0 @@
-Adds a new `mqtt` source enabling Vector to receive logs from a MQTT broker.
-
-authors: mladedav pront StormStake
diff --git a/changelog.d/22125.feature.md b/changelog.d/22125.feature.md
deleted file mode 100644
index a2fb312ef23ed..0000000000000
--- a/changelog.d/22125.feature.md
+++ /dev/null
@@ -1,3 +0,0 @@
-Allows users to specify AWS authentication and the AWS service name for HTTP sinks to support AWS API endpoints that require SigV4.
-
-authors: johannesfloriangeiger
diff --git a/changelog.d/22212_fluent_unix_socket.feature.md b/changelog.d/22212_fluent_unix_socket.feature.md
deleted file mode 100644
index be21ffb0c042a..0000000000000
--- a/changelog.d/22212_fluent_unix_socket.feature.md
+++ /dev/null
@@ -1,3 +0,0 @@
-Add support for fluentd forwarding over a unix socket
-
-authors: tustvold
diff --git a/changelog.d/22533_zlib-rs.enhancement.md b/changelog.d/22533_zlib-rs.enhancement.md
deleted file mode 100644
index cbc922fcc52b5..0000000000000
--- a/changelog.d/22533_zlib-rs.enhancement.md
+++ /dev/null
@@ -1,3 +0,0 @@
-Replaced miniz_oxide backend for zlib compression with zlib-rs for significantly improved compression performance. zlib-rs provides 2-3x performance improvements for compression, and ~20% improvements for decompression than miniz_oxide.
-
-authors: JakubOnderka
diff --git a/changelog.d/22540_websocket_server_buffering_ack_support.feature.md b/changelog.d/22540_websocket_server_buffering_ack_support.feature.md
deleted file mode 100644
index 0ce4cadf6740c..0000000000000
--- a/changelog.d/22540_websocket_server_buffering_ack_support.feature.md
+++ /dev/null
@@ -1,3 +0,0 @@
-Add ACK support to message buffering feature of `websocket_server` sink, allowing this component to cache latest received messages per client.
-
-authors: esensar Quad9DNS
diff --git a/changelog.d/22651_greptimedb_logs_headers.breaking.md b/changelog.d/22651_greptimedb_logs_headers.breaking.md
deleted file mode 100644
index 674bf5d69bacb..0000000000000
--- a/changelog.d/22651_greptimedb_logs_headers.breaking.md
+++ /dev/null
@@ -1,32 +0,0 @@
-Added a new `extra_headers` option to `greptimedb_logs` sink configuration to set additional headers for outgoing requests.
-
-change `greptimedb_logs` sink default content type to `application/x-ndjson` to match the default content type of `greptimedb` sink
-if you use the greptimedb version v0.12 or earlier, you need to set the content type to `application/json` in the sink configuration
-
-Example:
-
-```yaml
-sinks:
-  greptime_logs:
-    type: greptimedb_logs
-    inputs: ["my_source_id"]
-    endpoint: "http://localhost:4000"
-    table: "demo_logs"
-    dbname: "public"
-    extra_headers:
-      x-source: vector
-```
-
-```toml
-[sinks.greptime_logs]
-type = "greptimedb_logs"
-inputs = ["my_source_id"]
-endpoint = "http://localhost:4000"
-table = "demo_logs"
-dbname = "public"
-
-[sinks.greptime_logs.extra_headers]
-x-source = "vector"
-```
-
-authors: greptimedb
diff --git a/changelog.d/22656_statsd_timer_conversion.feature.md b/changelog.d/22656_statsd_timer_conversion.feature.md
deleted file mode 100644
index fa55207ebd3b6..0000000000000
--- a/changelog.d/22656_statsd_timer_conversion.feature.md
+++ /dev/null
@@ -1,3 +0,0 @@
-This change introduces a new configuration option in the StatsD source: `convert_to` of type `ConversionUnit`. By default, timing values in milliseconds (`ms`) are converted to seconds (`s`). Users can set `convert_to` to `"milliseconds"` to preserve the original millisecond values.
-
-authors: devkoriel
diff --git a/changelog.d/22786_remove_empty_file_after_secs.fix.md b/changelog.d/22786_remove_empty_file_after_secs.fix.md
deleted file mode 100644
index 70b9d5177e956..0000000000000
--- a/changelog.d/22786_remove_empty_file_after_secs.fix.md
+++ /dev/null
@@ -1,3 +0,0 @@
-Fixed `file` source bug where known small files were not deleted after the specified `remove_after_secs`.
-
-authors: linw1995
diff --git a/changelog.d/22827_cloudwatch_auth_missing_region.fix.md b/changelog.d/22827_cloudwatch_auth_missing_region.fix.md
deleted file mode 100644
index 7cfacdc2191c1..0000000000000
--- a/changelog.d/22827_cloudwatch_auth_missing_region.fix.md
+++ /dev/null
@@ -1,3 +0,0 @@
-Fixed a `AwsAuthentication::File` bug where `region` was missing from the `STS` authentication endpoint.
-
-authors: cahartma
diff --git a/changelog.d/22831_increase_cloudwatch_log_event_max_size.fix.md b/changelog.d/22831_increase_cloudwatch_log_event_max_size.fix.md
deleted file mode 100644
index dddae5c17b134..0000000000000
--- a/changelog.d/22831_increase_cloudwatch_log_event_max_size.fix.md
+++ /dev/null
@@ -1,3 +0,0 @@
-Increase the max event size for `aws_cloudwatch_logs` sink based on newly increased limit from `AWS`
-
-authors: cahartma
diff --git a/changelog.d/22850_custom_auth_address_access.feature.md b/changelog.d/22850_custom_auth_address_access.feature.md
deleted file mode 100644
index a955cec1b0aa5..0000000000000
--- a/changelog.d/22850_custom_auth_address_access.feature.md
+++ /dev/null
@@ -1,3 +0,0 @@
-Enabled IP address access in VRL scripts of custom auth strategy for server components.
-
-authors: esensar Quad9DNS
diff --git a/changelog.d/22854_websocket_server_subprotocol_support.feature.md b/changelog.d/22854_websocket_server_subprotocol_support.feature.md
deleted file mode 100644
index 322aa36a8b4d9..0000000000000
--- a/changelog.d/22854_websocket_server_subprotocol_support.feature.md
+++ /dev/null
@@ -1,3 +0,0 @@
-Added support for the `Sec-WebSocket-Protocol` header in the `websocket_server` sink to better accommodate clients that require it.
-
-authors: esensar Quad9DNS
diff --git a/changelog.d/22857_junit_reports_for_unit_tests.feature.md b/changelog.d/22857_junit_reports_for_unit_tests.feature.md
deleted file mode 100644
index 1c72c4919937e..0000000000000
--- a/changelog.d/22857_junit_reports_for_unit_tests.feature.md
+++ /dev/null
@@ -1,3 +0,0 @@
-Added the ability to generate JUnit reports for unit tests.
-
-authors: simplepad
diff --git a/changelog.d/22865_framing_performance.enhancement.md b/changelog.d/22865_framing_performance.enhancement.md
deleted file mode 100644
index 00a8479f662dd..0000000000000
--- a/changelog.d/22865_framing_performance.enhancement.md
+++ /dev/null
@@ -1,3 +0,0 @@
-Reduced unnecessary buffer reallocation when using `framing.method = length_delimited` in sinks for significantly improved performance with large (more than 10MB) batches.
-
-authors: Ilmarii
diff --git a/changelog.d/22909_redis_sink_supports_encoding_input.feature.md b/changelog.d/22909_redis_sink_supports_encoding_input.feature.md
deleted file mode 100644
index 52f5514516570..0000000000000
--- a/changelog.d/22909_redis_sink_supports_encoding_input.feature.md
+++ /dev/null
@@ -1,3 +0,0 @@
-The redis sink now supports any input event type that the configured encoding supports. It previously only supported log events.
-
-authors: ynachi
diff --git a/changelog.d/22921_remove_limit_if_use_apiserver_cache.fix.md b/changelog.d/22921_remove_limit_if_use_apiserver_cache.fix.md
deleted file mode 100644
index e0f68868b5ce1..0000000000000
--- a/changelog.d/22921_remove_limit_if_use_apiserver_cache.fix.md
+++ /dev/null
@@ -1,3 +0,0 @@
-Fixed a `kubernetes source` bug where `use_apiserver_cache=true` but there is no `resourceVersion=0` parameters in list request. As [the issue](https://github.com/kube-rs/kube/issues/1743) mentioned, when there are `resourceVersion =0` and `!page_size.is_none` in the `ListParams` fields, the parameter `resourceVersion=0` will be ignored by `kube-rs` sdk. If no parameter `resourceVersion` passed to the apiserver, the apiserver will list pods from ETCD instead of in memory cache.
-
-authors: xiaozongyang
diff --git a/changelog.d/22922_healthcheck_timeout_config.feature.md b/changelog.d/22922_healthcheck_timeout_config.feature.md
deleted file mode 100644
index 4865e0f047876..0000000000000
--- a/changelog.d/22922_healthcheck_timeout_config.feature.md
+++ /dev/null
@@ -1,3 +0,0 @@
-Added `timeout` config option to the `healthcheck` sink configuration. Previously it was hardcoded to 10 seconds across all components, but now it can be configured per component.
-
-authors: esensar Quad9DNS
diff --git a/changelog.d/22926_enrichment_function_single_bounded_date_range_search.enhancement.md b/changelog.d/22926_enrichment_function_single_bounded_date_range_search.enhancement.md
deleted file mode 100644
index e20a27c160a15..0000000000000
--- a/changelog.d/22926_enrichment_function_single_bounded_date_range_search.enhancement.md
+++ /dev/null
@@ -1,3 +0,0 @@
-The [enrichment functions](https://vector.dev/docs/reference/vrl/functions/#enrichment-functions) now support bounded date range filtering using optional `from` and `to` parameters. There are no changes to the function signatures.
-
-authors: nzxwang
diff --git a/changelog.d/23011_add_relaxed_wildcard_matching.feature.md b/changelog.d/23011_add_relaxed_wildcard_matching.feature.md
deleted file mode 100644
index adaf44fd03177..0000000000000
--- a/changelog.d/23011_add_relaxed_wildcard_matching.feature.md
+++ /dev/null
@@ -1,24 +0,0 @@
-Added `wildcard_matching` global config option to set wildcard matching mode for inputs. Relaxed mode allows configurations with wildcards that do not match any inputs to be accepted without causing an error.
-
-Example config:
-
-```yaml
-wildcard_matching: relaxed
-
-sources:
-  stdin:
-    type: stdin
-
-# note - no transforms
-
-sinks:
-  stdout:
-    type: console
-    encoding:
-      codec: json
-    inputs:
-      - "runtime-added-transform-*"
-
-```
-
-authors: simplepad
diff --git a/changelog.d/23047_add_a6_prefix_check_in_dns_parsing.fix.md b/changelog.d/23047_add_a6_prefix_check_in_dns_parsing.fix.md
deleted file mode 100644
index 7de9609bce5d7..0000000000000
--- a/changelog.d/23047_add_a6_prefix_check_in_dns_parsing.fix.md
+++ /dev/null
@@ -1,3 +0,0 @@
-Fixed a bug that allowed a record to be transmitted with an IPv6 prefix larger than allowed (128) in `dnsmsg_parser::DnsMessageParser` parse functions.
-
-authors: wooffie
diff --git a/changelog.d/23048_fix_arith_logic_dnstap_parse.fix.md b/changelog.d/23048_fix_arith_logic_dnstap_parse.fix.md
deleted file mode 100644
index 1a213d2bd4e4a..0000000000000
--- a/changelog.d/23048_fix_arith_logic_dnstap_parse.fix.md
+++ /dev/null
@@ -1,3 +0,0 @@
-Added checks for integer operations with timestamps which used in `dnstap-parser::DnstapParser::parse`.
-
-authors: wooffie
diff --git a/changelog.d/9819_watch_remap_external_vrl.enhancement.md b/changelog.d/9819_watch_remap_external_vrl.enhancement.md
deleted file mode 100644
index a77b4c1809d7f..0000000000000
--- a/changelog.d/9819_watch_remap_external_vrl.enhancement.md
+++ /dev/null
@@ -1,3 +0,0 @@
-Files specified in the `file` and `files` fields of `remap` transforms are now watched when `--watch-config` is enabled. Changes to these files automatically trigger a configuration reload, so there's no need to restart Vector.
-
-authors: nekorro
diff --git a/changelog.d/add_priority_amqp_sink.enhancement.md b/changelog.d/add_priority_amqp_sink.enhancement.md
deleted file mode 100644
index 6b665ebef64b1..0000000000000
--- a/changelog.d/add_priority_amqp_sink.enhancement.md
+++ /dev/null
@@ -1,3 +0,0 @@
-The `amqp` sink now supports setting the `priority` for messages. The priority value can be templated to an integer between 0 and 255 (inclusive). Also, this new field is template-able and Vector templates can now render numerical values.
-
-authors: aramperes
diff --git a/changelog.d/datadog_agent_http_header.fix.md b/changelog.d/datadog_agent_http_header.fix.md
deleted file mode 100644
index a075a4976e157..0000000000000
--- a/changelog.d/datadog_agent_http_header.fix.md
+++ /dev/null
@@ -1,31 +0,0 @@
-Adding an option in the `datadog_logs` sink to allow Vector to mutate the record to conform to the
-protocol used by the Datadog Agent itself. To enable use the `conforms_as_agent` option or have the
-appropriate agent header (`DD-PROTOCOL: agent-json`) within the additional HTTP Headers list.
-
-The log will be mutated so that any data that is a reserved keyword that exists at the root will be
-moved under a new object keyed at the field 'message'. One will be created if it already does not
-exist. As an example:
-
-```json
-{
-  "key1": "value1",
-  "key2": { "key2-1" : "value2" },
-  "message" : "Hello world",
-  ... rest of reserved fields
-}
-```
-
-will be modified to:
-
-```json
-{
-  "message" : {
-    "message" : "Hello world",
-    "key1": "value1",
-    "key2": { "key2-1" : "value2" }
-  },
-  ... rest of reserved fields
-}
-```
-
-authors: graphcareful
diff --git a/changelog.d/datadog_logs_sink_logs_namespace.fix.md b/changelog.d/datadog_logs_sink_logs_namespace.fix.md
deleted file mode 100644
index c430a21b4f448..0000000000000
--- a/changelog.d/datadog_logs_sink_logs_namespace.fix.md
+++ /dev/null
@@ -1,3 +0,0 @@
-Fix bug in the `datadog_logs` sink where the content of the log message is dropped when logs namespacing is enabled.
-
-authors: graphcareful
diff --git a/changelog.d/gelf-error.fix.md b/changelog.d/gelf-error.fix.md
deleted file mode 100644
index 9f0133e6d550c..0000000000000
--- a/changelog.d/gelf-error.fix.md
+++ /dev/null
@@ -1,3 +0,0 @@
-Fixed misleading error message for invalid field name in gelf encoder.
-
-authors: mprasil
diff --git a/changelog.d/opentelemetry_metrics.feature.md b/changelog.d/opentelemetry_metrics.feature.md
deleted file mode 100644
index 824383d14747b..0000000000000
--- a/changelog.d/opentelemetry_metrics.feature.md
+++ /dev/null
@@ -1,3 +0,0 @@
-The `opentelemetry` source now supports metrics ingestion.
-
-authors: cmcmacs
diff --git a/changelog.d/s3-source-defer-or-delete.enhancement.md b/changelog.d/s3-source-defer-or-delete.enhancement.md
deleted file mode 100644
index c4d0b54ccce4a..0000000000000
--- a/changelog.d/s3-source-defer-or-delete.enhancement.md
+++ /dev/null
@@ -1,3 +0,0 @@
-Add deferred processing options (`deferred.max_age_secs`, `deferred.queue_url`) to automatically route older event notifications to a separate queue, enabling prioritized processing of recent files
-
-authors: akutta
diff --git a/changelog.d/window-transform.feature.md b/changelog.d/window-transform.feature.md
deleted file mode 100644
index b3f366108c625..0000000000000
--- a/changelog.d/window-transform.feature.md
+++ /dev/null
@@ -1,5 +0,0 @@
-Add a new `window` transform, a variant of ring buffer or backtrace logging implemented as a sliding window.
-Allows for reduction of log volume by filtering out logs when the system is healthy, but preserving detailed
-logs when they are most relevant.
-
-authors: ilinas
diff --git a/distribution/install.sh b/distribution/install.sh
index 13d8f847b6e06..e96aff7fe4c4e 100755
--- a/distribution/install.sh
+++ b/distribution/install.sh
@@ -13,7 +13,7 @@ set -u
 # If PACKAGE_ROOT is unset or empty, default it.
 PACKAGE_ROOT="${PACKAGE_ROOT:-"https://packages.timber.io/vector"}"
 # If VECTOR_VERSION is unset or empty, default it.
-VECTOR_VERSION="${VECTOR_VERSION:-"0.46.1"}"
+VECTOR_VERSION="${VECTOR_VERSION:-"0.47.0"}"
 _divider="--------------------------------------------------------------------------------"
 _prompt=">>>"
 _indent="   "
diff --git a/distribution/kubernetes/vector-agent/README.md b/distribution/kubernetes/vector-agent/README.md
index 27da769cff90c..95b20cde3fb8d 100644
--- a/distribution/kubernetes/vector-agent/README.md
+++ b/distribution/kubernetes/vector-agent/README.md
@@ -1,6 +1,6 @@
 The kubernetes manifests found in this directory have been automatically generated
 from the [helm chart `vector/vector`](https://github.com/vectordotdev/helm-charts/tree/master/charts/vector)
-version 0.42.1 with the following `values.yaml`:
+version 0.43.0 with the following `values.yaml`:
 
 ```yaml
 role: Agent
diff --git a/distribution/kubernetes/vector-agent/configmap.yaml b/distribution/kubernetes/vector-agent/configmap.yaml
index 6db2a2ea95a6b..1eb3b3a2b8f88 100644
--- a/distribution/kubernetes/vector-agent/configmap.yaml
+++ b/distribution/kubernetes/vector-agent/configmap.yaml
@@ -9,7 +9,7 @@ metadata:
     app.kubernetes.io/name: vector
     app.kubernetes.io/instance: vector
     app.kubernetes.io/component: Agent
-    app.kubernetes.io/version: "0.46.1-distroless-libc"
+    app.kubernetes.io/version: "0.47.0-distroless-libc"
 data:
   agent.yaml: |
     data_dir: /vector-data-dir
diff --git a/distribution/kubernetes/vector-agent/daemonset.yaml b/distribution/kubernetes/vector-agent/daemonset.yaml
index 41d64e003a753..b1ef77d0dd828 100644
--- a/distribution/kubernetes/vector-agent/daemonset.yaml
+++ b/distribution/kubernetes/vector-agent/daemonset.yaml
@@ -9,7 +9,7 @@ metadata:
     app.kubernetes.io/name: vector
     app.kubernetes.io/instance: vector
     app.kubernetes.io/component: Agent
-    app.kubernetes.io/version: "0.46.1-distroless-libc"
+    app.kubernetes.io/version: "0.47.0-distroless-libc"
 spec:
   selector:
     matchLabels:
@@ -30,7 +30,7 @@ spec:
       dnsPolicy: ClusterFirst
       containers:
         - name: vector
-          image: "timberio/vector:0.46.1-distroless-libc"
+          image: "timberio/vector:0.47.0-distroless-libc"
           imagePullPolicy: IfNotPresent
           args:
             - --config-dir
diff --git a/distribution/kubernetes/vector-agent/rbac.yaml b/distribution/kubernetes/vector-agent/rbac.yaml
index 4c776a65970e3..f1e1f7351ddd5 100644
--- a/distribution/kubernetes/vector-agent/rbac.yaml
+++ b/distribution/kubernetes/vector-agent/rbac.yaml
@@ -10,7 +10,7 @@ metadata:
     app.kubernetes.io/name: vector
     app.kubernetes.io/instance: vector
     app.kubernetes.io/component: Agent
-    app.kubernetes.io/version: "0.46.1-distroless-libc"
+    app.kubernetes.io/version: "0.47.0-distroless-libc"
 rules:
   - apiGroups:
       - ""
@@ -31,7 +31,7 @@ metadata:
     app.kubernetes.io/name: vector
     app.kubernetes.io/instance: vector
     app.kubernetes.io/component: Agent
-    app.kubernetes.io/version: "0.46.1-distroless-libc"
+    app.kubernetes.io/version: "0.47.0-distroless-libc"
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
diff --git a/distribution/kubernetes/vector-agent/service-headless.yaml b/distribution/kubernetes/vector-agent/service-headless.yaml
index 45fc274219f22..c7a5c971fc2f7 100644
--- a/distribution/kubernetes/vector-agent/service-headless.yaml
+++ b/distribution/kubernetes/vector-agent/service-headless.yaml
@@ -9,7 +9,7 @@ metadata:
     app.kubernetes.io/name: vector
     app.kubernetes.io/instance: vector
     app.kubernetes.io/component: Agent
-    app.kubernetes.io/version: "0.46.1-distroless-libc"
+    app.kubernetes.io/version: "0.47.0-distroless-libc"
   annotations:
 spec:
   clusterIP: None
diff --git a/distribution/kubernetes/vector-agent/serviceaccount.yaml b/distribution/kubernetes/vector-agent/serviceaccount.yaml
index 6582dfe20ca82..18198d14032b0 100644
--- a/distribution/kubernetes/vector-agent/serviceaccount.yaml
+++ b/distribution/kubernetes/vector-agent/serviceaccount.yaml
@@ -9,5 +9,5 @@ metadata:
     app.kubernetes.io/name: vector
     app.kubernetes.io/instance: vector
     app.kubernetes.io/component: Agent
-    app.kubernetes.io/version: "0.46.1-distroless-libc"
+    app.kubernetes.io/version: "0.47.0-distroless-libc"
 automountServiceAccountToken: true
diff --git a/distribution/kubernetes/vector-aggregator/README.md b/distribution/kubernetes/vector-aggregator/README.md
index f50f97fa32989..2940d28c48a1a 100644
--- a/distribution/kubernetes/vector-aggregator/README.md
+++ b/distribution/kubernetes/vector-aggregator/README.md
@@ -1,6 +1,6 @@
 The kubernetes manifests found in this directory have been automatically generated
 from the [helm chart `vector/vector`](https://github.com/vectordotdev/helm-charts/tree/master/charts/vector)
-version 0.42.1 with the following `values.yaml`:
+version 0.43.0 with the following `values.yaml`:
 
 ```yaml
 
diff --git a/distribution/kubernetes/vector-aggregator/configmap.yaml b/distribution/kubernetes/vector-aggregator/configmap.yaml
index c3b6e0ac25ada..5548ef74f65ed 100644
--- a/distribution/kubernetes/vector-aggregator/configmap.yaml
+++ b/distribution/kubernetes/vector-aggregator/configmap.yaml
@@ -9,7 +9,7 @@ metadata:
     app.kubernetes.io/name: vector
     app.kubernetes.io/instance: vector
     app.kubernetes.io/component: Aggregator
-    app.kubernetes.io/version: "0.46.1-distroless-libc"
+    app.kubernetes.io/version: "0.47.0-distroless-libc"
 data:
   aggregator.yaml: |
     data_dir: /vector-data-dir
diff --git a/distribution/kubernetes/vector-aggregator/service-headless.yaml b/distribution/kubernetes/vector-aggregator/service-headless.yaml
index c88a67f2b310b..b3e79b9d67718 100644
--- a/distribution/kubernetes/vector-aggregator/service-headless.yaml
+++ b/distribution/kubernetes/vector-aggregator/service-headless.yaml
@@ -9,7 +9,7 @@ metadata:
     app.kubernetes.io/name: vector
     app.kubernetes.io/instance: vector
     app.kubernetes.io/component: Aggregator
-    app.kubernetes.io/version: "0.46.1-distroless-libc"
+    app.kubernetes.io/version: "0.47.0-distroless-libc"
   annotations:
 spec:
   clusterIP: None
diff --git a/distribution/kubernetes/vector-aggregator/service.yaml b/distribution/kubernetes/vector-aggregator/service.yaml
index f85a74c2acdab..fe65a612a1fc0 100644
--- a/distribution/kubernetes/vector-aggregator/service.yaml
+++ b/distribution/kubernetes/vector-aggregator/service.yaml
@@ -9,7 +9,7 @@ metadata:
     app.kubernetes.io/name: vector
     app.kubernetes.io/instance: vector
     app.kubernetes.io/component: Aggregator
-    app.kubernetes.io/version: "0.46.1-distroless-libc"
+    app.kubernetes.io/version: "0.47.0-distroless-libc"
   annotations:
 spec:
   ports:
diff --git a/distribution/kubernetes/vector-aggregator/serviceaccount.yaml b/distribution/kubernetes/vector-aggregator/serviceaccount.yaml
index ca52b73bb4fca..cab03421b9df7 100644
--- a/distribution/kubernetes/vector-aggregator/serviceaccount.yaml
+++ b/distribution/kubernetes/vector-aggregator/serviceaccount.yaml
@@ -9,5 +9,5 @@ metadata:
     app.kubernetes.io/name: vector
     app.kubernetes.io/instance: vector
     app.kubernetes.io/component: Aggregator
-    app.kubernetes.io/version: "0.46.1-distroless-libc"
+    app.kubernetes.io/version: "0.47.0-distroless-libc"
 automountServiceAccountToken: true
diff --git a/distribution/kubernetes/vector-aggregator/statefulset.yaml b/distribution/kubernetes/vector-aggregator/statefulset.yaml
index 03a554ba2568c..a8f500eec9656 100644
--- a/distribution/kubernetes/vector-aggregator/statefulset.yaml
+++ b/distribution/kubernetes/vector-aggregator/statefulset.yaml
@@ -9,7 +9,7 @@ metadata:
     app.kubernetes.io/name: vector
     app.kubernetes.io/instance: vector
     app.kubernetes.io/component: Aggregator
-    app.kubernetes.io/version: "0.46.1-distroless-libc"
+    app.kubernetes.io/version: "0.47.0-distroless-libc"
   annotations: {}
 spec:
   replicas: 1
@@ -34,7 +34,7 @@ spec:
       dnsPolicy: ClusterFirst
       containers:
         - name: vector
-          image: "timberio/vector:0.46.1-distroless-libc"
+          image: "timberio/vector:0.47.0-distroless-libc"
           imagePullPolicy: IfNotPresent
           args:
             - --config-dir
diff --git a/distribution/kubernetes/vector-stateless-aggregator/README.md b/distribution/kubernetes/vector-stateless-aggregator/README.md
index 773c7190c08e7..73042c237387b 100644
--- a/distribution/kubernetes/vector-stateless-aggregator/README.md
+++ b/distribution/kubernetes/vector-stateless-aggregator/README.md
@@ -1,6 +1,6 @@
 The kubernetes manifests found in this directory have been automatically generated
 from the [helm chart `vector/vector`](https://github.com/vectordotdev/helm-charts/tree/master/charts/vector)
-version 0.42.1 with the following `values.yaml`:
+version 0.43.0 with the following `values.yaml`:
 
 ```yaml
 role: Stateless-Aggregator
diff --git a/distribution/kubernetes/vector-stateless-aggregator/configmap.yaml b/distribution/kubernetes/vector-stateless-aggregator/configmap.yaml
index 6e2277f4b0b8d..9285d34da1486 100644
--- a/distribution/kubernetes/vector-stateless-aggregator/configmap.yaml
+++ b/distribution/kubernetes/vector-stateless-aggregator/configmap.yaml
@@ -9,7 +9,7 @@ metadata:
     app.kubernetes.io/name: vector
     app.kubernetes.io/instance: vector
     app.kubernetes.io/component: Stateless-Aggregator
-    app.kubernetes.io/version: "0.46.1-distroless-libc"
+    app.kubernetes.io/version: "0.47.0-distroless-libc"
 data:
   aggregator.yaml: |
     data_dir: /vector-data-dir
diff --git a/distribution/kubernetes/vector-stateless-aggregator/deployment.yaml b/distribution/kubernetes/vector-stateless-aggregator/deployment.yaml
index abd9830d1e9a2..90e636d234352 100644
--- a/distribution/kubernetes/vector-stateless-aggregator/deployment.yaml
+++ b/distribution/kubernetes/vector-stateless-aggregator/deployment.yaml
@@ -9,7 +9,7 @@ metadata:
     app.kubernetes.io/name: vector
     app.kubernetes.io/instance: vector
     app.kubernetes.io/component: Stateless-Aggregator
-    app.kubernetes.io/version: "0.46.1-distroless-libc"
+    app.kubernetes.io/version: "0.47.0-distroless-libc"
   annotations: {}
 spec:
   replicas: 1
@@ -32,7 +32,7 @@ spec:
       dnsPolicy: ClusterFirst
       containers:
         - name: vector
-          image: "timberio/vector:0.46.1-distroless-libc"
+          image: "timberio/vector:0.47.0-distroless-libc"
           imagePullPolicy: IfNotPresent
           args:
             - --config-dir
diff --git a/distribution/kubernetes/vector-stateless-aggregator/service-headless.yaml b/distribution/kubernetes/vector-stateless-aggregator/service-headless.yaml
index ce28b3f972de6..a79fa284683e8 100644
--- a/distribution/kubernetes/vector-stateless-aggregator/service-headless.yaml
+++ b/distribution/kubernetes/vector-stateless-aggregator/service-headless.yaml
@@ -9,7 +9,7 @@ metadata:
     app.kubernetes.io/name: vector
     app.kubernetes.io/instance: vector
     app.kubernetes.io/component: Stateless-Aggregator
-    app.kubernetes.io/version: "0.46.1-distroless-libc"
+    app.kubernetes.io/version: "0.47.0-distroless-libc"
   annotations:
 spec:
   clusterIP: None
diff --git a/distribution/kubernetes/vector-stateless-aggregator/service.yaml b/distribution/kubernetes/vector-stateless-aggregator/service.yaml
index 0a5a0cb3eea98..d4ec508ea0188 100644
--- a/distribution/kubernetes/vector-stateless-aggregator/service.yaml
+++ b/distribution/kubernetes/vector-stateless-aggregator/service.yaml
@@ -9,7 +9,7 @@ metadata:
     app.kubernetes.io/name: vector
     app.kubernetes.io/instance: vector
     app.kubernetes.io/component: Stateless-Aggregator
-    app.kubernetes.io/version: "0.46.1-distroless-libc"
+    app.kubernetes.io/version: "0.47.0-distroless-libc"
   annotations:
 spec:
   ports:
diff --git a/distribution/kubernetes/vector-stateless-aggregator/serviceaccount.yaml b/distribution/kubernetes/vector-stateless-aggregator/serviceaccount.yaml
index 9c6e57f0f5155..ab1579b288218 100644
--- a/distribution/kubernetes/vector-stateless-aggregator/serviceaccount.yaml
+++ b/distribution/kubernetes/vector-stateless-aggregator/serviceaccount.yaml
@@ -9,5 +9,5 @@ metadata:
     app.kubernetes.io/name: vector
     app.kubernetes.io/instance: vector
     app.kubernetes.io/component: Stateless-Aggregator
-    app.kubernetes.io/version: "0.46.1-distroless-libc"
+    app.kubernetes.io/version: "0.47.0-distroless-libc"
 automountServiceAccountToken: true
diff --git a/docker_logs.txt b/docker_logs.txt
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/website/content/en/docs/reference/configuration/sources/mqtt.md b/website/content/en/docs/reference/configuration/sources/mqtt.md
index 179b0bce2e9d5..86560c96d566f 100644
--- a/website/content/en/docs/reference/configuration/sources/mqtt.md
+++ b/website/content/en/docs/reference/configuration/sources/mqtt.md
@@ -1,7 +1,7 @@
 ---
 title: MQTT
 description: Receive logs from an [MQTT](https://mqtt.org) broker
-kind: source
+component_kind: source
 layout: component
 tags: ["mqtt", "component", "source"]
 ---
diff --git a/website/content/en/releases/0.47.0.md b/website/content/en/releases/0.47.0.md
new file mode 100644
index 0000000000000..5bad0ddc3fbdb
--- /dev/null
+++ b/website/content/en/releases/0.47.0.md
@@ -0,0 +1,4 @@
+---
+title: Vector v0.47.0 release notes
+weight: 25
+---
diff --git a/website/cue/reference/administration/interfaces/kubectl.cue b/website/cue/reference/administration/interfaces/kubectl.cue
index 67b39c183d675..ea5f5b2b9c4a1 100644
--- a/website/cue/reference/administration/interfaces/kubectl.cue
+++ b/website/cue/reference/administration/interfaces/kubectl.cue
@@ -19,7 +19,7 @@ administration: interfaces: kubectl: {
 	role_implementations: [Name=string]: {
 		commands: {
 			_deployment_variant:       string
-			_vector_version:           "0.46"
+			_vector_version:           "0.47"
 			_namespace:                string | *"vector"
 			_controller_resource_type: string
 			_controller_resource_name: string | *_deployment_variant
diff --git a/website/cue/reference/releases/0.47.0.cue b/website/cue/reference/releases/0.47.0.cue
new file mode 100644
index 0000000000000..d6edbe6388ade
--- /dev/null
+++ b/website/cue/reference/releases/0.47.0.cue
@@ -0,0 +1,419 @@
+package metadata
+
+releases: "0.47.0": {
+	date:     "2025-05-20"
+	codename: ""
+
+	whats_next: []
+
+	description: """
+		The Vector team is excited to announce version `0.47.0`!
+
+		Release highlights:
+
+		- The `opentelemetry` source now supports metrics ingestion.
+		- A new `window` transform has been introduced which enables log noise reduction by filtering out events when the system is in a healthy state.
+		- A new `mqtt` source is now available, enabling ingestion from MQTT brokers.
+		- The `datadog_logs` sink now supports a new `conforms_as_agent` option to format logs like the Datadog Agent, ensuring compatibility with reserved fields.
+		"""
+
+	vrl_changelog: """
+		VRL was updated to `v0.24.0`. This includes the following changes:
+
+		#### Enhancements
+
+		- The `encode_gzip`, `decode_gzip`, `encode_zlib`, and `decode_zlib` methods now use the [zlib-rs](https://github.com/trifectatechfoundation/zlib-rs) backend.
+			which is much faster than the previous backend `miniz_oxide`.
+
+		- The `decode_base64`, `encode_base64`, and `decode_mime_q` functions now use the SIMD backend.
+			which is faster than the previous backend.
+
+		#### Fixes
+
+		- Add BOM stripping logic to the parse_json function.
+		"""
+
+	changelog: [
+		{
+			type: "feat"
+			description: """
+				The `opentelemetry` source now supports metrics ingestion.
+				"""
+			contributors: ["cmcmacs"]
+		},
+		{
+			type: "feat"
+			description: """
+				Add a new `window` transform, a variant of ring buffer or backtrace logging implemented as a sliding window.
+				Allows for reduction of log volume by filtering out logs when the system is healthy, but preserving detailed
+				logs when they are most relevant.
+				"""
+			contributors: ["ilinas"]
+		},
+		{
+			type: "feat"
+			description: """
+				Add a new `mqtt` source enabling Vector to receive logs from a MQTT broker.
+				"""
+			contributors: ["mladedav", "pront", "StormStake"]
+		},
+		{
+			type: "feat"
+			description: """
+				Add support for rendering to Mermaid format in `vector graph`
+				"""
+			contributors: ["Firehed"]
+		},
+		{
+			type: "fix"
+			description: """
+				Fix a Vector crash that occurred when the internal metrics generated too many groups by increasing groups max limit from 128 to 256.
+				"""
+			contributors: ["triggerhappy17"]
+		},
+		{
+			type: "feat"
+			description: """
+				Allow users to specify AWS authentication and the AWS service name for HTTP sinks to support AWS API endpoints that require SigV4.
+				"""
+			contributors: ["johannesfloriangeiger"]
+		},
+		{
+			type: "feat"
+			description: """
+				Add support for fluentd forwarding over a Unix socket
+				"""
+			contributors: ["tustvold"]
+		},
+		{
+			type: "enhancement"
+			description: """
+				Zlib compression and decompression are now more efficient by using [zlib-rs](https://github.com/trifectatechfoundation/zlib-rs).
+				"""
+			contributors: ["JakubOnderka"]
+		},
+		{
+			type: "feat"
+			description: """
+				Add ACK support to message buffering feature of `websocket_server` sink, allowing this component to cache latest received messages per client.
+				"""
+			contributors: ["esensar", "Quad9DNS"]
+		},
+		{
+			type: "chore"
+			description: """
+				Add a new `extra_headers` option to `greptimedb_logs` sink configuration to set additional headers for outgoing requests.
+				
+				Change `greptimedb_logs` sink default content type to `application/x-ndjson` to match the default content type of `greptimedb` sink.
+				If you use the greptimedb version v0.12 or earlier, you need to set the content type to `application/json` in the sink configuration.
+				
+				Example:
+				
+				```yaml
+				sinks:
+				  greptime_logs:
+				    type: greptimedb_logs
+				    inputs: ["my_source_id"]
+				    endpoint: "http://localhost:4000"
+				    table: "demo_logs"
+				    dbname: "public"
+				    extra_headers:
+				      x-source: vector
+				```
+				
+				```toml
+				[sinks.greptime_logs]
+				type = "greptimedb_logs"
+				inputs = ["my_source_id"]
+				endpoint = "http://localhost:4000"
+				table = "demo_logs"
+				dbname = "public"
+				
+				[sinks.greptime_logs.extra_headers]
+				x-source = "vector"
+				```
+				"""
+			contributors: ["greptimedb"]
+		},
+		{
+			type: "feat"
+			description: """
+				Introduce a configuration option in the StatsD source: `convert_to` of type `ConversionUnit`. By default, timing values in milliseconds (`ms`) are converted to seconds (`s`). Users can set `convert_to` to `milliseconds` to preserve the original millisecond values.
+				"""
+			contributors: ["devkoriel"]
+		},
+		{
+			type: "fix"
+			description: """
+				Fix `file` source bug where known small files were not deleted after the specified `remove_after_secs`.
+				"""
+			contributors: ["linw1995"]
+		},
+		{
+			type: "fix"
+			description: """
+				Fix an AWS authentication bug where `region` was missing from the `STS` authentication endpoint.
+				"""
+			contributors: ["cahartma"]
+		},
+		{
+			type: "fix"
+			description: """
+				Increase the max event size for `aws_cloudwatch_logs` sink to ~1MB.
+				"""
+			contributors: ["cahartma"]
+		},
+		{
+			type: "feat"
+			description: """
+				The `address` field is now available within VRL scripts when using the `auth.strategy.custom` authentication method.
+				"""
+			contributors: ["esensar", "Quad9DNS"]
+		},
+		{
+			type: "feat"
+			description: """
+				Add support for the `Sec-WebSocket-Protocol` header in the `websocket_server` sink to better accommodate clients that require it.
+				"""
+			contributors: ["esensar", "Quad9DNS"]
+		},
+		{
+			type: "enhancement"
+			description: """
+				Reduce unnecessary buffer reallocation when using `framing.method = length_delimited` in sinks for significantly improved performance with large (more than 10MB) batches.
+				"""
+			contributors: ["Ilmarii"]
+		},
+		{
+			type: "feat"
+			description: """
+				The redis sink now supports any input event type that the configured encoding supports. It previously only supported log events.
+				"""
+			contributors: ["ynachi"]
+		},
+		{
+			type: "fix"
+			description: """
+				Fix a `kubernetes source` bug where `use_apiserver_cache=true` but there is no `resourceVersion=0` parameter in list request. Per [this issue](https://github.com/kube-rs/kube/issues/1743), when `resourceVersion =0` and `!page_size.is_none` in`ListParams`, the parameter `resourceVersion=0` will be ignored by `kube-rs` sdk. If no parameter `resourceVersion` passed to the apiserver, the apiserver will list pods from ETCD instead of in memory cache.
+				"""
+			contributors: ["xiaozongyang"]
+		},
+		{
+			type: "feat"
+			description: """
+				Add `timeout` config option to the `healthcheck` sink configuration. Previously it was hardcoded to 10 seconds across all components, but now it can be configured per component.
+				"""
+			contributors: ["esensar", "Quad9DNS"]
+		},
+		{
+			type: "enhancement"
+			description: """
+				The [enrichment functions](https://vector.dev/docs/reference/vrl/functions/#enrichment-functions) now support bounded date range filtering using optional `from` and `to` parameters. There are no changes to the function signatures.
+				"""
+			contributors: ["nzxwang"]
+		},
+		{
+			type: "feat"
+			description: """
+				Add `wildcard_matching` global config option to set wildcard matching mode for inputs. Relaxed mode allows configurations with wildcards that do not match any inputs to be accepted without causing an error.
+				
+				Example config:
+				
+				```yaml
+				wildcard_matching: relaxed
+				
+				sources:
+				  stdin:
+				    type: stdin
+				
+				# note - no transforms
+				
+				sinks:
+				  stdout:
+				    type: console
+				    encoding:
+				      codec: json
+				    inputs:
+				      - "runtime-added-transform-*"
+				
+				```
+				"""
+			contributors: ["simplepad"]
+		},
+		{
+			type: "fix"
+			description: """
+				Fix a bug that allows DNS records with an IPv6 prefix length greater than 128 to be transmitted; invalid prefixes are now rejected during parsing.
+				"""
+			contributors: ["wooffie"]
+		},
+		{
+			type: "fix"
+			description: """
+				Add checks to prevent invalid timestamps operations during DNS tap parsing; such operations are now validated to ensure correctness.
+				"""
+			contributors: ["wooffie"]
+		},
+		{
+			type: "enhancement"
+			description: """
+				Files specified in the `file` and `files` fields of `remap` transforms are now watched when `--watch-config` is enabled. Changes to these files automatically trigger a configuration reload, so there's no need to restart Vector.
+				"""
+			contributors: ["nekorro"]
+		},
+		{
+			type: "enhancement"
+			description: """
+				The `amqp` sink now supports setting the `priority` for messages. The value can be templated to an integer 0-255 (inclusive).
+				"""
+			contributors: ["aramperes"]
+		},
+		{
+			type: "fix"
+			description: """
+				Add an option in the `datadog_logs` sink to allow Vector to mutate the record to conform to the
+				protocol used by the Datadog Agent itself. To enable, use the `conforms_as_agent` option or have the
+				appropriate agent header (`DD-PROTOCOL: agent-json`) within the additional HTTP Headers list.
+				
+				Any top-level fields that use Datadog-reserved keywords are moved into a new object named `message`. If `message` doesn’t exist, it is created first. For example:
+				
+				```json
+				{
+				  "key1": "value1",
+				  "key2": { "key2-1" : "value2" },
+				  "message" : "Hello world",
+				  ... rest of reserved fields
+				}
+				```
+				
+				will be modified to:
+				
+				```json
+				{
+				  "message" : {
+				    "message" : "Hello world",
+				    "key1": "value1",
+				    "key2": { "key2-1" : "value2" }
+				  },
+				  ... rest of reserved fields
+				}
+				```
+				"""
+			contributors: ["graphcareful"]
+		},
+		{
+			type: "fix"
+			description: """
+				Fix a bug in the `datadog_logs` sink where the content of the log message is dropped when logs namespacing is enabled.
+				"""
+			contributors: ["graphcareful"]
+		},
+		{
+			type: "fix"
+			description: """
+				Fix misleading error message for invalid field name in gelf encoder.
+				"""
+			contributors: ["mprasil"]
+		},
+		{
+			type: "enhancement"
+			description: """
+				Add `deferred.max_age_secs` and `deferred.queue_url` options to the `aws_s3` and `aws_sqs` sinks, to automatically
+				route older event notifications to a separate queue, allowing prioritized processing of recent files.
+				"""
+			contributors: ["akutta"]
+		},
+	]
+
+	commits: [
+		{sha: "37803453653444ce1b210b66cdc1e64e500a970f", date: "2025-04-07 17:59:45 UTC", description: "Bump indexmap from 2.8.0 to 2.9.0", pr_number: 22814, scopes: ["deps"], type: "chore", breaking_change: false, author: "dependabot[bot]", files_count: 3, insertions_count: 27, deletions_count: 27},
+		{sha: "bb3680636d9ae058d608999f0c4424e3e7f1d9f7", date: "2025-04-07 18:28:41 UTC", description: "Bump smallvec from 1.14.0 to 1.15.0", pr_number: 22817, scopes: ["deps"], type: "chore", breaking_change: false, author: "dependabot[bot]", files_count: 1, insertions_count: 2, deletions_count: 2},
+		{sha: "1547c15f4c7bebae56d0e8d595ece5789be3b54e", date: "2025-04-07 22:43:10 UTC", description: "Bump openssl from 0.10.71 to 0.10.72 in the cargo group", pr_number: 22802, scopes: ["deps"], type: "chore", breaking_change: false, author: "dependabot[bot]", files_count: 3, insertions_count: 6, deletions_count: 6},
+		{sha: "e74b60cd8d468b19c683d7152699067d1c043781", date: "2025-04-07 23:11:34 UTC", description: "Bump crossterm from 0.28.1 to 0.29.0", pr_number: 22815, scopes: ["deps"], type: "chore", breaking_change: false, author: "dependabot[bot]", files_count: 3, insertions_count: 59, deletions_count: 25},
+		{sha: "92e2a2f6a9b701e8e6d501cb2452a5850d5e19f5", date: "2025-04-07 19:43:58 UTC", description: "update tokio to fix RUSTSEC-2025-0023", pr_number: 22820, scopes: ["deps"], type: "fix", breaking_change: false, author: "Pavlos Rontidis", files_count: 1, insertions_count: 3, deletions_count: 3},
+		{sha: "081b3044ea8e11763374e49958208e618ee54408", date: "2025-04-08 01:06:44 UTC", description: "Bump vrl from `7020ba2` to `048253d`", pr_number: 22812, scopes: ["deps"], type: "chore", breaking_change: false, author: "dependabot[bot]", files_count: 2, insertions_count: 68, deletions_count: 48},
+		{sha: "b0823b6364c7d6702a84cae1698b5b6b51b0664d", date: "2025-04-07 21:20:10 UTC", description: "update interval changed to 'monthly'", pr_number: 22822, scopes: ["ci"], type: "chore", breaking_change: false, author: "Pavlos Rontidis", files_count: 1, insertions_count: 4, deletions_count: 4},
+		{sha: "5d9297b35bd9d132292663bc6623c9c34c3efef2", date: "2025-04-08 12:41:58 UTC", description: "add documentation for Lz4 encode and decode features in vrl", pr_number: 22702, scopes: ["external"], type: "docs", breaking_change: false, author: "James Lamb", files_count: 2, insertions_count: 62, deletions_count: 0},
+		{sha: "5ccca8ae3098c1aefc65e7222e60ea4819f0b152", date: "2025-04-07 23:17:57 UTC", description: "update CODEOWNERS files for cue docs PRs", pr_number: 22824, scopes: ["administration"], type: "chore", breaking_change: false, author: "Pavlos Rontidis", files_count: 1, insertions_count: 1, deletions_count: 0},
+		{sha: "60048c814bffac01ac49b84045bce37ad5b4190b", date: "2025-04-08 19:55:19 UTC", description: "fix website branch name", pr_number: 22830, scopes: ["releasing"], type: "chore", breaking_change: false, author: "Pavlos Rontidis", files_count: 1, insertions_count: 14, deletions_count: 13},
+		{sha: "cf9185f1e47bad13ae6ffbe14f2f2cbcb0c051f4", date: "2025-04-09 04:15:11 UTC", description: "Use zlib-rs for much faster zlib decoding/encoding", pr_number: 22533, scopes: ["deps"], type: "enhancement", breaking_change: false, author: "Jakub Onderka", files_count: 6, insertions_count: 32, deletions_count: 9},
+		{sha: "e1491d84812a1892053d57482bc322bb061bad90", date: "2025-04-09 00:03:21 UTC", description: "Refactor reduce transform logic", pr_number: 22829, scopes: ["reduce transform"], type: "enhancement", breaking_change: false, author: "ArunPiduguDD", files_count: 2, insertions_count: 40, deletions_count: 26},
+		{sha: "7d9242aaa13814b2eaf9157b3858ce6bc5d59572", date: "2025-04-09 00:26:01 UTC", description: "update homebrew repo link", pr_number: 22832, scopes: ["releasing"], type: "fix", breaking_change: false, author: "Pavlos Rontidis", files_count: 1, insertions_count: 1, deletions_count: 1},
+		{sha: "1de7e9d6703487c23e74312bafd130ff324dd3ff", date: "2025-04-09 00:57:41 UTC", description: "#22827 missing region error when using AWS credentials file auth", pr_number: 22831, scopes: ["auth"], type: "fix", breaking_change: false, author: "Casey Hartman", files_count: 2, insertions_count: 21, deletions_count: 1},
+		{sha: "6a59a873a520bbe736f23d09108f019ba29a6d88", date: "2025-04-09 05:10:57 UTC", description: "Bump sysinfo from 0.32.1 to 0.34.2", pr_number: 22816, scopes: ["deps"], type: "chore", breaking_change: false, author: "dependabot[bot]", files_count: 4, insertions_count: 15, deletions_count: 8},
+		{sha: "c2e082052c1c637d66ecdc8b5b2a5e30b2749d77", date: "2025-04-09 01:39:38 UTC", description: "cherry pick release prep commit", pr_number: 22836, scopes: ["releasing"], type: "chore", breaking_change: false, author: "Pavlos Rontidis", files_count: 30, insertions_count: 398, deletions_count: 96},
+		{sha: "050743b0134ecc2e88436f903c705aa31b8b6cf1", date: "2025-04-09 02:25:51 UTC", description: "cargo vdev build manifests", pr_number: 22833, scopes: ["releasing"], type: "chore", breaking_change: false, author: "Pavlos Rontidis", files_count: 18, insertions_count: 37, deletions_count: 37},
+		{sha: "668caf89b64c5c412631909bfbf971098d5747ed", date: "2025-04-10 00:04:10 UTC", description: "add ACK support for message buffering", pr_number: 22540, scopes: ["websocket_server sink"], type: "feat", breaking_change: false, author: "Ensar Sarajčić", files_count: 6, insertions_count: 652, deletions_count: 47},
+		{sha: "906a9bd900e7df402417a5544392b8792bf34c86", date: "2025-04-09 18:19:35 UTC", description: "PR template and CONTRIBUTING.md enhancements", pr_number: 22788, scopes: ["dev"], type: "chore", breaking_change: false, author: "Pavlos Rontidis", files_count: 2, insertions_count: 43, deletions_count: 4},
+		{sha: "6a39e6a42042761586aa115975926a65538fb76f", date: "2025-04-09 22:44:14 UTC", description: "add known issue to v0.46.0", pr_number: 22842, scopes: ["releasing"], type: "chore", breaking_change: false, author: "Pavlos Rontidis", files_count: 1, insertions_count: 7, deletions_count: 0},
+		{sha: "238e8b8c26718ab19f4c5d97ef9dc45e3c6f1e06", date: "2025-04-11 12:17:53 UTC", description: "fix dead links to configuration reference", pr_number: 22846, scopes: ["external"], type: "docs", breaking_change: false, author: "Shin Seunghun", files_count: 6, insertions_count: 15, deletions_count: 15},
+		{sha: "c1ad3421e1215d83a376c5541412c0359682752a", date: "2025-04-12 00:58:38 UTC", description: "properly display client count in websocket_server debug logs", pr_number: 22855, scopes: ["websocket_server sink"], type: "fix", breaking_change: false, author: "Ensar Sarajčić", files_count: 1, insertions_count: 12, deletions_count: 2},
+		{sha: "eb60aa05d6e3d5c390de0f581e24cebaf31cca9c", date: "2025-04-12 07:42:50 UTC", description: "Bump OpenDAL to v0.53.0", pr_number: 21493, scopes: ["deps"], type: "chore", breaking_change: false, author: "Xuanwo", files_count: 5, insertions_count: 45, deletions_count: 31},
+		{sha: "0a613370046c1f25ed747a829bbf3f665282a41d", date: "2025-04-12 04:13:29 UTC", description: "Bump maxminddb from 0.25.0 to 0.26.0 ", pr_number: 22804, scopes: ["deps"], type: "chore", breaking_change: false, author: "Jakub Onderka", files_count: 4, insertions_count: 13, deletions_count: 12},
+		{sha: "ee6dc973ed600e1ba4e657a0de1dd65a7f56020a", date: "2025-04-12 07:19:26 UTC", description: "add support for websocket subprotocol", pr_number: 22854, scopes: ["websocket_server sink"], type: "feat", breaking_change: false, author: "Ensar Sarajčić", files_count: 4, insertions_count: 105, deletions_count: 2},
+		{sha: "9dfa36bafbeefe6841d443f0430473ee4216fb87", date: "2025-04-12 05:55:27 UTC", description: "Bump tokio from 1.44.1 to 1.44.2 in the cargo group", pr_number: 22861, scopes: ["deps"], type: "chore", breaking_change: false, author: "dependabot[bot]", files_count: 11, insertions_count: 18, deletions_count: 18},
+		{sha: "b30a36cf42c283ef8128c5720b6fc1315dad6eb5", date: "2025-04-15 04:09:56 UTC", description: "add ability to generate JUnit reports", pr_number: 22857, scopes: ["unit tests"], type: "feat", breaking_change: false, author: "simplepad", files_count: 4, insertions_count: 98, deletions_count: 0},
+		{sha: "07b4c71b4d35746664fcb5bf8dca7d941fef65c8", date: "2025-04-14 21:43:30 UTC", description: "enhancements to the patch release template", pr_number: 22871, scopes: ["dev"], type: "chore", breaking_change: false, author: "Pavlos Rontidis", files_count: 1, insertions_count: 6, deletions_count: 6},
+		{sha: "c8b57ded8591ff70dd0bd65f0ba3d77f55675dd0", date: "2025-04-15 00:47:28 UTC", description: "update Cargo.lock", pr_number: 22873, scopes: ["deps"], type: "chore", breaking_change: false, author: "Pavlos Rontidis", files_count: 1, insertions_count: 34, deletions_count: 0},
+		{sha: "cb62efe251e78470c7e3f7e7b718f2c87d45db27", date: "2025-04-14 23:50:12 UTC", description: "enhancements to the patch release template", pr_number: 22872, scopes: ["dev"], type: "chore", breaking_change: false, author: "Pavlos Rontidis", files_count: 1, insertions_count: 2, deletions_count: 2},
+		{sha: "f35398a7c2689f5cc4f5bb6c0545f0bb2cc7940c", date: "2025-04-15 05:15:54 UTC", description: "adding metric ingestion to opentelemetry source", pr_number: 22746, scopes: ["opentelemetry source"], type: "feat", breaking_change: false, author: "Kirill Mikhailov", files_count: 16, insertions_count: 1833, deletions_count: 292},
+		{sha: "7cfc9c54bffba9a603d58eb01134305b50ef5f4a", date: "2025-04-15 01:06:11 UTC", description: "add v0.46.1 patch commits", pr_number: 22874, scopes: ["releasing"], type: "chore", breaking_change: false, author: "Pavlos Rontidis", files_count: 4, insertions_count: 27, deletions_count: 1},
+		{sha: "2c038c3b2600c24520be6d8e63be0f6cb57de9c0", date: "2025-04-15 17:44:48 UTC", description: "fix rendering of 0.46.1.cue", pr_number: 22882, scopes: ["website"], type: "chore", breaking_change: false, author: "Pavlos Rontidis", files_count: 1, insertions_count: 1, deletions_count: 1},
+		{sha: "3f7026f05c7bd485297ef6469fcd6d512d6c8518", date: "2025-04-15 23:12:18 UTC", description: "bump darling version", pr_number: 22883, scopes: ["deps"], type: "chore", breaking_change: false, author: "Pavlos Rontidis", files_count: 5, insertions_count: 19, deletions_count: 18},
+		{sha: "8029c109fbaf8af5822dce72a678c54db02810c1", date: "2025-04-16 06:17:20 UTC", description: "support all formats: YAML,TOML,JSON", pr_number: 22864, scopes: ["config provider"], type: "enhancement", breaking_change: false, author: "Kirill Nazarov", files_count: 3, insertions_count: 39, deletions_count: 8},
+		{sha: "dc614442826c829acf45a554c9cace766a9f5a31", date: "2025-04-15 23:29:45 UTC", description: "build manifests - 0.46.1", pr_number: 22887, scopes: ["releasing"], type: "chore", breaking_change: false, author: "Pavlos Rontidis", files_count: 18, insertions_count: 22, deletions_count: 22},
+		{sha: "3e1327890e27b9f62ac7631fa72198fe11c8922a", date: "2025-04-15 23:44:39 UTC", description: "increase cloudwatch logs max event size to match new aws limit of 1MB", pr_number: 22886, scopes: ["aws_cloudwatch_logs sink"], type: "fix", breaking_change: false, author: "Casey Hartman", files_count: 2, insertions_count: 29, deletions_count: 6},
+		{sha: "82ffecbf4b869922643b8ac51aecf972c05b64d1", date: "2025-04-15 20:57:59 UTC", description: "Add support for rendering to mermaid with `vector graph` command", pr_number: 22787, scopes: ["cli"], type: "feat", breaking_change: false, author: "Eric Stern", files_count: 2, insertions_count: 66, deletions_count: 0},
+		{sha: "e293b574a3141deff09fb809e87d8cb66f3de608", date: "2025-04-16 22:55:25 UTC", description: "Improve performance with `length_delimited` framing and large batches", pr_number: 22877, scopes: ["codecs"], type: "enhancement", breaking_change: false, author: "Alex Savitskii", files_count: 2, insertions_count: 20, deletions_count: 5},
+		{sha: "ce170d5e6062083af476277579361373e23af97a", date: "2025-04-17 00:22:11 UTC", description: "Apply agent-json header on events from agent", pr_number: 22701, scopes: ["datadog_logs sink"], type: "fix", breaking_change: false, author: "Rob Blafford", files_count: 6, insertions_count: 454, deletions_count: 107},
+		{sha: "3ea8c86f9461f1e3d403c3c6820fdf19b280fe75", date: "2025-04-17 06:40:08 UTC", description: "Add new `window` transform", pr_number: 22609, scopes: ["new transform"], type: "feat", breaking_change: false, author: "Linas Zvirblis", files_count: 13, insertions_count: 1142, deletions_count: 0},
+		{sha: "42caf99f7bb027a02ed9fef622f2d5a7a1767816", date: "2025-04-19 00:13:45 UTC", description: "add access to client address in custom VRL auth", pr_number: 22850, scopes: ["sources"], type: "feat", breaking_change: false, author: "Ensar Sarajčić", files_count: 5, insertions_count: 82, deletions_count: 32},
+		{sha: "8057e633eb0b97f1286848d6f3f393524ae4c643", date: "2025-04-19 00:57:52 UTC", description: "Add support for forwarding over unix socket", pr_number: 22212, scopes: ["fluent source"], type: "enhancement", breaking_change: false, author: "Raphael Taylor-Davies", files_count: 5, insertions_count: 339, deletions_count: 93},
+		{sha: "3c10200690febf375cc80c57cecbcac77a19186d", date: "2025-04-22 08:39:59 UTC", description: "Remove known small files based on remove_after_secs", pr_number: 22786, scopes: ["file source"], type: "fix", breaking_change: false, author: "林玮 (Jade Lin)", files_count: 3, insertions_count: 54, deletions_count: 18},
+		{sha: "8861538469ce8f002493ff4699dae64376d62ded", date: "2025-04-22 11:50:43 UTC", description: "add `convert_to` option for controlling timing unit conversion", pr_number: 22716, scopes: ["statsd source"], type: "feat", breaking_change: false, author: "Jinsoo Heo", files_count: 7, insertions_count: 165, deletions_count: 29},
+		{sha: "d7c27eb3ac131b7631391330a402bb7797a2ebba", date: "2025-04-21 23:38:52 UTC", description: "optionally configure source to defer or delete older notifications", pr_number: 22691, scopes: ["aws_s3 source"], type: "enhancement", breaking_change: false, author: "Andrew Kutta", files_count: 4, insertions_count: 317, deletions_count: 7},
+		{sha: "ca9fa2e61e26243b12c54ea0a9aaf6997acadd31", date: "2025-04-23 04:43:17 UTC", description: "`AllocationGroupId::register` groups max limit increased to 256", pr_number: 22897, scopes: ["internal"], type: "fix", breaking_change: false, author: "triggerh@ppy", files_count: 2, insertions_count: 7, deletions_count: 7},
+		{sha: "18d6867a64ec0884f9d3a5f9af6ae25a06041fb2", date: "2025-04-23 03:47:28 UTC", description: "add a config option for setting the healthcheck timeout", pr_number: 22922, scopes: ["config"], type: "feat", breaking_change: false, author: "Ensar Sarajčić", files_count: 7, insertions_count: 58, deletions_count: 15},
+		{sha: "e3d7ad090af6b34f46a88f2f774ab715813253e5", date: "2025-04-23 01:48:37 UTC", description: "Remove datadog specific telemetry", pr_number: 22927, scopes: ["datadog service"], type: "docs", breaking_change: false, author: "Jesse Szwedko", files_count: 1, insertions_count: 0, deletions_count: 12},
+		{sha: "997beb8919284bbbfa630ec51ac28788ab20a1cc", date: "2025-04-23 20:44:13 UTC", description: "guide page improvements", pr_number: 22936, scopes: ["website"], type: "chore", breaking_change: false, author: "Pavlos Rontidis", files_count: 9, insertions_count: 45, deletions_count: 39},
+		{sha: "b0bac1e1ac2ef5dfae7a2a39d6d9b542ba3556e3", date: "2025-04-23 19:25:01 UTC", description: "fix typo in CONTRIBUTING.md", pr_number: 22930, scopes: ["external"], type: "docs", breaking_change: false, author: "Nick Wang", files_count: 1, insertions_count: 1, deletions_count: 1},
+		{sha: "861075f2a69d8c6213e358527e9ab90b84763341", date: "2025-04-25 03:23:10 UTC", description: "Implement components selection in diff.rs and tests", pr_number: 22678, scopes: ["config"], type: "enhancement", breaking_change: false, author: "Guillaume Le Blanc", files_count: 10, insertions_count: 172, deletions_count: 98},
+		{sha: "1e7da76fc0f178284d2a4e0291128fc8ddce67c3", date: "2025-04-25 10:03:29 UTC", description: "add headers field to greptimedb_logs config", pr_number: 22651, scopes: ["greptimedb_logs sink"], type: "enhancement", breaking_change: false, author: "localhost", files_count: 5, insertions_count: 71, deletions_count: 2},
+		{sha: "e2f84ea86ffe29a01f919dcab4bbfa6df7d4744f", date: "2025-04-29 02:37:27 UTC", description: "Allows users to specify AWS authentication and the AWS service name for HTTP sinks to support AWS API endpoints that require SigV4.", pr_number: 22744, scopes: ["http sink"], type: "feat", breaking_change: false, author: "Johannes Geiger", files_count: 19, insertions_count: 1390, deletions_count: 27},
+		{sha: "d771ab1b753544a2b4e382c09bb13b7e58ce29be", date: "2025-04-28 23:01:36 UTC", description: "add priority property", pr_number: 22243, scopes: ["amqp sink"], type: "feat", breaking_change: false, author: "Aram Peres", files_count: 8, insertions_count: 529, deletions_count: 16},
+		{sha: "96bc5942ac5a0d082e14ba706133631d094f3061", date: "2025-04-29 01:08:52 UTC", description: "updates concepts/traces page", pr_number: 22955, scopes: ["external"], type: "docs", breaking_change: false, author: "Pavlos Rontidis", files_count: 1, insertions_count: 19, deletions_count: 5},
+		{sha: "4b4b16e31cfdf9fc7dac67ecf48192939067742a", date: "2025-04-30 01:01:56 UTC", description: "fix reduce transfrom examples", pr_number: 22962, scopes: ["external"], type: "docs", breaking_change: false, author: "Pavlos Rontidis", files_count: 3, insertions_count: 15, deletions_count: 4},
+		{sha: "4ad3fdc54c2c3b56db94a8613417783458a96111", date: "2025-04-30 18:53:50 UTC", description: "Remove `_collisions` field in agent normalization routine", pr_number: 22956, scopes: ["datadog_logs sink"], type: "fix", breaking_change: false, author: "Rob Blafford", files_count: 1, insertions_count: 16, deletions_count: 136},
+		{sha: "f4c15e33b6fccdf5c7ce44f05dc2782790c9a9d2", date: "2025-05-01 17:37:03 UTC", description: "Bump vrl from `d802b30` to `7f8ed50`", pr_number: 22977, scopes: ["deps"], type: "chore", breaking_change: false, author: "dependabot[bot]", files_count: 1, insertions_count: 3, deletions_count: 3},
+		{sha: "b6b9c677ac8e7ee158ba5f210750fd3ce97ff88b", date: "2025-05-01 17:37:32 UTC", description: "Bump smallvec from 1.14.0 to 1.15.0", pr_number: 22982, scopes: ["deps"], type: "chore", breaking_change: false, author: "dependabot[bot]", files_count: 1, insertions_count: 2, deletions_count: 2},
+		{sha: "b70e555a1e2c563de826683eb1942ca8d88cb1bb", date: "2025-05-01 18:26:48 UTC", description: "Bump lru from 0.13.0 to 0.14.0", pr_number: 22981, scopes: ["deps"], type: "chore", breaking_change: false, author: "dependabot[bot]", files_count: 2, insertions_count: 4, deletions_count: 4},
+		{sha: "4f3aad5b6ad68fc4a7514d5959575d96da167552", date: "2025-05-01 22:27:20 UTC", description: "Bump bstr from 1.11.3 to 1.12.0", pr_number: 22980, scopes: ["deps"], type: "chore", breaking_change: false, author: "dependabot[bot]", files_count: 2, insertions_count: 6, deletions_count: 6},
+		{sha: "db929085e7b7ffb6adf4b16b6fd0009c4afe1b25", date: "2025-05-01 22:27:40 UTC", description: "Bump data-encoding from 2.8.0 to 2.9.0", pr_number: 22979, scopes: ["deps"], type: "chore", breaking_change: false, author: "dependabot[bot]", files_count: 2, insertions_count: 3, deletions_count: 3},
+		{sha: "0cf34ee74b9868a8362e90f8b0d48fb8d7846305", date: "2025-05-01 22:29:22 UTC", description: "Bump openssl-src from 300.4.2+3.4.1 to 300.5.0+3.5.0", pr_number: 22978, scopes: ["deps"], type: "chore", breaking_change: false, author: "dependabot[bot]", files_count: 1, insertions_count: 2, deletions_count: 2},
+		{sha: "f84c36c8be42352f74221aa8c9d66309a3047c9b", date: "2025-05-01 23:32:50 UTC", description: "Bump the patches group with 26 updates", pr_number: 22973, scopes: ["deps"], type: "chore", breaking_change: false, author: "dependabot[bot]", files_count: 7, insertions_count: 433, deletions_count: 311},
+		{sha: "e5726e1250d2fbbc524a76110999d49517317507", date: "2025-05-02 10:12:44 UTC", description: "remove limit if use apiserver cache", pr_number: 22921, scopes: ["kubernetes_logs source"], type: "fix", breaking_change: false, author: "Xiao", files_count: 3, insertions_count: 18, deletions_count: 2},
+		{sha: "b8c24c9bebcf898cfeed257db6ca95e4e0664ba6", date: "2025-05-02 02:58:36 UTC", description: "Bump docker/build-push-action from 6.15.0 to 6.16.0", pr_number: 22984, scopes: ["ci"], type: "chore", breaking_change: false, author: "dependabot[bot]", files_count: 2, insertions_count: 3, deletions_count: 3},
+		{sha: "61c418f88a83bad665529cab82462e15034df730", date: "2025-05-05 18:46:17 UTC", description: "introduce log namespace guide", pr_number: 22985, scopes: ["external"], type: "docs", breaking_change: false, author: "Pavlos Rontidis", files_count: 5, insertions_count: 196, deletions_count: 3},
+		{sha: "9b824f97516ea92c3a7a894e4bedddb9ad9b59f1", date: "2025-05-06 01:44:29 UTC", description: "support input based on encoding type", pr_number: 22989, scopes: ["redis sink"], type: "feat", breaking_change: false, author: "Yao Noel Achi", files_count: 4, insertions_count: 201, deletions_count: 6},
+		{sha: "9a3d2e83a904c36972e2aa7e5457a65454b7bc36", date: "2025-05-07 08:21:27 UTC", description: "fix reduce transfrom examples", pr_number: 22992, scopes: ["external"], type: "docs", breaking_change: false, author: "Pomin Wu", files_count: 1, insertions_count: 6, deletions_count: 7},
+		{sha: "9daa00cbec230ba0d89ae85ab3b001b15bc9db97", date: "2025-05-07 20:07:34 UTC", description: "run markdownlint on git files only", pr_number: 23004, scopes: ["dev"], type: "chore", breaking_change: false, author: "Pavlos Rontidis", files_count: 2, insertions_count: 29, deletions_count: 15},
+		{sha: "91245a4dd9ac2be20acb9ce53d2d59905e3513bb", date: "2025-05-10 01:05:49 UTC", description: "add `wildcard_matching` config option", pr_number: 23011, scopes: ["config"], type: "feat", breaking_change: false, author: "simplepad", files_count: 9, insertions_count: 156, deletions_count: 13},
+		{sha: "9129d95c56ad530989c238dd0d380de6a0c95ca8", date: "2025-05-13 15:31:55 UTC", description: "Remove slash from max_bytes text", pr_number: 23035, scopes: ["sinks"], type: "docs", breaking_change: false, author: "Jed Laundry", files_count: 47, insertions_count: 47, deletions_count: 47},
+		{sha: "a39d60acbfb60a3b740c3da45a3fadfc3e1052a4", date: "2025-05-14 20:42:31 UTC", description: "Initial MQTT Source, #19931", pr_number: 22752, scopes: ["new source"], type: "feat", breaking_change: false, author: "StormStake", files_count: 18, insertions_count: 1296, deletions_count: 103},
+		{sha: "689a65d51a2f8034f220afcf5e65e1b924019687", date: "2025-05-14 22:45:15 UTC", description: "e2e dd logs failure", pr_number: 23038, scopes: ["ci"], type: "fix", breaking_change: false, author: "Pavlos Rontidis", files_count: 8, insertions_count: 50, deletions_count: 31},
+		{sha: "822ed0d3f6a752637a33c60b983bd158ad27cce6", date: "2025-05-15 00:48:00 UTC", description: "revert deps bump", pr_number: 23039, scopes: ["azure service"], type: "fix", breaking_change: false, author: "Pavlos Rontidis", files_count: 5, insertions_count: 60, deletions_count: 114},
+		{sha: "346b1ba993f7cdb4e1608fcfb730267c90a85496", date: "2025-05-15 03:46:54 UTC", description: "gelf encoder error message", pr_number: 23021, scopes: ["codecs"], type: "fix", breaking_change: false, author: "Miro Prasil", files_count: 2, insertions_count: 11, deletions_count: 1},
+		{sha: "1a1050dbe585bf4a79c37b2183d075ac49bbf254", date: "2025-05-15 00:10:33 UTC", description: "request ARG in every build stage", pr_number: 23049, scopes: ["ci"], type: "fix", breaking_change: false, author: "Pavlos Rontidis", files_count: 2, insertions_count: 3, deletions_count: 3},
+		{sha: "8f10b37a38daaec7bf48f91f00ebea6afa4eb183", date: "2025-05-15 16:37:20 UTC", description: "disable E2E datadog-logs test", pr_number: 23055, scopes: ["ci"], type: "chore", breaking_change: false, author: "Pavlos Rontidis", files_count: 1, insertions_count: 9, deletions_count: 8},
+		{sha: "c1cf664ecbbdf5abe945a0b0c74001829a25fea5", date: "2025-05-15 16:54:10 UTC", description: "temporarily disable failing AMQP tests", pr_number: 23057, scopes: ["ci"], type: "chore", breaking_change: false, author: "Pavlos Rontidis", files_count: 1, insertions_count: 2, deletions_count: 1},
+		{sha: "f2b4e29191e5cbdd6d94111dec1122dc3f9da5d7", date: "2025-05-15 17:13:27 UTC", description: "remove redundant rustup prefix", pr_number: 23059, scopes: ["ci"], type: "chore", breaking_change: false, author: "Pavlos Rontidis", files_count: 1, insertions_count: 1, deletions_count: 1},
+		{sha: "4643acd78cdaf051c3088f7fc46be1488c109563", date: "2025-05-15 17:22:23 UTC", description: "provide default RUST_VERSION if one is not specified", pr_number: 23060, scopes: ["ci"], type: "chore", breaking_change: false, author: "Pavlos Rontidis", files_count: 3, insertions_count: 3, deletions_count: 3},
+		{sha: "84e5fe9bec1221c58e663602a2aef10e90c146d5", date: "2025-05-15 17:57:56 UTC", description: "bump nextest to latest version", pr_number: 23058, scopes: ["ci"], type: "chore", breaking_change: false, author: "Pavlos Rontidis", files_count: 4, insertions_count: 5, deletions_count: 5},
+		{sha: "2c63454e394cdd18451bd3432b87f1b65d516ede", date: "2025-05-16 00:07:01 UTC", description: "Handling wrong timestamps in dnstap-parser", pr_number: 23048, scopes: ["parsing"], type: "fix", breaking_change: false, author: "Burkov Egor", files_count: 2, insertions_count: 52, deletions_count: 5},
+		{sha: "ace0dd21b542cfd522a18f3f3943a643a91e0e79", date: "2025-05-16 00:42:26 UTC", description: "Handle underflow in A6 parsing", pr_number: 23047, scopes: ["parsing"], type: "fix", breaking_change: false, author: "Burkov Egor", files_count: 2, insertions_count: 20, deletions_count: 0},
+		{sha: "9cdab60b320ad14c06214b4cf7b7e0f8a441f373", date: "2025-05-16 01:26:16 UTC", description: "make `--watch-config` watch external VRL files in `remap` transforms", pr_number: 23010, scopes: ["remap transform"], type: "feat", breaking_change: false, author: "nekorro", files_count: 5, insertions_count: 35, deletions_count: 2},
+		{sha: "914d1568dd1363d2d95b9e8dc4b2b1a808885d12", date: "2025-05-16 20:59:37 UTC", description: "install mold (no need to build it)", pr_number: 23064, scopes: ["ci"], type: "chore", breaking_change: false, author: "Pavlos Rontidis", files_count: 1, insertions_count: 3, deletions_count: 11},
+		{sha: "1d232fb5057786b704b5ac953aa0fd7a74493c26", date: "2025-05-16 18:53:31 UTC", description: "add from and to date search to enrichment tables", pr_number: 22926, scopes: ["enriching"], type: "enhancement", breaking_change: false, author: "Nick Wang", files_count: 5, insertions_count: 177, deletions_count: 3},
+		{sha: "c9791e3db80659a5f763e51b4ad0824e366cbf1f", date: "2025-05-17 01:15:42 UTC", description: "path resolution for docker compose files", pr_number: 23066, scopes: ["ci"], type: "fix", breaking_change: false, author: "Pavlos Rontidis", files_count: 5, insertions_count: 30, deletions_count: 33},
+	]
+}
diff --git a/website/cue/reference/versions.cue b/website/cue/reference/versions.cue
index ff39842f506e1..fcd606b214c63 100644
--- a/website/cue/reference/versions.cue
+++ b/website/cue/reference/versions.cue
@@ -2,6 +2,7 @@ package metadata
 
 // This has to be maintained manually because there's currently no way to sort versions programmatically
 versions: [string, ...string] & [
+	"0.47.0",
 	"0.46.1",
 	"0.46.0",
 	"0.45.0",
diff --git a/website/layouts/releases/single.html b/website/layouts/releases/single.html
index 9c3a962ed773e..fe4cb606aacdf 100644
--- a/website/layouts/releases/single.html
+++ b/website/layouts/releases/single.html
@@ -126,12 +126,13 @@
                 {{ if gt (len .contributors) 0 }}
                 <br>
                 <span class="prose dark:prose-dark italic">
-                    Thanks to
-                    {{ range .contributors}}
-                    <a href="https://github.com/{{ replace . "@" "" }}" rel="noopener" target="_blank">{{ . }}</a>
+                  Thanks to
+                  {{ $len := len .contributors }}
+                  {{ range $i, $contributor := .contributors }}
+                    <a href="https://github.com/{{ replace $contributor "@" "" }}" rel="noopener" target="_blank">{{ $contributor }}</a>{{ if lt (add $i 1) $len }}, {{ end }}
                   {{ end }}
-                    for contributing this change!
-                  </span>
+                  for contributing this change!
+                </span>
                 {{ end }}
               </li>
               {{ end }}

From bb6a91404cdc3f662b037cc4d5f52237b28d215d Mon Sep 17 00:00:00 2001
From: Bruce Guenter <bruce.guenter@datadoghq.com>
Date: Wed, 21 May 2025 17:31:12 -0400
Subject: [PATCH 025/305] chore(sources): Refactor `struct SourceSender` a bit
 (#23089)

* Clean up `inner` handling, as it should never be `None`

* Rename some fields for clarity

* Handle the unsent event count decrementing in one place
---
 src/source_sender/mod.rs | 130 +++++++++++++++++----------------------
 1 file changed, 58 insertions(+), 72 deletions(-)

diff --git a/src/source_sender/mod.rs b/src/source_sender/mod.rs
index b79dba5684862..bf0ee0525597f 100644
--- a/src/source_sender/mod.rs
+++ b/src/source_sender/mod.rs
@@ -94,22 +94,27 @@ impl From<SourceSenderItem> for EventArray {
 
 pub struct Builder {
     buf_size: usize,
-    inner: Option<Inner>,
-    named_inners: HashMap<String, Inner>,
+    default_output: Option<Output>,
+    named_outputs: HashMap<String, Output>,
     lag_time: Option<Histogram>,
 }
 
-impl Builder {
-    // https://github.com/rust-lang/rust/issues/73255
-    #[allow(clippy::missing_const_for_fn)]
-    pub fn with_buffer(self, n: usize) -> Self {
+impl Default for Builder {
+    fn default() -> Self {
         Self {
-            buf_size: n,
-            inner: self.inner,
-            named_inners: self.named_inners,
-            lag_time: self.lag_time,
+            buf_size: CHUNK_SIZE,
+            default_output: None,
+            named_outputs: Default::default(),
+            lag_time: Some(histogram!(LAG_TIME_NAME)),
         }
     }
+}
+
+impl Builder {
+    pub const fn with_buffer(mut self, n: usize) -> Self {
+        self.buf_size = n;
+        self
+    }
 
     pub fn add_source_output(
         &mut self,
@@ -124,54 +129,47 @@ impl Builder {
         };
         match output.port {
             None => {
-                let (inner, rx) = Inner::new_with_buffer(
+                let (output, rx) = Output::new_with_buffer(
                     self.buf_size,
                     DEFAULT_OUTPUT.to_owned(),
                     lag_time,
                     log_definition,
                     output_id,
                 );
-                self.inner = Some(inner);
+                self.default_output = Some(output);
                 rx
             }
             Some(name) => {
-                let (inner, rx) = Inner::new_with_buffer(
+                let (output, rx) = Output::new_with_buffer(
                     self.buf_size,
                     name.clone(),
                     lag_time,
                     log_definition,
                     output_id,
                 );
-                self.named_inners.insert(name, inner);
+                self.named_outputs.insert(name, output);
                 rx
             }
         }
     }
 
-    // https://github.com/rust-lang/rust/issues/73255
-    #[allow(clippy::missing_const_for_fn)]
     pub fn build(self) -> SourceSender {
         SourceSender {
-            inner: self.inner,
-            named_inners: self.named_inners,
+            default_output: self.default_output.expect("no default output"),
+            named_outputs: self.named_outputs,
         }
     }
 }
 
 #[derive(Debug, Clone)]
 pub struct SourceSender {
-    inner: Option<Inner>,
-    named_inners: HashMap<String, Inner>,
+    default_output: Output,
+    named_outputs: HashMap<String, Output>,
 }
 
 impl SourceSender {
     pub fn builder() -> Builder {
-        Builder {
-            buf_size: CHUNK_SIZE,
-            inner: None,
-            named_inners: Default::default(),
-            lag_time: Some(histogram!(LAG_TIME_NAME)),
-        }
+        Builder::default()
     }
 
     #[cfg(any(test, feature = "test-utils"))]
@@ -181,12 +179,12 @@ impl SourceSender {
             component: "test".to_string().into(),
             port: None,
         };
-        let (inner, rx) =
-            Inner::new_with_buffer(n, DEFAULT_OUTPUT.to_owned(), lag_time, None, output_id);
+        let (default_output, rx) =
+            Output::new_with_buffer(n, DEFAULT_OUTPUT.to_owned(), lag_time, None, output_id);
         (
             Self {
-                inner: Some(inner),
-                named_inners: Default::default(),
+                default_output,
+                named_outputs: Default::default(),
             },
             rx,
         )
@@ -254,7 +252,7 @@ impl SourceSender {
             component: "test".to_string().into(),
             port: Some(name.clone()),
         };
-        let (inner, recv) = Inner::new_with_buffer(100, name.clone(), None, None, output_id);
+        let (output, recv) = Output::new_with_buffer(100, name.clone(), None, None, output_id);
         let recv = recv.into_stream().map(move |mut item| {
             item.events.iter_events_mut().for_each(|mut event| {
                 let metadata = event.metadata_mut();
@@ -263,7 +261,7 @@ impl SourceSender {
             });
             item
         });
-        self.named_inners.insert(name, inner);
+        self.named_outputs.insert(name, output);
         recv
     }
 
@@ -271,11 +269,7 @@ impl SourceSender {
     ///
     /// This internally handles emitting [EventsSent] and [ComponentEventsDropped] events.
     pub async fn send_event(&mut self, event: impl Into<EventArray>) -> Result<(), ClosedError> {
-        self.inner
-            .as_mut()
-            .expect("no default output")
-            .send_event(event)
-            .await
+        self.default_output.send_event(event).await
     }
 
     /// Send a stream of events to the default output.
@@ -286,11 +280,7 @@ impl SourceSender {
         S: Stream<Item = E> + Unpin,
         E: Into<Event> + ByteSizeOf,
     {
-        self.inner
-            .as_mut()
-            .expect("no default output")
-            .send_event_stream(events)
-            .await
+        self.default_output.send_event_stream(events).await
     }
 
     /// Send a batch of events to the default output.
@@ -302,11 +292,7 @@ impl SourceSender {
         I: IntoIterator<Item = E>,
         <I as IntoIterator>::IntoIter: ExactSizeIterator,
     {
-        self.inner
-            .as_mut()
-            .expect("no default output")
-            .send_batch(events)
-            .await
+        self.default_output.send_batch(events).await
     }
 
     /// Send a batch of events event to a named output.
@@ -318,7 +304,7 @@ impl SourceSender {
         I: IntoIterator<Item = E>,
         <I as IntoIterator>::IntoIter: ExactSizeIterator,
     {
-        self.named_inners
+        self.named_outputs
             .get_mut(name)
             .expect("unknown output")
             .send_batch(events)
@@ -368,9 +354,8 @@ impl Drop for UnsentEventCount {
 }
 
 #[derive(Clone)]
-struct Inner {
-    inner: LimitedSender<SourceSenderItem>,
-    output: String,
+struct Output {
+    sender: LimitedSender<SourceSenderItem>,
     lag_time: Option<Histogram>,
     events_sent: Registered<EventsSent>,
     /// The schema definition that will be attached to Log events sent through here
@@ -380,17 +365,17 @@ struct Inner {
     output_id: Arc<OutputId>,
 }
 
-impl fmt::Debug for Inner {
+impl fmt::Debug for Output {
     fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
-        fmt.debug_struct("Inner")
-            .field("inner", &self.inner)
-            .field("output", &self.output)
+        fmt.debug_struct("Output")
+            .field("sender", &self.sender)
+            .field("output_id", &self.output_id)
             // `metrics::Histogram` is missing `impl Debug`
             .finish()
     }
 }
 
-impl Inner {
+impl Output {
     fn new_with_buffer(
         n: usize,
         output: String,
@@ -401,8 +386,7 @@ impl Inner {
         let (tx, rx) = channel::limited(n);
         (
             Self {
-                inner: tx,
-                output: output.clone(),
+                sender: tx,
                 lag_time,
                 events_sent: register!(EventsSent::from(internal_event::Output(Some(
                     output.into()
@@ -414,7 +398,11 @@ impl Inner {
         )
     }
 
-    async fn send(&mut self, mut events: EventArray) -> Result<(), ClosedError> {
+    async fn send(
+        &mut self,
+        mut events: EventArray,
+        unsent_event_count: &mut UnsentEventCount,
+    ) -> Result<(), ClosedError> {
         let send_reference = Instant::now();
         let reference = Utc::now().timestamp_millis();
         events
@@ -433,7 +421,7 @@ impl Inner {
 
         let byte_size = events.estimated_json_encoded_size_of();
         let count = events.len();
-        self.inner
+        self.sender
             .send(SourceSenderItem {
                 events,
                 send_reference,
@@ -441,6 +429,7 @@ impl Inner {
             .await
             .map_err(|_| ClosedError)?;
         self.events_sent.emit(CountByteSize(count, byte_size));
+        unsent_event_count.decr(count);
         Ok(())
     }
 
@@ -449,11 +438,8 @@ impl Inner {
         // It's possible that the caller stops polling this future while it is blocked waiting
         // on `self.send()`. When that happens, we use `UnsentEventCount` to correctly emit
         // `ComponentEventsDropped` events.
-        let count = event.len();
-        let mut unsent_event_count = UnsentEventCount::new(count);
-        let res = self.send(event).await;
-        unsent_event_count.discard();
-        res
+        let mut unsent_event_count = UnsentEventCount::new(event.len());
+        self.send(event, &mut unsent_event_count).await
     }
 
     async fn send_event_stream<S, E>(&mut self, events: S) -> Result<(), ClosedError>
@@ -480,13 +466,13 @@ impl Inner {
         let events = events.into_iter().map(Into::into);
         let mut unsent_event_count = UnsentEventCount::new(events.len());
         for events in array::events_into_arrays(events, Some(CHUNK_SIZE)) {
-            let count = events.len();
-            self.send(events).await.inspect_err(|_| {
-                // The unsent event count is discarded here because the caller emits the
-                // `StreamClosedError`.
-                unsent_event_count.discard();
-            })?;
-            unsent_event_count.decr(count);
+            self.send(events, &mut unsent_event_count)
+                .await
+                .inspect_err(|_| {
+                    // The unsent event count is discarded here because the callee emits the
+                    // `StreamClosedError`.
+                    unsent_event_count.discard();
+                })?;
         }
         Ok(())
     }

From 3528fc19162a6c722209423ea1db0e2e754bfaf8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josu=C3=A9=20AGBEKODO?=
 <70853334+20agbekodo@users.noreply.github.com>
Date: Wed, 28 May 2025 12:43:47 -0400
Subject: [PATCH 026/305] chore(transforms): Move `TransformOutputsBuf`
 functions out of test flag (#23116)

* chore(remap transform) Move take_primary() outside of test flag

* chore(remap transform): Remove other take/drain functions from the test FF

* fix: also remove called function from test FF
---
 lib/vector-core/src/transform/mod.rs | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/lib/vector-core/src/transform/mod.rs b/lib/vector-core/src/transform/mod.rs
index 37d694e6c1b9b..87fac605f6b12 100644
--- a/lib/vector-core/src/transform/mod.rs
+++ b/lib/vector-core/src/transform/mod.rs
@@ -376,7 +376,6 @@ impl TransformOutputsBuf {
     /// # Panics
     ///
     /// Panics if there is no default output.
-    #[cfg(any(feature = "test", test))]
     pub fn drain(&mut self) -> impl Iterator<Item = Event> + '_ {
         self.primary_buffer
             .as_mut()
@@ -389,7 +388,6 @@ impl TransformOutputsBuf {
     /// # Panics
     ///
     /// Panics if there is no output with the given name.
-    #[cfg(any(feature = "test", test))]
     pub fn drain_named(&mut self, name: &str) -> impl Iterator<Item = Event> + '_ {
         self.named_buffers
             .get_mut(name)
@@ -402,12 +400,10 @@ impl TransformOutputsBuf {
     /// # Panics
     ///
     /// Panics if there is no default output.
-    #[cfg(any(feature = "test", test))]
     pub fn take_primary(&mut self) -> OutputBuffer {
         std::mem::take(self.primary_buffer.as_mut().expect("no default output"))
     }
 
-    #[cfg(any(feature = "test", test))]
     pub fn take_all_named(&mut self) -> HashMap<String, OutputBuffer> {
         std::mem::take(&mut self.named_buffers)
     }
@@ -482,7 +478,6 @@ impl OutputBuffer {
         })
     }
 
-    #[cfg(any(feature = "test", test))]
     pub fn drain(&mut self) -> impl Iterator<Item = Event> + '_ {
         self.0.drain(..).flat_map(EventArray::into_events)
     }

From 43550f31b039f39707c7f2060016a197d9e19077 Mon Sep 17 00:00:00 2001
From: Jesse Szwedko <jesse.szwedko@datadoghq.com>
Date: Wed, 4 Jun 2025 11:39:58 -0700
Subject: [PATCH 027/305] chore(ci): Add axiom sink to list of scopes

---
 .github/workflows/semantic.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/semantic.yml b/.github/workflows/semantic.yml
index 47a53618e4eef..f59a9403c4d86 100644
--- a/.github/workflows/semantic.yml
+++ b/.github/workflows/semantic.yml
@@ -192,6 +192,7 @@ jobs:
             aws_kinesis_streams sink
             aws_s3 sink
             aws_sqs sink
+            axiom sink
             azure_blob sink
             azure_monitor_logs sink
             blackhole sink

From 5ac8263dc400033552cc86a1885a6f8a2d3cfd0a Mon Sep 17 00:00:00 2001
From: Darach Ennis <darach@gmail.com>
Date: Wed, 4 Jun 2025 21:20:48 +0200
Subject: [PATCH 028/305] feat(axiom sink): Add trace data support to Axiom
 Configuration for the axiom sink (#22935)

* Add trace data support to Axiom Configuration for the axiom sink

Signed-off-by: Darach Ennis <darach@gmail.com>

* Add changelog entry for axiom sink trace support feature addition

Signed-off-by: Darach Ennis <darach@gmail.com>

---------

Signed-off-by: Darach Ennis <darach@gmail.com>
Signed-off-by: Jesse Szwedko <jesse.szwedko@datadoghq.com>
Co-authored-by: Jesse Szwedko <jesse.szwedko@datadoghq.com>
---
 changelog.d/22935_axiom_sink_trace_data_support.feature.md | 5 +++++
 src/sinks/axiom.rs                                         | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 changelog.d/22935_axiom_sink_trace_data_support.feature.md

diff --git a/changelog.d/22935_axiom_sink_trace_data_support.feature.md b/changelog.d/22935_axiom_sink_trace_data_support.feature.md
new file mode 100644
index 0000000000000..08d117b51f672
--- /dev/null
+++ b/changelog.d/22935_axiom_sink_trace_data_support.feature.md
@@ -0,0 +1,5 @@
+Adds trace data type support to the Axiom sink allowing propagation of
+OpenTelemetry traces received via the `opentelemetry` or compatible trace
+emitting components.
+
+authors: darach
diff --git a/src/sinks/axiom.rs b/src/sinks/axiom.rs
index dfc4ab124dcc1..5d4cf96076ab3 100644
--- a/src/sinks/axiom.rs
+++ b/src/sinks/axiom.rs
@@ -139,7 +139,7 @@ impl SinkConfig for AxiomConfig {
     }
 
     fn input(&self) -> Input {
-        Input::new(DataType::Metric | DataType::Log)
+        Input::new(DataType::Metric | DataType::Log | DataType::Trace)
     }
 
     fn acknowledgements(&self) -> &AcknowledgementsConfig {

From c6cc716d12cd3e16fa3504ae8353ee294f53c0b7 Mon Sep 17 00:00:00 2001
From: Scott Opell <me@scottopell.com>
Date: Thu, 5 Jun 2025 18:53:40 -0400
Subject: [PATCH 029/305] chore(ci): Updates SMP cli client version (#23125)

updates SMP cli client version
---
 .github/workflows/regression.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/regression.yml b/.github/workflows/regression.yml
index af2426ce30429..712d9a200c939 100644
--- a/.github/workflows/regression.yml
+++ b/.github/workflows/regression.yml
@@ -105,7 +105,7 @@ jobs:
       - name: Set SMP version
         id: experimental-meta
         run: |
-          export SMP_CRATE_VERSION="0.21.0"
+          export SMP_CRATE_VERSION="0.22.0"
           echo "smp crate version: ${SMP_CRATE_VERSION}"
           echo "SMP_CRATE_VERSION=${SMP_CRATE_VERSION}" >> $GITHUB_OUTPUT
 

From 2f8f1c3474f7f5a0717ab8f1879750844e07ff05 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 9 Jun 2025 09:54:22 -0400
Subject: [PATCH 030/305] chore(ci): Bump check-spelling/check-spelling from
 0.0.24 to 0.0.25 (#23143)

Bumps [check-spelling/check-spelling](https://github.com/check-spelling/check-spelling) from 0.0.24 to 0.0.25.
- [Release notes](https://github.com/check-spelling/check-spelling/releases)
- [Commits](https://github.com/check-spelling/check-spelling/compare/v0.0.24...v0.0.25)

---
updated-dependencies:
- dependency-name: check-spelling/check-spelling
  dependency-version: 0.0.25
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/spelling.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/spelling.yml b/.github/workflows/spelling.yml
index 5976f1a9fedb4..e7649b1e9f4cb 100644
--- a/.github/workflows/spelling.yml
+++ b/.github/workflows/spelling.yml
@@ -87,7 +87,7 @@ jobs:
     steps:
     - name: check-spelling
       id: spelling
-      uses: check-spelling/check-spelling@v0.0.24
+      uses: check-spelling/check-spelling@v0.0.25
       with:
         suppress_push_for_open_pull_request: ${{ github.actor != 'dependabot[bot]' && 1 }}
         checkout: true

From 03e6215ee4bdb37790e2356ce89990d461079ada Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 9 Jun 2025 09:54:49 -0400
Subject: [PATCH 031/305] chore(ci): Bump aws-actions/configure-aws-credentials
 from 4.1.0 to 4.2.1 (#23142)

chore(ci): Bump aws-actions/configure-aws-credentials

Bumps [aws-actions/configure-aws-credentials](https://github.com/aws-actions/configure-aws-credentials) from 4.1.0 to 4.2.1.
- [Release notes](https://github.com/aws-actions/configure-aws-credentials/releases)
- [Changelog](https://github.com/aws-actions/configure-aws-credentials/blob/main/CHANGELOG.md)
- [Commits](https://github.com/aws-actions/configure-aws-credentials/compare/v4.1.0...v4.2.1)

---
updated-dependencies:
- dependency-name: aws-actions/configure-aws-credentials
  dependency-version: 4.2.1
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/regression.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/regression.yml b/.github/workflows/regression.yml
index 712d9a200c939..b0aa8378df9c4 100644
--- a/.github/workflows/regression.yml
+++ b/.github/workflows/regression.yml
@@ -269,7 +269,7 @@ jobs:
       - resolve-inputs
     steps:
       - name: Configure AWS Credentials
-        uses: aws-actions/configure-aws-credentials@v4.1.0
+        uses: aws-actions/configure-aws-credentials@v4.2.1
         with:
           aws-access-key-id: ${{ secrets.SINGLE_MACHINE_PERFORMANCE_BOT_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ secrets.SINGLE_MACHINE_PERFORMANCE_BOT_SECRET_ACCESS_KEY }}
@@ -303,7 +303,7 @@ jobs:
           docker load --input baseline-image.tar
 
       - name: Configure AWS Credentials
-        uses: aws-actions/configure-aws-credentials@v4.1.0
+        uses: aws-actions/configure-aws-credentials@v4.2.1
         with:
           aws-access-key-id: ${{ secrets.SINGLE_MACHINE_PERFORMANCE_BOT_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ secrets.SINGLE_MACHINE_PERFORMANCE_BOT_SECRET_ACCESS_KEY }}
@@ -343,7 +343,7 @@ jobs:
           docker load --input comparison-image.tar
 
       - name: Configure AWS Credentials
-        uses: aws-actions/configure-aws-credentials@v4.1.0
+        uses: aws-actions/configure-aws-credentials@v4.2.1
         with:
           aws-access-key-id: ${{ secrets.SINGLE_MACHINE_PERFORMANCE_BOT_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ secrets.SINGLE_MACHINE_PERFORMANCE_BOT_SECRET_ACCESS_KEY }}
@@ -378,7 +378,7 @@ jobs:
           ref: ${{ needs.resolve-inputs.outputs.comparison-sha }}
 
       - name: Configure AWS Credentials
-        uses: aws-actions/configure-aws-credentials@v4.1.0
+        uses: aws-actions/configure-aws-credentials@v4.2.1
         with:
           aws-access-key-id: ${{ secrets.SINGLE_MACHINE_PERFORMANCE_BOT_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ secrets.SINGLE_MACHINE_PERFORMANCE_BOT_SECRET_ACCESS_KEY }}
@@ -451,7 +451,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Configure AWS Credentials
-        uses: aws-actions/configure-aws-credentials@v4.1.0
+        uses: aws-actions/configure-aws-credentials@v4.2.1
         with:
           aws-access-key-id: ${{ secrets.SINGLE_MACHINE_PERFORMANCE_BOT_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ secrets.SINGLE_MACHINE_PERFORMANCE_BOT_SECRET_ACCESS_KEY }}
@@ -490,7 +490,7 @@ jobs:
           ref: ${{ needs.resolve-inputs.outputs.comparison-sha }}
 
       - name: Configure AWS Credentials
-        uses: aws-actions/configure-aws-credentials@v4.1.0
+        uses: aws-actions/configure-aws-credentials@v4.2.1
         with:
           aws-access-key-id: ${{ secrets.SINGLE_MACHINE_PERFORMANCE_BOT_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ secrets.SINGLE_MACHINE_PERFORMANCE_BOT_SECRET_ACCESS_KEY }}

From a34ab883c1682444c55e5f15757e20c024f763db Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 9 Jun 2025 09:55:33 -0400
Subject: [PATCH 032/305] chore(ci): Bump ossf/scorecard-action from 2.4.1 to
 2.4.2 (#23141)

Bumps [ossf/scorecard-action](https://github.com/ossf/scorecard-action) from 2.4.1 to 2.4.2.
- [Release notes](https://github.com/ossf/scorecard-action/releases)
- [Changelog](https://github.com/ossf/scorecard-action/blob/main/RELEASE.md)
- [Commits](https://github.com/ossf/scorecard-action/compare/v2.4.1...v2.4.2)

---
updated-dependencies:
- dependency-name: ossf/scorecard-action
  dependency-version: 2.4.2
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/scorecard.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index ba19d832ca3fb..294b5ecaedd3f 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -37,7 +37,7 @@ jobs:
           persist-credentials: false
 
       - name: "Run analysis"
-        uses: ossf/scorecard-action@v2.4.1
+        uses: ossf/scorecard-action@v2.4.2
         with:
           results_file: results.sarif
           results_format: sarif

From 59adb1aa767d471d2de3c3ac705e8dfe35e3c5d9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 9 Jun 2025 13:55:58 +0000
Subject: [PATCH 033/305] chore(ci): Bump docker/build-push-action from 6.16.0
 to 6.18.0 (#23140)

Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 6.16.0 to 6.18.0.
- [Release notes](https://github.com/docker/build-push-action/releases)
- [Commits](https://github.com/docker/build-push-action/compare/v6.16.0...v6.18.0)

---
updated-dependencies:
- dependency-name: docker/build-push-action
  dependency-version: 6.18.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/environment.yml | 2 +-
 .github/workflows/regression.yml  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/environment.yml b/.github/workflows/environment.yml
index 500e7db8c8425..edbbce826dd50 100644
--- a/.github/workflows/environment.yml
+++ b/.github/workflows/environment.yml
@@ -62,7 +62,7 @@ jobs:
             org.opencontainers.image.title=Vector development environment
             org.opencontainers.image.url=https://github.com/vectordotdev/vector
       - name: Build and push
-        uses: docker/build-push-action@v6.16.0
+        uses: docker/build-push-action@v6.18.0
         with:
           context: .
           file: ./scripts/environment/Dockerfile
diff --git a/.github/workflows/regression.yml b/.github/workflows/regression.yml
index b0aa8378df9c4..88b3a4637043f 100644
--- a/.github/workflows/regression.yml
+++ b/.github/workflows/regression.yml
@@ -204,7 +204,7 @@ jobs:
         uses: docker/setup-buildx-action@v3.10.0
 
       - name: Build 'vector' target image
-        uses: docker/build-push-action@v6.16.0
+        uses: docker/build-push-action@v6.18.0
         with:
           context: baseline-vector/
           cache-from: type=gha
@@ -243,7 +243,7 @@ jobs:
         uses: docker/setup-buildx-action@v3.10.0
 
       - name: Build 'vector' target image
-        uses: docker/build-push-action@v6.16.0
+        uses: docker/build-push-action@v6.18.0
         with:
           context: comparison-vector/
           cache-from: type=gha

From a04b4d3bd094902a2aa92feed981b21687e3fd68 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 9 Jun 2025 14:01:18 +0000
Subject: [PATCH 034/305] chore(deps): Bump tokio from 1.44.2 to 1.45.1
 (#23136)

Bumps [tokio](https://github.com/tokio-rs/tokio) from 1.44.2 to 1.45.1.
- [Release notes](https://github.com/tokio-rs/tokio/releases)
- [Commits](https://github.com/tokio-rs/tokio/compare/tokio-1.44.2...tokio-1.45.1)

---
updated-dependencies:
- dependency-name: tokio
  dependency-version: 1.45.1
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock                        | 4 ++--
 Cargo.toml                        | 6 +++---
 lib/file-source/Cargo.toml        | 2 +-
 lib/k8s-e2e-tests/Cargo.toml      | 2 +-
 lib/k8s-test-framework/Cargo.toml | 2 +-
 lib/vector-api-client/Cargo.toml  | 2 +-
 lib/vector-buffers/Cargo.toml     | 2 +-
 lib/vector-common/Cargo.toml      | 4 ++--
 lib/vector-core/Cargo.toml        | 2 +-
 lib/vector-stream/Cargo.toml      | 2 +-
 lib/vector-tap/Cargo.toml         | 4 ++--
 11 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 3c465db7ff350..46a6bb16b8ca6 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -10412,9 +10412,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.44.2"
+version = "1.45.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6b88822cbe49de4185e3a4cbf8321dd487cf5fe0c5c65695fef6346371e9c48"
+checksum = "75ef51a33ef1da925cea3e4eb122833cb377c61439ca401b770f54902b806779"
 dependencies = [
  "backtrace",
  "bytes 1.10.1",
diff --git a/Cargo.toml b/Cargo.toml
index 4bf10447c73ac..faccd2a7dd0d4 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -165,7 +165,7 @@ serde_json = { version = "1.0.140", default-features = false, features = ["raw_v
 serde = { version = "1.0.219", default-features = false, features = ["alloc", "derive", "rc"] }
 snafu = { version = "0.7.5", default-features = false, features = ["futures", "std"] }
 tempfile = "3.19.1"
-tokio = { version = "1.44.2", default-features = false, features = ["full"] }
+tokio = { version = "1.45.1", default-features = false, features = ["full"] }
 toml = { version = "0.8.22", default-features = false, features = ["display", "parse"] }
 tonic = { version = "0.11", default-features = false, features = ["transport", "codegen", "prost", "tls", "tls-roots", "gzip"] }
 tonic-build = { version = "0.11", default-features = false, features = ["transport", "prost"] }
@@ -207,7 +207,7 @@ loki-logproto = { path = "lib/loki-logproto", optional = true }
 async-stream = { version = "0.3.6", default-features = false }
 async-trait = { version = "0.1.88", default-features = false }
 futures.workspace = true
-tokio = { version = "1.44.2", default-features = false, features = ["full"] }
+tokio = { version = "1.45.1", default-features = false, features = ["full"] }
 tokio-openssl = { version = "0.6.5", default-features = false }
 tokio-stream = { version = "0.1.17", default-features = false, features = ["net", "sync", "time"] }
 tokio-util = { version = "0.7", default-features = false, features = ["io", "time"] }
@@ -443,7 +443,7 @@ reqwest = { version = "0.11", features = ["json"] }
 rstest = { version = "0.25.0" }
 tempfile.workspace = true
 test-generator = "0.3.1"
-tokio = { version = "1.44.2", features = ["test-util"] }
+tokio = { version = "1.45.1", features = ["test-util"] }
 tokio-test = "0.4.4"
 tower-test = "0.4.0"
 vector-lib = { workspace = true, features = ["test"] }
diff --git a/lib/file-source/Cargo.toml b/lib/file-source/Cargo.toml
index f9c5c178d5651..e5de5004697c4 100644
--- a/lib/file-source/Cargo.toml
+++ b/lib/file-source/Cargo.toml
@@ -68,7 +68,7 @@ default-features = false
 features = []
 
 [dependencies.tokio]
-version = "1.44.2"
+version = "1.45.1"
 default-features = false
 features = ["full"]
 
diff --git a/lib/k8s-e2e-tests/Cargo.toml b/lib/k8s-e2e-tests/Cargo.toml
index 954675e9b3b76..fc5339e054e79 100644
--- a/lib/k8s-e2e-tests/Cargo.toml
+++ b/lib/k8s-e2e-tests/Cargo.toml
@@ -14,7 +14,7 @@ k8s-test-framework = { version = "0.1", path = "../k8s-test-framework" }
 regex = "1"
 reqwest = { version = "0.11.26", features = ["json"] }
 serde_json.workspace = true
-tokio = { version = "1.44.2", features = ["full"] }
+tokio = { version = "1.45.1", features = ["full"] }
 indoc.workspace = true
 env_logger = "0.11"
 tracing = { version = "0.1", features = ["log"] }
diff --git a/lib/k8s-test-framework/Cargo.toml b/lib/k8s-test-framework/Cargo.toml
index fa7b47e3bf5f5..c5a4a213500a3 100644
--- a/lib/k8s-test-framework/Cargo.toml
+++ b/lib/k8s-test-framework/Cargo.toml
@@ -11,5 +11,5 @@ license = "MPL-2.0"
 k8s-openapi = { version = "0.16.0", default-features = false, features = ["v1_19"] }
 serde_json.workspace = true
 tempfile.workspace = true
-tokio = { version = "1.44.2", features = ["full"] }
+tokio = { version = "1.45.1", features = ["full"] }
 log = "0.4"
diff --git a/lib/vector-api-client/Cargo.toml b/lib/vector-api-client/Cargo.toml
index be614b8ccbb7f..30a7c9d80f990 100644
--- a/lib/vector-api-client/Cargo.toml
+++ b/lib/vector-api-client/Cargo.toml
@@ -17,7 +17,7 @@ anyhow = { version = "1.0.98", default-features = false, features = ["std"] }
 
 # Tokio / Futures
 futures.workspace = true
-tokio = { version = "1.44.2", default-features = false, features = ["macros", "rt", "sync"] }
+tokio = { version = "1.45.1", default-features = false, features = ["macros", "rt", "sync"] }
 tokio-stream = { version = "0.1.17", default-features = false, features = ["sync"] }
 
 # GraphQL
diff --git a/lib/vector-buffers/Cargo.toml b/lib/vector-buffers/Cargo.toml
index 24e6c90ff0862..6d2f40cf91b3a 100644
--- a/lib/vector-buffers/Cargo.toml
+++ b/lib/vector-buffers/Cargo.toml
@@ -28,7 +28,7 @@ rkyv = { version = "0.7.45", default-features = false, features = ["size_32", "s
 serde.workspace = true
 snafu.workspace = true
 tokio-util = { version = "0.7.0", default-features = false }
-tokio = { version = "1.44.2", default-features = false, features = ["rt", "macros", "rt-multi-thread", "sync", "fs", "io-util", "time"] }
+tokio = { version = "1.45.1", default-features = false, features = ["rt", "macros", "rt-multi-thread", "sync", "fs", "io-util", "time"] }
 tracing = { version = "0.1.34", default-features = false, features = ["attributes"] }
 vector-config = { path = "../vector-config", default-features = false }
 vector-common = { path = "../vector-common", default-features = false, features = ["byte_size_of"] }
diff --git a/lib/vector-common/Cargo.toml b/lib/vector-common/Cargo.toml
index 17ad79cdc73f1..07d09e7d45a48 100644
--- a/lib/vector-common/Cargo.toml
+++ b/lib/vector-common/Cargo.toml
@@ -48,11 +48,11 @@ serde.workspace = true
 serde_json.workspace = true
 smallvec = { version = "1", default-features = false }
 stream-cancel = { version = "0.8.2", default-features = false }
-tokio = { version = "1.44.2", default-features = false, features = ["macros", "time"] }
+tokio = { version = "1.45.1", default-features = false, features = ["macros", "time"] }
 tracing = { version = "0.1.34", default-features = false }
 vrl.workspace = true
 vector-config = { path = "../vector-config" }
 
 [dev-dependencies]
 futures = { version = "0.3.31", default-features = false, features = ["async-await"] }
-tokio = { version = "1.44.2", default-features = false, features = ["rt", "time"] }
+tokio = { version = "1.45.1", default-features = false, features = ["rt", "time"] }
diff --git a/lib/vector-core/Cargo.toml b/lib/vector-core/Cargo.toml
index af3c2839e8dfe..2c805ae62ae3d 100644
--- a/lib/vector-core/Cargo.toml
+++ b/lib/vector-core/Cargo.toml
@@ -49,7 +49,7 @@ serde_with = { version = "3.12.0", default-features = false, features = ["std",
 smallvec = { version = "1", default-features = false, features = ["serde", "const_generics"] }
 snafu.workspace = true
 socket2 = { version = "0.5.9", default-features = false }
-tokio = { version = "1.44.2", default-features = false, features = ["net"] }
+tokio = { version = "1.45.1", default-features = false, features = ["net"] }
 tokio-openssl = { version = "0.6.5", default-features = false }
 tokio-stream = { version = "0.1", default-features = false, features = ["time"], optional = true }
 tokio-util = { version = "0.7.0", default-features = false, features = ["time"] }
diff --git a/lib/vector-stream/Cargo.toml b/lib/vector-stream/Cargo.toml
index 63493bea41cd3..87908f771ad13 100644
--- a/lib/vector-stream/Cargo.toml
+++ b/lib/vector-stream/Cargo.toml
@@ -10,7 +10,7 @@ async-stream = { version = "0.3.6", default-features = false }
 futures.workspace = true
 futures-util = { version = "0.3.29", default-features = false, features = ["std"] }
 pin-project.workspace = true
-tokio = { version = "1.44.2", default-features = false, features = ["net"] }
+tokio = { version = "1.45.1", default-features = false, features = ["net"] }
 tokio-util = { version = "0.7.0", default-features = false, features = ["time"] }
 tower = { version = "0.4", default-features = false, features = ["util"] }
 tracing = { version = "0.1.34", default-features = false }
diff --git a/lib/vector-tap/Cargo.toml b/lib/vector-tap/Cargo.toml
index 83a89dd9c8fcf..154e7a3f08e33 100644
--- a/lib/vector-tap/Cargo.toml
+++ b/lib/vector-tap/Cargo.toml
@@ -15,7 +15,7 @@ colored = { version = "3.0.0", default-features = false }
 futures.workspace = true
 glob.workspace = true
 serde_yaml = { version = "0.9.34", default-features = false }
-tokio = { version = "1.44.2", default-features = false, features = ["time"] }
+tokio = { version = "1.45.1", default-features = false, features = ["time"] }
 tokio-stream = { version = "0.1.17", default-features = false, features = ["sync"] }
 tokio-tungstenite = { version = "0.20.1", default-features = false }
 tracing = { version = "0.1.34", default-features = false }
@@ -31,4 +31,4 @@ futures-util = "0.3.30"
 chrono = { workspace = true }
 portpicker = { path = "../portpicker" }
 serde_json = { workspace = true }
-tokio = { version = "1.44.2", default-features = false, features = ["test-util"] }
+tokio = { version = "1.45.1", default-features = false, features = ["test-util"] }

From e5f533e86c6914369b3b34c9e68a0f23ec85e7d9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 9 Jun 2025 14:01:39 +0000
Subject: [PATCH 035/305] chore(deps): Bump quickcheck_macros from 1.0.0 to
 1.1.0 (#23135)

Bumps [quickcheck_macros](https://github.com/BurntSushi/quickcheck) from 1.0.0 to 1.1.0.
- [Commits](https://github.com/BurntSushi/quickcheck/compare/quickcheck_macros-1.0.0...quickcheck_macros-1.1.0)

---
updated-dependencies:
- dependency-name: quickcheck_macros
  dependency-version: 1.1.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 46a6bb16b8ca6..a414558938c32 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -8034,13 +8034,13 @@ dependencies = [
 
 [[package]]
 name = "quickcheck_macros"
-version = "1.0.0"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b22a693222d716a9587786f37ac3f6b4faedb5b80c23914e7303ff5a1d8016e9"
+checksum = "f71ee38b42f8459a88d3362be6f9b841ad2d5421844f61eb1c59c11bff3ac14a"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 1.0.109",
+ "syn 2.0.101",
 ]
 
 [[package]]

From 563a9f048195f10e81044edca867d7788e755bd8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 9 Jun 2025 14:01:59 +0000
Subject: [PATCH 036/305] chore(deps): Bump uuid from 1.16.0 to 1.17.0 (#23134)

Bumps [uuid](https://github.com/uuid-rs/uuid) from 1.16.0 to 1.17.0.
- [Release notes](https://github.com/uuid-rs/uuid/releases)
- [Commits](https://github.com/uuid-rs/uuid/compare/v1.16.0...v1.17.0)

---
updated-dependencies:
- dependency-name: uuid
  dependency-version: 1.17.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock | 9 +++++----
 Cargo.toml | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index a414558938c32..7f9961ae40d19 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5393,10 +5393,11 @@ dependencies = [
 
 [[package]]
 name = "js-sys"
-version = "0.3.65"
+version = "0.3.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54c0c35952f67de54bb584e9fd912b3023117cbafc0a77d8f3dee1fb5f572fe8"
+checksum = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f"
 dependencies = [
+ "once_cell",
  "wasm-bindgen",
 ]
 
@@ -11377,9 +11378,9 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
 
 [[package]]
 name = "uuid"
-version = "1.16.0"
+version = "1.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "458f7a779bf54acc9f347480ac654f68407d3aab21269a6e3c9f922acd9e2da9"
+checksum = "3cf4199d1e5d15ddd86a694e4d0dffa9c323ce759fea589f00fef9d81cc1931d"
 dependencies = [
  "getrandom 0.3.1",
  "js-sys",
diff --git a/Cargo.toml b/Cargo.toml
index faccd2a7dd0d4..b031dbfac8336 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -169,7 +169,7 @@ tokio = { version = "1.45.1", default-features = false, features = ["full"] }
 toml = { version = "0.8.22", default-features = false, features = ["display", "parse"] }
 tonic = { version = "0.11", default-features = false, features = ["transport", "codegen", "prost", "tls", "tls-roots", "gzip"] }
 tonic-build = { version = "0.11", default-features = false, features = ["transport", "prost"] }
-uuid = { version = "1.16.0", features = ["v4", "v7", "serde"] }
+uuid = { version = "1.17.0", features = ["v4", "v7", "serde"] }
 vector-lib = { path = "lib/vector-lib", default-features = false, features = ["vrl"] }
 vector-config = { path = "lib/vector-config" }
 vector-config-common = { path = "lib/vector-config-common" }

From ddb412160664cee505619e75f69a3d56fd9f337b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 9 Jun 2025 14:03:55 +0000
Subject: [PATCH 037/305] chore(deps): Bump crc from 3.2.1 to 3.3.0 (#23132)

Bumps [crc](https://github.com/mrhooray/crc-rs) from 3.2.1 to 3.3.0.
- [Release notes](https://github.com/mrhooray/crc-rs/releases)
- [Commits](https://github.com/mrhooray/crc-rs/commits)

---
updated-dependencies:
- dependency-name: crc
  dependency-version: 3.3.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock                 | 4 ++--
 lib/file-source/Cargo.toml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 7f9961ae40d19..3ab8b9c34cc70 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2526,9 +2526,9 @@ dependencies = [
 
 [[package]]
 name = "crc"
-version = "3.2.1"
+version = "3.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69e6e4d7b33a94f0991c26729976b10ebde1d34c3ee82408fb536164fa10d636"
+checksum = "9710d3b3739c2e349eb44fe848ad0b7c8cb1e42bd87ee49371df2f7acaf3e675"
 dependencies = [
  "crc-catalog",
 ]
diff --git a/lib/file-source/Cargo.toml b/lib/file-source/Cargo.toml
index e5de5004697c4..b61e0b036d3a4 100644
--- a/lib/file-source/Cargo.toml
+++ b/lib/file-source/Cargo.toml
@@ -11,7 +11,7 @@ libc = "0.2"
 winapi = { version = "0.3", features = ["winioctl"] }
 
 [dependencies]
-crc = "3.2.1"
+crc = "3.3.0"
 glob.workspace = true
 scan_fmt = "0.2.6"
 vector-common = { path = "../vector-common", default-features = false }

From fcc546a4ad7229f949852044900e6ff997016905 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 9 Jun 2025 14:04:41 +0000
Subject: [PATCH 038/305] chore(deps): Bump confy from 0.6.1 to 1.0.0 (#23130)

Bumps [confy](https://github.com/rust-cli/confy) from 0.6.1 to 1.0.0.
- [Release notes](https://github.com/rust-cli/confy/releases)
- [Commits](https://github.com/rust-cli/confy/compare/v0.6.1...v1.0.0)

---
updated-dependencies:
- dependency-name: confy
  dependency-version: 1.0.0
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock      | 33 ++++++---------------------------
 vdev/Cargo.toml |  2 +-
 2 files changed, 7 insertions(+), 28 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 3ab8b9c34cc70..ef618c62c8f27 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2395,13 +2395,13 @@ dependencies = [
 
 [[package]]
 name = "confy"
-version = "0.6.1"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "45b1f4c00870f07dc34adcac82bb6a72cc5aabca8536ba1797e01df51d2ce9a0"
+checksum = "f29222b549d4e3ded127989d523da9e928918d0d0d7f7c1690b439d0d538bae9"
 dependencies = [
- "directories 5.0.1",
+ "directories",
  "serde",
- "thiserror 1.0.68",
+ "thiserror 2.0.3",
  "toml",
 ]
 
@@ -3087,22 +3087,13 @@ dependencies = [
  "subtle",
 ]
 
-[[package]]
-name = "directories"
-version = "5.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a49173b84e034382284f27f1af4dcbbd231ffa358c0fe316541a7337f376a35"
-dependencies = [
- "dirs-sys 0.4.1",
-]
-
 [[package]]
 name = "directories"
 version = "6.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "16f5094c54661b38d03bd7e50df373292118db60b585c08a411c6d840017fe7d"
 dependencies = [
- "dirs-sys 0.5.0",
+ "dirs-sys",
 ]
 
 [[package]]
@@ -3115,18 +3106,6 @@ dependencies = [
  "dirs-sys-next",
 ]
 
-[[package]]
-name = "dirs-sys"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c"
-dependencies = [
- "libc",
- "option-ext",
- "redox_users 0.4.3",
- "windows-sys 0.48.0",
-]
-
 [[package]]
 name = "dirs-sys"
 version = "0.5.0"
@@ -11411,7 +11390,7 @@ dependencies = [
  "clap-verbosity-flag",
  "clap_complete",
  "confy",
- "directories 6.0.0",
+ "directories",
  "dunce",
  "glob",
  "hex",
diff --git a/vdev/Cargo.toml b/vdev/Cargo.toml
index a0e2b3bd863b8..b35fe0fefce54 100644
--- a/vdev/Cargo.toml
+++ b/vdev/Cargo.toml
@@ -13,7 +13,7 @@ chrono.workspace = true
 clap.workspace = true
 clap-verbosity-flag = "3.0.2"
 clap_complete = "4.5.48"
-confy = "0.6.1"
+confy = "1.0.0"
 directories = "6.0.0"
 # remove this when stabilized https://doc.rust-lang.org/stable/std/path/fn.absolute.html
 dunce = "1.0.5"

From a03f45c511ef3893317153b07ba0fc2f51cf12ef Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 9 Jun 2025 14:23:41 +0000
Subject: [PATCH 039/305] chore(deps): Bump windows-service from 0.7.0 to 0.8.0
 (#22557)

Bumps [windows-service](https://github.com/mullvad/windows-service-rs) from 0.7.0 to 0.8.0.
- [Release notes](https://github.com/mullvad/windows-service-rs/releases)
- [Changelog](https://github.com/mullvad/windows-service-rs/blob/main/CHANGELOG.md)
- [Commits](https://github.com/mullvad/windows-service-rs/compare/v0.7.0...v0.8.0)

---
updated-dependencies:
- dependency-name: windows-service
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Pavlos Rontidis <pavlos.rontidis@gmail.com>
---
 Cargo.lock | 6 +++---
 Cargo.toml | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index ef618c62c8f27..eb0faad3c3dff 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -12495,13 +12495,13 @@ dependencies = [
 
 [[package]]
 name = "windows-service"
-version = "0.7.0"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d24d6bcc7f734a4091ecf8d7a64c5f7d7066f45585c1861eba06449909609c8a"
+checksum = "193cae8e647981c35bc947fdd57ba7928b1fa0d4a79305f6dd2dc55221ac35ac"
 dependencies = [
  "bitflags 2.9.0",
  "widestring 1.0.2",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
diff --git a/Cargo.toml b/Cargo.toml
index b031dbfac8336..4424dbd79edfc 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -407,7 +407,7 @@ sysinfo = "0.34.2"
 byteorder = "1.5.0"
 
 [target.'cfg(windows)'.dependencies]
-windows-service = "0.7.0"
+windows-service = "0.8.0"
 
 [target.'cfg(unix)'.dependencies]
 nix = { version = "0.26.2", default-features = false, features = ["socket", "signal"] }

From 2e067e7054dd4cd88f4b2416407b49b902ccb447 Mon Sep 17 00:00:00 2001
From: Bruce Guenter <bruce.guenter@datadoghq.com>
Date: Mon, 9 Jun 2025 13:23:45 -0600
Subject: [PATCH 040/305] fix(sources): Handle sources with no default output
 (#23172)

* fix(sources): Handle sources with no default output

There exist sources that can be configured to output events entirely to
non-default ports. The refactoring to `struct SourceSender` in #23089 failed to
take this into account. This PR reverts the changes to the `default_output`
handling in the builder and `SourceSender` with the addition of a small cleanup
of its own.

The sources that can have this condition are `datadog_agent` when
`multiple_outputs` is set and `opentelemetry`.

* Generalize comment
---
 src/source_sender/mod.rs | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/source_sender/mod.rs b/src/source_sender/mod.rs
index bf0ee0525597f..719d55968385b 100644
--- a/src/source_sender/mod.rs
+++ b/src/source_sender/mod.rs
@@ -155,7 +155,7 @@ impl Builder {
 
     pub fn build(self) -> SourceSender {
         SourceSender {
-            default_output: self.default_output.expect("no default output"),
+            default_output: self.default_output,
             named_outputs: self.named_outputs,
         }
     }
@@ -163,7 +163,9 @@ impl Builder {
 
 #[derive(Debug, Clone)]
 pub struct SourceSender {
-    default_output: Output,
+    // The default output is optional because some sources, e.g. `datadog_agent`
+    // and `opentelemetry`, can be configured to only output to named outputs.
+    default_output: Option<Output>,
     named_outputs: HashMap<String, Output>,
 }
 
@@ -183,7 +185,7 @@ impl SourceSender {
             Output::new_with_buffer(n, DEFAULT_OUTPUT.to_owned(), lag_time, None, output_id);
         (
             Self {
-                default_output,
+                default_output: Some(default_output),
                 named_outputs: Default::default(),
             },
             rx,
@@ -265,11 +267,16 @@ impl SourceSender {
         recv
     }
 
+    /// Get a mutable reference to the default output, panicking if none exists.
+    fn default_output_mut(&mut self) -> &mut Output {
+        self.default_output.as_mut().expect("no default output")
+    }
+
     /// Send an event to the default output.
     ///
     /// This internally handles emitting [EventsSent] and [ComponentEventsDropped] events.
     pub async fn send_event(&mut self, event: impl Into<EventArray>) -> Result<(), ClosedError> {
-        self.default_output.send_event(event).await
+        self.default_output_mut().send_event(event).await
     }
 
     /// Send a stream of events to the default output.
@@ -280,7 +287,7 @@ impl SourceSender {
         S: Stream<Item = E> + Unpin,
         E: Into<Event> + ByteSizeOf,
     {
-        self.default_output.send_event_stream(events).await
+        self.default_output_mut().send_event_stream(events).await
     }
 
     /// Send a batch of events to the default output.
@@ -292,7 +299,7 @@ impl SourceSender {
         I: IntoIterator<Item = E>,
         <I as IntoIterator>::IntoIter: ExactSizeIterator,
     {
-        self.default_output.send_batch(events).await
+        self.default_output_mut().send_batch(events).await
     }
 
     /// Send a batch of events event to a named output.

From 4539b58964ab8bf23fb8f51a34718e233f7555db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ensar=20Saraj=C4=8Di=C4=87?= <dev@ensarsarajcic.com>
Date: Mon, 9 Jun 2025 20:47:04 +0000
Subject: [PATCH 041/305] fix(dnstap source): fix rcode 16 handling in
 dnsmsg-parser (#23106)

* fix(dnstap source): fix rcode 16 handling in dnsmsg-parser

Changes RCODE 16 description to BADVERS instead of BADSIG, since BADSIG is used for TSIG RR (which
is not parsed currently).

Related: https://www.iana.org/go/rfc6891
Related: https://www.iana.org/go/rfc8945
Closes: #22949

* Add changelog entry

* Allow BADVERS in spelling
---
 .github/actions/spelling/allow.txt                       | 1 +
 changelog.d/23106_rcode_16_dnsmsg_parser_handling.fix.md | 3 +++
 lib/dnsmsg-parser/src/dns_message_parser.rs              | 4 ++--
 lib/dnstap-parser/src/vrl_functions/parse_dnstap.rs      | 4 ++--
 website/cue/reference/components/sources/dnstap.cue      | 1 +
 website/cue/reference/remap/functions/parse_dnstap.cue   | 2 +-
 6 files changed, 10 insertions(+), 5 deletions(-)
 create mode 100644 changelog.d/23106_rcode_16_dnsmsg_parser_handling.fix.md

diff --git a/.github/actions/spelling/allow.txt b/.github/actions/spelling/allow.txt
index 36e53e7b8f9af..341a2ed509dae 100644
--- a/.github/actions/spelling/allow.txt
+++ b/.github/actions/spelling/allow.txt
@@ -50,6 +50,7 @@ Comcast
 Consolas
 Coolpad
 BADDCAFE
+BADVERS
 DEBHELPER
 Danew
 dkr
diff --git a/changelog.d/23106_rcode_16_dnsmsg_parser_handling.fix.md b/changelog.d/23106_rcode_16_dnsmsg_parser_handling.fix.md
new file mode 100644
index 0000000000000..59506f1fb6ff3
--- /dev/null
+++ b/changelog.d/23106_rcode_16_dnsmsg_parser_handling.fix.md
@@ -0,0 +1,3 @@
+Fixed description for RCODE 16 (it was BADSIG previously, but it should be BADVERS).
+
+authors: esensar Quad9DNS
diff --git a/lib/dnsmsg-parser/src/dns_message_parser.rs b/lib/dnsmsg-parser/src/dns_message_parser.rs
index fadb27109ae63..e80c380324fe1 100644
--- a/lib/dnsmsg-parser/src/dns_message_parser.rs
+++ b/lib/dnsmsg-parser/src/dns_message_parser.rs
@@ -945,8 +945,8 @@ fn parse_response_code(rcode: u16) -> Option<&'static str> {
         9 => Some("NotAuth"),  // 9    NotAuth    Server Not Authoritative for zone    [RFC2136]
         10 => Some("NotZone"), // 10   NotZone    Name not contained in zone           [RFC2136]
         // backwards compat for 4 bit ResponseCodes so far.
-        // 16    BADVERS    Bad OPT Version    [RFC6891]
-        16 => Some("BADSIG"), // 16    BADSIG    TSIG Signature Failure               [RFC2845]
+        16 => Some("BADVERS"), // 16    BADVERS    Bad OPT Version    [RFC6891]
+        // 16    BADSIG    TSIG Signature Failure               [RFC2845]
         17 => Some("BADKEY"), // 17    BADKEY    Key not recognized                   [RFC2845]
         18 => Some("BADTIME"), // 18    BADTIME   Signature out of time window         [RFC2845]
         19 => Some("BADMODE"), // 19    BADMODE   Bad TKEY Mode                        [RFC2930]
diff --git a/lib/dnstap-parser/src/vrl_functions/parse_dnstap.rs b/lib/dnstap-parser/src/vrl_functions/parse_dnstap.rs
index ee6c5d52bc8b8..3b397478d00b8 100644
--- a/lib/dnstap-parser/src/vrl_functions/parse_dnstap.rs
+++ b/lib/dnstap-parser/src/vrl_functions/parse_dnstap.rs
@@ -120,7 +120,7 @@ impl Function for ParseDnstap {
                                     "questionTypeId": 6
                                 }
                             ],
-                            "rcodeName": "BADSIG"
+                            "rcodeName": "BADVERS"
                         },
                         "responseAddress": "2001:502:7094::30",
                         "responsePort": 53,
@@ -295,7 +295,7 @@ mod tests {
                             questionTypeId: 6,
                         }
                         ],
-                        rcodeName: "BADSIG",
+                        rcodeName: "BADVERS",
                     },
                     responseAddress: "2001:502:7094::30",
                     responsePort: 53,
diff --git a/website/cue/reference/components/sources/dnstap.cue b/website/cue/reference/components/sources/dnstap.cue
index 19235f95e0678..836f37ad78667 100644
--- a/website/cue/reference/components/sources/dnstap.cue
+++ b/website/cue/reference/components/sources/dnstap.cue
@@ -658,6 +658,7 @@ components: sources: dnstap: {
 									NXRRSet:   "RR Set that should exist does not"
 									NotAuth:   "Server Not Authoritative for zone"
 									NotZone:   "Name not contained in zone"
+									BADVERS:   "Bad OPT Version"
 									BADSIG:    "TSIG Signature Failure"
 									BADKEY:    "Key not recognized"
 									BADTIME:   "Signature out of time window"
diff --git a/website/cue/reference/remap/functions/parse_dnstap.cue b/website/cue/reference/remap/functions/parse_dnstap.cue
index 55fc381adc767..de91822af17d7 100644
--- a/website/cue/reference/remap/functions/parse_dnstap.cue
+++ b/website/cue/reference/remap/functions/parse_dnstap.cue
@@ -123,7 +123,7 @@ remap: functions: parse_dnstap: {
 							"questionTypeId": 6
 						},
 					]
-					"rcodeName": "BADSIG"
+					"rcodeName": "BADVERS"
 				}
 				"responseAddress": "2001:502:7094::30"
 				"responsePort":    53

From 1bf3328af6c4f4d01a9830a34a7078906431ecff Mon Sep 17 00:00:00 2001
From: Pavlos Rontidis <pavlos.rontidis@gmail.com>
Date: Mon, 9 Jun 2025 17:54:25 -0400
Subject: [PATCH 042/305] chore(ci): add docker compose debug logs (if a test
 fails) (#23176)

* chore(e2e): output docker compose logs when in debug mode

* support long form vdev - read_only set to true now

* always output logs on failure

* more edits

* expand int
---
 scripts/e2e/datadog-logs/compose.yaml | 42 +++++++++++++++++++++------
 scripts/int-e2e-test.sh               | 17 +++++++++++
 vdev/src/testing/config.rs            | 25 ++++++++++++++--
 vdev/src/testing/integration.rs       | 19 +++++++-----
 4 files changed, 84 insertions(+), 19 deletions(-)

diff --git a/scripts/e2e/datadog-logs/compose.yaml b/scripts/e2e/datadog-logs/compose.yaml
index 61a9f8f2da1ae..ae004588f46f3 100644
--- a/scripts/e2e/datadog-logs/compose.yaml
+++ b/scripts/e2e/datadog-logs/compose.yaml
@@ -1,4 +1,4 @@
-version: '3'
+version: '3.8'
 
 services:
   # Generates random log data for consumption by the custom Agent check
@@ -17,7 +17,9 @@ services:
       - "-o"
       - "/var/log/a_custom.log"
     volumes:
-      - log_path:/var/log/
+      - type: volume
+        source: log_path
+        target: /var/log/
 
   # Tails a custom log created by `log_generator` and sends log data to
   # the `fakeintake-agent` service
@@ -33,11 +35,21 @@ services:
     - DD_CONTAINER_EXCLUDE="name:.*"
     volumes:
       # The Agent config file
-      - ../../../tests/data/e2e/datadog/logs/agent_only.yaml:/etc/datadog-agent/datadog.yaml
+      - type: bind
+        source: ../../../tests/data/e2e/datadog/logs/agent_only.yaml
+        target: /etc/datadog-agent/datadog.yaml
+        read_only: true
+
       # The custom logs check
-      - ../../../tests/data/e2e/datadog/logs/logs.conf.d:/conf.d:ro
+      - type: bind
+        source: ../../../tests/data/e2e/datadog/logs/logs.conf.d
+        target: /conf.d
+        read_only: true
+
       # The custom log to tail, created by the `log_generator` service
-      - log_path:/var/log/
+      - type: volume
+        source: log_path
+        target: /var/log/
 
   # Tails a custom log created by `log_generator` and sends log data to
   # the `vector` service
@@ -53,11 +65,21 @@ services:
     - DD_CONTAINER_EXCLUDE="name:.*"
     volumes:
       # The Agent config file
-      - ../../../tests/data/e2e/datadog/logs/agent_vector.yaml:/etc/datadog-agent/datadog.yaml
+      - type: bind
+        source: ../../../tests/data/e2e/datadog/logs/agent_vector.yaml
+        target: /etc/datadog-agent/datadog.yaml
+        read_only: true
+
       # The custom logs check
-      - ../../../tests/data/e2e/datadog/logs/logs.conf.d:/conf.d:ro
+      - type: bind
+        source: ../../../tests/data/e2e/datadog/logs/logs.conf.d
+        target: /conf.d
+        read_only: true
+
       # The custom log to tail, created by the `log_generator` service
-      - log_path:/var/log/
+      - type: volume
+        source: log_path
+        target: /var/log/
 
   # Receives log data from the `datadog-agent-vector` service and sends
   # to the `fakeintake-vector` service.
@@ -79,7 +101,9 @@ services:
       - "-c"
       - "/home/vector/tests/data/e2e/datadog/logs/vector.toml"
     volumes:
-      - ../../..:/home/vector
+      - type: bind
+        source: ../../..
+        target: /home/vector
 
   # Receives log data from the `datadog-agent` service. Is queried by the test runner
   # which does the validation of consistency with the other fakeintake service.
diff --git a/scripts/int-e2e-test.sh b/scripts/int-e2e-test.sh
index f795c352e3d8e..51f41999aec13 100755
--- a/scripts/int-e2e-test.sh
+++ b/scripts/int-e2e-test.sh
@@ -21,6 +21,23 @@ cargo vdev -v "${TEST_TYPE}" start -a "${TEST_NAME}"
 sleep 30
 cargo vdev -v "${TEST_TYPE}" test --retries 2 -a "${TEST_NAME}"
 RET=$?
+
+# Output docker compose logs on failure
+if [[ $RET -ne 0 ]]; then
+  SCRIPT_DIR=$(realpath "$(dirname "${BASH_SOURCE[0]}")")
+
+  case "$TEST_TYPE" in
+    int) TYPE_DIR="integration" ;;
+    e2e) TYPE_DIR="e2e" ;;
+    *) TYPE_DIR="" ;;
+  esac
+
+  if [[ -n "$TYPE_DIR" ]]; then
+    COMPOSE_DIR="${SCRIPT_DIR}/${TYPE_DIR}/${TEST_NAME}"
+    (cd "${COMPOSE_DIR}" && docker compose logs)
+  fi
+fi
+
 cargo vdev -v "${TEST_TYPE}" stop -a "${TEST_NAME}"
 
 # Only upload test results if CI is defined
diff --git a/vdev/src/testing/config.rs b/vdev/src/testing/config.rs
index 487da26a8489e..f8bfaf549000d 100644
--- a/vdev/src/testing/config.rs
+++ b/vdev/src/testing/config.rs
@@ -47,11 +47,32 @@ pub fn get_rust_version() -> String {
     }
 }
 
+#[derive(Debug, Deserialize, Serialize)]
+#[serde(untagged)]
+pub enum VolumeMount {
+    Short(String),
+    Long {
+        #[serde(default)]
+        r#type: Option<String>,
+        source: String,
+        target: String,
+        #[serde(default, skip_serializing_if = "Option::is_none")]
+        read_only: Option<bool>,
+    },
+}
+
+#[derive(Debug, Deserialize, Serialize)]
+#[serde(untagged)]
+pub enum VolumeDefinition {
+    Empty,
+    WithOptions(BTreeMap<String, Value>),
+}
+
 #[derive(Debug, Deserialize, Serialize)]
 pub struct ComposeConfig {
     pub services: BTreeMap<String, ComposeService>,
     #[serde(default, skip_serializing_if = "BTreeMap::is_empty")]
-    pub volumes: BTreeMap<String, Value>,
+    pub volumes: BTreeMap<String, VolumeDefinition>,
     #[serde(default)]
     pub networks: BTreeMap<String, BTreeMap<String, String>>,
 }
@@ -73,7 +94,7 @@ pub struct ComposeService {
     #[serde(default, skip_serializing_if = "Option::is_none")]
     pub env_file: Option<Vec<String>>,
     #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub volumes: Option<Vec<String>>,
+    pub volumes: Option<Vec<VolumeMount>>,
     #[serde(default, skip_serializing_if = "Option::is_none")]
     pub environment: Option<Vec<String>>,
     #[serde(default, skip_serializing_if = "Option::is_none")]
diff --git a/vdev/src/testing/integration.rs b/vdev/src/testing/integration.rs
index 15202bc6730dc..a2d55aca07c98 100644
--- a/vdev/src/testing/integration.rs
+++ b/vdev/src/testing/integration.rs
@@ -338,9 +338,9 @@ mod unix {
     use std::os::unix::fs::PermissionsExt as _;
     use std::path::{Path, PathBuf};
 
-    use anyhow::{Context, Result};
-
     use super::super::config::ComposeConfig;
+    use crate::testing::config::VolumeMount;
+    use anyhow::{Context, Result};
 
     /// Unix permissions mask to allow everybody to read a file
     const ALL_READ: u32 = 0o444;
@@ -350,14 +350,17 @@ mod unix {
     /// Fix up potential issues before starting a compose container
     pub fn prepare_compose_volumes(config: &ComposeConfig, test_dir: &Path) -> Result<()> {
         for service in config.services.values() {
-            // Make sure all volume files are world readable
             if let Some(volumes) = &service.volumes {
                 for volume in volumes {
-                    let source = volume
-                        .split_once(':')
-                        .expect("Invalid volume in compose file")
-                        .0;
-                    // Only fixup relative paths, i.e. within our source tree.
+                    let source = match volume {
+                        VolumeMount::Short(s) => {
+                            s.split_once(':').map(|(s, _)| s).ok_or_else(|| {
+                                anyhow::anyhow!("Invalid short volume mount format: {s}")
+                            })?
+                        }
+                        VolumeMount::Long { source, .. } => source,
+                    };
+
                     if !config.volumes.contains_key(source)
                         && !source.starts_with('/')
                         && !source.starts_with('$')

From 6c1922e2769c49b70db179f94e9969802e319ef8 Mon Sep 17 00:00:00 2001
From: Pavlos Rontidis <pavlos.rontidis@gmail.com>
Date: Tue, 10 Jun 2025 10:16:38 -0400
Subject: [PATCH 043/305] chore(deps): update Rust to 1.86 (#23175)

* chore(deps): update to rust 1.86

* cargo fmt

* one more fix
---
 lib/codecs/src/encoding/mod.rs                   |  4 ++--
 lib/vector-buffers/src/config.rs                 |  2 +-
 lib/vector-buffers/src/test/variant.rs           |  2 +-
 lib/vector-buffers/src/topology/builder.rs       |  2 +-
 .../src/topology/channel/receiver.rs             |  1 -
 .../src/topology/channel/sender.rs               |  2 +-
 .../src/variants/disk_v2/reader.rs               |  2 +-
 .../src/variants/disk_v2/writer.rs               | 10 +---------
 lib/vector-common/src/request_metadata.rs        |  2 +-
 lib/vector-core/src/event/discriminant.rs        |  2 +-
 lib/vector-core/src/event/metadata.rs            |  2 +-
 lib/vector-core/src/event/util/log/all_fields.rs |  4 ++--
 lib/vector-core/src/tls/settings.rs              |  2 +-
 lib/vector-stream/src/driver.rs                  |  2 +-
 lib/vector-tap/src/controller.rs                 |  2 +-
 rust-toolchain.toml                              |  2 +-
 src/api/schema/relay.rs                          |  2 +-
 src/async_read.rs                                |  2 +-
 src/codecs/ready_frames.rs                       |  2 +-
 src/components/validation/resources/event.rs     |  2 +-
 src/config/mod.rs                                |  2 +-
 src/sinks/aws_kinesis/firehose/record.rs         |  2 +-
 src/sinks/aws_kinesis/streams/record.rs          |  2 +-
 src/sinks/datadog/metrics/request_builder.rs     |  5 ++++-
 src/sinks/util/buffer/metrics/normalize.rs       |  2 +-
 src/sinks/util/buffer/mod.rs                     | 16 +++++++++-------
 src/sinks/util/retries.rs                        |  2 +-
 src/sinks/util/service.rs                        |  8 ++++----
 src/source_sender/mod.rs                         |  6 +++---
 src/sources/aws_kinesis_firehose/errors.rs       |  1 +
 src/sources/aws_kinesis_firehose/handlers.rs     | 11 ++++++-----
 src/sources/docker_logs/mod.rs                   |  4 ++--
 src/sources/opentelemetry/status.rs              |  1 +
 src/sources/socket/tcp.rs                        |  8 ++++----
 src/sources/socket/udp.rs                        |  2 +-
 src/sources/util/wrappers.rs                     |  2 +-
 src/template.rs                                  |  1 +
 src/topology/builder.rs                          |  4 ++--
 src/topology/task.rs                             |  1 +
 src/transforms/log_to_metric.rs                  |  2 +-
 src/transforms/remap.rs                          |  2 +-
 41 files changed, 68 insertions(+), 67 deletions(-)

diff --git a/lib/codecs/src/encoding/mod.rs b/lib/codecs/src/encoding/mod.rs
index 411f3f692515f..bd71a4f3c5e02 100644
--- a/lib/codecs/src/encoding/mod.rs
+++ b/lib/codecs/src/encoding/mod.rs
@@ -397,7 +397,7 @@ impl SerializerConfig {
             }
             SerializerConfig::Cef(config) => config.input_type(),
             SerializerConfig::Csv(config) => config.input_type(),
-            SerializerConfig::Gelf { .. } => GelfSerializerConfig::input_type(),
+            SerializerConfig::Gelf => GelfSerializerConfig::input_type(),
             SerializerConfig::Json(config) => config.input_type(),
             SerializerConfig::Logfmt => LogfmtSerializerConfig.input_type(),
             SerializerConfig::Native => NativeSerializerConfig.input_type(),
@@ -416,7 +416,7 @@ impl SerializerConfig {
             }
             SerializerConfig::Cef(config) => config.schema_requirement(),
             SerializerConfig::Csv(config) => config.schema_requirement(),
-            SerializerConfig::Gelf { .. } => GelfSerializerConfig::schema_requirement(),
+            SerializerConfig::Gelf => GelfSerializerConfig::schema_requirement(),
             SerializerConfig::Json(config) => config.schema_requirement(),
             SerializerConfig::Logfmt => LogfmtSerializerConfig.schema_requirement(),
             SerializerConfig::Native => NativeSerializerConfig.schema_requirement(),
diff --git a/lib/vector-buffers/src/config.rs b/lib/vector-buffers/src/config.rs
index 14826b6c204c0..9264685d4fa28 100644
--- a/lib/vector-buffers/src/config.rs
+++ b/lib/vector-buffers/src/config.rs
@@ -290,7 +290,7 @@ impl BufferType {
                 let data_dir = data_dir.ok_or(BufferBuildError::RequiresDataDir)?;
                 builder.stage(DiskV2Buffer::new(id, data_dir, max_size), when_full);
             }
-        };
+        }
 
         Ok(())
     }
diff --git a/lib/vector-buffers/src/test/variant.rs b/lib/vector-buffers/src/test/variant.rs
index a14995d86b436..0d58ce388d3d7 100644
--- a/lib/vector-buffers/src/test/variant.rs
+++ b/lib/vector-buffers/src/test/variant.rs
@@ -67,7 +67,7 @@ impl Variant {
                     *when_full,
                 );
             }
-        };
+        }
 
         let (sender, receiver) = builder
             .build(String::from("benches"), Span::none())
diff --git a/lib/vector-buffers/src/topology/builder.rs b/lib/vector-buffers/src/topology/builder.rs
index 51f52900eca2f..9f13b6d17a228 100644
--- a/lib/vector-buffers/src/topology/builder.rs
+++ b/lib/vector-buffers/src/topology/builder.rs
@@ -129,7 +129,7 @@ impl<T: Bufferable> TopologyBuilder<T> {
                         return Err(TopologyError::NextStageNotUsed { stage_idx });
                     }
                 }
-            };
+            }
 
             // Create the buffer usage handle for this stage and initialize it as we create the
             // sender/receiver.  This is slightly awkward since we just end up actually giving
diff --git a/lib/vector-buffers/src/topology/channel/receiver.rs b/lib/vector-buffers/src/topology/channel/receiver.rs
index d21aa1ed67e4f..4afacc3bb0dff 100644
--- a/lib/vector-buffers/src/topology/channel/receiver.rs
+++ b/lib/vector-buffers/src/topology/channel/receiver.rs
@@ -54,7 +54,6 @@ where
                             // If we've hit a recoverable error, we'll emit an event to indicate as much but we'll still
                             // keep trying to read the next available record.
                             emit(re);
-                            continue;
                         }
                         None => panic!("Reader encountered unrecoverable error: {e:?}"),
                     },
diff --git a/lib/vector-buffers/src/topology/channel/sender.rs b/lib/vector-buffers/src/topology/channel/sender.rs
index 15191ec02eead..7e4b09dad2753 100644
--- a/lib/vector-buffers/src/topology/channel/sender.rs
+++ b/lib/vector-buffers/src/topology/channel/sender.rs
@@ -221,7 +221,7 @@ impl<T: Bufferable> BufferSender<T> {
                         .await?;
                 }
             }
-        };
+        }
 
         if sent_to_base || was_dropped {
             if let (Some(send_duration), Some(send_reference)) =
diff --git a/lib/vector-buffers/src/variants/disk_v2/reader.rs b/lib/vector-buffers/src/variants/disk_v2/reader.rs
index 8aea89645ca64..a584af5d38d6f 100644
--- a/lib/vector-buffers/src/variants/disk_v2/reader.rs
+++ b/lib/vector-buffers/src/variants/disk_v2/reader.rs
@@ -1035,7 +1035,7 @@ where
 
                     return Err(e);
                 }
-            };
+            }
 
             // Fundamentally, when `try_read_record` returns `None`, there's three possible
             // scenarios:
diff --git a/lib/vector-buffers/src/variants/disk_v2/writer.rs b/lib/vector-buffers/src/variants/disk_v2/writer.rs
index fc8f60672e1af..173ccd1248b14 100644
--- a/lib/vector-buffers/src/variants/disk_v2/writer.rs
+++ b/lib/vector-buffers/src/variants/disk_v2/writer.rs
@@ -1161,12 +1161,7 @@ where
     /// If an error occurred while writing the record, an error variant will be returned describing
     /// the error.
     pub async fn try_write_record(&mut self, record: T) -> Result<Option<T>, WriterError<T>> {
-        self.try_write_record_inner(record)
-            .await
-            .map(|result| match result {
-                Ok(_) => None,
-                Err(record) => Some(record),
-            })
+        self.try_write_record_inner(record).await.map(Result::err)
     }
 
     #[instrument(skip_all, level = "debug")]
@@ -1219,8 +1214,6 @@ where
                             last_attempted_write_size = serialized_len,
                             "Current data file reached maximum size. Rolling to the next data file."
                         );
-
-                        continue;
                     }
                     e => return Err(e),
                 },
@@ -1294,7 +1287,6 @@ where
                 Err(old_record) => {
                     record = old_record;
                     self.ledger.wait_for_reader().await;
-                    continue;
                 }
             }
         }
diff --git a/lib/vector-common/src/request_metadata.rs b/lib/vector-common/src/request_metadata.rs
index 12a164d23e437..d38321a476e40 100644
--- a/lib/vector-common/src/request_metadata.rs
+++ b/lib/vector-common/src/request_metadata.rs
@@ -196,7 +196,7 @@ impl AddAssign for GroupedCountByteSize {
                 }
             }
             (Self::Untagged { .. }, Self::Tagged { .. }) => unreachable!(),
-        };
+        }
     }
 }
 
diff --git a/lib/vector-core/src/event/discriminant.rs b/lib/vector-core/src/event/discriminant.rs
index 20770506562db..08f7f913222ab 100644
--- a/lib/vector-core/src/event/discriminant.rs
+++ b/lib/vector-core/src/event/discriminant.rs
@@ -77,7 +77,7 @@ fn f64_eq(this: f64, other: f64) -> bool {
     }
     if this != other {
         return false;
-    };
+    }
     if (this.is_sign_positive() && other.is_sign_negative())
         || (this.is_sign_negative() && other.is_sign_positive())
     {
diff --git a/lib/vector-core/src/event/metadata.rs b/lib/vector-core/src/event/metadata.rs
index c1dd5790236bb..b7be59900503e 100644
--- a/lib/vector-core/src/event/metadata.rs
+++ b/lib/vector-core/src/event/metadata.rs
@@ -356,7 +356,7 @@ impl EventMetadata {
                 inner.source_event_id = Some(uuid2);
             }
             _ => {} // Keep the existing value.
-        };
+        }
     }
 
     /// Update the finalizer(s) status.
diff --git a/lib/vector-core/src/event/util/log/all_fields.rs b/lib/vector-core/src/event/util/log/all_fields.rs
index 10afadfede4cc..5194f05cb707d 100644
--- a/lib/vector-core/src/event/util/log/all_fields.rs
+++ b/lib/vector-core/src/event/util/log/all_fields.rs
@@ -144,7 +144,7 @@ impl<'a> FieldsIter<'a> {
                 None => break res.into(),
                 Some(PathComponent::Key(key)) => {
                     if self.quote_invalid_fields && !IS_VALID_PATH_SEGMENT.is_match(key) {
-                        res.push_str(&format!("\"{key}\""));
+                        write!(res, "\"{key}\"").expect("write to String never fails");
                     } else {
                         res.push_str(key);
                     }
@@ -191,7 +191,7 @@ impl<'a> Iterator for FieldsIter<'a> {
                     *visited = true;
                     break result;
                 }
-            };
+            }
         }
     }
 }
diff --git a/lib/vector-core/src/tls/settings.rs b/lib/vector-core/src/tls/settings.rs
index e0c84dc51308c..0fece816894a9 100644
--- a/lib/vector-core/src/tls/settings.rs
+++ b/lib/vector-core/src/tls/settings.rs
@@ -370,7 +370,7 @@ impl TlsConfig {
                     |der| X509::from_der(&der).map(|x509| vec![x509]),
                     |pem| {
                         pem.match_indices(PEM_START_MARKER)
-                            .map(|(start, _)| X509::from_pem(pem[start..].as_bytes()))
+                            .map(|(start, _)| X509::from_pem(&pem.as_bytes()[start..]))
                             .collect()
                     },
                 )
diff --git a/lib/vector-stream/src/driver.rs b/lib/vector-stream/src/driver.rs
index b142deba814f2..45ec1af74741a 100644
--- a/lib/vector-stream/src/driver.rs
+++ b/lib/vector-stream/src/driver.rs
@@ -226,7 +226,7 @@ where
                     finalizers.update_status(EventStatus::Rejected);
                 }
             }
-        };
+        }
         drop(finalizers); // suppress "argument not consumed" warning
     }
 
diff --git a/lib/vector-tap/src/controller.rs b/lib/vector-tap/src/controller.rs
index 656f77c108bc2..c07318d224507 100644
--- a/lib/vector-tap/src/controller.rs
+++ b/lib/vector-tap/src/controller.rs
@@ -26,7 +26,7 @@ type TapSender = tokio_mpsc::Sender<TapPayload>;
 type ShutdownTx = oneshot::Sender<()>;
 type ShutdownRx = oneshot::Receiver<()>;
 
-const TAP_BUFFER_SIZE: NonZeroUsize = unsafe { NonZeroUsize::new_unchecked(100) };
+const TAP_BUFFER_SIZE: NonZeroUsize = NonZeroUsize::new(100).unwrap();
 
 /// Clients can supply glob patterns to find matched topology components.
 trait GlobMatcher<T> {
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
index 5bedd373fc370..bd493b61329bf 100644
--- a/rust-toolchain.toml
+++ b/rust-toolchain.toml
@@ -1,3 +1,3 @@
 [toolchain]
-channel = "1.85"
+channel = "1.86"
 profile = "default"
diff --git a/src/api/schema/relay.rs b/src/api/schema/relay.rs
index 366a71723aafe..83f397a9d8f76 100644
--- a/src/api/schema/relay.rs
+++ b/src/api/schema/relay.rs
@@ -49,7 +49,7 @@ impl Base64Cursor {
         let cursor = String::from_utf8(bytes).map_err(|_| Base64CursorError::Invalid)?;
         let index = cursor
             .split(':')
-            .last()
+            .next_back()
             .map(|s| s.parse::<usize>())
             .ok_or(Base64CursorError::Invalid)?
             .map_err(|_| Base64CursorError::Invalid)?;
diff --git a/src/async_read.rs b/src/async_read.rs
index 00a3c53024684..6dc0f0f7d83dd 100644
--- a/src/async_read.rs
+++ b/src/async_read.rs
@@ -39,7 +39,7 @@ impl<S, F> AllowReadUntil<S, F> {
         &self.reader
     }
 
-    pub fn get_mut(&mut self) -> &mut S {
+    pub const fn get_mut(&mut self) -> &mut S {
         &mut self.reader
     }
 }
diff --git a/src/codecs/ready_frames.rs b/src/codecs/ready_frames.rs
index 4aed021b57e83..a707140b23001 100644
--- a/src/codecs/ready_frames.rs
+++ b/src/codecs/ready_frames.rs
@@ -52,7 +52,7 @@ where
     }
 
     /// Returns a mutable reference to the underlying stream.
-    pub fn get_mut(&mut self) -> &mut T {
+    pub const fn get_mut(&mut self) -> &mut T {
         &mut self.inner
     }
 
diff --git a/src/components/validation/resources/event.rs b/src/components/validation/resources/event.rs
index b7a6e102ea799..46ae48378ae1f 100644
--- a/src/components/validation/resources/event.rs
+++ b/src/components/validation/resources/event.rs
@@ -101,7 +101,7 @@ impl TestEvent {
         }
     }
 
-    pub fn get_event(&mut self) -> &mut Event {
+    pub const fn get_event(&mut self) -> &mut Event {
         match self {
             Self::Passthrough(event) => event,
             Self::FailWithAlternateEncoder(event) => event,
diff --git a/src/config/mod.rs b/src/config/mod.rs
index 8da0ce75c4255..8f3b247db57a0 100644
--- a/src/config/mod.rs
+++ b/src/config/mod.rs
@@ -265,7 +265,7 @@ impl HealthcheckOptions {
         }
     }
 
-    fn merge(&mut self, other: Self) {
+    const fn merge(&mut self, other: Self) {
         self.enabled &= other.enabled;
         self.require_healthy |= other.require_healthy;
     }
diff --git a/src/sinks/aws_kinesis/firehose/record.rs b/src/sinks/aws_kinesis/firehose/record.rs
index 24704aa3b50d5..5cd6c44fddc31 100644
--- a/src/sinks/aws_kinesis/firehose/record.rs
+++ b/src/sinks/aws_kinesis/firehose/record.rs
@@ -28,7 +28,7 @@ impl Record for KinesisFirehoseRecord {
     fn encoded_length(&self) -> usize {
         let data_len = self.record.data.as_ref().len();
         // data is simply base64 encoded, quoted, and comma separated
-        (data_len + 2) / 3 * 4 + 3
+        data_len.div_ceil(3) * 4 + 3
     }
 
     fn get(self) -> Self::T {
diff --git a/src/sinks/aws_kinesis/streams/record.rs b/src/sinks/aws_kinesis/streams/record.rs
index 16bf89515c277..ebd59fd81a890 100644
--- a/src/sinks/aws_kinesis/streams/record.rs
+++ b/src/sinks/aws_kinesis/streams/record.rs
@@ -38,7 +38,7 @@ impl Record for KinesisStreamRecord {
         let data_len = self.record.data.as_ref().len();
         let key_len = self.record.partition_key.len();
 
-        (data_len + 2) / 3 * 4 + hash_key_size + key_len + 10
+        data_len.div_ceil(3) * 4 + hash_key_size + key_len + 10
     }
 
     fn get(self) -> Self::T {
diff --git a/src/sinks/datadog/metrics/request_builder.rs b/src/sinks/datadog/metrics/request_builder.rs
index 794d8b5a58a2e..83b53b8d2b6ed 100644
--- a/src/sinks/datadog/metrics/request_builder.rs
+++ b/src/sinks/datadog/metrics/request_builder.rs
@@ -91,7 +91,10 @@ impl DatadogMetricsRequestBuilder {
         })
     }
 
-    fn get_encoder(&mut self, endpoint: DatadogMetricsEndpoint) -> &mut DatadogMetricsEncoder {
+    const fn get_encoder(
+        &mut self,
+        endpoint: DatadogMetricsEndpoint,
+    ) -> &mut DatadogMetricsEncoder {
         match endpoint {
             DatadogMetricsEndpoint::Series { .. } => &mut self.series_encoder,
             DatadogMetricsEndpoint::Sketches => &mut self.sketches_encoder,
diff --git a/src/sinks/util/buffer/metrics/normalize.rs b/src/sinks/util/buffer/metrics/normalize.rs
index 57b77413b7f41..edb63f5f8a4d7 100644
--- a/src/sinks/util/buffer/metrics/normalize.rs
+++ b/src/sinks/util/buffer/metrics/normalize.rs
@@ -47,7 +47,7 @@ pub struct MetricNormalizer<N> {
 
 impl<N> MetricNormalizer<N> {
     /// Gets a mutable reference to the current metric state for this normalizer.
-    pub fn get_state_mut(&mut self) -> &mut MetricSet {
+    pub const fn get_state_mut(&mut self) -> &mut MetricSet {
         &mut self.state
     }
 }
diff --git a/src/sinks/util/buffer/mod.rs b/src/sinks/util/buffer/mod.rs
index 25760b345388e..a5797e6eb14f9 100644
--- a/src/sinks/util/buffer/mod.rs
+++ b/src/sinks/util/buffer/mod.rs
@@ -198,10 +198,12 @@ mod test {
             batch_settings.timeout,
         );
 
-        let input = std::iter::repeat(BytesMut::from(
-            "It's going down, I'm yelling timber, You better move, you better dance",
-        ))
-        .take(100_000);
+        let input = std::iter::repeat_n(
+            BytesMut::from(
+                "It's going down, I'm yelling timber, You better move, you better dance",
+            ),
+            100_000,
+        );
 
         buffered
             .sink_map_err(drop)
@@ -228,10 +230,10 @@ mod test {
             decompressed
         });
 
-        assert!(decompressed.eq(std::iter::repeat(
-            b"It's going down, I'm yelling timber, You better move, you better dance".to_vec()
+        assert!(decompressed.eq(std::iter::repeat_n(
+            b"It's going down, I'm yelling timber, You better move, you better dance".to_vec(),
+            100_000
         )
-        .take(100_000)
         .flatten()));
     }
 }
diff --git a/src/sinks/util/retries.rs b/src/sinks/util/retries.rs
index e265be25a9089..32ac8fd251f2e 100644
--- a/src/sinks/util/retries.rs
+++ b/src/sinks/util/retries.rs
@@ -283,7 +283,7 @@ impl ExponentialBackoff {
     }
 
     /// Resents the exponential back-off strategy to its initial state.
-    pub fn reset(&mut self) {
+    pub const fn reset(&mut self) {
         self.current = self.base;
     }
 }
diff --git a/src/sinks/util/service.rs b/src/sinks/util/service.rs
index 283637b74b595..5960250034144 100644
--- a/src/sinks/util/service.rs
+++ b/src/sinks/util/service.rs
@@ -90,8 +90,8 @@ pub trait TowerRequestConfigDefaults {
     const RATE_LIMIT_DURATION_SECS: u64 = 1;
     const RATE_LIMIT_NUM: u64 = i64::MAX as u64; // i64 avoids TOML deserialize issue
     const RETRY_ATTEMPTS: usize = isize::MAX as usize; // isize avoids TOML deserialize issue
-    const RETRY_MAX_DURATION_SECS: NonZeroU64 = unsafe { NonZeroU64::new_unchecked(30) };
-    const RETRY_INITIAL_BACKOFF_SECS: NonZeroU64 = unsafe { NonZeroU64::new_unchecked(1) };
+    const RETRY_MAX_DURATION_SECS: NonZeroU64 = NonZeroU64::new(30).unwrap();
+    const RETRY_INITIAL_BACKOFF_SECS: NonZeroU64 = NonZeroU64::new(1).unwrap();
 }
 
 #[derive(Clone, Copy, Debug)]
@@ -474,8 +474,8 @@ mod tests {
         const RATE_LIMIT_DURATION_SECS: u64 = 2;
         const RATE_LIMIT_NUM: u64 = 3;
         const RETRY_ATTEMPTS: usize = 4;
-        const RETRY_MAX_DURATION_SECS: NonZeroU64 = unsafe { NonZeroU64::new_unchecked(5) };
-        const RETRY_INITIAL_BACKOFF_SECS: NonZeroU64 = unsafe { NonZeroU64::new_unchecked(6) };
+        const RETRY_MAX_DURATION_SECS: NonZeroU64 = NonZeroU64::new(5).unwrap();
+        const RETRY_INITIAL_BACKOFF_SECS: NonZeroU64 = NonZeroU64::new(6).unwrap();
     }
 
     #[test]
diff --git a/src/source_sender/mod.rs b/src/source_sender/mod.rs
index 719d55968385b..243eb7ad8ecf7 100644
--- a/src/source_sender/mod.rs
+++ b/src/source_sender/mod.rs
@@ -268,7 +268,7 @@ impl SourceSender {
     }
 
     /// Get a mutable reference to the default output, panicking if none exists.
-    fn default_output_mut(&mut self) -> &mut Output {
+    const fn default_output_mut(&mut self) -> &mut Output {
         self.default_output.as_mut().expect("no default output")
     }
 
@@ -339,11 +339,11 @@ impl UnsentEventCount {
         }
     }
 
-    fn decr(&mut self, count: usize) {
+    const fn decr(&mut self, count: usize) {
         self.count = self.count.saturating_sub(count);
     }
 
-    fn discard(&mut self) {
+    const fn discard(&mut self) {
         self.count = 0;
     }
 }
diff --git a/src/sources/aws_kinesis_firehose/errors.rs b/src/sources/aws_kinesis_firehose/errors.rs
index fb96487d33801..0aaa518244414 100644
--- a/src/sources/aws_kinesis_firehose/errors.rs
+++ b/src/sources/aws_kinesis_firehose/errors.rs
@@ -76,6 +76,7 @@ impl RequestError {
         }
     }
 
+    #[allow(clippy::missing_const_for_fn)] // Adding `const` results in https://doc.rust-lang.org/error_codes/E0015.html
     pub fn request_id(&self) -> Option<&str> {
         use RequestError::*;
         match *self {
diff --git a/src/sources/aws_kinesis_firehose/handlers.rs b/src/sources/aws_kinesis_firehose/handlers.rs
index cd424d97a336a..4ad8ddf50121b 100644
--- a/src/sources/aws_kinesis_firehose/handlers.rs
+++ b/src/sources/aws_kinesis_firehose/handlers.rs
@@ -78,13 +78,14 @@ pub(super) async fn firehose(
                         events.estimated_json_encoded_size_of(),
                     ));
 
-                    let (batch, receiver) = context
-                        .acknowledgements
-                        .then(|| {
+                    let (batch, receiver) = if context.acknowledgements {
+                        {
                             let (batch, receiver) = BatchNotifier::new_with_receiver();
                             (Some(batch), Some(receiver))
-                        })
-                        .unwrap_or((None, None));
+                        }
+                    } else {
+                        (None, None)
+                    };
 
                     let now = Utc::now();
                     for event in &mut events {
diff --git a/src/sources/docker_logs/mod.rs b/src/sources/docker_logs/mod.rs
index 634cf45a1d936..4920c72bfe1af 100644
--- a/src/sources/docker_logs/mod.rs
+++ b/src/sources/docker_logs/mod.rs
@@ -904,12 +904,12 @@ impl ContainerState {
         }
     }
 
-    fn running(&mut self) {
+    const fn running(&mut self) {
         self.running = true;
         self.generation += 1;
     }
 
-    fn stopped(&mut self) {
+    const fn stopped(&mut self) {
         self.running = false;
     }
 
diff --git a/src/sources/opentelemetry/status.rs b/src/sources/opentelemetry/status.rs
index 7aa6fddae8e0d..e7d9c038896d5 100644
--- a/src/sources/opentelemetry/status.rs
+++ b/src/sources/opentelemetry/status.rs
@@ -1,3 +1,4 @@
+#![allow(clippy::doc_overindented_list_items)] // The generated code has this minor issue.
 include!(concat!(env!("OUT_DIR"), "/google.rpc.rs"));
 
 impl warp::reject::Reject for Status {}
diff --git a/src/sources/socket/tcp.rs b/src/sources/socket/tcp.rs
index 1aea8b0332d48..98b10dbf2105e 100644
--- a/src/sources/socket/tcp.rs
+++ b/src/sources/socket/tcp.rs
@@ -158,12 +158,12 @@ impl TcpConfig {
         self.max_connection_duration_secs
     }
 
-    pub fn set_max_connection_duration_secs(&mut self, val: Option<u64>) -> &mut Self {
+    pub const fn set_max_connection_duration_secs(&mut self, val: Option<u64>) -> &mut Self {
         self.max_connection_duration_secs = val;
         self
     }
 
-    pub fn set_shutdown_timeout_secs(&mut self, val: u64) -> &mut Self {
+    pub const fn set_shutdown_timeout_secs(&mut self, val: u64) -> &mut Self {
         self.shutdown_timeout_secs = Duration::from_secs(val);
         self
     }
@@ -173,7 +173,7 @@ impl TcpConfig {
         self
     }
 
-    pub fn set_framing(&mut self, val: Option<FramingConfig>) -> &mut Self {
+    pub const fn set_framing(&mut self, val: Option<FramingConfig>) -> &mut Self {
         self.framing = val;
         self
     }
@@ -183,7 +183,7 @@ impl TcpConfig {
         self
     }
 
-    pub fn set_log_namespace(&mut self, val: Option<bool>) -> &mut Self {
+    pub const fn set_log_namespace(&mut self, val: Option<bool>) -> &mut Self {
         self.log_namespace = val;
         self
     }
diff --git a/src/sources/socket/udp.rs b/src/sources/socket/udp.rs
index a1b39c2fbcd33..a5d57207ea0a0 100644
--- a/src/sources/socket/udp.rs
+++ b/src/sources/socket/udp.rs
@@ -128,7 +128,7 @@ impl UdpConfig {
         }
     }
 
-    pub fn set_log_namespace(&mut self, val: Option<bool>) -> &mut Self {
+    pub const fn set_log_namespace(&mut self, val: Option<bool>) -> &mut Self {
         self.log_namespace = val;
         self
     }
diff --git a/src/sources/util/wrappers.rs b/src/sources/util/wrappers.rs
index aab0a650293d8..848ecac9c4c8e 100644
--- a/src/sources/util/wrappers.rs
+++ b/src/sources/util/wrappers.rs
@@ -39,7 +39,7 @@ impl<T, F> AfterRead<T, F> {
     }
 
     #[cfg(all(unix, feature = "sources-utils-net-unix"))]
-    pub fn get_mut_ref(&mut self) -> &mut T {
+    pub const fn get_mut_ref(&mut self) -> &mut T {
         &mut self.inner
     }
 }
diff --git a/src/template.rs b/src/template.rs
index ec989f1968159..dab20876a1ac7 100644
--- a/src/template.rs
+++ b/src/template.rs
@@ -228,6 +228,7 @@ impl Template {
         (!parts.is_empty()).then_some(parts)
     }
 
+    #[allow(clippy::missing_const_for_fn)] // Adding `const` results in https://doc.rust-lang.org/error_codes/E0015.html
     /// Returns a reference to the template string.
     pub fn get_ref(&self) -> &str {
         &self.src
diff --git a/src/topology/builder.rs b/src/topology/builder.rs
index 00252622a4742..847c0614ba697 100644
--- a/src/topology/builder.rs
+++ b/src/topology/builder.rs
@@ -61,8 +61,8 @@ static ENRICHMENT_TABLES: LazyLock<vector_lib::enrichment::TableRegistry> =
 pub(crate) static SOURCE_SENDER_BUFFER_SIZE: LazyLock<usize> =
     LazyLock::new(|| *TRANSFORM_CONCURRENCY_LIMIT * CHUNK_SIZE);
 
-const READY_ARRAY_CAPACITY: NonZeroUsize = unsafe { NonZeroUsize::new_unchecked(CHUNK_SIZE * 4) };
-pub(crate) const TOPOLOGY_BUFFER_SIZE: NonZeroUsize = unsafe { NonZeroUsize::new_unchecked(100) };
+const READY_ARRAY_CAPACITY: NonZeroUsize = NonZeroUsize::new(CHUNK_SIZE * 4).unwrap();
+pub(crate) const TOPOLOGY_BUFFER_SIZE: NonZeroUsize = NonZeroUsize::new(100).unwrap();
 
 static TRANSFORM_CONCURRENCY_LIMIT: LazyLock<usize> = LazyLock::new(|| {
     crate::app::worker_threads()
diff --git a/src/topology/task.rs b/src/topology/task.rs
index afdbaf9da165b..2db88e1f48fbe 100644
--- a/src/topology/task.rs
+++ b/src/topology/task.rs
@@ -79,6 +79,7 @@ impl Task {
         self.key.id()
     }
 
+    #[allow(clippy::missing_const_for_fn)] // Adding `const` results in https://doc.rust-lang.org/error_codes/E0015.html
     pub fn typetag(&self) -> &str {
         &self.typetag
     }
diff --git a/src/transforms/log_to_metric.rs b/src/transforms/log_to_metric.rs
index 48cfbecfeb501..65eabd9300183 100644
--- a/src/transforms/log_to_metric.rs
+++ b/src/transforms/log_to_metric.rs
@@ -887,7 +887,7 @@ impl FunctionTransform for LogToMetric {
                                 kind: &kind.to_string(),
                             })
                         }
-                        TransformError::MetricDetailsNotFound {} => {
+                        TransformError::MetricDetailsNotFound => {
                             emit!(MetricMetadataMetricDetailsNotFoundError {})
                         }
                         _ => {}
diff --git a/src/transforms/remap.rs b/src/transforms/remap.rs
index 9f92a9a61b26b..0f1d24c1aa007 100644
--- a/src/transforms/remap.rs
+++ b/src/transforms/remap.rs
@@ -493,7 +493,7 @@ where
             .notes()
             .iter()
             .filter(|note| matches!(note, Note::UserErrorMessage(_)))
-            .last()
+            .next_back()
             .map(|note| note.to_string())
             .unwrap_or_else(|| error.to_string());
         serde_json::json!({

From ab886d8e1b1f22ffae76ebc999c9494971ec0780 Mon Sep 17 00:00:00 2001
From: Pavlos Rontidis <pavlos.rontidis@gmail.com>
Date: Tue, 10 Jun 2025 11:56:11 -0400
Subject: [PATCH 044/305] fix(ci): update cargo-deny version to support 2024
 edition (#23178)

---
 aqua/aqua.yaml                 | 2 +-
 scripts/environment/prepare.sh | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/aqua/aqua.yaml b/aqua/aqua.yaml
index e72564f079e00..7a1d785e753bc 100644
--- a/aqua/aqua.yaml
+++ b/aqua/aqua.yaml
@@ -9,6 +9,6 @@ packages:
   - name: crates.io/cargo-deb@2.9.1
   - name: cross-rs/cross@v0.2.5
   - name: nextest-rs/nextest/cargo-nextest@cargo-nextest-0.9.47
-  - name: EmbarkStudios/cargo-deny@0.16.1
+  - name: EmbarkStudios/cargo-deny@0.16.2
   - name: foresterre/cargo-msrv@v0.15.1
   - name: crates.io/dd-rust-license-tool@1.0.1
diff --git a/scripts/environment/prepare.sh b/scripts/environment/prepare.sh
index a42daaf8c427d..fef332b218011 100755
--- a/scripts/environment/prepare.sh
+++ b/scripts/environment/prepare.sh
@@ -14,8 +14,8 @@ fi
 if [[ "$(cargo-nextest --version)" != "cargo-nextest 0.9.95" ]] ; then
   rustup run stable cargo install cargo-nextest --version 0.9.95 --force --locked
 fi
-if [[ "$(cargo-deny --version)" != "cargo-deny 0.16.1" ]] ; then
-  rustup run stable cargo install cargo-deny --version 0.16.1 --force --locked
+if [[ "$(cargo-deny --version)" != "cargo-deny 0.16.2" ]] ; then
+  rustup run stable cargo install cargo-deny --version 0.16.2 --force --locked
 fi
 if ! dd-rust-license-tool --help >& /dev/null ; then
   rustup run stable cargo install dd-rust-license-tool --version 1.0.2 --force --locked

From 0191c3af087c1eb00094c7076452d27f19c92e50 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 10 Jun 2025 18:44:51 +0000
Subject: [PATCH 045/305] chore(deps): Bump ring from 0.17.12 to 0.17.14 in the
 cargo group (#23020)

* chore(deps): Bump ring from 0.17.12 to 0.17.14 in the cargo group

Bumps the cargo group with 1 update: [ring](https://github.com/briansmith/ring).


Updates `ring` from 0.17.12 to 0.17.14
- [Changelog](https://github.com/briansmith/ring/blob/main/RELEASES.md)
- [Commits](https://github.com/briansmith/ring/commits)

---
updated-dependencies:
- dependency-name: ring
  dependency-version: 0.17.14
  dependency-type: indirect
  dependency-group: cargo
...

Signed-off-by: dependabot[bot] <support@github.com>

* update licenses

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Pavlos Rontidis <pavlos.rontidis@gmail.com>
---
 Cargo.lock           | 4 ++--
 LICENSE-3rdparty.csv | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index eb0faad3c3dff..4b59a190e6b44 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -8608,9 +8608,9 @@ dependencies = [
 
 [[package]]
 name = "ring"
-version = "0.17.12"
+version = "0.17.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed9b823fa29b721a59671b41d6b06e66b29e0628e207e8b1c3ceeda701ec928d"
+checksum = "a4689e6c2294d81e88dc6261c768b63bc4fcdb852be6d1352498b114f61383b7"
 dependencies = [
  "cc",
  "cfg-if",
diff --git a/LICENSE-3rdparty.csv b/LICENSE-3rdparty.csv
index dbe0a174c9ec3..67538f6f1ded5 100644
--- a/LICENSE-3rdparty.csv
+++ b/LICENSE-3rdparty.csv
@@ -531,7 +531,7 @@ rend,https://github.com/djkoloski/rend,MIT,David Koloski <djkoloski@gmail.com>
 reqwest,https://github.com/seanmonstar/reqwest,MIT OR Apache-2.0,Sean McArthur <sean@seanmonstar.com>
 resolv-conf,http://github.com/tailhook/resolv-conf,MIT OR Apache-2.0,paul@colomiets.name
 rfc6979,https://github.com/RustCrypto/signatures/tree/master/rfc6979,Apache-2.0 OR MIT,RustCrypto Developers
-ring,https://github.com/ctz/ring,Apache-2.0 AND ISC,The ring Authors
+ring,https://github.com/briansmith/ring,Apache-2.0 AND ISC,The ring Authors
 rkyv,https://github.com/rkyv/rkyv,MIT,David Koloski <djkoloski@gmail.com>
 rle-decode-fast,https://github.com/WanzenBug/rle-decode-helper,MIT OR Apache-2.0,Moritz Wanzenböck <moritz@wanzenbug.xyz>
 rmp,https://github.com/3Hren/msgpack-rust,MIT,Evgeny Safronov <division494@gmail.com>

From f84dbbc915b525d4ba54257bbf40de209468b2f6 Mon Sep 17 00:00:00 2001
From: Burkov Egor <eburkov@rvision.ru>
Date: Tue, 10 Jun 2025 21:59:56 +0300
Subject: [PATCH 046/305] fix(parsing): Timestamp error handling in dnstap
 parser (#23072)

* fix(parsing): Timestamp error handling in dnstap parser

* Remove redundant check for time_sec

* Change ok_or_else to ok_or

* fix changelog name

---------

Co-authored-by: Pavlos Rontidis <pavlos.rontidis@gmail.com>
---
 changelog.d/dnstap_better_errors_timestamp.fix.md |  3 +++
 lib/dnstap-parser/src/parser.rs                   | 11 ++++++-----
 2 files changed, 9 insertions(+), 5 deletions(-)
 create mode 100644 changelog.d/dnstap_better_errors_timestamp.fix.md

diff --git a/changelog.d/dnstap_better_errors_timestamp.fix.md b/changelog.d/dnstap_better_errors_timestamp.fix.md
new file mode 100644
index 0000000000000..a970b91d6127c
--- /dev/null
+++ b/changelog.d/dnstap_better_errors_timestamp.fix.md
@@ -0,0 +1,3 @@
+Fix problem with parsing timestamp that could lead into panic in `dnstap-parser::DnstapParser::parse_dnstap_message_time`.
+
+authors: wooffie
diff --git a/lib/dnstap-parser/src/parser.rs b/lib/dnstap-parser/src/parser.rs
index 14443ef581e76..80f6068525585 100644
--- a/lib/dnstap-parser/src/parser.rs
+++ b/lib/dnstap-parser/src/parser.rs
@@ -393,11 +393,10 @@ impl DnstapParser {
 
         if type_ids.contains(&dnstap_message_type_id) {
             DnstapParser::log_time(event, prefix.clone(), time_in_nanosec, "ns");
-
             let timestamp = Utc
                 .timestamp_opt(time_sec.try_into().unwrap(), query_time_nsec)
                 .single()
-                .expect("invalid timestamp");
+                .ok_or("Invalid timestamp")?;
             if let Some(timestamp_key) = log_schema().timestamp_key() {
                 DnstapParser::insert(event, prefix.clone(), timestamp_key, timestamp);
             }
@@ -1358,9 +1357,9 @@ mod tests {
         fn test_one_timestamp_parse(time_sec: u64, time_nsec: Option<u32>) -> Result<()> {
             let mut event = LogEvent::default();
             let root = owned_value_path!();
-            let type_ids = HashSet::new();
+            let type_ids = HashSet::from([1]);
             DnstapParser::parse_dnstap_message_time(
-                &mut event, &root, time_sec, time_nsec, 0, None, &type_ids,
+                &mut event, &root, time_sec, time_nsec, 1, None, &type_ids,
             )
         }
         // okay case
@@ -1374,7 +1373,9 @@ mod tests {
         // overflow in add
         assert!(
             test_one_timestamp_parse((i64::MAX / 1_000_000_000) as u64, Some(u32::MAX)).is_err()
-        )
+        );
+        // cannot be parsed by timestamp_opt
+        assert!(test_one_timestamp_parse(96, Some(1616928816)).is_err());
     }
 
     #[test]

From d1da30726228589ec8f84e38052feb60e67afdc7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 10 Jun 2025 15:18:08 -0400
Subject: [PATCH 047/305] chore(deps): Bump the patches group across 1
 directory with 27 updates (#23179)

* chore(deps): Bump the patches group across 1 directory with 27 updates

Bumps the patches group with 27 updates in the / directory:

| Package | From | To |
| --- | --- | --- |
| [cfg-if](https://github.com/rust-lang/cfg-if) | `1.0.0` | `1.0.1` |
| [clap](https://github.com/clap-rs/clap) | `4.5.37` | `4.5.40` |
| [aws-runtime](https://github.com/smithy-lang/smithy-rs) | `1.5.6` | `1.5.7` |
| [aws-sigv4](https://github.com/smithy-lang/smithy-rs) | `1.3.1` | `1.3.2` |
| [opendal](https://github.com/apache/opendal) | `0.53.1` | `0.53.3` |
| [async-graphql](https://github.com/async-graphql/async-graphql) | `7.0.16` | `7.0.17` |
| [async-graphql-warp](https://github.com/async-graphql/async-graphql) | `7.0.16` | `7.0.17` |
| [async-compression](https://github.com/Nullus157/async-compression) | `0.4.23` | `0.4.24` |
| [flate2](https://github.com/rust-lang/flate2-rs) | `1.1.1` | `1.1.2` |
| [h2](https://github.com/hyperium/h2) | `0.4.9` | `0.4.10` |
| [hash_hasher](https://github.com/Fraser999/Hash-Hasher) | `2.0.3` | `2.0.4` |
| [openssl](https://github.com/sfackler/rust-openssl) | `0.10.72` | `0.10.73` |
| [smallvec](https://github.com/servo/rust-smallvec) | `1.15.0` | `1.15.1` |
| [socket2](https://github.com/rust-lang/socket2) | `0.5.9` | `0.5.10` |
| [sqlx](https://github.com/launchbadge/sqlx) | `0.8.5` | `0.8.6` |
| [toml](https://github.com/toml-rs/toml) | `0.8.22` | `0.8.23` |
| [hickory-proto](https://github.com/hickory-dns/hickory-dns) | `0.25.1` | `0.25.2` |
| [mlua](https://github.com/mlua-rs/mlua) | `0.10.3` | `0.10.5` |
| [temp-dir](https://gitlab.com/leonhard-llc/ops) | `0.1.14` | `0.1.16` |
| [syn](https://github.com/dtolnay/syn) | `2.0.101` | `2.0.102` |
| [enumflags2](https://github.com/meithecatte/enumflags2) | `0.7.11` | `0.7.12` |
| [parking_lot](https://github.com/Amanieu/parking_lot) | `0.12.3` | `0.12.4` |
| [quanta](https://github.com/metrics-rs/quanta) | `0.12.5` | `0.12.6` |
| [twox-hash](https://github.com/shepmaster/twox-hash) | `2.1.0` | `2.1.1` |
| [clap-verbosity-flag](https://github.com/clap-rs/clap-verbosity-flag) | `3.0.2` | `3.0.3` |
| [clap_complete](https://github.com/clap-rs/clap) | `4.5.48` | `4.5.54` |
| [owo-colors](https://github.com/owo-colors/owo-colors) | `4.2.0` | `4.2.1` |



Updates `cfg-if` from 1.0.0 to 1.0.1
- [Release notes](https://github.com/rust-lang/cfg-if/releases)
- [Changelog](https://github.com/rust-lang/cfg-if/blob/main/CHANGELOG.md)
- [Commits](https://github.com/rust-lang/cfg-if/compare/1.0.0...v1.0.1)

Updates `clap` from 4.5.37 to 4.5.40
- [Release notes](https://github.com/clap-rs/clap/releases)
- [Changelog](https://github.com/clap-rs/clap/blob/master/CHANGELOG.md)
- [Commits](https://github.com/clap-rs/clap/compare/clap_complete-v4.5.37...clap_complete-v4.5.40)

Updates `aws-runtime` from 1.5.6 to 1.5.7
- [Release notes](https://github.com/smithy-lang/smithy-rs/releases)
- [Changelog](https://github.com/smithy-lang/smithy-rs/blob/main/CHANGELOG.md)
- [Commits](https://github.com/smithy-lang/smithy-rs/commits)

Updates `aws-sigv4` from 1.3.1 to 1.3.2
- [Release notes](https://github.com/smithy-lang/smithy-rs/releases)
- [Changelog](https://github.com/smithy-lang/smithy-rs/blob/main/CHANGELOG.md)
- [Commits](https://github.com/smithy-lang/smithy-rs/commits)

Updates `opendal` from 0.53.1 to 0.53.3
- [Release notes](https://github.com/apache/opendal/releases)
- [Changelog](https://github.com/apache/opendal/blob/main/CHANGELOG.md)
- [Commits](https://github.com/apache/opendal/compare/v0.53.1...v0.53.3)

Updates `async-graphql` from 7.0.16 to 7.0.17
- [Changelog](https://github.com/async-graphql/async-graphql/blob/master/CHANGELOG.md)
- [Commits](https://github.com/async-graphql/async-graphql/commits)

Updates `async-graphql-warp` from 7.0.16 to 7.0.17
- [Changelog](https://github.com/async-graphql/async-graphql/blob/master/CHANGELOG.md)
- [Commits](https://github.com/async-graphql/async-graphql/commits)

Updates `async-compression` from 0.4.23 to 0.4.24
- [Release notes](https://github.com/Nullus157/async-compression/releases)
- [Changelog](https://github.com/Nullus157/async-compression/blob/main/CHANGELOG.md)
- [Commits](https://github.com/Nullus157/async-compression/compare/v0.4.23...v0.4.24)

Updates `flate2` from 1.1.1 to 1.1.2
- [Release notes](https://github.com/rust-lang/flate2-rs/releases)
- [Commits](https://github.com/rust-lang/flate2-rs/compare/1.1.1...1.1.2)

Updates `h2` from 0.4.9 to 0.4.10
- [Release notes](https://github.com/hyperium/h2/releases)
- [Changelog](https://github.com/hyperium/h2/blob/master/CHANGELOG.md)
- [Commits](https://github.com/hyperium/h2/compare/v0.4.9...v0.4.10)

Updates `hash_hasher` from 2.0.3 to 2.0.4
- [Commits](https://github.com/Fraser999/Hash-Hasher/commits)

Updates `openssl` from 0.10.72 to 0.10.73
- [Release notes](https://github.com/sfackler/rust-openssl/releases)
- [Commits](https://github.com/sfackler/rust-openssl/compare/openssl-v0.10.72...openssl-v0.10.73)

Updates `smallvec` from 1.15.0 to 1.15.1
- [Release notes](https://github.com/servo/rust-smallvec/releases)
- [Commits](https://github.com/servo/rust-smallvec/compare/v1.15.0...v1.15.1)

Updates `socket2` from 0.5.9 to 0.5.10
- [Release notes](https://github.com/rust-lang/socket2/releases)
- [Changelog](https://github.com/rust-lang/socket2/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rust-lang/socket2/commits)

Updates `sqlx` from 0.8.5 to 0.8.6
- [Changelog](https://github.com/launchbadge/sqlx/blob/main/CHANGELOG.md)
- [Commits](https://github.com/launchbadge/sqlx/compare/v0.8.5...v0.8.6)

Updates `toml` from 0.8.22 to 0.8.23
- [Commits](https://github.com/toml-rs/toml/compare/toml-v0.8.22...toml-v0.8.23)

Updates `hickory-proto` from 0.25.1 to 0.25.2
- [Release notes](https://github.com/hickory-dns/hickory-dns/releases)
- [Changelog](https://github.com/hickory-dns/hickory-dns/blob/main/OLD-CHANGELOG.md)
- [Commits](https://github.com/hickory-dns/hickory-dns/compare/v0.25.1...v0.25.2)

Updates `mlua` from 0.10.3 to 0.10.5
- [Release notes](https://github.com/mlua-rs/mlua/releases)
- [Changelog](https://github.com/mlua-rs/mlua/blob/v0.10.5/CHANGELOG.md)
- [Commits](https://github.com/mlua-rs/mlua/compare/v0.10.3...v0.10.5)

Updates `temp-dir` from 0.1.14 to 0.1.16
- [Commits](https://gitlab.com/leonhard-llc/ops/compare/temp-dir-v0.1.14...temp-dir-v0.1.16)

Updates `syn` from 2.0.101 to 2.0.102
- [Release notes](https://github.com/dtolnay/syn/releases)
- [Commits](https://github.com/dtolnay/syn/compare/2.0.101...2.0.102)

Updates `enumflags2` from 0.7.11 to 0.7.12
- [Release notes](https://github.com/meithecatte/enumflags2/releases)
- [Commits](https://github.com/meithecatte/enumflags2/compare/v0.7.11...v0.7.12)

Updates `parking_lot` from 0.12.3 to 0.12.4
- [Release notes](https://github.com/Amanieu/parking_lot/releases)
- [Changelog](https://github.com/Amanieu/parking_lot/blob/master/CHANGELOG.md)
- [Commits](https://github.com/Amanieu/parking_lot/compare/0.12.3...parking_lot-v0.12.4)

Updates `quanta` from 0.12.5 to 0.12.6
- [Changelog](https://github.com/metrics-rs/quanta/blob/main/CHANGELOG.md)
- [Commits](https://github.com/metrics-rs/quanta/compare/v0.12.5...v0.12.6)

Updates `twox-hash` from 2.1.0 to 2.1.1
- [Changelog](https://github.com/shepmaster/twox-hash/blob/main/CHANGELOG.md)
- [Commits](https://github.com/shepmaster/twox-hash/compare/v2.1.0...v2.1.1)

Updates `clap-verbosity-flag` from 3.0.2 to 3.0.3
- [Changelog](https://github.com/clap-rs/clap-verbosity-flag/blob/master/CHANGELOG.md)
- [Commits](https://github.com/clap-rs/clap-verbosity-flag/compare/v3.0.2...v3.0.3)

Updates `clap_complete` from 4.5.48 to 4.5.54
- [Release notes](https://github.com/clap-rs/clap/releases)
- [Changelog](https://github.com/clap-rs/clap/blob/master/CHANGELOG.md)
- [Commits](https://github.com/clap-rs/clap/compare/clap_complete-v4.5.48...clap_complete-v4.5.54)

Updates `owo-colors` from 4.2.0 to 4.2.1
- [Release notes](https://github.com/owo-colors/owo-colors/releases)
- [Changelog](https://github.com/owo-colors/owo-colors/blob/main/CHANGELOG.md)
- [Commits](https://github.com/owo-colors/owo-colors/compare/v4.2.0...v4.2.1)

---
updated-dependencies:
- dependency-name: cfg-if
  dependency-version: 1.0.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: patches
- dependency-name: clap
  dependency-version: 4.5.40
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: patches
- dependency-name: aws-runtime
  dependency-version: 1.5.7
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: patches
- dependency-name: aws-sigv4
  dependency-version: 1.3.2
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: patches
- dependency-name: opendal
  dependency-version: 0.53.3
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: patches
- dependency-name: async-graphql
  dependency-version: 7.0.17
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: patches
- dependency-name: async-graphql-warp
  dependency-version: 7.0.17
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: patches
- dependency-name: async-compression
  dependency-version: 0.4.24
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: patches
- dependency-name: flate2
  dependency-version: 1.1.2
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: patches
- dependency-name: h2
  dependency-version: 0.4.10
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: patches
- dependency-name: hash_hasher
  dependency-version: 2.0.4
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: patches
- dependency-name: openssl
  dependency-version: 0.10.73
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: patches
- dependency-name: smallvec
  dependency-version: 1.15.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: patches
- dependency-name: socket2
  dependency-version: 0.5.10
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: patches
- dependency-name: sqlx
  dependency-version: 0.8.6
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: patches
- dependency-name: toml
  dependency-version: 0.8.23
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: patches
- dependency-name: hickory-proto
  dependency-version: 0.25.2
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: patches
- dependency-name: mlua
  dependency-version: 0.10.5
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: patches
- dependency-name: temp-dir
  dependency-version: 0.1.16
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: patches
- dependency-name: syn
  dependency-version: 2.0.102
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: patches
- dependency-name: enumflags2
  dependency-version: 0.7.12
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: patches
- dependency-name: parking_lot
  dependency-version: 0.12.4
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: patches
- dependency-name: quanta
  dependency-version: 0.12.6
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: patches
- dependency-name: twox-hash
  dependency-version: 2.1.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: patches
- dependency-name: clap-verbosity-flag
  dependency-version: 3.0.3
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: patches
- dependency-name: clap_complete
  dependency-version: 4.5.54
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: patches
- dependency-name: owo-colors
  dependency-version: 4.2.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: patches
...

Signed-off-by: dependabot[bot] <support@github.com>

* update licenses

* update hickory proto code

* bump msrv, required by async graph ql

* clippy fix

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Pavlos Rontidis <pavlos.rontidis@gmail.com>
---
 Cargo.lock                                  | 380 ++++++++++----------
 Cargo.toml                                  |  34 +-
 LICENSE-3rdparty.csv                        |  12 +-
 lib/dnsmsg-parser/src/dns_message_parser.rs |  27 +-
 lib/file-source/Cargo.toml                  |   2 +-
 lib/vector-buffers/Cargo.toml               |   2 +-
 lib/vector-core/Cargo.toml                  |  12 +-
 lib/vector-stream/Cargo.toml                |   2 +-
 lib/vector-tap/Cargo.toml                   |   2 +-
 src/config/diff.rs                          |   4 +-
 vdev/Cargo.toml                             |   6 +-
 11 files changed, 252 insertions(+), 231 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 4b59a190e6b44..ff1cdfe628db0 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -409,9 +409,9 @@ dependencies = [
 
 [[package]]
 name = "async-compression"
-version = "0.4.23"
+version = "0.4.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b37fc50485c4f3f736a4fb14199f6d5f5ba008d7f28fe710306c92780f004c07"
+checksum = "d615619615a650c571269c00dca41db04b9210037fa76ed8239f70404ab56985"
 dependencies = [
  "brotli",
  "flate2",
@@ -477,9 +477,9 @@ dependencies = [
 
 [[package]]
 name = "async-graphql"
-version = "7.0.16"
+version = "7.0.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3ee559e72d983e7e04001ba3bf32e6b71c1d670595780723727fd8a29d36e87"
+checksum = "036618f842229ba0b89652ffe425f96c7c16a49f7e3cb23b56fca7f61fd74980"
 dependencies = [
  "async-graphql-derive",
  "async-graphql-parser",
@@ -508,9 +508,9 @@ dependencies = [
 
 [[package]]
 name = "async-graphql-derive"
-version = "7.0.16"
+version = "7.0.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29db05b624fb6352fc11bfe30c54ab1b16a1fe937d7c05a783f4e88ef1292b3b"
+checksum = "fd45deb3dbe5da5cdb8d6a670a7736d735ba65b455328440f236dfb113727a3d"
 dependencies = [
  "Inflector",
  "async-graphql-parser",
@@ -519,15 +519,15 @@ dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
  "strum 0.26.3",
- "syn 2.0.101",
+ "syn 2.0.102",
  "thiserror 1.0.68",
 ]
 
 [[package]]
 name = "async-graphql-parser"
-version = "7.0.16"
+version = "7.0.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4904895044116aab098ca82c6cec831ec43ed99efd04db9b70a390419bc88c5b"
+checksum = "60b7607e59424a35dadbc085b0d513aa54ec28160ee640cf79ec3b634eba66d3"
 dependencies = [
  "async-graphql-value",
  "pest",
@@ -537,9 +537,9 @@ dependencies = [
 
 [[package]]
 name = "async-graphql-value"
-version = "7.0.16"
+version = "7.0.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0cde74de18e3a00c5dd5cfa002ab6f532e1a06c2a79ee6671e2fc353b400b92"
+checksum = "34ecdaff7c9cffa3614a9f9999bf9ee4c3078fe3ce4d6a6e161736b56febf2de"
 dependencies = [
  "bytes 1.10.1",
  "indexmap 2.9.0",
@@ -549,9 +549,9 @@ dependencies = [
 
 [[package]]
 name = "async-graphql-warp"
-version = "7.0.16"
+version = "7.0.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e662bc1abaf791b2b21b54f679bb2cd34ba456c6c27b908c3f2b18ec5ce30a8b"
+checksum = "ff6008a33c32d5a048aa72437821eb864dd56a80c0d80c8df48f11f12154db6c"
 dependencies = [
  "async-graphql",
  "futures-util",
@@ -700,7 +700,7 @@ checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.101",
+ "syn 2.0.102",
 ]
 
 [[package]]
@@ -740,7 +740,7 @@ checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.101",
+ "syn 2.0.102",
 ]
 
 [[package]]
@@ -757,7 +757,7 @@ checksum = "e539d3fca749fcee5236ab05e93a52867dd549cc157c8cb7f99595f3cedffdb5"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.101",
+ "syn 2.0.102",
 ]
 
 [[package]]
@@ -825,9 +825,9 @@ dependencies = [
 
 [[package]]
 name = "aws-runtime"
-version = "1.5.6"
+version = "1.5.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0aff45ffe35196e593ea3b9dd65b320e51e2dda95aff4390bc459e461d09c6ad"
+checksum = "6c4063282c69991e57faab9e5cb21ae557e59f5b0fb285c196335243df8dc25c"
 dependencies = [
  "aws-credential-types",
  "aws-sigv4",
@@ -842,7 +842,6 @@ dependencies = [
  "fastrand 2.3.0",
  "http 0.2.9",
  "http-body 0.4.5",
- "once_cell",
  "percent-encoding",
  "pin-project-lite",
  "tracing 0.1.41",
@@ -1170,9 +1169,9 @@ dependencies = [
 
 [[package]]
 name = "aws-sigv4"
-version = "1.3.1"
+version = "1.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3503af839bd8751d0bdc5a46b9cac93a003a353e635b0c12cf2376b5b53e41ea"
+checksum = "3734aecf9ff79aa401a6ca099d076535ab465ff76b46440cf567c8e70b65dc13"
 dependencies = [
  "aws-credential-types",
  "aws-smithy-eventstream",
@@ -1282,7 +1281,7 @@ dependencies = [
  "aws-smithy-async",
  "aws-smithy-runtime-api",
  "aws-smithy-types",
- "h2 0.4.9",
+ "h2 0.4.10",
  "http 0.2.9",
  "http-body 0.4.5",
  "hyper 0.14.28",
@@ -1729,7 +1728,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e6cbbb8f56245b5a479b30a62cdc86d26e2f35c2b9f594bc4671654b03851380"
 dependencies = [
  "quote 1.0.40",
- "syn 2.0.101",
+ "syn 2.0.102",
 ]
 
 [[package]]
@@ -2048,9 +2047,9 @@ dependencies = [
 
 [[package]]
 name = "cfg-if"
-version = "1.0.0"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+checksum = "9555578bc9e57714c812a1f84e4fc5b4d21fcb063490c624de019f7464c91268"
 
 [[package]]
 name = "cfg_aliases"
@@ -2175,9 +2174,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.5.37"
+version = "4.5.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eccb054f56cbd38340b380d4a8e69ef1f02f1af43db2f0cc817a4774d80ae071"
+checksum = "40b6887a1d8685cebccf115538db5c0efe625ccac9696ad45c409d96566e910f"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -2185,9 +2184,9 @@ dependencies = [
 
 [[package]]
 name = "clap-verbosity-flag"
-version = "3.0.2"
+version = "3.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2678fade3b77aa3a8ff3aae87e9c008d3fb00473a41c71fbf74e91c8c7b37e84"
+checksum = "eeab6a5cdfc795a05538422012f20a5496f050223c91be4e5420bfd13c641fb1"
 dependencies = [
  "clap",
  "log",
@@ -2195,9 +2194,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.5.37"
+version = "4.5.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "efd9466fac8543255d3b1fcad4762c5e116ffe808c8a3043d4263cd4fd4862a2"
+checksum = "e0c66c08ce9f0c698cbce5c0279d0bb6ac936d8674174fe48f736533b964f59e"
 dependencies = [
  "anstream",
  "anstyle",
@@ -2208,23 +2207,23 @@ dependencies = [
 
 [[package]]
 name = "clap_complete"
-version = "4.5.48"
+version = "4.5.54"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be8c97f3a6f02b9e24cadc12aaba75201d18754b53ea0a9d99642f806ccdb4c9"
+checksum = "aad5b1b4de04fead402672b48897030eec1f3bfe1550776322f59f6d6e6a5677"
 dependencies = [
  "clap",
 ]
 
 [[package]]
 name = "clap_derive"
-version = "4.5.32"
+version = "4.5.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09176aae279615badda0765c0c0b3f6ed53f4709118af73cf4655d85d1530cd7"
+checksum = "d2c7947ae4cc3d851207c1adb5b5e260ff0cca11446b1d6d1423788e442257ce"
 dependencies = [
  "heck 0.5.0",
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.101",
+ "syn 2.0.102",
 ]
 
 [[package]]
@@ -2815,7 +2814,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.101",
+ "syn 2.0.102",
 ]
 
 [[package]]
@@ -2863,7 +2862,7 @@ dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
  "strsim 0.11.1",
- "syn 2.0.101",
+ "syn 2.0.102",
 ]
 
 [[package]]
@@ -2885,7 +2884,7 @@ checksum = "fc34b93ccb385b40dc71c6fceac4b2ad23662c7eeb248cf10d529b7e055b6ead"
 dependencies = [
  "darling_core 0.20.11",
  "quote 1.0.40",
- "syn 2.0.101",
+ "syn 2.0.102",
 ]
 
 [[package]]
@@ -3022,7 +3021,7 @@ checksum = "67e77553c4162a157adbf834ebae5b415acbecbeafc7a74b0e886657506a7611"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.101",
+ "syn 2.0.102",
 ]
 
 [[package]]
@@ -3043,7 +3042,7 @@ dependencies = [
  "darling 0.20.11",
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.101",
+ "syn 2.0.102",
 ]
 
 [[package]]
@@ -3053,7 +3052,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "206868b8242f27cecce124c19fd88157fbd0dd334df2587f36417bafbc85097b"
 dependencies = [
  "derive_builder_core",
- "syn 2.0.101",
+ "syn 2.0.102",
 ]
 
 [[package]]
@@ -3137,7 +3136,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.101",
+ "syn 2.0.102",
 ]
 
 [[package]]
@@ -3148,7 +3147,7 @@ checksum = "e5766087c2235fec47fafa4cfecc81e494ee679d0fd4a59887ea0919bfb0e4fc"
 dependencies = [
  "cfg-if",
  "libc",
- "socket2 0.5.9",
+ "socket2 0.5.10",
  "windows-sys 0.48.0",
 ]
 
@@ -3394,7 +3393,7 @@ dependencies = [
  "heck 0.4.1",
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.101",
+ "syn 2.0.102",
 ]
 
 [[package]]
@@ -3406,27 +3405,27 @@ dependencies = [
  "once_cell",
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.101",
+ "syn 2.0.102",
 ]
 
 [[package]]
 name = "enumflags2"
-version = "0.7.11"
+version = "0.7.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba2f4b465f5318854c6f8dd686ede6c0a9dc67d4b1ac241cf0eb51521a309147"
+checksum = "1027f7680c853e056ebcec683615fb6fbbc07dbaa13b4d5d9442b146ded4ecef"
 dependencies = [
  "enumflags2_derive",
 ]
 
 [[package]]
 name = "enumflags2_derive"
-version = "0.7.11"
+version = "0.7.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc4caf64a58d7a6d65ab00639b046ff54399a39f5f2554728895ace4b297cd79"
+checksum = "67c78a4d8fdf9953a5c9d458f9efe940fd97a0cab0941c075a813ac594733827"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.101",
+ "syn 2.0.102",
 ]
 
 [[package]]
@@ -3717,9 +3716,9 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
 
 [[package]]
 name = "flate2"
-version = "1.1.1"
+version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ced92e76e966ca2fd84c8f7aa01a4aea65b0eb6648d72f7c8f3e2764a67fece"
+checksum = "4a3d7db9596fecd151c5f638c0ee5d5bd487b6e0ea232e5dc96d5250f6f94b1d"
 dependencies = [
  "crc32fast",
  "libz-rs-sys",
@@ -3920,7 +3919,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.101",
+ "syn 2.0.102",
 ]
 
 [[package]]
@@ -4220,9 +4219,9 @@ dependencies = [
 
 [[package]]
 name = "h2"
-version = "0.4.9"
+version = "0.4.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75249d144030531f8dee69fe9cea04d3edf809a017ae445e2abdff6629e86633"
+checksum = "a9421a676d1b147b16b82c9225157dc629087ef8ec4d5e2960f9437a90dac0a5"
 dependencies = [
  "atomic-waker",
  "bytes 1.10.1",
@@ -4249,9 +4248,9 @@ dependencies = [
 
 [[package]]
 name = "hash_hasher"
-version = "2.0.3"
+version = "2.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74721d007512d0cb3338cd20f0654ac913920061a4c4d0d8708edb3f2a698c0c"
+checksum = "1b4b9ebce26001bad2e6366295f64e381c1e9c479109202149b9e15e154973e9"
 
 [[package]]
 name = "hashbag"
@@ -4501,15 +4500,13 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
 [[package]]
 name = "hickory-proto"
-version = "0.25.1"
+version = "0.25.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d844af74f7b799e41c78221be863bade11c430d46042c3b49ca8ae0c6d27287"
+checksum = "f8a6fe56c0038198998a6f217ca4e7ef3a5e51f46163bd6dd60b5c71ca6c6502"
 dependencies = [
- "async-recursion",
  "async-trait",
  "bitflags 2.9.0",
  "cfg-if",
- "critical-section",
  "data-encoding",
  "enum-as-inner 0.6.0",
  "futures-channel",
@@ -4704,7 +4701,7 @@ dependencies = [
  "httpdate",
  "itoa",
  "pin-project-lite",
- "socket2 0.5.9",
+ "socket2 0.5.10",
  "tokio",
  "tower-service",
  "tracing 0.1.41",
@@ -4720,7 +4717,7 @@ dependencies = [
  "bytes 1.10.1",
  "futures-channel",
  "futures-util",
- "h2 0.4.9",
+ "h2 0.4.10",
  "http 1.1.0",
  "http-body 1.0.0",
  "httparse",
@@ -4905,7 +4902,7 @@ dependencies = [
  "http-body 1.0.0",
  "hyper 1.4.1",
  "pin-project-lite",
- "socket2 0.5.9",
+ "socket2 0.5.10",
  "tokio",
  "tower-service",
  "tracing 0.1.41",
@@ -5064,7 +5061,7 @@ checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.101",
+ "syn 2.0.102",
 ]
 
 [[package]]
@@ -5203,7 +5200,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b23a0c8dfe501baac4adf6ebbfa6eddf8f0c07f56b058cc1288017e32397846c"
 dependencies = [
  "quote 1.0.40",
- "syn 2.0.101",
+ "syn 2.0.102",
 ]
 
 [[package]]
@@ -5250,7 +5247,7 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b58db92f96b720de98181bbbe63c831e87005ab460c1bf306eb2622b4707997f"
 dependencies = [
- "socket2 0.5.9",
+ "socket2 0.5.10",
  "widestring 1.0.2",
  "windows-sys 0.48.0",
  "winreg",
@@ -5723,9 +5720,9 @@ dependencies = [
 
 [[package]]
 name = "libz-rs-sys"
-version = "0.5.0"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6489ca9bd760fe9642d7644e827b0c9add07df89857b0416ee15c1cc1a3b8c5a"
+checksum = "172a788537a2221661b480fee8dc5f96c580eb34fa88764d3205dc356c7e4221"
 dependencies = [
  "zlib-rs",
 ]
@@ -5800,9 +5797,9 @@ checksum = "b4ce301924b7887e9d637144fdade93f9dfff9b60981d4ac161db09720d39aa5"
 
 [[package]]
 name = "lock_api"
-version = "0.4.11"
+version = "0.4.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45"
+checksum = "96936507f153605bddfcda068dd804796c84324ed2510809e5b2a624c81da765"
 dependencies = [
  "autocfg",
  "scopeguard",
@@ -6129,9 +6126,9 @@ dependencies = [
 
 [[package]]
 name = "mlua"
-version = "0.10.3"
+version = "0.10.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3f763c1041eff92ffb5d7169968a327e1ed2ebfe425dac0ee5a35f29082534b"
+checksum = "c1f5f8fbebc7db5f671671134b9321c4b9aa9adeafccfd9a8c020ae45c6a35d0"
 dependencies = [
  "bstr 1.12.0",
  "either",
@@ -6140,13 +6137,14 @@ dependencies = [
  "num-traits",
  "parking_lot",
  "rustc-hash",
+ "rustversion",
 ]
 
 [[package]]
 name = "mlua-sys"
-version = "0.6.6"
+version = "0.6.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "63a11d485edf0f3f04a508615d36c7d50d299cf61a7ee6d3e2530651e0a31771"
+checksum = "380c1f7e2099cafcf40e51d3a9f20a346977587aa4d012eae1f043149a728a93"
 dependencies = [
  "cc",
  "cfg-if",
@@ -6167,7 +6165,7 @@ dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
  "regex",
- "syn 2.0.101",
+ "syn 2.0.102",
 ]
 
 [[package]]
@@ -6709,7 +6707,7 @@ dependencies = [
  "proc-macro-crate 1.3.1",
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.101",
+ "syn 2.0.102",
 ]
 
 [[package]]
@@ -6721,7 +6719,7 @@ dependencies = [
  "proc-macro-crate 3.2.0",
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.101",
+ "syn 2.0.102",
 ]
 
 [[package]]
@@ -6852,9 +6850,9 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"
 
 [[package]]
 name = "opendal"
-version = "0.53.1"
+version = "0.53.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0f407ca2797ca6c010720aa3cedfa0187430e4f70b729c75c33142d44021f59"
+checksum = "f947c4efbca344c1a125753366033c8107f552b2e3f8251815ed1908f116ca3e"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -6911,9 +6909,9 @@ dependencies = [
 
 [[package]]
 name = "openssl"
-version = "0.10.72"
+version = "0.10.73"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fedfea7d58a1f73118430a55da6a286e7b044961736ce96a16a17068ea25e5da"
+checksum = "8505734d46c8ab1e19a1dce3aef597ad87dcb4c37e7188231769bd6bd51cebf8"
 dependencies = [
  "bitflags 2.9.0",
  "cfg-if",
@@ -6932,7 +6930,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.101",
+ "syn 2.0.102",
 ]
 
 [[package]]
@@ -6952,9 +6950,9 @@ dependencies = [
 
 [[package]]
 name = "openssl-sys"
-version = "0.9.107"
+version = "0.9.109"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8288979acd84749c744a9014b4382d42b8f7b2592847b5afb2ed29e5d16ede07"
+checksum = "90096e2e47630d78b7d1c20952dc621f957103f8bc2c8359ec81290d75238571"
 dependencies = [
  "cc",
  "libc",
@@ -7028,9 +7026,9 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
 
 [[package]]
 name = "owo-colors"
-version = "4.2.0"
+version = "4.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1036865bb9422d3300cf723f657c2851d0e9ab12567854b1f4eba3d77decf564"
+checksum = "26995317201fa17f3656c36716aed4a7c81743a9634ac4c99c0eeda495db0cec"
 dependencies = [
  "supports-color 2.1.0",
  "supports-color 3.0.1",
@@ -7077,9 +7075,9 @@ checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae"
 
 [[package]]
 name = "parking_lot"
-version = "0.12.3"
+version = "0.12.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27"
+checksum = "70d58bf43669b5795d1576d0641cfb6fbb2057bf629506267a92807158584a13"
 dependencies = [
  "lock_api",
  "parking_lot_core",
@@ -7087,15 +7085,15 @@ dependencies = [
 
 [[package]]
 name = "parking_lot_core"
-version = "0.9.9"
+version = "0.9.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e"
+checksum = "bc838d2a56b5b1a6c25f55575dfc605fabb63bb2365f6c2353ef9159aa69e4a5"
 dependencies = [
  "cfg-if",
  "libc",
- "redox_syscall 0.4.1",
+ "redox_syscall 0.5.12",
  "smallvec",
- "windows-targets 0.48.5",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
@@ -7196,7 +7194,7 @@ dependencies = [
  "pest_meta",
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.101",
+ "syn 2.0.102",
 ]
 
 [[package]]
@@ -7284,7 +7282,7 @@ checksum = "6e918e4ff8c4549eb882f14b3a4bc8c8bc93de829416eacf579f1207a8fbf861"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.101",
+ "syn 2.0.102",
 ]
 
 [[package]]
@@ -7562,7 +7560,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ae005bd773ab59b4725093fd7df83fd7892f7d8eafb48dbd7de6e024e4215f9d"
 dependencies = [
  "proc-macro2 1.0.95",
- "syn 2.0.101",
+ "syn 2.0.102",
 ]
 
 [[package]]
@@ -7603,7 +7601,7 @@ version = "3.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8ecf48c7ca261d60b74ab1a7b20da18bede46776b2e55535cb958eb595c5fa7b"
 dependencies = [
- "toml_edit 0.22.26",
+ "toml_edit 0.22.27",
 ]
 
 [[package]]
@@ -7625,7 +7623,7 @@ dependencies = [
  "proc-macro-error-attr2",
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.101",
+ "syn 2.0.102",
 ]
 
 [[package]]
@@ -7699,7 +7697,7 @@ checksum = "4ee1c9ac207483d5e7db4940700de86a9aae46ef90c48b57f99fe7edb8345e49"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.101",
+ "syn 2.0.102",
 ]
 
 [[package]]
@@ -7771,7 +7769,7 @@ dependencies = [
  "prost 0.12.6",
  "prost-types 0.12.6",
  "regex",
- "syn 2.0.101",
+ "syn 2.0.102",
  "tempfile",
 ]
 
@@ -7798,7 +7796,7 @@ dependencies = [
  "itertools 0.12.1",
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.101",
+ "syn 2.0.102",
 ]
 
 [[package]]
@@ -7811,7 +7809,7 @@ dependencies = [
  "itertools 0.13.0",
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.101",
+ "syn 2.0.102",
 ]
 
 [[package]]
@@ -7947,9 +7945,9 @@ checksum = "658fa1faf7a4cc5f057c9ee5ef560f717ad9d8dc66d975267f709624d6e1ab88"
 
 [[package]]
 name = "quanta"
-version = "0.12.5"
+version = "0.12.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3bd1fe6824cea6538803de3ff1bc0cf3949024db3d43c9643024bfb33a807c0e"
+checksum = "f3ab5a9d756f0d97bdc89019bd2e4ea098cf9cde50ee7564dde6b81ccc8f06c7"
 dependencies = [
  "crossbeam-utils",
  "libc",
@@ -8020,7 +8018,7 @@ checksum = "f71ee38b42f8459a88d3362be6f9b841ad2d5421844f61eb1c59c11bff3ac14a"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.101",
+ "syn 2.0.102",
 ]
 
 [[package]]
@@ -8035,7 +8033,7 @@ dependencies = [
  "quinn-udp",
  "rustc-hash",
  "rustls 0.23.23",
- "socket2 0.5.9",
+ "socket2 0.5.10",
  "thiserror 2.0.3",
  "tokio",
  "tracing 0.1.41",
@@ -8070,7 +8068,7 @@ dependencies = [
  "cfg_aliases",
  "libc",
  "once_cell",
- "socket2 0.5.9",
+ "socket2 0.5.10",
  "tracing 0.1.41",
  "windows-sys 0.59.0",
 ]
@@ -8394,6 +8392,15 @@ dependencies = [
  "bitflags 1.3.2",
 ]
 
+[[package]]
+name = "redox_syscall"
+version = "0.5.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "928fca9cf2aa042393a8325b9ead81d2f0df4cb12e1e24cef072922ccd99c5af"
+dependencies = [
+ "bitflags 2.9.0",
+]
+
 [[package]]
 name = "redox_users"
 version = "0.4.3"
@@ -8751,7 +8758,7 @@ dependencies = [
  "regex",
  "relative-path",
  "rustc_version 0.4.1",
- "syn 2.0.101",
+ "syn 2.0.102",
  "unicode-ident",
 ]
 
@@ -9213,7 +9220,7 @@ checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.101",
+ "syn 2.0.102",
 ]
 
 [[package]]
@@ -9224,7 +9231,7 @@ checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.101",
+ "syn 2.0.102",
 ]
 
 [[package]]
@@ -9287,14 +9294,14 @@ checksum = "3081f5ffbb02284dda55132aa26daecedd7372a42417bbbab6f14ab7d6bb9145"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.101",
+ "syn 2.0.102",
 ]
 
 [[package]]
 name = "serde_spanned"
-version = "0.6.8"
+version = "0.6.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1"
+checksum = "bf41e0cfaf7226dca15e8197172c295a782857fcb97fad1808a166870dee75a3"
 dependencies = [
  "serde",
 ]
@@ -9360,7 +9367,7 @@ dependencies = [
  "darling 0.20.11",
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.101",
+ "syn 2.0.102",
 ]
 
 [[package]]
@@ -9551,9 +9558,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.15.0"
+version = "1.15.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8917285742e9f3e1683f0a9c4e6b57960b7314d0b08d30d1ecd426713ee2eee9"
+checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03"
 dependencies = [
  "serde",
 ]
@@ -9633,7 +9640,7 @@ dependencies = [
  "heck 0.4.1",
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.101",
+ "syn 2.0.102",
 ]
 
 [[package]]
@@ -9654,9 +9661,9 @@ dependencies = [
 
 [[package]]
 name = "socket2"
-version = "0.5.9"
+version = "0.5.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f5fd57c80058a56cf5c777ab8a126398ece8e442983605d280a44ce79d0edef"
+checksum = "e22376abed350d73dd1cd119b57ffccad95b4e585a7cda43e286245ce23c0678"
 dependencies = [
  "libc",
  "windows-sys 0.52.0",
@@ -9698,9 +9705,9 @@ dependencies = [
 
 [[package]]
 name = "sqlx"
-version = "0.8.5"
+version = "0.8.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3c3a85280daca669cfd3bcb68a337882a8bc57ec882f72c5d13a430613a738e"
+checksum = "1fefb893899429669dcdd979aff487bd78f4064e5e7907e4269081e0ef7d97dc"
 dependencies = [
  "sqlx-core",
  "sqlx-macros",
@@ -9711,9 +9718,9 @@ dependencies = [
 
 [[package]]
 name = "sqlx-core"
-version = "0.8.5"
+version = "0.8.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f743f2a3cea30a58cd479013f75550e879009e3a02f616f18ca699335aa248c3"
+checksum = "ee6798b1838b6a0f69c007c133b8df5866302197e404e8b6ee8ed3e3a5e68dc6"
 dependencies = [
  "base64 0.22.1",
  "bytes 1.10.1",
@@ -9746,22 +9753,22 @@ dependencies = [
 
 [[package]]
 name = "sqlx-macros"
-version = "0.8.5"
+version = "0.8.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f4200e0fde19834956d4252347c12a083bdcb237d7a1a1446bffd8768417dce"
+checksum = "a2d452988ccaacfbf5e0bdbc348fb91d7c8af5bee192173ac3636b5fb6e6715d"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
  "sqlx-core",
  "sqlx-macros-core",
- "syn 2.0.101",
+ "syn 2.0.102",
 ]
 
 [[package]]
 name = "sqlx-macros-core"
-version = "0.8.5"
+version = "0.8.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "882ceaa29cade31beca7129b6beeb05737f44f82dbe2a9806ecea5a7093d00b7"
+checksum = "19a9c1841124ac5a61741f96e1d9e2ec77424bf323962dd894bdb93f37d5219b"
 dependencies = [
  "dotenvy",
  "either",
@@ -9777,17 +9784,16 @@ dependencies = [
  "sqlx-mysql",
  "sqlx-postgres",
  "sqlx-sqlite",
- "syn 2.0.101",
- "tempfile",
+ "syn 2.0.102",
  "tokio",
  "url",
 ]
 
 [[package]]
 name = "sqlx-mysql"
-version = "0.8.5"
+version = "0.8.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0afdd3aa7a629683c2d750c2df343025545087081ab5942593a5288855b1b7a7"
+checksum = "aa003f0038df784eb8fecbbac13affe3da23b45194bd57dba231c8f48199c526"
 dependencies = [
  "atoi",
  "base64 0.22.1",
@@ -9828,9 +9834,9 @@ dependencies = [
 
 [[package]]
 name = "sqlx-postgres"
-version = "0.8.5"
+version = "0.8.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a0bedbe1bbb5e2615ef347a5e9d8cd7680fb63e77d9dafc0f29be15e53f1ebe6"
+checksum = "db58fcd5a53cf07c184b154801ff91347e4c30d17a3562a635ff028ad5deda46"
 dependencies = [
  "atoi",
  "base64 0.22.1",
@@ -9866,9 +9872,9 @@ dependencies = [
 
 [[package]]
 name = "sqlx-sqlite"
-version = "0.8.5"
+version = "0.8.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c26083e9a520e8eb87a06b12347679b142dc2ea29e6e409f805644a7a979a5bc"
+checksum = "c2d12fe70b2c1b4401038055f90f151b78208de1f9f89a7dbfd41587a10c3eea"
 dependencies = [
  "atoi",
  "chrono",
@@ -9988,7 +9994,7 @@ dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
  "rustversion",
- "syn 2.0.101",
+ "syn 2.0.102",
 ]
 
 [[package]]
@@ -10001,7 +10007,7 @@ dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
  "rustversion",
- "syn 2.0.101",
+ "syn 2.0.102",
 ]
 
 [[package]]
@@ -10053,9 +10059,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.101"
+version = "2.0.102"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ce2b7fc941b3a24138a0a7cf8e858bfc6a992e7978a068a5c760deb0ed43caf"
+checksum = "f6397daf94fa90f058bd0fd88429dd9e5738999cca8d701813c80723add80462"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
@@ -10085,7 +10091,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.101",
+ "syn 2.0.102",
 ]
 
 [[package]]
@@ -10176,9 +10182,9 @@ dependencies = [
 
 [[package]]
 name = "temp-dir"
-version = "0.1.14"
+version = "0.1.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc1ee6eef34f12f765cb94725905c6312b6610ab2b0940889cfe58dae7bc3c72"
+checksum = "83176759e9416cf81ee66cb6508dbfe9c96f20b8b56265a39917551c23c70964"
 
 [[package]]
 name = "tempfile"
@@ -10277,7 +10283,7 @@ checksum = "a7c61ec9a6f64d2793d8a45faba21efbe3ced62a886d44c36a009b2b519b4c7e"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.101",
+ "syn 2.0.102",
 ]
 
 [[package]]
@@ -10288,7 +10294,7 @@ checksum = "f077553d607adc1caf65430528a576c757a71ed73944b66ebb58ef2bbd243568"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.101",
+ "syn 2.0.102",
 ]
 
 [[package]]
@@ -10403,7 +10409,7 @@ dependencies = [
  "parking_lot",
  "pin-project-lite",
  "signal-hook-registry",
- "socket2 0.5.9",
+ "socket2 0.5.10",
  "tokio-macros",
  "tracing 0.1.41",
  "windows-sys 0.52.0",
@@ -10438,7 +10444,7 @@ checksum = "6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.101",
+ "syn 2.0.102",
 ]
 
 [[package]]
@@ -10482,7 +10488,7 @@ dependencies = [
  "postgres-protocol",
  "postgres-types",
  "rand 0.9.1",
- "socket2 0.5.9",
+ "socket2 0.5.10",
  "tokio",
  "tokio-util",
  "whoami",
@@ -10596,21 +10602,21 @@ dependencies = [
 
 [[package]]
 name = "toml"
-version = "0.8.22"
+version = "0.8.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05ae329d1f08c4d17a59bed7ff5b5a769d062e64a62d34a3261b219e62cd5aae"
+checksum = "dc1beb996b9d83529a9e75c17a1686767d148d70663143c7854d8b4a09ced362"
 dependencies = [
  "serde",
  "serde_spanned",
  "toml_datetime",
- "toml_edit 0.22.26",
+ "toml_edit 0.22.27",
 ]
 
 [[package]]
 name = "toml_datetime"
-version = "0.6.9"
+version = "0.6.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3da5db5a963e24bc68be8b17b6fa82814bb22ee8660f192bb182771d498f09a3"
+checksum = "22cddaf88f4fbc13c51aebbf5f8eceb5c7c5a9da2ac40a13519eb5b0a0e8f11c"
 dependencies = [
  "serde",
 ]
@@ -10628,23 +10634,23 @@ dependencies = [
 
 [[package]]
 name = "toml_edit"
-version = "0.22.26"
+version = "0.22.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "310068873db2c5b3e7659d2cc35d21855dbafa50d1ce336397c666e3cb08137e"
+checksum = "41fe8c660ae4257887cf66394862d21dbca4a6ddd26f04a3560410406a2f819a"
 dependencies = [
  "indexmap 2.9.0",
  "serde",
  "serde_spanned",
  "toml_datetime",
  "toml_write",
- "winnow 0.7.7",
+ "winnow 0.7.10",
 ]
 
 [[package]]
 name = "toml_write"
-version = "0.1.1"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfb942dfe1d8e29a7ee7fcbde5bd2b9a25fb89aa70caea2eba3bee836ff41076"
+checksum = "5d99f8c9a7727884afe522e9bd5edbfc91a3312b36a77b5fb8926e4c31a41801"
 
 [[package]]
 name = "tonic"
@@ -10690,7 +10696,7 @@ dependencies = [
  "axum 0.7.5",
  "base64 0.22.1",
  "bytes 1.10.1",
- "h2 0.4.9",
+ "h2 0.4.10",
  "http 1.1.0",
  "http-body 1.0.0",
  "http-body-util",
@@ -10700,7 +10706,7 @@ dependencies = [
  "percent-encoding",
  "pin-project",
  "prost 0.13.3",
- "socket2 0.5.9",
+ "socket2 0.5.10",
  "tokio",
  "tokio-stream",
  "tower",
@@ -10732,7 +10738,7 @@ dependencies = [
  "proc-macro2 1.0.95",
  "prost-build 0.12.6",
  "quote 1.0.40",
- "syn 2.0.101",
+ "syn 2.0.102",
 ]
 
 [[package]]
@@ -10852,7 +10858,7 @@ checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.101",
+ "syn 2.0.102",
 ]
 
 [[package]]
@@ -10977,7 +10983,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "04659ddb06c87d233c566112c1c9c5b9e98256d9af50ec3bc9c8327f873a7568"
 dependencies = [
  "quote 1.0.40",
- "syn 2.0.101",
+ "syn 2.0.102",
 ]
 
 [[package]]
@@ -11098,9 +11104,9 @@ dependencies = [
 
 [[package]]
 name = "twox-hash"
-version = "2.1.0"
+version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7b17f197b3050ba473acf9181f7b1d3b66d1cf7356c6cc57886662276e65908"
+checksum = "8b907da542cbced5261bd3256de1b3a1bf340a3d37f93425a07362a1d687de56"
 
 [[package]]
 name = "typed-builder"
@@ -11130,7 +11136,7 @@ checksum = "f03ca4cb38206e2bef0700092660bb74d696f808514dae47fa1467cbfe26e96e"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.101",
+ "syn 2.0.102",
 ]
 
 [[package]]
@@ -11160,7 +11166,7 @@ checksum = "35f5380909ffc31b4de4f4bdf96b877175a016aa2ca98cee39fcfd8c4d53d952"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.101",
+ "syn 2.0.102",
 ]
 
 [[package]]
@@ -11487,7 +11493,7 @@ dependencies = [
  "goauth",
  "governor",
  "greptimedb-ingester",
- "h2 0.4.9",
+ "h2 0.4.10",
  "hash_hasher",
  "hashbrown 0.14.5",
  "headers",
@@ -11574,7 +11580,7 @@ dependencies = [
  "smpl_jwt",
  "snafu 0.7.5",
  "snap",
- "socket2 0.5.9",
+ "socket2 0.5.10",
  "sqlx",
  "stream-cancel",
  "strip-ansi-escapes",
@@ -11739,7 +11745,7 @@ dependencies = [
  "quote 1.0.40",
  "serde",
  "serde_json",
- "syn 2.0.101",
+ "syn 2.0.102",
  "tracing 0.1.41",
 ]
 
@@ -11752,7 +11758,7 @@ dependencies = [
  "quote 1.0.40",
  "serde",
  "serde_derive_internals",
- "syn 2.0.101",
+ "syn 2.0.102",
  "vector-config",
  "vector-config-common",
 ]
@@ -11815,7 +11821,7 @@ dependencies = [
  "similar-asserts",
  "smallvec",
  "snafu 0.7.5",
- "socket2 0.5.9",
+ "socket2 0.5.10",
  "tokio",
  "tokio-openssl",
  "tokio-stream",
@@ -11883,7 +11889,7 @@ dependencies = [
  "tokio-util",
  "tower",
  "tracing 0.1.41",
- "twox-hash 2.1.0",
+ "twox-hash 2.1.1",
  "vector-common",
  "vector-core",
 ]
@@ -12203,7 +12209,7 @@ dependencies = [
  "log",
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.101",
+ "syn 2.0.102",
  "wasm-bindgen-shared",
 ]
 
@@ -12237,7 +12243,7 @@ checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.101",
+ "syn 2.0.102",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
@@ -12444,7 +12450,7 @@ checksum = "9107ddc059d5b6fbfbffdfa7a7fe3e22a226def0b2608f72e9d552763d3e1ad7"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.101",
+ "syn 2.0.102",
 ]
 
 [[package]]
@@ -12455,7 +12461,7 @@ checksum = "29bee4b38ea3cde66011baa44dba677c432a78593e202392d1e9070cf2a7fca7"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.101",
+ "syn 2.0.102",
 ]
 
 [[package]]
@@ -12739,9 +12745,9 @@ dependencies = [
 
 [[package]]
 name = "winnow"
-version = "0.7.7"
+version = "0.7.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6cb8234a863ea0e8cd7284fcdd4f145233eb00fee02bbdd9861aec44e6477bc5"
+checksum = "c06928c8748d81b05c9be96aad92e1b6ff01833332f281e8cfca3be4b35fc9ec"
 dependencies = [
  "memchr",
 ]
@@ -12846,7 +12852,7 @@ checksum = "28cc31741b18cb6f1d5ff12f5b7523e3d6eb0852bbbad19d73905511d9849b95"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.101",
+ "syn 2.0.102",
  "synstructure",
 ]
 
@@ -12876,7 +12882,7 @@ checksum = "b3c129550b3e6de3fd0ba67ba5c81818f9805e58b8d7fee80a3a59d2c9fc601a"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.101",
+ "syn 2.0.102",
 ]
 
 [[package]]
@@ -12887,7 +12893,7 @@ checksum = "5226bc9a9a9836e7428936cde76bb6b22feea1a8bfdbc0d241136e4d13417e25"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.101",
+ "syn 2.0.102",
 ]
 
 [[package]]
@@ -12907,7 +12913,7 @@ checksum = "0ea7b4a3637ea8669cedf0f1fd5c286a17f3de97b8dd5a70a6c167a1730e63a5"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.101",
+ "syn 2.0.102",
  "synstructure",
 ]
 
@@ -12936,14 +12942,14 @@ checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.101",
+ "syn 2.0.102",
 ]
 
 [[package]]
 name = "zlib-rs"
-version = "0.5.0"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "868b928d7949e09af2f6086dfc1e01936064cc7a819253bce650d4e2a2d63ba8"
+checksum = "626bd9fa9734751fc50d6060752170984d7053f5a39061f524cda68023d4db8a"
 
 [[package]]
 name = "zstd"
diff --git a/Cargo.toml b/Cargo.toml
index 4424dbd79edfc..3864e4e9306f2 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -12,7 +12,7 @@ default-run = "vector"
 autobenches = false # our benchmarks are not runnable on their own either way
 # Minimum supported rust version
 # See docs/DEVELOPING.md for policy
-rust-version = "1.83"
+rust-version = "1.86"
 
 [[bin]]
 name = "vector"
@@ -135,15 +135,15 @@ members = [
 
 [workspace.dependencies]
 anyhow = "1.0.98"
-cfg-if = { version = "1.0.0", default-features = false }
+cfg-if = { version = "1.0.1", default-features = false }
 chrono = { version = "0.4.41", default-features = false, features = ["clock", "serde"] }
 chrono-tz = { version = "0.10.3", default-features = false, features = ["serde"] }
-clap = { version = "4.5.37", default-features = false, features = ["derive", "error-context", "env", "help", "std", "string", "usage", "wrap_help"] }
+clap = { version = "4.5.40", default-features = false, features = ["derive", "error-context", "env", "help", "std", "string", "usage", "wrap_help"] }
 darling = { version = "0.20.11", default-features = false, features = ["suggestions"] }
-flate2 = { version = "1.1.1", default-features = false, features = ["zlib-rs"] }
+flate2 = { version = "1.1.2", default-features = false, features = ["zlib-rs"] }
 futures = { version = "0.3.31", default-features = false, features = ["compat", "io-compat", "std"], package = "futures" }
 glob = { version = "0.3.2", default-features = false }
-hickory-proto = { version = "0.25.1", default-features = false, features = ["dnssec-ring"] }
+hickory-proto = { version = "0.25.2", default-features = false, features = ["dnssec-ring"] }
 indexmap = { version = "2.9.0", default-features = false, features = ["serde", "std"] }
 inventory = { version = "0.3" }
 indoc = { version = "2.0.6" }
@@ -166,7 +166,7 @@ serde = { version = "1.0.219", default-features = false, features = ["alloc", "d
 snafu = { version = "0.7.5", default-features = false, features = ["futures", "std"] }
 tempfile = "3.19.1"
 tokio = { version = "1.45.1", default-features = false, features = ["full"] }
-toml = { version = "0.8.22", default-features = false, features = ["display", "parse"] }
+toml = { version = "0.8.23", default-features = false, features = ["display", "parse"] }
 tonic = { version = "0.11", default-features = false, features = ["transport", "codegen", "prost", "tls", "tls-roots", "gzip"] }
 tonic-build = { version = "0.11", default-features = false, features = ["transport", "prost"] }
 uuid = { version = "1.17.0", features = ["v4", "v7", "serde"] }
@@ -225,7 +225,7 @@ metrics.workspace = true
 metrics-tracing-context.workspace = true
 
 # AWS - Official SDK
-aws-runtime = { version = "1.5.6", optional = true }
+aws-runtime = { version = "1.5.7", optional = true }
 aws-config = { version = "1.6.1", default-features = false, features = ["behavior-version-latest", "credentials-process", "sso", "rt-tokio"], optional = true }
 aws-credential-types = { version = "1.2.3", default-features = false, features = ["hardcoded-credentials"], optional = true }
 aws-sdk-cloudwatch = { version = "1.70.0", default-features = false, features = ["behavior-version-latest", "rt-tokio"], optional = true }
@@ -247,7 +247,7 @@ aws-sdk-sts = { version = "1.65.0", default-features = false, features = ["behav
 
 # The `aws-sdk-sts` crate is needed despite not being referred to anywhere in the code because we need to set the
 # `behavior-version-latest` feature. Without this we get a runtime panic when `auth.assume_role` authentication is configured.
-aws-sigv4 = { version = "1.3.1", default-features = false, features = ["sign-http"], optional = true }
+aws-sigv4 = { version = "1.3.2", default-features = false, features = ["sign-http"], optional = true }
 
 aws-smithy-async = { version = "1.2.5", default-features = false, features = ["rt-tokio"], optional = true }
 aws-smithy-http = { version = "0.62", default-features = false, features = ["event-stream", "rt-tokio"], optional = true }
@@ -292,8 +292,8 @@ smpl_jwt = { version = "0.8.0", default-features = false, optional = true }
 lapin = { version = "2.5.3", default-features = false, features = ["native-tls"], optional = true }
 
 # API
-async-graphql = { version = "7.0.16", default-features = false, optional = true, features = ["chrono", "playground"] }
-async-graphql-warp = { version = "7.0.16", default-features = false, optional = true }
+async-graphql = { version = "7.0.17", default-features = false, optional = true, features = ["chrono", "playground"] }
+async-graphql-warp = { version = "7.0.17", default-features = false, optional = true }
 
 # API client
 crossterm = { version = "0.29.0", default-features = false, features = ["event-stream", "windows"], optional = true }
@@ -310,7 +310,7 @@ greptimedb-ingester = { git = "https://github.com/GreptimeTeam/greptimedb-ingest
 
 # External libs
 arc-swap = { version = "1.7", default-features = false, optional = true }
-async-compression = { version = "0.4.23", default-features = false, features = ["tokio", "gzip", "zstd"], optional = true }
+async-compression = { version = "0.4.24", default-features = false, features = ["tokio", "gzip", "zstd"], optional = true }
 apache-avro = { version = "0.16.0", default-features = false, optional = true }
 axum = { version = "0.6.20", default-features = false }
 base64 = { version = "0.22.1", default-features = false, optional = true }
@@ -335,8 +335,8 @@ flate2.workspace = true
 futures-util = { version = "0.3.29", default-features = false }
 glob.workspace = true
 governor = { version = "0.7.0", default-features = false, features = ["dashmap", "jitter", "std"], optional = true }
-h2 = { version = "0.4.9", default-features = false, optional = true }
-hash_hasher = { version = "2.0.0", default-features = false }
+h2 = { version = "0.4.10", default-features = false, optional = true }
+hash_hasher = { version = "2.0.4", default-features = false }
 hashbrown = { version = "0.14.5", default-features = false, optional = true, features = ["ahash"] }
 headers = { version = "0.3.9", default-features = false }
 hostname = { version = "0.4.0", default-features = false }
@@ -362,7 +362,7 @@ async-nats = { version = "0.33.0", default-features = false, optional = true }
 nkeys = { version = "0.4.4", default-features = false, optional = true }
 nom = { version = "7.1.3", default-features = false, optional = true }
 notify = { version = "8.0.0", default-features = false, features = ["macos_fsevent"] }
-openssl = { version = "0.10.72", default-features = false, features = ["vendored"] }
+openssl = { version = "0.10.73", default-features = false, features = ["vendored"] }
 openssl-probe = { version = "0.1.6", default-features = false }
 ordered-float = { version = "4.6.0", default-features = false }
 percent-encoding = { version = "2.3.1", default-features = false }
@@ -379,8 +379,8 @@ rumqttc = { version = "0.24.0", default-features = false, features = ["use-rustl
 seahash = { version = "4.1.0", default-features = false }
 smallvec = { version = "1", default-features = false, features = ["union", "serde"] }
 snap = { version = "1.1.1", default-features = false }
-socket2 = { version = "0.5.9", default-features = false }
-sqlx = { version = "0.8.5", default-features = false, features = ["derive", "postgres", "chrono", "runtime-tokio"], optional=true }
+socket2 = { version = "0.5.10", default-features = false }
+sqlx = { version = "0.8.6", default-features = false, features = ["derive", "postgres", "chrono", "runtime-tokio"], optional=true }
 stream-cancel = { version = "0.8.2", default-features = false }
 strip-ansi-escapes = { version = "0.2.1", default-features = false }
 syslog = { version = "6.1.1", default-features = false, optional = true }
@@ -402,7 +402,7 @@ arr_macro = { version = "0.2.1" }
 heim = { git = "https://github.com/vectordotdev/heim.git", branch = "update-nix", default-features = false, features = ["disk"] }
 
 # make sure to update the external docs when the Lua version changes
-mlua = { version = "0.10.3", default-features = false, features = ["lua54", "send", "vendored", "macros"], optional = true }
+mlua = { version = "0.10.5", default-features = false, features = ["lua54", "send", "vendored", "macros"], optional = true }
 sysinfo = "0.34.2"
 byteorder = "1.5.0"
 
diff --git a/LICENSE-3rdparty.csv b/LICENSE-3rdparty.csv
index 67538f6f1ded5..e107729c35ddc 100644
--- a/LICENSE-3rdparty.csv
+++ b/LICENSE-3rdparty.csv
@@ -122,7 +122,7 @@ castaway,https://github.com/sagebind/castaway,MIT,Stephen M. Coakley <me@stephen
 cbc,https://github.com/RustCrypto/block-modes,MIT OR Apache-2.0,RustCrypto Developers
 cesu8,https://github.com/emk/cesu8-rs,Apache-2.0 OR MIT,Eric Kidd <git@randomhacks.net>
 cfb-mode,https://github.com/RustCrypto/block-modes,MIT OR Apache-2.0,RustCrypto Developers
-cfg-if,https://github.com/alexcrichton/cfg-if,MIT OR Apache-2.0,Alex Crichton <alex@alexcrichton.com>
+cfg-if,https://github.com/rust-lang/cfg-if,MIT OR Apache-2.0,Alex Crichton <alex@alexcrichton.com>
 chacha20,https://github.com/RustCrypto/stream-ciphers,Apache-2.0 OR MIT,RustCrypto Developers
 chacha20poly1305,https://github.com/RustCrypto/AEADs/tree/master/chacha20poly1305,Apache-2.0 OR MIT,RustCrypto Developers
 charset,https://github.com/hsivonen/charset,MIT OR Apache-2.0,Henri Sivonen <hsivonen@hsivonen.fi>
@@ -271,7 +271,7 @@ grok,https://github.com/daschl/grok,Apache-2.0,Michael Nitschinger <michael@nits
 group,https://github.com/zkcrypto/group,MIT OR Apache-2.0,"Sean Bowe <ewillbefull@gmail.com>, Jack Grigg <jack@z.cash>"
 h2,https://github.com/hyperium/h2,MIT,"Carl Lerche <me@carllerche.com>, Sean McArthur <sean@seanmonstar.com>"
 half,https://github.com/starkat99/half-rs,MIT OR Apache-2.0,Kathryn Long <squeeself@gmail.com>
-hash_hasher,https://github.com/Fraser999/Hash-Hasher,Apache-2.0 OR MIT,Fraser Hutchison <fraser.hutchison@maidsafe.net>
+hash_hasher,https://github.com/Fraser999/Hash-Hasher,Apache-2.0 OR MIT,Fraser Hutchison <fraser@astria.org>
 hashbag,https://github.com/jonhoo/hashbag,MIT OR Apache-2.0,Jon Gjengset <jon@thesquareplanet.com>
 hashbrown,https://github.com/rust-lang/hashbrown,MIT OR Apache-2.0,Amanieu d'Antras <amanieu@gmail.com>
 hashlink,https://github.com/kyren/hashlink,MIT OR Apache-2.0,kyren <kerriganw@gmail.com>
@@ -389,8 +389,8 @@ minimal-lexical,https://github.com/Alexhuszagh/minimal-lexical,MIT OR Apache-2.0
 miniz_oxide,https://github.com/Frommi/miniz_oxide/tree/master/miniz_oxide,MIT OR Zlib OR Apache-2.0,"Frommi <daniil.liferenko@gmail.com>, oyvindln <oyvindln@users.noreply.github.com>"
 miniz_oxide,https://github.com/Frommi/miniz_oxide/tree/master/miniz_oxide,MIT OR Zlib OR Apache-2.0,"Frommi <daniil.liferenko@gmail.com>, oyvindln <oyvindln@users.noreply.github.com>, Rich Geldreich richgel99@gmail.com"
 mio,https://github.com/tokio-rs/mio,MIT,"Carl Lerche <me@carllerche.com>, Thomas de Zeeuw <thomasdezeeuw@gmail.com>, Tokio Contributors <team@tokio.rs>"
-mlua,https://github.com/khvzak/mlua,MIT,"Aleksandr Orlenko <zxteam@pm.me>, kyren <catherine@kyju.org>"
-mlua-sys,https://github.com/khvzak/mlua,MIT,Aleksandr Orlenko <zxteam@pm.me>
+mlua,https://github.com/mlua-rs/mlua,MIT,"Aleksandr Orlenko <zxteam@pm.me>, kyren <catherine@kyju.org>"
+mlua-sys,https://github.com/mlua-rs/mlua,MIT,Aleksandr Orlenko <zxteam@pm.me>
 mlua_derive,https://github.com/khvzak/mlua,MIT,Aleksandr Orlenko <zxteam@pm.me>
 moka,https://github.com/moka-rs/moka,MIT OR Apache-2.0,The moka Authors
 mongodb,https://github.com/mongodb/mongo-rust-driver,Apache-2.0,"Saghm Rossi <saghmrossi@gmail.com>, Patrick Freed <patrick.freed@mongodb.com>, Isabel Atkinson <isabel.atkinson@mongodb.com>, Abraham Egnor <abraham.egnor@mongodb.com>, Kaitlin Mahar <kaitlin.mahar@mongodb.com>"
@@ -655,8 +655,10 @@ tokio-postgres,https://github.com/sfackler/rust-postgres,MIT OR Apache-2.0,Steve
 tokio-retry,https://github.com/srijs/rust-tokio-retry,MIT,Sam Rijs <srijs@airpost.net>
 tokio-rustls,https://github.com/rustls/tokio-rustls,MIT OR Apache-2.0,The tokio-rustls Authors
 tokio-tungstenite,https://github.com/snapview/tokio-tungstenite,MIT,"Daniel Abramov <dabramov@snapview.de>, Alexey Galakhov <agalakhov@snapview.de>"
-toml,https://github.com/toml-rs/toml,MIT OR Apache-2.0,Alex Crichton <alex@alexcrichton.com>
+toml,https://github.com/toml-rs/toml,MIT OR Apache-2.0,The toml Authors
+toml_datetime,https://github.com/toml-rs/toml,MIT OR Apache-2.0,The toml_datetime Authors
 toml_edit,https://github.com/toml-rs/toml,MIT OR Apache-2.0,"Andronik Ordian <write@reusable.software>, Ed Page <eopage@gmail.com>"
+toml_edit,https://github.com/toml-rs/toml,MIT OR Apache-2.0,The toml_edit Authors
 toml_write,https://github.com/toml-rs/toml,MIT OR Apache-2.0,The toml_write Authors
 tonic,https://github.com/hyperium/tonic,MIT,Lucio Franco <luciofranco14@gmail.com>
 tower,https://github.com/tower-rs/tower,MIT,Tower Maintainers <team@tower-rs.com>
diff --git a/lib/dnsmsg-parser/src/dns_message_parser.rs b/lib/dnsmsg-parser/src/dns_message_parser.rs
index e80c380324fe1..5da9fc5fcb78d 100644
--- a/lib/dnsmsg-parser/src/dns_message_parser.rs
+++ b/lib/dnsmsg-parser/src/dns_message_parser.rs
@@ -5,11 +5,11 @@ use std::str::Utf8Error;
 use data_encoding::{BASE32HEX_NOPAD, BASE64, HEXUPPER};
 use hickory_proto::dnssec::rdata::{DNSSECRData, CDNSKEY, CDS, DNSKEY, DS};
 use hickory_proto::dnssec::SupportedAlgorithms;
+use hickory_proto::rr::rdata::caa::Property;
 use hickory_proto::{
     op::{message::Message as TrustDnsMessage, Query},
     rr::{
         rdata::{
-            caa::Value,
             opt::{EdnsCode, EdnsOption},
             A, AAAA, NULL, OPT, SVCB,
         },
@@ -633,11 +633,19 @@ impl DnsMessageParser {
                     "{} {} \"{}\"",
                     caa.issuer_critical() as u8,
                     caa.tag().as_str(),
-                    match caa.value() {
-                        Value::Url(url) => {
+                    match caa.tag() {
+                        Property::Iodef => {
+                            let url = caa.value_as_iodef().map_err(|source| {
+                                DnsMessageParserError::TrustDnsError { source }
+                            })?;
                             url.as_str().to_string()
                         }
-                        Value::Issuer(option_name, vec_keyvalue) => {
+                        Property::Issue | Property::IssueWild => {
+                            let (option_name, vec_keyvalue) =
+                                caa.value_as_issue().map_err(|source| {
+                                    DnsMessageParserError::TrustDnsError { source }
+                                })?;
+
                             let mut final_issuer = String::new();
                             if let Some(name) = option_name {
                                 final_issuer.push_str(&name.to_string_with_options(&self.options));
@@ -650,9 +658,14 @@ impl DnsMessageParser {
                             }
                             final_issuer.trim_end().to_string()
                         }
-                        Value::Unknown(unknown) => std::str::from_utf8(unknown)
-                            .map_err(|source| DnsMessageParserError::Utf8ParsingError { source })?
-                            .to_string(),
+                        Property::Unknown(_) => {
+                            let unknown = caa.raw_value();
+                            std::str::from_utf8(unknown)
+                                .map_err(|source| DnsMessageParserError::Utf8ParsingError {
+                                    source,
+                                })?
+                                .to_string()
+                        }
                     }
                 );
                 Ok((Some(caa_rdata), None))
diff --git a/lib/file-source/Cargo.toml b/lib/file-source/Cargo.toml
index b61e0b036d3a4..c5789c43e17d7 100644
--- a/lib/file-source/Cargo.toml
+++ b/lib/file-source/Cargo.toml
@@ -43,7 +43,7 @@ default-features = false
 features = ["serde"]
 
 [dependencies.flate2]
-version = "1.0"
+version = "1.1"
 default-features = false
 features = ["rust_backend"]
 
diff --git a/lib/vector-buffers/Cargo.toml b/lib/vector-buffers/Cargo.toml
index 6d2f40cf91b3a..dfe21bae73628 100644
--- a/lib/vector-buffers/Cargo.toml
+++ b/lib/vector-buffers/Cargo.toml
@@ -44,7 +44,7 @@ proptest = "1.6"
 quickcheck = "1.0"
 rand.workspace = true
 serde_yaml = { version = "0.9", default-features = false }
-temp-dir = "0.1.14"
+temp-dir = "0.1.16"
 tokio-test = "0.4.4"
 tracing-fluent-assertions = { version = "0.3" }
 tracing-subscriber = { version = "0.3.19", default-features = false, features = ["env-filter", "fmt", "registry", "std", "ansi"] }
diff --git a/lib/vector-core/Cargo.toml b/lib/vector-core/Cargo.toml
index 2c805ae62ae3d..e7df732eb0bed 100644
--- a/lib/vector-core/Cargo.toml
+++ b/lib/vector-core/Cargo.toml
@@ -17,7 +17,7 @@ chrono-tz.workspace = true
 crossbeam-utils = { version = "0.8.21", default-features = false }
 derivative = { version = "2.2.0", default-features = false }
 dyn-clone = { version = "1.0.19", default-features = false }
-enumflags2 = { version = "0.7.11", default-features = false }
+enumflags2 = { version = "0.7.12", default-features = false }
 float_eq = { version = "1.0", default-features = false }
 futures.workspace = true
 futures-util = { version = "0.3.29", default-features = false, features = ["std"] }
@@ -31,16 +31,16 @@ lookup = { package = "vector-lookup", path = "../vector-lookup" }
 metrics.workspace = true
 metrics-tracing-context.workspace = true
 metrics-util.workspace = true
-mlua = { version = "0.10.3", default-features = false, features = ["lua54", "send", "vendored"], optional = true }
+mlua = { version = "0.10.5", default-features = false, features = ["lua54", "send", "vendored"], optional = true }
 no-proxy = { version  = "0.3.6", default-features = false, features = ["serialize"] }
 ordered-float = { version = "4.6.0", default-features = false }
-openssl = { version = "0.10.72", default-features = false, features = ["vendored"] }
-parking_lot = { version = "0.12.3", default-features = false }
+openssl = { version = "0.10.73", default-features = false, features = ["vendored"] }
+parking_lot = { version = "0.12.4", default-features = false }
 pin-project.workspace = true
 proptest = { version = "1.6", optional = true }
 prost-types.workspace = true
 prost .workspace = true
-quanta = { version = "0.12.5", default-features = false }
+quanta = { version = "0.12.6", default-features = false }
 regex = { version = "1.11.1", default-features = false, features = ["std", "perf"] }
 ryu = { version = "1", default-features = false }
 serde.workspace = true
@@ -48,7 +48,7 @@ serde_json.workspace = true
 serde_with = { version = "3.12.0", default-features = false, features = ["std", "macros"] }
 smallvec = { version = "1", default-features = false, features = ["serde", "const_generics"] }
 snafu.workspace = true
-socket2 = { version = "0.5.9", default-features = false }
+socket2 = { version = "0.5.10", default-features = false }
 tokio = { version = "1.45.1", default-features = false, features = ["net"] }
 tokio-openssl = { version = "0.6.5", default-features = false }
 tokio-stream = { version = "0.1", default-features = false, features = ["time"], optional = true }
diff --git a/lib/vector-stream/Cargo.toml b/lib/vector-stream/Cargo.toml
index 87908f771ad13..d77ef065f1b73 100644
--- a/lib/vector-stream/Cargo.toml
+++ b/lib/vector-stream/Cargo.toml
@@ -14,7 +14,7 @@ tokio = { version = "1.45.1", default-features = false, features = ["net"] }
 tokio-util = { version = "0.7.0", default-features = false, features = ["time"] }
 tower = { version = "0.4", default-features = false, features = ["util"] }
 tracing = { version = "0.1.34", default-features = false }
-twox-hash = { version = "2.1.0", default-features = false, features = ["xxhash64"] }
+twox-hash = { version = "2.1.1", default-features = false, features = ["xxhash64"] }
 vector-common = { path = "../vector-common" }
 vector-core = { path = "../vector-core" }
 
diff --git a/lib/vector-tap/Cargo.toml b/lib/vector-tap/Cargo.toml
index 154e7a3f08e33..7b1640748f49e 100644
--- a/lib/vector-tap/Cargo.toml
+++ b/lib/vector-tap/Cargo.toml
@@ -10,7 +10,7 @@ license = "MPL-2.0"
 api = ["dep:async-graphql"]
 
 [dependencies]
-async-graphql = { version = "7.0.16", default-features = false, features = ["playground"], optional = true}
+async-graphql = { version = "7.0.17", default-features = false, features = ["playground"], optional = true}
 colored = { version = "3.0.0", default-features = false }
 futures.workspace = true
 glob.workspace = true
diff --git a/src/config/diff.rs b/src/config/diff.rs
index cce523cfb85ba..fa5f8cf09b8ff 100644
--- a/src/config/diff.rs
+++ b/src/config/diff.rs
@@ -35,7 +35,7 @@ impl ConfigDiff {
     }
 
     /// Swaps removed with added in Differences.
-    pub fn flip(mut self) -> Self {
+    pub const fn flip(mut self) -> Self {
         self.sources.flip();
         self.transforms.flip();
         self.sinks.flip();
@@ -189,7 +189,7 @@ impl Difference {
         self.to_remove.contains(key)
     }
 
-    fn flip(&mut self) {
+    const fn flip(&mut self) {
         std::mem::swap(&mut self.to_remove, &mut self.to_add);
     }
 
diff --git a/vdev/Cargo.toml b/vdev/Cargo.toml
index b35fe0fefce54..096ae69c0488b 100644
--- a/vdev/Cargo.toml
+++ b/vdev/Cargo.toml
@@ -11,8 +11,8 @@ publish = false
 anyhow.workspace = true
 chrono.workspace = true
 clap.workspace = true
-clap-verbosity-flag = "3.0.2"
-clap_complete = "4.5.48"
+clap-verbosity-flag = "3.0.3"
+clap_complete = "4.5.54"
 confy = "1.0.0"
 directories = "6.0.0"
 # remove this when stabilized https://doc.rust-lang.org/stable/std/path/fn.absolute.html
@@ -24,7 +24,7 @@ indicatif = { version = "0.17.11", features = ["improved_unicode"] }
 itertools = "0.14.0"
 log = "0.4.27"
 # watch https://github.com/epage/anstyle for official interop with Clap
-owo-colors = { version = "4.2.0", features = ["supports-colors"] }
+owo-colors = { version = "4.2.1", features = ["supports-colors"] }
 paste.workspace = true
 regex = { version = "1.11.1", default-features = false, features = ["std", "perf"] }
 reqwest = { version = "0.11", features = ["json", "blocking"] }

From 7082f2e5f0b809f8625ee5093247bd7ac5cadcec Mon Sep 17 00:00:00 2001
From: Thomas <thomasqueirozb@gmail.com>
Date: Tue, 10 Jun 2025 16:22:29 -0400
Subject: [PATCH 048/305] chore(internal docs): Fix spelling and add QA'd to
 allow.txt (#23182)

Fix spelling and add QA'd to allow.txt
---
 .github/actions/spelling/allow.txt                         | 1 +
 website/content/en/docs/about/under-the-hood/guarantees.md | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/actions/spelling/allow.txt b/.github/actions/spelling/allow.txt
index 341a2ed509dae..ac5a03921a55f 100644
--- a/.github/actions/spelling/allow.txt
+++ b/.github/actions/spelling/allow.txt
@@ -512,6 +512,7 @@ NRSC
 OPENPGP
 OPENSAFETY
 PROFIBUS
+QA'd
 RFID
 riello
 ROHC
diff --git a/website/content/en/docs/about/under-the-hood/guarantees.md b/website/content/en/docs/about/under-the-hood/guarantees.md
index b5bc5e830b3b5..6a1c150ee074e 100644
--- a/website/content/en/docs/about/under-the-hood/guarantees.md
+++ b/website/content/en/docs/about/under-the-hood/guarantees.md
@@ -79,7 +79,7 @@ A **best-effort** delivery guarantee means that a Vector component makes a best
 each event but it can't _guarantee_ delivery. This is usually due to limitations of the underlying
 protocol, which is outside Vector's control.
 
-Note that this is _not_ the same as at-most-once delivery, as it'is still possible for Vector to
+Note that this is _not_ the same as at-most-once delivery, as it's still possible for Vector to
 introduce duplicates under extreme circumstances.
 
 ## Stability guarantees

From 333cd765f0d8bd414413caac1b12b07960efece8 Mon Sep 17 00:00:00 2001
From: tot19 <31141271+tot19@users.noreply.github.com>
Date: Wed, 11 Jun 2025 05:48:41 +0900
Subject: [PATCH 049/305] feat(splunk_hec source): Allow content-type header if
 it includes application/json (#23024)

* #23022 Allow content-type header if it only includes application/json. Do not require exact match

* Formatting

* Ensuring response with invalid Content-Type header value will return same error response

* Adding changelog

* Adding newline

* Fixed failing tests and added new unit test
---
 ...low_content_header_contains.enhancement.md |   3 +
 src/sources/splunk_hec/mod.rs                 | 104 ++++++++++++++++--
 2 files changed, 97 insertions(+), 10 deletions(-)
 create mode 100644 changelog.d/23022_hec_allow_content_header_contains.enhancement.md

diff --git a/changelog.d/23022_hec_allow_content_header_contains.enhancement.md b/changelog.d/23022_hec_allow_content_header_contains.enhancement.md
new file mode 100644
index 0000000000000..2cc0d2a827bfd
--- /dev/null
+++ b/changelog.d/23022_hec_allow_content_header_contains.enhancement.md
@@ -0,0 +1,3 @@
+Updated the Splunk HEC source to accept requests that contain the header content-type with any value containing "application/json," not the exact value of "application/json." This matches the behavior of a true Splunk HEC. Allows sources from AWS to successfully send events to the Splunk HEC source without additional proxying to update headers.
+
+authors: Tot19
diff --git a/src/sources/splunk_hec/mod.rs b/src/sources/splunk_hec/mod.rs
index 0be523bf8fe19..23b0f0e2f8aad 100644
--- a/src/sources/splunk_hec/mod.rs
+++ b/src/sources/splunk_hec/mod.rs
@@ -13,6 +13,7 @@ use flate2::read::MultiGzDecoder;
 use futures::FutureExt;
 use http::StatusCode;
 use hyper::{service::make_service_fn, Server};
+use serde::de::DeserializeOwned;
 use serde::Serialize;
 use serde_json::{
     de::{Read as JsonRead, StrRead},
@@ -35,6 +36,7 @@ use vector_lib::{
 use vector_lib::{configurable::configurable_component, tls::MaybeTlsIncomingStream};
 use vrl::path::OwnedTargetPath;
 use vrl::value::{kind::Collection, Kind};
+use warp::http::header::{HeaderValue, CONTENT_TYPE};
 use warp::{filters::BoxedFilter, path, reject::Rejection, reply::Response, Filter, Reply};
 
 use self::{
@@ -529,26 +531,50 @@ impl SplunkSource {
             .boxed()
     }
 
+    fn lenient_json_content_type_check<T>() -> impl Filter<Extract = (T,), Error = Rejection> + Clone
+    where
+        T: Send + DeserializeOwned + 'static,
+    {
+        warp::header::optional::<HeaderValue>(CONTENT_TYPE.as_str())
+            .and(warp::body::bytes())
+            .and_then(
+                |ctype: Option<HeaderValue>, body: bytes::Bytes| async move {
+                    let ok = ctype
+                        .as_ref()
+                        .and_then(|v| v.to_str().ok())
+                        .map(|h| h.to_ascii_lowercase().contains("application/json"))
+                        .unwrap_or(true);
+
+                    if !ok {
+                        return Err(warp::reject::custom(ApiError::UnsupportedContentType));
+                    }
+
+                    let value = serde_json::from_slice::<T>(&body)
+                        .map_err(|_| warp::reject::custom(ApiError::BadRequest))?;
+
+                    Ok(value)
+                },
+            )
+    }
+
     fn ack_service(&self) -> BoxedFilter<(Response,)> {
         let idx_ack = self.idx_ack.clone();
+
         warp::post()
-            .and(path!("ack"))
+            .and(warp::path!("ack"))
             .and(self.authorization())
             .and(SplunkSource::required_channel())
-            .and(warp::body::json())
-            .and_then(move |_, channel_id: String, body: HecAckStatusRequest| {
+            .and(Self::lenient_json_content_type_check::<HecAckStatusRequest>())
+            .and_then(move |_, channel: String, req: HecAckStatusRequest| {
                 let idx_ack = idx_ack.clone();
                 async move {
                     if let Some(idx_ack) = idx_ack {
-                        let ack_statuses = idx_ack
-                            .get_acks_status_from_channel(channel_id, &body.acks)
+                        let acks = idx_ack
+                            .get_acks_status_from_channel(channel, &req.acks)
                             .await?;
-                        Ok(
-                            warp::reply::json(&HecAckStatusResponse { acks: ack_statuses })
-                                .into_response(),
-                        )
+                        Ok(warp::reply::json(&HecAckStatusResponse { acks }).into_response())
                     } else {
-                        Err(Rejection::from(ApiError::AckIsDisabled))
+                        Err(warp::reject::custom(ApiError::AckIsDisabled))
                     }
                 }
             })
@@ -1094,6 +1120,7 @@ pub(crate) enum ApiError {
     MissingAuthorization,
     InvalidAuthorization,
     UnsupportedEncoding,
+    UnsupportedContentType,
     MissingChannel,
     NoData,
     InvalidDataFormat { event: usize },
@@ -1188,6 +1215,14 @@ fn finish_ok(maybe_ack_id: Option<u64>) -> Response {
     response_json(StatusCode::OK, body)
 }
 
+fn response_plain(code: StatusCode, msg: &'static str) -> Response {
+    warp::reply::with_status(
+        warp::reply::with_header(msg, http::header::CONTENT_TYPE, "text/plain; charset=utf-8"),
+        code,
+    )
+    .into_response()
+}
+
 async fn finish_err(rejection: Rejection) -> Result<(Response,), Rejection> {
     if let Some(&error) = rejection.find::<ApiError>() {
         emit!(SplunkHecRequestError { error });
@@ -1200,6 +1235,10 @@ async fn finish_err(rejection: Rejection) -> Result<(Response,), Rejection> {
                 splunk_response::INVALID_AUTHORIZATION,
             ),
             ApiError::UnsupportedEncoding => empty_response(StatusCode::UNSUPPORTED_MEDIA_TYPE),
+            ApiError::UnsupportedContentType => response_plain(
+                StatusCode::UNSUPPORTED_MEDIA_TYPE,
+                "The request's content-type is not supported",
+            ),
             ApiError::MissingChannel => {
                 response_json(StatusCode::BAD_REQUEST, splunk_response::NO_CHANNEL)
             }
@@ -2485,6 +2524,51 @@ mod tests {
         assert!(ack_res.acks.get(&event_res.ack_id).unwrap());
     }
 
+    #[tokio::test]
+    async fn ack_service_accepts_parameterized_content_type() {
+        let ack_config = HecAcknowledgementsConfig {
+            enabled: Some(true),
+            ..Default::default()
+        };
+        let (source, address) = source(Some(ack_config)).await;
+        let opts = SendWithOpts {
+            channel: Some(Channel::Header("guid")),
+            forwarded_for: None,
+        };
+
+        let event_res = send_with_response(
+            address,
+            "services/collector/event",
+            r#"{"event":"param-test"}"#,
+            TOKEN,
+            &opts,
+        )
+        .await
+        .json::<HecAckEventResponse>()
+        .await
+        .unwrap();
+        let _ = collect_n(source, 1).await;
+
+        let body = serde_json::to_string(&HecAckStatusRequest {
+            acks: vec![event_res.ack_id],
+        })
+        .unwrap();
+
+        let res = reqwest::Client::new()
+            .post(format!("http://{}/services/collector/ack", address))
+            .header("Authorization", format!("Splunk {}", TOKEN))
+            .header("x-splunk-request-channel", "guid")
+            .header("Content-Type", "application/json; some-random-text; hello")
+            .body(body)
+            .send()
+            .await
+            .unwrap();
+
+        assert_eq!(200, res.status().as_u16());
+
+        let _parsed: HecAckStatusResponse = res.json().await.unwrap();
+    }
+
     #[tokio::test]
     async fn event_service_acknowledgements_enabled_channel_required() {
         let message = r#"{"event":"first", "color": "blue"}"#;

From c03abd71ec406e4ec49b14d3461cc800f52f3286 Mon Sep 17 00:00:00 2001
From: Jorge Hermo <jorgehermogonzalez@gmail.com>
Date: Wed, 11 Jun 2025 15:32:11 +0200
Subject: [PATCH 050/305] feat(sources): multicast udp socket support (#22099)

* feat: multicast udp socket support

* test: add tests for multicast udp

* test: add tests for multicast udp

* chore: add changelog

* chore: remove dbg statement

* chore: remove todo

* chore: remove todo

* chore: fix typo

* docs: add docs for multicast_groups setting

* docs: update website cue

* fix: clippy lints

* chore: fix typo

* chore: fix typo

* Update src/sources/socket/mod.rs

Co-authored-by: Pavlos Rontidis <pavlos.rontidis@gmail.com>

* feat: change panic to unimplemented

* chore: add todo about init_udp_with_config

* chore: add todo about init_udp_with_config

* feat: change "addr" to "to" in udp test helpers

* feat: add new SocketMulticastGroupJoinError and refactor error test

* feat: add variables to logs

* feat: add variables to logs

* feat: add INITIALIZING error stage

* test: fix broken test on windows

---------

Co-authored-by: Pavlos Rontidis <pavlos.rontidis@gmail.com>
---
 ...32_multicast_udp_socket_sources.feature.md |   8 +
 .../src/internal_event/prelude.rs             |   1 +
 lib/vector-config/src/stdlib.rs               |  27 +++-
 src/internal_events/socket.rs                 |  44 +++++-
 src/sources/socket/mod.rs                     | 148 ++++++++++++++++--
 src/sources/socket/udp.rs                     |  50 +++++-
 src/test_util/mod.rs                          |   4 +
 .../components/sources/base/socket.cue        |  21 +++
 8 files changed, 289 insertions(+), 14 deletions(-)
 create mode 100644 changelog.d/5732_multicast_udp_socket_sources.feature.md

diff --git a/changelog.d/5732_multicast_udp_socket_sources.feature.md b/changelog.d/5732_multicast_udp_socket_sources.feature.md
new file mode 100644
index 0000000000000..f85c4451b53d0
--- /dev/null
+++ b/changelog.d/5732_multicast_udp_socket_sources.feature.md
@@ -0,0 +1,8 @@
+The `socket` source with `udp` mode now supports joining multicast groups via the `multicast_groups` option
+of that source. This allows the source to receive multicast packets from the specified multicast groups.
+
+Note that in order to work properly, the `socket` address must be set to `0.0.0.0` and not
+to `127.0.0.1` (localhost) or any other specific IP address. If other IP address is used, the host's interface
+will filter out the multicast packets as the packet target IP (multicast) would not match the host's interface IP.
+
+authors: jorgehermo9
diff --git a/lib/vector-common/src/internal_event/prelude.rs b/lib/vector-common/src/internal_event/prelude.rs
index e15a6b52b4503..92aa160fe509e 100644
--- a/lib/vector-common/src/internal_event/prelude.rs
+++ b/lib/vector-common/src/internal_event/prelude.rs
@@ -1,5 +1,6 @@
 // Set of `stage` tags to use when emitting error events.
 pub mod error_stage {
+    pub const INITIALIZING: &str = "initializing";
     pub const RECEIVING: &str = "receiving";
     pub const PROCESSING: &str = "processing";
     pub const SENDING: &str = "sending";
diff --git a/lib/vector-config/src/stdlib.rs b/lib/vector-config/src/stdlib.rs
index ad3ae47aac32d..add05f87fd9ea 100644
--- a/lib/vector-config/src/stdlib.rs
+++ b/lib/vector-config/src/stdlib.rs
@@ -2,7 +2,7 @@ use std::{
     cell::RefCell,
     collections::{BTreeMap, BTreeSet, HashMap, HashSet},
     hash::Hash,
-    net::SocketAddr,
+    net::{Ipv4Addr, SocketAddr},
     num::{
         NonZeroI16, NonZeroI32, NonZeroI64, NonZeroI8, NonZeroU16, NonZeroU32, NonZeroU64,
         NonZeroU8, NonZeroUsize,
@@ -402,6 +402,31 @@ impl ToValue for SocketAddr {
     }
 }
 
+impl Configurable for Ipv4Addr {
+    fn referenceable_name() -> Option<&'static str> {
+        Some("stdlib::Ipv4Addr")
+    }
+
+    fn metadata() -> Metadata {
+        let mut metadata = Metadata::default();
+        metadata.set_description("An IPv4 address.");
+        metadata
+    }
+
+    fn generate_schema(_: &RefCell<SchemaGenerator>) -> Result<SchemaObject, GenerateError> {
+        // TODO: We don't need anything other than a string schema to (de)serialize a `Ipv4Addr`,
+        // but we eventually should have validation since the format for the possible permutations
+        // is well-known and can be easily codified.
+        Ok(generate_string_schema())
+    }
+}
+
+impl ToValue for Ipv4Addr {
+    fn to_value(&self) -> Value {
+        Value::String(self.to_string())
+    }
+}
+
 impl Configurable for PathBuf {
     fn referenceable_name() -> Option<&'static str> {
         Some("stdlib::PathBuf")
diff --git a/src/internal_events/socket.rs b/src/internal_events/socket.rs
index 97a648da2587b..5f2f7aac301e4 100644
--- a/src/internal_events/socket.rs
+++ b/src/internal_events/socket.rs
@@ -1,3 +1,5 @@
+use std::net::Ipv4Addr;
+
 use metrics::{counter, histogram};
 use vector_lib::internal_event::{ComponentEventsDropped, InternalEvent, UNINTENTIONAL};
 use vector_lib::{
@@ -120,7 +122,7 @@ impl<E: std::fmt::Display> InternalEvent for SocketBindError<E> {
             error = %self.error,
             error_code = "socket_bind",
             error_type = error_type::IO_FAILED,
-            stage = error_stage::RECEIVING,
+            stage = error_stage::INITIALIZING,
             %mode,
             internal_log_rate_limit = true,
         );
@@ -128,8 +130,46 @@ impl<E: std::fmt::Display> InternalEvent for SocketBindError<E> {
             "component_errors_total",
             "error_code" => "socket_bind",
             "error_type" => error_type::IO_FAILED,
-            "stage" => error_stage::RECEIVING,
+            "stage" => error_stage::INITIALIZING,
+            "mode" => mode,
+        )
+        .increment(1);
+    }
+}
+
+#[derive(Debug)]
+pub struct SocketMulticastGroupJoinError<E> {
+    pub error: E,
+    pub group_addr: Ipv4Addr,
+    pub interface: Ipv4Addr,
+}
+
+impl<E: std::fmt::Display> InternalEvent for SocketMulticastGroupJoinError<E> {
+    fn emit(self) {
+        // Multicast groups are only used in UDP mode
+        let mode = SocketMode::Udp.as_str();
+        let group_addr = self.group_addr.to_string();
+        let interface = self.interface.to_string();
+
+        error!(
+            message = "Error joining multicast group.",
+            error = %self.error,
+            error_code = "socket_multicast_group_join",
+            error_type = error_type::IO_FAILED,
+            stage = error_stage::INITIALIZING,
+            %mode,
+            %group_addr,
+            %interface,
+            internal_log_rate_limit = true,
+        );
+        counter!(
+            "component_errors_total",
+            "error_code" => "socket_multicast_group_join",
+            "error_type" => error_type::IO_FAILED,
+            "stage" => error_stage::INITIALIZING,
             "mode" => mode,
+            "group_addr" => group_addr,
+            "interface" => interface,
         )
         .increment(1);
     }
diff --git a/src/sources/socket/mod.rs b/src/sources/socket/mod.rs
index df8eb08a2f915..13660f33693ce 100644
--- a/src/sources/socket/mod.rs
+++ b/src/sources/socket/mod.rs
@@ -319,7 +319,7 @@ mod test {
     use approx::assert_relative_eq;
     use std::{
         collections::HashMap,
-        net::{SocketAddr, UdpSocket},
+        net::{IpAddr, Ipv4Addr, SocketAddr, UdpSocket},
         sync::{
             atomic::{AtomicBool, Ordering},
             Arc,
@@ -373,8 +373,11 @@ mod test {
         sources::util::net::SocketListenAddr,
         test_util::{
             collect_n, collect_n_limited,
-            components::{assert_source_compliance, SOCKET_PUSH_SOURCE_TAGS},
-            next_addr, random_string, send_lines, send_lines_tls, wait_for_tcp,
+            components::{
+                assert_source_compliance, assert_source_error, COMPONENT_ERROR_TAGS,
+                SOCKET_PUSH_SOURCE_TAGS,
+            },
+            next_addr, next_addr_any, random_string, send_lines, send_lines_tls, wait_for_tcp,
         },
         tls::{self, TlsConfig, TlsEnableableConfig, TlsSourceConfig},
         SourceSender,
@@ -898,13 +901,28 @@ mod test {
     }
 
     //////// UDP TESTS ////////
-    fn send_lines_udp(addr: SocketAddr, lines: impl IntoIterator<Item = String>) -> SocketAddr {
-        send_packets_udp(addr, lines.into_iter().map(|line| line.into()))
+    fn send_lines_udp(to: SocketAddr, lines: impl IntoIterator<Item = String>) -> SocketAddr {
+        send_lines_udp_from(next_addr(), to, lines)
+    }
+
+    fn send_lines_udp_from(
+        from: SocketAddr,
+        to: SocketAddr,
+        lines: impl IntoIterator<Item = String>,
+    ) -> SocketAddr {
+        send_packets_udp_from(from, to, lines.into_iter().map(|line| line.into()))
     }
 
-    fn send_packets_udp(addr: SocketAddr, packets: impl IntoIterator<Item = Bytes>) -> SocketAddr {
-        let bind = next_addr();
-        let socket = UdpSocket::bind(bind)
+    fn send_packets_udp(to: SocketAddr, packets: impl IntoIterator<Item = Bytes>) -> SocketAddr {
+        send_packets_udp_from(next_addr(), to, packets)
+    }
+
+    fn send_packets_udp_from(
+        from: SocketAddr,
+        to: SocketAddr,
+        packets: impl IntoIterator<Item = Bytes>,
+    ) -> SocketAddr {
+        let socket = UdpSocket::bind(from)
             .map_err(|error| panic!("{:}", error))
             .ok()
             .unwrap();
@@ -912,7 +930,7 @@ mod test {
         for packet in packets {
             assert_eq!(
                 socket
-                    .send_to(&packet, addr)
+                    .send_to(&packet, to)
                     .map_err(|error| panic!("{:}", error))
                     .ok()
                     .unwrap(),
@@ -926,7 +944,7 @@ mod test {
         thread::sleep(Duration::from_millis(10));
 
         // Done
-        bind
+        from
     }
 
     async fn init_udp_with_shutdown(
@@ -1304,6 +1322,116 @@ mod test {
         .await;
     }
 
+    #[tokio::test]
+    async fn multicast_udp_message() {
+        assert_source_compliance(&SOCKET_PUSH_SOURCE_TAGS, async {
+            let (tx, mut rx) = SourceSender::new_test();
+            // The socket address must be `IPADDR_ANY` (0.0.0.0) in order to receive multicast packets
+            let socket_address = next_addr_any();
+            let multicast_ip_address: Ipv4Addr = "224.0.0.2".parse().unwrap();
+            let multicast_socket_address =
+                SocketAddr::new(IpAddr::V4(multicast_ip_address), socket_address.port());
+            let mut config = UdpConfig::from_address(socket_address.into());
+            config.multicast_groups = vec![multicast_ip_address];
+            init_udp_with_config(tx, config).await;
+
+            // We must send packets to the same interface the `socket_address` is bound to
+            // in order to receive the multicast packets the `from` socket sends.
+            // To do so, we use the `IPADDR_ANY` address
+            let from = next_addr_any();
+            send_lines_udp_from(from, multicast_socket_address, ["test".to_string()]);
+
+            let event = rx.next().await.expect("must receive an event");
+            assert_eq!(
+                event.as_log()[log_schema().message_key().unwrap().to_string()],
+                "test".into()
+            );
+        })
+        .await;
+    }
+
+    #[tokio::test]
+    async fn multiple_multicast_addresses_udp_message() {
+        assert_source_compliance(&SOCKET_PUSH_SOURCE_TAGS, async {
+            let (tx, mut rx) = SourceSender::new_test();
+            let socket_address = next_addr_any();
+            let multicast_ip_addresses = (2..12)
+                .map(|i| format!("224.0.0.{i}").parse().unwrap())
+                .collect::<Vec<Ipv4Addr>>();
+            let multicast_ip_socket_addresses = multicast_ip_addresses
+                .iter()
+                .map(|ip_address| SocketAddr::new(IpAddr::V4(*ip_address), socket_address.port()))
+                .collect::<Vec<SocketAddr>>();
+            let mut config = UdpConfig::from_address(socket_address.into());
+            config.multicast_groups = multicast_ip_addresses;
+            init_udp_with_config(tx, config).await;
+
+            let from = next_addr_any();
+            for multicast_ip_socket_address in multicast_ip_socket_addresses {
+                send_lines_udp_from(
+                    from,
+                    multicast_ip_socket_address,
+                    [multicast_ip_socket_address.to_string()],
+                );
+
+                let event = rx.next().await.expect("must receive an event");
+                assert_eq!(
+                    event.as_log()[log_schema().message_key().unwrap().to_string()],
+                    multicast_ip_socket_address.to_string().into()
+                );
+            }
+        })
+        .await;
+    }
+
+    #[tokio::test]
+    async fn multicast_and_unicast_udp_message() {
+        assert_source_compliance(&SOCKET_PUSH_SOURCE_TAGS, async {
+            let (tx, mut rx) = SourceSender::new_test();
+            let socket_address = next_addr_any();
+            let multicast_ip_address: Ipv4Addr = "224.0.0.2".parse().unwrap();
+            let multicast_socket_address =
+                SocketAddr::new(IpAddr::V4(multicast_ip_address), socket_address.port());
+            let mut config = UdpConfig::from_address(socket_address.into());
+            config.multicast_groups = vec![multicast_ip_address];
+            init_udp_with_config(tx, config).await;
+
+            let from = next_addr_any();
+            // Send packet to multicast address
+            send_lines_udp_from(from, multicast_socket_address, ["test".to_string()]);
+            let event = rx.next().await.expect("must receive an event");
+            assert_eq!(
+                event.as_log()[log_schema().message_key().unwrap().to_string()],
+                "test".into()
+            );
+
+            // Windows does not support connecting to `0.0.0.0`,
+            // therefore we connect to `127.0.0.1` instead (the socket is listening at `0.0.0.0`)
+            let to = SocketAddr::new(IpAddr::V4(Ipv4Addr::LOCALHOST), socket_address.port());
+            // Send packet to unicast address
+            send_lines_udp_from(from, to, ["test".to_string()]);
+            let event = rx.next().await.expect("must receive an event");
+            assert_eq!(
+                event.as_log()[log_schema().message_key().unwrap().to_string()],
+                "test".into()
+            );
+        })
+        .await;
+    }
+
+    #[tokio::test]
+    async fn udp_invalid_multicast_group() {
+        assert_source_error(&COMPONENT_ERROR_TAGS, async {
+            let (tx, _rx) = SourceSender::new_test();
+            let socket_address = next_addr_any();
+            let invalid_multicast_ip_address: Ipv4Addr = "192.168.0.3".parse().unwrap();
+            let mut config = UdpConfig::from_address(socket_address.into());
+            config.multicast_groups = vec![invalid_multicast_ip_address];
+            init_udp_with_config(tx, config).await;
+        })
+        .await;
+    }
+
     ////////////// UNIX TEST LIBS //////////////
 
     #[cfg(unix)]
diff --git a/src/sources/socket/udp.rs b/src/sources/socket/udp.rs
index a5d57207ea0a0..4cfa052c85d7e 100644
--- a/src/sources/socket/udp.rs
+++ b/src/sources/socket/udp.rs
@@ -1,3 +1,5 @@
+use std::net::{Ipv4Addr, SocketAddr};
+
 use super::default_host_key;
 use bytes::BytesMut;
 use chrono::Utc;
@@ -20,7 +22,8 @@ use crate::{
     codecs::Decoder,
     event::Event,
     internal_events::{
-        SocketBindError, SocketEventsReceived, SocketMode, SocketReceiveError, StreamClosedError,
+        SocketBindError, SocketEventsReceived, SocketMode, SocketMulticastGroupJoinError,
+        SocketReceiveError, StreamClosedError,
     },
     net,
     serde::default_decoding,
@@ -41,6 +44,21 @@ pub struct UdpConfig {
     #[configurable(derived)]
     address: SocketListenAddr,
 
+    /// List of IPv4 multicast groups to join on socket's binding process.
+    ///
+    /// In order to read multicast packets, this source's listening address should be set to `0.0.0.0`.
+    /// If any other address is used (such as `127.0.0.1` or an specific interface address), the
+    /// listening interface will filter out all multicast packets received,
+    /// as their target IP would be the one of the multicast group
+    /// and it will not match the socket's bound IP.
+    ///
+    /// Note that this setting will only work if the source's address
+    /// is an IPv4 address (IPv6 and systemd file descriptor as source's address are not supported
+    /// with multicast groups).
+    #[serde(default)]
+    #[configurable(metadata(docs::examples = "['224.0.0.2', '224.0.0.4']"))]
+    pub(super) multicast_groups: Vec<Ipv4Addr>,
+
     /// The maximum buffer size of incoming messages.
     ///
     /// Messages larger than this are truncated.
@@ -118,6 +136,7 @@ impl UdpConfig {
     pub fn from_address(address: SocketListenAddr) -> Self {
         Self {
             address,
+            multicast_groups: Vec::new(),
             max_length: default_max_length(),
             host_key: None,
             port_key: default_port_key(),
@@ -152,6 +171,35 @@ pub(super) fn udp(
                 })
             })?;
 
+        if !config.multicast_groups.is_empty() {
+            socket.set_multicast_loop_v4(true).unwrap();
+            let listen_addr = match config.address() {
+                SocketListenAddr::SocketAddr(SocketAddr::V4(addr)) => addr,
+                SocketListenAddr::SocketAddr(SocketAddr::V6(_)) => {
+                    // We could support Ipv6 multicast with the
+                    // https://doc.rust-lang.org/std/net/struct.UdpSocket.html#method.join_multicast_v6 method
+                    // and specifying the interface index as `0`, in order to bind all interfaces.
+                    unimplemented!("IPv6 multicast is not supported")
+                }
+                SocketListenAddr::SystemdFd(_) => {
+                    unimplemented!("Multicast for systemd fd sockets is not supported")
+                }
+            };
+            for group_addr in config.multicast_groups {
+                let interface = *listen_addr.ip();
+                socket
+                    .join_multicast_v4(group_addr, interface)
+                    .map_err(|error| {
+                        emit!(SocketMulticastGroupJoinError {
+                            error,
+                            group_addr,
+                            interface,
+                        })
+                    })?;
+                info!(message = "Joined multicast group.", group = %group_addr);
+            }
+        }
+
         if let Some(receive_buffer_bytes) = config.receive_buffer_bytes {
             if let Err(error) = net::set_receive_buffer_size(&socket, receive_buffer_bytes) {
                 warn!(message = "Failed configuring receive buffer size on UDP socket.", %error);
diff --git a/src/test_util/mod.rs b/src/test_util/mod.rs
index e446b5455d9d4..93162c2e23bc4 100644
--- a/src/test_util/mod.rs
+++ b/src/test_util/mod.rs
@@ -124,6 +124,10 @@ pub fn next_addr() -> SocketAddr {
     next_addr_for_ip(IpAddr::V4(Ipv4Addr::LOCALHOST))
 }
 
+pub fn next_addr_any() -> SocketAddr {
+    next_addr_for_ip(IpAddr::V4(Ipv4Addr::UNSPECIFIED))
+}
+
 pub fn next_addr_v6() -> SocketAddr {
     next_addr_for_ip(IpAddr::V6(Ipv6Addr::LOCALHOST))
 }
diff --git a/website/cue/reference/components/sources/base/socket.cue b/website/cue/reference/components/sources/base/socket.cue
index f6df0070b2dd1..39fec3ee13018 100644
--- a/website/cue/reference/components/sources/base/socket.cue
+++ b/website/cue/reference/components/sources/base/socket.cue
@@ -498,6 +498,27 @@ base: components: sources: socket: configuration: {
 			unix_stream:   "Listen on a Unix domain socket (UDS), in stream mode."
 		}
 	}
+	multicast_groups: {
+		description: """
+			List of IPv4 multicast groups to join on socket's binding process.
+
+			In order to read multicast packets, this source's listening address should be set to `0.0.0.0`.
+			If any other address is used (such as `127.0.0.1` or an specific interface address), the
+			listening interface will filter out all multicast packets received,
+			as their target IP would be the one of the multicast group
+			and it will not match the socket's bound IP.
+
+			Note that this setting will only work if the source's address
+			is an IPv4 address (IPv6 and systemd file descriptor as source's address are not supported
+			with multicast groups).
+			"""
+		relevant_when: "mode = \"udp\""
+		required:      false
+		type: array: {
+			default: []
+			items: type: string: examples: ["['224.0.0.2', '224.0.0.4']"]
+		}
+	}
 	path: {
 		description: """
 			The Unix socket path.

From 25296d0d01c8e2e9eac87096b2bff5ea07094afe Mon Sep 17 00:00:00 2001
From: Burkov Egor <eburkov@rvision.ru>
Date: Wed, 11 Jun 2025 16:52:11 +0300
Subject: [PATCH 051/305] fix(parsing): Prometheus timestamp parse int overflow
 handle (#23077)

* fix(parsing): Prometheus timestamp parse int overflow handle

* fix typo

* Change changelog

* Update changelog.d/fix_prometheus_timestamp_parse.fix.md

---------

Co-authored-by: Pavlos Rontidis <pavlos.rontidis@gmail.com>
---
 .../fix_prometheus_timestamp_parse.fix.md     |  3 ++
 lib/prometheus-parser/src/line.rs             | 33 ++++++++++++++++---
 2 files changed, 32 insertions(+), 4 deletions(-)
 create mode 100644 changelog.d/fix_prometheus_timestamp_parse.fix.md

diff --git a/changelog.d/fix_prometheus_timestamp_parse.fix.md b/changelog.d/fix_prometheus_timestamp_parse.fix.md
new file mode 100644
index 0000000000000..0ed27abdee620
--- /dev/null
+++ b/changelog.d/fix_prometheus_timestamp_parse.fix.md
@@ -0,0 +1,3 @@
+Fix bug allowing invalid Prometheus timestamps; now properly rejected during parsing.
+
+authors: wooffie
diff --git a/lib/prometheus-parser/src/line.rs b/lib/prometheus-parser/src/line.rs
index aeac1e81105c6..4a41db94ce6b5 100644
--- a/lib/prometheus-parser/src/line.rs
+++ b/lib/prometheus-parser/src/line.rs
@@ -6,7 +6,7 @@ use nom::{
     branch::alt,
     bytes::complete::{is_not, tag, take_while, take_while1},
     character::complete::{char, digit1},
-    combinator::{map, opt, recognize, value},
+    combinator::{map, map_res, opt, recognize, value},
     error::ParseError,
     multi::fold_many0,
     number::complete::double,
@@ -151,9 +151,16 @@ impl Metric {
 
     fn parse_timestamp(input: &str) -> IResult<Option<i64>> {
         let input = trim_space(input);
-        opt(map(recognize(pair(opt(char('-')), digit1)), |s: &str| {
-            s.parse().unwrap()
-        }))(input)
+        opt(map_res(
+            recognize(pair(opt(char('-')), digit1)),
+            |s: &str| s.parse(),
+        ))(input)
+        .map_err(|_: NomError| {
+            ErrorKind::ParseTimestampError {
+                input: input.to_owned(),
+            }
+            .into()
+        })
     }
 
     fn parse_name_value(input: &str) -> IResult<(String, String)> {
@@ -667,6 +674,24 @@ mod test {
         assert_eq!(Metric::parse_timestamp(""), Ok(("", None)));
         assert_eq!(Metric::parse_timestamp("123"), Ok(("", Some(123))));
         assert_eq!(Metric::parse_timestamp(" -23"), Ok(("", Some(-23))));
+        // Edge cases
+        assert_eq!(
+            Metric::parse_timestamp("9223372036854775807"),
+            Ok(("", Some(9223372036854775807i64)))
+        );
+        assert_eq!(
+            Metric::parse_timestamp("-9223372036854775808"),
+            Ok(("", Some(-9223372036854775808i64)))
+        );
+        // overflow
+        assert_eq!(
+            Metric::parse_timestamp("9223372036854775809"),
+            Ok(("9223372036854775809", None))
+        );
+        assert_eq!(
+            Metric::parse_timestamp("-9223372036854775809"),
+            Ok(("-9223372036854775809", None))
+        );
     }
 
     #[test]

From 60fdc8a1cf96963bc99d2b0148befb11a6d75f34 Mon Sep 17 00:00:00 2001
From: Thomas <thomasqueirozb@gmail.com>
Date: Wed, 11 Jun 2025 11:19:31 -0400
Subject: [PATCH 052/305] fix(core): Add deny_unknown_fields to
 TlsEnableableConfig (#23187)

* Add deny_unknown_fields to TlsEnableableConfig

* Add changelog

* Update changelog.d/23187_tls_enableable_config_deny_unknown_fields.fix.md

Co-authored-by: Pavlos Rontidis <pavlos.rontidis@gmail.com>

* Update changelog.d/23187_tls_enableable_config_deny_unknown_fields.fix.md

---------

Co-authored-by: Pavlos Rontidis <pavlos.rontidis@gmail.com>
---
 .../23187_tls_enableable_config_deny_unknown_fields.fix.md     | 3 +++
 lib/vector-core/src/tls/settings.rs                            | 1 +
 2 files changed, 4 insertions(+)
 create mode 100644 changelog.d/23187_tls_enableable_config_deny_unknown_fields.fix.md

diff --git a/changelog.d/23187_tls_enableable_config_deny_unknown_fields.fix.md b/changelog.d/23187_tls_enableable_config_deny_unknown_fields.fix.md
new file mode 100644
index 0000000000000..61b9c7bcae91c
--- /dev/null
+++ b/changelog.d/23187_tls_enableable_config_deny_unknown_fields.fix.md
@@ -0,0 +1,3 @@
+Unknown fields in the `tls` config are now rejected so these fields now need to be removed for Vector to start successfully.
+
+authors: thomasqueirozb
diff --git a/lib/vector-core/src/tls/settings.rs b/lib/vector-core/src/tls/settings.rs
index 0fece816894a9..fbedb57fac35c 100644
--- a/lib/vector-core/src/tls/settings.rs
+++ b/lib/vector-core/src/tls/settings.rs
@@ -41,6 +41,7 @@ pub const TEST_PEM_CLIENT_KEY_PATH: &str =
 #[configurable_component]
 #[configurable(metadata(docs::advanced))]
 #[derive(Clone, Debug, Default)]
+#[serde(deny_unknown_fields)]
 pub struct TlsEnableableConfig {
     /// Whether or not to require TLS for incoming or outgoing connections.
     ///

From ce5e6d445254b5f284076dd70c1b2ced27825c90 Mon Sep 17 00:00:00 2001
From: Thomas <thomas.schneider@datadoghq.com>
Date: Wed, 11 Jun 2025 15:38:20 -0400
Subject: [PATCH 053/305] docs(internal docs): remove vector-test-harness from
 REVIEWING.md (#23192)

chore(docs): remove vector-test-harness from REVIEWING.md
---
 docs/REVIEWING.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/REVIEWING.md b/docs/REVIEWING.md
index 9075b74556a89..d40d311c63a91 100644
--- a/docs/REVIEWING.md
+++ b/docs/REVIEWING.md
@@ -26,7 +26,7 @@ should be used for all pull requests:
 - [ ] Is backward compatibility broken? If so, can it be avoided or deprecated? (see [Backward compatibility](#backward-compatibility))
 - [ ] Have dependencies changed? (see [Dependencies](#dependencies))
 - [ ] Has the code been explicitly reviewed for security issues? Dependencies included. (see [Security](#security))
-- [ ] Is there a risk of performance regressions? If so, have run the [Vector test harness](https://github.com/vectordotdev/vector-test-harness)? (see [Performance Testing](#performance-testing))
+- [ ] Is there a risk of performance regressions? (see [Performance Testing](#performance-testing))
 - [ ] Should documentation be adjusted to reflect any of these changes? (see [Documentation](#documentation))
 
 For component changes, especially pull requests introducing new components, the

From 5b8afb4d20c5678ff43e9eb91eaf7dbbb425c231 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 11 Jun 2025 20:53:22 +0000
Subject: [PATCH 054/305] chore(deps): Bump tempfile from 3.19.1 to 3.20.0
 (#23137)

* chore(deps): Bump tempfile from 3.19.1 to 3.20.0

Bumps [tempfile](https://github.com/Stebalien/tempfile) from 3.19.1 to 3.20.0.
- [Changelog](https://github.com/Stebalien/tempfile/blob/master/CHANGELOG.md)
- [Commits](https://github.com/Stebalien/tempfile/compare/v3.19.1...v3.20.0)

---
updated-dependencies:
- dependency-name: tempfile
  dependency-version: 3.20.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* Use keep instead of into_path

* Use keep instead of into_path in multiple files

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Pavlos Rontidis <pavlos.rontidis@gmail.com>
Co-authored-by: Thomas Schneider <thomas.schneider@datadoghq.com>
---
 Cargo.lock                              | 4 ++--
 Cargo.toml                              | 2 +-
 lib/k8s-test-framework/src/temp_file.rs | 2 +-
 src/convert_config.rs                   | 2 +-
 src/sinks/socket.rs                     | 2 +-
 src/sinks/util/unix.rs                  | 2 +-
 src/sources/file.rs                     | 2 +-
 src/sources/socket/mod.rs               | 8 ++++----
 src/sources/statsd/mod.rs               | 2 +-
 src/sources/syslog.rs                   | 2 +-
 src/sources/util/framestream.rs         | 2 +-
 11 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index ff1cdfe628db0..3f09488ccebad 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -10188,9 +10188,9 @@ checksum = "83176759e9416cf81ee66cb6508dbfe9c96f20b8b56265a39917551c23c70964"
 
 [[package]]
 name = "tempfile"
-version = "3.19.1"
+version = "3.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7437ac7763b9b123ccf33c338a5cc1bac6f69b45a136c19bdd8a65e3916435bf"
+checksum = "e8a64e3985349f2441a1a9ef0b853f869006c3855f2cda6862a94d26ebb9d6a1"
 dependencies = [
  "fastrand 2.3.0",
  "getrandom 0.3.1",
diff --git a/Cargo.toml b/Cargo.toml
index 3864e4e9306f2..370158465977f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -164,7 +164,7 @@ semver = { version = "1.0.26", default-features = false, features = ["serde", "s
 serde_json = { version = "1.0.140", default-features = false, features = ["raw_value", "std"] }
 serde = { version = "1.0.219", default-features = false, features = ["alloc", "derive", "rc"] }
 snafu = { version = "0.7.5", default-features = false, features = ["futures", "std"] }
-tempfile = "3.19.1"
+tempfile = "3.20.0"
 tokio = { version = "1.45.1", default-features = false, features = ["full"] }
 toml = { version = "0.8.23", default-features = false, features = ["display", "parse"] }
 tonic = { version = "0.11", default-features = false, features = ["transport", "codegen", "prost", "tls", "tls-roots", "gzip"] }
diff --git a/lib/k8s-test-framework/src/temp_file.rs b/lib/k8s-test-framework/src/temp_file.rs
index d1535b6b5a658..567de01031037 100644
--- a/lib/k8s-test-framework/src/temp_file.rs
+++ b/lib/k8s-test-framework/src/temp_file.rs
@@ -9,7 +9,7 @@ pub struct TempFile {
 
 impl TempFile {
     pub fn new(file_name: &str, data: &str) -> std::io::Result<Self> {
-        let dir = tempdir()?.into_path();
+        let dir = tempdir()?.keep();
         let path = dir.join(file_name);
         std::fs::write(&path, data)?;
         Ok(Self { path })
diff --git a/src/convert_config.rs b/src/convert_config.rs
index ec80424c12fd1..526838b06cd43 100644
--- a/src/convert_config.rs
+++ b/src/convert_config.rs
@@ -271,7 +271,7 @@ mod tests {
         let input_path = test_data_dir();
         let output_dir = tempdir()
             .expect("Unable to create tempdir for config")
-            .into_path();
+            .keep();
         walk_dir_and_convert(&input_path, &output_dir, Format::Yaml).unwrap();
 
         let mut count: usize = 0;
diff --git a/src/sinks/socket.rs b/src/sinks/socket.rs
index 4768eede706e6..805fa6354355c 100644
--- a/src/sinks/socket.rs
+++ b/src/sinks/socket.rs
@@ -634,6 +634,6 @@ mod test {
 
     #[cfg(unix)]
     fn temp_uds_path(name: &str) -> PathBuf {
-        tempfile::tempdir().unwrap().into_path().join(name)
+        tempfile::tempdir().unwrap().keep().join(name)
     }
 }
diff --git a/src/sinks/util/unix.rs b/src/sinks/util/unix.rs
index efe31ad9dd9e7..9dd6e6f671e49 100644
--- a/src/sinks/util/unix.rs
+++ b/src/sinks/util/unix.rs
@@ -315,7 +315,7 @@ mod tests {
     };
 
     fn temp_uds_path(name: &str) -> PathBuf {
-        tempfile::tempdir().unwrap().into_path().join(name)
+        tempfile::tempdir().unwrap().keep().join(name)
     }
 
     #[tokio::test]
diff --git a/src/sources/file.rs b/src/sources/file.rs
index c5611caddaee6..b435d6afc8cbc 100644
--- a/src/sources/file.rs
+++ b/src/sources/file.rs
@@ -978,7 +978,7 @@ mod tests {
         let local_dir = tempdir().unwrap();
 
         let mut config = Config::default();
-        config.global.data_dir = global_dir.into_path().into();
+        config.global.data_dir = global_dir.keep().into();
 
         // local path given -- local should win
         let res = config
diff --git a/src/sources/socket/mod.rs b/src/sources/socket/mod.rs
index 13660f33693ce..af27117cfd1c1 100644
--- a/src/sources/socket/mod.rs
+++ b/src/sources/socket/mod.rs
@@ -1457,7 +1457,7 @@ mod test {
         config: Option<UnixConfig>,
     ) -> PathBuf {
         let mut config = config.unwrap_or_else(|| {
-            UnixConfig::new(tempfile::tempdir().unwrap().into_path().join("unix_test"))
+            UnixConfig::new(tempfile::tempdir().unwrap().keep().join("unix_test"))
         });
 
         let in_path = config.path.clone();
@@ -1648,7 +1648,7 @@ mod test {
     async fn unix_datagram_chunked_gelf_messages() {
         assert_source_compliance(&SOCKET_PUSH_SOURCE_TAGS, async {
             let (tx, rx) = SourceSender::new_test();
-            let in_path = tempfile::tempdir().unwrap().into_path().join("unix_test");
+            let in_path = tempfile::tempdir().unwrap().keep().join("unix_test");
             let mut config = UnixConfig::new(in_path.clone());
             config.decoding = GelfDeserializerConfig::default().into();
             let path = init_unix_with_config(tx, false, false, config).await;
@@ -1749,7 +1749,7 @@ mod test {
     #[cfg(unix)]
     #[tokio::test]
     async fn unix_datagram_permissions() {
-        let in_path = tempfile::tempdir().unwrap().into_path().join("unix_test");
+        let in_path = tempfile::tempdir().unwrap().keep().join("unix_test");
         let (tx, _) = SourceSender::new_test();
 
         let mut config = UnixConfig::new(in_path.clone());
@@ -1894,7 +1894,7 @@ mod test {
     #[cfg(unix)]
     #[tokio::test]
     async fn unix_stream_permissions() {
-        let in_path = tempfile::tempdir().unwrap().into_path().join("unix_test");
+        let in_path = tempfile::tempdir().unwrap().keep().join("unix_test");
         let (tx, _) = SourceSender::new_test();
 
         let mut config = UnixConfig::new(in_path.clone());
diff --git a/src/sources/statsd/mod.rs b/src/sources/statsd/mod.rs
index 2d64af174e851..b77ecaeca7a13 100644
--- a/src/sources/statsd/mod.rs
+++ b/src/sources/statsd/mod.rs
@@ -498,7 +498,7 @@ mod test {
     #[tokio::test]
     async fn test_statsd_unix() {
         assert_source_compliance(&SOCKET_PUSH_SOURCE_TAGS, async move {
-            let in_path = tempfile::tempdir().unwrap().into_path().join("unix_test");
+            let in_path = tempfile::tempdir().unwrap().keep().join("unix_test");
             let config = StatsdConfig::Unix(UnixConfig {
                 path: in_path.clone(),
                 sanitize: true,
diff --git a/src/sources/syslog.rs b/src/sources/syslog.rs
index 2892285fda65d..c2a9364173c4c 100644
--- a/src/sources/syslog.rs
+++ b/src/sources/syslog.rs
@@ -1195,7 +1195,7 @@ mod test {
 
         assert_source_compliance(&SOCKET_PUSH_SOURCE_TAGS, async {
             let num_messages: usize = 1;
-            let in_path = tempfile::tempdir().unwrap().into_path().join("stream_test");
+            let in_path = tempfile::tempdir().unwrap().keep().join("stream_test");
 
             // Create and spawn the source.
             let config = SyslogConfig::from_mode(Mode::Unix {
diff --git a/src/sources/util/framestream.rs b/src/sources/util/framestream.rs
index 404e56c306306..7a36196732ceb 100644
--- a/src/sources/util/framestream.rs
+++ b/src/sources/util/framestream.rs
@@ -948,7 +948,7 @@ mod test {
         pub fn new(content_type: String, multithreaded: bool, extra_routine: F) -> Self {
             Self {
                 frame_handler: MockFrameHandler::new(content_type, multithreaded, extra_routine),
-                socket_path: tempfile::tempdir().unwrap().into_path().join("unix_test"),
+                socket_path: tempfile::tempdir().unwrap().keep().join("unix_test"),
                 socket_file_mode: None,
                 socket_receive_buffer_size: None,
                 socket_send_buffer_size: None,

From bf9f3444833aa8334125632bc0ba92dcaebb47d2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 12 Jun 2025 09:34:33 -0400
Subject: [PATCH 055/305] chore(deps): Bump snafu from 0.7.5 to 0.8.0 (#19481)

Bumps [snafu](https://github.com/shepmaster/snafu) from 0.7.5 to 0.8.0.
- [Changelog](https://github.com/shepmaster/snafu/blob/main/CHANGELOG.md)
- [Commits](https://github.com/shepmaster/snafu/compare/0.7.5...0.8.0)

---
updated-dependencies:
- dependency-name: snafu
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock | 22 +++++++++++-----------
 Cargo.toml |  2 +-
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 3f09488ccebad..9698a0f4e00fb 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2287,7 +2287,7 @@ dependencies = [
  "serde_with 3.12.0",
  "similar-asserts",
  "smallvec",
- "snafu 0.7.5",
+ "snafu 0.8.0",
  "syslog_loose",
  "tokio",
  "tokio-util",
@@ -3158,7 +3158,7 @@ dependencies = [
  "criterion",
  "data-encoding",
  "hickory-proto",
- "snafu 0.7.5",
+ "snafu 0.8.0",
 ]
 
 [[package]]
@@ -3175,7 +3175,7 @@ dependencies = [
  "paste",
  "prost 0.12.6",
  "prost-build 0.12.6",
- "snafu 0.7.5",
+ "snafu 0.8.0",
  "tracing 0.1.41",
  "vector-lib",
  "vrl",
@@ -3194,7 +3194,7 @@ dependencies = [
  "anyhow",
  "serde",
  "serde_json",
- "snafu 0.7.5",
+ "snafu 0.8.0",
  "tracing 0.1.41",
  "vector-config",
  "vector-config-common",
@@ -7665,7 +7665,7 @@ dependencies = [
  "prost 0.12.6",
  "prost-build 0.12.6",
  "prost-types 0.12.6",
- "snafu 0.7.5",
+ "snafu 0.8.0",
  "vector-common",
 ]
 
@@ -9605,8 +9605,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e4de37ad025c587a29e8f3f5605c00f70b98715ef90b9061a815b9e59e9042d6"
 dependencies = [
  "doc-comment",
- "futures-core",
- "pin-project",
  "snafu-derive 0.7.5",
 ]
 
@@ -9616,6 +9614,8 @@ version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d342c51730e54029130d7dc9fd735d28c4cd360f1368c01981d4f03ff207f096"
 dependencies = [
+ "futures-core",
+ "pin-project",
  "snafu-derive 0.8.0",
 ]
 
@@ -11578,7 +11578,7 @@ dependencies = [
  "similar-asserts",
  "smallvec",
  "smpl_jwt",
- "snafu 0.7.5",
+ "snafu 0.8.0",
  "snap",
  "socket2 0.5.10",
  "sqlx",
@@ -11674,7 +11674,7 @@ dependencies = [
  "rkyv",
  "serde",
  "serde_yaml",
- "snafu 0.7.5",
+ "snafu 0.8.0",
  "temp-dir",
  "tokio",
  "tokio-test",
@@ -11726,7 +11726,7 @@ dependencies = [
  "serde",
  "serde_json",
  "serde_with 3.12.0",
- "snafu 0.7.5",
+ "snafu 0.8.0",
  "toml",
  "tracing 0.1.41",
  "url",
@@ -11820,7 +11820,7 @@ dependencies = [
  "serde_yaml",
  "similar-asserts",
  "smallvec",
- "snafu 0.7.5",
+ "snafu 0.8.0",
  "socket2 0.5.10",
  "tokio",
  "tokio-openssl",
diff --git a/Cargo.toml b/Cargo.toml
index 370158465977f..e705a9f37d613 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -163,7 +163,7 @@ rand_distr = { version = "0.5.1", default-features = false }
 semver = { version = "1.0.26", default-features = false, features = ["serde", "std"] }
 serde_json = { version = "1.0.140", default-features = false, features = ["raw_value", "std"] }
 serde = { version = "1.0.219", default-features = false, features = ["alloc", "derive", "rc"] }
-snafu = { version = "0.7.5", default-features = false, features = ["futures", "std"] }
+snafu = { version = "0.8.0", default-features = false, features = ["futures", "std"] }
 tempfile = "3.20.0"
 tokio = { version = "1.45.1", default-features = false, features = ["full"] }
 toml = { version = "0.8.23", default-features = false, features = ["display", "parse"] }

From 064efc13e37ae69500c2ae8c4cd5bb168605dc0f Mon Sep 17 00:00:00 2001
From: Thomas <thomas.schneider@datadoghq.com>
Date: Thu, 12 Jun 2025 10:20:02 -0400
Subject: [PATCH 056/305] chore(internal docs): Add enableable to allow.txt
 (#23197)

Add enableable to allow.txt
---
 .github/actions/spelling/allow.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/actions/spelling/allow.txt b/.github/actions/spelling/allow.txt
index ac5a03921a55f..71ad2a86332d6 100644
--- a/.github/actions/spelling/allow.txt
+++ b/.github/actions/spelling/allow.txt
@@ -291,6 +291,7 @@ downsides
 downwardapi
 ede
 emoji
+enableable
 esbuild
 etld
 fakeintake

From dffcb5a02c881dd94a84470722ca4e6040a9cc43 Mon Sep 17 00:00:00 2001
From: Shivanth MP <shivanth.metchem@deliveryhero.com>
Date: Thu, 12 Jun 2025 18:29:08 +0200
Subject: [PATCH 057/305] feat(dev): Enable `internal_log_rate_limit` by
 default (#22899)

* Set ratelimitng as default

* Remove explicit internal_log_rate_limit flag

* Add tests

* Review comments

* add internal ratelimit only if the field is  present

q

---------

Co-authored-by: Pavlos Rontidis <pavlos.rontidis@gmail.com>
---
 .../src/decoding/framing/chunked_gelf.rs      |  2 -
 lib/dnstap-parser/src/internal_events.rs      |  2 +-
 lib/tracing-limit/benches/limit.rs            |  1 -
 lib/tracing-limit/examples/basic.rs           |  6 +--
 lib/tracing-limit/examples/by_span.rs         |  1 -
 lib/tracing-limit/src/lib.rs                  | 45 +++++++++++++------
 lib/vector-buffers/src/internal_events.rs     |  2 +-
 .../component_events_dropped.rs               |  2 -
 .../src/internal_event/service.rs             |  3 +-
 src/app.rs                                    |  5 +--
 src/cli.rs                                    |  1 +
 src/internal_events/amqp.rs                   |  6 +--
 src/internal_events/apache_metrics.rs         |  2 +-
 src/internal_events/aws_cloudwatch_logs.rs    |  1 -
 src/internal_events/aws_ec2_metadata.rs       |  2 +-
 src/internal_events/aws_ecs_metrics.rs        |  4 +-
 src/internal_events/aws_kinesis.rs            |  2 +-
 src/internal_events/aws_kinesis_firehose.rs   |  3 +-
 src/internal_events/aws_sqs.rs                | 10 ++---
 src/internal_events/batch.rs                  |  2 +-
 src/internal_events/codecs.rs                 | 10 ++---
 src/internal_events/common.rs                 |  5 +--
 src/internal_events/conditions.rs             |  1 -
 src/internal_events/datadog_agent.rs          |  2 +-
 src/internal_events/datadog_metrics.rs        |  1 -
 src/internal_events/datadog_traces.rs         |  4 +-
 src/internal_events/dnstap.rs                 |  2 +-
 src/internal_events/docker_logs.rs            |  2 +-
 src/internal_events/encoding_transcode.rs     |  1 -
 src/internal_events/eventstoredb_metrics.rs   |  4 +-
 src/internal_events/exec.rs                   |  9 ++--
 src/internal_events/file.rs                   |  9 ++--
 src/internal_events/fluent.rs                 |  2 +-
 src/internal_events/gcp_pubsub.rs             |  6 +--
 src/internal_events/host_metrics.rs           |  5 +--
 src/internal_events/http.rs                   |  2 +-
 src/internal_events/http_client.rs            |  2 +-
 src/internal_events/http_client_source.rs     |  4 +-
 src/internal_events/influxdb.rs               |  1 -
 src/internal_events/journald.rs               |  9 ++--
 src/internal_events/kafka.rs                  |  5 +--
 src/internal_events/kubernetes_logs.rs        | 10 ++---
 src/internal_events/logplex.rs                |  2 +-
 src/internal_events/loki.rs                   |  4 --
 src/internal_events/lua.rs                    |  3 +-
 src/internal_events/metric_to_log.rs          |  1 -
 src/internal_events/mongodb_metrics.rs        |  4 +-
 src/internal_events/mqtt.rs                   |  2 +-
 src/internal_events/nginx_metrics.rs          |  4 +-
 src/internal_events/parser.rs                 |  1 -
 src/internal_events/postgresql_metrics.rs     |  2 +-
 src/internal_events/process.rs                |  3 --
 src/internal_events/prometheus.rs             |  5 +--
 src/internal_events/pulsar.rs                 | 10 ++---
 src/internal_events/redis.rs                  |  2 +-
 src/internal_events/reduce.rs                 |  2 +-
 src/internal_events/remap.rs                  |  2 +-
 src/internal_events/sematext_metrics.rs       |  4 +-
 src/internal_events/socket.rs                 |  6 +--
 src/internal_events/splunk_hec.rs             | 10 ++---
 src/internal_events/statsd_sink.rs            |  2 +-
 src/internal_events/tag_cardinality_limit.rs  |  2 -
 src/internal_events/tcp.rs                    |  4 --
 src/internal_events/template.rs               |  4 +-
 src/internal_events/udp.rs                    |  1 -
 src/internal_events/unix.rs                   |  7 ++-
 src/internal_events/websocket.rs              |  4 +-
 src/internal_events/websocket_server.rs       |  4 +-
 src/internal_events/windows.rs                |  1 -
 src/sinks/datadog/logs/sink.rs                |  1 -
 src/sinks/datadog/traces/apm_stats/flusher.rs |  1 -
 src/sinks/gcp/stackdriver/logs/encoder.rs     |  1 -
 .../util/adaptive_concurrency/controller.rs   |  1 -
 src/sinks/util/retries.rs                     |  4 +-
 src/sources/datadog_agent/metrics.rs          |  5 +--
 src/sources/heroku_logs.rs                    |  1 -
 src/sources/socket/udp.rs                     |  2 -
 src/transforms/lua/v1/mod.rs                  |  1 -
 78 files changed, 135 insertions(+), 176 deletions(-)

diff --git a/lib/codecs/src/decoding/framing/chunked_gelf.rs b/lib/codecs/src/decoding/framing/chunked_gelf.rs
index b5a67b7aec5ba..286645cfa5698 100644
--- a/lib/codecs/src/decoding/framing/chunked_gelf.rs
+++ b/lib/codecs/src/decoding/framing/chunked_gelf.rs
@@ -387,7 +387,6 @@ impl ChunkedGelfDecoder {
                     warn!(
                         message_id = message_id,
                         timeout_secs = timeout.as_secs_f64(),
-                        internal_log_rate_limit = true,
                         "Message was not fully received within the timeout window. Discarding it."
                     );
                 }
@@ -409,7 +408,6 @@ impl ChunkedGelfDecoder {
             debug!(
                 message_id = message_id,
                 sequence_number = sequence_number,
-                internal_log_rate_limit = true,
                 "Received a duplicate chunk. Ignoring it."
             );
             return Ok(None);
diff --git a/lib/dnstap-parser/src/internal_events.rs b/lib/dnstap-parser/src/internal_events.rs
index ab1635c9b3e03..2ce75acb19709 100644
--- a/lib/dnstap-parser/src/internal_events.rs
+++ b/lib/dnstap-parser/src/internal_events.rs
@@ -14,7 +14,7 @@ impl<E: std::fmt::Display> InternalEvent for DnstapParseWarning<E> {
             error = %self.error,
             stage = error_stage::PROCESSING,
             error_type = error_type::PARSER_FAILED,
-            internal_log_rate_limit = true,
+
         );
     }
 }
diff --git a/lib/tracing-limit/benches/limit.rs b/lib/tracing-limit/benches/limit.rs
index f7214525e9819..86ffbae5bf206 100644
--- a/lib/tracing-limit/benches/limit.rs
+++ b/lib/tracing-limit/benches/limit.rs
@@ -59,7 +59,6 @@ fn bench(c: &mut Criterion) {
                             bar = "bar",
                             baz = 3,
                             quuux = ?0.99,
-                            internal_log_rate_limit = true
                         )
                     }
                 })
diff --git a/lib/tracing-limit/examples/basic.rs b/lib/tracing-limit/examples/basic.rs
index 3b4428d540997..86c973739b13a 100644
--- a/lib/tracing-limit/examples/basic.rs
+++ b/lib/tracing-limit/examples/basic.rs
@@ -14,11 +14,7 @@ fn main() {
     tracing::dispatcher::with_default(&dispatch, || {
         for i in 0..40usize {
             trace!("This field is not rate limited!");
-            info!(
-                message = "This message is rate limited",
-                count = &i,
-                internal_log_rate_limit = true,
-            );
+            info!(message = "This message is rate limited", count = &i,);
             std::thread::sleep(std::time::Duration::from_millis(1000));
         }
     })
diff --git a/lib/tracing-limit/examples/by_span.rs b/lib/tracing-limit/examples/by_span.rs
index 63b8775d9905d..0c7e81666d279 100644
--- a/lib/tracing-limit/examples/by_span.rs
+++ b/lib/tracing-limit/examples/by_span.rs
@@ -28,7 +28,6 @@ fn main() {
                         message =
                             "This message is rate limited by its component and vrl_line_number",
                         count = &i,
-                        internal_log_rate_limit = true,
                     );
                 }
             }
diff --git a/lib/tracing-limit/src/lib.rs b/lib/tracing-limit/src/lib.rs
index bd5952bf39760..dc131b3e31b39 100644
--- a/lib/tracing-limit/src/lib.rs
+++ b/lib/tracing-limit/src/lib.rs
@@ -129,7 +129,7 @@ where
         let mut limit_visitor = LimitVisitor::default();
         event.record(&mut limit_visitor);
 
-        let limit_exists = limit_visitor.limit.unwrap_or(false);
+        let limit_exists = limit_visitor.limit.unwrap_or(true);
         if !limit_exists {
             return self.inner.on_event(event, ctx);
         }
@@ -264,11 +264,8 @@ where
             let valueset = fields.value_set(&values);
             let event = Event::new(metadata, &valueset);
             self.inner.on_event(&event, ctx.clone());
-        } else {
-            let values = [(
-                &fields.field(RATE_LIMIT_FIELD).unwrap(),
-                Some(&rate_limit as &dyn Value),
-            )];
+        } else if let Some(ratelimit_field) = fields.field(RATE_LIMIT_FIELD) {
+            let values = [(&ratelimit_field, Some(&rate_limit as &dyn Value))];
 
             let valueset = fields.value_set(&values);
             let event = Event::new(metadata, &valueset);
@@ -525,6 +522,34 @@ mod test {
         );
     }
 
+    #[test]
+    fn rate_limits_default() {
+        let events: Arc<Mutex<Vec<String>>> = Default::default();
+
+        let recorder = RecordingLayer::new(Arc::clone(&events));
+        let sub = tracing_subscriber::registry::Registry::default()
+            .with(RateLimitedLayer::new(recorder).with_default_limit(10));
+        tracing::subscriber::with_default(sub, || {
+            for _ in 0..21 {
+                info!(message = "Hello world!");
+                MockClock::advance(Duration::from_millis(100));
+            }
+        });
+
+        let events = events.lock().unwrap();
+
+        assert_eq!(
+            *events,
+            vec![
+                "Hello world!",
+                "Internal log [Hello world!] is being suppressed to avoid flooding.",
+            ]
+            .into_iter()
+            .map(std::borrow::ToOwned::to_owned)
+            .collect::<Vec<String>>()
+        );
+    }
+
     #[test]
     fn override_rate_limit_at_callsite() {
         let events: Arc<Mutex<Vec<String>>> = Default::default();
@@ -534,11 +559,7 @@ mod test {
             .with(RateLimitedLayer::new(recorder).with_default_limit(100));
         tracing::subscriber::with_default(sub, || {
             for _ in 0..21 {
-                info!(
-                    message = "Hello world!",
-                    internal_log_rate_limit = true,
-                    internal_log_rate_secs = 1
-                );
+                info!(message = "Hello world!", internal_log_rate_secs = 1);
                 MockClock::advance(Duration::from_millis(100));
             }
         });
@@ -579,7 +600,6 @@ mod test {
                         info!(
                             message =
                                 format!("Hello {} on line_number {}!", key, line_number).as_str(),
-                            internal_log_rate_limit = true
                         );
                     }
                 }
@@ -641,7 +661,6 @@ mod test {
                         info!(
                             message =
                                 format!("Hello {} on line_number {}!", key, line_number).as_str(),
-                            internal_log_rate_limit = true,
                             component_id = &key,
                             vrl_position = &line_number
                         );
diff --git a/lib/vector-buffers/src/internal_events.rs b/lib/vector-buffers/src/internal_events.rs
index 0cda5beec46f9..055f09ebb6e62 100644
--- a/lib/vector-buffers/src/internal_events.rs
+++ b/lib/vector-buffers/src/internal_events.rs
@@ -115,7 +115,7 @@ impl InternalEvent for BufferReadError {
             error_code = self.error_code,
             error_type = error_type::READER_FAILED,
             stage = "processing",
-            internal_log_rate_limit = true,
+
         );
         counter!(
             "buffer_errors_total", "error_code" => self.error_code,
diff --git a/lib/vector-common/src/internal_event/component_events_dropped.rs b/lib/vector-common/src/internal_event/component_events_dropped.rs
index c7d2bd9eedd32..f8838911ff8a0 100644
--- a/lib/vector-common/src/internal_event/component_events_dropped.rs
+++ b/lib/vector-common/src/internal_event/component_events_dropped.rs
@@ -58,7 +58,6 @@ impl<const INTENDED: bool> InternalEventHandle for DroppedHandle<'_, INTENDED> {
                 intentional = INTENDED,
                 count = data.0,
                 reason = self.reason,
-                internal_log_rate_limit = true,
             );
         } else {
             error!(
@@ -66,7 +65,6 @@ impl<const INTENDED: bool> InternalEventHandle for DroppedHandle<'_, INTENDED> {
                 intentional = INTENDED,
                 count = data.0,
                 reason = self.reason,
-                internal_log_rate_limit = true,
             );
         }
         self.discarded_events.increment(data.0 as u64);
diff --git a/lib/vector-common/src/internal_event/service.rs b/lib/vector-common/src/internal_event/service.rs
index 20132cc99fc61..d6c912f9d3fbc 100644
--- a/lib/vector-common/src/internal_event/service.rs
+++ b/lib/vector-common/src/internal_event/service.rs
@@ -14,7 +14,6 @@ impl<E: std::fmt::Debug> InternalEvent for PollReadyError<E> {
             error = ?self.error,
             error_type = error_type::REQUEST_FAILED,
             stage = error_stage::SENDING,
-            internal_log_rate_limit = true,
         );
         counter!(
             "component_errors_total",
@@ -45,7 +44,7 @@ impl<E: std::fmt::Debug> InternalEvent for CallError<E> {
             request_id = self.request_id,
             error_type = error_type::REQUEST_FAILED,
             stage = error_stage::SENDING,
-            internal_log_rate_limit = true,
+
         );
         counter!(
             "component_errors_total",
diff --git a/src/app.rs b/src/app.rs
index 04023ebba4bab..2095ce57fbbb6 100644
--- a/src/app.rs
+++ b/src/app.rs
@@ -590,10 +590,7 @@ pub fn init_logging(color: bool, format: LogFormat, log_level: &str, rate: u64)
     };
 
     trace::init(color, json, &level, rate);
-    debug!(
-        message = "Internal log rate limit configured.",
-        internal_log_rate_secs = rate,
-    );
+    debug!(message = "Internal log rate limit configured.",);
     info!(message = "Log level is enabled.", level = ?level);
 }
 
diff --git a/src/cli.rs b/src/cli.rs
index 279560154585c..93e1dfea4d6bd 100644
--- a/src/cli.rs
+++ b/src/cli.rs
@@ -178,6 +178,7 @@ pub struct RootOpts {
     pub watch_config_poll_interval_seconds: NonZeroU64,
 
     /// Set the internal log rate limit
+    /// Note that traces are throttled by default unless tagged with `internal_log_rate_limit = false`.
     #[arg(
         short,
         long,
diff --git a/src/internal_events/amqp.rs b/src/internal_events/amqp.rs
index c66a3d9087016..677ec605ea234 100644
--- a/src/internal_events/amqp.rs
+++ b/src/internal_events/amqp.rs
@@ -36,7 +36,7 @@ pub mod source {
                    error = ?self.error,
                    error_type = error_type::REQUEST_FAILED,
                    stage = error_stage::RECEIVING,
-                   internal_log_rate_limit = true,
+
             );
             counter!(
                 "component_errors_total",
@@ -58,7 +58,7 @@ pub mod source {
                    error = ?self.error,
                    error_type = error_type::ACKNOWLEDGMENT_FAILED,
                    stage = error_stage::RECEIVING,
-                   internal_log_rate_limit = true,
+
             );
             counter!(
                 "component_errors_total",
@@ -80,7 +80,7 @@ pub mod source {
                    error = ?self.error,
                    error_type = error_type::COMMAND_FAILED,
                    stage = error_stage::RECEIVING,
-                   internal_log_rate_limit = true,
+
             );
             counter!(
                 "component_errors_total",
diff --git a/src/internal_events/apache_metrics.rs b/src/internal_events/apache_metrics.rs
index 79ae7dced79b4..849741e44dd41 100644
--- a/src/internal_events/apache_metrics.rs
+++ b/src/internal_events/apache_metrics.rs
@@ -46,7 +46,7 @@ impl InternalEvent for ApacheMetricsParseError<'_> {
             stage = error_stage::PROCESSING,
             error_type = error_type::PARSER_FAILED,
             endpoint = %self.endpoint,
-            internal_log_rate_limit = true,
+
         );
         counter!(
             "component_errors_total",
diff --git a/src/internal_events/aws_cloudwatch_logs.rs b/src/internal_events/aws_cloudwatch_logs.rs
index d4bfe0328a53b..d8c4838dab7e1 100644
--- a/src/internal_events/aws_cloudwatch_logs.rs
+++ b/src/internal_events/aws_cloudwatch_logs.rs
@@ -18,7 +18,6 @@ impl InternalEvent for AwsCloudwatchLogsMessageSizeError {
             error_code = "message_too_long",
             error_type = error_type::ENCODER_FAILED,
             stage = error_stage::PROCESSING,
-            internal_log_rate_limit = true,
         );
         counter!(
             "component_errors_total",
diff --git a/src/internal_events/aws_ec2_metadata.rs b/src/internal_events/aws_ec2_metadata.rs
index 3e0996a3c9f60..3eafadf20222d 100644
--- a/src/internal_events/aws_ec2_metadata.rs
+++ b/src/internal_events/aws_ec2_metadata.rs
@@ -24,7 +24,7 @@ impl InternalEvent for AwsEc2MetadataRefreshError {
             error = %self.error,
             error_type = error_type::REQUEST_FAILED,
             stage = error_stage::PROCESSING,
-            internal_log_rate_limit = true,
+
         );
         counter!(
             "component_errors_total",
diff --git a/src/internal_events/aws_ecs_metrics.rs b/src/internal_events/aws_ecs_metrics.rs
index 1a2f7133094ce..969c5c33aa2e6 100644
--- a/src/internal_events/aws_ecs_metrics.rs
+++ b/src/internal_events/aws_ecs_metrics.rs
@@ -50,12 +50,12 @@ impl InternalEvent for AwsEcsMetricsParseError<'_> {
             error = ?self.error,
             stage = error_stage::PROCESSING,
             error_type = error_type::PARSER_FAILED,
-            internal_log_rate_limit = true,
+
         );
         debug!(
             message = %format!("Failed to parse response:\\n\\n{}\\n\\n", self.body.escape_debug()),
             endpoint = %self.endpoint,
-            internal_log_rate_limit = true,
+
         );
         counter!("parse_errors_total").increment(1);
         counter!(
diff --git a/src/internal_events/aws_kinesis.rs b/src/internal_events/aws_kinesis.rs
index 332f55d08b25e..fd5f73bb7e11f 100644
--- a/src/internal_events/aws_kinesis.rs
+++ b/src/internal_events/aws_kinesis.rs
@@ -17,7 +17,7 @@ impl InternalEvent for AwsKinesisStreamNoPartitionKeyError<'_> {
             partition_key_field = %self.partition_key_field,
             error_type = error_type::PARSER_FAILED,
             stage = error_stage::PROCESSING,
-            internal_log_rate_limit = true,
+
         );
 
         counter!(
diff --git a/src/internal_events/aws_kinesis_firehose.rs b/src/internal_events/aws_kinesis_firehose.rs
index d98d5ed5fa1c4..317435696b799 100644
--- a/src/internal_events/aws_kinesis_firehose.rs
+++ b/src/internal_events/aws_kinesis_firehose.rs
@@ -48,7 +48,6 @@ impl InternalEvent for AwsKinesisFirehoseRequestError<'_> {
             error_type = error_type::REQUEST_FAILED,
             error_code = %self.error_code,
             request_id = %self.request_id.unwrap_or(""),
-            internal_log_rate_limit = true,
         );
         counter!(
             "component_errors_total",
@@ -75,7 +74,7 @@ impl InternalEvent for AwsKinesisFirehoseAutomaticRecordDecodeError {
             error_type = error_type::PARSER_FAILED,
             error_code = %io_error_code(&self.error),
             compression = %self.compression,
-            internal_log_rate_limit = true,
+
         );
         counter!(
             "component_errors_total",
diff --git a/src/internal_events/aws_sqs.rs b/src/internal_events/aws_sqs.rs
index 490a65f004190..37f4ea98d25ec 100644
--- a/src/internal_events/aws_sqs.rs
+++ b/src/internal_events/aws_sqs.rs
@@ -30,7 +30,7 @@ mod s3 {
                 error_code = "failed_processing_sqs_message",
                 error_type = error_type::PARSER_FAILED,
                 stage = error_stage::PROCESSING,
-                internal_log_rate_limit = true,
+
             );
             counter!(
                 "component_errors_total",
@@ -74,7 +74,7 @@ mod s3 {
                 error_code = "failed_deleting_some_sqs_messages",
                 error_type = error_type::ACKNOWLEDGMENT_FAILED,
                 stage = error_stage::PROCESSING,
-                internal_log_rate_limit = true,
+
             );
             counter!(
                 "component_errors_total",
@@ -104,7 +104,7 @@ mod s3 {
                 error_code = "failed_deleting_all_sqs_messages",
                 error_type = error_type::ACKNOWLEDGMENT_FAILED,
                 stage = error_stage::PROCESSING,
-                internal_log_rate_limit = true,
+
             );
             counter!(
                 "component_errors_total",
@@ -204,7 +204,7 @@ impl<E: std::fmt::Display> InternalEvent for SqsMessageReceiveError<'_, E> {
             error_code = "failed_fetching_sqs_events",
             error_type = error_type::REQUEST_FAILED,
             stage = error_stage::RECEIVING,
-            internal_log_rate_limit = true,
+
         );
         counter!(
             "component_errors_total",
@@ -257,7 +257,7 @@ impl<E: std::fmt::Display> InternalEvent for SqsMessageDeleteError<'_, E> {
             error = %self.error,
             error_type = error_type::WRITER_FAILED,
             stage = error_stage::PROCESSING,
-            internal_log_rate_limit = true,
+
         );
         counter!(
             "component_errors_total",
diff --git a/src/internal_events/batch.rs b/src/internal_events/batch.rs
index 816afa4398d5f..5afc99d47f1bf 100644
--- a/src/internal_events/batch.rs
+++ b/src/internal_events/batch.rs
@@ -17,7 +17,7 @@ impl InternalEvent for LargeEventDroppedError {
             length = %self.length,
             error_type = error_type::CONDITION_FAILED,
             stage = error_stage::SENDING,
-            internal_log_rate_limit = true,
+
         );
         counter!(
             "component_errors_total",
diff --git a/src/internal_events/codecs.rs b/src/internal_events/codecs.rs
index 50251bf089cd3..e876db1dab5ab 100644
--- a/src/internal_events/codecs.rs
+++ b/src/internal_events/codecs.rs
@@ -15,7 +15,7 @@ impl<E: std::fmt::Display> InternalEvent for DecoderFramingError<E> {
             error_code = "decoder_frame",
             error_type = error_type::PARSER_FAILED,
             stage = error_stage::PROCESSING,
-            internal_log_rate_limit = true,
+
         );
         counter!(
             "component_errors_total",
@@ -40,7 +40,7 @@ impl InternalEvent for DecoderDeserializeError<'_> {
             error_code = "decoder_deserialize",
             error_type = error_type::PARSER_FAILED,
             stage = error_stage::PROCESSING,
-            internal_log_rate_limit = true,
+
         );
         counter!(
             "component_errors_total",
@@ -66,7 +66,7 @@ impl InternalEvent for EncoderFramingError<'_> {
             error_code = "encoder_frame",
             error_type = error_type::ENCODER_FAILED,
             stage = error_stage::SENDING,
-            internal_log_rate_limit = true,
+
         );
         counter!(
             "component_errors_total",
@@ -93,7 +93,7 @@ impl InternalEvent for EncoderSerializeError<'_> {
             error_code = "encoder_serialize",
             error_type = error_type::ENCODER_FAILED,
             stage = error_stage::SENDING,
-            internal_log_rate_limit = true,
+
         );
         counter!(
             "component_errors_total",
@@ -120,7 +120,7 @@ impl<E: std::fmt::Display> InternalEvent for EncoderWriteError<'_, E> {
             error = %self.error,
             error_type = error_type::IO_FAILED,
             stage = error_stage::SENDING,
-            internal_log_rate_limit = true,
+
         );
         counter!(
             "component_errors_total",
diff --git a/src/internal_events/common.rs b/src/internal_events/common.rs
index 78971840d7dba..f342710daedb2 100644
--- a/src/internal_events/common.rs
+++ b/src/internal_events/common.rs
@@ -66,7 +66,7 @@ impl<E: std::error::Error> InternalEvent for SocketOutgoingConnectionError<E> {
             error_code = "failed_connecting",
             error_type = error_type::CONNECTION_FAILED,
             stage = error_stage::SENDING,
-            internal_log_rate_limit = true,
+
         );
         counter!(
             "component_errors_total",
@@ -92,7 +92,6 @@ impl InternalEvent for StreamClosedError {
             error_code = STREAM_CLOSED,
             error_type = error_type::WRITER_FAILED,
             stage = error_stage::SENDING,
-            internal_log_rate_limit = true,
         );
         counter!(
             "component_errors_total",
@@ -137,7 +136,7 @@ impl<E: std::fmt::Display> InternalEvent for SinkRequestBuildError<E> {
             error = %self.error,
             error_type = error_type::ENCODER_FAILED,
             stage = error_stage::PROCESSING,
-            internal_log_rate_limit = true,
+
         );
         counter!(
             "component_errors_total",
diff --git a/src/internal_events/conditions.rs b/src/internal_events/conditions.rs
index bf825213c6719..0f7cb70962b08 100644
--- a/src/internal_events/conditions.rs
+++ b/src/internal_events/conditions.rs
@@ -14,7 +14,6 @@ impl InternalEvent for VrlConditionExecutionError<'_> {
             error = %self.error,
             error_type = error_type::SCRIPT_FAILED,
             stage = error_stage::PROCESSING,
-            internal_log_rate_limit = true,
         );
         counter!(
             "component_errors_total",
diff --git a/src/internal_events/datadog_agent.rs b/src/internal_events/datadog_agent.rs
index 02f017bc076bb..686e3e0e3179c 100644
--- a/src/internal_events/datadog_agent.rs
+++ b/src/internal_events/datadog_agent.rs
@@ -15,7 +15,7 @@ impl InternalEvent for DatadogAgentJsonParseError<'_> {
             error = ?self.error,
             error_type = error_type::PARSER_FAILED,
             stage = error_stage::PROCESSING,
-            internal_log_rate_limit = true,
+
         );
         counter!(
             "component_errors_total",
diff --git a/src/internal_events/datadog_metrics.rs b/src/internal_events/datadog_metrics.rs
index 8875b29281ac7..03812c2c81def 100644
--- a/src/internal_events/datadog_metrics.rs
+++ b/src/internal_events/datadog_metrics.rs
@@ -17,7 +17,6 @@ impl InternalEvent for DatadogMetricsEncodingError<'_> {
             error_type = error_type::ENCODER_FAILED,
             intentional = "false",
             stage = error_stage::PROCESSING,
-            internal_log_rate_limit = true,
         );
         counter!(
             "component_errors_total",
diff --git a/src/internal_events/datadog_traces.rs b/src/internal_events/datadog_traces.rs
index dd1df213cdf06..aee946528391b 100644
--- a/src/internal_events/datadog_traces.rs
+++ b/src/internal_events/datadog_traces.rs
@@ -18,7 +18,7 @@ impl InternalEvent for DatadogTracesEncodingError {
             error_reason = %self.error_reason,
             error_type = error_type::ENCODER_FAILED,
             stage = error_stage::PROCESSING,
-            internal_log_rate_limit = true,
+
         );
         counter!(
             "component_errors_total",
@@ -48,7 +48,7 @@ impl<E: std::fmt::Display> InternalEvent for DatadogTracesAPMStatsError<E> {
             error = %self.error,
             error_type = error_type::WRITER_FAILED,
             stage = error_stage::SENDING,
-            internal_log_rate_limit = true,
+
         );
         counter!(
             "component_errors_total",
diff --git a/src/internal_events/dnstap.rs b/src/internal_events/dnstap.rs
index 231a6527830d7..adf9ea8688d6c 100644
--- a/src/internal_events/dnstap.rs
+++ b/src/internal_events/dnstap.rs
@@ -14,7 +14,7 @@ impl<E: std::fmt::Display> InternalEvent for DnstapParseError<E> {
             error = %self.error,
             stage = error_stage::PROCESSING,
             error_type = error_type::PARSER_FAILED,
-            internal_log_rate_limit = true,
+
         );
         counter!(
             "component_errors_total",
diff --git a/src/internal_events/docker_logs.rs b/src/internal_events/docker_logs.rs
index 81950b1fa947a..f1daaa6c2d4f4 100644
--- a/src/internal_events/docker_logs.rs
+++ b/src/internal_events/docker_logs.rs
@@ -170,7 +170,7 @@ impl InternalEvent for DockerLogsLoggingDriverUnsupportedError<'_> {
             error_type = error_type::CONFIGURATION_FAILED,
             stage = error_stage::RECEIVING,
             container_id = ?self.container_id,
-            internal_log_rate_limit = true,
+
         );
         counter!(
             "component_errors_total",
diff --git a/src/internal_events/encoding_transcode.rs b/src/internal_events/encoding_transcode.rs
index 0a377f52ca1ee..869423fb98241 100644
--- a/src/internal_events/encoding_transcode.rs
+++ b/src/internal_events/encoding_transcode.rs
@@ -27,7 +27,6 @@ impl InternalEvent for DecoderMalformedReplacement {
         warn!(
             message = "Replaced malformed sequences with replacement character while decoding to utf8.",
             from_encoding = %self.from_encoding,
-            internal_log_rate_limit = true
         );
         // NOT the actual number of replacements in the output: there's no easy
         // way to get that from the lib we use here (encoding_rs)
diff --git a/src/internal_events/eventstoredb_metrics.rs b/src/internal_events/eventstoredb_metrics.rs
index b5d7fadd088dc..7ee7f36cf9f50 100644
--- a/src/internal_events/eventstoredb_metrics.rs
+++ b/src/internal_events/eventstoredb_metrics.rs
@@ -14,7 +14,7 @@ impl InternalEvent for EventStoreDbMetricsHttpError {
             error = ?self.error,
             stage = error_stage::RECEIVING,
             error_type = error_type::REQUEST_FAILED,
-            internal_log_rate_limit = true,
+
         );
         counter!(
             "component_errors_total",
@@ -37,7 +37,7 @@ impl InternalEvent for EventStoreDbStatsParsingError {
             error = ?self.error,
             stage = error_stage::PROCESSING,
             error_type = error_type::PARSER_FAILED,
-            internal_log_rate_limit = true,
+
         );
         counter!(
             "component_errors_total",
diff --git a/src/internal_events/exec.rs b/src/internal_events/exec.rs
index 539471719d0e9..3a5ffe7c1c9ef 100644
--- a/src/internal_events/exec.rs
+++ b/src/internal_events/exec.rs
@@ -53,7 +53,7 @@ impl InternalEvent for ExecFailedError<'_> {
             error_type = error_type::COMMAND_FAILED,
             error_code = %io_error_code(&self.error),
             stage = error_stage::RECEIVING,
-            internal_log_rate_limit = true,
+
         );
         counter!(
             "component_errors_total",
@@ -82,7 +82,7 @@ impl InternalEvent for ExecTimeoutError<'_> {
             error = %self.error,
             error_type = error_type::TIMED_OUT,
             stage = error_stage::RECEIVING,
-            internal_log_rate_limit = true,
+
         );
         counter!(
             "component_errors_total",
@@ -118,7 +118,7 @@ impl InternalEvent for ExecCommandExecuted<'_> {
             command = %self.command,
             exit_status = %exit_status,
             elapsed_millis = %self.exec_duration.as_millis(),
-            internal_log_rate_limit = true,
+
         );
         counter!(
             "command_executed_total",
@@ -194,7 +194,7 @@ impl InternalEvent for ExecFailedToSignalChildError<'_> {
             error_code = %self.error.to_error_code(),
             error_type = error_type::COMMAND_FAILED,
             stage = error_stage::RECEIVING,
-            internal_log_rate_limit = true,
+
         );
         counter!(
             "component_errors_total",
@@ -216,7 +216,6 @@ impl InternalEvent for ExecChannelClosedError {
             message = exec_reason,
             error_type = error_type::COMMAND_FAILED,
             stage = error_stage::RECEIVING,
-            internal_log_rate_limit = true,
         );
         counter!(
             "component_errors_total",
diff --git a/src/internal_events/file.rs b/src/internal_events/file.rs
index fba86d6ad1b72..84cf828c89d7a 100644
--- a/src/internal_events/file.rs
+++ b/src/internal_events/file.rs
@@ -83,7 +83,6 @@ impl<P: std::fmt::Debug> InternalEvent for FileIoError<'_, P> {
             error_code = %self.code,
             error_type = error_type::IO_FAILED,
             stage = error_stage::SENDING,
-            internal_log_rate_limit = true,
         );
         counter!(
             "component_errors_total",
@@ -222,7 +221,7 @@ mod source {
                 error_code = "reading_fingerprint",
                 error_type = error_type::READER_FAILED,
                 stage = error_stage::RECEIVING,
-                internal_log_rate_limit = true,
+
             );
             if self.include_file_metric_tag {
                 counter!(
@@ -262,7 +261,6 @@ mod source {
                 error_code = DELETION_FAILED,
                 error_type = error_type::COMMAND_FAILED,
                 stage = error_stage::RECEIVING,
-                internal_log_rate_limit = true,
             );
             if self.include_file_metric_tag {
                 counter!(
@@ -355,7 +353,7 @@ mod source {
                 error_type = error_type::COMMAND_FAILED,
                 stage = error_stage::RECEIVING,
                 file = %self.file.display(),
-                internal_log_rate_limit = true,
+
             );
             if self.include_file_metric_tag {
                 counter!(
@@ -457,7 +455,7 @@ mod source {
                 error_code = "writing_checkpoints",
                 error_type = error_type::WRITER_FAILED,
                 stage = error_stage::RECEIVING,
-                internal_log_rate_limit = true,
+
             );
             counter!(
                 "component_errors_total",
@@ -484,7 +482,6 @@ mod source {
                 error_type = error_type::READER_FAILED,
                 stage = error_stage::RECEIVING,
                 path = %self.path.display(),
-                internal_log_rate_limit = true,
             );
             counter!(
                 "component_errors_total",
diff --git a/src/internal_events/fluent.rs b/src/internal_events/fluent.rs
index 3493db9cd762d..aa0d26610b72a 100644
--- a/src/internal_events/fluent.rs
+++ b/src/internal_events/fluent.rs
@@ -30,7 +30,7 @@ impl InternalEvent for FluentMessageDecodeError<'_> {
             base64_encoded_message = %self.base64_encoded_message,
             error_type = error_type::PARSER_FAILED,
             stage = error_stage::PROCESSING,
-            internal_log_rate_limit = true,
+
         );
         counter!(
             "component_errors_total",
diff --git a/src/internal_events/gcp_pubsub.rs b/src/internal_events/gcp_pubsub.rs
index 1f6a7b5253514..be3f274e8d225 100644
--- a/src/internal_events/gcp_pubsub.rs
+++ b/src/internal_events/gcp_pubsub.rs
@@ -14,7 +14,7 @@ impl InternalEvent for GcpPubsubConnectError {
             error_code = "failed_connecting",
             error_type = error_type::CONNECTION_FAILED,
             stage = error_stage::RECEIVING,
-            internal_log_rate_limit = true,
+
         );
 
         counter!(
@@ -39,7 +39,7 @@ impl InternalEvent for GcpPubsubStreamingPullError {
             error_code = "failed_streaming_pull",
             error_type = error_type::REQUEST_FAILED,
             stage = error_stage::RECEIVING,
-            internal_log_rate_limit = true,
+
         );
 
         counter!(
@@ -64,7 +64,7 @@ impl InternalEvent for GcpPubsubReceiveError {
             error_code = "failed_fetching_events",
             error_type = error_type::REQUEST_FAILED,
             stage = error_stage::RECEIVING,
-            internal_log_rate_limit = true,
+
         );
 
         counter!(
diff --git a/src/internal_events/host_metrics.rs b/src/internal_events/host_metrics.rs
index 3352e529edf0a..56d5649159dfb 100644
--- a/src/internal_events/host_metrics.rs
+++ b/src/internal_events/host_metrics.rs
@@ -13,7 +13,6 @@ impl InternalEvent for HostMetricsScrapeError {
             message = self.message,
             error_type = error_type::READER_FAILED,
             stage = error_stage::RECEIVING,
-            internal_log_rate_limit = true,
         );
 
         counter!(
@@ -38,7 +37,7 @@ impl<E: std::fmt::Display> InternalEvent for HostMetricsScrapeDetailError<E> {
             error = %self.error,
             error_type = error_type::READER_FAILED,
             stage = error_stage::RECEIVING,
-            internal_log_rate_limit = true,
+
         );
 
         counter!(
@@ -65,7 +64,7 @@ impl InternalEvent for HostMetricsScrapeFilesystemError {
             error = %self.error,
             error_type = error_type::READER_FAILED,
             stage = error_stage::RECEIVING,
-            internal_log_rate_limit = true,
+
         );
 
         counter!(
diff --git a/src/internal_events/http.rs b/src/internal_events/http.rs
index b2b3bfec4ad95..5a1e818dcc484 100644
--- a/src/internal_events/http.rs
+++ b/src/internal_events/http.rs
@@ -127,7 +127,7 @@ impl InternalEvent for HttpBadRequest<'_> {
             error_type = error_type::REQUEST_FAILED,
             error_stage = error_stage::RECEIVING,
             http_code = %self.code,
-            internal_log_rate_limit = true,
+
         );
         counter!(
             "component_errors_total",
diff --git a/src/internal_events/http_client.rs b/src/internal_events/http_client.rs
index a6fde2f1a6dd1..155e9d8d67739 100644
--- a/src/internal_events/http_client.rs
+++ b/src/internal_events/http_client.rs
@@ -86,7 +86,7 @@ impl InternalEvent for GotHttpWarning<'_> {
             error = %self.error,
             error_type = error_type::REQUEST_FAILED,
             stage = error_stage::PROCESSING,
-            internal_log_rate_limit = true,
+
         );
         counter!("http_client_errors_total", "error_kind" => self.error.to_string()).increment(1);
         histogram!("http_client_rtt_seconds").record(self.roundtrip);
diff --git a/src/internal_events/http_client_source.rs b/src/internal_events/http_client_source.rs
index 376adf35eda56..ad1b989d3969a 100644
--- a/src/internal_events/http_client_source.rs
+++ b/src/internal_events/http_client_source.rs
@@ -49,7 +49,7 @@ impl InternalEvent for HttpClientHttpResponseError {
             stage = error_stage::RECEIVING,
             error_type = error_type::REQUEST_FAILED,
             error_code = %http_error_code(self.code.as_u16()),
-            internal_log_rate_limit = true,
+
         );
         counter!(
             "component_errors_total",
@@ -76,7 +76,7 @@ impl InternalEvent for HttpClientHttpError {
             error = ?self.error,
             error_type = error_type::REQUEST_FAILED,
             stage = error_stage::RECEIVING,
-            internal_log_rate_limit = true,
+
         );
         counter!(
             "component_errors_total",
diff --git a/src/internal_events/influxdb.rs b/src/internal_events/influxdb.rs
index 007f5565f1a8f..d487353b8dc68 100644
--- a/src/internal_events/influxdb.rs
+++ b/src/internal_events/influxdb.rs
@@ -16,7 +16,6 @@ impl InternalEvent for InfluxdbEncodingError {
             error = %self.error_message,
             error_type = error_type::ENCODER_FAILED,
             stage = error_stage::PROCESSING,
-            internal_log_rate_limit = true,
         );
         counter!(
             "component_errors_total",
diff --git a/src/internal_events/journald.rs b/src/internal_events/journald.rs
index f467137186baa..9f7e9a694f9ca 100644
--- a/src/internal_events/journald.rs
+++ b/src/internal_events/journald.rs
@@ -17,7 +17,7 @@ impl InternalEvent for JournaldInvalidRecordError {
             text = %self.text,
             error_type = error_type::PARSER_FAILED,
             stage = error_stage::PROCESSING,
-            internal_log_rate_limit = true,
+
         );
         counter!(
             "component_errors_total",
@@ -40,7 +40,7 @@ impl InternalEvent for JournaldStartJournalctlError {
             error = %self.error,
             error_type = error_type::COMMAND_FAILED,
             stage = error_stage::RECEIVING,
-            internal_log_rate_limit = true,
+
         );
         counter!(
             "component_errors_total",
@@ -63,7 +63,7 @@ impl InternalEvent for JournaldReadError {
             error = %self.error,
             error_type = error_type::READER_FAILED,
             stage = error_stage::PROCESSING,
-            internal_log_rate_limit = true,
+
         );
         counter!(
             "component_errors_total",
@@ -88,7 +88,6 @@ impl InternalEvent for JournaldCheckpointSetError {
             error = %self.error,
             error_type = error_type::IO_FAILED,
             stage = error_stage::PROCESSING,
-            internal_log_rate_limit = true,
         );
         counter!(
             "component_errors_total",
@@ -113,7 +112,7 @@ impl InternalEvent for JournaldCheckpointFileOpenError {
             error = %self.error,
             error_type = error_type::IO_FAILED,
             stage = error_stage::RECEIVING,
-            internal_log_rate_limit = true,
+
         );
         counter!(
             "component_errors_total",
diff --git a/src/internal_events/kafka.rs b/src/internal_events/kafka.rs
index ea1b198be7053..05e06ea5161ff 100644
--- a/src/internal_events/kafka.rs
+++ b/src/internal_events/kafka.rs
@@ -78,7 +78,7 @@ impl InternalEvent for KafkaOffsetUpdateError {
             error_code = "kafka_offset_update",
             error_type = error_type::READER_FAILED,
             stage = error_stage::SENDING,
-            internal_log_rate_limit = true,
+
         );
         counter!(
             "component_errors_total",
@@ -103,7 +103,7 @@ impl InternalEvent for KafkaReadError {
             error_code = "reading_message",
             error_type = error_type::READER_FAILED,
             stage = error_stage::RECEIVING,
-            internal_log_rate_limit = true,
+
         );
         counter!(
             "component_errors_total",
@@ -163,7 +163,6 @@ impl InternalEvent for KafkaHeaderExtractionError<'_> {
             error_type = error_type::PARSER_FAILED,
             stage = error_stage::RECEIVING,
             header_field = self.header_field.to_string(),
-            internal_log_rate_limit = true,
         );
         counter!(
             "component_errors_total",
diff --git a/src/internal_events/kubernetes_logs.rs b/src/internal_events/kubernetes_logs.rs
index 77dac30b1945b..e70f3f47cc4a7 100644
--- a/src/internal_events/kubernetes_logs.rs
+++ b/src/internal_events/kubernetes_logs.rs
@@ -70,7 +70,7 @@ impl InternalEvent for KubernetesLogsEventAnnotationError<'_> {
             error_code = ANNOTATION_FAILED,
             error_type = error_type::READER_FAILED,
             stage = error_stage::PROCESSING,
-            internal_log_rate_limit = true,
+
         );
         counter!(
             "component_errors_total",
@@ -95,7 +95,7 @@ impl InternalEvent for KubernetesLogsEventNamespaceAnnotationError<'_> {
             error_code = ANNOTATION_FAILED,
             error_type = error_type::READER_FAILED,
             stage = error_stage::PROCESSING,
-            internal_log_rate_limit = true,
+
         );
         counter!(
             "component_errors_total",
@@ -121,7 +121,7 @@ impl InternalEvent for KubernetesLogsEventNodeAnnotationError<'_> {
             error_code = ANNOTATION_FAILED,
             error_type = error_type::READER_FAILED,
             stage = error_stage::PROCESSING,
-            internal_log_rate_limit = true,
+
         );
         counter!(
             "component_errors_total",
@@ -161,7 +161,7 @@ impl InternalEvent for KubernetesLogsDockerFormatParseError<'_> {
             error = %self.error,
             error_type = error_type::PARSER_FAILED,
             stage = error_stage::PROCESSING,
-            internal_log_rate_limit = true,
+
         );
         counter!(
             "component_errors_total",
@@ -190,7 +190,7 @@ impl<E: std::fmt::Display> InternalEvent for KubernetesLifecycleError<E> {
             error_code = KUBERNETES_LIFECYCLE,
             error_type = error_type::READER_FAILED,
             stage = error_stage::PROCESSING,
-            internal_log_rate_limit = true,
+
         );
         counter!(
             "component_errors_total",
diff --git a/src/internal_events/logplex.rs b/src/internal_events/logplex.rs
index 160947fb0d147..b08df7c624d4f 100644
--- a/src/internal_events/logplex.rs
+++ b/src/internal_events/logplex.rs
@@ -36,7 +36,7 @@ impl InternalEvent for HerokuLogplexRequestReadError {
             error_type = error_type::READER_FAILED,
             error_code = io_error_code(&self.error),
             stage = error_stage::PROCESSING,
-            internal_log_rate_limit = true,
+
         );
         counter!(
             "component_errors_total",
diff --git a/src/internal_events/loki.rs b/src/internal_events/loki.rs
index 2c95d524c655f..6a5e7567b65b2 100644
--- a/src/internal_events/loki.rs
+++ b/src/internal_events/loki.rs
@@ -12,7 +12,6 @@ impl InternalEvent for LokiEventUnlabeledError {
             error_code = "unlabeled_event",
             error_type = error_type::CONDITION_FAILED,
             stage = error_stage::PROCESSING,
-            internal_log_rate_limit = true,
         );
 
         counter!(
@@ -39,7 +38,6 @@ impl InternalEvent for LokiOutOfOrderEventDroppedError {
             error_code = "out_of_order",
             error_type = error_type::CONDITION_FAILED,
             stage = error_stage::PROCESSING,
-            internal_log_rate_limit = true,
         );
 
         emit!(ComponentEventsDropped::<INTENTIONAL> {
@@ -68,7 +66,6 @@ impl InternalEvent for LokiOutOfOrderEventRewritten {
             message = "Timestamps rewritten.",
             count = self.count,
             reason = "out_of_order",
-            internal_log_rate_limit = true,
         );
         counter!("rewritten_timestamp_events_total").increment(self.count as u64);
     }
@@ -86,7 +83,6 @@ impl InternalEvent for LokiTimestampNonParsableEventsDropped {
             error_code = "non-parsable_timestamp",
             error_type = error_type::CONDITION_FAILED,
             stage = error_stage::PROCESSING,
-            internal_log_rate_limit = true,
         );
 
         emit!(ComponentEventsDropped::<INTENTIONAL> { count: 1, reason });
diff --git a/src/internal_events/lua.rs b/src/internal_events/lua.rs
index 2805b5b57917d..392f1b8b26199 100644
--- a/src/internal_events/lua.rs
+++ b/src/internal_events/lua.rs
@@ -28,7 +28,6 @@ impl InternalEvent for LuaScriptError {
             error_code = mlua_error_code(&self.error),
             error_type = error_type::COMMAND_FAILED,
             stage = error_stage::PROCESSING,
-            internal_log_rate_limit = true,
         );
         counter!(
             "component_errors_total",
@@ -58,7 +57,7 @@ impl InternalEvent for LuaBuildError {
             error_type = error_type::SCRIPT_FAILED,
             error_code = lua_build_error_code(&self.error),
             stage = error_stage::PROCESSING,
-            internal_log_rate_limit = true,
+
         );
         counter!(
             "component_errors_total",
diff --git a/src/internal_events/metric_to_log.rs b/src/internal_events/metric_to_log.rs
index 79a9d117054a8..5bbceeb5017c6 100644
--- a/src/internal_events/metric_to_log.rs
+++ b/src/internal_events/metric_to_log.rs
@@ -16,7 +16,6 @@ impl InternalEvent for MetricToLogSerializeError {
             error = ?self.error,
             error_type = error_type::ENCODER_FAILED,
             stage = error_stage::PROCESSING,
-            internal_log_rate_limit = true
         );
         counter!(
             "component_errors_total",
diff --git a/src/internal_events/mongodb_metrics.rs b/src/internal_events/mongodb_metrics.rs
index 8d292342d3f0d..cf57b7af94e6a 100644
--- a/src/internal_events/mongodb_metrics.rs
+++ b/src/internal_events/mongodb_metrics.rs
@@ -48,7 +48,7 @@ impl InternalEvent for MongoDbMetricsRequestError<'_> {
             error = ?self.error,
             error_type = error_type::REQUEST_FAILED,
             stage = error_stage::RECEIVING,
-            internal_log_rate_limit = true,
+
         );
         counter!(
             "component_errors_total",
@@ -72,7 +72,7 @@ impl InternalEvent for MongoDbMetricsBsonParseError<'_> {
             error = ?self.error,
             error_type = error_type::PARSER_FAILED,
             stage = error_stage::RECEIVING,
-            internal_log_rate_limit = true,
+
         );
         counter!(
             "component_errors_total",
diff --git a/src/internal_events/mqtt.rs b/src/internal_events/mqtt.rs
index d20ccad0bad98..507f4aea2464c 100644
--- a/src/internal_events/mqtt.rs
+++ b/src/internal_events/mqtt.rs
@@ -18,7 +18,7 @@ impl InternalEvent for MqttConnectionError {
             error_code = "mqtt_connection_error",
             error_type = error_type::WRITER_FAILED,
             stage = error_stage::SENDING,
-            internal_log_rate_limit = true,
+
         );
         counter!(
             "component_errors_total",
diff --git a/src/internal_events/nginx_metrics.rs b/src/internal_events/nginx_metrics.rs
index 02f3309aec3a1..d6561ccf21096 100644
--- a/src/internal_events/nginx_metrics.rs
+++ b/src/internal_events/nginx_metrics.rs
@@ -48,7 +48,7 @@ impl InternalEvent for NginxMetricsRequestError<'_> {
             error = %self.error,
             error_type = error_type::REQUEST_FAILED,
             stage = error_stage::RECEIVING,
-            internal_log_rate_limit = true,
+
         );
         counter!(
             "component_errors_total",
@@ -73,7 +73,7 @@ impl InternalEvent for NginxMetricsStubStatusParseError<'_> {
             error = %self.error,
             error_type = error_type::PARSER_FAILED,
             stage = error_stage::PROCESSING,
-            internal_log_rate_limit = true,
+
         );
         counter!(
             "component_errors_total",
diff --git a/src/internal_events/parser.rs b/src/internal_events/parser.rs
index 84cd0556b4821..3638ab4189e7b 100644
--- a/src/internal_events/parser.rs
+++ b/src/internal_events/parser.rs
@@ -30,7 +30,6 @@ impl InternalEvent for ParserMatchError<'_> {
             error_type = error_type::CONDITION_FAILED,
             stage = error_stage::PROCESSING,
             field = &truncate_string_at(&String::from_utf8_lossy(self.value), 60)[..],
-            internal_log_rate_limit = true
         );
         counter!(
             "component_errors_total",
diff --git a/src/internal_events/postgresql_metrics.rs b/src/internal_events/postgresql_metrics.rs
index 8843140cb54e7..d7979f8dd1185 100644
--- a/src/internal_events/postgresql_metrics.rs
+++ b/src/internal_events/postgresql_metrics.rs
@@ -16,7 +16,7 @@ impl InternalEvent for PostgresqlMetricsCollectError<'_> {
             error_type = error_type::REQUEST_FAILED,
             stage = error_stage::RECEIVING,
             endpoint = %self.endpoint,
-            internal_log_rate_limit = true,
+
         );
         counter!(
             "component_errors_total",
diff --git a/src/internal_events/process.rs b/src/internal_events/process.rs
index 5a54154eca849..ef30c1ea9e7e2 100644
--- a/src/internal_events/process.rs
+++ b/src/internal_events/process.rs
@@ -73,7 +73,6 @@ impl InternalEvent for VectorReloadError {
             error_code = "reload",
             error_type = error_type::CONFIGURATION_FAILED,
             stage = error_stage::PROCESSING,
-            internal_log_rate_limit = true,
         );
         counter!(
             "component_errors_total",
@@ -95,7 +94,6 @@ impl InternalEvent for VectorConfigLoadError {
             error_code = "config_load",
             error_type = error_type::CONFIGURATION_FAILED,
             stage = error_stage::PROCESSING,
-            internal_log_rate_limit = true,
         );
         counter!(
             "component_errors_total",
@@ -117,7 +115,6 @@ impl InternalEvent for VectorRecoveryError {
             error_code = "recovery",
             error_type = error_type::CONFIGURATION_FAILED,
             stage = error_stage::PROCESSING,
-            internal_log_rate_limit = true,
         );
         counter!(
             "component_errors_total",
diff --git a/src/internal_events/prometheus.rs b/src/internal_events/prometheus.rs
index 752e8e238fac4..2285ee1323773 100644
--- a/src/internal_events/prometheus.rs
+++ b/src/internal_events/prometheus.rs
@@ -24,7 +24,7 @@ impl InternalEvent for PrometheusParseError<'_> {
             error = ?self.error,
             error_type = error_type::PARSER_FAILED,
             stage = error_stage::PROCESSING,
-            internal_log_rate_limit = true,
+
         );
         debug!(
             message = %format!("Failed to parse response:\n\n{}\n\n", self.body),
@@ -53,7 +53,7 @@ impl InternalEvent for PrometheusRemoteWriteParseError {
             error = ?self.error,
             error_type = error_type::PARSER_FAILED,
             stage = error_stage::PROCESSING,
-            internal_log_rate_limit = true,
+
         );
         counter!(
             "component_errors_total",
@@ -74,7 +74,6 @@ impl InternalEvent for PrometheusNormalizationError {
             message = normalization_reason,
             error_type = error_type::CONVERSION_FAILED,
             stage = error_stage::PROCESSING,
-            internal_log_rate_limit = true,
         );
         counter!(
             "component_errors_total",
diff --git a/src/internal_events/pulsar.rs b/src/internal_events/pulsar.rs
index c03dea3870086..416768fcff6a5 100644
--- a/src/internal_events/pulsar.rs
+++ b/src/internal_events/pulsar.rs
@@ -19,7 +19,7 @@ impl InternalEvent for PulsarSendingError {
             error = %self.error,
             error_type = error_type::REQUEST_FAILED,
             stage = error_stage::SENDING,
-            internal_log_rate_limit = true,
+
         );
         counter!(
             "component_errors_total",
@@ -46,7 +46,7 @@ impl<F: std::fmt::Display> InternalEvent for PulsarPropertyExtractionError<F> {
             error_type = error_type::PARSER_FAILED,
             stage = error_stage::PROCESSING,
             property_field = %self.property_field,
-            internal_log_rate_limit = true,
+
         );
         counter!(
             "component_errors_total",
@@ -105,7 +105,7 @@ registered_event!(
                     error_code = "reading_message",
                     error_type = error_type::READER_FAILED,
                     stage = error_stage::RECEIVING,
-                    internal_log_rate_limit = true,
+
                 );
 
                 self.read_errors.increment(1_u64);
@@ -117,7 +117,7 @@ registered_event!(
                     error_code = "acknowledge_message",
                     error_type = error_type::ACKNOWLEDGMENT_FAILED,
                     stage = error_stage::RECEIVING,
-                    internal_log_rate_limit = true,
+
                 );
 
                 self.ack_errors.increment(1_u64);
@@ -129,7 +129,7 @@ registered_event!(
                     error_code = "negative_acknowledge_message",
                     error_type = error_type::ACKNOWLEDGMENT_FAILED,
                     stage = error_stage::RECEIVING,
-                    internal_log_rate_limit = true,
+
                 );
 
                 self.nack_errors.increment(1_u64);
diff --git a/src/internal_events/redis.rs b/src/internal_events/redis.rs
index 0ac9e9e59d417..32af514f4215d 100644
--- a/src/internal_events/redis.rs
+++ b/src/internal_events/redis.rs
@@ -23,7 +23,7 @@ impl InternalEvent for RedisReceiveEventError {
             error_code = %self.error_code,
             error_type = error_type::READER_FAILED,
             stage = error_stage::SENDING,
-            internal_log_rate_limit = true,
+
         );
         counter!(
             "component_errors_total",
diff --git a/src/internal_events/reduce.rs b/src/internal_events/reduce.rs
index b9887aaf54bb7..c62c1ed3639fa 100644
--- a/src/internal_events/reduce.rs
+++ b/src/internal_events/reduce.rs
@@ -26,7 +26,7 @@ impl InternalEvent for ReduceAddEventError {
             error = ?self.error,
             error_type = error_type::CONDITION_FAILED,
             stage = error_stage::PROCESSING,
-            internal_log_rate_limit = true,
+
         );
         counter!(
             "component_errors_total",
diff --git a/src/internal_events/remap.rs b/src/internal_events/remap.rs
index d05e6dfb9c874..93193941b23fe 100644
--- a/src/internal_events/remap.rs
+++ b/src/internal_events/remap.rs
@@ -19,7 +19,7 @@ impl InternalEvent for RemapMappingError {
             error = ?self.error,
             error_type = error_type::CONVERSION_FAILED,
             stage = error_stage::PROCESSING,
-            internal_log_rate_limit = true,
+
         );
         counter!(
             "component_errors_total",
diff --git a/src/internal_events/sematext_metrics.rs b/src/internal_events/sematext_metrics.rs
index b4b5be737fb2e..67839e8c90e79 100644
--- a/src/internal_events/sematext_metrics.rs
+++ b/src/internal_events/sematext_metrics.rs
@@ -19,7 +19,7 @@ impl InternalEvent for SematextMetricsInvalidMetricError<'_> {
             stage = error_stage::PROCESSING,
             value = ?self.metric.value(),
             kind = ?self.metric.kind(),
-            internal_log_rate_limit = true,
+
         );
         counter!(
             "component_errors_total",
@@ -46,7 +46,7 @@ impl<E: std::fmt::Display> InternalEvent for SematextMetricsEncodeEventError<E>
             error = %self.error,
             error_type = error_type::ENCODER_FAILED,
             stage = error_stage::PROCESSING,
-            internal_log_rate_limit = true,
+
         );
         counter!(
             "component_errors_total",
diff --git a/src/internal_events/socket.rs b/src/internal_events/socket.rs
index 5f2f7aac301e4..389adb0f478af 100644
--- a/src/internal_events/socket.rs
+++ b/src/internal_events/socket.rs
@@ -124,7 +124,7 @@ impl<E: std::fmt::Display> InternalEvent for SocketBindError<E> {
             error_type = error_type::IO_FAILED,
             stage = error_stage::INITIALIZING,
             %mode,
-            internal_log_rate_limit = true,
+
         );
         counter!(
             "component_errors_total",
@@ -191,7 +191,7 @@ impl<E: std::fmt::Display> InternalEvent for SocketReceiveError<E> {
             error_type = error_type::READER_FAILED,
             stage = error_stage::RECEIVING,
             %mode,
-            internal_log_rate_limit = true,
+
         );
         counter!(
             "component_errors_total",
@@ -221,7 +221,7 @@ impl<E: std::fmt::Display> InternalEvent for SocketSendError<E> {
             error_type = error_type::WRITER_FAILED,
             stage = error_stage::SENDING,
             %mode,
-            internal_log_rate_limit = true,
+
         );
         counter!(
             "component_errors_total",
diff --git a/src/internal_events/splunk_hec.rs b/src/internal_events/splunk_hec.rs
index 4ff5838cdc0b7..e4853c1a8b40e 100644
--- a/src/internal_events/splunk_hec.rs
+++ b/src/internal_events/splunk_hec.rs
@@ -33,7 +33,7 @@ mod sink {
                 error_code = "serializing_json",
                 error_type = error_type::ENCODER_FAILED,
                 stage = error_stage::PROCESSING,
-                internal_log_rate_limit = true,
+
             );
             counter!(
                 "component_errors_total",
@@ -62,7 +62,7 @@ mod sink {
                 stage = error_stage::PROCESSING,
                 value = ?self.value,
                 kind = ?self.kind,
-                internal_log_rate_limit = true,
+
             );
             counter!(
                 "component_errors_total",
@@ -92,7 +92,7 @@ mod sink {
                 error_code = "invalid_response",
                 error_type = error_type::PARSER_FAILED,
                 stage = error_stage::SENDING,
-                internal_log_rate_limit = true,
+
             );
             counter!(
                 "component_errors_total",
@@ -118,7 +118,7 @@ mod sink {
                 error_code = "indexer_ack_failed",
                 error_type = error_type::ACKNOWLEDGMENT_FAILED,
                 stage = error_stage::SENDING,
-                internal_log_rate_limit = true,
+
             );
             counter!(
                 "component_errors_total",
@@ -143,7 +143,7 @@ mod sink {
                 error_code = "indexer_ack_unavailable",
                 error_type = error_type::ACKNOWLEDGMENT_FAILED,
                 stage = error_stage::SENDING,
-                internal_log_rate_limit = true,
+
             );
             counter!(
                 "component_errors_total",
diff --git a/src/internal_events/statsd_sink.rs b/src/internal_events/statsd_sink.rs
index 165ef885eabbd..b7ee84cfbc457 100644
--- a/src/internal_events/statsd_sink.rs
+++ b/src/internal_events/statsd_sink.rs
@@ -20,7 +20,7 @@ impl InternalEvent for StatsdInvalidMetricError<'_> {
             stage = error_stage::PROCESSING,
             value = ?self.value,
             kind = ?self.kind,
-            internal_log_rate_limit = true,
+
         );
         counter!(
             "component_errors_total",
diff --git a/src/internal_events/tag_cardinality_limit.rs b/src/internal_events/tag_cardinality_limit.rs
index 4c0c315eb11c1..e0a79e583bbcc 100644
--- a/src/internal_events/tag_cardinality_limit.rs
+++ b/src/internal_events/tag_cardinality_limit.rs
@@ -14,7 +14,6 @@ impl InternalEvent for TagCardinalityLimitRejectingEvent<'_> {
             metric_name = self.metric_name,
             tag_key = self.tag_key,
             tag_value = self.tag_value,
-            internal_log_rate_limit = true,
         );
         counter!("tag_value_limit_exceeded_total").increment(1);
 
@@ -38,7 +37,6 @@ impl InternalEvent for TagCardinalityLimitRejectingTag<'_> {
             metric_name = self.metric_name,
             tag_key = self.tag_key,
             tag_value = self.tag_value,
-            internal_log_rate_limit = true,
         );
         counter!("tag_value_limit_exceeded_total").increment(1);
     }
diff --git a/src/internal_events/tcp.rs b/src/internal_events/tcp.rs
index 23ec1fc88e830..ae050b99be309 100644
--- a/src/internal_events/tcp.rs
+++ b/src/internal_events/tcp.rs
@@ -60,7 +60,6 @@ impl<E: std::fmt::Display> InternalEvent for TcpSocketError<'_, E> {
             peer_addr = ?self.peer_addr,
             error_type = error_type::CONNECTION_FAILED,
             stage = error_stage::PROCESSING,
-            internal_log_rate_limit = true,
         );
         counter!(
             "component_errors_total",
@@ -89,7 +88,6 @@ impl InternalEvent for TcpSocketTlsConnectionError {
                 debug!(
                     message = "Connection error, probably a healthcheck.",
                     error = %self.error,
-                    internal_log_rate_limit = true,
                 );
             }
             _ => {
@@ -99,7 +97,6 @@ impl InternalEvent for TcpSocketTlsConnectionError {
                     error_code = "connection_failed",
                     error_type = error_type::WRITER_FAILED,
                     stage = error_stage::SENDING,
-                    internal_log_rate_limit = true,
                 );
                 counter!(
                     "component_errors_total",
@@ -127,7 +124,6 @@ impl InternalEvent for TcpSendAckError {
             error_code = "ack_failed",
             error_type = error_type::WRITER_FAILED,
             stage = error_stage::SENDING,
-            internal_log_rate_limit = true,
         );
         counter!(
             "component_errors_total",
diff --git a/src/internal_events/template.rs b/src/internal_events/template.rs
index 82df77cefdb8d..c7b42b1b10363 100644
--- a/src/internal_events/template.rs
+++ b/src/internal_events/template.rs
@@ -23,7 +23,7 @@ impl InternalEvent for TemplateRenderingError<'_> {
                 error = %self.error,
                 error_type = error_type::TEMPLATE_FAILED,
                 stage = error_stage::PROCESSING,
-                internal_log_rate_limit = true,
+
             );
 
             counter!(
@@ -43,7 +43,7 @@ impl InternalEvent for TemplateRenderingError<'_> {
                 error = %self.error,
                 error_type = error_type::TEMPLATE_FAILED,
                 stage = error_stage::PROCESSING,
-                internal_log_rate_limit = true,
+
             );
         }
     }
diff --git a/src/internal_events/udp.rs b/src/internal_events/udp.rs
index 15e9df4c2b07b..b983543e6cae1 100644
--- a/src/internal_events/udp.rs
+++ b/src/internal_events/udp.rs
@@ -47,7 +47,6 @@ impl InternalEvent for UdpSendIncompleteError {
             dropped = self.data_size - self.sent,
             error_type = error_type::WRITER_FAILED,
             stage = error_stage::SENDING,
-            internal_log_rate_limit = true,
         );
         counter!(
             "component_errors_total",
diff --git a/src/internal_events/unix.rs b/src/internal_events/unix.rs
index a45777ab8f2e1..f66327011da98 100644
--- a/src/internal_events/unix.rs
+++ b/src/internal_events/unix.rs
@@ -54,7 +54,7 @@ impl<E: std::fmt::Display> InternalEvent for UnixSocketError<'_, E> {
             path = ?self.path,
             error_type = error_type::CONNECTION_FAILED,
             stage = error_stage::PROCESSING,
-            internal_log_rate_limit = true,
+
         );
         counter!(
             "component_errors_total",
@@ -80,7 +80,7 @@ impl<E: std::fmt::Display> InternalEvent for UnixSocketSendError<'_, E> {
             path = ?self.path,
             error_type = error_type::WRITER_FAILED,
             stage = error_stage::SENDING,
-            internal_log_rate_limit = true,
+
         );
         counter!(
             "component_errors_total",
@@ -109,7 +109,6 @@ impl InternalEvent for UnixSendIncompleteError {
             dropped = self.data_size - self.sent,
             error_type = error_type::WRITER_FAILED,
             stage = error_stage::SENDING,
-            internal_log_rate_limit = true,
         );
         counter!(
             "component_errors_total",
@@ -137,7 +136,7 @@ impl InternalEvent for UnixSocketFileDeleteError<'_> {
             error_code = "delete_socket_file",
             error_type = error_type::WRITER_FAILED,
             stage = error_stage::PROCESSING,
-            internal_log_rate_limit = true,
+
         );
         counter!(
             "component_errors_total",
diff --git a/src/internal_events/websocket.rs b/src/internal_events/websocket.rs
index 59d64574940f4..bd3bbb78a6ede 100644
--- a/src/internal_events/websocket.rs
+++ b/src/internal_events/websocket.rs
@@ -33,7 +33,7 @@ impl InternalEvent for WsConnectionFailedError {
             error_code = "ws_connection_error",
             error_type = error_type::CONNECTION_FAILED,
             stage = error_stage::SENDING,
-            internal_log_rate_limit = true,
+
         );
         counter!(
             "component_errors_total",
@@ -76,7 +76,7 @@ impl InternalEvent for WsConnectionError {
             error_code = "ws_connection_error",
             error_type = error_type::WRITER_FAILED,
             stage = error_stage::SENDING,
-            internal_log_rate_limit = true,
+
         );
         counter!(
             "component_errors_total",
diff --git a/src/internal_events/websocket_server.rs b/src/internal_events/websocket_server.rs
index 2fdb79394998e..881cba02a0b9d 100644
--- a/src/internal_events/websocket_server.rs
+++ b/src/internal_events/websocket_server.rs
@@ -43,7 +43,7 @@ impl InternalEvent for WsListenerConnectionFailedError {
             error_code = "ws_connection_error",
             error_type = error_type::CONNECTION_FAILED,
             stage = error_stage::SENDING,
-            internal_log_rate_limit = true,
+
         );
         let mut all_tags = self.extra_tags.clone();
         all_tags.extend([
@@ -100,7 +100,7 @@ impl InternalEvent for WsListenerSendError {
             error_code = "ws_server_connection_error",
             error_type = error_type::WRITER_FAILED,
             stage = error_stage::SENDING,
-            internal_log_rate_limit = true,
+
         );
         counter!(
             "component_errors_total",
diff --git a/src/internal_events/windows.rs b/src/internal_events/windows.rs
index 994b89345e3c0..f44c0a26bc8f3 100644
--- a/src/internal_events/windows.rs
+++ b/src/internal_events/windows.rs
@@ -102,7 +102,6 @@ impl InternalEvent for WindowsServiceDoesNotExistError<'_> {
             error_code = "service_missing",
             error_type = error_type::CONDITION_FAILED,
             stage = error_stage::PROCESSING,
-            internal_log_rate_limit = true,
         );
         counter!(
             "component_errors_total",
diff --git a/src/sinks/datadog/logs/sink.rs b/src/sinks/datadog/logs/sink.rs
index 8544bf8f61947..f901f9f9bab7e 100644
--- a/src/sinks/datadog/logs/sink.rs
+++ b/src/sinks/datadog/logs/sink.rs
@@ -200,7 +200,6 @@ pub fn position_reserved_attr_event_root(
                 message = "Semantic meaning is defined, but the event path already exists. Renaming to not overwrite.",
                 meaning = meaning,
                 renamed = &rename_attr,
-                internal_log_rate_limit = true,
             );
             log.rename_key(desired_path, rename_path);
         }
diff --git a/src/sinks/datadog/traces/apm_stats/flusher.rs b/src/sinks/datadog/traces/apm_stats/flusher.rs
index d1ee1e73e949b..e529f49869dbd 100644
--- a/src/sinks/datadog/traces/apm_stats/flusher.rs
+++ b/src/sinks/datadog/traces/apm_stats/flusher.rs
@@ -70,7 +70,6 @@ pub async fn flush_apm_stats_thread(
             }
             Err(_) => {
                 error!(
-                    internal_log_rate_limit = true,
                     message = "Tokio Sender unexpectedly dropped."
                 );
                 break;
diff --git a/src/sinks/gcp/stackdriver/logs/encoder.rs b/src/sinks/gcp/stackdriver/logs/encoder.rs
index 5b4faaac8740e..f8dbdee3bec4d 100644
--- a/src/sinks/gcp/stackdriver/logs/encoder.rs
+++ b/src/sinks/gcp/stackdriver/logs/encoder.rs
@@ -173,7 +173,6 @@ pub(super) fn remap_severity(severity: Value) -> Value {
                         warn!(
                             message = "Unknown severity value string, using DEFAULT.",
                             value = %s,
-                            internal_log_rate_limit = true
                         );
                         0
                     }
diff --git a/src/sinks/util/adaptive_concurrency/controller.rs b/src/sinks/util/adaptive_concurrency/controller.rs
index 4457e71cad4a7..227ee29c7122a 100644
--- a/src/sinks/util/adaptive_concurrency/controller.rs
+++ b/src/sinks/util/adaptive_concurrency/controller.rs
@@ -291,7 +291,6 @@ where
                     warn!(
                         message = "Unhandled error response.",
                         %error,
-                        internal_log_rate_limit = true
                     );
                     false
                 }
diff --git a/src/sinks/util/retries.rs b/src/sinks/util/retries.rs
index 32ac8fd251f2e..6e4549fb8cbac 100644
--- a/src/sinks/util/retries.rs
+++ b/src/sinks/util/retries.rs
@@ -152,7 +152,6 @@ where
                         error!(
                             message = "OK/retry response but retries exhausted; dropping the request.",
                             reason = ?reason,
-                            internal_log_rate_limit = true,
                         );
                         return None;
                     }
@@ -182,7 +181,7 @@ where
                         error!(
                             message = "Non-retriable error; dropping the request.",
                             %error,
-                            internal_log_rate_limit = true,
+
                         );
                         None
                     }
@@ -196,7 +195,6 @@ where
                     error!(
                         message = "Unexpected error type; dropping the request.",
                         %error,
-                        internal_log_rate_limit = true
                     );
                     None
                 }
diff --git a/src/sources/datadog_agent/metrics.rs b/src/sources/datadog_agent/metrics.rs
index a27400e995ef1..b093df4a31a5a 100644
--- a/src/sources/datadog_agent/metrics.rs
+++ b/src/sources/datadog_agent/metrics.rs
@@ -182,10 +182,7 @@ fn decode_datadog_sketches(
 ) -> Result<Vec<Event>, ErrorMessage> {
     if body.is_empty() {
         // The datadog agent may send an empty payload as a keep alive
-        debug!(
-            message = "Empty payload ignored.",
-            internal_log_rate_limit = true
-        );
+        debug!(message = "Empty payload ignored.",);
         return Ok(Vec::new());
     }
 
diff --git a/src/sources/heroku_logs.rs b/src/sources/heroku_logs.rs
index c4bde0c2898e1..c86dec895eb7a 100644
--- a/src/sources/heroku_logs.rs
+++ b/src/sources/heroku_logs.rs
@@ -407,7 +407,6 @@ fn line_to_events(
         warn!(
             message = "Line didn't match expected logplex format, so raw message is forwarded.",
             fields = parts.len(),
-            internal_log_rate_limit = true
         );
 
         events.push(LogEvent::from_str_legacy(line).into())
diff --git a/src/sources/socket/udp.rs b/src/sources/socket/udp.rs
index 4cfa052c85d7e..d1031fdd8f531 100644
--- a/src/sources/socket/udp.rs
+++ b/src/sources/socket/udp.rs
@@ -231,7 +231,6 @@ pub(super) fn udp(
                                     warn!(
                                         message = "Discarding frame larger than max_length.",
                                         max_length = max_length,
-                                        internal_log_rate_limit = true
                                     );
                                     continue;
                                 }
@@ -259,7 +258,6 @@ pub(super) fn udp(
                                     warn!(
                                         message = "Discarding frame larger than max_length.",
                                         max_length = max_length,
-                                        internal_log_rate_limit = true
                                     );
                                 }
 
diff --git a/src/transforms/lua/v1/mod.rs b/src/transforms/lua/v1/mod.rs
index 1255365f22116..97cef1684ea8e 100644
--- a/src/transforms/lua/v1/mod.rs
+++ b/src/transforms/lua/v1/mod.rs
@@ -255,7 +255,6 @@ impl mlua::UserData for LuaEvent {
                             message =
                                 "Could not set field to Lua value of invalid type, dropping field.",
                             field = key.as_str(),
-                            internal_log_rate_limit = true
                         );
                         this.inner.as_mut_log().remove(&key_path);
                     }

From fbb2dea4c1fedf514d7e6fa0d764c45e489ee3a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ensar=20Saraj=C4=8Di=C4=87?= <dev@ensarsarajcic.com>
Date: Thu, 12 Jun 2025 20:59:59 +0000
Subject: [PATCH 058/305] feat(kafka sink): add rate limit configuration for
 `kafka` sink (#23196)

* feature(kafka sink): add rate limit configuration for `kafka` sink

Related: #21879

* Add changelog entry

---------

Co-authored-by: Pavlos Rontidis <pavlos.rontidis@gmail.com>
---
 .../23196_kafka_sink_rate_limit.feature.md    |  3 +++
 src/sinks/kafka/config.rs                     | 22 +++++++++++++++++++
 src/sinks/kafka/sink.rs                       | 12 ++++++++--
 src/sinks/kafka/tests.rs                      |  8 +++++++
 .../reference/components/sinks/base/kafka.cue | 16 ++++++++++++++
 5 files changed, 59 insertions(+), 2 deletions(-)
 create mode 100644 changelog.d/23196_kafka_sink_rate_limit.feature.md

diff --git a/changelog.d/23196_kafka_sink_rate_limit.feature.md b/changelog.d/23196_kafka_sink_rate_limit.feature.md
new file mode 100644
index 0000000000000..a8562b04ab962
--- /dev/null
+++ b/changelog.d/23196_kafka_sink_rate_limit.feature.md
@@ -0,0 +1,3 @@
+Added `rate_limit_num` and `rate_limit_duration_secs` options to `kafka` sink, to enable rate limiting this sink.
+
+authors: esensar Quad9DNS
diff --git a/src/sinks/kafka/config.rs b/src/sinks/kafka/config.rs
index e348cf68532b6..69f3f6b6ec306 100644
--- a/src/sinks/kafka/config.rs
+++ b/src/sinks/kafka/config.rs
@@ -96,6 +96,18 @@ pub struct KafkaSinkConfig {
     #[configurable(metadata(docs::advanced))]
     pub message_timeout_ms: Duration,
 
+    /// The time window used for the `rate_limit_num` option.
+    #[configurable(metadata(docs::type_unit = "seconds"))]
+    #[configurable(metadata(docs::human_name = "Rate Limit Duration"))]
+    #[serde(default = "default_rate_limit_duration_secs")]
+    pub rate_limit_duration_secs: u64,
+
+    /// The maximum number of requests allowed within the `rate_limit_duration_secs` time window.
+    #[configurable(metadata(docs::type_unit = "requests"))]
+    #[configurable(metadata(docs::human_name = "Rate Limit Number"))]
+    #[serde(default = "default_rate_limit_num")]
+    pub rate_limit_num: u64,
+
     /// A map of advanced options to pass directly to the underlying `librdkafka` client.
     ///
     /// For more information on configuration options, see [Configuration properties][config_props_docs].
@@ -134,6 +146,14 @@ const fn default_message_timeout_ms() -> Duration {
     Duration::from_millis(300000) // default in librdkafka
 }
 
+const fn default_rate_limit_duration_secs() -> u64 {
+    1
+}
+
+const fn default_rate_limit_num() -> u64 {
+    i64::MAX as u64 // i64 avoids TOML deserialize issue
+}
+
 fn example_librdkafka_options() -> HashMap<String, String> {
     HashMap::<_, _>::from_iter([
         ("client.id".to_string(), "${ENV_VAR}".to_string()),
@@ -245,6 +265,8 @@ impl GenerateConfig for KafkaSinkConfig {
             auth: Default::default(),
             socket_timeout_ms: default_socket_timeout_ms(),
             message_timeout_ms: default_message_timeout_ms(),
+            rate_limit_duration_secs: default_rate_limit_duration_secs(),
+            rate_limit_num: default_rate_limit_num(),
             librdkafka_options: Default::default(),
             headers_key: None,
             acknowledgements: Default::default(),
diff --git a/src/sinks/kafka/sink.rs b/src/sinks/kafka/sink.rs
index 6770572a7b08c..e62fe3450a2c2 100644
--- a/src/sinks/kafka/sink.rs
+++ b/src/sinks/kafka/sink.rs
@@ -1,9 +1,12 @@
+use std::time::Duration;
+
 use rdkafka::{
     error::KafkaError,
     producer::{BaseProducer, FutureProducer, Producer},
     ClientConfig,
 };
 use snafu::{ResultExt, Snafu};
+use tower::limit::RateLimit;
 use tracing::Span;
 use vrl::path::OwnedTargetPath;
 
@@ -27,7 +30,7 @@ pub(super) enum BuildError {
 pub struct KafkaSink {
     transformer: Transformer,
     encoder: Encoder<()>,
-    service: KafkaService,
+    service: RateLimit<KafkaService>,
     topic: Template,
     key_field: Option<OwnedTargetPath>,
     headers_key: Option<OwnedTargetPath>,
@@ -57,7 +60,12 @@ impl KafkaSink {
             headers_key: config.headers_key.map(|key| key.0),
             transformer,
             encoder,
-            service: KafkaService::new(producer),
+            service: ServiceBuilder::new()
+                .rate_limit(
+                    config.rate_limit_num,
+                    Duration::from_secs(config.rate_limit_duration_secs),
+                )
+                .service(KafkaService::new(producer)),
             topic: config.topic,
             key_field: config.key_field.map(|key| key.0),
         })
diff --git a/src/sinks/kafka/tests.rs b/src/sinks/kafka/tests.rs
index 8c2de36ff6867..d6a5a9c1cf0a3 100644
--- a/src/sinks/kafka/tests.rs
+++ b/src/sinks/kafka/tests.rs
@@ -59,6 +59,8 @@ mod integration_test {
             auth: KafkaAuthConfig::default(),
             socket_timeout_ms: Duration::from_millis(60000),
             message_timeout_ms: Duration::from_millis(300000),
+            rate_limit_duration_secs: 1,
+            rate_limit_num: i64::MAX as u64,
             librdkafka_options: HashMap::new(),
             headers_key: None,
             acknowledgements: Default::default(),
@@ -85,6 +87,8 @@ mod integration_test {
             auth: KafkaAuthConfig::default(),
             socket_timeout_ms: Duration::from_millis(60000),
             message_timeout_ms: Duration::from_millis(300000),
+            rate_limit_duration_secs: 1,
+            rate_limit_num: i64::MAX as u64,
             librdkafka_options: HashMap::new(),
             headers_key: None,
             acknowledgements: Default::default(),
@@ -185,6 +189,8 @@ mod integration_test {
             },
             socket_timeout_ms: Duration::from_millis(60000),
             message_timeout_ms: Duration::from_millis(300000),
+            rate_limit_duration_secs: 1,
+            rate_limit_num: i64::MAX as u64,
             batch,
             librdkafka_options,
             headers_key: None,
@@ -334,6 +340,8 @@ mod integration_test {
             auth: kafka_auth.clone(),
             socket_timeout_ms: Duration::from_millis(60000),
             message_timeout_ms: Duration::from_millis(300000),
+            rate_limit_duration_secs: 1,
+            rate_limit_num: i64::MAX as u64,
             librdkafka_options: HashMap::new(),
             headers_key: Some(headers_key.clone()),
             acknowledgements: Default::default(),
diff --git a/website/cue/reference/components/sinks/base/kafka.cue b/website/cue/reference/components/sinks/base/kafka.cue
index 1f88e96d23741..f4ec89ef30d8c 100644
--- a/website/cue/reference/components/sinks/base/kafka.cue
+++ b/website/cue/reference/components/sinks/base/kafka.cue
@@ -489,6 +489,22 @@ base: components: sinks: kafka: configuration: {
 			unit: "milliseconds"
 		}
 	}
+	rate_limit_duration_secs: {
+		description: "The time window used for the `rate_limit_num` option."
+		required:    false
+		type: uint: {
+			default: 1
+			unit:    "seconds"
+		}
+	}
+	rate_limit_num: {
+		description: "The maximum number of requests allowed within the `rate_limit_duration_secs` time window."
+		required:    false
+		type: uint: {
+			default: 9223372036854775807
+			unit:    "requests"
+		}
+	}
 	sasl: {
 		description: "Configuration for SASL authentication when interacting with Kafka."
 		required:    false

From 865c8aca2007e4e280dffae27babc33fee079216 Mon Sep 17 00:00:00 2001
From: Anil Gupta <90670783+anil-db@users.noreply.github.com>
Date: Thu, 12 Jun 2025 14:02:13 -0700
Subject: [PATCH 059/305] enhancement(sinks): allow to provide aws session
 token (#22964)

* allow to provide aws session token

* doc generation

* Update changelog.d/aws-auth-session-token.enhancement.md

Co-authored-by: Pavlos Rontidis <pavlos.rontidis@gmail.com>

* incorporate comments

* rerun make generate-component-docs

* fix bare url in doc

---------

Co-authored-by: Pavlos Rontidis <pavlos.rontidis@gmail.com>
---
 changelog.d/aws-auth-session-token.enhancement.md        | 3 +++
 src/aws/auth.rs                                          | 9 ++++++++-
 website/cue/reference/base/configuration.cue             | 8 ++++++++
 .../components/sinks/base/aws_cloudwatch_logs.cue        | 8 ++++++++
 .../components/sinks/base/aws_cloudwatch_metrics.cue     | 8 ++++++++
 .../components/sinks/base/aws_kinesis_firehose.cue       | 8 ++++++++
 .../components/sinks/base/aws_kinesis_streams.cue        | 8 ++++++++
 website/cue/reference/components/sinks/base/aws_s3.cue   | 8 ++++++++
 website/cue/reference/components/sinks/base/aws_sns.cue  | 8 ++++++++
 website/cue/reference/components/sinks/base/aws_sqs.cue  | 8 ++++++++
 .../cue/reference/components/sinks/base/clickhouse.cue   | 8 ++++++++
 website/cue/reference/components/sinks/base/databend.cue | 8 ++++++++
 .../reference/components/sinks/base/elasticsearch.cue    | 9 +++++++++
 website/cue/reference/components/sinks/base/http.cue     | 8 ++++++++
 website/cue/reference/components/sinks/base/loki.cue     | 8 ++++++++
 .../reference/components/sinks/base/opentelemetry.cue    | 8 ++++++++
 .../components/sinks/base/prometheus_exporter.cue        | 8 ++++++++
 .../components/sinks/base/prometheus_remote_write.cue    | 9 +++++++++
 .../cue/reference/components/sinks/base/websocket.cue    | 8 ++++++++
 website/cue/reference/components/sources/base/aws_s3.cue | 8 ++++++++
 .../cue/reference/components/sources/base/aws_sqs.cue    | 8 ++++++++
 .../reference/components/sources/base/http_client.cue    | 8 ++++++++
 .../reference/components/sources/base/nginx_metrics.cue  | 8 ++++++++
 .../components/sources/base/prometheus_scrape.cue        | 8 ++++++++
 24 files changed, 189 insertions(+), 1 deletion(-)
 create mode 100644 changelog.d/aws-auth-session-token.enhancement.md

diff --git a/changelog.d/aws-auth-session-token.enhancement.md b/changelog.d/aws-auth-session-token.enhancement.md
new file mode 100644
index 0000000000000..5d49320932445
--- /dev/null
+++ b/changelog.d/aws-auth-session-token.enhancement.md
@@ -0,0 +1,3 @@
+Adds support for session tokens in AWS authentication options. When using temporary credentials (access key, secret key, and session token), the session token is required. Temporary credentials can be provided by an external system and updated using the `SECRET` backend.
+
+authors: anil-db
diff --git a/src/aws/auth.rs b/src/aws/auth.rs
index 1b8aa111eec33..4dd00f5cdbc24 100644
--- a/src/aws/auth.rs
+++ b/src/aws/auth.rs
@@ -71,6 +71,11 @@ pub enum AwsAuthentication {
         #[configurable(metadata(docs::examples = "wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY"))]
         secret_access_key: SensitiveString,
 
+        /// The AWS session token.
+        /// See [AWS temporary credentials](https://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_temp_use-resources.html)
+        #[configurable(metadata(docs::examples = "AQoDYXdz...AQoDYXdz..."))]
+        session_token: Option<SensitiveString>,
+
         /// The ARN of an [IAM role][iam_role] to assume.
         ///
         /// [iam_role]: https://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles.html
@@ -275,11 +280,12 @@ impl AwsAuthentication {
                 external_id,
                 region,
                 session_name,
+                session_token,
             } => {
                 let provider = SharedCredentialsProvider::new(Credentials::from_keys(
                     access_key_id.inner(),
                     secret_access_key.inner(),
-                    None,
+                    session_token.clone().map(|v| v.inner().into()),
                 ));
                 if let Some(assume_role) = assume_role {
                     let auth_region = region.clone().map(Region::new).unwrap_or(service_region);
@@ -372,6 +378,7 @@ impl AwsAuthentication {
             external_id: None,
             region: None,
             session_name: None,
+            session_token: None,
         }
     }
 }
diff --git a/website/cue/reference/base/configuration.cue b/website/cue/reference/base/configuration.cue
index 41650b84adf79..facbc3d1caada 100644
--- a/website/cue/reference/base/configuration.cue
+++ b/website/cue/reference/base/configuration.cue
@@ -364,6 +364,14 @@ base: configuration: configuration: {
 														"""
 						required: false
 					}
+					session_token: {
+						type: string: examples: ["AQoDYXdz...AQoDYXdz..."]
+						description: """
+														The AWS session token.
+														See [AWS temporary credentials](https://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_temp_use-resources.html)
+														"""
+						required: false
+					}
 					credentials_file: {
 						type: string: examples: ["/my/aws/credentials"]
 						description: "Path to the credentials file."
diff --git a/website/cue/reference/components/sinks/base/aws_cloudwatch_logs.cue b/website/cue/reference/components/sinks/base/aws_cloudwatch_logs.cue
index e0f57c6ce0730..7eda53f14b84c 100644
--- a/website/cue/reference/components/sinks/base/aws_cloudwatch_logs.cue
+++ b/website/cue/reference/components/sinks/base/aws_cloudwatch_logs.cue
@@ -139,6 +139,14 @@ base: components: sinks: aws_cloudwatch_logs: configuration: {
 				required: false
 				type: string: examples: ["vector-indexer-role"]
 			}
+			session_token: {
+				description: """
+					The AWS session token.
+					See [AWS temporary credentials](https://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_temp_use-resources.html)
+					"""
+				required: false
+				type: string: examples: ["AQoDYXdz...AQoDYXdz..."]
+			}
 		}
 	}
 	batch: {
diff --git a/website/cue/reference/components/sinks/base/aws_cloudwatch_metrics.cue b/website/cue/reference/components/sinks/base/aws_cloudwatch_metrics.cue
index 2f587a9ab0ae9..bc03d510b10c6 100644
--- a/website/cue/reference/components/sinks/base/aws_cloudwatch_metrics.cue
+++ b/website/cue/reference/components/sinks/base/aws_cloudwatch_metrics.cue
@@ -139,6 +139,14 @@ base: components: sinks: aws_cloudwatch_metrics: configuration: {
 				required: false
 				type: string: examples: ["vector-indexer-role"]
 			}
+			session_token: {
+				description: """
+					The AWS session token.
+					See [AWS temporary credentials](https://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_temp_use-resources.html)
+					"""
+				required: false
+				type: string: examples: ["AQoDYXdz...AQoDYXdz..."]
+			}
 		}
 	}
 	batch: {
diff --git a/website/cue/reference/components/sinks/base/aws_kinesis_firehose.cue b/website/cue/reference/components/sinks/base/aws_kinesis_firehose.cue
index 66fc0c718bf69..0f2d80d4e8390 100644
--- a/website/cue/reference/components/sinks/base/aws_kinesis_firehose.cue
+++ b/website/cue/reference/components/sinks/base/aws_kinesis_firehose.cue
@@ -139,6 +139,14 @@ base: components: sinks: aws_kinesis_firehose: configuration: {
 				required: false
 				type: string: examples: ["vector-indexer-role"]
 			}
+			session_token: {
+				description: """
+					The AWS session token.
+					See [AWS temporary credentials](https://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_temp_use-resources.html)
+					"""
+				required: false
+				type: string: examples: ["AQoDYXdz...AQoDYXdz..."]
+			}
 		}
 	}
 	batch: {
diff --git a/website/cue/reference/components/sinks/base/aws_kinesis_streams.cue b/website/cue/reference/components/sinks/base/aws_kinesis_streams.cue
index fe0c944ef400d..6028c01ba4241 100644
--- a/website/cue/reference/components/sinks/base/aws_kinesis_streams.cue
+++ b/website/cue/reference/components/sinks/base/aws_kinesis_streams.cue
@@ -139,6 +139,14 @@ base: components: sinks: aws_kinesis_streams: configuration: {
 				required: false
 				type: string: examples: ["vector-indexer-role"]
 			}
+			session_token: {
+				description: """
+					The AWS session token.
+					See [AWS temporary credentials](https://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_temp_use-resources.html)
+					"""
+				required: false
+				type: string: examples: ["AQoDYXdz...AQoDYXdz..."]
+			}
 		}
 	}
 	batch: {
diff --git a/website/cue/reference/components/sinks/base/aws_s3.cue b/website/cue/reference/components/sinks/base/aws_s3.cue
index 625daa2730ac5..5654d6ac48727 100644
--- a/website/cue/reference/components/sinks/base/aws_s3.cue
+++ b/website/cue/reference/components/sinks/base/aws_s3.cue
@@ -214,6 +214,14 @@ base: components: sinks: aws_s3: configuration: {
 				required: false
 				type: string: examples: ["vector-indexer-role"]
 			}
+			session_token: {
+				description: """
+					The AWS session token.
+					See [AWS temporary credentials](https://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_temp_use-resources.html)
+					"""
+				required: false
+				type: string: examples: ["AQoDYXdz...AQoDYXdz..."]
+			}
 		}
 	}
 	batch: {
diff --git a/website/cue/reference/components/sinks/base/aws_sns.cue b/website/cue/reference/components/sinks/base/aws_sns.cue
index 8953e1893f24d..8d183c33d9b04 100644
--- a/website/cue/reference/components/sinks/base/aws_sns.cue
+++ b/website/cue/reference/components/sinks/base/aws_sns.cue
@@ -139,6 +139,14 @@ base: components: sinks: aws_sns: configuration: {
 				required: false
 				type: string: examples: ["vector-indexer-role"]
 			}
+			session_token: {
+				description: """
+					The AWS session token.
+					See [AWS temporary credentials](https://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_temp_use-resources.html)
+					"""
+				required: false
+				type: string: examples: ["AQoDYXdz...AQoDYXdz..."]
+			}
 		}
 	}
 	encoding: {
diff --git a/website/cue/reference/components/sinks/base/aws_sqs.cue b/website/cue/reference/components/sinks/base/aws_sqs.cue
index 0fcfe80f4f0b0..0493d2ede171f 100644
--- a/website/cue/reference/components/sinks/base/aws_sqs.cue
+++ b/website/cue/reference/components/sinks/base/aws_sqs.cue
@@ -139,6 +139,14 @@ base: components: sinks: aws_sqs: configuration: {
 				required: false
 				type: string: examples: ["vector-indexer-role"]
 			}
+			session_token: {
+				description: """
+					The AWS session token.
+					See [AWS temporary credentials](https://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_temp_use-resources.html)
+					"""
+				required: false
+				type: string: examples: ["AQoDYXdz...AQoDYXdz..."]
+			}
 		}
 	}
 	encoding: {
diff --git a/website/cue/reference/components/sinks/base/clickhouse.cue b/website/cue/reference/components/sinks/base/clickhouse.cue
index c472c8736c682..c4b97366ddd18 100644
--- a/website/cue/reference/components/sinks/base/clickhouse.cue
+++ b/website/cue/reference/components/sinks/base/clickhouse.cue
@@ -149,6 +149,14 @@ base: components: sinks: clickhouse: configuration: {
 						required: false
 						type: string: examples: ["vector-indexer-role"]
 					}
+					session_token: {
+						description: """
+																The AWS session token.
+																See [AWS temporary credentials](https://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_temp_use-resources.html)
+																"""
+						required: false
+						type: string: examples: ["AQoDYXdz...AQoDYXdz..."]
+					}
 				}
 			}
 			password: {
diff --git a/website/cue/reference/components/sinks/base/databend.cue b/website/cue/reference/components/sinks/base/databend.cue
index 0fa20d0dd1d62..4fc3a763ab059 100644
--- a/website/cue/reference/components/sinks/base/databend.cue
+++ b/website/cue/reference/components/sinks/base/databend.cue
@@ -144,6 +144,14 @@ base: components: sinks: databend: configuration: {
 						required: false
 						type: string: examples: ["vector-indexer-role"]
 					}
+					session_token: {
+						description: """
+																The AWS session token.
+																See [AWS temporary credentials](https://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_temp_use-resources.html)
+																"""
+						required: false
+						type: string: examples: ["AQoDYXdz...AQoDYXdz..."]
+					}
 				}
 			}
 			password: {
diff --git a/website/cue/reference/components/sinks/base/elasticsearch.cue b/website/cue/reference/components/sinks/base/elasticsearch.cue
index aa29493a59583..59284c4260e4a 100644
--- a/website/cue/reference/components/sinks/base/elasticsearch.cue
+++ b/website/cue/reference/components/sinks/base/elasticsearch.cue
@@ -182,6 +182,15 @@ base: components: sinks: elasticsearch: configuration: {
 				required:      false
 				type: string: examples: ["vector-indexer-role"]
 			}
+			session_token: {
+				description: """
+					The AWS session token.
+					See [AWS temporary credentials](https://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_temp_use-resources.html)
+					"""
+				relevant_when: "strategy = \"aws\""
+				required:      false
+				type: string: examples: ["AQoDYXdz...AQoDYXdz..."]
+			}
 			strategy: {
 				description: """
 					The authentication strategy to use.
diff --git a/website/cue/reference/components/sinks/base/http.cue b/website/cue/reference/components/sinks/base/http.cue
index 5cf6181e34e96..286cf7dd842fb 100644
--- a/website/cue/reference/components/sinks/base/http.cue
+++ b/website/cue/reference/components/sinks/base/http.cue
@@ -149,6 +149,14 @@ base: components: sinks: http: configuration: {
 						required: false
 						type: string: examples: ["vector-indexer-role"]
 					}
+					session_token: {
+						description: """
+																The AWS session token.
+																See [AWS temporary credentials](https://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_temp_use-resources.html)
+																"""
+						required: false
+						type: string: examples: ["AQoDYXdz...AQoDYXdz..."]
+					}
 				}
 			}
 			password: {
diff --git a/website/cue/reference/components/sinks/base/loki.cue b/website/cue/reference/components/sinks/base/loki.cue
index 0641330c99865..218aed6a861fb 100644
--- a/website/cue/reference/components/sinks/base/loki.cue
+++ b/website/cue/reference/components/sinks/base/loki.cue
@@ -149,6 +149,14 @@ base: components: sinks: loki: configuration: {
 						required: false
 						type: string: examples: ["vector-indexer-role"]
 					}
+					session_token: {
+						description: """
+																The AWS session token.
+																See [AWS temporary credentials](https://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_temp_use-resources.html)
+																"""
+						required: false
+						type: string: examples: ["AQoDYXdz...AQoDYXdz..."]
+					}
 				}
 			}
 			password: {
diff --git a/website/cue/reference/components/sinks/base/opentelemetry.cue b/website/cue/reference/components/sinks/base/opentelemetry.cue
index 4d7a2d4b5228d..0f9d2a62585c1 100644
--- a/website/cue/reference/components/sinks/base/opentelemetry.cue
+++ b/website/cue/reference/components/sinks/base/opentelemetry.cue
@@ -152,6 +152,14 @@ base: components: sinks: opentelemetry: configuration: protocol: {
 							required: false
 							type: string: examples: ["vector-indexer-role"]
 						}
+						session_token: {
+							description: """
+																				The AWS session token.
+																				See [AWS temporary credentials](https://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_temp_use-resources.html)
+																				"""
+							required: false
+							type: string: examples: ["AQoDYXdz...AQoDYXdz..."]
+						}
 					}
 				}
 				password: {
diff --git a/website/cue/reference/components/sinks/base/prometheus_exporter.cue b/website/cue/reference/components/sinks/base/prometheus_exporter.cue
index 23b073699ba7b..50f16c511e1a9 100644
--- a/website/cue/reference/components/sinks/base/prometheus_exporter.cue
+++ b/website/cue/reference/components/sinks/base/prometheus_exporter.cue
@@ -161,6 +161,14 @@ base: components: sinks: prometheus_exporter: configuration: {
 						required: false
 						type: string: examples: ["vector-indexer-role"]
 					}
+					session_token: {
+						description: """
+																The AWS session token.
+																See [AWS temporary credentials](https://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_temp_use-resources.html)
+																"""
+						required: false
+						type: string: examples: ["AQoDYXdz...AQoDYXdz..."]
+					}
 				}
 			}
 			password: {
diff --git a/website/cue/reference/components/sinks/base/prometheus_remote_write.cue b/website/cue/reference/components/sinks/base/prometheus_remote_write.cue
index 62b12a901aa80..cbdd3ac14a7da 100644
--- a/website/cue/reference/components/sinks/base/prometheus_remote_write.cue
+++ b/website/cue/reference/components/sinks/base/prometheus_remote_write.cue
@@ -155,6 +155,15 @@ base: components: sinks: prometheus_remote_write: configuration: {
 				required:      false
 				type: string: examples: ["vector-indexer-role"]
 			}
+			session_token: {
+				description: """
+					The AWS session token.
+					See [AWS temporary credentials](https://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_temp_use-resources.html)
+					"""
+				relevant_when: "strategy = \"aws\""
+				required:      false
+				type: string: examples: ["AQoDYXdz...AQoDYXdz..."]
+			}
 			strategy: {
 				description: "The authentication strategy to use."
 				required:    true
diff --git a/website/cue/reference/components/sinks/base/websocket.cue b/website/cue/reference/components/sinks/base/websocket.cue
index 301315bbf9ea1..d6cadf59f1fbc 100644
--- a/website/cue/reference/components/sinks/base/websocket.cue
+++ b/website/cue/reference/components/sinks/base/websocket.cue
@@ -149,6 +149,14 @@ base: components: sinks: websocket: configuration: {
 						required: false
 						type: string: examples: ["vector-indexer-role"]
 					}
+					session_token: {
+						description: """
+																The AWS session token.
+																See [AWS temporary credentials](https://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_temp_use-resources.html)
+																"""
+						required: false
+						type: string: examples: ["AQoDYXdz...AQoDYXdz..."]
+					}
 				}
 			}
 			password: {
diff --git a/website/cue/reference/components/sources/base/aws_s3.cue b/website/cue/reference/components/sources/base/aws_s3.cue
index 8b3da586e11e8..e49d52b08c818 100644
--- a/website/cue/reference/components/sources/base/aws_s3.cue
+++ b/website/cue/reference/components/sources/base/aws_s3.cue
@@ -134,6 +134,14 @@ base: components: sources: aws_s3: configuration: {
 				required: false
 				type: string: examples: ["vector-indexer-role"]
 			}
+			session_token: {
+				description: """
+					The AWS session token.
+					See [AWS temporary credentials](https://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_temp_use-resources.html)
+					"""
+				required: false
+				type: string: examples: ["AQoDYXdz...AQoDYXdz..."]
+			}
 		}
 	}
 	compression: {
diff --git a/website/cue/reference/components/sources/base/aws_sqs.cue b/website/cue/reference/components/sources/base/aws_sqs.cue
index 9c713b33b2bd4..bc717121c5f09 100644
--- a/website/cue/reference/components/sources/base/aws_sqs.cue
+++ b/website/cue/reference/components/sources/base/aws_sqs.cue
@@ -134,6 +134,14 @@ base: components: sources: aws_sqs: configuration: {
 				required: false
 				type: string: examples: ["vector-indexer-role"]
 			}
+			session_token: {
+				description: """
+					The AWS session token.
+					See [AWS temporary credentials](https://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_temp_use-resources.html)
+					"""
+				required: false
+				type: string: examples: ["AQoDYXdz...AQoDYXdz..."]
+			}
 		}
 	}
 	client_concurrency: {
diff --git a/website/cue/reference/components/sources/base/http_client.cue b/website/cue/reference/components/sources/base/http_client.cue
index 5718041692c20..290740a94ac1a 100644
--- a/website/cue/reference/components/sources/base/http_client.cue
+++ b/website/cue/reference/components/sources/base/http_client.cue
@@ -118,6 +118,14 @@ base: components: sources: http_client: configuration: {
 						required: false
 						type: string: examples: ["vector-indexer-role"]
 					}
+					session_token: {
+						description: """
+																The AWS session token.
+																See [AWS temporary credentials](https://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_temp_use-resources.html)
+																"""
+						required: false
+						type: string: examples: ["AQoDYXdz...AQoDYXdz..."]
+					}
 				}
 			}
 			password: {
diff --git a/website/cue/reference/components/sources/base/nginx_metrics.cue b/website/cue/reference/components/sources/base/nginx_metrics.cue
index 57fb2200f7234..12cb35c733faf 100644
--- a/website/cue/reference/components/sources/base/nginx_metrics.cue
+++ b/website/cue/reference/components/sources/base/nginx_metrics.cue
@@ -123,6 +123,14 @@ base: components: sources: nginx_metrics: configuration: {
 						required: false
 						type: string: examples: ["vector-indexer-role"]
 					}
+					session_token: {
+						description: """
+																The AWS session token.
+																See [AWS temporary credentials](https://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_temp_use-resources.html)
+																"""
+						required: false
+						type: string: examples: ["AQoDYXdz...AQoDYXdz..."]
+					}
 				}
 			}
 			password: {
diff --git a/website/cue/reference/components/sources/base/prometheus_scrape.cue b/website/cue/reference/components/sources/base/prometheus_scrape.cue
index 396aa751a7ee9..ecaff2a727185 100644
--- a/website/cue/reference/components/sources/base/prometheus_scrape.cue
+++ b/website/cue/reference/components/sources/base/prometheus_scrape.cue
@@ -123,6 +123,14 @@ base: components: sources: prometheus_scrape: configuration: {
 						required: false
 						type: string: examples: ["vector-indexer-role"]
 					}
+					session_token: {
+						description: """
+																The AWS session token.
+																See [AWS temporary credentials](https://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_temp_use-resources.html)
+																"""
+						required: false
+						type: string: examples: ["AQoDYXdz...AQoDYXdz..."]
+					}
 				}
 			}
 			password: {

From f31839be8b0b7425fdc3c3fc44e6557dece627ee Mon Sep 17 00:00:00 2001
From: Orri Ganel <ganel.o@gmail.com>
Date: Thu, 12 Jun 2025 17:11:44 -0400
Subject: [PATCH 060/305] enhancement(kubernetes_logs source): Allow
 specification of a maximum line size to be applied after merging instead of
 just before (#22582)

* Add config for maximum allowed line size after merging

* Add warns when we drop partial logs for being too big; shift some comments around

* Add changelog

* Format

* Increment component_discarded_events_total on violation of max_line_size and max_merged_line_size

* Update changelog.d/22581_max_merged_line_bytes.feature.md

Co-authored-by: Pavlos Rontidis <pavlos.rontidis@gmail.com>

* Don't emit expired events that are too big nor ones that don't appear to be partial; fix test

* Fix another test

* Update src/sources/kubernetes_logs/mod.rs

Co-authored-by: Pavlos Rontidis <pavlos.rontidis@gmail.com>

* Update src/sources/kubernetes_logs/mod.rs

Co-authored-by: Pavlos Rontidis <pavlos.rontidis@gmail.com>

* Remove inadvertently added file

* Include Value rather than Event in error struct

* Rename field in bucket struct

* Move max_merged_line_bytes from being a param to being a field on the state struct

* Make new config field optional, defaulting to old behavior

* Format

* Appease check-events

* docs regen

* Tweak wording of doc; emit only first 1k bytes of dropped lines in error

* Rename fields for clarity

* Per PR feedback: copy just the initial 1000 bytes rather than cloning the whole buffer and then truncating, use more idiomatic Rust for handling both configured and unconfigured cases of max_merged_line_bytes

* Allow spelling of already-merged changelog filename

* Don't try to include more characters than there actually are in the slice

* Don't just get enough capacity, make sure length matches too

* Formatting

---------

Co-authored-by: Orri Ganel <oganel@palantir.com>
Co-authored-by: Pavlos Rontidis <pavlos.rontidis@gmail.com>
---
 .github/actions/spelling/expect.txt           |   1 +
 .../22581_max_merged_line_bytes.feature.md    |   3 +
 lib/file-source/src/buffer.rs                 |  55 +++++---
 lib/file-source/src/file_server.rs            |  16 ++-
 lib/file-source/src/file_watcher/mod.rs       |  54 ++++++--
 .../src/file_watcher/tests/experiment.rs      |   9 +-
 .../tests/experiment_no_truncations.rs        |  14 +-
 lib/file-source/src/fingerprinter.rs          |   3 +
 lib/file-source/src/internal_events.rs        |   9 ++
 src/internal_events/file.rs                   |  47 +++++++
 src/internal_events/kubernetes_logs.rs        |  35 ++++-
 src/sources/kubernetes_logs/mod.rs            |  30 ++++-
 .../kubernetes_logs/partial_events_merger.rs  | 123 ++++++++++++++++--
 .../sources/base/kubernetes_logs.cue          |  13 ++
 14 files changed, 358 insertions(+), 54 deletions(-)
 create mode 100644 changelog.d/22581_max_merged_line_bytes.feature.md

diff --git a/.github/actions/spelling/expect.txt b/.github/actions/spelling/expect.txt
index ee745e5c30d5e..82fea89d4fb57 100644
--- a/.github/actions/spelling/expect.txt
+++ b/.github/actions/spelling/expect.txt
@@ -175,6 +175,7 @@ efgh
 Elhage
 emerg
 Enableable
+enableable
 endianess
 endler
 eni
diff --git a/changelog.d/22581_max_merged_line_bytes.feature.md b/changelog.d/22581_max_merged_line_bytes.feature.md
new file mode 100644
index 0000000000000..b5d36e53bde52
--- /dev/null
+++ b/changelog.d/22581_max_merged_line_bytes.feature.md
@@ -0,0 +1,3 @@
+The `kubernetes_logs` source now includes a new `max_merged_line_bytes` configuration option. This setting enables users to cap the size of log lines after they’ve been combined using `auto_partial_merge`. Previously, the `max_line_bytes` field only restricted line sizes *before* merging, leaving no practical way to limit the length of merged lines—unless you set a size so tiny that it prevented merging altogether by stopping short of the continuation character. This new option gives you better control over merged line sizes.
+
+authors: ganelo
diff --git a/lib/file-source/src/buffer.rs b/lib/file-source/src/buffer.rs
index c8dbe1f400905..55dd481334e1d 100644
--- a/lib/file-source/src/buffer.rs
+++ b/lib/file-source/src/buffer.rs
@@ -1,11 +1,18 @@
-use std::io::{self, BufRead};
+use std::{
+    cmp::min,
+    io::{self, BufRead},
+};
 
 use bstr::Finder;
 use bytes::BytesMut;
-use tracing::warn;
 
 use crate::FilePosition;
 
+pub struct ReadResult {
+    pub successfully_read: Option<usize>,
+    pub discarded_for_size_and_truncated: Vec<BytesMut>,
+}
+
 /// Read up to `max_size` bytes from `reader`, splitting by `delim`
 ///
 /// The function reads up to `max_size` bytes from `reader`, splitting the input
@@ -29,17 +36,18 @@ use crate::FilePosition;
 /// Benchmarks indicate that this function processes in the high single-digit
 /// GiB/s range for buffers of length 1KiB. For buffers any smaller than this
 /// the overhead of setup dominates our benchmarks.
-pub fn read_until_with_max_size<R: BufRead + ?Sized>(
-    reader: &mut R,
-    position: &mut FilePosition,
-    delim: &[u8],
-    buf: &mut BytesMut,
+pub fn read_until_with_max_size<'a, R: BufRead + ?Sized>(
+    reader: &'a mut R,
+    position: &'a mut FilePosition,
+    delim: &'a [u8],
+    buf: &'a mut BytesMut,
     max_size: usize,
-) -> io::Result<Option<usize>> {
+) -> io::Result<ReadResult> {
     let mut total_read = 0;
     let mut discarding = false;
     let delim_finder = Finder::new(delim);
     let delim_len = delim.len();
+    let mut discarded_for_size_and_truncated = Vec::new();
     loop {
         let available: &[u8] = match reader.fill_buf() {
             Ok(n) => n,
@@ -68,16 +76,20 @@ pub fn read_until_with_max_size<R: BufRead + ?Sized>(
         total_read += used;
 
         if !discarding && buf.len() > max_size {
-            warn!(
-                message = "Found line that exceeds max_line_bytes; discarding.",
-                internal_log_rate_limit = true
-            );
+            // keep only the first <1k bytes to make sure we can actually emit a usable error
+            let length_to_keep = min(1000, max_size);
+            let mut truncated: BytesMut = BytesMut::zeroed(length_to_keep);
+            truncated.copy_from_slice(&buf[0..length_to_keep]);
+            discarded_for_size_and_truncated.push(truncated);
             discarding = true;
         }
 
         if done {
             if !discarding {
-                return Ok(Some(total_read));
+                return Ok(ReadResult {
+                    successfully_read: Some(total_read),
+                    discarded_for_size_and_truncated,
+                });
             } else {
                 discarding = false;
                 buf.clear();
@@ -87,7 +99,10 @@ pub fn read_until_with_max_size<R: BufRead + ?Sized>(
             // us to observe an incomplete write. We return None here and let the loop continue
             // next time the method is called. This is safe because the buffer is specific to this
             // FileWatcher.
-            return Ok(None);
+            return Ok(ReadResult {
+                successfully_read: None,
+                discarded_for_size_and_truncated,
+            });
         }
     }
 }
@@ -99,6 +114,8 @@ mod test {
     use bytes::{BufMut, BytesMut};
     use quickcheck::{QuickCheck, TestResult};
 
+    use crate::buffer::ReadResult;
+
     use super::read_until_with_max_size;
 
     fn qc_inner(chunks: Vec<Vec<u8>>, delim: u8, max_size: NonZeroU8) -> TestResult {
@@ -181,7 +198,10 @@ mod test {
             )
             .unwrap()
             {
-                None => {
+                ReadResult {
+                    successfully_read: None,
+                    discarded_for_size_and_truncated: _,
+                } => {
                     // Subject only returns None if this is the last chunk _and_
                     // the chunk did not contain a delimiter _or_ the delimiter
                     // was outside the max_size range _or_ the current chunk is empty.
@@ -190,7 +210,10 @@ mod test {
                         .any(|details| ((details.chunk_index == idx) && details.within_max_size));
                     assert!(chunk.is_empty() || !has_valid_delimiter)
                 }
-                Some(total_read) => {
+                ReadResult {
+                    successfully_read: Some(total_read),
+                    discarded_for_size_and_truncated: _,
+                } => {
                     // Now that the function has returned we confirm that the
                     // returned details match our `first_delim` and also that
                     // the `buffer` is populated correctly.
diff --git a/lib/file-source/src/file_server.rs b/lib/file-source/src/file_server.rs
index 1dfc6ebd08004..ebb1867339242 100644
--- a/lib/file-source/src/file_server.rs
+++ b/lib/file-source/src/file_server.rs
@@ -19,7 +19,7 @@ use tracing::{debug, error, info, trace};
 
 use crate::{
     checkpointer::{Checkpointer, CheckpointsView},
-    file_watcher::FileWatcher,
+    file_watcher::{FileWatcher, RawLineResult},
     fingerprinter::{FileFingerprint, Fingerprinter},
     paths_provider::PathsProvider,
     FileSourceInternalEvents, ReadFrom,
@@ -263,7 +263,19 @@ where
 
                 let start = time::Instant::now();
                 let mut bytes_read: usize = 0;
-                while let Ok(Some(line)) = watcher.read_line() {
+                while let Ok(RawLineResult {
+                    raw_line: Some(line),
+                    discarded_for_size_and_truncated,
+                }) = watcher.read_line()
+                {
+                    discarded_for_size_and_truncated.iter().for_each(|buf| {
+                        self.emitter.emit_file_line_too_long(
+                            &buf.clone(),
+                            self.max_line_bytes,
+                            buf.len(),
+                        )
+                    });
+
                     let sz = line.bytes.len();
                     trace!(
                         message = "Read bytes.",
diff --git a/lib/file-source/src/file_watcher/mod.rs b/lib/file-source/src/file_watcher/mod.rs
index 80db2b9bc876c..a8d4fd0f81641 100644
--- a/lib/file-source/src/file_watcher/mod.rs
+++ b/lib/file-source/src/file_watcher/mod.rs
@@ -12,7 +12,9 @@ use tracing::debug;
 use vector_common::constants::GZIP_MAGIC;
 
 use crate::{
-    buffer::read_until_with_max_size, metadata_ext::PortableFileExt, FilePosition, ReadFrom,
+    buffer::{read_until_with_max_size, ReadResult},
+    metadata_ext::PortableFileExt,
+    FilePosition, ReadFrom,
 };
 #[cfg(test)]
 mod tests;
@@ -28,6 +30,12 @@ pub(super) struct RawLine {
     pub bytes: Bytes,
 }
 
+#[derive(Debug)]
+pub struct RawLineResult {
+    pub raw_line: Option<RawLine>,
+    pub discarded_for_size_and_truncated: Vec<BytesMut>,
+}
+
 /// The `FileWatcher` struct defines the polling based state machine which reads
 /// from a file path, transparently updating the underlying file descriptor when
 /// the file has been rolled over, as is common for logs.
@@ -207,7 +215,7 @@ impl FileWatcher {
     /// This function will attempt to read a new line from its file, blocking,
     /// up to some maximum but unspecified amount of time. `read_line` will open
     /// a new file handler as needed, transparently to the caller.
-    pub(super) fn read_line(&mut self) -> io::Result<Option<RawLine>> {
+    pub(super) fn read_line(&mut self) -> io::Result<RawLineResult> {
         self.track_read_attempt();
 
         let reader = &mut self.reader;
@@ -220,14 +228,23 @@ impl FileWatcher {
             &mut self.buf,
             self.max_line_bytes,
         ) {
-            Ok(Some(_)) => {
+            Ok(ReadResult {
+                successfully_read: Some(_),
+                discarded_for_size_and_truncated,
+            }) => {
                 self.track_read_success();
-                Ok(Some(RawLine {
-                    offset: initial_position,
-                    bytes: self.buf.split().freeze(),
-                }))
+                Ok(RawLineResult {
+                    raw_line: Some(RawLine {
+                        offset: initial_position,
+                        bytes: self.buf.split().freeze(),
+                    }),
+                    discarded_for_size_and_truncated,
+                })
             }
-            Ok(None) => {
+            Ok(ReadResult {
+                successfully_read: None,
+                discarded_for_size_and_truncated,
+            }) => {
                 if !self.file_findable() {
                     self.set_dead();
                     // File has been deleted, so return what we have in the buffer, even though it
@@ -237,16 +254,25 @@ impl FileWatcher {
                     if buf.is_empty() {
                         // EOF
                         self.reached_eof = true;
-                        Ok(None)
+                        Ok(RawLineResult {
+                            raw_line: None,
+                            discarded_for_size_and_truncated,
+                        })
                     } else {
-                        Ok(Some(RawLine {
-                            offset: initial_position,
-                            bytes: buf,
-                        }))
+                        Ok(RawLineResult {
+                            raw_line: Some(RawLine {
+                                offset: initial_position,
+                                bytes: buf,
+                            }),
+                            discarded_for_size_and_truncated,
+                        })
                     }
                 } else {
                     self.reached_eof = true;
-                    Ok(None)
+                    Ok(RawLineResult {
+                        raw_line: None,
+                        discarded_for_size_and_truncated,
+                    })
                 }
             }
             Err(e) => {
diff --git a/lib/file-source/src/file_watcher/tests/experiment.rs b/lib/file-source/src/file_watcher/tests/experiment.rs
index decdbdab98240..cbbfabe0a67b7 100644
--- a/lib/file-source/src/file_watcher/tests/experiment.rs
+++ b/lib/file-source/src/file_watcher/tests/experiment.rs
@@ -8,7 +8,7 @@ use bytes::Bytes;
 use quickcheck::{QuickCheck, TestResult};
 
 use crate::{
-    file_watcher::{tests::*, FileWatcher},
+    file_watcher::{tests::*, FileWatcher, RawLineResult},
     ReadFrom,
 };
 
@@ -96,11 +96,14 @@ fn experiment(actions: Vec<FileWatcherAction>) {
                         Err(_) => {
                             unreachable!();
                         }
-                        Ok(Some(line)) if line.bytes.is_empty() => {
+                        Ok(RawLineResult {
+                            raw_line: Some(line),
+                            ..
+                        }) if line.bytes.is_empty() => {
                             attempts -= 1;
                             continue;
                         }
-                        Ok(None) => {
+                        Ok(RawLineResult { raw_line: None, .. }) => {
                             attempts -= 1;
                             continue;
                         }
diff --git a/lib/file-source/src/file_watcher/tests/experiment_no_truncations.rs b/lib/file-source/src/file_watcher/tests/experiment_no_truncations.rs
index ee8a24a9f95bf..78aa7536b9a38 100644
--- a/lib/file-source/src/file_watcher/tests/experiment_no_truncations.rs
+++ b/lib/file-source/src/file_watcher/tests/experiment_no_truncations.rs
@@ -4,7 +4,7 @@ use bytes::Bytes;
 use quickcheck::{QuickCheck, TestResult};
 
 use crate::{
-    file_watcher::{tests::*, FileWatcher},
+    file_watcher::{tests::*, FileWatcher, RawLineResult},
     ReadFrom,
 };
 
@@ -63,17 +63,23 @@ fn experiment_no_truncations(actions: Vec<FileWatcherAction>) {
                         Err(_) => {
                             unreachable!();
                         }
-                        Ok(Some(line)) if line.bytes.is_empty() => {
+                        Ok(RawLineResult {
+                            raw_line: Some(line),
+                            ..
+                        }) if line.bytes.is_empty() => {
                             attempts -= 1;
                             assert!(fwfiles[read_index].read_line().is_none());
                             continue;
                         }
-                        Ok(None) => {
+                        Ok(RawLineResult { raw_line: None, .. }) => {
                             attempts -= 1;
                             assert!(fwfiles[read_index].read_line().is_none());
                             continue;
                         }
-                        Ok(Some(line)) => {
+                        Ok(RawLineResult {
+                            raw_line: Some(line),
+                            ..
+                        }) => {
                             let exp = fwfiles[read_index].read_line().expect("could not readline");
                             assert_eq!(exp.into_bytes(), line.bytes);
                             // assert_eq!(sz, buf.len() + 1);
diff --git a/lib/file-source/src/fingerprinter.rs b/lib/file-source/src/fingerprinter.rs
index b176f6e9964ac..a7c339d249760 100644
--- a/lib/file-source/src/fingerprinter.rs
+++ b/lib/file-source/src/fingerprinter.rs
@@ -392,6 +392,7 @@ mod test {
         time::Duration,
     };
 
+    use bytes::BytesMut;
     use flate2::write::GzEncoder;
     use tempfile::{tempdir, TempDir};
 
@@ -813,5 +814,7 @@ mod test {
         fn emit_files_open(&self, _: usize) {}
 
         fn emit_path_globbing_failed(&self, _: &Path, _: &Error) {}
+
+        fn emit_file_line_too_long(&self, _: &BytesMut, _: usize, _: usize) {}
     }
 }
diff --git a/lib/file-source/src/internal_events.rs b/lib/file-source/src/internal_events.rs
index 9eb60e65397a1..3077a51d8cab9 100644
--- a/lib/file-source/src/internal_events.rs
+++ b/lib/file-source/src/internal_events.rs
@@ -1,5 +1,7 @@
 use std::{io::Error, path::Path, time::Duration};
 
+use bytes::BytesMut;
+
 /// Every internal event in this crate has a corresponding
 /// method in this trait which should emit the event.
 pub trait FileSourceInternalEvents: Send + Sync + Clone + 'static {
@@ -26,4 +28,11 @@ pub trait FileSourceInternalEvents: Send + Sync + Clone + 'static {
     fn emit_files_open(&self, count: usize);
 
     fn emit_path_globbing_failed(&self, path: &Path, error: &Error);
+
+    fn emit_file_line_too_long(
+        &self,
+        truncated_bytes: &BytesMut,
+        configured_limit: usize,
+        encountered_size_so_far: usize,
+    );
 }
diff --git a/src/internal_events/file.rs b/src/internal_events/file.rs
index 84cf828c89d7a..c6d80460143f2 100644
--- a/src/internal_events/file.rs
+++ b/src/internal_events/file.rs
@@ -105,8 +105,10 @@ impl<P: std::fmt::Debug> InternalEvent for FileIoError<'_, P> {
 mod source {
     use std::{io::Error, path::Path, time::Duration};
 
+    use bytes::BytesMut;
     use metrics::counter;
     use vector_lib::file_source::FileSourceInternalEvents;
+    use vector_lib::internal_event::{ComponentEventsDropped, INTENTIONAL};
 
     use super::{FileOpen, InternalEvent};
     use vector_lib::emit;
@@ -493,6 +495,38 @@ mod source {
         }
     }
 
+    #[derive(Debug)]
+    pub struct FileLineTooBigError<'a> {
+        pub truncated_bytes: &'a BytesMut,
+        pub configured_limit: usize,
+        pub encountered_size_so_far: usize,
+    }
+
+    impl InternalEvent for FileLineTooBigError<'_> {
+        fn emit(self) {
+            error!(
+                message = "Found line that exceeds max_line_bytes; discarding.",
+                truncated_bytes = ?self.truncated_bytes,
+                configured_limit = self.configured_limit,
+                encountered_size_so_far = self.encountered_size_so_far,
+                internal_log_rate_limit = true,
+                error_type = error_type::CONDITION_FAILED,
+                stage = error_stage::RECEIVING,
+            );
+            counter!(
+                "component_errors_total",
+                "error_code" => "reading_line_from_file",
+                "error_type" => error_type::CONDITION_FAILED,
+                "stage" => error_stage::RECEIVING,
+            )
+            .increment(1);
+            emit!(ComponentEventsDropped::<INTENTIONAL> {
+                count: 1,
+                reason: "Found line that exceeds max_line_bytes; discarding.",
+            });
+        }
+    }
+
     #[derive(Clone)]
     pub struct FileSourceInternalEventsEmitter {
         pub include_file_metric_tag: bool,
@@ -575,5 +609,18 @@ mod source {
         fn emit_path_globbing_failed(&self, path: &Path, error: &Error) {
             emit!(PathGlobbingError { path, error });
         }
+
+        fn emit_file_line_too_long(
+            &self,
+            truncated_bytes: &bytes::BytesMut,
+            configured_limit: usize,
+            encountered_size_so_far: usize,
+        ) {
+            emit!(FileLineTooBigError {
+                truncated_bytes,
+                configured_limit,
+                encountered_size_so_far
+            });
+        }
     }
 }
diff --git a/src/internal_events/kubernetes_logs.rs b/src/internal_events/kubernetes_logs.rs
index e70f3f47cc4a7..ed68c14790656 100644
--- a/src/internal_events/kubernetes_logs.rs
+++ b/src/internal_events/kubernetes_logs.rs
@@ -1,9 +1,10 @@
 use metrics::counter;
-use vector_lib::internal_event::InternalEvent;
+use vector_lib::internal_event::{InternalEvent, INTENTIONAL};
 use vector_lib::{
     internal_event::{error_stage, error_type, ComponentEventsDropped, UNINTENTIONAL},
     json_size::JsonSize,
 };
+use vrl::core::Value;
 
 use crate::event::Event;
 
@@ -205,3 +206,35 @@ impl<E: std::fmt::Display> InternalEvent for KubernetesLifecycleError<E> {
         });
     }
 }
+
+#[derive(Debug)]
+pub struct KubernetesMergedLineTooBigError<'a> {
+    pub event: &'a Value,
+    pub configured_limit: usize,
+    pub encountered_size_so_far: usize,
+}
+
+impl InternalEvent for KubernetesMergedLineTooBigError<'_> {
+    fn emit(self) {
+        error!(
+            message = "Found line that exceeds max_merged_line_bytes; discarding.",
+            event = ?self.event,
+            configured_limit = self.configured_limit,
+            encountered_size_so_far = self.encountered_size_so_far,
+            internal_log_rate_limit = true,
+            error_type = error_type::CONDITION_FAILED,
+            stage = error_stage::RECEIVING,
+        );
+        counter!(
+            "component_errors_total",
+            "error_code" => "reading_line_from_kubernetes_log",
+            "error_type" => error_type::CONDITION_FAILED,
+            "stage" => error_stage::RECEIVING,
+        )
+        .increment(1);
+        emit!(ComponentEventsDropped::<INTENTIONAL> {
+            count: 1,
+            reason: "Found line that exceeds max_merged_line_bytes; discarding.",
+        });
+    }
+}
diff --git a/src/sources/kubernetes_logs/mod.rs b/src/sources/kubernetes_logs/mod.rs
index fa0fedb80546a..4adf82d61905f 100644
--- a/src/sources/kubernetes_logs/mod.rs
+++ b/src/sources/kubernetes_logs/mod.rs
@@ -4,7 +4,7 @@
 //! running inside the cluster as a DaemonSet.
 
 #![deny(missing_docs)]
-use std::{path::PathBuf, time::Duration};
+use std::{cmp::min, path::PathBuf, time::Duration};
 
 use bytes::Bytes;
 use chrono::Utc;
@@ -193,6 +193,16 @@ pub struct Config {
     #[configurable(metadata(docs::type_unit = "bytes"))]
     max_line_bytes: usize,
 
+    /// The maximum number of bytes a line can contain - after merging - before being discarded.
+    ///
+    /// This protects against malformed lines or tailing incorrect files.
+    ///
+    /// Note that, if auto_partial_merge is false, this config will be ignored. Also, if max_line_bytes is too small to reach the continuation character, then this
+    /// config will have no practical impact (the same is true of `auto_partial_merge`). Finally, the smaller of `max_merged_line_bytes` and `max_line_bytes` will apply
+    /// if auto_partial_merge is true, so if this is set to be 1 MiB, for example, but `max_line_bytes` is set to ~2.5 MiB, then every line greater than 1 MiB will be dropped.
+    #[configurable(metadata(docs::type_unit = "bytes"))]
+    max_merged_line_bytes: Option<usize>,
+
     /// The number of lines to read for generating the checksum.
     ///
     /// If your files share a common header that is not always a fixed size,
@@ -294,6 +304,7 @@ impl Default for Config {
             max_read_bytes: default_max_read_bytes(),
             oldest_first: default_oldest_first(),
             max_line_bytes: default_max_line_bytes(),
+            max_merged_line_bytes: None,
             fingerprint_lines: default_fingerprint_lines(),
             glob_minimum_cooldown_ms: default_glob_minimum_cooldown_ms(),
             ingestion_timestamp_field: None,
@@ -553,6 +564,7 @@ struct Source {
     max_read_bytes: usize,
     oldest_first: bool,
     max_line_bytes: usize,
+    max_merged_line_bytes: Option<usize>,
     fingerprint_lines: usize,
     glob_minimum_cooldown: Duration,
     use_apiserver_cache: bool,
@@ -641,6 +653,7 @@ impl Source {
             max_read_bytes: config.max_read_bytes,
             oldest_first: config.oldest_first,
             max_line_bytes: config.max_line_bytes,
+            max_merged_line_bytes: config.max_merged_line_bytes,
             fingerprint_lines: config.fingerprint_lines,
             glob_minimum_cooldown,
             use_apiserver_cache: config.use_apiserver_cache,
@@ -676,6 +689,7 @@ impl Source {
             max_read_bytes,
             oldest_first,
             max_line_bytes,
+            max_merged_line_bytes,
             fingerprint_lines,
             glob_minimum_cooldown,
             use_apiserver_cache,
@@ -779,6 +793,14 @@ impl Source {
 
         let ignore_before = calculate_ignore_before(ignore_older_secs);
 
+        let mut resolved_max_line_bytes = max_line_bytes;
+        if auto_partial_merge {
+            resolved_max_line_bytes = min(
+                max_line_bytes,
+                max_merged_line_bytes.unwrap_or(max_line_bytes),
+            );
+        }
+
         // TODO: maybe more of the parameters have to be configurable.
 
         let checkpointer = Checkpointer::new(&data_dir);
@@ -803,7 +825,7 @@ impl Source {
             ignore_before,
             // The maximum number of bytes a line can contain before being discarded. This
             // protects against malformed lines or tailing incorrect files.
-            max_line_bytes,
+            max_line_bytes: resolved_max_line_bytes,
             // Delimiter bytes that is used to read the file line-by-line
             line_delimiter: Bytes::from("\n"),
             // The directory where to keep the checkpoints.
@@ -821,7 +843,7 @@ impl Source {
                     ignored_header_bytes: 0,
                     lines: fingerprint_lines,
                 },
-                max_line_length: max_line_bytes,
+                max_line_length: resolved_max_line_bytes,
                 ignore_not_found: true,
             },
             oldest_first,
@@ -897,7 +919,7 @@ impl Source {
         let (events_count, _) = events.size_hint();
 
         let mut stream = if auto_partial_merge {
-            merge_partial_events(events, log_namespace).left_stream()
+            merge_partial_events(events, log_namespace, max_merged_line_bytes).left_stream()
         } else {
             events.right_stream()
         };
diff --git a/src/sources/kubernetes_logs/partial_events_merger.rs b/src/sources/kubernetes_logs/partial_events_merger.rs
index 14628df46ad6e..56752b49454cd 100644
--- a/src/sources/kubernetes_logs/partial_events_merger.rs
+++ b/src/sources/kubernetes_logs/partial_events_merger.rs
@@ -11,6 +11,7 @@ use vrl::owned_value_path;
 
 use crate::event;
 use crate::event::{Event, LogEvent, Value};
+use crate::internal_events::KubernetesMergedLineTooBigError;
 use crate::sources::kubernetes_logs::transform_utils::get_message_path;
 
 /// The key we use for `file` field.
@@ -20,6 +21,7 @@ const EXPIRATION_TIME: Duration = Duration::from_secs(30);
 
 struct PartialEventMergeState {
     buckets: HashMap<String, Bucket>,
+    maybe_max_merged_line_bytes: Option<usize>,
 }
 
 impl PartialEventMergeState {
@@ -30,38 +32,80 @@ impl PartialEventMergeState {
         message_path: &OwnedTargetPath,
         expiration_time: Duration,
     ) {
+        let mut bytes_mut = BytesMut::new();
         if let Some(bucket) = self.buckets.get_mut(file) {
+            // don't bother continuing to process new partial events that match existing ones that are already too big
+            if bucket.exceeds_max_merged_line_limit {
+                return;
+            }
+
             // merging with existing event
 
             if let (Some(Value::Bytes(prev_value)), Some(Value::Bytes(new_value))) =
                 (bucket.event.get_mut(message_path), event.get(message_path))
             {
-                let mut bytes_mut = BytesMut::new();
                 bytes_mut.extend_from_slice(prev_value);
                 bytes_mut.extend_from_slice(new_value);
+
+                // drop event if it's bigger than max allowed
+                if let Some(max_merged_line_bytes) = self.maybe_max_merged_line_bytes {
+                    if bytes_mut.len() > max_merged_line_bytes {
+                        bucket.exceeds_max_merged_line_limit = true;
+                        // perf impact of clone should be minimal since being here means no further processing of this event will occur
+                        emit!(KubernetesMergedLineTooBigError {
+                            event: &Value::Bytes(new_value.clone()),
+                            configured_limit: max_merged_line_bytes,
+                            encountered_size_so_far: bytes_mut.len()
+                        });
+                    }
+                }
+
                 *prev_value = bytes_mut.freeze();
             }
         } else {
             // new event
+
+            let mut exceeds_max_merged_line_limit = false;
+
+            if let Some(Value::Bytes(event_bytes)) = event.get(message_path) {
+                bytes_mut.extend_from_slice(event_bytes);
+                if let Some(max_merged_line_bytes) = self.maybe_max_merged_line_bytes {
+                    exceeds_max_merged_line_limit = bytes_mut.len() > max_merged_line_bytes;
+
+                    if exceeds_max_merged_line_limit {
+                        // perf impact of clone should be minimal since being here means no further processing of this event will occur
+                        emit!(KubernetesMergedLineTooBigError {
+                            event: &Value::Bytes(event_bytes.clone()),
+                            configured_limit: max_merged_line_bytes,
+                            encountered_size_so_far: bytes_mut.len()
+                        });
+                    }
+                }
+            }
+
             self.buckets.insert(
                 file.to_owned(),
                 Bucket {
                     event,
                     expiration: Instant::now() + expiration_time,
+                    exceeds_max_merged_line_limit,
                 },
             );
         }
     }
 
     fn remove_event(&mut self, file: &str) -> Option<LogEvent> {
-        self.buckets.remove(file).map(|bucket| bucket.event)
+        self.buckets
+            .remove(file)
+            .filter(|bucket| !bucket.exceeds_max_merged_line_limit)
+            .map(|bucket| bucket.event)
     }
 
     fn emit_expired_events(&mut self, emitter: &mut Emitter<LogEvent>) {
         let now = Instant::now();
         self.buckets.retain(|_key, bucket| {
             let expired = now >= bucket.expiration;
-            if expired {
+            if expired && !bucket.exceeds_max_merged_line_limit {
                 emitter.emit(bucket.event.clone());
             }
             !expired
@@ -70,7 +114,9 @@ impl PartialEventMergeState {
 
     fn flush_events(&mut self, emitter: &mut Emitter<LogEvent>) {
         for (_, bucket) in self.buckets.drain() {
-            emitter.emit(bucket.event);
+            if !bucket.exceeds_max_merged_line_limit {
+                emitter.emit(bucket.event);
+            }
         }
     }
 }
@@ -78,13 +124,20 @@ impl PartialEventMergeState {
 struct Bucket {
     event: LogEvent,
     expiration: Instant,
+    exceeds_max_merged_line_limit: bool,
 }
 
 pub fn merge_partial_events(
     stream: impl Stream<Item = Event> + 'static,
     log_namespace: LogNamespace,
+    maybe_max_merged_line_bytes: Option<usize>,
 ) -> impl Stream<Item = Event> {
-    merge_partial_events_with_custom_expiration(stream, log_namespace, EXPIRATION_TIME)
+    merge_partial_events_with_custom_expiration(
+        stream,
+        log_namespace,
+        EXPIRATION_TIME,
+        maybe_max_merged_line_bytes,
+    )
 }
 
 // internal function that allows customizing the expiration time (for testing)
@@ -92,6 +145,7 @@ fn merge_partial_events_with_custom_expiration(
     stream: impl Stream<Item = Event> + 'static,
     log_namespace: LogNamespace,
     expiration_time: Duration,
+    maybe_max_merged_line_bytes: Option<usize>,
 ) -> impl Stream<Item = Event> {
     let partial_flag_path = match log_namespace {
         LogNamespace::Vector => {
@@ -109,6 +163,7 @@ fn merge_partial_events_with_custom_expiration(
 
     let state = PartialEventMergeState {
         buckets: HashMap::new(),
+        maybe_max_merged_line_bytes,
     };
 
     let message_path = get_message_path(log_namespace);
@@ -164,7 +219,7 @@ mod test {
         e_1.insert("foo", 1);
 
         let input_stream = futures::stream::iter([e_1.into()]);
-        let output_stream = merge_partial_events(input_stream, LogNamespace::Legacy);
+        let output_stream = merge_partial_events(input_stream, LogNamespace::Legacy, None);
 
         let output: Vec<Event> = output_stream.collect().await;
         assert_eq!(output.len(), 1);
@@ -174,6 +229,18 @@ mod test {
         );
     }
 
+    #[tokio::test]
+    async fn merge_single_event_legacy_exceeds_max_merged_line_limit() {
+        let mut e_1 = LogEvent::from("test message 1");
+        e_1.insert("foo", 1);
+
+        let input_stream = futures::stream::iter([e_1.into()]);
+        let output_stream = merge_partial_events(input_stream, LogNamespace::Legacy, Some(1));
+
+        let output: Vec<Event> = output_stream.collect().await;
+        assert_eq!(output.len(), 0);
+    }
+
     #[tokio::test]
     async fn merge_multiple_events_legacy() {
         let mut e_1 = LogEvent::from("test message 1");
@@ -184,7 +251,7 @@ mod test {
         e_2.insert("foo2", 1);
 
         let input_stream = futures::stream::iter([e_1.into(), e_2.into()]);
-        let output_stream = merge_partial_events(input_stream, LogNamespace::Legacy);
+        let output_stream = merge_partial_events(input_stream, LogNamespace::Legacy, None);
 
         let output: Vec<Event> = output_stream.collect().await;
         assert_eq!(output.len(), 1);
@@ -194,6 +261,23 @@ mod test {
         );
     }
 
+    #[tokio::test]
+    async fn merge_multiple_events_legacy_exceeds_max_merged_line_limit() {
+        let mut e_1 = LogEvent::from("test message 1");
+        e_1.insert("foo", 1);
+        e_1.insert("_partial", true);
+
+        let mut e_2 = LogEvent::from("test message 2");
+        e_2.insert("foo2", 1);
+
+        let input_stream = futures::stream::iter([e_1.into(), e_2.into()]);
+        // 24 > length of first message but less than the two combined
+        let output_stream = merge_partial_events(input_stream, LogNamespace::Legacy, Some(24));
+
+        let output: Vec<Event> = output_stream.collect().await;
+        assert_eq!(output.len(), 0);
+    }
+
     #[tokio::test]
     async fn multiple_events_flush_legacy() {
         let mut e_1 = LogEvent::from("test message 1");
@@ -205,7 +289,7 @@ mod test {
         e_1.insert("_partial", true);
 
         let input_stream = futures::stream::iter([e_1.into(), e_2.into()]);
-        let output_stream = merge_partial_events(input_stream, LogNamespace::Legacy);
+        let output_stream = merge_partial_events(input_stream, LogNamespace::Legacy, None);
 
         let output: Vec<Event> = output_stream.collect().await;
         assert_eq!(output.len(), 1);
@@ -215,6 +299,24 @@ mod test {
         );
     }
 
+    #[tokio::test]
+    async fn multiple_events_flush_legacy_exceeds_max_merged_line_limit() {
+        let mut e_1 = LogEvent::from("test message 1");
+        e_1.insert("foo", 1);
+        e_1.insert("_partial", true);
+
+        let mut e_2 = LogEvent::from("test message 2");
+        e_2.insert("foo2", 1);
+        e_1.insert("_partial", true);
+
+        let input_stream = futures::stream::iter([e_1.into(), e_2.into()]);
+        // 24 > length of first message but less than the two combined
+        let output_stream = merge_partial_events(input_stream, LogNamespace::Legacy, Some(24));
+
+        let output: Vec<Event> = output_stream.collect().await;
+        assert_eq!(output.len(), 0);
+    }
+
     #[tokio::test]
     async fn multiple_events_expire_legacy() {
         let mut e_1 = LogEvent::from("test message");
@@ -233,6 +335,7 @@ mod test {
             input_stream,
             LogNamespace::Legacy,
             Duration::from_secs(1),
+            None,
         );
 
         let output: Vec<Event> = output_stream.take(2).collect().await;
@@ -256,7 +359,7 @@ mod test {
         );
 
         let input_stream = futures::stream::iter([e_1.into()]);
-        let output_stream = merge_partial_events(input_stream, LogNamespace::Vector);
+        let output_stream = merge_partial_events(input_stream, LogNamespace::Vector, None);
 
         let output: Vec<Event> = output_stream.collect().await;
         assert_eq!(output.len(), 1);
@@ -286,7 +389,7 @@ mod test {
         );
 
         let input_stream = futures::stream::iter([e_1.into(), e_2.into()]);
-        let output_stream = merge_partial_events(input_stream, LogNamespace::Vector);
+        let output_stream = merge_partial_events(input_stream, LogNamespace::Vector, None);
 
         let output: Vec<Event> = output_stream.collect().await;
         assert_eq!(output.len(), 1);
diff --git a/website/cue/reference/components/sources/base/kubernetes_logs.cue b/website/cue/reference/components/sources/base/kubernetes_logs.cue
index 5895f56908506..f07e3b317e5a0 100644
--- a/website/cue/reference/components/sources/base/kubernetes_logs.cue
+++ b/website/cue/reference/components/sources/base/kubernetes_logs.cue
@@ -191,6 +191,19 @@ base: components: sources: kubernetes_logs: configuration: {
 			unit:    "bytes"
 		}
 	}
+	max_merged_line_bytes: {
+		description: """
+			The maximum number of bytes a line can contain - after merging - before being discarded.
+
+			This protects against malformed lines or tailing incorrect files.
+
+			Note that, if auto_partial_merge is false, this config will be ignored. Also, if max_line_bytes is too small to reach the continuation character, then this
+			config will have no practical impact (the same is true of `auto_partial_merge`). Finally, the smaller of `max_merged_line_bytes` and `max_line_bytes` will apply
+			if auto_partial_merge is true, so if this is set to be 1 MiB, for example, but `max_line_bytes` is set to ~2.5 MiB, then every line greater than 1 MiB will be dropped.
+			"""
+		required: false
+		type: uint: unit: "bytes"
+	}
 	max_read_bytes: {
 		description: """
 			Max amount of bytes to read from a single file before switching over to the next file.

From 7205b4a7273ec4480d6e03375df01b29002df504 Mon Sep 17 00:00:00 2001
From: Aram Peres <6775216+aramperes@users.noreply.github.com>
Date: Fri, 13 Jun 2025 09:55:42 -0400
Subject: [PATCH 061/305] fix(amqp sink): attempt one reconnect when channel
 has errored (#22971)

* fix(amqp sink): attempt one reconnect when channel has errored

* add changelog.d

* fix changelog.d

* Use vector_common::Error

* use deadpool to manage channel recovery and multiple channels

* Rename AmqpSink

* Update integration tests

* make amqp max_channels configurable; default to 4; added to docs and changelog

* dupe word

* Update 3rd party licenses for deadpool

* Fix formatting in amqp.cue

* Update DEVELOPING.md
---
 Cargo.lock                                    | 17 +++-
 Cargo.toml                                    |  3 +-
 LICENSE-3rdparty.csv                          |  2 +
 .../22971_reconnect_broken_amqp_sink.fix.md   |  3 +
 docs/DEVELOPING.md                            |  4 +-
 src/sinks/amqp/channel.rs                     | 86 +++++++++++++++++++
 src/sinks/amqp/config.rs                      | 20 ++++-
 src/sinks/amqp/integration_tests.rs           |  7 +-
 src/sinks/amqp/mod.rs                         |  5 +-
 src/sinks/amqp/service.rs                     | 26 ++++--
 src/sinks/amqp/sink.rs                        | 23 ++---
 .../reference/components/sinks/base/amqp.cue  |  5 ++
 12 files changed, 163 insertions(+), 38 deletions(-)
 create mode 100644 changelog.d/22971_reconnect_broken_amqp_sink.fix.md
 create mode 100644 src/sinks/amqp/channel.rs

diff --git a/Cargo.lock b/Cargo.lock
index 9698a0f4e00fb..0b1e6d2fd327e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2975,11 +2975,25 @@ dependencies = [
  "tokio",
 ]
 
+[[package]]
+name = "deadpool"
+version = "0.12.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5ed5957ff93768adf7a65ab167a17835c3d2c3c50d084fe305174c112f468e2f"
+dependencies = [
+ "deadpool-runtime",
+ "num_cpus",
+ "tokio",
+]
+
 [[package]]
 name = "deadpool-runtime"
 version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "63dfa964fe2a66f3fde91fc70b267fe193d822c7e603e2a675a49a7f46ad3f49"
+dependencies = [
+ "tokio",
+]
 
 [[package]]
 name = "der"
@@ -11475,6 +11489,7 @@ dependencies = [
  "crossterm 0.29.0",
  "csv",
  "databend-client",
+ "deadpool 0.12.2",
  "derivative",
  "dirs-next",
  "dnsmsg-parser",
@@ -12771,7 +12786,7 @@ dependencies = [
  "assert-json-diff",
  "async-trait",
  "base64 0.22.1",
- "deadpool",
+ "deadpool 0.10.0",
  "futures 0.3.31",
  "http 1.1.0",
  "http-body-util",
diff --git a/Cargo.toml b/Cargo.toml
index e705a9f37d613..089f436bcc8f2 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -290,6 +290,7 @@ smpl_jwt = { version = "0.8.0", default-features = false, optional = true }
 
 # AMQP
 lapin = { version = "2.5.3", default-features = false, features = ["native-tls"], optional = true }
+deadpool = { version = "0.12.2", default-features = false, features = ["managed", "rt_tokio_1"], optional = true }
 
 # API
 async-graphql = { version = "7.0.17", default-features = false, optional = true, features = ["chrono", "playground"] }
@@ -784,7 +785,7 @@ sinks-metrics = [
   "sinks-splunk_hec"
 ]
 
-sinks-amqp = ["lapin"]
+sinks-amqp = ["deadpool", "lapin"]
 sinks-appsignal = []
 sinks-aws_cloudwatch_logs = ["aws-core", "dep:aws-sdk-cloudwatchlogs", "dep:aws-sdk-kms"]
 sinks-aws_cloudwatch_metrics = ["aws-core", "dep:aws-sdk-cloudwatch"]
diff --git a/LICENSE-3rdparty.csv b/LICENSE-3rdparty.csv
index e107729c35ddc..aaaaac24bed82 100644
--- a/LICENSE-3rdparty.csv
+++ b/LICENSE-3rdparty.csv
@@ -180,6 +180,7 @@ data-encoding,https://github.com/ia0/data-encoding,MIT,Julien Cretin <git@ia0.eu
 data-url,https://github.com/servo/rust-url,MIT OR Apache-2.0,Simon Sapin <simon.sapin@exyr.org>
 databend-client,https://github.com/databendlabs/bendsql,Apache-2.0,Databend Authors <opensource@databend.com>
 dbl,https://github.com/RustCrypto/utils,MIT OR Apache-2.0,RustCrypto Developers
+deadpool,https://github.com/bikeshedder/deadpool,MIT OR Apache-2.0,Michael P. Jung <michael.jung@terreon.de>
 der,https://github.com/RustCrypto/formats/tree/master/der,Apache-2.0 OR MIT,RustCrypto Developers
 deranged,https://github.com/jhpratt/deranged,MIT OR Apache-2.0,Jacob Pratt <jacob@jhpratt.dev>
 derivative,https://github.com/mcarton/rust-derivative,MIT OR Apache-2.0,mcarton <cartonmartin+git@gmail.com>
@@ -423,6 +424,7 @@ num-integer,https://github.com/rust-num/num-integer,MIT OR Apache-2.0,The Rust P
 num-iter,https://github.com/rust-num/num-iter,MIT OR Apache-2.0,The Rust Project Developers
 num-rational,https://github.com/rust-num/num-rational,MIT OR Apache-2.0,The Rust Project Developers
 num-traits,https://github.com/rust-num/num-traits,MIT OR Apache-2.0,The Rust Project Developers
+num_cpus,https://github.com/seanmonstar/num_cpus,MIT OR Apache-2.0,Sean McArthur <sean@seanmonstar.com>
 num_enum,https://github.com/illicitonion/num_enum,BSD-3-Clause OR MIT OR Apache-2.0,"Daniel Wagner-Hall <dawagner@gmail.com>, Daniel Henry-Mantilla <daniel.henry.mantilla@gmail.com>, Vincent Esche <regexident@gmail.com>"
 num_threads,https://github.com/jhpratt/num_threads,MIT OR Apache-2.0,Jacob Pratt <open-source@jhpratt.dev>
 number_prefix,https://github.com/ogham/rust-number-prefix,MIT,Benjamin Sago <ogham@bsago.me>
diff --git a/changelog.d/22971_reconnect_broken_amqp_sink.fix.md b/changelog.d/22971_reconnect_broken_amqp_sink.fix.md
new file mode 100644
index 0000000000000..acd01e4280f13
--- /dev/null
+++ b/changelog.d/22971_reconnect_broken_amqp_sink.fix.md
@@ -0,0 +1,3 @@
+The `amqp` sink now attempts to re-connect to the AMQP broker when the channel has been disconnected. It will also create up to 4 channels in a pool (configurable with the `max_channels` setting) to improve throughput.
+
+authors: aramperes
diff --git a/docs/DEVELOPING.md b/docs/DEVELOPING.md
index 7b9116a2a806b..356f780e54cb6 100644
--- a/docs/DEVELOPING.md
+++ b/docs/DEVELOPING.md
@@ -126,7 +126,7 @@ Loosely, you'll need the following:
 - **To run integration tests:** Have `docker` available, or a real live version of that service. (Use `AUTOSPAWN=false`)
 - **To run `make check-component-features`:** Have `remarshal` installed.
 - **To run `make check-licenses` or `cargo vdev build licenses`:** Have `dd-rust-license-tool` [installed](https://github.com/DataDog/rust-license-tool).
-- **To run `cargo vdev build component-docs`:** Have `cue` [installed](https://cuelang.org/docs/install/).
+- **To run `make generate-component-docs`:** Have `cue` [installed](https://cuelang.org/docs/install/).
 
 If you find yourself needing to run something inside the Docker environment described above, that's totally fine, they won't collide or hurt each other. In this case, you'd just run `make environment-generate`.
 
@@ -161,7 +161,7 @@ cargo bench transforms::example
 make fmt
 cargo fmt
 # Build component documentation for the website
-cargo vdev build component-docs
+make generate-component-docs
 ```
 
 If you run `make` you'll see a full list of all our tasks. Some of these will start Docker containers, sign commits, or even make releases. These are not common development commands and your mileage may vary.
diff --git a/src/sinks/amqp/channel.rs b/src/sinks/amqp/channel.rs
new file mode 100644
index 0000000000000..862ff06e5d0dc
--- /dev/null
+++ b/src/sinks/amqp/channel.rs
@@ -0,0 +1,86 @@
+use super::config::AmqpSinkConfig;
+use super::service::AmqpError;
+use crate::amqp::AmqpConfig;
+use deadpool::managed::Pool;
+use lapin::options::ConfirmSelectOptions;
+
+pub type AmqpSinkChannels = Pool<AmqpSinkChannelManager>;
+
+pub(super) fn new_channel_pool(config: &AmqpSinkConfig) -> crate::Result<AmqpSinkChannels> {
+    let max_channels = config.max_channels.try_into().map_err(|_| {
+        Box::new(AmqpError::PoolError {
+            error: "max_channels must fit into usize".into(),
+        })
+    })?;
+    if max_channels == 0 {
+        return Err(Box::new(AmqpError::PoolError {
+            error: "max_channels must be positive".into(),
+        }));
+    }
+    let channel_manager = AmqpSinkChannelManager::new(&config.connection);
+    let channels = Pool::builder(channel_manager)
+        .max_size(max_channels)
+        .runtime(deadpool::Runtime::Tokio1)
+        .build()?;
+    debug!("AMQP channel pool created with max size: {}", max_channels);
+    Ok(channels)
+}
+
+/// A channel pool manager for the AMQP sink.
+/// This manager is responsible for creating and recycling AMQP channels.
+/// It uses the `deadpool` crate to manage the channels.
+pub(crate) struct AmqpSinkChannelManager {
+    config: AmqpConfig,
+}
+
+impl deadpool::managed::Manager for AmqpSinkChannelManager {
+    type Type = lapin::Channel;
+    type Error = AmqpError;
+
+    async fn create(&self) -> Result<Self::Type, Self::Error> {
+        let channel = Self::new_channel(&self.config).await?;
+        info!(
+            message = "Created a new channel to the AMQP broker.",
+            id = channel.id()
+        );
+        Ok(channel)
+    }
+
+    async fn recycle(
+        &self,
+        channel: &mut Self::Type,
+        _: &deadpool::managed::Metrics,
+    ) -> deadpool::managed::RecycleResult<Self::Error> {
+        let state = channel.status().state();
+        if state == lapin::ChannelState::Connected {
+            Ok(())
+        } else {
+            Err((AmqpError::ChannelClosed { state }).into())
+        }
+    }
+}
+
+impl AmqpSinkChannelManager {
+    /// Creates a new channel pool manager for the AMQP sink.
+    pub fn new(config: &AmqpConfig) -> Self {
+        Self {
+            config: config.clone(),
+        }
+    }
+
+    /// Creates a new AMQP channel using the configuration of this sink.
+    async fn new_channel(config: &AmqpConfig) -> Result<lapin::Channel, AmqpError> {
+        let (_, channel) = config
+            .connect()
+            .await
+            .map_err(|e| AmqpError::ConnectFailed { error: e })?;
+
+        // Enable confirmations on the channel.
+        channel
+            .confirm_select(ConfirmSelectOptions::default())
+            .await
+            .map_err(|e| AmqpError::ConnectFailed { error: Box::new(e) })?;
+
+        Ok(channel)
+    }
+}
diff --git a/src/sinks/amqp/config.rs b/src/sinks/amqp/config.rs
index 50ea63104f836..afca8b47ccae5 100644
--- a/src/sinks/amqp/config.rs
+++ b/src/sinks/amqp/config.rs
@@ -1,7 +1,7 @@
 //! Configuration functionality for the `AMQP` sink.
+use super::channel::AmqpSinkChannels;
 use crate::{amqp::AmqpConfig, sinks::prelude::*};
 use lapin::{types::ShortString, BasicProperties};
-use std::sync::Arc;
 use vector_lib::{
     codecs::TextSerializerConfig,
     internal_event::{error_stage, error_type},
@@ -90,6 +90,14 @@ pub struct AmqpSinkConfig {
         skip_serializing_if = "crate::serde::is_default"
     )]
     pub(crate) acknowledgements: AcknowledgementsConfig,
+
+    /// Maximum number of AMQP channels to keep active (channels are created as needed).
+    #[serde(default = "default_max_channels")]
+    pub(crate) max_channels: u32,
+}
+
+const fn default_max_channels() -> u32 {
+    4
 }
 
 impl Default for AmqpSinkConfig {
@@ -101,6 +109,7 @@ impl Default for AmqpSinkConfig {
             encoding: TextSerializerConfig::default().into(),
             connection: AmqpConfig::default(),
             acknowledgements: AcknowledgementsConfig::default(),
+            max_channels: default_max_channels(),
         }
     }
 }
@@ -111,7 +120,8 @@ impl GenerateConfig for AmqpSinkConfig {
             r#"connection_string = "amqp://localhost:5672/%2f"
             routing_key = "user_id"
             exchange = "test"
-            encoding.codec = "json""#,
+            encoding.codec = "json"
+            max_channels = 4"#,
         )
         .unwrap()
     }
@@ -122,7 +132,7 @@ impl GenerateConfig for AmqpSinkConfig {
 impl SinkConfig for AmqpSinkConfig {
     async fn build(&self, _cx: SinkContext) -> crate::Result<(VectorSink, Healthcheck)> {
         let sink = AmqpSink::new(self.clone()).await?;
-        let hc = healthcheck(Arc::clone(&sink.channel)).boxed();
+        let hc = healthcheck(sink.channels.clone()).boxed();
         Ok((VectorSink::from_event_streamsink(sink), hc))
     }
 
@@ -135,9 +145,11 @@ impl SinkConfig for AmqpSinkConfig {
     }
 }
 
-pub(super) async fn healthcheck(channel: Arc<lapin::Channel>) -> crate::Result<()> {
+pub(super) async fn healthcheck(channels: AmqpSinkChannels) -> crate::Result<()> {
     trace!("Healthcheck started.");
 
+    let channel = channels.get().await?;
+
     if !channel.status().connected() {
         return Err(Box::new(std::io::Error::new(
             std::io::ErrorKind::BrokenPipe,
diff --git a/src/sinks/amqp/integration_tests.rs b/src/sinks/amqp/integration_tests.rs
index e919c5b88e92e..c974dbccb87cc 100644
--- a/src/sinks/amqp/integration_tests.rs
+++ b/src/sinks/amqp/integration_tests.rs
@@ -3,6 +3,7 @@ use crate::{
     amqp::await_connection,
     config::{SinkConfig, SinkContext},
     shutdown::ShutdownSignal,
+    sinks::amqp::channel::new_channel_pool,
     template::{Template, UnsignedIntTemplate},
     test_util::{
         components::{run_and_assert_sink_compliance, SINK_TAGS},
@@ -12,7 +13,7 @@ use crate::{
 };
 use config::AmqpPropertiesConfig;
 use futures::StreamExt;
-use std::{collections::HashSet, sync::Arc, time::Duration};
+use std::{collections::HashSet, time::Duration};
 use vector_lib::{config::LogNamespace, event::LogEvent};
 
 pub fn make_config() -> AmqpSinkConfig {
@@ -37,8 +38,8 @@ async fn healthcheck() {
     let mut config = make_config();
     config.exchange = Template::try_from(exchange.as_str()).unwrap();
     await_connection(&config.connection).await;
-    let (_conn, channel) = config.connection.connect().await.unwrap();
-    super::config::healthcheck(Arc::new(channel)).await.unwrap();
+    let channels = new_channel_pool(&config).unwrap();
+    super::config::healthcheck(channels).await.unwrap();
 }
 
 #[tokio::test]
diff --git a/src/sinks/amqp/mod.rs b/src/sinks/amqp/mod.rs
index 749f892f1ccd2..6b478c4adc10d 100644
--- a/src/sinks/amqp/mod.rs
+++ b/src/sinks/amqp/mod.rs
@@ -1,5 +1,6 @@
 //! `AMQP` sink.
 //! Handles version AMQP 0.9.1 which is used by RabbitMQ.
+mod channel;
 mod config;
 mod encoder;
 mod request_builder;
@@ -15,7 +16,5 @@ use snafu::Snafu;
 #[derive(Debug, Snafu)]
 enum BuildError {
     #[snafu(display("creating amqp producer failed: {}", source))]
-    AmqpCreateFailed {
-        source: Box<dyn std::error::Error + Send + Sync>,
-    },
+    AmqpCreateFailed { source: vector_common::Error },
 }
diff --git a/src/sinks/amqp/service.rs b/src/sinks/amqp/service.rs
index 44c475f208cae..cee7d20344bd7 100644
--- a/src/sinks/amqp/service.rs
+++ b/src/sinks/amqp/service.rs
@@ -5,10 +5,9 @@ use bytes::Bytes;
 use futures::future::BoxFuture;
 use lapin::{options::BasicPublishOptions, BasicProperties};
 use snafu::Snafu;
-use std::{
-    sync::Arc,
-    task::{Context, Poll},
-};
+use std::task::{Context, Poll};
+
+use super::channel::AmqpSinkChannels;
 
 /// The request contains the data to send to `AMQP` together
 /// with the information need to route the message.
@@ -79,11 +78,11 @@ impl DriverResponse for AmqpResponse {
 
 /// The tower service that handles the actual sending of data to `AMQP`.
 pub(super) struct AmqpService {
-    pub(super) channel: Arc<lapin::Channel>,
+    pub(super) channels: AmqpSinkChannels,
 }
 
 #[derive(Debug, Snafu)]
-pub(super) enum AmqpError {
+pub enum AmqpError {
     #[snafu(display("Failed retrieving Acknowledgement: {}", error))]
     AcknowledgementFailed { error: lapin::Error },
 
@@ -92,6 +91,15 @@ pub(super) enum AmqpError {
 
     #[snafu(display("Received Negative Acknowledgement from AMQP broker."))]
     Nack,
+
+    #[snafu(display("Failed to open AMQP channel: {}", error))]
+    ConnectFailed { error: vector_common::Error },
+
+    #[snafu(display("Channel is not writeable: {:?}", state))]
+    ChannelClosed { state: lapin::ChannelState },
+
+    #[snafu(display("Channel pool error: {}", error))]
+    PoolError { error: vector_common::Error },
 }
 
 impl Service<AmqpRequest> for AmqpService {
@@ -106,9 +114,13 @@ impl Service<AmqpRequest> for AmqpService {
     }
 
     fn call(&mut self, req: AmqpRequest) -> Self::Future {
-        let channel = Arc::clone(&self.channel);
+        let channel = self.channels.clone();
 
         Box::pin(async move {
+            let channel = channel.get().await.map_err(|error| AmqpError::PoolError {
+                error: Box::new(error),
+            })?;
+
             let byte_size = req.body.len();
             let fut = channel
                 .basic_publish(
diff --git a/src/sinks/amqp/sink.rs b/src/sinks/amqp/sink.rs
index 1537713be206c..ca40fe46b21e5 100644
--- a/src/sinks/amqp/sink.rs
+++ b/src/sinks/amqp/sink.rs
@@ -1,10 +1,10 @@
 //! The sink for the `AMQP` sink that wires together the main stream that takes the
 //! event and sends it to `AMQP`.
 use crate::sinks::prelude::*;
-use lapin::{options::ConfirmSelectOptions, BasicProperties};
+use lapin::BasicProperties;
 use serde::Serialize;
-use std::sync::Arc;
 
+use super::channel::AmqpSinkChannels;
 use super::{
     config::{AmqpPropertiesConfig, AmqpSinkConfig},
     encoder::AmqpEncoder,
@@ -27,7 +27,7 @@ pub(super) struct AmqpEvent {
 }
 
 pub(super) struct AmqpSink {
-    pub(super) channel: Arc<lapin::Channel>,
+    pub(super) channels: AmqpSinkChannels,
     exchange: Template,
     routing_key: Option<Template>,
     properties: Option<AmqpPropertiesConfig>,
@@ -37,26 +37,15 @@ pub(super) struct AmqpSink {
 
 impl AmqpSink {
     pub(super) async fn new(config: AmqpSinkConfig) -> crate::Result<Self> {
-        let (_, channel) = config
-            .connection
-            .connect()
-            .await
+        let channels = super::channel::new_channel_pool(&config)
             .map_err(|e| BuildError::AmqpCreateFailed { source: e })?;
 
-        // Enable confirmations on the channel.
-        channel
-            .confirm_select(ConfirmSelectOptions::default())
-            .await
-            .map_err(|e| BuildError::AmqpCreateFailed {
-                source: Box::new(e),
-            })?;
-
         let transformer = config.encoding.transformer();
         let serializer = config.encoding.build()?;
         let encoder = crate::codecs::Encoder::<()>::new(serializer);
 
         Ok(AmqpSink {
-            channel: Arc::new(channel),
+            channels,
             exchange: config.exchange,
             routing_key: config.routing_key,
             properties: config.properties,
@@ -115,7 +104,7 @@ impl AmqpSink {
             },
         };
         let service = ServiceBuilder::new().service(AmqpService {
-            channel: Arc::clone(&self.channel),
+            channels: self.channels.clone(),
         });
 
         input
diff --git a/website/cue/reference/components/sinks/base/amqp.cue b/website/cue/reference/components/sinks/base/amqp.cue
index 9b2f6b79d710d..016cfa8404b0b 100644
--- a/website/cue/reference/components/sinks/base/amqp.cue
+++ b/website/cue/reference/components/sinks/base/amqp.cue
@@ -392,6 +392,11 @@ base: components: sinks: amqp: configuration: {
 		required:    true
 		type: string: syntax: "template"
 	}
+	max_channels: {
+		description: "Maximum number of AMQP channels to keep active (channels are created as needed)."
+		required:    false
+		type: uint: default: 4
+	}
 	properties: {
 		description: """
 			Configure the AMQP message properties.

From e6ac12207dbe53c2ebe638d94199175c65fa9f65 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 13 Jun 2025 12:58:12 -0400
Subject: [PATCH 062/305] chore(deps): Bump rustls from 0.20.9 to 0.22.4
 (#21808)

Bumps [rustls](https://github.com/rustls/rustls) from 0.20.9 to 0.22.4.
- [Release notes](https://github.com/rustls/rustls/releases)
- [Changelog](https://github.com/rustls/rustls/blob/main/CHANGELOG.md)
- [Commits](https://github.com/rustls/rustls/compare/v/0.20.9...v/0.22.4)

---
updated-dependencies:
- dependency-name: rustls
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 0b1e6d2fd327e..daf433e18d5d0 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -635,7 +635,7 @@ dependencies = [
  "rand 0.8.5",
  "regex",
  "ring",
- "rustls 0.21.11",
+ "rustls 0.21.12",
  "rustls-native-certs 0.6.3",
  "rustls-pemfile 1.0.4",
  "rustls-webpki 0.101.7",
@@ -1287,7 +1287,7 @@ dependencies = [
  "hyper 0.14.28",
  "hyper-rustls 0.24.2",
  "pin-project-lite",
- "rustls 0.21.11",
+ "rustls 0.21.12",
  "tokio",
  "tracing 0.1.41",
 ]
@@ -4822,7 +4822,7 @@ dependencies = [
  "http 0.2.9",
  "hyper 0.14.28",
  "log",
- "rustls 0.21.11",
+ "rustls 0.21.12",
  "rustls-native-certs 0.6.3",
  "tokio",
  "tokio-rustls 0.24.1",
@@ -6237,7 +6237,7 @@ dependencies = [
  "percent-encoding",
  "rand 0.8.5",
  "rustc_version_runtime",
- "rustls 0.21.11",
+ "rustls 0.21.12",
  "rustls-pemfile 1.0.4",
  "serde",
  "serde_bytes",
@@ -8541,7 +8541,7 @@ dependencies = [
  "once_cell",
  "percent-encoding",
  "pin-project-lite",
- "rustls 0.21.11",
+ "rustls 0.21.12",
  "rustls-pemfile 1.0.4",
  "serde",
  "serde_json",
@@ -8886,9 +8886,9 @@ dependencies = [
 
 [[package]]
 name = "rustls"
-version = "0.21.11"
+version = "0.21.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fecbfb7b1444f477b345853b1fce097a2c6fb637b2bfb87e6bc5db0f043fae4"
+checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e"
 dependencies = [
  "log",
  "ring",
@@ -10525,7 +10525,7 @@ version = "0.24.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081"
 dependencies = [
- "rustls 0.21.11",
+ "rustls 0.21.12",
  "tokio",
 ]
 
@@ -10583,7 +10583,7 @@ checksum = "212d5dcb2a1ce06d81107c3d0ffa3121fe974b73f068c8282cb1c32328113b6c"
 dependencies = [
  "futures-util",
  "log",
- "rustls 0.21.11",
+ "rustls 0.21.12",
  "tokio",
  "tungstenite 0.20.1",
 ]

From 89f73419b94c4ac82e4e9dc9f422e87fa41445d9 Mon Sep 17 00:00:00 2001
From: Scott Strickland <srstrickland@gmail.com>
Date: Fri, 13 Jun 2025 10:33:41 -0700
Subject: [PATCH 063/305] fix(opentelemetry source): Handle NaN in
 opentelemetry source without panic (#23201)

* fix(opentelemetry source): Handle NaN without panic

* Update changelog.d/23199_opentelemetry_source_panic_on_nan_attributes.fix.md

* Update 23199_opentelemetry_source_panic_on_nan_attributes.fix.md

Remove trailing space

---------

Co-authored-by: Pavlos Rontidis <pavlos.rontidis@gmail.com>
---
 ...etry_source_panic_on_nan_attributes.fix.md |  3 ++
 lib/opentelemetry-proto/src/common.rs         | 37 ++++++++++++++++++-
 2 files changed, 39 insertions(+), 1 deletion(-)
 create mode 100644 changelog.d/23199_opentelemetry_source_panic_on_nan_attributes.fix.md

diff --git a/changelog.d/23199_opentelemetry_source_panic_on_nan_attributes.fix.md b/changelog.d/23199_opentelemetry_source_panic_on_nan_attributes.fix.md
new file mode 100644
index 0000000000000..e8dd6a554ac5f
--- /dev/null
+++ b/changelog.d/23199_opentelemetry_source_panic_on_nan_attributes.fix.md
@@ -0,0 +1,3 @@
+Fixed panic in `opentelemetry` source when a `NaN` float value is received. `NaN` values are now converted to `null`.
+
+authors: srstrickland
diff --git a/lib/opentelemetry-proto/src/common.rs b/lib/opentelemetry-proto/src/common.rs
index d3c061a3d7e35..19bfe0883195f 100644
--- a/lib/opentelemetry-proto/src/common.rs
+++ b/lib/opentelemetry-proto/src/common.rs
@@ -10,7 +10,7 @@ impl From<PBValue> for Value {
             PBValue::StringValue(v) => Value::Bytes(Bytes::from(v)),
             PBValue::BoolValue(v) => Value::Boolean(v),
             PBValue::IntValue(v) => Value::Integer(v),
-            PBValue::DoubleValue(v) => Value::Float(NotNan::new(v).unwrap()),
+            PBValue::DoubleValue(v) => NotNan::new(v).map(Value::Float).unwrap_or(Value::Null),
             PBValue::BytesValue(v) => Value::Bytes(Bytes::from(v)),
             PBValue::ArrayValue(arr) => Value::Array(
                 arr.values
@@ -57,3 +57,38 @@ pub fn to_hex(d: &[u8]) -> String {
     }
     hex::encode(d)
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_pb_double_value_nan_handling() {
+        // Test that NaN values are converted to Value::Null instead of panicking
+        let nan_value = PBValue::DoubleValue(f64::NAN);
+        let result = Value::from(nan_value);
+        assert_eq!(result, Value::Null);
+    }
+
+    #[test]
+    fn test_pb_double_value_infinity() {
+        // Test that infinity values work correctly
+        let inf_value = PBValue::DoubleValue(f64::INFINITY);
+        let result = Value::from(inf_value);
+        match result {
+            Value::Float(f) => {
+                assert!(f.into_inner().is_infinite() && f.into_inner().is_sign_positive())
+            }
+            _ => panic!("Expected Float value, got {:?}", result),
+        }
+
+        let neg_inf_value = PBValue::DoubleValue(f64::NEG_INFINITY);
+        let result = Value::from(neg_inf_value);
+        match result {
+            Value::Float(f) => {
+                assert!(f.into_inner().is_infinite() && f.into_inner().is_sign_negative())
+            }
+            _ => panic!("Expected Float value, got {:?}", result),
+        }
+    }
+}

From 521cad69a33ad25016f1acad15492d50186fdd49 Mon Sep 17 00:00:00 2001
From: Tenghuan He <tenghuanhe@gmail.com>
Date: Sat, 14 Jun 2025 03:06:27 +0800
Subject: [PATCH 064/305] docs(website): Fix config extension typo in Windows
 command (from-source.md) (#23166)

Fix config extension typo in Windows command (from-source.md)

Corrects the configuration file extension in the Windows startup command for Vector.
The original command `.\target\release\vector --config config\vector.toml` incorrectly used TOML extension,
while Vector's actual config file is YAML format.
---
 .../content/en/docs/setup/installation/manual/from-source.md    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/website/content/en/docs/setup/installation/manual/from-source.md b/website/content/en/docs/setup/installation/manual/from-source.md
index c1c2b27efae25..4df7017e00fb2 100644
--- a/website/content/en/docs/setup/installation/manual/from-source.md
+++ b/website/content/en/docs/setup/installation/manual/from-source.md
@@ -101,7 +101,7 @@ cargo build --no-default-features --features default-msvc --release
 Start Vector. After these steps, a binary `vector.exe` in `target\release` would be created. It can be started by running:
 
 ```powershell
-.\target\release\vector --config config\vector.toml
+.\target\release\vector --config config\vector.yaml
 ```
 
 ### Docker

From e74575a27e255e7202c2fd05481c23104165bb6a Mon Sep 17 00:00:00 2001
From: Jesse Szwedko <jesse.szwedko@datadoghq.com>
Date: Fri, 13 Jun 2025 12:10:09 -0700
Subject: [PATCH 065/305] fix(elasticsearch sink): Encode bulk action
 parameters as JSON (#21293)

* fix(elasticsearch): Encode bulk action parameters as JSON

They are currently using string templating which, if there are special characters in the value, will
end up creating an invalid JSON payload; an issue that can be difficult to track down. This happened
in https://github.com/vectordotdev/vector/discussions/21288.

Signed-off-by: Jesse Szwedko <jesse.szwedko@datadoghq.com>

* Fix tests

Signed-off-by: Jesse Szwedko <jesse.szwedko@datadoghq.com>

* Use serde_json to check json equality

* Remove unnecessary &

* Unwrap instead of ignoring error

---------

Signed-off-by: Jesse Szwedko <jesse.szwedko@datadoghq.com>
Co-authored-by: Thomas Schneider <thomas.schneider@datadoghq.com>
---
 changelog.d/elasticsearch-encoding.fix.md |   2 +
 src/sinks/elasticsearch/encoder.rs        | 121 +++++++++++++++++-----
 src/sinks/elasticsearch/tests.rs          |  39 ++++---
 3 files changed, 122 insertions(+), 40 deletions(-)
 create mode 100644 changelog.d/elasticsearch-encoding.fix.md

diff --git a/changelog.d/elasticsearch-encoding.fix.md b/changelog.d/elasticsearch-encoding.fix.md
new file mode 100644
index 0000000000000..1c0c12184089c
--- /dev/null
+++ b/changelog.d/elasticsearch-encoding.fix.md
@@ -0,0 +1,2 @@
+The `elasticsearch` sink now encodes parameters such as `index` that contain characters that need to
+be escaped in JSON strings.
diff --git a/src/sinks/elasticsearch/encoder.rs b/src/sinks/elasticsearch/encoder.rs
index 122d38f19ac4c..e4f1ace676181 100644
--- a/src/sinks/elasticsearch/encoder.rs
+++ b/src/sinks/elasticsearch/encoder.rs
@@ -1,6 +1,7 @@
 use std::{io, io::Write};
 
 use serde::Serialize;
+use serde_json::json;
 use vector_lib::buffers::EventCount;
 use vector_lib::{config::telemetry, event::Event, ByteSizeOf, EstimatedJsonEncodedSizeOf};
 use vector_lib::{
@@ -157,48 +158,78 @@ fn write_bulk_action(
             (true, DocumentMetadata::Id(id)) => {
                 write!(
                     writer,
-                    r#"{{"{}":{{"_index":"{}","_id":"{}"}}}}"#,
-                    bulk_action, index, id
+                    "{}",
+                    json!({
+                        bulk_action: {
+                            "_index": index,
+                            "_id": id,
+                        }
+                    }),
                 )
             }
             (false, DocumentMetadata::Id(id)) => {
                 write!(
                     writer,
-                    r#"{{"{}":{{"_index":"{}","_type":"{}","_id":"{}"}}}}"#,
-                    bulk_action, index, doc_type, id
+                    "{}",
+                    json!({
+                        bulk_action: {
+                            "_type": doc_type,
+                            "_index": index,
+                            "_id": id,
+                        }
+                    }),
                 )
             }
             (true, DocumentMetadata::WithoutId) => {
-                write!(writer, r#"{{"{}":{{"_index":"{}"}}}}"#, bulk_action, index)
+                write!(
+                    writer,
+                    "{}",
+                    json!({
+                        bulk_action: {
+                            "_index": index,
+                        }
+                    }),
+                )
             }
             (false, DocumentMetadata::WithoutId) => {
                 write!(
                     writer,
-                    r#"{{"{}":{{"_index":"{}","_type":"{}"}}}}"#,
-                    bulk_action, index, doc_type
+                    "{}",
+                    json!({
+                        bulk_action: {
+                            "_type": doc_type,
+                            "_index": index,
+                        }
+                    }),
                 )
             }
             (true, DocumentMetadata::IdAndVersion(id, version)) => {
                 write!(
                     writer,
-                    r#"{{"{}":{{"_index":"{}","_id":"{}","version_type":"{}","version":{}}}}}"#,
-                    bulk_action,
-                    index,
-                    id,
-                    version.kind.as_str(),
-                    version.value
+                    "{}",
+                    json!({
+                        bulk_action: {
+                            "_id": id,
+                            "_index": index,
+                            "version_type": version.kind.as_str(),
+                            "version": version.value,
+                        }
+                    }),
                 )
             }
             (false, DocumentMetadata::IdAndVersion(id, version)) => {
                 write!(
                     writer,
-                    r#"{{"{}":{{"_index":"{}","_type":"{}","_id":"{}","version_type":"{}","version":{}}}}}"#,
-                    bulk_action,
-                    index,
-                    doc_type,
-                    id,
-                    version.kind.as_str(),
-                    version.value
+                    "{}",
+                    json!({
+                        bulk_action: {
+                            "_id": id,
+                            "_type": doc_type,
+                            "_index": index,
+                            "version_type": version.kind.as_str(),
+                            "version": version.value,
+                        }
+                    }),
                 )
             }
         },
@@ -213,14 +244,15 @@ mod tests {
     fn suppress_type_with_id() {
         let mut writer = Vec::new();
 
-        _ = write_bulk_action(
+        write_bulk_action(
             &mut writer,
             "ACTION",
             "INDEX",
             "TYPE",
             true,
             &DocumentMetadata::Id("ID".to_string()),
-        );
+        )
+        .unwrap();
 
         let value: serde_json::Value = serde_json::from_slice(&writer).unwrap();
         let value = value.as_object().unwrap();
@@ -241,14 +273,15 @@ mod tests {
     fn suppress_type_without_id() {
         let mut writer = Vec::new();
 
-        _ = write_bulk_action(
+        write_bulk_action(
             &mut writer,
             "ACTION",
             "INDEX",
             "TYPE",
             true,
             &DocumentMetadata::WithoutId,
-        );
+        )
+        .unwrap();
 
         let value: serde_json::Value = serde_json::from_slice(&writer).unwrap();
         let value = value.as_object().unwrap();
@@ -268,14 +301,15 @@ mod tests {
     fn type_with_id() {
         let mut writer = Vec::new();
 
-        _ = write_bulk_action(
+        write_bulk_action(
             &mut writer,
             "ACTION",
             "INDEX",
             "TYPE",
             false,
             &DocumentMetadata::Id("ID".to_string()),
-        );
+        )
+        .unwrap();
 
         let value: serde_json::Value = serde_json::from_slice(&writer).unwrap();
         let value = value.as_object().unwrap();
@@ -297,14 +331,15 @@ mod tests {
     fn type_without_id() {
         let mut writer = Vec::new();
 
-        _ = write_bulk_action(
+        write_bulk_action(
             &mut writer,
             "ACTION",
             "INDEX",
             "TYPE",
             false,
             &DocumentMetadata::WithoutId,
-        );
+        )
+        .unwrap();
 
         let value: serde_json::Value = serde_json::from_slice(&writer).unwrap();
         let value = value.as_object().unwrap();
@@ -320,4 +355,34 @@ mod tests {
         assert!(nested.contains_key("_type"));
         assert_eq!(nested.get("_type").unwrap().as_str(), Some("TYPE"));
     }
+
+    #[test]
+    fn encodes_fields_with_newlines() {
+        let mut writer = Vec::new();
+
+        write_bulk_action(
+            &mut writer,
+            "ACTION\n",
+            "INDEX\n",
+            "TYPE\n",
+            false,
+            &DocumentMetadata::Id("ID\n".to_string()),
+        )
+        .unwrap();
+
+        let value: serde_json::Value = serde_json::from_slice(&writer).unwrap();
+        let value = value.as_object().unwrap();
+
+        assert!(value.contains_key("ACTION\n"));
+
+        let nested = value.get("ACTION\n").unwrap();
+        let nested = nested.as_object().unwrap();
+
+        assert!(nested.contains_key("_index"));
+        assert_eq!(nested.get("_index").unwrap().as_str(), Some("INDEX\n"));
+        assert!(nested.contains_key("_id"));
+        assert_eq!(nested.get("_id").unwrap().as_str(), Some("ID\n"));
+        assert!(nested.contains_key("_type"));
+        assert_eq!(nested.get("_type").unwrap().as_str(), Some("TYPE\n"));
+    }
 }
diff --git a/src/sinks/elasticsearch/tests.rs b/src/sinks/elasticsearch/tests.rs
index d09b3195f3e18..9ef28cc7f811b 100644
--- a/src/sinks/elasticsearch/tests.rs
+++ b/src/sinks/elasticsearch/tests.rs
@@ -1,4 +1,4 @@
-use std::convert::TryFrom;
+use std::{convert::TryFrom, iter::zip};
 
 use vector_lib::lookup::PathPrefix;
 
@@ -62,7 +62,7 @@ async fn sets_create_action_when_configured() {
     let expected = r#"{"create":{"_index":"vector","_type":"_doc"}}
 {"action":"crea","message":"hello there","timestamp":"2020-12-01T01:02:03Z"}
 "#;
-    assert_eq!(std::str::from_utf8(&encoded).unwrap(), expected);
+    assert_expected_is_encoded(expected, &encoded);
     assert_eq!(encoded.len(), encoded_size);
 }
 
@@ -127,10 +127,10 @@ async fn encoding_with_external_versioning_with_version_set_includes_version() {
         )
         .unwrap();
 
-    let expected = r#"{"create":{"_index":"vector","_type":"_doc","_id":"42","version_type":"external","version":1337}}
+    let expected = r#"{"create":{"_id":"42","_index":"vector","_type":"_doc","version":1337,"version_type":"external"}}
 {"message":"hello there","my_field":"1337","timestamp":"2020-12-01T01:02:03Z"}
 "#;
-    assert_eq!(std::str::from_utf8(&encoded).unwrap(), expected);
+    assert_expected_is_encoded(expected, &encoded);
     assert_eq!(encoded.len(), encoded_size);
 }
 
@@ -176,10 +176,10 @@ async fn encoding_with_external_gte_versioning_with_version_set_includes_version
         )
         .unwrap();
 
-    let expected = r#"{"create":{"_index":"vector","_type":"_doc","_id":"42","version_type":"external_gte","version":1337}}
+    let expected = r#"{"create":{"_id":"42","_index":"vector","_type":"_doc","version":1337,"version_type":"external_gte"}}
 {"message":"hello there","my_field":"1337","timestamp":"2020-12-01T01:02:03Z"}
 "#;
-    assert_eq!(std::str::from_utf8(&encoded).unwrap(), expected);
+    assert_expected_is_encoded(expected, &encoded);
     assert_eq!(encoded.len(), encoded_size);
 }
 
@@ -205,6 +205,21 @@ fn data_stream_body(
     ds
 }
 
+fn assert_expected_is_encoded(expected: &str, encoded: &[u8]) {
+    let encoded = std::str::from_utf8(encoded).unwrap();
+
+    let expected_lines: Vec<&str> = expected.lines().collect();
+    let encoded_lines: Vec<&str> = encoded.lines().collect();
+
+    assert_eq!(expected_lines.len(), encoded_lines.len());
+
+    let to_value = |s: &str| -> serde_json::Value { serde_json::from_str(s).unwrap() };
+
+    zip(expected_lines, encoded_lines).for_each(|(expected, encoded)| {
+        assert_eq!(to_value(expected), to_value(encoded));
+    });
+}
+
 #[tokio::test]
 async fn encode_datastream_mode() {
     use chrono::{TimeZone, Utc};
@@ -252,7 +267,7 @@ async fn encode_datastream_mode() {
     let expected = r#"{"create":{"_index":"synthetics-testing-default","_type":"_doc"}}
 {"@timestamp":"2020-12-01T01:02:03Z","data_stream":{"dataset":"testing","namespace":"default","type":"synthetics"},"message":"hello there"}
 "#;
-    assert_eq!(std::str::from_utf8(&encoded).unwrap(), expected);
+    assert_expected_is_encoded(expected, &encoded);
     assert_eq!(encoded.len(), encoded_size);
 }
 
@@ -307,7 +322,7 @@ async fn encode_datastream_mode_no_routing() {
     let expected = r#"{"create":{"_index":"logs-generic-something","_type":"_doc"}}
 {"@timestamp":"2020-12-01T01:02:03Z","data_stream":{"dataset":"testing","namespace":"something","type":"synthetics"},"message":"hello there"}
 "#;
-    assert_eq!(std::str::from_utf8(&encoded).unwrap(), expected);
+    assert_expected_is_encoded(expected, &encoded);
     assert_eq!(encoded.len(), encoded_size);
 }
 
@@ -346,7 +361,7 @@ async fn handle_metrics() {
     assert_eq!(encoded_lines.len(), 3); // there's an empty line at the end
     assert_eq!(
         encoded_lines.first().unwrap(),
-        r#"{"create":{"_index":"vector","_type":"_doc"}}"#
+        r#"{"create":{"_type":"_doc","_index":"vector"}}"#
     );
     assert!(encoded_lines
         .get(1)
@@ -459,7 +474,7 @@ async fn encode_datastream_mode_no_sync() {
     let expected = r#"{"create":{"_index":"synthetics-testing-something","_type":"_doc"}}
 {"@timestamp":"2020-12-01T01:02:03Z","data_stream":{"dataset":"testing","type":"synthetics"},"message":"hello there"}
 "#;
-    assert_eq!(std::str::from_utf8(&encoded).unwrap(), expected);
+    assert_expected_is_encoded(expected, &encoded);
     assert_eq!(encoded.len(), encoded_size);
 }
 
@@ -495,7 +510,7 @@ async fn allows_using_except_fields() {
     let expected = r#"{"index":{"_index":"purple","_type":"_doc"}}
 {"foo":"bar","message":"hello there"}
 "#;
-    assert_eq!(std::str::from_utf8(&encoded).unwrap(), expected);
+    assert_expected_is_encoded(expected, &encoded);
     assert_eq!(encoded.len(), encoded_size);
 }
 
@@ -530,7 +545,7 @@ async fn allows_using_only_fields() {
     let expected = r#"{"index":{"_index":"purple","_type":"_doc"}}
 {"foo":"bar"}
 "#;
-    assert_eq!(std::str::from_utf8(&encoded).unwrap(), expected);
+    assert_expected_is_encoded(expected, &encoded);
     assert_eq!(encoded.len(), encoded_size);
 }
 

From ed67c6d6c41ef87b43dee6a80d5f808c8684ae7d Mon Sep 17 00:00:00 2001
From: Raphael Taylor-Davies <1781103+tustvold@users.noreply.github.com>
Date: Mon, 16 Jun 2025 14:52:43 +0100
Subject: [PATCH 066/305] fix(aws_ecs_metrics source): skip over empty ECS
 metrics payloads (#23151)

* fix(aws_ecs_metrics): skip over empty ECS metrics payloads

* chore: add changelog entry

* Update changelog.d/skip_empty_ecs_metrics.fix.md

---------

Co-authored-by: Pavlos Rontidis <pavlos.rontidis@gmail.com>
---
 changelog.d/skip_empty_ecs_metrics.fix.md |  3 +++
 src/sources/aws_ecs_metrics/parser.rs     | 25 +++++++++++++++++++----
 2 files changed, 24 insertions(+), 4 deletions(-)
 create mode 100644 changelog.d/skip_empty_ecs_metrics.fix.md

diff --git a/changelog.d/skip_empty_ecs_metrics.fix.md b/changelog.d/skip_empty_ecs_metrics.fix.md
new file mode 100644
index 0000000000000..9aae13a99a650
--- /dev/null
+++ b/changelog.d/skip_empty_ecs_metrics.fix.md
@@ -0,0 +1,3 @@
+The `aws_ecs_metrics` source now skips over empty ECS metrics payloads. It previously failed to parse such payloads.
+
+authors: tustvold
diff --git a/src/sources/aws_ecs_metrics/parser.rs b/src/sources/aws_ecs_metrics/parser.rs
index f4a066d0b712e..e37decf894bd6 100644
--- a/src/sources/aws_ecs_metrics/parser.rs
+++ b/src/sources/aws_ecs_metrics/parser.rs
@@ -507,14 +507,27 @@ fn network_metrics(
     .collect()
 }
 
+#[derive(Deserialize)]
+#[serde(untagged, deny_unknown_fields)]
+enum StatsPayload {
+    Container(ContainerStats),
+    Empty {},
+    Null,
+}
+
 pub(super) fn parse(
     bytes: &[u8],
     namespace: Option<String>,
 ) -> Result<Vec<Metric>, serde_json::Error> {
     let mut metrics = Vec::new();
-    let parsed = serde_json::from_slice::<BTreeMap<String, ContainerStats>>(bytes)?;
+    let parsed = serde_json::from_slice::<BTreeMap<String, StatsPayload>>(bytes)?;
+
+    for (id, payload) in parsed {
+        let container = match payload {
+            StatsPayload::Container(container) => container,
+            _ => continue,
+        };
 
-    for (id, container) in parsed {
         let mut tags = MetricTags::default();
         tags.replace("container_id".into(), id);
         if let Some(name) = container.name {
@@ -608,7 +621,9 @@ mod test {
                     "io_time_recursive": [],
                     "sectors_recursive": []
                 }
-            }
+            },
+            "123456789": {},
+            "123456789": null
         }"#;
 
         assert_event_data_eq!(
@@ -672,7 +687,9 @@ mod test {
                         "throttled_time": 0
                     }
                 }
-            }
+            },
+            "2344": {},
+            "test": null
         }"#;
 
         assert_event_data_eq!(

From 932bb6797db4766e66714bf18c6529cf99c7366a Mon Sep 17 00:00:00 2001
From: Jakub Onderka <ahoj@jakubonderka.cz>
Date: Mon, 16 Jun 2025 15:53:16 +0200
Subject: [PATCH 067/305] chore(deps): Bump pulsar to 6.3.1 (#22862)

---
 Cargo.lock           | 124 +++++++++++++++++++++++++------------------
 Cargo.toml           |   2 +-
 LICENSE-3rdparty.csv |   3 --
 3 files changed, 74 insertions(+), 55 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index daf433e18d5d0..56ebbd4f578a5 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -407,6 +407,18 @@ dependencies = [
  "futures-core",
 ]
 
+[[package]]
+name = "async-channel"
+version = "2.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a"
+dependencies = [
+ "concurrent-queue",
+ "event-listener-strategy",
+ "futures-core",
+ "pin-project-lite",
+]
+
 [[package]]
 name = "async-compression"
 version = "0.4.24"
@@ -455,7 +467,7 @@ version = "2.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f1b6f5d7df27bd294849f8eec66ecfc63d11814df7a4f5d74168a2394467b776"
 dependencies = [
- "async-channel",
+ "async-channel 1.9.0",
  "async-executor",
  "async-io 1.13.0",
  "async-lock 2.8.0",
@@ -1691,15 +1703,9 @@ version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "08807e080ed7f9d5433fa9b275196cfc35414f66a0c79d864dc51a0d825231a3"
 dependencies = [
- "bit-vec 0.8.0",
+ "bit-vec",
 ]
 
-[[package]]
-name = "bit-vec"
-version = "0.6.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb"
-
 [[package]]
 name = "bit-vec"
 version = "0.8.0"
@@ -1767,7 +1773,7 @@ version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8c36a4d0d48574b3dd360b4b7d95cc651d2b6557b6402848a27d4b228a473e2a"
 dependencies = [
- "async-channel",
+ "async-channel 1.9.0",
  "async-lock 2.8.0",
  "async-task",
  "fastrand 2.3.0",
@@ -2424,8 +2430,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8030735ecb0d128428b64cd379809817e620a40e5001c54465b99ec5feec2857"
 dependencies = [
  "futures-core",
- "prost 0.13.3",
- "prost-types 0.13.3",
+ "prost 0.13.5",
+ "prost-types 0.13.5",
  "tonic 0.12.3",
  "tracing-core 0.1.33",
 ]
@@ -2443,8 +2449,8 @@ dependencies = [
  "hdrhistogram",
  "humantime",
  "hyper-util",
- "prost 0.13.3",
- "prost-types 0.13.3",
+ "prost 0.13.5",
+ "prost-types 0.13.5",
  "serde",
  "serde_json",
  "thread_local",
@@ -4667,7 +4673,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6e9b187a72d63adbfba487f48095306ac823049cb504ee195541e91c7775f5ad"
 dependencies = [
  "anyhow",
- "async-channel",
+ "async-channel 1.9.0",
  "base64 0.13.1",
  "futures-lite 1.13.0",
  "infer",
@@ -5886,19 +5892,18 @@ dependencies = [
 
 [[package]]
 name = "lz4"
-version = "1.24.0"
+version = "1.28.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e9e2dd86df36ce760a60f6ff6ad526f7ba1f14ba0356f8254fb6905e6494df1"
+checksum = "a20b523e860d03443e98350ceaac5e71c6ba89aea7d960769ec3ce37f4de5af4"
 dependencies = [
- "libc",
  "lz4-sys",
 ]
 
 [[package]]
 name = "lz4-sys"
-version = "1.9.4"
+version = "1.11.1+lz4-1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57d27b317e207b10f69f5e75494119e391a96f48861ae870d1da6edac98ca900"
+checksum = "6bd8c0d6c6ed0cd30b3652886bb8711dc4bb01d637a68105a3d5158039b418e6"
 dependencies = [
  "cc",
  "libc",
@@ -6285,11 +6290,10 @@ checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a"
 
 [[package]]
 name = "native-tls"
-version = "0.2.11"
+version = "0.2.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e"
+checksum = "87de3442987e9dbec73158d5c715e7ad9072fda936bb03d19d7fa10e00520f0e"
 dependencies = [
- "lazy_static",
  "libc",
  "log",
  "openssl",
@@ -6891,9 +6895,9 @@ dependencies = [
 
 [[package]]
 name = "openidconnect"
-version = "3.4.0"
+version = "3.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62d6050f6a84b81f23c569f5607ad883293e57491036e318fafe6fc4895fadb1"
+checksum = "f47e80a9cfae4462dd29c41e987edd228971d6565553fbc14b8a11e666d91590"
 dependencies = [
  "base64 0.13.1",
  "chrono",
@@ -7154,11 +7158,11 @@ checksum = "9e9ed2178b0575fff8e1b83b58ba6f75e727aafac2e1b6c795169ad3b17eb518"
 
 [[package]]
 name = "pem"
-version = "3.0.2"
+version = "3.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3163d2912b7c3b52d651a055f2c7eec9ba5cd22d26ef75b8dd3a59980b185923"
+checksum = "38af38e8470ac9dee3ce1bae1af9c1671fffc44ddfd8bd1d0a3445bf349a8ef3"
 dependencies = [
- "base64 0.21.7",
+ "base64 0.22.1",
  "serde",
 ]
 
@@ -7690,7 +7694,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "14cae93065090804185d3b75f0bf93b8eeda30c7a9b4a33d3bdb3988d6229e50"
 dependencies = [
  "bit-set",
- "bit-vec 0.8.0",
+ "bit-vec",
  "bitflags 2.9.0",
  "lazy_static",
  "num-traits",
@@ -7736,12 +7740,12 @@ dependencies = [
 
 [[package]]
 name = "prost"
-version = "0.13.3"
+version = "0.13.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b0487d90e047de87f984913713b85c601c05609aad5b0df4b4573fbf69aa13f"
+checksum = "2796faa41db3ec313a31f7624d9286acf277b52de526150b7e69f3debf891ee5"
 dependencies = [
  "bytes 1.10.1",
- "prost-derive 0.13.3",
+ "prost-derive 0.13.5",
 ]
 
 [[package]]
@@ -7787,6 +7791,26 @@ dependencies = [
  "tempfile",
 ]
 
+[[package]]
+name = "prost-build"
+version = "0.13.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "be769465445e8c1474e9c5dac2018218498557af32d9ed057325ec9a41ae81bf"
+dependencies = [
+ "heck 0.5.0",
+ "itertools 0.14.0",
+ "log",
+ "multimap",
+ "once_cell",
+ "petgraph",
+ "prettyplease 0.2.15",
+ "prost 0.13.5",
+ "prost-types 0.13.5",
+ "regex",
+ "syn 2.0.102",
+ "tempfile",
+]
+
 [[package]]
 name = "prost-derive"
 version = "0.11.9"
@@ -7815,12 +7839,12 @@ dependencies = [
 
 [[package]]
 name = "prost-derive"
-version = "0.13.3"
+version = "0.13.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e9552f850d5f0964a4e4d0bf306459ac29323ddfbae05e35a7c0d35cb0803cc5"
+checksum = "8a56d757972c98b346a9b766e3f02746cde6dd1cd1d1d563472929fdd74bec4d"
 dependencies = [
  "anyhow",
- "itertools 0.13.0",
+ "itertools 0.14.0",
  "proc-macro2 1.0.95",
  "quote 1.0.40",
  "syn 2.0.102",
@@ -7834,8 +7858,8 @@ checksum = "7b5edd582b62f5cde844716e66d92565d7faf7ab1445c8cebce6e00fba83ddb2"
 dependencies = [
  "base64 0.22.1",
  "once_cell",
- "prost 0.13.3",
- "prost-types 0.13.3",
+ "prost 0.13.5",
+ "prost-types 0.13.5",
  "serde",
  "serde-value",
 ]
@@ -7860,11 +7884,11 @@ dependencies = [
 
 [[package]]
 name = "prost-types"
-version = "0.13.3"
+version = "0.13.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4759aa0d3a6232fb8dbdb97b61de2c20047c68aca932c7ed76da9d788508d670"
+checksum = "52c2c1bf36ddb1a1c396b3601a3cec27c2462e45f07c386894ec3ccf5332bd16"
 dependencies = [
- "prost 0.13.3",
+ "prost 0.13.5",
 ]
 
 [[package]]
@@ -7914,20 +7938,18 @@ dependencies = [
 
 [[package]]
 name = "pulsar"
-version = "6.3.0"
+version = "6.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7f3541ff84e39da334979ac4bf171e0f277f4f782603aeae65bf5795dc7275a"
+checksum = "6cee616af00383c461f9ceb0067d15dee68e7d313ae47dbd7f8543236aed7ee9"
 dependencies = [
+ "async-channel 2.3.1",
  "async-trait",
- "bit-vec 0.6.3",
  "bytes 1.10.1",
  "chrono",
  "crc",
  "data-url",
  "flate2",
  "futures 0.3.31",
- "futures-io",
- "futures-timer",
  "log",
  "lz4",
  "native-tls",
@@ -7935,9 +7957,9 @@ dependencies = [
  "oauth2",
  "openidconnect",
  "pem",
- "prost 0.11.9",
- "prost-build 0.11.9",
- "prost-derive 0.11.9",
+ "prost 0.13.5",
+ "prost-build 0.13.5",
+ "prost-derive 0.13.5",
  "rand 0.8.5",
  "regex",
  "serde",
@@ -7948,7 +7970,7 @@ dependencies = [
  "tokio-util",
  "url",
  "uuid",
- "zstd 0.12.4",
+ "zstd 0.13.2",
 ]
 
 [[package]]
@@ -9585,7 +9607,7 @@ version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "13f2b548cd8447f8de0fdf1c592929f70f4fc7039a05e47404b0d096ec6987a1"
 dependencies = [
- "async-channel",
+ "async-channel 1.9.0",
  "async-executor",
  "async-fs",
  "async-io 1.13.0",
@@ -10719,7 +10741,7 @@ dependencies = [
  "hyper-util",
  "percent-encoding",
  "pin-project",
- "prost 0.13.3",
+ "prost 0.13.5",
  "socket2 0.5.10",
  "tokio",
  "tokio-stream",
@@ -12060,7 +12082,7 @@ dependencies = [
  "prettytable-rs",
  "proptest",
  "proptest-derive",
- "prost 0.13.3",
+ "prost 0.13.5",
  "prost-reflect",
  "psl",
  "psl-types",
diff --git a/Cargo.toml b/Cargo.toml
index 089f436bcc8f2..5601fbfcf5993 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -368,7 +368,7 @@ openssl-probe = { version = "0.1.6", default-features = false }
 ordered-float = { version = "4.6.0", default-features = false }
 percent-encoding = { version = "2.3.1", default-features = false }
 postgres-openssl = { version = "0.5.1", default-features = false, features = ["runtime"], optional = true }
-pulsar = { version = "6.3.0", default-features = false, features = ["tokio-runtime", "auth-oauth2", "flate2", "lz4", "snap", "zstd"], optional = true }
+pulsar = { version = "6.3.1", default-features = false, features = ["tokio-runtime", "auth-oauth2", "flate2", "lz4", "snap", "zstd"], optional = true }
 quick-junit = { version = "0.5.1" }
 rand.workspace = true
 rand_distr.workspace = true
diff --git a/LICENSE-3rdparty.csv b/LICENSE-3rdparty.csv
index aaaaac24bed82..ee87492b9319d 100644
--- a/LICENSE-3rdparty.csv
+++ b/LICENSE-3rdparty.csv
@@ -96,7 +96,6 @@ base64-simd,https://github.com/Nugine/simd,MIT,The base64-simd Authors
 base64ct,https://github.com/RustCrypto/formats/tree/master/base64ct,Apache-2.0 OR MIT,RustCrypto Developers
 bit-set,https://github.com/contain-rs/bit-set,Apache-2.0 OR MIT,Alexis Beingessner <a.beingessner@gmail.com>
 bit-vec,https://github.com/contain-rs/bit-vec,Apache-2.0 OR MIT,Alexis Beingessner <a.beingessner@gmail.com>
-bit-vec,https://github.com/contain-rs/bit-vec,MIT OR Apache-2.0,Alexis Beingessner <a.beingessner@gmail.com>
 bitflags,https://github.com/bitflags/bitflags,MIT OR Apache-2.0,The Rust Project Developers
 bitmask-enum,https://github.com/Lukas3674/rust-bitmask-enum,MIT OR Apache-2.0,Lukas3674 <lukashassler@web.de>
 bitvec,https://github.com/bitvecto-rs/bitvec,MIT,The bitvec Authors
@@ -488,9 +487,7 @@ proc-macro-error2,https://github.com/GnomedDev/proc-macro-error-2,MIT OR Apache-
 proc-macro-hack,https://github.com/dtolnay/proc-macro-hack,MIT OR Apache-2.0,David Tolnay <dtolnay@gmail.com>
 proc-macro2,https://github.com/dtolnay/proc-macro2,MIT OR Apache-2.0,"David Tolnay <dtolnay@gmail.com>, Alex Crichton <alex@alexcrichton.com>"
 proptest,https://github.com/proptest-rs/proptest,MIT OR Apache-2.0,Jason Lingle
-prost,https://github.com/tokio-rs/prost,Apache-2.0,"Dan Burkert <dan@danburkert.com>, Lucio Franco <luciofranco14@gmail.com, Tokio Contributors <team@tokio.rs>"
 prost,https://github.com/tokio-rs/prost,Apache-2.0,"Dan Burkert <dan@danburkert.com>, Lucio Franco <luciofranco14@gmail.com>, Casper Meijn <casper@meijn.net>, Tokio Contributors <team@tokio.rs>"
-prost-derive,https://github.com/tokio-rs/prost,Apache-2.0,"Dan Burkert <dan@danburkert.com>, Lucio Franco <luciofranco14@gmail.com>, Tokio Contributors <team@tokio.rs>"
 prost-reflect,https://github.com/andrewhickman/prost-reflect,MIT OR Apache-2.0,Andrew Hickman <andrew.hickman1@sky.com>
 psl,https://github.com/addr-rs/psl,MIT OR Apache-2.0,rushmorem <rushmore@webenchanter.com>
 psl-types,https://github.com/addr-rs/psl-types,MIT OR Apache-2.0,rushmorem <rushmore@webenchanter.com>

From 71be227f29febf1efc82859ef19677f99ec82ac4 Mon Sep 17 00:00:00 2001
From: Pavlos Rontidis <pavlos.rontidis@gmail.com>
Date: Mon, 16 Jun 2025 13:17:53 -0400
Subject: [PATCH 068/305] fix(ci): add missing perms to
 gardener_remove_waiting_author.yml (#23213)

* fix(ci): add missing perms to gardener_remove_waiting_author.yml

* add fail on error

* only run if label exists

* Update .github/workflows/gardener_remove_waiting_author.yml

* Update .github/workflows/gardener_remove_waiting_author.yml

* Update .github/workflows/gardener_remove_waiting_author.yml

* Update .github/workflows/gardener_remove_waiting_author.yml

---------

Co-authored-by: Thomas <thomas.schneider@datadoghq.com>
---
 .github/workflows/gardener_remove_waiting_author.yml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/gardener_remove_waiting_author.yml b/.github/workflows/gardener_remove_waiting_author.yml
index a9e7f52cb3660..130868d4acd23 100644
--- a/.github/workflows/gardener_remove_waiting_author.yml
+++ b/.github/workflows/gardener_remove_waiting_author.yml
@@ -1,11 +1,15 @@
 name: Remove Awaiting Author Label
 
+permissions:
+  pull-requests: write
+
 on:
   pull_request:
-    types: [synchronize, review_requested]
+    types: [synchronize, review_requested, labeled]
 
 jobs:
   remove_label:
+    if: "contains(github.event.pull_request.labels.*.name, 'meta: awaiting author')"
     runs-on: ubuntu-24.04
     timeout-minutes: 5
     steps:
@@ -13,3 +17,4 @@ jobs:
       - uses: actions-ecosystem/action-remove-labels@v1
         with:
           labels: "meta: awaiting author"
+          fail_on_error: true

From f41cae298cd16d3360d0239c39b48ee076e434a9 Mon Sep 17 00:00:00 2001
From: Pavlos Rontidis <pavlos.rontidis@gmail.com>
Date: Mon, 16 Jun 2025 13:34:57 -0400
Subject: [PATCH 069/305] feat(website): render input and output badges for all
 components (#23204)

* feat(website): render input and output badges for all components

* fix badges

* v1 display traces in output data

* remove printfs

* fix badge rendering
---
 website/cue/reference/components.cue          |  20 +-
 .../components/sources/datadog_agent.cue      |   2 +-
 .../components/sources/http_client.cue        |   2 +-
 .../reference/components/transforms/remap.cue |  14 +-
 website/layouts/docs/component.html           |   6 +-
 website/layouts/partials/badge.html           |  20 +-
 website/layouts/partials/data.html            | 173 +++---------------
 .../partials/docs/component-under-hero.html   |  33 +++-
 website/layouts/partials/heading.html         |   9 +-
 website/layouts/partials/logs_output.html     |  85 +++++++++
 website/layouts/partials/telemetry.html       |  49 +++++
 11 files changed, 234 insertions(+), 179 deletions(-)
 create mode 100644 website/layouts/partials/logs_output.html
 create mode 100644 website/layouts/partials/telemetry.html

diff --git a/website/cue/reference/components.cue b/website/cue/reference/components.cue
index 11fbc0a3f34f9..a43b0f61f18e3 100644
--- a/website/cue/reference/components.cue
+++ b/website/cue/reference/components.cue
@@ -446,13 +446,13 @@ components: {
 
 	#LogOutput: [Name=string]: {
 		description: string
-		name:        Name
-		fields:      #Schema
+		name?:       Name
+		fields?:     #Schema
 	}
 
-	#TraceOutput: {
+	#TraceOutput: [Name=string]: {
 		description: string
-		fields:      #Schema
+		fields?:     #Schema
 	}
 
 	#MetricInput: {
@@ -465,12 +465,12 @@ components: {
 	}
 
 	#MetricOutput: [Name=string]: {
-		description:       string
-		relevant_when?:    string
-		tags:              #MetricTags
-		name:              Name
-		type:              #MetricType
-		default_namespace: string
+		description:        string
+		relevant_when?:     string
+		tags?:              #MetricTags
+		name?:              Name
+		type?:              #MetricType
+		default_namespace?: string
 	}
 
 	#OutputData: {
diff --git a/website/cue/reference/components/sources/datadog_agent.cue b/website/cue/reference/components/sources/datadog_agent.cue
index f45e9d0ef856d..9dfb692b09158 100644
--- a/website/cue/reference/components/sources/datadog_agent.cue
+++ b/website/cue/reference/components/sources/datadog_agent.cue
@@ -153,7 +153,7 @@ components: sources: datadog_agent: {
 				tags: _extra_tags
 			}
 		}
-		traces: {
+		traces: trace: {
 			description: "A trace received through an HTTP POST request sent by a Datadog Trace Agent."
 			fields: {
 				spans: {
diff --git a/website/cue/reference/components/sources/http_client.cue b/website/cue/reference/components/sources/http_client.cue
index c7093f47835ef..fa14ba24280d0 100644
--- a/website/cue/reference/components/sources/http_client.cue
+++ b/website/cue/reference/components/sources/http_client.cue
@@ -124,7 +124,7 @@ components: sources: http_client: {
 				tags: _extra_tags
 			}
 		}
-		traces: {
+		traces: trace: {
 			description: "A trace received through an HTTP request."
 			fields: {
 				source_type: {
diff --git a/website/cue/reference/components/transforms/remap.cue b/website/cue/reference/components/transforms/remap.cue
index 42a77e898cf1b..b5564dab0b0a1 100644
--- a/website/cue/reference/components/transforms/remap.cue
+++ b/website/cue/reference/components/transforms/remap.cue
@@ -4,7 +4,7 @@ components: transforms: "remap": {
 	title: "Remap"
 
 	description: """
-		Is the recommended transform for parsing, shaping, and transforming data in Vector. It implements the
+		This is the recommended transform for parsing, shaping, and transforming data in Vector. It implements the
 		[Vector Remap Language](\(urls.vrl_reference)) (VRL), an expression-oriented language designed for processing
 		observability data (logs and metrics) in a safe and performant manner.
 
@@ -49,6 +49,18 @@ components: transforms: "remap": {
 		traces: true
 	}
 
+	output: {
+		logs: event: {
+			description: "The modified input `log` event."
+		}
+		metrics: event: {
+			description: "The modified input `metric` event."
+		}
+		traces: event: {
+			description: "The modified input `trace` event."
+		}
+	}
+
 	examples: [
 		for k, v in remap.examples if v.raises == _|_ {
 			{
diff --git a/website/layouts/docs/component.html b/website/layouts/docs/component.html
index 9f5cdac0a327d..93f3e34d66095 100644
--- a/website/layouts/docs/component.html
+++ b/website/layouts/docs/component.html
@@ -86,9 +86,9 @@ <h1 class="dark:text-gray-50 font-secondary font-extrabold text-4xl lg:text-5xl
           {{ partial "data.html" (dict "component_outputs" . ) }}
           {{ end }}
 
-          {{/* Component log/metric output */}}
+          {{/* Component log/metric/trace output */}}
           {{ with $config.output }}
-          {{ partial "heading.html" (dict "text" "Output Data" "level" 2) }}
+          {{ partial "heading.html" (dict "text" "Output Types" "level" 2) }}
           {{ partial "data.html" (dict "component_output" . ) }}
           {{ end }}
 
@@ -173,4 +173,4 @@ <h1 class="dark:text-gray-50 font-secondary font-extrabold text-4xl lg:text-5xl
 
 {{ define "subfooter" }}
 {{ partial "docs/mobile-nav.html" . }}
-{{ end }}
\ No newline at end of file
+{{ end }}
diff --git a/website/layouts/partials/badge.html b/website/layouts/partials/badge.html
index 248494801c1dc..f17281ac99e3a 100644
--- a/website/layouts/partials/badge.html
+++ b/website/layouts/partials/badge.html
@@ -1,3 +1,5 @@
+<!-- Do not render an empty box if a `word` is missing -->
+{{ if .word }}
 {{ $red := "text-red-700 bg-red-100 dark:text-white dark:bg-red-600" }}
 {{ $blue := "text-blue-800 bg-blue-100 dark:text-blue-100 dark:bg-blue-600" }}
 {{ $yellow := "text-yellow-800 bg-yellow-100 dark:text-black dark:bg-yellow-400" }}
@@ -8,11 +10,13 @@
 {{ $styles := dict "red" $red "blue" $blue "yellow" $yellow "gray" $gray "green" $green "indigo" $indigo "violet" $violet }}
 {{ $color := index $styles .color }}
 {{ with .href }}<a href="{{ . }}">{{ end }}
-<span{{ with .show }} x-show="{{ . }}"{{ end }} class="{{ if .inline }}inline-{{ end }}flex items-center py-1 font-medium{{ if .large }} text-sm px-3{{ else }} text-xs px-2{{ end }} {{ if .rounded }} rounded-full{{ else }} rounded{{ end }} {{ $color }}">
-  {{ if .prefix }}
-  {{ .prefix }}:&nbsp;<span class="font-bold">{{- .word -}}</span>
-  {{ else }}
-  {{ .word }}
-  {{ end }}
-</span>
-{{ if .href }}</a>{{ end }}
\ No newline at end of file
+    <span {{ with .show }} x-show="{{ . }}" {{ end }}
+          class="{{ if .inline }}inline-{{ end }}flex items-center py-1 font-medium{{ if .large }} text-sm px-3{{ else }} text-xs px-2{{ end }} {{ if .rounded }} rounded-full{{ else }} rounded{{ end }} {{ $color }}">
+      {{ if .prefix }}
+      {{ .prefix }}:&nbsp;<span class="font-bold">{{- .word -}}</span>
+      {{ else }}
+      {{ .word }}
+      {{ end }}
+    </span>
+{{ if .href }}</a>{{ end }}
+{{ end }}
diff --git a/website/layouts/partials/data.html b/website/layouts/partials/data.html
index 41268850ad469..3382324e3cb91 100644
--- a/website/layouts/partials/data.html
+++ b/website/layouts/partials/data.html
@@ -232,25 +232,37 @@
   {{/* Source/transform/sink output */}}
   {{ with .component_output }}
   <div class="py-3 px-5">
+
     {{ with .metrics }}
     <span class="flex items-center justify-between">
-      {{ partial "heading.html" (dict "text" "Metrics" "level" 3 "id" "output-metrics" "href" "#output-metrics") }}
+        {{ partial "heading.html" (dict "text" "Metrics" "level" 3 "id" "output-metrics" "href" "#output-metrics") }}
+
+        <a href="/docs/about/under-the-hood/architecture/data-model/metric">
+          {{/* Heroicon: solid/question-mark-circle */}}
+          <svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5" viewBox="0 0 20 20" fill="currentColor">
+            <path fill-rule="evenodd"
+                  d="M18 10a8 8 0 11-16 0 8 8 0 0116 0zm-8-3a1 1 0 00-.867.5 1 1 0 11-1.731-1A3 3 0 0113 8a3.001 3.001 0 01-2 2.83V11a1 1 0 11-2 0v-1a1 1 0 011-1 1 1 0 100-2zm0 8a1 1 0 100-2 1 1 0 000 2z"
+                  clip-rule="evenodd"/>
+          </svg>
+        </a>
+      </span>
 
-      <a href="/docs/about/under-the-hood/architecture/data-model/metric">
-        {{/* Heroicon: solid/question-mark-circle */}}
-        <svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5" viewBox="0 0 20 20" fill="currentColor">
-          <path fill-rule="evenodd"
-            d="M18 10a8 8 0 11-16 0 8 8 0 0116 0zm-8-3a1 1 0 00-.867.5 1 1 0 11-1.731-1A3 3 0 0113 8a3.001 3.001 0 01-2 2.83V11a1 1 0 11-2 0v-1a1 1 0 011-1 1 1 0 100-2zm0 8a1 1 0 100-2 1 1 0 000 2z"
-            clip-rule="evenodd" />
-        </svg>
-      </a>
-    </span>
+    <div class="mt-3 border rounded divide-y dark:border-gray-700 dark:divide-gray-700">
+      {{ template "telemetry" . }}
+    </div>
+    {{ end }}
+
+    {{ with .traces }}
+    <span class="flex items-center justify-between">
+        {{ partial "heading.html" (dict "text" "Traces" "level" 3 "id" "output-traces") }}
+        </span>
 
     <div class="mt-3 border rounded divide-y dark:border-gray-700 dark:divide-gray-700">
       {{ template "telemetry" . }}
     </div>
     {{ end }}
 
+
     {{ with .logs }}
     <span class="flex items-center justify-between">
       {{ partial "heading.html" (dict "text" "Logs" "level" 3 "id" "output-logs" "href" "#output-logs") }}
@@ -265,6 +277,7 @@
       </a>
     </span>
 
+
     <div
       class="mt-3 border-2 rounded-md border-yellow-400 flex flex-col space-y-1.5 py-2 px-3">
       <span>
@@ -382,7 +395,8 @@
   {{/* Source/transform/sink output */}}
   {{ with .component_telemetry }}
   <div class="py-4 px-6">
-    {{ with .metrics }}
+
+  {{ with .metrics }}
     <span class="flex items-center justify-between">
       {{ partial "heading.html" (dict "text" "Metrics" "level" 3 "id" "telemetry-metrics" "href" "#telemetry-metrics")
       }}
@@ -410,6 +424,7 @@
       {{ template "telemetry" . }}
     </div>
     {{ end }}
+
   </div>
   {{ end }}
 
@@ -1712,140 +1727,6 @@ <h3 id="{{ $code }}">
 </div>
 {{ end }}
 
-{{ define "logs_output" }}
-{{ range $k, $v := . }}
-{{ $title := $k | title }}
-{{ $id := printf "%s-log-output" $k }}
-<div class="py-3 px-5">
-  <span class="flex justify-between items-center">
-    <span class="text-lg">
-      {{ partial "heading.html" (dict "text" $title "level" 4 "id" $id) }}
-    </span>
-  </span>
-
-  {{ with $v.description }}
-  <div class="mt-3 prose dark:prose-dark">
-    {{ . | markdownify }}
-  </div>
-  {{ end }}
-
-  {{ with $v.fields }}
-  {{ $id := printf "%s-fields" $k }}
-  <div class="mt-4 font-semibold">
-    {{ partial "heading.html" (dict "text" "Fields" "level" 5 "id" $id) }}
-  </div>
-
-  <div class="mt-2 flex flex-col divide-y dark:divide-gray-700 border rounded dark:border-gray-700">
-
-    {{ range $k, $v := . }}
-    <div class="py-2.5 px-3.5">
-      <span class="flex justify-between items-center">
-        <span class="font-mono font-semibold">
-          {{ $k }}
-        </span>
-
-        <span class="flex space-x-1">
-          {{ if $v.required }}
-          {{ partial "badge.html" (dict "word" "required" "color" "red") }}
-          {{ else }}
-          {{ partial "badge.html" (dict "word" "optional" "color" "blue") }}
-          {{ end }}
-
-          {{ range $k, $v := $v.type }}
-          {{ $isArray := eq $k "array" }}
-          {{ if $isArray }}
-          {{ range $k, $v := $v.items.type }}
-          {{ $name := printf "[%s]" $k }}
-          {{ partial "badge.html" (dict "word" $name "color" "gray") }}
-          {{ end }}
-          {{ else }}
-          {{ partial "badge.html" (dict "word" $k "color" "gray") }}
-
-          {{ with $v.syntax }}
-          {{ partial "badge.html" (dict "word" . "color" "gray") }}
-          {{ end }}
-          {{ end }}
-          {{ end }}
-        </span>
-      </span>
-
-      {{ with $v.description }}
-      <div class="mt-2 prose dark:prose-dark">
-        {{ . | markdownify }}
-      </div>
-      {{ end }}
-
-      {{ range $k, $v := $v.type }}
-      {{ with $v.examples }}
-      <div class="mt-2">
-        <span>
-          Examples
-        </span>
-
-        <div class="mt-1.5 flex flex-col space-y-1 text-sm">
-          {{ range . }}
-          {{ template "code" . }}
-          {{ end }}
-        </div>
-      </div>
-      {{ end }}
-      {{ end }}
-    </div>
-    {{ end }}
-  </div>
-  {{ end }}
-</div>
-{{ end }}
-{{ end }}
-
-{{ define "telemetry" }}
-{{ range $k, $v := . }}
-<div class="py-3 px-5">
-  <span class="flex justify-between items-center">
-    <span class="font-mono font-bold text-dark dark:text-gray-200">
-      {{ partial "heading.html" (dict "text" $k "level" 4) }}
-    </span>
-
-    {{ partial "badge.html" (dict "word" $v.type "color" "gray") }}
-  </span>
-
-  {{ with $v.description }}
-  <div class="my-3 prose dark:prose-dark max-w-none">
-    {{ . | markdownify }}
-  </div>
-  {{ end }}
-
-  {{ with $v.tags }}
-  <div class="mt-3 border rounded dark:border-gray-700">
-    <div class="flex flex-col divide-y dark:divide-gray-700">
-      {{ range $k, $v := . }}
-      <div class="py-2.5 px-4">
-        <span class="flex justify-between items-center">
-          <span class="font-mono font-semibold">
-            {{ $k }}
-          </span>
-
-          <span>
-            {{ if not $v.required }}
-            {{ partial "badge.html" (dict "word" "optional" "color" "blue") }}
-            {{ end }}
-          </span>
-        </span>
-
-        {{ with $v.description }}
-        <div class="prose dark:prose-dark">
-          {{ . | markdownify }}
-        </div>
-        {{ end }}
-      </div>
-      {{ end }}
-    </div>
-  </div>
-  {{ end }}
-</div>
-{{ end }}
-{{ end }}
-
 {{ define "vrl-function-legend" }}
 {{/* Heroicon: outline/map */}}
 <div class="flex items-center space-x-2">
@@ -2244,4 +2125,4 @@ <h3 id="{{ $code }}">
     </div>
   </div>
 </div>
-{{ end }}
\ No newline at end of file
+{{ end }}
diff --git a/website/layouts/partials/docs/component-under-hero.html b/website/layouts/partials/docs/component-under-hero.html
index 2d0f8331747e0..bdf86bbe7c075 100644
--- a/website/layouts/partials/docs/component-under-hero.html
+++ b/website/layouts/partials/docs/component-under-hero.html
@@ -3,9 +3,11 @@
 {{ $config := index (index site.Data.docs.components $type) $tag }}
 {{ $classes := $config.classes }}
 {{ $features := $config.features }}
-{{ $output := $config.output }}
 {{ $alias := $config.alias }}
 
+{{ $input := $config.input }}
+{{ $output := $config.output }}
+
 <div class="block space-y-1">
   {{ if eq $classes.development "beta" }}
   {{ partial "badge.html" (dict "prefix" "status" "word" "beta" "color" "red" "inline" true) }}
@@ -49,23 +51,42 @@
   {{ partial "badge.html" (dict "prefix" "state" "word" "stateful" "color" "indigo" "inline" true) }}
   {{ end }}
 
+  {{ with $alias }}
+  {{ partial "badge.html" (dict "prefix" "previously known as" "word" . "color" "yellow" "inline" true) }}
+  {{ end }}
+</div>
+
+<div class="w-full mt-4">
+  {{ if $input.logs }}
+  {{ partial "badge.html" (dict "prefix" "input" "word" "logs" "color" "blue" "inline" true) }}
+  {{ end }}
+  {{ if $input.metrics }}
+  {{ partial "badge.html" (dict "prefix" "input" "word" "metrics" "color" "blue" "inline" true) }}
+  {{ end }}
+  {{ if $input.traces }}
+  {{ partial "badge.html" (dict "prefix" "input" "word" "traces" "color" "blue" "inline" true) }}
+  {{ end }}
+</div>
+
+<div class="w-full mt-4">
   {{ range $k, $v := $output }}
   {{ if eq $k "logs" }}
-  {{ partial "badge.html" (dict "prefix" "output" "word" "log" "color" "yellow" "inline" true) }}
+  {{ partial "badge.html" (dict "prefix" "output" "word" "logs" "color" "yellow" "inline" true) }}
   {{ end }}
 
   {{ if eq $k "metrics" }}
   {{ partial "badge.html" (dict "prefix" "output" "word" "metrics" "color" "yellow" "inline" true) }}
   {{ end }}
-  {{ end }}
 
-  {{ with $alias }}
-  {{ partial "badge.html" (dict "prefix" "previously known as" "word" . "color" "yellow" "inline" true) }}
+  {{ if eq $k "traces" }}
+  {{ partial "badge.html" (dict "prefix" "output" "word" "traces" "color" "yellow" "inline" true) }}
+  {{ end }}
   {{ end }}
 </div>
 
+
 {{ if .Params.deprecated }}
 <div class="mt-4">
   {{ partial "badge.html" (dict "prefix" "status" "word" "deprecated" "color" "red" "inline" true) }}
 </div>
-{{ end }}
\ No newline at end of file
+{{ end }}
diff --git a/website/layouts/partials/heading.html b/website/layouts/partials/heading.html
index 97c09710d83a9..84f361f360851 100644
--- a/website/layouts/partials/heading.html
+++ b/website/layouts/partials/heading.html
@@ -3,7 +3,10 @@
 {{ $level := .level | default 2 }}
 {{ $iconSizes := dict "1" "7" "2" "6" "3" "5" "4" "4" "5" "3" "6" "3" }}
 {{ $n := index $iconSizes ($level | string) }}
-<h{{ $level }} x-data="{ show: false }" x-on:mouseover="show = true" x-on:mouseleave="show = false" id="{{ $id }}" class="flex items-center text-dark dark:text-gray-200{{ if .bold }} font-bold{{ end }}{{ if .toc_hide }} js-toc-ignore{{ end }}{{ if .mono }} font-mono{{ end }}">
+{{ $icon := or .icon false }}
+<h{{ $level }} x-data="{ show: false }" x-on:mouseover="show = true" x-on:mouseleave="show = false" id="{{ $id }}"
+class="flex items-center text-dark dark:text-gray-200{{ if .bold }} font-bold{{ end }}{{ if .toc_hide }}
+js-toc-ignore{{ end }}{{ if .mono }} font-mono{{ end }}">
   {{ if .href }}
   <a href="{{ .href }}">
     {{ $text }}
@@ -18,11 +21,11 @@
   </span>
   {{ end }}
 
-  {{ if ne .icon false }}
+  {{ if $icon }}
   <a class="ml-2" x-cloak x-show="show" href="#{{ $id }}">
     <svg xmlns="http://www.w3.org/2000/svg" class="text-secondary dark:text-primary h-{{ $n }} w-{{ $n }}" fill="none" viewBox="0 0 24 24" stroke="currentColor">
       <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M7 20l4-16m2 16l4-16M6 9h14M4 15h14" />
     </svg>
   </a>
   {{ end }}
-</h{{ $level }}>
\ No newline at end of file
+</h{{ $level }}>
diff --git a/website/layouts/partials/logs_output.html b/website/layouts/partials/logs_output.html
new file mode 100644
index 0000000000000..88301ef9b5c13
--- /dev/null
+++ b/website/layouts/partials/logs_output.html
@@ -0,0 +1,85 @@
+{{ define "logs_output" }}
+{{ range $k, $v := . }}
+{{ $title := $k | title }}
+{{ $id := printf "%s-log-output" $k }}
+<div class="py-3 px-5">
+  <span class="flex justify-between items-center">
+    <span class="text-lg">
+      {{ partial "heading.html" (dict "text" $title "level" 4 "id" $id) }}
+    </span>
+  </span>
+
+    {{ with $v.description }}
+    <div class="mt-3 prose dark:prose-dark">
+        {{ . | markdownify }}
+    </div>
+    {{ end }}
+
+    {{ with $v.fields }}
+    {{ $id := printf "%s-fields" $k }}
+    <div class="mt-4 font-semibold">
+        {{ partial "heading.html" (dict "text" "Fields" "level" 5 "id" $id) }}
+    </div>
+
+    <div class="mt-2 flex flex-col divide-y dark:divide-gray-700 border rounded dark:border-gray-700">
+
+        {{ range $k, $v := . }}
+        <div class="py-2.5 px-3.5">
+      <span class="flex justify-between items-center">
+        <span class="font-mono font-semibold">
+          {{ $k }}
+        </span>
+
+        <span class="flex space-x-1">
+          {{ if $v.required }}
+          {{ partial "badge.html" (dict "word" "required" "color" "red") }}
+          {{ else }}
+          {{ partial "badge.html" (dict "word" "optional" "color" "blue") }}
+          {{ end }}
+
+          {{ range $k, $v := $v.type }}
+          {{ $isArray := eq $k "array" }}
+          {{ if $isArray }}
+          {{ range $k, $v := $v.items.type }}
+          {{ $name := printf "[%s]" $k }}
+          {{ partial "badge.html" (dict "word" $name "color" "gray") }}
+          {{ end }}
+          {{ else }}
+          {{ partial "badge.html" (dict "word" $k "color" "gray") }}
+
+          {{ with $v.syntax }}
+          {{ partial "badge.html" (dict "word" . "color" "gray") }}
+          {{ end }}
+          {{ end }}
+          {{ end }}
+        </span>
+      </span>
+
+            {{ with $v.description }}
+            <div class="mt-2 prose dark:prose-dark">
+                {{ . | markdownify }}
+            </div>
+            {{ end }}
+
+            {{ range $k, $v := $v.type }}
+            {{ with $v.examples }}
+            <div class="mt-2">
+        <span>
+          Examples
+        </span>
+
+                <div class="mt-1.5 flex flex-col space-y-1 text-sm">
+                    {{ range . }}
+                    {{ template "code" . }}
+                    {{ end }}
+                </div>
+            </div>
+            {{ end }}
+            {{ end }}
+        </div>
+        {{ end }}
+    </div>
+    {{ end }}
+</div>
+{{ end }}
+{{ end }}
diff --git a/website/layouts/partials/telemetry.html b/website/layouts/partials/telemetry.html
new file mode 100644
index 0000000000000..74940d29ecedd
--- /dev/null
+++ b/website/layouts/partials/telemetry.html
@@ -0,0 +1,49 @@
+{{ define "telemetry" }}
+{{ range $k, $v := . }}
+<div class="py-3 px-5">
+  <span class="flex justify-between items-center">
+    <span class="font-mono font-bold text-dark dark:text-gray-200">
+      {{ partial "heading.html" (dict "text" $k "level" 4) }}
+    </span>
+
+    {{ with $v.type }}
+    {{ partial "badge.html" (dict "word" $v.type "color" "gray") }}
+    {{ end }}
+  </span>
+
+    {{ with $v.description }}
+    <div class="my-3 prose dark:prose-dark max-w-none">
+        {{ . | markdownify }}
+    </div>
+    {{ end }}
+
+    {{ with $v.tags }}
+    <div class="mt-3 border rounded dark:border-gray-700">
+        <div class="flex flex-col divide-y dark:divide-gray-700">
+            {{ range $k, $v := . }}
+            <div class="py-2.5 px-4">
+                <span class="flex justify-between items-center">
+                  <span class="font-mono font-semibold">
+                    {{ $k }}
+                  </span>
+
+                  <span>
+                    {{ if not $v.required }}
+                    {{ partial "badge.html" (dict "word" "optional" "color" "blue") }}
+                    {{ end }}
+                  </span>
+                </span>
+
+                {{ with $v.description }}
+                <div class="prose dark:prose-dark">
+                    {{ . | markdownify }}
+                </div>
+                {{ end }}
+            </div>
+            {{ end }}
+        </div>
+    </div>
+    {{ end }}
+</div>
+{{ end }}
+{{ end }}

From 42ab24cc74f0b0a8fb3fa95c0b829ade1d226c78 Mon Sep 17 00:00:00 2001
From: Thomas <thomas.schneider@datadoghq.com>
Date: Mon, 16 Jun 2025 13:37:59 -0400
Subject: [PATCH 070/305] chore(internal): Remove docker_logs.txt and fix
 annotations (#23214)

* Remove random log file

* Remove enableable from expect.txt since it is in allow.txt
---
 .github/actions/spelling/expect.txt | 2 --
 docker_logs.txt                     | 0
 2 files changed, 2 deletions(-)
 delete mode 100644 docker_logs.txt

diff --git a/.github/actions/spelling/expect.txt b/.github/actions/spelling/expect.txt
index 82fea89d4fb57..af010d0a4d5d9 100644
--- a/.github/actions/spelling/expect.txt
+++ b/.github/actions/spelling/expect.txt
@@ -174,8 +174,6 @@ eeyun
 efgh
 Elhage
 emerg
-Enableable
-enableable
 endianess
 endler
 eni
diff --git a/docker_logs.txt b/docker_logs.txt
deleted file mode 100644
index e69de29bb2d1d..0000000000000

From b8fdf424cb7d4bdc1b987c7fc24f37d4683c8b3b Mon Sep 17 00:00:00 2001
From: Pavlos Rontidis <pavlos.rontidis@gmail.com>
Date: Mon, 16 Jun 2025 13:56:13 -0400
Subject: [PATCH 071/305] chore(dev): add Docker gitignore rules (#23215)

---
 .gitignore | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 2a57f31cc6f40..e5ad1eb947787 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,5 +23,20 @@ tilt_modules/
 # Jetbrains
 .idea/
 
-# Ignore generated temporary Docker Compose files
+# Docker build cache
+**/Dockerfile~
+**/Dockerfile.*~
+.dockerignore
+
+# Docker Compose override files
+docker-compose.override.yml
+docker-compose.override.*.yml
 **/compose-temp-*.yaml
+
+# Compose project volume mounts (if stored locally)
+volumes/
+*.volume/
+
+# Environment variable files (can contain secrets)
+.env
+.env.*

From 3ff55b87bc4362a24d9b06b91b5fc8efb1246875 Mon Sep 17 00:00:00 2001
From: Pavlos Rontidis <pavlos.rontidis@gmail.com>
Date: Mon, 16 Jun 2025 14:11:47 -0400
Subject: [PATCH 072/305] docs(external): fix memory enrichment table highlight
 wording (#23216)

* docs(external): fix memory enrichment table highlight wording

* improve wording
---
 .../2025-02-24-memory_enrichment_table.md       | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/website/content/en/highlights/2025-02-24-memory_enrichment_table.md b/website/content/en/highlights/2025-02-24-memory_enrichment_table.md
index e58e461b319dc..0141821f7979d 100644
--- a/website/content/en/highlights/2025-02-24-memory_enrichment_table.md
+++ b/website/content/en/highlights/2025-02-24-memory_enrichment_table.md
@@ -102,21 +102,12 @@ calculation the first time it encounters a key. Subsequently, every time the sam
 the processing step will be skipped since the pre-computed value is present in the table. The values
 can expire; in that case, the computation step will be repeated.
 
-## Use as a sink
+## Populate with other components
 
-This new table type can also be used as a sink to feed it data, which can then be queried
-like any other enrichment table. For example, here is how to introduce this new component as a sink
-if you have another source that can populate the cache:
+This new table type also accepts `inputs`, meaning that sources and/or transforms can populate it with data, similar to how a sink operates.
+The data can then be queried like any other enrichment table. The configuration above demonstrates this behavior.
 
-```yaml
-  memory_table_sink:
-    inputs: [ "another_source_or_transform" ]
-    type: memory_enrichment_table
-    ttl: 60
-    flush_interval: 5
-```
-
-We plan to make this component even more flexible in the future. For example, it can also act as a
+> We plan to make this component even more flexible in the future. For example, it can also act as a
 source. This exercise raises some important questions on component flexibility. The end goal is
 treating components as nodes in a graph, unlocking even greater possibilities, such as chaining
 sinks.

From ae13b3b4d26a82a5f2585362f1b8c5d8368f8d47 Mon Sep 17 00:00:00 2001
From: Matt Simons <mattsimons@ntlworld.com>
Date: Mon, 16 Jun 2025 19:53:04 +0100
Subject: [PATCH 073/305] docs(website): fix opentelemetry typo (#22586)

chore(docs): fix opentelemetry typo

Co-authored-by: Pavlos Rontidis <pavlos.rontidis@gmail.com>
---
 website/cue/reference/components/sinks/opentelemetry.cue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/website/cue/reference/components/sinks/opentelemetry.cue b/website/cue/reference/components/sinks/opentelemetry.cue
index 08abfb9b453e9..eb696c2829d90 100644
--- a/website/cue/reference/components/sinks/opentelemetry.cue
+++ b/website/cue/reference/components/sinks/opentelemetry.cue
@@ -31,7 +31,7 @@ components: sinks: opentelemetry: {
 	}
 
 	support: {
-		requirements: ["This sink excepts events conforming to the [OTEL proto format](\(urls.opentelemetry_proto)). You can use [Remap](\(urls.vector_remap_transform)) to prepare events for ingestion."]
+		requirements: ["This sink accepts events conforming to the [OTEL proto format](\(urls.opentelemetry_proto)). You can use [Remap](\(urls.vector_remap_transform)) to prepare events for ingestion."]
 		warnings: []
 		notices: []
 	}

From e594c7b575030a4c51dc108a412f89a2d91ea259 Mon Sep 17 00:00:00 2001
From: Jakub Onderka <ahoj@jakubonderka.cz>
Date: Mon, 16 Jun 2025 21:34:56 +0200
Subject: [PATCH 074/305] chore(deps): Bump greptimedb (#23210)

---
 Cargo.lock | 29 ++++++++---------------------
 Cargo.toml |  2 +-
 2 files changed, 9 insertions(+), 22 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 56ebbd4f578a5..4c9f0d84abbc3 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2899,19 +2899,6 @@ version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7762d17f1241643615821a8455a0b2c3e803784b058693d990b11f2dce25a0ca"
 
-[[package]]
-name = "dashmap"
-version = "5.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856"
-dependencies = [
- "cfg-if",
- "hashbrown 0.14.5",
- "lock_api",
- "once_cell",
- "parking_lot_core",
-]
-
 [[package]]
 name = "dashmap"
 version = "6.1.0"
@@ -3691,7 +3678,7 @@ dependencies = [
  "chrono",
  "crc",
  "criterion",
- "dashmap 6.1.0",
+ "dashmap",
  "flate2",
  "futures 0.3.31",
  "glob",
@@ -4090,7 +4077,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0746aa765db78b521451ef74221663b57ba595bf83f75d0ce23cc09447c8139f"
 dependencies = [
  "cfg-if",
- "dashmap 6.1.0",
+ "dashmap",
  "futures-sink",
  "futures-timer",
  "futures-util",
@@ -4164,7 +4151,7 @@ dependencies = [
 [[package]]
 name = "greptime-proto"
 version = "0.1.0"
-source = "git+https://github.com/GreptimeTeam/greptime-proto.git?tag=v0.7.0#4bc0d17577dbea47396a064c1ccf229a4c9539fa"
+source = "git+https://github.com/GreptimeTeam/greptime-proto.git?tag=v0.9.0#396206c2801b5a3ec51bfe8984c66b686da910e6"
 dependencies = [
  "prost 0.12.6",
  "serde",
@@ -4178,9 +4165,9 @@ dependencies = [
 [[package]]
 name = "greptimedb-ingester"
 version = "0.1.0"
-source = "git+https://github.com/GreptimeTeam/greptimedb-ingester-rust?rev=2e6b0c5eb6a5e7549c3100e4d356b07d15cce66d#2e6b0c5eb6a5e7549c3100e4d356b07d15cce66d"
+source = "git+https://github.com/GreptimeTeam/greptimedb-ingester-rust?rev=f7243393808640f5123b0d5b7b798da591a4df6e#f7243393808640f5123b0d5b7b798da591a4df6e"
 dependencies = [
- "dashmap 5.5.3",
+ "dashmap",
  "derive_builder",
  "enum_dispatch",
  "futures 0.3.31",
@@ -4188,8 +4175,8 @@ dependencies = [
  "greptime-proto",
  "parking_lot",
  "prost 0.12.6",
- "rand 0.8.5",
- "snafu 0.7.5",
+ "rand 0.9.1",
+ "snafu 0.8.0",
  "tokio",
  "tokio-stream",
  "tonic 0.11.0",
@@ -10952,7 +10939,7 @@ name = "tracing-limit"
 version = "0.1.0"
 dependencies = [
  "criterion",
- "dashmap 6.1.0",
+ "dashmap",
  "mock_instant",
  "tracing 0.1.41",
  "tracing-core 0.1.33",
diff --git a/Cargo.toml b/Cargo.toml
index 5601fbfcf5993..86e12671670dd 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -307,7 +307,7 @@ ratatui = { version = "0.29.0", optional = true, default-features = false, featu
 hex = { version = "0.4.3", default-features = false, optional = true }
 
 # GreptimeDB
-greptimedb-ingester = { git = "https://github.com/GreptimeTeam/greptimedb-ingester-rust", rev = "2e6b0c5eb6a5e7549c3100e4d356b07d15cce66d", optional = true }
+greptimedb-ingester = { git = "https://github.com/GreptimeTeam/greptimedb-ingester-rust", rev = "f7243393808640f5123b0d5b7b798da591a4df6e", optional = true }
 
 # External libs
 arc-swap = { version = "1.7", default-features = false, optional = true }

From fc1146aaaf89d4def75ee43854e7f31a76a290ae Mon Sep 17 00:00:00 2001
From: Pavlos Rontidis <pavlos.rontidis@gmail.com>
Date: Mon, 16 Jun 2025 16:40:03 -0400
Subject: [PATCH 075/305] chore(website): prettier rc formatting of hugo/html
 (#23218)

* chore(website): prettier rc formatting of hugo/html

* increase width to 120
---
 website/.prettierrc.json                  |   17 +
 website/layouts/partials/data.html        | 3502 +++++++++++----------
 website/layouts/partials/logs_output.html |  137 +-
 website/package.json                      |    5 +-
 website/yarn.lock                         |   17 +
 5 files changed, 1889 insertions(+), 1789 deletions(-)
 create mode 100644 website/.prettierrc.json

diff --git a/website/.prettierrc.json b/website/.prettierrc.json
new file mode 100644
index 0000000000000..7b17711cfff7a
--- /dev/null
+++ b/website/.prettierrc.json
@@ -0,0 +1,17 @@
+{
+  "plugins": ["prettier-plugin-go-template"],
+  "overrides": [
+    {
+      "files": ["*.html"],
+      "options": {
+        "parser": "go-template"
+      }
+    }
+  ],
+  "tabWidth": 2,
+  "useTabs": false,
+  "semi": false,
+  "singleQuote": true,
+  "trailingComma": "none",
+  "printWidth": 120
+}
diff --git a/website/layouts/partials/data.html b/website/layouts/partials/data.html
index 3382324e3cb91..5f6f0165cb57f 100644
--- a/website/layouts/partials/data.html
+++ b/website/layouts/partials/data.html
@@ -1,2128 +1,2194 @@
-{{/* This partial is for pretty much all structured data (VRL stuff, CLI, API, component configs/output/telemetry, etc.)
-*/}}
+{{/* This partial is for pretty much all structured data (VRL stuff, CLI, API, component configs/output/telemetry, etc.) */}}
 {{ $ctx := . }}
 <div class="relative no-prose border dark:border-gray-700 rounded-md shadow">
   {{/* Source/transform/sink config */}}
   {{ with .component_config }}
-  <div class="flex flex-col divide-y dark:divide-gray-700">
-    {{ range $k, $v := . }}
-    {{ if ne $k "type" }}
-    {{ $name := $k }}
-    <div class="p-4">
-      <span class="flex justify-between items-center">
-        {{/* Config name */}}
-        <span class="font-mono">
-          {{ partial "heading.html" (dict "text" $name "level" 3 "anchor" true "icon" false) }}
-        </span>
+    <div class="flex flex-col divide-y dark:divide-gray-700">
+      {{ range $k, $v := . }}
+        {{ if ne $k "type" }}
+          {{ $name := $k }}
+          <div class="p-4">
+            <span class="flex justify-between items-center">
+              {{/* Config name */}}
+              <span class="font-mono">
+                {{ partial "heading.html" (dict "text" $name "level" 3 "anchor" true "icon" false) }}
+              </span>
 
-        {{/* Config labels */}}
-        <span class="flex justify-between space-x-1">
-          {{ if $v.common }}
-          {{ partial "badge.html" (dict "word" "common" "color" "blue") }}
-          {{ end }}
+              {{/* Config labels */}}
+              <span class="flex justify-between space-x-1">
+                {{ if $v.common }}
+                  {{ partial "badge.html" (dict "word" "common" "color" "blue") }}
+                {{ end }}
 
-          {{ if $v.required }}
-          {{ partial "badge.html" (dict "word" "required" "color" "red") }}
-          {{ else }}
-          {{ partial "badge.html" (dict "word" "optional" "color" "blue") }}
-          {{ end }}
+                {{ if $v.required }}
+                  {{ partial "badge.html" (dict "word" "required" "color" "red") }}
+                {{ else }}
+                  {{ partial "badge.html" (dict "word" "optional" "color" "blue") }}
+                {{ end }}
 
-          {{ range $k, $v := $v.type }}
-          {{ $isArray := eq $k "array" }}
-          {{ if $isArray }}
-          {{ range $k, $v := $v.items.type }}
-          {{ $name := printf "[%s]" $k }}
-          {{ partial "badge.html" (dict "word" $name "color" "gray") }}
-          {{ end }}
-          {{ else }}
-          {{ partial "badge.html" (dict "word" $k "color" "gray") }}
-          {{ end }}
+                {{ range $k, $v := $v.type }}
+                  {{ $isArray := eq $k "array" }}
+                  {{ if $isArray }}
+                    {{ range $k, $v := $v.items.type }}
+                      {{ $name := printf "[%s]" $k }}
+                      {{ partial "badge.html" (dict "word" $name "color" "gray") }}
+                    {{ end }}
+                  {{ else }}
+                    {{ partial "badge.html" (dict "word" $k "color" "gray") }}
+                  {{ end }}
 
-          {{ with $v.syntax }}
-          {{ if eq . "remap_program" }}
-          {{ partial "badge.html" (dict "word" . "color" "gray" "href" "/docs/reference/vrl#program") }}
-          {{ else if eq . "template" }}
-          {{ partial "badge.html" (dict "word" . "color" "gray" "href" "/docs/reference/configuration/template-syntax/") }}
-          {{ else }}
-          {{ partial "badge.html" (dict "word" . "color" "gray") }}
-          {{ end }}
-          {{ end }}
+                  {{ with $v.syntax }}
+                    {{ if eq . "remap_program" }}
+                      {{ partial "badge.html" (dict "word" . "color" "gray" "href" "/docs/reference/vrl#program") }}
+                    {{ else if eq . "template" }}
+                      {{ partial "badge.html" (dict "word" . "color" "gray" "href" "/docs/reference/configuration/template-syntax/") }}
+                    {{ else }}
+                      {{ partial "badge.html" (dict "word" . "color" "gray") }}
+                    {{ end }}
+                  {{ end }}
 
-          {{ if $v.enum }}
-          {{ partial "badge.html" (dict "word" "enum" "color" "yellow") }}
-          {{ end }}
-          {{ end }}
-        </span>
-      </span>
+                  {{ if $v.enum }}
+                    {{ partial "badge.html" (dict "word" "enum" "color" "yellow") }}
+                  {{ end }}
+                {{ end }}
+              </span>
+            </span>
 
-      {{ if $v.deprecated }}
-      <div class="mt-3 border-2 rounded-md border-yellow-400 flex flex-col space-y-1.5 py-2 px-3">
-        <span>
-          {{ partial "heading.html" (dict "text" "Deprecated" "level" 4 "toc_hide" true) }}
-        </span>
-        <div class="flex space-x-5 items-center">
-          <div class="flex-shrink-0">
-            {{/* Heroicon: outline/exclamation-circle */}}
-            <svg xmlns="http://www.w3.org/2000/svg" class="text-yellow-500 h-5 w-5" fill="none" viewBox="0 0 24 24"
-              stroke="currentColor">
-              <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2"
-                d="M12 8v4m0 4h.01M21 12a9 9 0 11-18 0 9 9 0 0118 0z" />
-            </svg>
-          </div>
+            {{ if $v.deprecated }}
+              <div class="mt-3 border-2 rounded-md border-yellow-400 flex flex-col space-y-1.5 py-2 px-3">
+                <span>
+                  {{ partial "heading.html" (dict "text" "Deprecated" "level" 4 "toc_hide" true) }}
+                </span>
+                <div class="flex space-x-5 items-center">
+                  <div class="flex-shrink-0">
+                    {{/* Heroicon: outline/exclamation-circle */}}
+                    <svg
+                      xmlns="http://www.w3.org/2000/svg"
+                      class="text-yellow-500 h-5 w-5"
+                      fill="none"
+                      viewBox="0 0 24 24"
+                      stroke="currentColor"
+                    >
+                      <path
+                        stroke-linecap="round"
+                        stroke-linejoin="round"
+                        stroke-width="2"
+                        d="M12 8v4m0 4h.01M21 12a9 9 0 11-18 0 9 9 0 0118 0z"
+                      />
+                    </svg>
+                  </div>
 
-          <div class="prose dark:prose-dark max-w-none leading-snug">
-            {{ if $v.deprecated_message }}
-            {{ $v.deprecated_message | markdownify }}
-            {{ else }}
-            This field is deprecated.
+                  <div class="prose dark:prose-dark max-w-none leading-snug">
+                    {{ if $v.deprecated_message }}
+                      {{ $v.deprecated_message | markdownify }}
+                    {{ else }}
+                      This field is deprecated.
+                    {{ end }}
+                  </div>
+                </div>
+              </div>
             {{ end }}
-          </div>
-        </div>
-      </div>
-      {{ end }}
-
-      <div class="mt-6 prose dark:prose-dark max-w-none leading-snug text-gray-600 dark:text-gray-300">
-        {{ $v.description | markdownify }}
-      </div>
-
-      {{ with $v.warnings }}
-      <div class="mt-3 border-2 rounded-md border-yellow-400 flex flex-col space-y-1.5 py-2 px-3">
-        <span>
-          {{ partial "heading.html" (dict "text" "Warning" "level" 4 "toc_hide" true) }}
-        </span>
-
-        {{ range . }}
-        <div class="flex space-x-5 items-center">
-          <div class="flex-shrink-0">
-            {{/* Heroicon: outline/exclamation-circle */}}
-            <svg xmlns="http://www.w3.org/2000/svg" class="text-yellow-500 h-5 w-5" fill="none" viewBox="0 0 24 24"
-              stroke="currentColor">
-              <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2"
-                d="M12 8v4m0 4h.01M21 12a9 9 0 11-18 0 9 9 0 0118 0z" />
-            </svg>
-          </div>
 
-          <div class="prose dark:prose-dark max-w-none leading-snug">
-            {{ . | markdownify }}
-          </div>
-        </div>
-        {{ end }}
-      </div>
-      {{ end }}
 
-      {{ range $k, $v := $v.type }}
-      {{ if eq $k "condition" }}
-      {{ template "config-condition" (dict "name" $name "condition" $v) }}
-      {{ end }}
+            <div class="mt-6 prose dark:prose-dark max-w-none leading-snug text-gray-600 dark:text-gray-300">
+              {{ $v.description | markdownify }}
+            </div>
 
-      {{ if eq $k "object" }} {{/* Object (with sub-configs) */}}
-      <div class="mt-4">
-        {{ template "config-object" (dict "name" $name "config" $v "level" 4) }}
-      </div>
-      {{ else if eq $k "array" }} {{/* Array */}}
-      {{ with $v.items }}
-      <div class="mt-3 border rounded py-2 px-3 dark:border-gray-700">
-        {{ range $k, $v := . }}
-        {{ range $k, $v := . }}
-        <span class="flex justify-between items-center">
-          <span class="font-semibold">
-            Array
-          </span>
+            {{ with $v.warnings }}
+              <div class="mt-3 border-2 rounded-md border-yellow-400 flex flex-col space-y-1.5 py-2 px-3">
+                <span>
+                  {{ partial "heading.html" (dict "text" "Warning" "level" 4 "toc_hide" true) }}
+                </span>
 
-          <span class="flex items-center space-x-1">
-            {{ partial "badge.html" (dict "word" $k "color" "gray") }}
-            {{ if $v.syntax }} 
-            {{ partial "badge.html" (dict "word" $v.syntax "color" "gray") }}
+                {{ range . }}
+                  <div class="flex space-x-5 items-center">
+                    <div class="flex-shrink-0">
+                      {{/* Heroicon: outline/exclamation-circle */}}
+                      <svg
+                        xmlns="http://www.w3.org/2000/svg"
+                        class="text-yellow-500 h-5 w-5"
+                        fill="none"
+                        viewBox="0 0 24 24"
+                        stroke="currentColor"
+                      >
+                        <path
+                          stroke-linecap="round"
+                          stroke-linejoin="round"
+                          stroke-width="2"
+                          d="M12 8v4m0 4h.01M21 12a9 9 0 11-18 0 9 9 0 0118 0z"
+                        />
+                      </svg>
+                    </div>
+
+                    <div class="prose dark:prose-dark max-w-none leading-snug">
+                      {{ . | markdownify }}
+                    </div>
+                  </div>
+                {{ end }}
+              </div>
             {{ end }}
-          </span>
-        </span>
 
-        {{ if eq $k "object" }}
-        <div class="mt-2">
-            {{ template "config-object" (dict "name" $name "config" $v "level" 4) }}
-        </div>
-        {{ end }}
-        
-        {{ with $v.examples }}
-        {{ template "config-array-examples" (dict "examples" .) }}
-        {{ end }}
-        {{ end }}
-        {{ end }}
-      </div>
-      {{ end }}
-      {{ else }} {{/* Non-arrays/objects */}}
-      {{ if eq $v.syntax "template" }}
-      <div class="mt-4 text-sm">
-        <strong>Note</strong>: This parameter supports Vector's
-        <a href="/docs/reference/configuration/template-syntax">template syntax</a>, which enables you to use
-        dynamic per-event values.
-      </div>
-      {{ end }}
+            {{ range $k, $v := $v.type }}
+              {{ if eq $k "condition" }}
+                {{ template "config-condition" (dict "name" $name "condition" $v) }}
+              {{ end }}
 
-      {{ with $v.examples }}
-      {{ template "config-examples" (dict "examples" .) }}
-      {{ end }}
-      {{ end }}
+              {{ if eq $k "object" }}
+                {{/* Object (with sub-configs) */}}
+                <div class="mt-4">
+                  {{ template "config-object" (dict "name" $name "config" $v "level" 4) }}
+                </div>
+              {{ else if eq $k "array" }}
+                {{/* Array */}}
+                {{ with $v.items }}
+                  <div class="mt-3 border rounded py-2 px-3 dark:border-gray-700">
+                    {{ range $k, $v := . }}
+                      {{ range $k, $v := . }}
+                        <span class="flex justify-between items-center">
+                          <span class="font-semibold"> Array </span>
+
+                          <span class="flex items-center space-x-1">
+                            {{ partial "badge.html" (dict "word" $k "color" "gray") }}
+                            {{ if $v.syntax }}
+                              {{ partial "badge.html" (dict "word" $v.syntax "color" "gray") }}
+                            {{ end }}
+                          </span>
+                        </span>
+
+                        {{ if eq $k "object" }}
+                          <div class="mt-2">
+                            {{ template "config-object" (dict "name" $name "config" $v "level" 4) }}
+                          </div>
+                        {{ end }}
+
+                        {{ with $v.examples }}
+                          {{ template "config-array-examples" (dict "examples" .) }}
+                        {{ end }}
+                      {{ end }}
+                    {{ end }}
+                  </div>
+                {{ end }}
+              {{ else }}
+                {{/* Non-arrays/objects */}}
+                {{ if eq $v.syntax "template" }}
+                  <div class="mt-4 text-sm">
+                    <strong>Note</strong>: This parameter supports Vector's
+                    <a href="/docs/reference/configuration/template-syntax">template syntax</a>, which enables you to
+                    use dynamic per-event values.
+                  </div>
+                {{ end }}
 
-      {{/* Enum */}}
-      {{ with $v.enum }}
-      <div class="mt-3 border rounded py-2 px-3 dark:border-gray-700">
-        <span class="flex justify-between items-center">
-          <span class="font-semibold">
-            Enum options
-          </span>
+                {{ with $v.examples }}
+                  {{ template "config-examples" (dict "examples" .) }}
+                {{ end }}
+              {{ end }}
 
-          <span class="flex items-center space-x-1">
-            {{ partial "badge.html" (dict "word" $k "color" "gray") }}
-            {{ partial "badge.html" (dict "word" $v.syntax "color" "gray") }}
-          </span>
-        </span>
+              {{/* Enum */}}
+              {{ with $v.enum }}
+                <div class="mt-3 border rounded py-2 px-3 dark:border-gray-700">
+                  <span class="flex justify-between items-center">
+                    <span class="font-semibold"> Enum options </span>
 
-        <div class="mt-4 prose dark:prose-dark max-w-none">
-          {{ template "enum-options-table" . }}
-        </div>
-      </div>
-      {{ end }}
-      {{ end }}
+                    <span class="flex items-center space-x-1">
+                      {{ partial "badge.html" (dict "word" $k "color" "gray") }}
+                      {{ partial "badge.html" (dict "word" $v.syntax "color" "gray") }}
+                    </span>
+                  </span>
 
-      {{/* Default value */}}
-      {{ range $k, $v := $v.type }}
-      {{ if or $v.default (eq $v.default false) }}
-      <div class="mt-4">
-        {{ template "default" . }}
-      </div>
-      {{ end }}
-      {{ end }}
+                  <div class="mt-4 prose dark:prose-dark max-w-none">
+                    {{ template "enum-options-table" . }}
+                  </div>
+                </div>
+              {{ end }}
+            {{ end }}
 
-      {{/* "Relevant when" conditions */}}
-      {{ with .relevant_when }}
-      <div class="mt-2 text-sm flex justify-end">
-        <span>
-          Relevant when: <code>{{ . }}</code>
-        </span>
-      </div>
+            {{/* Default value */}}
+            {{ range $k, $v := $v.type }}
+              {{ if or $v.default (eq $v.default false) }}
+                <div class="mt-4">
+                  {{ template "default" . }}
+                </div>
+              {{ end }}
+            {{ end }}
+
+            {{/* "Relevant when" conditions */}}
+            {{ with .relevant_when }}
+              <div class="mt-2 text-sm flex justify-end">
+                <span> Relevant when: <code>{{ . }}</code> </span>
+              </div>
+            {{ end }}
+          </div>
+        {{ end }}
       {{ end }}
     </div>
-    {{ end }}
-    {{ end }}
-  </div>
   {{ end }}
 
   {{/* Source/transform/sink requirements */}}
   {{ with .component_requirements }}
-  <div class="py-4 px-6 flex items-center">
-    <div class="mr-8 flex-shrink-0">
-      {{/* Heroicon: outline/exclamation */}}
-      <svg xmlns="http://www.w3.org/2000/svg" class="text-yellow-500 h-6 w-6" fill="none" viewBox="0 0 24 24"
-        stroke="currentColor">
-        <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2"
-          d="M12 9v2m0 4h.01m-6.938 4h13.856c1.54 0 2.502-1.667 1.732-3L13.732 4c-.77-1.333-2.694-1.333-3.464 0L3.34 16c-.77 1.333.192 3 1.732 3z" />
-      </svg>
-    </div>
-    <div class="flex flex-col space-y-4 overflow-x-auto">
-      {{ range . }}
-      <div class="prose dark:prose-dark max-w-none leading-normal">
-        {{ . | markdownify }}
+    <div class="py-4 px-6 flex items-center">
+      <div class="mr-8 flex-shrink-0">
+        {{/* Heroicon: outline/exclamation */}}
+        <svg
+          xmlns="http://www.w3.org/2000/svg"
+          class="text-yellow-500 h-6 w-6"
+          fill="none"
+          viewBox="0 0 24 24"
+          stroke="currentColor"
+        >
+          <path
+            stroke-linecap="round"
+            stroke-linejoin="round"
+            stroke-width="2"
+            d="M12 9v2m0 4h.01m-6.938 4h13.856c1.54 0 2.502-1.667 1.732-3L13.732 4c-.77-1.333-2.694-1.333-3.464 0L3.34 16c-.77 1.333.192 3 1.732 3z"
+          />
+        </svg>
+      </div>
+      <div class="flex flex-col space-y-4 overflow-x-auto">
+        {{ range . }}
+          <div class="prose dark:prose-dark max-w-none leading-normal">
+            {{ . | markdownify }}
+          </div>
+        {{ end }}
       </div>
-      {{ end }}
     </div>
-  </div>
   {{ end }}
 
   {{/* Source/transform/sink output */}}
   {{ with .component_output }}
-  <div class="py-3 px-5">
-
-    {{ with .metrics }}
-    <span class="flex items-center justify-between">
-        {{ partial "heading.html" (dict "text" "Metrics" "level" 3 "id" "output-metrics" "href" "#output-metrics") }}
-
-        <a href="/docs/about/under-the-hood/architecture/data-model/metric">
-          {{/* Heroicon: solid/question-mark-circle */}}
-          <svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5" viewBox="0 0 20 20" fill="currentColor">
-            <path fill-rule="evenodd"
-                  d="M18 10a8 8 0 11-16 0 8 8 0 0116 0zm-8-3a1 1 0 00-.867.5 1 1 0 11-1.731-1A3 3 0 0113 8a3.001 3.001 0 01-2 2.83V11a1 1 0 11-2 0v-1a1 1 0 011-1 1 1 0 100-2zm0 8a1 1 0 100-2 1 1 0 000 2z"
-                  clip-rule="evenodd"/>
-          </svg>
-        </a>
-      </span>
+    <div class="py-3 px-5">
+      {{ with .metrics }}
+        <span class="flex items-center justify-between">
+          {{ partial "heading.html" (dict "text" "Metrics" "level" 3 "id" "output-metrics" "href" "#output-metrics") }}
+
+
+          <a href="/docs/about/under-the-hood/architecture/data-model/metric">
+            {{/* Heroicon: solid/question-mark-circle */}}
+            <svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5" viewBox="0 0 20 20" fill="currentColor">
+              <path
+                fill-rule="evenodd"
+                d="M18 10a8 8 0 11-16 0 8 8 0 0116 0zm-8-3a1 1 0 00-.867.5 1 1 0 11-1.731-1A3 3 0 0113 8a3.001 3.001 0 01-2 2.83V11a1 1 0 11-2 0v-1a1 1 0 011-1 1 1 0 100-2zm0 8a1 1 0 100-2 1 1 0 000 2z"
+                clip-rule="evenodd"
+              />
+            </svg>
+          </a>
+        </span>
 
-    <div class="mt-3 border rounded divide-y dark:border-gray-700 dark:divide-gray-700">
-      {{ template "telemetry" . }}
-    </div>
-    {{ end }}
+        <div class="mt-3 border rounded divide-y dark:border-gray-700 dark:divide-gray-700">
+          {{ template "telemetry" . }}
+        </div>
+      {{ end }}
 
-    {{ with .traces }}
-    <span class="flex items-center justify-between">
-        {{ partial "heading.html" (dict "text" "Traces" "level" 3 "id" "output-traces") }}
+      {{ with .traces }}
+        <span class="flex items-center justify-between">
+          {{ partial "heading.html" (dict "text" "Traces" "level" 3 "id" "output-traces") }}
         </span>
 
-    <div class="mt-3 border rounded divide-y dark:border-gray-700 dark:divide-gray-700">
-      {{ template "telemetry" . }}
-    </div>
-    {{ end }}
-
+        <div class="mt-3 border rounded divide-y dark:border-gray-700 dark:divide-gray-700">
+          {{ template "telemetry" . }}
+        </div>
+      {{ end }}
 
-    {{ with .logs }}
-    <span class="flex items-center justify-between">
-      {{ partial "heading.html" (dict "text" "Logs" "level" 3 "id" "output-logs" "href" "#output-logs") }}
+      {{ with .logs }}
+        <span class="flex items-center justify-between">
+          {{ partial "heading.html" (dict "text" "Logs" "level" 3 "id" "output-logs" "href" "#output-logs") }}
 
-      <a href="/docs/about/under-the-hood/architecture/data-model/log">
-        {{/* Heroicon: solid/question-mark-circle */}}
-        <svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5" viewBox="0 0 20 20" fill="currentColor">
-          <path fill-rule="evenodd"
-            d="M18 10a8 8 0 11-16 0 8 8 0 0116 0zm-8-3a1 1 0 00-.867.5 1 1 0 11-1.731-1A3 3 0 0113 8a3.001 3.001 0 01-2 2.83V11a1 1 0 11-2 0v-1a1 1 0 011-1 1 1 0 100-2zm0 8a1 1 0 100-2 1 1 0 000 2z"
-            clip-rule="evenodd" />
-        </svg>
-      </a>
-    </span>
 
+          <a href="/docs/about/under-the-hood/architecture/data-model/log">
+            {{/* Heroicon: solid/question-mark-circle */}}
+            <svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5" viewBox="0 0 20 20" fill="currentColor">
+              <path
+                fill-rule="evenodd"
+                d="M18 10a8 8 0 11-16 0 8 8 0 0116 0zm-8-3a1 1 0 00-.867.5 1 1 0 11-1.731-1A3 3 0 0113 8a3.001 3.001 0 01-2 2.83V11a1 1 0 11-2 0v-1a1 1 0 011-1 1 1 0 100-2zm0 8a1 1 0 100-2 1 1 0 000 2z"
+                clip-rule="evenodd"
+              />
+            </svg>
+          </a>
+        </span>
 
-    <div
-      class="mt-3 border-2 rounded-md border-yellow-400 flex flex-col space-y-1.5 py-2 px-3">
-      <span>
-        <h4
-          x-data="{ show: false }" x-on:mouseover="show = true" x-on:mouseleave="show = false"
-          id="warning" class="flex items-center text-dark dark:text-gray-200 js-toc-ignore">
-          <span>Warning</span>
-          <a class="ml-2" x-show="show" href="#warning" style="display: none;"><svg
-            xmlns="http://www.w3.org/2000/svg" class="text-secondary dark:text-primary h-4 w-4"
-            fill="none"
-            viewBox="0 0 24 24" stroke="currentColor">
-                <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2"
-                      d="M7 20l4-16m2 16l4-16M6 9h14M4 15h14"></path>
+        <div class="mt-3 border-2 rounded-md border-yellow-400 flex flex-col space-y-1.5 py-2 px-3">
+          <span>
+            <h4
+              x-data="{ show: false }"
+              x-on:mouseover="show = true"
+              x-on:mouseleave="show = false"
+              id="warning"
+              class="flex items-center text-dark dark:text-gray-200 js-toc-ignore"
+            >
+              <span>Warning</span>
+              <a class="ml-2" x-show="show" href="#warning" style="display: none;"
+                ><svg
+                  xmlns="http://www.w3.org/2000/svg"
+                  class="text-secondary dark:text-primary h-4 w-4"
+                  fill="none"
+                  viewBox="0 0 24 24"
+                  stroke="currentColor"
+                >
+                  <path
+                    stroke-linecap="round"
+                    stroke-linejoin="round"
+                    stroke-width="2"
+                    d="M7 20l4-16m2 16l4-16M6 9h14M4 15h14"
+                  ></path>
+                </svg>
+              </a>
+            </h4>
+          </span>
+          <div class="flex space-x-5 items-center">
+            <div class="flex-shrink-0">
+              <svg
+                xmlns="http://www.w3.org/2000/svg"
+                class="text-yellow-500 h-5 w-5"
+                fill="none"
+                viewBox="0 0 24 24"
+                stroke="currentColor"
+              >
+                <path
+                  stroke-linecap="round"
+                  stroke-linejoin="round"
+                  stroke-width="2"
+                  d="M12 8v4m0 4h.01M21 12a9 9 0 11-18 0 9 9 0 0118 0z"
+                ></path>
               </svg>
-          </a>
-        </h4>
-      </span>
-      <div class="flex space-x-5 items-center">
-        <div class="flex-shrink-0">
-          <svg xmlns="http://www.w3.org/2000/svg" class="text-yellow-500 h-5 w-5" fill="none"
-               viewBox="0 0 24 24" stroke="currentColor">
-            <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2"
-                  d="M12 8v4m0 4h.01M21 12a9 9 0 11-18 0 9 9 0 0118 0z"></path>
-          </svg>
-        </div>
-        <div class="prose dark:prose-dark max-w-none leading-snug">The fields shown below will be
-          different if log namespacing is enabled.
-          See <a href="/blog/log-namespacing/">Log Namespacing</a> for
-          more details
+            </div>
+            <div class="prose dark:prose-dark max-w-none leading-snug">
+              The fields shown below will be different if log namespacing is enabled. See
+              <a href="/blog/log-namespacing/">Log Namespacing</a> for more details
+            </div>
+          </div>
         </div>
-      </div>
-    </div>
 
-    <div class="mt-3 border rounded divide-y dark:border-gray-700 dark:divide-gray-700">
-      {{ template "logs_output" . }}
+        <div class="mt-3 border rounded divide-y dark:border-gray-700 dark:divide-gray-700">
+          {{ template "logs_output" . }}
+        </div>
+      {{ end }}
     </div>
-    {{ end }}
-  </div>
   {{ end }}
 
   {{/* Source/transform outputs */}}
   {{ with .component_outputs }}
     <div class="flex flex-col divide-y dark:divide-gray-700">
       {{ range . }}
-      <div class="py-3 px-5">
-        <span class="flex justify-between items-center">
-          <span class="font-mono">
-            {{ partial "heading.html" (dict "text" .name "level" 3 "anchor" true "icon" false) }}
+        <div class="py-3 px-5">
+          <span class="flex justify-between items-center">
+            <span class="font-mono">
+              {{ partial "heading.html" (dict "text" .name "level" 3 "anchor" true "icon" false) }}
+            </span>
           </span>
-        </span>
 
-        <div class="my-3 prose dark:prose-dark max-w-none">
-          {{ .description | markdownify }}
+          <div class="my-3 prose dark:prose-dark max-w-none">
+            {{ .description | markdownify }}
+          </div>
         </div>
-      </div>
       {{ end }}
-      </div>
+    </div>
   {{ end }}
 
   {{/* Source/transform/sink examples */}}
   {{ with .component_examples }}
-  {{ $formats := slice "yaml"  "toml" "json" }}
-  {{ $defaultFormat := index $formats 0 }}
-  <div class="no-prose flex flex-col divide-y dark:divide-gray-700">
-    {{ range . }}
-    {{ $configs := .configuration }}
-    {{ $id := printf "examples-%s" .title | urlize }}
-    <div class="py-3 px-5 flex flex-col space-y-2">
-      <span>
-        {{ partial "heading.html" (dict "text" .title "level" 3 "id" $id) }}
-      </span>
-
-      <span>
-        Given this event...
-      </span>
+    {{ $formats := slice "yaml"  "toml" "json" }}
+    {{ $defaultFormat := index $formats 0 }}
+    <div class="no-prose flex flex-col divide-y dark:divide-gray-700">
+      {{ range . }}
+        {{ $configs := .configuration }}
+        {{ $id := printf "examples-%s" .title | urlize }}
+        <div class="py-3 px-5 flex flex-col space-y-2">
+          <span>
+            {{ partial "heading.html" (dict "text" .title "level" 3 "id" $id) }}
+          </span>
 
-      <div>
-        {{ template "code" .input }}
-      </div>
+          <span> Given this event... </span>
 
-      <span>
-        ...and this configuration...
-      </span>
+          <div>
+            {{ template "code" .input }}
+          </div>
 
-      <div class="py-2.5 px-3.5 border rounded dark:border-gray-700">
-        <div class="flex space-x-2">
-          {{ range $formats }}
-          <button @click="$store.global.setFormat('{{ . }}')"
-            :class="{ 'text-secondary dark:text-primary': $store.global.isFormat('{{ . }}') }" class="font-semibold">
-            {{ . | upper }}
-          </button>
-          {{ end }}
-        </div>
+          <span> ...and this configuration... </span>
+
+          <div class="py-2.5 px-3.5 border rounded dark:border-gray-700">
+            <div class="flex space-x-2">
+              {{ range $formats }}
+                <button
+                  @click="$store.global.setFormat('{{ . }}')"
+                  :class="{ 'text-secondary dark:text-primary': $store.global.isFormat('{{ . }}') }"
+                  class="font-semibold"
+                >
+                  {{ . | upper }}
+                </button>
+              {{ end }}
+            </div>
 
-        {{ range $formats }}
-        {{ $config := index $configs . }}
-        <div x-show="$store.global.isFormat('{{ . }}')" class="mt-2">
-          {{ highlight $config . "" }}
-        </div>
-        {{ end }}
-      </div>
+            {{ range $formats }}
+              {{ $config := index $configs . }}
+              <div x-show="$store.global.isFormat('{{ . }}')" class="mt-2">
+                {{ highlight $config . "" }}
+              </div>
+            {{ end }}
+          </div>
 
-      <span>
-        ...this Vector event is produced:
-      </span>
+          <span> ...this Vector event is produced: </span>
 
-      <div>
-        {{ template "code" .output }}
-      </div>
+          <div>
+            {{ template "code" .output }}
+          </div>
+        </div>
+      {{ end }}
     </div>
-    {{ end}}
-  </div>
   {{ end }}
 
   {{/* Source/transform/sink output */}}
   {{ with .component_telemetry }}
-  <div class="py-4 px-6">
+    <div class="py-4 px-6">
+      {{ with .metrics }}
+        <span class="flex items-center justify-between">
+          {{ partial "heading.html" (dict "text" "Metrics" "level" 3 "id" "telemetry-metrics" "href" "#telemetry-metrics") }}
 
-  {{ with .metrics }}
-    <span class="flex items-center justify-between">
-      {{ partial "heading.html" (dict "text" "Metrics" "level" 3 "id" "telemetry-metrics" "href" "#telemetry-metrics")
-      }}
 
-      <a href="/docs/about/under-the-hood/architecture/data-model/metric">
-        link
-      </a>
-    </span>
+          <a href="/docs/about/under-the-hood/architecture/data-model/metric"> link </a>
+        </span>
 
-    <div class="mt-3 border rounded divide-y dark:border-gray-700 dark:divide-gray-700">
-      {{ template "telemetry" . }}
-    </div>
-    {{ end }}
+        <div class="mt-3 border rounded divide-y dark:border-gray-700 dark:divide-gray-700">
+          {{ template "telemetry" . }}
+        </div>
+      {{ end }}
 
-    {{ with .logs }}
-    <span class="flex items-center justify-between">
-      {{ partial "heading.html" (dict "text" "Logs" "id" "telemetry-logs" "href" "#telemetry-logs") }}
+      {{ with .logs }}
+        <span class="flex items-center justify-between">
+          {{ partial "heading.html" (dict "text" "Logs" "id" "telemetry-logs" "href" "#telemetry-logs") }}
 
-      <a href="/docs/about/under-the-hood/architecture/data-model/log">
-        link
-      </a>
-    </span>
 
-    <div class="mt-3 border rounded divide-y dark:border-gray-700 dark:divide-gray-700">
-      {{ template "telemetry" . }}
-    </div>
-    {{ end }}
+          <a href="/docs/about/under-the-hood/architecture/data-model/log"> link </a>
+        </span>
 
-  </div>
+        <div class="mt-3 border rounded divide-y dark:border-gray-700 dark:divide-gray-700">
+          {{ template "telemetry" . }}
+        </div>
+      {{ end }}
+
+    </div>
   {{ end }}
 
   {{/* Source/transform/sink warnings */}}
   {{ with .component_warnings }}
-  <div class="no-prose py-4 px-6 flex items-center">
-    <div class="mr-8 flex-shrink-0">
-      <svg xmlns="http://www.w3.org/2000/svg" class="text-red-400 h-7 w-7" fill="none" viewBox="0 0 24 24"
-        stroke="currentColor">
-        <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2"
-          d="M12 9v2m0 4h.01m-6.938 4h13.856c1.54 0 2.502-1.667 1.732-3L13.732 4c-.77-1.333-2.694-1.333-3.464 0L3.34 16c-.77 1.333.192 3 1.732 3z" />
-      </svg>
-    </div>
-    <div class="flex flex-col space-y-4 overflow-x-auto">
-      {{ range . }}
-      <div class="prose dark:prose-dark max-w-none leading-normal">
-        {{ . | markdownify }}
+    <div class="no-prose py-4 px-6 flex items-center">
+      <div class="mr-8 flex-shrink-0">
+        <svg
+          xmlns="http://www.w3.org/2000/svg"
+          class="text-red-400 h-7 w-7"
+          fill="none"
+          viewBox="0 0 24 24"
+          stroke="currentColor"
+        >
+          <path
+            stroke-linecap="round"
+            stroke-linejoin="round"
+            stroke-width="2"
+            d="M12 9v2m0 4h.01m-6.938 4h13.856c1.54 0 2.502-1.667 1.732-3L13.732 4c-.77-1.333-2.694-1.333-3.464 0L3.34 16c-.77 1.333.192 3 1.732 3z"
+          />
+        </svg>
+      </div>
+      <div class="flex flex-col space-y-4 overflow-x-auto">
+        {{ range . }}
+          <div class="prose dark:prose-dark max-w-none leading-normal">
+            {{ . | markdownify }}
+          </div>
+        {{ end }}
       </div>
-      {{ end }}
     </div>
-  </div>
   {{ end }}
 
   {{/* Source/transform/sink environment variables */}}
   {{ with .component_env_vars }}
-  <div class="no-prose flex flex-col divide-y dark:divide-gray-700">
-    {{ range $k, $v := . }}
-    <div class="py-4 px-6">
-      <span class="flex justify-between items-center">
-        <span class="font-mono">
-          {{ $href := printf "#%s" $k | urlize }}
-          {{ partial "heading.html" (dict "text" $k "level" 3 "href" $href) }}
-        </span>
+    <div class="no-prose flex flex-col divide-y dark:divide-gray-700">
+      {{ range $k, $v := . }}
+        <div class="py-4 px-6">
+          <span class="flex justify-between items-center">
+            <span class="font-mono">
+              {{ $href := printf "#%s" $k | urlize }}
+              {{ partial "heading.html" (dict "text" $k "level" 3 "href" $href) }}
+            </span>
 
-        <span class="flex space-x-1">
-          {{ if $v.common }}
-          {{ partial "badge.html" (dict "word" "common" "color" "blue") }}
-          {{ end }}
+            <span class="flex space-x-1">
+              {{ if $v.common }}
+                {{ partial "badge.html" (dict "word" "common" "color" "blue") }}
+              {{ end }}
 
-          {{ if $v.required }}
-          {{ partial "badge.html" (dict "word" "required" "color" "red") }}
-          {{ else }}
-          {{ partial "badge.html" (dict "word" "optional" "color" "blue") }}
-          {{ end }}
+              {{ if $v.required }}
+                {{ partial "badge.html" (dict "word" "required" "color" "red") }}
+              {{ else }}
+                {{ partial "badge.html" (dict "word" "optional" "color" "blue") }}
+              {{ end }}
 
-          {{ range $k, $v := $v.type }}
-          {{ partial "badge.html" (dict "word" $k "color" "gray") }}
+              {{ range $k, $v := $v.type }}
+                {{ partial "badge.html" (dict "word" $k "color" "gray") }}
 
-          {{ with $v.syntax }}
-          {{ partial "badge.html" (dict "word" . "color" "gray") }}
-          {{ end }}
+                {{ with $v.syntax }}
+                  {{ partial "badge.html" (dict "word" . "color" "gray") }}
+                {{ end }}
 
-          {{ if $v.enum }}
-          {{ partial "badge.html" (dict "word" "enum" "color" "yellow") }}
-          {{ end }}
-          {{ end }}
-        </span>
-      </span>
-
-      <div class="mt-4 prose prose-sm dark:prose-dark max-w-none">
-        {{ $v.description | markdownify }}
-      </div>
+                {{ if $v.enum }}
+                  {{ partial "badge.html" (dict "word" "enum" "color" "yellow") }}
+                {{ end }}
+              {{ end }}
+            </span>
+          </span>
 
-      {{ range $k, $v := $v.type }}
-      {{ with $v.default }}
-      <span class="mt-2 text-sm">
-        Default: <code>{{ . }}</code>
-      </span>
-      {{ end }}
-      {{ end }}
+          <div class="mt-4 prose prose-sm dark:prose-dark max-w-none">
+            {{ $v.description | markdownify }}
+          </div>
 
-      {{ range $k, $v := $v.type }}
-      {{/* Enum */}}
-      {{ with $v.enum }}
-      <div class="mt-3 border rounded py-2 px-3 dark:border-gray-700">
-        <span class="flex justify-between items-center">
-          <span class="font-semibold">
-            Enum options
-          </span>
+          {{ range $k, $v := $v.type }}
+            {{ with $v.default }}
+              <span class="mt-2 text-sm"> Default: <code>{{ . }}</code> </span>
+            {{ end }}
+          {{ end }}
 
-          <span class="flex items-center space-x-1">
-            {{ partial "badge.html" (dict "word" $k "color" "gray") }}
-            {{ partial "badge.html" (dict "word" $v.syntax "color" "gray") }}
-          </span>
-        </span>
+          {{ range $k, $v := $v.type }}
+            {{/* Enum */}}
+            {{ with $v.enum }}
+              <div class="mt-3 border rounded py-2 px-3 dark:border-gray-700">
+                <span class="flex justify-between items-center">
+                  <span class="font-semibold"> Enum options </span>
+
+                  <span class="flex items-center space-x-1">
+                    {{ partial "badge.html" (dict "word" $k "color" "gray") }}
+                    {{ partial "badge.html" (dict "word" $v.syntax "color" "gray") }}
+                  </span>
+                </span>
 
-        <div class="mt-4 prose dark:prose-dark max-w-none">
-          {{ template "enum-options-table" . }}
-        </div>
-      </div>
-      {{ end }}
+                <div class="mt-4 prose dark:prose-dark max-w-none">
+                  {{ template "enum-options-table" . }}
+                </div>
+              </div>
+            {{ end }}
 
-      {{ with $v.examples }}
-      <div x-data="{ open: false }" class="mt-3 border rounded py-2 px-3 dark:border-gray-700">
-        <span class="flex justify-between items-center">
-          <span class="font-semibold">
-            Examples
-          </span>
+            {{ with $v.examples }}
+              <div x-data="{ open: false }" class="mt-3 border rounded py-2 px-3 dark:border-gray-700">
+                <span class="flex justify-between items-center">
+                  <span class="font-semibold"> Examples </span>
 
-          {{ template "config-toggler" (dict "size" 4) }}
-        </span>
+                  {{ template "config-toggler" (dict "size" 4) }}
+                </span>
 
-        <div x-show="open">
-          {{ range . }}
-          <div class="overflow-x-scroll">
-            <span class="font-mono text-sm">
-              {{ . }}
-            </span>
-          </div>
+                <div x-show="open">
+                  {{ range . }}
+                    <div class="overflow-x-scroll">
+                      <span class="font-mono text-sm">
+                        {{ . }}
+                      </span>
+                    </div>
+                  {{ end }}
+                </div>
+              </div>
+            {{ end }}
           {{ end }}
         </div>
-      </div>
-      {{ end }}
       {{ end }}
     </div>
-    {{ end }}
-  </div>
   {{ end }}
 
   {{/* Data schemas (logs and metrics) */}}
   {{ with .data_schema }}
-  <div class="flex flex-col divide-y dark:divide-gray-700">
-    <div class="prose dark:prose-dark max-w-none py-4 px-6">
-      {{ .description | markdownify }}
-    </div>
-
-    {{/* Options */}}
-    <div class="py-4 px-6">
-      <span>
-        {{ partial "heading.html" (dict "text" "Options" "level" 3) }}
-      </span>
-
-      <div class="mt-4 border rounded flex flex-col divide-y dark:divide-gray-700 dark:border-gray-700">
-        {{ range $k, $v := .type.object.options }}
-        {{ $name := $k }}
-        {{ $id := cond (eq $name "*") "star" $name }}
-        <div class="py-4 px-6">
-          <span class="flex items-center justify-between">
-            <span>
-              <h3 id="{{ $id }}" class="font-semibold font-mono text-sm dark:text-primary">
-                <a href="#{{ $id }}">
-                  {{ $name }}
-                </a>
-              </h3>
-            </span>
-
-            <span class="flex space-x-1">
-              {{ if $v.common }}
-              {{ partial "badge.html" (dict "word" "common" "color" "indigo") }}
-              {{ end }}
-
-              {{ if $v.required }}
-              {{ partial "badge.html" (dict "word" "required" "color" "red") }}
-              {{ else }}
-              {{ partial "badge.html" (dict "word" "optional" "color" "gray") }}
-              {{ end }}
-
-              {{ range $k, $v := $v.type }}
-              {{ $type := cond (eq $k "object") "table" $k }}
-              {{ partial "badge.html" (dict "word" $type "color" "green") }}
-              {{ end }}
-            </span>
-          </span>
-
-          {{ with $v.description }}
-          <div class="mt-3">
-            {{ . | markdownify }}
-          </div>
-          {{ end }}
+    <div class="flex flex-col divide-y dark:divide-gray-700">
+      <div class="prose dark:prose-dark max-w-none py-4 px-6">
+        {{ .description | markdownify }}
+      </div>
 
-          <div>
-            {{ range $k, $v := $v.type }}
-            {{ if eq $k "object" }}
-            <div class="mt-3">
-              <div class="border rounded flex flex-col divide-y dark:border-gray-700 dark:divide-gray-700">
-                {{ range $k, $v := $v.options }}
-                {{ $id := printf "%s-%s" $name $k }}
-                <div class="py-3 px-5">
-                  <span class="flex justify-between items-center">
-                    <span class="font-mono font-semibold">
-                      <h4 id="{{ $id }}">
-                        <a href="#{{ $id }}">
-                          {{ $k }}
-                        </a>
-                      </h4>
-                    </span>
+      {{/* Options */}}
+      <div class="py-4 px-6">
+        <span>
+          {{ partial "heading.html" (dict "text" "Options" "level" 3) }}
+        </span>
 
-                    <span class="flex space-x-1">
-                      {{ if $v.required }}
-                      {{ partial "badge.html" (dict "word" "required" "color" "red") }}
-                      {{ else }}
-                      {{ partial "badge.html" (dict "word" "optional" "color" "gray") }}
-                      {{ end }}
+        <div class="mt-4 border rounded flex flex-col divide-y dark:divide-gray-700 dark:border-gray-700">
+          {{ range $k, $v := .type.object.options }}
+            {{ $name := $k }}
+            {{ $id := cond (eq $name "*") "star" $name }}
+            <div class="py-4 px-6">
+              <span class="flex items-center justify-between">
+                <span>
+                  <h3 id="{{ $id }}" class="font-semibold font-mono text-sm dark:text-primary">
+                    <a href="#{{ $id }}">
+                      {{ $name }}
+                    </a>
+                  </h3>
+                </span>
 
-                      {{ range $k, $v := $v.type }}
-                      {{ partial "badge.html" (dict "word" $k "color" "green") }}
+                <span class="flex space-x-1">
+                  {{ if $v.common }}
+                    {{ partial "badge.html" (dict "word" "common" "color" "indigo") }}
+                  {{ end }}
 
-                      {{ with $v.syntax }}
-                      {{ partial "badge.html" (dict "word" . "color" "gray") }}
-                      {{ end }}
+                  {{ if $v.required }}
+                    {{ partial "badge.html" (dict "word" "required" "color" "red") }}
+                  {{ else }}
+                    {{ partial "badge.html" (dict "word" "optional" "color" "gray") }}
+                  {{ end }}
 
-                      {{ if $v.enum }}
-                      {{ partial "badge.html" (dict "word" "enum" "color" "yellow") }}
-                      {{ end }}
-                      {{ end }}
-                    </span>
-                  </span>
+                  {{ range $k, $v := $v.type }}
+                    {{ $type := cond (eq $k "object") "table" $k }}
+                    {{ partial "badge.html" (dict "word" $type "color" "green") }}
+                  {{ end }}
+                </span>
+              </span>
 
-                  <div class="prose dark:prose-dark max-w-none">
-                    {{ $v.description | markdownify }}
-                  </div>
+              {{ with $v.description }}
+                <div class="mt-3">
+                  {{ . | markdownify }}
+                </div>
+              {{ end }}
 
-                  {{ range $k, $v := $v.type }}
-                  {{ with $v.examples }}
-                  <div class="mt-2">
-                    <span class="font-semibold">
-                      Examples
-                    </span>
 
-                    <span class="flex space-x-2">
-                      {{ range . }}
-                      <span class="font-mono text-sm text-secondary dark:text-primary">
-                        {{ . }}
-                      </span>
-                      {{ end }}
-                    </span>
-                  </div>
-                  {{ end }}
+              <div>
+                {{ range $k, $v := $v.type }}
+                  {{ if eq $k "object" }}
+                    <div class="mt-3">
+                      <div class="border rounded flex flex-col divide-y dark:border-gray-700 dark:divide-gray-700">
+                        {{ range $k, $v := $v.options }}
+                          {{ $id := printf "%s-%s" $name $k }}
+                          <div class="py-3 px-5">
+                            <span class="flex justify-between items-center">
+                              <span class="font-mono font-semibold">
+                                <h4 id="{{ $id }}">
+                                  <a href="#{{ $id }}">
+                                    {{ $k }}
+                                  </a>
+                                </h4>
+                              </span>
+
+                              <span class="flex space-x-1">
+                                {{ if $v.required }}
+                                  {{ partial "badge.html" (dict "word" "required" "color" "red") }}
+                                {{ else }}
+                                  {{ partial "badge.html" (dict "word" "optional" "color" "gray") }}
+                                {{ end }}
+
+                                {{ range $k, $v := $v.type }}
+                                  {{ partial "badge.html" (dict "word" $k "color" "green") }}
+
+                                  {{ with $v.syntax }}
+                                    {{ partial "badge.html" (dict "word" . "color" "gray") }}
+                                  {{ end }}
+
+                                  {{ if $v.enum }}
+                                    {{ partial "badge.html" (dict "word" "enum" "color" "yellow") }}
+                                  {{ end }}
+                                {{ end }}
+                              </span>
+                            </span>
+
+                            <div class="prose dark:prose-dark max-w-none">
+                              {{ $v.description | markdownify }}
+                            </div>
+
+                            {{ range $k, $v := $v.type }}
+                              {{ with $v.examples }}
+                                <div class="mt-2">
+                                  <span class="font-semibold"> Examples </span>
+
+                                  <span class="flex space-x-2">
+                                    {{ range . }}
+                                      <span class="font-mono text-sm text-secondary dark:text-primary">
+                                        {{ . }}
+                                      </span>
+                                    {{ end }}
+                                  </span>
+                                </div>
+                              {{ end }}
+                            {{ end }}
+                          </div>
+                        {{ end }}
+                      </div>
+                    </div>
                   {{ end }}
-                </div>
                 {{ end }}
               </div>
             </div>
-            {{ end }}
-            {{ end }}
-          </div>
+          {{ end }}
         </div>
-        {{ end }}
       </div>
-    </div>
 
-    {{/* Examples */}}
-    {{ with .type.object.examples }}
-    <div class="py-4 px-6">
-      <span>
-        {{ partial "heading.html" (dict "text" "Examples" "level" 3) }}
-      </span>
+      {{/* Examples */}}
+      {{ with .type.object.examples }}
+        <div class="py-4 px-6">
+          <span>
+            {{ partial "heading.html" (dict "text" "Examples" "level" 3) }}
+          </span>
 
-      <div class="mt-4 flex flex-col divide-y dark:divide-gray-700 dark:border-gray-700">
-        {{ range . }}
-        {{ template "code" . }}
-        {{ end }}
-      </div>
+          <div class="mt-4 flex flex-col divide-y dark:divide-gray-700 dark:border-gray-700">
+            {{ range . }}
+              {{ template "code" . }}
+            {{ end }}
+          </div>
+        </div>
+      {{ end }}
     </div>
-    {{ end }}
-  </div>
   {{ end }}
 
   {{/* VRL function info (/vrl/functions) */}}
   {{ with .vrl_functions }}
-  <div class="flex flex-col divide-y dark:divide-gray-700">
-    {{ range . }}
-    {{ $name := .name }}
-    {{ $func := index site.Data.docs.remap.functions .name }}
-    {{ $infallible := not $func.internal_failure_reasons }}
-    {{ $args := $func.arguments }}
-    {{ $requiredArgs := where $args "required" true }}
-    {{ $optionalArgs := where $args "required" false }}
-    {{ $lastArg := sub (len $args) 1 }}
-    {{ $return := $func.return }}
-    <div class="py-4 px-6">
-      {{/* Function title */}}
-      <span class="flex justify-between items-center">
-        <span class="font-mono">
-          {{ $href := printf "#%s" $name }}
-          {{ partial "heading.html" (dict "text" $name "level" 3 "href" $href "icon" false) }}
-        </span>
-
-        {{/* Badges */}}
-        <span class="flex space-x-1">
-          {{ $href := "/docs/reference/vrl/expressions/#function-call-characteristics" | relURL }}
-          {{ if $infallible }}
-          {{ partial "badge.html" (dict "word" "infallible" "color" "blue" "inline" true "href" $href) }}
-          {{ else }}
-          {{ partial "badge.html" (dict "word" "fallible" "color" "yellow" "inline" true "href" $href) }}
-          {{ end }}
-          {{/* Deprecation Badge */}}
-          {{ if $func.deprecated }}
-          {{ partial "badge.html" (dict "word" "deprecated" "color" "red" "inline" true "href" $href) }}
-          {{ end }}
-          {{/* Pure Badge */}}
-          {{ if $func.pure }}
-          {{ partial "badge.html" (dict "word" "pure" "color" "green" "inline" true "href" $href) }}
-          {{ else }}
-          {{ partial "badge.html" (dict "word" "impure" "color" "yellow" "inline" true "href" $href) }}
-          {{ end }}
-        </span>
-      </span>
-
-      {{/* Function description */}}
-      <div class="mt-6 prose prose-md dark:prose-dark max-w-none">
-        {{ $func.description | markdownify }}
-      </div>
+    <div class="flex flex-col divide-y dark:divide-gray-700">
+      {{ range . }}
+        {{ $name := .name }}
+        {{ $func := index site.Data.docs.remap.functions .name }}
+        {{ $infallible := not $func.internal_failure_reasons }}
+        {{ $args := $func.arguments }}
+        {{ $requiredArgs := where $args "required" true }}
+        {{ $optionalArgs := where $args "required" false }}
+        {{ $lastArg := sub (len $args) 1 }}
+        {{ $return := $func.return }}
+        <div class="py-4 px-6">
+          {{/* Function title */}}
+          <span class="flex justify-between items-center">
+            <span class="font-mono">
+              {{ $href := printf "#%s" $name }}
+              {{ partial "heading.html" (dict "text" $name "level" 3 "href" $href "icon" false) }}
+            </span>
 
-      {{/* Function spec, etc. */}}
-      {{ $id := printf "%s-function-spec" $name }}
-      <div class="mt-6">
-        <span>
-          {{ partial "heading.html" (dict "text" "Function spec" "level" 4 "id" $id "toc_hide" true) }}
-        </span>
+            {{/* Badges */}}
+            <span class="flex space-x-1">
+              {{ $href := "/docs/reference/vrl/expressions/#function-call-characteristics" | relURL }}
+              {{ if $infallible }}
+                {{ partial "badge.html" (dict "word" "infallible" "color" "blue" "inline" true "href" $href) }}
+              {{ else }}
+                {{ partial "badge.html" (dict "word" "fallible" "color" "yellow" "inline" true "href" $href) }}
+              {{ end }}
+              {{/* Deprecation Badge */}}
+              {{ if $func.deprecated }}
+                {{ partial "badge.html" (dict "word" "deprecated" "color" "red" "inline" true "href" $href) }}
+              {{ end }}
+              {{/* Pure Badge */}}
+              {{ if $func.pure }}
+                {{ partial "badge.html" (dict "word" "pure" "color" "green" "inline" true "href" $href) }}
+              {{ else }}
+                {{ partial "badge.html" (dict "word" "impure" "color" "yellow" "inline" true "href" $href) }}
+              {{ end }}
+            </span>
+          </span>
 
-        <div class="my-2 font-mono text-sm bg-dark dark:bg-black px-3.5 py-2.5 rounded text-gray-100">
-          <span class="text-primary-dark dark:text-primary font-semibold">{{ $name }}</span>(
-          {{- $lastArg := sub (len $requiredArgs) 1 -}}
-          {{- range $idx, $arg := $requiredArgs -}}
-          {{ $isLast := eq $idx $lastArg -}}
-          <span class="font-bold text-secondary dark:text-primary">
-            {{- .name -}}
-          </span>:
-          <span class="text-gray-200">
-            &lt;{{ delimit .type `<span class="text-grey-500"> | </span>` | safeHTML}}&gt;
-          </span>{{ if not $isLast }}, {{ end -}}
-          {{ end -}}
-          {{- if gt (len $optionalArgs) 0 -}},
-          [{{- $lastArg := sub (len $optionalArgs) 1 -}}
-          {{- range $idx, $arg := $optionalArgs -}}
-          {{ $isLast := eq $idx $lastArg -}}
-          <span class="text-indigo-500 dark:text-indigo-300">
-            {{- .name -}}
-          </span>:
-          <span class="text-gray-200">
-            &lt;{{ delimit .type `<span class="text-grey-500"> | </span>`  | safeHTML}}&gt;
-          </span>{{ if not $isLast }}, {{ end -}}
-          {{ end -}}]{{ end }})
-          {{- with $return -}}
-          <div class="ml-3">
-            <span class="font-extrabold">::</span> <span class="text-gray-200">
-              &lt;{{ delimit .types " | " }}&gt;
-            </span>{{ if not $infallible }}, &lt;error&gt;{{ end }}
+          {{/* Function description */}}
+          <div class="mt-6 prose prose-md dark:prose-dark max-w-none">
+            {{ $func.description | markdownify }}
           </div>
-          {{- end -}}
-        </div>
-
-        <div class="mt-3 flex flex-row-reverse">
-          {{ template "vrl-function-legend" }}
-        </div>
 
-        {{/* Function arguments */}}
-        {{ with $args }}
-        <div class="mt-6 prose dark:prose-dark max-w-none">
-          {{ template "vrl-function-args" . }}
-        </div>
-        {{ end }}
-
-        {{/* Function notices */}}
-        {{ with $func.notices }}
-        {{ $id := printf "%s-notices" $name }}
-        <div class="mt-6">
-          <span>
-            {{ partial "heading.html" (dict "text" "Notices" "level" 4 "id" $id "toc_hide" true) }}
-          </span>
+          {{/* Function spec, etc. */}}
+          {{ $id := printf "%s-function-spec" $name }}
+          <div class="mt-6">
+            <span>
+              {{ partial "heading.html" (dict "text" "Function spec" "level" 4 "id" $id "toc_hide" true) }}
+            </span>
 
-          <span class="mt-2 text-sm prose prose-md dark:prose-dark max-w-none">
-            This function has special behavior that you should be aware of.
-          </span>
+            <div class="my-2 font-mono text-sm bg-dark dark:bg-black px-3.5 py-2.5 rounded text-gray-100">
+              <span class="text-primary-dark dark:text-primary font-semibold">{{ $name }}</span>(
+              {{- $lastArg := sub (len $requiredArgs) 1 -}}
+              {{- range $idx, $arg := $requiredArgs -}}
+                {{ $isLast := eq $idx $lastArg -}}
+                <span class="font-bold text-secondary dark:text-primary"> {{- .name -}} </span>:
+                <span class="text-gray-200">
+                  &lt;{{ delimit .type `<span class="text-grey-500"> | </span>` | safeHTML }}&gt; </span
+                >{{ if not $isLast }},{{ end -}}
+              {{ end -}}
+              {{- if gt (len $optionalArgs) 0 -}}
+                ,
+                [{{- $lastArg := sub (len $optionalArgs) 1 -}}
+                {{- range $idx, $arg := $optionalArgs -}}
+                  {{ $isLast := eq $idx $lastArg -}}
+                  <span class="text-indigo-500 dark:text-indigo-300"> {{- .name -}} </span>:
+                  <span class="text-gray-200">
+                    &lt;{{ delimit .type `<span class="text-grey-500"> | </span>`  | safeHTML }}&gt; </span
+                  >{{ if not $isLast }},{{ end -}}
+                {{ end -}}]
+              {{ end }})
+              {{- with $return -}}
+                <div class="ml-3">
+                  <span class="font-extrabold">::</span>
+                  <span class="text-gray-200"> &lt;{{ delimit .types " | " }}&gt; </span>{{ if not $infallible }}
+                    , &lt;error&gt;
+                  {{ end }}
+                </div>
+              {{- end -}}
+            </div>
 
-          <div class="mt-1.5 flex flex-col space-y-2">
-            {{ range . }}
-            <div class="flex space-x-5 items-center">
-              <div class="flex-shrink-0 py-1">
-                {{/* Heroicon: outline/exclamation-circle */}}
-                <svg xmlns="http://www.w3.org/2000/svg" class="text-yellow-500 h-5 w-5" fill="none" viewBox="0 0 24 24"
-                  stroke="currentColor">
-                  <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2"
-                    d="M12 8v4m0 4h.01M21 12a9 9 0 11-18 0 9 9 0 0118 0z" />
-                </svg>
-              </div>
+            <div class="mt-3 flex flex-row-reverse">
+              {{ template "vrl-function-legend" }}
+            </div>
 
-              <div class="prose prose-sm dark:prose-dark max-w-none leading-snug">
-                {{ . | markdownify }}
+            {{/* Function arguments */}}
+            {{ with $args }}
+              <div class="mt-6 prose dark:prose-dark max-w-none">
+                {{ template "vrl-function-args" . }}
               </div>
-            </div>
             {{ end }}
-          </div>
-        </div>
-        {{ end }}
 
-        {{/* Function errors */}}
-        {{ with $func.internal_failure_reasons }}
-        {{ $id := printf "%s-errors" $name }}
-        <div class="mt-6">
-          <span>
-            {{ partial "heading.html" (dict "text" "Errors" "level" 4 "id" $id "toc_hide" true) }}
-          </span>
+            {{/* Function notices */}}
+            {{ with $func.notices }}
+              {{ $id := printf "%s-notices" $name }}
+              <div class="mt-6">
+                <span>
+                  {{ partial "heading.html" (dict "text" "Notices" "level" 4 "id" $id "toc_hide" true) }}
+                </span>
 
-          <span class="mt-2 text-sm prose prose-md dark:prose-dark max-w-none">
-            The <code>{{ $name }}</code> function is <strong>fallible</strong>, which means that
-            <a href="/docs/reference/vrl/errors">error handling</a> is required for these errors:
-          </span>
+                <span class="mt-2 text-sm prose prose-md dark:prose-dark max-w-none">
+                  This function has special behavior that you should be aware of.
+                </span>
 
-          <div class="mt-1.5">
-            {{ range . }}
-            <div class="flex space-x-5 items-center">
-              <div class="flex-shrink-0 py-1">
-                {{/* Heroicon: outline/exclamation */}}
-                <svg xmlns="http://www.w3.org/2000/svg" class="text-red-400 h-5 w-5" fill="none" viewBox="0 0 24 24"
-                  stroke="currentColor">
-                  <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2"
-                    d="M12 9v2m0 4h.01m-6.938 4h13.856c1.54 0 2.502-1.667 1.732-3L13.732 4c-.77-1.333-2.694-1.333-3.464 0L3.34 16c-.77 1.333.192 3 1.732 3z" />
-                </svg>
+                <div class="mt-1.5 flex flex-col space-y-2">
+                  {{ range . }}
+                    <div class="flex space-x-5 items-center">
+                      <div class="flex-shrink-0 py-1">
+                        {{/* Heroicon: outline/exclamation-circle */}}
+                        <svg
+                          xmlns="http://www.w3.org/2000/svg"
+                          class="text-yellow-500 h-5 w-5"
+                          fill="none"
+                          viewBox="0 0 24 24"
+                          stroke="currentColor"
+                        >
+                          <path
+                            stroke-linecap="round"
+                            stroke-linejoin="round"
+                            stroke-width="2"
+                            d="M12 8v4m0 4h.01M21 12a9 9 0 11-18 0 9 9 0 0118 0z"
+                          />
+                        </svg>
+                      </div>
+
+                      <div class="prose prose-sm dark:prose-dark max-w-none leading-snug">
+                        {{ . | markdownify }}
+                      </div>
+                    </div>
+                  {{ end }}
+                </div>
               </div>
+            {{ end }}
 
-              <div class="prose prose-sm dark:prose-dark max-w-none leading-snug">
-                {{ . | markdownify }}
+            {{/* Function errors */}}
+            {{ with $func.internal_failure_reasons }}
+              {{ $id := printf "%s-errors" $name }}
+              <div class="mt-6">
+                <span>
+                  {{ partial "heading.html" (dict "text" "Errors" "level" 4 "id" $id "toc_hide" true) }}
+                </span>
+
+                <span class="mt-2 text-sm prose prose-md dark:prose-dark max-w-none">
+                  The <code>{{ $name }}</code> function is <strong>fallible</strong>, which means that
+                  <a href="/docs/reference/vrl/errors">error handling</a> is required for these errors:
+                </span>
+
+                <div class="mt-1.5">
+                  {{ range . }}
+                    <div class="flex space-x-5 items-center">
+                      <div class="flex-shrink-0 py-1">
+                        {{/* Heroicon: outline/exclamation */}}
+                        <svg
+                          xmlns="http://www.w3.org/2000/svg"
+                          class="text-red-400 h-5 w-5"
+                          fill="none"
+                          viewBox="0 0 24 24"
+                          stroke="currentColor"
+                        >
+                          <path
+                            stroke-linecap="round"
+                            stroke-linejoin="round"
+                            stroke-width="2"
+                            d="M12 9v2m0 4h.01m-6.938 4h13.856c1.54 0 2.502-1.667 1.732-3L13.732 4c-.77-1.333-2.694-1.333-3.464 0L3.34 16c-.77 1.333.192 3 1.732 3z"
+                          />
+                        </svg>
+                      </div>
+
+                      <div class="prose prose-sm dark:prose-dark max-w-none leading-snug">
+                        {{ . | markdownify }}
+                      </div>
+                    </div>
+                  {{ end }}
+                </div>
               </div>
-            </div>
             {{ end }}
-          </div>
-        </div>
-        {{ end }}
 
-        {{/* Function examples */}}
-        {{ with $func.examples }}
-        {{ $id := printf "%s-examples" $name }}
-        <div class="mt-6">
-          <span>
-            {{ partial "heading.html" (dict "text" "Examples" "level" 4 "id" $id "toc_hide" true) }}
-          </span>
+            {{/* Function examples */}}
+            {{ with $func.examples }}
+              {{ $id := printf "%s-examples" $name }}
+              <div class="mt-6">
+                <span>
+                  {{ partial "heading.html" (dict "text" "Examples" "level" 4 "id" $id "toc_hide" true) }}
+                </span>
 
-          <div class="mt-2 flex flex-col space-y-4">
-            {{ range . }}
-            {{ template "vrl-function-example" (dict "name" $name "ctx" .) }}
+                <div class="mt-2 flex flex-col space-y-4">
+                  {{ range . }}
+                    {{ template "vrl-function-example" (dict "name" $name "ctx" .) }}
+                  {{ end }}
+                </div>
+              </div>
             {{ end }}
           </div>
         </div>
-        {{ end }}
-      </div>
+      {{ end }}
     </div>
-    {{ end }}
-  </div>
   {{ end }}
 
   {{/* Real-world examples */}}
   {{ with .vrl_real_world_examples }}
-  <div class="flex flex-col divide-y dark:divide-gray-700">
-    {{ range . }}
-    {{ $input := dict "message" .input.log.message | jsonify (dict "indent" "  ") }}
-    {{ $vrlSourceCode := highlight .source "toml" "" }}
-    {{ $output := .output | jsonify (dict "indent" "  ") }}
-    {{ $outputCode := highlight $output "json" "" }}
-    <div class="py-3 px-5">
-      <span class="font-semibold tracking-tight">
-        {{ $href := printf "#%s" (.title | urlize) }}
-        {{ partial "heading.html" (dict "text" .title "level" 3 "href" $href "icon" false) }}
-      </span>
+    <div class="flex flex-col divide-y dark:divide-gray-700">
+      {{ range . }}
+        {{ $input := dict "message" .input.log.message | jsonify (dict "indent" "  ") }}
+        {{ $vrlSourceCode := highlight .source "toml" "" }}
+        {{ $output := .output | jsonify (dict "indent" "  ") }}
+        {{ $outputCode := highlight $output "json" "" }}
+        <div class="py-3 px-5">
+          <span class="font-semibold tracking-tight">
+            {{ $href := printf "#%s" (.title | urlize) }}
+            {{ partial "heading.html" (dict "text" .title "level" 3 "href" $href "icon" false) }}
+          </span>
 
-      <div class="mt-3 flex flex-col space-y-2">
-        {{ with .input.log }}
-        {{ $json := . | jsonify (dict "indent" "  ") }}
-        {{ $code := highlight $json "json" "" }}
-        <span>
-          Given this <a href="/docs/about/under-the-hood/architecture/data-model/log">Vector log event</a>...
-        </span>
-        {{ $code }}
-        {{ end }}
+          <div class="mt-3 flex flex-col space-y-2">
+            {{ with .input.log }}
+              {{ $json := . | jsonify (dict "indent" "  ") }}
+              {{ $code := highlight $json "json" "" }}
+              <span>
+                Given this
+                <a href="/docs/about/under-the-hood/architecture/data-model/log">Vector log event</a>...
+              </span>
+              {{ $code }}
+            {{ end }}
 
-        {{ with .input.metric }}
-        {{ $json := . | jsonify (dict "indent" "  ") }}
-        {{ $code := highlight $json "json" "" }}
-        <span>
-          Given this <a href="/docs/about/under-the-hood/architecture/data-model/metric">Vector metric event</a>...
-        </span>
-        {{ $code }}
-        {{ end }}
+            {{ with .input.metric }}
+              {{ $json := . | jsonify (dict "indent" "  ") }}
+              {{ $code := highlight $json "json" "" }}
+              <span>
+                Given this
+                <a href="/docs/about/under-the-hood/architecture/data-model/metric">Vector metric event</a>...
+              </span>
+              {{ $code }}
+            {{ end }}
 
-        <span>
-          ...and this VRL program...
-        </span>
 
-        {{ $vrlSourceCode }}
+            <span> ...and this VRL program... </span>
 
-        {{ if .raises }}
-        {{ $errorCode := highlight .raises.compiletime "rust" "" }}
-        <span>
-          ...you should see this error:
-        </span>
+            {{ $vrlSourceCode }}
 
-        {{ $errorCode }}
-        {{ else }}
-        {{ with .input.log }}
-        <span>...the following log event is output:</span>
-        {{ end }}
+            {{ if .raises }}
+              {{ $errorCode := highlight .raises.compiletime "rust" "" }}
+              <span> ...you should see this error: </span>
 
-        {{ with .input.metric }}
-        <span>...the following metric event is output:</span>
-        {{ end }}
+              {{ $errorCode }}
+            {{ else }}
+              {{ with .input.log }}
+                <span>...the following log event is output:</span>
+              {{ end }}
 
-        {{ $outputCode }}
-        {{ end }}
-      </div>
+              {{ with .input.metric }}
+                <span>...the following metric event is output:</span>
+              {{ end }}
+
+              {{ $outputCode }}
+            {{ end }}
+          </div>
+        </div>
+      {{ end }}
     </div>
-    {{ end }}
-  </div>
   {{ end }}
 
   {{/* Compile-time errors */}}
   {{ with .vrl_compile_time_errors }}
-  <div class="divide-y dark:divide-gray-700">
-    {{ range $code, $error := . }}
-    {{ $id := printf "%s %s" $code $error.title | urlize }}
-    <div class="p-6">
-      <span>
-        <h3 id="{{ $code }}">
-          <span class="font-mono text-secondary">
-            {{ $code }}
-          </span>
-
-          <a href="#{{ $code }}" class="text-gray-700 dark:text-white tracking-tight">
-            {{ $error.title }}
-          </a>
-        </h3>
-      </span>
-
-      <div x-show="open" class="mt-4">
-        {{ with $error.description }}
-        <div class="leading-tight">
-          {{ . | markdownify }}
-        </div>
-        {{ end }}
-
-        {{ with $error.rationale }}
-        {{ $id := printf "error-%s-rationale" $code }}
-        <div class="mt-3">
-          <span class="flex items-center space-x-1.5">
-            {{/* Heroicon: outline/zoom-in */}}
-            <svg xmlns="http://www.w3.org/2000/svg" class="h-4 w-4 text-indigo-500 dark:text-indigo-400" fill="none"
-              viewBox="0 0 24 24" stroke="currentColor">
-              <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2"
-                d="M21 21l-6-6m2-5a7 7 0 11-14 0 7 7 0 0114 0zM10 7v3m0 0v3m0-3h3m-3 0H7" />
-            </svg>
-
-            {{ partial "heading.html" (dict "text" "Rationale" "level" 4 "id" $id "toc_hide" true) }}
-          </span>
-
-          <div class="mt-2 leading-tight">
-            {{ . | markdownify }}
-          </div>
-        </div>
-        {{ end }}
-
-        {{ with $error.resolution }}
-        {{ $id := printf "error-%s-resolution" $code }}
-        <div class="mt-3">
-          <span class="flex items-center space-x-1.5">
-            {{/* Heroicon: outline/trending-up */}}
-            <svg xmlns="http://www.w3.org/2000/svg" class="h-4 w-4 text-blue-500 dark:text-blue-400" fill="none"
-              viewBox="0 0 24 24" stroke="currentColor">
-              <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2"
-                d="M5 3v4M3 5h4M6 17v4m-2-2h4m5-16l2.286 6.857L21 12l-5.714 2.143L13 21l-2.286-6.857L5 12l5.714-2.143L13 3z" />
-            </svg>
-
-            {{ partial "heading.html" (dict "text" "Resolution" "level" 4 "id" $id "toc_hide" true) }}
-          </span>
-
-          <div class="mt-2 leading-tight">
-            {{ . | markdownify }}
-          </div>
-        </div>
-        {{ end }}
-
-        {{ with $error.examples }}
-        {{ $id := printf "error-%s-examples" $code }}
-        <div x-data="{ open: location.hash.startsWith('#error-{{ $code }}') }"
-          class="mt-5 rounded-md px-3 py-2 dark:border-gray-700 border">
-          <span class="flex justify-between items-center">
-            <span class="flex items-center space-x-2">
-              {{/* Heroicon: outline/code */}}
-              <svg xmlns="http://www.w3.org/2000/svg" class="h-4 w-4 text-secondary dark:text-primary" fill="none"
-                viewBox="0 0 24 24" stroke="currentColor">
-                <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2"
-                  d="M10 20l4-16m4 4l4 4-4 4M6 16l-4-4 4-4" />
-              </svg>
-
-              {{ partial "heading.html" (dict "text" "Examples" "level" 4 "toc_hide" true "id" $id) }}
-            </span>
+    <div class="divide-y dark:divide-gray-700">
+      {{ range $code, $error := . }}
+        {{ $id := printf "%s %s" $code $error.title | urlize }}
+        <div class="p-6">
+          <span>
+            <h3 id="{{ $code }}">
+              <span class="font-mono text-secondary">
+                {{ $code }}
+              </span>
 
-            {{ template "vrl-toggler" }}
+              <a href="#{{ $code }}" class="text-gray-700 dark:text-white tracking-tight">
+                {{ $error.title }}
+              </a>
+            </h3>
           </span>
 
-          <div x-show="open"
-            class="mt-2 flex flex-col divide-y dark:divide-gray-700 border rounded dark:border-gray-700">
-            {{ range . }}
-            {{ $id := printf "error-%s-example-%s" $code (.title | urlize) }}
-            <div class="flex flex-col space-y-1 py-2.5 px-4 rounded-sm dark:border-gray-700">
-              <span>
-                {{ partial "heading.html" (dict "text" .title "level" 5 "id" $id "toc_hide" true) }}
-              </span>
+          <div x-show="open" class="mt-4">
+            {{ with $error.description }}
+              <div class="leading-tight">
+                {{ . | markdownify }}
+              </div>
+            {{ end }}
 
-              {{/* Example event (log or metric) */}}
-              {{ with .input }}
-              {{ with .log }} {{/* Log event */}}
-              {{ $json := . | jsonify (dict "indent" "  ") }}
-              <div>
-                <span class="tracking-tighter font-semibold text-sm">
-                  Log event
+            {{ with $error.rationale }}
+              {{ $id := printf "error-%s-rationale" $code }}
+              <div class="mt-3">
+                <span class="flex items-center space-x-1.5">
+                  {{/* Heroicon: outline/zoom-in */}}
+                  <svg
+                    xmlns="http://www.w3.org/2000/svg"
+                    class="h-4 w-4 text-indigo-500 dark:text-indigo-400"
+                    fill="none"
+                    viewBox="0 0 24 24"
+                    stroke="currentColor"
+                  >
+                    <path
+                      stroke-linecap="round"
+                      stroke-linejoin="round"
+                      stroke-width="2"
+                      d="M21 21l-6-6m2-5a7 7 0 11-14 0 7 7 0 0114 0zM10 7v3m0 0v3m0-3h3m-3 0H7"
+                    />
+                  </svg>
+
+                  {{ partial "heading.html" (dict "text" "Rationale" "level" 4 "id" $id "toc_hide" true) }}
                 </span>
 
-                {{ highlight $json "json" "" }}
+                <div class="mt-2 leading-tight">
+                  {{ . | markdownify }}
+                </div>
               </div>
-              {{ end }}
+            {{ end }}
 
-              {{ with .metric }} {{/* Metric event */}}
-              {{ $json := . | jsonify (dict "indent" "  ") }}
-              <div>
-                <span class="tracking-tighter font-semibold text-sm">
-                  Metric event
+            {{ with $error.resolution }}
+              {{ $id := printf "error-%s-resolution" $code }}
+              <div class="mt-3">
+                <span class="flex items-center space-x-1.5">
+                  {{/* Heroicon: outline/trending-up */}}
+                  <svg
+                    xmlns="http://www.w3.org/2000/svg"
+                    class="h-4 w-4 text-blue-500 dark:text-blue-400"
+                    fill="none"
+                    viewBox="0 0 24 24"
+                    stroke="currentColor"
+                  >
+                    <path
+                      stroke-linecap="round"
+                      stroke-linejoin="round"
+                      stroke-width="2"
+                      d="M5 3v4M3 5h4M6 17v4m-2-2h4m5-16l2.286 6.857L21 12l-5.714 2.143L13 21l-2.286-6.857L5 12l5.714-2.143L13 3z"
+                    />
+                  </svg>
+
+                  {{ partial "heading.html" (dict "text" "Resolution" "level" 4 "id" $id "toc_hide" true) }}
                 </span>
 
-                {{ highlight $json "json" "" }}
+                <div class="mt-2 leading-tight">
+                  {{ . | markdownify }}
+                </div>
               </div>
-              {{ end }}
-              {{ end }}
+            {{ end }}
 
-              {{ with .source }}
-              <div>
-                <span class="tracking-tighter font-semibold text-sm">
-                  VRL program
+            {{ with $error.examples }}
+              {{ $id := printf "error-%s-examples" $code }}
+              <div
+                x-data="{ open: location.hash.startsWith('#error-{{ $code }}') }"
+                class="mt-5 rounded-md px-3 py-2 dark:border-gray-700 border"
+              >
+                <span class="flex justify-between items-center">
+                  <span class="flex items-center space-x-2">
+                    {{/* Heroicon: outline/code */}}
+                    <svg
+                      xmlns="http://www.w3.org/2000/svg"
+                      class="h-4 w-4 text-secondary dark:text-primary"
+                      fill="none"
+                      viewBox="0 0 24 24"
+                      stroke="currentColor"
+                    >
+                      <path
+                        stroke-linecap="round"
+                        stroke-linejoin="round"
+                        stroke-width="2"
+                        d="M10 20l4-16m4 4l4 4-4 4M6 16l-4-4 4-4"
+                      />
+                    </svg>
+
+                    {{ partial "heading.html" (dict "text" "Examples" "level" 4 "toc_hide" true "id" $id) }}
+                  </span>
+
+                  {{ template "vrl-toggler" }}
                 </span>
 
-                {{ highlight . "coffee" "" }}
-              </div>
-              {{ end }}
+                <div
+                  x-show="open"
+                  class="mt-2 flex flex-col divide-y dark:divide-gray-700 border rounded dark:border-gray-700"
+                >
+                  {{ range . }}
+                    {{ $id := printf "error-%s-example-%s" $code (.title | urlize) }}
+                    <div class="flex flex-col space-y-1 py-2.5 px-4 rounded-sm dark:border-gray-700">
+                      <span>
+                        {{ partial "heading.html" (dict "text" .title "level" 5 "id" $id "toc_hide" true) }}
+                      </span>
 
-              {{/* Example diff */}}
-              {{ with .diff }}
-              <div>
-                <span class="tracking-tighter font-semibold text-sm">
-                  How to fix it
-                </span>
+                      {{/* Example event (log or metric) */}}
+                      {{ with .input }}
+                        {{ with .log }}
+                          {{/* Log event */}}
+                          {{ $json := . | jsonify (dict "indent" "  ") }}
+                          <div>
+                            <span class="tracking-tighter font-semibold text-sm"> Log event </span>
+
+                            {{ highlight $json "json" "" }}
+                          </div>
+                        {{ end }}
+
+                        {{ with .metric }}
+                          {{/* Metric event */}}
+                          {{ $json := . | jsonify (dict "indent" "  ") }}
+                          <div>
+                            <span class="tracking-tighter font-semibold text-sm"> Metric event </span>
+
+                            {{ highlight $json "json" "" }}
+                          </div>
+                        {{ end }}
+                      {{ end }}
 
-                {{ highlight . "diff" "" }}
+                      {{ with .source }}
+                        <div>
+                          <span class="tracking-tighter font-semibold text-sm"> VRL program </span>
+
+                          {{ highlight . "coffee" "" }}
+                        </div>
+                      {{ end }}
+
+                      {{/* Example diff */}}
+                      {{ with .diff }}
+                        <div>
+                          <span class="tracking-tighter font-semibold text-sm"> How to fix it </span>
+
+                          {{ highlight . "diff" "" }}
+                        </div>
+                      {{ end }}
+                    </div>
+                  {{ end }}
+                </div>
               </div>
-              {{ end }}
-            </div>
             {{ end }}
           </div>
         </div>
-        {{ end }}
-      </div>
+      {{ end }}
     </div>
-    {{ end }}
-  </div>
   {{ end }}
 
   {{/* VRL expressions */}}
   {{ with .vrl_expressions }}
-  <div class="divide-y dark:divide-gray-700">
-    {{ range $k, $v := . }}
-    <div class="py-4 px-6">
-      <span>
-        {{ partial "heading.html" (dict "text" $v.title "level" 3) }}
-      </span>
-
-      <div class="mt-6 prose dark:prose-dark max-w-none leading-snug">
-        {{ $v.description | markdownify }}
-      </div>
-
-      {{ with $v.grammar }}
-      {{ $id := printf "%s-grammar" $k }}
-      <div class="mt-4">
-        <span>
-          {{ partial "heading.html" (dict "text" "Grammar" "level" 4 "id" $id) }}
-        </span>
-      </div>
+    <div class="divide-y dark:divide-gray-700">
+      {{ range $k, $v := . }}
+        <div class="py-4 px-6">
+          <span>
+            {{ partial "heading.html" (dict "text" $v.title "level" 3) }}
+          </span>
 
-      <div class="mt-2 border rounded p-4 dark:border-gray-700">
-        <div>
-          {{ highlight .source "coffee" "" }}
-        </div>
+          <div class="mt-6 prose dark:prose-dark max-w-none leading-snug">
+            {{ $v.description | markdownify }}
+          </div>
 
-        {{ with .definitions }}
-        <div class="mt-3 prose dark:prose-dark max-w-none">
-          <table>
-            <thead>
-              <tr>
-                <th>
-                  Argument
-                </th>
-                <th>
-                  Meaning
-                </th>
-              </tr>
-            </thead>
-            <tbody>
-              {{ range $k, $v := . }}
-              <tr>
-                <td>
-                  <code>
-                    {{ $k }}
-                  </code>
-                </td>
-                <td>
-                  {{ $v.description | markdownify }}
-                </td>
-              </tr>
-              {{ end }}
-            </tbody>
-          </table>
-        </div>
-        {{ end }}
-      </div>
-      {{ end }}
+          {{ with $v.grammar }}
+            {{ $id := printf "%s-grammar" $k }}
+            <div class="mt-4">
+              <span>
+                {{ partial "heading.html" (dict "text" "Grammar" "level" 4 "id" $id) }}
+              </span>
+            </div>
 
-      {{ with $v.examples }}
-      {{ $id := printf "%s-examples" $k }}
-      <div class="mt-6">
-        <span>
-          {{ partial "heading.html" (dict "text" "Examples" "level" 4 "id" $id) }}
-        </span>
+            <div class="mt-2 border rounded p-4 dark:border-gray-700">
+              <div>
+                {{ highlight .source "coffee" "" }}
+              </div>
 
-        <div class="mt-3 no-prose border rounded-md flex flex-col divide-y dark:border-gray-700 dark:divide-gray-700">
-          {{ range . }}
-          {{ template "vrl-data-example" (dict "name" $k "ctx" .) }}
+              {{ with .definitions }}
+                <div class="mt-3 prose dark:prose-dark max-w-none">
+                  <table>
+                    <thead>
+                      <tr>
+                        <th>Argument</th>
+                        <th>Meaning</th>
+                      </tr>
+                    </thead>
+                    <tbody>
+                      {{ range $k, $v := . }}
+                        <tr>
+                          <td>
+                            <code>
+                              {{ $k }}
+                            </code>
+                          </td>
+                          <td>
+                            {{ $v.description | markdownify }}
+                          </td>
+                        </tr>
+                      {{ end }}
+                    </tbody>
+                  </table>
+                </div>
+              {{ end }}
+            </div>
           {{ end }}
-        </div>
-      </div>
-      {{ end }}
-
-      {{ with $v.characteristics }}
-      {{ $id := printf "%s-characteristics" ($v.title | urlize) }}
-      <div class="mt-4">
-        <span>
-          {{ partial "heading.html" (dict "text" "Characteristics" "level" 4 "id" $id) }}
-        </span>
 
-        <div class="mt-2 flex flex-col divide-y dark:divide-gray-700 border dark:border-gray-700">
-          {{ range . }}
-          <div class="py-1.5 px-3">
-            {{ partial "heading.html" (dict "text" .title "level" 5 "icon" false) }}
+          {{ with $v.examples }}
+            {{ $id := printf "%s-examples" $k }}
+            <div class="mt-6">
+              <span>
+                {{ partial "heading.html" (dict "text" "Examples" "level" 4 "id" $id) }}
+              </span>
 
-            {{ with .description }}
-            <div class="mt-1 prose prose-sm dark:prose-dark max-w-none">
-              {{ . | markdownify }}
+              <div
+                class="mt-3 no-prose border rounded-md flex flex-col divide-y dark:border-gray-700 dark:divide-gray-700"
+              >
+                {{ range . }}
+                  {{ template "vrl-data-example" (dict "name" $k "ctx" .) }}
+                {{ end }}
+              </div>
             </div>
-            {{ end }}
+          {{ end }}
 
-            {{ with .enum }}
-            <div class="mt-2">
+          {{ with $v.characteristics }}
+            {{ $id := printf "%s-characteristics" ($v.title | urlize) }}
+            <div class="mt-4">
               <span>
-                Enum options
+                {{ partial "heading.html" (dict "text" "Characteristics" "level" 4 "id" $id) }}
               </span>
 
-              <div class="prose dark:prose-dark max-w-none">
-                {{ template "enum-options-table" . }}
+              <div class="mt-2 flex flex-col divide-y dark:divide-gray-700 border dark:border-gray-700">
+                {{ range . }}
+                  <div class="py-1.5 px-3">
+                    {{ partial "heading.html" (dict "text" .title "level" 5 "icon" false) }}
+
+                    {{ with .description }}
+                      <div class="mt-1 prose prose-sm dark:prose-dark max-w-none">
+                        {{ . | markdownify }}
+                      </div>
+                    {{ end }}
+
+                    {{ with .enum }}
+                      <div class="mt-2">
+                        <span> Enum options </span>
+
+                        <div class="prose dark:prose-dark max-w-none">
+                          {{ template "enum-options-table" . }}
+                        </div>
+                      </div>
+                    {{ end }}
+                  </div>
+                {{ end }}
               </div>
             </div>
-            {{ end }}
-          </div>
           {{ end }}
         </div>
-      </div>
       {{ end }}
     </div>
-    {{ end }}
-  </div>
   {{ end }}
 
   {{/* VRL examples */}}
   {{ with .vrl_examples }}
-  <div class="flex flex-col divide-y dark:divide-gray-700">
-    {{ range . }}
-    {{ $name := .name }}
-    {{ $link := printf "docs/reference/vrl/functions/#%s" $name | relURL }}
-    <div class="py-4 px-6">
-      <span class="text-base font-mono">
-        {{ partial "heading.html" (dict "text" $name "level" 3) }}
-      </span>
+    <div class="flex flex-col divide-y dark:divide-gray-700">
+      {{ range . }}
+        {{ $name := .name }}
+        {{ $link := printf "docs/reference/vrl/functions/#%s" $name | relURL }}
+        <div class="py-4 px-6">
+          <span class="text-base font-mono">
+            {{ partial "heading.html" (dict "text" $name "level" 3) }}
+          </span>
 
-      <div class="my-4 prose dark:prose-dark max-w-none leading-snug">
-        {{ .description | markdownify }}
-      </div>
+          <div class="my-4 prose dark:prose-dark max-w-none leading-snug">
+            {{ .description | markdownify }}
+          </div>
 
-      <div class="border rounded divide-y dark:border-gray-700 dark:divide-gray-700">
-        {{ range .examples }}
-        <div class="py-3 px-5">
-          <span class="font-semibold">
-            {{ partial "heading.html" (dict "text" .title "level" 4) }}
-          </span>
+          <div class="border rounded divide-y dark:border-gray-700 dark:divide-gray-700">
+            {{ range .examples }}
+              <div class="py-3 px-5">
+                <span class="font-semibold">
+                  {{ partial "heading.html" (dict "text" .title "level" 4) }}
+                </span>
 
-          <div class="mt-2">
-            <span>
-              Source
-            </span>
+                <div class="mt-2">
+                  <span> Source </span>
 
-            <div class="mt-1">
-              {{ highlight .source "coffee" "" }}
-            </div>
-          </div>
+                  <div class="mt-1">
+                    {{ highlight .source "coffee" "" }}
+                  </div>
+                </div>
 
-          {{ with .return }}
-          <div class="mt-2.5">
-            <span>
-              Return
-            </span>
+                {{ with .return }}
+                  <div class="mt-2.5">
+                    <span> Return </span>
 
-            <div class="mt-1">
-              {{ template "code" . }}
-            </div>
-          </div>
-          {{ end }}
+                    <div class="mt-1">
+                      {{ template "code" . }}
+                    </div>
+                  </div>
+                {{ end }}
 
-          <div class="mt-4 flex items-center space-x-2 justify-end">
-            <span>
-              {{/* Heroicon: outline/light-bulb */}}
-              <svg xmlns="http://www.w3.org/2000/svg" class="text-yellow-500 h-4 w-4" fill="none" viewBox="0 0 24 24"
-                stroke="currentColor">
-                <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2"
-                  d="M9.663 17h4.673M12 3v1m6.364 1.636l-.707.707M21 12h-1M4 12H3m3.343-5.657l-.707-.707m2.828 9.9a5 5 0 117.072 0l-.548.547A3.374 3.374 0 0014 18.469V19a2 2 0 11-4 0v-.531c0-.895-.356-1.754-.988-2.386l-.548-.547z" />
-              </svg>
-            </span>
 
-            <span class="text-sm">
-              Learn more about the <a href="{{ $link }}"
-                class="font-mono font-semibold text-secondary dark:text-primary hover:text-primary dark:hover:text-secondary">{{
-                $name }}</a> function
-            </span>
+                <div class="mt-4 flex items-center space-x-2 justify-end">
+                  <span>
+                    {{/* Heroicon: outline/light-bulb */}}
+                    <svg
+                      xmlns="http://www.w3.org/2000/svg"
+                      class="text-yellow-500 h-4 w-4"
+                      fill="none"
+                      viewBox="0 0 24 24"
+                      stroke="currentColor"
+                    >
+                      <path
+                        stroke-linecap="round"
+                        stroke-linejoin="round"
+                        stroke-width="2"
+                        d="M9.663 17h4.673M12 3v1m6.364 1.636l-.707.707M21 12h-1M4 12H3m3.343-5.657l-.707-.707m2.828 9.9a5 5 0 117.072 0l-.548.547A3.374 3.374 0 0014 18.469V19a2 2 0 11-4 0v-.531c0-.895-.356-1.754-.988-2.386l-.548-.547z"
+                      />
+                    </svg>
+                  </span>
+
+                  <span class="text-sm">
+                    Learn more about the
+                    <a
+                      href="{{ $link }}"
+                      class="font-mono font-semibold text-secondary dark:text-primary hover:text-primary dark:hover:text-secondary"
+                      >{{ $name }}</a
+                    >
+                    function
+                  </span>
+                </div>
+              </div>
+            {{ end }}
           </div>
         </div>
-        {{ end }}
-      </div>
+      {{ end }}
     </div>
-    {{ end }}
-  </div>
   {{ end }}
 
   {{/* VRL syntax */}}
   {{ with .vrl_syntax }}
-  <div class="flex flex-col divide-y dark:divide-gray-700">
-    {{ range . }}
-    {{ $title := .title }}
-    <div class="py-4 px-6">
-      {{ partial "heading.html" (dict "text" .title "level" 3) }}
+    <div class="flex flex-col divide-y dark:divide-gray-700">
+      {{ range . }}
+        {{ $title := .title }}
+        <div class="py-4 px-6">
+          {{ partial "heading.html" (dict "text" .title "level" 3) }}
 
-      {{ with .description }}
-      <div class="mt-2 prose dark:prose-dark max-w-none">
-        {{ . | markdownify }}
-      </div>
-      {{ end }}
+          {{ with .description }}
+            <div class="mt-2 prose dark:prose-dark max-w-none">
+              {{ . | markdownify }}
+            </div>
+          {{ end }}
 
-      {{ with .examples }}
-      {{ $id := printf "%s-examples" (urlize $title) }}
-      <div class="mt-3">
-        <span>
-          {{ partial "heading.html" (dict "text" "Examples" "level" 4 "id" $id) }}
-        </span>
+          {{ with .examples }}
+            {{ $id := printf "%s-examples" (urlize $title) }}
+            <div class="mt-3">
+              <span>
+                {{ partial "heading.html" (dict "text" "Examples" "level" 4 "id" $id) }}
+              </span>
 
-        <div class="mt-2 flex flex-col space-y-2">
-          {{ range . }}
-          {{ highlight . "text" "" }}
+              <div class="mt-2 flex flex-col space-y-2">
+                {{ range . }}
+                  {{ highlight . "text" "" }}
+                {{ end }}
+              </div>
+            </div>
           {{ end }}
         </div>
-      </div>
       {{ end }}
     </div>
-    {{ end }}
-  </div>
   {{ end }}
 
   {{/* VRL literals */}}
   {{ with .vrl_literals }}
-  <div class="flex flex-col divide-y dark:divide-gray-700">
-    {{ range $k, $v := . }}
-    <div class="py-4 px-6">
-      <span>
-        {{ partial "heading.html" (dict "text" $v.title "level" 3 "icon" false) }}
-      </span>
-
-      {{ with $v.description }}
-      <div class="mt-2 prose dark:prose-dark max-w-none leading-6">
-        {{ . | markdownify }}
-      </div>
-      {{ end }}
-
-      {{ with $v.examples }}
-      {{ $id := printf "%s-examples" ($v.title | urlize) }}
-      <div class="mt-4">
-        <span>
-          {{ partial "heading.html" (dict "text" "Examples" "level" 4 "id" $id) }}
-        </span>
+    <div class="flex flex-col divide-y dark:divide-gray-700">
+      {{ range $k, $v := . }}
+        <div class="py-4 px-6">
+          <span>
+            {{ partial "heading.html" (dict "text" $v.title "level" 3 "icon" false) }}
+          </span>
 
-        <div class="mt-2 flex flex-col space-y-2 text-sm">
-          {{ range . }}
-          {{ highlight . "coffee" "" }}
+          {{ with $v.description }}
+            <div class="mt-2 prose dark:prose-dark max-w-none leading-6">
+              {{ . | markdownify }}
+            </div>
           {{ end }}
-        </div>
-      </div>
-      {{ end }}
-
-      {{ with $v.characteristics }}
-      {{ $id := printf "%s-characteristics" ($v.title | urlize) }}
-      <div class="mt-4">
-        <span>
-          {{ partial "heading.html" (dict "text" "Characteristics" "level" 4 "id" $id) }}
-        </span>
 
-        <div class="mt-2 flex flex-col divide-y dark:divide-gray-700 border dark:border-gray-700">
-          {{ range . }}
-          <div class="py-1.5 px-3">
-            {{ partial "heading.html" (dict "text" .title "level" 5 "icon" false) }}
+          {{ with $v.examples }}
+            {{ $id := printf "%s-examples" ($v.title | urlize) }}
+            <div class="mt-4">
+              <span>
+                {{ partial "heading.html" (dict "text" "Examples" "level" 4 "id" $id) }}
+              </span>
 
-            {{ with .description }}
-            <div class="mt-1 prose prose-sm dark:prose-dark max-w-none">
-              {{ . | markdownify }}
+              <div class="mt-2 flex flex-col space-y-2 text-sm">
+                {{ range . }}
+                  {{ highlight . "coffee" "" }}
+                {{ end }}
+              </div>
             </div>
-            {{ end }}
+          {{ end }}
 
-            {{ with .enum }}
-            <div class="mt-2">
+          {{ with $v.characteristics }}
+            {{ $id := printf "%s-characteristics" ($v.title | urlize) }}
+            <div class="mt-4">
               <span>
-                Enum options
+                {{ partial "heading.html" (dict "text" "Characteristics" "level" 4 "id" $id) }}
               </span>
 
-              <div class="prose dark:prose-dark max-w-none">
-                {{ template "enum-options-table" . }}
+              <div class="mt-2 flex flex-col divide-y dark:divide-gray-700 border dark:border-gray-700">
+                {{ range . }}
+                  <div class="py-1.5 px-3">
+                    {{ partial "heading.html" (dict "text" .title "level" 5 "icon" false) }}
+
+                    {{ with .description }}
+                      <div class="mt-1 prose prose-sm dark:prose-dark max-w-none">
+                        {{ . | markdownify }}
+                      </div>
+                    {{ end }}
+
+                    {{ with .enum }}
+                      <div class="mt-2">
+                        <span> Enum options </span>
+
+                        <div class="prose dark:prose-dark max-w-none">
+                          {{ template "enum-options-table" . }}
+                        </div>
+                      </div>
+                    {{ end }}
+                  </div>
+                {{ end }}
               </div>
             </div>
-            {{ end }}
-          </div>
           {{ end }}
         </div>
-      </div>
       {{ end }}
     </div>
-    {{ end }}
-  </div>
   {{ end }}
 
   {{/* VRL concepts */}}
   {{ with .vrl_concepts }}
-  <div class="flex flex-col divide-y dark:divide-gray-700">
-    {{ range $k, $v := . }}
-    {{ $id := .anchor }}
-    <div class="py-3 px-5">
-      <span>
-        {{ partial "heading.html" (dict "text" $v.title "level" 3) }}
-      </span>
+    <div class="flex flex-col divide-y dark:divide-gray-700">
+      {{ range $k, $v := . }}
+        {{ $id := .anchor }}
+        <div class="py-3 px-5">
+          <span>
+            {{ partial "heading.html" (dict "text" $v.title "level" 3) }}
+          </span>
 
-      <div class="mt-2 prose dark:prose-dark max-w-none">
-        {{ $v.description | markdownify }}
-      </div>
+          <div class="mt-2 prose dark:prose-dark max-w-none">
+            {{ $v.description | markdownify }}
+          </div>
 
-      {{ with $v.characteristics }}
-      {{ $id := printf "%s-characteristics" $id }}
-      <div class="mt-3">
-        <span>
-          {{ partial "heading.html" (dict "text" "Characteristics" "level" 4 "id" $id) }}
-        </span>
+          {{ with $v.characteristics }}
+            {{ $id := printf "%s-characteristics" $id }}
+            <div class="mt-3">
+              <span>
+                {{ partial "heading.html" (dict "text" "Characteristics" "level" 4 "id" $id) }}
+              </span>
 
-        <div class="mt-2 flex flex-col divide-y border rounded-sm dark:border-gray-700 dark:divide-gray-700">
-          {{ range . }}
-          <div class="py-2 px-4">
-            <span class="font-semibold">
-              {{ partial "heading.html" (dict "text" .title "level" 5) }}
-            </span>
+              <div class="mt-2 flex flex-col divide-y border rounded-sm dark:border-gray-700 dark:divide-gray-700">
+                {{ range . }}
+                  <div class="py-2 px-4">
+                    <span class="font-semibold">
+                      {{ partial "heading.html" (dict "text" .title "level" 5) }}
+                    </span>
 
-            <div class="mt-2 prose prose-sm dark:prose-dark max-w-none">
-              {{ .description | markdownify }}
+                    <div class="mt-2 prose prose-sm dark:prose-dark max-w-none">
+                      {{ .description | markdownify }}
+                    </div>
+                  </div>
+                {{ end }}
+              </div>
             </div>
-          </div>
           {{ end }}
         </div>
-      </div>
       {{ end }}
     </div>
-    {{ end }}
-  </div>
   {{ end }}
 
   {{/* VRL features */}}
   {{ with .vrl_features }}
-  <div class="flex flex-col divide-y dark:divide-gray-700">
-    {{ range . }}
-    {{ $id := .anchor }}
-    <div class="py-3 px-5">
-      <span>
-        {{ partial "heading.html" (dict "text" .title "level" 3) }}
-      </span>
+    <div class="flex flex-col divide-y dark:divide-gray-700">
+      {{ range . }}
+        {{ $id := .anchor }}
+        <div class="py-3 px-5">
+          <span>
+            {{ partial "heading.html" (dict "text" .title "level" 3) }}
+          </span>
 
-      <div class="mt-3 prose dark:prose-dark max-w-none">
-        {{ .description | markdownify }}
-      </div>
+          <div class="mt-3 prose dark:prose-dark max-w-none">
+            {{ .description | markdownify }}
+          </div>
 
-      {{ with .characteristics }}
-      {{ $id := printf "%s-characteristics" $id }}
-      <div class="mt-3">
-        <span>
-          {{ partial "heading.html" (dict "text" "Characteristics" "level" 4) }}
-        </span>
+          {{ with .characteristics }}
+            {{ $id := printf "%s-characteristics" $id }}
+            <div class="mt-3">
+              <span>
+                {{ partial "heading.html" (dict "text" "Characteristics" "level" 4) }}
+              </span>
+
+              <div class="mt-2 flex flex-col space-y-2">
+                {{ range . }}
+                  <div>
+                    {{ partial "heading.html" (dict "text" .title "level" 5) }}
 
-        <div class="mt-2 flex flex-col space-y-2">
-          {{ range . }}
-          <div>
-            {{ partial "heading.html" (dict "text" .title "level" 5) }}
 
-            <div class="mt-2 prose prose-sm dark:prose-dark max-w-none">
-              {{ .description | markdownify }}
+                    <div class="mt-2 prose prose-sm dark:prose-dark max-w-none">
+                      {{ .description | markdownify }}
+                    </div>
+                  </div>
+                {{ end }}
+              </div>
             </div>
-          </div>
           {{ end }}
         </div>
-      </div>
       {{ end }}
     </div>
-    {{ end }}
-  </div>
   {{ end }}
 
   {{/* VRL principles */}}
   {{ with .vrl_principles }}
-  <div class="flex flex-col divide-y dark:divide-gray-700">
-    {{ range . }}
-    <div class="py-4 px-6">
-      <span>
-        {{ partial "heading.html" (dict "text" .title "level" 3) }}
-      </span>
+    <div class="flex flex-col divide-y dark:divide-gray-700">
+      {{ range . }}
+        <div class="py-4 px-6">
+          <span>
+            {{ partial "heading.html" (dict "text" .title "level" 3) }}
+          </span>
 
-      <div class="mt-3 prose dark:prose-dark max-w-none">
-        {{ .description | markdownify }}
-      </div>
+          <div class="mt-3 prose dark:prose-dark max-w-none">
+            {{ .description | markdownify }}
+          </div>
+        </div>
+      {{ end }}
     </div>
-    {{ end }}
-  </div>
   {{ end }}
 
   {{/* Vector process */}}
   {{ with .process }}
-  <div class="flex flex-col divide-y dark:divide-gray-700">
-    {{/* Signals */}}
-    <div class="py-3 px-5">
-      <span>
-        {{ partial "heading.html" (dict "text" "Signals" "level" 3 "anchor" true) }}
-      </span>
-
-      <div class="my-4 prose dark:prose-dark max-w-none leading-snug">
-        {{ .process_signals.description | markdownify }}
-      </div>
-
-      <div class="mt-2 prose dark:prose-dark max-w-none">
-        <table>
-          <thead>
-            <tr>
-              <th>
-                Signal
-              </th>
-              <th>
-                Description
-              </th>
-            </tr>
-          </thead>
-          <tbody>
-            {{ range .process_signals.signals }}
-            <tr>
-              <td>
-                <code>{{ .name }}</code>
-              </td>
-              <td>
-                {{ .description | markdownify }}
-              </td>
-            </tr>
-            {{ end }}
-          </tbody>
-        </table>
-      </div>
-    </div>
-
-    {{/* Exit codes */}}
-    <div class="py-3 px-5">
-      <span>
-        {{ partial "heading.html" (dict "text" "Exit codes" "level" 3 "anchor" true) }}
-      </span>
+    <div class="flex flex-col divide-y dark:divide-gray-700">
+      {{/* Signals */}}
+      <div class="py-3 px-5">
+        <span>
+          {{ partial "heading.html" (dict "text" "Signals" "level" 3 "anchor" true) }}
+        </span>
 
-      <div class="my-4 prose dark:prose-dark max-w-none leading-snug">
-        {{ .exit_codes.description | markdownify }}
-      </div>
+        <div class="my-4 prose dark:prose-dark max-w-none leading-snug">
+          {{ .process_signals.description | markdownify }}
+        </div>
 
-      <div class="prose dark:prose-dark max-w-none">
-        <table>
-          <thead>
-            <tr>
-              <th>
-                Code
-              </th>
-              <th>
-                Description
-              </th>
-            </tr>
-          </thead>
-          <tbody>
-            {{ range .exit_codes.codes }}
-            <tr>
-              <td>
-                <code>{{ .code }}</code>
-              </td>
-              <td>
-                {{ .description | markdownify }}
-              </td>
-            </tr>
-            {{ end }}
-          </tbody>
-        </table>
+        <div class="mt-2 prose dark:prose-dark max-w-none">
+          <table>
+            <thead>
+              <tr>
+                <th>Signal</th>
+                <th>Description</th>
+              </tr>
+            </thead>
+            <tbody>
+              {{ range .process_signals.signals }}
+                <tr>
+                  <td>
+                    <code>{{ .name }}</code>
+                  </td>
+                  <td>
+                    {{ .description | markdownify }}
+                  </td>
+                </tr>
+              {{ end }}
+            </tbody>
+          </table>
+        </div>
       </div>
-    </div>
-  </div>
-  {{ end }}
-
-  {{ with .component_permissions }}
-  <div class="flex flex-col divide-y dark:divide-gray-700">
-    {{ range . }} {{/* TODO: remove the need for this double loop in the CUE sources */}}
-    {{ range . }}
-    <div class="py-3 px-5">
-      <span class="text-lg">
-        Platform:
-        <a href="{{ .platform_link }}">
-          <strong>
-            {{ .platform_title }}
-          </strong>
-        </a>
-      </span>
 
-      <div class="mt-2">
-        <span class="text-md">
-          Relevant policies
+      {{/* Exit codes */}}
+      <div class="py-3 px-5">
+        <span>
+          {{ partial "heading.html" (dict "text" "Exit codes" "level" 3 "anchor" true) }}
         </span>
 
-        <div class="p-3 prose dark:prose-dark max-w-none">
+        <div class="my-4 prose dark:prose-dark max-w-none leading-snug">
+          {{ .exit_codes.description | markdownify }}
+        </div>
+
+        <div class="prose dark:prose-dark max-w-none">
           <table>
             <thead>
               <tr>
-                <th>
-                  Policy
-                </th>
-                <th>
-                  Required for
-                </th>
-                <th>
-                  Required when
-                </th>
+                <th>Code</th>
+                <th>Description</th>
               </tr>
             </thead>
             <tbody>
-              {{ range .policies }}
-              <tr>
-                <td>
-                  <a href="{{ .docs_url }}">
-                    <code>
-                      {{ .action }}
-                    </code>
-                  </a>
-                </td>
-                <td>
-                  <ul>
-                    {{ range .required_for }}<li><code>{{ . }}</code></li>{{ end }}
-                  </ul>
-                </td>
-                <td>
-                  {{ .required_when | markdownify }}
-                </td>
-              </tr>
+              {{ range .exit_codes.codes }}
+                <tr>
+                  <td>
+                    <code>{{ .code }}</code>
+                  </td>
+                  <td>
+                    {{ .description | markdownify }}
+                  </td>
+                </tr>
               {{ end }}
             </tbody>
           </table>
         </div>
       </div>
     </div>
-    {{ end }}
-    {{ end }}
-  </div>
+  {{ end }}
+
+  {{ with .component_permissions }}
+    <div class="flex flex-col divide-y dark:divide-gray-700">
+      {{ range . }}
+        {{/* TODO: remove the need for this double loop in the CUE sources */}}
+        {{ range . }}
+          <div class="py-3 px-5">
+            <span class="text-lg">
+              Platform:
+              <a href="{{ .platform_link }}">
+                <strong>
+                  {{ .platform_title }}
+                </strong>
+              </a>
+            </span>
+
+            <div class="mt-2">
+              <span class="text-md"> Relevant policies </span>
+
+              <div class="p-3 prose dark:prose-dark max-w-none">
+                <table>
+                  <thead>
+                    <tr>
+                      <th>Policy</th>
+                      <th>Required for</th>
+                      <th>Required when</th>
+                    </tr>
+                  </thead>
+                  <tbody>
+                    {{ range .policies }}
+                      <tr>
+                        <td>
+                          <a href="{{ .docs_url }}">
+                            <code>
+                              {{ .action }}
+                            </code>
+                          </a>
+                        </td>
+                        <td>
+                          <ul>
+                            {{ range .required_for }}<li><code>{{ . }}</code></li>{{ end }}
+                          </ul>
+                        </td>
+                        <td>
+                          {{ .required_when | markdownify }}
+                        </td>
+                      </tr>
+                    {{ end }}
+                  </tbody>
+                </table>
+              </div>
+            </div>
+          </div>
+        {{ end }}
+      {{ end }}
+    </div>
   {{ end }}
 </div>
 
 {{ define "enum-options-table" }}
-<table class="table-auto">
-  <thead>
-    <tr>
-      <th>
-        Option
-      </th>
-      <th>
-        Description
-      </th>
-    </tr>
-  </thead>
-  <tbody>
-    {{ range $k, $v := . }}
-    <tr>
-      <td>
-        <code>{{ $k }}</code>
-      </td>
-      <td>
-        {{ $v | markdownify }}
-      </td>
-    </tr>
-    {{ end }}
-  </tbody>
-</table>
+  <table class="table-auto">
+    <thead>
+      <tr>
+        <th>Option</th>
+        <th>Description</th>
+      </tr>
+    </thead>
+    <tbody>
+      {{ range $k, $v := . }}
+        <tr>
+          <td>
+            <code>{{ $k }}</code>
+          </td>
+          <td>
+            {{ $v | markdownify }}
+          </td>
+        </tr>
+      {{ end }}
+    </tbody>
+  </table>
 {{ end }}
 
 {{ define "config-examples" }}
-<div x-data="{ open: false }" class="mt-2.5 border rounded py-2 px-3 dark:border-gray-700">
-  <span class="flex justify-between items-center">
-    <span class="text-sm">
-      Examples
-    </span>
+  <div x-data="{ open: false }" class="mt-2.5 border rounded py-2 px-3 dark:border-gray-700">
+    <span class="flex justify-between items-center">
+      <span class="text-sm"> Examples </span>
 
-    {{ template "config-toggler" (dict "size" 4) }}
-  </span>
+      {{ template "config-toggler" (dict "size" 4) }}
+    </span>
 
-  <div x-show="open" class="mt-3 text-sm flex flex-col space-y-2">
-    {{ range .examples }}
-    {{ $json := . | jsonify (dict "indent" "  ") }}
-    {{ highlight $json "json" "" }}
-    {{ end }}
+    <div x-show="open" class="mt-3 text-sm flex flex-col space-y-2">
+      {{ range .examples }}
+        {{ $json := . | jsonify (dict "indent" "  ") }}
+        {{ highlight $json "json" "" }}
+      {{ end }}
+    </div>
   </div>
-</div>
 {{ end }}
 
 {{ define "config-array-examples" }}
-{{ $json := .examples | jsonify (dict "indent" "  ") }}
-<div x-data="{ open: false }" class="mt-2 border rounded py-2 px-3 dark:border-gray-700">
-  <span class="flex justify-between items-center">
-    <span class="text-sm">
-      Examples
-    </span>
+  {{ $json := .examples | jsonify (dict "indent" "  ") }}
+  <div x-data="{ open: false }" class="mt-2 border rounded py-2 px-3 dark:border-gray-700">
+    <span class="flex justify-between items-center">
+      <span class="text-sm"> Examples </span>
 
-    {{ template "config-toggler" (dict "size" 4) }}
-  </span>
+      {{ template "config-toggler" (dict "size" 4) }}
+    </span>
 
-  <div x-show="open" class="mt-3 text-sm flex flex-col space-y-2">
-    {{ highlight $json "json" "" }}
+    <div x-show="open" class="mt-3 text-sm flex flex-col space-y-2">
+      {{ highlight $json "json" "" }}
+    </div>
   </div>
-</div>
 {{ end }}
 
 {{ define "config-toggler" }}
-{{ $size := .size | default 4 }}
-<a @click="open = !open" class="cursor-pointer">
-  {{/* Heroicon: outline/chevron-down */}}
-  <svg x-show="!open" xmlns="http://www.w3.org/2000/svg" class="h-{{ $size }} w-{{ $size }}" fill="none"
-    viewBox="0 0 24 24" stroke="currentColor">
-    <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M19 9l-7 7-7-7" />
-  </svg>
-
-  {{/* Heroicon: outline/chevron-up */}}
-  <svg x-show="open" xmlns="http://www.w3.org/2000/svg" class="h-{{ $size }} w-{{ $size }}" fill="none"
-    viewBox="0 0 24 24" stroke="currentColor">
-    <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M5 15l7-7 7 7" />
-  </svg>
-</a>
+  {{ $size := .size | default 4 }}
+  <a @click="open = !open" class="cursor-pointer">
+    {{/* Heroicon: outline/chevron-down */}}
+    <svg
+      x-show="!open"
+      xmlns="http://www.w3.org/2000/svg"
+      class="h-{{ $size }} w-{{ $size }}"
+      fill="none"
+      viewBox="0 0 24 24"
+      stroke="currentColor"
+    >
+      <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M19 9l-7 7-7-7" />
+    </svg>
+
+    {{/* Heroicon: outline/chevron-up */}}
+    <svg
+      x-show="open"
+      xmlns="http://www.w3.org/2000/svg"
+      class="h-{{ $size }} w-{{ $size }}"
+      fill="none"
+      viewBox="0 0 24 24"
+      stroke="currentColor"
+    >
+      <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M5 15l7-7 7 7" />
+    </svg>
+  </a>
 {{ end }}
 
 {{ define "default" }}
-<div class="flex flex-row-reverse">
-  <span class="text-sm">
-    <span class="font-semibold">default:</span>
-    <code>{{ .default }}</code>{{ with .unit }} ({{ . }}){{ end }}
-  </span>
-</div>
+  <div class="flex flex-row-reverse">
+    <span class="text-sm">
+      <span class="font-semibold">default:</span>
+      <code>{{ .default }}</code>{{ with .unit }}({{ . }}){{ end }}
+    </span>
+  </div>
 {{ end }}
 
 {{ define "vrl-function-example" }}
-{{ $id := printf "%s-examples-%s" .name (.ctx.title | urlize) }}
-<div>
-  <span>
-    {{ partial "heading.html" (dict "text" .ctx.title "level" 5 "id" $id "toc_hide" true) }}
-  </span>
-
-  <div class="flex flex-col space-y-2">
-    <div>
-      <span class="font-light">
-        Source
-      </span>
+  {{ $id := printf "%s-examples-%s" .name (.ctx.title | urlize) }}
+  <div>
+    <span>
+      {{ partial "heading.html" (dict "text" .ctx.title "level" 5 "id" $id "toc_hide" true) }}
+    </span>
+
+    <div class="flex flex-col space-y-2">
+      <div>
+        <span class="font-light"> Source </span>
 
-      <div class="text-sm">
-        {{ template "code" .ctx.source }}
+        <div class="text-sm">
+          {{ template "code" .ctx.source }}
+        </div>
       </div>
-    </div>
 
-    {{ with .ctx.return }}
-    <div>
-      <span class="font-light">
-        Return
-      </span>
+      {{ with .ctx.return }}
+        <div>
+          <span class="font-light"> Return </span>
 
-      <div class="text-sm">
-        {{ template "code" . }}
-      </div>
+          <div class="text-sm">
+            {{ template "code" . }}
+          </div>
+        </div>
+      {{ end }}
     </div>
-    {{ end }}
   </div>
-</div>
 {{ end }}
 
 {{ define "vrl-function-legend" }}
-{{/* Heroicon: outline/map */}}
-<div class="flex items-center space-x-2">
-  <svg xmlns="http://www.w3.org/2000/svg" class="text-gray-400 dark:text-gray-300 h-4 w-4" fill="none"
-    viewBox="0 0 24 24" stroke="currentColor">
-    <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2"
-      d="M9 20l-5.447-2.724A1 1 0 013 16.382V5.618a1 1 0 011.447-.894L9 7m0 13l6-3m-6 3V7m6 10l4.553 2.276A1 1 0 0021 18.382V7.618a1 1 0 00-.553-.894L15 4m0 13V4m0 0L9 7" />
-  </svg>
-
-  <span class="font-mono text-xs text-secondary dark:text-primary font-semibold">
-    required
-  </span>
-
-  <span class="font-mono text-xs text-indigo-500 dark:text-indigo-300 font-semibold">
-    optional
-  </span>
-
-  <span class="font-mono text-xs text-gray-500 dark:text-gray-300 font-semibold">
-    &lt;types | ...&gt;
-  </span>
-</div>
+  {{/* Heroicon: outline/map */}}
+  <div class="flex items-center space-x-2">
+    <svg
+      xmlns="http://www.w3.org/2000/svg"
+      class="text-gray-400 dark:text-gray-300 h-4 w-4"
+      fill="none"
+      viewBox="0 0 24 24"
+      stroke="currentColor"
+    >
+      <path
+        stroke-linecap="round"
+        stroke-linejoin="round"
+        stroke-width="2"
+        d="M9 20l-5.447-2.724A1 1 0 013 16.382V5.618a1 1 0 011.447-.894L9 7m0 13l6-3m-6 3V7m6 10l4.553 2.276A1 1 0 0021 18.382V7.618a1 1 0 00-.553-.894L15 4m0 13V4m0 0L9 7"
+      />
+    </svg>
+
+    <span class="font-mono text-xs text-secondary dark:text-primary font-semibold"> required </span>
+
+    <span class="font-mono text-xs text-indigo-500 dark:text-indigo-300 font-semibold"> optional </span>
+
+    <span class="font-mono text-xs text-gray-500 dark:text-gray-300 font-semibold"> &lt;types | ...&gt; </span>
+  </div>
 {{ end }}
 
 {{ define "vrl-function-arg-row" }}
-{{ $color := cond .required "text-secondary dark:text-primary" "text-indigo-500 dark:text-indigo-300" }}
-<tr>
-  <td>
-    <span class="font-mono {{ $color }}{{ if .required }} font-bold{{ end }}">
-      {{ .name }}
-    </span>
-  </td>
-  <td>
-    <span class="font-mono">
-      {{ range .type }}
-      {{ . }}<br />
+  {{ $color := cond .required "text-secondary dark:text-primary" "text-indigo-500 dark:text-indigo-300" }}
+  <tr>
+    <td>
+      <span class="font-mono {{ $color }}{{ if .required }}font-bold{{ end }}">
+        {{ .name }}
+      </span>
+    </td>
+    <td>
+      <span class="font-mono">
+        {{ range .type }}
+          {{ . }}<br />
+        {{ end }}
+      </span>
+    </td>
+    <td class="leading-snug">
+      {{ .description | markdownify }}
+    </td>
+    <td class="overflow-auto">
+      {{ with .default }}
+        <code>{{ . }}</code>
       {{ end }}
-    </span>
-  </td>
-  <td class="leading-snug">
-    {{ .description | markdownify }}
-  </td>
-  <td class="overflow-auto">
-    {{ with .default }}
-    <code>{{ . }}</code>
-    {{ end }}
-  </td>
-  <td>
-    {{ if .required }}
-    <span>yes</span>
-    {{ else }}
-    <span>no</span>
-    {{ end }}
-  </td>
-</tr>
+    </td>
+    <td>
+      {{ if .required }}
+        <span>yes</span>
+      {{ else }}
+        <span>no</span>
+      {{ end }}
+    </td>
+  </tr>
 {{ end }}
 
 {{ define "vrl-function-args" }}
-{{ $required := where . "required" true }}
-{{ $optional := where . "required" false }}
-<table class="table-fixed">
-  <thead>
-    <tr>
-      <th class="w-1/6">
-        Argument
-      </th>
-      <th class="w-1/6">
-        Type
-      </th>
-      <th class="w-1/2">
-        Description
-      </th>
-      <th class="w-1/6">
-        Default
-      </th>
-      <th>
-        Required?
-      </th>
-    </tr>
-  </thead>
-  <tbody>
-    {{ range $required }}
-    {{ template "vrl-function-arg-row" . }}
-    {{ end }}
+  {{ $required := where . "required" true }}
+  {{ $optional := where . "required" false }}
+  <table class="table-fixed">
+    <thead>
+      <tr>
+        <th class="w-1/6">Argument</th>
+        <th class="w-1/6">Type</th>
+        <th class="w-1/2">Description</th>
+        <th class="w-1/6">Default</th>
+        <th>Required?</th>
+      </tr>
+    </thead>
+    <tbody>
+      {{ range $required }}
+        {{ template "vrl-function-arg-row" . }}
+      {{ end }}
 
-    {{ range $optional }}
-    {{ template "vrl-function-arg-row" . }}
-    {{ end }}
-  </tbody>
-</table>
+      {{ range $optional }}
+        {{ template "vrl-function-arg-row" . }}
+      {{ end }}
+    </tbody>
+  </table>
 {{ end }}
 
 {{ define "vrl-toggler" }}
-<button @click="open = !open">
-  {{/* Heroicon: outline/chevron-down */}}
-  <svg x-show="!open" xmlns="http://www.w3.org/2000/svg"
-    class="h-4 w-4 text-gray-600 dark:text-gray-400 hover:text-secondary dark:hover:text-primary" fill="none"
-    viewBox="0 0 24 24" stroke="currentColor">
-    <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M19 9l-7 7-7-7" />
-  </svg>
-
-  {{/* Heroicon: outline/chevron-up */}}
-  <svg x-show="open" xmlns="http://www.w3.org/2000/svg"
-    class="h-4 w-4 text-gray-600 dark:text-gray-400 hover:text-secondary dark:hover:text-primary" fill="none"
-    viewBox="0 0 24 24" stroke="currentColor">
-    <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M5 15l7-7 7 7" />
-  </svg>
-</button>
+  <button @click="open = !open">
+    {{/* Heroicon: outline/chevron-down */}}
+    <svg
+      x-show="!open"
+      xmlns="http://www.w3.org/2000/svg"
+      class="h-4 w-4 text-gray-600 dark:text-gray-400 hover:text-secondary dark:hover:text-primary"
+      fill="none"
+      viewBox="0 0 24 24"
+      stroke="currentColor"
+    >
+      <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M19 9l-7 7-7-7" />
+    </svg>
+
+    {{/* Heroicon: outline/chevron-up */}}
+    <svg
+      x-show="open"
+      xmlns="http://www.w3.org/2000/svg"
+      class="h-4 w-4 text-gray-600 dark:text-gray-400 hover:text-secondary dark:hover:text-primary"
+      fill="none"
+      viewBox="0 0 24 24"
+      stroke="currentColor"
+    >
+      <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M5 15l7-7 7 7" />
+    </svg>
+  </button>
 {{ end }}
 
 {{ define "vrl-data-example" }}
-{{ $id := printf "%s-example-%s" .name (urlize .ctx.title) }}
-<div class="py-3 px-5">
-  {{ with .ctx.title }}
-  {{ partial "heading.html" (dict "text" . "level" 5 "id" $id "bold" true) }}
-  {{ end }}
+  {{ $id := printf "%s-example-%s" .name (urlize .ctx.title) }}
+  <div class="py-3 px-5">
+    {{ with .ctx.title }}
+      {{ partial "heading.html" (dict "text" . "level" 5 "id" $id "bold" true) }}
+    {{ end }}
 
-  <div class="mt-3 flex flex-col space-y-2.5">
-    {{ with .ctx.input }}
-    <div>
-      <span class="font-semibold text-gray-600 dark:text-gray-300">
-        Vector event
-      </span>
 
-      <div class="mt-2">
-        {{ template "code" . }}
-      </div>
-    </div>
-    {{ end }}
+    <div class="mt-3 flex flex-col space-y-2.5">
+      {{ with .ctx.input }}
+        <div>
+          <span class="font-semibold text-gray-600 dark:text-gray-300"> Vector event </span>
 
-    {{ with .ctx.source }}
-    <div>
-      <span class="font-semibold text-gray-600 dark:text-gray-300">
-        VRL program
-      </span>
+          <div class="mt-2">
+            {{ template "code" . }}
+          </div>
+        </div>
+      {{ end }}
 
-      <div class="mt-2">
-        {{ template "code" . }}
-      </div>
-    </div>
-    {{ end }}
+      {{ with .ctx.source }}
+        <div>
+          <span class="font-semibold text-gray-600 dark:text-gray-300"> VRL program </span>
 
-    {{ with .ctx.return }}
-    <div>
-      <span class="font-semibold text-gray-600 dark:text-gray-300">
-        Resulting event
-      </span>
+          <div class="mt-2">
+            {{ template "code" . }}
+          </div>
+        </div>
+      {{ end }}
 
-      <div class="mt-2">
-        {{ template "code" . }}
-      </div>
+      {{ with .ctx.return }}
+        <div>
+          <span class="font-semibold text-gray-600 dark:text-gray-300"> Resulting event </span>
+
+          <div class="mt-2">
+            {{ template "code" . }}
+          </div>
+        </div>
+      {{ end }}
     </div>
-    {{ end }}
   </div>
-</div>
 {{ end }}
 
 {{ define "config-object" }}
-{{ $prefix := .name }}
-{{ $level := .level }}
-{{ $innerLevel := add $level 1 }}
-<div class="border dark:border-gray-700 rounded flex flex-col divide-y dark:divide-gray-700">
-  {{ range $k, $v := .config.options }}
-  {{ $name := printf "%s.%s" $prefix $k }}
-  <div class="py-3 px-4">
-    <div class="flex justify-between items-center">
-      <span>
-        {{ partial "heading.html" (dict "text" $name "level" $level "anchor" true "icon" false "mono" true) }}
-      </span>
+  {{ $prefix := .name }}
+  {{ $level := .level }}
+  {{ $innerLevel := add $level 1 }}
+  <div class="border dark:border-gray-700 rounded flex flex-col divide-y dark:divide-gray-700">
+    {{ range $k, $v := .config.options }}
+      {{ $name := printf "%s.%s" $prefix $k }}
+      <div class="py-3 px-4">
+        <div class="flex justify-between items-center">
+          <span>
+            {{ partial "heading.html" (dict "text" $name "level" $level "anchor" true "icon" false "mono" true) }}
+          </span>
 
-      <span class="flex space-x-1">
-        {{ if $v.common }}
-        {{ partial "badge.html" (dict "word" "common" "color" "blue") }}
-        {{ end }}
+          <span class="flex space-x-1">
+            {{ if $v.common }}
+              {{ partial "badge.html" (dict "word" "common" "color" "blue") }}
+            {{ end }}
 
-        {{ if $v.required }}
-        {{ partial "badge.html" (dict "word" "required" "color" "red") }}
-        {{ else }}
-        {{ partial "badge.html" (dict "word" "optional" "color" "blue") }}
-        {{ end }}
+            {{ if $v.required }}
+              {{ partial "badge.html" (dict "word" "required" "color" "red") }}
+            {{ else }}
+              {{ partial "badge.html" (dict "word" "optional" "color" "blue") }}
+            {{ end }}
 
-        {{ range $k, $v := $v.type }}
-        {{ $isArray := eq $k "array" }}
-        {{ if $isArray }}
-        {{ range $k, $v := $v.items.type }}
-        {{ $name := printf "[%s]" $k }}
-        {{ partial "badge.html" (dict "word" $name "color" "gray") }}
-        {{ end }}
-        {{ else }}
-        {{ partial "badge.html" (dict "word" $k "color" "gray") }}
-        {{ end }}
+            {{ range $k, $v := $v.type }}
+              {{ $isArray := eq $k "array" }}
+              {{ if $isArray }}
+                {{ range $k, $v := $v.items.type }}
+                  {{ $name := printf "[%s]" $k }}
+                  {{ partial "badge.html" (dict "word" $name "color" "gray") }}
+                {{ end }}
+              {{ else }}
+                {{ partial "badge.html" (dict "word" $k "color" "gray") }}
+              {{ end }}
 
-        {{ with $v.syntax }}
-        {{ if eq . "remap_program" }}
-        {{ partial "badge.html" (dict "word" . "color" "gray" "href" "/docs/reference/vrl#program") }}
-        {{ else if eq . "template" }}
-        {{ partial "badge.html" (dict "word" . "color" "gray" "href" "/docs/reference/configuration/template-syntax/") }}
-        {{ else }}
-        {{ partial "badge.html" (dict "word" . "color" "gray") }}
-        {{ end }}
-        {{ end }}
+              {{ with $v.syntax }}
+                {{ if eq . "remap_program" }}
+                  {{ partial "badge.html" (dict "word" . "color" "gray" "href" "/docs/reference/vrl#program") }}
+                {{ else if eq . "template" }}
+                  {{ partial "badge.html" (dict "word" . "color" "gray" "href" "/docs/reference/configuration/template-syntax/") }}
+                {{ else }}
+                  {{ partial "badge.html" (dict "word" . "color" "gray") }}
+                {{ end }}
+              {{ end }}
 
-        {{ if $v.enum }}
-        {{ partial "badge.html" (dict "word" "enum" "color" "yellow") }}
-        {{ end }}
-        {{ end }}
-      </span>
-    </div>
+              {{ if $v.enum }}
+                {{ partial "badge.html" (dict "word" "enum" "color" "yellow") }}
+              {{ end }}
+            {{ end }}
+          </span>
+        </div>
 
-    <div class="mt-4 prose dark:prose-dark max-w-none leading-snug">
-      {{ $v.description | markdownify }}
-    </div>
+        <div class="mt-4 prose dark:prose-dark max-w-none leading-snug">
+          {{ $v.description | markdownify }}
+        </div>
 
-    {{ if eq $v.type.string.syntax "template" }}
-    <div class="mt-4 text-sm">
-      <strong>Note</strong>: This parameter supports Vector's
-      <a href="/docs/reference/configuration/template-syntax">template syntax</a>, which enables you to use
-      dynamic per-event values.
-    </div>
-    {{ end }}
+        {{ if eq $v.type.string.syntax "template" }}
+          <div class="mt-4 text-sm">
+            <strong>Note</strong>: This parameter supports Vector's
+            <a href="/docs/reference/configuration/template-syntax">template syntax</a>, which enables you to use
+            dynamic per-event values.
+          </div>
+        {{ end }}
 
-    {{ with $v.relevant_when }}
-    <div class="mt-2">
-      <span>
-        Relevant when: <code>{{ . }}</code>
-      </span>
-    </div>
-    {{ end }}
+        {{ with $v.relevant_when }}
+          <div class="mt-2">
+            <span> Relevant when: <code>{{ . }}</code> </span>
+          </div>
+        {{ end }}
 
-    {{ range $k, $v := $v.type }}
-    {{ if eq $k "object" }}
-    <div class="mt-4">
-      {{ template "config-object" (dict "name" $name "config" $v "level" $innerLevel) }}
-    </div>
-    {{ end }}
+        {{ range $k, $v := $v.type }}
+          {{ if eq $k "object" }}
+            <div class="mt-4">
+              {{ template "config-object" (dict "name" $name "config" $v "level" $innerLevel) }}
+            </div>
+          {{ end }}
 
-    {{ if eq $k "condition" }}
-    {{ template "config-condition" (dict "name" "*" "condition" $v) }}
-    {{ end }}
+          {{ if eq $k "condition" }}
+            {{ template "config-condition" (dict "name" "*" "condition" $v) }}
+          {{ end }}
 
-    {{ with $v.enum }}
-    <div class="mt-4">
-      <span class="font-semibold">
-        Enum options
-      </span>
+          {{ with $v.enum }}
+            <div class="mt-4">
+              <span class="font-semibold"> Enum options </span>
 
-      <div class="mt-2 prose dark:prose-dark max-w-none">
-        {{ template "enum-options-table" . }}
-      </div>
-    </div>
-    {{ end }}
+              <div class="mt-2 prose dark:prose-dark max-w-none">
+                {{ template "enum-options-table" . }}
+              </div>
+            </div>
+          {{ end }}
 
-    {{ with $v.examples }}
-    {{ template "config-examples" (dict "examples" .) }}
-    {{ end }}
+          {{ with $v.examples }}
+            {{ template "config-examples" (dict "examples" .) }}
+          {{ end }}
 
-    {{ if or $v.default (eq $v.default false) }}
-    <div class="mt-4">
-      {{ template "default" . }}
-    </div>
-    {{ end }}
+          {{ if or $v.default (eq $v.default false) }}
+            <div class="mt-4">
+              {{ template "default" . }}
+            </div>
+          {{ end }}
+        {{ end }}
+      </div>
     {{ end }}
   </div>
-  {{ end }}
-</div>
 {{ end }}
 
 {{ define "code" }}
-{{ if reflect.IsMap . }} {{/* If a map or array, highlight as JSON */}}
-{{ $json := . | jsonify (dict "indent" "  ") }}
-{{ highlight $json "json" "" }}
-{{ else if reflect.IsSlice . }}
-{{ $json := . | jsonify }}
-{{ highlight $json "json" "" }}
-{{ else if hasPrefix . "```" }} {{/* If a code sample, translate into Markdown */}}
-{{ . | markdownify }}
-{{ else }} {{/* If just a plain old string, use Ruby syntax highlighting as a best guess */}}
-{{ highlight . "ruby" "" }}
-{{ end }}
+  {{ if reflect.IsMap . }}
+    {{/* If a map or array, highlight as JSON */}}
+    {{ $json := . | jsonify (dict "indent" "  ") }}
+    {{ highlight $json "json" "" }}
+  {{ else if reflect.IsSlice . }}
+    {{ $json := . | jsonify }}
+    {{ highlight $json "json" "" }}
+  {{ else if hasPrefix . "```" }}
+    {{/* If a code sample, translate into Markdown */}}
+    {{ . | markdownify }}
+  {{ else }}
+    {{/* If just a plain old string, use Ruby syntax highlighting as a best guess */}}
+    {{ highlight . "ruby" "" }}
+  {{ end }}
 {{ end }}
 
 {{ define "config-condition" }}
-{{ $configName := .name }}
-<div class="mt-4">
-  <div class="border rounded dark:border-gray-700 divide-y dark:divide-gray-700">
-    {{ range $k, $v := .condition.options }}
-    {{ $id := printf "%s.%s" $configName $k }}
-    <div class="py-3 px-5">
-      <div>
-        {{ partial "heading.html" (dict "text" $id "level" 4 "mono" true) }}
-      </div>
+  {{ $configName := .name }}
+  <div class="mt-4">
+    <div class="border rounded dark:border-gray-700 divide-y dark:divide-gray-700">
+      {{ range $k, $v := .condition.options }}
+        {{ $id := printf "%s.%s" $configName $k }}
+        <div class="py-3 px-5">
+          <div>
+            {{ partial "heading.html" (dict "text" $id "level" 4 "mono" true) }}
+          </div>
 
-      <div class="mt-2 prose dark:prose-dark max-w-none">
-        {{ $v.description | markdownify }}
-      </div>
+          <div class="mt-2 prose dark:prose-dark max-w-none">
+            {{ $v.description | markdownify }}
+          </div>
+        </div>
+      {{ end }}
     </div>
-    {{ end }}
-  </div>
-
-  <div class="my-4 ml-2">
-    <span>
-      {{ partial "heading.html" (dict "text" "Available syntaxes" "level" 3 "icon" false "toc_hide" true) }}
-    </span>
-
-    <table class="table-auto">
-      <thead>
-        <tr>
-          <th>
-            Syntax
-          </th>
-          <th>
-            Description
-          </th>
-          <th>
-            Example
-          </th>
-        </tr>
-      </thead>
-      <tbody>
-        {{ range .condition.syntaxes }}
-        <tr>
-          <td>
-            <code>
-              {{ .name }}
-            </code>
-          </td>
-          <td>
-            {{ .description | markdownify }}
-          </td>
-          <td>
-            <code>{{ .example }}</code>
-          </td>
-        </tr>
-        {{ end }}
-      </tbody>
-    </table>
 
-    <div class="py-3 px-5 border rounded-md border-green-500">
+    <div class="my-4 ml-2">
       <span>
-        {{ partial "heading.html" (dict "text" .condition.shorthand_explainer.title "level" 3 "icon" false "toc_hide" true) }}
+        {{ partial "heading.html" (dict "text" "Available syntaxes" "level" 3 "icon" false "toc_hide" true) }}
       </span>
 
-      <div class="mt-2 prose dark:prose-dark max-w-none">
-        {{ .condition.shorthand_explainer.description | markdownify }}
+      <table class="table-auto">
+        <thead>
+          <tr>
+            <th>Syntax</th>
+            <th>Description</th>
+            <th>Example</th>
+          </tr>
+        </thead>
+        <tbody>
+          {{ range .condition.syntaxes }}
+            <tr>
+              <td>
+                <code>
+                  {{ .name }}
+                </code>
+              </td>
+              <td>
+                {{ .description | markdownify }}
+              </td>
+              <td>
+                <code>{{ .example }}</code>
+              </td>
+            </tr>
+          {{ end }}
+        </tbody>
+      </table>
+
+      <div class="py-3 px-5 border rounded-md border-green-500">
+        <span>
+          {{ partial "heading.html" (dict "text" .condition.shorthand_explainer.title "level" 3 "icon" false "toc_hide" true) }}
+        </span>
+
+        <div class="mt-2 prose dark:prose-dark max-w-none">
+          {{ .condition.shorthand_explainer.description | markdownify }}
+        </div>
       </div>
-    </div>
 
-    <div class="mt-4">
-      <span>
-        {{ partial "heading.html" (dict "text" "Condition config examples" "level" 3) }}
-      </span>
+      <div class="mt-4">
+        <span>
+          {{ partial "heading.html" (dict "text" "Condition config examples" "level" 3) }}
+        </span>
 
-      <div class="mt-2 flex flex-col space-y-2">
-        {{ range .condition.condition_examples }}
-        {{ $name := .name }}
-        {{ $example := .example }}
-        {{ $vrlOnly := .vrl_only }}
-        <div class="flex flex-col space-y-2">
-          <span>
-            {{ partial "heading.html" (dict "text" .title "level" 4) }}
-          </span>
+        <div class="mt-2 flex flex-col space-y-2">
+          {{ range .condition.condition_examples }}
+            {{ $name := .name }}
+            {{ $example := .example }}
+            {{ $vrlOnly := .vrl_only }}
+            <div class="flex flex-col space-y-2">
+              <span>
+                {{ partial "heading.html" (dict "text" .title "level" 4) }}
+              </span>
 
-          {{ $formats := slice "yaml"  "toml" "json" }}
-          <div class="flex space-x-2">
-            {{ range $formats }}
-            <button @click="$store.global.setFormat('{{ . }}')"
-              :class="{ 'text-secondary dark:text-primary': $store.global.isFormat('{{ . }}') }" class="font-semibold">
-              {{ . | upper }}
-            </button>
-            {{ end }}
-          </div>
+              {{ $formats := slice "yaml"  "toml" "json" }}
+              <div class="flex space-x-2">
+                {{ range $formats }}
+                  <button
+                    @click="$store.global.setFormat('{{ . }}')"
+                    :class="{ 'text-secondary dark:text-primary': $store.global.isFormat('{{ . }}') }"
+                    class="font-semibold"
+                  >
+                    {{ . | upper }}
+                  </button>
+                {{ end }}
+              </div>
 
-          {{ range $formats }}
-          {{ $code := "" }}
-          {{ $shorthand := "" }}
-          {{ if eq . "toml" }}
-          {{ $code = printf "%s = { type = \"%s\", source = \"%s\" }" $configName $name $example }}
-          {{ $shorthand = printf "%s = \"%s\"" $configName $example }}
-          {{ else if eq . "yaml" }}
-          {{ $code = printf "%s:\n  type: \"%s\"\n  source: \"%s\"" $configName $name $example }}
-          {{ $shorthand = printf "%s: \"%s\"" $configName $example }}
-          {{ else if eq . "json" }}
-          {{ $code = printf "\"%s\": {\n  \"type\": \"%s\",\n  \"source\": \"%s\"\n}" $configName $name $example }}
-          {{ $shorthand = printf "\"%s\": \"%s\"" $configName $example }}
-          {{ end }}
-          <div x-show="$store.global.isFormat('{{ . }}')" class="mt-2">
-            {{ if $vrlOnly }}
-            {{ highlight $shorthand . "" }}
-            {{ else }}
-            {{ highlight $code . "" }}
-            {{ end }}
-          </div>
+              {{ range $formats }}
+                {{ $code := "" }}
+                {{ $shorthand := "" }}
+                {{ if eq . "toml" }}
+                  {{ $code = printf "%s = { type = \"%s\", source = \"%s\" }" $configName $name $example }}
+                  {{ $shorthand = printf "%s = \"%s\"" $configName $example }}
+                {{ else if eq . "yaml" }}
+                  {{ $code = printf "%s:\n  type: \"%s\"\n  source: \"%s\"" $configName $name $example }}
+                  {{ $shorthand = printf "%s: \"%s\"" $configName $example }}
+                {{ else if eq . "json" }}
+                  {{ $code = printf "\"%s\": {\n  \"type\": \"%s\",\n  \"source\": \"%s\"\n}" $configName $name $example }}
+                  {{ $shorthand = printf "\"%s\": \"%s\"" $configName $example }}
+                {{ end }}
+                <div x-show="$store.global.isFormat('{{ . }}')" class="mt-2">
+                  {{ if $vrlOnly }}
+                    {{ highlight $shorthand . "" }}
+                  {{ else }}
+                    {{ highlight $code . "" }}
+                  {{ end }}
+                </div>
+              {{ end }}
+            </div>
           {{ end }}
         </div>
-        {{ end }}
       </div>
     </div>
   </div>
-</div>
 {{ end }}
diff --git a/website/layouts/partials/logs_output.html b/website/layouts/partials/logs_output.html
index 88301ef9b5c13..db8565278bb3a 100644
--- a/website/layouts/partials/logs_output.html
+++ b/website/layouts/partials/logs_output.html
@@ -1,85 +1,82 @@
 {{ define "logs_output" }}
-{{ range $k, $v := . }}
-{{ $title := $k | title }}
-{{ $id := printf "%s-log-output" $k }}
-<div class="py-3 px-5">
-  <span class="flex justify-between items-center">
-    <span class="text-lg">
-      {{ partial "heading.html" (dict "text" $title "level" 4 "id" $id) }}
-    </span>
-  </span>
-
-    {{ with $v.description }}
-    <div class="mt-3 prose dark:prose-dark">
-        {{ . | markdownify }}
-    </div>
-    {{ end }}
-
-    {{ with $v.fields }}
-    {{ $id := printf "%s-fields" $k }}
-    <div class="mt-4 font-semibold">
-        {{ partial "heading.html" (dict "text" "Fields" "level" 5 "id" $id) }}
-    </div>
-
-    <div class="mt-2 flex flex-col divide-y dark:divide-gray-700 border rounded dark:border-gray-700">
-
-        {{ range $k, $v := . }}
-        <div class="py-2.5 px-3.5">
+  {{ range $k, $v := . }}
+    {{ $title := $k | title }}
+    {{ $id := printf "%s-log-output" $k }}
+    <div class="py-3 px-5">
       <span class="flex justify-between items-center">
-        <span class="font-mono font-semibold">
-          {{ $k }}
+        <span class="text-lg">
+          {{ partial "heading.html" (dict "text" $title "level" 4 "id" $id) }}
         </span>
+      </span>
 
-        <span class="flex space-x-1">
-          {{ if $v.required }}
-          {{ partial "badge.html" (dict "word" "required" "color" "red") }}
-          {{ else }}
-          {{ partial "badge.html" (dict "word" "optional" "color" "blue") }}
-          {{ end }}
+      {{ with $v.description }}
+        <div class="mt-3 prose dark:prose-dark">
+          {{ . | markdownify }}
+        </div>
+      {{ end }}
 
-          {{ range $k, $v := $v.type }}
-          {{ $isArray := eq $k "array" }}
-          {{ if $isArray }}
-          {{ range $k, $v := $v.items.type }}
-          {{ $name := printf "[%s]" $k }}
-          {{ partial "badge.html" (dict "word" $name "color" "gray") }}
-          {{ end }}
-          {{ else }}
-          {{ partial "badge.html" (dict "word" $k "color" "gray") }}
+      {{ with $v.fields }}
+        {{ $id := printf "%s-fields" $k }}
+        <div class="mt-4 font-semibold">
+          {{ partial "heading.html" (dict "text" "Fields" "level" 5 "id" $id) }}
+        </div>
 
-          {{ with $v.syntax }}
-          {{ partial "badge.html" (dict "word" . "color" "gray") }}
-          {{ end }}
-          {{ end }}
-          {{ end }}
-        </span>
-      </span>
+        <div class="mt-2 flex flex-col divide-y dark:divide-gray-700 border rounded dark:border-gray-700">
+          {{ range $k, $v := . }}
+            <div class="py-2.5 px-3.5">
+              <span class="flex justify-between items-center">
+                <span class="font-mono font-semibold">
+                  {{ $k }}
+                </span>
 
-            {{ with $v.description }}
-            <div class="mt-2 prose dark:prose-dark">
-                {{ . | markdownify }}
-            </div>
-            {{ end }}
+                <span class="flex space-x-1">
+                  {{ if $v.required }}
+                    {{ partial "badge.html" (dict "word" "required" "color" "red") }}
+                  {{ else }}
+                    {{ partial "badge.html" (dict "word" "optional" "color" "blue") }}
+                  {{ end }}
 
-            {{ range $k, $v := $v.type }}
-            {{ with $v.examples }}
-            <div class="mt-2">
-        <span>
-          Examples
-        </span>
+                  {{ range $k, $v := $v.type }}
+                    {{ $isArray := eq $k "array" }}
+                    {{ if $isArray }}
+                      {{ range $k, $v := $v.items.type }}
+                        {{ $name := printf "[%s]" $k }}
+                        {{ partial "badge.html" (dict "word" $name "color" "gray") }}
+                      {{ end }}
+                    {{ else }}
+                      {{ partial "badge.html" (dict "word" $k "color" "gray") }}
 
-                <div class="mt-1.5 flex flex-col space-y-1 text-sm">
-                    {{ range . }}
-                    {{ template "code" . }}
+                      {{ with $v.syntax }}
+                        {{ partial "badge.html" (dict "word" . "color" "gray") }}
+                      {{ end }}
                     {{ end }}
+                  {{ end }}
+                </span>
+              </span>
+
+              {{ with $v.description }}
+                <div class="mt-2 prose dark:prose-dark">
+                  {{ . | markdownify }}
                 </div>
+              {{ end }}
+
+              {{ range $k, $v := $v.type }}
+                {{ with $v.examples }}
+                  <div class="mt-2">
+                    <span> Examples </span>
+
+                    <div class="mt-1.5 flex flex-col space-y-1 text-sm">
+                      {{ range . }}
+                        {{ template "code" . }}
+                      {{ end }}
+                    </div>
+                  </div>
+                {{ end }}
+              {{ end }}
             </div>
-            {{ end }}
-            {{ end }}
+          {{ end }}
         </div>
-        {{ end }}
+      {{ end }}
     </div>
-    {{ end }}
-</div>
-{{ end }}
+  {{ end }}
 {{ end }}
diff --git a/website/package.json b/website/package.json
index 90872617969d1..2d706e07302f1 100644
--- a/website/package.json
+++ b/website/package.json
@@ -61,5 +61,8 @@
   "browserslist": [
     "since 2017-06"
   ],
-  "devDependencies": {}
+  "devDependencies": {
+    "prettier": "^3.5.3",
+    "prettier-plugin-go-template": "^0.0.15"
+  }
 }
diff --git a/website/yarn.lock b/website/yarn.lock
index 79ac8cc664498..4981d7ac7cd3b 100644
--- a/website/yarn.lock
+++ b/website/yarn.lock
@@ -3216,6 +3216,18 @@ preact@^10.0.0:
   resolved "https://registry.yarnpkg.com/preact/-/preact-10.6.6.tgz#f1899bc8dab7c0788b858481532cb3b5d764a520"
   integrity sha512-dgxpTFV2vs4vizwKohYKkk7g7rmp1wOOcfd4Tz3IB3Wi+ivZzsn/SpeKJhRENSE+n8sUfsAl4S3HiCVT923ABw==
 
+prettier-plugin-go-template@^0.0.15:
+  version "0.0.15"
+  resolved "https://registry.yarnpkg.com/prettier-plugin-go-template/-/prettier-plugin-go-template-0.0.15.tgz#474952ed72405e528f70bf9cf3f50938c97d8f86"
+  integrity sha512-WqU92E1NokWYNZ9mLE6ijoRg6LtIGdLMePt2C7UBDjXeDH9okcRI3zRqtnWR4s5AloiqyvZ66jNBAa9tmRY5EQ==
+  dependencies:
+    ulid "^2.3.0"
+
+prettier@^3.5.3:
+  version "3.5.3"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.5.3.tgz#4fc2ce0d657e7a02e602549f053b239cb7dfe1b5"
+  integrity sha512-QQtaxnoDJeAkDvDKWCLiwIXkTgRhwYDEQCghU9Z6q03iyek/rxRh/2lC3HB7P8sWT2xC/y5JDctPLBIGzHKbhw==
+
 pretty-hrtime@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz#b7e3ea42435a4c9b2759d99e0f201eb195802ee1"
@@ -3809,6 +3821,11 @@ typesense@^2.0.3:
     loglevel "^1.8.1"
     tslib "^2.6.2"
 
+ulid@^2.3.0:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/ulid/-/ulid-2.4.0.tgz#9d9ee22e63f4390ee1bcd9ad09fca39d8ae0afed"
+  integrity sha512-fIRiVTJNcSRmXKPZtGzFQv9WRrZ3M9eoptl/teFJvjOzmpU+/K/JH6HZ8deBfb5vMEpicJcLn7JmvdknlMq7Zg==
+
 unicode-canonical-property-names-ecmascript@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.1.tgz#cb3173fe47ca743e228216e4a3ddc4c84d628cc2"

From d720b303d2e87b75767a07a92a6fd3b52a180e01 Mon Sep 17 00:00:00 2001
From: Thomas <thomas.schneider@datadoghq.com>
Date: Tue, 17 Jun 2025 10:22:04 -0400
Subject: [PATCH 076/305] feat(core): Make interval_ms modifiable via VRL
 (#23217)

* Make interval_ms {read,write,delete}able

* Add interval_ms to VALID_METRIC_PATHS_SET

* Add backtics to docs, clippy complains

* Add changelog

* Rename changelog to add .feature

* Update changelog.d/23217_interval_ms_modifiable.feature.md

Co-authored-by: Pavlos Rontidis <pavlos.rontidis@gmail.com>

* Move struct Case up

* Fix clippy again

* Fix test

---------

Co-authored-by: Pavlos Rontidis <pavlos.rontidis@gmail.com>
---
 .../23217_interval_ms_modifiable.feature.md   |   3 +
 lib/vector-core/src/event/vrl_target.rs       | 132 ++++++++++++------
 .../reference/components/transforms/remap.cue |   3 +-
 3 files changed, 95 insertions(+), 43 deletions(-)
 create mode 100644 changelog.d/23217_interval_ms_modifiable.feature.md

diff --git a/changelog.d/23217_interval_ms_modifiable.feature.md b/changelog.d/23217_interval_ms_modifiable.feature.md
new file mode 100644
index 0000000000000..bac2eccda82af
--- /dev/null
+++ b/changelog.d/23217_interval_ms_modifiable.feature.md
@@ -0,0 +1,3 @@
+VRL programs can now read, write, and delete the `interval_ms` field in metric events.
+
+authors: thomasqueirozb
diff --git a/lib/vector-core/src/event/vrl_target.rs b/lib/vector-core/src/event/vrl_target.rs
index 7ef2aec3b87a6..d7243483693f5 100644
--- a/lib/vector-core/src/event/vrl_target.rs
+++ b/lib/vector-core/src/event/vrl_target.rs
@@ -1,4 +1,5 @@
 use std::borrow::Cow;
+use std::num::{NonZero, TryFromIntError};
 use std::{collections::BTreeMap, convert::TryFrom, marker::PhantomData};
 
 use lookup::lookup_v2::OwnedSegment;
@@ -13,10 +14,11 @@ use super::{metric::TagValue, Event, EventMetadata, LogEvent, Metric, MetricKind
 use crate::config::{log_schema, LogNamespace};
 use crate::schema::Definition;
 
-const VALID_METRIC_PATHS_SET: &str = ".name, .namespace, .timestamp, .kind, .tags";
+const VALID_METRIC_PATHS_SET: &str = ".name, .namespace, .interval_ms, .timestamp, .kind, .tags";
 
 /// We can get the `type` of the metric in Remap, but can't set it.
-const VALID_METRIC_PATHS_GET: &str = ".name, .namespace, .timestamp, .kind, .tags, .type";
+const VALID_METRIC_PATHS_GET: &str =
+    ".name, .namespace, .interval_ms, .timestamp, .kind, .tags, .type";
 
 /// Metrics aren't interested in paths that have a length longer than 3.
 ///
@@ -319,6 +321,15 @@ impl Target for VrlTarget {
                                 metric.series.name.namespace =
                                     Some(String::from_utf8_lossy(&value).into_owned());
                             }
+                            ["interval_ms"] => {
+                                let value: i64 =
+                                    value.clone().try_into_i64().map_err(|e| e.to_string())?;
+                                let value: u32 = value
+                                    .try_into()
+                                    .map_err(|e: TryFromIntError| e.to_string())?;
+                                let value = NonZero::try_from(value).map_err(|e| e.to_string())?;
+                                metric.data.time.interval_ms = Some(value);
+                            }
                             ["timestamp"] => {
                                 let value =
                                     value.clone().try_timestamp().map_err(|e| e.to_string())?;
@@ -412,6 +423,13 @@ impl Target for VrlTarget {
                         let removed_value = match paths.as_slice() {
                             ["namespace"] => metric.series.name.namespace.take().map(Into::into),
                             ["timestamp"] => metric.data.time.timestamp.take().map(Into::into),
+                            ["interval_ms"] => metric
+                                .data
+                                .time
+                                .interval_ms
+                                .take()
+                                .map(u32::from)
+                                .map(Into::into),
                             ["tags"] => metric.series.tags.take().map(|map| {
                                 map.into_iter_single()
                                     .map(|(k, v)| (k, v.into()))
@@ -459,13 +477,14 @@ impl SecretTarget for VrlTarget {
 
 /// Retrieves a value from a the provided metric using the path.
 /// Currently the root path and the following paths are supported:
-/// - name
-/// - namespace
-/// - timestamp
-/// - kind
-/// - tags
-/// - tags.<tagname>
-/// - type
+/// - `name`
+/// - `namespace`
+/// - `interval_ms`
+/// - `timestamp`
+/// - `kind`
+/// - `tags`
+/// - `tags.<tagname>`
+/// - `type`
 ///
 /// Any other paths result in a `MetricPathError::InvalidPath` being returned.
 fn target_get_metric<'a>(
@@ -481,7 +500,7 @@ fn target_get_metric<'a>(
     for paths in path.to_alternative_components(MAX_METRIC_PATH_DEPTH) {
         match paths.as_slice() {
             ["name"] | ["kind"] | ["type"] | ["tags", _] => return Ok(value),
-            ["namespace"] | ["timestamp"] | ["tags"] => {
+            ["namespace"] | ["timestamp"] | ["interval_ms"] | ["tags"] => {
                 if let Some(value) = value {
                     return Ok(Some(value));
                 }
@@ -1125,6 +1144,13 @@ mod test {
 
     #[test]
     fn metric_fields() {
+        struct Case {
+            path: OwnedValuePath,
+            current: Option<Value>,
+            new: Value,
+            delete: bool,
+        }
+
         let metric = Metric::new(
             "name",
             MetricKind::Absolute,
@@ -1133,39 +1159,46 @@ mod test {
         .with_tags(Some(metric_tags!("tig" => "tog")));
 
         let cases = vec![
-            (
-                owned_value_path!("name"), // Path
-                Some(Value::from("name")), // Current value
-                Value::from("namefoo"),    // New value
-                false,                     // Test deletion
-            ),
-            (
-                owned_value_path!("namespace"),
-                None,
-                "namespacefoo".into(),
-                true,
-            ),
-            (
-                owned_value_path!("timestamp"),
-                None,
-                Utc.with_ymd_and_hms(2020, 12, 8, 12, 0, 0)
+            Case {
+                path: owned_value_path!("name"),
+                current: Some(Value::from("name")),
+                new: Value::from("namefoo"),
+                delete: false,
+            },
+            Case {
+                path: owned_value_path!("namespace"),
+                current: None,
+                new: "namespacefoo".into(),
+                delete: true,
+            },
+            Case {
+                path: owned_value_path!("timestamp"),
+                current: None,
+                new: Utc
+                    .with_ymd_and_hms(2020, 12, 8, 12, 0, 0)
                     .single()
                     .expect("invalid timestamp")
                     .into(),
-                true,
-            ),
-            (
-                owned_value_path!("kind"),
-                Some(Value::from("absolute")),
-                "incremental".into(),
-                false,
-            ),
-            (
-                owned_value_path!("tags", "thing"),
-                None,
-                "footag".into(),
-                true,
-            ),
+                delete: true,
+            },
+            Case {
+                path: owned_value_path!("interval_ms"),
+                current: None,
+                new: 123_456.into(),
+                delete: true,
+            },
+            Case {
+                path: owned_value_path!("kind"),
+                current: Some(Value::from("absolute")),
+                new: "incremental".into(),
+                delete: false,
+            },
+            Case {
+                path: owned_value_path!("tags", "thing"),
+                current: None,
+                new: "footag".into(),
+                delete: true,
+            },
         ];
 
         let info = ProgramInfo {
@@ -1175,13 +1208,20 @@ mod test {
                 OwnedTargetPath::event(owned_value_path!("name")),
                 OwnedTargetPath::event(owned_value_path!("namespace")),
                 OwnedTargetPath::event(owned_value_path!("timestamp")),
+                OwnedTargetPath::event(owned_value_path!("interval_ms")),
                 OwnedTargetPath::event(owned_value_path!("kind")),
             ],
             target_assignments: vec![],
         };
         let mut target = VrlTarget::new(Event::Metric(metric), &info, false);
 
-        for (path, current, new, delete) in cases {
+        for Case {
+            path,
+            current,
+            new,
+            delete,
+        } in cases
+        {
             let path = OwnedTargetPath::event(path);
 
             assert_eq!(
@@ -1249,13 +1289,21 @@ mod test {
         let validpaths_get = [
             ".name",
             ".namespace",
+            ".interval_ms",
             ".timestamp",
             ".kind",
             ".tags",
             ".type",
         ];
 
-        let validpaths_set = [".name", ".namespace", ".timestamp", ".kind", ".tags"];
+        let validpaths_set = [
+            ".name",
+            ".namespace",
+            ".interval_ms",
+            ".timestamp",
+            ".kind",
+            ".tags",
+        ];
 
         let info = ProgramInfo {
             fallible: false,
diff --git a/website/cue/reference/components/transforms/remap.cue b/website/cue/reference/components/transforms/remap.cue
index b5564dab0b0a1..fd4829e23388c 100644
--- a/website/cue/reference/components/transforms/remap.cue
+++ b/website/cue/reference/components/transforms/remap.cue
@@ -110,7 +110,8 @@ components: transforms: "remap": {
 				`type` | Read only |
 				`kind` | Read/write | You can set `kind` to either `incremental` or `absolute` but not to an arbitrary value.
 				`name` | Read/write |
-				`timestamp` | Read/write/delete | You assign only a valid [VRL timestamp](\(urls.vrl_expressions)/#timestamp) value, not a [VRL string](\(urls.vrl_expressions)/#string).
+				`timestamp` | Read/write/delete | You can only assign a valid [VRL timestamp](\(urls.vrl_expressions)/#timestamp) value, not a [VRL string](\(urls.vrl_expressions)/#string).
+				`interval_ms` | Read/write/delete | You can assign it a non zero 32 byte unsigned interval
 				`namespace` | Read/write/delete |
 				`tags` | Read/write/delete | The `tags` field must be a [VRL object](\(urls.vrl_expressions)/#object) in which all keys and values are strings.
 

From 11e1cea3135bc22500fe90c9d9ac884892bf6da8 Mon Sep 17 00:00:00 2001
From: Bruce Guenter <bruce.guenter@datadoghq.com>
Date: Tue, 17 Jun 2025 08:56:25 -0600
Subject: [PATCH 077/305] chore(config): Fix `InlineSingleUseReferencesVisitor`
 failing merges (#23207)

* chore(config): Fix `InlineSingleUseReferencesVisitor` failing tests

The above visitor is intended to inline schemas in the references section for
which there is only a single reference. This visitor is, however, unable to
detect some cases where there are in fact multiple references, ending up
inlining the schema multiple times. This has led to bloat in generated schemas.

In the core Vector schema, this affects 121 structures, shaving 844 lines off of
the generated schema.

* Regenerate component docs
---
 .../src/schema/visitors/inline_single.rs      | 167 ++++++++++++++----
 .../reference/components/sinks/base/http.cue  |   8 +-
 .../components/sinks/base/opentelemetry.cue   |   8 +-
 .../sources/base/static_metrics.cue           |   8 +-
 4 files changed, 137 insertions(+), 54 deletions(-)

diff --git a/lib/vector-config/src/schema/visitors/inline_single.rs b/lib/vector-config/src/schema/visitors/inline_single.rs
index 4aee9499b2398..92e8576711faf 100644
--- a/lib/vector-config/src/schema/visitors/inline_single.rs
+++ b/lib/vector-config/src/schema/visitors/inline_single.rs
@@ -41,7 +41,7 @@ impl Visitor for InlineSingleUseReferencesVisitor {
         // entire schema, by visiting the root schema in a recursive fashion, using a helper visitor.
         let mut occurrence_visitor = OccurrenceVisitor::default();
         occurrence_visitor.visit_root_schema(root);
-        let occurrence_map = occurrence_visitor.into_occurrences();
+        let occurrence_map = occurrence_visitor.occurrence_map;
 
         self.eligible_to_inline = occurrence_map
             .into_iter()
@@ -141,16 +141,7 @@ fn is_inlineable_schema(definition_name: &str, schema: &SchemaObject) -> bool {
 #[derive(Debug, Default)]
 struct OccurrenceVisitor {
     scope_stack: SchemaScopeStack,
-    occurrence_map: HashMap<SchemaReference, HashSet<SchemaReference>>,
-}
-
-impl OccurrenceVisitor {
-    fn into_occurrences(self) -> HashMap<SchemaReference, usize> {
-        self.occurrence_map
-            .into_iter()
-            .map(|(k, v)| (k, v.len()))
-            .collect()
-    }
+    occurrence_map: HashMap<SchemaReference, usize>,
 }
 
 impl Visitor for OccurrenceVisitor {
@@ -162,23 +153,11 @@ impl Visitor for OccurrenceVisitor {
         visit_schema_object_scoped(self, definitions, schema);
 
         if let Some(current_schema_ref) = schema.reference.as_ref() {
-            // Track the named "parent" schema for the schema we're currently visiting so that if we
-            // visit this schema again, we don't double count any schema references that it has. The
-            // "parent" schema is simply the closest ancestor schema that was itself a schema
-            // reference, or "Root", which represents the oldest schema ancestor in the document.
-            //
-            // This lets us couple with scenarios where schema A references schema B, and is the
-            // only actual direct schema reference to schema B, but due to multiple schemas
-            // referencing schema A, would otherwise lead to both A and B being visited multiple
-            // times.
-            let current_parent_schema_ref = self.get_current_schema_scope().clone();
             let current_schema_ref = get_cleaned_schema_reference(current_schema_ref);
-
-            let occurrences = self
+            *self
                 .occurrence_map
                 .entry(current_schema_ref.into())
-                .or_default();
-            occurrences.insert(current_parent_schema_ref);
+                .or_default() += 1;
         }
     }
 }
@@ -257,17 +236,7 @@ mod tests {
         assert_schemas_eq(expected_schema, actual_schema);
     }
 
-    // TODO(tobz): These two tests are ignored because the inliner currently works off of schema
-    // reference scopes, so two object properties within the same schema don't count as two
-    // instances of a schema being referenced.
-    //
-    // We need to refactor schema scopes to be piecemeal extensible more in the way of how
-    // `jsonschema` does it rather than an actual stack.... the current approach is good enough for
-    // now, but not optimal in the way that it could be.
-    //
-    // These are here for when I improve the situation after getting this merged.
     #[test]
-    #[ignore]
     fn single_ref_multiple_usages() {
         let mut actual_schema = as_schema(json!({
             "definitions": {
@@ -294,7 +263,6 @@ mod tests {
     }
 
     #[test]
-    #[ignore]
     fn multiple_refs_mixed_usages() {
         let mut actual_schema = as_schema(json!({
             "definitions": {
@@ -346,4 +314,131 @@ mod tests {
 
         assert_schemas_eq(expected_schema, actual_schema);
     }
+
+    #[test]
+    fn reference_in_multiple_arrays() {
+        let mut actual_schema = as_schema(json!({
+            "definitions": {
+                "item": {
+                    "type": "object",
+                    "properties": {
+                        "x": { "type": "string" }
+                    }
+                }
+            },
+            "type": "object",
+            "properties": {
+                "arr1": { "type": "array", "items": { "$ref": "#/definitions/item" } },
+                "arr2": { "type": "array", "items": { "$ref": "#/definitions/item" } }
+            }
+        }));
+
+        let expected_schema = actual_schema.clone();
+
+        let mut visitor = InlineSingleUseReferencesVisitor::default();
+        visitor.visit_root_schema(&mut actual_schema);
+
+        assert_schemas_eq(expected_schema, actual_schema);
+    }
+
+    #[test]
+    fn reference_in_oneof_anyof_allof() {
+        let mut actual_schema = as_schema(json!({
+            "definitions": {
+                "shared": {
+                    "type": "object",
+                    "properties": {
+                        "y": { "type": "string" }
+                    }
+                }
+            },
+            "type": "object",
+            "properties": {
+                "choice": {
+                    "oneOf": [
+                        { "$ref": "#/definitions/shared" },
+                        { "$ref": "#/definitions/shared" }
+                    ],
+                    "anyOf": [
+                        { "$ref": "#/definitions/shared" },
+                        { "type": "null" }
+                    ],
+                    "allOf": [
+                        { "$ref": "#/definitions/shared" },
+                        { "type": "object" }
+                    ]
+                }
+            }
+        }));
+
+        let expected_schema = actual_schema.clone();
+
+        let mut visitor = InlineSingleUseReferencesVisitor::default();
+        visitor.visit_root_schema(&mut actual_schema);
+
+        assert_schemas_eq(expected_schema, actual_schema);
+    }
+
+    #[test]
+    fn reference_in_additional_properties() {
+        let mut actual_schema = as_schema(json!({
+            "definitions": {
+                "val": {
+                    "type": "object",
+                    "properties": {
+                        "z": { "type": "string" }
+                    }
+                }
+            },
+            "type": "object",
+            "properties": {
+                "obj1": {
+                    "type": "object",
+                    "additionalProperties": { "$ref": "#/definitions/val" }
+                },
+                "obj2": {
+                    "type": "object",
+                    "additionalProperties": { "$ref": "#/definitions/val" }
+                }
+            }
+        }));
+
+        let expected_schema = actual_schema.clone();
+
+        let mut visitor = InlineSingleUseReferencesVisitor::default();
+        visitor.visit_root_schema(&mut actual_schema);
+
+        assert_schemas_eq(expected_schema, actual_schema);
+    }
+
+    #[test]
+    fn reference_in_pattern_properties() {
+        let mut actual_schema = as_schema(json!({
+            "definitions": {
+                "pat": {
+                    "type": "object",
+                    "properties": {
+                        "w": { "type": "string" }
+                    }
+                }
+            },
+            "type": "object",
+            "properties": {
+                "obj": {
+                    "type": "object",
+                    "patternProperties": {
+                        "^foo$": { "$ref": "#/definitions/pat" },
+                        "^bar$": { "$ref": "#/definitions/pat" }
+                    }
+                }
+            }
+        }));
+
+        let expected_schema = actual_schema.clone();
+
+        let mut visitor = InlineSingleUseReferencesVisitor::default();
+        visitor.visit_root_schema(&mut actual_schema);
+
+        assert_schemas_eq(expected_schema, actual_schema);
+    }
 }
diff --git a/website/cue/reference/components/sinks/base/http.cue b/website/cue/reference/components/sinks/base/http.cue
index 286cf7dd842fb..71f7bb5945545 100644
--- a/website/cue/reference/components/sinks/base/http.cue
+++ b/website/cue/reference/components/sinks/base/http.cue
@@ -683,12 +683,8 @@ base: components: sinks: http: configuration: {
 		}
 	}
 	method: {
-		description: """
-			HTTP method.
-
-			The HTTP method to use when making the request.
-			"""
-		required: false
+		description: "The HTTP method to use when making the request."
+		required:    false
 		type: string: {
 			default: "post"
 			enum: {
diff --git a/website/cue/reference/components/sinks/base/opentelemetry.cue b/website/cue/reference/components/sinks/base/opentelemetry.cue
index 0f9d2a62585c1..f7bb74741c554 100644
--- a/website/cue/reference/components/sinks/base/opentelemetry.cue
+++ b/website/cue/reference/components/sinks/base/opentelemetry.cue
@@ -686,12 +686,8 @@ base: components: sinks: opentelemetry: configuration: protocol: {
 			}
 		}
 		method: {
-			description: """
-				HTTP method.
-
-				The HTTP method to use when making the request.
-				"""
-			required: false
+			description: "The HTTP method to use when making the request."
+			required:    false
 			type: string: {
 				default: "post"
 				enum: {
diff --git a/website/cue/reference/components/sources/base/static_metrics.cue b/website/cue/reference/components/sources/base/static_metrics.cue
index 939f4b8471fbc..78f34bfb1a5d3 100644
--- a/website/cue/reference/components/sources/base/static_metrics.cue
+++ b/website/cue/reference/components/sources/base/static_metrics.cue
@@ -218,12 +218,8 @@ base: components: sources: static_metrics: configuration: {
 											type: float: {}
 										}
 										bins: {
-											description: """
-																															A split representation of sketch bins.
-
-																															The bins within the sketch.
-																															"""
-											required: true
+											description: "The bins within the sketch."
+											required:    true
 											type: object: options: {
 												k: {
 													description: "The bin keys."

From 05d1521fc0fb08e74104a86b52e5241deda57d88 Mon Sep 17 00:00:00 2001
From: Benjamin Dornel <benjamindornel@gmail.com>
Date: Wed, 18 Jun 2025 01:08:47 +0800
Subject: [PATCH 078/305] enhancement(http_client source): allow VRL in query
 parameters (#22706)

* enhancement(http_client source): allow VRL in query parameters

* update semantic scopes

* chore: update cue docs for http_client

* refactor: handle VRL compilation and regex during build

* chore: fix punctuation for message

* refactor: use vrl type in query parameter instead of regex

* chore: add better VRL result -> string handling

* chore: update docs

* chore: use raw identifier for type

* chore: allow missing const for value

---------

Co-authored-by: Pavlos Rontidis <pavlos.rontidis@gmail.com>
Co-authored-by: Thomas <thomas.schneider@datadoghq.com>
---
 .github/workflows/semantic.yml                |   2 +-
 ...source_vrl_query_parameters.enhancement.md |   5 +
 src/http.rs                                   |  94 +++++--
 src/sinks/elasticsearch/common.rs             |  13 +-
 src/sinks/elasticsearch/integration_tests.rs  |   4 +-
 src/sources/http_client/client.rs             | 244 ++++++++++++++++--
 src/sources/http_client/tests.rs              | 204 ++++++++++++++-
 src/sources/prometheus/scrape.rs              |  11 +-
 src/sources/util/http_client.rs               |  33 ++-
 .../components/sinks/base/elasticsearch.cue   |  22 +-
 .../components/sources/base/http_client.cue   |  34 ++-
 .../sources/base/prometheus_scrape.cue        |  22 +-
 12 files changed, 627 insertions(+), 61 deletions(-)
 create mode 100644 changelog.d/14621_http_client_source_vrl_query_parameters.enhancement.md

diff --git a/.github/workflows/semantic.yml b/.github/workflows/semantic.yml
index f59a9403c4d86..5e1c03a569831 100644
--- a/.github/workflows/semantic.yml
+++ b/.github/workflows/semantic.yml
@@ -145,7 +145,7 @@ jobs:
             gcp_pubsub source
             heroku_logs source
             host_metrics source
-            http source
+            http_client source
             http_scrape source
             internal_logs source
             internal_metrics source
diff --git a/changelog.d/14621_http_client_source_vrl_query_parameters.enhancement.md b/changelog.d/14621_http_client_source_vrl_query_parameters.enhancement.md
new file mode 100644
index 0000000000000..732e0ee351a21
--- /dev/null
+++ b/changelog.d/14621_http_client_source_vrl_query_parameters.enhancement.md
@@ -0,0 +1,5 @@
+The HTTP client source now supports VRL within query parameters.
+
+This means that HTTP requests can now be made with dynamic query parameters. This is particularly useful for generating unique timestamps or UUIDs per request.
+
+authors: benjamin-awd
diff --git a/src/http.rs b/src/http.rs
index 76aff937631d3..7bd199b4ea40b 100644
--- a/src/http.rs
+++ b/src/http.rs
@@ -569,6 +569,73 @@ where
     }
 }
 
+/// The type of a query parameter's value, determines if it's treated as a plain string or a VRL expression.
+#[configurable_component]
+#[derive(Clone, Debug, Default, Eq, PartialEq)]
+#[serde(rename_all = "snake_case")]
+pub enum ParamType {
+    /// The parameter value is a plain string.
+    #[default]
+    String,
+    /// The parameter value is a VRL expression that will be evaluated before each request.
+    Vrl,
+}
+
+impl ParamType {
+    fn is_default(&self) -> bool {
+        *self == Self::default()
+    }
+}
+
+/// Represents a query parameter value, which can be a simple string or a typed object
+/// indicating whether the value is a string or a VRL expression.
+#[configurable_component]
+#[derive(Clone, Debug, Eq, PartialEq)]
+#[serde(untagged)]
+pub enum ParameterValue {
+    /// A simple string value. For backwards compatibility.
+    String(String),
+    /// A value with an explicit type.
+    Typed {
+        /// The raw value of the parameter.
+        value: String,
+        /// The type of the parameter, indicating how the `value` should be treated.
+        #[serde(
+            default,
+            skip_serializing_if = "ParamType::is_default",
+            rename = "type"
+        )]
+        r#type: ParamType,
+    },
+}
+
+impl ParameterValue {
+    /// Returns true if the parameter is a VRL expression.
+    pub const fn is_vrl(&self) -> bool {
+        match self {
+            ParameterValue::String(_) => false,
+            ParameterValue::Typed { r#type, .. } => matches!(r#type, ParamType::Vrl),
+        }
+    }
+
+    /// Returns the raw string value of the parameter.
+    #[allow(clippy::missing_const_for_fn)]
+    pub fn value(&self) -> &str {
+        match self {
+            ParameterValue::String(s) => s,
+            ParameterValue::Typed { value, .. } => value,
+        }
+    }
+
+    /// Consumes the `ParameterValue` and returns the owned raw string value.
+    pub fn into_value(self) -> String {
+        match self {
+            ParameterValue::String(s) => s,
+            ParameterValue::Typed { value, .. } => value,
+        }
+    }
+}
+
 /// Configuration of the query parameter value for HTTP requests.
 #[configurable_component]
 #[derive(Clone, Debug, Eq, PartialEq)]
@@ -576,23 +643,22 @@ where
 #[configurable(metadata(docs::enum_tag_description = "Query parameter value"))]
 pub enum QueryParameterValue {
     /// Query parameter with single value
-    SingleParam(String),
+    SingleParam(ParameterValue),
     /// Query parameter with multiple values
-    MultiParams(Vec<String>),
+    MultiParams(Vec<ParameterValue>),
 }
 
 impl QueryParameterValue {
-    /// Returns an iterator over string slices of the parameter values
-    pub fn iter(&self) -> std::iter::Map<std::slice::Iter<'_, String>, fn(&String) -> &str> {
+    /// Returns an iterator over the contained `ParameterValue`s.
+    pub fn iter(&self) -> impl Iterator<Item = &ParameterValue> {
         match self {
             QueryParameterValue::SingleParam(param) => std::slice::from_ref(param).iter(),
             QueryParameterValue::MultiParams(params) => params.iter(),
         }
-        .map(String::as_str)
     }
 
-    /// Convert to Vec<String> for owned iteration
-    fn into_vec(self) -> Vec<String> {
+    /// Convert to `Vec<ParameterValue>` for owned iteration.
+    fn into_vec(self) -> Vec<ParameterValue> {
         match self {
             QueryParameterValue::SingleParam(param) => vec![param],
             QueryParameterValue::MultiParams(params) => params,
@@ -600,20 +666,10 @@ impl QueryParameterValue {
     }
 }
 
-// Implement IntoIterator for &QueryParameterValue
-impl<'a> IntoIterator for &'a QueryParameterValue {
-    type Item = &'a str;
-    type IntoIter = std::iter::Map<std::slice::Iter<'a, String>, fn(&String) -> &str>;
-
-    fn into_iter(self) -> Self::IntoIter {
-        self.iter()
-    }
-}
-
 // Implement IntoIterator for owned QueryParameterValue
 impl IntoIterator for QueryParameterValue {
-    type Item = String;
-    type IntoIter = std::vec::IntoIter<String>;
+    type Item = ParameterValue;
+    type IntoIter = std::vec::IntoIter<ParameterValue>;
 
     fn into_iter(self) -> Self::IntoIter {
         self.into_vec().into_iter()
diff --git a/src/sinks/elasticsearch/common.rs b/src/sinks/elasticsearch/common.rs
index 1060ee5c7a22a..20a80c22651bf 100644
--- a/src/sinks/elasticsearch/common.rs
+++ b/src/sinks/elasticsearch/common.rs
@@ -11,7 +11,7 @@ use super::{
     InvalidHostSnafu, Request, VersionType,
 };
 use crate::{
-    http::{HttpClient, MaybeAuth, QueryParameterValue, QueryParameters},
+    http::{HttpClient, MaybeAuth, ParameterValue, QueryParameterValue, QueryParameters},
     sinks::{
         elasticsearch::{
             ElasticsearchAuthConfig, ElasticsearchCommonMode, ElasticsearchConfig,
@@ -120,14 +120,17 @@ impl ElasticsearchCommon {
         let mut query_params = config.query.clone().unwrap_or_default();
         query_params.insert(
             "timeout".into(),
-            QueryParameterValue::SingleParam(format!("{}s", tower_request.timeout.as_secs())),
+            QueryParameterValue::SingleParam(ParameterValue::String(format!(
+                "{}s",
+                tower_request.timeout.as_secs()
+            ))),
         );
 
         if let Some(pipeline) = &config.pipeline {
             if !pipeline.is_empty() {
                 query_params.insert(
                     "pipeline".into(),
-                    QueryParameterValue::SingleParam(pipeline.into()),
+                    QueryParameterValue::SingleParam(ParameterValue::String(pipeline.into())),
                 );
             }
         }
@@ -139,12 +142,12 @@ impl ElasticsearchCommon {
                 match param_value {
                     QueryParameterValue::SingleParam(param) => {
                         // For single parameter, just append one pair
-                        query.append_pair(param_name, param);
+                        query.append_pair(param_name, param.value());
                     }
                     QueryParameterValue::MultiParams(params) => {
                         // For multiple parameters, append the same key multiple times
                         for value in params {
-                            query.append_pair(param_name, value);
+                            query.append_pair(param_name, value.value());
                         }
                     }
                 }
diff --git a/src/sinks/elasticsearch/integration_tests.rs b/src/sinks/elasticsearch/integration_tests.rs
index 9c58b12a6694f..697b915f99d1c 100644
--- a/src/sinks/elasticsearch/integration_tests.rs
+++ b/src/sinks/elasticsearch/integration_tests.rs
@@ -16,7 +16,7 @@ use super::{config::DATA_STREAM_TIMESTAMP_KEY, *};
 use crate::{
     aws::{ImdsAuthentication, RegionOrEndpoint},
     config::{ProxyConfig, SinkConfig, SinkContext},
-    http::{HttpClient, QueryParameterValue},
+    http::{HttpClient, ParameterValue, QueryParameterValue},
     sinks::{
         util::{auth::Auth, BatchConfig, Compression, SinkBatchSettings},
         HealthcheckError,
@@ -135,7 +135,7 @@ async fn ensure_pipeline_in_params() {
 
     assert_eq!(
         common.query_params["pipeline"],
-        QueryParameterValue::SingleParam(pipeline)
+        QueryParameterValue::SingleParam(ParameterValue::String(pipeline))
     );
 }
 
diff --git a/src/sources/http_client/client.rs b/src/sources/http_client/client.rs
index a3813f75b1382..b09fbdddcac80 100644
--- a/src/sources/http_client/client.rs
+++ b/src/sources/http_client/client.rs
@@ -9,8 +9,9 @@ use serde_with::serde_as;
 use snafu::ResultExt;
 use std::{collections::HashMap, time::Duration};
 use tokio_util::codec::Decoder as _;
+use vrl::diagnostic::Formatter;
 
-use crate::http::{QueryParameterValue, QueryParameters};
+use crate::http::{ParamType, ParameterValue, QueryParameterValue, QueryParameters};
 use crate::sources::util::http_client;
 use crate::{
     codecs::{Decoder, DecodingConfig},
@@ -26,16 +27,21 @@ use crate::{
         },
     },
     tls::{TlsConfig, TlsSettings},
-    Result,
 };
 use vector_lib::codecs::{
     decoding::{DeserializerConfig, FramingConfig},
     StreamDecodingError,
 };
+use vector_lib::config::{log_schema, LogNamespace, SourceOutput};
 use vector_lib::configurable::configurable_component;
 use vector_lib::{
-    config::{log_schema, LogNamespace, SourceOutput},
-    event::Event,
+    compile_vrl,
+    event::{Event, LogEvent, VrlTarget},
+    TimeZone,
+};
+use vrl::{
+    compiler::{runtime::Runtime, CompileConfig, Function, Program},
+    prelude::TypeState,
 };
 
 /// Configuration for the `http_client` source.
@@ -74,9 +80,13 @@ pub struct HttpClientConfig {
     ///
     /// The parameters provided in this option are appended to any parameters
     /// manually provided in the `endpoint` option.
+    ///
+    /// VRL functions are supported within query parameters. You can
+    /// use functions like `now()` to dynamically modify query
+    /// parameter values.
     #[serde(default)]
     #[configurable(metadata(
-        docs::additional_props_description = "A query string parameter and it's value(s)."
+        docs::additional_props_description = "A query string parameter and its value(s)."
     ))]
     #[configurable(metadata(docs::examples = "query_examples()"))]
     pub query: QueryParameters,
@@ -96,7 +106,7 @@ pub struct HttpClientConfig {
     /// One or more values for the same header can be provided.
     #[serde(default)]
     #[configurable(metadata(
-        docs::additional_props_description = "An HTTP request header and it's value(s)."
+        docs::additional_props_description = "An HTTP request header and its value(s)."
     ))]
     #[configurable(metadata(docs::examples = "headers_examples()"))]
     pub headers: HashMap<String, Vec<String>>,
@@ -127,16 +137,23 @@ fn query_examples() -> QueryParameters {
     HashMap::<_, _>::from_iter([
         (
             "field".to_owned(),
-            QueryParameterValue::SingleParam("value".to_owned()),
+            QueryParameterValue::SingleParam(ParameterValue::String("value".to_owned())),
         ),
         (
             "fruit".to_owned(),
             QueryParameterValue::MultiParams(vec![
-                "mango".to_owned(),
-                "papaya".to_owned(),
-                "kiwi".to_owned(),
+                ParameterValue::String("mango".to_owned()),
+                ParameterValue::String("papaya".to_owned()),
+                ParameterValue::String("kiwi".to_owned()),
             ]),
         ),
+        (
+            "start_time".to_owned(),
+            QueryParameterValue::SingleParam(ParameterValue::Typed {
+                value: "now()".to_owned(),
+                r#type: ParamType::Vrl,
+            }),
+        ),
     ])
 }
 
@@ -178,16 +195,125 @@ impl Default for HttpClientConfig {
 
 impl_generate_config_from_default!(HttpClientConfig);
 
+#[derive(Clone)]
+pub struct CompiledParam {
+    value: String,
+    program: Option<Program>,
+}
+
+#[derive(Clone)]
+pub enum CompiledQueryParameterValue {
+    SingleParam(CompiledParam),
+    MultiParams(Vec<CompiledParam>),
+}
+
+#[derive(Clone)]
+pub struct Query {
+    original: HashMap<String, QueryParameterValue>,
+    compiled: HashMap<String, CompiledQueryParameterValue>,
+    has_vrl: bool,
+}
+
+impl Query {
+    pub fn new(params: &HashMap<String, QueryParameterValue>) -> Self {
+        let functions = vrl::stdlib::all()
+            .into_iter()
+            .chain(vector_lib::enrichment::vrl_functions())
+            .chain(vector_vrl_functions::all())
+            .collect::<Vec<_>>();
+
+        let compiled: HashMap<String, CompiledQueryParameterValue> = params
+            .iter()
+            .map(|(k, v)| (k.clone(), Self::compile_param(v, &functions)))
+            .collect();
+
+        let has_vrl = compiled.values().any(|compiled| match compiled {
+            CompiledQueryParameterValue::SingleParam(param) => param.program.is_some(),
+            CompiledQueryParameterValue::MultiParams(params) => {
+                params.iter().any(|p| p.program.is_some())
+            }
+        });
+
+        Query {
+            original: params.clone(),
+            compiled,
+            has_vrl,
+        }
+    }
+
+    fn compile_value(param: &ParameterValue, functions: &[Box<dyn Function>]) -> CompiledParam {
+        let program = if param.is_vrl() {
+            let state = TypeState::default();
+            let config = CompileConfig::default();
+
+            match compile_vrl(param.value(), functions, &state, config) {
+                Ok(compilation_result) => {
+                    if !compilation_result.warnings.is_empty() {
+                        let warnings = Formatter::new(param.value(), compilation_result.warnings)
+                            .colored()
+                            .to_string();
+                        warn!(message = "VRL compilation warnings.", %warnings);
+                    }
+                    Some(compilation_result.program)
+                }
+                Err(diagnostics) => {
+                    let error = Formatter::new(param.value(), diagnostics)
+                        .colored()
+                        .to_string();
+                    warn!(message = "VRL compilation failed.", %error);
+                    None
+                }
+            }
+        } else {
+            None
+        };
+
+        CompiledParam {
+            value: param.value().to_string(),
+            program,
+        }
+    }
+
+    fn compile_param(
+        value: &QueryParameterValue,
+        functions: &[Box<dyn Function>],
+    ) -> CompiledQueryParameterValue {
+        match value {
+            QueryParameterValue::SingleParam(param) => {
+                CompiledQueryParameterValue::SingleParam(Self::compile_value(param, functions))
+            }
+            QueryParameterValue::MultiParams(params) => {
+                let compiled = params
+                    .iter()
+                    .map(|p| Self::compile_value(p, functions))
+                    .collect();
+                CompiledQueryParameterValue::MultiParams(compiled)
+            }
+        }
+    }
+}
+
 #[async_trait::async_trait]
 #[typetag::serde(name = "http_client")]
 impl SourceConfig for HttpClientConfig {
-    async fn build(&self, cx: SourceContext) -> Result<sources::Source> {
-        // build the url
+    async fn build(&self, cx: SourceContext) -> crate::Result<sources::Source> {
+        let query = Query::new(&self.query.clone());
+
+        // Build the base URLs
         let endpoints = [self.endpoint.clone()];
-        let urls = endpoints
+        let urls: Vec<Uri> = endpoints
             .iter()
             .map(|s| s.parse::<Uri>().context(sources::UriParseSnafu))
-            .map(|r| r.map(|uri| build_url(&uri, &self.query)))
+            .map(|r| {
+                if query.has_vrl {
+                    // For URLs with VRL expressions, don't add query parameters here
+                    // They'll be added dynamically during the HTTP request
+                    r
+                } else {
+                    // For URLs without VRL expressions, add query parameters now
+                    r.map(|uri| build_url(&uri, &query.original))
+                }
+            })
             .collect::<std::result::Result<Vec<Uri>, sources::BuildError>>()?;
 
         let tls = TlsSettings::from_options(self.tls.as_ref())?;
@@ -199,10 +325,11 @@ impl SourceConfig for HttpClientConfig {
 
         let content_type = self.decoding.content_type(&self.framing).to_string();
 
-        // the only specific context needed is the codec decoding
+        // Create context with the config for dynamic query parameter evaluation
         let context = HttpClientContext {
             decoder,
             log_namespace,
+            query,
         };
 
         warn_if_interval_too_low(self.timeout, self.interval);
@@ -259,6 +386,7 @@ impl HttpClientConfig {
 pub struct HttpClientContext {
     pub decoder: Decoder,
     pub log_namespace: LogNamespace,
+    query: Query,
 }
 
 impl HttpClientContext {
@@ -294,6 +422,31 @@ impl HttpClientBuilder for HttpClientContext {
     }
 }
 
+fn resolve_vrl(value: &str, program: &Program) -> Option<String> {
+    let mut target = VrlTarget::new(Event::Log(LogEvent::default()), program.info(), false);
+    let timezone = TimeZone::default();
+
+    Runtime::default()
+        .resolve(&mut target, program, &timezone)
+        .map_err(|error| {
+            warn!(message = "VRL runtime error.", source = %value, %error);
+        })
+        .ok()
+        .and_then(|vrl_value| {
+            let json_value = serde_json::to_value(vrl_value).ok()?;
+
+            // Properly handle VRL values, so that key1: `upcase("foo")` will resolve
+            // properly as endpoint.com/key1=FOO and not endpoint.com/key1="FOO"
+            // similarly, `now()` should resolve to endpoint.com/key1=2025-06-07T10:39:08.662735Z
+            // and not endpoint.com/key1=t'2025-06-07T10:39:08.662735Z'
+            let resolved_string = match json_value {
+                serde_json::Value::String(s) => s,
+                value => value.to_string(),
+            };
+            Some(resolved_string)
+        })
+}
+
 impl http_client::HttpClientContext for HttpClientContext {
     /// Decodes the HTTP response body into events per the decoder configured.
     fn on_response(&mut self, _url: &Uri, _header: &Parts, body: &Bytes) -> Option<Vec<Event>> {
@@ -306,6 +459,67 @@ impl http_client::HttpClientContext for HttpClientContext {
         Some(events)
     }
 
+    /// Process the URL dynamically before each request
+    fn process_url(&self, url: &Uri) -> Option<Uri> {
+        // Early exit if there is no VRL to process
+        let query: &Query = &self.query;
+        if !query.has_vrl {
+            return None;
+        }
+
+        let mut processed_query = HashMap::new();
+
+        for (param_name, compiled_value) in &query.compiled {
+            match compiled_value {
+                CompiledQueryParameterValue::SingleParam(compiled_param) => {
+                    let result = match &compiled_param.program {
+                        Some(prog) => resolve_vrl(&compiled_param.value, prog)?,
+                        None => compiled_param.value.clone(),
+                    };
+
+                    processed_query.insert(
+                        param_name.clone(),
+                        QueryParameterValue::SingleParam(ParameterValue::String(result)),
+                    );
+                }
+                CompiledQueryParameterValue::MultiParams(compiled_params) => {
+                    let mut results = Vec::new();
+
+                    for param in compiled_params {
+                        let result = match &param.program {
+                            Some(p) => resolve_vrl(&param.value, p)?,
+                            None => param.value.clone(),
+                        };
+                        results.push(ParameterValue::String(result));
+                    }
+
+                    processed_query.insert(
+                        param_name.clone(),
+                        QueryParameterValue::MultiParams(results),
+                    );
+                }
+            };
+        }
+
+        // Extract the base URI without query parameters to avoid parameter duplication
+        let base_uri = Uri::builder()
+            .scheme(
+                url.scheme()
+                    .cloned()
+                    .unwrap_or_else(|| http::uri::Scheme::try_from("http").unwrap()),
+            )
+            .authority(
+                url.authority()
+                    .cloned()
+                    .unwrap_or_else(|| http::uri::Authority::try_from("localhost").unwrap()),
+            )
+            .path_and_query(url.path().to_string())
+            .build()
+            .ok()?;
+
+        Some(build_url(&base_uri, &processed_query))
+    }
+
     /// Enriches events with source_type, timestamp
     fn enrich_events(&mut self, events: &mut Vec<Event>) {
         let now = Utc::now();
diff --git a/src/sources/http_client/tests.rs b/src/sources/http_client/tests.rs
index 8ce4f87f3de29..f215e4ecf8743 100644
--- a/src/sources/http_client/tests.rs
+++ b/src/sources/http_client/tests.rs
@@ -5,7 +5,7 @@ use vector_lib::config::LogNamespace;
 use warp::{http::HeaderMap, Filter};
 
 use crate::components::validation::prelude::*;
-use crate::http::QueryParameterValue;
+use crate::http::{ParamType, ParameterValue, QueryParameterValue};
 use crate::sources::util::http::HttpMethod;
 use crate::{serde::default_decoding, serde::default_framing_message_based};
 use vector_lib::codecs::decoding::{
@@ -183,11 +183,14 @@ async fn request_query_applied() {
         query: HashMap::from([
             (
                 "key1".to_string(),
-                QueryParameterValue::MultiParams(vec!["val2".to_string()]),
+                QueryParameterValue::MultiParams(vec![ParameterValue::String("val2".to_string())]),
             ),
             (
                 "key2".to_string(),
-                QueryParameterValue::MultiParams(vec!["val1".to_string(), "val2".to_string()]),
+                QueryParameterValue::MultiParams(vec![
+                    ParameterValue::String("val1".to_string()),
+                    ParameterValue::String("val2".to_string()),
+                ]),
             ),
         ]),
         decoding: DeserializerConfig::Json(Default::default()),
@@ -228,6 +231,201 @@ async fn request_query_applied() {
     }
 }
 
+/// VRL query parameters should be parsed correctly
+#[tokio::test]
+async fn request_query_vrl_applied() {
+    let in_addr = next_addr();
+
+    let dummy_endpoint = warp::path!("endpoint")
+        .and(warp::query::raw())
+        .map(|query| format!(r#"{{"data" : "{}"}}"#, query));
+
+    tokio::spawn(warp::serve(dummy_endpoint).run(in_addr));
+    wait_for_tcp(in_addr).await;
+
+    let events = run_compliance(HttpClientConfig {
+        endpoint: format!("http://{}/endpoint", in_addr),
+        interval: INTERVAL,
+        timeout: TIMEOUT,
+        query: HashMap::from([
+            // Test a single VRL parameter with concatenation
+            (
+                "key1".to_string(),
+                QueryParameterValue::SingleParam(ParameterValue::Typed {
+                    value: "upcase(\"bar\") + \"-\" + md5(\"baz\")".to_string(),
+                    r#type: ParamType::Vrl,
+                }),
+            ),
+            // Test multiple parameters with a mixture of string and VRL types
+            (
+                "key2".to_string(),
+                QueryParameterValue::MultiParams(vec![
+                    // Check that nested quotes are not stripped
+                    ParameterValue::String("\"bob ross\"".to_string()),
+                    ParameterValue::Typed {
+                        value: "mod(5, 2)".to_string(),
+                        r#type: ParamType::Vrl,
+                    },
+                    ParameterValue::Typed {
+                        value: "camelcase(\"input-string\")".to_string(),
+                        r#type: ParamType::Vrl,
+                    },
+                ]),
+            ),
+            // Test if VRL timestamps are correctly formatted as a raw ISO 8601 string
+            (
+                "key3".to_string(),
+                QueryParameterValue::SingleParam(ParameterValue::Typed {
+                    value: "parse_timestamp!(\"10-Oct-2020 16:00+00:00\", format: \"%v %R %:z\")"
+                        .to_string(),
+                    r#type: ParamType::Vrl,
+                }),
+            ),
+            // Test if other types are formatted correctly
+            (
+                "key4".to_string(),
+                QueryParameterValue::MultiParams(vec![
+                    ParameterValue::Typed {
+                        value: "to_int!(\"123\")".to_string(),
+                        r#type: ParamType::Vrl,
+                    },
+                    ParameterValue::Typed {
+                        value: "to_bool!(\"yes\")".to_string(),
+                        r#type: ParamType::Vrl,
+                    },
+                    ParameterValue::Typed {
+                        value: "to_float!(\"-99.9\")".to_string(),
+                        r#type: ParamType::Vrl,
+                    },
+                    ParameterValue::Typed {
+                        value: "to_string!(false)".to_string(),
+                        r#type: ParamType::Vrl,
+                    },
+                ]),
+            ),
+        ]),
+        decoding: DeserializerConfig::Json(Default::default()),
+        framing: default_framing_message_based(),
+        headers: HashMap::new(),
+        method: HttpMethod::Get,
+        tls: None,
+        auth: None,
+        log_namespace: None,
+    })
+    .await;
+
+    let logs: Vec<_> = events.into_iter().map(|event| event.into_log()).collect();
+
+    let mut expected = HashMap::from([
+        (
+            "key1".to_string(),
+            vec!["BAR-73feffa4b7f6bb68e44cf984c85f6e88".to_string()],
+        ),
+        (
+            "key2".to_string(),
+            vec![
+                "\"bob ross\"".to_string(),
+                "1".to_string(),
+                "inputString".to_string(),
+            ],
+        ),
+        ("key3".to_string(), vec!["2020-10-10T16:00:00Z".to_string()]),
+        (
+            "key4".to_string(),
+            vec![
+                "123".to_string(),
+                "true".to_string(),
+                "-99.9".to_string(),
+                "false".to_string(),
+            ],
+        ),
+    ]);
+
+    for v in expected.values_mut() {
+        v.sort();
+    }
+
+    for log in logs {
+        let query = log.get("data").expect("data must be available");
+        let mut got: HashMap<String, Vec<String>> = HashMap::new();
+        for (k, v) in
+            url::form_urlencoded::parse(query.as_bytes().expect("byte conversion should succeed"))
+        {
+            got.entry(k.to_string()).or_default().push(v.to_string());
+        }
+        for v in got.values_mut() {
+            v.sort();
+        }
+        assert_eq!(got, expected);
+    }
+}
+
+/// VRL query parameters should dynamically update on each request
+#[tokio::test]
+async fn request_query_vrl_dynamic_updates() {
+    let in_addr = next_addr();
+
+    // A handler that returns the query parameters as part of the response
+    let dummy_endpoint = warp::path!("endpoint")
+        .and(warp::query::raw())
+        .map(|query| format!(r#"{{"data" : "{}"}}"#, query));
+
+    tokio::spawn(warp::serve(dummy_endpoint).run(in_addr));
+    wait_for_tcp(in_addr).await;
+
+    // The timestamp should be different for each event
+    let events = run_compliance(HttpClientConfig {
+        endpoint: format!("http://{}/endpoint", in_addr),
+        interval: Duration::from_millis(100),
+        timeout: TIMEOUT,
+        query: HashMap::from([(
+            "timestamp".to_string(),
+            QueryParameterValue::SingleParam(ParameterValue::Typed {
+                value: "to_unix_timestamp(now(), unit: \"milliseconds\")".to_string(),
+                r#type: ParamType::Vrl,
+            }),
+        )]),
+        decoding: DeserializerConfig::Json(Default::default()),
+        framing: default_framing_message_based(),
+        headers: HashMap::new(),
+        method: HttpMethod::Get,
+        tls: None,
+        auth: None,
+        log_namespace: None,
+    })
+    .await;
+
+    let logs: Vec<_> = events.into_iter().map(|event| event.into_log()).collect();
+
+    // Make sure we have at least 2 events to check for unique timestamps
+    assert!(
+        logs.len() >= 2,
+        "Expected at least 2 events, got {}",
+        logs.len()
+    );
+
+    let mut timestamps = Vec::new();
+    for log in logs {
+        let query = log.get("data").expect("data must be available");
+        let query_bytes = query.as_bytes().expect("byte conversion should succeed");
+
+        // Parse the timestamp value
+        for (k, v) in url::form_urlencoded::parse(query_bytes) {
+            if k == "timestamp" {
+                timestamps.push(v.to_string());
+            }
+        }
+    }
+
+    // Check that timestamps are unique (should be different for each request)
+    let unique_timestamps: std::collections::HashSet<String> = timestamps.iter().cloned().collect();
+    assert_eq!(
+        timestamps.len(),
+        unique_timestamps.len(),
+        "Expected all timestamps to be unique"
+    );
+}
+
 /// HTTP request headers configured by the user should be applied correctly.
 #[tokio::test]
 async fn headers_applied() {
diff --git a/src/sources/prometheus/scrape.rs b/src/sources/prometheus/scrape.rs
index ac32e9dbfc47b..1c47ad764d996 100644
--- a/src/sources/prometheus/scrape.rs
+++ b/src/sources/prometheus/scrape.rs
@@ -331,7 +331,7 @@ mod test {
     use super::*;
     use crate::{
         config,
-        http::QueryParameterValue,
+        http::{ParameterValue, QueryParameterValue},
         sinks::prometheus::exporter::PrometheusExporterConfig,
         test_util::{
             components::{run_and_assert_source_compliance, HTTP_PULL_SOURCE_TAGS},
@@ -576,11 +576,16 @@ mod test {
             query: HashMap::from([
                 (
                     "key1".to_string(),
-                    QueryParameterValue::MultiParams(vec!["val2".to_string()]),
+                    QueryParameterValue::MultiParams(vec![ParameterValue::String(
+                        "val2".to_string(),
+                    )]),
                 ),
                 (
                     "key2".to_string(),
-                    QueryParameterValue::MultiParams(vec!["val1".to_string(), "val2".to_string()]),
+                    QueryParameterValue::MultiParams(vec![
+                        ParameterValue::String("val1".to_string()),
+                        ParameterValue::String("val2".to_string()),
+                    ]),
                 ),
             ]),
             auth: None,
diff --git a/src/sources/util/http_client.rs b/src/sources/util/http_client.rs
index 5433a7001a417..dd352e6ec8549 100644
--- a/src/sources/util/http_client.rs
+++ b/src/sources/util/http_client.rs
@@ -17,7 +17,7 @@ use std::{collections::HashMap, future::ready};
 use tokio_stream::wrappers::IntervalStream;
 use vector_lib::json_size::JsonSize;
 
-use crate::http::QueryParameters;
+use crate::http::{QueryParameterValue, QueryParameters};
 use crate::{
     http::{Auth, HttpClient},
     internal_events::{
@@ -76,6 +76,13 @@ pub(crate) trait HttpClientContext {
     /// (Optional) Called if the HTTP response is not 200 ('OK').
     fn on_http_response_error(&self, _uri: &Uri, _header: &Parts) {}
 
+    /// (Optional) Process the base URL before each request.
+    /// Allows for dynamic query parameters that update at runtime.
+    /// Returns a new URL if parameters need to be updated, or None to use the original URL.
+    fn process_url(&self, _url: &Uri) -> Option<Uri> {
+        None
+    }
+
     // This function can be defined to enrich events with additional HTTP
     // metadata. This function should be used rather than internal enrichment so
     // that accurate byte count metrics can be emitted.
@@ -88,10 +95,17 @@ pub(crate) fn build_url(uri: &Uri, query: &QueryParameters) -> Uri {
     if let Some(query) = uri.query() {
         serializer.extend_pairs(url::form_urlencoded::parse(query.as_bytes()));
     };
-    for (k, l) in query {
-        for v in l {
-            serializer.append_pair(k, v);
-        }
+    for (k, query_value) in query {
+        match query_value {
+            QueryParameterValue::SingleParam(param) => {
+                serializer.append_pair(k, param.value());
+            }
+            QueryParameterValue::MultiParams(params) => {
+                for v in params {
+                    serializer.append_pair(k, v.value());
+                }
+            }
+        };
     }
     let mut builder = Uri::builder();
     if let Some(scheme) = uri.scheme() {
@@ -141,12 +155,15 @@ pub(crate) async fn call<
         .take_until(inputs.shutdown)
         .map(move |_| stream::iter(inputs.urls.clone()))
         .flatten()
-        .map(move |url| {
+        .map(move |base_url| {
             let client = client.clone();
-            let endpoint = url.to_string();
+            let endpoint = base_url.to_string();
 
             let context_builder = context_builder.clone();
-            let mut context = context_builder.build(&url);
+            let mut context = context_builder.build(&base_url);
+
+            // Check if we need to process the URL dynamically (for updating VRL expressions)
+            let url = context.process_url(&base_url).unwrap_or(base_url);
 
             let mut builder = match http_method {
                 HttpMethod::Head => Request::head(&url),
diff --git a/website/cue/reference/components/sinks/base/elasticsearch.cue b/website/cue/reference/components/sinks/base/elasticsearch.cue
index 59284c4260e4a..495f8d231752d 100644
--- a/website/cue/reference/components/sinks/base/elasticsearch.cue
+++ b/website/cue/reference/components/sinks/base/elasticsearch.cue
@@ -614,7 +614,27 @@ base: components: sinks: elasticsearch: configuration: {
 			options: "*": {
 				description: "A query string parameter."
 				required:    true
-				type: string: {}
+				type: {
+					object: options: {
+						type: {
+							description: "The type of the parameter, indicating how the `value` should be treated."
+							required:    false
+							type: string: {
+								default: "string"
+								enum: {
+									string: "The parameter value is a plain string."
+									vrl:    "The parameter value is a VRL expression that will be evaluated before each request."
+								}
+							}
+						}
+						value: {
+							description: "The raw value of the parameter."
+							required:    true
+							type: string: {}
+						}
+					}
+					string: {}
+				}
 			}
 		}
 	}
diff --git a/website/cue/reference/components/sources/base/http_client.cue b/website/cue/reference/components/sources/base/http_client.cue
index 290740a94ac1a..3ba456fdd0546 100644
--- a/website/cue/reference/components/sources/base/http_client.cue
+++ b/website/cue/reference/components/sources/base/http_client.cue
@@ -614,7 +614,7 @@ base: components: sources: http_client: configuration: {
 				"X-My-Custom-Header": ["a", "vector", "of", "values"]
 			}]
 			options: "*": {
-				description: "An HTTP request header and it's value(s)."
+				description: "An HTTP request header and its value(s)."
 				required:    true
 				type: array: items: type: string: {}
 			}
@@ -644,17 +644,45 @@ base: components: sources: http_client: configuration: {
 
 			The parameters provided in this option are appended to any parameters
 			manually provided in the `endpoint` option.
+
+			VRL functions are supported within query parameters. You can
+			use functions like `now()` to dynamically modify query
+			parameter values.
 			"""
 		required: false
 		type: object: {
 			examples: [{
 				field: "value"
 				fruit: ["mango", "papaya", "kiwi"]
+				start_time: {
+					type:  "vrl"
+					value: "now()"
+				}
 			}]
 			options: "*": {
-				description: "A query string parameter and it's value(s)."
+				description: "A query string parameter and its value(s)."
 				required:    true
-				type: string: {}
+				type: {
+					object: options: {
+						type: {
+							description: "The type of the parameter, indicating how the `value` should be treated."
+							required:    false
+							type: string: {
+								default: "string"
+								enum: {
+									string: "The parameter value is a plain string."
+									vrl:    "The parameter value is a VRL expression that will be evaluated before each request."
+								}
+							}
+						}
+						value: {
+							description: "The raw value of the parameter."
+							required:    true
+							type: string: {}
+						}
+					}
+					string: {}
+				}
 			}
 		}
 	}
diff --git a/website/cue/reference/components/sources/base/prometheus_scrape.cue b/website/cue/reference/components/sources/base/prometheus_scrape.cue
index ecaff2a727185..83ddc70bd7fe8 100644
--- a/website/cue/reference/components/sources/base/prometheus_scrape.cue
+++ b/website/cue/reference/components/sources/base/prometheus_scrape.cue
@@ -229,7 +229,27 @@ base: components: sources: prometheus_scrape: configuration: {
 			options: "*": {
 				description: "A query string parameter."
 				required:    true
-				type: string: {}
+				type: {
+					object: options: {
+						type: {
+							description: "The type of the parameter, indicating how the `value` should be treated."
+							required:    false
+							type: string: {
+								default: "string"
+								enum: {
+									string: "The parameter value is a plain string."
+									vrl:    "The parameter value is a VRL expression that will be evaluated before each request."
+								}
+							}
+						}
+						value: {
+							description: "The raw value of the parameter."
+							required:    true
+							type: string: {}
+						}
+					}
+					string: {}
+				}
 			}
 		}
 	}

From abd5e0ca26c3328a7c3e7acc1aa5f283033703d6 Mon Sep 17 00:00:00 2001
From: Pavlos Rontidis <pavlos.rontidis@gmail.com>
Date: Tue, 17 Jun 2025 16:11:25 -0400
Subject: [PATCH 079/305] feat(website): add input telemetry types section for
 transforms and sinks (#23222)

* external(docs): mention that encoding config can change what telemetry types are supported

* feat(website): add input telemetry types section

* remove weird char

* visual improvements
---
 src/codecs/encoding/config.rs                 |  3 +-
 website/cue/reference/components.cue          |  7 ++-
 .../reference/components/sinks/base/amqp.cue  |  8 ++-
 .../sinks/base/aws_cloudwatch_logs.cue        |  8 ++-
 .../sinks/base/aws_kinesis_firehose.cue       |  8 ++-
 .../sinks/base/aws_kinesis_streams.cue        |  8 ++-
 .../components/sinks/base/aws_s3.cue          |  8 ++-
 .../components/sinks/base/aws_sns.cue         |  8 ++-
 .../components/sinks/base/aws_sqs.cue         |  8 ++-
 .../components/sinks/base/azure_blob.cue      |  8 ++-
 .../components/sinks/base/console.cue         |  8 ++-
 .../reference/components/sinks/base/file.cue  |  8 ++-
 .../sinks/base/gcp_chronicle_unstructured.cue |  8 ++-
 .../sinks/base/gcp_cloud_storage.cue          |  8 ++-
 .../components/sinks/base/gcp_pubsub.cue      |  8 ++-
 .../reference/components/sinks/base/http.cue  |  8 ++-
 .../components/sinks/base/humio_logs.cue      |  8 ++-
 .../reference/components/sinks/base/kafka.cue |  8 ++-
 .../reference/components/sinks/base/loki.cue  |  8 ++-
 .../reference/components/sinks/base/mqtt.cue  |  8 ++-
 .../reference/components/sinks/base/nats.cue  |  8 ++-
 .../components/sinks/base/opentelemetry.cue   |  8 ++-
 .../components/sinks/base/papertrail.cue      |  8 ++-
 .../components/sinks/base/pulsar.cue          |  8 ++-
 .../reference/components/sinks/base/redis.cue |  8 ++-
 .../components/sinks/base/socket.cue          |  8 ++-
 .../components/sinks/base/splunk_hec_logs.cue |  8 ++-
 .../components/sinks/base/webhdfs.cue         |  8 ++-
 .../components/sinks/base/websocket.cue       |  8 ++-
 .../sinks/base/websocket_server.cue           |  8 ++-
 .../components/sinks/websocket_server.cue     |  4 ++
 website/layouts/docs/component.html           | 12 +++-
 website/layouts/partials/data.html            | 15 +++--
 website/layouts/partials/telemetry_input.html | 58 +++++++++++++++++++
 .../{telemetry.html => telemetry_output.html} |  2 +-
 35 files changed, 256 insertions(+), 69 deletions(-)
 create mode 100644 website/layouts/partials/telemetry_input.html
 rename website/layouts/partials/{telemetry.html => telemetry_output.html} (97%)

diff --git a/src/codecs/encoding/config.rs b/src/codecs/encoding/config.rs
index b11fe751a7462..c3d77a5abde2c 100644
--- a/src/codecs/encoding/config.rs
+++ b/src/codecs/encoding/config.rs
@@ -8,7 +8,8 @@ use vector_lib::configurable::configurable_component;
 /// Encoding configuration.
 #[configurable_component]
 #[derive(Clone, Debug)]
-#[configurable(description = "Configures how events are encoded into raw bytes.")]
+/// Configures how events are encoded into raw bytes.
+/// The selected encoding also determines which input types (logs, metrics, traces) are supported.
 pub struct EncodingConfig {
     #[serde(flatten)]
     encoding: SerializerConfig,
diff --git a/website/cue/reference/components.cue b/website/cue/reference/components.cue
index a43b0f61f18e3..05a437fe86caa 100644
--- a/website/cue/reference/components.cue
+++ b/website/cue/reference/components.cue
@@ -439,9 +439,10 @@ components: {
 	}
 
 	#Input: {
-		logs:    bool
-		metrics: #MetricInput | null
-		traces:  bool
+		description?: string
+		logs:         bool
+		metrics:      #MetricInput | null
+		traces:       bool
 	}
 
 	#LogOutput: [Name=string]: {
diff --git a/website/cue/reference/components/sinks/base/amqp.cue b/website/cue/reference/components/sinks/base/amqp.cue
index 016cfa8404b0b..0f8c24162cb97 100644
--- a/website/cue/reference/components/sinks/base/amqp.cue
+++ b/website/cue/reference/components/sinks/base/amqp.cue
@@ -44,8 +44,12 @@ base: components: sinks: amqp: configuration: {
 		type: string: examples: ["amqp://user:password@127.0.0.1:5672/%2f?timeout=10"]
 	}
 	encoding: {
-		description: "Configures how events are encoded into raw bytes."
-		required:    true
+		description: """
+			Encoding configuration.
+			Configures how events are encoded into raw bytes.
+			The selected encoding also determines which input types (logs, metrics, traces) are supported.
+			"""
+		required: true
 		type: object: options: {
 			avro: {
 				description:   "Apache Avro-specific encoder options."
diff --git a/website/cue/reference/components/sinks/base/aws_cloudwatch_logs.cue b/website/cue/reference/components/sinks/base/aws_cloudwatch_logs.cue
index 7eda53f14b84c..a4ca1de78da7a 100644
--- a/website/cue/reference/components/sinks/base/aws_cloudwatch_logs.cue
+++ b/website/cue/reference/components/sinks/base/aws_cloudwatch_logs.cue
@@ -240,8 +240,12 @@ base: components: sinks: aws_cloudwatch_logs: configuration: {
 		type: bool: default: true
 	}
 	encoding: {
-		description: "Configures how events are encoded into raw bytes."
-		required:    true
+		description: """
+			Encoding configuration.
+			Configures how events are encoded into raw bytes.
+			The selected encoding also determines which input types (logs, metrics, traces) are supported.
+			"""
+		required: true
 		type: object: options: {
 			avro: {
 				description:   "Apache Avro-specific encoder options."
diff --git a/website/cue/reference/components/sinks/base/aws_kinesis_firehose.cue b/website/cue/reference/components/sinks/base/aws_kinesis_firehose.cue
index 0f2d80d4e8390..301ba0b2a539c 100644
--- a/website/cue/reference/components/sinks/base/aws_kinesis_firehose.cue
+++ b/website/cue/reference/components/sinks/base/aws_kinesis_firehose.cue
@@ -219,8 +219,12 @@ base: components: sinks: aws_kinesis_firehose: configuration: {
 		}
 	}
 	encoding: {
-		description: "Configures how events are encoded into raw bytes."
-		required:    true
+		description: """
+			Encoding configuration.
+			Configures how events are encoded into raw bytes.
+			The selected encoding also determines which input types (logs, metrics, traces) are supported.
+			"""
+		required: true
 		type: object: options: {
 			avro: {
 				description:   "Apache Avro-specific encoder options."
diff --git a/website/cue/reference/components/sinks/base/aws_kinesis_streams.cue b/website/cue/reference/components/sinks/base/aws_kinesis_streams.cue
index 6028c01ba4241..09b182fd89994 100644
--- a/website/cue/reference/components/sinks/base/aws_kinesis_streams.cue
+++ b/website/cue/reference/components/sinks/base/aws_kinesis_streams.cue
@@ -219,8 +219,12 @@ base: components: sinks: aws_kinesis_streams: configuration: {
 		}
 	}
 	encoding: {
-		description: "Configures how events are encoded into raw bytes."
-		required:    true
+		description: """
+			Encoding configuration.
+			Configures how events are encoded into raw bytes.
+			The selected encoding also determines which input types (logs, metrics, traces) are supported.
+			"""
+		required: true
 		type: object: options: {
 			avro: {
 				description:   "Apache Avro-specific encoder options."
diff --git a/website/cue/reference/components/sinks/base/aws_s3.cue b/website/cue/reference/components/sinks/base/aws_s3.cue
index 5654d6ac48727..6345607788038 100644
--- a/website/cue/reference/components/sinks/base/aws_s3.cue
+++ b/website/cue/reference/components/sinks/base/aws_s3.cue
@@ -328,8 +328,12 @@ base: components: sinks: aws_s3: configuration: {
 		type: string: examples: ["application/gzip"]
 	}
 	encoding: {
-		description: "Configures how events are encoded into raw bytes."
-		required:    true
+		description: """
+			Encoding configuration.
+			Configures how events are encoded into raw bytes.
+			The selected encoding also determines which input types (logs, metrics, traces) are supported.
+			"""
+		required: true
 		type: object: options: {
 			avro: {
 				description:   "Apache Avro-specific encoder options."
diff --git a/website/cue/reference/components/sinks/base/aws_sns.cue b/website/cue/reference/components/sinks/base/aws_sns.cue
index 8d183c33d9b04..107cfc7a8a7d8 100644
--- a/website/cue/reference/components/sinks/base/aws_sns.cue
+++ b/website/cue/reference/components/sinks/base/aws_sns.cue
@@ -150,8 +150,12 @@ base: components: sinks: aws_sns: configuration: {
 		}
 	}
 	encoding: {
-		description: "Configures how events are encoded into raw bytes."
-		required:    true
+		description: """
+			Encoding configuration.
+			Configures how events are encoded into raw bytes.
+			The selected encoding also determines which input types (logs, metrics, traces) are supported.
+			"""
+		required: true
 		type: object: options: {
 			avro: {
 				description:   "Apache Avro-specific encoder options."
diff --git a/website/cue/reference/components/sinks/base/aws_sqs.cue b/website/cue/reference/components/sinks/base/aws_sqs.cue
index 0493d2ede171f..b8a0ee23ccc10 100644
--- a/website/cue/reference/components/sinks/base/aws_sqs.cue
+++ b/website/cue/reference/components/sinks/base/aws_sqs.cue
@@ -150,8 +150,12 @@ base: components: sinks: aws_sqs: configuration: {
 		}
 	}
 	encoding: {
-		description: "Configures how events are encoded into raw bytes."
-		required:    true
+		description: """
+			Encoding configuration.
+			Configures how events are encoded into raw bytes.
+			The selected encoding also determines which input types (logs, metrics, traces) are supported.
+			"""
+		required: true
 		type: object: options: {
 			avro: {
 				description:   "Apache Avro-specific encoder options."
diff --git a/website/cue/reference/components/sinks/base/azure_blob.cue b/website/cue/reference/components/sinks/base/azure_blob.cue
index 0bd8b0f494979..5fd082eed789c 100644
--- a/website/cue/reference/components/sinks/base/azure_blob.cue
+++ b/website/cue/reference/components/sinks/base/azure_blob.cue
@@ -176,8 +176,12 @@ base: components: sinks: azure_blob: configuration: {
 		type: string: examples: ["my-logs"]
 	}
 	encoding: {
-		description: "Configures how events are encoded into raw bytes."
-		required:    true
+		description: """
+			Encoding configuration.
+			Configures how events are encoded into raw bytes.
+			The selected encoding also determines which input types (logs, metrics, traces) are supported.
+			"""
+		required: true
 		type: object: options: {
 			avro: {
 				description:   "Apache Avro-specific encoder options."
diff --git a/website/cue/reference/components/sinks/base/console.cue b/website/cue/reference/components/sinks/base/console.cue
index a140bedf2b276..acd35724c8d26 100644
--- a/website/cue/reference/components/sinks/base/console.cue
+++ b/website/cue/reference/components/sinks/base/console.cue
@@ -28,8 +28,12 @@ base: components: sinks: console: configuration: {
 		}
 	}
 	encoding: {
-		description: "Configures how events are encoded into raw bytes."
-		required:    true
+		description: """
+			Encoding configuration.
+			Configures how events are encoded into raw bytes.
+			The selected encoding also determines which input types (logs, metrics, traces) are supported.
+			"""
+		required: true
 		type: object: options: {
 			avro: {
 				description:   "Apache Avro-specific encoder options."
diff --git a/website/cue/reference/components/sinks/base/file.cue b/website/cue/reference/components/sinks/base/file.cue
index 0cf8178fdae08..bcd793427b2f4 100644
--- a/website/cue/reference/components/sinks/base/file.cue
+++ b/website/cue/reference/components/sinks/base/file.cue
@@ -48,8 +48,12 @@ base: components: sinks: file: configuration: {
 		}
 	}
 	encoding: {
-		description: "Configures how events are encoded into raw bytes."
-		required:    true
+		description: """
+			Encoding configuration.
+			Configures how events are encoded into raw bytes.
+			The selected encoding also determines which input types (logs, metrics, traces) are supported.
+			"""
+		required: true
 		type: object: options: {
 			avro: {
 				description:   "Apache Avro-specific encoder options."
diff --git a/website/cue/reference/components/sinks/base/gcp_chronicle_unstructured.cue b/website/cue/reference/components/sinks/base/gcp_chronicle_unstructured.cue
index 1b9edc8daea52..57a747fd21cb8 100644
--- a/website/cue/reference/components/sinks/base/gcp_chronicle_unstructured.cue
+++ b/website/cue/reference/components/sinks/base/gcp_chronicle_unstructured.cue
@@ -116,8 +116,12 @@ base: components: sinks: gcp_chronicle_unstructured: configuration: {
 		type: string: examples: ["c8c65bfa-5f2c-42d4-9189-64bb7b939f2c"]
 	}
 	encoding: {
-		description: "Configures how events are encoded into raw bytes."
-		required:    true
+		description: """
+			Encoding configuration.
+			Configures how events are encoded into raw bytes.
+			The selected encoding also determines which input types (logs, metrics, traces) are supported.
+			"""
+		required: true
 		type: object: options: {
 			avro: {
 				description:   "Apache Avro-specific encoder options."
diff --git a/website/cue/reference/components/sinks/base/gcp_cloud_storage.cue b/website/cue/reference/components/sinks/base/gcp_cloud_storage.cue
index 45e175ee58aee..0a0b423693bef 100644
--- a/website/cue/reference/components/sinks/base/gcp_cloud_storage.cue
+++ b/website/cue/reference/components/sinks/base/gcp_cloud_storage.cue
@@ -189,8 +189,12 @@ base: components: sinks: gcp_cloud_storage: configuration: {
 		type: string: {}
 	}
 	encoding: {
-		description: "Configures how events are encoded into raw bytes."
-		required:    true
+		description: """
+			Encoding configuration.
+			Configures how events are encoded into raw bytes.
+			The selected encoding also determines which input types (logs, metrics, traces) are supported.
+			"""
+		required: true
 		type: object: options: {
 			avro: {
 				description:   "Apache Avro-specific encoder options."
diff --git a/website/cue/reference/components/sinks/base/gcp_pubsub.cue b/website/cue/reference/components/sinks/base/gcp_pubsub.cue
index 17e23079783ae..5db694873ebce 100644
--- a/website/cue/reference/components/sinks/base/gcp_pubsub.cue
+++ b/website/cue/reference/components/sinks/base/gcp_pubsub.cue
@@ -95,8 +95,12 @@ base: components: sinks: gcp_pubsub: configuration: {
 		type: string: {}
 	}
 	encoding: {
-		description: "Configures how events are encoded into raw bytes."
-		required:    true
+		description: """
+			Encoding configuration.
+			Configures how events are encoded into raw bytes.
+			The selected encoding also determines which input types (logs, metrics, traces) are supported.
+			"""
+		required: true
 		type: object: options: {
 			avro: {
 				description:   "Apache Avro-specific encoder options."
diff --git a/website/cue/reference/components/sinks/base/http.cue b/website/cue/reference/components/sinks/base/http.cue
index 71f7bb5945545..b041227f5b55a 100644
--- a/website/cue/reference/components/sinks/base/http.cue
+++ b/website/cue/reference/components/sinks/base/http.cue
@@ -271,8 +271,12 @@ base: components: sinks: http: configuration: {
 		}
 	}
 	encoding: {
-		description: "Configures how events are encoded into raw bytes."
-		required:    true
+		description: """
+			Encoding configuration.
+			Configures how events are encoded into raw bytes.
+			The selected encoding also determines which input types (logs, metrics, traces) are supported.
+			"""
+		required: true
 		type: object: options: {
 			avro: {
 				description:   "Apache Avro-specific encoder options."
diff --git a/website/cue/reference/components/sinks/base/humio_logs.cue b/website/cue/reference/components/sinks/base/humio_logs.cue
index 153dfa5324fdc..546a244d84959 100644
--- a/website/cue/reference/components/sinks/base/humio_logs.cue
+++ b/website/cue/reference/components/sinks/base/humio_logs.cue
@@ -94,8 +94,12 @@ base: components: sinks: humio_logs: configuration: {
 		}
 	}
 	encoding: {
-		description: "Configures how events are encoded into raw bytes."
-		required:    true
+		description: """
+			Encoding configuration.
+			Configures how events are encoded into raw bytes.
+			The selected encoding also determines which input types (logs, metrics, traces) are supported.
+			"""
+		required: true
 		type: object: options: {
 			avro: {
 				description:   "Apache Avro-specific encoder options."
diff --git a/website/cue/reference/components/sinks/base/kafka.cue b/website/cue/reference/components/sinks/base/kafka.cue
index f4ec89ef30d8c..97fecdbb2d2d3 100644
--- a/website/cue/reference/components/sinks/base/kafka.cue
+++ b/website/cue/reference/components/sinks/base/kafka.cue
@@ -83,8 +83,12 @@ base: components: sinks: kafka: configuration: {
 		}
 	}
 	encoding: {
-		description: "Configures how events are encoded into raw bytes."
-		required:    true
+		description: """
+			Encoding configuration.
+			Configures how events are encoded into raw bytes.
+			The selected encoding also determines which input types (logs, metrics, traces) are supported.
+			"""
+		required: true
 		type: object: options: {
 			avro: {
 				description:   "Apache Avro-specific encoder options."
diff --git a/website/cue/reference/components/sinks/base/loki.cue b/website/cue/reference/components/sinks/base/loki.cue
index 218aed6a861fb..4dc8d00fcf13f 100644
--- a/website/cue/reference/components/sinks/base/loki.cue
+++ b/website/cue/reference/components/sinks/base/loki.cue
@@ -273,8 +273,12 @@ base: components: sinks: loki: configuration: {
 		}
 	}
 	encoding: {
-		description: "Configures how events are encoded into raw bytes."
-		required:    true
+		description: """
+			Encoding configuration.
+			Configures how events are encoded into raw bytes.
+			The selected encoding also determines which input types (logs, metrics, traces) are supported.
+			"""
+		required: true
 		type: object: options: {
 			avro: {
 				description:   "Apache Avro-specific encoder options."
diff --git a/website/cue/reference/components/sinks/base/mqtt.cue b/website/cue/reference/components/sinks/base/mqtt.cue
index 12bed930db3c8..c8f4ed9bd1fed 100644
--- a/website/cue/reference/components/sinks/base/mqtt.cue
+++ b/website/cue/reference/components/sinks/base/mqtt.cue
@@ -38,8 +38,12 @@ base: components: sinks: mqtt: configuration: {
 		type: string: {}
 	}
 	encoding: {
-		description: "Configures how events are encoded into raw bytes."
-		required:    true
+		description: """
+			Encoding configuration.
+			Configures how events are encoded into raw bytes.
+			The selected encoding also determines which input types (logs, metrics, traces) are supported.
+			"""
+		required: true
 		type: object: options: {
 			avro: {
 				description:   "Apache Avro-specific encoder options."
diff --git a/website/cue/reference/components/sinks/base/nats.cue b/website/cue/reference/components/sinks/base/nats.cue
index d663a69f666af..8cf579f6a2e3b 100644
--- a/website/cue/reference/components/sinks/base/nats.cue
+++ b/website/cue/reference/components/sinks/base/nats.cue
@@ -128,8 +128,12 @@ base: components: sinks: nats: configuration: {
 		}
 	}
 	encoding: {
-		description: "Configures how events are encoded into raw bytes."
-		required:    true
+		description: """
+			Encoding configuration.
+			Configures how events are encoded into raw bytes.
+			The selected encoding also determines which input types (logs, metrics, traces) are supported.
+			"""
+		required: true
 		type: object: options: {
 			avro: {
 				description:   "Apache Avro-specific encoder options."
diff --git a/website/cue/reference/components/sinks/base/opentelemetry.cue b/website/cue/reference/components/sinks/base/opentelemetry.cue
index f7bb74741c554..14ddde902e9d7 100644
--- a/website/cue/reference/components/sinks/base/opentelemetry.cue
+++ b/website/cue/reference/components/sinks/base/opentelemetry.cue
@@ -274,8 +274,12 @@ base: components: sinks: opentelemetry: configuration: protocol: {
 			}
 		}
 		encoding: {
-			description: "Configures how events are encoded into raw bytes."
-			required:    true
+			description: """
+				Encoding configuration.
+				Configures how events are encoded into raw bytes.
+				The selected encoding also determines which input types (logs, metrics, traces) are supported.
+				"""
+			required: true
 			type: object: options: {
 				avro: {
 					description:   "Apache Avro-specific encoder options."
diff --git a/website/cue/reference/components/sinks/base/papertrail.cue b/website/cue/reference/components/sinks/base/papertrail.cue
index de4bb6b34ba28..b20c940cad1f5 100644
--- a/website/cue/reference/components/sinks/base/papertrail.cue
+++ b/website/cue/reference/components/sinks/base/papertrail.cue
@@ -28,8 +28,12 @@ base: components: sinks: papertrail: configuration: {
 		}
 	}
 	encoding: {
-		description: "Configures how events are encoded into raw bytes."
-		required:    true
+		description: """
+			Encoding configuration.
+			Configures how events are encoded into raw bytes.
+			The selected encoding also determines which input types (logs, metrics, traces) are supported.
+			"""
+		required: true
 		type: object: options: {
 			avro: {
 				description:   "Apache Avro-specific encoder options."
diff --git a/website/cue/reference/components/sinks/base/pulsar.cue b/website/cue/reference/components/sinks/base/pulsar.cue
index b24d5bce94de6..b423fa09c6f73 100644
--- a/website/cue/reference/components/sinks/base/pulsar.cue
+++ b/website/cue/reference/components/sinks/base/pulsar.cue
@@ -162,8 +162,12 @@ base: components: sinks: pulsar: configuration: {
 		}
 	}
 	encoding: {
-		description: "Configures how events are encoded into raw bytes."
-		required:    true
+		description: """
+			Encoding configuration.
+			Configures how events are encoded into raw bytes.
+			The selected encoding also determines which input types (logs, metrics, traces) are supported.
+			"""
+		required: true
 		type: object: options: {
 			avro: {
 				description:   "Apache Avro-specific encoder options."
diff --git a/website/cue/reference/components/sinks/base/redis.cue b/website/cue/reference/components/sinks/base/redis.cue
index e93567ba823fd..9c0b95a42c0a1 100644
--- a/website/cue/reference/components/sinks/base/redis.cue
+++ b/website/cue/reference/components/sinks/base/redis.cue
@@ -81,8 +81,12 @@ base: components: sinks: redis: configuration: {
 		}
 	}
 	encoding: {
-		description: "Configures how events are encoded into raw bytes."
-		required:    true
+		description: """
+			Encoding configuration.
+			Configures how events are encoded into raw bytes.
+			The selected encoding also determines which input types (logs, metrics, traces) are supported.
+			"""
+		required: true
 		type: object: options: {
 			avro: {
 				description:   "Apache Avro-specific encoder options."
diff --git a/website/cue/reference/components/sinks/base/socket.cue b/website/cue/reference/components/sinks/base/socket.cue
index 76e1365789869..cb6aac0fd9fae 100644
--- a/website/cue/reference/components/sinks/base/socket.cue
+++ b/website/cue/reference/components/sinks/base/socket.cue
@@ -40,8 +40,12 @@ base: components: sinks: socket: configuration: {
 		type: string: examples: ["92.12.333.224:5000", "https://somehost:5000"]
 	}
 	encoding: {
-		description: "Configures how events are encoded into raw bytes."
-		required:    true
+		description: """
+			Encoding configuration.
+			Configures how events are encoded into raw bytes.
+			The selected encoding also determines which input types (logs, metrics, traces) are supported.
+			"""
+		required: true
 		type: object: options: {
 			avro: {
 				description:   "Apache Avro-specific encoder options."
diff --git a/website/cue/reference/components/sinks/base/splunk_hec_logs.cue b/website/cue/reference/components/sinks/base/splunk_hec_logs.cue
index 0c8187c067592..48d07e78b8024 100644
--- a/website/cue/reference/components/sinks/base/splunk_hec_logs.cue
+++ b/website/cue/reference/components/sinks/base/splunk_hec_logs.cue
@@ -144,8 +144,12 @@ base: components: sinks: splunk_hec_logs: configuration: {
 		type: string: {}
 	}
 	encoding: {
-		description: "Configures how events are encoded into raw bytes."
-		required:    true
+		description: """
+			Encoding configuration.
+			Configures how events are encoded into raw bytes.
+			The selected encoding also determines which input types (logs, metrics, traces) are supported.
+			"""
+		required: true
 		type: object: options: {
 			avro: {
 				description:   "Apache Avro-specific encoder options."
diff --git a/website/cue/reference/components/sinks/base/webhdfs.cue b/website/cue/reference/components/sinks/base/webhdfs.cue
index a011bc24262e5..ca14f7bd07878 100644
--- a/website/cue/reference/components/sinks/base/webhdfs.cue
+++ b/website/cue/reference/components/sinks/base/webhdfs.cue
@@ -94,8 +94,12 @@ base: components: sinks: webhdfs: configuration: {
 		}
 	}
 	encoding: {
-		description: "Configures how events are encoded into raw bytes."
-		required:    true
+		description: """
+			Encoding configuration.
+			Configures how events are encoded into raw bytes.
+			The selected encoding also determines which input types (logs, metrics, traces) are supported.
+			"""
+		required: true
 		type: object: options: {
 			avro: {
 				description:   "Apache Avro-specific encoder options."
diff --git a/website/cue/reference/components/sinks/base/websocket.cue b/website/cue/reference/components/sinks/base/websocket.cue
index d6cadf59f1fbc..0694c649db191 100644
--- a/website/cue/reference/components/sinks/base/websocket.cue
+++ b/website/cue/reference/components/sinks/base/websocket.cue
@@ -205,8 +205,12 @@ base: components: sinks: websocket: configuration: {
 		}
 	}
 	encoding: {
-		description: "Configures how events are encoded into raw bytes."
-		required:    true
+		description: """
+			Encoding configuration.
+			Configures how events are encoded into raw bytes.
+			The selected encoding also determines which input types (logs, metrics, traces) are supported.
+			"""
+		required: true
 		type: object: options: {
 			avro: {
 				description:   "Apache Avro-specific encoder options."
diff --git a/website/cue/reference/components/sinks/base/websocket_server.cue b/website/cue/reference/components/sinks/base/websocket_server.cue
index 94c4ce577834c..ada3da7debe2e 100644
--- a/website/cue/reference/components/sinks/base/websocket_server.cue
+++ b/website/cue/reference/components/sinks/base/websocket_server.cue
@@ -84,8 +84,12 @@ base: components: sinks: websocket_server: configuration: {
 		}
 	}
 	encoding: {
-		description: "Configures how events are encoded into raw bytes."
-		required:    true
+		description: """
+			Encoding configuration.
+			Configures how events are encoded into raw bytes.
+			The selected encoding also determines which input types (logs, metrics, traces) are supported.
+			"""
+		required: true
 		type: object: options: {
 			avro: {
 				description:   "Apache Avro-specific encoder options."
diff --git a/website/cue/reference/components/sinks/websocket_server.cue b/website/cue/reference/components/sinks/websocket_server.cue
index 1a76c607aa7ed..31c9d4af42d1d 100644
--- a/website/cue/reference/components/sinks/websocket_server.cue
+++ b/website/cue/reference/components/sinks/websocket_server.cue
@@ -66,6 +66,10 @@ components: sinks: websocket_server: {
 	}
 
 	input: {
+		description: """
+			The supported input types depend on the encoding configuration.
+			This sink accepts any input type supported by the specified encoder.
+			"""
 		logs: true
 		metrics: {
 			counter:      true
diff --git a/website/layouts/docs/component.html b/website/layouts/docs/component.html
index 93f3e34d66095..9c52d2f2fdf56 100644
--- a/website/layouts/docs/component.html
+++ b/website/layouts/docs/component.html
@@ -21,7 +21,7 @@
         {{ partial "breadcrumb.html" . }}
       </div>
 
-      <div{{ if not $noindex }} id="page-content"{{ end }}>
+      <div {{ if not $noindex }} id="page-content"{{ end }}>
         <h1 class="dark:text-gray-50 font-secondary font-extrabold text-4xl lg:text-5xl leading-tight tracking-tight">
           {{ .Title | markdownify }}
         </h1>
@@ -80,16 +80,22 @@ <h1 class="dark:text-gray-50 font-secondary font-extrabold text-4xl lg:text-5xl
           {{ partial "data.html" (dict "component_env_vars" . ) }}
           {{ end }}
 
+          {{/* Component log/metric/trace input types */}}
+          {{ with $config.input }}
+          {{ partial "heading.html" (dict "text" "Input Types" "level" 2) }}
+          {{ partial "data.html" (dict "component_input_types" . ) }}
+          {{ end }}
+
           {{/* Component outputs */}}
           {{ with $config.outputs }}
           {{ partial "heading.html" (dict "text" "Outputs" "level" 2) }}
           {{ partial "data.html" (dict "component_outputs" . ) }}
           {{ end }}
 
-          {{/* Component log/metric/trace output */}}
+          {{/* Component log/metric/trace output types */}}
           {{ with $config.output }}
           {{ partial "heading.html" (dict "text" "Output Types" "level" 2) }}
-          {{ partial "data.html" (dict "component_output" . ) }}
+          {{ partial "data.html" (dict "component_output_types" . ) }}
           {{ end }}
 
           {{/* Component telemetry output */}}
diff --git a/website/layouts/partials/data.html b/website/layouts/partials/data.html
index 5f6f0165cb57f..266593b360f4e 100644
--- a/website/layouts/partials/data.html
+++ b/website/layouts/partials/data.html
@@ -253,8 +253,13 @@
     </div>
   {{ end }}
 
+  {{/* Source/transform/sink input */}}
+  {{ with .component_input_types }}
+    {{ template "telemetry_input" . }}
+  {{ end }}
+
   {{/* Source/transform/sink output */}}
-  {{ with .component_output }}
+  {{ with .component_output_types }}
     <div class="py-3 px-5">
       {{ with .metrics }}
         <span class="flex items-center justify-between">
@@ -274,7 +279,7 @@
         </span>
 
         <div class="mt-3 border rounded divide-y dark:border-gray-700 dark:divide-gray-700">
-          {{ template "telemetry" . }}
+          {{ template "telemetry_output" . }}
         </div>
       {{ end }}
 
@@ -284,7 +289,7 @@
         </span>
 
         <div class="mt-3 border rounded divide-y dark:border-gray-700 dark:divide-gray-700">
-          {{ template "telemetry" . }}
+          {{ template "telemetry_output" . }}
         </div>
       {{ end }}
 
@@ -447,7 +452,7 @@
         </span>
 
         <div class="mt-3 border rounded divide-y dark:border-gray-700 dark:divide-gray-700">
-          {{ template "telemetry" . }}
+          {{ template "telemetry_output" . }}
         </div>
       {{ end }}
 
@@ -460,7 +465,7 @@
         </span>
 
         <div class="mt-3 border rounded divide-y dark:border-gray-700 dark:divide-gray-700">
-          {{ template "telemetry" . }}
+          {{ template "telemetry_output" . }}
         </div>
       {{ end }}
 
diff --git a/website/layouts/partials/telemetry_input.html b/website/layouts/partials/telemetry_input.html
new file mode 100644
index 0000000000000..3d675b09c844f
--- /dev/null
+++ b/website/layouts/partials/telemetry_input.html
@@ -0,0 +1,58 @@
+{{ define "telemetry_input" }}
+  <div class="py-3 px-5 divide-y divide-gray-200 dark:divide-gray-700">
+    <div class="pb-4 prose dark:prose-dark max-w-none text-sm italic">
+      {{ with .description }}
+        {{ . | markdownify }}
+      {{ else }}
+        The following section shows which telemetry data types are supported.
+      {{ end }}
+    </div>
+
+    {{ if .logs }}
+      <div class="py-4">
+        <span class="flex items-center">
+          {{ partial "heading.html" (dict "text" "Logs" "level" 3 "id" "input-logs" "href" "#input-logs") }}
+        </span>
+        <div class="mt-2 text-sm text-gray-700 dark:text-gray-300">Log events are supported.</div>
+      </div>
+    {{ end }}
+
+    {{ with .metrics }}
+      {{ $has := slice }}
+      {{ range $k, $v := . }}
+        {{ if $v }}
+          {{ $has = $has | append $k }}
+        {{ end }}
+      {{ end }}
+      {{ if gt (len $has) 0 }}
+        <div class="py-4">
+          <span class="flex items-center">
+            {{ partial "heading.html" (dict "text" "Metrics" "level" 3 "id" "input-metrics" "href" "#input-metrics") }}
+          </span>
+
+          <div class="mt-3 text-sm text-gray-700 dark:text-gray-300">The following metrics are supported:</div>
+
+          <div class="mt-2 border rounded px-4 py-2 dark:border-gray-700">
+            <div class="flex flex-wrap gap-2 text-sm text-gray-700 dark:text-gray-300">
+              {{ range $has }}
+                <span class="bg-gray-100 dark:bg-gray-800 px-2 py-0.5 rounded font-mono">
+                  <code>{{ . }}</code>
+                </span>
+              {{ end }}
+            </div>
+          </div>
+        </div>
+      {{ end }}
+    {{ end }}
+
+    {{ if .traces }}
+      <div class="py-4">
+        <span class="flex items-center">
+          {{ partial "heading.html" (dict "text" "Traces" "level" 3 "id" "input-traces" "href" "#input-traces") }}
+        </span>
+        <div class="mt-2 text-sm text-gray-700 dark:text-gray-300">Trace events are supported.</div>
+      </div>
+    {{ end }}
+
+  </div>
+{{ end }}
diff --git a/website/layouts/partials/telemetry.html b/website/layouts/partials/telemetry_output.html
similarity index 97%
rename from website/layouts/partials/telemetry.html
rename to website/layouts/partials/telemetry_output.html
index 74940d29ecedd..bb5875786e1c7 100644
--- a/website/layouts/partials/telemetry.html
+++ b/website/layouts/partials/telemetry_output.html
@@ -1,4 +1,4 @@
-{{ define "telemetry" }}
+{{ define "telemetry_output" }}
 {{ range $k, $v := . }}
 <div class="py-3 px-5">
   <span class="flex justify-between items-center">

From 2f71bb716fc052493e5aa396456cf9db1dd92722 Mon Sep 17 00:00:00 2001
From: Thomas <thomas.schneider@datadoghq.com>
Date: Tue, 17 Jun 2025 15:27:07 -0400
Subject: [PATCH 080/305] chore(core): use latest VRL and update function
 signature (#23221)

* Update to_alternative_components function signature from VRL

* Simplify + add interval_ms to mut code path

* Fix clippy warnings

* cargo vdev build licenses
---
 Cargo.lock                              | 52 ++++++++++------
 Cargo.toml                              |  2 +-
 LICENSE-3rdparty.csv                    |  4 +-
 lib/vector-core/src/event/vrl_target.rs | 83 +++++++++++--------------
 4 files changed, 73 insertions(+), 68 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 4c9f0d84abbc3..dd31764fa86eb 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3218,12 +3218,16 @@ dependencies = [
 
 [[package]]
 name = "domain"
-version = "0.10.4"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c84070523f8ba0f9127ff156920f27eb27b302b425efe60bf5f41ec244d1c60"
+checksum = "a11dd7f04a6a6d2aea0153c6e31f5ea7af8b2efdf52cdaeea7a9a592c7fefef9"
 dependencies = [
+ "bumpalo",
  "bytes 1.10.1",
+ "domain-macros",
  "futures-util",
+ "hashbrown 0.14.5",
+ "log",
  "moka",
  "octseq",
  "rand 0.8.5",
@@ -3234,6 +3238,17 @@ dependencies = [
  "tracing 0.1.41",
 ]
 
+[[package]]
+name = "domain-macros"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0e197fdfd2cdb5fdeb7f8ddcf3aed5d5d04ecde2890d448b14ffb716f7376b70"
+dependencies = [
+ "proc-macro2 1.0.95",
+ "quote 1.0.40",
+ "syn 2.0.102",
+]
+
 [[package]]
 name = "dotenvy"
 version = "0.15.7"
@@ -4186,9 +4201,9 @@ dependencies = [
 
 [[package]]
 name = "grok"
-version = "2.0.0"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "273797968160270573071022613fc4aa28b91fe68f3eef6c96a1b2a1947ddfbd"
+checksum = "6c52724b609896f661a3f4641dd3a44dc602958ef615857c12d00756b4e9355b"
 dependencies = [
  "glob",
  "onig",
@@ -4708,7 +4723,7 @@ dependencies = [
  "httpdate",
  "itoa",
  "pin-project-lite",
- "socket2 0.5.10",
+ "socket2 0.4.10",
  "tokio",
  "tower-service",
  "tracing 0.1.41",
@@ -6430,9 +6445,9 @@ dependencies = [
 
 [[package]]
 name = "nix"
-version = "0.29.0"
+version = "0.30.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46"
+checksum = "74523f3a35e05aba87a1d978330aef40f67b0304ac79c1c00b294c9830543db6"
 dependencies = [
  "bitflags 2.9.0",
  "cfg-if",
@@ -6821,11 +6836,11 @@ dependencies = [
 
 [[package]]
 name = "onig"
-version = "6.4.0"
+version = "6.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c4b31c8722ad9171c6d77d3557db078cab2bd50afcc9d09c8b315c59df8ca4f"
+checksum = "336b9c63443aceef14bea841b899035ae3abe89b7c486aaf4c5bd8aafedac3f0"
 dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.9.0",
  "libc",
  "once_cell",
  "onig_sys",
@@ -6833,9 +6848,9 @@ dependencies = [
 
 [[package]]
 name = "onig_sys"
-version = "69.8.1"
+version = "69.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b829e3d7e9cc74c7e315ee8edb185bf4190da5acde74afd7fc59c35b1f086e7"
+checksum = "c7f86c6eef3d6df15f23bcfb6af487cbd2fed4e5581d58d5bf1f5f8b7f6727dc"
 dependencies = [
  "cc",
  "pkg-config",
@@ -7785,7 +7800,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "be769465445e8c1474e9c5dac2018218498557af32d9ed057325ec9a41ae81bf"
 dependencies = [
  "heck 0.5.0",
- "itertools 0.14.0",
+ "itertools 0.10.5",
  "log",
  "multimap",
  "once_cell",
@@ -7831,7 +7846,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8a56d757972c98b346a9b766e3f02746cde6dd1cd1d1d563472929fdd74bec4d"
 dependencies = [
  "anyhow",
- "itertools 0.14.0",
+ "itertools 0.10.5",
  "proc-macro2 1.0.95",
  "quote 1.0.40",
  "syn 2.0.102",
@@ -9027,9 +9042,9 @@ dependencies = [
 
 [[package]]
 name = "rustyline"
-version = "15.0.0"
+version = "16.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2ee1e066dc922e513bda599c6ccb5f3bb2b0ea5870a579448f2622993f0a9a2f"
+checksum = "62fd9ca5ebc709e8535e8ef7c658eb51457987e48c98ead2be482172accc408d"
 dependencies = [
  "bitflags 2.9.0",
  "cfg-if",
@@ -9037,7 +9052,7 @@ dependencies = [
  "libc",
  "log",
  "memchr",
- "nix 0.29.0",
+ "nix 0.30.1",
  "unicode-segmentation",
  "unicode-width 0.2.0",
  "utf8parse",
@@ -12005,8 +12020,7 @@ checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d"
 [[package]]
 name = "vrl"
 version = "0.24.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9ceadaa40aef567a26079ff014ca7a567ba85344f1b81090b5ec7d7bb16a219"
+source = "git+https://github.com/vectordotdev/vrl.git?branch=main#c45f0d7165e7f39a7b353dc8095565b3df9c073f"
 dependencies = [
  "aes",
  "aes-siv",
diff --git a/Cargo.toml b/Cargo.toml
index 86e12671670dd..f622517aa2795 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -174,7 +174,7 @@ vector-lib = { path = "lib/vector-lib", default-features = false, features = ["v
 vector-config = { path = "lib/vector-config" }
 vector-config-common = { path = "lib/vector-config-common" }
 vector-config-macros = { path = "lib/vector-config-macros" }
-vrl = { features = ["arbitrary", "cli", "test", "test_framework"], version = "0.24.0" }
+vrl = { git = "https://github.com/vectordotdev/vrl.git", branch = "main", features = ["arbitrary", "cli", "test", "test_framework"] }
 
 [dependencies]
 cfg-if.workspace = true
diff --git a/LICENSE-3rdparty.csv b/LICENSE-3rdparty.csv
index ee87492b9319d..cd7ce1243f97c 100644
--- a/LICENSE-3rdparty.csv
+++ b/LICENSE-3rdparty.csv
@@ -267,7 +267,7 @@ graphql_client_codegen,https://github.com/graphql-rust/graphql-client,Apache-2.0
 graphql_query_derive,https://github.com/graphql-rust/graphql-client,Apache-2.0 OR MIT,Tom Houlé <tom@tomhoule.com>
 greptime-proto,https://github.com/GreptimeTeam/greptime-proto,Apache-2.0,The greptime-proto Authors
 greptimedb-ingester,https://github.com/GreptimeTeam/greptimedb-ingester-rust,Apache-2.0,The greptimedb-ingester Authors
-grok,https://github.com/daschl/grok,Apache-2.0,Michael Nitschinger <michael@nitschinger.at>
+grok,https://github.com/mmastrac/grok,Apache-2.0,"Matt Mastracci <matthew@mastracci.com>, Michael Nitschinger <michael@nitschinger.at>"
 group,https://github.com/zkcrypto/group,MIT OR Apache-2.0,"Sean Bowe <ewillbefull@gmail.com>, Jack Grigg <jack@z.cash>"
 h2,https://github.com/hyperium/h2,MIT,"Carl Lerche <me@carllerche.com>, Sean McArthur <sean@seanmonstar.com>"
 half,https://github.com/starkat99/half-rs,MIT OR Apache-2.0,Kathryn Long <squeeself@gmail.com>
@@ -434,7 +434,7 @@ object,https://github.com/gimli-rs/object,Apache-2.0 OR MIT,The object Authors
 octseq,https://github.com/NLnetLabs/octets/,BSD-3-Clause,NLnet Labs <rust-team@nlnetlabs.nl>
 ofb,https://github.com/RustCrypto/block-modes,MIT OR Apache-2.0,RustCrypto Developers
 once_cell,https://github.com/matklad/once_cell,MIT OR Apache-2.0,Aleksey Kladov <aleksey.kladov@gmail.com>
-onig,http://github.com/iwillspeak/rust-onig,MIT,"Will Speak <will@willspeak.me>, Ivan Ivashchenko <defuz@me.com>"
+onig,https://github.com/iwillspeak/rust-onig,MIT,"Will Speak <will@willspeak.me>, Ivan Ivashchenko <defuz@me.com>"
 opaque-debug,https://github.com/RustCrypto/utils,MIT OR Apache-2.0,RustCrypto Developers
 opendal,https://github.com/apache/opendal,Apache-2.0,Apache OpenDAL <dev@opendal.apache.org>
 openidconnect,https://github.com/ramosbugs/openidconnect-rs,MIT,David A. Ramos <ramos@cs.stanford.edu>
diff --git a/lib/vector-core/src/event/vrl_target.rs b/lib/vector-core/src/event/vrl_target.rs
index d7243483693f5..ddb8507dce1e3 100644
--- a/lib/vector-core/src/event/vrl_target.rs
+++ b/lib/vector-core/src/event/vrl_target.rs
@@ -284,10 +284,7 @@ impl Target for VrlTarget {
                         return Err(MetricPathError::SetPathError.to_string());
                     }
 
-                    if let Some(paths) = path
-                        .to_alternative_components(MAX_METRIC_PATH_DEPTH)
-                        .first()
-                    {
+                    if let Some(paths) = path.to_alternative_components(MAX_METRIC_PATH_DEPTH) {
                         match paths.as_slice() {
                             ["tags"] => {
                                 let value =
@@ -418,7 +415,6 @@ impl Target for VrlTarget {
                     if let Some(paths) = target_path
                         .path
                         .to_alternative_components(MAX_METRIC_PATH_DEPTH)
-                        .first()
                     {
                         let removed_value = match paths.as_slice() {
                             ["namespace"] => metric.series.name.namespace.take().map(Into::into),
@@ -447,10 +443,10 @@ impl Target for VrlTarget {
 
                         value.remove(&target_path.path, false);
 
-                        return Ok(removed_value);
+                        Ok(removed_value)
+                    } else {
+                        Ok(None)
                     }
-
-                    Ok(None)
                 }
             },
             PathPrefix::Metadata => Ok(self
@@ -497,27 +493,25 @@ fn target_get_metric<'a>(
 
     let value = value.get(path);
 
-    for paths in path.to_alternative_components(MAX_METRIC_PATH_DEPTH) {
-        match paths.as_slice() {
-            ["name"] | ["kind"] | ["type"] | ["tags", _] => return Ok(value),
-            ["namespace"] | ["timestamp"] | ["interval_ms"] | ["tags"] => {
-                if let Some(value) = value {
-                    return Ok(Some(value));
-                }
-            }
-            _ => {
-                return Err(MetricPathError::InvalidPath {
-                    path: &path.to_string(),
-                    expected: VALID_METRIC_PATHS_GET,
-                }
-                .to_string())
-            }
+    let Some(paths) = path.to_alternative_components(MAX_METRIC_PATH_DEPTH) else {
+        return Ok(None);
+    };
+
+    match paths.as_slice() {
+        ["name"]
+        | ["kind"]
+        | ["type"]
+        | ["tags", _]
+        | ["namespace"]
+        | ["timestamp"]
+        | ["interval_ms"]
+        | ["tags"] => Ok(value),
+        _ => Err(MetricPathError::InvalidPath {
+            path: &path.to_string(),
+            expected: VALID_METRIC_PATHS_GET,
         }
+        .to_string()),
     }
-
-    // We only reach this point if we have requested a tag that doesn't exist or an empty
-    // field.
-    Ok(None)
 }
 
 fn target_get_mut_metric<'a>(
@@ -530,27 +524,24 @@ fn target_get_mut_metric<'a>(
 
     let value = value.get_mut(path);
 
-    for paths in path.to_alternative_components(MAX_METRIC_PATH_DEPTH) {
-        match paths.as_slice() {
-            ["name"] | ["kind"] | ["tags", _] => return Ok(value),
-            ["namespace"] | ["timestamp"] | ["tags"] => {
-                if let Some(value) = value {
-                    return Ok(Some(value));
-                }
-            }
-            _ => {
-                return Err(MetricPathError::InvalidPath {
-                    path: &path.to_string(),
-                    expected: VALID_METRIC_PATHS_SET,
-                }
-                .to_string())
-            }
+    let Some(paths) = path.to_alternative_components(MAX_METRIC_PATH_DEPTH) else {
+        return Ok(None);
+    };
+
+    match paths.as_slice() {
+        ["name"]
+        | ["kind"]
+        | ["tags", _]
+        | ["namespace"]
+        | ["timestamp"]
+        | ["interval_ms"]
+        | ["tags"] => Ok(value),
+        _ => Err(MetricPathError::InvalidPath {
+            path: &path.to_string(),
+            expected: VALID_METRIC_PATHS_SET,
         }
+        .to_string()),
     }
-
-    // We only reach this point if we have requested a tag that doesn't exist or an empty
-    // field.
-    Ok(None)
 }
 
 /// pre-compute the `Value` structure of the metric.

From 4cca9474763f234333d9c88d5f1a8efe76b0717b Mon Sep 17 00:00:00 2001
From: Pavlos Rontidis <pavlos.rontidis@gmail.com>
Date: Tue, 17 Jun 2025 16:26:08 -0400
Subject: [PATCH 081/305] chore(website): minor improvements to output data
 section (#23225)

---
 website/cue/reference/components/transforms/remap.cue | 6 +++---
 website/layouts/partials/data.html                    | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/website/cue/reference/components/transforms/remap.cue b/website/cue/reference/components/transforms/remap.cue
index fd4829e23388c..fc10ea96df23d 100644
--- a/website/cue/reference/components/transforms/remap.cue
+++ b/website/cue/reference/components/transforms/remap.cue
@@ -50,13 +50,13 @@ components: transforms: "remap": {
 	}
 
 	output: {
-		logs: event: {
+		logs: "": {
 			description: "The modified input `log` event."
 		}
-		metrics: event: {
+		metrics: "": {
 			description: "The modified input `metric` event."
 		}
-		traces: event: {
+		traces: "": {
 			description: "The modified input `trace` event."
 		}
 	}
diff --git a/website/layouts/partials/data.html b/website/layouts/partials/data.html
index 266593b360f4e..ebe5d9f0088ad 100644
--- a/website/layouts/partials/data.html
+++ b/website/layouts/partials/data.html
@@ -285,7 +285,7 @@
 
       {{ with .traces }}
         <span class="flex items-center justify-between">
-          {{ partial "heading.html" (dict "text" "Traces" "level" 3 "id" "output-traces") }}
+          {{ partial "heading.html" (dict "text" "Traces" "level" 3 "id" "output-traces" "href" "#output-traces") }}
         </span>
 
         <div class="mt-3 border rounded divide-y dark:border-gray-700 dark:divide-gray-700">

From 154fe3ef90919bcbbbb4b7f093be67fa28228533 Mon Sep 17 00:00:00 2001
From: rdwr-tomers <18597107+rdwr-tomers@users.noreply.github.com>
Date: Wed, 18 Jun 2025 16:07:21 +0300
Subject: [PATCH 082/305] fix(nats sink): fix vector exiting if nats sink url
 fails dns resolution or is unavailable without --require-healthy (#23167)

* fix: retry reconnecting to nats server. don't retry in healthchecks

* added changelog

* fix: renamed changelog fragment

* added author to changelog

* fix: pass options to connect instead of with_retry bool

* Update changelog.d/22914_fix_nats_sink_ignored_healthcheck.fix.md

Co-authored-by: Pavlos Rontidis <pavlos.rontidis@gmail.com>

---------

Co-authored-by: Pavlos Rontidis <pavlos.rontidis@gmail.com>
---
 ...14_fix_nats_sink_ignored_healthcheck.fix.md |  3 +++
 src/sinks/nats/config.rs                       | 18 +++++++++++++-----
 src/sinks/nats/integration_tests.rs            |  6 ++++--
 3 files changed, 20 insertions(+), 7 deletions(-)
 create mode 100644 changelog.d/22914_fix_nats_sink_ignored_healthcheck.fix.md

diff --git a/changelog.d/22914_fix_nats_sink_ignored_healthcheck.fix.md b/changelog.d/22914_fix_nats_sink_ignored_healthcheck.fix.md
new file mode 100644
index 0000000000000..5e143f6a220ad
--- /dev/null
+++ b/changelog.d/22914_fix_nats_sink_ignored_healthcheck.fix.md
@@ -0,0 +1,3 @@
+The `nats` sink now does not return an error when an unresolvable or unavailable URL is provided. Note that if `--require-healthy` is set then Vector will stop on startup.
+
+authors: rdwr-tomers
diff --git a/src/sinks/nats/config.rs b/src/sinks/nats/config.rs
index 98423b9d1f35a..c951049b7a845 100644
--- a/src/sinks/nats/config.rs
+++ b/src/sinks/nats/config.rs
@@ -138,9 +138,10 @@ impl std::convert::TryFrom<&NatsSinkConfig> for async_nats::ConnectOptions {
 }
 
 impl NatsSinkConfig {
-    pub(super) async fn connect(&self) -> Result<async_nats::Client, NatsError> {
-        let options: async_nats::ConnectOptions = self.try_into().context(ConfigSnafu)?;
-
+    pub(super) async fn connect(
+        &self,
+        options: async_nats::ConnectOptions,
+    ) -> Result<async_nats::Client, NatsError> {
         let urls = self.parse_server_addresses()?;
         options.connect(urls).await.context(ConnectSnafu)
     }
@@ -158,7 +159,9 @@ impl NatsSinkConfig {
     }
 
     pub(super) async fn publisher(&self) -> Result<NatsPublisher, NatsError> {
-        let connection = self.connect().await?;
+        let mut options: async_nats::ConnectOptions = self.try_into().context(ConfigSnafu)?;
+        options = options.retry_on_initial_connect();
+        let connection = self.connect(options).await?;
 
         if self.jetstream {
             Ok(NatsPublisher::JetStream(async_nats::jetstream::new(
@@ -171,7 +174,12 @@ impl NatsSinkConfig {
 }
 
 async fn healthcheck(config: NatsSinkConfig) -> crate::Result<()> {
-    config.connect().map_ok(|_| ()).map_err(|e| e.into()).await
+    let options: async_nats::ConnectOptions = (&config).try_into().context(ConfigSnafu)?;
+    config
+        .connect(options)
+        .map_ok(|_| ())
+        .map_err(|e| e.into())
+        .await
 }
 
 pub enum NatsPublisher {
diff --git a/src/sinks/nats/integration_tests.rs b/src/sinks/nats/integration_tests.rs
index bc0c8dce0611d..371d7af6f275d 100644
--- a/src/sinks/nats/integration_tests.rs
+++ b/src/sinks/nats/integration_tests.rs
@@ -1,7 +1,7 @@
 use std::time::Duration;
 use vector_lib::codecs::TextSerializerConfig;
 
-use super::{config::NatsSinkConfig, sink::NatsSink, NatsError};
+use super::{config::NatsSinkConfig, sink::NatsSink, ConfigSnafu, NatsError};
 use crate::{
     nats::{
         NatsAuthConfig, NatsAuthCredentialsFile, NatsAuthNKey, NatsAuthToken, NatsAuthUserPassword,
@@ -13,6 +13,7 @@ use crate::{
     },
     tls::TlsEnableableConfig,
 };
+use snafu::ResultExt;
 
 async fn publish_and_check(conf: NatsSinkConfig) -> Result<(), NatsError> {
     // Publish `N` messages to NATS.
@@ -26,9 +27,10 @@ async fn publish_and_check(conf: NatsSinkConfig) -> Result<(), NatsError> {
 
     // Establish the consumer subscription.
     let subject = conf.subject.clone();
+    let options: async_nats::ConnectOptions = (&conf).try_into().context(ConfigSnafu)?;
     let consumer = conf
         .clone()
-        .connect()
+        .connect(options)
         .await
         .expect("failed to connect with test consumer");
     let mut sub = consumer

From aded15be572117b2dd5c7fc1874a18fb84ec2572 Mon Sep 17 00:00:00 2001
From: melinoix <titouan.ameline@gmail.com>
Date: Wed, 18 Jun 2025 18:44:32 +0200
Subject: [PATCH 083/305] fix(website): Fixed documentation badges space on
 documentation (#23229)

badge space corrected
---
 website/layouts/partials/badge.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/website/layouts/partials/badge.html b/website/layouts/partials/badge.html
index f17281ac99e3a..dba3c6e28ec19 100644
--- a/website/layouts/partials/badge.html
+++ b/website/layouts/partials/badge.html
@@ -11,7 +11,7 @@
 {{ $color := index $styles .color }}
 {{ with .href }}<a href="{{ . }}">{{ end }}
     <span {{ with .show }} x-show="{{ . }}" {{ end }}
-          class="{{ if .inline }}inline-{{ end }}flex items-center py-1 font-medium{{ if .large }} text-sm px-3{{ else }} text-xs px-2{{ end }} {{ if .rounded }} rounded-full{{ else }} rounded{{ end }} {{ $color }}">
+          class="{{ if .inline }}inline-{{ end }}flex items-center py-1 mr-1 font-medium{{ if .large }} text-sm px-3{{ else }} text-xs px-2{{ end }} {{ if .rounded }} rounded-full{{ else }} rounded{{ end }} {{ $color }}">
       {{ if .prefix }}
       {{ .prefix }}:&nbsp;<span class="font-bold">{{- .word -}}</span>
       {{ else }}

From 8488649f616ddb410cac09a00ac8c38fb1a9c275 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ensar=20Saraj=C4=8Di=C4=87?= <dev@ensarsarajcic.com>
Date: Wed, 18 Jun 2025 20:25:32 +0200
Subject: [PATCH 084/305] fix(dnstap source): implement all TCP dnstap options
 to reduce error (#23123)

* fix(dnstap source): implement all TCP dnstap options to reduce error

The dnstap TCP source was initially built based on the TCP socket source, but not all of the options
were correctly implemented, which left the request limiter unused.
This also changes the multithreaded approach to do async-aware waits, because previous
implementation used thread sleep in async context.

Related: #20744

* Add changelog entry

* Update src/sources/util/framestream.rs

Co-authored-by: Pavlos Rontidis <pavlos.rontidis@gmail.com>

* Update src/sources/util/framestream.rs

Co-authored-by: Pavlos Rontidis <pavlos.rontidis@gmail.com>

* Move out tcp frame handle into a function

* Move 10 ms timeout to a constant

* Fix clippy warnings

---------

Co-authored-by: Pavlos Rontidis <pavlos.rontidis@gmail.com>
---
 changelog.d/23123_dnstap_tcp_errors.fix.md |   3 +
 src/sources/util/framestream.rs            | 170 ++++++++++++++++-----
 2 files changed, 137 insertions(+), 36 deletions(-)
 create mode 100644 changelog.d/23123_dnstap_tcp_errors.fix.md

diff --git a/changelog.d/23123_dnstap_tcp_errors.fix.md b/changelog.d/23123_dnstap_tcp_errors.fix.md
new file mode 100644
index 0000000000000..c8686aa3e1f20
--- /dev/null
+++ b/changelog.d/23123_dnstap_tcp_errors.fix.md
@@ -0,0 +1,3 @@
+Improved backpressure and load handling of dnstap TCP source.
+
+authors: esensar Quad9DNS
diff --git a/src/sources/util/framestream.rs b/src/sources/util/framestream.rs
index 7a36196732ceb..fe29b50e2049d 100644
--- a/src/sources/util/framestream.rs
+++ b/src/sources/util/framestream.rs
@@ -11,14 +11,13 @@ use std::{
         atomic::{AtomicU32, Ordering},
         Arc, Mutex,
     },
-    thread,
     time::Duration,
 };
 
 use bytes::{Buf, Bytes, BytesMut};
 use futures::{
     executor::block_on,
-    future,
+    future::{self, OptionFuture},
     sink::{Sink, SinkExt},
     stream::{self, StreamExt, TryStreamExt},
 };
@@ -63,6 +62,12 @@ use super::net::{RequestLimiter, SocketListenAddr};
 const FSTRM_CONTROL_FRAME_LENGTH_MAX: usize = 512;
 const FSTRM_CONTROL_FIELD_CONTENT_TYPE_LENGTH_MAX: usize = 256;
 
+/// If a connection does not receive any data during this short timeout,
+/// it should release its permit (and try to obtain a new one) allowing other connections to read.
+/// It is very short because any incoming data will avoid this timeout,
+/// so it mainly prevents holding permits without consuming any data
+const PERMIT_HOLD_TIMEOUT_MS: u64 = 10;
+
 pub type FrameStreamSink = Box<dyn Sink<Bytes, Error = std::io::Error> + Send + Unpin>;
 
 pub struct FrameStreamReader {
@@ -520,10 +525,10 @@ async fn handle_stream(
     mut frame_handler: impl TcpFrameHandler + Send + Sync + Clone + 'static,
     mut shutdown_signal: ShutdownSignal,
     mut socket: MaybeTlsIncomingStream<TcpStream>,
-    _tripwire: BoxFuture<'static, ()>,
+    mut tripwire: BoxFuture<'static, ()>,
     peer_addr: SocketAddr,
     out: SourceSender,
-    _request_limiter: RequestLimiter,
+    request_limiter: RequestLimiter,
 ) {
     tokio::select! {
         result = socket.handshake() => {
@@ -567,23 +572,113 @@ async fn handle_stream(
     let span = info_span!("connection");
     span.record("peer_addr", field::debug(&peer_addr));
     let received_from: Option<Bytes> = Some(peer_addr.to_string().into());
-    let active_parsing_task_nums = Arc::new(AtomicU32::new(0));
 
-    build_framestream_source(
-        frame_handler,
+    let connection_close_timeout = OptionFuture::from(
+        frame_handler
+            .max_connection_duration_secs()
+            .map(|timeout_secs| tokio::time::sleep(Duration::from_secs(timeout_secs))),
+    );
+    tokio::pin!(connection_close_timeout);
+
+    let content_type = frame_handler.content_type();
+    let mut event_sink = out.clone();
+    let (sock_sink, sock_stream) = Framed::new(
         socket,
-        received_from,
-        out,
-        shutdown_signal,
-        span,
-        active_parsing_task_nums,
-        move |error| {
+        length_delimited::Builder::new()
+            .max_frame_length(frame_handler.max_frame_length())
+            .new_codec(),
+    )
+    .split();
+    let mut reader = FrameStreamReader::new(Box::new(sock_sink), content_type);
+    let mut frames = sock_stream
+        .map_err(move |error| {
             emit!(TcpSocketError {
                 error: &error,
                 peer_addr,
             });
-        },
-    );
+        })
+        .filter_map(move |frame| {
+            future::ready(match frame {
+                Ok(f) => reader.handle_frame(Bytes::from(f)),
+                Err(_) => None,
+            })
+        });
+
+    let active_parsing_task_nums = Arc::new(AtomicU32::new(0));
+    loop {
+        let mut permit = tokio::select! {
+            _ = &mut tripwire => break,
+            Some(_) = &mut connection_close_timeout  => {
+                break;
+            },
+            _ = &mut shutdown_signal => {
+                break;
+            },
+            permit = request_limiter.acquire() => {
+                Some(permit)
+            }
+            else => break,
+        };
+
+        let timeout = tokio::time::sleep(Duration::from_millis(PERMIT_HOLD_TIMEOUT_MS));
+        tokio::pin!(timeout);
+
+        tokio::select! {
+            _ = &mut tripwire => break,
+            _ = &mut shutdown_signal => break,
+            _ = &mut timeout => {
+                // This connection is currently holding a permit, but has not received data for some time. Release
+                // the permit to let another connection try
+                continue;
+            }
+            res = frames.next() => {
+                match res {
+                    Some(frame) => {
+                        if let Some(permit) = &mut permit {
+                            // Note that this is intentionally not the "number of events in a single request", but rather
+                            // the "number of events currently available". This may contain events from multiple events,
+                            // but it should always contain all events from each request.
+                            permit.decoding_finished(1);
+                        };
+                        handle_tcp_frame(&mut frame_handler, frame, &mut event_sink, received_from.clone(), Arc::clone(&active_parsing_task_nums)).await;
+                    }
+                    None => {
+                        debug!("Connection closed.");
+                        break
+                    },
+                }
+            }
+            else => break,
+        }
+
+        drop(permit);
+    }
+}
+
+async fn handle_tcp_frame<T>(
+    frame_handler: &mut T,
+    frame: Bytes,
+    event_sink: &mut SourceSender,
+    received_from: Option<Bytes>,
+    active_parsing_task_nums: Arc<AtomicU32>,
+) where
+    T: TcpFrameHandler + Send + Sync + Clone + 'static,
+{
+    if frame_handler.multithreaded() {
+        spawn_event_handling_tasks(
+            frame,
+            frame_handler.clone(),
+            event_sink.clone(),
+            received_from,
+            active_parsing_task_nums,
+            frame_handler.max_frame_handling_tasks(),
+        )
+        .await;
+    } else if let Some(event) = frame_handler.handle_event(received_from, frame) {
+        if let Err(e) = event_sink.send_event(event).await {
+            error!("Error sending event: {e:?}.");
+        }
+    }
 }
 
 /**
@@ -778,14 +873,13 @@ fn build_framestream_source<T: Send + 'static>(
         let handler = async move {
             frames
                 .for_each(move |f| {
-                    future::ready({
-                        let max_frame_handling_tasks =
-                            frame_handler_copy.max_frame_handling_tasks();
-                        let f_handler = frame_handler_copy.clone();
-                        let received_from_copy = received_from.clone();
-                        let event_sink_copy = event_sink.clone();
-                        let active_task_nums_copy = Arc::clone(&active_task_nums);
+                    let max_frame_handling_tasks = frame_handler_copy.max_frame_handling_tasks();
+                    let f_handler = frame_handler_copy.clone();
+                    let received_from_copy = received_from.clone();
+                    let event_sink_copy = event_sink.clone();
+                    let active_task_nums_copy = Arc::clone(&active_task_nums);
 
+                    async move {
                         spawn_event_handling_tasks(
                             f,
                             f_handler,
@@ -793,8 +887,9 @@ fn build_framestream_source<T: Send + 'static>(
                             received_from_copy,
                             active_task_nums_copy,
                             max_frame_handling_tasks,
-                        );
-                    })
+                        )
+                        .await;
+                    }
                 })
                 .await;
             info!("Finished sending.");
@@ -803,7 +898,7 @@ fn build_framestream_source<T: Send + 'static>(
     }
 }
 
-fn spawn_event_handling_tasks(
+async fn spawn_event_handling_tasks(
     event_data: Bytes,
     event_handler: impl FrameHandler + Send + Sync + 'static,
     mut event_sink: SourceSender,
@@ -811,7 +906,7 @@ fn spawn_event_handling_tasks(
     active_task_nums: Arc<AtomicU32>,
     max_frame_handling_tasks: u32,
 ) -> JoinHandle<()> {
-    wait_for_task_quota(&active_task_nums, max_frame_handling_tasks);
+    wait_for_task_quota(&active_task_nums, max_frame_handling_tasks).await;
 
     tokio::spawn(async move {
         future::ready({
@@ -826,9 +921,9 @@ fn spawn_event_handling_tasks(
     })
 }
 
-fn wait_for_task_quota(active_task_nums: &Arc<AtomicU32>, max_tasks: u32) {
+async fn wait_for_task_quota(active_task_nums: &Arc<AtomicU32>, max_tasks: u32) {
     while max_tasks > 0 && max_tasks < active_task_nums.load(Ordering::Acquire) {
-        thread::sleep(Duration::from_millis(3));
+        tokio::time::sleep(Duration::from_millis(3)).await;
     }
     active_task_nums.fetch_add(1, Ordering::AcqRel);
 }
@@ -1677,14 +1772,17 @@ mod test {
         }));
 
         for i in 0..total_events {
-            join_handles.push(spawn_event_handling_tasks(
-                Bytes::from(format!("event_{}", i)),
-                MockFrameHandler::new("test_content".to_string(), true, extra_routine.clone()),
-                out.clone(),
-                None,
-                Arc::clone(&active_task_nums_copy),
-                max_frame_handling_tasks,
-            ));
+            join_handles.push(
+                spawn_event_handling_tasks(
+                    Bytes::from(format!("event_{i}")),
+                    MockFrameHandler::new("test_content".to_string(), true, extra_routine.clone()),
+                    out.clone(),
+                    None,
+                    Arc::clone(&active_task_nums_copy),
+                    max_frame_handling_tasks,
+                )
+                .await,
+            );
         }
 
         future::join_all(join_handles).await;

From 7f20e0f3b4ec35f09b55edc830b7633d684f8a74 Mon Sep 17 00:00:00 2001
From: Pavlos Rontidis <pavlos.rontidis@gmail.com>
Date: Fri, 20 Jun 2025 11:53:09 -0400
Subject: [PATCH 085/305] chore(dev): sort allow.txt lines (#23237)

---
 .github/actions/spelling/allow.txt | 548 ++++++++++++++---------------
 1 file changed, 274 insertions(+), 274 deletions(-)

diff --git a/.github/actions/spelling/allow.txt b/.github/actions/spelling/allow.txt
index 71ad2a86332d6..f4466efffef49 100644
--- a/.github/actions/spelling/allow.txt
+++ b/.github/actions/spelling/allow.txt
@@ -1,26 +1,43 @@
-ANSIX
-APAC
-APPSIGNAL
+acmecorp
 Acro
+addonmanager
 Ainol
+aiohttp
 Airis
 Airpad
+AIXM
 Alcatel
-Alexey
 alertmanager
+Alexey
+algoliasearch
 Alibaba
 Allfine
 Allview
 Allwinner
+alpinejs
+altostrat
 Amarok
 Amaway
+amazonlinux
 Amoi
+ansible
+ANSIX
 Aoc
 Aoson
+APAC
+apachectl
+apachepulsar
 Apanda
+apikey
+apimachinery
+apiserver
+APPSIGNAL
 Appsignal
+appsignal
+archlinux
 Archos
 Arival
+armhf
 Arnova
 Asus
 Atlassian
@@ -28,222 +45,17 @@ atleastonce
 atmostonce
 Attab
 Audiosonic
+AUTOSAR
+aviv
 avsc
 Axioo
 Azend
-Bedove
-Benss
-Blaupunkt
-Blusens
-Casio
-Cantarell
-Celkon
-Ceph
-Chromecast
-Citrix
-Cloudflare
-Cloudfone
-Cmx
-Coby
-Collectd
-Comcast
-Consolas
-Coolpad
-BADDCAFE
-BADVERS
-DEBHELPER
-Danew
-dkr
-Dockerfiles
-DOOV
-Douban
-emqx
-eventloop
-Enot
-Evercoss
-exactlyonce
-Explay
-FAQs
-FDO
-FQDNs
-Fabro
-Figma
-Flipboard
-Foto
-Freescale
-Galapad
-Garmin
-Geeksphone
-Gfive
-Ghemawat
-Gionee
-HMACs
-HTTPDATE
-Haier
-Haipad
-Hannspree
-Hena
-Hisense
-Huawei
-Hyundai
-Ideapad
-Infinix
-Instacart
-Intenso
-Itamar
-Ivio
-JXD
-Jacq
-Jameel
-Jaytech
-Jia
-Jiayu
-Joda
-KBytes
-KDL
-KTtech
-Karbonn
-Kingcom
-Kolkata
-Kruno
-Ktouch
-Kurio
-Kyros
-LGE
-LYF
-Lenco
-Lexibook
-Lifetab
-Lifetouch
-Lumia
-Malata
-manden
-Maxthon
-Mediacom
-Medion
-Meizu
-Mertz
-metakey
-Metakey
-Micromax
-Mito
-Mobistel
-Modecom
-Moto
-Mpman
-Multilaser
-Mumbai
-musleabi
-Mytab
-NLB
-Nabi
-Netflix
-Neue
-Nextbook
-Nextcloud
-OVH
-Odys
-Openpeak
-Oppo
-Ovi
-Owncloud
-PHILIPSTV
-POCs
-Panasonic
-Papyre
-pbs
-Phicomm
-Phototechnik
-Pingdom
-Pinterest
-Pinterestbot
-Pipo
-Ployer
-Podcast
-Podkicker
-Positivo
-Prestigio
-pront
-Proscan
-Qmobilevn
-RPZ
-RRSIGs
-Rackspace
-Rathi
-Regza
-Rijs
-Roboto
-Rockchip
-Roku
-Roundcube
-Rowling
-rumqttc
-SBT
-SKtelesys
-Salesforce
-Samsung
-Sega
-Segoe
-Shopify
-SIGINTs
-Simvalley
-Skype
-Skytex
-Smartbitt
-Snapchat
-Softbank
-Sogou
-Soref
-Tagi
-Tecmobile
-Telstra
-Tencent
-Texet
-Thl
-Tizen
-Tmobile
-Tomtec
-Tooky
-Touchmate
-Traefik
-Trekstor
-Treq
-Umeox
-Verizon
-Videocon
-Viewsonic
-Wellcom
-Wii
-Wiko
-Woxter
-Xeon
-Xianghe
-Xolo
-Xoro
-Xperia
-Yarvik
-Yifang
-ZTE
-Zopo
-Zync
-acmecorp
-addonmanager
-aiohttp
-algoliasearch
-alpinejs
-altostrat
-amazonlinux
-ansible
-apachectl
-apachepulsar
-apikey
-apimachinery
-apiserver
-appsignal
-archlinux
-armhf
 backpressure
 backticks
+BADDCAFE
+BADVERS
+Bedove
+Benss
 bigendian
 bindir
 binfmt
@@ -253,16 +65,36 @@ bitflags
 bitnami
 bitwidth
 blackbox
+Blaupunkt
+Blusens
 buildname
 buildroot
 bytestream
 callsites
+Cantarell
+Casio
+cbor
+CDMA
 cdnskey
+Celkon
+Ceph
+Chromecast
+Citrix
+cksum
+Cloudflare
+Cloudfone
+Cmx
 cncf
+Coby
 codepath
 codepaths
+Collectd
+Comcast
 commandline
 compiletime
+Consolas
+contactless
+Coolpad
 coredns
 corejs
 coreutils
@@ -270,47 +102,83 @@ csync
 curta
 daemonset
 dalek
+dammam
+Danew
 databend
 datacenter
 datadog
 datadoghq
 datanode
 ddog
+DEBHELPER
 debian
+DECT
 demuxing
 dfs
 discriminants
 distro
 distroless
+dkr
+DNP
 dnslookup
 dnssec
 dnstap
 dnsutils
 dockercmd
+Dockerfiles
+doha
+DOOV
+Douban
 downsides
 downwardapi
+DVB
 ede
 emoji
+emqx
 enableable
+Enot
+EPC
 esbuild
 etld
+eventloop
+Evercoss
+exactlyonce
+Explay
+Fabro
 fakeintake
+FAQs
 fargate
+FDO
 fibonacci
+Figma
 fileapi
 filebeat
 finalizers
 findstring
 firefox
+FLEXRAY
+Flipboard
 fluentbit
 fluentd
+Foto
+FQDNs
+Freescale
+FUJITSU
 fuzzers
+Galapad
+Garmin
 gce
 gcloud
 gcp
 gcr
 gcs
 gdpr
+Geeksphone
+GENIBUS
+Gfive
+Ghemawat
+gifs
+Gionee
 github
 gnueabi
 gnueabihf
@@ -329,43 +197,79 @@ graphiql
 greptime
 greptimecloud
 greptimedb
+GSM
 gvisor
 gws
 hadoop
+Haier
+Haipad
+Hannspree
 hdfs
 healthcheck
 healthchecks
+Hena
 heroicon
 heroicons
 heroku
 herokuapp
+Hisense
+hitag
 hitech
+HMACs
 hogwarts
 htc
 htmltest
+HTTPDATE
 https
+Huawei
 humungus
+Hyundai
 icecream
+Ideapad
 idn
 ifeq
 ifneq
 imobile
+Infinix
 influxd
+Instacart
+Intenso
+INTERLAKEN
 ionik
 ipallowlist
 ipod
 ircd
+Itamar
+Ivio
+Jacq
+JAMCRC
+Jameel
+Jaytech
 jemalloc
 jemallocator
+jetbrains
+JetBrains
+Jia
+Jiayu
 jndi
+Joda
 journalctl
 jsonnet
 jsontag
 jvm
-kenton
+JXD
+Karbonn
+KBytes
+KDL
 keepappkey
 keephq
+kenton
+Kingcom
+Kolkata
 konqueror
+Kruno
+Ktouch
+KTtech
 kube
 kubeadm
 kubeconfig
@@ -373,161 +277,257 @@ kubectl
 kubelet
 kubernetes
 kubeval
+Kurio
 kustomization
 kustomize
 kyocera
+Kyros
+Lenco
 lenovo
 levenstein
+Lexibook
+LGE
+Lifetab
+Lifetouch
 linkerd
 localdomain
 localstack
 lucene
+Lumia
+LYF
 macbook
+Malata
+manden
 maxmind
 maxminddb
+Maxthon
+MCRF
+Mediacom
+Medion
+MEF
+Meizu
+meme
+Mertz
 messagebird
+metakey
+Metakey
+microcontroller
+Micromax
+MIFARE
 minikube
 minimalistic
 minio
 minishift
+miniz
+Mito
 mkfile
+Mobistel
+modbus
+Modecom
 mongod
+Moto
 motorola
 mountpoint
 mozilla
+Mpman
 msiexec
+Multilaser
+Mumbai
+mumbai
+musleabi
+Mytab
+Nabi
 namenode
 netcat
 netdata
+Netflix
 netlify
+Neue
+Nextbook
+Nextcloud
 nintendo
 nio
 nixos
 nixpkg
 nixpkgs
+NLB
 nokia
+NRSC
 nslookup
 nsupdate
 ntapi
 ntfs
+Odys
+onig
 opendal
+Openpeak
+OPENPGP
+OPENSAFETY
 opensearch
 opentelemetry
+Oppo
 oss
+otel
+otelcol
+OVH
+Ovi
+Owncloud
 pacman
+Panasonic
 pantech
 papertrail
 papertrailapp
+Papyre
+paulo
+pbs
 petabytes
+Phicomm
 philips
+PHILIPSTV
+Phototechnik
+Pingdom
+Pinterest
+Pinterestbot
+Pipo
+Ployer
+POCs
+Podcast
 podinfo
+Podkicker
 podman
+Positivo
 postgresql
+Prestigio
+PROFIBUS
+pront
+Proscan
 proxyuser
 pseudocode
 psl
 pushgateway
+QA'd
+Qmobilevn
 qwerty
 rabbitmq
+Rackspace
+Rathi
 rclone
+Regza
+requestline
 rfcs
+RFID
+riello
+Rijs
 roadmap
+Roboto
+Rockchip
+ROHC
+Roku
 rootfs
+Roundcube
 roundrobin
+Rowling
 rpmbuild
 rpms
+RPZ
+RRSIGs
 rstest
 rsyslog
 rsyslogd
+rumqttc
+Salesforce
+Samsung
+SBT
 scriptblock
+Sega
+Segoe
 servlet
-Sinjo
-sublocation
 shannon
-sundar
-svcb
+Shopify
+SIGINTs
+simdutf
+Simvalley
+Sinjo
+siv
+SKtelesys
+Skype
+Skytex
+Smartbitt
+SMBUS
+Snapchat
 snyk
 socketaddr
+Softbank
+Sogou
 solarwinds
+Soref
 splunk
 ssh
 staticuser
 statsd
+sublocation
+sundar
+svcb
 symbian
+Tagi
 tanushri
+Tecmobile
+teledisk
+Telstra
+Tencent
+Texet
+Thl
 timeframe
 timeseries
 timespan
 timestamped
+Tizen
+Tmobile
+Tomtec
+Tooky
+Touchmate
+Traefik
+Trekstor
+Treq
+turin
 typesense
 tzdata
 ubuntu
+Umeox
+UMTS
 unchunked
 upstreaminfo
+urlencoding
 useragents
 usergroups
 userguide
-urlencoding
+Verizon
+vhosts
+Videocon
+Viewsonic
+WCDMA
 webhdfs
+Wellcom
+Wii
+Wiko
 winapi
 workarounds
+Woxter
 XCHACHA
+Xeon
+Xianghe
+XMODEM
+Xolo
+Xoro
+Xperia
 XSALSA
 yandex
+Yarvik
+Yifang
 zeek
 zookeeper
+Zopo
 zst
 zstandard
-otel
-otelcol
-siv
-onig
-aviv
-dammam
-doha
-mumbai
-paulo
-turin
-AIXM
-AUTOSAR
-CDMA
-cksum
-contactless
-DECT
-DNP
-DVB
-EPC
-FLEXRAY
-FUJITSU
-GENIBUS
-GSM
-hitag
-INTERLAKEN
-JAMCRC
-MCRF
-MEF
-microcontroller
-MIFARE
-modbus
-NRSC
-OPENPGP
-OPENSAFETY
-PROFIBUS
-QA'd
-RFID
-riello
-ROHC
-SMBUS
-teledisk
-UMTS
-WCDMA
-XMODEM
-cbor
-requestline
-jetbrains
-JetBrains
-gifs
-meme
-simdutf
-vhosts
-miniz
+ZTE
+Zync

From ebfa262363eceed03c08671253dd93534138e80f Mon Sep 17 00:00:00 2001
From: Pavlos Rontidis <pavlos.rontidis@gmail.com>
Date: Fri, 20 Jun 2025 13:34:09 -0400
Subject: [PATCH 086/305] chore(dev): improve gitignore (#23239)

* chore(dev): improve gitignore

* Add tmp/

---------

Co-authored-by: Thomas <thomas.schneider@datadoghq.com>
---
 .gitignore | 58 ++++++++++++++++++++++++++++++++++++++----------------
 README.md  |  1 -
 2 files changed, 41 insertions(+), 18 deletions(-)

diff --git a/.gitignore b/.gitignore
index e5ad1eb947787..cba76581f96aa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,42 +1,66 @@
+# Rust
 cargo-timing*.html
+**/*.rs.bk
+target
+tests/data/wasm/*/target
+bench_output.txt
+
+# Python
 *.pyc
+
+# Ruby
+miniodat
+
+# Node.js / JavaScript / TypeScript
+node_modules
+scripts/package-lock.json
+
+# Yarn
+yarn.lock
+
+# JetBrains IDEs
+.idea/
 *.iml
-*.tmp
-*~
-**/*.rs.bk
+
+# macOS
 .DS_Store
+
+# Emacs
 .dir-locals.el
-checkpoints/*
-miniodat
-bench_output.txt
+
+# Temporary files
+tmp/
+*.tmp
+*~
 sample.log
-scripts/package-lock.json
-target
-node_modules
-tests/data/wasm/*/target
+
+# Profiling tools
 heaptrack.*
 massif.*
 
-# tilt
-tilt_modules/
+# Checkpoints
+checkpoints/*
 
-# Jetbrains
-.idea/
+# Tilt
+tilt_modules/
 
-# Docker build cache
+# Docker
 **/Dockerfile~
 **/Dockerfile.*~
 .dockerignore
 
-# Docker Compose override files
+# Docker Compose
 docker-compose.override.yml
 docker-compose.override.*.yml
 **/compose-temp-*.yaml
 
-# Compose project volume mounts (if stored locally)
+# Compose project volume mounts
 volumes/
 *.volume/
 
 # Environment variable files (can contain secrets)
 .env
 .env.*
+
+# LLM tools
+copilot-instructions.md
diff --git a/README.md b/README.md
index 117c284a72d2a..6c42e8a2ccda7 100644
--- a/README.md
+++ b/README.md
@@ -228,4 +228,3 @@ Vector is an end-to-end, unified, open data platform.
 [urls.vector_twitter]: https://twitter.com/vectordotdev
 [urls.vector_versioning_policy]: https://github.com/vectordotdev/vector/blob/master/VERSIONING.md
 [urls.vote_feature]: https://github.com/vectordotdev/vector/issues?q=is%3Aissue+is%3Aopen+sort%3Areactions-%2B1-desc+label%3A%22type%3A+feature%22
-

From cd8d07fc2d25268b68a0eed5cdc01d78bcd3e304 Mon Sep 17 00:00:00 2001
From: Pavlos Rontidis <pavlos.rontidis@gmail.com>
Date: Fri, 20 Jun 2025 12:47:11 -0400
Subject: [PATCH 087/305] chore(website): improve environment variable docs
 (#23236)

* chore(website): improve environment variable docs

* move env variables section to its own page, refactor navigation

* spelling

* md check fix

* improve warning

* improve comment on unset vars

* tiy improvement

* move warning up a bit
---
 .github/actions/spelling/allow.txt            |  1 +
 website/content/en/docs/reference/api.md      |  3 +-
 .../en/docs/reference/configuration/_index.md | 43 +-------
 .../docs/reference/environment_variables.md   | 99 +++++++++++++++++++
 website/content/en/docs/reference/glossary.md |  1 +
 5 files changed, 105 insertions(+), 42 deletions(-)
 create mode 100644 website/content/en/docs/reference/environment_variables.md

diff --git a/.github/actions/spelling/allow.txt b/.github/actions/spelling/allow.txt
index f4466efffef49..09f3e31c25b14 100644
--- a/.github/actions/spelling/allow.txt
+++ b/.github/actions/spelling/allow.txt
@@ -531,3 +531,4 @@ zst
 zstandard
 ZTE
 Zync
+envsubst
diff --git a/website/content/en/docs/reference/api.md b/website/content/en/docs/reference/api.md
index 10dca47cea414..705c598ab9af7 100644
--- a/website/content/en/docs/reference/api.md
+++ b/website/content/en/docs/reference/api.md
@@ -1,7 +1,8 @@
 ---
 title: The Vector API
 short: API
-weight: 3
+weight: 6
+tags: ["api", "graphql"]
 ---
 
 Vector ships with a [GraphQL] API that allows you to interact with a running Vector instance. This page covers how to configure and enable Vector's API.
diff --git a/website/content/en/docs/reference/configuration/_index.md b/website/content/en/docs/reference/configuration/_index.md
index bb465df6838bd..e7a588b78fd38 100644
--- a/website/content/en/docs/reference/configuration/_index.md
+++ b/website/content/en/docs/reference/configuration/_index.md
@@ -3,6 +3,7 @@ title: Configuring Vector
 short: Configuration
 weight: 2
 aliases: ["/docs/configuration", "/docs/setup/configuration"]
+tags: ["configuration", "env", "environment variables", "interpolation"]
 ---
 
 Vector is configured using a configuration file. This section contains a
@@ -244,47 +245,7 @@ vector --config /etc/vector/vector.json
 
 ### Environment variables
 
-Vector interpolates environment variables within your configuration file with
-the following syntax:
-
-```yaml
-transforms:
-  add_host:
-    type: "remap"
-    source: |
-      # Basic usage. "$HOSTNAME" also works.
-      .host = "${HOSTNAME}" # or "$HOSTNAME"
-
-      # Setting a default value when not present.
-      .environment = "${ENV:-development}"
-
-      # Requiring an environment variable to be present.
-      .tenant = "${TENANT:?tenant must be supplied}"
-```
-
-#### Default values
-
-Default values can be supplied using `:-` or `-` syntax:
-
-```yaml
-option: "${ENV_VAR:-default}" # default value if variable is unset or empty
-option: "${ENV_VAR-default}" # default value only if variable is unset
-```
-
-#### Required variables
-
-Environment variables that are required can be specified using `:?` or `?` syntax:
-
-```yaml
-option: "${ENV_VAR:?err}" # Vector exits with 'err' message if variable is unset or empty
-option: "${ENV_VAR?err}" # Vector exits with 'err' message only if variable is unset
-```
-
-#### Escaping
-
-You can escape environment variables by prefacing them with a `$` character. For
-example `$${HOSTNAME}` or `$$HOSTNAME` is treated literally in the above
-environment variable example.
+Refer to the [Environment Variables](docs/reference/environment_variables/) page.
 
 ### Formats
 
diff --git a/website/content/en/docs/reference/environment_variables.md b/website/content/en/docs/reference/environment_variables.md
new file mode 100644
index 0000000000000..995e2373f4a1c
--- /dev/null
+++ b/website/content/en/docs/reference/environment_variables.md
@@ -0,0 +1,99 @@
+---
+title: Environment Variables
+short: Environment Variables
+weight: 5
+tags: ["env", "environment variables", "interpolation"]
+---
+
+Vector interpolates environment variables within your configuration file with
+the following syntax:
+
+```yaml
+transforms:
+  add_host:
+    type: "remap"
+    source: |
+      # Basic usage. "$HOSTNAME" also works.
+      .host = "${HOSTNAME}" # or "$HOSTNAME"
+
+      # Setting a default value when not present.
+      .environment = "${ENV:-development}"
+
+      # Requiring an environment variable to be present.
+      .tenant = "${TENANT:?tenant must be supplied}"
+```
+
+## Default values
+
+Default values can be supplied using `:-` syntax:
+
+```yaml
+option: "${ENV_VAR:-default}" # default value if variable is unset or empty
+```
+
+Or the `-` syntax:
+
+```yaml
+option: "${ENV_VAR-default}" # default value only if variable is unset
+```
+
+## Required variables
+
+Environment variables that are required can be specified using `:?` syntax:
+
+```yaml
+option: "${ENV_VAR:?err}" # Vector exits with 'err' message if variable is unset or empty
+```
+
+Or  the `?` syntax for unset variables:
+
+```yaml
+option: "${ENV_VAR?err}" # Vector exits with 'err' message only if variable is unset.
+```
+
+## Escaping
+
+You can escape environment variables by prefacing them with a `$` character. For
+example `$${HOSTNAME}` or `$$HOSTNAME` is treated literally in the above
+environment variable example.
+
+## Interpolation Pitfalls
+
+
+It is possible to inject multiline blocks.
+
+{{< warning >}}
+Support for block interpolation feature may be removed in the future.
+We do not recommend using this feature, as it can lead to unwanted injections.
+For example, a malicious actor could inject components that execute arbitrary code.
+Of course this assumes said actor penetrated the system and has write access to the environment variables.
+{{< /warning >}}
+
+For example, the following section of a config:
+
+```yaml
+${SOURCES_BLOCK}
+```
+
+will be replaced by the following value:
+
+```shell
+export SOURCES_BLOCK="sources:\"
+  demo:
+    type: demo_logs
+    format: json
+    interval: 1
+```
+
+A better approach is to introduce a config pre-processing step with a mature tool. This also has the benefit of giving the user
+more control over the configuration and the result can be inspected before it is passed to Vector. See the following example:
+
+```shell
+envsubst < snippet_in.yaml > snippet_out.yaml
+cat snippet_out.yaml
+sources:"
+  demo:
+    type: demo_logs
+    format: json
+    interval: 1
+```
diff --git a/website/content/en/docs/reference/glossary.md b/website/content/en/docs/reference/glossary.md
index 1db25ac5ca8f7..90e51cbb84135 100644
--- a/website/content/en/docs/reference/glossary.md
+++ b/website/content/en/docs/reference/glossary.md
@@ -2,6 +2,7 @@
 title: Glossary
 description: Definitions of Vector-specific terms
 show_toc: true
+weight: 7
 ---
 
 {{< glossary >}}

From 675245880fbf3582a17c567e153d733db9b6a695 Mon Sep 17 00:00:00 2001
From: Thomas <thomas.schneider@datadoghq.com>
Date: Fri, 20 Jun 2025 13:22:19 -0400
Subject: [PATCH 088/305] feat(ci): improve and remove authorization
 requirements (#23224)

* changelog: remove useless token generation job

* changelog: use pull_request_target

* changelog: add fail_on_error

* changelog: update event_name

* changelog: revert pull_request_target changes

* Bring back the weird whitespace

* Bring back _target

* Change name idk anymore

* Minimize changes -> maximize sanity

* what

* Remove auth token fetching

* Remove hopefully useless job

* Try pr_target ****again****

* ngl I'm just testing this and will polish if it works

* Should work idk

* Fix flow

* Add write permissions

* Hope it works

* Revert "Add write permissions"

This reverts commit af4232b164743fd805651fa422267f8308b86fb2.

* Revert to older version

* Tweak to make things work when in merge queue

* Add changelog

* Revert comments

* Remove base branch fetching

* Remove changelog

* gardener_remove_awaiting_author: add pr_target

* gardener_remove_waiting_author: remove unneeded types

* gardener_remove_waiting_author: remove labeled type

* Revert "Remove changelog"

This reverts commit fe418dbb153be80589bb427b089be8302567c19e.

* Revert "Revert "Remove changelog""

This reverts commit 06b891001ff7d9446da9fd8cf448159af712e3fa.

* semantic: add pull_request_target

* Remove comment
---
 .github/workflows/changelog.yaml              | 60 +++++++------------
 .../gardener_remove_waiting_author.yml        |  5 +-
 .github/workflows/semantic.yml                |  7 +--
 3 files changed, 29 insertions(+), 43 deletions(-)

diff --git a/.github/workflows/changelog.yaml b/.github/workflows/changelog.yaml
index 57d7013f3b2d6..a4c8d05ce057c 100644
--- a/.github/workflows/changelog.yaml
+++ b/.github/workflows/changelog.yaml
@@ -6,63 +6,47 @@
 #   - new commits pushed
 #   - label is added or removed
 # Runs on merge queues, but just passes, because it is a required check.
-
 name: Changelog
 
 on:
   pull_request:
     types: [opened, synchronize, reopened, labeled, unlabeled]
-  # Due to merge queue requiring same status checks as PRs, must pass by default
+
+  pull_request_target:
+    types: [opened, synchronize, reopened, labeled, unlabeled]
+
+  # Required by GitHub merge queue due to branch protection rules. Should always be successful
   merge_group:
     types: [checks_requested]
 
 jobs:
   validate-changelog:
     runs-on: ubuntu-24.04
-    if: github.event_name == 'pull_request'
+
     env:
-      PR_HAS_LABEL: ${{ contains( github.event.pull_request.labels.*.name, 'no-changelog') }}
+      PR_HAS_LABEL: ${{ contains(github.event.pull_request.labels.*.name, 'no-changelog') }}
+
     steps:
       # Checkout full depth because in the check_changelog_fragments script, we need to specify a
       # merge base. If we only shallow clone the repo, git may not have enough history to determine
       # the base.
       - uses: actions/checkout@v4
+        if: ${{ github.event_name != 'merge_group' }}
         with:
           fetch-depth: 0
 
-      - name: Generate authentication token
-        # Don't run this step if the PR is from a fork or dependabot since the secrets won't exist
-        if: ${{ github.event.pull_request.head.repo.full_name == github.repository && github.actor != 'dependabot[bot]' }}
-        id: generate_token
-        uses: tibdex/github-app-token@3beb63f4bd073e61482598c45c71c1019b59b73a
-        with:
-          app_id: ${{ secrets.GH_APP_DATADOG_VECTOR_CI_APP_ID }}
-          private_key: ${{ secrets.GH_APP_DATADOG_VECTOR_CI_APP_PRIVATE_KEY }}
-
-      - run: |
-          if [[ $PR_HAS_LABEL == 'true' ]] ; then
-            echo "'no-changelog' label detected."
-            exit 0
-          fi
-
-          # Helper script needs to reference the master branch to compare against
-          git fetch origin master:refs/remotes/origin/master
-
-          ./scripts/check_changelog_fragments.sh
+      - name: Bypass when no‑changelog label is present
+        if: env.PR_HAS_LABEL == 'true'
+        run: |
+          echo "'no-changelog' label detected – skipping changelog validation."
+          exit 0
 
-  check-changelog:
-    name: Changelog
-    runs-on: ubuntu-24.04
-    needs: validate-changelog
-    if: always()
-    env:
-      FAILED: ${{ contains(needs.*.result, 'failure') }}
-    steps:
-      - name: exit
+      - name: Merge queue
+        if: ${{ github.event_name == 'merge_group' }}
         run: |
-          echo "failed=${{ env.FAILED }}"
-          if [[ "$FAILED" == "true" ]] ; then
-            exit 1
-          else
-            exit 0
-          fi
+          echo "merge_group event – passing without running changelog validation."
+          exit 0
+
+      - name: Run changelog fragment checker
+        if: ${{ env.PR_HAS_LABEL == 'false' && github.event_name != 'merge_group' }}
+        run: ./scripts/check_changelog_fragments.sh
diff --git a/.github/workflows/gardener_remove_waiting_author.yml b/.github/workflows/gardener_remove_waiting_author.yml
index 130868d4acd23..2bcea4ec86e67 100644
--- a/.github/workflows/gardener_remove_waiting_author.yml
+++ b/.github/workflows/gardener_remove_waiting_author.yml
@@ -4,8 +4,11 @@ permissions:
   pull-requests: write
 
 on:
+  pull_request_target:
+    types: [synchronize, review_requested]
+
   pull_request:
-    types: [synchronize, review_requested, labeled]
+    types: [synchronize, review_requested]
 
 jobs:
   remove_label:
diff --git a/.github/workflows/semantic.yml b/.github/workflows/semantic.yml
index 5e1c03a569831..223e93a0124ee 100644
--- a/.github/workflows/semantic.yml
+++ b/.github/workflows/semantic.yml
@@ -4,11 +4,10 @@
 name: "PR Title Semantic Check"
 
 on:
+  pull_request_target:
+    types: [opened, edited, synchronize]
   pull_request:
-    types:
-      - opened
-      - edited
-      - synchronize
+    types: [opened, edited, synchronize]
 
 jobs:
   main:

From 0e8f813f6b1e6dacbb927740f622e127a0933a2f Mon Sep 17 00:00:00 2001
From: Pavlos Rontidis <pavlos.rontidis@gmail.com>
Date: Fri, 20 Jun 2025 13:30:32 -0400
Subject: [PATCH 089/305] docs(internal): remove obsolete and unused team.cue
 (#23238)

* chore(docs): remove obsolete and unused team.cue

* rm copilot instructions
---
 README.md                      |   2 +
 website/cue/reference/team.cue | 162 ---------------------------------
 2 files changed, 2 insertions(+), 162 deletions(-)
 delete mode 100644 website/cue/reference/team.cue

diff --git a/README.md b/README.md
index 6c42e8a2ccda7..0d0ca08cce6b7 100644
--- a/README.md
+++ b/README.md
@@ -27,6 +27,8 @@ faster than every alternative in the space.
 To get started, follow our [**quickstart guide**][docs.quickstart] or [**install
 Vector**][docs.installation].
 
+Vector is maintained by the Datadog's [Community Open Source Engineering team](https://opensource.datadoghq.com/about/#the-community-open-source-engineering-team).
+
 ### Principles
 
 * **Reliable** - Built in [Rust][urls.rust], Vector's primary design goal is reliability.
diff --git a/website/cue/reference/team.cue b/website/cue/reference/team.cue
deleted file mode 100644
index 380706fa52d99..0000000000000
--- a/website/cue/reference/team.cue
+++ /dev/null
@@ -1,162 +0,0 @@
-package metadata
-
-import "strings"
-
-#Member: {
-	id:        strings.ToLower(name)
-	name:      !=""
-	active:    bool | *true
-	_github:   !=""
-	_twitter?: !=""
-	_keybase?: !=""
-	avatar:    "\(github).png"
-	bio?:      !=""
-	github:    "https://github.com/\(_github)"
-
-	if _twitter != _|_ {
-		twitter: "https://twitter.com/\(_twitter)"
-	}
-
-	if _keybase != _|_ {
-		keybase: "https://keybase.io/\(_keybase)"
-	}
-}
-
-team: [#Member, ...#Member] & [
-	{
-		name:     "Ben Johnson"
-		_github:  "binarylogic"
-		_keybase: "binarylogic"
-		_twitter: "binarylogic"
-		bio: """
-			Ben is an engineering manager at Datadog managing the Vector project (formerly the CTO/Co-Founder at Timber.io).
-			"""
-	},
-	{
-		name:    "Brian L. Troutwine"
-		_github: "blt"
-		bio: """
-			Brian is a staff engineer at Datadog and a member of the Vector team.
-			"""
-	},
-	{
-		name:    "Bruce Guenter"
-		_github: "bruceg"
-		bio: """
-			Bruce is a software engineer at Datadog on the Vector project (formerly part of Timber.io).
-			"""
-	},
-	{
-		name:     "James Turnbull"
-		_github:  "jamtur01"
-		_keybase: "jamtur01"
-		_twitter: "kartar"
-		bio: """
-			James was the VP of Engineering at Timber.io.
-			"""
-		active: false
-	},
-	{
-		name:     "Jean Mertz"
-		_github:  "JeanMertz"
-		_keybase: "JeanMertz"
-		_twitter: "JeanMertz"
-		bio: """
-			Jean is a senior engineer at Datadog (formerly part of Timber.io).
-			"""
-	},
-	{
-		name:     "Jesse Szwedko"
-		_github:  "jszwedko"
-		_keybase: "jszwedko"
-		_twitter: "jszwedko"
-		bio: """
-			Jesse is an engineer at Datadog (formerly Timber.io).
-			"""
-	},
-	{
-		name:     "Kirill Fomichev"
-		_github:  "fanatid"
-		_keybase: "fanatid"
-		bio: """
-			Kirill was an engineer at Timber.io.
-			"""
-		active: false
-	},
-	{
-		name:    "Kruno Tomola Fabro"
-		_github: "ktff"
-		bio: """
-			Kruno is a contractor for Datadog on the Vector project (formerly contracted with at Timber.io).
-			"""
-	},
-	{
-		name:    "Lee Benson"
-		_github: "leebenson"
-		bio: """
-			Lee is a senior engineer at Datadog (formerly part of Timber.io).
-			"""
-	},
-	{
-		name:     "Luc Perkins"
-		_github:  "lucperkins"
-		_keybase: "lucperkins"
-		_twitter: "lucperkins"
-		bio: """
-			Luc is a technical writer at Datadog (formerly part of Timber.io).
-			"""
-	},
-	{
-		name:     "Luke Steensen"
-		_github:  "lukesteensen"
-		_keybase: "lukesteensen"
-		_twitter: "lukesteensen"
-		bio: """
-			Luke is the team lead of the Vector project at Datadog (formerly part of Timber.io).
-			Before Timber, Luke was an engineer at Braintree working on parts of their
-			observability infrastructure.
-			"""
-	},
-	{
-		name:     "Mike"
-		_github:  "MOZGIII"
-		_keybase: "MOZGIII"
-		_twitter: "MOZGIII"
-		bio: """
-			Mike was a senior engineer at Timber.io.
-			"""
-		active: false
-	},
-	{
-		name:    "Spencer Gilbert"
-		_github: "spencergilbert"
-		bio: """
-			Spencer is an engineer at Datadog.
-			"""
-	},
-	{
-		name:     "Steve Hall"
-		_github:  "sghall"
-		_keybase: "sghall"
-		_twitter: "sghall"
-		bio: """
-			Steve is an engineer at Datadog (formerly part of Timber.io).
-			"""
-	},
-	{
-		name:    "Vic"
-		_github: "vector-vic"
-		bio: """
-			Vic is the Vector mascot.
-			"""
-	},
-	{
-		name:     "Zach Sherman"
-		_github:  "zsherman"
-		_keybase: "zsherman"
-		_twitter: "zsherman"
-		bio: """
-			Zach is the product manager of the Vector project at Datadog (formerly the CEO/co-founder of Timber.io).
-			"""
-	},
-]

From 207a608fbda792fad0b271134d4af7b9bc731712 Mon Sep 17 00:00:00 2001
From: Thomas <thomas.schneider@datadoghq.com>
Date: Fri, 20 Jun 2025 14:06:33 -0400
Subject: [PATCH 090/305] chore(website): Remove Page source and Edit this page
 buttons (#23240)

* Remove Page source and Edit this page buttons

* Add EOL
---
 website/layouts/docs/component.html        |  4 ----
 website/layouts/partials/content.html      |  4 ----
 website/layouts/partials/page-actions.html | 20 --------------------
 3 files changed, 28 deletions(-)
 delete mode 100644 website/layouts/partials/page-actions.html

diff --git a/website/layouts/docs/component.html b/website/layouts/docs/component.html
index 9c52d2f2fdf56..1e3c03eb05e46 100644
--- a/website/layouts/docs/component.html
+++ b/website/layouts/docs/component.html
@@ -36,10 +36,6 @@ <h1 class="dark:text-gray-50 font-secondary font-extrabold text-4xl lg:text-5xl
           {{ partial "docs/component-under-hero.html" . }}
         </div>
 
-        <div class="mt-8">
-          {{ partial "page-actions.html" . }}
-        </div>
-
         <div class="mt-12 prose dark:prose-dark max-w-none tracking-tight pb-32">
           {{ with $config.description }}
           <div class="prose dark:prose-dark max-w-none">
diff --git a/website/layouts/partials/content.html b/website/layouts/partials/content.html
index 70cc9d6c4aaf7..1fdfa750cbe24 100644
--- a/website/layouts/partials/content.html
+++ b/website/layouts/partials/content.html
@@ -18,10 +18,6 @@ <h1 class="dark:text-gray-50 font-secondary font-extrabold text-4xl lg:text-5xl
   {{ partial "guides/badges.html" . }}
   {{ end }}
 
-  <div class="mt-8">
-    {{ partial "page-actions.html" . }}
-  </div>
-
   <div class="mt-12">
     {{ partial "inner-content.html" . }}
   </div>
diff --git a/website/layouts/partials/page-actions.html b/website/layouts/partials/page-actions.html
deleted file mode 100644
index f023770feac0d..0000000000000
--- a/website/layouts/partials/page-actions.html
+++ /dev/null
@@ -1,20 +0,0 @@
-{{ $root := site.Params.social.github_repo }}
-{{ $source := printf "https://github.com/%s/tree/master/website/content/%s/%s" $root .Lang .File.Path }}
-{{ $edit := printf "https://github.com/%s/edit/master/website/content/%s/%s" $root .Lang .File.Path }}
-<div class="flex space-x-1 text-xs">
-  <a href="{{ $source }}" class="py-1 px-2 rounded bg-gray-700 text-white dark:bg-gray-500 hover:bg-black dark:hover:bg-gray-600 shadow flex items-center space-x-1.5" rel="noopener" target="_blank">
-    <ion-icon name="logo-github" class="text-white"></ion-icon>
-
-    <span>
-      Page source
-    </span>
-  </a>
-
-  <a href="{{ $edit }}" class="py-1 px-2 rounded bg-gray-700 text-white dark:bg-gray-500 hover:bg-black dark:hover:bg-gray-600 shadow flex items-center space-x-1.5" rel="noopener" target="_blank">
-    <ion-icon name="logo-github" class="text-white"></ion-icon>
-
-    <span>
-      Edit this page
-    </span>
-  </a>
-</div>
\ No newline at end of file

From 01bbc690b04253071fce3a6bab513ff71049b9b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ensar=20Saraj=C4=8Di=C4=87?= <dev@ensarsarajcic.com>
Date: Fri, 20 Jun 2025 20:08:04 +0200
Subject: [PATCH 091/305] feat(observability): add uptime seconds display to
 `vector top` (#23228)

* feat(observability): add uptime seconds display to `vector top`

Closes: #23226

* Add changelog entry

* Use humantime for uptime display

* Update 3rd party licenses

---------

Co-authored-by: Thomas <thomas.schneider@datadoghq.com>
---
 Cargo.lock                                     | 15 ++++++++-------
 Cargo.toml                                     |  2 ++
 LICENSE-3rdparty.csv                           |  1 +
 changelog.d/23228_vector_top_uptime.feature.md |  3 +++
 src/top/dashboard.rs                           | 16 +++++++++++++---
 src/top/metrics.rs                             | 17 ++++++++++++++++-
 src/top/state.rs                               | 11 ++++++++++-
 7 files changed, 53 insertions(+), 12 deletions(-)
 create mode 100644 changelog.d/23228_vector_top_uptime.feature.md

diff --git a/Cargo.lock b/Cargo.lock
index dd31764fa86eb..c36b6b61ad941 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -132,9 +132,9 @@ dependencies = [
 
 [[package]]
 name = "allocator-api2"
-version = "0.2.16"
+version = "0.2.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5"
+checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923"
 
 [[package]]
 name = "amq-protocol"
@@ -4702,9 +4702,9 @@ checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9"
 
 [[package]]
 name = "humantime"
-version = "2.1.0"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
+checksum = "9b112acc8b3adf4b107a8ec20977da0273a8c386765a3ec0229bd500a1443f9f"
 
 [[package]]
 name = "hyper"
@@ -4723,7 +4723,7 @@ dependencies = [
  "httpdate",
  "itoa",
  "pin-project-lite",
- "socket2 0.4.10",
+ "socket2 0.5.10",
  "tokio",
  "tower-service",
  "tracing 0.1.41",
@@ -7800,7 +7800,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "be769465445e8c1474e9c5dac2018218498557af32d9ed057325ec9a41ae81bf"
 dependencies = [
  "heck 0.5.0",
- "itertools 0.10.5",
+ "itertools 0.14.0",
  "log",
  "multimap",
  "once_cell",
@@ -7846,7 +7846,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8a56d757972c98b346a9b766e3f02746cde6dd1cd1d1d563472929fdd74bec4d"
 dependencies = [
  "anyhow",
- "itertools 0.10.5",
+ "itertools 0.14.0",
  "proc-macro2 1.0.95",
  "quote 1.0.40",
  "syn 2.0.102",
@@ -11544,6 +11544,7 @@ dependencies = [
  "http 1.1.0",
  "http-body 0.4.5",
  "http-serde",
+ "humantime",
  "hyper 0.14.28",
  "hyper-openssl 0.9.2",
  "hyper-proxy",
diff --git a/Cargo.toml b/Cargo.toml
index f622517aa2795..81f203e70692d 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -144,6 +144,7 @@ flate2 = { version = "1.1.2", default-features = false, features = ["zlib-rs"] }
 futures = { version = "0.3.31", default-features = false, features = ["compat", "io-compat", "std"], package = "futures" }
 glob = { version = "0.3.2", default-features = false }
 hickory-proto = { version = "0.25.2", default-features = false, features = ["dnssec-ring"] }
+humantime = { version = "2.2.0", default-features = false }
 indexmap = { version = "2.9.0", default-features = false, features = ["serde", "std"] }
 inventory = { version = "0.3" }
 indoc = { version = "2.0.6" }
@@ -345,6 +346,7 @@ http = { version = "0.2.9", default-features = false }
 http-1 = { package = "http", version = "1.0", default-features = false, features = ["std"] }
 http-serde = "1.1.3"
 http-body = { version = "0.4.5", default-features = false }
+humantime.workspace = true
 hyper = { version = "0.14.28", default-features = false, features = ["client", "runtime", "http1", "http2", "server", "stream"] }
 hyper-openssl = { version = "0.9.2", default-features = false }
 hyper-proxy = { version = "0.9.1", default-features = false, features = ["openssl-tls"] }
diff --git a/LICENSE-3rdparty.csv b/LICENSE-3rdparty.csv
index cd7ce1243f97c..56d1ff2fa8d87 100644
--- a/LICENSE-3rdparty.csv
+++ b/LICENSE-3rdparty.csv
@@ -293,6 +293,7 @@ http-serde,https://gitlab.com/kornelski/http-serde,Apache-2.0 OR MIT,Kornel <kor
 http-types,https://github.com/http-rs/http-types,MIT OR Apache-2.0,Yoshua Wuyts <yoshuawuyts@gmail.com>
 httparse,https://github.com/seanmonstar/httparse,MIT OR Apache-2.0,Sean McArthur <sean@seanmonstar.com>
 httpdate,https://github.com/pyfisch/httpdate,MIT OR Apache-2.0,Pyfisch <pyfisch@posteo.org>
+humantime,https://github.com/chronotope/humantime,MIT OR Apache-2.0,The humantime Authors
 hyper,https://github.com/hyperium/hyper,MIT,Sean McArthur <sean@seanmonstar.com>
 hyper-named-pipe,https://github.com/fussybeaver/hyper-named-pipe,Apache-2.0,The hyper-named-pipe Authors
 hyper-openssl,https://github.com/sfackler/hyper-openssl,MIT OR Apache-2.0,Steven Fackler <sfackler@gmail.com>
diff --git a/changelog.d/23228_vector_top_uptime.feature.md b/changelog.d/23228_vector_top_uptime.feature.md
new file mode 100644
index 0000000000000..f49705c477127
--- /dev/null
+++ b/changelog.d/23228_vector_top_uptime.feature.md
@@ -0,0 +1,3 @@
+Added vector uptime in seconds to `vector top`.
+
+authors: esensar Quad9DNS
diff --git a/src/top/dashboard.rs b/src/top/dashboard.rs
index 0ceb20749bda8..22db21dc99c83 100644
--- a/src/top/dashboard.rs
+++ b/src/top/dashboard.rs
@@ -17,7 +17,7 @@ use ratatui::{
     widgets::{Block, Borders, Cell, Paragraph, Row, Table, Wrap},
     Frame, Terminal,
 };
-use std::io::stdout;
+use std::{io::stdout, time::Duration};
 use tokio::sync::oneshot;
 
 use super::{
@@ -164,7 +164,13 @@ impl<'a> Widgets<'a> {
     }
 
     /// Renders a title and the URL the dashboard is currently connected to.
-    fn title(&'a self, f: &mut Frame, area: Rect, connection_status: &ConnectionStatus) {
+    fn title(
+        &'a self,
+        f: &mut Frame,
+        area: Rect,
+        connection_status: &ConnectionStatus,
+        uptime: Duration,
+    ) {
         let mut text = vec![
             Span::from(self.url_string),
             Span::styled(
@@ -174,6 +180,10 @@ impl<'a> Widgets<'a> {
             Span::from(" | "),
         ];
         text.extend(connection_status.as_ui_spans());
+        text.extend(vec![Span::from(format!(
+            " | Uptime: {}",
+            humantime::format_duration(uptime)
+        ))]);
 
         let text = vec![Line::from(text)];
 
@@ -327,7 +337,7 @@ impl<'a> Widgets<'a> {
             .constraints(self.constraints.clone())
             .split(size);
 
-        self.title(f, rects[0], &state.connection_status);
+        self.title(f, rects[0], &state.connection_status, state.uptime);
 
         // Require a minimum of 80 chars of line width to display the table
         if size.width >= 80 {
diff --git a/src/top/metrics.rs b/src/top/metrics.rs
index 057974790ad11..c2a8ef02e762a 100644
--- a/src/top/metrics.rs
+++ b/src/top/metrics.rs
@@ -397,6 +397,20 @@ async fn errors_totals(
     }
 }
 
+async fn uptime_changed(client: Arc<SubscriptionClient>, tx: state::EventTx) {
+    tokio::pin! {
+        let stream = client.uptime_subscription();
+    };
+
+    while let Some(Some(res)) = stream.next().await {
+        if let Some(d) = res.data {
+            _ = tx
+                .send(state::EventType::UptimeChanged(d.uptime.seconds))
+                .await;
+        }
+    }
+}
+
 /// Subscribe to each metrics channel through a separate client. This is a temporary workaround
 /// until client multiplexing is fixed. In future, we should be able to use a single client
 pub fn subscribe(
@@ -475,10 +489,11 @@ pub fn subscribe(
         )),
         tokio::spawn(errors_totals(
             Arc::clone(&client),
-            tx,
+            tx.clone(),
             interval,
             Arc::clone(&components_patterns),
         )),
+        tokio::spawn(uptime_changed(Arc::clone(&client), tx)),
     ]
 }
 
diff --git a/src/top/state.rs b/src/top/state.rs
index b6db5cef2bc67..597ef6d7e8dcc 100644
--- a/src/top/state.rs
+++ b/src/top/state.rs
@@ -1,4 +1,7 @@
-use std::collections::{BTreeMap, HashMap};
+use std::{
+    collections::{BTreeMap, HashMap},
+    time::Duration,
+};
 
 use chrono::{DateTime, Local};
 use ratatui::{
@@ -22,6 +25,7 @@ pub struct SentEventsMetric {
 #[derive(Debug)]
 pub enum EventType {
     InitializeState(State),
+    UptimeChanged(f64),
     ReceivedBytesTotals(Vec<IdentifiedMetric>),
     /// Interval + identified metric
     ReceivedBytesThroughputs(i64, Vec<IdentifiedMetric>),
@@ -76,6 +80,7 @@ impl ConnectionStatus {
 #[derive(Debug, Clone)]
 pub struct State {
     pub connection_status: ConnectionStatus,
+    pub uptime: Duration,
     pub components: BTreeMap<ComponentKey, ComponentRow>,
 }
 
@@ -83,6 +88,7 @@ impl State {
     pub const fn new(components: BTreeMap<ComponentKey, ComponentRow>) -> Self {
         Self {
             connection_status: ConnectionStatus::Pending,
+            uptime: Duration::from_secs(0),
             components,
         }
     }
@@ -244,6 +250,9 @@ pub async fn updater(mut event_rx: EventRx) -> StateRx {
                 EventType::ConnectionUpdated(status) => {
                     state.connection_status = status;
                 }
+                EventType::UptimeChanged(uptime) => {
+                    state.uptime = Duration::from_secs_f64(uptime);
+                }
             }
 
             // Send updated map to listeners

From ba2b75b8b44855106ad15fa4f790b8410755dcf7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 20 Jun 2025 19:38:30 +0000
Subject: [PATCH 092/305] chore(deps): Bump convert_case from 0.7.1 to 0.8.0
 (#22556)

Bumps [convert_case](https://github.com/rutrum/convert-case) from 0.7.1 to 0.8.0.
- [Commits](https://github.com/rutrum/convert-case/commits)

---
updated-dependencies:
- dependency-name: convert_case
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock                          | 11 ++++++++++-
 lib/vector-config-common/Cargo.toml |  2 +-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index c36b6b61ad941..6aa4c1423a524 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2489,6 +2489,15 @@ dependencies = [
  "unicode-segmentation",
 ]
 
+[[package]]
+name = "convert_case"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "baaaa0ecca5b51987b9423ccdc971514dd8b0bb7b4060b983d3664dad3f1f89f"
+dependencies = [
+ "unicode-segmentation",
+]
+
 [[package]]
 name = "cookie-factory"
 version = "0.3.2"
@@ -11779,7 +11788,7 @@ dependencies = [
 name = "vector-config-common"
 version = "0.1.0"
 dependencies = [
- "convert_case 0.7.1",
+ "convert_case 0.8.0",
  "darling 0.20.11",
  "proc-macro2 1.0.95",
  "quote 1.0.40",
diff --git a/lib/vector-config-common/Cargo.toml b/lib/vector-config-common/Cargo.toml
index 5a057e977f656..46d93242ce01a 100644
--- a/lib/vector-config-common/Cargo.toml
+++ b/lib/vector-config-common/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 license = "MPL-2.0"
 
 [dependencies]
-convert_case = { version = "0.7", default-features = false }
+convert_case = { version = "0.8", default-features = false }
 darling.workspace = true
 proc-macro2 = { version = "1.0", default-features = false }
 serde.workspace = true

From a0ef7aaed4368cdc99eca177524fc77669a0f6e2 Mon Sep 17 00:00:00 2001
From: Thomas <thomas.schneider@datadoghq.com>
Date: Mon, 23 Jun 2025 09:31:31 -0400
Subject: [PATCH 093/305] fix(ci): fix changelog check by fetching correct ref
 (#23241)

* Revert "Remove base branch fetching"

This reverts commit ad73fd15136eac26f623a488adc88910320ca610.

* changelog: remove pull_request job

* Add changelog

* Use BASE_BRANCH in check_changelog_fragments.sh

* Revert "Use BASE_BRANCH in check_changelog_fragments.sh"

This reverts commit 88c12f649efe9e180feae71116f8cde9064a58ed.

* Fetch correct sha

* Revert "Revert "Use BASE_BRANCH in check_changelog_fragments.sh""

This reverts commit 14d9bf6bf871a96029534b936b56540212f9676b.

* Use ref instead of sha

* Revert "Revert "Revert "Use BASE_BRANCH in check_changelog_fragments.sh"""

This reverts commit d9d5cf813778c1620d8c7a20cbb383fc5e971aae.

* Remove BASE_BRANCH entirely

* Go back to sha

* Temporarily add pull_request back

* Revert "Temporarily add pull_request back"

This reverts commit 690b5cf88c4328880cf5857f9bf6d5ae123663bc.

* Revert "Add changelog"

This reverts commit 165ade2cdb9a249c1990780a5b2be613f4991b5a.
---
 .github/workflows/changelog.yaml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/changelog.yaml b/.github/workflows/changelog.yaml
index a4c8d05ce057c..76f92e5f94ecc 100644
--- a/.github/workflows/changelog.yaml
+++ b/.github/workflows/changelog.yaml
@@ -9,9 +9,6 @@
 name: Changelog
 
 on:
-  pull_request:
-    types: [opened, synchronize, reopened, labeled, unlabeled]
-
   pull_request_target:
     types: [opened, synchronize, reopened, labeled, unlabeled]
 
@@ -34,6 +31,8 @@ jobs:
         if: ${{ github.event_name != 'merge_group' }}
         with:
           fetch-depth: 0
+          repository: ${{ github.event.pull_request.head.repo.full_name }}
+          ref: ${{ github.event.pull_request.head.sha }}
 
       - name: Bypass when no‑changelog label is present
         if: env.PR_HAS_LABEL == 'true'

From 96f8624e225deaee9bb1a20a6e2bba7774972332 Mon Sep 17 00:00:00 2001
From: Serendo <biiyunfei@gmail.com>
Date: Mon, 23 Jun 2025 21:53:35 +0800
Subject: [PATCH 094/305] chore(deps): Update tower to v`0.5` (#23186)

* Update to tower 0.5.
- Adjustments of Buffer type definition in Tower 0.5
- As policy is directly modified in Tower 0.5. Removed the policy part in the RetryPolicyFuture.
- The change args to mutable for the retry function and clone_request function. It's changed in Tower 0.5.
- Changed the RetryPolicyFuture Output to (). This is also changed in Tower 0.5.
- Modified some tests as policy is now modified in advance function;

* rename unused variable

* changed some threshold of the tests. But I dont quite understand how these stats ranges are related with the test params.

* Apply suggestions from code review

Co-authored-by: Pavlos Rontidis <pavlos.rontidis@gmail.com>

* reformatted  to pass check fmt

* update tower to v0.5.2 in vector-stream

---------

Co-authored-by: Pavlos Rontidis <pavlos.rontidis@gmail.com>
---
 Cargo.lock                                    | 43 +++++++----
 Cargo.toml                                    |  2 +-
 lib/vector-stream/Cargo.toml                  |  2 +-
 src/sinks/aws_cloudwatch_logs/service.rs      | 11 +--
 src/sinks/util/retries.rs                     | 72 +++++++++----------
 src/sinks/util/service.rs                     |  7 +-
 .../defers-at-high-concurrency.toml           | 16 ++---
 .../drops-at-high-concurrency.toml            |  2 +-
 8 files changed, 87 insertions(+), 68 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 6aa4c1423a524..afbd95de80a64 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1446,7 +1446,7 @@ dependencies = [
  "serde",
  "sync_wrapper 0.1.2",
  "tokio",
- "tower",
+ "tower 0.4.13",
  "tower-layer",
  "tower-service",
 ]
@@ -1473,7 +1473,7 @@ dependencies = [
  "rustversion",
  "serde",
  "sync_wrapper 1.0.1",
- "tower",
+ "tower 0.4.13",
  "tower-layer",
  "tower-service",
 ]
@@ -4205,7 +4205,7 @@ dependencies = [
  "tokio-stream",
  "tonic 0.11.0",
  "tonic-build 0.9.2",
- "tower",
+ "tower 0.4.13",
 ]
 
 [[package]]
@@ -5582,7 +5582,7 @@ dependencies = [
  "thiserror 1.0.68",
  "tokio",
  "tokio-util",
- "tower",
+ "tower 0.4.13",
  "tower-http 0.5.2",
  "tracing 0.1.41",
 ]
@@ -10725,7 +10725,7 @@ dependencies = [
  "tokio",
  "tokio-rustls 0.25.0",
  "tokio-stream",
- "tower",
+ "tower 0.4.13",
  "tower-layer",
  "tower-service",
  "tracing 0.1.41",
@@ -10756,7 +10756,7 @@ dependencies = [
  "socket2 0.5.10",
  "tokio",
  "tokio-stream",
- "tower",
+ "tower 0.4.13",
  "tower-layer",
  "tower-service",
  "tracing 0.1.41",
@@ -10808,6 +10808,25 @@ dependencies = [
  "tracing 0.1.41",
 ]
 
+[[package]]
+name = "tower"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d039ad9159c98b70ecfd540b2573b97f7f52c3e8d9f8ad57a24b916a536975f9"
+dependencies = [
+ "futures-core",
+ "futures-util",
+ "indexmap 2.7.0",
+ "pin-project-lite",
+ "slab",
+ "sync_wrapper 1.0.1",
+ "tokio",
+ "tokio-util",
+ "tower-layer",
+ "tower-service",
+ "tracing 0.1.41",
+]
+
 [[package]]
 name = "tower-http"
 version = "0.4.4"
@@ -10851,15 +10870,15 @@ dependencies = [
 
 [[package]]
 name = "tower-layer"
-version = "0.3.2"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0"
+checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e"
 
 [[package]]
 name = "tower-service"
-version = "0.3.2"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52"
+checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3"
 
 [[package]]
 name = "tower-test"
@@ -11649,7 +11668,7 @@ dependencies = [
  "toml",
  "tonic 0.11.0",
  "tonic-build 0.11.0",
- "tower",
+ "tower 0.5.2",
  "tower-http 0.4.4",
  "tower-test",
  "tracing 0.1.41",
@@ -11936,7 +11955,7 @@ dependencies = [
  "rand_distr",
  "tokio",
  "tokio-util",
- "tower",
+ "tower 0.4.13",
  "tracing 0.1.41",
  "twox-hash 2.1.1",
  "vector-common",
diff --git a/Cargo.toml b/Cargo.toml
index 81f203e70692d..7edd3b2f50bc2 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -266,7 +266,7 @@ azure_storage_blobs = { version = "0.17", default-features = false, optional = t
 opendal = { version = "0.53", default-features = false, features = ["services-webhdfs"], optional = true }
 
 # Tower
-tower = { version = "0.4.13", default-features = false, features = ["buffer", "limit", "retry", "timeout", "util", "balance", "discover"] }
+tower = { version = "0.5.2", default-features = false, features = ["buffer", "limit", "retry", "timeout", "util", "balance", "discover"] }
 tower-http = { version = "0.4.4", default-features = false, features = ["compression-full", "decompression-gzip", "trace"] }
 # Serde
 serde.workspace = true
diff --git a/lib/vector-stream/Cargo.toml b/lib/vector-stream/Cargo.toml
index d77ef065f1b73..4af3d5f4f4759 100644
--- a/lib/vector-stream/Cargo.toml
+++ b/lib/vector-stream/Cargo.toml
@@ -12,7 +12,7 @@ futures-util = { version = "0.3.29", default-features = false, features = ["std"
 pin-project.workspace = true
 tokio = { version = "1.45.1", default-features = false, features = ["net"] }
 tokio-util = { version = "0.7.0", default-features = false, features = ["time"] }
-tower = { version = "0.4", default-features = false, features = ["util"] }
+tower = { version = "0.5.2", default-features = false, features = ["util"] }
 tracing = { version = "0.1.34", default-features = false }
 twox-hash = { version = "2.1.1", default-features = false, features = ["xxhash64"] }
 vector-common = { path = "../vector-common" }
diff --git a/src/sinks/aws_cloudwatch_logs/service.rs b/src/sinks/aws_cloudwatch_logs/service.rs
index f914029dbc35f..371a439199057 100644
--- a/src/sinks/aws_cloudwatch_logs/service.rs
+++ b/src/sinks/aws_cloudwatch_logs/service.rs
@@ -46,15 +46,18 @@ use crate::sinks::{
 };
 
 type Svc = Buffer<
-    ConcurrencyLimit<
+    Vec<InputLogEvent>,
+    <ConcurrencyLimit<
         RateLimit<
             Retry<
                 FibonacciRetryPolicy<CloudwatchRetryLogic<()>>,
-                Buffer<Timeout<CloudwatchLogsSvc>, Vec<InputLogEvent>>,
+                Buffer<
+                    Vec<InputLogEvent>,
+                    <Timeout<CloudwatchLogsSvc> as Service<Vec<InputLogEvent>>>::Future,
+                >,
             >,
         >,
-    >,
-    Vec<InputLogEvent>,
+    > as Service<Vec<InputLogEvent>>>::Future,
 >;
 
 #[derive(Debug)]
diff --git a/src/sinks/util/retries.rs b/src/sinks/util/retries.rs
index 6e4549fb8cbac..05607ed501522 100644
--- a/src/sinks/util/retries.rs
+++ b/src/sinks/util/retries.rs
@@ -73,9 +73,8 @@ pub struct FibonacciRetryPolicy<L> {
     logic: L,
 }
 
-pub struct RetryPolicyFuture<L: RetryLogic> {
+pub struct RetryPolicyFuture {
     delay: Pin<Box<Sleep>>,
-    policy: FibonacciRetryPolicy<L>,
 }
 
 impl<L: RetryLogic> FibonacciRetryPolicy<L> {
@@ -102,23 +101,6 @@ impl<L: RetryLogic> FibonacciRetryPolicy<L> {
         Duration::from_millis(jitter)
     }
 
-    fn advance(&self) -> FibonacciRetryPolicy<L> {
-        let next_duration: Duration = cmp::min(
-            self.previous_duration + self.current_duration,
-            self.max_duration,
-        );
-
-        FibonacciRetryPolicy {
-            remaining_attempts: self.remaining_attempts - 1,
-            previous_duration: self.current_duration,
-            current_duration: next_duration,
-            current_jitter_duration: Self::add_full_jitter(next_duration),
-            jitter_mode: self.jitter_mode,
-            max_duration: self.max_duration,
-            logic: self.logic.clone(),
-        }
-    }
-
     const fn backoff(&self) -> Duration {
         match self.jitter_mode {
             JitterMode::None => self.current_duration,
@@ -126,25 +108,37 @@ impl<L: RetryLogic> FibonacciRetryPolicy<L> {
         }
     }
 
-    fn build_retry(&self) -> RetryPolicyFuture<L> {
-        let policy = self.advance();
+    fn advance(&mut self) {
+        let sum = self
+            .previous_duration
+            .checked_add(self.current_duration)
+            .unwrap_or(Duration::MAX);
+        let next_duration = cmp::min(sum, self.max_duration);
+        self.remaining_attempts = self.remaining_attempts.saturating_sub(1);
+        self.previous_duration = self.current_duration;
+        self.current_duration = next_duration;
+        self.current_jitter_duration = Self::add_full_jitter(next_duration);
+    }
+
+    fn build_retry(&mut self) -> RetryPolicyFuture {
+        self.advance();
         let delay = Box::pin(sleep(self.backoff()));
 
         debug!(message = "Retrying request.", delay_ms = %self.backoff().as_millis());
-        RetryPolicyFuture { delay, policy }
+        RetryPolicyFuture { delay }
     }
 }
 
 impl<Req, Res, L> Policy<Req, Res, Error> for FibonacciRetryPolicy<L>
 where
-    Req: Clone,
+    Req: Clone + 'static,
     L: RetryLogic<Response = Res>,
 {
-    type Future = RetryPolicyFuture<L>;
+    type Future = RetryPolicyFuture;
 
     // NOTE: in the error cases- `Error` and `EventsDropped` internal events are emitted by the
     // driver, so only need to log here.
-    fn retry(&self, _: &Req, result: Result<&Res, &Error>) -> Option<Self::Future> {
+    fn retry(&mut self, _: &mut Req, result: &mut Result<Res, Error>) -> Option<Self::Future> {
         match result {
             Ok(response) => match self.logic.should_retry_response(response) {
                 RetryAction::Retry(reason) => {
@@ -202,21 +196,21 @@ where
         }
     }
 
-    fn clone_request(&self, request: &Req) -> Option<Req> {
+    fn clone_request(&mut self, request: &Req) -> Option<Req> {
         Some(request.clone())
     }
 }
 
 // Safety: `L` is never pinned and we use no unsafe pin projections
 // therefore this safe.
-impl<L: RetryLogic> Unpin for RetryPolicyFuture<L> {}
+impl Unpin for RetryPolicyFuture {}
 
-impl<L: RetryLogic> Future for RetryPolicyFuture<L> {
-    type Output = FibonacciRetryPolicy<L>;
+impl Future for RetryPolicyFuture {
+    type Output = ();
 
     fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
         std::task::ready!(self.delay.poll_unpin(cx));
-        Poll::Ready(self.policy.clone())
+        Poll::Ready(())
     }
 }
 
@@ -419,25 +413,25 @@ mod tests {
         );
         assert_eq!(Duration::from_secs(1), policy.backoff());
 
-        policy = policy.advance();
+        policy.advance();
         assert_eq!(Duration::from_secs(1), policy.backoff());
 
-        policy = policy.advance();
+        policy.advance();
         assert_eq!(Duration::from_secs(2), policy.backoff());
 
-        policy = policy.advance();
+        policy.advance();
         assert_eq!(Duration::from_secs(3), policy.backoff());
 
-        policy = policy.advance();
+        policy.advance();
         assert_eq!(Duration::from_secs(5), policy.backoff());
 
-        policy = policy.advance();
+        policy.advance();
         assert_eq!(Duration::from_secs(8), policy.backoff());
 
-        policy = policy.advance();
+        policy.advance();
         assert_eq!(Duration::from_secs(10), policy.backoff());
 
-        policy = policy.advance();
+        policy.advance();
         assert_eq!(Duration::from_secs(10), policy.backoff());
     }
 
@@ -467,7 +461,7 @@ mod tests {
                 backoff
             );
 
-            policy = policy.advance();
+            policy.advance();
         }
 
         // Once the max backoff is reached, it should not exceed the max backoff.
@@ -480,7 +474,7 @@ mod tests {
                 backoff
             );
 
-            policy = policy.advance();
+            policy.advance();
         }
     }
 
diff --git a/src/sinks/util/service.rs b/src/sinks/util/service.rs
index 5960250034144..91733c4af019f 100644
--- a/src/sinks/util/service.rs
+++ b/src/sinks/util/service.rs
@@ -44,7 +44,10 @@ pub type TowerPartitionSink<S, B, RL, K> = PartitionBatchSink<Svc<S, RL>, B, K>;
 
 // Distributed service types
 pub type DistributedService<S, RL, HL, K, Req> = RateLimit<
-    Retry<FibonacciRetryPolicy<RL>, Buffer<Balance<DiscoveryService<S, RL, HL, K>, Req>, Req>>,
+    Retry<
+        FibonacciRetryPolicy<RL>,
+        Buffer<Req, <Balance<DiscoveryService<S, RL, HL, K>, Req> as Service<Req>>::Future>,
+    >,
 >;
 pub type DiscoveryService<S, RL, HL, K> =
     BoxStream<'static, Result<Change<K, SingleDistributedService<S, RL, HL>>, crate::Error>>;
@@ -352,7 +355,7 @@ impl TowerRequestSettings {
                     )
             })
             .enumerate()
-            .map(|(i, service)| Ok(Change::Insert(i, service)))
+            .map(|(i, service)| Ok::<_, S::Error>(Change::Insert(i, service)))
             .collect::<Vec<_>>();
 
         // Build sink service
diff --git a/tests/data/adaptive-concurrency/defers-at-high-concurrency.toml b/tests/data/adaptive-concurrency/defers-at-high-concurrency.toml
index 3401d91c0c5f3..2cc22a0b3041a 100644
--- a/tests/data/adaptive-concurrency/defers-at-high-concurrency.toml
+++ b/tests/data/adaptive-concurrency/defers-at-high-concurrency.toml
@@ -15,26 +15,26 @@ mode = [0, 6]
 mean = [2.2, 5.0]
 
 [stats.rate]
-max = [52, 62]
+max = [52, 63]
 mean = [20, 44]
 
 [controller.in_flight]
-max = [5, 39]
-mode = [4, 27]
+max = [5, 41]
+mode = [4, 29]
 mean = [3.5, 26]
 
 [controller.concurrency_limit]
-max = [6, 39]
-mode = [2, 27]
-mean = [4.0, 26.5]
+max = [6, 41]
+mode = [2, 29]
+mean = [4.0, 29]
 
 [controller.observed_rtt]
 min = [0.100, 0.102]
-max = [0.100, 12.7]
+max = [0.100, 19.7]
 mean = [0.100, 5.7]
 
 [controller.averaged_rtt]
 min = [0.100, 0.102]
-max = [0.100, 7.0]
+max = [0.100, 9.0]
 mean = [0.100, 3.2]
 
diff --git a/tests/data/adaptive-concurrency/drops-at-high-concurrency.toml b/tests/data/adaptive-concurrency/drops-at-high-concurrency.toml
index 98cc7a637036a..b9033c1333c5c 100644
--- a/tests/data/adaptive-concurrency/drops-at-high-concurrency.toml
+++ b/tests/data/adaptive-concurrency/drops-at-high-concurrency.toml
@@ -19,7 +19,7 @@ mean = [31, 54]
 
 [controller.in_flight]
 max = [13, 85]
-mean = [7.0, 40]
+mean = [7.0, 41]
 mode = [1, 11]
 
 [controller.concurrency_limit]

From 6a88922da9b4112be6f0ab835cf039391db25327 Mon Sep 17 00:00:00 2001
From: Pavlos Rontidis <pavlos.rontidis@gmail.com>
Date: Mon, 23 Jun 2025 13:11:08 -0400
Subject: [PATCH 095/305] chore(website): improve decoder docs (#23245)

---
 lib/codecs/src/decoding/mod.rs                        |  8 ++++++--
 src/sources/http_client/client.rs                     |  1 -
 .../components/sinks/base/websocket_server.cue        | 11 +++++++++--
 .../cue/reference/components/sources/base/amqp.cue    | 11 +++++++++--
 .../components/sources/base/aws_kinesis_firehose.cue  | 11 +++++++++--
 .../cue/reference/components/sources/base/aws_s3.cue  | 11 +++++++++--
 .../cue/reference/components/sources/base/aws_sqs.cue | 11 +++++++++--
 .../components/sources/base/datadog_agent.cue         | 11 +++++++++--
 .../reference/components/sources/base/demo_logs.cue   | 11 +++++++++--
 .../cue/reference/components/sources/base/exec.cue    | 11 +++++++++--
 .../components/sources/base/file_descriptor.cue       | 11 +++++++++--
 .../reference/components/sources/base/gcp_pubsub.cue  | 11 +++++++++--
 .../reference/components/sources/base/heroku_logs.cue | 11 +++++++++--
 .../cue/reference/components/sources/base/http.cue    | 11 +++++++++--
 .../reference/components/sources/base/http_client.cue | 11 +++++++++--
 .../reference/components/sources/base/http_server.cue | 11 +++++++++--
 .../cue/reference/components/sources/base/kafka.cue   | 11 +++++++++--
 .../cue/reference/components/sources/base/mqtt.cue    | 11 +++++++++--
 .../cue/reference/components/sources/base/nats.cue    | 11 +++++++++--
 .../cue/reference/components/sources/base/pulsar.cue  | 11 +++++++++--
 .../cue/reference/components/sources/base/redis.cue   | 11 +++++++++--
 .../cue/reference/components/sources/base/socket.cue  | 11 +++++++++--
 .../cue/reference/components/sources/base/stdin.cue   | 11 +++++++++--
 23 files changed, 195 insertions(+), 45 deletions(-)

diff --git a/lib/codecs/src/decoding/mod.rs b/lib/codecs/src/decoding/mod.rs
index 0e14722dd3430..684c61fef37f5 100644
--- a/lib/codecs/src/decoding/mod.rs
+++ b/lib/codecs/src/decoding/mod.rs
@@ -205,11 +205,11 @@ impl tokio_util::codec::Decoder for Framer {
     }
 }
 
-/// Deserializer configuration.
+/// Configures how events are decoded from raw bytes. Note some decoders can also determine the event output
+/// type (log, metric, trace).
 #[configurable_component]
 #[derive(Clone, Debug)]
 #[serde(tag = "codec", rename_all = "snake_case")]
-#[configurable(description = "Configures how events are decoded from raw bytes.")]
 #[configurable(metadata(docs::enum_tag_description = "The codec to use for decoding events."))]
 pub enum DeserializerConfig {
     /// Uses the raw bytes as-is.
@@ -237,6 +237,8 @@ pub enum DeserializerConfig {
 
     /// Decodes the raw bytes as [native Protocol Buffers format][vector_native_protobuf].
     ///
+    /// This decoder can output all types of events (logs, metrics, traces).
+    ///
     /// This codec is **[experimental][experimental]**.
     ///
     /// [vector_native_protobuf]: https://github.com/vectordotdev/vector/blob/master/lib/vector-core/proto/event.proto
@@ -245,6 +247,8 @@ pub enum DeserializerConfig {
 
     /// Decodes the raw bytes as [native JSON format][vector_native_json].
     ///
+    /// This decoder can output all types of events (logs, metrics, traces).
+    ///
     /// This codec is **[experimental][experimental]**.
     ///
     /// [vector_native_json]: https://github.com/vectordotdev/vector/blob/master/lib/codecs/tests/data/native_encoding/schema.cue
diff --git a/src/sources/http_client/client.rs b/src/sources/http_client/client.rs
index b09fbdddcac80..a0e4f54ab9994 100644
--- a/src/sources/http_client/client.rs
+++ b/src/sources/http_client/client.rs
@@ -91,7 +91,6 @@ pub struct HttpClientConfig {
     #[configurable(metadata(docs::examples = "query_examples()"))]
     pub query: QueryParameters,
 
-    /// Decoder to use on the HTTP responses.
     #[configurable(derived)]
     #[serde(default = "default_decoding")]
     pub decoding: DeserializerConfig,
diff --git a/website/cue/reference/components/sinks/base/websocket_server.cue b/website/cue/reference/components/sinks/base/websocket_server.cue
index ada3da7debe2e..c99d46880959a 100644
--- a/website/cue/reference/components/sinks/base/websocket_server.cue
+++ b/website/cue/reference/components/sinks/base/websocket_server.cue
@@ -492,8 +492,11 @@ base: components: sinks: websocket_server: configuration: {
 				required: false
 				type: object: options: {
 					ack_decoding: {
-						description: "Configures how events are decoded from raw bytes."
-						required:    false
+						description: """
+																Configures how events are decoded from raw bytes. Note some decoders can also determine the event output
+																type (log, metric, trace).
+																"""
+						required: false
 						type: object: options: {
 							avro: {
 								description:   "Apache Avro-specific encoder options."
@@ -566,6 +569,8 @@ base: components: sinks: websocket_server: configuration: {
 										native: """
 																							Decodes the raw bytes as [native Protocol Buffers format][vector_native_protobuf].
 
+																							This decoder can output all types of events (logs, metrics, traces).
+
 																							This codec is **[experimental][experimental]**.
 
 																							[vector_native_protobuf]: https://github.com/vectordotdev/vector/blob/master/lib/vector-core/proto/event.proto
@@ -574,6 +579,8 @@ base: components: sinks: websocket_server: configuration: {
 										native_json: """
 																							Decodes the raw bytes as [native JSON format][vector_native_json].
 
+																							This decoder can output all types of events (logs, metrics, traces).
+
 																							This codec is **[experimental][experimental]**.
 
 																							[vector_native_json]: https://github.com/vectordotdev/vector/blob/master/lib/codecs/tests/data/native_encoding/schema.cue
diff --git a/website/cue/reference/components/sources/base/amqp.cue b/website/cue/reference/components/sources/base/amqp.cue
index 9143f33575ba6..4b6bf3997bc8c 100644
--- a/website/cue/reference/components/sources/base/amqp.cue
+++ b/website/cue/reference/components/sources/base/amqp.cue
@@ -47,8 +47,11 @@ base: components: sources: amqp: configuration: {
 		}
 	}
 	decoding: {
-		description: "Configures how events are decoded from raw bytes."
-		required:    false
+		description: """
+			Configures how events are decoded from raw bytes. Note some decoders can also determine the event output
+			type (log, metric, trace).
+			"""
+		required: false
 		type: object: options: {
 			avro: {
 				description:   "Apache Avro-specific encoder options."
@@ -121,6 +124,8 @@ base: components: sources: amqp: configuration: {
 						native: """
 															Decodes the raw bytes as [native Protocol Buffers format][vector_native_protobuf].
 
+															This decoder can output all types of events (logs, metrics, traces).
+
 															This codec is **[experimental][experimental]**.
 
 															[vector_native_protobuf]: https://github.com/vectordotdev/vector/blob/master/lib/vector-core/proto/event.proto
@@ -129,6 +134,8 @@ base: components: sources: amqp: configuration: {
 						native_json: """
 															Decodes the raw bytes as [native JSON format][vector_native_json].
 
+															This decoder can output all types of events (logs, metrics, traces).
+
 															This codec is **[experimental][experimental]**.
 
 															[vector_native_json]: https://github.com/vectordotdev/vector/blob/master/lib/codecs/tests/data/native_encoding/schema.cue
diff --git a/website/cue/reference/components/sources/base/aws_kinesis_firehose.cue b/website/cue/reference/components/sources/base/aws_kinesis_firehose.cue
index fd1f1a4331a4e..18aa1bb813c2c 100644
--- a/website/cue/reference/components/sources/base/aws_kinesis_firehose.cue
+++ b/website/cue/reference/components/sources/base/aws_kinesis_firehose.cue
@@ -50,8 +50,11 @@ base: components: sources: aws_kinesis_firehose: configuration: {
 		type: string: examples: ["0.0.0.0:443", "localhost:443"]
 	}
 	decoding: {
-		description: "Configures how events are decoded from raw bytes."
-		required:    false
+		description: """
+			Configures how events are decoded from raw bytes. Note some decoders can also determine the event output
+			type (log, metric, trace).
+			"""
+		required: false
 		type: object: options: {
 			avro: {
 				description:   "Apache Avro-specific encoder options."
@@ -124,6 +127,8 @@ base: components: sources: aws_kinesis_firehose: configuration: {
 						native: """
 															Decodes the raw bytes as [native Protocol Buffers format][vector_native_protobuf].
 
+															This decoder can output all types of events (logs, metrics, traces).
+
 															This codec is **[experimental][experimental]**.
 
 															[vector_native_protobuf]: https://github.com/vectordotdev/vector/blob/master/lib/vector-core/proto/event.proto
@@ -132,6 +137,8 @@ base: components: sources: aws_kinesis_firehose: configuration: {
 						native_json: """
 															Decodes the raw bytes as [native JSON format][vector_native_json].
 
+															This decoder can output all types of events (logs, metrics, traces).
+
 															This codec is **[experimental][experimental]**.
 
 															[vector_native_json]: https://github.com/vectordotdev/vector/blob/master/lib/codecs/tests/data/native_encoding/schema.cue
diff --git a/website/cue/reference/components/sources/base/aws_s3.cue b/website/cue/reference/components/sources/base/aws_s3.cue
index e49d52b08c818..9ed1f676b03df 100644
--- a/website/cue/reference/components/sources/base/aws_s3.cue
+++ b/website/cue/reference/components/sources/base/aws_s3.cue
@@ -165,8 +165,11 @@ base: components: sources: aws_s3: configuration: {
 		}
 	}
 	decoding: {
-		description: "Configures how events are decoded from raw bytes."
-		required:    false
+		description: """
+			Configures how events are decoded from raw bytes. Note some decoders can also determine the event output
+			type (log, metric, trace).
+			"""
+		required: false
 		type: object: options: {
 			avro: {
 				description:   "Apache Avro-specific encoder options."
@@ -239,6 +242,8 @@ base: components: sources: aws_s3: configuration: {
 						native: """
 															Decodes the raw bytes as [native Protocol Buffers format][vector_native_protobuf].
 
+															This decoder can output all types of events (logs, metrics, traces).
+
 															This codec is **[experimental][experimental]**.
 
 															[vector_native_protobuf]: https://github.com/vectordotdev/vector/blob/master/lib/vector-core/proto/event.proto
@@ -247,6 +252,8 @@ base: components: sources: aws_s3: configuration: {
 						native_json: """
 															Decodes the raw bytes as [native JSON format][vector_native_json].
 
+															This decoder can output all types of events (logs, metrics, traces).
+
 															This codec is **[experimental][experimental]**.
 
 															[vector_native_json]: https://github.com/vectordotdev/vector/blob/master/lib/codecs/tests/data/native_encoding/schema.cue
diff --git a/website/cue/reference/components/sources/base/aws_sqs.cue b/website/cue/reference/components/sources/base/aws_sqs.cue
index bc717121c5f09..c11fb4cf2d297 100644
--- a/website/cue/reference/components/sources/base/aws_sqs.cue
+++ b/website/cue/reference/components/sources/base/aws_sqs.cue
@@ -160,8 +160,11 @@ base: components: sources: aws_sqs: configuration: {
 		type: uint: {}
 	}
 	decoding: {
-		description: "Configures how events are decoded from raw bytes."
-		required:    false
+		description: """
+			Configures how events are decoded from raw bytes. Note some decoders can also determine the event output
+			type (log, metric, trace).
+			"""
+		required: false
 		type: object: options: {
 			avro: {
 				description:   "Apache Avro-specific encoder options."
@@ -234,6 +237,8 @@ base: components: sources: aws_sqs: configuration: {
 						native: """
 															Decodes the raw bytes as [native Protocol Buffers format][vector_native_protobuf].
 
+															This decoder can output all types of events (logs, metrics, traces).
+
 															This codec is **[experimental][experimental]**.
 
 															[vector_native_protobuf]: https://github.com/vectordotdev/vector/blob/master/lib/vector-core/proto/event.proto
@@ -242,6 +247,8 @@ base: components: sources: aws_sqs: configuration: {
 						native_json: """
 															Decodes the raw bytes as [native JSON format][vector_native_json].
 
+															This decoder can output all types of events (logs, metrics, traces).
+
 															This codec is **[experimental][experimental]**.
 
 															[vector_native_json]: https://github.com/vectordotdev/vector/blob/master/lib/codecs/tests/data/native_encoding/schema.cue
diff --git a/website/cue/reference/components/sources/base/datadog_agent.cue b/website/cue/reference/components/sources/base/datadog_agent.cue
index 056b5b72faca2..3e25931a16657 100644
--- a/website/cue/reference/components/sources/base/datadog_agent.cue
+++ b/website/cue/reference/components/sources/base/datadog_agent.cue
@@ -32,8 +32,11 @@ base: components: sources: datadog_agent: configuration: {
 		type: string: examples: ["0.0.0.0:80", "localhost:80"]
 	}
 	decoding: {
-		description: "Configures how events are decoded from raw bytes."
-		required:    false
+		description: """
+			Configures how events are decoded from raw bytes. Note some decoders can also determine the event output
+			type (log, metric, trace).
+			"""
+		required: false
 		type: object: options: {
 			avro: {
 				description:   "Apache Avro-specific encoder options."
@@ -106,6 +109,8 @@ base: components: sources: datadog_agent: configuration: {
 						native: """
 															Decodes the raw bytes as [native Protocol Buffers format][vector_native_protobuf].
 
+															This decoder can output all types of events (logs, metrics, traces).
+
 															This codec is **[experimental][experimental]**.
 
 															[vector_native_protobuf]: https://github.com/vectordotdev/vector/blob/master/lib/vector-core/proto/event.proto
@@ -114,6 +119,8 @@ base: components: sources: datadog_agent: configuration: {
 						native_json: """
 															Decodes the raw bytes as [native JSON format][vector_native_json].
 
+															This decoder can output all types of events (logs, metrics, traces).
+
 															This codec is **[experimental][experimental]**.
 
 															[vector_native_json]: https://github.com/vectordotdev/vector/blob/master/lib/codecs/tests/data/native_encoding/schema.cue
diff --git a/website/cue/reference/components/sources/base/demo_logs.cue b/website/cue/reference/components/sources/base/demo_logs.cue
index e1cf5b972a3d2..7159f0bee338d 100644
--- a/website/cue/reference/components/sources/base/demo_logs.cue
+++ b/website/cue/reference/components/sources/base/demo_logs.cue
@@ -11,8 +11,11 @@ base: components: sources: demo_logs: configuration: {
 		type: uint: default: 9223372036854775807
 	}
 	decoding: {
-		description: "Configures how events are decoded from raw bytes."
-		required:    false
+		description: """
+			Configures how events are decoded from raw bytes. Note some decoders can also determine the event output
+			type (log, metric, trace).
+			"""
+		required: false
 		type: object: options: {
 			avro: {
 				description:   "Apache Avro-specific encoder options."
@@ -85,6 +88,8 @@ base: components: sources: demo_logs: configuration: {
 						native: """
 															Decodes the raw bytes as [native Protocol Buffers format][vector_native_protobuf].
 
+															This decoder can output all types of events (logs, metrics, traces).
+
 															This codec is **[experimental][experimental]**.
 
 															[vector_native_protobuf]: https://github.com/vectordotdev/vector/blob/master/lib/vector-core/proto/event.proto
@@ -93,6 +98,8 @@ base: components: sources: demo_logs: configuration: {
 						native_json: """
 															Decodes the raw bytes as [native JSON format][vector_native_json].
 
+															This decoder can output all types of events (logs, metrics, traces).
+
 															This codec is **[experimental][experimental]**.
 
 															[vector_native_json]: https://github.com/vectordotdev/vector/blob/master/lib/codecs/tests/data/native_encoding/schema.cue
diff --git a/website/cue/reference/components/sources/base/exec.cue b/website/cue/reference/components/sources/base/exec.cue
index c51784220d7f6..26515eafb22a1 100644
--- a/website/cue/reference/components/sources/base/exec.cue
+++ b/website/cue/reference/components/sources/base/exec.cue
@@ -12,8 +12,11 @@ base: components: sources: exec: configuration: {
 		type: array: items: type: string: examples: ["echo", "Hello World!"]
 	}
 	decoding: {
-		description: "Configures how events are decoded from raw bytes."
-		required:    false
+		description: """
+			Configures how events are decoded from raw bytes. Note some decoders can also determine the event output
+			type (log, metric, trace).
+			"""
+		required: false
 		type: object: options: {
 			avro: {
 				description:   "Apache Avro-specific encoder options."
@@ -86,6 +89,8 @@ base: components: sources: exec: configuration: {
 						native: """
 															Decodes the raw bytes as [native Protocol Buffers format][vector_native_protobuf].
 
+															This decoder can output all types of events (logs, metrics, traces).
+
 															This codec is **[experimental][experimental]**.
 
 															[vector_native_protobuf]: https://github.com/vectordotdev/vector/blob/master/lib/vector-core/proto/event.proto
@@ -94,6 +99,8 @@ base: components: sources: exec: configuration: {
 						native_json: """
 															Decodes the raw bytes as [native JSON format][vector_native_json].
 
+															This decoder can output all types of events (logs, metrics, traces).
+
 															This codec is **[experimental][experimental]**.
 
 															[vector_native_json]: https://github.com/vectordotdev/vector/blob/master/lib/codecs/tests/data/native_encoding/schema.cue
diff --git a/website/cue/reference/components/sources/base/file_descriptor.cue b/website/cue/reference/components/sources/base/file_descriptor.cue
index 855b9d4570d40..1c12758efe2b0 100644
--- a/website/cue/reference/components/sources/base/file_descriptor.cue
+++ b/website/cue/reference/components/sources/base/file_descriptor.cue
@@ -2,8 +2,11 @@ package metadata
 
 base: components: sources: file_descriptor: configuration: {
 	decoding: {
-		description: "Configures how events are decoded from raw bytes."
-		required:    false
+		description: """
+			Configures how events are decoded from raw bytes. Note some decoders can also determine the event output
+			type (log, metric, trace).
+			"""
+		required: false
 		type: object: options: {
 			avro: {
 				description:   "Apache Avro-specific encoder options."
@@ -76,6 +79,8 @@ base: components: sources: file_descriptor: configuration: {
 						native: """
 															Decodes the raw bytes as [native Protocol Buffers format][vector_native_protobuf].
 
+															This decoder can output all types of events (logs, metrics, traces).
+
 															This codec is **[experimental][experimental]**.
 
 															[vector_native_protobuf]: https://github.com/vectordotdev/vector/blob/master/lib/vector-core/proto/event.proto
@@ -84,6 +89,8 @@ base: components: sources: file_descriptor: configuration: {
 						native_json: """
 															Decodes the raw bytes as [native JSON format][vector_native_json].
 
+															This decoder can output all types of events (logs, metrics, traces).
+
 															This codec is **[experimental][experimental]**.
 
 															[vector_native_json]: https://github.com/vectordotdev/vector/blob/master/lib/codecs/tests/data/native_encoding/schema.cue
diff --git a/website/cue/reference/components/sources/base/gcp_pubsub.cue b/website/cue/reference/components/sources/base/gcp_pubsub.cue
index 926fc2c1c6c56..c7454f49b4fe2 100644
--- a/website/cue/reference/components/sources/base/gcp_pubsub.cue
+++ b/website/cue/reference/components/sources/base/gcp_pubsub.cue
@@ -78,8 +78,11 @@ base: components: sources: gcp_pubsub: configuration: {
 		type: string: {}
 	}
 	decoding: {
-		description: "Configures how events are decoded from raw bytes."
-		required:    false
+		description: """
+			Configures how events are decoded from raw bytes. Note some decoders can also determine the event output
+			type (log, metric, trace).
+			"""
+		required: false
 		type: object: options: {
 			avro: {
 				description:   "Apache Avro-specific encoder options."
@@ -152,6 +155,8 @@ base: components: sources: gcp_pubsub: configuration: {
 						native: """
 															Decodes the raw bytes as [native Protocol Buffers format][vector_native_protobuf].
 
+															This decoder can output all types of events (logs, metrics, traces).
+
 															This codec is **[experimental][experimental]**.
 
 															[vector_native_protobuf]: https://github.com/vectordotdev/vector/blob/master/lib/vector-core/proto/event.proto
@@ -160,6 +165,8 @@ base: components: sources: gcp_pubsub: configuration: {
 						native_json: """
 															Decodes the raw bytes as [native JSON format][vector_native_json].
 
+															This decoder can output all types of events (logs, metrics, traces).
+
 															This codec is **[experimental][experimental]**.
 
 															[vector_native_json]: https://github.com/vectordotdev/vector/blob/master/lib/codecs/tests/data/native_encoding/schema.cue
diff --git a/website/cue/reference/components/sources/base/heroku_logs.cue b/website/cue/reference/components/sources/base/heroku_logs.cue
index 406c46fc398b9..bb1fb121179cc 100644
--- a/website/cue/reference/components/sources/base/heroku_logs.cue
+++ b/website/cue/reference/components/sources/base/heroku_logs.cue
@@ -75,8 +75,11 @@ base: components: sources: heroku_logs: configuration: {
 		}
 	}
 	decoding: {
-		description: "Configures how events are decoded from raw bytes."
-		required:    false
+		description: """
+			Configures how events are decoded from raw bytes. Note some decoders can also determine the event output
+			type (log, metric, trace).
+			"""
+		required: false
 		type: object: options: {
 			avro: {
 				description:   "Apache Avro-specific encoder options."
@@ -149,6 +152,8 @@ base: components: sources: heroku_logs: configuration: {
 						native: """
 															Decodes the raw bytes as [native Protocol Buffers format][vector_native_protobuf].
 
+															This decoder can output all types of events (logs, metrics, traces).
+
 															This codec is **[experimental][experimental]**.
 
 															[vector_native_protobuf]: https://github.com/vectordotdev/vector/blob/master/lib/vector-core/proto/event.proto
@@ -157,6 +162,8 @@ base: components: sources: heroku_logs: configuration: {
 						native_json: """
 															Decodes the raw bytes as [native JSON format][vector_native_json].
 
+															This decoder can output all types of events (logs, metrics, traces).
+
 															This codec is **[experimental][experimental]**.
 
 															[vector_native_json]: https://github.com/vectordotdev/vector/blob/master/lib/codecs/tests/data/native_encoding/schema.cue
diff --git a/website/cue/reference/components/sources/base/http.cue b/website/cue/reference/components/sources/base/http.cue
index eff02d1066ae2..9320727234367 100644
--- a/website/cue/reference/components/sources/base/http.cue
+++ b/website/cue/reference/components/sources/base/http.cue
@@ -79,8 +79,11 @@ base: components: sources: http: configuration: {
 		}
 	}
 	decoding: {
-		description: "Configures how events are decoded from raw bytes."
-		required:    false
+		description: """
+			Configures how events are decoded from raw bytes. Note some decoders can also determine the event output
+			type (log, metric, trace).
+			"""
+		required: false
 		type: object: options: {
 			avro: {
 				description:   "Apache Avro-specific encoder options."
@@ -151,6 +154,8 @@ base: components: sources: http: configuration: {
 					native: """
 						Decodes the raw bytes as [native Protocol Buffers format][vector_native_protobuf].
 
+						This decoder can output all types of events (logs, metrics, traces).
+
 						This codec is **[experimental][experimental]**.
 
 						[vector_native_protobuf]: https://github.com/vectordotdev/vector/blob/master/lib/vector-core/proto/event.proto
@@ -159,6 +164,8 @@ base: components: sources: http: configuration: {
 					native_json: """
 						Decodes the raw bytes as [native JSON format][vector_native_json].
 
+						This decoder can output all types of events (logs, metrics, traces).
+
 						This codec is **[experimental][experimental]**.
 
 						[vector_native_json]: https://github.com/vectordotdev/vector/blob/master/lib/codecs/tests/data/native_encoding/schema.cue
diff --git a/website/cue/reference/components/sources/base/http_client.cue b/website/cue/reference/components/sources/base/http_client.cue
index 3ba456fdd0546..f42de4f7e9d79 100644
--- a/website/cue/reference/components/sources/base/http_client.cue
+++ b/website/cue/reference/components/sources/base/http_client.cue
@@ -174,8 +174,11 @@ base: components: sources: http_client: configuration: {
 		}
 	}
 	decoding: {
-		description: "Decoder to use on the HTTP responses."
-		required:    false
+		description: """
+			Configures how events are decoded from raw bytes. Note some decoders can also determine the event output
+			type (log, metric, trace).
+			"""
+		required: false
 		type: object: options: {
 			avro: {
 				description:   "Apache Avro-specific encoder options."
@@ -248,6 +251,8 @@ base: components: sources: http_client: configuration: {
 						native: """
 															Decodes the raw bytes as [native Protocol Buffers format][vector_native_protobuf].
 
+															This decoder can output all types of events (logs, metrics, traces).
+
 															This codec is **[experimental][experimental]**.
 
 															[vector_native_protobuf]: https://github.com/vectordotdev/vector/blob/master/lib/vector-core/proto/event.proto
@@ -256,6 +261,8 @@ base: components: sources: http_client: configuration: {
 						native_json: """
 															Decodes the raw bytes as [native JSON format][vector_native_json].
 
+															This decoder can output all types of events (logs, metrics, traces).
+
 															This codec is **[experimental][experimental]**.
 
 															[vector_native_json]: https://github.com/vectordotdev/vector/blob/master/lib/codecs/tests/data/native_encoding/schema.cue
diff --git a/website/cue/reference/components/sources/base/http_server.cue b/website/cue/reference/components/sources/base/http_server.cue
index 5ee472c98fe40..c23a809e5947c 100644
--- a/website/cue/reference/components/sources/base/http_server.cue
+++ b/website/cue/reference/components/sources/base/http_server.cue
@@ -79,8 +79,11 @@ base: components: sources: http_server: configuration: {
 		}
 	}
 	decoding: {
-		description: "Configures how events are decoded from raw bytes."
-		required:    false
+		description: """
+			Configures how events are decoded from raw bytes. Note some decoders can also determine the event output
+			type (log, metric, trace).
+			"""
+		required: false
 		type: object: options: {
 			avro: {
 				description:   "Apache Avro-specific encoder options."
@@ -151,6 +154,8 @@ base: components: sources: http_server: configuration: {
 					native: """
 						Decodes the raw bytes as [native Protocol Buffers format][vector_native_protobuf].
 
+						This decoder can output all types of events (logs, metrics, traces).
+
 						This codec is **[experimental][experimental]**.
 
 						[vector_native_protobuf]: https://github.com/vectordotdev/vector/blob/master/lib/vector-core/proto/event.proto
@@ -159,6 +164,8 @@ base: components: sources: http_server: configuration: {
 					native_json: """
 						Decodes the raw bytes as [native JSON format][vector_native_json].
 
+						This decoder can output all types of events (logs, metrics, traces).
+
 						This codec is **[experimental][experimental]**.
 
 						[vector_native_json]: https://github.com/vectordotdev/vector/blob/master/lib/codecs/tests/data/native_encoding/schema.cue
diff --git a/website/cue/reference/components/sources/base/kafka.cue b/website/cue/reference/components/sources/base/kafka.cue
index 40a4c7946468e..1bc76dbf35103 100644
--- a/website/cue/reference/components/sources/base/kafka.cue
+++ b/website/cue/reference/components/sources/base/kafka.cue
@@ -56,8 +56,11 @@ base: components: sources: kafka: configuration: {
 		}
 	}
 	decoding: {
-		description: "Configures how events are decoded from raw bytes."
-		required:    false
+		description: """
+			Configures how events are decoded from raw bytes. Note some decoders can also determine the event output
+			type (log, metric, trace).
+			"""
+		required: false
 		type: object: options: {
 			avro: {
 				description:   "Apache Avro-specific encoder options."
@@ -130,6 +133,8 @@ base: components: sources: kafka: configuration: {
 						native: """
 															Decodes the raw bytes as [native Protocol Buffers format][vector_native_protobuf].
 
+															This decoder can output all types of events (logs, metrics, traces).
+
 															This codec is **[experimental][experimental]**.
 
 															[vector_native_protobuf]: https://github.com/vectordotdev/vector/blob/master/lib/vector-core/proto/event.proto
@@ -138,6 +143,8 @@ base: components: sources: kafka: configuration: {
 						native_json: """
 															Decodes the raw bytes as [native JSON format][vector_native_json].
 
+															This decoder can output all types of events (logs, metrics, traces).
+
 															This codec is **[experimental][experimental]**.
 
 															[vector_native_json]: https://github.com/vectordotdev/vector/blob/master/lib/codecs/tests/data/native_encoding/schema.cue
diff --git a/website/cue/reference/components/sources/base/mqtt.cue b/website/cue/reference/components/sources/base/mqtt.cue
index 9ace00d90fb5f..dacce79d0337f 100644
--- a/website/cue/reference/components/sources/base/mqtt.cue
+++ b/website/cue/reference/components/sources/base/mqtt.cue
@@ -7,8 +7,11 @@ base: components: sources: mqtt: configuration: {
 		type: string: {}
 	}
 	decoding: {
-		description: "Configures how events are decoded from raw bytes."
-		required:    false
+		description: """
+			Configures how events are decoded from raw bytes. Note some decoders can also determine the event output
+			type (log, metric, trace).
+			"""
+		required: false
 		type: object: options: {
 			avro: {
 				description:   "Apache Avro-specific encoder options."
@@ -81,6 +84,8 @@ base: components: sources: mqtt: configuration: {
 						native: """
 															Decodes the raw bytes as [native Protocol Buffers format][vector_native_protobuf].
 
+															This decoder can output all types of events (logs, metrics, traces).
+
 															This codec is **[experimental][experimental]**.
 
 															[vector_native_protobuf]: https://github.com/vectordotdev/vector/blob/master/lib/vector-core/proto/event.proto
@@ -89,6 +94,8 @@ base: components: sources: mqtt: configuration: {
 						native_json: """
 															Decodes the raw bytes as [native JSON format][vector_native_json].
 
+															This decoder can output all types of events (logs, metrics, traces).
+
 															This codec is **[experimental][experimental]**.
 
 															[vector_native_json]: https://github.com/vectordotdev/vector/blob/master/lib/codecs/tests/data/native_encoding/schema.cue
diff --git a/website/cue/reference/components/sources/base/nats.cue b/website/cue/reference/components/sources/base/nats.cue
index 2c8d244707ae3..2b059503d7b56 100644
--- a/website/cue/reference/components/sources/base/nats.cue
+++ b/website/cue/reference/components/sources/base/nats.cue
@@ -99,8 +99,11 @@ base: components: sources: nats: configuration: {
 		]
 	}
 	decoding: {
-		description: "Configures how events are decoded from raw bytes."
-		required:    false
+		description: """
+			Configures how events are decoded from raw bytes. Note some decoders can also determine the event output
+			type (log, metric, trace).
+			"""
+		required: false
 		type: object: options: {
 			avro: {
 				description:   "Apache Avro-specific encoder options."
@@ -173,6 +176,8 @@ base: components: sources: nats: configuration: {
 						native: """
 															Decodes the raw bytes as [native Protocol Buffers format][vector_native_protobuf].
 
+															This decoder can output all types of events (logs, metrics, traces).
+
 															This codec is **[experimental][experimental]**.
 
 															[vector_native_protobuf]: https://github.com/vectordotdev/vector/blob/master/lib/vector-core/proto/event.proto
@@ -181,6 +186,8 @@ base: components: sources: nats: configuration: {
 						native_json: """
 															Decodes the raw bytes as [native JSON format][vector_native_json].
 
+															This decoder can output all types of events (logs, metrics, traces).
+
 															This codec is **[experimental][experimental]**.
 
 															[vector_native_json]: https://github.com/vectordotdev/vector/blob/master/lib/codecs/tests/data/native_encoding/schema.cue
diff --git a/website/cue/reference/components/sources/base/pulsar.cue b/website/cue/reference/components/sources/base/pulsar.cue
index acd3153311ff4..5c3a3717b1901 100644
--- a/website/cue/reference/components/sources/base/pulsar.cue
+++ b/website/cue/reference/components/sources/base/pulsar.cue
@@ -105,8 +105,11 @@ base: components: sources: pulsar: configuration: {
 		}
 	}
 	decoding: {
-		description: "Configures how events are decoded from raw bytes."
-		required:    false
+		description: """
+			Configures how events are decoded from raw bytes. Note some decoders can also determine the event output
+			type (log, metric, trace).
+			"""
+		required: false
 		type: object: options: {
 			avro: {
 				description:   "Apache Avro-specific encoder options."
@@ -179,6 +182,8 @@ base: components: sources: pulsar: configuration: {
 						native: """
 															Decodes the raw bytes as [native Protocol Buffers format][vector_native_protobuf].
 
+															This decoder can output all types of events (logs, metrics, traces).
+
 															This codec is **[experimental][experimental]**.
 
 															[vector_native_protobuf]: https://github.com/vectordotdev/vector/blob/master/lib/vector-core/proto/event.proto
@@ -187,6 +192,8 @@ base: components: sources: pulsar: configuration: {
 						native_json: """
 															Decodes the raw bytes as [native JSON format][vector_native_json].
 
+															This decoder can output all types of events (logs, metrics, traces).
+
 															This codec is **[experimental][experimental]**.
 
 															[vector_native_json]: https://github.com/vectordotdev/vector/blob/master/lib/codecs/tests/data/native_encoding/schema.cue
diff --git a/website/cue/reference/components/sources/base/redis.cue b/website/cue/reference/components/sources/base/redis.cue
index 3c88ae6163cd6..2a513cd06e927 100644
--- a/website/cue/reference/components/sources/base/redis.cue
+++ b/website/cue/reference/components/sources/base/redis.cue
@@ -17,8 +17,11 @@ base: components: sources: redis: configuration: {
 		}
 	}
 	decoding: {
-		description: "Configures how events are decoded from raw bytes."
-		required:    false
+		description: """
+			Configures how events are decoded from raw bytes. Note some decoders can also determine the event output
+			type (log, metric, trace).
+			"""
+		required: false
 		type: object: options: {
 			avro: {
 				description:   "Apache Avro-specific encoder options."
@@ -91,6 +94,8 @@ base: components: sources: redis: configuration: {
 						native: """
 															Decodes the raw bytes as [native Protocol Buffers format][vector_native_protobuf].
 
+															This decoder can output all types of events (logs, metrics, traces).
+
 															This codec is **[experimental][experimental]**.
 
 															[vector_native_protobuf]: https://github.com/vectordotdev/vector/blob/master/lib/vector-core/proto/event.proto
@@ -99,6 +104,8 @@ base: components: sources: redis: configuration: {
 						native_json: """
 															Decodes the raw bytes as [native JSON format][vector_native_json].
 
+															This decoder can output all types of events (logs, metrics, traces).
+
 															This codec is **[experimental][experimental]**.
 
 															[vector_native_json]: https://github.com/vectordotdev/vector/blob/master/lib/codecs/tests/data/native_encoding/schema.cue
diff --git a/website/cue/reference/components/sources/base/socket.cue b/website/cue/reference/components/sources/base/socket.cue
index 39fec3ee13018..ae004d971f85d 100644
--- a/website/cue/reference/components/sources/base/socket.cue
+++ b/website/cue/reference/components/sources/base/socket.cue
@@ -19,8 +19,11 @@ base: components: sources: socket: configuration: {
 		type: uint: unit: "connections"
 	}
 	decoding: {
-		description: "Configures how events are decoded from raw bytes."
-		required:    false
+		description: """
+			Configures how events are decoded from raw bytes. Note some decoders can also determine the event output
+			type (log, metric, trace).
+			"""
+		required: false
 		type: object: options: {
 			avro: {
 				description:   "Apache Avro-specific encoder options."
@@ -93,6 +96,8 @@ base: components: sources: socket: configuration: {
 						native: """
 															Decodes the raw bytes as [native Protocol Buffers format][vector_native_protobuf].
 
+															This decoder can output all types of events (logs, metrics, traces).
+
 															This codec is **[experimental][experimental]**.
 
 															[vector_native_protobuf]: https://github.com/vectordotdev/vector/blob/master/lib/vector-core/proto/event.proto
@@ -101,6 +106,8 @@ base: components: sources: socket: configuration: {
 						native_json: """
 															Decodes the raw bytes as [native JSON format][vector_native_json].
 
+															This decoder can output all types of events (logs, metrics, traces).
+
 															This codec is **[experimental][experimental]**.
 
 															[vector_native_json]: https://github.com/vectordotdev/vector/blob/master/lib/codecs/tests/data/native_encoding/schema.cue
diff --git a/website/cue/reference/components/sources/base/stdin.cue b/website/cue/reference/components/sources/base/stdin.cue
index 971559f73e6e2..ae907df2af46f 100644
--- a/website/cue/reference/components/sources/base/stdin.cue
+++ b/website/cue/reference/components/sources/base/stdin.cue
@@ -2,8 +2,11 @@ package metadata
 
 base: components: sources: stdin: configuration: {
 	decoding: {
-		description: "Configures how events are decoded from raw bytes."
-		required:    false
+		description: """
+			Configures how events are decoded from raw bytes. Note some decoders can also determine the event output
+			type (log, metric, trace).
+			"""
+		required: false
 		type: object: options: {
 			avro: {
 				description:   "Apache Avro-specific encoder options."
@@ -76,6 +79,8 @@ base: components: sources: stdin: configuration: {
 						native: """
 															Decodes the raw bytes as [native Protocol Buffers format][vector_native_protobuf].
 
+															This decoder can output all types of events (logs, metrics, traces).
+
 															This codec is **[experimental][experimental]**.
 
 															[vector_native_protobuf]: https://github.com/vectordotdev/vector/blob/master/lib/vector-core/proto/event.proto
@@ -84,6 +89,8 @@ base: components: sources: stdin: configuration: {
 						native_json: """
 															Decodes the raw bytes as [native JSON format][vector_native_json].
 
+															This decoder can output all types of events (logs, metrics, traces).
+
 															This codec is **[experimental][experimental]**.
 
 															[vector_native_json]: https://github.com/vectordotdev/vector/blob/master/lib/codecs/tests/data/native_encoding/schema.cue

From 2bb9e8ef43f949c23e59549bbfd7ed2e63667003 Mon Sep 17 00:00:00 2001
From: Thomas <thomas.schneider@datadoghq.com>
Date: Mon, 23 Jun 2025 13:11:24 -0400
Subject: [PATCH 096/305] chore(ci): update PULL_REQUEST_TEMPLATE (#23248)

* Update PULL_REQUEST_TEMPLATE

* Remove comments

---------

Co-authored-by: Pavlos Rontidis <pavlos.rontidis@gmail.com>
---
 .github/PULL_REQUEST_TEMPLATE.md | 65 ++++++++++++++++----------------
 1 file changed, 32 insertions(+), 33 deletions(-)

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index c5c0550653c74..76781a822e55d 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,26 +1,13 @@
-<!--
-  Your PR title must conform to the conventional commit spec:
-  https://www.conventionalcommits.org/en/v1.0.0/
-
-  <type>(<scope>)!: <description>
-
-  * `type` = chore, enhancement, feat, fix, docs, revert
-  * `!` = OPTIONAL: signals a breaking change
-  * `scope` = Optional when `type` is "chore" or "docs", available scopes https://github.com/vectordotdev/vector/blob/master/.github/workflows/semantic.yml#L31
-  * `description` = short description of the change
-
-Examples:
-
-  * enhancement(file source): Add `sort` option to sort discovered files
-  * feat(new source): Initial `statsd` source
-  * fix(file source): Fix a bug discovering new files
-  * chore(external docs): Clarify `batch_size` option
--->
-
 ## Summary
 <!-- Please provide a brief summary about what this PR does.
 This should help the reviewers give feedback faster and with higher quality. -->
 
+## Vector configuration
+<!-- Include Vector configuration(s) you used to test and debug your changes. -->
+
+## How did you test this PR?
+<!-- Please describe how you tested your changes. Also include any information about your setup. -->
+
 ## Change Type
 - [ ] Bug fix
 - [ ] New feature
@@ -31,38 +18,50 @@ This should help the reviewers give feedback faster and with higher quality. -->
 - [ ] Yes
 - [ ] No
 
-## How did you test this PR?
-<!-- Please describe your testing plan here.
-Sharing information about your setup and the Vector configuration(s) you used (when applicable) is highly recommended.
-Providing this information upfront will facilitate a smoother review process. -->
-
 ## Does this PR include user facing changes?
 
 - [ ] Yes. Please add a changelog fragment based on our [guidelines](https://github.com/vectordotdev/vector/blob/master/changelog.d/README.md).
-- [ ] No. A maintainer will apply the "no-changelog" label to this PR.
+- [ ] No. A maintainer will apply the `no-changelog` label to this PR.
+
+## References
+
+<!--
+- Closes: #<issue number>
+- Related: #<issue number>
+- Related: #<PR number>
+-->
 
 ## Notes
 - Please read our [Vector contributor resources](https://github.com/vectordotdev/vector/tree/master/docs#getting-started).
 - Do not hesitate to use `@vectordotdev/vector` to reach out to us regarding this PR.
-- The CI checks run only after we manually approve them.
+- Some CI checks run only after we manually approve them.
   - We recommend adding a `pre-push` hook, please see [this template](https://github.com/vectordotdev/vector/blob/master/CONTRIBUTING.md#Pre-push).
   - Alternatively, we recommend running the following locally before pushing to the remote branch:
     - `cargo fmt --all`
     - `cargo clippy --workspace --all-targets -- -D warnings`
     - `cargo nextest run --workspace` (alternatively, you can run `cargo test --all`)
-    - `./scripts/check_changelog_fragments.sh`
 - After a review is requested, please avoid force pushes to help us review incrementally.
   - Feel free to push as many commits as you want. They will be squashed into one before merging.
   - For example, you can run `git merge origin master` and `git push`.
 - If this PR introduces changes Vector dependencies (modifies `Cargo.lock`), please
   run `cargo vdev build licenses` to regenerate the [license inventory](https://github.com/vectordotdev/vrl/blob/main/LICENSE-3rdparty.csv) and commit the changes (if any). More details [here](https://crates.io/crates/dd-rust-license-tool).
 
-## References
-
-<!-- Please list any issues closed by this PR. -->
 
 <!--
-- Closes: <issue link>
--->
+  Your PR title must conform to the conventional commit spec:
+  https://www.conventionalcommits.org/en/v1.0.0/
+
+  <type>(<scope>)!: <description>
 
-<!-- Any other issues or PRs relevant to this PR? Feel free to list them here. -->
+  * `type` = chore, enhancement, feat, fix, docs, revert
+  * `!` = OPTIONAL: signals a breaking change
+  * `scope` = Optional when `type` is "chore" or "docs", available scopes https://github.com/vectordotdev/vector/blob/master/.github/workflows/semantic.yml#L31
+  * `description` = short description of the change
+
+Examples:
+
+  * enhancement(file source): Add `sort` option to sort discovered files
+  * feat(new source): Initial `statsd` source
+  * fix(file source): Fix a bug discovering new files
+  * chore(external docs): Clarify `batch_size` option
+-->

From 2fda2e7cf116251016a29cd3da874a860235fc3d Mon Sep 17 00:00:00 2001
From: Thomas <thomas.schneider@datadoghq.com>
Date: Mon, 23 Jun 2025 13:32:09 -0400
Subject: [PATCH 097/305] fix(ci): add author to changelog (#23250)

add author to changelog
---
 changelog.d/elasticsearch-encoding.fix.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/changelog.d/elasticsearch-encoding.fix.md b/changelog.d/elasticsearch-encoding.fix.md
index 1c0c12184089c..015b42efcb691 100644
--- a/changelog.d/elasticsearch-encoding.fix.md
+++ b/changelog.d/elasticsearch-encoding.fix.md
@@ -1,2 +1,4 @@
 The `elasticsearch` sink now encodes parameters such as `index` that contain characters that need to
 be escaped in JSON strings.
+
+authors: jszwedko

From 94c964a3f27a9afab479fe42e9930db4a0ca6a2d Mon Sep 17 00:00:00 2001
From: Pavlos Rontidis <pavlos.rontidis@gmail.com>
Date: Mon, 23 Jun 2025 13:58:03 -0400
Subject: [PATCH 098/305] chore(website): add/fix telemetry input & output for
 transforms (#23247)

* fix log to metric docs

* update all transforms
---
 .../reference/components/transforms/aggregate.cue    |  6 ++++++
 .../cue/reference/components/transforms/dedupe.cue   |  6 ++++++
 .../components/transforms/exclusive_route.cue        | 12 ++++++++++++
 .../cue/reference/components/transforms/filter.cue   | 12 ++++++++++++
 .../components/transforms/log_to_metric.cue          |  2 ++
 website/cue/reference/components/transforms/lua.cue  |  9 +++++++++
 .../components/transforms/metric_to_log.cue          |  6 ++++++
 .../cue/reference/components/transforms/reduce.cue   |  6 ++++++
 .../cue/reference/components/transforms/route.cue    | 12 ++++++++++++
 .../cue/reference/components/transforms/sample.cue   |  9 +++++++++
 .../components/transforms/tag_cardinality_limit.cue  |  6 ++++++
 .../cue/reference/components/transforms/throttle.cue |  6 ++++++
 .../cue/reference/components/transforms/window.cue   |  6 ++++++
 13 files changed, 98 insertions(+)

diff --git a/website/cue/reference/components/transforms/aggregate.cue b/website/cue/reference/components/transforms/aggregate.cue
index b15d29550b836..00f657f298c11 100644
--- a/website/cue/reference/components/transforms/aggregate.cue
+++ b/website/cue/reference/components/transforms/aggregate.cue
@@ -41,6 +41,12 @@ components: transforms: aggregate: {
 		traces: false
 	}
 
+	output: {
+		metrics: "": {
+			description: "The modified input `metric` event."
+		}
+	}
+
 	examples: [
 		{
 			title: "Aggregate over 5 seconds"
diff --git a/website/cue/reference/components/transforms/dedupe.cue b/website/cue/reference/components/transforms/dedupe.cue
index b358129ef0e60..e6f696e98f3d6 100644
--- a/website/cue/reference/components/transforms/dedupe.cue
+++ b/website/cue/reference/components/transforms/dedupe.cue
@@ -32,6 +32,12 @@ components: transforms: dedupe: {
 		traces:  false
 	}
 
+	output: {
+		logs: "": {
+			description: "The modified input `log` event."
+		}
+	}
+
 	how_it_works: {
 		cache_behavior: {
 			title: "Cache Behavior"
diff --git a/website/cue/reference/components/transforms/exclusive_route.cue b/website/cue/reference/components/transforms/exclusive_route.cue
index 2ca2128828845..1679b6a10870b 100644
--- a/website/cue/reference/components/transforms/exclusive_route.cue
+++ b/website/cue/reference/components/transforms/exclusive_route.cue
@@ -41,6 +41,18 @@ components: transforms: exclusive_route: {
 		traces: true
 	}
 
+	output: {
+		logs: "": {
+			description: "The input `log` event."
+		}
+		metrics: "": {
+			description: "The input `metric` event."
+		}
+		traces: "": {
+			description: "The input `trace` event."
+		}
+	}
+
 	outputs: [
 		{
 			name:        "<route_id>"
diff --git a/website/cue/reference/components/transforms/filter.cue b/website/cue/reference/components/transforms/filter.cue
index 8fb684e40123b..d25919767dd72 100644
--- a/website/cue/reference/components/transforms/filter.cue
+++ b/website/cue/reference/components/transforms/filter.cue
@@ -39,6 +39,18 @@ components: transforms: filter: {
 		traces: true
 	}
 
+	output: {
+		logs: "": {
+			description: "The input `log` event."
+		}
+		metrics: "": {
+			description: "The input `metric` event."
+		}
+		traces: "": {
+			description: "The input `trace` event."
+		}
+	}
+
 	examples: [
 		{
 			title: "Drop debug logs"
diff --git a/website/cue/reference/components/transforms/log_to_metric.cue b/website/cue/reference/components/transforms/log_to_metric.cue
index 80a49c2fa54b7..3339b1441e4eb 100644
--- a/website/cue/reference/components/transforms/log_to_metric.cue
+++ b/website/cue/reference/components/transforms/log_to_metric.cue
@@ -37,6 +37,8 @@ components: transforms: log_to_metric: {
 		distribution: output._passthrough_distribution
 		gauge:        output._passthrough_gauge
 		set:          output._passthrough_set
+		histogram:    output._passthrough_histogram
+		summary:      output._passthrough_summary
 	}
 
 	examples: [
diff --git a/website/cue/reference/components/transforms/lua.cue b/website/cue/reference/components/transforms/lua.cue
index e2649d1712171..162318c107765 100644
--- a/website/cue/reference/components/transforms/lua.cue
+++ b/website/cue/reference/components/transforms/lua.cue
@@ -53,6 +53,15 @@ components: transforms: lua: {
 		traces: false
 	}
 
+	output: {
+		logs: "": {
+			description: "The modified input `log` event."
+		}
+		metrics: "": {
+			description: "The modified input `metric` event."
+		}
+	}
+
 	examples: [
 		{
 			title: "Add, rename, and remove log fields"
diff --git a/website/cue/reference/components/transforms/metric_to_log.cue b/website/cue/reference/components/transforms/metric_to_log.cue
index 3607ccaacf07f..5f4dae22e76f5 100644
--- a/website/cue/reference/components/transforms/metric_to_log.cue
+++ b/website/cue/reference/components/transforms/metric_to_log.cue
@@ -40,6 +40,12 @@ components: transforms: metric_to_log: {
 		traces: false
 	}
 
+	output: {
+		logs: "": {
+			description: "The converted `log` event."
+		}
+	}
+
 	examples: [
 		{
 			title: "Metric To Log"
diff --git a/website/cue/reference/components/transforms/reduce.cue b/website/cue/reference/components/transforms/reduce.cue
index 1449b8d8e69f6..758e4c5d65af8 100644
--- a/website/cue/reference/components/transforms/reduce.cue
+++ b/website/cue/reference/components/transforms/reduce.cue
@@ -33,6 +33,12 @@ components: transforms: reduce: {
 		traces:  false
 	}
 
+	output: {
+		logs: "": {
+			description: "The modified input `log` event."
+		}
+	}
+
 	examples: [
 		{
 			title: "Merge Ruby exceptions"
diff --git a/website/cue/reference/components/transforms/route.cue b/website/cue/reference/components/transforms/route.cue
index 891c4671ac7b4..4040b84cbe497 100644
--- a/website/cue/reference/components/transforms/route.cue
+++ b/website/cue/reference/components/transforms/route.cue
@@ -43,6 +43,18 @@ components: transforms: route: {
 		traces: true
 	}
 
+	output: {
+		logs: "": {
+			description: "The input `log` event."
+		}
+		metrics: "": {
+			description: "The input `metric` event."
+		}
+		traces: "": {
+			description: "The input `trace` event."
+		}
+	}
+
 	examples: [
 		{
 			title: "Split by log level"
diff --git a/website/cue/reference/components/transforms/sample.cue b/website/cue/reference/components/transforms/sample.cue
index 97c39cd2f6a0a..18699677e63c9 100644
--- a/website/cue/reference/components/transforms/sample.cue
+++ b/website/cue/reference/components/transforms/sample.cue
@@ -31,4 +31,13 @@ components: transforms: sample: {
 		metrics: null
 		traces:  true
 	}
+
+	output: {
+		logs: "": {
+			description: "The modified input `log` event."
+		}
+		traces: "": {
+			description: "The modified input `trace` event."
+		}
+	}
 }
diff --git a/website/cue/reference/components/transforms/tag_cardinality_limit.cue b/website/cue/reference/components/transforms/tag_cardinality_limit.cue
index 4535f2d248051..32b21f0e68dbd 100644
--- a/website/cue/reference/components/transforms/tag_cardinality_limit.cue
+++ b/website/cue/reference/components/transforms/tag_cardinality_limit.cue
@@ -51,6 +51,12 @@ components: transforms: tag_cardinality_limit: {
 		traces: false
 	}
 
+	output: {
+		metrics: "": {
+			description: "The modified input `metric` event."
+		}
+	}
+
 	examples: [
 		{
 			title: "Drop high-cardinality tag"
diff --git a/website/cue/reference/components/transforms/throttle.cue b/website/cue/reference/components/transforms/throttle.cue
index 88248bc57364c..bdbc363cae1de 100644
--- a/website/cue/reference/components/transforms/throttle.cue
+++ b/website/cue/reference/components/transforms/throttle.cue
@@ -32,6 +32,12 @@ components: transforms: throttle: {
 		traces:  false
 	}
 
+	output: {
+		logs: "": {
+			description: "The modified input `log` event."
+		}
+	}
+
 	telemetry: metrics: {
 		events_discarded_total: components.sources.internal_metrics.output.metrics.events_discarded_total
 	}
diff --git a/website/cue/reference/components/transforms/window.cue b/website/cue/reference/components/transforms/window.cue
index 4198d7b1afde5..7d877031f0aae 100644
--- a/website/cue/reference/components/transforms/window.cue
+++ b/website/cue/reference/components/transforms/window.cue
@@ -33,6 +33,12 @@ components: transforms: window: {
 		traces:  false
 	}
 
+	output: {
+		logs: "": {
+			description: "The modified input `log` event."
+		}
+	}
+
 	examples: [
 		{
 			title: "Flush recent events when an error happens"

From 1ee4d2f025b14553083211820b51ff74755612d3 Mon Sep 17 00:00:00 2001
From: Pavlos Rontidis <pavlos.rontidis@gmail.com>
Date: Mon, 23 Jun 2025 16:23:52 -0400
Subject: [PATCH 099/305] chore(website): fix telemetry types for Sinks
 (#23251)

* chore(website): fix sinks telemetry types (part 1)

* fix elasticsearch

* cue fmt

* more fixes

* fix socket
---
 Cargo.lock                                          |  4 ++--
 website/cue/reference/components/sinks/aws_s3.cue   | 13 ++++++++++---
 website/cue/reference/components/sinks/axiom.cue    |  2 +-
 .../reference/components/sinks/elasticsearch.cue    | 13 ++++++++++---
 website/cue/reference/components/sinks/file.cue     | 13 ++++++++++---
 website/cue/reference/components/sinks/pulsar.cue   | 13 ++++++++++---
 website/cue/reference/components/sinks/redis.cue    | 13 ++++++++++---
 website/cue/reference/components/sinks/socket.cue   | 13 ++++++++++---
 website/layouts/partials/telemetry_input.html       |  3 ++-
 9 files changed, 65 insertions(+), 22 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index afbd95de80a64..afc30a4a95ee4 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -10816,7 +10816,7 @@ checksum = "d039ad9159c98b70ecfd540b2573b97f7f52c3e8d9f8ad57a24b916a536975f9"
 dependencies = [
  "futures-core",
  "futures-util",
- "indexmap 2.7.0",
+ "indexmap 2.9.0",
  "pin-project-lite",
  "slab",
  "sync_wrapper 1.0.1",
@@ -11955,7 +11955,7 @@ dependencies = [
  "rand_distr",
  "tokio",
  "tokio-util",
- "tower 0.4.13",
+ "tower 0.5.2",
  "tracing 0.1.41",
  "twox-hash 2.1.1",
  "vector-common",
diff --git a/website/cue/reference/components/sinks/aws_s3.cue b/website/cue/reference/components/sinks/aws_s3.cue
index 3953ac53ab9d9..0ed260598a988 100644
--- a/website/cue/reference/components/sinks/aws_s3.cue
+++ b/website/cue/reference/components/sinks/aws_s3.cue
@@ -78,9 +78,16 @@ components: sinks: aws_s3: components._aws & {
 	}
 
 	input: {
-		logs:    true
-		metrics: null
-		traces:  false
+		logs: true
+		metrics: {
+			counter:      true
+			distribution: true
+			gauge:        true
+			histogram:    true
+			set:          true
+			summary:      true
+		}
+		traces: true
 	}
 
 	how_it_works: {
diff --git a/website/cue/reference/components/sinks/axiom.cue b/website/cue/reference/components/sinks/axiom.cue
index 63017f274ff8f..d7790476f2650 100644
--- a/website/cue/reference/components/sinks/axiom.cue
+++ b/website/cue/reference/components/sinks/axiom.cue
@@ -82,7 +82,7 @@ components: sinks: axiom: {
 			set:          true
 			summary:      true
 		}
-		traces: false
+		traces: true
 	}
 
 	how_it_works: {
diff --git a/website/cue/reference/components/sinks/elasticsearch.cue b/website/cue/reference/components/sinks/elasticsearch.cue
index 5cbc67922c2fe..c7c03fc5b1847 100644
--- a/website/cue/reference/components/sinks/elasticsearch.cue
+++ b/website/cue/reference/components/sinks/elasticsearch.cue
@@ -77,9 +77,16 @@ components: sinks: elasticsearch: {
 	configuration: base.components.sinks.elasticsearch.configuration
 
 	input: {
-		logs:    true
-		metrics: null
-		traces:  false
+		logs: true
+		metrics: {
+			counter:      true
+			distribution: true
+			gauge:        true
+			histogram:    true
+			set:          true
+			summary:      true
+		}
+		traces: false
 	}
 
 	how_it_works: {
diff --git a/website/cue/reference/components/sinks/file.cue b/website/cue/reference/components/sinks/file.cue
index 79a692db63ac6..aa3cdcbd91592 100644
--- a/website/cue/reference/components/sinks/file.cue
+++ b/website/cue/reference/components/sinks/file.cue
@@ -46,9 +46,16 @@ components: sinks: file: {
 	configuration: base.components.sinks.file.configuration
 
 	input: {
-		logs:    true
-		metrics: null
-		traces:  false
+		logs: true
+		metrics: {
+			counter:      true
+			distribution: true
+			gauge:        true
+			histogram:    true
+			set:          true
+			summary:      true
+		}
+		traces: true
 	}
 
 	how_it_works: {
diff --git a/website/cue/reference/components/sinks/pulsar.cue b/website/cue/reference/components/sinks/pulsar.cue
index debf83b9028d2..4170e5a6693e9 100644
--- a/website/cue/reference/components/sinks/pulsar.cue
+++ b/website/cue/reference/components/sinks/pulsar.cue
@@ -59,8 +59,15 @@ components: sinks: pulsar: {
 	configuration: base.components.sinks.pulsar.configuration
 
 	input: {
-		logs:    true
-		metrics: null
-		traces:  false
+		logs: true
+		metrics: {
+			counter:      true
+			distribution: true
+			gauge:        true
+			histogram:    true
+			set:          true
+			summary:      true
+		}
+		traces: false
 	}
 }
diff --git a/website/cue/reference/components/sinks/redis.cue b/website/cue/reference/components/sinks/redis.cue
index cc9f9ab4f8152..0f44244498403 100644
--- a/website/cue/reference/components/sinks/redis.cue
+++ b/website/cue/reference/components/sinks/redis.cue
@@ -58,9 +58,16 @@ components: sinks: redis: {
 	configuration: base.components.sinks.redis.configuration
 
 	input: {
-		logs:    true
-		metrics: null
-		traces:  false
+		logs: true
+		metrics: {
+			counter:      true
+			distribution: true
+			gauge:        true
+			histogram:    true
+			set:          true
+			summary:      true
+		}
+		traces: true
 	}
 
 	how_it_works: {
diff --git a/website/cue/reference/components/sinks/socket.cue b/website/cue/reference/components/sinks/socket.cue
index ef5bacb8a555c..a256f609d9c80 100644
--- a/website/cue/reference/components/sinks/socket.cue
+++ b/website/cue/reference/components/sinks/socket.cue
@@ -62,8 +62,15 @@ components: sinks: socket: {
 	configuration: base.components.sinks.socket.configuration
 
 	input: {
-		logs:    true
-		metrics: null
-		traces:  false
+		logs: true
+		metrics: {
+			counter:      true
+			distribution: true
+			gauge:        true
+			histogram:    true
+			set:          true
+			summary:      true
+		}
+		traces: true
 	}
 }
diff --git a/website/layouts/partials/telemetry_input.html b/website/layouts/partials/telemetry_input.html
index 3d675b09c844f..dd83a6d12cacf 100644
--- a/website/layouts/partials/telemetry_input.html
+++ b/website/layouts/partials/telemetry_input.html
@@ -4,7 +4,8 @@
       {{ with .description }}
         {{ . | markdownify }}
       {{ else }}
-        The following section shows which telemetry data types are supported.
+        The following table lists all telemetry data types supported by the component across possible configurations. Be
+         aware that the available data types may differ based on the specified codec configuration.
       {{ end }}
     </div>
 

From 212320097b49e39e7bce93619ffa9095a590b84d Mon Sep 17 00:00:00 2001
From: Pavlos Rontidis <pavlos.rontidis@gmail.com>
Date: Mon, 23 Jun 2025 17:17:30 -0400
Subject: [PATCH 100/305] fix(ci): always run 'integration-tests' for the MQ
 (#23252)

* fix(ci): always run 'integration-tests' for the MQ

* disabled nats since it is failing on master :(
---
 .github/workflows/integration.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
index 74eb0bebaa696..84b8efad78864 100644
--- a/.github/workflows/integration.yml
+++ b/.github/workflows/integration.yml
@@ -108,16 +108,17 @@ jobs:
     needs:
       - changes
       - setup
-    if: ${{ needs.setup.outputs.can_access_secrets == 'true' }}
+    if: ${{ needs.setup.outputs.can_access_secrets == 'true' || github.event_name == 'merge_group' }}
     strategy:
       matrix:
         # TODO: Add "splunk" back once https://github.com/vectordotdev/vector/issues/22379 is fixed.
+        # TODO: Add "nats" back once https://github.com/vectordotdev/vector/issues/23253 is fixed.
         # If you modify this list, please also update the `int_tests` job in changes.yml.
         service: [
           "amqp", "appsignal", "axiom", "aws", "azure", "clickhouse", "databend", "datadog-agent",
           "datadog-logs", "datadog-metrics", "datadog-traces", "dnstap", "docker-logs", "elasticsearch",
           "eventstoredb", "fluent", "gcp", "greptimedb", "http-client", "influxdb", "kafka", "logstash",
-          "loki", "mongodb", "nats", "nginx", "opentelemetry", "postgres", "prometheus", "pulsar",
+          "loki", "mongodb", "nginx", "opentelemetry", "postgres", "prometheus", "pulsar",
           "redis", "webhdfs"
         ]
     timeout-minutes: 90

From 55a8371376fc4da71a56bc35be438a483889c823 Mon Sep 17 00:00:00 2001
From: Pavlos Rontidis <pavlos.rontidis@gmail.com>
Date: Tue, 24 Jun 2025 10:00:18 -0400
Subject: [PATCH 101/305] chore(releasing): minor fixes for minor release tmpl
 (#23258)

---
 .github/ISSUE_TEMPLATE/minor-release.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/minor-release.md b/.github/ISSUE_TEMPLATE/minor-release.md
index fe1dc999ba9a7..4fd20458c3ea8 100644
--- a/.github/ISSUE_TEMPLATE/minor-release.md
+++ b/.github/ISSUE_TEMPLATE/minor-release.md
@@ -11,11 +11,12 @@ labels: "domain: releasing"
 Note the preparation steps are now automated. You can run:
 
 ```shell
-export NEW_VERSION=0.47.0 # replace this with the actual new version
+export NEW_VERSION=<new Vector version> # replace this with the actual new version
 export MINOR_VERSION=$(echo "$NEW_VERSION" | cut -d. -f2)
 export PREP_BRANCH=prepare-v-0-"${MINOR_VERSION}"-"${NEW_VERSION}"-website
 export RELEASE_BRANCH=v0."${MINOR_VERSION}"
-export NEW_VRL_VERSION=0.42.0 # replace this with the actual new VRL version
+export NEW_VRL_VERSION=<new VRL version> # replace this with the actual new VRL version
+vdev release prepare --version "${NEW_VERSION_NUMBER}" --vrl-version NEW_VRL_VERSION
 ```
 
 # The week before the release

From e4f741d5c708602f6142bb917bae2bd66a547394 Mon Sep 17 00:00:00 2001
From: Pavlos Rontidis <pavlos.rontidis@gmail.com>
Date: Tue, 24 Jun 2025 10:03:02 -0400
Subject: [PATCH 102/305] chore(releasing): fix minor release template version
 var

---
 .github/ISSUE_TEMPLATE/minor-release.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/ISSUE_TEMPLATE/minor-release.md b/.github/ISSUE_TEMPLATE/minor-release.md
index 4fd20458c3ea8..4958ea7012455 100644
--- a/.github/ISSUE_TEMPLATE/minor-release.md
+++ b/.github/ISSUE_TEMPLATE/minor-release.md
@@ -16,7 +16,7 @@ export MINOR_VERSION=$(echo "$NEW_VERSION" | cut -d. -f2)
 export PREP_BRANCH=prepare-v-0-"${MINOR_VERSION}"-"${NEW_VERSION}"-website
 export RELEASE_BRANCH=v0."${MINOR_VERSION}"
 export NEW_VRL_VERSION=<new VRL version> # replace this with the actual new VRL version
-vdev release prepare --version "${NEW_VERSION_NUMBER}" --vrl-version NEW_VRL_VERSION
+vdev release prepare --version "${NEW_VERSION}" --vrl-version "${NEW_VRL_VERSION}"
 ```
 
 # The week before the release

From d9dc37c1867db1e07431770b2b1b4cb1953267b5 Mon Sep 17 00:00:00 2001
From: Thomas <thomas.schneider@datadoghq.com>
Date: Tue, 24 Jun 2025 10:27:02 -0400
Subject: [PATCH 103/305] fix(ci): re-add nats to integration tests and revert
 broken PR (#23256)

* Re-add nats to integration tests

* Revert "fix(nats sink): fix vector exiting if nats sink url fails dns resolution or is unavailable without --require-healthy (#23167)"

This reverts commit 154fe3ef90919bcbbbb4b7f093be67fa28228533.

* Fix nats sink path
---
 .github/workflows/integration.yml              |  3 +--
 ...14_fix_nats_sink_ignored_healthcheck.fix.md |  3 ---
 scripts/integration/nats/test.yaml             |  2 +-
 src/sinks/nats/config.rs                       | 18 +++++-------------
 src/sinks/nats/integration_tests.rs            |  6 ++----
 5 files changed, 9 insertions(+), 23 deletions(-)
 delete mode 100644 changelog.d/22914_fix_nats_sink_ignored_healthcheck.fix.md

diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
index 84b8efad78864..aacdcb92f92ee 100644
--- a/.github/workflows/integration.yml
+++ b/.github/workflows/integration.yml
@@ -112,13 +112,12 @@ jobs:
     strategy:
       matrix:
         # TODO: Add "splunk" back once https://github.com/vectordotdev/vector/issues/22379 is fixed.
-        # TODO: Add "nats" back once https://github.com/vectordotdev/vector/issues/23253 is fixed.
         # If you modify this list, please also update the `int_tests` job in changes.yml.
         service: [
           "amqp", "appsignal", "axiom", "aws", "azure", "clickhouse", "databend", "datadog-agent",
           "datadog-logs", "datadog-metrics", "datadog-traces", "dnstap", "docker-logs", "elasticsearch",
           "eventstoredb", "fluent", "gcp", "greptimedb", "http-client", "influxdb", "kafka", "logstash",
-          "loki", "mongodb", "nginx", "opentelemetry", "postgres", "prometheus", "pulsar",
+          "loki", "mongodb", "nats", "nginx", "opentelemetry", "postgres", "prometheus", "pulsar",
           "redis", "webhdfs"
         ]
     timeout-minutes: 90
diff --git a/changelog.d/22914_fix_nats_sink_ignored_healthcheck.fix.md b/changelog.d/22914_fix_nats_sink_ignored_healthcheck.fix.md
deleted file mode 100644
index 5e143f6a220ad..0000000000000
--- a/changelog.d/22914_fix_nats_sink_ignored_healthcheck.fix.md
+++ /dev/null
@@ -1,3 +0,0 @@
-The `nats` sink now does not return an error when an unresolvable or unavailable URL is provided. Note that if `--require-healthy` is set then Vector will stop on startup.
-
-authors: rdwr-tomers
diff --git a/scripts/integration/nats/test.yaml b/scripts/integration/nats/test.yaml
index 1615b5f244ff6..553c9efa25257 100644
--- a/scripts/integration/nats/test.yaml
+++ b/scripts/integration/nats/test.yaml
@@ -21,7 +21,7 @@ paths:
 - "src/internal_events/nats.rs"
 - "src/sources/nats.rs"
 - "src/sources/util/**"
-- "src/sinks/nats.rs"
+- "src/sinks/nats/**"
 - "src/sinks/util/**"
 - "src/nats.rs"
 - "scripts/integration/nats/**"
diff --git a/src/sinks/nats/config.rs b/src/sinks/nats/config.rs
index c951049b7a845..98423b9d1f35a 100644
--- a/src/sinks/nats/config.rs
+++ b/src/sinks/nats/config.rs
@@ -138,10 +138,9 @@ impl std::convert::TryFrom<&NatsSinkConfig> for async_nats::ConnectOptions {
 }
 
 impl NatsSinkConfig {
-    pub(super) async fn connect(
-        &self,
-        options: async_nats::ConnectOptions,
-    ) -> Result<async_nats::Client, NatsError> {
+    pub(super) async fn connect(&self) -> Result<async_nats::Client, NatsError> {
+        let options: async_nats::ConnectOptions = self.try_into().context(ConfigSnafu)?;
+
         let urls = self.parse_server_addresses()?;
         options.connect(urls).await.context(ConnectSnafu)
     }
@@ -159,9 +158,7 @@ impl NatsSinkConfig {
     }
 
     pub(super) async fn publisher(&self) -> Result<NatsPublisher, NatsError> {
-        let mut options: async_nats::ConnectOptions = self.try_into().context(ConfigSnafu)?;
-        options = options.retry_on_initial_connect();
-        let connection = self.connect(options).await?;
+        let connection = self.connect().await?;
 
         if self.jetstream {
             Ok(NatsPublisher::JetStream(async_nats::jetstream::new(
@@ -174,12 +171,7 @@ impl NatsSinkConfig {
 }
 
 async fn healthcheck(config: NatsSinkConfig) -> crate::Result<()> {
-    let options: async_nats::ConnectOptions = (&config).try_into().context(ConfigSnafu)?;
-    config
-        .connect(options)
-        .map_ok(|_| ())
-        .map_err(|e| e.into())
-        .await
+    config.connect().map_ok(|_| ()).map_err(|e| e.into()).await
 }
 
 pub enum NatsPublisher {
diff --git a/src/sinks/nats/integration_tests.rs b/src/sinks/nats/integration_tests.rs
index 371d7af6f275d..bc0c8dce0611d 100644
--- a/src/sinks/nats/integration_tests.rs
+++ b/src/sinks/nats/integration_tests.rs
@@ -1,7 +1,7 @@
 use std::time::Duration;
 use vector_lib::codecs::TextSerializerConfig;
 
-use super::{config::NatsSinkConfig, sink::NatsSink, ConfigSnafu, NatsError};
+use super::{config::NatsSinkConfig, sink::NatsSink, NatsError};
 use crate::{
     nats::{
         NatsAuthConfig, NatsAuthCredentialsFile, NatsAuthNKey, NatsAuthToken, NatsAuthUserPassword,
@@ -13,7 +13,6 @@ use crate::{
     },
     tls::TlsEnableableConfig,
 };
-use snafu::ResultExt;
 
 async fn publish_and_check(conf: NatsSinkConfig) -> Result<(), NatsError> {
     // Publish `N` messages to NATS.
@@ -27,10 +26,9 @@ async fn publish_and_check(conf: NatsSinkConfig) -> Result<(), NatsError> {
 
     // Establish the consumer subscription.
     let subject = conf.subject.clone();
-    let options: async_nats::ConnectOptions = (&conf).try_into().context(ConfigSnafu)?;
     let consumer = conf
         .clone()
-        .connect(options)
+        .connect()
         .await
         .expect("failed to connect with test consumer");
     let mut sub = consumer

From 820e63b77803bb0995b9aed10ecefc15547ca69c Mon Sep 17 00:00:00 2001
From: Byron Wolfman <byronwolfman@users.noreply.github.com>
Date: Tue, 24 Jun 2025 11:10:05 -0400
Subject: [PATCH 104/305] feat(sources): add access to URL path in custom VRL
 auth (#23165)

* feat(sources) add access to URL path in custom VRL auth

* update website docs for VRL custom auth

* format components.cue (tabs vs spaces)

* Add changelog entry

* Address changelog linter

---------

Co-authored-by: Thomas <thomas.schneider@datadoghq.com>
Co-authored-by: Pavlos Rontidis <pavlos.rontidis@gmail.com>
---
 .../23165_custom_auth_path_access.feature.md  |  3 ++
 src/common/http/server_auth.rs                | 49 +++++++++++++++----
 src/sinks/websocket_server/sink.rs            |  2 +-
 src/sources/util/http/prelude.rs              |  6 ++-
 website/cue/reference/components.cue          |  4 +-
 5 files changed, 51 insertions(+), 13 deletions(-)
 create mode 100644 changelog.d/23165_custom_auth_path_access.feature.md

diff --git a/changelog.d/23165_custom_auth_path_access.feature.md b/changelog.d/23165_custom_auth_path_access.feature.md
new file mode 100644
index 0000000000000..537d9e0011b0b
--- /dev/null
+++ b/changelog.d/23165_custom_auth_path_access.feature.md
@@ -0,0 +1,3 @@
+Enabled URL path access in VRL scripts of custom auth strategy for server components.
+
+authors: byronwolfman
diff --git a/src/common/http/server_auth.rs b/src/common/http/server_auth.rs
index fda8ccdbf82eb..b3155f5781206 100644
--- a/src/common/http/server_auth.rs
+++ b/src/common/http/server_auth.rs
@@ -198,6 +198,7 @@ impl HttpServerAuthMatcher {
         &self,
         address: Option<&SocketAddr>,
         headers: &HeaderMap<HeaderValue>,
+        path: &str,
     ) -> Result<(), ErrorMessage> {
         match self {
             HttpServerAuthMatcher::AuthHeader(expected, err_message) => {
@@ -218,7 +219,7 @@ impl HttpServerAuthMatcher {
                 }
             }
             HttpServerAuthMatcher::Vrl { program } => {
-                self.handle_vrl_auth(address, headers, program)
+                self.handle_vrl_auth(address, headers, path, program)
             }
         }
     }
@@ -227,6 +228,7 @@ impl HttpServerAuthMatcher {
         &self,
         address: Option<&SocketAddr>,
         headers: &HeaderMap<HeaderValue>,
+        path: &str,
         program: &Program,
     ) -> Result<(), ErrorMessage> {
         let mut target = VrlTarget::new(
@@ -250,6 +252,7 @@ impl HttpServerAuthMatcher {
                         "address".into(),
                         address.map_or(Value::Null, |a| Value::from(a.ip().to_string())),
                     ),
+                    ("path".into(), Value::from(path.to_owned())),
                 ]),
                 Default::default(),
             )),
@@ -439,7 +442,7 @@ mod tests {
 
         let matcher = basic_auth.build(&Default::default()).unwrap();
 
-        let result = matcher.handle_auth(Some(&next_addr()), &HeaderMap::new());
+        let result = matcher.handle_auth(Some(&next_addr()), &HeaderMap::new(), "/");
 
         assert!(result.is_err());
         let error = result.unwrap_err();
@@ -458,7 +461,7 @@ mod tests {
 
         let mut headers = HeaderMap::new();
         headers.insert(AUTHORIZATION, HeaderValue::from_static("Basic wrong"));
-        let result = matcher.handle_auth(Some(&next_addr()), &headers);
+        let result = matcher.handle_auth(Some(&next_addr()), &headers, "/");
 
         assert!(result.is_err());
         let error = result.unwrap_err();
@@ -482,7 +485,7 @@ mod tests {
             AUTHORIZATION,
             Authorization::basic(&username, &password).0.encode(),
         );
-        let result = matcher.handle_auth(Some(&next_addr()), &headers);
+        let result = matcher.handle_auth(Some(&next_addr()), &headers, "/");
 
         assert!(result.is_ok());
     }
@@ -497,7 +500,7 @@ mod tests {
 
         let mut headers = HeaderMap::new();
         headers.insert(AUTHORIZATION, HeaderValue::from_static("test"));
-        let result = matcher.handle_auth(Some(&next_addr()), &headers);
+        let result = matcher.handle_auth(Some(&next_addr()), &headers, "/");
 
         assert!(result.is_ok());
     }
@@ -513,7 +516,7 @@ mod tests {
         let matcher = custom_auth.build(&Default::default()).unwrap();
 
         let headers = HeaderMap::new();
-        let result = matcher.handle_auth(Some(&next_addr()), &headers);
+        let result = matcher.handle_auth(Some(&next_addr()), &headers, "/");
 
         assert!(result.is_ok());
     }
@@ -529,7 +532,35 @@ mod tests {
         let matcher = custom_auth.build(&Default::default()).unwrap();
 
         let headers = HeaderMap::new();
-        let result = matcher.handle_auth(None, &headers);
+        let result = matcher.handle_auth(None, &headers, "/");
+
+        assert!(result.is_err());
+    }
+
+    #[test]
+    fn custom_auth_matcher_should_be_able_to_check_path() {
+        let custom_auth = HttpServerAuthConfig::Custom {
+            source: r#".path == "/ok""#.to_string(),
+        };
+
+        let matcher = custom_auth.build(&Default::default()).unwrap();
+
+        let headers = HeaderMap::new();
+        let result = matcher.handle_auth(Some(&next_addr()), &headers, "/ok");
+
+        assert!(result.is_ok());
+    }
+
+    #[test]
+    fn custom_auth_matcher_should_return_401_with_wrong_path() {
+        let custom_auth = HttpServerAuthConfig::Custom {
+            source: r#".path == "/ok""#.to_string(),
+        };
+
+        let matcher = custom_auth.build(&Default::default()).unwrap();
+
+        let headers = HeaderMap::new();
+        let result = matcher.handle_auth(Some(&next_addr()), &headers, "/bad");
 
         assert!(result.is_err());
     }
@@ -544,7 +575,7 @@ mod tests {
 
         let mut headers = HeaderMap::new();
         headers.insert(AUTHORIZATION, HeaderValue::from_static("wrong value"));
-        let result = matcher.handle_auth(Some(&next_addr()), &headers);
+        let result = matcher.handle_auth(Some(&next_addr()), &headers, "/");
 
         assert!(result.is_err());
         let error = result.unwrap_err();
@@ -562,7 +593,7 @@ mod tests {
 
         let mut headers = HeaderMap::new();
         headers.insert(AUTHORIZATION, HeaderValue::from_static("test"));
-        let result = matcher.handle_auth(Some(&next_addr()), &headers);
+        let result = matcher.handle_auth(Some(&next_addr()), &headers, "/");
 
         assert!(result.is_err());
         let error = result.unwrap_err();
diff --git a/src/sinks/websocket_server/sink.rs b/src/sinks/websocket_server/sink.rs
index 62da60bd1740a..f8ab7ebab45b9 100644
--- a/src/sinks/websocket_server/sink.rs
+++ b/src/sinks/websocket_server/sink.rs
@@ -214,7 +214,7 @@ impl WebSocketListenerSink {
                 ));
                 return Ok(response);
             };
-            match auth.handle_auth(Some(&addr), req.headers()) {
+            match auth.handle_auth(Some(&addr), req.headers(), req.uri().path()) {
                 Ok(_) => {
                     extra_tags.append(&mut Self::extract_extra_tags(
                         &extra_tags_config,
diff --git a/src/sources/util/http/prelude.rs b/src/sources/util/http/prelude.rs
index 15f7a23b1c0f5..b6310ec2c2c75 100644
--- a/src/sources/util/http/prelude.rs
+++ b/src/sources/util/http/prelude.rs
@@ -133,7 +133,11 @@ pub trait HttpSource: Clone + Send + Sync + 'static {
                         let events = auth_matcher
                             .as_ref()
                             .map_or(Ok(()), |a| {
-                                a.handle_auth(addr.as_ref().map(|a| a.0).as_ref(), &headers)
+                                a.handle_auth(
+                                    addr.as_ref().map(|a| a.0).as_ref(),
+                                    &headers,
+                                    path.as_str(),
+                                )
                             })
                             .and_then(|()| self.decode(encoding_header.as_deref(), body))
                             .and_then(|body| {
diff --git a/website/cue/reference/components.cue b/website/cue/reference/components.cue
index 05a437fe86caa..002c65294189a 100644
--- a/website/cue/reference/components.cue
+++ b/website/cue/reference/components.cue
@@ -1290,8 +1290,8 @@ components: {
 					authorization code using VRL. Here is an example that looks up the token in an
 					enrichment table backed by a CSV file.
 
-					Currently custom VRL auth has access to `headers` and `address` (IP address of the
-					client).
+					Currently custom VRL auth has access to `headers`, `path`, and `address` (IP
+					address of the client).
 
 					```yaml
 					\(kind)s:

From 93f82b7ccae468b6f813588c4503ec9933dc615f Mon Sep 17 00:00:00 2001
From: Pavlos Rontidis <pavlos.rontidis@gmail.com>
Date: Tue, 24 Jun 2025 12:35:51 -0400
Subject: [PATCH 105/305] chore(ci): avoid IT setup if suite will not run
 (#23259)

* chore(ci): avoid IT setup if suite will not run

* test - trigger

* cannot access 'secrets' in if, add env block

* trigger tests

* turns out we do NEED the step

* Revert "trigger tests"

This reverts commit 53b6fd72bff0dfd9242703fa9c157deafde96350.

* revert trigger
---
 .github/workflows/integration.yml | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
index aacdcb92f92ee..687f740ab66ee 100644
--- a/.github/workflows/integration.yml
+++ b/.github/workflows/integration.yml
@@ -87,10 +87,6 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - run: sudo npm -g install @datadog/datadog-ci
-      - run: sudo -E bash scripts/ci-free-disk-space.sh
-      - run: docker image prune -af ; docker container prune -f
-
       - name: Determine if secrets are defined (PR author is team member)
         id: secret_access_check
         if: github.event_name == 'pull_request'
@@ -103,6 +99,13 @@ jobs:
             echo "can_access_secrets=false" >> $GITHUB_OUTPUT
           fi
 
+      - name: Run setup steps required by the IT suite
+        if: ${{ github.event_name == 'merge_group' || steps.check.outputs.can_access_secrets == 'true' }}
+        run: |
+          sudo npm -g install @datadog/datadog-ci
+          sudo -E bash scripts/ci-free-disk-space.sh
+          docker image prune -af && docker container prune -f
+
   integration-tests:
     runs-on: ubuntu-24.04
     needs:

From b364a1e692894df8843707e8f26c67a21e9497ce Mon Sep 17 00:00:00 2001
From: Thomas <thomas.schneider@datadoghq.com>
Date: Wed, 25 Jun 2025 09:18:36 -0400
Subject: [PATCH 106/305] feat(ci): don't run K8S E2E tests on website only
 changes (#23260)

---
 .github/workflows/changes.yml | 7 +++++++
 .github/workflows/k8s_e2e.yml | 4 ++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/changes.yml b/.github/workflows/changes.yml
index 682dded4a7b21..458fc7beeadf1 100644
--- a/.github/workflows/changes.yml
+++ b/.github/workflows/changes.yml
@@ -141,6 +141,7 @@ jobs:
       markdown: ${{ steps.filter.outputs.markdown }}
       install: ${{ steps.filter.outputs.install }}
       k8s: ${{ steps.filter.outputs.k8s }}
+      website_only: ${{ steps.filter.outputs.website == 'true' && steps.filter.outputs.other == 'false' }}
     steps:
     - uses: actions/checkout@v4
 
@@ -195,6 +196,12 @@ jobs:
             - "distribution/install.sh"
           k8s:
             - "src/sources/kubernetes_logs/**"
+          website:
+            - "website/**"
+          # any change _not_ under website/
+          not_website:
+            - "**"
+            - "!website/**"
 
   # Detects changes that are specific to integration tests
   int_tests:
diff --git a/.github/workflows/k8s_e2e.yml b/.github/workflows/k8s_e2e.yml
index 244e727f446c6..e9bdff7250e8f 100644
--- a/.github/workflows/k8s_e2e.yml
+++ b/.github/workflows/k8s_e2e.yml
@@ -66,7 +66,7 @@ jobs:
     timeout-minutes: 45
     needs: changes
     # Run this job even if `changes` job is skipped (non- pull request trigger)
-    if: ${{ !failure() && !cancelled() && (github.event_name != 'pull_request' || needs.changes.outputs.k8s == 'true') }}
+    if: ${{ !failure() && !cancelled() && (github.event_name != 'pull_request' || needs.changes.outputs.k8s == 'true') && needs.changes.website_only != 'true' }}
     # cargo-deb requires a release build, but we don't need optimizations for tests
     env:
       CARGO_PROFILE_RELEASE_OPT_LEVEL: 0
@@ -130,7 +130,7 @@ jobs:
     timeout-minutes: 5
     needs: changes
     # Run this job even if `changes` job is skipped
-    if: ${{ !failure() && !cancelled() && (github.event_name != 'pull_request' || needs.changes.outputs.k8s == 'true') }}
+    if: ${{ !failure() && !cancelled() && (github.event_name != 'pull_request' || needs.changes.outputs.k8s == 'true') && needs.changes.website_only != 'true' }}
     outputs:
       matrix: ${{ steps.set-matrix.outputs.matrix }}
     steps:

From 9d3d0a87187890f1efe5ce03cd7f067fd75d64b0 Mon Sep 17 00:00:00 2001
From: Pavlos Rontidis <pavlos.rontidis@gmail.com>
Date: Wed, 25 Jun 2025 12:37:42 -0400
Subject: [PATCH 107/305] chore(vdev): add `int build` command (#23265)

* chore(ci): refactoring (preparation for follow up PRs)

* chore(vdev): refactoring wip

* cargo fmt

* revert unrelated change

* trigger CI suite - revert me later

* add vdev semantic scope

* fix integration

* revert

* Revert "trigger CI suite - revert me later"

This reverts commit ab5694c5b9b08fae156d6d4f5a85351454a60a76.
---
 .github/workflows/semantic.yml         |   1 +
 vdev/src/commands/info.rs              |   5 +-
 vdev/src/commands/integration/build.rs |  14 ++++
 vdev/src/commands/integration/mod.rs   |   1 +
 vdev/src/testing/build.rs              |  65 ++++++++++++++++
 vdev/src/testing/config.rs             |  12 +--
 vdev/src/testing/docker.rs             |  44 +++++++++++
 vdev/src/testing/integration.rs        |  16 ++--
 vdev/src/testing/mod.rs                |   2 +
 vdev/src/testing/runner.rs             | 104 ++++++-------------------
 10 files changed, 166 insertions(+), 98 deletions(-)
 create mode 100644 vdev/src/commands/integration/build.rs
 create mode 100644 vdev/src/testing/build.rs
 create mode 100644 vdev/src/testing/docker.rs

diff --git a/.github/workflows/semantic.yml b/.github/workflows/semantic.yml
index 223e93a0124ee..82ea0bb43022b 100644
--- a/.github/workflows/semantic.yml
+++ b/.github/workflows/semantic.yml
@@ -48,6 +48,7 @@ jobs:
             deployment
             deps
             dev
+            vdev
             durability
             enriching
             enterprise
diff --git a/vdev/src/commands/info.rs b/vdev/src/commands/info.rs
index c0815cb3f2677..f3a8614054e57 100644
--- a/vdev/src/commands/info.rs
+++ b/vdev/src/commands/info.rs
@@ -1,7 +1,8 @@
 use anyhow::Result;
 use clap::Args;
 
-use crate::{app, config, platform, testing::runner};
+use crate::testing::docker::CONTAINER_TOOL;
+use crate::{app, config, platform};
 
 /// Show `vdev` command configuration
 #[derive(Args, Debug)]
@@ -10,7 +11,7 @@ pub struct Cli {}
 
 impl Cli {
     pub fn exec(self) -> Result<()> {
-        println!("Container tool:  {:?}", *runner::CONTAINER_TOOL);
+        println!("Container tool:  {:?}", *CONTAINER_TOOL);
         println!("Data path:       {:?}", platform::data_dir());
         println!("Repository:      {:?}", app::path());
         println!("Shell:           {:?}", *app::SHELL);
diff --git a/vdev/src/commands/integration/build.rs b/vdev/src/commands/integration/build.rs
new file mode 100644
index 0000000000000..22d5ad682d58d
--- /dev/null
+++ b/vdev/src/commands/integration/build.rs
@@ -0,0 +1,14 @@
+use crate::testing::build::build_integration_image;
+use anyhow::Result;
+use clap::Args;
+
+/// Start an environment
+#[derive(Args, Debug)]
+#[command()]
+pub struct Cli {}
+
+impl Cli {
+    pub fn exec(self) -> Result<()> {
+        build_integration_image()
+    }
+}
diff --git a/vdev/src/commands/integration/mod.rs b/vdev/src/commands/integration/mod.rs
index c563bdb16fbba..b517fc475a5db 100644
--- a/vdev/src/commands/integration/mod.rs
+++ b/vdev/src/commands/integration/mod.rs
@@ -6,6 +6,7 @@ These test setups are organized into a set of integrations, located in subdirect
 `matrix` setting in the `test.yaml` file contained therein."
 
     mod show,
+    mod build,
     mod start,
     mod stop,
     mod test,
diff --git a/vdev/src/testing/build.rs b/vdev/src/testing/build.rs
new file mode 100644
index 0000000000000..d3b0f213aadf7
--- /dev/null
+++ b/vdev/src/testing/build.rs
@@ -0,0 +1,65 @@
+use crate::app;
+use crate::app::CommandExt;
+use crate::testing::config::RustToolchainConfig;
+use crate::testing::docker::docker_command;
+use crate::util::IS_A_TTY;
+use anyhow::Result;
+use std::path::PathBuf;
+use std::{path::Path, process::Command};
+
+pub const ALL_INTEGRATIONS_FEATURE_FLAG: &str = "all-integration-tests";
+
+/// Construct (but do not run) the `docker build` command for a test-runner image.
+/// - `image` is the full tag (e.g. `"vector-test-runner-1.86.0:latest"`).
+/// - `dockerfile` is the path to the Dockerfile (e.g. `scripts/integration/Dockerfile`).
+/// - `features` controls the `FEATURES` build-arg (pass `None` for an empty list).
+pub fn prepare_build_command(
+    image: &str,
+    dockerfile: &Path,
+    features: Option<&[String]>,
+) -> Command {
+    // Start with `docker build`
+    let mut cmd = docker_command(["build"]);
+
+    // Ensure we run from the repo root (so `.` context is correct)
+    cmd.current_dir(app::path());
+
+    // If we're attached to a TTY, show fancy progress
+    if *IS_A_TTY {
+        cmd.args(["--progress", "tty"]);
+    }
+
+    // Add all of the flags in one go
+    cmd.args([
+        "--pull",
+        "--tag",
+        image,
+        "--file",
+        dockerfile.to_str().unwrap(),
+        "--label",
+        "vector-test-runner=true",
+        "--build-arg",
+        &format!("RUST_VERSION={}", RustToolchainConfig::rust_version()),
+        "--build-arg",
+        &format!("FEATURES={}", features.unwrap_or(&[]).join(",")),
+        ".",
+    ]);
+
+    cmd
+}
+
+#[allow(dead_code)]
+/// Build the integration test‐runner image from `scripts/integration/Dockerfile`
+pub fn build_integration_image() -> Result<()> {
+    let dockerfile: PathBuf = [app::path(), "scripts", "integration", "Dockerfile"]
+        .iter()
+        .collect();
+    let image = format!("vector-test-runner-{}", RustToolchainConfig::rust_version());
+    let mut cmd = prepare_build_command(
+        &image,
+        &dockerfile,
+        Some(&[ALL_INTEGRATIONS_FEATURE_FLAG.to_string()]),
+    );
+    waiting!("Building {image}");
+    cmd.check_run()
+}
diff --git a/vdev/src/testing/config.rs b/vdev/src/testing/config.rs
index f8bfaf549000d..4a0b261daf9fb 100644
--- a/vdev/src/testing/config.rs
+++ b/vdev/src/testing/config.rs
@@ -28,7 +28,7 @@ pub struct RustToolchainConfig {
 }
 
 impl RustToolchainConfig {
-    pub fn parse() -> Result<Self> {
+    fn parse() -> Result<Self> {
         let repo_path = app::path();
         let config_file: PathBuf = [repo_path, "rust-toolchain.toml"].iter().collect();
         let contents = fs::read_to_string(&config_file)
@@ -38,12 +38,12 @@ impl RustToolchainConfig {
 
         Ok(config.toolchain)
     }
-}
 
-pub fn get_rust_version() -> String {
-    match RustToolchainConfig::parse() {
-        Ok(config) => config.channel,
-        Err(error) => fatal!("Could not read `rust-toolchain.toml` file: {error}"),
+    pub fn rust_version() -> String {
+        match RustToolchainConfig::parse() {
+            Ok(config) => config.channel,
+            Err(error) => fatal!("Could not read `rust-toolchain.toml` file: {error}"),
+        }
     }
 }
 
diff --git a/vdev/src/testing/docker.rs b/vdev/src/testing/docker.rs
new file mode 100644
index 0000000000000..6aca2a4b9ed6d
--- /dev/null
+++ b/vdev/src/testing/docker.rs
@@ -0,0 +1,44 @@
+use std::env;
+use std::ffi::{OsStr, OsString};
+use std::path::PathBuf;
+use std::process::{Command, Stdio};
+use std::sync::LazyLock;
+
+pub static CONTAINER_TOOL: LazyLock<OsString> =
+    LazyLock::new(|| env::var_os("CONTAINER_TOOL").unwrap_or_else(detect_container_tool));
+
+pub(super) static DOCKER_SOCKET: LazyLock<PathBuf> = LazyLock::new(detect_docker_socket);
+
+pub fn docker_command<I: AsRef<OsStr>>(args: impl IntoIterator<Item = I>) -> Command {
+    let mut command = Command::new(&*CONTAINER_TOOL);
+    command.args(args);
+    command
+}
+
+fn detect_container_tool() -> OsString {
+    for tool in ["docker", "podman"] {
+        if Command::new(tool)
+            .arg("version")
+            .stdout(Stdio::null())
+            .stderr(Stdio::null())
+            .spawn()
+            .and_then(|mut child| child.wait())
+            .is_ok_and(|status| status.success())
+        {
+            return OsString::from(String::from(tool));
+        }
+    }
+    fatal!("No container tool could be detected.");
+}
+
+fn detect_docker_socket() -> PathBuf {
+    match env::var_os("DOCKER_HOST") {
+        Some(host) => host
+            .into_string()
+            .expect("Invalid value in $DOCKER_HOST")
+            .strip_prefix("unix://")
+            .expect("$DOCKER_HOST is not a socket path")
+            .into(),
+        None => "/var/run/docker.sock".into(),
+    }
+}
diff --git a/vdev/src/testing/integration.rs b/vdev/src/testing/integration.rs
index a2d55aca07c98..0fa4329eb9485 100644
--- a/vdev/src/testing/integration.rs
+++ b/vdev/src/testing/integration.rs
@@ -4,18 +4,16 @@ use anyhow::{bail, Context, Result};
 use tempfile::{Builder, NamedTempFile};
 
 use super::config::{
-    ComposeConfig, ComposeTestConfig, Environment, E2E_TESTS_DIR, INTEGRATION_TESTS_DIR,
-};
-use super::runner::{
-    ContainerTestRunner as _, IntegrationTestRunner, TestRunner as _, CONTAINER_TOOL, DOCKER_SOCKET,
+    ComposeConfig, ComposeTestConfig, Environment, RustToolchainConfig, E2E_TESTS_DIR,
+    INTEGRATION_TESTS_DIR,
 };
+use super::runner::{ContainerTestRunner as _, IntegrationTestRunner, TestRunner as _};
 use super::state::EnvsDir;
 use crate::app::CommandExt as _;
-use crate::testing::config::get_rust_version;
+use crate::testing::build::ALL_INTEGRATIONS_FEATURE_FLAG;
+use crate::testing::docker::{CONTAINER_TOOL, DOCKER_SOCKET};
 
 const NETWORK_ENV_VAR: &str = "VECTOR_NETWORK";
-
-const INTEGRATION_FEATURE_FLAG: &str = "all-integration-tests";
 const E2E_FEATURE_FLAG: &str = "all-e2e-tests";
 
 pub(crate) struct ComposeTest {
@@ -197,7 +195,7 @@ pub(crate) struct IntegrationTest;
 impl ComposeTestT for IntegrationTest {
     const DIRECTORY: &'static str = INTEGRATION_TESTS_DIR;
 
-    const FEATURE_FLAG: &'static str = INTEGRATION_FEATURE_FLAG;
+    const FEATURE_FLAG: &'static str = ALL_INTEGRATIONS_FEATURE_FLAG;
 }
 
 /// E2E tests are located in the `scripts/e2e` dir,
@@ -299,7 +297,7 @@ impl Compose {
         command.env(NETWORK_ENV_VAR, &self.network);
 
         // some services require this in order to build Vector
-        command.env("RUST_VERSION", get_rust_version());
+        command.env("RUST_VERSION", RustToolchainConfig::rust_version());
 
         for (key, value) in &self.env {
             if let Some(value) = value {
diff --git a/vdev/src/testing/mod.rs b/vdev/src/testing/mod.rs
index 1bec37be971f7..a899e52804387 100644
--- a/vdev/src/testing/mod.rs
+++ b/vdev/src/testing/mod.rs
@@ -1,4 +1,6 @@
+pub mod build;
 pub mod config;
+pub mod docker;
 pub mod integration;
 pub mod runner;
 pub mod state;
diff --git a/vdev/src/testing/runner.rs b/vdev/src/testing/runner.rs
index 719fbd568d405..bfaa203021da5 100644
--- a/vdev/src/testing/runner.rs
+++ b/vdev/src/testing/runner.rs
@@ -1,11 +1,13 @@
 use std::collections::HashSet;
-use std::process::{Command, Stdio};
-use std::{env, ffi::OsStr, ffi::OsString, path::PathBuf, sync::LazyLock};
+use std::process::Command;
+use std::{env, path::PathBuf};
 
 use anyhow::Result;
 
 use super::config::{Environment, IntegrationRunnerConfig, RustToolchainConfig};
 use crate::app::{self, CommandExt as _};
+use crate::testing::build::prepare_build_command;
+use crate::testing::docker::{docker_command, DOCKER_SOCKET};
 use crate::util::{ChainArgs as _, IS_A_TTY};
 
 const MOUNT_PATH: &str = "/home/vector";
@@ -25,40 +27,6 @@ const TEST_COMMAND: &[&str] = &[
 const UPSTREAM_IMAGE: &str =
     "docker.io/timberio/vector-dev:sha-3eadc96742a33754a5859203b58249f6a806972a";
 
-pub static CONTAINER_TOOL: LazyLock<OsString> =
-    LazyLock::new(|| env::var_os("CONTAINER_TOOL").unwrap_or_else(detect_container_tool));
-
-pub(super) static DOCKER_SOCKET: LazyLock<PathBuf> = LazyLock::new(detect_docker_socket);
-
-fn detect_container_tool() -> OsString {
-    for tool in ["docker", "podman"] {
-        if Command::new(tool)
-            .arg("version")
-            .stdout(Stdio::null())
-            .stderr(Stdio::null())
-            .spawn()
-            .and_then(|mut child| child.wait())
-            .is_ok_and(|status| status.success())
-        {
-            return OsString::from(String::from(tool));
-        }
-    }
-    fatal!("No container tool could be detected.");
-}
-
-fn get_rust_version() -> String {
-    match RustToolchainConfig::parse() {
-        Ok(config) => config.channel,
-        Err(error) => fatal!("Could not read `rust-toolchain.toml` file: {error}"),
-    }
-}
-
-fn dockercmd<I: AsRef<OsStr>>(args: impl IntoIterator<Item = I>) -> Command {
-    let mut command = Command::new(&*CONTAINER_TOOL);
-    command.args(args);
-    command
-}
-
 pub enum RunnerState {
     Running,
     Restarting,
@@ -101,7 +69,7 @@ pub trait ContainerTestRunner: TestRunner {
     fn volumes(&self) -> Vec<String>;
 
     fn state(&self) -> Result<RunnerState> {
-        let mut command = dockercmd(["ps", "-a", "--format", "{{.Names}} {{.State}}"]);
+        let mut command = docker_command(["ps", "-a", "--format", "{{.Names}} {{.State}}"]);
         let container_name = self.container_name();
 
         for line in command.check_output()?.lines() {
@@ -151,7 +119,7 @@ pub trait ContainerTestRunner: TestRunner {
     }
 
     fn ensure_volumes(&self) -> Result<()> {
-        let mut command = dockercmd(["volume", "ls", "--format", "{{.Name}}"]);
+        let mut command = docker_command(["volume", "ls", "--format", "{{.Name}}"]);
 
         let mut volumes = HashSet::new();
         volumes.insert(VOLUME_TARGET);
@@ -162,7 +130,8 @@ pub trait ContainerTestRunner: TestRunner {
         }
 
         for volume in &volumes {
-            dockercmd(["volume", "create", volume]).wait(format!("Creating volume {volume}"))?;
+            docker_command(["volume", "create", volume])
+                .wait(format!("Creating volume {volume}"))?;
         }
 
         Ok(())
@@ -172,32 +141,13 @@ pub trait ContainerTestRunner: TestRunner {
         let dockerfile: PathBuf = [app::path(), "scripts", directory, "Dockerfile"]
             .iter()
             .collect();
-        let mut command = dockercmd(["build"]);
-        command.current_dir(app::path());
-        if *IS_A_TTY {
-            command.args(["--progress", "tty"]);
-        }
-        command.args([
-            "--pull",
-            "--tag",
-            &self.image_name(),
-            "--file",
-            dockerfile.to_str().unwrap(),
-            "--label",
-            "vector-test-runner=true",
-            "--build-arg",
-            &format!("RUST_VERSION={}", get_rust_version()),
-            "--build-arg",
-            &format!("FEATURES={}", features.unwrap_or(&[]).join(",")),
-            ".",
-        ]);
-
+        let mut command = prepare_build_command(&self.image_name(), &dockerfile, features);
         waiting!("Building image {}", self.image_name());
         command.check_run()
     }
 
     fn start(&self) -> Result<()> {
-        dockercmd(["start", &self.container_name()])
+        docker_command(["start", &self.container_name()])
             .wait(format!("Starting container {}", self.container_name()))
     }
 
@@ -205,13 +155,13 @@ pub trait ContainerTestRunner: TestRunner {
         if matches!(self.state()?, RunnerState::Missing) {
             Ok(())
         } else {
-            dockercmd(["rm", "--force", "--volumes", &self.container_name()])
+            docker_command(["rm", "--force", "--volumes", &self.container_name()])
                 .wait(format!("Removing container {}", self.container_name()))
         }
     }
 
     fn unpause(&self) -> Result<()> {
-        dockercmd(["unpause", &self.container_name()])
+        docker_command(["unpause", &self.container_name()])
             .wait(format!("Unpausing container {}", self.container_name()))
     }
 
@@ -230,7 +180,7 @@ pub trait ContainerTestRunner: TestRunner {
             .flat_map(|volume| ["--volume", volume])
             .collect();
 
-        dockercmd(
+        docker_command(
             [
                 "create",
                 "--name",
@@ -272,7 +222,7 @@ where
     ) -> Result<()> {
         self.ensure_running(features, directory)?;
 
-        let mut command = dockercmd(["exec"]);
+        let mut command = docker_command(["exec"]);
         if *IS_A_TTY {
             command.arg("--tty");
         }
@@ -329,7 +279,7 @@ impl IntegrationTestRunner {
 
     pub(super) fn ensure_network(&self) -> Result<()> {
         if let Some(network_name) = &self.network {
-            let mut command = dockercmd(["network", "ls", "--format", "{{.Name}}"]);
+            let mut command = docker_command(["network", "ls", "--format", "{{.Name}}"]);
 
             if command
                 .check_output()?
@@ -339,7 +289,7 @@ impl IntegrationTestRunner {
                 return Ok(());
             }
 
-            dockercmd(["network", "create", network_name]).wait("Creating network")
+            docker_command(["network", "create", network_name]).wait("Creating network")
         } else {
             Ok(())
         }
@@ -353,9 +303,13 @@ impl ContainerTestRunner for IntegrationTestRunner {
 
     fn container_name(&self) -> String {
         if let Some(integration) = self.integration.as_ref() {
-            format!("vector-test-runner-{}-{}", integration, get_rust_version())
+            format!(
+                "vector-test-runner-{}-{}",
+                integration,
+                RustToolchainConfig::rust_version()
+            )
         } else {
-            format!("vector-test-runner-{}", get_rust_version())
+            format!("vector-test-runner-{}", RustToolchainConfig::rust_version())
         }
     }
 
@@ -380,7 +334,7 @@ impl ContainerTestRunner for DockerTestRunner {
     }
 
     fn container_name(&self) -> String {
-        format!("vector-test-runner-{}", get_rust_version())
+        format!("vector-test-runner-{}", RustToolchainConfig::rust_version())
     }
 
     fn image_name(&self) -> String {
@@ -425,15 +379,3 @@ impl TestRunner for LocalTestRunner {
         command.check_run()
     }
 }
-
-fn detect_docker_socket() -> PathBuf {
-    match env::var_os("DOCKER_HOST") {
-        Some(host) => host
-            .into_string()
-            .expect("Invalid value in $DOCKER_HOST")
-            .strip_prefix("unix://")
-            .expect("$DOCKER_HOST is not a socket path")
-            .into(),
-        None => "/var/run/docker.sock".into(),
-    }
-}

From 404f0b948d483c307fe9ef0639d5b516eb2da50e Mon Sep 17 00:00:00 2001
From: Pavlos Rontidis <pavlos.rontidis@gmail.com>
Date: Wed, 25 Jun 2025 13:44:44 -0400
Subject: [PATCH 108/305] chore(ci): add enrcihment tables to semantic.yml

---
 .github/workflows/semantic.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/semantic.yml b/.github/workflows/semantic.yml
index 82ea0bb43022b..5125b2e855e62 100644
--- a/.github/workflows/semantic.yml
+++ b/.github/workflows/semantic.yml
@@ -51,6 +51,7 @@ jobs:
             vdev
             durability
             enriching
+            enrichment tables
             enterprise
             exceptions
             external

From e4bfd06469d405ddb561c110b158fb1cc85aaf37 Mon Sep 17 00:00:00 2001
From: Pavlos Rontidis <pavlos.rontidis@gmail.com>
Date: Wed, 25 Jun 2025 13:25:37 -0400
Subject: [PATCH 109/305] chore(ci): refactoring (preparation for follow up
 PRs) (#23266)

* chore(ci): refactoring (preparation for follow up PRs)

* trigger test - revert me

* Revert "trigger test - revert me"

This reverts commit 44728f0c007d08110e6561b1b3c9999f9e06d201.
---
 .github/workflows/integration.yml | 29 +++++++++++++++++------------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
index 687f740ab66ee..81d12a117a1fa 100644
--- a/.github/workflows/integration.yml
+++ b/.github/workflows/integration.yml
@@ -46,7 +46,7 @@ jobs:
       int_tests: true
     secrets: inherit
 
-  check-all:
+  check-changes:
     runs-on: ubuntu-latest
     needs: changes
     outputs:
@@ -78,29 +78,34 @@ jobs:
             echo "should_run=true" >> $GITHUB_OUTPUT
           fi
 
-  setup:
+  check-secrets:
     runs-on: ubuntu-latest
-    needs: check-all
-    if: ${{ needs.check-all.outputs.should_run == 'true' }}
+    needs: check-changes
     outputs:
-      can_access_secrets: ${{ steps.secret_access_check.outputs.can_access_secrets }}
+      can_access_secrets: ${{ steps.secret_check.outputs.can_access_secrets }}
     steps:
       - uses: actions/checkout@v4
 
       - name: Determine if secrets are defined (PR author is team member)
-        id: secret_access_check
-        if: github.event_name == 'pull_request'
+        id: secret_check
+        if: ${{ github.event_name == 'pull_request' }}
         env:
           GH_APP_DATADOG_VECTOR_CI_APP_ID: ${{ secrets.GH_APP_DATADOG_VECTOR_CI_APP_ID }}
         run: |
-          if [[ "$GH_APP_DATADOG_VECTOR_CI_APP_ID" != "" ]] ; then
+          if [[ "$GH_APP_DATADOG_VECTOR_CI_APP_ID" != "" ]]; then
             echo "can_access_secrets=true" >> $GITHUB_OUTPUT
           else
             echo "can_access_secrets=false" >> $GITHUB_OUTPUT
           fi
 
+  setup:
+    runs-on: ubuntu-latest
+    needs: check-secrets
+    if: ${{ github.event_name == 'merge_group' || needs.check-secrets.outputs.can_access_secrets == 'true' }}
+    steps:
+      - uses: actions/checkout@v4
+
       - name: Run setup steps required by the IT suite
-        if: ${{ github.event_name == 'merge_group' || steps.check.outputs.can_access_secrets == 'true' }}
         run: |
           sudo npm -g install @datadog/datadog-ci
           sudo -E bash scripts/ci-free-disk-space.sh
@@ -109,9 +114,9 @@ jobs:
   integration-tests:
     runs-on: ubuntu-24.04
     needs:
-      - changes
       - setup
-    if: ${{ needs.setup.outputs.can_access_secrets == 'true' || github.event_name == 'merge_group' }}
+      - check-secrets
+    if: ${{ needs.check-secrets.outputs.can_access_secrets == 'true' || github.event_name == 'merge_group' }}
     strategy:
       matrix:
         # TODO: Add "splunk" back once https://github.com/vectordotdev/vector/issues/22379 is fixed.
@@ -163,7 +168,7 @@ jobs:
     if: always()
     needs:
       - changes
-      - check-all
+      - check-changes
       - setup
       - integration-tests
     env:

From 516bbc91b21559ed99f835428d456fac0af391cc Mon Sep 17 00:00:00 2001
From: Thomas <thomas.schneider@datadoghq.com>
Date: Wed, 25 Jun 2025 14:07:35 -0400
Subject: [PATCH 110/305] chore(website): fix telemetry types for Sources
 (#23267)

* chore(website): fix telemetry types for Sources

* Revert changes to _logs.cue
---
 .../cue/reference/components/sources/amqp.cue | 60 +++++++------
 .../sources/aws_kinesis_firehose.cue          | 64 ++++++++------
 .../reference/components/sources/aws_s3.cue   | 78 ++++++++--------
 .../reference/components/sources/aws_sqs.cue  | 44 ++++++----
 .../cue/reference/components/sources/exec.cue | 74 +++++++++-------
 .../components/sources/file_descriptor.cue    | 20 +++--
 .../components/sources/http_server.cue        | 88 ++++++++++---------
 .../reference/components/sources/kafka.cue    | 80 +++++++++--------
 .../cue/reference/components/sources/mqtt.cue | 46 ++++++----
 .../cue/reference/components/sources/nats.cue | 48 +++++-----
 .../components/sources/opentelemetry.cue      |  6 ++
 .../reference/components/sources/pulsar.cue   | 72 ++++++++-------
 .../reference/components/sources/redis.cue    | 46 ++++++----
 .../reference/components/sources/socket.cue   | 60 +++++++------
 .../reference/components/sources/stdin.cue    | 30 ++++---
 .../reference/components/sources/vector.cue   |  3 +
 16 files changed, 470 insertions(+), 349 deletions(-)

diff --git a/website/cue/reference/components/sources/amqp.cue b/website/cue/reference/components/sources/amqp.cue
index 0dd23404e3fb8..cfc469f543bbe 100644
--- a/website/cue/reference/components/sources/amqp.cue
+++ b/website/cue/reference/components/sources/amqp.cue
@@ -44,37 +44,45 @@ components: sources: amqp: {
 
 	configuration: base.components.sources.amqp.configuration
 
-	output: logs: record: {
-		description: "An individual AMQP record."
-		fields: {
-			message: {
-				description: "The raw line from the AMQP record."
-				required:    true
-				type: string: {
-					examples: ["53.126.150.246 - - [01/Oct/2020:11:25:58 -0400] \"GET /disintermediate HTTP/2.0\" 401 20308"]
-					syntax: "literal"
+	output: {
+		logs: record: {
+			description: "An individual AMQP record."
+			fields: {
+				message: {
+					description: "The raw line from the AMQP record."
+					required:    true
+					type: string: {
+						examples: ["53.126.150.246 - - [01/Oct/2020:11:25:58 -0400] \"GET /disintermediate HTTP/2.0\" 401 20308"]
+						syntax: "literal"
+					}
 				}
-			}
-			offset: {
-				description: "The AMQP offset at the time the record was retrieved."
-				required:    true
-				type: uint: {
-					examples: [100]
-					unit: null
+				offset: {
+					description: "The AMQP offset at the time the record was retrieved."
+					required:    true
+					type: uint: {
+						examples: [100]
+						unit: null
+					}
 				}
-			}
-			timestamp: fields._current_timestamp & {
-				description: "The timestamp encoded in the AMQP message or the current time if it cannot be fetched."
-			}
-			exchange: {
-				description: "The AMQP exchange that the record came from."
-				required:    true
-				type: string: {
-					examples: ["topic"]
-					syntax: "literal"
+				timestamp: fields._current_timestamp & {
+					description: "The timestamp encoded in the AMQP message or the current time if it cannot be fetched."
+				}
+				exchange: {
+					description: "The AMQP exchange that the record came from."
+					required:    true
+					type: string: {
+						examples: ["topic"]
+						syntax: "literal"
+					}
 				}
 			}
 		}
+		metrics: "": {
+			description: "The input `metric` event."
+		}
+		traces: "": {
+			description: "The input `trace` event."
+		}
 	}
 
 	how_it_works: components._amqp.how_it_works
diff --git a/website/cue/reference/components/sources/aws_kinesis_firehose.cue b/website/cue/reference/components/sources/aws_kinesis_firehose.cue
index ebab167e306f3..c912c4c17f449 100644
--- a/website/cue/reference/components/sources/aws_kinesis_firehose.cue
+++ b/website/cue/reference/components/sources/aws_kinesis_firehose.cue
@@ -60,41 +60,49 @@ components: sources: aws_kinesis_firehose: {
 
 	configuration: base.components.sources.aws_kinesis_firehose.configuration
 
-	output: logs: {
-		line: {
-			description: "One event will be published per incoming AWS Kinesis Firehose record."
-			fields: {
-				timestamp: fields._current_timestamp
-				message: {
-					description: "The raw record from the incoming payload."
-					required:    true
-					type: string: {
-						examples: ["Started GET / for 127.0.0.1 at 2012-03-10 14:28:14 +0100"]
+	output: {
+		logs: {
+			line: {
+				description: "One event will be published per incoming AWS Kinesis Firehose record."
+				fields: {
+					timestamp: fields._current_timestamp
+					message: {
+						description: "The raw record from the incoming payload."
+						required:    true
+						type: string: {
+							examples: ["Started GET / for 127.0.0.1 at 2012-03-10 14:28:14 +0100"]
+						}
 					}
-				}
-				request_id: {
-					description: "The AWS Kinesis Firehose request ID, value of the `X-Amz-Firehose-Request-Id` header."
-					required:    true
-					type: string: {
-						examples: ["ed1d787c-b9e2-4631-92dc-8e7c9d26d804"]
+					request_id: {
+						description: "The AWS Kinesis Firehose request ID, value of the `X-Amz-Firehose-Request-Id` header."
+						required:    true
+						type: string: {
+							examples: ["ed1d787c-b9e2-4631-92dc-8e7c9d26d804"]
+						}
 					}
-				}
-				source_arn: {
-					description: "The AWS Kinesis Firehose delivery stream that issued the request, value of the `X-Amz-Firehose-Source-Arn` header."
-					required:    true
-					type: string: {
-						examples: ["arn:aws:firehose:us-east-1:111111111111:deliverystream/test"]
+					source_arn: {
+						description: "The AWS Kinesis Firehose delivery stream that issued the request, value of the `X-Amz-Firehose-Source-Arn` header."
+						required:    true
+						type: string: {
+							examples: ["arn:aws:firehose:us-east-1:111111111111:deliverystream/test"]
+						}
 					}
-				}
-				source_type: {
-					description: "The name of the source type."
-					required:    true
-					type: string: {
-						examples: ["aws_kinesis_firehose"]
+					source_type: {
+						description: "The name of the source type."
+						required:    true
+						type: string: {
+							examples: ["aws_kinesis_firehose"]
+						}
 					}
 				}
 			}
 		}
+		metrics: "": {
+			description: "The input `metric` event."
+		}
+		traces: "": {
+			description: "The input `trace` event."
+		}
 	}
 
 	examples: [
diff --git a/website/cue/reference/components/sources/aws_s3.cue b/website/cue/reference/components/sources/aws_s3.cue
index 41e33ddfac4b0..d2f8db43fbcd0 100644
--- a/website/cue/reference/components/sources/aws_s3.cue
+++ b/website/cue/reference/components/sources/aws_s3.cue
@@ -49,48 +49,56 @@ components: sources: aws_s3: components._aws & {
 		_aws_include: false
 	}
 
-	output: logs: object: {
-		description: "A line from an S3 object."
-		fields: {
-			message: {
-				description: "A line from the S3 object."
-				required:    true
-				type: string: {
-					examples: ["53.126.150.246 - - [01/Oct/2020:11:25:58 -0400] \"GET /disintermediate HTTP/2.0\" 401 20308"]
+	output: {
+		logs: object: {
+			description: "A line from an S3 object."
+			fields: {
+				message: {
+					description: "A line from the S3 object."
+					required:    true
+					type: string: {
+						examples: ["53.126.150.246 - - [01/Oct/2020:11:25:58 -0400] \"GET /disintermediate HTTP/2.0\" 401 20308"]
+					}
 				}
-			}
-			timestamp: fields._current_timestamp & {
-				description: "The Last-Modified time of the object. Defaults the current timestamp if this information is missing."
-			}
-			source_type: {
-				description: "The name of the source type."
-				required:    true
-				type: string: {
-					examples: ["aws_s3"]
+				timestamp: fields._current_timestamp & {
+					description: "The Last-Modified time of the object. Defaults the current timestamp if this information is missing."
 				}
-			}
-			bucket: {
-				description: "The bucket of the object the line came from."
-				required:    true
-				type: string: {
-					examples: ["my-bucket"]
+				source_type: {
+					description: "The name of the source type."
+					required:    true
+					type: string: {
+						examples: ["aws_s3"]
+					}
 				}
-			}
-			object: {
-				description: "The object the line came from."
-				required:    true
-				type: string: {
-					examples: ["AWSLogs/111111111111/vpcflowlogs/us-east-1/2020/10/26/111111111111_vpcflowlogs_us-east-1_fl-0c5605d9f1baf680d_20201026T1950Z_b1ea4a7a.log.gz"]
+				bucket: {
+					description: "The bucket of the object the line came from."
+					required:    true
+					type: string: {
+						examples: ["my-bucket"]
+					}
 				}
-			}
-			region: {
-				description: "The AWS region bucket is in."
-				required:    true
-				type: string: {
-					examples: ["us-east-1"]
+				object: {
+					description: "The object the line came from."
+					required:    true
+					type: string: {
+						examples: ["AWSLogs/111111111111/vpcflowlogs/us-east-1/2020/10/26/111111111111_vpcflowlogs_us-east-1_fl-0c5605d9f1baf680d_20201026T1950Z_b1ea4a7a.log.gz"]
+					}
+				}
+				region: {
+					description: "The AWS region bucket is in."
+					required:    true
+					type: string: {
+						examples: ["us-east-1"]
+					}
 				}
 			}
 		}
+		metrics: "": {
+			description: "The input `metric` event."
+		}
+		traces: "": {
+			description: "The input `trace` event."
+		}
 	}
 
 	how_it_works: {
diff --git a/website/cue/reference/components/sources/aws_sqs.cue b/website/cue/reference/components/sources/aws_sqs.cue
index 21e717e99dde4..ae6a53e32149e 100644
--- a/website/cue/reference/components/sources/aws_sqs.cue
+++ b/website/cue/reference/components/sources/aws_sqs.cue
@@ -58,27 +58,35 @@ components: sources: aws_sqs: components._aws & {
 		_aws_include: false
 	}
 
-	output: logs: record: {
-		description: "An individual SQS record"
-		fields: {
-			message: {
-				description: "The raw message from the SQS record."
-				required:    true
-				type: string: {
-					examples: ["53.126.150.246 - - [01/Oct/2020:11:25:58 -0400] \"GET /disintermediate HTTP/2.0\" 401 20308"]
-					syntax: "literal"
+	output: {
+		logs: record: {
+			description: "An individual SQS record"
+			fields: {
+				message: {
+					description: "The raw message from the SQS record."
+					required:    true
+					type: string: {
+						examples: ["53.126.150.246 - - [01/Oct/2020:11:25:58 -0400] \"GET /disintermediate HTTP/2.0\" 401 20308"]
+						syntax: "literal"
+					}
 				}
-			}
-			source_type: {
-				description: "The name of the source type."
-				required:    true
-				type: string: {
-					examples: ["aws_sqs"]
+				source_type: {
+					description: "The name of the source type."
+					required:    true
+					type: string: {
+						examples: ["aws_sqs"]
+					}
+				}
+				timestamp: fields._current_timestamp & {
+					description: "The time this message was sent to SQS."
 				}
 			}
-			timestamp: fields._current_timestamp & {
-				description: "The time this message was sent to SQS."
-			}
+		}
+		metrics: "": {
+			description: "The input `metric` event."
+		}
+		traces: "": {
+			description: "The input `trace` event."
 		}
 	}
 
diff --git a/website/cue/reference/components/sources/exec.cue b/website/cue/reference/components/sources/exec.cue
index 4be168e338a09..b0db5e0dae0d0 100644
--- a/website/cue/reference/components/sources/exec.cue
+++ b/website/cue/reference/components/sources/exec.cue
@@ -41,46 +41,54 @@ components: sources: exec: {
 
 	configuration: base.components.sources.exec.configuration
 
-	output: logs: line: {
-		description: "An individual event from exec."
-		fields: {
-			host:      fields._local_host
-			message:   fields._raw_line
-			timestamp: fields._current_timestamp
-			data_stream: {
-				common:      true
-				description: "The data stream from which the event originated."
-				required:    false
-				type: string: {
-					default: null
-					examples: ["stdout", "stderr"]
+	output: {
+		logs: line: {
+			description: "An individual event from exec."
+			fields: {
+				host:      fields._local_host
+				message:   fields._raw_line
+				timestamp: fields._current_timestamp
+				data_stream: {
+					common:      true
+					description: "The data stream from which the event originated."
+					required:    false
+					type: string: {
+						default: null
+						examples: ["stdout", "stderr"]
+					}
 				}
-			}
-			pid: {
-				description: "The process ID of the command."
-				required:    true
-				type: uint: {
-					examples: [60085, 668]
-					unit: null
+				pid: {
+					description: "The process ID of the command."
+					required:    true
+					type: uint: {
+						examples: [60085, 668]
+						unit: null
+					}
 				}
-			}
-			command: {
-				required:    true
-				description: "The command that was run to generate this event."
-				type: array: {
-					items: type: string: {
-						examples: ["echo", "Hello World!", "ls", "-la"]
+				command: {
+					required:    true
+					description: "The command that was run to generate this event."
+					type: array: {
+						items: type: string: {
+							examples: ["echo", "Hello World!", "ls", "-la"]
+						}
 					}
 				}
-			}
-			source_type: {
-				description: "The name of the source type."
-				required:    true
-				type: string: {
-					examples: ["exec"]
+				source_type: {
+					description: "The name of the source type."
+					required:    true
+					type: string: {
+						examples: ["exec"]
+					}
 				}
 			}
 		}
+		metrics: "": {
+			description: "The input `metric` event."
+		}
+		traces: "": {
+			description: "The input `trace` event."
+		}
 	}
 
 	examples: [
diff --git a/website/cue/reference/components/sources/file_descriptor.cue b/website/cue/reference/components/sources/file_descriptor.cue
index ee86f0063e24e..5a7e7ab1a79b6 100644
--- a/website/cue/reference/components/sources/file_descriptor.cue
+++ b/website/cue/reference/components/sources/file_descriptor.cue
@@ -42,12 +42,20 @@ components: sources: file_descriptor: {
 
 	configuration: base.components.sources.file_descriptor.configuration
 
-	output: logs: line: {
-		description: "An individual event from the file descriptor."
-		fields: {
-			host:      fields._local_host
-			message:   fields._raw_line
-			timestamp: fields._current_timestamp
+	output: {
+		logs: line: {
+			description: "An individual event from the file descriptor."
+			fields: {
+				host:      fields._local_host
+				message:   fields._raw_line
+				timestamp: fields._current_timestamp
+			}
+		}
+		metrics: "": {
+			description: "The input `metric` event."
+		}
+		traces: "": {
+			description: "The input `trace` event."
 		}
 	}
 
diff --git a/website/cue/reference/components/sources/http_server.cue b/website/cue/reference/components/sources/http_server.cue
index 37f24eccd017d..15228e6de6b1c 100644
--- a/website/cue/reference/components/sources/http_server.cue
+++ b/website/cue/reference/components/sources/http_server.cue
@@ -58,55 +58,63 @@ components: sources: http_server: {
 
 	configuration: base.components.sources.http_server.configuration
 
-	output: logs: {
-		text: {
-			description: "An individual line from a `text/plain` request"
-			fields: {
-				message: {
-					description:   "The raw line from the incoming payload."
-					relevant_when: "encoding == \"text\""
-					required:      true
-					type: string: {
-						examples: ["Hello world"]
+	output: {
+		logs: {
+			text: {
+				description: "An individual line from a `text/plain` request"
+				fields: {
+					message: {
+						description:   "The raw line from the incoming payload."
+						relevant_when: "encoding == \"text\""
+						required:      true
+						type: string: {
+							examples: ["Hello world"]
+						}
 					}
-				}
-				path: {
-					description: "The HTTP path the event was received from. The key can be changed using the `path_key` configuration setting"
-					required:    true
-					type: string: {
-						examples: ["/", "/logs/event712"]
+					path: {
+						description: "The HTTP path the event was received from. The key can be changed using the `path_key` configuration setting"
+						required:    true
+						type: string: {
+							examples: ["/", "/logs/event712"]
+						}
 					}
-				}
-				source_type: {
-					description: "The name of the source type."
-					required:    true
-					type: string: {
-						examples: ["http_server"]
+					source_type: {
+						description: "The name of the source type."
+						required:    true
+						type: string: {
+							examples: ["http_server"]
+						}
 					}
+					timestamp: fields._current_timestamp
 				}
-				timestamp: fields._current_timestamp
 			}
-		}
-		structured: {
-			description: "An individual line from an `application/json` request"
-			fields: {
-				"*": {
-					common:        false
-					description:   "Any field contained in your JSON payload"
-					relevant_when: "encoding != \"text\""
-					required:      false
-					type: "*": {}
-				}
-				path: {
-					description: "The HTTP path the event was received from. The key can be changed using the `path_key` configuration setting"
-					required:    true
-					type: string: {
-						examples: ["/", "/logs/event712"]
+			structured: {
+				description: "An individual line from an `application/json` request"
+				fields: {
+					"*": {
+						common:        false
+						description:   "Any field contained in your JSON payload"
+						relevant_when: "encoding != \"text\""
+						required:      false
+						type: "*": {}
 					}
+					path: {
+						description: "The HTTP path the event was received from. The key can be changed using the `path_key` configuration setting"
+						required:    true
+						type: string: {
+							examples: ["/", "/logs/event712"]
+						}
+					}
+					timestamp: fields._current_timestamp
 				}
-				timestamp: fields._current_timestamp
 			}
 		}
+		metrics: "": {
+			description: "The input `metric` event."
+		}
+		traces: "": {
+			description: "The input `trace` event."
+		}
 	}
 
 	examples: [
diff --git a/website/cue/reference/components/sources/kafka.cue b/website/cue/reference/components/sources/kafka.cue
index 5a3b17a2d32fa..f00e4cdcb4997 100644
--- a/website/cue/reference/components/sources/kafka.cue
+++ b/website/cue/reference/components/sources/kafka.cue
@@ -41,49 +41,57 @@ components: sources: kafka: {
 
 	configuration: base.components.sources.kafka.configuration
 
-	output: logs: record: {
-		description: "An individual Kafka record"
-		fields: {
-			message: {
-				description: "The raw line from the Kafka record."
-				required:    true
-				type: string: {
-					examples: ["53.126.150.246 - - [01/Oct/2020:11:25:58 -0400] \"GET /disintermediate HTTP/2.0\" 401 20308"]
+	output: {
+		logs: record: {
+			description: "An individual Kafka record"
+			fields: {
+				message: {
+					description: "The raw line from the Kafka record."
+					required:    true
+					type: string: {
+						examples: ["53.126.150.246 - - [01/Oct/2020:11:25:58 -0400] \"GET /disintermediate HTTP/2.0\" 401 20308"]
+					}
 				}
-			}
-			offset: {
-				description: "The Kafka offset at the time the record was retrieved."
-				required:    true
-				type: uint: {
-					examples: [100]
-					unit: null
+				offset: {
+					description: "The Kafka offset at the time the record was retrieved."
+					required:    true
+					type: uint: {
+						examples: [100]
+						unit: null
+					}
 				}
-			}
-			partition: {
-				description: "The Kafka partition that the record came from."
-				required:    true
-				type: string: {
-					examples: ["partition"]
+				partition: {
+					description: "The Kafka partition that the record came from."
+					required:    true
+					type: string: {
+						examples: ["partition"]
+					}
 				}
-			}
-			source_type: {
-				description: "The name of the source type."
-				required:    true
-				type: string: {
-					examples: ["kafka"]
+				source_type: {
+					description: "The name of the source type."
+					required:    true
+					type: string: {
+						examples: ["kafka"]
+					}
 				}
-			}
-			timestamp: fields._current_timestamp & {
-				description: "The timestamp encoded in the Kafka message or the current time if it cannot be fetched."
-			}
-			topic: {
-				description: "The Kafka topic that the record came from."
-				required:    true
-				type: string: {
-					examples: ["topic"]
+				timestamp: fields._current_timestamp & {
+					description: "The timestamp encoded in the Kafka message or the current time if it cannot be fetched."
+				}
+				topic: {
+					description: "The Kafka topic that the record came from."
+					required:    true
+					type: string: {
+						examples: ["topic"]
+					}
 				}
 			}
 		}
+		metrics: "": {
+			description: "The input `metric` event."
+		}
+		traces: "": {
+			description: "The input `trace` event."
+		}
 	}
 
 	telemetry: metrics: {
diff --git a/website/cue/reference/components/sources/mqtt.cue b/website/cue/reference/components/sources/mqtt.cue
index 8cdf9b7429b55..0a057cc71b7bb 100644
--- a/website/cue/reference/components/sources/mqtt.cue
+++ b/website/cue/reference/components/sources/mqtt.cue
@@ -58,29 +58,37 @@ components: sources: mqtt: {
 		platform_name: null
 	}
 
-	output: logs: record: {
-		description: "An individual MQTT message."
-		fields: {
-			message: {
-				description: "The raw line from the MQTT message."
-				required:    true
-				type: string: {
-					examples: ["53.126.150.246 - - [01/Oct/2020:11:25:58 -0400] \"GET /disintermediate HTTP/2.0\" 401 20308"]
-					syntax: "literal"
+	output: {
+		logs: record: {
+			description: "An individual MQTT message."
+			fields: {
+				message: {
+					description: "The raw line from the MQTT message."
+					required:    true
+					type: string: {
+						examples: ["53.126.150.246 - - [01/Oct/2020:11:25:58 -0400] \"GET /disintermediate HTTP/2.0\" 401 20308"]
+						syntax: "literal"
+					}
 				}
-			}
-			timestamp: fields._current_timestamp & {
-				description: "The current time when the message has been received."
-			}
-			topic: {
-				description: "The MQTT topic that the message came from."
-				required:    true
-				type: string: {
-					examples: ["topic/logs"]
-					syntax: "literal"
+				timestamp: fields._current_timestamp & {
+					description: "The current time when the message has been received."
+				}
+				topic: {
+					description: "The MQTT topic that the message came from."
+					required:    true
+					type: string: {
+						examples: ["topic/logs"]
+						syntax: "literal"
+					}
 				}
 			}
 		}
+		metrics: "": {
+			description: "The input `metric` event."
+		}
+		traces: "": {
+			description: "The input `trace` event."
+		}
 	}
 
 	how_it_works: components._amqp.how_it_works
diff --git a/website/cue/reference/components/sources/nats.cue b/website/cue/reference/components/sources/nats.cue
index f9f3c3819b73a..5f7b58cf1169b 100644
--- a/website/cue/reference/components/sources/nats.cue
+++ b/website/cue/reference/components/sources/nats.cue
@@ -41,31 +41,39 @@ components: sources: nats: {
 
 	configuration: base.components.sources.nats.configuration
 
-	output: logs: record: {
-		description: "An individual NATS record."
-		fields: {
-			message: {
-				description: "The raw line from the NATS message."
-				required:    true
-				type: string: {
-					examples: ["53.126.150.246 - - [01/Oct/2020:11:25:58 -0400] \"GET /disintermediate HTTP/2.0\" 401 20308"]
+	output: {
+		logs: record: {
+			description: "An individual NATS record."
+			fields: {
+				message: {
+					description: "The raw line from the NATS message."
+					required:    true
+					type: string: {
+						examples: ["53.126.150.246 - - [01/Oct/2020:11:25:58 -0400] \"GET /disintermediate HTTP/2.0\" 401 20308"]
+					}
 				}
-			}
-			source_type: {
-				description: "The name of the source type."
-				required:    true
-				type: string: {
-					examples: ["nats"]
+				source_type: {
+					description: "The name of the source type."
+					required:    true
+					type: string: {
+						examples: ["nats"]
+					}
 				}
-			}
-			subject: {
-				description: "The subject from the NATS message."
-				required:    true
-				type: string: {
-					examples: ["nats.subject"]
+				subject: {
+					description: "The subject from the NATS message."
+					required:    true
+					type: string: {
+						examples: ["nats.subject"]
+					}
 				}
 			}
 		}
+		metrics: "": {
+			description: "The input `metric` event."
+		}
+		traces: "": {
+			description: "The input `trace` event."
+		}
 	}
 
 	how_it_works: components._nats.how_it_works
diff --git a/website/cue/reference/components/sources/opentelemetry.cue b/website/cue/reference/components/sources/opentelemetry.cue
index fb114c1a64151..0e985701c806a 100644
--- a/website/cue/reference/components/sources/opentelemetry.cue
+++ b/website/cue/reference/components/sources/opentelemetry.cue
@@ -240,6 +240,12 @@ components: sources: opentelemetry: {
 				}
 			}
 		}
+		metrics: "": {
+			description: "The input `metric` event."
+		}
+		traces: "": {
+			description: "The input `trace` event."
+		}
 	}
 
 	how_it_works: {
diff --git a/website/cue/reference/components/sources/pulsar.cue b/website/cue/reference/components/sources/pulsar.cue
index c3ff06743eec2..a499e82752521 100644
--- a/website/cue/reference/components/sources/pulsar.cue
+++ b/website/cue/reference/components/sources/pulsar.cue
@@ -120,44 +120,52 @@ components: sources: pulsar: {
 		}
 	}
 
-	output: logs: record: {
-		description: "An individual Pulsar record"
-		fields: {
-			message: {
-				description: "The raw line from the Kafka record."
-				required:    true
-				type: string: {
-					examples: ["53.126.150.246 - - [01/Oct/2020:11:25:58 -0400] \"GET /disintermediate HTTP/2.0\" 401 20308"]
+	output: {
+		logs: record: {
+			description: "An individual Pulsar record"
+			fields: {
+				message: {
+					description: "The raw line from the Kafka record."
+					required:    true
+					type: string: {
+						examples: ["53.126.150.246 - - [01/Oct/2020:11:25:58 -0400] \"GET /disintermediate HTTP/2.0\" 401 20308"]
+					}
 				}
-			}
-			source_type: {
-				description: "The name of the source type."
-				required:    true
-				type: string: {
-					examples: ["pulsar"]
+				source_type: {
+					description: "The name of the source type."
+					required:    true
+					type: string: {
+						examples: ["pulsar"]
+					}
 				}
-			}
-			timestamp: fields._current_timestamp & {
-				description: "The current time if it cannot be fetched."
-			}
-			publish_time: fields._current_timestamp & {
-				description: "The timestamp encoded in the Pulsar message."
-			}
-			topic: {
-				description: "The Pulsar topic that the record came from."
-				required:    true
-				type: string: {
-					examples: ["topic"]
+				timestamp: fields._current_timestamp & {
+					description: "The current time if it cannot be fetched."
 				}
-			}
-			producer_name: {
-				description: "The Pulsar producer's name which the record came from."
-				required:    true
-				type: string: {
-					examples: ["pulsar-client"]
+				publish_time: fields._current_timestamp & {
+					description: "The timestamp encoded in the Pulsar message."
+				}
+				topic: {
+					description: "The Pulsar topic that the record came from."
+					required:    true
+					type: string: {
+						examples: ["topic"]
+					}
+				}
+				producer_name: {
+					description: "The Pulsar producer's name which the record came from."
+					required:    true
+					type: string: {
+						examples: ["pulsar-client"]
+					}
 				}
 			}
 		}
+		metrics: "": {
+			description: "The input `metric` event."
+		}
+		traces: "": {
+			description: "The input `trace` event."
+		}
 	}
 
 	telemetry: metrics: {
diff --git a/website/cue/reference/components/sources/redis.cue b/website/cue/reference/components/sources/redis.cue
index d395b233d2d3d..081ed24f08dd4 100644
--- a/website/cue/reference/components/sources/redis.cue
+++ b/website/cue/reference/components/sources/redis.cue
@@ -60,29 +60,37 @@ components: sources: redis: {
 
 	configuration: base.components.sources.redis.configuration
 
-	output: logs: record: {
-		description: "An individual Redis record"
-		fields: {
-			host:      fields._local_host
-			message:   fields._raw_line
-			timestamp: fields._current_timestamp
-			source_type: {
-				description: "The name of the source type."
-				required:    true
-				type: string: {
-					examples: ["redis"]
+	output: {
+		logs: record: {
+			description: "An individual Redis record"
+			fields: {
+				host:      fields._local_host
+				message:   fields._raw_line
+				timestamp: fields._current_timestamp
+				source_type: {
+					description: "The name of the source type."
+					required:    true
+					type: string: {
+						examples: ["redis"]
+					}
 				}
-			}
-			redis_key: {
-				description: "The Redis key the event came from"
-				required:    false
-				common:      false
-				type: string: {
-					examples: ["some_key"]
-					default: null
+				redis_key: {
+					description: "The Redis key the event came from"
+					required:    false
+					common:      false
+					type: string: {
+						examples: ["some_key"]
+						default: null
+					}
 				}
 			}
 		}
+		metrics: "": {
+			description: "The input `metric` event."
+		}
+		traces: "": {
+			description: "The input `trace` event."
+		}
 	}
 
 	how_it_works: {
diff --git a/website/cue/reference/components/sources/socket.cue b/website/cue/reference/components/sources/socket.cue
index a417ba8c065cb..569003f6e7636 100644
--- a/website/cue/reference/components/sources/socket.cue
+++ b/website/cue/reference/components/sources/socket.cue
@@ -58,36 +58,44 @@ components: sources: socket: {
 
 	configuration: base.components.sources.socket.configuration
 
-	output: logs: line: {
-		description: "A single socket event."
-		fields: {
-			host: {
-				description: "The peer host IP address."
-				required:    true
-				type: string: {
-					examples: ["129.21.31.122"]
+	output: {
+		logs: line: {
+			description: "A single socket event."
+			fields: {
+				host: {
+					description: "The peer host IP address."
+					required:    true
+					type: string: {
+						examples: ["129.21.31.122"]
+					}
 				}
-			}
-			message:   fields._raw_line
-			timestamp: fields._current_timestamp
-			source_type: {
-				description: "The name of the source type."
-				required:    true
-				type: string: {
-					examples: ["socket"]
+				message:   fields._raw_line
+				timestamp: fields._current_timestamp
+				source_type: {
+					description: "The name of the source type."
+					required:    true
+					type: string: {
+						examples: ["socket"]
+					}
 				}
-			}
-			port: {
-				description: "The peer source port."
-				required:    false
-				common:      true
-				type: uint: {
-					default: null
-					unit:    null
-					examples: [2838]
+				port: {
+					description: "The peer source port."
+					required:    false
+					common:      true
+					type: uint: {
+						default: null
+						unit:    null
+						examples: [2838]
+					}
 				}
+				client_metadata: fields._client_metadata
 			}
-			client_metadata: fields._client_metadata
+		}
+		metrics: "": {
+			description: "The input `metric` event."
+		}
+		traces: "": {
+			description: "The input `trace` event."
 		}
 	}
 
diff --git a/website/cue/reference/components/sources/stdin.cue b/website/cue/reference/components/sources/stdin.cue
index f99622103123b..d7ae3b46d533d 100644
--- a/website/cue/reference/components/sources/stdin.cue
+++ b/website/cue/reference/components/sources/stdin.cue
@@ -42,20 +42,28 @@ components: sources: stdin: {
 
 	configuration: base.components.sources.stdin.configuration
 
-	output: logs: line: {
-		description: "An individual event from STDIN."
-		fields: {
-			host:      fields._local_host
-			message:   fields._raw_line
-			timestamp: fields._current_timestamp
-			source_type: {
-				description: "The name of the source type."
-				required:    true
-				type: string: {
-					examples: ["stdin"]
+	output: {
+		logs: line: {
+			description: "An individual event from STDIN."
+			fields: {
+				host:      fields._local_host
+				message:   fields._raw_line
+				timestamp: fields._current_timestamp
+				source_type: {
+					description: "The name of the source type."
+					required:    true
+					type: string: {
+						examples: ["stdin"]
+					}
 				}
 			}
 		}
+		metrics: "": {
+			description: "The input `metric` event."
+		}
+		traces: "": {
+			description: "The input `trace` event."
+		}
 	}
 
 	examples: [
diff --git a/website/cue/reference/components/sources/vector.cue b/website/cue/reference/components/sources/vector.cue
index bccc77d956b66..8fc667e2299f6 100644
--- a/website/cue/reference/components/sources/vector.cue
+++ b/website/cue/reference/components/sources/vector.cue
@@ -97,6 +97,9 @@ components: sources: vector: {
 				tags: _extra_tags
 			}
 		}
+		traces: "": {
+			description: "The input `trace` event."
+		}
 	}
 
 	telemetry: metrics: {

From 150208ab6af00f80e0d5a71a8b4f48e106c51cba Mon Sep 17 00:00:00 2001
From: Thomas <thomas.schneider@datadoghq.com>
Date: Wed, 25 Jun 2025 16:48:47 -0400
Subject: [PATCH 111/305] fix(ci): K8S E2E tests skipping changes.yml in MQ
 (#23268)

* fix(ci): K8S E2E tests skipping changes.yaml in MQ

* Use same logic as in test.yaml

* Fix nesting/checkout

* Take into account MQ triggers

* Simplify changes

* Fix website_only output path

* Add debug step

* Revert "Add debug step"

This reverts commit f52320cb1829bff1d2b3b8522ed93a1a7b0683fd.

* Revert "Revert "Add debug step""

This reverts commit ad2bf8f95747856c3d9dc6f018c0b16b872f4317.

* Fix website_only in changes.yml

* || -> &&

* Revert "Revert "Revert "Add debug step"""

This reverts commit 11ac5e725bb76af63a82130aad4807a3925e2f83.
---
 .github/workflows/changes.yml |  5 +++--
 .github/workflows/k8s_e2e.yml | 12 ++++++------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/changes.yml b/.github/workflows/changes.yml
index 458fc7beeadf1..14da9b7490e67 100644
--- a/.github/workflows/changes.yml
+++ b/.github/workflows/changes.yml
@@ -44,6 +44,8 @@ on:
         value: ${{ jobs.source.outputs.install }}
       k8s:
         value: ${{ jobs.source.outputs.k8s }}
+      website_only:
+        value: ${{ jobs.source.outputs.website_only }}
       all-int:
         value: ${{ jobs.int_tests.outputs.all-tests }}
       amqp:
@@ -141,7 +143,7 @@ jobs:
       markdown: ${{ steps.filter.outputs.markdown }}
       install: ${{ steps.filter.outputs.install }}
       k8s: ${{ steps.filter.outputs.k8s }}
-      website_only: ${{ steps.filter.outputs.website == 'true' && steps.filter.outputs.other == 'false' }}
+      website_only: ${{ steps.filter.outputs.website == 'true' && steps.filter.outputs.not_website == 'false' }}
     steps:
     - uses: actions/checkout@v4
 
@@ -198,7 +200,6 @@ jobs:
             - "src/sources/kubernetes_logs/**"
           website:
             - "website/**"
-          # any change _not_ under website/
           not_website:
             - "**"
             - "!website/**"
diff --git a/.github/workflows/k8s_e2e.yml b/.github/workflows/k8s_e2e.yml
index e9bdff7250e8f..67499caa7b70c 100644
--- a/.github/workflows/k8s_e2e.yml
+++ b/.github/workflows/k8s_e2e.yml
@@ -53,11 +53,11 @@ env:
 jobs:
   changes:
     # Only evaluate files changed on pull request trigger
-    if: github.event_name == 'pull_request'
+    if: ${{ github.event_name == 'pull_request' || github.event_name == 'merge_group' }}
     uses: ./.github/workflows/changes.yml
     with:
-      base_ref: ${{ github.event.pull_request.base.ref }}
-      head_ref: ${{ github.event.pull_request.head.ref }}
+      base_ref: ${{ github.event.merge_group.base_ref || github.event.pull_request.base.ref }}
+      head_ref: ${{ github.event.merge_group.head_ref || github.event.pull_request.head.ref }}
     secrets: inherit
 
   build-x86_64-unknown-linux-gnu:
@@ -65,8 +65,8 @@ jobs:
     runs-on: ubuntu-24.04
     timeout-minutes: 45
     needs: changes
-    # Run this job even if `changes` job is skipped (non- pull request trigger)
-    if: ${{ !failure() && !cancelled() && (github.event_name != 'pull_request' || needs.changes.outputs.k8s == 'true') && needs.changes.website_only != 'true' }}
+    # Run this job even if `changes` job is skipped
+    if: ${{ !failure() && !cancelled() && needs.changes.outputs.website_only != 'true' && needs.changes.outputs.k8s != 'false' }}
     # cargo-deb requires a release build, but we don't need optimizations for tests
     env:
       CARGO_PROFILE_RELEASE_OPT_LEVEL: 0
@@ -130,7 +130,7 @@ jobs:
     timeout-minutes: 5
     needs: changes
     # Run this job even if `changes` job is skipped
-    if: ${{ !failure() && !cancelled() && (github.event_name != 'pull_request' || needs.changes.outputs.k8s == 'true') && needs.changes.website_only != 'true' }}
+    if: ${{ !failure() && !cancelled() && needs.changes.outputs.website_only != 'true' && needs.changes.outputs.k8s != 'false' }}
     outputs:
       matrix: ${{ steps.set-matrix.outputs.matrix }}
     steps:

From 2a6cea60559b7241d336990156530458bbafcf04 Mon Sep 17 00:00:00 2001
From: Pavlos Rontidis <pavlos.rontidis@gmail.com>
Date: Thu, 26 Jun 2025 10:13:05 -0400
Subject: [PATCH 112/305] chore(releasing): fix minor release notes

---
 .github/ISSUE_TEMPLATE/minor-release.md | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/minor-release.md b/.github/ISSUE_TEMPLATE/minor-release.md
index 4958ea7012455..536adc34eb2d2 100644
--- a/.github/ISSUE_TEMPLATE/minor-release.md
+++ b/.github/ISSUE_TEMPLATE/minor-release.md
@@ -8,15 +8,14 @@ labels: "domain: releasing"
 
 # Setup and Automation
 
-Note the preparation steps are now automated. You can run:
+Note the preparation steps are now automated. First, prepare your environment:
 
 ```shell
 export NEW_VERSION=<new Vector version> # replace this with the actual new version
-export MINOR_VERSION=$(echo "$NEW_VERSION" | cut -d. -f2)
+export MINOR_VERSION=$(echo "NEW_VECTOR_VERSION" | cut -d. -f2)
 export PREP_BRANCH=prepare-v-0-"${MINOR_VERSION}"-"${NEW_VERSION}"-website
 export RELEASE_BRANCH=v0."${MINOR_VERSION}"
 export NEW_VRL_VERSION=<new VRL version> # replace this with the actual new VRL version
-vdev release prepare --version "${NEW_VERSION}" --vrl-version "${NEW_VRL_VERSION}"
 ```
 
 # The week before the release
@@ -31,7 +30,7 @@ vdev release prepare --version "${NEW_VERSION}" --vrl-version "${NEW_VRL_VERSION
 Run the following:
 
 ```shell
-vdev release prepare --version "${NEW_VERSION_NUMBER}" --vrl-version NEW_VRL_VERSION
+cargo vdev release prepare --version "${NEW_VECTOR_VERSION}" --vrl-version "${NEW_VRL_VERSION}"
 ```
 
 Automated steps include:
@@ -56,7 +55,7 @@ Automated steps include:
 
 ## 3. Manual Steps
 
-- [ ] Edit `website/cue/reference/releases/"${NEW_VERSION_NUMBER}".cue`
+- [ ] Edit `website/cue/reference/releases/"${NEW_VECTOR_VERSION}".cue`
   - [ ] Add description key to the generated cue file with a description of the release (see
         previous releases for examples).
   - [ ] Ensure any breaking changes are highlighted in the release upgrade guide
@@ -75,8 +74,8 @@ Automated steps include:
 - [ ] Merge release preparation branch into the release branch
     - `git switch "${RELEASE_BRANCH}" && git merge --ff-only "${PREP_BRANCH}"`
 - [ ] Tag new release
-  - [ ] `git tag v"${NEW_VERSION_NUMBER}" -a -m v"${NEW_VERSION_NUMBER}"`
-  - [ ] `git push origin v"${NEW_VERSION_NUMBER}"`
+  - [ ] `git tag v"${NEW_VECTOR_VERSION}" -a -m v"${NEW_VECTOR_VERSION}"`
+  - [ ] `git push origin v"${NEW_VECTOR_VERSION}"`
 - [ ] Wait for release workflow to complete
   - Discoverable via [https://github.com/timberio/vector/actions/workflows/release.yml](https://github.com/timberio/vector/actions/workflows/release.yml)
 - [ ] Reset the `website` branch to the `HEAD` of the release branch to update https://vector.dev
@@ -85,7 +84,7 @@ Automated steps include:
     - The deployment is done by Amplify. You can see
       the [deployment logs here](https://dd-corpsite.datadoghq.com/logs?query=service%3Awebsites-vector%20branch%3Awebsite&agg_m=count&agg_m_source=base&agg_t=count&cols=host%2Cservice&fromUser=true&messageDisplay=inline&refresh_mode=sliding&storage=hot&stream_sort=time%2Casc&viz=stream).
 - [ ] Release Linux packages. See [`vector-release` usage](https://github.com/DataDog/vector-release#usage).
-  - Note: the pipeline inputs are the version number `v"${NEW_VERSION_NUMBER}"` and a personal GitHub token.
+  - Note: the pipeline inputs are the version number `v"${NEW_VECTOR_VERSION}"` and a personal GitHub token.
   - [ ] Manually trigger the `trigger-package-release-pipeline-prod-stable` job.
 - [ ] Release updated Helm chart. See [releasing Helm chart](https://github.com/vectordotdev/helm-charts#releasing).
 - [ ] Once Helm chart is released, updated Vector manifests

From 022c840ebe1c3ef6e506bd9d9c1b596c7624f610 Mon Sep 17 00:00:00 2001
From: Pavlos Rontidis <pavlos.rontidis@gmail.com>
Date: Thu, 26 Jun 2025 09:19:22 -0400
Subject: [PATCH 113/305] fix(ci): remove unusued all-tests placeholder
 (#23269)

* fix(ci): remove unusued all-tests placeholder

* delete a few more

* fix merge
---
 .github/workflows/changes.yml               | 11 ++---------
 .github/workflows/e2e.yml                   | 12 +++++-------
 .github/workflows/integration.yml           |  2 +-
 vdev/src/commands/compose_tests/ci_paths.rs |  5 -----
 4 files changed, 8 insertions(+), 22 deletions(-)

diff --git a/.github/workflows/changes.yml b/.github/workflows/changes.yml
index 14da9b7490e67..16520fe306b87 100644
--- a/.github/workflows/changes.yml
+++ b/.github/workflows/changes.yml
@@ -40,14 +40,12 @@ on:
         value: ${{ jobs.source.outputs.component_docs }}
       markdown:
         value: ${{ jobs.source.outputs.markdown }}
+      website_only:
+        value: ${{ jobs.source.outputs.website_only }}
       install:
         value: ${{ jobs.source.outputs.install }}
       k8s:
         value: ${{ jobs.source.outputs.k8s }}
-      website_only:
-        value: ${{ jobs.source.outputs.website_only }}
-      all-int:
-        value: ${{ jobs.int_tests.outputs.all-tests }}
       amqp:
         value: ${{ jobs.int_tests.outputs.amqp }}
       appsignal:
@@ -121,8 +119,6 @@ on:
       all-changes-json:
         value: ${{ jobs.int_tests.outputs.all-changes-json }}
       # e2e tests
-      all-e2e:
-        value: ${{ jobs.e2e_tests.outputs.all-tests }}
       e2e-datadog-logs:
         value: ${{ jobs.e2e_tests.outputs.datadog-logs }}
       e2e-datadog-metrics:
@@ -173,7 +169,6 @@ jobs:
             - 'Cargo.toml'
             - 'Cargo.lock'
             - 'rust-toolchain.toml'
-            - '.github/workflows/pr.yml'
             - 'Makefile'
             - 'scripts/cross/**'
             - "vdev/**"
@@ -210,7 +205,6 @@ jobs:
     timeout-minutes: 5
     if: ${{ inputs.int_tests }}
     outputs:
-      all-tests: ${{ steps.filter.outputs.all-tests}}
       amqp: ${{ steps.filter.outputs.amqp }}
       appsignal: ${{ steps.filter.outputs.appsignal}}
       aws: ${{ steps.filter.outputs.aws }}
@@ -323,7 +317,6 @@ jobs:
     timeout-minutes: 5
     if: ${{ inputs.e2e_tests }}
     outputs:
-      all-tests: ${{ steps.filter.outputs.all-tests}}
       datadog-logs: ${{ steps.filter.outputs.datadog-logs }}
       datadog-metrics: ${{ steps.filter.outputs.datadog-metrics }}
     steps:
diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
index e5d322d2b8cc9..36d6d5e99cd6e 100644
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -56,11 +56,9 @@ jobs:
     timeout-minutes: 45
     needs: changes
     if: always() && (
-      github.event_name == 'schedule' || (
-          needs.changes.outputs.all-e2e == 'true'
-            || needs.changes.outputs.e2e-datadog-logs == 'true'
-            || needs.changes.outputs.e2e-datadog-metrics == 'true'
-        )
+      github.event_name == 'schedule' ||
+      needs.changes.outputs.e2e-datadog-logs == 'true' ||
+      needs.changes.outputs.e2e-datadog-metrics == 'true'
       )
     steps:
       - uses: actions/checkout@v4
@@ -82,7 +80,7 @@ jobs:
             echo "PR_HAS_ACCESS_TO_SECRETS=false" >> "$GITHUB_ENV"
           fi
 
-      - if: (github.event_name == 'schedule' || needs.changes.outputs.all-e2e == 'true' || needs.changes.outputs.e2e-datadog-logs == 'true') &&
+      - if: (github.event_name == 'schedule' || needs.changes.outputs.e2e-datadog-logs == 'true') &&
           (github.event_name != 'pull_request' || env.PR_HAS_ACCESS_TO_SECRETS == 'true')
         name: e2e-datadog-logs
         uses: nick-fields/retry@v3
@@ -91,7 +89,7 @@ jobs:
           max_attempts: 3
           command: bash scripts/int-e2e-test.sh e2e datadog-logs
 
-      - if: (github.event_name == 'schedule' || needs.changes.outputs.all-e2e == 'true' || needs.changes.outputs.e2e-datadog-metrics == 'true') &&
+      - if: (github.event_name == 'schedule' || needs.changes.outputs.e2e-datadog-metrics == 'true') &&
           (github.event_name != 'pull_request' || env.PR_HAS_ACCESS_TO_SECRETS == 'true')
         name: e2e-datadog-metrics
         uses: nick-fields/retry@v3
diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
index 81d12a117a1fa..bc39c0f449c77 100644
--- a/.github/workflows/integration.yml
+++ b/.github/workflows/integration.yml
@@ -152,7 +152,7 @@ jobs:
 
             # Check if any of the three conditions is true
             if [[ "${{ github.event_name }}" == "merge_group" || \
-                  "${{ needs.changes.outputs.all-int }}" == "true" || \
+                  "${{ needs.changes.outputs.dependencies }}" == "true" || \
                   "$should_run" == "true" ]]; then
               echo "Running test for ${{ matrix.service }}"
               bash scripts/int-e2e-test.sh int ${{ matrix.service }}
diff --git a/vdev/src/commands/compose_tests/ci_paths.rs b/vdev/src/commands/compose_tests/ci_paths.rs
index 94cdc411c7013..d384f986605b9 100644
--- a/vdev/src/commands/compose_tests/ci_paths.rs
+++ b/vdev/src/commands/compose_tests/ci_paths.rs
@@ -3,9 +3,6 @@ use anyhow::Result;
 use crate::testing::config::ComposeTestConfig;
 
 pub(crate) fn exec(path: &str) -> Result<()> {
-    // placeholder for changes that should run all integration tests
-    println!("all-tests: []");
-
     // paths for each integration are defined in their respective config files.
     for (test_name, config) in ComposeTestConfig::collect_all(path)? {
         if let Some(paths) = config.paths {
@@ -13,8 +10,6 @@ pub(crate) fn exec(path: &str) -> Result<()> {
             for path in paths {
                 println!("- {path:?}");
             }
-            println!("- Cargo.toml");
-            println!("- Cargo.lock");
         }
     }
 

From 1357e1a3ab03e044e5aad33210898229a823dc20 Mon Sep 17 00:00:00 2001
From: Pavlos Rontidis <pavlos.rontidis@gmail.com>
Date: Thu, 26 Jun 2025 11:53:18 -0400
Subject: [PATCH 114/305] chore(vdev): use git2 for some git operations
 (#23270)

* chore(vdev): use git2 for some git operations

* review feedback

* clippy fix
---
 Cargo.lock      | 44 ++++++++++++++++++++++++++++++++++++++++++++
 vdev/Cargo.toml |  1 +
 vdev/src/git.rs | 46 ++++++++++++++++++++++++++++++++++++++--------
 3 files changed, 83 insertions(+), 8 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index afc30a4a95ee4..ad1f96a9851de 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4044,6 +4044,21 @@ version = "0.28.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0"
 
+[[package]]
+name = "git2"
+version = "0.20.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2deb07a133b1520dc1a5690e9bd08950108873d7ed5de38dcc74d3b5ebffa110"
+dependencies = [
+ "bitflags 2.9.0",
+ "libc",
+ "libgit2-sys",
+ "log",
+ "openssl-probe",
+ "openssl-sys",
+ "url",
+]
+
 [[package]]
 name = "glob"
 version = "0.3.2"
@@ -5723,6 +5738,20 @@ dependencies = [
  "rle-decode-fast",
 ]
 
+[[package]]
+name = "libgit2-sys"
+version = "0.18.2+1.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1c42fe03df2bd3c53a3a9c7317ad91d80c81cd1fb0caec8d7cc4cd2bfa10c222"
+dependencies = [
+ "cc",
+ "libc",
+ "libssh2-sys",
+ "libz-sys",
+ "openssl-sys",
+ "pkg-config",
+]
+
 [[package]]
 name = "libm"
 version = "0.2.8"
@@ -5749,6 +5778,20 @@ dependencies = [
  "vcpkg",
 ]
 
+[[package]]
+name = "libssh2-sys"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "220e4f05ad4a218192533b300327f5150e809b54c4ec83b5a1d91833601811b9"
+dependencies = [
+ "cc",
+ "libc",
+ "libz-sys",
+ "openssl-sys",
+ "pkg-config",
+ "vcpkg",
+]
+
 [[package]]
 name = "libz-rs-sys"
 version = "0.5.1"
@@ -11464,6 +11507,7 @@ dependencies = [
  "confy",
  "directories",
  "dunce",
+ "git2",
  "glob",
  "hex",
  "indexmap 2.9.0",
diff --git a/vdev/Cargo.toml b/vdev/Cargo.toml
index 096ae69c0488b..1a7541d111ef9 100644
--- a/vdev/Cargo.toml
+++ b/vdev/Cargo.toml
@@ -36,3 +36,4 @@ tempfile.workspace = true
 toml.workspace = true
 semver.workspace = true
 indoc.workspace = true
+git2 = { version = "0.20.2" }
diff --git a/vdev/src/git.rs b/vdev/src/git.rs
index b5f3dcbfcb9c5..b2f20fc09f524 100644
--- a/vdev/src/git.rs
+++ b/vdev/src/git.rs
@@ -1,8 +1,7 @@
-use std::{collections::HashSet, process::Command};
-
-use anyhow::Result;
-
 use crate::app::CommandExt as _;
+use anyhow::{anyhow, bail, Result};
+use git2::{BranchType, ErrorCode, Repository};
+use std::{collections::HashSet, process::Command};
 
 pub fn current_branch() -> Result<String> {
     let output = run_and_check_output(&["rev-parse", "--abbrev-ref", "HEAD"])?;
@@ -138,11 +137,27 @@ pub fn clone(repo_url: &str) -> Result<String> {
     Command::new("git").args(["clone", repo_url]).check_output()
 }
 
-pub fn branch_exists(branch_name: &str) -> Result<bool> {
-    let output = run_and_check_output(&["rev-parse", "--verify", branch_name])?;
-    Ok(!output.is_empty())
+/// Walks up from the current working directory until it finds a `.git`
+/// and opens that repo.  Panics (Err) if none is found.
+fn find_repo() -> Result<Repository, git2::Error> {
+    Repository::discover(".")
 }
 
+pub fn branch_exists(branch: &str) -> Result<bool> {
+    let repo = find_repo()?;
+
+    // Do the lookup inside its own scope so the temporary Branch<'_> is dropped
+    // before we try to drop `repo` at function exit.
+    let exists = {
+        match repo.find_branch(branch, BranchType::Local) {
+            Ok(_) => true,
+            Err(e) if e.code() == ErrorCode::NotFound => false,
+            Err(e) => bail!(e),
+        }
+    };
+
+    Ok(exists)
+}
 pub fn checkout_branch(branch_name: &str) -> Result<()> {
     let _output = run_and_check_output(&["checkout", branch_name])?;
     Ok(())
@@ -154,7 +169,22 @@ pub fn checkout_main_branch() -> Result<()> {
 }
 
 pub fn create_branch(branch_name: &str) -> Result<()> {
-    let _output = run_and_check_output(&["checkout", "-b", branch_name])?;
+    let repo = find_repo()?;
+
+    let head_ref = repo.head()?;
+    let target_oid = head_ref
+        .target()
+        .ok_or_else(|| anyhow!("HEAD is not pointing at a valid commit"))?;
+    let target_commit = repo.find_commit(target_oid)?;
+
+    let branch = repo.branch(branch_name, &target_commit, false)?;
+    let reference = branch.into_reference();
+    let full_ref_name = reference
+        .name()
+        .ok_or_else(|| git2::Error::from_str("branch reference has no name"))?;
+    repo.set_head(full_ref_name)?;
+    repo.checkout_head(None)?;
+
     Ok(())
 }
 

From d61446d7471c5c469c77d95591fd46f7da12d33f Mon Sep 17 00:00:00 2001
From: Thomas <thomas.schneider@datadoghq.com>
Date: Thu, 26 Jun 2025 12:38:07 -0400
Subject: [PATCH 115/305] chore(ci): use defaults in changes.yml (#23273)

* Use defaults in changes.yml

* Add test changelog

* Revert "Add test changelog"

This reverts commit 2acbe531749b41dd8b07bb5b7ef311f22dc0ca7b.

* Make base_ref/head_ref not required

* pre-compute BASE_REF/HEAD_REF
---
 .github/workflows/changes.yml            | 19 +++++++++++--------
 .github/workflows/e2e.yml                |  2 --
 .github/workflows/integration.yml        |  2 --
 .github/workflows/k8s_e2e.yml            |  3 ---
 .github/workflows/master_merge_queue.yml |  3 ---
 .github/workflows/test.yml               |  3 ---
 6 files changed, 11 insertions(+), 21 deletions(-)

diff --git a/.github/workflows/changes.yml b/.github/workflows/changes.yml
index 16520fe306b87..b22d29b6a76bb 100644
--- a/.github/workflows/changes.yml
+++ b/.github/workflows/changes.yml
@@ -10,10 +10,10 @@ on:
     # merge_group context.
     inputs:
       base_ref:
-        required: true
+        required: false
         type: string
       head_ref:
-        required: true
+        required: false
         type: string
       int_tests:
         required: false
@@ -123,6 +123,9 @@ on:
         value: ${{ jobs.e2e_tests.outputs.datadog-logs }}
       e2e-datadog-metrics:
         value: ${{ jobs.e2e_tests.outputs.datadog-metrics }}
+env:
+  BASE_REF: ${{ inputs.base_ref || (github.event_name == 'merge_group' && github.event.merge_group.base_ref) || github.event.pull_request.base.ref }}
+  HEAD_REF: ${{ inputs.head_ref  || (github.event_name == 'merge_group' && github.event.merge_group.head_ref)  || github.event.pull_request.head.ref }}
 
 jobs:
   # Detects changes that are not specific to integration tests
@@ -146,8 +149,8 @@ jobs:
     - uses: dorny/paths-filter@v3
       id: filter
       with:
-        base: ${{ inputs.base_ref }}
-        ref: ${{ inputs.head_ref }}
+        base: ${{ env.BASE_REF }}
+        ref:  ${{ env.HEAD_REF }}
         filters: |
           source:
             - ".github/workflows/test.yml"
@@ -253,8 +256,8 @@ jobs:
       - uses: dorny/paths-filter@v3
         id: filter
         with:
-          base: ${{ inputs.base_ref }}
-          ref: ${{ inputs.head_ref }}
+          base: ${{ env.BASE_REF }}
+          ref:  ${{ env.HEAD_REF }}
           filters: int_test_filters.yaml
 
       # This JSON hack was introduced because GitHub Actions does not support dynamic expressions in the
@@ -331,6 +334,6 @@ jobs:
       - uses: dorny/paths-filter@v3
         id: filter
         with:
-          base: ${{ inputs.base_ref }}
-          ref: ${{ inputs.head_ref }}
+          base: ${{ env.BASE_REF }}
+          ref:  ${{ env.HEAD_REF }}
           filters: int_test_filters.yaml
diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
index 36d6d5e99cd6e..a002fd583e69e 100644
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -44,8 +44,6 @@ jobs:
     if: github.event_name == 'pull_request'
     uses: ./.github/workflows/changes.yml
     with:
-      base_ref: ${{ github.event.pull_request.base.ref }}
-      head_ref: ${{ github.event.pull_request.head.ref  }}
       source: false
       e2e_tests: true
     secrets: inherit
diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
index bc39c0f449c77..033db95bad1bf 100644
--- a/.github/workflows/integration.yml
+++ b/.github/workflows/integration.yml
@@ -40,8 +40,6 @@ jobs:
     if: github.event_name == 'pull_request' || github.event_name == 'merge_group'
     uses: ./.github/workflows/changes.yml
     with:
-      base_ref: ${{ github.event.pull_request.base.ref || github.event.merge_group.base_ref  }}
-      head_ref: ${{ github.event.pull_request.head.ref || github.event.merge_group.head_ref  }}
       source: false
       int_tests: true
     secrets: inherit
diff --git a/.github/workflows/k8s_e2e.yml b/.github/workflows/k8s_e2e.yml
index 67499caa7b70c..593e5fc63b011 100644
--- a/.github/workflows/k8s_e2e.yml
+++ b/.github/workflows/k8s_e2e.yml
@@ -55,9 +55,6 @@ jobs:
     # Only evaluate files changed on pull request trigger
     if: ${{ github.event_name == 'pull_request' || github.event_name == 'merge_group' }}
     uses: ./.github/workflows/changes.yml
-    with:
-      base_ref: ${{ github.event.merge_group.base_ref || github.event.pull_request.base.ref }}
-      head_ref: ${{ github.event.merge_group.head_ref || github.event.pull_request.head.ref }}
     secrets: inherit
 
   build-x86_64-unknown-linux-gnu:
diff --git a/.github/workflows/master_merge_queue.yml b/.github/workflows/master_merge_queue.yml
index 034eb5914c624..98f5abeacdc90 100644
--- a/.github/workflows/master_merge_queue.yml
+++ b/.github/workflows/master_merge_queue.yml
@@ -49,9 +49,6 @@ jobs:
   changes:
     if: ${{ github.event_name == 'merge_group' }}
     uses: ./.github/workflows/changes.yml
-    with:
-      base_ref: ${{ github.event.merge_group.base_ref }}
-      head_ref: ${{ github.event.merge_group.head_ref }}
     secrets: inherit
 
   test-cli:
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index c30215f33bf49..32804d101565a 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -29,9 +29,6 @@ jobs:
   changes:
     uses: ./.github/workflows/changes.yml
     secrets: inherit
-    with:
-      base_ref: ${{ github.event.merge_group.base_ref || github.event.pull_request.base.ref }}
-      head_ref: ${{ github.event.merge_group.head_ref || github.event.pull_request.head.ref }}
 
   checks:
     name: Checks

From 25354f71c3df586ecc4402b8bc56841d0ad53c25 Mon Sep 17 00:00:00 2001
From: Pavlos Rontidis <pavlos.rontidis@gmail.com>
Date: Thu, 26 Jun 2025 12:59:16 -0400
Subject: [PATCH 116/305] fix(ci): it suite should run when manually evoked
 (#23274)

* fix(ci): it suite should run when manually evoked

* add guard in case changes did not run

* Update .github/workflows/integration.yml

Co-authored-by: Thomas <thomas.schneider@datadoghq.com>

---------

Co-authored-by: Thomas <thomas.schneider@datadoghq.com>
---
 .github/workflows/integration.yml | 45 ++++++-------------------------
 1 file changed, 8 insertions(+), 37 deletions(-)

diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
index 033db95bad1bf..089e3942652d3 100644
--- a/.github/workflows/integration.yml
+++ b/.github/workflows/integration.yml
@@ -44,41 +44,8 @@ jobs:
       int_tests: true
     secrets: inherit
 
-  check-changes:
-    runs-on: ubuntu-latest
-    needs: changes
-    outputs:
-      should_run: ${{ steps.check.outputs.should_run }}
-    steps:
-      - name: Download JSON artifact from changes.yml
-        uses: actions/download-artifact@v4
-        with:
-          name: int_tests_changes
-
-      - name: Check if all values are false
-        id: check
-        run: |
-          # Always run the suite when the PR is in the merge queue
-          if [[ "${{ github.event_name }}" == "merge_group" ]] ; then
-            echo "should_run=true" >> $GITHUB_OUTPUT
-            exit 0
-          fi
-
-          # Check if all values are 'false'
-          json=$(cat int_tests_changes.json)
-          all_false=$(echo "$json" | jq -r 'to_entries | all(.value == false)')
-
-          if [[ "$all_false" == "true" ]]; then
-            echo "No changes detected. Skipping integration tests."
-            echo "should_run=false" >> $GITHUB_OUTPUT
-          else
-            echo "Detected changes. Proceeding with integration tests."
-            echo "should_run=true" >> $GITHUB_OUTPUT
-          fi
-
   check-secrets:
     runs-on: ubuntu-latest
-    needs: check-changes
     outputs:
       can_access_secrets: ${{ steps.secret_check.outputs.can_access_secrets }}
     steps:
@@ -145,11 +112,17 @@ jobs:
           timeout_minutes: 30
           max_attempts: 3
           command: |
-            # Parse the JSON and check if the specific integration test should run.
-            should_run=$(jq '."${{ matrix.service }}"' int_tests_changes.json)
+            if [[ -f int_tests_changes.json ]]; then
+              # Parse the JSON and check if the specific integration test should run.
+              should_run=$(jq -r '."${{ matrix.service }}" // false' int_tests_changes.json)
+            else
+              # The `changes` job did not run (manual run) or the file is missing, default to false.
+              should_run=false
+            fi
 
             # Check if any of the three conditions is true
             if [[ "${{ github.event_name }}" == "merge_group" || \
+                  "${{ github.event_name }}" == "workflow_dispatch" || \
                   "${{ needs.changes.outputs.dependencies }}" == "true" || \
                   "$should_run" == "true" ]]; then
               echo "Running test for ${{ matrix.service }}"
@@ -165,8 +138,6 @@ jobs:
     timeout-minutes: 5
     if: always()
     needs:
-      - changes
-      - check-changes
       - setup
       - integration-tests
     env:

From 889760f4a7942136bbedd3640bf289d11bb8f906 Mon Sep 17 00:00:00 2001
From: Thomas <thomas.schneider@datadoghq.com>
Date: Thu, 26 Jun 2025 14:13:36 -0400
Subject: [PATCH 117/305] chore(dev): fix shebangs (#23276)

Fix shebangs
---
 scripts/ensure-wasm-target-installed.sh       | 2 +-
 scripts/environment/bootstrap-macos.sh        | 2 +-
 scripts/environment/bootstrap-ubuntu-24.04.sh | 2 +-
 scripts/environment/entrypoint.sh             | 2 +-
 scripts/environment/install-protoc.sh         | 2 +-
 scripts/environment/prepare.sh                | 2 +-
 scripts/environment/release-flags.sh          | 2 +-
 scripts/environment/setup-helm.sh             | 2 +-
 vdev/src/commands/meta/install_git_hooks.rs   | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/scripts/ensure-wasm-target-installed.sh b/scripts/ensure-wasm-target-installed.sh
index e80b06c4d3f1c..da89901163941 100644
--- a/scripts/ensure-wasm-target-installed.sh
+++ b/scripts/ensure-wasm-target-installed.sh
@@ -1,4 +1,4 @@
-#! /usr/bin/env bash
+#!/usr/bin/env bash
 
 if [[ "$(rustup target list --installed | grep wasm32-unknown-unknown)" != "wasm32-unknown-unknown" ]] ; then
     echo "wasm32-unknown-unknown target is not installed"
diff --git a/scripts/environment/bootstrap-macos.sh b/scripts/environment/bootstrap-macos.sh
index 32a8fd528e1f0..b1ddf5c58c489 100755
--- a/scripts/environment/bootstrap-macos.sh
+++ b/scripts/environment/bootstrap-macos.sh
@@ -1,4 +1,4 @@
-#! /usr/bin/env bash
+#!/usr/bin/env bash
 set -e -o verbose
 
 brew update
diff --git a/scripts/environment/bootstrap-ubuntu-24.04.sh b/scripts/environment/bootstrap-ubuntu-24.04.sh
index ca481e6219228..df729728b67b7 100755
--- a/scripts/environment/bootstrap-ubuntu-24.04.sh
+++ b/scripts/environment/bootstrap-ubuntu-24.04.sh
@@ -1,4 +1,4 @@
-#! /usr/bin/env bash
+#!/usr/bin/env bash
 # Refer to https://github.com/actions/runner-images/blob/main/images/ubuntu/Ubuntu2404-Readme.md
 # for all runner information such as OS version and installed software.
 
diff --git a/scripts/environment/entrypoint.sh b/scripts/environment/entrypoint.sh
index ae6b55eb1ce55..67121796d5908 100755
--- a/scripts/environment/entrypoint.sh
+++ b/scripts/environment/entrypoint.sh
@@ -1,4 +1,4 @@
-#! /usr/bin/env bash
+#!/usr/bin/env bash
 
 # set HOSTNAME to container id for `cross`
 HOSTNAME="$(head -1 /proc/self/cgroup|cut -d/ -f3)"
diff --git a/scripts/environment/install-protoc.sh b/scripts/environment/install-protoc.sh
index 082c3112e3aa1..dc0eaa09037a2 100755
--- a/scripts/environment/install-protoc.sh
+++ b/scripts/environment/install-protoc.sh
@@ -1,4 +1,4 @@
-#! /usr/bin/env bash
+#!/usr/bin/env bash
 set -o errexit -o verbose
 
 # A parameter can be optionally passed to this script to specify an alternative
diff --git a/scripts/environment/prepare.sh b/scripts/environment/prepare.sh
index fef332b218011..f7ac60391ce1c 100755
--- a/scripts/environment/prepare.sh
+++ b/scripts/environment/prepare.sh
@@ -1,4 +1,4 @@
-#! /usr/bin/env bash
+#!/usr/bin/env bash
 set -e -o verbose
 
 git config --global --add safe.directory /git/vectordotdev/vector
diff --git a/scripts/environment/release-flags.sh b/scripts/environment/release-flags.sh
index 5ccbc70f60866..4115517c437e1 100755
--- a/scripts/environment/release-flags.sh
+++ b/scripts/environment/release-flags.sh
@@ -1,4 +1,4 @@
-#! /usr/bin/env bash
+#!/usr/bin/env bash
 set -e -o verbose
 
 # We want to ensure we're building using "full" release capabilities when possible, which
diff --git a/scripts/environment/setup-helm.sh b/scripts/environment/setup-helm.sh
index 66c919f895c83..a16b731957b3c 100755
--- a/scripts/environment/setup-helm.sh
+++ b/scripts/environment/setup-helm.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -euo pipefail
 
 KUBERNETES_VERSION="v1.18.6"
diff --git a/vdev/src/commands/meta/install_git_hooks.rs b/vdev/src/commands/meta/install_git_hooks.rs
index 6ad9ddef43d89..2182cf87376d1 100644
--- a/vdev/src/commands/meta/install_git_hooks.rs
+++ b/vdev/src/commands/meta/install_git_hooks.rs
@@ -8,7 +8,7 @@ use std::os::unix::fs::PermissionsExt;
 use crate::app;
 use std::path::Path;
 
-const SIGNOFF_HOOK: &str = r#"#!/bin/bash
+const SIGNOFF_HOOK: &str = r#"#!/usr/bin/env bash
 set -euo pipefail
 
 # Automatically sign off your commits.

From 6d484ae90547ebd51ecdee89cb268644b31a4cda Mon Sep 17 00:00:00 2001
From: Thomas <thomas.schneider@datadoghq.com>
Date: Thu, 26 Jun 2025 16:32:43 -0400
Subject: [PATCH 118/305] fix(ci): Use source changes in integration.yml
 (#23278)

* Add source to integration.yml

* Fix dispatch_workflow

* Make checks part of needs

* Touch Cargo.toml

* Compile vdev in setup

* Revert Cargo.toml test

* Remove vdev build

---------

Co-authored-by: Pavlos Rontidis <pavlos.rontidis@gmail.com>
---
 .github/workflows/integration.yml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
index 089e3942652d3..799a88686114d 100644
--- a/.github/workflows/integration.yml
+++ b/.github/workflows/integration.yml
@@ -40,7 +40,7 @@ jobs:
     if: github.event_name == 'pull_request' || github.event_name == 'merge_group'
     uses: ./.github/workflows/changes.yml
     with:
-      source: false
+      source: true
       int_tests: true
     secrets: inherit
 
@@ -53,7 +53,6 @@ jobs:
 
       - name: Determine if secrets are defined (PR author is team member)
         id: secret_check
-        if: ${{ github.event_name == 'pull_request' }}
         env:
           GH_APP_DATADOG_VECTOR_CI_APP_ID: ${{ secrets.GH_APP_DATADOG_VECTOR_CI_APP_ID }}
         run: |
@@ -79,9 +78,11 @@ jobs:
   integration-tests:
     runs-on: ubuntu-24.04
     needs:
+      - changes
       - setup
       - check-secrets
-    if: ${{ needs.check-secrets.outputs.can_access_secrets == 'true' || github.event_name == 'merge_group' }}
+
+    if: ${{ !failure() && !cancelled() && (needs.check-secrets.outputs.can_access_secrets == 'true' || github.event_name == 'merge_group') }}
     strategy:
       matrix:
         # TODO: Add "splunk" back once https://github.com/vectordotdev/vector/issues/22379 is fixed.

From c57aa6e96fd1c4d4d138b6ea9ce1493bd9eeaca9 Mon Sep 17 00:00:00 2001
From: Thomas <thomas.schneider@datadoghq.com>
Date: Thu, 26 Jun 2025 16:34:51 -0400
Subject: [PATCH 119/305] fix!(sources): make heroku_logs and demo_logs only
 output logs (#23279)

* fix(sources): make heroku_logs and demo_logs only output logs

* Add changelog

* Make changelog breaking
---
 .../23279_logs_sources_output_logs.breaking.md   |  4 ++++
 src/sources/demo_logs.rs                         | 13 ++++++++-----
 src/sources/heroku_logs.rs                       | 16 ++++++++--------
 3 files changed, 20 insertions(+), 13 deletions(-)
 create mode 100644 changelog.d/23279_logs_sources_output_logs.breaking.md

diff --git a/changelog.d/23279_logs_sources_output_logs.breaking.md b/changelog.d/23279_logs_sources_output_logs.breaking.md
new file mode 100644
index 0000000000000..e6a747cfc9619
--- /dev/null
+++ b/changelog.d/23279_logs_sources_output_logs.breaking.md
@@ -0,0 +1,4 @@
+Previously heroku_logs and demo_logs could output logs, metrics and traces depending on the decoding. Now they can only output logs.
+This behavior was unintuitive and undocumented.
+
+authors: thomasqueirozb
diff --git a/src/sources/demo_logs.rs b/src/sources/demo_logs.rs
index d4a936dce5a10..91690deaea32e 100644
--- a/src/sources/demo_logs.rs
+++ b/src/sources/demo_logs.rs
@@ -7,15 +7,18 @@ use snafu::Snafu;
 use std::task::Poll;
 use tokio::time::{self, Duration};
 use tokio_util::codec::FramedRead;
-use vector_lib::codecs::{
-    decoding::{DeserializerConfig, FramingConfig},
-    StreamDecodingError,
-};
 use vector_lib::configurable::configurable_component;
 use vector_lib::internal_event::{
     ByteSize, BytesReceived, CountByteSize, InternalEventHandle as _, Protocol,
 };
 use vector_lib::lookup::{owned_value_path, path};
+use vector_lib::{
+    codecs::{
+        decoding::{DeserializerConfig, FramingConfig},
+        StreamDecodingError,
+    },
+    config::DataType,
+};
 use vector_lib::{
     config::{LegacyKey, LogNamespace},
     EstimatedJsonEncodedSizeOf,
@@ -330,7 +333,7 @@ impl SourceConfig for DemoLogsConfig {
             );
 
         vec![SourceOutput::new_maybe_logs(
-            self.decoding.output_type(),
+            DataType::Log,
             schema_definition,
         )]
     }
diff --git a/src/sources/heroku_logs.rs b/src/sources/heroku_logs.rs
index c86dec895eb7a..e6bcfe1a842f0 100644
--- a/src/sources/heroku_logs.rs
+++ b/src/sources/heroku_logs.rs
@@ -9,11 +9,14 @@ use bytes::{Buf, BufMut, Bytes, BytesMut};
 use chrono::{DateTime, Utc};
 use smallvec::SmallVec;
 use tokio_util::codec::Decoder as _;
-use vector_lib::codecs::{
-    decoding::{DeserializerConfig, FramingConfig},
-    StreamDecodingError,
-};
 use vector_lib::lookup::{lookup_v2::parse_value_path, owned_value_path, path};
+use vector_lib::{
+    codecs::{
+        decoding::{DeserializerConfig, FramingConfig},
+        StreamDecodingError,
+    },
+    config::DataType,
+};
 use vrl::value::{kind::Collection, Kind};
 use warp::http::{HeaderMap, StatusCode};
 
@@ -210,10 +213,7 @@ impl SourceConfig for LogplexConfig {
         // There is a global and per-source `log_namespace` config.
         // The source config overrides the global setting and is merged here.
         let schema_def = self.schema_definition(global_log_namespace.merge(self.log_namespace));
-        vec![SourceOutput::new_maybe_logs(
-            self.decoding.output_type(),
-            schema_def,
-        )]
+        vec![SourceOutput::new_maybe_logs(DataType::Log, schema_def)]
     }
 
     fn resources(&self) -> Vec<Resource> {

From 7f6c41ec69d0f256941be6842a5639e7254850cb Mon Sep 17 00:00:00 2001
From: Thomas <thomas.schneider@datadoghq.com>
Date: Fri, 27 Jun 2025 09:51:13 -0400
Subject: [PATCH 120/305] fix(ci): require changes to run before downloading
 artifacts (#23281)

Require changes before downloading artifacts
---
 .github/workflows/integration.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
index 799a88686114d..584e683aaf1bc 100644
--- a/.github/workflows/integration.yml
+++ b/.github/workflows/integration.yml
@@ -104,6 +104,7 @@ jobs:
 
       - name: Download JSON artifact from changes.yml
         uses: actions/download-artifact@v4
+        needs: changes
         with:
           name: int_tests_changes
 

From d23406eb758f3e4ff165c53efe9f132a62c6b304 Mon Sep 17 00:00:00 2001
From: Pavlos Rontidis <pavlos.rontidis@gmail.com>
Date: Fri, 27 Jun 2025 09:52:15 -0400
Subject: [PATCH 121/305] Revert "fix(ci): require changes to run before
 downloading artifacts" (#23282)

Revert "fix(ci): require changes to run before downloading artifacts (#23281)"

This reverts commit 7f6c41ec69d0f256941be6842a5639e7254850cb.
---
 .github/workflows/integration.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
index 584e683aaf1bc..799a88686114d 100644
--- a/.github/workflows/integration.yml
+++ b/.github/workflows/integration.yml
@@ -104,7 +104,6 @@ jobs:
 
       - name: Download JSON artifact from changes.yml
         uses: actions/download-artifact@v4
-        needs: changes
         with:
           name: int_tests_changes
 

From 282dfe0d248e12e9e6b7616bdedecf9a9a43d5fa Mon Sep 17 00:00:00 2001
From: Thomas <thomas.schneider@datadoghq.com>
Date: Fri, 27 Jun 2025 10:01:23 -0400
Subject: [PATCH 122/305] fix(ci): require changes to run before downloading
 artifacts (#23283)

* Require changes before downloading artifacts

* Replace needs with an if
---
 .github/workflows/integration.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
index 799a88686114d..5c45d7dca7dce 100644
--- a/.github/workflows/integration.yml
+++ b/.github/workflows/integration.yml
@@ -104,6 +104,7 @@ jobs:
 
       - name: Download JSON artifact from changes.yml
         uses: actions/download-artifact@v4
+        if: github.event_name == 'pull_request' || github.event_name == 'merge_group'
         with:
           name: int_tests_changes
 

From 0557e86edfa4b2deed43a8fe06b11e788e37afeb Mon Sep 17 00:00:00 2001
From: Thomas <thomas.schneider@datadoghq.com>
Date: Fri, 27 Jun 2025 13:57:01 -0400
Subject: [PATCH 123/305] chore(website): use YAML for the default config
 language (#23285)

---
 website/assets/js/app.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/website/assets/js/app.js b/website/assets/js/app.js
index 953c5752d7907..32f20c6d4a46d 100644
--- a/website/assets/js/app.js
+++ b/website/assets/js/app.js
@@ -42,7 +42,7 @@ const manageState = () => {
     // Home page platform tab
     platformTab: '{{ $defaultPlatformTab }}',
     // Config format
-    format: 'toml',
+    format: 'yaml',
 
     // Helper functions
     setFormat(f) {

From 9bee1411c0d23c7a4f4571287230382aaf0c9c36 Mon Sep 17 00:00:00 2001
From: Thomas <thomas.schneider@datadoghq.com>
Date: Mon, 30 Jun 2025 08:41:07 -0400
Subject: [PATCH 124/305] feat(ci): add workflow_dispatch to msrv (#23294)

---
 .github/workflows/msrv.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/msrv.yml b/.github/workflows/msrv.yml
index 18a70126da711..150fbaed15706 100644
--- a/.github/workflows/msrv.yml
+++ b/.github/workflows/msrv.yml
@@ -2,6 +2,7 @@ name: Check minimum supported Rust version
 
 on:
   workflow_call:
+  workflow_dispatch:
 
 env:
   RUST_BACKTRACE: full

From 326caa5c33129f6280885f10a84073a7b39e554a Mon Sep 17 00:00:00 2001
From: Thomas <thomas.schneider@datadoghq.com>
Date: Mon, 30 Jun 2025 09:32:32 -0400
Subject: [PATCH 125/305] feat(ci): add ability to specify checkout ref in
 msrv.yml (#23295)

* feat(ci): add ability to specify checkout ref in msrv.yml

* Remove useless comment
---
 .github/workflows/msrv.yml | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/msrv.yml b/.github/workflows/msrv.yml
index 150fbaed15706..30b5816dc9602 100644
--- a/.github/workflows/msrv.yml
+++ b/.github/workflows/msrv.yml
@@ -1,8 +1,13 @@
-name: Check minimum supported Rust version
+name: Check minimum supported Rust version (MSRV)
 
 on:
   workflow_call:
   workflow_dispatch:
+    inputs:
+      checkout_ref:
+        description: "Git ref (branch, tag or SHA) to check out"
+        required: false
+        type: string
 
 env:
   RUST_BACKTRACE: full
@@ -18,6 +23,8 @@ jobs:
     timeout-minutes: 20
     steps:
       - uses: actions/checkout@v4
+        with:
+          ref: ${{ inputs.checkout_ref }}
       - run: sudo -E bash scripts/environment/bootstrap-ubuntu-24.04.sh
       - run: |
           # We usually run `scripts/environment/prepare.sh` but in this case we only need the toolchain.

From 0fef6b2f86eeb6e94c01b1f9af725605b2eee496 Mon Sep 17 00:00:00 2001
From: Thomas <thomas.schneider@datadoghq.com>
Date: Mon, 30 Jun 2025 10:07:17 -0400
Subject: [PATCH 126/305] chore(ci): bump cargo-msrv version (#23296)

---
 .github/workflows/msrv.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/msrv.yml b/.github/workflows/msrv.yml
index 30b5816dc9602..2fb7ea43bf966 100644
--- a/.github/workflows/msrv.yml
+++ b/.github/workflows/msrv.yml
@@ -29,5 +29,5 @@ jobs:
       - run: |
           # We usually run `scripts/environment/prepare.sh` but in this case we only need the toolchain.
           rustup show active-toolchain || rustup toolchain install
-      - run: cargo install cargo-msrv --version 0.15.1
+      - run: cargo install cargo-msrv --version 0.18.4
       - run: cargo msrv verify

From 6ad09472e986833b7a5b48776767cfe916d03726 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 30 Jun 2025 15:19:33 +0000
Subject: [PATCH 127/305] chore(deps): Bump nom from 7.1.3 to 8.0.0 (#22302)

* chore(deps): Bump nom from 7.1.3 to 8.0.0

Bumps [nom](https://github.com/rust-bakery/nom) from 7.1.3 to 8.0.0.
- [Changelog](https://github.com/rust-bakery/nom/blob/main/CHANGELOG.md)
- [Commits](https://github.com/rust-bakery/nom/compare/7.1.3...8.0.0)

---
updated-dependencies:
- dependency-name: nom
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

* Use parse

* Remove deprecated tuple

* Add missing import

* Add nom to the workspace

* Fix tuple order from prev commit

* cargo vdev build licenses

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Thomas Schneider <thomas.schneider@datadoghq.com>
Co-authored-by: Pavlos Rontidis <pavlos.rontidis@gmail.com>
---
 Cargo.lock                          | 27 ++++++++++++++++++---------
 Cargo.toml                          |  3 ++-
 LICENSE-3rdparty.csv                |  1 +
 lib/prometheus-parser/Cargo.toml    |  2 +-
 lib/prometheus-parser/src/line.rs   | 28 +++++++++++++++++-----------
 src/sources/nginx_metrics/parser.rs | 11 +++++++----
 6 files changed, 46 insertions(+), 26 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index ad1f96a9851de..558a0ab93afc1 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -146,7 +146,7 @@ dependencies = [
  "amq-protocol-types",
  "amq-protocol-uri",
  "cookie-factory",
- "nom",
+ "nom 7.1.3",
  "serde",
 ]
 
@@ -168,7 +168,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c7412353b58923fa012feb9a64ccc0c811747babee2e5a2fd63eb102dc8054c3"
 dependencies = [
  "cookie-factory",
- "nom",
+ "nom 7.1.3",
  "serde",
  "serde_json",
 ]
@@ -4362,7 +4362,7 @@ dependencies = [
  "byteorder",
  "crossbeam-channel",
  "flate2",
- "nom",
+ "nom 7.1.3",
  "num-traits",
 ]
 
@@ -5204,7 +5204,7 @@ checksum = "22fa7ee6be451ea0b1912b962c91c8380835e97cf1584a77e18264e908448dcb"
 dependencies = [
  "bytes 1.10.1",
  "log",
- "nom",
+ "nom 7.1.3",
  "smallvec",
  "snafu 0.7.5",
 ]
@@ -6579,6 +6579,15 @@ dependencies = [
  "minimal-lexical",
 ]
 
+[[package]]
+name = "nom"
+version = "8.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "df9761775871bdef83bee530e60050f7e54b1105350d6884eb0fb4f46c2f9405"
+dependencies = [
+ "memchr",
+]
+
 [[package]]
 name = "nonzero_ext"
 version = "0.3.0"
@@ -7733,7 +7742,7 @@ name = "prometheus-parser"
 version = "0.1.0"
 dependencies = [
  "indexmap 2.9.0",
- "nom",
+ "nom 8.0.0",
  "prost 0.12.6",
  "prost-build 0.12.6",
  "prost-types 0.12.6",
@@ -8007,7 +8016,7 @@ dependencies = [
  "log",
  "lz4",
  "native-tls",
- "nom",
+ "nom 7.1.3",
  "oauth2",
  "openidconnect",
  "pem",
@@ -10217,7 +10226,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "161028c00842709450114c39db3b29f44c898055ed8833bb9b535aba7facf30e"
 dependencies = [
  "chrono",
- "nom",
+ "nom 7.1.3",
 ]
 
 [[package]]
@@ -11644,7 +11653,7 @@ dependencies = [
  "netlink-sys",
  "nix 0.26.2",
  "nkeys 0.4.4",
- "nom",
+ "nom 8.0.0",
  "notify",
  "num-format",
  "number_prefix",
@@ -12143,7 +12152,7 @@ dependencies = [
  "lz4_flex",
  "md-5",
  "mlua",
- "nom",
+ "nom 7.1.3",
  "ofb",
  "onig",
  "ordered-float 4.6.0",
diff --git a/Cargo.toml b/Cargo.toml
index 7edd3b2f50bc2..ff18ed90b47a3 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -151,6 +151,7 @@ indoc = { version = "2.0.6" }
 metrics = "0.24.2"
 metrics-tracing-context = { version = "0.17.0", default-features = false }
 metrics-util = { version = "0.18.0", default-features = false, features = ["registry"] }
+nom = { version = "8.0.0", default-features = false }
 paste = { version = "1.0.15" }
 pin-project = { version = "1.1.10", default-features = false }
 proptest = { version = "1.6" }
@@ -363,7 +364,7 @@ md-5 = { version = "0.10", default-features = false, optional = true }
 mongodb = { version = "2.8.2", default-features = false, features = ["tokio-runtime"], optional = true }
 async-nats = { version = "0.33.0", default-features = false, optional = true }
 nkeys = { version = "0.4.4", default-features = false, optional = true }
-nom = { version = "7.1.3", default-features = false, optional = true }
+nom = { workspace = true, optional = true }
 notify = { version = "8.0.0", default-features = false, features = ["macos_fsevent"] }
 openssl = { version = "0.10.73", default-features = false, features = ["vendored"] }
 openssl-probe = { version = "0.1.6", default-features = false }
diff --git a/LICENSE-3rdparty.csv b/LICENSE-3rdparty.csv
index 56d1ff2fa8d87..1d7a869d05e4d 100644
--- a/LICENSE-3rdparty.csv
+++ b/LICENSE-3rdparty.csv
@@ -410,6 +410,7 @@ no-proxy,https://github.com/jdrouet/no-proxy,MIT,Jérémie Drouet <jeremie.droue
 no-std-compat,https://gitlab.com/jD91mZM2/no-std-compat,MIT,jD91mZM2 <me@krake.one>
 nohash,https://github.com/tetcoin/nohash,Apache-2.0 OR MIT,Parity Technologies <admin@parity.io>
 nom,https://github.com/Geal/nom,MIT,contact@geoffroycouprie.com
+nom,https://github.com/rust-bakery/nom,MIT,contact@geoffroycouprie.com
 nonzero_ext,https://github.com/antifuchs/nonzero_ext,Apache-2.0,Andreas Fuchs <asf@boinkor.net>
 notify,https://github.com/notify-rs/notify,CC0-1.0,"Félix Saparelli <me@passcod.name>, Daniel Faust <hessijames@gmail.com>, Aron Heinecke <Ox0p54r36@t-online.de>"
 notify-types,https://github.com/notify-rs/notify,MIT OR Apache-2.0,Daniel Faust <hessijames@gmail.com>
diff --git a/lib/prometheus-parser/Cargo.toml b/lib/prometheus-parser/Cargo.toml
index 4e1c261b094f2..6f5b5708b3277 100644
--- a/lib/prometheus-parser/Cargo.toml
+++ b/lib/prometheus-parser/Cargo.toml
@@ -10,7 +10,7 @@ license = "MPL-2.0"
 
 [dependencies]
 indexmap.workspace = true
-nom = "7.1.3"
+nom.workspace = true
 prost.workspace = true
 prost-types.workspace = true
 snafu.workspace = true
diff --git a/lib/prometheus-parser/src/line.rs b/lib/prometheus-parser/src/line.rs
index 4a41db94ce6b5..0de52037a3450 100644
--- a/lib/prometheus-parser/src/line.rs
+++ b/lib/prometheus-parser/src/line.rs
@@ -10,7 +10,8 @@ use nom::{
     error::ParseError,
     multi::fold_many0,
     number::complete::double,
-    sequence::{delimited, pair, preceded, tuple},
+    sequence::{delimited, pair, preceded},
+    Parser,
 };
 
 /// We try to catch all nom's `ErrorKind` with our own `ErrorKind`,
@@ -140,7 +141,8 @@ impl Metric {
             // This shouldn't be necessary if that issue is remedied.
             value(f64::NAN, tag("NaN")),
             double,
-        ))(input)
+        ))
+        .parse(input)
         .map_err(|_: NomError| {
             ErrorKind::ParseFloatError {
                 input: input.to_owned(),
@@ -154,7 +156,8 @@ impl Metric {
         opt(map_res(
             recognize(pair(opt(char('-')), digit1)),
             |s: &str| s.parse(),
-        ))(input)
+        ))
+        .parse(input)
         .map_err(|_: NomError| {
             ErrorKind::ParseTimestampError {
                 input: input.to_owned(),
@@ -165,9 +168,10 @@ impl Metric {
 
     fn parse_name_value(input: &str) -> IResult<(String, String)> {
         map(
-            tuple((parse_name, match_char('='), Self::parse_escaped_string)),
+            (parse_name, match_char('='), Self::parse_escaped_string),
             |(name, _, value)| (name, value),
-        )(input)
+        )
+        .parse(input)
     }
 
     // Return:
@@ -224,7 +228,7 @@ impl Metric {
     fn parse_labels(input: &str) -> IResult<BTreeMap<String, String>> {
         let input = trim_space(input);
 
-        match opt(char('{'))(input) {
+        match opt(char('{')).parse(input) {
             Ok((input, None)) => Ok((input, BTreeMap::new())),
             Ok((input, Some(_))) => Self::parse_labels_inner(input),
             Err(failure) => Err(failure),
@@ -280,7 +284,7 @@ impl Metric {
             })
         }
 
-        delimited(match_quote, build_string, match_quote)(input)
+        delimited(match_quote, build_string, match_quote).parse(input)
     }
 }
 
@@ -317,7 +321,8 @@ impl Header {
             value(MetricKind::Summary, tag("summary")),
             value(MetricKind::Histogram, tag("histogram")),
             value(MetricKind::Untyped, tag("untyped")),
-        ))(input)
+        ))
+        .parse(input)
         .map_err(|_: NomError| ErrorKind::InvalidMetricKind {
             input: input.to_owned(),
         })?;
@@ -356,7 +361,7 @@ impl Line {
         };
 
         if let Ok((input, _)) = char::<_, NomErrorType>('#')(input) {
-            if tuple::<_, _, NomErrorType, _>((sp, tag("TYPE")))(input).is_ok() {
+            if (sp, tag::<_, _, NomErrorType>("TYPE")).parse(input).is_ok() {
                 return Err(header_error);
             }
             Ok(None)
@@ -372,7 +377,8 @@ fn parse_name(input: &str) -> IResult<String> {
     let (input, (a, b)) = pair(
         take_while1(|c: char| c.is_alphabetic() || c == '_'),
         take_while(|c: char| c.is_alphanumeric() || c == '_' || c == ':'),
-    )(input)
+    )
+    .parse(input)
     .map_err(|_: NomError| ErrorKind::ParseNameError {
         input: input.to_owned(),
     })?;
@@ -389,7 +395,7 @@ fn sp<'a, E: ParseError<&'a str>>(i: &'a str) -> nom::IResult<&'a str, &'a str,
 
 fn match_char(c: char) -> impl Fn(&str) -> IResult<char> {
     move |input| {
-        preceded(sp, char(c))(input).map_err(|_: NomError| {
+        preceded(sp, char(c)).parse(input).map_err(|_: NomError| {
             ErrorKind::ExpectedChar {
                 expected: c,
                 input: input.to_owned(),
diff --git a/src/sources/nginx_metrics/parser.rs b/src/sources/nginx_metrics/parser.rs
index 36c741c75b49e..8fda2786f2888 100644
--- a/src/sources/nginx_metrics/parser.rs
+++ b/src/sources/nginx_metrics/parser.rs
@@ -4,7 +4,8 @@ use nom::{
     bytes::complete::{tag, take_while_m_n},
     combinator::{all_consuming, map_res},
     error::ErrorKind,
-    sequence::{preceded, terminated, tuple},
+    sequence::{preceded, terminated},
+    Parser,
 };
 use snafu::Snafu;
 
@@ -29,7 +30,8 @@ fn get_usize(input: &str) -> nom::IResult<&str, usize, nom::error::Error<&str>>
     map_res(
         take_while_m_n(1, 20, |c: char| c.is_ascii_digit()),
         |s: &str| s.parse::<usize>(),
-    )(input)
+    )
+    .parse(input)
 }
 
 impl<'a> TryFrom<&'a str> for NginxStubStatus {
@@ -39,7 +41,7 @@ impl<'a> TryFrom<&'a str> for NginxStubStatus {
     // https://github.com/nginx/nginx/blob/master/src/http/modules/ngx_http_stub_status_module.c#L137-L145
     fn try_from(input: &'a str) -> Result<Self, Self::Error> {
         // `usize::MAX` eq `18446744073709551615` (20 characters)
-        match all_consuming(tuple((
+        match all_consuming((
             preceded(tag("Active connections: "), get_usize),
             preceded(tag(" \nserver accepts handled requests\n "), get_usize),
             preceded(tag(" "), get_usize),
@@ -47,7 +49,8 @@ impl<'a> TryFrom<&'a str> for NginxStubStatus {
             preceded(tag(" \nReading: "), get_usize),
             preceded(tag(" Writing: "), get_usize),
             terminated(preceded(tag(" Waiting: "), get_usize), tag(" \n")),
-        )))(input)
+        ))
+        .parse(input)
         {
             Ok((_, (active, accepts, handled, requests, reading, writing, waiting))) => {
                 Ok(NginxStubStatus {

From a16f8301112e2292bf74f63193c8fa38b1171f58 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 30 Jun 2025 18:41:18 +0000
Subject: [PATCH 128/305] chore(deps): Bump bollard from 0.16.1 to 0.19.1
 (#20958)

* chore(deps): Bump bollard from 0.16.1 to 0.17.0

Bumps [bollard](https://github.com/fussybeaver/bollard) from 0.16.1 to 0.17.0.
- [Release notes](https://github.com/fussybeaver/bollard/releases)
- [Commits](https://github.com/fussybeaver/bollard/compare/v0.16.1...v0.17.0)

---
updated-dependencies:
- dependency-name: bollard
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* Use new bollard APIs

* Update licenses

* Fix deprecation in tests

* Fix some tests but not all

* Make exclude_self part of integration test suite

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Thomas Schneider <thomas.schneider@datadoghq.com>
---
 Cargo.lock                       | 105 ++++++++++++++++++-------------
 Cargo.toml                       |   2 +-
 LICENSE-3rdparty.csv             |   3 +-
 src/docker.rs                    |  43 +++++++------
 src/sources/docker_logs/mod.rs   |  48 +++++++-------
 src/sources/docker_logs/tests.rs |  91 ++++++++++++++-------------
 6 files changed, 163 insertions(+), 129 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 558a0ab93afc1..39a21d0ffd268 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1794,9 +1794,9 @@ dependencies = [
 
 [[package]]
 name = "bollard"
-version = "0.16.1"
+version = "0.19.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0aed08d3adb6ebe0eff737115056652670ae290f177759aac19c30456135f94c"
+checksum = "899ca34eb6924d6ec2a77c6f7f5c7339e60fd68235eaf91edd5a15f12958bb06"
 dependencies = [
  "base64 0.22.1",
  "bollard-stubs",
@@ -1810,13 +1810,13 @@ dependencies = [
  "http-body-util",
  "hyper 1.4.1",
  "hyper-named-pipe",
- "hyper-rustls 0.26.0",
+ "hyper-rustls 0.27.5",
  "hyper-util",
- "hyperlocal-next",
+ "hyperlocal",
  "log",
  "pin-project-lite",
- "rustls 0.22.4",
- "rustls-native-certs 0.7.0",
+ "rustls 0.23.23",
+ "rustls-native-certs 0.8.1",
  "rustls-pemfile 2.1.0",
  "rustls-pki-types",
  "serde",
@@ -1824,7 +1824,7 @@ dependencies = [
  "serde_json",
  "serde_repr",
  "serde_urlencoded",
- "thiserror 1.0.68",
+ "thiserror 2.0.3",
  "tokio",
  "tokio-util",
  "tower-service",
@@ -1834,12 +1834,13 @@ dependencies = [
 
 [[package]]
 name = "bollard-stubs"
-version = "1.44.0-rc.2"
+version = "1.48.3-rc.28.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "709d9aa1c37abb89d40f19f5d0ad6f0d88cb1581264e571c9350fc5bb89cf1c5"
+checksum = "64ea257e555d16a2c01e5593f40b73865cdf12efbceda33c6d14a2d8d1490368"
 dependencies = [
  "chrono",
  "serde",
+ "serde_json",
  "serde_repr",
  "serde_with 3.12.0",
 ]
@@ -2514,11 +2515,21 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "core-foundation"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b2a6cd9ae233e7f62ba4e9353e81a88df7fc8a5987b8d445b4d90c879bd156f6"
+dependencies = [
+ "core-foundation-sys",
+ "libc",
+]
+
 [[package]]
 name = "core-foundation-sys"
-version = "0.8.4"
+version = "0.8.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa"
+checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
 
 [[package]]
 name = "core2"
@@ -4422,7 +4433,7 @@ version = "0.1.0-rc.1"
 source = "git+https://github.com/vectordotdev/heim.git?branch=update-nix#f3537d9b32e69a2a8ab19a0d42a1e6f5577a5a45"
 dependencies = [
  "cfg-if",
- "core-foundation",
+ "core-foundation 0.9.3",
  "futures-core",
  "futures-util",
  "lazy_static",
@@ -4459,7 +4470,7 @@ source = "git+https://github.com/vectordotdev/heim.git?branch=update-nix#f3537d9
 dependencies = [
  "bitflags 1.3.2",
  "cfg-if",
- "core-foundation",
+ "core-foundation 0.9.3",
  "heim-common",
  "heim-runtime",
  "libc",
@@ -4860,25 +4871,6 @@ dependencies = [
  "tokio-rustls 0.24.1",
 ]
 
-[[package]]
-name = "hyper-rustls"
-version = "0.26.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a0bea761b46ae2b24eb4aef630d8d1c398157b6fc29e6350ecf090a0b70c952c"
-dependencies = [
- "futures-util",
- "http 1.1.0",
- "hyper 1.4.1",
- "hyper-util",
- "log",
- "rustls 0.22.4",
- "rustls-native-certs 0.7.0",
- "rustls-pki-types",
- "tokio",
- "tokio-rustls 0.25.0",
- "tower-service",
-]
-
 [[package]]
 name = "hyper-rustls"
 version = "0.27.5"
@@ -4955,10 +4947,10 @@ dependencies = [
 ]
 
 [[package]]
-name = "hyperlocal-next"
-version = "0.9.0"
+name = "hyperlocal"
+version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "acf569d43fa9848e510358c07b80f4adf34084ddc28c6a4a651ee8474c070dcc"
+checksum = "986c5ce3b994526b3cd75578e62554abd09f0899d6206de48b3e96ab34ccc8c7"
 dependencies = [
  "hex",
  "http-body-util",
@@ -6354,7 +6346,7 @@ dependencies = [
  "openssl-probe",
  "openssl-sys",
  "schannel",
- "security-framework",
+ "security-framework 2.10.0",
  "security-framework-sys",
  "tempfile",
 ]
@@ -9018,7 +9010,7 @@ dependencies = [
  "openssl-probe",
  "rustls-pemfile 1.0.4",
  "schannel",
- "security-framework",
+ "security-framework 2.10.0",
 ]
 
 [[package]]
@@ -9031,7 +9023,19 @@ dependencies = [
  "rustls-pemfile 2.1.0",
  "rustls-pki-types",
  "schannel",
- "security-framework",
+ "security-framework 2.10.0",
+]
+
+[[package]]
+name = "rustls-native-certs"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7fcff2dd52b58a8d98a70243663a0d234c4e2b79235637849d15913394a247d3"
+dependencies = [
+ "openssl-probe",
+ "rustls-pki-types",
+ "schannel",
+ "security-framework 3.2.0",
 ]
 
 [[package]]
@@ -9234,7 +9238,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "770452e37cad93e0a50d5abc3990d2bc351c36d0328f86cefec2f2fb206eaef6"
 dependencies = [
  "bitflags 1.3.2",
- "core-foundation",
+ "core-foundation 0.9.3",
+ "core-foundation-sys",
+ "libc",
+ "security-framework-sys",
+]
+
+[[package]]
+name = "security-framework"
+version = "3.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "271720403f46ca04f7ba6f55d438f8bd878d6b8ca0a1046e8228c4145bcbb316"
+dependencies = [
+ "bitflags 2.9.0",
+ "core-foundation 0.10.1",
  "core-foundation-sys",
  "libc",
  "security-framework-sys",
@@ -9242,9 +9259,9 @@ dependencies = [
 
 [[package]]
 name = "security-framework-sys"
-version = "2.10.0"
+version = "2.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41f3cc463c0ef97e11c3461a9d3787412d30e8e7eb907c79180c4a57bf7c04ef"
+checksum = "49db231d56a190491cb4aeda9527f1ad45345af50b0851622a7adb8c03b01c32"
 dependencies = [
  "core-foundation-sys",
  "libc",
@@ -10236,7 +10253,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7"
 dependencies = [
  "bitflags 1.3.2",
- "core-foundation",
+ "core-foundation 0.9.3",
  "system-configuration-sys",
 ]
 
@@ -11934,7 +11951,7 @@ dependencies = [
  "regex",
  "ryu",
  "schannel",
- "security-framework",
+ "security-framework 2.10.0",
  "serde",
  "serde_json",
  "serde_with 3.12.0",
@@ -12416,7 +12433,7 @@ version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "60b6f804e41d0852e16d2eaee61c7e4f7d3e8ffdb7b8ed85886aeb0791fe9fcd"
 dependencies = [
- "core-foundation",
+ "core-foundation 0.9.3",
  "home",
  "jni",
  "log",
diff --git a/Cargo.toml b/Cargo.toml
index ff18ed90b47a3..808034b430a4c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -318,7 +318,7 @@ apache-avro = { version = "0.16.0", default-features = false, optional = true }
 axum = { version = "0.6.20", default-features = false }
 base64 = { version = "0.22.1", default-features = false, optional = true }
 bloomy = { version = "1.2.0", default-features = false, optional = true }
-bollard = { version = "0.16.1", default-features = false, features = ["ssl", "chrono"], optional = true }
+bollard = { version = "0.19.1", default-features = false, features = ["pipe", "ssl", "chrono"], optional = true }
 bytes = { version = "1.10.1", default-features = false, features = ["serde"] }
 bytesize = { version = "2.0.1", default-features = false }
 chrono.workspace = true
diff --git a/LICENSE-3rdparty.csv b/LICENSE-3rdparty.csv
index 1d7a869d05e4d..b0b0e2761d78e 100644
--- a/LICENSE-3rdparty.csv
+++ b/LICENSE-3rdparty.csv
@@ -149,6 +149,7 @@ convert_case,https://github.com/rutrum/convert-case,MIT,David Purdum <purdum41@g
 convert_case,https://github.com/rutrum/convert-case,MIT,rutrum <dave@rutrum.net>
 cookie-factory,https://github.com/rust-bakery/cookie-factory,MIT,"Geoffroy Couprie <geo.couprie@gmail.com>, Pierre Chifflier <chifflier@wzdftpd.net>"
 core-foundation,https://github.com/servo/core-foundation-rs,MIT  OR  Apache-2.0,The Servo Project Developers
+core-foundation,https://github.com/servo/core-foundation-rs,MIT OR Apache-2.0,The Servo Project Developers
 core2,https://github.com/bbqsrc/core2,Apache-2.0 OR MIT,Brendan Molloy <brendan@bbqsrc.net>
 cpufeatures,https://github.com/RustCrypto/utils,MIT OR Apache-2.0,RustCrypto Developers
 crc,https://github.com/mrhooray/crc-rs,MIT OR Apache-2.0,"Rui Hu <code@mrhooray.com>, Akhil Velagapudi <4@4khil.com>"
@@ -302,7 +303,7 @@ hyper-rustls,https://github.com/rustls/hyper-rustls,Apache-2.0 OR ISC OR MIT,The
 hyper-timeout,https://github.com/hjr3/hyper-timeout,MIT OR Apache-2.0,Herman J. Radtke III <herman@hermanradtke.com>
 hyper-tls,https://github.com/hyperium/hyper-tls,MIT OR Apache-2.0,Sean McArthur <sean@seanmonstar.com>
 hyper-util,https://github.com/hyperium/hyper-util,MIT,Sean McArthur <sean@seanmonstar.com>
-hyperlocal-next,https://github.com/softprops/hyperlocal,MIT,softprops <d.tangren@gmail.com>
+hyperlocal,https://github.com/softprops/hyperlocal,MIT,softprops <d.tangren@gmail.com>
 iana-time-zone,https://github.com/strawlab/iana-time-zone,MIT OR Apache-2.0,"Andrew Straw <strawman@astraw.com>, René Kijewski <rene.kijewski@fu-berlin.de>, Ryan Lopopolo <rjl@hyperbo.la>"
 iana-time-zone-haiku,https://github.com/strawlab/iana-time-zone,MIT OR Apache-2.0,René Kijewski <crates.io@k6i.de>
 icu_collections,https://github.com/unicode-org/icu4x,Unicode-3.0,The ICU4X Project Developers
diff --git a/src/docker.rs b/src/docker.rs
index 58e9c1819f7a8..a8f7f69b07585 100644
--- a/src/docker.rs
+++ b/src/docker.rs
@@ -2,10 +2,13 @@
 use std::{collections::HashMap, env, path::PathBuf};
 
 use bollard::{
-    container::{Config, CreateContainerOptions},
     errors::Error as DockerError,
-    image::{CreateImageOptions, ListImagesOptions},
     models::HostConfig,
+    query_parameters::{
+        CreateContainerOptionsBuilder, CreateImageOptionsBuilder, ListImagesOptionsBuilder,
+        RemoveContainerOptions, StartContainerOptions, StopContainerOptions,
+    },
+    secret::ContainerCreateBody,
     Docker, API_DEFAULT_VERSION,
 };
 use futures::StreamExt;
@@ -120,19 +123,17 @@ async fn pull_image(docker: &Docker, image: &str, tag: &str) {
         vec![format!("{}:{}", image, tag)],
     );
 
-    let options = Some(ListImagesOptions {
-        filters,
-        ..Default::default()
-    });
+    let options = Some(ListImagesOptionsBuilder::new().filters(&filters).build());
 
     let images = docker.list_images(options).await.unwrap();
     if images.is_empty() {
         // If not found, pull it
-        let options = Some(CreateImageOptions {
-            from_image: image,
-            tag,
-            ..Default::default()
-        });
+        let options = Some(
+            CreateImageOptionsBuilder::new()
+                .from_image(image)
+                .tag(tag)
+                .build(),
+        );
 
         docker
             .create_image(options, None, None)
@@ -150,7 +151,7 @@ async fn remove_container(docker: &Docker, id: &str) {
     trace!("Stopping container.");
 
     _ = docker
-        .stop_container(id, None)
+        .stop_container(id, None::<StopContainerOptions>)
         .await
         .map_err(|e| error!(%e));
 
@@ -158,7 +159,7 @@ async fn remove_container(docker: &Docker, id: &str) {
 
     // Don't panic, as this is unrelated to the test
     _ = docker
-        .remove_container(id, None)
+        .remove_container(id, None::<RemoveContainerOptions>)
         .await
         .map_err(|e| error!(%e));
 }
@@ -196,12 +197,11 @@ impl Container {
 
         pull_image(&docker, self.image, self.tag).await;
 
-        let options = Some(CreateContainerOptions {
-            name: format!("vector_test_{}", uuid::Uuid::new_v4()),
-            platform: None,
-        });
+        let options = CreateContainerOptionsBuilder::new()
+            .name(&format!("vector_test_{}", uuid::Uuid::new_v4()))
+            .build();
 
-        let config = Config {
+        let config = ContainerCreateBody {
             image: Some(format!("{}:{}", &self.image, &self.tag)),
             cmd: self.cmd,
             host_config: Some(HostConfig {
@@ -213,10 +213,13 @@ impl Container {
             ..Default::default()
         };
 
-        let container = docker.create_container(options, config).await.unwrap();
+        let container = docker
+            .create_container(Some(options), config)
+            .await
+            .unwrap();
 
         docker
-            .start_container::<String>(&container.id, None)
+            .start_container(&container.id, None::<StartContainerOptions>)
             .await
             .unwrap();
 
diff --git a/src/sources/docker_logs/mod.rs b/src/sources/docker_logs/mod.rs
index 4920c72bfe1af..e6d97a24486bb 100644
--- a/src/sources/docker_logs/mod.rs
+++ b/src/sources/docker_logs/mod.rs
@@ -1,11 +1,14 @@
 use std::sync::{Arc, LazyLock};
 use std::{collections::HashMap, convert::TryFrom, future::ready, pin::Pin, time::Duration};
 
+use bollard::query_parameters::{
+    EventsOptionsBuilder, ListContainersOptionsBuilder, LogsOptionsBuilder,
+};
 use bollard::{
-    container::{InspectContainerOptions, ListContainersOptions, LogOutput, LogsOptions},
+    container::LogOutput,
     errors::Error as DockerError,
+    query_parameters::InspectContainerOptions,
     service::{ContainerInspectResponse, EventMessage},
-    system::EventsOptions,
     Docker,
 };
 use bytes::{Buf, Bytes};
@@ -425,11 +428,12 @@ impl DockerLogsSourceCore {
             filters.insert("image".to_owned(), include_images.clone());
         }
 
-        self.docker.events(Some(EventsOptions {
-            since: Some(self.now_timestamp),
-            until: None,
-            filters,
-        }))
+        self.docker.events(Some(
+            EventsOptionsBuilder::new()
+                .since(&self.now_timestamp.timestamp().to_string())
+                .filters(&filters)
+                .build(),
+        ))
     }
 }
 
@@ -527,11 +531,12 @@ impl DockerLogsSource {
         self.esb
             .core
             .docker
-            .list_containers(Some(ListContainersOptions {
-                all: false, // only running containers
-                filters,
-                ..Default::default()
-            }))
+            .list_containers(Some(
+                ListContainersOptionsBuilder::new()
+                    .all(false)
+                    .filters(&filters)
+                    .build(),
+            ))
             .await?
             .into_iter()
             .for_each(|container| {
@@ -736,14 +741,15 @@ impl EventStreamBuilder {
 
     async fn run_event_stream(mut self, mut info: ContainerLogInfo) {
         // Establish connection
-        let options = Some(LogsOptions::<String> {
-            follow: true,
-            stdout: true,
-            stderr: true,
-            since: info.log_since(),
-            timestamps: true,
-            ..Default::default()
-        });
+        let options = Some(
+            LogsOptionsBuilder::new()
+                .follow(true)
+                .stdout(true)
+                .stderr(true)
+                .since(info.log_since() as i32) // 2038 bug (I think)
+                .timestamps(true)
+                .build(),
+        );
 
         let stream = self.core.docker.logs(info.id.as_str(), options);
         emit!(DockerLogsContainerWatch {
@@ -1275,7 +1281,7 @@ impl ContainerMetadata {
             name: name.as_str().trim_start_matches('/').to_owned().into(),
             name_str: name,
             image: config.image.unwrap().into(),
-            created_at: DateTime::parse_from_rfc3339(created.as_str())?.with_timezone(&Utc),
+            created_at: created.with_timezone(&Utc),
         })
     }
 }
diff --git a/src/sources/docker_logs/tests.rs b/src/sources/docker_logs/tests.rs
index 72b0dd75ee96f..05a6ad14151e2 100644
--- a/src/sources/docker_logs/tests.rs
+++ b/src/sources/docker_logs/tests.rs
@@ -5,32 +5,39 @@ fn generate_config() {
     crate::test_util::test_generate_config::<DockerLogsConfig>();
 }
 
-#[test]
-fn exclude_self() {
-    let (tx, _rx) = SourceSender::new_test();
-    let mut source = DockerLogsSource::new(
-        DockerLogsConfig::default(),
-        tx,
-        ShutdownSignal::noop(),
-        LogNamespace::Legacy,
-    )
-    .unwrap();
-    source.hostname = Some("451062c59603".to_owned());
-    assert!(source.exclude_self("451062c59603a1cf0c6af3e74a31c0ae63d8275aa16a5fc78ef31b923baaffc3"));
-
-    // hostname too short
-    source.hostname = Some("a".to_owned());
-    assert!(!source.exclude_self("a29d569bd46c"));
-}
-
 #[cfg(all(test, feature = "docker-logs-integration-tests"))]
 mod integration_tests {
+    #[test]
+    /// Should only run when docker daemon is up. DockerLogsSource::new will fail if docker socket
+    /// is not present even though it is not used.
+    fn exclude_self() {
+        let (tx, _rx) = SourceSender::new_test();
+        let mut source = DockerLogsSource::new(
+            DockerLogsConfig::default(),
+            tx,
+            ShutdownSignal::noop(),
+            LogNamespace::Legacy,
+        )
+        .unwrap();
+        source.hostname = Some("451062c59603".to_owned());
+        assert!(
+            source.exclude_self("451062c59603a1cf0c6af3e74a31c0ae63d8275aa16a5fc78ef31b923baaffc3")
+        );
+
+        // hostname too short
+        source.hostname = Some("a".to_owned());
+        assert!(!source.exclude_self("a29d569bd46c"));
+    }
+
     use bollard::{
-        container::{
-            Config as ContainerConfig, CreateContainerOptions, KillContainerOptions,
-            RemoveContainerOptions, StartContainerOptions, WaitContainerOptions,
+        query_parameters::{
+            CreateContainerOptionsBuilder, CreateImageOptionsBuilder, ListImagesOptionsBuilder,
+        },
+        query_parameters::{
+            KillContainerOptions, RemoveContainerOptions, StartContainerOptions,
+            WaitContainerOptions,
         },
-        image::{CreateImageOptions, ListImagesOptions},
+        secret::ContainerCreateBody,
     };
     use futures::{stream::TryStreamExt, FutureExt};
     use itertools::Itertools as _;
@@ -140,14 +147,16 @@ mod integration_tests {
 
         trace!("Creating container.");
 
-        let options = Some(CreateContainerOptions {
-            name,
-            platform: None,
-        });
-        let config = ContainerConfig {
-            image: Some("busybox"),
-            cmd: Some(cmd),
-            labels: label.map(|label| vec![(label, "")].into_iter().collect()),
+        let options = Some(CreateContainerOptionsBuilder::new().name(name).build());
+
+        let config = ContainerCreateBody {
+            image: Some("busybox".to_string()),
+            cmd: Some(cmd.iter().map(|i| i.to_string()).collect::<Vec<_>>()),
+            labels: label.map(|label| {
+                vec![(label.to_string(), String::new())]
+                    .into_iter()
+                    .collect()
+            }),
             tty: Some(tty),
             ..Default::default()
         };
@@ -160,19 +169,17 @@ mod integration_tests {
         let mut filters = HashMap::new();
         filters.insert("reference", vec!["busybox:latest"]);
 
-        let options = Some(ListImagesOptions {
-            filters,
-            ..Default::default()
-        });
+        let options = Some(ListImagesOptionsBuilder::new().filters(&filters).build());
 
         let images = docker.list_images(options).await.unwrap();
         if images.is_empty() {
             // If `busybox:latest` not found, pull it
-            let options = Some(CreateImageOptions {
-                from_image: "busybox",
-                tag: "latest",
-                ..Default::default()
-            });
+            let options = Some(
+                CreateImageOptionsBuilder::new()
+                    .from_image("busybox")
+                    .tag("latest")
+                    .build(),
+            );
 
             docker
                 .create_image(options, None, None)
@@ -190,7 +197,7 @@ mod integration_tests {
     async fn container_start(id: &str, docker: &Docker) -> Result<(), bollard::errors::Error> {
         trace!("Starting container.");
 
-        let options = None::<StartContainerOptions<&str>>;
+        let options = None::<StartContainerOptions>;
         docker.start_container(id, options).await
     }
 
@@ -199,7 +206,7 @@ mod integration_tests {
         trace!("Waiting for container.");
 
         docker
-            .wait_container(id, None::<WaitContainerOptions<&str>>)
+            .wait_container(id, None::<WaitContainerOptions>)
             .try_for_each(|exit| async move {
                 info!(message = "Container exited with status code.", status_code = ?exit.status_code);
                 Ok(())
@@ -212,7 +219,7 @@ mod integration_tests {
         trace!("Waiting for container to be killed.");
 
         docker
-            .kill_container(id, None::<KillContainerOptions<&str>>)
+            .kill_container(id, None::<KillContainerOptions>)
             .await
     }
 

From 833eece934379c86c0129e84dec93497faadb669 Mon Sep 17 00:00:00 2001
From: Thomas <thomas.schneider@datadoghq.com>
Date: Mon, 30 Jun 2025 16:38:54 -0400
Subject: [PATCH 129/305] chore(releasing): improve minor release documentation
 (#23298)

* chore(releasing): improve minor release documentation

* Add post release PR instructions

* Update .github/ISSUE_TEMPLATE/minor-release.md

* Update release steps

---------

Co-authored-by: Pavlos Rontidis <pavlos.rontidis@gmail.com>
---
 .github/ISSUE_TEMPLATE/minor-release.md | 22 +++++++++++++---------
 .gitignore                              |  2 +-
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/minor-release.md b/.github/ISSUE_TEMPLATE/minor-release.md
index 536adc34eb2d2..5d34d0c63143f 100644
--- a/.github/ISSUE_TEMPLATE/minor-release.md
+++ b/.github/ISSUE_TEMPLATE/minor-release.md
@@ -8,16 +8,18 @@ labels: "domain: releasing"
 
 # Setup and Automation
 
-Note the preparation steps are now automated. First, prepare your environment:
+Note the preparation steps are now automated. First, alter/create release.env
 
 ```shell
-export NEW_VERSION=<new Vector version> # replace this with the actual new version
+export NEW_VECTOR_VERSION=<new Vector version> # replace this with the actual new version
 export MINOR_VERSION=$(echo "NEW_VECTOR_VERSION" | cut -d. -f2)
-export PREP_BRANCH=prepare-v-0-"${MINOR_VERSION}"-"${NEW_VERSION}"-website
+export PREP_BRANCH=prepare-v-0-"${MINOR_VERSION}"-"${NEW_VECTOR_VERSION}"-website
 export RELEASE_BRANCH=v0."${MINOR_VERSION}"
 export NEW_VRL_VERSION=<new VRL version> # replace this with the actual new VRL version
 ```
 
+and then source it by running `source ./release.env`
+
 # The week before the release
 
 ## 1. Manual Steps
@@ -77,9 +79,9 @@ Automated steps include:
   - [ ] `git tag v"${NEW_VECTOR_VERSION}" -a -m v"${NEW_VECTOR_VERSION}"`
   - [ ] `git push origin v"${NEW_VECTOR_VERSION}"`
 - [ ] Wait for release workflow to complete
-  - Discoverable via [https://github.com/timberio/vector/actions/workflows/release.yml](https://github.com/timberio/vector/actions/workflows/release.yml)
+  - Discoverable via [release.yml](https://github.com/vectordotdev/vector/actions/workflows/release.yml)
 - [ ] Reset the `website` branch to the `HEAD` of the release branch to update https://vector.dev
-  - [ ] `git switch website && git reset --hard origin/"{RELEASE_BRANCH}" && git push`
+  - [ ] `git switch website && git reset --hard origin/"${RELEASE_BRANCH}" && git push`
   - [ ] Confirm that the release changelog was published to https://vector.dev/releases/
     - The deployment is done by Amplify. You can see
       the [deployment logs here](https://dd-corpsite.datadoghq.com/logs?query=service%3Awebsites-vector%20branch%3Awebsite&agg_m=count&agg_m_source=base&agg_t=count&cols=host%2Cservice&fromUser=true&messageDisplay=inline&refresh_mode=sliding&storage=hot&stream_sort=time%2Casc&viz=stream).
@@ -89,8 +91,10 @@ Automated steps include:
 - [ ] Release updated Helm chart. See [releasing Helm chart](https://github.com/vectordotdev/helm-charts#releasing).
 - [ ] Once Helm chart is released, updated Vector manifests
     - Run `cargo vdev build manifests` and open a PR with changes
-- [ ] Add docker images to [https://github.com/DataDog/images](https://github.com/DataDog/images/tree/master/vector) to have them available internally.
-- [ ] Cherry-pick any release commits from the release branch that are not on `master`, to `master`
-- [ ] Bump the release number in the `Cargo.toml` on master to the next major release.
-  - Also, update `Cargo.lock` with: `cargo update -p vector`
+- [ ] Add docker images to [https://github.com/DataDog/images](https://github.com/DataDog/images/tree/master/vector) to have them available internally. ([Example PR](https://github.com/DataDog/images/pull/7104))
+- [ ] Create a new PR with title starting as `chore(releasing):`
+  - [ ] Cherry-pick any release commits from the release branch that are not on `master`, to `master`
+  - [ ] Bump the release number in the `Cargo.toml` on master to the next minor release.
+  - [ ] Also, update `Cargo.lock` with: `cargo update -p vector`
+  - [ ] If there is a VRL version update, revert it and make it track the git `main` branch and then run `cargo update -p vrl`.
 - [ ] Kick-off post-mortems for any regressions resolved by the release
diff --git a/.gitignore b/.gitignore
index cba76581f96aa..1963fcca25fcc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -59,7 +59,7 @@ volumes/
 *.volume/
 
 # Environment variable files (can contain secrets)
-.env
+*.env
 .env.*
 
 # LLM tools

From dd205d3593e65f1e2c4613414a2b2d59ad74018a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 30 Jun 2025 20:42:53 +0000
Subject: [PATCH 130/305] chore(deps): Bump governor from 0.7.0 to 0.8.1
 (#22555)

* chore(deps): Bump governor from 0.7.0 to 0.8.1

Bumps [governor](https://github.com/boinkor-net/governor) from 0.7.0 to 0.8.1.
- [Release notes](https://github.com/boinkor-net/governor/releases)
- [Changelog](https://github.com/boinkor-net/governor/blob/master/release.toml)
- [Commits](https://github.com/boinkor-net/governor/compare/v0.7.0...v0.8.1)

---
updated-dependencies:
- dependency-name: governor
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* cargo vdev build licenses

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Thomas Schneider <thomas.schneider@datadoghq.com>
Co-authored-by: Pavlos Rontidis <pavlos.rontidis@gmail.com>
---
 Cargo.lock           | 18 ++++++++----------
 Cargo.toml           |  2 +-
 LICENSE-3rdparty.csv |  1 -
 3 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 39a21d0ffd268..8682f332a0de8 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4044,8 +4044,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "43a49c392881ce6d5c3b8cb70f98717b7c07aabbdff06687b9030dbfbe2725f8"
 dependencies = [
  "cfg-if",
+ "js-sys",
  "libc",
  "wasi 0.13.3+wasi-0.2.2",
+ "wasm-bindgen",
  "windows-targets 0.52.6",
 ]
 
@@ -4122,22 +4124,24 @@ dependencies = [
 
 [[package]]
 name = "governor"
-version = "0.7.0"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0746aa765db78b521451ef74221663b57ba595bf83f75d0ce23cc09447c8139f"
+checksum = "3cbe789d04bf14543f03c4b60cd494148aa79438c8440ae7d81a7778147745c3"
 dependencies = [
  "cfg-if",
  "dashmap",
  "futures-sink",
  "futures-timer",
  "futures-util",
- "no-std-compat",
+ "getrandom 0.3.1",
+ "hashbrown 0.15.2",
  "nonzero_ext",
  "parking_lot",
  "portable-atomic",
- "rand 0.8.5",
+ "rand 0.9.1",
  "smallvec",
  "spinning_top",
+ "web-time",
 ]
 
 [[package]]
@@ -6540,12 +6544,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "no-std-compat"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b93853da6d84c2e3c7d730d6473e8817692dd89be387eb01b94d7f108ecb5b8c"
-
 [[package]]
 name = "nohash"
 version = "0.2.0"
diff --git a/Cargo.toml b/Cargo.toml
index 808034b430a4c..7a1c08147d1b4 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -337,7 +337,7 @@ exitcode = { version = "1.1.2", default-features = false }
 flate2.workspace = true
 futures-util = { version = "0.3.29", default-features = false }
 glob.workspace = true
-governor = { version = "0.7.0", default-features = false, features = ["dashmap", "jitter", "std"], optional = true }
+governor = { version = "0.10.0", default-features = false, features = ["dashmap", "jitter", "std"], optional = true }
 h2 = { version = "0.4.10", default-features = false, optional = true }
 hash_hasher = { version = "2.0.4", default-features = false }
 hashbrown = { version = "0.14.5", default-features = false, optional = true, features = ["ahash"] }
diff --git a/LICENSE-3rdparty.csv b/LICENSE-3rdparty.csv
index b0b0e2761d78e..da525d7a56ee5 100644
--- a/LICENSE-3rdparty.csv
+++ b/LICENSE-3rdparty.csv
@@ -408,7 +408,6 @@ nibble_vec,https://github.com/michaelsproul/rust_nibble_vec,MIT,Michael Sproul <
 nix,https://github.com/nix-rust/nix,MIT,The nix-rust Project Developers
 nkeys,https://github.com/wasmcloud/nkeys,Apache-2.0,wasmCloud Team
 no-proxy,https://github.com/jdrouet/no-proxy,MIT,Jérémie Drouet <jeremie.drouet@gmail.com>
-no-std-compat,https://gitlab.com/jD91mZM2/no-std-compat,MIT,jD91mZM2 <me@krake.one>
 nohash,https://github.com/tetcoin/nohash,Apache-2.0 OR MIT,Parity Technologies <admin@parity.io>
 nom,https://github.com/Geal/nom,MIT,contact@geoffroycouprie.com
 nom,https://github.com/rust-bakery/nom,MIT,contact@geoffroycouprie.com

From bf5d9d05f09b72579ae27a2204f07d1495859e3e Mon Sep 17 00:00:00 2001
From: Bing Wang <wangbing.adam@gmail.com>
Date: Tue, 1 Jul 2025 05:07:09 +0800
Subject: [PATCH 131/305] chore(deps): use connect_with_local_defaults on all
 platforms (#21088)

* chore(deps): use connect_with_local_defaults for docker on all platforms

Signed-off-by: pigletfly <wangbing.adam@gmail.com>

fix

* Grab Cargo.* from master

---------

Co-authored-by: Thomas Schneider <thomas.schneider@datadoghq.com>
Co-authored-by: Pavlos Rontidis <pavlos.rontidis@gmail.com>
---
 src/docker.rs             | 14 ++------------
 src/sources/dnstap/mod.rs |  2 +-
 2 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/src/docker.rs b/src/docker.rs
index a8f7f69b07585..7a8308cabe14f 100644
--- a/src/docker.rs
+++ b/src/docker.rs
@@ -48,7 +48,7 @@ pub fn docker(host: Option<String>, tls: Option<DockerTlsConfig>) -> crate::Resu
     let host = host.or_else(|| env::var("DOCKER_HOST").ok());
 
     match host {
-        None => Docker::connect_with_local_defaults().map_err(Into::into),
+        None => Docker::connect_with_defaults().map_err(Into::into),
         Some(host) => {
             let scheme = host
                 .parse::<Uri>()
@@ -77,17 +77,7 @@ pub fn docker(host: Option<String>, tls: Option<DockerTlsConfig>) -> crate::Resu
                     .map_err(Into::into)
                 }
                 Some("unix") | Some("npipe") | None => {
-                    // TODO: Use `connect_with_local` on all platforms.
-                    //
-                    // Named pipes are currently disabled in Tokio. Tracking issue:
-                    // https://github.com/fussybeaver/bollard/pull/138
-                    if cfg!(windows) {
-                        warn!("Named pipes are currently not available on Windows, trying to connecting to Docker with default HTTP settings instead.");
-                        Docker::connect_with_http_defaults().map_err(Into::into)
-                    } else {
-                        Docker::connect_with_local(&host, DEFAULT_TIMEOUT, API_DEFAULT_VERSION)
-                            .map_err(Into::into)
-                    }
+                    Docker::connect_with_defaults().map_err(Into::into)
                 }
                 Some(scheme) => Err(format!("Unknown scheme: {}", scheme).into()),
             }
diff --git a/src/sources/dnstap/mod.rs b/src/sources/dnstap/mod.rs
index b4acefb0a6d32..70449fc413961 100644
--- a/src/sources/dnstap/mod.rs
+++ b/src/sources/dnstap/mod.rs
@@ -632,7 +632,7 @@ mod integration_tests {
     }
 
     async fn dnstap_exec(cmd: Vec<&str>) {
-        let docker = Docker::connect_with_unix_defaults().expect("failed binding to docker socket");
+        let docker = Docker::connect_with_defaults().expect("failed binding to docker socket");
         let config = CreateExecOptions {
             cmd: Some(cmd),
             attach_stdout: Some(true),

From ed93c1deeed38fc4ef3323cf79b9423bd8d743e1 Mon Sep 17 00:00:00 2001
From: Thomas <thomas.schneider@datadoghq.com>
Date: Mon, 30 Jun 2025 17:35:28 -0400
Subject: [PATCH 132/305] chore(releasing): prep next version and cherry pick
 release (#23300)

* chore(releasing): prepare v0.48.0 release (#23275)

* chore(releasing): Pinned VRL version to 0.25.0

* chore(releasing): Generated release CUE file

* chore(releasing): Updated website/cue/reference/administration/interfaces/kubectl.cue vector version to 0.48.0

* chore(releasing): Updated distribution/install.sh vector version to 0.48.0

* chore(releasing): Add 0.48.0 to versions.cue

* chore(releasing): Created release md file

* add release description

* set projected release date

* bump alpine version

* first round of improvements for each changelog

* add vrl query example

* update summary

* Apply suggestions from code review

Co-authored-by: Thomas <thomas.schneider@datadoghq.com>

---------

Co-authored-by: Thomas <thomas.schneider@datadoghq.com>

* Update to next version

* Revert VRL changes

* cargo vdev build manifests

---------

Co-authored-by: Pavlos Rontidis <pavlos.rontidis@gmail.com>
---
 Cargo.lock                                    |   6 +-
 Cargo.toml                                    |   2 +-
 ...source_vrl_query_parameters.enhancement.md |   5 -
 .../22581_max_merged_line_bytes.feature.md    |   3 -
 ...5_axiom_sink_trace_data_support.feature.md |   5 -
 .../22971_reconnect_broken_amqp_sink.fix.md   |   3 -
 ...low_content_header_contains.enhancement.md |   3 -
 ...106_rcode_16_dnsmsg_parser_handling.fix.md |   3 -
 changelog.d/23123_dnstap_tcp_errors.fix.md    |   3 -
 .../23165_custom_auth_path_access.feature.md  |   3 -
 ...ableable_config_deny_unknown_fields.fix.md |   3 -
 .../23196_kafka_sink_rate_limit.feature.md    |   3 -
 ...etry_source_panic_on_nan_attributes.fix.md |   3 -
 .../23217_interval_ms_modifiable.feature.md   |   3 -
 .../23228_vector_top_uptime.feature.md        |   3 -
 ...32_multicast_udp_socket_sources.feature.md |   8 -
 .../aws-auth-session-token.enhancement.md     |   3 -
 .../dnstap_better_errors_timestamp.fix.md     |   3 -
 changelog.d/elasticsearch-encoding.fix.md     |   4 -
 .../fix_dnstap_extract_address_logic.fix.md   |   3 -
 .../fix_prometheus_timestamp_parse.fix.md     |   3 -
 changelog.d/skip_empty_ecs_metrics.fix.md     |   3 -
 distribution/docker/alpine/Dockerfile         |   2 +-
 distribution/install.sh                       |   2 +-
 .../kubernetes/vector-agent/README.md         |   2 +-
 .../kubernetes/vector-agent/configmap.yaml    |   2 +-
 .../kubernetes/vector-agent/daemonset.yaml    |   4 +-
 .../kubernetes/vector-agent/rbac.yaml         |   4 +-
 .../vector-agent/service-headless.yaml        |   2 +-
 .../vector-agent/serviceaccount.yaml          |   2 +-
 .../kubernetes/vector-aggregator/README.md    |   2 +-
 .../vector-aggregator/configmap.yaml          |   2 +-
 .../vector-aggregator/service-headless.yaml   |   2 +-
 .../kubernetes/vector-aggregator/service.yaml |   2 +-
 .../vector-aggregator/serviceaccount.yaml     |   2 +-
 .../vector-aggregator/statefulset.yaml        |   4 +-
 .../vector-stateless-aggregator/README.md     |   2 +-
 .../configmap.yaml                            |   2 +-
 .../deployment.yaml                           |   4 +-
 .../service-headless.yaml                     |   2 +-
 .../vector-stateless-aggregator/service.yaml  |   2 +-
 .../serviceaccount.yaml                       |   2 +-
 website/content/en/releases/0.48.0.md         |   4 +
 .../administration/interfaces/kubectl.cue     |   2 +-
 website/cue/reference/releases/0.48.0.cue     | 294 ++++++++++++++++++
 website/cue/reference/versions.cue            |   1 +
 46 files changed, 328 insertions(+), 99 deletions(-)
 delete mode 100644 changelog.d/14621_http_client_source_vrl_query_parameters.enhancement.md
 delete mode 100644 changelog.d/22581_max_merged_line_bytes.feature.md
 delete mode 100644 changelog.d/22935_axiom_sink_trace_data_support.feature.md
 delete mode 100644 changelog.d/22971_reconnect_broken_amqp_sink.fix.md
 delete mode 100644 changelog.d/23022_hec_allow_content_header_contains.enhancement.md
 delete mode 100644 changelog.d/23106_rcode_16_dnsmsg_parser_handling.fix.md
 delete mode 100644 changelog.d/23123_dnstap_tcp_errors.fix.md
 delete mode 100644 changelog.d/23165_custom_auth_path_access.feature.md
 delete mode 100644 changelog.d/23187_tls_enableable_config_deny_unknown_fields.fix.md
 delete mode 100644 changelog.d/23196_kafka_sink_rate_limit.feature.md
 delete mode 100644 changelog.d/23199_opentelemetry_source_panic_on_nan_attributes.fix.md
 delete mode 100644 changelog.d/23217_interval_ms_modifiable.feature.md
 delete mode 100644 changelog.d/23228_vector_top_uptime.feature.md
 delete mode 100644 changelog.d/5732_multicast_udp_socket_sources.feature.md
 delete mode 100644 changelog.d/aws-auth-session-token.enhancement.md
 delete mode 100644 changelog.d/dnstap_better_errors_timestamp.fix.md
 delete mode 100644 changelog.d/elasticsearch-encoding.fix.md
 delete mode 100644 changelog.d/fix_dnstap_extract_address_logic.fix.md
 delete mode 100644 changelog.d/fix_prometheus_timestamp_parse.fix.md
 delete mode 100644 changelog.d/skip_empty_ecs_metrics.fix.md
 create mode 100644 website/content/en/releases/0.48.0.md
 create mode 100644 website/cue/reference/releases/0.48.0.cue

diff --git a/Cargo.lock b/Cargo.lock
index 8682f332a0de8..e1a319f33b891 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -11554,7 +11554,7 @@ dependencies = [
 
 [[package]]
 name = "vector"
-version = "0.48.0"
+version = "0.49.0"
 dependencies = [
  "apache-avro",
  "approx",
@@ -12116,8 +12116,8 @@ checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d"
 
 [[package]]
 name = "vrl"
-version = "0.24.0"
-source = "git+https://github.com/vectordotdev/vrl.git?branch=main#c45f0d7165e7f39a7b353dc8095565b3df9c073f"
+version = "0.25.0"
+source = "git+https://github.com/vectordotdev/vrl.git?branch=main#25ec43955c030f6f51e7d8353a7fc3388664ca02"
 dependencies = [
  "aes",
  "aes-siv",
diff --git a/Cargo.toml b/Cargo.toml
index 7a1c08147d1b4..8540bd667e4bb 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "vector"
-version = "0.48.0"
+version = "0.49.0"
 authors = ["Vector Contributors <vector@datadoghq.com>"]
 edition = "2021"
 description = "A lightweight and ultra-fast tool for building observability pipelines"
diff --git a/changelog.d/14621_http_client_source_vrl_query_parameters.enhancement.md b/changelog.d/14621_http_client_source_vrl_query_parameters.enhancement.md
deleted file mode 100644
index 732e0ee351a21..0000000000000
--- a/changelog.d/14621_http_client_source_vrl_query_parameters.enhancement.md
+++ /dev/null
@@ -1,5 +0,0 @@
-The HTTP client source now supports VRL within query parameters.
-
-This means that HTTP requests can now be made with dynamic query parameters. This is particularly useful for generating unique timestamps or UUIDs per request.
-
-authors: benjamin-awd
diff --git a/changelog.d/22581_max_merged_line_bytes.feature.md b/changelog.d/22581_max_merged_line_bytes.feature.md
deleted file mode 100644
index b5d36e53bde52..0000000000000
--- a/changelog.d/22581_max_merged_line_bytes.feature.md
+++ /dev/null
@@ -1,3 +0,0 @@
-The `kubernetes_logs` source now includes a new `max_merged_line_bytes` configuration option. This setting enables users to cap the size of log lines after they’ve been combined using `auto_partial_merge`. Previously, the `max_line_bytes` field only restricted line sizes *before* merging, leaving no practical way to limit the length of merged lines—unless you set a size so tiny that it prevented merging altogether by stopping short of the continuation character. This new option gives you better control over merged line sizes.
-
-authors: ganelo
diff --git a/changelog.d/22935_axiom_sink_trace_data_support.feature.md b/changelog.d/22935_axiom_sink_trace_data_support.feature.md
deleted file mode 100644
index 08d117b51f672..0000000000000
--- a/changelog.d/22935_axiom_sink_trace_data_support.feature.md
+++ /dev/null
@@ -1,5 +0,0 @@
-Adds trace data type support to the Axiom sink allowing propagation of
-OpenTelemetry traces received via the `opentelemetry` or compatible trace
-emitting components.
-
-authors: darach
diff --git a/changelog.d/22971_reconnect_broken_amqp_sink.fix.md b/changelog.d/22971_reconnect_broken_amqp_sink.fix.md
deleted file mode 100644
index acd01e4280f13..0000000000000
--- a/changelog.d/22971_reconnect_broken_amqp_sink.fix.md
+++ /dev/null
@@ -1,3 +0,0 @@
-The `amqp` sink now attempts to re-connect to the AMQP broker when the channel has been disconnected. It will also create up to 4 channels in a pool (configurable with the `max_channels` setting) to improve throughput.
-
-authors: aramperes
diff --git a/changelog.d/23022_hec_allow_content_header_contains.enhancement.md b/changelog.d/23022_hec_allow_content_header_contains.enhancement.md
deleted file mode 100644
index 2cc0d2a827bfd..0000000000000
--- a/changelog.d/23022_hec_allow_content_header_contains.enhancement.md
+++ /dev/null
@@ -1,3 +0,0 @@
-Updated the Splunk HEC source to accept requests that contain the header content-type with any value containing "application/json," not the exact value of "application/json." This matches the behavior of a true Splunk HEC. Allows sources from AWS to successfully send events to the Splunk HEC source without additional proxying to update headers.
-
-authors: Tot19
diff --git a/changelog.d/23106_rcode_16_dnsmsg_parser_handling.fix.md b/changelog.d/23106_rcode_16_dnsmsg_parser_handling.fix.md
deleted file mode 100644
index 59506f1fb6ff3..0000000000000
--- a/changelog.d/23106_rcode_16_dnsmsg_parser_handling.fix.md
+++ /dev/null
@@ -1,3 +0,0 @@
-Fixed description for RCODE 16 (it was BADSIG previously, but it should be BADVERS).
-
-authors: esensar Quad9DNS
diff --git a/changelog.d/23123_dnstap_tcp_errors.fix.md b/changelog.d/23123_dnstap_tcp_errors.fix.md
deleted file mode 100644
index c8686aa3e1f20..0000000000000
--- a/changelog.d/23123_dnstap_tcp_errors.fix.md
+++ /dev/null
@@ -1,3 +0,0 @@
-Improved backpressure and load handling of dnstap TCP source.
-
-authors: esensar Quad9DNS
diff --git a/changelog.d/23165_custom_auth_path_access.feature.md b/changelog.d/23165_custom_auth_path_access.feature.md
deleted file mode 100644
index 537d9e0011b0b..0000000000000
--- a/changelog.d/23165_custom_auth_path_access.feature.md
+++ /dev/null
@@ -1,3 +0,0 @@
-Enabled URL path access in VRL scripts of custom auth strategy for server components.
-
-authors: byronwolfman
diff --git a/changelog.d/23187_tls_enableable_config_deny_unknown_fields.fix.md b/changelog.d/23187_tls_enableable_config_deny_unknown_fields.fix.md
deleted file mode 100644
index 61b9c7bcae91c..0000000000000
--- a/changelog.d/23187_tls_enableable_config_deny_unknown_fields.fix.md
+++ /dev/null
@@ -1,3 +0,0 @@
-Unknown fields in the `tls` config are now rejected so these fields now need to be removed for Vector to start successfully.
-
-authors: thomasqueirozb
diff --git a/changelog.d/23196_kafka_sink_rate_limit.feature.md b/changelog.d/23196_kafka_sink_rate_limit.feature.md
deleted file mode 100644
index a8562b04ab962..0000000000000
--- a/changelog.d/23196_kafka_sink_rate_limit.feature.md
+++ /dev/null
@@ -1,3 +0,0 @@
-Added `rate_limit_num` and `rate_limit_duration_secs` options to `kafka` sink, to enable rate limiting this sink.
-
-authors: esensar Quad9DNS
diff --git a/changelog.d/23199_opentelemetry_source_panic_on_nan_attributes.fix.md b/changelog.d/23199_opentelemetry_source_panic_on_nan_attributes.fix.md
deleted file mode 100644
index e8dd6a554ac5f..0000000000000
--- a/changelog.d/23199_opentelemetry_source_panic_on_nan_attributes.fix.md
+++ /dev/null
@@ -1,3 +0,0 @@
-Fixed panic in `opentelemetry` source when a `NaN` float value is received. `NaN` values are now converted to `null`.
-
-authors: srstrickland
diff --git a/changelog.d/23217_interval_ms_modifiable.feature.md b/changelog.d/23217_interval_ms_modifiable.feature.md
deleted file mode 100644
index bac2eccda82af..0000000000000
--- a/changelog.d/23217_interval_ms_modifiable.feature.md
+++ /dev/null
@@ -1,3 +0,0 @@
-VRL programs can now read, write, and delete the `interval_ms` field in metric events.
-
-authors: thomasqueirozb
diff --git a/changelog.d/23228_vector_top_uptime.feature.md b/changelog.d/23228_vector_top_uptime.feature.md
deleted file mode 100644
index f49705c477127..0000000000000
--- a/changelog.d/23228_vector_top_uptime.feature.md
+++ /dev/null
@@ -1,3 +0,0 @@
-Added vector uptime in seconds to `vector top`.
-
-authors: esensar Quad9DNS
diff --git a/changelog.d/5732_multicast_udp_socket_sources.feature.md b/changelog.d/5732_multicast_udp_socket_sources.feature.md
deleted file mode 100644
index f85c4451b53d0..0000000000000
--- a/changelog.d/5732_multicast_udp_socket_sources.feature.md
+++ /dev/null
@@ -1,8 +0,0 @@
-The `socket` source with `udp` mode now supports joining multicast groups via the `multicast_groups` option
-of that source. This allows the source to receive multicast packets from the specified multicast groups.
-
-Note that in order to work properly, the `socket` address must be set to `0.0.0.0` and not
-to `127.0.0.1` (localhost) or any other specific IP address. If other IP address is used, the host's interface
-will filter out the multicast packets as the packet target IP (multicast) would not match the host's interface IP.
-
-authors: jorgehermo9
diff --git a/changelog.d/aws-auth-session-token.enhancement.md b/changelog.d/aws-auth-session-token.enhancement.md
deleted file mode 100644
index 5d49320932445..0000000000000
--- a/changelog.d/aws-auth-session-token.enhancement.md
+++ /dev/null
@@ -1,3 +0,0 @@
-Adds support for session tokens in AWS authentication options. When using temporary credentials (access key, secret key, and session token), the session token is required. Temporary credentials can be provided by an external system and updated using the `SECRET` backend.
-
-authors: anil-db
diff --git a/changelog.d/dnstap_better_errors_timestamp.fix.md b/changelog.d/dnstap_better_errors_timestamp.fix.md
deleted file mode 100644
index a970b91d6127c..0000000000000
--- a/changelog.d/dnstap_better_errors_timestamp.fix.md
+++ /dev/null
@@ -1,3 +0,0 @@
-Fix problem with parsing timestamp that could lead into panic in `dnstap-parser::DnstapParser::parse_dnstap_message_time`.
-
-authors: wooffie
diff --git a/changelog.d/elasticsearch-encoding.fix.md b/changelog.d/elasticsearch-encoding.fix.md
deleted file mode 100644
index 015b42efcb691..0000000000000
--- a/changelog.d/elasticsearch-encoding.fix.md
+++ /dev/null
@@ -1,4 +0,0 @@
-The `elasticsearch` sink now encodes parameters such as `index` that contain characters that need to
-be escaped in JSON strings.
-
-authors: jszwedko
diff --git a/changelog.d/fix_dnstap_extract_address_logic.fix.md b/changelog.d/fix_dnstap_extract_address_logic.fix.md
deleted file mode 100644
index 60701f5b7d1d1..0000000000000
--- a/changelog.d/fix_dnstap_extract_address_logic.fix.md
+++ /dev/null
@@ -1,3 +0,0 @@
-Added checks to avoid possible panic while parsing address in `dnstap-parser::DnstapParser::parse_dnstap_message_socket_family`.
-
-authors: wooffie
diff --git a/changelog.d/fix_prometheus_timestamp_parse.fix.md b/changelog.d/fix_prometheus_timestamp_parse.fix.md
deleted file mode 100644
index 0ed27abdee620..0000000000000
--- a/changelog.d/fix_prometheus_timestamp_parse.fix.md
+++ /dev/null
@@ -1,3 +0,0 @@
-Fix bug allowing invalid Prometheus timestamps; now properly rejected during parsing.
-
-authors: wooffie
diff --git a/changelog.d/skip_empty_ecs_metrics.fix.md b/changelog.d/skip_empty_ecs_metrics.fix.md
deleted file mode 100644
index 9aae13a99a650..0000000000000
--- a/changelog.d/skip_empty_ecs_metrics.fix.md
+++ /dev/null
@@ -1,3 +0,0 @@
-The `aws_ecs_metrics` source now skips over empty ECS metrics payloads. It previously failed to parse such payloads.
-
-authors: tustvold
diff --git a/distribution/docker/alpine/Dockerfile b/distribution/docker/alpine/Dockerfile
index a33ef65479b15..45ae3194b264f 100644
--- a/distribution/docker/alpine/Dockerfile
+++ b/distribution/docker/alpine/Dockerfile
@@ -12,7 +12,7 @@ RUN ARCH=$(if [ "$TARGETPLATFORM" = "linux/arm/v6" ]; then echo "arm"; else cat
 
 RUN mkdir -p /var/lib/vector
 
-FROM docker.io/alpine:3.21
+FROM docker.io/alpine:3.22
 
 # https://github.com/opencontainers/image-spec/blob/main/annotations.md
 LABEL org.opencontainers.image.url="https://vector.dev"
diff --git a/distribution/install.sh b/distribution/install.sh
index e96aff7fe4c4e..2e6a6afe9a417 100755
--- a/distribution/install.sh
+++ b/distribution/install.sh
@@ -13,7 +13,7 @@ set -u
 # If PACKAGE_ROOT is unset or empty, default it.
 PACKAGE_ROOT="${PACKAGE_ROOT:-"https://packages.timber.io/vector"}"
 # If VECTOR_VERSION is unset or empty, default it.
-VECTOR_VERSION="${VECTOR_VERSION:-"0.47.0"}"
+VECTOR_VERSION="${VECTOR_VERSION:-"0.48.0"}"
 _divider="--------------------------------------------------------------------------------"
 _prompt=">>>"
 _indent="   "
diff --git a/distribution/kubernetes/vector-agent/README.md b/distribution/kubernetes/vector-agent/README.md
index 95b20cde3fb8d..a2c281d825d08 100644
--- a/distribution/kubernetes/vector-agent/README.md
+++ b/distribution/kubernetes/vector-agent/README.md
@@ -1,6 +1,6 @@
 The kubernetes manifests found in this directory have been automatically generated
 from the [helm chart `vector/vector`](https://github.com/vectordotdev/helm-charts/tree/master/charts/vector)
-version 0.43.0 with the following `values.yaml`:
+version 0.44.0 with the following `values.yaml`:
 
 ```yaml
 role: Agent
diff --git a/distribution/kubernetes/vector-agent/configmap.yaml b/distribution/kubernetes/vector-agent/configmap.yaml
index 1eb3b3a2b8f88..7249f8361c433 100644
--- a/distribution/kubernetes/vector-agent/configmap.yaml
+++ b/distribution/kubernetes/vector-agent/configmap.yaml
@@ -9,7 +9,7 @@ metadata:
     app.kubernetes.io/name: vector
     app.kubernetes.io/instance: vector
     app.kubernetes.io/component: Agent
-    app.kubernetes.io/version: "0.47.0-distroless-libc"
+    app.kubernetes.io/version: "0.48.0-distroless-libc"
 data:
   agent.yaml: |
     data_dir: /vector-data-dir
diff --git a/distribution/kubernetes/vector-agent/daemonset.yaml b/distribution/kubernetes/vector-agent/daemonset.yaml
index b1ef77d0dd828..ccf4c7012a3d9 100644
--- a/distribution/kubernetes/vector-agent/daemonset.yaml
+++ b/distribution/kubernetes/vector-agent/daemonset.yaml
@@ -9,7 +9,7 @@ metadata:
     app.kubernetes.io/name: vector
     app.kubernetes.io/instance: vector
     app.kubernetes.io/component: Agent
-    app.kubernetes.io/version: "0.47.0-distroless-libc"
+    app.kubernetes.io/version: "0.48.0-distroless-libc"
 spec:
   selector:
     matchLabels:
@@ -30,7 +30,7 @@ spec:
       dnsPolicy: ClusterFirst
       containers:
         - name: vector
-          image: "timberio/vector:0.47.0-distroless-libc"
+          image: "timberio/vector:0.48.0-distroless-libc"
           imagePullPolicy: IfNotPresent
           args:
             - --config-dir
diff --git a/distribution/kubernetes/vector-agent/rbac.yaml b/distribution/kubernetes/vector-agent/rbac.yaml
index f1e1f7351ddd5..52706a906caa7 100644
--- a/distribution/kubernetes/vector-agent/rbac.yaml
+++ b/distribution/kubernetes/vector-agent/rbac.yaml
@@ -10,7 +10,7 @@ metadata:
     app.kubernetes.io/name: vector
     app.kubernetes.io/instance: vector
     app.kubernetes.io/component: Agent
-    app.kubernetes.io/version: "0.47.0-distroless-libc"
+    app.kubernetes.io/version: "0.48.0-distroless-libc"
 rules:
   - apiGroups:
       - ""
@@ -31,7 +31,7 @@ metadata:
     app.kubernetes.io/name: vector
     app.kubernetes.io/instance: vector
     app.kubernetes.io/component: Agent
-    app.kubernetes.io/version: "0.47.0-distroless-libc"
+    app.kubernetes.io/version: "0.48.0-distroless-libc"
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
diff --git a/distribution/kubernetes/vector-agent/service-headless.yaml b/distribution/kubernetes/vector-agent/service-headless.yaml
index c7a5c971fc2f7..47b1e5eb01786 100644
--- a/distribution/kubernetes/vector-agent/service-headless.yaml
+++ b/distribution/kubernetes/vector-agent/service-headless.yaml
@@ -9,7 +9,7 @@ metadata:
     app.kubernetes.io/name: vector
     app.kubernetes.io/instance: vector
     app.kubernetes.io/component: Agent
-    app.kubernetes.io/version: "0.47.0-distroless-libc"
+    app.kubernetes.io/version: "0.48.0-distroless-libc"
   annotations:
 spec:
   clusterIP: None
diff --git a/distribution/kubernetes/vector-agent/serviceaccount.yaml b/distribution/kubernetes/vector-agent/serviceaccount.yaml
index 18198d14032b0..98e97909f02ba 100644
--- a/distribution/kubernetes/vector-agent/serviceaccount.yaml
+++ b/distribution/kubernetes/vector-agent/serviceaccount.yaml
@@ -9,5 +9,5 @@ metadata:
     app.kubernetes.io/name: vector
     app.kubernetes.io/instance: vector
     app.kubernetes.io/component: Agent
-    app.kubernetes.io/version: "0.47.0-distroless-libc"
+    app.kubernetes.io/version: "0.48.0-distroless-libc"
 automountServiceAccountToken: true
diff --git a/distribution/kubernetes/vector-aggregator/README.md b/distribution/kubernetes/vector-aggregator/README.md
index 2940d28c48a1a..d8ef30ba866bb 100644
--- a/distribution/kubernetes/vector-aggregator/README.md
+++ b/distribution/kubernetes/vector-aggregator/README.md
@@ -1,6 +1,6 @@
 The kubernetes manifests found in this directory have been automatically generated
 from the [helm chart `vector/vector`](https://github.com/vectordotdev/helm-charts/tree/master/charts/vector)
-version 0.43.0 with the following `values.yaml`:
+version 0.44.0 with the following `values.yaml`:
 
 ```yaml
 
diff --git a/distribution/kubernetes/vector-aggregator/configmap.yaml b/distribution/kubernetes/vector-aggregator/configmap.yaml
index 5548ef74f65ed..9aba164839b89 100644
--- a/distribution/kubernetes/vector-aggregator/configmap.yaml
+++ b/distribution/kubernetes/vector-aggregator/configmap.yaml
@@ -9,7 +9,7 @@ metadata:
     app.kubernetes.io/name: vector
     app.kubernetes.io/instance: vector
     app.kubernetes.io/component: Aggregator
-    app.kubernetes.io/version: "0.47.0-distroless-libc"
+    app.kubernetes.io/version: "0.48.0-distroless-libc"
 data:
   aggregator.yaml: |
     data_dir: /vector-data-dir
diff --git a/distribution/kubernetes/vector-aggregator/service-headless.yaml b/distribution/kubernetes/vector-aggregator/service-headless.yaml
index b3e79b9d67718..b8a0b0acddd6c 100644
--- a/distribution/kubernetes/vector-aggregator/service-headless.yaml
+++ b/distribution/kubernetes/vector-aggregator/service-headless.yaml
@@ -9,7 +9,7 @@ metadata:
     app.kubernetes.io/name: vector
     app.kubernetes.io/instance: vector
     app.kubernetes.io/component: Aggregator
-    app.kubernetes.io/version: "0.47.0-distroless-libc"
+    app.kubernetes.io/version: "0.48.0-distroless-libc"
   annotations:
 spec:
   clusterIP: None
diff --git a/distribution/kubernetes/vector-aggregator/service.yaml b/distribution/kubernetes/vector-aggregator/service.yaml
index fe65a612a1fc0..001bdfa32753a 100644
--- a/distribution/kubernetes/vector-aggregator/service.yaml
+++ b/distribution/kubernetes/vector-aggregator/service.yaml
@@ -9,7 +9,7 @@ metadata:
     app.kubernetes.io/name: vector
     app.kubernetes.io/instance: vector
     app.kubernetes.io/component: Aggregator
-    app.kubernetes.io/version: "0.47.0-distroless-libc"
+    app.kubernetes.io/version: "0.48.0-distroless-libc"
   annotations:
 spec:
   ports:
diff --git a/distribution/kubernetes/vector-aggregator/serviceaccount.yaml b/distribution/kubernetes/vector-aggregator/serviceaccount.yaml
index cab03421b9df7..193853224def2 100644
--- a/distribution/kubernetes/vector-aggregator/serviceaccount.yaml
+++ b/distribution/kubernetes/vector-aggregator/serviceaccount.yaml
@@ -9,5 +9,5 @@ metadata:
     app.kubernetes.io/name: vector
     app.kubernetes.io/instance: vector
     app.kubernetes.io/component: Aggregator
-    app.kubernetes.io/version: "0.47.0-distroless-libc"
+    app.kubernetes.io/version: "0.48.0-distroless-libc"
 automountServiceAccountToken: true
diff --git a/distribution/kubernetes/vector-aggregator/statefulset.yaml b/distribution/kubernetes/vector-aggregator/statefulset.yaml
index a8f500eec9656..8c7700752d288 100644
--- a/distribution/kubernetes/vector-aggregator/statefulset.yaml
+++ b/distribution/kubernetes/vector-aggregator/statefulset.yaml
@@ -9,7 +9,7 @@ metadata:
     app.kubernetes.io/name: vector
     app.kubernetes.io/instance: vector
     app.kubernetes.io/component: Aggregator
-    app.kubernetes.io/version: "0.47.0-distroless-libc"
+    app.kubernetes.io/version: "0.48.0-distroless-libc"
   annotations: {}
 spec:
   replicas: 1
@@ -34,7 +34,7 @@ spec:
       dnsPolicy: ClusterFirst
       containers:
         - name: vector
-          image: "timberio/vector:0.47.0-distroless-libc"
+          image: "timberio/vector:0.48.0-distroless-libc"
           imagePullPolicy: IfNotPresent
           args:
             - --config-dir
diff --git a/distribution/kubernetes/vector-stateless-aggregator/README.md b/distribution/kubernetes/vector-stateless-aggregator/README.md
index 73042c237387b..3805e31a4fa94 100644
--- a/distribution/kubernetes/vector-stateless-aggregator/README.md
+++ b/distribution/kubernetes/vector-stateless-aggregator/README.md
@@ -1,6 +1,6 @@
 The kubernetes manifests found in this directory have been automatically generated
 from the [helm chart `vector/vector`](https://github.com/vectordotdev/helm-charts/tree/master/charts/vector)
-version 0.43.0 with the following `values.yaml`:
+version 0.44.0 with the following `values.yaml`:
 
 ```yaml
 role: Stateless-Aggregator
diff --git a/distribution/kubernetes/vector-stateless-aggregator/configmap.yaml b/distribution/kubernetes/vector-stateless-aggregator/configmap.yaml
index 9285d34da1486..c5c6bf9999984 100644
--- a/distribution/kubernetes/vector-stateless-aggregator/configmap.yaml
+++ b/distribution/kubernetes/vector-stateless-aggregator/configmap.yaml
@@ -9,7 +9,7 @@ metadata:
     app.kubernetes.io/name: vector
     app.kubernetes.io/instance: vector
     app.kubernetes.io/component: Stateless-Aggregator
-    app.kubernetes.io/version: "0.47.0-distroless-libc"
+    app.kubernetes.io/version: "0.48.0-distroless-libc"
 data:
   aggregator.yaml: |
     data_dir: /vector-data-dir
diff --git a/distribution/kubernetes/vector-stateless-aggregator/deployment.yaml b/distribution/kubernetes/vector-stateless-aggregator/deployment.yaml
index 90e636d234352..8c17457b4dd82 100644
--- a/distribution/kubernetes/vector-stateless-aggregator/deployment.yaml
+++ b/distribution/kubernetes/vector-stateless-aggregator/deployment.yaml
@@ -9,7 +9,7 @@ metadata:
     app.kubernetes.io/name: vector
     app.kubernetes.io/instance: vector
     app.kubernetes.io/component: Stateless-Aggregator
-    app.kubernetes.io/version: "0.47.0-distroless-libc"
+    app.kubernetes.io/version: "0.48.0-distroless-libc"
   annotations: {}
 spec:
   replicas: 1
@@ -32,7 +32,7 @@ spec:
       dnsPolicy: ClusterFirst
       containers:
         - name: vector
-          image: "timberio/vector:0.47.0-distroless-libc"
+          image: "timberio/vector:0.48.0-distroless-libc"
           imagePullPolicy: IfNotPresent
           args:
             - --config-dir
diff --git a/distribution/kubernetes/vector-stateless-aggregator/service-headless.yaml b/distribution/kubernetes/vector-stateless-aggregator/service-headless.yaml
index a79fa284683e8..114fb02de8c54 100644
--- a/distribution/kubernetes/vector-stateless-aggregator/service-headless.yaml
+++ b/distribution/kubernetes/vector-stateless-aggregator/service-headless.yaml
@@ -9,7 +9,7 @@ metadata:
     app.kubernetes.io/name: vector
     app.kubernetes.io/instance: vector
     app.kubernetes.io/component: Stateless-Aggregator
-    app.kubernetes.io/version: "0.47.0-distroless-libc"
+    app.kubernetes.io/version: "0.48.0-distroless-libc"
   annotations:
 spec:
   clusterIP: None
diff --git a/distribution/kubernetes/vector-stateless-aggregator/service.yaml b/distribution/kubernetes/vector-stateless-aggregator/service.yaml
index d4ec508ea0188..175021e357b2e 100644
--- a/distribution/kubernetes/vector-stateless-aggregator/service.yaml
+++ b/distribution/kubernetes/vector-stateless-aggregator/service.yaml
@@ -9,7 +9,7 @@ metadata:
     app.kubernetes.io/name: vector
     app.kubernetes.io/instance: vector
     app.kubernetes.io/component: Stateless-Aggregator
-    app.kubernetes.io/version: "0.47.0-distroless-libc"
+    app.kubernetes.io/version: "0.48.0-distroless-libc"
   annotations:
 spec:
   ports:
diff --git a/distribution/kubernetes/vector-stateless-aggregator/serviceaccount.yaml b/distribution/kubernetes/vector-stateless-aggregator/serviceaccount.yaml
index ab1579b288218..d52c46f47a713 100644
--- a/distribution/kubernetes/vector-stateless-aggregator/serviceaccount.yaml
+++ b/distribution/kubernetes/vector-stateless-aggregator/serviceaccount.yaml
@@ -9,5 +9,5 @@ metadata:
     app.kubernetes.io/name: vector
     app.kubernetes.io/instance: vector
     app.kubernetes.io/component: Stateless-Aggregator
-    app.kubernetes.io/version: "0.47.0-distroless-libc"
+    app.kubernetes.io/version: "0.48.0-distroless-libc"
 automountServiceAccountToken: true
diff --git a/website/content/en/releases/0.48.0.md b/website/content/en/releases/0.48.0.md
new file mode 100644
index 0000000000000..023683a50c25a
--- /dev/null
+++ b/website/content/en/releases/0.48.0.md
@@ -0,0 +1,4 @@
+---
+title: Vector v0.48.0 release notes
+weight: 26
+---
diff --git a/website/cue/reference/administration/interfaces/kubectl.cue b/website/cue/reference/administration/interfaces/kubectl.cue
index ea5f5b2b9c4a1..e39c18992909e 100644
--- a/website/cue/reference/administration/interfaces/kubectl.cue
+++ b/website/cue/reference/administration/interfaces/kubectl.cue
@@ -19,7 +19,7 @@ administration: interfaces: kubectl: {
 	role_implementations: [Name=string]: {
 		commands: {
 			_deployment_variant:       string
-			_vector_version:           "0.47"
+			_vector_version:           "0.48"
 			_namespace:                string | *"vector"
 			_controller_resource_type: string
 			_controller_resource_name: string | *_deployment_variant
diff --git a/website/cue/reference/releases/0.48.0.cue b/website/cue/reference/releases/0.48.0.cue
new file mode 100644
index 0000000000000..a9bd1b3b85642
--- /dev/null
+++ b/website/cue/reference/releases/0.48.0.cue
@@ -0,0 +1,294 @@
+package metadata
+
+releases: "0.48.0": {
+	date:     "2025-06-30"
+	codename: ""
+
+	whats_next: []
+
+	description: """
+		The Vector team is excited to announce version `0.48.0`!
+
+		This release new configuration options for various components.
+		For example, VRL expressions can be used in HTTP
+		query parameters.
+
+		Also, this release includes numerous bug fixes which should improve Vector's reliability in
+		production environments.
+		"""
+
+	changelog: [
+		{
+			type: "enhancement"
+			description: """
+				The HTTP client source now supports VRL within query parameters.
+
+				For example:
+				```yaml
+				sources:
+					http:
+						type: http_client
+						endpoint: https://endpoint.com
+						method: GET
+						query:
+							timestamp:
+								 value: "now()"
+								 type: "vrl"
+							foo:
+								 value: "bar"
+								 type: "string"
+				```
+				
+				This means that HTTP requests can now be made with dynamic query parameters.
+				This is particularly useful for generating unique timestamps or UUIDs per request.
+				"""
+			contributors: ["benjamin-awd"]
+		},
+		{
+			type: "feat"
+			description: """
+				The `kubernetes_logs` source now includes a new `max_merged_line_bytes` configuration option. This setting enables users to cap the size of log lines after they’ve been combined using `auto_partial_merge`. Previously, the `max_line_bytes` field only restricted line sizes *before* merging, leaving no practical way to limit the length of merged lines—unless you set a size so tiny that it prevented merging altogether by stopping short of the continuation character. This new option gives you better control over merged line sizes.
+				"""
+			contributors: ["ganelo"]
+		},
+		{
+			type: "feat"
+			description: """
+				Adds trace data type support to the Axiom sink allowing propagation of
+				OpenTelemetry traces received via the `opentelemetry` or compatible trace
+				emitting components.
+				"""
+			contributors: ["darach"]
+		},
+		{
+			type: "fix"
+			description: """
+				The `amqp` sink now attempts to re-connect to the AMQP broker when the channel has been disconnected. It will also create up to 4 channels in a pool (configurable with the `max_channels` setting) to improve throughput.
+				"""
+			contributors: ["aramperes"]
+		},
+		{
+			type: "enhancement"
+			description: """
+				Updated the Splunk HEC source to accept requests that contain the header content-type with any value containing "application/json," not the exact value of "application/json." This matches the behavior of a true Splunk HEC. Allows sources from AWS to successfully send events to the Splunk HEC source without additional proxying to update headers.
+				"""
+			contributors: ["Tot19"]
+		},
+		{
+			type: "fix"
+			description: """
+				The dnstap source now correctly labels DNS response code 16 as BADVERS instead of BADSIG, which is reserved for TSIG RRs.
+				"""
+			contributors: ["esensar", "Quad9DNS"]
+		},
+		{
+			type: "fix"
+			description: """
+				Improved `dnstap` source TCP backpressure and load handling.
+				"""
+			contributors: ["esensar", "Quad9DNS"]
+		},
+		{
+			type: "feat"
+			description: """
+				Enabled URL path access in VRL scripts of custom auth strategy for server components.
+				"""
+			contributors: ["byronwolfman"]
+		},
+		{
+			type: "fix"
+			description: """
+				Unknown fields in the `tls` config are now rejected so these fields now need to be removed for Vector to start successfully.
+				"""
+			contributors: ["thomasqueirozb"]
+		},
+		{
+			type: "feat"
+			description: """
+				Added `rate_limit_num` and `rate_limit_duration_secs` options to `kafka` sink, to enable rate limiting this sink.
+				"""
+			contributors: ["esensar", "Quad9DNS"]
+		},
+		{
+			type: "fix"
+			description: """
+				Fixed panic in `opentelemetry` source when a `NaN` float value is received. `NaN` values are now converted to `null`.
+				"""
+			contributors: ["srstrickland"]
+		},
+		{
+			type: "feat"
+			description: """
+				VRL programs can now read, write, and delete the `interval_ms` field in metric events.
+				"""
+			contributors: ["thomasqueirozb"]
+		},
+		{
+			type: "feat"
+			description: """
+				Added vector uptime in seconds to `vector top`.
+				"""
+			contributors: ["esensar", "Quad9DNS"]
+		},
+		{
+			type: "feat"
+			description: """
+				The `socket` source with `udp` mode now supports joining multicast groups via the `multicast_groups` option
+				of that source. This allows the source to receive multicast packets from the specified multicast groups.
+				
+				Note that in order to work properly, the `socket` address must be set to `0.0.0.0` and not
+				to `127.0.0.1` (localhost) or any other specific IP address. If other IP address is used, the host's interface
+				will filter out the multicast packets as the packet target IP (multicast) would not match the host's interface IP.
+				"""
+			contributors: ["jorgehermo9"]
+		},
+		{
+			type: "enhancement"
+			description: """
+				Adds support for session tokens in AWS authentication options. When using temporary credentials (access key, secret key, and session token), the session token is required. Temporary credentials can be provided by an external system and updated using the `SECRET` backend.
+				"""
+			contributors: ["anil-db"]
+		},
+		{
+			type: "fix"
+			description: """
+				Fix panic when dnstap parser encounters unusual timestamps.
+				"""
+			contributors: ["wooffie"]
+		},
+		{
+			type: "fix"
+			description: """
+				The `elasticsearch` sink now encodes parameters such as `index` that contain characters that need to
+				be escaped in JSON strings.
+				"""
+			contributors: ["jszwedko"]
+		},
+		{
+			type: "fix"
+			description: """
+				Fix crash when dnstap source parses unexpected socket address values.”
+				"""
+			contributors: ["wooffie"]
+		},
+		{
+			type: "fix"
+			description: """
+				Fix bug allowing invalid Prometheus timestamps; now properly rejected during parsing.
+				"""
+			contributors: ["wooffie"]
+		},
+		{
+			type: "fix"
+			description: """
+				The `aws_ecs_metrics` source now skips over empty ECS metrics payloads. It previously failed to parse such payloads.
+				"""
+			contributors: ["tustvold"]
+		},
+	]
+
+	vrl_changelog: """
+		### [0.25.0 (2025-06-26)]
+		
+		#### Enhancements
+		
+		- Add support for decompressing lz4 frame compressed data.
+		
+		authors: jimmystewpot (https://github.com/vectordotdev/vrl/pull/1367)
+		"""
+
+	commits: [
+		{sha: "968f3c91c3db6c1b57f4a329cb03f1978744b18d", date: "2025-05-17 01:33:24 UTC", description: "relax prepare script branch creation", pr_number: 23067, scopes: ["releasing"], type: "chore", breaking_change: false, author: "Pavlos Rontidis", files_count: 1, insertions_count: 2, deletions_count: 2},
+		{sha: "e76f18ec820cf381716eca16c51ccdd11963af17", date: "2025-05-20 01:07:29 UTC", description: "Handling bad addresses in dsntap", pr_number: 23071, scopes: ["parsing"], type: "fix", breaking_change: false, author: "Burkov Egor", files_count: 2, insertions_count: 56, deletions_count: 1},
+		{sha: "bf57582d5855cf7beae12eb88bf21e911680489c", date: "2025-05-20 00:03:23 UTC", description: "update VRL changelog block insertion", pr_number: 23075, scopes: ["releasing"], type: "chore", breaking_change: false, author: "Pavlos Rontidis", files_count: 1, insertions_count: 91, deletions_count: 54},
+		{sha: "eb12304ebd8b2b06fd50df242d660b056a33b8a3", date: "2025-05-20 19:51:36 UTC", description: "update git repo url for homebrew release", pr_number: 23081, scopes: ["ci"], type: "fix", breaking_change: false, author: "Pavlos Rontidis", files_count: 1, insertions_count: 2, deletions_count: 1},
+		{sha: "0ce2de7527170e2b9792a7916391a8d5483bc949", date: "2025-05-21 00:03:02 UTC", description: "improve release templates", pr_number: 23080, scopes: ["releasing"], type: "chore", breaking_change: false, author: "Pavlos Rontidis", files_count: 2, insertions_count: 73, deletions_count: 31},
+		{sha: "34db5b0d784392e8d1c687edb6682ca980dcace8", date: "2025-05-21 01:20:19 UTC", description: "final release steps", pr_number: 23085, scopes: ["releasing"], type: "chore", breaking_change: false, author: "Pavlos Rontidis", files_count: 60, insertions_count: 465, deletions_count: 210},
+		{sha: "bb6a91404cdc3f662b037cc4d5f52237b28d215d", date: "2025-05-22 01:31:12 UTC", description: "Refactor `struct SourceSender` a bit", pr_number: 23089, scopes: ["sources"], type: "chore", breaking_change: false, author: "Bruce Guenter", files_count: 1, insertions_count: 58, deletions_count: 72},
+		{sha: "3528fc19162a6c722209423ea1db0e2e754bfaf8", date: "2025-05-28 20:43:47 UTC", description: "Move `TransformOutputsBuf` functions out of test flag", pr_number: 23116, scopes: ["transforms"], type: "chore", breaking_change: false, author: "Josué AGBEKODO", files_count: 1, insertions_count: 0, deletions_count: 5},
+		{sha: "5ac8263dc400033552cc86a1885a6f8a2d3cfd0a", date: "2025-06-05 05:20:48 UTC", description: "Add trace data support to Axiom Configuration for the axiom sink", pr_number: 22935, scopes: ["axiom sink"], type: "feat", breaking_change: false, author: "Darach Ennis", files_count: 2, insertions_count: 6, deletions_count: 1},
+		{sha: "c6cc716d12cd3e16fa3504ae8353ee294f53c0b7", date: "2025-06-06 02:53:40 UTC", description: "Updates SMP cli client version", pr_number: 23125, scopes: ["ci"], type: "chore", breaking_change: false, author: "Scott Opell", files_count: 1, insertions_count: 1, deletions_count: 1},
+		{sha: "2f8f1c3474f7f5a0717ab8f1879750844e07ff05", date: "2025-06-09 17:54:22 UTC", description: "Bump check-spelling/check-spelling from 0.0.24 to 0.0.25", pr_number: 23143, scopes: ["ci"], type: "chore", breaking_change: false, author: "dependabot[bot]", files_count: 1, insertions_count: 1, deletions_count: 1},
+		{sha: "03e6215ee4bdb37790e2356ce89990d461079ada", date: "2025-06-09 17:54:49 UTC", description: "Bump aws-actions/configure-aws-credentials from 4.1.0 to 4.2.1", pr_number: 23142, scopes: ["ci"], type: "chore", breaking_change: false, author: "dependabot[bot]", files_count: 1, insertions_count: 6, deletions_count: 6},
+		{sha: "a34ab883c1682444c55e5f15757e20c024f763db", date: "2025-06-09 17:55:33 UTC", description: "Bump ossf/scorecard-action from 2.4.1 to 2.4.2", pr_number: 23141, scopes: ["ci"], type: "chore", breaking_change: false, author: "dependabot[bot]", files_count: 1, insertions_count: 1, deletions_count: 1},
+		{sha: "59adb1aa767d471d2de3c3ac705e8dfe35e3c5d9", date: "2025-06-09 21:55:58 UTC", description: "Bump docker/build-push-action from 6.16.0 to 6.18.0", pr_number: 23140, scopes: ["ci"], type: "chore", breaking_change: false, author: "dependabot[bot]", files_count: 2, insertions_count: 3, deletions_count: 3},
+		{sha: "a04b4d3bd094902a2aa92feed981b21687e3fd68", date: "2025-06-09 22:01:18 UTC", description: "Bump tokio from 1.44.2 to 1.45.1", pr_number: 23136, scopes: ["deps"], type: "chore", breaking_change: false, author: "dependabot[bot]", files_count: 11, insertions_count: 16, deletions_count: 16},
+		{sha: "e5f533e86c6914369b3b34c9e68a0f23ec85e7d9", date: "2025-06-09 22:01:39 UTC", description: "Bump quickcheck_macros from 1.0.0 to 1.1.0", pr_number: 23135, scopes: ["deps"], type: "chore", breaking_change: false, author: "dependabot[bot]", files_count: 1, insertions_count: 3, deletions_count: 3},
+		{sha: "563a9f048195f10e81044edca867d7788e755bd8", date: "2025-06-09 22:01:59 UTC", description: "Bump uuid from 1.16.0 to 1.17.0", pr_number: 23134, scopes: ["deps"], type: "chore", breaking_change: false, author: "dependabot[bot]", files_count: 2, insertions_count: 6, deletions_count: 5},
+		{sha: "ddb412160664cee505619e75f69a3d56fd9f337b", date: "2025-06-09 22:03:55 UTC", description: "Bump crc from 3.2.1 to 3.3.0", pr_number: 23132, scopes: ["deps"], type: "chore", breaking_change: false, author: "dependabot[bot]", files_count: 2, insertions_count: 3, deletions_count: 3},
+		{sha: "fcc546a4ad7229f949852044900e6ff997016905", date: "2025-06-09 22:04:41 UTC", description: "Bump confy from 0.6.1 to 1.0.0", pr_number: 23130, scopes: ["deps"], type: "chore", breaking_change: false, author: "dependabot[bot]", files_count: 2, insertions_count: 7, deletions_count: 28},
+		{sha: "a03f45c511ef3893317153b07ba0fc2f51cf12ef", date: "2025-06-09 22:23:41 UTC", description: "Bump windows-service from 0.7.0 to 0.8.0", pr_number: 22557, scopes: ["deps"], type: "chore", breaking_change: false, author: "dependabot[bot]", files_count: 2, insertions_count: 4, deletions_count: 4},
+		{sha: "2e067e7054dd4cd88f4b2416407b49b902ccb447", date: "2025-06-09 21:23:45 UTC", description: "Handle sources with no default output", pr_number: 23172, scopes: ["sources"], type: "fix", breaking_change: false, author: "Bruce Guenter", files_count: 1, insertions_count: 13, deletions_count: 6},
+		{sha: "4539b58964ab8bf23fb8f51a34718e233f7555db", date: "2025-06-10 04:47:04 UTC", description: "fix rcode 16 handling in dnsmsg-parser", pr_number: 23106, scopes: ["dnstap source"], type: "fix", breaking_change: false, author: "Ensar Sarajčić", files_count: 6, insertions_count: 10, deletions_count: 5},
+		{sha: "1bf3328af6c4f4d01a9830a34a7078906431ecff", date: "2025-06-10 01:54:25 UTC", description: "add docker compose debug logs (if a test fails)", pr_number: 23176, scopes: ["ci"], type: "chore", breaking_change: false, author: "Pavlos Rontidis", files_count: 4, insertions_count: 84, deletions_count: 19},
+		{sha: "6c1922e2769c49b70db179f94e9969802e319ef8", date: "2025-06-10 18:16:38 UTC", description: "update Rust to 1.86", pr_number: 23175, scopes: ["deps"], type: "chore", breaking_change: false, author: "Pavlos Rontidis", files_count: 41, insertions_count: 68, deletions_count: 67},
+		{sha: "ab886d8e1b1f22ffae76ebc999c9494971ec0780", date: "2025-06-10 19:56:11 UTC", description: "update cargo-deny version to support 2024 edition", pr_number: 23178, scopes: ["ci"], type: "fix", breaking_change: false, author: "Pavlos Rontidis", files_count: 2, insertions_count: 3, deletions_count: 3},
+		{sha: "0191c3af087c1eb00094c7076452d27f19c92e50", date: "2025-06-11 02:44:51 UTC", description: "Bump ring from 0.17.12 to 0.17.14 in the cargo group", pr_number: 23020, scopes: ["deps"], type: "chore", breaking_change: false, author: "dependabot[bot]", files_count: 2, insertions_count: 3, deletions_count: 3},
+		{sha: "f84dbbc915b525d4ba54257bbf40de209468b2f6", date: "2025-06-11 05:59:56 UTC", description: "Timestamp error handling in dnstap parser", pr_number: 23072, scopes: ["parsing"], type: "fix", breaking_change: false, author: "Burkov Egor", files_count: 2, insertions_count: 9, deletions_count: 5},
+		{sha: "d1da30726228589ec8f84e38052feb60e67afdc7", date: "2025-06-10 23:18:08 UTC", description: "Bump the patches group across 1 directory with 27 updates", pr_number: 23179, scopes: ["deps"], type: "chore", breaking_change: false, author: "dependabot[bot]", files_count: 11, insertions_count: 252, deletions_count: 231},
+		{sha: "7082f2e5f0b809f8625ee5093247bd7ac5cadcec", date: "2025-06-11 00:22:29 UTC", description: "Fix spelling and add QA'd to allow.txt", pr_number: 23182, scopes: ["internal docs"], type: "chore", breaking_change: false, author: "Thomas", files_count: 2, insertions_count: 2, deletions_count: 1},
+		{sha: "333cd765f0d8bd414413caac1b12b07960efece8", date: "2025-06-11 13:48:41 UTC", description: "Allow content-type header if it includes application/json", pr_number: 23024, scopes: ["splunk_hec source"], type: "feat", breaking_change: false, author: "tot19", files_count: 2, insertions_count: 97, deletions_count: 10},
+		{sha: "c03abd71ec406e4ec49b14d3461cc800f52f3286", date: "2025-06-11 23:32:11 UTC", description: "multicast udp socket support", pr_number: 22099, scopes: ["sources"], type: "feat", breaking_change: false, author: "Jorge Hermo", files_count: 8, insertions_count: 289, deletions_count: 14},
+		{sha: "25296d0d01c8e2e9eac87096b2bff5ea07094afe", date: "2025-06-12 00:52:11 UTC", description: "Prometheus timestamp parse int overflow handle", pr_number: 23077, scopes: ["parsing"], type: "fix", breaking_change: false, author: "Burkov Egor", files_count: 2, insertions_count: 32, deletions_count: 4},
+		{sha: "60fdc8a1cf96963bc99d2b0148befb11a6d75f34", date: "2025-06-11 19:19:31 UTC", description: "Add deny_unknown_fields to TlsEnableableConfig", pr_number: 23187, scopes: ["core"], type: "fix", breaking_change: false, author: "Thomas", files_count: 2, insertions_count: 4, deletions_count: 0},
+		{sha: "ce5e6d445254b5f284076dd70c1b2ced27825c90", date: "2025-06-11 23:38:20 UTC", description: "remove vector-test-harness from REVIEWING.md", pr_number: 23192, scopes: ["internal docs"], type: "docs", breaking_change: false, author: "Thomas", files_count: 1, insertions_count: 1, deletions_count: 1},
+		{sha: "5b8afb4d20c5678ff43e9eb91eaf7dbbb425c231", date: "2025-06-12 04:53:22 UTC", description: "Bump tempfile from 3.19.1 to 3.20.0", pr_number: 23137, scopes: ["deps"], type: "chore", breaking_change: false, author: "dependabot[bot]", files_count: 11, insertions_count: 15, deletions_count: 15},
+		{sha: "bf9f3444833aa8334125632bc0ba92dcaebb47d2", date: "2025-06-12 17:34:33 UTC", description: "Bump snafu from 0.7.5 to 0.8.0", pr_number: 19481, scopes: ["deps"], type: "chore", breaking_change: false, author: "dependabot[bot]", files_count: 2, insertions_count: 12, deletions_count: 12},
+		{sha: "064efc13e37ae69500c2ae8c4cd5bb168605dc0f", date: "2025-06-12 18:20:02 UTC", description: "Add enableable to allow.txt", pr_number: 23197, scopes: ["internal docs"], type: "chore", breaking_change: false, author: "Thomas", files_count: 1, insertions_count: 1, deletions_count: 0},
+		{sha: "dffcb5a02c881dd94a84470722ca4e6040a9cc43", date: "2025-06-13 02:29:08 UTC", description: "Enable `internal_log_rate_limit` by default", pr_number: 22899, scopes: ["dev"], type: "feat", breaking_change: false, author: "Shivanth MP", files_count: 78, insertions_count: 135, deletions_count: 176},
+		{sha: "fbb2dea4c1fedf514d7e6fa0d764c45e489ee3a4", date: "2025-06-13 04:59:59 UTC", description: "add rate limit configuration for `kafka` sink", pr_number: 23196, scopes: ["kafka sink"], type: "feat", breaking_change: false, author: "Ensar Sarajčić", files_count: 5, insertions_count: 59, deletions_count: 2},
+		{sha: "865c8aca2007e4e280dffae27babc33fee079216", date: "2025-06-12 22:02:13 UTC", description: "allow to provide aws session token", pr_number: 22964, scopes: ["sinks"], type: "enhancement", breaking_change: false, author: "Anil Gupta", files_count: 24, insertions_count: 189, deletions_count: 1},
+		{sha: "f31839be8b0b7425fdc3c3fc44e6557dece627ee", date: "2025-06-13 01:11:44 UTC", description: "Allow specification of a maximum line size to be applied after merging instead of just before", pr_number: 22582, scopes: ["kubernetes_logs source"], type: "enhancement", breaking_change: false, author: "Orri Ganel", files_count: 14, insertions_count: 358, deletions_count: 54},
+		{sha: "7205b4a7273ec4480d6e03375df01b29002df504", date: "2025-06-13 17:55:42 UTC", description: "attempt one reconnect when channel has errored", pr_number: 22971, scopes: ["amqp sink"], type: "fix", breaking_change: false, author: "Aram Peres", files_count: 12, insertions_count: 163, deletions_count: 38},
+		{sha: "e6ac12207dbe53c2ebe638d94199175c65fa9f65", date: "2025-06-13 20:58:12 UTC", description: "Bump rustls from 0.20.9 to 0.22.4", pr_number: 21808, scopes: ["deps"], type: "chore", breaking_change: false, author: "dependabot[bot]", files_count: 1, insertions_count: 9, deletions_count: 9},
+		{sha: "89f73419b94c4ac82e4e9dc9f422e87fa41445d9", date: "2025-06-13 18:33:41 UTC", description: "Handle NaN in opentelemetry source without panic", pr_number: 23201, scopes: ["opentelemetry source"], type: "fix", breaking_change: false, author: "Scott Strickland", files_count: 2, insertions_count: 39, deletions_count: 1},
+		{sha: "521cad69a33ad25016f1acad15492d50186fdd49", date: "2025-06-14 11:06:27 UTC", description: "Fix config extension typo in Windows command (from-source.md)", pr_number: 23166, scopes: ["website"], type: "docs", breaking_change: false, author: "Tenghuan He", files_count: 1, insertions_count: 1, deletions_count: 1},
+		{sha: "e74575a27e255e7202c2fd05481c23104165bb6a", date: "2025-06-13 20:10:09 UTC", description: "Encode bulk action parameters as JSON", pr_number: 21293, scopes: ["elasticsearch sink"], type: "fix", breaking_change: false, author: "Jesse Szwedko", files_count: 3, insertions_count: 122, deletions_count: 40},
+		{sha: "ed67c6d6c41ef87b43dee6a80d5f808c8684ae7d", date: "2025-06-16 22:52:43 UTC", description: "skip over empty ECS metrics payloads", pr_number: 23151, scopes: ["aws_ecs_metrics source"], type: "fix", breaking_change: false, author: "Raphael Taylor-Davies", files_count: 2, insertions_count: 24, deletions_count: 4},
+		{sha: "932bb6797db4766e66714bf18c6529cf99c7366a", date: "2025-06-16 23:53:16 UTC", description: "Bump pulsar to 6.3.1", pr_number: 22862, scopes: ["deps"], type: "chore", breaking_change: false, author: "Jakub Onderka", files_count: 3, insertions_count: 74, deletions_count: 55},
+		{sha: "71be227f29febf1efc82859ef19677f99ec82ac4", date: "2025-06-16 21:17:53 UTC", description: "add missing perms to gardener_remove_waiting_author.yml", pr_number: 23213, scopes: ["ci"], type: "fix", breaking_change: false, author: "Pavlos Rontidis", files_count: 1, insertions_count: 6, deletions_count: 1},
+		{sha: "f41cae298cd16d3360d0239c39b48ee076e434a9", date: "2025-06-16 21:34:57 UTC", description: "render input and output badges for all components", pr_number: 23204, scopes: ["website"], type: "feat", breaking_change: false, author: "Pavlos Rontidis", files_count: 11, insertions_count: 234, deletions_count: 179},
+		{sha: "42ab24cc74f0b0a8fb3fa95c0b829ade1d226c78", date: "2025-06-16 21:37:59 UTC", description: "Remove docker_logs.txt and fix annotations", pr_number: 23214, scopes: ["internal"], type: "chore", breaking_change: false, author: "Thomas", files_count: 2, insertions_count: 0, deletions_count: 2},
+		{sha: "b8fdf424cb7d4bdc1b987c7fc24f37d4683c8b3b", date: "2025-06-16 21:56:13 UTC", description: "add Docker gitignore rules", pr_number: 23215, scopes: ["dev"], type: "chore", breaking_change: false, author: "Pavlos Rontidis", files_count: 1, insertions_count: 16, deletions_count: 1},
+		{sha: "3ff55b87bc4362a24d9b06b91b5fc8efb1246875", date: "2025-06-16 22:11:47 UTC", description: "fix memory enrichment table highlight wording", pr_number: 23216, scopes: ["external"], type: "docs", breaking_change: false, author: "Pavlos Rontidis", files_count: 1, insertions_count: 4, deletions_count: 13},
+		{sha: "ae13b3b4d26a82a5f2585362f1b8c5d8368f8d47", date: "2025-06-17 03:53:04 UTC", description: "fix opentelemetry typo", pr_number: 22586, scopes: ["website"], type: "docs", breaking_change: false, author: "Matt Simons", files_count: 1, insertions_count: 1, deletions_count: 1},
+		{sha: "e594c7b575030a4c51dc108a412f89a2d91ea259", date: "2025-06-17 05:34:56 UTC", description: "Bump greptimedb", pr_number: 23210, scopes: ["deps"], type: "chore", breaking_change: false, author: "Jakub Onderka", files_count: 2, insertions_count: 9, deletions_count: 22},
+		{sha: "fc1146aaaf89d4def75ee43854e7f31a76a290ae", date: "2025-06-17 00:40:03 UTC", description: "prettier rc formatting of hugo/html", pr_number: 23218, scopes: ["website"], type: "chore", breaking_change: false, author: "Pavlos Rontidis", files_count: 5, insertions_count: 1889, deletions_count: 1789},
+		{sha: "d720b303d2e87b75767a07a92a6fd3b52a180e01", date: "2025-06-17 18:22:04 UTC", description: "Make interval_ms modifiable via VRL", pr_number: 23217, scopes: ["core"], type: "feat", breaking_change: false, author: "Thomas", files_count: 3, insertions_count: 95, deletions_count: 43},
+		{sha: "11e1cea3135bc22500fe90c9d9ac884892bf6da8", date: "2025-06-17 16:56:25 UTC", description: "Fix `InlineSingleUseReferencesVisitor` failing merges", pr_number: 23207, scopes: ["config"], type: "chore", breaking_change: false, author: "Bruce Guenter", files_count: 4, insertions_count: 137, deletions_count: 54},
+		{sha: "05d1521fc0fb08e74104a86b52e5241deda57d88", date: "2025-06-18 09:08:47 UTC", description: "allow VRL in query parameters", pr_number: 22706, scopes: ["http_client source"], type: "enhancement", breaking_change: false, author: "Benjamin Dornel", files_count: 12, insertions_count: 627, deletions_count: 61},
+		{sha: "abd5e0ca26c3328a7c3e7acc1aa5f283033703d6", date: "2025-06-18 00:11:25 UTC", description: "add input telemetry types section for transforms and sinks", pr_number: 23222, scopes: ["website"], type: "feat", breaking_change: false, author: "Pavlos Rontidis", files_count: 35, insertions_count: 256, deletions_count: 69},
+		{sha: "2f71bb716fc052493e5aa396456cf9db1dd92722", date: "2025-06-17 23:27:07 UTC", description: "use latest VRL and update function signature", pr_number: 23221, scopes: ["core"], type: "chore", breaking_change: false, author: "Thomas", files_count: 4, insertions_count: 73, deletions_count: 68},
+		{sha: "4cca9474763f234333d9c88d5f1a8efe76b0717b", date: "2025-06-18 00:26:08 UTC", description: "minor improvements to output data section", pr_number: 23225, scopes: ["website"], type: "chore", breaking_change: false, author: "Pavlos Rontidis", files_count: 2, insertions_count: 4, deletions_count: 4},
+		{sha: "154fe3ef90919bcbbbb4b7f093be67fa28228533", date: "2025-06-19 00:07:21 UTC", description: "fix vector exiting if nats sink url fails dns resolution or is unavailable without --require-healthy", pr_number: 23167, scopes: ["nats sink"], type: "fix", breaking_change: false, author: "rdwr-tomers", files_count: 3, insertions_count: 20, deletions_count: 7},
+		{sha: "aded15be572117b2dd5c7fc1874a18fb84ec2572", date: "2025-06-19 02:44:32 UTC", description: "Fixed documentation badges space on documentation", pr_number: 23229, scopes: ["website"], type: "fix", breaking_change: false, author: "melinoix", files_count: 1, insertions_count: 1, deletions_count: 1},
+		{sha: "8488649f616ddb410cac09a00ac8c38fb1a9c275", date: "2025-06-19 04:25:32 UTC", description: "implement all TCP dnstap options to reduce error", pr_number: 23123, scopes: ["dnstap source"], type: "fix", breaking_change: false, author: "Ensar Sarajčić", files_count: 2, insertions_count: 137, deletions_count: 36},
+		{sha: "7f20e0f3b4ec35f09b55edc830b7633d684f8a74", date: "2025-06-20 19:53:09 UTC", description: "sort allow.txt lines", pr_number: 23237, scopes: ["dev"], type: "chore", breaking_change: false, author: "Pavlos Rontidis", files_count: 1, insertions_count: 274, deletions_count: 274},
+		{sha: "ebfa262363eceed03c08671253dd93534138e80f", date: "2025-06-20 21:34:09 UTC", description: "improve gitignore", pr_number: 23239, scopes: ["dev"], type: "chore", breaking_change: false, author: "Pavlos Rontidis", files_count: 2, insertions_count: 41, deletions_count: 18},
+		{sha: "cd8d07fc2d25268b68a0eed5cdc01d78bcd3e304", date: "2025-06-20 20:47:11 UTC", description: "improve environment variable docs", pr_number: 23236, scopes: ["website"], type: "chore", breaking_change: false, author: "Pavlos Rontidis", files_count: 5, insertions_count: 105, deletions_count: 42},
+		{sha: "675245880fbf3582a17c567e153d733db9b6a695", date: "2025-06-20 21:22:19 UTC", description: "improve and remove authorization requirements", pr_number: 23224, scopes: ["ci"], type: "feat", breaking_change: false, author: "Thomas", files_count: 3, insertions_count: 29, deletions_count: 43},
+		{sha: "0e8f813f6b1e6dacbb927740f622e127a0933a2f", date: "2025-06-20 21:30:32 UTC", description: "remove obsolete and unused team.cue", pr_number: 23238, scopes: ["internal"], type: "docs", breaking_change: false, author: "Pavlos Rontidis", files_count: 2, insertions_count: 2, deletions_count: 162},
+		{sha: "207a608fbda792fad0b271134d4af7b9bc731712", date: "2025-06-20 22:06:33 UTC", description: "Remove Page source and Edit this page buttons", pr_number: 23240, scopes: ["website"], type: "chore", breaking_change: false, author: "Thomas", files_count: 3, insertions_count: 0, deletions_count: 28},
+		{sha: "01bbc690b04253071fce3a6bab513ff71049b9b7", date: "2025-06-21 04:08:04 UTC", description: "add uptime seconds display to `vector top`", pr_number: 23228, scopes: ["observability"], type: "feat", breaking_change: false, author: "Ensar Sarajčić", files_count: 7, insertions_count: 53, deletions_count: 12},
+		{sha: "ba2b75b8b44855106ad15fa4f790b8410755dcf7", date: "2025-06-21 03:38:30 UTC", description: "Bump convert_case from 0.7.1 to 0.8.0", pr_number: 22556, scopes: ["deps"], type: "chore", breaking_change: false, author: "dependabot[bot]", files_count: 2, insertions_count: 11, deletions_count: 2},
+		{sha: "a0ef7aaed4368cdc99eca177524fc77669a0f6e2", date: "2025-06-23 17:31:31 UTC", description: "fix changelog check by fetching correct ref", pr_number: 23241, scopes: ["ci"], type: "fix", breaking_change: false, author: "Thomas", files_count: 1, insertions_count: 2, deletions_count: 3},
+		{sha: "96f8624e225deaee9bb1a20a6e2bba7774972332", date: "2025-06-24 05:53:35 UTC", description: "Update tower to v`0.5`", pr_number: 23186, scopes: ["deps"], type: "chore", breaking_change: false, author: "Serendo", files_count: 8, insertions_count: 87, deletions_count: 68},
+		{sha: "6a88922da9b4112be6f0ab835cf039391db25327", date: "2025-06-23 21:11:08 UTC", description: "improve decoder docs", pr_number: 23245, scopes: ["website"], type: "chore", breaking_change: false, author: "Pavlos Rontidis", files_count: 23, insertions_count: 195, deletions_count: 45},
+		{sha: "2bb9e8ef43f949c23e59549bbfd7ed2e63667003", date: "2025-06-23 21:11:24 UTC", description: "update PULL_REQUEST_TEMPLATE", pr_number: 23248, scopes: ["ci"], type: "chore", breaking_change: false, author: "Thomas", files_count: 1, insertions_count: 32, deletions_count: 33},
+		{sha: "2fda2e7cf116251016a29cd3da874a860235fc3d", date: "2025-06-23 21:32:09 UTC", description: "add author to changelog", pr_number: 23250, scopes: ["ci"], type: "fix", breaking_change: false, author: "Thomas", files_count: 1, insertions_count: 2, deletions_count: 0},
+		{sha: "94c964a3f27a9afab479fe42e9930db4a0ca6a2d", date: "2025-06-23 21:58:03 UTC", description: "add/fix telemetry input & output for transforms", pr_number: 23247, scopes: ["website"], type: "chore", breaking_change: false, author: "Pavlos Rontidis", files_count: 13, insertions_count: 98, deletions_count: 0},
+		{sha: "1ee4d2f025b14553083211820b51ff74755612d3", date: "2025-06-24 00:23:52 UTC", description: "fix telemetry types for Sinks", pr_number: 23251, scopes: ["website"], type: "chore", breaking_change: false, author: "Pavlos Rontidis", files_count: 9, insertions_count: 65, deletions_count: 22},
+		{sha: "212320097b49e39e7bce93619ffa9095a590b84d", date: "2025-06-24 01:17:30 UTC", description: "always run 'integration-tests' for the MQ", pr_number: 23252, scopes: ["ci"], type: "fix", breaking_change: false, author: "Pavlos Rontidis", files_count: 1, insertions_count: 3, deletions_count: 2},
+		{sha: "55a8371376fc4da71a56bc35be438a483889c823", date: "2025-06-24 18:00:18 UTC", description: "minor fixes for minor release tmpl", pr_number: 23258, scopes: ["releasing"], type: "chore", breaking_change: false, author: "Pavlos Rontidis", files_count: 1, insertions_count: 3, deletions_count: 2},
+		{sha: "d9dc37c1867db1e07431770b2b1b4cb1953267b5", date: "2025-06-24 18:27:02 UTC", description: "re-add nats to integration tests and revert broken PR", pr_number: 23256, scopes: ["ci"], type: "fix", breaking_change: false, author: "Thomas", files_count: 5, insertions_count: 9, deletions_count: 23},
+		{sha: "820e63b77803bb0995b9aed10ecefc15547ca69c", date: "2025-06-24 19:10:05 UTC", description: "add access to URL path in custom VRL auth", pr_number: 23165, scopes: ["sources"], type: "feat", breaking_change: false, author: "Byron Wolfman", files_count: 5, insertions_count: 51, deletions_count: 13},
+		{sha: "93f82b7ccae468b6f813588c4503ec9933dc615f", date: "2025-06-24 20:35:51 UTC", description: "avoid IT setup if suite will not run", pr_number: 23259, scopes: ["ci"], type: "chore", breaking_change: false, author: "Pavlos Rontidis", files_count: 1, insertions_count: 7, deletions_count: 4},
+		{sha: "b364a1e692894df8843707e8f26c67a21e9497ce", date: "2025-06-25 17:18:36 UTC", description: "don't run K8S E2E tests on website only changes", pr_number: 23260, scopes: ["ci"], type: "feat", breaking_change: false, author: "Thomas", files_count: 2, insertions_count: 9, deletions_count: 2},
+		{sha: "9d3d0a87187890f1efe5ce03cd7f067fd75d64b0", date: "2025-06-25 20:37:42 UTC", description: "add `int build` command", pr_number: 23265, scopes: ["vdev"], type: "chore", breaking_change: false, author: "Pavlos Rontidis", files_count: 10, insertions_count: 166, deletions_count: 98},
+		{sha: "e4bfd06469d405ddb561c110b158fb1cc85aaf37", date: "2025-06-25 21:25:37 UTC", description: "refactoring (preparation for follow up PRs)", pr_number: 23266, scopes: ["ci"], type: "chore", breaking_change: false, author: "Pavlos Rontidis", files_count: 1, insertions_count: 17, deletions_count: 12},
+		{sha: "516bbc91b21559ed99f835428d456fac0af391cc", date: "2025-06-25 22:07:35 UTC", description: "fix telemetry types for Sources", pr_number: 23267, scopes: ["website"], type: "chore", breaking_change: false, author: "Thomas", files_count: 16, insertions_count: 470, deletions_count: 349},
+		{sha: "150208ab6af00f80e0d5a71a8b4f48e106c51cba", date: "2025-06-26 00:48:47 UTC", description: "K8S E2E tests skipping changes.yml in MQ", pr_number: 23268, scopes: ["ci"], type: "fix", breaking_change: false, author: "Thomas", files_count: 2, insertions_count: 9, deletions_count: 8},
+		{sha: "022c840ebe1c3ef6e506bd9d9c1b596c7624f610", date: "2025-06-26 17:19:22 UTC", description: "remove unusued all-tests placeholder", pr_number: 23269, scopes: ["ci"], type: "fix", breaking_change: false, author: "Pavlos Rontidis", files_count: 4, insertions_count: 8, deletions_count: 22},
+		{sha: "1357e1a3ab03e044e5aad33210898229a823dc20", date: "2025-06-26 19:53:18 UTC", description: "use git2 for some git operations", pr_number: 23270, scopes: ["vdev"], type: "chore", breaking_change: false, author: "Pavlos Rontidis", files_count: 3, insertions_count: 83, deletions_count: 8},
+	]
+}
diff --git a/website/cue/reference/versions.cue b/website/cue/reference/versions.cue
index fcd606b214c63..5ea34d5a8bda7 100644
--- a/website/cue/reference/versions.cue
+++ b/website/cue/reference/versions.cue
@@ -2,6 +2,7 @@ package metadata
 
 // This has to be maintained manually because there's currently no way to sort versions programmatically
 versions: [string, ...string] & [
+	"0.48.0",
 	"0.47.0",
 	"0.46.1",
 	"0.46.0",

From 8ad26282d2211188ac8003f60c0b0fc6484b259b Mon Sep 17 00:00:00 2001
From: Pavlos Rontidis <pavlos.rontidis@gmail.com>
Date: Tue, 1 Jul 2025 09:22:19 -0400
Subject: [PATCH 133/305] chore(docs): add username to allow list

---
 .github/actions/spelling/allow.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/actions/spelling/allow.txt b/.github/actions/spelling/allow.txt
index 09f3e31c25b14..2ca815cca913b 100644
--- a/.github/actions/spelling/allow.txt
+++ b/.github/actions/spelling/allow.txt
@@ -532,3 +532,4 @@ zstandard
 ZTE
 Zync
 envsubst
+jimmystewpot

From 2afe6d8c453d5e481500609cdd5c4653de0994b3 Mon Sep 17 00:00:00 2001
From: Pavlos Rontidis <pavlos.rontidis@gmail.com>
Date: Tue, 1 Jul 2025 09:33:09 -0400
Subject: [PATCH 134/305] fix(ci): use PAT for homebrew releasing workflow
 (which is currently failing)

---
 vdev/src/commands/release/homebrew.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vdev/src/commands/release/homebrew.rs b/vdev/src/commands/release/homebrew.rs
index 213e6ce1c5ed3..2be3550c2f8e7 100644
--- a/vdev/src/commands/release/homebrew.rs
+++ b/vdev/src/commands/release/homebrew.rs
@@ -40,7 +40,7 @@ impl Cli {
 
 /// Clones the repository and sets up Git configuration
 fn clone_and_setup_git(username: &str) -> Result<()> {
-    let github_token = env::var("GITHUB_TOKEN")?;
+    let github_token = env::var("HOMEBREW_TOKEN")?;
     let homebrew_repo = format!(
         "https://{username}:{github_token}@github.com/{username}/homebrew-brew.git"
     );

From 3281b07f4f4516d408ab7c300bdc7c3cf563702f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Jul 2025 09:46:28 -0400
Subject: [PATCH 135/305] chore(deps): Bump proptest from 1.6.0 to 1.7.0
 (#23312)

Bumps [proptest](https://github.com/proptest-rs/proptest) from 1.6.0 to 1.7.0.
- [Release notes](https://github.com/proptest-rs/proptest/releases)
- [Changelog](https://github.com/proptest-rs/proptest/blob/main/CHANGELOG.md)
- [Commits](https://github.com/proptest-rs/proptest/commits)

---
updated-dependencies:
- dependency-name: proptest
  dependency-version: 1.7.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock                    | 14 +++++++-------
 Cargo.toml                    |  2 +-
 lib/vector-buffers/Cargo.toml |  2 +-
 lib/vector-core/Cargo.toml    |  4 ++--
 lib/vector-stream/Cargo.toml  |  2 +-
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index e1a319f33b891..066ee24023319 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -7742,17 +7742,17 @@ dependencies = [
 
 [[package]]
 name = "proptest"
-version = "1.6.0"
+version = "1.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14cae93065090804185d3b75f0bf93b8eeda30c7a9b4a33d3bdb3988d6229e50"
+checksum = "6fcdab19deb5195a31cf7726a210015ff1496ba1464fd42cb4f537b8b01b471f"
 dependencies = [
  "bit-set",
  "bit-vec",
  "bitflags 2.9.0",
  "lazy_static",
  "num-traits",
- "rand 0.8.5",
- "rand_chacha 0.3.1",
+ "rand 0.9.1",
+ "rand_chacha 0.9.0",
  "rand_xorshift",
  "regex-syntax 0.8.5",
  "rusty-fork",
@@ -8315,11 +8315,11 @@ dependencies = [
 
 [[package]]
 name = "rand_xorshift"
-version = "0.3.0"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d25bf25ec5ae4a3f1b92f929810509a2f53d7dca2f50b794ff57e3face536c8f"
+checksum = "513962919efc330f829edb2535844d1b912b0fbe2ca165d613e4e8788bb05a5a"
 dependencies = [
- "rand_core 0.6.4",
+ "rand_core 0.9.0",
 ]
 
 [[package]]
diff --git a/Cargo.toml b/Cargo.toml
index 8540bd667e4bb..019012204d7a3 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -154,7 +154,7 @@ metrics-util = { version = "0.18.0", default-features = false, features = ["regi
 nom = { version = "8.0.0", default-features = false }
 paste = { version = "1.0.15" }
 pin-project = { version = "1.1.10", default-features = false }
-proptest = { version = "1.6" }
+proptest = { version = "1.7" }
 proptest-derive = { version = "0.5.1" }
 prost = { version = "0.12", default-features = false, features = ["std"] }
 prost-build = { version = "0.12", default-features = false }
diff --git a/lib/vector-buffers/Cargo.toml b/lib/vector-buffers/Cargo.toml
index dfe21bae73628..312d7f4fa1b12 100644
--- a/lib/vector-buffers/Cargo.toml
+++ b/lib/vector-buffers/Cargo.toml
@@ -40,7 +40,7 @@ crossbeam-queue = "0.3.12"
 hdrhistogram = "7.5.4"
 metrics-tracing-context.workspace = true
 metrics-util = { workspace = true, features = ["debugging"] }
-proptest = "1.6"
+proptest = "1.7"
 quickcheck = "1.0"
 rand.workspace = true
 serde_yaml = { version = "0.9", default-features = false }
diff --git a/lib/vector-core/Cargo.toml b/lib/vector-core/Cargo.toml
index e7df732eb0bed..8bc103b717c4c 100644
--- a/lib/vector-core/Cargo.toml
+++ b/lib/vector-core/Cargo.toml
@@ -37,7 +37,7 @@ ordered-float = { version = "4.6.0", default-features = false }
 openssl = { version = "0.10.73", default-features = false, features = ["vendored"] }
 parking_lot = { version = "0.12.4", default-features = false }
 pin-project.workspace = true
-proptest = { version = "1.6", optional = true }
+proptest = { version = "1.7", optional = true }
 prost-types.workspace = true
 prost .workspace = true
 quanta = { version = "0.12.6", default-features = false }
@@ -82,7 +82,7 @@ criterion = { version = "0.5.1", features = ["html_reports"] }
 env-test-util = "1.0.1"
 quickcheck = "1"
 quickcheck_macros = "1"
-proptest = "1.6"
+proptest = "1.7"
 similar-asserts = "1.7.0"
 tokio-test = "0.4.4"
 toml.workspace = true
diff --git a/lib/vector-stream/Cargo.toml b/lib/vector-stream/Cargo.toml
index 4af3d5f4f4759..e06cb4b123315 100644
--- a/lib/vector-stream/Cargo.toml
+++ b/lib/vector-stream/Cargo.toml
@@ -19,6 +19,6 @@ vector-common = { path = "../vector-common" }
 vector-core = { path = "../vector-core" }
 
 [dev-dependencies]
-proptest = "1.6"
+proptest = "1.7"
 rand.workspace = true
 rand_distr.workspace = true

From b8edba0f58dda2c73a7351c2da7a12e9ef2aa2cd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Jul 2025 09:54:14 -0400
Subject: [PATCH 136/305] chore(deps): Bump lru from 0.14.0 to 0.15.0 (#23303)

Bumps [lru](https://github.com/jeromefroe/lru-rs) from 0.14.0 to 0.15.0.
- [Changelog](https://github.com/jeromefroe/lru-rs/blob/master/CHANGELOG.md)
- [Commits](https://github.com/jeromefroe/lru-rs/compare/0.14.0...0.15.0)

---
updated-dependencies:
- dependency-name: lru
  dependency-version: 0.15.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock | 6 +++---
 Cargo.toml | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 066ee24023319..01db9994ef41a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5908,9 +5908,9 @@ dependencies = [
 
 [[package]]
 name = "lru"
-version = "0.14.0"
+version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f8cc7106155f10bdf99a6f379688f543ad6596a415375b36a59a054ceda1198"
+checksum = "0281c2e25e62316a5c9d98f2d2e9e95a37841afdaf4383c177dbb5c1dfab0568"
 
 [[package]]
 name = "lru-cache"
@@ -11655,7 +11655,7 @@ dependencies = [
  "libc",
  "listenfd",
  "loki-logproto",
- "lru 0.14.0",
+ "lru 0.15.0",
  "maxminddb",
  "md-5",
  "metrics",
diff --git a/Cargo.toml b/Cargo.toml
index 019012204d7a3..0a9f4c17aeeea 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -358,7 +358,7 @@ itertools = { version = "0.14.0", default-features = false, optional = false, fe
 k8s-openapi = { version = "0.22.0", default-features = false, features = ["v1_26"], optional = true }
 kube = { version = "0.93.0", default-features = false, features = ["client", "openssl-tls", "runtime"], optional = true }
 listenfd = { version = "1.0.2", default-features = false, optional = true }
-lru = { version = "0.14.0", default-features = false, optional = true }
+lru = { version = "0.15.0", default-features = false, optional = true }
 maxminddb = { version = "0.26.0", default-features = false, optional = true, features = ["simdutf8"] }
 md-5 = { version = "0.10", default-features = false, optional = true }
 mongodb = { version = "2.8.2", default-features = false, features = ["tokio-runtime"], optional = true }

From 47cf6acb68ca347e1d48f14456087620bac5c108 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Jul 2025 10:05:06 -0400
Subject: [PATCH 137/305] chore(deps): Bump mock_instant from 0.5.3 to 0.6.0
 (#23301)

---
updated-dependencies:
- dependency-name: mock_instant
  dependency-version: 0.6.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock                   | 4 ++--
 lib/tracing-limit/Cargo.toml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 01db9994ef41a..54d36f955603d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6239,9 +6239,9 @@ dependencies = [
 
 [[package]]
 name = "mock_instant"
-version = "0.5.3"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e1d4c44418358edcac6e1d9ce59cea7fb38052429c7704033f1196f0c179e6a"
+checksum = "dce6dd36094cac388f119d2e9dc82dc730ef91c32a6222170d630e5414b956e6"
 
 [[package]]
 name = "moka"
diff --git a/lib/tracing-limit/Cargo.toml b/lib/tracing-limit/Cargo.toml
index 8fb0fb62090e1..f3ea08910e4cd 100644
--- a/lib/tracing-limit/Cargo.toml
+++ b/lib/tracing-limit/Cargo.toml
@@ -14,7 +14,7 @@ dashmap = { version = "6.1.0", default-features = false }
 [dev-dependencies]
 criterion = "0.5"
 tracing = "0.1.34"
-mock_instant = { version = "0.5" }
+mock_instant = { version = "0.6" }
 tracing-subscriber = { version = "0.3.19", default-features = false, features = ["env-filter", "fmt"] }
 
 [[bench]]

From ffacb27885f5dab2e6ff3a024563d4b3f813b4b8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Jul 2025 14:11:57 +0000
Subject: [PATCH 138/305] chore(deps): Bump the patches group with 14 updates
 (#23305)

Bumps the patches group with 14 updates:

| Package | From | To |
| --- | --- | --- |
| [snafu](https://github.com/shepmaster/snafu) | `0.8.0` | `0.8.6` |
| [aws-runtime](https://github.com/smithy-lang/smithy-rs) | `1.5.7` | `1.5.8` |
| [aws-sigv4](https://github.com/smithy-lang/smithy-rs) | `1.3.2` | `1.3.3` |
| [aws-smithy-runtime-api](https://github.com/smithy-lang/smithy-rs) | `1.8.0` | `1.8.1` |
| [aws-smithy-types](https://github.com/smithy-lang/smithy-rs) | `1.3.1` | `1.3.2` |
| [async-compression](https://github.com/Nullus157/async-compression) | `0.4.24` | `0.4.25` |
| [h2](https://github.com/hyperium/h2) | `0.4.10` | `0.4.11` |
| [thread_local](https://github.com/Amanieu/thread_local-rs) | `1.1.8` | `1.1.9` |
| [libc](https://github.com/rust-lang/libc) | `0.2.172` | `0.2.174` |
| [wiremock](https://github.com/LukeMathWalker/wiremock-rs) | `0.6.3` | `0.6.4` |
| [memchr](https://github.com/BurntSushi/memchr) | `2.7.4` | `2.7.5` |
| [syn](https://github.com/dtolnay/syn) | `2.0.102` | `2.0.104` |
| [indicatif](https://github.com/console-rs/indicatif) | `0.17.11` | `0.17.12` |
| [owo-colors](https://github.com/owo-colors/owo-colors) | `4.2.1` | `4.2.2` |


Updates `snafu` from 0.8.0 to 0.8.6
- [Changelog](https://github.com/shepmaster/snafu/blob/main/CHANGELOG.md)
- [Commits](https://github.com/shepmaster/snafu/compare/0.8.0...0.8.6)

Updates `aws-runtime` from 1.5.7 to 1.5.8
- [Release notes](https://github.com/smithy-lang/smithy-rs/releases)
- [Changelog](https://github.com/smithy-lang/smithy-rs/blob/main/CHANGELOG.md)
- [Commits](https://github.com/smithy-lang/smithy-rs/commits)

Updates `aws-sigv4` from 1.3.2 to 1.3.3
- [Release notes](https://github.com/smithy-lang/smithy-rs/releases)
- [Changelog](https://github.com/smithy-lang/smithy-rs/blob/main/CHANGELOG.md)
- [Commits](https://github.com/smithy-lang/smithy-rs/commits)

Updates `aws-smithy-runtime-api` from 1.8.0 to 1.8.1
- [Release notes](https://github.com/smithy-lang/smithy-rs/releases)
- [Changelog](https://github.com/smithy-lang/smithy-rs/blob/main/CHANGELOG.md)
- [Commits](https://github.com/smithy-lang/smithy-rs/commits)

Updates `aws-smithy-types` from 1.3.1 to 1.3.2
- [Release notes](https://github.com/smithy-lang/smithy-rs/releases)
- [Changelog](https://github.com/smithy-lang/smithy-rs/blob/main/CHANGELOG.md)
- [Commits](https://github.com/smithy-lang/smithy-rs/commits)

Updates `async-compression` from 0.4.24 to 0.4.25
- [Release notes](https://github.com/Nullus157/async-compression/releases)
- [Changelog](https://github.com/Nullus157/async-compression/blob/main/CHANGELOG.md)
- [Commits](https://github.com/Nullus157/async-compression/compare/v0.4.24...v0.4.25)

Updates `h2` from 0.4.10 to 0.4.11
- [Release notes](https://github.com/hyperium/h2/releases)
- [Changelog](https://github.com/hyperium/h2/blob/master/CHANGELOG.md)
- [Commits](https://github.com/hyperium/h2/compare/v0.4.10...v0.4.11)

Updates `thread_local` from 1.1.8 to 1.1.9
- [Release notes](https://github.com/Amanieu/thread_local-rs/releases)
- [Changelog](https://github.com/Amanieu/thread_local-rs/blob/master/CHANGELOG.md)
- [Commits](https://github.com/Amanieu/thread_local-rs/compare/1.1.8...v1.1.9)

Updates `libc` from 0.2.172 to 0.2.174
- [Release notes](https://github.com/rust-lang/libc/releases)
- [Changelog](https://github.com/rust-lang/libc/blob/0.2.174/CHANGELOG.md)
- [Commits](https://github.com/rust-lang/libc/compare/0.2.172...0.2.174)

Updates `wiremock` from 0.6.3 to 0.6.4
- [Changelog](https://github.com/LukeMathWalker/wiremock-rs/blob/main/CHANGELOG.md)
- [Commits](https://github.com/LukeMathWalker/wiremock-rs/compare/v0.6.3...v0.6.4)

Updates `memchr` from 2.7.4 to 2.7.5
- [Commits](https://github.com/BurntSushi/memchr/compare/2.7.4...2.7.5)

Updates `syn` from 2.0.102 to 2.0.104
- [Release notes](https://github.com/dtolnay/syn/releases)
- [Commits](https://github.com/dtolnay/syn/compare/2.0.102...2.0.104)

Updates `indicatif` from 0.17.11 to 0.17.12
- [Release notes](https://github.com/console-rs/indicatif/releases)
- [Commits](https://github.com/console-rs/indicatif/compare/0.17.11...0.17.12)

Updates `owo-colors` from 4.2.1 to 4.2.2
- [Release notes](https://github.com/owo-colors/owo-colors/releases)
- [Changelog](https://github.com/owo-colors/owo-colors/blob/main/CHANGELOG.md)
- [Commits](https://github.com/owo-colors/owo-colors/compare/v4.2.1...v4.2.2)

---
updated-dependencies:
- dependency-name: snafu
  dependency-version: 0.8.6
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: patches
- dependency-name: aws-runtime
  dependency-version: 1.5.8
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: patches
- dependency-name: aws-sigv4
  dependency-version: 1.3.3
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: patches
- dependency-name: aws-smithy-runtime-api
  dependency-version: 1.8.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: patches
- dependency-name: aws-smithy-types
  dependency-version: 1.3.2
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: patches
- dependency-name: async-compression
  dependency-version: 0.4.25
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: patches
- dependency-name: h2
  dependency-version: 0.4.11
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: patches
- dependency-name: thread_local
  dependency-version: 1.1.9
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: patches
- dependency-name: libc
  dependency-version: 0.2.174
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: patches
- dependency-name: wiremock
  dependency-version: 0.6.4
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: patches
- dependency-name: memchr
  dependency-version: 2.7.5
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: patches
- dependency-name: syn
  dependency-version: 2.0.104
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: patches
- dependency-name: indicatif
  dependency-version: 0.17.12
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: patches
- dependency-name: owo-colors
  dependency-version: 4.2.2
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: patches
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock      | 330 ++++++++++++++++++++++++++++++------------------
 Cargo.toml      |  14 +-
 vdev/Cargo.toml |   4 +-
 3 files changed, 219 insertions(+), 129 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 54d36f955603d..e454061b16d74 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -421,9 +421,9 @@ dependencies = [
 
 [[package]]
 name = "async-compression"
-version = "0.4.24"
+version = "0.4.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d615619615a650c571269c00dca41db04b9210037fa76ed8239f70404ab56985"
+checksum = "40f6024f3f856663b45fd0c9b6f2024034a702f453549449e0d84a305900dad4"
 dependencies = [
  "brotli",
  "flate2",
@@ -531,7 +531,7 @@ dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
  "strum 0.26.3",
- "syn 2.0.102",
+ "syn 2.0.104",
  "thiserror 1.0.68",
 ]
 
@@ -712,7 +712,7 @@ checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.102",
+ "syn 2.0.104",
 ]
 
 [[package]]
@@ -752,7 +752,7 @@ checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.102",
+ "syn 2.0.104",
 ]
 
 [[package]]
@@ -769,7 +769,7 @@ checksum = "e539d3fca749fcee5236ab05e93a52867dd549cc157c8cb7f99595f3cedffdb5"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.102",
+ "syn 2.0.104",
 ]
 
 [[package]]
@@ -837,9 +837,9 @@ dependencies = [
 
 [[package]]
 name = "aws-runtime"
-version = "1.5.7"
+version = "1.5.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c4063282c69991e57faab9e5cb21ae557e59f5b0fb285c196335243df8dc25c"
+checksum = "4f6c68419d8ba16d9a7463671593c54f81ba58cab466e9b759418da606dcc2e2"
 dependencies = [
  "aws-credential-types",
  "aws-sigv4",
@@ -1181,9 +1181,9 @@ dependencies = [
 
 [[package]]
 name = "aws-sigv4"
-version = "1.3.2"
+version = "1.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3734aecf9ff79aa401a6ca099d076535ab465ff76b46440cf567c8e70b65dc13"
+checksum = "ddfb9021f581b71870a17eac25b52335b82211cdc092e02b6876b2bcefa61666"
 dependencies = [
  "aws-credential-types",
  "aws-smithy-eventstream",
@@ -1254,9 +1254,9 @@ dependencies = [
 
 [[package]]
 name = "aws-smithy-eventstream"
-version = "0.60.8"
+version = "0.60.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c45d3dddac16c5c59d553ece225a88870cf81b7b813c9cc17b78cf4685eac7a"
+checksum = "338a3642c399c0a5d157648426110e199ca7fd1c689cc395676b81aa563700c4"
 dependencies = [
  "aws-smithy-types",
  "bytes 1.10.1",
@@ -1293,7 +1293,7 @@ dependencies = [
  "aws-smithy-async",
  "aws-smithy-runtime-api",
  "aws-smithy-types",
- "h2 0.4.10",
+ "h2 0.4.11",
  "http 0.2.9",
  "http-body 0.4.5",
  "hyper 0.14.28",
@@ -1358,9 +1358,9 @@ dependencies = [
 
 [[package]]
 name = "aws-smithy-runtime-api"
-version = "1.8.0"
+version = "1.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1e5d9e3a80a18afa109391fb5ad09c3daf887b516c6fd805a157c6ea7994a57"
+checksum = "bd8531b6d8882fd8f48f82a9754e682e29dd44cff27154af51fa3eb730f59efb"
 dependencies = [
  "aws-smithy-async",
  "aws-smithy-types",
@@ -1375,9 +1375,9 @@ dependencies = [
 
 [[package]]
 name = "aws-smithy-types"
-version = "1.3.1"
+version = "1.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "40076bd09fadbc12d5e026ae080d0930defa606856186e31d83ccc6a255eeaf3"
+checksum = "d498595448e43de7f4296b7b7a18a8a02c61ec9349128c80a368f7c3b4ab11a8"
 dependencies = [
  "base64-simd",
  "bytes 1.10.1",
@@ -1734,7 +1734,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e6cbbb8f56245b5a479b30a62cdc86d26e2f35c2b9f594bc4671654b03851380"
 dependencies = [
  "quote 1.0.40",
- "syn 2.0.102",
+ "syn 2.0.104",
 ]
 
 [[package]]
@@ -2230,7 +2230,7 @@ dependencies = [
  "heck 0.5.0",
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.102",
+ "syn 2.0.104",
 ]
 
 [[package]]
@@ -2294,7 +2294,7 @@ dependencies = [
  "serde_with 3.12.0",
  "similar-asserts",
  "smallvec",
- "snafu 0.8.0",
+ "snafu 0.8.6",
  "syslog_loose",
  "tokio",
  "tokio-util",
@@ -2420,10 +2420,22 @@ dependencies = [
  "encode_unicode 0.3.6",
  "lazy_static",
  "libc",
- "unicode-width 0.1.13",
  "windows-sys 0.45.0",
 ]
 
+[[package]]
+name = "console"
+version = "0.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2e09ced7ebbccb63b4c65413d821f2e00ce54c5ca4514ddc6b3c892fdbcbc69d"
+dependencies = [
+ "encode_unicode 1.0.0",
+ "libc",
+ "once_cell",
+ "unicode-width 0.2.0",
+ "windows-sys 0.60.2",
+]
+
 [[package]]
 name = "console-api"
 version = "0.8.1"
@@ -2840,7 +2852,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.102",
+ "syn 2.0.104",
 ]
 
 [[package]]
@@ -2888,7 +2900,7 @@ dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
  "strsim 0.11.1",
- "syn 2.0.102",
+ "syn 2.0.104",
 ]
 
 [[package]]
@@ -2910,7 +2922,7 @@ checksum = "fc34b93ccb385b40dc71c6fceac4b2ad23662c7eeb248cf10d529b7e055b6ead"
 dependencies = [
  "darling_core 0.20.11",
  "quote 1.0.40",
- "syn 2.0.102",
+ "syn 2.0.104",
 ]
 
 [[package]]
@@ -3048,7 +3060,7 @@ checksum = "67e77553c4162a157adbf834ebae5b415acbecbeafc7a74b0e886657506a7611"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.102",
+ "syn 2.0.104",
 ]
 
 [[package]]
@@ -3069,7 +3081,7 @@ dependencies = [
  "darling 0.20.11",
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.102",
+ "syn 2.0.104",
 ]
 
 [[package]]
@@ -3079,7 +3091,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "206868b8242f27cecce124c19fd88157fbd0dd334df2587f36417bafbc85097b"
 dependencies = [
  "derive_builder_core",
- "syn 2.0.102",
+ "syn 2.0.104",
 ]
 
 [[package]]
@@ -3141,7 +3153,7 @@ dependencies = [
  "libc",
  "option-ext",
  "redox_users 0.5.0",
- "windows-sys 0.59.0",
+ "windows-sys 0.60.2",
 ]
 
 [[package]]
@@ -3163,7 +3175,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.102",
+ "syn 2.0.104",
 ]
 
 [[package]]
@@ -3185,7 +3197,7 @@ dependencies = [
  "criterion",
  "data-encoding",
  "hickory-proto",
- "snafu 0.8.0",
+ "snafu 0.8.6",
 ]
 
 [[package]]
@@ -3202,7 +3214,7 @@ dependencies = [
  "paste",
  "prost 0.12.6",
  "prost-build 0.12.6",
- "snafu 0.8.0",
+ "snafu 0.8.6",
  "tracing 0.1.41",
  "vector-lib",
  "vrl",
@@ -3221,7 +3233,7 @@ dependencies = [
  "anyhow",
  "serde",
  "serde_json",
- "snafu 0.8.0",
+ "snafu 0.8.6",
  "tracing 0.1.41",
  "vector-config",
  "vector-config-common",
@@ -3266,7 +3278,7 @@ checksum = "0e197fdfd2cdb5fdeb7f8ddcf3aed5d5d04ecde2890d448b14ffb716f7376b70"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.102",
+ "syn 2.0.104",
 ]
 
 [[package]]
@@ -3435,7 +3447,7 @@ dependencies = [
  "heck 0.4.1",
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.102",
+ "syn 2.0.104",
 ]
 
 [[package]]
@@ -3447,7 +3459,7 @@ dependencies = [
  "once_cell",
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.102",
+ "syn 2.0.104",
 ]
 
 [[package]]
@@ -3467,7 +3479,7 @@ checksum = "67c78a4d8fdf9953a5c9d458f9efe940fd97a0cab0941c075a813ac594733827"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.102",
+ "syn 2.0.104",
 ]
 
 [[package]]
@@ -3961,7 +3973,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.102",
+ "syn 2.0.104",
 ]
 
 [[package]]
@@ -4230,7 +4242,7 @@ dependencies = [
  "parking_lot",
  "prost 0.12.6",
  "rand 0.9.1",
- "snafu 0.8.0",
+ "snafu 0.8.6",
  "tokio",
  "tokio-stream",
  "tonic 0.11.0",
@@ -4280,9 +4292,9 @@ dependencies = [
 
 [[package]]
 name = "h2"
-version = "0.4.10"
+version = "0.4.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9421a676d1b147b16b82c9225157dc629087ef8ec4d5e2960f9437a90dac0a5"
+checksum = "17da50a276f1e01e0ba6c029e47b7100754904ee8a278f886546e98575380785"
 dependencies = [
  "atomic-waker",
  "bytes 1.10.1",
@@ -4778,7 +4790,7 @@ dependencies = [
  "bytes 1.10.1",
  "futures-channel",
  "futures-util",
- "h2 0.4.10",
+ "h2 0.4.11",
  "http 1.1.0",
  "http-body 1.0.0",
  "httparse",
@@ -5103,7 +5115,7 @@ checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.102",
+ "syn 2.0.104",
 ]
 
 [[package]]
@@ -5168,15 +5180,15 @@ dependencies = [
 
 [[package]]
 name = "indicatif"
-version = "0.17.11"
+version = "0.17.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "183b3088984b400f4cfac3620d5e076c84da5364016b4f49473de574b2586235"
+checksum = "4adb2ee6ad319a912210a36e56e3623555817bcc877a7e6e8802d1d69c4d8056"
 dependencies = [
- "console",
- "number_prefix",
+ "console 0.16.0",
  "portable-atomic",
  "unicode-segmentation",
  "unicode-width 0.2.0",
+ "unit-prefix",
  "web-time",
 ]
 
@@ -5242,7 +5254,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b23a0c8dfe501baac4adf6ebbfa6eddf8f0c07f56b058cc1288017e32397846c"
 dependencies = [
  "quote 1.0.40",
- "syn 2.0.102",
+ "syn 2.0.104",
 ]
 
 [[package]]
@@ -5706,9 +5718,9 @@ dependencies = [
 
 [[package]]
 name = "libc"
-version = "0.2.172"
+version = "0.2.174"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d750af042f7ef4f724306de029d18836c26c1765a54a6a3f094cbd23a7267ffa"
+checksum = "1171693293099992e19cddea4e8b849964e9846f4acee11b3948bcc337be8776"
 
 [[package]]
 name = "libflate"
@@ -6055,9 +6067,9 @@ dependencies = [
 
 [[package]]
 name = "memchr"
-version = "2.7.4"
+version = "2.7.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
+checksum = "32a282da65faaf38286cf3be983213fcf1d2e2a58700e808f83f4ea9a4804bc0"
 
 [[package]]
 name = "memmap2"
@@ -6234,7 +6246,7 @@ dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
  "regex",
- "syn 2.0.102",
+ "syn 2.0.104",
 ]
 
 [[package]]
@@ -6778,7 +6790,7 @@ dependencies = [
  "proc-macro-crate 1.3.1",
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.102",
+ "syn 2.0.104",
 ]
 
 [[package]]
@@ -6790,7 +6802,7 @@ dependencies = [
  "proc-macro-crate 3.2.0",
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.102",
+ "syn 2.0.104",
 ]
 
 [[package]]
@@ -7001,7 +7013,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.102",
+ "syn 2.0.104",
 ]
 
 [[package]]
@@ -7097,9 +7109,9 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
 
 [[package]]
 name = "owo-colors"
-version = "4.2.1"
+version = "4.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26995317201fa17f3656c36716aed4a7c81743a9634ac4c99c0eeda495db0cec"
+checksum = "48dd4f4a2c8405440fd0462561f0e5806bd0f77e86f51c761481bdd4018b545e"
 dependencies = [
  "supports-color 2.1.0",
  "supports-color 3.0.1",
@@ -7265,7 +7277,7 @@ dependencies = [
  "pest_meta",
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.102",
+ "syn 2.0.104",
 ]
 
 [[package]]
@@ -7353,7 +7365,7 @@ checksum = "6e918e4ff8c4549eb882f14b3a4bc8c8bc93de829416eacf579f1207a8fbf861"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.102",
+ "syn 2.0.104",
 ]
 
 [[package]]
@@ -7631,7 +7643,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ae005bd773ab59b4725093fd7df83fd7892f7d8eafb48dbd7de6e024e4215f9d"
 dependencies = [
  "proc-macro2 1.0.95",
- "syn 2.0.102",
+ "syn 2.0.104",
 ]
 
 [[package]]
@@ -7694,7 +7706,7 @@ dependencies = [
  "proc-macro-error-attr2",
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.102",
+ "syn 2.0.104",
 ]
 
 [[package]]
@@ -7736,7 +7748,7 @@ dependencies = [
  "prost 0.12.6",
  "prost-build 0.12.6",
  "prost-types 0.12.6",
- "snafu 0.8.0",
+ "snafu 0.8.6",
  "vector-common",
 ]
 
@@ -7768,7 +7780,7 @@ checksum = "4ee1c9ac207483d5e7db4940700de86a9aae46ef90c48b57f99fe7edb8345e49"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.102",
+ "syn 2.0.104",
 ]
 
 [[package]]
@@ -7840,7 +7852,7 @@ dependencies = [
  "prost 0.12.6",
  "prost-types 0.12.6",
  "regex",
- "syn 2.0.102",
+ "syn 2.0.104",
  "tempfile",
 ]
 
@@ -7860,7 +7872,7 @@ dependencies = [
  "prost 0.13.5",
  "prost-types 0.13.5",
  "regex",
- "syn 2.0.102",
+ "syn 2.0.104",
  "tempfile",
 ]
 
@@ -7887,7 +7899,7 @@ dependencies = [
  "itertools 0.12.1",
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.102",
+ "syn 2.0.104",
 ]
 
 [[package]]
@@ -7900,7 +7912,7 @@ dependencies = [
  "itertools 0.14.0",
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.102",
+ "syn 2.0.104",
 ]
 
 [[package]]
@@ -8107,7 +8119,7 @@ checksum = "f71ee38b42f8459a88d3362be6f9b841ad2d5421844f61eb1c59c11bff3ac14a"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.102",
+ "syn 2.0.104",
 ]
 
 [[package]]
@@ -8847,7 +8859,7 @@ dependencies = [
  "regex",
  "relative-path",
  "rustc_version 0.4.1",
- "syn 2.0.102",
+ "syn 2.0.104",
  "unicode-ident",
 ]
 
@@ -9334,7 +9346,7 @@ checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.102",
+ "syn 2.0.104",
 ]
 
 [[package]]
@@ -9345,7 +9357,7 @@ checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.102",
+ "syn 2.0.104",
 ]
 
 [[package]]
@@ -9408,7 +9420,7 @@ checksum = "3081f5ffbb02284dda55132aa26daecedd7372a42417bbbab6f14ab7d6bb9145"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.102",
+ "syn 2.0.104",
 ]
 
 [[package]]
@@ -9481,7 +9493,7 @@ dependencies = [
  "darling 0.20.11",
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.102",
+ "syn 2.0.104",
 ]
 
 [[package]]
@@ -9639,7 +9651,7 @@ version = "1.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b5b441962c817e33508847a22bd82f03a30cff43642dc2fae8b050566121eb9a"
 dependencies = [
- "console",
+ "console 0.15.7",
  "similar",
 ]
 
@@ -9724,13 +9736,13 @@ dependencies = [
 
 [[package]]
 name = "snafu"
-version = "0.8.0"
+version = "0.8.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d342c51730e54029130d7dc9fd735d28c4cd360f1368c01981d4f03ff207f096"
+checksum = "320b01e011bf8d5d7a4a4a4be966d9160968935849c83b918827f6a435e7f627"
 dependencies = [
  "futures-core",
  "pin-project",
- "snafu-derive 0.8.0",
+ "snafu-derive 0.8.6",
 ]
 
 [[package]]
@@ -9747,14 +9759,14 @@ dependencies = [
 
 [[package]]
 name = "snafu-derive"
-version = "0.8.0"
+version = "0.8.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "080c44971436b1af15d6f61ddd8b543995cf63ab8e677d46b00cc06f4ef267a0"
+checksum = "1961e2ef424c1424204d3a5d6975f934f56b6d50ff5732382d84ebf460e147f7"
 dependencies = [
- "heck 0.4.1",
+ "heck 0.5.0",
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.102",
+ "syn 2.0.104",
 ]
 
 [[package]]
@@ -9875,7 +9887,7 @@ dependencies = [
  "quote 1.0.40",
  "sqlx-core",
  "sqlx-macros-core",
- "syn 2.0.102",
+ "syn 2.0.104",
 ]
 
 [[package]]
@@ -9898,7 +9910,7 @@ dependencies = [
  "sqlx-mysql",
  "sqlx-postgres",
  "sqlx-sqlite",
- "syn 2.0.102",
+ "syn 2.0.104",
  "tokio",
  "url",
 ]
@@ -10108,7 +10120,7 @@ dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
  "rustversion",
- "syn 2.0.102",
+ "syn 2.0.104",
 ]
 
 [[package]]
@@ -10121,7 +10133,7 @@ dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
  "rustversion",
- "syn 2.0.102",
+ "syn 2.0.104",
 ]
 
 [[package]]
@@ -10173,9 +10185,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.102"
+version = "2.0.104"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6397daf94fa90f058bd0fd88429dd9e5738999cca8d701813c80723add80462"
+checksum = "17b6f705963418cdb9927482fa304bc562ece2fdd4f616084c50b7023b435a40"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
@@ -10205,7 +10217,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.102",
+ "syn 2.0.104",
 ]
 
 [[package]]
@@ -10397,7 +10409,7 @@ checksum = "a7c61ec9a6f64d2793d8a45faba21efbe3ced62a886d44c36a009b2b519b4c7e"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.102",
+ "syn 2.0.104",
 ]
 
 [[package]]
@@ -10408,17 +10420,16 @@ checksum = "f077553d607adc1caf65430528a576c757a71ed73944b66ebb58ef2bbd243568"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.102",
+ "syn 2.0.104",
 ]
 
 [[package]]
 name = "thread_local"
-version = "1.1.8"
+version = "1.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c"
+checksum = "f60246a4944f24f6e018aa17cdeffb7818b76356965d03b07d6a9886e8962185"
 dependencies = [
  "cfg-if",
- "once_cell",
 ]
 
 [[package]]
@@ -10558,7 +10569,7 @@ checksum = "6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.102",
+ "syn 2.0.104",
 ]
 
 [[package]]
@@ -10810,7 +10821,7 @@ dependencies = [
  "axum 0.7.5",
  "base64 0.22.1",
  "bytes 1.10.1",
- "h2 0.4.10",
+ "h2 0.4.11",
  "http 1.1.0",
  "http-body 1.0.0",
  "http-body-util",
@@ -10852,7 +10863,7 @@ dependencies = [
  "proc-macro2 1.0.95",
  "prost-build 0.12.6",
  "quote 1.0.40",
- "syn 2.0.102",
+ "syn 2.0.104",
 ]
 
 [[package]]
@@ -10991,7 +11002,7 @@ checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.102",
+ "syn 2.0.104",
 ]
 
 [[package]]
@@ -11116,7 +11127,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "04659ddb06c87d233c566112c1c9c5b9e98256d9af50ec3bc9c8327f873a7568"
 dependencies = [
  "quote 1.0.40",
- "syn 2.0.102",
+ "syn 2.0.104",
 ]
 
 [[package]]
@@ -11269,7 +11280,7 @@ checksum = "f03ca4cb38206e2bef0700092660bb74d696f808514dae47fa1467cbfe26e96e"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.102",
+ "syn 2.0.104",
 ]
 
 [[package]]
@@ -11299,7 +11310,7 @@ checksum = "35f5380909ffc31b4de4f4bdf96b877175a016aa2ca98cee39fcfd8c4d53d952"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.102",
+ "syn 2.0.104",
 ]
 
 [[package]]
@@ -11404,6 +11415,12 @@ version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c"
 
+[[package]]
+name = "unit-prefix"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "323402cff2dd658f39ca17c789b502021b3f18707c91cdf22e3838e1b4023817"
+
 [[package]]
 name = "universal-hash"
 version = "0.5.1"
@@ -11628,7 +11645,7 @@ dependencies = [
  "goauth",
  "governor",
  "greptimedb-ingester",
- "h2 0.4.10",
+ "h2 0.4.11",
  "hash_hasher",
  "hashbrown 0.14.5",
  "headers",
@@ -11714,7 +11731,7 @@ dependencies = [
  "similar-asserts",
  "smallvec",
  "smpl_jwt",
- "snafu 0.8.0",
+ "snafu 0.8.6",
  "snap",
  "socket2 0.5.10",
  "sqlx",
@@ -11810,7 +11827,7 @@ dependencies = [
  "rkyv",
  "serde",
  "serde_yaml",
- "snafu 0.8.0",
+ "snafu 0.8.6",
  "temp-dir",
  "tokio",
  "tokio-test",
@@ -11862,7 +11879,7 @@ dependencies = [
  "serde",
  "serde_json",
  "serde_with 3.12.0",
- "snafu 0.8.0",
+ "snafu 0.8.6",
  "toml",
  "tracing 0.1.41",
  "url",
@@ -11881,7 +11898,7 @@ dependencies = [
  "quote 1.0.40",
  "serde",
  "serde_json",
- "syn 2.0.102",
+ "syn 2.0.104",
  "tracing 0.1.41",
 ]
 
@@ -11894,7 +11911,7 @@ dependencies = [
  "quote 1.0.40",
  "serde",
  "serde_derive_internals",
- "syn 2.0.102",
+ "syn 2.0.104",
  "vector-config",
  "vector-config-common",
 ]
@@ -11956,7 +11973,7 @@ dependencies = [
  "serde_yaml",
  "similar-asserts",
  "smallvec",
- "snafu 0.8.0",
+ "snafu 0.8.6",
  "socket2 0.5.10",
  "tokio",
  "tokio-openssl",
@@ -12200,7 +12217,7 @@ dependencies = [
  "sha2",
  "sha3",
  "simdutf8",
- "snafu 0.8.0",
+ "snafu 0.8.6",
  "snap",
  "strip-ansi-escapes",
  "syslog_loose",
@@ -12344,7 +12361,7 @@ dependencies = [
  "log",
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.102",
+ "syn 2.0.104",
  "wasm-bindgen-shared",
 ]
 
@@ -12378,7 +12395,7 @@ checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.102",
+ "syn 2.0.104",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
@@ -12585,7 +12602,7 @@ checksum = "9107ddc059d5b6fbfbffdfa7a7fe3e22a226def0b2608f72e9d552763d3e1ad7"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.102",
+ "syn 2.0.104",
 ]
 
 [[package]]
@@ -12596,7 +12613,7 @@ checksum = "29bee4b38ea3cde66011baa44dba677c432a78593e202392d1e9070cf2a7fca7"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.102",
+ "syn 2.0.104",
 ]
 
 [[package]]
@@ -12691,6 +12708,15 @@ dependencies = [
  "windows-targets 0.52.6",
 ]
 
+[[package]]
+name = "windows-sys"
+version = "0.60.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb"
+dependencies = [
+ "windows-targets 0.53.2",
+]
+
 [[package]]
 name = "windows-targets"
 version = "0.42.2"
@@ -12730,13 +12756,29 @@ dependencies = [
  "windows_aarch64_gnullvm 0.52.6",
  "windows_aarch64_msvc 0.52.6",
  "windows_i686_gnu 0.52.6",
- "windows_i686_gnullvm",
+ "windows_i686_gnullvm 0.52.6",
  "windows_i686_msvc 0.52.6",
  "windows_x86_64_gnu 0.52.6",
  "windows_x86_64_gnullvm 0.52.6",
  "windows_x86_64_msvc 0.52.6",
 ]
 
+[[package]]
+name = "windows-targets"
+version = "0.53.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c66f69fcc9ce11da9966ddb31a40968cad001c5bedeb5c2b82ede4253ab48aef"
+dependencies = [
+ "windows_aarch64_gnullvm 0.53.0",
+ "windows_aarch64_msvc 0.53.0",
+ "windows_i686_gnu 0.53.0",
+ "windows_i686_gnullvm 0.53.0",
+ "windows_i686_msvc 0.53.0",
+ "windows_x86_64_gnu 0.53.0",
+ "windows_x86_64_gnullvm 0.53.0",
+ "windows_x86_64_msvc 0.53.0",
+]
+
 [[package]]
 name = "windows_aarch64_gnullvm"
 version = "0.42.2"
@@ -12755,6 +12797,12 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
 
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "86b8d5f90ddd19cb4a147a5fa63ca848db3df085e25fee3cc10b39b6eebae764"
+
 [[package]]
 name = "windows_aarch64_msvc"
 version = "0.42.2"
@@ -12773,6 +12821,12 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
 
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c7651a1f62a11b8cbd5e0d42526e55f2c99886c77e007179efff86c2b137e66c"
+
 [[package]]
 name = "windows_i686_gnu"
 version = "0.42.2"
@@ -12791,12 +12845,24 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
 
+[[package]]
+name = "windows_i686_gnu"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c1dc67659d35f387f5f6c479dc4e28f1d4bb90ddd1a5d3da2e5d97b42d6272c3"
+
 [[package]]
 name = "windows_i686_gnullvm"
 version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
 
+[[package]]
+name = "windows_i686_gnullvm"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ce6ccbdedbf6d6354471319e781c0dfef054c81fbc7cf83f338a4296c0cae11"
+
 [[package]]
 name = "windows_i686_msvc"
 version = "0.42.2"
@@ -12815,6 +12881,12 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
 
+[[package]]
+name = "windows_i686_msvc"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "581fee95406bb13382d2f65cd4a908ca7b1e4c2f1917f143ba16efe98a589b5d"
+
 [[package]]
 name = "windows_x86_64_gnu"
 version = "0.42.2"
@@ -12833,6 +12905,12 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
 
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2e55b5ac9ea33f2fc1716d1742db15574fd6fc8dadc51caab1c16a3d3b4190ba"
+
 [[package]]
 name = "windows_x86_64_gnullvm"
 version = "0.42.2"
@@ -12851,6 +12929,12 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
 
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0a6e035dd0599267ce1ee132e51c27dd29437f63325753051e71dd9e42406c57"
+
 [[package]]
 name = "windows_x86_64_msvc"
 version = "0.42.2"
@@ -12869,6 +12953,12 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "271414315aff87387382ec3d271b52d7ae78726f5d44ac98b4f4030c91880486"
+
 [[package]]
 name = "winnow"
 version = "0.5.18"
@@ -12899,9 +12989,9 @@ dependencies = [
 
 [[package]]
 name = "wiremock"
-version = "0.6.3"
+version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "101681b74cd87b5899e87bcf5a64e83334dd313fcd3053ea72e6dba18928e301"
+checksum = "a2b8b99d4cdbf36b239a9532e31fe4fb8acc38d1897c1761e161550a7dc78e6a"
 dependencies = [
  "assert-json-diff",
  "async-trait",
@@ -12987,7 +13077,7 @@ checksum = "28cc31741b18cb6f1d5ff12f5b7523e3d6eb0852bbbad19d73905511d9849b95"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.102",
+ "syn 2.0.104",
  "synstructure",
 ]
 
@@ -13017,7 +13107,7 @@ checksum = "b3c129550b3e6de3fd0ba67ba5c81818f9805e58b8d7fee80a3a59d2c9fc601a"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.102",
+ "syn 2.0.104",
 ]
 
 [[package]]
@@ -13028,7 +13118,7 @@ checksum = "5226bc9a9a9836e7428936cde76bb6b22feea1a8bfdbc0d241136e4d13417e25"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.102",
+ "syn 2.0.104",
 ]
 
 [[package]]
@@ -13048,7 +13138,7 @@ checksum = "0ea7b4a3637ea8669cedf0f1fd5c286a17f3de97b8dd5a70a6c167a1730e63a5"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.102",
+ "syn 2.0.104",
  "synstructure",
 ]
 
@@ -13077,7 +13167,7 @@ checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.102",
+ "syn 2.0.104",
 ]
 
 [[package]]
diff --git a/Cargo.toml b/Cargo.toml
index 0a9f4c17aeeea..ae363bf126eb4 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -165,7 +165,7 @@ rand_distr = { version = "0.5.1", default-features = false }
 semver = { version = "1.0.26", default-features = false, features = ["serde", "std"] }
 serde_json = { version = "1.0.140", default-features = false, features = ["raw_value", "std"] }
 serde = { version = "1.0.219", default-features = false, features = ["alloc", "derive", "rc"] }
-snafu = { version = "0.8.0", default-features = false, features = ["futures", "std"] }
+snafu = { version = "0.8.6", default-features = false, features = ["futures", "std"] }
 tempfile = "3.20.0"
 tokio = { version = "1.45.1", default-features = false, features = ["full"] }
 toml = { version = "0.8.23", default-features = false, features = ["display", "parse"] }
@@ -227,7 +227,7 @@ metrics.workspace = true
 metrics-tracing-context.workspace = true
 
 # AWS - Official SDK
-aws-runtime = { version = "1.5.7", optional = true }
+aws-runtime = { version = "1.5.8", optional = true }
 aws-config = { version = "1.6.1", default-features = false, features = ["behavior-version-latest", "credentials-process", "sso", "rt-tokio"], optional = true }
 aws-credential-types = { version = "1.2.3", default-features = false, features = ["hardcoded-credentials"], optional = true }
 aws-sdk-cloudwatch = { version = "1.70.0", default-features = false, features = ["behavior-version-latest", "rt-tokio"], optional = true }
@@ -313,7 +313,7 @@ greptimedb-ingester = { git = "https://github.com/GreptimeTeam/greptimedb-ingest
 
 # External libs
 arc-swap = { version = "1.7", default-features = false, optional = true }
-async-compression = { version = "0.4.24", default-features = false, features = ["tokio", "gzip", "zstd"], optional = true }
+async-compression = { version = "0.4.25", default-features = false, features = ["tokio", "gzip", "zstd"], optional = true }
 apache-avro = { version = "0.16.0", default-features = false, optional = true }
 axum = { version = "0.6.20", default-features = false }
 base64 = { version = "0.22.1", default-features = false, optional = true }
@@ -338,7 +338,7 @@ flate2.workspace = true
 futures-util = { version = "0.3.29", default-features = false }
 glob.workspace = true
 governor = { version = "0.10.0", default-features = false, features = ["dashmap", "jitter", "std"], optional = true }
-h2 = { version = "0.4.10", default-features = false, optional = true }
+h2 = { version = "0.4.11", default-features = false, optional = true }
 hash_hasher = { version = "2.0.4", default-features = false }
 hashbrown = { version = "0.14.5", default-features = false, optional = true, features = ["ahash"] }
 headers = { version = "0.3.9", default-features = false }
@@ -394,7 +394,7 @@ tokio-tungstenite = { version = "0.20.1", default-features = false, features = [
 toml.workspace = true
 hickory-proto = { workspace = true, optional = true }
 tonic = { workspace = true, optional = true }
-thread_local = { version = "1.1.8", default-features = false, optional = true }
+thread_local = { version = "1.1.9", default-features = false, optional = true }
 typetag = { version = "0.2.20", default-features = false }
 url = { version = "2.5.4", default-features = false, features = ["serde"] }
 warp = { version = "0.3.7", default-features = false }
@@ -439,7 +439,7 @@ azure_storage = { version = "0.17", default-features = false }
 base64 = "0.22.1"
 criterion = { version = "0.5.1", features = ["html_reports", "async_tokio"] }
 itertools = { version = "0.14.0", default-features = false, features = ["use_alloc"] }
-libc = "0.2.172"
+libc = "0.2.174"
 similar-asserts = "1.7.0"
 proptest.workspace = true
 quickcheck = "1.0.3"
@@ -453,7 +453,7 @@ tower-test = "0.4.0"
 vector-lib = { workspace = true, features = ["test"] }
 vrl.workspace = true
 
-wiremock = "0.6.3"
+wiremock = "0.6.4"
 zstd = { version = "0.13.0", default-features = false }
 
 [patch.crates-io]
diff --git a/vdev/Cargo.toml b/vdev/Cargo.toml
index 1a7541d111ef9..b3a760fb6d595 100644
--- a/vdev/Cargo.toml
+++ b/vdev/Cargo.toml
@@ -20,11 +20,11 @@ dunce = "1.0.5"
 glob.workspace = true
 hex = "0.4.3"
 indexmap.workspace = true
-indicatif = { version = "0.17.11", features = ["improved_unicode"] }
+indicatif = { version = "0.17.12", features = ["improved_unicode"] }
 itertools = "0.14.0"
 log = "0.4.27"
 # watch https://github.com/epage/anstyle for official interop with Clap
-owo-colors = { version = "4.2.1", features = ["supports-colors"] }
+owo-colors = { version = "4.2.2", features = ["supports-colors"] }
 paste.workspace = true
 regex = { version = "1.11.1", default-features = false, features = ["std", "perf"] }
 reqwest = { version = "0.11", features = ["json", "blocking"] }

From 4f7195e554509bbeead4a311f4913fb1b56e9ca7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Jul 2025 14:13:48 +0000
Subject: [PATCH 139/305] chore(deps): Bump security-framework from 2.10.0 to
 3.2.0 (#23314)

---
updated-dependencies:
- dependency-name: security-framework
  dependency-version: 3.2.0
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock                 | 2 +-
 lib/vector-core/Cargo.toml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index e454061b16d74..280ff5a12ed55 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -11966,7 +11966,7 @@ dependencies = [
  "regex",
  "ryu",
  "schannel",
- "security-framework 2.10.0",
+ "security-framework 3.2.0",
  "serde",
  "serde_json",
  "serde_with 3.12.0",
diff --git a/lib/vector-core/Cargo.toml b/lib/vector-core/Cargo.toml
index 8bc103b717c4c..d102265a53ac7 100644
--- a/lib/vector-core/Cargo.toml
+++ b/lib/vector-core/Cargo.toml
@@ -67,7 +67,7 @@ vrl.workspace = true
 cfg-if.workspace = true
 
 [target.'cfg(target_os = "macos")'.dependencies]
-security-framework = "2.10.0"
+security-framework = "3.2.0"
 
 [target.'cfg(windows)'.dependencies]
 schannel = "0.1.27"

From c59788eb3cab9e92f53acb81a2ae778145032ae4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Jul 2025 14:14:21 +0000
Subject: [PATCH 140/305] chore(deps): Bump the aws group with 4 updates
 (#23306)

Bumps the aws group with 4 updates: [aws-sdk-kms](https://github.com/awslabs/aws-sdk-rust), [aws-sdk-secretsmanager](https://github.com/awslabs/aws-sdk-rust), [aws-sdk-sns](https://github.com/awslabs/aws-sdk-rust) and [aws-sdk-sts](https://github.com/awslabs/aws-sdk-rust).


Updates `aws-sdk-kms` from 1.65.0 to 1.75.0
- [Release notes](https://github.com/awslabs/aws-sdk-rust/releases)
- [Commits](https://github.com/awslabs/aws-sdk-rust/commits)

Updates `aws-sdk-secretsmanager` from 1.68.0 to 1.76.0
- [Release notes](https://github.com/awslabs/aws-sdk-rust/releases)
- [Commits](https://github.com/awslabs/aws-sdk-rust/commits)

Updates `aws-sdk-sns` from 1.65.0 to 1.73.0
- [Release notes](https://github.com/awslabs/aws-sdk-rust/releases)
- [Commits](https://github.com/awslabs/aws-sdk-rust/commits)

Updates `aws-sdk-sts` from 1.65.0 to 1.73.0
- [Release notes](https://github.com/awslabs/aws-sdk-rust/releases)
- [Commits](https://github.com/awslabs/aws-sdk-rust/commits)

---
updated-dependencies:
- dependency-name: aws-sdk-kms
  dependency-version: 1.75.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: aws
- dependency-name: aws-sdk-secretsmanager
  dependency-version: 1.76.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: aws
- dependency-name: aws-sdk-sns
  dependency-version: 1.73.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: aws
- dependency-name: aws-sdk-sts
  dependency-version: 1.73.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: aws
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock | 20 ++++++++------------
 Cargo.toml |  8 ++++----
 2 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 280ff5a12ed55..5656bc65ffda9 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -983,9 +983,9 @@ dependencies = [
 
 [[package]]
 name = "aws-sdk-kms"
-version = "1.65.0"
+version = "1.75.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f5325c5e2badf4148e850017cc56cc205888c6e0b52c9e29d3501ec577005230"
+checksum = "bb89d6ae47f03ca664f604571d0f29165112543ba1a39878347815b8028c235b"
 dependencies = [
  "aws-credential-types",
  "aws-runtime",
@@ -999,7 +999,6 @@ dependencies = [
  "bytes 1.10.1",
  "fastrand 2.3.0",
  "http 0.2.9",
- "once_cell",
  "regex-lite",
  "tracing 0.1.41",
 ]
@@ -1041,9 +1040,9 @@ dependencies = [
 
 [[package]]
 name = "aws-sdk-secretsmanager"
-version = "1.68.0"
+version = "1.76.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c18fb03c6aad6a5de2a36e44eebc83640eea9a025bf407579f503b5dc4cd0b0"
+checksum = "eb99bf4d3be2b4598ad26eed5da8d0c930b8d47d76b279a03e47d160151eb0fb"
 dependencies = [
  "aws-credential-types",
  "aws-runtime",
@@ -1057,16 +1056,15 @@ dependencies = [
  "bytes 1.10.1",
  "fastrand 2.3.0",
  "http 0.2.9",
- "once_cell",
  "regex-lite",
  "tracing 0.1.41",
 ]
 
 [[package]]
 name = "aws-sdk-sns"
-version = "1.65.0"
+version = "1.73.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61cedc4d189aa87ced9b8362cc453e3c3bdcdb73c1020578a0506ed75a280117"
+checksum = "9e936a9af3eccbd24452a57bb8206d2f8e1e483d38c52b1a2901fcb892d98866"
 dependencies = [
  "aws-credential-types",
  "aws-runtime",
@@ -1081,7 +1079,6 @@ dependencies = [
  "aws-types",
  "fastrand 2.3.0",
  "http 0.2.9",
- "once_cell",
  "regex-lite",
  "tracing 0.1.41",
 ]
@@ -1157,9 +1154,9 @@ dependencies = [
 
 [[package]]
 name = "aws-sdk-sts"
-version = "1.65.0"
+version = "1.73.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96a78a8f50a1630db757b60f679c8226a8a70ee2ab5f5e6e51dc67f6c61c7cfd"
+checksum = "f1e9c3c24e36183e2f698235ed38dcfbbdff1d09b9232dc866c4be3011e0b47e"
 dependencies = [
  "aws-credential-types",
  "aws-runtime",
@@ -1174,7 +1171,6 @@ dependencies = [
  "aws-types",
  "fastrand 2.3.0",
  "http 0.2.9",
- "once_cell",
  "regex-lite",
  "tracing 0.1.41",
 ]
diff --git a/Cargo.toml b/Cargo.toml
index ae363bf126eb4..eb2b090bb808c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -235,17 +235,17 @@ aws-sdk-cloudwatchlogs = { version = "1.76.0", default-features = false, feature
 aws-sdk-elasticsearch = { version = "1.67.0", default-features = false, features = ["behavior-version-latest", "rt-tokio"], optional = true }
 aws-sdk-firehose = { version = "1.71.0", default-features = false, features = ["behavior-version-latest", "rt-tokio"], optional = true }
 aws-sdk-kinesis = { version = "1.66.0", default-features = false, features = ["behavior-version-latest", "rt-tokio"], optional = true }
-aws-sdk-kms = { version = "1.65.0", default-features = false, features = ["behavior-version-latest", "rt-tokio"], optional = true }
+aws-sdk-kms = { version = "1.75.0", default-features = false, features = ["behavior-version-latest", "rt-tokio"], optional = true }
 aws-sdk-s3 = { version = "1.15.0", default-features = false, features = ["behavior-version-latest", "rt-tokio"], optional = true }
-aws-sdk-secretsmanager = { version = "1.68.0", default-features = false, features = ["behavior-version-latest", "rt-tokio"], optional = true }
-aws-sdk-sns = { version = "1.65.0", default-features = false, features = ["behavior-version-latest", "rt-tokio"], optional = true }
+aws-sdk-secretsmanager = { version = "1.76.0", default-features = false, features = ["behavior-version-latest", "rt-tokio"], optional = true }
+aws-sdk-sns = { version = "1.73.0", default-features = false, features = ["behavior-version-latest", "rt-tokio"], optional = true }
 aws-sdk-sqs = { version = "1.64.0", default-features = false, features = ["behavior-version-latest", "rt-tokio"], optional = true }
 aws-types = { version = "1.3.7", default-features = false, optional = true }
 
 # The sts crate is needed despite not being referred to anywhere in the code because we need to set the
 # `behavior-version-latest` feature. Without this we get a runtime panic when `auth.assume_role` authentication
 # is configured.
-aws-sdk-sts = { version = "1.65.0", default-features = false, features = ["behavior-version-latest", "rt-tokio"], optional = true }
+aws-sdk-sts = { version = "1.73.0", default-features = false, features = ["behavior-version-latest", "rt-tokio"], optional = true }
 
 # The `aws-sdk-sts` crate is needed despite not being referred to anywhere in the code because we need to set the
 # `behavior-version-latest` feature. Without this we get a runtime panic when `auth.assume_role` authentication is configured.

From 03db0287b9452465138b89f2ddee5aacbe530cb7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Jul 2025 14:20:36 +0000
Subject: [PATCH 141/305] chore(deps): Bump roaring from 0.10.12 to 0.11.0
 (#23311)

Bumps [roaring](https://github.com/RoaringBitmap/roaring-rs) from 0.10.12 to 0.11.0.
- [Release notes](https://github.com/RoaringBitmap/roaring-rs/releases)
- [Commits](https://github.com/RoaringBitmap/roaring-rs/compare/v0.10.12...v0.11.0)

---
updated-dependencies:
- dependency-name: roaring
  dependency-version: 0.11.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock | 4 ++--
 Cargo.toml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 5656bc65ffda9..03695cf07b89d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -8795,9 +8795,9 @@ dependencies = [
 
 [[package]]
 name = "roaring"
-version = "0.10.12"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19e8d2cfa184d94d0726d650a9f4a1be7f9b76ac9fdb954219878dc00c1c1e7b"
+checksum = "a728d3a68e1cf244b26b3fec3d045a6d69b7890eda1ba6ea451ea88889824e01"
 dependencies = [
  "bytemuck",
  "byteorder",
diff --git a/Cargo.toml b/Cargo.toml
index eb2b090bb808c..0bc57ef50ab8e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -378,7 +378,7 @@ rand_distr.workspace = true
 rdkafka = { version = "0.37.0", default-features = false, features = ["curl-static", "tokio", "libz", "ssl", "zstd"], optional = true }
 redis = { version = "0.24.0", default-features = false, features = ["connection-manager", "tokio-comp", "tokio-native-tls-comp"], optional = true }
 regex = { version = "1.11.1", default-features = false, features = ["std", "perf"] }
-roaring = { version = "0.10.12", default-features = false, features = ["std"], optional = true }
+roaring = { version = "0.11.0", default-features = false, features = ["std"], optional = true }
 rumqttc = { version = "0.24.0", default-features = false, features = ["use-rustls"], optional = true }
 seahash = { version = "4.1.0", default-features = false }
 smallvec = { version = "1", default-features = false, features = ["union", "serde"] }

From f491a3a5766bce28a21d00c60cb1eb1b77a98600 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Jul 2025 14:21:35 +0000
Subject: [PATCH 142/305] chore(deps): Bump indexmap from 2.9.0 to 2.10.0
 (#23308)

Bumps [indexmap](https://github.com/indexmap-rs/indexmap) from 2.9.0 to 2.10.0.
- [Changelog](https://github.com/indexmap-rs/indexmap/blob/main/RELEASES.md)
- [Commits](https://github.com/indexmap-rs/indexmap/compare/2.9.0...2.10.0)

---
updated-dependencies:
- dependency-name: indexmap
  dependency-version: 2.10.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock                 | 54 +++++++++++++++++++-------------------
 Cargo.toml                 |  2 +-
 lib/file-source/Cargo.toml |  2 +-
 3 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 03695cf07b89d..dffa836e1552b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -505,7 +505,7 @@ dependencies = [
  "futures-timer",
  "futures-util",
  "http 1.1.0",
- "indexmap 2.9.0",
+ "indexmap 2.10.0",
  "mime",
  "multer",
  "num-traits",
@@ -554,7 +554,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "34ecdaff7c9cffa3614a9f9999bf9ee4c3078fe3ce4d6a6e161736b56febf2de"
 dependencies = [
  "bytes 1.10.1",
- "indexmap 2.9.0",
+ "indexmap 2.10.0",
  "serde",
  "serde_json",
 ]
@@ -3725,7 +3725,7 @@ dependencies = [
  "flate2",
  "futures 0.3.31",
  "glob",
- "indexmap 2.9.0",
+ "indexmap 2.10.0",
  "libc",
  "quickcheck",
  "scan_fmt",
@@ -4279,7 +4279,7 @@ dependencies = [
  "futures-sink",
  "futures-util",
  "http 0.2.9",
- "indexmap 2.9.0",
+ "indexmap 2.10.0",
  "slab",
  "tokio",
  "tokio-util",
@@ -4298,7 +4298,7 @@ dependencies = [
  "futures-core",
  "futures-sink",
  "http 1.1.0",
- "indexmap 2.9.0",
+ "indexmap 2.10.0",
  "slab",
  "tokio",
  "tokio-util",
@@ -5165,9 +5165,9 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.9.0"
+version = "2.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cea70ddb795996207ad57735b50c5982d8844f38ba9ee5f1aedcfb708a2aa11e"
+checksum = "fe4cd85333e22411419a0bcae1297d25e58c9443848b11dc6a86fefe8c78a661"
 dependencies = [
  "equivalent",
  "hashbrown 0.15.2",
@@ -6119,7 +6119,7 @@ version = "0.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f1ada651cd6bdffe01e5f35067df53491f1fe853d2b154008ca2bd30b3d3fcf6"
 dependencies = [
- "indexmap 2.9.0",
+ "indexmap 2.10.0",
  "itoa",
  "lockfree-object-pool",
  "metrics",
@@ -6140,7 +6140,7 @@ dependencies = [
  "crossbeam-epoch",
  "crossbeam-utils",
  "hashbrown 0.15.2",
- "indexmap 2.9.0",
+ "indexmap 2.10.0",
  "metrics",
  "ordered-float 4.6.0",
  "quanta",
@@ -6384,7 +6384,7 @@ version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "17ebbe97acce52d06aebed4cd4a87c0941f4b2519b59b82b4feb5bd0ce003dfd"
 dependencies = [
- "indexmap 2.9.0",
+ "indexmap 2.10.0",
  "itertools 0.13.0",
  "ndarray",
  "noisy_float",
@@ -7294,7 +7294,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9"
 dependencies = [
  "fixedbitset",
- "indexmap 2.9.0",
+ "indexmap 2.10.0",
 ]
 
 [[package]]
@@ -7739,7 +7739,7 @@ dependencies = [
 name = "prometheus-parser"
 version = "0.1.0"
 dependencies = [
- "indexmap 2.9.0",
+ "indexmap 2.10.0",
  "nom 8.0.0",
  "prost 0.12.6",
  "prost-build 0.12.6",
@@ -8068,7 +8068,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3ed1a693391a16317257103ad06a88c6529ac640846021da7c435a06fffdacd7"
 dependencies = [
  "chrono",
- "indexmap 2.9.0",
+ "indexmap 2.10.0",
  "newtype-uuid",
  "quick-xml 0.37.4",
  "strip-ansi-escapes",
@@ -8559,7 +8559,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4c11639076bf147be211b90e47790db89f4c22b6c8a9ca6e960833869da67166"
 dependencies = [
  "aho-corasick",
- "indexmap 2.9.0",
+ "indexmap 2.10.0",
  "itertools 0.13.0",
  "nohash",
  "regex",
@@ -9362,7 +9362,7 @@ version = "1.0.140"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373"
 dependencies = [
- "indexmap 2.9.0",
+ "indexmap 2.10.0",
  "itoa",
  "memchr",
  "ryu",
@@ -9460,7 +9460,7 @@ dependencies = [
  "chrono",
  "hex",
  "indexmap 1.9.3",
- "indexmap 2.9.0",
+ "indexmap 2.10.0",
  "serde",
  "serde_derive",
  "serde_json",
@@ -9498,7 +9498,7 @@ version = "0.9.34+deprecated"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47"
 dependencies = [
- "indexmap 2.9.0",
+ "indexmap 2.10.0",
  "itoa",
  "ryu",
  "serde",
@@ -9857,7 +9857,7 @@ dependencies = [
  "futures-util",
  "hashbrown 0.15.2",
  "hashlink",
- "indexmap 2.9.0",
+ "indexmap 2.10.0",
  "log",
  "memchr",
  "once_cell",
@@ -10748,7 +10748,7 @@ version = "0.19.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
 dependencies = [
- "indexmap 2.9.0",
+ "indexmap 2.10.0",
  "toml_datetime",
  "winnow 0.5.18",
 ]
@@ -10759,7 +10759,7 @@ version = "0.22.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "41fe8c660ae4257887cf66394862d21dbca4a6ddd26f04a3560410406a2f819a"
 dependencies = [
- "indexmap 2.9.0",
+ "indexmap 2.10.0",
  "serde",
  "serde_spanned",
  "toml_datetime",
@@ -10890,7 +10890,7 @@ checksum = "d039ad9159c98b70ecfd540b2573b97f7f52c3e8d9f8ad57a24b916a536975f9"
 dependencies = [
  "futures-core",
  "futures-util",
- "indexmap 2.9.0",
+ "indexmap 2.10.0",
  "pin-project-lite",
  "slab",
  "sync_wrapper 1.0.1",
@@ -11547,7 +11547,7 @@ dependencies = [
  "git2",
  "glob",
  "hex",
- "indexmap 2.9.0",
+ "indexmap 2.10.0",
  "indicatif",
  "indoc",
  "itertools 0.14.0",
@@ -11657,7 +11657,7 @@ dependencies = [
  "hyper 0.14.28",
  "hyper-openssl 0.9.2",
  "hyper-proxy",
- "indexmap 2.9.0",
+ "indexmap 2.10.0",
  "indoc",
  "inventory",
  "ipnet",
@@ -11845,7 +11845,7 @@ dependencies = [
  "crossbeam-utils",
  "derivative",
  "futures 0.3.31",
- "indexmap 2.9.0",
+ "indexmap 2.10.0",
  "metrics",
  "paste",
  "pin-project",
@@ -11868,7 +11868,7 @@ dependencies = [
  "chrono-tz",
  "encoding_rs",
  "http 0.2.9",
- "indexmap 2.9.0",
+ "indexmap 2.10.0",
  "inventory",
  "no-proxy",
  "num-traits",
@@ -11935,7 +11935,7 @@ dependencies = [
  "headers",
  "http 0.2.9",
  "hyper-proxy",
- "indexmap 2.9.0",
+ "indexmap 2.10.0",
  "inventory",
  "ipnet",
  "metrics",
@@ -12171,7 +12171,7 @@ dependencies = [
  "hostname 0.4.0",
  "iana-time-zone",
  "idna 1.0.3",
- "indexmap 2.9.0",
+ "indexmap 2.10.0",
  "indoc",
  "influxdb-line-protocol",
  "itertools 0.14.0",
diff --git a/Cargo.toml b/Cargo.toml
index 0bc57ef50ab8e..08cded9823015 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -145,7 +145,7 @@ futures = { version = "0.3.31", default-features = false, features = ["compat",
 glob = { version = "0.3.2", default-features = false }
 hickory-proto = { version = "0.25.2", default-features = false, features = ["dnssec-ring"] }
 humantime = { version = "2.2.0", default-features = false }
-indexmap = { version = "2.9.0", default-features = false, features = ["serde", "std"] }
+indexmap = { version = "2.10.0", default-features = false, features = ["serde", "std"] }
 inventory = { version = "0.3" }
 indoc = { version = "2.0.6" }
 metrics = "0.24.2"
diff --git a/lib/file-source/Cargo.toml b/lib/file-source/Cargo.toml
index c5789c43e17d7..d9d57d8c09ada 100644
--- a/lib/file-source/Cargo.toml
+++ b/lib/file-source/Cargo.toml
@@ -38,7 +38,7 @@ default-features = false
 features = []
 
 [dependencies.indexmap]
-version = "2.9.0"
+version = "2.10.0"
 default-features = false
 features = ["serde"]
 

From 8d4c0918740678fbe3f635c2a2be4be3effc6876 Mon Sep 17 00:00:00 2001
From: Pavlos Rontidis <pavlos.rontidis@gmail.com>
Date: Tue, 1 Jul 2025 10:32:09 -0400
Subject: [PATCH 143/305] fix(ci): install datadog-ci correctly (#23318)

* fix(ci): install datadog-ci correctly

* should not need prune on each vm
---
 .github/workflows/integration.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
index 5c45d7dca7dce..eae42b102028a 100644
--- a/.github/workflows/integration.yml
+++ b/.github/workflows/integration.yml
@@ -71,9 +71,7 @@ jobs:
 
       - name: Run setup steps required by the IT suite
         run: |
-          sudo npm -g install @datadog/datadog-ci
           sudo -E bash scripts/ci-free-disk-space.sh
-          docker image prune -af && docker container prune -f
 
   integration-tests:
     runs-on: ubuntu-24.04
@@ -100,7 +98,8 @@ jobs:
         with:
           submodules: "recursive"
 
-      - run: docker image prune -af ; docker container prune -f
+      - run: |
+          sudo npm -g install @datadog/datadog-ci
 
       - name: Download JSON artifact from changes.yml
         uses: actions/download-artifact@v4

From 68f7ebc31a3084ddda4c0247022a8f8cfc995801 Mon Sep 17 00:00:00 2001
From: Pavlos Rontidis <pavlos.rontidis@gmail.com>
Date: Tue, 1 Jul 2025 12:28:54 -0400
Subject: [PATCH 144/305] feat(website): navigation overhaul - part 1 (#23320)

* feat(website): navigation overhaul

* about -> introduction overhaul cont

* setup changes

* fix broken links

* fix more broken links

* fix broken link
---
 website/content/en/docs/_index.md             |  2 +-
 website/content/en/docs/about/_index.md       | 15 -------------
 .../en/docs/about/observability-pipelines.md  | 22 -------------------
 .../en/docs/about/under-the-hood/_index.md    | 15 -------------
 .../under-the-hood/architecture/_index.md     | 21 ------------------
 .../about/under-the-hood/networking/_index.md |  8 -------
 .../en/docs/administration/monitoring.md      |  2 +-
 .../vector.md => introduction/_index.md}      | 15 +++++++++----
 .../docs/introduction/architecture/_index.md  | 21 ++++++++++++++++++
 .../architecture}/arc.md                      |  4 ++--
 .../architecture/buffering-model.md           |  4 ++--
 .../architecture/concurrency-model.md         |  4 ++--
 .../architecture/data-model/_index.md         |  4 ++--
 .../architecture/data-model/log.md            |  0
 .../architecture/data-model/metric.md         |  2 +-
 .../end-to-end-acknowledgements.md            |  2 +-
 .../architecture/pipeline-model.md            |  4 ++--
 .../architecture/runtime-model.md             |  4 ++--
 .../docs/{about => introduction}/concepts.md  | 10 ++++-----
 .../guarantees.md                             |  5 +++--
 website/content/en/docs/reference/_index.md   |  4 ++--
 .../configuration/template-syntax.md          |  4 ++--
 .../reference/configuration/unit-tests.md     |  4 ++--
 .../content/en/docs/reference/vrl/_index.md   |  6 ++---
 .../en/docs/setup/deployment/_index.md        |  2 +-
 .../en/docs/setup/going-to-prod/_index.md     |  2 +-
 .../en/docs/setup/going-to-prod/arch/agent.md |  2 +-
 .../setup/going-to-prod/arch/aggregator.md    |  2 +-
 .../docs/setup/going-to-prod/architecting.md  |  8 +++----
 .../setup/going-to-prod/high-availability.md  |  6 ++---
 .../en/docs/setup/going-to-prod/sizing.md     |  2 +-
 .../en/docs/setup/installation/_index.md      |  1 +
 .../tuning => setup/optimization}/_index.md   |  6 ++---
 .../tuning => setup/optimization}/pgo.md      |  0
 34 files changed, 81 insertions(+), 132 deletions(-)
 delete mode 100644 website/content/en/docs/about/_index.md
 delete mode 100644 website/content/en/docs/about/observability-pipelines.md
 delete mode 100644 website/content/en/docs/about/under-the-hood/_index.md
 delete mode 100644 website/content/en/docs/about/under-the-hood/architecture/_index.md
 delete mode 100644 website/content/en/docs/about/under-the-hood/networking/_index.md
 rename website/content/en/docs/{about/vector.md => introduction/_index.md} (89%)
 create mode 100644 website/content/en/docs/introduction/architecture/_index.md
 rename website/content/en/docs/{about/under-the-hood/networking => introduction/architecture}/arc.md (95%)
 rename website/content/en/docs/{about/under-the-hood => introduction}/architecture/buffering-model.md (99%)
 rename website/content/en/docs/{about/under-the-hood => introduction}/architecture/concurrency-model.md (94%)
 rename website/content/en/docs/{about/under-the-hood => introduction}/architecture/data-model/_index.md (89%)
 rename website/content/en/docs/{about/under-the-hood => introduction}/architecture/data-model/log.md (100%)
 rename website/content/en/docs/{about/under-the-hood => introduction}/architecture/data-model/metric.md (79%)
 rename website/content/en/docs/{about/under-the-hood => introduction}/architecture/end-to-end-acknowledgements.md (99%)
 rename website/content/en/docs/{about/under-the-hood => introduction}/architecture/pipeline-model.md (95%)
 rename website/content/en/docs/{about/under-the-hood => introduction}/architecture/runtime-model.md (94%)
 rename website/content/en/docs/{about => introduction}/concepts.md (95%)
 rename website/content/en/docs/{about/under-the-hood => introduction}/guarantees.md (98%)
 rename website/content/en/docs/{administration/tuning => setup/optimization}/_index.md (79%)
 rename website/content/en/docs/{administration/tuning => setup/optimization}/pgo.md (100%)

diff --git a/website/content/en/docs/_index.md b/website/content/en/docs/_index.md
index 6e34e711fec36..d11e1d97dfa91 100644
--- a/website/content/en/docs/_index.md
+++ b/website/content/en/docs/_index.md
@@ -9,7 +9,7 @@ Welcome to the documentation for **Vector**! Vector is a lightweight and ultra-f
 
 If you'd like to familiarize yourself with Vector's core concepts, we recommend reading up on Vector's core concepts:
 
-{{< jump "/docs/about/concepts" >}}
+{{< jump "/docs/introduction/concepts" >}}
 
 If you feel comfortable with the concepts, we recommend our quickstart guide, which takes you through a practical example:
 
diff --git a/website/content/en/docs/about/_index.md b/website/content/en/docs/about/_index.md
deleted file mode 100644
index 9f5bed74193e5..0000000000000
--- a/website/content/en/docs/about/_index.md
+++ /dev/null
@@ -1,15 +0,0 @@
----
-title: About
-weight: 1
-tags: ["about"]
----
-
-This section covers Vector's basic concepts and provides a foundation for the rest of the documentation.
-
-## Pages
-
-{{< pages >}}
-
-## Sections
-
-{{< sections >}}
diff --git a/website/content/en/docs/about/observability-pipelines.md b/website/content/en/docs/about/observability-pipelines.md
deleted file mode 100644
index 88aa54f61fa28..0000000000000
--- a/website/content/en/docs/about/observability-pipelines.md
+++ /dev/null
@@ -1,22 +0,0 @@
----
-title: Observability Pipelines
-weight: 2
-tags: ["concepts"]
-aliases:
-- ./what-is-observability-pipelines
----
-
-Datadog's Observability Pipelines are commercial observability data pipelines for collecting, processing, and routing observability data from any source to any destination in the infrastructure that you own or manage.
-
-Use Observability Pipelines to:
-
-- Manage your pipelines from a control plane. You can build or edit pipelines, whether it is to route a subset of data to a new destination or introduce a new sensitive data redaction rule, and roll out these changes to your active pipelines from the Datadog UI.
-- Monitor your pipelines to understand the health of your pipelines, identify bottlenecks and latencies, fine-tune performance, validate data delivery, and investigate your largest volume contributors.
-- Better optimize volume and control costs by enforcing quotas, store noisy logs in an archive, and more.
-- Scan for and redact sensitive data flowing through your pipelines.
-
-## Learn more
-
-- [Observability Pipelines Overview](https://www.datadoghq.com/product/observability-pipelines/)
-- [Take Control of Your Telemetry Data with Datadog Observability Pipelines](https://www.datadoghq.com/blog/datadog-observability-pipelines/)
-- [Observability Pipelines documentation](https://docs.datadoghq.com/observability_pipelines/)
diff --git a/website/content/en/docs/about/under-the-hood/_index.md b/website/content/en/docs/about/under-the-hood/_index.md
deleted file mode 100644
index c6ce70dc45017..0000000000000
--- a/website/content/en/docs/about/under-the-hood/_index.md
+++ /dev/null
@@ -1,15 +0,0 @@
----
-title: Under the hood
-weight: 3
-tags: ["concepts"]
----
-
-This section focuses on how Vector works. It's intended for readers who are curious about Vector as technology and less focused on usage.
-
-## Sections
-
-{{< sections >}}
-
-## Pages
-
-{{< pages >}}
diff --git a/website/content/en/docs/about/under-the-hood/architecture/_index.md b/website/content/en/docs/about/under-the-hood/architecture/_index.md
deleted file mode 100644
index 2dcd49ac36b79..0000000000000
--- a/website/content/en/docs/about/under-the-hood/architecture/_index.md
+++ /dev/null
@@ -1,21 +0,0 @@
----
-title: Architecture
-weight: 1
-tags: ["architecture", "concepts"]
----
-
-{{< svg "img/architecture.svg" >}}
-
-This section covers the various models that combine to form Vector's architecture. These are ordered progressively, beginning with the [data model][data_model] and broadening all the way to Vector's [runtime model][runtime_model].
-
-## Key pages
-
-{{< jump "/docs/about/under-the-hood/architecture/data-model" >}}
-{{< jump "/docs/about/under-the-hood/architecture/pipeline-model" >}}
-{{< jump "/docs/about/under-the-hood/architecture/concurrency-model" >}}
-{{< jump "/docs/about/under-the-hood/architecture/buffering-model" >}}
-{{< jump "/docs/about/under-the-hood/architecture/end-to-end-acknowledgements" >}}
-{{< jump "/docs/about/under-the-hood/architecture/runtime-model" >}}
-
-[data_model]: /docs/about/under-the-hood/architecture/data-model
-[runtime_model]: /docs/about/under-the-hood/architecture/runtime-model
diff --git a/website/content/en/docs/about/under-the-hood/networking/_index.md b/website/content/en/docs/about/under-the-hood/networking/_index.md
deleted file mode 100644
index 23244bfc77ad3..0000000000000
--- a/website/content/en/docs/about/under-the-hood/networking/_index.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-title: Networking
-weight: 2
----
-
-## Pages in this section
-
-{{< pages >}}
diff --git a/website/content/en/docs/administration/monitoring.md b/website/content/en/docs/administration/monitoring.md
index e4b1d1f96370a..cec428adfe7ad 100644
--- a/website/content/en/docs/administration/monitoring.md
+++ b/website/content/en/docs/administration/monitoring.md
@@ -138,7 +138,7 @@ IO and disrupting the service. The trade-off is that repetitive logs aren't logg
 [sources]: /sources
 [starting]: /docs/administration/management
 [stderr]: https://en.wikipedia.org/wiki/Standard_streams#Standard_error_(stderr)
-[topology]: /docs/about/concepts/#topology
+[topology]: /docs/introduction/concepts/#topology
 [transform]: /transforms
 [troubleshooting]: /guides/level-up/troubleshooting
 [vrl]: /docs/reference/vrl
diff --git a/website/content/en/docs/about/vector.md b/website/content/en/docs/introduction/_index.md
similarity index 89%
rename from website/content/en/docs/about/vector.md
rename to website/content/en/docs/introduction/_index.md
index 52fd7b130d99d..e3d55838ef8c5 100644
--- a/website/content/en/docs/about/vector.md
+++ b/website/content/en/docs/introduction/_index.md
@@ -1,9 +1,7 @@
 ---
-title: Vector
+title: Introduction
 weight: 1
-tags: ["concepts"]
-aliases:
-- ./what-is-vector
+tags: ["introduction"]
 ---
 
 Vector is a high-performance observability data pipeline that puts organizations in control of their observability data. [Collect], [transform], and [route] all your logs, metrics, and traces to any vendors you want today and any other vendors you may want tomorrow. Vector enables dramatic cost reduction, novel data enrichment, and data security where you need it, not where is most convenient for your vendors. Open source and up to 10x faster than every alternative.
@@ -17,3 +15,12 @@ Vector is downloaded millions of times per month and relied on by companies like
 [collect]: /docs/reference/configuration/sources
 [route]: /docs/reference/configuration/sinks
 [transform]: /docs/reference/configuration/transforms
+
+
+## Pages
+
+{{< pages >}}
+
+## Sections
+
+{{< sections >}}
diff --git a/website/content/en/docs/introduction/architecture/_index.md b/website/content/en/docs/introduction/architecture/_index.md
new file mode 100644
index 0000000000000..969315f241ba6
--- /dev/null
+++ b/website/content/en/docs/introduction/architecture/_index.md
@@ -0,0 +1,21 @@
+---
+title: Architecture
+weight: 3
+tags: ["architecture", "concepts"]
+---
+
+{{< svg "img/architecture.svg" >}}
+
+This section covers the various models that combine to form Vector's architecture. These are ordered progressively, beginning with the [data model][data_model] and broadening all the way to Vector's [runtime model][runtime_model].
+
+## Key pages
+
+{{< jump "/docs/introduction/architecture/data-model" >}}
+{{< jump "/docs/introduction/architecture/pipeline-model" >}}
+{{< jump "/docs/introduction/architecture/concurrency-model" >}}
+{{< jump "/docs/introduction/architecture/buffering-model" >}}
+{{< jump "/docs/introduction/architecture/end-to-end-acknowledgements" >}}
+{{< jump "/docs/introduction/architecture/runtime-model" >}}
+
+[data_model]: /docs/introduction/architecture/data-model
+[runtime_model]: /docs/introduction/architecture/runtime-model
diff --git a/website/content/en/docs/about/under-the-hood/networking/arc.md b/website/content/en/docs/introduction/architecture/arc.md
similarity index 95%
rename from website/content/en/docs/about/under-the-hood/networking/arc.md
rename to website/content/en/docs/introduction/architecture/arc.md
index 46171bdaf522e..2c6799879c9ff 100644
--- a/website/content/en/docs/about/under-the-hood/networking/arc.md
+++ b/website/content/en/docs/introduction/architecture/arc.md
@@ -1,7 +1,7 @@
 ---
 title: Adaptive request concurrency (ARC)
-short: ARC
-weight: 1
+short: Adaptive Concurrency
+weight: 6
 tags: ["arc", "request", "concurrency", "adaptive request concurrency", "performance", "http"]
 ---
 
diff --git a/website/content/en/docs/about/under-the-hood/architecture/buffering-model.md b/website/content/en/docs/introduction/architecture/buffering-model.md
similarity index 99%
rename from website/content/en/docs/about/under-the-hood/architecture/buffering-model.md
rename to website/content/en/docs/introduction/architecture/buffering-model.md
index dd0b0bcacc3d2..daa376cc538a0 100644
--- a/website/content/en/docs/about/under-the-hood/architecture/buffering-model.md
+++ b/website/content/en/docs/introduction/architecture/buffering-model.md
@@ -1,6 +1,6 @@
 ---
 title: Buffering model
-weight: 2
+weight: 4
 tags: ["buffering", "buffers", "disk"]
 ---
 
@@ -258,5 +258,5 @@ rather than force the client to wait, which could cause issues further up the st
 [sinks]: /docs/reference/configuration/sinks/
 [transforms]: /docs/reference/configuration/transforms/
 [sources]: /docs/reference/configuration/sources/
-[e2e_acks]: /docs/about/under-the-hood/architecture/end-to-end-acknowledgements
+[e2e_acks]: /docs/introduction/architecture/end-to-end-acknowledgements
 [global_data_dir]: /docs/reference/configuration/global-options/#data_dir
diff --git a/website/content/en/docs/about/under-the-hood/architecture/concurrency-model.md b/website/content/en/docs/introduction/architecture/concurrency-model.md
similarity index 94%
rename from website/content/en/docs/about/under-the-hood/architecture/concurrency-model.md
rename to website/content/en/docs/introduction/architecture/concurrency-model.md
index 0f8fcf676094b..93ad6e37c53de 100644
--- a/website/content/en/docs/about/under-the-hood/architecture/concurrency-model.md
+++ b/website/content/en/docs/introduction/architecture/concurrency-model.md
@@ -1,6 +1,6 @@
 ---
 title: Concurrency model
-weight: 2
+weight: 5
 tags: ["concurrency", "pipeline", "state"]
 ---
 
@@ -23,4 +23,4 @@ processing (we hope to improve this [in the future](https://github.com/vectordot
 [file]: /docs/reference/configuration/sources/file
 [socket]: /docs/reference/configuration/sources/socket
 [sources]: /docs/reference/configuration/sources/
-[pipeline]: /docs/about/under-the-hood/architecture/pipeline-model
+[pipeline]: /docs/introduction/architecture/pipeline-model
diff --git a/website/content/en/docs/about/under-the-hood/architecture/data-model/_index.md b/website/content/en/docs/introduction/architecture/data-model/_index.md
similarity index 89%
rename from website/content/en/docs/about/under-the-hood/architecture/data-model/_index.md
rename to website/content/en/docs/introduction/architecture/data-model/_index.md
index 98b813e2f778a..8dc1fdb0e0931 100644
--- a/website/content/en/docs/about/under-the-hood/architecture/data-model/_index.md
+++ b/website/content/en/docs/introduction/architecture/data-model/_index.md
@@ -13,8 +13,8 @@ The individual units of data flowing through Vector are known as **events**. Eve
 
 Vector defines subtypes for events. This is necessary to establish domain-specific requirements enabling interoperability with existing monitoring and observability systems.
 
-{{< jump "/docs/about/under-the-hood/architecture/data-model/log" >}}
-{{< jump "/docs/about/under-the-hood/architecture/data-model/metric" >}}
+{{< jump "/docs/introduction/architecture/data-model/log" >}}
+{{< jump "/docs/introduction/architecture/data-model/metric" >}}
 
 ## FAQ
 
diff --git a/website/content/en/docs/about/under-the-hood/architecture/data-model/log.md b/website/content/en/docs/introduction/architecture/data-model/log.md
similarity index 100%
rename from website/content/en/docs/about/under-the-hood/architecture/data-model/log.md
rename to website/content/en/docs/introduction/architecture/data-model/log.md
diff --git a/website/content/en/docs/about/under-the-hood/architecture/data-model/metric.md b/website/content/en/docs/introduction/architecture/data-model/metric.md
similarity index 79%
rename from website/content/en/docs/about/under-the-hood/architecture/data-model/metric.md
rename to website/content/en/docs/introduction/architecture/data-model/metric.md
index 5b7ed7f244349..19050c85631cb 100644
--- a/website/content/en/docs/about/under-the-hood/architecture/data-model/metric.md
+++ b/website/content/en/docs/introduction/architecture/data-model/metric.md
@@ -10,6 +10,6 @@ tags: ["metrics", "events", "schema"]
 
 {{< config/metric-schema >}}
 
-[logs]: /docs/about/under-the-hood/architecture/data-model/log
+[logs]: /docs/introduction/architecture/data-model/log
 [prometheus]: https://prometheus.io
 [statsd]: https://github.com/statsd/statsd
diff --git a/website/content/en/docs/about/under-the-hood/architecture/end-to-end-acknowledgements.md b/website/content/en/docs/introduction/architecture/end-to-end-acknowledgements.md
similarity index 99%
rename from website/content/en/docs/about/under-the-hood/architecture/end-to-end-acknowledgements.md
rename to website/content/en/docs/introduction/architecture/end-to-end-acknowledgements.md
index 83829dbe07f19..7f018e7a6082d 100644
--- a/website/content/en/docs/about/under-the-hood/architecture/end-to-end-acknowledgements.md
+++ b/website/content/en/docs/introduction/architecture/end-to-end-acknowledgements.md
@@ -1,6 +1,6 @@
 ---
 title: End-to-end Acknowledgements
-weight: 1
+weight: 7
 tags: ["acknowledgements", "configuration"]
 ---
 
diff --git a/website/content/en/docs/about/under-the-hood/architecture/pipeline-model.md b/website/content/en/docs/introduction/architecture/pipeline-model.md
similarity index 95%
rename from website/content/en/docs/about/under-the-hood/architecture/pipeline-model.md
rename to website/content/en/docs/introduction/architecture/pipeline-model.md
index bcd2144ab2aeb..27a6879434421 100644
--- a/website/content/en/docs/about/under-the-hood/architecture/pipeline-model.md
+++ b/website/content/en/docs/introduction/architecture/pipeline-model.md
@@ -1,6 +1,6 @@
 ---
 title: Pipeline model
-weight: 1
+weight: 2
 tags: ["pipeline", "dag", "graph", "configuration"]
 ---
 
@@ -31,6 +31,6 @@ Vector also includes an [API] that allows for real-time observation and manipula
 [configuration]: /docs/reference/configuration
 [cue]: https://cuelang.org
 [dag]: https://en.wikipedia.org/wiki/Directed_acyclic_graph
-[events]: /docs/about/under-the-hood/architecture/data-model
+[events]: /docs/introduction/architecture/data-model
 [jsonnet]: https://jsonnet.org
 [reloading]: /docs/administration/management/#reloading
diff --git a/website/content/en/docs/about/under-the-hood/architecture/runtime-model.md b/website/content/en/docs/introduction/architecture/runtime-model.md
similarity index 94%
rename from website/content/en/docs/about/under-the-hood/architecture/runtime-model.md
rename to website/content/en/docs/introduction/architecture/runtime-model.md
index ff0572a8ffdc8..d4c3dff162aa5 100644
--- a/website/content/en/docs/about/under-the-hood/architecture/runtime-model.md
+++ b/website/content/en/docs/introduction/architecture/runtime-model.md
@@ -42,9 +42,9 @@ Vector uses the [Tokio][tokio] runtime for task scheduling.
 
 Nodes in Vector's [DAG topology][pipeline] communicate via channels. Edge nodes are customized channels with dynamic output control where back pressure is the default, but can be customized on a per-sink basis to shed load or persist to disk.
 
-[concurrency]: /docs/about/under-the-hood/architecture/concurrency-model
+[concurrency]: /docs/introduction/architecture/concurrency-model
 [dedupe]: /docs/reference/configuration/transforms/dedupe
-[pipeline]: /docs/about/under-the-hood/architecture/pipeline-model
+[pipeline]: /docs/introduction/architecture/pipeline-model
 [remap]: /docs/reference/configuration/transforms/remap
 [tokio]: https://tokio.rs
 [sinks]: /docs/reference/configuration/sinks
diff --git a/website/content/en/docs/about/concepts.md b/website/content/en/docs/introduction/concepts.md
similarity index 95%
rename from website/content/en/docs/about/concepts.md
rename to website/content/en/docs/introduction/concepts.md
index ecd8b30599ea2..024453685f5b2 100644
--- a/website/content/en/docs/about/concepts.md
+++ b/website/content/en/docs/introduction/concepts.md
@@ -1,6 +1,6 @@
 ---
 title: Concepts
-weight: 3
+weight: 1
 tags: ["concepts", "meta", "events", "logs", "metrics", "components", "sources", "transforms", "sinks", "pipeline", "roles", "agent", "aggregator", "topology"]
 ---
 
@@ -10,19 +10,19 @@ In order to understand Vector, you must first understand the fundamental concept
 
 **Events** represent the individual units of data in Vector.
 
-{{< jump "/docs/about/under-the-hood/architecture/data-model" >}}
+{{< jump "/docs/introduction/architecture/data-model" >}}
 
 ### Logs
 
 A **log** event is a generic key/value representation of an event.
 
-{{< jump "/docs/about/under-the-hood/architecture/data-model/log" >}}
+{{< jump "/docs/introduction/architecture/data-model/log" >}}
 
 ### Metrics
 
 A **metric** event represents a numerical operation performed on a time series. Vector's metric events are fully interoperable.
 
-{{< jump "/docs/about/under-the-hood/architecture/data-model/metric" >}}
+{{< jump "/docs/introduction/architecture/data-model/metric" >}}
 
 ### Traces
 
@@ -74,7 +74,7 @@ A **sink** is a destination for events. Each sink's design and transmission meth
 
 A **pipeline** is a [directed acyclic graph][dag] of [components]. Each component is a node in the graph with directed edges. Data must flow in one direction, from sources to sinks. Components can produce zero or more events.
 
-{{< jump "/docs/about/under-the-hood/architecture/pipeline-model" >}}
+{{< jump "/docs/introduction/architecture/pipeline-model" >}}
 
 
 ## Buffers
diff --git a/website/content/en/docs/about/under-the-hood/guarantees.md b/website/content/en/docs/introduction/guarantees.md
similarity index 98%
rename from website/content/en/docs/about/under-the-hood/guarantees.md
rename to website/content/en/docs/introduction/guarantees.md
index 6a1c150ee074e..2311a16176493 100644
--- a/website/content/en/docs/about/under-the-hood/guarantees.md
+++ b/website/content/en/docs/introduction/guarantees.md
@@ -1,6 +1,7 @@
 ---
 title: Guarantees
-aliases: ["/docs/about/guarantees"]
+weight: 2
+aliases: ["/docs/introduction/guarantees"]
 ---
 
 Vector attempts to make it clear which guarantees you can expect from it. We categorize all
@@ -132,4 +133,4 @@ filters.
 
 [bugs]: https://github.com/vectordotdev/vector/issues?q=is%3Aopen+is%3Aissue+label%3A%22type%3A+bug%22
 [components]: /components
-[event]: /docs/about/under-the-hood/architecture/data-model
+[event]: /docs/introduction/architecture/data-model
diff --git a/website/content/en/docs/reference/_index.md b/website/content/en/docs/reference/_index.md
index f4516a76e0fe6..9edf2c61baa2f 100644
--- a/website/content/en/docs/reference/_index.md
+++ b/website/content/en/docs/reference/_index.md
@@ -4,7 +4,7 @@ weight: 3
 ---
 
 This section contains various forms of reference-style documentation for Vector. These docs tend to
-be most useful when you already have a [good grasp][about] of how Vector works and have already
+be most useful when you already have a [good grasp][introduction] of how Vector works and have already
 made your way through the [Vector quickstart][quickstart].
 
 ## Pages
@@ -15,5 +15,5 @@ made your way through the [Vector quickstart][quickstart].
 
 {{< sections >}}
 
-[about]: /docs/about
+[introduction]: /docs/introduction
 [quickstart]: /docs/setup/quickstart
diff --git a/website/content/en/docs/reference/configuration/template-syntax.md b/website/content/en/docs/reference/configuration/template-syntax.md
index ba08fd7ee8313..e0efd2ec4ee29 100644
--- a/website/content/en/docs/reference/configuration/template-syntax.md
+++ b/website/content/en/docs/reference/configuration/template-syntax.md
@@ -58,7 +58,7 @@ option = "year=%Y/month=%m/day=%d/"
 ```
 
 {{< info >}}
-The value is derived from the [`timestamp` field](/docs/about/under-the-hood/architecture/data-model/log/#timestamps)
+The value is derived from the [`timestamp` field](/docs/introduction/under-the-hood/architecture/data-model/log/#timestamps)
 and the name of this field can be changed via the [global `timestamp_key` option](/docs/reference/configuration/global-options/#log_schema.timestamp_key).
 {{< /info >}}
 
@@ -109,7 +109,7 @@ metric is incremented with an `error_type` tag of `template_failed`.
 
 [1692]: https://github.com/vectordotdev/vector/issues/1692
 [aws_s3]: /docs/reference/configuration/sinks/aws_s3
-[log]: /docs/about/under-the-hood/architecture/data-model/log
+[log]: /docs/introduction/under-the-hood/architecture/data-model/log
 [path_expression]: /docs/reference/vrl/expressions/#path
 [path_expression_examples]: /docs/reference/vrl/expressions/#path-examples
 [remap]: /docs/reference/configuration/transforms/remap
diff --git a/website/content/en/docs/reference/configuration/unit-tests.md b/website/content/en/docs/reference/configuration/unit-tests.md
index f685c16383814..6dbc26ebc42f0 100644
--- a/website/content/en/docs/reference/configuration/unit-tests.md
+++ b/website/content/en/docs/reference/configuration/unit-tests.md
@@ -599,8 +599,8 @@ assert!(!exists(.tags.host), "host tag included")
 [filter]: /docs/reference/configuration/transforms/filter
 [includes]: /docs/reference/vrl/functions/#includes
 [is_nullish]: /docs/reference/vrl/functions/#is_nullish
-[logs]: /docs/about/under-the-hood/architecture/data-model/log
-[metrics]: /docs/about/under-the-hood/architecture/data-model/metric
+[logs]: /docs/introduction/under-the-hood/architecture/data-model/log
+[metrics]: /docs/introduction/under-the-hood/architecture/data-model/metric
 [pipeline]: /docs/reference/glossary/#pipeline
 [remap]: /docs/reference/configuration/transforms/remap
 [transforms]: /docs/reference/glossary/#transform
diff --git a/website/content/en/docs/reference/vrl/_index.md b/website/content/en/docs/reference/vrl/_index.md
index 6b25e9903a5b0..4c2b19d1f6000 100644
--- a/website/content/en/docs/reference/vrl/_index.md
+++ b/website/content/en/docs/reference/vrl/_index.md
@@ -199,14 +199,14 @@ VRL has some core concepts that you should be aware of as you dive in.
 [dedupe]: /docs/reference/configuration/transforms/dedupe
 [del]: /docs/reference/vrl/functions#del
 [errors]: /docs/reference/vrl/errors
-[events]: /docs/about/under-the-hood-architecture/data-model
+[events]: /docs/introduction/under-the-hood-architecture/data-model
 [fail_safe]: https://en.wikipedia.org/wiki/Fail-safe
 [ffi]: https://en.wikipedia.org/wiki/Foreign_function_interface
 [filter]: /docs/reference/configuration/transforms/filter
 [log]: /docs/reference/vrl/functions#log
-[logs]: /docs/about/under-the-hood/architecture/data-model/log
+[logs]: /docs/introduction/under-the-hood/architecture/data-model/log
 [memory_safety]: https://en.wikipedia.org/wiki/Memory_safety
-[metrics]: /docs/about/under-the-hood/architecture/data-model/metrics
+[metrics]: /docs/introduction/under-the-hood/architecture/data-model/metrics
 [now]: /docs/reference/vrl/functions#now
 [remap]: /docs/reference/configuration/transforms/remap
 [route]: /docs/reference/configuration/transforms/route
diff --git a/website/content/en/docs/setup/deployment/_index.md b/website/content/en/docs/setup/deployment/_index.md
index e8c2d3f374542..a056660a4cf17 100644
--- a/website/content/en/docs/setup/deployment/_index.md
+++ b/website/content/en/docs/setup/deployment/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Deployment
-weight: 2
+weight: 3
 ---
 
 ![Vector deployment diagram](/img/deployment.png)
diff --git a/website/content/en/docs/setup/going-to-prod/_index.md b/website/content/en/docs/setup/going-to-prod/_index.md
index b1cc09f4109ac..a0b8d1aea44bb 100644
--- a/website/content/en/docs/setup/going-to-prod/_index.md
+++ b/website/content/en/docs/setup/going-to-prod/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Going to Production
-weight: 3
+weight: 4
 ---
 
 This section offers guidance and best practices for infrastructure architects deploying Vector into production environments.
diff --git a/website/content/en/docs/setup/going-to-prod/arch/agent.md b/website/content/en/docs/setup/going-to-prod/arch/agent.md
index 97e2ba8cfce98..fce1d6e40ccc6 100644
--- a/website/content/en/docs/setup/going-to-prod/arch/agent.md
+++ b/website/content/en/docs/setup/going-to-prod/arch/agent.md
@@ -46,7 +46,7 @@ See the [architecting document](/docs/setup/going-to-prod/architecting/) for mor
 ### High Availability
 
 - If the [failure of a single Vector agent](/docs/setup/going-to-prod/high-availability/#vector-process-failure) is unacceptable, consider the [aggregator architecture](/docs/setup/going-to-prod/arch/aggregator/), which deploys Vector across multiple nodes in a [highly available manner](/docs/setup/going-to-prod/high-availability/).
-- Enable [end-to-end acknowledgements](/docs/about/under-the-hood/architecture/end-to-end-acknowledgements/) to mitigate [data receive failures](/docs/setup/going-to-prod/high-availability/#data-receive-failure).
+- Enable [end-to-end acknowledgements](/docs/introduction/under-the-hood/architecture/end-to-end-acknowledgements/) to mitigate [data receive failures](/docs/setup/going-to-prod/high-availability/#data-receive-failure).
 - Route dropped events to mitigate [data processing failures](/docs/setup/going-to-prod/high-availability/#data-processing-failure).
 
 {{< info >}}
diff --git a/website/content/en/docs/setup/going-to-prod/arch/aggregator.md b/website/content/en/docs/setup/going-to-prod/arch/aggregator.md
index a0132d215959c..01b0895b7a39b 100644
--- a/website/content/en/docs/setup/going-to-prod/arch/aggregator.md
+++ b/website/content/en/docs/setup/going-to-prod/arch/aggregator.md
@@ -94,7 +94,7 @@ Partitioning, or “topics” in Kafka terminology, refers to separating data in
 #### Recommendations
 
 - Use memory buffers with `buffers.when_full` set to `block`. This will ensure back pressure flows upstream to your pub-sub system, where durable buffering should occur.
-- Enable [end-to-end acknowledgements](/docs/about/under-the-hood/architecture/end-to-end-acknowledgements/) for your Vector pub-sub source (i.e., the `kafka` source) to ensure data is persisted downstream before removing the data from your pub-sub systems.
+- Enable [end-to-end acknowledgements](/docs/introduction/under-the-hood/architecture/end-to-end-acknowledgements/) for your Vector pub-sub source (i.e., the `kafka` source) to ensure data is persisted downstream before removing the data from your pub-sub systems.
 
 ### Global Aggregation
 
diff --git a/website/content/en/docs/setup/going-to-prod/architecting.md b/website/content/en/docs/setup/going-to-prod/architecting.md
index 2931894aea06d..afacd34584bb7 100644
--- a/website/content/en/docs/setup/going-to-prod/architecting.md
+++ b/website/content/en/docs/setup/going-to-prod/architecting.md
@@ -122,7 +122,7 @@ Notice that these functions collect and forward existing data, unchanged. There
 
 Vector should not replace agents that produce vendor-specific data that Vector cannot replicate.
 
-For example, the Datadog Agent powers [Network Performance Monitoring](https://www.datadoghq.com/product/network-monitoring/network-performance-monitoring/). In this case, the Datadog Agent integrates with vendor-specific systems and produces vendor-specific data. Vector should not be involved with this process. Instead, the Datadog Agent should collect the data and send it directly to Datadog since the data is not one of [Vector’s supported data types](docs/about/under-the-hood/architecture/data-model/).
+For example, the Datadog Agent powers [Network Performance Monitoring](https://www.datadoghq.com/product/network-monitoring/network-performance-monitoring/). In this case, the Datadog Agent integrates with vendor-specific systems and produces vendor-specific data. Vector should not be involved with this process. Instead, the Datadog Agent should collect the data and send it directly to Datadog since the data is not one of [Vector’s supported data types](docs/introduction/under-the-hood/architecture/data-model/).
 
 As another example, the Datadog Agent collects service metrics and enriches them with vendor-specific Datadog tags. In this case, the Datadog Agent should send the metrics directly to Datadog or route them through Vector. Vector should not replace the Datadog Agent because the data being produced is enriched in a vendor-specific way.
 
@@ -153,7 +153,7 @@ Alternatively, you can deploy Vector [on separate nodes as an aggregator](/docs/
 
 ##### Reducing Agent Risk
 
-When integrating with an agent, you should configure the agent to be a simple data forwarder, and route [supported data types](docs/about/under-the-hood/architecture/data-model/) through Vector. This strategy reduces the risk of data loss and service disruption due to misbehaving agents by minimizing their responsibilities.
+When integrating with an agent, you should configure the agent to be a simple data forwarder, and route [supported data types](docs/introduction/under-the-hood/architecture/data-model/) through Vector. This strategy reduces the risk of data loss and service disruption due to misbehaving agents by minimizing their responsibilities.
 
 #### Replacing Agents
 
@@ -173,7 +173,7 @@ Data processing deals with everything in between your Vector sources and sinks.
 
 #### Choosing Which Data to Process
 
-Primitive data types that [Vector’s data model](docs/about/under-the-hood/architecture/data-model/) supports should be processed by Vector (i.e., logs, metrics, and traces). Real-time, vendor-specific data, such as continuous profiling data, should not flow through Vector since it is not interoperable and typically does not benefit from processing.
+Primitive data types that [Vector’s data model](docs/introduction/under-the-hood/architecture/data-model/) supports should be processed by Vector (i.e., logs, metrics, and traces). Real-time, vendor-specific data, such as continuous profiling data, should not flow through Vector since it is not interoperable and typically does not benefit from processing.
 
 #### Choosing Where to Process Data
 
@@ -266,7 +266,7 @@ Your system of record should optimize for durability while minimizing cost:
 
 - Only write to your archive from the [aggregator role](#aggregator-role) to reduce data loss due to node restarts and [software failures](/docs/setup/going-to-prod/high-availability/#mitigate-software-failures).
 - Front the sink with a disk buffer.
-- Enable [end-to-end acknowledgements](/docs/about/under-the-hood/architecture/end-to-end-acknowledgements/) on all sources.
+- Enable [end-to-end acknowledgements](/docs/introduction/under-the-hood/architecture/end-to-end-acknowledgements/) on all sources.
 - Set `batch.max_bytes` to ≥ 5MiB and `batch.timeout_secs` to ≥ 5 minutes and enable `compression` (the default for archiving sinks, such as the `aws_s3` sink).
 - Archive raw, unprocessed data to allow for data replay and reduce the risk of accidental data corruption during processing.
 
diff --git a/website/content/en/docs/setup/going-to-prod/high-availability.md b/website/content/en/docs/setup/going-to-prod/high-availability.md
index 9dc7fdb5a12ed..97f88ac269e34 100644
--- a/website/content/en/docs/setup/going-to-prod/high-availability.md
+++ b/website/content/en/docs/setup/going-to-prod/high-availability.md
@@ -39,7 +39,7 @@ Mitigate Vector process failures similarly to [node failures](#node-failure): Ve
 
 #### Data Receive Failure
 
-Mitigate data receive failures with Vector’s [end-to-end acknowledgements feature](/docs/about/under-the-hood/architecture/end-to-end-acknowledgements/). When enabled, Vector only responds to the clients when data durably persists. Such as writing the data to the disk buffer or a downstream service.
+Mitigate data receive failures with Vector’s [end-to-end acknowledgements feature](/docs/introduction/under-the-hood/architecture/end-to-end-acknowledgements/). When enabled, Vector only responds to the clients when data durably persists. Such as writing the data to the disk buffer or a downstream service.
 
 ![Failure](/img/going-to-prod/ha/receive-failure.png)
 
@@ -78,7 +78,7 @@ Support for `dropped` channels in other components is forthcoming.
 
 #### Data Send Failure
 
-Mitigate data send failures with [Adaptive Request Concurrency (ARC)](/docs/about/under-the-hood/networking/arc/) and buffers.
+Mitigate data send failures with [Adaptive Request Concurrency (ARC)](/docs/introduction/under-the-hood/networking/arc/) and buffers.
 
 ARC automatically scales down the number of outgoing connections when Vector cannot send data. ARC minimizes the amount of in-flight data, appropriately applies backpressure, and prevents the stampede effect that often prohibits downstream services from recovering.
 
@@ -139,7 +139,7 @@ These actions mitigate [individual node failure](#node-failure) and [data center
 
 Mitigate software failures by configuring your Vector instances as follows:
 
-1. Able sources should enable [end-to-end acknowledgements](/docs/about/under-the-hood/architecture/end-to-end-acknowledgements/).
+1. Able sources should enable [end-to-end acknowledgements](/docs/introduction/under-the-hood/architecture/end-to-end-acknowledgements/).
 2. Sinks should implement disk or memory buffers that overflow to disk.
 3. Transforms should implement dropped event routing to your system of record.
 
diff --git a/website/content/en/docs/setup/going-to-prod/sizing.md b/website/content/en/docs/setup/going-to-prod/sizing.md
index ecc7b827b37c6..122f5b06d628a 100644
--- a/website/content/en/docs/setup/going-to-prod/sizing.md
+++ b/website/content/en/docs/setup/going-to-prod/sizing.md
@@ -77,7 +77,7 @@ More information about buffers and data loss can be found in the [high availabil
 
 ### Vertical Scaling
 
-[Vector’s concurrency model](/docs/about/under-the-hood/architecture/concurrency-model/) automatically scales to take advantage of all vCPUs. There are no configuration changes needed. When vertically scaling, we recommend capping an instance’s size to process no more than 33% of your total volume. This allows for [high availability](/docs/setup/going-to-prod/high-availability/) in the event of a node failure.
+[Vector’s concurrency model](/docs/introduction/under-the-hood/architecture/concurrency-model/) automatically scales to take advantage of all vCPUs. There are no configuration changes needed. When vertically scaling, we recommend capping an instance’s size to process no more than 33% of your total volume. This allows for [high availability](/docs/setup/going-to-prod/high-availability/) in the event of a node failure.
 
 {{< info >}}
 More information about vertical sizing can be found in the [capacity planning section](#capacity-planning).
diff --git a/website/content/en/docs/setup/installation/_index.md b/website/content/en/docs/setup/installation/_index.md
index 5bd018da6b0c9..9f817f5eb0eb5 100644
--- a/website/content/en/docs/setup/installation/_index.md
+++ b/website/content/en/docs/setup/installation/_index.md
@@ -2,6 +2,7 @@
 title: Install Vector
 description: Get up and running with Vector on your preferred platform
 short: Installation
+weight: 2
 ---
 
 Vector compiles to a single static binary, which makes it easy to install.
diff --git a/website/content/en/docs/administration/tuning/_index.md b/website/content/en/docs/setup/optimization/_index.md
similarity index 79%
rename from website/content/en/docs/administration/tuning/_index.md
rename to website/content/en/docs/setup/optimization/_index.md
index 836557b142088..d73c9e5b31164 100644
--- a/website/content/en/docs/administration/tuning/_index.md
+++ b/website/content/en/docs/setup/optimization/_index.md
@@ -1,7 +1,7 @@
 ---
-title: Tuning
-weight: 3
-tags: ["tuning", "rust", "performance"]
+title: Optimization
+weight: 5
+tags: ["tuning", "rust", "performance", "optimization"]
 ---
 
 Vector is written in [Rust] and therefore doesn't include a runtime or a virtual machine. There are no special service-level steps you need to undertake to improve performance as Vector takes full advantage of all system resources by default and without any adjustments.
diff --git a/website/content/en/docs/administration/tuning/pgo.md b/website/content/en/docs/setup/optimization/pgo.md
similarity index 100%
rename from website/content/en/docs/administration/tuning/pgo.md
rename to website/content/en/docs/setup/optimization/pgo.md

From 86b3235e33c3448f356312a7a04af4ed69e6fd74 Mon Sep 17 00:00:00 2001
From: Thomas <thomas.schneider@datadoghq.com>
Date: Tue, 1 Jul 2025 12:56:01 -0400
Subject: [PATCH 145/305] fix(website): fix broken links due to // in
 vrl_expressions (#23321)

---
 website/cue/reference/urls.cue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/website/cue/reference/urls.cue b/website/cue/reference/urls.cue
index 584919b0a4bbd..ebd0bc52760f3 100644
--- a/website/cue/reference/urls.cue
+++ b/website/cue/reference/urls.cue
@@ -653,14 +653,14 @@ urls: {
 	vrl_error_handling_raising:                 "\(vrl_errors_reference)#raising"
 	vrl_errors_reference:                       "\(vrl_reference)/errors/"
 	vrl_examples:                               "\(vrl_reference)/examples"
-	vrl_expressions:                            "\(vrl_reference)/expressions/"
+	vrl_expressions:                            "\(vrl_reference)/expressions"
 	vrl_fail_safety:                            "\(vrl_reference)/#fail-safety"
 	vrl_features:                               "\(vrl_reference)/#features"
 	vrl_functions:                              "\(vrl_reference)/functions"
 	vrl_literals:                               "\(vrl_expressions)/#literal-expressions"
 	vrl_match_function:                         "\(vrl_functions)/#match"
 	vrl_parsing_functions:                      "\(vrl_functions)/#parse-functions"
-	vrl_path_expressions:                       "\(vrl_expressions)#path"
+	vrl_path_expressions:                       "\(vrl_expressions)/#path"
 	vrl_performance:                            "\(vrl_reference)#performance"
 	vrl_reference:                              "/docs/reference/vrl"
 	vrl_runtime_errors:                         "\(vrl_errors_reference)#runtime-errors"

From 39b6277a5c2ece171a7b810b3bdbd57763a68bdb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Jul 2025 17:51:52 +0000
Subject: [PATCH 146/305] chore(ci): Bump docker/setup-buildx-action from
 3.10.0 to 3.11.1 (#23322)

Bumps [docker/setup-buildx-action](https://github.com/docker/setup-buildx-action) from 3.10.0 to 3.11.1.
- [Release notes](https://github.com/docker/setup-buildx-action/releases)
- [Commits](https://github.com/docker/setup-buildx-action/compare/v3.10.0...v3.11.1)

---
updated-dependencies:
- dependency-name: docker/setup-buildx-action
  dependency-version: 3.11.1
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/environment.yml | 2 +-
 .github/workflows/publish.yml     | 2 +-
 .github/workflows/regression.yml  | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/environment.yml b/.github/workflows/environment.yml
index edbbce826dd50..21be3a8dcab05 100644
--- a/.github/workflows/environment.yml
+++ b/.github/workflows/environment.yml
@@ -41,7 +41,7 @@ jobs:
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3.6.0
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3.10.0
+        uses: docker/setup-buildx-action@v3.11.1
       - name: Login to DockerHub
         uses: docker/login-action@v3
         if: github.ref == 'refs/heads/master'
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 099fb27b09146..5ce7e533434d3 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -534,7 +534,7 @@ jobs:
           platforms: all
       - name: Set up Docker Buildx
         id: buildx
-        uses: docker/setup-buildx-action@v3.10.0
+        uses: docker/setup-buildx-action@v3.11.1
         with:
           version: latest
           install: true
diff --git a/.github/workflows/regression.yml b/.github/workflows/regression.yml
index 88b3a4637043f..f3960b5caeb19 100644
--- a/.github/workflows/regression.yml
+++ b/.github/workflows/regression.yml
@@ -201,7 +201,7 @@ jobs:
 
       - name: Set up Docker Buildx
         id: buildx
-        uses: docker/setup-buildx-action@v3.10.0
+        uses: docker/setup-buildx-action@v3.11.1
 
       - name: Build 'vector' target image
         uses: docker/build-push-action@v6.18.0
@@ -240,7 +240,7 @@ jobs:
 
       - name: Set up Docker Buildx
         id: buildx
-        uses: docker/setup-buildx-action@v3.10.0
+        uses: docker/setup-buildx-action@v3.11.1
 
       - name: Build 'vector' target image
         uses: docker/build-push-action@v6.18.0

From d8f74708a2703c7f31487482a395d2f4021887ff Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Jul 2025 15:43:29 -0400
Subject: [PATCH 147/305] chore(deps): Bump syslog_loose from 0.21.0 to 0.22.0
 (#23315)

---
updated-dependencies:
- dependency-name: syslog_loose
  dependency-version: 0.22.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock            | 14 ++++++++++++--
 lib/codecs/Cargo.toml |  2 +-
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index dffa836e1552b..bf5b3bb360146 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2291,7 +2291,7 @@ dependencies = [
  "similar-asserts",
  "smallvec",
  "snafu 0.8.6",
- "syslog_loose",
+ "syslog_loose 0.22.0",
  "tokio",
  "tokio-util",
  "tracing 0.1.41",
@@ -10252,6 +10252,16 @@ dependencies = [
  "nom 7.1.3",
 ]
 
+[[package]]
+name = "syslog_loose"
+version = "0.22.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d6ec4df26907adce53e94eac201a9ba38744baea3bc97f34ffd591d5646231a6"
+dependencies = [
+ "chrono",
+ "nom 8.0.0",
+]
+
 [[package]]
 name = "system-configuration"
 version = "0.5.1"
@@ -12216,7 +12226,7 @@ dependencies = [
  "snafu 0.8.6",
  "snap",
  "strip-ansi-escapes",
- "syslog_loose",
+ "syslog_loose 0.21.0",
  "termcolor",
  "thiserror 2.0.3",
  "tokio",
diff --git a/lib/codecs/Cargo.toml b/lib/codecs/Cargo.toml
index 01112bc2e6dd7..17b715a1cd3ea 100644
--- a/lib/codecs/Cargo.toml
+++ b/lib/codecs/Cargo.toml
@@ -30,7 +30,7 @@ serde_with = { version = "3.12.0", default-features = false, features = ["std",
 serde_json.workspace = true
 smallvec = { version = "1", default-features = false, features = ["union"] }
 snafu.workspace = true
-syslog_loose = { version = "0.21", default-features = false, optional = true }
+syslog_loose = { version = "0.22", default-features = false, optional = true }
 tokio-util = { version = "0.7", default-features = false, features = ["codec"] }
 tokio.workspace = true
 tracing = { version = "0.1", default-features = false }

From dff8802ddc8ea30b2929ce3bc017d7486aa12a9d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Jul 2025 21:02:17 +0000
Subject: [PATCH 148/305] chore(deps): Bump redis from 0.24.0 to 0.32.3
 (#23307)

* chore(deps): Bump redis from 0.24.0 to 0.25.4

---
updated-dependencies:
- dependency-name: redis
  dependency-version: 0.25.4
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* Replace deprecated get_async_connection->get_multiplexed_async_connection

* Bump redis to 0.32.3

* Fix integration test

* Fix all compilation errors

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Thomas Schneider <thomas.schneider@datadoghq.com>
---
 Cargo.lock                           | 26 +++++++++++++-------------
 Cargo.toml                           |  2 +-
 src/sinks/redis/integration_tests.rs | 12 +++++-------
 src/sources/redis/channel.rs         |  5 ++---
 src/sources/redis/mod.rs             |  2 +-
 5 files changed, 22 insertions(+), 25 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index bf5b3bb360146..9a55cb28c2091 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2328,7 +2328,7 @@ version = "3.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fde0e0ec90c9dfb3b4b1a0891a7dcd0e2bffde2f7efed5fe7c9bb00e5bfb915e"
 dependencies = [
- "windows-sys 0.59.0",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
@@ -4770,7 +4770,7 @@ dependencies = [
  "httpdate",
  "itoa",
  "pin-project-lite",
- "socket2 0.5.10",
+ "socket2 0.4.10",
  "tokio",
  "tower-service",
  "tracing 0.1.41",
@@ -6655,11 +6655,10 @@ dependencies = [
 
 [[package]]
 name = "num-bigint"
-version = "0.4.4"
+version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0"
+checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9"
 dependencies = [
- "autocfg",
  "num-integer",
  "num-traits",
 ]
@@ -6709,11 +6708,10 @@ dependencies = [
 
 [[package]]
 name = "num-integer"
-version = "0.1.45"
+version = "0.1.46"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9"
+checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f"
 dependencies = [
- "autocfg",
  "num-traits",
 ]
 
@@ -8440,24 +8438,26 @@ dependencies = [
 
 [[package]]
 name = "redis"
-version = "0.24.0"
+version = "0.32.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c580d9cbbe1d1b479e8d67cf9daf6a62c957e6846048408b80b43ac3f6af84cd"
+checksum = "7f0f6a8c53351d89a3869a703459995a0bcadcfa846002707fbc7e5cca235c4a"
 dependencies = [
  "arc-swap",
- "async-trait",
+ "backon",
  "bytes 1.10.1",
+ "cfg-if",
  "combine 4.6.6",
- "futures 0.3.31",
+ "futures-channel",
  "futures-util",
  "itoa",
  "native-tls",
+ "num-bigint",
  "percent-encoding",
  "pin-project-lite",
  "ryu",
+ "socket2 0.5.10",
  "tokio",
  "tokio-native-tls",
- "tokio-retry",
  "tokio-util",
  "url",
 ]
diff --git a/Cargo.toml b/Cargo.toml
index 08cded9823015..4b19eecd90db3 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -376,7 +376,7 @@ quick-junit = { version = "0.5.1" }
 rand.workspace = true
 rand_distr.workspace = true
 rdkafka = { version = "0.37.0", default-features = false, features = ["curl-static", "tokio", "libz", "ssl", "zstd"], optional = true }
-redis = { version = "0.24.0", default-features = false, features = ["connection-manager", "tokio-comp", "tokio-native-tls-comp"], optional = true }
+redis = { version = "0.32.3", default-features = false, features = ["connection-manager", "tokio-comp", "tokio-native-tls-comp"], optional = true }
 regex = { version = "1.11.1", default-features = false, features = ["std", "perf"] }
 roaring = { version = "0.11.0", default-features = false, features = ["std"], optional = true }
 rumqttc = { version = "0.24.0", default-features = false, features = ["use-rustls"], optional = true }
diff --git a/src/sinks/redis/integration_tests.rs b/src/sinks/redis/integration_tests.rs
index b3a206d431e96..442e44a935fe2 100644
--- a/src/sinks/redis/integration_tests.rs
+++ b/src/sinks/redis/integration_tests.rs
@@ -168,12 +168,11 @@ async fn redis_sink_channel() {
 
     let client = redis::Client::open(redis_server()).unwrap();
     debug!("Get Redis async connection.");
-    let conn = client
-        .get_async_connection()
+    let mut pubsub_conn = client
+        .get_async_pubsub()
         .await
         .expect("Failed to get Redis async connection.");
     debug!("Get Redis async connection success.");
-    let mut pubsub_conn = conn.into_pubsub();
     debug!("Subscribe channel:{}.", key);
     pubsub_conn
         .subscribe(key.clone().to_string())
@@ -244,12 +243,11 @@ async fn redis_sink_channel_data_volume_tags() {
 
     let client = redis::Client::open(redis_server()).unwrap();
     debug!("Get Redis async connection.");
-    let conn = client
-        .get_async_connection()
+    let mut pubsub_conn = client
+        .get_async_pubsub()
         .await
         .expect("Failed to get Redis async connection.");
     debug!("Get Redis async connection success.");
-    let mut pubsub_conn = conn.into_pubsub();
     debug!("Subscribe channel:{}.", key);
     pubsub_conn
         .subscribe(key.clone().to_string())
@@ -438,7 +436,7 @@ async fn redis_sink_traces() {
         // Verify data in Redis
         let mut conn = redis::Client::open(redis_server())
             .unwrap()
-            .get_async_connection()
+            .get_multiplexed_async_connection()
             .await
             .unwrap();
 
diff --git a/src/sources/redis/channel.rs b/src/sources/redis/channel.rs
index c9417c24b65f1..0e9089d804a30 100644
--- a/src/sources/redis/channel.rs
+++ b/src/sources/redis/channel.rs
@@ -22,15 +22,14 @@ impl InputHandler {
         mut self,
         connection_info: ConnectionInfo,
     ) -> crate::Result<Source> {
-        let conn = self
+        let mut pubsub_conn = self
             .client
-            .get_async_connection()
+            .get_async_pubsub()
             .await
             .context(ConnectionSnafu {})?;
 
         trace!(endpoint = %connection_info.endpoint.as_str(), "Connected.");
 
-        let mut pubsub_conn = conn.into_pubsub();
         pubsub_conn
             .subscribe(&self.key)
             .await
diff --git a/src/sources/redis/mod.rs b/src/sources/redis/mod.rs
index 107d3ca81548d..292503cdfa160 100644
--- a/src/sources/redis/mod.rs
+++ b/src/sources/redis/mod.rs
@@ -487,7 +487,7 @@ mod integration_test {
         let client = redis::Client::open(REDIS_SERVER).unwrap();
 
         let mut async_conn = client
-            .get_async_connection()
+            .get_multiplexed_async_connection()
             .await
             .expect("Failed to get redis async connection.");
 

From 90ba7c4efe2c1d3540ae99c3db1ec32e2e6bce07 Mon Sep 17 00:00:00 2001
From: Pavlos Rontidis <pavlos.rontidis@gmail.com>
Date: Tue, 1 Jul 2025 17:23:08 -0400
Subject: [PATCH 149/305] chore(website): navigation overhaul part 2 (#23324)

* chore(website): convert monitoring toml snippets to yaml snippets

* update upgrading page

* also update readme

* cleanup

* move guarantees

* cargo fmt

* re-add some links

* tweaks to the footer
---
 README.md                                     | 78 +++++++------------
 VERSIONING.md                                 |  2 +-
 docs/tutorials/sinks/1_basic_sink.md          |  2 +-
 docs/tutorials/sinks/2_http_sink.md           |  2 +-
 lib/vector-buffers/src/config.rs              |  2 +-
 lib/vector-core/src/config/global_options.rs  |  2 +-
 lib/vector-core/src/config/mod.rs             |  4 +-
 ...6-1999-api-extensions-for-lua-transform.md | 30 +++----
 rfcs/2020-05-25-2692-more-usable-logevents.md |  2 +-
 rfcs/2020-07-28-3642-jmx_rfc.md               |  2 +-
 rfcs/2020-08-21-3092-apache-metrics-source.md |  3 +-
 rfcs/2020-08-26-3191-host-metrics.md          |  2 +-
 rfcs/2020-08-27-3603-postgres-metrics.md      |  2 +-
 rfcs/2020-08-31-3640-nginx-metrics-source.md  |  2 +-
 rfcs/2020-08-31-3641-mongo-metrics.md         |  2 +-
 ...-accept-metrics-in-datadog-agent-source.md |  2 +-
 src/sinks/prometheus/exporter.rs              |  6 +-
 src/sinks/prometheus/remote_write/config.rs   |  4 +-
 src/sinks/util/service/concurrency.rs         |  5 +-
 website/config.toml                           | 24 +++---
 website/content/en/_index.md                  |  4 +-
 .../en/docs/administration/monitoring.md      | 77 ++++++++++--------
 .../optimization/_index.md                    |  2 +-
 .../optimization/pgo.md                       |  0
 .../en/docs/administration/upgrading.md       |  4 +-
 .../content/en/docs/architecture/_index.md    | 21 +++++
 .../{introduction => }/architecture/arc.md    |  0
 .../architecture/buffering-model.md           |  2 +-
 .../architecture/concurrency-model.md         |  2 +-
 .../architecture/data-model/_index.md         |  4 +-
 .../architecture/data-model/log.md            |  0
 .../architecture/data-model/metric.md         |  2 +-
 .../end-to-end-acknowledgements.md            |  0
 .../guarantees.md                             |  4 +-
 .../architecture/pipeline-model.md            |  2 +-
 .../architecture/runtime-model.md             |  4 +-
 website/content/en/docs/example.md            |  7 --
 .../content/en/docs/introduction/_index.md    |  4 -
 .../docs/introduction/architecture/_index.md  | 21 -----
 .../content/en/docs/introduction/concepts.md  |  8 +-
 website/content/en/docs/reference/_index.md   |  2 +-
 .../configuration/template-syntax.md          |  4 +-
 .../reference/configuration/unit-tests.md     |  4 +-
 .../content/en/docs/reference/vrl/_index.md   |  6 +-
 .../en/docs/setup/going-to-prod/arch/agent.md |  2 +-
 .../setup/going-to-prod/arch/aggregator.md    |  2 +-
 .../docs/setup/going-to-prod/architecting.md  |  8 +-
 .../setup/going-to-prod/high-availability.md  |  6 +-
 .../en/docs/setup/going-to-prod/sizing.md     |  2 +-
 .../advanced/custom-aggregations-with-lua.md  |  4 +-
 .../advanced/merge-multiline-logs-with-lua.md |  4 +-
 .../advanced/parsing-csv-logs-with-lua.md     |  2 +-
 .../guides/developer/config-autocompletion.md |  2 +-
 .../guides/getting-started/transformation.md  |  4 +-
 .../guides/level-up/csv-enrichment-guide.md   |  2 +-
 .../level-up/managing-complex-configs.md      |  4 +-
 .../en/guides/level-up/managing-schemas.md    |  3 +-
 .../en/guides/level-up/vector-tap-guide.md    |  2 +-
 .../2020-02-14-global-log-schema.md           |  2 +-
 .../2020-02-24-log-data-model-changes.md      |  2 +-
 .../2020-04-07-vector-to-vector-metrics.md    |  2 +-
 .../en/highlights/2020-12-23-vector-top.md    |  2 +-
 .../2021-01-10-kafka-sink-metrics.md          |  2 +-
 .../2021-10-08-0-17-upgrade-guide.md          |  2 +-
 .../2022-03-22-0-21-0-upgrade-guide.md        |  2 +-
 website/cue/reference/base/configuration.cue  |  2 +-
 .../cue/reference/components/base/sinks.cue   |  2 +-
 .../reference/components/sinks/base/amqp.cue  |  2 +-
 .../components/sinks/base/appsignal.cue       |  4 +-
 .../sinks/base/aws_cloudwatch_logs.cue        |  4 +-
 .../sinks/base/aws_cloudwatch_metrics.cue     |  4 +-
 .../sinks/base/aws_kinesis_firehose.cue       |  4 +-
 .../sinks/base/aws_kinesis_streams.cue        |  4 +-
 .../components/sinks/base/aws_s3.cue          |  4 +-
 .../components/sinks/base/aws_sns.cue         |  4 +-
 .../components/sinks/base/aws_sqs.cue         |  4 +-
 .../reference/components/sinks/base/axiom.cue |  2 +-
 .../components/sinks/base/azure_blob.cue      |  4 +-
 .../sinks/base/azure_monitor_logs.cue         |  4 +-
 .../components/sinks/base/blackhole.cue       |  2 +-
 .../components/sinks/base/clickhouse.cue      |  4 +-
 .../components/sinks/base/console.cue         |  2 +-
 .../components/sinks/base/databend.cue        |  4 +-
 .../components/sinks/base/datadog_events.cue  |  4 +-
 .../components/sinks/base/datadog_logs.cue    |  4 +-
 .../components/sinks/base/datadog_metrics.cue |  4 +-
 .../components/sinks/base/datadog_traces.cue  |  4 +-
 .../components/sinks/base/elasticsearch.cue   |  4 +-
 .../reference/components/sinks/base/file.cue  |  2 +-
 .../sinks/base/gcp_chronicle_unstructured.cue |  4 +-
 .../sinks/base/gcp_cloud_storage.cue          |  4 +-
 .../components/sinks/base/gcp_pubsub.cue      |  4 +-
 .../sinks/base/gcp_stackdriver_logs.cue       |  4 +-
 .../sinks/base/gcp_stackdriver_metrics.cue    |  4 +-
 .../components/sinks/base/greptimedb.cue      |  4 +-
 .../components/sinks/base/greptimedb_logs.cue |  4 +-
 .../sinks/base/greptimedb_metrics.cue         |  4 +-
 .../components/sinks/base/honeycomb.cue       |  4 +-
 .../reference/components/sinks/base/http.cue  |  4 +-
 .../components/sinks/base/humio_logs.cue      |  4 +-
 .../components/sinks/base/humio_metrics.cue   |  4 +-
 .../components/sinks/base/influxdb_logs.cue   |  4 +-
 .../sinks/base/influxdb_metrics.cue           |  4 +-
 .../reference/components/sinks/base/kafka.cue |  2 +-
 .../reference/components/sinks/base/keep.cue  |  4 +-
 .../components/sinks/base/logdna.cue          |  4 +-
 .../reference/components/sinks/base/loki.cue  |  4 +-
 .../reference/components/sinks/base/mezmo.cue |  4 +-
 .../reference/components/sinks/base/mqtt.cue  |  2 +-
 .../reference/components/sinks/base/nats.cue  |  4 +-
 .../components/sinks/base/new_relic.cue       |  4 +-
 .../components/sinks/base/opentelemetry.cue   |  4 +-
 .../components/sinks/base/papertrail.cue      |  2 +-
 .../components/sinks/base/postgres.cue        |  4 +-
 .../sinks/base/prometheus_exporter.cue        |  8 +-
 .../sinks/base/prometheus_remote_write.cue    |  8 +-
 .../components/sinks/base/pulsar.cue          |  2 +-
 .../reference/components/sinks/base/redis.cue |  4 +-
 .../components/sinks/base/sematext_logs.cue   |  4 +-
 .../sinks/base/sematext_metrics.cue           |  4 +-
 .../components/sinks/base/socket.cue          |  2 +-
 .../components/sinks/base/splunk_hec_logs.cue |  2 +-
 .../sinks/base/splunk_hec_metrics.cue         |  2 +-
 .../components/sinks/base/statsd.cue          |  2 +-
 .../components/sinks/base/vector.cue          |  4 +-
 .../components/sinks/base/webhdfs.cue         |  2 +-
 .../components/sinks/base/websocket.cue       |  2 +-
 .../sinks/base/websocket_server.cue           |  2 +-
 .../components/sources/base/amqp.cue          |  2 +-
 .../sources/base/aws_kinesis_firehose.cue     |  2 +-
 .../components/sources/base/aws_s3.cue        |  2 +-
 .../components/sources/base/aws_sqs.cue       |  2 +-
 .../components/sources/base/datadog_agent.cue |  2 +-
 .../components/sources/base/file.cue          |  2 +-
 .../components/sources/base/fluent.cue        |  2 +-
 .../components/sources/base/gcp_pubsub.cue    |  2 +-
 .../components/sources/base/heroku_logs.cue   |  2 +-
 .../components/sources/base/http.cue          |  2 +-
 .../components/sources/base/http_server.cue   |  2 +-
 .../components/sources/base/journald.cue      |  2 +-
 .../components/sources/base/kafka.cue         |  2 +-
 .../components/sources/base/logstash.cue      |  2 +-
 .../components/sources/base/opentelemetry.cue |  2 +-
 .../sources/base/prometheus_pushgateway.cue   |  2 +-
 .../sources/base/prometheus_remote_write.cue  |  2 +-
 .../components/sources/base/pulsar.cue        |  2 +-
 .../components/sources/base/vector.cue        |  2 +-
 website/cue/reference/releases/0.30.0.cue     |  2 +-
 website/cue/reference/urls.cue                | 10 +--
 website/layouts/index.redirects               |  2 +-
 website/layouts/partials/data.html            | 12 +--
 .../shortcodes/internal-metrics-list.html     |  4 +-
 website/scripts/typesense-index.ts            |  6 +-
 153 files changed, 346 insertions(+), 375 deletions(-)
 rename website/content/en/docs/{setup => administration}/optimization/_index.md (97%)
 rename website/content/en/docs/{setup => administration}/optimization/pgo.md (100%)
 create mode 100644 website/content/en/docs/architecture/_index.md
 rename website/content/en/docs/{introduction => }/architecture/arc.md (100%)
 rename website/content/en/docs/{introduction => }/architecture/buffering-model.md (99%)
 rename website/content/en/docs/{introduction => }/architecture/concurrency-model.md (95%)
 rename website/content/en/docs/{introduction => }/architecture/data-model/_index.md (90%)
 rename website/content/en/docs/{introduction => }/architecture/data-model/log.md (100%)
 rename website/content/en/docs/{introduction => }/architecture/data-model/metric.md (81%)
 rename website/content/en/docs/{introduction => }/architecture/end-to-end-acknowledgements.md (100%)
 rename website/content/en/docs/{introduction => architecture}/guarantees.md (99%)
 rename website/content/en/docs/{introduction => }/architecture/pipeline-model.md (96%)
 rename website/content/en/docs/{introduction => }/architecture/runtime-model.md (95%)
 delete mode 100644 website/content/en/docs/example.md
 delete mode 100644 website/content/en/docs/introduction/architecture/_index.md

diff --git a/README.md b/README.md
index 0d0ca08cce6b7..2094c4fc646ff 100644
--- a/README.md
+++ b/README.md
@@ -50,50 +50,23 @@ Vector is maintained by the Datadog's [Community Open Source Engineering team](h
   **Tuple**, **Douban**, **Visa**, **Mambu**, **Blockfi**, **Claranet**,
   **Instacart**, **Forcepoint**, and [many more][urls.production_users].
 * Vector is **downloaded over 100,000 times per day**.
-* Vector's largest user **processes over 30TB daily**.
-* Vector has **over 100 contributors** and growing.
+* Vector's largest user **processes over 500TB daily**.
+* Vector has **over 500 contributors** and growing.
 
-## [Documentation](https://vector.dev/docs/)
+## Documentation
 
-### About
+All user documentation is available at **[vector.dev/docs](https://vector.dev/docs)**.
 
-* [**Concepts**][docs.about.concepts]
-* [**Under the hood**][docs.about.under-the-hood]
-  * [**Architecture**][docs.under-the-hood.architecture] - [data model][docs.architecture.data-model] ([log][docs.data-model.log], [metric][docs.data-model.metric]), [pipeline model][docs.architecture.pipeline-model], [concurrency model][docs.architecture.concurrency-model], [runtime model][docs.architecture.runtime-model]
-  * [**Networking**][docs.under-the-hood.networking] - [ARC][docs.networking.adaptive-request-concurrency]
-  * [**Guarantees**][docs.under-the-hood.guarantees]
+Other Resources:
 
-### Setup
-
-* [**Quickstart**][docs.setup.quickstart]
-* [**Installation**][docs.setup.installation] - [operating systems][docs.installation.operating_systems], [package managers][docs.installation.package_managers], [platforms][docs.installation.platforms] ([Kubernetes][docs.platforms.kubernetes]), [manual][docs.installation.manual]
-* [**Deployment**][docs.deployment] - [roles][docs.deployment.roles], [topologies][docs.deployment.topologies]
-
-### Reference
-
-* **Configuration**
-  * [**Sources**][docs.configuration.sources] - [docker_logs][docs.sources.docker_logs], [file][docs.sources.file], [http][docs.sources.http], [journald][docs.sources.journald], [kafka][docs.sources.kafka], [socket][docs.sources.socket], and [many more...][docs.sources]
-  * [**Transforms**][docs.configuration.transforms] - [dedupe][docs.transforms.dedupe], [filter][docs.transforms.filter], [log_to_metric][docs.transforms.log_to_metric], [lua][docs.transforms.lua], [remap][docs.transforms.remap],
-    and [many more...][docs.transforms]
-  * [**Sinks**][docs.configuration.sinks] - [aws_cloudwatch_logs][docs.sinks.aws_cloudwatch_logs], [aws_s3][docs.sinks.aws_s3], [clickhouse][docs.sinks.clickhouse], [elasticsearch][docs.sinks.elasticsearch], [gcp_cloud_storage][docs.sinks.gcp_cloud_storage], and [many more...][docs.sinks]
-  * [**Enrichment Tables**][docs.configuration.enrichment_tables]
-  * [**Unit tests**][docs.configuration.tests]
-* [**Remap Language**][docs.reference.vrl]
-* [**API**][docs.reference.api]
-* [**CLI**][docs.reference.cli]
-
-### Administration
-
-* [**Management**][docs.administration.management]
-* [**Monitoring & observing**][docs.administration.monitoring]
-* [**Upgrading**][docs.administration.upgrading]
-* [**Validating**][docs.administration.validating]
-
-### Resources
-
-* [**Community**][urls.vector_community] - [chat][urls.vector_chat], [calendar][urls.vector_calendar], [@vectordotdev][urls.vector_twitter]
-* [**Releases**][urls.vector_releases]
-* **Policies** - [Code of Conduct][urls.vector_code_of_conduct], [Privacy][urls.vector_privacy_policy], [Releases][urls.vector_releases_policy], [Security][urls.vector_security_policy], [Versioning][urls.vector_versioning_policy]
+* [**Vector Calendar**][urls.vector_calendar]
+* **Policies**:
+  * [**Code of Conduct**][urls.vector_code_of_conduct]
+  * [**Contributing**][urls.vector_contributing_policy]
+  * [**Privacy**][urls.vector_privacy_policy]
+  * [**Releases**][urls.vector_releases_policy]
+  * [**Versioning**][urls.vector_versioning_policy]
+  * [**Security**][urls.vector_security_policy]
 
 ## Comparisons
 
@@ -158,23 +131,23 @@ Vector is an end-to-end, unified, open data platform.
   Developed with ❤️ by <strong><a href="https://datadoghq.com">Datadog</a></strong> - <a href="https://github.com/vectordotdev/vector/security/policy">Security Policy</a> - <a href="https://github.com/vectordotdev/vector/blob/master/PRIVACY.md">Privacy Policy</a>
 </p>
 
-[docs.about.concepts]: https://vector.dev/docs/about/concepts/
-[docs.about.under-the-hood]: https://vector.dev/docs/about/under-the-hood/
+[docs.about.concepts]: https://vector.dev/docs/introduction/concepts/
+[docs.about.introduction]: https://vector.dev/docs/introduction/
 [docs.administration.monitoring]: https://vector.dev/docs/administration/monitoring/
 [docs.administration.management]: https://vector.dev/docs/administration/management/
 [docs.administration.upgrading]: https://vector.dev/docs/administration/upgrading/
 [docs.administration.validating]: https://vector.dev/docs/administration/validating/
-[docs.architecture.concurrency-model]: https://vector.dev/docs/about/under-the-hood/architecture/concurrency-model/
-[docs.architecture.data-model]: https://vector.dev/docs/about/under-the-hood/architecture/data-model/
-[docs.architecture.pipeline-model]: https://vector.dev/docs/about/under-the-hood/architecture/pipeline-model/
-[docs.architecture.runtime-model]: https://vector.dev/docs/about/under-the-hood/architecture/runtime-model/
+[docs.architecture.concurrency-model]: https://vector.dev/docs/architecture/concurrency-model/
+[docs.architecture.data-model]: https://vector.dev/docs/architecture/data-model/
+[docs.architecture.pipeline-model]: https://vector.dev/docs/architecture/pipeline-model/
+[docs.architecture.runtime-model]: https://vector.dev/docs/architecture/runtime-model/
 [docs.configuration.sinks]: https://vector.dev/docs/reference/configuration/sinks/
 [docs.configuration.sources]: https://vector.dev/docs/reference/configuration/sources/
 [docs.configuration.tests]: https://vector.dev/docs/reference/configuration/tests/
 [docs.configuration.transforms]: https://vector.dev/docs/reference/configuration/transforms/
 [docs.configuration.enrichment_tables]: https://vector.dev/docs/reference/configuration/global-options/#enrichment_tables
-[docs.data-model.log]: https://vector.dev/docs/about/under-the-hood/architecture/data-model/log/
-[docs.data-model.metric]: https://vector.dev/docs/about/under-the-hood/architecture/data-model/metric/
+[docs.data-model.log]: https://vector.dev/docs/architecture/data-model/log/
+[docs.data-model.metric]: https://vector.dev/docs/architecture/data-model/metric/
 [docs.deployment.roles]: https://vector.dev/docs/setup/deployment/roles/
 [docs.deployment.topologies]: https://vector.dev/docs/setup/deployment/topologies/
 [docs.deployment]: https://vector.dev/docs/setup/deployment/
@@ -183,7 +156,7 @@ Vector is an end-to-end, unified, open data platform.
 [docs.installation.package_managers]: https://vector.dev/docs/setup/installation/package-managers/
 [docs.installation.platforms]: https://vector.dev/docs/setup/installation/platforms/
 [docs.installation]: https://vector.dev/docs/setup/installation/
-[docs.networking.adaptive-request-concurrency]: https://vector.dev/docs/about/under-the-hood/networking/arc/
+[docs.architecture.adaptive-request-concurrency]: https://vector.dev/docs/architecture/arc/
 [docs.platforms.kubernetes]: https://vector.dev/docs/setup/installation/platforms/kubernetes/
 [docs.quickstart]: https://vector.dev/docs/setup/quickstart/
 [docs.reference.api]: https://vector.dev/docs/reference/api/
@@ -212,14 +185,15 @@ Vector is an end-to-end, unified, open data platform.
 [docs.transforms.lua]: https://vector.dev/docs/reference/configuration/transforms/lua/
 [docs.transforms.remap]: https://vector.dev/docs/reference/configuration/transforms/remap/
 [docs.transforms]: https://vector.dev/docs/reference/configuration/transforms/
-[docs.under-the-hood.architecture]: https://vector.dev/docs/about/under-the-hood/architecture/
-[docs.under-the-hood.guarantees]: https://vector.dev/docs/about/under-the-hood/guarantees/
-[docs.under-the-hood.networking]: https://vector.dev/docs/about/under-the-hood/networking/
+[docs.introduction.architecture]: https://vector.dev/docs/architecture/
+[docs.introduction.guarantees]: https://vector.dev/docs/introduction/guarantees/
+[docs.introduction.architecture]: https://vector.dev/docs/architecture/
 [urls.production_users]: https://github.com/vectordotdev/vector/issues/790
 [urls.rust]: https://www.rust-lang.org/
 [urls.vector_calendar]: https://calendar.vector.dev
 [urls.vector_chat]: https://chat.vector.dev
 [urls.vector_code_of_conduct]: https://github.com/vectordotdev/vector/blob/master/CODE_OF_CONDUCT.md
+[urls.vector_contributing_policy]: https://github.com/vectordotdev/vector/blob/master/CONTRIBUTING.md
 [urls.vector_community]: https://vector.dev/community/
 [urls.vector_privacy_policy]: https://github.com/vectordotdev/vector/blob/master/PRIVACY.md
 [urls.vector_release_policy]: https://github.com/vectordotdev/vector/blob/master/RELEASING.md
diff --git a/VERSIONING.md b/VERSIONING.md
index 33d37b8aa7277..a84b608f6ad80 100644
--- a/VERSIONING.md
+++ b/VERSIONING.md
@@ -122,7 +122,7 @@ here. Each minor release bump will include an upgrade guide in the
 [CLI]: https://vector.dev/docs/reference/cli/
 [configuration schema]: https://vector.dev/docs/reference/configuration/
 [data directory]: https://vector.dev/docs/reference/configuration/global-options/#data_dir
-[data model]: https://vector.dev/docs/about/under-the-hood/architecture/data-model/
+[data model]: https://vector.dev/docs/architecture/data-model/
 [GitHub repository]: https://github.com/vectordotdev/vector
 [GraphQL API]: https://vector.dev/docs/reference/api/
 [Installation workflows]: https://vector.dev/docs/setup/installation/
diff --git a/docs/tutorials/sinks/1_basic_sink.md b/docs/tutorials/sinks/1_basic_sink.md
index 65bb7b4078880..a099a5530602d 100644
--- a/docs/tutorials/sinks/1_basic_sink.md
+++ b/docs/tutorials/sinks/1_basic_sink.md
@@ -348,7 +348,7 @@ Our sink works!
 
 [event_streams_tracking]: https://github.com/vectordotdev/vector/issues/9261
 [vdev_install]: https://github.com/vectordotdev/vector/tree/master/vdev#installation
-[acknowledgements]: https://vector.dev/docs/about/under-the-hood/architecture/end-to-end-acknowledgements/
+[acknowledgements]: https://vector.dev/docs/architecture/end-to-end-acknowledgements/
 [configurable_component]: https://rust-doc.vector.dev/vector_config/attr.configurable_component.html
 [generate_config]: https://rust-doc.vector.dev/vector/config/trait.generateconfig
 [sink_config]: https://rust-doc.vector.dev/vector/config/trait.sinkconfig
diff --git a/docs/tutorials/sinks/2_http_sink.md b/docs/tutorials/sinks/2_http_sink.md
index ca25791136ecb..4c100fcb8e4bc 100644
--- a/docs/tutorials/sinks/2_http_sink.md
+++ b/docs/tutorials/sinks/2_http_sink.md
@@ -150,7 +150,7 @@ generated by our `BasicEncoder`.
 *finalizers* - [`EventFinalizers`][event_finalizers] is a collection of
 `EventFinalizer`s. An [`EventFinalizer`][event_finalizer] is used to track the
 status of a given event and is used to support [end to end acknowledgements]
-(https://vector.dev/docs/about/under-the-hood/guarantees/#acknowledgement-
+(https://vector.dev/docs/architecture/guarantees/#acknowledgement-
 guarantees).
 
 *metadata* - the metadata contains additional data that is used to emit various metrics when
diff --git a/lib/vector-buffers/src/config.rs b/lib/vector-buffers/src/config.rs
index 9264685d4fa28..6806f213bdfc2 100644
--- a/lib/vector-buffers/src/config.rs
+++ b/lib/vector-buffers/src/config.rs
@@ -322,7 +322,7 @@ impl BufferType {
     description = r#"More information about the individual buffer types, and buffer behavior, can be found in the
 [Buffering Model][buffering_model] section.
 
-[buffering_model]: /docs/about/under-the-hood/architecture/buffering-model/"#
+[buffering_model]: /docs/architecture/buffering-model/"#
 )]
 pub enum BufferConfig {
     /// A single stage buffer topology.
diff --git a/lib/vector-core/src/config/global_options.rs b/lib/vector-core/src/config/global_options.rs
index 121a5bcd2c0a5..df12981f6f626 100644
--- a/lib/vector-core/src/config/global_options.rs
+++ b/lib/vector-core/src/config/global_options.rs
@@ -107,7 +107,7 @@ pub struct GlobalOptions {
     /// See [End-to-end Acknowledgements][e2e_acks] for more information on how Vector handles event
     /// acknowledgement.
     ///
-    /// [e2e_acks]: https://vector.dev/docs/about/under-the-hood/architecture/end-to-end-acknowledgements/
+    /// [e2e_acks]: https://vector.dev/docs/architecture/end-to-end-acknowledgements/
     #[serde(
         default,
         deserialize_with = "bool_or_struct",
diff --git a/lib/vector-core/src/config/mod.rs b/lib/vector-core/src/config/mod.rs
index 7b47e3dbbe94d..874014a96a859 100644
--- a/lib/vector-core/src/config/mod.rs
+++ b/lib/vector-core/src/config/mod.rs
@@ -304,7 +304,7 @@ Enabling or disabling acknowledgements at the source level has **no effect** on
 See [End-to-end Acknowledgements][e2e_acks] for more information on how event acknowledgement is handled.
 
 [global_acks]: https://vector.dev/docs/reference/configuration/global-options/#acknowledgements
-[e2e_acks]: https://vector.dev/docs/about/under-the-hood/architecture/end-to-end-acknowledgements/"
+[e2e_acks]: https://vector.dev/docs/architecture/end-to-end-acknowledgements/"
 )]
 #[derive(Clone, Copy, Debug, Default, Eq, PartialEq)]
 pub struct SourceAcknowledgementsConfig {
@@ -352,7 +352,7 @@ impl From<SourceAcknowledgementsConfig> for AcknowledgementsConfig {
 #[configurable(
     description = "See [End-to-end Acknowledgements][e2e_acks] for more information on how event acknowledgement is handled.
 
-[e2e_acks]: https://vector.dev/docs/about/under-the-hood/architecture/end-to-end-acknowledgements/"
+[e2e_acks]: https://vector.dev/docs/architecture/end-to-end-acknowledgements/"
 )]
 #[derive(Clone, Copy, Debug, Default, Eq, PartialEq)]
 pub struct AcknowledgementsConfig {
diff --git a/rfcs/2020-03-06-1999-api-extensions-for-lua-transform.md b/rfcs/2020-03-06-1999-api-extensions-for-lua-transform.md
index d2bcb020041b3..4b8b75c032d66 100644
--- a/rfcs/2020-03-06-1999-api-extensions-for-lua-transform.md
+++ b/rfcs/2020-03-06-1999-api-extensions-for-lua-transform.md
@@ -488,7 +488,7 @@ Events produced by the transforms through calling an emitting function can have
 
 Both log and metrics events are encoded using [external tagging](https://serde.rs/enum-representations.html#externally-tagged).
 
-* [Log events](https://vector.dev/docs/about/data-model/log/) could be seen as tables created using
+* [Log events](https://vector.dev/docs/architecture/data-model/log/) could be seen as tables created using
 
     ```lua
     {
@@ -498,7 +498,7 @@ Both log and metrics events are encoded using [external tagging](https://serde.r
     }
     ```
 
-    The content of the `log` field corresponds to the usual [log event](https://vector.dev/docs/about/data-model/log/#examples) structure, with possible nesting of the fields.
+    The content of the `log` field corresponds to the usual [log event](https://vector.dev/docs/architecture/data-model/log/#examples) structure, with possible nesting of the fields.
 
     If a log event is created by the user inside the transform is a table, then, if default fields named according to the [global schema](https://vector.dev/docs/reference/global-options/#log_schema) are not present in such a table, then they are automatically added to the event. This rule does not apply to events having `userdata` type.
 
@@ -532,7 +532,7 @@ Both log and metrics events are encoded using [external tagging](https://serde.r
     >
     > And then emits the event. In that case Vector would not automatically insert the `timestamp` field.
 
-* [Metric events](https://vector.dev/docs/about/data-model/metric/) could be seen as tables created using
+* [Metric events](https://vector.dev/docs/architecture/data-model/metric/) could be seen as tables created using
 
     ```lua
     {
@@ -542,7 +542,7 @@ Both log and metrics events are encoded using [external tagging](https://serde.r
     }
     ```
 
-    The content of the `metric` field matches the [metric data model](https://vector.dev/docs/about/data-model/metric). The values use [external tagging](https://serde.rs/enum-representations.html#externally-tagged) with respect to the metric type, see the examples.
+    The content of the `metric` field matches the [metric data model](https://vector.dev/docs/architecture/data-model/metric). The values use [external tagging](https://serde.rs/enum-representations.html#externally-tagged) with respect to the metric type, see the examples.
 
     In case when the metric events are created as tables in user-defined code, the following default values are assumed if they are not provided:
 
@@ -552,7 +552,7 @@ Both log and metrics events are encoded using [external tagging](https://serde.r
     | `kind`      | `absolute`    |
     | `tags`      | empty map     |
 
-    Furthermore, for [`aggregated_histogram`](https://vector.dev/docs/about/data-model/metric/#aggregated_histogram) the `count` field inside the `value` map can be omitted.
+    Furthermore, for [`aggregated_histogram`](https://vector.dev/docs/architecture/data-model/metric/#aggregated_histogram) the `count` field inside the `value` map can be omitted.
 
 
     **Example: `counter`**
@@ -621,7 +621,7 @@ Both log and metrics events are encoded using [external tagging](https://serde.r
     >     }
     >   }
     > }
-    > Note that the field [`count`](https://vector.dev/docs/about/data-model/metric/#count) is not required because it can be inferred by Vector automatically by summing up the values from `counts`.
+    > Note that the field [`count`](https://vector.dev/docs/architecture/data-model/metric/#count) is not required because it can be inferred by Vector automatically by summing up the values from `counts`.
 
     **Example: `aggregated_summary`**
     > The minimal Lua code required to create an aggregated summary metric is the following:
@@ -645,14 +645,14 @@ The mapping between Vector data types and Lua data types is the following:
 
 | Vector Type | Lua Type | Comment |
 | :----------- | :-------- | :------- |
-| [`String`](https://vector.dev/docs/about/data-model/log/#strings) | [`string`](https://www.lua.org/pil/2.4.html) ||
-| [`Integer`](https://vector.dev/docs/about/data-model/log/#ints) | [`integer`](https://docs.rs/mlua/0.6.0/mlua/type.Integer.html) ||
-| [`Float`](https://vector.dev/docs/about/data-model/log/#floats) | [`number`](https://docs.rs/mlua/0.6.0/mlua/type.Number.html) ||
-| [`Boolean`](https://vector.dev/docs/about/data-model/log/#booleans) | [`boolean`](https://www.lua.org/pil/2.2.html) ||
-| [`Timestamp`](https://vector.dev/docs/about/data-model/log/#timestamps) | [`userdata`](https://www.lua.org/pil/28.1.html) | There is no dedicated timestamp type in Lua. However, there is a standard library function [`os.date`](https://www.lua.org/manual/5.1/manual.html#pdf-os.date) which returns a table with fields `year`, `month`, `day`, `hour`, `min`, `sec`, and some others. Other standard library functions, such as [`os.time`](https://www.lua.org/manual/5.1/manual.html#pdf-os.time), support tables with these fields as arguments. Because of that, Vector timestamps passed to the transform are represented as `userdata` with the same set of accessible fields. In order to have one-to-one correspondence between Vector timestamps and Lua timestamps, `os.date` function from the standard library is patched to return not a table, but `userdata` with the same set of fields as it usually would return instead. This approach makes it possible to have both compatibility with the standard library functions and a dedicated data type for timestamps. |
-| [`Null`](https://vector.dev/docs/about/data-model/log/#null-values) | empty string | In Lua setting a table field to `nil` means deletion of this field. Furthermore, setting an array element to `nil` leads to deletion of this element. In order to avoid inconsistencies, already present `Null` values are visible represented as empty strings from Lua code, and it is impossible to create a new `Null` value in the user-defined code. |
-| [`Map`](https://vector.dev/docs/about/data-model/log/#maps) | [`userdata`](https://www.lua.org/pil/28.1.html) or [`table`](https://www.lua.org/pil/2.5.html) | Maps which are parts of events passed to the transform from Vector have `userdata` type. User-created maps have `table` type. Both types are converted to Vector's `Map` type when they are emitted from the transform. |
-| [`Array`](https://vector.dev/docs/about/data-model/log/#arrays) | [`sequence`](https://www.lua.org/pil/11.1.html) | Sequences in Lua are a special case of tables. Because of that fact, the indexes can in principle start from any number. However, the convention in Lua is to start indexes from 1 instead of 0, so Vector should adhere it. |
+| [`String`](https://vector.dev/docs/architecture/data-model/log/#strings) | [`string`](https://www.lua.org/pil/2.4.html) ||
+| [`Integer`](https://vector.dev/docs/architecture/data-model/log/#ints) | [`integer`](https://docs.rs/mlua/0.6.0/mlua/type.Integer.html) ||
+| [`Float`](https://vector.dev/docs/architecture/data-model/log/#floats) | [`number`](https://docs.rs/mlua/0.6.0/mlua/type.Number.html) ||
+| [`Boolean`](https://vector.dev/docs/architecture/data-model/log/#booleans) | [`boolean`](https://www.lua.org/pil/2.2.html) ||
+| [`Timestamp`](https://vector.dev/docs/architecture/data-model/log/#timestamps) | [`userdata`](https://www.lua.org/pil/28.1.html) | There is no dedicated timestamp type in Lua. However, there is a standard library function [`os.date`](https://www.lua.org/manual/5.1/manual.html#pdf-os.date) which returns a table with fields `year`, `month`, `day`, `hour`, `min`, `sec`, and some others. Other standard library functions, such as [`os.time`](https://www.lua.org/manual/5.1/manual.html#pdf-os.time), support tables with these fields as arguments. Because of that, Vector timestamps passed to the transform are represented as `userdata` with the same set of accessible fields. In order to have one-to-one correspondence between Vector timestamps and Lua timestamps, `os.date` function from the standard library is patched to return not a table, but `userdata` with the same set of fields as it usually would return instead. This approach makes it possible to have both compatibility with the standard library functions and a dedicated data type for timestamps. |
+| [`Null`](https://vector.dev/docs/architecture/data-model/log/#null-values) | empty string | In Lua setting a table field to `nil` means deletion of this field. Furthermore, setting an array element to `nil` leads to deletion of this element. In order to avoid inconsistencies, already present `Null` values are visible represented as empty strings from Lua code, and it is impossible to create a new `Null` value in the user-defined code. |
+| [`Map`](https://vector.dev/docs/architecture/data-model/log/#maps) | [`userdata`](https://www.lua.org/pil/28.1.html) or [`table`](https://www.lua.org/pil/2.5.html) | Maps which are parts of events passed to the transform from Vector have `userdata` type. User-created maps have `table` type. Both types are converted to Vector's `Map` type when they are emitted from the transform. |
+| [`Array`](https://vector.dev/docs/architecture/data-model/log/#arrays) | [`sequence`](https://www.lua.org/pil/11.1.html) | Sequences in Lua are a special case of tables. Because of that fact, the indexes can in principle start from any number. However, the convention in Lua is to start indexes from 1 instead of 0, so Vector should adhere it. |
 
 ### Configuration
 
@@ -679,7 +679,7 @@ The implementation of `lua` transform supports only log events. Processing of lo
 
 Events have type [`userdata`](https://www.lua.org/pil/28.1.html) with custom [metamethods](https://www.lua.org/pil/13.html), so they are views to Vector's events. Thus passing an event to Lua has zero cost, so only when fields are actually accessed the data is copied to Lua.
 
-The fields are accessed through string indexes using [Vector's field path notation](https://vector.dev/docs/about/data-model/log/).
+The fields are accessed through string indexes using [Vector's field path notation](https://vector.dev/docs/architecture/data-model/log/).
 
 ## Sales Pitch
 
diff --git a/rfcs/2020-05-25-2692-more-usable-logevents.md b/rfcs/2020-05-25-2692-more-usable-logevents.md
index 73e50f5231dd6..09ab89b35d7e5 100644
--- a/rfcs/2020-05-25-2692-more-usable-logevents.md
+++ b/rfcs/2020-05-25-2692-more-usable-logevents.md
@@ -162,7 +162,7 @@ There is no guide accompanying this RFC, it only minimally touches user facing s
 
 ## Doc Level Proposal
 
-> **Placement:** Insert into [Log Event](https://vector.dev/docs/about/data-model/log/#types)'s [Types](https://vector.dev/docs/about/data-model/log/#types) section
+> **Placement:** Insert into [Log Event](https://vector.dev/docs/architecture/data-model/log/#types)'s [Types](https://vector.dev/docs/architecture/data-model/log/#types) section
 
 ### Bytes
 
diff --git a/rfcs/2020-07-28-3642-jmx_rfc.md b/rfcs/2020-07-28-3642-jmx_rfc.md
index fb3a98d32cd56..b872b276574f5 100644
--- a/rfcs/2020-07-28-3642-jmx_rfc.md
+++ b/rfcs/2020-07-28-3642-jmx_rfc.md
@@ -223,7 +223,7 @@ principles of Vector:
 > One Tool. All Data. - One simple tool gets your logs, metrics, and traces
 > (coming soon) from A to B.
 
-[Vector principles](https://vector.dev/docs/about/what-is-vector/#who-should-use-vector)
+[Vector principles](https://vector.dev/docs/)
 
 If users are already running Prometheus though, they could opt for the Prometheus path.
 
diff --git a/rfcs/2020-08-21-3092-apache-metrics-source.md b/rfcs/2020-08-21-3092-apache-metrics-source.md
index c7ab4a9162ad4..4b285632f121b 100644
--- a/rfcs/2020-08-21-3092-apache-metrics-source.md
+++ b/rfcs/2020-08-21-3092-apache-metrics-source.md
@@ -166,8 +166,7 @@ principles of Vector:
 > One Tool. All Data. - One simple tool gets your logs, metrics, and traces
 > (coming soon) from A to B.
 
-[Vector
-principles](https://vector.dev/docs/about/what-is-vector/#who-should-use-vector)
+[Vector principles](https://vector.dev/docs/)
 
 On the same page, it is mentioned that Vector should be a replacement for
 Telegraf.
diff --git a/rfcs/2020-08-26-3191-host-metrics.md b/rfcs/2020-08-26-3191-host-metrics.md
index f494030000fad..58243ddf1eeda 100644
--- a/rfcs/2020-08-26-3191-host-metrics.md
+++ b/rfcs/2020-08-26-3191-host-metrics.md
@@ -180,7 +180,7 @@ principles of Vector:
 > (coming soon) from A to B.
 
 [Vector
-principles](https://vector.dev/docs/about/what-is-vector/#who-should-use-vector)
+principles](https://vector.dev/docs/)
 
 On the same page, it is mentioned that Vector should be a replacement for
 Telegraf.
diff --git a/rfcs/2020-08-27-3603-postgres-metrics.md b/rfcs/2020-08-27-3603-postgres-metrics.md
index cbc7facbdca6c..2b47b4e07e12f 100644
--- a/rfcs/2020-08-27-3603-postgres-metrics.md
+++ b/rfcs/2020-08-27-3603-postgres-metrics.md
@@ -136,7 +136,7 @@ principles of Vector:
 > (coming soon) from A to B.
 
 [Vector
-principles](https://vector.dev/docs/about/what-is-vector/#who-should-use-vector)
+principles](https://vector.dev/docs/)
 
 On the same page, it is mentioned that Vector should be a replacement for
 Telegraf.
diff --git a/rfcs/2020-08-31-3640-nginx-metrics-source.md b/rfcs/2020-08-31-3640-nginx-metrics-source.md
index 5351aa1351660..93551a51492c9 100644
--- a/rfcs/2020-08-31-3640-nginx-metrics-source.md
+++ b/rfcs/2020-08-31-3640-nginx-metrics-source.md
@@ -131,7 +131,7 @@ principles of Vector:
 > (coming soon) from A to B.
 
 [Vector
-principles](https://vector.dev/docs/about/what-is-vector/#who-should-use-vector)
+principles](https://vector.dev/docs/)
 
 On the same page, it is mentioned that Vector should be a replacement for
 Telegraf.
diff --git a/rfcs/2020-08-31-3641-mongo-metrics.md b/rfcs/2020-08-31-3641-mongo-metrics.md
index ca100cf457302..32949f59b1273 100644
--- a/rfcs/2020-08-31-3641-mongo-metrics.md
+++ b/rfcs/2020-08-31-3641-mongo-metrics.md
@@ -1107,7 +1107,7 @@ principles of Vector:
 > (coming soon) from A to B.
 
 [Vector
-principles](https://vector.dev/docs/about/what-is-vector/#who-should-use-vector)
+principles](https://vector.dev/docs/)
 
 On the same page, it is mentioned that Vector should be a replacement for
 Telegraf.
diff --git a/rfcs/2021-09-01-8547-accept-metrics-in-datadog-agent-source.md b/rfcs/2021-09-01-8547-accept-metrics-in-datadog-agent-source.md
index aec7cd9db8e3a..ac95ef626762e 100644
--- a/rfcs/2021-09-01-8547-accept-metrics-in-datadog-agent-source.md
+++ b/rfcs/2021-09-01-8547-accept-metrics-in-datadog-agent-source.md
@@ -116,7 +116,7 @@ A few details about the Datadog Agents & [Datadog metrics](https://docs.datadogh
   [here](https://github.com/DataDog/agent-payload/blob/master/proto/metrics/agent_payload.proto#L47-L81).
 
 Vector has a nice description of its [metrics data
-model](https://vector.dev/docs/about/under-the-hood/architecture/data-model/metric/) and a [concise enum for
+model](https://vector.dev/docs/architecture/data-model/metric/) and a [concise enum for
 representing it](https://github.com/vectordotdev/vector/blob/master/lib/vector-core/src/event/metric.rs#L135-L169).
 
 
diff --git a/src/sinks/prometheus/exporter.rs b/src/sinks/prometheus/exporter.rs
index 88fa5167c7348..065094454d526 100644
--- a/src/sinks/prometheus/exporter.rs
+++ b/src/sinks/prometheus/exporter.rs
@@ -94,14 +94,14 @@ pub struct PrometheusExporterConfig {
 
     /// Default buckets to use for aggregating [distribution][dist_metric_docs] metrics into histograms.
     ///
-    /// [dist_metric_docs]: https://vector.dev/docs/about/under-the-hood/architecture/data-model/metric/#distribution
+    /// [dist_metric_docs]: https://vector.dev/docs/architecture/data-model/metric/#distribution
     #[serde(default = "super::default_histogram_buckets")]
     #[configurable(metadata(docs::advanced))]
     pub buckets: Vec<f64>,
 
     /// Quantiles to use for aggregating [distribution][dist_metric_docs] metrics into a summary.
     ///
-    /// [dist_metric_docs]: https://vector.dev/docs/about/under-the-hood/architecture/data-model/metric/#distribution
+    /// [dist_metric_docs]: https://vector.dev/docs/architecture/data-model/metric/#distribution
     #[serde(default = "super::default_summary_quantiles")]
     #[configurable(metadata(docs::advanced))]
     pub quantiles: Vec<f64>,
@@ -112,7 +112,7 @@ pub struct PrometheusExporterConfig {
     /// metric is supported, Prometheus clients (the application being scraped, which is this sink) must
     /// aggregate locally into either an aggregated histogram or aggregated summary.
     ///
-    /// [dist_metric_docs]: https://vector.dev/docs/about/under-the-hood/architecture/data-model/metric/#distribution
+    /// [dist_metric_docs]: https://vector.dev/docs/architecture/data-model/metric/#distribution
     /// [prom_agg_hist_docs]: https://prometheus.io/docs/concepts/metric_types/#histogram
     /// [prom_agg_summ_docs]: https://prometheus.io/docs/concepts/metric_types/#summary
     #[serde(default = "default_distributions_as_summaries")]
diff --git a/src/sinks/prometheus/remote_write/config.rs b/src/sinks/prometheus/remote_write/config.rs
index 9a61d0be6baa0..e1fe2afe11456 100644
--- a/src/sinks/prometheus/remote_write/config.rs
+++ b/src/sinks/prometheus/remote_write/config.rs
@@ -63,14 +63,14 @@ pub struct RemoteWriteConfig {
 
     /// Default buckets to use for aggregating [distribution][dist_metric_docs] metrics into histograms.
     ///
-    /// [dist_metric_docs]: https://vector.dev/docs/about/under-the-hood/architecture/data-model/metric/#distribution
+    /// [dist_metric_docs]: https://vector.dev/docs/architecture/data-model/metric/#distribution
     #[serde(default = "crate::sinks::prometheus::default_histogram_buckets")]
     #[configurable(metadata(docs::advanced))]
     pub buckets: Vec<f64>,
 
     /// Quantiles to use for aggregating [distribution][dist_metric_docs] metrics into a summary.
     ///
-    /// [dist_metric_docs]: https://vector.dev/docs/about/under-the-hood/architecture/data-model/metric/#distribution
+    /// [dist_metric_docs]: https://vector.dev/docs/architecture/data-model/metric/#distribution
     #[serde(default = "crate::sinks::prometheus::default_summary_quantiles")]
     #[configurable(metadata(docs::advanced))]
     pub quantiles: Vec<f64>,
diff --git a/src/sinks/util/service/concurrency.rs b/src/sinks/util/service/concurrency.rs
index 802a9d0623538..9fd53bf3f63b2 100644
--- a/src/sinks/util/service/concurrency.rs
+++ b/src/sinks/util/service/concurrency.rs
@@ -29,7 +29,7 @@ pub enum Concurrency {
 
     /// Concurrency is managed by the [Adaptive Request Concurrency][arc] feature.
     ///
-    /// [arc]: https://vector.dev/docs/about/under-the-hood/networking/arc/
+    /// [arc]: https://vector.dev/docs/architecture/arc/
     Adaptive,
 
     /// A fixed amount of concurrency is allowed.
@@ -146,8 +146,7 @@ a fixed concurrency limit.",
         let mut adaptive_metadata = Metadata::with_title(
             "Concurrency is managed by Vector's [Adaptive Request Concurrency][arc] feature.",
         );
-        adaptive_metadata
-            .set_description("[arc]: https://vector.dev/docs/about/under-the-hood/networking/arc/");
+        adaptive_metadata.set_description("[arc]: https://vector.dev/docs/architecture/arc/");
         adaptive_metadata.add_custom_attribute(CustomAttribute::kv("logical_name", "Adaptive"));
         apply_base_metadata(&mut adaptive_schema, adaptive_metadata);
 
diff --git a/website/config.toml b/website/config.toml
index afc65f1d609cd..052b3b96780b9 100644
--- a/website/config.toml
+++ b/website/config.toml
@@ -156,38 +156,38 @@ weight = 7
 
 # Footer menu
 [[languages.en.menus.footer]]
-name = "About"
-identifier = "about"
+name = "Abount"
+identifier = "introduction"
 weight = 1
 
 [[languages.en.menus.footer]]
 name = "Vector"
-url = "/docs/about"
-parent = "about"
+url = "/docs/introduction"
+parent = "introduction"
 weight = 1
 
 [[languages.en.menus.footer]]
-name = "Observability Pipelines"
-url = "/docs/about/observability-pipelines"
-parent = "about"
+name = "Contact us"
+url = "/community"
+parent = "introduction"
 weight = 2
 
 [[languages.en.menus.footer]]
-name = "Contact us"
-url = "/community"
-parent = "about"
+name = "The Team"
+url = "https://opensource.datadoghq.com/about/#the-community-open-source-engineering-team"
+parent = "introduction"
 weight = 3
 
 [[languages.en.menus.footer]]
 name = "Privacy"
 url = "https://www.datadoghq.com/legal/privacy/"
-parent = "about"
+parent = "introduction"
 weight = 4
 
 [[languages.en.menus.footer]]
 name = "Cookies"
 url = "https://www.datadoghq.com/legal/cookies/"
-parent = "about"
+parent = "introduction"
 weight = 5
 
 [[languages.en.menus.footer]]
diff --git a/website/content/en/_index.md b/website/content/en/_index.md
index 05ae409f98dd8..2f06104b92bf9 100644
--- a/website/content/en/_index.md
+++ b/website/content/en/_index.md
@@ -16,7 +16,7 @@ why:
   description: "Vector strives to be the only tool you need to get observability data from A to B, [deploying](/docs/setup/deployment) as a [daemon](/docs/setup/deployment/roles/#daemon), [sidecar](/docs/setup/deployment/roles/#sidecar), or [aggregator](/docs/setup/deployment/roles/#aggregator)."
   icon: "chart.svg"
 -  title: "Unified"
-   description: "Vector supports [logs](/docs/about/under-the-hood/architecture/data-model/log) and [metrics](/docs/about/under-the-hood/architecture/data-model/metric), making it easy to collect and process all your observability data."
+   description: "Vector supports [logs](/docs/architecture/data-model/log) and [metrics](/docs/architecture/data-model/metric), making it easy to collect and process all your observability data."
    icon: "hex.svg"
 - title: "Vendor neutral"
   description: "Vector doesn't favor any specific vendor platforms and fosters a fair, open ecosystem with your best interests in mind. Lock-in free and future proof."
@@ -25,7 +25,7 @@ why:
   description: "Vector's highly configurable [transforms](/docs/reference/configuration/transforms) give you the full power of programmable runtimes. Handle complex use cases without limitation."
   icon: "code.svg"
 - title: "Clear guarantees"
-  description: "Guarantees matter, and Vector is clear on [which guarantees](/docs/about/under-the-hood/guarantees) it provides, helping you make the appropriate trade-offs for your use case."
+  description: "Guarantees matter, and Vector is clear on [which guarantees](/docs/architecture/guarantees) it provides, helping you make the appropriate trade-offs for your use case."
   icon: "laptop.svg"
 
 # Platform section
diff --git a/website/content/en/docs/administration/monitoring.md b/website/content/en/docs/administration/monitoring.md
index cec428adfe7ad..c2cfa395b608f 100644
--- a/website/content/en/docs/administration/monitoring.md
+++ b/website/content/en/docs/administration/monitoring.md
@@ -27,14 +27,18 @@ Kubernetes, SystemD, or however you are running Vector.
 You can access Vector's logs by adding an [`internal_logs`][internal_logs] source to your [topology]. Here's an example
 configuration that takes Vector's logs and pipes them to the console as plain text:
 
-```toml
-[sources.vector_logs]
-type = "internal_logs"
-
-[sinks.console]
-type = "console"
-inputs = ["vector_logs"]
-encoding.codec = "text"
+```yaml
+sources:
+  vector_logs:
+    type: internal_logs
+
+sinks:
+  console:
+    type: console
+    inputs:
+      - vector_logs
+    encoding:
+      codec: text
 ```
 
 ### Using Vector logs
@@ -44,24 +48,26 @@ system, i.e. you can [transform] them and send them off to any number of [sinks]
 transforms Vector's logs using the [`remap` transform][remap] and [Vector Remap Language][VRL] and then stores those
 logs in [ClickHouse]:
 
-```toml
-[sources.vector_logs]
-type = "internal_logs"
-
-[transforms.modify]
-type = "remap"
-inputs = ["vector_logs"]
-
-# Reformat the timestamp to Unix time
-source = '''
-  .timestamp = to_unix_timestamp!(to_timestamp!(.timestamp))
-'''
-
-[sinks.database]
-type = "clickhouse"
-inputs = ["modify"]
-host = "http://localhost:8123"
-table = "vector-log-data"
+```yaml
+sources:
+  vector_logs:
+    type: internal_logs
+
+transforms:
+  modify:
+    type: remap
+    inputs:
+      - vector_logs
+    source: |
+      .timestamp = to_unix_timestamp!(to_timestamp!(.timestamp))
+
+sinks:
+  database:
+    type: clickhouse
+    inputs:
+      - modify
+    host: http://localhost:8123
+    table: vector-log-data
 ```
 
 ### Configuring logs
@@ -91,14 +97,17 @@ You can monitor metrics produced by Vector using the [`internal_metrics`][intern
 [internal logs](#using-vector-logs), you can configure an `internal_metrics` source and use the piped-in metrics
 however you wish. Here's an example configuration that delivers Vector's metrics to a Prometheus remote write endpoint.
 
-```toml
-[sources.vector_metrics]
-type = "internal_metrics"
-
-[sinks.prometheus]
-type = ["prometheus_remote_write"]
-endpoint = ["https://localhost:8087/"]
-inputs = ["vector_metrics"]
+```yaml
+sources:
+  vector_metrics:
+    type: internal_metrics
+
+sinks:
+  prometheus:
+    type: prometheus_remote_write
+    endpoint: https://localhost:8087/
+    inputs:
+      - vector_metrics
 ```
 
 ### Metrics catalogue
diff --git a/website/content/en/docs/setup/optimization/_index.md b/website/content/en/docs/administration/optimization/_index.md
similarity index 97%
rename from website/content/en/docs/setup/optimization/_index.md
rename to website/content/en/docs/administration/optimization/_index.md
index d73c9e5b31164..bdd479a47899c 100644
--- a/website/content/en/docs/setup/optimization/_index.md
+++ b/website/content/en/docs/administration/optimization/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Optimization
-weight: 5
+weight: 6
 tags: ["tuning", "rust", "performance", "optimization"]
 ---
 
diff --git a/website/content/en/docs/setup/optimization/pgo.md b/website/content/en/docs/administration/optimization/pgo.md
similarity index 100%
rename from website/content/en/docs/setup/optimization/pgo.md
rename to website/content/en/docs/administration/optimization/pgo.md
diff --git a/website/content/en/docs/administration/upgrading.md b/website/content/en/docs/administration/upgrading.md
index 7876cf8e185ef..ad78c93d378e8 100644
--- a/website/content/en/docs/administration/upgrading.md
+++ b/website/content/en/docs/administration/upgrading.md
@@ -6,4 +6,6 @@ weight: 4
 tags: ["upgrade"]
 ---
 
-How you upgrade Vector depends largely on your installation method.
+How you upgrade Vector depends largely on how it was installed.
+If you're multiple versions behind the latest release, we recommend upgrading incrementally.
+This approach helps ensure a smoother transition and reduces the risk of breaking changes from large version jumps.
diff --git a/website/content/en/docs/architecture/_index.md b/website/content/en/docs/architecture/_index.md
new file mode 100644
index 0000000000000..cd566c7f38f34
--- /dev/null
+++ b/website/content/en/docs/architecture/_index.md
@@ -0,0 +1,21 @@
+---
+title: Architecture
+weight: 3
+tags: ["architecture", "concepts"]
+---
+
+{{< svg "img/architecture.svg" >}}
+
+This section covers the various models that combine to form Vector's architecture. These are ordered progressively, beginning with the [data model][data_model] and broadening all the way to Vector's [runtime model][runtime_model].
+
+## Key pages
+
+{{< jump "/docs/architecture/data-model" >}}
+{{< jump "/docs/architecture/pipeline-model" >}}
+{{< jump "/docs/architecture/concurrency-model" >}}
+{{< jump "/docs/architecture/buffering-model" >}}
+{{< jump "/docs/architecture/end-to-end-acknowledgements" >}}
+{{< jump "/docs/architecture/runtime-model" >}}
+
+[data_model]: /docs/architecture/data-model
+[runtime_model]: /docs/architecture/runtime-model
diff --git a/website/content/en/docs/introduction/architecture/arc.md b/website/content/en/docs/architecture/arc.md
similarity index 100%
rename from website/content/en/docs/introduction/architecture/arc.md
rename to website/content/en/docs/architecture/arc.md
diff --git a/website/content/en/docs/introduction/architecture/buffering-model.md b/website/content/en/docs/architecture/buffering-model.md
similarity index 99%
rename from website/content/en/docs/introduction/architecture/buffering-model.md
rename to website/content/en/docs/architecture/buffering-model.md
index daa376cc538a0..701c571cde73b 100644
--- a/website/content/en/docs/introduction/architecture/buffering-model.md
+++ b/website/content/en/docs/architecture/buffering-model.md
@@ -258,5 +258,5 @@ rather than force the client to wait, which could cause issues further up the st
 [sinks]: /docs/reference/configuration/sinks/
 [transforms]: /docs/reference/configuration/transforms/
 [sources]: /docs/reference/configuration/sources/
-[e2e_acks]: /docs/introduction/architecture/end-to-end-acknowledgements
+[e2e_acks]: /docs/architecture/end-to-end-acknowledgements
 [global_data_dir]: /docs/reference/configuration/global-options/#data_dir
diff --git a/website/content/en/docs/introduction/architecture/concurrency-model.md b/website/content/en/docs/architecture/concurrency-model.md
similarity index 95%
rename from website/content/en/docs/introduction/architecture/concurrency-model.md
rename to website/content/en/docs/architecture/concurrency-model.md
index 93ad6e37c53de..4fa12c48d3c8f 100644
--- a/website/content/en/docs/introduction/architecture/concurrency-model.md
+++ b/website/content/en/docs/architecture/concurrency-model.md
@@ -23,4 +23,4 @@ processing (we hope to improve this [in the future](https://github.com/vectordot
 [file]: /docs/reference/configuration/sources/file
 [socket]: /docs/reference/configuration/sources/socket
 [sources]: /docs/reference/configuration/sources/
-[pipeline]: /docs/introduction/architecture/pipeline-model
+[pipeline]: /docs/architecture/pipeline-model
diff --git a/website/content/en/docs/introduction/architecture/data-model/_index.md b/website/content/en/docs/architecture/data-model/_index.md
similarity index 90%
rename from website/content/en/docs/introduction/architecture/data-model/_index.md
rename to website/content/en/docs/architecture/data-model/_index.md
index 8dc1fdb0e0931..e339cb02ce88e 100644
--- a/website/content/en/docs/introduction/architecture/data-model/_index.md
+++ b/website/content/en/docs/architecture/data-model/_index.md
@@ -13,8 +13,8 @@ The individual units of data flowing through Vector are known as **events**. Eve
 
 Vector defines subtypes for events. This is necessary to establish domain-specific requirements enabling interoperability with existing monitoring and observability systems.
 
-{{< jump "/docs/introduction/architecture/data-model/log" >}}
-{{< jump "/docs/introduction/architecture/data-model/metric" >}}
+{{< jump "/docs/architecture/data-model/log" >}}
+{{< jump "/docs/architecture/data-model/metric" >}}
 
 ## FAQ
 
diff --git a/website/content/en/docs/introduction/architecture/data-model/log.md b/website/content/en/docs/architecture/data-model/log.md
similarity index 100%
rename from website/content/en/docs/introduction/architecture/data-model/log.md
rename to website/content/en/docs/architecture/data-model/log.md
diff --git a/website/content/en/docs/introduction/architecture/data-model/metric.md b/website/content/en/docs/architecture/data-model/metric.md
similarity index 81%
rename from website/content/en/docs/introduction/architecture/data-model/metric.md
rename to website/content/en/docs/architecture/data-model/metric.md
index 19050c85631cb..8c8ea3a6f4e00 100644
--- a/website/content/en/docs/introduction/architecture/data-model/metric.md
+++ b/website/content/en/docs/architecture/data-model/metric.md
@@ -10,6 +10,6 @@ tags: ["metrics", "events", "schema"]
 
 {{< config/metric-schema >}}
 
-[logs]: /docs/introduction/architecture/data-model/log
+[logs]: /docs/architecture/data-model/log
 [prometheus]: https://prometheus.io
 [statsd]: https://github.com/statsd/statsd
diff --git a/website/content/en/docs/introduction/architecture/end-to-end-acknowledgements.md b/website/content/en/docs/architecture/end-to-end-acknowledgements.md
similarity index 100%
rename from website/content/en/docs/introduction/architecture/end-to-end-acknowledgements.md
rename to website/content/en/docs/architecture/end-to-end-acknowledgements.md
diff --git a/website/content/en/docs/introduction/guarantees.md b/website/content/en/docs/architecture/guarantees.md
similarity index 99%
rename from website/content/en/docs/introduction/guarantees.md
rename to website/content/en/docs/architecture/guarantees.md
index 2311a16176493..76028d4e42fe1 100644
--- a/website/content/en/docs/introduction/guarantees.md
+++ b/website/content/en/docs/architecture/guarantees.md
@@ -1,6 +1,6 @@
 ---
 title: Guarantees
-weight: 2
+weight: 6
 aliases: ["/docs/introduction/guarantees"]
 ---
 
@@ -133,4 +133,4 @@ filters.
 
 [bugs]: https://github.com/vectordotdev/vector/issues?q=is%3Aopen+is%3Aissue+label%3A%22type%3A+bug%22
 [components]: /components
-[event]: /docs/introduction/architecture/data-model
+[event]: /docs/architecture/data-model
diff --git a/website/content/en/docs/introduction/architecture/pipeline-model.md b/website/content/en/docs/architecture/pipeline-model.md
similarity index 96%
rename from website/content/en/docs/introduction/architecture/pipeline-model.md
rename to website/content/en/docs/architecture/pipeline-model.md
index 27a6879434421..49cc846f7ac96 100644
--- a/website/content/en/docs/introduction/architecture/pipeline-model.md
+++ b/website/content/en/docs/architecture/pipeline-model.md
@@ -31,6 +31,6 @@ Vector also includes an [API] that allows for real-time observation and manipula
 [configuration]: /docs/reference/configuration
 [cue]: https://cuelang.org
 [dag]: https://en.wikipedia.org/wiki/Directed_acyclic_graph
-[events]: /docs/introduction/architecture/data-model
+[events]: /docs/architecture/data-model
 [jsonnet]: https://jsonnet.org
 [reloading]: /docs/administration/management/#reloading
diff --git a/website/content/en/docs/introduction/architecture/runtime-model.md b/website/content/en/docs/architecture/runtime-model.md
similarity index 95%
rename from website/content/en/docs/introduction/architecture/runtime-model.md
rename to website/content/en/docs/architecture/runtime-model.md
index d4c3dff162aa5..40863bb4676a5 100644
--- a/website/content/en/docs/introduction/architecture/runtime-model.md
+++ b/website/content/en/docs/architecture/runtime-model.md
@@ -42,9 +42,9 @@ Vector uses the [Tokio][tokio] runtime for task scheduling.
 
 Nodes in Vector's [DAG topology][pipeline] communicate via channels. Edge nodes are customized channels with dynamic output control where back pressure is the default, but can be customized on a per-sink basis to shed load or persist to disk.
 
-[concurrency]: /docs/introduction/architecture/concurrency-model
+[concurrency]: /docs/architecture/concurrency-model
 [dedupe]: /docs/reference/configuration/transforms/dedupe
-[pipeline]: /docs/introduction/architecture/pipeline-model
+[pipeline]: /docs/architecture/pipeline-model
 [remap]: /docs/reference/configuration/transforms/remap
 [tokio]: https://tokio.rs
 [sinks]: /docs/reference/configuration/sinks
diff --git a/website/content/en/docs/example.md b/website/content/en/docs/example.md
deleted file mode 100644
index 5ca32f819f86d..0000000000000
--- a/website/content/en/docs/example.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-# This page is just "scratch paper" for playing around with shortcodes and such.
-# It's rendered in the preview build but not in the production build (hence the draft status).
-title: Example
-description: A page for experimenting and doodling
-draft: true
----
diff --git a/website/content/en/docs/introduction/_index.md b/website/content/en/docs/introduction/_index.md
index e3d55838ef8c5..c039f0c6ce2e7 100644
--- a/website/content/en/docs/introduction/_index.md
+++ b/website/content/en/docs/introduction/_index.md
@@ -20,7 +20,3 @@ Vector is downloaded millions of times per month and relied on by companies like
 ## Pages
 
 {{< pages >}}
-
-## Sections
-
-{{< sections >}}
diff --git a/website/content/en/docs/introduction/architecture/_index.md b/website/content/en/docs/introduction/architecture/_index.md
deleted file mode 100644
index 969315f241ba6..0000000000000
--- a/website/content/en/docs/introduction/architecture/_index.md
+++ /dev/null
@@ -1,21 +0,0 @@
----
-title: Architecture
-weight: 3
-tags: ["architecture", "concepts"]
----
-
-{{< svg "img/architecture.svg" >}}
-
-This section covers the various models that combine to form Vector's architecture. These are ordered progressively, beginning with the [data model][data_model] and broadening all the way to Vector's [runtime model][runtime_model].
-
-## Key pages
-
-{{< jump "/docs/introduction/architecture/data-model" >}}
-{{< jump "/docs/introduction/architecture/pipeline-model" >}}
-{{< jump "/docs/introduction/architecture/concurrency-model" >}}
-{{< jump "/docs/introduction/architecture/buffering-model" >}}
-{{< jump "/docs/introduction/architecture/end-to-end-acknowledgements" >}}
-{{< jump "/docs/introduction/architecture/runtime-model" >}}
-
-[data_model]: /docs/introduction/architecture/data-model
-[runtime_model]: /docs/introduction/architecture/runtime-model
diff --git a/website/content/en/docs/introduction/concepts.md b/website/content/en/docs/introduction/concepts.md
index 024453685f5b2..ad2dadddc6135 100644
--- a/website/content/en/docs/introduction/concepts.md
+++ b/website/content/en/docs/introduction/concepts.md
@@ -10,19 +10,19 @@ In order to understand Vector, you must first understand the fundamental concept
 
 **Events** represent the individual units of data in Vector.
 
-{{< jump "/docs/introduction/architecture/data-model" >}}
+{{< jump "/docs/architecture/data-model" >}}
 
 ### Logs
 
 A **log** event is a generic key/value representation of an event.
 
-{{< jump "/docs/introduction/architecture/data-model/log" >}}
+{{< jump "/docs/architecture/data-model/log" >}}
 
 ### Metrics
 
 A **metric** event represents a numerical operation performed on a time series. Vector's metric events are fully interoperable.
 
-{{< jump "/docs/introduction/architecture/data-model/metric" >}}
+{{< jump "/docs/architecture/data-model/metric" >}}
 
 ### Traces
 
@@ -74,7 +74,7 @@ A **sink** is a destination for events. Each sink's design and transmission meth
 
 A **pipeline** is a [directed acyclic graph][dag] of [components]. Each component is a node in the graph with directed edges. Data must flow in one direction, from sources to sinks. Components can produce zero or more events.
 
-{{< jump "/docs/introduction/architecture/pipeline-model" >}}
+{{< jump "/docs/architecture/pipeline-model" >}}
 
 
 ## Buffers
diff --git a/website/content/en/docs/reference/_index.md b/website/content/en/docs/reference/_index.md
index 9edf2c61baa2f..d2383cd40169d 100644
--- a/website/content/en/docs/reference/_index.md
+++ b/website/content/en/docs/reference/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Reference
-weight: 3
+weight: 4
 ---
 
 This section contains various forms of reference-style documentation for Vector. These docs tend to
diff --git a/website/content/en/docs/reference/configuration/template-syntax.md b/website/content/en/docs/reference/configuration/template-syntax.md
index e0efd2ec4ee29..5b2e356245df0 100644
--- a/website/content/en/docs/reference/configuration/template-syntax.md
+++ b/website/content/en/docs/reference/configuration/template-syntax.md
@@ -58,7 +58,7 @@ option = "year=%Y/month=%m/day=%d/"
 ```
 
 {{< info >}}
-The value is derived from the [`timestamp` field](/docs/introduction/under-the-hood/architecture/data-model/log/#timestamps)
+The value is derived from the [`timestamp` field](/docs/introduction/introduction/architecture/data-model/log/#timestamps)
 and the name of this field can be changed via the [global `timestamp_key` option](/docs/reference/configuration/global-options/#log_schema.timestamp_key).
 {{< /info >}}
 
@@ -109,7 +109,7 @@ metric is incremented with an `error_type` tag of `template_failed`.
 
 [1692]: https://github.com/vectordotdev/vector/issues/1692
 [aws_s3]: /docs/reference/configuration/sinks/aws_s3
-[log]: /docs/introduction/under-the-hood/architecture/data-model/log
+[log]: /docs/introduction/introduction/architecture/data-model/log
 [path_expression]: /docs/reference/vrl/expressions/#path
 [path_expression_examples]: /docs/reference/vrl/expressions/#path-examples
 [remap]: /docs/reference/configuration/transforms/remap
diff --git a/website/content/en/docs/reference/configuration/unit-tests.md b/website/content/en/docs/reference/configuration/unit-tests.md
index 6dbc26ebc42f0..ef3423a32a4d9 100644
--- a/website/content/en/docs/reference/configuration/unit-tests.md
+++ b/website/content/en/docs/reference/configuration/unit-tests.md
@@ -599,8 +599,8 @@ assert!(!exists(.tags.host), "host tag included")
 [filter]: /docs/reference/configuration/transforms/filter
 [includes]: /docs/reference/vrl/functions/#includes
 [is_nullish]: /docs/reference/vrl/functions/#is_nullish
-[logs]: /docs/introduction/under-the-hood/architecture/data-model/log
-[metrics]: /docs/introduction/under-the-hood/architecture/data-model/metric
+[logs]: /docs/introduction/introduction/architecture/data-model/log
+[metrics]: /docs/introduction/introduction/architecture/data-model/metric
 [pipeline]: /docs/reference/glossary/#pipeline
 [remap]: /docs/reference/configuration/transforms/remap
 [transforms]: /docs/reference/glossary/#transform
diff --git a/website/content/en/docs/reference/vrl/_index.md b/website/content/en/docs/reference/vrl/_index.md
index 4c2b19d1f6000..1d9dd17afdd7a 100644
--- a/website/content/en/docs/reference/vrl/_index.md
+++ b/website/content/en/docs/reference/vrl/_index.md
@@ -199,14 +199,14 @@ VRL has some core concepts that you should be aware of as you dive in.
 [dedupe]: /docs/reference/configuration/transforms/dedupe
 [del]: /docs/reference/vrl/functions#del
 [errors]: /docs/reference/vrl/errors
-[events]: /docs/introduction/under-the-hood-architecture/data-model
+[events]: /docs/introduction/architecture/data-model
 [fail_safe]: https://en.wikipedia.org/wiki/Fail-safe
 [ffi]: https://en.wikipedia.org/wiki/Foreign_function_interface
 [filter]: /docs/reference/configuration/transforms/filter
 [log]: /docs/reference/vrl/functions#log
-[logs]: /docs/introduction/under-the-hood/architecture/data-model/log
+[logs]: /docs/introduction/introduction/architecture/data-model/log
 [memory_safety]: https://en.wikipedia.org/wiki/Memory_safety
-[metrics]: /docs/introduction/under-the-hood/architecture/data-model/metrics
+[metrics]: /docs/introduction/introduction/architecture/data-model/metrics
 [now]: /docs/reference/vrl/functions#now
 [remap]: /docs/reference/configuration/transforms/remap
 [route]: /docs/reference/configuration/transforms/route
diff --git a/website/content/en/docs/setup/going-to-prod/arch/agent.md b/website/content/en/docs/setup/going-to-prod/arch/agent.md
index fce1d6e40ccc6..f6181607a4859 100644
--- a/website/content/en/docs/setup/going-to-prod/arch/agent.md
+++ b/website/content/en/docs/setup/going-to-prod/arch/agent.md
@@ -46,7 +46,7 @@ See the [architecting document](/docs/setup/going-to-prod/architecting/) for mor
 ### High Availability
 
 - If the [failure of a single Vector agent](/docs/setup/going-to-prod/high-availability/#vector-process-failure) is unacceptable, consider the [aggregator architecture](/docs/setup/going-to-prod/arch/aggregator/), which deploys Vector across multiple nodes in a [highly available manner](/docs/setup/going-to-prod/high-availability/).
-- Enable [end-to-end acknowledgements](/docs/introduction/under-the-hood/architecture/end-to-end-acknowledgements/) to mitigate [data receive failures](/docs/setup/going-to-prod/high-availability/#data-receive-failure).
+- Enable [end-to-end acknowledgements](/docs/introduction/introduction/architecture/end-to-end-acknowledgements/) to mitigate [data receive failures](/docs/setup/going-to-prod/high-availability/#data-receive-failure).
 - Route dropped events to mitigate [data processing failures](/docs/setup/going-to-prod/high-availability/#data-processing-failure).
 
 {{< info >}}
diff --git a/website/content/en/docs/setup/going-to-prod/arch/aggregator.md b/website/content/en/docs/setup/going-to-prod/arch/aggregator.md
index 01b0895b7a39b..ca37330be30b0 100644
--- a/website/content/en/docs/setup/going-to-prod/arch/aggregator.md
+++ b/website/content/en/docs/setup/going-to-prod/arch/aggregator.md
@@ -94,7 +94,7 @@ Partitioning, or “topics” in Kafka terminology, refers to separating data in
 #### Recommendations
 
 - Use memory buffers with `buffers.when_full` set to `block`. This will ensure back pressure flows upstream to your pub-sub system, where durable buffering should occur.
-- Enable [end-to-end acknowledgements](/docs/introduction/under-the-hood/architecture/end-to-end-acknowledgements/) for your Vector pub-sub source (i.e., the `kafka` source) to ensure data is persisted downstream before removing the data from your pub-sub systems.
+- Enable [end-to-end acknowledgements](/docs/introduction/introduction/architecture/end-to-end-acknowledgements/) for your Vector pub-sub source (i.e., the `kafka` source) to ensure data is persisted downstream before removing the data from your pub-sub systems.
 
 ### Global Aggregation
 
diff --git a/website/content/en/docs/setup/going-to-prod/architecting.md b/website/content/en/docs/setup/going-to-prod/architecting.md
index afacd34584bb7..bababee355b16 100644
--- a/website/content/en/docs/setup/going-to-prod/architecting.md
+++ b/website/content/en/docs/setup/going-to-prod/architecting.md
@@ -122,7 +122,7 @@ Notice that these functions collect and forward existing data, unchanged. There
 
 Vector should not replace agents that produce vendor-specific data that Vector cannot replicate.
 
-For example, the Datadog Agent powers [Network Performance Monitoring](https://www.datadoghq.com/product/network-monitoring/network-performance-monitoring/). In this case, the Datadog Agent integrates with vendor-specific systems and produces vendor-specific data. Vector should not be involved with this process. Instead, the Datadog Agent should collect the data and send it directly to Datadog since the data is not one of [Vector’s supported data types](docs/introduction/under-the-hood/architecture/data-model/).
+For example, the Datadog Agent powers [Network Performance Monitoring](https://www.datadoghq.com/product/network-monitoring/network-performance-monitoring/). In this case, the Datadog Agent integrates with vendor-specific systems and produces vendor-specific data. Vector should not be involved with this process. Instead, the Datadog Agent should collect the data and send it directly to Datadog since the data is not one of [Vector’s supported data types](docs/introduction/introduction/architecture/data-model/).
 
 As another example, the Datadog Agent collects service metrics and enriches them with vendor-specific Datadog tags. In this case, the Datadog Agent should send the metrics directly to Datadog or route them through Vector. Vector should not replace the Datadog Agent because the data being produced is enriched in a vendor-specific way.
 
@@ -153,7 +153,7 @@ Alternatively, you can deploy Vector [on separate nodes as an aggregator](/docs/
 
 ##### Reducing Agent Risk
 
-When integrating with an agent, you should configure the agent to be a simple data forwarder, and route [supported data types](docs/introduction/under-the-hood/architecture/data-model/) through Vector. This strategy reduces the risk of data loss and service disruption due to misbehaving agents by minimizing their responsibilities.
+When integrating with an agent, you should configure the agent to be a simple data forwarder, and route [supported data types](docs/introduction/introduction/architecture/data-model/) through Vector. This strategy reduces the risk of data loss and service disruption due to misbehaving agents by minimizing their responsibilities.
 
 #### Replacing Agents
 
@@ -173,7 +173,7 @@ Data processing deals with everything in between your Vector sources and sinks.
 
 #### Choosing Which Data to Process
 
-Primitive data types that [Vector’s data model](docs/introduction/under-the-hood/architecture/data-model/) supports should be processed by Vector (i.e., logs, metrics, and traces). Real-time, vendor-specific data, such as continuous profiling data, should not flow through Vector since it is not interoperable and typically does not benefit from processing.
+Primitive data types that [Vector’s data model](docs/introduction/introduction/architecture/data-model/) supports should be processed by Vector (i.e., logs, metrics, and traces). Real-time, vendor-specific data, such as continuous profiling data, should not flow through Vector since it is not interoperable and typically does not benefit from processing.
 
 #### Choosing Where to Process Data
 
@@ -266,7 +266,7 @@ Your system of record should optimize for durability while minimizing cost:
 
 - Only write to your archive from the [aggregator role](#aggregator-role) to reduce data loss due to node restarts and [software failures](/docs/setup/going-to-prod/high-availability/#mitigate-software-failures).
 - Front the sink with a disk buffer.
-- Enable [end-to-end acknowledgements](/docs/introduction/under-the-hood/architecture/end-to-end-acknowledgements/) on all sources.
+- Enable [end-to-end acknowledgements](/docs/introduction/introduction/architecture/end-to-end-acknowledgements/) on all sources.
 - Set `batch.max_bytes` to ≥ 5MiB and `batch.timeout_secs` to ≥ 5 minutes and enable `compression` (the default for archiving sinks, such as the `aws_s3` sink).
 - Archive raw, unprocessed data to allow for data replay and reduce the risk of accidental data corruption during processing.
 
diff --git a/website/content/en/docs/setup/going-to-prod/high-availability.md b/website/content/en/docs/setup/going-to-prod/high-availability.md
index 97f88ac269e34..033bf17ccc0ca 100644
--- a/website/content/en/docs/setup/going-to-prod/high-availability.md
+++ b/website/content/en/docs/setup/going-to-prod/high-availability.md
@@ -39,7 +39,7 @@ Mitigate Vector process failures similarly to [node failures](#node-failure): Ve
 
 #### Data Receive Failure
 
-Mitigate data receive failures with Vector’s [end-to-end acknowledgements feature](/docs/introduction/under-the-hood/architecture/end-to-end-acknowledgements/). When enabled, Vector only responds to the clients when data durably persists. Such as writing the data to the disk buffer or a downstream service.
+Mitigate data receive failures with Vector’s [end-to-end acknowledgements feature](/docs/introduction/introduction/architecture/end-to-end-acknowledgements/). When enabled, Vector only responds to the clients when data durably persists. Such as writing the data to the disk buffer or a downstream service.
 
 ![Failure](/img/going-to-prod/ha/receive-failure.png)
 
@@ -78,7 +78,7 @@ Support for `dropped` channels in other components is forthcoming.
 
 #### Data Send Failure
 
-Mitigate data send failures with [Adaptive Request Concurrency (ARC)](/docs/introduction/under-the-hood/networking/arc/) and buffers.
+Mitigate data send failures with [Adaptive Request Concurrency (ARC)](/docs/architecture/arc/) and buffers.
 
 ARC automatically scales down the number of outgoing connections when Vector cannot send data. ARC minimizes the amount of in-flight data, appropriately applies backpressure, and prevents the stampede effect that often prohibits downstream services from recovering.
 
@@ -139,7 +139,7 @@ These actions mitigate [individual node failure](#node-failure) and [data center
 
 Mitigate software failures by configuring your Vector instances as follows:
 
-1. Able sources should enable [end-to-end acknowledgements](/docs/introduction/under-the-hood/architecture/end-to-end-acknowledgements/).
+1. Able sources should enable [end-to-end acknowledgements](/docs/introduction/introduction/architecture/end-to-end-acknowledgements/).
 2. Sinks should implement disk or memory buffers that overflow to disk.
 3. Transforms should implement dropped event routing to your system of record.
 
diff --git a/website/content/en/docs/setup/going-to-prod/sizing.md b/website/content/en/docs/setup/going-to-prod/sizing.md
index 122f5b06d628a..e0cc44e1f3416 100644
--- a/website/content/en/docs/setup/going-to-prod/sizing.md
+++ b/website/content/en/docs/setup/going-to-prod/sizing.md
@@ -77,7 +77,7 @@ More information about buffers and data loss can be found in the [high availabil
 
 ### Vertical Scaling
 
-[Vector’s concurrency model](/docs/introduction/under-the-hood/architecture/concurrency-model/) automatically scales to take advantage of all vCPUs. There are no configuration changes needed. When vertically scaling, we recommend capping an instance’s size to process no more than 33% of your total volume. This allows for [high availability](/docs/setup/going-to-prod/high-availability/) in the event of a node failure.
+[Vector’s concurrency model](/docs/introduction/introduction/architecture/concurrency-model/) automatically scales to take advantage of all vCPUs. There are no configuration changes needed. When vertically scaling, we recommend capping an instance’s size to process no more than 33% of your total volume. This allows for [high availability](/docs/setup/going-to-prod/high-availability/) in the event of a node failure.
 
 {{< info >}}
 More information about vertical sizing can be found in the [capacity planning section](#capacity-planning).
diff --git a/website/content/en/guides/advanced/custom-aggregations-with-lua.md b/website/content/en/guides/advanced/custom-aggregations-with-lua.md
index 709650b04b1d6..262f6b7a2d4c8 100644
--- a/website/content/en/guides/advanced/custom-aggregations-with-lua.md
+++ b/website/content/en/guides/advanced/custom-aggregations-with-lua.md
@@ -285,8 +285,8 @@ pipelines, it makes it possible to write custom aggregations as Lua scripts. Thi
 in a [deployment topology][docs.setup.deployment.topologies] to perform various kinds of aggregations, providing
 alternatives to centralized logs aggregation.
 
-[docs.about.concepts#pipelines]: /docs/about/concepts/#pipeline
-[docs.architecture.data-model.metric#counter]: /docs/about/under-the-hood/architecture/data-model/metric/#counter
+[docs.about.concepts#pipelines]: /docs/introduction/concepts/#pipeline
+[docs.architecture.data-model.metric#counter]: /docs/architecture/data-model/metric/#counter
 [docs.setup.deployment.topologies]: /docs/setup/deployment/topologies/
 [docs.transforms.lua#event-data-model]: /docs/reference/configuration/transforms/lua/#event-data-model
 [docs.transforms.lua#source]: /docs/reference/configuration/transforms/lua/#source
diff --git a/website/content/en/guides/advanced/merge-multiline-logs-with-lua.md b/website/content/en/guides/advanced/merge-multiline-logs-with-lua.md
index a2478129ead83..3f23a5c6eda39 100644
--- a/website/content/en/guides/advanced/merge-multiline-logs-with-lua.md
+++ b/website/content/en/guides/advanced/merge-multiline-logs-with-lua.md
@@ -14,7 +14,7 @@ tags: ["lua", "merge", "multiline", "multi-line", "advanced", "guides", "guide"]
 * You understand the [basic Vector concepts][docs.about.concepts] and understand [how to set up a basic pipeline][docs.setup.quickstart].
 * You know how to [parse CSV logs with Lua][guides.parsing-csv-logs-with-lua].
 
-[docs.about.concepts]: /docs/about/concepts
+[docs.about.concepts]: /docs/introduction/concepts
 [docs.setup.quickstart]: /docs/setup/quickstart
 [docs.transforms.lua]: /docs/reference/configuration/transforms/lua
 [guides.parsing-csv-logs-with-lua]: /guides/advanced/parsing-csv-logs-with-lua
@@ -148,7 +148,7 @@ in checking out the following guides:
 * [Unit Testing Your Configs][guides.unit-testing]
 * [Custom Aggregations with Lua][guides.advanced.custom-aggregations-with-lua]
 
-[docs.about.concepts]: /docs/about/concepts/
+[docs.about.concepts]: /docs/introduction/concepts/
 [docs.setup.quickstart]: /docs/setup/quickstart/
 [docs.sources.file#multiline]: /docs/reference/configuration/sources/file/#multiline
 [docs.transforms.lua#source]: /docs/reference/configuration/transforms/lua/#source
diff --git a/website/content/en/guides/advanced/parsing-csv-logs-with-lua.md b/website/content/en/guides/advanced/parsing-csv-logs-with-lua.md
index 6035d067fa974..ecb89d844adab 100644
--- a/website/content/en/guides/advanced/parsing-csv-logs-with-lua.md
+++ b/website/content/en/guides/advanced/parsing-csv-logs-with-lua.md
@@ -11,7 +11,7 @@ tags: ["lua", "csv", "logs", "transform", "advanced", "guides", "guide"]
 {{< requirement title="Pre-requisites" >}}
 
 * You understand the <a href="/docs/reference/configuration/transforms/lua">basic Lua concepts</a>.
-* You understand the <a href="/docs/about/concepts">basic Vector concepts</a> and understand <a href="/docs/setup/quickstart/">how to set up a pipeline</a>
+* You understand the <a href="/docs/introduction/concepts">basic Vector concepts</a> and understand <a href="/docs/setup/quickstart/">how to set up a pipeline</a>
 
 {{< /requirement >}}
 
diff --git a/website/content/en/guides/developer/config-autocompletion.md b/website/content/en/guides/developer/config-autocompletion.md
index 97eefb05bf14b..4a047314a5c3d 100644
--- a/website/content/en/guides/developer/config-autocompletion.md
+++ b/website/content/en/guides/developer/config-autocompletion.md
@@ -12,7 +12,7 @@ weight: 2
 {{< requirement >}}
 This guide assumes you understand [basic Vector concepts][concepts]
 
-[concepts]: /docs/about/concepts
+[concepts]: /docs/introduction/concepts
 {{< /requirement >}}
 
 Vector provides CLI [subcommands][subcommands] to perform various tasks apart from running pipelines. This short guide focuses on how to
diff --git a/website/content/en/guides/getting-started/transformation.md b/website/content/en/guides/getting-started/transformation.md
index 66a46cc928ccf..3910e82ef754e 100644
--- a/website/content/en/guides/getting-started/transformation.md
+++ b/website/content/en/guides/getting-started/transformation.md
@@ -14,7 +14,7 @@ Before you begin, this guide assumes the following:
 * You understand the [basic Vector concepts][concepts]
 * You understand [how to set up a basic pipeline][pipeline]
 
-[concepts]: /docs/about/concepts
+[concepts]: /docs/introduction/concepts
 [pipeline]: /docs/setup/quickstart
 {{< /requirement >}}
 
@@ -209,7 +209,7 @@ using it only when truly necessary, for several reasons:
    but best avoided if possible.
 3. It imposes a performance penalty vis-à-vis VRL.
 
-[docs.architecture.pipeline-model]: /docs/about/under-the-hood/architecture/pipeline-model/
+[docs.architecture.pipeline-model]: /docs/architecture/pipeline-model/
 [docs.lua]: /docs/reference/configuration/transforms/lua/
 [docs.setup.quickstart]: /docs/setup/quickstart/
 [docs.sinks.console]: /docs/reference/configuration/sinks/console/
diff --git a/website/content/en/guides/level-up/csv-enrichment-guide.md b/website/content/en/guides/level-up/csv-enrichment-guide.md
index f7f2b50a2a383..48ec444069849 100644
--- a/website/content/en/guides/level-up/csv-enrichment-guide.md
+++ b/website/content/en/guides/level-up/csv-enrichment-guide.md
@@ -14,7 +14,7 @@ Before you begin, this guide assumes the following:
 * You understand the [basic Vector concepts][concepts]
 * You understand [how to set up a basic pipeline][pipeline]
 
-[concepts]: /docs/about/concepts
+[concepts]: /docs/introduction/concepts
 [pipeline]: /docs/setup/quickstart
 {{< /requirement >}}
 
diff --git a/website/content/en/guides/level-up/managing-complex-configs.md b/website/content/en/guides/level-up/managing-complex-configs.md
index 74c40a6ce301a..1a18028719080 100644
--- a/website/content/en/guides/level-up/managing-complex-configs.md
+++ b/website/content/en/guides/level-up/managing-complex-configs.md
@@ -14,7 +14,7 @@ Before you begin, this guide assumes the following:
 * You understand the [basic Vector concepts][docs.about.concepts]
 * You understand [how to set up a basic pipeline][docs.setup.quickstart].
 
-[docs.about.concepts]: /docs/about/concepts
+[docs.about.concepts]: /docs/introduction/concepts
 [docs.setup.quickstart]: /docs/setup/quickstart
 {{< /requirement >}}
 
@@ -257,6 +257,6 @@ If you're running Vector in environments where it's not possible to issue
 `SIGHUP` signals you can instead run it with the `--watch-config` flag and it'll
 automatically gobble up changes whenever the file is written to.
 
-[docs.about.concepts]: /docs/about/concepts/
+[docs.about.concepts]: /docs/introduction/concepts/
 [docs.setup.quickstart]: /docs/setup/quickstart/
 [guides.unit-testing]: /guides/level-up/unit-testing/
diff --git a/website/content/en/guides/level-up/managing-schemas.md b/website/content/en/guides/level-up/managing-schemas.md
index 069148d377c45..e66c17b11b238 100644
--- a/website/content/en/guides/level-up/managing-schemas.md
+++ b/website/content/en/guides/level-up/managing-schemas.md
@@ -15,7 +15,7 @@ Before you begin, this guide assumes the following:
 * You understand [how to set up a basic pipeline][docs.setup.quickstart].
 * This guide assumes `log_namespace` (off by default) was not explicitly enabled.
 
-[docs.about.concepts]: /docs/about/concepts/
+[docs.about.concepts]: /docs/introduction/concepts/
 [docs.setup.quickstart]: /docs/setup/quickstart/
 {{< /requirement >}}
 
@@ -332,4 +332,3 @@ Where are you deploying Vector? Let us know, maybe we can help optimize it!
 [docs.sources]: /docs/reference/configuration/sources/
 [docs.transforms.remap]: /docs/reference/configuration/transforms/remap/
 [docs.enrichment_functions]: /docs/reference/vrl/functions/#enrichment-functions
-
diff --git a/website/content/en/guides/level-up/vector-tap-guide.md b/website/content/en/guides/level-up/vector-tap-guide.md
index 0ed68bfac6a99..83286a17d218c 100644
--- a/website/content/en/guides/level-up/vector-tap-guide.md
+++ b/website/content/en/guides/level-up/vector-tap-guide.md
@@ -14,7 +14,7 @@ Before you begin, this guide assumes the following:
 * You understand the [basic Vector concepts][concepts]
 * You understand [how to set up a basic pipeline][pipeline]
 
-[concepts]: /docs/about/concepts
+[concepts]: /docs/introduction/concepts
 [pipeline]: /docs/setup/quickstart
 {{< /requirement >}}
 
diff --git a/website/content/en/highlights/2020-02-14-global-log-schema.md b/website/content/en/highlights/2020-02-14-global-log-schema.md
index f1e3b6d84ebbc..c12851e15b10b 100644
--- a/website/content/en/highlights/2020-02-14-global-log-schema.md
+++ b/website/content/en/highlights/2020-02-14-global-log-schema.md
@@ -40,7 +40,7 @@ Why is this useful?
    [sinks][docs.sinks] to ensure that Vector's internal "host" field is mapped
    to the downstream service's "host" field.
 
-[docs.data-model.log]: /docs/about/under-the-hood/architecture/data-model/log
+[docs.data-model.log]: /docs/architecture/data-model/log
 [docs.global-options#host_key]: /docs/reference/configuration/global-options/#log_schema.host_key
 [docs.global-options#log_schema]: /docs/reference/configuration/global-options/#log_schema
 [docs.global-options#message_key]: /docs/reference/configuration/global-options/#log_schema.message_key
diff --git a/website/content/en/highlights/2020-02-24-log-data-model-changes.md b/website/content/en/highlights/2020-02-24-log-data-model-changes.md
index 0a1a85aba5657..30d7a5a6fba4d 100644
--- a/website/content/en/highlights/2020-02-24-log-data-model-changes.md
+++ b/website/content/en/highlights/2020-02-24-log-data-model-changes.md
@@ -34,4 +34,4 @@ drain your disk buffer before upgrading Vector.
 Note, Vector will discard invalid disk buffer data, bad data will not prevent
 Vector from starting.
 
-[docs.data-model.log]: /docs/about/under-the-hood/architecture/data-model/log/
+[docs.data-model.log]: /docs/architecture/data-model/log/
diff --git a/website/content/en/highlights/2020-04-07-vector-to-vector-metrics.md b/website/content/en/highlights/2020-04-07-vector-to-vector-metrics.md
index 8f0fc3c3f988c..7475cc7d619e9 100644
--- a/website/content/en/highlights/2020-04-07-vector-to-vector-metrics.md
+++ b/website/content/en/highlights/2020-04-07-vector-to-vector-metrics.md
@@ -19,7 +19,7 @@ metric data model development, as well as topology improvements.
 observability pipelines that can process both logs and metrics, such as
 the [centralized topology][docs.topologies#centralized].
 
-[docs.data-model.log]: /docs/about/under-the-hood/architecture/data-model/log
+[docs.data-model.log]: /docs/architecture/data-model/log
 [docs.sources.vector]: /docs/reference/configuration/sources/vector/
 [docs.topologies#centralized]: /docs/setup/deployment/topologies/#centralized
 [urls.pr_2245]: https://github.com/vectordotdev/vector/pull/2245
diff --git a/website/content/en/highlights/2020-12-23-vector-top.md b/website/content/en/highlights/2020-12-23-vector-top.md
index 9e981e2902946..4c630f5c43914 100644
--- a/website/content/en/highlights/2020-12-23-vector-top.md
+++ b/website/content/en/highlights/2020-12-23-vector-top.md
@@ -36,5 +36,5 @@ a primary consumer. The dashboard UI was created using the excellent [tui-rs] li
 [cli]: /docs/reference/cli
 [htop]: https://htop.dev
 [top]: /docs/reference/cli/#top
-[topology]: /docs/about/concepts/#topology
+[topology]: /docs/introduction/concepts/#topology
 [tui]: https://docs.rs/tui
diff --git a/website/content/en/highlights/2021-01-10-kafka-sink-metrics.md b/website/content/en/highlights/2021-01-10-kafka-sink-metrics.md
index afef93e7fa598..389e85dbf50ff 100644
--- a/website/content/en/highlights/2021-01-10-kafka-sink-metrics.md
+++ b/website/content/en/highlights/2021-01-10-kafka-sink-metrics.md
@@ -37,4 +37,4 @@ source and sink will support. See [issue 5809] for more info.
 
 [issue 5809]: https://github.com/vectordotdev/vector/issues/5809
 [kafka_sink]: /docs/reference/configuration/sinks/kafka/
-[metrics data model]: /docs/about/under-the-hood/architecture/data-model/metric/#schema
+[metrics data model]: /docs/architecture/data-model/metric/#schema
diff --git a/website/content/en/highlights/2021-10-08-0-17-upgrade-guide.md b/website/content/en/highlights/2021-10-08-0-17-upgrade-guide.md
index 29b93bc635721..2af26a0c1b6d5 100644
--- a/website/content/en/highlights/2021-10-08-0-17-upgrade-guide.md
+++ b/website/content/en/highlights/2021-10-08-0-17-upgrade-guide.md
@@ -99,5 +99,5 @@ calculation. It has been replaced by
 [`rtt_deviation_scale`][rtt_deviation_scale] which can be used to adjust
 the scale factor applied to this value.
 
-[arc]: /docs/about/under-the-hood/networking/arc/
+[arc]: /docs/architecture/arc/
 [rtt_deviation_scale]: /docs/reference/configuration/sinks/http/#request.adaptive_concurrency.rtt_deviation_scale
diff --git a/website/content/en/highlights/2022-03-22-0-21-0-upgrade-guide.md b/website/content/en/highlights/2022-03-22-0-21-0-upgrade-guide.md
index 89d84e34f080d..855cfa2ddd81a 100644
--- a/website/content/en/highlights/2022-03-22-0-21-0-upgrade-guide.md
+++ b/website/content/en/highlights/2022-03-22-0-21-0-upgrade-guide.md
@@ -446,4 +446,4 @@ version, but is deprecated and will be removed in a future version.
 See [the documentation for end-to-end acknowledgements][acknowledgements] for
 more details on the acknowledgement process.
 
-[acknowledgements]: https://vector.dev/docs/about/under-the-hood/architecture/end-to-end-acknowledgements/
+[acknowledgements]: https://vector.dev/docs/architecture/end-to-end-acknowledgements/
diff --git a/website/cue/reference/base/configuration.cue b/website/cue/reference/base/configuration.cue
index facbc3d1caada..00db6e184f61f 100644
--- a/website/cue/reference/base/configuration.cue
+++ b/website/cue/reference/base/configuration.cue
@@ -608,7 +608,7 @@ base: configuration: configuration: {
 			See [End-to-end Acknowledgements][e2e_acks] for more information on how Vector handles event
 			acknowledgement.
 
-			[e2e_acks]: https://vector.dev/docs/about/under-the-hood/architecture/end-to-end-acknowledgements/
+			[e2e_acks]: https://vector.dev/docs/architecture/end-to-end-acknowledgements/
 			"""
 		required: false
 		type: object: options: enabled: {
diff --git a/website/cue/reference/components/base/sinks.cue b/website/cue/reference/components/base/sinks.cue
index ddb5287a24b67..73c913a397ce1 100644
--- a/website/cue/reference/components/base/sinks.cue
+++ b/website/cue/reference/components/base/sinks.cue
@@ -8,7 +8,7 @@ base: components: sinks: configuration: {
 			More information about the individual buffer types, and buffer behavior, can be found in the
 			[Buffering Model][buffering_model] section.
 
-			[buffering_model]: /docs/about/under-the-hood/architecture/buffering-model/
+			[buffering_model]: /docs/architecture/buffering-model/
 			"""
 		required: false
 		type: object: options: {
diff --git a/website/cue/reference/components/sinks/base/amqp.cue b/website/cue/reference/components/sinks/base/amqp.cue
index 0f8c24162cb97..0fcde6cbe9c53 100644
--- a/website/cue/reference/components/sinks/base/amqp.cue
+++ b/website/cue/reference/components/sinks/base/amqp.cue
@@ -7,7 +7,7 @@ base: components: sinks: amqp: configuration: {
 
 			See [End-to-end Acknowledgements][e2e_acks] for more information on how event acknowledgement is handled.
 
-			[e2e_acks]: https://vector.dev/docs/about/under-the-hood/architecture/end-to-end-acknowledgements/
+			[e2e_acks]: https://vector.dev/docs/architecture/end-to-end-acknowledgements/
 			"""
 		required: false
 		type: object: options: enabled: {
diff --git a/website/cue/reference/components/sinks/base/appsignal.cue b/website/cue/reference/components/sinks/base/appsignal.cue
index 30ce8edf72077..2fa750ee72f54 100644
--- a/website/cue/reference/components/sinks/base/appsignal.cue
+++ b/website/cue/reference/components/sinks/base/appsignal.cue
@@ -7,7 +7,7 @@ base: components: sinks: appsignal: configuration: {
 
 			See [End-to-end Acknowledgements][e2e_acks] for more information on how event acknowledgement is handled.
 
-			[e2e_acks]: https://vector.dev/docs/about/under-the-hood/architecture/end-to-end-acknowledgements/
+			[e2e_acks]: https://vector.dev/docs/architecture/end-to-end-acknowledgements/
 			"""
 		required: false
 		type: object: options: enabled: {
@@ -232,7 +232,7 @@ base: components: sinks: appsignal: configuration: {
 							adaptive: """
 															Concurrency is managed by Vector's [Adaptive Request Concurrency][arc] feature.
 
-															[arc]: https://vector.dev/docs/about/under-the-hood/networking/arc/
+															[arc]: https://vector.dev/docs/architecture/arc/
 															"""
 							none: """
 															A fixed concurrency of 1.
diff --git a/website/cue/reference/components/sinks/base/aws_cloudwatch_logs.cue b/website/cue/reference/components/sinks/base/aws_cloudwatch_logs.cue
index a4ca1de78da7a..85e63138cfd7d 100644
--- a/website/cue/reference/components/sinks/base/aws_cloudwatch_logs.cue
+++ b/website/cue/reference/components/sinks/base/aws_cloudwatch_logs.cue
@@ -7,7 +7,7 @@ base: components: sinks: aws_cloudwatch_logs: configuration: {
 
 			See [End-to-end Acknowledgements][e2e_acks] for more information on how event acknowledgement is handled.
 
-			[e2e_acks]: https://vector.dev/docs/about/under-the-hood/architecture/end-to-end-acknowledgements/
+			[e2e_acks]: https://vector.dev/docs/architecture/end-to-end-acknowledgements/
 			"""
 		required: false
 		type: object: options: enabled: {
@@ -712,7 +712,7 @@ base: components: sinks: aws_cloudwatch_logs: configuration: {
 							adaptive: """
 															Concurrency is managed by Vector's [Adaptive Request Concurrency][arc] feature.
 
-															[arc]: https://vector.dev/docs/about/under-the-hood/networking/arc/
+															[arc]: https://vector.dev/docs/architecture/arc/
 															"""
 							none: """
 															A fixed concurrency of 1.
diff --git a/website/cue/reference/components/sinks/base/aws_cloudwatch_metrics.cue b/website/cue/reference/components/sinks/base/aws_cloudwatch_metrics.cue
index bc03d510b10c6..09547529cd3c6 100644
--- a/website/cue/reference/components/sinks/base/aws_cloudwatch_metrics.cue
+++ b/website/cue/reference/components/sinks/base/aws_cloudwatch_metrics.cue
@@ -7,7 +7,7 @@ base: components: sinks: aws_cloudwatch_metrics: configuration: {
 
 			See [End-to-end Acknowledgements][e2e_acks] for more information on how event acknowledgement is handled.
 
-			[e2e_acks]: https://vector.dev/docs/about/under-the-hood/architecture/end-to-end-acknowledgements/
+			[e2e_acks]: https://vector.dev/docs/architecture/end-to-end-acknowledgements/
 			"""
 		required: false
 		type: object: options: enabled: {
@@ -336,7 +336,7 @@ base: components: sinks: aws_cloudwatch_metrics: configuration: {
 							adaptive: """
 															Concurrency is managed by Vector's [Adaptive Request Concurrency][arc] feature.
 
-															[arc]: https://vector.dev/docs/about/under-the-hood/networking/arc/
+															[arc]: https://vector.dev/docs/architecture/arc/
 															"""
 							none: """
 															A fixed concurrency of 1.
diff --git a/website/cue/reference/components/sinks/base/aws_kinesis_firehose.cue b/website/cue/reference/components/sinks/base/aws_kinesis_firehose.cue
index 301ba0b2a539c..1b2c6b5c00429 100644
--- a/website/cue/reference/components/sinks/base/aws_kinesis_firehose.cue
+++ b/website/cue/reference/components/sinks/base/aws_kinesis_firehose.cue
@@ -7,7 +7,7 @@ base: components: sinks: aws_kinesis_firehose: configuration: {
 
 			See [End-to-end Acknowledgements][e2e_acks] for more information on how event acknowledgement is handled.
 
-			[e2e_acks]: https://vector.dev/docs/about/under-the-hood/architecture/end-to-end-acknowledgements/
+			[e2e_acks]: https://vector.dev/docs/architecture/end-to-end-acknowledgements/
 			"""
 		required: false
 		type: object: options: enabled: {
@@ -684,7 +684,7 @@ base: components: sinks: aws_kinesis_firehose: configuration: {
 							adaptive: """
 															Concurrency is managed by Vector's [Adaptive Request Concurrency][arc] feature.
 
-															[arc]: https://vector.dev/docs/about/under-the-hood/networking/arc/
+															[arc]: https://vector.dev/docs/architecture/arc/
 															"""
 							none: """
 															A fixed concurrency of 1.
diff --git a/website/cue/reference/components/sinks/base/aws_kinesis_streams.cue b/website/cue/reference/components/sinks/base/aws_kinesis_streams.cue
index 09b182fd89994..ba0c0600b5c87 100644
--- a/website/cue/reference/components/sinks/base/aws_kinesis_streams.cue
+++ b/website/cue/reference/components/sinks/base/aws_kinesis_streams.cue
@@ -7,7 +7,7 @@ base: components: sinks: aws_kinesis_streams: configuration: {
 
 			See [End-to-end Acknowledgements][e2e_acks] for more information on how event acknowledgement is handled.
 
-			[e2e_acks]: https://vector.dev/docs/about/under-the-hood/architecture/end-to-end-acknowledgements/
+			[e2e_acks]: https://vector.dev/docs/architecture/end-to-end-acknowledgements/
 			"""
 		required: false
 		type: object: options: enabled: {
@@ -684,7 +684,7 @@ base: components: sinks: aws_kinesis_streams: configuration: {
 							adaptive: """
 															Concurrency is managed by Vector's [Adaptive Request Concurrency][arc] feature.
 
-															[arc]: https://vector.dev/docs/about/under-the-hood/networking/arc/
+															[arc]: https://vector.dev/docs/architecture/arc/
 															"""
 							none: """
 															A fixed concurrency of 1.
diff --git a/website/cue/reference/components/sinks/base/aws_s3.cue b/website/cue/reference/components/sinks/base/aws_s3.cue
index 6345607788038..cdb75c8307174 100644
--- a/website/cue/reference/components/sinks/base/aws_s3.cue
+++ b/website/cue/reference/components/sinks/base/aws_s3.cue
@@ -7,7 +7,7 @@ base: components: sinks: aws_s3: configuration: {
 
 			See [End-to-end Acknowledgements][e2e_acks] for more information on how event acknowledgement is handled.
 
-			[e2e_acks]: https://vector.dev/docs/about/under-the-hood/architecture/end-to-end-acknowledgements/
+			[e2e_acks]: https://vector.dev/docs/architecture/end-to-end-acknowledgements/
 			"""
 		required: false
 		type: object: options: enabled: {
@@ -957,7 +957,7 @@ base: components: sinks: aws_s3: configuration: {
 							adaptive: """
 															Concurrency is managed by Vector's [Adaptive Request Concurrency][arc] feature.
 
-															[arc]: https://vector.dev/docs/about/under-the-hood/networking/arc/
+															[arc]: https://vector.dev/docs/architecture/arc/
 															"""
 							none: """
 															A fixed concurrency of 1.
diff --git a/website/cue/reference/components/sinks/base/aws_sns.cue b/website/cue/reference/components/sinks/base/aws_sns.cue
index 107cfc7a8a7d8..3a1c649f63a00 100644
--- a/website/cue/reference/components/sinks/base/aws_sns.cue
+++ b/website/cue/reference/components/sinks/base/aws_sns.cue
@@ -7,7 +7,7 @@ base: components: sinks: aws_sns: configuration: {
 
 			See [End-to-end Acknowledgements][e2e_acks] for more information on how event acknowledgement is handled.
 
-			[e2e_acks]: https://vector.dev/docs/about/under-the-hood/architecture/end-to-end-acknowledgements/
+			[e2e_acks]: https://vector.dev/docs/architecture/end-to-end-acknowledgements/
 			"""
 		required: false
 		type: object: options: enabled: {
@@ -627,7 +627,7 @@ base: components: sinks: aws_sns: configuration: {
 							adaptive: """
 															Concurrency is managed by Vector's [Adaptive Request Concurrency][arc] feature.
 
-															[arc]: https://vector.dev/docs/about/under-the-hood/networking/arc/
+															[arc]: https://vector.dev/docs/architecture/arc/
 															"""
 							none: """
 															A fixed concurrency of 1.
diff --git a/website/cue/reference/components/sinks/base/aws_sqs.cue b/website/cue/reference/components/sinks/base/aws_sqs.cue
index b8a0ee23ccc10..98980124d2008 100644
--- a/website/cue/reference/components/sinks/base/aws_sqs.cue
+++ b/website/cue/reference/components/sinks/base/aws_sqs.cue
@@ -7,7 +7,7 @@ base: components: sinks: aws_sqs: configuration: {
 
 			See [End-to-end Acknowledgements][e2e_acks] for more information on how event acknowledgement is handled.
 
-			[e2e_acks]: https://vector.dev/docs/about/under-the-hood/architecture/end-to-end-acknowledgements/
+			[e2e_acks]: https://vector.dev/docs/architecture/end-to-end-acknowledgements/
 			"""
 		required: false
 		type: object: options: enabled: {
@@ -632,7 +632,7 @@ base: components: sinks: aws_sqs: configuration: {
 							adaptive: """
 															Concurrency is managed by Vector's [Adaptive Request Concurrency][arc] feature.
 
-															[arc]: https://vector.dev/docs/about/under-the-hood/networking/arc/
+															[arc]: https://vector.dev/docs/architecture/arc/
 															"""
 							none: """
 															A fixed concurrency of 1.
diff --git a/website/cue/reference/components/sinks/base/axiom.cue b/website/cue/reference/components/sinks/base/axiom.cue
index ce0f396bfac30..2ec4013d54db0 100644
--- a/website/cue/reference/components/sinks/base/axiom.cue
+++ b/website/cue/reference/components/sinks/base/axiom.cue
@@ -186,7 +186,7 @@ base: components: sinks: axiom: configuration: {
 							adaptive: """
 															Concurrency is managed by Vector's [Adaptive Request Concurrency][arc] feature.
 
-															[arc]: https://vector.dev/docs/about/under-the-hood/networking/arc/
+															[arc]: https://vector.dev/docs/architecture/arc/
 															"""
 							none: """
 															A fixed concurrency of 1.
diff --git a/website/cue/reference/components/sinks/base/azure_blob.cue b/website/cue/reference/components/sinks/base/azure_blob.cue
index 5fd082eed789c..366e0f8ad5c21 100644
--- a/website/cue/reference/components/sinks/base/azure_blob.cue
+++ b/website/cue/reference/components/sinks/base/azure_blob.cue
@@ -7,7 +7,7 @@ base: components: sinks: azure_blob: configuration: {
 
 			See [End-to-end Acknowledgements][e2e_acks] for more information on how event acknowledgement is handled.
 
-			[e2e_acks]: https://vector.dev/docs/about/under-the-hood/architecture/end-to-end-acknowledgements/
+			[e2e_acks]: https://vector.dev/docs/architecture/end-to-end-acknowledgements/
 			"""
 		required: false
 		type: object: options: enabled: {
@@ -690,7 +690,7 @@ base: components: sinks: azure_blob: configuration: {
 							adaptive: """
 															Concurrency is managed by Vector's [Adaptive Request Concurrency][arc] feature.
 
-															[arc]: https://vector.dev/docs/about/under-the-hood/networking/arc/
+															[arc]: https://vector.dev/docs/architecture/arc/
 															"""
 							none: """
 															A fixed concurrency of 1.
diff --git a/website/cue/reference/components/sinks/base/azure_monitor_logs.cue b/website/cue/reference/components/sinks/base/azure_monitor_logs.cue
index bce585a0c5325..873b08ceec446 100644
--- a/website/cue/reference/components/sinks/base/azure_monitor_logs.cue
+++ b/website/cue/reference/components/sinks/base/azure_monitor_logs.cue
@@ -7,7 +7,7 @@ base: components: sinks: azure_monitor_logs: configuration: {
 
 			See [End-to-end Acknowledgements][e2e_acks] for more information on how event acknowledgement is handled.
 
-			[e2e_acks]: https://vector.dev/docs/about/under-the-hood/architecture/end-to-end-acknowledgements/
+			[e2e_acks]: https://vector.dev/docs/architecture/end-to-end-acknowledgements/
 			"""
 		required: false
 		type: object: options: enabled: {
@@ -223,7 +223,7 @@ base: components: sinks: azure_monitor_logs: configuration: {
 							adaptive: """
 															Concurrency is managed by Vector's [Adaptive Request Concurrency][arc] feature.
 
-															[arc]: https://vector.dev/docs/about/under-the-hood/networking/arc/
+															[arc]: https://vector.dev/docs/architecture/arc/
 															"""
 							none: """
 															A fixed concurrency of 1.
diff --git a/website/cue/reference/components/sinks/base/blackhole.cue b/website/cue/reference/components/sinks/base/blackhole.cue
index 37da73bf150fd..8933f76469672 100644
--- a/website/cue/reference/components/sinks/base/blackhole.cue
+++ b/website/cue/reference/components/sinks/base/blackhole.cue
@@ -7,7 +7,7 @@ base: components: sinks: blackhole: configuration: {
 
 			See [End-to-end Acknowledgements][e2e_acks] for more information on how event acknowledgement is handled.
 
-			[e2e_acks]: https://vector.dev/docs/about/under-the-hood/architecture/end-to-end-acknowledgements/
+			[e2e_acks]: https://vector.dev/docs/architecture/end-to-end-acknowledgements/
 			"""
 		required: false
 		type: object: options: enabled: {
diff --git a/website/cue/reference/components/sinks/base/clickhouse.cue b/website/cue/reference/components/sinks/base/clickhouse.cue
index c4b97366ddd18..f5f973abe7347 100644
--- a/website/cue/reference/components/sinks/base/clickhouse.cue
+++ b/website/cue/reference/components/sinks/base/clickhouse.cue
@@ -7,7 +7,7 @@ base: components: sinks: clickhouse: configuration: {
 
 			See [End-to-end Acknowledgements][e2e_acks] for more information on how event acknowledgement is handled.
 
-			[e2e_acks]: https://vector.dev/docs/about/under-the-hood/architecture/end-to-end-acknowledgements/
+			[e2e_acks]: https://vector.dev/docs/architecture/end-to-end-acknowledgements/
 			"""
 		required: false
 		type: object: options: enabled: {
@@ -432,7 +432,7 @@ base: components: sinks: clickhouse: configuration: {
 							adaptive: """
 															Concurrency is managed by Vector's [Adaptive Request Concurrency][arc] feature.
 
-															[arc]: https://vector.dev/docs/about/under-the-hood/networking/arc/
+															[arc]: https://vector.dev/docs/architecture/arc/
 															"""
 							none: """
 															A fixed concurrency of 1.
diff --git a/website/cue/reference/components/sinks/base/console.cue b/website/cue/reference/components/sinks/base/console.cue
index acd35724c8d26..90fb7ef605736 100644
--- a/website/cue/reference/components/sinks/base/console.cue
+++ b/website/cue/reference/components/sinks/base/console.cue
@@ -7,7 +7,7 @@ base: components: sinks: console: configuration: {
 
 			See [End-to-end Acknowledgements][e2e_acks] for more information on how event acknowledgement is handled.
 
-			[e2e_acks]: https://vector.dev/docs/about/under-the-hood/architecture/end-to-end-acknowledgements/
+			[e2e_acks]: https://vector.dev/docs/architecture/end-to-end-acknowledgements/
 			"""
 		required: false
 		type: object: options: enabled: {
diff --git a/website/cue/reference/components/sinks/base/databend.cue b/website/cue/reference/components/sinks/base/databend.cue
index 4fc3a763ab059..eb9c2f3780c25 100644
--- a/website/cue/reference/components/sinks/base/databend.cue
+++ b/website/cue/reference/components/sinks/base/databend.cue
@@ -7,7 +7,7 @@ base: components: sinks: databend: configuration: {
 
 			See [End-to-end Acknowledgements][e2e_acks] for more information on how event acknowledgement is handled.
 
-			[e2e_acks]: https://vector.dev/docs/about/under-the-hood/architecture/end-to-end-acknowledgements/
+			[e2e_acks]: https://vector.dev/docs/architecture/end-to-end-acknowledgements/
 			"""
 		required: false
 		type: object: options: enabled: {
@@ -527,7 +527,7 @@ base: components: sinks: databend: configuration: {
 							adaptive: """
 															Concurrency is managed by Vector's [Adaptive Request Concurrency][arc] feature.
 
-															[arc]: https://vector.dev/docs/about/under-the-hood/networking/arc/
+															[arc]: https://vector.dev/docs/architecture/arc/
 															"""
 							none: """
 															A fixed concurrency of 1.
diff --git a/website/cue/reference/components/sinks/base/datadog_events.cue b/website/cue/reference/components/sinks/base/datadog_events.cue
index 0e4eb7ffee366..00874fb0bb387 100644
--- a/website/cue/reference/components/sinks/base/datadog_events.cue
+++ b/website/cue/reference/components/sinks/base/datadog_events.cue
@@ -7,7 +7,7 @@ base: components: sinks: datadog_events: configuration: {
 
 			See [End-to-end Acknowledgements][e2e_acks] for more information on how event acknowledgement is handled.
 
-			[e2e_acks]: https://vector.dev/docs/about/under-the-hood/architecture/end-to-end-acknowledgements/
+			[e2e_acks]: https://vector.dev/docs/architecture/end-to-end-acknowledgements/
 			"""
 		required: false
 		type: object: options: enabled: {
@@ -151,7 +151,7 @@ base: components: sinks: datadog_events: configuration: {
 							adaptive: """
 															Concurrency is managed by Vector's [Adaptive Request Concurrency][arc] feature.
 
-															[arc]: https://vector.dev/docs/about/under-the-hood/networking/arc/
+															[arc]: https://vector.dev/docs/architecture/arc/
 															"""
 							none: """
 															A fixed concurrency of 1.
diff --git a/website/cue/reference/components/sinks/base/datadog_logs.cue b/website/cue/reference/components/sinks/base/datadog_logs.cue
index 7f9853614b4d9..41214a77c99c0 100644
--- a/website/cue/reference/components/sinks/base/datadog_logs.cue
+++ b/website/cue/reference/components/sinks/base/datadog_logs.cue
@@ -7,7 +7,7 @@ base: components: sinks: datadog_logs: configuration: {
 
 			See [End-to-end Acknowledgements][e2e_acks] for more information on how event acknowledgement is handled.
 
-			[e2e_acks]: https://vector.dev/docs/about/under-the-hood/architecture/end-to-end-acknowledgements/
+			[e2e_acks]: https://vector.dev/docs/architecture/end-to-end-acknowledgements/
 			"""
 		required: false
 		type: object: options: enabled: {
@@ -249,7 +249,7 @@ base: components: sinks: datadog_logs: configuration: {
 							adaptive: """
 															Concurrency is managed by Vector's [Adaptive Request Concurrency][arc] feature.
 
-															[arc]: https://vector.dev/docs/about/under-the-hood/networking/arc/
+															[arc]: https://vector.dev/docs/architecture/arc/
 															"""
 							none: """
 															A fixed concurrency of 1.
diff --git a/website/cue/reference/components/sinks/base/datadog_metrics.cue b/website/cue/reference/components/sinks/base/datadog_metrics.cue
index 8acd1569f57f5..534dff6da40d5 100644
--- a/website/cue/reference/components/sinks/base/datadog_metrics.cue
+++ b/website/cue/reference/components/sinks/base/datadog_metrics.cue
@@ -7,7 +7,7 @@ base: components: sinks: datadog_metrics: configuration: {
 
 			See [End-to-end Acknowledgements][e2e_acks] for more information on how event acknowledgement is handled.
 
-			[e2e_acks]: https://vector.dev/docs/about/under-the-hood/architecture/end-to-end-acknowledgements/
+			[e2e_acks]: https://vector.dev/docs/architecture/end-to-end-acknowledgements/
 			"""
 		required: false
 		type: object: options: enabled: {
@@ -193,7 +193,7 @@ base: components: sinks: datadog_metrics: configuration: {
 							adaptive: """
 															Concurrency is managed by Vector's [Adaptive Request Concurrency][arc] feature.
 
-															[arc]: https://vector.dev/docs/about/under-the-hood/networking/arc/
+															[arc]: https://vector.dev/docs/architecture/arc/
 															"""
 							none: """
 															A fixed concurrency of 1.
diff --git a/website/cue/reference/components/sinks/base/datadog_traces.cue b/website/cue/reference/components/sinks/base/datadog_traces.cue
index c60bd879e881e..7c1d038d09aa9 100644
--- a/website/cue/reference/components/sinks/base/datadog_traces.cue
+++ b/website/cue/reference/components/sinks/base/datadog_traces.cue
@@ -7,7 +7,7 @@ base: components: sinks: datadog_traces: configuration: {
 
 			See [End-to-end Acknowledgements][e2e_acks] for more information on how event acknowledgement is handled.
 
-			[e2e_acks]: https://vector.dev/docs/about/under-the-hood/architecture/end-to-end-acknowledgements/
+			[e2e_acks]: https://vector.dev/docs/architecture/end-to-end-acknowledgements/
 			"""
 		required: false
 		type: object: options: enabled: {
@@ -217,7 +217,7 @@ base: components: sinks: datadog_traces: configuration: {
 							adaptive: """
 															Concurrency is managed by Vector's [Adaptive Request Concurrency][arc] feature.
 
-															[arc]: https://vector.dev/docs/about/under-the-hood/networking/arc/
+															[arc]: https://vector.dev/docs/architecture/arc/
 															"""
 							none: """
 															A fixed concurrency of 1.
diff --git a/website/cue/reference/components/sinks/base/elasticsearch.cue b/website/cue/reference/components/sinks/base/elasticsearch.cue
index 495f8d231752d..315ae9baa09c4 100644
--- a/website/cue/reference/components/sinks/base/elasticsearch.cue
+++ b/website/cue/reference/components/sinks/base/elasticsearch.cue
@@ -7,7 +7,7 @@ base: components: sinks: elasticsearch: configuration: {
 
 			See [End-to-end Acknowledgements][e2e_acks] for more information on how event acknowledgement is handled.
 
-			[e2e_acks]: https://vector.dev/docs/about/under-the-hood/architecture/end-to-end-acknowledgements/
+			[e2e_acks]: https://vector.dev/docs/architecture/end-to-end-acknowledgements/
 			"""
 		required: false
 		type: object: options: enabled: {
@@ -727,7 +727,7 @@ base: components: sinks: elasticsearch: configuration: {
 							adaptive: """
 															Concurrency is managed by Vector's [Adaptive Request Concurrency][arc] feature.
 
-															[arc]: https://vector.dev/docs/about/under-the-hood/networking/arc/
+															[arc]: https://vector.dev/docs/architecture/arc/
 															"""
 							none: """
 															A fixed concurrency of 1.
diff --git a/website/cue/reference/components/sinks/base/file.cue b/website/cue/reference/components/sinks/base/file.cue
index bcd793427b2f4..1a044fe961f25 100644
--- a/website/cue/reference/components/sinks/base/file.cue
+++ b/website/cue/reference/components/sinks/base/file.cue
@@ -7,7 +7,7 @@ base: components: sinks: file: configuration: {
 
 			See [End-to-end Acknowledgements][e2e_acks] for more information on how event acknowledgement is handled.
 
-			[e2e_acks]: https://vector.dev/docs/about/under-the-hood/architecture/end-to-end-acknowledgements/
+			[e2e_acks]: https://vector.dev/docs/architecture/end-to-end-acknowledgements/
 			"""
 		required: false
 		type: object: options: enabled: {
diff --git a/website/cue/reference/components/sinks/base/gcp_chronicle_unstructured.cue b/website/cue/reference/components/sinks/base/gcp_chronicle_unstructured.cue
index 57a747fd21cb8..0a455d7039cd8 100644
--- a/website/cue/reference/components/sinks/base/gcp_chronicle_unstructured.cue
+++ b/website/cue/reference/components/sinks/base/gcp_chronicle_unstructured.cue
@@ -7,7 +7,7 @@ base: components: sinks: gcp_chronicle_unstructured: configuration: {
 
 			See [End-to-end Acknowledgements][e2e_acks] for more information on how event acknowledgement is handled.
 
-			[e2e_acks]: https://vector.dev/docs/about/under-the-hood/architecture/end-to-end-acknowledgements/
+			[e2e_acks]: https://vector.dev/docs/architecture/end-to-end-acknowledgements/
 			"""
 		required: false
 		type: object: options: enabled: {
@@ -629,7 +629,7 @@ base: components: sinks: gcp_chronicle_unstructured: configuration: {
 							adaptive: """
 															Concurrency is managed by Vector's [Adaptive Request Concurrency][arc] feature.
 
-															[arc]: https://vector.dev/docs/about/under-the-hood/networking/arc/
+															[arc]: https://vector.dev/docs/architecture/arc/
 															"""
 							none: """
 															A fixed concurrency of 1.
diff --git a/website/cue/reference/components/sinks/base/gcp_cloud_storage.cue b/website/cue/reference/components/sinks/base/gcp_cloud_storage.cue
index 0a0b423693bef..6fa1fcbd03484 100644
--- a/website/cue/reference/components/sinks/base/gcp_cloud_storage.cue
+++ b/website/cue/reference/components/sinks/base/gcp_cloud_storage.cue
@@ -7,7 +7,7 @@ base: components: sinks: gcp_cloud_storage: configuration: {
 
 			See [End-to-end Acknowledgements][e2e_acks] for more information on how event acknowledgement is handled.
 
-			[e2e_acks]: https://vector.dev/docs/about/under-the-hood/architecture/end-to-end-acknowledgements/
+			[e2e_acks]: https://vector.dev/docs/architecture/end-to-end-acknowledgements/
 			"""
 		required: false
 		type: object: options: enabled: {
@@ -770,7 +770,7 @@ base: components: sinks: gcp_cloud_storage: configuration: {
 							adaptive: """
 															Concurrency is managed by Vector's [Adaptive Request Concurrency][arc] feature.
 
-															[arc]: https://vector.dev/docs/about/under-the-hood/networking/arc/
+															[arc]: https://vector.dev/docs/architecture/arc/
 															"""
 							none: """
 															A fixed concurrency of 1.
diff --git a/website/cue/reference/components/sinks/base/gcp_pubsub.cue b/website/cue/reference/components/sinks/base/gcp_pubsub.cue
index 5db694873ebce..7c3cc3db1abd1 100644
--- a/website/cue/reference/components/sinks/base/gcp_pubsub.cue
+++ b/website/cue/reference/components/sinks/base/gcp_pubsub.cue
@@ -7,7 +7,7 @@ base: components: sinks: gcp_pubsub: configuration: {
 
 			See [End-to-end Acknowledgements][e2e_acks] for more information on how event acknowledgement is handled.
 
-			[e2e_acks]: https://vector.dev/docs/about/under-the-hood/architecture/end-to-end-acknowledgements/
+			[e2e_acks]: https://vector.dev/docs/architecture/end-to-end-acknowledgements/
 			"""
 		required: false
 		type: object: options: enabled: {
@@ -559,7 +559,7 @@ base: components: sinks: gcp_pubsub: configuration: {
 							adaptive: """
 															Concurrency is managed by Vector's [Adaptive Request Concurrency][arc] feature.
 
-															[arc]: https://vector.dev/docs/about/under-the-hood/networking/arc/
+															[arc]: https://vector.dev/docs/architecture/arc/
 															"""
 							none: """
 															A fixed concurrency of 1.
diff --git a/website/cue/reference/components/sinks/base/gcp_stackdriver_logs.cue b/website/cue/reference/components/sinks/base/gcp_stackdriver_logs.cue
index e313a849aa81f..b241468a327ab 100644
--- a/website/cue/reference/components/sinks/base/gcp_stackdriver_logs.cue
+++ b/website/cue/reference/components/sinks/base/gcp_stackdriver_logs.cue
@@ -7,7 +7,7 @@ base: components: sinks: gcp_stackdriver_logs: configuration: {
 
 			See [End-to-end Acknowledgements][e2e_acks] for more information on how event acknowledgement is handled.
 
-			[e2e_acks]: https://vector.dev/docs/about/under-the-hood/architecture/end-to-end-acknowledgements/
+			[e2e_acks]: https://vector.dev/docs/architecture/end-to-end-acknowledgements/
 			"""
 		required: false
 		type: object: options: enabled: {
@@ -295,7 +295,7 @@ base: components: sinks: gcp_stackdriver_logs: configuration: {
 							adaptive: """
 															Concurrency is managed by Vector's [Adaptive Request Concurrency][arc] feature.
 
-															[arc]: https://vector.dev/docs/about/under-the-hood/networking/arc/
+															[arc]: https://vector.dev/docs/architecture/arc/
 															"""
 							none: """
 															A fixed concurrency of 1.
diff --git a/website/cue/reference/components/sinks/base/gcp_stackdriver_metrics.cue b/website/cue/reference/components/sinks/base/gcp_stackdriver_metrics.cue
index 1e1703d6b0820..3ca9ac2ae022f 100644
--- a/website/cue/reference/components/sinks/base/gcp_stackdriver_metrics.cue
+++ b/website/cue/reference/components/sinks/base/gcp_stackdriver_metrics.cue
@@ -7,7 +7,7 @@ base: components: sinks: gcp_stackdriver_metrics: configuration: {
 
 			See [End-to-end Acknowledgements][e2e_acks] for more information on how event acknowledgement is handled.
 
-			[e2e_acks]: https://vector.dev/docs/about/under-the-hood/architecture/end-to-end-acknowledgements/
+			[e2e_acks]: https://vector.dev/docs/architecture/end-to-end-acknowledgements/
 			"""
 		required: false
 		type: object: options: enabled: {
@@ -207,7 +207,7 @@ base: components: sinks: gcp_stackdriver_metrics: configuration: {
 							adaptive: """
 															Concurrency is managed by Vector's [Adaptive Request Concurrency][arc] feature.
 
-															[arc]: https://vector.dev/docs/about/under-the-hood/networking/arc/
+															[arc]: https://vector.dev/docs/architecture/arc/
 															"""
 							none: """
 															A fixed concurrency of 1.
diff --git a/website/cue/reference/components/sinks/base/greptimedb.cue b/website/cue/reference/components/sinks/base/greptimedb.cue
index 29cd94ff45e41..5778c92c726f8 100644
--- a/website/cue/reference/components/sinks/base/greptimedb.cue
+++ b/website/cue/reference/components/sinks/base/greptimedb.cue
@@ -7,7 +7,7 @@ base: components: sinks: greptimedb: configuration: {
 
 			See [End-to-end Acknowledgements][e2e_acks] for more information on how event acknowledgement is handled.
 
-			[e2e_acks]: https://vector.dev/docs/about/under-the-hood/architecture/end-to-end-acknowledgements/
+			[e2e_acks]: https://vector.dev/docs/architecture/end-to-end-acknowledgements/
 			"""
 		required: false
 		type: object: options: enabled: {
@@ -227,7 +227,7 @@ base: components: sinks: greptimedb: configuration: {
 							adaptive: """
 															Concurrency is managed by Vector's [Adaptive Request Concurrency][arc] feature.
 
-															[arc]: https://vector.dev/docs/about/under-the-hood/networking/arc/
+															[arc]: https://vector.dev/docs/architecture/arc/
 															"""
 							none: """
 															A fixed concurrency of 1.
diff --git a/website/cue/reference/components/sinks/base/greptimedb_logs.cue b/website/cue/reference/components/sinks/base/greptimedb_logs.cue
index 777f9890bab87..45c819d00708f 100644
--- a/website/cue/reference/components/sinks/base/greptimedb_logs.cue
+++ b/website/cue/reference/components/sinks/base/greptimedb_logs.cue
@@ -7,7 +7,7 @@ base: components: sinks: greptimedb_logs: configuration: {
 
 			See [End-to-end Acknowledgements][e2e_acks] for more information on how event acknowledgement is handled.
 
-			[e2e_acks]: https://vector.dev/docs/about/under-the-hood/architecture/end-to-end-acknowledgements/
+			[e2e_acks]: https://vector.dev/docs/architecture/end-to-end-acknowledgements/
 			"""
 		required: false
 		type: object: options: enabled: {
@@ -300,7 +300,7 @@ base: components: sinks: greptimedb_logs: configuration: {
 							adaptive: """
 															Concurrency is managed by Vector's [Adaptive Request Concurrency][arc] feature.
 
-															[arc]: https://vector.dev/docs/about/under-the-hood/networking/arc/
+															[arc]: https://vector.dev/docs/architecture/arc/
 															"""
 							none: """
 															A fixed concurrency of 1.
diff --git a/website/cue/reference/components/sinks/base/greptimedb_metrics.cue b/website/cue/reference/components/sinks/base/greptimedb_metrics.cue
index be9d9ae854a7b..449f6d1006c1e 100644
--- a/website/cue/reference/components/sinks/base/greptimedb_metrics.cue
+++ b/website/cue/reference/components/sinks/base/greptimedb_metrics.cue
@@ -7,7 +7,7 @@ base: components: sinks: greptimedb_metrics: configuration: {
 
 			See [End-to-end Acknowledgements][e2e_acks] for more information on how event acknowledgement is handled.
 
-			[e2e_acks]: https://vector.dev/docs/about/under-the-hood/architecture/end-to-end-acknowledgements/
+			[e2e_acks]: https://vector.dev/docs/architecture/end-to-end-acknowledgements/
 			"""
 		required: false
 		type: object: options: enabled: {
@@ -227,7 +227,7 @@ base: components: sinks: greptimedb_metrics: configuration: {
 							adaptive: """
 															Concurrency is managed by Vector's [Adaptive Request Concurrency][arc] feature.
 
-															[arc]: https://vector.dev/docs/about/under-the-hood/networking/arc/
+															[arc]: https://vector.dev/docs/architecture/arc/
 															"""
 							none: """
 															A fixed concurrency of 1.
diff --git a/website/cue/reference/components/sinks/base/honeycomb.cue b/website/cue/reference/components/sinks/base/honeycomb.cue
index 0834f68ac4aea..746c5c67f7e81 100644
--- a/website/cue/reference/components/sinks/base/honeycomb.cue
+++ b/website/cue/reference/components/sinks/base/honeycomb.cue
@@ -7,7 +7,7 @@ base: components: sinks: honeycomb: configuration: {
 
 			See [End-to-end Acknowledgements][e2e_acks] for more information on how event acknowledgement is handled.
 
-			[e2e_acks]: https://vector.dev/docs/about/under-the-hood/architecture/end-to-end-acknowledgements/
+			[e2e_acks]: https://vector.dev/docs/architecture/end-to-end-acknowledgements/
 			"""
 		required: false
 		type: object: options: enabled: {
@@ -230,7 +230,7 @@ base: components: sinks: honeycomb: configuration: {
 							adaptive: """
 															Concurrency is managed by Vector's [Adaptive Request Concurrency][arc] feature.
 
-															[arc]: https://vector.dev/docs/about/under-the-hood/networking/arc/
+															[arc]: https://vector.dev/docs/architecture/arc/
 															"""
 							none: """
 															A fixed concurrency of 1.
diff --git a/website/cue/reference/components/sinks/base/http.cue b/website/cue/reference/components/sinks/base/http.cue
index b041227f5b55a..eb4ae90d2310a 100644
--- a/website/cue/reference/components/sinks/base/http.cue
+++ b/website/cue/reference/components/sinks/base/http.cue
@@ -7,7 +7,7 @@ base: components: sinks: http: configuration: {
 
 			See [End-to-end Acknowledgements][e2e_acks] for more information on how event acknowledgement is handled.
 
-			[e2e_acks]: https://vector.dev/docs/about/under-the-hood/architecture/end-to-end-acknowledgements/
+			[e2e_acks]: https://vector.dev/docs/architecture/end-to-end-acknowledgements/
 			"""
 		required: false
 		type: object: options: enabled: {
@@ -822,7 +822,7 @@ base: components: sinks: http: configuration: {
 							adaptive: """
 															Concurrency is managed by Vector's [Adaptive Request Concurrency][arc] feature.
 
-															[arc]: https://vector.dev/docs/about/under-the-hood/networking/arc/
+															[arc]: https://vector.dev/docs/architecture/arc/
 															"""
 							none: """
 															A fixed concurrency of 1.
diff --git a/website/cue/reference/components/sinks/base/humio_logs.cue b/website/cue/reference/components/sinks/base/humio_logs.cue
index 546a244d84959..ea5149ec5501b 100644
--- a/website/cue/reference/components/sinks/base/humio_logs.cue
+++ b/website/cue/reference/components/sinks/base/humio_logs.cue
@@ -7,7 +7,7 @@ base: components: sinks: humio_logs: configuration: {
 
 			See [End-to-end Acknowledgements][e2e_acks] for more information on how event acknowledgement is handled.
 
-			[e2e_acks]: https://vector.dev/docs/about/under-the-hood/architecture/end-to-end-acknowledgements/
+			[e2e_acks]: https://vector.dev/docs/architecture/end-to-end-acknowledgements/
 			"""
 		required: false
 		type: object: options: enabled: {
@@ -609,7 +609,7 @@ base: components: sinks: humio_logs: configuration: {
 							adaptive: """
 															Concurrency is managed by Vector's [Adaptive Request Concurrency][arc] feature.
 
-															[arc]: https://vector.dev/docs/about/under-the-hood/networking/arc/
+															[arc]: https://vector.dev/docs/architecture/arc/
 															"""
 							none: """
 															A fixed concurrency of 1.
diff --git a/website/cue/reference/components/sinks/base/humio_metrics.cue b/website/cue/reference/components/sinks/base/humio_metrics.cue
index fd0e65f6daa6b..1164b8f3ddf7d 100644
--- a/website/cue/reference/components/sinks/base/humio_metrics.cue
+++ b/website/cue/reference/components/sinks/base/humio_metrics.cue
@@ -7,7 +7,7 @@ base: components: sinks: humio_metrics: configuration: {
 
 			See [End-to-end Acknowledgements][e2e_acks] for more information on how event acknowledgement is handled.
 
-			[e2e_acks]: https://vector.dev/docs/about/under-the-hood/architecture/end-to-end-acknowledgements/
+			[e2e_acks]: https://vector.dev/docs/architecture/end-to-end-acknowledgements/
 			"""
 		required: false
 		type: object: options: enabled: {
@@ -296,7 +296,7 @@ base: components: sinks: humio_metrics: configuration: {
 							adaptive: """
 															Concurrency is managed by Vector's [Adaptive Request Concurrency][arc] feature.
 
-															[arc]: https://vector.dev/docs/about/under-the-hood/networking/arc/
+															[arc]: https://vector.dev/docs/architecture/arc/
 															"""
 							none: """
 															A fixed concurrency of 1.
diff --git a/website/cue/reference/components/sinks/base/influxdb_logs.cue b/website/cue/reference/components/sinks/base/influxdb_logs.cue
index f8885c040730f..ca732f248ecd0 100644
--- a/website/cue/reference/components/sinks/base/influxdb_logs.cue
+++ b/website/cue/reference/components/sinks/base/influxdb_logs.cue
@@ -7,7 +7,7 @@ base: components: sinks: influxdb_logs: configuration: {
 
 			See [End-to-end Acknowledgements][e2e_acks] for more information on how event acknowledgement is handled.
 
-			[e2e_acks]: https://vector.dev/docs/about/under-the-hood/architecture/end-to-end-acknowledgements/
+			[e2e_acks]: https://vector.dev/docs/architecture/end-to-end-acknowledgements/
 			"""
 		required: false
 		type: object: options: enabled: {
@@ -272,7 +272,7 @@ base: components: sinks: influxdb_logs: configuration: {
 							adaptive: """
 															Concurrency is managed by Vector's [Adaptive Request Concurrency][arc] feature.
 
-															[arc]: https://vector.dev/docs/about/under-the-hood/networking/arc/
+															[arc]: https://vector.dev/docs/architecture/arc/
 															"""
 							none: """
 															A fixed concurrency of 1.
diff --git a/website/cue/reference/components/sinks/base/influxdb_metrics.cue b/website/cue/reference/components/sinks/base/influxdb_metrics.cue
index 093b79ba83e41..923040ab022cc 100644
--- a/website/cue/reference/components/sinks/base/influxdb_metrics.cue
+++ b/website/cue/reference/components/sinks/base/influxdb_metrics.cue
@@ -7,7 +7,7 @@ base: components: sinks: influxdb_metrics: configuration: {
 
 			See [End-to-end Acknowledgements][e2e_acks] for more information on how event acknowledgement is handled.
 
-			[e2e_acks]: https://vector.dev/docs/about/under-the-hood/architecture/end-to-end-acknowledgements/
+			[e2e_acks]: https://vector.dev/docs/architecture/end-to-end-acknowledgements/
 			"""
 		required: false
 		type: object: options: enabled: {
@@ -226,7 +226,7 @@ base: components: sinks: influxdb_metrics: configuration: {
 							adaptive: """
 															Concurrency is managed by Vector's [Adaptive Request Concurrency][arc] feature.
 
-															[arc]: https://vector.dev/docs/about/under-the-hood/networking/arc/
+															[arc]: https://vector.dev/docs/architecture/arc/
 															"""
 							none: """
 															A fixed concurrency of 1.
diff --git a/website/cue/reference/components/sinks/base/kafka.cue b/website/cue/reference/components/sinks/base/kafka.cue
index 97fecdbb2d2d3..8185b93ab475a 100644
--- a/website/cue/reference/components/sinks/base/kafka.cue
+++ b/website/cue/reference/components/sinks/base/kafka.cue
@@ -7,7 +7,7 @@ base: components: sinks: kafka: configuration: {
 
 			See [End-to-end Acknowledgements][e2e_acks] for more information on how event acknowledgement is handled.
 
-			[e2e_acks]: https://vector.dev/docs/about/under-the-hood/architecture/end-to-end-acknowledgements/
+			[e2e_acks]: https://vector.dev/docs/architecture/end-to-end-acknowledgements/
 			"""
 		required: false
 		type: object: options: enabled: {
diff --git a/website/cue/reference/components/sinks/base/keep.cue b/website/cue/reference/components/sinks/base/keep.cue
index 3cae9b1b1cbfe..dafd596340e5f 100644
--- a/website/cue/reference/components/sinks/base/keep.cue
+++ b/website/cue/reference/components/sinks/base/keep.cue
@@ -7,7 +7,7 @@ base: components: sinks: keep: configuration: {
 
 			See [End-to-end Acknowledgements][e2e_acks] for more information on how event acknowledgement is handled.
 
-			[e2e_acks]: https://vector.dev/docs/about/under-the-hood/architecture/end-to-end-acknowledgements/
+			[e2e_acks]: https://vector.dev/docs/architecture/end-to-end-acknowledgements/
 			"""
 		required: false
 		type: object: options: enabled: {
@@ -195,7 +195,7 @@ base: components: sinks: keep: configuration: {
 							adaptive: """
 															Concurrency is managed by Vector's [Adaptive Request Concurrency][arc] feature.
 
-															[arc]: https://vector.dev/docs/about/under-the-hood/networking/arc/
+															[arc]: https://vector.dev/docs/architecture/arc/
 															"""
 							none: """
 															A fixed concurrency of 1.
diff --git a/website/cue/reference/components/sinks/base/logdna.cue b/website/cue/reference/components/sinks/base/logdna.cue
index 63f3d81553417..44e09e3ede058 100644
--- a/website/cue/reference/components/sinks/base/logdna.cue
+++ b/website/cue/reference/components/sinks/base/logdna.cue
@@ -7,7 +7,7 @@ base: components: sinks: logdna: configuration: {
 
 			See [End-to-end Acknowledgements][e2e_acks] for more information on how event acknowledgement is handled.
 
-			[e2e_acks]: https://vector.dev/docs/about/under-the-hood/architecture/end-to-end-acknowledgements/
+			[e2e_acks]: https://vector.dev/docs/architecture/end-to-end-acknowledgements/
 			"""
 		required: false
 		type: object: options: enabled: {
@@ -235,7 +235,7 @@ base: components: sinks: logdna: configuration: {
 							adaptive: """
 															Concurrency is managed by Vector's [Adaptive Request Concurrency][arc] feature.
 
-															[arc]: https://vector.dev/docs/about/under-the-hood/networking/arc/
+															[arc]: https://vector.dev/docs/architecture/arc/
 															"""
 							none: """
 															A fixed concurrency of 1.
diff --git a/website/cue/reference/components/sinks/base/loki.cue b/website/cue/reference/components/sinks/base/loki.cue
index 4dc8d00fcf13f..310f0e52ff5d8 100644
--- a/website/cue/reference/components/sinks/base/loki.cue
+++ b/website/cue/reference/components/sinks/base/loki.cue
@@ -7,7 +7,7 @@ base: components: sinks: loki: configuration: {
 
 			See [End-to-end Acknowledgements][e2e_acks] for more information on how event acknowledgement is handled.
 
-			[e2e_acks]: https://vector.dev/docs/about/under-the-hood/architecture/end-to-end-acknowledgements/
+			[e2e_acks]: https://vector.dev/docs/architecture/end-to-end-acknowledgements/
 			"""
 		required: false
 		type: object: options: enabled: {
@@ -807,7 +807,7 @@ base: components: sinks: loki: configuration: {
 							adaptive: """
 															Concurrency is managed by Vector's [Adaptive Request Concurrency][arc] feature.
 
-															[arc]: https://vector.dev/docs/about/under-the-hood/networking/arc/
+															[arc]: https://vector.dev/docs/architecture/arc/
 															"""
 							none: """
 															A fixed concurrency of 1.
diff --git a/website/cue/reference/components/sinks/base/mezmo.cue b/website/cue/reference/components/sinks/base/mezmo.cue
index 8a8eefb22732f..9a65e23994934 100644
--- a/website/cue/reference/components/sinks/base/mezmo.cue
+++ b/website/cue/reference/components/sinks/base/mezmo.cue
@@ -7,7 +7,7 @@ base: components: sinks: mezmo: configuration: {
 
 			See [End-to-end Acknowledgements][e2e_acks] for more information on how event acknowledgement is handled.
 
-			[e2e_acks]: https://vector.dev/docs/about/under-the-hood/architecture/end-to-end-acknowledgements/
+			[e2e_acks]: https://vector.dev/docs/architecture/end-to-end-acknowledgements/
 			"""
 		required: false
 		type: object: options: enabled: {
@@ -235,7 +235,7 @@ base: components: sinks: mezmo: configuration: {
 							adaptive: """
 															Concurrency is managed by Vector's [Adaptive Request Concurrency][arc] feature.
 
-															[arc]: https://vector.dev/docs/about/under-the-hood/networking/arc/
+															[arc]: https://vector.dev/docs/architecture/arc/
 															"""
 							none: """
 															A fixed concurrency of 1.
diff --git a/website/cue/reference/components/sinks/base/mqtt.cue b/website/cue/reference/components/sinks/base/mqtt.cue
index c8f4ed9bd1fed..d82b40c6c1b6f 100644
--- a/website/cue/reference/components/sinks/base/mqtt.cue
+++ b/website/cue/reference/components/sinks/base/mqtt.cue
@@ -7,7 +7,7 @@ base: components: sinks: mqtt: configuration: {
 
 			See [End-to-end Acknowledgements][e2e_acks] for more information on how event acknowledgement is handled.
 
-			[e2e_acks]: https://vector.dev/docs/about/under-the-hood/architecture/end-to-end-acknowledgements/
+			[e2e_acks]: https://vector.dev/docs/architecture/end-to-end-acknowledgements/
 			"""
 		required: false
 		type: object: options: enabled: {
diff --git a/website/cue/reference/components/sinks/base/nats.cue b/website/cue/reference/components/sinks/base/nats.cue
index 8cf579f6a2e3b..4b76d7be071c5 100644
--- a/website/cue/reference/components/sinks/base/nats.cue
+++ b/website/cue/reference/components/sinks/base/nats.cue
@@ -7,7 +7,7 @@ base: components: sinks: nats: configuration: {
 
 			See [End-to-end Acknowledgements][e2e_acks] for more information on how event acknowledgement is handled.
 
-			[e2e_acks]: https://vector.dev/docs/about/under-the-hood/architecture/end-to-end-acknowledgements/
+			[e2e_acks]: https://vector.dev/docs/architecture/end-to-end-acknowledgements/
 			"""
 		required: false
 		type: object: options: enabled: {
@@ -581,7 +581,7 @@ base: components: sinks: nats: configuration: {
 							adaptive: """
 															Concurrency is managed by Vector's [Adaptive Request Concurrency][arc] feature.
 
-															[arc]: https://vector.dev/docs/about/under-the-hood/networking/arc/
+															[arc]: https://vector.dev/docs/architecture/arc/
 															"""
 							none: """
 															A fixed concurrency of 1.
diff --git a/website/cue/reference/components/sinks/base/new_relic.cue b/website/cue/reference/components/sinks/base/new_relic.cue
index 7e3895b02cd27..64b753cf3995f 100644
--- a/website/cue/reference/components/sinks/base/new_relic.cue
+++ b/website/cue/reference/components/sinks/base/new_relic.cue
@@ -12,7 +12,7 @@ base: components: sinks: new_relic: configuration: {
 
 			See [End-to-end Acknowledgements][e2e_acks] for more information on how event acknowledgement is handled.
 
-			[e2e_acks]: https://vector.dev/docs/about/under-the-hood/architecture/end-to-end-acknowledgements/
+			[e2e_acks]: https://vector.dev/docs/architecture/end-to-end-acknowledgements/
 			"""
 		required: false
 		type: object: options: enabled: {
@@ -246,7 +246,7 @@ base: components: sinks: new_relic: configuration: {
 							adaptive: """
 															Concurrency is managed by Vector's [Adaptive Request Concurrency][arc] feature.
 
-															[arc]: https://vector.dev/docs/about/under-the-hood/networking/arc/
+															[arc]: https://vector.dev/docs/architecture/arc/
 															"""
 							none: """
 															A fixed concurrency of 1.
diff --git a/website/cue/reference/components/sinks/base/opentelemetry.cue b/website/cue/reference/components/sinks/base/opentelemetry.cue
index 14ddde902e9d7..42c45813c44ba 100644
--- a/website/cue/reference/components/sinks/base/opentelemetry.cue
+++ b/website/cue/reference/components/sinks/base/opentelemetry.cue
@@ -10,7 +10,7 @@ base: components: sinks: opentelemetry: configuration: protocol: {
 
 				See [End-to-end Acknowledgements][e2e_acks] for more information on how event acknowledgement is handled.
 
-				[e2e_acks]: https://vector.dev/docs/about/under-the-hood/architecture/end-to-end-acknowledgements/
+				[e2e_acks]: https://vector.dev/docs/architecture/end-to-end-acknowledgements/
 				"""
 			required: false
 			type: object: options: enabled: {
@@ -823,7 +823,7 @@ base: components: sinks: opentelemetry: configuration: protocol: {
 								adaptive: """
 																			Concurrency is managed by Vector's [Adaptive Request Concurrency][arc] feature.
 
-																			[arc]: https://vector.dev/docs/about/under-the-hood/networking/arc/
+																			[arc]: https://vector.dev/docs/architecture/arc/
 																			"""
 								none: """
 																			A fixed concurrency of 1.
diff --git a/website/cue/reference/components/sinks/base/papertrail.cue b/website/cue/reference/components/sinks/base/papertrail.cue
index b20c940cad1f5..7118a99bb283a 100644
--- a/website/cue/reference/components/sinks/base/papertrail.cue
+++ b/website/cue/reference/components/sinks/base/papertrail.cue
@@ -7,7 +7,7 @@ base: components: sinks: papertrail: configuration: {
 
 			See [End-to-end Acknowledgements][e2e_acks] for more information on how event acknowledgement is handled.
 
-			[e2e_acks]: https://vector.dev/docs/about/under-the-hood/architecture/end-to-end-acknowledgements/
+			[e2e_acks]: https://vector.dev/docs/architecture/end-to-end-acknowledgements/
 			"""
 		required: false
 		type: object: options: enabled: {
diff --git a/website/cue/reference/components/sinks/base/postgres.cue b/website/cue/reference/components/sinks/base/postgres.cue
index d3fa9af9d9e52..d7b4b32aee92a 100644
--- a/website/cue/reference/components/sinks/base/postgres.cue
+++ b/website/cue/reference/components/sinks/base/postgres.cue
@@ -7,7 +7,7 @@ base: components: sinks: postgres: configuration: {
 
 			See [End-to-end Acknowledgements][e2e_acks] for more information on how event acknowledgement is handled.
 
-			[e2e_acks]: https://vector.dev/docs/about/under-the-hood/architecture/end-to-end-acknowledgements/
+			[e2e_acks]: https://vector.dev/docs/architecture/end-to-end-acknowledgements/
 			"""
 		required: false
 		type: object: options: enabled: {
@@ -182,7 +182,7 @@ base: components: sinks: postgres: configuration: {
 							adaptive: """
 															Concurrency is managed by Vector's [Adaptive Request Concurrency][arc] feature.
 
-															[arc]: https://vector.dev/docs/about/under-the-hood/networking/arc/
+															[arc]: https://vector.dev/docs/architecture/arc/
 															"""
 							none: """
 															A fixed concurrency of 1.
diff --git a/website/cue/reference/components/sinks/base/prometheus_exporter.cue b/website/cue/reference/components/sinks/base/prometheus_exporter.cue
index 50f16c511e1a9..7c4dbf04f502e 100644
--- a/website/cue/reference/components/sinks/base/prometheus_exporter.cue
+++ b/website/cue/reference/components/sinks/base/prometheus_exporter.cue
@@ -7,7 +7,7 @@ base: components: sinks: prometheus_exporter: configuration: {
 
 			See [End-to-end Acknowledgements][e2e_acks] for more information on how event acknowledgement is handled.
 
-			[e2e_acks]: https://vector.dev/docs/about/under-the-hood/architecture/end-to-end-acknowledgements/
+			[e2e_acks]: https://vector.dev/docs/architecture/end-to-end-acknowledgements/
 			"""
 		required: false
 		type: object: options: enabled: {
@@ -220,7 +220,7 @@ base: components: sinks: prometheus_exporter: configuration: {
 		description: """
 			Default buckets to use for aggregating [distribution][dist_metric_docs] metrics into histograms.
 
-			[dist_metric_docs]: https://vector.dev/docs/about/under-the-hood/architecture/data-model/metric/#distribution
+			[dist_metric_docs]: https://vector.dev/docs/architecture/data-model/metric/#distribution
 			"""
 		required: false
 		type: array: {
@@ -250,7 +250,7 @@ base: components: sinks: prometheus_exporter: configuration: {
 			metric is supported, Prometheus clients (the application being scraped, which is this sink) must
 			aggregate locally into either an aggregated histogram or aggregated summary.
 
-			[dist_metric_docs]: https://vector.dev/docs/about/under-the-hood/architecture/data-model/metric/#distribution
+			[dist_metric_docs]: https://vector.dev/docs/architecture/data-model/metric/#distribution
 			[prom_agg_hist_docs]: https://prometheus.io/docs/concepts/metric_types/#histogram
 			[prom_agg_summ_docs]: https://prometheus.io/docs/concepts/metric_types/#summary
 			"""
@@ -276,7 +276,7 @@ base: components: sinks: prometheus_exporter: configuration: {
 		description: """
 			Quantiles to use for aggregating [distribution][dist_metric_docs] metrics into a summary.
 
-			[dist_metric_docs]: https://vector.dev/docs/about/under-the-hood/architecture/data-model/metric/#distribution
+			[dist_metric_docs]: https://vector.dev/docs/architecture/data-model/metric/#distribution
 			"""
 		required: false
 		type: array: {
diff --git a/website/cue/reference/components/sinks/base/prometheus_remote_write.cue b/website/cue/reference/components/sinks/base/prometheus_remote_write.cue
index cbdd3ac14a7da..4f961e6f4bd17 100644
--- a/website/cue/reference/components/sinks/base/prometheus_remote_write.cue
+++ b/website/cue/reference/components/sinks/base/prometheus_remote_write.cue
@@ -7,7 +7,7 @@ base: components: sinks: prometheus_remote_write: configuration: {
 
 			See [End-to-end Acknowledgements][e2e_acks] for more information on how event acknowledgement is handled.
 
-			[e2e_acks]: https://vector.dev/docs/about/under-the-hood/architecture/end-to-end-acknowledgements/
+			[e2e_acks]: https://vector.dev/docs/architecture/end-to-end-acknowledgements/
 			"""
 		required: false
 		type: object: options: enabled: {
@@ -252,7 +252,7 @@ base: components: sinks: prometheus_remote_write: configuration: {
 		description: """
 			Default buckets to use for aggregating [distribution][dist_metric_docs] metrics into histograms.
 
-			[dist_metric_docs]: https://vector.dev/docs/about/under-the-hood/architecture/data-model/metric/#distribution
+			[dist_metric_docs]: https://vector.dev/docs/architecture/data-model/metric/#distribution
 			"""
 		required: false
 		type: array: {
@@ -321,7 +321,7 @@ base: components: sinks: prometheus_remote_write: configuration: {
 		description: """
 			Quantiles to use for aggregating [distribution][dist_metric_docs] metrics into a summary.
 
-			[dist_metric_docs]: https://vector.dev/docs/about/under-the-hood/architecture/data-model/metric/#distribution
+			[dist_metric_docs]: https://vector.dev/docs/architecture/data-model/metric/#distribution
 			"""
 		required: false
 		type: array: {
@@ -424,7 +424,7 @@ base: components: sinks: prometheus_remote_write: configuration: {
 							adaptive: """
 															Concurrency is managed by Vector's [Adaptive Request Concurrency][arc] feature.
 
-															[arc]: https://vector.dev/docs/about/under-the-hood/networking/arc/
+															[arc]: https://vector.dev/docs/architecture/arc/
 															"""
 							none: """
 															A fixed concurrency of 1.
diff --git a/website/cue/reference/components/sinks/base/pulsar.cue b/website/cue/reference/components/sinks/base/pulsar.cue
index b423fa09c6f73..f64829bd3a9e7 100644
--- a/website/cue/reference/components/sinks/base/pulsar.cue
+++ b/website/cue/reference/components/sinks/base/pulsar.cue
@@ -7,7 +7,7 @@ base: components: sinks: pulsar: configuration: {
 
 			See [End-to-end Acknowledgements][e2e_acks] for more information on how event acknowledgement is handled.
 
-			[e2e_acks]: https://vector.dev/docs/about/under-the-hood/architecture/end-to-end-acknowledgements/
+			[e2e_acks]: https://vector.dev/docs/architecture/end-to-end-acknowledgements/
 			"""
 		required: false
 		type: object: options: enabled: {
diff --git a/website/cue/reference/components/sinks/base/redis.cue b/website/cue/reference/components/sinks/base/redis.cue
index 9c0b95a42c0a1..2eb625c201674 100644
--- a/website/cue/reference/components/sinks/base/redis.cue
+++ b/website/cue/reference/components/sinks/base/redis.cue
@@ -7,7 +7,7 @@ base: components: sinks: redis: configuration: {
 
 			See [End-to-end Acknowledgements][e2e_acks] for more information on how event acknowledgement is handled.
 
-			[e2e_acks]: https://vector.dev/docs/about/under-the-hood/architecture/end-to-end-acknowledgements/
+			[e2e_acks]: https://vector.dev/docs/architecture/end-to-end-acknowledgements/
 			"""
 		required: false
 		type: object: options: enabled: {
@@ -563,7 +563,7 @@ base: components: sinks: redis: configuration: {
 							adaptive: """
 															Concurrency is managed by Vector's [Adaptive Request Concurrency][arc] feature.
 
-															[arc]: https://vector.dev/docs/about/under-the-hood/networking/arc/
+															[arc]: https://vector.dev/docs/architecture/arc/
 															"""
 							none: """
 															A fixed concurrency of 1.
diff --git a/website/cue/reference/components/sinks/base/sematext_logs.cue b/website/cue/reference/components/sinks/base/sematext_logs.cue
index 45e2e2962fc2c..c83b416d406a6 100644
--- a/website/cue/reference/components/sinks/base/sematext_logs.cue
+++ b/website/cue/reference/components/sinks/base/sematext_logs.cue
@@ -7,7 +7,7 @@ base: components: sinks: sematext_logs: configuration: {
 
 			See [End-to-end Acknowledgements][e2e_acks] for more information on how event acknowledgement is handled.
 
-			[e2e_acks]: https://vector.dev/docs/about/under-the-hood/architecture/end-to-end-acknowledgements/
+			[e2e_acks]: https://vector.dev/docs/architecture/end-to-end-acknowledgements/
 			"""
 		required: false
 		type: object: options: enabled: {
@@ -202,7 +202,7 @@ base: components: sinks: sematext_logs: configuration: {
 							adaptive: """
 															Concurrency is managed by Vector's [Adaptive Request Concurrency][arc] feature.
 
-															[arc]: https://vector.dev/docs/about/under-the-hood/networking/arc/
+															[arc]: https://vector.dev/docs/architecture/arc/
 															"""
 							none: """
 															A fixed concurrency of 1.
diff --git a/website/cue/reference/components/sinks/base/sematext_metrics.cue b/website/cue/reference/components/sinks/base/sematext_metrics.cue
index c5d5571f2d4d2..3ac88f5c6a285 100644
--- a/website/cue/reference/components/sinks/base/sematext_metrics.cue
+++ b/website/cue/reference/components/sinks/base/sematext_metrics.cue
@@ -7,7 +7,7 @@ base: components: sinks: sematext_metrics: configuration: {
 
 			See [End-to-end Acknowledgements][e2e_acks] for more information on how event acknowledgement is handled.
 
-			[e2e_acks]: https://vector.dev/docs/about/under-the-hood/architecture/end-to-end-acknowledgements/
+			[e2e_acks]: https://vector.dev/docs/architecture/end-to-end-acknowledgements/
 			"""
 		required: false
 		type: object: options: enabled: {
@@ -184,7 +184,7 @@ base: components: sinks: sematext_metrics: configuration: {
 							adaptive: """
 															Concurrency is managed by Vector's [Adaptive Request Concurrency][arc] feature.
 
-															[arc]: https://vector.dev/docs/about/under-the-hood/networking/arc/
+															[arc]: https://vector.dev/docs/architecture/arc/
 															"""
 							none: """
 															A fixed concurrency of 1.
diff --git a/website/cue/reference/components/sinks/base/socket.cue b/website/cue/reference/components/sinks/base/socket.cue
index cb6aac0fd9fae..100a913c8d871 100644
--- a/website/cue/reference/components/sinks/base/socket.cue
+++ b/website/cue/reference/components/sinks/base/socket.cue
@@ -7,7 +7,7 @@ base: components: sinks: socket: configuration: {
 
 			See [End-to-end Acknowledgements][e2e_acks] for more information on how event acknowledgement is handled.
 
-			[e2e_acks]: https://vector.dev/docs/about/under-the-hood/architecture/end-to-end-acknowledgements/
+			[e2e_acks]: https://vector.dev/docs/architecture/end-to-end-acknowledgements/
 			"""
 		required: false
 		type: object: options: enabled: {
diff --git a/website/cue/reference/components/sinks/base/splunk_hec_logs.cue b/website/cue/reference/components/sinks/base/splunk_hec_logs.cue
index 48d07e78b8024..e5d189ba1d95d 100644
--- a/website/cue/reference/components/sinks/base/splunk_hec_logs.cue
+++ b/website/cue/reference/components/sinks/base/splunk_hec_logs.cue
@@ -661,7 +661,7 @@ base: components: sinks: splunk_hec_logs: configuration: {
 							adaptive: """
 															Concurrency is managed by Vector's [Adaptive Request Concurrency][arc] feature.
 
-															[arc]: https://vector.dev/docs/about/under-the-hood/networking/arc/
+															[arc]: https://vector.dev/docs/architecture/arc/
 															"""
 							none: """
 															A fixed concurrency of 1.
diff --git a/website/cue/reference/components/sinks/base/splunk_hec_metrics.cue b/website/cue/reference/components/sinks/base/splunk_hec_metrics.cue
index 80376f7cfe0c0..0bad9ae1c94d9 100644
--- a/website/cue/reference/components/sinks/base/splunk_hec_metrics.cue
+++ b/website/cue/reference/components/sinks/base/splunk_hec_metrics.cue
@@ -269,7 +269,7 @@ base: components: sinks: splunk_hec_metrics: configuration: {
 							adaptive: """
 															Concurrency is managed by Vector's [Adaptive Request Concurrency][arc] feature.
 
-															[arc]: https://vector.dev/docs/about/under-the-hood/networking/arc/
+															[arc]: https://vector.dev/docs/architecture/arc/
 															"""
 							none: """
 															A fixed concurrency of 1.
diff --git a/website/cue/reference/components/sinks/base/statsd.cue b/website/cue/reference/components/sinks/base/statsd.cue
index f411bf70f4df3..4415d149587da 100644
--- a/website/cue/reference/components/sinks/base/statsd.cue
+++ b/website/cue/reference/components/sinks/base/statsd.cue
@@ -7,7 +7,7 @@ base: components: sinks: statsd: configuration: {
 
 			See [End-to-end Acknowledgements][e2e_acks] for more information on how event acknowledgement is handled.
 
-			[e2e_acks]: https://vector.dev/docs/about/under-the-hood/architecture/end-to-end-acknowledgements/
+			[e2e_acks]: https://vector.dev/docs/architecture/end-to-end-acknowledgements/
 			"""
 		required: false
 		type: object: options: enabled: {
diff --git a/website/cue/reference/components/sinks/base/vector.cue b/website/cue/reference/components/sinks/base/vector.cue
index 50c254bf90416..43e4d2734c7d8 100644
--- a/website/cue/reference/components/sinks/base/vector.cue
+++ b/website/cue/reference/components/sinks/base/vector.cue
@@ -7,7 +7,7 @@ base: components: sinks: vector: configuration: {
 
 			See [End-to-end Acknowledgements][e2e_acks] for more information on how event acknowledgement is handled.
 
-			[e2e_acks]: https://vector.dev/docs/about/under-the-hood/architecture/end-to-end-acknowledgements/
+			[e2e_acks]: https://vector.dev/docs/architecture/end-to-end-acknowledgements/
 			"""
 		required: false
 		type: object: options: enabled: {
@@ -176,7 +176,7 @@ base: components: sinks: vector: configuration: {
 							adaptive: """
 															Concurrency is managed by Vector's [Adaptive Request Concurrency][arc] feature.
 
-															[arc]: https://vector.dev/docs/about/under-the-hood/networking/arc/
+															[arc]: https://vector.dev/docs/architecture/arc/
 															"""
 							none: """
 															A fixed concurrency of 1.
diff --git a/website/cue/reference/components/sinks/base/webhdfs.cue b/website/cue/reference/components/sinks/base/webhdfs.cue
index ca14f7bd07878..35e7de6c537e1 100644
--- a/website/cue/reference/components/sinks/base/webhdfs.cue
+++ b/website/cue/reference/components/sinks/base/webhdfs.cue
@@ -7,7 +7,7 @@ base: components: sinks: webhdfs: configuration: {
 
 			See [End-to-end Acknowledgements][e2e_acks] for more information on how event acknowledgement is handled.
 
-			[e2e_acks]: https://vector.dev/docs/about/under-the-hood/architecture/end-to-end-acknowledgements/
+			[e2e_acks]: https://vector.dev/docs/architecture/end-to-end-acknowledgements/
 			"""
 		required: false
 		type: object: options: enabled: {
diff --git a/website/cue/reference/components/sinks/base/websocket.cue b/website/cue/reference/components/sinks/base/websocket.cue
index 0694c649db191..a0b8640f1a07c 100644
--- a/website/cue/reference/components/sinks/base/websocket.cue
+++ b/website/cue/reference/components/sinks/base/websocket.cue
@@ -7,7 +7,7 @@ base: components: sinks: websocket: configuration: {
 
 			See [End-to-end Acknowledgements][e2e_acks] for more information on how event acknowledgement is handled.
 
-			[e2e_acks]: https://vector.dev/docs/about/under-the-hood/architecture/end-to-end-acknowledgements/
+			[e2e_acks]: https://vector.dev/docs/architecture/end-to-end-acknowledgements/
 			"""
 		required: false
 		type: object: options: enabled: {
diff --git a/website/cue/reference/components/sinks/base/websocket_server.cue b/website/cue/reference/components/sinks/base/websocket_server.cue
index c99d46880959a..ebbd024bef91d 100644
--- a/website/cue/reference/components/sinks/base/websocket_server.cue
+++ b/website/cue/reference/components/sinks/base/websocket_server.cue
@@ -7,7 +7,7 @@ base: components: sinks: websocket_server: configuration: {
 
 			See [End-to-end Acknowledgements][e2e_acks] for more information on how event acknowledgement is handled.
 
-			[e2e_acks]: https://vector.dev/docs/about/under-the-hood/architecture/end-to-end-acknowledgements/
+			[e2e_acks]: https://vector.dev/docs/architecture/end-to-end-acknowledgements/
 			"""
 		required: false
 		type: object: options: enabled: {
diff --git a/website/cue/reference/components/sources/base/amqp.cue b/website/cue/reference/components/sources/base/amqp.cue
index 4b6bf3997bc8c..6e289aa9a5d24 100644
--- a/website/cue/reference/components/sources/base/amqp.cue
+++ b/website/cue/reference/components/sources/base/amqp.cue
@@ -13,7 +13,7 @@ base: components: sources: amqp: configuration: {
 			See [End-to-end Acknowledgements][e2e_acks] for more information on how event acknowledgement is handled.
 
 			[global_acks]: https://vector.dev/docs/reference/configuration/global-options/#acknowledgements
-			[e2e_acks]: https://vector.dev/docs/about/under-the-hood/architecture/end-to-end-acknowledgements/
+			[e2e_acks]: https://vector.dev/docs/architecture/end-to-end-acknowledgements/
 			"""
 		required: false
 		type: object: options: enabled: {
diff --git a/website/cue/reference/components/sources/base/aws_kinesis_firehose.cue b/website/cue/reference/components/sources/base/aws_kinesis_firehose.cue
index 18aa1bb813c2c..9b3829b34f3e5 100644
--- a/website/cue/reference/components/sources/base/aws_kinesis_firehose.cue
+++ b/website/cue/reference/components/sources/base/aws_kinesis_firehose.cue
@@ -35,7 +35,7 @@ base: components: sources: aws_kinesis_firehose: configuration: {
 			See [End-to-end Acknowledgements][e2e_acks] for more information on how event acknowledgement is handled.
 
 			[global_acks]: https://vector.dev/docs/reference/configuration/global-options/#acknowledgements
-			[e2e_acks]: https://vector.dev/docs/about/under-the-hood/architecture/end-to-end-acknowledgements/
+			[e2e_acks]: https://vector.dev/docs/architecture/end-to-end-acknowledgements/
 			"""
 		required: false
 		type: object: options: enabled: {
diff --git a/website/cue/reference/components/sources/base/aws_s3.cue b/website/cue/reference/components/sources/base/aws_s3.cue
index 9ed1f676b03df..c7df2c33f0b78 100644
--- a/website/cue/reference/components/sources/base/aws_s3.cue
+++ b/website/cue/reference/components/sources/base/aws_s3.cue
@@ -13,7 +13,7 @@ base: components: sources: aws_s3: configuration: {
 			See [End-to-end Acknowledgements][e2e_acks] for more information on how event acknowledgement is handled.
 
 			[global_acks]: https://vector.dev/docs/reference/configuration/global-options/#acknowledgements
-			[e2e_acks]: https://vector.dev/docs/about/under-the-hood/architecture/end-to-end-acknowledgements/
+			[e2e_acks]: https://vector.dev/docs/architecture/end-to-end-acknowledgements/
 			"""
 		required: false
 		type: object: options: enabled: {
diff --git a/website/cue/reference/components/sources/base/aws_sqs.cue b/website/cue/reference/components/sources/base/aws_sqs.cue
index c11fb4cf2d297..06fc149c49089 100644
--- a/website/cue/reference/components/sources/base/aws_sqs.cue
+++ b/website/cue/reference/components/sources/base/aws_sqs.cue
@@ -13,7 +13,7 @@ base: components: sources: aws_sqs: configuration: {
 			See [End-to-end Acknowledgements][e2e_acks] for more information on how event acknowledgement is handled.
 
 			[global_acks]: https://vector.dev/docs/reference/configuration/global-options/#acknowledgements
-			[e2e_acks]: https://vector.dev/docs/about/under-the-hood/architecture/end-to-end-acknowledgements/
+			[e2e_acks]: https://vector.dev/docs/architecture/end-to-end-acknowledgements/
 			"""
 		required: false
 		type: object: options: enabled: {
diff --git a/website/cue/reference/components/sources/base/datadog_agent.cue b/website/cue/reference/components/sources/base/datadog_agent.cue
index 3e25931a16657..f0841cda68e73 100644
--- a/website/cue/reference/components/sources/base/datadog_agent.cue
+++ b/website/cue/reference/components/sources/base/datadog_agent.cue
@@ -13,7 +13,7 @@ base: components: sources: datadog_agent: configuration: {
 			See [End-to-end Acknowledgements][e2e_acks] for more information on how event acknowledgement is handled.
 
 			[global_acks]: https://vector.dev/docs/reference/configuration/global-options/#acknowledgements
-			[e2e_acks]: https://vector.dev/docs/about/under-the-hood/architecture/end-to-end-acknowledgements/
+			[e2e_acks]: https://vector.dev/docs/architecture/end-to-end-acknowledgements/
 			"""
 		required: false
 		type: object: options: enabled: {
diff --git a/website/cue/reference/components/sources/base/file.cue b/website/cue/reference/components/sources/base/file.cue
index 2c1247b099105..2e5faa30908de 100644
--- a/website/cue/reference/components/sources/base/file.cue
+++ b/website/cue/reference/components/sources/base/file.cue
@@ -13,7 +13,7 @@ base: components: sources: file: configuration: {
 			See [End-to-end Acknowledgements][e2e_acks] for more information on how event acknowledgement is handled.
 
 			[global_acks]: https://vector.dev/docs/reference/configuration/global-options/#acknowledgements
-			[e2e_acks]: https://vector.dev/docs/about/under-the-hood/architecture/end-to-end-acknowledgements/
+			[e2e_acks]: https://vector.dev/docs/architecture/end-to-end-acknowledgements/
 			"""
 		required: false
 		type: object: options: enabled: {
diff --git a/website/cue/reference/components/sources/base/fluent.cue b/website/cue/reference/components/sources/base/fluent.cue
index c32550d85a176..91fb0cabbafe8 100644
--- a/website/cue/reference/components/sources/base/fluent.cue
+++ b/website/cue/reference/components/sources/base/fluent.cue
@@ -13,7 +13,7 @@ base: components: sources: fluent: configuration: {
 			See [End-to-end Acknowledgements][e2e_acks] for more information on how event acknowledgement is handled.
 
 			[global_acks]: https://vector.dev/docs/reference/configuration/global-options/#acknowledgements
-			[e2e_acks]: https://vector.dev/docs/about/under-the-hood/architecture/end-to-end-acknowledgements/
+			[e2e_acks]: https://vector.dev/docs/architecture/end-to-end-acknowledgements/
 			"""
 		relevant_when: "mode = \"tcp\""
 		required:      false
diff --git a/website/cue/reference/components/sources/base/gcp_pubsub.cue b/website/cue/reference/components/sources/base/gcp_pubsub.cue
index c7454f49b4fe2..1ccc9839fe1ad 100644
--- a/website/cue/reference/components/sources/base/gcp_pubsub.cue
+++ b/website/cue/reference/components/sources/base/gcp_pubsub.cue
@@ -36,7 +36,7 @@ base: components: sources: gcp_pubsub: configuration: {
 			See [End-to-end Acknowledgements][e2e_acks] for more information on how event acknowledgement is handled.
 
 			[global_acks]: https://vector.dev/docs/reference/configuration/global-options/#acknowledgements
-			[e2e_acks]: https://vector.dev/docs/about/under-the-hood/architecture/end-to-end-acknowledgements/
+			[e2e_acks]: https://vector.dev/docs/architecture/end-to-end-acknowledgements/
 			"""
 		required: false
 		type: object: options: enabled: {
diff --git a/website/cue/reference/components/sources/base/heroku_logs.cue b/website/cue/reference/components/sources/base/heroku_logs.cue
index bb1fb121179cc..c0c637e403a86 100644
--- a/website/cue/reference/components/sources/base/heroku_logs.cue
+++ b/website/cue/reference/components/sources/base/heroku_logs.cue
@@ -13,7 +13,7 @@ base: components: sources: heroku_logs: configuration: {
 			See [End-to-end Acknowledgements][e2e_acks] for more information on how event acknowledgement is handled.
 
 			[global_acks]: https://vector.dev/docs/reference/configuration/global-options/#acknowledgements
-			[e2e_acks]: https://vector.dev/docs/about/under-the-hood/architecture/end-to-end-acknowledgements/
+			[e2e_acks]: https://vector.dev/docs/architecture/end-to-end-acknowledgements/
 			"""
 		required: false
 		type: object: options: enabled: {
diff --git a/website/cue/reference/components/sources/base/http.cue b/website/cue/reference/components/sources/base/http.cue
index 9320727234367..a2e999c593997 100644
--- a/website/cue/reference/components/sources/base/http.cue
+++ b/website/cue/reference/components/sources/base/http.cue
@@ -13,7 +13,7 @@ base: components: sources: http: configuration: {
 			See [End-to-end Acknowledgements][e2e_acks] for more information on how event acknowledgement is handled.
 
 			[global_acks]: https://vector.dev/docs/reference/configuration/global-options/#acknowledgements
-			[e2e_acks]: https://vector.dev/docs/about/under-the-hood/architecture/end-to-end-acknowledgements/
+			[e2e_acks]: https://vector.dev/docs/architecture/end-to-end-acknowledgements/
 			"""
 		required: false
 		type: object: options: enabled: {
diff --git a/website/cue/reference/components/sources/base/http_server.cue b/website/cue/reference/components/sources/base/http_server.cue
index c23a809e5947c..2f6b38c904c23 100644
--- a/website/cue/reference/components/sources/base/http_server.cue
+++ b/website/cue/reference/components/sources/base/http_server.cue
@@ -13,7 +13,7 @@ base: components: sources: http_server: configuration: {
 			See [End-to-end Acknowledgements][e2e_acks] for more information on how event acknowledgement is handled.
 
 			[global_acks]: https://vector.dev/docs/reference/configuration/global-options/#acknowledgements
-			[e2e_acks]: https://vector.dev/docs/about/under-the-hood/architecture/end-to-end-acknowledgements/
+			[e2e_acks]: https://vector.dev/docs/architecture/end-to-end-acknowledgements/
 			"""
 		required: false
 		type: object: options: enabled: {
diff --git a/website/cue/reference/components/sources/base/journald.cue b/website/cue/reference/components/sources/base/journald.cue
index 951064c41b3d4..c30f388465632 100644
--- a/website/cue/reference/components/sources/base/journald.cue
+++ b/website/cue/reference/components/sources/base/journald.cue
@@ -13,7 +13,7 @@ base: components: sources: journald: configuration: {
 			See [End-to-end Acknowledgements][e2e_acks] for more information on how event acknowledgement is handled.
 
 			[global_acks]: https://vector.dev/docs/reference/configuration/global-options/#acknowledgements
-			[e2e_acks]: https://vector.dev/docs/about/under-the-hood/architecture/end-to-end-acknowledgements/
+			[e2e_acks]: https://vector.dev/docs/architecture/end-to-end-acknowledgements/
 			"""
 		required: false
 		type: object: options: enabled: {
diff --git a/website/cue/reference/components/sources/base/kafka.cue b/website/cue/reference/components/sources/base/kafka.cue
index 1bc76dbf35103..e780a1eb06829 100644
--- a/website/cue/reference/components/sources/base/kafka.cue
+++ b/website/cue/reference/components/sources/base/kafka.cue
@@ -13,7 +13,7 @@ base: components: sources: kafka: configuration: {
 			See [End-to-end Acknowledgements][e2e_acks] for more information on how event acknowledgement is handled.
 
 			[global_acks]: https://vector.dev/docs/reference/configuration/global-options/#acknowledgements
-			[e2e_acks]: https://vector.dev/docs/about/under-the-hood/architecture/end-to-end-acknowledgements/
+			[e2e_acks]: https://vector.dev/docs/architecture/end-to-end-acknowledgements/
 			"""
 		required: false
 		type: object: options: enabled: {
diff --git a/website/cue/reference/components/sources/base/logstash.cue b/website/cue/reference/components/sources/base/logstash.cue
index d365dfee60cc6..02cae1e7e675e 100644
--- a/website/cue/reference/components/sources/base/logstash.cue
+++ b/website/cue/reference/components/sources/base/logstash.cue
@@ -13,7 +13,7 @@ base: components: sources: logstash: configuration: {
 			See [End-to-end Acknowledgements][e2e_acks] for more information on how event acknowledgement is handled.
 
 			[global_acks]: https://vector.dev/docs/reference/configuration/global-options/#acknowledgements
-			[e2e_acks]: https://vector.dev/docs/about/under-the-hood/architecture/end-to-end-acknowledgements/
+			[e2e_acks]: https://vector.dev/docs/architecture/end-to-end-acknowledgements/
 			"""
 		required: false
 		type: object: options: enabled: {
diff --git a/website/cue/reference/components/sources/base/opentelemetry.cue b/website/cue/reference/components/sources/base/opentelemetry.cue
index 8319044d7e9a6..546e5bc743272 100644
--- a/website/cue/reference/components/sources/base/opentelemetry.cue
+++ b/website/cue/reference/components/sources/base/opentelemetry.cue
@@ -13,7 +13,7 @@ base: components: sources: opentelemetry: configuration: {
 			See [End-to-end Acknowledgements][e2e_acks] for more information on how event acknowledgement is handled.
 
 			[global_acks]: https://vector.dev/docs/reference/configuration/global-options/#acknowledgements
-			[e2e_acks]: https://vector.dev/docs/about/under-the-hood/architecture/end-to-end-acknowledgements/
+			[e2e_acks]: https://vector.dev/docs/architecture/end-to-end-acknowledgements/
 			"""
 		required: false
 		type: object: options: enabled: {
diff --git a/website/cue/reference/components/sources/base/prometheus_pushgateway.cue b/website/cue/reference/components/sources/base/prometheus_pushgateway.cue
index 6a1704b47723a..84453af371613 100644
--- a/website/cue/reference/components/sources/base/prometheus_pushgateway.cue
+++ b/website/cue/reference/components/sources/base/prometheus_pushgateway.cue
@@ -13,7 +13,7 @@ base: components: sources: prometheus_pushgateway: configuration: {
 			See [End-to-end Acknowledgements][e2e_acks] for more information on how event acknowledgement is handled.
 
 			[global_acks]: https://vector.dev/docs/reference/configuration/global-options/#acknowledgements
-			[e2e_acks]: https://vector.dev/docs/about/under-the-hood/architecture/end-to-end-acknowledgements/
+			[e2e_acks]: https://vector.dev/docs/architecture/end-to-end-acknowledgements/
 			"""
 		required: false
 		type: object: options: enabled: {
diff --git a/website/cue/reference/components/sources/base/prometheus_remote_write.cue b/website/cue/reference/components/sources/base/prometheus_remote_write.cue
index c12789826651a..eebd362a70f3c 100644
--- a/website/cue/reference/components/sources/base/prometheus_remote_write.cue
+++ b/website/cue/reference/components/sources/base/prometheus_remote_write.cue
@@ -13,7 +13,7 @@ base: components: sources: prometheus_remote_write: configuration: {
 			See [End-to-end Acknowledgements][e2e_acks] for more information on how event acknowledgement is handled.
 
 			[global_acks]: https://vector.dev/docs/reference/configuration/global-options/#acknowledgements
-			[e2e_acks]: https://vector.dev/docs/about/under-the-hood/architecture/end-to-end-acknowledgements/
+			[e2e_acks]: https://vector.dev/docs/architecture/end-to-end-acknowledgements/
 			"""
 		required: false
 		type: object: options: enabled: {
diff --git a/website/cue/reference/components/sources/base/pulsar.cue b/website/cue/reference/components/sources/base/pulsar.cue
index 5c3a3717b1901..5f0f2df862f03 100644
--- a/website/cue/reference/components/sources/base/pulsar.cue
+++ b/website/cue/reference/components/sources/base/pulsar.cue
@@ -13,7 +13,7 @@ base: components: sources: pulsar: configuration: {
 			See [End-to-end Acknowledgements][e2e_acks] for more information on how event acknowledgement is handled.
 
 			[global_acks]: https://vector.dev/docs/reference/configuration/global-options/#acknowledgements
-			[e2e_acks]: https://vector.dev/docs/about/under-the-hood/architecture/end-to-end-acknowledgements/
+			[e2e_acks]: https://vector.dev/docs/architecture/end-to-end-acknowledgements/
 			"""
 		required: false
 		type: object: options: enabled: {
diff --git a/website/cue/reference/components/sources/base/vector.cue b/website/cue/reference/components/sources/base/vector.cue
index 87e28efaa9b61..7e5d8a6947d4e 100644
--- a/website/cue/reference/components/sources/base/vector.cue
+++ b/website/cue/reference/components/sources/base/vector.cue
@@ -13,7 +13,7 @@ base: components: sources: vector: configuration: {
 			See [End-to-end Acknowledgements][e2e_acks] for more information on how event acknowledgement is handled.
 
 			[global_acks]: https://vector.dev/docs/reference/configuration/global-options/#acknowledgements
-			[e2e_acks]: https://vector.dev/docs/about/under-the-hood/architecture/end-to-end-acknowledgements/
+			[e2e_acks]: https://vector.dev/docs/architecture/end-to-end-acknowledgements/
 			"""
 		required: false
 		type: object: options: enabled: {
diff --git a/website/cue/reference/releases/0.30.0.cue b/website/cue/reference/releases/0.30.0.cue
index 264b56c772346..341865e903c15 100644
--- a/website/cue/reference/releases/0.30.0.cue
+++ b/website/cue/reference/releases/0.30.0.cue
@@ -9,7 +9,7 @@ releases: "0.30.0": {
 
 		In addition to the usual smaller enhancements and bug fixes, this release also includes
 		a refresh of the component statuses in the docs following the [stability
-		guarantees](/docs/about/under-the-hood/guarantees/#stability-guarantees).
+		guarantees](/docs/architecture/guarantees/#stability-guarantees).
 
 		Be sure to check out the [upgrade guide](/highlights/2023-05-22-0-30-0-upgrade-guide) for
 		breaking changes in this release.
diff --git a/website/cue/reference/urls.cue b/website/cue/reference/urls.cue
index ebd0bc52760f3..a18867cfbe4f4 100644
--- a/website/cue/reference/urls.cue
+++ b/website/cue/reference/urls.cue
@@ -551,7 +551,7 @@ urls: {
 	vector_aws_s3_sink_auth:                    "/docs/reference/configuration/sinks/aws_s3/#auth"
 	vector_aws_s3_sink_how_it_works:            "/docs/reference/configuration/sinks/aws_s3/#how-it-works"
 	vector_blog:                                "/blog/"
-	vector_buffering_model:                     "/docs/about/under-the-hood/architecture/buffering-model/"
+	vector_buffering_model:                     "/docs/architecture/buffering-model/"
 	vector_bug_issues:                          "\(vector_repo)/issues?q=is%3Aopen+is%3Aissue+label%3A%22type%3A+bug%22"
 	vector_changelog:                           "\(vector_repo)/blob/master/CHANGELOG.md"
 	vector_chat:                                "https://chat.vector.dev"
@@ -560,7 +560,7 @@ urls: {
 	vector_components:                          "/components/"
 	vector_configuration:                       "/docs/reference/configuration/"
 	vector_configuration_global:                "/docs/reference/configuration/global-options"
-	vector_data_model:                          "/docs/about/under-the-hood/architecture/data-model/"
+	vector_data_model:                          "/docs/architecture/data-model/"
 	vector_debian_source_files:                 "\(vector_repo)/tree/master/distribution/debian"
 	vector_dedupe_transform:                    "/docs/reference/configuration/transforms/dedupe/"
 	vector_docker_logs_source:                  "/docs/reference/configuration/sources/docker_logs/"
@@ -589,12 +589,12 @@ urls: {
 	vector_journald_source:                     "/docs/reference/configuration/sources/journald/"
 	vector_kubernetes_logs_source:              "/docs/reference/configuration/sources/kubernetes_logs/"
 	vector_level_up:                            "/guides/level-up/"
-	vector_log:                                 "/docs/about/under-the-hood/architecture/data-model/log"
-	vector_log_data_types:                      "/docs/about/under-the-hood/architecture/data-model/log/#types"
+	vector_log:                                 "/docs/architecture/data-model/log"
+	vector_log_data_types:                      "/docs/architecture/data-model/log/#types"
 	vector_lua_rfc:                             "\(vector_repo)/blob/master/rfcs/2020-03-06-1999-api-extensions-for-lua-transform.md"
 	vector_log_schema:                          "/docs/reference/configuration/global-options/#log_schema"
 	vector_lua_transform:                       "/docs/reference/configuration/transforms/lua/"
-	vector_metric:                              "/docs/about/under-the-hood/architecture/data-model/metric"
+	vector_metric:                              "/docs/architecture/data-model/metric"
 	vector_monitoring:                          "/docs/administration/monitoring"
 	vector_msi_source_files:                    "\(vector_repo)/tree/master/distribution/msi"
 	vector_new_relic_sink:                      "/docs/reference/configuration/sinks/new_relic/"
diff --git a/website/layouts/index.redirects b/website/layouts/index.redirects
index 363530671ac41..7c54c3b248e7e 100644
--- a/website/layouts/index.redirects
+++ b/website/layouts/index.redirects
@@ -17,7 +17,7 @@
 {{- end -}}
 
 {{/* Other redirects (301 because permanent) */}}
-/docs/about/data-model/*   /docs/about/under-the-hood/architecture/data-model/:splat  301
+/docs/architecture/data-model/*   /docs/architecture/data-model/:splat  301
 /docs/components/*   /docs/reference/:splat  301
 /docs/reference/sinks/*   /docs/reference/configuration/sinks/:splat  301
 /docs/reference/sources/*   /docs/reference/configuration/sources/:splat  301
diff --git a/website/layouts/partials/data.html b/website/layouts/partials/data.html
index ebe5d9f0088ad..eff16b2b91de1 100644
--- a/website/layouts/partials/data.html
+++ b/website/layouts/partials/data.html
@@ -266,7 +266,7 @@
           {{ partial "heading.html" (dict "text" "Metrics" "level" 3 "id" "output-metrics" "href" "#output-metrics") }}
 
 
-          <a href="/docs/about/under-the-hood/architecture/data-model/metric">
+          <a href="/docs/architecture/data-model/metric">
             {{/* Heroicon: solid/question-mark-circle */}}
             <svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5" viewBox="0 0 20 20" fill="currentColor">
               <path
@@ -298,7 +298,7 @@
           {{ partial "heading.html" (dict "text" "Logs" "level" 3 "id" "output-logs" "href" "#output-logs") }}
 
 
-          <a href="/docs/about/under-the-hood/architecture/data-model/log">
+          <a href="/docs/architecture/data-model/log">
             {{/* Heroicon: solid/question-mark-circle */}}
             <svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5" viewBox="0 0 20 20" fill="currentColor">
               <path
@@ -448,7 +448,7 @@
           {{ partial "heading.html" (dict "text" "Metrics" "level" 3 "id" "telemetry-metrics" "href" "#telemetry-metrics") }}
 
 
-          <a href="/docs/about/under-the-hood/architecture/data-model/metric"> link </a>
+          <a href="/docs/architecture/data-model/metric"> link </a>
         </span>
 
         <div class="mt-3 border rounded divide-y dark:border-gray-700 dark:divide-gray-700">
@@ -461,7 +461,7 @@
           {{ partial "heading.html" (dict "text" "Logs" "id" "telemetry-logs" "href" "#telemetry-logs") }}
 
 
-          <a href="/docs/about/under-the-hood/architecture/data-model/log"> link </a>
+          <a href="/docs/architecture/data-model/log"> link </a>
         </span>
 
         <div class="mt-3 border rounded divide-y dark:border-gray-700 dark:divide-gray-700">
@@ -950,7 +950,7 @@ <h4 id="{{ $id }}">
               {{ $code := highlight $json "json" "" }}
               <span>
                 Given this
-                <a href="/docs/about/under-the-hood/architecture/data-model/log">Vector log event</a>...
+                <a href="/docs/architecture/data-model/log">Vector log event</a>...
               </span>
               {{ $code }}
             {{ end }}
@@ -960,7 +960,7 @@ <h4 id="{{ $id }}">
               {{ $code := highlight $json "json" "" }}
               <span>
                 Given this
-                <a href="/docs/about/under-the-hood/architecture/data-model/metric">Vector metric event</a>...
+                <a href="/docs/architecture/data-model/metric">Vector metric event</a>...
               </span>
               {{ $code }}
             {{ end }}
diff --git a/website/layouts/shortcodes/internal-metrics-list.html b/website/layouts/shortcodes/internal-metrics-list.html
index dba3620e277a5..0c15c1fcd8396 100644
--- a/website/layouts/shortcodes/internal-metrics-list.html
+++ b/website/layouts/shortcodes/internal-metrics-list.html
@@ -26,7 +26,7 @@
           {{ .description | markdownify }}
         </td>
         <td>
-          {{ $href := printf "/docs/about/under-the-hood/architecture/data-model/metric/#%s" .type }}
+          {{ $href := printf "/docs/architecture/data-model/metric/#%s" .type }}
           <a href="{{ $href }}">
             {{ .type }}
           </a>
@@ -35,4 +35,4 @@
       {{ end }}
     </tbody>
   </table>
-</div>
\ No newline at end of file
+</div>
diff --git a/website/scripts/typesense-index.ts b/website/scripts/typesense-index.ts
index 2602b7e2efb2c..9ef2c72706f47 100644
--- a/website/scripts/typesense-index.ts
+++ b/website/scripts/typesense-index.ts
@@ -1,6 +1,6 @@
 import chalk from "chalk";
 import cheerio from "cheerio";
-import { Element } from "domhandler";
+import {Element} from "domhandler";
 import dotEnv from "dotenv-defaults";
 import fs from "fs";
 import glob from "glob-promise";
@@ -222,8 +222,8 @@ async function buildIndex() {
   const sections: Section[] = [
     {
       name: "Docs",
-      path: `${publicPath}/docs/about/**/**.html`,
-      displayPath: "docs/about",
+      path: `${publicPath}/docs/introduction/**/**.html`,
+      displayPath: "docs/introduction",
       ranking: 50,
     },
     {

From a9104b89b6b120160f4321562a7529acc5b50f94 Mon Sep 17 00:00:00 2001
From: Pavlos Rontidis <pavlos.rontidis@gmail.com>
Date: Wed, 2 Jul 2025 12:56:49 -0400
Subject: [PATCH 150/305] fix(website): updated multiple broken links (#23328)

* DRY for author avatars, fix links

* log namespace global isn't rendered anywher :( - preexisting issue

* one more fix

* ignore livereload links
---
 website/.htmltest.yml                         |  2 +
 .../content/en/blog/kubernetes-integration.md |  2 +-
 website/content/en/blog/log-namespacing.md    |  5 +-
 .../en/docs/administration/monitoring.md      |  2 +-
 .../configuration/template-syntax.md          |  4 +-
 .../reference/configuration/unit-tests.md     |  4 +-
 .../content/en/docs/reference/vrl/_index.md   |  6 +--
 .../en/docs/setup/going-to-prod/arch/agent.md |  2 +-
 .../setup/going-to-prod/arch/aggregator.md    |  2 +-
 .../docs/setup/going-to-prod/architecting.md  |  8 +--
 .../setup/going-to-prod/high-availability.md  |  4 +-
 .../en/docs/setup/going-to-prod/sizing.md     |  2 +-
 .../installation/platforms/kubernetes.md      |  2 +-
 .../2022-08-16-0-24-0-upgrade-guide.md        |  2 +-
 .../2022-11-07-0-26-0-upgrade-guide.md        |  2 +-
 website/cue/reference/authors.cue             | 49 -------------------
 website/cue/reference/components/sinks.cue    |  2 +-
 .../components/sources/kubernetes_logs.cue    |  2 +-
 website/cue/reference/releases/0.24.0.cue     |  2 +-
 website/cue/reference/releases/0.25.0.cue     |  2 +-
 website/cue/reference/releases/0.28.0.cue     |  2 +-
 .../cue/reference/remap/functions/replace.cue |  2 +-
 website/layouts/_default/blog-post-card.html  |  4 +-
 website/layouts/highlights/li.html            | 45 ++++++-----------
 .../layouts/partials/author-with-avatar.html  | 35 +++++++++++++
 website/layouts/partials/blog/authors.html    | 22 ---------
 website/layouts/partials/blog/content.html    |  4 +-
 website/layouts/partials/content.html         |  2 +-
 .../layouts/partials/highlights/authors.html  | 22 ---------
 29 files changed, 87 insertions(+), 157 deletions(-)
 delete mode 100644 website/cue/reference/authors.cue
 create mode 100644 website/layouts/partials/author-with-avatar.html
 delete mode 100644 website/layouts/partials/blog/authors.html
 delete mode 100644 website/layouts/partials/highlights/authors.html

diff --git a/website/.htmltest.yml b/website/.htmltest.yml
index e0a08a91fe5ad..6690f098861e0 100644
--- a/website/.htmltest.yml
+++ b/website/.htmltest.yml
@@ -3,3 +3,5 @@ IgnoreDirectoryMissingTrailingSlash: true
 CheckExternal: false
 IgnoreAltMissing: true
 IgnoreEmptyHref: true
+ignoreURLs:
+  - ^/livereload\.js
diff --git a/website/content/en/blog/kubernetes-integration.md b/website/content/en/blog/kubernetes-integration.md
index 376d40ef01d8a..bf60365d98ed1 100644
--- a/website/content/en/blog/kubernetes-integration.md
+++ b/website/content/en/blog/kubernetes-integration.md
@@ -108,7 +108,7 @@ We want Vector to become the backbone of observability in Kubernetes. If you sha
 [arc]: /blog/adaptive-request-concurrency
 [chat]: https://chat.vector.dev
 [clickhouse]: /docs/reference/configuration/sinks/clickhouse
-[enriching]: /docs/reference/configuration/sources/kubernetes_logs/#output-data
+[enriching]: /docs/reference/configuration/sources/kubernetes_logs/#output-types
 [elasticsearch]: /docs/reference/configuration/sinks/elasticsearch
 [helm]: https://helm.sh
 [install]: /docs/setup/installation/platforms/kubernetes/#install
diff --git a/website/content/en/blog/log-namespacing.md b/website/content/en/blog/log-namespacing.md
index d2d2d049490a5..12cfe94796f4e 100644
--- a/website/content/en/blog/log-namespacing.md
+++ b/website/content/en/blog/log-namespacing.md
@@ -26,7 +26,7 @@ of events in Vector.
 
 ## How to enable
 
-The [global config] `schema.log_namespace` can be set to `true` to enable the new
+The global config `schema.log_namespace` can be set to `true` to enable the new
 Log Namespacing feature for all components. The default is `false`.
 
 Every source also has a `log_namespace` config option. This will override the global setting,
@@ -166,4 +166,5 @@ be used.
 [global log schema]: /docs/reference/configuration/global-options/#log_schema
 [set_semantic_meaning]: /docs/reference/vrl/functions/#set_semantic_meaning
 [remap]: /docs/reference/configuration/transforms/remap/
-[global config]: /docs/reference/configuration/global-options/#schema.log_namespace
+
+[//]: # ([global config]: /docs/reference/configuration/global-options/#schema.log_namespace) TODO FIX
diff --git a/website/content/en/docs/administration/monitoring.md b/website/content/en/docs/administration/monitoring.md
index c2cfa395b608f..0ba4e7320ba02 100644
--- a/website/content/en/docs/administration/monitoring.md
+++ b/website/content/en/docs/administration/monitoring.md
@@ -140,7 +140,7 @@ IO and disrupting the service. The trade-off is that repetitive logs aren't logg
 [internal_metrics]: /docs/reference/configuration/sources/internal_metrics
 [journald]: https://www.freedesktop.org/software/systemd/man/systemd-journald.service.html
 [journald_source]: /docs/reference/configuration/sources/journald
-[output]: /docs/reference/configuration/sources/internal_metrics/#output-data
+[output]: /docs/reference/configuration/sources/internal_metrics/#output-types
 [remap]: /docs/reference/configuration/transforms/remap
 [rfc_2064]: https://github.com/vectordotdev/vector/blob/master/rfcs/2020-03-17-2064-event-driven-observability.md
 [sinks]: /sinks
diff --git a/website/content/en/docs/reference/configuration/template-syntax.md b/website/content/en/docs/reference/configuration/template-syntax.md
index 5b2e356245df0..372cd7988b4bf 100644
--- a/website/content/en/docs/reference/configuration/template-syntax.md
+++ b/website/content/en/docs/reference/configuration/template-syntax.md
@@ -58,7 +58,7 @@ option = "year=%Y/month=%m/day=%d/"
 ```
 
 {{< info >}}
-The value is derived from the [`timestamp` field](/docs/introduction/introduction/architecture/data-model/log/#timestamps)
+The value is derived from the [`timestamp` field](/docs/architecture/data-model/log/#timestamps)
 and the name of this field can be changed via the [global `timestamp_key` option](/docs/reference/configuration/global-options/#log_schema.timestamp_key).
 {{< /info >}}
 
@@ -109,7 +109,7 @@ metric is incremented with an `error_type` tag of `template_failed`.
 
 [1692]: https://github.com/vectordotdev/vector/issues/1692
 [aws_s3]: /docs/reference/configuration/sinks/aws_s3
-[log]: /docs/introduction/introduction/architecture/data-model/log
+[log]: /docs/architecture/data-model/log
 [path_expression]: /docs/reference/vrl/expressions/#path
 [path_expression_examples]: /docs/reference/vrl/expressions/#path-examples
 [remap]: /docs/reference/configuration/transforms/remap
diff --git a/website/content/en/docs/reference/configuration/unit-tests.md b/website/content/en/docs/reference/configuration/unit-tests.md
index ef3423a32a4d9..c838086f50286 100644
--- a/website/content/en/docs/reference/configuration/unit-tests.md
+++ b/website/content/en/docs/reference/configuration/unit-tests.md
@@ -599,8 +599,8 @@ assert!(!exists(.tags.host), "host tag included")
 [filter]: /docs/reference/configuration/transforms/filter
 [includes]: /docs/reference/vrl/functions/#includes
 [is_nullish]: /docs/reference/vrl/functions/#is_nullish
-[logs]: /docs/introduction/introduction/architecture/data-model/log
-[metrics]: /docs/introduction/introduction/architecture/data-model/metric
+[logs]: /docs/architecture/data-model/log
+[metrics]: /docs/architecture/data-model/metric
 [pipeline]: /docs/reference/glossary/#pipeline
 [remap]: /docs/reference/configuration/transforms/remap
 [transforms]: /docs/reference/glossary/#transform
diff --git a/website/content/en/docs/reference/vrl/_index.md b/website/content/en/docs/reference/vrl/_index.md
index 1d9dd17afdd7a..a0b2cfb426efe 100644
--- a/website/content/en/docs/reference/vrl/_index.md
+++ b/website/content/en/docs/reference/vrl/_index.md
@@ -199,14 +199,14 @@ VRL has some core concepts that you should be aware of as you dive in.
 [dedupe]: /docs/reference/configuration/transforms/dedupe
 [del]: /docs/reference/vrl/functions#del
 [errors]: /docs/reference/vrl/errors
-[events]: /docs/introduction/architecture/data-model
+[events]: /docs/architecture/data-model
 [fail_safe]: https://en.wikipedia.org/wiki/Fail-safe
 [ffi]: https://en.wikipedia.org/wiki/Foreign_function_interface
 [filter]: /docs/reference/configuration/transforms/filter
 [log]: /docs/reference/vrl/functions#log
-[logs]: /docs/introduction/introduction/architecture/data-model/log
+[logs]: /docs/architecture/data-model/log
 [memory_safety]: https://en.wikipedia.org/wiki/Memory_safety
-[metrics]: /docs/introduction/introduction/architecture/data-model/metrics
+[metrics]: /docs/architecture/data-model/metrics
 [now]: /docs/reference/vrl/functions#now
 [remap]: /docs/reference/configuration/transforms/remap
 [route]: /docs/reference/configuration/transforms/route
diff --git a/website/content/en/docs/setup/going-to-prod/arch/agent.md b/website/content/en/docs/setup/going-to-prod/arch/agent.md
index f6181607a4859..7c86ca49264ca 100644
--- a/website/content/en/docs/setup/going-to-prod/arch/agent.md
+++ b/website/content/en/docs/setup/going-to-prod/arch/agent.md
@@ -46,7 +46,7 @@ See the [architecting document](/docs/setup/going-to-prod/architecting/) for mor
 ### High Availability
 
 - If the [failure of a single Vector agent](/docs/setup/going-to-prod/high-availability/#vector-process-failure) is unacceptable, consider the [aggregator architecture](/docs/setup/going-to-prod/arch/aggregator/), which deploys Vector across multiple nodes in a [highly available manner](/docs/setup/going-to-prod/high-availability/).
-- Enable [end-to-end acknowledgements](/docs/introduction/introduction/architecture/end-to-end-acknowledgements/) to mitigate [data receive failures](/docs/setup/going-to-prod/high-availability/#data-receive-failure).
+- Enable [end-to-end acknowledgements](/docs/architecture/end-to-end-acknowledgements/) to mitigate [data receive failures](/docs/setup/going-to-prod/high-availability/#data-receive-failure).
 - Route dropped events to mitigate [data processing failures](/docs/setup/going-to-prod/high-availability/#data-processing-failure).
 
 {{< info >}}
diff --git a/website/content/en/docs/setup/going-to-prod/arch/aggregator.md b/website/content/en/docs/setup/going-to-prod/arch/aggregator.md
index ca37330be30b0..3bf337c7f4ac6 100644
--- a/website/content/en/docs/setup/going-to-prod/arch/aggregator.md
+++ b/website/content/en/docs/setup/going-to-prod/arch/aggregator.md
@@ -94,7 +94,7 @@ Partitioning, or “topics” in Kafka terminology, refers to separating data in
 #### Recommendations
 
 - Use memory buffers with `buffers.when_full` set to `block`. This will ensure back pressure flows upstream to your pub-sub system, where durable buffering should occur.
-- Enable [end-to-end acknowledgements](/docs/introduction/introduction/architecture/end-to-end-acknowledgements/) for your Vector pub-sub source (i.e., the `kafka` source) to ensure data is persisted downstream before removing the data from your pub-sub systems.
+- Enable [end-to-end acknowledgements](/docs/architecture/end-to-end-acknowledgements/) for your Vector pub-sub source (i.e., the `kafka` source) to ensure data is persisted downstream before removing the data from your pub-sub systems.
 
 ### Global Aggregation
 
diff --git a/website/content/en/docs/setup/going-to-prod/architecting.md b/website/content/en/docs/setup/going-to-prod/architecting.md
index bababee355b16..612afa484b5a3 100644
--- a/website/content/en/docs/setup/going-to-prod/architecting.md
+++ b/website/content/en/docs/setup/going-to-prod/architecting.md
@@ -122,7 +122,7 @@ Notice that these functions collect and forward existing data, unchanged. There
 
 Vector should not replace agents that produce vendor-specific data that Vector cannot replicate.
 
-For example, the Datadog Agent powers [Network Performance Monitoring](https://www.datadoghq.com/product/network-monitoring/network-performance-monitoring/). In this case, the Datadog Agent integrates with vendor-specific systems and produces vendor-specific data. Vector should not be involved with this process. Instead, the Datadog Agent should collect the data and send it directly to Datadog since the data is not one of [Vector’s supported data types](docs/introduction/introduction/architecture/data-model/).
+For example, the Datadog Agent powers [Network Performance Monitoring](https://www.datadoghq.com/product/network-monitoring/network-performance-monitoring/). In this case, the Datadog Agent integrates with vendor-specific systems and produces vendor-specific data. Vector should not be involved with this process. Instead, the Datadog Agent should collect the data and send it directly to Datadog since the data is not one of [Vector’s supported data types](docs/architecture/data-model/).
 
 As another example, the Datadog Agent collects service metrics and enriches them with vendor-specific Datadog tags. In this case, the Datadog Agent should send the metrics directly to Datadog or route them through Vector. Vector should not replace the Datadog Agent because the data being produced is enriched in a vendor-specific way.
 
@@ -153,7 +153,7 @@ Alternatively, you can deploy Vector [on separate nodes as an aggregator](/docs/
 
 ##### Reducing Agent Risk
 
-When integrating with an agent, you should configure the agent to be a simple data forwarder, and route [supported data types](docs/introduction/introduction/architecture/data-model/) through Vector. This strategy reduces the risk of data loss and service disruption due to misbehaving agents by minimizing their responsibilities.
+When integrating with an agent, you should configure the agent to be a simple data forwarder, and route [supported data types](docs/architecture/data-model/) through Vector. This strategy reduces the risk of data loss and service disruption due to misbehaving agents by minimizing their responsibilities.
 
 #### Replacing Agents
 
@@ -173,7 +173,7 @@ Data processing deals with everything in between your Vector sources and sinks.
 
 #### Choosing Which Data to Process
 
-Primitive data types that [Vector’s data model](docs/introduction/introduction/architecture/data-model/) supports should be processed by Vector (i.e., logs, metrics, and traces). Real-time, vendor-specific data, such as continuous profiling data, should not flow through Vector since it is not interoperable and typically does not benefit from processing.
+Primitive data types that [Vector’s data model](docs/architecture/data-model/) supports should be processed by Vector (i.e., logs, metrics, and traces). Real-time, vendor-specific data, such as continuous profiling data, should not flow through Vector since it is not interoperable and typically does not benefit from processing.
 
 #### Choosing Where to Process Data
 
@@ -266,7 +266,7 @@ Your system of record should optimize for durability while minimizing cost:
 
 - Only write to your archive from the [aggregator role](#aggregator-role) to reduce data loss due to node restarts and [software failures](/docs/setup/going-to-prod/high-availability/#mitigate-software-failures).
 - Front the sink with a disk buffer.
-- Enable [end-to-end acknowledgements](/docs/introduction/introduction/architecture/end-to-end-acknowledgements/) on all sources.
+- Enable [end-to-end acknowledgements](/docs/architecture/end-to-end-acknowledgements/) on all sources.
 - Set `batch.max_bytes` to ≥ 5MiB and `batch.timeout_secs` to ≥ 5 minutes and enable `compression` (the default for archiving sinks, such as the `aws_s3` sink).
 - Archive raw, unprocessed data to allow for data replay and reduce the risk of accidental data corruption during processing.
 
diff --git a/website/content/en/docs/setup/going-to-prod/high-availability.md b/website/content/en/docs/setup/going-to-prod/high-availability.md
index 033bf17ccc0ca..768d40d16ea59 100644
--- a/website/content/en/docs/setup/going-to-prod/high-availability.md
+++ b/website/content/en/docs/setup/going-to-prod/high-availability.md
@@ -39,7 +39,7 @@ Mitigate Vector process failures similarly to [node failures](#node-failure): Ve
 
 #### Data Receive Failure
 
-Mitigate data receive failures with Vector’s [end-to-end acknowledgements feature](/docs/introduction/introduction/architecture/end-to-end-acknowledgements/). When enabled, Vector only responds to the clients when data durably persists. Such as writing the data to the disk buffer or a downstream service.
+Mitigate data receive failures with Vector’s [end-to-end acknowledgements feature](/docs/architecture/end-to-end-acknowledgements/). When enabled, Vector only responds to the clients when data durably persists. Such as writing the data to the disk buffer or a downstream service.
 
 ![Failure](/img/going-to-prod/ha/receive-failure.png)
 
@@ -139,7 +139,7 @@ These actions mitigate [individual node failure](#node-failure) and [data center
 
 Mitigate software failures by configuring your Vector instances as follows:
 
-1. Able sources should enable [end-to-end acknowledgements](/docs/introduction/introduction/architecture/end-to-end-acknowledgements/).
+1. Able sources should enable [end-to-end acknowledgements](/docs/architecture/end-to-end-acknowledgements/).
 2. Sinks should implement disk or memory buffers that overflow to disk.
 3. Transforms should implement dropped event routing to your system of record.
 
diff --git a/website/content/en/docs/setup/going-to-prod/sizing.md b/website/content/en/docs/setup/going-to-prod/sizing.md
index e0cc44e1f3416..abe6f6a199bef 100644
--- a/website/content/en/docs/setup/going-to-prod/sizing.md
+++ b/website/content/en/docs/setup/going-to-prod/sizing.md
@@ -77,7 +77,7 @@ More information about buffers and data loss can be found in the [high availabil
 
 ### Vertical Scaling
 
-[Vector’s concurrency model](/docs/introduction/introduction/architecture/concurrency-model/) automatically scales to take advantage of all vCPUs. There are no configuration changes needed. When vertically scaling, we recommend capping an instance’s size to process no more than 33% of your total volume. This allows for [high availability](/docs/setup/going-to-prod/high-availability/) in the event of a node failure.
+[Vector’s concurrency model](/docs/architecture/concurrency-model/) automatically scales to take advantage of all vCPUs. There are no configuration changes needed. When vertically scaling, we recommend capping an instance’s size to process no more than 33% of your total volume. This allows for [high availability](/docs/setup/going-to-prod/high-availability/) in the event of a node failure.
 
 {{< info >}}
 More information about vertical sizing can be found in the [capacity planning section](#capacity-planning).
diff --git a/website/content/en/docs/setup/installation/platforms/kubernetes.md b/website/content/en/docs/setup/installation/platforms/kubernetes.md
index d52137b5bd5d9..b86e3ad251e48 100644
--- a/website/content/en/docs/setup/installation/platforms/kubernetes.md
+++ b/website/content/en/docs/setup/installation/platforms/kubernetes.md
@@ -271,7 +271,7 @@ Vector is tested extensively against Kubernetes. In addition to Kubernetes being
 [kubernetes]: https://kubernetes.io
 [kubernetes_logs]: /docs/reference/configuration/sources/kubernetes_logs
 [kubernetes_logs_config]: /docs/reference/configuration/sources/kubernetes_logs/#configuration
-[kubernetes_logs_output]: /docs/reference/configuration/sources/kubernetes_logs#output-data
+[kubernetes_logs_output]: /docs/reference/configuration/sources/kubernetes_logs#output-types
 [kustomize]: https://kustomize.io
 [node]: https://kubernetes.io/docs/concepts/architecture/nodes
 [reduce]: /docs/reference/configuration/transforms/reduce
diff --git a/website/content/en/highlights/2022-08-16-0-24-0-upgrade-guide.md b/website/content/en/highlights/2022-08-16-0-24-0-upgrade-guide.md
index faeeb0f62fc1e..7a18c94e1fe8b 100644
--- a/website/content/en/highlights/2022-08-16-0-24-0-upgrade-guide.md
+++ b/website/content/en/highlights/2022-08-16-0-24-0-upgrade-guide.md
@@ -236,7 +236,7 @@ Sinks:
 #### Deprecation of the `geoip` transform {#geoip-deprecation}
 
 The `geoip` transform has been deprecated in-lieu of new support for [`geoip` enrichment
-tables](/docs/reference/configuration/global-options/#enrichment_tables.geoip). These can be used
+tables](/docs/reference/configuration/global-options/#enrichment_tables.type). These can be used
 with [VRL's enrichment table functions](/docs/reference/vrl/functions/#enrichment-functions) to
 enrich events using a [GeoIP database](https://www.maxmind.com/en/geoip2-databases).
 
diff --git a/website/content/en/highlights/2022-11-07-0-26-0-upgrade-guide.md b/website/content/en/highlights/2022-11-07-0-26-0-upgrade-guide.md
index 5546d0dfc8309..cc64dcdf3762f 100644
--- a/website/content/en/highlights/2022-11-07-0-26-0-upgrade-guide.md
+++ b/website/content/en/highlights/2022-11-07-0-26-0-upgrade-guide.md
@@ -63,7 +63,7 @@ transforms:
 
 The `geoip` transform was deprecated in `0.24.0` and has now been removed. You can
 get the same functionality through a `remap` transform with [`geoip` enrichment
-tables](/docs/reference/configuration/global-options/#enrichment_tables.geoip). These can be used
+tables](/docs/reference/configuration/global-options/#enrichment_tables.type). These can be used
 with [VRL's enrichment table functions](/docs/reference/vrl/functions/#enrichment-functions) to
 enrich events using a [GeoIP database](https://www.maxmind.com/en/geoip2-databases).
 
diff --git a/website/cue/reference/authors.cue b/website/cue/reference/authors.cue
deleted file mode 100644
index 06f5ab52d3b0e..0000000000000
--- a/website/cue/reference/authors.cue
+++ /dev/null
@@ -1,49 +0,0 @@
-package metadata
-
-#Author: {
-	handle: !=""
-	name:   !=""
-}
-
-authors: [#Author, ...#Author] & [
-	{
-		handle: "barieom"
-		name:   "Barry Eom"
-	},
-	{
-		handle: "binarylogic"
-		name:   "Ben Johnson"
-	},
-	{
-		handle: "hoverbear"
-		name:   "Ana Hobden"
-	},
-	{
-		handle: "jamtur01"
-		name:   "James Turnbull"
-	},
-	{
-		handle: "jszwedko"
-		name:   "Jesse Szwedko"
-	},
-	{
-		handle: "lukesteensen"
-		name:   "Luke Steensen"
-	},
-	{
-		handle: "lucperkins"
-		name:   "Luc Perkins"
-	},
-	{
-		handle: "leebenson"
-		name:   "Lee Benson"
-	},
-	{
-		handle: "spencergilbert"
-		name:   "Spencer Gilbert"
-	},
-	{
-		handle: "zsherman"
-		name:   "Zach Sherman"
-	},
-]
diff --git a/website/cue/reference/components/sinks.cue b/website/cue/reference/components/sinks.cue
index e272e7ea2da4b..0c7703b082003 100644
--- a/website/cue/reference/components/sinks.cue
+++ b/website/cue/reference/components/sinks.cue
@@ -651,7 +651,7 @@ components: sinks: [Name=string]: {
 					title: "Transport Layer Security (TLS)"
 					body:  """
 						Vector uses [OpenSSL](\(urls.openssl)) for TLS protocols due to OpenSSL's maturity. You can
-						enable and adjust TLS behavior via the [`tls.*`](#tls) options and/or via an
+						enable and adjust TLS behavior via the `tls.*`` options and/or via an
 						[OpenSSL configuration file](\(urls.openssl_conf)). The file location defaults to
 						`/usr/local/ssl/openssl.cnf` or can be specified with the `OPENSSL_CONF` environment variable.
 						"""
diff --git a/website/cue/reference/components/sources/kubernetes_logs.cue b/website/cue/reference/components/sources/kubernetes_logs.cue
index a421ebf61dfb2..fd19f4aa19472 100644
--- a/website/cue/reference/components/sources/kubernetes_logs.cue
+++ b/website/cue/reference/components/sources/kubernetes_logs.cue
@@ -268,7 +268,7 @@ components: sources: kubernetes_logs: {
 			body:  """
 					Vector will enrich data with Kubernetes context. A comprehensive
 					list of fields can be found in the
-					[`kubernetes_logs` source output docs](\(urls.vector_kubernetes_logs_source)#output-data).
+					[`kubernetes_logs` source output docs](\(urls.vector_kubernetes_logs_source)#output-types).
 					"""
 		}
 
diff --git a/website/cue/reference/releases/0.24.0.cue b/website/cue/reference/releases/0.24.0.cue
index 5b71feba43deb..d61e1604d8b0f 100644
--- a/website/cue/reference/releases/0.24.0.cue
+++ b/website/cue/reference/releases/0.24.0.cue
@@ -155,7 +155,7 @@ releases: "0.24.0": {
 			scopes: ["enrichment tables"]
 			description: """
 				A new enrichment table type was added,
-				[`geoip`](/docs/reference/configuration/global-options/#enrichment_tables.geoip).
+				[`geoip`](/docs/reference/configuration/global-options/#enrichment_tables.type).
 				This can be used with [VRL's enrichment table
 				functions](/docs/reference/vrl/functions/#enrichment-functions) to enrich events
 				using a [GeoIP database](https://www.maxmind.com/en/geoip2-databases).
diff --git a/website/cue/reference/releases/0.25.0.cue b/website/cue/reference/releases/0.25.0.cue
index 5cfb11c096369..f53387a604f81 100644
--- a/website/cue/reference/releases/0.25.0.cue
+++ b/website/cue/reference/releases/0.25.0.cue
@@ -91,7 +91,7 @@ releases: "0.25.0": {
 				[`mod`](https://vrl.dev/functions#mod) function that was added in v0.24.0.
 
 				 Please see [the upgrade
-				 guide](/highlights/2022-10-04-0-25-0-upgrade-guide#module-removal) for more
+				 guide](/highlights/2022-10-04-0-25-0-upgrade-guide) for more
 				 details.
 				"""
 			pr_numbers: [14111, 14011]
diff --git a/website/cue/reference/releases/0.28.0.cue b/website/cue/reference/releases/0.28.0.cue
index 568e50e9b38cf..91032cae68694 100644
--- a/website/cue/reference/releases/0.28.0.cue
+++ b/website/cue/reference/releases/0.28.0.cue
@@ -101,7 +101,7 @@ releases: "0.28.0": {
 			scopes: ["buffers"]
 			description: """
 				The deprecated `disk_v1` buffer type was removed. See [the upgrade
-				guide](#disk_v1-removal) for details and how to migrate if you are using this buffer
+				guide](/highlights/2023-02-28-0-28-0-upgrade-guide/#disk_v1-removal) for details and how to migrate if you are using this buffer
 				type.
 				"""
 			breaking: true
diff --git a/website/cue/reference/remap/functions/replace.cue b/website/cue/reference/remap/functions/replace.cue
index 2095cd5361a3f..6e1c50ba5972e 100644
--- a/website/cue/reference/remap/functions/replace.cue
+++ b/website/cue/reference/remap/functions/replace.cue
@@ -9,7 +9,7 @@ remap: functions: replace: {
 
 		**Note when using capture groups**:
 		- You will need to escape the `$` by using `$$` to avoid Vector interpreting it as an
-		  [environment variable when loading configuration](/docs/reference/configuration/#escaping)
+		  [environment variable when loading configuration](/docs/reference/environment_variables/#escaping)
 		- If you want a literal `$` in the replacement pattern, you will also need to escape this
 		  with `$$`. When combined with environment variable interpolation in config files this
 		  means you will need to use `$$$$` to have a literal `$` in the replacement pattern.
diff --git a/website/layouts/_default/blog-post-card.html b/website/layouts/_default/blog-post-card.html
index f9d991fc48e8b..765e2a620abbe 100644
--- a/website/layouts/_default/blog-post-card.html
+++ b/website/layouts/_default/blog-post-card.html
@@ -28,7 +28,7 @@
 
       {{/* Author(s) info */}}
       <div class="mb-5">
-        {{ partial "blog/authors.html" . }}
+        {{ partial  "author-with-avatar.html" . }}
       </div>
 
       {{ with .Params.badges }}
@@ -42,4 +42,4 @@
       {{ end }}
     </div>
   </a>
-</div>
\ No newline at end of file
+</div>
diff --git a/website/layouts/highlights/li.html b/website/layouts/highlights/li.html
index c861cec35ad2e..d23132bd5f44e 100644
--- a/website/layouts/highlights/li.html
+++ b/website/layouts/highlights/li.html
@@ -3,12 +3,17 @@
 {{ $badges := .Params.badges }}
 {{ $colors := dict "deprecation" "red" "enhancement" "green" "new feature" "blue"
   "breaking change" "yellow" "featured" "violet" "performance" "orange"
-  "announcement" "fuchsia" }}
+  "announcement" "fuchsia"
+}}
 {{ $type := $badges.type | default "enhancement" }}
 {{ $color := index $colors $type }}
+
+
 <div>
   <a href="{{ .RelPermalink }}">
-    <div class="border-t-6 border-{{ $color }}-500 bg-gray-50 hover:bg-gray-100 dark:bg-gray-800 dark:hover:bg-gray-900 rounded-md shadow">
+    <div
+      class="border-t-6 border-{{ $color }}-500 bg-gray-50 hover:bg-gray-100 dark:bg-gray-800 dark:hover:bg-gray-900 rounded-md shadow"
+    >
       <div class="flex flex-col justify-between p-6">
         <span class="text-lg leading-tight font-semibold tracking-tight text-dark dark:text-gray-300">
           {{ $title }}
@@ -20,52 +25,32 @@
           </time>
         </p>
 
-        <div class="my-4 flex items-center">
-          <div class="flex-shrink-0">
-            <div class="flex space-x-1 relative z-0 overflow-hidden">
-              {{ range .Params.authors }}
-              {{ $img := printf "https://github.com/%s.png" . }}
-              {{ $name := (index (where site.Data.docs.authors ".handle" "eq" .) 0).name }}
-              <img class="relative z-30 inline-block h-8 w-8 rounded-full ring-1 ring-white dark:ring-dark" src="{{ $img }}" alt="Author photo for {{ $name }}">
-              {{ end }}
-            </div>
-          </div>
+        {{ partial  "author-with-avatar.html" . }}
 
 
-          <div class="ml-4 flex flex-col space-y-1">
-            {{ range .Params.authors }}
-            {{ $name := (index (where site.Data.docs.authors ".handle" "eq" .) 0).name }}
-            {{ $link := printf "https://github.com/%s" . }}
-            <a href="{{ $link }}" class="text-md font-bold tracking-tight text-gray-700 hover:text-secondary dark:text-gray-200 dark:hover:text-primary" rel="noopener" target="_blank">
-              {{ $name }}
-            </a>
-            {{ end }}
-          </div>
-        </div>
-
         <div class="block space-y-1.5">
           {{ with $badges.type }}
-          {{ $color := cond (eq . "deprecation") "red" "blue" }}
-          {{ partial "badge.html" (dict "prefix" "type" "word" . "color" $color "inline" true) }}
+            {{ $color := cond (eq . "deprecation") "red" "blue" }}
+            {{ partial "badge.html" (dict "prefix" "type" "word" . "color" $color "inline" true) }}
           {{ end }}
 
           {{ range $badges.domains }}
-          {{ partial "badge.html" (dict "prefix" "domain" "word" . "color" "indigo" "inline" true) }}
+            {{ partial "badge.html" (dict "prefix" "domain" "word" . "color" "indigo" "inline" true) }}
           {{ end }}
 
           {{ range $badges.sources }}
-          {{ partial "badge.html" (dict "prefix" "source" "word" . "color" "violet" "inline" true) }}
+            {{ partial "badge.html" (dict "prefix" "source" "word" . "color" "violet" "inline" true) }}
           {{ end }}
 
           {{ range $badges.transforms }}
-          {{ partial "badge.html" (dict "prefix" "transform" "word" . "color" "violet" "inline" true) }}
+            {{ partial "badge.html" (dict "prefix" "transform" "word" . "color" "violet" "inline" true) }}
           {{ end }}
 
           {{ range $badges.sinks }}
-          {{ partial "badge.html" (dict "prefix" "sink" "word" . "color" "violet" "inline" true) }}
+            {{ partial "badge.html" (dict "prefix" "sink" "word" . "color" "violet" "inline" true) }}
           {{ end }}
         </div>
       </div>
     </div>
   </a>
-</div>
\ No newline at end of file
+</div>
diff --git a/website/layouts/partials/author-with-avatar.html b/website/layouts/partials/author-with-avatar.html
new file mode 100644
index 0000000000000..def78c8a08735
--- /dev/null
+++ b/website/layouts/partials/author-with-avatar.html
@@ -0,0 +1,35 @@
+<div class="flex items-center">
+<pre>{{ jsonify .Params.authors }}</pre>
+
+  {{ if or (not .Params.authors) (eq (len .Params.authors) 0) }}
+    <div class="ml-4 flex flex-col space-y-1">
+      <span class="text-md font-bold tracking-tight text-gray-700 dark:text-gray-200">
+        Unknown author
+      </span>
+    </div>
+  {{ else }}
+    <div class="flex-shrink-0">
+      <div class="flex -space-x-1 relative z-0 overflow-hidden">
+        {{ range .Params.authors }}
+          {{ $handle := . }}
+          {{ $img := printf "https://github.com/%s.png" $handle }}
+          <img class="relative z-30 inline-block h-12 w-12 rounded-full ring-1 ring-white dark:ring-dark"
+               src="{{ $img }}"
+               alt="Author avatar for {{ $handle }}">
+        {{ end }}
+      </div>
+    </div>
+
+    <div class="ml-4 flex flex-col space-y-1">
+      {{ range .Params.authors }}
+        {{ $handle := . }}
+        {{ $link := printf "https://github.com/%s" $handle }}
+        <a href="{{ $link }}"
+           class="text-md font-bold tracking-tight text-gray-700 hover:text-secondary dark:text-gray-200"
+           rel="noopener" target="_blank">
+          {{ $handle }}
+        </a>
+      {{ end }}
+    </div>
+  {{ end }}
+</div>
diff --git a/website/layouts/partials/blog/authors.html b/website/layouts/partials/blog/authors.html
deleted file mode 100644
index 47e822ed6754a..0000000000000
--- a/website/layouts/partials/blog/authors.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<div class="flex items-center">
-  <div class="flex-shrink-0">
-    <div class="flex -space-x-1 relative z-0 overflow-hidden">
-      {{ range .Params.authors }}
-      {{ $img := printf "https://github.com/%s.png" . }}
-      {{ $name := (index (where site.Data.docs.authors ".handle" "eq" .) 0).name }}
-      <img class="relative z-30 inline-block h-12 w-12 rounded-full ring-1 ring-white dark:ring-dark" src="{{ $img }}" alt="Author photo for {{ $name }}">
-      {{ end }}
-    </div>
-  </div>
-
-
-  <div class="ml-4 flex flex-col space-y-1">
-    {{ range .Params.authors }}
-    {{ $name := (index (where site.Data.docs.authors ".handle" "eq" .) 0).name }}
-    {{ $link := printf "https://github.com/%s" . }}
-    <a href="{{ $link }}" class="text-md font-bold tracking-tight text-gray-700 hover:text-secondary dark:text-gray-200" rel="noopener" target="_blank">
-      {{ $name }}
-    </a>
-    {{ end }}
-  </div>
-</div>
diff --git a/website/layouts/partials/blog/content.html b/website/layouts/partials/blog/content.html
index c17e6c0073060..5220950dcf7f4 100644
--- a/website/layouts/partials/blog/content.html
+++ b/website/layouts/partials/blog/content.html
@@ -28,10 +28,10 @@ <h1 class="dark:text-gray-50 font-secondary font-extrabold text-4xl md:text-5xl
   </div>
 
   <div class="mt-5">
-    {{ partial "blog/authors.html" . }}
+    {{ partial "author-with-avatar.html" . }}
   </div>
 
   <div class="mt-12 prose dark:prose-dark tracking-tight">
     {{ .Content }}
   </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/website/layouts/partials/content.html b/website/layouts/partials/content.html
index 1fdfa750cbe24..6025f9f88ec97 100644
--- a/website/layouts/partials/content.html
+++ b/website/layouts/partials/content.html
@@ -21,4 +21,4 @@ <h1 class="dark:text-gray-50 font-secondary font-extrabold text-4xl lg:text-5xl
   <div class="mt-12">
     {{ partial "inner-content.html" . }}
   </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/website/layouts/partials/highlights/authors.html b/website/layouts/partials/highlights/authors.html
deleted file mode 100644
index 4841cffbe487a..0000000000000
--- a/website/layouts/partials/highlights/authors.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<div class="flex items-center">
-  <div class="flex-shrink-0">
-    <div class="flex -space-x-1 relative z-0 overflow-hidden">
-      {{ range .Params.authors }}
-      {{ $img := printf "https://github.com/%s.png" . }}
-      {{ $name := (index (where site.Data.docs.authors ".handle" "eq" .) 0).name }}
-      <img class="relative z-30 inline-block h-8 w-8 rounded-full ring-1 ring-white dark:ring-dark" src="{{ $img }}" alt="Author photo for {{ $name }}">
-      {{ end }}
-    </div>
-  </div>
-
-
-  <div class="ml-4 flex flex-col space-y-1">
-    {{ range .Params.authors }}
-    {{ $name := (index (where site.Data.docs.authors ".handle" "eq" .) 0).name }}
-    {{ $link := printf "https://github.com/%s" . }}
-    <a href="{{ $link }}" class="text-md font-bold tracking-tight text-gray-700 hover:text-secondary dark:text-gray-200">
-      {{ $name }}
-    </a>
-    {{ end }}
-  </div>
-</div>
\ No newline at end of file

From a8f54ebbb00eb7c8b8630bace36f8fe4b9f0b014 Mon Sep 17 00:00:00 2001
From: Pavlos Rontidis <pavlos.rontidis@gmail.com>
Date: Wed, 2 Jul 2025 14:29:27 -0400
Subject: [PATCH 151/305] fix(website): remove leftover dbg statement (#23331)

---
 website/layouts/partials/author-with-avatar.html | 2 --
 1 file changed, 2 deletions(-)

diff --git a/website/layouts/partials/author-with-avatar.html b/website/layouts/partials/author-with-avatar.html
index def78c8a08735..b27a88ef65c67 100644
--- a/website/layouts/partials/author-with-avatar.html
+++ b/website/layouts/partials/author-with-avatar.html
@@ -1,6 +1,4 @@
 <div class="flex items-center">
-<pre>{{ jsonify .Params.authors }}</pre>
-
   {{ if or (not .Params.authors) (eq (len .Params.authors) 0) }}
     <div class="ml-4 flex flex-col space-y-1">
       <span class="text-md font-bold tracking-tight text-gray-700 dark:text-gray-200">

From 7847e9253cbdb66550255c7fa2a274128f8b2835 Mon Sep 17 00:00:00 2001
From: rdwr-tomers <18597107+rdwr-tomers@users.noreply.github.com>
Date: Wed, 2 Jul 2025 21:16:56 +0300
Subject: [PATCH 152/305] fix(nats sink): fix vector exiting if nats sink url
 fails dns resolution or is unavailable without --require-healthy (#23287)

* fix: retry reconnecting to nats server. don't retry in healthchecks

* added changelog

* fix: renamed changelog fragment

* added author to changelog

* fix: pass options to connect instead of with_retry bool

* Update changelog.d/22914_fix_nats_sink_ignored_healthcheck.fix.md

Co-authored-by: Pavlos Rontidis <pavlos.rontidis@gmail.com>

* fix(nats sink): use connect options without retry in integration tests

* remove commented out code

* renamed changelog fragment to match new PR

* fix: cargo fmt whitespace

---------

Co-authored-by: Pavlos Rontidis <pavlos.rontidis@gmail.com>
---
 ...7_fix_nats_sink_ignored_healthcheck.fix.md |  3 ++
 src/sinks/nats/config.rs                      | 30 +++++++++++++++----
 src/sinks/nats/integration_tests.rs           |  6 ++--
 3 files changed, 32 insertions(+), 7 deletions(-)
 create mode 100644 changelog.d/23287_fix_nats_sink_ignored_healthcheck.fix.md

diff --git a/changelog.d/23287_fix_nats_sink_ignored_healthcheck.fix.md b/changelog.d/23287_fix_nats_sink_ignored_healthcheck.fix.md
new file mode 100644
index 0000000000000..5e143f6a220ad
--- /dev/null
+++ b/changelog.d/23287_fix_nats_sink_ignored_healthcheck.fix.md
@@ -0,0 +1,3 @@
+The `nats` sink now does not return an error when an unresolvable or unavailable URL is provided. Note that if `--require-healthy` is set then Vector will stop on startup.
+
+authors: rdwr-tomers
diff --git a/src/sinks/nats/config.rs b/src/sinks/nats/config.rs
index 98423b9d1f35a..c5209c54041bf 100644
--- a/src/sinks/nats/config.rs
+++ b/src/sinks/nats/config.rs
@@ -138,9 +138,10 @@ impl std::convert::TryFrom<&NatsSinkConfig> for async_nats::ConnectOptions {
 }
 
 impl NatsSinkConfig {
-    pub(super) async fn connect(&self) -> Result<async_nats::Client, NatsError> {
-        let options: async_nats::ConnectOptions = self.try_into().context(ConfigSnafu)?;
-
+    pub(super) async fn connect(
+        &self,
+        options: async_nats::ConnectOptions,
+    ) -> Result<async_nats::Client, NatsError> {
         let urls = self.parse_server_addresses()?;
         options.connect(urls).await.context(ConnectSnafu)
     }
@@ -157,8 +158,22 @@ impl NatsSinkConfig {
             .collect()
     }
 
+    #[cfg(not(test))]
+    fn create_connect_options(&self) -> Result<async_nats::ConnectOptions, NatsError> {
+        let mut options: async_nats::ConnectOptions = self.try_into().context(ConfigSnafu)?;
+        options = options.retry_on_initial_connect();
+        Ok(options)
+    }
+
+    #[cfg(test)]
+    fn create_connect_options(&self) -> Result<async_nats::ConnectOptions, NatsError> {
+        let options: async_nats::ConnectOptions = self.try_into().context(ConfigSnafu)?;
+        Ok(options)
+    }
+
     pub(super) async fn publisher(&self) -> Result<NatsPublisher, NatsError> {
-        let connection = self.connect().await?;
+        let options = self.create_connect_options()?;
+        let connection = self.connect(options).await?;
 
         if self.jetstream {
             Ok(NatsPublisher::JetStream(async_nats::jetstream::new(
@@ -171,7 +186,12 @@ impl NatsSinkConfig {
 }
 
 async fn healthcheck(config: NatsSinkConfig) -> crate::Result<()> {
-    config.connect().map_ok(|_| ()).map_err(|e| e.into()).await
+    let options: async_nats::ConnectOptions = (&config).try_into().context(ConfigSnafu)?;
+    config
+        .connect(options)
+        .map_ok(|_| ())
+        .map_err(|e| e.into())
+        .await
 }
 
 pub enum NatsPublisher {
diff --git a/src/sinks/nats/integration_tests.rs b/src/sinks/nats/integration_tests.rs
index bc0c8dce0611d..371d7af6f275d 100644
--- a/src/sinks/nats/integration_tests.rs
+++ b/src/sinks/nats/integration_tests.rs
@@ -1,7 +1,7 @@
 use std::time::Duration;
 use vector_lib::codecs::TextSerializerConfig;
 
-use super::{config::NatsSinkConfig, sink::NatsSink, NatsError};
+use super::{config::NatsSinkConfig, sink::NatsSink, ConfigSnafu, NatsError};
 use crate::{
     nats::{
         NatsAuthConfig, NatsAuthCredentialsFile, NatsAuthNKey, NatsAuthToken, NatsAuthUserPassword,
@@ -13,6 +13,7 @@ use crate::{
     },
     tls::TlsEnableableConfig,
 };
+use snafu::ResultExt;
 
 async fn publish_and_check(conf: NatsSinkConfig) -> Result<(), NatsError> {
     // Publish `N` messages to NATS.
@@ -26,9 +27,10 @@ async fn publish_and_check(conf: NatsSinkConfig) -> Result<(), NatsError> {
 
     // Establish the consumer subscription.
     let subject = conf.subject.clone();
+    let options: async_nats::ConnectOptions = (&conf).try_into().context(ConfigSnafu)?;
     let consumer = conf
         .clone()
-        .connect()
+        .connect(options)
         .await
         .expect("failed to connect with test consumer");
     let mut sub = consumer

From c4ace5b5147b328bbf2b81984ffaf25090362d88 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ensar=20Saraj=C4=8Di=C4=87?= <dev@ensarsarajcic.com>
Date: Wed, 2 Jul 2025 20:59:08 +0200
Subject: [PATCH 153/305] fix(metrics): run a separate task for utilization
 metric to ensure it is regularly updated (#22070)

* fix(utilization_metric): run a separate task for utilization to ensure it is regularly published

This adds a separate task that runs periodically to emit utilization metrics and collect messages
from components that need their utilization metrics calculated. This ensures that utilization metric
is published even when no events are running through a component.

Fixes: #20216

* Add changelog entry

* Remove unnecessary clone when building utilization task

Co-authored-by: Pavlos Rontidis <pavlos.rontidis@gmail.com>

* Name utilization task `utilization_heartbeat`

* Join `utilization_task` when stopping topology

* Shutdown utilization task when stopping topology

* Hack: fix utilization never ending, by polling another stream?

* Credit Quad9DNS in changelog

* Replace unbounded_channel with channel

* Replace unwrap with expect in utilization

* Increase timer channel buffer size

* Wrap utilization timer logic in a separate sender

* Rename start and stop fns

* Remove unused clippy check

* Replace unwrap with expect in topology start

---------

Co-authored-by: Pavlos Rontidis <pavlos.rontidis@gmail.com>
Co-authored-by: Thomas <thomas.schneider@datadoghq.com>
---
 ...70_utilization_metric_periodic_emit.fix.md |   3 +
 src/topology/builder.rs                       |  50 +++--
 src/topology/running.rs                       |  44 +++-
 src/utilization.rs                            | 188 +++++++++++++-----
 4 files changed, 213 insertions(+), 72 deletions(-)
 create mode 100644 changelog.d/22070_utilization_metric_periodic_emit.fix.md

diff --git a/changelog.d/22070_utilization_metric_periodic_emit.fix.md b/changelog.d/22070_utilization_metric_periodic_emit.fix.md
new file mode 100644
index 0000000000000..27dd9de778d79
--- /dev/null
+++ b/changelog.d/22070_utilization_metric_periodic_emit.fix.md
@@ -0,0 +1,3 @@
+The `utilization` metric is now properly published periodically, even when no events are flowing through the components.
+
+authors: esensar Quad9DNS
diff --git a/src/topology/builder.rs b/src/topology/builder.rs
index 847c0614ba697..39ec9453e6b2d 100644
--- a/src/topology/builder.rs
+++ b/src/topology/builder.rs
@@ -8,6 +8,7 @@ use std::{
 
 use futures::{stream::FuturesOrdered, FutureExt, StreamExt, TryStreamExt};
 use futures_util::stream::FuturesUnordered;
+use metrics::gauge;
 use stream_cancel::{StreamExt as StreamCancelExt, Trigger, Tripwire};
 use tokio::{
     select,
@@ -51,7 +52,7 @@ use crate::{
     spawn_named,
     topology::task::TaskError,
     transforms::{SyncTransform, TaskTransform, Transform, TransformOutputs, TransformOutputsBuf},
-    utilization::wrap,
+    utilization::{wrap, UtilizationComponentSender, UtilizationEmitter},
     SourceSender,
 };
 
@@ -84,6 +85,7 @@ struct Builder<'a> {
     healthchecks: HashMap<ComponentKey, Task>,
     detach_triggers: HashMap<ComponentKey, Trigger>,
     extra_context: ExtraContext,
+    utilization_emitter: UtilizationEmitter,
 }
 
 impl<'a> Builder<'a> {
@@ -105,6 +107,7 @@ impl<'a> Builder<'a> {
             healthchecks: HashMap::new(),
             detach_triggers: HashMap::new(),
             extra_context,
+            utilization_emitter: UtilizationEmitter::new(),
         }
     }
 
@@ -128,6 +131,7 @@ impl<'a> Builder<'a> {
                 healthchecks: self.healthchecks,
                 shutdown_coordinator: self.shutdown_coordinator,
                 detach_triggers: self.detach_triggers,
+                utilization_emitter: Some(self.utilization_emitter),
             })
         } else {
             Err(self.errors)
@@ -513,7 +517,7 @@ impl<'a> Builder<'a> {
 
             let (transform_task, transform_outputs) = {
                 let _span = span.enter();
-                build_transform(transform, node, input_rx)
+                build_transform(transform, node, input_rx, &mut self.utilization_emitter)
             };
 
             self.outputs.extend(transform_outputs);
@@ -615,6 +619,10 @@ impl<'a> Builder<'a> {
 
             let (trigger, tripwire) = Tripwire::new();
 
+            let utilization_sender = self
+                .utilization_emitter
+                .add_component(key.clone(), gauge!("utilization"));
+            let component_key = key.clone();
             let sink = async move {
                 debug!("Sink starting.");
 
@@ -630,7 +638,7 @@ impl<'a> Builder<'a> {
                     .take()
                     .expect("Task started but input has been taken.");
 
-                let mut rx = wrap(rx);
+                let mut rx = wrap(utilization_sender, component_key.clone(), rx);
 
                 let events_received = register!(EventsReceived);
                 sink.run(
@@ -711,6 +719,7 @@ pub struct TopologyPieces {
     pub(super) healthchecks: HashMap<ComponentKey, Task>,
     pub(crate) shutdown_coordinator: SourceShutdownCoordinator,
     pub(crate) detach_triggers: HashMap<ComponentKey, Trigger>,
+    pub(crate) utilization_emitter: Option<UtilizationEmitter>,
 }
 
 impl TopologyPieces {
@@ -789,11 +798,14 @@ fn build_transform(
     transform: Transform,
     node: TransformNode,
     input_rx: BufferReceiver<EventArray>,
+    utilization_emitter: &mut UtilizationEmitter,
 ) -> (Task, HashMap<OutputId, fanout::ControlChannel>) {
     match transform {
         // TODO: avoid the double boxing for function transforms here
-        Transform::Function(t) => build_sync_transform(Box::new(t), node, input_rx),
-        Transform::Synchronous(t) => build_sync_transform(t, node, input_rx),
+        Transform::Function(t) => {
+            build_sync_transform(Box::new(t), node, input_rx, utilization_emitter)
+        }
+        Transform::Synchronous(t) => build_sync_transform(t, node, input_rx, utilization_emitter),
         Transform::Task(t) => build_task_transform(
             t,
             input_rx,
@@ -801,6 +813,7 @@ fn build_transform(
             node.typetag,
             &node.key,
             &node.outputs,
+            utilization_emitter,
         ),
     }
 }
@@ -809,10 +822,12 @@ fn build_sync_transform(
     t: Box<dyn SyncTransform>,
     node: TransformNode,
     input_rx: BufferReceiver<EventArray>,
+    utilization_emitter: &mut UtilizationEmitter,
 ) -> (Task, HashMap<OutputId, fanout::ControlChannel>) {
     let (outputs, controls) = TransformOutputs::new(node.outputs, &node.key);
 
-    let runner = Runner::new(t, input_rx, node.input_details.data_type(), outputs);
+    let sender = utilization_emitter.add_component(node.key.clone(), gauge!("utilization"));
+    let runner = Runner::new(t, input_rx, sender, node.input_details.data_type(), outputs);
     let transform = if node.enable_concurrency {
         runner.run_concurrently().boxed()
     } else {
@@ -852,8 +867,7 @@ struct Runner {
     input_rx: Option<BufferReceiver<EventArray>>,
     input_type: DataType,
     outputs: TransformOutputs,
-    timer: crate::utilization::Timer,
-    last_report: Instant,
+    timer_tx: UtilizationComponentSender,
     events_received: Registered<EventsReceived>,
 }
 
@@ -861,6 +875,7 @@ impl Runner {
     fn new(
         transform: Box<dyn SyncTransform>,
         input_rx: BufferReceiver<EventArray>,
+        timer_tx: UtilizationComponentSender,
         input_type: DataType,
         outputs: TransformOutputs,
     ) -> Self {
@@ -869,18 +884,13 @@ impl Runner {
             input_rx: Some(input_rx),
             input_type,
             outputs,
-            timer: crate::utilization::Timer::new(),
-            last_report: Instant::now(),
+            timer_tx,
             events_received: register!(EventsReceived),
         }
     }
 
     fn on_events_received(&mut self, events: &EventArray) {
-        let stopped = self.timer.stop_wait();
-        if stopped.duration_since(self.last_report).as_secs() >= 5 {
-            self.timer.report();
-            self.last_report = stopped;
-        }
+        self.timer_tx.try_send_stop_wait();
 
         self.events_received.emit(CountByteSize(
             events.len(),
@@ -889,7 +899,7 @@ impl Runner {
     }
 
     async fn send_outputs(&mut self, outputs_buf: &mut TransformOutputsBuf) -> crate::Result<()> {
-        self.timer.start_wait();
+        self.timer_tx.try_send_start_wait();
         self.outputs.send(outputs_buf).await
     }
 
@@ -906,7 +916,7 @@ impl Runner {
             .into_stream()
             .filter(move |events| ready(filter_events_type(events, self.input_type)));
 
-        self.timer.start_wait();
+        self.timer_tx.try_send_start_wait();
         while let Some(events) = input_rx.next().await {
             self.on_events_received(&events);
             self.transform.transform_all(events, &mut outputs_buf);
@@ -932,7 +942,7 @@ impl Runner {
         let mut in_flight = FuturesOrdered::new();
         let mut shutting_down = false;
 
-        self.timer.start_wait();
+        self.timer_tx.try_send_start_wait();
         loop {
             tokio::select! {
                 biased;
@@ -993,10 +1003,12 @@ fn build_task_transform(
     typetag: &str,
     key: &ComponentKey,
     outputs: &[TransformOutput],
+    utilization_emitter: &mut UtilizationEmitter,
 ) -> (Task, HashMap<OutputId, fanout::ControlChannel>) {
     let (mut fanout, control) = Fanout::new();
 
-    let input_rx = crate::utilization::wrap(input_rx.into_stream());
+    let sender = utilization_emitter.add_component(key.clone(), gauge!("utilization"));
+    let input_rx = wrap(sender, key.clone(), input_rx.into_stream());
 
     let events_received = register!(EventsReceived);
     let filtered = input_rx
diff --git a/src/topology/running.rs b/src/topology/running.rs
index 8429359976a07..5c763ea6e7eba 100644
--- a/src/topology/running.rs
+++ b/src/topology/running.rs
@@ -7,11 +7,10 @@ use std::{
 };
 
 use super::{
-    builder,
-    builder::TopologyPieces,
+    builder::{self, TopologyPieces},
     fanout::{ControlChannel, ControlMessage},
     handle_errors, retain, take_healthchecks,
-    task::TaskOutput,
+    task::{Task, TaskOutput},
     BuiltBuffer, TaskHandle,
 };
 use crate::{
@@ -23,14 +22,15 @@ use crate::{
     spawn_named,
 };
 use futures::{future, Future, FutureExt};
+use stream_cancel::Trigger;
 use tokio::{
     sync::{mpsc, watch},
     time::{interval, sleep_until, Duration, Instant},
 };
 use tracing::Instrument;
-use vector_lib::buffers::topology::channel::BufferSender;
 use vector_lib::tap::topology::{TapOutput, TapResource, WatchRx, WatchTx};
 use vector_lib::trigger::DisabledTrigger;
+use vector_lib::{buffers::topology::channel::BufferSender, shutdown::ShutdownSignal};
 
 pub type ShutdownErrorReceiver = mpsc::UnboundedReceiver<ShutdownError>;
 
@@ -49,6 +49,8 @@ pub struct RunningTopology {
     watch: (WatchTx, WatchRx),
     pub(crate) running: Arc<AtomicBool>,
     graceful_shutdown_duration: Option<Duration>,
+    utilization_task: Option<TaskHandle>,
+    utilization_task_shutdown_trigger: Option<Trigger>,
     pending_reload: Option<HashSet<ComponentKey>>,
 }
 
@@ -68,6 +70,8 @@ impl RunningTopology {
             running: Arc::new(AtomicBool::new(true)),
             graceful_shutdown_duration: config.graceful_shutdown_duration,
             config,
+            utilization_task: None,
+            utilization_task_shutdown_trigger: None,
             pending_reload: None,
         }
     }
@@ -127,15 +131,21 @@ impl RunningTopology {
         // pump in self.tasks, and the other for source in self.source_tasks.
         let mut check_handles = HashMap::<ComponentKey, Vec<_>>::new();
 
+        let map_closure = |_result| ();
+
         // We need to give some time to the sources to gracefully shutdown, so
         // we will merge them with other tasks.
         for (key, task) in self.tasks.into_iter().chain(self.source_tasks.into_iter()) {
-            let task = task.map(|_result| ()).shared();
+            let task = task.map(map_closure).shared();
 
             wait_handles.push(task.clone());
             check_handles.entry(key).or_default().push(task);
         }
 
+        if let Some(utilization_task) = self.utilization_task {
+            wait_handles.push(utilization_task.map(map_closure).shared());
+        }
+
         // If we reach this, we will forcefully shutdown the sources. If None, we will never force shutdown.
         let deadline = self
             .graceful_shutdown_duration
@@ -212,6 +222,9 @@ impl RunningTopology {
 
         // Now kick off the shutdown process by shutting down the sources.
         let source_shutdown_complete = self.shutdown_coordinator.shutdown_all(deadline);
+        if let Some(trigger) = self.utilization_task_shutdown_trigger {
+            trigger.cancel();
+        }
 
         futures::future::join(source_shutdown_complete, shutdown_complete_future).map(|_| ())
     }
@@ -1220,6 +1233,10 @@ impl RunningTopology {
             return None;
         }
 
+        let mut utilization_emitter = pieces
+            .utilization_emitter
+            .take()
+            .expect("Topology is missing the utilization metric emitter!");
         let mut running_topology = Self::new(config, abort_tx);
 
         if !running_topology
@@ -1231,6 +1248,23 @@ impl RunningTopology {
         running_topology.connect_diff(&diff, &mut pieces).await;
         running_topology.spawn_diff(&diff, pieces);
 
+        let (utilization_task_shutdown_trigger, utilization_shutdown_signal, _) =
+            ShutdownSignal::new_wired();
+        running_topology.utilization_task_shutdown_trigger =
+            Some(utilization_task_shutdown_trigger);
+        running_topology.utilization_task = Some(tokio::spawn(Task::new(
+            "utilization_heartbeat".into(),
+            "",
+            async move {
+                utilization_emitter
+                    .run_utilization(utilization_shutdown_signal)
+                    .await;
+                // TODO: new task output type for this? Or handle this task in a completely
+                // different way
+                Ok(TaskOutput::Healthcheck)
+            },
+        )));
+
         Some((running_topology, abort_rx))
     }
 }
diff --git a/src/utilization.rs b/src/utilization.rs
index 2d19cf9c2d150..cdb2cafcf2222 100644
--- a/src/utilization.rs
+++ b/src/utilization.rs
@@ -1,21 +1,25 @@
 use std::{
+    collections::HashMap,
     pin::Pin,
     task::{ready, Context, Poll},
     time::{Duration, Instant},
 };
+use tokio::sync::mpsc::{channel, Receiver, Sender};
 
 use futures::{Stream, StreamExt};
-use metrics::gauge;
+use metrics::Gauge;
 use pin_project::pin_project;
 use tokio::time::interval;
 use tokio_stream::wrappers::IntervalStream;
+use vector_lib::{id::ComponentKey, shutdown::ShutdownSignal};
 
 use crate::stats;
 
 #[pin_project]
 pub(crate) struct Utilization<S> {
-    timer: Timer,
     intervals: IntervalStream,
+    timer_tx: UtilizationComponentSender,
+    component_key: ComponentKey,
     inner: S,
 }
 
@@ -42,50 +46,24 @@ where
         // ready, with the side-effect of reporting every so often about how
         // long the wait gap is.
         //
-        // To achieve this we poll the `intervals` stream and if a new interval
-        // is ready we hit `Timer::report` and loop back around again to poll
-        // for a new `Event`. Calls to `Timer::start_wait` will only have an
-        // effect if `stop_wait` has been called, so the structure of this loop
-        // avoids double-measures.
+        // This will just measure the time, while UtilizationEmitter collects
+        // all the timers and emits utilization value periodically
         let this = self.project();
-        loop {
-            this.timer.start_wait();
-            match this.intervals.poll_next_unpin(cx) {
-                Poll::Ready(_) => {
-                    this.timer.report();
-                    continue;
-                }
-                Poll::Pending => {
-                    let result = ready!(this.inner.poll_next_unpin(cx));
-                    this.timer.stop_wait();
-                    return Poll::Ready(result);
-                }
-            }
-        }
-    }
-}
-
-/// Wrap a stream to emit stats about utilization. This is designed for use with
-/// the input channels of transform and sinks components, and measures the
-/// amount of time that the stream is waiting for input from upstream. We make
-/// the simplifying assumption that this wait time is when the component is idle
-/// and the rest of the time it is doing useful work. This is more true for
-/// sinks than transforms, which can be blocked by downstream components, but
-/// with knowledge of the config the data is still useful.
-pub(crate) fn wrap<S>(inner: S) -> Utilization<S> {
-    Utilization {
-        timer: Timer::new(),
-        intervals: IntervalStream::new(interval(Duration::from_secs(5))),
-        inner,
+        this.timer_tx.try_send_start_wait();
+        let _ = this.intervals.poll_next_unpin(cx);
+        let result = ready!(this.inner.poll_next_unpin(cx));
+        this.timer_tx.try_send_stop_wait();
+        Poll::Ready(result)
     }
 }
 
-pub(super) struct Timer {
+pub(crate) struct Timer {
     overall_start: Instant,
     span_start: Instant,
     waiting: bool,
     total_wait: Duration,
     ewma: stats::Ewma,
+    gauge: Gauge,
 }
 
 /// A simple, specialized timer for tracking spans of waiting vs not-waiting
@@ -97,32 +75,33 @@ pub(super) struct Timer {
 /// to be of uniform length and used to aggregate span data into time-weighted
 /// averages.
 impl Timer {
-    pub(crate) fn new() -> Self {
+    pub(crate) fn new(gauge: Gauge) -> Self {
         Self {
             overall_start: Instant::now(),
             span_start: Instant::now(),
             waiting: false,
             total_wait: Duration::new(0, 0),
             ewma: stats::Ewma::new(0.9),
+            gauge,
         }
     }
 
     /// Begin a new span representing time spent waiting
-    pub(crate) fn start_wait(&mut self) {
+    pub(crate) fn start_wait(&mut self, at: Instant) {
         if !self.waiting {
-            self.end_span();
+            self.end_span(at);
             self.waiting = true;
         }
     }
 
     /// Complete the current waiting span and begin a non-waiting span
-    pub(crate) fn stop_wait(&mut self) -> Instant {
+    pub(crate) fn stop_wait(&mut self, at: Instant) -> Instant {
         if self.waiting {
-            let now = self.end_span();
+            let now = self.end_span(at);
             self.waiting = false;
             now
         } else {
-            Instant::now()
+            at
         }
     }
 
@@ -133,7 +112,7 @@ impl Timer {
         // End the current span so it can be accounted for, but do not change
         // whether or not we're in the waiting state. This way the next span
         // inherits the correct status.
-        let now = self.end_span();
+        let now = self.end_span(Instant::now());
 
         let total_duration = now.duration_since(self.overall_start);
         let wait_ratio = self.total_wait.as_secs_f64() / total_duration.as_secs_f64();
@@ -142,18 +121,131 @@ impl Timer {
         self.ewma.update(utilization);
         let avg = self.ewma.average().unwrap_or(f64::NAN);
         debug!(utilization = %avg);
-        gauge!("utilization").set(avg);
+        self.gauge.set(avg);
 
         // Reset overall statistics for the next reporting period.
         self.overall_start = self.span_start;
         self.total_wait = Duration::new(0, 0);
     }
 
-    fn end_span(&mut self) -> Instant {
+    fn end_span(&mut self, at: Instant) -> Instant {
         if self.waiting {
-            self.total_wait += self.span_start.elapsed();
+            self.total_wait += at - self.span_start;
         }
-        self.span_start = Instant::now();
+        self.span_start = at;
         self.span_start
     }
 }
+
+#[derive(Debug)]
+enum UtilizationTimerMessage {
+    StartWait(ComponentKey, Instant),
+    StopWait(ComponentKey, Instant),
+}
+
+pub(crate) struct UtilizationComponentSender {
+    component_key: ComponentKey,
+    timer_tx: Sender<UtilizationTimerMessage>,
+}
+
+impl UtilizationComponentSender {
+    pub(crate) fn try_send_start_wait(&self) {
+        if let Err(err) = self.timer_tx.try_send(UtilizationTimerMessage::StartWait(
+            self.component_key.clone(),
+            Instant::now(),
+        )) {
+            debug!(component_id = ?self.component_key, error = ?err, "Couldn't send utilization start wait message.");
+        }
+    }
+
+    pub(crate) fn try_send_stop_wait(&self) {
+        if let Err(err) = self.timer_tx.try_send(UtilizationTimerMessage::StopWait(
+            self.component_key.clone(),
+            Instant::now(),
+        )) {
+            debug!(component_id = ?self.component_key, error = ?err, "Couldn't send utilization stop wait message.");
+        }
+    }
+}
+
+pub(crate) struct UtilizationEmitter {
+    timers: HashMap<ComponentKey, Timer>,
+    timer_rx: Receiver<UtilizationTimerMessage>,
+    timer_tx: Sender<UtilizationTimerMessage>,
+    intervals: IntervalStream,
+}
+
+impl UtilizationEmitter {
+    pub(crate) fn new() -> Self {
+        let (timer_tx, timer_rx) = channel(4096);
+        Self {
+            timers: HashMap::default(),
+            intervals: IntervalStream::new(interval(Duration::from_secs(5))),
+            timer_tx,
+            timer_rx,
+        }
+    }
+
+    /// Adds a new component to this utilization metric emitter
+    ///
+    /// Returns a sender which can be used to send utilization information back to the emitter
+    pub(crate) fn add_component(
+        &mut self,
+        key: ComponentKey,
+        gauge: Gauge,
+    ) -> UtilizationComponentSender {
+        self.timers.insert(key.clone(), Timer::new(gauge));
+        UtilizationComponentSender {
+            timer_tx: self.timer_tx.clone(),
+            component_key: key,
+        }
+    }
+
+    pub(crate) async fn run_utilization(&mut self, mut shutdown: ShutdownSignal) {
+        loop {
+            tokio::select! {
+                message = self.timer_rx.recv() => {
+                    match message {
+                        Some(UtilizationTimerMessage::StartWait(key, start_time)) => {
+                            self.timers.get_mut(&key).expect("Utilization timer missing for component").start_wait(start_time);
+                        }
+                        Some(UtilizationTimerMessage::StopWait(key, stop_time)) => {
+                            self.timers.get_mut(&key).expect("Utilization timer missing for component").stop_wait(stop_time);
+                        }
+                        None => break,
+                    }
+                },
+
+                Some(_) = self.intervals.next() => {
+                    for timer in self.timers.values_mut() {
+                        timer.report();
+                    }
+                },
+
+                _ = &mut shutdown => {
+                    break
+                }
+            }
+        }
+    }
+}
+
+/// Wrap a stream to emit stats about utilization. This is designed for use with
+/// the input channels of transform and sinks components, and measures the
+/// amount of time that the stream is waiting for input from upstream. We make
+/// the simplifying assumption that this wait time is when the component is idle
+/// and the rest of the time it is doing useful work. This is more true for
+/// sinks than transforms, which can be blocked by downstream components, but
+/// with knowledge of the config the data is still useful.
+pub(crate) fn wrap<S>(
+    timer_tx: UtilizationComponentSender,
+    component_key: ComponentKey,
+    inner: S,
+) -> Utilization<S> {
+    Utilization {
+        intervals: IntervalStream::new(interval(Duration::from_secs(5))),
+        timer_tx,
+        component_key,
+        inner,
+    }
+}

From 2fa1b6bf207539b931d370bbaa752ac2c79a1899 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 2 Jul 2025 16:05:51 -0400
Subject: [PATCH 154/305] chore(deps): Bump criterion from 0.5.1 to 0.6.0
 (#23133)

* chore(deps): Bump criterion from 0.5.1 to 0.6.0

Bumps [criterion](https://github.com/bheisler/criterion.rs) from 0.5.1 to 0.6.0.
- [Changelog](https://github.com/bheisler/criterion.rs/blob/master/CHANGELOG.md)
- [Commits](https://github.com/bheisler/criterion.rs/compare/0.5.1...0.6.0)

---
updated-dependencies:
- dependency-name: criterion
  dependency-version: 0.6.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* deprecation fix

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Pavlos Rontidis <pavlos.rontidis@gmail.com>
Co-authored-by: Thomas <thomas.schneider@datadoghq.com>
---
 Cargo.lock                         | 10 +++-------
 Cargo.toml                         |  2 +-
 lib/dnsmsg-parser/Cargo.toml       |  2 +-
 lib/file-source/Cargo.toml         |  2 +-
 lib/tracing-limit/Cargo.toml       |  2 +-
 lib/tracing-limit/benches/limit.rs |  9 ++++-----
 lib/vector-buffers/Cargo.toml      |  2 +-
 lib/vector-core/Cargo.toml         |  2 +-
 8 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 9a55cb28c2091..4d0a9bc039a30 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2601,26 +2601,22 @@ dependencies = [
 
 [[package]]
 name = "criterion"
-version = "0.5.1"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2b12d017a929603d80db1831cd3a24082f8137ce19c69e6447f54f5fc8d692f"
+checksum = "3bf7af66b0989381bd0be551bd7cc91912a655a58c6918420c9527b1fd8b4679"
 dependencies = [
  "anes",
  "cast",
  "ciborium",
  "clap",
  "criterion-plot",
- "futures 0.3.31",
- "is-terminal",
- "itertools 0.10.5",
+ "itertools 0.13.0",
  "num-traits",
- "once_cell",
  "oorandom",
  "plotters",
  "rayon",
  "regex",
  "serde",
- "serde_derive",
  "serde_json",
  "tinytemplate",
  "tokio",
diff --git a/Cargo.toml b/Cargo.toml
index 4b19eecd90db3..b5e3263782c3b 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -437,7 +437,7 @@ azure_identity = { version = "0.17", default-features = false, features = ["enab
 azure_storage_blobs = { version = "0.17", default-features = false, features = ["azurite_workaround"] }
 azure_storage = { version = "0.17", default-features = false }
 base64 = "0.22.1"
-criterion = { version = "0.5.1", features = ["html_reports", "async_tokio"] }
+criterion = { version = "0.6.0", features = ["html_reports", "async_tokio"] }
 itertools = { version = "0.14.0", default-features = false, features = ["use_alloc"] }
 libc = "0.2.174"
 similar-asserts = "1.7.0"
diff --git a/lib/dnsmsg-parser/Cargo.toml b/lib/dnsmsg-parser/Cargo.toml
index 4722e929c13cc..69378f2e56b99 100644
--- a/lib/dnsmsg-parser/Cargo.toml
+++ b/lib/dnsmsg-parser/Cargo.toml
@@ -12,7 +12,7 @@ hickory-proto.workspace = true
 snafu.workspace = true
 
 [dev-dependencies]
-criterion = "0.5"
+criterion = "0.6"
 
 [lib]
 bench = false
diff --git a/lib/file-source/Cargo.toml b/lib/file-source/Cargo.toml
index d9d57d8c09ada..e4ff2274d7c59 100644
--- a/lib/file-source/Cargo.toml
+++ b/lib/file-source/Cargo.toml
@@ -73,7 +73,7 @@ default-features = false
 features = ["full"]
 
 [dev-dependencies]
-criterion = "0.5"
+criterion = "0.6"
 quickcheck = "1"
 tempfile.workspace = true
 similar-asserts = "1.7.0"
diff --git a/lib/tracing-limit/Cargo.toml b/lib/tracing-limit/Cargo.toml
index f3ea08910e4cd..8d8b430c9033a 100644
--- a/lib/tracing-limit/Cargo.toml
+++ b/lib/tracing-limit/Cargo.toml
@@ -12,7 +12,7 @@ tracing-subscriber = { version = "0.3", default-features = false, features = ["r
 dashmap = { version = "6.1.0", default-features = false }
 
 [dev-dependencies]
-criterion = "0.5"
+criterion = "0.6"
 tracing = "0.1.34"
 mock_instant = { version = "0.6" }
 tracing-subscriber = { version = "0.3.19", default-features = false, features = ["env-filter", "fmt"] }
diff --git a/lib/tracing-limit/benches/limit.rs b/lib/tracing-limit/benches/limit.rs
index 86ffbae5bf206..f983e9be48b90 100644
--- a/lib/tracing-limit/benches/limit.rs
+++ b/lib/tracing-limit/benches/limit.rs
@@ -1,15 +1,14 @@
-#[macro_use]
-extern crate tracing;
-
 #[macro_use]
 extern crate criterion;
+#[macro_use]
+extern crate tracing;
 
+use criterion::{BenchmarkId, Criterion};
+use std::hint::black_box;
 use std::{
     fmt,
     sync::{Mutex, MutexGuard},
 };
-
-use criterion::{black_box, BenchmarkId, Criterion};
 use tracing::{field, span, subscriber::Interest, Event, Metadata, Subscriber};
 use tracing_limit::RateLimitedLayer;
 use tracing_subscriber::layer::{Context, Layer, SubscriberExt};
diff --git a/lib/vector-buffers/Cargo.toml b/lib/vector-buffers/Cargo.toml
index 312d7f4fa1b12..66b84459c7864 100644
--- a/lib/vector-buffers/Cargo.toml
+++ b/lib/vector-buffers/Cargo.toml
@@ -35,7 +35,7 @@ vector-common = { path = "../vector-common", default-features = false, features
 
 [dev-dependencies]
 clap.workspace = true
-criterion = { version = "0.5", features = ["html_reports", "async_tokio"] }
+criterion = { version = "0.6", features = ["html_reports", "async_tokio"] }
 crossbeam-queue = "0.3.12"
 hdrhistogram = "7.5.4"
 metrics-tracing-context.workspace = true
diff --git a/lib/vector-core/Cargo.toml b/lib/vector-core/Cargo.toml
index d102265a53ac7..8c360e741452a 100644
--- a/lib/vector-core/Cargo.toml
+++ b/lib/vector-core/Cargo.toml
@@ -78,7 +78,7 @@ prost-build.workspace = true
 [dev-dependencies]
 base64 = "0.22.1"
 chrono-tz.workspace = true
-criterion = { version = "0.5.1", features = ["html_reports"] }
+criterion = { version = "0.6.0", features = ["html_reports"] }
 env-test-util = "1.0.1"
 quickcheck = "1"
 quickcheck_macros = "1"

From 65d6a86a48e36bb19e8b014b888a979687dd0b27 Mon Sep 17 00:00:00 2001
From: Pavlos Rontidis <pavlos.rontidis@gmail.com>
Date: Thu, 3 Jul 2025 12:00:25 -0400
Subject: [PATCH 155/305] fix(website): remove broken metrics table rendering
 (#23335)

---
 .../en/docs/administration/monitoring.md      |  5 +--
 .../shortcodes/internal-metrics-list.html     | 38 -------------------
 2 files changed, 2 insertions(+), 41 deletions(-)
 delete mode 100644 website/layouts/shortcodes/internal-metrics-list.html

diff --git a/website/content/en/docs/administration/monitoring.md b/website/content/en/docs/administration/monitoring.md
index 0ba4e7320ba02..72d1dbd41baac 100644
--- a/website/content/en/docs/administration/monitoring.md
+++ b/website/content/en/docs/administration/monitoring.md
@@ -113,9 +113,7 @@ sinks:
 ### Metrics catalogue
 
 The table below provides a list of internal metrics provided by Vector. See the docs for the [`internal_metrics`
-source][output] for more detailed information about the available metrics.
-
-{{< internal-metrics-list >}}
+source][output] for more detailed information about the available metrics and the [debugging guide][debugging_guide] on how to use them.
 
 ## Troubleshooting
 
@@ -151,3 +149,4 @@ IO and disrupting the service. The trade-off is that repetitive logs aren't logg
 [transform]: /transforms
 [troubleshooting]: /guides/level-up/troubleshooting
 [vrl]: /docs/reference/vrl
+[debugging_guide]: /guides/developer/debugging#visualizing-and-querying-internal-metrics
diff --git a/website/layouts/shortcodes/internal-metrics-list.html b/website/layouts/shortcodes/internal-metrics-list.html
deleted file mode 100644
index 0c15c1fcd8396..0000000000000
--- a/website/layouts/shortcodes/internal-metrics-list.html
+++ /dev/null
@@ -1,38 +0,0 @@
-{{ $metrics := site.Data.docs.components.sources.internal_metrics.output.metrics }}
-<div class="overflow-x-scroll">
-  <table>
-    <thead>
-      <tr>
-        <th>
-          Name
-        </th>
-        <th>
-          Description
-        </th>
-        <th>
-          Data type
-        </th>
-      </tr>
-    </thead>
-    <tbody>
-      {{ range $metrics }}
-      <tr>
-        <td>
-          <code>
-            {{ .name }}
-          </code>
-        </td>
-        <td>
-          {{ .description | markdownify }}
-        </td>
-        <td>
-          {{ $href := printf "/docs/architecture/data-model/metric/#%s" .type }}
-          <a href="{{ $href }}">
-            {{ .type }}
-          </a>
-        </td>
-      </tr>
-      {{ end }}
-    </tbody>
-  </table>
-</div>

From 21bb9f7ed92c98649c89835669a8628bdc51f048 Mon Sep 17 00:00:00 2001
From: Thomas <thomas.schneider@datadoghq.com>
Date: Thu, 3 Jul 2025 13:23:51 -0400
Subject: [PATCH 156/305] fix(ci): integration remove useless setup job
 (#23337)

---
 .github/workflows/integration.yml | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
index eae42b102028a..0f307e0272cb6 100644
--- a/.github/workflows/integration.yml
+++ b/.github/workflows/integration.yml
@@ -18,8 +18,6 @@ concurrency:
   cancel-in-progress: true
 
 env:
-  AWS_ACCESS_KEY_ID: "dummy"
-  AWS_SECRET_ACCESS_KEY: "dummy"
   CONTAINER_TOOL: "docker"
   DD_ENV: "ci"
   DD_API_KEY: ${{ secrets.DD_API_KEY }}
@@ -62,22 +60,10 @@ jobs:
             echo "can_access_secrets=false" >> $GITHUB_OUTPUT
           fi
 
-  setup:
-    runs-on: ubuntu-latest
-    needs: check-secrets
-    if: ${{ github.event_name == 'merge_group' || needs.check-secrets.outputs.can_access_secrets == 'true' }}
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Run setup steps required by the IT suite
-        run: |
-          sudo -E bash scripts/ci-free-disk-space.sh
-
   integration-tests:
     runs-on: ubuntu-24.04
     needs:
       - changes
-      - setup
       - check-secrets
 
     if: ${{ !failure() && !cancelled() && (needs.check-secrets.outputs.can_access_secrets == 'true' || github.event_name == 'merge_group') }}
@@ -139,7 +125,6 @@ jobs:
     timeout-minutes: 5
     if: always()
     needs:
-      - setup
       - integration-tests
     env:
       FAILED: ${{ contains(needs.*.result, 'failure') }}

From 1c4472a07e479976eb061d1fbda2f44e184ec8df Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 3 Jul 2025 21:09:54 +0000
Subject: [PATCH 157/305] chore(deps): Bump databend-client from 0.22.2 to
 0.27.1 (#22301)

* chore(deps): Bump databend-client from 0.22.2 to 0.25.4

Bumps [databend-client](https://github.com/databendlabs/bendsql) from 0.22.2 to 0.25.4.
- [Release notes](https://github.com/databendlabs/bendsql/releases)
- [Commits](https://github.com/databendlabs/bendsql/compare/v0.22.2...v0.25.4)

---
updated-dependencies:
- dependency-name: databend-client
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* Remove deprecated fns

* Fix databend integration test

* Fix clippy

* Remove useless Arc::from

* cargo vdev build licenses

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Thomas Schneider <thomas.schneider@datadoghq.com>
---
 Cargo.lock                              | 41 ++++++++++++++++++++++---
 Cargo.toml                              |  2 +-
 LICENSE-3rdparty.csv                    |  2 ++
 src/sinks/databend/config.rs            |  5 +--
 src/sinks/databend/integration_tests.rs | 17 +++++-----
 src/sinks/databend/service.rs           | 35 +++++++++++----------
 6 files changed, 71 insertions(+), 31 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 4d0a9bc039a30..de30dca8eb714 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2328,7 +2328,7 @@ version = "3.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fde0e0ec90c9dfb3b4b1a0891a7dcd0e2bffde2f7efed5fe7c9bb00e5bfb915e"
 dependencies = [
- "windows-sys 0.48.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -2507,12 +2507,41 @@ dependencies = [
  "unicode-segmentation",
 ]
 
+[[package]]
+name = "cookie"
+version = "0.18.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ddef33a339a91ea89fb53151bd0a4689cfce27055c291dfa69945475d22c747"
+dependencies = [
+ "percent-encoding",
+ "time",
+ "version_check",
+]
+
 [[package]]
 name = "cookie-factory"
 version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "396de984970346b0d9e93d1415082923c679e5ae5c3ee3dcbd104f5610af126b"
 
+[[package]]
+name = "cookie_store"
+version = "0.21.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2eac901828f88a5241ee0600950ab981148a18f2f756900ffba1b125ca6a3ef9"
+dependencies = [
+ "cookie",
+ "document-features",
+ "idna 1.0.3",
+ "log",
+ "publicsuffix",
+ "serde",
+ "serde_derive",
+ "serde_json",
+ "time",
+ "url",
+]
+
 [[package]]
 name = "core-foundation"
 version = "0.9.3"
@@ -2951,11 +2980,11 @@ checksum = "5c297a1c74b71ae29df00c3e22dd9534821d60eb9af5a0192823fa2acea70c2a"
 
 [[package]]
 name = "databend-client"
-version = "0.22.2"
+version = "0.27.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd8770a1c49fa21e62a768a0de442cc3f77998a357303d56ddd3485cb7c58d3a"
+checksum = "98306030d9bd9802fa38866eb8b9254f2eeeda44094b4191623d3d73d20b02d2"
 dependencies = [
- "async-trait",
+ "cookie",
  "log",
  "once_cell",
  "parking_lot",
@@ -4766,7 +4795,7 @@ dependencies = [
  "httpdate",
  "itoa",
  "pin-project-lite",
- "socket2 0.4.10",
+ "socket2 0.5.10",
  "tokio",
  "tower-service",
  "tracing 0.1.41",
@@ -8649,6 +8678,8 @@ checksum = "a77c62af46e79de0a562e1a9849205ffcb7fc1238876e9bd743357570e04046f"
 dependencies = [
  "base64 0.22.1",
  "bytes 1.10.1",
+ "cookie",
+ "cookie_store",
  "futures-core",
  "futures-util",
  "http 1.1.0",
diff --git a/Cargo.toml b/Cargo.toml
index b5e3263782c3b..d81aba519ac3c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -325,7 +325,7 @@ chrono.workspace = true
 chrono-tz.workspace = true
 colored = { version = "3.0.0", default-features = false }
 csv = { version = "1.3", default-features = false }
-databend-client = { version = "0.22.2", default-features = false, features = ["rustls"], optional = true }
+databend-client = { version = "0.27.1", default-features = false, features = ["rustls"], optional = true }
 derivative = { version = "2.2.0", default-features = false }
 dirs-next = { version = "2.0.0", default-features = false, optional = true }
 dyn-clone = { version = "1.0.19", default-features = false }
diff --git a/LICENSE-3rdparty.csv b/LICENSE-3rdparty.csv
index da525d7a56ee5..e4e9df7daad43 100644
--- a/LICENSE-3rdparty.csv
+++ b/LICENSE-3rdparty.csv
@@ -147,7 +147,9 @@ const-oid,https://github.com/RustCrypto/formats/tree/master/const-oid,Apache-2.0
 const_fn,https://github.com/taiki-e/const_fn,Apache-2.0 OR MIT,The const_fn Authors
 convert_case,https://github.com/rutrum/convert-case,MIT,David Purdum <purdum41@gmail.com>
 convert_case,https://github.com/rutrum/convert-case,MIT,rutrum <dave@rutrum.net>
+cookie,https://github.com/SergioBenitez/cookie-rs,MIT OR Apache-2.0,"Sergio Benitez <sb@sergio.bz>, Alex Crichton <alex@alexcrichton.com>"
 cookie-factory,https://github.com/rust-bakery/cookie-factory,MIT,"Geoffroy Couprie <geo.couprie@gmail.com>, Pierre Chifflier <chifflier@wzdftpd.net>"
+cookie_store,https://github.com/pfernie/cookie_store,MIT OR Apache-2.0,Patrick Fernie <patrick.fernie@gmail.com>
 core-foundation,https://github.com/servo/core-foundation-rs,MIT  OR  Apache-2.0,The Servo Project Developers
 core-foundation,https://github.com/servo/core-foundation-rs,MIT OR Apache-2.0,The Servo Project Developers
 core2,https://github.com/bbqsrc/core2,Apache-2.0 OR MIT,Brendan Molloy <brendan@bbqsrc.net>
diff --git a/src/sinks/databend/config.rs b/src/sinks/databend/config.rs
index 7c27fdbaac513..62b776ba6a3cd 100644
--- a/src/sinks/databend/config.rs
+++ b/src/sinks/databend/config.rs
@@ -1,4 +1,5 @@
 use std::collections::BTreeMap;
+use std::sync::Arc;
 
 use databend_client::APIClient as DatabendAPIClient;
 use futures::future::FutureExt;
@@ -204,8 +205,8 @@ impl SinkConfig for DatabendConfig {
     }
 }
 
-async fn select_one(client: DatabendAPIClient) -> crate::Result<()> {
-    client.query("SELECT 1").await?;
+async fn select_one(client: Arc<DatabendAPIClient>) -> crate::Result<()> {
+    client.query_all("SELECT 1").await?;
     Ok(())
 }
 
diff --git a/src/sinks/databend/integration_tests.rs b/src/sinks/databend/integration_tests.rs
index cfca418d86848..1a5284eb6bf2e 100644
--- a/src/sinks/databend/integration_tests.rs
+++ b/src/sinks/databend/integration_tests.rs
@@ -1,10 +1,10 @@
 use std::collections::BTreeMap;
+use std::sync::Arc;
 
 use futures::future::ready;
 use futures::stream;
 
-use databend_client::response::QueryResponse as DatabendAPIResponse;
-use databend_client::APIClient as DatabendAPIClient;
+use databend_client::{APIClient as DatabendAPIClient, Page};
 use vector_lib::event::{BatchNotifier, BatchStatus, BatchStatusReceiver, Event, LogEvent};
 
 use crate::sinks::util::test::load_sink;
@@ -31,7 +31,10 @@ fn make_event() -> (Event, BatchStatusReceiver) {
     (event.into(), receiver)
 }
 
-async fn prepare_config(codec: &str, compression: &str) -> (String, String, DatabendAPIClient) {
+async fn prepare_config(
+    codec: &str,
+    compression: &str,
+) -> (String, String, Arc<DatabendAPIClient>) {
     trace_init();
 
     let table = random_table_name();
@@ -89,12 +92,12 @@ async fn prepare_config(codec: &str, compression: &str) -> (String, String, Data
     (cfg, table, client)
 }
 
-async fn insert_event_with_cfg(cfg: String, table: String, client: DatabendAPIClient) {
+async fn insert_event_with_cfg(cfg: String, table: String, client: Arc<DatabendAPIClient>) {
     let create_table_sql = format!(
         "create table `{}` (host String, timestamp String, message String)",
         table
     );
-    client.query(&create_table_sql).await.unwrap();
+    client.query_all(&create_table_sql).await.unwrap();
 
     let (config, _) = load_sink::<DatabendConfig>(&cfg).unwrap();
     let (sink, _hc) = config.build(SinkContext::default()).await.unwrap();
@@ -108,7 +111,7 @@ async fn insert_event_with_cfg(cfg: String, table: String, client: DatabendAPICl
     .await;
 
     let select_all_sql = format!("select * from `{}`", table);
-    let resp = client.query(&select_all_sql).await.unwrap();
+    let resp = client.query_all(&select_all_sql).await.unwrap();
     assert_eq!(1, resp.data.len());
 
     // drop input_event after comparing with response
@@ -147,7 +150,7 @@ async fn insert_event_csv_gzip() {
     insert_event_with_cfg(cfg, table, client).await;
 }
 
-fn response_to_map(resp: &DatabendAPIResponse) -> Vec<BTreeMap<String, Option<String>>> {
+fn response_to_map(resp: &Page) -> Vec<BTreeMap<String, Option<String>>> {
     let mut result = Vec::new();
     for row in &resp.data {
         let mut map = BTreeMap::new();
diff --git a/src/sinks/databend/service.rs b/src/sinks/databend/service.rs
index 3219b66f0db8f..88a504e3e6ec7 100644
--- a/src/sinks/databend/service.rs
+++ b/src/sinks/databend/service.rs
@@ -1,11 +1,12 @@
 use std::collections::BTreeMap;
 use std::io::Cursor;
+use std::sync::Arc;
 use std::task::{Context, Poll};
 
 use bytes::Bytes;
 use chrono::Utc;
-use databend_client::error::Error as DatabendError;
 use databend_client::APIClient as DatabendAPIClient;
+use databend_client::Error as DatabendError;
 use futures::future::BoxFuture;
 use rand::{rng, Rng};
 use rand_distr::Alphanumeric;
@@ -26,16 +27,19 @@ impl RetryLogic for DatabendRetryLogic {
 
     fn is_retriable_error(&self, error: &Self::Error) -> bool {
         match error {
-            DatabendError::InvalidResponse(qe) => match qe.code {
-                429 => true,
-                // general server error
-                500 => true,
-                // storage doesn't support presign operation
-                3902 => false,
-                // fail to parse stage attachment
-                1046 => false,
-                _ => false,
-            },
+            DatabendError::Response { status, .. } => {
+                match status.as_u16() {
+                    429 => true,
+                    // general server error
+                    500 => true,
+                    // storage doesn't support presign operation
+                    3902 => false,
+                    // fail to parse stage attachment
+                    1046 => false,
+                    _ => false,
+                }
+            }
+            DatabendError::WithContext(boxed_error, ..) => self.is_retriable_error(boxed_error),
             DatabendError::IO(_) => true,
             _ => false,
         }
@@ -44,7 +48,7 @@ impl RetryLogic for DatabendRetryLogic {
 
 #[derive(Clone)]
 pub struct DatabendService {
-    client: DatabendAPIClient,
+    client: Arc<DatabendAPIClient>,
     table: String,
     file_format_options: BTreeMap<&'static str, &'static str>,
     copy_options: BTreeMap<&'static str, &'static str>,
@@ -94,7 +98,7 @@ impl DriverResponse for DatabendResponse {
 
 impl DatabendService {
     pub(super) fn new(
-        client: DatabendAPIClient,
+        client: Arc<DatabendAPIClient>,
         table: String,
         file_format_options: BTreeMap<&'static str, &'static str>,
         copy_options: BTreeMap<&'static str, &'static str>,
@@ -115,7 +119,6 @@ impl DatabendService {
         let database = self
             .client
             .current_database()
-            .await
             .unwrap_or("default".to_string());
         let suffix = rng()
             .sample_iter(&Alphanumeric)
@@ -158,8 +161,8 @@ impl Service<DatabendRequest> for DatabendService {
 
         let future = async move {
             let metadata = request.get_metadata().clone();
-            let protocol = service.client.scheme.as_str();
-            let host_port = format!("{}:{}", service.client.host, service.client.port);
+            let protocol = service.client.scheme();
+            let host_port = format!("{}:{}", service.client.host(), service.client.port());
             let endpoint = host_port.as_str();
             let byte_size = request.data.len();
             service.insert_with_stage(request.data).await?;

From a2c6c442d8254b11d013bf4d2a88f84e5b08d0a6 Mon Sep 17 00:00:00 2001
From: Derek Zhang <161868481+GreyLilac09@users.noreply.github.com>
Date: Mon, 7 Jul 2025 11:01:11 -0400
Subject: [PATCH 158/305] feat(metrics): add TTL-based cache for metric sets
 and add expire_metrics_secs for Prometheus remote write sink (#23286)

* add ttl policy to metricset

* rust fmt

* rust

* update cue

* fix secs format

* fix float

* component docs

* update comments

* fix fmt

* update comment

* add cleanup and fix timestamp

* remove unnecessary function

* add MetricEntry as struct

* fix lint issues

* use is_some_and

* revert greptime_logs.cue
---
 .../fix_metric_set_memory_growth.feature.md   |   6 +
 src/sinks/prometheus/remote_write/config.rs   |   9 +
 src/sinks/prometheus/remote_write/sink.rs     |   4 +-
 src/sinks/util/buffer/metrics/normalize.rs    | 227 +++++++++++++++---
 src/sinks/util/builder.rs                     |  20 +-
 src/sinks/util/normalizer.rs                  |  10 +-
 .../sinks/base/prometheus_remote_write.cue    |  11 +
 7 files changed, 242 insertions(+), 45 deletions(-)
 create mode 100644 changelog.d/fix_metric_set_memory_growth.feature.md

diff --git a/changelog.d/fix_metric_set_memory_growth.feature.md b/changelog.d/fix_metric_set_memory_growth.feature.md
new file mode 100644
index 0000000000000..525648566668a
--- /dev/null
+++ b/changelog.d/fix_metric_set_memory_growth.feature.md
@@ -0,0 +1,6 @@
+- Add a TTL-based cache for metrics sets
+- Add `expire_metrics_secs` config for Prometheus remote write sink which uses the TTL-based cache
+- This fixes an issue where incremental metrics are preserved for the lifetime of Vector's runtime, which causes
+  indefinite memory growth
+
+authors: GreyLilac09
diff --git a/src/sinks/prometheus/remote_write/config.rs b/src/sinks/prometheus/remote_write/config.rs
index e1fe2afe11456..1ee5d4695301c 100644
--- a/src/sinks/prometheus/remote_write/config.rs
+++ b/src/sinks/prometheus/remote_write/config.rs
@@ -93,6 +93,14 @@ pub struct RemoteWriteConfig {
     #[configurable(metadata(docs::advanced))]
     pub tenant_id: Option<Template>,
 
+    /// The amount of time, in seconds, that incremental metrics will persist in the internal metrics cache
+    /// after having not been updated before they expire and are removed.
+    ///
+    /// If unset, sending unique incremental metrics to this sink will cause indefinite memory growth.
+    #[serde(skip_serializing_if = "crate::serde::is_default")]
+    #[configurable(metadata(docs::common = false, docs::required = false))]
+    pub expire_metrics_secs: Option<f64>,
+
     #[configurable(derived)]
     pub tls: Option<TlsConfig>,
 
@@ -202,6 +210,7 @@ impl SinkConfig for RemoteWriteConfig {
             buckets,
             quantiles,
             default_namespace,
+            expire_metrics_secs: self.expire_metrics_secs,
             service,
         };
 
diff --git a/src/sinks/prometheus/remote_write/sink.rs b/src/sinks/prometheus/remote_write/sink.rs
index 093cb7e0bc26b..8ce8dfa6a43f3 100644
--- a/src/sinks/prometheus/remote_write/sink.rs
+++ b/src/sinks/prometheus/remote_write/sink.rs
@@ -149,6 +149,7 @@ pub(super) struct RemoteWriteSink<S> {
     pub(super) default_namespace: Option<String>,
     pub(super) buckets: Vec<f64>,
     pub(super) quantiles: Vec<f64>,
+    pub(super) expire_metrics_secs: Option<f64>,
     pub(super) service: S,
 }
 
@@ -172,10 +173,11 @@ where
         let batch_settings = self.batch_settings;
         let tenant_id = self.tenant_id.clone();
         let service = self.service;
+        let expire_metrics_secs = self.expire_metrics_secs;
 
         input
             .filter_map(|event| future::ready(event.try_into_metric()))
-            .normalized_with_default::<PrometheusMetricNormalize>()
+            .normalized_with_ttl::<PrometheusMetricNormalize>(expire_metrics_secs)
             .filter_map(move |event| {
                 future::ready(make_remote_write_event(tenant_id.as_ref(), event))
             })
diff --git a/src/sinks/util/buffer/metrics/normalize.rs b/src/sinks/util/buffer/metrics/normalize.rs
index edb63f5f8a4d7..5988a2c19a4a5 100644
--- a/src/sinks/util/buffer/metrics/normalize.rs
+++ b/src/sinks/util/buffer/metrics/normalize.rs
@@ -1,5 +1,7 @@
 use indexmap::IndexMap;
 
+use std::time::{Duration, Instant};
+
 use vector_lib::event::{
     metric::{MetricData, MetricSeries},
     EventMetadata, Metric, MetricKind,
@@ -46,6 +48,14 @@ pub struct MetricNormalizer<N> {
 }
 
 impl<N> MetricNormalizer<N> {
+    /// Creates a new normalizer with TTL policy.
+    pub fn with_ttl(normalizer: N, ttl: TtlPolicy) -> Self {
+        Self {
+            state: MetricSet::with_ttl_policy(ttl),
+            normalizer,
+        }
+    }
+
     /// Gets a mutable reference to the current metric state for this normalizer.
     pub const fn get_state_mut(&mut self) -> &mut MetricSet {
         &mut self.state
@@ -79,46 +89,178 @@ impl<N> From<N> for MetricNormalizer<N> {
     }
 }
 
-type MetricEntry = (MetricData, EventMetadata);
+/// Represents a stored metric entry with its data, metadata, and optional timestamp.
+#[derive(Clone, Debug)]
+pub struct MetricEntry {
+    /// The metric data containing the value and kind
+    pub data: MetricData,
+    /// Event metadata associated with this metric
+    pub metadata: EventMetadata,
+    /// Optional timestamp for TTL tracking
+    pub timestamp: Option<Instant>,
+}
+
+impl MetricEntry {
+    /// Creates a new MetricEntry with the given data, metadata, and timestamp.
+    pub const fn new(
+        data: MetricData,
+        metadata: EventMetadata,
+        timestamp: Option<Instant>,
+    ) -> Self {
+        Self {
+            data,
+            metadata,
+            timestamp,
+        }
+    }
+
+    /// Creates a new MetricEntry from a Metric and optional timestamp.
+    pub fn from_metric(metric: Metric, timestamp: Option<Instant>) -> (MetricSeries, Self) {
+        let (series, data, metadata) = metric.into_parts();
+        let entry = Self::new(data, metadata, timestamp);
+        (series, entry)
+    }
+
+    /// Converts this entry back to a Metric with the given series.
+    pub fn into_metric(self, series: MetricSeries) -> Metric {
+        Metric::from_parts(series, self.data, self.metadata)
+    }
+
+    /// Updates this entry's timestamp.
+    pub const fn update_timestamp(&mut self, timestamp: Option<Instant>) {
+        self.timestamp = timestamp;
+    }
+}
+
+/// Configuration for automatic cleanup of expired entries.
+#[derive(Clone, Debug)]
+pub struct TtlPolicy {
+    /// Time-to-live for entries
+    pub ttl: Duration,
+    /// How often to run cleanup
+    pub cleanup_interval: Duration,
+    /// Last time cleanup was performed
+    pub(crate) last_cleanup: Instant,
+}
+
+impl TtlPolicy {
+    /// Creates a new cleanup configuration with TTL.
+    /// Cleanup interval defaults to TTL/10 with a 10-second minimum.
+    pub fn new(ttl: Duration) -> Self {
+        Self {
+            ttl,
+            cleanup_interval: ttl.div_f32(10.0).max(Duration::from_secs(10)),
+            last_cleanup: Instant::now(),
+        }
+    }
+
+    /// Checks if it's time to run cleanup.
+    pub fn should_cleanup(&self) -> bool {
+        Instant::now().duration_since(self.last_cleanup) >= self.cleanup_interval
+    }
+
+    /// Marks cleanup as having been performed.
+    pub fn mark_cleanup_done(&mut self) {
+        self.last_cleanup = Instant::now();
+    }
+}
 
 /// Metric storage for use with normalization.
 ///
 /// This is primarily a wrapper around [`IndexMap`] (to ensure insertion order
 /// is maintained) with convenience methods to make it easier to perform
-/// normalization-specific operations.
-#[derive(Clone, Default, Debug)]
-pub struct MetricSet(IndexMap<MetricSeries, MetricEntry>);
+/// normalization-specific operations. It also includes an optional TTL policy
+/// to automatically expire old entries.
+#[derive(Clone, Debug, Default)]
+pub struct MetricSet {
+    inner: IndexMap<MetricSeries, MetricEntry>,
+    ttl_policy: Option<TtlPolicy>,
+}
 
 impl MetricSet {
-    /// Creates an empty `MetricSet` with the specified capacity.
-    ///
-    /// The metric set will be able to hold at least `capacity` elements without reallocating. If `capacity` is 0, the
-    /// metric set will not allocate.
+    /// Creates an empty MetricSet with the specified capacity.
     pub fn with_capacity(capacity: usize) -> Self {
-        Self(IndexMap::with_capacity(capacity))
+        Self {
+            inner: IndexMap::with_capacity(capacity),
+            ttl_policy: None,
+        }
+    }
+
+    /// Creates a MetricSet with custom cleanup configuration.
+    pub fn with_ttl_policy(ttl_policy: TtlPolicy) -> Self {
+        Self {
+            inner: IndexMap::default(),
+            ttl_policy: Some(ttl_policy),
+        }
+    }
+
+    /// Gets a reference to the TTL policy configuration.
+    pub const fn ttl_policy(&self) -> Option<&TtlPolicy> {
+        self.ttl_policy.as_ref()
+    }
+
+    /// Gets a mutable reference to the TTL policy configuration.
+    pub const fn ttl_policy_mut(&mut self) -> Option<&mut TtlPolicy> {
+        self.ttl_policy.as_mut()
+    }
+
+    /// Perform periodic cleanup if enough time has passed since the last cleanup
+    fn maybe_cleanup(&mut self) {
+        // Return early if no cleanup is needed
+        if !self
+            .ttl_policy()
+            .is_some_and(|config| config.should_cleanup())
+        {
+            return;
+        }
+        self.cleanup_expired();
+        if let Some(config) = self.ttl_policy_mut() {
+            config.mark_cleanup_done();
+        }
+    }
+
+    /// Removes expired entries based on TTL if configured.
+    fn cleanup_expired(&mut self) {
+        let now = Instant::now();
+        if let Some(config) = &self.ttl_policy {
+            self.inner.retain(|_, entry| match entry.timestamp {
+                Some(ts) => now.duration_since(ts) < config.ttl,
+                None => true,
+            });
+        }
     }
 
     /// Returns the number of elements in the set.
     pub fn len(&self) -> usize {
-        self.0.len()
+        self.inner.len()
+    }
+
+    fn create_timestamp(&self) -> Option<Instant> {
+        match self.ttl_policy() {
+            Some(_) => Some(Instant::now()),
+            _ => None,
+        }
     }
 
-    /// Returns `true` if the set contains no elements.
+    /// Returns true if the set contains no elements.
     pub fn is_empty(&self) -> bool {
-        self.0.is_empty()
+        self.inner.is_empty()
     }
 
-    /// Consumes this `MetricSet` and returns a vector of `Metric`.
-    pub fn into_metrics(self) -> Vec<Metric> {
-        self.0
+    /// Consumes this MetricSet and returns a vector of Metric.
+    pub fn into_metrics(mut self) -> Vec<Metric> {
+        // Always cleanup on final consumption
+        self.cleanup_expired();
+        self.inner
             .into_iter()
-            .map(|(series, (data, metadata))| Metric::from_parts(series, data, metadata))
+            .map(|(series, entry)| entry.into_metric(series))
             .collect()
     }
 
     /// Either pass the metric through as-is if absolute, or convert it
     /// to absolute if incremental.
     pub fn make_absolute(&mut self, metric: Metric) -> Option<Metric> {
+        self.maybe_cleanup();
         match metric.kind() {
             MetricKind::Absolute => Some(metric),
             MetricKind::Incremental => Some(self.incremental_to_absolute(metric)),
@@ -128,6 +270,7 @@ impl MetricSet {
     /// Either convert the metric to incremental if absolute, or
     /// aggregate it with any previous value if already incremental.
     pub fn make_incremental(&mut self, metric: Metric) -> Option<Metric> {
+        self.maybe_cleanup();
         match metric.kind() {
             MetricKind::Absolute => self.absolute_to_incremental(metric),
             MetricKind::Incremental => Some(metric),
@@ -138,23 +281,21 @@ impl MetricSet {
     /// state buffer to keep track of the value throughout the entire
     /// application uptime.
     fn incremental_to_absolute(&mut self, mut metric: Metric) -> Metric {
-        match self.0.get_mut(metric.series()) {
+        let timestamp = self.create_timestamp();
+        match self.inner.get_mut(metric.series()) {
             Some(existing) => {
-                if existing.0.value.add(metric.value()) {
-                    metric = metric.with_value(existing.0.value.clone());
+                if existing.data.value.add(metric.value()) {
+                    metric = metric.with_value(existing.data.value.clone());
+                    existing.update_timestamp(timestamp);
                 } else {
                     // Metric changed type, store this as the new reference value
-                    self.0.insert(
-                        metric.series().clone(),
-                        (metric.data().clone(), EventMetadata::default()),
-                    );
+                    let (series, entry) = MetricEntry::from_metric(metric.clone(), timestamp);
+                    self.inner.insert(series, entry);
                 }
             }
             None => {
-                self.0.insert(
-                    metric.series().clone(),
-                    (metric.data().clone(), EventMetadata::default()),
-                );
+                let (series, entry) = MetricEntry::from_metric(metric.clone(), timestamp);
+                self.inner.insert(series, entry);
             }
         }
         metric.into_absolute()
@@ -182,42 +323,47 @@ impl MetricSet {
         // introducing a small amount of lag before a metric is emitted by having to wait to see it
         // again, but this is a behavior we have to observe for sinks that can only handle
         // incremental updates.
-        match self.0.get_mut(metric.series()) {
+        let timestamp = self.create_timestamp();
+        match self.inner.get_mut(metric.series()) {
             Some(reference) => {
                 let new_value = metric.value().clone();
                 // From the stored reference value, emit an increment
-                if metric.subtract(&reference.0) {
-                    reference.0.value = new_value;
+                if metric.subtract(&reference.data) {
+                    reference.data.value = new_value;
+                    reference.update_timestamp(timestamp);
                     Some(metric.into_incremental())
                 } else {
                     // Metric changed type, store this and emit nothing
-                    self.insert(metric);
+                    self.insert(metric, timestamp);
                     None
                 }
             }
             None => {
                 // No reference so store this and emit nothing
-                self.insert(metric);
+                self.insert(metric, timestamp);
                 None
             }
         }
     }
 
-    fn insert(&mut self, metric: Metric) {
-        let (series, data, metadata) = metric.into_parts();
-        self.0.insert(series, (data, metadata));
+    fn insert(&mut self, metric: Metric, timestamp: Option<Instant>) {
+        let (series, entry) = MetricEntry::from_metric(metric, timestamp);
+        self.inner.insert(series, entry);
     }
 
     pub fn insert_update(&mut self, metric: Metric) {
+        self.maybe_cleanup();
+        let timestamp = self.create_timestamp();
         let update = match metric.kind() {
             MetricKind::Absolute => Some(metric),
             MetricKind::Incremental => {
                 // Incremental metrics update existing entries, if present
-                match self.0.get_mut(metric.series()) {
+                match self.inner.get_mut(metric.series()) {
                     Some(existing) => {
                         let (series, data, metadata) = metric.into_parts();
-                        if existing.0.update(&data) {
-                            existing.1.merge(metadata);
+                        if existing.data.update(&data) {
+                            existing.metadata.merge(metadata);
+                            existing.update_timestamp(timestamp);
                             None
                         } else {
                             warn!(message = "Metric changed type, dropping old value.", %series);
@@ -229,7 +375,7 @@ impl MetricSet {
             }
         };
         if let Some(metric) = update {
-            self.insert(metric);
+            self.insert(metric, timestamp);
         }
     }
 
@@ -237,6 +383,7 @@ impl MetricSet {
     ///
     /// If the series existed and was removed, returns `true`.  Otherwise, `false`.
     pub fn remove(&mut self, series: &MetricSeries) -> bool {
-        self.0.shift_remove(series).is_some()
+        self.maybe_cleanup();
+        self.inner.shift_remove(series).is_some()
     }
 }
diff --git a/src/sinks/util/builder.rs b/src/sinks/util/builder.rs
index 45c01ce41dcdd..8750e2ae862a9 100644
--- a/src/sinks/util/builder.rs
+++ b/src/sinks/util/builder.rs
@@ -1,3 +1,6 @@
+use futures_util::{stream::Map, Stream, StreamExt};
+use pin_project::pin_project;
+use std::time::Duration;
 use std::{
     convert::Infallible,
     fmt,
@@ -8,9 +11,6 @@ use std::{
     sync::Arc,
     task::{Context, Poll},
 };
-
-use futures_util::{stream::Map, Stream, StreamExt};
-use pin_project::pin_project;
 use tower::Service;
 use tracing::Span;
 use vector_lib::stream::{
@@ -220,6 +220,20 @@ pub trait SinkBuilderExt: Stream {
         Normalizer::new(self, N::default())
     }
 
+    /// Normalizes a stream of [`Metric`] events with a normalizer and an optional TTL.
+    fn normalized_with_ttl<N>(self, maybe_ttl_secs: Option<f64>) -> Normalizer<Self, N>
+    where
+        Self: Stream<Item = Metric> + Unpin + Sized,
+        N: MetricNormalize + Default,
+    {
+        match maybe_ttl_secs {
+            None => Normalizer::new(self, N::default()),
+            Some(ttl) => {
+                Normalizer::new_with_ttl(self, N::default(), Duration::from_secs(ttl as u64))
+            }
+        }
+    }
+
     /// Creates a [`Driver`] that uses the configured event stream as the input to the given
     /// service.
     ///
diff --git a/src/sinks/util/normalizer.rs b/src/sinks/util/normalizer.rs
index c1ab6cd047913..a8560264e5e3b 100644
--- a/src/sinks/util/normalizer.rs
+++ b/src/sinks/util/normalizer.rs
@@ -1,13 +1,14 @@
 use std::{
     pin::Pin,
     task::{ready, Context, Poll},
+    time::Duration,
 };
 
 use futures_util::{stream::Fuse, Stream, StreamExt};
 use pin_project::pin_project;
 use vector_lib::event::Metric;
 
-use super::buffer::metrics::{MetricNormalize, MetricNormalizer};
+use super::buffer::metrics::{MetricNormalize, MetricNormalizer, TtlPolicy};
 
 #[pin_project]
 pub struct Normalizer<St, N>
@@ -29,6 +30,13 @@ where
             normalizer: MetricNormalizer::from(normalizer),
         }
     }
+
+    pub fn new_with_ttl(stream: St, normalizer: N, ttl: Duration) -> Self {
+        Self {
+            stream: stream.fuse(),
+            normalizer: MetricNormalizer::with_ttl(normalizer, TtlPolicy::new(ttl)),
+        }
+    }
 }
 
 impl<St, N> Stream for Normalizer<St, N>
diff --git a/website/cue/reference/components/sinks/base/prometheus_remote_write.cue b/website/cue/reference/components/sinks/base/prometheus_remote_write.cue
index 4f961e6f4bd17..8e68af4f80813 100644
--- a/website/cue/reference/components/sinks/base/prometheus_remote_write.cue
+++ b/website/cue/reference/components/sinks/base/prometheus_remote_write.cue
@@ -317,6 +317,17 @@ base: components: sinks: prometheus_remote_write: configuration: {
 		required: true
 		type: string: examples: ["https://localhost:8087/api/v1/write"]
 	}
+	expire_metrics_secs: {
+		common: false
+		description: """
+			The amount of time, in seconds, that incremental metrics will persist in the internal metrics cache
+			after having not been updated before they expire and are removed.
+
+			If unset, sending unique incremental metrics to this sink will cause indefinite memory growth.
+			"""
+		required: false
+		type: float: {}
+	}
 	quantiles: {
 		description: """
 			Quantiles to use for aggregating [distribution][dist_metric_docs] metrics into a summary.

From 33e44aeaff314a2bf16db8c89f8bb81a92c2d97e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 7 Jul 2025 19:12:39 +0000
Subject: [PATCH 159/305] chore(deps): Bump serde_with from 3.12.0 to 3.14.0
 (#23313)

* chore(deps): Bump serde_with from 3.12.0 to 3.14.0

Bumps [serde_with](https://github.com/jonasbb/serde_with) from 3.12.0 to 3.14.0.
- [Release notes](https://github.com/jonasbb/serde_with/releases)
- [Commits](https://github.com/jonasbb/serde_with/compare/v3.12.0...v3.14.0)

---
updated-dependencies:
- dependency-name: serde_with
  dependency-version: 3.14.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* update licenses

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Pavlos Rontidis <pavlos.rontidis@gmail.com>
---
 Cargo.lock                   | 68 ++++++++++++++++++++++++++++++------
 Cargo.toml                   |  2 +-
 LICENSE-3rdparty.csv         |  2 ++
 lib/codecs/Cargo.toml        |  2 +-
 lib/vector-config/Cargo.toml |  4 +--
 lib/vector-core/Cargo.toml   |  2 +-
 6 files changed, 64 insertions(+), 16 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index de30dca8eb714..af4cff45df158 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1838,7 +1838,7 @@ dependencies = [
  "serde",
  "serde_json",
  "serde_repr",
- "serde_with 3.12.0",
+ "serde_with 3.14.0",
 ]
 
 [[package]]
@@ -2287,7 +2287,7 @@ dependencies = [
  "rstest",
  "serde",
  "serde_json",
- "serde_with 3.12.0",
+ "serde_with 3.14.0",
  "similar-asserts",
  "smallvec",
  "snafu 0.8.6",
@@ -7002,7 +7002,7 @@ dependencies = [
  "serde_json",
  "serde_path_to_error",
  "serde_plain",
- "serde_with 3.12.0",
+ "serde_with 3.14.0",
  "sha2",
  "subtle",
  "thiserror 1.0.68",
@@ -8545,6 +8545,26 @@ dependencies = [
  "thiserror 2.0.3",
 ]
 
+[[package]]
+name = "ref-cast"
+version = "1.0.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4a0ae411dbe946a674d89546582cea4ba2bb8defac896622d6496f14c23ba5cf"
+dependencies = [
+ "ref-cast-impl",
+]
+
+[[package]]
+name = "ref-cast-impl"
+version = "1.0.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1165225c21bff1f3bbce98f5a1f889949bc902d3575308cc7b0de30b4f6d27c7"
+dependencies = [
+ "proc-macro2 1.0.95",
+ "quote 1.0.40",
+ "syn 2.0.104",
+]
+
 [[package]]
 name = "regex"
 version = "1.11.1"
@@ -9212,6 +9232,30 @@ dependencies = [
  "windows-sys 0.59.0",
 ]
 
+[[package]]
+name = "schemars"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4cd191f9397d57d581cddd31014772520aa448f65ef991055d7f61582c65165f"
+dependencies = [
+ "dyn-clone",
+ "ref-cast",
+ "serde",
+ "serde_json",
+]
+
+[[package]]
+name = "schemars"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1375ba8ef45a6f15d83fa8748f1079428295d403d6ea991d09ab100155fbc06d"
+dependencies = [
+ "dyn-clone",
+ "ref-cast",
+ "serde",
+ "serde_json",
+]
+
 [[package]]
 name = "scoped-tls"
 version = "1.0.1"
@@ -9479,19 +9523,21 @@ dependencies = [
 
 [[package]]
 name = "serde_with"
-version = "3.12.0"
+version = "3.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6b6f7f2fcb69f747921f79f3926bd1e203fce4fef62c268dd3abfb6d86029aa"
+checksum = "f2c45cd61fefa9db6f254525d46e392b852e0e61d9a1fd36e5bd183450a556d5"
 dependencies = [
  "base64 0.22.1",
  "chrono",
  "hex",
  "indexmap 1.9.3",
  "indexmap 2.10.0",
+ "schemars 0.9.0",
+ "schemars 1.0.3",
  "serde",
  "serde_derive",
  "serde_json",
- "serde_with_macros 3.12.0",
+ "serde_with_macros 3.14.0",
  "time",
 ]
 
@@ -9509,9 +9555,9 @@ dependencies = [
 
 [[package]]
 name = "serde_with_macros"
-version = "3.12.0"
+version = "3.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d00caa5193a3c8362ac2b73be6b9e768aa5a4b2f721d8f4b339600c3cb51f8e"
+checksum = "de90945e6565ce0d9a25098082ed4ee4002e047cb59892c318d66821e14bb30f"
 dependencies = [
  "darling 0.20.11",
  "proc-macro2 1.0.95",
@@ -11759,7 +11805,7 @@ dependencies = [
  "serde-toml-merge",
  "serde_bytes",
  "serde_json",
- "serde_with 3.12.0",
+ "serde_with 3.14.0",
  "serde_yaml",
  "similar-asserts",
  "smallvec",
@@ -11911,7 +11957,7 @@ dependencies = [
  "num-traits",
  "serde",
  "serde_json",
- "serde_with 3.12.0",
+ "serde_with 3.14.0",
  "snafu 0.8.6",
  "toml",
  "tracing 0.1.41",
@@ -12002,7 +12048,7 @@ dependencies = [
  "security-framework 3.2.0",
  "serde",
  "serde_json",
- "serde_with 3.12.0",
+ "serde_with 3.14.0",
  "serde_yaml",
  "similar-asserts",
  "smallvec",
diff --git a/Cargo.toml b/Cargo.toml
index d81aba519ac3c..04b655a24b0a2 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -274,7 +274,7 @@ serde.workspace = true
 serde-toml-merge = { version = "0.3.9", default-features = false }
 serde_bytes = { version = "0.11.17", default-features = false, features = ["std"], optional = true }
 serde_json.workspace = true
-serde_with = { version = "3.12.0", default-features = false, features = ["macros", "std"] }
+serde_with = { version = "3.14.0", default-features = false, features = ["macros", "std"] }
 serde_yaml = { version = "0.9.34", default-features = false }
 
 # Messagepack
diff --git a/LICENSE-3rdparty.csv b/LICENSE-3rdparty.csv
index e4e9df7daad43..d1be769292d5c 100644
--- a/LICENSE-3rdparty.csv
+++ b/LICENSE-3rdparty.csv
@@ -523,6 +523,7 @@ rdkafka,https://github.com/fede1024/rust-rdkafka,MIT,Federico Giraud <giraud.fed
 redis,https://github.com/redis-rs/redis-rs,BSD-3-Clause,The redis Authors
 redox_syscall,https://gitlab.redox-os.org/redox-os/syscall,MIT,Jeremy Soller <jackpot51@gmail.com>
 redox_users,https://gitlab.redox-os.org/redox-os/users,MIT,"Jose Narvaez <goyox86@gmail.com>, Wesley Hershberger <mggmugginsmc@gmail.com>"
+ref-cast,https://github.com/dtolnay/ref-cast,MIT OR Apache-2.0,David Tolnay <dtolnay@gmail.com>
 regex,https://github.com/rust-lang/regex,MIT OR Apache-2.0,"The Rust Project Developers, Andrew Gallant <jamslam@gmail.com>"
 regex-automata,https://github.com/BurntSushi/regex-automata,Unlicense OR MIT,Andrew Gallant <jamslam@gmail.com>
 regex-automata,https://github.com/rust-lang/regex/tree/master/regex-automata,MIT OR Apache-2.0,"The Rust Project Developers, Andrew Gallant <jamslam@gmail.com>"
@@ -565,6 +566,7 @@ same-file,https://github.com/BurntSushi/same-file,Unlicense OR MIT,Andrew Gallan
 sasl2-sys,https://github.com/MaterializeInc/rust-sasl,Apache-2.0,"Materialize, Inc."
 scan_fmt,https://github.com/wlentz/scan_fmt,MIT,wlentz
 schannel,https://github.com/steffengy/schannel-rs,MIT,"Steven Fackler <sfackler@gmail.com>, Steffen Butzer <steffen.butzer@outlook.com>"
+schemars,https://github.com/GREsau/schemars,MIT,Graham Esau <gesau@hotmail.co.uk>
 scoped-tls,https://github.com/alexcrichton/scoped-tls,MIT OR Apache-2.0,Alex Crichton <alex@alexcrichton.com>
 scopeguard,https://github.com/bluss/scopeguard,MIT OR Apache-2.0,bluss
 sct,https://github.com/rustls/sct.rs,Apache-2.0 OR ISC OR MIT,Joseph Birr-Pixton <jpixton@gmail.com>
diff --git a/lib/codecs/Cargo.toml b/lib/codecs/Cargo.toml
index 17b715a1cd3ea..1ab5c53027a9f 100644
--- a/lib/codecs/Cargo.toml
+++ b/lib/codecs/Cargo.toml
@@ -26,7 +26,7 @@ prost-reflect.workspace = true
 rand.workspace = true
 regex = { version = "1.11.1", default-features = false, features = ["std", "perf"] }
 serde.workspace = true
-serde_with = { version = "3.12.0", default-features = false, features = ["std", "macros", "chrono_0_4"] }
+serde_with = { version = "3.14.0", default-features = false, features = ["std", "macros", "chrono_0_4"] }
 serde_json.workspace = true
 smallvec = { version = "1", default-features = false, features = ["union"] }
 snafu.workspace = true
diff --git a/lib/vector-config/Cargo.toml b/lib/vector-config/Cargo.toml
index 3098fe2488280..fbbc7a249c02e 100644
--- a/lib/vector-config/Cargo.toml
+++ b/lib/vector-config/Cargo.toml
@@ -20,7 +20,7 @@ no-proxy = { version = "0.3.6", default-features = false, features = ["serialize
 num-traits = { version = "0.2.19", default-features = false }
 serde.workspace = true
 serde_json.workspace = true
-serde_with = { version = "3.12.0", default-features = false, features = ["std"] }
+serde_with = { version = "3.14.0", default-features = false, features = ["std"] }
 snafu.workspace = true
 toml.workspace = true
 tracing = { version = "0.1.34", default-features = false }
@@ -32,4 +32,4 @@ vector-config-macros = { path = "../vector-config-macros" }
 
 [dev-dependencies]
 assert-json-diff = { version = "2", default-features = false }
-serde_with = { version = "3.12.0", default-features = false, features = ["std", "macros"] }
+serde_with = { version = "3.14.0", default-features = false, features = ["std", "macros"] }
diff --git a/lib/vector-core/Cargo.toml b/lib/vector-core/Cargo.toml
index 8c360e741452a..b76c1b06f868f 100644
--- a/lib/vector-core/Cargo.toml
+++ b/lib/vector-core/Cargo.toml
@@ -45,7 +45,7 @@ regex = { version = "1.11.1", default-features = false, features = ["std", "perf
 ryu = { version = "1", default-features = false }
 serde.workspace = true
 serde_json.workspace = true
-serde_with = { version = "3.12.0", default-features = false, features = ["std", "macros"] }
+serde_with = { version = "3.14.0", default-features = false, features = ["std", "macros"] }
 smallvec = { version = "1", default-features = false, features = ["serde", "const_generics"] }
 snafu.workspace = true
 socket2 = { version = "0.5.10", default-features = false }

From eb4cb46ccd4a24f06cdb2c969efe87ba734f053d Mon Sep 17 00:00:00 2001
From: bas smit <474727+fbs@users.noreply.github.com>
Date: Tue, 8 Jul 2025 13:39:51 +0000
Subject: [PATCH 160/305] chore(dev): Bump libz-sys for macos compatibility
 (#23347)

Bump libz-sys for macos compatibility

```
 --- stderr
  src/smoke.c:4:10: warning: cast to smaller integer type 'int' from 'uLong (*)(uLong, const Bytef *, uInt)' (aka 'unsigned long (*)(unsigned long, const unsigned char *, unsigned int)') [-Wpointer-to-int-cast]
      4 |   return (int) adler32;
        |          ^~~~~~~~~~~~~
  1 warning generated.
  error: cannot parse the debug map for '/dev/null': The file was not recognized as a valid object file
  clang: error: dsymutil command failed with exit code 1 (use -v to see invocation)
```
---
 Cargo.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index af4cff45df158..7e6a2c477172b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5832,9 +5832,9 @@ dependencies = [
 
 [[package]]
 name = "libz-sys"
-version = "1.1.12"
+version = "1.1.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d97137b25e321a73eef1418d1d5d2eda4d77e12813f8e6dead84bc52c5870a7b"
+checksum = "8b70e7a7df205e92a1a4cd9aaae7898dac0aa555503cc0a649494d0d60e7651d"
 dependencies = [
  "cc",
  "libc",

From fc8a51de7b5c0f29a06cf6b07f1828c5ce2882aa Mon Sep 17 00:00:00 2001
From: Jorge Hermo <jorgehermogonzalez@gmail.com>
Date: Tue, 8 Jul 2025 16:00:38 +0200
Subject: [PATCH 161/305] fix(core): potential hang in ConcurrentMap (#23340)

* fix: fix potential hang in ConcurrentMap

* refactor: clippy

* chore: add tokio dev dependency feature

* chore: add tokio dev dependency feature

* fix: clippy lint
---
 .../fix_concurrent_map_potential_hang.fix.md  |  3 +++
 lib/vector-stream/Cargo.toml                  |  3 ++-
 lib/vector-stream/src/concurrent_map.rs       | 24 ++++++++++++++++++-
 3 files changed, 28 insertions(+), 2 deletions(-)
 create mode 100644 changelog.d/fix_concurrent_map_potential_hang.fix.md

diff --git a/changelog.d/fix_concurrent_map_potential_hang.fix.md b/changelog.d/fix_concurrent_map_potential_hang.fix.md
new file mode 100644
index 0000000000000..abb8cdd53a0a7
--- /dev/null
+++ b/changelog.d/fix_concurrent_map_potential_hang.fix.md
@@ -0,0 +1,3 @@
+Fixed a potential hang in the internal concurrent map, this issue could hang vector when shutting it down.
+
+authors: jorgehermo9
diff --git a/lib/vector-stream/Cargo.toml b/lib/vector-stream/Cargo.toml
index e06cb4b123315..dc08739e1c4b6 100644
--- a/lib/vector-stream/Cargo.toml
+++ b/lib/vector-stream/Cargo.toml
@@ -10,7 +10,7 @@ async-stream = { version = "0.3.6", default-features = false }
 futures.workspace = true
 futures-util = { version = "0.3.29", default-features = false, features = ["std"] }
 pin-project.workspace = true
-tokio = { version = "1.45.1", default-features = false, features = ["net"] }
+tokio.workspace = true
 tokio-util = { version = "0.7.0", default-features = false, features = ["time"] }
 tower = { version = "0.5.2", default-features = false, features = ["util"] }
 tracing = { version = "0.1.34", default-features = false }
@@ -22,3 +22,4 @@ vector-core = { path = "../vector-core" }
 proptest = "1.7"
 rand.workspace = true
 rand_distr.workspace = true
+tokio = {workspace = true, features = ["test-util"] }
diff --git a/lib/vector-stream/src/concurrent_map.rs b/lib/vector-stream/src/concurrent_map.rs
index 57ce9b8bc47d7..d637537b65dc8 100644
--- a/lib/vector-stream/src/concurrent_map.rs
+++ b/lib/vector-stream/src/concurrent_map.rs
@@ -83,7 +83,11 @@ where
         }
 
         match ready!(this.in_flight.poll_next_unpin(cx)) {
-            // Either nothing is in-flight, or nothing is ready.
+            // If the stream is done and there is no futures managed by FuturesOrdered,
+            // we must end the stream by returning Poll::Ready(None).
+            None if this.stream.is_done() => Poll::Ready(None),
+            // If there are no in-flight futures managed by FuturesOrdered but the underlying
+            // stream is not done, then we must keep polling that stream.
             None => Poll::Pending,
             Some(result) => match result {
                 Ok(item) => Poll::Ready(Some(item)),
@@ -101,3 +105,21 @@ where
         }
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use futures_util::stream::StreamExt;
+
+    #[tokio::test]
+    async fn test_concurrent_map_on_empty_stream() {
+        let stream = futures_util::stream::empty::<()>();
+        let limit = Some(NonZeroUsize::new(2).unwrap());
+        // The `as _` is required to construct a `dyn Future`
+        let f = |()| Box::pin(async move {}) as _;
+        let mut concurrent_map = ConcurrentMap::new(stream, limit, f);
+
+        // Assert that the stream does not hang
+        assert_eq!(concurrent_map.next().await, None);
+    }
+}

From a3f648f5351877102d3eb0645492de0a381e000e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 8 Jul 2025 15:15:41 +0000
Subject: [PATCH 162/305] chore(deps): Bump goauth from 0.14.0 to 0.16.0
 (#20688)

* chore(deps): Bump goauth from 0.14.0 to 0.16.0

Bumps [goauth](https://github.com/durch/rust-goauth) from 0.14.0 to 0.16.0.
- [Release notes](https://github.com/durch/rust-goauth/releases)
- [Commits](https://github.com/durch/rust-goauth/commits)

---
updated-dependencies:
- dependency-name: goauth
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* Update to new function signature

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Thomas <thomas.schneider@datadoghq.com>
---
 Cargo.lock | 28 ++++++++++++++++++++++++----
 Cargo.toml |  2 +-
 src/gcp.rs |  2 +-
 3 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 7e6a2c477172b..7be10c60ede05 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4138,14 +4138,14 @@ dependencies = [
 
 [[package]]
 name = "goauth"
-version = "0.14.0"
+version = "0.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d351469a584f3b3565e2e740d4da60839bddc4320dadd7d61da8bdd77ffb373b"
+checksum = "7b1f1228623a5a37d4834f984573a01086708b109bbf0f7c2ee8d70b0c90d7a5"
 dependencies = [
  "arc-swap",
  "futures 0.3.31",
  "log",
- "reqwest 0.11.26",
+ "reqwest 0.12.9",
  "serde",
  "serde_derive",
  "serde_json",
@@ -4964,6 +4964,22 @@ dependencies = [
  "tokio-native-tls",
 ]
 
+[[package]]
+name = "hyper-tls"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0"
+dependencies = [
+ "bytes 1.10.1",
+ "http-body-util",
+ "hyper 1.4.1",
+ "hyper-util",
+ "native-tls",
+ "tokio",
+ "tokio-native-tls",
+ "tower-service",
+]
+
 [[package]]
 name = "hyper-util"
 version = "0.1.9"
@@ -8660,7 +8676,7 @@ dependencies = [
  "http-body 0.4.5",
  "hyper 0.14.28",
  "hyper-rustls 0.24.2",
- "hyper-tls",
+ "hyper-tls 0.5.0",
  "ipnet",
  "js-sys",
  "log",
@@ -8700,6 +8716,7 @@ dependencies = [
  "bytes 1.10.1",
  "cookie",
  "cookie_store",
+ "futures-channel",
  "futures-core",
  "futures-util",
  "http 1.1.0",
@@ -8707,12 +8724,14 @@ dependencies = [
  "http-body-util",
  "hyper 1.4.1",
  "hyper-rustls 0.27.5",
+ "hyper-tls 0.6.0",
  "hyper-util",
  "ipnet",
  "js-sys",
  "log",
  "mime",
  "mime_guess",
+ "native-tls",
  "once_cell",
  "percent-encoding",
  "pin-project-lite",
@@ -8725,6 +8744,7 @@ dependencies = [
  "serde_urlencoded",
  "sync_wrapper 1.0.1",
  "tokio",
+ "tokio-native-tls",
  "tokio-rustls 0.26.2",
  "tokio-util",
  "tower-service",
diff --git a/Cargo.toml b/Cargo.toml
index 04b655a24b0a2..c598761dd75ad 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -287,7 +287,7 @@ prost-reflect = { workspace = true, optional = true }
 prost-types = { workspace = true, optional = true }
 
 # GCP
-goauth = { version = "0.14.0", optional = true }
+goauth = { version = "0.16.0", optional = true }
 smpl_jwt = { version = "0.8.0", default-features = false, optional = true }
 
 # AMQP
diff --git a/src/gcp.rs b/src/gcp.rs
index 120ca0196398d..d484a063ccd35 100644
--- a/src/gcp.rs
+++ b/src/gcp.rs
@@ -257,7 +257,7 @@ impl InnerCreds {
 }
 
 async fn fetch_token(creds: &Credentials, scope: &Scope) -> crate::Result<Token> {
-    let claims = JwtClaims::new(creds.iss(), scope, creds.token_uri(), None, None);
+    let claims = JwtClaims::new(creds.iss(), &[scope.clone()], creds.token_uri(), None, None);
     let rsa_key = creds.rsa_key().context(InvalidRsaKeySnafu)?;
     let jwt = Jwt::new(claims, rsa_key, None);
 

From 31756e041a0652de6e7fbf06369cc502132f91a0 Mon Sep 17 00:00:00 2001
From: Erlang Parasu <erlangparasu@gmail.com>
Date: Wed, 9 Jul 2025 21:34:46 +0800
Subject: [PATCH 163/305] docs(external): update file websocket_server.cue
 (#23348)

Update websocket_server.cue

change `websocket_listener` to `websocket_server`
---
 website/cue/reference/components/sinks/websocket_server.cue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/website/cue/reference/components/sinks/websocket_server.cue b/website/cue/reference/components/sinks/websocket_server.cue
index 31c9d4af42d1d..da38e34288d1a 100644
--- a/website/cue/reference/components/sinks/websocket_server.cue
+++ b/website/cue/reference/components/sinks/websocket_server.cue
@@ -120,7 +120,7 @@ components: sinks: websocket_server: {
 				sinks:
 					websocket_sink:
 						inputs: ["demo_logs_test"]
-						type: "websocket_listener"
+						type: "websocket_server"
 						address: "0.0.0.0:1234"
 						auth:
 							username: "test"

From 1102f897dfea8cc14255228add5daf54191c0da2 Mon Sep 17 00:00:00 2001
From: Nick Wang <nickywang100@gmail.com>
Date: Wed, 9 Jul 2025 10:10:54 -0400
Subject: [PATCH 164/305] enhancement(enriching): add optional wildcard search
 parameter (#23074)

* add wildcard parameter

* update unit tests from 1d232fb50

* unit tests

* format

* update docs

* update docs with examples

* changelog

* rename changelog

* bugfix and finds_row_with_wildcard without index

* use Value instead of String

* reset row_equals matching wildcard logic

* f

* update indexed signature only

* fix composite hash key bug in indexed

* revert accidental name cahnge

* cargo format

* update example title to wildcard match

* 3 sections for searching enrichment table

* indexed_with_wildcard

* cargo fmt

* run ./website/scripts/cue.sh fmt

* fix

* fix docs

---------

Co-authored-by: Pavlos Rontidis <pavlos.rontidis@gmail.com>
---
 ...e_bounded_date_range_search.enhancement.md |   3 +
 .../src/find_enrichment_table_records.rs      |  17 +
 .../src/get_enrichment_table_record.rs        |  18 ++
 lib/enrichment/src/lib.rs                     |   2 +
 lib/enrichment/src/tables.rs                  |  14 +-
 lib/enrichment/src/test_util.rs               |   2 +
 lib/vector-vrl/tests/src/test_enrichment.rs   |   2 +
 src/enrichment_tables/file.rs                 | 301 ++++++++++++++++--
 src/enrichment_tables/geoip.rs                |   5 +-
 src/enrichment_tables/memory/table.rs         |  24 +-
 src/enrichment_tables/mmdb.rs                 |   5 +-
 website/cue/reference/remap/functions.cue     |   8 +-
 .../find_enrichment_table_records.cue         |  14 +
 .../functions/get_enrichment_table_record.cue |  14 +
 14 files changed, 384 insertions(+), 45 deletions(-)
 create mode 100644 changelog.d/23074_enrichment_function_single_bounded_date_range_search.enhancement.md

diff --git a/changelog.d/23074_enrichment_function_single_bounded_date_range_search.enhancement.md b/changelog.d/23074_enrichment_function_single_bounded_date_range_search.enhancement.md
new file mode 100644
index 0000000000000..f1e08baad96ab
--- /dev/null
+++ b/changelog.d/23074_enrichment_function_single_bounded_date_range_search.enhancement.md
@@ -0,0 +1,3 @@
+The [enrichment functions](https://vector.dev/docs/reference/vrl/functions/#enrichment-functions) now support an optional wildcard parameter where a match will succeed if the field value equals either the wildcard or the actual comparison value.
+
+authors: nzxwang
diff --git a/lib/enrichment/src/find_enrichment_table_records.rs b/lib/enrichment/src/find_enrichment_table_records.rs
index f2ec4313b60d5..03540d8384137 100644
--- a/lib/enrichment/src/find_enrichment_table_records.rs
+++ b/lib/enrichment/src/find_enrichment_table_records.rs
@@ -12,6 +12,7 @@ fn find_enrichment_table_records(
     enrichment_tables: &TableSearch,
     table: &str,
     case_sensitive: Case,
+    wildcard: Option<Value>,
     condition: &[Condition],
     index: Option<IndexHandle>,
 ) -> Resolved {
@@ -34,6 +35,7 @@ fn find_enrichment_table_records(
             case_sensitive,
             condition,
             select.as_ref().map(|select| select.as_ref()),
+            wildcard.as_ref(),
             index,
         )?
         .into_iter()
@@ -71,6 +73,11 @@ impl Function for FindEnrichmentTableRecords {
                 kind: kind::BOOLEAN,
                 required: false,
             },
+            Parameter {
+                keyword: "wildcard",
+                kind: kind::BYTES,
+                required: false,
+            },
         ]
     }
 
@@ -112,6 +119,7 @@ impl Function for FindEnrichmentTableRecords {
         let select = arguments.optional("select");
 
         let case_sensitive = is_case_sensitive(&arguments, state)?;
+        let wildcard = arguments.optional("wildcard");
         let index = Some(
             add_index(registry, &table, case_sensitive, &condition)
                 .map_err(|err| Box::new(err) as Box<_>)?,
@@ -123,6 +131,7 @@ impl Function for FindEnrichmentTableRecords {
             index,
             select,
             case_sensitive,
+            wildcard,
             enrichment_tables: registry.as_readonly(),
         }
         .as_expr())
@@ -136,6 +145,7 @@ pub struct FindEnrichmentTableRecordsFn {
     index: Option<IndexHandle>,
     select: Option<Box<dyn Expression>>,
     case_sensitive: Case,
+    wildcard: Option<Box<dyn Expression>>,
     enrichment_tables: TableSearch,
 }
 
@@ -158,6 +168,11 @@ impl FunctionExpression for FindEnrichmentTableRecordsFn {
 
         let table = &self.table;
         let case_sensitive = self.case_sensitive;
+        let wildcard = self
+            .wildcard
+            .as_ref()
+            .map(|array| array.resolve(ctx))
+            .transpose()?;
         let index = self.index;
         let enrichment_tables = &self.enrichment_tables;
 
@@ -166,6 +181,7 @@ impl FunctionExpression for FindEnrichmentTableRecordsFn {
             enrichment_tables,
             table,
             case_sensitive,
+            wildcard,
             &condition,
             index,
         )
@@ -199,6 +215,7 @@ mod tests {
             index: Some(IndexHandle(999)),
             select: None,
             case_sensitive: Case::Sensitive,
+            wildcard: None,
             enrichment_tables: registry.as_readonly(),
         };
 
diff --git a/lib/enrichment/src/get_enrichment_table_record.rs b/lib/enrichment/src/get_enrichment_table_record.rs
index ddd99c99c804b..fea1d77be9ed2 100644
--- a/lib/enrichment/src/get_enrichment_table_record.rs
+++ b/lib/enrichment/src/get_enrichment_table_record.rs
@@ -12,6 +12,7 @@ fn get_enrichment_table_record(
     enrichment_tables: &TableSearch,
     table: &str,
     case_sensitive: Case,
+    wildcard: Option<Value>,
     condition: &[Condition],
     index: Option<IndexHandle>,
 ) -> Resolved {
@@ -27,11 +28,13 @@ fn get_enrichment_table_record(
             }),
         })
         .transpose()?;
+
     let data = enrichment_tables.find_table_row(
         table,
         case_sensitive,
         condition,
         select.as_ref().map(|select| select.as_ref()),
+        wildcard.as_ref(),
         index,
     )?;
 
@@ -67,6 +70,11 @@ impl Function for GetEnrichmentTableRecord {
                 kind: kind::BOOLEAN,
                 required: false,
             },
+            Parameter {
+                keyword: "wildcard",
+                kind: kind::BYTES,
+                required: false,
+            },
         ]
     }
 
@@ -104,6 +112,7 @@ impl Function for GetEnrichmentTableRecord {
         let select = arguments.optional("select");
 
         let case_sensitive = is_case_sensitive(&arguments, state)?;
+        let wildcard = arguments.optional("wildcard");
         let index = Some(
             add_index(registry, &table, case_sensitive, &condition)
                 .map_err(|err| Box::new(err) as Box<_>)?,
@@ -115,6 +124,7 @@ impl Function for GetEnrichmentTableRecord {
             index,
             select,
             case_sensitive,
+            wildcard,
             enrichment_tables: registry.as_readonly(),
         }
         .as_expr())
@@ -127,6 +137,7 @@ pub struct GetEnrichmentTableRecordFn {
     condition: BTreeMap<KeyString, expression::Expr>,
     index: Option<IndexHandle>,
     select: Option<Box<dyn Expression>>,
+    wildcard: Option<Box<dyn Expression>>,
     case_sensitive: Case,
     enrichment_tables: TableSearch,
 }
@@ -150,6 +161,11 @@ impl FunctionExpression for GetEnrichmentTableRecordFn {
 
         let table = &self.table;
         let case_sensitive = self.case_sensitive;
+        let wildcard = self
+            .wildcard
+            .as_ref()
+            .map(|array| array.resolve(ctx))
+            .transpose()?;
         let index = self.index;
         let enrichment_tables = &self.enrichment_tables;
 
@@ -158,6 +174,7 @@ impl FunctionExpression for GetEnrichmentTableRecordFn {
             enrichment_tables,
             table,
             case_sensitive,
+            wildcard,
             &condition,
             index,
         )
@@ -191,6 +208,7 @@ mod tests {
             index: Some(IndexHandle(999)),
             select: None,
             case_sensitive: Case::Sensitive,
+            wildcard: None,
             enrichment_tables: registry.as_readonly(),
         };
 
diff --git a/lib/enrichment/src/lib.rs b/lib/enrichment/src/lib.rs
index 91195aa77338b..ce02e5f8f8436 100644
--- a/lib/enrichment/src/lib.rs
+++ b/lib/enrichment/src/lib.rs
@@ -57,6 +57,7 @@ pub trait Table: DynClone {
         case: Case,
         condition: &'a [Condition<'a>],
         select: Option<&[String]>,
+        wildcard: Option<&Value>,
         index: Option<IndexHandle>,
     ) -> Result<ObjectMap, String>;
 
@@ -68,6 +69,7 @@ pub trait Table: DynClone {
         case: Case,
         condition: &'a [Condition<'a>],
         select: Option<&[String]>,
+        wildcard: Option<&Value>,
         index: Option<IndexHandle>,
     ) -> Result<Vec<ObjectMap>, String>;
 
diff --git a/lib/enrichment/src/tables.rs b/lib/enrichment/src/tables.rs
index 522d77c1c2b78..62c1b380b72d2 100644
--- a/lib/enrichment/src/tables.rs
+++ b/lib/enrichment/src/tables.rs
@@ -35,7 +35,7 @@ use std::{
 };
 
 use arc_swap::ArcSwap;
-use vrl::value::ObjectMap;
+use vrl::value::{ObjectMap, Value};
 
 use super::{Condition, IndexHandle, Table};
 use crate::Case;
@@ -216,13 +216,14 @@ impl TableSearch {
         case: Case,
         condition: &'a [Condition<'a>],
         select: Option<&[String]>,
+        wildcard: Option<&Value>,
         index: Option<IndexHandle>,
     ) -> Result<ObjectMap, String> {
         let tables = self.0.load();
         if let Some(ref tables) = **tables {
             match tables.get(table) {
                 None => Err(format!("table {} not loaded", table)),
-                Some(table) => table.find_table_row(case, condition, select, index),
+                Some(table) => table.find_table_row(case, condition, select, wildcard, index),
             }
         } else {
             Err("finish_load not called".to_string())
@@ -238,13 +239,14 @@ impl TableSearch {
         case: Case,
         condition: &'a [Condition<'a>],
         select: Option<&[String]>,
+        wildcard: Option<&Value>,
         index: Option<IndexHandle>,
     ) -> Result<Vec<ObjectMap>, String> {
         let tables = self.0.load();
         if let Some(ref tables) = **tables {
             match tables.get(table) {
                 None => Err(format!("table {} not loaded", table)),
-                Some(table) => table.find_table_rows(case, condition, select, index),
+                Some(table) => table.find_table_rows(case, condition, select, wildcard, index),
             }
         } else {
             Err("finish_load not called".to_string())
@@ -337,6 +339,7 @@ mod tests {
                     value: Value::from("thang"),
                 }],
                 None,
+                None,
                 None
             )
         );
@@ -378,6 +381,7 @@ mod tests {
                     value: Value::from("thang"),
                 }],
                 None,
+                None,
                 None
             )
         );
@@ -442,7 +446,7 @@ mod tests {
             tables
                 .get("dummy1")
                 .unwrap()
-                .find_table_row(Case::Sensitive, &Vec::new(), None, None)
+                .find_table_row(Case::Sensitive, &Vec::new(), None, None, None)
                 .unwrap()
                 .get("field")
                 .cloned()
@@ -455,7 +459,7 @@ mod tests {
             tables
                 .get("dummy2")
                 .unwrap()
-                .find_table_row(Case::Sensitive, &Vec::new(), None, None)
+                .find_table_row(Case::Sensitive, &Vec::new(), None, None, None)
                 .unwrap()
                 .get("thing")
                 .cloned()
diff --git a/lib/enrichment/src/test_util.rs b/lib/enrichment/src/test_util.rs
index 1eed09e200ca6..f56b3342ddaf4 100644
--- a/lib/enrichment/src/test_util.rs
+++ b/lib/enrichment/src/test_util.rs
@@ -39,6 +39,7 @@ impl Table for DummyEnrichmentTable {
         _case: Case,
         _condition: &[Condition],
         _select: Option<&[String]>,
+        _wildcard: Option<&Value>,
         _index: Option<IndexHandle>,
     ) -> Result<ObjectMap, String> {
         Ok(self.data.clone())
@@ -49,6 +50,7 @@ impl Table for DummyEnrichmentTable {
         _case: Case,
         _condition: &[Condition],
         _select: Option<&[String]>,
+        _wildcard: Option<&Value>,
         _index: Option<IndexHandle>,
     ) -> Result<Vec<ObjectMap>, String> {
         Ok(vec![self.data.clone()])
diff --git a/lib/vector-vrl/tests/src/test_enrichment.rs b/lib/vector-vrl/tests/src/test_enrichment.rs
index 725c4cd4a2ab6..ff803ea090b71 100644
--- a/lib/vector-vrl/tests/src/test_enrichment.rs
+++ b/lib/vector-vrl/tests/src/test_enrichment.rs
@@ -10,6 +10,7 @@ impl enrichment::Table for TestEnrichmentTable {
         _case: enrichment::Case,
         _condition: &'a [enrichment::Condition<'a>],
         _select: Option<&[String]>,
+        _wildcard: Option<&Value>,
         _index: Option<enrichment::IndexHandle>,
     ) -> Result<ObjectMap, String> {
         let mut result = ObjectMap::new();
@@ -25,6 +26,7 @@ impl enrichment::Table for TestEnrichmentTable {
         _case: enrichment::Case,
         _condition: &'a [enrichment::Condition<'a>],
         _select: Option<&[String]>,
+        _wildcard: Option<&Value>,
         _index: Option<enrichment::IndexHandle>,
     ) -> Result<Vec<ObjectMap>, String> {
         let mut result1 = ObjectMap::new();
diff --git a/src/enrichment_tables/file.rs b/src/enrichment_tables/file.rs
index 20abb4fa8a4d1..114e910c9c69b 100644
--- a/src/enrichment_tables/file.rs
+++ b/src/enrichment_tables/file.rs
@@ -295,20 +295,60 @@ impl File {
     }
 
     /// Does the given row match all the conditions specified?
-    fn row_equals(&self, case: Case, condition: &[Condition], row: &[Value]) -> bool {
+    fn row_equals(
+        &self,
+        case: Case,
+        condition: &[Condition],
+        row: &[Value],
+        wildcard: Option<&Value>,
+    ) -> bool {
         condition.iter().all(|condition| match condition {
             Condition::Equals { field, value } => match self.column_index(field) {
                 None => false,
-                Some(idx) => match (case, &row[idx], value) {
-                    (Case::Insensitive, Value::Bytes(bytes1), Value::Bytes(bytes2)) => {
-                        match (std::str::from_utf8(bytes1), std::str::from_utf8(bytes2)) {
-                            (Ok(s1), Ok(s2)) => s1.to_lowercase() == s2.to_lowercase(),
-                            (Err(_), Err(_)) => bytes1 == bytes2,
-                            _ => false,
+                Some(idx) => {
+                    let current_row_value = &row[idx];
+
+                    // Helper closure for comparing current_row_value with another value,
+                    // respecting the specified case for Value::Bytes.
+                    let compare_values = |val_to_compare: &Value| -> bool {
+                        match (case, current_row_value, val_to_compare) {
+                            (
+                                Case::Insensitive,
+                                Value::Bytes(bytes_row),
+                                Value::Bytes(bytes_cmp),
+                            ) => {
+                                // Perform case-insensitive comparison for byte strings.
+                                // If both are valid UTF-8, compare their lowercase versions.
+                                // If both are non-UTF-8 bytes, compare them directly.
+                                // If one is UTF-8 and the other is not, they are considered not equal.
+                                match (
+                                    std::str::from_utf8(bytes_row),
+                                    std::str::from_utf8(bytes_cmp),
+                                ) {
+                                    (Ok(s_row), Ok(s_cmp)) => {
+                                        s_row.to_lowercase() == s_cmp.to_lowercase()
+                                    }
+                                    (Err(_), Err(_)) => bytes_row == bytes_cmp,
+                                    _ => false,
+                                }
+                            }
+                            // For Case::Sensitive, or for Case::Insensitive with non-Bytes types,
+                            // perform a direct equality check.
+                            _ => current_row_value == val_to_compare,
                         }
+                    };
+
+                    // First, check if the row value matches the condition's value.
+                    if compare_values(value) {
+                        true
+                    } else if let Some(wc_val) = wildcard {
+                        // If not, and a wildcard is provided, check if the row value matches the wildcard.
+                        compare_values(wc_val)
+                    } else {
+                        // Otherwise, no match.
+                        false
                     }
-                    (_, value1, value2) => value1 == value2,
-                },
+                }
             },
             Condition::BetweenDates { field, from, to } => match self.column_index(field) {
                 None => false,
@@ -422,12 +462,13 @@ impl File {
         case: Case,
         condition: &'a [Condition<'a>],
         select: Option<&'a [String]>,
+        wildcard: Option<&'a Value>,
     ) -> impl Iterator<Item = ObjectMap> + 'a
     where
         I: Iterator<Item = &'a Vec<Value>> + 'a,
     {
         data.filter_map(move |row| {
-            if self.row_equals(case, condition, row) {
+            if self.row_equals(case, condition, row, wildcard) {
                 Some(self.add_columns(select, row))
             } else {
                 None
@@ -459,6 +500,32 @@ impl File {
         let IndexHandle(handle) = handle;
         Ok(self.indexes[handle].2.get(&key))
     }
+
+    fn indexed_with_wildcard<'a>(
+        &'a self,
+        case: Case,
+        wildcard: &'a Value,
+        condition: &'a [Condition<'a>],
+        handle: IndexHandle,
+    ) -> Result<Option<&'a Vec<usize>>, String> {
+        if let Some(result) = self.indexed(case, condition, handle)? {
+            return Ok(Some(result));
+        }
+
+        // If lookup fails and a wildcard is provided, compute hash for the wildcard
+        let mut wildcard_hash = seahash::SeaHasher::default();
+        for header in self.headers.iter() {
+            if condition.iter().any(
+                |condition| matches!(condition, Condition::Equals { field, .. } if field == header),
+            ) {
+                hash_value(&mut wildcard_hash, case, wildcard)?;
+            }
+        }
+
+        let wildcard_key = wildcard_hash.finish();
+        let IndexHandle(handle) = handle;
+        Ok(self.indexes[handle].2.get(&wildcard_key))
+    }
 }
 
 /// Adds the bytes from the given value to the hash.
@@ -506,22 +573,26 @@ impl Table for File {
         case: Case,
         condition: &'a [Condition<'a>],
         select: Option<&'a [String]>,
+        wildcard: Option<&Value>,
         index: Option<IndexHandle>,
     ) -> Result<ObjectMap, String> {
         match index {
             None => {
                 // No index has been passed so we need to do a Sequential Scan.
-                single_or_err(self.sequential(self.data.iter(), case, condition, select))
+                single_or_err(self.sequential(self.data.iter(), case, condition, select, wildcard))
             }
             Some(handle) => {
-                let result = self
-                    .indexed(case, condition, handle)?
-                    .ok_or_else(|| "no rows found in index".to_string())?
-                    .iter()
-                    .map(|idx| &self.data[*idx]);
+                let result = if let Some(wildcard) = wildcard {
+                    self.indexed_with_wildcard(case, wildcard, condition, handle)?
+                } else {
+                    self.indexed(case, condition, handle)?
+                }
+                .ok_or_else(|| "no rows found in index".to_string())?
+                .iter()
+                .map(|idx| &self.data[*idx]);
 
                 // Perform a sequential scan over the indexed result.
-                single_or_err(self.sequential(result, case, condition, select))
+                single_or_err(self.sequential(result, case, condition, select, wildcard))
             }
         }
     }
@@ -531,25 +602,33 @@ impl Table for File {
         case: Case,
         condition: &'a [Condition<'a>],
         select: Option<&'a [String]>,
+        wildcard: Option<&Value>,
         index: Option<IndexHandle>,
     ) -> Result<Vec<ObjectMap>, String> {
         match index {
             None => {
                 // No index has been passed so we need to do a Sequential Scan.
                 Ok(self
-                    .sequential(self.data.iter(), case, condition, select)
+                    .sequential(self.data.iter(), case, condition, select, wildcard)
                     .collect())
             }
             Some(handle) => {
                 // Perform a sequential scan over the indexed result.
+                let indexed_result = if let Some(wildcard) = wildcard {
+                    self.indexed_with_wildcard(case, wildcard, condition, handle)?
+                } else {
+                    self.indexed(case, condition, handle)?
+                };
+
                 Ok(self
                     .sequential(
-                        self.indexed(case, condition, handle)?
+                        indexed_result
                             .iter()
                             .flat_map(|results| results.iter().map(|idx| &self.data[*idx])),
                         case,
                         condition,
                         select,
+                        wildcard,
                     )
                     .collect())
             }
@@ -804,7 +883,37 @@ mod tests {
                 ("field1".into(), Value::from("zirp")),
                 ("field2".into(), Value::from("zurp")),
             ])),
-            file.find_table_row(Case::Sensitive, &[condition], None, None)
+            file.find_table_row(Case::Sensitive, &[condition], None, None, None)
+        );
+    }
+
+    #[test]
+    fn finds_row_with_wildcard() {
+        let file = File::new(
+            Default::default(),
+            FileData {
+                modified: SystemTime::now(),
+                data: vec![
+                    vec!["zip".into(), "zup".into()],
+                    vec!["zirp".into(), "zurp".into()],
+                ],
+                headers: vec!["field1".to_string(), "field2".to_string()],
+            },
+        );
+
+        let wildcard = Value::from("zirp");
+
+        let condition = Condition::Equals {
+            field: "field1",
+            value: Value::from("nonexistent"),
+        };
+
+        assert_eq!(
+            Ok(ObjectMap::from([
+                ("field1".into(), Value::from("zirp")),
+                ("field2".into(), Value::from("zurp")),
+            ])),
+            file.find_table_row(Case::Sensitive, &[condition], None, Some(&wildcard), None)
         );
     }
 
@@ -878,7 +987,44 @@ mod tests {
                 ("field1".into(), Value::from("zirp")),
                 ("field2".into(), Value::from("zurp")),
             ])),
-            file.find_table_row(Case::Sensitive, &[condition], None, Some(handle))
+            file.find_table_row(Case::Sensitive, &[condition], None, None, Some(handle))
+        );
+    }
+
+    #[test]
+    fn finds_row_with_index_case_sensitive_and_wildcard() {
+        let mut file = File::new(
+            Default::default(),
+            FileData {
+                modified: SystemTime::now(),
+                data: vec![
+                    vec!["zip".into(), "zup".into()],
+                    vec!["zirp".into(), "zurp".into()],
+                ],
+                headers: vec!["field1".to_string(), "field2".to_string()],
+            },
+        );
+
+        let handle = file.add_index(Case::Sensitive, &["field1"]).unwrap();
+        let wildcard = Value::from("zirp");
+
+        let condition = Condition::Equals {
+            field: "field1",
+            value: Value::from("nonexistent"),
+        };
+
+        assert_eq!(
+            Ok(ObjectMap::from([
+                ("field1".into(), Value::from("zirp")),
+                ("field2".into(), Value::from("zurp")),
+            ])),
+            file.find_table_row(
+                Case::Sensitive,
+                &[condition],
+                None,
+                Some(&wildcard),
+                Some(handle)
+            )
         );
     }
 
@@ -917,6 +1063,7 @@ mod tests {
                     value: Value::from("zip"),
                 }],
                 None,
+                None,
                 Some(handle)
             )
         );
@@ -930,6 +1077,7 @@ mod tests {
                     value: Value::from("ZiP"),
                 }],
                 None,
+                None,
                 Some(handle)
             )
         );
@@ -976,6 +1124,7 @@ mod tests {
                 Case::Sensitive,
                 &[condition],
                 Some(&["field1".to_string(), "field3".to_string()]),
+                None,
                 Some(handle)
             )
         );
@@ -1016,6 +1165,71 @@ mod tests {
                     value: Value::from("zip"),
                 }],
                 None,
+                None,
+                Some(handle)
+            )
+        );
+
+        assert_eq!(
+            Ok(vec![
+                ObjectMap::from([
+                    ("field1".into(), Value::from("zip")),
+                    ("field2".into(), Value::from("zup")),
+                ]),
+                ObjectMap::from([
+                    ("field1".into(), Value::from("zip")),
+                    ("field2".into(), Value::from("zoop")),
+                ]),
+            ]),
+            file.find_table_rows(
+                Case::Insensitive,
+                &[Condition::Equals {
+                    field: "field1",
+                    value: Value::from("ZiP"),
+                }],
+                None,
+                None,
+                Some(handle)
+            )
+        );
+    }
+
+    #[test]
+    fn finds_rows_with_index_case_insensitive_and_wildcard() {
+        let mut file = File::new(
+            Default::default(),
+            FileData {
+                modified: SystemTime::now(),
+                data: vec![
+                    vec!["zip".into(), "zup".into()],
+                    vec!["zirp".into(), "zurp".into()],
+                    vec!["zip".into(), "zoop".into()],
+                ],
+                headers: vec!["field1".to_string(), "field2".to_string()],
+            },
+        );
+
+        let handle = file.add_index(Case::Insensitive, &["field1"]).unwrap();
+
+        assert_eq!(
+            Ok(vec![
+                ObjectMap::from([
+                    ("field1".into(), Value::from("zip")),
+                    ("field2".into(), Value::from("zup")),
+                ]),
+                ObjectMap::from([
+                    ("field1".into(), Value::from("zip")),
+                    ("field2".into(), Value::from("zoop")),
+                ]),
+            ]),
+            file.find_table_rows(
+                Case::Insensitive,
+                &[Condition::Equals {
+                    field: "field1",
+                    value: Value::from("nonexistent"),
+                }],
+                None,
+                Some(&Value::from("zip")),
                 Some(handle)
             )
         );
@@ -1038,6 +1252,7 @@ mod tests {
                     value: Value::from("ZiP"),
                 }],
                 None,
+                Some(&Value::from("ZiP")),
                 Some(handle)
             )
         );
@@ -1106,7 +1321,7 @@ mod tests {
                     )
                 )
             ])),
-            file.find_table_row(Case::Sensitive, &conditions, None, Some(handle))
+            file.find_table_row(Case::Sensitive, &conditions, None, None, Some(handle))
         );
     }
 
@@ -1169,7 +1384,7 @@ mod tests {
                     )
                 )
             ])),
-            file.find_table_row(Case::Sensitive, &conditions, None, Some(handle))
+            file.find_table_row(Case::Sensitive, &conditions, None, None, Some(handle))
         );
     }
 
@@ -1232,7 +1447,7 @@ mod tests {
                     )
                 )
             ])),
-            file.find_table_row(Case::Sensitive, &conditions, None, Some(handle))
+            file.find_table_row(Case::Sensitive, &conditions, None, None, Some(handle))
         );
     }
 
@@ -1257,7 +1472,7 @@ mod tests {
 
         assert_eq!(
             Err("no rows found".to_string()),
-            file.find_table_row(Case::Sensitive, &[condition], None, None)
+            file.find_table_row(Case::Sensitive, &[condition], None, None, None)
         );
     }
 
@@ -1284,7 +1499,41 @@ mod tests {
 
         assert_eq!(
             Err("no rows found in index".to_string()),
-            file.find_table_row(Case::Sensitive, &[condition], None, Some(handle))
+            file.find_table_row(Case::Sensitive, &[condition], None, None, Some(handle))
+        );
+    }
+
+    #[test]
+    fn doesnt_find_row_with_index_and_wildcard() {
+        let mut file = File::new(
+            Default::default(),
+            FileData {
+                modified: SystemTime::now(),
+                data: vec![
+                    vec!["zip".into(), "zup".into()],
+                    vec!["zirp".into(), "zurp".into()],
+                ],
+                headers: vec!["field1".to_string(), "field2".to_string()],
+            },
+        );
+
+        let handle = file.add_index(Case::Sensitive, &["field1"]).unwrap();
+        let wildcard = Value::from("nonexistent");
+
+        let condition = Condition::Equals {
+            field: "field1",
+            value: Value::from("zorp"),
+        };
+
+        assert_eq!(
+            Err("no rows found in index".to_string()),
+            file.find_table_row(
+                Case::Sensitive,
+                &[condition],
+                None,
+                Some(&wildcard),
+                Some(handle)
+            )
         );
     }
 }
diff --git a/src/enrichment_tables/geoip.rs b/src/enrichment_tables/geoip.rs
index 917fc4885881a..d7f47f4b4d843 100644
--- a/src/enrichment_tables/geoip.rs
+++ b/src/enrichment_tables/geoip.rs
@@ -264,9 +264,10 @@ impl Table for Geoip {
         case: Case,
         condition: &'a [Condition<'a>],
         select: Option<&[String]>,
+        wildcard: Option<&Value>,
         index: Option<IndexHandle>,
     ) -> Result<ObjectMap, String> {
-        let mut rows = self.find_table_rows(case, condition, select, index)?;
+        let mut rows = self.find_table_rows(case, condition, select, wildcard, index)?;
 
         match rows.pop() {
             Some(row) if rows.is_empty() => Ok(row),
@@ -283,6 +284,7 @@ impl Table for Geoip {
         _: Case,
         condition: &'a [Condition<'a>],
         select: Option<&[String]>,
+        _wildcard: Option<&Value>,
         _: Option<IndexHandle>,
     ) -> Result<Vec<ObjectMap>, String> {
         match condition.first() {
@@ -514,6 +516,7 @@ mod tests {
             }],
             select,
             None,
+            None,
         )
         .unwrap()
         .pop()
diff --git a/src/enrichment_tables/memory/table.rs b/src/enrichment_tables/memory/table.rs
index dd8ff7779780a..068f6630bfb75 100644
--- a/src/enrichment_tables/memory/table.rs
+++ b/src/enrichment_tables/memory/table.rs
@@ -243,9 +243,10 @@ impl Table for Memory {
         case: Case,
         condition: &'a [Condition<'a>],
         select: Option<&'a [String]>,
+        wildcard: Option<&Value>,
         index: Option<IndexHandle>,
     ) -> Result<ObjectMap, String> {
-        let mut rows = self.find_table_rows(case, condition, select, index)?;
+        let mut rows = self.find_table_rows(case, condition, select, wildcard, index)?;
 
         match rows.pop() {
             Some(row) if rows.is_empty() => Ok(row),
@@ -259,6 +260,7 @@ impl Table for Memory {
         _case: Case,
         condition: &'a [Condition<'a>],
         _select: Option<&'a [String]>,
+        _wildcard: Option<&Value>,
         _index: Option<IndexHandle>,
     ) -> Result<Vec<ObjectMap>, String> {
         match condition.first() {
@@ -414,7 +416,7 @@ mod tests {
                 ("ttl".into(), Value::from(memory.config.ttl)),
                 ("value".into(), Value::from(5)),
             ])),
-            memory.find_table_row(Case::Sensitive, &[condition], None, None)
+            memory.find_table_row(Case::Sensitive, &[condition], None, None, None)
         );
     }
 
@@ -446,7 +448,7 @@ mod tests {
                 ("ttl".into(), Value::from(ttl - secs_to_subtract)),
                 ("value".into(), Value::from(5)),
             ])),
-            memory.find_table_row(Case::Sensitive, &[condition], None, None)
+            memory.find_table_row(Case::Sensitive, &[condition], None, None, None)
         );
     }
 
@@ -479,7 +481,7 @@ mod tests {
                 ("ttl".into(), Value::from(0)),
                 ("value".into(), Value::from(5)),
             ])),
-            memory.find_table_row(Case::Sensitive, &[condition.clone()], None, None)
+            memory.find_table_row(Case::Sensitive, &[condition.clone()], None, None, None)
         );
 
         // Force scan
@@ -488,7 +490,7 @@ mod tests {
 
         // The value is not present anymore
         assert!(memory
-            .find_table_rows(Case::Sensitive, &[condition], None, None)
+            .find_table_rows(Case::Sensitive, &[condition], None, None, None)
             .unwrap()
             .pop()
             .is_none());
@@ -509,7 +511,7 @@ mod tests {
         };
 
         assert!(memory
-            .find_table_rows(Case::Sensitive, &[condition], None, None)
+            .find_table_rows(Case::Sensitive, &[condition], None, None, None)
             .unwrap()
             .pop()
             .is_none());
@@ -541,7 +543,7 @@ mod tests {
                 ("ttl".into(), Value::from(ttl / 2)),
                 ("value".into(), Value::from(5)),
             ])),
-            memory.find_table_row(Case::Sensitive, &[condition.clone()], None, None)
+            memory.find_table_row(Case::Sensitive, &[condition.clone()], None, None, None)
         );
 
         memory.handle_value(ObjectMap::from([("test_key".into(), Value::from(5))]));
@@ -552,7 +554,7 @@ mod tests {
                 ("ttl".into(), Value::from(ttl)),
                 ("value".into(), Value::from(5)),
             ])),
-            memory.find_table_row(Case::Sensitive, &[condition], None, None)
+            memory.find_table_row(Case::Sensitive, &[condition], None, None, None)
         );
     }
 
@@ -569,7 +571,7 @@ mod tests {
         };
 
         assert!(memory
-            .find_table_rows(Case::Sensitive, &[condition], None, None)
+            .find_table_rows(Case::Sensitive, &[condition], None, None, None)
             .unwrap()
             .pop()
             .is_none());
@@ -598,6 +600,7 @@ mod tests {
                     value: Value::from("test_key")
                 }],
                 None,
+                None,
                 None
             )
         );
@@ -610,6 +613,7 @@ mod tests {
                     value: Value::from("rejected_key")
                 }],
                 None,
+                None,
                 None
             )
             .unwrap()
@@ -627,7 +631,7 @@ mod tests {
         };
 
         assert!(memory
-            .find_table_rows(Case::Sensitive, &[condition], None, None)
+            .find_table_rows(Case::Sensitive, &[condition], None, None, None)
             .unwrap()
             .pop()
             .is_none());
diff --git a/src/enrichment_tables/mmdb.rs b/src/enrichment_tables/mmdb.rs
index 7441dd8a3d893..0c47c1d52d4b4 100644
--- a/src/enrichment_tables/mmdb.rs
+++ b/src/enrichment_tables/mmdb.rs
@@ -98,9 +98,10 @@ impl Table for Mmdb {
         case: Case,
         condition: &'a [Condition<'a>],
         select: Option<&[String]>,
+        wildcard: Option<&Value>,
         index: Option<IndexHandle>,
     ) -> Result<ObjectMap, String> {
-        let mut rows = self.find_table_rows(case, condition, select, index)?;
+        let mut rows = self.find_table_rows(case, condition, select, wildcard, index)?;
 
         match rows.pop() {
             Some(row) if rows.is_empty() => Ok(row),
@@ -117,6 +118,7 @@ impl Table for Mmdb {
         _: Case,
         condition: &'a [Condition<'a>],
         select: Option<&[String]>,
+        _wildcard: Option<&Value>,
         _: Option<IndexHandle>,
     ) -> Result<Vec<ObjectMap>, String> {
         match condition.first() {
@@ -270,6 +272,7 @@ mod tests {
             }],
             select,
             None,
+            None,
         )
         .unwrap()
         .pop()
diff --git a/website/cue/reference/remap/functions.cue b/website/cue/reference/remap/functions.cue
index 18ed9457a673c..ab149676e838a 100644
--- a/website/cue/reference/remap/functions.cue
+++ b/website/cue/reference/remap/functions.cue
@@ -66,14 +66,18 @@ remap: {
 		This function returns the rows that match the provided condition(s). _All_ fields need to
 		match for rows to be returned; if any fields do not match, then no rows are returned.
 
-		There are currently two forms of search criteria:
+		There are currently three forms of search criteria:
 
 		1. **Exact match search**. The given field must match the value exactly. Case sensitivity
 		   can be specified using the `case_sensitive` argument. An exact match search can use an
 		   index directly into the dataset, which should make this search fairly "cheap" from a
 		   performance perspective.
 
-		2. **Date range search**. The given field must be greater than or equal to the `from` date
+		2. **Wildcard match search**. The given fields specified by the exact match search may also
+		    be matched exactly to the value provided to the `wildcard` parameter.
+		    A wildcard match search can also use an index directly into the dataset.
+
+		3. **Date range search**. The given field must be greater than or equal to the `from` date
 		   and/or less than or equal to the `to` date. A date range search involves
 		   sequentially scanning through the rows that have been located using any exact match
 		   criteria. This can be an expensive operation if there are many rows returned by any exact
diff --git a/website/cue/reference/remap/functions/find_enrichment_table_records.cue b/website/cue/reference/remap/functions/find_enrichment_table_records.cue
index 78956f365a1c5..1848f163edd4d 100644
--- a/website/cue/reference/remap/functions/find_enrichment_table_records.cue
+++ b/website/cue/reference/remap/functions/find_enrichment_table_records.cue
@@ -59,6 +59,20 @@ remap: functions: find_enrichment_table_records: {
 				{"id": 2, "firstname": "Fred", "surname": "Smith"},
 			]
 		},
+		{
+			title: "Wildcard match"
+			source: #"""
+				find_enrichment_table_records!("test",
+				  {
+				    "firstname": "Bob",
+				  },
+				  wildcard: "fred",
+				  case_sensitive: false)
+				"""#
+			return: [{"id": 1, "firstname": "Bob", "surname": "Smith"},
+				{"id": 2, "firstname": "Fred", "surname": "Smith"},
+			]
+		},
 		{
 			title: "Date range search"
 			source: #"""
diff --git a/website/cue/reference/remap/functions/get_enrichment_table_record.cue b/website/cue/reference/remap/functions/get_enrichment_table_record.cue
index 58ff104e6754f..9aae8266392b0 100644
--- a/website/cue/reference/remap/functions/get_enrichment_table_record.cue
+++ b/website/cue/reference/remap/functions/get_enrichment_table_record.cue
@@ -62,6 +62,20 @@ remap: functions: get_enrichment_table_record: {
 				"""#
 			return: {"id": 1, "firstname": "Bob", "surname": "Smith"}
 		},
+		{
+			title: "Wildcard match"
+			source: #"""
+				find_enrichment_table_records!("test",
+				  {
+				    "firstname": "Bob",
+				  },
+				  wildcard: "fred",
+				  case_sensitive: false)
+				"""#
+			return: [{"id": 1, "firstname": "Bob", "surname": "Smith"},
+				{"id": 2, "firstname": "Fred", "surname": "Smith"},
+			]
+		},
 		{
 			title: "Date range search"
 			source: #"""

From ffe54be6a3b3d0777fbc07b5401c343cb00e1639 Mon Sep 17 00:00:00 2001
From: Pavlos Rontidis <pavlos.rontidis@gmail.com>
Date: Thu, 10 Jul 2025 11:37:23 -0400
Subject: [PATCH 165/305] chore(dev): new discussions q-a template

---
 .github/DISCUSSION_TEMPLATE/q-a.yml | 33 +++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 .github/DISCUSSION_TEMPLATE/q-a.yml

diff --git a/.github/DISCUSSION_TEMPLATE/q-a.yml b/.github/DISCUSSION_TEMPLATE/q-a.yml
new file mode 100644
index 0000000000000..23cb1f8467745
--- /dev/null
+++ b/.github/DISCUSSION_TEMPLATE/q-a.yml
@@ -0,0 +1,33 @@
+title: "Q&A"
+labels: [ q-a ]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Please fill out the following fields to help us assist you effectively.
+
+  - type: textarea
+    id: question
+    attributes:
+      label: Question
+      description: What are you trying to do? What issue are you encountering?
+
+  - type: textarea
+    id: config
+    attributes:
+      label: Vector Config
+      description: Your Vector configuration (please redact sensitive data)
+      placeholder: |
+        ```yaml
+        # your config
+        ```
+
+  - type: textarea
+    id: logs
+    attributes:
+      label: Vector Logs
+      description: Paste any relevant Vector logs or error messages.
+      placeholder: |
+        ```sh
+        Jul 10 14:32:02 vector[1234]: ERROR ...
+        ```

From ca0b95121137a35466d472c741c0a897e6061e7c Mon Sep 17 00:00:00 2001
From: Thomas <thomas.schneider@datadoghq.com>
Date: Thu, 10 Jul 2025 11:47:23 -0400
Subject: [PATCH 166/305] chore(website): Rename base to generated (#23353)

* Rename base->generated

* Fix references
---
 scripts/generate-component-docs.rb            | 32 +++++++++----------
 website/cue/reference/api.cue                 |  2 +-
 .../components/{base => generated}/sinks.cue  |  2 +-
 .../{base => generated}/sources.cue           |  2 +-
 .../{base => generated}/transforms.cue        |  2 +-
 website/cue/reference/components/sinks.cue    | 14 ++++----
 .../cue/reference/components/sinks/amqp.cue   |  2 +-
 .../reference/components/sinks/appsignal.cue  |  2 +-
 .../components/sinks/aws_cloudwatch_logs.cue  |  2 +-
 .../sinks/aws_cloudwatch_metrics.cue          |  2 +-
 .../components/sinks/aws_kinesis_firehose.cue |  2 +-
 .../components/sinks/aws_kinesis_streams.cue  |  2 +-
 .../cue/reference/components/sinks/aws_s3.cue |  2 +-
 .../reference/components/sinks/aws_sns.cue    |  2 +-
 .../reference/components/sinks/aws_sqs.cue    |  2 +-
 .../cue/reference/components/sinks/axiom.cue  |  2 +-
 .../reference/components/sinks/azure_blob.cue |  2 +-
 .../components/sinks/azure_monitor_logs.cue   |  2 +-
 .../sinks/base/unit_test_stream.cue           |  3 --
 .../reference/components/sinks/blackhole.cue  |  2 +-
 .../reference/components/sinks/clickhouse.cue |  2 +-
 .../reference/components/sinks/console.cue    |  2 +-
 .../reference/components/sinks/databend.cue   |  2 +-
 .../components/sinks/datadog_events.cue       |  2 +-
 .../components/sinks/datadog_logs.cue         |  2 +-
 .../components/sinks/datadog_metrics.cue      |  2 +-
 .../components/sinks/datadog_traces.cue       |  2 +-
 .../components/sinks/elasticsearch.cue        |  2 +-
 .../cue/reference/components/sinks/file.cue   |  2 +-
 .../sinks/gcp_chronicle_unstructured.cue      |  2 +-
 .../components/sinks/gcp_cloud_storage.cue    |  2 +-
 .../reference/components/sinks/gcp_pubsub.cue |  2 +-
 .../components/sinks/gcp_stackdriver_logs.cue |  2 +-
 .../sinks/gcp_stackdriver_metrics.cue         |  2 +-
 .../sinks/{base => generated}/amqp.cue        |  2 +-
 .../sinks/{base => generated}/appsignal.cue   |  2 +-
 .../aws_cloudwatch_logs.cue                   |  2 +-
 .../aws_cloudwatch_metrics.cue                |  2 +-
 .../aws_kinesis_firehose.cue                  |  2 +-
 .../aws_kinesis_streams.cue                   |  2 +-
 .../sinks/{base => generated}/aws_s3.cue      |  2 +-
 .../sinks/{base => generated}/aws_sns.cue     |  2 +-
 .../sinks/{base => generated}/aws_sqs.cue     |  2 +-
 .../sinks/{base => generated}/axiom.cue       |  2 +-
 .../sinks/{base => generated}/azure_blob.cue  |  2 +-
 .../azure_monitor_logs.cue                    |  2 +-
 .../sinks/{base => generated}/blackhole.cue   |  2 +-
 .../sinks/{base => generated}/clickhouse.cue  |  2 +-
 .../sinks/{base => generated}/console.cue     |  2 +-
 .../sinks/{base => generated}/databend.cue    |  2 +-
 .../{base => generated}/datadog_events.cue    |  2 +-
 .../{base => generated}/datadog_logs.cue      |  2 +-
 .../{base => generated}/datadog_metrics.cue   |  2 +-
 .../{base => generated}/datadog_traces.cue    |  2 +-
 .../{base => generated}/elasticsearch.cue     |  2 +-
 .../sinks/{base => generated}/file.cue        |  2 +-
 .../gcp_chronicle_unstructured.cue            |  2 +-
 .../{base => generated}/gcp_cloud_storage.cue |  2 +-
 .../sinks/{base => generated}/gcp_pubsub.cue  |  2 +-
 .../gcp_stackdriver_logs.cue                  |  2 +-
 .../gcp_stackdriver_metrics.cue               |  2 +-
 .../sinks/{base => generated}/greptimedb.cue  |  2 +-
 .../{base => generated}/greptimedb_logs.cue   |  2 +-
 .../greptimedb_metrics.cue                    |  2 +-
 .../sinks/{base => generated}/honeycomb.cue   |  2 +-
 .../sinks/{base => generated}/http.cue        |  2 +-
 .../sinks/{base => generated}/humio_logs.cue  |  2 +-
 .../{base => generated}/humio_metrics.cue     |  2 +-
 .../{base => generated}/influxdb_logs.cue     |  2 +-
 .../{base => generated}/influxdb_metrics.cue  |  2 +-
 .../sinks/{base => generated}/kafka.cue       |  2 +-
 .../sinks/{base => generated}/keep.cue        |  2 +-
 .../sinks/{base => generated}/logdna.cue      |  2 +-
 .../sinks/{base => generated}/loki.cue        |  2 +-
 .../sinks/{base => generated}/mezmo.cue       |  2 +-
 .../sinks/{base => generated}/mqtt.cue        |  2 +-
 .../sinks/{base => generated}/nats.cue        |  2 +-
 .../sinks/{base => generated}/new_relic.cue   |  2 +-
 .../{base => generated}/opentelemetry.cue     |  2 +-
 .../sinks/{base => generated}/papertrail.cue  |  2 +-
 .../sinks/{base => generated}/postgres.cue    |  2 +-
 .../prometheus_exporter.cue                   |  2 +-
 .../prometheus_remote_write.cue               |  2 +-
 .../sinks/{base => generated}/pulsar.cue      |  2 +-
 .../sinks/{base => generated}/redis.cue       |  2 +-
 .../{base => generated}/sematext_logs.cue     |  2 +-
 .../{base => generated}/sematext_metrics.cue  |  2 +-
 .../sinks/{base => generated}/socket.cue      |  2 +-
 .../{base => generated}/splunk_hec_logs.cue   |  2 +-
 .../splunk_hec_metrics.cue                    |  2 +-
 .../sinks/{base => generated}/statsd.cue      |  2 +-
 .../sinks/{base => generated}/unit_test.cue   |  2 +-
 .../sinks/generated/unit_test_stream.cue      |  3 ++
 .../sinks/{base => generated}/vector.cue      |  2 +-
 .../sinks/{base => generated}/webhdfs.cue     |  2 +-
 .../sinks/{base => generated}/websocket.cue   |  2 +-
 .../{base => generated}/websocket_server.cue  |  2 +-
 .../components/sinks/greptimedb_logs.cue      |  2 +-
 .../components/sinks/greptimedb_metrics.cue   |  2 +-
 .../reference/components/sinks/honeycomb.cue  |  2 +-
 .../cue/reference/components/sinks/http.cue   |  2 +-
 .../reference/components/sinks/humio_logs.cue |  2 +-
 .../components/sinks/humio_metrics.cue        |  2 +-
 .../components/sinks/influxdb_logs.cue        |  2 +-
 .../components/sinks/influxdb_metrics.cue     |  2 +-
 .../cue/reference/components/sinks/kafka.cue  |  2 +-
 .../cue/reference/components/sinks/keep.cue   |  2 +-
 .../cue/reference/components/sinks/loki.cue   |  2 +-
 .../cue/reference/components/sinks/mezmo.cue  |  2 +-
 .../cue/reference/components/sinks/mqtt.cue   |  2 +-
 .../cue/reference/components/sinks/nats.cue   |  2 +-
 .../reference/components/sinks/new_relic.cue  |  2 +-
 .../components/sinks/opentelemetry.cue        |  2 +-
 .../reference/components/sinks/papertrail.cue |  2 +-
 .../reference/components/sinks/postgres.cue   |  2 +-
 .../components/sinks/prometheus_exporter.cue  |  2 +-
 .../sinks/prometheus_remote_write.cue         |  2 +-
 .../cue/reference/components/sinks/pulsar.cue |  2 +-
 .../cue/reference/components/sinks/redis.cue  |  2 +-
 .../components/sinks/sematext_logs.cue        |  2 +-
 .../components/sinks/sematext_metrics.cue     |  2 +-
 .../cue/reference/components/sinks/socket.cue |  2 +-
 .../components/sinks/splunk_hec_logs.cue      |  2 +-
 .../components/sinks/splunk_hec_metrics.cue   |  2 +-
 .../cue/reference/components/sinks/statsd.cue |  2 +-
 .../cue/reference/components/sinks/vector.cue |  2 +-
 .../reference/components/sinks/webhdfs.cue    |  2 +-
 .../reference/components/sinks/websocket.cue  |  2 +-
 .../components/sinks/websocket_server.cue     |  2 +-
 website/cue/reference/components/sources.cue  |  2 +-
 .../cue/reference/components/sources/amqp.cue |  2 +-
 .../components/sources/apache_metrics.cue     |  2 +-
 .../components/sources/aws_ecs_metrics.cue    |  2 +-
 .../sources/aws_kinesis_firehose.cue          |  2 +-
 .../reference/components/sources/aws_s3.cue   |  2 +-
 .../reference/components/sources/aws_sqs.cue  |  2 +-
 .../components/sources/base/unit_test.cue     |  3 --
 .../sources/base/unit_test_stream.cue         |  3 --
 .../components/sources/datadog_agent.cue      |  2 +-
 .../components/sources/demo_logs.cue          |  2 +-
 .../reference/components/sources/dnstap.cue   |  2 +-
 .../components/sources/docker_logs.cue        |  2 +-
 .../sources/eventstoredb_metrics.cue          |  2 +-
 .../cue/reference/components/sources/exec.cue |  2 +-
 .../cue/reference/components/sources/file.cue |  2 +-
 .../components/sources/file_descriptor.cue    |  2 +-
 .../reference/components/sources/fluent.cue   |  2 +-
 .../components/sources/gcp_pubsub.cue         |  2 +-
 .../sources/{base => generated}/amqp.cue      |  2 +-
 .../{base => generated}/apache_metrics.cue    |  2 +-
 .../{base => generated}/aws_ecs_metrics.cue   |  2 +-
 .../aws_kinesis_firehose.cue                  |  2 +-
 .../sources/{base => generated}/aws_s3.cue    |  2 +-
 .../sources/{base => generated}/aws_sqs.cue   |  2 +-
 .../{base => generated}/datadog_agent.cue     |  2 +-
 .../sources/{base => generated}/demo_logs.cue |  2 +-
 .../sources/{base => generated}/dnstap.cue    |  2 +-
 .../{base => generated}/docker_logs.cue       |  2 +-
 .../eventstoredb_metrics.cue                  |  2 +-
 .../sources/{base => generated}/exec.cue      |  2 +-
 .../sources/{base => generated}/file.cue      |  2 +-
 .../{base => generated}/file_descriptor.cue   |  2 +-
 .../sources/{base => generated}/fluent.cue    |  2 +-
 .../{base => generated}/gcp_pubsub.cue        |  2 +-
 .../{base => generated}/heroku_logs.cue       |  2 +-
 .../{base => generated}/host_metrics.cue      |  2 +-
 .../sources/{base => generated}/http.cue      |  2 +-
 .../{base => generated}/http_client.cue       |  2 +-
 .../{base => generated}/http_server.cue       |  2 +-
 .../{base => generated}/internal_logs.cue     |  2 +-
 .../{base => generated}/internal_metrics.cue  |  2 +-
 .../sources/{base => generated}/journald.cue  |  2 +-
 .../sources/{base => generated}/kafka.cue     |  2 +-
 .../{base => generated}/kubernetes_logs.cue   |  2 +-
 .../sources/{base => generated}/logstash.cue  |  2 +-
 .../{base => generated}/mongodb_metrics.cue   |  2 +-
 .../sources/{base => generated}/mqtt.cue      |  2 +-
 .../sources/{base => generated}/nats.cue      |  2 +-
 .../{base => generated}/nginx_metrics.cue     |  2 +-
 .../{base => generated}/opentelemetry.cue     |  2 +-
 .../postgresql_metrics.cue                    |  2 +-
 .../prometheus_pushgateway.cue                |  2 +-
 .../prometheus_remote_write.cue               |  2 +-
 .../{base => generated}/prometheus_scrape.cue |  2 +-
 .../sources/{base => generated}/pulsar.cue    |  2 +-
 .../sources/{base => generated}/redis.cue     |  2 +-
 .../sources/{base => generated}/socket.cue    |  2 +-
 .../{base => generated}/splunk_hec.cue        |  2 +-
 .../{base => generated}/static_metrics.cue    |  2 +-
 .../sources/{base => generated}/statsd.cue    |  2 +-
 .../sources/{base => generated}/stdin.cue     |  2 +-
 .../sources/{base => generated}/syslog.cue    |  2 +-
 .../sources/generated/unit_test.cue           |  3 ++
 .../sources/generated/unit_test_stream.cue    |  3 ++
 .../sources/{base => generated}/vector.cue    |  2 +-
 .../components/sources/heroku_logs.cue        |  2 +-
 .../components/sources/host_metrics.cue       |  2 +-
 .../components/sources/http_client.cue        |  2 +-
 .../components/sources/http_server.cue        |  2 +-
 .../components/sources/internal_logs.cue      |  2 +-
 .../components/sources/internal_metrics.cue   |  2 +-
 .../reference/components/sources/journald.cue |  2 +-
 .../reference/components/sources/kafka.cue    |  2 +-
 .../components/sources/kubernetes_logs.cue    |  2 +-
 .../reference/components/sources/logstash.cue |  2 +-
 .../components/sources/mongodb_metrics.cue    |  2 +-
 .../cue/reference/components/sources/mqtt.cue |  2 +-
 .../cue/reference/components/sources/nats.cue |  2 +-
 .../components/sources/nginx_metrics.cue      |  2 +-
 .../components/sources/opentelemetry.cue      |  2 +-
 .../components/sources/postgresql_metrics.cue |  2 +-
 .../sources/prometheus_pushgateway.cue        |  2 +-
 .../sources/prometheus_remote_write.cue       |  2 +-
 .../components/sources/prometheus_scrape.cue  |  2 +-
 .../reference/components/sources/redis.cue    |  2 +-
 .../reference/components/sources/socket.cue   |  2 +-
 .../components/sources/splunk_hec.cue         |  2 +-
 .../components/sources/static_metrics.cue     |  2 +-
 .../reference/components/sources/statsd.cue   |  2 +-
 .../reference/components/sources/stdin.cue    |  2 +-
 .../reference/components/sources/syslog.cue   |  2 +-
 .../reference/components/sources/vector.cue   |  2 +-
 .../cue/reference/components/transforms.cue   |  2 +-
 .../components/transforms/aggregate.cue       |  2 +-
 .../transforms/aws_ec2_metadata.cue           |  2 +-
 .../components/transforms/dedupe.cue          |  2 +-
 .../components/transforms/exclusive_route.cue |  2 +-
 .../components/transforms/filter.cue          |  2 +-
 .../{base => generated}/aggregate.cue         |  2 +-
 .../{base => generated}/aws_ec2_metadata.cue  |  2 +-
 .../transforms/{base => generated}/dedupe.cue |  2 +-
 .../{base => generated}/exclusive_route.cue   |  2 +-
 .../transforms/{base => generated}/filter.cue |  2 +-
 .../{base => generated}/log_to_metric.cue     |  2 +-
 .../transforms/{base => generated}/lua.cue    |  2 +-
 .../{base => generated}/metric_to_log.cue     |  2 +-
 .../transforms/{base => generated}/reduce.cue |  2 +-
 .../transforms/{base => generated}/remap.cue  |  2 +-
 .../transforms/{base => generated}/route.cue  |  2 +-
 .../transforms/{base => generated}/sample.cue |  2 +-
 .../tag_cardinality_limit.cue                 |  2 +-
 .../{base => generated}/throttle.cue          |  2 +-
 .../transforms/{base => generated}/window.cue |  2 +-
 .../components/transforms/log_to_metric.cue   |  2 +-
 .../reference/components/transforms/lua.cue   |  2 +-
 .../components/transforms/metric_to_log.cue   |  2 +-
 .../components/transforms/reduce.cue          |  2 +-
 .../reference/components/transforms/remap.cue |  2 +-
 .../reference/components/transforms/route.cue |  2 +-
 .../components/transforms/sample.cue          |  2 +-
 .../transforms/tag_cardinality_limit.cue      |  2 +-
 .../components/transforms/throttle.cue        |  2 +-
 .../components/transforms/window.cue          |  2 +-
 website/cue/reference/configuration.cue       |  2 +-
 .../cue/reference/{base => generated}/api.cue |  2 +-
 .../{base => generated}/configuration.cue     |  2 +-
 256 files changed, 280 insertions(+), 280 deletions(-)
 rename website/cue/reference/components/{base => generated}/sinks.cue (99%)
 rename website/cue/reference/components/{base => generated}/sources.cue (98%)
 rename website/cue/reference/components/{base => generated}/transforms.cue (95%)
 delete mode 100644 website/cue/reference/components/sinks/base/unit_test_stream.cue
 rename website/cue/reference/components/sinks/{base => generated}/amqp.cue (99%)
 rename website/cue/reference/components/sinks/{base => generated}/appsignal.cue (99%)
 rename website/cue/reference/components/sinks/{base => generated}/aws_cloudwatch_logs.cue (99%)
 rename website/cue/reference/components/sinks/{base => generated}/aws_cloudwatch_metrics.cue (99%)
 rename website/cue/reference/components/sinks/{base => generated}/aws_kinesis_firehose.cue (99%)
 rename website/cue/reference/components/sinks/{base => generated}/aws_kinesis_streams.cue (99%)
 rename website/cue/reference/components/sinks/{base => generated}/aws_s3.cue (99%)
 rename website/cue/reference/components/sinks/{base => generated}/aws_sns.cue (99%)
 rename website/cue/reference/components/sinks/{base => generated}/aws_sqs.cue (99%)
 rename website/cue/reference/components/sinks/{base => generated}/axiom.cue (99%)
 rename website/cue/reference/components/sinks/{base => generated}/azure_blob.cue (99%)
 rename website/cue/reference/components/sinks/{base => generated}/azure_monitor_logs.cue (99%)
 rename website/cue/reference/components/sinks/{base => generated}/blackhole.cue (96%)
 rename website/cue/reference/components/sinks/{base => generated}/clickhouse.cue (99%)
 rename website/cue/reference/components/sinks/{base => generated}/console.cue (99%)
 rename website/cue/reference/components/sinks/{base => generated}/databend.cue (99%)
 rename website/cue/reference/components/sinks/{base => generated}/datadog_events.cue (99%)
 rename website/cue/reference/components/sinks/{base => generated}/datadog_logs.cue (99%)
 rename website/cue/reference/components/sinks/{base => generated}/datadog_metrics.cue (99%)
 rename website/cue/reference/components/sinks/{base => generated}/datadog_traces.cue (99%)
 rename website/cue/reference/components/sinks/{base => generated}/elasticsearch.cue (99%)
 rename website/cue/reference/components/sinks/{base => generated}/file.cue (99%)
 rename website/cue/reference/components/sinks/{base => generated}/gcp_chronicle_unstructured.cue (99%)
 rename website/cue/reference/components/sinks/{base => generated}/gcp_cloud_storage.cue (99%)
 rename website/cue/reference/components/sinks/{base => generated}/gcp_pubsub.cue (99%)
 rename website/cue/reference/components/sinks/{base => generated}/gcp_stackdriver_logs.cue (99%)
 rename website/cue/reference/components/sinks/{base => generated}/gcp_stackdriver_metrics.cue (99%)
 rename website/cue/reference/components/sinks/{base => generated}/greptimedb.cue (99%)
 rename website/cue/reference/components/sinks/{base => generated}/greptimedb_logs.cue (99%)
 rename website/cue/reference/components/sinks/{base => generated}/greptimedb_metrics.cue (99%)
 rename website/cue/reference/components/sinks/{base => generated}/honeycomb.cue (99%)
 rename website/cue/reference/components/sinks/{base => generated}/http.cue (99%)
 rename website/cue/reference/components/sinks/{base => generated}/humio_logs.cue (99%)
 rename website/cue/reference/components/sinks/{base => generated}/humio_metrics.cue (99%)
 rename website/cue/reference/components/sinks/{base => generated}/influxdb_logs.cue (99%)
 rename website/cue/reference/components/sinks/{base => generated}/influxdb_metrics.cue (99%)
 rename website/cue/reference/components/sinks/{base => generated}/kafka.cue (99%)
 rename website/cue/reference/components/sinks/{base => generated}/keep.cue (99%)
 rename website/cue/reference/components/sinks/{base => generated}/logdna.cue (99%)
 rename website/cue/reference/components/sinks/{base => generated}/loki.cue (99%)
 rename website/cue/reference/components/sinks/{base => generated}/mezmo.cue (99%)
 rename website/cue/reference/components/sinks/{base => generated}/mqtt.cue (99%)
 rename website/cue/reference/components/sinks/{base => generated}/nats.cue (99%)
 rename website/cue/reference/components/sinks/{base => generated}/new_relic.cue (99%)
 rename website/cue/reference/components/sinks/{base => generated}/opentelemetry.cue (99%)
 rename website/cue/reference/components/sinks/{base => generated}/papertrail.cue (99%)
 rename website/cue/reference/components/sinks/{base => generated}/postgres.cue (99%)
 rename website/cue/reference/components/sinks/{base => generated}/prometheus_exporter.cue (99%)
 rename website/cue/reference/components/sinks/{base => generated}/prometheus_remote_write.cue (99%)
 rename website/cue/reference/components/sinks/{base => generated}/pulsar.cue (99%)
 rename website/cue/reference/components/sinks/{base => generated}/redis.cue (99%)
 rename website/cue/reference/components/sinks/{base => generated}/sematext_logs.cue (99%)
 rename website/cue/reference/components/sinks/{base => generated}/sematext_metrics.cue (99%)
 rename website/cue/reference/components/sinks/{base => generated}/socket.cue (99%)
 rename website/cue/reference/components/sinks/{base => generated}/splunk_hec_logs.cue (99%)
 rename website/cue/reference/components/sinks/{base => generated}/splunk_hec_metrics.cue (99%)
 rename website/cue/reference/components/sinks/{base => generated}/statsd.cue (99%)
 rename website/cue/reference/components/sinks/{base => generated}/unit_test.cue (84%)
 create mode 100644 website/cue/reference/components/sinks/generated/unit_test_stream.cue
 rename website/cue/reference/components/sinks/{base => generated}/vector.cue (99%)
 rename website/cue/reference/components/sinks/{base => generated}/webhdfs.cue (99%)
 rename website/cue/reference/components/sinks/{base => generated}/websocket.cue (99%)
 rename website/cue/reference/components/sinks/{base => generated}/websocket_server.cue (99%)
 delete mode 100644 website/cue/reference/components/sources/base/unit_test.cue
 delete mode 100644 website/cue/reference/components/sources/base/unit_test_stream.cue
 rename website/cue/reference/components/sources/{base => generated}/amqp.cue (99%)
 rename website/cue/reference/components/sources/{base => generated}/apache_metrics.cue (89%)
 rename website/cue/reference/components/sources/{base => generated}/aws_ecs_metrics.cue (97%)
 rename website/cue/reference/components/sources/{base => generated}/aws_kinesis_firehose.cue (99%)
 rename website/cue/reference/components/sources/{base => generated}/aws_s3.cue (99%)
 rename website/cue/reference/components/sources/{base => generated}/aws_sqs.cue (99%)
 rename website/cue/reference/components/sources/{base => generated}/datadog_agent.cue (99%)
 rename website/cue/reference/components/sources/{base => generated}/demo_logs.cue (99%)
 rename website/cue/reference/components/sources/{base => generated}/dnstap.cue (99%)
 rename website/cue/reference/components/sources/{base => generated}/docker_logs.cue (99%)
 rename website/cue/reference/components/sources/{base => generated}/eventstoredb_metrics.cue (89%)
 rename website/cue/reference/components/sources/{base => generated}/exec.cue (99%)
 rename website/cue/reference/components/sources/{base => generated}/file.cue (99%)
 rename website/cue/reference/components/sources/{base => generated}/file_descriptor.cue (99%)
 rename website/cue/reference/components/sources/{base => generated}/fluent.cue (99%)
 rename website/cue/reference/components/sources/{base => generated}/gcp_pubsub.cue (99%)
 rename website/cue/reference/components/sources/{base => generated}/heroku_logs.cue (99%)
 rename website/cue/reference/components/sources/{base => generated}/host_metrics.cue (99%)
 rename website/cue/reference/components/sources/{base => generated}/http.cue (99%)
 rename website/cue/reference/components/sources/{base => generated}/http_client.cue (99%)
 rename website/cue/reference/components/sources/{base => generated}/http_server.cue (99%)
 rename website/cue/reference/components/sources/{base => generated}/internal_logs.cue (91%)
 rename website/cue/reference/components/sources/{base => generated}/internal_metrics.cue (94%)
 rename website/cue/reference/components/sources/{base => generated}/journald.cue (98%)
 rename website/cue/reference/components/sources/{base => generated}/kafka.cue (99%)
 rename website/cue/reference/components/sources/{base => generated}/kubernetes_logs.cue (99%)
 rename website/cue/reference/components/sources/{base => generated}/logstash.cue (99%)
 rename website/cue/reference/components/sources/{base => generated}/mongodb_metrics.cue (92%)
 rename website/cue/reference/components/sources/{base => generated}/mqtt.cue (99%)
 rename website/cue/reference/components/sources/{base => generated}/nats.cue (99%)
 rename website/cue/reference/components/sources/{base => generated}/nginx_metrics.cue (99%)
 rename website/cue/reference/components/sources/{base => generated}/opentelemetry.cue (99%)
 rename website/cue/reference/components/sources/{base => generated}/postgresql_metrics.cue (96%)
 rename website/cue/reference/components/sources/{base => generated}/prometheus_pushgateway.cue (99%)
 rename website/cue/reference/components/sources/{base => generated}/prometheus_remote_write.cue (98%)
 rename website/cue/reference/components/sources/{base => generated}/prometheus_scrape.cue (99%)
 rename website/cue/reference/components/sources/{base => generated}/pulsar.cue (99%)
 rename website/cue/reference/components/sources/{base => generated}/redis.cue (99%)
 rename website/cue/reference/components/sources/{base => generated}/socket.cue (99%)
 rename website/cue/reference/components/sources/{base => generated}/splunk_hec.cue (99%)
 rename website/cue/reference/components/sources/{base => generated}/static_metrics.cue (99%)
 rename website/cue/reference/components/sources/{base => generated}/statsd.cue (99%)
 rename website/cue/reference/components/sources/{base => generated}/stdin.cue (99%)
 rename website/cue/reference/components/sources/{base => generated}/syslog.cue (99%)
 create mode 100644 website/cue/reference/components/sources/generated/unit_test.cue
 create mode 100644 website/cue/reference/components/sources/generated/unit_test_stream.cue
 rename website/cue/reference/components/sources/{base => generated}/vector.cue (98%)
 rename website/cue/reference/components/transforms/{base => generated}/aggregate.cue (94%)
 rename website/cue/reference/components/transforms/{base => generated}/aws_ec2_metadata.cue (98%)
 rename website/cue/reference/components/transforms/{base => generated}/dedupe.cue (95%)
 rename website/cue/reference/components/transforms/{base => generated}/exclusive_route.cue (92%)
 rename website/cue/reference/components/transforms/{base => generated}/filter.cue (76%)
 rename website/cue/reference/components/transforms/{base => generated}/log_to_metric.cue (98%)
 rename website/cue/reference/components/transforms/{base => generated}/lua.cue (98%)
 rename website/cue/reference/components/transforms/{base => generated}/metric_to_log.cue (96%)
 rename website/cue/reference/components/transforms/{base => generated}/reduce.cue (98%)
 rename website/cue/reference/components/transforms/{base => generated}/remap.cue (98%)
 rename website/cue/reference/components/transforms/{base => generated}/route.cue (96%)
 rename website/cue/reference/components/transforms/{base => generated}/sample.cue (97%)
 rename website/cue/reference/components/transforms/{base => generated}/tag_cardinality_limit.cue (98%)
 rename website/cue/reference/components/transforms/{base => generated}/throttle.cue (96%)
 rename website/cue/reference/components/transforms/{base => generated}/window.cue (94%)
 rename website/cue/reference/{base => generated}/api.cue (97%)
 rename website/cue/reference/{base => generated}/configuration.cue (99%)

diff --git a/scripts/generate-component-docs.rb b/scripts/generate-component-docs.rb
index e023b75d968af..940abc111bf73 100755
--- a/scripts/generate-component-docs.rb
+++ b/scripts/generate-component-docs.rb
@@ -1693,14 +1693,14 @@ def render_and_import_schema(unwrapped_resolved_schema, friendly_name, config_ma
   @logger.info "[✓]   Imported #{friendly_name} schema to '#{cue_output_file}'."
 end
 
-def render_and_import_base_component_schema(root_schema, schema_name, component_type)
-  friendly_name = "base #{component_type} configuration"
+def render_and_import_generated_component_schema(root_schema, schema_name, component_type)
+  friendly_name = "generated #{component_type} configuration"
   unwrapped_resolved_schema = unwrap_resolved_schema(root_schema, schema_name, friendly_name)
   render_and_import_schema(
     unwrapped_resolved_schema,
     friendly_name,
-    ["base", "components", "#{component_type}s"],
-    "components/base/#{component_type}s.cue"
+    ["generated", "components", "#{component_type}s"],
+    "components/generated/#{component_type}s.cue"
   )
 end
 
@@ -1710,12 +1710,12 @@ def render_and_import_component_schema(root_schema, schema_name, component_type,
   render_and_import_schema(
     unwrapped_resolved_schema,
     friendly_name,
-    ["base", "components", "#{component_type}s", component_name],
-    "components/#{component_type}s/base/#{component_name}.cue"
+    ["generated", "components", "#{component_type}s", component_name],
+    "components/#{component_type}s/generated/#{component_name}.cue"
   )
 end
 
-def render_and_import_base_api_schema(root_schema, apis)
+def render_and_import_generated_api_schema(root_schema, apis)
   api_schema = {}
   apis.each do |component_name, schema_name|
     friendly_name = "'#{component_name}' #{schema_name} configuration"
@@ -1726,12 +1726,12 @@ def render_and_import_base_api_schema(root_schema, apis)
   render_and_import_schema(
     api_schema,
     "configuration",
-    ["base", "api"],
-    "base/api.cue"
+    ["generated", "api"],
+    "generated/api.cue"
   )
 end
 
-def render_and_import_base_global_option_schema(root_schema, global_options)
+def render_and_import_generated_global_option_schema(root_schema, global_options)
   global_option_schema = {}
 
   global_options.each do |component_name, schema_name|
@@ -1750,8 +1750,8 @@ def render_and_import_base_global_option_schema(root_schema, global_options)
   render_and_import_schema(
     global_option_schema,
     "configuration",
-    ["base", "configuration"],
-    "base/configuration.cue"
+    ["generated", "configuration"],
+    "generated/configuration.cue"
   )
 end
 
@@ -1774,7 +1774,7 @@ def render_and_import_base_global_option_schema(root_schema, global_options)
 # First off, we generate the component type configuration bases. These are the high-level
 # configuration settings that are universal on a per-component type basis.
 #
-# For example, the "base" configuration for a sink would be the inputs, buffer settings, healthcheck
+# For example, the "generated" configuration for a sink would be the inputs, buffer settings, healthcheck
 # settings, and proxy settings... and then the configuration for a sink would be those, plus
 # whatever the sink itself defines.
 component_bases = root_schema['definitions'].filter_map do |key, definition|
@@ -1784,7 +1784,7 @@ def render_and_import_base_global_option_schema(root_schema, global_options)
 .reduce { |acc, item| nested_merge(acc, item) }
 
 component_bases.each do |component_type, schema_name|
-  render_and_import_base_component_schema(root_schema, schema_name, component_type)
+  render_and_import_generated_component_schema(root_schema, schema_name, component_type)
 end
 
 # Now we'll generate the base configuration for each component.
@@ -1808,7 +1808,7 @@ def render_and_import_base_global_option_schema(root_schema, global_options)
 end
 .reduce { |acc, item| nested_merge(acc, item) }
 
-render_and_import_base_api_schema(root_schema, apis)
+render_and_import_generated_api_schema(root_schema, apis)
 
 
 # At last, we generate the global options configuration.
@@ -1819,4 +1819,4 @@ def render_and_import_base_global_option_schema(root_schema, global_options)
 end
 .reduce { |acc, item| nested_merge(acc, item) }
 
-render_and_import_base_global_option_schema(root_schema, global_options)
+render_and_import_generated_global_option_schema(root_schema, global_options)
diff --git a/website/cue/reference/api.cue b/website/cue/reference/api.cue
index 6768b7941f823..720b5ef84334f 100644
--- a/website/cue/reference/api.cue
+++ b/website/cue/reference/api.cue
@@ -17,7 +17,7 @@ api: {
 		Vector in real-time.
 		"""
 	schema_json_url: "https://github.com/vectordotdev/vector/blob/master/lib/vector-api-client/graphql/schema.json"
-	configuration:   base.api.configuration.api
+	configuration:   generated.api.configuration.api
 
 	endpoints: {
 		"/graphql": {
diff --git a/website/cue/reference/components/base/sinks.cue b/website/cue/reference/components/generated/sinks.cue
similarity index 99%
rename from website/cue/reference/components/base/sinks.cue
rename to website/cue/reference/components/generated/sinks.cue
index 73c913a397ce1..44bb2f72ee95b 100644
--- a/website/cue/reference/components/base/sinks.cue
+++ b/website/cue/reference/components/generated/sinks.cue
@@ -1,6 +1,6 @@
 package metadata
 
-base: components: sinks: configuration: {
+generated: components: sinks: configuration: {
 	buffer: {
 		description: """
 			Configures the buffering behavior for this sink.
diff --git a/website/cue/reference/components/base/sources.cue b/website/cue/reference/components/generated/sources.cue
similarity index 98%
rename from website/cue/reference/components/base/sources.cue
rename to website/cue/reference/components/generated/sources.cue
index dd7c7431c9189..03b0c109f2be9 100644
--- a/website/cue/reference/components/base/sources.cue
+++ b/website/cue/reference/components/generated/sources.cue
@@ -1,6 +1,6 @@
 package metadata
 
-base: components: sources: configuration: {
+generated: components: sources: configuration: {
 	graph: {
 		description: """
 			Extra graph configuration
diff --git a/website/cue/reference/components/base/transforms.cue b/website/cue/reference/components/generated/transforms.cue
similarity index 95%
rename from website/cue/reference/components/base/transforms.cue
rename to website/cue/reference/components/generated/transforms.cue
index d53acc4ae4f35..a7bee15d2958e 100644
--- a/website/cue/reference/components/base/transforms.cue
+++ b/website/cue/reference/components/generated/transforms.cue
@@ -1,6 +1,6 @@
 package metadata
 
-base: components: transforms: configuration: {
+generated: components: transforms: configuration: {
 	graph: {
 		description: """
 			Extra graph configuration
diff --git a/website/cue/reference/components/sinks.cue b/website/cue/reference/components/sinks.cue
index 0c7703b082003..e90324c472593 100644
--- a/website/cue/reference/components/sinks.cue
+++ b/website/cue/reference/components/sinks.cue
@@ -6,18 +6,18 @@ components: sinks: [Name=string]: {
 	features: _
 
 	configuration: {
-		inputs: base.components.sinks.configuration.inputs
-		buffer: base.components.sinks.configuration.buffer
+		inputs: generated.components.sinks.configuration.inputs
+		buffer: generated.components.sinks.configuration.buffer
 		healthcheck: {
-			description: base.components.sinks.configuration.healthcheck.description
-			required:    base.components.sinks.configuration.healthcheck.required
+			description: generated.components.sinks.configuration.healthcheck.description
+			required:    generated.components.sinks.configuration.healthcheck.required
 			type: object: options: {
-				enabled: base.components.sinks.configuration.healthcheck.type.object.options.enabled
+				enabled: generated.components.sinks.configuration.healthcheck.type.object.options.enabled
 
 				if features.healthcheck != _|_ {
 					if features.healthcheck.uses_uri != _|_ {
 						if features.healthcheck.uses_uri {
-							uri: base.components.sinks.configuration.healthcheck.type.object.options.uri
+							uri: generated.components.sinks.configuration.healthcheck.type.object.options.uri
 						}
 					}
 				}
@@ -26,7 +26,7 @@ components: sinks: [Name=string]: {
 
 		if features.send != _|_ && features.send.proxy != _|_ {
 			if features.send.proxy.enabled {
-				proxy: base.components.sinks.configuration.proxy
+				proxy: generated.components.sinks.configuration.proxy
 			}
 		}
 
diff --git a/website/cue/reference/components/sinks/amqp.cue b/website/cue/reference/components/sinks/amqp.cue
index cda263626ac75..9a8f90a2a356f 100644
--- a/website/cue/reference/components/sinks/amqp.cue
+++ b/website/cue/reference/components/sinks/amqp.cue
@@ -50,7 +50,7 @@ components: sinks: amqp: {
 
 	support: components._amqp.support
 
-	configuration: base.components.sinks.amqp.configuration
+	configuration: generated.components.sinks.amqp.configuration
 
 	input: {
 		logs:    true
diff --git a/website/cue/reference/components/sinks/appsignal.cue b/website/cue/reference/components/sinks/appsignal.cue
index 4a6c77728a0e2..7dc65b6fd7d33 100644
--- a/website/cue/reference/components/sinks/appsignal.cue
+++ b/website/cue/reference/components/sinks/appsignal.cue
@@ -61,7 +61,7 @@ components: sinks: appsignal: {
 		notices: []
 	}
 
-	configuration: base.components.sinks.appsignal.configuration
+	configuration: generated.components.sinks.appsignal.configuration
 
 	input: {
 		logs: true
diff --git a/website/cue/reference/components/sinks/aws_cloudwatch_logs.cue b/website/cue/reference/components/sinks/aws_cloudwatch_logs.cue
index 9daf79982787a..01ee0b130760a 100644
--- a/website/cue/reference/components/sinks/aws_cloudwatch_logs.cue
+++ b/website/cue/reference/components/sinks/aws_cloudwatch_logs.cue
@@ -73,7 +73,7 @@ components: sinks: aws_cloudwatch_logs: components._aws & {
 		warnings: []
 	}
 
-	configuration: base.components.sinks.aws_cloudwatch_logs.configuration & {
+	configuration: generated.components.sinks.aws_cloudwatch_logs.configuration & {
 		_aws_include: false
 	}
 
diff --git a/website/cue/reference/components/sinks/aws_cloudwatch_metrics.cue b/website/cue/reference/components/sinks/aws_cloudwatch_metrics.cue
index 67270c3bb65a2..fac63b4891421 100644
--- a/website/cue/reference/components/sinks/aws_cloudwatch_metrics.cue
+++ b/website/cue/reference/components/sinks/aws_cloudwatch_metrics.cue
@@ -83,7 +83,7 @@ components: sinks: aws_cloudwatch_metrics: components._aws & {
 		]
 	}
 
-	configuration: base.components.sinks.aws_cloudwatch_metrics.configuration & {
+	configuration: generated.components.sinks.aws_cloudwatch_metrics.configuration & {
 		_aws_include: false
 	}
 
diff --git a/website/cue/reference/components/sinks/aws_kinesis_firehose.cue b/website/cue/reference/components/sinks/aws_kinesis_firehose.cue
index 35847e6db84df..2246c48d2a5b7 100644
--- a/website/cue/reference/components/sinks/aws_kinesis_firehose.cue
+++ b/website/cue/reference/components/sinks/aws_kinesis_firehose.cue
@@ -73,7 +73,7 @@ components: sinks: aws_kinesis_firehose: components._aws & {
 		warnings: []
 	}
 
-	configuration: base.components.sinks.aws_kinesis_firehose.configuration & {
+	configuration: generated.components.sinks.aws_kinesis_firehose.configuration & {
 		_aws_include: false
 		request_retry_partial: warnings: ["This can cause duplicate logs to be published."]
 	}
diff --git a/website/cue/reference/components/sinks/aws_kinesis_streams.cue b/website/cue/reference/components/sinks/aws_kinesis_streams.cue
index 75bfa684f8863..53a7a1b4ae670 100644
--- a/website/cue/reference/components/sinks/aws_kinesis_streams.cue
+++ b/website/cue/reference/components/sinks/aws_kinesis_streams.cue
@@ -73,7 +73,7 @@ components: sinks: aws_kinesis_streams: components._aws & {
 		warnings: []
 	}
 
-	configuration: base.components.sinks.aws_kinesis_streams.configuration & {
+	configuration: generated.components.sinks.aws_kinesis_streams.configuration & {
 		_aws_include: false
 	}
 
diff --git a/website/cue/reference/components/sinks/aws_s3.cue b/website/cue/reference/components/sinks/aws_s3.cue
index 0ed260598a988..d9f85e6f977da 100644
--- a/website/cue/reference/components/sinks/aws_s3.cue
+++ b/website/cue/reference/components/sinks/aws_s3.cue
@@ -73,7 +73,7 @@ components: sinks: aws_s3: components._aws & {
 		warnings: []
 	}
 
-	configuration: base.components.sinks.aws_s3.configuration & {
+	configuration: generated.components.sinks.aws_s3.configuration & {
 		_aws_include: false
 	}
 
diff --git a/website/cue/reference/components/sinks/aws_sns.cue b/website/cue/reference/components/sinks/aws_sns.cue
index 014a2eea8e89e..feca5c0980ea8 100644
--- a/website/cue/reference/components/sinks/aws_sns.cue
+++ b/website/cue/reference/components/sinks/aws_sns.cue
@@ -66,7 +66,7 @@ components: sinks: aws_sns: components._aws & {
 		notices: []
 	}
 
-	configuration: base.components.sinks.aws_sqs.configuration & {
+	configuration: generated.components.sinks.aws_sqs.configuration & {
 		_aws_include: false
 	}
 
diff --git a/website/cue/reference/components/sinks/aws_sqs.cue b/website/cue/reference/components/sinks/aws_sqs.cue
index 8d097eb579885..2e875455ed8fd 100644
--- a/website/cue/reference/components/sinks/aws_sqs.cue
+++ b/website/cue/reference/components/sinks/aws_sqs.cue
@@ -66,7 +66,7 @@ components: sinks: aws_sqs: components._aws & {
 		notices: []
 	}
 
-	configuration: base.components.sinks.aws_sqs.configuration & {
+	configuration: generated.components.sinks.aws_sqs.configuration & {
 		_aws_include: false
 	}
 
diff --git a/website/cue/reference/components/sinks/axiom.cue b/website/cue/reference/components/sinks/axiom.cue
index d7790476f2650..97fb56974342b 100644
--- a/website/cue/reference/components/sinks/axiom.cue
+++ b/website/cue/reference/components/sinks/axiom.cue
@@ -70,7 +70,7 @@ components: sinks: axiom: {
 		notices: []
 	}
 
-	configuration: base.components.sinks.axiom.configuration
+	configuration: generated.components.sinks.axiom.configuration
 
 	input: {
 		logs: true
diff --git a/website/cue/reference/components/sinks/azure_blob.cue b/website/cue/reference/components/sinks/azure_blob.cue
index aa4a5888d239d..11e70af8a81d4 100644
--- a/website/cue/reference/components/sinks/azure_blob.cue
+++ b/website/cue/reference/components/sinks/azure_blob.cue
@@ -67,7 +67,7 @@ components: sinks: azure_blob: {
 		notices: []
 	}
 
-	configuration: base.components.sinks.azure_blob.configuration
+	configuration: generated.components.sinks.azure_blob.configuration
 
 	input: {
 		logs:    true
diff --git a/website/cue/reference/components/sinks/azure_monitor_logs.cue b/website/cue/reference/components/sinks/azure_monitor_logs.cue
index 5b98b65bfc414..1d421b0f63ada 100644
--- a/website/cue/reference/components/sinks/azure_monitor_logs.cue
+++ b/website/cue/reference/components/sinks/azure_monitor_logs.cue
@@ -61,7 +61,7 @@ components: sinks: azure_monitor_logs: {
 		notices: []
 	}
 
-	configuration: base.components.sinks.azure_monitor_logs.configuration
+	configuration: generated.components.sinks.azure_monitor_logs.configuration
 
 	input: {
 		logs:    true
diff --git a/website/cue/reference/components/sinks/base/unit_test_stream.cue b/website/cue/reference/components/sinks/base/unit_test_stream.cue
deleted file mode 100644
index df75ef2fc968f..0000000000000
--- a/website/cue/reference/components/sinks/base/unit_test_stream.cue
+++ /dev/null
@@ -1,3 +0,0 @@
-package metadata
-
-base: components: sinks: unit_test_stream: configuration: {}
diff --git a/website/cue/reference/components/sinks/blackhole.cue b/website/cue/reference/components/sinks/blackhole.cue
index 4952e8fa78f42..1927915881873 100644
--- a/website/cue/reference/components/sinks/blackhole.cue
+++ b/website/cue/reference/components/sinks/blackhole.cue
@@ -30,7 +30,7 @@ components: sinks: blackhole: {
 		notices: []
 	}
 
-	configuration: base.components.sinks.blackhole.configuration
+	configuration: generated.components.sinks.blackhole.configuration
 
 	input: {
 		logs: true
diff --git a/website/cue/reference/components/sinks/clickhouse.cue b/website/cue/reference/components/sinks/clickhouse.cue
index e20d656717460..893ff01c63d32 100644
--- a/website/cue/reference/components/sinks/clickhouse.cue
+++ b/website/cue/reference/components/sinks/clickhouse.cue
@@ -73,7 +73,7 @@ components: sinks: clickhouse: {
 		notices: []
 	}
 
-	configuration: base.components.sinks.clickhouse.configuration
+	configuration: generated.components.sinks.clickhouse.configuration
 
 	input: {
 		logs:    true
diff --git a/website/cue/reference/components/sinks/console.cue b/website/cue/reference/components/sinks/console.cue
index 521bd14a4e569..027acc4dfad25 100644
--- a/website/cue/reference/components/sinks/console.cue
+++ b/website/cue/reference/components/sinks/console.cue
@@ -41,7 +41,7 @@ components: sinks: console: {
 		notices: []
 	}
 
-	configuration: base.components.sinks.console.configuration
+	configuration: generated.components.sinks.console.configuration
 
 	input: {
 		logs: true
diff --git a/website/cue/reference/components/sinks/databend.cue b/website/cue/reference/components/sinks/databend.cue
index 5d054cda935d4..1e04cb818899a 100644
--- a/website/cue/reference/components/sinks/databend.cue
+++ b/website/cue/reference/components/sinks/databend.cue
@@ -76,7 +76,7 @@ components: sinks: databend: {
 		notices: []
 	}
 
-	configuration: base.components.sinks.databend.configuration
+	configuration: generated.components.sinks.databend.configuration
 
 	input: {
 		logs:    true
diff --git a/website/cue/reference/components/sinks/datadog_events.cue b/website/cue/reference/components/sinks/datadog_events.cue
index 8dee616beaed9..9c2b6178e9c64 100644
--- a/website/cue/reference/components/sinks/datadog_events.cue
+++ b/website/cue/reference/components/sinks/datadog_events.cue
@@ -45,7 +45,7 @@ components: sinks: datadog_events: {
 
 	support: sinks._datadog.support
 
-	configuration: base.components.sinks.datadog_events.configuration
+	configuration: generated.components.sinks.datadog_events.configuration
 
 	input: {
 		logs:    true
diff --git a/website/cue/reference/components/sinks/datadog_logs.cue b/website/cue/reference/components/sinks/datadog_logs.cue
index 95723b2e0feca..aa0e080c4e594 100644
--- a/website/cue/reference/components/sinks/datadog_logs.cue
+++ b/website/cue/reference/components/sinks/datadog_logs.cue
@@ -59,7 +59,7 @@ components: sinks: datadog_logs: {
 
 	support: sinks._datadog.support
 
-	configuration: base.components.sinks.datadog_logs.configuration
+	configuration: generated.components.sinks.datadog_logs.configuration
 
 	input: {
 		logs:    true
diff --git a/website/cue/reference/components/sinks/datadog_metrics.cue b/website/cue/reference/components/sinks/datadog_metrics.cue
index f73c0bfe270e5..2995222d72748 100644
--- a/website/cue/reference/components/sinks/datadog_metrics.cue
+++ b/website/cue/reference/components/sinks/datadog_metrics.cue
@@ -57,7 +57,7 @@ components: sinks: datadog_metrics: {
 
 	support: sinks._datadog.support
 
-	configuration: base.components.sinks.datadog_metrics.configuration
+	configuration: generated.components.sinks.datadog_metrics.configuration
 
 	input: {
 		logs: false
diff --git a/website/cue/reference/components/sinks/datadog_traces.cue b/website/cue/reference/components/sinks/datadog_traces.cue
index c887e0d1976e5..c73adc8446537 100644
--- a/website/cue/reference/components/sinks/datadog_traces.cue
+++ b/website/cue/reference/components/sinks/datadog_traces.cue
@@ -79,7 +79,7 @@ components: sinks: datadog_traces: {
 		notices: []
 	}
 
-	configuration: base.components.sinks.datadog_traces.configuration
+	configuration: generated.components.sinks.datadog_traces.configuration
 
 	input: {
 		logs:    false
diff --git a/website/cue/reference/components/sinks/elasticsearch.cue b/website/cue/reference/components/sinks/elasticsearch.cue
index c7c03fc5b1847..507ad7a3bdcec 100644
--- a/website/cue/reference/components/sinks/elasticsearch.cue
+++ b/website/cue/reference/components/sinks/elasticsearch.cue
@@ -74,7 +74,7 @@ components: sinks: elasticsearch: {
 		notices: []
 	}
 
-	configuration: base.components.sinks.elasticsearch.configuration
+	configuration: generated.components.sinks.elasticsearch.configuration
 
 	input: {
 		logs: true
diff --git a/website/cue/reference/components/sinks/file.cue b/website/cue/reference/components/sinks/file.cue
index aa3cdcbd91592..3f4344c36ff33 100644
--- a/website/cue/reference/components/sinks/file.cue
+++ b/website/cue/reference/components/sinks/file.cue
@@ -43,7 +43,7 @@ components: sinks: file: {
 		notices: []
 	}
 
-	configuration: base.components.sinks.file.configuration
+	configuration: generated.components.sinks.file.configuration
 
 	input: {
 		logs: true
diff --git a/website/cue/reference/components/sinks/gcp_chronicle_unstructured.cue b/website/cue/reference/components/sinks/gcp_chronicle_unstructured.cue
index 575f943726022..4de4475cb4d07 100644
--- a/website/cue/reference/components/sinks/gcp_chronicle_unstructured.cue
+++ b/website/cue/reference/components/sinks/gcp_chronicle_unstructured.cue
@@ -69,7 +69,7 @@ components: sinks: gcp_chronicle_unstructured: {
 		notices: []
 	}
 
-	configuration: base.components.sinks.gcp_chronicle_unstructured.configuration
+	configuration: generated.components.sinks.gcp_chronicle_unstructured.configuration
 
 	input: {
 		logs:    true
diff --git a/website/cue/reference/components/sinks/gcp_cloud_storage.cue b/website/cue/reference/components/sinks/gcp_cloud_storage.cue
index 94e03043e43e0..a17fa3ec59066 100644
--- a/website/cue/reference/components/sinks/gcp_cloud_storage.cue
+++ b/website/cue/reference/components/sinks/gcp_cloud_storage.cue
@@ -74,7 +74,7 @@ components: sinks: gcp_cloud_storage: {
 		notices: []
 	}
 
-	configuration: base.components.sinks.gcp_cloud_storage.configuration
+	configuration: generated.components.sinks.gcp_cloud_storage.configuration
 
 	input: {
 		logs:    true
diff --git a/website/cue/reference/components/sinks/gcp_pubsub.cue b/website/cue/reference/components/sinks/gcp_pubsub.cue
index 3a789a3bd6bb5..da57d140d5364 100644
--- a/website/cue/reference/components/sinks/gcp_pubsub.cue
+++ b/website/cue/reference/components/sinks/gcp_pubsub.cue
@@ -68,7 +68,7 @@ components: sinks: gcp_pubsub: {
 		notices: []
 	}
 
-	configuration: base.components.sinks.gcp_pubsub.configuration
+	configuration: generated.components.sinks.gcp_pubsub.configuration
 
 	input: {
 		logs:    true
diff --git a/website/cue/reference/components/sinks/gcp_stackdriver_logs.cue b/website/cue/reference/components/sinks/gcp_stackdriver_logs.cue
index c7194dd1344fa..84c31f5de30dd 100644
--- a/website/cue/reference/components/sinks/gcp_stackdriver_logs.cue
+++ b/website/cue/reference/components/sinks/gcp_stackdriver_logs.cue
@@ -65,7 +65,7 @@ components: sinks: gcp_stackdriver_logs: {
 		notices: []
 	}
 
-	configuration: base.components.sinks.gcp_stackdriver_logs.configuration
+	configuration: generated.components.sinks.gcp_stackdriver_logs.configuration
 
 	input: {
 		logs:    true
diff --git a/website/cue/reference/components/sinks/gcp_stackdriver_metrics.cue b/website/cue/reference/components/sinks/gcp_stackdriver_metrics.cue
index 1db83b33a69f5..6d1bec6b6cf18 100644
--- a/website/cue/reference/components/sinks/gcp_stackdriver_metrics.cue
+++ b/website/cue/reference/components/sinks/gcp_stackdriver_metrics.cue
@@ -65,7 +65,7 @@ components: sinks: gcp_stackdriver_metrics: {
 		notices: []
 	}
 
-	configuration: base.components.sinks.gcp_stackdriver_metrics.configuration
+	configuration: generated.components.sinks.gcp_stackdriver_metrics.configuration
 
 	input: {
 		logs: false
diff --git a/website/cue/reference/components/sinks/base/amqp.cue b/website/cue/reference/components/sinks/generated/amqp.cue
similarity index 99%
rename from website/cue/reference/components/sinks/base/amqp.cue
rename to website/cue/reference/components/sinks/generated/amqp.cue
index 0fcde6cbe9c53..6bb6aee1e4685 100644
--- a/website/cue/reference/components/sinks/base/amqp.cue
+++ b/website/cue/reference/components/sinks/generated/amqp.cue
@@ -1,6 +1,6 @@
 package metadata
 
-base: components: sinks: amqp: configuration: {
+generated: components: sinks: amqp: configuration: {
 	acknowledgements: {
 		description: """
 			Controls how acknowledgements are handled for this sink.
diff --git a/website/cue/reference/components/sinks/base/appsignal.cue b/website/cue/reference/components/sinks/generated/appsignal.cue
similarity index 99%
rename from website/cue/reference/components/sinks/base/appsignal.cue
rename to website/cue/reference/components/sinks/generated/appsignal.cue
index 2fa750ee72f54..aa3b5d0c588f3 100644
--- a/website/cue/reference/components/sinks/base/appsignal.cue
+++ b/website/cue/reference/components/sinks/generated/appsignal.cue
@@ -1,6 +1,6 @@
 package metadata
 
-base: components: sinks: appsignal: configuration: {
+generated: components: sinks: appsignal: configuration: {
 	acknowledgements: {
 		description: """
 			Controls how acknowledgements are handled for this sink.
diff --git a/website/cue/reference/components/sinks/base/aws_cloudwatch_logs.cue b/website/cue/reference/components/sinks/generated/aws_cloudwatch_logs.cue
similarity index 99%
rename from website/cue/reference/components/sinks/base/aws_cloudwatch_logs.cue
rename to website/cue/reference/components/sinks/generated/aws_cloudwatch_logs.cue
index 85e63138cfd7d..94db65cd54aeb 100644
--- a/website/cue/reference/components/sinks/base/aws_cloudwatch_logs.cue
+++ b/website/cue/reference/components/sinks/generated/aws_cloudwatch_logs.cue
@@ -1,6 +1,6 @@
 package metadata
 
-base: components: sinks: aws_cloudwatch_logs: configuration: {
+generated: components: sinks: aws_cloudwatch_logs: configuration: {
 	acknowledgements: {
 		description: """
 			Controls how acknowledgements are handled for this sink.
diff --git a/website/cue/reference/components/sinks/base/aws_cloudwatch_metrics.cue b/website/cue/reference/components/sinks/generated/aws_cloudwatch_metrics.cue
similarity index 99%
rename from website/cue/reference/components/sinks/base/aws_cloudwatch_metrics.cue
rename to website/cue/reference/components/sinks/generated/aws_cloudwatch_metrics.cue
index 09547529cd3c6..4b26eb7ee8042 100644
--- a/website/cue/reference/components/sinks/base/aws_cloudwatch_metrics.cue
+++ b/website/cue/reference/components/sinks/generated/aws_cloudwatch_metrics.cue
@@ -1,6 +1,6 @@
 package metadata
 
-base: components: sinks: aws_cloudwatch_metrics: configuration: {
+generated: components: sinks: aws_cloudwatch_metrics: configuration: {
 	acknowledgements: {
 		description: """
 			Controls how acknowledgements are handled for this sink.
diff --git a/website/cue/reference/components/sinks/base/aws_kinesis_firehose.cue b/website/cue/reference/components/sinks/generated/aws_kinesis_firehose.cue
similarity index 99%
rename from website/cue/reference/components/sinks/base/aws_kinesis_firehose.cue
rename to website/cue/reference/components/sinks/generated/aws_kinesis_firehose.cue
index 1b2c6b5c00429..763c7595a7336 100644
--- a/website/cue/reference/components/sinks/base/aws_kinesis_firehose.cue
+++ b/website/cue/reference/components/sinks/generated/aws_kinesis_firehose.cue
@@ -1,6 +1,6 @@
 package metadata
 
-base: components: sinks: aws_kinesis_firehose: configuration: {
+generated: components: sinks: aws_kinesis_firehose: configuration: {
 	acknowledgements: {
 		description: """
 			Controls how acknowledgements are handled for this sink.
diff --git a/website/cue/reference/components/sinks/base/aws_kinesis_streams.cue b/website/cue/reference/components/sinks/generated/aws_kinesis_streams.cue
similarity index 99%
rename from website/cue/reference/components/sinks/base/aws_kinesis_streams.cue
rename to website/cue/reference/components/sinks/generated/aws_kinesis_streams.cue
index ba0c0600b5c87..fd9071c55bb29 100644
--- a/website/cue/reference/components/sinks/base/aws_kinesis_streams.cue
+++ b/website/cue/reference/components/sinks/generated/aws_kinesis_streams.cue
@@ -1,6 +1,6 @@
 package metadata
 
-base: components: sinks: aws_kinesis_streams: configuration: {
+generated: components: sinks: aws_kinesis_streams: configuration: {
 	acknowledgements: {
 		description: """
 			Controls how acknowledgements are handled for this sink.
diff --git a/website/cue/reference/components/sinks/base/aws_s3.cue b/website/cue/reference/components/sinks/generated/aws_s3.cue
similarity index 99%
rename from website/cue/reference/components/sinks/base/aws_s3.cue
rename to website/cue/reference/components/sinks/generated/aws_s3.cue
index cdb75c8307174..034579ddb8374 100644
--- a/website/cue/reference/components/sinks/base/aws_s3.cue
+++ b/website/cue/reference/components/sinks/generated/aws_s3.cue
@@ -1,6 +1,6 @@
 package metadata
 
-base: components: sinks: aws_s3: configuration: {
+generated: components: sinks: aws_s3: configuration: {
 	acknowledgements: {
 		description: """
 			Controls how acknowledgements are handled for this sink.
diff --git a/website/cue/reference/components/sinks/base/aws_sns.cue b/website/cue/reference/components/sinks/generated/aws_sns.cue
similarity index 99%
rename from website/cue/reference/components/sinks/base/aws_sns.cue
rename to website/cue/reference/components/sinks/generated/aws_sns.cue
index 3a1c649f63a00..6d5738f2c58cf 100644
--- a/website/cue/reference/components/sinks/base/aws_sns.cue
+++ b/website/cue/reference/components/sinks/generated/aws_sns.cue
@@ -1,6 +1,6 @@
 package metadata
 
-base: components: sinks: aws_sns: configuration: {
+generated: components: sinks: aws_sns: configuration: {
 	acknowledgements: {
 		description: """
 			Controls how acknowledgements are handled for this sink.
diff --git a/website/cue/reference/components/sinks/base/aws_sqs.cue b/website/cue/reference/components/sinks/generated/aws_sqs.cue
similarity index 99%
rename from website/cue/reference/components/sinks/base/aws_sqs.cue
rename to website/cue/reference/components/sinks/generated/aws_sqs.cue
index 98980124d2008..5672309253dc9 100644
--- a/website/cue/reference/components/sinks/base/aws_sqs.cue
+++ b/website/cue/reference/components/sinks/generated/aws_sqs.cue
@@ -1,6 +1,6 @@
 package metadata
 
-base: components: sinks: aws_sqs: configuration: {
+generated: components: sinks: aws_sqs: configuration: {
 	acknowledgements: {
 		description: """
 			Controls how acknowledgements are handled for this sink.
diff --git a/website/cue/reference/components/sinks/base/axiom.cue b/website/cue/reference/components/sinks/generated/axiom.cue
similarity index 99%
rename from website/cue/reference/components/sinks/base/axiom.cue
rename to website/cue/reference/components/sinks/generated/axiom.cue
index 2ec4013d54db0..258845138f138 100644
--- a/website/cue/reference/components/sinks/base/axiom.cue
+++ b/website/cue/reference/components/sinks/generated/axiom.cue
@@ -1,6 +1,6 @@
 package metadata
 
-base: components: sinks: axiom: configuration: {
+generated: components: sinks: axiom: configuration: {
 	acknowledgements: {
 		description: "Controls how acknowledgements are handled for this sink."
 		required:    false
diff --git a/website/cue/reference/components/sinks/base/azure_blob.cue b/website/cue/reference/components/sinks/generated/azure_blob.cue
similarity index 99%
rename from website/cue/reference/components/sinks/base/azure_blob.cue
rename to website/cue/reference/components/sinks/generated/azure_blob.cue
index 366e0f8ad5c21..e0a720238cb7c 100644
--- a/website/cue/reference/components/sinks/base/azure_blob.cue
+++ b/website/cue/reference/components/sinks/generated/azure_blob.cue
@@ -1,6 +1,6 @@
 package metadata
 
-base: components: sinks: azure_blob: configuration: {
+generated: components: sinks: azure_blob: configuration: {
 	acknowledgements: {
 		description: """
 			Controls how acknowledgements are handled for this sink.
diff --git a/website/cue/reference/components/sinks/base/azure_monitor_logs.cue b/website/cue/reference/components/sinks/generated/azure_monitor_logs.cue
similarity index 99%
rename from website/cue/reference/components/sinks/base/azure_monitor_logs.cue
rename to website/cue/reference/components/sinks/generated/azure_monitor_logs.cue
index 873b08ceec446..d7bbff23b322b 100644
--- a/website/cue/reference/components/sinks/base/azure_monitor_logs.cue
+++ b/website/cue/reference/components/sinks/generated/azure_monitor_logs.cue
@@ -1,6 +1,6 @@
 package metadata
 
-base: components: sinks: azure_monitor_logs: configuration: {
+generated: components: sinks: azure_monitor_logs: configuration: {
 	acknowledgements: {
 		description: """
 			Controls how acknowledgements are handled for this sink.
diff --git a/website/cue/reference/components/sinks/base/blackhole.cue b/website/cue/reference/components/sinks/generated/blackhole.cue
similarity index 96%
rename from website/cue/reference/components/sinks/base/blackhole.cue
rename to website/cue/reference/components/sinks/generated/blackhole.cue
index 8933f76469672..d10b78df250c6 100644
--- a/website/cue/reference/components/sinks/base/blackhole.cue
+++ b/website/cue/reference/components/sinks/generated/blackhole.cue
@@ -1,6 +1,6 @@
 package metadata
 
-base: components: sinks: blackhole: configuration: {
+generated: components: sinks: blackhole: configuration: {
 	acknowledgements: {
 		description: """
 			Controls how acknowledgements are handled for this sink.
diff --git a/website/cue/reference/components/sinks/base/clickhouse.cue b/website/cue/reference/components/sinks/generated/clickhouse.cue
similarity index 99%
rename from website/cue/reference/components/sinks/base/clickhouse.cue
rename to website/cue/reference/components/sinks/generated/clickhouse.cue
index f5f973abe7347..61ccb4f952eda 100644
--- a/website/cue/reference/components/sinks/base/clickhouse.cue
+++ b/website/cue/reference/components/sinks/generated/clickhouse.cue
@@ -1,6 +1,6 @@
 package metadata
 
-base: components: sinks: clickhouse: configuration: {
+generated: components: sinks: clickhouse: configuration: {
 	acknowledgements: {
 		description: """
 			Controls how acknowledgements are handled for this sink.
diff --git a/website/cue/reference/components/sinks/base/console.cue b/website/cue/reference/components/sinks/generated/console.cue
similarity index 99%
rename from website/cue/reference/components/sinks/base/console.cue
rename to website/cue/reference/components/sinks/generated/console.cue
index 90fb7ef605736..918bbdea6f2e4 100644
--- a/website/cue/reference/components/sinks/base/console.cue
+++ b/website/cue/reference/components/sinks/generated/console.cue
@@ -1,6 +1,6 @@
 package metadata
 
-base: components: sinks: console: configuration: {
+generated: components: sinks: console: configuration: {
 	acknowledgements: {
 		description: """
 			Controls how acknowledgements are handled for this sink.
diff --git a/website/cue/reference/components/sinks/base/databend.cue b/website/cue/reference/components/sinks/generated/databend.cue
similarity index 99%
rename from website/cue/reference/components/sinks/base/databend.cue
rename to website/cue/reference/components/sinks/generated/databend.cue
index eb9c2f3780c25..7492859c679a3 100644
--- a/website/cue/reference/components/sinks/base/databend.cue
+++ b/website/cue/reference/components/sinks/generated/databend.cue
@@ -1,6 +1,6 @@
 package metadata
 
-base: components: sinks: databend: configuration: {
+generated: components: sinks: databend: configuration: {
 	acknowledgements: {
 		description: """
 			Controls how acknowledgements are handled for this sink.
diff --git a/website/cue/reference/components/sinks/base/datadog_events.cue b/website/cue/reference/components/sinks/generated/datadog_events.cue
similarity index 99%
rename from website/cue/reference/components/sinks/base/datadog_events.cue
rename to website/cue/reference/components/sinks/generated/datadog_events.cue
index 00874fb0bb387..1ce0a61900dc3 100644
--- a/website/cue/reference/components/sinks/base/datadog_events.cue
+++ b/website/cue/reference/components/sinks/generated/datadog_events.cue
@@ -1,6 +1,6 @@
 package metadata
 
-base: components: sinks: datadog_events: configuration: {
+generated: components: sinks: datadog_events: configuration: {
 	acknowledgements: {
 		description: """
 			Controls how acknowledgements are handled for this sink.
diff --git a/website/cue/reference/components/sinks/base/datadog_logs.cue b/website/cue/reference/components/sinks/generated/datadog_logs.cue
similarity index 99%
rename from website/cue/reference/components/sinks/base/datadog_logs.cue
rename to website/cue/reference/components/sinks/generated/datadog_logs.cue
index 41214a77c99c0..0cef802539683 100644
--- a/website/cue/reference/components/sinks/base/datadog_logs.cue
+++ b/website/cue/reference/components/sinks/generated/datadog_logs.cue
@@ -1,6 +1,6 @@
 package metadata
 
-base: components: sinks: datadog_logs: configuration: {
+generated: components: sinks: datadog_logs: configuration: {
 	acknowledgements: {
 		description: """
 			Controls how acknowledgements are handled for this sink.
diff --git a/website/cue/reference/components/sinks/base/datadog_metrics.cue b/website/cue/reference/components/sinks/generated/datadog_metrics.cue
similarity index 99%
rename from website/cue/reference/components/sinks/base/datadog_metrics.cue
rename to website/cue/reference/components/sinks/generated/datadog_metrics.cue
index 534dff6da40d5..fade7e5ff638a 100644
--- a/website/cue/reference/components/sinks/base/datadog_metrics.cue
+++ b/website/cue/reference/components/sinks/generated/datadog_metrics.cue
@@ -1,6 +1,6 @@
 package metadata
 
-base: components: sinks: datadog_metrics: configuration: {
+generated: components: sinks: datadog_metrics: configuration: {
 	acknowledgements: {
 		description: """
 			Controls how acknowledgements are handled for this sink.
diff --git a/website/cue/reference/components/sinks/base/datadog_traces.cue b/website/cue/reference/components/sinks/generated/datadog_traces.cue
similarity index 99%
rename from website/cue/reference/components/sinks/base/datadog_traces.cue
rename to website/cue/reference/components/sinks/generated/datadog_traces.cue
index 7c1d038d09aa9..2c867b765b4c7 100644
--- a/website/cue/reference/components/sinks/base/datadog_traces.cue
+++ b/website/cue/reference/components/sinks/generated/datadog_traces.cue
@@ -1,6 +1,6 @@
 package metadata
 
-base: components: sinks: datadog_traces: configuration: {
+generated: components: sinks: datadog_traces: configuration: {
 	acknowledgements: {
 		description: """
 			Controls how acknowledgements are handled for this sink.
diff --git a/website/cue/reference/components/sinks/base/elasticsearch.cue b/website/cue/reference/components/sinks/generated/elasticsearch.cue
similarity index 99%
rename from website/cue/reference/components/sinks/base/elasticsearch.cue
rename to website/cue/reference/components/sinks/generated/elasticsearch.cue
index 315ae9baa09c4..85eac233a81ff 100644
--- a/website/cue/reference/components/sinks/base/elasticsearch.cue
+++ b/website/cue/reference/components/sinks/generated/elasticsearch.cue
@@ -1,6 +1,6 @@
 package metadata
 
-base: components: sinks: elasticsearch: configuration: {
+generated: components: sinks: elasticsearch: configuration: {
 	acknowledgements: {
 		description: """
 			Controls how acknowledgements are handled for this sink.
diff --git a/website/cue/reference/components/sinks/base/file.cue b/website/cue/reference/components/sinks/generated/file.cue
similarity index 99%
rename from website/cue/reference/components/sinks/base/file.cue
rename to website/cue/reference/components/sinks/generated/file.cue
index 1a044fe961f25..1e75d3682c08e 100644
--- a/website/cue/reference/components/sinks/base/file.cue
+++ b/website/cue/reference/components/sinks/generated/file.cue
@@ -1,6 +1,6 @@
 package metadata
 
-base: components: sinks: file: configuration: {
+generated: components: sinks: file: configuration: {
 	acknowledgements: {
 		description: """
 			Controls how acknowledgements are handled for this sink.
diff --git a/website/cue/reference/components/sinks/base/gcp_chronicle_unstructured.cue b/website/cue/reference/components/sinks/generated/gcp_chronicle_unstructured.cue
similarity index 99%
rename from website/cue/reference/components/sinks/base/gcp_chronicle_unstructured.cue
rename to website/cue/reference/components/sinks/generated/gcp_chronicle_unstructured.cue
index 0a455d7039cd8..30989f2068da6 100644
--- a/website/cue/reference/components/sinks/base/gcp_chronicle_unstructured.cue
+++ b/website/cue/reference/components/sinks/generated/gcp_chronicle_unstructured.cue
@@ -1,6 +1,6 @@
 package metadata
 
-base: components: sinks: gcp_chronicle_unstructured: configuration: {
+generated: components: sinks: gcp_chronicle_unstructured: configuration: {
 	acknowledgements: {
 		description: """
 			Controls how acknowledgements are handled for this sink.
diff --git a/website/cue/reference/components/sinks/base/gcp_cloud_storage.cue b/website/cue/reference/components/sinks/generated/gcp_cloud_storage.cue
similarity index 99%
rename from website/cue/reference/components/sinks/base/gcp_cloud_storage.cue
rename to website/cue/reference/components/sinks/generated/gcp_cloud_storage.cue
index 6fa1fcbd03484..31164980c6923 100644
--- a/website/cue/reference/components/sinks/base/gcp_cloud_storage.cue
+++ b/website/cue/reference/components/sinks/generated/gcp_cloud_storage.cue
@@ -1,6 +1,6 @@
 package metadata
 
-base: components: sinks: gcp_cloud_storage: configuration: {
+generated: components: sinks: gcp_cloud_storage: configuration: {
 	acknowledgements: {
 		description: """
 			Controls how acknowledgements are handled for this sink.
diff --git a/website/cue/reference/components/sinks/base/gcp_pubsub.cue b/website/cue/reference/components/sinks/generated/gcp_pubsub.cue
similarity index 99%
rename from website/cue/reference/components/sinks/base/gcp_pubsub.cue
rename to website/cue/reference/components/sinks/generated/gcp_pubsub.cue
index 7c3cc3db1abd1..827f17de0e03b 100644
--- a/website/cue/reference/components/sinks/base/gcp_pubsub.cue
+++ b/website/cue/reference/components/sinks/generated/gcp_pubsub.cue
@@ -1,6 +1,6 @@
 package metadata
 
-base: components: sinks: gcp_pubsub: configuration: {
+generated: components: sinks: gcp_pubsub: configuration: {
 	acknowledgements: {
 		description: """
 			Controls how acknowledgements are handled for this sink.
diff --git a/website/cue/reference/components/sinks/base/gcp_stackdriver_logs.cue b/website/cue/reference/components/sinks/generated/gcp_stackdriver_logs.cue
similarity index 99%
rename from website/cue/reference/components/sinks/base/gcp_stackdriver_logs.cue
rename to website/cue/reference/components/sinks/generated/gcp_stackdriver_logs.cue
index b241468a327ab..47c1e8e072f71 100644
--- a/website/cue/reference/components/sinks/base/gcp_stackdriver_logs.cue
+++ b/website/cue/reference/components/sinks/generated/gcp_stackdriver_logs.cue
@@ -1,6 +1,6 @@
 package metadata
 
-base: components: sinks: gcp_stackdriver_logs: configuration: {
+generated: components: sinks: gcp_stackdriver_logs: configuration: {
 	acknowledgements: {
 		description: """
 			Controls how acknowledgements are handled for this sink.
diff --git a/website/cue/reference/components/sinks/base/gcp_stackdriver_metrics.cue b/website/cue/reference/components/sinks/generated/gcp_stackdriver_metrics.cue
similarity index 99%
rename from website/cue/reference/components/sinks/base/gcp_stackdriver_metrics.cue
rename to website/cue/reference/components/sinks/generated/gcp_stackdriver_metrics.cue
index 3ca9ac2ae022f..6ecffafb965fd 100644
--- a/website/cue/reference/components/sinks/base/gcp_stackdriver_metrics.cue
+++ b/website/cue/reference/components/sinks/generated/gcp_stackdriver_metrics.cue
@@ -1,6 +1,6 @@
 package metadata
 
-base: components: sinks: gcp_stackdriver_metrics: configuration: {
+generated: components: sinks: gcp_stackdriver_metrics: configuration: {
 	acknowledgements: {
 		description: """
 			Controls how acknowledgements are handled for this sink.
diff --git a/website/cue/reference/components/sinks/base/greptimedb.cue b/website/cue/reference/components/sinks/generated/greptimedb.cue
similarity index 99%
rename from website/cue/reference/components/sinks/base/greptimedb.cue
rename to website/cue/reference/components/sinks/generated/greptimedb.cue
index 5778c92c726f8..12a4574f65fcd 100644
--- a/website/cue/reference/components/sinks/base/greptimedb.cue
+++ b/website/cue/reference/components/sinks/generated/greptimedb.cue
@@ -1,6 +1,6 @@
 package metadata
 
-base: components: sinks: greptimedb: configuration: {
+generated: components: sinks: greptimedb: configuration: {
 	acknowledgements: {
 		description: """
 			Controls how acknowledgements are handled for this sink.
diff --git a/website/cue/reference/components/sinks/base/greptimedb_logs.cue b/website/cue/reference/components/sinks/generated/greptimedb_logs.cue
similarity index 99%
rename from website/cue/reference/components/sinks/base/greptimedb_logs.cue
rename to website/cue/reference/components/sinks/generated/greptimedb_logs.cue
index 45c819d00708f..21353cf840bfb 100644
--- a/website/cue/reference/components/sinks/base/greptimedb_logs.cue
+++ b/website/cue/reference/components/sinks/generated/greptimedb_logs.cue
@@ -1,6 +1,6 @@
 package metadata
 
-base: components: sinks: greptimedb_logs: configuration: {
+generated: components: sinks: greptimedb_logs: configuration: {
 	acknowledgements: {
 		description: """
 			Controls how acknowledgements are handled for this sink.
diff --git a/website/cue/reference/components/sinks/base/greptimedb_metrics.cue b/website/cue/reference/components/sinks/generated/greptimedb_metrics.cue
similarity index 99%
rename from website/cue/reference/components/sinks/base/greptimedb_metrics.cue
rename to website/cue/reference/components/sinks/generated/greptimedb_metrics.cue
index 449f6d1006c1e..9bcf8f957b0ef 100644
--- a/website/cue/reference/components/sinks/base/greptimedb_metrics.cue
+++ b/website/cue/reference/components/sinks/generated/greptimedb_metrics.cue
@@ -1,6 +1,6 @@
 package metadata
 
-base: components: sinks: greptimedb_metrics: configuration: {
+generated: components: sinks: greptimedb_metrics: configuration: {
 	acknowledgements: {
 		description: """
 			Controls how acknowledgements are handled for this sink.
diff --git a/website/cue/reference/components/sinks/base/honeycomb.cue b/website/cue/reference/components/sinks/generated/honeycomb.cue
similarity index 99%
rename from website/cue/reference/components/sinks/base/honeycomb.cue
rename to website/cue/reference/components/sinks/generated/honeycomb.cue
index 746c5c67f7e81..ad2b64434c6b5 100644
--- a/website/cue/reference/components/sinks/base/honeycomb.cue
+++ b/website/cue/reference/components/sinks/generated/honeycomb.cue
@@ -1,6 +1,6 @@
 package metadata
 
-base: components: sinks: honeycomb: configuration: {
+generated: components: sinks: honeycomb: configuration: {
 	acknowledgements: {
 		description: """
 			Controls how acknowledgements are handled for this sink.
diff --git a/website/cue/reference/components/sinks/base/http.cue b/website/cue/reference/components/sinks/generated/http.cue
similarity index 99%
rename from website/cue/reference/components/sinks/base/http.cue
rename to website/cue/reference/components/sinks/generated/http.cue
index eb4ae90d2310a..b750df7d33d43 100644
--- a/website/cue/reference/components/sinks/base/http.cue
+++ b/website/cue/reference/components/sinks/generated/http.cue
@@ -1,6 +1,6 @@
 package metadata
 
-base: components: sinks: http: configuration: {
+generated: components: sinks: http: configuration: {
 	acknowledgements: {
 		description: """
 			Controls how acknowledgements are handled for this sink.
diff --git a/website/cue/reference/components/sinks/base/humio_logs.cue b/website/cue/reference/components/sinks/generated/humio_logs.cue
similarity index 99%
rename from website/cue/reference/components/sinks/base/humio_logs.cue
rename to website/cue/reference/components/sinks/generated/humio_logs.cue
index ea5149ec5501b..99cbd11cab182 100644
--- a/website/cue/reference/components/sinks/base/humio_logs.cue
+++ b/website/cue/reference/components/sinks/generated/humio_logs.cue
@@ -1,6 +1,6 @@
 package metadata
 
-base: components: sinks: humio_logs: configuration: {
+generated: components: sinks: humio_logs: configuration: {
 	acknowledgements: {
 		description: """
 			Controls how acknowledgements are handled for this sink.
diff --git a/website/cue/reference/components/sinks/base/humio_metrics.cue b/website/cue/reference/components/sinks/generated/humio_metrics.cue
similarity index 99%
rename from website/cue/reference/components/sinks/base/humio_metrics.cue
rename to website/cue/reference/components/sinks/generated/humio_metrics.cue
index 1164b8f3ddf7d..e95a67571fdfa 100644
--- a/website/cue/reference/components/sinks/base/humio_metrics.cue
+++ b/website/cue/reference/components/sinks/generated/humio_metrics.cue
@@ -1,6 +1,6 @@
 package metadata
 
-base: components: sinks: humio_metrics: configuration: {
+generated: components: sinks: humio_metrics: configuration: {
 	acknowledgements: {
 		description: """
 			Controls how acknowledgements are handled for this sink.
diff --git a/website/cue/reference/components/sinks/base/influxdb_logs.cue b/website/cue/reference/components/sinks/generated/influxdb_logs.cue
similarity index 99%
rename from website/cue/reference/components/sinks/base/influxdb_logs.cue
rename to website/cue/reference/components/sinks/generated/influxdb_logs.cue
index ca732f248ecd0..aa780a94c2830 100644
--- a/website/cue/reference/components/sinks/base/influxdb_logs.cue
+++ b/website/cue/reference/components/sinks/generated/influxdb_logs.cue
@@ -1,6 +1,6 @@
 package metadata
 
-base: components: sinks: influxdb_logs: configuration: {
+generated: components: sinks: influxdb_logs: configuration: {
 	acknowledgements: {
 		description: """
 			Controls how acknowledgements are handled for this sink.
diff --git a/website/cue/reference/components/sinks/base/influxdb_metrics.cue b/website/cue/reference/components/sinks/generated/influxdb_metrics.cue
similarity index 99%
rename from website/cue/reference/components/sinks/base/influxdb_metrics.cue
rename to website/cue/reference/components/sinks/generated/influxdb_metrics.cue
index 923040ab022cc..a05030e6698f5 100644
--- a/website/cue/reference/components/sinks/base/influxdb_metrics.cue
+++ b/website/cue/reference/components/sinks/generated/influxdb_metrics.cue
@@ -1,6 +1,6 @@
 package metadata
 
-base: components: sinks: influxdb_metrics: configuration: {
+generated: components: sinks: influxdb_metrics: configuration: {
 	acknowledgements: {
 		description: """
 			Controls how acknowledgements are handled for this sink.
diff --git a/website/cue/reference/components/sinks/base/kafka.cue b/website/cue/reference/components/sinks/generated/kafka.cue
similarity index 99%
rename from website/cue/reference/components/sinks/base/kafka.cue
rename to website/cue/reference/components/sinks/generated/kafka.cue
index 8185b93ab475a..d7e1d93117f83 100644
--- a/website/cue/reference/components/sinks/base/kafka.cue
+++ b/website/cue/reference/components/sinks/generated/kafka.cue
@@ -1,6 +1,6 @@
 package metadata
 
-base: components: sinks: kafka: configuration: {
+generated: components: sinks: kafka: configuration: {
 	acknowledgements: {
 		description: """
 			Controls how acknowledgements are handled for this sink.
diff --git a/website/cue/reference/components/sinks/base/keep.cue b/website/cue/reference/components/sinks/generated/keep.cue
similarity index 99%
rename from website/cue/reference/components/sinks/base/keep.cue
rename to website/cue/reference/components/sinks/generated/keep.cue
index dafd596340e5f..4978e8499bc4e 100644
--- a/website/cue/reference/components/sinks/base/keep.cue
+++ b/website/cue/reference/components/sinks/generated/keep.cue
@@ -1,6 +1,6 @@
 package metadata
 
-base: components: sinks: keep: configuration: {
+generated: components: sinks: keep: configuration: {
 	acknowledgements: {
 		description: """
 			Controls how acknowledgements are handled for this sink.
diff --git a/website/cue/reference/components/sinks/base/logdna.cue b/website/cue/reference/components/sinks/generated/logdna.cue
similarity index 99%
rename from website/cue/reference/components/sinks/base/logdna.cue
rename to website/cue/reference/components/sinks/generated/logdna.cue
index 44e09e3ede058..03afc5c79f938 100644
--- a/website/cue/reference/components/sinks/base/logdna.cue
+++ b/website/cue/reference/components/sinks/generated/logdna.cue
@@ -1,6 +1,6 @@
 package metadata
 
-base: components: sinks: logdna: configuration: {
+generated: components: sinks: logdna: configuration: {
 	acknowledgements: {
 		description: """
 			Controls how acknowledgements are handled for this sink.
diff --git a/website/cue/reference/components/sinks/base/loki.cue b/website/cue/reference/components/sinks/generated/loki.cue
similarity index 99%
rename from website/cue/reference/components/sinks/base/loki.cue
rename to website/cue/reference/components/sinks/generated/loki.cue
index 310f0e52ff5d8..ec0e1658a8b6e 100644
--- a/website/cue/reference/components/sinks/base/loki.cue
+++ b/website/cue/reference/components/sinks/generated/loki.cue
@@ -1,6 +1,6 @@
 package metadata
 
-base: components: sinks: loki: configuration: {
+generated: components: sinks: loki: configuration: {
 	acknowledgements: {
 		description: """
 			Controls how acknowledgements are handled for this sink.
diff --git a/website/cue/reference/components/sinks/base/mezmo.cue b/website/cue/reference/components/sinks/generated/mezmo.cue
similarity index 99%
rename from website/cue/reference/components/sinks/base/mezmo.cue
rename to website/cue/reference/components/sinks/generated/mezmo.cue
index 9a65e23994934..00f21f569117a 100644
--- a/website/cue/reference/components/sinks/base/mezmo.cue
+++ b/website/cue/reference/components/sinks/generated/mezmo.cue
@@ -1,6 +1,6 @@
 package metadata
 
-base: components: sinks: mezmo: configuration: {
+generated: components: sinks: mezmo: configuration: {
 	acknowledgements: {
 		description: """
 			Controls how acknowledgements are handled for this sink.
diff --git a/website/cue/reference/components/sinks/base/mqtt.cue b/website/cue/reference/components/sinks/generated/mqtt.cue
similarity index 99%
rename from website/cue/reference/components/sinks/base/mqtt.cue
rename to website/cue/reference/components/sinks/generated/mqtt.cue
index d82b40c6c1b6f..2fc71c205625d 100644
--- a/website/cue/reference/components/sinks/base/mqtt.cue
+++ b/website/cue/reference/components/sinks/generated/mqtt.cue
@@ -1,6 +1,6 @@
 package metadata
 
-base: components: sinks: mqtt: configuration: {
+generated: components: sinks: mqtt: configuration: {
 	acknowledgements: {
 		description: """
 			Controls how acknowledgements are handled for this sink.
diff --git a/website/cue/reference/components/sinks/base/nats.cue b/website/cue/reference/components/sinks/generated/nats.cue
similarity index 99%
rename from website/cue/reference/components/sinks/base/nats.cue
rename to website/cue/reference/components/sinks/generated/nats.cue
index 4b76d7be071c5..f1031f912ef3a 100644
--- a/website/cue/reference/components/sinks/base/nats.cue
+++ b/website/cue/reference/components/sinks/generated/nats.cue
@@ -1,6 +1,6 @@
 package metadata
 
-base: components: sinks: nats: configuration: {
+generated: components: sinks: nats: configuration: {
 	acknowledgements: {
 		description: """
 			Controls how acknowledgements are handled for this sink.
diff --git a/website/cue/reference/components/sinks/base/new_relic.cue b/website/cue/reference/components/sinks/generated/new_relic.cue
similarity index 99%
rename from website/cue/reference/components/sinks/base/new_relic.cue
rename to website/cue/reference/components/sinks/generated/new_relic.cue
index 64b753cf3995f..f940dd5eadb10 100644
--- a/website/cue/reference/components/sinks/base/new_relic.cue
+++ b/website/cue/reference/components/sinks/generated/new_relic.cue
@@ -1,6 +1,6 @@
 package metadata
 
-base: components: sinks: new_relic: configuration: {
+generated: components: sinks: new_relic: configuration: {
 	account_id: {
 		description: "The New Relic account ID."
 		required:    true
diff --git a/website/cue/reference/components/sinks/base/opentelemetry.cue b/website/cue/reference/components/sinks/generated/opentelemetry.cue
similarity index 99%
rename from website/cue/reference/components/sinks/base/opentelemetry.cue
rename to website/cue/reference/components/sinks/generated/opentelemetry.cue
index 42c45813c44ba..7d6e1d6bf0531 100644
--- a/website/cue/reference/components/sinks/base/opentelemetry.cue
+++ b/website/cue/reference/components/sinks/generated/opentelemetry.cue
@@ -1,6 +1,6 @@
 package metadata
 
-base: components: sinks: opentelemetry: configuration: protocol: {
+generated: components: sinks: opentelemetry: configuration: protocol: {
 	description: "Protocol configuration"
 	required:    true
 	type: object: options: {
diff --git a/website/cue/reference/components/sinks/base/papertrail.cue b/website/cue/reference/components/sinks/generated/papertrail.cue
similarity index 99%
rename from website/cue/reference/components/sinks/base/papertrail.cue
rename to website/cue/reference/components/sinks/generated/papertrail.cue
index 7118a99bb283a..1dfcbe0d99d40 100644
--- a/website/cue/reference/components/sinks/base/papertrail.cue
+++ b/website/cue/reference/components/sinks/generated/papertrail.cue
@@ -1,6 +1,6 @@
 package metadata
 
-base: components: sinks: papertrail: configuration: {
+generated: components: sinks: papertrail: configuration: {
 	acknowledgements: {
 		description: """
 			Controls how acknowledgements are handled for this sink.
diff --git a/website/cue/reference/components/sinks/base/postgres.cue b/website/cue/reference/components/sinks/generated/postgres.cue
similarity index 99%
rename from website/cue/reference/components/sinks/base/postgres.cue
rename to website/cue/reference/components/sinks/generated/postgres.cue
index d7b4b32aee92a..424246a7f78cb 100644
--- a/website/cue/reference/components/sinks/base/postgres.cue
+++ b/website/cue/reference/components/sinks/generated/postgres.cue
@@ -1,6 +1,6 @@
 package metadata
 
-base: components: sinks: postgres: configuration: {
+generated: components: sinks: postgres: configuration: {
 	acknowledgements: {
 		description: """
 			Controls how acknowledgements are handled for this sink.
diff --git a/website/cue/reference/components/sinks/base/prometheus_exporter.cue b/website/cue/reference/components/sinks/generated/prometheus_exporter.cue
similarity index 99%
rename from website/cue/reference/components/sinks/base/prometheus_exporter.cue
rename to website/cue/reference/components/sinks/generated/prometheus_exporter.cue
index 7c4dbf04f502e..6e9fa28c83397 100644
--- a/website/cue/reference/components/sinks/base/prometheus_exporter.cue
+++ b/website/cue/reference/components/sinks/generated/prometheus_exporter.cue
@@ -1,6 +1,6 @@
 package metadata
 
-base: components: sinks: prometheus_exporter: configuration: {
+generated: components: sinks: prometheus_exporter: configuration: {
 	acknowledgements: {
 		description: """
 			Controls how acknowledgements are handled for this sink.
diff --git a/website/cue/reference/components/sinks/base/prometheus_remote_write.cue b/website/cue/reference/components/sinks/generated/prometheus_remote_write.cue
similarity index 99%
rename from website/cue/reference/components/sinks/base/prometheus_remote_write.cue
rename to website/cue/reference/components/sinks/generated/prometheus_remote_write.cue
index 8e68af4f80813..83d55d96d5912 100644
--- a/website/cue/reference/components/sinks/base/prometheus_remote_write.cue
+++ b/website/cue/reference/components/sinks/generated/prometheus_remote_write.cue
@@ -1,6 +1,6 @@
 package metadata
 
-base: components: sinks: prometheus_remote_write: configuration: {
+generated: components: sinks: prometheus_remote_write: configuration: {
 	acknowledgements: {
 		description: """
 			Controls how acknowledgements are handled for this sink.
diff --git a/website/cue/reference/components/sinks/base/pulsar.cue b/website/cue/reference/components/sinks/generated/pulsar.cue
similarity index 99%
rename from website/cue/reference/components/sinks/base/pulsar.cue
rename to website/cue/reference/components/sinks/generated/pulsar.cue
index f64829bd3a9e7..9be3aa459fe3d 100644
--- a/website/cue/reference/components/sinks/base/pulsar.cue
+++ b/website/cue/reference/components/sinks/generated/pulsar.cue
@@ -1,6 +1,6 @@
 package metadata
 
-base: components: sinks: pulsar: configuration: {
+generated: components: sinks: pulsar: configuration: {
 	acknowledgements: {
 		description: """
 			Controls how acknowledgements are handled for this sink.
diff --git a/website/cue/reference/components/sinks/base/redis.cue b/website/cue/reference/components/sinks/generated/redis.cue
similarity index 99%
rename from website/cue/reference/components/sinks/base/redis.cue
rename to website/cue/reference/components/sinks/generated/redis.cue
index 2eb625c201674..6d6cfd21451a0 100644
--- a/website/cue/reference/components/sinks/base/redis.cue
+++ b/website/cue/reference/components/sinks/generated/redis.cue
@@ -1,6 +1,6 @@
 package metadata
 
-base: components: sinks: redis: configuration: {
+generated: components: sinks: redis: configuration: {
 	acknowledgements: {
 		description: """
 			Controls how acknowledgements are handled for this sink.
diff --git a/website/cue/reference/components/sinks/base/sematext_logs.cue b/website/cue/reference/components/sinks/generated/sematext_logs.cue
similarity index 99%
rename from website/cue/reference/components/sinks/base/sematext_logs.cue
rename to website/cue/reference/components/sinks/generated/sematext_logs.cue
index c83b416d406a6..9e45702b89c0a 100644
--- a/website/cue/reference/components/sinks/base/sematext_logs.cue
+++ b/website/cue/reference/components/sinks/generated/sematext_logs.cue
@@ -1,6 +1,6 @@
 package metadata
 
-base: components: sinks: sematext_logs: configuration: {
+generated: components: sinks: sematext_logs: configuration: {
 	acknowledgements: {
 		description: """
 			Controls how acknowledgements are handled for this sink.
diff --git a/website/cue/reference/components/sinks/base/sematext_metrics.cue b/website/cue/reference/components/sinks/generated/sematext_metrics.cue
similarity index 99%
rename from website/cue/reference/components/sinks/base/sematext_metrics.cue
rename to website/cue/reference/components/sinks/generated/sematext_metrics.cue
index 3ac88f5c6a285..418d92f7732f9 100644
--- a/website/cue/reference/components/sinks/base/sematext_metrics.cue
+++ b/website/cue/reference/components/sinks/generated/sematext_metrics.cue
@@ -1,6 +1,6 @@
 package metadata
 
-base: components: sinks: sematext_metrics: configuration: {
+generated: components: sinks: sematext_metrics: configuration: {
 	acknowledgements: {
 		description: """
 			Controls how acknowledgements are handled for this sink.
diff --git a/website/cue/reference/components/sinks/base/socket.cue b/website/cue/reference/components/sinks/generated/socket.cue
similarity index 99%
rename from website/cue/reference/components/sinks/base/socket.cue
rename to website/cue/reference/components/sinks/generated/socket.cue
index 100a913c8d871..5af2b131b5f62 100644
--- a/website/cue/reference/components/sinks/base/socket.cue
+++ b/website/cue/reference/components/sinks/generated/socket.cue
@@ -1,6 +1,6 @@
 package metadata
 
-base: components: sinks: socket: configuration: {
+generated: components: sinks: socket: configuration: {
 	acknowledgements: {
 		description: """
 			Controls how acknowledgements are handled for this sink.
diff --git a/website/cue/reference/components/sinks/base/splunk_hec_logs.cue b/website/cue/reference/components/sinks/generated/splunk_hec_logs.cue
similarity index 99%
rename from website/cue/reference/components/sinks/base/splunk_hec_logs.cue
rename to website/cue/reference/components/sinks/generated/splunk_hec_logs.cue
index e5d189ba1d95d..009573d1065f8 100644
--- a/website/cue/reference/components/sinks/base/splunk_hec_logs.cue
+++ b/website/cue/reference/components/sinks/generated/splunk_hec_logs.cue
@@ -1,6 +1,6 @@
 package metadata
 
-base: components: sinks: splunk_hec_logs: configuration: {
+generated: components: sinks: splunk_hec_logs: configuration: {
 	acknowledgements: {
 		description: "Splunk HEC acknowledgement configuration."
 		required:    false
diff --git a/website/cue/reference/components/sinks/base/splunk_hec_metrics.cue b/website/cue/reference/components/sinks/generated/splunk_hec_metrics.cue
similarity index 99%
rename from website/cue/reference/components/sinks/base/splunk_hec_metrics.cue
rename to website/cue/reference/components/sinks/generated/splunk_hec_metrics.cue
index 0bad9ae1c94d9..7d514e4ace9da 100644
--- a/website/cue/reference/components/sinks/base/splunk_hec_metrics.cue
+++ b/website/cue/reference/components/sinks/generated/splunk_hec_metrics.cue
@@ -1,6 +1,6 @@
 package metadata
 
-base: components: sinks: splunk_hec_metrics: configuration: {
+generated: components: sinks: splunk_hec_metrics: configuration: {
 	acknowledgements: {
 		description: "Splunk HEC acknowledgement configuration."
 		required:    false
diff --git a/website/cue/reference/components/sinks/base/statsd.cue b/website/cue/reference/components/sinks/generated/statsd.cue
similarity index 99%
rename from website/cue/reference/components/sinks/base/statsd.cue
rename to website/cue/reference/components/sinks/generated/statsd.cue
index 4415d149587da..5eb52c0c3416f 100644
--- a/website/cue/reference/components/sinks/base/statsd.cue
+++ b/website/cue/reference/components/sinks/generated/statsd.cue
@@ -1,6 +1,6 @@
 package metadata
 
-base: components: sinks: statsd: configuration: {
+generated: components: sinks: statsd: configuration: {
 	acknowledgements: {
 		description: """
 			Controls how acknowledgements are handled for this sink.
diff --git a/website/cue/reference/components/sinks/base/unit_test.cue b/website/cue/reference/components/sinks/generated/unit_test.cue
similarity index 84%
rename from website/cue/reference/components/sinks/base/unit_test.cue
rename to website/cue/reference/components/sinks/generated/unit_test.cue
index 18dc7292baea5..86cd6fffbf538 100644
--- a/website/cue/reference/components/sinks/base/unit_test.cue
+++ b/website/cue/reference/components/sinks/generated/unit_test.cue
@@ -1,6 +1,6 @@
 package metadata
 
-base: components: sinks: unit_test: configuration: {
+generated: components: sinks: unit_test: configuration: {
 	test_name: {
 		description: "Name of the test that this sink is being used for."
 		required:    true
diff --git a/website/cue/reference/components/sinks/generated/unit_test_stream.cue b/website/cue/reference/components/sinks/generated/unit_test_stream.cue
new file mode 100644
index 0000000000000..6485b3c65681a
--- /dev/null
+++ b/website/cue/reference/components/sinks/generated/unit_test_stream.cue
@@ -0,0 +1,3 @@
+package metadata
+
+generated: components: sinks: unit_test_stream: configuration: {}
diff --git a/website/cue/reference/components/sinks/base/vector.cue b/website/cue/reference/components/sinks/generated/vector.cue
similarity index 99%
rename from website/cue/reference/components/sinks/base/vector.cue
rename to website/cue/reference/components/sinks/generated/vector.cue
index 43e4d2734c7d8..34de3922630e1 100644
--- a/website/cue/reference/components/sinks/base/vector.cue
+++ b/website/cue/reference/components/sinks/generated/vector.cue
@@ -1,6 +1,6 @@
 package metadata
 
-base: components: sinks: vector: configuration: {
+generated: components: sinks: vector: configuration: {
 	acknowledgements: {
 		description: """
 			Controls how acknowledgements are handled for this sink.
diff --git a/website/cue/reference/components/sinks/base/webhdfs.cue b/website/cue/reference/components/sinks/generated/webhdfs.cue
similarity index 99%
rename from website/cue/reference/components/sinks/base/webhdfs.cue
rename to website/cue/reference/components/sinks/generated/webhdfs.cue
index 35e7de6c537e1..1d98609bb8536 100644
--- a/website/cue/reference/components/sinks/base/webhdfs.cue
+++ b/website/cue/reference/components/sinks/generated/webhdfs.cue
@@ -1,6 +1,6 @@
 package metadata
 
-base: components: sinks: webhdfs: configuration: {
+generated: components: sinks: webhdfs: configuration: {
 	acknowledgements: {
 		description: """
 			Controls how acknowledgements are handled for this sink.
diff --git a/website/cue/reference/components/sinks/base/websocket.cue b/website/cue/reference/components/sinks/generated/websocket.cue
similarity index 99%
rename from website/cue/reference/components/sinks/base/websocket.cue
rename to website/cue/reference/components/sinks/generated/websocket.cue
index a0b8640f1a07c..ac3f4469cf0fc 100644
--- a/website/cue/reference/components/sinks/base/websocket.cue
+++ b/website/cue/reference/components/sinks/generated/websocket.cue
@@ -1,6 +1,6 @@
 package metadata
 
-base: components: sinks: websocket: configuration: {
+generated: components: sinks: websocket: configuration: {
 	acknowledgements: {
 		description: """
 			Controls how acknowledgements are handled for this sink.
diff --git a/website/cue/reference/components/sinks/base/websocket_server.cue b/website/cue/reference/components/sinks/generated/websocket_server.cue
similarity index 99%
rename from website/cue/reference/components/sinks/base/websocket_server.cue
rename to website/cue/reference/components/sinks/generated/websocket_server.cue
index ebbd024bef91d..e27f8c1418c70 100644
--- a/website/cue/reference/components/sinks/base/websocket_server.cue
+++ b/website/cue/reference/components/sinks/generated/websocket_server.cue
@@ -1,6 +1,6 @@
 package metadata
 
-base: components: sinks: websocket_server: configuration: {
+generated: components: sinks: websocket_server: configuration: {
 	acknowledgements: {
 		description: """
 			Controls how acknowledgements are handled for this sink.
diff --git a/website/cue/reference/components/sinks/greptimedb_logs.cue b/website/cue/reference/components/sinks/greptimedb_logs.cue
index 5aee4dceb921c..565f0ef3b801d 100644
--- a/website/cue/reference/components/sinks/greptimedb_logs.cue
+++ b/website/cue/reference/components/sinks/greptimedb_logs.cue
@@ -63,7 +63,7 @@ components: sinks: greptimedb_logs: {
 		notices: []
 	}
 
-	configuration: base.components.sinks.greptimedb_logs.configuration
+	configuration: generated.components.sinks.greptimedb_logs.configuration
 
 	input: {
 		logs: true
diff --git a/website/cue/reference/components/sinks/greptimedb_metrics.cue b/website/cue/reference/components/sinks/greptimedb_metrics.cue
index 0774fe28884c0..7bad56a28ca8d 100644
--- a/website/cue/reference/components/sinks/greptimedb_metrics.cue
+++ b/website/cue/reference/components/sinks/greptimedb_metrics.cue
@@ -64,7 +64,7 @@ components: sinks: greptimedb_metrics: {
 		notices: []
 	}
 
-	configuration: base.components.sinks.greptimedb_metrics.configuration
+	configuration: generated.components.sinks.greptimedb_metrics.configuration
 
 	input: {
 		logs: false
diff --git a/website/cue/reference/components/sinks/honeycomb.cue b/website/cue/reference/components/sinks/honeycomb.cue
index a06f4f4235b7e..a0ec0d5d2185f 100644
--- a/website/cue/reference/components/sinks/honeycomb.cue
+++ b/website/cue/reference/components/sinks/honeycomb.cue
@@ -63,7 +63,7 @@ components: sinks: honeycomb: {
 		notices: []
 	}
 
-	configuration: base.components.sinks.honeycomb.configuration
+	configuration: generated.components.sinks.honeycomb.configuration
 
 	input: {
 		logs:    true
diff --git a/website/cue/reference/components/sinks/http.cue b/website/cue/reference/components/sinks/http.cue
index 634456ab438aa..4cd8e352a88dc 100644
--- a/website/cue/reference/components/sinks/http.cue
+++ b/website/cue/reference/components/sinks/http.cue
@@ -77,7 +77,7 @@ components: sinks: http: {
 		notices: ["Input type support can depend on configured `encoding.codec`"]
 	}
 
-	configuration: base.components.sinks.http.configuration
+	configuration: generated.components.sinks.http.configuration
 
 	input: {
 		logs: true
diff --git a/website/cue/reference/components/sinks/humio_logs.cue b/website/cue/reference/components/sinks/humio_logs.cue
index 7d79bbf25b650..4ed263b0ee6d4 100644
--- a/website/cue/reference/components/sinks/humio_logs.cue
+++ b/website/cue/reference/components/sinks/humio_logs.cue
@@ -14,7 +14,7 @@ components: sinks: humio_logs: {
 	classes:       sinks._humio.classes
 	features:      sinks._humio.features
 	support:       sinks._humio.support
-	configuration: base.components.sinks.humio_logs.configuration
+	configuration: generated.components.sinks.humio_logs.configuration
 
 	input: {
 		logs:    true
diff --git a/website/cue/reference/components/sinks/humio_metrics.cue b/website/cue/reference/components/sinks/humio_metrics.cue
index d24ee3af92874..49eb2c0233c56 100644
--- a/website/cue/reference/components/sinks/humio_metrics.cue
+++ b/website/cue/reference/components/sinks/humio_metrics.cue
@@ -6,7 +6,7 @@ components: sinks: humio_metrics: {
 	classes:       sinks._humio.classes
 	features:      sinks._humio.features
 	support:       sinks._humio.support
-	configuration: base.components.sinks.humio_metrics.configuration
+	configuration: generated.components.sinks.humio_metrics.configuration
 
 	input: {
 		logs: false
diff --git a/website/cue/reference/components/sinks/influxdb_logs.cue b/website/cue/reference/components/sinks/influxdb_logs.cue
index 3f5ef8d457a9f..86084a4c8d01c 100644
--- a/website/cue/reference/components/sinks/influxdb_logs.cue
+++ b/website/cue/reference/components/sinks/influxdb_logs.cue
@@ -43,7 +43,7 @@ components: sinks: influxdb_logs: {
 		notices: []
 	}
 
-	configuration: base.components.sinks.influxdb_logs.configuration
+	configuration: generated.components.sinks.influxdb_logs.configuration
 
 	input: {
 		logs:    true
diff --git a/website/cue/reference/components/sinks/influxdb_metrics.cue b/website/cue/reference/components/sinks/influxdb_metrics.cue
index 01c120d9fecbb..4a0453519e08e 100644
--- a/website/cue/reference/components/sinks/influxdb_metrics.cue
+++ b/website/cue/reference/components/sinks/influxdb_metrics.cue
@@ -43,7 +43,7 @@ components: sinks: influxdb_metrics: {
 		notices: []
 	}
 
-	configuration: base.components.sinks.influxdb_metrics.configuration
+	configuration: generated.components.sinks.influxdb_metrics.configuration
 
 	input: {
 		logs: false
diff --git a/website/cue/reference/components/sinks/kafka.cue b/website/cue/reference/components/sinks/kafka.cue
index cfd2a9e8ccd64..d464d80826e79 100644
--- a/website/cue/reference/components/sinks/kafka.cue
+++ b/website/cue/reference/components/sinks/kafka.cue
@@ -51,7 +51,7 @@ components: sinks: kafka: {
 
 	support: components._kafka.support
 
-	configuration: base.components.sinks.kafka.configuration
+	configuration: generated.components.sinks.kafka.configuration
 
 	input: {
 		logs: true
diff --git a/website/cue/reference/components/sinks/keep.cue b/website/cue/reference/components/sinks/keep.cue
index 8c823e09b3bda..0bc963337215b 100644
--- a/website/cue/reference/components/sinks/keep.cue
+++ b/website/cue/reference/components/sinks/keep.cue
@@ -67,7 +67,7 @@ components: sinks: keep: {
 		notices: []
 	}
 
-	configuration: base.components.sinks.keep.configuration
+	configuration: generated.components.sinks.keep.configuration
 
 	input: {
 		logs:    true
diff --git a/website/cue/reference/components/sinks/loki.cue b/website/cue/reference/components/sinks/loki.cue
index 6f341bbde7998..a1d245016178b 100644
--- a/website/cue/reference/components/sinks/loki.cue
+++ b/website/cue/reference/components/sinks/loki.cue
@@ -69,7 +69,7 @@ components: sinks: loki: {
 		notices: []
 	}
 
-	configuration: base.components.sinks.loki.configuration
+	configuration: generated.components.sinks.loki.configuration
 
 	input: {
 		logs:    true
diff --git a/website/cue/reference/components/sinks/mezmo.cue b/website/cue/reference/components/sinks/mezmo.cue
index 0672c321343a6..540274a358576 100644
--- a/website/cue/reference/components/sinks/mezmo.cue
+++ b/website/cue/reference/components/sinks/mezmo.cue
@@ -55,7 +55,7 @@ components: sinks: mezmo: {
 		notices: []
 	}
 
-	configuration: base.components.sinks.mezmo.configuration
+	configuration: generated.components.sinks.mezmo.configuration
 
 	input: {
 		logs:    true
diff --git a/website/cue/reference/components/sinks/mqtt.cue b/website/cue/reference/components/sinks/mqtt.cue
index 014bbcd69a6f6..2bc68e35dc429 100644
--- a/website/cue/reference/components/sinks/mqtt.cue
+++ b/website/cue/reference/components/sinks/mqtt.cue
@@ -62,7 +62,7 @@ components: sinks: mqtt: {
 		notices: []
 	}
 
-	configuration: base.components.sinks.mqtt.configuration
+	configuration: generated.components.sinks.mqtt.configuration
 
 	input: {
 		logs:    true
diff --git a/website/cue/reference/components/sinks/nats.cue b/website/cue/reference/components/sinks/nats.cue
index 0d5eb18b1323e..99c101d5d8665 100644
--- a/website/cue/reference/components/sinks/nats.cue
+++ b/website/cue/reference/components/sinks/nats.cue
@@ -53,7 +53,7 @@ components: sinks: nats: {
 		notices: []
 	}
 
-	configuration: base.components.sinks.nats.configuration
+	configuration: generated.components.sinks.nats.configuration
 
 	input: {
 		logs:    true
diff --git a/website/cue/reference/components/sinks/new_relic.cue b/website/cue/reference/components/sinks/new_relic.cue
index e34a45627a602..9dc3a7cff8034 100644
--- a/website/cue/reference/components/sinks/new_relic.cue
+++ b/website/cue/reference/components/sinks/new_relic.cue
@@ -64,7 +64,7 @@ components: sinks: new_relic: {
 		notices: []
 	}
 
-	configuration: base.components.sinks.new_relic.configuration
+	configuration: generated.components.sinks.new_relic.configuration
 
 	input: {
 		logs: true
diff --git a/website/cue/reference/components/sinks/opentelemetry.cue b/website/cue/reference/components/sinks/opentelemetry.cue
index eb696c2829d90..ffdc1d40b67c2 100644
--- a/website/cue/reference/components/sinks/opentelemetry.cue
+++ b/website/cue/reference/components/sinks/opentelemetry.cue
@@ -36,7 +36,7 @@ components: sinks: opentelemetry: {
 		notices: []
 	}
 
-	configuration: base.components.sinks.opentelemetry.configuration
+	configuration: generated.components.sinks.opentelemetry.configuration
 	how_it_works: {
 		quickstart: {
 			title: "Quickstart"
diff --git a/website/cue/reference/components/sinks/papertrail.cue b/website/cue/reference/components/sinks/papertrail.cue
index eff5a59dc63ff..e2a7cc1800545 100644
--- a/website/cue/reference/components/sinks/papertrail.cue
+++ b/website/cue/reference/components/sinks/papertrail.cue
@@ -59,7 +59,7 @@ components: sinks: papertrail: {
 		notices: []
 	}
 
-	configuration: base.components.sinks.papertrail.configuration
+	configuration: generated.components.sinks.papertrail.configuration
 
 	input: {
 		logs:    true
diff --git a/website/cue/reference/components/sinks/postgres.cue b/website/cue/reference/components/sinks/postgres.cue
index a7e8f84d62b59..e2c4c68fd719d 100644
--- a/website/cue/reference/components/sinks/postgres.cue
+++ b/website/cue/reference/components/sinks/postgres.cue
@@ -59,7 +59,7 @@ components: sinks: postgres: {
 		notices: []
 	}
 
-	configuration: base.components.sinks.postgres.configuration
+	configuration: generated.components.sinks.postgres.configuration
 
 	input: {
 		logs: true
diff --git a/website/cue/reference/components/sinks/prometheus_exporter.cue b/website/cue/reference/components/sinks/prometheus_exporter.cue
index 15bf46418182a..c23a9b77771f5 100644
--- a/website/cue/reference/components/sinks/prometheus_exporter.cue
+++ b/website/cue/reference/components/sinks/prometheus_exporter.cue
@@ -58,7 +58,7 @@ components: sinks: prometheus_exporter: {
 		notices: []
 	}
 
-	configuration: base.components.sinks.prometheus_exporter.configuration
+	configuration: generated.components.sinks.prometheus_exporter.configuration
 
 	input: {
 		logs: false
diff --git a/website/cue/reference/components/sinks/prometheus_remote_write.cue b/website/cue/reference/components/sinks/prometheus_remote_write.cue
index fc16151370419..92904077b99d0 100644
--- a/website/cue/reference/components/sinks/prometheus_remote_write.cue
+++ b/website/cue/reference/components/sinks/prometheus_remote_write.cue
@@ -76,7 +76,7 @@ components: sinks: prometheus_remote_write: {
 		notices: []
 	}
 
-	configuration: base.components.sinks.prometheus_remote_write.configuration
+	configuration: generated.components.sinks.prometheus_remote_write.configuration
 
 	input: {
 		logs: false
diff --git a/website/cue/reference/components/sinks/pulsar.cue b/website/cue/reference/components/sinks/pulsar.cue
index 4170e5a6693e9..3bc31ede308c9 100644
--- a/website/cue/reference/components/sinks/pulsar.cue
+++ b/website/cue/reference/components/sinks/pulsar.cue
@@ -56,7 +56,7 @@ components: sinks: pulsar: {
 		notices: []
 	}
 
-	configuration: base.components.sinks.pulsar.configuration
+	configuration: generated.components.sinks.pulsar.configuration
 
 	input: {
 		logs: true
diff --git a/website/cue/reference/components/sinks/redis.cue b/website/cue/reference/components/sinks/redis.cue
index 0f44244498403..0ba92f88e56ea 100644
--- a/website/cue/reference/components/sinks/redis.cue
+++ b/website/cue/reference/components/sinks/redis.cue
@@ -55,7 +55,7 @@ components: sinks: redis: {
 		notices: []
 	}
 
-	configuration: base.components.sinks.redis.configuration
+	configuration: generated.components.sinks.redis.configuration
 
 	input: {
 		logs: true
diff --git a/website/cue/reference/components/sinks/sematext_logs.cue b/website/cue/reference/components/sinks/sematext_logs.cue
index ff6110beee3ce..52ec8da456cfb 100644
--- a/website/cue/reference/components/sinks/sematext_logs.cue
+++ b/website/cue/reference/components/sinks/sematext_logs.cue
@@ -44,7 +44,7 @@ components: sinks: sematext_logs: {
 		notices: []
 	}
 
-	configuration: base.components.sinks.sematext_logs.configuration
+	configuration: generated.components.sinks.sematext_logs.configuration
 
 	input: {
 		logs:    true
diff --git a/website/cue/reference/components/sinks/sematext_metrics.cue b/website/cue/reference/components/sinks/sematext_metrics.cue
index e5a8d8a24b3ad..a4e6ab8826ef5 100644
--- a/website/cue/reference/components/sinks/sematext_metrics.cue
+++ b/website/cue/reference/components/sinks/sematext_metrics.cue
@@ -48,7 +48,7 @@ components: sinks: sematext_metrics: {
 		notices: []
 	}
 
-	configuration: base.components.sinks.sematext_metrics.configuration
+	configuration: generated.components.sinks.sematext_metrics.configuration
 
 	input: {
 		logs: false
diff --git a/website/cue/reference/components/sinks/socket.cue b/website/cue/reference/components/sinks/socket.cue
index a256f609d9c80..7bd59d45c6037 100644
--- a/website/cue/reference/components/sinks/socket.cue
+++ b/website/cue/reference/components/sinks/socket.cue
@@ -59,7 +59,7 @@ components: sinks: socket: {
 		notices: []
 	}
 
-	configuration: base.components.sinks.socket.configuration
+	configuration: generated.components.sinks.socket.configuration
 
 	input: {
 		logs: true
diff --git a/website/cue/reference/components/sinks/splunk_hec_logs.cue b/website/cue/reference/components/sinks/splunk_hec_logs.cue
index 182a05dcfa13a..9a824eb7bcea3 100644
--- a/website/cue/reference/components/sinks/splunk_hec_logs.cue
+++ b/website/cue/reference/components/sinks/splunk_hec_logs.cue
@@ -73,7 +73,7 @@ components: sinks: splunk_hec_logs: {
 		notices: []
 	}
 
-	configuration: base.components.sinks.splunk_hec_logs.configuration
+	configuration: generated.components.sinks.splunk_hec_logs.configuration
 
 	input: {
 		logs:    true
diff --git a/website/cue/reference/components/sinks/splunk_hec_metrics.cue b/website/cue/reference/components/sinks/splunk_hec_metrics.cue
index d3657d51da24b..700775703b28f 100644
--- a/website/cue/reference/components/sinks/splunk_hec_metrics.cue
+++ b/website/cue/reference/components/sinks/splunk_hec_metrics.cue
@@ -66,7 +66,7 @@ components: sinks: splunk_hec_metrics: {
 		notices: []
 	}
 
-	configuration: base.components.sinks.splunk_hec_metrics.configuration
+	configuration: generated.components.sinks.splunk_hec_metrics.configuration
 
 	input: {
 		logs: false
diff --git a/website/cue/reference/components/sinks/statsd.cue b/website/cue/reference/components/sinks/statsd.cue
index 5d5678d6ab8a6..b67bb559fcc6c 100644
--- a/website/cue/reference/components/sinks/statsd.cue
+++ b/website/cue/reference/components/sinks/statsd.cue
@@ -47,5 +47,5 @@ components: sinks: statsd: {
 		traces: false
 	}
 
-	configuration: base.components.sinks.statsd.configuration
+	configuration: generated.components.sinks.statsd.configuration
 }
diff --git a/website/cue/reference/components/sinks/vector.cue b/website/cue/reference/components/sinks/vector.cue
index 4d10d75d53981..bcffbf3ba0114 100644
--- a/website/cue/reference/components/sinks/vector.cue
+++ b/website/cue/reference/components/sinks/vector.cue
@@ -76,7 +76,7 @@ components: sinks: vector: {
 		traces: true
 	}
 
-	configuration: base.components.sinks.vector.configuration
+	configuration: generated.components.sinks.vector.configuration
 
 	how_it_works: components.sinks.vector.how_it_works
 
diff --git a/website/cue/reference/components/sinks/webhdfs.cue b/website/cue/reference/components/sinks/webhdfs.cue
index be5604ef11378..2eaebd6986131 100644
--- a/website/cue/reference/components/sinks/webhdfs.cue
+++ b/website/cue/reference/components/sinks/webhdfs.cue
@@ -43,7 +43,7 @@ components: sinks: webhdfs: {
 		notices: []
 	}
 
-	configuration: base.components.sinks.webhdfs.configuration
+	configuration: generated.components.sinks.webhdfs.configuration
 
 	input: {
 		logs:    true
diff --git a/website/cue/reference/components/sinks/websocket.cue b/website/cue/reference/components/sinks/websocket.cue
index 873499e3b48dc..dc482deeae1fc 100644
--- a/website/cue/reference/components/sinks/websocket.cue
+++ b/website/cue/reference/components/sinks/websocket.cue
@@ -62,7 +62,7 @@ components: sinks: websocket: {
 		notices: []
 	}
 
-	configuration: base.components.sinks.websocket.configuration & {
+	configuration: generated.components.sinks.websocket.configuration & {
 		ping_timeout: warnings: ["This option is ignored if the `ping_interval` option is not set."]
 	}
 
diff --git a/website/cue/reference/components/sinks/websocket_server.cue b/website/cue/reference/components/sinks/websocket_server.cue
index da38e34288d1a..e8491e660d0b6 100644
--- a/website/cue/reference/components/sinks/websocket_server.cue
+++ b/website/cue/reference/components/sinks/websocket_server.cue
@@ -101,7 +101,7 @@ components: sinks: websocket_server: {
 		}
 	}
 
-	configuration: base.components.sinks.websocket_server.configuration
+	configuration: generated.components.sinks.websocket_server.configuration
 
 	how_it_works: {
 		simple_configuration: {
diff --git a/website/cue/reference/components/sources.cue b/website/cue/reference/components/sources.cue
index ae8b88f4d897a..69fcafd19ccf0 100644
--- a/website/cue/reference/components/sources.cue
+++ b/website/cue/reference/components/sources.cue
@@ -9,7 +9,7 @@ components: sources: [Name=string]: {
 		if features.collect != _|_ {
 			if features.collect.proxy != _|_ {
 				if features.collect.proxy.enabled {
-					proxy: base.components.sources.configuration.proxy
+					proxy: generated.components.sources.configuration.proxy
 				}
 			}
 		}
diff --git a/website/cue/reference/components/sources/amqp.cue b/website/cue/reference/components/sources/amqp.cue
index cfc469f543bbe..0838fbe8c22bd 100644
--- a/website/cue/reference/components/sources/amqp.cue
+++ b/website/cue/reference/components/sources/amqp.cue
@@ -42,7 +42,7 @@ components: sources: amqp: {
 		platform_name: null
 	}
 
-	configuration: base.components.sources.amqp.configuration
+	configuration: generated.components.sources.amqp.configuration
 
 	output: {
 		logs: record: {
diff --git a/website/cue/reference/components/sources/apache_metrics.cue b/website/cue/reference/components/sources/apache_metrics.cue
index 23544e92d5f10..ba8c79ca8b5aa 100644
--- a/website/cue/reference/components/sources/apache_metrics.cue
+++ b/website/cue/reference/components/sources/apache_metrics.cue
@@ -50,7 +50,7 @@ components: sources: apache_metrics: {
 		platform_name: null
 	}
 
-	configuration: base.components.sources.apache_metrics.configuration
+	configuration: generated.components.sources.apache_metrics.configuration
 
 	output: metrics: {
 		// Default Apache metrics tags
diff --git a/website/cue/reference/components/sources/aws_ecs_metrics.cue b/website/cue/reference/components/sources/aws_ecs_metrics.cue
index 781f7ba18a0b9..4bd4cac53efda 100644
--- a/website/cue/reference/components/sources/aws_ecs_metrics.cue
+++ b/website/cue/reference/components/sources/aws_ecs_metrics.cue
@@ -51,7 +51,7 @@ components: sources: aws_ecs_metrics: {
 		platform_name: null
 	}
 
-	configuration: base.components.sources.aws_ecs_metrics.configuration
+	configuration: generated.components.sources.aws_ecs_metrics.configuration
 
 	output: metrics: {
 		_awsecs: {
diff --git a/website/cue/reference/components/sources/aws_kinesis_firehose.cue b/website/cue/reference/components/sources/aws_kinesis_firehose.cue
index c912c4c17f449..8627af63deae2 100644
--- a/website/cue/reference/components/sources/aws_kinesis_firehose.cue
+++ b/website/cue/reference/components/sources/aws_kinesis_firehose.cue
@@ -58,7 +58,7 @@ components: sources: aws_kinesis_firehose: {
 		platform_name: null
 	}
 
-	configuration: base.components.sources.aws_kinesis_firehose.configuration
+	configuration: generated.components.sources.aws_kinesis_firehose.configuration
 
 	output: {
 		logs: {
diff --git a/website/cue/reference/components/sources/aws_s3.cue b/website/cue/reference/components/sources/aws_s3.cue
index d2f8db43fbcd0..1f5dc6775fcd2 100644
--- a/website/cue/reference/components/sources/aws_s3.cue
+++ b/website/cue/reference/components/sources/aws_s3.cue
@@ -45,7 +45,7 @@ components: sources: aws_s3: components._aws & {
 		platform_name: null
 	}
 
-	configuration: base.components.sources.aws_s3.configuration & {
+	configuration: generated.components.sources.aws_s3.configuration & {
 		_aws_include: false
 	}
 
diff --git a/website/cue/reference/components/sources/aws_sqs.cue b/website/cue/reference/components/sources/aws_sqs.cue
index ae6a53e32149e..23024f9b3f46d 100644
--- a/website/cue/reference/components/sources/aws_sqs.cue
+++ b/website/cue/reference/components/sources/aws_sqs.cue
@@ -54,7 +54,7 @@ components: sources: aws_sqs: components._aws & {
 		platform_name: null
 	}
 
-	configuration: base.components.sources.aws_sqs.configuration & {
+	configuration: generated.components.sources.aws_sqs.configuration & {
 		_aws_include: false
 	}
 
diff --git a/website/cue/reference/components/sources/base/unit_test.cue b/website/cue/reference/components/sources/base/unit_test.cue
deleted file mode 100644
index aacb80e6f4920..0000000000000
--- a/website/cue/reference/components/sources/base/unit_test.cue
+++ /dev/null
@@ -1,3 +0,0 @@
-package metadata
-
-base: components: sources: unit_test: configuration: {}
diff --git a/website/cue/reference/components/sources/base/unit_test_stream.cue b/website/cue/reference/components/sources/base/unit_test_stream.cue
deleted file mode 100644
index 202a10021c00f..0000000000000
--- a/website/cue/reference/components/sources/base/unit_test_stream.cue
+++ /dev/null
@@ -1,3 +0,0 @@
-package metadata
-
-base: components: sources: unit_test_stream: configuration: {}
diff --git a/website/cue/reference/components/sources/datadog_agent.cue b/website/cue/reference/components/sources/datadog_agent.cue
index 9dfb692b09158..96e841889ab2a 100644
--- a/website/cue/reference/components/sources/datadog_agent.cue
+++ b/website/cue/reference/components/sources/datadog_agent.cue
@@ -56,7 +56,7 @@ components: sources: datadog_agent: {
 		platform_name: null
 	}
 
-	configuration: base.components.sources.datadog_agent.configuration
+	configuration: generated.components.sources.datadog_agent.configuration
 
 	outputs: [
 		{
diff --git a/website/cue/reference/components/sources/demo_logs.cue b/website/cue/reference/components/sources/demo_logs.cue
index 5ad1811a3bebd..d58723b1782b6 100644
--- a/website/cue/reference/components/sources/demo_logs.cue
+++ b/website/cue/reference/components/sources/demo_logs.cue
@@ -39,7 +39,7 @@ components: sources: demo_logs: {
 		platform_name: null
 	}
 
-	configuration: base.components.sources.demo_logs.configuration
+	configuration: generated.components.sources.demo_logs.configuration
 
 	output: {
 		logs: line: {
diff --git a/website/cue/reference/components/sources/dnstap.cue b/website/cue/reference/components/sources/dnstap.cue
index 836f37ad78667..1854973c15ee6 100644
--- a/website/cue/reference/components/sources/dnstap.cue
+++ b/website/cue/reference/components/sources/dnstap.cue
@@ -51,7 +51,7 @@ components: sources: dnstap: {
 		notices: []
 	}
 
-	configuration: base.components.sources.dnstap.configuration & {
+	configuration: generated.components.sources.dnstap.configuration & {
 		socket_receive_buffer_size: {
 			warnings: [
 				"""
diff --git a/website/cue/reference/components/sources/docker_logs.cue b/website/cue/reference/components/sources/docker_logs.cue
index a280e9c58e455..c0a99b5160658 100644
--- a/website/cue/reference/components/sources/docker_logs.cue
+++ b/website/cue/reference/components/sources/docker_logs.cue
@@ -88,7 +88,7 @@ components: sources: docker_logs: {
 		platform_name: "docker"
 	}
 
-	configuration: base.components.sources.docker_logs.configuration
+	configuration: generated.components.sources.docker_logs.configuration
 
 	output: logs: {
 		log: {
diff --git a/website/cue/reference/components/sources/eventstoredb_metrics.cue b/website/cue/reference/components/sources/eventstoredb_metrics.cue
index d321c1c43495d..2df38e0f69115 100644
--- a/website/cue/reference/components/sources/eventstoredb_metrics.cue
+++ b/website/cue/reference/components/sources/eventstoredb_metrics.cue
@@ -44,7 +44,7 @@ components: sources: eventstoredb_metrics: {
 		platform_name: null
 	}
 
-	configuration: base.components.sources.eventstoredb_metrics.configuration
+	configuration: generated.components.sources.eventstoredb_metrics.configuration
 
 	output: metrics: {
 		_eventstoredb_metrics_tags: {
diff --git a/website/cue/reference/components/sources/exec.cue b/website/cue/reference/components/sources/exec.cue
index b0db5e0dae0d0..b00fcb71383db 100644
--- a/website/cue/reference/components/sources/exec.cue
+++ b/website/cue/reference/components/sources/exec.cue
@@ -39,7 +39,7 @@ components: sources: exec: {
 		platform_name: null
 	}
 
-	configuration: base.components.sources.exec.configuration
+	configuration: generated.components.sources.exec.configuration
 
 	output: {
 		logs: line: {
diff --git a/website/cue/reference/components/sources/file.cue b/website/cue/reference/components/sources/file.cue
index 00eb115dc3090..37724c605a5ed 100644
--- a/website/cue/reference/components/sources/file.cue
+++ b/website/cue/reference/components/sources/file.cue
@@ -48,7 +48,7 @@ components: sources: file: {
 		platform_name: null
 	}
 
-	configuration: base.components.sources.file.configuration & {
+	configuration: generated.components.sources.file.configuration & {
 		remove_after_secs: warnings: [
 			"""
 				Vector’s process must have permission to delete files.
diff --git a/website/cue/reference/components/sources/file_descriptor.cue b/website/cue/reference/components/sources/file_descriptor.cue
index 5a7e7ab1a79b6..19b910fdaa32a 100644
--- a/website/cue/reference/components/sources/file_descriptor.cue
+++ b/website/cue/reference/components/sources/file_descriptor.cue
@@ -40,7 +40,7 @@ components: sources: file_descriptor: {
 		platform_name: null
 	}
 
-	configuration: base.components.sources.file_descriptor.configuration
+	configuration: generated.components.sources.file_descriptor.configuration
 
 	output: {
 		logs: line: {
diff --git a/website/cue/reference/components/sources/fluent.cue b/website/cue/reference/components/sources/fluent.cue
index da7327a0e55c1..07c2ad5bfad3f 100644
--- a/website/cue/reference/components/sources/fluent.cue
+++ b/website/cue/reference/components/sources/fluent.cue
@@ -51,7 +51,7 @@ components: sources: fluent: {
 		platform_name: null
 	}
 
-	configuration: base.components.sources.fluent.configuration
+	configuration: generated.components.sources.fluent.configuration
 
 	output: logs: line: {
 		description: "A Fluent message"
diff --git a/website/cue/reference/components/sources/gcp_pubsub.cue b/website/cue/reference/components/sources/gcp_pubsub.cue
index 3ff488347179f..61bb6b75cc0e9 100644
--- a/website/cue/reference/components/sources/gcp_pubsub.cue
+++ b/website/cue/reference/components/sources/gcp_pubsub.cue
@@ -58,7 +58,7 @@ components: sources: gcp_pubsub: {
 		platform_name: null
 	}
 
-	configuration: base.components.sources.gcp_pubsub.configuration
+	configuration: generated.components.sources.gcp_pubsub.configuration
 
 	output: logs: record: {
 		description: "An individual Pub/Sub record"
diff --git a/website/cue/reference/components/sources/base/amqp.cue b/website/cue/reference/components/sources/generated/amqp.cue
similarity index 99%
rename from website/cue/reference/components/sources/base/amqp.cue
rename to website/cue/reference/components/sources/generated/amqp.cue
index 6e289aa9a5d24..77fcb7ef8f827 100644
--- a/website/cue/reference/components/sources/base/amqp.cue
+++ b/website/cue/reference/components/sources/generated/amqp.cue
@@ -1,6 +1,6 @@
 package metadata
 
-base: components: sources: amqp: configuration: {
+generated: components: sources: amqp: configuration: {
 	acknowledgements: {
 		deprecated: true
 		description: """
diff --git a/website/cue/reference/components/sources/base/apache_metrics.cue b/website/cue/reference/components/sources/generated/apache_metrics.cue
similarity index 89%
rename from website/cue/reference/components/sources/base/apache_metrics.cue
rename to website/cue/reference/components/sources/generated/apache_metrics.cue
index 23e4b2b5e4cea..63aba710db15f 100644
--- a/website/cue/reference/components/sources/base/apache_metrics.cue
+++ b/website/cue/reference/components/sources/generated/apache_metrics.cue
@@ -1,6 +1,6 @@
 package metadata
 
-base: components: sources: apache_metrics: configuration: {
+generated: components: sources: apache_metrics: configuration: {
 	endpoints: {
 		description: "The list of `mod_status` endpoints to scrape metrics from."
 		required:    true
diff --git a/website/cue/reference/components/sources/base/aws_ecs_metrics.cue b/website/cue/reference/components/sources/generated/aws_ecs_metrics.cue
similarity index 97%
rename from website/cue/reference/components/sources/base/aws_ecs_metrics.cue
rename to website/cue/reference/components/sources/generated/aws_ecs_metrics.cue
index 91231fb8e5144..30c34015871c5 100644
--- a/website/cue/reference/components/sources/base/aws_ecs_metrics.cue
+++ b/website/cue/reference/components/sources/generated/aws_ecs_metrics.cue
@@ -1,6 +1,6 @@
 package metadata
 
-base: components: sources: aws_ecs_metrics: configuration: {
+generated: components: sources: aws_ecs_metrics: configuration: {
 	endpoint: {
 		description: """
 			Base URI of the task metadata endpoint.
diff --git a/website/cue/reference/components/sources/base/aws_kinesis_firehose.cue b/website/cue/reference/components/sources/generated/aws_kinesis_firehose.cue
similarity index 99%
rename from website/cue/reference/components/sources/base/aws_kinesis_firehose.cue
rename to website/cue/reference/components/sources/generated/aws_kinesis_firehose.cue
index 9b3829b34f3e5..f5ae42f23a6c8 100644
--- a/website/cue/reference/components/sources/base/aws_kinesis_firehose.cue
+++ b/website/cue/reference/components/sources/generated/aws_kinesis_firehose.cue
@@ -1,6 +1,6 @@
 package metadata
 
-base: components: sources: aws_kinesis_firehose: configuration: {
+generated: components: sources: aws_kinesis_firehose: configuration: {
 	access_key: {
 		deprecated:         true
 		deprecated_message: "This option has been deprecated, use `access_keys` instead."
diff --git a/website/cue/reference/components/sources/base/aws_s3.cue b/website/cue/reference/components/sources/generated/aws_s3.cue
similarity index 99%
rename from website/cue/reference/components/sources/base/aws_s3.cue
rename to website/cue/reference/components/sources/generated/aws_s3.cue
index c7df2c33f0b78..c81349ced8630 100644
--- a/website/cue/reference/components/sources/base/aws_s3.cue
+++ b/website/cue/reference/components/sources/generated/aws_s3.cue
@@ -1,6 +1,6 @@
 package metadata
 
-base: components: sources: aws_s3: configuration: {
+generated: components: sources: aws_s3: configuration: {
 	acknowledgements: {
 		deprecated: true
 		description: """
diff --git a/website/cue/reference/components/sources/base/aws_sqs.cue b/website/cue/reference/components/sources/generated/aws_sqs.cue
similarity index 99%
rename from website/cue/reference/components/sources/base/aws_sqs.cue
rename to website/cue/reference/components/sources/generated/aws_sqs.cue
index 06fc149c49089..1b14843ee08ee 100644
--- a/website/cue/reference/components/sources/base/aws_sqs.cue
+++ b/website/cue/reference/components/sources/generated/aws_sqs.cue
@@ -1,6 +1,6 @@
 package metadata
 
-base: components: sources: aws_sqs: configuration: {
+generated: components: sources: aws_sqs: configuration: {
 	acknowledgements: {
 		deprecated: true
 		description: """
diff --git a/website/cue/reference/components/sources/base/datadog_agent.cue b/website/cue/reference/components/sources/generated/datadog_agent.cue
similarity index 99%
rename from website/cue/reference/components/sources/base/datadog_agent.cue
rename to website/cue/reference/components/sources/generated/datadog_agent.cue
index f0841cda68e73..b453750cf66d8 100644
--- a/website/cue/reference/components/sources/base/datadog_agent.cue
+++ b/website/cue/reference/components/sources/generated/datadog_agent.cue
@@ -1,6 +1,6 @@
 package metadata
 
-base: components: sources: datadog_agent: configuration: {
+generated: components: sources: datadog_agent: configuration: {
 	acknowledgements: {
 		deprecated: true
 		description: """
diff --git a/website/cue/reference/components/sources/base/demo_logs.cue b/website/cue/reference/components/sources/generated/demo_logs.cue
similarity index 99%
rename from website/cue/reference/components/sources/base/demo_logs.cue
rename to website/cue/reference/components/sources/generated/demo_logs.cue
index 7159f0bee338d..8bd26ed6d8dbc 100644
--- a/website/cue/reference/components/sources/base/demo_logs.cue
+++ b/website/cue/reference/components/sources/generated/demo_logs.cue
@@ -1,6 +1,6 @@
 package metadata
 
-base: components: sources: demo_logs: configuration: {
+generated: components: sources: demo_logs: configuration: {
 	count: {
 		description: """
 			The total number of lines to output.
diff --git a/website/cue/reference/components/sources/base/dnstap.cue b/website/cue/reference/components/sources/generated/dnstap.cue
similarity index 99%
rename from website/cue/reference/components/sources/base/dnstap.cue
rename to website/cue/reference/components/sources/generated/dnstap.cue
index 4b85ecd85191d..a1664c81dc535 100644
--- a/website/cue/reference/components/sources/base/dnstap.cue
+++ b/website/cue/reference/components/sources/generated/dnstap.cue
@@ -1,6 +1,6 @@
 package metadata
 
-base: components: sources: dnstap: configuration: {
+generated: components: sources: dnstap: configuration: {
 	address: {
 		description: """
 			The socket address to listen for connections on, or `systemd{#N}` to use the Nth socket passed by
diff --git a/website/cue/reference/components/sources/base/docker_logs.cue b/website/cue/reference/components/sources/generated/docker_logs.cue
similarity index 99%
rename from website/cue/reference/components/sources/base/docker_logs.cue
rename to website/cue/reference/components/sources/generated/docker_logs.cue
index 217754ee2ed84..21882bd7e14a3 100644
--- a/website/cue/reference/components/sources/base/docker_logs.cue
+++ b/website/cue/reference/components/sources/generated/docker_logs.cue
@@ -1,6 +1,6 @@
 package metadata
 
-base: components: sources: docker_logs: configuration: {
+generated: components: sources: docker_logs: configuration: {
 	auto_partial_merge: {
 		description: "Enables automatic merging of partial events."
 		required:    false
diff --git a/website/cue/reference/components/sources/base/eventstoredb_metrics.cue b/website/cue/reference/components/sources/generated/eventstoredb_metrics.cue
similarity index 89%
rename from website/cue/reference/components/sources/base/eventstoredb_metrics.cue
rename to website/cue/reference/components/sources/generated/eventstoredb_metrics.cue
index 336b624f03123..421a91ab5e074 100644
--- a/website/cue/reference/components/sources/base/eventstoredb_metrics.cue
+++ b/website/cue/reference/components/sources/generated/eventstoredb_metrics.cue
@@ -1,6 +1,6 @@
 package metadata
 
-base: components: sources: eventstoredb_metrics: configuration: {
+generated: components: sources: eventstoredb_metrics: configuration: {
 	default_namespace: {
 		description: """
 			Overrides the default namespace for the metrics emitted by the source.
diff --git a/website/cue/reference/components/sources/base/exec.cue b/website/cue/reference/components/sources/generated/exec.cue
similarity index 99%
rename from website/cue/reference/components/sources/base/exec.cue
rename to website/cue/reference/components/sources/generated/exec.cue
index 26515eafb22a1..a933cd395621e 100644
--- a/website/cue/reference/components/sources/base/exec.cue
+++ b/website/cue/reference/components/sources/generated/exec.cue
@@ -1,6 +1,6 @@
 package metadata
 
-base: components: sources: exec: configuration: {
+generated: components: sources: exec: configuration: {
 	clear_environment: {
 		description: "Whether or not to clear the environment before setting custom environment variables."
 		required:    false
diff --git a/website/cue/reference/components/sources/base/file.cue b/website/cue/reference/components/sources/generated/file.cue
similarity index 99%
rename from website/cue/reference/components/sources/base/file.cue
rename to website/cue/reference/components/sources/generated/file.cue
index 2e5faa30908de..4c87743d84b0f 100644
--- a/website/cue/reference/components/sources/base/file.cue
+++ b/website/cue/reference/components/sources/generated/file.cue
@@ -1,6 +1,6 @@
 package metadata
 
-base: components: sources: file: configuration: {
+generated: components: sources: file: configuration: {
 	acknowledgements: {
 		deprecated: true
 		description: """
diff --git a/website/cue/reference/components/sources/base/file_descriptor.cue b/website/cue/reference/components/sources/generated/file_descriptor.cue
similarity index 99%
rename from website/cue/reference/components/sources/base/file_descriptor.cue
rename to website/cue/reference/components/sources/generated/file_descriptor.cue
index 1c12758efe2b0..ddc721b8a96e3 100644
--- a/website/cue/reference/components/sources/base/file_descriptor.cue
+++ b/website/cue/reference/components/sources/generated/file_descriptor.cue
@@ -1,6 +1,6 @@
 package metadata
 
-base: components: sources: file_descriptor: configuration: {
+generated: components: sources: file_descriptor: configuration: {
 	decoding: {
 		description: """
 			Configures how events are decoded from raw bytes. Note some decoders can also determine the event output
diff --git a/website/cue/reference/components/sources/base/fluent.cue b/website/cue/reference/components/sources/generated/fluent.cue
similarity index 99%
rename from website/cue/reference/components/sources/base/fluent.cue
rename to website/cue/reference/components/sources/generated/fluent.cue
index 91fb0cabbafe8..2219b9309c7a7 100644
--- a/website/cue/reference/components/sources/base/fluent.cue
+++ b/website/cue/reference/components/sources/generated/fluent.cue
@@ -1,6 +1,6 @@
 package metadata
 
-base: components: sources: fluent: configuration: {
+generated: components: sources: fluent: configuration: {
 	acknowledgements: {
 		deprecated: true
 		description: """
diff --git a/website/cue/reference/components/sources/base/gcp_pubsub.cue b/website/cue/reference/components/sources/generated/gcp_pubsub.cue
similarity index 99%
rename from website/cue/reference/components/sources/base/gcp_pubsub.cue
rename to website/cue/reference/components/sources/generated/gcp_pubsub.cue
index 1ccc9839fe1ad..6c7e395f45ded 100644
--- a/website/cue/reference/components/sources/base/gcp_pubsub.cue
+++ b/website/cue/reference/components/sources/generated/gcp_pubsub.cue
@@ -1,6 +1,6 @@
 package metadata
 
-base: components: sources: gcp_pubsub: configuration: {
+generated: components: sources: gcp_pubsub: configuration: {
 	ack_deadline_seconds: {
 		deprecated:         true
 		deprecated_message: "This option has been deprecated, use `ack_deadline_secs` instead."
diff --git a/website/cue/reference/components/sources/base/heroku_logs.cue b/website/cue/reference/components/sources/generated/heroku_logs.cue
similarity index 99%
rename from website/cue/reference/components/sources/base/heroku_logs.cue
rename to website/cue/reference/components/sources/generated/heroku_logs.cue
index c0c637e403a86..830143949c279 100644
--- a/website/cue/reference/components/sources/base/heroku_logs.cue
+++ b/website/cue/reference/components/sources/generated/heroku_logs.cue
@@ -1,6 +1,6 @@
 package metadata
 
-base: components: sources: heroku_logs: configuration: {
+generated: components: sources: heroku_logs: configuration: {
 	acknowledgements: {
 		deprecated: true
 		description: """
diff --git a/website/cue/reference/components/sources/base/host_metrics.cue b/website/cue/reference/components/sources/generated/host_metrics.cue
similarity index 99%
rename from website/cue/reference/components/sources/base/host_metrics.cue
rename to website/cue/reference/components/sources/generated/host_metrics.cue
index 35fa29c8138c9..64ab2d676ed4d 100644
--- a/website/cue/reference/components/sources/base/host_metrics.cue
+++ b/website/cue/reference/components/sources/generated/host_metrics.cue
@@ -1,6 +1,6 @@
 package metadata
 
-base: components: sources: host_metrics: configuration: {
+generated: components: sources: host_metrics: configuration: {
 	cgroups: {
 		description: """
 			Options for the cgroups (controller groups) metrics collector.
diff --git a/website/cue/reference/components/sources/base/http.cue b/website/cue/reference/components/sources/generated/http.cue
similarity index 99%
rename from website/cue/reference/components/sources/base/http.cue
rename to website/cue/reference/components/sources/generated/http.cue
index a2e999c593997..0f88f04044236 100644
--- a/website/cue/reference/components/sources/base/http.cue
+++ b/website/cue/reference/components/sources/generated/http.cue
@@ -1,6 +1,6 @@
 package metadata
 
-base: components: sources: http: configuration: {
+generated: components: sources: http: configuration: {
 	acknowledgements: {
 		deprecated: true
 		description: """
diff --git a/website/cue/reference/components/sources/base/http_client.cue b/website/cue/reference/components/sources/generated/http_client.cue
similarity index 99%
rename from website/cue/reference/components/sources/base/http_client.cue
rename to website/cue/reference/components/sources/generated/http_client.cue
index f42de4f7e9d79..c564a7365e0aa 100644
--- a/website/cue/reference/components/sources/base/http_client.cue
+++ b/website/cue/reference/components/sources/generated/http_client.cue
@@ -1,6 +1,6 @@
 package metadata
 
-base: components: sources: http_client: configuration: {
+generated: components: sources: http_client: configuration: {
 	auth: {
 		description: "HTTP Authentication."
 		required:    false
diff --git a/website/cue/reference/components/sources/base/http_server.cue b/website/cue/reference/components/sources/generated/http_server.cue
similarity index 99%
rename from website/cue/reference/components/sources/base/http_server.cue
rename to website/cue/reference/components/sources/generated/http_server.cue
index 2f6b38c904c23..00e973da362c1 100644
--- a/website/cue/reference/components/sources/base/http_server.cue
+++ b/website/cue/reference/components/sources/generated/http_server.cue
@@ -1,6 +1,6 @@
 package metadata
 
-base: components: sources: http_server: configuration: {
+generated: components: sources: http_server: configuration: {
 	acknowledgements: {
 		deprecated: true
 		description: """
diff --git a/website/cue/reference/components/sources/base/internal_logs.cue b/website/cue/reference/components/sources/generated/internal_logs.cue
similarity index 91%
rename from website/cue/reference/components/sources/base/internal_logs.cue
rename to website/cue/reference/components/sources/generated/internal_logs.cue
index ca3efad691312..f8bbda59b7ef9 100644
--- a/website/cue/reference/components/sources/base/internal_logs.cue
+++ b/website/cue/reference/components/sources/generated/internal_logs.cue
@@ -1,6 +1,6 @@
 package metadata
 
-base: components: sources: internal_logs: configuration: {
+generated: components: sources: internal_logs: configuration: {
 	host_key: {
 		description: """
 			Overrides the name of the log field used to add the current hostname to each event.
diff --git a/website/cue/reference/components/sources/base/internal_metrics.cue b/website/cue/reference/components/sources/generated/internal_metrics.cue
similarity index 94%
rename from website/cue/reference/components/sources/base/internal_metrics.cue
rename to website/cue/reference/components/sources/generated/internal_metrics.cue
index c3ea866b73351..ca5fddecb6056 100644
--- a/website/cue/reference/components/sources/base/internal_metrics.cue
+++ b/website/cue/reference/components/sources/generated/internal_metrics.cue
@@ -1,6 +1,6 @@
 package metadata
 
-base: components: sources: internal_metrics: configuration: {
+generated: components: sources: internal_metrics: configuration: {
 	namespace: {
 		description: "Overrides the default namespace for the metrics emitted by the source."
 		required:    false
diff --git a/website/cue/reference/components/sources/base/journald.cue b/website/cue/reference/components/sources/generated/journald.cue
similarity index 98%
rename from website/cue/reference/components/sources/base/journald.cue
rename to website/cue/reference/components/sources/generated/journald.cue
index c30f388465632..d33c8505f3fd2 100644
--- a/website/cue/reference/components/sources/base/journald.cue
+++ b/website/cue/reference/components/sources/generated/journald.cue
@@ -1,6 +1,6 @@
 package metadata
 
-base: components: sources: journald: configuration: {
+generated: components: sources: journald: configuration: {
 	acknowledgements: {
 		deprecated: true
 		description: """
diff --git a/website/cue/reference/components/sources/base/kafka.cue b/website/cue/reference/components/sources/generated/kafka.cue
similarity index 99%
rename from website/cue/reference/components/sources/base/kafka.cue
rename to website/cue/reference/components/sources/generated/kafka.cue
index e780a1eb06829..1aed17b904acc 100644
--- a/website/cue/reference/components/sources/base/kafka.cue
+++ b/website/cue/reference/components/sources/generated/kafka.cue
@@ -1,6 +1,6 @@
 package metadata
 
-base: components: sources: kafka: configuration: {
+generated: components: sources: kafka: configuration: {
 	acknowledgements: {
 		deprecated: true
 		description: """
diff --git a/website/cue/reference/components/sources/base/kubernetes_logs.cue b/website/cue/reference/components/sources/generated/kubernetes_logs.cue
similarity index 99%
rename from website/cue/reference/components/sources/base/kubernetes_logs.cue
rename to website/cue/reference/components/sources/generated/kubernetes_logs.cue
index f07e3b317e5a0..459a70a9287be 100644
--- a/website/cue/reference/components/sources/base/kubernetes_logs.cue
+++ b/website/cue/reference/components/sources/generated/kubernetes_logs.cue
@@ -1,6 +1,6 @@
 package metadata
 
-base: components: sources: kubernetes_logs: configuration: {
+generated: components: sources: kubernetes_logs: configuration: {
 	auto_partial_merge: {
 		description: """
 			Whether or not to automatically merge partial events.
diff --git a/website/cue/reference/components/sources/base/logstash.cue b/website/cue/reference/components/sources/generated/logstash.cue
similarity index 99%
rename from website/cue/reference/components/sources/base/logstash.cue
rename to website/cue/reference/components/sources/generated/logstash.cue
index 02cae1e7e675e..9964e4eb12eb0 100644
--- a/website/cue/reference/components/sources/base/logstash.cue
+++ b/website/cue/reference/components/sources/generated/logstash.cue
@@ -1,6 +1,6 @@
 package metadata
 
-base: components: sources: logstash: configuration: {
+generated: components: sources: logstash: configuration: {
 	acknowledgements: {
 		deprecated: true
 		description: """
diff --git a/website/cue/reference/components/sources/base/mongodb_metrics.cue b/website/cue/reference/components/sources/generated/mongodb_metrics.cue
similarity index 92%
rename from website/cue/reference/components/sources/base/mongodb_metrics.cue
rename to website/cue/reference/components/sources/generated/mongodb_metrics.cue
index f6881237d551c..d168961a84c0c 100644
--- a/website/cue/reference/components/sources/base/mongodb_metrics.cue
+++ b/website/cue/reference/components/sources/generated/mongodb_metrics.cue
@@ -1,6 +1,6 @@
 package metadata
 
-base: components: sources: mongodb_metrics: configuration: {
+generated: components: sources: mongodb_metrics: configuration: {
 	endpoints: {
 		description: """
 			A list of MongoDB instances to scrape.
diff --git a/website/cue/reference/components/sources/base/mqtt.cue b/website/cue/reference/components/sources/generated/mqtt.cue
similarity index 99%
rename from website/cue/reference/components/sources/base/mqtt.cue
rename to website/cue/reference/components/sources/generated/mqtt.cue
index dacce79d0337f..52daf10a5d1e2 100644
--- a/website/cue/reference/components/sources/base/mqtt.cue
+++ b/website/cue/reference/components/sources/generated/mqtt.cue
@@ -1,6 +1,6 @@
 package metadata
 
-base: components: sources: mqtt: configuration: {
+generated: components: sources: mqtt: configuration: {
 	client_id: {
 		description: "MQTT client ID."
 		required:    false
diff --git a/website/cue/reference/components/sources/base/nats.cue b/website/cue/reference/components/sources/generated/nats.cue
similarity index 99%
rename from website/cue/reference/components/sources/base/nats.cue
rename to website/cue/reference/components/sources/generated/nats.cue
index 2b059503d7b56..251aa17e87c7a 100644
--- a/website/cue/reference/components/sources/base/nats.cue
+++ b/website/cue/reference/components/sources/generated/nats.cue
@@ -1,6 +1,6 @@
 package metadata
 
-base: components: sources: nats: configuration: {
+generated: components: sources: nats: configuration: {
 	auth: {
 		description: "Configuration of the authentication strategy when interacting with NATS."
 		required:    false
diff --git a/website/cue/reference/components/sources/base/nginx_metrics.cue b/website/cue/reference/components/sources/generated/nginx_metrics.cue
similarity index 99%
rename from website/cue/reference/components/sources/base/nginx_metrics.cue
rename to website/cue/reference/components/sources/generated/nginx_metrics.cue
index 12cb35c733faf..775a0b75a845e 100644
--- a/website/cue/reference/components/sources/base/nginx_metrics.cue
+++ b/website/cue/reference/components/sources/generated/nginx_metrics.cue
@@ -1,6 +1,6 @@
 package metadata
 
-base: components: sources: nginx_metrics: configuration: {
+generated: components: sources: nginx_metrics: configuration: {
 	auth: {
 		description: """
 			Configuration of the authentication strategy for HTTP requests.
diff --git a/website/cue/reference/components/sources/base/opentelemetry.cue b/website/cue/reference/components/sources/generated/opentelemetry.cue
similarity index 99%
rename from website/cue/reference/components/sources/base/opentelemetry.cue
rename to website/cue/reference/components/sources/generated/opentelemetry.cue
index 546e5bc743272..9316a4c0764c7 100644
--- a/website/cue/reference/components/sources/base/opentelemetry.cue
+++ b/website/cue/reference/components/sources/generated/opentelemetry.cue
@@ -1,6 +1,6 @@
 package metadata
 
-base: components: sources: opentelemetry: configuration: {
+generated: components: sources: opentelemetry: configuration: {
 	acknowledgements: {
 		deprecated: true
 		description: """
diff --git a/website/cue/reference/components/sources/base/postgresql_metrics.cue b/website/cue/reference/components/sources/generated/postgresql_metrics.cue
similarity index 96%
rename from website/cue/reference/components/sources/base/postgresql_metrics.cue
rename to website/cue/reference/components/sources/generated/postgresql_metrics.cue
index 932b2d8fce36e..f3611315496ae 100644
--- a/website/cue/reference/components/sources/base/postgresql_metrics.cue
+++ b/website/cue/reference/components/sources/generated/postgresql_metrics.cue
@@ -1,6 +1,6 @@
 package metadata
 
-base: components: sources: postgresql_metrics: configuration: {
+generated: components: sources: postgresql_metrics: configuration: {
 	endpoints: {
 		description: """
 			A list of PostgreSQL instances to scrape.
diff --git a/website/cue/reference/components/sources/base/prometheus_pushgateway.cue b/website/cue/reference/components/sources/generated/prometheus_pushgateway.cue
similarity index 99%
rename from website/cue/reference/components/sources/base/prometheus_pushgateway.cue
rename to website/cue/reference/components/sources/generated/prometheus_pushgateway.cue
index 84453af371613..e0026cb0bd52e 100644
--- a/website/cue/reference/components/sources/base/prometheus_pushgateway.cue
+++ b/website/cue/reference/components/sources/generated/prometheus_pushgateway.cue
@@ -1,6 +1,6 @@
 package metadata
 
-base: components: sources: prometheus_pushgateway: configuration: {
+generated: components: sources: prometheus_pushgateway: configuration: {
 	acknowledgements: {
 		deprecated: true
 		description: """
diff --git a/website/cue/reference/components/sources/base/prometheus_remote_write.cue b/website/cue/reference/components/sources/generated/prometheus_remote_write.cue
similarity index 98%
rename from website/cue/reference/components/sources/base/prometheus_remote_write.cue
rename to website/cue/reference/components/sources/generated/prometheus_remote_write.cue
index eebd362a70f3c..b384c2426d2cf 100644
--- a/website/cue/reference/components/sources/base/prometheus_remote_write.cue
+++ b/website/cue/reference/components/sources/generated/prometheus_remote_write.cue
@@ -1,6 +1,6 @@
 package metadata
 
-base: components: sources: prometheus_remote_write: configuration: {
+generated: components: sources: prometheus_remote_write: configuration: {
 	acknowledgements: {
 		deprecated: true
 		description: """
diff --git a/website/cue/reference/components/sources/base/prometheus_scrape.cue b/website/cue/reference/components/sources/generated/prometheus_scrape.cue
similarity index 99%
rename from website/cue/reference/components/sources/base/prometheus_scrape.cue
rename to website/cue/reference/components/sources/generated/prometheus_scrape.cue
index 83ddc70bd7fe8..938fb4c34294c 100644
--- a/website/cue/reference/components/sources/base/prometheus_scrape.cue
+++ b/website/cue/reference/components/sources/generated/prometheus_scrape.cue
@@ -1,6 +1,6 @@
 package metadata
 
-base: components: sources: prometheus_scrape: configuration: {
+generated: components: sources: prometheus_scrape: configuration: {
 	auth: {
 		description: """
 			Configuration of the authentication strategy for HTTP requests.
diff --git a/website/cue/reference/components/sources/base/pulsar.cue b/website/cue/reference/components/sources/generated/pulsar.cue
similarity index 99%
rename from website/cue/reference/components/sources/base/pulsar.cue
rename to website/cue/reference/components/sources/generated/pulsar.cue
index 5f0f2df862f03..467c3de709dea 100644
--- a/website/cue/reference/components/sources/base/pulsar.cue
+++ b/website/cue/reference/components/sources/generated/pulsar.cue
@@ -1,6 +1,6 @@
 package metadata
 
-base: components: sources: pulsar: configuration: {
+generated: components: sources: pulsar: configuration: {
 	acknowledgements: {
 		deprecated: true
 		description: """
diff --git a/website/cue/reference/components/sources/base/redis.cue b/website/cue/reference/components/sources/generated/redis.cue
similarity index 99%
rename from website/cue/reference/components/sources/base/redis.cue
rename to website/cue/reference/components/sources/generated/redis.cue
index 2a513cd06e927..567435f06bdc6 100644
--- a/website/cue/reference/components/sources/base/redis.cue
+++ b/website/cue/reference/components/sources/generated/redis.cue
@@ -1,6 +1,6 @@
 package metadata
 
-base: components: sources: redis: configuration: {
+generated: components: sources: redis: configuration: {
 	data_type: {
 		description: "The Redis data type (`list` or `channel`) to use."
 		required:    false
diff --git a/website/cue/reference/components/sources/base/socket.cue b/website/cue/reference/components/sources/generated/socket.cue
similarity index 99%
rename from website/cue/reference/components/sources/base/socket.cue
rename to website/cue/reference/components/sources/generated/socket.cue
index ae004d971f85d..b7482c3ea3b86 100644
--- a/website/cue/reference/components/sources/base/socket.cue
+++ b/website/cue/reference/components/sources/generated/socket.cue
@@ -1,6 +1,6 @@
 package metadata
 
-base: components: sources: socket: configuration: {
+generated: components: sources: socket: configuration: {
 	address: {
 		description: """
 			The socket address to listen for connections on, or `systemd{#N}` to use the Nth socket passed by
diff --git a/website/cue/reference/components/sources/base/splunk_hec.cue b/website/cue/reference/components/sources/generated/splunk_hec.cue
similarity index 99%
rename from website/cue/reference/components/sources/base/splunk_hec.cue
rename to website/cue/reference/components/sources/generated/splunk_hec.cue
index e03fd2d1acc51..9424e44213ea9 100644
--- a/website/cue/reference/components/sources/base/splunk_hec.cue
+++ b/website/cue/reference/components/sources/generated/splunk_hec.cue
@@ -1,6 +1,6 @@
 package metadata
 
-base: components: sources: splunk_hec: configuration: {
+generated: components: sources: splunk_hec: configuration: {
 	acknowledgements: {
 		description: "Acknowledgement configuration for the `splunk_hec` source."
 		required:    false
diff --git a/website/cue/reference/components/sources/base/static_metrics.cue b/website/cue/reference/components/sources/generated/static_metrics.cue
similarity index 99%
rename from website/cue/reference/components/sources/base/static_metrics.cue
rename to website/cue/reference/components/sources/generated/static_metrics.cue
index 78f34bfb1a5d3..f8a348430e87a 100644
--- a/website/cue/reference/components/sources/base/static_metrics.cue
+++ b/website/cue/reference/components/sources/generated/static_metrics.cue
@@ -1,6 +1,6 @@
 package metadata
 
-base: components: sources: static_metrics: configuration: {
+generated: components: sources: static_metrics: configuration: {
 	interval_secs: {
 		description: "The interval between metric emitting, in seconds."
 		required:    false
diff --git a/website/cue/reference/components/sources/base/statsd.cue b/website/cue/reference/components/sources/generated/statsd.cue
similarity index 99%
rename from website/cue/reference/components/sources/base/statsd.cue
rename to website/cue/reference/components/sources/generated/statsd.cue
index 789eb36fae77f..4e80208630c11 100644
--- a/website/cue/reference/components/sources/base/statsd.cue
+++ b/website/cue/reference/components/sources/generated/statsd.cue
@@ -1,6 +1,6 @@
 package metadata
 
-base: components: sources: statsd: configuration: {
+generated: components: sources: statsd: configuration: {
 	address: {
 		description: """
 			The socket address to listen for connections on, or `systemd{#N}` to use the Nth socket passed by
diff --git a/website/cue/reference/components/sources/base/stdin.cue b/website/cue/reference/components/sources/generated/stdin.cue
similarity index 99%
rename from website/cue/reference/components/sources/base/stdin.cue
rename to website/cue/reference/components/sources/generated/stdin.cue
index ae907df2af46f..104eed5b39ad6 100644
--- a/website/cue/reference/components/sources/base/stdin.cue
+++ b/website/cue/reference/components/sources/generated/stdin.cue
@@ -1,6 +1,6 @@
 package metadata
 
-base: components: sources: stdin: configuration: {
+generated: components: sources: stdin: configuration: {
 	decoding: {
 		description: """
 			Configures how events are decoded from raw bytes. Note some decoders can also determine the event output
diff --git a/website/cue/reference/components/sources/base/syslog.cue b/website/cue/reference/components/sources/generated/syslog.cue
similarity index 99%
rename from website/cue/reference/components/sources/base/syslog.cue
rename to website/cue/reference/components/sources/generated/syslog.cue
index 830ec743a8419..09ce0d7d4ba38 100644
--- a/website/cue/reference/components/sources/base/syslog.cue
+++ b/website/cue/reference/components/sources/generated/syslog.cue
@@ -1,6 +1,6 @@
 package metadata
 
-base: components: sources: syslog: configuration: {
+generated: components: sources: syslog: configuration: {
 	address: {
 		description: """
 			The socket address to listen for connections on, or `systemd{#N}` to use the Nth socket passed by
diff --git a/website/cue/reference/components/sources/generated/unit_test.cue b/website/cue/reference/components/sources/generated/unit_test.cue
new file mode 100644
index 0000000000000..2a0980dfc5a98
--- /dev/null
+++ b/website/cue/reference/components/sources/generated/unit_test.cue
@@ -0,0 +1,3 @@
+package metadata
+
+generated: components: sources: unit_test: configuration: {}
diff --git a/website/cue/reference/components/sources/generated/unit_test_stream.cue b/website/cue/reference/components/sources/generated/unit_test_stream.cue
new file mode 100644
index 0000000000000..8a84d245f2e5c
--- /dev/null
+++ b/website/cue/reference/components/sources/generated/unit_test_stream.cue
@@ -0,0 +1,3 @@
+package metadata
+
+generated: components: sources: unit_test_stream: configuration: {}
diff --git a/website/cue/reference/components/sources/base/vector.cue b/website/cue/reference/components/sources/generated/vector.cue
similarity index 98%
rename from website/cue/reference/components/sources/base/vector.cue
rename to website/cue/reference/components/sources/generated/vector.cue
index 7e5d8a6947d4e..239357a91ffd7 100644
--- a/website/cue/reference/components/sources/base/vector.cue
+++ b/website/cue/reference/components/sources/generated/vector.cue
@@ -1,6 +1,6 @@
 package metadata
 
-base: components: sources: vector: configuration: {
+generated: components: sources: vector: configuration: {
 	acknowledgements: {
 		deprecated: true
 		description: """
diff --git a/website/cue/reference/components/sources/heroku_logs.cue b/website/cue/reference/components/sources/heroku_logs.cue
index 40276a18ae1cf..0321436a98da2 100644
--- a/website/cue/reference/components/sources/heroku_logs.cue
+++ b/website/cue/reference/components/sources/heroku_logs.cue
@@ -63,7 +63,7 @@ components: sources: heroku_logs: {
 		platform_name: null
 	}
 
-	configuration: base.components.sources.heroku_logs.configuration
+	configuration: generated.components.sources.heroku_logs.configuration
 
 	output: logs: line: {
 		description: "An individual event from a batch of events received through an HTTP POST request."
diff --git a/website/cue/reference/components/sources/host_metrics.cue b/website/cue/reference/components/sources/host_metrics.cue
index c92894b441bb2..377d02b3d0ba9 100644
--- a/website/cue/reference/components/sources/host_metrics.cue
+++ b/website/cue/reference/components/sources/host_metrics.cue
@@ -66,7 +66,7 @@ components: sources: host_metrics: {
 		}
 	}
 
-	configuration: base.components.sources.host_metrics.configuration
+	configuration: generated.components.sources.host_metrics.configuration
 
 	output: metrics: {
 		_host_metrics_tags: {
diff --git a/website/cue/reference/components/sources/http_client.cue b/website/cue/reference/components/sources/http_client.cue
index fa14ba24280d0..f92569e485555 100644
--- a/website/cue/reference/components/sources/http_client.cue
+++ b/website/cue/reference/components/sources/http_client.cue
@@ -52,7 +52,7 @@ components: sources: http_client: {
 		platform_name: null
 	}
 
-	configuration: base.components.sources.http_client.configuration & {
+	configuration: generated.components.sources.http_client.configuration & {
 		endpoint: warnings: ["You must explicitly add the path to your endpoint."]
 	}
 
diff --git a/website/cue/reference/components/sources/http_server.cue b/website/cue/reference/components/sources/http_server.cue
index 15228e6de6b1c..b5628306cb8a0 100644
--- a/website/cue/reference/components/sources/http_server.cue
+++ b/website/cue/reference/components/sources/http_server.cue
@@ -56,7 +56,7 @@ components: sources: http_server: {
 		platform_name: null
 	}
 
-	configuration: base.components.sources.http_server.configuration
+	configuration: generated.components.sources.http_server.configuration
 
 	output: {
 		logs: {
diff --git a/website/cue/reference/components/sources/internal_logs.cue b/website/cue/reference/components/sources/internal_logs.cue
index 632267111583d..24369f81cfe47 100644
--- a/website/cue/reference/components/sources/internal_logs.cue
+++ b/website/cue/reference/components/sources/internal_logs.cue
@@ -37,7 +37,7 @@ components: sources: internal_logs: {
 		platform_name: null
 	}
 
-	configuration: base.components.sources.internal_logs.configuration
+	configuration: generated.components.sources.internal_logs.configuration
 
 	output: logs: line: {
 		description: "An individual log or trace message."
diff --git a/website/cue/reference/components/sources/internal_metrics.cue b/website/cue/reference/components/sources/internal_metrics.cue
index a2d2a2f0da5e7..27562b23b7d3b 100644
--- a/website/cue/reference/components/sources/internal_metrics.cue
+++ b/website/cue/reference/components/sources/internal_metrics.cue
@@ -36,7 +36,7 @@ components: sources: internal_metrics: {
 		platform_name: null
 	}
 
-	configuration: base.components.sources.internal_metrics.configuration
+	configuration: generated.components.sources.internal_metrics.configuration
 
 	output: metrics: {
 		// Default internal metrics tags
diff --git a/website/cue/reference/components/sources/journald.cue b/website/cue/reference/components/sources/journald.cue
index 57db4cfccbff3..0c7b326e925fc 100644
--- a/website/cue/reference/components/sources/journald.cue
+++ b/website/cue/reference/components/sources/journald.cue
@@ -49,7 +49,7 @@ components: sources: journald: {
 		platform_name: null
 	}
 
-	configuration: base.components.sources.journald.configuration
+	configuration: generated.components.sources.journald.configuration
 
 	output: logs: {
 		event: {
diff --git a/website/cue/reference/components/sources/kafka.cue b/website/cue/reference/components/sources/kafka.cue
index f00e4cdcb4997..7126aa8b0df5e 100644
--- a/website/cue/reference/components/sources/kafka.cue
+++ b/website/cue/reference/components/sources/kafka.cue
@@ -39,7 +39,7 @@ components: sources: kafka: {
 		platform_name: null
 	}
 
-	configuration: base.components.sources.kafka.configuration
+	configuration: generated.components.sources.kafka.configuration
 
 	output: {
 		logs: record: {
diff --git a/website/cue/reference/components/sources/kubernetes_logs.cue b/website/cue/reference/components/sources/kubernetes_logs.cue
index fd19f4aa19472..10e505b4a1647 100644
--- a/website/cue/reference/components/sources/kubernetes_logs.cue
+++ b/website/cue/reference/components/sources/kubernetes_logs.cue
@@ -57,7 +57,7 @@ components: sources: kubernetes_logs: {
 		platform_name: "kubernetes"
 	}
 
-	configuration: base.components.sources.kubernetes_logs.configuration
+	configuration: generated.components.sources.kubernetes_logs.configuration
 
 	output: logs: line: {
 		description: "An individual line from a `Pod` log file."
diff --git a/website/cue/reference/components/sources/logstash.cue b/website/cue/reference/components/sources/logstash.cue
index c9c38500863c6..3be43a264cca8 100644
--- a/website/cue/reference/components/sources/logstash.cue
+++ b/website/cue/reference/components/sources/logstash.cue
@@ -51,7 +51,7 @@ components: sources: logstash: {
 		platform_name: null
 	}
 
-	configuration: base.components.sources.logstash.configuration
+	configuration: generated.components.sources.logstash.configuration
 
 	output: logs: line: {
 		description: "A Logstash message"
diff --git a/website/cue/reference/components/sources/mongodb_metrics.cue b/website/cue/reference/components/sources/mongodb_metrics.cue
index 115d33e988bdb..40c9e10218b35 100644
--- a/website/cue/reference/components/sources/mongodb_metrics.cue
+++ b/website/cue/reference/components/sources/mongodb_metrics.cue
@@ -51,7 +51,7 @@ components: sources: mongodb_metrics: {
 		platform_name: null
 	}
 
-	configuration: base.components.sources.mongodb_metrics.configuration
+	configuration: generated.components.sources.mongodb_metrics.configuration
 
 	how_it_works: {
 		mod_status: {
diff --git a/website/cue/reference/components/sources/mqtt.cue b/website/cue/reference/components/sources/mqtt.cue
index 0a057cc71b7bb..0884dc25e57cc 100644
--- a/website/cue/reference/components/sources/mqtt.cue
+++ b/website/cue/reference/components/sources/mqtt.cue
@@ -52,7 +52,7 @@ components: sources: mqtt: {
 		notices: []
 	}
 
-	configuration: base.components.sources.mqtt.configuration
+	configuration: generated.components.sources.mqtt.configuration
 
 	installation: {
 		platform_name: null
diff --git a/website/cue/reference/components/sources/nats.cue b/website/cue/reference/components/sources/nats.cue
index 5f7b58cf1169b..829f305419529 100644
--- a/website/cue/reference/components/sources/nats.cue
+++ b/website/cue/reference/components/sources/nats.cue
@@ -39,7 +39,7 @@ components: sources: nats: {
 		platform_name: null
 	}
 
-	configuration: base.components.sources.nats.configuration
+	configuration: generated.components.sources.nats.configuration
 
 	output: {
 		logs: record: {
diff --git a/website/cue/reference/components/sources/nginx_metrics.cue b/website/cue/reference/components/sources/nginx_metrics.cue
index 7413cecc1fb9b..bcfbc2e70a4fc 100644
--- a/website/cue/reference/components/sources/nginx_metrics.cue
+++ b/website/cue/reference/components/sources/nginx_metrics.cue
@@ -49,7 +49,7 @@ components: sources: nginx_metrics: {
 		platform_name: null
 	}
 
-	configuration: base.components.sources.nginx_metrics.configuration
+	configuration: generated.components.sources.nginx_metrics.configuration
 
 	how_it_works: {
 		mod_status: {
diff --git a/website/cue/reference/components/sources/opentelemetry.cue b/website/cue/reference/components/sources/opentelemetry.cue
index 0e985701c806a..a975b3e4e4718 100644
--- a/website/cue/reference/components/sources/opentelemetry.cue
+++ b/website/cue/reference/components/sources/opentelemetry.cue
@@ -47,7 +47,7 @@ components: sources: opentelemetry: {
 		platform_name: null
 	}
 
-	configuration: base.components.sources.opentelemetry.configuration
+	configuration: generated.components.sources.opentelemetry.configuration
 
 	outputs: [
 		{
diff --git a/website/cue/reference/components/sources/postgresql_metrics.cue b/website/cue/reference/components/sources/postgresql_metrics.cue
index 864fbe151e9fa..5b392c909b9a9 100644
--- a/website/cue/reference/components/sources/postgresql_metrics.cue
+++ b/website/cue/reference/components/sources/postgresql_metrics.cue
@@ -52,7 +52,7 @@ components: sources: postgresql_metrics: {
 		platform_name: null
 	}
 
-	configuration: base.components.sources.postgresql_metrics.configuration
+	configuration: generated.components.sources.postgresql_metrics.configuration
 
 	how_it_works: {
 		privileges: {
diff --git a/website/cue/reference/components/sources/prometheus_pushgateway.cue b/website/cue/reference/components/sources/prometheus_pushgateway.cue
index a004735b4cbf3..62ddb8c8faf17 100644
--- a/website/cue/reference/components/sources/prometheus_pushgateway.cue
+++ b/website/cue/reference/components/sources/prometheus_pushgateway.cue
@@ -50,7 +50,7 @@ components: sources: prometheus_pushgateway: {
 		platform_name: null
 	}
 
-	configuration: base.components.sources.prometheus_pushgateway.configuration
+	configuration: generated.components.sources.prometheus_pushgateway.configuration
 
 	output: metrics: {
 		counter:   output._passthrough_counter
diff --git a/website/cue/reference/components/sources/prometheus_remote_write.cue b/website/cue/reference/components/sources/prometheus_remote_write.cue
index 0b8f8f12b7e13..c7dd80b82153a 100644
--- a/website/cue/reference/components/sources/prometheus_remote_write.cue
+++ b/website/cue/reference/components/sources/prometheus_remote_write.cue
@@ -50,7 +50,7 @@ components: sources: prometheus_remote_write: {
 		platform_name: null
 	}
 
-	configuration: base.components.sources.prometheus_remote_write.configuration
+	configuration: generated.components.sources.prometheus_remote_write.configuration
 
 	output: metrics: {
 		counter: output._passthrough_counter
diff --git a/website/cue/reference/components/sources/prometheus_scrape.cue b/website/cue/reference/components/sources/prometheus_scrape.cue
index cb6d1db7674d0..f5087c28b3c63 100644
--- a/website/cue/reference/components/sources/prometheus_scrape.cue
+++ b/website/cue/reference/components/sources/prometheus_scrape.cue
@@ -53,7 +53,7 @@ components: sources: prometheus_scrape: {
 		platform_name: null
 	}
 
-	configuration: base.components.sources.prometheus_scrape.configuration & {
+	configuration: generated.components.sources.prometheus_scrape.configuration & {
 		endpoints: warnings: ["You must explicitly add the path to your endpoints. Vector will _not_ automatically add `/metrics`."]
 	}
 
diff --git a/website/cue/reference/components/sources/redis.cue b/website/cue/reference/components/sources/redis.cue
index 081ed24f08dd4..bc8a63cb660b6 100644
--- a/website/cue/reference/components/sources/redis.cue
+++ b/website/cue/reference/components/sources/redis.cue
@@ -58,7 +58,7 @@ components: sources: redis: {
 		platform_name: null
 	}
 
-	configuration: base.components.sources.redis.configuration
+	configuration: generated.components.sources.redis.configuration
 
 	output: {
 		logs: record: {
diff --git a/website/cue/reference/components/sources/socket.cue b/website/cue/reference/components/sources/socket.cue
index 569003f6e7636..a6838823f7f13 100644
--- a/website/cue/reference/components/sources/socket.cue
+++ b/website/cue/reference/components/sources/socket.cue
@@ -56,7 +56,7 @@ components: sources: socket: {
 		platform_name: null
 	}
 
-	configuration: base.components.sources.socket.configuration
+	configuration: generated.components.sources.socket.configuration
 
 	output: {
 		logs: line: {
diff --git a/website/cue/reference/components/sources/splunk_hec.cue b/website/cue/reference/components/sources/splunk_hec.cue
index 5e889be27f3f2..ef6ba5f8cfcf2 100644
--- a/website/cue/reference/components/sources/splunk_hec.cue
+++ b/website/cue/reference/components/sources/splunk_hec.cue
@@ -56,7 +56,7 @@ components: sources: splunk_hec: {
 		platform_name: null
 	}
 
-	configuration: base.components.sources.splunk_hec.configuration
+	configuration: generated.components.sources.splunk_hec.configuration
 
 	output: logs: event: {
 		description: "A single event"
diff --git a/website/cue/reference/components/sources/static_metrics.cue b/website/cue/reference/components/sources/static_metrics.cue
index d6b40f354dc22..24e7f1186f8df 100644
--- a/website/cue/reference/components/sources/static_metrics.cue
+++ b/website/cue/reference/components/sources/static_metrics.cue
@@ -36,7 +36,7 @@ components: sources: static_metrics: {
 		platform_name: null
 	}
 
-	configuration: base.components.sources.static_metrics.configuration
+	configuration: generated.components.sources.static_metrics.configuration
 
 	output: metrics: {
 		counter: output._passthrough_counter & {
diff --git a/website/cue/reference/components/sources/statsd.cue b/website/cue/reference/components/sources/statsd.cue
index f7c0b32a39908..0eddb9f274020 100644
--- a/website/cue/reference/components/sources/statsd.cue
+++ b/website/cue/reference/components/sources/statsd.cue
@@ -55,7 +55,7 @@ components: sources: statsd: {
 		platform_name: null
 	}
 
-	configuration: base.components.sources.statsd.configuration
+	configuration: generated.components.sources.statsd.configuration
 
 	output: metrics: {
 		counter:      output._passthrough_counter
diff --git a/website/cue/reference/components/sources/stdin.cue b/website/cue/reference/components/sources/stdin.cue
index d7ae3b46d533d..a22a75dd36356 100644
--- a/website/cue/reference/components/sources/stdin.cue
+++ b/website/cue/reference/components/sources/stdin.cue
@@ -40,7 +40,7 @@ components: sources: stdin: {
 		platform_name: null
 	}
 
-	configuration: base.components.sources.stdin.configuration
+	configuration: generated.components.sources.stdin.configuration
 
 	output: {
 		logs: line: {
diff --git a/website/cue/reference/components/sources/syslog.cue b/website/cue/reference/components/sources/syslog.cue
index 51764945f81a8..ba27f8762718b 100644
--- a/website/cue/reference/components/sources/syslog.cue
+++ b/website/cue/reference/components/sources/syslog.cue
@@ -47,7 +47,7 @@ components: sources: syslog: {
 		platform_name: null
 	}
 
-	configuration: base.components.sources.syslog.configuration
+	configuration: generated.components.sources.syslog.configuration
 
 	output: logs: line: {
 		description: "An individual Syslog event"
diff --git a/website/cue/reference/components/sources/vector.cue b/website/cue/reference/components/sources/vector.cue
index 8fc667e2299f6..3cce08b489c96 100644
--- a/website/cue/reference/components/sources/vector.cue
+++ b/website/cue/reference/components/sources/vector.cue
@@ -53,7 +53,7 @@ components: sources: vector: {
 		platform_name: null
 	}
 
-	configuration: base.components.sources.vector.configuration
+	configuration: generated.components.sources.vector.configuration
 
 	output: {
 		logs: event: {
diff --git a/website/cue/reference/components/transforms.cue b/website/cue/reference/components/transforms.cue
index 35942a0e0005a..c227be551e223 100644
--- a/website/cue/reference/components/transforms.cue
+++ b/website/cue/reference/components/transforms.cue
@@ -10,7 +10,7 @@ components: transforms: [Name=string]: {
 
 	kind: "transform"
 
-	configuration: base.components.transforms.configuration
+	configuration: generated.components.transforms.configuration
 
 	telemetry: metrics: {
 		component_discarded_events_total:     components.sources.internal_metrics.output.metrics.component_discarded_events_total
diff --git a/website/cue/reference/components/transforms/aggregate.cue b/website/cue/reference/components/transforms/aggregate.cue
index 00f657f298c11..37980aa252e23 100644
--- a/website/cue/reference/components/transforms/aggregate.cue
+++ b/website/cue/reference/components/transforms/aggregate.cue
@@ -26,7 +26,7 @@ components: transforms: aggregate: {
 		warnings: []
 	}
 
-	configuration: base.components.transforms.aggregate.configuration
+	configuration: generated.components.transforms.aggregate.configuration
 
 	input: {
 		logs: false
diff --git a/website/cue/reference/components/transforms/aws_ec2_metadata.cue b/website/cue/reference/components/transforms/aws_ec2_metadata.cue
index 62cde7dc2b2e9..ed5bff826033a 100644
--- a/website/cue/reference/components/transforms/aws_ec2_metadata.cue
+++ b/website/cue/reference/components/transforms/aws_ec2_metadata.cue
@@ -49,7 +49,7 @@ components: transforms: aws_ec2_metadata: {
 		]
 	}
 
-	configuration: base.components.transforms.aws_ec2_metadata.configuration
+	configuration: generated.components.transforms.aws_ec2_metadata.configuration
 
 	env_vars: {
 		http_proxy:  env_vars._http_proxy
diff --git a/website/cue/reference/components/transforms/dedupe.cue b/website/cue/reference/components/transforms/dedupe.cue
index e6f696e98f3d6..322186bd8b777 100644
--- a/website/cue/reference/components/transforms/dedupe.cue
+++ b/website/cue/reference/components/transforms/dedupe.cue
@@ -24,7 +24,7 @@ components: transforms: dedupe: {
 		notices: []
 	}
 
-	configuration: base.components.transforms.dedupe.configuration
+	configuration: generated.components.transforms.dedupe.configuration
 
 	input: {
 		logs:    true
diff --git a/website/cue/reference/components/transforms/exclusive_route.cue b/website/cue/reference/components/transforms/exclusive_route.cue
index 1679b6a10870b..1a30f35e441f0 100644
--- a/website/cue/reference/components/transforms/exclusive_route.cue
+++ b/website/cue/reference/components/transforms/exclusive_route.cue
@@ -26,7 +26,7 @@ components: transforms: exclusive_route: {
 		notices: []
 	}
 
-	configuration: base.components.transforms.exclusive_route.configuration
+	configuration: generated.components.transforms.exclusive_route.configuration
 
 	input: {
 		logs: true
diff --git a/website/cue/reference/components/transforms/filter.cue b/website/cue/reference/components/transforms/filter.cue
index d25919767dd72..13a68d8097383 100644
--- a/website/cue/reference/components/transforms/filter.cue
+++ b/website/cue/reference/components/transforms/filter.cue
@@ -24,7 +24,7 @@ components: transforms: filter: {
 		notices: []
 	}
 
-	configuration: base.components.transforms.filter.configuration
+	configuration: generated.components.transforms.filter.configuration
 
 	input: {
 		logs: true
diff --git a/website/cue/reference/components/transforms/base/aggregate.cue b/website/cue/reference/components/transforms/generated/aggregate.cue
similarity index 94%
rename from website/cue/reference/components/transforms/base/aggregate.cue
rename to website/cue/reference/components/transforms/generated/aggregate.cue
index fc97c11ba2bcb..725285a35281b 100644
--- a/website/cue/reference/components/transforms/base/aggregate.cue
+++ b/website/cue/reference/components/transforms/generated/aggregate.cue
@@ -1,6 +1,6 @@
 package metadata
 
-base: components: transforms: aggregate: configuration: {
+generated: components: transforms: aggregate: configuration: {
 	interval_ms: {
 		description: """
 			The interval between flushes, in milliseconds.
diff --git a/website/cue/reference/components/transforms/base/aws_ec2_metadata.cue b/website/cue/reference/components/transforms/generated/aws_ec2_metadata.cue
similarity index 98%
rename from website/cue/reference/components/transforms/base/aws_ec2_metadata.cue
rename to website/cue/reference/components/transforms/generated/aws_ec2_metadata.cue
index 252ed59f8b67d..833b2794d0f4f 100644
--- a/website/cue/reference/components/transforms/base/aws_ec2_metadata.cue
+++ b/website/cue/reference/components/transforms/generated/aws_ec2_metadata.cue
@@ -1,6 +1,6 @@
 package metadata
 
-base: components: transforms: aws_ec2_metadata: configuration: {
+generated: components: transforms: aws_ec2_metadata: configuration: {
 	endpoint: {
 		description: "Overrides the default EC2 metadata endpoint."
 		required:    false
diff --git a/website/cue/reference/components/transforms/base/dedupe.cue b/website/cue/reference/components/transforms/generated/dedupe.cue
similarity index 95%
rename from website/cue/reference/components/transforms/base/dedupe.cue
rename to website/cue/reference/components/transforms/generated/dedupe.cue
index 724a8c52fa6e5..cc5ed2fe9ac5e 100644
--- a/website/cue/reference/components/transforms/base/dedupe.cue
+++ b/website/cue/reference/components/transforms/generated/dedupe.cue
@@ -1,6 +1,6 @@
 package metadata
 
-base: components: transforms: dedupe: configuration: {
+generated: components: transforms: dedupe: configuration: {
 	cache: {
 		description: "Caching configuration for deduplication."
 		required:    false
diff --git a/website/cue/reference/components/transforms/base/exclusive_route.cue b/website/cue/reference/components/transforms/generated/exclusive_route.cue
similarity index 92%
rename from website/cue/reference/components/transforms/base/exclusive_route.cue
rename to website/cue/reference/components/transforms/generated/exclusive_route.cue
index 9260d83373d61..4900c4d8ac12f 100644
--- a/website/cue/reference/components/transforms/base/exclusive_route.cue
+++ b/website/cue/reference/components/transforms/generated/exclusive_route.cue
@@ -1,6 +1,6 @@
 package metadata
 
-base: components: transforms: exclusive_route: configuration: routes: {
+generated: components: transforms: exclusive_route: configuration: routes: {
 	description: "An array of named routes. The route names are expected to be unique."
 	required:    true
 	type: array: items: type: object: {
diff --git a/website/cue/reference/components/transforms/base/filter.cue b/website/cue/reference/components/transforms/generated/filter.cue
similarity index 76%
rename from website/cue/reference/components/transforms/base/filter.cue
rename to website/cue/reference/components/transforms/generated/filter.cue
index f4ad0cd49fd10..7ec8ffe61ebab 100644
--- a/website/cue/reference/components/transforms/base/filter.cue
+++ b/website/cue/reference/components/transforms/generated/filter.cue
@@ -1,6 +1,6 @@
 package metadata
 
-base: components: transforms: filter: configuration: condition: {
+generated: components: transforms: filter: configuration: condition: {
 	description: """
 		The condition that every input event is matched against.
 
diff --git a/website/cue/reference/components/transforms/base/log_to_metric.cue b/website/cue/reference/components/transforms/generated/log_to_metric.cue
similarity index 98%
rename from website/cue/reference/components/transforms/base/log_to_metric.cue
rename to website/cue/reference/components/transforms/generated/log_to_metric.cue
index 6275706f44869..34930849334bd 100644
--- a/website/cue/reference/components/transforms/base/log_to_metric.cue
+++ b/website/cue/reference/components/transforms/generated/log_to_metric.cue
@@ -1,6 +1,6 @@
 package metadata
 
-base: components: transforms: log_to_metric: configuration: {
+generated: components: transforms: log_to_metric: configuration: {
 	all_metrics: {
 		description: """
 			Setting this flag changes the behavior of this transformation.<br />
diff --git a/website/cue/reference/components/transforms/base/lua.cue b/website/cue/reference/components/transforms/generated/lua.cue
similarity index 98%
rename from website/cue/reference/components/transforms/base/lua.cue
rename to website/cue/reference/components/transforms/generated/lua.cue
index 46549967e2f08..da54aead3168b 100644
--- a/website/cue/reference/components/transforms/base/lua.cue
+++ b/website/cue/reference/components/transforms/generated/lua.cue
@@ -1,6 +1,6 @@
 package metadata
 
-base: components: transforms: lua: configuration: {
+generated: components: transforms: lua: configuration: {
 	hooks: {
 		description: """
 			Lifecycle hooks.
diff --git a/website/cue/reference/components/transforms/base/metric_to_log.cue b/website/cue/reference/components/transforms/generated/metric_to_log.cue
similarity index 96%
rename from website/cue/reference/components/transforms/base/metric_to_log.cue
rename to website/cue/reference/components/transforms/generated/metric_to_log.cue
index e9571cb0225fe..9a982381aa037 100644
--- a/website/cue/reference/components/transforms/base/metric_to_log.cue
+++ b/website/cue/reference/components/transforms/generated/metric_to_log.cue
@@ -1,6 +1,6 @@
 package metadata
 
-base: components: transforms: metric_to_log: configuration: {
+generated: components: transforms: metric_to_log: configuration: {
 	host_tag: {
 		description: """
 			Name of the tag in the metric to use for the source host.
diff --git a/website/cue/reference/components/transforms/base/reduce.cue b/website/cue/reference/components/transforms/generated/reduce.cue
similarity index 98%
rename from website/cue/reference/components/transforms/base/reduce.cue
rename to website/cue/reference/components/transforms/generated/reduce.cue
index c11e0b364f755..8f494c884e0bd 100644
--- a/website/cue/reference/components/transforms/base/reduce.cue
+++ b/website/cue/reference/components/transforms/generated/reduce.cue
@@ -1,6 +1,6 @@
 package metadata
 
-base: components: transforms: reduce: configuration: {
+generated: components: transforms: reduce: configuration: {
 	end_every_period_ms: {
 		description: """
 			If supplied, every time this interval elapses for a given grouping, the reduced value
diff --git a/website/cue/reference/components/transforms/base/remap.cue b/website/cue/reference/components/transforms/generated/remap.cue
similarity index 98%
rename from website/cue/reference/components/transforms/base/remap.cue
rename to website/cue/reference/components/transforms/generated/remap.cue
index 716a11508308f..c6b00d42b5aa5 100644
--- a/website/cue/reference/components/transforms/base/remap.cue
+++ b/website/cue/reference/components/transforms/generated/remap.cue
@@ -1,6 +1,6 @@
 package metadata
 
-base: components: transforms: remap: configuration: {
+generated: components: transforms: remap: configuration: {
 	drop_on_abort: {
 		description: """
 			Drops any event that is manually aborted during processing.
diff --git a/website/cue/reference/components/transforms/base/route.cue b/website/cue/reference/components/transforms/generated/route.cue
similarity index 96%
rename from website/cue/reference/components/transforms/base/route.cue
rename to website/cue/reference/components/transforms/generated/route.cue
index 40484c568bbef..df589cbd8b558 100644
--- a/website/cue/reference/components/transforms/base/route.cue
+++ b/website/cue/reference/components/transforms/generated/route.cue
@@ -1,6 +1,6 @@
 package metadata
 
-base: components: transforms: route: configuration: {
+generated: components: transforms: route: configuration: {
 	reroute_unmatched: {
 		description: """
 			Reroutes unmatched events to a named output instead of silently discarding them.
diff --git a/website/cue/reference/components/transforms/base/sample.cue b/website/cue/reference/components/transforms/generated/sample.cue
similarity index 97%
rename from website/cue/reference/components/transforms/base/sample.cue
rename to website/cue/reference/components/transforms/generated/sample.cue
index 40c468bf56505..11a91141683fa 100644
--- a/website/cue/reference/components/transforms/base/sample.cue
+++ b/website/cue/reference/components/transforms/generated/sample.cue
@@ -1,6 +1,6 @@
 package metadata
 
-base: components: transforms: sample: configuration: {
+generated: components: transforms: sample: configuration: {
 	exclude: {
 		description: "A logical condition used to exclude events from sampling."
 		required:    false
diff --git a/website/cue/reference/components/transforms/base/tag_cardinality_limit.cue b/website/cue/reference/components/transforms/generated/tag_cardinality_limit.cue
similarity index 98%
rename from website/cue/reference/components/transforms/base/tag_cardinality_limit.cue
rename to website/cue/reference/components/transforms/generated/tag_cardinality_limit.cue
index 5680d03c2c3d3..a7d92b56adf7a 100644
--- a/website/cue/reference/components/transforms/base/tag_cardinality_limit.cue
+++ b/website/cue/reference/components/transforms/generated/tag_cardinality_limit.cue
@@ -1,6 +1,6 @@
 package metadata
 
-base: components: transforms: tag_cardinality_limit: configuration: {
+generated: components: transforms: tag_cardinality_limit: configuration: {
 	cache_size_per_key: {
 		description: """
 			The size of the cache for detecting duplicate tags, in bytes.
diff --git a/website/cue/reference/components/transforms/base/throttle.cue b/website/cue/reference/components/transforms/generated/throttle.cue
similarity index 96%
rename from website/cue/reference/components/transforms/base/throttle.cue
rename to website/cue/reference/components/transforms/generated/throttle.cue
index 8da191aeb8f54..4a93795f5240e 100644
--- a/website/cue/reference/components/transforms/base/throttle.cue
+++ b/website/cue/reference/components/transforms/generated/throttle.cue
@@ -1,6 +1,6 @@
 package metadata
 
-base: components: transforms: throttle: configuration: {
+generated: components: transforms: throttle: configuration: {
 	exclude: {
 		description: "A logical condition used to exclude events from sampling."
 		required:    false
diff --git a/website/cue/reference/components/transforms/base/window.cue b/website/cue/reference/components/transforms/generated/window.cue
similarity index 94%
rename from website/cue/reference/components/transforms/base/window.cue
rename to website/cue/reference/components/transforms/generated/window.cue
index 6eeb587c9ece0..531a00fdb3a21 100644
--- a/website/cue/reference/components/transforms/base/window.cue
+++ b/website/cue/reference/components/transforms/generated/window.cue
@@ -1,6 +1,6 @@
 package metadata
 
-base: components: transforms: window: configuration: {
+generated: components: transforms: window: configuration: {
 	flush_when: {
 		description: """
 			A condition used to flush the events.
diff --git a/website/cue/reference/components/transforms/log_to_metric.cue b/website/cue/reference/components/transforms/log_to_metric.cue
index 3339b1441e4eb..c580e4c9ef545 100644
--- a/website/cue/reference/components/transforms/log_to_metric.cue
+++ b/website/cue/reference/components/transforms/log_to_metric.cue
@@ -24,7 +24,7 @@ components: transforms: log_to_metric: {
 		notices: []
 	}
 
-	configuration: base.components.transforms.log_to_metric.configuration
+	configuration: generated.components.transforms.log_to_metric.configuration
 
 	input: {
 		logs:    true
diff --git a/website/cue/reference/components/transforms/lua.cue b/website/cue/reference/components/transforms/lua.cue
index 162318c107765..c962249e9b685 100644
--- a/website/cue/reference/components/transforms/lua.cue
+++ b/website/cue/reference/components/transforms/lua.cue
@@ -38,7 +38,7 @@ components: transforms: lua: {
 		notices: []
 	}
 
-	configuration: base.components.transforms.lua.configuration
+	configuration: generated.components.transforms.lua.configuration
 
 	input: {
 		logs: true
diff --git a/website/cue/reference/components/transforms/metric_to_log.cue b/website/cue/reference/components/transforms/metric_to_log.cue
index 5f4dae22e76f5..db684299c218b 100644
--- a/website/cue/reference/components/transforms/metric_to_log.cue
+++ b/website/cue/reference/components/transforms/metric_to_log.cue
@@ -25,7 +25,7 @@ components: transforms: metric_to_log: {
 		notices: []
 	}
 
-	configuration: base.components.transforms.metric_to_log.configuration
+	configuration: generated.components.transforms.metric_to_log.configuration
 
 	input: {
 		logs: false
diff --git a/website/cue/reference/components/transforms/reduce.cue b/website/cue/reference/components/transforms/reduce.cue
index 758e4c5d65af8..49fa0184df561 100644
--- a/website/cue/reference/components/transforms/reduce.cue
+++ b/website/cue/reference/components/transforms/reduce.cue
@@ -25,7 +25,7 @@ components: transforms: reduce: {
 		notices: []
 	}
 
-	configuration: base.components.transforms.reduce.configuration
+	configuration: generated.components.transforms.reduce.configuration
 
 	input: {
 		logs:    true
diff --git a/website/cue/reference/components/transforms/remap.cue b/website/cue/reference/components/transforms/remap.cue
index fc10ea96df23d..d19cdd1fdd25d 100644
--- a/website/cue/reference/components/transforms/remap.cue
+++ b/website/cue/reference/components/transforms/remap.cue
@@ -34,7 +34,7 @@ components: transforms: "remap": {
 		notices: []
 	}
 
-	configuration: base.components.transforms.remap.configuration
+	configuration: generated.components.transforms.remap.configuration
 
 	input: {
 		logs: true
diff --git a/website/cue/reference/components/transforms/route.cue b/website/cue/reference/components/transforms/route.cue
index 4040b84cbe497..82f0750528701 100644
--- a/website/cue/reference/components/transforms/route.cue
+++ b/website/cue/reference/components/transforms/route.cue
@@ -28,7 +28,7 @@ components: transforms: route: {
 		notices: []
 	}
 
-	configuration: base.components.transforms.route.configuration
+	configuration: generated.components.transforms.route.configuration
 
 	input: {
 		logs: true
diff --git a/website/cue/reference/components/transforms/sample.cue b/website/cue/reference/components/transforms/sample.cue
index 18699677e63c9..3f589f9248fb1 100644
--- a/website/cue/reference/components/transforms/sample.cue
+++ b/website/cue/reference/components/transforms/sample.cue
@@ -24,7 +24,7 @@ components: transforms: sample: {
 		notices: []
 	}
 
-	configuration: base.components.transforms.sample.configuration
+	configuration: generated.components.transforms.sample.configuration
 
 	input: {
 		logs:    true
diff --git a/website/cue/reference/components/transforms/tag_cardinality_limit.cue b/website/cue/reference/components/transforms/tag_cardinality_limit.cue
index 32b21f0e68dbd..f8ca250786f32 100644
--- a/website/cue/reference/components/transforms/tag_cardinality_limit.cue
+++ b/website/cue/reference/components/transforms/tag_cardinality_limit.cue
@@ -34,7 +34,7 @@ components: transforms: tag_cardinality_limit: {
 
 	// TODO: It'd be nice to have a way to define the description of the enum tag field on the Rust
 	// side and propagate it forward, since this is a common pattern that gets used.
-	configuration: base.components.transforms.tag_cardinality_limit.configuration & {
+	configuration: generated.components.transforms.tag_cardinality_limit.configuration & {
 		mode: description: "Controls the approach taken for tracking tag cardinality."
 	}
 
diff --git a/website/cue/reference/components/transforms/throttle.cue b/website/cue/reference/components/transforms/throttle.cue
index bdbc363cae1de..4c68f5f99f7a2 100644
--- a/website/cue/reference/components/transforms/throttle.cue
+++ b/website/cue/reference/components/transforms/throttle.cue
@@ -24,7 +24,7 @@ components: transforms: throttle: {
 		notices: []
 	}
 
-	configuration: base.components.transforms.throttle.configuration
+	configuration: generated.components.transforms.throttle.configuration
 
 	input: {
 		logs:    true
diff --git a/website/cue/reference/components/transforms/window.cue b/website/cue/reference/components/transforms/window.cue
index 7d877031f0aae..f0f7541d3658e 100644
--- a/website/cue/reference/components/transforms/window.cue
+++ b/website/cue/reference/components/transforms/window.cue
@@ -25,7 +25,7 @@ components: transforms: window: {
 		notices: []
 	}
 
-	configuration: base.components.transforms.window.configuration
+	configuration: generated.components.transforms.window.configuration
 
 	input: {
 		logs:    true
diff --git a/website/cue/reference/configuration.cue b/website/cue/reference/configuration.cue
index 589b85f934fdc..2170e9837afee 100644
--- a/website/cue/reference/configuration.cue
+++ b/website/cue/reference/configuration.cue
@@ -6,7 +6,7 @@ configuration: {
 }
 
 configuration: {
-	configuration: base.configuration.configuration
+	configuration: generated.configuration.configuration
 
 	configuration: {
 		// expire_metrics's type is a little bit tricky, we could not generate `uint` from `docs::type_override` metadata macro easily.
diff --git a/website/cue/reference/base/api.cue b/website/cue/reference/generated/api.cue
similarity index 97%
rename from website/cue/reference/base/api.cue
rename to website/cue/reference/generated/api.cue
index 43dab35c9b9f6..298b9fb59e686 100644
--- a/website/cue/reference/base/api.cue
+++ b/website/cue/reference/generated/api.cue
@@ -1,6 +1,6 @@
 package metadata
 
-base: api: configuration: api: {
+generated: api: configuration: api: {
 	address: {
 		common: true
 		description: """
diff --git a/website/cue/reference/base/configuration.cue b/website/cue/reference/generated/configuration.cue
similarity index 99%
rename from website/cue/reference/base/configuration.cue
rename to website/cue/reference/generated/configuration.cue
index 00db6e184f61f..646f06be4d5ef 100644
--- a/website/cue/reference/base/configuration.cue
+++ b/website/cue/reference/generated/configuration.cue
@@ -1,6 +1,6 @@
 package metadata
 
-base: configuration: configuration: {
+generated: configuration: configuration: {
 	enrichment_tables: {
 		type: object: options: {
 			file: {

From 18f3055d89041bfd2ac7e4303f41a9b37cce0938 Mon Sep 17 00:00:00 2001
From: pezkins <35820963+pezkins@users.noreply.github.com>
Date: Thu, 10 Jul 2025 13:03:28 -0400
Subject: [PATCH 167/305] docs(external): Updated `replace` capture group
 example  (#18785)

* Update replace.cue

updating the example for the capture group name in the example to use $$num instead of $num as single $ does not work.
Also need to provide more description on the Note.
"Note that $foo is interpreted in a Vector configuration file, instead use $$foo." This isn't clear, and not sure what it means.

* Update replace.cue

Added additional example for Replace with capture group to give an example of calling capture groups in a configuration file and outside a configuration file so it is clear.

* Update website/cue/reference/remap/functions/replace.cue

* Update website/cue/reference/remap/functions/replace.cue

Co-authored-by: May Lee <mayl@alumni.cmu.edu>

* Update website/cue/reference/remap/functions/replace.cue

Co-authored-by: May Lee <mayl@alumni.cmu.edu>

* test case fix

* cue fmt

---------

Co-authored-by: Jesse Szwedko <jesse@szwedko.me>
Co-authored-by: May Lee <mayl@alumni.cmu.edu>
Co-authored-by: Pavlos Rontidis <pavlos.rontidis@gmail.com>
---
 website/cue/reference/remap/functions/replace.cue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/website/cue/reference/remap/functions/replace.cue b/website/cue/reference/remap/functions/replace.cue
index 6e1c50ba5972e..fd31772aebd6e 100644
--- a/website/cue/reference/remap/functions/replace.cue
+++ b/website/cue/reference/remap/functions/replace.cue
@@ -69,8 +69,10 @@ remap: functions: replace: {
 			return: "Pineapples and Bananas"
 		},
 		{
-			title: "Replace with capture groups (Note: Use `$$num` in config files)"
+			title: "Replace with capture groups when not set in the configuration file (use `$$num` in config files)"
 			source: #"""
+				# Note that in the context of Vector configuration files, an extra `$` escape character is required
+				# (i.e. `$$num`) to avoid interepreting `num` as an environment variable.
 				replace("foo123bar", r'foo(?P<num>\d+)bar', "$num")
 				"""#
 			return: "123"

From a9366ad55888c85258d0be206710e44a3de389df Mon Sep 17 00:00:00 2001
From: Pavlos Rontidis <pavlos.rontidis@gmail.com>
Date: Fri, 11 Jul 2025 10:40:13 -0400
Subject: [PATCH 168/305] fix(ci): re-enable splunk ITs (#23360)

* fix(ci): attempt to enable splunk ITs

* sort
---
 .github/workflows/integration.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
index 0f307e0272cb6..89a9ff17ff67a 100644
--- a/.github/workflows/integration.yml
+++ b/.github/workflows/integration.yml
@@ -69,14 +69,13 @@ jobs:
     if: ${{ !failure() && !cancelled() && (needs.check-secrets.outputs.can_access_secrets == 'true' || github.event_name == 'merge_group') }}
     strategy:
       matrix:
-        # TODO: Add "splunk" back once https://github.com/vectordotdev/vector/issues/22379 is fixed.
         # If you modify this list, please also update the `int_tests` job in changes.yml.
         service: [
           "amqp", "appsignal", "axiom", "aws", "azure", "clickhouse", "databend", "datadog-agent",
           "datadog-logs", "datadog-metrics", "datadog-traces", "dnstap", "docker-logs", "elasticsearch",
           "eventstoredb", "fluent", "gcp", "greptimedb", "http-client", "influxdb", "kafka", "logstash",
           "loki", "mongodb", "nats", "nginx", "opentelemetry", "postgres", "prometheus", "pulsar",
-          "redis", "webhdfs"
+          "redis", "splunk", "webhdfs"
         ]
     timeout-minutes: 90
     steps:

From f83b7e0ba32167ded8d007461298a9aea11ee7d8 Mon Sep 17 00:00:00 2001
From: Pomin Wu <pm5@users.noreply.github.com>
Date: Sat, 12 Jul 2025 02:04:34 +0800
Subject: [PATCH 169/305] feat(clickhouse sink): add query_settings to
 clickhouse sink (#22764)

* feat(sink: clickhouse): add query_settings option to clickhouse sink

* Rename query settings struct

* config UX improvements

* Update changelog.d/22764_clickhouse_query_settings.feature.md

* Fix spelling

* cargo fmt

* regen docs

---------

Co-authored-by: Pavlos Rontidis <pavlos.rontidis@gmail.com>
Co-authored-by: Thomas <thomas.schneider@datadoghq.com>
---
 ...22764_clickhouse_query_settings.feature.md |  3 +
 src/sinks/clickhouse/config.rs                | 57 ++++++++++++
 src/sinks/clickhouse/integration_tests.rs     |  6 +-
 src/sinks/clickhouse/mod.rs                   |  3 +-
 src/sinks/clickhouse/service.rs               | 88 +++++++++++++++++--
 .../components/sinks/generated/clickhouse.cue | 64 ++++++++++++++
 .../cue/reference/remap/functions/replace.cue |  2 +-
 7 files changed, 211 insertions(+), 12 deletions(-)
 create mode 100644 changelog.d/22764_clickhouse_query_settings.feature.md

diff --git a/changelog.d/22764_clickhouse_query_settings.feature.md b/changelog.d/22764_clickhouse_query_settings.feature.md
new file mode 100644
index 0000000000000..10e4a7f4ef85a
--- /dev/null
+++ b/changelog.d/22764_clickhouse_query_settings.feature.md
@@ -0,0 +1,3 @@
+Add a `query_settings` and `async_insert_settings` option in the `clickhouse` sink, which allows users to configure asynchronous inserts.
+
+authors: pm5
diff --git a/src/sinks/clickhouse/config.rs b/src/sinks/clickhouse/config.rs
index 9ae6c52c3d489..9a884b53a48dd 100644
--- a/src/sinks/clickhouse/config.rs
+++ b/src/sinks/clickhouse/config.rs
@@ -114,6 +114,62 @@ pub struct ClickhouseConfig {
         skip_serializing_if = "crate::serde::is_default"
     )]
     pub acknowledgements: AcknowledgementsConfig,
+
+    #[configurable(derived)]
+    #[serde(default)]
+    pub query_settings: QuerySettingsConfig,
+}
+
+/// Query settings for the `clickhouse` sink.
+#[configurable_component]
+#[derive(Clone, Copy, Debug, Default)]
+#[serde(deny_unknown_fields)]
+pub struct QuerySettingsConfig {
+    /// Async insert-related settings.
+    #[serde(default)]
+    pub async_insert_settings: AsyncInsertSettingsConfig,
+}
+
+/// Async insert related settings for the `clickhouse` sink.
+#[configurable_component]
+#[derive(Clone, Copy, Debug, Default)]
+#[serde(deny_unknown_fields)]
+pub struct AsyncInsertSettingsConfig {
+    /// Sets `async_insert`, allowing ClickHouse to queue the inserted data and later flush to table in the background.
+    ///
+    /// If left unspecified, use the default provided by the `ClickHouse` server.
+    #[serde(default)]
+    pub enabled: Option<bool>,
+
+    /// Sets `wait_for`, allowing ClickHouse to wait for processing of asynchronous insertion.
+    ///
+    /// If left unspecified, use the default provided by the `ClickHouse` server.
+    #[serde(default)]
+    pub wait_for_processing: Option<bool>,
+
+    /// Sets 'wait_for_processing_timeout`, to control the timeout for waiting for processing asynchronous insertion.
+    ///
+    /// If left unspecified, use the default provided by the `ClickHouse` server.
+    #[serde(default)]
+    pub wait_for_processing_timeout: Option<u64>,
+
+    /// Sets `async_insert_deduplicate`, allowing ClickHouse to perform deduplication when inserting blocks in the replicated table.
+    ///
+    /// If left unspecified, use the default provided by the `ClickHouse` server.
+    #[serde(default)]
+    pub deduplicate: Option<bool>,
+
+    /// Sets `async_insert_max_data_size`, the maximum size in bytes of unparsed data collected per query before being inserted.
+    ///
+    /// If left unspecified, use the default provided by the `ClickHouse` server.
+    #[serde(default)]
+    pub max_data_size: Option<u64>,
+
+    /// Sets `async_insert_max_query_number`, the maximum number of insert queries before being inserted
+    ///
+    /// If left unspecified, use the default provided by the `ClickHouse` server.
+    #[serde(default)]
+    pub max_query_number: Option<u64>,
 }
 
 impl_generate_config_from_default!(ClickhouseConfig);
@@ -137,6 +193,7 @@ impl SinkConfig for ClickhouseConfig {
             date_time_best_effort: self.date_time_best_effort,
             insert_random_shard: self.insert_random_shard,
             compression: self.compression,
+            query_settings: self.query_settings,
         };
 
         let service: HttpService<ClickhouseServiceRequestBuilder, PartitionKey> =
diff --git a/src/sinks/clickhouse/integration_tests.rs b/src/sinks/clickhouse/integration_tests.rs
index 0383db043458f..57aa0f4df9e07 100644
--- a/src/sinks/clickhouse/integration_tests.rs
+++ b/src/sinks/clickhouse/integration_tests.rs
@@ -19,11 +19,13 @@ use vector_lib::event::{BatchNotifier, BatchStatus, BatchStatusReceiver, Event,
 use vector_lib::lookup::PathPrefix;
 use warp::Filter;
 
-use super::*;
 use crate::{
     codecs::{TimestampFormat, Transformer},
     config::{log_schema, SinkConfig, SinkContext},
-    sinks::util::{BatchConfig, Compression, TowerRequestConfig},
+    sinks::{
+        clickhouse::config::ClickhouseConfig,
+        util::{BatchConfig, Compression, TowerRequestConfig},
+    },
     test_util::{
         components::{run_and_assert_sink_compliance, SINK_TAGS},
         random_table_name, trace_init,
diff --git a/src/sinks/clickhouse/mod.rs b/src/sinks/clickhouse/mod.rs
index b107b47356635..3a578041bf533 100644
--- a/src/sinks/clickhouse/mod.rs
+++ b/src/sinks/clickhouse/mod.rs
@@ -9,10 +9,9 @@
 //!
 //! This sink only supports logs for now but could support metrics and traces as well in the future.
 
-mod config;
+pub mod config;
 #[cfg(all(test, feature = "clickhouse-integration-tests"))]
 mod integration_tests;
 mod request_builder;
 mod service;
 mod sink;
-pub use self::config::ClickhouseConfig;
diff --git a/src/sinks/clickhouse/service.rs b/src/sinks/clickhouse/service.rs
index 65e3c83614aa0..aa45017a4caef 100644
--- a/src/sinks/clickhouse/service.rs
+++ b/src/sinks/clickhouse/service.rs
@@ -1,5 +1,6 @@
 //! Service implementation for the `Clickhouse` sink.
 
+use super::config::QuerySettingsConfig;
 use super::sink::PartitionKey;
 use crate::{
     http::{Auth, HttpError},
@@ -67,6 +68,7 @@ pub(super) struct ClickhouseServiceRequestBuilder {
     pub(super) date_time_best_effort: bool,
     pub(super) insert_random_shard: bool,
     pub(super) compression: Compression,
+    pub(super) query_settings: QuerySettingsConfig,
 }
 
 impl HttpServiceRequestBuilder<PartitionKey> for ClickhouseServiceRequestBuilder {
@@ -84,6 +86,7 @@ impl HttpServiceRequestBuilder<PartitionKey> for ClickhouseServiceRequestBuilder
             self.skip_unknown_fields,
             self.date_time_best_effort,
             self.insert_random_shard,
+            self.query_settings,
         )?;
 
         let auth: Option<Auth> = self.auth.clone();
@@ -107,6 +110,18 @@ impl HttpServiceRequestBuilder<PartitionKey> for ClickhouseServiceRequestBuilder
     }
 }
 
+fn append_param<T: ToString>(uri: &mut String, key: &str, value: Option<T>) {
+    if let Some(val) = value {
+        uri.push_str(&format!("{}={}&", key, val.to_string()));
+    }
+}
+fn append_param_bool(uri: &mut String, key: &str, value: Option<bool>) {
+    if let Some(val) = value {
+        uri.push_str(&format!("{}={}&", key, if val { 1 } else { 0 }));
+    }
+}
+
+#[allow(clippy::too_many_arguments)]
 fn set_uri_query(
     uri: &Uri,
     database: &str,
@@ -115,6 +130,7 @@ fn set_uri_query(
     skip_unknown: Option<bool>,
     date_time_best_effort: bool,
     insert_random_shard: bool,
+    query_settings: QuerySettingsConfig,
 ) -> crate::Result<Uri> {
     let query = url::form_urlencoded::Serializer::new(String::new())
         .append_pair(
@@ -135,19 +151,45 @@ fn set_uri_query(
     }
 
     uri.push_str("?input_format_import_nested_json=1&");
-    if let Some(skip_unknown) = skip_unknown {
-        if skip_unknown {
-            uri.push_str("input_format_skip_unknown_fields=1&");
-        } else {
-            uri.push_str("input_format_skip_unknown_fields=0&")
-        }
-    }
+    append_param_bool(&mut uri, "input_format_skip_unknown_fields", skip_unknown);
     if date_time_best_effort {
         uri.push_str("date_time_input_format=best_effort&")
     }
     if insert_random_shard {
         uri.push_str("insert_distributed_one_random_shard=1&")
     }
+    append_param_bool(
+        &mut uri,
+        "async_insert",
+        query_settings.async_insert_settings.enabled,
+    );
+    append_param_bool(
+        &mut uri,
+        "wait_for_async_insert",
+        query_settings.async_insert_settings.wait_for_processing,
+    );
+    append_param(
+        &mut uri,
+        "wait_for_async_insert_timeout",
+        query_settings
+            .async_insert_settings
+            .wait_for_processing_timeout,
+    );
+    append_param_bool(
+        &mut uri,
+        "async_insert_deduplicate",
+        query_settings.async_insert_settings.deduplicate,
+    );
+    append_param(
+        &mut uri,
+        "async_insert_max_data_size",
+        query_settings.async_insert_settings.max_data_size,
+    );
+    append_param(
+        &mut uri,
+        "async_insert_max_query_number",
+        query_settings.async_insert_settings.max_query_number,
+    );
     uri.push_str(query.as_str());
 
     uri.parse::<Uri>()
@@ -158,6 +200,7 @@ fn set_uri_query(
 #[cfg(test)]
 mod tests {
     use super::*;
+    use crate::sinks::clickhouse::config::*;
 
     #[test]
     fn encode_valid() {
@@ -169,6 +212,7 @@ mod tests {
             Some(false),
             true,
             false,
+            QuerySettingsConfig::default(),
         )
         .unwrap();
         assert_eq!(uri.to_string(), "http://localhost:80/?\
@@ -185,6 +229,7 @@ mod tests {
             Some(false),
             false,
             false,
+            QuerySettingsConfig::default(),
         )
         .unwrap();
         assert_eq!(uri.to_string(), "http://localhost:80/?\
@@ -200,6 +245,7 @@ mod tests {
             Some(true),
             true,
             false,
+            QuerySettingsConfig::default(),
         )
         .unwrap();
         assert_eq!(uri.to_string(), "http://localhost:80/?\
@@ -216,11 +262,38 @@ mod tests {
             None,
             true,
             false,
+            QuerySettingsConfig::default(),
+        )
+        .unwrap();
+        assert_eq!(uri.to_string(), "http://localhost:80/?\
+                                     input_format_import_nested_json=1&\
+                                     date_time_input_format=best_effort&\
+                                     query=INSERT+INTO+%22my_database%22.%22my_%5C%22table%5C%22%22+FORMAT+JSONAsObject");
+
+        let uri = set_uri_query(
+            &"http://localhost:80".parse().unwrap(),
+            "my_database",
+            "my_\"table\"",
+            Format::JsonAsObject,
+            None,
+            true,
+            false,
+            QuerySettingsConfig {
+                async_insert_settings: AsyncInsertSettingsConfig {
+                    enabled: Some(true),
+                    wait_for_processing: Some(true),
+                    wait_for_processing_timeout: Some(500),
+                    ..AsyncInsertSettingsConfig::default()
+                },
+            },
         )
         .unwrap();
         assert_eq!(uri.to_string(), "http://localhost:80/?\
                                      input_format_import_nested_json=1&\
                                      date_time_input_format=best_effort&\
+                                     async_insert=1&\
+                                     wait_for_async_insert=1&\
+                                     wait_for_async_insert_timeout=500&\
                                      query=INSERT+INTO+%22my_database%22.%22my_%5C%22table%5C%22%22+FORMAT+JSONAsObject");
     }
 
@@ -234,6 +307,7 @@ mod tests {
             Some(false),
             false,
             false,
+            QuerySettingsConfig::default(),
         )
         .unwrap_err();
     }
diff --git a/website/cue/reference/components/sinks/generated/clickhouse.cue b/website/cue/reference/components/sinks/generated/clickhouse.cue
index 61ccb4f952eda..77df2b8b457b2 100644
--- a/website/cue/reference/components/sinks/generated/clickhouse.cue
+++ b/website/cue/reference/components/sinks/generated/clickhouse.cue
@@ -337,6 +337,70 @@ generated: components: sinks: clickhouse: configuration: {
 		required:    false
 		type: bool: default: false
 	}
+	query_settings: {
+		description: "Query settings for the `clickhouse` sink."
+		required:    false
+		type: object: options: async_insert_settings: {
+			description: "Async insert-related settings."
+			required:    false
+			type: object: options: {
+				deduplicate: {
+					description: """
+						Sets `async_insert_deduplicate`, allowing ClickHouse to perform deduplication when inserting blocks in the replicated table.
+
+						If left unspecified, use the default provided by the `ClickHouse` server.
+						"""
+					required: false
+					type: bool: {}
+				}
+				enabled: {
+					description: """
+						Sets `async_insert`, allowing ClickHouse to queue the inserted data and later flush to table in the background.
+
+						If left unspecified, use the default provided by the `ClickHouse` server.
+						"""
+					required: false
+					type: bool: {}
+				}
+				max_data_size: {
+					description: """
+						Sets `async_insert_max_data_size`, the maximum size in bytes of unparsed data collected per query before being inserted.
+
+						If left unspecified, use the default provided by the `ClickHouse` server.
+						"""
+					required: false
+					type: uint: {}
+				}
+				max_query_number: {
+					description: """
+						Sets `async_insert_max_query_number`, the maximum number of insert queries before being inserted
+
+						If left unspecified, use the default provided by the `ClickHouse` server.
+						"""
+					required: false
+					type: uint: {}
+				}
+				wait_for_processing: {
+					description: """
+						Sets `wait_for`, allowing ClickHouse to wait for processing of asynchronous insertion.
+
+						If left unspecified, use the default provided by the `ClickHouse` server.
+						"""
+					required: false
+					type: bool: {}
+				}
+				wait_for_processing_timeout: {
+					description: """
+						Sets 'wait_for_processing_timeout`, to control the timeout for waiting for processing asynchronous insertion.
+
+						If left unspecified, use the default provided by the `ClickHouse` server.
+						"""
+					required: false
+					type: uint: {}
+				}
+			}
+		}
+	}
 	request: {
 		description: """
 			Middleware settings for outbound requests.
diff --git a/website/cue/reference/remap/functions/replace.cue b/website/cue/reference/remap/functions/replace.cue
index fd31772aebd6e..d66218c6ea33e 100644
--- a/website/cue/reference/remap/functions/replace.cue
+++ b/website/cue/reference/remap/functions/replace.cue
@@ -72,7 +72,7 @@ remap: functions: replace: {
 			title: "Replace with capture groups when not set in the configuration file (use `$$num` in config files)"
 			source: #"""
 				# Note that in the context of Vector configuration files, an extra `$` escape character is required
-				# (i.e. `$$num`) to avoid interepreting `num` as an environment variable.
+				# (i.e. `$$num`) to avoid interpreting `num` as an environment variable.
 				replace("foo123bar", r'foo(?P<num>\d+)bar', "$num")
 				"""#
 			return: "123"

From 8d95e2318fd95f57b2ee76069a7a7bfea961bc99 Mon Sep 17 00:00:00 2001
From: Thomas <thomas.schneider@datadoghq.com>
Date: Mon, 14 Jul 2025 09:59:48 -0400
Subject: [PATCH 170/305] fix(core): unreadable interval_ms (#23361)

* Update VRL

* Add interval_ms to get funcs

* Refactor code to remove duplication

* Revert "Update VRL"

This reverts commit 4667fc9fa1e101fbbec4e996081f6d5dfbea595a.

* Update VRL's main branch

* Add changelog

* Update changelog.d/23361_interval_ms_redeable.fix.md

* Update changelog.d/23361_interval_ms_redeable.fix.md

Co-authored-by: Pavlos Rontidis <pavlos.rontidis@gmail.com>

* Move structs to before statments (clippy)

* cargo vdev build licenses

* Fix typo in filename

---------

Co-authored-by: Pavlos Rontidis <pavlos.rontidis@gmail.com>
---
 Cargo.lock                                    | 199 ++++++++++++++----
 LICENSE-3rdparty.csv                          |   9 +
 changelog.d/23361_interval_ms_readable.fix.md |   3 +
 lib/vector-core/src/event/vrl_target.rs       | 150 ++++++-------
 4 files changed, 245 insertions(+), 116 deletions(-)
 create mode 100644 changelog.d/23361_interval_ms_readable.fix.md

diff --git a/Cargo.lock b/Cargo.lock
index 7be10c60ede05..5ece83e0e7cc1 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -102,6 +102,7 @@ dependencies = [
  "cfg-if",
  "getrandom 0.2.15",
  "once_cell",
+ "serde",
  "version_check",
  "zerocopy 0.7.31",
 ]
@@ -1841,6 +1842,12 @@ dependencies = [
  "serde_with 3.14.0",
 ]
 
+[[package]]
+name = "borrow-or-share"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3eeab4423108c5d7c744f4d234de88d18d636100093ae04caf4825134b9c3a32"
+
 [[package]]
 name = "brotli"
 version = "8.0.0"
@@ -1933,6 +1940,12 @@ dependencies = [
  "syn 1.0.109",
 ]
 
+[[package]]
+name = "bytecount"
+version = "0.6.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "175812e0be2bccb6abe50bb8d566126198344f707e304f45c648fd8f2cc0365e"
+
 [[package]]
 name = "bytemuck"
 version = "1.21.0"
@@ -2291,7 +2304,7 @@ dependencies = [
  "similar-asserts",
  "smallvec",
  "snafu 0.8.6",
- "syslog_loose 0.22.0",
+ "syslog_loose",
  "tokio",
  "tokio-util",
  "tracing 0.1.41",
@@ -3400,6 +3413,15 @@ dependencies = [
  "zeroize",
 ]
 
+[[package]]
+name = "email_address"
+version = "0.2.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e079f19b08ca6239f47f8ba8509c11cf3ea30095831f7fed61441475edd8c449"
+dependencies = [
+ "serde",
+]
+
 [[package]]
 name = "ena"
 version = "0.14.2"
@@ -3815,6 +3837,17 @@ dependencies = [
  "bitflags 1.3.2",
 ]
 
+[[package]]
+name = "fluent-uri"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1918b65d96df47d3591bed19c5cca17e3fa5d0707318e4b5ef2eae01764df7e5"
+dependencies = [
+ "borrow-or-share",
+ "ref-cast",
+ "serde",
+]
+
 [[package]]
 name = "flume"
 version = "0.10.14"
@@ -3871,6 +3904,16 @@ dependencies = [
  "percent-encoding",
 ]
 
+[[package]]
+name = "fraction"
+version = "0.15.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b486ab61634f05b11b591c38c71fb25139cb55e22be4fb6ecf649cc3736c074a"
+dependencies = [
+ "lazy_static",
+ "num",
+]
+
 [[package]]
 name = "fsevent-sys"
 version = "4.1.0"
@@ -4795,7 +4838,7 @@ dependencies = [
  "httpdate",
  "itoa",
  "pin-project-lite",
- "socket2 0.5.10",
+ "socket2 0.4.10",
  "tokio",
  "tower-service",
  "tracing 0.1.41",
@@ -5501,11 +5544,37 @@ version = "0.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1c6e529149475ca0b2820835d3dce8fcc41c6b943ca608d32f35b449255e4627"
 dependencies = [
- "fluent-uri",
+ "fluent-uri 0.1.4",
  "serde",
  "serde_json",
 ]
 
+[[package]]
+name = "jsonschema"
+version = "0.30.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f1b46a0365a611fbf1d2143104dcf910aada96fafd295bab16c60b802bf6fa1d"
+dependencies = [
+ "ahash 0.8.11",
+ "base64 0.22.1",
+ "bytecount",
+ "email_address",
+ "fancy-regex",
+ "fraction",
+ "idna 1.0.3",
+ "itoa",
+ "num-cmp",
+ "num-traits",
+ "once_cell",
+ "percent-encoding",
+ "referencing",
+ "regex",
+ "regex-syntax 0.8.5",
+ "serde",
+ "serde_json",
+ "uuid-simd",
+]
+
 [[package]]
 name = "k8s-e2e-tests"
 version = "0.1.0"
@@ -6010,11 +6079,11 @@ dependencies = [
 
 [[package]]
 name = "lz4_flex"
-version = "0.11.3"
+version = "0.11.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75761162ae2b0e580d7e7c390558127e5f01b4194debd6221fd8c207fc80e3f5"
+checksum = "08ab2867e3eeeca90e844d1940eab391c9dc5228783db2ed999acbc0a9ed375a"
 dependencies = [
- "twox-hash 1.6.3",
+ "twox-hash",
 ]
 
 [[package]]
@@ -6627,6 +6696,15 @@ dependencies = [
  "memchr",
 ]
 
+[[package]]
+name = "nom-language"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2de2bc5b451bfedaef92c90b8939a8fff5770bdcc1fafd6239d086aab8fa6b29"
+dependencies = [
+ "nom 8.0.0",
+]
+
 [[package]]
 name = "nonzero_ext"
 version = "0.3.0"
@@ -6694,6 +6772,20 @@ dependencies = [
  "rand 0.8.5",
 ]
 
+[[package]]
+name = "num"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b05180d69e3da0e530ba2a1dae5110317e49e3b7f3d41be227dc5f92e49ee7af"
+dependencies = [
+ "num-bigint",
+ "num-complex",
+ "num-integer",
+ "num-iter",
+ "num-rational 0.4.2",
+ "num-traits",
+]
+
 [[package]]
 name = "num-bigint"
 version = "0.4.6"
@@ -6721,6 +6813,12 @@ dependencies = [
  "zeroize",
 ]
 
+[[package]]
+name = "num-cmp"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "63335b2e2c34fae2fb0aa2cecfd9f0832a1e24b3b32ecec612c3426d46dc8aaa"
+
 [[package]]
 name = "num-complex"
 version = "0.4.4"
@@ -6778,6 +6876,17 @@ dependencies = [
  "num-traits",
 ]
 
+[[package]]
+name = "num-rational"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f83d14da390562dca69fc84082e73e548e1ad308d24accdedd2720017cb37824"
+dependencies = [
+ "num-bigint",
+ "num-integer",
+ "num-traits",
+]
+
 [[package]]
 name = "num-traits"
 version = "0.2.19"
@@ -7818,6 +7927,17 @@ dependencies = [
  "syn 2.0.104",
 ]
 
+[[package]]
+name = "proptest-derive"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "095a99f75c69734802359b682be8daaf8980296731f6470434ea2c652af1dd30"
+dependencies = [
+ "proc-macro2 1.0.95",
+ "quote 1.0.40",
+ "syn 2.0.104",
+]
+
 [[package]]
 name = "prost"
 version = "0.11.9"
@@ -7898,7 +8018,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "be769465445e8c1474e9c5dac2018218498557af32d9ed057325ec9a41ae81bf"
 dependencies = [
  "heck 0.5.0",
- "itertools 0.14.0",
+ "itertools 0.10.5",
  "log",
  "multimap",
  "once_cell",
@@ -7944,7 +8064,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8a56d757972c98b346a9b766e3f02746cde6dd1cd1d1d563472929fdd74bec4d"
 dependencies = [
  "anyhow",
- "itertools 0.14.0",
+ "itertools 0.10.5",
  "proc-macro2 1.0.95",
  "quote 1.0.40",
  "syn 2.0.104",
@@ -8581,6 +8701,20 @@ dependencies = [
  "syn 2.0.104",
 ]
 
+[[package]]
+name = "referencing"
+version = "0.30.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8eff4fa778b5c2a57e85c5f2fe3a709c52f0e60d23146e2151cbef5893f420e"
+dependencies = [
+ "ahash 0.8.11",
+ "fluent-uri 0.3.2",
+ "once_cell",
+ "parking_lot",
+ "percent-encoding",
+ "serde_json",
+]
+
 [[package]]
 name = "regex"
 version = "1.11.1"
@@ -10335,16 +10469,6 @@ dependencies = [
  "time",
 ]
 
-[[package]]
-name = "syslog_loose"
-version = "0.21.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "161028c00842709450114c39db3b29f44c898055ed8833bb9b535aba7facf30e"
-dependencies = [
- "chrono",
- "nom 7.1.3",
-]
-
 [[package]]
 name = "syslog_loose"
 version = "0.22.0"
@@ -11335,16 +11459,6 @@ dependencies = [
  "utf-8",
 ]
 
-[[package]]
-name = "twox-hash"
-version = "1.6.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675"
-dependencies = [
- "cfg-if",
- "static_assertions",
-]
-
 [[package]]
 name = "twox-hash"
 version = "2.1.1"
@@ -11557,7 +11671,7 @@ version = "0.31.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b1ee6bfd0a27bf614353809a035cf6880b74239ec6c5e39a7b2860ca16809137"
 dependencies = [
- "num-rational",
+ "num-rational 0.3.2",
  "num-traits",
  "typenum",
 ]
@@ -11623,6 +11737,17 @@ dependencies = [
  "wasm-bindgen",
 ]
 
+[[package]]
+name = "uuid-simd"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "23b082222b4f6619906941c17eb2297fff4c2fb96cb60164170522942a200bd8"
+dependencies = [
+ "outref",
+ "uuid",
+ "vsimd",
+]
+
 [[package]]
 name = "valuable"
 version = "0.1.0"
@@ -11799,7 +11924,7 @@ dependencies = [
  "portpicker",
  "postgres-openssl",
  "proptest",
- "proptest-derive",
+ "proptest-derive 0.5.1",
  "prost 0.12.6",
  "prost-build 0.12.6",
  "prost-reflect",
@@ -12119,7 +12244,7 @@ name = "vector-lookup"
 version = "0.1.0"
 dependencies = [
  "proptest",
- "proptest-derive",
+ "proptest-derive 0.5.1",
  "serde",
  "vector-config",
  "vector-config-macros",
@@ -12141,7 +12266,7 @@ dependencies = [
  "tokio-util",
  "tower 0.5.2",
  "tracing 0.1.41",
- "twox-hash 2.1.1",
+ "twox-hash",
  "vector-common",
  "vector-core",
 ]
@@ -12233,7 +12358,7 @@ checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d"
 [[package]]
 name = "vrl"
 version = "0.25.0"
-source = "git+https://github.com/vectordotdev/vrl.git?branch=main#25ec43955c030f6f51e7d8353a7fc3388664ca02"
+source = "git+https://github.com/vectordotdev/vrl.git?branch=main#e717f1820138a0da0394fe609fd7d9bf072f95e2"
 dependencies = [
  "aes",
  "aes-siv",
@@ -12278,12 +12403,14 @@ dependencies = [
  "indoc",
  "influxdb-line-protocol",
  "itertools 0.14.0",
+ "jsonschema",
  "lalrpop",
  "lalrpop-util",
  "lz4_flex",
  "md-5",
  "mlua",
- "nom 7.1.3",
+ "nom 8.0.0",
+ "nom-language",
  "ofb",
  "onig",
  "ordered-float 4.6.0",
@@ -12295,7 +12422,7 @@ dependencies = [
  "prettydiff",
  "prettytable-rs",
  "proptest",
- "proptest-derive",
+ "proptest-derive 0.6.0",
  "prost 0.13.5",
  "prost-reflect",
  "psl",
@@ -12319,7 +12446,7 @@ dependencies = [
  "snafu 0.8.6",
  "snap",
  "strip-ansi-escapes",
- "syslog_loose 0.21.0",
+ "syslog_loose",
  "termcolor",
  "thiserror 2.0.3",
  "tokio",
diff --git a/LICENSE-3rdparty.csv b/LICENSE-3rdparty.csv
index d1be769292d5c..b74c671b206cb 100644
--- a/LICENSE-3rdparty.csv
+++ b/LICENSE-3rdparty.csv
@@ -104,12 +104,14 @@ block-padding,https://github.com/RustCrypto/utils,MIT OR Apache-2.0,RustCrypto D
 blocking,https://github.com/smol-rs/blocking,Apache-2.0 OR MIT,Stjepan Glavina <stjepang@gmail.com>
 bloomy,https://docs.rs/bloomy/,MIT,"Aleksandr Bezobchuk <aleks.bezobchuk@gmail.com>, Alexis Sellier <self@cloudhead.io>"
 bollard,https://github.com/fussybeaver/bollard,Apache-2.0,Bollard contributors
+borrow-or-share,https://github.com/yescallop/borrow-or-share,MIT-0,Scallop Ye <yescallop@gmail.com>
 brotli,https://github.com/dropbox/rust-brotli,BSD-3-Clause AND MIT,"Daniel Reiter Horn <danielrh@dropbox.com>, The Brotli Authors"
 brotli-decompressor,https://github.com/dropbox/rust-brotli-decompressor,BSD-3-Clause OR MIT,"Daniel Reiter Horn <danielrh@dropbox.com>, The Brotli Authors"
 bson,https://github.com/mongodb/bson-rust,MIT,"Y. T. Chung <zonyitoo@gmail.com>, Kevin Yeh <kevinyeah@utexas.edu>, Saghm Rossi <saghmrossi@gmail.com>, Patrick Freed <patrick.freed@mongodb.com>, Isabel Atkinson <isabel.atkinson@mongodb.com>, Abraham Egnor <abraham.egnor@mongodb.com>"
 bstr,https://github.com/BurntSushi/bstr,MIT OR Apache-2.0,Andrew Gallant <jamslam@gmail.com>
 bumpalo,https://github.com/fitzgen/bumpalo,MIT OR Apache-2.0,Nick Fitzgerald <fitzgen@gmail.com>
 bytecheck,https://github.com/djkoloski/bytecheck,MIT,David Koloski <djkoloski@gmail.com>
+bytecount,https://github.com/llogiq/bytecount,Apache-2.0 OR MIT,"Andre Bogus <bogusandre@gmail.de>, Joshua Landau <joshua@landau.ws>"
 bytemuck,https://github.com/Lokathor/bytemuck,Zlib OR Apache-2.0 OR MIT,Lokathor <zefria@gmail.com>
 byteorder,https://github.com/BurntSushi/byteorder,Unlicense OR MIT,Andrew Gallant <jamslam@gmail.com>
 bytes,https://github.com/carllerche/bytes,MIT,Carl Lerche <me@carllerche.com>
@@ -206,6 +208,7 @@ ed25519,https://github.com/RustCrypto/signatures/tree/master/ed25519,Apache-2.0
 ed25519-dalek,https://github.com/dalek-cryptography/ed25519-dalek,BSD-3-Clause,"isis lovecruft <isis@patternsinthevoid.net>, Tony Arcieri <bascule@gmail.com>, Michael Rosenberg <michael@mrosenberg.pub>"
 either,https://github.com/bluss/either,MIT OR Apache-2.0,bluss
 elliptic-curve,https://github.com/RustCrypto/traits/tree/master/elliptic-curve,Apache-2.0 OR MIT,RustCrypto Developers
+email_address,https://github.com/johnstonskj/rust-email_address,MIT,Simon Johnston <johnstonskj@gmail.com>
 encode_unicode,https://github.com/tormol/encode_unicode,Apache-2.0 OR MIT,Torbjørn Birch Moltu <t.b.moltu@lyse.net>
 encoding_rs,https://github.com/hsivonen/encoding_rs,(Apache-2.0 OR MIT) AND BSD-3-Clause,Henri Sivonen <hsivonen@hsivonen.fi>
 endian-type,https://github.com/Lolirofle/endian-type,MIT,Lolirofle <lolipopple@hotmail.com>
@@ -240,6 +243,7 @@ flume,https://github.com/zesterer/flume,Apache-2.0 OR MIT,Joshua Barretto <joshu
 fnv,https://github.com/servo/rust-fnv,Apache-2.0  OR  MIT,Alex Crichton <alex@alexcrichton.com>
 foldhash,https://github.com/orlp/foldhash,Zlib,Orson Peters <orsonpeters@gmail.com>
 foreign-types,https://github.com/sfackler/foreign-types,MIT OR Apache-2.0,Steven Fackler <sfackler@gmail.com>
+fraction,https://github.com/dnsl48/fraction,MIT OR Apache-2.0,dnsl48 <dnsl48@gmail.com>
 fsevent-sys,https://github.com/octplane/fsevent-rust/tree/master/fsevent-sys,MIT,Pierre Baillet <pierre@baillet.name>
 fslock,https://github.com/brunoczim/fslock,MIT,The fslock Authors
 funty,https://github.com/myrrlyn/funty,MIT,myrrlyn <self@myrrlyn.dev>
@@ -346,6 +350,7 @@ js-sys,https://github.com/rustwasm/wasm-bindgen/tree/master/crates/js-sys,MIT OR
 json-patch,https://github.com/idubrov/json-patch,MIT OR Apache-2.0,Ivan Dubrov <dubrov.ivan@gmail.com>
 jsonpath-rust,https://github.com/besok/jsonpath-rust,MIT,BorisZhguchev <zhguchev@gmail.com>
 jsonptr,https://github.com/chanced/jsonptr,MIT OR Apache-2.0,chance dinkins
+jsonschema,https://github.com/Stranger6667/jsonschema,MIT,Dmitry Dygalo <dmitry@dygalo.dev>
 k8s-openapi,https://github.com/Arnavion/k8s-openapi,Apache-2.0,Arnav Singh <me@arnavion.dev>
 keccak,https://github.com/RustCrypto/sponges/tree/master/keccak,Apache-2.0 OR MIT,RustCrypto Developers
 kqueue,https://gitlab.com/rust-kqueue/rust-kqueue,MIT,William Orr <will@worrbase.com>
@@ -419,8 +424,11 @@ notify-types,https://github.com/notify-rs/notify,MIT OR Apache-2.0,Daniel Faust
 ntapi,https://github.com/MSxDOS/ntapi,Apache-2.0 OR MIT,MSxDOS <melcodos@gmail.com>
 nu-ansi-term,https://github.com/nushell/nu-ansi-term,MIT,"ogham@bsago.me, Ryan Scheel (Havvy) <ryan.havvy@gmail.com>, Josh Triplett <josh@joshtriplett.org>, The Nushell Project Developers"
 nuid,https://github.com/casualjim/rs-nuid,Apache-2.0,Ivan Porto Carrero <ivan@oflanders.co.nz>
+num,https://github.com/rust-num/num,MIT OR Apache-2.0,The Rust Project Developers
 num-bigint,https://github.com/rust-num/num-bigint,MIT OR Apache-2.0,The Rust Project Developers
 num-bigint-dig,https://github.com/dignifiedquire/num-bigint,MIT OR Apache-2.0,"dignifiedquire <dignifiedquire@gmail.com>, The Rust Project Developers"
+num-cmp,https://github.com/lifthrasiir/num-cmp,MIT OR Apache-2.0,Kang Seonghoon <public+git@mearie.org>
+num-complex,https://github.com/rust-num/num-complex,MIT OR Apache-2.0,The Rust Project Developers
 num-conv,https://github.com/jhpratt/num-conv,MIT OR Apache-2.0,Jacob Pratt <jacob@jhpratt.dev>
 num-format,https://github.com/bcmyers/num-format,MIT OR Apache-2.0,Brian Myers <brian.carl.myers@gmail.com>
 num-integer,https://github.com/rust-num/num-integer,MIT OR Apache-2.0,The Rust Project Developers
@@ -707,6 +715,7 @@ utf16_iter,https://github.com/hsivonen/utf16_iter,Apache-2.0 OR MIT,Henri Sivone
 utf8-width,https://github.com/magiclen/utf8-width,MIT,Magic Len <len@magiclen.org>
 utf8_iter,https://github.com/hsivonen/utf8_iter,Apache-2.0 OR MIT,Henri Sivonen <hsivonen@hsivonen.fi>
 uuid,https://github.com/uuid-rs/uuid,Apache-2.0 OR MIT,"Ashley Mannix<ashleymannix@live.com.au>, Dylan DPC<dylan.dpc@gmail.com>, Hunar Roop Kahlon<hunar.roop@gmail.com>"
+uuid-simd,https://github.com/Nugine/simd,MIT,The uuid-simd Authors
 valuable,https://github.com/tokio-rs/valuable,MIT,The valuable Authors
 void,https://github.com/reem/rust-void,MIT,Jonathan Reem <jonathan.reem@gmail.com>
 vrl,https://github.com/vectordotdev/vrl,MPL-2.0,Vector Contributors <vector@datadoghq.com>
diff --git a/changelog.d/23361_interval_ms_readable.fix.md b/changelog.d/23361_interval_ms_readable.fix.md
new file mode 100644
index 0000000000000..ac122825e6a73
--- /dev/null
+++ b/changelog.d/23361_interval_ms_readable.fix.md
@@ -0,0 +1,3 @@
+VRL programs can now read the `interval_ms` field. This field was previously writeable but not readable.
+
+authors: thomasqueirozb
diff --git a/lib/vector-core/src/event/vrl_target.rs b/lib/vector-core/src/event/vrl_target.rs
index ddb8507dce1e3..8916c76adfb45 100644
--- a/lib/vector-core/src/event/vrl_target.rs
+++ b/lib/vector-core/src/event/vrl_target.rs
@@ -549,99 +549,86 @@ fn target_get_mut_metric<'a>(
 /// This structure is partially populated based on the fields accessed by
 /// the VRL program as informed by `ProgramInfo`.
 fn precompute_metric_value(metric: &Metric, info: &ProgramInfo) -> Value {
-    let mut map = ObjectMap::default();
-
-    let mut set_name = false;
-    let mut set_kind = false;
-    let mut set_type = false;
-    let mut set_namespace = false;
-    let mut set_timestamp = false;
-    let mut set_tags = false;
-
-    for target_path in &info.target_queries {
-        // Accessing a root path requires us to pre-populate all fields.
-        if target_path == &OwnedTargetPath::event_root() {
-            if !set_name {
-                map.insert("name".into(), metric.name().to_owned().into());
-            }
+    struct MetricProperty {
+        property: &'static str,
+        getter: fn(&Metric) -> Option<Value>,
+        set: bool,
+    }
 
-            if !set_kind {
-                map.insert("kind".into(), metric.kind().into());
+    impl MetricProperty {
+        fn new(property: &'static str, getter: fn(&Metric) -> Option<Value>) -> Self {
+            Self {
+                property,
+                getter,
+                set: false,
             }
+        }
 
-            if !set_type {
-                map.insert("type".into(), metric.value().clone().into());
+        fn insert(&mut self, metric: &Metric, map: &mut ObjectMap) {
+            if self.set {
+                return;
             }
-
-            if !set_namespace {
-                if let Some(namespace) = metric.namespace() {
-                    map.insert("namespace".into(), namespace.to_owned().into());
-                }
+            if let Some(value) = (self.getter)(metric) {
+                map.insert(self.property.into(), value);
+                self.set = true;
             }
+        }
+    }
 
-            if !set_timestamp {
-                if let Some(timestamp) = metric.timestamp() {
-                    map.insert("timestamp".into(), timestamp.into());
-                }
-            }
+    let mut name = MetricProperty::new("name", |metric| Some(metric.name().to_owned().into()));
+    let mut kind = MetricProperty::new("kind", |metric| Some(metric.kind().into()));
+    let mut type_ = MetricProperty::new("type", |metric| Some(metric.value().clone().into()));
+    let mut namespace = MetricProperty::new("namespace", |metric| {
+        metric.namespace().map(String::from).map(Into::into)
+    });
+    let mut interval_ms =
+        MetricProperty::new("interval_ms", |metric| metric.interval_ms().map(Into::into));
+    let mut timestamp =
+        MetricProperty::new("timestamp", |metric| metric.timestamp().map(Into::into));
+    let mut tags = MetricProperty::new("tags", |metric| {
+        metric.tags().cloned().map(|tags| {
+            tags.into_iter_single()
+                .map(|(tag, value)| (tag.into(), value.into()))
+                .collect::<ObjectMap>()
+                .into()
+        })
+    });
 
-            if !set_tags {
-                if let Some(tags) = metric.tags().cloned() {
-                    map.insert(
-                        "tags".into(),
-                        tags.into_iter_single()
-                            .map(|(tag, value)| (tag.into(), value.into()))
-                            .collect::<ObjectMap>()
-                            .into(),
-                    );
-                }
-            }
+    let mut map = ObjectMap::default();
 
+    for target_path in &info.target_queries {
+        // Accessing a root path requires us to pre-populate all fields.
+        if target_path == &OwnedTargetPath::event_root() {
+            let mut properties = [
+                &mut name,
+                &mut kind,
+                &mut type_,
+                &mut namespace,
+                &mut interval_ms,
+                &mut timestamp,
+                &mut tags,
+            ];
+            properties
+                .iter_mut()
+                .for_each(|property| property.insert(metric, &mut map));
             break;
         }
 
         // For non-root paths, we continuously populate the value with the
         // relevant data.
         if let Some(OwnedSegment::Field(field)) = target_path.path.segments.first() {
-            match field.as_ref() {
-                "name" if !set_name => {
-                    set_name = true;
-                    map.insert("name".into(), metric.name().to_owned().into());
-                }
-                "kind" if !set_kind => {
-                    set_kind = true;
-                    map.insert("kind".into(), metric.kind().into());
-                }
-                "type" if !set_type => {
-                    set_type = true;
-                    map.insert("type".into(), metric.value().clone().into());
-                }
-                "namespace" if !set_namespace && metric.namespace().is_some() => {
-                    set_namespace = true;
-                    map.insert(
-                        "namespace".into(),
-                        metric.namespace().unwrap().to_owned().into(),
-                    );
-                }
-                "timestamp" if !set_timestamp && metric.timestamp().is_some() => {
-                    set_timestamp = true;
-                    map.insert("timestamp".into(), metric.timestamp().unwrap().into());
-                }
-                "tags" if !set_tags && metric.tags().is_some() => {
-                    set_tags = true;
-                    map.insert(
-                        "tags".into(),
-                        metric
-                            .tags()
-                            .cloned()
-                            .unwrap()
-                            .into_iter_single()
-                            .map(|(tag, value)| (tag.into(), value.into()))
-                            .collect::<ObjectMap>()
-                            .into(),
-                    );
-                }
-                _ => {}
+            let property = match field.as_ref() {
+                "name" => Some(&mut name),
+                "kind" => Some(&mut kind),
+                "type" => Some(&mut type_),
+                "namespace" => Some(&mut namespace),
+                "timestamp" => Some(&mut timestamp),
+                "interval_ms" => Some(&mut interval_ms),
+                "tags" => Some(&mut tags),
+                _ => None,
+            };
+            if let Some(property) = property {
+                property.insert(metric, &mut map);
             }
         }
     }
@@ -1098,7 +1085,8 @@ mod test {
             Utc.with_ymd_and_hms(2020, 12, 10, 12, 0, 0)
                 .single()
                 .expect("invalid timestamp"),
-        ));
+        ))
+        .with_interval_ms(Some(NonZero::<u32>::new(507).unwrap()));
 
         let info = ProgramInfo {
             fallible: false,
@@ -1106,6 +1094,7 @@ mod test {
             target_queries: vec![
                 OwnedTargetPath::event(owned_value_path!("name")),
                 OwnedTargetPath::event(owned_value_path!("namespace")),
+                OwnedTargetPath::event(owned_value_path!("interval_ms")),
                 OwnedTargetPath::event(owned_value_path!("timestamp")),
                 OwnedTargetPath::event(owned_value_path!("kind")),
                 OwnedTargetPath::event(owned_value_path!("type")),
@@ -1120,6 +1109,7 @@ mod test {
                 btreemap! {
                     "name" => "zub",
                     "namespace" => "zoob",
+                    "interval_ms" => 507,
                     "timestamp" => Utc.with_ymd_and_hms(2020, 12, 10, 12, 0, 0).single().expect("invalid timestamp"),
                     "tags" => btreemap! { "tig" => "tog" },
                     "kind" => "absolute",

From b63361ae2c908d1d2547d37da69d010cbf728112 Mon Sep 17 00:00:00 2001
From: Jesse Szwedko <jesse.szwedko@datadoghq.com>
Date: Mon, 14 Jul 2025 11:45:42 -0700
Subject: [PATCH 171/305] fix(codecs): Ensure that batches using newline
 delimited framing end in a newline (#21097)

* fix(codecs): Ensure that batches using newline delimited framing end in a newline

Fixes: #21086

Signed-off-by: Jesse Szwedko <jesse.szwedko@datadoghq.com>

* Update tests and handle empty batches

Signed-off-by: Jesse Szwedko <jesse.szwedko@datadoghq.com>

* fix changelog

---------

Signed-off-by: Jesse Szwedko <jesse.szwedko@datadoghq.com>
Co-authored-by: Pavlos Rontidis <pavlos.rontidis@gmail.com>
---
 changelog.d/batch-newline.fix.md |  3 +++
 src/codecs/encoding/encoder.rs   | 25 +++++++++++++++++++++++--
 src/sinks/util/encoding.rs       | 11 ++++++-----
 3 files changed, 32 insertions(+), 7 deletions(-)
 create mode 100644 changelog.d/batch-newline.fix.md

diff --git a/changelog.d/batch-newline.fix.md b/changelog.d/batch-newline.fix.md
new file mode 100644
index 0000000000000..0c38c41dd74cd
--- /dev/null
+++ b/changelog.d/batch-newline.fix.md
@@ -0,0 +1,3 @@
+Batches encoded using newline delimited framing now end with a trailing newline.
+
+authors: jszwedko
diff --git a/src/codecs/encoding/encoder.rs b/src/codecs/encoding/encoder.rs
index e461e6834f53b..2f294d0aae783 100644
--- a/src/codecs/encoding/encoder.rs
+++ b/src/codecs/encoding/encoder.rs
@@ -93,12 +93,14 @@ impl Encoder<Framer> {
     }
 
     /// Get the suffix that encloses a batch of events.
-    pub const fn batch_suffix(&self) -> &[u8] {
-        match (&self.framer, &self.serializer) {
+    pub const fn batch_suffix(&self, empty: bool) -> &[u8] {
+        match (&self.framer, &self.serializer, empty) {
             (
                 Framer::CharacterDelimited(CharacterDelimitedEncoder { delimiter: b',' }),
                 Serializer::Json(_) | Serializer::NativeJson(_),
+                _,
             ) => b"]",
+            (Framer::NewlineDelimited(_), _, false) => b"\n",
             _ => &[],
         }
     }
@@ -323,4 +325,23 @@ mod tests {
         let sink = framed.into_inner();
         assert_eq!(sink, b"(foo)(bar)");
     }
+
+    #[tokio::test]
+    async fn test_encode_batch_newline() {
+        let encoder = Encoder::<Framer>::new(
+            Framer::NewlineDelimited(NewlineDelimitedEncoder::default()),
+            TextSerializerConfig::default().build().into(),
+        );
+        let source = futures::stream::iter(vec![
+            Event::Log(LogEvent::from("bar")),
+            Event::Log(LogEvent::from("baz")),
+            Event::Log(LogEvent::from("bat")),
+        ])
+        .map(Ok);
+        let sink: Vec<u8> = Vec::new();
+        let mut framed = FramedWrite::new(sink, encoder);
+        source.forward(&mut framed).await.unwrap();
+        let sink = framed.into_inner();
+        assert_eq!(sink, b"bar\nbaz\nbat\n");
+    }
 }
diff --git a/src/sinks/util/encoding.rs b/src/sinks/util/encoding.rs
index 2958da0f9173e..f7f75be1db4be 100644
--- a/src/sinks/util/encoding.rs
+++ b/src/sinks/util/encoding.rs
@@ -31,6 +31,7 @@ impl Encoder<Vec<Event>> for (Transformer, crate::codecs::Encoder<Framer>) {
         let mut encoder = self.1.clone();
         let mut bytes_written = 0;
         let mut n_events_pending = events.len();
+        let is_empty = events.is_empty();
         let batch_prefix = encoder.batch_prefix();
         write_all(writer, n_events_pending, batch_prefix)?;
         bytes_written += batch_prefix.len();
@@ -65,7 +66,7 @@ impl Encoder<Vec<Event>> for (Transformer, crate::codecs::Encoder<Framer>) {
             n_events_pending -= 1;
         }
 
-        let batch_suffix = encoder.batch_suffix();
+        let batch_suffix = encoder.batch_suffix(is_empty);
         assert!(n_events_pending == 0);
         write_all(writer, 0, batch_suffix)?;
         bytes_written += batch_suffix.len();
@@ -295,9 +296,9 @@ mod tests {
             .sum::<JsonSize>();
 
         let (written, json_size) = encoding.encode_input(input, &mut writer).unwrap();
-        assert_eq!(written, 15);
+        assert_eq!(written, 16);
 
-        assert_eq!(String::from_utf8(writer).unwrap(), r#"{"key":"value"}"#);
+        assert_eq!(String::from_utf8(writer).unwrap(), "{\"key\":\"value\"}\n");
         assert_eq!(CountByteSize(1, input_json_size), json_size.size().unwrap());
     }
 
@@ -332,11 +333,11 @@ mod tests {
             .sum::<JsonSize>();
 
         let (written, json_size) = encoding.encode_input(input, &mut writer).unwrap();
-        assert_eq!(written, 50);
+        assert_eq!(written, 51);
 
         assert_eq!(
             String::from_utf8(writer).unwrap(),
-            "{\"key\":\"value1\"}\n{\"key\":\"value2\"}\n{\"key\":\"value3\"}"
+            "{\"key\":\"value1\"}\n{\"key\":\"value2\"}\n{\"key\":\"value3\"}\n"
         );
         assert_eq!(CountByteSize(3, input_json_size), json_size.size().unwrap());
     }

From 25353d2976285b29127730f27b76d01e0c537a50 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 14 Jul 2025 20:22:36 +0000
Subject: [PATCH 172/305] chore(website deps): Bump brace-expansion from 1.1.11
 to 1.1.12 in /website in the npm_and_yarn group (#23372)

chore(website deps): Bump brace-expansion

Bumps the npm_and_yarn group in /website with 1 update: [brace-expansion](https://github.com/juliangruber/brace-expansion).


Updates `brace-expansion` from 1.1.11 to 1.1.12
- [Release notes](https://github.com/juliangruber/brace-expansion/releases)
- [Commits](https://github.com/juliangruber/brace-expansion/compare/1.1.11...v1.1.12)

---
updated-dependencies:
- dependency-name: brace-expansion
  dependency-version: 1.1.12
  dependency-type: indirect
  dependency-group: npm_and_yarn
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 website/yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/website/yarn.lock b/website/yarn.lock
index 4981d7ac7cd3b..f748d123269f1 100644
--- a/website/yarn.lock
+++ b/website/yarn.lock
@@ -1908,9 +1908,9 @@ boolbase@^1.0.0:
   integrity sha1-aN/1++YMUes3cl6p4+0xDcwed24=
 
 brace-expansion@^1.1.7:
-  version "1.1.11"
-  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
-  integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==
+  version "1.1.12"
+  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.12.tgz#ab9b454466e5a8cc3a187beaad580412a9c5b843"
+  integrity sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==
   dependencies:
     balanced-match "^1.0.0"
     concat-map "0.0.1"

From d86dc3bd6186a283b6c10e1d242695ca5c96009a Mon Sep 17 00:00:00 2001
From: Thomas <thomas.schneider@datadoghq.com>
Date: Mon, 14 Jul 2025 17:53:51 -0400
Subject: [PATCH 173/305] fix(ci): remove token permissions for changelog
 workflow (#23376)

---
 .github/workflows/changelog.yaml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/workflows/changelog.yaml b/.github/workflows/changelog.yaml
index 76f92e5f94ecc..800cb00880ddf 100644
--- a/.github/workflows/changelog.yaml
+++ b/.github/workflows/changelog.yaml
@@ -18,6 +18,10 @@ on:
 
 jobs:
   validate-changelog:
+    permissions:
+      contents: read
+      pull-requests: none
+
     runs-on: ubuntu-24.04
 
     env:

From c5a98b2497cae632df1e51a7048af039f4802a5d Mon Sep 17 00:00:00 2001
From: Jorge Hermo <jorgehermogonzalez@gmail.com>
Date: Mon, 14 Jul 2025 23:36:15 +0200
Subject: [PATCH 174/305] feat(http sink): templateable uri (#23288)

* feat: templateable http uri

* test: add test for templatable uri

* test: add tests for templatable uri

* feat: fast committed

* feat: fast committed

* feat: fast committed

* feat: fast committed

* feat: fast committed

* revert: concurrent map fix

* chore: update changelog

* refactor: batch config

* refactor: move create_events utility to test_util

* test: update batch nofitier handling

* refactor: new run_and_assert_sink_error_with_events utility function

* refactor: new run_and_assert_sink_error_with_events utility function

* refactor: new run_and_assert_sink_error_with_events utility function

* clippy fixes

* fix: clippy lints

* chore: make generate-component-docs

* make generate-component-docs

---------

Co-authored-by: Pavlos Rontidis <pavlos.rontidis@gmail.com>
---
 benches/http.rs                               |  10 +-
 ...1155_http_sink_templateable_uri.feature.md |   4 +
 src/sinks/http/batch.rs                       |   2 +-
 src/sinks/http/config.rs                      |  15 +-
 src/sinks/http/request_builder.rs             |  22 +-
 src/sinks/http/service.rs                     |  27 +-
 src/sinks/http/sink.rs                        |  53 +++-
 src/sinks/http/tests.rs                       | 250 +++++++++++++++++-
 src/test_util/components.rs                   |  60 ++++-
 src/test_util/mod.rs                          |  15 +-
 .../components/sinks/generated/http.cue       |   5 +-
 .../sinks/generated/opentelemetry.cue         |   5 +-
 12 files changed, 419 insertions(+), 49 deletions(-)
 create mode 100644 changelog.d/1155_http_sink_templateable_uri.feature.md

diff --git a/benches/http.rs b/benches/http.rs
index b60b25a49556f..84d97eb1a6be1 100644
--- a/benches/http.rs
+++ b/benches/http.rs
@@ -8,9 +8,13 @@ use hyper::{
 };
 use tokio::runtime::Runtime;
 use vector::{
-    config, sinks,
-    sinks::util::{BatchConfig, Compression},
+    config,
+    sinks::{
+        self,
+        util::{BatchConfig, Compression},
+    },
     sources,
+    template::Template,
     test_util::{next_addr, random_lines, runtime, send_lines, start_topology, wait_for_tcp},
     Error,
 };
@@ -48,7 +52,7 @@ fn benchmark_http(c: &mut Criterion) {
                             "out",
                             &["in"],
                             sinks::http::config::HttpSinkConfig {
-                                uri: out_addr.to_string().parse::<http::Uri>().unwrap().into(),
+                                uri: Template::try_from(out_addr.to_string()).unwrap(),
                                 compression: *compression,
                                 method: Default::default(),
                                 auth: Default::default(),
diff --git a/changelog.d/1155_http_sink_templateable_uri.feature.md b/changelog.d/1155_http_sink_templateable_uri.feature.md
new file mode 100644
index 0000000000000..5d0a44fca7e9c
--- /dev/null
+++ b/changelog.d/1155_http_sink_templateable_uri.feature.md
@@ -0,0 +1,4 @@
+`http` sink's uri config is now templateable, allowing to use fields from events
+to build the uri.
+
+authors: jorgehermo9
diff --git a/src/sinks/http/batch.rs b/src/sinks/http/batch.rs
index f433501f9070f..deb4b8e0e1d1d 100644
--- a/src/sinks/http/batch.rs
+++ b/src/sinks/http/batch.rs
@@ -7,7 +7,7 @@ use vector_lib::{event::Event, ByteSizeOf, EstimatedJsonEncodedSizeOf};
 use crate::codecs::Encoder;
 
 /// Uses the configured encoder to determine batch sizing.
-#[derive(Default)]
+#[derive(Default, Clone)]
 pub(super) struct HttpBatchSizer {
     pub(super) encoder: Encoder<Framer>,
 }
diff --git a/src/sinks/http/config.rs b/src/sinks/http/config.rs
index 4094768c34a43..cf72ffbc164ff 100644
--- a/src/sinks/http/config.rs
+++ b/src/sinks/http/config.rs
@@ -48,7 +48,7 @@ pub struct HttpSinkConfig {
     ///
     /// This should include the protocol and host, but can also include the port, path, and any other valid part of a URI.
     #[configurable(metadata(docs::examples = "https://10.22.212.22:9000/endpoint"))]
-    pub uri: UriSerde,
+    pub uri: Template,
 
     /// The HTTP method to use when making the request.
     #[serde(default)]
@@ -286,9 +286,8 @@ impl SinkConfig for HttpSinkConfig {
         });
 
         let http_sink_request_builder = HttpSinkRequestBuilder::new(
-            self.uri.with_default_parts(),
             self.method,
-            self.auth.choose_one(&self.uri.auth)?,
+            self.auth.clone(),
             headers,
             content_type,
             content_encoding,
@@ -330,7 +329,7 @@ impl SinkConfig for HttpSinkConfig {
             .settings(request_limits, http_response_retry_logic())
             .service(service);
 
-        let sink = HttpSink::new(service, batch_settings, request_builder);
+        let sink = HttpSink::new(service, self.uri.clone(), batch_settings, request_builder);
 
         Ok((VectorSink::from_event_streamsink(sink), healthcheck))
     }
@@ -370,9 +369,11 @@ mod tests {
             use vector_lib::codecs::{JsonSerializerConfig, MetricTagValues};
             use vector_lib::config::LogNamespace;
 
+            let endpoint = "http://127.0.0.1:9000/endpoint";
+            let uri = UriSerde::from_str(endpoint).expect("should never fail to parse");
+
             let config = HttpSinkConfig {
-                uri: UriSerde::from_str("http://127.0.0.1:9000/endpoint")
-                    .expect("should never fail to parse"),
+                uri: Template::try_from(endpoint).expect("should never fail to parse"),
                 method: HttpMethod::Post,
                 encoding: EncodingConfigWithFraming::new(
                     None,
@@ -396,7 +397,7 @@ mod tests {
 
             let external_resource = ExternalResource::new(
                 ResourceDirection::Push,
-                HttpResourceConfig::from_parts(config.uri.uri.clone(), Some(config.method.into())),
+                HttpResourceConfig::from_parts(uri.uri, Some(config.method.into())),
                 config.encoding.clone(),
             );
 
diff --git a/src/sinks/http/request_builder.rs b/src/sinks/http/request_builder.rs
index 0b08ef7677c9b..78c776516bc82 100644
--- a/src/sinks/http/request_builder.rs
+++ b/src/sinks/http/request_builder.rs
@@ -3,7 +3,7 @@
 use bytes::Bytes;
 use std::io;
 
-use crate::sinks::{prelude::*, util::http::HttpRequest};
+use crate::sinks::{http::sink::PartitionKey, prelude::*, util::http::HttpRequest};
 
 use super::encoder::HttpEncoder;
 
@@ -12,12 +12,12 @@ pub(super) struct HttpRequestBuilder {
     pub(super) compression: Compression,
 }
 
-impl RequestBuilder<Vec<Event>> for HttpRequestBuilder {
-    type Metadata = EventFinalizers;
+impl RequestBuilder<(PartitionKey, Vec<Event>)> for HttpRequestBuilder {
+    type Metadata = (PartitionKey, EventFinalizers);
     type Events = Vec<Event>;
     type Encoder = HttpEncoder;
     type Payload = Bytes;
-    type Request = HttpRequest<()>;
+    type Request = HttpRequest<PartitionKey>;
     type Error = io::Error;
 
     fn compression(&self) -> Compression {
@@ -30,11 +30,13 @@ impl RequestBuilder<Vec<Event>> for HttpRequestBuilder {
 
     fn split_input(
         &self,
-        mut events: Vec<Event>,
+        input: (PartitionKey, Vec<Event>),
     ) -> (Self::Metadata, RequestMetadataBuilder, Self::Events) {
+        let (partition_key, mut events) = input;
+
         let finalizers = events.take_finalizers();
         let builder = RequestMetadataBuilder::from_events(&events);
-        (finalizers, builder, events)
+        ((partition_key, finalizers), builder, events)
     }
 
     fn build_request(
@@ -43,6 +45,12 @@ impl RequestBuilder<Vec<Event>> for HttpRequestBuilder {
         request_metadata: RequestMetadata,
         payload: EncodeResult<Self::Payload>,
     ) -> Self::Request {
-        HttpRequest::new(payload.into_payload(), metadata, request_metadata, ())
+        let (partition_key, finalizers) = metadata;
+        HttpRequest::new(
+            payload.into_payload(),
+            finalizers,
+            request_metadata,
+            partition_key,
+        )
     }
 }
diff --git a/src/sinks/http/service.rs b/src/sinks/http/service.rs
index 460482e6b6800..c8e9503ea2dce 100644
--- a/src/sinks/http/service.rs
+++ b/src/sinks/http/service.rs
@@ -1,14 +1,16 @@
 //! Service implementation for the `http` sink.
 
+use std::str::FromStr;
+
 use bytes::Bytes;
 use http::{
     header::{CONTENT_ENCODING, CONTENT_TYPE},
-    HeaderName, HeaderValue, Method, Request, Uri,
+    HeaderName, HeaderValue, Method, Request,
 };
 use indexmap::IndexMap;
 
 use crate::{
-    http::Auth,
+    http::{Auth, MaybeAuth},
     sinks::{
         util::{
             http::{HttpRequest, HttpServiceRequestBuilder},
@@ -20,10 +22,10 @@ use crate::{
 use snafu::ResultExt;
 
 use super::config::HttpMethod;
+use super::sink::PartitionKey;
 
 #[derive(Debug, Clone)]
 pub(super) struct HttpSinkRequestBuilder {
-    uri: UriSerde,
     method: HttpMethod,
     auth: Option<Auth>,
     headers: IndexMap<HeaderName, HeaderValue>,
@@ -34,7 +36,6 @@ pub(super) struct HttpSinkRequestBuilder {
 impl HttpSinkRequestBuilder {
     /// Creates a new `HttpSinkRequestBuilder`
     pub(super) const fn new(
-        uri: UriSerde,
         method: HttpMethod,
         auth: Option<Auth>,
         headers: IndexMap<HeaderName, HeaderValue>,
@@ -42,7 +43,6 @@ impl HttpSinkRequestBuilder {
         content_encoding: Option<String>,
     ) -> Self {
         Self {
-            uri,
             method,
             auth,
             headers,
@@ -52,10 +52,19 @@ impl HttpSinkRequestBuilder {
     }
 }
 
-impl HttpServiceRequestBuilder<()> for HttpSinkRequestBuilder {
-    fn build(&self, mut request: HttpRequest<()>) -> Result<Request<Bytes>, crate::Error> {
+impl HttpServiceRequestBuilder<PartitionKey> for HttpSinkRequestBuilder {
+    fn build(
+        &self,
+        mut request: HttpRequest<PartitionKey>,
+    ) -> Result<Request<Bytes>, crate::Error> {
+        let metadata = request.get_additional_metadata();
+        let uri_serde = UriSerde::from_str(&metadata.uri)?;
+        let uri_auth = uri_serde.auth;
+        let uri = uri_serde.uri;
+
+        let auth = self.auth.choose_one(&uri_auth)?;
+
         let method: Method = self.method.into();
-        let uri: Uri = self.uri.uri.clone();
         let mut builder = Request::builder().method(method).uri(uri);
 
         if let Some(content_type) = &self.content_type {
@@ -81,7 +90,7 @@ impl HttpServiceRequestBuilder<()> for HttpSinkRequestBuilder {
             .context(HTTPRequestBuilderSnafu)
             .map_err(Into::<crate::Error>::into)?;
 
-        if let Some(auth) = &self.auth {
+        if let Some(auth) = auth {
             auth.apply(&mut request);
         }
 
diff --git a/src/sinks/http/sink.rs b/src/sinks/http/sink.rs
index 79cea97c0dc27..dee308a3521d1 100644
--- a/src/sinks/http/sink.rs
+++ b/src/sinks/http/sink.rs
@@ -6,13 +6,14 @@ use super::{batch::HttpBatchSizer, request_builder::HttpRequestBuilder};
 
 pub(super) struct HttpSink<S> {
     service: S,
+    uri: Template,
     batch_settings: BatcherSettings,
     request_builder: HttpRequestBuilder,
 }
 
 impl<S> HttpSink<S>
 where
-    S: Service<HttpRequest<()>> + Send + 'static,
+    S: Service<HttpRequest<PartitionKey>> + Send + 'static,
     S::Future: Send + 'static,
     S::Response: DriverResponse + Send + 'static,
     S::Error: std::fmt::Debug + Into<crate::Error> + Send,
@@ -20,22 +21,28 @@ where
     /// Creates a new `HttpSink`.
     pub(super) const fn new(
         service: S,
+        uri: Template,
         batch_settings: BatcherSettings,
         request_builder: HttpRequestBuilder,
     ) -> Self {
         Self {
             service,
+            uri,
             batch_settings,
             request_builder,
         }
     }
 
     async fn run_inner(self: Box<Self>, input: BoxStream<'_, Event>) -> Result<(), ()> {
+        let batch_sizer = HttpBatchSizer {
+            encoder: self.request_builder.encoder.encoder.clone(),
+        };
         input
             // Batch the input stream with size calculation based on the configured codec
-            .batched(self.batch_settings.as_item_size_config(HttpBatchSizer {
-                encoder: self.request_builder.encoder.encoder.clone(),
-            }))
+            .batched_partitioned(KeyPartitioner::new(self.uri), || {
+                self.batch_settings.as_item_size_config(batch_sizer.clone())
+            })
+            .filter_map(|(key, batch)| async move { key.map(move |k| (k, batch)) })
             // Build requests with default concurrency limit.
             .request_builder(
                 default_request_builder_concurrency_limit(),
@@ -62,7 +69,7 @@ where
 #[async_trait::async_trait]
 impl<S> StreamSink<Event> for HttpSink<S>
 where
-    S: Service<HttpRequest<()>> + Send + 'static,
+    S: Service<HttpRequest<PartitionKey>> + Send + 'static,
     S::Future: Send + 'static,
     S::Response: DriverResponse + Send + 'static,
     S::Error: std::fmt::Debug + Into<crate::Error> + Send,
@@ -74,3 +81,39 @@ where
         self.run_inner(input).await
     }
 }
+
+#[derive(Hash, Eq, PartialEq, Clone, Debug)]
+pub struct PartitionKey {
+    pub uri: String,
+}
+
+struct KeyPartitioner {
+    uri: Template,
+}
+
+impl KeyPartitioner {
+    const fn new(uri: Template) -> Self {
+        Self { uri }
+    }
+}
+
+impl Partitioner for KeyPartitioner {
+    type Item = Event;
+    type Key = Option<PartitionKey>;
+
+    fn partition(&self, event: &Event) -> Self::Key {
+        let uri = self
+            .uri
+            .render_string(event)
+            .map_err(|error| {
+                emit!(TemplateRenderingError {
+                    error,
+                    field: Some("uri"),
+                    drop_event: true,
+                });
+            })
+            .ok()?;
+
+        Some(PartitionKey { uri })
+    }
+}
diff --git a/src/sinks/http/tests.rs b/src/sinks/http/tests.rs
index 363877380c308..a70bc3d07f3e7 100644
--- a/src/sinks/http/tests.rs
+++ b/src/sinks/http/tests.rs
@@ -1,6 +1,9 @@
 //! Unit tests for the `http` sink.
 
-use std::sync::{atomic, Arc};
+use std::{
+    future::ready,
+    sync::{atomic, Arc},
+};
 
 use bytes::{Buf, Bytes};
 use flate2::{read::MultiGzDecoder, read::ZlibDecoder};
@@ -12,12 +15,13 @@ use vector_lib::codecs::{
     encoding::{Framer, FramingConfig},
     JsonSerializerConfig, NewlineDelimitedEncoderConfig, TextSerializerConfig,
 };
-
 use vector_lib::event::{BatchNotifier, BatchStatus, Event, LogEvent};
+use vector_lib::finalization::AddBatchNotifier;
 
 use crate::{
     assert_downcast_matches,
     codecs::{EncodingConfigWithFraming, SinkType},
+    log_event,
     sinks::{
         prelude::*,
         util::{
@@ -30,8 +34,11 @@ use crate::{
         },
     },
     test_util::{
-        components::{self, COMPONENT_ERROR_TAGS, HTTP_SINK_TAGS},
-        next_addr, random_lines_with_stream,
+        components::{
+            self, init_test, run_and_assert_sink_compliance, run_and_assert_sink_error_with_events,
+            COMPONENT_ERROR_TAGS, HTTP_SINK_TAGS,
+        },
+        create_events_batch_with_fn, next_addr, random_lines_with_stream,
     },
 };
 
@@ -528,6 +535,241 @@ async fn json_compression_with_payload_wrapper(compression: &str) {
     .await;
 }
 
+#[tokio::test]
+async fn templateable_uri_path() {
+    init_test();
+    fn create_event_with_id(id: i64) -> Event {
+        log_event!["id" => id]
+    }
+
+    let num_events_per_id = 100;
+    let an_id = 1;
+    let another_id = 2;
+    let in_addr = next_addr();
+
+    let config = format!(
+        r#"
+        uri = "http://{in_addr}/id/{{{{id}}}}"
+        encoding.codec = "json"
+        "#
+    );
+
+    let config: HttpSinkConfig = toml::from_str(&config).unwrap();
+
+    let cx = SinkContext::default();
+
+    let (sink, _) = config.build(cx).await.unwrap();
+    let (rx, trigger, server) = build_test_server(in_addr);
+
+    let (some_events_with_an_id, mut a_receiver) =
+        create_events_batch_with_fn(|| create_event_with_id(an_id), num_events_per_id);
+    let (some_events_with_another_id, mut another_receiver) =
+        create_events_batch_with_fn(|| create_event_with_id(another_id), num_events_per_id);
+    let all_events = some_events_with_an_id
+        .into_iter()
+        .chain(some_events_with_another_id);
+    let event_stream = stream::iter(all_events);
+
+    tokio::spawn(server);
+
+    run_and_assert_sink_compliance(sink, event_stream, &HTTP_SINK_TAGS).await;
+
+    drop(trigger);
+
+    assert_eq!(a_receiver.try_recv(), Ok(BatchStatus::Delivered));
+    assert_eq!(another_receiver.try_recv(), Ok(BatchStatus::Delivered));
+
+    let request_batches = rx
+        .inspect(|(parts, body)| {
+            let events: Vec<serde_json::Value> = serde_json::from_slice(body).unwrap();
+
+            // Assert that all the events are received
+            assert_eq!(events.len(), num_events_per_id);
+
+            // Assert that all events have the same id
+            let expected_event_id = events[0]["id"].as_i64().unwrap();
+
+            for event in events {
+                let event_id = event["id"].as_i64().unwrap();
+                assert_eq!(event_id, expected_event_id)
+            }
+
+            // Assert that the uri path is the expected one for the given id
+            let expected_uri_path = format!("/id/{expected_event_id}");
+            assert_eq!(parts.uri.path(), expected_uri_path);
+        })
+        .collect::<Vec<_>>()
+        .await;
+    assert_eq!(request_batches.len(), 2)
+}
+
+#[tokio::test]
+async fn templateable_uri_auth() {
+    init_test();
+
+    fn create_event_with_user_and_pass(user: &str, pass: &str) -> Event {
+        log_event!["user" => user, "pass" => pass]
+    }
+
+    let num_events_per_auth = 100;
+    let an_user = "an_user";
+    let a_pass = "a_pass";
+    let another_user = "another_user";
+    let another_pass = "another_pass";
+    let in_addr = next_addr();
+    let config = format!(
+        r#"
+        uri = "http://{{{{user}}}}:{{{{pass}}}}@{in_addr}/"
+        encoding.codec = "json"
+        "#
+    );
+
+    let config: HttpSinkConfig = toml::from_str(&config).unwrap();
+
+    let cx = SinkContext::default();
+
+    let (sink, _) = config.build(cx).await.unwrap();
+    let (rx, trigger, server) = build_test_server(in_addr);
+
+    let (some_events_with_an_auth, mut a_receiver) = create_events_batch_with_fn(
+        || create_event_with_user_and_pass(an_user, a_pass),
+        num_events_per_auth,
+    );
+    let (some_events_with_another_auth, mut another_receiver) = create_events_batch_with_fn(
+        || create_event_with_user_and_pass(another_user, another_pass),
+        num_events_per_auth,
+    );
+    let all_events = some_events_with_an_auth
+        .into_iter()
+        .chain(some_events_with_another_auth);
+    let event_stream = stream::iter(all_events);
+
+    tokio::spawn(server);
+
+    run_and_assert_sink_compliance(sink, event_stream, &HTTP_SINK_TAGS).await;
+
+    drop(trigger);
+
+    assert_eq!(a_receiver.try_recv(), Ok(BatchStatus::Delivered));
+    assert_eq!(another_receiver.try_recv(), Ok(BatchStatus::Delivered));
+
+    let request_batches = rx
+        .inspect(|(parts, body)| {
+            let events: Vec<serde_json::Value> = serde_json::from_slice(body).unwrap();
+
+            // Assert that all the events are received
+            assert_eq!(events.len(), num_events_per_auth);
+
+            // Assert that all events have the same user & pass
+            let expected_user = events[0]["user"].as_str().unwrap().to_string();
+            let expected_pass = events[0]["pass"].as_str().unwrap().to_string();
+
+            for event in events {
+                let event_user = event["user"].as_str().unwrap();
+                let event_pass = event["pass"].as_str().unwrap();
+                assert_eq!(event_user, expected_user);
+                assert_eq!(event_pass, expected_pass);
+            }
+
+            // Assert that the auth is the expected one for the given user & pass
+            let expected_auth = Authorization::basic(&expected_user, &expected_pass);
+            assert_eq!(parts.headers.typed_get(), Some(expected_auth));
+        })
+        .collect::<Vec<_>>()
+        .await;
+    assert_eq!(request_batches.len(), 2);
+}
+
+#[tokio::test]
+async fn missing_field_in_uri_template() {
+    init_test();
+
+    let in_addr = next_addr();
+    let config = format!(
+        r#"
+        uri = "http://{in_addr}/{{{{missing_field}}}}"
+        encoding.codec = "json"
+        "#
+    );
+    let config: HttpSinkConfig = toml::from_str(&config).unwrap();
+
+    let cx = SinkContext::default();
+
+    let (sink, _) = config.build(cx).await.unwrap();
+    let (rx, trigger, server) = build_test_server(in_addr);
+
+    let (batch, mut receiver) = BatchNotifier::new_with_receiver();
+    let mut event = Event::Log(LogEvent::default());
+    event.add_batch_notifier(batch);
+
+    tokio::spawn(server);
+    let expected_emitted_error_events = ["TemplateRenderingError"];
+    run_and_assert_sink_error_with_events(
+        sink,
+        stream::once(ready(event)),
+        &expected_emitted_error_events,
+        &COMPONENT_ERROR_TAGS,
+    )
+    .await;
+
+    drop(trigger);
+
+    // TODO(https://github.com/vectordotdev/vector/issues/23366): Currently, When the KeyPartitioner fails to build the batch key from
+    // an event, the finalizer is not notified with
+    // EventStatus::Rejected. The error is silently ignored.
+    // See src/sinks/http/sink.rs:47
+    assert_eq!(receiver.try_recv(), Ok(BatchStatus::Delivered));
+
+    // No requests should have been made to the server
+    let requests = rx.collect::<Vec<_>>().await;
+    assert!(requests.is_empty());
+}
+
+#[tokio::test]
+async fn http_uri_auth_conflict() {
+    init_test();
+
+    let in_addr = next_addr();
+    let config = format!(
+        r#"
+        uri = "http://user:pass@{in_addr}/"
+        encoding.codec = "json"
+        auth.strategy = "basic"
+        auth.user = "user"
+        auth.password = "pass"
+        "#
+    );
+    let config: HttpSinkConfig = toml::from_str(&config).unwrap();
+
+    let cx = SinkContext::default();
+
+    let (sink, _) = config.build(cx).await.unwrap();
+    let (rx, trigger, server) = build_test_server(in_addr);
+
+    let (batch, mut receiver) = BatchNotifier::new_with_receiver();
+    let mut event = Event::Log(LogEvent::default());
+    event.add_batch_notifier(batch);
+
+    tokio::spawn(server);
+
+    let expected_emitted_error_events = ["ServiceCallError", "SinkRequestBuildError"];
+    run_and_assert_sink_error_with_events(
+        sink,
+        stream::once(ready(event)),
+        &expected_emitted_error_events,
+        &COMPONENT_ERROR_TAGS,
+    )
+    .await;
+
+    drop(trigger);
+
+    assert_eq!(receiver.try_recv(), Ok(BatchStatus::Rejected));
+
+    // No requests should have been made to the server
+    let requests = rx.collect::<Vec<_>>().await;
+    assert!(requests.is_empty());
+}
+
 fn parse_compressed_json<T>(compression: &str, buf: Bytes) -> T
 where
     T: de::DeserializeOwned,
diff --git a/src/test_util/components.rs b/src/test_util/components.rs
index 2cfefa3ebcb4e..d58d8c6f7fb33 100644
--- a/src/test_util/components.rs
+++ b/src/test_util/components.rs
@@ -65,13 +65,13 @@ pub const HTTP_SINK_TAGS: [&str; 2] = ["endpoint", "protocol"];
 pub const AWS_SINK_TAGS: [&str; 2] = ["protocol", "region"];
 
 /// This struct is used to describe a set of component tests.
-pub struct ComponentTests {
+pub struct ComponentTests<'a, 'b, 'c> {
     /// The list of event (suffixes) that must be emitted by the component
-    events: &'static [&'static str],
+    events: &'a [&'a str],
     /// The list of counter metrics (with given tags) that must be incremented
-    tagged_counters: &'static [&'static str],
+    tagged_counters: &'b [&'b str],
     /// The list of counter metrics (with no particular tags) that must be incremented
-    untagged_counters: &'static [&'static str],
+    untagged_counters: &'c [&'c str],
 }
 
 /// The component test specification for all sources.
@@ -150,7 +150,7 @@ pub static COMPONENT_MULTIPLE_OUTPUTS_TESTS: LazyLock<ComponentTests> =
         untagged_counters: &[],
     });
 
-impl ComponentTests {
+impl ComponentTests<'_, '_, '_> {
     /// Run the test specification, and assert that all tests passed.
     #[track_caller]
     pub fn assert(&self, tags: &[&str]) {
@@ -253,7 +253,7 @@ impl ComponentTester {
 
 /// Runs and returns a future and asserts that the provided test specification passes.
 pub async fn assert_source<T>(
-    tests: &LazyLock<ComponentTests>,
+    tests: &LazyLock<ComponentTests<'_, '_, '_>>,
     tags: &[&str],
     f: impl Future<Output = T>,
 ) -> T {
@@ -347,7 +347,7 @@ pub async fn run_and_assert_source_advanced<SC>(
     setup: impl FnOnce(&mut SourceContext),
     timeout: Option<Duration>,
     event_count: Option<usize>,
-    tests: &LazyLock<ComponentTests>,
+    tests: &LazyLock<ComponentTests<'_, '_, '_>>,
     tags: &[&str],
 ) -> Vec<Event>
 where
@@ -499,17 +499,40 @@ pub async fn run_and_assert_nonsending_sink_compliance<S, I>(
     .await;
 }
 
-/// Convenience wrapper for running sink error tests
-pub async fn assert_sink_error<T>(tags: &[&str], f: impl Future<Output = T>) -> T {
+// Convenience wrapper for running sink error tests with a specific component test specification
+async fn assert_sink_error_with_component_tests<T>(
+    component_tests: &ComponentTests<'_, '_, '_>,
+    tags: &[&str],
+    f: impl Future<Output = T>,
+) -> T {
     init_test();
 
     let result = f.await;
 
-    COMPONENT_TESTS_ERROR.assert(tags);
+    component_tests.assert(tags);
 
     result
 }
 
+/// Convenience wrapper for running sink error tests
+pub async fn assert_sink_error<T>(tags: &[&str], f: impl Future<Output = T>) -> T {
+    assert_sink_error_with_component_tests(&COMPONENT_TESTS_ERROR, tags, f).await
+}
+
+/// Convenience wrapper for running sink error tests for a specific set of error events
+pub async fn assert_sink_error_with_events<T>(
+    events: &[&str],
+    tags: &[&str],
+    f: impl Future<Output = T>,
+) -> T {
+    let component_tests = ComponentTests {
+        events,
+        tagged_counters: &["component_errors_total"],
+        untagged_counters: &[],
+    };
+    assert_sink_error_with_component_tests(&component_tests, tags, f).await
+}
+
 /// Runs and asserts sink error compliance.
 pub async fn run_and_assert_sink_error<S, I>(sink: VectorSink, events: S, tags: &[&str])
 where
@@ -523,6 +546,23 @@ where
     .await;
 }
 
+/// Runs and asserts sink error compliance with a specific set of error events.
+pub async fn run_and_assert_sink_error_with_events<S, I>(
+    sink: VectorSink,
+    events: S,
+    error_events: &[&str],
+    tags: &[&str],
+) where
+    S: Stream<Item = I> + Send,
+    I: Into<EventArray>,
+{
+    assert_sink_error_with_events(error_events, tags, async move {
+        let events = events.map(Into::into);
+        sink.run(events).await.expect("Running sink failed")
+    })
+    .await;
+}
+
 /// Convenience wrapper for running sinks with `send_all`
 pub async fn sink_send_all<I>(sink: VectorSink, events: I, tags: &[&str])
 where
diff --git a/src/test_util/mod.rs b/src/test_util/mod.rs
index 93162c2e23bc4..3582fd030cd2c 100644
--- a/src/test_util/mod.rs
+++ b/src/test_util/mod.rs
@@ -35,7 +35,9 @@ use tokio_stream::wrappers::TcpListenerStream;
 #[cfg(unix)]
 use tokio_stream::wrappers::UnixListenerStream;
 use tokio_util::codec::{Encoder, FramedRead, FramedWrite, LinesCodec};
-use vector_lib::event::{BatchNotifier, Event, EventArray, LogEvent, MetricTags, MetricValue};
+use vector_lib::event::{
+    BatchNotifier, BatchStatusReceiver, Event, EventArray, LogEvent, MetricTags, MetricValue,
+};
 use vector_lib::{
     buffers::topology::channel::LimitedReceiver,
     event::{Metric, MetricKind},
@@ -385,6 +387,17 @@ where
     (events, stream)
 }
 
+pub fn create_events_batch_with_fn<F: Fn() -> Event>(
+    create_event_fn: F,
+    num_events: usize,
+) -> (Vec<Event>, BatchStatusReceiver) {
+    let mut events = (0..num_events)
+        .map(|_| create_event_fn())
+        .collect::<Vec<_>>();
+    let receiver = BatchNotifier::apply_to(&mut events);
+    (events, receiver)
+}
+
 pub fn random_string(len: usize) -> String {
     rng()
         .sample_iter(&Alphanumeric)
diff --git a/website/cue/reference/components/sinks/generated/http.cue b/website/cue/reference/components/sinks/generated/http.cue
index b750df7d33d43..92b02b191c572 100644
--- a/website/cue/reference/components/sinks/generated/http.cue
+++ b/website/cue/reference/components/sinks/generated/http.cue
@@ -1029,6 +1029,9 @@ generated: components: sinks: http: configuration: {
 			This should include the protocol and host, but can also include the port, path, and any other valid part of a URI.
 			"""
 		required: true
-		type: string: examples: ["https://10.22.212.22:9000/endpoint"]
+		type: string: {
+			examples: ["https://10.22.212.22:9000/endpoint"]
+			syntax: "template"
+		}
 	}
 }
diff --git a/website/cue/reference/components/sinks/generated/opentelemetry.cue b/website/cue/reference/components/sinks/generated/opentelemetry.cue
index 7d6e1d6bf0531..10c0e84759f7f 100644
--- a/website/cue/reference/components/sinks/generated/opentelemetry.cue
+++ b/website/cue/reference/components/sinks/generated/opentelemetry.cue
@@ -1035,7 +1035,10 @@ generated: components: sinks: opentelemetry: configuration: protocol: {
 				This should include the protocol and host, but can also include the port, path, and any other valid part of a URI.
 				"""
 			required: true
-			type: string: examples: ["https://10.22.212.22:9000/endpoint"]
+			type: string: {
+				examples: ["https://10.22.212.22:9000/endpoint"]
+				syntax: "template"
+			}
 		}
 	}
 }

From 8c199ace3384acb71bc2337f5057976c6827d418 Mon Sep 17 00:00:00 2001
From: Joe Chapman <15679599+jchap-pnnl@users.noreply.github.com>
Date: Mon, 14 Jul 2025 14:54:38 -0700
Subject: [PATCH 175/305] enhancement(aws_s3 sink): Add ability to configure
 request errors to retry  (#23206)

* Added ability to force the aws_s3 sink to retry failed requests on all errors. Added retry_all_errors to S3SinkConfig and S3RetryLogic structs. Setting retry_all_errors to the default value in the generate_config function. Added self.retry_all_errors to the condition in the is_retriable_error function.  (#10870)

* Added errors_to_retry field to S3SinkConfig as an Option<Vec<String>>. Changed retry_all_errors to Option<bool>.

* Changed errors_to_retry from Option<Vec<String>> to Option<Vec<u16>>. Added configured_to_retry and check_response functions to s3_common/config.rs. Added configured_to_retry call to is_retriable_error result in RetryLogic. (#10870)

* Moved retry_all_errors and errors_to_retry into S3RetryLogic struct and replaced them with retry_logic in S3SinkConfig. (#10870)

* Added retry_logic to s3_flush_on_exhaustion integration test. (#10870)

* Fixed format and build issues in s3_common/config.rs. (#10870)

* Fixed panic error if retry_logic is None in sinks/aws_s3/config.rs. (#10870)

* Changed build_processor function to call unwrap_or_default on retry_logic rather than unwrap_or. (#10870)

* Fixed formatting issue in build_processor function. (#10870)

* Updated docs for retry_logic. (#10870)

* Added changelog fragment. (#10870)

* Fixed documentation note for S3RetryLogic. (#10870)

* Updated component docs. (#10870)

* Updated the feature authors list for the changelog. (#10870)

* Increased the version in Cargo.toml. (#10870)

* Adjusted wording in documentation comments for S3RetryLogic and retry_logic trait in S3SinkConfig. (#10870)

* Reverted vector version change in Cargo.toml. Adjusted wording in documentation comment for errors_to_retry. (#10870)

* Updated autogenerated documentation for aws_s3. (#10870)

* Changed configred_to_retry to should_retry_error and changed check_response to is_retriable_response. (#10870)

* Replaced RetryLogic struct with RetryStrategy enum. (#10870)

* Fixed formatting issue in sinks/aws_s3/config.rs. (#10870)

* Replaced retry_logic with retry_strategy sinks/aws_s3/integration_tests.rs. (#10870)

* Added jimmystewpot to allow.txt to fix spellcheck fail. (#10870)

* Changed retry_strategy options to snake_case in the config file. (#10870)

* Updated component docs for snake-case retry_strategy config options. (#10870)

* Upped indicatif version to fix build error from previous version being yanked. (#10870)

* Regenerated license file. (#10870)

* Changed WriteToken to pass by reference in recover_archived_record to fix a clippy error. (#10870)

* Pull in Cargo.toml/Cargo.lock from master

* Pull in LICENSE-3rdparty.csv from master

* Pull in Cargo.lock

* Pull in Cargo.lock from master

* Pull in vdev/Cargo.toml from master

* Added "interpreting" spelling/expect.txt to fix spell check failing. (#10870)

* Removed interpreting from expect.txt. Changed interepreting to interpreting in replace.cue. (#10870)

* fix and improve RetryStrategy enum

* Fixed formatting errors in aws_s3/config.rs and s3_common/config.rs. Changed documentation comments explain that retry_strategy settings extend, not override, default retry behavior for the sink. (#10870)

* Update .github/actions/spelling/allow.txt

---------

Co-authored-by: Thomas <thomas.schneider@datadoghq.com>
Co-authored-by: Pavlos Rontidis <pavlos.rontidis@gmail.com>
Co-authored-by: Thomas <thomasqueirozb@gmail.com>
---
 ...aws_sink_retry_logic_update.enhancement.md |  3 +
 .../src/variants/disk_v2/writer.rs            |  4 +-
 src/sinks/aws_s3/config.rs                    | 18 ++++--
 src/sinks/aws_s3/integration_tests.rs         |  2 +
 src/sinks/s3_common/config.rs                 | 57 +++++++++++++++++--
 .../components/sinks/generated/aws_s3.cue     | 29 ++++++++++
 6 files changed, 102 insertions(+), 11 deletions(-)
 create mode 100644 changelog.d/10870_aws_sink_retry_logic_update.enhancement.md

diff --git a/changelog.d/10870_aws_sink_retry_logic_update.enhancement.md b/changelog.d/10870_aws_sink_retry_logic_update.enhancement.md
new file mode 100644
index 0000000000000..ee467d0c600a2
--- /dev/null
+++ b/changelog.d/10870_aws_sink_retry_logic_update.enhancement.md
@@ -0,0 +1,3 @@
+Extends retry logic in AWS sink by allowing users to configure the sink to retry specific or all failed request attempts.
+
+authors: jchap-pnnl jhbigler-pnnl
diff --git a/lib/vector-buffers/src/variants/disk_v2/writer.rs b/lib/vector-buffers/src/variants/disk_v2/writer.rs
index 173ccd1248b14..426b061ea53bb 100644
--- a/lib/vector-buffers/src/variants/disk_v2/writer.rs
+++ b/lib/vector-buffers/src/variants/disk_v2/writer.rs
@@ -648,7 +648,7 @@ where
     /// `InconsistentState`, as being unable to immediately deserialize and decode a record we just serialized and
     /// encoded implies a fatal, and unrecoverable, error with the buffer implementation as a whole.
     #[instrument(skip(self), level = "trace")]
-    pub fn recover_archived_record(&mut self, token: WriteToken) -> Result<T, WriterError<T>> {
+    pub fn recover_archived_record(&mut self, token: &WriteToken) -> Result<T, WriterError<T>> {
         // Make sure the write token we've been given matches whatever the last call to `archive_record` generated.
         let serialized_len = token.serialized_len();
         debug_assert_eq!(
@@ -1240,7 +1240,7 @@ where
             // writer and hand it back. This looks a little weird because we want to surface deserialize/decoding
             // errors if we encounter them, but if we recover the record successfully, we're returning
             // `Ok(Err(record))` to signal that our attempt failed but the record is able to be retried again later.
-            return Ok(Err(writer.recover_archived_record(token)?));
+            return Ok(Err(writer.recover_archived_record(&token)?));
         };
 
         // Track our write since things appear to have succeeded. This only updates our internal
diff --git a/src/sinks/aws_s3/config.rs b/src/sinks/aws_s3/config.rs
index 9e001db84071f..06b1148783bf8 100644
--- a/src/sinks/aws_s3/config.rs
+++ b/src/sinks/aws_s3/config.rs
@@ -4,9 +4,7 @@ use vector_lib::codecs::{
     encoding::{Framer, FramingConfig},
     TextSerializerConfig,
 };
-use vector_lib::configurable::configurable_component;
-use vector_lib::sink::VectorSink;
-use vector_lib::TimeZone;
+use vector_lib::{configurable::configurable_component, sink::VectorSink, TimeZone};
 
 use super::sink::S3RequestOptions;
 use crate::{
@@ -16,7 +14,7 @@ use crate::{
     sinks::{
         s3_common::{
             self,
-            config::{S3Options, S3RetryLogic},
+            config::{RetryStrategy, S3Options},
             partitioner::S3KeyPartitioner,
             service::S3Service,
             sink::S3Sink,
@@ -145,6 +143,14 @@ pub struct S3SinkConfig {
     /// This controls if the bucket name is in the hostname or part of the URL.
     #[serde(default = "crate::serde::default_true")]
     pub force_path_style: bool,
+
+    /// Specifies errors to retry
+    ///
+    /// By default, the sink only retries attempts it deems possible to retry.
+    /// These settings extend the default behavior.
+    #[configurable(derived)]
+    #[serde(default, skip_serializing_if = "vector_lib::serde::is_default")]
+    pub retry_strategy: RetryStrategy,
 }
 
 pub(super) fn default_key_prefix() -> String {
@@ -174,6 +180,7 @@ impl GenerateConfig for S3SinkConfig {
             acknowledgements: Default::default(),
             timezone: Default::default(),
             force_path_style: Default::default(),
+            retry_strategy: Default::default(),
         })
         .unwrap()
     }
@@ -209,8 +216,9 @@ impl S3SinkConfig {
         // order to configure the client/service with retries, concurrency
         // limits, rate limits, and whatever else the client should have.
         let request_limits = self.request.into_settings();
+        let retry_strategy = self.retry_strategy.clone();
         let service = ServiceBuilder::new()
-            .settings(request_limits, S3RetryLogic)
+            .settings(request_limits, retry_strategy)
             .service(service);
 
         let offset = self
diff --git a/src/sinks/aws_s3/integration_tests.rs b/src/sinks/aws_s3/integration_tests.rs
index 9e1645778bc20..8d53d6eca6f9e 100644
--- a/src/sinks/aws_s3/integration_tests.rs
+++ b/src/sinks/aws_s3/integration_tests.rs
@@ -439,6 +439,7 @@ async fn s3_flush_on_exhaustion() {
             acknowledgements: Default::default(),
             timezone: Default::default(),
             force_path_style: true,
+            retry_strategy: Default::default(),
         }
     };
     let prefix = config.key_prefix.clone();
@@ -529,6 +530,7 @@ fn config(bucket: &str, batch_size: usize) -> S3SinkConfig {
         acknowledgements: Default::default(),
         timezone: Default::default(),
         force_path_style: true,
+        retry_strategy: Default::default(),
     }
 }
 
diff --git a/src/sinks/s3_common/config.rs b/src/sinks/s3_common/config.rs
index 9db7fc506191a..65021254dff91 100644
--- a/src/sinks/s3_common/config.rs
+++ b/src/sinks/s3_common/config.rs
@@ -312,15 +312,64 @@ impl From<S3CannedAcl> for ObjectCannedAcl {
     }
 }
 
-#[derive(Debug, Clone)]
-pub struct S3RetryLogic;
+fn is_retriable_response(res: &HttpResponse, errors_to_retry: Option<Vec<u16>>) -> bool {
+    let status_code = res.status();
 
-impl RetryLogic for S3RetryLogic {
+    match errors_to_retry {
+        Some(error_codes) => error_codes.contains(&status_code.as_u16()),
+        None => false,
+    }
+}
+
+fn should_retry_error(
+    errors_to_retry: Option<Vec<u16>>,
+    error: &SdkError<PutObjectError, HttpResponse>,
+) -> bool {
+    match error {
+        SdkError::ResponseError(err) => is_retriable_response(err.raw(), errors_to_retry),
+        SdkError::ServiceError(err) => is_retriable_response(err.raw(), errors_to_retry),
+        _ => false,
+    }
+}
+
+/// Retry strategy for S3 service calls.
+///
+/// Specifies a retry policy for S3 service calls.
+///
+/// For more information about error responses, see [Client Error Responses][error_responses].
+///
+/// [error_responses]: https://developer.mozilla.org/en-US/docs/Web/HTTP/Reference/Status#client_error_responses
+#[configurable_component]
+#[derive(Debug, Clone, Default, PartialEq)]
+#[serde(tag = "type", rename_all = "snake_case")]
+#[configurable(metadata(docs::enum_tag_description = "The retry strategy enum."))]
+pub enum RetryStrategy {
+    /// Don't retry any errors
+    #[default]
+    None,
+
+    /// Retry on *all* errors
+    All,
+
+    /// Custom retry strategy
+    Custom {
+        /// Retry on these specific HTTP status codes
+        status_codes: Vec<u16>,
+    },
+}
+
+impl RetryLogic for RetryStrategy {
     type Error = SdkError<PutObjectError, HttpResponse>;
     type Response = S3Response;
 
     fn is_retriable_error(&self, error: &Self::Error) -> bool {
-        is_retriable_error(error)
+        match self {
+            RetryStrategy::None => false,
+            RetryStrategy::All => true,
+            RetryStrategy::Custom { status_codes } => {
+                is_retriable_error(error) || should_retry_error(Some(status_codes.clone()), error)
+            }
+        }
     }
 }
 
diff --git a/website/cue/reference/components/sinks/generated/aws_s3.cue b/website/cue/reference/components/sinks/generated/aws_s3.cue
index 034579ddb8374..2f03902900598 100644
--- a/website/cue/reference/components/sinks/generated/aws_s3.cue
+++ b/website/cue/reference/components/sinks/generated/aws_s3.cue
@@ -1048,6 +1048,35 @@ generated: components: sinks: aws_s3: configuration: {
 			}
 		}
 	}
+	retry_strategy: {
+		description: """
+			Specifies errors to retry
+
+			By default, the sink only retries attempts it deems possible to retry.
+			These settings extend the default behavior.
+			"""
+		required: false
+		type: object: options: {
+			status_codes: {
+				description:   "Retry on these specific HTTP status codes"
+				relevant_when: "type = \"custom\""
+				required:      true
+				type: array: items: type: uint: {}
+			}
+			type: {
+				description: "The retry strategy enum."
+				required:    false
+				type: string: {
+					default: "none"
+					enum: {
+						all:    "Retry on *all* errors"
+						custom: "Custom retry strategy"
+						none:   "Don't retry any errors"
+					}
+				}
+			}
+		}
+	}
 	server_side_encryption: {
 		description: """
 			AWS S3 Server-Side Encryption algorithms.

From 3ab75690b3b1e9ae0a58a61ac917a1aa6c78fcc6 Mon Sep 17 00:00:00 2001
From: Thomas <thomas.schneider@datadoghq.com>
Date: Tue, 15 Jul 2025 09:52:29 -0400
Subject: [PATCH 176/305] fix(ci): remove EOL Debian Buster 10 (#23380)

---
 .github/workflows/publish.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 5ce7e533434d3..79fdd2b45e69a 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -379,7 +379,6 @@ jobs:
           - ubuntu:20.04
           - ubuntu:22.04
           - ubuntu:24.04
-          - debian:10
           - debian:11
           - debian:12
     container:

From 5ff037bfb95ea62d1faa1ef6267be8ba4a2c6080 Mon Sep 17 00:00:00 2001
From: Thomas <thomas.schneider@datadoghq.com>
Date: Tue, 15 Jul 2025 12:46:14 -0400
Subject: [PATCH 177/305] chore(ci): rename name for publish-github job
 (#23381)

---
 .github/workflows/publish.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 79fdd2b45e69a..6307be5412108 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -677,7 +677,7 @@ jobs:
         run: make release-s3
 
   publish-github:
-    name: Publish to GitHub
+    name: Publish release to GitHub
     # We only publish to GitHub for versioned releases, not nightlies.
     if: inputs.channel == 'release'
     runs-on: ubuntu-24.04

From 121b9da9e45e372b9f205cec7830e5a054cf0a21 Mon Sep 17 00:00:00 2001
From: Rob Blafford <robert.blafford@datadoghq.com>
Date: Tue, 15 Jul 2025 12:49:36 -0400
Subject: [PATCH 178/305] enhancement(sinks): Add support for `max_bytes` for
 memory buffers (#23330)

* New interface around buffers to select impl at runtime

* Expose a non-fixed sized queue in vector-buffers

* Modifications to make max_bytes configurable

* Modify Sample to test limiting behavior on bytes allocated

* Unit test for semaphore guarding SeqQueue

* Include new SegQueue in buffering benchmarks

* Generated documentation updates

* Add changelog fragment

* Implement QueueImpl trait directly on crossbeam queue types

* Add helper method to reduce terseness

* Convert config to flat layout

* Modify MemoryBufferSize to be a tuple variant

- Also removing its configurable_component tag as it is no longer
officially part of the configuration

* Update error message

* Prefer size_of over magic numbers

* Remove stray comment

* Revert test behavior to use arbitrary u16s

* Update documentation

* Addressing some comments

- Replace if let chain with match expression
- Replace map/sum with just calls to +
- Replace function pointer in limited_queue.rs with enum + variant check

* Revert "Modify MemoryBufferSize to be a tuple variant"

- Previous commit hash: f87aeab0

* Revert "Config config to flat layout"

- Previous commit hash: 43548746

* Fix config bug where flatten option isn't respected for variants

* Rename MemoryBufferSize variant options

- This makes the options more consistent with the existing ones like
max_size

* Add unit test for parsing memory buffer config w/ byte_size

* Update doc comments

* Update generated documentation

* Fix bug in config generator with flattening enum values

- When the flatten attribute was applied to a variant it would not be
respected in the generated output

* Modify MemoryBufferSize to be a tuple variant

* Updating generated documentation

* Remove unnecessary serde attribute

* Move MaxSizes configurable attribute within the tuple

- This correctly identifies the attributes as having the bytes unit type

* Modify _heap_allocated to be a heap allocated array

- Since the size is fixed and known at compile time this type is a
better fit here then Vec

---------

Co-authored-by: Pavlos Rontidis <pavlos.rontidis@gmail.com>
---
 ...upport_max_bytes_memory_buffers.feature.md |   3 +
 lib/vector-buffers/benches/common.rs          |  16 +-
 lib/vector-buffers/benches/sized_records.rs   |  43 ++++-
 lib/vector-buffers/examples/buffer_perf.rs    |   4 +-
 lib/vector-buffers/src/config.rs              |  98 ++++++++---
 lib/vector-buffers/src/lib.rs                 |   2 +-
 lib/vector-buffers/src/test/variant.rs        |  40 +++--
 lib/vector-buffers/src/topology/builder.rs    |  28 +--
 .../src/topology/channel/limited_queue.rs     | 160 ++++++++++++++----
 lib/vector-buffers/src/topology/test_util.rs  |  69 ++++++--
 lib/vector-buffers/src/variants/in_memory.rs  |  20 ++-
 lib/vector-config-macros/src/configurable.rs  |  35 +++-
 src/source_sender/mod.rs                      |   9 +-
 src/test_util/mock/sources/basic.rs           |  18 +-
 src/topology/test/backpressure.rs             |   4 +-
 .../reference/components/generated/sinks.cue  |   7 +-
 16 files changed, 409 insertions(+), 147 deletions(-)
 create mode 100644 changelog.d/8679_add_support_max_bytes_memory_buffers.feature.md

diff --git a/changelog.d/8679_add_support_max_bytes_memory_buffers.feature.md b/changelog.d/8679_add_support_max_bytes_memory_buffers.feature.md
new file mode 100644
index 0000000000000..78bde9a474bcd
--- /dev/null
+++ b/changelog.d/8679_add_support_max_bytes_memory_buffers.feature.md
@@ -0,0 +1,3 @@
+Adds support for `max_bytes` for memory buffers
+
+authors: graphcareful
diff --git a/lib/vector-buffers/benches/common.rs b/lib/vector-buffers/benches/common.rs
index cb2f1ec402116..03a17b864d9a5 100644
--- a/lib/vector-buffers/benches/common.rs
+++ b/lib/vector-buffers/benches/common.rs
@@ -17,9 +17,12 @@ use vector_buffers::{
 use vector_common::byte_size_of::ByteSizeOf;
 use vector_common::finalization::{AddBatchNotifier, BatchNotifier, EventFinalizers, Finalizable};
 
-#[derive(Clone, Copy, Debug)]
+#[derive(Clone, Debug)]
 pub struct Message<const N: usize> {
     id: u64,
+    // Purpose of `_heap_allocated` is to simulate memory pressure in the buffer benchmarks when the
+    // max_size option is selected.
+    _heap_allocated: Box<[u64; N]>,
     _padding: [u64; N],
 }
 
@@ -27,6 +30,7 @@ impl<const N: usize> Message<N> {
     fn new(id: u64) -> Self {
         Message {
             id,
+            _heap_allocated: Box::new([0; N]),
             _padding: [0; N],
         }
     }
@@ -40,7 +44,7 @@ impl<const N: usize> AddBatchNotifier for Message<N> {
 
 impl<const N: usize> ByteSizeOf for Message<N> {
     fn allocated_bytes(&self) -> usize {
-        0
+        N * std::mem::size_of::<u64>()
     }
 }
 
@@ -88,8 +92,8 @@ impl<const N: usize> FixedEncodable for Message<N> {
         Self: Sized,
     {
         buffer.put_u64(self.id);
-        for _ in 0..N {
-            // this covers self._padding
+        for _ in 0..(N * 2) {
+            // this covers self._padding and self.heap_allocated
             buffer.put_u64(0);
         }
         Ok(())
@@ -101,8 +105,8 @@ impl<const N: usize> FixedEncodable for Message<N> {
         Self: Sized,
     {
         let id = buffer.get_u64();
-        for _ in 0..N {
-            // this covers self._padding
+        for _ in 0..(N * 2) {
+            // this covers self._padding and self.heap_allocated
             _ = buffer.get_u64();
         }
         Ok(Message::new(id))
diff --git a/lib/vector-buffers/benches/sized_records.rs b/lib/vector-buffers/benches/sized_records.rs
index 80ffd4275d198..5fe31a0e3d68b 100644
--- a/lib/vector-buffers/benches/sized_records.rs
+++ b/lib/vector-buffers/benches/sized_records.rs
@@ -10,7 +10,7 @@ use criterion::{
     Criterion, SamplingMode, Throughput,
 };
 use tokio::runtime::{Handle, Runtime};
-use vector_buffers::{BufferType, WhenFull};
+use vector_buffers::{BufferType, MemoryBufferSize, WhenFull};
 
 use crate::common::{init_instrumentation, war_measurement, wtr_measurement};
 
@@ -37,6 +37,11 @@ struct PathGuard {
     inner: PathBuf,
 }
 
+enum BoundBy {
+    Bytes,
+    NumberEvents,
+}
+
 impl DataDir {
     fn new(name: &str) -> Self {
         let mut base_dir = PathBuf::new();
@@ -79,9 +84,15 @@ fn create_disk_v2_variant(_max_events: usize, max_size: u64) -> BufferType {
     }
 }
 
-fn create_in_memory_variant(max_events: usize, _max_size: u64) -> BufferType {
+fn create_in_memory_variant(bound_by: BoundBy, max_events: usize, max_size: u64) -> BufferType {
+    let size = match bound_by {
+        BoundBy::Bytes => MemoryBufferSize::MaxSize(NonZeroUsize::new(max_size as usize).unwrap()),
+        BoundBy::NumberEvents => {
+            MemoryBufferSize::MaxEvents(NonZeroUsize::new(max_events).unwrap())
+        }
+    };
     BufferType::Memory {
-        max_events: NonZeroUsize::new(max_events).unwrap(),
+        size,
         when_full: WhenFull::DropNewest,
     }
 }
@@ -146,13 +157,24 @@ fn write_then_read(c: &mut Criterion) {
         create_disk_v2_variant
     );
 
+    let f = |a, b| create_in_memory_variant(BoundBy::NumberEvents, a, b);
     experiment!(
         c,
         [32, 64, 128, 256, 512, 1024],
         "buffer-in-memory-v2",
         "write-then-read",
         wtr_measurement,
-        create_in_memory_variant
+        f
+    );
+
+    let f = |a, b| create_in_memory_variant(BoundBy::Bytes, a, b);
+    experiment!(
+        c,
+        [32, 64, 128, 256, 512, 1024],
+        "buffer-in-memory-bytes-v2",
+        "write-then-read",
+        wtr_measurement,
+        f
     );
 }
 
@@ -167,13 +189,24 @@ fn write_and_read(c: &mut Criterion) {
         create_disk_v2_variant
     );
 
+    let f = |a, b| create_in_memory_variant(BoundBy::NumberEvents, a, b);
     experiment!(
         c,
         [32, 64, 128, 256, 512, 1024],
         "buffer-in-memory-v2",
         "write-and-read",
         war_measurement,
-        create_in_memory_variant
+        f
+    );
+
+    let f = |a, b| create_in_memory_variant(BoundBy::Bytes, a, b);
+    experiment!(
+        c,
+        [32, 64, 128, 256, 512, 1024],
+        "buffer-in-memory-bytes-v2",
+        "write-and-read",
+        war_measurement,
+        f
     );
 }
 
diff --git a/lib/vector-buffers/examples/buffer_perf.rs b/lib/vector-buffers/examples/buffer_perf.rs
index 67d781bd7cf0a..c3286b4588a3c 100644
--- a/lib/vector-buffers/examples/buffer_perf.rs
+++ b/lib/vector-buffers/examples/buffer_perf.rs
@@ -21,7 +21,7 @@ use vector_buffers::{
         builder::TopologyBuilder,
         channel::{BufferReceiver, BufferSender},
     },
-    BufferType, Bufferable, EventCount, WhenFull,
+    BufferType, Bufferable, EventCount, MemoryBufferSize, WhenFull,
 };
 use vector_common::byte_size_of::ByteSizeOf;
 use vector_common::finalization::{
@@ -261,7 +261,7 @@ where
                 max_size_events
             );
             BufferType::Memory {
-                max_events: max_size_events,
+                size: MemoryBufferSize::MaxEvents(max_size_events),
                 when_full,
             }
         }
diff --git a/lib/vector-buffers/src/config.rs b/lib/vector-buffers/src/config.rs
index 6806f213bdfc2..11a97a85cddf4 100644
--- a/lib/vector-buffers/src/config.rs
+++ b/lib/vector-buffers/src/config.rs
@@ -86,16 +86,32 @@ impl BufferTypeVisitor {
         let when_full = when_full.unwrap_or_default();
         match kind {
             BufferTypeKind::Memory => {
-                if max_size.is_some() {
-                    return Err(de::Error::unknown_field(
-                        "max_size",
-                        &["type", "max_events", "when_full"],
-                    ));
-                }
-                Ok(BufferType::Memory {
-                    max_events: max_events.unwrap_or_else(memory_buffer_default_max_events),
-                    when_full,
-                })
+                let size = match (max_events, max_size) {
+                    (Some(_), Some(_)) => {
+                        return Err(de::Error::unknown_field(
+                            "max_events",
+                            &["type", "max_size", "when_full"],
+                        ));
+                    }
+                    (_, Some(max_size)) => {
+                        if let Ok(bounded_max_bytes) = usize::try_from(max_size.get()) {
+                            MemoryBufferSize::MaxSize(NonZeroUsize::new(bounded_max_bytes).unwrap())
+                        } else {
+                            return Err(de::Error::invalid_value(
+                                de::Unexpected::Unsigned(max_size.into()),
+                                &format!(
+                                    "Value for max_bytes must be a positive integer <= {}",
+                                    usize::MAX
+                                )
+                                .as_str(),
+                            ));
+                        }
+                    }
+                    _ => MemoryBufferSize::MaxEvents(
+                        max_events.unwrap_or_else(memory_buffer_default_max_events),
+                    ),
+                };
+                Ok(BufferType::Memory { size, when_full })
             }
             BufferTypeKind::DiskV2 => {
                 if max_events.is_some() {
@@ -175,6 +191,23 @@ impl DiskUsage {
     }
 }
 
+/// Enumeration to define exactly what terms the bounds of the buffer is expressed in: length, or
+/// `byte_size`.
+#[configurable_component(no_deser)]
+#[serde(rename_all = "snake_case")]
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+pub enum MemoryBufferSize {
+    /// The maximum number of events allowed in the buffer.
+    MaxEvents(#[serde(default = "memory_buffer_default_max_events")] NonZeroUsize),
+
+    // Doc string is duplicated here as a workaround due to a name collision with the `max_size`
+    // field with the DiskV2 variant of `BufferType`.
+    /// The maximum allowed amount of allocated memory the buffer can hold.
+    ///
+    /// If `type = "disk"` then must be at least ~256 megabytes (268435488 bytes).
+    MaxSize(#[configurable(metadata(docs::type_unit = "bytes"))] NonZeroUsize),
+}
+
 /// A specific type of buffer stage.
 #[configurable_component(no_deser)]
 #[derive(Clone, Copy, Debug, PartialEq, Eq)]
@@ -186,11 +219,10 @@ pub enum BufferType {
     /// This is more performant, but less durable. Data will be lost if Vector is restarted
     /// forcefully or crashes.
     #[configurable(title = "Events are buffered in memory.")]
-    #[serde(rename = "memory")]
     Memory {
-        /// The maximum number of events allowed in the buffer.
-        #[serde(default = "memory_buffer_default_max_events")]
-        max_events: NonZeroUsize,
+        /// The terms around how to express buffering limits, can be in size or bytes_size.
+        #[serde(flatten)]
+        size: MemoryBufferSize,
 
         #[configurable(derived)]
         #[serde(default)]
@@ -277,11 +309,8 @@ impl BufferType {
         T: Bufferable + Clone + Finalizable,
     {
         match *self {
-            BufferType::Memory {
-                when_full,
-                max_events,
-            } => {
-                builder.stage(MemoryBuffer::new(max_events), when_full);
+            BufferType::Memory { size, when_full } => {
+                builder.stage(MemoryBuffer::new(size), when_full);
             }
             BufferType::DiskV2 {
                 when_full,
@@ -335,7 +364,7 @@ pub enum BufferConfig {
 impl Default for BufferConfig {
     fn default() -> Self {
         Self::Single(BufferType::Memory {
-            max_events: memory_buffer_default_max_events(),
+            size: MemoryBufferSize::MaxEvents(memory_buffer_default_max_events()),
             when_full: WhenFull::default(),
         })
     }
@@ -389,7 +418,7 @@ impl BufferConfig {
 mod test {
     use std::num::{NonZeroU64, NonZeroUsize};
 
-    use crate::{BufferConfig, BufferType, WhenFull};
+    use crate::{BufferConfig, BufferType, MemoryBufferSize, WhenFull};
 
     fn check_single_stage(source: &str, expected: BufferType) {
         let config: BufferConfig = serde_yaml::from_str(source).unwrap();
@@ -439,7 +468,20 @@ max_events: 42
           max_events: 100
           ",
             BufferType::Memory {
-                max_events: NonZeroUsize::new(100).unwrap(),
+                size: MemoryBufferSize::MaxEvents(NonZeroUsize::new(100).unwrap()),
+                when_full: WhenFull::Block,
+            },
+        );
+    }
+
+    #[test]
+    fn parse_memory_with_byte_size_option() {
+        check_single_stage(
+            r"
+        max_size: 4096
+        ",
+            BufferType::Memory {
+                size: MemoryBufferSize::MaxSize(NonZeroUsize::new(4096).unwrap()),
                 when_full: WhenFull::Block,
             },
         );
@@ -455,11 +497,11 @@ max_events: 42
           ",
             &[
                 BufferType::Memory {
-                    max_events: NonZeroUsize::new(42).unwrap(),
+                    size: MemoryBufferSize::MaxEvents(NonZeroUsize::new(42).unwrap()),
                     when_full: WhenFull::Block,
                 },
                 BufferType::Memory {
-                    max_events: NonZeroUsize::new(100).unwrap(),
+                    size: MemoryBufferSize::MaxEvents(NonZeroUsize::new(100).unwrap()),
                     when_full: WhenFull::DropNewest,
                 },
             ],
@@ -473,7 +515,7 @@ max_events: 42
           type: memory
           ",
             BufferType::Memory {
-                max_events: NonZeroUsize::new(500).unwrap(),
+                size: MemoryBufferSize::MaxEvents(NonZeroUsize::new(500).unwrap()),
                 when_full: WhenFull::Block,
             },
         );
@@ -484,7 +526,7 @@ max_events: 42
           max_events: 100
           ",
             BufferType::Memory {
-                max_events: NonZeroUsize::new(100).unwrap(),
+                size: MemoryBufferSize::MaxEvents(NonZeroUsize::new(100).unwrap()),
                 when_full: WhenFull::Block,
             },
         );
@@ -495,7 +537,7 @@ max_events: 42
           when_full: drop_newest
           ",
             BufferType::Memory {
-                max_events: NonZeroUsize::new(500).unwrap(),
+                size: MemoryBufferSize::MaxEvents(NonZeroUsize::new(500).unwrap()),
                 when_full: WhenFull::DropNewest,
             },
         );
@@ -506,7 +548,7 @@ max_events: 42
           when_full: overflow
           ",
             BufferType::Memory {
-                max_events: NonZeroUsize::new(500).unwrap(),
+                size: MemoryBufferSize::MaxEvents(NonZeroUsize::new(500).unwrap()),
                 when_full: WhenFull::Overflow,
             },
         );
diff --git a/lib/vector-buffers/src/lib.rs b/lib/vector-buffers/src/lib.rs
index 84e88b659169c..795c8bb0eee06 100644
--- a/lib/vector-buffers/src/lib.rs
+++ b/lib/vector-buffers/src/lib.rs
@@ -17,7 +17,7 @@ extern crate tracing;
 mod buffer_usage_data;
 
 pub mod config;
-pub use config::{BufferConfig, BufferType};
+pub use config::{BufferConfig, BufferType, MemoryBufferSize};
 use encoding::Encodable;
 use vector_config::configurable_component;
 
diff --git a/lib/vector-buffers/src/test/variant.rs b/lib/vector-buffers/src/test/variant.rs
index 0d58ce388d3d7..64283e3b17d7c 100644
--- a/lib/vector-buffers/src/test/variant.rs
+++ b/lib/vector-buffers/src/test/variant.rs
@@ -1,5 +1,5 @@
 use std::{
-    num::{NonZeroU16, NonZeroU64, NonZeroUsize},
+    num::{NonZeroU16, NonZeroU64},
     path::PathBuf,
 };
 
@@ -14,7 +14,7 @@ use crate::{
         channel::{BufferReceiver, BufferSender},
     },
     variants::{DiskV2Buffer, MemoryBuffer},
-    Bufferable, WhenFull,
+    Bufferable, MemoryBufferSize, WhenFull,
 };
 
 #[cfg(test)]
@@ -31,7 +31,7 @@ const ALPHABET: [&str; 27] = [
 #[derive(Debug, Clone)]
 pub enum Variant {
     Memory {
-        max_events: NonZeroUsize,
+        size: MemoryBufferSize,
         when_full: WhenFull,
     },
     DiskV2 {
@@ -50,11 +50,9 @@ impl Variant {
         let mut builder = TopologyBuilder::default();
         match self {
             Variant::Memory {
-                max_events,
-                when_full,
-                ..
+                size, when_full, ..
             } => {
-                builder.stage(MemoryBuffer::new(*max_events), *when_full);
+                builder.stage(MemoryBuffer::new(*size), *when_full);
             }
             Variant::DiskV2 {
                 max_size,
@@ -105,14 +103,12 @@ impl Arbitrary for Variant {
         // Using a u16 ensures we avoid any allocation errors for our holding buffers, etc.
         let max_events = NonZeroU16::arbitrary(g).into();
         let max_size = NonZeroU16::arbitrary(g).into();
+        let size = MemoryBufferSize::MaxEvents(max_events);
 
         let when_full = WhenFull::arbitrary(g);
 
         if use_memory_buffer {
-            Variant::Memory {
-                max_events,
-                when_full,
-            }
+            Variant::Memory { size, when_full }
         } else {
             Variant::DiskV2 {
                 max_size,
@@ -126,15 +122,23 @@ impl Arbitrary for Variant {
     fn shrink(&self) -> Box<dyn Iterator<Item = Self>> {
         match self {
             Variant::Memory {
-                max_events,
-                when_full,
-                ..
+                size, when_full, ..
             } => {
                 let when_full = *when_full;
-                Box::new(max_events.shrink().map(move |me| Variant::Memory {
-                    max_events: me,
-                    when_full,
-                }))
+                match size {
+                    MemoryBufferSize::MaxEvents(max_events) => {
+                        Box::new(max_events.shrink().map(move |me| Variant::Memory {
+                            size: MemoryBufferSize::MaxEvents(me),
+                            when_full,
+                        }))
+                    }
+                    MemoryBufferSize::MaxSize(max_size) => {
+                        Box::new(max_size.shrink().map(move |me| Variant::Memory {
+                            size: MemoryBufferSize::MaxSize(me),
+                            when_full,
+                        }))
+                    }
+                }
             }
             Variant::DiskV2 {
                 max_size,
diff --git a/lib/vector-buffers/src/topology/builder.rs b/lib/vector-buffers/src/topology/builder.rs
index 9f13b6d17a228..7bea4217b0d7f 100644
--- a/lib/vector-buffers/src/topology/builder.rs
+++ b/lib/vector-buffers/src/topology/builder.rs
@@ -193,7 +193,7 @@ impl<T: Bufferable> TopologyBuilder<T> {
     ) -> (BufferSender<T>, BufferReceiver<T>) {
         let usage_handle = BufferUsageHandle::noop();
 
-        let memory_buffer = Box::new(MemoryBuffer::new(max_events));
+        let memory_buffer = Box::new(MemoryBuffer::with_max_events(max_events));
         let (sender, receiver) = memory_buffer
             .into_buffer_parts(usage_handle.clone())
             .await
@@ -229,7 +229,7 @@ impl<T: Bufferable> TopologyBuilder<T> {
         when_full: WhenFull,
         usage_handle: BufferUsageHandle,
     ) -> (BufferSender<T>, BufferReceiver<T>) {
-        let memory_buffer = Box::new(MemoryBuffer::new(max_events));
+        let memory_buffer = Box::new(MemoryBuffer::with_max_events(max_events));
         let (sender, receiver) = memory_buffer
             .into_buffer_parts(usage_handle.clone())
             .await
@@ -263,8 +263,10 @@ mod tests {
 
     use super::TopologyBuilder;
     use crate::{
-        topology::builder::TopologyError,
-        topology::test_util::{assert_current_send_capacity, Sample},
+        topology::{
+            builder::TopologyError,
+            test_util::{assert_current_send_capacity, Sample},
+        },
         variants::MemoryBuffer,
         WhenFull,
     };
@@ -273,7 +275,7 @@ mod tests {
     async fn single_stage_topology_block() {
         let mut builder = TopologyBuilder::<Sample>::default();
         builder.stage(
-            MemoryBuffer::new(NonZeroUsize::new(1).unwrap()),
+            MemoryBuffer::with_max_events(NonZeroUsize::new(1).unwrap()),
             WhenFull::Block,
         );
         let result = builder.build(String::from("test"), Span::none()).await;
@@ -287,7 +289,7 @@ mod tests {
     async fn single_stage_topology_drop_newest() {
         let mut builder = TopologyBuilder::<Sample>::default();
         builder.stage(
-            MemoryBuffer::new(NonZeroUsize::new(1).unwrap()),
+            MemoryBuffer::with_max_events(NonZeroUsize::new(1).unwrap()),
             WhenFull::DropNewest,
         );
         let result = builder.build(String::from("test"), Span::none()).await;
@@ -301,7 +303,7 @@ mod tests {
     async fn single_stage_topology_overflow() {
         let mut builder = TopologyBuilder::<Sample>::default();
         builder.stage(
-            MemoryBuffer::new(NonZeroUsize::new(1).unwrap()),
+            MemoryBuffer::with_max_events(NonZeroUsize::new(1).unwrap()),
             WhenFull::Overflow,
         );
         let result = builder.build(String::from("test"), Span::none()).await;
@@ -315,11 +317,11 @@ mod tests {
     async fn two_stage_topology_block() {
         let mut builder = TopologyBuilder::<Sample>::default();
         builder.stage(
-            MemoryBuffer::new(NonZeroUsize::new(1).unwrap()),
+            MemoryBuffer::with_max_events(NonZeroUsize::new(1).unwrap()),
             WhenFull::Block,
         );
         builder.stage(
-            MemoryBuffer::new(NonZeroUsize::new(1).unwrap()),
+            MemoryBuffer::with_max_events(NonZeroUsize::new(1).unwrap()),
             WhenFull::Block,
         );
         let result = builder.build(String::from("test"), Span::none()).await;
@@ -333,11 +335,11 @@ mod tests {
     async fn two_stage_topology_drop_newest() {
         let mut builder = TopologyBuilder::<Sample>::default();
         builder.stage(
-            MemoryBuffer::new(NonZeroUsize::new(1).unwrap()),
+            MemoryBuffer::with_max_events(NonZeroUsize::new(1).unwrap()),
             WhenFull::DropNewest,
         );
         builder.stage(
-            MemoryBuffer::new(NonZeroUsize::new(1).unwrap()),
+            MemoryBuffer::with_max_events(NonZeroUsize::new(1).unwrap()),
             WhenFull::Block,
         );
         let result = builder.build(String::from("test"), Span::none()).await;
@@ -351,11 +353,11 @@ mod tests {
     async fn two_stage_topology_overflow() {
         let mut builder = TopologyBuilder::<Sample>::default();
         builder.stage(
-            MemoryBuffer::new(NonZeroUsize::new(1).unwrap()),
+            MemoryBuffer::with_max_events(NonZeroUsize::new(1).unwrap()),
             WhenFull::Overflow,
         );
         builder.stage(
-            MemoryBuffer::new(NonZeroUsize::new(1).unwrap()),
+            MemoryBuffer::with_max_events(NonZeroUsize::new(1).unwrap()),
             WhenFull::Block,
         );
 
diff --git a/lib/vector-buffers/src/topology/channel/limited_queue.rs b/lib/vector-buffers/src/topology/channel/limited_queue.rs
index 887ce2639ada0..2dd0da905cc87 100644
--- a/lib/vector-buffers/src/topology/channel/limited_queue.rs
+++ b/lib/vector-buffers/src/topology/channel/limited_queue.rs
@@ -1,5 +1,6 @@
 use std::{
     cmp, fmt,
+    fmt::Debug,
     pin::Pin,
     sync::{
         atomic::{AtomicUsize, Ordering},
@@ -8,11 +9,11 @@ use std::{
 };
 
 use async_stream::stream;
-use crossbeam_queue::ArrayQueue;
+use crossbeam_queue::{ArrayQueue, SegQueue};
 use futures::Stream;
 use tokio::sync::{Notify, OwnedSemaphorePermit, Semaphore, TryAcquireError};
 
-use crate::InMemoryBufferable;
+use crate::{config::MemoryBufferSize, InMemoryBufferable};
 
 /// Error returned by `LimitedSender::send` when the receiver has disconnected.
 #[derive(Debug, PartialEq, Eq)]
@@ -54,10 +55,43 @@ impl<T> fmt::Display for TrySendError<T> {
 
 impl<T: fmt::Debug> std::error::Error for TrySendError<T> {}
 
+// Trait over common queue operations so implementation can be chosen at initialization phase
+trait QueueImpl<T>: Send + Sync + fmt::Debug {
+    fn push(&self, item: T);
+    fn pop(&self) -> Option<T>;
+}
+
+impl<T> QueueImpl<T> for ArrayQueue<T>
+where
+    T: Send + Sync + fmt::Debug,
+{
+    fn push(&self, item: T) {
+        self.push(item)
+            .unwrap_or_else(|_| unreachable!("acquired permits but channel reported being full."));
+    }
+
+    fn pop(&self) -> Option<T> {
+        self.pop()
+    }
+}
+
+impl<T> QueueImpl<T> for SegQueue<T>
+where
+    T: Send + Sync + fmt::Debug,
+{
+    fn push(&self, item: T) {
+        self.push(item);
+    }
+
+    fn pop(&self) -> Option<T> {
+        self.pop()
+    }
+}
+
 #[derive(Debug)]
 struct Inner<T> {
-    data: Arc<ArrayQueue<(OwnedSemaphorePermit, T)>>,
-    limit: usize,
+    data: Arc<dyn QueueImpl<(OwnedSemaphorePermit, T)>>,
+    limit: MemoryBufferSize,
     limiter: Arc<Semaphore>,
     read_waker: Arc<Notify>,
 }
@@ -85,7 +119,11 @@ impl<T: InMemoryBufferable> LimitedSender<T> {
         // We have to limit the number of permits we ask for to the overall limit since we're always
         // willing to store more items than the limit if the queue is entirely empty, because
         // otherwise we might deadlock ourselves by not being able to send a single item.
-        cmp::min(self.inner.limit, item.event_count()) as u32
+        let (limit, value) = match self.inner.limit {
+            MemoryBufferSize::MaxSize(max_size) => (max_size, item.allocated_bytes()),
+            MemoryBufferSize::MaxEvents(max_events) => (max_events, item.event_count()),
+        };
+        cmp::min(limit.get(), value) as u32
     }
 
     /// Gets the number of items that this channel could accept.
@@ -112,10 +150,7 @@ impl<T: InMemoryBufferable> LimitedSender<T> {
             return Err(SendError(item));
         };
 
-        self.inner
-            .data
-            .push((permits, item))
-            .unwrap_or_else(|_| unreachable!("acquired permits but channel reported being full"));
+        self.inner.data.push((permits, item));
         self.inner.read_waker.notify_one();
 
         trace!("Sent item.");
@@ -153,10 +188,7 @@ impl<T: InMemoryBufferable> LimitedSender<T> {
             }
         };
 
-        self.inner
-            .data
-            .push((permits, item))
-            .unwrap_or_else(|_| unreachable!("acquired permits but channel reported being full"));
+        self.inner.data.push((permits, item));
         self.inner.read_waker.notify_one();
 
         trace!("Attempt to send item succeeded.");
@@ -235,12 +267,22 @@ impl<T> Drop for LimitedReceiver<T> {
     }
 }
 
-pub fn limited<T>(limit: usize) -> (LimitedSender<T>, LimitedReceiver<T>) {
-    let inner = Inner {
-        data: Arc::new(ArrayQueue::new(limit)),
-        limit,
-        limiter: Arc::new(Semaphore::new(limit)),
-        read_waker: Arc::new(Notify::new()),
+pub fn limited<T: InMemoryBufferable + fmt::Debug>(
+    limit: MemoryBufferSize,
+) -> (LimitedSender<T>, LimitedReceiver<T>) {
+    let inner = match limit {
+        MemoryBufferSize::MaxEvents(max_events) => Inner {
+            data: Arc::new(ArrayQueue::new(max_events.get())),
+            limit,
+            limiter: Arc::new(Semaphore::new(max_events.get())),
+            read_waker: Arc::new(Notify::new()),
+        },
+        MemoryBufferSize::MaxSize(max_size) => Inner {
+            data: Arc::new(SegQueue::new()),
+            limit,
+            limiter: Arc::new(Semaphore::new(max_size.get())),
+            read_waker: Arc::new(Notify::new()),
+        },
     };
 
     let sender = LimitedSender {
@@ -254,21 +296,25 @@ pub fn limited<T>(limit: usize) -> (LimitedSender<T>, LimitedReceiver<T>) {
 
 #[cfg(test)]
 mod tests {
+    use std::num::NonZeroUsize;
+
     use tokio_test::{assert_pending, assert_ready, task::spawn};
+    use vector_common::byte_size_of::ByteSizeOf;
 
     use super::limited;
     use crate::{
-        test::MultiEventRecord, topology::channel::limited_queue::SendError,
-        topology::test_util::Sample,
+        test::MultiEventRecord,
+        topology::{channel::limited_queue::SendError, test_util::Sample},
+        MemoryBufferSize,
     };
 
     #[tokio::test]
     async fn send_receive() {
-        let (mut tx, mut rx) = limited(2);
+        let (mut tx, mut rx) = limited(MemoryBufferSize::MaxEvents(NonZeroUsize::new(2).unwrap()));
 
         assert_eq!(2, tx.available_capacity());
 
-        let msg = Sample(42);
+        let msg = Sample::new(42);
 
         // Create our send and receive futures.
         let mut send = spawn(async { tx.send(msg).await });
@@ -287,17 +333,58 @@ mod tests {
 
         // Now our receive should have been woken up, and should immediately be ready.
         assert!(recv.is_woken());
-        assert_eq!(Some(msg), assert_ready!(recv.poll()));
+        assert_eq!(Some(Sample::new(42)), assert_ready!(recv.poll()));
+    }
+
+    #[test]
+    fn test_limiting_by_byte_size() {
+        let max_elements = 10;
+        let msg = Sample::new_with_heap_allocated_values(50);
+        let msg_size = msg.allocated_bytes();
+        let max_allowed_bytes = msg_size * max_elements;
+
+        // With this configuration a maximum of exactly 10 messages can fit in the channel
+        let (mut tx, mut rx) = limited(MemoryBufferSize::MaxSize(
+            NonZeroUsize::new(max_allowed_bytes).unwrap(),
+        ));
+
+        assert_eq!(max_allowed_bytes, tx.available_capacity());
+
+        // Send 10 messages into the channel, filling it
+        for _ in 0..10 {
+            let msg_clone = msg.clone();
+            let mut f = spawn(async { tx.send(msg_clone).await });
+            assert_eq!(Ok(()), assert_ready!(f.poll()));
+        }
+        // With the 10th message in the channel no space should be left
+        assert_eq!(0, tx.available_capacity());
+
+        // Attemting to produce one more then the max capacity should block
+        let mut send_final = spawn({
+            let msg_clone = msg.clone();
+            async { tx.send(msg_clone).await }
+        });
+        assert_pending!(send_final.poll());
+
+        // Read all data from the channel, assert final states are as expected
+        for _ in 0..10 {
+            let mut f = spawn(async { rx.next().await });
+            let value = assert_ready!(f.poll());
+            assert_eq!(value.allocated_bytes(), msg_size);
+        }
+        // Channel should have no more data
+        let mut recv = spawn(async { rx.next().await });
+        assert_pending!(recv.poll());
     }
 
     #[test]
     fn sender_waits_for_more_capacity_when_none_available() {
-        let (mut tx, mut rx) = limited(1);
+        let (mut tx, mut rx) = limited(MemoryBufferSize::MaxEvents(NonZeroUsize::new(1).unwrap()));
 
         assert_eq!(1, tx.available_capacity());
 
-        let msg1 = Sample(42);
-        let msg2 = Sample(43);
+        let msg1 = Sample::new(42);
+        let msg2 = Sample::new(43);
 
         // Create our send and receive futures.
         let mut send1 = spawn(async { tx.send(msg1).await });
@@ -328,7 +415,7 @@ mod tests {
         assert_pending!(send2.poll());
 
         // Now if we receive the item, our second send should be woken up and be able to send in.
-        assert_eq!(Some(msg1), assert_ready!(recv1.poll()));
+        assert_eq!(Some(Sample::new(42)), assert_ready!(recv1.poll()));
         drop(recv1);
 
         // Since the second send was already waiting for permits, the semaphore returns them
@@ -346,14 +433,14 @@ mod tests {
 
         // And the final receive to get our second send:
         assert!(recv2.is_woken());
-        assert_eq!(Some(msg2), assert_ready!(recv2.poll()));
+        assert_eq!(Some(Sample::new(43)), assert_ready!(recv2.poll()));
 
         assert_eq!(1, tx.available_capacity());
     }
 
     #[test]
     fn sender_waits_for_more_capacity_when_partial_available() {
-        let (mut tx, mut rx) = limited(7);
+        let (mut tx, mut rx) = limited(MemoryBufferSize::MaxEvents(NonZeroUsize::new(7).unwrap()));
 
         assert_eq!(7, tx.available_capacity());
 
@@ -441,12 +528,12 @@ mod tests {
 
     #[test]
     fn empty_receiver_returns_none_when_last_sender_drops() {
-        let (mut tx, mut rx) = limited(1);
+        let (mut tx, mut rx) = limited(MemoryBufferSize::MaxEvents(NonZeroUsize::new(1).unwrap()));
 
         assert_eq!(1, tx.available_capacity());
 
         let tx2 = tx.clone();
-        let msg = Sample(42);
+        let msg = Sample::new(42);
 
         // Create our send and receive futures.
         let mut send = spawn(async { tx.send(msg).await });
@@ -473,7 +560,7 @@ mod tests {
         drop(tx);
 
         assert!(recv.is_woken());
-        assert_eq!(Some(msg), assert_ready!(recv.poll()));
+        assert_eq!(Some(Sample::new(42)), assert_ready!(recv.poll()));
         drop(recv);
 
         let mut recv2 = spawn(async { rx.next().await });
@@ -483,7 +570,8 @@ mod tests {
 
     #[test]
     fn receiver_returns_none_once_empty_when_last_sender_drops() {
-        let (tx, mut rx) = limited::<Sample>(1);
+        let (tx, mut rx) =
+            limited::<Sample>(MemoryBufferSize::MaxEvents(NonZeroUsize::new(1).unwrap()));
 
         assert_eq!(1, tx.available_capacity());
 
@@ -512,7 +600,7 @@ mod tests {
 
     #[test]
     fn oversized_send_allowed_when_empty() {
-        let (mut tx, mut rx) = limited(1);
+        let (mut tx, mut rx) = limited(MemoryBufferSize::MaxEvents(NonZeroUsize::new(1).unwrap()));
 
         assert_eq!(1, tx.available_capacity());
 
@@ -544,7 +632,7 @@ mod tests {
 
     #[test]
     fn oversized_send_allowed_when_partial_capacity() {
-        let (mut tx, mut rx) = limited(2);
+        let (mut tx, mut rx) = limited(MemoryBufferSize::MaxEvents(NonZeroUsize::new(2).unwrap()));
 
         assert_eq!(2, tx.available_capacity());
 
diff --git a/lib/vector-buffers/src/topology/test_util.rs b/lib/vector-buffers/src/topology/test_util.rs
index ec0acac7416d2..b1c3a27f48c6b 100644
--- a/lib/vector-buffers/src/topology/test_util.rs
+++ b/lib/vector-buffers/src/topology/test_util.rs
@@ -12,18 +12,39 @@ use crate::{
     Bufferable, EventCount, WhenFull,
 };
 
-#[derive(Clone, Copy, Debug, Eq, Ord, PartialEq, PartialOrd)]
-pub(crate) struct Sample(pub u64);
+const SINGLE_VALUE_FLAG: u8 = 0;
+const HEAP_ALLOCATED_VALUES_FLAG: u8 = 1;
+
+#[derive(Clone, Debug, Eq, Ord, PartialEq, PartialOrd)]
+pub(crate) enum Sample {
+    SingleValue(u64),
+    HeapAllocatedValues(Vec<u64>),
+}
 
 impl From<u64> for Sample {
     fn from(v: u64) -> Self {
-        Self(v)
+        Self::SingleValue(v)
     }
 }
 
 impl From<Sample> for u64 {
-    fn from(s: Sample) -> Self {
-        s.0
+    fn from(v: Sample) -> Self {
+        match v {
+            Sample::SingleValue(sv) => sv,
+            Sample::HeapAllocatedValues(_) => {
+                panic!("Cannot use this API with other enum states of this type.")
+            }
+        }
+    }
+}
+
+impl Sample {
+    pub fn new(value: u64) -> Self {
+        Self::SingleValue(value)
+    }
+
+    pub fn new_with_heap_allocated_values(n: usize) -> Self {
+        Self::HeapAllocatedValues(vec![0; n])
     }
 }
 
@@ -35,7 +56,10 @@ impl AddBatchNotifier for Sample {
 
 impl ByteSizeOf for Sample {
     fn allocated_bytes(&self) -> usize {
-        0
+        match self {
+            Self::SingleValue(_) => 0,
+            Self::HeapAllocatedValues(uints) => uints.len() * 8,
+        }
     }
 }
 
@@ -44,12 +68,29 @@ impl FixedEncodable for Sample {
     type EncodeError = BasicError;
     type DecodeError = BasicError;
 
+    // Serialization format:
+    // - Encode type flag
+    // - if single flag encode int value
+    // - otherwise encode array length and encode array contents
     fn encode<B>(self, buffer: &mut B) -> Result<(), Self::EncodeError>
     where
         B: BufMut,
         Self: Sized,
     {
-        buffer.put_u64(self.0);
+        match self {
+            Self::SingleValue(uint) => {
+                buffer.put_u8(SINGLE_VALUE_FLAG);
+                buffer.put_u64(uint);
+            }
+            Self::HeapAllocatedValues(uints) => {
+                buffer.put_u8(HEAP_ALLOCATED_VALUES_FLAG);
+                // Prepend with array size
+                buffer.put_u32(u32::try_from(uints.len()).unwrap());
+                for v in uints {
+                    buffer.put_u64(v);
+                }
+            }
+        }
         Ok(())
     }
 
@@ -57,10 +98,16 @@ impl FixedEncodable for Sample {
     where
         B: Buf,
     {
-        if buffer.remaining() >= 8 {
-            Ok(Self(buffer.get_u64()))
-        } else {
-            Err(BasicError("need 8 bytes minimum".to_string()))
+        match buffer.get_u8() {
+            SINGLE_VALUE_FLAG => Ok(Self::SingleValue(buffer.get_u64())),
+            HEAP_ALLOCATED_VALUES_FLAG => {
+                let length = buffer.get_u32();
+                let values = (0..length).map(|_| buffer.get_u64()).collect();
+                Ok(Self::HeapAllocatedValues(values))
+            }
+            _ => Err(BasicError(
+                "Unknown serialization flag observed".to_string(),
+            )),
         }
     }
 }
diff --git a/lib/vector-buffers/src/variants/in_memory.rs b/lib/vector-buffers/src/variants/in_memory.rs
index fedcf35c2d9f1..9dbb79ebf5c18 100644
--- a/lib/vector-buffers/src/variants/in_memory.rs
+++ b/lib/vector-buffers/src/variants/in_memory.rs
@@ -4,6 +4,7 @@ use async_trait::async_trait;
 
 use crate::{
     buffer_usage_data::BufferUsageHandle,
+    config::MemoryBufferSize,
     topology::{
         builder::IntoBuffer,
         channel::{limited, ReceiverAdapter, SenderAdapter},
@@ -12,13 +13,19 @@ use crate::{
 };
 
 pub struct MemoryBuffer {
-    capacity: NonZeroUsize,
+    capacity: MemoryBufferSize,
 }
 
 impl MemoryBuffer {
-    pub fn new(capacity: NonZeroUsize) -> Self {
+    pub fn new(capacity: MemoryBufferSize) -> Self {
         MemoryBuffer { capacity }
     }
+
+    pub fn with_max_events(n: NonZeroUsize) -> Self {
+        Self {
+            capacity: MemoryBufferSize::MaxEvents(n),
+        }
+    }
 }
 
 #[async_trait]
@@ -30,9 +37,14 @@ where
         self: Box<Self>,
         usage_handle: BufferUsageHandle,
     ) -> Result<(SenderAdapter<T>, ReceiverAdapter<T>), Box<dyn Error + Send + Sync>> {
-        usage_handle.set_buffer_limits(None, Some(self.capacity.get()));
+        let (max_bytes, max_size) = match self.capacity {
+            MemoryBufferSize::MaxEvents(max_events) => (None, Some(max_events.get())),
+            MemoryBufferSize::MaxSize(max_size) => (None, Some(max_size.get())),
+        };
+
+        usage_handle.set_buffer_limits(max_bytes, max_size);
 
-        let (tx, rx) = limited(self.capacity.get());
+        let (tx, rx) = limited(self.capacity);
         Ok((tx.into(), rx.into()))
     }
 }
diff --git a/lib/vector-config-macros/src/configurable.rs b/lib/vector-config-macros/src/configurable.rs
index fa27431a6c4c2..a52115a05434c 100644
--- a/lib/vector-config-macros/src/configurable.rs
+++ b/lib/vector-config-macros/src/configurable.rs
@@ -700,15 +700,24 @@ fn generate_named_enum_field(field: &Field<'_>) -> proc_macro2::TokenStream {
         None
     };
 
-    quote! {
-        {
-            #field_schema
-
-            if let Some(_) = properties.insert(#field_key.to_string(), subschema) {
-                panic!(#field_already_contained);
+    if field.flatten() {
+        quote! {
+            {
+                #field_schema
+                flattened_subschemas.push(subschema);
             }
+        }
+    } else {
+        quote! {
+            {
+                #field_schema
 
-            #maybe_field_required
+                if let Some(_) = properties.insert(#field_key.to_string(), subschema) {
+                    panic!(#field_already_contained);
+                }
+
+                #maybe_field_required
+            }
         }
     }
 }
@@ -733,6 +742,7 @@ fn generate_enum_struct_named_variant_schema(
         {
             let mut properties = ::vector_config::indexmap::IndexMap::new();
             let mut required = ::std::collections::BTreeSet::new();
+            let mut flattened_subschemas = ::std::vec::Vec::new();
 
             #(#mapped_fields)*
 
@@ -740,11 +750,18 @@ fn generate_enum_struct_named_variant_schema(
 
             #maybe_fill_discriminant_map
 
-            ::vector_config::schema::generate_struct_schema(
+            let mut schema = ::vector_config::schema::generate_struct_schema(
                 properties,
                 required,
                 None
-            )
+            );
+
+            // If we have any flattened subschemas, deal with them now.
+            if !flattened_subschemas.is_empty() {
+                ::vector_config::schema::convert_to_flattened_schema(&mut schema, flattened_subschemas);
+            }
+
+            schema
         }
     }
 }
diff --git a/src/source_sender/mod.rs b/src/source_sender/mod.rs
index 243eb7ad8ecf7..39c578c22e200 100644
--- a/src/source_sender/mod.rs
+++ b/src/source_sender/mod.rs
@@ -1,12 +1,15 @@
 #![allow(missing_docs)]
-use std::{collections::HashMap, fmt, sync::Arc, time::Instant};
+use std::{collections::HashMap, fmt, num::NonZeroUsize, sync::Arc, time::Instant};
 
 use chrono::Utc;
 use futures::{Stream, StreamExt};
 use metrics::{histogram, Histogram};
 use tracing::Span;
-use vector_lib::buffers::topology::channel::{self, LimitedReceiver, LimitedSender};
 use vector_lib::buffers::EventCount;
+use vector_lib::buffers::{
+    config::MemoryBufferSize,
+    topology::channel::{self, LimitedReceiver, LimitedSender},
+};
 use vector_lib::event::array::EventArrayIntoIter;
 #[cfg(any(test, feature = "test-utils"))]
 use vector_lib::event::{into_event_stream, EventStatus};
@@ -390,7 +393,7 @@ impl Output {
         log_definition: Option<Arc<Definition>>,
         output_id: OutputId,
     ) -> (Self, LimitedReceiver<SourceSenderItem>) {
-        let (tx, rx) = channel::limited(n);
+        let (tx, rx) = channel::limited(MemoryBufferSize::MaxEvents(NonZeroUsize::new(n).unwrap()));
         (
             Self {
                 sender: tx,
diff --git a/src/test_util/mock/sources/basic.rs b/src/test_util/mock/sources/basic.rs
index 880917d0dac68..1a432d98affc4 100644
--- a/src/test_util/mock/sources/basic.rs
+++ b/src/test_util/mock/sources/basic.rs
@@ -1,10 +1,16 @@
-use std::sync::{
-    atomic::{AtomicUsize, Ordering},
-    Arc, Mutex,
+use std::{
+    num::NonZeroUsize,
+    sync::{
+        atomic::{AtomicUsize, Ordering},
+        Arc, Mutex,
+    },
 };
 
 use async_trait::async_trait;
-use vector_lib::buffers::topology::channel::{limited, LimitedReceiver};
+use vector_lib::buffers::{
+    config::MemoryBufferSize,
+    topology::channel::{limited, LimitedReceiver},
+};
 use vector_lib::configurable::configurable_component;
 use vector_lib::{config::LogNamespace, schema::Definition};
 use vector_lib::{
@@ -41,7 +47,9 @@ pub struct BasicSourceConfig {
 
 impl Default for BasicSourceConfig {
     fn default() -> Self {
-        let (_, receiver) = limited(1000);
+        let (_, receiver) = limited(MemoryBufferSize::MaxEvents(
+            NonZeroUsize::new(1000).unwrap(),
+        ));
         Self {
             receiver: Arc::new(Mutex::new(Some(receiver))),
             event_counter: None,
diff --git a/src/topology/test/backpressure.rs b/src/topology/test/backpressure.rs
index 5da2950e2f72e..52c472e183566 100644
--- a/src/topology/test/backpressure.rs
+++ b/src/topology/test/backpressure.rs
@@ -2,7 +2,7 @@ use std::sync::atomic::{AtomicUsize, Ordering};
 use std::sync::Arc;
 
 use tokio::time::Duration;
-use vector_lib::buffers::{BufferConfig, BufferType, WhenFull};
+use vector_lib::buffers::{BufferConfig, BufferType, MemoryBufferSize, WhenFull};
 use vector_lib::config::MEMORY_BUFFER_DEFAULT_MAX_EVENTS;
 
 use crate::{config::Config, test_util, test_util::start_topology};
@@ -98,7 +98,7 @@ async fn buffer_drop_fan_out() {
         backpressure_sink(events_to_sink / 2),
     );
     sink_outer.buffer = BufferConfig::Single(BufferType::Memory {
-        max_events: MEMORY_BUFFER_DEFAULT_MAX_EVENTS,
+        size: MemoryBufferSize::MaxEvents(MEMORY_BUFFER_DEFAULT_MAX_EVENTS),
         when_full: WhenFull::DropNewest,
     });
     config.add_sink_outer("out2", sink_outer);
diff --git a/website/cue/reference/components/generated/sinks.cue b/website/cue/reference/components/generated/sinks.cue
index 44bb2f72ee95b..9bb1bc943749e 100644
--- a/website/cue/reference/components/generated/sinks.cue
+++ b/website/cue/reference/components/generated/sinks.cue
@@ -20,12 +20,11 @@ generated: components: sinks: configuration: {
 			}
 			max_size: {
 				description: """
-					The maximum size of the buffer on disk.
+					The maximum allowed amount of allocated memory the buffer can hold.
 
-					Must be at least ~256 megabytes (268435488 bytes).
+					If `type = "disk"` then must be at least ~256 megabytes (268435488 bytes).
 					"""
-				relevant_when: "type = \"disk\""
-				required:      true
+				required: true
 				type: uint: unit: "bytes"
 			}
 			type: {

From 00c554f87ecfaa225a9523789648ed2362070623 Mon Sep 17 00:00:00 2001
From: Thomas <thomas.schneider@datadoghq.com>
Date: Tue, 15 Jul 2025 13:08:46 -0400
Subject: [PATCH 179/305] fix(core): `metrics-tag-values: full` made tags
 unmodifiable (#23371)

* Fix tags with multi_value_tags

* Add changelog

* Simplify tag getter by splitting into multiple fns

* Fix clippy warning

* Inline tags_getter

* Remove useless metric.series access
---
 ...c-tag-values-full-unmodifiable-tags.fix.md |  3 +
 lib/vector-core/src/event/vrl_target.rs       | 57 ++++++++++++++-----
 2 files changed, 47 insertions(+), 13 deletions(-)
 create mode 100644 changelog.d/23371_metric-tag-values-full-unmodifiable-tags.fix.md

diff --git a/changelog.d/23371_metric-tag-values-full-unmodifiable-tags.fix.md b/changelog.d/23371_metric-tag-values-full-unmodifiable-tags.fix.md
new file mode 100644
index 0000000000000..85613f056e0ed
--- /dev/null
+++ b/changelog.d/23371_metric-tag-values-full-unmodifiable-tags.fix.md
@@ -0,0 +1,3 @@
+Fix an issue where tags were not modifiable via VRL if `metrics-tag-values` was set to `full`.
+
+authors: thomasqueirozb
diff --git a/lib/vector-core/src/event/vrl_target.rs b/lib/vector-core/src/event/vrl_target.rs
index 8916c76adfb45..c79e2df360301 100644
--- a/lib/vector-core/src/event/vrl_target.rs
+++ b/lib/vector-core/src/event/vrl_target.rs
@@ -104,7 +104,7 @@ impl VrlTarget {
                 // We pre-generate [`Value`] types for the metric fields accessed in
                 // the event. This allows us to then return references to those
                 // values, even if the field is accessed more than once.
-                let value = precompute_metric_value(&metric, info);
+                let value = precompute_metric_value(&metric, info, multi_value_metric_tags);
 
                 VrlTarget::Metric {
                     metric,
@@ -242,9 +242,13 @@ fn merge_array_definitions(mut definition: Definition) -> Definition {
 
 fn set_metric_tag_values(name: String, value: &Value, metric: &mut Metric, multi_value_tags: bool) {
     if multi_value_tags {
-        let tag_values = value
-            .as_array()
-            .unwrap_or(&[])
+        let values = if let Value::Array(values) = value {
+            values.as_slice()
+        } else {
+            std::slice::from_ref(value)
+        };
+
+        let tag_values = values
             .iter()
             .filter_map(|value| match value {
                 Value::Bytes(bytes) => {
@@ -548,7 +552,7 @@ fn target_get_mut_metric<'a>(
 ///
 /// This structure is partially populated based on the fields accessed by
 /// the VRL program as informed by `ProgramInfo`.
-fn precompute_metric_value(metric: &Metric, info: &ProgramInfo) -> Value {
+fn precompute_metric_value(metric: &Metric, info: &ProgramInfo, multi_value_tags: bool) -> Value {
     struct MetricProperty {
         property: &'static str,
         getter: fn(&Metric) -> Option<Value>,
@@ -575,6 +579,33 @@ fn precompute_metric_value(metric: &Metric, info: &ProgramInfo) -> Value {
         }
     }
 
+    fn get_single_value_tags(metric: &Metric) -> Option<Value> {
+        metric.tags().cloned().map(|tags| {
+            tags.into_iter_single()
+                .map(|(tag, value)| (tag.into(), value.into()))
+                .collect::<ObjectMap>()
+                .into()
+        })
+    }
+
+    fn get_multi_value_tags(metric: &Metric) -> Option<Value> {
+        metric.tags().cloned().map(|tags| {
+            tags.iter_sets()
+                .map(|(tag, tag_set)| {
+                    let array_values: Vec<Value> = tag_set
+                        .iter()
+                        .map(|v| match v {
+                            Some(s) => Value::Bytes(s.as_bytes().to_vec().into()),
+                            None => Value::Null,
+                        })
+                        .collect();
+                    (tag.into(), Value::Array(array_values))
+                })
+                .collect::<ObjectMap>()
+                .into()
+        })
+    }
+
     let mut name = MetricProperty::new("name", |metric| Some(metric.name().to_owned().into()));
     let mut kind = MetricProperty::new("kind", |metric| Some(metric.kind().into()));
     let mut type_ = MetricProperty::new("type", |metric| Some(metric.value().clone().into()));
@@ -585,14 +616,14 @@ fn precompute_metric_value(metric: &Metric, info: &ProgramInfo) -> Value {
         MetricProperty::new("interval_ms", |metric| metric.interval_ms().map(Into::into));
     let mut timestamp =
         MetricProperty::new("timestamp", |metric| metric.timestamp().map(Into::into));
-    let mut tags = MetricProperty::new("tags", |metric| {
-        metric.tags().cloned().map(|tags| {
-            tags.into_iter_single()
-                .map(|(tag, value)| (tag.into(), value.into()))
-                .collect::<ObjectMap>()
-                .into()
-        })
-    });
+    let mut tags = MetricProperty::new(
+        "tags",
+        if multi_value_tags {
+            get_multi_value_tags
+        } else {
+            get_single_value_tags
+        },
+    );
 
     let mut map = ObjectMap::default();
 

From b2c6c79864b06e81c2ac73657e1a31a0c2b8d991 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 15 Jul 2025 17:51:15 +0000
Subject: [PATCH 180/305] chore(deps): Bump sysinfo from 0.34.2 to 0.35.1
 (#23138)

* chore(deps): Bump sysinfo from 0.34.2 to 0.35.1

Bumps [sysinfo](https://github.com/GuillaumeGomez/sysinfo) from 0.34.2 to 0.35.1.
- [Changelog](https://github.com/GuillaumeGomez/sysinfo/blob/master/CHANGELOG.md)
- [Commits](https://github.com/GuillaumeGomez/sysinfo/commits/v0.35.1)

---
updated-dependencies:
- dependency-name: sysinfo
  dependency-version: 0.35.1
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* cargo vdev build licenses

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Thomas <thomas.schneider@datadoghq.com>
---
 Cargo.lock           | 99 ++++++++++++++++++++++++++++++++++----------
 Cargo.toml           |  2 +-
 LICENSE-3rdparty.csv |  4 ++
 3 files changed, 81 insertions(+), 24 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 5ece83e0e7cc1..24860c8c7d4e7 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6995,13 +6995,23 @@ dependencies = [
 
 [[package]]
 name = "objc2-core-foundation"
-version = "0.3.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "daeaf60f25471d26948a1c2f840e3f7d86f4109e3af4e8e4b5cd70c39690d925"
+checksum = "1c10c2894a6fed806ade6027bcd50662746363a9589d3ec9d9bef30a4e4bc166"
 dependencies = [
  "bitflags 2.9.0",
 ]
 
+[[package]]
+name = "objc2-io-kit"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "71c1c64d6120e51cd86033f67176b1cb66780c2efe34dec55176f77befd93c0a"
+dependencies = [
+ "libc",
+ "objc2-core-foundation",
+]
+
 [[package]]
 name = "object"
 version = "0.32.1"
@@ -10445,15 +10455,16 @@ dependencies = [
 
 [[package]]
 name = "sysinfo"
-version = "0.34.2"
+version = "0.36.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4b93974b3d3aeaa036504b8eefd4c039dced109171c1ae973f1dc63b2c7e4b2"
+checksum = "aab138f5c1bb35231de19049060a87977ad23e04f2303e953bc5c2947ac7dec4"
 dependencies = [
  "libc",
  "memchr",
  "ntapi 0.4.1",
  "objc2-core-foundation",
- "windows 0.57.0",
+ "objc2-io-kit",
+ "windows 0.60.0",
 ]
 
 [[package]]
@@ -12791,12 +12802,24 @@ dependencies = [
 
 [[package]]
 name = "windows"
-version = "0.57.0"
+version = "0.60.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12342cb4d8e3b046f3d80effd474a7a02447231330ef77d71daa6fbc40681143"
+checksum = "ddf874e74c7a99773e62b1c671427abf01a425e77c3d3fb9fb1e4883ea934529"
 dependencies = [
- "windows-core 0.57.0",
- "windows-targets 0.52.6",
+ "windows-collections",
+ "windows-core 0.60.1",
+ "windows-future",
+ "windows-link",
+ "windows-numerics",
+]
+
+[[package]]
+name = "windows-collections"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5467f79cc1ba3f52ebb2ed41dbb459b8e7db636cc3429458d9a852e15bc24dec"
+dependencies = [
+ "windows-core 0.60.1",
 ]
 
 [[package]]
@@ -12810,21 +12833,32 @@ dependencies = [
 
 [[package]]
 name = "windows-core"
-version = "0.57.0"
+version = "0.60.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2ed2439a290666cd67ecce2b0ffaad89c2a56b976b736e6ece670297897832d"
+checksum = "ca21a92a9cae9bf4ccae5cf8368dce0837100ddf6e6d57936749e85f152f6247"
 dependencies = [
  "windows-implement",
  "windows-interface",
- "windows-result 0.1.2",
- "windows-targets 0.52.6",
+ "windows-link",
+ "windows-result 0.3.1",
+ "windows-strings 0.3.1",
+]
+
+[[package]]
+name = "windows-future"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a787db4595e7eb80239b74ce8babfb1363d8e343ab072f2ffe901400c03349f0"
+dependencies = [
+ "windows-core 0.60.1",
+ "windows-link",
 ]
 
 [[package]]
 name = "windows-implement"
-version = "0.57.0"
+version = "0.59.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9107ddc059d5b6fbfbffdfa7a7fe3e22a226def0b2608f72e9d552763d3e1ad7"
+checksum = "83577b051e2f49a058c308f17f273b570a6a758386fc291b5f6a934dd84e48c1"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
@@ -12833,9 +12867,9 @@ dependencies = [
 
 [[package]]
 name = "windows-interface"
-version = "0.57.0"
+version = "0.59.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29bee4b38ea3cde66011baa44dba677c432a78593e202392d1e9070cf2a7fca7"
+checksum = "bd9211b69f8dcdfa817bfd14bf1c97c9188afa36f4750130fcdf3f400eca9fa8"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
@@ -12848,6 +12882,16 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6dccfd733ce2b1753b03b6d3c65edf020262ea35e20ccdf3e288043e6dd620e3"
 
+[[package]]
+name = "windows-numerics"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "005dea54e2f6499f2cee279b8f703b3cf3b5734a2d8d21867c8f44003182eeed"
+dependencies = [
+ "windows-core 0.60.1",
+ "windows-link",
+]
+
 [[package]]
 name = "windows-registry"
 version = "0.2.0"
@@ -12855,26 +12899,26 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e400001bb720a623c1c69032f8e3e4cf09984deec740f007dd2b03ec864804b0"
 dependencies = [
  "windows-result 0.2.0",
- "windows-strings",
+ "windows-strings 0.1.0",
  "windows-targets 0.52.6",
 ]
 
 [[package]]
 name = "windows-result"
-version = "0.1.2"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e383302e8ec8515204254685643de10811af0ed97ea37210dc26fb0032647f8"
+checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e"
 dependencies = [
  "windows-targets 0.52.6",
 ]
 
 [[package]]
 name = "windows-result"
-version = "0.2.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e"
+checksum = "06374efe858fab7e4f881500e6e86ec8bc28f9462c47e5a9941a0142ad86b189"
 dependencies = [
- "windows-targets 0.52.6",
+ "windows-link",
 ]
 
 [[package]]
@@ -12898,6 +12942,15 @@ dependencies = [
  "windows-targets 0.52.6",
 ]
 
+[[package]]
+name = "windows-strings"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87fa48cc5d406560701792be122a10132491cff9d0aeb23583cc2dcafc847319"
+dependencies = [
+ "windows-link",
+]
+
 [[package]]
 name = "windows-sys"
 version = "0.45.0"
diff --git a/Cargo.toml b/Cargo.toml
index c598761dd75ad..69ef953ca152f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -407,7 +407,7 @@ heim = { git = "https://github.com/vectordotdev/heim.git", branch = "update-nix"
 
 # make sure to update the external docs when the Lua version changes
 mlua = { version = "0.10.5", default-features = false, features = ["lua54", "send", "vendored", "macros"], optional = true }
-sysinfo = "0.34.2"
+sysinfo = "0.36.0"
 byteorder = "1.5.0"
 
 [target.'cfg(windows)'.dependencies]
diff --git a/LICENSE-3rdparty.csv b/LICENSE-3rdparty.csv
index b74c671b206cb..bacbc08ecd534 100644
--- a/LICENSE-3rdparty.csv
+++ b/LICENSE-3rdparty.csv
@@ -442,6 +442,7 @@ number_prefix,https://github.com/ogham/rust-number-prefix,MIT,Benjamin Sago <ogh
 oauth2,https://github.com/ramosbugs/oauth2-rs,MIT OR Apache-2.0,"Alex Crichton <alex@alexcrichton.com>, Florin Lipan <florinlipan@gmail.com>, David A. Ramos <ramos@cs.stanford.edu>"
 objc,http://github.com/SSheldon/rust-objc,MIT,Steven Sheldon
 objc2-core-foundation,https://github.com/madsmtm/objc2,Zlib OR Apache-2.0 OR MIT,The objc2-core-foundation Authors
+objc2-io-kit,https://github.com/madsmtm/objc2,Zlib OR Apache-2.0 OR MIT,The objc2-io-kit Authors
 object,https://github.com/gimli-rs/object,Apache-2.0 OR MIT,The object Authors
 octseq,https://github.com/NLnetLabs/octets/,BSD-3-Clause,NLnet Labs <rust-team@nlnetlabs.nl>
 ofb,https://github.com/RustCrypto/block-modes,MIT OR Apache-2.0,RustCrypto Developers
@@ -746,6 +747,9 @@ widestring,https://github.com/starkat99/widestring-rs,MIT OR Apache-2.0,The wide
 winapi,https://github.com/retep998/winapi-rs,MIT OR Apache-2.0,Peter Atashian <retep998@gmail.com>
 winapi-util,https://github.com/BurntSushi/winapi-util,Unlicense OR MIT,Andrew Gallant <jamslam@gmail.com>
 windows,https://github.com/microsoft/windows-rs,MIT OR Apache-2.0,Microsoft
+windows-collections,https://github.com/microsoft/windows-rs,MIT OR Apache-2.0,The windows-collections Authors
+windows-future,https://github.com/microsoft/windows-rs,MIT OR Apache-2.0,The windows-future Authors
+windows-numerics,https://github.com/microsoft/windows-rs,MIT OR Apache-2.0,The windows-numerics Authors
 windows-service,https://github.com/mullvad/windows-service-rs,MIT OR Apache-2.0,Mullvad VPN
 winnow,https://github.com/winnow-rs/winnow,MIT,The winnow Authors
 winreg,https://github.com/gentoo90/winreg-rs,MIT,Igor Shaula <gentoo90@gmail.com>

From 600f3457100bc097c68edaf6882be97c609f85ac Mon Sep 17 00:00:00 2001
From: Thomas <thomas.schneider@datadoghq.com>
Date: Tue, 15 Jul 2025 16:48:33 -0400
Subject: [PATCH 181/305] fix(ci): checkout changelog script from master
 (#23382)

* fix(ci): checkout changelog script from master

* Add debug statement

* Add pull_request to test modified workflow

* Revert "Add pull_request to test modified workflow" + "Add debug statement"

* Change ref to master

* Re-add debug

* Remove debug

This reverts commit 02a67c4d5c7e1d60629c16fc8c343e8572713d60.

* Remove whitespace
---
 .github/workflows/changelog.yaml     | 12 +++++++++++-
 scripts/check_changelog_fragments.sh |  2 +-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/changelog.yaml b/.github/workflows/changelog.yaml
index 800cb00880ddf..a062e08c00492 100644
--- a/.github/workflows/changelog.yaml
+++ b/.github/workflows/changelog.yaml
@@ -38,6 +38,16 @@ jobs:
           repository: ${{ github.event.pull_request.head.repo.full_name }}
           ref: ${{ github.event.pull_request.head.sha }}
 
+      - name: Checkout trusted changelog script
+        uses: actions/checkout@v4
+        with:
+          repository: ${{ github.repository }}
+          ref: master
+          path: base
+          sparse-checkout: scripts/check_changelog_fragments.sh
+          sparse-checkout-cone-mode: false
+          clean: false
+
       - name: Bypass when no‑changelog label is present
         if: env.PR_HAS_LABEL == 'true'
         run: |
@@ -52,4 +62,4 @@ jobs:
 
       - name: Run changelog fragment checker
         if: ${{ env.PR_HAS_LABEL == 'false' && github.event_name != 'merge_group' }}
-        run: ./scripts/check_changelog_fragments.sh
+        run: ./base/scripts/check_changelog_fragments.sh
diff --git a/scripts/check_changelog_fragments.sh b/scripts/check_changelog_fragments.sh
index 731d4ea34fb3a..edda3acffddf8 100755
--- a/scripts/check_changelog_fragments.sh
+++ b/scripts/check_changelog_fragments.sh
@@ -21,7 +21,7 @@ FRAGMENTS=$(git diff --name-only --diff-filter=A --merge-base origin/master ${CH
 
 if [ -z "$FRAGMENTS" ]; then
   echo "No changelog fragments detected"
-  echo "If no changes  necessitate user-facing explanations, add the GH label 'no-changelog'"
+  echo "If no changes necessitate user-facing explanations, add the GH label 'no-changelog'"
   echo "Otherwise, add changelog fragments to changelog.d/"
   echo "For details, see 'changelog.d/README.md'"
   exit 1

From efc1c5d6da5f09bd7e2ea8f140b1a753b731794e Mon Sep 17 00:00:00 2001
From: Pavlos Rontidis <pavlos.rontidis@gmail.com>
Date: Wed, 16 Jul 2025 09:29:51 -0400
Subject: [PATCH 182/305] fix(ci): add MIT-0 to allowed licenses (#23386)

---
 deny.toml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/deny.toml b/deny.toml
index 7d5b3a5a7168d..7e200969f6e01 100644
--- a/deny.toml
+++ b/deny.toml
@@ -8,6 +8,7 @@ allow = [
   "CC0-1.0",
   "ISC",
   "MIT",
+  "MIT-0",
   "OpenSSL",
   "Unicode-3.0",
   "Unicode-DFS-2016",

From e7de566922b6dc12c946829667379168fe49c0ba Mon Sep 17 00:00:00 2001
From: Yao Noel Achi <43069141+ynachi@users.noreply.github.com>
Date: Wed, 16 Jul 2025 20:05:43 +0200
Subject: [PATCH 183/305] fix(elasticsearch sink): opensearch credentials
 provided in uri not used (#23367)

* chore: fix opensearch credentials provided in uri not used

When opensearch credentials are provide in the URI, there are not
used. They are not used because the config parser ignore the
credentials extracted from the URI. This PR fixes that and add
some tests to catch that behavior.

* doc: document elasticsearch authenticated url behavior

* Update src/sinks/elasticsearch/config.rs

Co-authored-by: Pavlos Rontidis <pavlos.rontidis@gmail.com>

* doc: update document elasticsearch authenticated url behavior

---------

Co-authored-by: Pavlos Rontidis <pavlos.rontidis@gmail.com>
---
 ..._uri_provided_basic_auth_opensearch.fix.md |   3 +
 src/sinks/elasticsearch/common.rs             | 104 ++++++++++-------
 src/sinks/elasticsearch/config.rs             |   6 +
 src/sinks/elasticsearch/tests.rs              | 105 +++++++++++++++++-
 .../sinks/generated/elasticsearch.cue         |   6 +
 5 files changed, 185 insertions(+), 39 deletions(-)
 create mode 100644 changelog.d/23103_fix_uri_provided_basic_auth_opensearch.fix.md

diff --git a/changelog.d/23103_fix_uri_provided_basic_auth_opensearch.fix.md b/changelog.d/23103_fix_uri_provided_basic_auth_opensearch.fix.md
new file mode 100644
index 0000000000000..124071e9bbb4f
--- /dev/null
+++ b/changelog.d/23103_fix_uri_provided_basic_auth_opensearch.fix.md
@@ -0,0 +1,3 @@
+Fix URI provided for basic auth in OpenSearch. Credentials provided in the URI were ignored. It is now being used correctly.
+
+authors: ynachi
diff --git a/src/sinks/elasticsearch/common.rs b/src/sinks/elasticsearch/common.rs
index 20a80c22651bf..22f9c91aada67 100644
--- a/src/sinks/elasticsearch/common.rs
+++ b/src/sinks/elasticsearch/common.rs
@@ -45,46 +45,13 @@ impl ElasticsearchCommon {
         proxy_config: &ProxyConfig,
         version: &mut Option<usize>,
     ) -> crate::Result<Self> {
-        // Test the configured host, but ignore the result
-        let uri = format!("{}/_test", endpoint);
-        let uri = uri
-            .parse::<Uri>()
-            .with_context(|_| InvalidHostSnafu { host: endpoint })?;
-        if uri.host().is_none() {
-            return Err(ParseError::HostMustIncludeHostname {
-                host: endpoint.to_string(),
-            }
-            .into());
-        }
+        // Test the configured host
+        Self::check_endpoint(endpoint)?;
 
         let uri = endpoint.parse::<UriSerde>()?;
-        let auth = match &config.auth {
-            Some(ElasticsearchAuthConfig::Basic { user, password }) => {
-                let auth = Some(crate::http::Auth::Basic {
-                    user: user.clone(),
-                    password: password.clone(),
-                });
-                // basic auth must be some for now
-                let auth = auth.choose_one(&uri.auth)?.unwrap();
-                Some(Auth::Basic(auth))
-            }
-            #[cfg(feature = "aws-core")]
-            Some(ElasticsearchAuthConfig::Aws(aws)) => {
-                let region = config
-                    .aws
-                    .as_ref()
-                    .map(|config| config.region())
-                    .ok_or(ParseError::RegionRequired)?
-                    .ok_or(ParseError::RegionRequired)?;
-                Some(Auth::Aws {
-                    credentials_provider: aws
-                        .credentials_provider(region.clone(), proxy_config, config.tls.as_ref())
-                        .await?,
-                    region,
-                })
-            }
-            None => None,
-        };
+
+        // get auth from config or uri
+        let auth = Self::extract_auth(config, proxy_config, &uri).await?;
 
         if config.opensearch_service_type == OpenSearchServiceType::Serverless {
             match &config.auth {
@@ -257,6 +224,67 @@ impl ElasticsearchCommon {
         })
     }
 
+    fn check_endpoint(endpoint: &str) -> crate::Result<()> {
+        let uri = format!("{}/_test", endpoint);
+        let uri = uri
+            .parse::<Uri>()
+            .with_context(|_| InvalidHostSnafu { host: endpoint })?;
+        if uri.host().is_none() {
+            return Err(ParseError::HostMustIncludeHostname {
+                host: endpoint.to_string(),
+            }
+            .into());
+        }
+        Ok(())
+    }
+
+    // extract the authentication from config or endpoint
+    async fn extract_auth(
+        config: &ElasticsearchConfig,
+        proxy_config: &ProxyConfig,
+        uri: &UriSerde,
+    ) -> crate::Result<Option<Auth>> {
+        let auth = match &config.auth {
+            Some(ElasticsearchAuthConfig::Basic { user, password }) => {
+                let auth = Some(crate::http::Auth::Basic {
+                    user: user.clone(),
+                    password: password.clone(),
+                });
+                // get whichever auth is provided between config and uri, prevent duplicate auth.
+                let auth = auth.choose_one(&uri.auth)?.unwrap();
+                Some(Auth::Basic(auth))
+            }
+            #[cfg(feature = "aws-core")]
+            Some(ElasticsearchAuthConfig::Aws(aws)) => {
+                let region = config
+                    .aws
+                    .as_ref()
+                    .map(|config| config.region())
+                    .ok_or(ParseError::RegionRequired)?
+                    .ok_or(ParseError::RegionRequired)?;
+                Some(Auth::Aws {
+                    credentials_provider: aws
+                        .credentials_provider(region.clone(), proxy_config, config.tls.as_ref())
+                        .await?,
+                    region,
+                })
+            }
+            None => {
+                // Use the authentication from the URL if it exists
+                uri.auth.as_ref().and_then(|auth| match auth {
+                    crate::http::Auth::Basic { user, password } => {
+                        Some(Auth::Basic(crate::http::Auth::Basic {
+                            user: user.clone(),
+                            password: password.clone(),
+                        }))
+                    }
+                    _ => None,
+                })
+            }
+        };
+        Ok(auth)
+    }
+
     /// Parses endpoints into a vector of ElasticsearchCommons. The resulting vector is guaranteed to not be empty.
     pub async fn parse_many(
         config: &ElasticsearchConfig,
diff --git a/src/sinks/elasticsearch/config.rs b/src/sinks/elasticsearch/config.rs
index ba639c6ec794b..6b8d633fccf97 100644
--- a/src/sinks/elasticsearch/config.rs
+++ b/src/sinks/elasticsearch/config.rs
@@ -86,6 +86,12 @@ pub struct ElasticsearchConfig {
     ///
     /// The endpoint must contain an HTTP scheme, and may specify a
     /// hostname or IP address and port.
+    /// The endpoint may include basic authentication credentials,
+    /// e.g., `https://user:password@example.com`. If credentials are provided in the endpoint,
+    /// they will be used to authenticate against Elasticsearch.
+    ///
+    /// If `auth` is specified and the endpoint contains credentials,
+    /// a configuration error will be raised.
     #[serde(default)]
     #[configurable(metadata(docs::examples = "http://10.24.32.122:9000"))]
     #[configurable(metadata(docs::examples = "https://example.com"))]
diff --git a/src/sinks/elasticsearch/tests.rs b/src/sinks/elasticsearch/tests.rs
index 9ef28cc7f811b..a60c62ba5cacf 100644
--- a/src/sinks/elasticsearch/tests.rs
+++ b/src/sinks/elasticsearch/tests.rs
@@ -1,7 +1,10 @@
 use std::{convert::TryFrom, iter::zip};
-
+use vector_common::sensitive_string::SensitiveString;
 use vector_lib::lookup::PathPrefix;
 
+use crate::config::ProxyConfig;
+use crate::sinks::elasticsearch::ElasticsearchAuthConfig;
+use crate::sinks::util::auth::Auth;
 use crate::{
     codecs::Transformer,
     event::{LogEvent, Metric, MetricKind, MetricValue, ObjectMap, Value},
@@ -667,3 +670,103 @@ async fn datastream_index_name() {
         assert_eq!(processed_event.index, test_case.want, "{test_case:?}");
     }
 }
+
+#[tokio::test]
+async fn test_parse_config_with_uri_auth() {
+    let config = ElasticsearchConfig {
+        endpoints: vec!["http://user:pass@localhost:9200".to_string()],
+        ..Default::default()
+    };
+    let proxy = ProxyConfig::default();
+    let mut version = None;
+
+    let result = ElasticsearchCommon::parse_config(
+        &config,
+        "http://user:pass@localhost:9200",
+        &proxy,
+        &mut version,
+    )
+    .await;
+    assert!(result.is_ok());
+    let common = result.unwrap();
+
+    assert!(
+        common.auth.is_some(),
+        "Expected auth to be the one provided in the uri, got None"
+    );
+
+    let expected_auth = crate::http::Auth::Basic {
+        user: "user".to_string(),
+        password: SensitiveString::from("pass".to_string()),
+    };
+
+    let got_auth_inner = match common.auth.as_ref().unwrap() {
+        Auth::Basic(auth) => auth,
+        _ => panic!("Expected auth to be Basic"),
+    };
+
+    assert_eq!(
+        *got_auth_inner, expected_auth,
+        "Expected auth to be Basic with user 'user' and password 'pass'"
+    );
+}
+
+#[tokio::test]
+async fn test_parse_config_with_config_auth() {
+    let config = ElasticsearchConfig {
+        auth: Some(ElasticsearchAuthConfig::Basic {
+            user: "config_user".to_string(),
+            password: SensitiveString::from("config_pass".to_string()),
+        }),
+        endpoints: vec!["http://localhost:9200".to_string()],
+        ..Default::default()
+    };
+    let proxy = ProxyConfig::default();
+    let mut version = None;
+
+    let result =
+        ElasticsearchCommon::parse_config(&config, "http://localhost:9200", &proxy, &mut version)
+            .await;
+    assert!(result.is_ok());
+    let common = result.unwrap();
+
+    let expected_auth = crate::http::Auth::Basic {
+        user: "config_user".to_string(),
+        password: SensitiveString::from("config_pass".to_string()),
+    };
+
+    let got_auth_inner = match common.auth.as_ref().unwrap() {
+        Auth::Basic(auth) => auth,
+        _ => panic!("Expected auth to be Basic"),
+    };
+
+    assert_eq!(
+        *got_auth_inner, expected_auth,
+        "Expected auth to be Basic with user 'user' and password 'pass'"
+    );
+}
+
+#[tokio::test]
+async fn test_parse_config_with_conflicting_auth() {
+    let config = ElasticsearchConfig {
+        auth: Some(ElasticsearchAuthConfig::Basic {
+            user: "config_user".to_string(),
+            password: SensitiveString::from("config_pass".to_string()),
+        }),
+        endpoints: vec!["http://uri_user:uri_pass@localhost:9200".to_string()],
+        ..Default::default()
+    };
+    let proxy = ProxyConfig::default();
+    let mut version = None;
+
+    let result = ElasticsearchCommon::parse_config(
+        &config,
+        "http://uri_user:uri_pass@localhost:9200",
+        &proxy,
+        &mut version,
+    )
+    .await;
+
+    // Should fail due to auth being specified in both places
+    assert!(result.is_err());
+}
diff --git a/website/cue/reference/components/sinks/generated/elasticsearch.cue b/website/cue/reference/components/sinks/generated/elasticsearch.cue
index 85eac233a81ff..a54b78edb5b2c 100644
--- a/website/cue/reference/components/sinks/generated/elasticsearch.cue
+++ b/website/cue/reference/components/sinks/generated/elasticsearch.cue
@@ -495,6 +495,12 @@ generated: components: sinks: elasticsearch: configuration: {
 
 			The endpoint must contain an HTTP scheme, and may specify a
 			hostname or IP address and port.
+			The endpoint may include basic authentication credentials,
+			e.g., `https://user:password@example.com`. If credentials are provided in the endpoint,
+			they will be used to authenticate against Elasticsearch.
+
+			If `auth` is specified and the endpoint contains credentials,
+			a configuration error will be raised.
 			"""
 		required: false
 		type: array: {

From 29b323670bcc6ab1baec11cb865b927816aa954e Mon Sep 17 00:00:00 2001
From: Pavlos Rontidis <pavlos.rontidis@gmail.com>
Date: Thu, 17 Jul 2025 10:33:16 -0400
Subject: [PATCH 184/305] fix(ci): use Debian-native bind package (#23389)

---
 tests/data/dnstap/Dockerfile | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/tests/data/dnstap/Dockerfile b/tests/data/dnstap/Dockerfile
index ee929c6c2c925..a81c4b8142bf6 100644
--- a/tests/data/dnstap/Dockerfile
+++ b/tests/data/dnstap/Dockerfile
@@ -1,14 +1,10 @@
 FROM docker.io/library/debian:bookworm
 
 ENV DEBIAN_FRONTEND=noninteractive
+
 RUN apt-get update \
-  && apt-get -y --no-install-recommends install apt-utils apt-transport-https lsb-release ca-certificates curl wget \
-  && wget -q -O /etc/apt/trusted.gpg.d/bind.gpg https://packages.sury.org/bind/apt.gpg \
-  && sh -c 'echo "deb https://packages.sury.org/bind/ $(lsb_release -sc) main" > /etc/apt/sources.list.d/bind.list' \
-  && apt-get update \
   && apt-get -y --no-install-recommends install bind9 bind9utils dnsutils \
-  && apt-get remove --autoremove -y apt-utils apt-transport-https lsb-release ca-certificates curl wget \
-  && rm -rf /var/list/apt/lists/*
+  && rm -rf /var/lib/apt/lists/*
 
 COPY named.conf.local named.conf.options.template /etc/bind/
 COPY db.example.com /var/lib/bind/

From e3ee69876173073f30c3a7a9634dab6e960e20de Mon Sep 17 00:00:00 2001
From: Forking Frenzy <ken.ken@asx.com.au>
Date: Fri, 18 Jul 2025 00:36:19 +1000
Subject: [PATCH 185/305] feat(website): add timezone option, add performance
 timing into VRL Playground Website (#23343)

* Add Time Elapsed and Timezone Option

* Use default tz by default. Safely handle error if no performance timing.

* Make tz_str Optional.

* cargo fmt

* Changed 'took' to 'Duration: '. Changed 'TZ' to 'Select Timezone'. Changed position of elapsed time element to code section.

* Remove default value to fix suggestion.

* Readded default value.

---------

Co-authored-by: forkingfrenzy <forkingfrenzy@local>
Co-authored-by: Thomas <thomas.schneider@datadoghq.com>
---
 Cargo.lock                                    |  1 +
 lib/vector-vrl/web-playground/Cargo.toml      |  1 +
 .../web-playground/public/index.css           | 49 ++++++++++++++-
 .../web-playground/public/index.html          | 32 ++++++++--
 lib/vector-vrl/web-playground/public/index.js | 11 +++-
 lib/vector-vrl/web-playground/src/lib.rs      | 60 +++++++++++++++----
 6 files changed, 137 insertions(+), 17 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 24860c8c7d4e7..73abf27f60b1f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -12352,6 +12352,7 @@ dependencies = [
  "vector-vrl-functions",
  "vrl",
  "wasm-bindgen",
+ "web-sys",
 ]
 
 [[package]]
diff --git a/lib/vector-vrl/web-playground/Cargo.toml b/lib/vector-vrl/web-playground/Cargo.toml
index 8f2c875b6e718..544359ff7fac6 100644
--- a/lib/vector-vrl/web-playground/Cargo.toml
+++ b/lib/vector-vrl/web-playground/Cargo.toml
@@ -12,6 +12,7 @@ crate-type = ["cdylib"]
 wasm-bindgen = "0.2"
 vrl.workspace = true
 serde.workspace = true
+web-sys = { version = "0.3", features = ["Window", "Performance"] }
 gloo-utils = { version = "0.2", features = ["serde"] }
 vector-vrl-functions = { path = "../functions" }
 enrichment = { path = "../../enrichment" }
diff --git a/lib/vector-vrl/web-playground/public/index.css b/lib/vector-vrl/web-playground/public/index.css
index caaacc2cd0d3a..364ac714fe491 100644
--- a/lib/vector-vrl/web-playground/public/index.css
+++ b/lib/vector-vrl/web-playground/public/index.css
@@ -176,7 +176,7 @@ div#output-section {
   border-bottom: 1px solid var(--datadog-gray-light);
 }
 
-/*  BUTTONS */
+/* BUTTONS */
 .btn {
   display: inline-block;
   outline: 0;
@@ -373,3 +373,50 @@ div#output-section {
     font-size: 11px;
   }
 }
+
+#toolbar-section {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+}
+
+.timezone-container {
+  margin-left: auto;
+  display: flex;
+  align-items: center;
+}
+
+#timezone-label {
+  margin-right: 8px;
+  font-weight: bold;
+  font-family: "Open Sans", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen, Ubuntu,
+  Cantarell, "Helvetica Neue", sans-serif;
+  font-size: 14px;
+}
+
+#timezone-input {
+  padding: 0px 10px;
+  border: 1px solid #ccc;
+  border-radius: 4px;
+  background-color: #f8f9fa;
+  border-width: 1px;
+  border-style: solid;
+  font-size: 14px;
+  font-family: "Open Sans", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen, Ubuntu,
+  Cantarell, "Helvetica Neue", sans-serif;
+  line-height: 1.5;
+  color: #212529;
+  height: 36px;
+  box-sizing: border-box;
+}
+
+#output-cell-title .cell-title {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+
+#elapsed-time {
+  font-weight: normal;
+  font-size: 12px;
+}
diff --git a/lib/vector-vrl/web-playground/public/index.html b/lib/vector-vrl/web-playground/public/index.html
index 9799dcd4a4e76..7064dc6f4cd2e 100644
--- a/lib/vector-vrl/web-playground/public/index.html
+++ b/lib/vector-vrl/web-playground/public/index.html
@@ -2,7 +2,6 @@
 <html lang="en-US">
   <head>
     <meta charset="utf-8" />
-    <!-- the below line lets monaco editor to appear nicely in mobile view -->
     <meta content="width=device-width, initial-scale=1" name="viewport" />
     <title>VRL playground</title>
     <link rel="icon" type="image/x-icon" href="https://vector.dev/favicon.ico">
@@ -53,8 +52,30 @@ <h2>VRL Playground</h2>
       <div id="toolbar-section">
         <button id="run-code-btn" class="btn btn-primary" onClick="vrlPlayground.handleRunCode()">Run program</button>
         <button id="share-code-btn" class="btn btn-secondary" onClick="vrlPlayground.handleShareCode()">Share program</button>
-      </div>
-
+        <div class="timezone-container">
+          <label for="timezone-input" id="timezone-label">Select Timezone</label>
+          <input
+            type="text"
+            id="timezone-input"
+            name="timezone"
+            list="timezone-list"
+            value="Default"
+          >
+          <datalist id="timezone-list">
+            <option value="Default"></option>
+            <option value="Etc/UTC"></option>
+            <option value="America/New_York"></option>
+            <option value="America/Chicago"></option>
+            <option value="America/Denver"></option>
+            <option value="America/Los_Angeles"></option>
+            <option value="Europe/London"></option>
+            <option value="Europe/Paris"></option>
+            <option value="Asia/Tokyo"></option>
+            <option value="Asia/Dubai"></option>
+            <option value="Australia/Sydney"></option>
+          </datalist>
+        </div>
+        </div>
       <div id="input-section">
         <div id="cell">
           <div id="input-cell-title">
@@ -74,7 +95,10 @@ <h2>VRL Playground</h2>
 
         <div id="output-cell">
           <div id="output-cell-title">
-            <p class="cell-title">Output</p>
+            <p class="cell-title">
+              <span>Output</span>
+              <code id="elapsed-time"></code>
+            </p>
           </div>
           <div id="container-output"></div>
         </div>
diff --git a/lib/vector-vrl/web-playground/public/index.js b/lib/vector-vrl/web-playground/public/index.js
index aaf0c87007253..1f08115e8bb6a 100644
--- a/lib/vector-vrl/web-playground/public/index.js
+++ b/lib/vector-vrl/web-playground/public/index.js
@@ -39,7 +39,6 @@ export class VrlWebPlayground {
     constructor() {
         let temp = init().then(() => {
             this.run_vrl = run_vrl;
-
             this.vector_version = vector_version();
             this.vector_link = vector_link();
 
@@ -210,10 +209,18 @@ export class VrlWebPlayground {
             return input;
         }
 
-        let res = this.run_vrl(input);
+        const tz_input = document.getElementById('timezone-input');
+        // set default tz if nothing is set. this is going to use default timezone
+        let timezone = tz_input.value ? tz_input.value : (tz_input.value = "Default");
+        let res = this.run_vrl(input, timezone);
         console.log("[DEBUG::handleRunCode()] Printing out res: ", res);
         if (res.result) {
             this.outputEditor.setValue(JSON.stringify(res.result, null, "\t"));
+            if (res.elapsed_time !== null) {
+              document.getElementById("elapsed-time").textContent = `Duration: ${res.elapsed_time} milliseconds`;
+            }else {
+              document.getElementById("elapsed-time").textContent = "";
+            }
         } else if (res.msg) {
             // disable json linting for error msgs
             // since error msgs are not valid json
diff --git a/lib/vector-vrl/web-playground/src/lib.rs b/lib/vector-vrl/web-playground/src/lib.rs
index a434050aefa3c..7facbab54968c 100644
--- a/lib/vector-vrl/web-playground/src/lib.rs
+++ b/lib/vector-vrl/web-playground/src/lib.rs
@@ -29,17 +29,22 @@ impl Input {
     }
 }
 
-// The module returns the result of the last expression and the event that results from the
-// applied program
+// The module returns the result of the last expression, the resulting event,
+// and the execution time.
 #[derive(Deserialize, Serialize)]
 pub struct VrlCompileResult {
     pub output: Value,
     pub result: Value,
+    pub elapsed_time: Option<f64>,
 }
 
 impl VrlCompileResult {
-    fn new(output: Value, result: Value) -> Self {
-        Self { output, result }
+    fn new(output: Value, result: Value, elapsed_time: Option<f64>) -> Self {
+        Self {
+            output,
+            result,
+            elapsed_time,
+        }
     }
 }
 
@@ -76,7 +81,10 @@ impl VrlDiagnosticResult {
     }
 }
 
-fn compile(mut input: Input) -> Result<VrlCompileResult, VrlDiagnosticResult> {
+fn compile(
+    mut input: Input,
+    tz_str: Option<String>,
+) -> Result<VrlCompileResult, VrlDiagnosticResult> {
     let mut functions = vrl::stdlib::all();
     functions.extend(vector_vrl_functions::all());
     functions.extend(enrichment::vrl_functions());
@@ -85,7 +93,24 @@ fn compile(mut input: Input) -> Result<VrlCompileResult, VrlDiagnosticResult> {
     let state = TypeState::default();
     let mut runtime = Runtime::default();
     let config = CompileConfig::default();
-    let timezone = TimeZone::default();
+
+    let timezone = match tz_str.as_deref() {
+        // Empty or "Default" tz string will default to tz default
+        None | Some("") | Some("Default") => TimeZone::default(),
+        Some(other) => match other.parse() {
+            Ok(tz) => TimeZone::Named(tz),
+            Err(_) => {
+                // Returns error message if tz parsing has failed.
+                // This avoids head scratching, instead of it silently using the default timezone.
+                let error_message = format!("Invalid timezone identifier: '{}'", other);
+                return Err(VrlDiagnosticResult {
+                    list: vec![error_message.clone()],
+                    msg: error_message.clone(),
+                    msg_colorized: error_message,
+                });
+            }
+        },
+    };
 
     let mut target_value = TargetValue {
         value: event.clone(),
@@ -98,18 +123,32 @@ fn compile(mut input: Input) -> Result<VrlCompileResult, VrlDiagnosticResult> {
         Err(diagnostics) => return Err(VrlDiagnosticResult::new(&input.program, diagnostics)),
     };
 
-    match runtime.resolve(&mut target_value, &program.program, &timezone) {
-        Ok(result) => Ok(VrlCompileResult::new(result, target_value.value)),
+    let (result, elapsed_time) =
+        if let Some(performance) = web_sys::window().and_then(|w| w.performance()) {
+            let start_time = performance.now();
+            let result = runtime.resolve(&mut target_value, &program.program, &timezone);
+            let end_time = performance.now();
+            (result, Some(end_time - start_time))
+        } else {
+            // If performance API is not available, run the program without timing.
+            let result = runtime.resolve(&mut target_value, &program.program, &timezone);
+            (result, None)
+        };
+
+    match result {
+        // The final event is in `target_value.value`.
+        // The value of the last expression is in `res`.
+        Ok(res) => Ok(VrlCompileResult::new(res, target_value.value, elapsed_time)),
         Err(err) => Err(VrlDiagnosticResult::new_runtime_error(&input.program, err)),
     }
 }
 
 // The user-facing function
 #[wasm_bindgen]
-pub fn run_vrl(incoming: &JsValue) -> JsValue {
+pub fn run_vrl(incoming: &JsValue, tz_str: &str) -> JsValue {
     let input: Input = incoming.into_serde().unwrap();
 
-    match compile(input) {
+    match compile(input, Some(tz_str.to_string())) {
         Ok(res) => JsValue::from_serde(&res).unwrap(),
         Err(err) => JsValue::from_serde(&err).unwrap(),
     }
@@ -129,6 +168,7 @@ pub fn vector_link() -> String {
 pub fn vrl_version() -> String {
     built_info::VRL_VERSION.to_string()
 }
+
 #[wasm_bindgen]
 pub fn vrl_link() -> String {
     built_info::VRL_LINK.to_string()

From 87925298c54984812cc63799f1ccde7c74497865 Mon Sep 17 00:00:00 2001
From: Jake Halaska <26490690+5Dev24@users.noreply.github.com>
Date: Thu, 17 Jul 2025 10:18:38 -0500
Subject: [PATCH 186/305] enhancement(templating): Allow strftime in
 UnsignedIntTemplate (#23387)

* Allow strftime in UnsignedIntTemplates

* Add changelog fragment

* spelling

* add newline to changelog

* better event path usage

---------

Co-authored-by: Pavlos Rontidis <pavlos.rontidis@gmail.com>
---
 ...s_in_unsigned_int_templates.enhancement.md |  3 +
 src/template.rs                               | 55 ++++++++++++++++++-
 2 files changed, 55 insertions(+), 3 deletions(-)
 create mode 100644 changelog.d/strftime_items_in_unsigned_int_templates.enhancement.md

diff --git a/changelog.d/strftime_items_in_unsigned_int_templates.enhancement.md b/changelog.d/strftime_items_in_unsigned_int_templates.enhancement.md
new file mode 100644
index 0000000000000..df92d88cafe1b
--- /dev/null
+++ b/changelog.d/strftime_items_in_unsigned_int_templates.enhancement.md
@@ -0,0 +1,3 @@
+Allow strftime items in UnsignedIntTemplate.
+
+authors: 5Dev24
diff --git a/src/template.rs b/src/template.rs
index dab20876a1ac7..8db1a74f6f92d 100644
--- a/src/template.rs
+++ b/src/template.rs
@@ -40,8 +40,6 @@ pub enum TemplateRenderingError {
     MissingKeys { missing_keys: Vec<String> },
     #[snafu(display("Not numeric: {:?}", input))]
     NotNumeric { input: String },
-    #[snafu(display("Unsupported part for numeric value"))]
-    UnsupportedNumeric,
 }
 
 /// A templated field.
@@ -284,6 +282,9 @@ pub struct UnsignedIntTemplate {
 
     #[serde(skip)]
     parts: Vec<Part>,
+
+    #[serde(skip)]
+    tz_offset: Option<FixedOffset>,
 }
 
 impl TryFrom<UnsignedIntTemplateSource> for UnsignedIntTemplate {
@@ -294,6 +295,7 @@ impl TryFrom<UnsignedIntTemplateSource> for UnsignedIntTemplate {
             UnsignedIntTemplateSource::Number(num) => Ok(UnsignedIntTemplate {
                 src: UnsignedIntTemplateSource::Number(num),
                 parts: Vec::new(),
+                tz_offset: None,
             }),
             UnsignedIntTemplateSource::String(s) => UnsignedIntTemplate::try_from(s),
         }
@@ -327,6 +329,7 @@ impl From<u64> for UnsignedIntTemplate {
         UnsignedIntTemplate {
             src: UnsignedIntTemplateSource::Number(num),
             parts: Vec::new(),
+            tz_offset: None,
         }
     }
 }
@@ -344,6 +347,7 @@ impl TryFrom<Cow<'_, str>> for UnsignedIntTemplate {
                     Ok(num) => Ok(UnsignedIntTemplate {
                         src: UnsignedIntTemplateSource::Number(num),
                         parts,
+                        tz_offset: None,
                     }),
                     Err(_) => Err(TemplateParseError::InvalidNumericTemplate {
                         template: src.into_owned(),
@@ -353,6 +357,7 @@ impl TryFrom<Cow<'_, str>> for UnsignedIntTemplate {
                 Ok(UnsignedIntTemplate {
                     parts,
                     src: UnsignedIntTemplateSource::String(src.into_owned()),
+                    tz_offset: None,
                 })
             }
         })
@@ -392,6 +397,12 @@ impl UnsignedIntTemplate {
         }
     }
 
+    /// set tz offset
+    pub const fn with_tz_offset(mut self, tz_offset: Option<FixedOffset>) -> Self {
+        self.tz_offset = tz_offset;
+        self
+    }
+
     fn render_event(&self, event: EventRef<'_>) -> Result<u64, TemplateRenderingError> {
         let mut missing_keys = Vec::new();
         let mut out = String::with_capacity(20);
@@ -419,7 +430,9 @@ impl UnsignedIntTemplate {
                         }),
                     );
                 }
-                _ => return Err(TemplateRenderingError::UnsupportedNumeric),
+                Part::Strftime(items) => {
+                    out.push_str(&render_timestamp(items, event, self.tz_offset))
+                }
             }
         }
         if missing_keys.is_empty() {
@@ -605,6 +618,7 @@ mod tests {
     use vector_lib::config::LogNamespace;
     use vector_lib::lookup::{metadata_path, PathPrefix};
     use vector_lib::metric_tags;
+    use vrl::event_path;
 
     use super::*;
     use crate::event::{Event, LogEvent, MetricKind, MetricValue};
@@ -626,6 +640,7 @@ mod tests {
             .get_fields()
             .unwrap();
         let f6 = UnsignedIntTemplate::from(123u64).get_fields();
+        let f7 = UnsignedIntTemplate::try_from("%s").unwrap().get_fields();
 
         assert_eq!(f1, vec!["foo"]);
         assert_eq!(f2, vec!["foo", "bar"]);
@@ -633,6 +648,7 @@ mod tests {
         assert_eq!(f4, None);
         assert_eq!(f5, vec!["foo", "bar"]);
         assert_eq!(f6, None);
+        assert_eq!(f7, None);
     }
 
     #[test]
@@ -955,6 +971,23 @@ mod tests {
         );
     }
 
+    #[test]
+    fn render_log_unsigned_int_with_timezone() {
+        let ts = Utc.with_ymd_and_hms(2001, 2, 3, 4, 5, 6).unwrap();
+
+        let template = UnsignedIntTemplate::try_from("%Y%m%d%H").unwrap();
+        let mut event = Event::Log(LogEvent::from("hello world"));
+        event.as_mut_log().insert(event_path!("timestamp"), ts);
+
+        let tz: Tz = "Asia/Singapore".parse().unwrap();
+        let offset = Some(Utc::now().with_timezone(&tz).offset().fix());
+
+        assert_eq!(
+            Ok(2001020312),
+            template.with_tz_offset(offset).render(&event)
+        );
+    }
+
     fn sample_metric() -> Metric {
         Metric::new(
             "a-counter",
@@ -975,4 +1008,20 @@ mod tests {
             TemplateParseError::StrftimeError
         );
     }
+
+    #[test]
+    fn strftime_non_int_result() {
+        let template = UnsignedIntTemplate::try_from("a-%s").unwrap();
+        let ts = Utc.with_ymd_and_hms(2001, 2, 3, 4, 5, 6).unwrap();
+
+        let mut event = Event::Log(LogEvent::from("hello world"));
+        event.as_mut_log().insert(event_path!("timestamp"), ts);
+
+        assert_eq!(
+            Err(TemplateRenderingError::NotNumeric {
+                input: "a-981173106".to_owned()
+            }),
+            template.render(&event)
+        );
+    }
 }

From 74173af63a84695e29d3c3c3ad840c436f5c7832 Mon Sep 17 00:00:00 2001
From: Pavlos Rontidis <pavlos.rontidis@gmail.com>
Date: Thu, 17 Jul 2025 15:23:21 -0400
Subject: [PATCH 187/305] chore(dev): bump Rust toolchain to 1.88 (#23388)

* cargo clippy --all --fix --allow-dirty

* rust 1.88 - prep

* remove obsolete clippy.toml setting

* ran cargo fmt

* clippy fix

* Update vdev/src/commands/info.rs

Co-authored-by: Thomas <thomas.schneider@datadoghq.com>

* Update vdev/src/commands/info.rs

Co-authored-by: Thomas <thomas.schneider@datadoghq.com>

* cargo clippy --all-targets --all-features --fix

* ran cargo fmt

* more auto-fixes

* replace depracted all function

* unix auto fixes

---------

Co-authored-by: Thomas <thomas.schneider@datadoghq.com>
---
 benches/languages.rs                          | 14 ++---
 benches/remap.rs                              |  6 +-
 build.rs                                      | 17 ++----
 clippy.toml                                   |  2 +-
 lib/codecs/src/decoding/format/avro.rs        |  2 +-
 lib/codecs/src/decoding/format/gelf.rs        | 21 +++----
 lib/codecs/src/decoding/format/json.rs        |  2 +-
 lib/codecs/src/decoding/format/native_json.rs |  2 +-
 lib/codecs/src/decoding/format/protobuf.rs    |  2 +-
 .../src/decoding/framing/octet_counting.rs    | 11 ++--
 lib/codecs/src/decoding/mod.rs                |  5 +-
 lib/codecs/src/encoding/format/avro.rs        |  2 +-
 lib/codecs/src/encoding/format/cef.rs         |  4 +-
 lib/codecs/src/encoding/mod.rs                |  4 +-
 lib/codecs/tests/native.rs                    |  2 +-
 lib/dnsmsg-parser/src/dns_message_parser.rs   | 59 +++++++------------
 lib/dnstap-parser/src/parser.rs               | 10 ++--
 lib/docs-renderer/src/main.rs                 |  3 +-
 lib/docs-renderer/src/renderer.rs             |  4 +-
 lib/enrichment/src/tables.rs                  | 12 ++--
 lib/enrichment/src/vrl_util.rs                |  1 +
 lib/file-source/src/checkpointer.rs           |  8 +--
 .../src/file_watcher/tests/experiment.rs      |  2 +-
 .../tests/experiment_no_truncations.rs        |  2 +-
 lib/k8s-e2e-tests/src/lib.rs                  | 12 ++--
 lib/k8s-e2e-tests/src/metrics.rs              |  6 +-
 .../src/helm_values_file.rs                   |  2 +-
 lib/k8s-test-framework/src/port_forward.rs    |  2 +-
 lib/k8s-test-framework/src/reader.rs          |  2 +-
 lib/k8s-test-framework/src/util.rs            | 12 ++--
 .../src/wait_for_resource.rs                  |  2 +-
 lib/loki-logproto/src/lib.rs                  |  2 +-
 lib/opentelemetry-proto/src/common.rs         |  4 +-
 lib/prometheus-parser/src/line.rs             | 10 ++--
 lib/tracing-limit/benches/limit.rs            |  2 +-
 lib/tracing-limit/src/lib.rs                  | 10 ++--
 lib/vector-api-client/src/gql/components.rs   |  6 +-
 lib/vector-buffers/benches/common.rs          |  4 +-
 lib/vector-buffers/examples/buffer_perf.rs    |  9 ++-
 lib/vector-buffers/src/test/messages.rs       | 32 ++++------
 .../src/topology/channel/receiver.rs          |  2 +
 .../src/variants/disk_v2/tests/size_limits.rs |  2 +-
 lib/vector-common/src/finalization.rs         |  2 +-
 lib/vector-common/src/shutdown.rs             | 43 +++++++-------
 .../src/schema/json_schema.rs                 |  3 +-
 .../src/component_name.rs                     |  8 +--
 lib/vector-config-macros/src/configurable.rs  |  8 +--
 .../src/schema/parser/component.rs            |  2 +-
 .../src/schema/visitors/merge.rs              |  2 +-
 .../src/schema/visitors/scoped_visit.rs       |  2 +-
 lib/vector-config/tests/integration/smoke.rs  |  6 +-
 lib/vector-core/src/config/log_schema.rs      |  1 +
 lib/vector-core/src/event/metadata.rs         | 18 +++---
 lib/vector-core/src/tls/incoming.rs           | 10 ++--
 lib/vector-tap/src/controller.rs              |  5 +-
 lib/vector-tap/src/notification.rs            |  5 +-
 lib/vector-vrl/tests/src/docs.rs              |  2 +-
 lib/vector-vrl/tests/src/main.rs              |  2 +-
 lib/vector-vrl/web-playground/src/lib.rs      |  2 +-
 rust-toolchain.toml                           |  2 +-
 src/api/schema/gen.rs                         |  2 +-
 src/api/schema/metrics/filter.rs              |  5 +-
 src/api/schema/metrics/source/file.rs         |  4 +-
 src/codecs/encoding/encoder.rs                |  2 +-
 src/codecs/encoding/transformer.rs            |  2 +-
 src/common/datadog.rs                         |  2 +-
 src/common/expansion.rs                       |  2 +-
 src/common/http/server_auth.rs                |  1 +
 src/components/validation/mod.rs              | 11 ++--
 src/components/validation/runner/config.rs    |  3 +-
 src/components/validation/runner/mod.rs       | 25 +++-----
 .../validators/component_spec/mod.rs          |  2 +-
 src/conditions/datadog_search.rs              | 12 ++--
 src/conditions/vrl.rs                         |  4 +-
 src/config/api.rs                             |  6 +-
 src/config/builder.rs                         | 10 ++--
 src/config/cmd.rs                             | 13 ++--
 src/config/format.rs                          | 17 +++---
 src/config/graph.rs                           |  8 +--
 src/config/loading/loader.rs                  |  3 +-
 src/config/loading/secret_backend_example.rs  |  2 +-
 src/config/mod.rs                             | 16 +++--
 src/config/schema.rs                          |  5 +-
 src/config/unit_test/mod.rs                   |  5 +-
 src/config/unit_test/unit_test_components.rs  |  3 +-
 src/config/validation.rs                      |  5 +-
 src/docker.rs                                 |  6 +-
 src/encoding_transcode.rs                     |  5 +-
 src/enrichment_tables/file.rs                 | 16 ++---
 src/generate.rs                               | 33 ++++-------
 src/generate_schema.rs                        |  2 +-
 src/graph.rs                                  | 17 ++----
 src/http.rs                                   | 12 ++--
 src/internal_events/adaptive_concurrency.rs   |  4 +-
 src/internal_events/exec.rs                   |  6 +-
 src/internal_events/http_client.rs            |  8 +--
 src/internal_events/prelude.rs                |  2 +-
 src/internal_events/template.rs               |  2 +-
 .../allocations/allocator/stack.rs            |  2 +-
 src/lib.rs                                    |  6 +-
 src/line_agg.rs                               |  4 +-
 src/list.rs                                   |  8 +--
 src/nats.rs                                   |  2 +-
 src/secrets/directory.rs                      |  2 +-
 src/secrets/exec.rs                           | 10 ++--
 src/secrets/file.rs                           |  4 +-
 src/serde.rs                                  |  2 +-
 src/sinks/amqp/encoder.rs                     |  2 +-
 src/sinks/amqp/integration_tests.rs           |  3 +-
 src/sinks/appsignal/config.rs                 |  2 +-
 src/sinks/appsignal/encoder.rs                |  9 +--
 src/sinks/appsignal/integration_tests.rs      |  8 +--
 src/sinks/aws_cloudwatch_logs/config.rs       |  2 +-
 .../aws_cloudwatch_logs/integration_tests.rs  |  6 +-
 src/sinks/aws_cloudwatch_logs/service.rs      | 10 ++--
 .../integration_tests.rs                      |  4 +-
 .../aws_kinesis/firehose/integration_tests.rs |  4 +-
 .../aws_kinesis/streams/integration_tests.rs  |  2 +-
 src/sinks/aws_s3/integration_tests.rs         |  4 +-
 src/sinks/aws_s3/sink.rs                      | 14 +++--
 src/sinks/axiom.rs                            |  7 +--
 src/sinks/azure_blob/integration_tests.rs     |  4 +-
 src/sinks/azure_blob/request_builder.rs       | 11 ++--
 src/sinks/azure_monitor_logs/service.rs       |  3 +-
 src/sinks/clickhouse/integration_tests.rs     | 26 ++++----
 src/sinks/databend/config.rs                  |  8 +--
 src/sinks/databend/integration_tests.rs       | 13 ++--
 src/sinks/datadog/events/tests.rs             |  4 +-
 src/sinks/datadog/logs/config.rs              |  2 +-
 src/sinks/datadog/logs/integration_tests.rs   |  2 +-
 src/sinks/datadog/logs/sink.rs                |  4 +-
 src/sinks/datadog/logs/tests.rs               | 20 +++----
 src/sinks/datadog/metrics/config.rs           |  2 +-
 src/sinks/datadog/metrics/encoder.rs          |  2 +-
 .../datadog/metrics/integration_tests.rs      |  2 +-
 src/sinks/datadog/metrics/tests.rs            |  4 +-
 src/sinks/datadog/traces/config.rs            |  2 +-
 src/sinks/datadog/traces/service.rs           |  2 +-
 src/sinks/datadog/traces/tests.rs             |  4 +-
 src/sinks/elasticsearch/common.rs             |  6 +-
 src/sinks/elasticsearch/integration_tests.rs  |  6 +-
 src/sinks/elasticsearch/mod.rs                |  4 +-
 src/sinks/elasticsearch/retry.rs              | 13 ++--
 src/sinks/file/mod.rs                         |  2 +-
 src/sinks/gcp/pubsub.rs                       | 12 ++--
 src/sinks/gcp/stackdriver/logs/encoder.rs     |  8 +--
 src/sinks/gcp/stackdriver/logs/tests.rs       |  4 +-
 .../gcp_chronicle/chronicle_unstructured.rs   |  4 +-
 src/sinks/gcs_common/config.rs                |  2 +-
 .../greptimedb/logs/http_request_builder.rs   |  2 +-
 .../greptimedb/logs/integration_tests.rs      |  2 +-
 src/sinks/honeycomb/config.rs                 |  6 +-
 src/sinks/http/encoder.rs                     |  2 +-
 src/sinks/http/tests.rs                       |  8 +--
 src/sinks/humio/logs.rs                       |  7 +--
 src/sinks/humio/metrics.rs                    |  4 +-
 src/sinks/influxdb/logs.rs                    | 10 ++--
 src/sinks/influxdb/metrics.rs                 | 13 ++--
 src/sinks/influxdb/mod.rs                     | 23 ++++----
 src/sinks/kafka/tests.rs                      |  8 +--
 src/sinks/keep/config.rs                      |  6 +-
 src/sinks/loki/healthcheck.rs                 |  2 +-
 src/sinks/loki/integration_tests.rs           |  4 +-
 src/sinks/loki/sink.rs                        | 12 ++--
 src/sinks/loki/tests.rs                       |  2 +-
 src/sinks/mezmo.rs                            |  6 +-
 src/sinks/mqtt/integration_tests.rs           |  8 +--
 src/sinks/mqtt/request_builder.rs             |  2 +-
 src/sinks/nats/integration_tests.rs           | 36 ++++-------
 src/sinks/nats/request_builder.rs             |  2 +-
 src/sinks/new_relic/encoding.rs               |  3 +-
 src/sinks/new_relic/sink.rs                   |  2 +-
 src/sinks/papertrail.rs                       |  4 +-
 src/sinks/prometheus/collector.rs             |  9 +--
 src/sinks/prometheus/exporter.rs              |  4 +-
 .../remote_write/integration_tests.rs         |  6 +-
 src/sinks/prometheus/remote_write/tests.rs    |  2 +-
 src/sinks/pulsar/encoder.rs                   |  2 +-
 src/sinks/pulsar/integration_tests.rs         |  2 +-
 src/sinks/redis/integration_tests.rs          | 12 ++--
 src/sinks/s3_common/config.rs                 |  6 +-
 src/sinks/sematext/logs.rs                    |  2 +-
 src/sinks/sematext/metrics.rs                 |  4 +-
 src/sinks/splunk_hec/common/service.rs        | 15 +----
 src/sinks/splunk_hec/common/util.rs           |  2 +-
 .../splunk_hec/logs/integration_tests.rs      |  9 +--
 src/sinks/splunk_hec/logs/tests.rs            |  2 +-
 src/sinks/splunk_hec/metrics/tests.rs         |  2 +-
 src/sinks/statsd/encoder.rs                   |  8 +--
 src/sinks/util/adaptive_concurrency/tests.rs  | 14 ++---
 src/sinks/util/buffer/compression.rs          |  9 +--
 src/sinks/util/buffer/metrics/mod.rs          | 14 ++---
 src/sinks/util/http.rs                        | 10 ++--
 src/sinks/util/mod.rs                         |  2 +-
 src/sinks/util/retries.rs                     |  4 +-
 src/sinks/util/service.rs                     |  2 +-
 src/sinks/util/sink.rs                        |  2 +-
 src/sinks/util/socket_bytes_sink.rs           |  4 +-
 src/sinks/util/test.rs                        |  2 +-
 src/sinks/util/uri.rs                         |  8 +--
 src/sinks/vector/mod.rs                       |  4 +-
 src/sinks/websocket/sink.rs                   |  8 +--
 src/sinks/websocket_server/sink.rs            |  2 +-
 src/sources/amqp.rs                           |  6 +-
 src/sources/apache_metrics/mod.rs             |  2 +-
 src/sources/aws_ecs_metrics/mod.rs            |  9 +--
 src/sources/aws_ecs_metrics/parser.rs         |  5 +-
 src/sources/aws_kinesis_firehose/filters.rs   |  2 +-
 src/sources/aws_kinesis_firehose/mod.rs       |  2 +-
 src/sources/aws_s3/mod.rs                     | 11 ++--
 src/sources/aws_s3/sqs.rs                     |  7 +--
 src/sources/aws_sqs/integration_tests.rs      |  4 +-
 .../datadog_agent/integration_tests.rs        |  2 +-
 src/sources/datadog_agent/logs.rs             |  2 +-
 src/sources/datadog_agent/metrics.rs          |  6 +-
 src/sources/datadog_agent/mod.rs              |  4 +-
 src/sources/datadog_agent/tests.rs            |  2 +-
 src/sources/datadog_agent/traces.rs           |  2 +-
 src/sources/demo_logs.rs                      |  2 +-
 src/sources/dnstap/mod.rs                     |  6 +-
 src/sources/docker_logs/tests.rs              | 20 +++----
 src/sources/eventstoredb_metrics/types.rs     |  2 +-
 src/sources/exec/mod.rs                       | 16 ++---
 src/sources/exec/tests.rs                     |  4 +-
 src/sources/file.rs                           | 30 +++++-----
 src/sources/fluent/message.rs                 |  3 +-
 src/sources/fluent/mod.rs                     | 14 ++---
 src/sources/heroku_logs.rs                    |  4 +-
 src/sources/host_metrics/cgroups.rs           | 12 ++--
 src/sources/host_metrics/disk.rs              |  7 +--
 src/sources/host_metrics/filesystem.rs        |  7 +--
 src/sources/host_metrics/mod.rs               |  7 +--
 src/sources/http_client/client.rs             |  8 +--
 src/sources/http_client/tests.rs              | 22 +++----
 src/sources/http_server.rs                    | 10 ++--
 src/sources/journald.rs                       | 18 +++---
 src/sources/kafka.rs                          | 21 +++----
 src/sources/kubernetes_logs/mod.rs            | 11 ++--
 src/sources/kubernetes_logs/parser/docker.rs  |  4 +-
 src/sources/kubernetes_logs/parser/mod.rs     |  4 +-
 src/sources/mqtt/integration_tests.rs         |  2 +-
 src/sources/nats.rs                           | 45 +++++---------
 src/sources/nginx_metrics/mod.rs              |  2 +-
 src/sources/opentelemetry/http.rs             |  8 +--
 src/sources/opentelemetry/tests.rs            |  2 +-
 src/sources/prometheus/pushgateway.rs         | 12 +---
 src/sources/prometheus/remote_write.rs        |  4 +-
 src/sources/prometheus/scrape.rs              | 13 ++--
 src/sources/redis/mod.rs                      |  4 +-
 src/sources/socket/mod.rs                     | 16 +++--
 src/sources/splunk_hec/mod.rs                 | 20 +++----
 src/sources/statsd/parser.rs                  |  2 +-
 src/sources/syslog.rs                         | 14 ++---
 src/sources/util/framestream.rs               |  3 +-
 src/sources/util/grpc/decompression.rs        |  6 +-
 src/sources/util/http/encoding.rs             |  4 +-
 src/sources/util/http/prelude.rs              |  2 +-
 src/sources/util/net/mod.rs                   |  4 +-
 src/sources/vector/mod.rs                     |  9 ++-
 src/test_util/components.rs                   | 18 +++---
 src/test_util/metrics.rs                      | 24 +++-----
 src/test_util/mock/sources/backpressure.rs    |  2 +-
 src/test_util/mod.rs                          |  2 +-
 src/top/cmd.rs                                |  2 +-
 src/top/dashboard.rs                          | 14 +++--
 src/topology/builder.rs                       | 11 ++--
 src/topology/schema.rs                        |  2 +-
 src/topology/test/end_to_end.rs               |  4 +-
 src/trace.rs                                  |  2 +-
 src/transforms/aws_ec2_metadata.rs            | 20 +++----
 src/transforms/exclusive_route/config.rs      |  5 +-
 src/transforms/log_to_metric.rs               |  2 +-
 src/transforms/lua/v1/mod.rs                  |  4 +-
 src/transforms/lua/v2/mod.rs                  |  5 +-
 src/transforms/reduce/merge_strategy.rs       |  2 +-
 src/transforms/remap.rs                       | 10 ++--
 src/transforms/sample/tests.rs                |  2 +-
 .../tag_cardinality_limit/tag_value_set.rs    |  2 +-
 src/unit_test.rs                              |  4 +-
 src/validate.rs                               | 10 ++--
 tests/e2e/datadog/metrics/mod.rs              |  4 +-
 tests/e2e/datadog/metrics/series.rs           |  8 +--
 tests/e2e/datadog/mod.rs                      |  9 +--
 tests/integration/cli.rs                      | 12 ++--
 tests/integration/shutdown.rs                 | 13 ++--
 vdev/src/commands/info.rs                     |  8 +--
 vdev/src/features.rs                          |  4 +-
 vdev/src/platform.rs                          |  2 +-
 vdev/src/testing/config.rs                    | 11 ++--
 vdev/src/testing/integration.rs               | 15 +++--
 vdev/src/testing/runner.rs                    |  9 +--
 vdev/src/testing/state.rs                     | 11 ++--
 292 files changed, 917 insertions(+), 1169 deletions(-)

diff --git a/benches/languages.rs b/benches/languages.rs
index 2c386f786fd4f..6e0b0417055ad 100644
--- a/benches/languages.rs
+++ b/benches/languages.rs
@@ -256,11 +256,9 @@ fn benchmark_configs(
     let in_addr = next_addr();
     let out_addr = next_addr();
 
-    let lines: Vec<_> = ::std::iter::repeat(input.to_string())
-        .take(num_lines)
-        .collect();
+    let lines: Vec<_> = std::iter::repeat_n(input.to_string(), num_lines).collect();
 
-    let mut group = criterion.benchmark_group(format!("languages/{}", benchmark_name));
+    let mut group = criterion.benchmark_group(format!("languages/{benchmark_name}"));
     group.sampling_mode(SamplingMode::Flat);
 
     let source_config = format!(
@@ -286,15 +284,15 @@ fn benchmark_configs(
 
     for (name, transform_config) in configs.into_iter() {
         group.throughput(Throughput::Elements(num_lines as u64));
-        group.bench_function(name.clone(), |b| {
+        group.bench_function(name, |b| {
             b.iter_batched(
                 || {
                     let mut config = source_config.clone();
-                    config.push_str(&transform_config);
+                    config.push_str(transform_config);
                     config.push_str(&sink_config);
 
                     let config = config::load_from_str(&config, config::Format::Toml)
-                        .expect(&format!("invalid TOML configuration: {}", &config));
+                        .unwrap_or_else(|_| panic!("invalid TOML configuration: {}", &config));
                     let rt = runtime();
                     let (output_lines, topology) = rt.block_on(async move {
                         let output_lines = CountReceiver::receive_lines(out_addr);
@@ -322,7 +320,7 @@ fn benchmark_configs(
                                 // avoids asserting the actual == expected as the socket transform
                                 // adds dynamic keys like timestamp
                                 for (key, value) in output.iter() {
-                                    assert_eq!(Some(value), actual.get(key), "for key {}", key,);
+                                    assert_eq!(Some(value), actual.get(key), "for key {key}",);
                                 }
                             }
                         }
diff --git a/benches/remap.rs b/benches/remap.rs
index 5eedd24445e84..2cf0829ba2f4a 100644
--- a/benches/remap.rs
+++ b/benches/remap.rs
@@ -27,7 +27,7 @@ fn benchmark_remap(c: &mut Criterion) {
 
     let add_fields_runner = |tform: &mut Box<dyn SyncTransform>, event: Event| {
         let mut outputs = TransformOutputsBuf::new_with_capacity(
-            vec![TransformOutput::new(DataType::all(), HashMap::new())],
+            vec![TransformOutput::new(DataType::all_bits(), HashMap::new())],
             1,
         );
         tform.transform(event, &mut outputs);
@@ -90,7 +90,7 @@ fn benchmark_remap(c: &mut Criterion) {
 
     let json_parser_runner = |tform: &mut Box<dyn SyncTransform>, event: Event| {
         let mut outputs = TransformOutputsBuf::new_with_capacity(
-            vec![TransformOutput::new(DataType::all(), HashMap::new())],
+            vec![TransformOutput::new(DataType::all_bits(), HashMap::new())],
             1,
         );
         tform.transform(event, &mut outputs);
@@ -144,7 +144,7 @@ fn benchmark_remap(c: &mut Criterion) {
     let coerce_runner =
         |tform: &mut Box<dyn SyncTransform>, event: Event, timestamp: DateTime<Utc>| {
             let mut outputs = TransformOutputsBuf::new_with_capacity(
-                vec![TransformOutput::new(DataType::all(), HashMap::new())],
+                vec![TransformOutput::new(DataType::all_bits(), HashMap::new())],
                 1,
             );
             tform.transform(event, &mut outputs);
diff --git a/build.rs b/build.rs
index b603074f90bcc..cf35846cbe61c 100644
--- a/build.rs
+++ b/build.rs
@@ -20,7 +20,7 @@ impl TrackedEnv {
 
     pub fn emit_rerun_stanzas(&self) {
         for env_var in &self.tracked {
-            println!("cargo:rerun-if-env-changed={}", env_var);
+            println!("cargo:rerun-if-env-changed={env_var}");
         }
     }
 }
@@ -33,9 +33,9 @@ enum ConstantValue {
 impl ConstantValue {
     pub fn as_parts(&self) -> (&'static str, String) {
         match &self {
-            ConstantValue::Required(value) => ("&str", format!("\"{}\"", value)),
+            ConstantValue::Required(value) => ("&str", format!("\"{value}\"")),
             ConstantValue::Optional(value) => match value {
-                Some(value) => ("Option<&str>", format!("Some(\"{}\")", value)),
+                Some(value) => ("Option<&str>", format!("Some(\"{value}\")")),
                 None => ("Option<&str>", "None".to_string()),
             },
         }
@@ -79,10 +79,8 @@ impl BuildConstants {
 
         for (name, desc, value) in self.values {
             let (const_type, const_val) = value.as_parts();
-            let full = format!(
-                "#[doc=r#\"{}\"#]\npub const {}: {} = {};\n",
-                desc, name, const_type, const_val
-            );
+            let full =
+                format!("#[doc=r#\"{desc}\"#]\npub const {name}: {const_type} = {const_val};\n");
             output_file.write_all(full.as_ref())?;
         }
 
@@ -202,10 +200,7 @@ fn main() {
         .map_err(|e| {
             #[allow(clippy::print_stderr)]
             {
-                eprintln!(
-                    "Unable to determine git short hash from rev-parse command: {}",
-                    e
-                );
+                eprintln!("Unable to determine git short hash from rev-parse command: {e}");
             }
         })
         .expect("git hash detection failed");
diff --git a/clippy.toml b/clippy.toml
index 25937ac64122a..20274f646b1d7 100644
--- a/clippy.toml
+++ b/clippy.toml
@@ -1,4 +1,4 @@
-cognitive-complexity-threshold = 75
+large-error-threshold = 256  # in bytes
 
 # for `disallowed_method`:
 # https://rust-lang.github.io/rust-clippy/master/index.html#disallowed_method
diff --git a/lib/codecs/src/decoding/format/avro.rs b/lib/codecs/src/decoding/format/avro.rs
index 7a49763179891..7b2cb5fbe59aa 100644
--- a/lib/codecs/src/decoding/format/avro.rs
+++ b/lib/codecs/src/decoding/format/avro.rs
@@ -41,7 +41,7 @@ impl AvroDeserializerConfig {
     /// Build the `AvroDeserializer` from this configuration.
     pub fn build(&self) -> AvroDeserializer {
         let schema = apache_avro::Schema::parse_str(&self.avro_options.schema)
-            .map_err(|error| format!("Failed building Avro serializer: {}", error))
+            .map_err(|error| format!("Failed building Avro serializer: {error}"))
             .unwrap();
         AvroDeserializer {
             schema,
diff --git a/lib/codecs/src/decoding/format/gelf.rs b/lib/codecs/src/decoding/format/gelf.rs
index c37924072ffa6..e51e50d33aafb 100644
--- a/lib/codecs/src/decoding/format/gelf.rs
+++ b/lib/codecs/src/decoding/format/gelf.rs
@@ -118,11 +118,9 @@ impl GelfDeserializer {
 
         // GELF spec defines the version as 1.1 which has not changed since 2013
         if parsed.version != GELF_VERSION {
-            return Err(format!(
-                "{} does not match GELF spec version ({})",
-                VERSION, GELF_VERSION
-            )
-            .into());
+            return Err(
+                format!("{VERSION} does not match GELF spec version ({GELF_VERSION})").into(),
+            );
         }
 
         log.insert(&GELF_TARGET_PATHS.version, parsed.version.to_string());
@@ -166,16 +164,15 @@ impl GelfDeserializer {
                 // per GELF spec, Additional field names must be prefixed with an underscore
                 if !key.starts_with('_') {
                     return Err(format!(
-                        "'{}' field is invalid. \
-                                       Additional field names must be prefixed with an underscore.",
-                        key
+                        "'{key}' field is invalid. \
+                                       Additional field names must be prefixed with an underscore."
                     )
                     .into());
                 }
                 // per GELF spec, Additional field names must be characters dashes or dots
                 if !VALID_FIELD_REGEX.is_match(key) {
-                    return Err(format!("'{}' field contains invalid characters. Field names may \
-                                       contain only letters, numbers, underscores, dashes and dots.", key).into());
+                    return Err(format!("'{key}' field contains invalid characters. Field names may \
+                                       contain only letters, numbers, underscores, dashes and dots.").into());
                 }
 
                 // per GELF spec, Additional field values must be either strings or numbers
@@ -191,8 +188,8 @@ impl GelfDeserializer {
                         serde_json::Value::Array(_) => "array",
                         serde_json::Value::Object(_) => "object",
                     };
-                    return Err(format!("The value type for field {} is an invalid type ({}). Additional field values \
-                                       should be either strings or numbers.", key, type_).into());
+                    return Err(format!("The value type for field {key} is an invalid type ({type_}). Additional field values \
+                                       should be either strings or numbers.").into());
                 }
             }
         }
diff --git a/lib/codecs/src/decoding/format/json.rs b/lib/codecs/src/decoding/format/json.rs
index a017cba3c8fa6..9e7c0676b56b6 100644
--- a/lib/codecs/src/decoding/format/json.rs
+++ b/lib/codecs/src/decoding/format/json.rs
@@ -111,7 +111,7 @@ impl Deserializer for JsonDeserializer {
             true => serde_json::from_str(&String::from_utf8_lossy(&bytes)),
             false => serde_json::from_slice(&bytes),
         }
-        .map_err(|error| format!("Error parsing JSON: {:?}", error))?;
+        .map_err(|error| format!("Error parsing JSON: {error:?}"))?;
 
         // If the root is an Array, split it into multiple events
         let mut events = match json {
diff --git a/lib/codecs/src/decoding/format/native_json.rs b/lib/codecs/src/decoding/format/native_json.rs
index eac15b30529ea..ebdda1f9b80d2 100644
--- a/lib/codecs/src/decoding/format/native_json.rs
+++ b/lib/codecs/src/decoding/format/native_json.rs
@@ -97,7 +97,7 @@ impl Deserializer for NativeJsonDeserializer {
             true => serde_json::from_str(&String::from_utf8_lossy(&bytes)),
             false => serde_json::from_slice(&bytes),
         }
-        .map_err(|error| format!("Error parsing JSON: {:?}", error))?;
+        .map_err(|error| format!("Error parsing JSON: {error:?}"))?;
 
         let events = match json {
             serde_json::Value::Array(values) => values
diff --git a/lib/codecs/src/decoding/format/protobuf.rs b/lib/codecs/src/decoding/format/protobuf.rs
index 0a4552b076424..26330028d26aa 100644
--- a/lib/codecs/src/decoding/format/protobuf.rs
+++ b/lib/codecs/src/decoding/format/protobuf.rs
@@ -98,7 +98,7 @@ impl Deserializer for ProtobufDeserializer {
         log_namespace: LogNamespace,
     ) -> vector_common::Result<SmallVec<[Event; 1]>> {
         let dynamic_message = DynamicMessage::decode(self.message_descriptor.clone(), bytes)
-            .map_err(|error| format!("Error parsing protobuf: {:?}", error))?;
+            .map_err(|error| format!("Error parsing protobuf: {error:?}"))?;
 
         let proto_vrl =
             vrl::protobuf::proto_to_value(&prost_reflect::Value::Message(dynamic_message), None)?;
diff --git a/lib/codecs/src/decoding/framing/octet_counting.rs b/lib/codecs/src/decoding/framing/octet_counting.rs
index b5248b26b6c36..e90173f5a28cf 100644
--- a/lib/codecs/src/decoding/framing/octet_counting.rs
+++ b/lib/codecs/src/decoding/framing/octet_counting.rs
@@ -97,8 +97,7 @@ impl OctetCountingDecoder {
                 // There are enough chars in this frame to discard
                 src.advance(chars);
                 self.octet_decoding = None;
-                Err(LinesCodecError::Io(io::Error::new(
-                    io::ErrorKind::Other,
+                Err(LinesCodecError::Io(io::Error::other(
                     "Frame length limit exceeded",
                 )))
             }
@@ -117,8 +116,7 @@ impl OctetCountingDecoder {
                 // When discarding we keep discarding to the next newline.
                 src.advance(offset + 1);
                 self.octet_decoding = None;
-                Err(LinesCodecError::Io(io::Error::new(
-                    io::ErrorKind::Other,
+                Err(LinesCodecError::Io(io::Error::other(
                     "Frame length limit exceeded",
                 )))
             }
@@ -203,8 +201,7 @@ impl OctetCountingDecoder {
             (State::NotDiscarding, Some(newline_pos), _) => {
                 // Beyond maximum length, advance to the newline.
                 src.advance(newline_pos + 1);
-                Err(LinesCodecError::Io(io::Error::new(
-                    io::ErrorKind::Other,
+                Err(LinesCodecError::Io(io::Error::other(
                     "Frame length limit exceeded",
                 )))
             }
@@ -392,7 +389,7 @@ mod tests {
         buffer.put(&b"defghijklmnopqrstuvwxyzand here we are"[..]);
         let result = decoder.decode(&mut buffer);
 
-        println!("{:?}", result);
+        println!("{result:?}");
         assert!(result.is_err());
         assert_eq!(b"and here we are"[..], buffer);
     }
diff --git a/lib/codecs/src/decoding/mod.rs b/lib/codecs/src/decoding/mod.rs
index 684c61fef37f5..4d5d34d454cb1 100644
--- a/lib/codecs/src/decoding/mod.rs
+++ b/lib/codecs/src/decoding/mod.rs
@@ -51,8 +51,8 @@ pub enum Error {
 impl std::fmt::Display for Error {
     fn fmt(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         match self {
-            Self::FramingError(error) => write!(formatter, "FramingError({})", error),
-            Self::ParsingError(error) => write!(formatter, "ParsingError({})", error),
+            Self::FramingError(error) => write!(formatter, "FramingError({error})"),
+            Self::ParsingError(error) => write!(formatter, "ParsingError({error})"),
         }
     }
 }
@@ -468,6 +468,7 @@ impl DeserializerConfig {
 }
 
 /// Parse structured events from bytes.
+#[allow(clippy::large_enum_variant)]
 #[derive(Clone)]
 pub enum Deserializer {
     /// Uses a `AvroDeserializer` for deserialization.
diff --git a/lib/codecs/src/encoding/format/avro.rs b/lib/codecs/src/encoding/format/avro.rs
index bfac175f18c21..c06bdee2294a2 100644
--- a/lib/codecs/src/encoding/format/avro.rs
+++ b/lib/codecs/src/encoding/format/avro.rs
@@ -23,7 +23,7 @@ impl AvroSerializerConfig {
     /// Build the `AvroSerializer` from this configuration.
     pub fn build(&self) -> Result<AvroSerializer, BuildError> {
         let schema = apache_avro::Schema::parse_str(&self.avro.schema)
-            .map_err(|error| format!("Failed building Avro serializer: {}", error))?;
+            .map_err(|error| format!("Failed building Avro serializer: {error}"))?;
         Ok(AvroSerializer { schema })
     }
 
diff --git a/lib/codecs/src/encoding/format/cef.rs b/lib/codecs/src/encoding/format/cef.rs
index a22ba102251f9..78056e03c5889 100644
--- a/lib/codecs/src/encoding/format/cef.rs
+++ b/lib/codecs/src/encoding/format/cef.rs
@@ -321,7 +321,7 @@ impl Encoder<Event> for CefSerializer {
                 continue;
             }
             let value = escape_extension(&value);
-            formatted_extensions.push(format!("{}={}", extension, value));
+            formatted_extensions.push(format!("{extension}={value}"));
         }
 
         buffer.write_fmt(format_args!(
@@ -368,7 +368,7 @@ fn escape_extension(s: &str) -> String {
 
 fn escape_special_chars(s: &str, extra_char: char) -> String {
     s.replace('\\', r#"\\"#)
-        .replace(extra_char, &format!(r#"\{}"#, extra_char))
+        .replace(extra_char, &format!(r#"\{extra_char}"#))
 }
 
 fn validate_length(field: &str, field_name: &str, max_length: usize) -> Result<String, BuildError> {
diff --git a/lib/codecs/src/encoding/mod.rs b/lib/codecs/src/encoding/mod.rs
index bd71a4f3c5e02..b1c900336aaa8 100644
--- a/lib/codecs/src/encoding/mod.rs
+++ b/lib/codecs/src/encoding/mod.rs
@@ -39,8 +39,8 @@ pub enum Error {
 impl std::fmt::Display for Error {
     fn fmt(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         match self {
-            Self::FramingError(error) => write!(formatter, "FramingError({})", error),
-            Self::SerializingError(error) => write!(formatter, "SerializingError({})", error),
+            Self::FramingError(error) => write!(formatter, "FramingError({error})"),
+            Self::SerializingError(error) => write!(formatter, "SerializingError({error})"),
         }
     }
 }
diff --git a/lib/codecs/tests/native.rs b/lib/codecs/tests/native.rs
index c39a02ea5fe95..e145508bbe1f4 100644
--- a/lib/codecs/tests/native.rs
+++ b/lib/codecs/tests/native.rs
@@ -314,7 +314,7 @@ fn rebuild_fixtures(proto: &str, deserializer: &dyn Deserializer, serializer: &m
         .into_iter()
         .collect();
         let mut out = File::create(&new_path).unwrap_or_else(|error| {
-            panic!("Could not create rebuilt file {:?}: {:?}", new_path, error)
+            panic!("Could not create rebuilt file {new_path:?}: {error:?}")
         });
         out.write_all(&buf).expect("Could not write rebuilt data");
         out.flush().expect("Could not write rebuilt data");
diff --git a/lib/dnsmsg-parser/src/dns_message_parser.rs b/lib/dnsmsg-parser/src/dns_message_parser.rs
index 5da9fc5fcb78d..34d6a740d6de8 100644
--- a/lib/dnsmsg-parser/src/dns_message_parser.rs
+++ b/lib/dnsmsg-parser/src/dns_message_parser.rs
@@ -241,8 +241,7 @@ impl DnsMessageParser {
                 }
                 for _i in 0..8 {
                     if current_byte & 0b1000_0000 == 0b1000_0000 {
-                        write!(port_string, "{} ", current_bit)
-                            .expect("can always write to String");
+                        write!(port_string, "{current_bit} ").expect("can always write to String");
                     }
                     current_byte <<= 1;
                     current_bit += 1;
@@ -280,10 +279,7 @@ impl DnsMessageParser {
             parse_ipv6_address(&mut dec)?
         };
         let domain_name = Self::parse_domain_name(&mut decoder, &self.options)?;
-        Ok((
-            Some(format!("{} {} {}", prefix, ipv6_address, domain_name)),
-            None,
-        ))
+        Ok((Some(format!("{prefix} {ipv6_address} {domain_name}")), None))
     }
 
     fn parse_loc_rdata(
@@ -330,8 +326,7 @@ impl DnsMessageParser {
 
         Ok((
             Some(format!(
-                "{} {} {:.2}m {}m {}m {}m",
-                latitude, longitude, altitude, size, horizontal_precision, vertical_precision
+                "{latitude} {longitude} {altitude:.2}m {size}m {horizontal_precision}m {vertical_precision}m"
             )),
             None,
         ))
@@ -367,12 +362,8 @@ impl DnsMessageParser {
                 let mut dec = BinDecoder::new(&address_vec);
                 parse_ipv6_address(&mut dec)?
             };
-            write!(
-                apl_rdata,
-                "{}{}:{}/{}",
-                negation, address_family, address, prefix
-            )
-            .expect("can always write to String");
+            write!(apl_rdata, "{negation}{address_family}:{address}/{prefix}")
+                .expect("can always write to String");
             apl_rdata.push(' ');
         }
         Ok((Some(apl_rdata.trim_end().to_string()), None))
@@ -412,7 +403,7 @@ impl DnsMessageParser {
                 let mut decoder = self.get_rdata_decoder_with_raw_message(rdata.anything());
                 let rmailbx = Self::parse_domain_name(&mut decoder, &options)?;
                 let emailbx = Self::parse_domain_name(&mut decoder, &options)?;
-                Ok((Some(format!("{} {}", rmailbx, emailbx)), None))
+                Ok((Some(format!("{rmailbx} {emailbx}")), None))
             }
 
             dns_message::RTYPE_RP => {
@@ -420,7 +411,7 @@ impl DnsMessageParser {
                 let mut decoder = self.get_rdata_decoder_with_raw_message(rdata.anything());
                 let mbox = Self::parse_domain_name(&mut decoder, &options)?;
                 let txt = Self::parse_domain_name(&mut decoder, &options)?;
-                Ok((Some(format!("{} {}", mbox, txt)), None))
+                Ok((Some(format!("{mbox} {txt}")), None))
             }
 
             dns_message::RTYPE_AFSDB => {
@@ -428,7 +419,7 @@ impl DnsMessageParser {
                 let mut decoder = self.get_rdata_decoder_with_raw_message(rdata.anything());
                 let subtype = parse_u16(&mut decoder)?;
                 let hostname = Self::parse_domain_name(&mut decoder, &options)?;
-                Ok((Some(format!("{} {}", subtype, hostname)), None))
+                Ok((Some(format!("{subtype} {hostname}")), None))
             }
 
             dns_message::RTYPE_X25 => {
@@ -472,7 +463,7 @@ impl DnsMessageParser {
                 let mut decoder = self.get_rdata_decoder_with_raw_message(rdata.anything());
                 let preference = parse_u16(&mut decoder)?;
                 let intermediate_host = Self::parse_domain_name(&mut decoder, &options)?;
-                Ok((Some(format!("{} {}", preference, intermediate_host)), None))
+                Ok((Some(format!("{preference} {intermediate_host}")), None))
             }
 
             dns_message::RTYPE_NSAP => {
@@ -480,7 +471,7 @@ impl DnsMessageParser {
                 let mut decoder = BinDecoder::new(raw_rdata);
                 let rdata_len = raw_rdata.len() as u16;
                 let nsap_rdata = HEXUPPER.encode(&parse_vec_with_u16_len(&mut decoder, rdata_len)?);
-                Ok((Some(format!("0x{}", nsap_rdata)), None))
+                Ok((Some(format!("0x{nsap_rdata}")), None))
             }
 
             dns_message::RTYPE_PX => {
@@ -489,7 +480,7 @@ impl DnsMessageParser {
                 let preference = parse_u16(&mut decoder)?;
                 let map822 = Self::parse_domain_name(&mut decoder, &options)?;
                 let mapx400 = Self::parse_domain_name(&mut decoder, &options)?;
-                Ok((Some(format!("{} {} {}", preference, map822, mapx400)), None))
+                Ok((Some(format!("{preference} {map822} {mapx400}")), None))
             }
 
             dns_message::RTYPE_LOC => self.parse_loc_rdata(rdata.anything()),
@@ -499,7 +490,7 @@ impl DnsMessageParser {
                 let mut decoder = self.get_rdata_decoder_with_raw_message(rdata.anything());
                 let preference = parse_u16(&mut decoder)?;
                 let exchanger = Self::parse_domain_name(&mut decoder, &options)?;
-                Ok((Some(format!("{} {}", preference, exchanger)), None))
+                Ok((Some(format!("{preference} {exchanger}")), None))
             }
 
             dns_message::RTYPE_A6 => self.parse_a6_rdata(rdata.anything()),
@@ -513,10 +504,7 @@ impl DnsMessageParser {
                 let data_len = raw_rdata.len() as u16 - 3;
                 let data = BASE64.encode(&parse_vec_with_u16_len(&mut decoder, data_len)?);
 
-                Ok((
-                    Some(format!("{} {} {} {}", meaning, coding, subcoding, data)),
-                    None,
-                ))
+                Ok((Some(format!("{meaning} {coding} {subcoding} {data}")), None))
             }
 
             dns_message::RTYPE_APL => self.parse_apl_rdata(rdata.anything()),
@@ -566,7 +554,7 @@ impl DnsMessageParser {
 
             RData::CSYNC(csync) => {
                 // Using CSYNC's formatter since not all data is exposed otherwise
-                let csync_rdata = format!("{}", csync);
+                let csync_rdata = format!("{csync}");
                 Ok((Some(csync_rdata), None))
             }
             RData::MX(mx) => {
@@ -851,11 +839,11 @@ impl DnsMessageParser {
                     Ok((None, Some(rdata.anything().to_vec())))
                 }
                 _ => Err(DnsMessageParserError::SimpleError {
-                    cause: format!("Unsupported rdata {:?}", rdata),
+                    cause: format!("Unsupported rdata {rdata:?}"),
                 }),
             },
             _ => Err(DnsMessageParserError::SimpleError {
-                cause: format!("Unsupported rdata {:?}", rdata),
+                cause: format!("Unsupported rdata {rdata:?}"),
             }),
         }
     }
@@ -1055,7 +1043,7 @@ fn parse_edns_opt_dnssec_algorithms(
     let algorithm_names: Vec<String> = algorithms.iter().map(|alg| alg.to_string()).collect();
     EdnsOptionEntry {
         opt_code: Into::<u16>::into(opt_code),
-        opt_name: format!("{:?}", opt_code),
+        opt_name: format!("{opt_code:?}"),
         opt_data: algorithm_names.join(" "),
     }
 }
@@ -1063,7 +1051,7 @@ fn parse_edns_opt_dnssec_algorithms(
 fn parse_edns_opt(opt_code: EdnsCode, opt_data: &[u8]) -> EdnsOptionEntry {
     EdnsOptionEntry {
         opt_code: Into::<u16>::into(opt_code),
-        opt_name: format!("{:?}", opt_code),
+        opt_name: format!("{opt_code:?}"),
         opt_data: BASE64.encode(opt_data),
     }
 }
@@ -1072,17 +1060,14 @@ fn parse_loc_rdata_size(data: u8) -> DnsParserResult<f64> {
     let base = (data & 0xF0) >> 4;
     if base > 9 {
         return Err(DnsMessageParserError::SimpleError {
-            cause: format!("The base shouldn't be greater than 9. Base: {}", base),
+            cause: format!("The base shouldn't be greater than 9. Base: {base}"),
         });
     }
 
     let exponent = data & 0x0F;
     if exponent > 9 {
         return Err(DnsMessageParserError::SimpleError {
-            cause: format!(
-                "The exponent shouldn't be greater than 9. Exponent: {}",
-                exponent
-            ),
+            cause: format!("The exponent shouldn't be greater than 9. Exponent: {exponent}"),
         });
     }
 
@@ -1298,7 +1283,7 @@ fn parse_unknown_record_type(rtype: u16) -> Option<String> {
 fn format_bytes_as_hex_string(bytes: &[u8]) -> String {
     bytes
         .iter()
-        .map(|e| format!("{:02X}", e))
+        .map(|e| format!("{e:02X}"))
         .collect::<Vec<String>>()
         .join(".")
 }
@@ -1458,7 +1443,7 @@ mod tests {
             DnsMessageParserError::SimpleError { cause: e } => {
                 panic!("Expected TrustDnsError, got {}.", &e)
             }
-            _ => panic!("{}.", err),
+            _ => panic!("{err}."),
         }
     }
 
diff --git a/lib/dnstap-parser/src/parser.rs b/lib/dnstap-parser/src/parser.rs
index 80f6068525585..ce0895651a14c 100644
--- a/lib/dnstap-parser/src/parser.rs
+++ b/lib/dnstap-parser/src/parser.rs
@@ -165,7 +165,7 @@ impl DnstapParser {
             }
         } else {
             emit!(DnstapParseWarning {
-                error: format!("Unknown dnstap data type: {}", dnstap_data_type_id)
+                error: format!("Unknown dnstap data type: {dnstap_data_type_id}")
             });
             need_raw_data = true;
         }
@@ -990,8 +990,7 @@ fn to_socket_family_name(socket_family: i32) -> Result<&'static str> {
         Ok("INET6")
     } else {
         Err(Error::from(format!(
-            "Unknown socket family: {}",
-            socket_family
+            "Unknown socket family: {socket_family}"
         )))
     }
 }
@@ -1011,8 +1010,7 @@ fn to_socket_protocol_name(socket_protocol: i32) -> Result<&'static str> {
         Ok("DNSCryptTCP")
     } else {
         Err(Error::from(format!(
-            "Unknown socket protocol: {}",
-            socket_protocol
+            "Unknown socket protocol: {socket_protocol}"
         )))
     }
 }
@@ -1040,7 +1038,7 @@ fn to_dnstap_message_type(type_id: i32) -> String {
         12 => String::from("ToolResponse"),
         13 => String::from("UpdateQuery"),
         14 => String::from("UpdateResponse"),
-        _ => format!("Unknown dnstap message type: {}", type_id),
+        _ => format!("Unknown dnstap message type: {type_id}"),
     }
 }
 
diff --git a/lib/docs-renderer/src/main.rs b/lib/docs-renderer/src/main.rs
index dfd9c829d858c..ac7e8132828e4 100644
--- a/lib/docs-renderer/src/main.rs
+++ b/lib/docs-renderer/src/main.rs
@@ -68,8 +68,7 @@ fn main() -> Result<()> {
             let component_name = component_schema.component_name().to_string();
             let component_schema_renderer = SchemaRenderer::new(&querier, component_schema);
             let rendered_component_schema = component_schema_renderer.render().context(format!(
-                "Failed to render the '{}' component schema.",
-                component_name
+                "Failed to render the '{component_name}' component schema."
             ))?;
             rendered_component_schemas.insert(
                 format!("{}s/base/{}", base_component_type.as_str(), component_name),
diff --git a/lib/docs-renderer/src/renderer.rs b/lib/docs-renderer/src/renderer.rs
index 49065c761ae67..d95b76bf98114 100644
--- a/lib/docs-renderer/src/renderer.rs
+++ b/lib/docs-renderer/src/renderer.rs
@@ -300,7 +300,7 @@ fn render_bare_schema<T: QueryableSchema>(
             // All we need to do is figure out the rendered type for the constant value, so we can
             // generate the right type path and stick the constant value in it.
             let rendered_const_type = get_rendered_value_type(&schema, const_value)?;
-            let const_type_path = format!("/type/{}/const", rendered_const_type);
+            let const_type_path = format!("/type/{rendered_const_type}/const");
             data.write(const_type_path.as_str(), const_value.clone());
         }
         SchemaType::Enum(enum_values) => {
@@ -417,7 +417,7 @@ fn render_schema_description<T: QueryableSchema>(schema: T) -> Result<Option<Str
         (None, None) => Ok(None),
         (None, Some(description)) => Ok(Some(description.trim().to_string())),
         (Some(title), Some(description)) => {
-            let concatenated = format!("{}\n\n{}", title, description);
+            let concatenated = format!("{title}\n\n{description}");
             Ok(Some(concatenated.trim().to_string()))
         }
     }
diff --git a/lib/enrichment/src/tables.rs b/lib/enrichment/src/tables.rs
index 62c1b380b72d2..d4ccb4b0f99bc 100644
--- a/lib/enrichment/src/tables.rs
+++ b/lib/enrichment/src/tables.rs
@@ -134,7 +134,7 @@ impl TableRegistry {
     pub fn table_ids(&self) -> Vec<String> {
         let locked = self.loading.lock().unwrap();
         match *locked {
-            Some(ref tables) => tables.iter().map(|(key, _)| key.clone()).collect(),
+            Some(ref tables) => tables.keys().cloned().collect(),
             None => Vec::new(),
         }
     }
@@ -157,7 +157,7 @@ impl TableRegistry {
         match *locked {
             None => Err("finish_load has been called".to_string()),
             Some(ref mut tables) => match tables.get_mut(table) {
-                None => Err(format!("table '{}' not loaded", table)),
+                None => Err(format!("table '{table}' not loaded")),
                 Some(table) => table.add_index(case, fields),
             },
         }
@@ -222,7 +222,7 @@ impl TableSearch {
         let tables = self.0.load();
         if let Some(ref tables) = **tables {
             match tables.get(table) {
-                None => Err(format!("table {} not loaded", table)),
+                None => Err(format!("table {table} not loaded")),
                 Some(table) => table.find_table_row(case, condition, select, wildcard, index),
             }
         } else {
@@ -245,7 +245,7 @@ impl TableSearch {
         let tables = self.0.load();
         if let Some(ref tables) = **tables {
             match tables.get(table) {
-                None => Err(format!("table {} not loaded", table)),
+                None => Err(format!("table {table} not loaded")),
                 Some(table) => table.find_table_rows(case, condition, select, wildcard, index),
             }
         } else {
@@ -278,9 +278,9 @@ fn fmt_enrichment_table(
             tables.truncate(std::cmp::max(tables.len(), 0));
             tables.push(')');
 
-            write!(f, "{} {}", name, tables)
+            write!(f, "{name} {tables}")
         }
-        None => write!(f, "{} loading", name),
+        None => write!(f, "{name} loading"),
     }
 }
 
diff --git a/lib/enrichment/src/vrl_util.rs b/lib/enrichment/src/vrl_util.rs
index df40824cb17c6..0beb948cc435b 100644
--- a/lib/enrichment/src/vrl_util.rs
+++ b/lib/enrichment/src/vrl_util.rs
@@ -101,6 +101,7 @@ pub(crate) fn add_index(
     Ok(index)
 }
 
+#[allow(clippy::result_large_err)]
 pub(crate) fn is_case_sensitive(
     arguments: &ArgumentList,
     state: &TypeState,
diff --git a/lib/file-source/src/checkpointer.rs b/lib/file-source/src/checkpointer.rs
index a7eaea307aacf..3f569a55b7423 100644
--- a/lib/file-source/src/checkpointer.rs
+++ b/lib/file-source/src/checkpointer.rs
@@ -229,10 +229,10 @@ impl Checkpointer {
         use FileFingerprint::*;
 
         let path = match fng {
-            BytesChecksum(c) => format!("g{:x}.{}", c, pos),
-            FirstLinesChecksum(c) => format!("h{:x}.{}", c, pos),
-            DevInode(dev, ino) => format!("i{:x}.{:x}.{}", dev, ino, pos),
-            Unknown(x) => format!("{:x}.{}", x, pos),
+            BytesChecksum(c) => format!("g{c:x}.{pos}"),
+            FirstLinesChecksum(c) => format!("h{c:x}.{pos}"),
+            DevInode(dev, ino) => format!("i{dev:x}.{ino:x}.{pos}"),
+            Unknown(x) => format!("{x:x}.{pos}"),
         };
         self.directory.join(path)
     }
diff --git a/lib/file-source/src/file_watcher/tests/experiment.rs b/lib/file-source/src/file_watcher/tests/experiment.rs
index cbbfabe0a67b7..d58ce37162b8e 100644
--- a/lib/file-source/src/file_watcher/tests/experiment.rs
+++ b/lib/file-source/src/file_watcher/tests/experiment.rs
@@ -82,7 +82,7 @@ fn experiment(actions: Vec<FileWatcherAction>) {
             }
             FileWatcherAction::RotateFile => {
                 let mut new_path = path.clone();
-                new_path.set_extension(format!("log.{}", rotation_count));
+                new_path.set_extension(format!("log.{rotation_count}"));
                 rotation_count += 1;
                 fs::rename(&path, &new_path).expect("could not rename");
                 fp = fs::File::create(&path).expect("could not create");
diff --git a/lib/file-source/src/file_watcher/tests/experiment_no_truncations.rs b/lib/file-source/src/file_watcher/tests/experiment_no_truncations.rs
index 78aa7536b9a38..421a274cf02f5 100644
--- a/lib/file-source/src/file_watcher/tests/experiment_no_truncations.rs
+++ b/lib/file-source/src/file_watcher/tests/experiment_no_truncations.rs
@@ -49,7 +49,7 @@ fn experiment_no_truncations(actions: Vec<FileWatcherAction>) {
             }
             FileWatcherAction::RotateFile => {
                 let mut new_path = path.clone();
-                new_path.set_extension(format!("log.{}", rotation_count));
+                new_path.set_extension(format!("log.{rotation_count}"));
                 rotation_count += 1;
                 fs::rename(&path, &new_path).expect("could not rename");
                 fp = fs::File::create(&path).expect("could not create");
diff --git a/lib/k8s-e2e-tests/src/lib.rs b/lib/k8s-e2e-tests/src/lib.rs
index fc319adee0fcb..4c0ddad797676 100644
--- a/lib/k8s-e2e-tests/src/lib.rs
+++ b/lib/k8s-e2e-tests/src/lib.rs
@@ -27,17 +27,17 @@ pub fn get_namespace() -> String {
     // There is a 36 ^ 5 chance of a name collision, which is likely to be an acceptable risk.
     let id = Alphanumeric.sample_string(&mut rng(), 5).to_lowercase();
 
-    format!("vector-{}", id)
+    format!("vector-{id}")
 }
 
 pub fn get_namespace_appended(namespace: &str, suffix: &str) -> String {
-    format!("{}-{}", namespace, suffix)
+    format!("{namespace}-{suffix}")
 }
 
 /// Gets a name we can use for roles to prevent them conflicting with other tests.
 /// Uses the provided namespace as the root.
 pub fn get_override_name(namespace: &str, suffix: &str) -> String {
-    format!("{}-{}", namespace, suffix)
+    format!("{namespace}-{suffix}")
 }
 
 /// Is the MULTINODE environment variable set?
@@ -49,7 +49,7 @@ pub fn is_multinode() -> bool {
 /// to be run against the same cluster without the role names clashing.
 pub fn config_override_name(name: &str, cleanup: bool) -> String {
     let vectordir = if is_multinode() {
-        format!("{}-vector", name)
+        format!("{name}-vector")
     } else {
         "vector".to_string()
     };
@@ -236,9 +236,7 @@ pub async fn smoke_check_first_line(log_reader: &mut Reader) {
     let expected_pat = "INFO vector::app:";
     assert!(
         first_line.contains(expected_pat),
-        "Expected a line ending with {:?} but got {:?}; vector might be malfunctioning",
-        expected_pat,
-        first_line
+        "Expected a line ending with {expected_pat:?} but got {first_line:?}; vector might be malfunctioning"
     );
 }
 
diff --git a/lib/k8s-e2e-tests/src/metrics.rs b/lib/k8s-e2e-tests/src/metrics.rs
index d3fd61548efd9..a815acac35de3 100644
--- a/lib/k8s-e2e-tests/src/metrics.rs
+++ b/lib/k8s-e2e-tests/src/metrics.rs
@@ -64,7 +64,7 @@ pub async fn get_component_sent_events_total(url: &str) -> Result<u64, Box<dyn s
 pub async fn assert_vector_started(url: &str) -> Result<(), Box<dyn std::error::Error>> {
     let metrics = load(url).await?;
     if !extract_vector_started(&metrics) {
-        return Err(format!("`vector_started`-ish metric was not found:\n{}", metrics).into());
+        return Err(format!("`vector_started`-ish metric was not found:\n{metrics}").into());
     }
     Ok(())
 }
@@ -125,7 +125,7 @@ pub async fn assert_metrics_present(
         required_metrics.remove(metric_name);
     }
     if !required_metrics.is_empty() {
-        return Err(format!("Some host metrics were not found:\n{:?}", required_metrics).into());
+        return Err(format!("Some host metrics were not found:\n{required_metrics:?}").into());
     }
     Ok(())
 }
@@ -217,7 +217,7 @@ mod tests {
         for (input, expected_value) in cases {
             let input = input.join("\n");
             let actual_value = extract_vector_started(&input);
-            assert_eq!(expected_value, actual_value, "input: {}", input);
+            assert_eq!(expected_value, actual_value, "input: {input}");
         }
     }
 }
diff --git a/lib/k8s-test-framework/src/helm_values_file.rs b/lib/k8s-test-framework/src/helm_values_file.rs
index a539d608bf5ba..e57e8a23958a8 100644
--- a/lib/k8s-test-framework/src/helm_values_file.rs
+++ b/lib/k8s-test-framework/src/helm_values_file.rs
@@ -9,7 +9,7 @@ pub struct HelmValuesFile(TempFile);
 
 impl HelmValuesFile {
     pub fn new(data: &str) -> std::io::Result<Self> {
-        info!("Using values \n {}", data);
+        info!("Using values \n {data}");
         Ok(Self(TempFile::new("values.yml", data)?))
     }
 
diff --git a/lib/k8s-test-framework/src/port_forward.rs b/lib/k8s-test-framework/src/port_forward.rs
index b2acefa71f79b..457bce8169990 100644
--- a/lib/k8s-test-framework/src/port_forward.rs
+++ b/lib/k8s-test-framework/src/port_forward.rs
@@ -33,7 +33,7 @@ pub fn port_forward(
     command.arg("port-forward");
     command.arg("-n").arg(namespace);
     command.arg(resource);
-    command.arg(format!("{}:{}", local_port, resource_port));
+    command.arg(format!("{local_port}:{resource_port}"));
 
     command.kill_on_drop(true);
 
diff --git a/lib/k8s-test-framework/src/reader.rs b/lib/k8s-test-framework/src/reader.rs
index 0b83d5885afcd..e6af49066a8b2 100644
--- a/lib/k8s-test-framework/src/reader.rs
+++ b/lib/k8s-test-framework/src/reader.rs
@@ -98,7 +98,7 @@ mod tests {
         let mut expected_num = 0;
         while let Some(line) = reader.read_line().await {
             // Assert we're getting expected lines.
-            assert_eq!(line, format!("Line {}\n", expected_num));
+            assert_eq!(line, format!("Line {expected_num}\n"));
 
             // On line 100 issue a `kill` to stop the infinite stream.
             if expected_num == 100 {
diff --git a/lib/k8s-test-framework/src/util.rs b/lib/k8s-test-framework/src/util.rs
index a0499ba6fc875..67e8849809ee5 100644
--- a/lib/k8s-test-framework/src/util.rs
+++ b/lib/k8s-test-framework/src/util.rs
@@ -3,28 +3,28 @@ use log::info;
 use crate::Result;
 
 pub async fn run_command(mut command: tokio::process::Command) -> Result<()> {
-    info!("Running command `{:?}`", command);
+    info!("Running command `{command:?}`");
     let exit_status = command.spawn()?.wait().await?;
     if !exit_status.success() {
-        return Err(format!("exec failed: {:?}", command).into());
+        return Err(format!("exec failed: {command:?}").into());
     }
     Ok(())
 }
 
 pub fn run_command_blocking(mut command: std::process::Command) -> Result<()> {
-    info!("Running command blocking `{:?}`", command);
+    info!("Running command blocking `{command:?}`");
     let exit_status = command.spawn()?.wait()?;
     if !exit_status.success() {
-        return Err(format!("exec failed: {:?}", command).into());
+        return Err(format!("exec failed: {command:?}").into());
     }
     Ok(())
 }
 
 pub async fn run_command_output(mut command: tokio::process::Command) -> Result<String> {
-    info!("Fetching command `{:?}`", command);
+    info!("Fetching command `{command:?}`");
     let output = command.spawn()?.wait_with_output().await?;
     if !output.status.success() {
-        return Err(format!("exec failed: {:?}", command).into());
+        return Err(format!("exec failed: {command:?}").into());
     }
 
     let output = String::from_utf8(output.stdout)?;
diff --git a/lib/k8s-test-framework/src/wait_for_resource.rs b/lib/k8s-test-framework/src/wait_for_resource.rs
index d3cba0fd56d45..7beb0d7721efc 100644
--- a/lib/k8s-test-framework/src/wait_for_resource.rs
+++ b/lib/k8s-test-framework/src/wait_for_resource.rs
@@ -86,7 +86,7 @@ where
     command.arg("--for");
     match wait_for {
         WaitFor::Delete => command.arg("delete"),
-        WaitFor::Condition(cond) => command.arg(format!("condition={}", cond)),
+        WaitFor::Condition(cond) => command.arg(format!("condition={cond}")),
     };
 
     command.args(extra);
diff --git a/lib/loki-logproto/src/lib.rs b/lib/loki-logproto/src/lib.rs
index 81821dad7da9d..9aae27cf7925d 100644
--- a/lib/loki-logproto/src/lib.rs
+++ b/lib/loki-logproto/src/lib.rs
@@ -83,7 +83,7 @@ pub mod util {
         let mut labels: Vec<String> = labels
             .iter()
             .filter(|(k, _)| !RESERVED_LABELS.contains(&k.as_str()))
-            .map(|(k, v)| format!("{}=\"{}\"", k, v))
+            .map(|(k, v)| format!("{k}=\"{v}\""))
             .collect();
         labels.sort();
         format!("{{{}}}", labels.join(", "))
diff --git a/lib/opentelemetry-proto/src/common.rs b/lib/opentelemetry-proto/src/common.rs
index 19bfe0883195f..d369c4e860f12 100644
--- a/lib/opentelemetry-proto/src/common.rs
+++ b/lib/opentelemetry-proto/src/common.rs
@@ -79,7 +79,7 @@ mod tests {
             Value::Float(f) => {
                 assert!(f.into_inner().is_infinite() && f.into_inner().is_sign_positive())
             }
-            _ => panic!("Expected Float value, got {:?}", result),
+            _ => panic!("Expected Float value, got {result:?}"),
         }
 
         let neg_inf_value = PBValue::DoubleValue(f64::NEG_INFINITY);
@@ -88,7 +88,7 @@ mod tests {
             Value::Float(f) => {
                 assert!(f.into_inner().is_infinite() && f.into_inner().is_sign_negative())
             }
-            _ => panic!("Expected Float value, got {:?}", result),
+            _ => panic!("Expected Float value, got {result:?}"),
         }
     }
 }
diff --git a/lib/prometheus-parser/src/line.rs b/lib/prometheus-parser/src/line.rs
index 0de52037a3450..d7c36fdfa90fd 100644
--- a/lib/prometheus-parser/src/line.rs
+++ b/lib/prometheus-parser/src/line.rs
@@ -414,7 +414,7 @@ mod test {
     #[test]
     fn test_parse_escaped_string() {
         fn wrap(s: &str) -> String {
-            format!("  \t \"{}\"  .", s)
+            format!("  \t \"{s}\"  .")
         }
 
         // parser should not consume more that it needed
@@ -454,7 +454,7 @@ mod test {
     #[test]
     fn test_parse_name() {
         fn wrap(s: &str) -> String {
-            format!("  \t {}  .", s)
+            format!("  \t {s}  .")
         }
         let tail = "  .";
 
@@ -480,7 +480,7 @@ mod test {
     #[test]
     fn test_parse_header() {
         fn wrap(s: &str) -> String {
-            format!("  \t {}  .", s)
+            format!("  \t {s}  .")
         }
         let tail = "  .";
 
@@ -554,7 +554,7 @@ mod test {
     #[test]
     fn test_parse_value() {
         fn wrap(s: &str) -> String {
-            format!("  \t {}  .", s)
+            format!("  \t {s}  .")
         }
         let tail = "  .";
 
@@ -622,7 +622,7 @@ mod test {
     #[test]
     fn test_parse_labels() {
         fn wrap(s: &str) -> String {
-            format!("  \t {}  .", s)
+            format!("  \t {s}  .")
         }
         let tail = "  .";
 
diff --git a/lib/tracing-limit/benches/limit.rs b/lib/tracing-limit/benches/limit.rs
index f983e9be48b90..3a43707d7f992 100644
--- a/lib/tracing-limit/benches/limit.rs
+++ b/lib/tracing-limit/benches/limit.rs
@@ -95,7 +95,7 @@ struct Visitor<'a>(MutexGuard<'a, String>);
 impl field::Visit for Visitor<'_> {
     fn record_debug(&mut self, _field: &field::Field, value: &dyn fmt::Debug) {
         use std::fmt::Write;
-        _ = write!(&mut *self.0, "{:?}", value);
+        _ = write!(&mut *self.0, "{value:?}");
     }
 }
 
diff --git a/lib/tracing-limit/src/lib.rs b/lib/tracing-limit/src/lib.rs
index dc131b3e31b39..3f29cd7fa6c1d 100644
--- a/lib/tracing-limit/src/lib.rs
+++ b/lib/tracing-limit/src/lib.rs
@@ -386,7 +386,7 @@ impl Visit for RateLimitedSpanKeys {
     }
 
     fn record_debug(&mut self, field: &Field, value: &dyn fmt::Debug) {
-        self.record(field, format!("{:?}", value).into());
+        self.record(field, format!("{value:?}").into());
     }
 }
 
@@ -434,7 +434,7 @@ impl Visit for MessageVisitor {
 
     fn record_debug(&mut self, field: &Field, value: &dyn fmt::Debug) {
         if self.message.is_none() && field.name() == MESSAGE_FIELD {
-            self.message = Some(format!("{:?}", value));
+            self.message = Some(format!("{value:?}"));
         }
     }
 }
@@ -598,8 +598,7 @@ mod test {
                             info_span!("span", component_id = &key, vrl_position = &line_number);
                         let _enter = span.enter();
                         info!(
-                            message =
-                                format!("Hello {} on line_number {}!", key, line_number).as_str(),
+                            message = format!("Hello {key} on line_number {line_number}!").as_str(),
                         );
                     }
                 }
@@ -659,8 +658,7 @@ mod test {
                 for key in &["foo", "bar"] {
                     for line_number in &[1, 2] {
                         info!(
-                            message =
-                                format!("Hello {} on line_number {}!", key, line_number).as_str(),
+                            message = format!("Hello {key} on line_number {line_number}!").as_str(),
                             component_id = &key,
                             vrl_position = &line_number
                         );
diff --git a/lib/vector-api-client/src/gql/components.rs b/lib/vector-api-client/src/gql/components.rs
index a2bfde4cdf487..d278b30c317c8 100644
--- a/lib/vector-api-client/src/gql/components.rs
+++ b/lib/vector-api-client/src/gql/components.rs
@@ -181,7 +181,7 @@ impl fmt::Display for components_query::ComponentsQueryComponentsEdgesNodeOn {
             components_query::ComponentsQueryComponentsEdgesNodeOn::Sink(_) => "sink",
         };
 
-        write!(f, "{}", res)
+        write!(f, "{res}")
     }
 }
 
@@ -199,7 +199,7 @@ impl fmt::Display for component_added_subscription::ComponentAddedSubscriptionCo
             }
         };
 
-        write!(f, "{}", res)
+        write!(f, "{res}")
     }
 }
 
@@ -219,6 +219,6 @@ impl fmt::Display
             }
         };
 
-        write!(f, "{}", res)
+        write!(f, "{res}")
     }
 }
diff --git a/lib/vector-buffers/benches/common.rs b/lib/vector-buffers/benches/common.rs
index 03a17b864d9a5..04c4582dbd487 100644
--- a/lib/vector-buffers/benches/common.rs
+++ b/lib/vector-buffers/benches/common.rs
@@ -65,7 +65,7 @@ pub struct EncodeError;
 
 impl fmt::Display for EncodeError {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "{:?}", self)
+        write!(f, "{self:?}")
     }
 }
 
@@ -76,7 +76,7 @@ pub struct DecodeError;
 
 impl fmt::Display for DecodeError {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "{:?}", self)
+        write!(f, "{self:?}")
     }
 }
 
diff --git a/lib/vector-buffers/examples/buffer_perf.rs b/lib/vector-buffers/examples/buffer_perf.rs
index c3286b4588a3c..141cff65aef3f 100644
--- a/lib/vector-buffers/examples/buffer_perf.rs
+++ b/lib/vector-buffers/examples/buffer_perf.rs
@@ -113,7 +113,7 @@ pub struct EncodeError;
 
 impl fmt::Display for EncodeError {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "{:?}", self)
+        write!(f, "{self:?}")
     }
 }
 
@@ -124,7 +124,7 @@ pub struct DecodeError;
 
 impl fmt::Display for DecodeError {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "{:?}", self)
+        write!(f, "{self:?}")
     }
 }
 
@@ -247,7 +247,7 @@ where
     T: Bufferable + Clone + Finalizable,
 {
     let data_dir = PathBuf::from("/tmp/vector");
-    let id = format!("{}-buffer-perf-testing", buffer_type);
+    let id = format!("{buffer_type}-buffer-perf-testing");
     let max_size_events = std::num::NonZeroUsize::new(500).unwrap();
     let max_size_bytes = std::num::NonZeroU64::new(32 * 1024 * 1024 * 1024).unwrap();
     let when_full = WhenFull::Block;
@@ -276,8 +276,7 @@ where
             }
         }
         s => panic!(
-            "unknown buffer type '{}' requested; valid types are in-memory, disk-v1, and disk-v2",
-            s
+            "unknown buffer type '{s}' requested; valid types are in-memory, disk-v1, and disk-v2"
         ),
     };
 
diff --git a/lib/vector-buffers/src/test/messages.rs b/lib/vector-buffers/src/test/messages.rs
index 6d73d020937eb..c86d386d2d09b 100644
--- a/lib/vector-buffers/src/test/messages.rs
+++ b/lib/vector-buffers/src/test/messages.rs
@@ -160,14 +160,11 @@ impl FixedEncodable for SizedRecord {
     {
         let minimum_len = self.encoded_len();
         if buffer.remaining_mut() < minimum_len {
-            return Err(io::Error::new(
-                io::ErrorKind::Other,
-                format!(
-                    "not enough capacity to encode record: need {}, only have {}",
-                    minimum_len,
-                    buffer.remaining_mut()
-                ),
-            ));
+            return Err(io::Error::other(format!(
+                "not enough capacity to encode record: need {}, only have {}",
+                minimum_len,
+                buffer.remaining_mut()
+            )));
         }
 
         buffer.put_u32(self.0);
@@ -219,10 +216,7 @@ impl FixedEncodable for UndecodableRecord {
         B: BufMut,
     {
         if buffer.remaining_mut() < 4 {
-            return Err(io::Error::new(
-                io::ErrorKind::Other,
-                "not enough capacity to encode record",
-            ));
+            return Err(io::Error::other("not enough capacity to encode record"));
         }
 
         buffer.put_u32(42);
@@ -233,7 +227,7 @@ impl FixedEncodable for UndecodableRecord {
     where
         B: Buf,
     {
-        Err(io::Error::new(io::ErrorKind::Other, "failed to decode"))
+        Err(io::Error::other("failed to decode"))
     }
 }
 
@@ -254,10 +248,7 @@ impl FixedEncodable for MultiEventRecord {
         B: BufMut,
     {
         if buffer.remaining_mut() < self.encoded_size() {
-            return Err(io::Error::new(
-                io::ErrorKind::Other,
-                "not enough capacity to encode record",
-            ));
+            return Err(io::Error::other("not enough capacity to encode record"));
         }
 
         buffer.put_u32(self.0);
@@ -292,10 +283,7 @@ impl FixedEncodable for PoisonPillMultiEventRecord {
         B: BufMut,
     {
         if buffer.remaining_mut() < self.encoded_size() {
-            return Err(io::Error::new(
-                io::ErrorKind::Other,
-                "not enough capacity to encode record",
-            ));
+            return Err(io::Error::other("not enough capacity to encode record"));
         }
 
         buffer.put_u32(self.0);
@@ -309,7 +297,7 @@ impl FixedEncodable for PoisonPillMultiEventRecord {
     {
         let event_count = buffer.get_u32();
         if event_count == 42 {
-            return Err(io::Error::new(io::ErrorKind::Other, "failed to decode"));
+            return Err(io::Error::other("failed to decode"));
         }
 
         buffer.advance(usize::try_from(event_count).unwrap_or(usize::MAX));
diff --git a/lib/vector-buffers/src/topology/channel/receiver.rs b/lib/vector-buffers/src/topology/channel/receiver.rs
index 4afacc3bb0dff..1b51ec26f7ee3 100644
--- a/lib/vector-buffers/src/topology/channel/receiver.rs
+++ b/lib/vector-buffers/src/topology/channel/receiver.rs
@@ -18,6 +18,7 @@ use crate::{
 };
 
 /// Adapter for papering over various receiver backends.
+#[allow(clippy::large_enum_variant)]
 #[derive(Debug)]
 pub enum ReceiverAdapter<T: Bufferable> {
     /// The in-memory channel buffer.
@@ -156,6 +157,7 @@ impl<T: Bufferable> BufferReceiver<T> {
     }
 }
 
+#[allow(clippy::large_enum_variant)]
 enum StreamState<T: Bufferable> {
     Idle(BufferReceiver<T>),
     Polling,
diff --git a/lib/vector-buffers/src/variants/disk_v2/tests/size_limits.rs b/lib/vector-buffers/src/variants/disk_v2/tests/size_limits.rs
index 1902fb4c4c589..414a10fb4f21e 100644
--- a/lib/vector-buffers/src/variants/disk_v2/tests/size_limits.rs
+++ b/lib/vector-buffers/src/variants/disk_v2/tests/size_limits.rs
@@ -66,7 +66,7 @@ async fn writer_error_when_record_is_over_the_limit() {
 }
 
 #[tokio::test]
-#[ignore]
+#[ignore = "Needs investigation"]
 async fn writer_waits_when_buffer_is_full() {
     let assertion_registry = install_tracing_helpers();
     let fut = with_temp_dir(|dir| {
diff --git a/lib/vector-common/src/finalization.rs b/lib/vector-common/src/finalization.rs
index 48001a2bf8727..56310a37d31b4 100644
--- a/lib/vector-common/src/finalization.rs
+++ b/lib/vector-common/src/finalization.rs
@@ -462,7 +462,7 @@ mod tests {
         assert_eq!(receiver2.try_recv(), Ok(BatchStatus::Delivered));
     }
 
-    #[ignore] // The current implementation does not deduplicate finalizers
+    #[ignore = "The current implementation does not deduplicate finalizers"]
     #[test]
     fn clone_and_merge_events() {
         let (mut fin1, mut receiver) = make_finalizer();
diff --git a/lib/vector-common/src/shutdown.rs b/lib/vector-common/src/shutdown.rs
index d1b35be5c6fb7..741a5b4839d9e 100644
--- a/lib/vector-common/src/shutdown.rs
+++ b/lib/vector-common/src/shutdown.rs
@@ -111,9 +111,9 @@ type IsInternal = bool;
 
 #[derive(Debug, Default)]
 pub struct SourceShutdownCoordinator {
-    shutdown_begun_triggers: HashMap<ComponentKey, (IsInternal, Trigger)>,
-    shutdown_force_triggers: HashMap<ComponentKey, Trigger>,
-    shutdown_complete_tripwires: HashMap<ComponentKey, Tripwire>,
+    begun_triggers: HashMap<ComponentKey, (IsInternal, Trigger)>,
+    force_triggers: HashMap<ComponentKey, Trigger>,
+    complete_tripwires: HashMap<ComponentKey, Tripwire>,
 }
 
 impl SourceShutdownCoordinator {
@@ -129,11 +129,11 @@ impl SourceShutdownCoordinator {
         let (force_shutdown_trigger, force_shutdown_tripwire) = Tripwire::new();
         let (shutdown_complete_trigger, shutdown_complete_tripwire) = Tripwire::new();
 
-        self.shutdown_begun_triggers
+        self.begun_triggers
             .insert(id.clone(), (internal, shutdown_begun_trigger));
-        self.shutdown_force_triggers
+        self.force_triggers
             .insert(id.clone(), force_shutdown_trigger);
-        self.shutdown_complete_tripwires
+        self.complete_tripwires
             .insert(id.clone(), shutdown_complete_tripwire);
 
         let shutdown_signal =
@@ -151,9 +151,9 @@ impl SourceShutdownCoordinator {
     ///
     /// Panics if the other coordinator already had its triggers removed.
     pub fn takeover_source(&mut self, id: &ComponentKey, other: &mut Self) {
-        let existing = self.shutdown_begun_triggers.insert(
+        let existing = self.begun_triggers.insert(
             id.clone(),
-            other.shutdown_begun_triggers.remove(id).unwrap_or_else(|| {
+            other.begun_triggers.remove(id).unwrap_or_else(|| {
                 panic!(
                     "Other ShutdownCoordinator didn't have a shutdown_begun_trigger for \"{id}\""
                 )
@@ -164,9 +164,9 @@ impl SourceShutdownCoordinator {
             "ShutdownCoordinator already has a shutdown_begin_trigger for source \"{id}\""
         );
 
-        let existing = self.shutdown_force_triggers.insert(
+        let existing = self.force_triggers.insert(
             id.clone(),
-            other.shutdown_force_triggers.remove(id).unwrap_or_else(|| {
+            other.force_triggers.remove(id).unwrap_or_else(|| {
                 panic!(
                     "Other ShutdownCoordinator didn't have a shutdown_force_trigger for \"{id}\""
                 )
@@ -177,10 +177,10 @@ impl SourceShutdownCoordinator {
             "ShutdownCoordinator already has a shutdown_force_trigger for source \"{id}\""
         );
 
-        let existing = self.shutdown_complete_tripwires.insert(
+        let existing = self.complete_tripwires.insert(
             id.clone(),
             other
-                .shutdown_complete_tripwires
+                .complete_tripwires
                 .remove(id)
                 .unwrap_or_else(|| {
                     panic!(
@@ -207,9 +207,9 @@ impl SourceShutdownCoordinator {
         let mut internal_sources_complete_futures = Vec::new();
         let mut external_sources_complete_futures = Vec::new();
 
-        let shutdown_begun_triggers = self.shutdown_begun_triggers;
-        let mut shutdown_complete_tripwires = self.shutdown_complete_tripwires;
-        let mut shutdown_force_triggers = self.shutdown_force_triggers;
+        let shutdown_begun_triggers = self.begun_triggers;
+        let mut shutdown_complete_tripwires = self.complete_tripwires;
+        let mut shutdown_force_triggers = self.force_triggers;
 
         for (id, (internal, trigger)) in shutdown_begun_triggers {
             trigger.cancel();
@@ -260,24 +260,23 @@ impl SourceShutdownCoordinator {
         id: &ComponentKey,
         deadline: Instant,
     ) -> impl Future<Output = bool> {
-        let (_, begin_shutdown_trigger) =
-            self.shutdown_begun_triggers.remove(id).unwrap_or_else(|| {
-                panic!(
+        let (_, begin_shutdown_trigger) = self.begun_triggers.remove(id).unwrap_or_else(|| {
+            panic!(
                 "shutdown_begun_trigger for source \"{id}\" not found in the ShutdownCoordinator"
             )
-            });
+        });
         // This is what actually triggers the source to begin shutting down.
         begin_shutdown_trigger.cancel();
 
         let shutdown_complete_tripwire = self
-            .shutdown_complete_tripwires
+            .complete_tripwires
             .remove(id)
             .unwrap_or_else(|| {
                 panic!(
                 "shutdown_complete_tripwire for source \"{id}\" not found in the ShutdownCoordinator"
             )
             });
-        let shutdown_force_trigger = self.shutdown_force_triggers.remove(id).unwrap_or_else(|| {
+        let shutdown_force_trigger = self.force_triggers.remove(id).unwrap_or_else(|| {
             panic!(
                 "shutdown_force_trigger for source \"{id}\" not found in the ShutdownCoordinator"
             )
@@ -294,7 +293,7 @@ impl SourceShutdownCoordinator {
     #[must_use]
     pub fn shutdown_tripwire(&self) -> future::BoxFuture<'static, ()> {
         let futures = self
-            .shutdown_complete_tripwires
+            .complete_tripwires
             .values()
             .cloned()
             .map(|tripwire| tripwire.then(tripwire_handler).boxed());
diff --git a/lib/vector-config-common/src/schema/json_schema.rs b/lib/vector-config-common/src/schema/json_schema.rs
index 3c4a6c99410a8..38fd13b2f8f93 100644
--- a/lib/vector-config-common/src/schema/json_schema.rs
+++ b/lib/vector-config-common/src/schema/json_schema.rs
@@ -615,8 +615,7 @@ pub fn get_cleaned_schema_reference(schema_ref: &str) -> &str {
         cleaned
     } else {
         panic!(
-            "Tried to clean schema reference that does not start with the definition prefix: {}",
-            schema_ref
+            "Tried to clean schema reference that does not start with the definition prefix: {schema_ref}"
         );
     }
 }
diff --git a/lib/vector-config-macros/src/component_name.rs b/lib/vector-config-macros/src/component_name.rs
index 5faf393249173..431e382d712e2 100644
--- a/lib/vector-config-macros/src/component_name.rs
+++ b/lib/vector-config-macros/src/component_name.rs
@@ -134,8 +134,7 @@ fn attr_to_component_name(attr: &Attribute) -> Result<Option<String>, Error> {
         return Err(Error::new(
             attr.span(),
             format!(
-                "{}s must have a name specified (e.g. `{}(\"my_component\")`)",
-                component_type, component_type_attr
+                "{component_type}s must have a name specified (e.g. `{component_type_attr}(\"my_component\")`)"
             ),
         ));
     }
@@ -147,8 +146,7 @@ fn attr_to_component_name(attr: &Attribute) -> Result<Option<String>, Error> {
             Error::new(
                 attr.span(),
                 format!(
-                    "expected a string literal for the {} name (i.e. `{}(\"...\")`)",
-                    component_type, component_type_attr
+                    "expected a string literal for the {component_type} name (i.e. `{component_type_attr}(\"...\")`)"
                 ),
             )
         })
@@ -185,6 +183,6 @@ fn check_component_name_validity(component_name: &str) -> Result<(), String> {
     if component_name == component_name_converted {
         Ok(())
     } else {
-        Err(format!("component names must be lowercase, and contain only letters, numbers, and underscores (e.g. \"{}\")", component_name_converted))
+        Err(format!("component names must be lowercase, and contain only letters, numbers, and underscores (e.g. \"{component_name_converted}\")"))
     }
 }
diff --git a/lib/vector-config-macros/src/configurable.rs b/lib/vector-config-macros/src/configurable.rs
index a52115a05434c..cc506c7869552 100644
--- a/lib/vector-config-macros/src/configurable.rs
+++ b/lib/vector-config-macros/src/configurable.rs
@@ -250,8 +250,7 @@ fn generate_named_struct_field(
         .expect("named struct fields must always have an ident");
     let field_schema_ty = get_field_schema_ty(field);
     let field_already_contained = format!(
-        "schema properties already contained entry for `{}`, this should not occur",
-        field_name
+        "schema properties already contained entry for `{field_name}`, this should not occur"
     );
     let field_key = field.name();
 
@@ -675,8 +674,7 @@ fn generate_named_enum_field(field: &Field<'_>) -> proc_macro2::TokenStream {
     let field_name = field.ident().expect("field should be named");
     let field_ty = field.ty();
     let field_already_contained = format!(
-        "schema properties already contained entry for `{}`, this should not occur",
-        field_name
+        "schema properties already contained entry for `{field_name}`, this should not occur"
     );
     let field_key = field.name().to_string();
 
@@ -858,7 +856,7 @@ fn generate_enum_variant_schema(
         // { "field_using_enum": { "<tag>": "VariantName" } }
         Tagging::Internal { tag } => match variant.style() {
             Style::Struct => {
-                let tag_already_contained = format!("enum tag `{}` already contained as a field in variant; tag cannot overlap with any fields in any variant", tag);
+                let tag_already_contained = format!("enum tag `{tag}` already contained as a field in variant; tag cannot overlap with any fields in any variant");
 
                 // Just generate the tag field directly and pass it along to be included in the
                 // struct schema.
diff --git a/lib/vector-config/src/schema/parser/component.rs b/lib/vector-config/src/schema/parser/component.rs
index 37997e023dbab..da86f25ced59d 100644
--- a/lib/vector-config/src/schema/parser/component.rs
+++ b/lib/vector-config/src/schema/parser/component.rs
@@ -133,7 +133,7 @@ fn get_component_metadata_kv_str<'a>(
             Value::String(name) => Ok(name),
             _ => Err(SchemaError::invalid_component_schema(
                 key,
-                format!("`{}` must be a string", key),
+                format!("`{key}` must be a string"),
             )),
         })
 }
diff --git a/lib/vector-config/src/schema/visitors/merge.rs b/lib/vector-config/src/schema/visitors/merge.rs
index 28b724d602c5c..ef7d6f8f01d99 100644
--- a/lib/vector-config/src/schema/visitors/merge.rs
+++ b/lib/vector-config/src/schema/visitors/merge.rs
@@ -50,7 +50,7 @@ impl Mergeable for Value {
         // We _may_ need to relax this in practice/in the future, but it's a solid invariant to
         // enforce for the time being.
         if discriminant(self) != discriminant(other) {
-            panic!("Tried to merge two `Value` types together with differing types!\n\nSelf: {:?}\n\nOther: {:?}", self, other);
+            panic!("Tried to merge two `Value` types together with differing types!\n\nSelf: {self:?}\n\nOther: {other:?}");
         }
 
         match (self, other) {
diff --git a/lib/vector-config/src/schema/visitors/scoped_visit.rs b/lib/vector-config/src/schema/visitors/scoped_visit.rs
index 937a4ee4920dd..189bbbcfec9f4 100644
--- a/lib/vector-config/src/schema/visitors/scoped_visit.rs
+++ b/lib/vector-config/src/schema/visitors/scoped_visit.rs
@@ -15,7 +15,7 @@ pub enum SchemaReference {
 impl std::fmt::Display for SchemaReference {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         match self {
-            Self::Definition(name) => write!(f, "{}", name),
+            Self::Definition(name) => write!(f, "{name}"),
             Self::Root => write!(f, "<root>"),
         }
     }
diff --git a/lib/vector-config/tests/integration/smoke.rs b/lib/vector-config/tests/integration/smoke.rs
index 8d9d1fbb8e4df..2b99bc1f9f891 100644
--- a/lib/vector-config/tests/integration/smoke.rs
+++ b/lib/vector-config/tests/integration/smoke.rs
@@ -312,7 +312,7 @@ impl From<SocketListenAddr> for String {
                 if fd == 0 {
                     "systemd".to_owned()
                 } else {
-                    format!("systemd#{}", fd)
+                    format!("systemd#{fd}")
                 }
             }
         }
@@ -633,8 +633,8 @@ fn generate_semi_real_schema() {
             let json = serde_json::to_string_pretty(&schema)
                 .expect("rendering root schema to JSON should not fail");
 
-            println!("{}", json);
+            println!("{json}");
         }
-        Err(e) => eprintln!("error while generating schema: {:?}", e),
+        Err(e) => eprintln!("error while generating schema: {e:?}"),
     }
 }
diff --git a/lib/vector-core/src/config/log_schema.rs b/lib/vector-core/src/config/log_schema.rs
index 2ab6c423a66d0..bbbcfaeba499e 100644
--- a/lib/vector-core/src/config/log_schema.rs
+++ b/lib/vector-core/src/config/log_schema.rs
@@ -45,6 +45,7 @@ pub fn log_schema() -> &'static LogSchema {
 #[configurable_component]
 #[derive(Clone, Debug, Eq, PartialEq)]
 #[serde(default)]
+#[allow(clippy::struct_field_names)]
 pub struct LogSchema {
     /// The name of the event field to treat as the event message.
     ///
diff --git a/lib/vector-core/src/event/metadata.rs b/lib/vector-core/src/event/metadata.rs
index b7be59900503e..9b784fb9b22f1 100644
--- a/lib/vector-core/src/event/metadata.rs
+++ b/lib/vector-core/src/event/metadata.rs
@@ -84,11 +84,11 @@ pub(super) struct Inner {
 #[derive(Clone, Default, Debug, Deserialize, PartialEq, Serialize)]
 pub struct DatadogMetricOriginMetadata {
     /// `OriginProduct`
-    origin_product: Option<u32>,
+    product: Option<u32>,
     /// `OriginCategory`
-    origin_category: Option<u32>,
+    category: Option<u32>,
     /// `OriginService`
-    origin_service: Option<u32>,
+    service: Option<u32>,
 }
 
 impl DatadogMetricOriginMetadata {
@@ -100,25 +100,25 @@ impl DatadogMetricOriginMetadata {
     #[must_use]
     pub fn new(product: Option<u32>, category: Option<u32>, service: Option<u32>) -> Self {
         Self {
-            origin_product: product,
-            origin_category: category,
-            origin_service: service,
+            product,
+            category,
+            service,
         }
     }
 
     /// Returns a reference to the `OriginProduct`.
     pub fn product(&self) -> Option<u32> {
-        self.origin_product
+        self.product
     }
 
     /// Returns a reference to the `OriginCategory`.
     pub fn category(&self) -> Option<u32> {
-        self.origin_category
+        self.category
     }
 
     /// Returns a reference to the `OriginService`.
     pub fn service(&self) -> Option<u32> {
-        self.origin_service
+        self.service
     }
 }
 
diff --git a/lib/vector-core/src/tls/incoming.rs b/lib/vector-core/src/tls/incoming.rs
index d13c10717d8bc..290ad3e6f0ca4 100644
--- a/lib/vector-core/src/tls/incoming.rs
+++ b/lib/vector-core/src/tls/incoming.rs
@@ -320,13 +320,13 @@ impl MaybeTlsIncomingStream<TcpStream> {
                         continue;
                     }
                     Err(error) => {
-                        let error = io::Error::new(io::ErrorKind::Other, error);
+                        let error = io::Error::other(error);
                         this.state = StreamState::AcceptError(error.to_string());
                         Poll::Ready(Err(error))
                     }
                 },
                 StreamState::AcceptError(error) => {
-                    Poll::Ready(Err(io::Error::new(io::ErrorKind::Other, error.clone())))
+                    Poll::Ready(Err(io::Error::other(error.clone())))
                 }
                 StreamState::Closed => Poll::Ready(Err(io::ErrorKind::BrokenPipe.into())),
             };
@@ -369,14 +369,12 @@ impl AsyncWrite for MaybeTlsIncomingStream<TcpStream> {
                     Poll::Pending
                 }
                 Err(error) => {
-                    let error = io::Error::new(io::ErrorKind::Other, error);
+                    let error = io::Error::other(error);
                     this.state = StreamState::AcceptError(error.to_string());
                     Poll::Ready(Err(error))
                 }
             },
-            StreamState::AcceptError(error) => {
-                Poll::Ready(Err(io::Error::new(io::ErrorKind::Other, error.clone())))
-            }
+            StreamState::AcceptError(error) => Poll::Ready(Err(io::Error::other(error.clone()))),
             StreamState::Closed => Poll::Ready(Ok(())),
         }
     }
diff --git a/lib/vector-tap/src/controller.rs b/lib/vector-tap/src/controller.rs
index c07318d224507..cd10074d69f33 100644
--- a/lib/vector-tap/src/controller.rs
+++ b/lib/vector-tap/src/controller.rs
@@ -123,7 +123,7 @@ impl TapPayload {
         invalid_matches: Vec<String>,
     ) -> Self {
         let pattern = pattern.into();
-        let message = format!("[tap] Warning: source inputs cannot be tapped. Input pattern '{}' matches sources {:?}", pattern, invalid_matches);
+        let message = format!("[tap] Warning: source inputs cannot be tapped. Input pattern '{pattern}' matches sources {invalid_matches:?}");
         Self::Notification(Notification::InvalidMatch(InvalidMatch::new(
             message,
             pattern,
@@ -138,8 +138,7 @@ impl TapPayload {
     ) -> Self {
         let pattern = pattern.into();
         let message = format!(
-            "[tap] Warning: sink outputs cannot be tapped. Output pattern '{}' matches sinks {:?}",
-            pattern, invalid_matches
+            "[tap] Warning: sink outputs cannot be tapped. Output pattern '{pattern}' matches sinks {invalid_matches:?}"
         );
         Self::Notification(Notification::InvalidMatch(InvalidMatch::new(
             message,
diff --git a/lib/vector-tap/src/notification.rs b/lib/vector-tap/src/notification.rs
index 58fd81766a764..04ba715718993 100644
--- a/lib/vector-tap/src/notification.rs
+++ b/lib/vector-tap/src/notification.rs
@@ -14,7 +14,7 @@ pub struct Matched {
 impl Matched {
     pub fn new(pattern: String) -> Self {
         Self {
-            message: format!("[tap] Pattern '{}' successfully matched.", pattern),
+            message: format!("[tap] Pattern '{pattern}' successfully matched."),
             pattern,
         }
     }
@@ -34,8 +34,7 @@ impl NotMatched {
     pub fn new(pattern: String) -> Self {
         Self {
             message: format!(
-                "[tap] Pattern '{}' failed to match: will retry on configuration reload.",
-                pattern
+                "[tap] Pattern '{pattern}' failed to match: will retry on configuration reload."
             ),
             pattern,
         }
diff --git a/lib/vector-vrl/tests/src/docs.rs b/lib/vector-vrl/tests/src/docs.rs
index ec694ce316f6e..0dacafb10ed5a 100644
--- a/lib/vector-vrl/tests/src/docs.rs
+++ b/lib/vector-vrl/tests/src/docs.rs
@@ -183,7 +183,7 @@ fn test_from_cue_example(category: &'static str, name: String, example: Example)
 
     Test {
         name: title,
-        category: format!("docs/{}/{}", category, name),
+        category: format!("docs/{category}/{name}"),
         error: None,
         source,
         object,
diff --git a/lib/vector-vrl/tests/src/main.rs b/lib/vector-vrl/tests/src/main.rs
index 4fd751796935f..6f0025d3cb054 100644
--- a/lib/vector-vrl/tests/src/main.rs
+++ b/lib/vector-vrl/tests/src/main.rs
@@ -56,7 +56,7 @@ pub struct Cmd {
 impl Cmd {
     fn timezone(&self) -> TimeZone {
         if let Some(ref tz) = self.timezone {
-            TimeZone::parse(tz).unwrap_or_else(|| panic!("couldn't parse timezone: {}", tz))
+            TimeZone::parse(tz).unwrap_or_else(|| panic!("couldn't parse timezone: {tz}"))
         } else {
             TimeZone::Named(Tz::UTC)
         }
diff --git a/lib/vector-vrl/web-playground/src/lib.rs b/lib/vector-vrl/web-playground/src/lib.rs
index 7facbab54968c..14c983762e917 100644
--- a/lib/vector-vrl/web-playground/src/lib.rs
+++ b/lib/vector-vrl/web-playground/src/lib.rs
@@ -102,7 +102,7 @@ fn compile(
             Err(_) => {
                 // Returns error message if tz parsing has failed.
                 // This avoids head scratching, instead of it silently using the default timezone.
-                let error_message = format!("Invalid timezone identifier: '{}'", other);
+                let error_message = format!("Invalid timezone identifier: '{other}'");
                 return Err(VrlDiagnosticResult {
                     list: vec![error_message.clone()],
                     msg: error_message.clone(),
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
index bd493b61329bf..c2ee2a8766ad1 100644
--- a/rust-toolchain.toml
+++ b/rust-toolchain.toml
@@ -1,3 +1,3 @@
 [toolchain]
-channel = "1.86"
+channel = "1.88"
 profile = "default"
diff --git a/src/api/schema/gen.rs b/src/api/schema/gen.rs
index 33e27f658416d..c359f0db3b640 100644
--- a/src/api/schema/gen.rs
+++ b/src/api/schema/gen.rs
@@ -110,7 +110,7 @@ async fn main() {
 
     fs::write(
         "lib/vector-api-client/graphql/schema.json",
-        format!("{}\n", json),
+        format!("{json}\n"),
     )
     .expect("Couldn't save schema file");
 }
diff --git a/src/api/schema/metrics/filter.rs b/src/api/schema/metrics/filter.rs
index 52446cdc73ed2..1236119c87af3 100644
--- a/src/api/schema/metrics/filter.rs
+++ b/src/api/schema/metrics/filter.rs
@@ -303,7 +303,7 @@ pub fn component_sent_events_totals_metrics_with_outputs(
                             match m.value() {
                                 MetricValue::Counter { value }
                                     if cache
-                                        .insert(format!("{}.{}", id, output), *value)
+                                        .insert(format!("{id}.{output}"), *value)
                                         .unwrap_or(0.00)
                                         < *value =>
                                 {
@@ -349,8 +349,7 @@ pub fn component_sent_events_total_throughputs_with_outputs(
                         .iter()
                         .filter_map(|output| {
                             let m = filter_output_metric(metrics.as_ref(), output.as_ref())?;
-                            let throughput =
-                                throughput(&m, format!("{}.{}", id, output), &mut cache)?;
+                            let throughput = throughput(&m, format!("{id}.{output}"), &mut cache)?;
                             Some(OutputThroughput::new(output.clone(), throughput as i64))
                         })
                         .collect::<Vec<_>>();
diff --git a/src/api/schema/metrics/source/file.rs b/src/api/schema/metrics/source/file.rs
index fa73300ee5cce..93a3141860d5f 100644
--- a/src/api/schema/metrics/source/file.rs
+++ b/src/api/schema/metrics/source/file.rs
@@ -249,7 +249,7 @@ mod tests {
         sort::by_fields(&mut files, &fields);
 
         for (i, f) in ["1", "2", "3"].iter().enumerate() {
-            assert_eq!(files[i].name.as_str(), format!("/path/to/file/{}", f));
+            assert_eq!(files[i].name.as_str(), format!("/path/to/file/{f}"));
         }
     }
 
@@ -268,7 +268,7 @@ mod tests {
         sort::by_fields(&mut files, &fields);
 
         for (i, f) in ["3", "2", "1"].iter().enumerate() {
-            assert_eq!(files[i].name.as_str(), format!("/path/to/file/{}", f));
+            assert_eq!(files[i].name.as_str(), format!("/path/to/file/{f}"));
         }
     }
 
diff --git a/src/codecs/encoding/encoder.rs b/src/codecs/encoding/encoder.rs
index 2f294d0aae783..94ef9fe0408f9 100644
--- a/src/codecs/encoding/encoder.rs
+++ b/src/codecs/encoding/encoder.rs
@@ -239,7 +239,7 @@ mod tests {
         fn encode(&mut self, _: (), dst: &mut BytesMut) -> Result<(), Self::Error> {
             self.0.encode((), dst)?;
             let result = if self.1 == self.2 {
-                Err(Box::new(std::io::Error::new(std::io::ErrorKind::Other, "error")) as _)
+                Err(Box::new(std::io::Error::other("error")) as _)
             } else {
                 Ok(())
             };
diff --git a/src/codecs/encoding/transformer.rs b/src/codecs/encoding/transformer.rs
index 5539df5dd332c..4b9583e1f53e6 100644
--- a/src/codecs/encoding/transformer.rs
+++ b/src/codecs/encoding/transformer.rs
@@ -396,7 +396,7 @@ mod tests {
             ),
         ];
         for (fmt, expected) in cases {
-            let config: String = format!(r#"timestamp_format = "{}""#, fmt);
+            let config: String = format!(r#"timestamp_format = "{fmt}""#);
             let transformer: Transformer = toml::from_str(&config).unwrap();
             let mut event = base.clone();
             transformer.transform(&mut event);
diff --git a/src/common/datadog.rs b/src/common/datadog.rs
index 7e58a010494aa..9b84a2f8351dc 100644
--- a/src/common/datadog.rs
+++ b/src/common/datadog.rs
@@ -93,7 +93,7 @@ pub struct DatadogPoint<T>(pub i64, pub T);
 ///
 /// If `endpoint` is not specified, we fallback to `site`.
 pub(crate) fn get_api_base_endpoint(endpoint: Option<&str>, site: &str) -> String {
-    endpoint.map_or_else(|| format!("https://api.{}", site), compute_api_endpoint)
+    endpoint.map_or_else(|| format!("https://api.{site}"), compute_api_endpoint)
 }
 
 /// Computes the Datadog API endpoint from a given endpoint string.
diff --git a/src/common/expansion.rs b/src/common/expansion.rs
index 11d6940183de7..04c737498f259 100644
--- a/src/common/expansion.rs
+++ b/src/common/expansion.rs
@@ -25,7 +25,7 @@ pub(crate) fn pair_expansion(
         // key_* -> key_one, key_two, key_three
         // * -> one, two, three
         for (k, v) in output {
-            let key = slugify_text(&format!("{}{}", opening_prefix, k));
+            let key = slugify_text(&format!("{opening_prefix}{k}"));
             let val = Value::from(v).to_string_lossy().into_owned();
             if val == "<null>" {
                 warn!("Encountered \"null\" value for dynamic pair. key: {}", key);
diff --git a/src/common/http/server_auth.rs b/src/common/http/server_auth.rs
index b3155f5781206..0b3eda4c43184 100644
--- a/src/common/http/server_auth.rs
+++ b/src/common/http/server_auth.rs
@@ -181,6 +181,7 @@ impl HttpServerAuthConfig {
 
 /// Built auth matcher with validated configuration
 /// Can be used directly in a component to validate authentication in HTTP requests
+#[allow(clippy::large_enum_variant)]
 #[derive(Clone, Debug)]
 pub enum HttpServerAuthMatcher {
     /// Matcher for comparing exact value of Authorization header
diff --git a/src/components/validation/mod.rs b/src/components/validation/mod.rs
index 514153ad2b16b..a786a56571120 100644
--- a/src/components/validation/mod.rs
+++ b/src/components/validation/mod.rs
@@ -319,7 +319,7 @@ fn run_validation(configuration: ValidationConfiguration, test_case_data_path: s
                                 } else {
                                     let formatted = success
                                         .iter()
-                                        .map(|s| format!("    - {}\n", s))
+                                        .map(|s| format!("    - {s}\n"))
                                         .collect::<Vec<_>>();
 
                                     details.push(format!(
@@ -340,7 +340,7 @@ fn run_validation(configuration: ValidationConfiguration, test_case_data_path: s
                                 } else {
                                     let formatted = failure
                                         .iter()
-                                        .map(|s| format!("    - {}\n", s))
+                                        .map(|s| format!("    - {s}\n"))
                                         .collect::<Vec<_>>();
 
                                     details.push(format!(
@@ -368,10 +368,9 @@ fn run_validation(configuration: ValidationConfiguration, test_case_data_path: s
                     );
                 }
             }
-            Err(e) => panic!(
-                "Failed to complete validation run for component '{}': {}",
-                component_name, e
-            ),
+            Err(e) => {
+                panic!("Failed to complete validation run for component '{component_name}': {e}")
+            }
         }
     });
 }
diff --git a/src/components/validation/runner/config.rs b/src/components/validation/runner/config.rs
index 5f70f56670e99..1afc21e5d5fdb 100644
--- a/src/components/validation/runner/config.rs
+++ b/src/components/validation/runner/config.rs
@@ -33,8 +33,7 @@ impl TopologyBuilder {
         let component_configuration = configuration
             .component_configuration_for_test_case(config_name)
             .ok_or(format!(
-                "No test case name defined for configuration {:?}.",
-                config_name
+                "No test case name defined for configuration {config_name:?}."
             ))?;
 
         Ok(match component_configuration {
diff --git a/src/components/validation/runner/mod.rs b/src/components/validation/runner/mod.rs
index 8c5937bbf86cd..e58d5babb2f3d 100644
--- a/src/components/validation/runner/mod.rs
+++ b/src/components/validation/runner/mod.rs
@@ -188,10 +188,7 @@ impl Runner {
             .insert(validator_name.to_string(), validator)
             .is_some()
         {
-            panic!(
-                "attempted to add duplicate validator '{}' to runner",
-                validator_name
-            );
+            panic!("attempted to add duplicate validator '{validator_name}' to runner");
         }
     }
 
@@ -205,8 +202,8 @@ impl Runner {
 
         let test_cases = load_component_test_cases(&self.test_case_data_path)?;
         for test_case in test_cases {
-            println!("");
-            println!("");
+            println!();
+            println!();
             info!(
                 "Running test '{}' case for component '{}' (type: {:?})...",
                 test_case.name,
@@ -432,18 +429,10 @@ impl Runner {
 /// returned explaining the cause.
 fn load_component_test_cases(test_case_data_path: &PathBuf) -> Result<Vec<TestCase>, String> {
     std::fs::File::open(test_case_data_path)
-        .map_err(|e| {
-            format!(
-                "I/O error during open of component validation test cases file: {}",
-                e
-            )
-        })
+        .map_err(|e| format!("I/O error during open of component validation test cases file: {e}"))
         .and_then(|file| {
             serde_yaml::from_reader(file).map_err(|e| {
-                format!(
-                    "Deserialization error for component validation test cases file: {}",
-                    e
-                )
+                format!("Deserialization error for component validation test cases file: {e}")
             })
         })
 }
@@ -627,7 +616,9 @@ fn spawn_input_driver(
                         if let Some(ts) = log.remove_timestamp() {
                             let ts = match ts.as_integer() {
                                 Some(ts) => chrono::DateTime::from_timestamp_millis(ts)
-                                    .expect(&format!("invalid timestamp in input test event {ts}"))
+                                    .unwrap_or_else(|| {
+                                        panic!("invalid timestamp in input test event {ts}")
+                                    })
                                     .into(),
                                 None => ts,
                             };
diff --git a/src/components/validation/validators/component_spec/mod.rs b/src/components/validation/validators/component_spec/mod.rs
index 98db84a1ce6dd..26ffd292c5cf7 100644
--- a/src/components/validation/validators/component_spec/mod.rs
+++ b/src/components/validation/validators/component_spec/mod.rs
@@ -256,7 +256,7 @@ fn sum_counters(
                     sum += *value;
                 }
             }
-            _ => errs.push(format!("{}: metric value is not a counter", metric_name,)),
+            _ => errs.push(format!("{metric_name}: metric value is not a counter",)),
         }
     }
 
diff --git a/src/conditions/datadog_search.rs b/src/conditions/datadog_search.rs
index 83ec3e00923a7..a7ecea5f4f590 100644
--- a/src/conditions/datadog_search.rs
+++ b/src/conditions/datadog_search.rs
@@ -84,7 +84,7 @@ impl Filter<LogEvent> for EventFilter {
     fn exists(&self, field: Field) -> Result<Box<dyn Matcher<LogEvent>>, PathParseError> {
         Ok(match field {
             Field::Tag(tag) => {
-                let starts_with = format!("{}:", tag);
+                let starts_with = format!("{tag}:");
 
                 any_string_match_multiple(vec!["ddtags", "tags"], move |value| {
                     value == tag || value.starts_with(&starts_with)
@@ -125,7 +125,7 @@ impl Filter<LogEvent> for EventFilter {
             }
             // Individual tags are compared by element key:value.
             Field::Tag(tag) => {
-                let value_bytes = Value::Bytes(format!("{}:{}", tag, to_match).into());
+                let value_bytes = Value::Bytes(format!("{tag}:{to_match}").into());
 
                 array_match_multiple(vec!["ddtags", "tags"], move |values| {
                     values.contains(&value_bytes)
@@ -160,13 +160,13 @@ impl Filter<LogEvent> for EventFilter {
         Ok(match field {
             // Default fields are matched by word boundary.
             Field::Default(field) => {
-                let re = word_regex(&format!("{}*", prefix));
+                let re = word_regex(&format!("{prefix}*"));
 
                 string_match(field, move |value| re.is_match(&value))
             }
             // Tags are recursed until a match is found.
             Field::Tag(tag) => {
-                let starts_with = format!("{}:{}", tag, prefix);
+                let starts_with = format!("{tag}:{prefix}");
 
                 any_string_match_multiple(vec!["ddtags", "tags"], move |value| {
                     value.starts_with(&starts_with)
@@ -202,7 +202,7 @@ impl Filter<LogEvent> for EventFilter {
                 string_match(field, move |value| re.is_match(&value))
             }
             Field::Tag(tag) => {
-                let re = wildcard_regex(&format!("{}:{}", tag, wildcard));
+                let re = wildcard_regex(&format!("{tag}:{wildcard}"));
 
                 any_string_match_multiple(vec!["ddtags", "tags"], move |value| re.is_match(&value))
             }
@@ -1611,7 +1611,7 @@ mod test {
             // Every query should build successfully.
             let cond = config
                 .build(&Default::default())
-                .unwrap_or_else(|_| panic!("build failed: {}", source));
+                .unwrap_or_else(|_| panic!("build failed: {source}"));
 
             assert!(
                 cond.check_with_context(pass.clone()).0.is_ok(),
diff --git a/src/conditions/vrl.rs b/src/conditions/vrl.rs
index e8170e3ec51bd..267a7e01f19a4 100644
--- a/src/conditions/vrl.rs
+++ b/src/conditions/vrl.rs
@@ -142,7 +142,7 @@ impl Conditional for Vrl {
                 )
                 .colored()
                 .to_string();
-                format!("source execution aborted: {}", err)
+                format!("source execution aborted: {err}")
             }
             Terminate::Error(err) => {
                 let err = Formatter::new(
@@ -153,7 +153,7 @@ impl Conditional for Vrl {
                 )
                 .colored()
                 .to_string();
-                format!("source execution failed: {}", err)
+                format!("source execution failed: {err}")
             }
         });
 
diff --git a/src/config/api.rs b/src/config/api.rs
index 2f7ca7dd074f9..fca088f751b39 100644
--- a/src/config/api.rs
+++ b/src/config/api.rs
@@ -71,7 +71,7 @@ pub fn default_address() -> Option<SocketAddr> {
 /// Default GraphQL API address
 pub fn default_graphql_url() -> Url {
     let addr = default_address().unwrap();
-    Url::parse(&format!("http://{}/graphql", addr))
+    Url::parse(&format!("http://{addr}/graphql"))
         .expect("Couldn't parse default API URL. Please report this.")
 }
 
@@ -95,9 +95,7 @@ impl Options {
             // Prefer non default address
             (Some(a), Some(b)) => {
                 match (Some(a) == default_address(), Some(b) == default_address()) {
-                    (false, false) => {
-                        return Err(format!("Conflicting `api` address: {}, {} .", a, b))
-                    }
+                    (false, false) => return Err(format!("Conflicting `api` address: {a}, {b} .")),
                     (false, true) => Some(a),
                     (true, _) => Some(b),
                 }
diff --git a/src/config/builder.rs b/src/config/builder.rs
index 351122aa5ca7d..33889a67833c1 100644
--- a/src/config/builder.rs
+++ b/src/config/builder.rs
@@ -231,22 +231,22 @@ impl ConfigBuilder {
 
         with.enrichment_tables.keys().for_each(|k| {
             if self.enrichment_tables.contains_key(k) {
-                errors.push(format!("duplicate enrichment_table name found: {}", k));
+                errors.push(format!("duplicate enrichment_table name found: {k}"));
             }
         });
         with.sources.keys().for_each(|k| {
             if self.sources.contains_key(k) {
-                errors.push(format!("duplicate source id found: {}", k));
+                errors.push(format!("duplicate source id found: {k}"));
             }
         });
         with.sinks.keys().for_each(|k| {
             if self.sinks.contains_key(k) {
-                errors.push(format!("duplicate sink id found: {}", k));
+                errors.push(format!("duplicate sink id found: {k}"));
             }
         });
         with.transforms.keys().for_each(|k| {
             if self.transforms.contains_key(k) {
-                errors.push(format!("duplicate transform id found: {}", k));
+                errors.push(format!("duplicate transform id found: {k}"));
             }
         });
         with.tests.iter().for_each(|wt| {
@@ -256,7 +256,7 @@ impl ConfigBuilder {
         });
         with.secret.keys().for_each(|k| {
             if self.secret.contains_key(k) {
-                errors.push(format!("duplicate secret id found: {}", k));
+                errors.push(format!("duplicate secret id found: {k}"));
             }
         });
         if !errors.is_empty() {
diff --git a/src/config/cmd.rs b/src/config/cmd.rs
index a76d7a4a0843a..675a0dc1c9dd0 100644
--- a/src/config/cmd.rs
+++ b/src/config/cmd.rs
@@ -242,13 +242,12 @@ mod tests {
             r#"
             [sources.in]
             type = "demo_logs"
-            format = "${{{}}}"
+            format = "${{{env_var}}}"
 
             [sinks.out]
             type = "blackhole"
-            inputs = ["${{{}}}"]
-        "#,
-            env_var, env_var_in_arr
+            inputs = ["${{{env_var_in_arr}}}"]
+        "#
         );
         let interpolated_config_source = vars::interpolate(
             config_source.as_ref(),
@@ -319,18 +318,18 @@ mod tests {
             "{}/{}/{}",
             sources
                 .iter()
-                .map(|source| format!("{}:{}", source, source))
+                .map(|source| format!("{source}:{source}"))
                 .collect::<Vec<_>>()
                 .join(","),
             transforms
                 .iter()
-                .map(|transform| format!("{}:{}", transform, transform))
+                .map(|transform| format!("{transform}:{transform}"))
                 .chain(vec!["manually-added-remap:remap".to_string()])
                 .collect::<Vec<_>>()
                 .join(","),
             sinks
                 .iter()
-                .map(|sink| format!("{}:{}", sink, sink))
+                .map(|sink| format!("{sink}:{sink}"))
                 .collect::<Vec<_>>()
                 .join(","),
         );
diff --git a/src/config/format.rs b/src/config/format.rs
index 85a11c25697e5..75b19e86035d9 100644
--- a/src/config/format.rs
+++ b/src/config/format.rs
@@ -46,7 +46,7 @@ impl FromStr for Format {
             "toml" => Ok(Format::Toml),
             "yaml" => Ok(Format::Yaml),
             "json" => Ok(Format::Json),
-            _ => Err(format!("Invalid format: {}", s)),
+            _ => Err(format!("Invalid format: {s}")),
         }
     }
 }
@@ -58,7 +58,7 @@ impl fmt::Display for Format {
             Format::Json => "json",
             Format::Yaml => "yaml",
         };
-        write!(f, "{}", format)
+        write!(f, "{format}")
     }
 }
 
@@ -163,7 +163,7 @@ mod tests {
 
         for (input, expected) in cases {
             let output = Format::from_path(std::path::PathBuf::from(input));
-            assert_eq!(expected, output.ok(), "{}", input)
+            assert_eq!(expected, output.ok(), "{input}")
         }
     }
 
@@ -316,23 +316,20 @@ mod tests {
                 Ok(expected) => {
                     #[allow(clippy::expect_fun_call)] // false positive
                     let output: ConfigBuilder = output.expect(&format!(
-                        "expected Ok, got Err with format {:?} and input {:?}",
-                        format, input
+                        "expected Ok, got Err with format {format:?} and input {input:?}"
                     ));
                     let output_json = serde_json::to_value(output).unwrap();
                     let expected_output: ConfigBuilder = deserialize(expected, Format::Toml)
                         .expect("Invalid TOML passed as an expectation");
                     let expected_json = serde_json::to_value(expected_output).unwrap();
-                    assert_eq!(expected_json, output_json, "{}", input)
+                    assert_eq!(expected_json, output_json, "{input}")
                 }
                 Err(expected) => assert_eq!(
                     expected,
                     output.expect_err(&format!(
-                        "expected Err, got Ok with format {:?} and input {:?}",
-                        format, input
+                        "expected Err, got Ok with format {format:?} and input {input:?}"
                     )),
-                    "{}",
-                    input
+                    "{input}"
                 ),
             }
         }
diff --git a/src/config/graph.rs b/src/config/graph.rs
index 3943aefead147..989f0a9eaf282 100644
--- a/src/config/graph.rs
+++ b/src/config/graph.rs
@@ -26,7 +26,7 @@ impl fmt::Display for Node {
             Node::Source { outputs } => {
                 write!(f, "component_kind: source\n  outputs:")?;
                 for output in outputs {
-                    write!(f, "\n    {}", output)?;
+                    write!(f, "\n    {output}")?;
                 }
                 Ok(())
             }
@@ -36,7 +36,7 @@ impl fmt::Display for Node {
                     "component_kind: source\n  input_types: {in_ty}\n  outputs:"
                 )?;
                 for output in outputs {
-                    write!(f, "\n    {}", output)?;
+                    write!(f, "\n    {output}")?;
                 }
                 Ok(())
             }
@@ -187,7 +187,7 @@ impl Graph {
                 "Available components:\n{}",
                 self.nodes
                     .iter()
-                    .map(|(key, node)| format!("\"{}\":\n  {}", key, node))
+                    .map(|(key, node)| format!("\"{key}\":\n  {node}"))
                     .collect::<Vec<_>>()
                     .join("\n")
             );
@@ -353,7 +353,7 @@ impl Graph {
 
         for id in self.valid_inputs() {
             if let Some(_other) = mapped.insert(id.to_string(), id.clone()) {
-                errors.insert(format!("Input specifier {} is ambiguous", id));
+                errors.insert(format!("Input specifier {id} is ambiguous"));
             }
         }
 
diff --git a/src/config/loading/loader.rs b/src/config/loading/loader.rs
index 7bc9262d600c0..75bd431724250 100644
--- a/src/config/loading/loader.rs
+++ b/src/config/loading/loader.rs
@@ -100,8 +100,7 @@ pub(super) mod process {
                     }
                     Err(err) => {
                         errors.push(format!(
-                            "Could not read entry in config dir: {:?}, {}.",
-                            path, err
+                            "Could not read entry in config dir: {path:?}, {err}."
                         ));
                     }
                 };
diff --git a/src/config/loading/secret_backend_example.rs b/src/config/loading/secret_backend_example.rs
index 2466d7da387f7..4573df934fb3e 100644
--- a/src/config/loading/secret_backend_example.rs
+++ b/src/config/loading/secret_backend_example.rs
@@ -33,7 +33,7 @@ async fn main() {
             (
                 secret.clone(),
                 ExecResponse {
-                    value: format!("{}.retrieved", secret),
+                    value: format!("{secret}.retrieved"),
                     error: None,
                 },
             )
diff --git a/src/config/mod.rs b/src/config/mod.rs
index 8f3b247db57a0..4f17de80f59b6 100644
--- a/src/config/mod.rs
+++ b/src/config/mod.rs
@@ -361,10 +361,10 @@ impl Display for Protocol {
 impl Display for Resource {
     fn fmt(&self, fmt: &mut Formatter<'_>) -> Result<(), fmt::Error> {
         match self {
-            Resource::Port(address, protocol) => write!(fmt, "{} {}", protocol, address),
+            Resource::Port(address, protocol) => write!(fmt, "{protocol} {address}"),
             Resource::SystemFdOffset(offset) => write!(fmt, "systemd {}th socket", offset + 1),
-            Resource::Fd(fd) => write!(fmt, "file descriptor: {}", fd),
-            Resource::DiskBuffer(name) => write!(fmt, "disk buffer {:?}", name),
+            Resource::Fd(fd) => write!(fmt, "file descriptor: {fd}"),
+            Resource::DiskBuffer(name) => write!(fmt, "disk buffer {name:?}"),
         }
     }
 }
@@ -426,8 +426,7 @@ impl TestDefinition<String> {
                         outputs.push(output_id.clone());
                     } else {
                         errors.push(format!(
-                            r#"Invalid extract_from target in test '{}': '{}' does not exist"#,
-                            name, from
+                            r#"Invalid extract_from target in test '{name}': '{from}' does not exist"#
                         ));
                     }
                 }
@@ -449,8 +448,7 @@ impl TestDefinition<String> {
                     Some(output_id.clone())
                 } else {
                     errors.push(format!(
-                        r#"Invalid no_outputs_from target in test '{}': '{}' does not exist"#,
-                        name, o
+                        r#"Invalid no_outputs_from target in test '{name}': '{o}' does not exist"#
                     ));
                     None
                 }
@@ -1376,9 +1374,9 @@ mod resource_config_tests {
                 let json = serde_json::to_string_pretty(&schema)
                     .expect("rendering root schema to JSON should not fail");
 
-                println!("{}", json);
+                println!("{json}");
             }
-            Err(e) => eprintln!("error while generating schema: {:?}", e),
+            Err(e) => eprintln!("error while generating schema: {e:?}"),
         }
     }
 }
diff --git a/src/config/schema.rs b/src/config/schema.rs
index 2245e84e758f3..bed2c0f532b64 100644
--- a/src/config/schema.rs
+++ b/src/config/schema.rs
@@ -147,13 +147,12 @@ mod test {
             let mut errors = vec![];
             a.append(b, &mut errors);
             if errors.is_empty() {
-                assert_eq!(Some(a), expected, "result mismatch: {}", test);
+                assert_eq!(Some(a), expected, "result mismatch: {test}");
             } else {
                 assert_eq!(
                     errors.is_empty(),
                     expected.is_some(),
-                    "error mismatch: {}",
-                    test
+                    "error mismatch: {test}"
                 );
             }
         }
diff --git a/src/config/unit_test/mod.rs b/src/config/unit_test/mod.rs
index 4e5b12b658c78..cb967a4de5460 100644
--- a/src/config/unit_test/mod.rs
+++ b/src/config/unit_test/mod.rs
@@ -139,7 +139,7 @@ pub async fn build_unit_tests(
                 let mut test_error = errors.join("\n");
                 // Indent all line breaks
                 test_error = test_error.replace('\n', "\n  ");
-                test_error.insert_str(0, &format!("Failed to build test '{}':\n  ", test_name));
+                test_error.insert_str(0, &format!("Failed to build test '{test_name}':\n  "));
                 build_errors.push(test_error);
             }
         }
@@ -568,8 +568,7 @@ fn build_outputs(
             match condition.build(&Default::default()) {
                 Ok(condition) => conditions.push(condition),
                 Err(error) => errors.push(format!(
-                    "failed to create test condition '{}': {}",
-                    index, error
+                    "failed to create test condition '{index}': {error}"
                 )),
             }
         }
diff --git a/src/config/unit_test/unit_test_components.rs b/src/config/unit_test/unit_test_components.rs
index d478c80c87a9a..8daf82b5029d3 100644
--- a/src/config/unit_test/unit_test_components.rs
+++ b/src/config/unit_test/unit_test_components.rs
@@ -220,8 +220,7 @@ impl StreamSink<Event> for UnitTestSink {
                                         break;
                                     }
                                     Err(error) => {
-                                        condition_errors
-                                            .push(format!("  condition[{}]: {}", j, error));
+                                        condition_errors.push(format!("  condition[{j}]: {error}"));
                                     }
                                 }
                             }
diff --git a/src/config/validation.rs b/src/config/validation.rs
index 847bc094d737e..6cae1ecfbf19a 100644
--- a/src/config/validation.rs
+++ b/src/config/validation.rs
@@ -140,10 +140,7 @@ pub fn check_resources(config: &ConfigBuilder) -> Result<(), Vec<String>> {
         Err(conflicting_components
             .into_iter()
             .map(|(resource, components)| {
-                format!(
-                    "Resource `{}` is claimed by multiple components: {:?}",
-                    resource, components
-                )
+                format!("Resource `{resource}` is claimed by multiple components: {components:?}")
             })
             .collect())
     }
diff --git a/src/docker.rs b/src/docker.rs
index 7a8308cabe14f..24a1fc429748e 100644
--- a/src/docker.rs
+++ b/src/docker.rs
@@ -79,7 +79,7 @@ pub fn docker(host: Option<String>, tls: Option<DockerTlsConfig>) -> crate::Resu
                 Some("unix") | Some("npipe") | None => {
                     Docker::connect_with_defaults().map_err(Into::into)
                 }
-                Some(scheme) => Err(format!("Unknown scheme: {}", scheme).into()),
+                Some(scheme) => Err(format!("Unknown scheme: {scheme}").into()),
             }
         }
     }
@@ -130,7 +130,7 @@ async fn pull_image(docker: &Docker, image: &str, tag: &str) {
             .for_each(|item| async move {
                 let info = item.unwrap();
                 if let Some(error) = info.error {
-                    panic!("{:?}", error);
+                    panic!("{error:?}");
                 }
             })
             .await
@@ -172,7 +172,7 @@ impl Container {
     }
 
     pub fn bind(mut self, src: impl std::fmt::Display, dst: &str) -> Self {
-        let bind = format!("{}:{}", src, dst);
+        let bind = format!("{src}:{dst}");
         self.binds.get_or_insert_with(Vec::new).push(bind);
         self
     }
diff --git a/src/encoding_transcode.rs b/src/encoding_transcode.rs
index e093fa04b92f7..92a9c88b6e58b 100644
--- a/src/encoding_transcode.rs
+++ b/src/encoding_transcode.rs
@@ -290,10 +290,7 @@ mod tests {
 
         assert_eq!(
             d.decode_to_utf8(Bytes::from(problematic_input)),
-            Bytes::from(format!(
-                "{}{}123",
-                REPLACEMENT_CHARACTER, REPLACEMENT_CHARACTER
-            ))
+            Bytes::from(format!("{REPLACEMENT_CHARACTER}{REPLACEMENT_CHARACTER}123"))
         );
     }
 
diff --git a/src/enrichment_tables/file.rs b/src/enrichment_tables/file.rs
index 114e910c9c69b..ec234ea10e16c 100644
--- a/src/enrichment_tables/file.rs
+++ b/src/enrichment_tables/file.rs
@@ -143,10 +143,7 @@ impl FileConfig {
                             .from_utc_datetime(
                                 &chrono::NaiveDate::parse_from_str(value, "%Y-%m-%d")
                                     .map_err(|_| {
-                                        format!(
-                                            "unable to parse date {} found in row {}",
-                                            value, row
-                                        )
+                                        format!("unable to parse date {value} found in row {row}")
                                     })?
                                     .and_hms_opt(0, 0, 0)
                                     .expect("invalid timestamp"),
@@ -159,10 +156,7 @@ impl FileConfig {
                             .from_utc_datetime(
                                 &chrono::NaiveDate::parse_from_str(value, format)
                                     .map_err(|_| {
-                                        format!(
-                                            "unable to parse date {} found in row {}",
-                                            value, row
-                                        )
+                                        format!("unable to parse date {value} found in row {row}")
                                     })?
                                     .and_hms_opt(0, 0, 0)
                                     .expect("invalid timestamp"),
@@ -174,9 +168,7 @@ impl FileConfig {
                             Conversion::parse(format, timezone).map_err(|err| err.to_string())?;
                         conversion
                             .convert(Bytes::copy_from_slice(value.as_bytes()))
-                            .map_err(|_| {
-                                format!("unable to parse {} found in row {}", value, row)
-                            })?
+                            .map_err(|_| format!("unable to parse {value} found in row {row}"))?
                     }
                 }
             }
@@ -416,7 +408,7 @@ impl File {
                 })
                 .collect::<Vec<_>>()
                 .join(", ");
-            Err(format!("field(s) '{}' missing from dataset", missing))
+            Err(format!("field(s) '{missing}' missing from dataset"))
         } else {
             Ok(normalized)
         }
diff --git a/src/generate.rs b/src/generate.rs
index d49dd9c4a8e5c..1da6c414c7640 100644
--- a/src/generate.rs
+++ b/src/generate.rs
@@ -140,8 +140,7 @@ pub(crate) fn generate_example(
             let (name, source_type) = if let Some(c_index) = source_expr.find(':') {
                 if c_index == 0 {
                     errs.push(format!(
-                        "failed to generate source '{}': empty name is not allowed",
-                        source_expr
+                        "failed to generate source '{source_expr}': empty name is not allowed"
                     ));
                     continue;
                 }
@@ -151,17 +150,14 @@ pub(crate) fn generate_example(
                     chopped_expr.drain(1..).collect(),
                 )
             } else {
-                (format!("source{}", i), source_expr.clone())
+                (format!("source{i}"), source_expr.clone())
             };
             source_names.push(name.clone());
 
             let mut example = match SourceDescription::example(&source_type) {
                 Ok(example) => example,
                 Err(err) => {
-                    errs.push(format!(
-                        "failed to generate source '{}': {}",
-                        source_type, err
-                    ));
+                    errs.push(format!("failed to generate source '{source_type}': {err}"));
                     Value::Table(Map::new())
                 }
             };
@@ -186,8 +182,7 @@ pub(crate) fn generate_example(
             let (name, transform_type) = if let Some(c_index) = transform_expr.find(':') {
                 if c_index == 0 {
                     errs.push(format!(
-                        "failed to generate transform '{}': empty name is not allowed",
-                        transform_expr
+                        "failed to generate transform '{transform_expr}': empty name is not allowed"
                     ));
                     continue;
                 }
@@ -197,7 +192,7 @@ pub(crate) fn generate_example(
                     chopped_expr.drain(1..).collect(),
                 )
             } else {
-                (format!("transform{}", i), transform_expr.clone())
+                (format!("transform{i}"), transform_expr.clone())
             };
             transform_names.push(name.clone());
 
@@ -220,8 +215,7 @@ pub(crate) fn generate_example(
                 Ok(example) => example,
                 Err(err) => {
                     errs.push(format!(
-                        "failed to generate transform '{}': {}",
-                        transform_type, err
+                        "failed to generate transform '{transform_type}': {err}"
                     ));
                     Value::Table(Map::new())
                 }
@@ -252,8 +246,7 @@ pub(crate) fn generate_example(
             let (name, sink_type) = if let Some(c_index) = sink_expr.find(':') {
                 if c_index == 0 {
                     errs.push(format!(
-                        "failed to generate sink '{}': empty name is not allowed",
-                        sink_expr
+                        "failed to generate sink '{sink_expr}': empty name is not allowed"
                     ));
                     continue;
                 }
@@ -263,13 +256,13 @@ pub(crate) fn generate_example(
                     chopped_expr.drain(1..).collect(),
                 )
             } else {
-                (format!("sink{}", i), sink_expr.clone())
+                (format!("sink{i}"), sink_expr.clone())
             };
 
             let mut example = match SinkDescription::example(&sink_type) {
                 Ok(example) => example,
                 Err(err) => {
-                    errs.push(format!("failed to generate sink '{}': {}", sink_type, err));
+                    errs.push(format!("failed to generate sink '{sink_type}': {err}"));
                     Value::Table(Map::new())
                 }
             };
@@ -354,7 +347,7 @@ pub fn cmd(opts: &Opts) -> exitcode::ExitCode {
         Ok(s) => {
             #[allow(clippy::print_stdout)]
             {
-                println!("{}", s);
+                println!("{s}");
             }
             exitcode::OK
         }
@@ -411,15 +404,15 @@ mod tests {
     #[test]
     fn generate_all(#[case] format: Format) {
         for name in SourceDescription::types() {
-            generate_and_deserialize(format!("{}//", name), format);
+            generate_and_deserialize(format!("{name}//"), format);
         }
 
         for name in TransformDescription::types() {
-            generate_and_deserialize(format!("/{}/", name), format);
+            generate_and_deserialize(format!("/{name}/"), format);
         }
 
         for name in SinkDescription::types() {
-            generate_and_deserialize(format!("//{}", name), format);
+            generate_and_deserialize(format!("//{name}"), format);
         }
     }
 
diff --git a/src/generate_schema.rs b/src/generate_schema.rs
index bddd203cda382..f20a71480c106 100644
--- a/src/generate_schema.rs
+++ b/src/generate_schema.rs
@@ -46,7 +46,7 @@ pub fn cmd(opts: &Opts) -> exitcode::ExitCode {
             exitcode::OK
         }
         Err(e) => {
-            eprintln!("error while generating schema: {:?}", e);
+            eprintln!("error while generating schema: {e:?}");
             exitcode::SOFTWARE
         }
     }
diff --git a/src/graph.rs b/src/graph.rs
index 44ae55b19bbff..5d7ad0da03fca 100644
--- a/src/graph.rs
+++ b/src/graph.rs
@@ -85,10 +85,7 @@ fn node_attributes_to_string(attributes: &HashMap<String, String>, default_shape
     if !attrs.contains_key("shape") {
         attrs.insert("shape".to_string(), default_shape.to_string());
     }
-    attrs
-        .iter()
-        .map(|(k, v)| format!("{}=\"{}\"", k, v))
-        .join(" ")
+    attrs.iter().map(|(k, v)| format!("{k}=\"{v}\"")).join(" ")
 }
 
 pub(crate) fn cmd(opts: &Opts) -> exitcode::ExitCode {
@@ -103,7 +100,7 @@ pub(crate) fn cmd(opts: &Opts) -> exitcode::ExitCode {
         Err(errs) => {
             #[allow(clippy::print_stderr)]
             for err in errs {
-                eprintln!("{}", err);
+                eprintln!("{err}");
             }
             return exitcode::CONFIG;
         }
@@ -147,8 +144,7 @@ fn render_dot(config: config::Config) -> exitcode::ExitCode {
                 )
                 .expect("write to String never fails");
             } else {
-                writeln!(dot, "  \"{}\" -> \"{}\"", input, id)
-                    .expect("write to String never fails");
+                writeln!(dot, "  \"{input}\" -> \"{id}\"").expect("write to String never fails");
             }
         }
     }
@@ -171,8 +167,7 @@ fn render_dot(config: config::Config) -> exitcode::ExitCode {
                 )
                 .expect("write to String never fails");
             } else {
-                writeln!(dot, "  \"{}\" -> \"{}\"", input, id)
-                    .expect("write to String never fails");
+                writeln!(dot, "  \"{input}\" -> \"{id}\"").expect("write to String never fails");
             }
         }
     }
@@ -181,7 +176,7 @@ fn render_dot(config: config::Config) -> exitcode::ExitCode {
 
     #[allow(clippy::print_stdout)]
     {
-        println!("{}", dot);
+        println!("{dot}");
     }
 
     exitcode::OK
@@ -223,7 +218,7 @@ fn render_mermaid(config: config::Config) -> exitcode::ExitCode {
 
     #[allow(clippy::print_stdout)]
     {
-        println!("{}", mermaid);
+        println!("{mermaid}");
     }
 
     exitcode::OK
diff --git a/src/http.rs b/src/http.rs
index 7bd199b4ea40b..8c919da4d21e1 100644
--- a/src/http.rs
+++ b/src/http.rs
@@ -105,7 +105,7 @@ where
 
         let app_name = crate::get_app_name();
         let version = crate::get_version();
-        let user_agent = HeaderValue::from_str(&format!("{}/{}", app_name, version))
+        let user_agent = HeaderValue::from_str(&format!("{app_name}/{version}"))
             .expect("Invalid header value for user-agent!");
 
         Ok(HttpClient {
@@ -363,7 +363,7 @@ pub fn get_http_scheme_from_uri(uri: &Uri) -> &'static str {
         // it also supports arbitrary schemes, which is where we bomb out down here, since we can't generate a static
         // string for an arbitrary input string... and anything other than "http" and "https" makes no sense for an HTTP
         // client anyways.
-        s => panic!("invalid URI scheme for HTTP client: {}", s),
+        s => panic!("invalid URI scheme for HTTP client: {s}"),
     })
 }
 
@@ -902,13 +902,13 @@ mod tests {
 
         // Responses generated before the client's max connection age has elapsed do not
         // include a `Connection: close` header in the response.
-        let req = Request::get(format!("http://{}/", addr))
+        let req = Request::get(format!("http://{addr}/"))
             .body(Body::empty())
             .unwrap();
         let response = client.send(req).await.unwrap();
         assert_eq!(response.headers().get("Connection"), None);
 
-        let req = Request::get(format!("http://{}/", addr))
+        let req = Request::get(format!("http://{addr}/"))
             .body(Body::empty())
             .unwrap();
         let response = client.send(req).await.unwrap();
@@ -917,7 +917,7 @@ mod tests {
         // The first response generated after the client's max connection age has elapsed should
         // include the `Connection: close` header.
         tokio::time::sleep(Duration::from_secs(1)).await;
-        let req = Request::get(format!("http://{}/", addr))
+        let req = Request::get(format!("http://{addr}/"))
             .body(Body::empty())
             .unwrap();
         let response = client.send(req).await.unwrap();
@@ -929,7 +929,7 @@ mod tests {
         // The next request should establish a new connection.
         // Importantly, this also confirms that each connection has its own independent
         // connection age timer.
-        let req = Request::get(format!("http://{}/", addr))
+        let req = Request::get(format!("http://{addr}/"))
             .body(Body::empty())
             .unwrap();
         let response = client.send(req).await.unwrap();
diff --git a/src/internal_events/adaptive_concurrency.rs b/src/internal_events/adaptive_concurrency.rs
index 03836f5d855d1..e5898295ed79d 100644
--- a/src/internal_events/adaptive_concurrency.rs
+++ b/src/internal_events/adaptive_concurrency.rs
@@ -25,9 +25,9 @@ registered_event! {
 
     fn emit(&self, data: AdaptiveConcurrencyLimitData) {
         self.limit.record(data.concurrency as f64);
-        let reached_limit = data.reached_limit.then_some(1.0).unwrap_or_default();
+        let reached_limit = if data.reached_limit { 1.0 } else { Default::default() };
         self.reached_limit.record(reached_limit);
-        let back_pressure = data.had_back_pressure.then_some(1.0).unwrap_or_default();
+        let back_pressure = if data.had_back_pressure { 1.0 } else { Default::default() };
         self.back_pressure.record(back_pressure);
         self.past_rtt_mean.record(data.past_rtt);
         // past_rtt_deviation is unrecorded
diff --git a/src/internal_events/exec.rs b/src/internal_events/exec.rs
index 3a5ffe7c1c9ef..1cb656cd493c6 100644
--- a/src/internal_events/exec.rs
+++ b/src/internal_events/exec.rs
@@ -153,7 +153,7 @@ impl ExecFailedToSignalChild {
 
         match self {
             #[cfg(unix)]
-            SignalError(err) => format!("errno_{}", err),
+            SignalError(err) => format!("errno_{err}"),
             #[cfg(unix)]
             FailedToMarshalPid(_) => String::from("failed_to_marshal_pid"),
             #[cfg(unix)]
@@ -170,9 +170,9 @@ impl std::fmt::Display for ExecFailedToSignalChild {
 
         match self {
             #[cfg(unix)]
-            SignalError(err) => write!(f, "errno: {}", err),
+            SignalError(err) => write!(f, "errno: {err}"),
             #[cfg(unix)]
-            FailedToMarshalPid(err) => write!(f, "failed to marshal pid to i32: {}", err),
+            FailedToMarshalPid(err) => write!(f, "failed to marshal pid to i32: {err}"),
             #[cfg(unix)]
             NoPid => write!(f, "child had no pid"),
             #[cfg(windows)]
diff --git a/src/internal_events/http_client.rs b/src/internal_events/http_client.rs
index 155e9d8d67739..4aabe421d083c 100644
--- a/src/internal_events/http_client.rs
+++ b/src/internal_events/http_client.rs
@@ -103,13 +103,13 @@ impl<B: HttpBody> std::fmt::Display for FormatBody<'_, B> {
         let size = self.0.size_hint();
         match (size.lower(), size.upper()) {
             (0, None) => write!(fmt, "[unknown]"),
-            (lower, None) => write!(fmt, "[>={} bytes]", lower),
+            (lower, None) => write!(fmt, "[>={lower} bytes]"),
 
             (0, Some(0)) => write!(fmt, "[empty]"),
-            (0, Some(upper)) => write!(fmt, "[<={} bytes]", upper),
+            (0, Some(upper)) => write!(fmt, "[<={upper} bytes]"),
 
-            (lower, Some(upper)) if lower == upper => write!(fmt, "[{} bytes]", lower),
-            (lower, Some(upper)) => write!(fmt, "[{}..={} bytes]", lower, upper),
+            (lower, Some(upper)) if lower == upper => write!(fmt, "[{lower} bytes]"),
+            (lower, Some(upper)) => write!(fmt, "[{lower}..={upper} bytes]"),
         }
     }
 }
diff --git a/src/internal_events/prelude.rs b/src/internal_events/prelude.rs
index 8da12ce4b824e..e01bab6933b9f 100644
--- a/src/internal_events/prelude.rs
+++ b/src/internal_events/prelude.rs
@@ -5,7 +5,7 @@
     feature = "sources-utils-http",
 ))]
 pub(crate) fn http_error_code(code: u16) -> String {
-    format!("http_response_{}", code)
+    format!("http_response_{code}")
 }
 
 pub(crate) fn io_error_code(error: &std::io::Error) -> &'static str {
diff --git a/src/internal_events/template.rs b/src/internal_events/template.rs
index c7b42b1b10363..610acf9e7a166 100644
--- a/src/internal_events/template.rs
+++ b/src/internal_events/template.rs
@@ -13,7 +13,7 @@ impl InternalEvent for TemplateRenderingError<'_> {
         let mut msg = "Failed to render template".to_owned();
         if let Some(field) = self.field {
             use std::fmt::Write;
-            _ = write!(msg, " for \"{}\"", field);
+            _ = write!(msg, " for \"{field}\"");
         }
         msg.push('.');
 
diff --git a/src/internal_telemetry/allocations/allocator/stack.rs b/src/internal_telemetry/allocations/allocator/stack.rs
index 5479654501fe7..2ac8bab15410a 100644
--- a/src/internal_telemetry/allocations/allocator/stack.rs
+++ b/src/internal_telemetry/allocations/allocator/stack.rs
@@ -33,7 +33,7 @@ impl<const N: usize> GroupStack<N> {
     pub fn push(&mut self, group: AllocationGroupId) {
         self.current_top += 1;
         if self.current_top >= self.slots.len() {
-            panic!("tried to push new allocation group to the current stack, but hit the limit of {} entries", N);
+            panic!("tried to push new allocation group to the current stack, but hit the limit of {N} entries");
         }
         self.slots[self.current_top] = group;
     }
diff --git a/src/lib.rs b/src/lib.rs
index 59f91992a1f87..cc2bb8b59ae54 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -187,12 +187,12 @@ pub fn get_version() -> String {
     // or full debug symbols. See the Cargo Book profiling section for value meaning:
     // https://doc.rust-lang.org/cargo/reference/profiles.html#debug
     let build_string = match built_info::DEBUG {
-        "1" => format!("{} debug=line", build_string),
-        "2" | "true" => format!("{} debug=full", build_string),
+        "1" => format!("{build_string} debug=line"),
+        "2" | "true" => format!("{build_string} debug=full"),
         _ => build_string,
     };
 
-    format!("{} ({})", pkg_version, build_string)
+    format!("{pkg_version} ({build_string})")
 }
 
 /// Includes information about the current build.
diff --git a/src/line_agg.rs b/src/line_agg.rs
index 35d37a4fb60b1..7777071329bfa 100644
--- a/src/line_agg.rs
+++ b/src/line_agg.rs
@@ -749,7 +749,7 @@ mod tests {
             "START msg 1".to_string(), // will be stashed
         ];
         for i in 0..n {
-            lines.push(format!("line {}", i));
+            lines.push(format!("line {i}"));
         }
         let config = Config {
             start_pattern: Regex::new("").unwrap(),
@@ -760,7 +760,7 @@ mod tests {
 
         let mut expected = "START msg 1".to_string();
         for i in 0..n {
-            write!(expected, "\nline {}", i).expect("write to String never fails");
+            write!(expected, "\nline {i}").expect("write to String never fails");
         }
 
         let (mut send, recv) = futures::channel::mpsc::unbounded();
diff --git a/src/list.rs b/src/list.rs
index 566b07215d486..3cedbc91a9d0f 100644
--- a/src/list.rs
+++ b/src/list.rs
@@ -40,22 +40,22 @@ pub fn cmd(opts: &Opts) -> exitcode::ExitCode {
         Format::Text => {
             println!("Sources:");
             for name in sources {
-                println!("- {}", name);
+                println!("- {name}");
             }
 
             println!("\nTransforms:");
             for name in transforms {
-                println!("- {}", name);
+                println!("- {name}");
             }
 
             println!("\nSinks:");
             for name in sinks {
-                println!("- {}", name);
+                println!("- {name}");
             }
 
             println!("\nEnrichment tables:");
             for name in enrichment_tables {
-                println!("- {}", name);
+                println!("- {name}");
             }
         }
         Format::Json => {
diff --git a/src/nats.rs b/src/nats.rs
index 93a0a765ede55..5048cc3836315 100644
--- a/src/nats.rs
+++ b/src/nats.rs
@@ -65,7 +65,7 @@ impl std::fmt::Display for NatsAuthConfig {
             CredentialsFile { .. } => "credentials_file",
             Nkey { .. } => "nkey",
         };
-        write!(f, "{}", word)
+        write!(f, "{word}")
     }
 }
 
diff --git a/src/secrets/directory.rs b/src/secrets/directory.rs
index e9ebaebbdd771..8170c208fd125 100644
--- a/src/secrets/directory.rs
+++ b/src/secrets/directory.rs
@@ -43,7 +43,7 @@ impl SecretBackend for DirectoryBackend {
                 &contents
             };
             if secret.is_empty() {
-                return Err(format!("secret in file '{}' was empty", k).into());
+                return Err(format!("secret in file '{k}' was empty").into());
             }
             secrets.insert(k, secret.to_string());
         }
diff --git a/src/secrets/exec.rs b/src/secrets/exec.rs
index 485a5038b690d..29fb2c1585075 100644
--- a/src/secrets/exec.rs
+++ b/src/secrets/exec.rs
@@ -76,18 +76,18 @@ impl SecretBackend for ExecBackend {
         for k in secret_keys.into_iter() {
             if let Some(secret) = output.get_mut(&k) {
                 if let Some(e) = &secret.error {
-                    return Err(format!("secret for key '{}' was not retrieved: {}", k, e).into());
+                    return Err(format!("secret for key '{k}' was not retrieved: {e}").into());
                 }
                 if let Some(v) = secret.value.take() {
                     if v.is_empty() {
-                        return Err(format!("secret for key '{}' was empty", k).into());
+                        return Err(format!("secret for key '{k}' was empty").into());
                     }
                     secrets.insert(k.to_string(), v);
                 } else {
-                    return Err(format!("secret for key '{}' was empty", k).into());
+                    return Err(format!("secret for key '{k}' was empty").into());
                 }
             } else {
-                return Err(format!("secret for key '{}' was not retrieved", k).into());
+                return Err(format!("secret for key '{k}' was not retrieved").into());
             }
         }
         Ok(secrets)
@@ -146,7 +146,7 @@ async fn query_backend(
                 match stdout {
                     None => break,
                     Some(Ok(b)) => output.extend(b),
-                    Some(Err(e)) => return Err(format!("Error while reading from an exec backend stdout: {}.", e).into()),
+                    Some(Err(e)) => return Err(format!("Error while reading from an exec backend stdout: {e}.").into()),
                 }
             }
             _ = &mut timeout => {
diff --git a/src/secrets/file.rs b/src/secrets/file.rs
index 221a293622cb6..c103385493791 100644
--- a/src/secrets/file.rs
+++ b/src/secrets/file.rs
@@ -34,11 +34,11 @@ impl SecretBackend for FileBackend {
         for k in secret_keys.into_iter() {
             if let Some(secret) = output.get(&k) {
                 if secret.is_empty() {
-                    return Err(format!("secret for key '{}' was empty", k).into());
+                    return Err(format!("secret for key '{k}' was empty").into());
                 }
                 secrets.insert(k, secret.to_string());
             } else {
-                return Err(format!("secret for key '{}' was not retrieved", k).into());
+                return Err(format!("secret for key '{k}' was not retrieved").into());
             }
         }
         Ok(secrets)
diff --git a/src/serde.rs b/src/serde.rs
index 6a0fd579cdd15..2bee11583e0ad 100644
--- a/src/serde.rs
+++ b/src/serde.rs
@@ -90,7 +90,7 @@ impl<V: 'static> Fields<V> {
                     FieldsOrValue::Value(v) => Box::new(std::iter::once((k, v))),
                     FieldsOrValue::Fields(f) => Box::new(
                         f.all_fields()
-                            .map(move |(nested_k, v)| (format!("{}.{}", k, nested_k), v)),
+                            .map(move |(nested_k, v)| (format!("{k}.{nested_k}"), v)),
                     ),
                 }
             })
diff --git a/src/sinks/amqp/encoder.rs b/src/sinks/amqp/encoder.rs
index 7529fa12b6ffa..3655ab3d933f1 100644
--- a/src/sinks/amqp/encoder.rs
+++ b/src/sinks/amqp/encoder.rs
@@ -26,7 +26,7 @@ impl encoding::Encoder<Event> for AmqpEncoder {
         let mut encoder = self.encoder.clone();
         encoder
             .encode(input, &mut body)
-            .map_err(|_| io::Error::new(io::ErrorKind::Other, "unable to encode"))?;
+            .map_err(|_| io::Error::other("unable to encode"))?;
 
         let body = body.freeze();
         write_all(writer, 1, body.as_ref())?;
diff --git a/src/sinks/amqp/integration_tests.rs b/src/sinks/amqp/integration_tests.rs
index c974dbccb87cc..be30e93a6a37b 100644
--- a/src/sinks/amqp/integration_tests.rs
+++ b/src/sinks/amqp/integration_tests.rs
@@ -25,8 +25,7 @@ pub fn make_config() -> AmqpSinkConfig {
     let pass = std::env::var("AMQP_PASSWORD").unwrap_or_else(|_| "guest".to_string());
     let host = std::env::var("AMQP_HOST").unwrap_or_else(|_| "rabbitmq".to_string());
     let vhost = std::env::var("AMQP_VHOST").unwrap_or_else(|_| "%2f".to_string());
-    config.connection.connection_string =
-        format!("amqp://{}:{}@{}:5672/{}", user, pass, host, vhost);
+    config.connection.connection_string = format!("amqp://{user}:{pass}@{host}:5672/{vhost}");
     config
 }
 
diff --git a/src/sinks/appsignal/config.rs b/src/sinks/appsignal/config.rs
index 71d9edc98537d..0ba840c303da6 100644
--- a/src/sinks/appsignal/config.rs
+++ b/src/sinks/appsignal/config.rs
@@ -146,7 +146,7 @@ impl SinkConfig for AppsignalConfig {
 }
 
 async fn healthcheck(uri: Uri, push_api_key: String, client: HttpClient) -> crate::Result<()> {
-    let request = Request::get(uri).header(AUTHORIZATION, format!("Bearer {}", push_api_key));
+    let request = Request::get(uri).header(AUTHORIZATION, format!("Bearer {push_api_key}"));
     let response = client.send(request.body(Body::empty()).unwrap()).await?;
 
     match response.status() {
diff --git a/src/sinks/appsignal/encoder.rs b/src/sinks/appsignal/encoder.rs
index 2a3ff5ead28b7..ccd20415acd86 100644
--- a/src/sinks/appsignal/encoder.rs
+++ b/src/sinks/appsignal/encoder.rs
@@ -29,12 +29,9 @@ impl Encoder<Vec<Event>> for AppsignalEncoder {
                 Event::Log(log) => json!({ "log": log }),
                 Event::Metric(metric) => json!({ "metric": metric }),
                 _ => {
-                    return Err(std::io::Error::new(
-                        std::io::ErrorKind::Other,
-                        format!(
-                            "The AppSignal sink does not support this type of event: {event:?}"
-                        ),
-                    ))
+                    return Err(std::io::Error::other(format!(
+                        "The AppSignal sink does not support this type of event: {event:?}"
+                    )))
                 }
             };
             if let Value::Array(ref mut array) = result {
diff --git a/src/sinks/appsignal/integration_tests.rs b/src/sinks/appsignal/integration_tests.rs
index 773d9fb6eae8e..6509b805c6cde 100644
--- a/src/sinks/appsignal/integration_tests.rs
+++ b/src/sinks/appsignal/integration_tests.rs
@@ -29,7 +29,7 @@ async fn start_test(events: Vec<Event>) -> (Vec<Event>, Receiver<(http::request:
     let (mut config, cx) = load_sink::<AppsignalConfig>(config.as_str()).unwrap();
     let addr = next_addr();
     // Set the endpoint to a local server so we can fetch the sent events later
-    config.endpoint = format!("http://{}", addr);
+    config.endpoint = format!("http://{addr}");
 
     let (sink, _) = config.build(cx).await.unwrap();
 
@@ -57,7 +57,7 @@ async fn logs_real_endpoint() {
 
     let (sink, _) = config.build(cx).await.unwrap();
     let (batch, receiver) = BatchNotifier::new_with_receiver();
-    let generator = |index| format!("this is a log with index {}", index);
+    let generator = |index| format!("this is a log with index {index}");
     let (_, events) = generate_lines_with_stream(generator, 10, Some(batch));
 
     run_and_assert_sink_compliance(sink, events, &HTTP_SINK_TAGS).await;
@@ -101,14 +101,14 @@ async fn metrics_shape() {
         .flat_map(|index| {
             vec![
                 Event::Metric(Metric::new(
-                    format!("counter_{}", index),
+                    format!("counter_{index}"),
                     MetricKind::Absolute,
                     MetricValue::Counter {
                         value: index as f64,
                     },
                 )),
                 Event::Metric(Metric::new(
-                    format!("counter_{}", index),
+                    format!("counter_{index}"),
                     MetricKind::Absolute,
                     MetricValue::Counter {
                         value: (index + index) as f64,
diff --git a/src/sinks/aws_cloudwatch_logs/config.rs b/src/sinks/aws_cloudwatch_logs/config.rs
index db7e1d5d4da7a..c0f3afcb0e5ee 100644
--- a/src/sinks/aws_cloudwatch_logs/config.rs
+++ b/src/sinks/aws_cloudwatch_logs/config.rs
@@ -68,7 +68,7 @@ where
     if ALLOWED_VALUES.contains(&days) {
         Ok(days)
     } else {
-        let msg = format!("one of allowed values: {:?}", ALLOWED_VALUES).to_owned();
+        let msg = format!("one of allowed values: {ALLOWED_VALUES:?}").to_owned();
         let expected: &str = &msg[..];
         Err(de::Error::invalid_value(
             de::Unexpected::Signed(days.into()),
diff --git a/src/sinks/aws_cloudwatch_logs/integration_tests.rs b/src/sinks/aws_cloudwatch_logs/integration_tests.rs
index 437408e51f3ea..b365de7d812c1 100644
--- a/src/sinks/aws_cloudwatch_logs/integration_tests.rs
+++ b/src/sinks/aws_cloudwatch_logs/integration_tests.rs
@@ -459,7 +459,7 @@ async fn cloudwatch_insert_log_event_partitioned() {
     let stream_name = gen_name();
     let config = CloudwatchLogsSinkConfig {
         group_name: Template::try_from(GROUP_NAME).unwrap(),
-        stream_name: Template::try_from(format!("{}-{{{{key}}}}", stream_name)).unwrap(),
+        stream_name: Template::try_from(format!("{stream_name}-{{{{key}}}}")).unwrap(),
         region: RegionOrEndpoint::with_both("us-east-1", cloudwatch_address().as_str()),
         encoding: TextSerializerConfig::default().into(),
         create_missing_group: true,
@@ -498,7 +498,7 @@ async fn cloudwatch_insert_log_event_partitioned() {
     let response = create_client_test()
         .await
         .get_log_events()
-        .log_stream_name(format!("{}-0", stream_name))
+        .log_stream_name(format!("{stream_name}-0"))
         .log_group_name(GROUP_NAME)
         .start_time(timestamp.timestamp_millis())
         .send()
@@ -522,7 +522,7 @@ async fn cloudwatch_insert_log_event_partitioned() {
     let response = create_client_test()
         .await
         .get_log_events()
-        .log_stream_name(format!("{}-1", stream_name))
+        .log_stream_name(format!("{stream_name}-1"))
         .log_group_name(GROUP_NAME)
         .start_time(timestamp.timestamp_millis())
         .send()
diff --git a/src/sinks/aws_cloudwatch_logs/service.rs b/src/sinks/aws_cloudwatch_logs/service.rs
index 371a439199057..52f50678bbd35 100644
--- a/src/sinks/aws_cloudwatch_logs/service.rs
+++ b/src/sinks/aws_cloudwatch_logs/service.rs
@@ -73,19 +73,19 @@ pub enum CloudwatchError {
 impl fmt::Display for CloudwatchError {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         match self {
-            CloudwatchError::Put(error) => write!(f, "CloudwatchError::Put: {}", error),
+            CloudwatchError::Put(error) => write!(f, "CloudwatchError::Put: {error}"),
             CloudwatchError::DescribeLogStreams(error) => {
-                write!(f, "CloudwatchError::DescribeLogStreams: {}", error)
+                write!(f, "CloudwatchError::DescribeLogStreams: {error}")
             }
             CloudwatchError::CreateStream(error) => {
-                write!(f, "CloudwatchError::CreateStream: {}", error)
+                write!(f, "CloudwatchError::CreateStream: {error}")
             }
             CloudwatchError::CreateGroup(error) => {
-                write!(f, "CloudwatchError::CreateGroup: {}", error)
+                write!(f, "CloudwatchError::CreateGroup: {error}")
             }
             CloudwatchError::NoStreamsFound => write!(f, "CloudwatchError: No Streams Found"),
             CloudwatchError::PutRetentionPolicy(error) => {
-                write!(f, "CloudwatchError::PutRetentionPolicy: {}", error)
+                write!(f, "CloudwatchError::PutRetentionPolicy: {error}")
             }
         }
     }
diff --git a/src/sinks/aws_cloudwatch_metrics/integration_tests.rs b/src/sinks/aws_cloudwatch_metrics/integration_tests.rs
index 5d3bf9a253f38..c904c527cd6a7 100644
--- a/src/sinks/aws_cloudwatch_metrics/integration_tests.rs
+++ b/src/sinks/aws_cloudwatch_metrics/integration_tests.rs
@@ -61,7 +61,7 @@ async fn cloudwatch_metrics_put_data() {
     let gauge_name = random_string(10);
     for i in 0..10 {
         let event = Event::Metric(Metric::new(
-            format!("gauge-{}", gauge_name),
+            format!("gauge-{gauge_name}"),
             MetricKind::Absolute,
             MetricValue::Gauge { value: i as f64 },
         ));
@@ -72,7 +72,7 @@ async fn cloudwatch_metrics_put_data() {
     for i in 0..10 {
         let event = Event::Metric(
             Metric::new(
-                format!("distribution-{}", distribution_name),
+                format!("distribution-{distribution_name}"),
                 MetricKind::Incremental,
                 MetricValue::Distribution {
                     samples: vector_lib::samples![i as f64 => 100],
diff --git a/src/sinks/aws_kinesis/firehose/integration_tests.rs b/src/sinks/aws_kinesis/firehose/integration_tests.rs
index e70cc9cdc1362..e0a452c2a5ec5 100644
--- a/src/sinks/aws_kinesis/firehose/integration_tests.rs
+++ b/src/sinks/aws_kinesis/firehose/integration_tests.rs
@@ -299,7 +299,7 @@ async fn ensure_elasticsearch_domain(domain_name: String) -> String {
         .await
     {
         Ok(res) => res.domain_status.expect("no domain status").arn,
-        Err(error) => panic!("Unable to create the Elasticsearch domain {:?}", error),
+        Err(error) => panic!("Unable to create the Elasticsearch domain {error:?}"),
     };
 
     // wait for ES to be available; it starts up when the ES domain is created
@@ -347,7 +347,7 @@ async fn ensure_elasticsearch_delivery_stream(
         .await
     {
         Ok(_) => (),
-        Err(error) => panic!("Unable to create the delivery stream {:?}", error),
+        Err(error) => panic!("Unable to create the delivery stream {error:?}"),
     };
 }
 
diff --git a/src/sinks/aws_kinesis/streams/integration_tests.rs b/src/sinks/aws_kinesis/streams/integration_tests.rs
index 562f5d6b2f013..c46045dd9f83d 100644
--- a/src/sinks/aws_kinesis/streams/integration_tests.rs
+++ b/src/sinks/aws_kinesis/streams/integration_tests.rs
@@ -200,7 +200,7 @@ async fn ensure_stream(stream_name: String) {
         .await
     {
         Ok(_) => (),
-        Err(error) => panic!("Unable to check the stream {:?}", error),
+        Err(error) => panic!("Unable to check the stream {error:?}"),
     };
 
     // Wait for localstack to persist stream, otherwise it returns ResourceNotFound errors
diff --git a/src/sinks/aws_s3/integration_tests.rs b/src/sinks/aws_s3/integration_tests.rs
index 8d53d6eca6f9e..1815f5bde2933 100644
--- a/src/sinks/aws_s3/integration_tests.rs
+++ b/src/sinks/aws_s3/integration_tests.rs
@@ -561,9 +561,9 @@ async fn create_bucket(bucket: &str, object_lock_enabled: bool) {
         Err(err) => match err {
             SdkError::ServiceError(inner) => match &inner.err() {
                 CreateBucketError::BucketAlreadyOwnedByYou(_) => {}
-                err => panic!("Failed to create bucket: {:?}", err),
+                err => panic!("Failed to create bucket: {err:?}"),
             },
-            err => panic!("Failed to create bucket: {:?}", err),
+            err => panic!("Failed to create bucket: {err:?}"),
         },
     }
 }
diff --git a/src/sinks/aws_s3/sink.rs b/src/sinks/aws_s3/sink.rs
index 0443f377a55e6..aee79d00f18aa 100644
--- a/src/sinks/aws_s3/sink.rs
+++ b/src/sinks/aws_s3/sink.rs
@@ -82,13 +82,15 @@ impl RequestBuilder<(S3PartitionKey, Vec<Event>)> for S3RequestOptions {
                     .with_timezone(&offset)
                     .format(self.filename_time_format.as_str()),
                 None => Utc::now()
-                    .with_timezone(&chrono::Utc)
+                    .with_timezone(&Utc)
                     .format(self.filename_time_format.as_str()),
             };
 
-            self.filename_append_uuid
-                .then(|| format!("{}-{}", formatted_ts, Uuid::new_v4().hyphenated()))
-                .unwrap_or_else(|| formatted_ts.to_string())
+            if self.filename_append_uuid {
+                format!("{formatted_ts}-{}", Uuid::new_v4().hyphenated())
+            } else {
+                formatted_ts.to_string()
+            }
         };
 
         let ssekms_key_id = s3metadata.partition_key.ssekms_key_id.clone();
@@ -116,9 +118,9 @@ impl RequestBuilder<(S3PartitionKey, Vec<Event>)> for S3RequestOptions {
 
 fn format_s3_key(s3_key: &str, filename: &str, extension: &str) -> String {
     if extension.is_empty() {
-        format!("{}{}", s3_key, filename)
+        format!("{s3_key}{filename}")
     } else {
-        format!("{}{}.{}", s3_key, filename, extension)
+        format!("{s3_key}{filename}.{extension}")
     }
 }
 
diff --git a/src/sinks/axiom.rs b/src/sinks/axiom.rs
index 5d4cf96076ab3..6958f2cc137d2 100644
--- a/src/sinks/axiom.rs
+++ b/src/sinks/axiom.rs
@@ -267,16 +267,15 @@ mod integration_tests {
 
         let query_req = QueryRequest {
             apl: format!(
-                "['{}'] | where test_id == '{}' | order by _time desc | limit 2",
-                dataset, test_id
+                "['{dataset}'] | where test_id == '{test_id}' | order by _time desc | limit 2"
             ),
             start_time: Utc::now() - Duration::minutes(10),
             end_time: Utc::now() + Duration::minutes(10),
         };
         let query_res: QueryResponse = client
-            .post(format!("{}/v1/datasets/_apl?format=legacy", url))
+            .post(format!("{url}/v1/datasets/_apl?format=legacy"))
             .header("X-Axiom-Org-Id", org_id)
-            .header("Authorization", format!("Bearer {}", token))
+            .header("Authorization", format!("Bearer {token}"))
             .json(&query_req)
             .send()
             .await
diff --git a/src/sinks/azure_blob/integration_tests.rs b/src/sinks/azure_blob/integration_tests.rs
index 0530e2fbab85e..7318452ff0685 100644
--- a/src/sinks/azure_blob/integration_tests.rs
+++ b/src/sinks/azure_blob/integration_tests.rs
@@ -223,7 +223,7 @@ impl AzureBlobSinkConfig {
     pub async fn new_emulator() -> AzureBlobSinkConfig {
         let address = std::env::var("AZURE_ADDRESS").unwrap_or_else(|_| "localhost".into());
         let config = AzureBlobSinkConfig {
-                connection_string: Some(format!("UseDevelopmentStorage=true;DefaultEndpointsProtocol=http;AccountName=devstoreaccount1;AccountKey=Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==;BlobEndpoint=http://{}:10000/devstoreaccount1;QueueEndpoint=http://{}:10001/devstoreaccount1;TableEndpoint=http://{}:10002/devstoreaccount1;", address, address, address).into()),
+                connection_string: Some(format!("UseDevelopmentStorage=true;DefaultEndpointsProtocol=http;AccountName=devstoreaccount1;AccountKey=Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==;BlobEndpoint=http://{address}:10000/devstoreaccount1;QueueEndpoint=http://{address}:10001/devstoreaccount1;TableEndpoint=http://{address}:10002/devstoreaccount1;").into()),
                 storage_account: None,
                 container_name: "logs".to_string(),
                 endpoint: None,
@@ -347,7 +347,7 @@ impl AzureBlobSinkConfig {
                     Ok(StatusCode::CONFLICT) => Ok(()),
                     _ => Err(format!("Unexpected status code {}", err.status())),
                 },
-                _ => Err(format!("Unexpected error {}", reason)),
+                _ => Err(format!("Unexpected error {reason}")),
             },
         };
 
diff --git a/src/sinks/azure_blob/request_builder.rs b/src/sinks/azure_blob/request_builder.rs
index 507874ab406f1..1e674b41795f6 100644
--- a/src/sinks/azure_blob/request_builder.rs
+++ b/src/sinks/azure_blob/request_builder.rs
@@ -66,12 +66,11 @@ impl RequestBuilder<(String, Vec<Event>)> for AzureBlobRequestOptions {
         request_metadata: RequestMetadata,
         payload: EncodeResult<Self::Payload>,
     ) -> Self::Request {
-        let blob_name = {
-            let formatted_ts = Utc::now().format(self.blob_time_format.as_str());
-
-            self.blob_append_uuid
-                .then(|| format!("{}-{}", formatted_ts, Uuid::new_v4().hyphenated()))
-                .unwrap_or_else(|| formatted_ts.to_string())
+        let formatted_ts = Utc::now().format(self.blob_time_format.as_str());
+        let blob_name = if self.blob_append_uuid {
+            format!("{formatted_ts}-{}", Uuid::new_v4().hyphenated())
+        } else {
+            formatted_ts.to_string()
         };
 
         let extension = self.compression.extension();
diff --git a/src/sinks/azure_monitor_logs/service.rs b/src/sinks/azure_monitor_logs/service.rs
index b4ba4362c145f..4779a248bc75c 100644
--- a/src/sinks/azure_monitor_logs/service.rs
+++ b/src/sinks/azure_monitor_logs/service.rs
@@ -117,8 +117,7 @@ impl AzureMonitorLogsService {
 
             if log_type.len() > 100 || !LOG_TYPE_REGEX.is_match(log_type) {
                 return Err(format!(
-                "invalid log_type \"{}\": log type can only contain letters, numbers, and underscore (_), and may not exceed 100 characters",
-                log_type
+                "invalid log_type \"{log_type}\": log type can only contain letters, numbers, and underscore (_), and may not exceed 100 characters"
             ).into());
             }
             let log_type = HeaderValue::from_str(log_type)?;
diff --git a/src/sinks/clickhouse/integration_tests.rs b/src/sinks/clickhouse/integration_tests.rs
index 57aa0f4df9e07..a01e655be412d 100644
--- a/src/sinks/clickhouse/integration_tests.rs
+++ b/src/sinks/clickhouse/integration_tests.rs
@@ -199,16 +199,15 @@ async fn insert_events_unix_timestamps_toml_config() {
 
     let config: ClickhouseConfig = toml::from_str(&format!(
         r#"
-host = "{}"
-table = "{}"
+host = "{host}"
+table = "{table}"
 compression = "none"
 [request]
 retry_attempts = 1
 [batch]
 max_events = 1
 [encoding]
-timestamp_format = "unix""#,
-        host, table
+timestamp_format = "unix""#
     ))
     .unwrap();
 
@@ -375,20 +374,18 @@ async fn templated_table() {
 
     for (table, event, mut receiver) in table_events {
         let output = client.select_all(&table).await;
-        assert_eq!(1, output.rows, "table {} should have 1 row", table);
+        assert_eq!(1, output.rows, "table {table} should have 1 row");
 
         let expected = serde_json::to_value(event.into_log()).unwrap();
         assert_eq!(
             expected, output.data[0],
-            "table \"{}\"'s one row should have the correct data",
-            table
+            "table \"{table}\"'s one row should have the correct data"
         );
 
         assert_eq!(
             receiver.try_recv(),
             Ok(BatchStatus::Delivered),
-            "table \"{}\"'s event should have been delivered",
-            table
+            "table \"{table}\"'s event should have been delivered"
         );
     }
 }
@@ -418,11 +415,10 @@ impl ClickhouseClient {
             .client
             .post(&self.host)
             .body(format!(
-                "CREATE TABLE {}
-                    ({})
+                "CREATE TABLE {table}
+                    ({schema})
                     ENGINE = MergeTree()
-                    ORDER BY (host, timestamp);",
-                table, schema
+                    ORDER BY (host, timestamp);"
             ))
             .send()
             .await
@@ -437,7 +433,7 @@ impl ClickhouseClient {
         let response = self
             .client
             .post(&self.host)
-            .body(format!("SELECT * FROM {} FORMAT JSON", table))
+            .body(format!("SELECT * FROM {table} FORMAT JSON"))
             .send()
             .await
             .unwrap();
@@ -448,7 +444,7 @@ impl ClickhouseClient {
             let text = response.text().await.unwrap();
             match serde_json::from_str(&text) {
                 Ok(value) => value,
-                Err(_) => panic!("json failed: {:?}", text),
+                Err(_) => panic!("json failed: {text:?}"),
             }
         }
     }
diff --git a/src/sinks/databend/config.rs b/src/sinks/databend/config.rs
index 62b776ba6a3cd..4c4c4566ceafd 100644
--- a/src/sinks/databend/config.rs
+++ b/src/sinks/databend/config.rs
@@ -113,13 +113,13 @@ impl SinkConfig for DatabendConfig {
         let endpoint = match self.endpoint.uri.scheme().map(|s| s.as_str()) {
             Some("databend") => self.endpoint.to_string(),
             // for backward compatibility, build DSN from endpoint
-            Some("http") => format!("databend://{}/?sslmode=disable", authority),
-            Some("https") => format!("databend://{}", authority),
+            Some("http") => format!("databend://{authority}/?sslmode=disable"),
+            Some("https") => format!("databend://{authority}"),
             None => {
                 return Err("Missing scheme for Databend endpoint. Expected `databend`.".into());
             }
             Some(s) => {
-                return Err(format!("Unsupported scheme for Databend endpoint: {}", s).into());
+                return Err(format!("Unsupported scheme for Databend endpoint: {s}").into());
             }
         };
         let mut endpoint = url::Url::parse(&endpoint)?;
@@ -136,7 +136,7 @@ impl SinkConfig for DatabendConfig {
             _ => {}
         }
         if let Some(database) = &self.database {
-            endpoint.set_path(&format!("/{}", database));
+            endpoint.set_path(&format!("/{database}"));
         }
         let endpoint = endpoint.to_string();
         let health_client = DatabendAPIClient::new(&endpoint, Some(ua.clone())).await?;
diff --git a/src/sinks/databend/integration_tests.rs b/src/sinks/databend/integration_tests.rs
index 1a5284eb6bf2e..8bbf469aff364 100644
--- a/src/sinks/databend/integration_tests.rs
+++ b/src/sinks/databend/integration_tests.rs
@@ -43,11 +43,10 @@ async fn prepare_config(
 
     let mut cfg = format!(
         r#"
-            endpoint = "{}"
-            table = "{}"
+            endpoint = "{endpoint}"
+            table = "{table}"
             batch.max_events = 1
         "#,
-        endpoint, table,
     );
     match codec {
         "json" => {
@@ -93,10 +92,8 @@ async fn prepare_config(
 }
 
 async fn insert_event_with_cfg(cfg: String, table: String, client: Arc<DatabendAPIClient>) {
-    let create_table_sql = format!(
-        "create table `{}` (host String, timestamp String, message String)",
-        table
-    );
+    let create_table_sql =
+        format!("create table `{table}` (host String, timestamp String, message String)");
     client.query_all(&create_table_sql).await.unwrap();
 
     let (config, _) = load_sink::<DatabendConfig>(&cfg).unwrap();
@@ -110,7 +107,7 @@ async fn insert_event_with_cfg(cfg: String, table: String, client: Arc<DatabendA
     )
     .await;
 
-    let select_all_sql = format!("select * from `{}`", table);
+    let select_all_sql = format!("select * from `{table}`");
     let resp = client.query_all(&select_all_sql).await.unwrap();
     assert_eq!(1, resp.data.len());
 
diff --git a/src/sinks/datadog/events/tests.rs b/src/sinks/datadog/events/tests.rs
index b15ce6c68bdf8..d19e5e87a2443 100644
--- a/src/sinks/datadog/events/tests.rs
+++ b/src/sinks/datadog/events/tests.rs
@@ -52,7 +52,7 @@ async fn start_test(
     let addr = next_addr();
     // Swap out the endpoint so we can force send it
     // to our local server
-    let endpoint = format!("http://{}", addr);
+    let endpoint = format!("http://{addr}");
     config.dd_common.endpoint = Some(endpoint.clone());
 
     let (sink, _) = config.build(cx).await.unwrap();
@@ -117,7 +117,7 @@ async fn api_key_in_metadata() {
     let addr = next_addr();
     // Swap out the endpoint so we can force send it
     // to our local server
-    let endpoint = format!("http://{}", addr);
+    let endpoint = format!("http://{addr}");
     config.dd_common.endpoint = Some(endpoint.clone());
 
     let (sink, _) = config.build(cx).await.unwrap();
diff --git a/src/sinks/datadog/logs/config.rs b/src/sinks/datadog/logs/config.rs
index afe69ccf41a73..c848e377ec896 100644
--- a/src/sinks/datadog/logs/config.rs
+++ b/src/sinks/datadog/logs/config.rs
@@ -93,7 +93,7 @@ impl DatadogLogsConfig {
             .clone()
             .unwrap_or_else(|| format!("https://http-intake.logs.{}", dd_common.site));
 
-        http::Uri::try_from(format!("{}/api/v2/logs", base_url)).expect("URI not valid")
+        http::Uri::try_from(format!("{base_url}/api/v2/logs")).expect("URI not valid")
     }
 
     pub fn get_protocol(&self, dd_common: &DatadogCommonConfig) -> String {
diff --git a/src/sinks/datadog/logs/integration_tests.rs b/src/sinks/datadog/logs/integration_tests.rs
index b5308ac926c62..56d5db161ed59 100644
--- a/src/sinks/datadog/logs/integration_tests.rs
+++ b/src/sinks/datadog/logs/integration_tests.rs
@@ -25,7 +25,7 @@ async fn to_real_v2_endpoint() {
 
     let (sink, _) = config.build(cx).await.unwrap();
     let (batch, receiver) = BatchNotifier::new_with_receiver();
-    let generator = |index| format!("this is a log with index {}", index);
+    let generator = |index| format!("this is a log with index {index}");
     let (_, events) = generate_lines_with_stream(generator, 10, Some(batch));
 
     run_and_assert_sink_compliance(sink, events, &SINK_TAGS).await;
diff --git a/src/sinks/datadog/logs/sink.rs b/src/sinks/datadog/logs/sink.rs
index f901f9f9bab7e..cff96f92fd3dc 100644
--- a/src/sinks/datadog/logs/sink.rs
+++ b/src/sinks/datadog/logs/sink.rs
@@ -194,7 +194,7 @@ pub fn position_reserved_attr_event_root(
         // if an existing attribute exists here already, move it so to not overwrite it.
         // yes, technically the rename path could exist, but technically that could always be the case.
         if log.contains(desired_path) {
-            let rename_attr = format!("_RESERVED_{}", meaning);
+            let rename_attr = format!("_RESERVED_{meaning}");
             let rename_path = event_path!(rename_attr.as_str());
             warn!(
                 message = "Semantic meaning is defined, but the event path already exists. Renaming to not overwrite.",
@@ -465,7 +465,7 @@ mod tests {
             "service",
             "status",
         ] {
-            assert!(log.contains(event_path!(attr)), "missing {}", attr);
+            assert!(log.contains(event_path!(attr)), "missing {attr}");
         }
 
         assert_eq!(
diff --git a/src/sinks/datadog/logs/tests.rs b/src/sinks/datadog/logs/tests.rs
index 67cc094bf89ab..987e27539da84 100644
--- a/src/sinks/datadog/logs/tests.rs
+++ b/src/sinks/datadog/logs/tests.rs
@@ -87,7 +87,7 @@ async fn start_test_detail(
     let addr = next_addr();
     // Swap out the endpoint so we can force send it
     // to our local server
-    let endpoint = format!("http://{}", addr);
+    let endpoint = format!("http://{addr}");
     config.local_dd_common.endpoint = Some(endpoint.clone());
 
     let (sink, _) = config.build(cx).await.unwrap();
@@ -242,7 +242,7 @@ async fn api_key_in_metadata_inner(api_status: ApiStatus) {
 
     let addr = next_addr();
     // Swap out the endpoint so we can force send it to our local server
-    let endpoint = format!("http://{}", addr);
+    let endpoint = format!("http://{addr}");
     config.local_dd_common.endpoint = Some(endpoint.clone());
 
     let (sink, _) = config.build(cx).await.unwrap();
@@ -254,7 +254,7 @@ async fn api_key_in_metadata_inner(api_status: ApiStatus) {
 
     let api_key = "0xDECAFBAD";
     let events = events.map(|mut e| {
-        println!("EVENT: {:?}", e);
+        println!("EVENT: {e:?}");
         e.iter_logs_mut().for_each(|log| {
             log.metadata_mut().set_datadog_api_key(Arc::from(api_key));
         });
@@ -322,7 +322,7 @@ async fn multiple_api_keys_inner(api_status: ApiStatus) {
     let addr = next_addr();
     // Swap out the endpoint so we can force send it
     // to our local server
-    let endpoint = format!("http://{}", addr);
+    let endpoint = format!("http://{addr}");
     config.local_dd_common.endpoint = Some(endpoint.clone());
 
     let (sink, _) = config.build(cx).await.unwrap();
@@ -375,7 +375,7 @@ async fn headers_inner(api_status: ApiStatus) {
 
     let addr = next_addr();
     // Swap out the endpoint so we can force send it to our local server
-    let endpoint = format!("http://{}", addr);
+    let endpoint = format!("http://{addr}");
     config.local_dd_common.endpoint = Some(endpoint.clone());
 
     let (sink, _) = config.build(cx).await.unwrap();
@@ -387,7 +387,7 @@ async fn headers_inner(api_status: ApiStatus) {
 
     let api_key = "0xDECAFBAD";
     let events = events.map(|mut e| {
-        println!("EVENT: {:?}", e);
+        println!("EVENT: {e:?}");
         e.iter_logs_mut().for_each(|log| {
             log.metadata_mut().set_datadog_api_key(Arc::from(api_key));
         });
@@ -445,7 +445,7 @@ async fn does_not_send_too_big_payloads() {
     .unwrap();
 
     let addr = next_addr();
-    let endpoint = format!("http://{}", addr);
+    let endpoint = format!("http://{addr}");
     config.local_dd_common.endpoint = Some(endpoint.clone());
 
     let (sink, _) = config.build(cx).await.unwrap();
@@ -478,7 +478,7 @@ async fn does_not_send_too_big_payloads() {
 
     assert!(!sizes.is_empty());
     for size in sizes {
-        assert!(size < 5_000_000, "{} not less than max", size);
+        assert!(size < 5_000_000, "{size} not less than max");
     }
 }
 
@@ -499,7 +499,7 @@ async fn global_options() {
     let addr = next_addr();
     // Swap out the endpoint so we can force send it
     // to our local server
-    let endpoint = format!("http://{}", addr);
+    let endpoint = format!("http://{addr}");
     config.local_dd_common.endpoint = Some(endpoint.clone());
 
     let (sink, _) = config.build(cx).await.unwrap();
@@ -545,7 +545,7 @@ async fn override_global_options() {
     let addr = next_addr();
     // Swap out the endpoint so we can force send it
     // to our local server
-    let endpoint = format!("http://{}", addr);
+    let endpoint = format!("http://{addr}");
     config.local_dd_common.endpoint = Some(endpoint.clone());
 
     let (sink, _) = config.build(cx).await.unwrap();
diff --git a/src/sinks/datadog/metrics/config.rs b/src/sinks/datadog/metrics/config.rs
index 61c1b87b0e1c2..53d59a0e801cc 100644
--- a/src/sinks/datadog/metrics/config.rs
+++ b/src/sinks/datadog/metrics/config.rs
@@ -289,7 +289,7 @@ impl DatadogMetricsConfig {
 }
 
 fn build_uri(host: &str, endpoint: &str) -> crate::Result<Uri> {
-    let result = format!("{}{}", host, endpoint)
+    let result = format!("{host}{endpoint}")
         .parse::<Uri>()
         .context(UriParseSnafu)?;
     Ok(result)
diff --git a/src/sinks/datadog/metrics/encoder.rs b/src/sinks/datadog/metrics/encoder.rs
index 9f0608df805be..95bf837f4aced 100644
--- a/src/sinks/datadog/metrics/encoder.rs
+++ b/src/sinks/datadog/metrics/encoder.rs
@@ -693,7 +693,7 @@ fn encode_tags(tags: &MetricTags) -> Vec<String> {
     let mut pairs: Vec<_> = tags
         .iter_all()
         .map(|(name, value)| match value {
-            Some(value) => format!("{}:{}", name, value),
+            Some(value) => format!("{name}:{value}"),
             None => name.into(),
         })
         .collect();
diff --git a/src/sinks/datadog/metrics/integration_tests.rs b/src/sinks/datadog/metrics/integration_tests.rs
index 443f16a9face7..02983a4d6ea36 100644
--- a/src/sinks/datadog/metrics/integration_tests.rs
+++ b/src/sinks/datadog/metrics/integration_tests.rs
@@ -123,7 +123,7 @@ async fn start_test(events: Vec<Event>) -> (Vec<Event>, Receiver<(http::request:
     let addr = next_addr();
     // Swap out the endpoint so we can force send it
     // to our local server
-    let endpoint = format!("http://{}", addr);
+    let endpoint = format!("http://{addr}");
     config.local_dd_common.endpoint = Some(endpoint.clone());
 
     let (sink, _) = config.build(cx).await.unwrap();
diff --git a/src/sinks/datadog/metrics/tests.rs b/src/sinks/datadog/metrics/tests.rs
index c1345f842ac78..12575badbe83a 100644
--- a/src/sinks/datadog/metrics/tests.rs
+++ b/src/sinks/datadog/metrics/tests.rs
@@ -31,7 +31,7 @@ async fn global_options() {
     let addr = next_addr();
     // Swap out the endpoint so we can force send it
     // to our local server
-    let endpoint = format!("http://{}", addr);
+    let endpoint = format!("http://{addr}");
     config.local_dd_common.endpoint = Some(endpoint.clone());
 
     let (sink, _) = config.build(cx).await.unwrap();
@@ -76,7 +76,7 @@ async fn override_global_options() {
     let addr = next_addr();
     // Swap out the endpoint so we can force send it
     // to our local server
-    let endpoint = format!("http://{}", addr);
+    let endpoint = format!("http://{addr}");
     config.local_dd_common.endpoint = Some(endpoint.clone());
 
     let (sink, _) = config.build(cx).await.unwrap();
diff --git a/src/sinks/datadog/traces/config.rs b/src/sinks/datadog/traces/config.rs
index fc8313f41f8b6..b94a07642290c 100644
--- a/src/sinks/datadog/traces/config.rs
+++ b/src/sinks/datadog/traces/config.rs
@@ -235,7 +235,7 @@ impl SinkConfig for DatadogTracesConfig {
 }
 
 fn build_uri(host: &str, endpoint: &str) -> crate::Result<Uri> {
-    let result = format!("{}{}", host, endpoint)
+    let result = format!("{host}{endpoint}")
         .parse::<Uri>()
         .context(UriParseSnafu)?;
     Ok(result)
diff --git a/src/sinks/datadog/traces/service.rs b/src/sinks/datadog/traces/service.rs
index b872dbf3e3397..d561263a72fa9 100644
--- a/src/sinks/datadog/traces/service.rs
+++ b/src/sinks/datadog/traces/service.rs
@@ -46,7 +46,7 @@ impl RetryLogic for TraceApiRetry {
                 format!("{}: {}", status, String::from_utf8_lossy(&response.body)).into(),
             ),
             _ if status.is_success() => RetryAction::Successful,
-            _ => RetryAction::DontRetry(format!("response status: {}", status).into()),
+            _ => RetryAction::DontRetry(format!("response status: {status}").into()),
         }
     }
 }
diff --git a/src/sinks/datadog/traces/tests.rs b/src/sinks/datadog/traces/tests.rs
index 8ae044628bfb4..673f0d2729a27 100644
--- a/src/sinks/datadog/traces/tests.rs
+++ b/src/sinks/datadog/traces/tests.rs
@@ -328,7 +328,7 @@ async fn global_options() {
     let addr = next_addr();
     // Swap out the endpoint so we can force send it
     // to our local server
-    let endpoint = format!("http://{}", addr);
+    let endpoint = format!("http://{addr}");
     config.local_dd_common.endpoint = Some(endpoint.clone());
 
     let (sink, _) = config.build(cx).await.unwrap();
@@ -372,7 +372,7 @@ async fn override_global_options() {
     let addr = next_addr();
     // Swap out the endpoint so we can force send it
     // to our local server
-    let endpoint = format!("http://{}", addr);
+    let endpoint = format!("http://{addr}");
     config.local_dd_common.endpoint = Some(endpoint.clone());
 
     let (sink, _) = config.build(cx).await.unwrap();
diff --git a/src/sinks/elasticsearch/common.rs b/src/sinks/elasticsearch/common.rs
index 22f9c91aada67..4da59a65ac0b7 100644
--- a/src/sinks/elasticsearch/common.rs
+++ b/src/sinks/elasticsearch/common.rs
@@ -225,7 +225,7 @@ impl ElasticsearchCommon {
     }
 
     fn check_endpoint(endpoint: &str) -> crate::Result<()> {
-        let uri = format!("{}/_test", endpoint);
+        let uri = format!("{endpoint}/_test");
         let uri = uri
             .parse::<Uri>()
             .with_context(|_| InvalidHostSnafu { host: endpoint })?;
@@ -393,7 +393,7 @@ async fn get_version(
         "/",
     )
     .await
-    .map_err(|error| format!("Failed to get Elasticsearch API version: {}", error))?;
+    .map_err(|error| format!("Failed to get Elasticsearch API version: {error}"))?;
 
     let (_, body) = response.into_parts();
     let mut body = body::aggregate(body).await?;
@@ -420,7 +420,7 @@ async fn get(
     client: HttpClient,
     path: &str,
 ) -> crate::Result<Response<Body>> {
-    let mut builder = Request::get(format!("{}{}", base_url, path));
+    let mut builder = Request::get(format!("{base_url}{path}"));
 
     for (header, value) in &request.headers {
         builder = builder.header(&header[..], &value[..]);
diff --git a/src/sinks/elasticsearch/integration_tests.rs b/src/sinks/elasticsearch/integration_tests.rs
index 697b915f99d1c..34f471e8f77c8 100644
--- a/src/sinks/elasticsearch/integration_tests.rs
+++ b/src/sinks/elasticsearch/integration_tests.rs
@@ -210,7 +210,7 @@ async fn structures_events_correctly() {
     flush(common).await.unwrap();
 
     let response = reqwest::Client::new()
-        .get(format!("{}/{}/_search", base_url, index))
+        .get(format!("{base_url}/{index}/_search"))
         .json(&json!({
             "query": { "query_string": { "query": "*" } }
         }))
@@ -680,7 +680,7 @@ async fn run_insert_tests_with_config(
 
     let client = create_http_client();
     let mut response = client
-        .get(format!("{}/{}/_search", base_url, index))
+        .get(format!("{base_url}/{index}/_search"))
         .basic_auth("elastic", Some("vector"))
         .json(&json!({
             "query": { "query_string": { "query": "*" } }
@@ -769,7 +769,7 @@ async fn run_insert_tests_with_multiple_endpoints(config: &ElasticsearchConfig)
     let mut total = 0;
     for base_url in base_urls {
         if let Ok(response) = client
-            .get(format!("{}/{}/_search", base_url, index))
+            .get(format!("{base_url}/{index}/_search"))
             .basic_auth("elastic", Some("vector"))
             .json(&json!({
                 "query": { "query_string": { "query": "*" } }
diff --git a/src/sinks/elasticsearch/mod.rs b/src/sinks/elasticsearch/mod.rs
index 696c8ecc20cd6..8f9042c9b41e4 100644
--- a/src/sinks/elasticsearch/mod.rs
+++ b/src/sinks/elasticsearch/mod.rs
@@ -122,7 +122,7 @@ impl TryFrom<&str> for BulkAction {
             "index" => Ok(BulkAction::Index),
             "create" => Ok(BulkAction::Create),
             "update" => Ok(BulkAction::Update),
-            _ => Err(format!("Invalid bulk action: {}", input)),
+            _ => Err(format!("Invalid bulk action: {input}")),
         }
     }
 }
@@ -161,7 +161,7 @@ impl TryFrom<&str> for VersionType {
             "internal" => Ok(VersionType::Internal),
             "external" | "external_gt" => Ok(VersionType::External),
             "external_gte" => Ok(VersionType::ExternalGte),
-            _ => Err(format!("Invalid versioning mode: {}", input)),
+            _ => Err(format!("Invalid versioning mode: {input}")),
         }
     }
 }
diff --git a/src/sinks/elasticsearch/retry.rs b/src/sinks/elasticsearch/retry.rs
index 76a48216d7bf1..7cf2e6c51f14a 100644
--- a/src/sinks/elasticsearch/retry.rs
+++ b/src/sinks/elasticsearch/retry.rs
@@ -17,10 +17,7 @@ struct EsResultResponse {
 impl EsResultResponse {
     fn parse(body: &str) -> Result<Self, String> {
         serde_json::from_str::<EsResultResponse>(body).map_err(|json_error| {
-            format!(
-                "some messages failed, could not parse response, error: {}",
-                json_error
-            )
+            format!("some messages failed, could not parse response, error: {json_error}")
         })
     }
 
@@ -45,7 +42,7 @@ impl EsResultResponse {
             .find_map(|item| item.result().error.as_ref())
         {
             Some(error) => format!("error type: {}, reason: {}", error.err_type, error.reason),
-            None => format!("error response: {}", body),
+            None => format!("error response: {body}"),
         }
     }
 }
@@ -115,7 +112,7 @@ impl RetryLogic for ElasticsearchRetryLogic {
             ),
             _ if status.is_client_error() => {
                 let body = String::from_utf8_lossy(response.http_response.body());
-                RetryAction::DontRetry(format!("client-side error, {}: {}", status, body).into())
+                RetryAction::DontRetry(format!("client-side error, {status}: {body}").into())
             }
             _ if status.is_success() => {
                 let body = String::from_utf8_lossy(response.http_response.body());
@@ -139,7 +136,7 @@ impl RetryLogic for ElasticsearchRetryLogic {
                                             status, error.err_type, error.reason
                                         )
                                     } else {
-                                        format!("partial error, status: {}", status)
+                                        format!("partial error, status: {status}")
                                     };
                                     return RetryAction::Retry(msg.into());
                                 }
@@ -153,7 +150,7 @@ impl RetryLogic for ElasticsearchRetryLogic {
                     RetryAction::Successful
                 }
             }
-            _ => RetryAction::DontRetry(format!("response status: {}", status).into()),
+            _ => RetryAction::DontRetry(format!("response status: {status}").into()),
         }
     }
 }
diff --git a/src/sinks/file/mod.rs b/src/sinks/file/mod.rs
index f07a4a907b86e..942da67905b3b 100644
--- a/src/sinks/file/mod.rs
+++ b/src/sinks/file/mod.rs
@@ -722,7 +722,7 @@ mod tests {
 
         let format = "%Y-%m-%d-%H-%M-%S";
         let mut template = directory.to_string_lossy().to_string();
-        template.push_str(&format!("/{}.log", format));
+        template.push_str(&format!("/{format}.log"));
 
         let config = FileSinkConfig {
             path: template.try_into().unwrap(),
diff --git a/src/sinks/gcp/pubsub.rs b/src/sinks/gcp/pubsub.rs
index d666a4f32a470..67c5a8bcfb3fd 100644
--- a/src/sinks/gcp/pubsub.rs
+++ b/src/sinks/gcp/pubsub.rs
@@ -367,7 +367,7 @@ mod integration_tests {
         trace_init();
 
         let (topic, _subscription) = create_topic_subscription().await;
-        let (sink, _healthcheck) = config_build(&format!("BREAK{}BREAK", topic)).await;
+        let (sink, _healthcheck) = config_build(&format!("BREAK{topic}BREAK")).await;
         // Explicitly skip healthcheck
 
         let (batch, mut receiver) = BatchNotifier::new_with_receiver();
@@ -381,7 +381,7 @@ mod integration_tests {
         trace_init();
 
         let (topic, _subscription) = create_topic_subscription().await;
-        let topic = format!("BAD{}", topic);
+        let topic = format!("BAD{topic}");
         let (_sink, healthcheck) = config_build(&topic).await;
         healthcheck.await.expect_err("Health check did not fail");
     }
@@ -389,14 +389,14 @@ mod integration_tests {
     async fn create_topic_subscription() -> (String, String) {
         let topic = format!("topic-{}", random_string(10));
         let subscription = format!("subscription-{}", random_string(10));
-        request(Method::PUT, &format!("topics/{}", topic), json!({}))
+        request(Method::PUT, &format!("topics/{topic}"), json!({}))
             .await
             .json::<Value>()
             .await
             .expect("Creating new topic failed");
         request(
             Method::PUT,
-            &format!("subscriptions/{}", subscription),
+            &format!("subscriptions/{subscription}"),
             json!({ "topic": format!("projects/{}/topics/{}", PROJECT, topic) }),
         )
         .await
@@ -413,13 +413,13 @@ mod integration_tests {
             .json(&json)
             .send()
             .await
-            .unwrap_or_else(|_| panic!("Sending {} request to {} failed", method, url))
+            .unwrap_or_else(|_| panic!("Sending {method} request to {url} failed"))
     }
 
     async fn pull_messages(subscription: &str, count: usize) -> PullResponse {
         request(
             Method::POST,
-            &format!("subscriptions/{}:pull", subscription),
+            &format!("subscriptions/{subscription}:pull"),
             json!({
                 "returnImmediately": true,
                 "maxMessages": count
diff --git a/src/sinks/gcp/stackdriver/logs/encoder.rs b/src/sinks/gcp/stackdriver/logs/encoder.rs
index f8dbdee3bec4d..82fa672f1d58e 100644
--- a/src/sinks/gcp/stackdriver/logs/encoder.rs
+++ b/src/sinks/gcp/stackdriver/logs/encoder.rs
@@ -144,10 +144,10 @@ impl StackdriverLogsEncoder {
         let log_id = self.log_id.render_string(event)?;
 
         Ok(match &self.log_name {
-            BillingAccount(acct) => format!("billingAccounts/{}/logs/{}", acct, log_id),
-            Folder(folder) => format!("folders/{}/logs/{}", folder, log_id),
-            Organization(org) => format!("organizations/{}/logs/{}", org, log_id),
-            Project(project) => format!("projects/{}/logs/{}", project, log_id),
+            BillingAccount(acct) => format!("billingAccounts/{acct}/logs/{log_id}"),
+            Folder(folder) => format!("folders/{folder}/logs/{log_id}"),
+            Organization(org) => format!("organizations/{org}/logs/{log_id}"),
+            Project(project) => format!("projects/{project}/logs/{log_id}"),
         })
     }
 }
diff --git a/src/sinks/gcp/stackdriver/logs/tests.rs b/src/sinks/gcp/stackdriver/logs/tests.rs
index 12b3c0ebb3049..55fa99709a6ce 100644
--- a/src/sinks/gcp/stackdriver/logs/tests.rs
+++ b/src/sinks/gcp/stackdriver/logs/tests.rs
@@ -208,9 +208,7 @@ fn severity_remaps_strings() {
         assert_eq!(
             remap_severity(s.into()),
             Value::Integer(n),
-            "remap_severity({:?}) != {}",
-            s,
-            n
+            "remap_severity({s:?}) != {n}"
         );
     }
 }
diff --git a/src/sinks/gcp_chronicle/chronicle_unstructured.rs b/src/sinks/gcp_chronicle/chronicle_unstructured.rs
index 537ce9dde6f68..8727e789c137b 100644
--- a/src/sinks/gcp_chronicle/chronicle_unstructured.rs
+++ b/src/sinks/gcp_chronicle/chronicle_unstructured.rs
@@ -788,13 +788,13 @@ mod integration_tests {
 
     async fn request(method: Method, path: &str, log_type: &str) -> Response {
         let address = std::env::var(ADDRESS_ENV_VAR).unwrap();
-        let url = format!("{}/{}", address, path);
+        let url = format!("{address}/{path}");
         Client::new()
             .request(method.clone(), &url)
             .query(&[("log_type", log_type)])
             .send()
             .await
-            .unwrap_or_else(|_| panic!("Sending {} request to {} failed", method, url))
+            .unwrap_or_else(|_| panic!("Sending {method} request to {url} failed"))
     }
 
     async fn pull_messages(log_type: &str) -> Vec<Log> {
diff --git a/src/sinks/gcs_common/config.rs b/src/sinks/gcs_common/config.rs
index 830083d9e55c4..7c88c3c0990f5 100644
--- a/src/sinks/gcs_common/config.rs
+++ b/src/sinks/gcs_common/config.rs
@@ -162,7 +162,7 @@ impl RetryLogic for GcsRetryLogic {
             }
             _ if status.is_server_error() => RetryAction::Retry(status.to_string().into()),
             _ if status.is_success() => RetryAction::Successful,
-            _ => RetryAction::DontRetry(format!("response status: {}", status).into()),
+            _ => RetryAction::DontRetry(format!("response status: {status}").into()),
         }
     }
 }
diff --git a/src/sinks/greptimedb/logs/http_request_builder.rs b/src/sinks/greptimedb/logs/http_request_builder.rs
index 37b5e807848ae..8f888ec4c0dd7 100644
--- a/src/sinks/greptimedb/logs/http_request_builder.rs
+++ b/src/sinks/greptimedb/logs/http_request_builder.rs
@@ -104,7 +104,7 @@ fn prepare_log_ingester_url(
     metadata: &PartitionKey,
     extra_params: &Option<HashMap<String, String>>,
 ) -> String {
-    let path = format!("{}/v1/events/logs", endpoint);
+    let path = format!("{endpoint}/v1/events/logs");
     let mut url = url::Url::parse(&path).unwrap();
     let mut url_builder = url.query_pairs_mut();
     url_builder
diff --git a/src/sinks/greptimedb/logs/integration_tests.rs b/src/sinks/greptimedb/logs/integration_tests.rs
index 55ac45684bffb..bd5c18e92e680 100644
--- a/src/sinks/greptimedb/logs/integration_tests.rs
+++ b/src/sinks/greptimedb/logs/integration_tests.rs
@@ -139,7 +139,7 @@ impl GreptimeClient {
 
 fn create_event(i: i32, base_time: DateTime<Utc>) -> Event {
     let mut event = LogEvent::default();
-    event.insert("message", format!("test message {}", i));
+    event.insert("message", format!("test message {i}"));
     event.insert("timestamp", base_time);
     event.insert("name", "test");
     event.insert("namespace", "default");
diff --git a/src/sinks/honeycomb/config.rs b/src/sinks/honeycomb/config.rs
index c149cbe99c2e2..414d698f5a368 100644
--- a/src/sinks/honeycomb/config.rs
+++ b/src/sinks/honeycomb/config.rs
@@ -190,10 +190,6 @@ async fn healthcheck(uri: Uri, api_key: SensitiveString, client: HttpClient) ->
     } else {
         let body = String::from_utf8_lossy(&body[..]);
 
-        Err(format!(
-            "Server returned unexpected error status: {} body: {}",
-            status, body
-        )
-        .into())
+        Err(format!("Server returned unexpected error status: {status} body: {body}").into())
     }
 }
diff --git a/src/sinks/http/encoder.rs b/src/sinks/http/encoder.rs
index f28b8028c0d36..a48c1c19151f2 100644
--- a/src/sinks/http/encoder.rs
+++ b/src/sinks/http/encoder.rs
@@ -68,7 +68,7 @@ impl SinkEncoder<Vec<Event>> for HttpEncoder {
 
             encoder
                 .encode(event, &mut body)
-                .map_err(|_| io::Error::new(io::ErrorKind::Other, "unable to encode event"))?;
+                .map_err(|_| io::Error::other("unable to encode event"))?;
         }
 
         match (self.encoder.serializer(), self.encoder.framer()) {
diff --git a/src/sinks/http/tests.rs b/src/sinks/http/tests.rs
index a70bc3d07f3e7..7d166a2d39095 100644
--- a/src/sinks/http/tests.rs
+++ b/src/sinks/http/tests.rs
@@ -778,7 +778,7 @@ where
         "gzip" => serde_json::from_reader(MultiGzDecoder::new(buf.reader())).unwrap(),
         "zstd" => serde_json::from_reader(zstd::Decoder::new(buf.reader()).unwrap()).unwrap(),
         "zlib" => serde_json::from_reader(ZlibDecoder::new(buf.reader())).unwrap(),
-        _ => panic!("undefined compression: {}", compression),
+        _ => panic!("undefined compression: {compression}"),
     }
 }
 
@@ -808,14 +808,12 @@ async fn build_sink(extra_config: &str) -> (std::net::SocketAddr, crate::sinks::
 
     let config = format!(
         r#"
-                uri = "http://{addr}/frames"
+                uri = "http://{in_addr}/frames"
                 compression = "gzip"
                 framing.method = "newline_delimited"
                 encoding.codec = "json"
-                {extras}
+                {extra_config}
             "#,
-        addr = in_addr,
-        extras = extra_config,
     );
     let config: HttpSinkConfig = toml::from_str(&config).unwrap();
 
diff --git a/src/sinks/humio/logs.rs b/src/sinks/humio/logs.rs
index ba6b00f066407..eee9b071e01b4 100644
--- a/src/sinks/humio/logs.rs
+++ b/src/sinks/humio/logs.rs
@@ -478,7 +478,7 @@ mod integration_tests {
             humio_address(),
             repository_name
         );
-        let search_query = format!(r#"message="{}""#, message);
+        let search_query = format!(r#"message="{message}""#);
 
         // events are not available to search API immediately
         // poll up 200 times for event to show up
@@ -499,10 +499,7 @@ mod integration_tests {
                 return logs[0].clone();
             }
         }
-        panic!(
-            "did not find event in Humio repository {} with message {}",
-            repository_name, message
-        );
+        panic!("did not find event in Humio repository {repository_name} with message {message}");
     }
 
     #[derive(Debug)]
diff --git a/src/sinks/humio/metrics.rs b/src/sinks/humio/metrics.rs
index b25527f573802..a4822a88118b0 100644
--- a/src/sinks/humio/metrics.rs
+++ b/src/sinks/humio/metrics.rs
@@ -284,7 +284,7 @@ mod tests {
         let addr = test_util::next_addr();
         // Swap out the endpoint so we can force send it
         // to our local server
-        config.endpoint = format!("http://{}", addr);
+        config.endpoint = format!("http://{addr}");
 
         let (sink, _) = config.build(cx).await.unwrap();
 
@@ -350,7 +350,7 @@ mod tests {
         let addr = test_util::next_addr();
         // Swap out the endpoint so we can force send it
         // to our local server
-        config.endpoint = format!("http://{}", addr);
+        config.endpoint = format!("http://{addr}");
 
         let (sink, _) = config.build(cx).await.unwrap();
 
diff --git a/src/sinks/influxdb/logs.rs b/src/sinks/influxdb/logs.rs
index 0939d5ff46148..7b4c33c014183 100644
--- a/src/sinks/influxdb/logs.rs
+++ b/src/sinks/influxdb/logs.rs
@@ -360,7 +360,7 @@ impl InfluxDbLogsConfig {
                        For example, you can use `measurement=<namespace>.vector` for the \
                        same effect."
                 );
-                Ok(format!("{}.vector", namespace))
+                Ok(format!("{namespace}.vector"))
             }
             (None, None) => Err("The `measurement` option is required."),
         }
@@ -765,7 +765,7 @@ mod tests {
         let addr = next_addr();
         // Swap out the host so we can force send it
         // to our local server
-        let host = format!("http://{}", addr);
+        let host = format!("http://{addr}");
         config.endpoint = host;
 
         let (sink, _) = config.build(cx).await.unwrap();
@@ -784,7 +784,7 @@ mod tests {
         // Create 5 events with custom field
         for (i, line) in lines.iter().enumerate() {
             let mut event = LogEvent::from(line.to_string()).with_batch_notifier(&batch);
-            event.insert(format!("key{}", i).as_str(), format!("value{}", i));
+            event.insert(format!("key{i}").as_str(), format!("value{i}"));
 
             let timestamp = Utc
                 .with_ymd_and_hms(1970, 1, 1, 0, 0, (i as u32) + 1)
@@ -831,7 +831,7 @@ mod tests {
         assert_fields(
             line_protocol.2.to_string(),
             [
-                &*format!("key{}=\"value{}\"", i, i),
+                &*format!("key{i}=\"value{i}\""),
                 "message=\"message_value\"",
             ]
             .to_vec(),
@@ -984,7 +984,7 @@ mod integration_tests {
             .unwrap();
 
         let res = client
-            .post(format!("{}/api/v2/query?org=my-org", endpoint))
+            .post(format!("{endpoint}/api/v2/query?org=my-org"))
             .json(&body)
             .header("accept", "application/json")
             .header("Authorization", "Token my-token")
diff --git a/src/sinks/influxdb/metrics.rs b/src/sinks/influxdb/metrics.rs
index 577d6470ae30c..4dcff26dac58a 100644
--- a/src/sinks/influxdb/metrics.rs
+++ b/src/sinks/influxdb/metrics.rs
@@ -219,7 +219,7 @@ fn create_build_request(
     token: &str,
 ) -> impl Fn(Bytes) -> BoxFuture<'static, crate::Result<hyper::Request<Bytes>>> + Sync + Send + 'static
 {
-    let auth = format!("Token {}", token);
+    let auth = format!("Token {token}");
     move |body| {
         Box::pin(ready(
             hyper::Request::post(uri.clone())
@@ -415,7 +415,7 @@ fn encode_distribution(samples: &[Sample], quantiles: &[f64]) -> Option<HashMap<
             statistic
                 .quantiles
                 .iter()
-                .map(|&(p, val)| (format!("quantile_{:.2}", p).into(), Field::Float(val))),
+                .map(|&(p, val)| (format!("quantile_{p:.2}").into(), Field::Float(val))),
         )
         .collect(),
     )
@@ -1003,7 +1003,7 @@ mod integration_tests {
         let (sink, _) = config.build(cx).await.expect("error when building config");
         run_and_assert_sink_compliance(sink, stream::iter(events.clone()), &HTTP_SINK_TAGS).await;
 
-        let res = query_v1_json(url, &format!("show series on {}", database)).await;
+        let res = query_v1_json(url, &format!("show series on {database}")).await;
 
         //
         // {"results":[{"statement_id":0,"series":[{"columns":["key"],"values":
@@ -1037,8 +1037,7 @@ mod integration_tests {
                 _ => unreachable!(),
             };
             let timestamp = format_timestamp(metric.timestamp().unwrap(), SecondsFormat::Nanos);
-            let res =
-                query_v1_json(url, &format!("select * from {}..\"{}\"", database, name)).await;
+            let res = query_v1_json(url, &format!("select * from {database}..\"{name}\"")).await;
 
             assert_eq!(
                 res,
@@ -1120,7 +1119,7 @@ mod integration_tests {
         run_and_assert_sink_compliance(sink, stream::iter(events), &HTTP_SINK_TAGS).await;
 
         let mut body = std::collections::HashMap::new();
-        body.insert("query", format!("from(bucket:\"my-bucket\") |> range(start: 0) |> filter(fn: (r) => r._measurement == \"ns.{}\")", metric));
+        body.insert("query", format!("from(bucket:\"my-bucket\") |> range(start: 0) |> filter(fn: (r) => r._measurement == \"ns.{metric}\")"));
         body.insert("type", "flux".to_owned());
 
         let client = reqwest::Client::builder()
@@ -1183,7 +1182,7 @@ mod integration_tests {
     fn create_event(i: i32) -> Event {
         Event::Metric(
             Metric::new(
-                format!("counter-{}", i),
+                format!("counter-{i}"),
                 MetricKind::Incremental,
                 MetricValue::Counter { value: i as f64 },
             )
diff --git a/src/sinks/influxdb/mod.rs b/src/sinks/influxdb/mod.rs
index 6ff952ec42180..2743658c64a29 100644
--- a/src/sinks/influxdb/mod.rs
+++ b/src/sinks/influxdb/mod.rs
@@ -416,9 +416,7 @@ pub mod test_util {
         for field in fields.into_iter() {
             assert!(
                 encoded_fields.contains(&field),
-                "Fields: {} has to have: {}",
-                value,
-                field
+                "Fields: {value} has to have: {field}"
             )
         }
     }
@@ -471,7 +469,7 @@ pub mod test_util {
 
     pub(crate) async fn query_v1(endpoint: &str, query: &str) -> reqwest::Response {
         client()
-            .get(format!("{}/query", endpoint))
+            .get(format!("{endpoint}/query"))
             .query(&[("q", query)])
             .send()
             .await
@@ -480,10 +478,10 @@ pub mod test_util {
 
     pub(crate) async fn onboarding_v1(endpoint: &str) -> String {
         let database = next_database();
-        let status = query_v1(endpoint, &format!("create database {}", database))
+        let status = query_v1(endpoint, &format!("create database {database}"))
             .await
             .status();
-        assert_eq!(status, http::StatusCode::OK, "UnexpectedStatus: {}", status);
+        assert_eq!(status, http::StatusCode::OK, "UnexpectedStatus: {status}");
         // Some times InfluxDB will return OK before it can actually
         // accept writes to the database, leading to test failures. Test
         // this with empty writes and loop if it reports the database
@@ -494,7 +492,7 @@ pub mod test_util {
                 match client()
                     .post(&write_url)
                     .header("Content-Type", "text/plain")
-                    .header("Authorization", &format!("Token {}", TOKEN))
+                    .header("Authorization", &format!("Token {TOKEN}"))
                     .body("")
                     .send()
                     .await
@@ -503,7 +501,7 @@ pub mod test_util {
                 {
                     http::StatusCode::NO_CONTENT => true,
                     http::StatusCode::NOT_FOUND => false,
-                    status => panic!("Unexpected status: {}", status),
+                    status => panic!("Unexpected status: {status}"),
                 }
             }
         })
@@ -512,10 +510,10 @@ pub mod test_util {
     }
 
     pub(crate) async fn cleanup_v1(endpoint: &str, database: &str) {
-        let status = query_v1(endpoint, &format!("drop database {}", database))
+        let status = query_v1(endpoint, &format!("drop database {database}"))
             .await
             .status();
-        assert_eq!(status, http::StatusCode::OK, "UnexpectedStatus: {}", status);
+        assert_eq!(status, http::StatusCode::OK, "UnexpectedStatus: {status}");
     }
 
     pub(crate) async fn onboarding_v2(endpoint: &str) {
@@ -532,7 +530,7 @@ pub mod test_util {
             .unwrap();
 
         let res = client
-            .post(format!("{}/api/v2/setup", endpoint))
+            .post(format!("{endpoint}/api/v2/setup"))
             .json(&body)
             .header("accept", "application/json")
             .send()
@@ -543,8 +541,7 @@ pub mod test_util {
 
         assert!(
             status == StatusCode::CREATED || status == StatusCode::UNPROCESSABLE_ENTITY,
-            "UnexpectedStatus: {}",
-            status
+            "UnexpectedStatus: {status}"
         );
     }
 
diff --git a/src/sinks/kafka/tests.rs b/src/sinks/kafka/tests.rs
index d6a5a9c1cf0a3..89760148ee565 100644
--- a/src/sinks/kafka/tests.rs
+++ b/src/sinks/kafka/tests.rs
@@ -178,7 +178,7 @@ mod integration_test {
         let topic = format!("test-{}", random_string(10));
         let config = KafkaSinkConfig {
             bootstrap_servers: kafka_address(9091),
-            topic: Template::try_from(format!("{}-%Y%m%d", topic)).unwrap(),
+            topic: Template::try_from(format!("{topic}-%Y%m%d")).unwrap(),
             compression: KafkaCompression::None,
             healthcheck_topic: None,
             encoding: TextSerializerConfig::default().into(),
@@ -331,7 +331,7 @@ mod integration_test {
         let kafka_auth = KafkaAuthConfig { sasl, tls };
         let config = KafkaSinkConfig {
             bootstrap_servers: server.clone(),
-            topic: Template::try_from(format!("{}-%Y%m%d", topic)).unwrap(),
+            topic: Template::try_from(format!("{topic}-%Y%m%d")).unwrap(),
             healthcheck_topic: None,
             key_field: None,
             encoding: TextSerializerConfig::default().into(),
@@ -347,7 +347,7 @@ mod integration_test {
             acknowledgements: Default::default(),
         };
         let topic = format!("{}-{}", topic, chrono::Utc::now().format("%Y%m%d"));
-        println!("Topic name generated in test: {:?}", topic);
+        println!("Topic name generated in test: {topic:?}");
 
         let num_events = 1000;
         let (batch, mut receiver) = BatchNotifier::new_with_receiver();
@@ -407,7 +407,7 @@ mod integration_test {
             || match consumer.fetch_watermarks(&topic, 0, Duration::from_secs(3)) {
                 Ok((_low, high)) => ready(high > 0),
                 Err(err) => {
-                    println!("retrying due to error fetching watermarks: {}", err);
+                    println!("retrying due to error fetching watermarks: {err}");
                     ready(false)
                 }
             },
diff --git a/src/sinks/keep/config.rs b/src/sinks/keep/config.rs
index b5bc91578ae25..f7385b5b27cae 100644
--- a/src/sinks/keep/config.rs
+++ b/src/sinks/keep/config.rs
@@ -165,11 +165,7 @@ async fn healthcheck(uri: Uri, api_key: SensitiveString, client: HttpClient) ->
         _ => {
             // Handle other unexpected statuses
             let body = String::from_utf8_lossy(&body[..]);
-            Err(format!(
-                "Server returned unexpected error status: {} body: {}",
-                status, body
-            )
-            .into())
+            Err(format!("Server returned unexpected error status: {status} body: {body}").into())
         }
     }
 }
diff --git a/src/sinks/loki/healthcheck.rs b/src/sinks/loki/healthcheck.rs
index af09955269be7..6ac909dc0799d 100644
--- a/src/sinks/loki/healthcheck.rs
+++ b/src/sinks/loki/healthcheck.rs
@@ -31,6 +31,6 @@ pub async fn healthcheck(config: LokiConfig, client: HttpClient) -> crate::Resul
 
     match status {
         http::StatusCode::OK => Ok(()),
-        _ => Err(format!("A non-successful status returned: {}", status).into()),
+        _ => Err(format!("A non-successful status returned: {status}").into()),
     }
 }
diff --git a/src/sinks/loki/integration_tests.rs b/src/sinks/loki/integration_tests.rs
index ccd179ef51466..87545b4f8b6ab 100644
--- a/src/sinks/loki/integration_tests.rs
+++ b/src/sinks/loki/integration_tests.rs
@@ -94,7 +94,7 @@ async fn build_sink_with_compression(codec: &str, compression: &str) -> (uuid::U
 }
 
 fn line_generator(index: usize) -> String {
-    format!("random line {}", index)
+    format!("random line {index}")
 }
 
 fn event_generator(index: usize) -> Event {
@@ -675,7 +675,7 @@ fn get_timestamp(event: &Event) -> DateTime<Utc> {
 }
 
 async fn fetch_stream(stream: String, tenant: &str) -> (Vec<i64>, Vec<String>) {
-    let query = format!("%7Btest_name%3D\"{}\"%7D", stream);
+    let query = format!("%7Btest_name%3D\"{stream}\"%7D");
     let query = format!(
         "{}/loki/api/v1/query_range?query={}&direction=forward",
         loki_address(),
diff --git a/src/sinks/loki/sink.rs b/src/sinks/loki/sink.rs
index 37be3a9ee7478..60fd044854095 100644
--- a/src/sinks/loki/sink.rs
+++ b/src/sinks/loki/sink.rs
@@ -152,8 +152,7 @@ impl EventEncoder {
                     emit!(TemplateRenderingError {
                         field: Some(
                             format!(
-                                "label_key \"{}\" with label_value \"{}\"",
-                                key_template, value_template
+                                "label_key \"{key_template}\" with label_value \"{value_template}\""
                             )
                             .as_str()
                         ),
@@ -165,8 +164,7 @@ impl EventEncoder {
                     emit!(TemplateRenderingError {
                         field: Some(
                             format!(
-                                "label_value \"{}\" with label_key \"{}\"",
-                                value_template, key_template
+                                "label_value \"{value_template}\" with label_key \"{key_template}\""
                             )
                             .as_str()
                         ),
@@ -229,8 +227,7 @@ impl EventEncoder {
                     emit!(TemplateRenderingError {
                         field: Some(
                             format!(
-                        "structured_metadata_key \"{}\" with structured_metadata_value \"{}\"",
-                        key_template, value_template
+                        "structured_metadata_key \"{key_template}\" with structured_metadata_value \"{value_template}\""
                     )
                             .as_str()
                         ),
@@ -242,8 +239,7 @@ impl EventEncoder {
                     emit!(TemplateRenderingError {
                         field: Some(
                             format!(
-                        "structured_metadata_value \"{}\" with structured_metadata_key \"{}\"",
-                        value_template, key_template
+                        "structured_metadata_value \"{value_template}\" with structured_metadata_key \"{key_template}\""
                     )
                             .as_str()
                         ),
diff --git a/src/sinks/loki/tests.rs b/src/sinks/loki/tests.rs
index 3a68170029616..90d3fc7864f01 100644
--- a/src/sinks/loki/tests.rs
+++ b/src/sinks/loki/tests.rs
@@ -100,7 +100,7 @@ async fn healthcheck_includes_auth() {
     .unwrap();
 
     let addr = test_util::next_addr();
-    let endpoint = format!("http://{}", addr);
+    let endpoint = format!("http://{addr}");
     config.endpoint = endpoint
         .clone()
         .parse::<http::Uri>()
diff --git a/src/sinks/mezmo.rs b/src/sinks/mezmo.rs
index fe91cdd869f5e..526302675df33 100644
--- a/src/sinks/mezmo.rs
+++ b/src/sinks/mezmo.rs
@@ -367,7 +367,7 @@ impl MezmoConfig {
     fn build_uri(&self, query: &str) -> Uri {
         let host = &self.endpoint.uri;
 
-        let uri = format!("{}{}?{}", host, PATH, query);
+        let uri = format!("{host}{PATH}?{query}");
 
         uri.parse::<http::Uri>()
             .expect("This should be a valid uri")
@@ -482,7 +482,7 @@ mod tests {
         // Swap out the host so we can force send it
         // to our local server
         let endpoint = UriSerde {
-            uri: format!("http://{}", addr).parse::<http::Uri>().unwrap(),
+            uri: format!("http://{addr}").parse::<http::Uri>().unwrap(),
             auth: None,
         };
         config.endpoint = endpoint;
@@ -542,7 +542,7 @@ mod tests {
                 let (p, host) = hosts
                     .iter()
                     .enumerate()
-                    .find(|(_, host)| query.contains(&format!("hostname={}", host)))
+                    .find(|(_, host)| query.contains(&format!("hostname={host}")))
                     .expect("invalid hostname");
                 let lines = &partitions[p];
 
diff --git a/src/sinks/mqtt/integration_tests.rs b/src/sinks/mqtt/integration_tests.rs
index 6ef78bdeb9cb3..39d93ae6a5b44 100644
--- a/src/sinks/mqtt/integration_tests.rs
+++ b/src/sinks/mqtt/integration_tests.rs
@@ -9,16 +9,14 @@ use rumqttc::{AsyncClient, Event, Incoming, MqttOptions, QoS};
 use std::time::Duration;
 
 fn mqtt_broker_address() -> String {
-    let result = std::env::var("MQTT_BROKER_ADDRESS").unwrap_or_else(|_| "emqx".into());
-    result
+    std::env::var("MQTT_BROKER_ADDRESS").unwrap_or_else(|_| "emqx".into())
 }
 
 fn mqtt_broker_port() -> u16 {
-    let result = std::env::var("MQTT_BROKER_PORT")
+    std::env::var("MQTT_BROKER_PORT")
         .unwrap_or_else(|_| "1883".into())
         .parse::<u16>()
-        .expect("Cannot parse as u16");
-    result
+        .expect("Cannot parse as u16")
 }
 
 #[tokio::test]
diff --git a/src/sinks/mqtt/request_builder.rs b/src/sinks/mqtt/request_builder.rs
index 62b75910a5454..ed929d1588c49 100644
--- a/src/sinks/mqtt/request_builder.rs
+++ b/src/sinks/mqtt/request_builder.rs
@@ -32,7 +32,7 @@ impl encoding::Encoder<Event> for MqttEncoder {
         let mut encoder = self.encoder.clone();
         encoder
             .encode(input, &mut body)
-            .map_err(|_| io::Error::new(io::ErrorKind::Other, "unable to encode"))?;
+            .map_err(|_| io::Error::other("unable to encode"))?;
 
         let body = body.freeze();
         write_all(writer, 1, body.as_ref())?;
diff --git a/src/sinks/nats/integration_tests.rs b/src/sinks/nats/integration_tests.rs
index 371d7af6f275d..3555c55254d98 100644
--- a/src/sinks/nats/integration_tests.rs
+++ b/src/sinks/nats/integration_tests.rs
@@ -86,8 +86,7 @@ async fn nats_no_auth() {
     let r = publish_and_check(conf).await;
     assert!(
         r.is_ok(),
-        "publish_and_check failed, expected Ok(()), got: {:?}",
-        r
+        "publish_and_check failed, expected Ok(()), got: {r:?}"
     );
 }
 
@@ -149,8 +148,7 @@ async fn nats_userpass_auth_invalid() {
     let r = publish_and_check(conf).await;
     assert!(
         matches!(r, Err(NatsError::Connect { .. })),
-        "publish_and_check failed, expected NatsError::Connect, got: {:?}",
-        r
+        "publish_and_check failed, expected NatsError::Connect, got: {r:?}"
     );
 }
 
@@ -181,8 +179,7 @@ async fn nats_token_auth_valid() {
     let r = publish_and_check(conf).await;
     assert!(
         r.is_ok(),
-        "publish_and_check failed, expected Ok(()), got: {:?}",
-        r
+        "publish_and_check failed, expected Ok(()), got: {r:?}"
     );
 }
 
@@ -213,8 +210,7 @@ async fn nats_token_auth_invalid() {
     let r = publish_and_check(conf).await;
     assert!(
         matches!(r, Err(NatsError::Connect { .. })),
-        "publish_and_check failed, expected NatsError::Connect, got: {:?}",
-        r
+        "publish_and_check failed, expected NatsError::Connect, got: {r:?}"
     );
 }
 
@@ -246,8 +242,7 @@ async fn nats_nkey_auth_valid() {
     let r = publish_and_check(conf).await;
     assert!(
         r.is_ok(),
-        "publish_and_check failed, expected Ok(()), got: {:?}",
-        r
+        "publish_and_check failed, expected Ok(()), got: {r:?}"
     );
 }
 
@@ -279,8 +274,7 @@ async fn nats_nkey_auth_invalid() {
     let r = publish_and_check(conf).await;
     assert!(
         matches!(r, Err(NatsError::Connect { .. })),
-        "publish_and_check failed, expected NatsError::Config, got: {:?}",
-        r
+        "publish_and_check failed, expected NatsError::Config, got: {r:?}"
     );
 }
 
@@ -313,8 +307,7 @@ async fn nats_tls_valid() {
     let r = publish_and_check(conf).await;
     assert!(
         r.is_ok(),
-        "publish_and_check failed, expected Ok(()), got: {:?}",
-        r
+        "publish_and_check failed, expected Ok(()), got: {r:?}"
     );
 }
 
@@ -341,8 +334,7 @@ async fn nats_tls_invalid() {
     let r = publish_and_check(conf).await;
     assert!(
         matches!(r, Err(NatsError::Connect { .. })),
-        "publish_and_check failed, expected NatsError::Connect, got: {:?}",
-        r
+        "publish_and_check failed, expected NatsError::Connect, got: {r:?}"
     );
 }
 
@@ -377,8 +369,7 @@ async fn nats_tls_client_cert_valid() {
     let r = publish_and_check(conf).await;
     assert!(
         r.is_ok(),
-        "publish_and_check failed, expected Ok(()), got: {:?}",
-        r
+        "publish_and_check failed, expected Ok(()), got: {r:?}"
     );
 }
 
@@ -411,8 +402,7 @@ async fn nats_tls_client_cert_invalid() {
     let r = publish_and_check(conf).await;
     assert!(
         matches!(r, Err(NatsError::Connect { .. })),
-        "publish_and_check failed, expected NatsError::Connect, got: {:?}",
-        r
+        "publish_and_check failed, expected NatsError::Connect, got: {r:?}"
     );
 }
 
@@ -449,8 +439,7 @@ async fn nats_tls_jwt_auth_valid() {
     let r = publish_and_check(conf).await;
     assert!(
         r.is_ok(),
-        "publish_and_check failed, expected Ok(()), got: {:?}",
-        r
+        "publish_and_check failed, expected Ok(()), got: {r:?}"
     );
 }
 
@@ -487,7 +476,6 @@ async fn nats_tls_jwt_auth_invalid() {
     let r = publish_and_check(conf).await;
     assert!(
         matches!(r, Err(NatsError::Connect { .. })),
-        "publish_and_check failed, expected NatsError::Connect, got: {:?}",
-        r
+        "publish_and_check failed, expected NatsError::Connect, got: {r:?}"
     );
 }
diff --git a/src/sinks/nats/request_builder.rs b/src/sinks/nats/request_builder.rs
index 0709d391b060d..08368e138d368 100644
--- a/src/sinks/nats/request_builder.rs
+++ b/src/sinks/nats/request_builder.rs
@@ -28,7 +28,7 @@ impl encoding::Encoder<Event> for NatsEncoder {
         let mut encoder = self.encoder.clone();
         encoder
             .encode(input, &mut body)
-            .map_err(|_| io::Error::new(io::ErrorKind::Other, "unable to encode"))?;
+            .map_err(|_| io::Error::other("unable to encode"))?;
 
         let body = body.freeze();
         write_all(writer, 1, body.as_ref())?;
diff --git a/src/sinks/new_relic/encoding.rs b/src/sinks/new_relic/encoding.rs
index 8ad282b47f462..12ca89960393a 100644
--- a/src/sinks/new_relic/encoding.rs
+++ b/src/sinks/new_relic/encoding.rs
@@ -59,8 +59,7 @@ pub fn to_json<T: Serialize>(model: &T) -> Result<Vec<u8>, NewRelicSinkError> {
             Ok(json)
         }
         Err(error) => Err(NewRelicSinkError::new(&format!(
-            "Failed generating JSON: {}",
-            error
+            "Failed generating JSON: {error}"
         ))),
     }
 }
diff --git a/src/sinks/new_relic/sink.rs b/src/sinks/new_relic/sink.rs
index e8976e9131026..a0ca5c4da68ec 100644
--- a/src/sinks/new_relic/sink.rs
+++ b/src/sinks/new_relic/sink.rs
@@ -47,7 +47,7 @@ impl From<std::io::Error> for NewRelicSinkError {
 
 impl From<NewRelicSinkError> for std::io::Error {
     fn from(error: NewRelicSinkError) -> Self {
-        Self::new(std::io::ErrorKind::Other, error)
+        Self::other(error)
     }
 }
 
diff --git a/src/sinks/papertrail.rs b/src/sinks/papertrail.rs
index f152260a37be8..a7356c78a26e9 100644
--- a/src/sinks/papertrail.rs
+++ b/src/sinks/papertrail.rs
@@ -83,7 +83,7 @@ impl SinkConfig for PapertrailConfig {
             .port_u16()
             .ok_or_else(|| "A port is required for endpoint".to_string())?;
 
-        let address = format!("{}:{}", host, port);
+        let address = format!("{host}:{port}");
         let tls = Some(
             self.tls
                 .clone()
@@ -172,7 +172,7 @@ impl tokio_util::codec::Encoder<Event> for PapertrailEncoder {
 
         formatter
             .format(&mut buffer.writer(), Severity::LOG_INFO, message)
-            .map_err(|error| Self::Error::SerializingError(format!("{}", error).into()))?;
+            .map_err(|error| Self::Error::SerializingError(format!("{error}").into()))?;
 
         buffer.put_u8(b'\n');
 
diff --git a/src/sinks/prometheus/collector.rs b/src/sinks/prometheus/collector.rs
index dcd73116f5098..25a042a442084 100644
--- a/src/sinks/prometheus/collector.rs
+++ b/src/sinks/prometheus/collector.rs
@@ -256,8 +256,8 @@ impl MetricCollector for StringCollector {
         result.push_str(suffix);
         Self::encode_tags(result, tags, extra);
         _ = match timestamp_millis {
-            None => writeln!(result, " {}", value),
-            Some(timestamp) => writeln!(result, " {} {}", value, timestamp),
+            None => writeln!(result, " {value}"),
+            Some(timestamp) => writeln!(result, " {value} {timestamp}"),
         };
     }
 
@@ -290,10 +290,7 @@ impl StringCollector {
 
     fn encode_header(name: &str, fullname: &str, value: &MetricValue) -> String {
         let r#type = prometheus_metric_type(value).as_str();
-        format!(
-            "# HELP {} {}\n# TYPE {} {}\n",
-            fullname, name, fullname, r#type
-        )
+        format!("# HELP {fullname} {name}\n# TYPE {fullname} {type}\n")
     }
 
     fn format_tag(key: &str, mut value: &str) -> String {
diff --git a/src/sinks/prometheus/exporter.rs b/src/sinks/prometheus/exporter.rs
index 065094454d526..77c795b5e180f 100644
--- a/src/sinks/prometheus/exporter.rs
+++ b/src/sinks/prometheus/exporter.rs
@@ -927,7 +927,7 @@ mod tests {
         // Events are marked as delivered as soon as they are aggregated.
         assert_eq!(receiver.try_recv(), Ok(BatchStatus::Delivered));
 
-        let mut request = Request::get(format!("{}://{}/metrics", proto, address))
+        let mut request = Request::get(format!("{proto}://{address}/metrics"))
             .body(Body::empty())
             .expect("Error creating request.");
 
@@ -1013,7 +1013,7 @@ mod tests {
         // Events are marked as delivered as soon as they are aggregated.
         assert_eq!(receiver.try_recv(), Ok(BatchStatus::Delivered));
 
-        let mut request = Request::get(format!("{}://{}/metrics", proto, address))
+        let mut request = Request::get(format!("{proto}://{address}/metrics"))
             .body(Body::empty())
             .expect("Error creating request.");
 
diff --git a/src/sinks/prometheus/remote_write/integration_tests.rs b/src/sinks/prometheus/remote_write/integration_tests.rs
index 9f23476837f7f..cf47ec5270045 100644
--- a/src/sinks/prometheus/remote_write/integration_tests.rs
+++ b/src/sinks/prometheus/remote_write/integration_tests.rs
@@ -32,7 +32,7 @@ async fn insert_metrics(url: &str) {
         let cx = SinkContext::default();
 
         let config = RemoteWriteConfig {
-            endpoint: format!("{}/api/v1/prom/write?db={}", url, database),
+            endpoint: format!("{url}/api/v1/prom/write?db={database}"),
             tls: Some(TlsConfig {
                 ca_file: Some(tls::TEST_PEM_CA_PATH.into()),
                 ..Default::default()
@@ -44,7 +44,7 @@ async fn insert_metrics(url: &str) {
         let (sink, _) = config.build(cx).await.expect("error building config");
         sink.run_events(events.clone()).await.unwrap();
 
-        let result = query(url, &format!("show series on {}", database)).await;
+        let result = query(url, &format!("show series on {database}")).await;
 
         let values = &result["results"][0]["series"][0]["values"];
         assert_eq!(values.as_array().unwrap().len(), 5);
@@ -105,6 +105,6 @@ fn decode_metrics(data: &Value) -> Vec<HashMap<String, Value>> {
 
 fn create_events(name_range: Range<i32>, value: impl Fn(f64) -> f64) -> Vec<Event> {
     name_range
-        .map(move |num| create_event(format!("metric_{}", num), value(num as f64)))
+        .map(move |num| create_event(format!("metric_{num}"), value(num as f64)))
         .collect()
 }
diff --git a/src/sinks/prometheus/remote_write/tests.rs b/src/sinks/prometheus/remote_write/tests.rs
index dcf94eb02be2a..245bc74b6932d 100644
--- a/src/sinks/prometheus/remote_write/tests.rs
+++ b/src/sinks/prometheus/remote_write/tests.rs
@@ -235,7 +235,7 @@ async fn send_request(config: &str, events: Vec<Event>) -> Vec<(HeaderMap, proto
         let (rx, trigger, server) = build_test_server(addr);
         tokio::spawn(server);
 
-        let config = format!("endpoint = \"http://{}/write\"\n{}", addr, config);
+        let config = format!("endpoint = \"http://{addr}/write\"\n{config}");
         let config: RemoteWriteConfig = toml::from_str(&config).unwrap();
         let cx = SinkContext::default();
 
diff --git a/src/sinks/pulsar/encoder.rs b/src/sinks/pulsar/encoder.rs
index fd8fc8b9acd90..8fd05ceb14285 100644
--- a/src/sinks/pulsar/encoder.rs
+++ b/src/sinks/pulsar/encoder.rs
@@ -30,7 +30,7 @@ impl Encoder<Event> for PulsarEncoder {
         let mut encoder = self.encoder.clone();
         encoder
             .encode(input, &mut body)
-            .map_err(|_| io::Error::new(io::ErrorKind::Other, "unable to encode"))?;
+            .map_err(|_| io::Error::other("unable to encode"))?;
 
         let body = body.freeze();
         write_all(writer, 1, body.as_ref())?;
diff --git a/src/sinks/pulsar/integration_tests.rs b/src/sinks/pulsar/integration_tests.rs
index 3b96ec05690d5..5d95ed98b3f86 100644
--- a/src/sinks/pulsar/integration_tests.rs
+++ b/src/sinks/pulsar/integration_tests.rs
@@ -75,7 +75,7 @@ async fn pulsar_happy_reuse(mut cnf: PulsarSinkConfig) {
     for line in input {
         let msg = match consumer.next().await.unwrap() {
             Ok(msg) => msg,
-            Err(error) => panic!("{:?}", error),
+            Err(error) => panic!("{error:?}"),
         };
         consumer.ack(&msg).await.unwrap();
         assert_eq!(String::from_utf8_lossy(&msg.payload.data), line);
diff --git a/src/sinks/redis/integration_tests.rs b/src/sinks/redis/integration_tests.rs
index 442e44a935fe2..a7059d67aaaab 100644
--- a/src/sinks/redis/integration_tests.rs
+++ b/src/sinks/redis/integration_tests.rs
@@ -177,7 +177,7 @@ async fn redis_sink_channel() {
     pubsub_conn
         .subscribe(key.clone().to_string())
         .await
-        .unwrap_or_else(|_| panic!("Failed to subscribe channel:{}.", key));
+        .unwrap_or_else(|_| panic!("Failed to subscribe channel:{key}."));
     debug!("Subscribed to channel:{}.", key);
     let mut pubsub_stream = pubsub_conn.on_message();
 
@@ -252,7 +252,7 @@ async fn redis_sink_channel_data_volume_tags() {
     pubsub_conn
         .subscribe(key.clone().to_string())
         .await
-        .unwrap_or_else(|_| panic!("Failed to subscribe channel:{}.", key));
+        .unwrap_or_else(|_| panic!("Failed to subscribe channel:{key}."));
     debug!("Subscribed to channel:{}.", key);
     let mut pubsub_stream = pubsub_conn.on_message();
 
@@ -325,14 +325,14 @@ async fn redis_sink_metrics() {
         let metric = if i % 2 == 0 {
             // Counter metrics
             Metric::new(
-                format!("counter_{}", i),
+                format!("counter_{i}"),
                 MetricKind::Absolute,
                 MetricValue::Counter { value: i as f64 },
             )
         } else {
             // Gauge metrics
             Metric::new(
-                format!("gauge_{}", i),
+                format!("gauge_{i}"),
                 MetricKind::Absolute,
                 MetricValue::Gauge { value: i as f64 },
             )
@@ -373,12 +373,12 @@ async fn redis_sink_metrics() {
 
         if i % 2 == 0 {
             // Counter metrics
-            assert_eq!(json["name"], format!("counter_{}", i));
+            assert_eq!(json["name"], format!("counter_{i}"));
             assert_eq!(json["kind"], "absolute");
             assert_eq!(json["counter"]["value"], i as f64);
         } else {
             // Gauge metrics
-            assert_eq!(json["name"], format!("gauge_{}", i));
+            assert_eq!(json["name"], format!("gauge_{i}"));
             assert_eq!(json["kind"], "absolute");
             assert_eq!(json["gauge"]["value"], i as f64);
         }
diff --git a/src/sinks/s3_common/config.rs b/src/sinks/s3_common/config.rs
index 65021254dff91..f4dd5cce7a365 100644
--- a/src/sinks/s3_common/config.rs
+++ b/src/sinks/s3_common/config.rs
@@ -455,10 +455,8 @@ mod tests {
             ("STANDARD_IA", S3StorageClass::StandardIa),
         ] {
             assert_eq!(name, to_string(storage_class));
-            let result: S3StorageClass = serde_json::from_str(&format!("{:?}", name))
-                .unwrap_or_else(|error| {
-                    panic!("Unparsable storage class name {:?}: {}", name, error)
-                });
+            let result: S3StorageClass = serde_json::from_str(&format!("{name:?}"))
+                .unwrap_or_else(|error| panic!("Unparsable storage class name {name:?}: {error}"));
             assert_eq!(result, storage_class);
         }
     }
diff --git a/src/sinks/sematext/logs.rs b/src/sinks/sematext/logs.rs
index 90602e53848e4..49d4d157bfb1b 100644
--- a/src/sinks/sematext/logs.rs
+++ b/src/sinks/sematext/logs.rs
@@ -189,7 +189,7 @@ mod tests {
         let addr = next_addr();
         // Swap out the host so we can force send it
         // to our local server
-        config.endpoint = Some(format!("http://{}", addr));
+        config.endpoint = Some(format!("http://{addr}"));
 
         let (sink, _) = config.build(cx).await.unwrap();
 
diff --git a/src/sinks/sematext/metrics.rs b/src/sinks/sematext/metrics.rs
index 52174aad49753..88cc3fa5d0818 100644
--- a/src/sinks/sematext/metrics.rs
+++ b/src/sinks/sematext/metrics.rs
@@ -101,7 +101,7 @@ impl GenerateConfig for SematextMetricsConfig {
 }
 
 async fn healthcheck(endpoint: String, client: HttpClient) -> Result<()> {
-    let uri = format!("{}/health", endpoint);
+    let uri = format!("{endpoint}/health");
 
     let request = Request::get(uri)
         .body(Body::empty())
@@ -412,7 +412,7 @@ mod tests {
         let addr = next_addr();
         // Swap out the endpoint so we can force send it
         // to our local server
-        let endpoint = format!("http://{}", addr);
+        let endpoint = format!("http://{addr}");
         config.endpoint = Some(endpoint.clone());
 
         let (sink, _) = config.build(cx).await.unwrap();
diff --git a/src/sinks/splunk_hec/common/service.rs b/src/sinks/splunk_hec/common/service.rs
index 592ec7e0293f4..71a5d49741ad7 100644
--- a/src/sinks/splunk_hec/common/service.rs
+++ b/src/sinks/splunk_hec/common/service.rs
@@ -370,10 +370,7 @@ mod tests {
 
         Mock::given(method("POST"))
             .and(path("/services/collector/event"))
-            .and(header(
-                "Authorization",
-                format!("Splunk {}", TOKEN).as_str(),
-            ))
+            .and(header("Authorization", format!("Splunk {TOKEN}").as_str()))
             .and(header_exists("X-Splunk-Request-Channel"))
             .respond_with(move |_: &Request| {
                 let ack_id =
@@ -385,10 +382,7 @@ mod tests {
 
         Mock::given(method("POST"))
             .and(path("/services/collector/ack"))
-            .and(header(
-                "Authorization",
-                format!("Splunk {}", TOKEN).as_str(),
-            ))
+            .and(header("Authorization", format!("Splunk {TOKEN}").as_str()))
             .and(header_exists("X-Splunk-Request-Channel"))
             .respond_with(ack_response)
             .mount(&mock_server)
@@ -528,10 +522,7 @@ mod tests {
         // Override the usual event endpoint
         Mock::given(method("POST"))
             .and(path("/services/collector/event"))
-            .and(header(
-                "Authorization",
-                format!("Splunk {}", TOKEN).as_str(),
-            ))
+            .and(header("Authorization", format!("Splunk {TOKEN}").as_str()))
             .and(header_exists("X-Splunk-Request-Channel"))
             .respond_with(move |_: &Request| {
                 ResponseTemplate::new(200).set_body_json(r#"{ "new": "a new response body" }"#)
diff --git a/src/sinks/splunk_hec/common/util.rs b/src/sinks/splunk_hec/common/util.rs
index 99bfc1fbd6d16..a94614f10d04c 100644
--- a/src/sinks/splunk_hec/common/util.rs
+++ b/src/sinks/splunk_hec/common/util.rs
@@ -92,7 +92,7 @@ pub async fn build_healthcheck(
         .context(UriParseSnafu)?;
 
     let request = Request::get(uri)
-        .header("Authorization", format!("Splunk {}", token))
+        .header("Authorization", format!("Splunk {token}"))
         .body(Body::empty())
         .unwrap();
 
diff --git a/src/sinks/splunk_hec/logs/integration_tests.rs b/src/sinks/splunk_hec/logs/integration_tests.rs
index 6f07435097143..f26263f19acf1 100644
--- a/src/sinks/splunk_hec/logs/integration_tests.rs
+++ b/src/sinks/splunk_hec/logs/integration_tests.rs
@@ -50,7 +50,7 @@ async fn recent_entries(index: Option<&str>) -> Vec<JsonValue> {
 
     // https://docs.splunk.com/Documentation/Splunk/7.2.1/RESTREF/RESTsearch#search.2Fjobs
     let search_query = match index {
-        Some(index) => format!("search index={}", index),
+        Some(index) => format!("search index={index}"),
         None => "search index=*".into(),
     };
     let res = client
@@ -525,10 +525,7 @@ async fn splunk_auto_extracted_timestamp() {
         // Splunk will determine the timestamp from the *message* field in the event.
         // Thus, we expect the `timestamp` field to still be present.
         assert_eq!(
-            format!(
-                "{{\"message\":\"{}\",\"timestamp\":\"2020-03-05T00:00:00Z\"}}",
-                message
-            ),
+            format!("{{\"message\":\"{message}\",\"timestamp\":\"2020-03-05T00:00:00Z\"}}"),
             entry["_raw"].as_str().unwrap()
         );
         assert_eq!(
@@ -579,7 +576,7 @@ async fn splunk_non_auto_extracted_timestamp() {
         let entry = find_entry(&message).await;
 
         assert_eq!(
-            format!("{{\"message\":\"{}\"}}", message),
+            format!("{{\"message\":\"{message}\"}}"),
             entry["_raw"].as_str().unwrap()
         );
         assert_eq!(
diff --git a/src/sinks/splunk_hec/logs/tests.rs b/src/sinks/splunk_hec/logs/tests.rs
index 794fff1a4b684..c69f231ad50e7 100644
--- a/src/sinks/splunk_hec/logs/tests.rs
+++ b/src/sinks/splunk_hec/logs/tests.rs
@@ -221,7 +221,7 @@ async fn splunk_passthrough_token() {
     let addr = next_addr();
     let config = HecLogsSinkConfig {
         default_token: "token".to_string().into(),
-        endpoint: format!("http://{}", addr),
+        endpoint: format!("http://{addr}"),
         host_key: None,
         indexed_fields: Vec::new(),
         index: None,
diff --git a/src/sinks/splunk_hec/metrics/tests.rs b/src/sinks/splunk_hec/metrics/tests.rs
index 7eed102d43a70..3eccfefe40206 100644
--- a/src/sinks/splunk_hec/metrics/tests.rs
+++ b/src/sinks/splunk_hec/metrics/tests.rs
@@ -320,7 +320,7 @@ async fn splunk_passthrough_token() {
     let addr = next_addr();
     let config = HecMetricsSinkConfig {
         default_token: "token".to_owned().into(),
-        endpoint: format!("http://{}", addr),
+        endpoint: format!("http://{addr}"),
         host_key: config_host_key(),
         index: None,
         sourcetype: None,
diff --git a/src/sinks/statsd/encoder.rs b/src/sinks/statsd/encoder.rs
index 5b826d9e51c6d..d26dba9fdf6d9 100644
--- a/src/sinks/statsd/encoder.rs
+++ b/src/sinks/statsd/encoder.rs
@@ -57,7 +57,7 @@ impl<'a> Encoder<&'a Metric> for StatsdEncoder {
                         buf,
                         &name,
                         tags.as_deref(),
-                        format!("{:+}", value),
+                        format!("{value:+}"),
                         "g",
                         None,
                     ),
@@ -117,7 +117,7 @@ fn encode_tags(tags: &MetricTags) -> String {
     let parts: Vec<_> = tags
         .iter_all()
         .map(|(name, tag_value)| match tag_value {
-            Some(value) => format!("{}:{}", name, value),
+            Some(value) => format!("{name}:{value}"),
             None => name.to_owned(),
         })
         .collect();
@@ -136,7 +136,7 @@ fn encode_and_write_single_event<V: Display>(
 ) {
     let mut writer = buf.writer();
 
-    write!(&mut writer, "{}:{}|{}", metric_name, val, metric_type).unwrap();
+    write!(&mut writer, "{metric_name}:{val}|{metric_type}").unwrap();
 
     if let Some(sample_rate) = sample_rate {
         if sample_rate != 1 {
@@ -145,7 +145,7 @@ fn encode_and_write_single_event<V: Display>(
     };
 
     if let Some(t) = metric_tags {
-        write!(&mut writer, "|#{}", t).unwrap();
+        write!(&mut writer, "|#{t}").unwrap();
     };
 
     writeln!(&mut writer).unwrap();
diff --git a/src/sinks/util/adaptive_concurrency/tests.rs b/src/sinks/util/adaptive_concurrency/tests.rs
index 3197ab201f84c..0b209aca85c15 100644
--- a/src/sinks/util/adaptive_concurrency/tests.rs
+++ b/src/sinks/util/adaptive_concurrency/tests.rs
@@ -195,7 +195,7 @@ impl SinkConfig for TestConfig {
             .with_flat_map(|event| {
                 stream::iter(Some(Ok(EncodedEvent::new(event, 0, JsonSize::zero()))))
             })
-            .sink_map_err(|error| panic!("Fatal test sink error: {}", error));
+            .sink_map_err(|error| panic!("Fatal test sink error: {error}"));
         let healthcheck = future::ok(()).boxed();
 
         // Dig deep to get at the internal controller statistics
@@ -525,14 +525,14 @@ impl Range {
     fn assert_usize(&self, value: usize, name1: &str, name2: &str) -> Option<Failure> {
         if value < self.0 as usize {
             Some(Failure {
-                stat_name: format!("{} {}", name1, name2),
+                stat_name: format!("{name1} {name2}"),
                 mode: FailureMode::ExceededMinimum,
                 value: value as f64,
                 reference: self.0,
             })
         } else if value > self.1 as usize {
             Some(Failure {
-                stat_name: format!("{} {}", name1, name2),
+                stat_name: format!("{name1} {name2}"),
                 mode: FailureMode::ExceededMaximum,
                 value: value as f64,
                 reference: self.1,
@@ -545,14 +545,14 @@ impl Range {
     fn assert_f64(&self, value: f64, name1: &str, name2: &str) -> Option<Failure> {
         if value < self.0 {
             Some(Failure {
-                stat_name: format!("{} {}", name1, name2),
+                stat_name: format!("{name1} {name2}"),
                 mode: FailureMode::ExceededMinimum,
                 value,
                 reference: self.0,
             })
         } else if value > self.1 {
             Some(Failure {
-                stat_name: format!("{} {}", name1, name2),
+                stat_name: format!("{name1} {name2}"),
                 mode: FailureMode::ExceededMaximum,
                 value,
                 reference: self.1,
@@ -669,7 +669,7 @@ async fn run_compare(input: TestInput) {
             failure.stat_name, failure.value, mode, failure.reference
         );
     }
-    assert!(failures.is_empty(), "{:#?}", results);
+    assert!(failures.is_empty(), "{results:#?}");
 }
 
 #[rstest]
@@ -681,7 +681,7 @@ async fn all_tests(#[files("tests/data/adaptive-concurrency/*.toml")] file_path:
         .read_to_string(&mut data)
         .unwrap();
     let input: TestInput = toml::from_str(&data)
-        .unwrap_or_else(|error| panic!("Invalid TOML in {:?}: {:?}", file_path, error));
+        .unwrap_or_else(|error| panic!("Invalid TOML in {file_path:?}: {error:?}"));
 
     time::pause();
 
diff --git a/src/sinks/util/buffer/compression.rs b/src/sinks/util/buffer/compression.rs
index 91b7b323e37a1..c270976021359 100644
--- a/src/sinks/util/buffer/compression.rs
+++ b/src/sinks/util/buffer/compression.rs
@@ -212,9 +212,7 @@ impl<'de> de::Deserialize<'de> for Compression {
                     let max_level = compression.max_compression_level_val();
                     if level > max_level {
                         let msg = std::format!(
-                            "invalid value `{}`, expected value in range [0, {}]",
-                            level,
-                            max_level
+                            "invalid value `{level}`, expected value in range [0, {max_level}]"
                         );
                         return Err(de::Error::custom(msg));
                     }
@@ -455,8 +453,7 @@ impl<'de> de::Deserialize<'de> for CompressionLevel {
             {
                 u32::try_from(v).map(CompressionLevel::Val).map_err(|err| {
                     de::Error::custom(format!(
-                        "unsigned integer could not be converted to u32: {}",
-                        err
+                        "unsigned integer could not be converted to u32: {err}"
                     ))
                 })
             }
@@ -466,7 +463,7 @@ impl<'de> de::Deserialize<'de> for CompressionLevel {
                 E: de::Error,
             {
                 u32::try_from(v).map(CompressionLevel::Val).map_err(|err| {
-                    de::Error::custom(format!("integer could not be converted to u32: {}", err))
+                    de::Error::custom(format!("integer could not be converted to u32: {err}"))
                 })
             }
         }
diff --git a/src/sinks/util/buffer/metrics/mod.rs b/src/sinks/util/buffer/metrics/mod.rs
index 59c542aff5d85..64209ffbaffcc 100644
--- a/src/sinks/util/buffer/metrics/mod.rs
+++ b/src/sinks/util/buffer/metrics/mod.rs
@@ -138,7 +138,7 @@ mod tests {
 
     pub fn sample_counter(num: usize, tagstr: &str, kind: MetricKind, value: f64) -> Metric {
         Metric::new(
-            format!("counter-{}", num),
+            format!("counter-{num}"),
             kind,
             MetricValue::Counter { value },
         )
@@ -146,12 +146,12 @@ mod tests {
     }
 
     pub fn sample_gauge(num: usize, kind: MetricKind, value: f64) -> Metric {
-        Metric::new(format!("gauge-{}", num), kind, MetricValue::Gauge { value })
+        Metric::new(format!("gauge-{num}"), kind, MetricValue::Gauge { value })
     }
 
     pub fn sample_set<T: ToString>(num: usize, kind: MetricKind, values: &[T]) -> Metric {
         Metric::new(
-            format!("set-{}", num),
+            format!("set-{num}"),
             kind,
             MetricValue::Set {
                 values: values.iter().map(|s| s.to_string()).collect(),
@@ -161,7 +161,7 @@ mod tests {
 
     pub fn sample_distribution_histogram(num: u32, kind: MetricKind, rate: u32) -> Metric {
         Metric::new(
-            format!("dist-{}", num),
+            format!("dist-{num}"),
             kind,
             MetricValue::Distribution {
                 samples: vector_lib::samples![num as f64 => rate],
@@ -178,7 +178,7 @@ mod tests {
         sum: f64,
     ) -> Metric {
         Metric::new(
-            format!("buckets-{}", num),
+            format!("buckets-{num}"),
             kind,
             MetricValue::AggregatedHistogram {
                 buckets: vector_lib::buckets![
@@ -194,7 +194,7 @@ mod tests {
 
     pub fn sample_aggregated_summary(num: u32, kind: MetricKind, factor: f64) -> Metric {
         Metric::new(
-            format!("quantiles-{}", num),
+            format!("quantiles-{num}"),
             kind,
             MetricValue::AggregatedSummary {
                 quantiles: vector_lib::quantiles![
@@ -239,7 +239,7 @@ mod tests {
         result
             .into_iter()
             .map(|mut batch| {
-                batch.sort_by_key(|k| format!("{:?}", k));
+                batch.sort_by_key(|k| format!("{k:?}"));
                 batch
             })
             .collect()
diff --git a/src/sinks/util/http.rs b/src/sinks/util/http.rs
index aa8ba4bb3446e..3d85add642d0c 100644
--- a/src/sinks/util/http.rs
+++ b/src/sinks/util/http.rs
@@ -533,7 +533,7 @@ impl RetryLogic for HttpRetryLogic {
                 format!("{}: {}", status, String::from_utf8_lossy(response.body())).into(),
             ),
             _ if status.is_success() => RetryAction::Successful,
-            _ => RetryAction::DontRetry(format!("response status: {}", status).into()),
+            _ => RetryAction::DontRetry(format!("response status: {status}").into()),
         }
     }
 }
@@ -581,10 +581,10 @@ where
                 RetryAction::DontRetry("endpoint not implemented".into())
             }
             _ if status.is_server_error() => {
-                RetryAction::Retry(format!("Http Status: {}", status).into())
+                RetryAction::Retry(format!("Http Status: {status}").into())
             }
             _ if status.is_success() => RetryAction::Successful,
-            _ => RetryAction::DontRetry(format!("Http status: {}", status).into()),
+            _ => RetryAction::DontRetry(format!("Http status: {status}").into()),
         }
     }
 }
@@ -919,7 +919,7 @@ mod test {
                 async move {
                     let mut body = hyper::body::aggregate(req.into_body())
                         .await
-                        .map_err(|error| format!("error: {}", error))?;
+                        .map_err(|error| format!("error: {error}"))?;
                     let string = String::from_utf8(body.copy_to_bytes(body.remaining()).to_vec())
                         .map_err(|_| "Wasn't UTF-8".to_string())?;
                     tx.try_send(string).map_err(|_| "Send error".to_string())?;
@@ -933,7 +933,7 @@ mod test {
 
         tokio::spawn(async move {
             if let Err(error) = Server::bind(&addr).serve(new_service).await {
-                eprintln!("Server error: {}", error);
+                eprintln!("Server error: {error}");
             }
         });
 
diff --git a/src/sinks/util/mod.rs b/src/sinks/util/mod.rs
index 990095ed3452f..82bdf301ae456 100644
--- a/src/sinks/util/mod.rs
+++ b/src/sinks/util/mod.rs
@@ -122,7 +122,7 @@ pub fn encode_namespace<'a>(
 ) -> String {
     let name = name.into();
     namespace
-        .map(|namespace| format!("{}{}{}", namespace, delimiter, name))
+        .map(|namespace| format!("{namespace}{delimiter}{name}"))
         .unwrap_or_else(|| name.into_owned())
 }
 
diff --git a/src/sinks/util/retries.rs b/src/sinks/util/retries.rs
index 05607ed501522..129288fe9ff1b 100644
--- a/src/sinks/util/retries.rs
+++ b/src/sinks/util/retries.rs
@@ -469,9 +469,7 @@ mod tests {
             let backoff = policy.backoff();
             assert!(
                 !backoff.is_zero() && backoff <= max_duration,
-                "Expected backoff to not exceed {:?}, got {:?}",
-                max_duration,
-                backoff
+                "Expected backoff to not exceed {max_duration:?}, got {backoff:?}"
             );
 
             policy.advance();
diff --git a/src/sinks/util/service.rs b/src/sinks/util/service.rs
index 91733c4af019f..ab5160b8741ce 100644
--- a/src/sinks/util/service.rs
+++ b/src/sinks/util/service.rs
@@ -541,7 +541,7 @@ mod tests {
                 let (req, _) = req.into_parts();
                 if delay.swap(false, AcqRel) {
                     // Error on first request
-                    future::err::<(), _>(std::io::Error::new(std::io::ErrorKind::Other, "")).boxed()
+                    future::err::<(), _>(std::io::Error::other("")).boxed()
                 } else {
                     sent_requests.lock().unwrap().push(req);
                     future::ok::<_, std::io::Error>(()).boxed()
diff --git a/src/sinks/util/sink.rs b/src/sinks/util/sink.rs
index dcef4fa226bcf..4c7e9384388f4 100644
--- a/src/sinks/util/sink.rs
+++ b/src/sinks/util/sink.rs
@@ -1137,7 +1137,7 @@ mod tests {
 
     impl Partition<Bytes> for Partitions {
         fn partition(&self) -> Bytes {
-            format!("{:?}", self).into()
+            format!("{self:?}").into()
         }
     }
 
diff --git a/src/sinks/util/socket_bytes_sink.rs b/src/sinks/util/socket_bytes_sink.rs
index da453c0d155c7..4c2cd36454692 100644
--- a/src/sinks/util/socket_bytes_sink.rs
+++ b/src/sinks/util/socket_bytes_sink.rs
@@ -1,5 +1,5 @@
 use std::{
-    io::{Error as IoError, ErrorKind},
+    io::Error as IoError,
     marker::Unpin,
     pin::Pin,
     task::{ready, Context, Poll},
@@ -151,7 +151,7 @@ where
                     return Poll::Ready(Err(error));
                 }
 
-                return Poll::Ready(Err(IoError::new(ErrorKind::Other, reason)));
+                return Poll::Ready(Err(IoError::other(reason)));
             }
             ShutdownCheck::Alive => {}
         }
diff --git a/src/sinks/util/test.rs b/src/sinks/util/test.rs
index c029ce8d7481a..23b7a96d82984 100644
--- a/src/sinks/util/test.rs
+++ b/src/sinks/util/test.rs
@@ -107,7 +107,7 @@ where
     let server = Server::bind(&addr)
         .serve(service)
         .with_graceful_shutdown(tripwire.then(crate::shutdown::tripwire_handler))
-        .map_err(|error| panic!("Server error: {}", error));
+        .map_err(|error| panic!("Server error: {error}"));
 
     (rx, trigger, server)
 }
diff --git a/src/sinks/util/uri.rs b/src/sinks/util/uri.rs
index 11c7ab7f4027a..2bd42dd2ea670 100644
--- a/src/sinks/util/uri.rs
+++ b/src/sinks/util/uri.rs
@@ -47,7 +47,7 @@ impl UriSerde {
         let uri = self.uri.to_string();
         let self_path = uri.trim_end_matches('/');
         let other_path = path.trim_start_matches('/');
-        let path = format!("{}/{}", self_path, other_path);
+        let path = format!("{self_path}/{other_path}");
         let uri = path.parse::<Uri>()?;
         Ok(Self {
             uri,
@@ -80,7 +80,7 @@ impl fmt::Display for UriSerde {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         match (self.uri.authority(), &self.auth) {
             (Some(authority), Some(Auth::Basic { user, password })) => {
-                let authority = format!("{}:{}@{}", user, password, authority);
+                let authority = format!("{user}:{password}@{authority}");
                 let authority =
                     Authority::from_maybe_shared(authority).map_err(|_| std::fmt::Error)?;
                 let mut parts = self.uri.clone().into_parts();
@@ -119,7 +119,7 @@ impl From<Uri> for UriSerde {
 
 fn get_basic_auth(authority: &Authority) -> (Authority, Option<Auth>) {
     // We get a valid `Authority` as input, therefore cannot fail here.
-    let mut url = url::Url::parse(&format!("http://{}", authority)).expect("invalid authority");
+    let mut url = url::Url::parse(&format!("http://{authority}")).expect("invalid authority");
 
     let user = url.username();
     if !user.is_empty() {
@@ -164,7 +164,7 @@ pub fn protocol_endpoint(uri: Uri) -> (String, String) {
         let host = auth.host();
         match auth.port() {
             None => host.to_string(),
-            Some(port) => format!("{}:{}", host, port),
+            Some(port) => format!("{host}:{port}"),
         }
         .parse()
         .unwrap_or_else(|_| unreachable!())
diff --git a/src/sinks/vector/mod.rs b/src/sinks/vector/mod.rs
index 65df4553a84b0..1e9df54b0af9f 100644
--- a/src/sinks/vector/mod.rs
+++ b/src/sinks/vector/mod.rs
@@ -84,7 +84,7 @@ mod tests {
 
         let in_addr = next_addr();
 
-        let config = format!(r#"address = "http://{}/""#, in_addr);
+        let config = format!(r#"address = "http://{in_addr}/""#);
         let config: VectorConfig = toml::from_str(&config).unwrap();
 
         let cx = SinkContext::default();
@@ -156,7 +156,7 @@ mod tests {
 
         let in_addr = next_addr();
 
-        let config = format!(r#"address = "http://{}/""#, in_addr);
+        let config = format!(r#"address = "http://{in_addr}/""#);
         let config: VectorConfig = toml::from_str(&config).unwrap();
 
         let cx = SinkContext::default();
diff --git a/src/sinks/websocket/sink.rs b/src/sinks/websocket/sink.rs
index 4981a4e676ea2..5f86a821d7a44 100644
--- a/src/sinks/websocket/sink.rs
+++ b/src/sinks/websocket/sink.rs
@@ -415,7 +415,7 @@ mod tests {
 
         let addr = next_addr();
         let config = WebSocketSinkConfig {
-            uri: format!("ws://{}", addr),
+            uri: format!("ws://{addr}"),
             tls: None,
             encoding: JsonSerializerConfig::default().into(),
             ping_interval: None,
@@ -438,7 +438,7 @@ mod tests {
         let auth_clone = auth.clone();
         let addr = next_addr();
         let config = WebSocketSinkConfig {
-            uri: format!("ws://{}", addr),
+            uri: format!("ws://{addr}"),
             tls: None,
             encoding: JsonSerializerConfig::default().into(),
             ping_interval: None,
@@ -460,7 +460,7 @@ mod tests {
         let tls = MaybeTlsSettings::from_config(tls_config.as_ref(), true).unwrap();
 
         let config = WebSocketSinkConfig {
-            uri: format!("wss://{}", addr),
+            uri: format!("wss://{addr}"),
             tls: Some(TlsEnableableConfig {
                 enabled: Some(true),
                 options: TlsConfig {
@@ -486,7 +486,7 @@ mod tests {
 
         let addr = next_addr();
         let config = WebSocketSinkConfig {
-            uri: format!("ws://{}", addr),
+            uri: format!("ws://{addr}"),
             tls: None,
             encoding: JsonSerializerConfig::default().into(),
             ping_interval: None,
diff --git a/src/sinks/websocket_server/sink.rs b/src/sinks/websocket_server/sink.rs
index f8ab7ebab45b9..4eaf94bd06499 100644
--- a/src/sinks/websocket_server/sink.rs
+++ b/src/sinks/websocket_server/sink.rs
@@ -420,7 +420,7 @@ impl StreamSink<Event> for WebSocketListenerSink {
                     }
 
                     let peers = peers.lock().expect("mutex poisoned");
-                    let broadcast_recipients = peers.iter().map(|(_, ws_sink)| ws_sink);
+                    let broadcast_recipients = peers.values();
                     for recp in broadcast_recipients {
                         if let Err(error) = recp.unbounded_send(message.clone()) {
                             emit!(WsListenerSendError {
diff --git a/src/sources/amqp.rs b/src/sources/amqp.rs
index 4f3fc7098aac0..f65cb7fd53213 100644
--- a/src/sources/amqp.rs
+++ b/src/sources/amqp.rs
@@ -511,8 +511,7 @@ pub mod test {
         let pass = std::env::var("AMQP_PASSWORD").unwrap_or_else(|_| "guest".to_string());
         let host = std::env::var("AMQP_HOST").unwrap_or_else(|_| "rabbitmq".to_string());
         let vhost = std::env::var("AMQP_VHOST").unwrap_or_else(|_| "%2f".to_string());
-        config.connection.connection_string =
-            format!("amqp://{}:{}@{}:5672/{}", user, pass, host, vhost);
+        config.connection.connection_string = format!("amqp://{user}:{pass}@{host}:5672/{vhost}");
 
         config
     }
@@ -528,8 +527,7 @@ pub mod test {
         let host = std::env::var("AMQP_HOST").unwrap_or_else(|_| "rabbitmq".to_string());
         let ca_file =
             std::env::var("AMQP_CA_FILE").unwrap_or_else(|_| "/certs/ca.cert.pem".to_string());
-        config.connection.connection_string =
-            format!("amqps://{}:{}@{}/{}", user, pass, host, vhost);
+        config.connection.connection_string = format!("amqps://{user}:{pass}@{host}/{vhost}");
         let tls = TlsConfig {
             ca_file: Some(ca_file.as_str().into()),
             ..Default::default()
diff --git a/src/sources/apache_metrics/mod.rs b/src/sources/apache_metrics/mod.rs
index fe3706307a303..0cb82ef08b7c4 100644
--- a/src/sources/apache_metrics/mod.rs
+++ b/src/sources/apache_metrics/mod.rs
@@ -380,7 +380,7 @@ Scoreboard: ____S_____I______R____I_______KK___D__C__G_L____________W___________
                     Some(tags) => {
                         assert_eq!(
                             tags.get("endpoint"),
-                            Some(&format!("http://{}/metrics", in_addr)[..])
+                            Some(&format!("http://{in_addr}/metrics")[..])
                         );
                         assert_eq!(tags.get("host"), Some(&in_addr.to_string()[..]));
                     }
diff --git a/src/sources/aws_ecs_metrics/mod.rs b/src/sources/aws_ecs_metrics/mod.rs
index 889c53dc78302..1ea24be7ebb8d 100644
--- a/src/sources/aws_ecs_metrics/mod.rs
+++ b/src/sources/aws_ecs_metrics/mod.rs
@@ -572,7 +572,7 @@ mod test {
         wait_for_tcp(in_addr).await;
 
         let config = AwsEcsMetricsSourceConfig {
-            endpoint: format!("http://{}", in_addr),
+            endpoint: format!("http://{in_addr}"),
             version: Version::V4,
             scrape_interval_secs: Duration::from_secs(1),
             namespace: default_namespace(),
@@ -597,13 +597,10 @@ mod test {
 
                 match m.tags() {
                     Some(tags) => assert_eq!(tags.get("device"), Some("eth1")),
-                    None => panic!("No tags for metric. {:?}", m),
+                    None => panic!("No tags for metric. {m:?}"),
                 }
             }
-            None => panic!(
-                "Could not find 'network_receive_bytes_total' in {:?}.",
-                metrics
-            ),
+            None => panic!("Could not find 'network_receive_bytes_total' in {metrics:?}."),
         }
     }
 }
diff --git a/src/sources/aws_ecs_metrics/parser.rs b/src/sources/aws_ecs_metrics/parser.rs
index e37decf894bd6..9fb48318d7de6 100644
--- a/src/sources/aws_ecs_metrics/parser.rs
+++ b/src/sources/aws_ecs_metrics/parser.rs
@@ -126,7 +126,7 @@ fn counter(
     tags: MetricTags,
 ) -> Metric {
     Metric::new(
-        format!("{}_{}", prefix, name),
+        format!("{prefix}_{name}"),
         MetricKind::Absolute,
         MetricValue::Counter { value },
     )
@@ -144,7 +144,7 @@ fn gauge(
     tags: MetricTags,
 ) -> Metric {
     Metric::new(
-        format!("{}_{}", prefix, name),
+        format!("{prefix}_{name}"),
         MetricKind::Absolute,
         MetricValue::Gauge { value },
     )
@@ -507,6 +507,7 @@ fn network_metrics(
     .collect()
 }
 
+#[allow(clippy::large_enum_variant)]
 #[derive(Deserialize)]
 #[serde(untagged, deny_unknown_fields)]
 enum StatsPayload {
diff --git a/src/sources/aws_kinesis_firehose/filters.rs b/src/sources/aws_kinesis_firehose/filters.rs
index 25b9639ea341a..d767f778cc35a 100644
--- a/src/sources/aws_kinesis_firehose/filters.rs
+++ b/src/sources/aws_kinesis_firehose/filters.rs
@@ -166,7 +166,7 @@ async fn handle_firehose_rejection(err: warp::Rejection) -> Result<impl warp::Re
         request_id = None;
     } else {
         code = StatusCode::INTERNAL_SERVER_ERROR;
-        message = format!("{:?}", err);
+        message = format!("{err:?}");
         request_id = None;
     }
 
diff --git a/src/sources/aws_kinesis_firehose/mod.rs b/src/sources/aws_kinesis_firehose/mod.rs
index 298bce5dfc984..720d4c4d8f0c7 100644
--- a/src/sources/aws_kinesis_firehose/mod.rs
+++ b/src/sources/aws_kinesis_firehose/mod.rs
@@ -389,7 +389,7 @@ mod tests {
         };
 
         let mut builder = reqwest::Client::new()
-            .post(format!("http://{}", address))
+            .post(format!("http://{address}"))
             .header("host", address.to_string())
             .header(
                 "x-amzn-trace-id",
diff --git a/src/sources/aws_s3/mod.rs b/src/sources/aws_s3/mod.rs
index f0b89d1629477..228230fead992 100644
--- a/src/sources/aws_s3/mod.rs
+++ b/src/sources/aws_s3/mod.rs
@@ -1,4 +1,4 @@
-use std::{convert::TryInto, io::ErrorKind};
+use std::convert::TryInto;
 
 use async_compression::tokio::bufread;
 use aws_smithy_types::byte_stream::ByteStream;
@@ -317,7 +317,7 @@ async fn s3_object_decoder(
                     yield next;
                 }
             }))
-            .map_err(|e| std::io::Error::new(ErrorKind::Other, e)),
+            .map_err(std::io::Error::other),
     ));
 
     let compression = match compression {
@@ -414,10 +414,7 @@ mod test {
             assert_eq!(
                 super::determine_compression(content_encoding, content_type, key),
                 expected,
-                "key={:?} content_encoding={:?} content_type={:?}",
-                key,
-                content_encoding,
-                content_type,
+                "key={key:?} content_encoding={content_encoding:?} content_type={content_type:?}",
             );
         }
     }
@@ -517,7 +514,7 @@ mod integration_tests {
             .iter()
             .map(|msg| {
                 // convert to JSON object
-                format!(r#"{{"message": "{}"}}"#, msg)
+                format!(r#"{{"message": "{msg}"}}"#)
             })
             .collect();
 
diff --git a/src/sources/aws_s3/sqs.rs b/src/sources/aws_s3/sqs.rs
index 33a0efafe7fd8..3c33b7d30a782 100644
--- a/src/sources/aws_s3/sqs.rs
+++ b/src/sources/aws_s3/sqs.rs
@@ -1113,7 +1113,7 @@ mod urlencoded_string {
         use serde::de::Error;
 
         serde::de::Deserialize::deserialize(deserializer).and_then(|s: &[u8]| {
-            let decoded = if s.iter().any(|c| *c == b'+') {
+            let decoded = if s.contains(&b'+') {
                 // AWS encodes spaces as `+` rather than `%20`, so we first need to handle this.
                 let s = s
                     .iter()
@@ -1124,9 +1124,8 @@ mod urlencoded_string {
                 percent_decode(s).decode_utf8().map(Into::into)
             };
 
-            decoded.map_err(|err| {
-                D::Error::custom(format!("error url decoding S3 object key: {}", err))
-            })
+            decoded
+                .map_err(|err| D::Error::custom(format!("error url decoding S3 object key: {err}")))
         })
     }
 
diff --git a/src/sources/aws_sqs/integration_tests.rs b/src/sources/aws_sqs/integration_tests.rs
index af6452d0ab1c4..af9fadaebc4d2 100644
--- a/src/sources/aws_sqs/integration_tests.rs
+++ b/src/sources/aws_sqs/integration_tests.rs
@@ -113,7 +113,7 @@ pub(crate) async fn test() {
                 .unwrap()
                 .to_string_lossy();
             if !expected_messages.remove(message.as_ref()) {
-                panic!("Received unexpected message: {:?}", message);
+                panic!("Received unexpected message: {message:?}");
             }
         }
         assert!(expected_messages.is_empty());
@@ -122,5 +122,5 @@ pub(crate) async fn test() {
 }
 
 fn calculate_message(index: u32) -> String {
-    format!("Test message: {}", index)
+    format!("Test message: {index}")
 }
diff --git a/src/sources/datadog_agent/integration_tests.rs b/src/sources/datadog_agent/integration_tests.rs
index 6c491bf3113d8..390e97859f64e 100644
--- a/src/sources/datadog_agent/integration_tests.rs
+++ b/src/sources/datadog_agent/integration_tests.rs
@@ -52,7 +52,7 @@ async fn wait_for_healthy(address: String) {
         // wait a second before retry...
         tokio::time::sleep(Duration::new(1, 0)).await;
     }
-    panic!("Unable to reach the Datadog Agent. Check that it's started and that the health endpoint is available at {}.", address);
+    panic!("Unable to reach the Datadog Agent. Check that it's started and that the health endpoint is available at {address}.");
 }
 
 async fn wait_for_healthy_agent() {
diff --git a/src/sources/datadog_agent/logs.rs b/src/sources/datadog_agent/logs.rs
index 58c8b5369f029..144949cc775e4 100644
--- a/src/sources/datadog_agent/logs.rs
+++ b/src/sources/datadog_agent/logs.rs
@@ -84,7 +84,7 @@ pub(crate) fn decode_log_body(
 
         ErrorMessage::new(
             StatusCode::BAD_REQUEST,
-            format!("Error parsing JSON: {:?}", error),
+            format!("Error parsing JSON: {error:?}"),
         )
     })?;
 
diff --git a/src/sources/datadog_agent/metrics.rs b/src/sources/datadog_agent/metrics.rs
index b093df4a31a5a..7e5df463a16c2 100644
--- a/src/sources/datadog_agent/metrics.rs
+++ b/src/sources/datadog_agent/metrics.rs
@@ -189,7 +189,7 @@ fn decode_datadog_sketches(
     let metrics = decode_ddsketch(body, &api_key).map_err(|error| {
         ErrorMessage::new(
             StatusCode::UNPROCESSABLE_ENTITY,
-            format!("Error decoding Datadog sketch: {:?}", error),
+            format!("Error decoding Datadog sketch: {error:?}"),
         )
     })?;
 
@@ -218,7 +218,7 @@ fn decode_datadog_series_v2(
     let metrics = decode_ddseries_v2(body, &api_key).map_err(|error| {
         ErrorMessage::new(
             StatusCode::UNPROCESSABLE_ENTITY,
-            format!("Error decoding Datadog sketch: {:?}", error),
+            format!("Error decoding Datadog sketch: {error:?}"),
         )
     })?;
 
@@ -413,7 +413,7 @@ fn decode_datadog_series_v1(
     let metrics: DatadogSeriesRequest = serde_json::from_slice(&body).map_err(|error| {
         ErrorMessage::new(
             StatusCode::BAD_REQUEST,
-            format!("Error parsing JSON: {:?}", error),
+            format!("Error parsing JSON: {error:?}"),
         )
     })?;
 
diff --git a/src/sources/datadog_agent/mod.rs b/src/sources/datadog_agent/mod.rs
index abb5463608641..18a1d33f42766 100644
--- a/src/sources/datadog_agent/mod.rs
+++ b/src/sources/datadog_agent/mod.rs
@@ -481,7 +481,7 @@ impl DatadogAgentSource {
                     encoding => {
                         return Err(ErrorMessage::new(
                             StatusCode::UNSUPPORTED_MEDIA_TYPE,
-                            format!("Unsupported encoding {}", encoding),
+                            format!("Unsupported encoding {encoding}"),
                         ))
                     }
                 }
@@ -542,7 +542,7 @@ fn handle_decode_error(encoding: &str, error: impl std::error::Error) -> ErrorMe
     });
     ErrorMessage::new(
         StatusCode::UNPROCESSABLE_ENTITY,
-        format!("Failed decompressing payload with {} decoder.", encoding),
+        format!("Failed decompressing payload with {encoding} decoder."),
     )
 }
 
diff --git a/src/sources/datadog_agent/tests.rs b/src/sources/datadog_agent/tests.rs
index f328c88615956..b60965c5cac8a 100644
--- a/src/sources/datadog_agent/tests.rs
+++ b/src/sources/datadog_agent/tests.rs
@@ -256,7 +256,7 @@ async fn source(
 
 async fn send_with_path(address: SocketAddr, body: &str, headers: HeaderMap, path: &str) -> u16 {
     reqwest::Client::new()
-        .post(format!("http://{}{}", address, path))
+        .post(format!("http://{address}{path}"))
         .headers(headers)
         .body(body.to_owned())
         .send()
diff --git a/src/sources/datadog_agent/traces.rs b/src/sources/datadog_agent/traces.rs
index 769ec25a16d1c..8ce4d9aff7172 100644
--- a/src/sources/datadog_agent/traces.rs
+++ b/src/sources/datadog_agent/traces.rs
@@ -72,7 +72,7 @@ fn build_trace_filter(
                         .map_err(|error| {
                             ErrorMessage::new(
                                 StatusCode::UNPROCESSABLE_ENTITY,
-                                format!("Error decoding Datadog traces: {:?}", error),
+                                format!("Error decoding Datadog traces: {error:?}"),
                             )
                         })
                     });
diff --git a/src/sources/demo_logs.rs b/src/sources/demo_logs.rs
index 91690deaea32e..7019ae54d61a8 100644
--- a/src/sources/demo_logs.rs
+++ b/src/sources/demo_logs.rs
@@ -171,7 +171,7 @@ impl OutputFormat {
         let line = lines.choose(&mut rand::rng()).unwrap();
 
         if sequence {
-            format!("{} {}", n, line)
+            format!("{n} {line}")
         } else {
             line.into()
         }
diff --git a/src/sources/dnstap/mod.rs b/src/sources/dnstap/mod.rs
index 70449fc413961..6fd229d590982 100644
--- a/src/sources/dnstap/mod.rs
+++ b/src/sources/dnstap/mod.rs
@@ -298,7 +298,7 @@ impl FrameHandler for CommonFrameHandler {
             },
         ) {
             emit!(DnstapParseError {
-                error: format!("Dnstap protobuf decode error {:?}.", err)
+                error: format!("Dnstap protobuf decode error {err:?}.")
             });
             return None;
         }
@@ -478,7 +478,7 @@ mod integration_tests {
                         break;
                     }
                     Err(e) => {
-                        println!("Error: {}", e);
+                        println!("Error: {e}");
                         break;
                     }
                 }
@@ -664,7 +664,7 @@ mod integration_tests {
         dnstap_exec(vec![
             "nslookup",
             "-type=A",
-            format!("-port={}", port).as_str(),
+            format!("-port={port}").as_str(),
             "h1.example.com",
             "localhost",
         ])
diff --git a/src/sources/docker_logs/tests.rs b/src/sources/docker_logs/tests.rs
index 05a6ad14151e2..ab878c0b21590 100644
--- a/src/sources/docker_logs/tests.rs
+++ b/src/sources/docker_logs/tests.rs
@@ -108,7 +108,7 @@ mod integration_tests {
             vec![
                 "sh",
                 "-c",
-                format!("echo before; i=0; while [ $i -le 50 ]; do sleep 0.1; echo {}; i=$((i+1)); done", log).as_str(),
+                format!("echo before; i=0; while [ $i -le 50 ]; do sleep 0.1; echo {log}; i=$((i+1)); done").as_str(),
             ],
             docker,
             false
@@ -186,7 +186,7 @@ mod integration_tests {
                 .for_each(|item| async move {
                     let info = item.unwrap();
                     if let Some(error) = info.error {
-                        panic!("{:?}", error);
+                        panic!("{error:?}");
                     }
                 })
                 .await
@@ -262,7 +262,7 @@ mod integration_tests {
         for _ in 0..n {
             if let Err(error) = container_run(&id, docker).await {
                 container_remove(&id, docker).await;
-                panic!("Container failed to start with error: {:?}", error);
+                panic!("Container failed to start with error: {error:?}");
             }
         }
         id
@@ -282,7 +282,7 @@ mod integration_tests {
         let id = eternal_container(name, label, log, &docker).await;
         if let Err(error) = container_start(&id, &docker).await {
             container_remove(&id, &docker).await;
-            panic!("Container start failed with error: {:?}", error);
+            panic!("Container start failed with error: {error:?}");
         }
 
         // Wait for before message
@@ -453,7 +453,7 @@ mod integration_tests {
             assert_eq!(log[CONTAINER], id.into());
             assert!(log.get(CREATED_AT).is_some());
             assert_eq!(log[IMAGE], "busybox".into());
-            assert!(log.get(format!("label.{}", label).as_str()).is_some());
+            assert!(log.get(format!("label.{label}").as_str()).is_some());
             assert_eq!(events[0].as_log()[&NAME], name.into());
             assert_eq!(
                 events[0].as_log()[log_schema().source_type_key().unwrap().to_string()],
@@ -650,7 +650,7 @@ mod integration_tests {
             assert_eq!(log[CONTAINER], id.into());
             assert!(log.get(CREATED_AT).is_some());
             assert_eq!(log[IMAGE], "busybox".into());
-            assert!(log.get(format!("label.{}", label).as_str()).is_some());
+            assert!(log.get(format!("label.{label}").as_str()).is_some());
             assert_eq!(events[0].as_log()[&NAME], name.into());
             assert_eq!(
                 events[0].as_log()[log_schema().source_type_key().unwrap().to_string()],
@@ -877,13 +877,13 @@ mod integration_tests {
 
             let command = emitted_messages
                 .into_iter()
-                .map(|message| format!("echo {:?}", message))
+                .map(|message| format!("echo {message:?}"))
                 .join(" && ");
 
             let id = cmd_container(name, None, vec!["sh", "-c", &command], &docker, false).await;
             if let Err(error) = container_run(&id, &docker).await {
                 container_remove(&id, &docker).await;
-                panic!("Container failed to start with error: {:?}", error);
+                panic!("Container failed to start with error: {error:?}");
             }
             let events = collect_n(out, expected_messages.len()).await;
             container_remove(&id, &docker).await;
@@ -947,13 +947,13 @@ mod integration_tests {
 
             let command = emitted_messages
                 .into_iter()
-                .map(|message| format!("echo {:?}", message))
+                .map(|message| format!("echo {message:?}"))
                 .join(" && ");
 
             let id = cmd_container(name, None, vec!["sh", "-c", &command], &docker, false).await;
             if let Err(error) = container_run(&id, &docker).await {
                 container_remove(&id, &docker).await;
-                panic!("Container failed to start with error: {:?}", error);
+                panic!("Container failed to start with error: {error:?}");
             }
             let events = collect_n(out, expected_messages.len()).await;
             container_remove(&id, &docker).await;
diff --git a/src/sources/eventstoredb_metrics/types.rs b/src/sources/eventstoredb_metrics/types.rs
index 9d6d4a0aadbfb..0255058d34698 100644
--- a/src/sources/eventstoredb_metrics/types.rs
+++ b/src/sources/eventstoredb_metrics/types.rs
@@ -260,7 +260,7 @@ where
         {
             if let Some(caps) = PERCENT_REGEX.captures(value) {
                 caps[1].parse::<usize>().map_err(|err| {
-                    Error::custom(format!("could not parse percent value into usize: {}", err))
+                    Error::custom(format!("could not parse percent value into usize: {err}"))
                 })
             } else {
                 Err(de::Error::invalid_value(
diff --git a/src/sources/exec/mod.rs b/src/sources/exec/mod.rs
index 5c17b536b8ebd..d3ec9eba03fb8 100644
--- a/src/sources/exec/mod.rs
+++ b/src/sources/exec/mod.rs
@@ -1,9 +1,4 @@
-use std::{
-    collections::HashMap,
-    io::{Error, ErrorKind},
-    path::PathBuf,
-    process::ExitStatus,
-};
+use std::{collections::HashMap, io::Error, path::PathBuf, process::ExitStatus};
 
 use chrono::Utc;
 use futures::StreamExt;
@@ -480,9 +475,10 @@ async fn run_command(
 
     // Optionally include stderr
     if config.include_stderr {
-        let stderr = child.stderr.take().ok_or_else(|| {
-            Error::new(ErrorKind::Other, "Unable to take stderr of spawned process")
-        })?;
+        let stderr = child
+            .stderr
+            .take()
+            .ok_or_else(|| Error::other("Unable to take stderr of spawned process"))?;
 
         // Create stderr async reader
         let stderr_reader = BufReader::new(stderr);
@@ -493,7 +489,7 @@ async fn run_command(
     let stdout = child
         .stdout
         .take()
-        .ok_or_else(|| Error::new(ErrorKind::Other, "Unable to take stdout of spawned process"))?;
+        .ok_or_else(|| Error::other("Unable to take stdout of spawned process"))?;
 
     // Create stdout async reader
     let stdout_reader = BufReader::new(stdout);
diff --git a/src/sources/exec/tests.rs b/src/sources/exec/tests.rs
index 043df952cb308..c070b00a24f3c 100644
--- a/src/sources/exec/tests.rs
+++ b/src/sources/exec/tests.rs
@@ -194,8 +194,8 @@ fn test_build_command() {
     expected_command.args(vec!["arg1".to_owned(), "arg2".to_owned()]);
 
     // Unfortunately the current_dir is not included in the formatted string
-    let expected_command_string = format!("{:?}", expected_command);
-    let command_string = format!("{:?}", command);
+    let expected_command_string = format!("{expected_command:?}");
+    let command_string = format!("{command:?}");
 
     assert_eq!(expected_command_string, command_string);
 }
diff --git a/src/sources/file.rs b/src/sources/file.rs
index b435d6afc8cbc..4c53dc6385b3f 100644
--- a/src/sources/file.rs
+++ b/src/sources/file.rs
@@ -1178,8 +1178,8 @@ mod tests {
             sleep_500_millis().await; // The files must be observed at their original lengths before writing to them
 
             for i in 0..n {
-                writeln!(&mut file1, "hello {}", i).unwrap();
-                writeln!(&mut file2, "goodbye {}", i).unwrap();
+                writeln!(&mut file1, "hello {i}").unwrap();
+                writeln!(&mut file2, "goodbye {i}").unwrap();
             }
 
             sleep_500_millis().await;
@@ -1258,7 +1258,7 @@ mod tests {
             sleep_500_millis().await; // The files must be observed at its original length before writing to it
 
             for i in 0..n {
-                writeln!(&mut file, "pretrunc {}", i).unwrap();
+                writeln!(&mut file, "pretrunc {i}").unwrap();
             }
 
             sleep_500_millis().await; // The writes must be observed before truncating
@@ -1269,7 +1269,7 @@ mod tests {
             sleep_500_millis().await; // The truncate must be observed before writing again
 
             for i in 0..n {
-                writeln!(&mut file, "posttrunc {}", i).unwrap();
+                writeln!(&mut file, "posttrunc {i}").unwrap();
             }
 
             sleep_500_millis().await;
@@ -1320,7 +1320,7 @@ mod tests {
             sleep_500_millis().await; // The files must be observed at its original length before writing to it
 
             for i in 0..n {
-                writeln!(&mut file, "prerot {}", i).unwrap();
+                writeln!(&mut file, "prerot {i}").unwrap();
             }
 
             sleep_500_millis().await; // The writes must be observed before rotating
@@ -1331,7 +1331,7 @@ mod tests {
             sleep_500_millis().await; // The rotation must be observed before writing again
 
             for i in 0..n {
-                writeln!(&mut file, "postrot {}", i).unwrap();
+                writeln!(&mut file, "postrot {i}").unwrap();
             }
 
             sleep_500_millis().await;
@@ -1388,10 +1388,10 @@ mod tests {
             sleep_500_millis().await; // The files must be observed at their original lengths before writing to them
 
             for i in 0..n {
-                writeln!(&mut file1, "1 {}", i).unwrap();
-                writeln!(&mut file2, "2 {}", i).unwrap();
-                writeln!(&mut file3, "3 {}", i).unwrap();
-                writeln!(&mut file4, "4 {}", i).unwrap();
+                writeln!(&mut file1, "1 {i}").unwrap();
+                writeln!(&mut file2, "2 {i}").unwrap();
+                writeln!(&mut file3, "3 {i}").unwrap();
+                writeln!(&mut file4, "4 {i}").unwrap();
             }
 
             sleep_500_millis().await;
@@ -1436,8 +1436,8 @@ mod tests {
             sleep_500_millis().await; // The files must be observed at their original lengths before writing to them
 
             for i in 0..n {
-                writeln!(&mut file1, "1 {}", i).unwrap();
-                writeln!(&mut file2, "2 {}", i).unwrap();
+                writeln!(&mut file1, "1 {i}").unwrap();
+                writeln!(&mut file2, "2 {i}").unwrap();
             }
 
             sleep_500_millis().await;
@@ -1690,7 +1690,7 @@ mod tests {
 
         let line_count = 4000;
         for i in 0..line_count {
-            writeln!(&mut file, "Here's a line for you: {}", i).unwrap();
+            writeln!(&mut file, "Here's a line for you: {i}").unwrap();
         }
         sleep_500_millis().await;
 
@@ -1873,7 +1873,7 @@ mod tests {
             writeln!(&mut file, "this is too long").unwrap();
             writeln!(&mut file, "11 eleven11").unwrap();
             let super_long = "This line is super long and will take up more space than BufReader's internal buffer, just to make sure that everything works properly when multiple read calls are involved".repeat(10000);
-            writeln!(&mut file, "{}", super_long).unwrap();
+            writeln!(&mut file, "{super_long}").unwrap();
             writeln!(&mut file, "exactly 10").unwrap();
             writeln!(&mut file, "it can end on a line that's too long").unwrap();
 
@@ -2332,7 +2332,7 @@ mod tests {
             sleep_500_millis().await; // The files must be observed at their original lengths before writing to them
 
             for i in 0..n {
-                writeln!(&mut file, "{}", i).unwrap();
+                writeln!(&mut file, "{i}").unwrap();
             }
             drop(file);
 
diff --git a/src/sources/fluent/message.rs b/src/sources/fluent/message.rs
index 25c3c0589082e..a7e34410d97f1 100644
--- a/src/sources/fluent/message.rs
+++ b/src/sources/fluent/message.rs
@@ -96,8 +96,7 @@ impl<'de> serde::de::Deserialize<'de> for FluentEventTime {
 
                 if tag != 0 {
                     return Err(serde::de::Error::custom(format!(
-                        "expected extension type 0 for fluent timestamp, got {}",
-                        tag
+                        "expected extension type 0 for fluent timestamp, got {tag}"
                     )));
                 }
 
diff --git a/src/sources/fluent/mod.rs b/src/sources/fluent/mod.rs
index f1d70afa95293..642940c58a2e9 100644
--- a/src/sources/fluent/mod.rs
+++ b/src/sources/fluent/mod.rs
@@ -460,13 +460,13 @@ pub enum DecodeError {
 impl std::fmt::Display for DecodeError {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         match self {
-            DecodeError::IO(err) => write!(f, "{}", err),
-            DecodeError::Decode(err) => write!(f, "{}", err),
+            DecodeError::IO(err) => write!(f, "{err}"),
+            DecodeError::Decode(err) => write!(f, "{err}"),
             DecodeError::UnknownCompression(compression) => {
-                write!(f, "unknown compression: {}", compression)
+                write!(f, "unknown compression: {compression}")
             }
             DecodeError::UnexpectedValue(value) => {
-                write!(f, "unexpected msgpack value, ignoring: {}", value)
+                write!(f, "unexpected msgpack value, ignoring: {value}")
             }
         }
     }
@@ -1280,7 +1280,7 @@ mod integration_tests {
     fn make_file(name: &str, content: &str) -> tempfile::TempDir {
         let dir = tempfile::tempdir().unwrap();
         let mut file = File::create(dir.path().join(name)).unwrap();
-        write!(&mut file, "{}", content).unwrap();
+        write!(&mut file, "{content}").unwrap();
         dir
     }
 
@@ -1334,7 +1334,7 @@ mod integration_tests {
                 .run(async move {
                     wait_for_tcp(test_address).await;
                     reqwest::Client::new()
-                        .post(format!("http://{}/", test_address))
+                        .post(format!("http://{test_address}/"))
                         .header("content-type", "application/json")
                         .body(body.to_string())
                         .send()
@@ -1415,7 +1415,7 @@ mod integration_tests {
                 .run(async move {
                     wait_for_tcp(test_address).await;
                     reqwest::Client::new()
-                        .post(format!("http://{}/", test_address))
+                        .post(format!("http://{test_address}/"))
                         .header("content-type", "application/json")
                         .body(body.to_string())
                         .send()
diff --git a/src/sources/heroku_logs.rs b/src/sources/heroku_logs.rs
index e6bcfe1a842f0..8417ce2dad7d4 100644
--- a/src/sources/heroku_logs.rs
+++ b/src/sources/heroku_logs.rs
@@ -326,7 +326,7 @@ fn get_header<'a>(header_map: &'a HeaderMap, name: &str) -> Result<&'a str, Erro
 fn header_error_message(name: &str, msg: &str) -> ErrorMessage {
     ErrorMessage::new(
         StatusCode::BAD_REQUEST,
-        format!("Invalid request header {:?}: {:?}", name, msg),
+        format!("Invalid request header {name:?}: {msg:?}"),
     )
 }
 
@@ -493,7 +493,7 @@ mod tests {
         query: &str,
     ) -> u16 {
         let len = body.lines().count();
-        let mut req = reqwest::Client::new().post(format!("http://{}/events?{}", address, query));
+        let mut req = reqwest::Client::new().post(format!("http://{address}/events?{query}"));
         if let Some(HttpServerAuthConfig::Basic { username, password }) = auth {
             req = req.basic_auth(username, Some(password.inner()));
         }
diff --git a/src/sources/host_metrics/cgroups.rs b/src/sources/host_metrics/cgroups.rs
index d0aecd4fce8c6..1ad0bfe2dc137 100644
--- a/src/sources/host_metrics/cgroups.rs
+++ b/src/sources/host_metrics/cgroups.rs
@@ -529,8 +529,8 @@ mod tests {
         base.d("memory");
         base.d("unified");
         for subdir in SUBDIRS {
-            base.group(&format!("unified/{}", subdir), CPU_STAT, Some(""));
-            base.group(&format!("memory/{}", subdir), MEMORY_STAT, None);
+            base.group(&format!("unified/{subdir}"), CPU_STAT, Some(""));
+            base.group(&format!("memory/{subdir}"), MEMORY_STAT, None);
         }
         base.test().await;
     }
@@ -548,11 +548,11 @@ mod tests {
         base.d("unified");
         for subdir in SUBDIRS {
             base.group(
-                &format!("unified/{}", subdir),
+                &format!("unified/{subdir}"),
                 if subdir == "." { NONE } else { CPU_STAT },
                 Some(""),
             );
-            base.group(&format!("memory/{}", subdir), MEMORY_STAT, None);
+            base.group(&format!("memory/{subdir}"), MEMORY_STAT, None);
         }
         base.test().await;
     }
@@ -565,8 +565,8 @@ mod tests {
         base.d("cpu");
         base.d("memory");
         for subdir in SUBDIRS {
-            base.group(&format!("cpu/{}", subdir), CPU_STAT, None);
-            base.group(&format!("memory/{}", subdir), MEMORY_STAT, None);
+            base.group(&format!("cpu/{subdir}"), CPU_STAT, None);
+            base.group(&format!("memory/{subdir}"), MEMORY_STAT, None);
         }
     }
 
diff --git a/src/sources/host_metrics/disk.rs b/src/sources/host_metrics/disk.rs
index a24d20cf8b241..03ec6e0b82488 100644
--- a/src/sources/host_metrics/disk.rs
+++ b/src/sources/host_metrics/disk.rs
@@ -103,12 +103,7 @@ mod tests {
             "disk_written_bytes_total",
             "disk_writes_completed_total",
         ] {
-            assert_eq!(
-                count_name(&metrics, name),
-                metrics.len() / 4,
-                "name={}",
-                name
-            );
+            assert_eq!(count_name(&metrics, name), metrics.len() / 4, "name={name}");
         }
 
         // They should all have a "device" tag
diff --git a/src/sources/host_metrics/filesystem.rs b/src/sources/host_metrics/filesystem.rs
index d01094ffb3951..c093e6797155e 100644
--- a/src/sources/host_metrics/filesystem.rs
+++ b/src/sources/host_metrics/filesystem.rs
@@ -173,12 +173,7 @@ mod tests {
             "filesystem_used_bytes",
             "filesystem_used_ratio",
         ] {
-            assert_eq!(
-                count_name(&metrics, name),
-                metrics.len() / 4,
-                "name={}",
-                name
-            );
+            assert_eq!(count_name(&metrics, name), metrics.len() / 4, "name={name}");
         }
 
         // They should all have "filesystem" and "mountpoint" tags
diff --git a/src/sources/host_metrics/mod.rs b/src/sources/host_metrics/mod.rs
index 975a1df88a21d..ac3967b706276 100644
--- a/src/sources/host_metrics/mod.rs
+++ b/src/sources/host_metrics/mod.rs
@@ -343,7 +343,7 @@ impl HostMetricsConfig {
     fn has_collector(&self, collector: Collector) -> bool {
         match &self.collectors {
             None => true,
-            Some(collectors) => collectors.iter().any(|&c| c == collector),
+            Some(collectors) => collectors.contains(&collector),
         }
     }
 }
@@ -770,8 +770,7 @@ mod tests {
 
             assert!(
                 all_metrics_count > some_metrics.len(),
-                "collector={:?}",
-                collector
+                "collector={collector:?}"
             );
         }
     }
@@ -905,7 +904,7 @@ mod tests {
         // Pick an arbitrary key value
         if let Some(key) = keys.into_iter().next() {
             let key_prefix = &key[..key.len() - 1].to_string();
-            let key_prefix_pattern = PatternWrapper::try_from(format!("{}*", key_prefix)).unwrap();
+            let key_prefix_pattern = PatternWrapper::try_from(format!("{key_prefix}*")).unwrap();
             let key_pattern = PatternWrapper::try_from(key.clone()).unwrap();
 
             let filter = FilterList {
diff --git a/src/sources/http_client/client.rs b/src/sources/http_client/client.rs
index a0e4f54ab9994..6e30ba1ae856e 100644
--- a/src/sources/http_client/client.rs
+++ b/src/sources/http_client/client.rs
@@ -202,7 +202,7 @@ pub struct CompiledParam {
 
 #[derive(Clone)]
 pub enum CompiledQueryParameterValue {
-    SingleParam(CompiledParam),
+    SingleParam(Box<CompiledParam>),
     MultiParams(Vec<CompiledParam>),
 }
 
@@ -278,9 +278,9 @@ impl Query {
         functions: &[Box<dyn Function>],
     ) -> CompiledQueryParameterValue {
         match value {
-            QueryParameterValue::SingleParam(param) => {
-                CompiledQueryParameterValue::SingleParam(Self::compile_value(param, functions))
-            }
+            QueryParameterValue::SingleParam(param) => CompiledQueryParameterValue::SingleParam(
+                Box::new(Self::compile_value(param, functions)),
+            ),
             QueryParameterValue::MultiParams(params) => {
                 let compiled = params
                     .iter()
diff --git a/src/sources/http_client/tests.rs b/src/sources/http_client/tests.rs
index f215e4ecf8743..56df12eac1849 100644
--- a/src/sources/http_client/tests.rs
+++ b/src/sources/http_client/tests.rs
@@ -86,7 +86,7 @@ async fn bytes_decoding() {
     tokio::spawn(warp::serve(dummy_endpoint).run(in_addr));
 
     run_compliance(HttpClientConfig {
-        endpoint: format!("http://{}/endpoint", in_addr),
+        endpoint: format!("http://{in_addr}/endpoint"),
         interval: INTERVAL,
         timeout: TIMEOUT,
         query: HashMap::new(),
@@ -115,7 +115,7 @@ async fn json_decoding_newline_delimited() {
     wait_for_tcp(in_addr).await;
 
     run_compliance(HttpClientConfig {
-        endpoint: format!("http://{}/endpoint", in_addr),
+        endpoint: format!("http://{in_addr}/endpoint"),
         interval: INTERVAL,
         timeout: TIMEOUT,
         query: HashMap::new(),
@@ -144,7 +144,7 @@ async fn json_decoding_character_delimited() {
     wait_for_tcp(in_addr).await;
 
     run_compliance(HttpClientConfig {
-        endpoint: format!("http://{}/endpoint", in_addr),
+        endpoint: format!("http://{in_addr}/endpoint"),
         interval: INTERVAL,
         timeout: TIMEOUT,
         query: HashMap::new(),
@@ -171,13 +171,13 @@ async fn request_query_applied() {
 
     let dummy_endpoint = warp::path!("endpoint")
         .and(warp::query::raw())
-        .map(|query| format!(r#"{{"data" : "{}"}}"#, query));
+        .map(|query| format!(r#"{{"data" : "{query}"}}"#));
 
     tokio::spawn(warp::serve(dummy_endpoint).run(in_addr));
     wait_for_tcp(in_addr).await;
 
     let events = run_compliance(HttpClientConfig {
-        endpoint: format!("http://{}/endpoint?key1=val1", in_addr),
+        endpoint: format!("http://{in_addr}/endpoint?key1=val1"),
         interval: INTERVAL,
         timeout: TIMEOUT,
         query: HashMap::from([
@@ -238,13 +238,13 @@ async fn request_query_vrl_applied() {
 
     let dummy_endpoint = warp::path!("endpoint")
         .and(warp::query::raw())
-        .map(|query| format!(r#"{{"data" : "{}"}}"#, query));
+        .map(|query| format!(r#"{{"data" : "{query}"}}"#));
 
     tokio::spawn(warp::serve(dummy_endpoint).run(in_addr));
     wait_for_tcp(in_addr).await;
 
     let events = run_compliance(HttpClientConfig {
-        endpoint: format!("http://{}/endpoint", in_addr),
+        endpoint: format!("http://{in_addr}/endpoint"),
         interval: INTERVAL,
         timeout: TIMEOUT,
         query: HashMap::from([
@@ -368,14 +368,14 @@ async fn request_query_vrl_dynamic_updates() {
     // A handler that returns the query parameters as part of the response
     let dummy_endpoint = warp::path!("endpoint")
         .and(warp::query::raw())
-        .map(|query| format!(r#"{{"data" : "{}"}}"#, query));
+        .map(|query| format!(r#"{{"data" : "{query}"}}"#));
 
     tokio::spawn(warp::serve(dummy_endpoint).run(in_addr));
     wait_for_tcp(in_addr).await;
 
     // The timestamp should be different for each event
     let events = run_compliance(HttpClientConfig {
-        endpoint: format!("http://{}/endpoint", in_addr),
+        endpoint: format!("http://{in_addr}/endpoint"),
         interval: Duration::from_millis(100),
         timeout: TIMEOUT,
         query: HashMap::from([(
@@ -445,7 +445,7 @@ async fn headers_applied() {
     wait_for_tcp(in_addr).await;
 
     run_compliance(HttpClientConfig {
-        endpoint: format!("http://{}/endpoint", in_addr),
+        endpoint: format!("http://{in_addr}/endpoint"),
         interval: INTERVAL,
         timeout: TIMEOUT,
         query: HashMap::new(),
@@ -477,7 +477,7 @@ async fn accept_header_override() {
     wait_for_tcp(in_addr).await;
 
     run_compliance(HttpClientConfig {
-        endpoint: format!("http://{}/endpoint", in_addr),
+        endpoint: format!("http://{in_addr}/endpoint"),
         interval: INTERVAL,
         timeout: TIMEOUT,
         query: HashMap::new(),
diff --git a/src/sources/http_server.rs b/src/sources/http_server.rs
index 6ca55f9487dae..df5fa30144389 100644
--- a/src/sources/http_server.rs
+++ b/src/sources/http_server.rs
@@ -509,7 +509,7 @@ impl HttpSource for SimpleHttpSource {
                     // handling is needed here
                     return Err(ErrorMessage::new(
                         StatusCode::BAD_REQUEST,
-                        format!("Failed decoding body: {}", error),
+                        format!("Failed decoding body: {error}"),
                     ));
                 }
             }
@@ -629,7 +629,7 @@ mod tests {
 
     async fn send(address: SocketAddr, body: &str) -> u16 {
         reqwest::Client::new()
-            .post(format!("http://{}/", address))
+            .post(format!("http://{address}/"))
             .body(body.to_owned())
             .send()
             .await
@@ -640,7 +640,7 @@ mod tests {
 
     async fn send_with_headers(address: SocketAddr, body: &str, headers: HeaderMap) -> u16 {
         reqwest::Client::new()
-            .post(format!("http://{}/", address))
+            .post(format!("http://{address}/"))
             .headers(headers)
             .body(body.to_owned())
             .send()
@@ -652,7 +652,7 @@ mod tests {
 
     async fn send_with_query(address: SocketAddr, body: &str, query: &str) -> u16 {
         reqwest::Client::new()
-            .post(format!("http://{}?{}", address, query))
+            .post(format!("http://{address}?{query}"))
             .body(body.to_owned())
             .send()
             .await
@@ -663,7 +663,7 @@ mod tests {
 
     async fn send_with_path(address: SocketAddr, body: &str, path: &str) -> u16 {
         reqwest::Client::new()
-            .post(format!("http://{}{}", address, path))
+            .post(format!("http://{address}{path}"))
             .body(body.to_owned())
             .send()
             .await
diff --git a/src/sources/journald.rs b/src/sources/journald.rs
index 9eb42f4c377d7..e5df0dbf68e6a 100644
--- a/src/sources/journald.rs
+++ b/src/sources/journald.rs
@@ -683,7 +683,7 @@ impl StartJournalctl {
         }
 
         if let Some(namespace) = &self.journal_namespace {
-            command.arg(format!("--namespace={}", namespace));
+            command.arg(format!("--namespace={namespace}"));
         }
 
         if self.current_boot_only {
@@ -691,7 +691,7 @@ impl StartJournalctl {
         }
 
         if let Some(cursor) = checkpoint {
-            command.arg(format!("--after-cursor={}", cursor));
+            command.arg(format!("--after-cursor={cursor}"));
         } else if self.since_now {
             command.arg("--since=now");
         } else {
@@ -846,7 +846,7 @@ fn fixup_unit(unit: &str) -> String {
     if unit.contains('.') {
         unit.into()
     } else {
-        format!("{}.service", unit)
+        format!("{unit}.service")
     }
 }
 
@@ -996,7 +996,7 @@ impl Checkpointer {
 
     async fn set(&mut self, token: &str) -> Result<(), io::Error> {
         self.file.seek(SeekFrom::Start(0)).await?;
-        self.file.write_all(format!("{}\n", token).as_bytes()).await
+        self.file.write_all(format!("{token}\n").as_bytes()).await
     }
 
     async fn get(&mut self) -> Result<Option<String>, io::Error> {
@@ -1091,7 +1091,7 @@ mod checkpointer_tests {
         assert_eq!(checkpointer.get().await.unwrap().unwrap(), "first test");
         let contents = read_to_string(filename.clone())
             .await
-            .unwrap_or_else(|_| panic!("Failed to read: {:?}", filename));
+            .unwrap_or_else(|_| panic!("Failed to read: {filename:?}"));
         assert!(contents.starts_with("first test\n"));
 
         checkpointer
@@ -1101,7 +1101,7 @@ mod checkpointer_tests {
         assert_eq!(checkpointer.get().await.unwrap().unwrap(), "second");
         let contents = read_to_string(filename.clone())
             .await
-            .unwrap_or_else(|_| panic!("Failed to read: {:?}", filename));
+            .unwrap_or_else(|_| panic!("Failed to read: {filename:?}"));
         assert!(contents.starts_with("second\n"));
     }
 }
@@ -1488,7 +1488,7 @@ mod tests {
             cursor,
             extra_args,
         );
-        let cmd_line = format!("{:?}", command);
+        let cmd_line = format!("{command:?}");
         assert!(!cmd_line.contains("--directory="));
         assert!(!cmd_line.contains("--namespace="));
         assert!(!cmd_line.contains("--boot"));
@@ -1508,7 +1508,7 @@ mod tests {
             cursor,
             extra_args,
         );
-        let cmd_line = format!("{:?}", command);
+        let cmd_line = format!("{command:?}");
         assert!(cmd_line.contains("--since=now"));
 
         let journal_dir = Some(PathBuf::from("/tmp/journal-dir"));
@@ -1526,7 +1526,7 @@ mod tests {
             cursor,
             extra_args,
         );
-        let cmd_line = format!("{:?}", command);
+        let cmd_line = format!("{command:?}");
         assert!(cmd_line.contains("--directory=/tmp/journal-dir"));
         assert!(cmd_line.contains("--namespace=my_namespace"));
         assert!(cmd_line.contains("--boot"));
diff --git a/src/sources/kafka.rs b/src/sources/kafka.rs
index 7d0c1cdf26904..5fa512e0e10e3 100644
--- a/src/sources/kafka.rs
+++ b/src/sources/kafka.rs
@@ -1602,8 +1602,8 @@ mod integration_test {
 
         (0..count)
             .map(|i| async move {
-                let text = format!("{} {:03}", TEXT, i);
-                let key = format!("{} {}", KEY, i);
+                let text = format!("{TEXT} {i:03}");
+                let key = format!("{KEY} {i}");
                 let record = FutureRecord::to(topic_name)
                     .payload(&text)
                     .key(&key)
@@ -1613,7 +1613,7 @@ mod integration_test {
                         value: Some(HEADER_VALUE),
                     }));
                 if let Err(error) = producer.send(record, Timeout::Never).await {
-                    panic!("Cannot send event to Kafka: {:?}", error);
+                    panic!("Cannot send event to Kafka: {error:?}");
                 }
             })
             .collect::<FuturesUnordered<_>>()
@@ -1709,12 +1709,9 @@ mod integration_test {
             if let LogNamespace::Legacy = log_namespace {
                 assert_eq!(
                     event.as_log()[log_schema().message_key().unwrap().to_string()],
-                    format!("{} {:03}", TEXT, i).into()
-                );
-                assert_eq!(
-                    event.as_log()["message_key"],
-                    format!("{} {}", KEY, i).into()
+                    format!("{TEXT} {i:03}").into()
                 );
+                assert_eq!(event.as_log()["message_key"], format!("{KEY} {i}").into());
                 assert_eq!(
                     event.as_log()[log_schema().source_type_key().unwrap().to_string()],
                     "kafka".into()
@@ -1937,14 +1934,14 @@ mod integration_test {
             Offset::Offset(offset) => {
                 assert!((offset as isize - events1.len() as isize).abs() <= 1)
             }
-            o => panic!("Invalid offset for partition 0 {:?}", o),
+            o => panic!("Invalid offset for partition 0 {o:?}"),
         }
 
         match fetch_tpl_offset(&group_id, &topic, 1) {
             Offset::Offset(offset) => {
                 assert!((offset as isize - events2.len() as isize).abs() <= 1)
             }
-            o => panic!("Invalid offset for partition 0 {:?}", o),
+            o => panic!("Invalid offset for partition 0 {o:?}"),
         }
 
         let mut all_events = events1
@@ -1965,7 +1962,7 @@ mod integration_test {
             .parse()
             .expect("Number of messages to send to kafka.");
         let expect_count: usize = std::env::var("KAFKA_EXPECT_COUNT")
-            .unwrap_or_else(|_| format!("{}", send_count))
+            .unwrap_or_else(|_| format!("{send_count}"))
             .parse()
             .expect("Number of messages to expect consumers to process.");
         let delay_ms: u64 = std::env::var("KAFKA_SHUTDOWN_DELAY")
@@ -2037,7 +2034,7 @@ mod integration_test {
             .parse()
             .expect("Number of messages to send to kafka.");
         let expect_count: usize = std::env::var("KAFKA_EXPECT_COUNT")
-            .unwrap_or_else(|_| format!("{}", send_count))
+            .unwrap_or_else(|_| format!("{send_count}"))
             .parse()
             .expect("Number of messages to expect consumers to process.");
         let delay_ms: u64 = std::env::var("KAFKA_CONSUMER_DELAY")
diff --git a/src/sources/kubernetes_logs/mod.rs b/src/sources/kubernetes_logs/mod.rs
index 4adf82d61905f..7552df0abd8c6 100644
--- a/src/sources/kubernetes_logs/mod.rs
+++ b/src/sources/kubernetes_logs/mod.rs
@@ -585,8 +585,7 @@ impl Source {
         {
             std::env::var(SELF_NODE_NAME_ENV_KEY).map_err(|_| {
                 format!(
-                    "self_node_name config value or {} env var is not set",
-                    SELF_NODE_NAME_ENV_KEY
+                    "self_node_name config value or {SELF_NODE_NAME_ENV_KEY} env var is not set"
                 )
             })?
         } else {
@@ -612,7 +611,7 @@ impl Source {
             }
             None => ClientConfig::infer().await?,
         };
-        if let Ok(user_agent) = HeaderValue::from_str(&format!("{}/{}", PKG_NAME, PKG_VERSION)) {
+        if let Ok(user_agent) = HeaderValue::from_str(&format!("{PKG_NAME}/{PKG_VERSION}")) {
             client_config
                 .headers
                 .push((HeaderName::from_static("user-agent"), user_agent));
@@ -1120,7 +1119,7 @@ fn prepare_field_selector(config: &Config, self_node_name: &str) -> crate::Resul
         ?self_node_name
     );
 
-    let field_selector = format!("spec.nodeName={}", self_node_name);
+    let field_selector = format!("spec.nodeName={self_node_name}");
 
     if config.extra_field_selector.is_empty() {
         return Ok(field_selector);
@@ -1134,7 +1133,7 @@ fn prepare_field_selector(config: &Config, self_node_name: &str) -> crate::Resul
 
 // This function constructs the selector for a node to annotate entries with a node metadata.
 fn prepare_node_selector(self_node_name: &str) -> crate::Result<String> {
-    Ok(format!("metadata.name={}", self_node_name))
+    Ok(format!("metadata.name={self_node_name}"))
 }
 
 // This function constructs the effective label selector to use, based on
@@ -1146,7 +1145,7 @@ fn prepare_label_selector(selector: &str) -> String {
         return BUILT_IN.to_string();
     }
 
-    format!("{},{}", BUILT_IN, selector)
+    format!("{BUILT_IN},{selector}")
 }
 
 #[cfg(test)]
diff --git a/src/sources/kubernetes_logs/parser/docker.rs b/src/sources/kubernetes_logs/parser/docker.rs
index 0d74d829a8a6c..118cfbb5d799d 100644
--- a/src/sources/kubernetes_logs/parser/docker.rs
+++ b/src/sources/kubernetes_logs/parser/docker.rs
@@ -339,7 +339,7 @@ pub mod tests {
             let mut output = OutputBuffer::default();
             parser.transform(&mut output, input.into());
 
-            assert!(output.is_empty(), "Expected no events: {:?}", output);
+            assert!(output.is_empty(), "Expected no events: {output:?}");
         }
     }
 
@@ -355,7 +355,7 @@ pub mod tests {
             let mut output = OutputBuffer::default();
             parser.transform(&mut output, input.into());
 
-            assert!(output.is_empty(), "Expected no events: {:?}", output);
+            assert!(output.is_empty(), "Expected no events: {output:?}");
         }
     }
 }
diff --git a/src/sources/kubernetes_logs/parser/mod.rs b/src/sources/kubernetes_logs/parser/mod.rs
index cfaf1488a20a4..3bb761fab59c6 100644
--- a/src/sources/kubernetes_logs/parser/mod.rs
+++ b/src/sources/kubernetes_logs/parser/mod.rs
@@ -131,7 +131,7 @@ mod tests {
             let mut output = OutputBuffer::default();
             parser.transform(&mut output, input.into());
 
-            assert!(output.is_empty(), "Expected no events: {:?}", output);
+            assert!(output.is_empty(), "Expected no events: {output:?}");
         }
     }
 
@@ -159,7 +159,7 @@ mod tests {
             let mut output = OutputBuffer::default();
             parser.transform(&mut output, input.into());
 
-            assert!(output.is_empty(), "Expected no events: {:?}", output);
+            assert!(output.is_empty(), "Expected no events: {output:?}");
         }
     }
 }
diff --git a/src/sources/mqtt/integration_tests.rs b/src/sources/mqtt/integration_tests.rs
index cdc2c41fde5ab..7ba91d7a1e954 100644
--- a/src/sources/mqtt/integration_tests.rs
+++ b/src/sources/mqtt/integration_tests.rs
@@ -108,7 +108,7 @@ async fn mqtt_happy() {
                 .unwrap()
                 .to_string_lossy();
             if !expected_messages.remove(message.as_ref()) {
-                panic!("Received unexpected message: {:?}", message);
+                panic!("Received unexpected message: {message:?}");
             }
         }
         assert!(expected_messages.is_empty());
diff --git a/src/sources/nats.rs b/src/sources/nats.rs
index f1c9a865c7401..8e60316a397f5 100644
--- a/src/sources/nats.rs
+++ b/src/sources/nats.rs
@@ -455,8 +455,7 @@ mod integration_tests {
         let r = publish_and_check(conf).await;
         assert!(
             r.is_ok(),
-            "publish_and_check failed, expected Ok(()), got: {:?}",
-            r
+            "publish_and_check failed, expected Ok(()), got: {r:?}"
         );
     }
 
@@ -488,8 +487,7 @@ mod integration_tests {
         let r = publish_and_check(conf).await;
         assert!(
             r.is_ok(),
-            "publish_and_check failed, expected Ok(()), got: {:?}",
-            r
+            "publish_and_check failed, expected Ok(()), got: {r:?}"
         );
     }
 
@@ -521,8 +519,7 @@ mod integration_tests {
         let r = publish_and_check(conf).await;
         assert!(
             matches!(r, Err(BuildError::Connect { .. })),
-            "publish_and_check failed, expected BuildError::Connect, got: {:?}",
-            r
+            "publish_and_check failed, expected BuildError::Connect, got: {r:?}"
         );
     }
 
@@ -553,8 +550,7 @@ mod integration_tests {
         let r = publish_and_check(conf).await;
         assert!(
             r.is_ok(),
-            "publish_and_check failed, expected Ok(()), got: {:?}",
-            r
+            "publish_and_check failed, expected Ok(()), got: {r:?}"
         );
     }
 
@@ -585,8 +581,7 @@ mod integration_tests {
         let r = publish_and_check(conf).await;
         assert!(
             matches!(r, Err(BuildError::Connect { .. })),
-            "publish_and_check failed, expected BuildError::Connect, got: {:?}",
-            r
+            "publish_and_check failed, expected BuildError::Connect, got: {r:?}"
         );
     }
 
@@ -618,8 +613,7 @@ mod integration_tests {
         let r = publish_and_check(conf).await;
         assert!(
             r.is_ok(),
-            "publish_and_check failed, expected Ok(()), got: {:?}",
-            r
+            "publish_and_check failed, expected Ok(()), got: {r:?}"
         );
     }
 
@@ -651,8 +645,7 @@ mod integration_tests {
         let r = publish_and_check(conf).await;
         assert!(
             matches!(r, Err(BuildError::Connect { .. })),
-            "publish_and_check failed, expected BuildError::Config, got: {:?}",
-            r
+            "publish_and_check failed, expected BuildError::Config, got: {r:?}"
         );
     }
 
@@ -685,8 +678,7 @@ mod integration_tests {
         let r = publish_and_check(conf).await;
         assert!(
             r.is_ok(),
-            "publish_and_check failed, expected Ok(()), got: {:?}",
-            r
+            "publish_and_check failed, expected Ok(()), got: {r:?}"
         );
     }
 
@@ -713,8 +705,7 @@ mod integration_tests {
         let r = publish_and_check(conf).await;
         assert!(
             matches!(r, Err(BuildError::Connect { .. })),
-            "publish_and_check failed, expected BuildError::Connect, got: {:?}",
-            r
+            "publish_and_check failed, expected BuildError::Connect, got: {r:?}"
         );
     }
 
@@ -749,8 +740,7 @@ mod integration_tests {
         let r = publish_and_check(conf).await;
         assert!(
             r.is_ok(),
-            "publish_and_check failed, expected Ok(()), got: {:?}",
-            r
+            "publish_and_check failed, expected Ok(()), got: {r:?}"
         );
     }
 
@@ -783,8 +773,7 @@ mod integration_tests {
         let r = publish_and_check(conf).await;
         assert!(
             matches!(r, Err(BuildError::Connect { .. })),
-            "publish_and_check failed, expected BuildError::Connect, got: {:?}",
-            r
+            "publish_and_check failed, expected BuildError::Connect, got: {r:?}"
         );
     }
 
@@ -821,8 +810,7 @@ mod integration_tests {
         let r = publish_and_check(conf).await;
         assert!(
             r.is_ok(),
-            "publish_and_check failed, expected Ok(()), got: {:?}",
-            r
+            "publish_and_check failed, expected Ok(()), got: {r:?}"
         );
     }
 
@@ -859,8 +847,7 @@ mod integration_tests {
         let r = publish_and_check(conf).await;
         assert!(
             matches!(r, Err(BuildError::Connect { .. })),
-            "publish_and_check failed, expected BuildError::Connect, got: {:?}",
-            r
+            "publish_and_check failed, expected BuildError::Connect, got: {r:?}"
         );
     }
 
@@ -885,8 +872,7 @@ mod integration_tests {
         let r = publish_and_check(conf).await;
         assert!(
             r.is_ok(),
-            "publish_and_check failed for multiple URLs, expected Ok(()), got: {:?}",
-            r
+            "publish_and_check failed for multiple URLs, expected Ok(()), got: {r:?}"
         );
     }
 
@@ -911,8 +897,7 @@ mod integration_tests {
         let r = publish_and_check(conf).await;
         assert!(
             matches!(r, Err(BuildError::Connect { .. })),
-            "publish_and_check failed for bad URLs, expected BuildError::Connect, got: {:?}",
-            r
+            "publish_and_check failed for bad URLs, expected BuildError::Connect, got: {r:?}"
         );
     }
 }
diff --git a/src/sources/nginx_metrics/mod.rs b/src/sources/nginx_metrics/mod.rs
index f7726c264c29f..c475e3345f0a1 100644
--- a/src/sources/nginx_metrics/mod.rs
+++ b/src/sources/nginx_metrics/mod.rs
@@ -188,7 +188,7 @@ impl NginxMetrics {
         let uri: Uri = endpoint.parse().context(HostInvalidUriSnafu)?;
         Ok(match (uri.host().unwrap_or(""), uri.port()) {
             (host, None) => host.to_owned(),
-            (host, Some(port)) => format!("{}:{}", host, port),
+            (host, Some(port)) => format!("{host}:{port}"),
         })
     }
 
diff --git a/src/sources/opentelemetry/http.rs b/src/sources/opentelemetry/http.rs
index ec3c0c2734622..d3c3798dd14d6 100644
--- a/src/sources/opentelemetry/http.rs
+++ b/src/sources/opentelemetry/http.rs
@@ -248,7 +248,7 @@ fn decode_trace_body(
     let request = ExportTraceServiceRequest::decode(body).map_err(|error| {
         ErrorMessage::new(
             StatusCode::BAD_REQUEST,
-            format!("Could not decode request: {}", error),
+            format!("Could not decode request: {error}"),
         )
     })?;
 
@@ -274,7 +274,7 @@ fn decode_log_body(
     let request = ExportLogsServiceRequest::decode(body).map_err(|error| {
         ErrorMessage::new(
             StatusCode::BAD_REQUEST,
-            format!("Could not decode request: {}", error),
+            format!("Could not decode request: {error}"),
         )
     })?;
 
@@ -299,7 +299,7 @@ fn decode_metrics_body(
     let request = ExportMetricsServiceRequest::decode(body).map_err(|error| {
         ErrorMessage::new(
             StatusCode::BAD_REQUEST,
-            format!("Could not decode request: {}", error),
+            format!("Could not decode request: {error}"),
         )
     })?;
 
@@ -367,7 +367,7 @@ async fn handle_rejection(err: Rejection) -> Result<impl Reply, std::convert::In
     } else {
         let reply = protobuf(Status {
             code: 2, // UNKNOWN - OTLP doesn't require use of status.code, but we can't encode a None here
-            message: format!("{:?}", err),
+            message: format!("{err:?}"),
             ..Default::default()
         });
 
diff --git a/src/sources/opentelemetry/tests.rs b/src/sources/opentelemetry/tests.rs
index dd0829956ce71..a0fa9868acc58 100644
--- a/src/sources/opentelemetry/tests.rs
+++ b/src/sources/opentelemetry/tests.rs
@@ -1173,7 +1173,7 @@ async fn http_headers() {
             }],
         };
         let _res = client
-            .post(format!("http://{}/v1/logs", http_addr))
+            .post(format!("http://{http_addr}/v1/logs"))
             .header("Content-Type", "application/x-protobuf")
             .header("User-Agent", "Test")
             .body(req.encode_to_vec())
diff --git a/src/sources/prometheus/pushgateway.rs b/src/sources/prometheus/pushgateway.rs
index 88291d4513abe..8a08b126489a0 100644
--- a/src/sources/prometheus/pushgateway.rs
+++ b/src/sources/prometheus/pushgateway.rs
@@ -145,7 +145,7 @@ impl HttpSource for PushgatewaySource {
             |error| {
                 ErrorMessage::new(
                     http::StatusCode::UNPROCESSABLE_ENTITY,
-                    format!("Failed to parse metrics body: {}", error),
+                    format!("Failed to parse metrics body: {error}"),
                 )
             },
         )
@@ -234,20 +234,14 @@ fn decode_label_pair(k: &str, v: &str) -> Result<(String, String), ErrorMessage>
     let decoded_bytes = BASE64_URL_SAFE.decode(padded_value).map_err(|_| {
         ErrorMessage::new(
             http::StatusCode::BAD_REQUEST,
-            format!(
-                "Grouping key invalid - invalid base64 value for key {}: {}",
-                k, v
-            ),
+            format!("Grouping key invalid - invalid base64 value for key {k}: {v}"),
         )
     })?;
 
     let decoded = String::from_utf8(decoded_bytes).map_err(|_| {
         ErrorMessage::new(
             http::StatusCode::BAD_REQUEST,
-            format!(
-                "Grouping key invalid - invalid UTF-8 in decoded base64 value for key {}",
-                k
-            ),
+            format!("Grouping key invalid - invalid UTF-8 in decoded base64 value for key {k}"),
         )
     })?;
 
diff --git a/src/sources/prometheus/remote_write.rs b/src/sources/prometheus/remote_write.rs
index ba7613d600fc0..9a377ec3ebbc5 100644
--- a/src/sources/prometheus/remote_write.rs
+++ b/src/sources/prometheus/remote_write.rs
@@ -118,13 +118,13 @@ impl RemoteWriteSource {
             });
             ErrorMessage::new(
                 StatusCode::BAD_REQUEST,
-                format!("Could not decode write request: {}", error),
+                format!("Could not decode write request: {error}"),
             )
         })?;
         parser::parse_request(request).map_err(|error| {
             ErrorMessage::new(
                 StatusCode::BAD_REQUEST,
-                format!("Could not decode write request: {}", error),
+                format!("Could not decode write request: {error}"),
             )
         })
     }
diff --git a/src/sources/prometheus/scrape.rs b/src/sources/prometheus/scrape.rs
index 1c47ad764d996..7c6e2a2c43e3a 100644
--- a/src/sources/prometheus/scrape.rs
+++ b/src/sources/prometheus/scrape.rs
@@ -254,7 +254,7 @@ impl HttpClientContext for PrometheusScrapeContext {
             {
                 match (honor_label, metric.tag_value(tag)) {
                     (false, Some(old_instance)) => {
-                        metric.replace_tag(format!("exported_{}", tag), old_instance);
+                        metric.replace_tag(format!("exported_{tag}"), old_instance);
                         metric.replace_tag(tag.clone(), instance.clone());
                     }
                     (true, Some(_)) => {}
@@ -271,7 +271,7 @@ impl HttpClientContext for PrometheusScrapeContext {
             {
                 match (honor_label, metric.tag_value(tag)) {
                     (false, Some(old_endpoint)) => {
-                        metric.replace_tag(format!("exported_{}", tag), old_endpoint);
+                        metric.replace_tag(format!("exported_{tag}"), old_endpoint);
                         metric.replace_tag(tag.clone(), endpoint.clone());
                     }
                     (true, Some(_)) => {}
@@ -557,9 +557,8 @@ mod test {
         let dummy_endpoint = warp::path!("metrics").and(warp::query::raw()).map(|query| {
             format!(
                 r#"
-                    promhttp_metric_handler_requests_total{{query="{}"}} 100 1612411516789
-                "#,
-                query
+                    promhttp_metric_handler_requests_total{{query="{query}"}} 100 1612411516789
+                "#
             )
         });
 
@@ -715,7 +714,7 @@ mod test {
         sleep(Duration::from_secs(1)).await;
 
         let response = Client::new()
-            .get(format!("http://{}/metrics", out_addr).parse().unwrap())
+            .get(format!("http://{out_addr}/metrics").parse().unwrap())
             .await
             .unwrap();
 
@@ -801,7 +800,7 @@ mod integration_tests {
             metrics
                 .iter()
                 .find(|metric| metric.name() == name)
-                .unwrap_or_else(|| panic!("Missing metric {:?}", name))
+                .unwrap_or_else(|| panic!("Missing metric {name:?}"))
         };
 
         // Sample some well-known metrics
diff --git a/src/sources/redis/mod.rs b/src/sources/redis/mod.rs
index 292503cdfa160..242bfddd3d371 100644
--- a/src/sources/redis/mod.rs
+++ b/src/sources/redis/mod.rs
@@ -83,9 +83,7 @@ impl From<&redis::ConnectionInfo> for ConnectionInfo {
     fn from(redis_conn_info: &redis::ConnectionInfo) -> Self {
         let (protocol, endpoint) = match &redis_conn_info.addr {
             redis::ConnectionAddr::Tcp(host, port)
-            | redis::ConnectionAddr::TcpTls { host, port, .. } => {
-                ("tcp", format!("{}:{}", host, port))
-            }
+            | redis::ConnectionAddr::TcpTls { host, port, .. } => ("tcp", format!("{host}:{port}")),
             redis::ConnectionAddr::Unix(path) => ("uds", path.to_string_lossy().to_string()),
         };
 
diff --git a/src/sources/socket/mod.rs b/src/sources/socket/mod.rs
index af27117cfd1c1..2a0ca29f8352f 100644
--- a/src/sources/socket/mod.rs
+++ b/src/sources/socket/mod.rs
@@ -894,7 +894,7 @@ mod test {
                     // read resulting with 0 bytes -> the connection was closed
                     Ok(0) => assert_relative_eq!(start.elapsed().as_secs_f64(), 1.0, epsilon = 0.3),
                     Ok(_) => panic!("unexpectedly read data from stream"),
-                    Err(e) => panic!("{:}", e)
+                    Err(e) => panic!("{e:}")
                  }
              }
         }
@@ -923,7 +923,7 @@ mod test {
         packets: impl IntoIterator<Item = Bytes>,
     ) -> SocketAddr {
         let socket = UdpSocket::bind(from)
-            .map_err(|error| panic!("{:}", error))
+            .map_err(|error| panic!("{error:}"))
             .ok()
             .unwrap();
 
@@ -931,7 +931,7 @@ mod test {
             assert_eq!(
                 socket
                     .send_to(&packet, to)
-                    .map_err(|error| panic!("{:}", error))
+                    .map_err(|error| panic!("{error:}"))
                     .ok()
                     .unwrap(),
                 packet.len()
@@ -1537,10 +1537,9 @@ mod test {
     fn parses_unix_config(mode: &str) -> SocketConfig {
         toml::from_str::<SocketConfig>(&format!(
             r#"
-               mode = "{}"
+               mode = "{mode}"
                path = "/does/not/exist"
-            "#,
-            mode
+            "#
         ))
         .unwrap()
     }
@@ -1549,11 +1548,10 @@ mod test {
     fn parses_unix_config_file_mode(mode: &str) -> SocketConfig {
         toml::from_str::<SocketConfig>(&format!(
             r#"
-               mode = "{}"
+               mode = "{mode}"
                path = "/does/not/exist"
                socket_file_mode = 0o777
-            "#,
-            mode
+            "#
         ))
         .unwrap()
     }
diff --git a/src/sources/splunk_hec/mod.rs b/src/sources/splunk_hec/mod.rs
index 23b0f0e2f8aad..fc43d98b77c07 100644
--- a/src/sources/splunk_hec/mod.rs
+++ b/src/sources/splunk_hec/mod.rs
@@ -1380,7 +1380,7 @@ mod tests {
     ) -> (VectorSink, Healthcheck) {
         HecLogsSinkConfig {
             default_token: TOKEN.to_owned().into(),
-            endpoint: format!("http://{}", address),
+            endpoint: format!("http://{address}"),
             host_key: None,
             indexed_fields: vec![],
             index: None,
@@ -1465,8 +1465,8 @@ mod tests {
         opts: &SendWithOpts<'_>,
     ) -> RequestBuilder {
         let mut b = reqwest::Client::new()
-            .post(format!("http://{}/{}", address, api))
-            .header("Authorization", format!("Splunk {}", token));
+            .post(format!("http://{address}/{api}"))
+            .header("Authorization", format!("Splunk {token}"));
 
         b = match opts.channel {
             Some(c) => match c {
@@ -1565,7 +1565,7 @@ mod tests {
         .await;
 
         let messages = (0..n)
-            .map(|i| format!("multiple_simple_text_event_{}", i))
+            .map(|i| format!("multiple_simple_text_event_{i}"))
             .collect::<Vec<_>>();
         let events = channel_n(messages.clone(), sink, source).await;
 
@@ -1618,7 +1618,7 @@ mod tests {
         .await;
 
         let messages = (0..n)
-            .map(|i| format!("multiple_simple_json_event{}", i))
+            .map(|i| format!("multiple_simple_json_event{i}"))
             .collect::<Vec<_>>();
         let events = channel_n(messages.clone(), sink, source).await;
 
@@ -1902,7 +1902,7 @@ mod tests {
         let (_source, address) = source(None).await;
 
         let res = reqwest::Client::new()
-            .get(format!("http://{}/services/collector/health", address))
+            .get(format!("http://{address}/services/collector/health"))
             .header("Authorization", format!("Splunk {}", "invalid token"))
             .send()
             .await
@@ -1916,7 +1916,7 @@ mod tests {
         let (_source, address) = source(None).await;
 
         let res = reqwest::Client::new()
-            .get(format!("http://{}/services/collector/health", address))
+            .get(format!("http://{address}/services/collector/health"))
             .send()
             .await
             .unwrap();
@@ -2142,7 +2142,7 @@ mod tests {
                 "http://{}/{}",
                 address, "services/collector/event"
             ))
-            .header("Authorization", format!("Splunk {}", TOKEN))
+            .header("Authorization", format!("Splunk {TOKEN}"))
             .body::<&[u8]>(message);
 
         assert_eq!(200, b.send().await.unwrap().status().as_u16());
@@ -2555,8 +2555,8 @@ mod tests {
         .unwrap();
 
         let res = reqwest::Client::new()
-            .post(format!("http://{}/services/collector/ack", address))
-            .header("Authorization", format!("Splunk {}", TOKEN))
+            .post(format!("http://{address}/services/collector/ack"))
+            .header("Authorization", format!("Splunk {TOKEN}"))
             .header("x-splunk-request-channel", "guid")
             .header("Content-Type", "application/json; some-random-text; hello")
             .body(body)
diff --git a/src/sources/statsd/parser.rs b/src/sources/statsd/parser.rs
index e6766300ad7f4..ebe2a0fe8df10 100644
--- a/src/sources/statsd/parser.rs
+++ b/src/sources/statsd/parser.rs
@@ -216,7 +216,7 @@ pub enum ParseError {
 
 impl fmt::Display for ParseError {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "Statsd parse error: {:?}", self)
+        write!(f, "Statsd parse error: {self:?}")
     }
 }
 
diff --git a/src/sources/syslog.rs b/src/sources/syslog.rs
index c2a9364173c4c..4a25a2aae0125 100644
--- a/src/sources/syslog.rs
+++ b/src/sources/syslog.rs
@@ -984,7 +984,7 @@ mod test {
     #[test]
     fn syslog_ng_default_network() {
         let msg = "i am foobar";
-        let raw = format!(r#"<13>Feb 13 20:07:26 74794bfb6795 root[8539]: {}"#, msg);
+        let raw = format!(r#"<13>Feb 13 20:07:26 74794bfb6795 root[8539]: {msg}"#);
         let event = event_from_bytes(
             "host",
             Some(Bytes::from("192.168.0.254")),
@@ -1032,8 +1032,7 @@ mod test {
     fn rsyslog_omfwd_tcp_default() {
         let msg = "start";
         let raw = format!(
-            r#"<190>Feb 13 21:31:56 74794bfb6795 liblogging-stdlog:  [origin software="rsyslogd" swVersion="8.24.0" x-pid="8979" x-info="http://www.rsyslog.com"] {}"#,
-            msg
+            r#"<190>Feb 13 21:31:56 74794bfb6795 liblogging-stdlog:  [origin software="rsyslogd" swVersion="8.24.0" x-pid="8979" x-info="http://www.rsyslog.com"] {msg}"#
         );
         let event = event_from_bytes(
             "host",
@@ -1081,8 +1080,7 @@ mod test {
     fn rsyslog_omfwd_tcp_forward_format() {
         let msg = "start";
         let raw = format!(
-            r#"<190>2019-02-13T21:53:30.605850+00:00 74794bfb6795 liblogging-stdlog:  [origin software="rsyslogd" swVersion="8.24.0" x-pid="9043" x-info="http://www.rsyslog.com"] {}"#,
-            msg
+            r#"<190>2019-02-13T21:53:30.605850+00:00 74794bfb6795 liblogging-stdlog:  [origin software="rsyslogd" swVersion="8.24.0" x-pid="9043" x-info="http://www.rsyslog.com"] {msg}"#
         );
 
         let mut expected = Event::Log(LogEvent::from(msg));
@@ -1369,7 +1367,7 @@ mod test {
             //"secfrac" can contain up to 6 digits, but TCP sinks uses `AutoSi`
 
             Self {
-                msgid: format!("test{}", id),
+                msgid: format!("test{id}"),
                 severity: Severity::LOG_INFO,
                 facility: Facility::LOG_USER,
                 version: 1,
@@ -1492,7 +1490,7 @@ mod test {
                 x => {
                     #[allow(clippy::print_stdout)]
                     {
-                        println!("converting severity str, got {}", x);
+                        println!("converting severity str, got {x}");
                     }
                     None
                 }
@@ -1544,7 +1542,7 @@ mod test {
             .filter(|m| !m.is_empty()) //syslog_rfc5424 ignores empty maps, tested separately
             .take(amount)
             .enumerate()
-            .map(|(i, map)| (format!("id{}", i), map))
+            .map(|(i, map)| (format!("id{i}"), map))
             .collect()
     }
 
diff --git a/src/sources/util/framestream.rs b/src/sources/util/framestream.rs
index fe29b50e2049d..c0f254dabac88 100644
--- a/src/sources/util/framestream.rs
+++ b/src/sources/util/framestream.rs
@@ -743,8 +743,7 @@ pub fn build_framestream_unix_source(
     if let Some(socket_permission) = frame_handler.socket_file_mode() {
         if !(448..=511).contains(&socket_permission) {
             return Err(format!(
-                "Invalid Socket permission {:#o}. Must between 0o700 and 0o777.",
-                socket_permission
+                "Invalid Socket permission {socket_permission:#o}. Must between 0o700 and 0o777."
             )
             .into());
         }
diff --git a/src/sources/util/grpc/decompression.rs b/src/sources/util/grpc/decompression.rs
index 16293df4b07d0..cb87986ce0208 100644
--- a/src/sources/util/grpc/decompression.rs
+++ b/src/sources/util/grpc/decompression.rs
@@ -42,8 +42,7 @@ impl CompressionScheme {
             .map(|s| {
                 s.to_str().map(|s| s.to_string()).map_err(|_| {
                     Status::unimplemented(format!(
-                        "`{}` contains non-visible characters and is not a valid encoding",
-                        GRPC_ENCODING_HEADER
+                        "`{GRPC_ENCODING_HEADER}` contains non-visible characters and is not a valid encoding"
                     ))
                 })
             })
@@ -53,8 +52,7 @@ impl CompressionScheme {
                 Some(scheme) => match scheme.as_str() {
                     "gzip" => Ok(Some(CompressionScheme::Gzip)),
                     other => Err(Status::unimplemented(format!(
-                        "compression scheme `{}` is not supported",
-                        other
+                        "compression scheme `{other}` is not supported"
                     ))),
                 },
             })
diff --git a/src/sources/util/http/encoding.rs b/src/sources/util/http/encoding.rs
index 43f2916623a8e..47e2bf72315ac 100644
--- a/src/sources/util/http/encoding.rs
+++ b/src/sources/util/http/encoding.rs
@@ -36,7 +36,7 @@ pub fn decode(header: Option<&str>, mut body: Bytes) -> Result<Bytes, ErrorMessa
                 encoding => {
                     return Err(ErrorMessage::new(
                         StatusCode::UNSUPPORTED_MEDIA_TYPE,
-                        format!("Unsupported encoding {}", encoding),
+                        format!("Unsupported encoding {encoding}"),
                     ))
                 }
             }
@@ -53,6 +53,6 @@ fn handle_decode_error(encoding: &str, error: impl std::error::Error) -> ErrorMe
     });
     ErrorMessage::new(
         StatusCode::UNPROCESSABLE_ENTITY,
-        format!("Failed decompressing payload with {} decoder.", encoding),
+        format!("Failed decompressing payload with {encoding} decoder."),
     )
 }
diff --git a/src/sources/util/http/prelude.rs b/src/sources/util/http/prelude.rs
index b6310ec2c2c75..9fc83559fe887 100644
--- a/src/sources/util/http/prelude.rs
+++ b/src/sources/util/http/prelude.rs
@@ -181,7 +181,7 @@ pub trait HttpSource: Clone + Send + Sync + 'static {
                 } else {
                     //other internal error - will return 500 internal server error
                     emit!(HttpInternalError {
-                        message: &format!("Internal error: {:?}", r)
+                        message: &format!("Internal error: {r:?}")
                     });
                     Err(r)
                 }
diff --git a/src/sources/util/net/mod.rs b/src/sources/util/net/mod.rs
index a1a83662ccebb..f31a91ad8a82c 100644
--- a/src/sources/util/net/mod.rs
+++ b/src/sources/util/net/mod.rs
@@ -84,7 +84,7 @@ impl fmt::Display for SocketListenAddr {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         match self {
             Self::SocketAddr(ref addr) => addr.fmt(f),
-            Self::SystemdFd(offset) => write!(f, "systemd socket #{}", offset),
+            Self::SystemdFd(offset) => write!(f, "systemd socket #{offset}"),
         }
     }
 }
@@ -137,7 +137,7 @@ impl From<SocketListenAddr> for String {
                 if fd == 0 {
                     "systemd".to_owned()
                 } else {
-                    format!("systemd#{}", fd)
+                    format!("systemd#{fd}")
                 }
             }
         }
diff --git a/src/sources/vector/mod.rs b/src/sources/vector/mod.rs
index 77020c618d01d..5021e2c6cd1fd 100644
--- a/src/sources/vector/mod.rs
+++ b/src/sources/vector/mod.rs
@@ -288,7 +288,7 @@ mod tests {
     use vector_lib::config::log_schema;
 
     async fn run_test(vector_source_config_str: &str, addr: SocketAddr) {
-        let config = format!(r#"address = "{}""#, addr);
+        let config = format!(r#"address = "{addr}""#);
         let source: VectorConfig = toml::from_str(&config).unwrap();
 
         let (tx, rx) = SourceSender::new_test();
@@ -324,7 +324,7 @@ mod tests {
     async fn receive_message() {
         let addr = test_util::next_addr();
 
-        let config = format!(r#"address = "{}""#, addr);
+        let config = format!(r#"address = "{addr}""#);
         run_test(&config, addr).await;
     }
 
@@ -333,9 +333,8 @@ mod tests {
         let addr = test_util::next_addr();
 
         let config = format!(
-            r#"address = "{}"
-            compression=true"#,
-            addr
+            r#"address = "{addr}"
+            compression=true"#
         );
         run_test(&config, addr).await;
     }
diff --git a/src/test_util/components.rs b/src/test_util/components.rs
index d58d8c6f7fb33..613ec8ce73d48 100644
--- a/src/test_util/components.rs
+++ b/src/test_util/components.rs
@@ -195,7 +195,7 @@ impl ComponentTester {
             event_test_util::debug_print_events();
             metrics.sort_by(|a, b| a.name().cmp(b.name()));
             for metric in &metrics {
-                println!("{}", metric);
+                println!("{metric}");
             }
         }
 
@@ -204,9 +204,11 @@ impl ComponentTester {
     }
 
     fn emitted_all_counters(&mut self, names: &[&str], tags: &[&str]) {
-        let tag_suffix = (!tags.is_empty())
-            .then(|| format!("{{{}}}", tags.join(",")))
-            .unwrap_or_default();
+        let tag_suffix = if !tags.is_empty() {
+            format!("{{{}}}", tags.join(","))
+        } else {
+            String::new()
+        };
 
         for name in names {
             if !self.metrics.iter().any(|m| {
@@ -234,10 +236,8 @@ impl ComponentTester {
                     .collect::<Vec<_>>();
                 let partial = partial_matches.join("");
 
-                self.errors.push(format!(
-                    "  - Missing metric `{}{}`{}",
-                    name, tag_suffix, partial
-                ));
+                self.errors
+                    .push(format!("  - Missing metric `{name}{tag_suffix}`{partial}"));
             }
         }
     }
@@ -245,7 +245,7 @@ impl ComponentTester {
     fn emitted_all_events(&mut self, names: &[&str]) {
         for name in names {
             if let Err(err_msg) = event_test_util::contains_name_once(name) {
-                self.errors.push(format!("  - {}", err_msg));
+                self.errors.push(format!("  - {err_msg}"));
             }
         }
     }
diff --git a/src/test_util/metrics.rs b/src/test_util/metrics.rs
index fb9b82833d456..9603ea590b3d1 100644
--- a/src/test_util/metrics.rs
+++ b/src/test_util/metrics.rs
@@ -165,29 +165,23 @@ macro_rules! series {
 
 pub fn assert_counter(metrics: &SplitMetrics, series: MetricSeries, expected: f64) {
     let actual_counter = read_counter_value(metrics, series.clone());
-    assert!(
-        actual_counter.is_some(),
-        "counter '{}' was not found",
-        series
-    );
+    assert!(actual_counter.is_some(), "counter '{series}' was not found");
 
     let actual_counter_value = actual_counter.expect("counter must be valid");
     assert_eq!(
         actual_counter_value, expected,
-        "expected {} for '{}', got {} instead",
-        expected, series, actual_counter_value
+        "expected {expected} for '{series}', got {actual_counter_value} instead"
     );
 }
 
 pub fn assert_gauge(metrics: &SplitMetrics, series: MetricSeries, expected: f64) {
     let actual_gauge = read_gauge_value(metrics, series.clone());
-    assert!(actual_gauge.is_some(), "gauge '{}' was not found", series);
+    assert!(actual_gauge.is_some(), "gauge '{series}' was not found");
 
     let actual_gauge_value = actual_gauge.expect("gauge must be valid");
     assert_eq!(
         actual_gauge_value, expected,
-        "expected {} for '{}', got {} instead",
-        expected, series, actual_gauge_value
+        "expected {expected} for '{series}', got {actual_gauge_value} instead"
     );
 }
 
@@ -199,7 +193,7 @@ pub fn assert_distribution(
     expected_bounds: &[(f64, u32)],
 ) {
     let samples = read_distribution_samples(metrics, series.clone());
-    assert!(samples.is_some(), "distribution '{}' was not found", series);
+    assert!(samples.is_some(), "distribution '{series}' was not found");
 
     let samples = samples.expect("distribution must be valid");
 
@@ -219,13 +213,11 @@ pub fn assert_distribution(
 
     assert_eq!(
         actual_sum, expected_sum,
-        "expected sum of '{}' to equal {}, got {} instead",
-        series, expected_sum, actual_sum
+        "expected sum of '{series}' to equal {expected_sum}, got {actual_sum} instead"
     );
     assert_eq!(
         actual_count, expected_count,
-        "expected count of '{}' to equal {}, got {} instead",
-        series, expected_count, actual_count
+        "expected count of '{series}' to equal {expected_count}, got {actual_count} instead"
     );
 
     for (i, (bound, count)) in expected_bounds.iter().enumerate() {
@@ -239,7 +231,7 @@ pub fn assert_distribution(
 
 pub fn assert_set(metrics: &SplitMetrics, series: MetricSeries, expected_values: &[&str]) {
     let actual_values = read_set_values(metrics, series.clone());
-    assert!(actual_values.is_some(), "set '{}' was not found", series);
+    assert!(actual_values.is_some(), "set '{series}' was not found");
 
     let actual_values = actual_values.expect("set must be valid");
     let expected_values = expected_values
diff --git a/src/test_util/mock/sources/backpressure.rs b/src/test_util/mock/sources/backpressure.rs
index 6975d87e50d64..fa154da5134e3 100644
--- a/src/test_util/mock/sources/backpressure.rs
+++ b/src/test_util/mock/sources/backpressure.rs
@@ -45,7 +45,7 @@ impl SourceConfig for BackpressureSourceConfig {
             for i in 0.. {
                 let _result = cx
                     .out
-                    .send_event(Event::Log(LogEvent::from(format!("event-{}", i))))
+                    .send_event(Event::Log(LogEvent::from(format!("event-{i}"))))
                     .await;
                 counter.fetch_add(1, Ordering::AcqRel);
 
diff --git a/src/test_util/mod.rs b/src/test_util/mod.rs
index 3582fd030cd2c..0fdab99373f7a 100644
--- a/src/test_util/mod.rs
+++ b/src/test_util/mod.rs
@@ -105,7 +105,7 @@ where
     let cfg = toml::to_string(&T::generate_config()).unwrap();
 
     toml::from_str::<T>(&cfg)
-        .unwrap_or_else(|e| panic!("Invalid config generated from string:\n\n{}\n'{}'", e, cfg));
+        .unwrap_or_else(|e| panic!("Invalid config generated from string:\n\n{e}\n'{cfg}'"));
 }
 
 pub fn open_fixture(path: impl AsRef<Path>) -> crate::Result<serde_json::Value> {
diff --git a/src/top/cmd.rs b/src/top/cmd.rs
index 12a3b7b45caf7..f58c15fb9f101 100644
--- a/src/top/cmd.rs
+++ b/src/top/cmd.rs
@@ -76,7 +76,7 @@ pub async fn top(opts: &super::Opts, client: Client, dashboard_title: &str) -> e
         Err(err) => {
             #[allow(clippy::print_stderr)]
             {
-                eprintln!("[top] Encountered shutdown error: {}", err);
+                eprintln!("[top] Encountered shutdown error: {err}");
             }
             connection.abort();
             exitcode::IOERR
diff --git a/src/top/dashboard.rs b/src/top/dashboard.rs
index 22db21dc99c83..36567247d990c 100644
--- a/src/top/dashboard.rs
+++ b/src/top/dashboard.rs
@@ -71,7 +71,7 @@ impl HumanFormatter for i64 {
             0 => "--".into(),
             n => match NumberPrefix::decimal(*n as f64) {
                 NumberPrefix::Standalone(n) => n.to_string(),
-                NumberPrefix::Prefixed(p, n) => format!("{:.2} {}", n, p),
+                NumberPrefix::Prefixed(p, n) => format!("{n:.2} {p}"),
             },
         }
     }
@@ -83,7 +83,7 @@ impl HumanFormatter for i64 {
             0 => "--".into(),
             n => match NumberPrefix::binary(*n as f64) {
                 NumberPrefix::Standalone(n) => n.to_string(),
-                NumberPrefix::Prefixed(p, n) => format!("{:.2} {}B", n, p),
+                NumberPrefix::Prefixed(p, n) => format!("{n:.2} {p}B"),
             },
         }
     }
@@ -212,10 +212,12 @@ impl<'a> Widgets<'a> {
         for (_, r) in state.components.iter() {
             let mut data = vec![
                 r.key.id().to_string(),
-                (!r.has_displayable_outputs())
-                    .then_some("--")
-                    .unwrap_or_default()
-                    .to_string(),
+                if !r.has_displayable_outputs() {
+                    "--"
+                } else {
+                    Default::default()
+                }
+                .to_string(),
                 r.kind.clone(),
                 r.component_type.clone(),
             ];
diff --git a/src/topology/builder.rs b/src/topology/builder.rs
index 39ec9453e6b2d..bf6a3dca314f7 100644
--- a/src/topology/builder.rs
+++ b/src/topology/builder.rs
@@ -174,7 +174,7 @@ impl<'a> Builder<'a> {
                     Ok(table) => table,
                     Err(error) => {
                         self.errors
-                            .push(format!("Enrichment Table \"{}\": {}", name, error));
+                            .push(format!("Enrichment Table \"{name}\": {error}"));
                         continue;
                     }
                 };
@@ -353,7 +353,7 @@ impl<'a> Builder<'a> {
             let source = source.inner.build(context).await;
             let server = match source {
                 Err(error) => {
-                    self.errors.push(format!("Source \"{}\": {}", key, error));
+                    self.errors.push(format!("Source \"{key}\": {error}"));
                     continue;
                 }
                 Ok(server) => server,
@@ -501,8 +501,7 @@ impl<'a> Builder<'a> {
                 .await
             {
                 Err(error) => {
-                    self.errors
-                        .push(format!("Transform \"{}\": {}", key, error));
+                    self.errors.push(format!("Transform \"{key}\": {error}"));
                     continue;
                 }
                 Ok(transform) => transform,
@@ -591,7 +590,7 @@ impl<'a> Builder<'a> {
                     .await;
                 match buffer {
                     Err(error) => {
-                        self.errors.push(format!("Sink \"{}\": {}", key, error));
+                        self.errors.push(format!("Sink \"{key}\": {error}"));
                         continue;
                     }
                     Ok((tx, rx)) => (tx, Arc::new(Mutex::new(Some(rx.into_stream())))),
@@ -611,7 +610,7 @@ impl<'a> Builder<'a> {
 
             let (sink, healthcheck) = match sink.inner.build(cx).await {
                 Err(error) => {
-                    self.errors.push(format!("Sink \"{}\": {}", key, error));
+                    self.errors.push(format!("Sink \"{key}\": {error}"));
                     continue;
                 }
                 Ok(built) => built,
diff --git a/src/topology/schema.rs b/src/topology/schema.rs
index b457ea0ed84db..9920384b02a26 100644
--- a/src/topology/schema.rs
+++ b/src/topology/schema.rs
@@ -329,7 +329,7 @@ pub(super) fn validate_sink_expectations(
                     .errors()
                     .iter()
                     .cloned()
-                    .map(|err| format!("schema error in component {}: {}", key, err))
+                    .map(|err| format!("schema error in component {key}: {err}"))
                     .collect(),
             );
         }
diff --git a/src/topology/test/end_to_end.rs b/src/topology/test/end_to_end.rs
index 9434af5003df0..06703d06116d7 100644
--- a/src/topology/test/end_to_end.rs
+++ b/src/topology/test/end_to_end.rs
@@ -66,7 +66,7 @@ pub fn http_client(
 
     let sender = tokio::spawn(async move {
         let result = reqwest::Client::new()
-            .post(format!("http://{}/", address))
+            .post(format!("http://{address}/"))
             .body(body)
             .send()
             .await
@@ -96,8 +96,6 @@ inputs = ["in"]
 encoding.codec = "json"
 uri = "http://{address2}/"
 "#,
-            address1 = address1,
-            address2 = address2,
         ),
         Format::Toml,
     )
diff --git a/src/trace.rs b/src/trace.rs
index 5f2b2c332c1e1..9ee5c97350205 100644
--- a/src/trace.rs
+++ b/src/trace.rs
@@ -371,6 +371,6 @@ impl tracing::field::Visit for SpanFields {
     }
 
     fn record_debug(&mut self, field: &tracing_core::Field, value: &dyn std::fmt::Debug) {
-        self.record(field, format!("{:?}", value));
+        self.record(field, format!("{value:?}"));
     }
 }
diff --git a/src/transforms/aws_ec2_metadata.rs b/src/transforms/aws_ec2_metadata.rs
index 674c87f6f1c41..226e34f831517 100644
--- a/src/transforms/aws_ec2_metadata.rs
+++ b/src/transforms/aws_ec2_metadata.rs
@@ -509,10 +509,8 @@ impl MetadataClient {
                     let mac = String::from_utf8_lossy(&mac[..]);
 
                     if self.fields.contains(SUBNET_ID_KEY) {
-                        let subnet_path = format!(
-                            "/latest/meta-data/network/interfaces/macs/{}/subnet-id",
-                            mac
-                        );
+                        let subnet_path =
+                            format!("/latest/meta-data/network/interfaces/macs/{mac}/subnet-id");
 
                         let subnet_path = subnet_path.parse().context(ParsePathSnafu {
                             value: subnet_path.clone(),
@@ -525,7 +523,7 @@ impl MetadataClient {
 
                     if self.fields.contains(VPC_ID_KEY) {
                         let vpc_path =
-                            format!("/latest/meta-data/network/interfaces/macs/{}/vpc-id", mac);
+                            format!("/latest/meta-data/network/interfaces/macs/{mac}/vpc-id");
 
                         let vpc_path = vpc_path.parse().context(ParsePathSnafu {
                             value: vpc_path.clone(),
@@ -562,7 +560,7 @@ impl MetadataClient {
             }
 
             for tag in self.tags.clone() {
-                let tag_path = format!("/latest/meta-data/tags/instance/{}", tag);
+                let tag_path = format!("/latest/meta-data/tags/instance/{tag}");
 
                 let tag_path = tag_path.parse().context(ParsePathSnafu {
                     value: tag_path.clone(),
@@ -906,7 +904,7 @@ mod integration_tests {
         let _server = tokio::spawn(server);
 
         let config = Ec2Metadata {
-            endpoint: format!("http://{}", addr),
+            endpoint: format!("http://{addr}"),
             refresh_timeout_secs: Duration::from_secs(1),
             ..Default::default()
         };
@@ -937,7 +935,7 @@ mod integration_tests {
         let _server = tokio::spawn(server);
 
         let config = Ec2Metadata {
-            endpoint: format!("http://{}", addr),
+            endpoint: format!("http://{addr}"),
             refresh_timeout_secs: Duration::from_secs(1),
             required: false,
             ..Default::default()
@@ -1016,10 +1014,10 @@ mod integration_tests {
 
             let log = LogEvent::default();
             let mut expected_log = log.clone();
-            expected_log.insert(format!("\"{}\"", PUBLIC_IPV4_KEY).as_str(), "192.0.2.54");
-            expected_log.insert(format!("\"{}\"", REGION_KEY).as_str(), "us-east-1");
+            expected_log.insert(format!("\"{PUBLIC_IPV4_KEY}\"").as_str(), "192.0.2.54");
+            expected_log.insert(format!("\"{REGION_KEY}\"").as_str(), "us-east-1");
             expected_log.insert(
-                format!("\"{}\"", TAGS_KEY).as_str(),
+                format!("\"{TAGS_KEY}\"").as_str(),
                 ObjectMap::from([
                     ("Name".into(), Value::from("test-instance")),
                     ("Test".into(), Value::from("test-tag")),
diff --git a/src/transforms/exclusive_route/config.rs b/src/transforms/exclusive_route/config.rs
index c5d1a0223b651..374dd53ae6cd8 100644
--- a/src/transforms/exclusive_route/config.rs
+++ b/src/transforms/exclusive_route/config.rs
@@ -111,10 +111,7 @@ impl TransformConfig for ExclusiveRouteConfig {
             .collect();
 
         if !duplicates.is_empty() {
-            errors.push(format!(
-                "Found routes with duplicate names: {:?}",
-                duplicates
-            ));
+            errors.push(format!("Found routes with duplicate names: {duplicates:?}"));
         }
 
         if self
diff --git a/src/transforms/log_to_metric.rs b/src/transforms/log_to_metric.rs
index 65eabd9300183..4b7bf172f1039 100644
--- a/src/transforms/log_to_metric.rs
+++ b/src/transforms/log_to_metric.rs
@@ -241,7 +241,7 @@ pub enum TransformParseErrorKind {
 
 impl std::fmt::Display for TransformParseErrorKind {
     fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
-        write!(f, "{:?}", self)
+        write!(f, "{self:?}")
     }
 }
 
diff --git a/src/transforms/lua/v1/mod.rs b/src/transforms/lua/v1/mod.rs
index 97cef1684ea8e..f196d645dd9a8 100644
--- a/src/transforms/lua/v1/mod.rs
+++ b/src/transforms/lua/v1/mod.rs
@@ -120,7 +120,7 @@ impl Lua {
 
         let additional_paths = search_dirs
             .iter()
-            .map(|d| format!("{}/?.lua", d))
+            .map(|d| format!("{d}/?.lua"))
             .collect::<Vec<_>>()
             .join(";");
 
@@ -132,7 +132,7 @@ impl Lua {
             let current_paths = package
                 .get::<String>("path")
                 .unwrap_or_else(|_| ";".to_string());
-            let paths = format!("{};{}", additional_paths, current_paths);
+            let paths = format!("{additional_paths};{current_paths}");
             package.set("path", paths).context(InvalidLuaSnafu)?;
         }
 
diff --git a/src/transforms/lua/v2/mod.rs b/src/transforms/lua/v2/mod.rs
index dabca804d6102..71c4a4f008e0d 100644
--- a/src/transforms/lua/v2/mod.rs
+++ b/src/transforms/lua/v2/mod.rs
@@ -255,7 +255,7 @@ impl Lua {
             let current_paths = package
                 .get::<String>("path")
                 .unwrap_or_else(|_| ";".to_string());
-            let paths = format!("{};{}", additional_paths, current_paths);
+            let paths = format!("{additional_paths};{current_paths}");
             package.set("path", paths)?;
         }
 
@@ -1001,8 +1001,7 @@ mod tests {
             "#,
             |tx, out| async move {
                 let n: usize = 10;
-                let events =
-                    (0..n).map(|i| Event::Log(LogEvent::from(format!("program me {}", i))));
+                let events = (0..n).map(|i| Event::Log(LogEvent::from(format!("program me {i}"))));
                 for event in events {
                     tx.send(event).await.unwrap();
                     assert!(out.lock().await.recv().await.is_some());
diff --git a/src/transforms/reduce/merge_strategy.rs b/src/transforms/reduce/merge_strategy.rs
index c095cca317efe..2058f2c736e2a 100644
--- a/src/transforms/reduce/merge_strategy.rs
+++ b/src/transforms/reduce/merge_strategy.rs
@@ -366,7 +366,7 @@ impl ReduceValueMerger for TimestampWindowMerger {
         v: &mut LogEvent,
     ) -> Result<(), String> {
         v.insert(
-            format!("{}_end", path).as_str(),
+            format!("{path}_end").as_str(),
             Value::Timestamp(self.latest),
         );
         v.insert(path, Value::Timestamp(self.started));
diff --git a/src/transforms/remap.rs b/src/transforms/remap.rs
index 0f1d24c1aa007..a8e0845317fac 100644
--- a/src/transforms/remap.rs
+++ b/src/transforms/remap.rs
@@ -525,20 +525,20 @@ where
             },
             Event::Metric(ref mut metric) => {
                 if let Some(metadata_key) = log_schema().metadata_key() {
-                    metric.replace_tag(format!("{}.dropped.reason", metadata_key), reason.into());
+                    metric.replace_tag(format!("{metadata_key}.dropped.reason"), reason.into());
                     metric.replace_tag(
-                        format!("{}.dropped.component_id", metadata_key),
+                        format!("{metadata_key}.dropped.component_id"),
                         self.component_key
                             .as_ref()
                             .map(ToString::to_string)
                             .unwrap_or_default(),
                     );
                     metric.replace_tag(
-                        format!("{}.dropped.component_type", metadata_key),
+                        format!("{metadata_key}.dropped.component_type"),
                         "remap".into(),
                     );
                     metric.replace_tag(
-                        format!("{}.dropped.component_kind", metadata_key),
+                        format!("{metadata_key}.dropped.component_kind"),
                         "transform".into(),
                     );
                 }
@@ -1621,7 +1621,7 @@ mod tests {
         match (buf.pop(), err_buf.pop()) {
             (Some(good), None) => Ok(good),
             (None, Some(bad)) => Err(bad),
-            (a, b) => panic!("expected output xor error output, got {:?} and {:?}", a, b),
+            (a, b) => panic!("expected output xor error output, got {a:?} and {b:?}"),
         }
     }
 
diff --git a/src/transforms/sample/tests.rs b/src/transforms/sample/tests.rs
index 87357c409f35a..8c566d4dea73b 100644
--- a/src/transforms/sample/tests.rs
+++ b/src/transforms/sample/tests.rs
@@ -324,7 +324,7 @@ fn sample_at_rates_higher_then_half() {
 
 fn condition_contains(key: &str, needle: &str) -> Condition {
     let vrl_config = VrlConfig {
-        source: format!(r#"contains!(."{}", "{}")"#, key, needle),
+        source: format!(r#"contains!(."{key}", "{needle}")"#),
         runtime: Default::default(),
     };
 
diff --git a/src/transforms/tag_cardinality_limit/tag_value_set.rs b/src/transforms/tag_cardinality_limit/tag_value_set.rs
index 5d71ab98ccc52..2e9cb86009e3f 100644
--- a/src/transforms/tag_cardinality_limit/tag_value_set.rs
+++ b/src/transforms/tag_cardinality_limit/tag_value_set.rs
@@ -52,7 +52,7 @@ impl BloomFilterStorage {
 impl fmt::Debug for TagValueSetStorage {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         match self {
-            TagValueSetStorage::Set(set) => write!(f, "Set({:?})", set),
+            TagValueSetStorage::Set(set) => write!(f, "Set({set:?})"),
             TagValueSetStorage::Bloom(_) => write!(f, "Bloom"),
         }
     }
diff --git a/src/unit_test.rs b/src/unit_test.rs
index 499518457db43..73f020118aec4 100644
--- a/src/unit_test.rs
+++ b/src/unit_test.rs
@@ -204,12 +204,12 @@ pub async fn cmd(opts: &Opts, signal_handler: &mut signal::SignalHandler) -> exi
         for (test_name, fails) in aggregated_test_errors {
             #[allow(clippy::print_stdout)]
             {
-                println!("\ntest {}:\n", test_name);
+                println!("\ntest {test_name}:\n");
             }
             for fail in fails {
                 #[allow(clippy::print_stdout)]
                 {
-                    println!("{}\n", fail);
+                    println!("{fail}\n");
                 }
             }
         }
diff --git a/src/validate.rs b/src/validate.rs
index 352cc808a5ab5..83007e487264d 100644
--- a/src/validate.rs
+++ b/src/validate.rs
@@ -230,17 +230,17 @@ async fn validate_healthchecks(
                     .healthcheck()
                     .enabled
                 {
-                    fmt.success(format!("Health check \"{}\"", id));
+                    fmt.success(format!("Health check \"{id}\""));
                 } else {
-                    fmt.warning(format!("Health check disabled for \"{}\"", id));
+                    fmt.warning(format!("Health check disabled for \"{id}\""));
                     validated &= !opts.deny_warnings;
                 }
             }
-            Ok(Err(e)) => failed(format!("Health check for \"{}\" failed: {}", id, e)),
+            Ok(Err(e)) => failed(format!("Health check for \"{id}\" failed: {e}")),
             Err(error) if error.is_cancelled() => {
-                failed(format!("Health check for \"{}\" was cancelled", id))
+                failed(format!("Health check for \"{id}\" was cancelled"))
             }
-            Err(_) => failed(format!("Health check for \"{}\" panicked", id)),
+            Err(_) => failed(format!("Health check for \"{id}\" panicked")),
         }
         trace!("Healthcheck for {id} done.");
     }
diff --git a/tests/e2e/datadog/metrics/mod.rs b/tests/e2e/datadog/metrics/mod.rs
index a71483accbb92..a88a3c4c3155a 100644
--- a/tests/e2e/datadog/metrics/mod.rs
+++ b/tests/e2e/datadog/metrics/mod.rs
@@ -13,14 +13,14 @@ mod sketches;
 use super::*;
 
 async fn decompress_payload(payload: &[u8]) -> std::io::Result<Vec<u8>> {
-    if is_zstd(&payload) {
+    if is_zstd(payload) {
         let mut decompressor = ZstdDecoder::new(payload);
         let mut decompressed = Vec::new();
         decompressor.read_to_end(&mut decompressed).await?;
         return Ok(decompressed);
     }
 
-    let mut decompressor = ZlibDecoder::new(&payload[..]);
+    let mut decompressor = ZlibDecoder::new(payload);
     let mut decompressed = Vec::new();
     let result = decompressor.read_to_end(&mut decompressed);
     result.map(|_| decompressed)
diff --git a/tests/e2e/datadog/metrics/series.rs b/tests/e2e/datadog/metrics/series.rs
index 27316770b0804..984b9fd63c6f1 100644
--- a/tests/e2e/datadog/metrics/series.rs
+++ b/tests/e2e/datadog/metrics/series.rs
@@ -287,14 +287,14 @@ pub(super) async fn validate() {
             if metric_type == 2 {
                 let agent_sum: f64 = agent_ts
                     .1
-                    .iter()
-                    .map(|(_tb, points)| points.iter().sum::<f64>())
+                    .values()
+                    .map(|points| points.iter().sum::<f64>())
                     .sum();
 
                 let vector_sum: f64 = vector_ts
                     .1
-                    .iter()
-                    .map(|(_tb, points)| points.iter().sum::<f64>())
+                    .values()
+                    .map(|points| points.iter().sum::<f64>())
                     .sum();
 
                 assert_eq!(agent_sum, vector_sum, "Mismatch of rate data");
diff --git a/tests/e2e/datadog/mod.rs b/tests/e2e/datadog/mod.rs
index 2e64f40ab1e93..a56111ec5cf40 100644
--- a/tests/e2e/datadog/mod.rs
+++ b/tests/e2e/datadog/mod.rs
@@ -42,10 +42,7 @@ type FakeIntakeResponseJson = FakeIntakeResponse<FakeIntakePayloadJson>;
 
 impl FakeIntakeResponseT for FakeIntakeResponseJson {
     fn build_url(base: &str, endpoint: &str) -> String {
-        format!(
-            "{}/fakeintake/payloads?endpoint={}&format=json",
-            base, endpoint,
-        )
+        format!("{base}/fakeintake/payloads?endpoint={endpoint}&format=json",)
     }
 }
 
@@ -53,7 +50,7 @@ type FakeIntakeResponseRaw = FakeIntakeResponse<FakeIntakePayloadRaw>;
 
 impl FakeIntakeResponseT for FakeIntakeResponseRaw {
     fn build_url(base: &str, endpoint: &str) -> String {
-        format!("{}/fakeintake/payloads?endpoint={}", base, endpoint,)
+        format!("{base}/fakeintake/payloads?endpoint={endpoint}",)
     }
 }
 
@@ -66,7 +63,7 @@ where
         .request(Method::GET, url)
         .send()
         .await
-        .unwrap_or_else(|_| panic!("Sending GET request to {} failed", url))
+        .unwrap_or_else(|_| panic!("Sending GET request to {url} failed"))
         .json::<R>()
         .await
         .expect("Parsing fakeintake payloads failed")
diff --git a/tests/integration/cli.rs b/tests/integration/cli.rs
index 23e8c755da5a6..107153e4b2a3d 100644
--- a/tests/integration/cli.rs
+++ b/tests/integration/cli.rs
@@ -40,7 +40,7 @@ fn assert_no_log_lines(output: Vec<u8>) {
     let keywords = ["ERROR", "WARN", "INFO", "DEBUG", "TRACE"];
     for line in output.lines() {
         let present = keywords.iter().any(|word| line.contains(word));
-        assert!(!present, "Log detected in output line: {:?}", line);
+        assert!(!present, "Log detected in output line: {line:?}");
     }
 }
 
@@ -50,13 +50,12 @@ fn source_config(source: &str) -> String {
 data_dir = "${{VECTOR_DATA_DIR}}"
 
 [sources.in]
-{}
+{source}
 
 [sinks.out]
     inputs = ["in"]
     type = "blackhole"
-"#,
-        source
+"#
     )
 }
 
@@ -125,9 +124,8 @@ fn validate_ignore_healthcheck() {
         validate(&format!(
             r#"
         healthchecks.enabled = false
-        {}
-        "#,
-            FAILING_HEALTHCHECK
+        {FAILING_HEALTHCHECK}
+        "#
         )),
         exitcode::OK
     );
diff --git a/tests/integration/shutdown.rs b/tests/integration/shutdown.rs
index e4f0f75fa7739..0054ef0f0ae93 100644
--- a/tests/integration/shutdown.rs
+++ b/tests/integration/shutdown.rs
@@ -24,7 +24,7 @@ const STARTUP_TIME: Duration = Duration::from_secs(2);
 const SHUTDOWN_TIME: Duration = Duration::from_secs(4);
 const RELOAD_TIME: Duration = Duration::from_secs(5);
 
-const STDIO_CONFIG: &'static str = r#"
+const STDIO_CONFIG: &str = r#"
     data_dir = "${VECTOR_DATA_DIR}"
 
     [sources.in_console]
@@ -36,7 +36,7 @@ const STDIO_CONFIG: &'static str = r#"
         encoding.codec = "text"
 "#;
 
-const PROMETHEUS_SINK_CONFIG: &'static str = r#"
+const PROMETHEUS_SINK_CONFIG: &str = r#"
     data_dir = "${VECTOR_DATA_DIR}"
 
     [sources.in]
@@ -63,13 +63,12 @@ fn source_config(source: &str) -> String {
 data_dir = "${{VECTOR_DATA_DIR}}"
 
 [sources.in]
-{}
+{source}
 
 [sinks.out]
     inputs = ["in"]
     type = "blackhole"
-"#,
-        source
+"#
     )
 }
 
@@ -126,7 +125,7 @@ fn test_timely_shutdown_with_sub(mut cmd: Command, sub: impl FnOnce(&mut Child))
     // Check output
     if !output.status.success() {
         let stdout = String::from_utf8_lossy(&output.stdout).into_owned();
-        println!("{}", stdout);
+        println!("{stdout}");
         panic!("Vector didn't exit successfully. Status: {}", output.status);
     }
 
@@ -305,7 +304,7 @@ fn configuration_path_recomputed() {
     // Second configuration file
     overwrite_file(dir.join("conf2.toml"), STDIO_CONFIG);
     // Clean the first file so to have only the console source.
-    overwrite_file(dir.join("conf1.toml"), &"");
+    overwrite_file(dir.join("conf1.toml"), "");
 
     // Signal reload
     kill(Pid::from_raw(vector.id() as i32), Signal::SIGHUP).unwrap();
diff --git a/vdev/src/commands/info.rs b/vdev/src/commands/info.rs
index f3a8614054e57..e25992a91ab56 100644
--- a/vdev/src/commands/info.rs
+++ b/vdev/src/commands/info.rs
@@ -11,15 +11,15 @@ pub struct Cli {}
 
 impl Cli {
     pub fn exec(self) -> Result<()> {
-        println!("Container tool:  {:?}", *CONTAINER_TOOL);
-        println!("Data path:       {:?}", platform::data_dir());
+        println!("Container tool:  {}", CONTAINER_TOOL.display());
+        println!("Data path:       {}", platform::data_dir().display());
         println!("Repository:      {:?}", app::path());
-        println!("Shell:           {:?}", *app::SHELL);
+        println!("Shell:           {}", app::SHELL.display());
 
         println!("\nConfig:");
         match config::path() {
             Ok(path) => {
-                println!("  Path:        {path:?}");
+                println!("  Path:        {}", path.display());
                 match config::load() {
                     Ok(config) => {
                         println!("  Repository:  {:?}", config.repo);
diff --git a/vdev/src/features.rs b/vdev/src/features.rs
index 60762c525214c..2ad26bedcaba4 100644
--- a/vdev/src/features.rs
+++ b/vdev/src/features.rs
@@ -64,8 +64,8 @@ struct Component {
 }
 
 pub fn load_and_extract(filename: &Path) -> Result<Vec<String>> {
-    let config =
-        fs::read_to_string(filename).with_context(|| format!("failed to read {filename:?}"))?;
+    let config = fs::read_to_string(filename)
+        .with_context(|| format!("failed to read {}", filename.display()))?;
 
     let config: VectorConfig = match filename
         .extension()
diff --git a/vdev/src/platform.rs b/vdev/src/platform.rs
index 486105e5bc4df..e4268603b2df1 100644
--- a/vdev/src/platform.rs
+++ b/vdev/src/platform.rs
@@ -7,7 +7,7 @@ use std::sync::OnceLock;
 pub fn canonicalize_path(path: impl AsRef<Path>) -> String {
     let path = path.as_ref();
     dunce::canonicalize(path)
-        .unwrap_or_else(|err| panic!("Could not canonicalize path {path:?}: {err}"))
+        .unwrap_or_else(|err| panic!("Could not canonicalize path {}: {err}", path.display()))
         .display()
         .to_string()
 }
diff --git a/vdev/src/testing/config.rs b/vdev/src/testing/config.rs
index 4a0b261daf9fb..3ba11faa44337 100644
--- a/vdev/src/testing/config.rs
+++ b/vdev/src/testing/config.rs
@@ -32,9 +32,9 @@ impl RustToolchainConfig {
         let repo_path = app::path();
         let config_file: PathBuf = [repo_path, "rust-toolchain.toml"].iter().collect();
         let contents = fs::read_to_string(&config_file)
-            .with_context(|| format!("failed to read {config_file:?}"))?;
+            .with_context(|| format!("failed to read {}", config_file.display()))?;
         let config: RustToolchainRootConfig = toml::from_str(&contents)
-            .with_context(|| format!("failed to parse {config_file:?}"))?;
+            .with_context(|| format!("failed to parse {}", config_file.display()))?;
 
         Ok(config.toolchain)
     }
@@ -112,9 +112,10 @@ pub enum Command {
 
 impl ComposeConfig {
     pub fn parse(path: &Path) -> Result<Self> {
-        let contents =
-            fs::read_to_string(path).with_context(|| format!("failed to read {path:?}"))?;
-        serde_yaml::from_str(&contents).with_context(|| format!("failed to parse {path:?}"))
+        let contents = fs::read_to_string(path)
+            .with_context(|| format!("failed to read {}", path.display()))?;
+        serde_yaml::from_str(&contents)
+            .with_context(|| format!("failed to parse {}", path.display()))
     }
 }
 
diff --git a/vdev/src/testing/integration.rs b/vdev/src/testing/integration.rs
index 0fa4329eb9485..3452c2f27045f 100644
--- a/vdev/src/testing/integration.rs
+++ b/vdev/src/testing/integration.rs
@@ -223,7 +223,9 @@ impl Compose {
         let original_path: PathBuf = [&test_dir, Path::new("compose.yaml")].iter().collect();
 
         match original_path.try_exists() {
-            Err(error) => Err(error).with_context(|| format!("Could not lookup {original_path:?}")),
+            Err(error) => {
+                Err(error).with_context(|| format!("Could not lookup {}", original_path.display()))
+            }
             Ok(false) => Ok(None),
             Ok(true) => {
                 let mut config = ComposeConfig::parse(&original_path)?;
@@ -376,7 +378,7 @@ mod unix {
     fn add_read_permission(path: &Path) -> Result<()> {
         let metadata = path
             .metadata()
-            .with_context(|| format!("Could not get permissions on {path:?}"))?;
+            .with_context(|| format!("Could not get permissions on {}", path.display()))?;
 
         if metadata.is_file() {
             add_permission(path, &metadata, ALL_READ)
@@ -384,10 +386,11 @@ mod unix {
             if metadata.is_dir() {
                 add_permission(path, &metadata, ALL_READ_DIR)?;
                 for entry in fs::read_dir(path)
-                    .with_context(|| format!("Could not read directory {path:?}"))?
+                    .with_context(|| format!("Could not read directory {}", path.display()))?
                 {
-                    let entry = entry
-                        .with_context(|| format!("Could not read directory entry in {path:?}"))?;
+                    let entry = entry.with_context(|| {
+                        format!("Could not read directory entry in {}", path.display())
+                    })?;
                     add_read_permission(&entry.path())?;
                 }
             }
@@ -400,7 +403,7 @@ mod unix {
         let new_perms = Permissions::from_mode(perms.mode() | bits);
         if new_perms != perms {
             fs::set_permissions(path, new_perms)
-                .with_context(|| format!("Could not set permissions on {path:?}"))?;
+                .with_context(|| format!("Could not set permissions on {}", path.display()))?;
         }
         Ok(())
     }
diff --git a/vdev/src/testing/runner.rs b/vdev/src/testing/runner.rs
index bfaa203021da5..4dd9bb194be96 100644
--- a/vdev/src/testing/runner.rs
+++ b/vdev/src/testing/runner.rs
@@ -169,10 +169,11 @@ pub trait ContainerTestRunner: TestRunner {
         let network_name = self.network_name().unwrap_or("host");
 
         let docker_socket = format!("{}:/var/run/docker.sock", DOCKER_SOCKET.display());
-        let docker_args = self
-            .needs_docker_socket()
-            .then(|| vec!["--volume", &docker_socket])
-            .unwrap_or_default();
+        let docker_args = if self.needs_docker_socket() {
+            vec!["--volume", &docker_socket]
+        } else {
+            vec![]
+        };
 
         let volumes = self.volumes();
         let volumes: Vec<_> = volumes
diff --git a/vdev/src/testing/state.rs b/vdev/src/testing/state.rs
index cc58181a41c1e..761617636ff89 100644
--- a/vdev/src/testing/state.rs
+++ b/vdev/src/testing/state.rs
@@ -53,11 +53,12 @@ impl EnvsDir {
             Ok(json) => json,
             Err(error) if error.kind() == ErrorKind::NotFound => return Ok(None),
             Err(error) => {
-                return Err(error).context(format!("Could not read state file {:?}", self.path))
+                return Err(error)
+                    .context(format!("Could not read state file {}", self.path.display()))
             }
         };
         let state: State = serde_json::from_str(&json)
-            .with_context(|| format!("Could not parse state file {:?}", self.path))?;
+            .with_context(|| format!("Could not parse state file {}", self.path.display()))?;
         Ok(Some(state))
     }
 
@@ -69,18 +70,18 @@ impl EnvsDir {
         let path = &*DATA_DIR;
         if !path.is_dir() {
             fs::create_dir_all(path)
-                .with_context(|| format!("failed to create directory {path:?}"))?;
+                .with_context(|| format!("failed to create directory {}", path.display()))?;
         }
 
         let config = serde_json::to_string(&config)?;
         fs::write(&self.path, config)
-            .with_context(|| format!("failed to write file {:?}", self.path))
+            .with_context(|| format!("failed to write file {}", self.path.display()))
     }
 
     pub fn remove(&self) -> Result<()> {
         if util::exists(&self.path)? {
             fs::remove_file(&self.path)
-                .with_context(|| format!("failed to remove {:?}", self.path))?;
+                .with_context(|| format!("failed to remove {}", self.path.display()))?;
         }
 
         Ok(())

From c011a59dae9eac97dcab103f3824c8b0e1a3c730 Mon Sep 17 00:00:00 2001
From: Thomas <thomas.schneider@datadoghq.com>
Date: Fri, 18 Jul 2025 10:24:49 -0400
Subject: [PATCH 188/305] feat(ci): split up test.yml (#23383)

* feat(ci): split up test.yml

* Change path and chmod

* Install deps

* Use sudo to install protoc

* Add wasm-pack to vrl playground job

* Install nextest

* Install missing libsals2 in jobs

* Install protoc for unit and component spec

* Bootstrap only in component docs job

* Bootstrap ubuntu for unit tests

* Remove unecessary libsasl2-dev

* Remove rustup relative path

* Revert vdev caching

* Update vdev/README.md

* Fix wrong cue vdev matcher

* Remove cargo cache and add rust matcher

* Fix markdown check

* Bootstrap ubuntu in cue docs

* Remove all-checks job

* debug Revert "Bootstrap ubuntu in cue docs"

This reverts commit 01d7d894cbc01425c91d2ef3c79187a2260edcab.

* Re-add reverted "Bootstrap ubuntu in cue docs"

This reverts commit cc498fc6f876237a81bdc7ad42450b8c76c35bcd.

* Re-add all-checks job to satisfy branch protection rules
---
 .github/workflows/changes.yml |   2 +-
 .github/workflows/test.yml    | 242 ++++++++++++++++++++++------------
 vdev/README.md                |   2 +-
 3 files changed, 160 insertions(+), 86 deletions(-)

diff --git a/.github/workflows/changes.yml b/.github/workflows/changes.yml
index b22d29b6a76bb..d8fd0c7febe59 100644
--- a/.github/workflows/changes.yml
+++ b/.github/workflows/changes.yml
@@ -177,7 +177,7 @@ jobs:
             - "vdev/**"
           cue:
             - 'website/cue/**'
-            - "vdev"
+            - "vdev/**"
           component_docs:
             - 'scripts/generate-component-docs.rb'
             - "vdev/**"
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 32804d101565a..0b136320ba05b 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -11,8 +11,6 @@ concurrency:
   cancel-in-progress: true
 
 env:
-  AWS_ACCESS_KEY_ID: "dummy"
-  AWS_SECRET_ACCESS_KEY: "dummy"
   CONTAINER_TOOL: "docker"
   DD_ENV: "ci"
   DD_API_KEY: ${{ secrets.DD_API_KEY }}
@@ -30,116 +28,192 @@ jobs:
     uses: ./.github/workflows/changes.yml
     secrets: inherit
 
-  checks:
-    name: Checks
-    runs-on: ubuntu-24.04-8core
-    timeout-minutes: 60
+  check-fmt:
+    name: Check code format
+    runs-on: ubuntu-24.04
     needs: changes
-    env:
-      CARGO_INCREMENTAL: 0
     steps:
       - uses: actions/checkout@v4
-        with:
-          # check-version needs tags
-          fetch-depth: 0 # fetch everything
-
-      - uses: actions/cache@v4
-        name: Cache Cargo registry + index
-        with:
-          path: |
-            ~/.cargo/bin/
-            ~/.cargo/registry/index/
-            ~/.cargo/registry/cache/
-            ~/.cargo/git/db/
-          key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-cargo-
-
-      - run: sudo -E bash scripts/environment/bootstrap-ubuntu-24.04.sh
-
-      - uses: ruby/setup-ruby@v1
-
-      - run: bash scripts/environment/prepare.sh
-
       - name: Enable Rust matcher
         run: echo "::add-matcher::.github/matchers/rust.json"
+      - run: make check-fmt
 
-      - name: Check code format
-        run: make check-fmt
-
-      - name: Check clippy
-        if: needs.changes.outputs.source == 'true'
-        run: make check-clippy
+  check-clippy:
+    name: Check clippy
+    runs-on: ubuntu-24.04-8core
+    if: needs.changes.outputs.source == 'true'
+    needs: changes
+    steps:
+      - uses: actions/checkout@v4
+      - name: Enable Rust matcher
+        run: echo "::add-matcher::.github/matchers/rust.json"
+      - run: sudo bash ./scripts/environment/install-protoc.sh
+      - run: sudo apt-get update && sudo apt-get install -y libsasl2-dev
+      - run: make check-clippy
 
-      - name: Unit - x86_64-unknown-linux-gnu
-        if: needs.changes.outputs.source == 'true'
-        run: make test
+  test:
+    name: Unit - x86_64-unknown-linux-gnu
+    runs-on: ubuntu-24.04-8core
+    if: needs.changes.outputs.source == 'true'
+    needs: changes
+    steps:
+      - uses: actions/checkout@v4
+      - name: Enable Rust matcher
+        run: echo "::add-matcher::.github/matchers/rust.json"
+      - run: sudo -E bash scripts/environment/bootstrap-ubuntu-24.04.sh
+      - run: cargo install cargo-nextest --version 0.9.95 --force --locked
+      - run: make test
         env:
           CARGO_BUILD_JOBS: 5
 
-      # Validates components for adherence to the Component Specification
-      - name: Check Component Spec
-        run: make test-component-validation
-
-      - name: Upload test results
-        run: scripts/upload-test-results.sh
-        if: always()
+  test-component-validation:
+    name: Check Component Spec
+    runs-on: ubuntu-24.04
+    needs: changes
+    steps:
+      - uses: actions/checkout@v4
+      - name: Enable Rust matcher
+        run: echo "::add-matcher::.github/matchers/rust.json"
+      - run: sudo bash ./scripts/environment/install-protoc.sh
+      - run: cargo install cargo-nextest --version 0.9.95 --force --locked
+      - run: make test-component-validation
 
-      - name: Check version
-        run: make check-version
+  check-version:
+    name: Check version
+    runs-on: ubuntu-24.04
+    needs: changes
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      - run: make check-version
 
-      - name: Check scripts
-        run: make check-scripts
+  check-scripts:
+    name: Check scripts
+    runs-on: ubuntu-24.04
+    needs: changes
+    steps:
+      - uses: actions/checkout@v4
+      - run: make check-scripts
 
-      - name: Check events
-        if: needs.changes.outputs.source == 'true'
-        run: make check-events
+  check-events:
+    name: Check events
+    runs-on: ubuntu-24.04-8core
+    if: needs.changes.outputs.source == 'true'
+    needs: changes
+    steps:
+      - uses: actions/checkout@v4
+      - name: Enable Rust matcher
+        run: echo "::add-matcher::.github/matchers/rust.json"
+      - run: make check-events
 
-      - name: Check that the 3rd-party license file is up to date
-        if: needs.changes.outputs.dependencies == 'true'
-        run: make check-licenses
+  check-licenses:
+    name: Check that the 3rd-party license file is up to date
+    runs-on: ubuntu-24.04
+    if: needs.changes.outputs.dependencies == 'true'
+    needs: changes
+    steps:
+      - uses: actions/checkout@v4
+      - run: cargo install dd-rust-license-tool --version 1.0.2 --force --locked
+      - run: make check-licenses
 
-      - name: Check Cue docs
-        if: needs.changes.outputs.cue == 'true'
-        run: make check-docs
+  check-docs:
+    name: Check Cue docs
+    runs-on: ubuntu-24.04
+    if: needs.changes.outputs.cue == 'true'
+    needs: changes
+    steps:
+      - uses: actions/checkout@v4
+      - run: sudo -E bash scripts/environment/bootstrap-ubuntu-24.04.sh
+      - run: make check-docs
 
-      - name: Check Markdown
-        if: needs.changes.outputs.markdown == 'true'
-        run: make check-markdown
+  check-markdown:
+    name: Check Markdown
+    runs-on: ubuntu-24.04
+    if: needs.changes.outputs.markdown == 'true'
+    needs: changes
+    steps:
+      - uses: actions/checkout@v4
+      - run: sudo npm -g install markdownlint-cli@0.30
+      - run: make check-markdown
 
-      - name: Check Component Docs
-        if: needs.changes.outputs.source == 'true' || needs.changes.outputs.component_docs == 'true'
-        run: make check-component-docs
+  check-component-docs:
+    name: Check Component Docs
+    runs-on: ubuntu-24.04-8core
+    if: needs.changes.outputs.source == 'true' || needs.changes.outputs.component_docs == 'true'
+    needs: changes
+    steps:
+      - uses: actions/checkout@v4
+      - run: sudo bash ./scripts/environment/install-protoc.sh
+      - run: sudo apt-get update && sudo apt-get install -y libsasl2-dev
+      - run: sudo -E bash scripts/environment/bootstrap-ubuntu-24.04.sh
+      - run: make check-component-docs
 
-      - name: Check Rust Docs
-        if: needs.changes.outputs.source == 'true'
-        run: cd rust-doc && make docs
+  check-rust-docs:
+    name: Check Rust Docs
+    runs-on: ubuntu-24.04-8core
+    if: needs.changes.outputs.source == 'true'
+    needs: changes
+    steps:
+      - uses: actions/checkout@v4
+      - name: Enable Rust matcher
+        run: echo "::add-matcher::.github/matchers/rust.json"
+      - run: cd rust-doc && make docs
 
-      - name: VRL - Linux
-        if: needs.changes.outputs.source == 'true' || needs.changes.outputs.cue == 'true'
-        run: cargo vdev test-vrl
+  test-vrl:
+    name: VRL - Linux
+    runs-on: ubuntu-24.04-8core
+    if: needs.changes.outputs.source == 'true' || needs.changes.outputs.cue == 'true'
+    needs: changes
+    steps:
+      - uses: actions/checkout@v4
+      - name: Enable Rust matcher
+        run: echo "::add-matcher::.github/matchers/rust.json"
+      - run: sudo bash ./scripts/environment/install-protoc.sh
+      - run: cargo install --force --locked --version 0.13.1 wasm-pack
+      - run: make test-vrl
 
-      - name: Build VRL Playground
-        if: needs.changes.outputs.source == 'true' || needs.changes.outputs.dependencies == 'true'
-        run: |
+  build-vrl-playground:
+    name: Build VRL Playground
+    runs-on: ubuntu-24.04-8core
+    if: needs.changes.outputs.source == 'true' || needs.changes.outputs.dependencies == 'true'
+    needs: changes
+    steps:
+      - uses: actions/checkout@v4
+      - name: Enable Rust matcher
+        run: echo "::add-matcher::.github/matchers/rust.json"
+      - run: cargo install --force --locked --version 0.13.1 wasm-pack
+      - run: |
           cd lib/vector-vrl/web-playground/
-          ~/.cargo/bin/rustup target add wasm32-unknown-unknown
+          rustup target add wasm32-unknown-unknown
           wasm-pack build --target web --out-dir public/pkg
 
-  # This is a required status check, so it always needs to run if prior jobs failed, in order to mark the status correctly.
   all-checks:
     name: Test Suite
     runs-on: ubuntu-24.04
-    timeout-minutes: 5
     if: always()
-    needs: [changes, checks]
-    env:
-      FAILED: ${{ contains(needs.*.result, 'failure') }}
+    needs:
+      - changes
+      - check-fmt
+      - check-clippy
+      - test
+      - test-component-validation
+      - check-version
+      - check-scripts
+      - check-events
+      - check-licenses
+      - check-docs
+      - check-markdown
+      - check-component-docs
+      - check-rust-docs
+      - test-vrl
+      - build-vrl-playground
     steps:
-      - run: |
-          echo "failed=${{ env.FAILED }}"
-          if [[ "$FAILED" == "true" ]] ; then
+      - name: Check all jobs status
+        run: |
+          if [[ "${{ contains(needs.*.result, 'failure') || contains(needs.*.result, 'cancelled') }}" == "true" ]]; then
+            echo "One or more jobs failed or were cancelled"
             exit 1
           else
-            exit 0
+            echo "All jobs completed successfully"
           fi
diff --git a/vdev/README.md b/vdev/README.md
index befaefaa6f556..f8dfeeab5d969 100644
--- a/vdev/README.md
+++ b/vdev/README.md
@@ -78,4 +78,4 @@ Every command group/namespace has its own directory with a `cli` module, includi
 
 Unit tests can be run by calling `cargo vdev test`.
 
-Integration tests are not run by default when running`cargo vdev test`. Instead, they are accessible via the integration subcommand (example: `cargo vdev int test aws` runs aws-related integration tests). You can find the list of available integration tests using `cargo vdev int show`. Integration tests require docker or podman to run.
+Integration tests are not run by default when running `cargo vdev test`. Instead, they are accessible via the integration subcommand (example: `cargo vdev int test aws` runs aws-related integration tests). You can find the list of available integration tests using `cargo vdev int show`. Integration tests require docker or podman to run.

From 2d4bc0b7d40f5621f99617dcb047e190650526ae Mon Sep 17 00:00:00 2001
From: Thomas <thomas.schneider@datadoghq.com>
Date: Fri, 18 Jul 2025 10:58:40 -0400
Subject: [PATCH 189/305] fix(ci): pass in GITHUB_TOKEN to bypass rate limits
 (#23396)

* fix(ci): pass in GITHUB_TOKEN to bypass rate limits

* Add temp test file

* Make token read only

* Remove temp test file
---
 .github/workflows/protobuf.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.github/workflows/protobuf.yml b/.github/workflows/protobuf.yml
index 20fa9f864f351..6cb6e84dd0203 100644
--- a/.github/workflows/protobuf.yml
+++ b/.github/workflows/protobuf.yml
@@ -1,5 +1,8 @@
 name: Protobuf Compatibility
 
+permissions:
+  contents: read
+
 on:
   pull_request:
     paths:
@@ -22,6 +25,8 @@ jobs:
       - uses: actions/checkout@v4
       # Install the `buf` CLI
       - uses: bufbuild/buf-setup-action@v1.50.0
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
       # Perform breaking change detection against the `master` branch
       - uses: bufbuild/buf-breaking-action@v1.1.4
         with:

From 6a6ffa591320bd6c64e6b8b1ec4a42f4ebc17fd1 Mon Sep 17 00:00:00 2001
From: Pavlos Rontidis <pavlos.rontidis@gmail.com>
Date: Fri, 18 Jul 2025 14:32:31 -0400
Subject: [PATCH 190/305] chore(dev): switch to 2024 edition (#23395)

* chore(dev): switch to 2024 edition

* auto fixes and one manual fix in benches

* cargo fmt --all

* rename to avoid reserved words

* ran cargo fmt
---
 benches/enrichment_tables.rs                  | 14 +--
 src/api/schema/components/mod.rs              |  4 +-
 src/api/schema/filter.rs                      |  2 +-
 src/api/schema/health.rs                      |  2 +-
 src/api/schema/metrics/mod.rs                 | 36 ++++----
 src/aws/mod.rs                                |  2 +-
 src/components/validation/resources/http.rs   | 23 ++---
 src/config/cmd.rs                             |  6 +-
 src/config/format.rs                          |  2 +-
 src/config/loading/loader.rs                  |  7 +-
 src/config/sink.rs                            |  6 +-
 src/config/source.rs                          |  6 +-
 src/config/transform.rs                       |  6 +-
 src/enrichment_tables/geoip.rs                |  2 +-
 .../allocator/tracing_allocator.rs            | 90 ++++++++++---------
 src/line_agg.rs                               | 11 ++-
 src/signal.rs                                 |  2 +-
 src/sinks/azure_monitor_logs/sink.rs          |  7 +-
 src/sinks/gcp_chronicle/compression.rs        |  6 +-
 src/sinks/honeycomb/encoder.rs                |  7 +-
 src/sinks/influxdb/metrics.rs                 |  7 +-
 src/sinks/prometheus/exporter.rs              | 49 +++++-----
 src/sinks/prometheus/remote_write/tests.rs    |  2 +-
 .../util/adaptive_concurrency/controller.rs   |  4 +-
 .../util/adaptive_concurrency/service.rs      |  2 +-
 src/sinks/util/buffer/compression.rs          |  6 +-
 src/sinks/util/http.rs                        |  2 +-
 src/sinks/websocket/sink.rs                   |  4 +-
 src/sinks/websocket_server/buffering.rs       |  2 +-
 src/source_sender/mod.rs                      |  2 +-
 src/sources/apache_metrics/parser.rs          |  2 +-
 src/sources/aws_kinesis_firehose/handlers.rs  |  2 +-
 src/sources/aws_s3/mod.rs                     |  9 +-
 src/sources/demo_logs.rs                      |  7 +-
 src/sources/docker_logs/mod.rs                |  7 +-
 src/sources/gcp_pubsub.rs                     |  2 +-
 src/sources/http_client/client.rs             |  6 +-
 src/sources/kafka.rs                          | 22 ++---
 .../kubernetes_logs/k8s_paths_provider.rs     |  2 +-
 src/sources/mongodb_metrics/mod.rs            |  8 +-
 src/sources/mqtt/source.rs                    |  2 +-
 src/sources/nginx_metrics/mod.rs              |  4 +-
 src/sources/postgresql_metrics.rs             | 10 +--
 src/sources/socket/mod.rs                     |  2 +-
 src/sources/socket/tcp.rs                     |  2 +-
 src/sources/socket/udp.rs                     |  2 +-
 src/sources/socket/unix.rs                    |  2 +-
 src/sources/splunk_hec/mod.rs                 |  2 +-
 src/sources/util/message_decoding.rs          |  2 +-
 src/sources/util/net/mod.rs                   |  2 +-
 src/sources/vector/mod.rs                     |  2 +-
 src/test_util/metrics.rs                      |  4 +-
 src/test_util/mock/mod.rs                     |  5 +-
 src/test_util/mod.rs                          |  4 +-
 src/topology/builder.rs                       | 44 ++++-----
 src/transforms/aggregate.rs                   | 21 +++--
 src/transforms/reduce/merge_strategy.rs       | 33 +++----
 src/transforms/remap.rs                       |  6 +-
 src/transforms/throttle/transform.rs          | 57 +++++++-----
 src/validate.rs                               |  9 +-
 60 files changed, 328 insertions(+), 275 deletions(-)

diff --git a/benches/enrichment_tables.rs b/benches/enrichment_tables.rs
index 5c9a11f157a62..67de513d44142 100644
--- a/benches/enrichment_tables.rs
+++ b/benches/enrichment_tables.rs
@@ -2,6 +2,7 @@ use std::time::SystemTime;
 
 use chrono::prelude::*;
 use criterion::{criterion_group, criterion_main, BatchSize, Criterion};
+use vector::enrichment_tables::file::FileData;
 use vector::enrichment_tables::{
     file::File,
     geoip::{Geoip, GeoipConfig},
@@ -49,12 +50,13 @@ fn benchmark_enrichment_tables_file(c: &mut Criterion) {
 
         let mut file = File::new(
             Default::default(),
-            SystemTime::now(),
-            data,
-            // Headers.
-            (0..10)
-                .map(|header| format!("field-{}", header))
-                .collect::<Vec<_>>(),
+            FileData {
+                data,
+                headers: (0..10)
+                    .map(|header| format!("field-{header}"))
+                    .collect::<Vec<_>>(),
+                modified: SystemTime::now(),
+            },
         );
 
         let (condition, index, result_offset) = if date_range {
diff --git a/src/api/schema/components/mod.rs b/src/api/schema/components/mod.rs
index 8beffd82ce354..b65b2a4cec230 100644
--- a/src/api/schema/components/mod.rs
+++ b/src/api/schema/components/mod.rs
@@ -235,7 +235,7 @@ pub struct ComponentsSubscription;
 #[Subscription]
 impl ComponentsSubscription {
     /// Subscribes to all newly added components
-    async fn component_added(&self) -> impl Stream<Item = Component> {
+    async fn component_added(&self) -> impl Stream<Item = Component> + use<> {
         BroadcastStream::new(COMPONENT_CHANGED.subscribe()).filter_map(|c| match c {
             Ok(ComponentChanged::Added(c)) => Some(c),
             _ => None,
@@ -243,7 +243,7 @@ impl ComponentsSubscription {
     }
 
     /// Subscribes to all removed components
-    async fn component_removed(&self) -> impl Stream<Item = Component> {
+    async fn component_removed(&self) -> impl Stream<Item = Component> + use<> {
         BroadcastStream::new(COMPONENT_CHANGED.subscribe()).filter_map(|c| match c {
             Ok(ComponentChanged::Removed(c)) => Some(c),
             _ => None,
diff --git a/src/api/schema/filter.rs b/src/api/schema/filter.rs
index c73b88a6c01d6..438a4d7587207 100644
--- a/src/api/schema/filter.rs
+++ b/src/api/schema/filter.rs
@@ -7,7 +7,7 @@ use super::components::{source, ComponentKind};
 /// Takes an `&Option<bool>` and returns early if false
 #[macro_export]
 macro_rules! filter_check {
-    ($($match:expr),+) => {
+    ($($match:expr_2021),+) => {
         $(
             if matches!($match, Some(t) if !t) {
                 return false;
diff --git a/src/api/schema/health.rs b/src/api/schema/health.rs
index ebd24184caf17..36500f21f7afa 100644
--- a/src/api/schema/health.rs
+++ b/src/api/schema/health.rs
@@ -34,7 +34,7 @@ impl HealthSubscription {
     async fn heartbeat(
         &self,
         #[graphql(default = 1000, validator(minimum = 10, maximum = 60_000))] interval: i32,
-    ) -> impl Stream<Item = Heartbeat> {
+    ) -> impl Stream<Item = Heartbeat> + use<> {
         IntervalStream::new(tokio::time::interval(Duration::from_millis(
             interval as u64,
         )))
diff --git a/src/api/schema/metrics/mod.rs b/src/api/schema/metrics/mod.rs
index 08baa7cc12fd7..116f1ca3777c2 100644
--- a/src/api/schema/metrics/mod.rs
+++ b/src/api/schema/metrics/mod.rs
@@ -63,7 +63,7 @@ impl MetricsSubscription {
     async fn uptime(
         &self,
         #[graphql(default = 1000, validator(minimum = 10, maximum = 60_000))] interval: i32,
-    ) -> impl Stream<Item = Uptime> {
+    ) -> impl Stream<Item = Uptime> + use<> {
         get_metrics(interval).filter_map(|m| match m.name() {
             "uptime_seconds" => Some(Uptime::new(m)),
             _ => None,
@@ -75,7 +75,7 @@ impl MetricsSubscription {
     async fn received_events_total(
         &self,
         #[graphql(default = 1000, validator(minimum = 10, maximum = 60_000))] interval: i32,
-    ) -> impl Stream<Item = ReceivedEventsTotal> {
+    ) -> impl Stream<Item = ReceivedEventsTotal> + use<> {
         get_metrics(interval).filter_map(|m| match m.name() {
             "component_received_events_total" => Some(ReceivedEventsTotal::new(m)),
             _ => None,
@@ -87,7 +87,7 @@ impl MetricsSubscription {
     async fn received_events_throughput(
         &self,
         #[graphql(default = 1000, validator(minimum = 10, maximum = 60_000))] interval: i32,
-    ) -> impl Stream<Item = i64> {
+    ) -> impl Stream<Item = i64> + use<> {
         counter_throughput(interval, &|m| m.name() == "component_received_events_total")
             .map(|(_, throughput)| throughput as i64)
     }
@@ -96,7 +96,7 @@ impl MetricsSubscription {
     async fn component_received_events_throughputs(
         &self,
         #[graphql(default = 1000, validator(minimum = 10, maximum = 60_000))] interval: i32,
-    ) -> impl Stream<Item = Vec<ComponentReceivedEventsThroughput>> {
+    ) -> impl Stream<Item = Vec<ComponentReceivedEventsThroughput>> + use<> {
         component_counter_throughputs(interval, &|m| m.name() == "component_received_events_total")
             .map(|m| {
                 m.into_iter()
@@ -114,7 +114,7 @@ impl MetricsSubscription {
     async fn component_received_events_totals(
         &self,
         #[graphql(default = 1000, validator(minimum = 10, maximum = 60_000))] interval: i32,
-    ) -> impl Stream<Item = Vec<ComponentReceivedEventsTotal>> {
+    ) -> impl Stream<Item = Vec<ComponentReceivedEventsTotal>> + use<> {
         component_counter_metrics(interval, &|m| m.name() == "component_received_events_total").map(
             |m| {
                 m.into_iter()
@@ -129,7 +129,7 @@ impl MetricsSubscription {
     async fn sent_events_total(
         &self,
         #[graphql(default = 1000, validator(minimum = 10, maximum = 60_000))] interval: i32,
-    ) -> impl Stream<Item = SentEventsTotal> {
+    ) -> impl Stream<Item = SentEventsTotal> + use<> {
         get_metrics(interval).filter_map(|m| match m.name() {
             "component_sent_events_total" => Some(SentEventsTotal::new(m)),
             _ => None,
@@ -141,7 +141,7 @@ impl MetricsSubscription {
     async fn sent_events_throughput(
         &self,
         #[graphql(default = 1000, validator(minimum = 10, maximum = 60_000))] interval: i32,
-    ) -> impl Stream<Item = i64> {
+    ) -> impl Stream<Item = i64> + use<> {
         counter_throughput(interval, &|m| m.name() == "component_sent_events_total")
             .map(|(_, throughput)| throughput as i64)
     }
@@ -150,7 +150,7 @@ impl MetricsSubscription {
     async fn component_sent_events_throughputs(
         &self,
         #[graphql(default = 1000, validator(minimum = 10, maximum = 60_000))] interval: i32,
-    ) -> impl Stream<Item = Vec<ComponentSentEventsThroughput>> {
+    ) -> impl Stream<Item = Vec<ComponentSentEventsThroughput>> + use<> {
         component_sent_events_total_throughputs_with_outputs(interval).map(|m| {
             m.into_iter()
                 .map(|(key, total_throughput, outputs)| {
@@ -164,7 +164,7 @@ impl MetricsSubscription {
     async fn component_sent_events_totals(
         &self,
         #[graphql(default = 1000, validator(minimum = 10, maximum = 60_000))] interval: i32,
-    ) -> impl Stream<Item = Vec<ComponentSentEventsTotal>> {
+    ) -> impl Stream<Item = Vec<ComponentSentEventsTotal>> + use<> {
         component_sent_events_totals_metrics_with_outputs(interval).map(|ms| {
             ms.into_iter()
                 .map(|(m, m_by_outputs)| ComponentSentEventsTotal::new(m, m_by_outputs))
@@ -176,7 +176,7 @@ impl MetricsSubscription {
     async fn component_received_bytes_totals(
         &self,
         #[graphql(default = 1000, validator(minimum = 10, maximum = 60_000))] interval: i32,
-    ) -> impl Stream<Item = Vec<ComponentReceivedBytesTotal>> {
+    ) -> impl Stream<Item = Vec<ComponentReceivedBytesTotal>> + use<> {
         component_counter_metrics(interval, &|m| m.name() == "component_received_bytes_total").map(
             |m| {
                 m.into_iter()
@@ -190,7 +190,7 @@ impl MetricsSubscription {
     async fn component_received_bytes_throughputs(
         &self,
         #[graphql(default = 1000, validator(minimum = 10, maximum = 60_000))] interval: i32,
-    ) -> impl Stream<Item = Vec<ComponentReceivedBytesThroughput>> {
+    ) -> impl Stream<Item = Vec<ComponentReceivedBytesThroughput>> + use<> {
         component_counter_throughputs(interval, &|m| m.name() == "component_received_bytes_total")
             .map(|m| {
                 m.into_iter()
@@ -208,7 +208,7 @@ impl MetricsSubscription {
     async fn component_sent_bytes_totals(
         &self,
         #[graphql(default = 1000, validator(minimum = 10, maximum = 60_000))] interval: i32,
-    ) -> impl Stream<Item = Vec<ComponentSentBytesTotal>> {
+    ) -> impl Stream<Item = Vec<ComponentSentBytesTotal>> + use<> {
         component_counter_metrics(interval, &|m| m.name() == "component_sent_bytes_total")
             .map(|m| m.into_iter().map(ComponentSentBytesTotal::new).collect())
     }
@@ -217,7 +217,7 @@ impl MetricsSubscription {
     async fn component_sent_bytes_throughputs(
         &self,
         #[graphql(default = 1000, validator(minimum = 10, maximum = 60_000))] interval: i32,
-    ) -> impl Stream<Item = Vec<ComponentSentBytesThroughput>> {
+    ) -> impl Stream<Item = Vec<ComponentSentBytesThroughput>> + use<> {
         component_counter_throughputs(interval, &|m| m.name() == "component_sent_bytes_total").map(
             |m| {
                 m.into_iter()
@@ -236,7 +236,7 @@ impl MetricsSubscription {
     async fn errors_total(
         &self,
         #[graphql(default = 1000, validator(minimum = 10, maximum = 60_000))] interval: i32,
-    ) -> impl Stream<Item = ErrorsTotal> {
+    ) -> impl Stream<Item = ErrorsTotal> + use<> {
         get_metrics(interval)
             .filter(|m| m.name().ends_with("_errors_total"))
             .map(ErrorsTotal::new)
@@ -246,7 +246,7 @@ impl MetricsSubscription {
     async fn allocated_bytes(
         &self,
         #[graphql(default = 1000, validator(minimum = 10, maximum = 60_000))] interval: i32,
-    ) -> impl Stream<Item = AllocatedBytes> {
+    ) -> impl Stream<Item = AllocatedBytes> + use<> {
         get_metrics(interval)
             .filter(|m| m.name() == "component_allocated_bytes")
             .map(AllocatedBytes::new)
@@ -256,7 +256,7 @@ impl MetricsSubscription {
     async fn component_allocated_bytes(
         &self,
         #[graphql(default = 1000, validator(minimum = 10, maximum = 60_000))] interval: i32,
-    ) -> impl Stream<Item = Vec<ComponentAllocatedBytes>> {
+    ) -> impl Stream<Item = Vec<ComponentAllocatedBytes>> + use<> {
         component_gauge_metrics(interval, &|m| m.name() == "component_allocated_bytes")
             .map(|m| m.into_iter().map(ComponentAllocatedBytes::new).collect())
     }
@@ -265,7 +265,7 @@ impl MetricsSubscription {
     async fn component_errors_totals(
         &self,
         #[graphql(default = 1000, validator(minimum = 10, maximum = 60_000))] interval: i32,
-    ) -> impl Stream<Item = Vec<ComponentErrorsTotal>> {
+    ) -> impl Stream<Item = Vec<ComponentErrorsTotal>> + use<> {
         component_counter_metrics(interval, &|m| m.name().ends_with("_errors_total"))
             .map(|m| m.into_iter().map(ComponentErrorsTotal::new).collect())
     }
@@ -274,7 +274,7 @@ impl MetricsSubscription {
     async fn metrics(
         &self,
         #[graphql(default = 1000, validator(minimum = 10, maximum = 60_000))] interval: i32,
-    ) -> impl Stream<Item = MetricType> {
+    ) -> impl Stream<Item = MetricType> + use<> {
         get_metrics(interval).filter_map(|m| match m.name() {
             "uptime_seconds" => Some(MetricType::Uptime(m.into())),
             _ => None,
diff --git a/src/aws/mod.rs b/src/aws/mod.rs
index 0348f783b0837..dbfc742878ae8 100644
--- a/src/aws/mod.rs
+++ b/src/aws/mod.rs
@@ -130,7 +130,7 @@ pub trait ClientBuilder {
 pub fn region_provider(
     proxy: &ProxyConfig,
     tls_options: Option<&TlsConfig>,
-) -> crate::Result<impl ProvideRegion> {
+) -> crate::Result<impl ProvideRegion + use<>> {
     let config = aws_config::provider_config::ProviderConfig::default()
         .with_http_client(connector(proxy, tls_options)?);
 
diff --git a/src/components/validation/resources/http.rs b/src/components/validation/resources/http.rs
index 2bfc04deba62f..c9ad824d8150c 100644
--- a/src/components/validation/resources/http.rs
+++ b/src/components/validation/resources/http.rs
@@ -113,16 +113,19 @@ fn spawn_input_http_server(
 
             async move {
                 let mut sendable_events = sendable_events.lock().await;
-                if let Some(event) = sendable_events.pop_front() {
-                    let mut buffer = BytesMut::new();
-                    encode_test_event(&mut encoder, &mut buffer, event);
-
-                    buffer.into_response()
-                } else {
-                    // We'll send an empty 200 in the response since some
-                    // sources throw errors for anything other than a valid
-                    // response.
-                    StatusCode::OK.into_response()
+                match sendable_events.pop_front() {
+                    Some(event) => {
+                        let mut buffer = BytesMut::new();
+                        encode_test_event(&mut encoder, &mut buffer, event);
+
+                        buffer.into_response()
+                    }
+                    _ => {
+                        // We'll send an empty 200 in the response since some
+                        // sources throw errors for anything other than a valid
+                        // response.
+                        StatusCode::OK.into_response()
+                    }
                 }
             }
         },
diff --git a/src/config/cmd.rs b/src/config/cmd.rs
index 675a0dc1c9dd0..e2372931087fa 100644
--- a/src/config/cmd.rs
+++ b/src/config/cmd.rs
@@ -78,7 +78,7 @@ impl Opts {
 /// Helper to merge JSON. Handles objects and array concatenation.
 fn merge_json(a: &mut Value, b: Value) {
     match (a, b) {
-        (Value::Object(ref mut a), Value::Object(b)) => {
+        (Value::Object(a), Value::Object(b)) => {
             for (k, v) in b {
                 merge_json(a.entry(k).or_insert(Value::Null), v);
             }
@@ -92,7 +92,7 @@ fn merge_json(a: &mut Value, b: Value) {
 /// Helper to sort array values.
 fn sort_json_array_values(json: &mut Value) {
     match json {
-        Value::Array(ref mut arr) => {
+        Value::Array(arr) => {
             for v in arr.iter_mut() {
                 sort_json_array_values(v);
             }
@@ -113,7 +113,7 @@ fn sort_json_array_values(json: &mut Value) {
                 .map(|v| serde_json::from_str(v.as_str()).unwrap())
                 .collect::<Vec<_>>();
         }
-        Value::Object(ref mut json) => {
+        Value::Object(json) => {
             for (_, v) in json {
                 sort_json_array_values(v);
             }
diff --git a/src/config/format.rs b/src/config/format.rs
index 75b19e86035d9..32c2bd7b0f12e 100644
--- a/src/config/format.rs
+++ b/src/config/format.rs
@@ -179,7 +179,7 @@ mod tests {
         use crate::config::ConfigBuilder;
 
         macro_rules! concat_with_newlines {
-            ($($e:expr,)*) => { concat!( $($e, "\n"),+ ) };
+            ($($e:expr_2021,)*) => { concat!( $($e, "\n"),+ ) };
         }
 
         const SAMPLE_TOML: &str = r#"
diff --git a/src/config/loading/loader.rs b/src/config/loading/loader.rs
index 75bd431724250..0fcfeb2545c48 100644
--- a/src/config/loading/loader.rs
+++ b/src/config/loading/loader.rs
@@ -163,10 +163,9 @@ pub(super) mod process {
             path: &Path,
             format: Format,
         ) -> Result<Option<(String, Table)>, Vec<String>> {
-            if let (Ok(name), Some(file)) = (component_name(path), open_file(path)) {
-                self.load(file, format).map(|value| Some((name, value)))
-            } else {
-                Ok(None)
+            match (component_name(path), open_file(path)) {
+                (Ok(name), Some(file)) => self.load(file, format).map(|value| Some((name, value))),
+                _ => Ok(None),
             }
         }
 
diff --git a/src/config/sink.rs b/src/config/sink.rs
index 4ee7f64c13709..e322243c5acdd 100644
--- a/src/config/sink.rs
+++ b/src/config/sink.rs
@@ -37,8 +37,10 @@ impl Configurable for BoxedSink {
         metadata
     }
 
-    fn generate_schema(gen: &RefCell<SchemaGenerator>) -> Result<SchemaObject, GenerateError> {
-        vector_lib::configurable::component::SinkDescription::generate_schemas(gen)
+    fn generate_schema(
+        generator: &RefCell<SchemaGenerator>,
+    ) -> Result<SchemaObject, GenerateError> {
+        vector_lib::configurable::component::SinkDescription::generate_schemas(generator)
     }
 }
 
diff --git a/src/config/source.rs b/src/config/source.rs
index 8b91413115b7a..2c540eeea8a18 100644
--- a/src/config/source.rs
+++ b/src/config/source.rs
@@ -33,8 +33,10 @@ impl Configurable for BoxedSource {
         metadata
     }
 
-    fn generate_schema(gen: &RefCell<SchemaGenerator>) -> Result<SchemaObject, GenerateError> {
-        vector_lib::configurable::component::SourceDescription::generate_schemas(gen)
+    fn generate_schema(
+        generator: &RefCell<SchemaGenerator>,
+    ) -> Result<SchemaObject, GenerateError> {
+        vector_lib::configurable::component::SourceDescription::generate_schemas(generator)
     }
 }
 
diff --git a/src/config/transform.rs b/src/config/transform.rs
index b1a32534edc8a..5471c41b1429e 100644
--- a/src/config/transform.rs
+++ b/src/config/transform.rs
@@ -39,8 +39,10 @@ impl Configurable for BoxedTransform {
         metadata
     }
 
-    fn generate_schema(gen: &RefCell<SchemaGenerator>) -> Result<SchemaObject, GenerateError> {
-        vector_lib::configurable::component::TransformDescription::generate_schemas(gen)
+    fn generate_schema(
+        generator: &RefCell<SchemaGenerator>,
+    ) -> Result<SchemaObject, GenerateError> {
+        vector_lib::configurable::component::TransformDescription::generate_schemas(generator)
     }
 }
 
diff --git a/src/enrichment_tables/geoip.rs b/src/enrichment_tables/geoip.rs
index d7f47f4b4d843..fd3dbcf899ab3 100644
--- a/src/enrichment_tables/geoip.rs
+++ b/src/enrichment_tables/geoip.rs
@@ -156,7 +156,7 @@ impl Geoip {
         };
 
         macro_rules! add_field {
-            ($k:expr, $v:expr) => {
+            ($k:expr_2021, $v:expr_2021) => {
                 add_field($k, $v.map(Into::into))
             };
         }
diff --git a/src/internal_telemetry/allocations/allocator/tracing_allocator.rs b/src/internal_telemetry/allocations/allocator/tracing_allocator.rs
index 4c48928d079ce..dc189c35c239e 100644
--- a/src/internal_telemetry/allocations/allocator/tracing_allocator.rs
+++ b/src/internal_telemetry/allocations/allocator/tracing_allocator.rs
@@ -29,55 +29,59 @@ impl<A, T> GroupedTraceableAllocator<A, T> {
 unsafe impl<A: GlobalAlloc, T: Tracer> GlobalAlloc for GroupedTraceableAllocator<A, T> {
     #[inline]
     unsafe fn alloc(&self, object_layout: Layout) -> *mut u8 {
-        if !TRACK_ALLOCATIONS.load(Ordering::Relaxed) {
-            return self.allocator.alloc(object_layout);
+        unsafe {
+            if !TRACK_ALLOCATIONS.load(Ordering::Relaxed) {
+                return self.allocator.alloc(object_layout);
+            }
+
+            // Allocate our wrapped layout and make sure the allocation succeeded.
+            let (actual_layout, offset_to_group_id) = get_wrapped_layout(object_layout);
+            let actual_ptr = self.allocator.alloc(actual_layout);
+            if actual_ptr.is_null() {
+                return actual_ptr;
+            }
+
+            let group_id_ptr = actual_ptr.add(offset_to_group_id).cast::<u8>();
+
+            let object_size = object_layout.size();
+
+            try_with_suspended_allocation_group(
+                #[inline(always)]
+                |group_id| {
+                    group_id_ptr.write(group_id.as_raw());
+                    self.tracer.trace_allocation(object_size, group_id);
+                },
+            );
+            actual_ptr
         }
-
-        // Allocate our wrapped layout and make sure the allocation succeeded.
-        let (actual_layout, offset_to_group_id) = get_wrapped_layout(object_layout);
-        let actual_ptr = self.allocator.alloc(actual_layout);
-        if actual_ptr.is_null() {
-            return actual_ptr;
-        }
-
-        let group_id_ptr = actual_ptr.add(offset_to_group_id).cast::<u8>();
-
-        let object_size = object_layout.size();
-
-        try_with_suspended_allocation_group(
-            #[inline(always)]
-            |group_id| {
-                group_id_ptr.write(group_id.as_raw());
-                self.tracer.trace_allocation(object_size, group_id);
-            },
-        );
-        actual_ptr
     }
 
     #[inline]
     unsafe fn dealloc(&self, object_ptr: *mut u8, object_layout: Layout) {
-        if !TRACK_ALLOCATIONS.load(Ordering::Relaxed) {
-            self.allocator.dealloc(object_ptr, object_layout);
-            return;
+        unsafe {
+            if !TRACK_ALLOCATIONS.load(Ordering::Relaxed) {
+                self.allocator.dealloc(object_ptr, object_layout);
+                return;
+            }
+            // Regenerate the wrapped layout so we know where we have to look, as the pointer we've given relates to the
+            // requested layout, not the wrapped layout that was actually allocated.
+            let (wrapped_layout, offset_to_group_id) = get_wrapped_layout(object_layout);
+
+            let raw_group_id = object_ptr.add(offset_to_group_id).cast::<u8>().read();
+
+            // Deallocate before tracking, just to make sure we're reclaiming memory as soon as possible.
+            self.allocator.dealloc(object_ptr, wrapped_layout);
+
+            let object_size = object_layout.size();
+            let source_group_id = AllocationGroupId::from_raw(raw_group_id);
+
+            try_with_suspended_allocation_group(
+                #[inline(always)]
+                |_| {
+                    self.tracer.trace_deallocation(object_size, source_group_id);
+                },
+            );
         }
-        // Regenerate the wrapped layout so we know where we have to look, as the pointer we've given relates to the
-        // requested layout, not the wrapped layout that was actually allocated.
-        let (wrapped_layout, offset_to_group_id) = get_wrapped_layout(object_layout);
-
-        let raw_group_id = object_ptr.add(offset_to_group_id).cast::<u8>().read();
-
-        // Deallocate before tracking, just to make sure we're reclaiming memory as soon as possible.
-        self.allocator.dealloc(object_ptr, wrapped_layout);
-
-        let object_size = object_layout.size();
-        let source_group_id = AllocationGroupId::from_raw(raw_group_id);
-
-        try_with_suspended_allocation_group(
-            #[inline(always)]
-            |_| {
-                self.tracer.trace_deallocation(object_size, source_group_id);
-            },
-        );
     }
 }
 
diff --git a/src/line_agg.rs b/src/line_agg.rs
index 7777071329bfa..25693fb21783a 100644
--- a/src/line_agg.rs
+++ b/src/line_agg.rs
@@ -183,10 +183,13 @@ where
 
             // If we're in draining mode, short circuit here.
             if let Some(to_drain) = &mut this.draining {
-                if let Some(val) = to_drain.pop() {
-                    return Poll::Ready(Some(val));
-                } else {
-                    return Poll::Ready(None);
+                match to_drain.pop() {
+                    Some(val) => {
+                        return Poll::Ready(Some(val));
+                    }
+                    _ => {
+                        return Poll::Ready(None);
+                    }
                 }
             }
 
diff --git a/src/signal.rs b/src/signal.rs
index 4075c545a15ce..ef095ad55be6b 100644
--- a/src/signal.rs
+++ b/src/signal.rs
@@ -173,7 +173,7 @@ impl SignalHandler {
 
 /// Signals from OS/user.
 #[cfg(unix)]
-fn os_signals(runtime: &Runtime) -> impl Stream<Item = SignalTo> {
+fn os_signals(runtime: &Runtime) -> impl Stream<Item = SignalTo> + use<> {
     use tokio::signal::unix::{signal, SignalKind};
 
     // The `signal` function must be run within the context of a Tokio runtime.
diff --git a/src/sinks/azure_monitor_logs/sink.rs b/src/sinks/azure_monitor_logs/sink.rs
index e916ebe7418da..947256855421b 100644
--- a/src/sinks/azure_monitor_logs/sink.rs
+++ b/src/sinks/azure_monitor_logs/sink.rs
@@ -112,10 +112,9 @@ impl crate::sinks::util::encoding::Encoder<Vec<Event>> for JsonEncoding {
 
             // `.remove_timestamp()` will return the `timestamp` value regardless of location in Event or
             // Metadata, the following `insert()` ensures it's encoded in the request.
-            let timestamp = if let Some(Value::Timestamp(ts)) = log.remove_timestamp() {
-                ts
-            } else {
-                chrono::Utc::now()
+            let timestamp = match log.remove_timestamp() {
+                Some(Value::Timestamp(ts)) => ts,
+                _ => chrono::Utc::now(),
             };
 
             if let Some(timestamp_key) = &self.time_generated_key {
diff --git a/src/sinks/gcp_chronicle/compression.rs b/src/sinks/gcp_chronicle/compression.rs
index 21d86580ed9a2..3c9eb7a411917 100644
--- a/src/sinks/gcp_chronicle/compression.rs
+++ b/src/sinks/gcp_chronicle/compression.rs
@@ -61,7 +61,9 @@ impl Configurable for ChronicleCompression {
         Compression::metadata()
     }
 
-    fn generate_schema(gen: &RefCell<SchemaGenerator>) -> Result<SchemaObject, GenerateError> {
+    fn generate_schema(
+        generator: &RefCell<SchemaGenerator>,
+    ) -> Result<SchemaObject, GenerateError> {
         // First, we'll create the string-only subschemas for each algorithm, and wrap those up
         // within a one-of schema.
         let mut string_metadata = Metadata::with_description("Compression algorithm.");
@@ -79,7 +81,7 @@ impl Configurable for ChronicleCompression {
         apply_base_metadata(&mut all_string_oneof_subschema, string_metadata);
 
         let compression_level_schema =
-            get_or_generate_schema(&CompressionLevel::as_configurable_ref(), gen, None)?;
+            get_or_generate_schema(&CompressionLevel::as_configurable_ref(), generator, None)?;
 
         let mut required = BTreeSet::new();
         required.insert(ALGORITHM_NAME.to_string());
diff --git a/src/sinks/honeycomb/encoder.rs b/src/sinks/honeycomb/encoder.rs
index 7f0f0634cc4a1..77a773fbd3945 100644
--- a/src/sinks/honeycomb/encoder.rs
+++ b/src/sinks/honeycomb/encoder.rs
@@ -31,10 +31,9 @@ impl SinkEncoder<Vec<Event>> for HoneycombEncoder {
 
             let log = event.as_mut_log();
 
-            let timestamp = if let Some(Value::Timestamp(ts)) = log.remove_timestamp() {
-                ts
-            } else {
-                Utc::now()
+            let timestamp = match log.remove_timestamp() {
+                Some(Value::Timestamp(ts)) => ts,
+                _ => Utc::now(),
             };
 
             let data = json!({
diff --git a/src/sinks/influxdb/metrics.rs b/src/sinks/influxdb/metrics.rs
index 4dcff26dac58a..fd21c1025d2fe 100644
--- a/src/sinks/influxdb/metrics.rs
+++ b/src/sinks/influxdb/metrics.rs
@@ -217,8 +217,11 @@ impl Service<Vec<Metric>> for InfluxDbSvc {
 fn create_build_request(
     uri: http::Uri,
     token: &str,
-) -> impl Fn(Bytes) -> BoxFuture<'static, crate::Result<hyper::Request<Bytes>>> + Sync + Send + 'static
-{
+) -> impl Fn(Bytes) -> BoxFuture<'static, crate::Result<hyper::Request<Bytes>>>
+       + Sync
+       + Send
+       + 'static
+       + use<> {
     let auth = format!("Token {token}");
     move |body| {
         Box::pin(ready(
diff --git a/src/sinks/prometheus/exporter.rs b/src/sinks/prometheus/exporter.rs
index 77c795b5e180f..2dafb871b428f 100644
--- a/src/sinks/prometheus/exporter.rs
+++ b/src/sinks/prometheus/exporter.rs
@@ -563,31 +563,34 @@ impl StreamSink<Event> for PrometheusExporter {
             let mut metric = event.into_metric();
             let finalizers = metric.take_finalizers();
 
-            if let Some(normalized) = self.normalize(metric) {
-                let normalized = if self.config.suppress_timestamp {
-                    normalized.with_timestamp(None)
-                } else {
-                    normalized
-                };
-
-                // We have a normalized metric, in absolute form.  If we're already aware of this
-                // metric, update its expiration deadline, otherwise, start tracking it.
-                let mut metrics = self.metrics.write().expect(LOCK_FAILED);
-
-                match metrics.entry(MetricRef::from_metric(&normalized)) {
-                    Entry::Occupied(mut entry) => {
-                        let (data, metadata) = entry.get_mut();
-                        *data = normalized;
-                        metadata.refresh();
-                    }
-                    Entry::Vacant(entry) => {
-                        entry.insert((normalized, MetricMetadata::new(flush_period)));
+            match self.normalize(metric) {
+                Some(normalized) => {
+                    let normalized = if self.config.suppress_timestamp {
+                        normalized.with_timestamp(None)
+                    } else {
+                        normalized
+                    };
+
+                    // We have a normalized metric, in absolute form.  If we're already aware of this
+                    // metric, update its expiration deadline, otherwise, start tracking it.
+                    let mut metrics = self.metrics.write().expect(LOCK_FAILED);
+
+                    match metrics.entry(MetricRef::from_metric(&normalized)) {
+                        Entry::Occupied(mut entry) => {
+                            let (data, metadata) = entry.get_mut();
+                            *data = normalized;
+                            metadata.refresh();
+                        }
+                        Entry::Vacant(entry) => {
+                            entry.insert((normalized, MetricMetadata::new(flush_period)));
+                        }
                     }
+                    finalizers.update_status(EventStatus::Delivered);
+                }
+                _ => {
+                    emit!(PrometheusNormalizationError {});
+                    finalizers.update_status(EventStatus::Errored);
                 }
-                finalizers.update_status(EventStatus::Delivered);
-            } else {
-                emit!(PrometheusNormalizationError {});
-                finalizers.update_status(EventStatus::Errored);
             }
         }
 
diff --git a/src/sinks/prometheus/remote_write/tests.rs b/src/sinks/prometheus/remote_write/tests.rs
index 245bc74b6932d..9bf74c72aee6e 100644
--- a/src/sinks/prometheus/remote_write/tests.rs
+++ b/src/sinks/prometheus/remote_write/tests.rs
@@ -23,7 +23,7 @@ fn generate_config() {
 }
 
 macro_rules! labels {
-        ( $( $name:expr => $value:expr ),* ) => {
+        ( $( $name:expr_2021 => $value:expr_2021 ),* ) => {
             vec![ $( proto::Label {
                 name: $name.to_string(),
                 value: $value.to_string()
diff --git a/src/sinks/util/adaptive_concurrency/controller.rs b/src/sinks/util/adaptive_concurrency/controller.rs
index 227ee29c7122a..0f05639a92ed0 100644
--- a/src/sinks/util/adaptive_concurrency/controller.rs
+++ b/src/sinks/util/adaptive_concurrency/controller.rs
@@ -105,7 +105,9 @@ impl<L> Controller<L> {
         }
     }
 
-    pub(super) fn acquire(&self) -> impl Future<Output = OwnedSemaphorePermit> + Send + 'static {
+    pub(super) fn acquire(
+        &self,
+    ) -> impl Future<Output = OwnedSemaphorePermit> + Send + 'static + use<L> {
         Arc::clone(&self.semaphore).acquire()
     }
 
diff --git a/src/sinks/util/adaptive_concurrency/service.rs b/src/sinks/util/adaptive_concurrency/service.rs
index 6186b4cc1b3ae..6aa929f62fe15 100644
--- a/src/sinks/util/adaptive_concurrency/service.rs
+++ b/src/sinks/util/adaptive_concurrency/service.rs
@@ -115,7 +115,7 @@ impl fmt::Debug for State {
                 .debug_tuple("State::Waiting")
                 .field(&format_args!("..."))
                 .finish(),
-            State::Ready(ref r) => f.debug_tuple("State::Ready").field(&r).finish(),
+            State::Ready(r) => f.debug_tuple("State::Ready").field(&r).finish(),
             State::Empty => f.debug_tuple("State::Empty").finish(),
         }
     }
diff --git a/src/sinks/util/buffer/compression.rs b/src/sinks/util/buffer/compression.rs
index c270976021359..6e835c4a9cea8 100644
--- a/src/sinks/util/buffer/compression.rs
+++ b/src/sinks/util/buffer/compression.rs
@@ -305,7 +305,9 @@ impl Configurable for Compression {
         metadata
     }
 
-    fn generate_schema(gen: &RefCell<SchemaGenerator>) -> Result<SchemaObject, GenerateError> {
+    fn generate_schema(
+        generator: &RefCell<SchemaGenerator>,
+    ) -> Result<SchemaObject, GenerateError> {
         // First, we'll create the string-only subschemas for each algorithm, and wrap those up
         // within a one-of schema.
         let mut string_metadata = Metadata::with_description("Compression algorithm.");
@@ -358,7 +360,7 @@ impl Configurable for Compression {
         // `none` algorithm as part of the overall set of enum values declared for the `algorithm`
         // field in the "full" schema version.
         let compression_level_schema =
-            get_or_generate_schema(&CompressionLevel::as_configurable_ref(), gen, None)?;
+            get_or_generate_schema(&CompressionLevel::as_configurable_ref(), generator, None)?;
 
         let mut required = BTreeSet::new();
         required.insert(ALGORITHM_NAME.to_string());
diff --git a/src/sinks/util/http.rs b/src/sinks/util/http.rs
index 3d85add642d0c..89eed3d7bcd72 100644
--- a/src/sinks/util/http.rs
+++ b/src/sinks/util/http.rs
@@ -940,7 +940,7 @@ mod test {
         tokio::time::sleep(std::time::Duration::from_millis(50)).await;
         service.call(request).await.unwrap();
 
-        let (body, _rest) = rx.into_future().await;
+        let (body, _rest) = StreamExt::into_future(rx).await;
         assert_eq!(body.unwrap(), "hello");
     }
 }
diff --git a/src/sinks/websocket/sink.rs b/src/sinks/websocket/sink.rs
index 5f86a821d7a44..8f00da2bc9b97 100644
--- a/src/sinks/websocket/sink.rs
+++ b/src/sinks/websocket/sink.rs
@@ -214,8 +214,8 @@ impl WebSocketSink {
     async fn create_sink_and_stream(
         &self,
     ) -> (
-        impl Sink<Message, Error = WsError>,
-        impl Stream<Item = Result<Message, WsError>>,
+        impl Sink<Message, Error = WsError> + use<>,
+        impl Stream<Item = Result<Message, WsError>> + use<>,
     ) {
         let ws_stream = self.connector.connect_backoff().await;
         ws_stream.split()
diff --git a/src/sinks/websocket_server/buffering.rs b/src/sinks/websocket_server/buffering.rs
index 70f8c0e160b58..955da32e3ab2a 100644
--- a/src/sinks/websocket_server/buffering.rs
+++ b/src/sinks/websocket_server/buffering.rs
@@ -233,7 +233,7 @@ impl WsMessageBufferConfig for Option<MessageBufferingConfig> {
     fn add_replay_message_id_to_event(&self, event: &mut Event) -> Uuid {
         let message_id = Uuid::now_v7();
         if let Some(MessageBufferingConfig {
-            message_id_path: Some(ref message_id_path),
+            message_id_path: Some(message_id_path),
             ..
         }) = self
         {
diff --git a/src/source_sender/mod.rs b/src/source_sender/mod.rs
index 39c578c22e200..c93d316c08f7f 100644
--- a/src/source_sender/mod.rs
+++ b/src/source_sender/mod.rs
@@ -250,7 +250,7 @@ impl SourceSender {
         &mut self,
         status: EventStatus,
         name: String,
-    ) -> impl Stream<Item = SourceSenderItem> + Unpin {
+    ) -> impl Stream<Item = SourceSenderItem> + Unpin + use<> {
         // The lag_time parameter here will need to be filled in if this function is ever used for
         // non-test situations.
         let output_id = OutputId {
diff --git a/src/sources/apache_metrics/parser.rs b/src/sources/apache_metrics/parser.rs
index 658998dd8470a..0b436174bdd44 100644
--- a/src/sources/apache_metrics/parser.rs
+++ b/src/sources/apache_metrics/parser.rs
@@ -112,7 +112,7 @@ pub fn parse(
     namespace: Option<&str>,
     now: DateTime<Utc>,
     tags: Option<&MetricTags>,
-) -> impl Iterator<Item = Result<Metric, ParseError>> {
+) -> impl Iterator<Item = Result<Metric, ParseError>> + use<> {
     // We use a HashMap rather than a Vector as mod_status has
     // BusyWorkers/IdleWorkers repeated
     // https://bz.apache.org/bugzilla/show_bug.cgi?id=63300
diff --git a/src/sources/aws_kinesis_firehose/handlers.rs b/src/sources/aws_kinesis_firehose/handlers.rs
index 4ad8ddf50121b..1e390c38b2a41 100644
--- a/src/sources/aws_kinesis_firehose/handlers.rs
+++ b/src/sources/aws_kinesis_firehose/handlers.rs
@@ -92,7 +92,7 @@ pub(super) async fn firehose(
                         if let Some(batch) = &batch {
                             event.add_batch_notifier(batch.clone());
                         }
-                        if let Event::Log(ref mut log) = event {
+                        if let Event::Log(log) = event {
                             log_namespace.insert_vector_metadata(
                                 log,
                                 log_schema().source_type_key(),
diff --git a/src/sources/aws_s3/mod.rs b/src/sources/aws_s3/mod.rs
index 228230fead992..f519ccfb73d9c 100644
--- a/src/sources/aws_s3/mod.rs
+++ b/src/sources/aws_s3/mod.rs
@@ -304,10 +304,11 @@ async fn s3_object_decoder(
     content_type: Option<&str>,
     mut body: ByteStream,
 ) -> Box<dyn tokio::io::AsyncRead + Send + Unpin> {
-    let first = if let Some(first) = body.next().await {
-        first
-    } else {
-        return Box::new(tokio::io::empty());
+    let first = match body.next().await {
+        Some(first) => first,
+        _ => {
+            return Box::new(tokio::io::empty());
+        }
     };
 
     let r = tokio::io::BufReader::new(StreamReader::new(
diff --git a/src/sources/demo_logs.rs b/src/sources/demo_logs.rs
index 7019ae54d61a8..b5b97a52896c9 100644
--- a/src/sources/demo_logs.rs
+++ b/src/sources/demo_logs.rs
@@ -154,10 +154,7 @@ impl OutputFormat {
         emit!(DemoLogsEventProcessed);
 
         match self {
-            Self::Shuffle {
-                sequence,
-                ref lines,
-            } => Self::shuffle_generate(*sequence, lines, n),
+            Self::Shuffle { sequence, lines } => Self::shuffle_generate(*sequence, lines, n),
             Self::ApacheCommon => apache_common_log_line(),
             Self::ApacheError => apache_error_log_line(),
             Self::Syslog => syslog_5424_log_line(),
@@ -363,7 +360,7 @@ mod tests {
         crate::test_util::test_generate_config::<DemoLogsConfig>();
     }
 
-    async fn runit(config: &str) -> impl Stream<Item = Event> {
+    async fn runit(config: &str) -> impl Stream<Item = Event> + use<> {
         assert_source_compliance(&SOURCE_TAGS, async {
             let (tx, rx) = SourceSender::new_test();
             let config: DemoLogsConfig = toml::from_str(config).unwrap();
diff --git a/src/sources/docker_logs/mod.rs b/src/sources/docker_logs/mod.rs
index e6d97a24486bb..f51f86d4d63bd 100644
--- a/src/sources/docker_logs/mod.rs
+++ b/src/sources/docker_logs/mod.rs
@@ -399,7 +399,7 @@ impl DockerLogsSourceCore {
     /// Returns event stream coming from docker.
     fn docker_logs_event_stream(
         &self,
-    ) -> impl Stream<Item = Result<EventMessage, DockerError>> + Send {
+    ) -> impl Stream<Item = Result<EventMessage, DockerError>> + Send + use<> {
         let mut filters = HashMap::new();
 
         // event  | emitted on commands
@@ -1007,8 +1007,9 @@ impl ContainerLogInfo {
                 // occur when a container changes generations, and to avoid processing logs with timestamps before
                 // the created timestamp.
                 match self.last_log.as_ref() {
-                    Some(&(last, gen)) => {
-                        if last < timestamp || (last == timestamp && gen == self.generation) {
+                    Some(&(last, generation)) => {
+                        if last < timestamp || (last == timestamp && generation == self.generation)
+                        {
                             // Noop - log received in order.
                         } else {
                             // Docker returns logs in order.
diff --git a/src/sources/gcp_pubsub.rs b/src/sources/gcp_pubsub.rs
index df519ccbe2598..b175c5e895875 100644
--- a/src/sources/gcp_pubsub.rs
+++ b/src/sources/gcp_pubsub.rs
@@ -566,7 +566,7 @@ impl PubsubSource {
     fn request_stream(
         &self,
         ack_ids: mpsc::Receiver<Vec<String>>,
-    ) -> impl Stream<Item = proto::StreamingPullRequest> + 'static {
+    ) -> impl Stream<Item = proto::StreamingPullRequest> + 'static + use<> {
         let subscription = self.subscription.clone();
         let client_id = CLIENT_ID.clone();
         let stream_ack_deadline_seconds = self.ack_deadline_secs.as_secs() as i32;
diff --git a/src/sources/http_client/client.rs b/src/sources/http_client/client.rs
index 6e30ba1ae856e..2fde06fc6b88a 100644
--- a/src/sources/http_client/client.rs
+++ b/src/sources/http_client/client.rs
@@ -525,14 +525,14 @@ impl http_client::HttpClientContext for HttpClientContext {
 
         for event in events {
             match event {
-                Event::Log(ref mut log) => {
+                Event::Log(log) => {
                     self.log_namespace.insert_standard_vector_source_metadata(
                         log,
                         HttpClientConfig::NAME,
                         now,
                     );
                 }
-                Event::Metric(ref mut metric) => {
+                Event::Metric(metric) => {
                     if let Some(source_type_key) = log_schema().source_type_key() {
                         metric.replace_tag(
                             source_type_key.to_string(),
@@ -540,7 +540,7 @@ impl http_client::HttpClientContext for HttpClientContext {
                         );
                     }
                 }
-                Event::Trace(ref mut trace) => {
+                Event::Trace(trace) => {
                     trace.maybe_insert(log_schema().source_type_key_target_path(), || {
                         Bytes::from(HttpClientConfig::NAME).into()
                     });
diff --git a/src/sources/kafka.rs b/src/sources/kafka.rs
index 5fa512e0e10e3..c144841c1be31 100644
--- a/src/sources/kafka.rs
+++ b/src/sources/kafka.rs
@@ -817,14 +817,14 @@ async fn coordinate_kafka_callbacks(
                         for tp in assigned_partitions.drain(0..) {
                             let topic = tp.0.as_str();
                             let partition = tp.1;
-                            if let Some(pq) = consumer.split_partition_queue(topic, partition) {
+                            match consumer.split_partition_queue(topic, partition) { Some(pq) => {
                                 debug!("Consuming partition {}:{}.", &tp.0, tp.1);
                                 let (end_tx, handle) = consumer_state.consume_partition(&mut partition_consumers, tp.clone(), Arc::clone(&consumer), pq, acks, exit_eof);
                                 abort_handles.insert(tp.clone(), handle);
                                 end_signals.insert(tp, end_tx);
-                            } else {
+                            } _ => {
                                 warn!("Failed to get queue for assigned partition {}:{}.", &tp.0, tp.1);
-                            }
+                            }}
                         }
                         // ensure this is retained until all individual queues are set up
                         drop(done);
@@ -843,12 +843,12 @@ async fn coordinate_kafka_callbacks(
                         let (deadline, mut state) = state.begin_drain(max_drain_ms, drain, false);
 
                         for tp in revoked_partitions.drain(0..) {
-                            if let Some(end) = end_signals.remove(&tp) {
+                            match end_signals.remove(&tp) { Some(end) => {
                                 debug!("Revoking partition {}:{}", &tp.0, tp.1);
                                 state.revoke_partition(tp, end);
-                            } else {
+                            } _ => {
                                 debug!("Consumer task for partition {}:{} already finished.", &tp.0, tp.1);
-                            }
+                            }}
                         }
 
                         state.keep_draining(deadline)
@@ -878,12 +878,12 @@ async fn coordinate_kafka_callbacks(
                                 .for_each(|el| {
 
                                 let tp: TopicPartition = (el.topic().into(), el.partition());
-                                if let Some(end) = end_signals.remove(&tp) {
+                                match end_signals.remove(&tp) { Some(end) => {
                                     debug!("Shutting down and revoking partition {}:{}", &tp.0, tp.1);
                                     state.revoke_partition(tp, end);
-                                } else {
+                                } _ => {
                                     debug!("Consumer task for partition {}:{} already finished.", &tp.0, tp.1);
-                                }
+                                }}
                             });
                         }
                         // If shutdown was initiated by partition EOF mode, the drain phase
@@ -994,7 +994,7 @@ fn parse_stream<'a>(
     decoder: Decoder,
     keys: &'a Keys,
     log_namespace: LogNamespace,
-) -> Option<(usize, impl Stream<Item = Event> + 'a)> {
+) -> Option<(usize, impl Stream<Item = Event> + 'a + use<'a>)> {
     let payload = msg.payload()?; // skip messages with empty payload
 
     let rmsg = ReceivedMessage::from(msg);
@@ -1100,7 +1100,7 @@ impl ReceivedMessage {
     }
 
     fn apply(&self, keys: &Keys, event: &mut Event, log_namespace: LogNamespace) {
-        if let Event::Log(ref mut log) = event {
+        if let Event::Log(log) = event {
             match log_namespace {
                 LogNamespace::Vector => {
                     // We'll only use this function in Vector namespaces because we don't want
diff --git a/src/sources/kubernetes_logs/k8s_paths_provider.rs b/src/sources/kubernetes_logs/k8s_paths_provider.rs
index 78290f5638961..8f65eca7d3a9f 100644
--- a/src/sources/kubernetes_logs/k8s_paths_provider.rs
+++ b/src/sources/kubernetes_logs/k8s_paths_provider.rs
@@ -171,7 +171,7 @@ where
         })
 }
 
-fn real_glob(pattern: &str) -> impl Iterator<Item = PathBuf> {
+fn real_glob(pattern: &str) -> impl Iterator<Item = PathBuf> + use<> {
     glob::glob_with(
         pattern,
         glob::MatchOptions {
diff --git a/src/sources/mongodb_metrics/mod.rs b/src/sources/mongodb_metrics/mod.rs
index d80e6b1b0a1dd..021165671a83f 100644
--- a/src/sources/mongodb_metrics/mod.rs
+++ b/src/sources/mongodb_metrics/mod.rs
@@ -32,8 +32,8 @@ use types::{CommandBuildInfo, CommandIsMaster, CommandServerStatus, NodeType};
 use vector_lib::config::LogNamespace;
 
 macro_rules! tags {
-    ($tags:expr) => { $tags.clone() };
-    ($tags:expr, $($key:expr => $value:expr),*) => {
+    ($tags:expr_2021) => { $tags.clone() };
+    ($tags:expr_2021, $($key:expr_2021 => $value:expr_2021),*) => {
         {
             let mut tags = $tags.clone();
             $(
@@ -45,7 +45,7 @@ macro_rules! tags {
 }
 
 macro_rules! counter {
-    ($value:expr) => {
+    ($value:expr_2021) => {
         MetricValue::Counter {
             value: $value as f64,
         }
@@ -53,7 +53,7 @@ macro_rules! counter {
 }
 
 macro_rules! gauge {
-    ($value:expr) => {
+    ($value:expr_2021) => {
         MetricValue::Gauge {
             value: $value as f64,
         }
diff --git a/src/sources/mqtt/source.rs b/src/sources/mqtt/source.rs
index 62b379a75812a..5bf8588f263b9 100644
--- a/src/sources/mqtt/source.rs
+++ b/src/sources/mqtt/source.rs
@@ -107,7 +107,7 @@ impl MqttSource {
     }
 
     fn apply_metadata(&self, publish: &Publish, event: &mut Event) {
-        if let Event::Log(ref mut log) = event {
+        if let Event::Log(log) = event {
             self.log_namespace.insert_source_metadata(
                 MqttSourceConfig::NAME,
                 log,
diff --git a/src/sources/nginx_metrics/mod.rs b/src/sources/nginx_metrics/mod.rs
index c475e3345f0a1..9435c0a880451 100644
--- a/src/sources/nginx_metrics/mod.rs
+++ b/src/sources/nginx_metrics/mod.rs
@@ -31,7 +31,7 @@ use parser::NginxStubStatus;
 use vector_lib::config::LogNamespace;
 
 macro_rules! counter {
-    ($value:expr) => {
+    ($value:expr_2021) => {
         MetricValue::Counter {
             value: $value as f64,
         }
@@ -39,7 +39,7 @@ macro_rules! counter {
 }
 
 macro_rules! gauge {
-    ($value:expr) => {
+    ($value:expr_2021) => {
         MetricValue::Gauge {
             value: $value as f64,
         }
diff --git a/src/sources/postgresql_metrics.rs b/src/sources/postgresql_metrics.rs
index 675dd9e086288..4d670110910d2 100644
--- a/src/sources/postgresql_metrics.rs
+++ b/src/sources/postgresql_metrics.rs
@@ -43,8 +43,8 @@ use crate::{
 };
 
 macro_rules! tags {
-    ($tags:expr) => { $tags.clone() };
-    ($tags:expr, $($key:expr => $value:expr),*) => {
+    ($tags:expr_2021) => { $tags.clone() };
+    ($tags:expr_2021, $($key:expr_2021 => $value:expr_2021),*) => {
         {
             let mut tags = $tags.clone();
             $(
@@ -56,7 +56,7 @@ macro_rules! tags {
 }
 
 macro_rules! counter {
-    ($value:expr) => {
+    ($value:expr_2021) => {
         MetricValue::Counter {
             value: $value as f64,
         }
@@ -64,7 +64,7 @@ macro_rules! counter {
 }
 
 macro_rules! gauge {
-    ($value:expr) => {
+    ($value:expr_2021) => {
         MetricValue::Gauge {
             value: $value as f64,
         }
@@ -555,7 +555,7 @@ impl PostgresqlMetrics {
         }
     }
 
-    async fn collect_metrics(&mut self) -> Result<impl Iterator<Item = Metric>, String> {
+    async fn collect_metrics(&mut self) -> Result<impl Iterator<Item = Metric> + use<>, String> {
         let (client, client_version) = self
             .client
             .take()
diff --git a/src/sources/socket/mod.rs b/src/sources/socket/mod.rs
index 2a0ca29f8352f..77ebfa165930d 100644
--- a/src/sources/socket/mod.rs
+++ b/src/sources/socket/mod.rs
@@ -1504,7 +1504,7 @@ mod test {
         message: &str,
         stream: bool,
         use_vector_namespace: bool,
-    ) -> (PathBuf, impl Stream<Item = Event>) {
+    ) -> (PathBuf, impl Stream<Item = Event> + use<>) {
         let (tx, rx) = SourceSender::new_test();
         let path = init_unix(tx, stream, use_vector_namespace).await;
         let path_clone = path.clone();
diff --git a/src/sources/socket/tcp.rs b/src/sources/socket/tcp.rs
index 98b10dbf2105e..4c2a87ba4bf93 100644
--- a/src/sources/socket/tcp.rs
+++ b/src/sources/socket/tcp.rs
@@ -220,7 +220,7 @@ impl TcpSource for RawTcpSource {
         let now = Utc::now();
 
         for event in events {
-            if let Event::Log(ref mut log) = event {
+            if let Event::Log(log) = event {
                 self.log_namespace.insert_standard_vector_source_metadata(
                     log,
                     SocketConfig::NAME,
diff --git a/src/sources/socket/udp.rs b/src/sources/socket/udp.rs
index d1031fdd8f531..24ea971752eed 100644
--- a/src/sources/socket/udp.rs
+++ b/src/sources/socket/udp.rs
@@ -275,7 +275,7 @@ pub(super) fn udp(
                                 let now = Utc::now();
 
                                 for event in &mut events {
-                                    if let Event::Log(ref mut log) = event {
+                                    if let Event::Log(log) = event {
                                         log_namespace.insert_standard_vector_source_metadata(
                                             log,
                                             SocketConfig::NAME,
diff --git a/src/sources/socket/unix.rs b/src/sources/socket/unix.rs
index 9f9ba71e08811..2ad3e695372a5 100644
--- a/src/sources/socket/unix.rs
+++ b/src/sources/socket/unix.rs
@@ -99,7 +99,7 @@ fn handle_events(
     let now = Utc::now();
 
     for event in events {
-        if let Event::Log(ref mut log) = event {
+        if let Event::Log(log) = event {
             log_namespace.insert_standard_vector_source_metadata(log, SocketConfig::NAME, now);
 
             if let Some(ref host) = received_from {
diff --git a/src/sources/splunk_hec/mod.rs b/src/sources/splunk_hec/mod.rs
index fc43d98b77c07..d1b2af8a801db 100644
--- a/src/sources/splunk_hec/mod.rs
+++ b/src/sources/splunk_hec/mod.rs
@@ -1346,7 +1346,7 @@ mod tests {
         valid_tokens: Option<&[&str]>,
         acknowledgements: Option<HecAcknowledgementsConfig>,
         store_hec_token: bool,
-    ) -> (impl Stream<Item = Event> + Unpin, SocketAddr) {
+    ) -> (impl Stream<Item = Event> + Unpin + use<>, SocketAddr) {
         let (sender, recv) = SourceSender::new_test_finalize(EventStatus::Delivered);
         let address = next_addr();
         let valid_tokens =
diff --git a/src/sources/util/message_decoding.rs b/src/sources/util/message_decoding.rs
index 6c5af0e9db795..15baccc1406a9 100644
--- a/src/sources/util/message_decoding.rs
+++ b/src/sources/util/message_decoding.rs
@@ -20,7 +20,7 @@ pub fn decode_message<'a>(
     batch: &'a Option<BatchNotifier>,
     log_namespace: LogNamespace,
     events_received: &'a Registered<EventsReceived>,
-) -> impl Iterator<Item = Event> + 'a {
+) -> impl Iterator<Item = Event> + 'a + use<'a> {
     let schema = log_schema();
 
     let mut buffer = BytesMut::with_capacity(message.len());
diff --git a/src/sources/util/net/mod.rs b/src/sources/util/net/mod.rs
index f31a91ad8a82c..1317948dfd349 100644
--- a/src/sources/util/net/mod.rs
+++ b/src/sources/util/net/mod.rs
@@ -83,7 +83,7 @@ impl SocketListenAddr {
 impl fmt::Display for SocketListenAddr {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         match self {
-            Self::SocketAddr(ref addr) => addr.fmt(f),
+            Self::SocketAddr(addr) => addr.fmt(f),
             Self::SystemdFd(offset) => write!(f, "systemd socket #{offset}"),
         }
     }
diff --git a/src/sources/vector/mod.rs b/src/sources/vector/mod.rs
index 5021e2c6cd1fd..ead1dc64ea754 100644
--- a/src/sources/vector/mod.rs
+++ b/src/sources/vector/mod.rs
@@ -57,7 +57,7 @@ impl proto::Service for Service {
 
         let now = Utc::now();
         for event in &mut events {
-            if let Event::Log(ref mut log) = event {
+            if let Event::Log(log) = event {
                 self.log_namespace.insert_standard_vector_source_metadata(
                     log,
                     VectorConfig::NAME,
diff --git a/src/test_util/metrics.rs b/src/test_util/metrics.rs
index 9603ea590b3d1..1e393e15ba2af 100644
--- a/src/test_util/metrics.rs
+++ b/src/test_util/metrics.rs
@@ -143,7 +143,7 @@ pub fn read_set_values(metrics: &SplitMetrics, series: MetricSeries) -> Option<H
 
 #[macro_export]
 macro_rules! series {
-	($name:expr) => {
+	($name:expr_2021) => {
 		vector_lib::event::metric::MetricSeries {
 			name: vector_lib::event::metric::MetricName {
 				name: $name.into(),
@@ -152,7 +152,7 @@ macro_rules! series {
 			tags: None,
 		}
 	};
-	($name:expr, $($tk:expr => $tv:expr),*) => {
+	($name:expr_2021, $($tk:expr_2021 => $tv:expr_2021),*) => {
 		vector_lib::event::metric::MetricSeries {
 			name: vector_lib::event::metric::MetricName {
 				name: $name.into(),
diff --git a/src/test_util/mock/mod.rs b/src/test_util/mock/mod.rs
index 696d842c2d0f0..04781e08e43fe 100644
--- a/src/test_util/mock/mod.rs
+++ b/src/test_util/mock/mod.rs
@@ -83,7 +83,10 @@ pub fn basic_sink(channel_size: usize) -> (impl Stream<Item = SourceSenderItem>,
 pub fn basic_sink_with_data(
     channel_size: usize,
     data: &str,
-) -> (impl Stream<Item = SourceSenderItem>, BasicSinkConfig) {
+) -> (
+    impl Stream<Item = SourceSenderItem> + use<>,
+    BasicSinkConfig,
+) {
     let (tx, rx) = SourceSender::new_test_sender_with_buffer(channel_size);
     let sink = BasicSinkConfig::new_with_data(tx, true, data);
     (rx.into_stream(), sink)
diff --git a/src/test_util/mod.rs b/src/test_util/mod.rs
index 0fdab99373f7a..c920303ae87d0 100644
--- a/src/test_util/mod.rs
+++ b/src/test_util/mod.rs
@@ -75,7 +75,7 @@ pub mod integration;
 
 #[macro_export]
 macro_rules! assert_downcast_matches {
-    ($e:expr, $t:ty, $v:pat) => {{
+    ($e:expr_2021, $t:ty, $v:pat) => {{
         match $e.downcast_ref::<$t>() {
             Some($v) => (),
             got => panic!("Assertion failed: got wrong error variant {:?}", got),
@@ -85,7 +85,7 @@ macro_rules! assert_downcast_matches {
 
 #[macro_export]
 macro_rules! log_event {
-    ($($key:expr => $value:expr),*  $(,)?) => {
+    ($($key:expr_2021 => $value:expr_2021),*  $(,)?) => {
         #[allow(unused_variables)]
         {
             let mut event = $crate::event::Event::Log($crate::event::LogEvent::default());
diff --git a/src/topology/builder.rs b/src/topology/builder.rs
index bf6a3dca314f7..e06b617dbd9d4 100644
--- a/src/topology/builder.rs
+++ b/src/topology/builder.rs
@@ -572,28 +572,30 @@ impl<'a> Builder<'a> {
                 self.errors.append(&mut err);
             };
 
-            let (tx, rx) = if let Some(buffer) = self.buffers.remove(key) {
-                buffer
-            } else {
-                let buffer_type = match sink.buffer.stages().first().expect("cant ever be empty") {
-                    BufferType::Memory { .. } => "memory",
-                    BufferType::DiskV2 { .. } => "disk",
-                };
-                let buffer_span = error_span!("sink", buffer_type);
-                let buffer = sink
-                    .buffer
-                    .build(
-                        self.config.global.data_dir.clone(),
-                        key.to_string(),
-                        buffer_span,
-                    )
-                    .await;
-                match buffer {
-                    Err(error) => {
-                        self.errors.push(format!("Sink \"{key}\": {error}"));
-                        continue;
+            let (tx, rx) = match self.buffers.remove(key) {
+                Some(buffer) => buffer,
+                _ => {
+                    let buffer_type =
+                        match sink.buffer.stages().first().expect("cant ever be empty") {
+                            BufferType::Memory { .. } => "memory",
+                            BufferType::DiskV2 { .. } => "disk",
+                        };
+                    let buffer_span = error_span!("sink", buffer_type);
+                    let buffer = sink
+                        .buffer
+                        .build(
+                            self.config.global.data_dir.clone(),
+                            key.to_string(),
+                            buffer_span,
+                        )
+                        .await;
+                    match buffer {
+                        Err(error) => {
+                            self.errors.push(format!("Sink \"{key}\": {error}"));
+                            continue;
+                        }
+                        Ok((tx, rx)) => (tx, Arc::new(Mutex::new(Some(rx.into_stream())))),
                     }
-                    Ok((tx, rx)) => (tx, Arc::new(Mutex::new(Some(rx.into_stream())))),
                 }
             };
 
diff --git a/src/transforms/aggregate.rs b/src/transforms/aggregate.rs
index dc783e30216d1..377edc3ec67bc 100644
--- a/src/transforms/aggregate.rs
+++ b/src/transforms/aggregate.rs
@@ -1117,15 +1117,18 @@ interval_ms = 999999
             // available.
             let mut count = 0_u8;
             while count < 2 {
-                if let Some(event) = out.next().await {
-                    match event.as_metric().series().name.name.as_str() {
-                        "counter_a" => assert_eq!(counter_a_summed, event),
-                        "gauge_a" => assert_eq!(gauge_a_2, event),
-                        _ => panic!("Unexpected metric name in aggregate output"),
-                    };
-                    count += 1;
-                } else {
-                    panic!("Unexpectedly received None in output stream");
+                match out.next().await {
+                    Some(event) => {
+                        match event.as_metric().series().name.name.as_str() {
+                            "counter_a" => assert_eq!(counter_a_summed, event),
+                            "gauge_a" => assert_eq!(gauge_a_2, event),
+                            _ => panic!("Unexpected metric name in aggregate output"),
+                        };
+                        count += 1;
+                    }
+                    _ => {
+                        panic!("Unexpectedly received None in output stream");
+                    }
                 }
             }
             // We should be back to pending, having nothing waiting for us
diff --git a/src/transforms/reduce/merge_strategy.rs b/src/transforms/reduce/merge_strategy.rs
index 2058f2c736e2a..df50942ba7f86 100644
--- a/src/transforms/reduce/merge_strategy.rs
+++ b/src/transforms/reduce/merge_strategy.rs
@@ -890,21 +890,24 @@ mod test {
         );
 
         let v = merge(34_i64.into(), 43_i64.into(), &MergeStrategy::FlatUnique).unwrap();
-        if let Value::Array(v) = v.clone() {
-            let v: Vec<_> = v
-                .into_iter()
-                .map(|i| {
-                    if let Value::Integer(i) = i {
-                        i
-                    } else {
-                        panic!("Bad value");
-                    }
-                })
-                .collect();
-            assert_eq!(v.iter().filter(|i| **i == 34i64).count(), 1);
-            assert_eq!(v.iter().filter(|i| **i == 43i64).count(), 1);
-        } else {
-            panic!("Not array");
+        match v.clone() {
+            Value::Array(v) => {
+                let v: Vec<_> = v
+                    .into_iter()
+                    .map(|i| {
+                        if let Value::Integer(i) = i {
+                            i
+                        } else {
+                            panic!("Bad value");
+                        }
+                    })
+                    .collect();
+                assert_eq!(v.iter().filter(|i| **i == 34i64).count(), 1);
+                assert_eq!(v.iter().filter(|i| **i == 43i64).count(), 1);
+            }
+            _ => {
+                panic!("Not array");
+            }
         }
         let v = merge(v, 34_i32.into(), &MergeStrategy::FlatUnique).unwrap();
         if let Value::Array(v) = v {
diff --git a/src/transforms/remap.rs b/src/transforms/remap.rs
index a8e0845317fac..15af2ad2eacb2 100644
--- a/src/transforms/remap.rs
+++ b/src/transforms/remap.rs
@@ -507,7 +507,7 @@ where
 
     fn annotate_dropped(&self, event: &mut Event, reason: &str, error: ExpressionError) {
         match event {
-            Event::Log(ref mut log) => match log.namespace() {
+            Event::Log(log) => match log.namespace() {
                 LogNamespace::Legacy => {
                     if let Some(metadata_key) = log_schema().metadata_key() {
                         log.insert(
@@ -523,7 +523,7 @@ where
                     );
                 }
             },
-            Event::Metric(ref mut metric) => {
+            Event::Metric(metric) => {
                 if let Some(metadata_key) = log_schema().metadata_key() {
                     metric.replace_tag(format!("{metadata_key}.dropped.reason"), reason.into());
                     metric.replace_tag(
@@ -543,7 +543,7 @@ where
                     );
                 }
             }
-            Event::Trace(ref mut trace) => {
+            Event::Trace(trace) => {
                 trace.maybe_insert(log_schema().metadata_key_target_path(), || {
                     self.dropped_data(reason, error).into()
                 });
diff --git a/src/transforms/throttle/transform.rs b/src/transforms/throttle/transform.rs
index 3cb3514e652be..ad516098e8156 100644
--- a/src/transforms/throttle/transform.rs
+++ b/src/transforms/throttle/transform.rs
@@ -186,10 +186,13 @@ window_secs = 5
 
         let mut count = 0_u8;
         while count < 2 {
-            if let Some(_event) = out_stream.next().await {
-                count += 1;
-            } else {
-                panic!("Unexpectedly received None in output stream");
+            match out_stream.next().await {
+                Some(_event) => {
+                    count += 1;
+                }
+                _ => {
+                    panic!("Unexpectedly received None in output stream");
+                }
             }
         }
         assert_eq!(2, count);
@@ -206,9 +209,11 @@ window_secs = 5
         tx.send(LogEvent::default().into()).await.unwrap();
 
         // The rate limiter should now be refreshed and allow an additional event through
-        if let Some(_event) = out_stream.next().await {
-        } else {
-            panic!("Unexpectedly received None in output stream");
+        match out_stream.next().await {
+            Some(_event) => {}
+            _ => {
+                panic!("Unexpectedly received None in output stream");
+            }
         }
 
         // We should be back to pending, having nothing waiting for us
@@ -252,10 +257,13 @@ exists(.special)
 
         let mut count = 0_u8;
         while count < 2 {
-            if let Some(_event) = out_stream.next().await {
-                count += 1;
-            } else {
-                panic!("Unexpectedly received None in output stream");
+            match out_stream.next().await {
+                Some(_event) => {
+                    count += 1;
+                }
+                _ => {
+                    panic!("Unexpectedly received None in output stream");
+                }
             }
         }
         assert_eq!(2, count);
@@ -271,9 +279,11 @@ exists(.special)
         special_log.insert("special", "true");
         tx.send(special_log.into()).await.unwrap();
         // The rate limiter should allow this log through regardless of current limit
-        if let Some(_event) = out_stream.next().await {
-        } else {
-            panic!("Unexpectedly received None in output stream");
+        match out_stream.next().await {
+            Some(_event) => {}
+            _ => {
+                panic!("Unexpectedly received None in output stream");
+            }
         }
 
         clock.advance(Duration::from_secs(3));
@@ -281,9 +291,11 @@ exists(.special)
         tx.send(LogEvent::default().into()).await.unwrap();
 
         // The rate limiter should now be refreshed and allow an additional event through
-        if let Some(_event) = out_stream.next().await {
-        } else {
-            panic!("Unexpectedly received None in output stream");
+        match out_stream.next().await {
+            Some(_event) => {}
+            _ => {
+                panic!("Unexpectedly received None in output stream");
+            }
         }
 
         // We should be back to pending, having nothing waiting for us
@@ -329,10 +341,13 @@ key_field = "{{ bucket }}"
 
         let mut count = 0_u8;
         while count < 2 {
-            if let Some(_event) = out_stream.next().await {
-                count += 1;
-            } else {
-                panic!("Unexpectedly received None in output stream");
+            match out_stream.next().await {
+                Some(_event) => {
+                    count += 1;
+                }
+                _ => {
+                    panic!("Unexpectedly received None in output stream");
+                }
             }
         }
         assert_eq!(2, count);
diff --git a/src/validate.rs b/src/validate.rs
index 83007e487264d..320450f642c42 100644
--- a/src/validate.rs
+++ b/src/validate.rs
@@ -171,10 +171,11 @@ pub fn validate_config(opts: &Opts, fmt: &mut Formatter) -> Option<Config> {
 async fn validate_environment(opts: &Opts, config: &Config, fmt: &mut Formatter) -> bool {
     let diff = ConfigDiff::initial(config);
 
-    let mut pieces = if let Some(pieces) = validate_components(config, &diff, fmt).await {
-        pieces
-    } else {
-        return false;
+    let mut pieces = match validate_components(config, &diff, fmt).await {
+        Some(pieces) => pieces,
+        _ => {
+            return false;
+        }
     };
     opts.skip_healthchecks || validate_healthchecks(opts, config, &diff, &mut pieces, fmt).await
 }

From abe333808352eeb71b2e8e2dfe54757f3ff50a78 Mon Sep 17 00:00:00 2001
From: Thomas <thomas.schneider@datadoghq.com>
Date: Fri, 18 Jul 2025 14:34:19 -0400
Subject: [PATCH 191/305] chore(ci): merge test/test-component-validation and
 upload results (#23397)

* chore(ci): merge test/test-component-validation and upload results

* Delete removed test-component-validation
---
 .github/workflows/test.yml | 25 +++++++++++--------------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 0b136320ba05b..76565685daa5d 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -52,7 +52,7 @@ jobs:
       - run: make check-clippy
 
   test:
-    name: Unit - x86_64-unknown-linux-gnu
+    name: Unit and Component Validation tests - x86_64-unknown-linux-gnu
     runs-on: ubuntu-24.04-8core
     if: needs.changes.outputs.source == 'true'
     needs: changes
@@ -62,21 +62,19 @@ jobs:
         run: echo "::add-matcher::.github/matchers/rust.json"
       - run: sudo -E bash scripts/environment/bootstrap-ubuntu-24.04.sh
       - run: cargo install cargo-nextest --version 0.9.95 --force --locked
-      - run: make test
+
+      - name: Unit Test
+        run: make test
         env:
           CARGO_BUILD_JOBS: 5
 
-  test-component-validation:
-    name: Check Component Spec
-    runs-on: ubuntu-24.04
-    needs: changes
-    steps:
-      - uses: actions/checkout@v4
-      - name: Enable Rust matcher
-        run: echo "::add-matcher::.github/matchers/rust.json"
-      - run: sudo bash ./scripts/environment/install-protoc.sh
-      - run: cargo install cargo-nextest --version 0.9.95 --force --locked
-      - run: make test-component-validation
+      # Validates components for adherence to the Component Specification
+      - name: Check Component Spec
+        run: make test-component-validation
+
+      - name: Upload test results
+        run: scripts/upload-test-results.sh
+        if: always()
 
   check-version:
     name: Check version
@@ -197,7 +195,6 @@ jobs:
       - check-fmt
       - check-clippy
       - test
-      - test-component-validation
       - check-version
       - check-scripts
       - check-events

From af3ec0cfb7106b8f8615d27bfe3eb37f8d2471a0 Mon Sep 17 00:00:00 2001
From: Thomas <thomas.schneider@datadoghq.com>
Date: Fri, 18 Jul 2025 15:49:33 -0400
Subject: [PATCH 192/305] chore(ci): remove unused AWS env vars (#23401)

---
 .github/workflows/ci-integration-review.yml | 2 --
 .github/workflows/integration-test.yml      | 2 --
 .github/workflows/k8s_e2e.yml               | 2 --
 .github/workflows/master_merge_queue.yml    | 2 --
 4 files changed, 8 deletions(-)

diff --git a/.github/workflows/ci-integration-review.yml b/.github/workflows/ci-integration-review.yml
index b75bc701fba03..e3a4d7650436c 100644
--- a/.github/workflows/ci-integration-review.yml
+++ b/.github/workflows/ci-integration-review.yml
@@ -36,8 +36,6 @@ permissions:
   statuses: write
 
 env:
-  AWS_ACCESS_KEY_ID: "dummy"
-  AWS_SECRET_ACCESS_KEY: "dummy"
   AXIOM_TOKEN: ${{ secrets.AXIOM_TOKEN }}
   TEST_APPSIGNAL_PUSH_API_KEY: ${{ secrets.TEST_APPSIGNAL_PUSH_API_KEY }}
   TEST_DATADOG_API_KEY: ${{ secrets.CI_TEST_DATADOG_API_KEY }}
diff --git a/.github/workflows/integration-test.yml b/.github/workflows/integration-test.yml
index b27ff5617bdd0..5b966e0383e4a 100644
--- a/.github/workflows/integration-test.yml
+++ b/.github/workflows/integration-test.yml
@@ -15,8 +15,6 @@ on:
         type: string
 
 env:
-  AWS_ACCESS_KEY_ID: "dummy"
-  AWS_SECRET_ACCESS_KEY: "dummy"
   AXIOM_TOKEN: ${{ secrets.AXIOM_TOKEN }}
   TEST_APPSIGNAL_PUSH_API_KEY: ${{ secrets.TEST_APPSIGNAL_PUSH_API_KEY }}
   CONTAINER_TOOL: "docker"
diff --git a/.github/workflows/k8s_e2e.yml b/.github/workflows/k8s_e2e.yml
index 593e5fc63b011..2e817b547ce74 100644
--- a/.github/workflows/k8s_e2e.yml
+++ b/.github/workflows/k8s_e2e.yml
@@ -40,8 +40,6 @@ concurrency:
   cancel-in-progress: true
 
 env:
-  AWS_ACCESS_KEY_ID: "dummy"
-  AWS_SECRET_ACCESS_KEY: "dummy"
   CONTAINER_TOOL: "docker"
   RUST_BACKTRACE: full
   TEST_LOG: vector=debug
diff --git a/.github/workflows/master_merge_queue.yml b/.github/workflows/master_merge_queue.yml
index 98f5abeacdc90..1218d1428a7dd 100644
--- a/.github/workflows/master_merge_queue.yml
+++ b/.github/workflows/master_merge_queue.yml
@@ -28,8 +28,6 @@ concurrency:
   cancel-in-progress: true
 
 env:
-  AWS_ACCESS_KEY_ID: "dummy"
-  AWS_SECRET_ACCESS_KEY: "dummy"
   CONTAINER_TOOL: "docker"
   DD_ENV: "ci"
   DD_API_KEY: ${{ secrets.DD_API_KEY }}

From 659a3c3b8afaf3543b6603a9b32db8e8da0666c2 Mon Sep 17 00:00:00 2001
From: Thomas <thomas.schneider@datadoghq.com>
Date: Fri, 18 Jul 2025 16:00:52 -0400
Subject: [PATCH 193/305] fix(elasticsearch sink): allow unused var  (#23400)

* fix(elasticsearch sink): add _ assignment to unused var for feature

* Use cfg_attr instead
---
 src/sinks/elasticsearch/common.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sinks/elasticsearch/common.rs b/src/sinks/elasticsearch/common.rs
index 4da59a65ac0b7..1d346d262cdd8 100644
--- a/src/sinks/elasticsearch/common.rs
+++ b/src/sinks/elasticsearch/common.rs
@@ -241,7 +241,7 @@ impl ElasticsearchCommon {
     // extract the authentication from config or endpoint
     async fn extract_auth(
         config: &ElasticsearchConfig,
-        proxy_config: &ProxyConfig,
+        #[cfg_attr(not(feature = "aws-core"), allow(unused_variables))] proxy_config: &ProxyConfig,
         uri: &UriSerde,
     ) -> crate::Result<Option<Auth>> {
         let auth = match &config.auth {

From 1d699ee10269b3e35a3038cab12e98e80d3a4eb3 Mon Sep 17 00:00:00 2001
From: Thomas <thomas.schneider@datadoghq.com>
Date: Fri, 18 Jul 2025 16:20:32 -0400
Subject: [PATCH 194/305] chore(ci): only install datadog-ci if int test runs
 (#23402)

---
 .github/workflows/integration.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
index 89a9ff17ff67a..1d3ff68e8bf93 100644
--- a/.github/workflows/integration.yml
+++ b/.github/workflows/integration.yml
@@ -83,9 +83,6 @@ jobs:
         with:
           submodules: "recursive"
 
-      - run: |
-          sudo npm -g install @datadog/datadog-ci
-
       - name: Download JSON artifact from changes.yml
         uses: actions/download-artifact@v4
         if: github.event_name == 'pull_request' || github.event_name == 'merge_group'
@@ -111,6 +108,8 @@ jobs:
                   "${{ github.event_name }}" == "workflow_dispatch" || \
                   "${{ needs.changes.outputs.dependencies }}" == "true" || \
                   "$should_run" == "true" ]]; then
+              # Only install dep if test runs
+              sudo npm -g install @datadog/datadog-ci
               echo "Running test for ${{ matrix.service }}"
               bash scripts/int-e2e-test.sh int ${{ matrix.service }}
             else

From 3abcebd28641a14a664756a3efd36f728b8e6ecd Mon Sep 17 00:00:00 2001
From: Rob Blafford <robert.blafford@datadoghq.com>
Date: Fri, 18 Jul 2025 16:25:01 -0400
Subject: [PATCH 195/305] chore(codecs): Compare correct decoded byte size in
 Validator tests (#23399)

* chore(codecs): Compare correct decoded byte size in Validator tests

- The byte size of the decoded frame was used in *received_bytes_total
calculations when instead total size of payload on the wire is desired
for comparison against the matching telemetry metric.

* Remove stray dbg

* Adding comment
---
 src/components/validation/resources/http.rs | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/components/validation/resources/http.rs b/src/components/validation/resources/http.rs
index c9ad824d8150c..59c4504654ce9 100644
--- a/src/components/validation/resources/http.rs
+++ b/src/components/validation/resources/http.rs
@@ -328,16 +328,19 @@ impl HttpResourceOutputContext<'_> {
                     match hyper::body::to_bytes(request.into_body()).await {
                         Err(_) => StatusCode::INTERNAL_SERVER_ERROR.into_response(),
                         Ok(body) => {
+                            let byte_size = body.len();
                             let mut body = BytesMut::from(&body[..]);
                             loop {
                                 match decoder.decode_eof(&mut body) {
-                                    Ok(Some((events, byte_size))) => {
+                                    // `decoded_byte_size` is the decoded size of an individual frame. `byte_size` represents the size of the
+                                    // entire payload which may contain multiple frames and their delimiters.
+                                    Ok(Some((events, decoded_byte_size))) => {
                                         if should_reject {
-                                            info!("HTTP server external output resource decoded {byte_size} bytes but test case configured to reject.");
+                                            info!("HTTP server external output resource decoded {decoded_byte_size} bytes but test case configured to reject.");
                                         } else {
                                             let mut output_runner_metrics =
                                                 output_runner_metrics.lock().await;
-                                            info!("HTTP server external output resource decoded {byte_size} bytes.");
+                                            info!("HTTP server external output resource decoded {decoded_byte_size} bytes.");
 
                                             // Update the runner metrics for the received events. This will later
                                             // be used in the Validators, as the "expected" case.

From a1a75400919eb308b4895951df22c052468ea57b Mon Sep 17 00:00:00 2001
From: Pavlos Rontidis <pavlos.rontidis@gmail.com>
Date: Fri, 18 Jul 2025 16:42:28 -0400
Subject: [PATCH 196/305] chore(dev): add workflow badges (#23398)

* chore(dev): add workflow badges

* move menu under the image, because alignment looks awkward
---
 README.md | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 2094c4fc646ff..334ced93f3e95 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,11 @@
+[![Nightly](https://github.com/vectordotdev/vector/actions/workflows/nightly.yml/badge.svg)](https://github.com/vectordotdev/vector/actions/workflows/nightly.yml)
+[![E2E Test Suite](https://github.com/vectordotdev/vector/actions/workflows/e2e.yml/badge.svg)](https://github.com/vectordotdev/vector/actions/workflows/e2e.yml)
+[![Component Features](https://github.com/vectordotdev/vector/actions/workflows/component_features.yml/badge.svg)](https://github.com/vectordotdev/vector/actions/workflows/component_features.yml)
+
+<p align="center">
+  <img src="website/static/img/diagram.svg" alt="Vector">
+</p>
+
 <p align="center">
   <strong>
     <a href="https://vector.dev/docs/setup/quickstart/">Quickstart</a>&nbsp;&nbsp;&bull;&nbsp;&nbsp;
@@ -9,9 +17,6 @@
     <a href="https://rust-doc.vector.dev/">Rust Crate Docs</a>
   </strong>
 </p>
-<p align="center">
-  <img src="website/static/img/diagram.svg" alt="Vector">
-</p>
 
 ## What is Vector?
 

From d654fddd33d0988d3a7272a2257e101933783f5a Mon Sep 17 00:00:00 2001
From: jlambatl <168514818+jlambatl@users.noreply.github.com>
Date: Sat, 19 Jul 2025 07:12:15 +1000
Subject: [PATCH 197/305] docs(external): add documentation for
 validate_json_schema() function support in VRL (#23359)

* add documentation for validate_json_schema vrl function

* doc(validate_json_schema) docs update

* add documentation changelog fragment

* Update website/cue/reference/remap/functions/validate_json_schema.cue

Co-authored-by: Brett Blue <84536271+brett0000FF@users.noreply.github.com>

* cargo update -p vrl

* remove changelog

* update licenses

* add json-schema_definition for tests to pass

* add newline to json-schema_definition.json so cargo vdec check fmt passes

* Fix invalid json

---------

Co-authored-by: Pavlos Rontidis <pavlos.rontidis@gmail.com>
Co-authored-by: Brett Blue <84536271+brett0000FF@users.noreply.github.com>
Co-authored-by: Thomas <thomas.schneider@datadoghq.com>
---
 .../resources/json-schema_definition.json     |  1 +
 .../remap/functions/validate_json_schema.cue  | 79 +++++++++++++++++++
 2 files changed, 80 insertions(+)
 create mode 100644 lib/vector-vrl/tests/resources/json-schema_definition.json
 create mode 100644 website/cue/reference/remap/functions/validate_json_schema.cue

diff --git a/lib/vector-vrl/tests/resources/json-schema_definition.json b/lib/vector-vrl/tests/resources/json-schema_definition.json
new file mode 100644
index 0000000000000..9c4c8a00d0b28
--- /dev/null
+++ b/lib/vector-vrl/tests/resources/json-schema_definition.json
@@ -0,0 +1 @@
+{"$schema":"https://json-schema.org/draft/2020-12/schema","$id":"https://example.com/product.schema.json","title":"Product","description":"A product from Acme's catalog","type":"object","properties":{"productUser":{"description":"The unique identifier for a product user","type":"string","format":"email"}}}
diff --git a/website/cue/reference/remap/functions/validate_json_schema.cue b/website/cue/reference/remap/functions/validate_json_schema.cue
new file mode 100644
index 0000000000000..4930e35ec904a
--- /dev/null
+++ b/website/cue/reference/remap/functions/validate_json_schema.cue
@@ -0,0 +1,79 @@
+package metadata
+
+remap: functions: validate_json_schema: {
+	category: "Type"
+	description: """
+		Check if `value` conforms to a JSON Schema definition. This function validates a JSON payload against a JSON Schema definition. It can be used to ensure that the data structure and types in `value` match the expectations defined in `schema_definition`.
+		"""
+	notices: [
+		"""
+			This function uses a compiled schema cache. The first time it is called with a specific `schema_definition`, it will compile the schema and cache it for subsequent calls. This improves performance when validating multiple values against the same schema.
+			The cache implementation is fairly naive and does not support refreshing the schema if it changes. If you update the schema definition file, you must restart Vector to clear the cache.
+			""",
+	]
+	arguments: [
+		{
+			name:        "value"
+			description: #"The value to check if it conforms to the JSON schema definition."#
+			required:    true
+			type: ["any"]
+		},
+		{
+			name:        "schema_definition"
+			description: #"The location (path) of the JSON Schema definition."#
+			required:    true
+			type: ["any"]
+		},
+		{
+			name:        "ignore_unknown_formats"
+			description: #"Unknown formats can be silently ignored by setting this to `true` and validation continues without failing due to those fields."#
+			required:    false
+			type: ["boolean"]
+		},
+
+	]
+	internal_failure_reasons: [
+		"`value` is not a valid JSON Schema payload.",
+		"`value` contains custom format declarations and `ignore_unknown_formats` has not been set to `true`.",
+		"`schema_definition` is not a valid JSON Schema definition.",
+		"`schema_definition` file does not exist.",
+	]
+	return: {
+		types: ["boolean"]
+		rules: [
+			#"Returns `true` if `value` conforms to the JSON Schema definition."#,
+			#"Returns `false` if `value` does not conform to the JSON Schema definition."#,
+		]
+	}
+
+	examples: [
+		{
+			title: "Payload contains a valid email."
+			source: """
+				validate_json_schema!(s'{ "productUser": "valid@email.com" }', "resources/json-schema_definition.json", false)
+				"""
+			return: true
+		},
+		{
+			title: "Payload contains an invalid email."
+			source: """
+				validate_json_schema!(s'{ "productUser": "invalidEmail" }', "resources/json-schema_definition.json", false)
+				"""
+			return: false
+		},
+		{
+			title: "Payload contains a custom format declaration."
+			source: """
+				validate_json_schema!(s'{ "productUser": "a-custom-formatted-string" }', "resources/json-schema_definition.json", false)
+				"""
+			return: false
+		},
+		{
+			title: "Payload contains a custom format declaration, with ignore_unknown_formats set to true."
+			source: """
+				validate_json_schema!(s'{ "productUser": "a-custom-formatted-string" }', "resources/json-schema_definition.json", true)
+				"""
+			return: true
+		},
+	]
+}

From 144a0af4e05457e3d4434e934b763d5e09db156c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ensar=20Saraj=C4=8Di=C4=87?= <dev@ensarsarajcic.com>
Date: Mon, 21 Jul 2025 10:47:04 +0200
Subject: [PATCH 198/305] docs(external): add docs for `haversine` VRL function
 (#23336)

* docs(external): add docs for `haversine` VRL function

Related: https://github.com/vectordotdev/vrl/pull/1442

* Apply suggestions from code review

Co-authored-by: Rosa Trieu <107086888+rtrieu@users.noreply.github.com>

* Rename haversine function in docs

* Add map category to docs

* Fix docs formatting

* Generate #FunctionCategory disjunction from list to reduce duplication

* Update names of arguments

* Update VRL

* Update VRL

* Update types for haversine in docs

---------

Co-authored-by: Rosa Trieu <107086888+rtrieu@users.noreply.github.com>
Co-authored-by: Pavlos Rontidis <pavlos.rontidis@gmail.com>
---
 Cargo.lock                                    |  6 +-
 website/cue/reference/remap/functions.cue     |  7 +-
 .../reference/remap/functions/haversine.cue   | 72 +++++++++++++++++++
 website/cue/reference/urls.cue                |  1 +
 4 files changed, 79 insertions(+), 7 deletions(-)
 create mode 100644 website/cue/reference/remap/functions/haversine.cue

diff --git a/Cargo.lock b/Cargo.lock
index 73abf27f60b1f..8e11726b8577a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -8028,7 +8028,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "be769465445e8c1474e9c5dac2018218498557af32d9ed057325ec9a41ae81bf"
 dependencies = [
  "heck 0.5.0",
- "itertools 0.10.5",
+ "itertools 0.11.0",
  "log",
  "multimap",
  "once_cell",
@@ -8074,7 +8074,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8a56d757972c98b346a9b766e3f02746cde6dd1cd1d1d563472929fdd74bec4d"
 dependencies = [
  "anyhow",
- "itertools 0.10.5",
+ "itertools 0.11.0",
  "proc-macro2 1.0.95",
  "quote 1.0.40",
  "syn 2.0.104",
@@ -12370,7 +12370,7 @@ checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d"
 [[package]]
 name = "vrl"
 version = "0.25.0"
-source = "git+https://github.com/vectordotdev/vrl.git?branch=main#e717f1820138a0da0394fe609fd7d9bf072f95e2"
+source = "git+https://github.com/vectordotdev/vrl.git?branch=main#23c44aeeddaffc0226b164ac951bd075d2972361"
 dependencies = [
  "aes",
  "aes-siv",
diff --git a/website/cue/reference/remap/functions.cue b/website/cue/reference/remap/functions.cue
index ab149676e838a..338ee8ba03735 100644
--- a/website/cue/reference/remap/functions.cue
+++ b/website/cue/reference/remap/functions.cue
@@ -28,10 +28,6 @@ remap: {
 		pure:       bool | *true
 	}
 
-	#FunctionCategory: "Array" | "Codec" | "Coerce" | "Convert" | "Debug" | "Enrichment" | "Enumerate" | "Event" | "Path" | "Cryptography" | "IP" | "Number" | "Object" | "Parse" | "Random" | "String" | "System" | "Timestamp" | "Type" | "Checksum"
-
-	// A helper array for generating docs. At some point, we should generate this from the
-	// #FunctionCategory enum if CUE adds support for that.
 	function_categories: [
 		"Array",
 		"Codec",
@@ -44,6 +40,7 @@ remap: {
 		"Path",
 		"Cryptography",
 		"IP",
+		"Map",
 		"Number",
 		"Object",
 		"Parse",
@@ -55,6 +52,8 @@ remap: {
 		"Checksum",
 	]
 
+	#FunctionCategory: or(function_categories)
+
 	functions: [Name=string]: #Function & {
 		name: Name
 	}
diff --git a/website/cue/reference/remap/functions/haversine.cue b/website/cue/reference/remap/functions/haversine.cue
new file mode 100644
index 0000000000000..ce186df426fea
--- /dev/null
+++ b/website/cue/reference/remap/functions/haversine.cue
@@ -0,0 +1,72 @@
+package metadata
+
+remap: functions: haversine: {
+	category:    "Map"
+	description: """
+		Calculates [haversine](\(urls.haversine)) distance and bearing between two points.
+		Results are available in kilometers or miles.
+		"""
+
+	arguments: [
+		{
+			name:        "latitude1"
+			description: "Latitude of the first point."
+			required:    true
+			type: ["float"]
+		},
+		{
+			name:        "longitude1"
+			description: "Longitude of the first point."
+			required:    true
+			type: ["float"]
+		},
+		{
+			name:        "latitude2"
+			description: "Latitude of the second point."
+			required:    true
+			type: ["float"]
+		},
+		{
+			name:        "longitude2"
+			description: "Longitude of the second point."
+			required:    true
+			type: ["float"]
+		},
+		{
+			name:        "measurement"
+			description: "Measurement system to use for resulting distance."
+			required:    false
+			type: ["string"]
+			default: "kilometers"
+			enum: {
+				kilometers: "Use kilometers for the resulting distance."
+				miles:      "Use miles for the resulting distance."
+			}
+		},
+	]
+	internal_failure_reasons: []
+	return: types: ["object"]
+
+	examples: [
+		{
+			title: "Haversine in kilometers"
+			source: #"""
+				haversine(0.0, 0.0, 10.0, 10.0)
+				"""#
+			return: {
+				distance: 1568.5227233
+				bearing:  44.561
+			}
+		},
+		{
+			title: "Haversine in miles"
+			source: #"""
+				haversine(0.0, 0.0, 10.0, 10.0, "miles")
+				"""#
+			return: {
+				distance: 974.6348468
+				bearing:  44.561
+			}
+		},
+	]
+}
diff --git a/website/cue/reference/urls.cue b/website/cue/reference/urls.cue
index a18867cfbe4f4..0b03540f93f68 100644
--- a/website/cue/reference/urls.cue
+++ b/website/cue/reference/urls.cue
@@ -246,6 +246,7 @@ urls: {
 	grok_patterns:                              "\(github)/daschl/grok/tree/master/patterns"
 	gzip:                                       "https://www.gzip.org/"
 	haproxy:                                    "https://www.haproxy.org/"
+	haversine:                                  "\(wikipedia)/wiki/Haversine_formula"
 	helm:                                       "https://helm.sh/"
 	heroku:                                     "https://www.heroku.com"
 	heroku_http_log_drain:                      "https://devcenter.heroku.com/articles/log-drains#https-drains"

From dbeae5d0aa338e9c2ada94b79637663eda5cc571 Mon Sep 17 00:00:00 2001
From: Thomas <thomas.schneider@datadoghq.com>
Date: Mon, 21 Jul 2025 09:54:15 -0400
Subject: [PATCH 199/305] fix(elasticsearch sink): match only when feature is
 enabled (#23404)

---
 src/sinks/elasticsearch/tests.rs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/sinks/elasticsearch/tests.rs b/src/sinks/elasticsearch/tests.rs
index a60c62ba5cacf..fbb95e00dcafe 100644
--- a/src/sinks/elasticsearch/tests.rs
+++ b/src/sinks/elasticsearch/tests.rs
@@ -702,7 +702,8 @@ async fn test_parse_config_with_uri_auth() {
 
     let got_auth_inner = match common.auth.as_ref().unwrap() {
         Auth::Basic(auth) => auth,
-        _ => panic!("Expected auth to be Basic"),
+        #[cfg(feature = "aws-core")]
+        Auth::Aws { .. } => panic!("Expected auth to be Basic"),
     };
 
     assert_eq!(
@@ -737,7 +738,8 @@ async fn test_parse_config_with_config_auth() {
 
     let got_auth_inner = match common.auth.as_ref().unwrap() {
         Auth::Basic(auth) => auth,
-        _ => panic!("Expected auth to be Basic"),
+        #[cfg(feature = "aws-core")]
+        Auth::Aws { .. } => panic!("Expected auth to be Basic"),
     };
 
     assert_eq!(

From 91794109acade46e5482ca7dd2fc962cc88be8e9 Mon Sep 17 00:00:00 2001
From: Vladimir Zhuk <vladimir.zhuk@datadoghq.com>
Date: Mon, 21 Jul 2025 18:53:27 +0200
Subject: [PATCH 200/305] chore(azure_blob sink): support custom partitioners
 for gcs and azure sinks (#23403)

* support custom partitioners for gcs and azure sinks

* add default partitioner
---
 src/sinks/azure_common/sink.rs | 19 +++++++++++++------
 src/sinks/gcs_common/sink.rs   | 19 +++++++++++++------
 2 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/src/sinks/azure_common/sink.rs b/src/sinks/azure_common/sink.rs
index 4844474232cd0..1e1d68593aa34 100644
--- a/src/sinks/azure_common/sink.rs
+++ b/src/sinks/azure_common/sink.rs
@@ -1,19 +1,20 @@
 use std::fmt;
 
 use crate::sinks::{prelude::*, util::partitioner::KeyPartitioner};
+use vector_lib::{event::Event, partition::Partitioner};
 
-pub struct AzureBlobSink<Svc, RB> {
+pub struct AzureBlobSink<Svc, RB, P = KeyPartitioner> {
     service: Svc,
     request_builder: RB,
-    partitioner: KeyPartitioner,
+    partitioner: P,
     batcher_settings: BatcherSettings,
 }
 
-impl<Svc, RB> AzureBlobSink<Svc, RB> {
+impl<Svc, RB, P> AzureBlobSink<Svc, RB, P> {
     pub const fn new(
         service: Svc,
         request_builder: RB,
-        partitioner: KeyPartitioner,
+        partitioner: P,
         batcher_settings: BatcherSettings,
     ) -> Self {
         Self {
@@ -25,7 +26,7 @@ impl<Svc, RB> AzureBlobSink<Svc, RB> {
     }
 }
 
-impl<Svc, RB> AzureBlobSink<Svc, RB>
+impl<Svc, RB, P> AzureBlobSink<Svc, RB, P>
 where
     Svc: Service<RB::Request> + Send + 'static,
     Svc::Future: Send + 'static,
@@ -34,6 +35,9 @@ where
     RB: RequestBuilder<(String, Vec<Event>)> + Send + Sync + 'static,
     RB::Error: fmt::Display + Send,
     RB::Request: Finalizable + MetaDescriptive + Send,
+    P: Partitioner<Item = Event, Key = Option<String>> + Unpin + Send,
+    P::Key: Eq + std::hash::Hash + Clone,
+    P::Item: ByteSizeOf,
 {
     async fn run_inner(self: Box<Self>, input: BoxStream<'_, Event>) -> Result<(), ()> {
         let partitioner = self.partitioner;
@@ -67,7 +71,7 @@ where
 }
 
 #[async_trait]
-impl<Svc, RB> StreamSink<Event> for AzureBlobSink<Svc, RB>
+impl<Svc, RB, P> StreamSink<Event> for AzureBlobSink<Svc, RB, P>
 where
     Svc: Service<RB::Request> + Send + 'static,
     Svc::Future: Send + 'static,
@@ -76,6 +80,9 @@ where
     RB: RequestBuilder<(String, Vec<Event>)> + Send + Sync + 'static,
     RB::Error: fmt::Display + Send,
     RB::Request: Finalizable + MetaDescriptive + Send,
+    P: Partitioner<Item = Event, Key = Option<String>> + Unpin + Send,
+    P::Key: Eq + std::hash::Hash + Clone,
+    P::Item: ByteSizeOf,
 {
     async fn run(mut self: Box<Self>, input: BoxStream<'_, Event>) -> Result<(), ()> {
         self.run_inner(input).await
diff --git a/src/sinks/gcs_common/sink.rs b/src/sinks/gcs_common/sink.rs
index 1f1971a15152e..94144866d415c 100644
--- a/src/sinks/gcs_common/sink.rs
+++ b/src/sinks/gcs_common/sink.rs
@@ -1,20 +1,21 @@
 use std::fmt;
 
 use crate::sinks::{prelude::*, util::partitioner::KeyPartitioner};
+use vector_lib::{event::Event, partition::Partitioner};
 
-pub struct GcsSink<Svc, RB> {
+pub struct GcsSink<Svc, RB, P = KeyPartitioner> {
     service: Svc,
     request_builder: RB,
-    partitioner: KeyPartitioner,
+    partitioner: P,
     batcher_settings: BatcherSettings,
     protocol: &'static str,
 }
 
-impl<Svc, RB> GcsSink<Svc, RB> {
+impl<Svc, RB, P> GcsSink<Svc, RB, P> {
     pub const fn new(
         service: Svc,
         request_builder: RB,
-        partitioner: KeyPartitioner,
+        partitioner: P,
         batcher_settings: BatcherSettings,
         protocol: &'static str,
     ) -> Self {
@@ -28,7 +29,7 @@ impl<Svc, RB> GcsSink<Svc, RB> {
     }
 }
 
-impl<Svc, RB> GcsSink<Svc, RB>
+impl<Svc, RB, P> GcsSink<Svc, RB, P>
 where
     Svc: Service<RB::Request> + Send + 'static,
     Svc::Future: Send + 'static,
@@ -37,6 +38,9 @@ where
     RB: RequestBuilder<(String, Vec<Event>)> + Send + Sync + 'static,
     RB::Error: fmt::Display + Send,
     RB::Request: Finalizable + MetaDescriptive + Send,
+    P: Partitioner<Item = Event, Key = Option<String>> + Unpin + Send,
+    P::Key: Eq + std::hash::Hash + Clone,
+    P::Item: ByteSizeOf,
 {
     async fn run_inner(self: Box<Self>, input: BoxStream<'_, Event>) -> Result<(), ()> {
         let partitioner = self.partitioner;
@@ -69,7 +73,7 @@ where
 }
 
 #[async_trait]
-impl<Svc, RB> StreamSink<Event> for GcsSink<Svc, RB>
+impl<Svc, RB, P> StreamSink<Event> for GcsSink<Svc, RB, P>
 where
     Svc: Service<RB::Request> + Send + 'static,
     Svc::Future: Send + 'static,
@@ -78,6 +82,9 @@ where
     RB: RequestBuilder<(String, Vec<Event>)> + Send + Sync + 'static,
     RB::Error: fmt::Display + Send,
     RB::Request: Finalizable + MetaDescriptive + Send,
+    P: Partitioner<Item = Event, Key = Option<String>> + Unpin + Send,
+    P::Key: Eq + std::hash::Hash + Clone,
+    P::Item: ByteSizeOf,
 {
     async fn run(mut self: Box<Self>, input: BoxStream<'_, Event>) -> Result<(), ()> {
         self.run_inner(input).await

From 3778c089726c4299c292fa10ea25fd30d99e8ce1 Mon Sep 17 00:00:00 2001
From: Thomas <thomas.schneider@datadoghq.com>
Date: Tue, 22 Jul 2025 09:21:35 -0400
Subject: [PATCH 201/305] chore(ci): refactor changelog file fetching (#23405)

* chore(ci): refactor changelog file fetching

* Add on.pull_request to test changes

* Allow changing CHANGELOG_MERGE_BASE

* Add empty test changelog

* Checkout and move less files

* Add debug git commands

* Add ref: master to prevent fetching from PR branch

* Fix changelog

* Checkout even less files

* Reorder changelog script

* Make shellcheck happy

* Remove test code

* Add SHOULD_CHECK env var

* Temporily revert "Remove test code"

* Apply suggestion from @pront

Co-authored-by: Pavlos Rontidis <pavlos.rontidis@gmail.com>

* Change env var

* Revert "Add SHOULD_CHECK env var"

This reverts commit eebab89fa55befee90b353102edf67852c6545d6.

* Move checkout script

* Add SHOULD_RUN env var

* Remove test code

---------

Co-authored-by: Pavlos Rontidis <pavlos.rontidis@gmail.com>
---
 .github/workflows/changelog.yaml     | 54 +++++++++++++++-------------
 scripts/check_changelog_fragments.sh |  2 +-
 2 files changed, 31 insertions(+), 25 deletions(-)

diff --git a/.github/workflows/changelog.yaml b/.github/workflows/changelog.yaml
index a062e08c00492..6ae6f6e7354e0 100644
--- a/.github/workflows/changelog.yaml
+++ b/.github/workflows/changelog.yaml
@@ -25,31 +25,12 @@ jobs:
     runs-on: ubuntu-24.04
 
     env:
-      PR_HAS_LABEL: ${{ contains(github.event.pull_request.labels.*.name, 'no-changelog') }}
+      NO_CHANGELOG: ${{ contains(github.event.pull_request.labels.*.name, 'no-changelog') }}
+      SHOULD_RUN: ${{ !contains(github.event.pull_request.labels.*.name, 'no-changelog') && github.event_name != 'merge_group' }}
 
     steps:
-      # Checkout full depth because in the check_changelog_fragments script, we need to specify a
-      # merge base. If we only shallow clone the repo, git may not have enough history to determine
-      # the base.
-      - uses: actions/checkout@v4
-        if: ${{ github.event_name != 'merge_group' }}
-        with:
-          fetch-depth: 0
-          repository: ${{ github.event.pull_request.head.repo.full_name }}
-          ref: ${{ github.event.pull_request.head.sha }}
-
-      - name: Checkout trusted changelog script
-        uses: actions/checkout@v4
-        with:
-          repository: ${{ github.repository }}
-          ref: master
-          path: base
-          sparse-checkout: scripts/check_changelog_fragments.sh
-          sparse-checkout-cone-mode: false
-          clean: false
-
       - name: Bypass when no‑changelog label is present
-        if: env.PR_HAS_LABEL == 'true'
+        if: env.NO_CHANGELOG == 'true'
         run: |
           echo "'no-changelog' label detected – skipping changelog validation."
           exit 0
@@ -60,6 +41,31 @@ jobs:
           echo "merge_group event – passing without running changelog validation."
           exit 0
 
+      # Checkout changelog script and changelog.d/ from master
+      - uses: actions/checkout@v4
+        if: env.SHOULD_RUN == 'true'
+        with:
+          ref: master
+          sparse-checkout: |
+            scripts/check_changelog_fragments.sh
+            changelog.d/
+          sparse-checkout-cone-mode: false
+
+      # Checkout PR's changelog.d/ into tmp/
+      - uses: actions/checkout@v4
+        if: env.SHOULD_RUN == 'true'
+        with:
+          repository: ${{ github.event.pull_request.head.repo.full_name }}
+          ref: ${{ github.event.pull_request.head.sha }}
+          path: tmp
+          sparse-checkout: changelog.d/
+
       - name: Run changelog fragment checker
-        if: ${{ env.PR_HAS_LABEL == 'false' && github.event_name != 'merge_group' }}
-        run: ./base/scripts/check_changelog_fragments.sh
+        if: env.SHOULD_RUN == 'true'
+        run: |
+          # Overwrite changelog.d/*.md
+          rm -rf changelog.d/*.md && mv tmp/changelog.d/*.md changelog.d/
+
+          # Add files and then compare with HEAD instead of origin/master
+          git add changelog.d/
+          MERGE_BASE=HEAD ./scripts/check_changelog_fragments.sh
diff --git a/scripts/check_changelog_fragments.sh b/scripts/check_changelog_fragments.sh
index edda3acffddf8..e1afeb777cef1 100755
--- a/scripts/check_changelog_fragments.sh
+++ b/scripts/check_changelog_fragments.sh
@@ -17,7 +17,7 @@ if [ ! -d "${CHANGELOG_DIR}" ]; then
 fi
 
 # diff-filter=A lists only added files
-FRAGMENTS=$(git diff --name-only --diff-filter=A --merge-base origin/master ${CHANGELOG_DIR})
+FRAGMENTS=$(git diff --name-only --diff-filter=A --merge-base "${MERGE_BASE:-origin/master}" ${CHANGELOG_DIR})
 
 if [ -z "$FRAGMENTS" ]; then
   echo "No changelog fragments detected"

From 4d2472f5b1f5160c3ac9a3b5234b55030adeda99 Mon Sep 17 00:00:00 2001
From: Thomas <thomas.schneider@datadoghq.com>
Date: Tue, 22 Jul 2025 11:34:41 -0400
Subject: [PATCH 202/305] chore(ci): pin macos runner image version (#23411)

---
 .github/workflows/publish.yml  | 10 ++++++----
 .github/workflows/unit_mac.yml |  2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 6307be5412108..eed3cb1bac7ea 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -279,10 +279,11 @@ jobs:
       matrix:
         include:
           # Refer to https://docs.github.com/en/actions/using-github-hosted-runners/using-larger-runners/about-larger-runners#about-macos-larger-runners.
+          # and to https://github.com/actions/runner-images
           - architecture: x86_64
-            runner: macos-latest-large
+            runner: macos-14-large
           - architecture: arm64
-            runner: macos-latest-xlarge
+            runner: macos-14-xlarge
     steps:
       - name: Verify Runner Architecture
         run: |
@@ -473,10 +474,11 @@ jobs:
     strategy:
       matrix:
         include:
+          # Refer to https://github.com/actions/runner-images
           - target: x86_64-apple-darwin
-            runner: macos-latest-large
+            runner: macos-14-large
           - target: arm64-apple-darwin
-            runner: macos-latest-xlarge
+            runner: macos-14
     steps:
       - name: Checkout Vector
         uses: actions/checkout@v4
diff --git a/.github/workflows/unit_mac.yml b/.github/workflows/unit_mac.yml
index 5426f6bc51b40..e03522b712b8e 100644
--- a/.github/workflows/unit_mac.yml
+++ b/.github/workflows/unit_mac.yml
@@ -8,7 +8,7 @@ permissions:
 
 jobs:
   unit-mac:
-    runs-on: macos-13
+    runs-on: macos-14
     timeout-minutes: 90
     env:
       CARGO_INCREMENTAL: 0

From ea613700f650bc374d0d15a0c5961e46597e46f8 Mon Sep 17 00:00:00 2001
From: Thomas <thomas.schneider@datadoghq.com>
Date: Tue, 22 Jul 2025 14:07:40 -0400
Subject: [PATCH 203/305] chore(ci): add changelog fragments upper limit per PR
 (#23413)

* chore(ci): add changelog fragments upper limit per PR

* Add test code

* Modify shebang

* Remove test code

* Add MAX_FRAGMENTS env var

* Add test code

* Remove test code
---
 scripts/check_changelog_fragments.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/scripts/check_changelog_fragments.sh b/scripts/check_changelog_fragments.sh
index e1afeb777cef1..916ebe88dd53b 100755
--- a/scripts/check_changelog_fragments.sh
+++ b/scripts/check_changelog_fragments.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # This script is intended to run during CI, however it can be run locally by
 # committing changelog fragments before executing the script. If the script
@@ -27,6 +27,8 @@ if [ -z "$FRAGMENTS" ]; then
   exit 1
 fi
 
+[[ "$(wc -l <<< "$FRAGMENTS")" -gt "${MAX_FRAGMENTS:-1000}" ]] && exit 1
+
 # extract the basename from the file path
 FRAGMENTS=$(xargs -n1 basename <<< "${FRAGMENTS}")
 

From d2a439936691c71f07d444f5ce8f80e5d46322bb Mon Sep 17 00:00:00 2001
From: Pavlos Rontidis <pavlos.rontidis@gmail.com>
Date: Tue, 22 Jul 2025 16:30:50 -0400
Subject: [PATCH 204/305] chore(dev): clippy fixes (#23414)

* chore(dev): clippy fixes

* fmt all (unix)
---
 benches/batch.rs                        |  57 ++++----
 benches/codecs/encoder.rs               |   2 +-
 benches/codecs/newline_bytes.rs         |   4 +-
 benches/distribution_statistic.rs       |  13 +-
 benches/dnstap/mod.rs                   |  27 +++-
 benches/enrichment_tables.rs            | 171 +++++++++++-------------
 benches/lua.rs                          |   7 +-
 benches/metrics_snapshot.rs             |   2 +-
 benches/transform/common.rs             |   2 +-
 benches/transform/dedupe.rs             |  15 ++-
 benches/transform/reduce.rs             |  19 +--
 benches/transform/route.rs              |   7 +-
 src/components/validation/runner/mod.rs |   1 +
 tests/integration/cli.rs                |   1 +
 tests/integration/shutdown.rs           |   1 +
 15 files changed, 167 insertions(+), 162 deletions(-)

diff --git a/benches/batch.rs b/benches/batch.rs
index 02e9fc071aead..6734c8da8ae9c 100644
--- a/benches/batch.rs
+++ b/benches/batch.rs
@@ -38,7 +38,7 @@ fn benchmark_batch(c: &mut Criterion) {
         .collect();
 
     for (compression, batch_size) in cases.iter() {
-        group.bench_function(format!("partitioned/{}_{}", compression, batch_size), |b| {
+        group.bench_function(format!("partitioned/{compression}_{batch_size}"), |b| {
             b.iter_batched(
                 || {
                     let rt = runtime();
@@ -68,35 +68,32 @@ fn benchmark_batch(c: &mut Criterion) {
             )
         });
 
-        group.bench_function(
-            format!("unpartitioned/{}_{}", compression, batch_size),
-            |b| {
-                b.iter_batched(
-                    || {
-                        let rt = runtime();
-                        let mut batch = BatchSettings::default();
-                        batch.size.bytes = *batch_size;
-                        batch.size.events = num_events;
-
-                        let batch_sink = BatchSink::new(
-                            tower::service_fn(|_| future::ok::<_, Infallible>(())),
-                            Buffer::new(batch.size, *compression),
-                            Duration::from_secs(1),
-                        )
-                        .sink_map_err(|error| panic!("{}", error));
-
-                        (
-                            rt,
-                            stream::iter(input.clone())
-                                .map(|item| Ok(EncodedEvent::new(item, 0, JsonSize::zero()))),
-                            batch_sink,
-                        )
-                    },
-                    |(rt, input, batch_sink)| rt.block_on(input.forward(batch_sink)).unwrap(),
-                    criterion::BatchSize::LargeInput,
-                )
-            },
-        );
+        group.bench_function(format!("unpartitioned/{compression}_{batch_size}"), |b| {
+            b.iter_batched(
+                || {
+                    let rt = runtime();
+                    let mut batch = BatchSettings::default();
+                    batch.size.bytes = *batch_size;
+                    batch.size.events = num_events;
+
+                    let batch_sink = BatchSink::new(
+                        tower::service_fn(|_| future::ok::<_, Infallible>(())),
+                        Buffer::new(batch.size, *compression),
+                        Duration::from_secs(1),
+                    )
+                    .sink_map_err(|error| panic!("{}", error));
+
+                    (
+                        rt,
+                        stream::iter(input.clone())
+                            .map(|item| Ok(EncodedEvent::new(item, 0, JsonSize::zero()))),
+                        batch_sink,
+                    )
+                },
+                |(rt, input, batch_sink)| rt.block_on(input.forward(batch_sink)).unwrap(),
+                criterion::BatchSize::LargeInput,
+            )
+        });
     }
 }
 
diff --git a/benches/codecs/encoder.rs b/benches/codecs/encoder.rs
index 47f9d9ae25110..63091ec46ee5f 100644
--- a/benches/codecs/encoder.rs
+++ b/benches/codecs/encoder.rs
@@ -92,7 +92,7 @@ fn encoder(c: &mut Criterion) {
         b.iter_batched(
             || {
                 vector::codecs::Encoder::<Framer>::new(
-                    NewlineDelimitedEncoder::new().into(),
+                    NewlineDelimitedEncoder::default().into(),
                     JsonSerializerConfig::default().build().into(),
                 )
             },
diff --git a/benches/codecs/newline_bytes.rs b/benches/codecs/newline_bytes.rs
index 95d8962036a60..20e1d586b6850 100644
--- a/benches/codecs/newline_bytes.rs
+++ b/benches/codecs/newline_bytes.rs
@@ -50,8 +50,8 @@ fn decoding(c: &mut Criterion) {
                         let framer = Framer::NewlineDelimited(
                             param
                                 .max_length
-                                .map(|ml| NewlineDelimitedDecoder::new_with_max_length(ml))
-                                .unwrap_or(NewlineDelimitedDecoder::new()),
+                                .map(NewlineDelimitedDecoder::new_with_max_length)
+                                .unwrap_or_default(),
                         );
                         let deserializer = Deserializer::Bytes(BytesDeserializer);
                         let decoder = vector::codecs::Decoder::new(framer, deserializer);
diff --git a/benches/distribution_statistic.rs b/benches/distribution_statistic.rs
index 088c653067510..891a9c34f9907 100644
--- a/benches/distribution_statistic.rs
+++ b/benches/distribution_statistic.rs
@@ -1,13 +1,12 @@
 use criterion::{criterion_group, criterion_main, BatchSize, Criterion};
-use rand::{
-    distr::{Distribution, Uniform},
-    seq::SliceRandom,
-};
+use rand::distr::Distribution;
+use rand::{distr::Uniform, seq::SliceRandom};
 use vector::{event::metric::Sample, sinks::util::statistic::DistributionStatistic};
 
 fn generate_samples(mut size: u32, max_bin_count: u32) -> Vec<Sample> {
     let mut rng = rand::rng();
-    let range = Uniform::from(1..=max_bin_count);
+    // Fix Uniform usage for inclusive range
+    let range = Uniform::new_inclusive(1, max_bin_count).unwrap();
     let mut value = 1.0;
     let mut samples = Vec::new();
     while size > 0 {
@@ -28,7 +27,7 @@ fn bench_statistic(c: &mut Criterion) {
 
     let sizes = [5, 10, 50, 100, 200, 500, 1000];
     for &size in &sizes {
-        group.bench_function(format!("small-bin-{}", size), |b| {
+        group.bench_function(format!("small-bin-{size}"), |b| {
             b.iter_batched(
                 move || generate_samples(size, 3),
                 |samples| {
@@ -41,7 +40,7 @@ fn bench_statistic(c: &mut Criterion) {
 
     let sizes = [50, 100, 200, 500, 1000];
     for &size in &sizes {
-        group.bench_function(format!("large-bin-{}", size), |b| {
+        group.bench_function(format!("large-bin-{size}"), |b| {
             b.iter_batched(
                 move || generate_samples(size, 20),
                 |samples| {
diff --git a/benches/dnstap/mod.rs b/benches/dnstap/mod.rs
index 37839b41ace06..2110941f337ef 100644
--- a/benches/dnstap/mod.rs
+++ b/benches/dnstap/mod.rs
@@ -1,21 +1,31 @@
+use base64::engine::general_purpose::STANDARD;
+use base64::Engine;
 use bytes::Bytes;
 use criterion::{criterion_group, criterion_main, BatchSize, Criterion, Throughput};
+use dnsmsg_parser::dns_message_parser::DnsParserOptions;
+use dnstap_parser::parser::DnstapParser;
 use vector::event::LogEvent;
-use vector::sources::dnstap::parser::DnstapParser;
 
 fn benchmark_query_parsing(c: &mut Criterion) {
     let mut event = LogEvent::default();
     let raw_dnstap_data = "ChVqYW1lcy1WaXJ0dWFsLU1hY2hpbmUSC0JJTkQgOS4xNi4zcnoIAxACGAEiEAAAAAAAAA\
     AAAAAAAAAAAAAqECABBQJwlAAAAAAAAAAAADAw8+0CODVA7+zq9wVNMU3WNlI2kwIAAAABAAAAAAABCWZhY2Vib29rMQNjb\
     20AAAEAAQAAKQIAAACAAAAMAAoACOxjCAG9zVgzWgUDY29tAHgB";
-    let dnstap_data = base64::decode(raw_dnstap_data).unwrap();
+    let dnstap_data = STANDARD.decode(raw_dnstap_data).unwrap();
 
     let mut group = c.benchmark_group("dnstap");
     group.throughput(Throughput::Bytes(dnstap_data.len() as u64));
     group.bench_function("dns_query_parsing", |b| {
         b.iter_batched(
             || dnstap_data.clone(),
-            |dnstap_data| DnstapParser::parse(&mut event, Bytes::from(dnstap_data)).unwrap(),
+            |dnstap_data| {
+                DnstapParser::parse(
+                    &mut event,
+                    Bytes::from(dnstap_data),
+                    DnsParserOptions::default(),
+                )
+                .unwrap()
+            },
             BatchSize::SmallInput,
         )
     });
@@ -28,14 +38,21 @@ fn benchmark_update_parsing(c: &mut Criterion) {
     let raw_dnstap_data = "ChVqYW1lcy1WaXJ0dWFsLU1hY2hpbmUSC0JJTkQgOS4xNi4zcmsIDhABGAEiBH8AAA\
     EqBH8AAAEwrG44AEC+iu73BU14gfofUh1wi6gAAAEAAAAAAAAHZXhhbXBsZQNjb20AAAYAAWC+iu73BW0agDwvch1wi6gAA\
     AEAAAAAAAAHZXhhbXBsZQNjb20AAAYAAXgB";
-    let dnstap_data = base64::decode(raw_dnstap_data).unwrap();
+    let dnstap_data = STANDARD.decode(raw_dnstap_data).unwrap();
 
     let mut group = c.benchmark_group("dnstap");
     group.throughput(Throughput::Bytes(dnstap_data.len() as u64));
     group.bench_function("dns_update_parsing", |b| {
         b.iter_batched(
             || dnstap_data.clone(),
-            |dnstap_data| DnstapParser::parse(&mut event, Bytes::from(dnstap_data)).unwrap(),
+            |dnstap_data| {
+                DnstapParser::parse(
+                    &mut event,
+                    Bytes::from(dnstap_data),
+                    DnsParserOptions::default(),
+                )
+                .unwrap()
+            },
             BatchSize::SmallInput,
         )
     });
diff --git a/benches/enrichment_tables.rs b/benches/enrichment_tables.rs
index 67de513d44142..b56f4f794627e 100644
--- a/benches/enrichment_tables.rs
+++ b/benches/enrichment_tables.rs
@@ -28,12 +28,11 @@ fn column(col: usize, row: usize) -> Value {
         // And a final column with a date, each of the above duplicated row should have
         // a unique date.
         Value::Timestamp(
-            Utc.ymd(2013, row as u32 % 10 + 1, 15)
-                .and_hms_opt(0, 0, 0)
-                .expect("invalid timestamp"),
+            Utc.with_ymd_and_hms(2013, row as u32 % 10 + 1, 15, 0, 0, 0)
+                .unwrap(),
         )
     } else {
-        Value::from(format!("data-{}-{}", col, row))
+        Value::from(format!("data-{col}-{row}"))
     }
 }
 
@@ -69,14 +68,8 @@ fn benchmark_enrichment_tables_file(c: &mut Criterion) {
                     },
                     Condition::BetweenDates {
                         field: "field-1",
-                        from: Utc
-                            .ymd(2013, 6, 1)
-                            .and_hms_opt(0, 0, 0)
-                            .expect("invalid timestamp"),
-                        to: Utc
-                            .ymd(2013, 7, 1)
-                            .and_hms_opt(0, 0, 0)
-                            .expect("invalid timestamp"),
+                        from: Utc.with_ymd_and_hms(2013, 6, 1, 0, 0, 0).unwrap(),
+                        to: Utc.with_ymd_and_hms(2013, 7, 1, 0, 0, 0).unwrap(),
                     },
                 ],
                 file.add_index(case, &["field-0"]).unwrap(),
@@ -102,7 +95,7 @@ fn benchmark_enrichment_tables_file(c: &mut Criterion) {
         let result = (0..10)
             .map(|idx| {
                 (
-                    format!("field-{}", idx).into(),
+                    format!("field-{idx}").into(),
                     column(idx, size - result_offset),
                 )
             })
@@ -114,11 +107,11 @@ fn benchmark_enrichment_tables_file(c: &mut Criterion) {
     group.bench_function("enrichment_tables/file_date_10", |b| {
         let (file, index, condition, expected) = setup(10, true, Case::Sensitive);
         b.iter_batched(
-            || (&file, &condition, expected.clone()),
-            |(file, condition, expected)| {
+            || (&file, &condition, expected.clone(), Some(index)),
+            |(file, condition, expected, index)| {
                 assert_eq!(
                     Ok(expected),
-                    file.find_table_row(Case::Sensitive, condition, None, Some(index))
+                    file.find_table_row(Case::Sensitive, condition, None, None, index)
                 )
             },
             BatchSize::SmallInput,
@@ -128,11 +121,11 @@ fn benchmark_enrichment_tables_file(c: &mut Criterion) {
     group.bench_function("enrichment_tables/file_hashindex_sensitive_10", |b| {
         let (file, index, condition, expected) = setup(10, false, Case::Sensitive);
         b.iter_batched(
-            || (&file, index, &condition, expected.clone()),
-            |(file, index, condition, expected)| {
+            || (&file, &condition, expected.clone(), Some(index)),
+            |(file, condition, expected, index)| {
                 assert_eq!(
                     Ok(expected),
-                    file.find_table_row(Case::Sensitive, condition, None, Some(index))
+                    file.find_table_row(Case::Sensitive, condition, None, None, index)
                 )
             },
             BatchSize::SmallInput,
@@ -142,11 +135,11 @@ fn benchmark_enrichment_tables_file(c: &mut Criterion) {
     group.bench_function("enrichment_tables/file_hashindex_insensitive_10", |b| {
         let (file, index, condition, expected) = setup(10, false, Case::Insensitive);
         b.iter_batched(
-            || (&file, index, &condition, expected.clone()),
-            |(file, index, condition, expected)| {
+            || (&file, &condition, expected.clone(), Some(index)),
+            |(file, condition, expected, index)| {
                 assert_eq!(
                     Ok(expected),
-                    file.find_table_row(Case::Insensitive, condition, None, Some(index))
+                    file.find_table_row(Case::Insensitive, condition, None, None, index)
                 )
             },
             BatchSize::SmallInput,
@@ -156,11 +149,11 @@ fn benchmark_enrichment_tables_file(c: &mut Criterion) {
     group.bench_function("enrichment_tables/file_date_1_000", |b| {
         let (file, index, condition, expected) = setup(1_000, true, Case::Sensitive);
         b.iter_batched(
-            || (&file, &condition, expected.clone()),
-            |(file, condition, expected)| {
+            || (&file, &condition, expected.clone(), Some(index)),
+            |(file, condition, expected, index)| {
                 assert_eq!(
                     Ok(expected),
-                    file.find_table_row(Case::Sensitive, condition, None, Some(index))
+                    file.find_table_row(Case::Sensitive, condition, None, None, index)
                 )
             },
             BatchSize::SmallInput,
@@ -170,11 +163,11 @@ fn benchmark_enrichment_tables_file(c: &mut Criterion) {
     group.bench_function("enrichment_tables/file_hashindex_sensitive_1_000", |b| {
         let (file, index, condition, expected) = setup(1_000, false, Case::Sensitive);
         b.iter_batched(
-            || (&file, index, &condition, expected.clone()),
-            |(file, index, condition, expected)| {
+            || (&file, &condition, expected.clone(), Some(index)),
+            |(file, condition, expected, index)| {
                 assert_eq!(
                     Ok(expected),
-                    file.find_table_row(Case::Sensitive, condition, None, Some(index))
+                    file.find_table_row(Case::Sensitive, condition, None, None, index)
                 )
             },
             BatchSize::SmallInput,
@@ -184,11 +177,11 @@ fn benchmark_enrichment_tables_file(c: &mut Criterion) {
     group.bench_function("enrichment_tables/file_hashindex_insensitive_1_000", |b| {
         let (file, index, condition, expected) = setup(1_000, false, Case::Insensitive);
         b.iter_batched(
-            || (&file, index, &condition, expected.clone()),
-            |(file, index, condition, expected)| {
+            || (&file, &condition, expected.clone(), Some(index)),
+            |(file, condition, expected, index)| {
                 assert_eq!(
                     Ok(expected),
-                    file.find_table_row(Case::Insensitive, condition, None, Some(index))
+                    file.find_table_row(Case::Insensitive, condition, None, None, index)
                 )
             },
             BatchSize::SmallInput,
@@ -198,11 +191,11 @@ fn benchmark_enrichment_tables_file(c: &mut Criterion) {
     group.bench_function("enrichment_tables/file_date_1_000_000", |b| {
         let (file, index, condition, expected) = setup(1_000_000, true, Case::Sensitive);
         b.iter_batched(
-            || (&file, &condition, expected.clone()),
-            |(file, condition, expected)| {
+            || (&file, &condition, expected.clone(), Some(index)),
+            |(file, condition, expected, index)| {
                 assert_eq!(
                     Ok(expected),
-                    file.find_table_row(Case::Sensitive, condition, None, Some(index))
+                    file.find_table_row(Case::Sensitive, condition, None, None, index)
                 )
             },
             BatchSize::SmallInput,
@@ -214,11 +207,11 @@ fn benchmark_enrichment_tables_file(c: &mut Criterion) {
         |b| {
             let (file, index, condition, expected) = setup(1_000_000, false, Case::Sensitive);
             b.iter_batched(
-                || (&file, index, &condition, expected.clone()),
-                |(file, index, condition, expected)| {
+                || (&file, &condition, expected.clone(), Some(index)),
+                |(file, condition, expected, index)| {
                     assert_eq!(
                         Ok(expected),
-                        file.find_table_row(Case::Sensitive, condition, None, Some(index))
+                        file.find_table_row(Case::Sensitive, condition, None, None, index)
                     )
                 },
                 BatchSize::SmallInput,
@@ -231,11 +224,11 @@ fn benchmark_enrichment_tables_file(c: &mut Criterion) {
         |b| {
             let (file, index, condition, expected) = setup(1_000_000, false, Case::Insensitive);
             b.iter_batched(
-                || (&file, index, &condition, expected.clone()),
-                |(file, index, condition, expected)| {
+                || (&file, &condition, expected.clone(), Some(index)),
+                |(file, condition, expected, index)| {
                     assert_eq!(
                         Ok(expected),
-                        file.find_table_row(Case::Insensitive, condition, None, Some(index))
+                        file.find_table_row(Case::Insensitive, condition, None, None, index)
                     )
                 },
                 BatchSize::SmallInput,
@@ -270,18 +263,17 @@ fn benchmark_enrichment_tables_geoip(c: &mut Criterion) {
             || (&table, ip, &expected),
             |(table, ip, expected)| {
                 assert_eq!(
-                    Ok(expected),
-                    table
-                        .find_table_row(
-                            Case::Insensitive,
-                            &[Condition::Equals {
-                                field: "ip",
-                                value: ip.into(),
-                            }],
-                            None,
-                            None,
-                        )
-                        .as_ref()
+                    Ok(expected.clone()),
+                    table.find_table_row(
+                        Case::Insensitive,
+                        &[Condition::Equals {
+                            field: "ip",
+                            value: ip.into(),
+                        }],
+                        None,
+                        None,
+                        None,
+                    )
                 )
             },
             BatchSize::SmallInput,
@@ -308,18 +300,17 @@ fn benchmark_enrichment_tables_geoip(c: &mut Criterion) {
             || (&table, ip, &expected),
             |(table, ip, expected)| {
                 assert_eq!(
-                    Ok(expected),
-                    table
-                        .find_table_row(
-                            Case::Insensitive,
-                            &[Condition::Equals {
-                                field: "ip",
-                                value: ip.into(),
-                            }],
-                            None,
-                            None,
-                        )
-                        .as_ref()
+                    Ok(expected.clone()),
+                    table.find_table_row(
+                        Case::Insensitive,
+                        &[Condition::Equals {
+                            field: "ip",
+                            value: ip.into(),
+                        }],
+                        None,
+                        None,
+                        None,
+                    )
                 )
             },
             BatchSize::SmallInput,
@@ -352,18 +343,17 @@ fn benchmark_enrichment_tables_mmdb(c: &mut Criterion) {
             || (&table, ip, &expected),
             |(table, ip, expected)| {
                 assert_eq!(
-                    Ok(expected),
-                    table
-                        .find_table_row(
-                            Case::Insensitive,
-                            &[Condition::Equals {
-                                field: "ip",
-                                value: ip.into(),
-                            }],
-                            None,
-                            None,
-                        )
-                        .as_ref()
+                    Ok(expected.clone()),
+                    table.find_table_row(
+                        Case::Insensitive,
+                        &[Condition::Equals {
+                            field: "ip",
+                            value: ip.into(),
+                        }],
+                        None,
+                        None,
+                        None,
+                    )
                 )
             },
             BatchSize::SmallInput,
@@ -387,21 +377,20 @@ fn benchmark_enrichment_tables_mmdb(c: &mut Criterion) {
             || (&table, ip, &expected),
             |(table, ip, expected)| {
                 assert_eq!(
-                    Ok(expected),
-                    table
-                        .find_table_row(
-                            Case::Insensitive,
-                            &[Condition::Equals {
-                                field: "ip",
-                                value: ip.into(),
-                            }],
-                            Some(&[
-                                "location.latitude".to_string(),
-                                "location.longitude".to_string(),
-                            ]),
-                            None,
-                        )
-                        .as_ref()
+                    Ok(expected.clone()),
+                    table.find_table_row(
+                        Case::Insensitive,
+                        &[Condition::Equals {
+                            field: "ip",
+                            value: ip.into(),
+                        }],
+                        Some(&[
+                            "location.latitude".to_string(),
+                            "location.longitude".to_string(),
+                        ]),
+                        None,
+                        None,
+                    )
                 )
             },
             BatchSize::SmallInput,
diff --git a/benches/lua.rs b/benches/lua.rs
index 0d8a409d8acef..8bf99aaf9f0d4 100644
--- a/benches/lua.rs
+++ b/benches/lua.rs
@@ -22,7 +22,7 @@ fn bench_add_fields(c: &mut Criterion) {
 
     let benchmarks: Vec<(&str, Transform)> = vec![
         ("v1", {
-            let source = format!("event['{}'] = '{}'", key, value);
+            let source = format!("event['{key}'] = '{value}'");
 
             Transform::event_task(transforms::lua::v1::Lua::new(source, vec![]).unwrap())
         }),
@@ -148,9 +148,8 @@ fn bench_field_filter(c: &mut Criterion) {
             b.iter_batched(
                 || (tx.clone(), events.clone()),
                 |(mut tx, events)| {
-                    let _ =
-                        futures::executor::block_on(tx.send_all(&mut stream::iter(events).map(Ok)))
-                            .unwrap();
+                    futures::executor::block_on(tx.send_all(&mut stream::iter(events).map(Ok)))
+                        .unwrap();
 
                     let output = futures::executor::block_on(collect_ready(&mut rx));
 
diff --git a/benches/metrics_snapshot.rs b/benches/metrics_snapshot.rs
index bb59ccf65433c..637335967826c 100644
--- a/benches/metrics_snapshot.rs
+++ b/benches/metrics_snapshot.rs
@@ -23,7 +23,7 @@ fn prepare_metrics(cardinality: usize) -> &'static vector::metrics::Controller {
     controller.reset();
 
     for idx in 0..cardinality {
-        metrics::counter!("test", 1, "idx" => idx.to_string());
+        metrics::counter!("test", "idx" => idx.to_string()).increment(1);
     }
 
     controller
diff --git a/benches/transform/common.rs b/benches/transform/common.rs
index 1760c5e6a5537..481e65e2d7541 100644
--- a/benches/transform/common.rs
+++ b/benches/transform/common.rs
@@ -38,7 +38,7 @@ impl FixedLogStream {
         let mut events = Vec::with_capacity(total.get());
         let mut cycle = 0;
         for _ in 0..total.get() {
-            events.push(Event::Log(LogEvent::from(format!("event{}", cycle))));
+            events.push(Event::Log(LogEvent::from(format!("event{cycle}"))));
             cycle = (cycle + 1) % cycle_size;
         }
         Self::new_from_vec(events)
diff --git a/benches/transform/dedupe.rs b/benches/transform/dedupe.rs
index 5df5a5cf96ce4..de1fa3081a035 100644
--- a/benches/transform/dedupe.rs
+++ b/benches/transform/dedupe.rs
@@ -1,15 +1,16 @@
 use core::fmt;
 use std::{num::NonZeroUsize, time::Duration};
 
+use crate::common::{consume, FixedLogStream};
 use criterion::{
     criterion_group, measurement::WallTime, BatchSize, BenchmarkGroup, BenchmarkId, Criterion,
     SamplingMode, Throughput,
 };
-use vector::transforms::dedupe::{CacheConfig, Dedupe, DedupeConfig, FieldMatchConfig};
+use vector::transforms::dedupe::common::{CacheConfig, FieldMatchConfig};
+use vector::transforms::dedupe::config::DedupeConfig;
+use vector::transforms::dedupe::transform::Dedupe;
 use vector_lib::transform::Transform;
 
-use crate::common::{consume, FixedLogStream};
-
 #[derive(Debug)]
 struct Param {
     slug: &'static str,
@@ -91,8 +92,12 @@ fn dedupe(c: &mut Criterion) {
         group.bench_with_input(BenchmarkId::new("transform", param), &param, |b, param| {
             b.iter_batched(
                 || {
-                    let dedupe =
-                        Transform::event_task(Dedupe::new(param.dedupe_config.clone())).into_task();
+                    let config = param.dedupe_config.clone();
+                    let dedupe = Transform::event_task(Dedupe::new(
+                        config.cache.num_events,
+                        config.fields.unwrap(),
+                    ))
+                    .into_task();
                     (Box::new(dedupe), Box::pin(param.input.clone()))
                 },
                 |(dedupe, input)| {
diff --git a/benches/transform/reduce.rs b/benches/transform/reduce.rs
index 9f0e4ed60fdd2..fd3f54275766a 100644
--- a/benches/transform/reduce.rs
+++ b/benches/transform/reduce.rs
@@ -1,16 +1,16 @@
 use core::fmt;
 use std::{num::NonZeroUsize, time::Duration};
 
+use crate::common::{consume, FixedLogStream};
 use criterion::{
     criterion_group, measurement::WallTime, BatchSize, BenchmarkGroup, BenchmarkId, Criterion,
     SamplingMode, Throughput,
 };
 use indexmap::IndexMap;
-use vector::transforms::reduce::{Reduce, ReduceConfig};
+use vector::transforms::reduce::config::ReduceConfig;
+use vector::transforms::reduce::transform::Reduce;
 use vector_lib::transform::Transform;
 
-use crate::common::{consume, FixedLogStream};
-
 #[derive(Debug)]
 struct Param {
     slug: &'static str,
@@ -33,17 +33,13 @@ fn reduce(c: &mut Criterion) {
         NonZeroUsize::new(128).unwrap(),
         NonZeroUsize::new(2).unwrap(),
     );
-    for param in &[
-        // The `Reduce` transform has a high configuration surface. For now we
-        // only benchmark the "proof of concept" configuration, demonstrating
-        // that the benchmark does minimally work. Once we have soak tests with
-        // reduces in them we should extend this array to include those
-        // configurations.
-        Param {
+    {
+        let param = &Param {
             slug: "proof_of_concept",
             input: fixed_stream.clone(),
             reduce_config: ReduceConfig {
                 expire_after_ms: Duration::from_secs(30),
+                end_every_period_ms: None,
                 flush_period_ms: Duration::from_secs(1),
                 group_by: vec![String::from("message")],
                 merge_strategies: IndexMap::default(),
@@ -51,8 +47,7 @@ fn reduce(c: &mut Criterion) {
                 starts_when: None,
                 max_events: None,
             },
-        },
-    ] {
+        };
         group.throughput(Throughput::Elements(param.input.len() as u64));
         group.bench_with_input(BenchmarkId::new("transform", param), &param, |b, param| {
             b.to_async(tokio::runtime::Runtime::new().unwrap())
diff --git a/benches/transform/route.rs b/benches/transform/route.rs
index 0ef6efa30b179..c49ce47f13404 100644
--- a/benches/transform/route.rs
+++ b/benches/transform/route.rs
@@ -3,8 +3,8 @@ use std::time::Duration;
 
 use bytes::Bytes;
 use criterion::{
-    black_box, criterion_group, measurement::WallTime, BatchSize, BenchmarkGroup, BenchmarkId,
-    Criterion, SamplingMode, Throughput,
+    criterion_group, measurement::WallTime, BatchSize, BenchmarkGroup, BenchmarkId, Criterion,
+    SamplingMode, Throughput,
 };
 use vector::config::TransformContext;
 use vector::transforms::{
@@ -159,7 +159,8 @@ fn route(c: &mut Criterion) {
                     (route, param.input.clone(), param.output_buffer.clone())
                 },
                 |(mut route, input, mut output_buffer)| {
-                    black_box(route.transform(input, &mut output_buffer));
+                    route.transform(input, &mut output_buffer);
+                    std::hint::black_box(());
                 },
                 BatchSize::SmallInput,
             )
diff --git a/src/components/validation/runner/mod.rs b/src/components/validation/runner/mod.rs
index e58d5babb2f3d..1316499bb13ac 100644
--- a/src/components/validation/runner/mod.rs
+++ b/src/components/validation/runner/mod.rs
@@ -192,6 +192,7 @@ impl Runner {
         }
     }
 
+    #[allow(clippy::print_stdout)]
     pub async fn run_validation(self) -> Result<Vec<RunnerResults>, vector_lib::Error> {
         // Initialize our test environment.
         initialize_test_environment();
diff --git a/tests/integration/cli.rs b/tests/integration/cli.rs
index 107153e4b2a3d..636f1880c8790 100644
--- a/tests/integration/cli.rs
+++ b/tests/integration/cli.rs
@@ -1,3 +1,4 @@
+#![allow(clippy::print_stdout)]
 use std::collections::HashSet;
 use std::{fs::read_dir, process::Command};
 
diff --git a/tests/integration/shutdown.rs b/tests/integration/shutdown.rs
index 0054ef0f0ae93..af02d06e07814 100644
--- a/tests/integration/shutdown.rs
+++ b/tests/integration/shutdown.rs
@@ -97,6 +97,7 @@ fn test_timely_shutdown(cmd: Command) {
 }
 
 /// Returns stdout output
+#[allow(clippy::print_stdout)]
 fn test_timely_shutdown_with_sub(mut cmd: Command, sub: impl FnOnce(&mut Child)) {
     let mut vector = cmd
         .stdin(std::process::Stdio::piped())

From 3068480f39688dac5b08273c16140b87b20badda Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 23 Jul 2025 13:42:55 +0000
Subject: [PATCH 205/305] chore(website deps): Bump form-data from 4.0.0 to
 4.0.4 in /website in the npm_and_yarn group (#23408)

* chore(website deps): Bump form-data

Bumps the npm_and_yarn group in /website with 1 update: [form-data](https://github.com/form-data/form-data).


Updates `form-data` from 4.0.0 to 4.0.4
- [Release notes](https://github.com/form-data/form-data/releases)
- [Changelog](https://github.com/form-data/form-data/blob/master/CHANGELOG.md)
- [Commits](https://github.com/form-data/form-data/compare/v4.0.0...v4.0.4)

---
updated-dependencies:
- dependency-name: form-data
  dependency-version: 4.0.4
  dependency-type: indirect
  dependency-group: npm_and_yarn
...

Signed-off-by: dependabot[bot] <support@github.com>

* Add @vectordotdev/vector to all CODEOWNERS

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Thomas <thomas.schneider@datadoghq.com>
Co-authored-by: Pavlos Rontidis <pavlos.rontidis@gmail.com>
---
 .github/CODEOWNERS | 19 ++++-----
 website/yarn.lock  | 98 ++++++++++++++++++++++++++++++++++++++++++++--
 2 files changed, 105 insertions(+), 12 deletions(-)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 912fad9a7d770..9b7fa0951b6f1 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -2,13 +2,14 @@
 
 .github/workflows/regression.yml @vectordotdev/vector @vectordotdev/single-machine-performance
 regression/config.yaml @vectordotdev/vector @vectordotdev/single-machine-performance
-docs/ @vectordotdev/ux-team @vectordotdev/documentation
-website/ @vectordotdev/ux-team
-website/content  @vectordotdev/documentation
-website/cue/reference @vectordotdev/documentation
 
-website/js @vectordotdev/vector-website
-website/layouts @vectordotdev/vector-website
-website/scripts @vectordotdev/vector-website
-website/data @vectordotdev/vector-website
-website/* @vectordotdev/vector-website
+docs/ @vectordotdev/vector @vectordotdev/ux-team @vectordotdev/documentation
+website/ @vectordotdev/vector @vectordotdev/ux-team
+website/content @vectordotdev/vector @vectordotdev/documentation
+website/cue/reference @vectordotdev/vector @vectordotdev/documentation
+
+website/js @vectordotdev/vector @vectordotdev/vector-website
+website/layouts @vectordotdev/vector @vectordotdev/vector-website
+website/scripts @vectordotdev/vector @vectordotdev/vector-website
+website/data @vectordotdev/vector @vectordotdev/vector-website
+website/* @vectordotdev/vector @vectordotdev/vector-website
diff --git a/website/yarn.lock b/website/yarn.lock
index f748d123269f1..36742edf850c3 100644
--- a/website/yarn.lock
+++ b/website/yarn.lock
@@ -1942,6 +1942,14 @@ bytes@^3.0.0:
   resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.2.tgz#8b0beeb98605adf1b128fa4386403c009e0221a5"
   integrity sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==
 
+call-bind-apply-helpers@^1.0.1, call-bind-apply-helpers@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz#4b5428c222be985d79c3d82657479dbe0b59b2d6"
+  integrity sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==
+  dependencies:
+    es-errors "^1.3.0"
+    function-bind "^1.1.2"
+
 callsites@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73"
@@ -2382,6 +2390,15 @@ downshift@^6.1.3:
     react-is "^17.0.2"
     tslib "^2.3.0"
 
+dunder-proto@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/dunder-proto/-/dunder-proto-1.0.1.tgz#d7ae667e1dc83482f8b70fd0f6eefc50da30f58a"
+  integrity sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==
+  dependencies:
+    call-bind-apply-helpers "^1.0.1"
+    es-errors "^1.3.0"
+    gopd "^1.2.0"
+
 electron-to-chromium@^1.5.73:
   version "1.5.94"
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.94.tgz#808f294794af24f9edc63a6e58fc625f718b60a6"
@@ -2416,6 +2433,33 @@ error-stack-parser@^2.0.6:
   dependencies:
     stackframe "^1.1.1"
 
+es-define-property@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/es-define-property/-/es-define-property-1.0.1.tgz#983eb2f9a6724e9303f61addf011c72e09e0b0fa"
+  integrity sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==
+
+es-errors@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/es-errors/-/es-errors-1.3.0.tgz#05f75a25dab98e4fb1dcd5e1472c0546d5057c8f"
+  integrity sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==
+
+es-object-atoms@^1.0.0, es-object-atoms@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/es-object-atoms/-/es-object-atoms-1.1.1.tgz#1c4f2c4837327597ce69d2ca190a7fdd172338c1"
+  integrity sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==
+  dependencies:
+    es-errors "^1.3.0"
+
+es-set-tostringtag@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/es-set-tostringtag/-/es-set-tostringtag-2.1.0.tgz#f31dbbe0c183b00a6d26eb6325c810c0fd18bd4d"
+  integrity sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==
+  dependencies:
+    es-errors "^1.3.0"
+    get-intrinsic "^1.2.6"
+    has-tostringtag "^1.0.2"
+    hasown "^2.0.2"
+
 escalade@^3.1.1, escalade@^3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.2.0.tgz#011a3f69856ba189dffa7dc8fcce99d2a87903e5"
@@ -2497,12 +2541,14 @@ follow-redirects@^1.15.6:
   integrity sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==
 
 form-data@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.0.tgz#93919daeaf361ee529584b9b31664dc12c9fa452"
-  integrity sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==
+  version "4.0.4"
+  resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.4.tgz#784cdcce0669a9d68e94d11ac4eea98088edd2c4"
+  integrity sha512-KrGhL9Q4zjj0kiUt5OO4Mr/A/jlI2jDYs5eHBpYHPcBEVSiipAvn2Ko2HnPe20rmcuuvMHNdZFp+4IlGTMF0Ow==
   dependencies:
     asynckit "^0.4.0"
     combined-stream "^1.0.8"
+    es-set-tostringtag "^2.1.0"
+    hasown "^2.0.2"
     mime-types "^2.1.12"
 
 fraction.js@^4.1.2:
@@ -2564,6 +2610,30 @@ get-caller-file@^2.0.5:
   resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
   integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
 
+get-intrinsic@^1.2.6:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.3.0.tgz#743f0e3b6964a93a5491ed1bffaae054d7f98d01"
+  integrity sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==
+  dependencies:
+    call-bind-apply-helpers "^1.0.2"
+    es-define-property "^1.0.1"
+    es-errors "^1.3.0"
+    es-object-atoms "^1.1.1"
+    function-bind "^1.1.2"
+    get-proto "^1.0.1"
+    gopd "^1.2.0"
+    has-symbols "^1.1.0"
+    hasown "^2.0.2"
+    math-intrinsics "^1.1.0"
+
+get-proto@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/get-proto/-/get-proto-1.0.1.tgz#150b3f2743869ef3e851ec0c49d15b1d14d00ee1"
+  integrity sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==
+  dependencies:
+    dunder-proto "^1.0.1"
+    es-object-atoms "^1.0.0"
+
 get-stdin@^8.0.0:
   version "8.0.0"
   resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-8.0.0.tgz#cbad6a73feb75f6eeb22ba9e01f89aa28aa97a53"
@@ -2619,6 +2689,11 @@ globby@^11.0.0:
     merge2 "^1.4.1"
     slash "^3.0.0"
 
+gopd@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/gopd/-/gopd-1.2.0.tgz#89f56b8217bdbc8802bd299df6d7f1081d7e51a1"
+  integrity sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==
+
 graceful-fs@^4.1.6, graceful-fs@^4.2.0:
   version "4.2.9"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.9.tgz#041b05df45755e587a24942279b9d113146e1c96"
@@ -2634,6 +2709,18 @@ has-flag@^4.0.0:
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
   integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
 
+has-symbols@^1.0.3, has-symbols@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.1.0.tgz#fc9c6a783a084951d0b971fe1018de813707a338"
+  integrity sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==
+
+has-tostringtag@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/has-tostringtag/-/has-tostringtag-1.0.2.tgz#2cdc42d40bef2e5b4eeab7c01a73c54ce7ab5abc"
+  integrity sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==
+  dependencies:
+    has-symbols "^1.0.3"
+
 hasown@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/hasown/-/hasown-2.0.2.tgz#003eaf91be7adc372e84ec59dc37252cedb80003"
@@ -2925,6 +3012,11 @@ make-error@^1.1.1:
   resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.6.tgz#2eb2e37ea9b67c4891f684a1394799af484cf7a2"
   integrity sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==
 
+math-intrinsics@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/math-intrinsics/-/math-intrinsics-1.1.0.tgz#a0dd74be81e2aa5c2f27e65ce283605ee4e2b7f9"
+  integrity sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==
+
 mdn-data@2.0.14:
   version "2.0.14"
   resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.14.tgz#7113fc4281917d63ce29b43446f701e68c25ba50"

From fd7c30231a3ff807a49e93a496741cf006943579 Mon Sep 17 00:00:00 2001
From: Thomas <thomas.schneider@datadoghq.com>
Date: Wed, 23 Jul 2025 12:27:35 -0400
Subject: [PATCH 206/305] chore(ci): pin actions versions (#23417)

* audit.yml: update checkout to @v4

* Pin actions/checkout version

* Pin actions/upload-artifact version

* Pin actions/download-artifact version

* Pin actions-rs/audit-check version

* Pin actions/cache version

* Pin myrotvorets/set-commit-status-action version

* Pin actions-ecosystem/action-remove-labels version

* Pin nick-fields/retry version

* Pin actions/github-script version

* Pin xt0rted/pull-request-comment-branch version

* Pin dorny/paths-filter version

* Pin aws-actions/configure-aws-credentials version

* Pin ossf/scorecard-action version

* Pin tspascoal/get-user-teams-membership version

* Pin docker/setup-buildx-action version

* Pin docker/build-push-action version

* Pin docker/setup-qemu-action version

* Pin docker/login-action version

* Pin actions/add-to-project version

* Pin aws-actions/amazon-ecr-login version

* Pin juliangruber/read-file-action version

* Pin check-spelling/check-spelling version

* Pin amannn/action-semantic-pull-request version

* Pin actions/labeler version

* Pin bufbuild/buf-setup-action version

* Pin bufbuild/buf-breaking-action version

* Pin colpal/actions-clean version

* Pin github/codeql-action/upload-sarif version
---
 .github/audit.yml                             |   5 +-
 .github/workflows/changelog.yaml              |   4 +-
 .github/workflows/changes.yml                 |  14 +-
 .github/workflows/ci-integration-review.yml   |  18 +-
 .github/workflows/ci-review-trigger.yml       |   2 +-
 .github/workflows/cli.yml                     |  10 +-
 .github/workflows/compilation-timings.yml     |  20 +--
 .github/workflows/component_features.yml      |   8 +-
 .github/workflows/create_preview_sites.yml    |  10 +-
 .github/workflows/cross.yml                   |  14 +-
 .github/workflows/deny.yml                    |  10 +-
 .github/workflows/e2e.yml                     |   6 +-
 .github/workflows/environment.yml             |  16 +-
 .github/workflows/gardener_issue_comment.yml  |   2 +-
 .github/workflows/gardener_open_issue.yml     |   2 +-
 .github/workflows/gardener_open_pr.yml        |   6 +-
 .../gardener_remove_waiting_author.yml        |   4 +-
 .github/workflows/install-sh.yml              |  10 +-
 .github/workflows/integration-test.yml        |   6 +-
 .github/workflows/integration.yml             |   8 +-
 .github/workflows/k8s_e2e.yml                 |  30 ++--
 .github/workflows/labeler.yml                 |   2 +-
 .github/workflows/misc.yml                    |  10 +-
 .github/workflows/msrv.yml                    |   2 +-
 .github/workflows/preview_site_trigger.yml    |   4 +-
 .github/workflows/protobuf.yml                |   6 +-
 .github/workflows/publish.yml                 | 160 +++++++++---------
 .github/workflows/regression.yml              |  74 ++++----
 .github/workflows/scorecard.yml               |   8 +-
 .github/workflows/semantic.yml                |   2 +-
 .github/workflows/spelling.yml                |   2 +-
 .github/workflows/test.yml                    |  26 +--
 .github/workflows/unit_mac.yml                |  12 +-
 .github/workflows/unit_windows.yml            |   8 +-
 34 files changed, 261 insertions(+), 260 deletions(-)

diff --git a/.github/audit.yml b/.github/audit.yml
index 77ae1a5548fd5..2544a1bad0530 100644
--- a/.github/audit.yml
+++ b/.github/audit.yml
@@ -11,7 +11,8 @@ jobs:
   security_audit:
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v1
-      - uses: actions-rs/audit-check@v1
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      # TODO: replace this action - abandoned since 2020
+      - uses: actions-rs/audit-check@35b7b53b1e25b55642157ac01b4adceb5b9ebef3 # v1.2.0
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/changelog.yaml b/.github/workflows/changelog.yaml
index 6ae6f6e7354e0..9c6fe296d9733 100644
--- a/.github/workflows/changelog.yaml
+++ b/.github/workflows/changelog.yaml
@@ -42,7 +42,7 @@ jobs:
           exit 0
 
       # Checkout changelog script and changelog.d/ from master
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         if: env.SHOULD_RUN == 'true'
         with:
           ref: master
@@ -52,7 +52,7 @@ jobs:
           sparse-checkout-cone-mode: false
 
       # Checkout PR's changelog.d/ into tmp/
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         if: env.SHOULD_RUN == 'true'
         with:
           repository: ${{ github.event.pull_request.head.repo.full_name }}
diff --git a/.github/workflows/changes.yml b/.github/workflows/changes.yml
index d8fd0c7febe59..b73aedaec5df5 100644
--- a/.github/workflows/changes.yml
+++ b/.github/workflows/changes.yml
@@ -144,9 +144,9 @@ jobs:
       k8s: ${{ steps.filter.outputs.k8s }}
       website_only: ${{ steps.filter.outputs.website == 'true' && steps.filter.outputs.not_website == 'false' }}
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
-    - uses: dorny/paths-filter@v3
+    - uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36 # v3.0.2
       id: filter
       with:
         base: ${{ env.BASE_REF }}
@@ -245,7 +245,7 @@ jobs:
       webhdfs: ${{ steps.filter.outputs.webhdfs }}
       all-changes-json: ${{ steps.aggregate.outputs.all-changes-json }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
       # creates a yaml file that contains the filters for each integration,
       # extracted from the output of the `vdev int ci-paths` command, which
@@ -253,7 +253,7 @@ jobs:
       - name: Create filter rules for integrations
         run: cargo vdev int ci-paths > int_test_filters.yaml
 
-      - uses: dorny/paths-filter@v3
+      - uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36 # v3.0.2
         id: filter
         with:
           base: ${{ env.BASE_REF }}
@@ -309,7 +309,7 @@ jobs:
           echo "$json" > int_tests_changes.json
 
       - name: Upload JSON artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
         with:
           name: int_tests_changes
           path: int_tests_changes.json
@@ -323,7 +323,7 @@ jobs:
       datadog-logs: ${{ steps.filter.outputs.datadog-logs }}
       datadog-metrics: ${{ steps.filter.outputs.datadog-metrics }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
       # creates a yaml file that contains the filters for each test,
       # extracted from the output of the `vdev int ci-paths` command, which
@@ -331,7 +331,7 @@ jobs:
       - name: Create filter rules for e2e tests
         run: cargo vdev e2e ci-paths > int_test_filters.yaml
 
-      - uses: dorny/paths-filter@v3
+      - uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36 # v3.0.2
         id: filter
         with:
           base: ${{ env.BASE_REF }}
diff --git a/.github/workflows/ci-integration-review.yml b/.github/workflows/ci-integration-review.yml
index e3a4d7650436c..77962b14ee2a3 100644
--- a/.github/workflows/ci-integration-review.yml
+++ b/.github/workflows/ci-integration-review.yml
@@ -63,7 +63,7 @@ jobs:
           private_key: ${{ secrets.GH_APP_DATADOG_VECTOR_CI_APP_PRIVATE_KEY }}
       - name: Get PR review author
         id: comment
-        uses: tspascoal/get-user-teams-membership@v3
+        uses: tspascoal/get-user-teams-membership@57e9f42acd78f4d0f496b3be4368fc5f62696662 # v3.0.0
         with:
           username: ${{ github.actor }}
           team: 'Vector'
@@ -74,7 +74,7 @@ jobs:
         run: exit 1
 
       - name: (PR review) Set latest commit status as pending
-        uses: myrotvorets/set-commit-status-action@v2.0.1
+        uses: myrotvorets/set-commit-status-action@3730c0a348a2ace3c110851bed53331bc6406e9f # v2.0.1
         with:
           sha: ${{ github.event.review.commit_id }}
           token: ${{ secrets.GITHUB_TOKEN }}
@@ -94,7 +94,7 @@ jobs:
           "redis", "splunk", "webhdfs"
         ]
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           submodules: "recursive"
           ref: ${{ github.event.review.commit_id }}
@@ -107,7 +107,7 @@ jobs:
         if: ${{ startsWith(github.event.review.body, '/ci-run-integration-all')
           || startsWith(github.event.review.body, '/ci-run-all')
           || startsWith(github.event.review.body, format('/ci-run-integration-{0}', matrix.service)) }}
-        uses: nick-fields/retry@v3
+        uses: nick-fields/retry@ce71cc2ab81d554ebbe88c79ab5975992d79ba08 # v3.0.2
         with:
           timeout_minutes: 30
           max_attempts: 3
@@ -118,7 +118,7 @@ jobs:
     runs-on: ubuntu-24.04-8core
     timeout-minutes: 30
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           submodules: "recursive"
           ref: ${{ github.event.review.commit_id }}
@@ -130,7 +130,7 @@ jobs:
         if: ${{ startsWith(github.event.review.body, '/ci-run-e2e-datadog-logs')
           || startsWith(github.event.review.body, '/ci-run-integration-all')
           || startsWith(github.event.review.body, '/ci-run-all') }}
-        uses: nick-fields/retry@v3
+        uses: nick-fields/retry@ce71cc2ab81d554ebbe88c79ab5975992d79ba08 # v3.0.2
         with:
           timeout_minutes: 35
           max_attempts: 3
@@ -140,7 +140,7 @@ jobs:
         if: ${{ startsWith(github.event.review.body, '/ci-run-e2e-datadog-metrics')
           || startsWith(github.event.review.body, '/ci-run-e2e-all')
           || startsWith(github.event.review.body, '/ci-run-all') }}
-        uses: nick-fields/retry@v3
+        uses: nick-fields/retry@ce71cc2ab81d554ebbe88c79ab5975992d79ba08 # v3.0.2
         with:
           timeout_minutes: 35
           max_attempts: 3
@@ -166,7 +166,7 @@ jobs:
 
       - name: Validate issue comment
         if: github.event_name == 'pull_request_review'
-        uses: tspascoal/get-user-teams-membership@v3
+        uses: tspascoal/get-user-teams-membership@57e9f42acd78f4d0f496b3be4368fc5f62696662 # v3.0.0
         with:
           username: ${{ github.actor }}
           team: 'Vector'
@@ -174,7 +174,7 @@ jobs:
 
       - name: (PR review) Submit PR result as success
         if: github.event_name == 'pull_request_review' && env.FAILED != 'true'
-        uses: myrotvorets/set-commit-status-action@v2.0.1
+        uses: myrotvorets/set-commit-status-action@3730c0a348a2ace3c110851bed53331bc6406e9f # v2.0.1
         with:
           sha: ${{ github.event.review.commit_id }}
           token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/ci-review-trigger.yml b/.github/workflows/ci-review-trigger.yml
index 06f638da5fbab..6d2ef24c4c9a7 100644
--- a/.github/workflows/ci-review-trigger.yml
+++ b/.github/workflows/ci-review-trigger.yml
@@ -73,7 +73,7 @@ jobs:
           private_key: ${{ secrets.GH_APP_DATADOG_VECTOR_CI_APP_PRIVATE_KEY }}
       - name: Get PR review author
         id: comment
-        uses: tspascoal/get-user-teams-membership@v3
+        uses: tspascoal/get-user-teams-membership@57e9f42acd78f4d0f496b3be4368fc5f62696662 # v3.0.0
         with:
           username: ${{ github.actor }}
           team: 'Vector'
diff --git a/.github/workflows/cli.yml b/.github/workflows/cli.yml
index e2833e17a027c..6f6a6f379a8ac 100644
--- a/.github/workflows/cli.yml
+++ b/.github/workflows/cli.yml
@@ -15,7 +15,7 @@ jobs:
     steps:
       - name: (PR review) Set latest commit status as pending
         if: ${{ github.event_name == 'pull_request_review' }}
-        uses: myrotvorets/set-commit-status-action@v2.0.1
+        uses: myrotvorets/set-commit-status-action@3730c0a348a2ace3c110851bed53331bc6406e9f # v2.0.1
         with:
           sha: ${{ github.event.review.commit_id }}
           token: ${{ secrets.GITHUB_TOKEN }}
@@ -24,16 +24,16 @@ jobs:
 
       - name: (PR review) Checkout review SHA
         if: ${{ github.event_name == 'pull_request_review' }}
-        uses: actions/checkout@v4
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           ref: ${{ github.event.review.commit_id }}
 
       - name: Checkout branch
         if: ${{ github.event_name != 'pull_request_review' }}
-        uses: actions/checkout@v4
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
       - name: Cache Cargo registry + index
-        uses: actions/cache@v4
+        uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
         with:
           path: |
             ~/.cargo/bin/
@@ -53,7 +53,7 @@ jobs:
         if: always()
 
       - name: (PR review) Set latest commit status as ${{ job.status }}
-        uses: myrotvorets/set-commit-status-action@v2.0.1
+        uses: myrotvorets/set-commit-status-action@3730c0a348a2ace3c110851bed53331bc6406e9f # v2.0.1
         if: always() && github.event_name == 'pull_request_review'
         with:
           sha: ${{ github.event.review.commit_id }}
diff --git a/.github/workflows/compilation-timings.yml b/.github/workflows/compilation-timings.yml
index 4b0bfe5745ca0..9ee4f96c88a0e 100644
--- a/.github/workflows/compilation-timings.yml
+++ b/.github/workflows/compilation-timings.yml
@@ -15,8 +15,8 @@ jobs:
     name: "Release Build (optimized)"
     runs-on: ubuntu-24.04-8core
     steps:
-      - uses: colpal/actions-clean@v1
-      - uses: actions/checkout@v4
+      - uses: colpal/actions-clean@36e6ca1abd35efe61cb60f912bd7837f67887c8a # v1.1.1
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - run: sudo -E bash scripts/environment/bootstrap-ubuntu-24.04.sh
       - run: bash scripts/environment/prepare.sh
       - run: cargo clean
@@ -31,8 +31,8 @@ jobs:
       # with full LTO / single codegen unit.
       PROFILE: debug
     steps:
-      - uses: colpal/actions-clean@v1
-      - uses: actions/checkout@v4
+      - uses: colpal/actions-clean@36e6ca1abd35efe61cb60f912bd7837f67887c8a # v1.1.1
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - run: sudo -E bash scripts/environment/bootstrap-ubuntu-24.04.sh
       - run: bash scripts/environment/prepare.sh
       - run: cargo clean
@@ -42,8 +42,8 @@ jobs:
     name: "Debug Build"
     runs-on: ubuntu-24.04-8core
     steps:
-      - uses: colpal/actions-clean@v1
-      - uses: actions/checkout@v4
+      - uses: colpal/actions-clean@36e6ca1abd35efe61cb60f912bd7837f67887c8a # v1.1.1
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - run: sudo -E bash scripts/environment/bootstrap-ubuntu-24.04.sh
       - run: bash scripts/environment/prepare.sh
       - run: cargo clean
@@ -53,8 +53,8 @@ jobs:
     name: "Debug Rebuild"
     runs-on: ubuntu-24.04-8core
     steps:
-      - uses: colpal/actions-clean@v1
-      - uses: actions/checkout@v4
+      - uses: colpal/actions-clean@36e6ca1abd35efe61cb60f912bd7837f67887c8a # v1.1.1
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - run: sudo -E bash scripts/environment/bootstrap-ubuntu-24.04.sh
       - run: bash scripts/environment/prepare.sh
       - run: cargo clean
@@ -66,8 +66,8 @@ jobs:
     name: "Cargo Check"
     runs-on: ubuntu-24.04-8core
     steps:
-      - uses: colpal/actions-clean@v1
-      - uses: actions/checkout@v4
+      - uses: colpal/actions-clean@36e6ca1abd35efe61cb60f912bd7837f67887c8a # v1.1.1
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - run: sudo -E bash scripts/environment/bootstrap-ubuntu-24.04.sh
       - run: bash scripts/environment/prepare.sh
       - run: cargo clean
diff --git a/.github/workflows/component_features.yml b/.github/workflows/component_features.yml
index 6af5c66dd2f68..6be75594fb284 100644
--- a/.github/workflows/component_features.yml
+++ b/.github/workflows/component_features.yml
@@ -27,7 +27,7 @@ jobs:
     steps:
       - name: (PR review) Set latest commit status as pending
         if: github.event_name == 'pull_request_review'
-        uses: myrotvorets/set-commit-status-action@v2.0.1
+        uses: myrotvorets/set-commit-status-action@3730c0a348a2ace3c110851bed53331bc6406e9f # v2.0.1
         with:
           sha: ${{ github.event.review.commit_id }}
           token: ${{ secrets.GITHUB_TOKEN }}
@@ -36,13 +36,13 @@ jobs:
 
       - name: (PR review) Checkout PR branch
         if: github.event_name == 'pull_request_review'
-        uses: actions/checkout@v4
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           ref: ${{ github.event.review.commit_id }}
 
       - name: Checkout branch
         if: github.event_name != 'pull_request_review'
-        uses: actions/checkout@v4
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
       - run: sudo -E bash scripts/environment/bootstrap-ubuntu-24.04.sh
       - run: bash scripts/environment/prepare.sh
@@ -51,7 +51,7 @@ jobs:
 
       - name: (PR review) Set latest commit status as ${{ job.status }}
         if: always() && github.event_name == 'pull_request_review'
-        uses: myrotvorets/set-commit-status-action@v2.0.1
+        uses: myrotvorets/set-commit-status-action@3730c0a348a2ace3c110851bed53331bc6406e9f # v2.0.1
         with:
           sha: ${{ github.event.review.commit_id }}
           token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/create_preview_sites.yml b/.github/workflows/create_preview_sites.yml
index cd943c5f4f8be..47ce7bced9f80 100644
--- a/.github/workflows/create_preview_sites.yml
+++ b/.github/workflows/create_preview_sites.yml
@@ -35,7 +35,7 @@ jobs:
     steps:
       # Get the artifacts with the PR number and branch name
       - name: Download artifact
-        uses: actions/github-script@v7.0.1
+        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
         with:
           script: |
             const fs = require('fs');
@@ -55,7 +55,7 @@ jobs:
 
       # Extract the info from the artifact and set variables
       - name: Extract PR info from artifact
-        uses: actions/github-script@v7.0.1
+        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
         with:
           script: |
             const fs = require('fs');
@@ -82,7 +82,7 @@ jobs:
 
       # Validate the integrity of the artifact
       - name: Validate Artifact Integrity
-        uses: actions/github-script@v7.0.1
+        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
         with:
           script: |
             const crypto = require('crypto');
@@ -101,7 +101,7 @@ jobs:
 
       # Kick off the job in amplify
       - name: Deploy Site
-        uses: actions/github-script@v7.0.1
+        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
         env:
           APP_ID: ${{ inputs.APP_ID }}
           APP_NAME: ${{ inputs.APP_NAME }}
@@ -168,7 +168,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           APP_ID: ${{ inputs.APP_ID }}
           APP_NAME: ${{ inputs.APP_NAME }}
-        uses: actions/github-script@v7.0.1
+        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
         with:
           script: |
             const fs = require('fs');
diff --git a/.github/workflows/cross.yml b/.github/workflows/cross.yml
index fed5655fa1b61..77d88f5bea906 100644
--- a/.github/workflows/cross.yml
+++ b/.github/workflows/cross.yml
@@ -27,7 +27,7 @@ jobs:
     steps:
       - name: (PR review) Set latest commit status as pending
         if: ${{ github.event_name == 'pull_request_review' }}
-        uses: myrotvorets/set-commit-status-action@v2.0.1
+        uses: myrotvorets/set-commit-status-action@3730c0a348a2ace3c110851bed53331bc6406e9f # v2.0.1
         with:
           sha: ${{ github.event.review.commit_id }}
           token: ${{ secrets.GITHUB_TOKEN }}
@@ -36,15 +36,15 @@ jobs:
 
       - name: (PR review) Checkout PR branch
         if: ${{ github.event_name == 'pull_request_review' }}
-        uses: actions/checkout@v4
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           ref: ${{ github.event.review.commit_id }}
 
       - name: Checkout branch
         if: ${{ github.event_name != 'pull_request_review' }}
-        uses: actions/checkout@v4
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
-      - uses: actions/cache@v4
+      - uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
         name: Cache Cargo registry + index
         with:
           path: |
@@ -64,13 +64,13 @@ jobs:
       # aarch64 and musl in particular are notoriously hard to link.
       # While it may be tempting to slot a `check` in here for quickness, please don't.
       - run: make cross-build-${{ matrix.target }}
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
         with:
           name: "vector-debug-${{ matrix.target }}"
           path: "./target/${{ matrix.target }}/debug/vector"
 
       - name: (PR review) Set latest commit status as failed
-        uses: myrotvorets/set-commit-status-action@v2.0.1
+        uses: myrotvorets/set-commit-status-action@3730c0a348a2ace3c110851bed53331bc6406e9f # v2.0.1
         if: failure() && github.event_name == 'pull_request_review'
         with:
           sha: ${{ steps.comment-branch.outputs.head_sha }}
@@ -86,7 +86,7 @@ jobs:
     if: needs.cross-linux.result == 'success' && github.event_name == 'pull_request_review'
     steps:
       - name: (PR review) Submit PR result as success
-        uses: myrotvorets/set-commit-status-action@v2.0.1
+        uses: myrotvorets/set-commit-status-action@3730c0a348a2ace3c110851bed53331bc6406e9f # v2.0.1
         with:
           sha: ${{ github.event.review.commit_id }}
           token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/deny.yml b/.github/workflows/deny.yml
index 287a1c05e8441..29d59a4c444ac 100644
--- a/.github/workflows/deny.yml
+++ b/.github/workflows/deny.yml
@@ -28,7 +28,7 @@ jobs:
     steps:
       - name: (PR review) Set latest commit status as pending
         if: ${{ github.event_name == 'pull_request_review' }}
-        uses: myrotvorets/set-commit-status-action@v2.0.1
+        uses: myrotvorets/set-commit-status-action@3730c0a348a2ace3c110851bed53331bc6406e9f # v2.0.1
         with:
           sha: ${{ github.event.review.commit_id }}
           token: ${{ secrets.GITHUB_TOKEN }}
@@ -37,15 +37,15 @@ jobs:
 
       - name: (PR review) Checkout PR branch
         if: ${{ github.event_name == 'pull_request_review' }}
-        uses: actions/checkout@v4
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           ref: ${{ github.event.review.commit_id }}
 
       - name: Checkout branch
         if: ${{ github.event_name != 'pull_request_review' }}
-        uses: actions/checkout@v4
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
-      - uses: actions/cache@v4
+      - uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
         name: Cache Cargo registry + index
         with:
           path: |
@@ -64,7 +64,7 @@ jobs:
         run: make check-deny
 
       - name: (PR review) Set latest commit status as ${{ job.status }}
-        uses: myrotvorets/set-commit-status-action@v2.0.1
+        uses: myrotvorets/set-commit-status-action@3730c0a348a2ace3c110851bed53331bc6406e9f # v2.0.1
         if: always() && github.event_name == 'pull_request_review'
         with:
           sha: ${{ github.event.review.commit_id }}
diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
index a002fd583e69e..4a1be700dfb4a 100644
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -59,7 +59,7 @@ jobs:
       needs.changes.outputs.e2e-datadog-metrics == 'true'
       )
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           submodules: "recursive"
 
@@ -81,7 +81,7 @@ jobs:
       - if: (github.event_name == 'schedule' || needs.changes.outputs.e2e-datadog-logs == 'true') &&
           (github.event_name != 'pull_request' || env.PR_HAS_ACCESS_TO_SECRETS == 'true')
         name: e2e-datadog-logs
-        uses: nick-fields/retry@v3
+        uses: nick-fields/retry@ce71cc2ab81d554ebbe88c79ab5975992d79ba08 # v3.0.2
         with:
           timeout_minutes: 35
           max_attempts: 3
@@ -90,7 +90,7 @@ jobs:
       - if: (github.event_name == 'schedule' || needs.changes.outputs.e2e-datadog-metrics == 'true') &&
           (github.event_name != 'pull_request' || env.PR_HAS_ACCESS_TO_SECRETS == 'true')
         name: e2e-datadog-metrics
-        uses: nick-fields/retry@v3
+        uses: nick-fields/retry@ce71cc2ab81d554ebbe88c79ab5975992d79ba08 # v3.0.2
         with:
           timeout_minutes: 35
           max_attempts: 3
diff --git a/.github/workflows/environment.yml b/.github/workflows/environment.yml
index 21be3a8dcab05..383edd1d984e9 100644
--- a/.github/workflows/environment.yml
+++ b/.github/workflows/environment.yml
@@ -21,7 +21,7 @@ jobs:
     steps:
       - name: (PR review) Set latest commit status as pending
         if: ${{ github.event_name == 'pull_request_review' }}
-        uses: myrotvorets/set-commit-status-action@v2.0.1
+        uses: myrotvorets/set-commit-status-action@3730c0a348a2ace3c110851bed53331bc6406e9f # v2.0.1
         with:
           sha: ${{ github.event.review.commit_id }}
           token: ${{ secrets.GITHUB_TOKEN }}
@@ -30,20 +30,20 @@ jobs:
 
       - name: (PR review) Checkout PR branch
         if: ${{ github.event_name == 'pull_request_review' }}
-        uses: actions/checkout@v4
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           ref: ${{ github.event.review.commit_id }}
 
       - name: Checkout branch
         if: ${{ github.event_name != 'pull_request_review' }}
-        uses: actions/checkout@v4
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3.6.0
+        uses: docker/setup-qemu-action@29109295f81e9208d7d86ff1c6c12d2833863392 # v3.6.0
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3.11.1
+        uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3.11.1
       - name: Login to DockerHub
-        uses: docker/login-action@v3
+        uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
         if: github.ref == 'refs/heads/master'
         with:
           username: ${{ secrets.CI_DOCKER_USERNAME }}
@@ -62,7 +62,7 @@ jobs:
             org.opencontainers.image.title=Vector development environment
             org.opencontainers.image.url=https://github.com/vectordotdev/vector
       - name: Build and push
-        uses: docker/build-push-action@v6.18.0
+        uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6.18.0
         with:
           context: .
           file: ./scripts/environment/Dockerfile
@@ -71,7 +71,7 @@ jobs:
           labels: ${{ steps.meta.outputs.labels }}
 
       - name: (PR review) Set latest commit status as ${{ job.status }}
-        uses: myrotvorets/set-commit-status-action@v2.0.1
+        uses: myrotvorets/set-commit-status-action@3730c0a348a2ace3c110851bed53331bc6406e9f # v2.0.1
         if: always() && github.event_name == 'pull_request_review'
         with:
           sha: ${{ github.event.review.commit_id }}
diff --git a/.github/workflows/gardener_issue_comment.yml b/.github/workflows/gardener_issue_comment.yml
index 1e38590b7ca7d..b9936a1edecc4 100644
--- a/.github/workflows/gardener_issue_comment.yml
+++ b/.github/workflows/gardener_issue_comment.yml
@@ -26,7 +26,7 @@ jobs:
 
       - name: Get PR comment author
         id: comment
-        uses: tspascoal/get-user-teams-membership@v3
+        uses: tspascoal/get-user-teams-membership@57e9f42acd78f4d0f496b3be4368fc5f62696662 # v3.0.0
         with:
           username: ${{ github.actor }}
           team: 'Vector'
diff --git a/.github/workflows/gardener_open_issue.yml b/.github/workflows/gardener_open_issue.yml
index 303e8d5147fce..c8ba082d3ed63 100644
--- a/.github/workflows/gardener_open_issue.yml
+++ b/.github/workflows/gardener_open_issue.yml
@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-24.04
     timeout-minutes: 5
     steps:
-      - uses: actions/add-to-project@v1.0.2
+      - uses: actions/add-to-project@244f685bbc3b7adfa8466e08b698b5577571133e # v1.0.2
         with:
           project-url: https://github.com/orgs/vectordotdev/projects/49
           github-token: ${{ secrets.GH_PROJECT_PAT }}
diff --git a/.github/workflows/gardener_open_pr.yml b/.github/workflows/gardener_open_pr.yml
index c299c9318a42a..873c9da7e26ba 100644
--- a/.github/workflows/gardener_open_pr.yml
+++ b/.github/workflows/gardener_open_pr.yml
@@ -20,13 +20,13 @@ jobs:
         with:
           app_id: ${{ secrets.GH_APP_DATADOG_VECTOR_CI_APP_ID }}
           private_key: ${{ secrets.GH_APP_DATADOG_VECTOR_CI_APP_PRIVATE_KEY }}
-      - uses: tspascoal/get-user-teams-membership@v3
+      - uses: tspascoal/get-user-teams-membership@57e9f42acd78f4d0f496b3be4368fc5f62696662 # v3.0.0
         id: checkVectorMember
         with:
           username: ${{ github.actor }}
           team: vector
           GITHUB_TOKEN: ${{ steps.generate_token.outputs.token }}
-      - uses: actions/add-to-project@v1.0.2
+      - uses: actions/add-to-project@244f685bbc3b7adfa8466e08b698b5577571133e # v1.0.2
         if: ${{ steps.checkVectorMember.outputs.isTeamMember == 'false' }}
         with:
           project-url: https://github.com/orgs/vectordotdev/projects/49
@@ -37,7 +37,7 @@ jobs:
     timeout-minutes: 5
     if: ${{ github.actor == 'dependabot[bot]' }}
     steps:
-      - uses: actions/add-to-project@v1.0.2
+      - uses: actions/add-to-project@244f685bbc3b7adfa8466e08b698b5577571133e # v1.0.2
         with:
           project-url: https://github.com/orgs/vectordotdev/projects/49
           github-token: ${{ secrets.GH_PROJECT_PAT }}
diff --git a/.github/workflows/gardener_remove_waiting_author.yml b/.github/workflows/gardener_remove_waiting_author.yml
index 2bcea4ec86e67..9a739fb2bf6b9 100644
--- a/.github/workflows/gardener_remove_waiting_author.yml
+++ b/.github/workflows/gardener_remove_waiting_author.yml
@@ -16,8 +16,8 @@ jobs:
     runs-on: ubuntu-24.04
     timeout-minutes: 5
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions-ecosystem/action-remove-labels@v1
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - uses: actions-ecosystem/action-remove-labels@2ce5d41b4b6aa8503e285553f75ed56e0a40bae0 # v1.3.0
         with:
           labels: "meta: awaiting author"
           fail_on_error: true
diff --git a/.github/workflows/install-sh.yml b/.github/workflows/install-sh.yml
index 431ae1243fb1e..bc06f366026c9 100644
--- a/.github/workflows/install-sh.yml
+++ b/.github/workflows/install-sh.yml
@@ -14,12 +14,12 @@ jobs:
     steps:
       - name: (PR comment) Get PR branch
         if: ${{ github.event_name == 'issue_comment' }}
-        uses: xt0rted/pull-request-comment-branch@v3
+        uses: xt0rted/pull-request-comment-branch@e8b8daa837e8ea7331c0003c9c316a64c6d8b0b1 # v3.0.0
         id: comment-branch
 
       - name: (PR comment) Set latest commit status as pending
         if: ${{ github.event_name == 'issue_comment' }}
-        uses: myrotvorets/set-commit-status-action@v2.0.1
+        uses: myrotvorets/set-commit-status-action@3730c0a348a2ace3c110851bed53331bc6406e9f # v2.0.1
         with:
           sha: ${{ steps.comment-branch.outputs.head_sha }}
           token: ${{ secrets.GITHUB_TOKEN }}
@@ -28,13 +28,13 @@ jobs:
 
       - name: (PR comment) Checkout PR branch
         if: ${{ github.event_name == 'issue_comment' }}
-        uses: actions/checkout@v4
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           ref: ${{ steps.comment-branch.outputs.head_ref }}
 
       - name: Checkout branch
         if: ${{ github.event_name != 'issue_comment' }}
-        uses: actions/checkout@v4
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
       - run: sudo apt-get install --yes bc
       - run: bash distribution/install.sh -- -y
@@ -42,7 +42,7 @@ jobs:
 
       - name: (PR comment) Set latest commit status as ${{ job.status }}
         if: github.event_name == 'issue_comment'
-        uses: myrotvorets/set-commit-status-action@v2.0.1
+        uses: myrotvorets/set-commit-status-action@3730c0a348a2ace3c110851bed53331bc6406e9f # v2.0.1
         with:
           sha: ${{ steps.comment-branch.outputs.head_sha }}
           token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/integration-test.yml b/.github/workflows/integration-test.yml
index 5b966e0383e4a..795114916cf0c 100644
--- a/.github/workflows/integration-test.yml
+++ b/.github/workflows/integration-test.yml
@@ -34,18 +34,18 @@ jobs:
     steps:
       - name: (PR comment) Get PR branch
         if: ${{ github.event_name == 'issue_comment' }}
-        uses: xt0rted/pull-request-comment-branch@v3
+        uses: xt0rted/pull-request-comment-branch@e8b8daa837e8ea7331c0003c9c316a64c6d8b0b1 # v3.0.0
         id: comment-branch
 
       - name: (PR comment) Checkout PR branch
         if: ${{ github.event_name == 'issue_comment' }}
-        uses: actions/checkout@v4
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           ref: ${{ steps.comment-branch.outputs.head_ref }}
 
       - name: Checkout branch
         if: ${{ github.event_name != 'issue_comment' }}
-        uses: actions/checkout@v4
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
       - run: sudo npm -g install @datadog/datadog-ci
 
diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
index 1d3ff68e8bf93..4fafaba6fd42d 100644
--- a/.github/workflows/integration.yml
+++ b/.github/workflows/integration.yml
@@ -47,7 +47,7 @@ jobs:
     outputs:
       can_access_secrets: ${{ steps.secret_check.outputs.can_access_secrets }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
       - name: Determine if secrets are defined (PR author is team member)
         id: secret_check
@@ -79,18 +79,18 @@ jobs:
         ]
     timeout-minutes: 90
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           submodules: "recursive"
 
       - name: Download JSON artifact from changes.yml
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
         if: github.event_name == 'pull_request' || github.event_name == 'merge_group'
         with:
           name: int_tests_changes
 
       - name: Run Integration Tests for ${{ matrix.service }}
-        uses: nick-fields/retry@v3
+        uses: nick-fields/retry@ce71cc2ab81d554ebbe88c79ab5975992d79ba08 # v3.0.2
         with:
           timeout_minutes: 30
           max_attempts: 3
diff --git a/.github/workflows/k8s_e2e.yml b/.github/workflows/k8s_e2e.yml
index 2e817b547ce74..67dc56822eb03 100644
--- a/.github/workflows/k8s_e2e.yml
+++ b/.github/workflows/k8s_e2e.yml
@@ -70,7 +70,7 @@ jobs:
     steps:
       - name: (PR review) Set latest commit status as pending
         if: ${{ github.event_name == 'pull_request_review' }}
-        uses: myrotvorets/set-commit-status-action@v2.0.1
+        uses: myrotvorets/set-commit-status-action@3730c0a348a2ace3c110851bed53331bc6406e9f # v2.0.1
         with:
           sha: ${{ github.event.review.commit_id }}
           token: ${{ secrets.GITHUB_TOKEN }}
@@ -78,15 +78,15 @@ jobs:
 
       - name: (PR review) Checkout PR branch
         if: ${{ github.event_name == 'pull_request_review' }}
-        uses: actions/checkout@v4
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           ref: ${{ github.event.review.commit_id }}
 
       - name: Checkout branch
         if: ${{ github.event_name != 'pull_request_review' }}
-        uses: actions/checkout@v4
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
-      - uses: actions/cache@v4
+      - uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
         with:
           path: |
             ~/.cargo/registry
@@ -100,13 +100,13 @@ jobs:
       - run: echo "::add-matcher::.github/matchers/rust.json"
       - run: VECTOR_VERSION="$(cargo vdev version)" make package-deb-x86_64-unknown-linux-gnu
 
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
         with:
           name: e2e-test-deb-package
           path: target/artifacts/*
 
       - name: (PR review) Set latest commit status as 'failure'
-        uses: myrotvorets/set-commit-status-action@v2.0.1
+        uses: myrotvorets/set-commit-status-action@3730c0a348a2ace3c110851bed53331bc6406e9f # v2.0.1
         if: failure() && github.event_name == 'pull_request_review'
         with:
           sha: ${{ github.event.review.commit_id }}
@@ -129,7 +129,7 @@ jobs:
     outputs:
       matrix: ${{ steps.set-matrix.outputs.matrix }}
     steps:
-      - uses: actions/github-script@v7.0.1
+      - uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
         id: set-matrix
         with:
           script: |
@@ -189,20 +189,20 @@ jobs:
     steps:
       - name: (PR review) Get PR branch
         if: ${{ github.event_name == 'pull_request_review' }}
-        uses: xt0rted/pull-request-comment-branch@v3
+        uses: xt0rted/pull-request-comment-branch@e8b8daa837e8ea7331c0003c9c316a64c6d8b0b1 # v3.0.0
         id: comment-branch
 
       - name: (PR review) Checkout PR branch
         if: ${{ github.event_name == 'pull_request_review' }}
-        uses: actions/checkout@v4
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           ref: ${{ steps.comment-branch.outputs.head_ref }}
 
       - name: Checkout branch
         if: ${{ github.event_name != 'pull_request_review' }}
-        uses: actions/checkout@v4
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
-      - uses: actions/download-artifact@v4
+      - uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
         with:
           name: e2e-test-deb-package
           path: target/artifacts
@@ -216,7 +216,7 @@ jobs:
 
       # TODO: This job has been quite flakey. Need to investigate further and then remove the retries.
       - name: Run tests
-        uses: nick-fields/retry@v3
+        uses: nick-fields/retry@ce71cc2ab81d554ebbe88c79ab5975992d79ba08 # v3.0.2
         env:
           USE_MINIKUBE_CACHE: "true"
           SKIP_PACKAGE_DEB: "true"
@@ -227,7 +227,7 @@ jobs:
           command: make test-e2e-kubernetes
 
       - name: (PR review) Set latest commit status as failure
-        uses: myrotvorets/set-commit-status-action@v2.0.1
+        uses: myrotvorets/set-commit-status-action@3730c0a348a2ace3c110851bed53331bc6406e9f # v2.0.1
         if: failure() && github.event_name == 'pull_request_review'
         with:
           sha: ${{ github.event.review.commit_id }}
@@ -249,12 +249,12 @@ jobs:
     steps:
       - name: (PR review) Get PR branch
         if: github.event_name == 'pull_request_review' && env.FAILED != 'true'
-        uses: xt0rted/pull-request-comment-branch@v3
+        uses: xt0rted/pull-request-comment-branch@e8b8daa837e8ea7331c0003c9c316a64c6d8b0b1 # v3.0.0
         id: comment-branch
 
       - name: (PR review) Submit PR result as success
         if: github.event_name == 'pull_request_review' && env.FAILED != 'true'
-        uses: myrotvorets/set-commit-status-action@v2.0.1
+        uses: myrotvorets/set-commit-status-action@3730c0a348a2ace3c110851bed53331bc6406e9f # v2.0.1
         with:
           sha: ${{ github.event.review.commit_id }}
           token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml
index a230b8569a94b..44171cc3746d7 100644
--- a/.github/workflows/labeler.yml
+++ b/.github/workflows/labeler.yml
@@ -10,7 +10,7 @@ jobs:
       contents: read
       pull-requests: write
     steps:
-    - uses: actions/labeler@v5
+    - uses: actions/labeler@8558fd74291d67161a8a78ce36a881fa63b766a9 # v5.0.0
       with:
         repo-token: "${{ secrets.GITHUB_TOKEN }}"
         sync-labels: true
diff --git a/.github/workflows/misc.yml b/.github/workflows/misc.yml
index 6af0fca39b788..db607b1ff38fa 100644
--- a/.github/workflows/misc.yml
+++ b/.github/workflows/misc.yml
@@ -15,7 +15,7 @@ jobs:
     steps:
       - name: (PR review) Set latest commit status as pending
         if: ${{ github.event_name == 'pull_request_review' }}
-        uses: myrotvorets/set-commit-status-action@v2.0.1
+        uses: myrotvorets/set-commit-status-action@3730c0a348a2ace3c110851bed53331bc6406e9f # v2.0.1
         with:
           sha: ${{ github.event.review.commit_id }}
           token: ${{ secrets.GITHUB_TOKEN }}
@@ -24,15 +24,15 @@ jobs:
 
       - name: (PR review) Checkout review SHA
         if: ${{ github.event_name == 'pull_request_review' }}
-        uses: actions/checkout@v4
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           ref: ${{ github.event.review.commit_id }}
 
       - name: Checkout branch
         if: ${{ github.event_name != 'pull_request_review' }}
-        uses: actions/checkout@v4
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
-      - uses: actions/cache@v4
+      - uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
         name: Cache Cargo registry + index
         with:
           path: |
@@ -53,7 +53,7 @@ jobs:
       - run: make test-docs
 
       - name: (PR review) Set latest commit status as ${{ job.status }}
-        uses: myrotvorets/set-commit-status-action@v2.0.1
+        uses: myrotvorets/set-commit-status-action@3730c0a348a2ace3c110851bed53331bc6406e9f # v2.0.1
         if: always() && github.event_name == 'pull_request_review'
         with:
           sha: ${{ github.event.review.commit_id }}
diff --git a/.github/workflows/msrv.yml b/.github/workflows/msrv.yml
index 2fb7ea43bf966..c823433437cc6 100644
--- a/.github/workflows/msrv.yml
+++ b/.github/workflows/msrv.yml
@@ -22,7 +22,7 @@ jobs:
     runs-on: ubuntu-24.04
     timeout-minutes: 20
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           ref: ${{ inputs.checkout_ref }}
       - run: sudo -E bash scripts/environment/bootstrap-ubuntu-24.04.sh
diff --git a/.github/workflows/preview_site_trigger.yml b/.github/workflows/preview_site_trigger.yml
index 9bae486e39849..ba57d8d6e875f 100644
--- a/.github/workflows/preview_site_trigger.yml
+++ b/.github/workflows/preview_site_trigger.yml
@@ -15,7 +15,7 @@ jobs:
 
       # Use GitHub Action to safely validate and store PR information
       - name: Validate and save PR information
-        uses: actions/github-script@v7.0.1
+        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
         with:
           script: |
             const fs = require('fs').promises;
@@ -63,7 +63,7 @@ jobs:
 
       # Upload the artifact using latest version
       - name: Upload PR information artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
         with:
           name: pr
           path: pr/
diff --git a/.github/workflows/protobuf.yml b/.github/workflows/protobuf.yml
index 6cb6e84dd0203..836c0f19b29dc 100644
--- a/.github/workflows/protobuf.yml
+++ b/.github/workflows/protobuf.yml
@@ -22,12 +22,12 @@ jobs:
     timeout-minutes: 5
     steps:
       # Run `git checkout`
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       # Install the `buf` CLI
-      - uses: bufbuild/buf-setup-action@v1.50.0
+      - uses: bufbuild/buf-setup-action@a47c93e0b1648d5651a065437926377d060baa99 # v1.50.0
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
       # Perform breaking change detection against the `master` branch
-      - uses: bufbuild/buf-breaking-action@v1.1.4
+      - uses: bufbuild/buf-breaking-action@c57b3d842a5c3f3b454756ef65305a50a587c5ba # v1.1.4
         with:
           against: "https://github.com/vectordotdev/vector.git#branch=master"
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index eed3cb1bac7ea..9e36dd69ef989 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -40,7 +40,7 @@ jobs:
       vector_release_channel: ${{ steps.generate-publish-metadata.outputs.vector_release_channel }}
     steps:
       - name: Checkout Vector
-        uses: actions/checkout@v4
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           ref: ${{ inputs.git_ref }}
       - name: Generate publish metadata
@@ -58,7 +58,7 @@ jobs:
       CHANNEL: ${{ needs.generate-publish-metadata.outputs.vector_release_channel }}
     steps:
       - name: Checkout Vector
-        uses: actions/checkout@v4
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           ref: ${{ inputs.git_ref }}
       - name: Bootstrap runner environment (Ubuntu-specific)
@@ -68,7 +68,7 @@ jobs:
       - name: Build Vector
         run: make package-x86_64-unknown-linux-musl-all
       - name: Stage package artifacts for publish
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
         with:
           name: vector-${{ env.VECTOR_VERSION }}-x86_64-unknown-linux-musl
           path: target/artifacts/vector*
@@ -84,7 +84,7 @@ jobs:
       CHANNEL: ${{ needs.generate-publish-metadata.outputs.vector_release_channel }}
     steps:
       - name: Checkout Vector
-        uses: actions/checkout@v4
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           ref: ${{ inputs.git_ref }}
       - name: Bootstrap runner environment (Ubuntu-specific)
@@ -94,7 +94,7 @@ jobs:
       - name: Build Vector
         run: make package-x86_64-unknown-linux-gnu-all
       - name: Stage package artifacts for publish
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
         with:
           name: vector-${{ env.VECTOR_VERSION }}-x86_64-unknown-linux-gnu
           path: target/artifacts/vector*
@@ -110,7 +110,7 @@ jobs:
       CHANNEL: ${{ needs.generate-publish-metadata.outputs.vector_release_channel }}
     steps:
       - name: Checkout Vector
-        uses: actions/checkout@v4
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           ref: ${{ inputs.git_ref }}
       - name: Bootstrap runner environment (Ubuntu-specific)
@@ -122,7 +122,7 @@ jobs:
           DOCKER_PRIVILEGED: "true"
         run: make package-aarch64-unknown-linux-musl-all
       - name: Stage package artifacts for publish
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
         with:
           name: vector-${{ env.VECTOR_VERSION }}-aarch64-unknown-linux-musl
           path: target/artifacts/vector*
@@ -138,7 +138,7 @@ jobs:
       CHANNEL: ${{ needs.generate-publish-metadata.outputs.vector_release_channel }}
     steps:
       - name: Checkout Vector
-        uses: actions/checkout@v4
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           ref: ${{ inputs.git_ref }}
       - name: Bootstrap runner environment (Ubuntu-specific)
@@ -150,7 +150,7 @@ jobs:
           DOCKER_PRIVILEGED: "true"
         run: make package-aarch64-unknown-linux-gnu-all
       - name: Stage package artifacts for publish
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
         with:
           name: vector-${{ env.VECTOR_VERSION }}-aarch64-unknown-linux-gnu
           path: target/artifacts/vector*
@@ -166,7 +166,7 @@ jobs:
       CHANNEL: ${{ needs.generate-publish-metadata.outputs.vector_release_channel }}
     steps:
       - name: Checkout Vector
-        uses: actions/checkout@v4
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           ref: ${{ inputs.git_ref }}
       - name: Bootstrap runner environment (Ubuntu-specific)
@@ -178,7 +178,7 @@ jobs:
           DOCKER_PRIVILEGED: "true"
         run: make package-armv7-unknown-linux-gnueabihf-all
       - name: Stage package artifacts for publish
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
         with:
           name: vector-${{ env.VECTOR_VERSION }}-armv7-unknown-linux-gnueabihf
           path: target/artifacts/vector*
@@ -194,7 +194,7 @@ jobs:
       CHANNEL: ${{ needs.generate-publish-metadata.outputs.vector_release_channel }}
     steps:
       - name: Checkout Vector
-        uses: actions/checkout@v4
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           ref: ${{ inputs.git_ref }}
       - name: Bootstrap runner environment (Ubuntu-specific)
@@ -206,7 +206,7 @@ jobs:
           DOCKER_PRIVILEGED: "true"
         run: make package-armv7-unknown-linux-musleabihf
       - name: Stage package artifacts for publish
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
         with:
           name: vector-${{ env.VECTOR_VERSION }}-armv7-unknown-linux-musleabihf
           path: target/artifacts/vector*
@@ -222,7 +222,7 @@ jobs:
       CHANNEL: ${{ needs.generate-publish-metadata.outputs.vector_release_channel }}
     steps:
       - name: Checkout Vector
-        uses: actions/checkout@v4
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           ref: ${{ inputs.git_ref }}
       - name: Bootstrap runner environment (Ubuntu-specific)
@@ -234,7 +234,7 @@ jobs:
           DOCKER_PRIVILEGED: "true"
         run: make package-arm-unknown-linux-gnueabi-all
       - name: Stage package artifacts for publish
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
         with:
           name: vector-${{ env.VECTOR_VERSION }}-arm-unknown-linux-gnueabi
           path: target/artifacts/vector*
@@ -249,7 +249,7 @@ jobs:
       CHANNEL: ${{ needs.generate-publish-metadata.outputs.vector_release_channel }}
     steps:
       - name: Checkout Vector
-        uses: actions/checkout@v4
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           ref: ${{ inputs.git_ref }}
       - name: Bootstrap runner environment (Ubuntu-specific)
@@ -261,7 +261,7 @@ jobs:
           DOCKER_PRIVILEGED: "true"
         run: make package-arm-unknown-linux-musleabi
       - name: Stage package artifacts for publish
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
         with:
           name: vector-${{ env.VECTOR_VERSION }}-arm-unknown-linux-musleabi
           path: target/artifacts/vector*
@@ -294,7 +294,7 @@ jobs:
             exit 1
           fi
       - name: Checkout Vector
-        uses: actions/checkout@v4
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           ref: ${{ inputs.git_ref }}
       - name: Bootstrap runner environment (macOS-specific)
@@ -311,7 +311,7 @@ jobs:
           export PATH="$HOME/.cargo/bin:$PATH"
           make package
       - name: Stage package artifacts for publish
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
         with:
           name: vector-${{ env.VECTOR_VERSION }}-${{ matrix.architecture }}-apple-darwin
           path: target/artifacts/vector*
@@ -330,7 +330,7 @@ jobs:
       RELEASE_BUILDER: "true"
     steps:
       - name: Checkout Vector
-        uses: actions/checkout@v4
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           ref: ${{ inputs.git_ref }}
       - name: Bootstrap runner environment (Windows-specific)
@@ -359,7 +359,7 @@ jobs:
           export PATH="/c/wix:$PATH"
           ./scripts/package-msi.sh
       - name: Stage package artifacts for publish
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
         with:
           name: vector-${{ env.VECTOR_VERSION }}-x86_64-pc-windows-msvc
           path: target/artifacts/vector*
@@ -399,11 +399,11 @@ jobs:
       - name: Fix Git safe directories issue when in containers (actions/checkout#760)
         run: git config --global --add safe.directory /__w/vector/vector
       - name: Checkout Vector
-        uses: actions/checkout@v4
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           ref: ${{ inputs.git_ref }}
       - name: Download staged package artifacts (x86_64-unknown-linux-gnu)
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
         with:
           name: vector-${{ env.VECTOR_VERSION }}-x86_64-unknown-linux-gnu
           path: target/artifacts
@@ -450,11 +450,11 @@ jobs:
       - name: Fix Git safe directories issue when in containers (actions/checkout#760)
         run: git config --global --add safe.directory /__w/vector/vector
       - name: Checkout Vector
-        uses: actions/checkout@v4
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           ref: ${{ inputs.git_ref }}
       - name: Download staged package artifacts (x86_64-unknown-linux-gnu)
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
         with:
           name: vector-${{ env.VECTOR_VERSION }}-x86_64-unknown-linux-gnu
           path: target/artifacts
@@ -481,11 +481,11 @@ jobs:
             runner: macos-14
     steps:
       - name: Checkout Vector
-        uses: actions/checkout@v4
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           ref: ${{ inputs.git_ref }}
       - name: Download staged package artifacts (${{ matrix.target }})
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
         with:
           name: vector-${{ env.VECTOR_VERSION }}-${{ matrix.target }}
           path: target/artifacts
@@ -515,67 +515,67 @@ jobs:
       CHANNEL: ${{ needs.generate-publish-metadata.outputs.vector_release_channel }}
     steps:
       - name: Checkout Vector
-        uses: actions/checkout@v4
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           ref: ${{ inputs.git_ref }}
       - name: Login to DockerHub
-        uses: docker/login-action@v3
+        uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
         with:
           username: ${{ secrets.CI_DOCKER_USERNAME }}
           password: ${{ secrets.CI_DOCKER_PASSWORD }}
       - name: Login to GitHub Container Registry
-        uses: docker/login-action@v3
+        uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3.6.0
+        uses: docker/setup-qemu-action@29109295f81e9208d7d86ff1c6c12d2833863392 # v3.6.0
         with:
           platforms: all
       - name: Set up Docker Buildx
         id: buildx
-        uses: docker/setup-buildx-action@v3.11.1
+        uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3.11.1
         with:
           version: latest
           install: true
       - name: Download staged package artifacts (aarch64-unknown-linux-gnu)
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
         with:
           name: vector-${{ env.VECTOR_VERSION }}-aarch64-unknown-linux-gnu
           path: target/artifacts
       - name: Download staged package artifacts (aarch64-unknown-linux-musl)
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
         with:
           name: vector-${{ env.VECTOR_VERSION }}-aarch64-unknown-linux-musl
           path: target/artifacts
       - name: Download staged package artifacts (x86_64-unknown-linux-gnu)
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
         with:
           name: vector-${{ env.VECTOR_VERSION }}-x86_64-unknown-linux-gnu
           path: target/artifacts
       - name: Download staged package artifacts (x86_64-unknown-linux-musl)
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
         with:
           name: vector-${{ env.VECTOR_VERSION }}-x86_64-unknown-linux-musl
           path: target/artifacts
       - name: Download staged package artifacts (armv7-unknown-linux-gnueabihf)
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
         with:
           name: vector-${{ env.VECTOR_VERSION }}-armv7-unknown-linux-gnueabihf
           path: target/artifacts
       - name: Download staged package artifacts (armv7-unknown-linux-musleabihf)
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
         with:
           name: vector-${{ env.VECTOR_VERSION }}-armv7-unknown-linux-musleabihf
           path: target/artifacts
       - name: Download staged package artifacts (arm-unknown-linux-gnueabi)
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
         with:
           name: vector-${{ env.VECTOR_VERSION }}-arm-unknown-linux-gnueabi
           path: target/artifacts
       - name: Download staged package artifacts (arm-unknown-linux-musleabi)
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
         with:
           name: vector-${{ env.VECTOR_VERSION }}-arm-unknown-linux-musleabi
           path: target/artifacts
@@ -583,7 +583,7 @@ jobs:
         env:
           PLATFORM: "linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v6"
           REPOS: "timberio/vector,ghcr.io/vectordotdev/vector"
-        uses: nick-fields/retry@v3
+        uses: nick-fields/retry@ce71cc2ab81d554ebbe88c79ab5975992d79ba08 # v3.0.2
         with:
           timeout_minutes: 15
           max_attempts: 3
@@ -614,61 +614,61 @@ jobs:
       CHANNEL: ${{ needs.generate-publish-metadata.outputs.vector_release_channel }}
     steps:
       - name: Checkout Vector
-        uses: actions/checkout@v4
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           ref: ${{ inputs.git_ref }}
       - name: Download staged package artifacts (aarch64-unknown-linux-gnu)
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
         with:
           name: vector-${{ env.VECTOR_VERSION }}-aarch64-unknown-linux-gnu
           path: target/artifacts
       - name: Download staged package artifacts (aarch64-unknown-linux-musl)
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
         with:
           name: vector-${{ env.VECTOR_VERSION }}-aarch64-unknown-linux-musl
           path: target/artifacts
       - name: Download staged package artifacts (x86_64-unknown-linux-gnu)
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
         with:
           name: vector-${{ env.VECTOR_VERSION }}-x86_64-unknown-linux-gnu
           path: target/artifacts
       - name: Download staged package artifacts (x86_64-unknown-linux-musl)
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
         with:
           name: vector-${{ env.VECTOR_VERSION }}-x86_64-unknown-linux-musl
           path: target/artifacts
       - name: Download staged package artifacts (x86_64-apple-darwin)
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
         with:
           name: vector-${{ env.VECTOR_VERSION }}-x86_64-apple-darwin
           path: target/artifacts
       - name: Download staged package artifacts (arm64-apple-darwin)
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
         with:
           name: vector-${{ env.VECTOR_VERSION }}-arm64-apple-darwin
           path: target/artifacts
       - name: Download staged package artifacts (x86_64-pc-windows-msvc)
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
         with:
           name: vector-${{ env.VECTOR_VERSION }}-x86_64-pc-windows-msvc
           path: target/artifacts
       - name: Download staged package artifacts (armv7-unknown-linux-gnueabihf)
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
         with:
           name: vector-${{ env.VECTOR_VERSION }}-armv7-unknown-linux-gnueabihf
           path: target/artifacts
       - name: Download staged package artifacts (armv7-unknown-linux-musleabihf)
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
         with:
           name: vector-${{ env.VECTOR_VERSION }}-armv7-unknown-linux-musleabihf
           path: target/artifacts
       - name: Download staged package artifacts (arm-unknown-linux-gnueabi)
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
         with:
           name: vector-${{ env.VECTOR_VERSION }}-arm-unknown-linux-gnueabi
           path: target/artifacts
       - name: Download staged package artifacts (arm-unknown-linux-musleabi)
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
         with:
           name: vector-${{ env.VECTOR_VERSION }}-arm-unknown-linux-musleabi
           path: target/artifacts
@@ -704,66 +704,66 @@ jobs:
       VECTOR_VERSION: ${{ needs.generate-publish-metadata.outputs.vector_version }}
     steps:
       - name: Checkout Vector
-        uses: actions/checkout@v4
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           ref: ${{ inputs.git_ref }}
       - name: Download staged package artifacts (aarch64-unknown-linux-gnu)
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
         with:
           name: vector-${{ env.VECTOR_VERSION }}-aarch64-unknown-linux-gnu
           path: target/artifacts
       - name: Download staged package artifacts (aarch64-unknown-linux-musl)
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
         with:
           name: vector-${{ env.VECTOR_VERSION }}-aarch64-unknown-linux-musl
           path: target/artifacts
       - name: Download staged package artifacts (x86_64-unknown-linux-gnu)
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
         with:
           name: vector-${{ env.VECTOR_VERSION }}-x86_64-unknown-linux-gnu
           path: target/artifacts
       - name: Download staged package artifacts (x86_64-unknown-linux-musl)
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
         with:
           name: vector-${{ env.VECTOR_VERSION }}-x86_64-unknown-linux-musl
           path: target/artifacts
       - name: Download staged package artifacts (x86_64-apple-darwin)
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
         with:
           name: vector-${{ env.VECTOR_VERSION }}-x86_64-apple-darwin
           path: target/artifacts
       - name: Download staged package artifacts (arm64-apple-darwin)
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
         with:
           name: vector-${{ env.VECTOR_VERSION }}-arm64-apple-darwin
           path: target/artifacts
       - name: Download staged package artifacts (x86_64-pc-windows-msvc)
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
         with:
           name: vector-${{ env.VECTOR_VERSION }}-x86_64-pc-windows-msvc
           path: target/artifacts
       - name: Download staged package artifacts (armv7-unknown-linux-gnueabihf)
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
         with:
           name: vector-${{ env.VECTOR_VERSION }}-armv7-unknown-linux-gnueabihf
           path: target/artifacts
       - name: Download staged package artifacts (armv7-unknown-linux-musleabihf)
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
         with:
           name: vector-${{ env.VECTOR_VERSION }}-armv7-unknown-linux-musleabihf
           path: target/artifacts
       - name: Download artifact checksums
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
         with:
           name: vector-${{ env.VECTOR_VERSION }}-SHA256SUMS
           path: target/artifacts
       - name: Download staged package artifacts (arm-unknown-linux-gnueabi)
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
         with:
           name: vector-${{ env.VECTOR_VERSION }}-arm-unknown-linux-gnueabi
           path: target/artifacts
       - name: Download staged package artifacts (arm-unknown-linux-musleabi)
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
         with:
           name: vector-${{ env.VECTOR_VERSION }}-arm-unknown-linux-musleabi
           path: target/artifacts
@@ -785,7 +785,7 @@ jobs:
       VECTOR_VERSION: ${{ needs.generate-publish-metadata.outputs.vector_version }}
     steps:
       - name: Checkout Vector
-        uses: actions/checkout@v4
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           ref: ${{ inputs.git_ref }}
       - name: Publish update to Homebrew tap
@@ -813,68 +813,68 @@ jobs:
       VECTOR_VERSION: ${{ needs.generate-publish-metadata.outputs.vector_version }}
     steps:
       - name: Checkout Vector
-        uses: actions/checkout@v4
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           ref: ${{ inputs.git_ref }}
       - name: Download staged package artifacts (aarch64-unknown-linux-gnu)
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
         with:
           name: vector-${{ env.VECTOR_VERSION }}-aarch64-unknown-linux-gnu
           path: target/artifacts
       - name: Download staged package artifacts (aarch64-unknown-linux-musl)
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
         with:
           name: vector-${{ env.VECTOR_VERSION }}-aarch64-unknown-linux-musl
           path: target/artifacts
       - name: Download staged package artifacts (x86_64-unknown-linux-gnu)
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
         with:
           name: vector-${{ env.VECTOR_VERSION }}-x86_64-unknown-linux-gnu
           path: target/artifacts
       - name: Download staged package artifacts (x86_64-unknown-linux-musl)
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
         with:
           name: vector-${{ env.VECTOR_VERSION }}-x86_64-unknown-linux-musl
           path: target/artifacts
       - name: Download staged package artifacts (x86_64-apple-darwin)
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
         with:
           name: vector-${{ env.VECTOR_VERSION }}-x86_64-apple-darwin
           path: target/artifacts
       - name: Download staged package artifacts (arm64-apple-darwin)
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
         with:
           name: vector-${{ env.VECTOR_VERSION }}-arm64-apple-darwin
           path: target/artifacts
       - name: Download staged package artifacts (x86_64-pc-windows-msvc)
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
         with:
           name: vector-${{ env.VECTOR_VERSION }}-x86_64-pc-windows-msvc
           path: target/artifacts
       - name: Download staged package artifacts (armv7-unknown-linux-gnueabihf)
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
         with:
           name: vector-${{ env.VECTOR_VERSION }}-armv7-unknown-linux-gnueabihf
           path: target/artifacts
       - name: Download staged package artifacts (armv7-unknown-linux-musleabihf)
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
         with:
           name: vector-${{ env.VECTOR_VERSION }}-armv7-unknown-linux-musleabihf
           path: target/artifacts
       - name: Download staged package artifacts (arm-unknown-linux-gnueabi)
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
         with:
           name: vector-${{ env.VECTOR_VERSION }}-arm-unknown-linux-gnueabi
           path: target/artifacts
       - name: Download staged package artifacts (arm-unknown-linux-musleabi)
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
         with:
           name: vector-${{ env.VECTOR_VERSION }}-arm-unknown-linux-musleabi
           path: target/artifacts
       - name: Generate SHA256 checksums for artifacts
         run: make sha256sum
       - name: Stage checksum for publish
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
         with:
           name: vector-${{ env.VECTOR_VERSION }}-SHA256SUMS
           path: target/artifacts/vector-${{ env.VECTOR_VERSION }}-SHA256SUMS
diff --git a/.github/workflows/regression.yml b/.github/workflows/regression.yml
index f3960b5caeb19..9a4efea8c62a3 100644
--- a/.github/workflows/regression.yml
+++ b/.github/workflows/regression.yml
@@ -51,7 +51,7 @@ jobs:
       smp-version: ${{ steps.experimental-meta.outputs.SMP_CRATE_VERSION }}
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           fetch-depth: 0  # need to pull repository history to find merge bases
 
@@ -117,11 +117,11 @@ jobs:
     outputs:
       source_changed: ${{ steps.filter.outputs.SOURCE_CHANGED }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
       - name: Collect file changes
         id: changes
-        uses: dorny/paths-filter@v3
+        uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36 # v3.0.2
         with:
           base: ${{ needs.resolve-inputs.outputs.baseline-sha }}
           ref: ${{ needs.resolve-inputs.outputs.comparison-sha }}
@@ -190,21 +190,21 @@ jobs:
       - should-run-gate
       - resolve-inputs
     steps:
-      - uses: colpal/actions-clean@v1
+      - uses: colpal/actions-clean@36e6ca1abd35efe61cb60f912bd7837f67887c8a # v1.1.1
 
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           ref: ${{ needs.resolve-inputs.outputs.baseline-sha }}
           path: baseline-vector
 
       - name: Set up Docker Buildx
         id: buildx
-        uses: docker/setup-buildx-action@v3.11.1
+        uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3.11.1
 
       - name: Build 'vector' target image
-        uses: docker/build-push-action@v6.18.0
+        uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6.18.0
         with:
           context: baseline-vector/
           cache-from: type=gha
@@ -216,7 +216,7 @@ jobs:
             vector:${{ needs.resolve-inputs.outputs.baseline-tag }}
 
       - name: Upload image as artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
         with:
           name: baseline-image
           path: "${{ runner.temp }}/baseline-image.tar"
@@ -229,21 +229,21 @@ jobs:
       - should-run-gate
       - resolve-inputs
     steps:
-      - uses: colpal/actions-clean@v1
+      - uses: colpal/actions-clean@36e6ca1abd35efe61cb60f912bd7837f67887c8a # v1.1.1
 
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           ref: ${{ needs.resolve-inputs.outputs.comparison-sha }}
           path: comparison-vector
 
       - name: Set up Docker Buildx
         id: buildx
-        uses: docker/setup-buildx-action@v3.11.1
+        uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3.11.1
 
       - name: Build 'vector' target image
-        uses: docker/build-push-action@v6.18.0
+        uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6.18.0
         with:
           context: comparison-vector/
           cache-from: type=gha
@@ -255,7 +255,7 @@ jobs:
             vector:${{ needs.resolve-inputs.outputs.comparison-tag }}
 
       - name: Upload image as artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
         with:
           name: comparison-image
           path: "${{ runner.temp }}/comparison-image.tar"
@@ -269,7 +269,7 @@ jobs:
       - resolve-inputs
     steps:
       - name: Configure AWS Credentials
-        uses: aws-actions/configure-aws-credentials@v4.2.1
+        uses: aws-actions/configure-aws-credentials@b47578312673ae6fa5b5096b330d9fbac3d116df # v4.2.1
         with:
           aws-access-key-id: ${{ secrets.SINGLE_MACHINE_PERFORMANCE_BOT_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ secrets.SINGLE_MACHINE_PERFORMANCE_BOT_SECRET_ACCESS_KEY }}
@@ -294,7 +294,7 @@ jobs:
       - build-baseline
     steps:
       - name: 'Download baseline image'
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
         with:
           name: baseline-image
 
@@ -303,7 +303,7 @@ jobs:
           docker load --input baseline-image.tar
 
       - name: Configure AWS Credentials
-        uses: aws-actions/configure-aws-credentials@v4.2.1
+        uses: aws-actions/configure-aws-credentials@b47578312673ae6fa5b5096b330d9fbac3d116df # v4.2.1
         with:
           aws-access-key-id: ${{ secrets.SINGLE_MACHINE_PERFORMANCE_BOT_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ secrets.SINGLE_MACHINE_PERFORMANCE_BOT_SECRET_ACCESS_KEY }}
@@ -311,10 +311,10 @@ jobs:
 
       - name: Login to Amazon ECR
         id: login-ecr
-        uses: aws-actions/amazon-ecr-login@v2
+        uses: aws-actions/amazon-ecr-login@062b18b96a7aff071d4dc91bc00c4c1a7945b076 # v2.0.1
 
       - name: Docker Login to ECR
-        uses: docker/login-action@v3
+        uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
         with:
           registry: ${{ steps.login-ecr.outputs.registry }}
 
@@ -334,7 +334,7 @@ jobs:
       - build-comparison
     steps:
       - name: 'Download comparison image'
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
         with:
           name: comparison-image
 
@@ -343,7 +343,7 @@ jobs:
           docker load --input comparison-image.tar
 
       - name: Configure AWS Credentials
-        uses: aws-actions/configure-aws-credentials@v4.2.1
+        uses: aws-actions/configure-aws-credentials@b47578312673ae6fa5b5096b330d9fbac3d116df # v4.2.1
         with:
           aws-access-key-id: ${{ secrets.SINGLE_MACHINE_PERFORMANCE_BOT_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ secrets.SINGLE_MACHINE_PERFORMANCE_BOT_SECRET_ACCESS_KEY }}
@@ -351,10 +351,10 @@ jobs:
 
       - name: Login to Amazon ECR
         id: login-ecr
-        uses: aws-actions/amazon-ecr-login@v2
+        uses: aws-actions/amazon-ecr-login@062b18b96a7aff071d4dc91bc00c4c1a7945b076 # v2.0.1
 
       - name: Docker Login to ECR
-        uses: docker/login-action@v3
+        uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
         with:
           registry: ${{ steps.login-ecr.outputs.registry }}
 
@@ -373,12 +373,12 @@ jobs:
       - upload-baseline-image-to-ecr
       - upload-comparison-image-to-ecr
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           ref: ${{ needs.resolve-inputs.outputs.comparison-sha }}
 
       - name: Configure AWS Credentials
-        uses: aws-actions/configure-aws-credentials@v4.2.1
+        uses: aws-actions/configure-aws-credentials@b47578312673ae6fa5b5096b330d9fbac3d116df # v4.2.1
         with:
           aws-access-key-id: ${{ secrets.SINGLE_MACHINE_PERFORMANCE_BOT_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ secrets.SINGLE_MACHINE_PERFORMANCE_BOT_SECRET_ACCESS_KEY }}
@@ -386,7 +386,7 @@ jobs:
 
       - name: Login to Amazon ECR
         id: login-ecr
-        uses: aws-actions/amazon-ecr-login@v2
+        uses: aws-actions/amazon-ecr-login@062b18b96a7aff071d4dc91bc00c4c1a7945b076 # v2.0.1
 
       - name: Download SMP binary
         run: |
@@ -408,7 +408,7 @@ jobs:
             --submission-metadata ${{ runner.temp }}/submission-metadata \
             --replicas ${{ env.SMP_REPLICAS }}
 
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
         with:
           name: vector-submission-metadata
           path: ${{ runner.temp }}/submission-metadata
@@ -448,10 +448,10 @@ jobs:
       - should-run-gate
       - resolve-inputs
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
       - name: Configure AWS Credentials
-        uses: aws-actions/configure-aws-credentials@v4.2.1
+        uses: aws-actions/configure-aws-credentials@b47578312673ae6fa5b5096b330d9fbac3d116df # v4.2.1
         with:
           aws-access-key-id: ${{ secrets.SINGLE_MACHINE_PERFORMANCE_BOT_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ secrets.SINGLE_MACHINE_PERFORMANCE_BOT_SECRET_ACCESS_KEY }}
@@ -462,7 +462,7 @@ jobs:
           aws s3 cp s3://smp-cli-releases/v${{ needs.resolve-inputs.outputs.smp-version }}/x86_64-unknown-linux-gnu/smp ${{ runner.temp }}/bin/smp
 
       - name: Download submission metadata
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
         with:
           name: vector-submission-metadata
           path: ${{ runner.temp }}/
@@ -485,12 +485,12 @@ jobs:
       - submit-job
       - resolve-inputs
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           ref: ${{ needs.resolve-inputs.outputs.comparison-sha }}
 
       - name: Configure AWS Credentials
-        uses: aws-actions/configure-aws-credentials@v4.2.1
+        uses: aws-actions/configure-aws-credentials@b47578312673ae6fa5b5096b330d9fbac3d116df # v4.2.1
         with:
           aws-access-key-id: ${{ secrets.SINGLE_MACHINE_PERFORMANCE_BOT_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ secrets.SINGLE_MACHINE_PERFORMANCE_BOT_SECRET_ACCESS_KEY }}
@@ -501,7 +501,7 @@ jobs:
           aws s3 cp s3://smp-cli-releases/v${{ needs.resolve-inputs.outputs.smp-version }}/x86_64-unknown-linux-gnu/smp ${{ runner.temp }}/bin/smp
 
       - name: Download submission metadata
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
         with:
           name: vector-submission-metadata
           path: ${{ runner.temp }}/
@@ -518,12 +518,12 @@ jobs:
 
       - name: Read regression report
         id: read-analysis
-        uses: juliangruber/read-file-action@v1
+        uses: juliangruber/read-file-action@b549046febe0fe86f8cb4f93c24e284433f9ab58 # v1.1.7
         with:
           path: ${{ runner.temp }}/outputs/report.md
 
       - name: Upload regression report to artifacts
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
         with:
           name: capture-artifacts
           path: ${{ runner.temp }}/outputs/*
@@ -549,7 +549,7 @@ jobs:
     steps:
       - name: Download capture-artifacts
         continue-on-error: true
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
         with:
           name: capture-artifacts
 
diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index 294b5ecaedd3f..c4e8214594e38 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -32,12 +32,12 @@ jobs:
 
     steps:
       - name: "Checkout code"
-        uses: actions/checkout@v4
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           persist-credentials: false
 
       - name: "Run analysis"
-        uses: ossf/scorecard-action@v2.4.2
+        uses: ossf/scorecard-action@05b42c624433fc40578a4040d5cf5e36ddca8cde # v2.4.2
         with:
           results_file: results.sarif
           results_format: sarif
@@ -59,7 +59,7 @@ jobs:
       # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
       # format to the repository Actions tab.
       - name: "Upload artifact"
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
         with:
           name: SARIF file
           path: results.sarif
@@ -68,6 +68,6 @@ jobs:
       # Upload the results to GitHub's code scanning dashboard (optional).
       # Commenting out will disable upload of results to your repo's Code Scanning dashboard
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@v3
+        uses: github/codeql-action/upload-sarif@4e828ff8d448a8a6e532957b1811f387a63867e8 # v3.29.4
         with:
           sarif_file: results.sarif
diff --git a/.github/workflows/semantic.yml b/.github/workflows/semantic.yml
index 5125b2e855e62..4f1dfd98c24f3 100644
--- a/.github/workflows/semantic.yml
+++ b/.github/workflows/semantic.yml
@@ -14,7 +14,7 @@ jobs:
     name: Check Semantic PR
     runs-on: ubuntu-24.04
     steps:
-      - uses: amannn/action-semantic-pull-request@v5
+      - uses: amannn/action-semantic-pull-request@0723387faaf9b38adef4775cd42cfd5155ed6017 # v5.5.3
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
diff --git a/.github/workflows/spelling.yml b/.github/workflows/spelling.yml
index e7649b1e9f4cb..810fb03867dd3 100644
--- a/.github/workflows/spelling.yml
+++ b/.github/workflows/spelling.yml
@@ -87,7 +87,7 @@ jobs:
     steps:
     - name: check-spelling
       id: spelling
-      uses: check-spelling/check-spelling@v0.0.25
+      uses: check-spelling/check-spelling@c635c2f3f714eec2fcf27b643a1919b9a811ef2e # v0.0.25
       with:
         suppress_push_for_open_pull_request: ${{ github.actor != 'dependabot[bot]' && 1 }}
         checkout: true
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 76565685daa5d..bf207498b243b 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -33,7 +33,7 @@ jobs:
     runs-on: ubuntu-24.04
     needs: changes
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - name: Enable Rust matcher
         run: echo "::add-matcher::.github/matchers/rust.json"
       - run: make check-fmt
@@ -44,7 +44,7 @@ jobs:
     if: needs.changes.outputs.source == 'true'
     needs: changes
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - name: Enable Rust matcher
         run: echo "::add-matcher::.github/matchers/rust.json"
       - run: sudo bash ./scripts/environment/install-protoc.sh
@@ -57,7 +57,7 @@ jobs:
     if: needs.changes.outputs.source == 'true'
     needs: changes
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - name: Enable Rust matcher
         run: echo "::add-matcher::.github/matchers/rust.json"
       - run: sudo -E bash scripts/environment/bootstrap-ubuntu-24.04.sh
@@ -81,7 +81,7 @@ jobs:
     runs-on: ubuntu-24.04
     needs: changes
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           fetch-depth: 0
       - run: make check-version
@@ -91,7 +91,7 @@ jobs:
     runs-on: ubuntu-24.04
     needs: changes
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - run: make check-scripts
 
   check-events:
@@ -100,7 +100,7 @@ jobs:
     if: needs.changes.outputs.source == 'true'
     needs: changes
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - name: Enable Rust matcher
         run: echo "::add-matcher::.github/matchers/rust.json"
       - run: make check-events
@@ -111,7 +111,7 @@ jobs:
     if: needs.changes.outputs.dependencies == 'true'
     needs: changes
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - run: cargo install dd-rust-license-tool --version 1.0.2 --force --locked
       - run: make check-licenses
 
@@ -121,7 +121,7 @@ jobs:
     if: needs.changes.outputs.cue == 'true'
     needs: changes
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - run: sudo -E bash scripts/environment/bootstrap-ubuntu-24.04.sh
       - run: make check-docs
 
@@ -131,7 +131,7 @@ jobs:
     if: needs.changes.outputs.markdown == 'true'
     needs: changes
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - run: sudo npm -g install markdownlint-cli@0.30
       - run: make check-markdown
 
@@ -141,7 +141,7 @@ jobs:
     if: needs.changes.outputs.source == 'true' || needs.changes.outputs.component_docs == 'true'
     needs: changes
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - run: sudo bash ./scripts/environment/install-protoc.sh
       - run: sudo apt-get update && sudo apt-get install -y libsasl2-dev
       - run: sudo -E bash scripts/environment/bootstrap-ubuntu-24.04.sh
@@ -153,7 +153,7 @@ jobs:
     if: needs.changes.outputs.source == 'true'
     needs: changes
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - name: Enable Rust matcher
         run: echo "::add-matcher::.github/matchers/rust.json"
       - run: cd rust-doc && make docs
@@ -164,7 +164,7 @@ jobs:
     if: needs.changes.outputs.source == 'true' || needs.changes.outputs.cue == 'true'
     needs: changes
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - name: Enable Rust matcher
         run: echo "::add-matcher::.github/matchers/rust.json"
       - run: sudo bash ./scripts/environment/install-protoc.sh
@@ -177,7 +177,7 @@ jobs:
     if: needs.changes.outputs.source == 'true' || needs.changes.outputs.dependencies == 'true'
     needs: changes
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - name: Enable Rust matcher
         run: echo "::add-matcher::.github/matchers/rust.json"
       - run: cargo install --force --locked --version 0.13.1 wasm-pack
diff --git a/.github/workflows/unit_mac.yml b/.github/workflows/unit_mac.yml
index e03522b712b8e..c9370fa47e431 100644
--- a/.github/workflows/unit_mac.yml
+++ b/.github/workflows/unit_mac.yml
@@ -15,7 +15,7 @@ jobs:
     steps:
       - name: (PR review) Set latest commit status as pending
         if: ${{ github.event_name == 'pull_request_review' }}
-        uses: myrotvorets/set-commit-status-action@v2.0.1
+        uses: myrotvorets/set-commit-status-action@3730c0a348a2ace3c110851bed53331bc6406e9f # v2.0.1
         with:
           sha: ${{ github.event.review.commit_id }}
           token: ${{ secrets.GITHUB_TOKEN }}
@@ -24,15 +24,15 @@ jobs:
 
       - name: (PR review) Checkout PR branch
         if: ${{ github.event_name == 'pull_request_review' }}
-        uses: actions/checkout@v4
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           ref: ${{ github.event.review.commit_id }}
 
       - name: Checkout branch
         if: ${{ github.event_name != 'pull_request_review' }}
-        uses: actions/checkout@v4
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
-      - uses: actions/cache@v4
+      - uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
         name: Cache Cargo registry + index
         with:
           path: |
@@ -50,7 +50,7 @@ jobs:
 
       # Some tests e.g. `reader_exits_cleanly_when_writer_done_and_in_flight_acks` are flaky.
       - name: Run tests
-        uses: nick-fields/retry@v3
+        uses: nick-fields/retry@ce71cc2ab81d554ebbe88c79ab5975992d79ba08 # v3.0.2
         with:
           timeout_minutes: 45
           max_attempts: 3
@@ -59,7 +59,7 @@ jobs:
       - run: make test-behavior
 
       - name: (PR review) Set latest commit status as ${{ job.status }}
-        uses: myrotvorets/set-commit-status-action@v2.0.1
+        uses: myrotvorets/set-commit-status-action@3730c0a348a2ace3c110851bed53331bc6406e9f # v2.0.1
         if: always() && github.event_name == 'pull_request_review'
         with:
           sha: ${{ github.event.review.commit_id }}
diff --git a/.github/workflows/unit_windows.yml b/.github/workflows/unit_windows.yml
index 357ce89557a74..127a727d27875 100644
--- a/.github/workflows/unit_windows.yml
+++ b/.github/workflows/unit_windows.yml
@@ -14,7 +14,7 @@ jobs:
     steps:
       - name: (PR review) Set latest commit status as pending
         if: ${{ github.event_name == 'pull_request_review' }}
-        uses: myrotvorets/set-commit-status-action@v2.0.1
+        uses: myrotvorets/set-commit-status-action@3730c0a348a2ace3c110851bed53331bc6406e9f # v2.0.1
         with:
           sha: ${{ github.event.review.commit_id }}
           token: ${{ secrets.GITHUB_TOKEN }}
@@ -23,19 +23,19 @@ jobs:
 
       - name: (PR review) Checkout PR branch
         if: ${{ github.event_name == 'pull_request_review' }}
-        uses: actions/checkout@v4
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           ref: ${{ github.event.review.commit_id }}
 
       - name: Checkout branch
         if: ${{ github.event_name != 'pull_request_review' }}
-        uses: actions/checkout@v4
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
       - run: .\scripts\environment\bootstrap-windows-2022.ps1
       - run: make test
 
       - name: (PR review) Set latest commit status as ${{ job.status }}
-        uses: myrotvorets/set-commit-status-action@v2.0.1
+        uses: myrotvorets/set-commit-status-action@3730c0a348a2ace3c110851bed53331bc6406e9f # v2.0.1
         if: always() && github.event_name == 'pull_request_review'
         with:
           sha: ${{ github.event.review.commit_id }}

From f372816f0f8207e251352b512f65268684c2097c Mon Sep 17 00:00:00 2001
From: Thomas <thomas.schneider@datadoghq.com>
Date: Thu, 24 Jul 2025 10:28:23 -0400
Subject: [PATCH 207/305] chore(vdev): remove unnecessary traits (#23418)

* Move functions out of trait and into impl

* Remove traits

* Rename enum option
---
 vdev/src/commands/compose_tests/start.rs |  12 +-
 vdev/src/commands/compose_tests/stop.rs  |  13 +-
 vdev/src/commands/compose_tests/test.rs  |  33 ++---
 vdev/src/commands/e2e/start.rs           |   5 +-
 vdev/src/commands/e2e/stop.rs            |   8 +-
 vdev/src/commands/e2e/test.rs            |   5 +-
 vdev/src/commands/integration/start.rs   |   5 +-
 vdev/src/commands/integration/stop.rs    |   5 +-
 vdev/src/commands/integration/test.rs    |   5 +-
 vdev/src/testing/integration.rs          | 150 ++++++++++++-----------
 10 files changed, 135 insertions(+), 106 deletions(-)

diff --git a/vdev/src/commands/compose_tests/start.rs b/vdev/src/commands/compose_tests/start.rs
index 5118e087c84b8..826b988afed23 100644
--- a/vdev/src/commands/compose_tests/start.rs
+++ b/vdev/src/commands/compose_tests/start.rs
@@ -1,8 +1,12 @@
 use anyhow::Result;
 
-use crate::testing::{config::ComposeTestConfig, integration::ComposeTestT};
+use crate::testing::{
+    config::ComposeTestConfig,
+    integration::{ComposeTest, ComposeTestLocalConfig},
+};
 
-pub(crate) fn exec<T: ComposeTestT>(
+pub(crate) fn exec(
+    local_config: ComposeTestLocalConfig,
     integration: &str,
     environment: Option<&String>,
     build_all: bool,
@@ -10,11 +14,11 @@ pub(crate) fn exec<T: ComposeTestT>(
     let environment = if let Some(environment) = environment {
         environment.clone()
     } else {
-        let (_test_dir, config) = ComposeTestConfig::load(T::DIRECTORY, integration)?;
+        let (_test_dir, config) = ComposeTestConfig::load(local_config.directory, integration)?;
         let envs = config.environments();
         let env = envs.keys().next().expect("Integration has no environments");
         env.clone()
     };
 
-    T::start(&T::generate(integration, environment, build_all, 0)?)
+    ComposeTest::generate(local_config, integration, environment, build_all, 0)?.start()
 }
diff --git a/vdev/src/commands/compose_tests/stop.rs b/vdev/src/commands/compose_tests/stop.rs
index 7a780faf4d507..20849a2ecd6a2 100644
--- a/vdev/src/commands/compose_tests/stop.rs
+++ b/vdev/src/commands/compose_tests/stop.rs
@@ -1,10 +1,17 @@
 use anyhow::Result;
 
-use crate::testing::{integration::ComposeTestT, state::EnvsDir};
+use crate::testing::{
+    integration::{ComposeTest, ComposeTestLocalConfig},
+    state::EnvsDir,
+};
 
-pub(crate) fn exec<T: ComposeTestT>(test_name: &str, all_features: bool) -> Result<()> {
+pub(crate) fn exec(
+    local_config: ComposeTestLocalConfig,
+    test_name: &str,
+    all_features: bool,
+) -> Result<()> {
     if let Some(active) = EnvsDir::new(test_name).active()? {
-        T::stop(&T::generate(test_name, active, all_features, 0)?)
+        ComposeTest::generate(local_config, test_name, active, all_features, 0)?.stop()
     } else {
         println!("No environment for {test_name} is active.");
         Ok(())
diff --git a/vdev/src/commands/compose_tests/test.rs b/vdev/src/commands/compose_tests/test.rs
index 7c69296f554dd..0fee8c3479802 100644
--- a/vdev/src/commands/compose_tests/test.rs
+++ b/vdev/src/commands/compose_tests/test.rs
@@ -1,15 +1,20 @@
 use anyhow::{bail, Result};
 
-use crate::testing::{config::ComposeTestConfig, integration::ComposeTestT, state::EnvsDir};
+use crate::testing::{
+    config::ComposeTestConfig,
+    integration::{ComposeTest, ComposeTestLocalConfig},
+    state::EnvsDir,
+};
 
-pub fn exec<T: ComposeTestT>(
+pub fn exec(
+    local_config: ComposeTestLocalConfig,
     integration: &str,
     environment: Option<&String>,
     build_all: bool,
     retries: u8,
     args: &[String],
 ) -> Result<()> {
-    let (_test_dir, config) = ComposeTestConfig::load(T::DIRECTORY, integration)?;
+    let (_test_dir, config) = ComposeTestConfig::load(local_config.directory, integration)?;
     let envs = config.environments();
 
     let active = EnvsDir::new(integration).active()?;
@@ -18,20 +23,18 @@ pub fn exec<T: ComposeTestT>(
         (Some(environment), Some(active)) if environment != active => {
             bail!("Requested environment {environment:?} does not match active one {active:?}")
         }
-        (Some(environment), _) => T::test(
-            &T::generate(integration, environment, build_all, retries)?,
-            args.to_owned(),
-        ),
-        (None, Some(active)) => T::test(
-            &T::generate(integration, active, build_all, retries)?,
-            args.to_owned(),
-        ),
+        (Some(environment), _) => {
+            ComposeTest::generate(local_config, integration, environment, build_all, retries)?
+                .test(args.to_owned())
+        }
+        (None, Some(active)) => {
+            ComposeTest::generate(local_config, integration, active, build_all, retries)?
+                .test(args.to_owned())
+        }
         (None, None) => {
             for env_name in envs.keys() {
-                T::test(
-                    &T::generate(integration, env_name, build_all, retries)?,
-                    args.to_owned(),
-                )?;
+                ComposeTest::generate(local_config, integration, env_name, build_all, retries)?
+                    .test(args.to_owned())?;
             }
             Ok(())
         }
diff --git a/vdev/src/commands/e2e/start.rs b/vdev/src/commands/e2e/start.rs
index e71865592475d..d20aba240718a 100644
--- a/vdev/src/commands/e2e/start.rs
+++ b/vdev/src/commands/e2e/start.rs
@@ -1,7 +1,7 @@
 use anyhow::Result;
 use clap::Args;
 
-use crate::testing::integration::E2ETest;
+use crate::testing::integration::ComposeTestLocalConfig;
 
 /// Start an environment
 #[derive(Args, Debug)]
@@ -20,7 +20,8 @@ pub struct Cli {
 
 impl Cli {
     pub fn exec(self) -> Result<()> {
-        crate::commands::compose_tests::start::exec::<E2ETest>(
+        crate::commands::compose_tests::start::exec(
+            ComposeTestLocalConfig::e2e(),
             &self.test,
             self.environment.as_ref(),
             self.build_all,
diff --git a/vdev/src/commands/e2e/stop.rs b/vdev/src/commands/e2e/stop.rs
index 2a11fd5b4c976..f3390684f65fa 100644
--- a/vdev/src/commands/e2e/stop.rs
+++ b/vdev/src/commands/e2e/stop.rs
@@ -1,7 +1,7 @@
 use anyhow::Result;
 use clap::Args;
 
-use crate::testing::integration::E2ETest;
+use crate::testing::integration::ComposeTestLocalConfig;
 
 /// Stop an e2e-test environment
 #[derive(Args, Debug)]
@@ -17,6 +17,10 @@ pub struct Cli {
 
 impl Cli {
     pub fn exec(self) -> Result<()> {
-        crate::commands::compose_tests::stop::exec::<E2ETest>(&self.test, self.all_features)
+        crate::commands::compose_tests::stop::exec(
+            ComposeTestLocalConfig::e2e(),
+            &self.test,
+            self.all_features,
+        )
     }
 }
diff --git a/vdev/src/commands/e2e/test.rs b/vdev/src/commands/e2e/test.rs
index 8f22e3376939e..092d880f557e9 100644
--- a/vdev/src/commands/e2e/test.rs
+++ b/vdev/src/commands/e2e/test.rs
@@ -1,7 +1,7 @@
 use anyhow::Result;
 use clap::Args;
 
-use crate::testing::integration::E2ETest;
+use crate::testing::integration::ComposeTestLocalConfig;
 
 /// Execute end-to-end tests
 ///
@@ -34,7 +34,8 @@ pub struct Cli {
 
 impl Cli {
     pub fn exec(self) -> Result<()> {
-        crate::commands::compose_tests::test::exec::<E2ETest>(
+        crate::commands::compose_tests::test::exec(
+            ComposeTestLocalConfig::e2e(),
             &self.e2e_test,
             self.environment.as_ref(),
             self.build_all,
diff --git a/vdev/src/commands/integration/start.rs b/vdev/src/commands/integration/start.rs
index b43a11d8fd9a0..dca8ace5e4de2 100644
--- a/vdev/src/commands/integration/start.rs
+++ b/vdev/src/commands/integration/start.rs
@@ -1,7 +1,7 @@
 use anyhow::Result;
 use clap::Args;
 
-use crate::testing::integration::IntegrationTest;
+use crate::testing::integration::ComposeTestLocalConfig;
 
 /// Start an environment
 #[derive(Args, Debug)]
@@ -20,7 +20,8 @@ pub struct Cli {
 
 impl Cli {
     pub fn exec(self) -> Result<()> {
-        crate::commands::compose_tests::start::exec::<IntegrationTest>(
+        crate::commands::compose_tests::start::exec(
+            ComposeTestLocalConfig::integration(),
             &self.integration,
             self.environment.as_ref(),
             self.build_all,
diff --git a/vdev/src/commands/integration/stop.rs b/vdev/src/commands/integration/stop.rs
index 0bacde212596d..b7b09feb83d0b 100644
--- a/vdev/src/commands/integration/stop.rs
+++ b/vdev/src/commands/integration/stop.rs
@@ -1,7 +1,7 @@
 use anyhow::Result;
 use clap::Args;
 
-use crate::testing::integration::IntegrationTest;
+use crate::testing::integration::ComposeTestLocalConfig;
 
 /// Stop an integration test environment
 #[derive(Args, Debug)]
@@ -17,7 +17,8 @@ pub struct Cli {
 
 impl Cli {
     pub fn exec(self) -> Result<()> {
-        crate::commands::compose_tests::stop::exec::<IntegrationTest>(
+        crate::commands::compose_tests::stop::exec(
+            ComposeTestLocalConfig::integration(),
             &self.integration,
             self.all_features,
         )
diff --git a/vdev/src/commands/integration/test.rs b/vdev/src/commands/integration/test.rs
index bdc0eb67877c7..956b775a8c527 100644
--- a/vdev/src/commands/integration/test.rs
+++ b/vdev/src/commands/integration/test.rs
@@ -1,7 +1,7 @@
 use anyhow::Result;
 use clap::Args;
 
-use crate::testing::integration::IntegrationTest;
+use crate::testing::integration::ComposeTestLocalConfig;
 
 /// Execute integration tests
 ///
@@ -34,7 +34,8 @@ pub struct Cli {
 
 impl Cli {
     pub fn exec(self) -> Result<()> {
-        crate::commands::compose_tests::test::exec::<IntegrationTest>(
+        crate::commands::compose_tests::test::exec(
+            ComposeTestLocalConfig::integration(),
             &self.integration,
             self.environment.as_ref(),
             self.build_all,
diff --git a/vdev/src/testing/integration.rs b/vdev/src/testing/integration.rs
index 3452c2f27045f..d7758b903c61a 100644
--- a/vdev/src/testing/integration.rs
+++ b/vdev/src/testing/integration.rs
@@ -16,7 +16,43 @@ use crate::testing::docker::{CONTAINER_TOOL, DOCKER_SOCKET};
 const NETWORK_ENV_VAR: &str = "VECTOR_NETWORK";
 const E2E_FEATURE_FLAG: &str = "all-e2e-tests";
 
+#[derive(Clone, Copy, PartialEq, Eq)]
+pub(crate) enum ComposeTestKind {
+    E2E,
+    Integration,
+}
+
+#[derive(Clone, Copy)]
+pub(crate) struct ComposeTestLocalConfig {
+    pub(crate) kind: ComposeTestKind,
+    pub(crate) directory: &'static str,
+    pub(crate) feature_flag: &'static str,
+}
+
+impl ComposeTestLocalConfig {
+    /// Integration tests are located in the `scripts/integration` dir,
+    /// and are the full feature flag is `all-integration-tests`.
+    pub(crate) fn integration() -> Self {
+        Self {
+            kind: ComposeTestKind::Integration,
+            directory: INTEGRATION_TESTS_DIR,
+            feature_flag: ALL_INTEGRATIONS_FEATURE_FLAG,
+        }
+    }
+
+    /// E2E tests are located in the `scripts/e2e` dir,
+    /// and are the full feature flag is `all-e2e-tests`.
+    pub(crate) fn e2e() -> Self {
+        Self {
+            kind: ComposeTestKind::E2E,
+            directory: E2E_TESTS_DIR,
+            feature_flag: E2E_FEATURE_FLAG,
+        }
+    }
+}
+
 pub(crate) struct ComposeTest {
+    local_config: ComposeTestLocalConfig,
     test_name: String,
     environment: String,
     config: ComposeTestConfig,
@@ -28,20 +64,17 @@ pub(crate) struct ComposeTest {
     retries: u8,
 }
 
-pub(crate) trait ComposeTestT {
-    const DIRECTORY: &'static str;
-
-    const FEATURE_FLAG: &'static str;
-
-    fn generate(
+impl ComposeTest {
+    pub(crate) fn generate(
+        local_config: ComposeTestLocalConfig,
         test_name: impl Into<String>,
         environment: impl Into<String>,
         build_all: bool,
         retries: u8,
     ) -> Result<ComposeTest> {
-        let test_name = test_name.into();
+        let test_name: String = test_name.into();
         let environment = environment.into();
-        let (test_dir, config) = ComposeTestConfig::load(Self::DIRECTORY, &test_name)?;
+        let (test_dir, config) = ComposeTestConfig::load(local_config.directory, &test_name)?;
         let envs_dir = EnvsDir::new(&test_name);
         let Some(mut env_config) = config.environments().get(&environment).cloned() else {
             bail!("Could not find environment named {environment:?}");
@@ -62,6 +95,7 @@ pub(crate) trait ComposeTestT {
         env_config.insert("VECTOR_IMAGE".to_string(), Some(runner.image_name()));
 
         Ok(ComposeTest {
+            local_config,
             test_name,
             environment,
             config,
@@ -74,35 +108,33 @@ pub(crate) trait ComposeTestT {
         })
     }
 
-    fn test(compose_test: &ComposeTest, extra_args: Vec<String>) -> Result<()> {
-        let active = compose_test
-            .envs_dir
-            .check_active(&compose_test.environment)?;
-        compose_test.config.check_required()?;
+    pub(crate) fn test(&self, extra_args: Vec<String>) -> Result<()> {
+        let active = self.envs_dir.check_active(&self.environment)?;
+        self.config.check_required()?;
 
         if !active {
-            Self::start(compose_test)?;
+            self.start()?;
         }
 
-        let mut env_vars = compose_test.config.env.clone();
+        let mut env_vars = self.config.env.clone();
         // Make sure the test runner has the same config environment vars as the services do.
-        for (key, value) in config_env(&compose_test.env_config) {
+        for (key, value) in config_env(&self.env_config) {
             env_vars.insert(key, Some(value));
         }
 
         env_vars.insert("TEST_LOG".to_string(), Some("info".into()));
-        let mut args = compose_test.config.args.clone().unwrap_or_default();
+        let mut args = self.config.args.clone().unwrap_or_default();
 
         args.push("--features".to_string());
 
-        args.push(if compose_test.build_all {
-            Self::FEATURE_FLAG.to_string()
+        args.push(if self.build_all {
+            self.local_config.feature_flag.to_string()
         } else {
-            compose_test.config.features.join(",")
+            self.config.features.join(",")
         });
 
         // If the test field is not present then use the --lib flag
-        match compose_test.config.test {
+        match self.config.test {
             Some(ref test_arg) => {
                 args.push("--test".to_string());
                 args.push(test_arg.to_string());
@@ -111,7 +143,7 @@ pub(crate) trait ComposeTestT {
         }
 
         // Ensure the test_filter args are passed as well
-        if let Some(ref filter) = compose_test.config.test_filter {
+        if let Some(ref filter) = self.config.test_filter {
             args.push(filter.to_string());
         }
         args.extend(extra_args);
@@ -121,93 +153,67 @@ pub(crate) trait ComposeTestT {
             args.push("--no-capture".to_string());
         }
 
-        if compose_test.retries > 0 {
+        if self.retries > 0 {
             args.push("--retries".to_string());
-            args.push(compose_test.retries.to_string());
+            args.push(self.retries.to_string());
         }
 
-        compose_test.runner.test(
+        self.runner.test(
             &env_vars,
-            &compose_test.config.runner.env,
-            Some(&compose_test.config.features),
+            &self.config.runner.env,
+            Some(&self.config.features),
             &args,
-            Self::DIRECTORY,
+            self.local_config.directory,
         )?;
 
         if !active {
-            compose_test.runner.remove()?;
-            Self::stop(compose_test)?;
+            self.runner.remove()?;
+            self.stop()?;
         }
         Ok(())
     }
 
-    fn start(compose_test: &ComposeTest) -> Result<()> {
+    pub(crate) fn start(&self) -> Result<()> {
         // For end-to-end tests, we want to run vector as a service, leveraging the
         // image for the runner. So we must build that image before starting the
         // compose so that it is available.
-        if Self::DIRECTORY == E2E_TESTS_DIR {
-            compose_test
-                .runner
-                .build(Some(&compose_test.config.features), Self::DIRECTORY)?;
+        if self.local_config.kind == ComposeTestKind::E2E {
+            self.runner
+                .build(Some(&self.config.features), self.local_config.directory)?;
         }
 
-        compose_test.config.check_required()?;
-        if let Some(compose) = &compose_test.compose {
-            compose_test.runner.ensure_network()?;
+        self.config.check_required()?;
+        if let Some(compose) = &self.compose {
+            self.runner.ensure_network()?;
 
-            if compose_test
-                .envs_dir
-                .check_active(&compose_test.environment)?
-            {
+            if self.envs_dir.check_active(&self.environment)? {
                 bail!("environment is already up");
             }
 
-            compose.start(&compose_test.env_config)?;
+            compose.start(&self.env_config)?;
 
-            compose_test
-                .envs_dir
-                .save(&compose_test.environment, &compose_test.env_config)
+            self.envs_dir.save(&self.environment, &self.env_config)
         } else {
             Ok(())
         }
     }
 
-    fn stop(compose_test: &ComposeTest) -> Result<()> {
-        if let Some(compose) = &compose_test.compose {
+    pub(crate) fn stop(&self) -> Result<()> {
+        if let Some(compose) = &self.compose {
             // TODO: Is this check really needed?
-            if compose_test.envs_dir.load()?.is_none() {
-                bail!("No environment for {} is up.", compose_test.test_name);
+            if self.envs_dir.load()?.is_none() {
+                bail!("No environment for {} is up.", self.test_name);
             }
 
-            compose_test.runner.remove()?;
+            self.runner.remove()?;
             compose.stop()?;
-            compose_test.envs_dir.remove()?;
+            self.envs_dir.remove()?;
         }
 
         Ok(())
     }
 }
 
-/// Integration tests are located in the `scripts/integration` dir,
-/// and are the full feature flag is `all-integration-tests`.
-pub(crate) struct IntegrationTest;
-
-impl ComposeTestT for IntegrationTest {
-    const DIRECTORY: &'static str = INTEGRATION_TESTS_DIR;
-
-    const FEATURE_FLAG: &'static str = ALL_INTEGRATIONS_FEATURE_FLAG;
-}
-
-/// E2E tests are located in the `scripts/e2e` dir,
-/// and are the full feature flag is `all-e2e-tests`.
-pub(crate) struct E2ETest;
-
-impl ComposeTestT for E2ETest {
-    const DIRECTORY: &'static str = E2E_TESTS_DIR;
-
-    const FEATURE_FLAG: &'static str = E2E_FEATURE_FLAG;
-}
-
 struct Compose {
     original_path: PathBuf,
     test_dir: PathBuf,

From 01352255c2f3641c9c492b5b9a9dbd5a822d9a51 Mon Sep 17 00:00:00 2001
From: Thomas <thomas.schneider@datadoghq.com>
Date: Thu, 24 Jul 2025 10:49:14 -0400
Subject: [PATCH 208/305] chore(ci): enhance prepare.sh script (#23415)

* Enhance prepare.sh script

* Use now modules in ci

* Use prepare.sh modules in all workflows

* Remove release-flags module

* Use prepare.sh in some missed integrations

* Add cargo-msrv to prepare.sh

* Use prepare.sh instead of npm install

* Add missing datadog-ci

* Add cross to k8s workflow

* Revert cross to manual installation
---
 .github/workflows/ci-integration-review.yml |   4 +-
 .github/workflows/cli.yml                   |   2 +-
 .github/workflows/compilation-timings.yml   |  10 +-
 .github/workflows/component_features.yml    |   2 +-
 .github/workflows/deny.yml                  |   2 +-
 .github/workflows/e2e.yml                   |   2 +-
 .github/workflows/integration-test.yml      |   2 +-
 .github/workflows/integration.yml           |   2 +-
 .github/workflows/k8s_e2e.yml               |   4 +-
 .github/workflows/misc.yml                  |   2 +-
 .github/workflows/msrv.yml                  |   5 +-
 .github/workflows/publish.yml               |  23 ++-
 .github/workflows/test.yml                  |  10 +-
 .github/workflows/unit_mac.yml              |   2 +-
 scripts/environment/prepare.sh              | 165 ++++++++++++++++----
 15 files changed, 171 insertions(+), 66 deletions(-)

diff --git a/.github/workflows/ci-integration-review.yml b/.github/workflows/ci-integration-review.yml
index 77962b14ee2a3..0b5b1b67bdfff 100644
--- a/.github/workflows/ci-integration-review.yml
+++ b/.github/workflows/ci-integration-review.yml
@@ -99,7 +99,7 @@ jobs:
           submodules: "recursive"
           ref: ${{ github.event.review.commit_id }}
 
-      - run: sudo npm -g install @datadog/datadog-ci
+      - run: bash scripts/environment/prepare.sh --modules=datadog-ci
 
       - run: docker image prune -af ; docker container prune -f
 
@@ -123,7 +123,7 @@ jobs:
           submodules: "recursive"
           ref: ${{ github.event.review.commit_id }}
 
-      - run: sudo npm -g install @datadog/datadog-ci
+      - run: bash scripts/environment/prepare.sh --modules=datadog-ci
 
       - run: docker image prune -af ; docker container prune -f
       - name: e2e-datadog-logs
diff --git a/.github/workflows/cli.yml b/.github/workflows/cli.yml
index 6f6a6f379a8ac..d6ce3ab9bb255 100644
--- a/.github/workflows/cli.yml
+++ b/.github/workflows/cli.yml
@@ -45,7 +45,7 @@ jobs:
             ${{ runner.os }}-cargo-
 
       - run: sudo -E bash scripts/environment/bootstrap-ubuntu-24.04.sh
-      - run: bash scripts/environment/prepare.sh
+      - run: bash scripts/environment/prepare.sh --modules=cargo-nextest,datadog-ci
       - run: echo "::add-matcher::.github/matchers/rust.json"
       - run: make test-cli
       - name: Upload test results
diff --git a/.github/workflows/compilation-timings.yml b/.github/workflows/compilation-timings.yml
index 9ee4f96c88a0e..9546f44471c0c 100644
--- a/.github/workflows/compilation-timings.yml
+++ b/.github/workflows/compilation-timings.yml
@@ -18,7 +18,7 @@ jobs:
       - uses: colpal/actions-clean@36e6ca1abd35efe61cb60f912bd7837f67887c8a # v1.1.1
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - run: sudo -E bash scripts/environment/bootstrap-ubuntu-24.04.sh
-      - run: bash scripts/environment/prepare.sh
+      - run: bash scripts/environment/prepare.sh --modules=rustup
       - run: cargo clean
       - run: cargo build --release
 
@@ -34,7 +34,7 @@ jobs:
       - uses: colpal/actions-clean@36e6ca1abd35efe61cb60f912bd7837f67887c8a # v1.1.1
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - run: sudo -E bash scripts/environment/bootstrap-ubuntu-24.04.sh
-      - run: bash scripts/environment/prepare.sh
+      - run: bash scripts/environment/prepare.sh --modules=rustup
       - run: cargo clean
       - run: cargo build --release
 
@@ -45,7 +45,7 @@ jobs:
       - uses: colpal/actions-clean@36e6ca1abd35efe61cb60f912bd7837f67887c8a # v1.1.1
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - run: sudo -E bash scripts/environment/bootstrap-ubuntu-24.04.sh
-      - run: bash scripts/environment/prepare.sh
+      - run: bash scripts/environment/prepare.sh --modules=rustup
       - run: cargo clean
       - run: cargo build
 
@@ -56,7 +56,7 @@ jobs:
       - uses: colpal/actions-clean@36e6ca1abd35efe61cb60f912bd7837f67887c8a # v1.1.1
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - run: sudo -E bash scripts/environment/bootstrap-ubuntu-24.04.sh
-      - run: bash scripts/environment/prepare.sh
+      - run: bash scripts/environment/prepare.sh --modules=rustup
       - run: cargo clean
       - run: cargo build
       - run: touch src/app.rs
@@ -69,6 +69,6 @@ jobs:
       - uses: colpal/actions-clean@36e6ca1abd35efe61cb60f912bd7837f67887c8a # v1.1.1
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - run: sudo -E bash scripts/environment/bootstrap-ubuntu-24.04.sh
-      - run: bash scripts/environment/prepare.sh
+      - run: bash scripts/environment/prepare.sh --modules=rustup
       - run: cargo clean
       - run: cargo check
diff --git a/.github/workflows/component_features.yml b/.github/workflows/component_features.yml
index 6be75594fb284..b6537c076621b 100644
--- a/.github/workflows/component_features.yml
+++ b/.github/workflows/component_features.yml
@@ -45,7 +45,7 @@ jobs:
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
       - run: sudo -E bash scripts/environment/bootstrap-ubuntu-24.04.sh
-      - run: bash scripts/environment/prepare.sh
+      - run: bash scripts/environment/prepare.sh --modules=rustup
       - run: echo "::add-matcher::.github/matchers/rust.json"
       - run: make check-component-features
 
diff --git a/.github/workflows/deny.yml b/.github/workflows/deny.yml
index 29d59a4c444ac..e1c11f2068448 100644
--- a/.github/workflows/deny.yml
+++ b/.github/workflows/deny.yml
@@ -58,7 +58,7 @@ jobs:
             ${{ runner.os }}-cargo-
 
       - run: sudo -E bash scripts/environment/bootstrap-ubuntu-24.04.sh
-      - run: bash scripts/environment/prepare.sh
+      - run: bash scripts/environment/prepare.sh --modules=cargo-deny
       - run: echo "::add-matcher::.github/matchers/rust.json"
       - name: Check cargo deny advisories/licenses
         run: make check-deny
diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
index 4a1be700dfb4a..b8f0c22d77d2f 100644
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -63,7 +63,7 @@ jobs:
         with:
           submodules: "recursive"
 
-      - run: sudo npm -g install @datadog/datadog-ci
+      - run: bash scripts/environment/prepare.sh --modules=datadog-ci
 
       - run: docker image prune -af ; docker container prune -f
 
diff --git a/.github/workflows/integration-test.yml b/.github/workflows/integration-test.yml
index 795114916cf0c..2fa4abe3966c2 100644
--- a/.github/workflows/integration-test.yml
+++ b/.github/workflows/integration-test.yml
@@ -47,7 +47,7 @@ jobs:
         if: ${{ github.event_name != 'issue_comment' }}
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
-      - run: sudo npm -g install @datadog/datadog-ci
+      - run: bash scripts/environment/prepare.sh --modules=rustup,datadog-ci
 
       - run: make test-integration-${{ inputs.test_name }}
         env:
diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
index 4fafaba6fd42d..edf42f963e32f 100644
--- a/.github/workflows/integration.yml
+++ b/.github/workflows/integration.yml
@@ -109,7 +109,7 @@ jobs:
                   "${{ needs.changes.outputs.dependencies }}" == "true" || \
                   "$should_run" == "true" ]]; then
               # Only install dep if test runs
-              sudo npm -g install @datadog/datadog-ci
+              bash scripts/environment/prepare.sh --modules=datadog-ci
               echo "Running test for ${{ matrix.service }}"
               bash scripts/int-e2e-test.sh int ${{ matrix.service }}
             else
diff --git a/.github/workflows/k8s_e2e.yml b/.github/workflows/k8s_e2e.yml
index 67dc56822eb03..95d82f2cec366 100644
--- a/.github/workflows/k8s_e2e.yml
+++ b/.github/workflows/k8s_e2e.yml
@@ -95,8 +95,8 @@ jobs:
 
       - run: sudo -E bash scripts/ci-free-disk-space.sh
       - run: sudo -E bash scripts/environment/bootstrap-ubuntu-24.04.sh
-      - run: bash scripts/environment/prepare.sh
-      - run: ~/.cargo/bin/rustup target add x86_64-unknown-linux-gnu
+      - run: bash scripts/environment/prepare.sh --modules=rustup,cross
+      - run: rustup target add x86_64-unknown-linux-gnu
       - run: echo "::add-matcher::.github/matchers/rust.json"
       - run: VECTOR_VERSION="$(cargo vdev version)" make package-deb-x86_64-unknown-linux-gnu
 
diff --git a/.github/workflows/misc.yml b/.github/workflows/misc.yml
index db607b1ff38fa..fead79447cd80 100644
--- a/.github/workflows/misc.yml
+++ b/.github/workflows/misc.yml
@@ -46,7 +46,7 @@ jobs:
 
       - run: sudo -E bash scripts/ci-free-disk-space.sh
       - run: sudo -E bash scripts/environment/bootstrap-ubuntu-24.04.sh
-      - run: bash scripts/environment/prepare.sh
+      - run: bash scripts/environment/prepare.sh --modules=rustup
       - run: echo "::add-matcher::.github/matchers/rust.json"
       - run: make test-behavior
       - run: make check-examples
diff --git a/.github/workflows/msrv.yml b/.github/workflows/msrv.yml
index c823433437cc6..451f14b705099 100644
--- a/.github/workflows/msrv.yml
+++ b/.github/workflows/msrv.yml
@@ -26,8 +26,5 @@ jobs:
         with:
           ref: ${{ inputs.checkout_ref }}
       - run: sudo -E bash scripts/environment/bootstrap-ubuntu-24.04.sh
-      - run: |
-          # We usually run `scripts/environment/prepare.sh` but in this case we only need the toolchain.
-          rustup show active-toolchain || rustup toolchain install
-      - run: cargo install cargo-msrv --version 0.18.4
+      - run: bash scripts/environment/prepare.sh --modules=cargo-msrv
       - run: cargo msrv verify
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 9e36dd69ef989..321542e678cd5 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -64,7 +64,7 @@ jobs:
       - name: Bootstrap runner environment (Ubuntu-specific)
         run: sudo -E bash scripts/environment/bootstrap-ubuntu-24.04.sh
       - name: Bootstrap runner environment (generic)
-        run: bash scripts/environment/prepare.sh
+        run: bash scripts/environment/prepare.sh --modules=rustup,cross
       - name: Build Vector
         run: make package-x86_64-unknown-linux-musl-all
       - name: Stage package artifacts for publish
@@ -76,8 +76,8 @@ jobs:
   build-x86_64-unknown-linux-gnu-packages:
     name: Build Vector for x86_64-unknown-linux-gnu (.tar.gz, DEB, RPM)
     runs-on: release-builder-linux
-    needs: generate-publish-metadata
     timeout-minutes: 60
+    needs: generate-publish-metadata
     env:
       VECTOR_VERSION: ${{ needs.generate-publish-metadata.outputs.vector_version }}
       VECTOR_BUILD_DESC: ${{ needs.generate-publish-metadata.outputs.vector_build_desc }}
@@ -90,7 +90,7 @@ jobs:
       - name: Bootstrap runner environment (Ubuntu-specific)
         run: sudo -E bash scripts/environment/bootstrap-ubuntu-24.04.sh
       - name: Bootstrap runner environment (generic)
-        run: bash scripts/environment/prepare.sh
+        run: bash scripts/environment/prepare.sh --modules=rustup,cross
       - name: Build Vector
         run: make package-x86_64-unknown-linux-gnu-all
       - name: Stage package artifacts for publish
@@ -116,7 +116,7 @@ jobs:
       - name: Bootstrap runner environment (Ubuntu-specific)
         run: sudo -E bash scripts/environment/bootstrap-ubuntu-24.04.sh
       - name: Bootstrap runner environment (generic)
-        run: bash scripts/environment/prepare.sh
+        run: bash scripts/environment/prepare.sh --modules=rustup,cross
       - name: Build Vector
         env:
           DOCKER_PRIVILEGED: "true"
@@ -144,7 +144,7 @@ jobs:
       - name: Bootstrap runner environment (Ubuntu-specific)
         run: sudo -E bash scripts/environment/bootstrap-ubuntu-24.04.sh
       - name: Bootstrap runner environment (generic)
-        run: bash scripts/environment/prepare.sh
+        run: bash scripts/environment/prepare.sh --modules=rustup,cross
       - name: Build Vector
         env:
           DOCKER_PRIVILEGED: "true"
@@ -172,7 +172,7 @@ jobs:
       - name: Bootstrap runner environment (Ubuntu-specific)
         run: sudo -E bash scripts/environment/bootstrap-ubuntu-24.04.sh
       - name: Bootstrap runner environment (generic)
-        run: bash scripts/environment/prepare.sh
+        run: bash scripts/environment/prepare.sh --modules=rustup,cross
       - name: Build Vector
         env:
           DOCKER_PRIVILEGED: "true"
@@ -200,7 +200,7 @@ jobs:
       - name: Bootstrap runner environment (Ubuntu-specific)
         run: sudo -E bash scripts/environment/bootstrap-ubuntu-24.04.sh
       - name: Bootstrap runner environment (generic)
-        run: bash scripts/environment/prepare.sh
+        run: bash scripts/environment/prepare.sh --modules=rustup,cross
       - name: Build Vector
         env:
           DOCKER_PRIVILEGED: "true"
@@ -228,7 +228,7 @@ jobs:
       - name: Bootstrap runner environment (Ubuntu-specific)
         run: sudo -E bash scripts/environment/bootstrap-ubuntu-24.04.sh
       - name: Bootstrap runner environment (generic)
-        run: bash scripts/environment/prepare.sh
+        run: bash scripts/environment/prepare.sh --modules=rustup,cross
       - name: Build Vector
         env:
           DOCKER_PRIVILEGED: "true"
@@ -242,6 +242,7 @@ jobs:
   build-arm-unknown-linux-musleabi-packages:
     name: Build Vector for arm-unknown-linux-musleabi (.tar.gz)
     runs-on: release-builder-linux
+    timeout-minutes: 60
     needs: generate-publish-metadata
     env:
       VECTOR_VERSION: ${{ needs.generate-publish-metadata.outputs.vector_version }}
@@ -255,7 +256,7 @@ jobs:
       - name: Bootstrap runner environment (Ubuntu-specific)
         run: sudo -E bash scripts/environment/bootstrap-ubuntu-24.04.sh
       - name: Bootstrap runner environment (generic)
-        run: bash scripts/environment/prepare.sh
+        run: bash scripts/environment/prepare.sh --modules=rustup,cross
       - name: Build Vector
         env:
           DOCKER_PRIVILEGED: "true"
@@ -300,9 +301,7 @@ jobs:
       - name: Bootstrap runner environment (macOS-specific)
         run: |
           bash scripts/environment/bootstrap-macos.sh
-          # We usually run `scripts/environment/prepare.sh` but in this case we only need the toolchain.
-          rustup show active-toolchain || rustup toolchain install
-          rustup show
+          bash scripts/environment/prepare.sh --modules=rustup
       - name: Build Vector
         env:
           TARGET: "${{ matrix.architecture }}-apple-darwin"
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index bf207498b243b..fb96784f22c40 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -61,7 +61,7 @@ jobs:
       - name: Enable Rust matcher
         run: echo "::add-matcher::.github/matchers/rust.json"
       - run: sudo -E bash scripts/environment/bootstrap-ubuntu-24.04.sh
-      - run: cargo install cargo-nextest --version 0.9.95 --force --locked
+      - run: bash ./scripts/environment/prepare.sh --modules=cargo-nextest,datadog-ci
 
       - name: Unit Test
         run: make test
@@ -112,7 +112,7 @@ jobs:
     needs: changes
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-      - run: cargo install dd-rust-license-tool --version 1.0.2 --force --locked
+      - run: bash ./scripts/environment/prepare.sh --modules=dd-rust-license-tool
       - run: make check-licenses
 
   check-docs:
@@ -132,7 +132,7 @@ jobs:
     needs: changes
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-      - run: sudo npm -g install markdownlint-cli@0.30
+      - run: bash ./scripts/environment/prepare.sh --modules=markdownlint
       - run: make check-markdown
 
   check-component-docs:
@@ -168,7 +168,7 @@ jobs:
       - name: Enable Rust matcher
         run: echo "::add-matcher::.github/matchers/rust.json"
       - run: sudo bash ./scripts/environment/install-protoc.sh
-      - run: cargo install --force --locked --version 0.13.1 wasm-pack
+      - run: bash ./scripts/environment/prepare.sh --modules=wasm-pack
       - run: make test-vrl
 
   build-vrl-playground:
@@ -180,7 +180,7 @@ jobs:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - name: Enable Rust matcher
         run: echo "::add-matcher::.github/matchers/rust.json"
-      - run: cargo install --force --locked --version 0.13.1 wasm-pack
+      - run: bash ./scripts/environment/prepare.sh --modules=wasm-pack
       - run: |
           cd lib/vector-vrl/web-playground/
           rustup target add wasm32-unknown-unknown
diff --git a/.github/workflows/unit_mac.yml b/.github/workflows/unit_mac.yml
index c9370fa47e431..03104b981cd65 100644
--- a/.github/workflows/unit_mac.yml
+++ b/.github/workflows/unit_mac.yml
@@ -45,7 +45,7 @@ jobs:
             ${{ runner.os }}-cargo-
 
       - run: bash scripts/environment/bootstrap-macos.sh
-      - run: bash scripts/environment/prepare.sh
+      - run: bash scripts/environment/prepare.sh --modules=cargo-nextest
       - run: echo "::add-matcher::.github/matchers/rust.json"
 
       # Some tests e.g. `reader_exits_cleanly_when_writer_done_and_in_flight_acks` are flaky.
diff --git a/scripts/environment/prepare.sh b/scripts/environment/prepare.sh
index f7ac60391ce1c..5836f789083d8 100755
--- a/scripts/environment/prepare.sh
+++ b/scripts/environment/prepare.sh
@@ -1,40 +1,149 @@
 #!/usr/bin/env bash
-set -e -o verbose
+set -euo pipefail
 
-git config --global --add safe.directory /git/vectordotdev/vector
+ALL_MODULES=(
+  rustup
+  cargo-deb
+  cross
+  cargo-nextest
+  cargo-deny
+  cargo-msrv
+  dd-rust-license-tool
+  wasm-pack
+  markdownlint
+  datadog-ci
+  release-flags
+)
 
-rustup show active-toolchain || rustup toolchain install
-rustup show
-if [[ "$(cargo-deb --version)" != "2.0.2" ]] ; then
-  rustup run stable cargo install cargo-deb --version 2.0.0 --force --locked
+# By default, install everything
+MODULES=( "${ALL_MODULES[@]}" )
+
+# Helper to join an array by comma
+join_by() { local IFS="$1"; shift; echo "$*"; }
+
+# If the INSTALL_MODULES env var is set, override MODULES
+if [[ -n "${INSTALL_MODULES:-}" ]]; then
+  IFS=',' read -r -a MODULES <<< "$INSTALL_MODULES"
 fi
-if [[ "$(cross --version | grep cross)" != "cross 0.2.5" ]] ; then
-  rustup run stable cargo install cross --version 0.2.5 --force --locked
+
+# Parse CLI args for --modules or -m
+for arg in "$@"; do
+  case $arg in
+    --modules=*|-m=*)
+      val="${arg#*=}"
+      IFS=',' read -r -a MODULES <<< "$val"
+      shift
+      ;;
+    --help|-h)
+      cat <<EOF
+Usage: $0 [--modules=mod1,mod2,...]
+
+Modules:
+  rustup
+  cargo-deb
+  cross
+  cargo-nextest
+  cargo-deny
+  cargo-msrv
+  dd-rust-license-tool
+  wasm-pack
+  markdownlint
+  datadog-ci
+
+If a module requires rust then rustup will be automatically installed.
+By default, all modules are installed. To install only a subset:
+  INSTALL_MODULES=cargo-deb,cross    # via env var
+  $0 --modules=cargo-deb,cross       # via CLI
+EOF
+      exit 0
+      ;;
+    *)
+      echo "Unknown option: $arg"
+      exit 1
+      ;;
+  esac
+done
+
+echo "Installing modules: $(join_by ', ' "${MODULES[@]}")"
+
+contains_module() {
+  local needle="$1"
+  for item in "${MODULES[@]}"; do
+    [[ "$item" == "$needle" ]] && return 0
+  done
+  return 1
+}
+
+# Always ensure git safe.directory is set
+git config --global --add safe.directory "$(pwd)"
+
+if ! contains_module rustup; then
+  REQUIRES_RUSTUP=(cargo-deb cross cargo-nextest cargo-deny cargo-msrv dd-rust-license-tool wasm-pack)
+  for tool in "${REQUIRES_RUSTUP[@]}"; do
+    if contains_module "$tool"; then
+      MODULES=(rustup "${MODULES[@]}")
+      break
+    fi
+  done
 fi
-if [[ "$(cargo-nextest --version)" != "cargo-nextest 0.9.95" ]] ; then
-  rustup run stable cargo install cargo-nextest --version 0.9.95 --force --locked
+
+if contains_module rustup; then
+  . scripts/environment/release-flags.sh
+
+  rustup show active-toolchain || rustup toolchain install stable
+  rustup show
 fi
-if [[ "$(cargo-deny --version)" != "cargo-deny 0.16.2" ]] ; then
-  rustup run stable cargo install cargo-deny --version 0.16.2 --force --locked
+
+if contains_module cargo-deb; then
+  if [[ "$(cargo-deb --version 2>/dev/null)" != "2.0.2" ]]; then
+    rustup run stable cargo install cargo-deb --version 2.0.2 --force --locked
+  fi
 fi
-if ! dd-rust-license-tool --help >& /dev/null ; then
-  rustup run stable cargo install dd-rust-license-tool --version 1.0.2 --force --locked
+
+if contains_module cross; then
+  if ! cross --version 2>/dev/null | grep -q '^cross 0.2.5'; then
+    rustup run stable cargo install cross --version 0.2.5 --force --locked
+  fi
+fi
+
+if contains_module cargo-nextest; then
+  if ! cargo-nextest --version 2>/dev/null | grep -q '^cargo-nextest 0.9.95'; then
+    rustup run stable cargo install cargo-nextest --version 0.9.95 --force --locked
+  fi
 fi
 
-if [[ "$(wasm-pack --version)" != "wasm-pack 0.13.1" ]] ; then
-    echo "wasm-pack version 0.13.1 is not installed"
-    cargo install --force --locked --version 0.13.1 wasm-pack
-else
-    echo "wasm-pack version 0.13.1 is installed already"
+if contains_module cargo-deny; then
+  if ! cargo-deny --version 2>/dev/null | grep -q '^cargo-deny 0.16.2'; then
+    rustup run stable cargo install cargo-deny --version 0.16.2 --force --locked
+  fi
 fi
 
-# Currently fixing this to version 0.30 since version 0.31 has introduced
-# a change that means it only works with versions of node > 10.
-# https://github.com/igorshubovych/markdownlint-cli/issues/258
-# ubuntu 20.04 gives us version 10.19. We can revert once we update the
-# ci image to install a newer version of node.
-sudo npm -g install markdownlint-cli@0.30
-sudo npm -g install @datadog/datadog-ci
+if contains_module cargo-msrv; then
+  if ! cargo-msrv --version 2>/dev/null | grep -q '^cargo-msrv 0.18.4'; then
+    rustup run stable cargo install cargo-msrv --version 0.18.4 --force --locked
+  fi
+fi
+
+if contains_module dd-rust-license-tool; then
+  if ! dd-rust-license-tool --help &>/dev/null; then
+    rustup run stable cargo install dd-rust-license-tool --version 1.0.2 --force --locked
+  fi
+fi
 
-# Make sure our release build settings are present.
-. scripts/environment/release-flags.sh
+if contains_module wasm-pack; then
+  if ! wasm-pack --version | grep -q '^wasm-pack 0.13.1'; then
+    rustup run stable cargo install --locked --version 0.13.1 wasm-pack
+  fi
+fi
+
+if contains_module markdownlint; then
+  if [[ "$(markdownlint --version 2>/dev/null)" != "0.45.0" ]]; then
+    sudo npm install -g markdownlint-cli@0.45.0
+  fi
+fi
+
+if contains_module datadog-ci; then
+  if [[ "$(datadog-ci version 2>/dev/null)" != "v3.16.0" ]]; then
+    sudo npm install -g @datadog/datadog-ci@3.16.0
+  fi
+fi

From 774060bcccc11e950048652b463f119789feb4ad Mon Sep 17 00:00:00 2001
From: Pavlos Rontidis <pavlos.rontidis@gmail.com>
Date: Thu, 24 Jul 2025 12:27:04 -0400
Subject: [PATCH 209/305] chore(dev): reduce arbitrary sleep for IT script
 (#23420)

chore(dev): reduce arbitarty sleep for IT script
---
 scripts/int-e2e-test.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/int-e2e-test.sh b/scripts/int-e2e-test.sh
index 51f41999aec13..834f5f7b11b8c 100755
--- a/scripts/int-e2e-test.sh
+++ b/scripts/int-e2e-test.sh
@@ -18,7 +18,8 @@ TEST_TYPE=$1 # either "int" or "e2e"
 TEST_NAME=$2
 
 cargo vdev -v "${TEST_TYPE}" start -a "${TEST_NAME}"
-sleep 30
+# TODO this is arbitrary sleep. Investigate if it can be safely removed.
+sleep 15
 cargo vdev -v "${TEST_TYPE}" test --retries 2 -a "${TEST_NAME}"
 RET=$?
 

From 379ee5851121c476974d955b57c8cefc7e838624 Mon Sep 17 00:00:00 2001
From: Pavlos Rontidis <pavlos.rontidis@gmail.com>
Date: Thu, 24 Jul 2025 14:40:04 -0400
Subject: [PATCH 210/305] chore(ci): allow running E2E suite manually (#23423)

---
 .github/workflows/e2e.yml | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
index b8f0c22d77d2f..40e73d30bd3e7 100644
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -4,10 +4,12 @@
 #   - PRs if there are code changes to the source files that are noted in `vdev e2e ci_paths`
 #   - MQ (always pass)
 #   - Scheduled: at midnight UTC Tues-Sat
+#   - Manual trigger via Actions UI.
 
 name: E2E Test Suite
 
 on:
+  workflow_dispatch:
   pull_request:
   # Needs to pass by default in MQ
   merge_group:
@@ -55,6 +57,7 @@ jobs:
     needs: changes
     if: always() && (
       github.event_name == 'schedule' ||
+      github.event_name == 'workflow_dispatch' ||
       needs.changes.outputs.e2e-datadog-logs == 'true' ||
       needs.changes.outputs.e2e-datadog-metrics == 'true'
       )
@@ -78,7 +81,9 @@ jobs:
             echo "PR_HAS_ACCESS_TO_SECRETS=false" >> "$GITHUB_ENV"
           fi
 
-      - if: (github.event_name == 'schedule' || needs.changes.outputs.e2e-datadog-logs == 'true') &&
+      - if: (github.event_name == 'schedule' ||
+          github.event_name == 'workflow_dispatch' ||
+          needs.changes.outputs.e2e-datadog-logs == 'true') &&
           (github.event_name != 'pull_request' || env.PR_HAS_ACCESS_TO_SECRETS == 'true')
         name: e2e-datadog-logs
         uses: nick-fields/retry@ce71cc2ab81d554ebbe88c79ab5975992d79ba08 # v3.0.2
@@ -87,7 +92,9 @@ jobs:
           max_attempts: 3
           command: bash scripts/int-e2e-test.sh e2e datadog-logs
 
-      - if: (github.event_name == 'schedule' || needs.changes.outputs.e2e-datadog-metrics == 'true') &&
+      - if: (github.event_name == 'schedule' ||
+          github.event_name == 'workflow_dispatch' ||
+          needs.changes.outputs.e2e-datadog-metrics == 'true') &&
           (github.event_name != 'pull_request' || env.PR_HAS_ACCESS_TO_SECRETS == 'true')
         name: e2e-datadog-metrics
         uses: nick-fields/retry@ce71cc2ab81d554ebbe88c79ab5975992d79ba08 # v3.0.2

From 614e1957d121566eb69edba25473a858afe8bb4e Mon Sep 17 00:00:00 2001
From: Pavlos Rontidis <pavlos.rontidis@gmail.com>
Date: Thu, 24 Jul 2025 16:06:47 -0400
Subject: [PATCH 211/305] chore(dev): introduce OTEL E2E test (#23406)

* WIP

* wip

* otel configs

* add python sample generator

* more scaffolding

* remove gen_metric, something for another PR

* tweak log generator (minor)

* support debug runs

* more config options

* default to info

* fix port env vars

* add e2e case to e2e workflow

* create output dir (no need for mkdir -p)

* fix dep cycle

* test driver WIP

* playing with vdev + e2e config ...

* wip

* setup is starting with vdev

* no need to mount the log from the host

* add ability to run on review comment

* rename jobs

* md fixes

* use generated count

* cargo fmt --all

* count parsing

* cargo fmt --all

* need to recreate the file

* fix args

* improve logs generator

* make it more robust by comparing full files

* more robust test driver

* ran cargo fmt

* more robust test driver

* fix readme how to run section

* reduce AI slop

* revert vdev changes

* update changes.yml

* remove retries and log env vars

* nit
---
 .github/workflows/changes.yml                 |   2 +
 .github/workflows/ci-integration-review.yml   |   6 +
 .github/workflows/e2e.yml                     |   9 +-
 Cargo.toml                                    |  12 +-
 Makefile                                      |   2 +-
 scripts/e2e/opentelemetry-logs/README.md      |  25 +++
 scripts/e2e/opentelemetry-logs/compose.yaml   |  85 ++++++++
 .../opentelemetry-logs/generator/Dockerfile   |   4 +
 .../generator/logs_generator.py               | 125 +++++++++++
 .../generator/requirements.txt                |   1 +
 scripts/e2e/opentelemetry-logs/test.yaml      |  24 +++
 .../opentelemetry/logs/collector-sink.yaml    |  26 +++
 .../opentelemetry/logs/collector-source.yaml  |  28 +++
 .../e2e/opentelemetry/logs/output/.gitignore  |   1 +
 tests/data/e2e/opentelemetry/logs/vector.yaml |  82 +++++++
 tests/e2e/mod.rs                              |   2 +
 tests/e2e/opentelemetry/logs/mod.rs           | 202 ++++++++++++++++++
 tests/e2e/opentelemetry/mod.rs                |   1 +
 18 files changed, 633 insertions(+), 4 deletions(-)
 create mode 100644 scripts/e2e/opentelemetry-logs/README.md
 create mode 100644 scripts/e2e/opentelemetry-logs/compose.yaml
 create mode 100644 scripts/e2e/opentelemetry-logs/generator/Dockerfile
 create mode 100755 scripts/e2e/opentelemetry-logs/generator/logs_generator.py
 create mode 100644 scripts/e2e/opentelemetry-logs/generator/requirements.txt
 create mode 100644 scripts/e2e/opentelemetry-logs/test.yaml
 create mode 100644 tests/data/e2e/opentelemetry/logs/collector-sink.yaml
 create mode 100644 tests/data/e2e/opentelemetry/logs/collector-source.yaml
 create mode 100644 tests/data/e2e/opentelemetry/logs/output/.gitignore
 create mode 100644 tests/data/e2e/opentelemetry/logs/vector.yaml
 create mode 100644 tests/e2e/opentelemetry/logs/mod.rs
 create mode 100644 tests/e2e/opentelemetry/mod.rs

diff --git a/.github/workflows/changes.yml b/.github/workflows/changes.yml
index b73aedaec5df5..8a51ba0e1ad98 100644
--- a/.github/workflows/changes.yml
+++ b/.github/workflows/changes.yml
@@ -123,6 +123,8 @@ on:
         value: ${{ jobs.e2e_tests.outputs.datadog-logs }}
       e2e-datadog-metrics:
         value: ${{ jobs.e2e_tests.outputs.datadog-metrics }}
+      e2e-opentelemetry-logs:
+        value: ${{ jobs.e2e_tests.outputs.opentelemetry-logs }}
 env:
   BASE_REF: ${{ inputs.base_ref || (github.event_name == 'merge_group' && github.event.merge_group.base_ref) || github.event.pull_request.base.ref }}
   HEAD_REF: ${{ inputs.head_ref  || (github.event_name == 'merge_group' && github.event.merge_group.head_ref)  || github.event.pull_request.head.ref }}
diff --git a/.github/workflows/ci-integration-review.yml b/.github/workflows/ci-integration-review.yml
index 0b5b1b67bdfff..ce0ce7847238f 100644
--- a/.github/workflows/ci-integration-review.yml
+++ b/.github/workflows/ci-integration-review.yml
@@ -146,6 +146,12 @@ jobs:
           max_attempts: 3
           command: bash scripts/int-e2e-test.sh e2e datadog-metrics
 
+      - name: e2e-opentelemetry-logs
+        if: ${{ startsWith(github.event.review.body, '/ci-run-e2e-opentelemetry-logs')
+          || startsWith(github.event.review.body, '/ci-run-e2e-all')
+          || startsWith(github.event.review.body, '/ci-run-all') }}
+        run: bash scripts/int-e2e-test.sh e2e opentelemetry-logs
+
   update-pr-status:
     name: Signal result to PR
     runs-on: ubuntu-24.04
diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
index 40e73d30bd3e7..76a3dd9157da0 100644
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -39,7 +39,6 @@ env:
   # observing issues fetching boringssl via HTTPS in the OSX build, seeing if this helps
   # can be removed when we switch back to the upstream openssl-sys crate
   CARGO_NET_GIT_FETCH_WITH_CLI: true
-
 jobs:
 
   changes:
@@ -59,7 +58,8 @@ jobs:
       github.event_name == 'schedule' ||
       github.event_name == 'workflow_dispatch' ||
       needs.changes.outputs.e2e-datadog-logs == 'true' ||
-      needs.changes.outputs.e2e-datadog-metrics == 'true'
+      needs.changes.outputs.e2e-datadog-metrics == 'true' ||
+      needs.changes.outputs.e2e-opentelemetry-logs == 'true'
       )
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
@@ -103,6 +103,11 @@ jobs:
           max_attempts: 3
           command: bash scripts/int-e2e-test.sh e2e datadog-metrics
 
+      - if: (github.event_name == 'schedule' || needs.changes.outputs.e2e-opentelemetry-logs == 'true') &&
+          (github.event_name != 'pull_request' || env.PR_HAS_ACCESS_TO_SECRETS == 'true')
+        name: e2e-opentelemetry-logs
+        run: bash scripts/int-e2e-test.sh e2e opentelemetry-logs
+
 
   e2e-test-suite:
     name: E2E Test Suite
diff --git a/Cargo.toml b/Cargo.toml
index 69ef953ca152f..34f9ef3b9a568 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -959,7 +959,8 @@ test-utils = []
 
 # End-to-End testing-related features
 all-e2e-tests = [
-  "e2e-tests-datadog"
+  "e2e-tests-datadog",
+  "e2e-tests-opentelemetry"
 ]
 
 e2e-tests-datadog = [
@@ -969,6 +970,15 @@ e2e-tests-datadog = [
   "dep:async-compression"
 ]
 
+e2e-tests-opentelemetry = [
+  "sources-opentelemetry",
+  "sinks-opentelemetry",
+  "sources-internal_metrics",
+  "transforms-remap",
+  "sinks-console",
+  "sinks-file"
+]
+
 vector-api-tests = [
   "sources-demo_logs",
   "transforms-log_to_metric",
diff --git a/Makefile b/Makefile
index afe737044b878..7e3848ec79207 100644
--- a/Makefile
+++ b/Makefile
@@ -369,7 +369,7 @@ test-integration: test-integration-databend test-integration-docker-logs test-in
 test-integration: test-integration-eventstoredb test-integration-fluent test-integration-gcp test-integration-greptimedb test-integration-humio test-integration-http-client test-integration-influxdb
 test-integration: test-integration-kafka test-integration-logstash test-integration-loki test-integration-mongodb test-integration-nats
 test-integration: test-integration-nginx test-integration-opentelemetry test-integration-postgres test-integration-prometheus test-integration-pulsar
-test-integration: test-integration-redis test-integration-splunk test-integration-dnstap test-integration-datadog-agent test-integration-datadog-logs test-integration-e2e-datadog-logs
+test-integration: test-integration-redis test-integration-splunk test-integration-dnstap test-integration-datadog-agent test-integration-datadog-logs test-integration-e2e-datadog-logs test-integration-e2e-opentelemetry-logs
 test-integration: test-integration-datadog-traces test-integration-shutdown
 
 test-integration-%-cleanup:
diff --git a/scripts/e2e/opentelemetry-logs/README.md b/scripts/e2e/opentelemetry-logs/README.md
new file mode 100644
index 0000000000000..af55f71d0f3d7
--- /dev/null
+++ b/scripts/e2e/opentelemetry-logs/README.md
@@ -0,0 +1,25 @@
+# OpenTelemetry Vector E2E Log Pipeline Test
+
+This end-to-end (E2E) test validates that log events generated in a container are correctly ingested by Vector, processed, and forwarded to an OpenTelemetry Collector sink, where they are exported to a file for verification.
+
+## How this test works
+
+- **Orchestrates all required services:**
+  - **Log generator**: Emits fake OTLP logs.
+  - **Vector**: Receives, transforms, and forwards logs to the OTEL sink and a file.
+  - **OTEL Collector Source**: Forwards or processes logs upstream.
+  - **OTEL Collector Sink**: Receives logs from Vector and writes them to a file.
+- **Mounts volumes** to share configuration and output files between containers and the host.
+- **Exposes ports** for OTLP HTTP ingestion and for accessing Vector/collector APIs if needed.
+
+## How to Run
+
+```shell
+# from the repo root directory
+./scripts/int-e2e-test.sh e2e opentelemetry-logs
+```
+
+## Notes
+
+- The test ensures true end-to-end delivery and format compliance for OTLP logs through Vector and the OpenTelemetry Collector stack.
+- Adjust the log generator, remap logic, or assertions as needed for your use case.
diff --git a/scripts/e2e/opentelemetry-logs/compose.yaml b/scripts/e2e/opentelemetry-logs/compose.yaml
new file mode 100644
index 0000000000000..641a5f54dcb03
--- /dev/null
+++ b/scripts/e2e/opentelemetry-logs/compose.yaml
@@ -0,0 +1,85 @@
+name: opentelemetry-vector-e2e
+services:
+  cleanup-logs:
+    image: busybox
+    container_name: cleanup-logs
+    command: [ "sh", "-c", "rm -f /tmp/*.log" ]
+    volumes:
+      - type: bind
+        source: ../../../tests/data/e2e/opentelemetry/logs/output
+        target: /tmp
+
+  otel-collector-source:
+    image: otel/opentelemetry-collector-contrib:${CONFIG_COLLECTOR_VERSION:-latest}
+    container_name: otel-collector-source
+    init: true
+    volumes:
+      - type: bind
+        source: ../../../tests/data/e2e/opentelemetry/logs/collector-source.yaml
+        target: /etc/otelcol-contrib/config.yaml
+        read_only: true
+    ports:
+      - "${OTEL_COLLECTOR_SOURCE_GRPC_PORT:-4317}:4317"
+      - "${OTEL_COLLECTOR_SOURCE_HTTP_PORT:-4318}:4318"
+    command: [ "--config=/etc/otelcol-contrib/config.yaml" ]
+
+  logs-generator:
+    image: python:3.11-alpine
+    container_name: logs-generator
+    build:
+      context: ./generator
+    init: true
+    depends_on:
+      - otel-collector-source
+    volumes:
+      - type: bind
+        source: ./generator
+        target: /generator
+    environment:
+      - PYTHONUNBUFFERED=1
+    command: [ "python", "/generator/logs_generator.py", "-n", "100" ]
+
+  otel-collector-sink:
+    image: otel/opentelemetry-collector-contrib:${CONFIG_COLLECTOR_VERSION:-latest}
+    container_name: otel-collector-sink
+    init: true
+    volumes:
+      - type: bind
+        source: ../../../tests/data/e2e/opentelemetry/logs/collector-sink.yaml
+        target: /etc/otelcol-contrib/config.yaml
+        read_only: true
+      - type: bind
+        source: ../../../tests/data/e2e/opentelemetry/logs/output
+        target: /tmp
+    depends_on:
+      - cleanup-logs
+    ports:
+      - "${OTEL_COLLECTOR_SINK_HTTP_PORT:-5318}:5318"
+
+  vector:
+    build:
+      context: ../../../
+      dockerfile: ./scripts/e2e/Dockerfile
+      args:
+        FEATURES: e2e-tests-opentelemetry
+        RUST_VERSION: ${RUST_VERSION:-1.88}
+    image: vector-e2e:opentelemetry-logs
+    container_name: vector
+    init: true
+    depends_on:
+      - cleanup-logs
+      - otel-collector-source
+      - otel-collector-sink
+    volumes:
+      - type: bind
+        source: ../../../tests/data/e2e/opentelemetry/logs/vector.yaml
+        target: /etc/vector/vector.yaml
+        read_only: true
+      - type: bind
+        source: ../../../tests/data/e2e/opentelemetry/logs/output
+        target: /tmp
+    environment:
+      - VECTOR_LOG=${VECTOR_LOG:-info}
+      - FEATURES=e2e-tests-opentelemetry
+      - OTEL_E2E_OUTPUT_PATH
+    command: [ "vector", "-c", "/etc/vector/vector.yaml" ]
diff --git a/scripts/e2e/opentelemetry-logs/generator/Dockerfile b/scripts/e2e/opentelemetry-logs/generator/Dockerfile
new file mode 100644
index 0000000000000..349b4a8a669aa
--- /dev/null
+++ b/scripts/e2e/opentelemetry-logs/generator/Dockerfile
@@ -0,0 +1,4 @@
+FROM python:3.11-alpine
+WORKDIR /generator
+COPY requirements.txt logs_generator.py ./
+RUN pip install --no-cache-dir -r requirements.txt
diff --git a/scripts/e2e/opentelemetry-logs/generator/logs_generator.py b/scripts/e2e/opentelemetry-logs/generator/logs_generator.py
new file mode 100755
index 0000000000000..a5266485dc64a
--- /dev/null
+++ b/scripts/e2e/opentelemetry-logs/generator/logs_generator.py
@@ -0,0 +1,125 @@
+#!/usr/bin/env python3
+
+import argparse
+import json
+import random
+import time
+import uuid
+
+import requests
+
+SEVERITIES = ["DEBUG", "INFO", "WARN", "ERROR"]
+PATHS = ["/", "/login", "/api/data", "/metrics", "/health"]
+
+def generate_log(endpoint: str, count: int) -> dict:
+    now_nanos = time.time_ns()
+    timestamp = time.strftime("%Y-%m-%dT%H:%M:%S%z")
+    severity = random.choice(SEVERITIES)
+    log_id = str(uuid.uuid4())[:8]
+
+    log_data = {
+        "resourceLogs": [
+            {
+                "resource": {
+                    "attributes": [
+                        {"key": "service.name", "value": {"stringValue": "opentelemetry-logs"}}
+                    ]
+                },
+                "scopeLogs": [
+                    {
+                        "scope": {"name": "log-generator"},
+                        "logRecords": [
+                            {
+                                "timeUnixNano": now_nanos,
+                                "severityText": severity,
+                                "body": {"stringValue": f"[{log_id}] {severity} log {count} at {timestamp}"},
+                                "attributes": [
+                                    {"key": "count", "value": {"intValue": count}}
+                                ]
+                            }
+                        ]
+                    }
+                ]
+            }
+        ]
+    }
+
+    try:
+        response = requests.post(
+            endpoint,
+            data=json.dumps(log_data),
+            headers={"Content-Type": "application/json"},
+            timeout=2
+        )
+        if response.status_code == 200:
+            return {
+                "success": True,
+                "message": f"Log {count} sent successfully",
+                "log_id": log_id,
+                "status_code": response.status_code
+            }
+        else:
+            return {
+                "success": False,
+                "message": f"HTTP {response.status_code}: {response.text.strip() or '[empty]'}",
+                "log_id": log_id,
+                "status code": response.status_code,
+            }
+
+    except requests.exceptions.RequestException as e:
+        return {
+            "success": False,
+            "message": f"RequestException: {str(e)}",
+            "log_id": log_id,
+        }
+
+
+def non_negative_float(value):
+    f = float(value)
+    if f < 0:
+        raise argparse.ArgumentTypeError(f"Interval must be non-negative, got {value}")
+    return f
+
+
+def main():
+    parser = argparse.ArgumentParser(description="Generate OTLP logs periodically.")
+    parser.add_argument(
+        "--interval",
+        type=non_negative_float,
+        help="Seconds between log sends (non-negative, optional)"
+    )
+    parser.add_argument("-n", type=int, default=0, help="Total logs to send (0 or negative = infinite)")
+    parser.add_argument("--host", type=str, default="otel-collector-source", help="Host for the OTLP collector")
+    parser.add_argument("--port", type=int, default=4318, help="Port for OTLP HTTP logs")
+    parser.add_argument("--path", type=str, default="/v1/logs", help="OTLP HTTP logs path")
+
+    args = parser.parse_args()
+    endpoint = f"http://{args.host}:{args.port}{args.path}"
+
+    print(f"Starting log generator → {endpoint}")
+
+    count = 0
+    sent = 0
+    failed = 0
+
+    while True:
+        result = generate_log(endpoint, count)
+        count += 1
+        if result["success"]:
+            print(f"✅ Sent log {count} (ID: {result['log_id']})")
+            sent += 1
+        else:
+            print(f"❌ Failed log {count} (ID: {result['log_id']}): {result['message']}")
+            failed += 1
+
+        if 0 < args.n <= count:
+            break
+
+        if args.interval is not None:
+            time.sleep(args.interval)
+
+    print(f"\n📊 Finished: Sent={sent}, Failed={failed}")
+
+
+if __name__ == "__main__":
+    main()
diff --git a/scripts/e2e/opentelemetry-logs/generator/requirements.txt b/scripts/e2e/opentelemetry-logs/generator/requirements.txt
new file mode 100644
index 0000000000000..f2293605cf1b0
--- /dev/null
+++ b/scripts/e2e/opentelemetry-logs/generator/requirements.txt
@@ -0,0 +1 @@
+requests
diff --git a/scripts/e2e/opentelemetry-logs/test.yaml b/scripts/e2e/opentelemetry-logs/test.yaml
new file mode 100644
index 0000000000000..70e3862ae3347
--- /dev/null
+++ b/scripts/e2e/opentelemetry-logs/test.yaml
@@ -0,0 +1,24 @@
+features:
+- e2e-tests-opentelemetry
+
+test: "e2e"
+
+test_filter: "opentelemetry::logs::"
+
+runner:
+  env:
+    OTEL_COLLECTOR_SOURCE_GRPC_PORT: '4317'
+    OTEL_COLLECTOR_SOURCE_HTTP_PORT: '4318'
+    OTEL_COLLECTOR_SINK_HTTP_PORT: '5318'
+
+matrix:
+  # Determines which `otel/opentelemetry-collector-contrib` version to use
+  collector_version: [ 'latest' ]
+
+# Only trigger this integration test if relevant OTEL source/sink files change
+paths:
+  - "src/sources/opentelemetry/**"
+  - "src/sinks/opentelemetry/**"
+  - "src/internal_events/opentelemetry_*"
+  - "tests/e2e/opentelemetry/logs/**"
+  - "scripts/e2e/opentelemetry-logs/**"
diff --git a/tests/data/e2e/opentelemetry/logs/collector-sink.yaml b/tests/data/e2e/opentelemetry/logs/collector-sink.yaml
new file mode 100644
index 0000000000000..1bc7a7b6ca8b0
--- /dev/null
+++ b/tests/data/e2e/opentelemetry/logs/collector-sink.yaml
@@ -0,0 +1,26 @@
+receivers:
+  otlp:
+    protocols:
+      http:
+        endpoint: "0.0.0.0:5318"
+
+processors:
+  batch: { }
+
+exporters:
+  debug: { }
+  file:
+    path: /tmp/collector-file-exporter.log
+    rotation:
+      max_megabytes: 10
+      max_days: 1
+
+service:
+  pipelines:
+    logs:
+      receivers: [ otlp ]
+      processors: [ batch ]
+      exporters: [ debug, file ]
+  telemetry:
+    logs:
+      level: "debug"
diff --git a/tests/data/e2e/opentelemetry/logs/collector-source.yaml b/tests/data/e2e/opentelemetry/logs/collector-source.yaml
new file mode 100644
index 0000000000000..622a98ecbdc50
--- /dev/null
+++ b/tests/data/e2e/opentelemetry/logs/collector-source.yaml
@@ -0,0 +1,28 @@
+receivers:
+  otlp:
+    protocols:
+      http:
+        endpoint: "0.0.0.0:4318"
+      grpc:
+
+processors:
+  batch: { }
+
+exporters:
+  otlp:
+    endpoint: vector:4317
+    tls:
+      insecure: true
+  debug: { }
+
+service:
+  pipelines:
+    logs:
+      receivers: [ otlp ]
+      processors: [ batch ]
+      exporters: [ debug, otlp ]
+
+    metrics:
+      receivers: [ otlp ]
+      processors: [ batch ]
+      exporters: [ debug ]
diff --git a/tests/data/e2e/opentelemetry/logs/output/.gitignore b/tests/data/e2e/opentelemetry/logs/output/.gitignore
new file mode 100644
index 0000000000000..397b4a7624e35
--- /dev/null
+++ b/tests/data/e2e/opentelemetry/logs/output/.gitignore
@@ -0,0 +1 @@
+*.log
diff --git a/tests/data/e2e/opentelemetry/logs/vector.yaml b/tests/data/e2e/opentelemetry/logs/vector.yaml
new file mode 100644
index 0000000000000..defbcc5a59657
--- /dev/null
+++ b/tests/data/e2e/opentelemetry/logs/vector.yaml
@@ -0,0 +1,82 @@
+sources:
+  source0:
+    type: opentelemetry
+    grpc:
+      address: 0.0.0.0:4317
+    http:
+      address: 0.0.0.0:4318
+      keepalive:
+        max_connection_age_jitter_factor: 0.1
+        max_connection_age_secs: 300
+
+  internal_metrics:
+    type: internal_metrics
+    scrape_interval_secs: 60
+
+transforms:
+  remap_otel:
+    type: remap
+    inputs:
+      - source0.logs
+    source: |
+      . = {
+        "resourceLogs": [
+          {
+            "resource": {
+              "attributes": [
+                { "key": "service.name", "value": { "stringValue": "opentelemetry-logs" } }
+              ]
+            },
+            "scopeLogs": [
+              {
+                "scope": {
+                  "name": "log-generator"
+                },
+                "logRecords": [
+                  {
+                    "timeUnixNano": to_unix_timestamp!(.timestamp),
+                    "severityText": .severity_text,
+                    "body": { "stringValue": .message },
+                    "attributes": [
+                      { "key": "count", "value": { "intValue": get!(.attributes, ["count"]) } }
+                    ]
+                  }
+                ]
+              }
+            ]
+          }
+        ]
+      }
+
+sinks:
+  otel_sink:
+    inputs: [ "remap_otel" ]
+    type: opentelemetry
+    protocol:
+      type: http
+      uri: http://otel-collector-sink:5318/v1/logs
+      method: post
+      encoding:
+        codec: json
+      framing:
+        method: newline_delimited
+      batch:
+        max_events: 1
+      request:
+        headers:
+          content-type: application/json
+
+  otel_file_sink:
+    type: file
+    path: "/tmp/vector-file-sink.log"
+    inputs:
+      - remap_otel
+    encoding:
+      codec: json
+
+  metrics_console_sink:
+    type: console
+    inputs:
+      - internal_metrics
+    encoding:
+      codec: json
diff --git a/tests/e2e/mod.rs b/tests/e2e/mod.rs
index 1e3864b6d42fa..ad5d1822281d5 100644
--- a/tests/e2e/mod.rs
+++ b/tests/e2e/mod.rs
@@ -1,2 +1,4 @@
 #[cfg(feature = "e2e-tests-datadog")]
 mod datadog;
+#[cfg(feature = "e2e-tests-opentelemetry")]
+mod opentelemetry;
diff --git a/tests/e2e/opentelemetry/logs/mod.rs b/tests/e2e/opentelemetry/logs/mod.rs
new file mode 100644
index 0000000000000..64f0cbed53172
--- /dev/null
+++ b/tests/e2e/opentelemetry/logs/mod.rs
@@ -0,0 +1,202 @@
+use serde_json::Value;
+use std::collections::BTreeMap;
+use std::path::PathBuf;
+use std::time::Duration;
+use tokio::time::{sleep, timeout};
+use tracing::info;
+
+const MAXIMUM_WAITING_DURATION: Duration = Duration::from_secs(30);
+const POLLING_INTERVAL: Duration = Duration::from_millis(500);
+const EXPECTED_LOG_COUNT: usize = 100;
+
+fn log_output_dir() -> PathBuf {
+    std::env::current_dir()
+        .expect("Failed to get current dir")
+        .join("tests")
+        .join("data")
+        .join("e2e")
+        .join("opentelemetry")
+        .join("logs")
+        .join("output")
+}
+
+fn collector_log_path() -> PathBuf {
+    log_output_dir().join("collector-file-exporter.log")
+}
+
+fn vector_log_path() -> PathBuf {
+    log_output_dir().join("vector-file-sink.log")
+}
+
+fn extract_count(value: &Value) -> u64 {
+    value
+        .get("attributes")
+        .and_then(|attrs| attrs.as_array())
+        .and_then(|arr| {
+            arr.iter().find_map(|attr| {
+                if attr.get("key")?.as_str()? == "count" {
+                    attr.get("value")?
+                        .get("intValue")?
+                        .as_str()
+                        .and_then(|s| s.parse::<u64>().ok())
+                        .or_else(|| attr.get("value")?.get("intValue")?.as_u64())
+                } else {
+                    None
+                }
+            })
+        })
+        .expect("Missing or invalid 'count' attribute in log record")
+}
+
+fn sanitize(mut value: Value) -> Value {
+    if let Some(obj) = value.as_object_mut() {
+        obj.remove("traceId");
+        obj.remove("spanId");
+    };
+    value
+}
+
+fn normalize_numbers_to_strings(value: &Value) -> Value {
+    match value {
+        Value::Object(map) => {
+            let normalized = map
+                .iter()
+                .map(|(k, v)| (k.clone(), normalize_numbers_to_strings(v)))
+                .collect();
+            Value::Object(normalized)
+        }
+        Value::Array(arr) => {
+            let normalized = arr.iter().map(normalize_numbers_to_strings).collect();
+            Value::Array(normalized)
+        }
+        Value::Number(n) => Value::String(n.to_string()),
+        other => other.clone(),
+    }
+}
+
+async fn read_log_records(path: &PathBuf) -> BTreeMap<u64, Value> {
+    let content = tokio::fs::read_to_string(path)
+        .await
+        .unwrap_or_else(|_| panic!("Failed to read log file {}", path.display()));
+
+    let mut result = BTreeMap::new();
+
+    for (idx, line) in content.lines().enumerate() {
+        let root: Value = serde_json::from_str(line).unwrap_or_else(|_| {
+            panic!(
+                "Malformed JSON on line {} in {}\nLine: {line}",
+                idx + 1,
+                path.display()
+            )
+        });
+
+        let resource_logs = root
+            .get("resourceLogs")
+            .and_then(|v| v.as_array())
+            .unwrap_or_else(|| {
+                panic!(
+                    "Missing or invalid 'resourceLogs' in line {} of {}",
+                    idx + 1,
+                    path.display()
+                )
+            });
+
+        for resource in resource_logs {
+            let scope_logs = resource
+                .get("scopeLogs")
+                .and_then(|v| v.as_array())
+                .unwrap_or_else(|| {
+                    panic!(
+                        "Missing or invalid 'scopeLogs' in line {} of {}",
+                        idx + 1,
+                        path.display()
+                    )
+                });
+
+            for scope in scope_logs {
+                let log_records = scope
+                    .get("logRecords")
+                    .and_then(|v| v.as_array())
+                    .unwrap_or_else(|| {
+                        panic!(
+                            "Missing or invalid 'logRecords' in line {} of {}",
+                            idx + 1,
+                            path.display()
+                        )
+                    });
+
+                for record in log_records {
+                    let count = extract_count(record);
+                    let sanitized = sanitize(record.clone());
+                    if result.insert(count, sanitized).is_some() {
+                        panic!("Duplicate count value {count} in {}", path.display());
+                    }
+                }
+            }
+        }
+    }
+    result
+}
+
+/// # Panics
+/// After the timeout, this function will panic if both logs are not ready.
+async fn wait_for_logs() -> (BTreeMap<u64, Value>, BTreeMap<u64, Value>) {
+    let mut collector_acc: BTreeMap<u64, Value> = BTreeMap::new();
+    let mut vector_acc: BTreeMap<u64, Value> = BTreeMap::new();
+
+    timeout(MAXIMUM_WAITING_DURATION, async {
+        loop {
+            let collector_read = read_log_records(&collector_log_path()).await;
+            let vector_read = read_log_records(&vector_log_path()).await;
+
+            // Merge into accumulators, skipping duplicates
+            for (k, v) in collector_read {
+                collector_acc.entry(k).or_insert(v);
+            }
+            for (k, v) in vector_read {
+                vector_acc.entry(k).or_insert(v);
+            }
+
+            let c_len = collector_acc.len();
+            let v_len = vector_acc.len();
+
+            if c_len >= EXPECTED_LOG_COUNT && v_len >= EXPECTED_LOG_COUNT {
+                return (collector_acc, vector_acc);
+            }
+
+            info!("Waiting for logs... collector: {c_len}, vector: {v_len}");
+
+            sleep(POLLING_INTERVAL).await;
+        }
+    })
+    .await
+    .expect("Timed out waiting for both log files to contain sufficient records")
+}
+
+#[tokio::test]
+async fn vector_sink_otel_sink_logs_match() {
+    let (collector_log_records, vector_log_records) = wait_for_logs().await;
+
+    assert_eq!(
+        collector_log_records.len(),
+        EXPECTED_LOG_COUNT,
+        "Collector did not produce expected number of log records"
+    );
+    assert_eq!(
+        vector_log_records.len(),
+        EXPECTED_LOG_COUNT,
+        "Vector did not produce expected number of log records"
+    );
+
+    for count in 0..EXPECTED_LOG_COUNT as u64 {
+        let collector_log = collector_log_records
+            .get(&count)
+            .unwrap_or_else(|| panic!("Missing {count}) key"));
+        let vector_log = vector_log_records
+            .get(&count)
+            .unwrap_or_else(|| panic!("Missing {count}) key"));
+        let collector_log_normalized = normalize_numbers_to_strings(collector_log);
+        let vector_log_normalized = normalize_numbers_to_strings(vector_log);
+        assert_eq!(collector_log_normalized, vector_log_normalized);
+    }
+}
diff --git a/tests/e2e/opentelemetry/mod.rs b/tests/e2e/opentelemetry/mod.rs
new file mode 100644
index 0000000000000..af2c2c342fa4c
--- /dev/null
+++ b/tests/e2e/opentelemetry/mod.rs
@@ -0,0 +1 @@
+pub mod logs;

From b695d2291fab68fd4619d180f06d7790ef3beb88 Mon Sep 17 00:00:00 2001
From: Pavlos Rontidis <pavlos.rontidis@gmail.com>
Date: Thu, 24 Jul 2025 16:34:48 -0400
Subject: [PATCH 212/305] chore(ci): allow running E2E suite manually (#23425)

---
 .github/workflows/e2e.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
index 76a3dd9157da0..c0d2eb6516ac6 100644
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -103,7 +103,9 @@ jobs:
           max_attempts: 3
           command: bash scripts/int-e2e-test.sh e2e datadog-metrics
 
-      - if: (github.event_name == 'schedule' || needs.changes.outputs.e2e-opentelemetry-logs == 'true') &&
+      - if: (github.event_name == 'schedule' ||
+          github.event_name == 'workflow_dispatch' ||
+          needs.changes.outputs.e2e-opentelemetry-logs == 'true') &&
           (github.event_name != 'pull_request' || env.PR_HAS_ACCESS_TO_SECRETS == 'true')
         name: e2e-opentelemetry-logs
         run: bash scripts/int-e2e-test.sh e2e opentelemetry-logs

From e4cecb5d81544ecc3fc26734a5e02bd54092f734 Mon Sep 17 00:00:00 2001
From: Thomas <thomas.schneider@datadoghq.com>
Date: Thu, 24 Jul 2025 16:40:05 -0400
Subject: [PATCH 213/305] fix(buffers): wait 1s before panicking in test
 (#23424)

* fix(buffers): wait 1s before panicking

* Use imports instead of qualified names

* Fix clippy warning

* Remove unused import
---
 .../src/variants/disk_v2/tests/basic.rs           | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/lib/vector-buffers/src/variants/disk_v2/tests/basic.rs b/lib/vector-buffers/src/variants/disk_v2/tests/basic.rs
index 781e30ad5b217..ff0c1055c0f23 100644
--- a/lib/vector-buffers/src/variants/disk_v2/tests/basic.rs
+++ b/lib/vector-buffers/src/variants/disk_v2/tests/basic.rs
@@ -1,7 +1,8 @@
-use std::io::Cursor;
+use std::{io::Cursor, time::Duration};
 
 use futures::{stream, StreamExt};
-use tokio_test::{assert_pending, assert_ready, task::spawn};
+use tokio::{select, time::sleep};
+use tokio_test::{assert_pending, task::spawn};
 use tracing::Instrument;
 use vector_common::finalization::Finalizable;
 
@@ -127,7 +128,15 @@ async fn reader_exits_cleanly_when_writer_done_and_in_flight_acks() {
             // albeit with a return value of `None`... because the writer is closed, and we read all
             // the records, so nothing is left. :)
             assert!(blocked_read.is_woken());
-            let second_read = assert_ready!(blocked_read.poll());
+
+            let second_read = select! {
+                // if the reader task finishes in time, extract its output
+                res = blocked_read => res,
+                // otherwise panics after 1s
+                () = sleep(Duration::from_secs(1)) => {
+                    panic!("Reader not ready after 1s");
+                }
+            };
             assert_eq!(second_read.expect("read should not fail"), None);
 
             // All records should be consumed at this point.

From 49fae0916f85cd871e59c423bdc72e3eb5c76dec Mon Sep 17 00:00:00 2001
From: Pavlos Rontidis <pavlos.rontidis@gmail.com>
Date: Fri, 25 Jul 2025 09:03:44 -0400
Subject: [PATCH 214/305] chore(remap transform): mark as stable (#23431)

---
 website/cue/reference/components/transforms/remap.cue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/website/cue/reference/components/transforms/remap.cue b/website/cue/reference/components/transforms/remap.cue
index d19cdd1fdd25d..c27de5b1c6fee 100644
--- a/website/cue/reference/components/transforms/remap.cue
+++ b/website/cue/reference/components/transforms/remap.cue
@@ -13,7 +13,7 @@ components: transforms: "remap": {
 
 	classes: {
 		commonly_used: true
-		development:   "beta"
+		development:   "stable"
 		egress_method: "stream"
 		stateful:      false
 	}

From 9b3fb7b7597c34b86ace31e69fd415301258fc66 Mon Sep 17 00:00:00 2001
From: Thomas <thomas.schneider@datadoghq.com>
Date: Fri, 25 Jul 2025 10:28:19 -0400
Subject: [PATCH 215/305] chore(ci): switch macos to xlarge runner (#23433)

---
 .github/workflows/unit_mac.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/unit_mac.yml b/.github/workflows/unit_mac.yml
index 03104b981cd65..67c21d25ba58d 100644
--- a/.github/workflows/unit_mac.yml
+++ b/.github/workflows/unit_mac.yml
@@ -8,7 +8,7 @@ permissions:
 
 jobs:
   unit-mac:
-    runs-on: macos-14
+    runs-on: macos-14-xlarge
     timeout-minutes: 90
     env:
       CARGO_INCREMENTAL: 0

From 7cf4b0fba0ee2b09e90d5c6066e2058471e6bd42 Mon Sep 17 00:00:00 2001
From: Pavlos Rontidis <pavlos.rontidis@gmail.com>
Date: Fri, 25 Jul 2025 12:52:42 -0400
Subject: [PATCH 216/305] chore(ci): scripts/int-e2e-test.sh debugging
 improvements (#23434)

* chore(ci): scripts/int-e2e-test.sh debugging improvements

* remove unrelated if block
---
 scripts/int-e2e-test.sh | 46 ++++++++++++++++++++++++++---------------
 1 file changed, 29 insertions(+), 17 deletions(-)

diff --git a/scripts/int-e2e-test.sh b/scripts/int-e2e-test.sh
index 834f5f7b11b8c..6f6e49f9b2d50 100755
--- a/scripts/int-e2e-test.sh
+++ b/scripts/int-e2e-test.sh
@@ -14,29 +14,41 @@ fi
 
 set -x
 
+SCRIPT_DIR=$(realpath "$(dirname "${BASH_SOURCE[0]}")")
 TEST_TYPE=$1 # either "int" or "e2e"
 TEST_NAME=$2
 
+print_compose_logs_on_failure() {
+  local LAST_RETURN_CODE=$1
+
+  if [[ $LAST_RETURN_CODE -ne 0 ]]; then
+    case "$TEST_TYPE" in
+      int) TYPE_DIR="integration" ;;
+      e2e) TYPE_DIR="e2e" ;;
+      *) TYPE_DIR="" ;;
+    esac
+
+    if [[ -n "$TYPE_DIR" ]]; then
+      local COMPOSE_DIR="${SCRIPT_DIR}/${TYPE_DIR}/${TEST_NAME}"
+      (docker compose -f "${COMPOSE_DIR}/compose.yaml" logs) || echo "Failed to collect logs"
+    fi
+  fi
+}
+
 cargo vdev -v "${TEST_TYPE}" start -a "${TEST_NAME}"
+START_RET=$?
+print_compose_logs_on_failure $START_RET
+
 # TODO this is arbitrary sleep. Investigate if it can be safely removed.
 sleep 15
-cargo vdev -v "${TEST_TYPE}" test --retries 2 -a "${TEST_NAME}"
-RET=$?
-
-# Output docker compose logs on failure
-if [[ $RET -ne 0 ]]; then
-  SCRIPT_DIR=$(realpath "$(dirname "${BASH_SOURCE[0]}")")
-
-  case "$TEST_TYPE" in
-    int) TYPE_DIR="integration" ;;
-    e2e) TYPE_DIR="e2e" ;;
-    *) TYPE_DIR="" ;;
-  esac
-
-  if [[ -n "$TYPE_DIR" ]]; then
-    COMPOSE_DIR="${SCRIPT_DIR}/${TYPE_DIR}/${TEST_NAME}"
-    (cd "${COMPOSE_DIR}" && docker compose logs)
-  fi
+
+if [[ $START_RET -eq 0 ]]; then
+  cargo vdev -v "${TEST_TYPE}" test --retries 2 -a "${TEST_NAME}"
+  RET=$?
+  print_compose_logs_on_failure $RET
+else
+  echo "Skipping test phase because 'vdev start' failed"
+  RET=$START_RET
 fi
 
 cargo vdev -v "${TEST_TYPE}" stop -a "${TEST_NAME}"

From af98d9f5afe9fc1d1906279d441cd802bfa85b64 Mon Sep 17 00:00:00 2001
From: Pavlos Rontidis <pavlos.rontidis@gmail.com>
Date: Fri, 25 Jul 2025 13:53:05 -0400
Subject: [PATCH 217/305] chore(ci): e2e otel fixes (#23435)

* chore(ci): scripts/int-e2e-test.sh debugging improvements

* remove unrelated if block

* chore(ci): e2e otel - fix logs cleanup logic

* remove container_name params

* remove old logs if any before starting the test
---
 scripts/e2e/opentelemetry-logs/compose.yaml | 16 ----------------
 scripts/int-e2e-test.sh                     |  4 ++++
 2 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/scripts/e2e/opentelemetry-logs/compose.yaml b/scripts/e2e/opentelemetry-logs/compose.yaml
index 641a5f54dcb03..ea57b3d615308 100644
--- a/scripts/e2e/opentelemetry-logs/compose.yaml
+++ b/scripts/e2e/opentelemetry-logs/compose.yaml
@@ -1,17 +1,7 @@
 name: opentelemetry-vector-e2e
 services:
-  cleanup-logs:
-    image: busybox
-    container_name: cleanup-logs
-    command: [ "sh", "-c", "rm -f /tmp/*.log" ]
-    volumes:
-      - type: bind
-        source: ../../../tests/data/e2e/opentelemetry/logs/output
-        target: /tmp
-
   otel-collector-source:
     image: otel/opentelemetry-collector-contrib:${CONFIG_COLLECTOR_VERSION:-latest}
-    container_name: otel-collector-source
     init: true
     volumes:
       - type: bind
@@ -25,7 +15,6 @@ services:
 
   logs-generator:
     image: python:3.11-alpine
-    container_name: logs-generator
     build:
       context: ./generator
     init: true
@@ -41,7 +30,6 @@ services:
 
   otel-collector-sink:
     image: otel/opentelemetry-collector-contrib:${CONFIG_COLLECTOR_VERSION:-latest}
-    container_name: otel-collector-sink
     init: true
     volumes:
       - type: bind
@@ -51,8 +39,6 @@ services:
       - type: bind
         source: ../../../tests/data/e2e/opentelemetry/logs/output
         target: /tmp
-    depends_on:
-      - cleanup-logs
     ports:
       - "${OTEL_COLLECTOR_SINK_HTTP_PORT:-5318}:5318"
 
@@ -64,10 +50,8 @@ services:
         FEATURES: e2e-tests-opentelemetry
         RUST_VERSION: ${RUST_VERSION:-1.88}
     image: vector-e2e:opentelemetry-logs
-    container_name: vector
     init: true
     depends_on:
-      - cleanup-logs
       - otel-collector-source
       - otel-collector-sink
     volumes:
diff --git a/scripts/int-e2e-test.sh b/scripts/int-e2e-test.sh
index 6f6e49f9b2d50..8b3858d3bfe3b 100755
--- a/scripts/int-e2e-test.sh
+++ b/scripts/int-e2e-test.sh
@@ -35,6 +35,10 @@ print_compose_logs_on_failure() {
   fi
 }
 
+if [[ "$TEST_NAME" == "opentelemetry-logs" ]]; then
+  find "${SCRIPT_DIR}/../tests/data/e2e/opentelemetry/logs/output" -type f -name '*.log' -delete
+fi
+
 cargo vdev -v "${TEST_TYPE}" start -a "${TEST_NAME}"
 START_RET=$?
 print_compose_logs_on_failure $START_RET

From c0c060e6bbdef860bc348122b0729278beb7fb96 Mon Sep 17 00:00:00 2001
From: Thomas <thomas.schneider@datadoghq.com>
Date: Fri, 25 Jul 2025 15:37:58 -0400
Subject: [PATCH 218/305] chore(ci): use cargo binstall in prepare.sh (#23436)

* chore(ci): use cargo binstall in prepare.sh

* Use arrays to make shellcheck happy

* Update binstall linux sha256sum

* Remove cargo home check
---
 scripts/environment/binstall.sh | 75 +++++++++++++++++++++++++++++++++
 scripts/environment/prepare.sh  | 40 ++++++++++++++----
 2 files changed, 106 insertions(+), 9 deletions(-)
 create mode 100755 scripts/environment/binstall.sh

diff --git a/scripts/environment/binstall.sh b/scripts/environment/binstall.sh
new file mode 100755
index 0000000000000..def6e9eb7b3cc
--- /dev/null
+++ b/scripts/environment/binstall.sh
@@ -0,0 +1,75 @@
+#!/usr/bin/env bash
+
+set -eux
+set -o pipefail
+
+BINSTALL_VERSION="v1.14.1"
+BINSTALL_SHA256SUM_X86_64_LINUX="e1d1231720e6ed497a4b0f8881b08f5df9ce1a938fb3ae6f2444e95eb601fe99"
+BINSTALL_SHA256SUM_AARCH64_LINUX="17d69bcc07a0e38c912e7f596ed71b1f5f59dc8980da59890c5bc86c07e8506a"
+BINSTALL_SHA256SUM_ARMV7_LINUX="e4ba720023e02b071aa805ae62412e94741c1bb0e0a2bb2b35896fec3d140128"
+BINSTALL_SHA256SUM_AARCH64_DARWIN="07d46d31fb68ac10b906c5d39d611ded7787966f4ed15c598cb6175b45a2b069"
+BINSTALL_SHA256SUM_X86_64_DARWIN="3de381bdcca08c418dc790d2a283711894a0577c6e55bba0d4e6cb8b0378b36"
+
+pushd "$(mktemp -d)"
+
+base_url="https://github.com/cargo-bins/cargo-binstall/releases/download/${BINSTALL_VERSION}/cargo-binstall"
+
+download() {
+  curl --retry 3 --proto '=https' --tlsv1.2 -fsSL "$@"
+}
+
+os="$(uname -s)"
+machine="$(uname -m)"
+
+if [ "$os" = "Darwin" ]; then
+  if [ "$machine" = "arm64" ]; then
+    url="${base_url}-aarch64-apple-darwin.zip"
+    download_sha256sum="${BINSTALL_SHA256SUM_AARCH64_DARWIN}"
+  elif [ "$machine" = "x86_64" ]; then
+    url="${base_url}-x86_64-apple-darwin.zip"
+    download_sha256sum="${BINSTALL_SHA256SUM_X86_64_DARWIN}"
+  else
+    echo "Unsupported OS ${os} machine ${machine}"
+    popd
+    exit 1
+  fi
+
+  download -o output.zip "$url"
+elif [ "$os" = "Linux" ]; then
+  if [ "$machine" = "armv7l" ]; then
+    target="armv7-unknown-linux-musleabihf"
+    download_sha256sum="${BINSTALL_SHA256SUM_ARMV7_LINUX}"
+  elif [ "$machine" = "aarch64" ]; then
+    target="${machine}-unknown-linux-musl"
+    download_sha256sum="${BINSTALL_SHA256SUM_AARCH64_LINUX}"
+  elif [ "$machine" = "x86_64" ]; then
+    target="${machine}-unknown-linux-musl"
+    download_sha256sum="${BINSTALL_SHA256SUM_X86_64_LINUX}"
+  else
+    echo "Unsupported OS ${os} machine ${machine}"
+    popd
+    exit 1
+  fi
+
+  url="${base_url}-${target}.tgz"
+
+  download -o output.tgz "$url"
+# elif [ "${OS-}" = "Windows_NT" ]; then
+#   target="${machine}-pc-windows-msvc"
+#   url="${base_url}-${target}.zip"
+#   download -o output.zip "$url"
+else
+    echo "Unsupported OS ${os}"
+    popd
+    exit 1
+fi
+
+echo "${download_sha256sum} $(echo output.*)" | sha256sum --check
+
+case "$(echo output.*)" in
+    *.zip) unzip output.* ;;
+    *.tgz) tar -xvzf output.* ;;
+    *) >&2 echo "output.* not found"; exit 1 ;;
+esac
+
+./cargo-binstall --self-install || ./cargo-binstall -y --force cargo-binstall
diff --git a/scripts/environment/prepare.sh b/scripts/environment/prepare.sh
index 5836f789083d8..bf39d7205d690 100755
--- a/scripts/environment/prepare.sh
+++ b/scripts/environment/prepare.sh
@@ -77,8 +77,21 @@ contains_module() {
 # Always ensure git safe.directory is set
 git config --global --add safe.directory "$(pwd)"
 
-if ! contains_module rustup; then
-  REQUIRES_RUSTUP=(cargo-deb cross cargo-nextest cargo-deny cargo-msrv dd-rust-license-tool wasm-pack)
+REQUIRES_RUSTUP=(dd-rust-license-tool cargo-deb cross cargo-nextest cargo-deny cargo-msrv wasm-pack)
+
+REQUIRES_BINSTALL=("${REQUIRES_RUSTUP[@]}")
+unset -v 'REQUIRES_BINSTALL[0]' # remove dd-rust-license-tool
+require_binstall=false
+
+for tool in "${REQUIRES_BINSTALL[@]}"; do
+  if contains_module "$tool"; then
+    require_binstall=true
+    MODULES=(rustup "${MODULES[@]}")
+    break
+  fi
+done
+
+if [ "${require_binstall}" = "false" ] && ! contains_module rustup; then
   for tool in "${REQUIRES_RUSTUP[@]}"; do
     if contains_module "$tool"; then
       MODULES=(rustup "${MODULES[@]}")
@@ -87,40 +100,49 @@ if ! contains_module rustup; then
   done
 fi
 
+install=(install)
 if contains_module rustup; then
   . scripts/environment/release-flags.sh
 
   rustup show active-toolchain || rustup toolchain install stable
   rustup show
-fi
 
+  if [ "${require_binstall}" = "true" ]; then
+    if cargo binstall -V &>/dev/null || ./scripts/environment/binstall.sh; then
+      install=(binstall -y)
+    else
+      echo "Failed to install cargo binstall, defaulting to cargo install"
+    fi
+  fi
+fi
+set -e -o verbose
 if contains_module cargo-deb; then
   if [[ "$(cargo-deb --version 2>/dev/null)" != "2.0.2" ]]; then
-    rustup run stable cargo install cargo-deb --version 2.0.2 --force --locked
+    rustup run stable cargo "${install[@]}" cargo-deb --version 2.0.2 --force --locked
   fi
 fi
 
 if contains_module cross; then
   if ! cross --version 2>/dev/null | grep -q '^cross 0.2.5'; then
-    rustup run stable cargo install cross --version 0.2.5 --force --locked
+    rustup run stable cargo "${install[@]}" cross --version 0.2.5 --force --locked
   fi
 fi
 
 if contains_module cargo-nextest; then
   if ! cargo-nextest --version 2>/dev/null | grep -q '^cargo-nextest 0.9.95'; then
-    rustup run stable cargo install cargo-nextest --version 0.9.95 --force --locked
+    rustup run stable cargo "${install[@]}" cargo-nextest --version 0.9.95 --force --locked
   fi
 fi
 
 if contains_module cargo-deny; then
   if ! cargo-deny --version 2>/dev/null | grep -q '^cargo-deny 0.16.2'; then
-    rustup run stable cargo install cargo-deny --version 0.16.2 --force --locked
+    rustup run stable cargo "${install[@]}" cargo-deny --version 0.16.2 --force --locked
   fi
 fi
 
 if contains_module cargo-msrv; then
   if ! cargo-msrv --version 2>/dev/null | grep -q '^cargo-msrv 0.18.4'; then
-    rustup run stable cargo install cargo-msrv --version 0.18.4 --force --locked
+    rustup run stable cargo "${install[@]}" cargo-msrv --version 0.18.4 --force --locked
   fi
 fi
 
@@ -132,7 +154,7 @@ fi
 
 if contains_module wasm-pack; then
   if ! wasm-pack --version | grep -q '^wasm-pack 0.13.1'; then
-    rustup run stable cargo install --locked --version 0.13.1 wasm-pack
+    rustup run stable cargo "${install[@]}" --locked --version 0.13.1 wasm-pack
   fi
 fi
 

From 878708f8cd32dd4724890d51d4b9b27fe6188f55 Mon Sep 17 00:00:00 2001
From: Thomas <thomas.schneider@datadoghq.com>
Date: Fri, 25 Jul 2025 15:46:37 -0400
Subject: [PATCH 219/305] chore(file source): half # of tests ran by quickcheck
 (#23439)

---
 lib/file-source/src/file_watcher/tests/experiment.rs          | 4 ++--
 .../src/file_watcher/tests/experiment_no_truncations.rs       | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/file-source/src/file_watcher/tests/experiment.rs b/lib/file-source/src/file_watcher/tests/experiment.rs
index d58ce37162b8e..17bd3f5f9539d 100644
--- a/lib/file-source/src/file_watcher/tests/experiment.rs
+++ b/lib/file-source/src/file_watcher/tests/experiment.rs
@@ -132,7 +132,7 @@ fn file_watcher_with_truncation() {
         TestResult::passed()
     }
     QuickCheck::new()
-        .tests(10000)
-        .max_tests(100000)
+        .tests(5000)
+        .max_tests(50000)
         .quickcheck(inner as fn(Vec<FileWatcherAction>) -> TestResult);
 }
diff --git a/lib/file-source/src/file_watcher/tests/experiment_no_truncations.rs b/lib/file-source/src/file_watcher/tests/experiment_no_truncations.rs
index 421a274cf02f5..363fb6f761b9a 100644
--- a/lib/file-source/src/file_watcher/tests/experiment_no_truncations.rs
+++ b/lib/file-source/src/file_watcher/tests/experiment_no_truncations.rs
@@ -99,7 +99,7 @@ fn file_watcher_no_truncation() {
         TestResult::passed()
     }
     QuickCheck::new()
-        .tests(10000)
-        .max_tests(100000)
+        .tests(5000)
+        .max_tests(50000)
         .quickcheck(inner as fn(Vec<FileWatcherAction>) -> TestResult);
 }

From f136fb48edc1f8b2880a420a4f1aa8d8b457003d Mon Sep 17 00:00:00 2001
From: Pavlos Rontidis <pavlos.rontidis@gmail.com>
Date: Mon, 28 Jul 2025 09:38:25 -0400
Subject: [PATCH 220/305] chore(ci): skip e2e otel until it's fixed (#23445)

---
 .github/workflows/e2e.yml | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
index c0d2eb6516ac6..9ac67c7f879ba 100644
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -103,12 +103,13 @@ jobs:
           max_attempts: 3
           command: bash scripts/int-e2e-test.sh e2e datadog-metrics
 
-      - if: (github.event_name == 'schedule' ||
-          github.event_name == 'workflow_dispatch' ||
-          needs.changes.outputs.e2e-opentelemetry-logs == 'true') &&
-          (github.event_name != 'pull_request' || env.PR_HAS_ACCESS_TO_SECRETS == 'true')
-        name: e2e-opentelemetry-logs
-        run: bash scripts/int-e2e-test.sh e2e opentelemetry-logs
+  # TODO re-enable when fixed.
+  #      - if: (github.event_name == 'schedule' ||
+  #          github.event_name == 'workflow_dispatch' ||
+  #          needs.changes.outputs.e2e-opentelemetry-logs == 'true') &&
+  #          (github.event_name != 'pull_request' || env.PR_HAS_ACCESS_TO_SECRETS == 'true')
+  #        name: e2e-opentelemetry-logs
+  #        run: bash scripts/int-e2e-test.sh e2e opentelemetry-logs
 
 
   e2e-test-suite:

From 041a3b1727137e80897cac2e2738d0ad4a8f5c8f Mon Sep 17 00:00:00 2001
From: Pavlos Rontidis <pavlos.rontidis@gmail.com>
Date: Mon, 28 Jul 2025 09:39:06 -0400
Subject: [PATCH 221/305] fix(ci): fix trigger for DD logs E2E (#23446)

---
 .github/workflows/ci-integration-review.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci-integration-review.yml b/.github/workflows/ci-integration-review.yml
index ce0ce7847238f..4f59527acf6ab 100644
--- a/.github/workflows/ci-integration-review.yml
+++ b/.github/workflows/ci-integration-review.yml
@@ -128,7 +128,7 @@ jobs:
       - run: docker image prune -af ; docker container prune -f
       - name: e2e-datadog-logs
         if: ${{ startsWith(github.event.review.body, '/ci-run-e2e-datadog-logs')
-          || startsWith(github.event.review.body, '/ci-run-integration-all')
+          || startsWith(github.event.review.body, '/ci-run-e2e-all')
           || startsWith(github.event.review.body, '/ci-run-all') }}
         uses: nick-fields/retry@ce71cc2ab81d554ebbe88c79ab5975992d79ba08 # v3.0.2
         with:

From 0cf042e307c12ad297f73665b08a826dc4e61023 Mon Sep 17 00:00:00 2001
From: Pavlos Rontidis <pavlos.rontidis@gmail.com>
Date: Mon, 28 Jul 2025 09:56:45 -0400
Subject: [PATCH 222/305] chore(vdev): remove orphan containers (#23444)

* chore(vdev): remove orphan containers

* ran cargo fmt
---
 vdev/src/testing/integration.rs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/vdev/src/testing/integration.rs b/vdev/src/testing/integration.rs
index d7758b903c61a..4f175d9cda710 100644
--- a/vdev/src/testing/integration.rs
+++ b/vdev/src/testing/integration.rs
@@ -278,7 +278,11 @@ impl Compose {
 
     fn stop(&self) -> Result<()> {
         // The config settings are not needed when stopping a compose setup.
-        self.run("Stopping", &["down", "--timeout", "0", "--volumes"], None)
+        self.run(
+            "Stopping",
+            &["down", "--timeout", "0", "--volumes", "--remove-orphans"],
+            None,
+        )
     }
 
     fn run(&self, action: &str, args: &[&'static str], config: Option<&Environment>) -> Result<()> {

From d24b04686ff2b5454b19aaf0b85c850227e3f50f Mon Sep 17 00:00:00 2001
From: Pavlos Rontidis <pavlos.rontidis@gmail.com>
Date: Mon, 28 Jul 2025 10:36:16 -0400
Subject: [PATCH 223/305] fix(ci): remove arbitrary sleep (#23443)

---
 scripts/int-e2e-test.sh | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/scripts/int-e2e-test.sh b/scripts/int-e2e-test.sh
index 8b3858d3bfe3b..e85f2b1a15c05 100755
--- a/scripts/int-e2e-test.sh
+++ b/scripts/int-e2e-test.sh
@@ -43,9 +43,6 @@ cargo vdev -v "${TEST_TYPE}" start -a "${TEST_NAME}"
 START_RET=$?
 print_compose_logs_on_failure $START_RET
 
-# TODO this is arbitrary sleep. Investigate if it can be safely removed.
-sleep 15
-
 if [[ $START_RET -eq 0 ]]; then
   cargo vdev -v "${TEST_TYPE}" test --retries 2 -a "${TEST_NAME}"
   RET=$?

From 43ed8eb116d54cc17e7be46b579358cece937d1e Mon Sep 17 00:00:00 2001
From: Pavlos Rontidis <pavlos.rontidis@gmail.com>
Date: Mon, 28 Jul 2025 12:17:48 -0400
Subject: [PATCH 224/305] chore(ci): re-enable OTEL E2E logs test

---
 .github/workflows/e2e.yml | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
index 9ac67c7f879ba..c0d2eb6516ac6 100644
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -103,13 +103,12 @@ jobs:
           max_attempts: 3
           command: bash scripts/int-e2e-test.sh e2e datadog-metrics
 
-  # TODO re-enable when fixed.
-  #      - if: (github.event_name == 'schedule' ||
-  #          github.event_name == 'workflow_dispatch' ||
-  #          needs.changes.outputs.e2e-opentelemetry-logs == 'true') &&
-  #          (github.event_name != 'pull_request' || env.PR_HAS_ACCESS_TO_SECRETS == 'true')
-  #        name: e2e-opentelemetry-logs
-  #        run: bash scripts/int-e2e-test.sh e2e opentelemetry-logs
+      - if: (github.event_name == 'schedule' ||
+          github.event_name == 'workflow_dispatch' ||
+          needs.changes.outputs.e2e-opentelemetry-logs == 'true') &&
+          (github.event_name != 'pull_request' || env.PR_HAS_ACCESS_TO_SECRETS == 'true')
+        name: e2e-opentelemetry-logs
+        run: bash scripts/int-e2e-test.sh e2e opentelemetry-logs
 
 
   e2e-test-suite:

From 9699ace43dbc8d2b4b4cdab78614361c1582a31e Mon Sep 17 00:00:00 2001
From: Pavlos Rontidis <pavlos.rontidis@gmail.com>
Date: Mon, 28 Jul 2025 12:18:24 -0400
Subject: [PATCH 225/305] Revert "chore(ci): re-enable OTEL E2E logs test"

This reverts commit 43ed8eb116d54cc17e7be46b579358cece937d1e.
---
 .github/workflows/e2e.yml | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
index c0d2eb6516ac6..9ac67c7f879ba 100644
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -103,12 +103,13 @@ jobs:
           max_attempts: 3
           command: bash scripts/int-e2e-test.sh e2e datadog-metrics
 
-      - if: (github.event_name == 'schedule' ||
-          github.event_name == 'workflow_dispatch' ||
-          needs.changes.outputs.e2e-opentelemetry-logs == 'true') &&
-          (github.event_name != 'pull_request' || env.PR_HAS_ACCESS_TO_SECRETS == 'true')
-        name: e2e-opentelemetry-logs
-        run: bash scripts/int-e2e-test.sh e2e opentelemetry-logs
+  # TODO re-enable when fixed.
+  #      - if: (github.event_name == 'schedule' ||
+  #          github.event_name == 'workflow_dispatch' ||
+  #          needs.changes.outputs.e2e-opentelemetry-logs == 'true') &&
+  #          (github.event_name != 'pull_request' || env.PR_HAS_ACCESS_TO_SECRETS == 'true')
+  #        name: e2e-opentelemetry-logs
+  #        run: bash scripts/int-e2e-test.sh e2e opentelemetry-logs
 
 
   e2e-test-suite:

From a0179dc3bb94f0279dc507db11801ec0765787a9 Mon Sep 17 00:00:00 2001
From: Pavlos Rontidis <pavlos.rontidis@gmail.com>
Date: Mon, 28 Jul 2025 13:19:58 -0400
Subject: [PATCH 226/305] chore(ci): workaround vdev issues by using
 project-name for debug logs (#23454)

---
 scripts/int-e2e-test.sh | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/scripts/int-e2e-test.sh b/scripts/int-e2e-test.sh
index e85f2b1a15c05..6d1a1edbb5fba 100755
--- a/scripts/int-e2e-test.sh
+++ b/scripts/int-e2e-test.sh
@@ -21,17 +21,8 @@ TEST_NAME=$2
 print_compose_logs_on_failure() {
   local LAST_RETURN_CODE=$1
 
-  if [[ $LAST_RETURN_CODE -ne 0 ]]; then
-    case "$TEST_TYPE" in
-      int) TYPE_DIR="integration" ;;
-      e2e) TYPE_DIR="e2e" ;;
-      *) TYPE_DIR="" ;;
-    esac
-
-    if [[ -n "$TYPE_DIR" ]]; then
-      local COMPOSE_DIR="${SCRIPT_DIR}/${TYPE_DIR}/${TEST_NAME}"
-      (docker compose -f "${COMPOSE_DIR}/compose.yaml" logs) || echo "Failed to collect logs"
-    fi
+  if [[ $LAST_RETURN_CODE -ne 0 || "${ACTIONS_RUNNER_DEBUG:-}" == "true" ]]; then
+      (docker compose --project-name "${TEST_NAME}" logs) || echo "Failed to collect logs"
   fi
 }
 

From 42b8c7966e7a8a7524aa5655c09437d3ace4acac Mon Sep 17 00:00:00 2001
From: Pavlos Rontidis <pavlos.rontidis@gmail.com>
Date: Mon, 28 Jul 2025 14:09:40 -0400
Subject: [PATCH 227/305] fix(ci): fix vdev stop not cleaning up anything
 (#23450)

---
 vdev/src/testing/integration.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/vdev/src/testing/integration.rs b/vdev/src/testing/integration.rs
index 4f175d9cda710..34503672f52f5 100644
--- a/vdev/src/testing/integration.rs
+++ b/vdev/src/testing/integration.rs
@@ -295,10 +295,10 @@ impl Compose {
         // and doesn't create a new tempfile before calling docker compose.
         // If stop command needs to use some of the injected bits then we need to rebuild it
         command.arg("--file");
-        if config.is_none() {
-            command.arg(&self.original_path);
-        } else {
+        if self.temp_file.path().exists() {
             command.arg(self.temp_file.path());
+        } else {
+            command.arg(&self.original_path);
         }
 
         command.args(args);

From 0fd22b3fe5e4974073cc81dd15c3107cd158ad4a Mon Sep 17 00:00:00 2001
From: Thomas <thomas.schneider@datadoghq.com>
Date: Mon, 28 Jul 2025 15:20:29 -0400
Subject: [PATCH 228/305] chore(buffers): ignore flaky diskv2 test (#23455)

* chore(vector buffers): ignore flaky diskv2 test

* Simplify comment

* Update lib/vector-buffers/src/variants/disk_v2/tests/basic.rs

* Update lib/vector-buffers/src/variants/disk_v2/tests/basic.rs
---
 lib/vector-buffers/src/variants/disk_v2/tests/basic.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/vector-buffers/src/variants/disk_v2/tests/basic.rs b/lib/vector-buffers/src/variants/disk_v2/tests/basic.rs
index ff0c1055c0f23..80759529f4d7c 100644
--- a/lib/vector-buffers/src/variants/disk_v2/tests/basic.rs
+++ b/lib/vector-buffers/src/variants/disk_v2/tests/basic.rs
@@ -67,6 +67,7 @@ async fn basic_read_write_loop() {
     .await;
 }
 
+#[ignore = "flaky. See https://github.com/vectordotdev/vector/issues/23456"]
 #[tokio::test]
 async fn reader_exits_cleanly_when_writer_done_and_in_flight_acks() {
     let assertion_registry = install_tracing_helpers();

From affbcc32f75b81e2e6dc7db2e200db254b7f8184 Mon Sep 17 00:00:00 2001
From: Pavlos Rontidis <pavlos.rontidis@gmail.com>
Date: Tue, 29 Jul 2025 09:16:06 -0400
Subject: [PATCH 229/305] chore(ci): fix and renable otel logs e2e (#23459)

* chore(ci): re-enable OTEL E2E test

* more debug info in case of failure

debug 2

* fix print_compose_logs_on_failure

* add healthchecks for reliable detection

* the dep graph was off, logs generator should come up last, the others should come up independently
read with retries
logs generator fix
rename /tmp to /output
attempt 777
---
 .github/workflows/e2e.yml                     | 13 ++-
 scripts/e2e/opentelemetry-logs/compose.yaml   | 15 ++--
 scripts/int-e2e-test.sh                       |  1 +
 .../opentelemetry/logs/collector-sink.yaml    |  2 +-
 tests/data/e2e/opentelemetry/logs/vector.yaml |  2 +-
 tests/e2e/mod.rs                              |  1 +
 tests/e2e/opentelemetry/logs/mod.rs           | 85 ++++++++++---------
 7 files changed, 62 insertions(+), 57 deletions(-)

diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
index 9ac67c7f879ba..c0d2eb6516ac6 100644
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -103,13 +103,12 @@ jobs:
           max_attempts: 3
           command: bash scripts/int-e2e-test.sh e2e datadog-metrics
 
-  # TODO re-enable when fixed.
-  #      - if: (github.event_name == 'schedule' ||
-  #          github.event_name == 'workflow_dispatch' ||
-  #          needs.changes.outputs.e2e-opentelemetry-logs == 'true') &&
-  #          (github.event_name != 'pull_request' || env.PR_HAS_ACCESS_TO_SECRETS == 'true')
-  #        name: e2e-opentelemetry-logs
-  #        run: bash scripts/int-e2e-test.sh e2e opentelemetry-logs
+      - if: (github.event_name == 'schedule' ||
+          github.event_name == 'workflow_dispatch' ||
+          needs.changes.outputs.e2e-opentelemetry-logs == 'true') &&
+          (github.event_name != 'pull_request' || env.PR_HAS_ACCESS_TO_SECRETS == 'true')
+        name: e2e-opentelemetry-logs
+        run: bash scripts/int-e2e-test.sh e2e opentelemetry-logs
 
 
   e2e-test-suite:
diff --git a/scripts/e2e/opentelemetry-logs/compose.yaml b/scripts/e2e/opentelemetry-logs/compose.yaml
index ea57b3d615308..c82b2e8a569d8 100644
--- a/scripts/e2e/opentelemetry-logs/compose.yaml
+++ b/scripts/e2e/opentelemetry-logs/compose.yaml
@@ -1,6 +1,7 @@
 name: opentelemetry-vector-e2e
 services:
   otel-collector-source:
+    container_name: otel-collector-source
     image: otel/opentelemetry-collector-contrib:${CONFIG_COLLECTOR_VERSION:-latest}
     init: true
     volumes:
@@ -14,12 +15,14 @@ services:
     command: [ "--config=/etc/otelcol-contrib/config.yaml" ]
 
   logs-generator:
-    image: python:3.11-alpine
+    container_name: logs-generator
     build:
       context: ./generator
     init: true
     depends_on:
       - otel-collector-source
+      - vector
+      - otel-collector-sink
     volumes:
       - type: bind
         source: ./generator
@@ -29,6 +32,7 @@ services:
     command: [ "python", "/generator/logs_generator.py", "-n", "100" ]
 
   otel-collector-sink:
+    container_name: otel-collector-sink
     image: otel/opentelemetry-collector-contrib:${CONFIG_COLLECTOR_VERSION:-latest}
     init: true
     volumes:
@@ -38,22 +42,19 @@ services:
         read_only: true
       - type: bind
         source: ../../../tests/data/e2e/opentelemetry/logs/output
-        target: /tmp
+        target: /output
     ports:
       - "${OTEL_COLLECTOR_SINK_HTTP_PORT:-5318}:5318"
 
   vector:
+    container_name: vector-otel-logs-e2e
     build:
       context: ../../../
       dockerfile: ./scripts/e2e/Dockerfile
       args:
         FEATURES: e2e-tests-opentelemetry
         RUST_VERSION: ${RUST_VERSION:-1.88}
-    image: vector-e2e:opentelemetry-logs
     init: true
-    depends_on:
-      - otel-collector-source
-      - otel-collector-sink
     volumes:
       - type: bind
         source: ../../../tests/data/e2e/opentelemetry/logs/vector.yaml
@@ -61,7 +62,7 @@ services:
         read_only: true
       - type: bind
         source: ../../../tests/data/e2e/opentelemetry/logs/output
-        target: /tmp
+        target: /output
     environment:
       - VECTOR_LOG=${VECTOR_LOG:-info}
       - FEATURES=e2e-tests-opentelemetry
diff --git a/scripts/int-e2e-test.sh b/scripts/int-e2e-test.sh
index 6d1a1edbb5fba..c9981e248da88 100755
--- a/scripts/int-e2e-test.sh
+++ b/scripts/int-e2e-test.sh
@@ -28,6 +28,7 @@ print_compose_logs_on_failure() {
 
 if [[ "$TEST_NAME" == "opentelemetry-logs" ]]; then
   find "${SCRIPT_DIR}/../tests/data/e2e/opentelemetry/logs/output" -type f -name '*.log' -delete
+  chmod -R 777 "${SCRIPT_DIR}/../tests/data/e2e/opentelemetry/logs/output"
 fi
 
 cargo vdev -v "${TEST_TYPE}" start -a "${TEST_NAME}"
diff --git a/tests/data/e2e/opentelemetry/logs/collector-sink.yaml b/tests/data/e2e/opentelemetry/logs/collector-sink.yaml
index 1bc7a7b6ca8b0..bbe8429f52bfa 100644
--- a/tests/data/e2e/opentelemetry/logs/collector-sink.yaml
+++ b/tests/data/e2e/opentelemetry/logs/collector-sink.yaml
@@ -10,7 +10,7 @@ processors:
 exporters:
   debug: { }
   file:
-    path: /tmp/collector-file-exporter.log
+    path: /output/collector-file-exporter.log
     rotation:
       max_megabytes: 10
       max_days: 1
diff --git a/tests/data/e2e/opentelemetry/logs/vector.yaml b/tests/data/e2e/opentelemetry/logs/vector.yaml
index defbcc5a59657..3940da783a7f1 100644
--- a/tests/data/e2e/opentelemetry/logs/vector.yaml
+++ b/tests/data/e2e/opentelemetry/logs/vector.yaml
@@ -68,7 +68,7 @@ sinks:
 
   otel_file_sink:
     type: file
-    path: "/tmp/vector-file-sink.log"
+    path: "/output/vector-file-sink.log"
     inputs:
       - remap_otel
     encoding:
diff --git a/tests/e2e/mod.rs b/tests/e2e/mod.rs
index ad5d1822281d5..bbbc622317648 100644
--- a/tests/e2e/mod.rs
+++ b/tests/e2e/mod.rs
@@ -1,3 +1,4 @@
+#![allow(clippy::print_stderr)]
 #[cfg(feature = "e2e-tests-datadog")]
 mod datadog;
 #[cfg(feature = "e2e-tests-opentelemetry")]
diff --git a/tests/e2e/opentelemetry/logs/mod.rs b/tests/e2e/opentelemetry/logs/mod.rs
index 64f0cbed53172..34a83a24fb553 100644
--- a/tests/e2e/opentelemetry/logs/mod.rs
+++ b/tests/e2e/opentelemetry/logs/mod.rs
@@ -1,12 +1,7 @@
 use serde_json::Value;
 use std::collections::BTreeMap;
 use std::path::PathBuf;
-use std::time::Duration;
-use tokio::time::{sleep, timeout};
-use tracing::info;
 
-const MAXIMUM_WAITING_DURATION: Duration = Duration::from_secs(30);
-const POLLING_INTERVAL: Duration = Duration::from_millis(500);
 const EXPECTED_LOG_COUNT: usize = 100;
 
 fn log_output_dir() -> PathBuf {
@@ -28,6 +23,31 @@ fn vector_log_path() -> PathBuf {
     log_output_dir().join("vector-file-sink.log")
 }
 
+use std::{fs, io, path::Path, thread, time::Duration};
+
+pub fn read_file_contents(path: &Path) -> Result<String, io::Error> {
+    let max_retries = 5;
+    let retry_delay = Duration::from_secs(2);
+    let mut last_err: Option<io::Error> = None;
+    for attempt in 1..=max_retries {
+        match fs::read_to_string(path) {
+            Ok(contents) => return Ok(contents),
+            Err(e) => {
+                eprintln!(
+                    "Attempt {attempt}/{max_retries}: Failed to read file '{}': {e}",
+                    path.display()
+                );
+                last_err = Some(e);
+                if attempt < max_retries {
+                    thread::sleep(retry_delay);
+                    continue;
+                }
+            }
+        }
+    }
+    Err(last_err.unwrap())
+}
+
 fn extract_count(value: &Value) -> u64 {
     value
         .get("attributes")
@@ -74,10 +94,8 @@ fn normalize_numbers_to_strings(value: &Value) -> Value {
     }
 }
 
-async fn read_log_records(path: &PathBuf) -> BTreeMap<u64, Value> {
-    let content = tokio::fs::read_to_string(path)
-        .await
-        .unwrap_or_else(|_| panic!("Failed to read log file {}", path.display()));
+fn read_log_records(path: &Path) -> BTreeMap<u64, Value> {
+    let content = read_file_contents(path).unwrap();
 
     let mut result = BTreeMap::new();
 
@@ -140,42 +158,27 @@ async fn read_log_records(path: &PathBuf) -> BTreeMap<u64, Value> {
 
 /// # Panics
 /// After the timeout, this function will panic if both logs are not ready.
-async fn wait_for_logs() -> (BTreeMap<u64, Value>, BTreeMap<u64, Value>) {
-    let mut collector_acc: BTreeMap<u64, Value> = BTreeMap::new();
-    let mut vector_acc: BTreeMap<u64, Value> = BTreeMap::new();
-
-    timeout(MAXIMUM_WAITING_DURATION, async {
-        loop {
-            let collector_read = read_log_records(&collector_log_path()).await;
-            let vector_read = read_log_records(&vector_log_path()).await;
-
-            // Merge into accumulators, skipping duplicates
-            for (k, v) in collector_read {
-                collector_acc.entry(k).or_insert(v);
-            }
-            for (k, v) in vector_read {
-                vector_acc.entry(k).or_insert(v);
-            }
+fn wait_for_logs() -> (BTreeMap<u64, Value>, BTreeMap<u64, Value>) {
+    let collector_logs = read_log_records(&collector_log_path());
+    let vector_logs = read_log_records(&vector_log_path());
 
-            let c_len = collector_acc.len();
-            let v_len = vector_acc.len();
-
-            if c_len >= EXPECTED_LOG_COUNT && v_len >= EXPECTED_LOG_COUNT {
-                return (collector_acc, vector_acc);
-            }
-
-            info!("Waiting for logs... collector: {c_len}, vector: {v_len}");
+    assert_eq!(
+        collector_logs.len(),
+        EXPECTED_LOG_COUNT,
+        "Collector did not produce expected number of log records"
+    );
+    assert_eq!(
+        vector_logs.len(),
+        EXPECTED_LOG_COUNT,
+        "Vector did not produce expected number of log records"
+    );
 
-            sleep(POLLING_INTERVAL).await;
-        }
-    })
-    .await
-    .expect("Timed out waiting for both log files to contain sufficient records")
+    (collector_logs, vector_logs)
 }
 
-#[tokio::test]
-async fn vector_sink_otel_sink_logs_match() {
-    let (collector_log_records, vector_log_records) = wait_for_logs().await;
+#[test]
+fn vector_sink_otel_sink_logs_match() {
+    let (collector_log_records, vector_log_records) = wait_for_logs();
 
     assert_eq!(
         collector_log_records.len(),

From e326e652ec5a3f7304fc2d5eba73b782b6d5ce58 Mon Sep 17 00:00:00 2001
From: Jake Halaska <26490690+5Dev24@users.noreply.github.com>
Date: Tue, 29 Jul 2025 09:14:48 -0500
Subject: [PATCH 230/305] enhancement(aws_s3 sink): Emit log when putting an
 object to s3-compatible storage (#23390)

* Add log when putting an object to s3-compatible storage

* add changelog

* Revert "add changelog"

This reverts commit fb8a8ed728c9cf2bbd45097e7a33d36c2fef06f2.

* Add info to how it works

* Update website/cue/reference/components/sinks/aws_s3.cue

Co-authored-by: May Lee <may.lee@datadoghq.com>

* Update how it works title

---------

Co-authored-by: May Lee <may.lee@datadoghq.com>
Co-authored-by: Pavlos Rontidis <pavlos.rontidis@gmail.com>
---
 src/sinks/s3_common/service.rs                | 19 ++++++++++++++-----
 .../cue/reference/components/sinks/aws_s3.cue | 11 +++++++++++
 2 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/src/sinks/s3_common/service.rs b/src/sinks/s3_common/service.rs
index f651a576c50a5..d4ad54378fb09 100644
--- a/src/sinks/s3_common/service.rs
+++ b/src/sinks/s3_common/service.rs
@@ -126,11 +126,11 @@ impl Service<S3Request> for S3Service {
         let client = self.client.clone();
 
         Box::pin(async move {
-            let request = client
+            let put_request = client
                 .put_object()
                 .body(bytes_to_bytestream(request.body))
-                .bucket(request.bucket)
-                .key(request.metadata.s3_key)
+                .bucket(request.bucket.clone())
+                .key(request.metadata.s3_key.clone())
                 .set_content_encoding(content_encoding)
                 .set_content_type(content_type)
                 .set_acl(options.acl.map(Into::into))
@@ -144,9 +144,18 @@ impl Service<S3Request> for S3Service {
                 .set_tagging(tagging)
                 .content_md5(content_md5);
 
-            let result = request.send().in_current_span().await;
+            let result = put_request.send().in_current_span().await;
 
-            result.map(|_| S3Response { events_byte_size })
+            result.map(|_| {
+                trace!(
+                    target: "vector::sinks::s3_common::service::put_object",
+                    message = "Put object to s3-compatible storage.",
+                    bucket = request.bucket,
+                    key = request.metadata.s3_key
+                );
+
+                S3Response { events_byte_size }
+            })
         })
     }
 }
diff --git a/website/cue/reference/components/sinks/aws_s3.cue b/website/cue/reference/components/sinks/aws_s3.cue
index d9f85e6f977da..cec5a50e47f82 100644
--- a/website/cue/reference/components/sinks/aws_s3.cue
+++ b/website/cue/reference/components/sinks/aws_s3.cue
@@ -103,6 +103,17 @@ components: sinks: aws_s3: components._aws & {
 				"""
 		}
 
+		log_on_put: {
+			title: "Emit a log when putting an object"
+			body: """
+				If you're using Vector to write objects to an s3-compatible storage, you can
+				set `VECTOR_LOG` to `vector::sinks::s3_common::service::put_object=trace` to
+				enable a trace log containing the bucket and key the object was put to. This
+				is best used when writing an object to an s3-compatible storage to kick off
+				post-put operations through another sink.
+				"""
+		}
+
 		object_acl: {
 			title: "Object Access Control List (ACL)"
 			body:  """

From b77915cfb57ad39689f64773d8f09f968b8486d2 Mon Sep 17 00:00:00 2001
From: jlambatl <168514818+jlambatl@users.noreply.github.com>
Date: Wed, 30 Jul 2025 00:38:03 +1000
Subject: [PATCH 231/305] docs(external): vrl encode/decode_lz4 documentation
 update sibling PR (#23378)

* Update decode_lz4 documentation

* Update encode_lz4 documentation to reflect prepend_size argument

* Update website/cue/reference/remap/functions/decode_lz4.cue

much better use of grammar

Co-authored-by: Bryce Eadie <bryce.eadie@datadoghq.com>

* Update website/cue/reference/remap/functions/encode_lz4.cue

much better use of grammar

Co-authored-by: Bryce Eadie <bryce.eadie@datadoghq.com>

* cargo update -p vrl

* Remove whitespace

* Remove whitespace

* Update vrl

---------

Co-authored-by: Bryce Eadie <bryce.eadie@datadoghq.com>
Co-authored-by: Pavlos Rontidis <pavlos.rontidis@gmail.com>
Co-authored-by: Thomas <thomasqueirozb@gmail.com>
Co-authored-by: Thomas <thomas.schneider@datadoghq.com>
---
 Cargo.lock                                    |  6 ++--
 .../reference/remap/functions/decode_lz4.cue  | 33 +++++++++++++++++--
 .../reference/remap/functions/encode_lz4.cue  | 11 ++++++-
 3 files changed, 43 insertions(+), 7 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 8e11726b8577a..76649b716c9bc 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -8028,7 +8028,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "be769465445e8c1474e9c5dac2018218498557af32d9ed057325ec9a41ae81bf"
 dependencies = [
  "heck 0.5.0",
- "itertools 0.11.0",
+ "itertools 0.10.5",
  "log",
  "multimap",
  "once_cell",
@@ -8074,7 +8074,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8a56d757972c98b346a9b766e3f02746cde6dd1cd1d1d563472929fdd74bec4d"
 dependencies = [
  "anyhow",
- "itertools 0.11.0",
+ "itertools 0.10.5",
  "proc-macro2 1.0.95",
  "quote 1.0.40",
  "syn 2.0.104",
@@ -12370,7 +12370,7 @@ checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d"
 [[package]]
 name = "vrl"
 version = "0.25.0"
-source = "git+https://github.com/vectordotdev/vrl.git?branch=main#23c44aeeddaffc0226b164ac951bd075d2972361"
+source = "git+https://github.com/vectordotdev/vrl.git?branch=main#834e80187f508a48b06b4ea7cf0acf7dae81ebc9"
 dependencies = [
  "aes",
  "aes-siv",
diff --git a/website/cue/reference/remap/functions/decode_lz4.cue b/website/cue/reference/remap/functions/decode_lz4.cue
index 9f9487444e1ae..25baf7d14b600 100644
--- a/website/cue/reference/remap/functions/decode_lz4.cue
+++ b/website/cue/reference/remap/functions/decode_lz4.cue
@@ -3,7 +3,9 @@ package metadata
 remap: functions: decode_lz4: {
 	category: "Codec"
 	description: """
-		Decodes the `value` (an lz4 string) into its original string.
+		Decodes the `value` (an lz4 string) into its original string. `buf_size` is the size of the buffer to decode into, this must be equal to or larger than the uncompressed size.
+		If `prepended_size` is set to `true`, it expects the original uncompressed size to be prepended to the compressed data.
+		`prepended_size` is useful for some implementations of lz4 that require the original size to be known before decoding.
 		"""
 
 	arguments: [
@@ -13,17 +15,42 @@ remap: functions: decode_lz4: {
 			required:    true
 			type: ["string"]
 		},
+		{
+			name:        "buf_size"
+			description: "The size of the buffer to decode into, this must be equal to or larger than the uncompressed size."
+			required:    false
+			default:     1024 * 1024 // 1 MiB
+			type: ["integer"]
+		},
+		{
+			name:        "prepended_size"
+			description: "Some implementations of lz4 require the original uncompressed size to be prepended to the compressed data."
+			required:    false
+			default:     false
+			type: ["boolean"]
+		},
 	]
 	internal_failure_reasons: [
-		"`value` unable to decode value with lz4 decoder.",
+		"`value` unable to decode value with lz4 frame decoder.",
+		"`value` unable to decode value with lz4 block decoder.",
+		"`value` unable to decode because the output is too large for the buffer.",
+		"`value` unable to decode because the prepended size is not a valid integer.",
 	]
 	return: types: ["string"]
 
 	examples: [
 		{
-			title: "Decode Lz4 data"
+			title: "Decode Lz4 data with prepended size."
 			source: #"""
 				encoded_text = decode_base64!("LAAAAPAdVGhlIHF1aWNrIGJyb3duIGZveCBqdW1wcyBvdmVyIDEzIGxhenkgZG9ncy4=")
+				decode_lz4!(encoded_text, use_prepended_size: true)
+				"""#
+			return: "The quick brown fox jumps over 13 lazy dogs."
+		},
+		{
+			title: "Decode Lz4 data without prepended size."
+			source: #"""
+				encoded_text = decode_base64!("8B1UaGUgcXVpY2sgYnJvd24gZm94IGp1bXBzIG92ZXIgMTMgbGF6eSBkb2dzLg==")
 				decode_lz4!(encoded_text)
 				"""#
 			return: "The quick brown fox jumps over 13 lazy dogs."
diff --git a/website/cue/reference/remap/functions/encode_lz4.cue b/website/cue/reference/remap/functions/encode_lz4.cue
index a8761c9598666..66ebe7e45bcd9 100644
--- a/website/cue/reference/remap/functions/encode_lz4.cue
+++ b/website/cue/reference/remap/functions/encode_lz4.cue
@@ -3,7 +3,9 @@ package metadata
 remap: functions: encode_lz4: {
 	category:    "Codec"
 	description: """
-		Encodes the `value` to [Lz4](\(urls.lz4)).
+		Encodes the `value` to [Lz4](\(urls.lz4)). This function compresses the input string into an lz4 block.
+		If `prepend_size` is set to `true`, it prepends the original uncompressed size to the compressed data.
+		This is useful for some implementations of lz4 that require the original size to be known before decoding.
 		"""
 
 	arguments: [
@@ -13,6 +15,13 @@ remap: functions: encode_lz4: {
 			required:    true
 			type: ["string"]
 		},
+		{
+			name:        "prepend_size"
+			description: "Whether to prepend the original size to the compressed data."
+			required:    false
+			default:     false
+			type: ["boolean"]
+		},
 	]
 	internal_failure_reasons: []
 	return: types: ["string"]

From 182a309445b083b223291d64fe4f1c48507f8fb0 Mon Sep 17 00:00:00 2001
From: Benjamin Dornel <benjamindornel@gmail.com>
Date: Wed, 30 Jul 2025 02:57:21 +0800
Subject: [PATCH 232/305] docs(external): improve readability (#23460)

* docs(external): improve readability

* chore: revert greptimedb bad auto-generation
---
 lib/codecs/src/decoding/format/avro.rs        |  4 ++--
 lib/codecs/src/decoding/format/gelf.rs        |  2 +-
 lib/codecs/src/decoding/format/influxdb.rs    |  2 +-
 lib/codecs/src/decoding/format/json.rs        |  2 +-
 lib/codecs/src/decoding/format/native_json.rs |  2 +-
 lib/codecs/src/decoding/format/syslog.rs      |  2 +-
 lib/codecs/src/decoding/format/vrl.rs         |  2 +-
 .../src/decoding/framing/chunked_gelf.rs      |  2 +-
 lib/codecs/src/decoding/mod.rs                |  2 +-
 lib/vector-config/src/schema/helpers.rs       |  2 +-
 lib/vector-core/src/tls/settings.rs           |  2 +-
 src/aws/auth.rs                               |  4 ++--
 src/http.rs                                   |  2 +-
 website/cue/reference/components.cue          |  4 ++--
 .../components/sinks/generated/appsignal.cue  |  2 +-
 .../sinks/generated/aws_cloudwatch_logs.cue   |  2 +-
 .../generated/aws_cloudwatch_metrics.cue      |  2 +-
 .../sinks/generated/aws_kinesis_firehose.cue  |  2 +-
 .../sinks/generated/aws_kinesis_streams.cue   |  2 +-
 .../components/sinks/generated/aws_s3.cue     |  2 +-
 .../components/sinks/generated/aws_sns.cue    |  2 +-
 .../components/sinks/generated/aws_sqs.cue    |  2 +-
 .../components/sinks/generated/clickhouse.cue |  4 ++--
 .../components/sinks/generated/databend.cue   |  4 ++--
 .../sinks/generated/datadog_events.cue        |  2 +-
 .../sinks/generated/datadog_logs.cue          |  2 +-
 .../sinks/generated/datadog_metrics.cue       |  2 +-
 .../sinks/generated/datadog_traces.cue        |  2 +-
 .../sinks/generated/elasticsearch.cue         |  2 +-
 .../components/sinks/generated/http.cue       |  4 ++--
 .../components/sinks/generated/kafka.cue      |  2 +-
 .../components/sinks/generated/loki.cue       |  4 ++--
 .../components/sinks/generated/mqtt.cue       |  2 +-
 .../components/sinks/generated/nats.cue       |  2 +-
 .../sinks/generated/opentelemetry.cue         |  4 ++--
 .../components/sinks/generated/papertrail.cue |  2 +-
 .../sinks/generated/prometheus_exporter.cue   |  6 ++---
 .../generated/prometheus_remote_write.cue     |  2 +-
 .../components/sinks/generated/socket.cue     |  2 +-
 .../components/sinks/generated/statsd.cue     |  2 +-
 .../components/sinks/generated/vector.cue     |  2 +-
 .../components/sinks/generated/websocket.cue  |  6 ++---
 .../sinks/generated/websocket_server.cue      | 20 ++++++++--------
 .../components/sources/generated/amqp.cue     | 20 ++++++++--------
 .../generated/aws_kinesis_firehose.cue        | 22 ++++++++---------
 .../components/sources/generated/aws_s3.cue   | 22 ++++++++---------
 .../components/sources/generated/aws_sqs.cue  | 22 ++++++++---------
 .../sources/generated/datadog_agent.cue       | 22 ++++++++---------
 .../sources/generated/demo_logs.cue           | 20 ++++++++--------
 .../components/sources/generated/dnstap.cue   |  2 +-
 .../components/sources/generated/exec.cue     | 20 ++++++++--------
 .../sources/generated/file_descriptor.cue     | 20 ++++++++--------
 .../components/sources/generated/fluent.cue   |  2 +-
 .../sources/generated/gcp_pubsub.cue          | 20 ++++++++--------
 .../sources/generated/heroku_logs.cue         | 22 ++++++++---------
 .../components/sources/generated/http.cue     | 22 ++++++++---------
 .../sources/generated/http_client.cue         | 24 +++++++++----------
 .../sources/generated/http_server.cue         | 22 ++++++++---------
 .../components/sources/generated/kafka.cue    | 22 ++++++++---------
 .../components/sources/generated/logstash.cue |  2 +-
 .../components/sources/generated/mqtt.cue     | 22 ++++++++---------
 .../components/sources/generated/nats.cue     | 22 ++++++++---------
 .../sources/generated/nginx_metrics.cue       |  4 ++--
 .../sources/generated/opentelemetry.cue       |  4 ++--
 .../generated/prometheus_pushgateway.cue      |  2 +-
 .../generated/prometheus_remote_write.cue     |  2 +-
 .../sources/generated/prometheus_scrape.cue   |  4 ++--
 .../components/sources/generated/pulsar.cue   | 20 ++++++++--------
 .../components/sources/generated/redis.cue    | 20 ++++++++--------
 .../components/sources/generated/socket.cue   | 22 ++++++++---------
 .../sources/generated/splunk_hec.cue          |  2 +-
 .../components/sources/generated/statsd.cue   |  2 +-
 .../components/sources/generated/stdin.cue    | 20 ++++++++--------
 .../components/sources/generated/syslog.cue   |  2 +-
 .../components/sources/generated/vector.cue   |  2 +-
 .../cue/reference/generated/configuration.cue |  2 +-
 76 files changed, 293 insertions(+), 293 deletions(-)

diff --git a/lib/codecs/src/decoding/format/avro.rs b/lib/codecs/src/decoding/format/avro.rs
index 7b2cb5fbe59aa..53646a11bcd58 100644
--- a/lib/codecs/src/decoding/format/avro.rs
+++ b/lib/codecs/src/decoding/format/avro.rs
@@ -90,7 +90,7 @@ impl From<&AvroDeserializerOptions> for AvroSerializerOptions {
 #[derive(Clone, Debug)]
 pub struct AvroDeserializerOptions {
     /// The Avro schema definition.
-    /// Please note that the following [`apache_avro::types::Value`] variants are currently *not* supported:
+    /// **Note**: The following [`apache_avro::types::Value`] variants are *not* supported:
     /// * `Date`
     /// * `Decimal`
     /// * `Duration`
@@ -103,7 +103,7 @@ pub struct AvroDeserializerOptions {
     ))]
     pub schema: String,
 
-    /// For Avro datum encoded in Kafka messages, the bytes are prefixed with the schema ID.  Set this to true to strip the schema ID prefix.
+    /// For Avro datum encoded in Kafka messages, the bytes are prefixed with the schema ID.  Set this to `true` to strip the schema ID prefix.
     /// According to [Confluent Kafka's document](https://docs.confluent.io/platform/current/schema-registry/fundamentals/serdes-develop/index.html#wire-format).
     pub strip_schema_id_prefix: bool,
 }
diff --git a/lib/codecs/src/decoding/format/gelf.rs b/lib/codecs/src/decoding/format/gelf.rs
index e51e50d33aafb..aff349ccb7645 100644
--- a/lib/codecs/src/decoding/format/gelf.rs
+++ b/lib/codecs/src/decoding/format/gelf.rs
@@ -84,7 +84,7 @@ impl GelfDeserializerConfig {
 #[derive(Debug, Clone, PartialEq, Eq, Derivative)]
 #[derivative(Default)]
 pub struct GelfDeserializerOptions {
-    /// Determines whether or not to replace invalid UTF-8 sequences instead of failing.
+    /// Determines whether to replace invalid UTF-8 sequences instead of failing.
     ///
     /// When true, invalid UTF-8 sequences are replaced with the [`U+FFFD REPLACEMENT CHARACTER`][U+FFFD].
     ///
diff --git a/lib/codecs/src/decoding/format/influxdb.rs b/lib/codecs/src/decoding/format/influxdb.rs
index a4cb5cbfe7827..5ca8352dd9ba6 100644
--- a/lib/codecs/src/decoding/format/influxdb.rs
+++ b/lib/codecs/src/decoding/format/influxdb.rs
@@ -56,7 +56,7 @@ impl InfluxdbDeserializerConfig {
 #[derive(Debug, Clone, PartialEq, Eq, Derivative)]
 #[derivative(Default)]
 pub struct InfluxdbDeserializerOptions {
-    /// Determines whether or not to replace invalid UTF-8 sequences instead of failing.
+    /// Determines whether to replace invalid UTF-8 sequences instead of failing.
     ///
     /// When true, invalid UTF-8 sequences are replaced with the [`U+FFFD REPLACEMENT CHARACTER`][U+FFFD].
     ///
diff --git a/lib/codecs/src/decoding/format/json.rs b/lib/codecs/src/decoding/format/json.rs
index 9e7c0676b56b6..016cf5918ca3f 100644
--- a/lib/codecs/src/decoding/format/json.rs
+++ b/lib/codecs/src/decoding/format/json.rs
@@ -67,7 +67,7 @@ impl JsonDeserializerConfig {
 #[derive(Debug, Clone, PartialEq, Eq, Derivative)]
 #[derivative(Default)]
 pub struct JsonDeserializerOptions {
-    /// Determines whether or not to replace invalid UTF-8 sequences instead of failing.
+    /// Determines whether to replace invalid UTF-8 sequences instead of failing.
     ///
     /// When true, invalid UTF-8 sequences are replaced with the [`U+FFFD REPLACEMENT CHARACTER`][U+FFFD].
     ///
diff --git a/lib/codecs/src/decoding/format/native_json.rs b/lib/codecs/src/decoding/format/native_json.rs
index ebdda1f9b80d2..3bda6848d528e 100644
--- a/lib/codecs/src/decoding/format/native_json.rs
+++ b/lib/codecs/src/decoding/format/native_json.rs
@@ -57,7 +57,7 @@ impl NativeJsonDeserializerConfig {
 #[derive(Debug, Clone, PartialEq, Eq, Derivative)]
 #[derivative(Default)]
 pub struct NativeJsonDeserializerOptions {
-    /// Determines whether or not to replace invalid UTF-8 sequences instead of failing.
+    /// Determines whether to replace invalid UTF-8 sequences instead of failing.
     ///
     /// When true, invalid UTF-8 sequences are replaced with the [`U+FFFD REPLACEMENT CHARACTER`][U+FFFD].
     ///
diff --git a/lib/codecs/src/decoding/format/syslog.rs b/lib/codecs/src/decoding/format/syslog.rs
index 6a5d7e135e841..993de798aee14 100644
--- a/lib/codecs/src/decoding/format/syslog.rs
+++ b/lib/codecs/src/decoding/format/syslog.rs
@@ -241,7 +241,7 @@ impl SyslogDeserializerConfig {
 #[derive(Debug, Clone, PartialEq, Eq, Derivative)]
 #[derivative(Default)]
 pub struct SyslogDeserializerOptions {
-    /// Determines whether or not to replace invalid UTF-8 sequences instead of failing.
+    /// Determines whether to replace invalid UTF-8 sequences instead of failing.
     ///
     /// When true, invalid UTF-8 sequences are replaced with the [`U+FFFD REPLACEMENT CHARACTER`][U+FFFD].
     ///
diff --git a/lib/codecs/src/decoding/format/vrl.rs b/lib/codecs/src/decoding/format/vrl.rs
index 63a127955ee87..c11149d0fa842 100644
--- a/lib/codecs/src/decoding/format/vrl.rs
+++ b/lib/codecs/src/decoding/format/vrl.rs
@@ -37,7 +37,7 @@ pub struct VrlDeserializerOptions {
     /// time zone. The time zone name may be any name in the [TZ database][tz_database], or `local`
     /// to indicate system local time.
     ///
-    /// If not set, `local` will be used.
+    /// If not set, `local` is used.
     ///
     /// [tz_database]: https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
     #[serde(default)]
diff --git a/lib/codecs/src/decoding/framing/chunked_gelf.rs b/lib/codecs/src/decoding/framing/chunked_gelf.rs
index 286645cfa5698..51ffd53fb6f1b 100644
--- a/lib/codecs/src/decoding/framing/chunked_gelf.rs
+++ b/lib/codecs/src/decoding/framing/chunked_gelf.rs
@@ -67,7 +67,7 @@ pub struct ChunkedGelfDecoderOptions {
     /// be dropped. If this option is not set, the decoder does not limit the length of messages and
     /// the per-message memory is unbounded.
     ///
-    /// Note that a message can be composed of multiple chunks and this limit is applied to the whole
+    /// **Note**: A message can be composed of multiple chunks and this limit is applied to the whole
     /// message, not to individual chunks.
     ///
     /// This limit takes only into account the message's payload and the GELF header bytes are excluded from the calculation.
diff --git a/lib/codecs/src/decoding/mod.rs b/lib/codecs/src/decoding/mod.rs
index 4d5d34d454cb1..cf5f479d3c600 100644
--- a/lib/codecs/src/decoding/mod.rs
+++ b/lib/codecs/src/decoding/mod.rs
@@ -260,7 +260,7 @@ pub enum DeserializerConfig {
     /// This codec is experimental for the following reason:
     ///
     /// The GELF specification is more strict than the actual Graylog receiver.
-    /// Vector's decoder currently adheres more strictly to the GELF spec, with
+    /// Vector's decoder adheres more strictly to the GELF spec, with
     /// the exception that some characters such as `@`  are allowed in field names.
     ///
     /// Other GELF codecs such as Loki's, use a [Go SDK][implementation] that is maintained
diff --git a/lib/vector-config/src/schema/helpers.rs b/lib/vector-config/src/schema/helpers.rs
index 9900f32998f91..cfb79d9221c66 100644
--- a/lib/vector-config/src/schema/helpers.rs
+++ b/lib/vector-config/src/schema/helpers.rs
@@ -670,7 +670,7 @@ pub(crate) fn assert_string_schema_for_map(
     }
 }
 
-/// Determines whether or not an enum schema is ambiguous based on discriminants of its variants.
+/// Determines whether an enum schema is ambiguous based on discriminants of its variants.
 ///
 /// A discriminant is the set of the named fields which are required, which may be an empty set.
 pub fn has_ambiguous_discriminants(
diff --git a/lib/vector-core/src/tls/settings.rs b/lib/vector-core/src/tls/settings.rs
index fbedb57fac35c..9fcfe432c282f 100644
--- a/lib/vector-core/src/tls/settings.rs
+++ b/lib/vector-core/src/tls/settings.rs
@@ -43,7 +43,7 @@ pub const TEST_PEM_CLIENT_KEY_PATH: &str =
 #[derive(Clone, Debug, Default)]
 #[serde(deny_unknown_fields)]
 pub struct TlsEnableableConfig {
-    /// Whether or not to require TLS for incoming or outgoing connections.
+    /// Whether to require TLS for incoming or outgoing connections.
     ///
     /// When enabled and used for incoming connections, an identity certificate is also required. See `tls.crt_file` for
     /// more information.
diff --git a/src/aws/auth.rs b/src/aws/auth.rs
index 4dd00f5cdbc24..1ed174096dfa1 100644
--- a/src/aws/auth.rs
+++ b/src/aws/auth.rs
@@ -100,7 +100,7 @@ pub enum AwsAuthentication {
         /// The optional [RoleSessionName][role_session_name] is a unique session identifier for your assumed role.
         ///
         /// Should be unique per principal or reason.
-        /// If not set, session name will be autogenerated like assume-role-provider-1736428351340
+        /// If not set, the session name is autogenerated like assume-role-provider-1736428351340
         ///
         /// [role_session_name]: https://docs.aws.amazon.com/STS/latest/APIReference/API_AssumeRole.html
         #[configurable(metadata(docs::examples = "vector-indexer-role"))]
@@ -172,7 +172,7 @@ pub enum AwsAuthentication {
         /// The optional [RoleSessionName][role_session_name] is a unique session identifier for your assumed role.
         ///
         /// Should be unique per principal or reason.
-        /// If not set, session name will be autogenerated like assume-role-provider-1736428351340
+        /// If not set, the session name is autogenerated like assume-role-provider-1736428351340
         ///
         /// [role_session_name]: https://docs.aws.amazon.com/STS/latest/APIReference/API_AssumeRole.html
         #[configurable(metadata(docs::examples = "vector-indexer-role"))]
diff --git a/src/http.rs b/src/http.rs
index 8c919da4d21e1..bbd716a385817 100644
--- a/src/http.rs
+++ b/src/http.rs
@@ -277,7 +277,7 @@ impl<B> fmt::Debug for HttpClient<B> {
 pub enum Auth {
     /// Basic authentication.
     ///
-    /// The username and password are concatenated and encoded via [base64][base64].
+    /// The username and password are concatenated and encoded using [base64][base64].
     ///
     /// [base64]: https://en.wikipedia.org/wiki/Base64
     Basic {
diff --git a/website/cue/reference/components.cue b/website/cue/reference/components.cue
index 002c65294189a..f72bc26395805 100644
--- a/website/cue/reference/components.cue
+++ b/website/cue/reference/components.cue
@@ -627,7 +627,7 @@ components: {
 					enabled: {
 						common: false
 						description: """
-							Whether or not to require TLS for incoming/outgoing connections.
+							Whether to require TLS for incoming/outgoing connections.
 
 							When enabled and used for incoming connections, an identity certificate is also required. See `tls.crt_file` for
 							more information.
@@ -742,7 +742,7 @@ components: {
 						enabled: {
 							common: true
 							description: """
-								Whether or not to require TLS for incoming/outgoing connections.
+								Whether to require TLS for incoming/outgoing connections.
 
 								When enabled and used for incoming connections, an identity certificate is also required. See `tls.crt_file` for
 								more information.
diff --git a/website/cue/reference/components/sinks/generated/appsignal.cue b/website/cue/reference/components/sinks/generated/appsignal.cue
index aa3b5d0c588f3..75b2597c5176b 100644
--- a/website/cue/reference/components/sinks/generated/appsignal.cue
+++ b/website/cue/reference/components/sinks/generated/appsignal.cue
@@ -360,7 +360,7 @@ generated: components: sinks: appsignal: configuration: {
 			}
 			enabled: {
 				description: """
-					Whether or not to require TLS for incoming or outgoing connections.
+					Whether to require TLS for incoming or outgoing connections.
 
 					When enabled and used for incoming connections, an identity certificate is also required. See `tls.crt_file` for
 					more information.
diff --git a/website/cue/reference/components/sinks/generated/aws_cloudwatch_logs.cue b/website/cue/reference/components/sinks/generated/aws_cloudwatch_logs.cue
index 94db65cd54aeb..a042b84d8da1d 100644
--- a/website/cue/reference/components/sinks/generated/aws_cloudwatch_logs.cue
+++ b/website/cue/reference/components/sinks/generated/aws_cloudwatch_logs.cue
@@ -132,7 +132,7 @@ generated: components: sinks: aws_cloudwatch_logs: configuration: {
 					The optional [RoleSessionName][role_session_name] is a unique session identifier for your assumed role.
 
 					Should be unique per principal or reason.
-					If not set, session name will be autogenerated like assume-role-provider-1736428351340
+					If not set, the session name is autogenerated like assume-role-provider-1736428351340
 
 					[role_session_name]: https://docs.aws.amazon.com/STS/latest/APIReference/API_AssumeRole.html
 					"""
diff --git a/website/cue/reference/components/sinks/generated/aws_cloudwatch_metrics.cue b/website/cue/reference/components/sinks/generated/aws_cloudwatch_metrics.cue
index 4b26eb7ee8042..7a1d5572107dd 100644
--- a/website/cue/reference/components/sinks/generated/aws_cloudwatch_metrics.cue
+++ b/website/cue/reference/components/sinks/generated/aws_cloudwatch_metrics.cue
@@ -132,7 +132,7 @@ generated: components: sinks: aws_cloudwatch_metrics: configuration: {
 					The optional [RoleSessionName][role_session_name] is a unique session identifier for your assumed role.
 
 					Should be unique per principal or reason.
-					If not set, session name will be autogenerated like assume-role-provider-1736428351340
+					If not set, the session name is autogenerated like assume-role-provider-1736428351340
 
 					[role_session_name]: https://docs.aws.amazon.com/STS/latest/APIReference/API_AssumeRole.html
 					"""
diff --git a/website/cue/reference/components/sinks/generated/aws_kinesis_firehose.cue b/website/cue/reference/components/sinks/generated/aws_kinesis_firehose.cue
index 763c7595a7336..1f5cdf3c84a45 100644
--- a/website/cue/reference/components/sinks/generated/aws_kinesis_firehose.cue
+++ b/website/cue/reference/components/sinks/generated/aws_kinesis_firehose.cue
@@ -132,7 +132,7 @@ generated: components: sinks: aws_kinesis_firehose: configuration: {
 					The optional [RoleSessionName][role_session_name] is a unique session identifier for your assumed role.
 
 					Should be unique per principal or reason.
-					If not set, session name will be autogenerated like assume-role-provider-1736428351340
+					If not set, the session name is autogenerated like assume-role-provider-1736428351340
 
 					[role_session_name]: https://docs.aws.amazon.com/STS/latest/APIReference/API_AssumeRole.html
 					"""
diff --git a/website/cue/reference/components/sinks/generated/aws_kinesis_streams.cue b/website/cue/reference/components/sinks/generated/aws_kinesis_streams.cue
index fd9071c55bb29..868cdb2d7efb9 100644
--- a/website/cue/reference/components/sinks/generated/aws_kinesis_streams.cue
+++ b/website/cue/reference/components/sinks/generated/aws_kinesis_streams.cue
@@ -132,7 +132,7 @@ generated: components: sinks: aws_kinesis_streams: configuration: {
 					The optional [RoleSessionName][role_session_name] is a unique session identifier for your assumed role.
 
 					Should be unique per principal or reason.
-					If not set, session name will be autogenerated like assume-role-provider-1736428351340
+					If not set, the session name is autogenerated like assume-role-provider-1736428351340
 
 					[role_session_name]: https://docs.aws.amazon.com/STS/latest/APIReference/API_AssumeRole.html
 					"""
diff --git a/website/cue/reference/components/sinks/generated/aws_s3.cue b/website/cue/reference/components/sinks/generated/aws_s3.cue
index 2f03902900598..a9880f2c6206d 100644
--- a/website/cue/reference/components/sinks/generated/aws_s3.cue
+++ b/website/cue/reference/components/sinks/generated/aws_s3.cue
@@ -207,7 +207,7 @@ generated: components: sinks: aws_s3: configuration: {
 					The optional [RoleSessionName][role_session_name] is a unique session identifier for your assumed role.
 
 					Should be unique per principal or reason.
-					If not set, session name will be autogenerated like assume-role-provider-1736428351340
+					If not set, the session name is autogenerated like assume-role-provider-1736428351340
 
 					[role_session_name]: https://docs.aws.amazon.com/STS/latest/APIReference/API_AssumeRole.html
 					"""
diff --git a/website/cue/reference/components/sinks/generated/aws_sns.cue b/website/cue/reference/components/sinks/generated/aws_sns.cue
index 6d5738f2c58cf..c0616e47b84fa 100644
--- a/website/cue/reference/components/sinks/generated/aws_sns.cue
+++ b/website/cue/reference/components/sinks/generated/aws_sns.cue
@@ -132,7 +132,7 @@ generated: components: sinks: aws_sns: configuration: {
 					The optional [RoleSessionName][role_session_name] is a unique session identifier for your assumed role.
 
 					Should be unique per principal or reason.
-					If not set, session name will be autogenerated like assume-role-provider-1736428351340
+					If not set, the session name is autogenerated like assume-role-provider-1736428351340
 
 					[role_session_name]: https://docs.aws.amazon.com/STS/latest/APIReference/API_AssumeRole.html
 					"""
diff --git a/website/cue/reference/components/sinks/generated/aws_sqs.cue b/website/cue/reference/components/sinks/generated/aws_sqs.cue
index 5672309253dc9..c203e0d7db06d 100644
--- a/website/cue/reference/components/sinks/generated/aws_sqs.cue
+++ b/website/cue/reference/components/sinks/generated/aws_sqs.cue
@@ -132,7 +132,7 @@ generated: components: sinks: aws_sqs: configuration: {
 					The optional [RoleSessionName][role_session_name] is a unique session identifier for your assumed role.
 
 					Should be unique per principal or reason.
-					If not set, session name will be autogenerated like assume-role-provider-1736428351340
+					If not set, the session name is autogenerated like assume-role-provider-1736428351340
 
 					[role_session_name]: https://docs.aws.amazon.com/STS/latest/APIReference/API_AssumeRole.html
 					"""
diff --git a/website/cue/reference/components/sinks/generated/clickhouse.cue b/website/cue/reference/components/sinks/generated/clickhouse.cue
index 77df2b8b457b2..6243bbbd8d5ce 100644
--- a/website/cue/reference/components/sinks/generated/clickhouse.cue
+++ b/website/cue/reference/components/sinks/generated/clickhouse.cue
@@ -142,7 +142,7 @@ generated: components: sinks: clickhouse: configuration: {
 																The optional [RoleSessionName][role_session_name] is a unique session identifier for your assumed role.
 
 																Should be unique per principal or reason.
-																If not set, session name will be autogenerated like assume-role-provider-1736428351340
+																If not set, the session name is autogenerated like assume-role-provider-1736428351340
 
 																[role_session_name]: https://docs.aws.amazon.com/STS/latest/APIReference/API_AssumeRole.html
 																"""
@@ -179,7 +179,7 @@ generated: components: sinks: clickhouse: configuration: {
 					basic: """
 						Basic authentication.
 
-						The username and password are concatenated and encoded via [base64][base64].
+						The username and password are concatenated and encoded using [base64][base64].
 
 						[base64]: https://en.wikipedia.org/wiki/Base64
 						"""
diff --git a/website/cue/reference/components/sinks/generated/databend.cue b/website/cue/reference/components/sinks/generated/databend.cue
index 7492859c679a3..68f5903a57443 100644
--- a/website/cue/reference/components/sinks/generated/databend.cue
+++ b/website/cue/reference/components/sinks/generated/databend.cue
@@ -137,7 +137,7 @@ generated: components: sinks: databend: configuration: {
 																The optional [RoleSessionName][role_session_name] is a unique session identifier for your assumed role.
 
 																Should be unique per principal or reason.
-																If not set, session name will be autogenerated like assume-role-provider-1736428351340
+																If not set, the session name is autogenerated like assume-role-provider-1736428351340
 
 																[role_session_name]: https://docs.aws.amazon.com/STS/latest/APIReference/API_AssumeRole.html
 																"""
@@ -174,7 +174,7 @@ generated: components: sinks: databend: configuration: {
 					basic: """
 						Basic authentication.
 
-						The username and password are concatenated and encoded via [base64][base64].
+						The username and password are concatenated and encoded using [base64][base64].
 
 						[base64]: https://en.wikipedia.org/wiki/Base64
 						"""
diff --git a/website/cue/reference/components/sinks/generated/datadog_events.cue b/website/cue/reference/components/sinks/generated/datadog_events.cue
index 1ce0a61900dc3..5c916f11fcf70 100644
--- a/website/cue/reference/components/sinks/generated/datadog_events.cue
+++ b/website/cue/reference/components/sinks/generated/datadog_events.cue
@@ -294,7 +294,7 @@ generated: components: sinks: datadog_events: configuration: {
 			}
 			enabled: {
 				description: """
-					Whether or not to require TLS for incoming or outgoing connections.
+					Whether to require TLS for incoming or outgoing connections.
 
 					When enabled and used for incoming connections, an identity certificate is also required. See `tls.crt_file` for
 					more information.
diff --git a/website/cue/reference/components/sinks/generated/datadog_logs.cue b/website/cue/reference/components/sinks/generated/datadog_logs.cue
index 0cef802539683..298f91ba5bc7e 100644
--- a/website/cue/reference/components/sinks/generated/datadog_logs.cue
+++ b/website/cue/reference/components/sinks/generated/datadog_logs.cue
@@ -407,7 +407,7 @@ generated: components: sinks: datadog_logs: configuration: {
 			}
 			enabled: {
 				description: """
-					Whether or not to require TLS for incoming or outgoing connections.
+					Whether to require TLS for incoming or outgoing connections.
 
 					When enabled and used for incoming connections, an identity certificate is also required. See `tls.crt_file` for
 					more information.
diff --git a/website/cue/reference/components/sinks/generated/datadog_metrics.cue b/website/cue/reference/components/sinks/generated/datadog_metrics.cue
index fade7e5ff638a..7608fb8af3845 100644
--- a/website/cue/reference/components/sinks/generated/datadog_metrics.cue
+++ b/website/cue/reference/components/sinks/generated/datadog_metrics.cue
@@ -336,7 +336,7 @@ generated: components: sinks: datadog_metrics: configuration: {
 			}
 			enabled: {
 				description: """
-					Whether or not to require TLS for incoming or outgoing connections.
+					Whether to require TLS for incoming or outgoing connections.
 
 					When enabled and used for incoming connections, an identity certificate is also required. See `tls.crt_file` for
 					more information.
diff --git a/website/cue/reference/components/sinks/generated/datadog_traces.cue b/website/cue/reference/components/sinks/generated/datadog_traces.cue
index 2c867b765b4c7..2bf24d7f74495 100644
--- a/website/cue/reference/components/sinks/generated/datadog_traces.cue
+++ b/website/cue/reference/components/sinks/generated/datadog_traces.cue
@@ -360,7 +360,7 @@ generated: components: sinks: datadog_traces: configuration: {
 			}
 			enabled: {
 				description: """
-					Whether or not to require TLS for incoming or outgoing connections.
+					Whether to require TLS for incoming or outgoing connections.
 
 					When enabled and used for incoming connections, an identity certificate is also required. See `tls.crt_file` for
 					more information.
diff --git a/website/cue/reference/components/sinks/generated/elasticsearch.cue b/website/cue/reference/components/sinks/generated/elasticsearch.cue
index a54b78edb5b2c..6bc6e1857a9f9 100644
--- a/website/cue/reference/components/sinks/generated/elasticsearch.cue
+++ b/website/cue/reference/components/sinks/generated/elasticsearch.cue
@@ -174,7 +174,7 @@ generated: components: sinks: elasticsearch: configuration: {
 					The optional [RoleSessionName][role_session_name] is a unique session identifier for your assumed role.
 
 					Should be unique per principal or reason.
-					If not set, session name will be autogenerated like assume-role-provider-1736428351340
+					If not set, the session name is autogenerated like assume-role-provider-1736428351340
 
 					[role_session_name]: https://docs.aws.amazon.com/STS/latest/APIReference/API_AssumeRole.html
 					"""
diff --git a/website/cue/reference/components/sinks/generated/http.cue b/website/cue/reference/components/sinks/generated/http.cue
index 92b02b191c572..02fd3f4f1597a 100644
--- a/website/cue/reference/components/sinks/generated/http.cue
+++ b/website/cue/reference/components/sinks/generated/http.cue
@@ -142,7 +142,7 @@ generated: components: sinks: http: configuration: {
 																The optional [RoleSessionName][role_session_name] is a unique session identifier for your assumed role.
 
 																Should be unique per principal or reason.
-																If not set, session name will be autogenerated like assume-role-provider-1736428351340
+																If not set, the session name is autogenerated like assume-role-provider-1736428351340
 
 																[role_session_name]: https://docs.aws.amazon.com/STS/latest/APIReference/API_AssumeRole.html
 																"""
@@ -179,7 +179,7 @@ generated: components: sinks: http: configuration: {
 					basic: """
 						Basic authentication.
 
-						The username and password are concatenated and encoded via [base64][base64].
+						The username and password are concatenated and encoded using [base64][base64].
 
 						[base64]: https://en.wikipedia.org/wiki/Base64
 						"""
diff --git a/website/cue/reference/components/sinks/generated/kafka.cue b/website/cue/reference/components/sinks/generated/kafka.cue
index d7e1d93117f83..37e414f4278a6 100644
--- a/website/cue/reference/components/sinks/generated/kafka.cue
+++ b/website/cue/reference/components/sinks/generated/kafka.cue
@@ -593,7 +593,7 @@ generated: components: sinks: kafka: configuration: {
 			}
 			enabled: {
 				description: """
-					Whether or not to require TLS for incoming or outgoing connections.
+					Whether to require TLS for incoming or outgoing connections.
 
 					When enabled and used for incoming connections, an identity certificate is also required. See `tls.crt_file` for
 					more information.
diff --git a/website/cue/reference/components/sinks/generated/loki.cue b/website/cue/reference/components/sinks/generated/loki.cue
index ec0e1658a8b6e..7927664dab4bc 100644
--- a/website/cue/reference/components/sinks/generated/loki.cue
+++ b/website/cue/reference/components/sinks/generated/loki.cue
@@ -142,7 +142,7 @@ generated: components: sinks: loki: configuration: {
 																The optional [RoleSessionName][role_session_name] is a unique session identifier for your assumed role.
 
 																Should be unique per principal or reason.
-																If not set, session name will be autogenerated like assume-role-provider-1736428351340
+																If not set, the session name is autogenerated like assume-role-provider-1736428351340
 
 																[role_session_name]: https://docs.aws.amazon.com/STS/latest/APIReference/API_AssumeRole.html
 																"""
@@ -179,7 +179,7 @@ generated: components: sinks: loki: configuration: {
 					basic: """
 						Basic authentication.
 
-						The username and password are concatenated and encoded via [base64][base64].
+						The username and password are concatenated and encoded using [base64][base64].
 
 						[base64]: https://en.wikipedia.org/wiki/Base64
 						"""
diff --git a/website/cue/reference/components/sinks/generated/mqtt.cue b/website/cue/reference/components/sinks/generated/mqtt.cue
index 2fc71c205625d..9f2990ecd808a 100644
--- a/website/cue/reference/components/sinks/generated/mqtt.cue
+++ b/website/cue/reference/components/sinks/generated/mqtt.cue
@@ -459,7 +459,7 @@ generated: components: sinks: mqtt: configuration: {
 			}
 			enabled: {
 				description: """
-					Whether or not to require TLS for incoming or outgoing connections.
+					Whether to require TLS for incoming or outgoing connections.
 
 					When enabled and used for incoming connections, an identity certificate is also required. See `tls.crt_file` for
 					more information.
diff --git a/website/cue/reference/components/sinks/generated/nats.cue b/website/cue/reference/components/sinks/generated/nats.cue
index f1031f912ef3a..edb77b2b1bbe1 100644
--- a/website/cue/reference/components/sinks/generated/nats.cue
+++ b/website/cue/reference/components/sinks/generated/nats.cue
@@ -721,7 +721,7 @@ generated: components: sinks: nats: configuration: {
 			}
 			enabled: {
 				description: """
-					Whether or not to require TLS for incoming or outgoing connections.
+					Whether to require TLS for incoming or outgoing connections.
 
 					When enabled and used for incoming connections, an identity certificate is also required. See `tls.crt_file` for
 					more information.
diff --git a/website/cue/reference/components/sinks/generated/opentelemetry.cue b/website/cue/reference/components/sinks/generated/opentelemetry.cue
index 10c0e84759f7f..261521adbefca 100644
--- a/website/cue/reference/components/sinks/generated/opentelemetry.cue
+++ b/website/cue/reference/components/sinks/generated/opentelemetry.cue
@@ -145,7 +145,7 @@ generated: components: sinks: opentelemetry: configuration: protocol: {
 																				The optional [RoleSessionName][role_session_name] is a unique session identifier for your assumed role.
 
 																				Should be unique per principal or reason.
-																				If not set, session name will be autogenerated like assume-role-provider-1736428351340
+																				If not set, the session name is autogenerated like assume-role-provider-1736428351340
 
 																				[role_session_name]: https://docs.aws.amazon.com/STS/latest/APIReference/API_AssumeRole.html
 																				"""
@@ -182,7 +182,7 @@ generated: components: sinks: opentelemetry: configuration: protocol: {
 						basic: """
 																			Basic authentication.
 
-																			The username and password are concatenated and encoded via [base64][base64].
+																			The username and password are concatenated and encoded using [base64][base64].
 
 																			[base64]: https://en.wikipedia.org/wiki/Base64
 																			"""
diff --git a/website/cue/reference/components/sinks/generated/papertrail.cue b/website/cue/reference/components/sinks/generated/papertrail.cue
index 1dfcbe0d99d40..a0b37cddb25cb 100644
--- a/website/cue/reference/components/sinks/generated/papertrail.cue
+++ b/website/cue/reference/components/sinks/generated/papertrail.cue
@@ -440,7 +440,7 @@ generated: components: sinks: papertrail: configuration: {
 			}
 			enabled: {
 				description: """
-					Whether or not to require TLS for incoming or outgoing connections.
+					Whether to require TLS for incoming or outgoing connections.
 
 					When enabled and used for incoming connections, an identity certificate is also required. See `tls.crt_file` for
 					more information.
diff --git a/website/cue/reference/components/sinks/generated/prometheus_exporter.cue b/website/cue/reference/components/sinks/generated/prometheus_exporter.cue
index 6e9fa28c83397..b8b2693dfc9b1 100644
--- a/website/cue/reference/components/sinks/generated/prometheus_exporter.cue
+++ b/website/cue/reference/components/sinks/generated/prometheus_exporter.cue
@@ -154,7 +154,7 @@ generated: components: sinks: prometheus_exporter: configuration: {
 																The optional [RoleSessionName][role_session_name] is a unique session identifier for your assumed role.
 
 																Should be unique per principal or reason.
-																If not set, session name will be autogenerated like assume-role-provider-1736428351340
+																If not set, the session name is autogenerated like assume-role-provider-1736428351340
 
 																[role_session_name]: https://docs.aws.amazon.com/STS/latest/APIReference/API_AssumeRole.html
 																"""
@@ -191,7 +191,7 @@ generated: components: sinks: prometheus_exporter: configuration: {
 					basic: """
 						Basic authentication.
 
-						The username and password are concatenated and encoded via [base64][base64].
+						The username and password are concatenated and encoded using [base64][base64].
 
 						[base64]: https://en.wikipedia.org/wiki/Base64
 						"""
@@ -332,7 +332,7 @@ generated: components: sinks: prometheus_exporter: configuration: {
 			}
 			enabled: {
 				description: """
-					Whether or not to require TLS for incoming or outgoing connections.
+					Whether to require TLS for incoming or outgoing connections.
 
 					When enabled and used for incoming connections, an identity certificate is also required. See `tls.crt_file` for
 					more information.
diff --git a/website/cue/reference/components/sinks/generated/prometheus_remote_write.cue b/website/cue/reference/components/sinks/generated/prometheus_remote_write.cue
index 83d55d96d5912..e9693af380c27 100644
--- a/website/cue/reference/components/sinks/generated/prometheus_remote_write.cue
+++ b/website/cue/reference/components/sinks/generated/prometheus_remote_write.cue
@@ -147,7 +147,7 @@ generated: components: sinks: prometheus_remote_write: configuration: {
 					The optional [RoleSessionName][role_session_name] is a unique session identifier for your assumed role.
 
 					Should be unique per principal or reason.
-					If not set, session name will be autogenerated like assume-role-provider-1736428351340
+					If not set, the session name is autogenerated like assume-role-provider-1736428351340
 
 					[role_session_name]: https://docs.aws.amazon.com/STS/latest/APIReference/API_AssumeRole.html
 					"""
diff --git a/website/cue/reference/components/sinks/generated/socket.cue b/website/cue/reference/components/sinks/generated/socket.cue
index 5af2b131b5f62..b0ef9985bcf8c 100644
--- a/website/cue/reference/components/sinks/generated/socket.cue
+++ b/website/cue/reference/components/sinks/generated/socket.cue
@@ -532,7 +532,7 @@ generated: components: sinks: socket: configuration: {
 			}
 			enabled: {
 				description: """
-					Whether or not to require TLS for incoming or outgoing connections.
+					Whether to require TLS for incoming or outgoing connections.
 
 					When enabled and used for incoming connections, an identity certificate is also required. See `tls.crt_file` for
 					more information.
diff --git a/website/cue/reference/components/sinks/generated/statsd.cue b/website/cue/reference/components/sinks/generated/statsd.cue
index 5eb52c0c3416f..c99a4e5b8f360 100644
--- a/website/cue/reference/components/sinks/generated/statsd.cue
+++ b/website/cue/reference/components/sinks/generated/statsd.cue
@@ -165,7 +165,7 @@ generated: components: sinks: statsd: configuration: {
 			}
 			enabled: {
 				description: """
-					Whether or not to require TLS for incoming or outgoing connections.
+					Whether to require TLS for incoming or outgoing connections.
 
 					When enabled and used for incoming connections, an identity certificate is also required. See `tls.crt_file` for
 					more information.
diff --git a/website/cue/reference/components/sinks/generated/vector.cue b/website/cue/reference/components/sinks/generated/vector.cue
index 34de3922630e1..89145cf0af174 100644
--- a/website/cue/reference/components/sinks/generated/vector.cue
+++ b/website/cue/reference/components/sinks/generated/vector.cue
@@ -304,7 +304,7 @@ generated: components: sinks: vector: configuration: {
 			}
 			enabled: {
 				description: """
-					Whether or not to require TLS for incoming or outgoing connections.
+					Whether to require TLS for incoming or outgoing connections.
 
 					When enabled and used for incoming connections, an identity certificate is also required. See `tls.crt_file` for
 					more information.
diff --git a/website/cue/reference/components/sinks/generated/websocket.cue b/website/cue/reference/components/sinks/generated/websocket.cue
index ac3f4469cf0fc..a30cd703f5f9a 100644
--- a/website/cue/reference/components/sinks/generated/websocket.cue
+++ b/website/cue/reference/components/sinks/generated/websocket.cue
@@ -142,7 +142,7 @@ generated: components: sinks: websocket: configuration: {
 																The optional [RoleSessionName][role_session_name] is a unique session identifier for your assumed role.
 
 																Should be unique per principal or reason.
-																If not set, session name will be autogenerated like assume-role-provider-1736428351340
+																If not set, the session name is autogenerated like assume-role-provider-1736428351340
 
 																[role_session_name]: https://docs.aws.amazon.com/STS/latest/APIReference/API_AssumeRole.html
 																"""
@@ -179,7 +179,7 @@ generated: components: sinks: websocket: configuration: {
 					basic: """
 						Basic authentication.
 
-						The username and password are concatenated and encoded via [base64][base64].
+						The username and password are concatenated and encoded using [base64][base64].
 
 						[base64]: https://en.wikipedia.org/wiki/Base64
 						"""
@@ -614,7 +614,7 @@ generated: components: sinks: websocket: configuration: {
 			}
 			enabled: {
 				description: """
-					Whether or not to require TLS for incoming or outgoing connections.
+					Whether to require TLS for incoming or outgoing connections.
 
 					When enabled and used for incoming connections, an identity certificate is also required. See `tls.crt_file` for
 					more information.
diff --git a/website/cue/reference/components/sinks/generated/websocket_server.cue b/website/cue/reference/components/sinks/generated/websocket_server.cue
index e27f8c1418c70..dd09faf4fa051 100644
--- a/website/cue/reference/components/sinks/generated/websocket_server.cue
+++ b/website/cue/reference/components/sinks/generated/websocket_server.cue
@@ -506,7 +506,7 @@ generated: components: sinks: websocket_server: configuration: {
 									schema: {
 										description: """
 																								The Avro schema definition.
-																								Please note that the following [`apache_avro::types::Value`] variants are currently *not* supported:
+																								**Note**: The following [`apache_avro::types::Value`] variants are *not* supported:
 																								* `Date`
 																								* `Decimal`
 																								* `Duration`
@@ -518,7 +518,7 @@ generated: components: sinks: websocket_server: configuration: {
 									}
 									strip_schema_id_prefix: {
 										description: """
-																								For Avro datum encoded in Kafka messages, the bytes are prefixed with the schema ID.  Set this to true to strip the schema ID prefix.
+																								For Avro datum encoded in Kafka messages, the bytes are prefixed with the schema ID.  Set this to `true` to strip the schema ID prefix.
 																								According to [Confluent Kafka's document](https://docs.confluent.io/platform/current/schema-registry/fundamentals/serdes-develop/index.html#wire-format).
 																								"""
 										required: true
@@ -544,7 +544,7 @@ generated: components: sinks: websocket_server: configuration: {
 																							This codec is experimental for the following reason:
 
 																							The GELF specification is more strict than the actual Graylog receiver.
-																							Vector's decoder currently adheres more strictly to the GELF spec, with
+																							Vector's decoder adheres more strictly to the GELF spec, with
 																							the exception that some characters such as `@`  are allowed in field names.
 
 																							Other GELF codecs such as Loki's, use a [Go SDK][implementation] that is maintained
@@ -614,7 +614,7 @@ generated: components: sinks: websocket_server: configuration: {
 								required:      false
 								type: object: options: lossy: {
 									description: """
-																								Determines whether or not to replace invalid UTF-8 sequences instead of failing.
+																								Determines whether to replace invalid UTF-8 sequences instead of failing.
 
 																								When true, invalid UTF-8 sequences are replaced with the [`U+FFFD REPLACEMENT CHARACTER`][U+FFFD].
 
@@ -630,7 +630,7 @@ generated: components: sinks: websocket_server: configuration: {
 								required:      false
 								type: object: options: lossy: {
 									description: """
-																								Determines whether or not to replace invalid UTF-8 sequences instead of failing.
+																								Determines whether to replace invalid UTF-8 sequences instead of failing.
 
 																								When true, invalid UTF-8 sequences are replaced with the [`U+FFFD REPLACEMENT CHARACTER`][U+FFFD].
 
@@ -646,7 +646,7 @@ generated: components: sinks: websocket_server: configuration: {
 								required:      false
 								type: object: options: lossy: {
 									description: """
-																								Determines whether or not to replace invalid UTF-8 sequences instead of failing.
+																								Determines whether to replace invalid UTF-8 sequences instead of failing.
 
 																								When true, invalid UTF-8 sequences are replaced with the [`U+FFFD REPLACEMENT CHARACTER`][U+FFFD].
 
@@ -662,7 +662,7 @@ generated: components: sinks: websocket_server: configuration: {
 								required:      false
 								type: object: options: lossy: {
 									description: """
-																								Determines whether or not to replace invalid UTF-8 sequences instead of failing.
+																								Determines whether to replace invalid UTF-8 sequences instead of failing.
 
 																								When true, invalid UTF-8 sequences are replaced with the [`U+FFFD REPLACEMENT CHARACTER`][U+FFFD].
 
@@ -704,7 +704,7 @@ generated: components: sinks: websocket_server: configuration: {
 								required:      false
 								type: object: options: lossy: {
 									description: """
-																								Determines whether or not to replace invalid UTF-8 sequences instead of failing.
+																								Determines whether to replace invalid UTF-8 sequences instead of failing.
 
 																								When true, invalid UTF-8 sequences are replaced with the [`U+FFFD REPLACEMENT CHARACTER`][U+FFFD].
 
@@ -736,7 +736,7 @@ generated: components: sinks: websocket_server: configuration: {
 																								time zone. The time zone name may be any name in the [TZ database][tz_database], or `local`
 																								to indicate system local time.
 
-																								If not set, `local` will be used.
+																								If not set, `local` is used.
 
 																								[tz_database]: https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
 																								"""
@@ -881,7 +881,7 @@ generated: components: sinks: websocket_server: configuration: {
 			}
 			enabled: {
 				description: """
-					Whether or not to require TLS for incoming or outgoing connections.
+					Whether to require TLS for incoming or outgoing connections.
 
 					When enabled and used for incoming connections, an identity certificate is also required. See `tls.crt_file` for
 					more information.
diff --git a/website/cue/reference/components/sources/generated/amqp.cue b/website/cue/reference/components/sources/generated/amqp.cue
index 77fcb7ef8f827..ab171d5e366e3 100644
--- a/website/cue/reference/components/sources/generated/amqp.cue
+++ b/website/cue/reference/components/sources/generated/amqp.cue
@@ -61,7 +61,7 @@ generated: components: sources: amqp: configuration: {
 					schema: {
 						description: """
 																The Avro schema definition.
-																Please note that the following [`apache_avro::types::Value`] variants are currently *not* supported:
+																**Note**: The following [`apache_avro::types::Value`] variants are *not* supported:
 																* `Date`
 																* `Decimal`
 																* `Duration`
@@ -73,7 +73,7 @@ generated: components: sources: amqp: configuration: {
 					}
 					strip_schema_id_prefix: {
 						description: """
-																For Avro datum encoded in Kafka messages, the bytes are prefixed with the schema ID.  Set this to true to strip the schema ID prefix.
+																For Avro datum encoded in Kafka messages, the bytes are prefixed with the schema ID.  Set this to `true` to strip the schema ID prefix.
 																According to [Confluent Kafka's document](https://docs.confluent.io/platform/current/schema-registry/fundamentals/serdes-develop/index.html#wire-format).
 																"""
 						required: true
@@ -99,7 +99,7 @@ generated: components: sources: amqp: configuration: {
 															This codec is experimental for the following reason:
 
 															The GELF specification is more strict than the actual Graylog receiver.
-															Vector's decoder currently adheres more strictly to the GELF spec, with
+															Vector's decoder adheres more strictly to the GELF spec, with
 															the exception that some characters such as `@`  are allowed in field names.
 
 															Other GELF codecs such as Loki's, use a [Go SDK][implementation] that is maintained
@@ -169,7 +169,7 @@ generated: components: sources: amqp: configuration: {
 				required:      false
 				type: object: options: lossy: {
 					description: """
-						Determines whether or not to replace invalid UTF-8 sequences instead of failing.
+						Determines whether to replace invalid UTF-8 sequences instead of failing.
 
 						When true, invalid UTF-8 sequences are replaced with the [`U+FFFD REPLACEMENT CHARACTER`][U+FFFD].
 
@@ -185,7 +185,7 @@ generated: components: sources: amqp: configuration: {
 				required:      false
 				type: object: options: lossy: {
 					description: """
-						Determines whether or not to replace invalid UTF-8 sequences instead of failing.
+						Determines whether to replace invalid UTF-8 sequences instead of failing.
 
 						When true, invalid UTF-8 sequences are replaced with the [`U+FFFD REPLACEMENT CHARACTER`][U+FFFD].
 
@@ -201,7 +201,7 @@ generated: components: sources: amqp: configuration: {
 				required:      false
 				type: object: options: lossy: {
 					description: """
-						Determines whether or not to replace invalid UTF-8 sequences instead of failing.
+						Determines whether to replace invalid UTF-8 sequences instead of failing.
 
 						When true, invalid UTF-8 sequences are replaced with the [`U+FFFD REPLACEMENT CHARACTER`][U+FFFD].
 
@@ -217,7 +217,7 @@ generated: components: sources: amqp: configuration: {
 				required:      false
 				type: object: options: lossy: {
 					description: """
-						Determines whether or not to replace invalid UTF-8 sequences instead of failing.
+						Determines whether to replace invalid UTF-8 sequences instead of failing.
 
 						When true, invalid UTF-8 sequences are replaced with the [`U+FFFD REPLACEMENT CHARACTER`][U+FFFD].
 
@@ -259,7 +259,7 @@ generated: components: sources: amqp: configuration: {
 				required:      false
 				type: object: options: lossy: {
 					description: """
-						Determines whether or not to replace invalid UTF-8 sequences instead of failing.
+						Determines whether to replace invalid UTF-8 sequences instead of failing.
 
 						When true, invalid UTF-8 sequences are replaced with the [`U+FFFD REPLACEMENT CHARACTER`][U+FFFD].
 
@@ -291,7 +291,7 @@ generated: components: sources: amqp: configuration: {
 																time zone. The time zone name may be any name in the [TZ database][tz_database], or `local`
 																to indicate system local time.
 
-																If not set, `local` will be used.
+																If not set, `local` is used.
 
 																[tz_database]: https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
 																"""
@@ -370,7 +370,7 @@ generated: components: sources: amqp: configuration: {
 																be dropped. If this option is not set, the decoder does not limit the length of messages and
 																the per-message memory is unbounded.
 
-																Note that a message can be composed of multiple chunks and this limit is applied to the whole
+																**Note**: A message can be composed of multiple chunks and this limit is applied to the whole
 																message, not to individual chunks.
 
 																This limit takes only into account the message's payload and the GELF header bytes are excluded from the calculation.
diff --git a/website/cue/reference/components/sources/generated/aws_kinesis_firehose.cue b/website/cue/reference/components/sources/generated/aws_kinesis_firehose.cue
index f5ae42f23a6c8..8f0744c640f41 100644
--- a/website/cue/reference/components/sources/generated/aws_kinesis_firehose.cue
+++ b/website/cue/reference/components/sources/generated/aws_kinesis_firehose.cue
@@ -64,7 +64,7 @@ generated: components: sources: aws_kinesis_firehose: configuration: {
 					schema: {
 						description: """
 																The Avro schema definition.
-																Please note that the following [`apache_avro::types::Value`] variants are currently *not* supported:
+																**Note**: The following [`apache_avro::types::Value`] variants are *not* supported:
 																* `Date`
 																* `Decimal`
 																* `Duration`
@@ -76,7 +76,7 @@ generated: components: sources: aws_kinesis_firehose: configuration: {
 					}
 					strip_schema_id_prefix: {
 						description: """
-																For Avro datum encoded in Kafka messages, the bytes are prefixed with the schema ID.  Set this to true to strip the schema ID prefix.
+																For Avro datum encoded in Kafka messages, the bytes are prefixed with the schema ID.  Set this to `true` to strip the schema ID prefix.
 																According to [Confluent Kafka's document](https://docs.confluent.io/platform/current/schema-registry/fundamentals/serdes-develop/index.html#wire-format).
 																"""
 						required: true
@@ -102,7 +102,7 @@ generated: components: sources: aws_kinesis_firehose: configuration: {
 															This codec is experimental for the following reason:
 
 															The GELF specification is more strict than the actual Graylog receiver.
-															Vector's decoder currently adheres more strictly to the GELF spec, with
+															Vector's decoder adheres more strictly to the GELF spec, with
 															the exception that some characters such as `@`  are allowed in field names.
 
 															Other GELF codecs such as Loki's, use a [Go SDK][implementation] that is maintained
@@ -172,7 +172,7 @@ generated: components: sources: aws_kinesis_firehose: configuration: {
 				required:      false
 				type: object: options: lossy: {
 					description: """
-						Determines whether or not to replace invalid UTF-8 sequences instead of failing.
+						Determines whether to replace invalid UTF-8 sequences instead of failing.
 
 						When true, invalid UTF-8 sequences are replaced with the [`U+FFFD REPLACEMENT CHARACTER`][U+FFFD].
 
@@ -188,7 +188,7 @@ generated: components: sources: aws_kinesis_firehose: configuration: {
 				required:      false
 				type: object: options: lossy: {
 					description: """
-						Determines whether or not to replace invalid UTF-8 sequences instead of failing.
+						Determines whether to replace invalid UTF-8 sequences instead of failing.
 
 						When true, invalid UTF-8 sequences are replaced with the [`U+FFFD REPLACEMENT CHARACTER`][U+FFFD].
 
@@ -204,7 +204,7 @@ generated: components: sources: aws_kinesis_firehose: configuration: {
 				required:      false
 				type: object: options: lossy: {
 					description: """
-						Determines whether or not to replace invalid UTF-8 sequences instead of failing.
+						Determines whether to replace invalid UTF-8 sequences instead of failing.
 
 						When true, invalid UTF-8 sequences are replaced with the [`U+FFFD REPLACEMENT CHARACTER`][U+FFFD].
 
@@ -220,7 +220,7 @@ generated: components: sources: aws_kinesis_firehose: configuration: {
 				required:      false
 				type: object: options: lossy: {
 					description: """
-						Determines whether or not to replace invalid UTF-8 sequences instead of failing.
+						Determines whether to replace invalid UTF-8 sequences instead of failing.
 
 						When true, invalid UTF-8 sequences are replaced with the [`U+FFFD REPLACEMENT CHARACTER`][U+FFFD].
 
@@ -262,7 +262,7 @@ generated: components: sources: aws_kinesis_firehose: configuration: {
 				required:      false
 				type: object: options: lossy: {
 					description: """
-						Determines whether or not to replace invalid UTF-8 sequences instead of failing.
+						Determines whether to replace invalid UTF-8 sequences instead of failing.
 
 						When true, invalid UTF-8 sequences are replaced with the [`U+FFFD REPLACEMENT CHARACTER`][U+FFFD].
 
@@ -294,7 +294,7 @@ generated: components: sources: aws_kinesis_firehose: configuration: {
 																time zone. The time zone name may be any name in the [TZ database][tz_database], or `local`
 																to indicate system local time.
 
-																If not set, `local` will be used.
+																If not set, `local` is used.
 
 																[tz_database]: https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
 																"""
@@ -368,7 +368,7 @@ generated: components: sources: aws_kinesis_firehose: configuration: {
 																be dropped. If this option is not set, the decoder does not limit the length of messages and
 																the per-message memory is unbounded.
 
-																Note that a message can be composed of multiple chunks and this limit is applied to the whole
+																**Note**: A message can be composed of multiple chunks and this limit is applied to the whole
 																message, not to individual chunks.
 
 																This limit takes only into account the message's payload and the GELF header bytes are excluded from the calculation.
@@ -597,7 +597,7 @@ generated: components: sources: aws_kinesis_firehose: configuration: {
 			}
 			enabled: {
 				description: """
-					Whether or not to require TLS for incoming or outgoing connections.
+					Whether to require TLS for incoming or outgoing connections.
 
 					When enabled and used for incoming connections, an identity certificate is also required. See `tls.crt_file` for
 					more information.
diff --git a/website/cue/reference/components/sources/generated/aws_s3.cue b/website/cue/reference/components/sources/generated/aws_s3.cue
index c81349ced8630..7da4d8403e427 100644
--- a/website/cue/reference/components/sources/generated/aws_s3.cue
+++ b/website/cue/reference/components/sources/generated/aws_s3.cue
@@ -127,7 +127,7 @@ generated: components: sources: aws_s3: configuration: {
 					The optional [RoleSessionName][role_session_name] is a unique session identifier for your assumed role.
 
 					Should be unique per principal or reason.
-					If not set, session name will be autogenerated like assume-role-provider-1736428351340
+					If not set, the session name is autogenerated like assume-role-provider-1736428351340
 
 					[role_session_name]: https://docs.aws.amazon.com/STS/latest/APIReference/API_AssumeRole.html
 					"""
@@ -179,7 +179,7 @@ generated: components: sources: aws_s3: configuration: {
 					schema: {
 						description: """
 																The Avro schema definition.
-																Please note that the following [`apache_avro::types::Value`] variants are currently *not* supported:
+																**Note**: The following [`apache_avro::types::Value`] variants are *not* supported:
 																* `Date`
 																* `Decimal`
 																* `Duration`
@@ -191,7 +191,7 @@ generated: components: sources: aws_s3: configuration: {
 					}
 					strip_schema_id_prefix: {
 						description: """
-																For Avro datum encoded in Kafka messages, the bytes are prefixed with the schema ID.  Set this to true to strip the schema ID prefix.
+																For Avro datum encoded in Kafka messages, the bytes are prefixed with the schema ID.  Set this to `true` to strip the schema ID prefix.
 																According to [Confluent Kafka's document](https://docs.confluent.io/platform/current/schema-registry/fundamentals/serdes-develop/index.html#wire-format).
 																"""
 						required: true
@@ -217,7 +217,7 @@ generated: components: sources: aws_s3: configuration: {
 															This codec is experimental for the following reason:
 
 															The GELF specification is more strict than the actual Graylog receiver.
-															Vector's decoder currently adheres more strictly to the GELF spec, with
+															Vector's decoder adheres more strictly to the GELF spec, with
 															the exception that some characters such as `@`  are allowed in field names.
 
 															Other GELF codecs such as Loki's, use a [Go SDK][implementation] that is maintained
@@ -287,7 +287,7 @@ generated: components: sources: aws_s3: configuration: {
 				required:      false
 				type: object: options: lossy: {
 					description: """
-						Determines whether or not to replace invalid UTF-8 sequences instead of failing.
+						Determines whether to replace invalid UTF-8 sequences instead of failing.
 
 						When true, invalid UTF-8 sequences are replaced with the [`U+FFFD REPLACEMENT CHARACTER`][U+FFFD].
 
@@ -303,7 +303,7 @@ generated: components: sources: aws_s3: configuration: {
 				required:      false
 				type: object: options: lossy: {
 					description: """
-						Determines whether or not to replace invalid UTF-8 sequences instead of failing.
+						Determines whether to replace invalid UTF-8 sequences instead of failing.
 
 						When true, invalid UTF-8 sequences are replaced with the [`U+FFFD REPLACEMENT CHARACTER`][U+FFFD].
 
@@ -319,7 +319,7 @@ generated: components: sources: aws_s3: configuration: {
 				required:      false
 				type: object: options: lossy: {
 					description: """
-						Determines whether or not to replace invalid UTF-8 sequences instead of failing.
+						Determines whether to replace invalid UTF-8 sequences instead of failing.
 
 						When true, invalid UTF-8 sequences are replaced with the [`U+FFFD REPLACEMENT CHARACTER`][U+FFFD].
 
@@ -335,7 +335,7 @@ generated: components: sources: aws_s3: configuration: {
 				required:      false
 				type: object: options: lossy: {
 					description: """
-						Determines whether or not to replace invalid UTF-8 sequences instead of failing.
+						Determines whether to replace invalid UTF-8 sequences instead of failing.
 
 						When true, invalid UTF-8 sequences are replaced with the [`U+FFFD REPLACEMENT CHARACTER`][U+FFFD].
 
@@ -377,7 +377,7 @@ generated: components: sources: aws_s3: configuration: {
 				required:      false
 				type: object: options: lossy: {
 					description: """
-						Determines whether or not to replace invalid UTF-8 sequences instead of failing.
+						Determines whether to replace invalid UTF-8 sequences instead of failing.
 
 						When true, invalid UTF-8 sequences are replaced with the [`U+FFFD REPLACEMENT CHARACTER`][U+FFFD].
 
@@ -409,7 +409,7 @@ generated: components: sources: aws_s3: configuration: {
 																time zone. The time zone name may be any name in the [TZ database][tz_database], or `local`
 																to indicate system local time.
 
-																If not set, `local` will be used.
+																If not set, `local` is used.
 
 																[tz_database]: https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
 																"""
@@ -497,7 +497,7 @@ generated: components: sources: aws_s3: configuration: {
 																be dropped. If this option is not set, the decoder does not limit the length of messages and
 																the per-message memory is unbounded.
 
-																Note that a message can be composed of multiple chunks and this limit is applied to the whole
+																**Note**: A message can be composed of multiple chunks and this limit is applied to the whole
 																message, not to individual chunks.
 
 																This limit takes only into account the message's payload and the GELF header bytes are excluded from the calculation.
diff --git a/website/cue/reference/components/sources/generated/aws_sqs.cue b/website/cue/reference/components/sources/generated/aws_sqs.cue
index 1b14843ee08ee..d0d692cce1262 100644
--- a/website/cue/reference/components/sources/generated/aws_sqs.cue
+++ b/website/cue/reference/components/sources/generated/aws_sqs.cue
@@ -127,7 +127,7 @@ generated: components: sources: aws_sqs: configuration: {
 					The optional [RoleSessionName][role_session_name] is a unique session identifier for your assumed role.
 
 					Should be unique per principal or reason.
-					If not set, session name will be autogenerated like assume-role-provider-1736428351340
+					If not set, the session name is autogenerated like assume-role-provider-1736428351340
 
 					[role_session_name]: https://docs.aws.amazon.com/STS/latest/APIReference/API_AssumeRole.html
 					"""
@@ -174,7 +174,7 @@ generated: components: sources: aws_sqs: configuration: {
 					schema: {
 						description: """
 																The Avro schema definition.
-																Please note that the following [`apache_avro::types::Value`] variants are currently *not* supported:
+																**Note**: The following [`apache_avro::types::Value`] variants are *not* supported:
 																* `Date`
 																* `Decimal`
 																* `Duration`
@@ -186,7 +186,7 @@ generated: components: sources: aws_sqs: configuration: {
 					}
 					strip_schema_id_prefix: {
 						description: """
-																For Avro datum encoded in Kafka messages, the bytes are prefixed with the schema ID.  Set this to true to strip the schema ID prefix.
+																For Avro datum encoded in Kafka messages, the bytes are prefixed with the schema ID.  Set this to `true` to strip the schema ID prefix.
 																According to [Confluent Kafka's document](https://docs.confluent.io/platform/current/schema-registry/fundamentals/serdes-develop/index.html#wire-format).
 																"""
 						required: true
@@ -212,7 +212,7 @@ generated: components: sources: aws_sqs: configuration: {
 															This codec is experimental for the following reason:
 
 															The GELF specification is more strict than the actual Graylog receiver.
-															Vector's decoder currently adheres more strictly to the GELF spec, with
+															Vector's decoder adheres more strictly to the GELF spec, with
 															the exception that some characters such as `@`  are allowed in field names.
 
 															Other GELF codecs such as Loki's, use a [Go SDK][implementation] that is maintained
@@ -282,7 +282,7 @@ generated: components: sources: aws_sqs: configuration: {
 				required:      false
 				type: object: options: lossy: {
 					description: """
-						Determines whether or not to replace invalid UTF-8 sequences instead of failing.
+						Determines whether to replace invalid UTF-8 sequences instead of failing.
 
 						When true, invalid UTF-8 sequences are replaced with the [`U+FFFD REPLACEMENT CHARACTER`][U+FFFD].
 
@@ -298,7 +298,7 @@ generated: components: sources: aws_sqs: configuration: {
 				required:      false
 				type: object: options: lossy: {
 					description: """
-						Determines whether or not to replace invalid UTF-8 sequences instead of failing.
+						Determines whether to replace invalid UTF-8 sequences instead of failing.
 
 						When true, invalid UTF-8 sequences are replaced with the [`U+FFFD REPLACEMENT CHARACTER`][U+FFFD].
 
@@ -314,7 +314,7 @@ generated: components: sources: aws_sqs: configuration: {
 				required:      false
 				type: object: options: lossy: {
 					description: """
-						Determines whether or not to replace invalid UTF-8 sequences instead of failing.
+						Determines whether to replace invalid UTF-8 sequences instead of failing.
 
 						When true, invalid UTF-8 sequences are replaced with the [`U+FFFD REPLACEMENT CHARACTER`][U+FFFD].
 
@@ -330,7 +330,7 @@ generated: components: sources: aws_sqs: configuration: {
 				required:      false
 				type: object: options: lossy: {
 					description: """
-						Determines whether or not to replace invalid UTF-8 sequences instead of failing.
+						Determines whether to replace invalid UTF-8 sequences instead of failing.
 
 						When true, invalid UTF-8 sequences are replaced with the [`U+FFFD REPLACEMENT CHARACTER`][U+FFFD].
 
@@ -372,7 +372,7 @@ generated: components: sources: aws_sqs: configuration: {
 				required:      false
 				type: object: options: lossy: {
 					description: """
-						Determines whether or not to replace invalid UTF-8 sequences instead of failing.
+						Determines whether to replace invalid UTF-8 sequences instead of failing.
 
 						When true, invalid UTF-8 sequences are replaced with the [`U+FFFD REPLACEMENT CHARACTER`][U+FFFD].
 
@@ -404,7 +404,7 @@ generated: components: sources: aws_sqs: configuration: {
 																time zone. The time zone name may be any name in the [TZ database][tz_database], or `local`
 																to indicate system local time.
 
-																If not set, `local` will be used.
+																If not set, `local` is used.
 
 																[tz_database]: https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
 																"""
@@ -492,7 +492,7 @@ generated: components: sources: aws_sqs: configuration: {
 																be dropped. If this option is not set, the decoder does not limit the length of messages and
 																the per-message memory is unbounded.
 
-																Note that a message can be composed of multiple chunks and this limit is applied to the whole
+																**Note**: A message can be composed of multiple chunks and this limit is applied to the whole
 																message, not to individual chunks.
 
 																This limit takes only into account the message's payload and the GELF header bytes are excluded from the calculation.
diff --git a/website/cue/reference/components/sources/generated/datadog_agent.cue b/website/cue/reference/components/sources/generated/datadog_agent.cue
index b453750cf66d8..bd4a4d8797ca8 100644
--- a/website/cue/reference/components/sources/generated/datadog_agent.cue
+++ b/website/cue/reference/components/sources/generated/datadog_agent.cue
@@ -46,7 +46,7 @@ generated: components: sources: datadog_agent: configuration: {
 					schema: {
 						description: """
 																The Avro schema definition.
-																Please note that the following [`apache_avro::types::Value`] variants are currently *not* supported:
+																**Note**: The following [`apache_avro::types::Value`] variants are *not* supported:
 																* `Date`
 																* `Decimal`
 																* `Duration`
@@ -58,7 +58,7 @@ generated: components: sources: datadog_agent: configuration: {
 					}
 					strip_schema_id_prefix: {
 						description: """
-																For Avro datum encoded in Kafka messages, the bytes are prefixed with the schema ID.  Set this to true to strip the schema ID prefix.
+																For Avro datum encoded in Kafka messages, the bytes are prefixed with the schema ID.  Set this to `true` to strip the schema ID prefix.
 																According to [Confluent Kafka's document](https://docs.confluent.io/platform/current/schema-registry/fundamentals/serdes-develop/index.html#wire-format).
 																"""
 						required: true
@@ -84,7 +84,7 @@ generated: components: sources: datadog_agent: configuration: {
 															This codec is experimental for the following reason:
 
 															The GELF specification is more strict than the actual Graylog receiver.
-															Vector's decoder currently adheres more strictly to the GELF spec, with
+															Vector's decoder adheres more strictly to the GELF spec, with
 															the exception that some characters such as `@`  are allowed in field names.
 
 															Other GELF codecs such as Loki's, use a [Go SDK][implementation] that is maintained
@@ -154,7 +154,7 @@ generated: components: sources: datadog_agent: configuration: {
 				required:      false
 				type: object: options: lossy: {
 					description: """
-						Determines whether or not to replace invalid UTF-8 sequences instead of failing.
+						Determines whether to replace invalid UTF-8 sequences instead of failing.
 
 						When true, invalid UTF-8 sequences are replaced with the [`U+FFFD REPLACEMENT CHARACTER`][U+FFFD].
 
@@ -170,7 +170,7 @@ generated: components: sources: datadog_agent: configuration: {
 				required:      false
 				type: object: options: lossy: {
 					description: """
-						Determines whether or not to replace invalid UTF-8 sequences instead of failing.
+						Determines whether to replace invalid UTF-8 sequences instead of failing.
 
 						When true, invalid UTF-8 sequences are replaced with the [`U+FFFD REPLACEMENT CHARACTER`][U+FFFD].
 
@@ -186,7 +186,7 @@ generated: components: sources: datadog_agent: configuration: {
 				required:      false
 				type: object: options: lossy: {
 					description: """
-						Determines whether or not to replace invalid UTF-8 sequences instead of failing.
+						Determines whether to replace invalid UTF-8 sequences instead of failing.
 
 						When true, invalid UTF-8 sequences are replaced with the [`U+FFFD REPLACEMENT CHARACTER`][U+FFFD].
 
@@ -202,7 +202,7 @@ generated: components: sources: datadog_agent: configuration: {
 				required:      false
 				type: object: options: lossy: {
 					description: """
-						Determines whether or not to replace invalid UTF-8 sequences instead of failing.
+						Determines whether to replace invalid UTF-8 sequences instead of failing.
 
 						When true, invalid UTF-8 sequences are replaced with the [`U+FFFD REPLACEMENT CHARACTER`][U+FFFD].
 
@@ -244,7 +244,7 @@ generated: components: sources: datadog_agent: configuration: {
 				required:      false
 				type: object: options: lossy: {
 					description: """
-						Determines whether or not to replace invalid UTF-8 sequences instead of failing.
+						Determines whether to replace invalid UTF-8 sequences instead of failing.
 
 						When true, invalid UTF-8 sequences are replaced with the [`U+FFFD REPLACEMENT CHARACTER`][U+FFFD].
 
@@ -276,7 +276,7 @@ generated: components: sources: datadog_agent: configuration: {
 																time zone. The time zone name may be any name in the [TZ database][tz_database], or `local`
 																to indicate system local time.
 
-																If not set, `local` will be used.
+																If not set, `local` is used.
 
 																[tz_database]: https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
 																"""
@@ -365,7 +365,7 @@ generated: components: sources: datadog_agent: configuration: {
 																be dropped. If this option is not set, the decoder does not limit the length of messages and
 																the per-message memory is unbounded.
 
-																Note that a message can be composed of multiple chunks and this limit is applied to the whole
+																**Note**: A message can be composed of multiple chunks and this limit is applied to the whole
 																message, not to individual chunks.
 
 																This limit takes only into account the message's payload and the GELF header bytes are excluded from the calculation.
@@ -576,7 +576,7 @@ generated: components: sources: datadog_agent: configuration: {
 			}
 			enabled: {
 				description: """
-					Whether or not to require TLS for incoming or outgoing connections.
+					Whether to require TLS for incoming or outgoing connections.
 
 					When enabled and used for incoming connections, an identity certificate is also required. See `tls.crt_file` for
 					more information.
diff --git a/website/cue/reference/components/sources/generated/demo_logs.cue b/website/cue/reference/components/sources/generated/demo_logs.cue
index 8bd26ed6d8dbc..26d8187760d2c 100644
--- a/website/cue/reference/components/sources/generated/demo_logs.cue
+++ b/website/cue/reference/components/sources/generated/demo_logs.cue
@@ -25,7 +25,7 @@ generated: components: sources: demo_logs: configuration: {
 					schema: {
 						description: """
 																The Avro schema definition.
-																Please note that the following [`apache_avro::types::Value`] variants are currently *not* supported:
+																**Note**: The following [`apache_avro::types::Value`] variants are *not* supported:
 																* `Date`
 																* `Decimal`
 																* `Duration`
@@ -37,7 +37,7 @@ generated: components: sources: demo_logs: configuration: {
 					}
 					strip_schema_id_prefix: {
 						description: """
-																For Avro datum encoded in Kafka messages, the bytes are prefixed with the schema ID.  Set this to true to strip the schema ID prefix.
+																For Avro datum encoded in Kafka messages, the bytes are prefixed with the schema ID.  Set this to `true` to strip the schema ID prefix.
 																According to [Confluent Kafka's document](https://docs.confluent.io/platform/current/schema-registry/fundamentals/serdes-develop/index.html#wire-format).
 																"""
 						required: true
@@ -63,7 +63,7 @@ generated: components: sources: demo_logs: configuration: {
 															This codec is experimental for the following reason:
 
 															The GELF specification is more strict than the actual Graylog receiver.
-															Vector's decoder currently adheres more strictly to the GELF spec, with
+															Vector's decoder adheres more strictly to the GELF spec, with
 															the exception that some characters such as `@`  are allowed in field names.
 
 															Other GELF codecs such as Loki's, use a [Go SDK][implementation] that is maintained
@@ -133,7 +133,7 @@ generated: components: sources: demo_logs: configuration: {
 				required:      false
 				type: object: options: lossy: {
 					description: """
-						Determines whether or not to replace invalid UTF-8 sequences instead of failing.
+						Determines whether to replace invalid UTF-8 sequences instead of failing.
 
 						When true, invalid UTF-8 sequences are replaced with the [`U+FFFD REPLACEMENT CHARACTER`][U+FFFD].
 
@@ -149,7 +149,7 @@ generated: components: sources: demo_logs: configuration: {
 				required:      false
 				type: object: options: lossy: {
 					description: """
-						Determines whether or not to replace invalid UTF-8 sequences instead of failing.
+						Determines whether to replace invalid UTF-8 sequences instead of failing.
 
 						When true, invalid UTF-8 sequences are replaced with the [`U+FFFD REPLACEMENT CHARACTER`][U+FFFD].
 
@@ -165,7 +165,7 @@ generated: components: sources: demo_logs: configuration: {
 				required:      false
 				type: object: options: lossy: {
 					description: """
-						Determines whether or not to replace invalid UTF-8 sequences instead of failing.
+						Determines whether to replace invalid UTF-8 sequences instead of failing.
 
 						When true, invalid UTF-8 sequences are replaced with the [`U+FFFD REPLACEMENT CHARACTER`][U+FFFD].
 
@@ -181,7 +181,7 @@ generated: components: sources: demo_logs: configuration: {
 				required:      false
 				type: object: options: lossy: {
 					description: """
-						Determines whether or not to replace invalid UTF-8 sequences instead of failing.
+						Determines whether to replace invalid UTF-8 sequences instead of failing.
 
 						When true, invalid UTF-8 sequences are replaced with the [`U+FFFD REPLACEMENT CHARACTER`][U+FFFD].
 
@@ -223,7 +223,7 @@ generated: components: sources: demo_logs: configuration: {
 				required:      false
 				type: object: options: lossy: {
 					description: """
-						Determines whether or not to replace invalid UTF-8 sequences instead of failing.
+						Determines whether to replace invalid UTF-8 sequences instead of failing.
 
 						When true, invalid UTF-8 sequences are replaced with the [`U+FFFD REPLACEMENT CHARACTER`][U+FFFD].
 
@@ -255,7 +255,7 @@ generated: components: sources: demo_logs: configuration: {
 																time zone. The time zone name may be any name in the [TZ database][tz_database], or `local`
 																to indicate system local time.
 
-																If not set, `local` will be used.
+																If not set, `local` is used.
 
 																[tz_database]: https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
 																"""
@@ -361,7 +361,7 @@ generated: components: sources: demo_logs: configuration: {
 																be dropped. If this option is not set, the decoder does not limit the length of messages and
 																the per-message memory is unbounded.
 
-																Note that a message can be composed of multiple chunks and this limit is applied to the whole
+																**Note**: A message can be composed of multiple chunks and this limit is applied to the whole
 																message, not to individual chunks.
 
 																This limit takes only into account the message's payload and the GELF header bytes are excluded from the calculation.
diff --git a/website/cue/reference/components/sources/generated/dnstap.cue b/website/cue/reference/components/sources/generated/dnstap.cue
index a1664c81dc535..3ac53e6521dbf 100644
--- a/website/cue/reference/components/sources/generated/dnstap.cue
+++ b/website/cue/reference/components/sources/generated/dnstap.cue
@@ -216,7 +216,7 @@ generated: components: sources: dnstap: configuration: {
 			}
 			enabled: {
 				description: """
-					Whether or not to require TLS for incoming or outgoing connections.
+					Whether to require TLS for incoming or outgoing connections.
 
 					When enabled and used for incoming connections, an identity certificate is also required. See `tls.crt_file` for
 					more information.
diff --git a/website/cue/reference/components/sources/generated/exec.cue b/website/cue/reference/components/sources/generated/exec.cue
index a933cd395621e..57cf025c47da6 100644
--- a/website/cue/reference/components/sources/generated/exec.cue
+++ b/website/cue/reference/components/sources/generated/exec.cue
@@ -26,7 +26,7 @@ generated: components: sources: exec: configuration: {
 					schema: {
 						description: """
 																The Avro schema definition.
-																Please note that the following [`apache_avro::types::Value`] variants are currently *not* supported:
+																**Note**: The following [`apache_avro::types::Value`] variants are *not* supported:
 																* `Date`
 																* `Decimal`
 																* `Duration`
@@ -38,7 +38,7 @@ generated: components: sources: exec: configuration: {
 					}
 					strip_schema_id_prefix: {
 						description: """
-																For Avro datum encoded in Kafka messages, the bytes are prefixed with the schema ID.  Set this to true to strip the schema ID prefix.
+																For Avro datum encoded in Kafka messages, the bytes are prefixed with the schema ID.  Set this to `true` to strip the schema ID prefix.
 																According to [Confluent Kafka's document](https://docs.confluent.io/platform/current/schema-registry/fundamentals/serdes-develop/index.html#wire-format).
 																"""
 						required: true
@@ -64,7 +64,7 @@ generated: components: sources: exec: configuration: {
 															This codec is experimental for the following reason:
 
 															The GELF specification is more strict than the actual Graylog receiver.
-															Vector's decoder currently adheres more strictly to the GELF spec, with
+															Vector's decoder adheres more strictly to the GELF spec, with
 															the exception that some characters such as `@`  are allowed in field names.
 
 															Other GELF codecs such as Loki's, use a [Go SDK][implementation] that is maintained
@@ -134,7 +134,7 @@ generated: components: sources: exec: configuration: {
 				required:      false
 				type: object: options: lossy: {
 					description: """
-						Determines whether or not to replace invalid UTF-8 sequences instead of failing.
+						Determines whether to replace invalid UTF-8 sequences instead of failing.
 
 						When true, invalid UTF-8 sequences are replaced with the [`U+FFFD REPLACEMENT CHARACTER`][U+FFFD].
 
@@ -150,7 +150,7 @@ generated: components: sources: exec: configuration: {
 				required:      false
 				type: object: options: lossy: {
 					description: """
-						Determines whether or not to replace invalid UTF-8 sequences instead of failing.
+						Determines whether to replace invalid UTF-8 sequences instead of failing.
 
 						When true, invalid UTF-8 sequences are replaced with the [`U+FFFD REPLACEMENT CHARACTER`][U+FFFD].
 
@@ -166,7 +166,7 @@ generated: components: sources: exec: configuration: {
 				required:      false
 				type: object: options: lossy: {
 					description: """
-						Determines whether or not to replace invalid UTF-8 sequences instead of failing.
+						Determines whether to replace invalid UTF-8 sequences instead of failing.
 
 						When true, invalid UTF-8 sequences are replaced with the [`U+FFFD REPLACEMENT CHARACTER`][U+FFFD].
 
@@ -182,7 +182,7 @@ generated: components: sources: exec: configuration: {
 				required:      false
 				type: object: options: lossy: {
 					description: """
-						Determines whether or not to replace invalid UTF-8 sequences instead of failing.
+						Determines whether to replace invalid UTF-8 sequences instead of failing.
 
 						When true, invalid UTF-8 sequences are replaced with the [`U+FFFD REPLACEMENT CHARACTER`][U+FFFD].
 
@@ -224,7 +224,7 @@ generated: components: sources: exec: configuration: {
 				required:      false
 				type: object: options: lossy: {
 					description: """
-						Determines whether or not to replace invalid UTF-8 sequences instead of failing.
+						Determines whether to replace invalid UTF-8 sequences instead of failing.
 
 						When true, invalid UTF-8 sequences are replaced with the [`U+FFFD REPLACEMENT CHARACTER`][U+FFFD].
 
@@ -256,7 +256,7 @@ generated: components: sources: exec: configuration: {
 																time zone. The time zone name may be any name in the [TZ database][tz_database], or `local`
 																to indicate system local time.
 
-																If not set, `local` will be used.
+																If not set, `local` is used.
 
 																[tz_database]: https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
 																"""
@@ -349,7 +349,7 @@ generated: components: sources: exec: configuration: {
 																be dropped. If this option is not set, the decoder does not limit the length of messages and
 																the per-message memory is unbounded.
 
-																Note that a message can be composed of multiple chunks and this limit is applied to the whole
+																**Note**: A message can be composed of multiple chunks and this limit is applied to the whole
 																message, not to individual chunks.
 
 																This limit takes only into account the message's payload and the GELF header bytes are excluded from the calculation.
diff --git a/website/cue/reference/components/sources/generated/file_descriptor.cue b/website/cue/reference/components/sources/generated/file_descriptor.cue
index ddc721b8a96e3..ad69729a8849e 100644
--- a/website/cue/reference/components/sources/generated/file_descriptor.cue
+++ b/website/cue/reference/components/sources/generated/file_descriptor.cue
@@ -16,7 +16,7 @@ generated: components: sources: file_descriptor: configuration: {
 					schema: {
 						description: """
 																The Avro schema definition.
-																Please note that the following [`apache_avro::types::Value`] variants are currently *not* supported:
+																**Note**: The following [`apache_avro::types::Value`] variants are *not* supported:
 																* `Date`
 																* `Decimal`
 																* `Duration`
@@ -28,7 +28,7 @@ generated: components: sources: file_descriptor: configuration: {
 					}
 					strip_schema_id_prefix: {
 						description: """
-																For Avro datum encoded in Kafka messages, the bytes are prefixed with the schema ID.  Set this to true to strip the schema ID prefix.
+																For Avro datum encoded in Kafka messages, the bytes are prefixed with the schema ID.  Set this to `true` to strip the schema ID prefix.
 																According to [Confluent Kafka's document](https://docs.confluent.io/platform/current/schema-registry/fundamentals/serdes-develop/index.html#wire-format).
 																"""
 						required: true
@@ -54,7 +54,7 @@ generated: components: sources: file_descriptor: configuration: {
 															This codec is experimental for the following reason:
 
 															The GELF specification is more strict than the actual Graylog receiver.
-															Vector's decoder currently adheres more strictly to the GELF spec, with
+															Vector's decoder adheres more strictly to the GELF spec, with
 															the exception that some characters such as `@`  are allowed in field names.
 
 															Other GELF codecs such as Loki's, use a [Go SDK][implementation] that is maintained
@@ -124,7 +124,7 @@ generated: components: sources: file_descriptor: configuration: {
 				required:      false
 				type: object: options: lossy: {
 					description: """
-						Determines whether or not to replace invalid UTF-8 sequences instead of failing.
+						Determines whether to replace invalid UTF-8 sequences instead of failing.
 
 						When true, invalid UTF-8 sequences are replaced with the [`U+FFFD REPLACEMENT CHARACTER`][U+FFFD].
 
@@ -140,7 +140,7 @@ generated: components: sources: file_descriptor: configuration: {
 				required:      false
 				type: object: options: lossy: {
 					description: """
-						Determines whether or not to replace invalid UTF-8 sequences instead of failing.
+						Determines whether to replace invalid UTF-8 sequences instead of failing.
 
 						When true, invalid UTF-8 sequences are replaced with the [`U+FFFD REPLACEMENT CHARACTER`][U+FFFD].
 
@@ -156,7 +156,7 @@ generated: components: sources: file_descriptor: configuration: {
 				required:      false
 				type: object: options: lossy: {
 					description: """
-						Determines whether or not to replace invalid UTF-8 sequences instead of failing.
+						Determines whether to replace invalid UTF-8 sequences instead of failing.
 
 						When true, invalid UTF-8 sequences are replaced with the [`U+FFFD REPLACEMENT CHARACTER`][U+FFFD].
 
@@ -172,7 +172,7 @@ generated: components: sources: file_descriptor: configuration: {
 				required:      false
 				type: object: options: lossy: {
 					description: """
-						Determines whether or not to replace invalid UTF-8 sequences instead of failing.
+						Determines whether to replace invalid UTF-8 sequences instead of failing.
 
 						When true, invalid UTF-8 sequences are replaced with the [`U+FFFD REPLACEMENT CHARACTER`][U+FFFD].
 
@@ -214,7 +214,7 @@ generated: components: sources: file_descriptor: configuration: {
 				required:      false
 				type: object: options: lossy: {
 					description: """
-						Determines whether or not to replace invalid UTF-8 sequences instead of failing.
+						Determines whether to replace invalid UTF-8 sequences instead of failing.
 
 						When true, invalid UTF-8 sequences are replaced with the [`U+FFFD REPLACEMENT CHARACTER`][U+FFFD].
 
@@ -246,7 +246,7 @@ generated: components: sources: file_descriptor: configuration: {
 																time zone. The time zone name may be any name in the [TZ database][tz_database], or `local`
 																to indicate system local time.
 
-																If not set, `local` will be used.
+																If not set, `local` is used.
 
 																[tz_database]: https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
 																"""
@@ -327,7 +327,7 @@ generated: components: sources: file_descriptor: configuration: {
 																be dropped. If this option is not set, the decoder does not limit the length of messages and
 																the per-message memory is unbounded.
 
-																Note that a message can be composed of multiple chunks and this limit is applied to the whole
+																**Note**: A message can be composed of multiple chunks and this limit is applied to the whole
 																message, not to individual chunks.
 
 																This limit takes only into account the message's payload and the GELF header bytes are excluded from the calculation.
diff --git a/website/cue/reference/components/sources/generated/fluent.cue b/website/cue/reference/components/sources/generated/fluent.cue
index 2219b9309c7a7..278bfccf5bc48 100644
--- a/website/cue/reference/components/sources/generated/fluent.cue
+++ b/website/cue/reference/components/sources/generated/fluent.cue
@@ -143,7 +143,7 @@ generated: components: sources: fluent: configuration: {
 			}
 			enabled: {
 				description: """
-					Whether or not to require TLS for incoming or outgoing connections.
+					Whether to require TLS for incoming or outgoing connections.
 
 					When enabled and used for incoming connections, an identity certificate is also required. See `tls.crt_file` for
 					more information.
diff --git a/website/cue/reference/components/sources/generated/gcp_pubsub.cue b/website/cue/reference/components/sources/generated/gcp_pubsub.cue
index 6c7e395f45ded..63c066ab3ed09 100644
--- a/website/cue/reference/components/sources/generated/gcp_pubsub.cue
+++ b/website/cue/reference/components/sources/generated/gcp_pubsub.cue
@@ -92,7 +92,7 @@ generated: components: sources: gcp_pubsub: configuration: {
 					schema: {
 						description: """
 																The Avro schema definition.
-																Please note that the following [`apache_avro::types::Value`] variants are currently *not* supported:
+																**Note**: The following [`apache_avro::types::Value`] variants are *not* supported:
 																* `Date`
 																* `Decimal`
 																* `Duration`
@@ -104,7 +104,7 @@ generated: components: sources: gcp_pubsub: configuration: {
 					}
 					strip_schema_id_prefix: {
 						description: """
-																For Avro datum encoded in Kafka messages, the bytes are prefixed with the schema ID.  Set this to true to strip the schema ID prefix.
+																For Avro datum encoded in Kafka messages, the bytes are prefixed with the schema ID.  Set this to `true` to strip the schema ID prefix.
 																According to [Confluent Kafka's document](https://docs.confluent.io/platform/current/schema-registry/fundamentals/serdes-develop/index.html#wire-format).
 																"""
 						required: true
@@ -130,7 +130,7 @@ generated: components: sources: gcp_pubsub: configuration: {
 															This codec is experimental for the following reason:
 
 															The GELF specification is more strict than the actual Graylog receiver.
-															Vector's decoder currently adheres more strictly to the GELF spec, with
+															Vector's decoder adheres more strictly to the GELF spec, with
 															the exception that some characters such as `@`  are allowed in field names.
 
 															Other GELF codecs such as Loki's, use a [Go SDK][implementation] that is maintained
@@ -200,7 +200,7 @@ generated: components: sources: gcp_pubsub: configuration: {
 				required:      false
 				type: object: options: lossy: {
 					description: """
-						Determines whether or not to replace invalid UTF-8 sequences instead of failing.
+						Determines whether to replace invalid UTF-8 sequences instead of failing.
 
 						When true, invalid UTF-8 sequences are replaced with the [`U+FFFD REPLACEMENT CHARACTER`][U+FFFD].
 
@@ -216,7 +216,7 @@ generated: components: sources: gcp_pubsub: configuration: {
 				required:      false
 				type: object: options: lossy: {
 					description: """
-						Determines whether or not to replace invalid UTF-8 sequences instead of failing.
+						Determines whether to replace invalid UTF-8 sequences instead of failing.
 
 						When true, invalid UTF-8 sequences are replaced with the [`U+FFFD REPLACEMENT CHARACTER`][U+FFFD].
 
@@ -232,7 +232,7 @@ generated: components: sources: gcp_pubsub: configuration: {
 				required:      false
 				type: object: options: lossy: {
 					description: """
-						Determines whether or not to replace invalid UTF-8 sequences instead of failing.
+						Determines whether to replace invalid UTF-8 sequences instead of failing.
 
 						When true, invalid UTF-8 sequences are replaced with the [`U+FFFD REPLACEMENT CHARACTER`][U+FFFD].
 
@@ -248,7 +248,7 @@ generated: components: sources: gcp_pubsub: configuration: {
 				required:      false
 				type: object: options: lossy: {
 					description: """
-						Determines whether or not to replace invalid UTF-8 sequences instead of failing.
+						Determines whether to replace invalid UTF-8 sequences instead of failing.
 
 						When true, invalid UTF-8 sequences are replaced with the [`U+FFFD REPLACEMENT CHARACTER`][U+FFFD].
 
@@ -290,7 +290,7 @@ generated: components: sources: gcp_pubsub: configuration: {
 				required:      false
 				type: object: options: lossy: {
 					description: """
-						Determines whether or not to replace invalid UTF-8 sequences instead of failing.
+						Determines whether to replace invalid UTF-8 sequences instead of failing.
 
 						When true, invalid UTF-8 sequences are replaced with the [`U+FFFD REPLACEMENT CHARACTER`][U+FFFD].
 
@@ -322,7 +322,7 @@ generated: components: sources: gcp_pubsub: configuration: {
 																time zone. The time zone name may be any name in the [TZ database][tz_database], or `local`
 																to indicate system local time.
 
-																If not set, `local` will be used.
+																If not set, `local` is used.
 
 																[tz_database]: https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
 																"""
@@ -404,7 +404,7 @@ generated: components: sources: gcp_pubsub: configuration: {
 																be dropped. If this option is not set, the decoder does not limit the length of messages and
 																the per-message memory is unbounded.
 
-																Note that a message can be composed of multiple chunks and this limit is applied to the whole
+																**Note**: A message can be composed of multiple chunks and this limit is applied to the whole
 																message, not to individual chunks.
 
 																This limit takes only into account the message's payload and the GELF header bytes are excluded from the calculation.
diff --git a/website/cue/reference/components/sources/generated/heroku_logs.cue b/website/cue/reference/components/sources/generated/heroku_logs.cue
index 830143949c279..5c1650bd9cc15 100644
--- a/website/cue/reference/components/sources/generated/heroku_logs.cue
+++ b/website/cue/reference/components/sources/generated/heroku_logs.cue
@@ -89,7 +89,7 @@ generated: components: sources: heroku_logs: configuration: {
 					schema: {
 						description: """
 																The Avro schema definition.
-																Please note that the following [`apache_avro::types::Value`] variants are currently *not* supported:
+																**Note**: The following [`apache_avro::types::Value`] variants are *not* supported:
 																* `Date`
 																* `Decimal`
 																* `Duration`
@@ -101,7 +101,7 @@ generated: components: sources: heroku_logs: configuration: {
 					}
 					strip_schema_id_prefix: {
 						description: """
-																For Avro datum encoded in Kafka messages, the bytes are prefixed with the schema ID.  Set this to true to strip the schema ID prefix.
+																For Avro datum encoded in Kafka messages, the bytes are prefixed with the schema ID.  Set this to `true` to strip the schema ID prefix.
 																According to [Confluent Kafka's document](https://docs.confluent.io/platform/current/schema-registry/fundamentals/serdes-develop/index.html#wire-format).
 																"""
 						required: true
@@ -127,7 +127,7 @@ generated: components: sources: heroku_logs: configuration: {
 															This codec is experimental for the following reason:
 
 															The GELF specification is more strict than the actual Graylog receiver.
-															Vector's decoder currently adheres more strictly to the GELF spec, with
+															Vector's decoder adheres more strictly to the GELF spec, with
 															the exception that some characters such as `@`  are allowed in field names.
 
 															Other GELF codecs such as Loki's, use a [Go SDK][implementation] that is maintained
@@ -197,7 +197,7 @@ generated: components: sources: heroku_logs: configuration: {
 				required:      false
 				type: object: options: lossy: {
 					description: """
-						Determines whether or not to replace invalid UTF-8 sequences instead of failing.
+						Determines whether to replace invalid UTF-8 sequences instead of failing.
 
 						When true, invalid UTF-8 sequences are replaced with the [`U+FFFD REPLACEMENT CHARACTER`][U+FFFD].
 
@@ -213,7 +213,7 @@ generated: components: sources: heroku_logs: configuration: {
 				required:      false
 				type: object: options: lossy: {
 					description: """
-						Determines whether or not to replace invalid UTF-8 sequences instead of failing.
+						Determines whether to replace invalid UTF-8 sequences instead of failing.
 
 						When true, invalid UTF-8 sequences are replaced with the [`U+FFFD REPLACEMENT CHARACTER`][U+FFFD].
 
@@ -229,7 +229,7 @@ generated: components: sources: heroku_logs: configuration: {
 				required:      false
 				type: object: options: lossy: {
 					description: """
-						Determines whether or not to replace invalid UTF-8 sequences instead of failing.
+						Determines whether to replace invalid UTF-8 sequences instead of failing.
 
 						When true, invalid UTF-8 sequences are replaced with the [`U+FFFD REPLACEMENT CHARACTER`][U+FFFD].
 
@@ -245,7 +245,7 @@ generated: components: sources: heroku_logs: configuration: {
 				required:      false
 				type: object: options: lossy: {
 					description: """
-						Determines whether or not to replace invalid UTF-8 sequences instead of failing.
+						Determines whether to replace invalid UTF-8 sequences instead of failing.
 
 						When true, invalid UTF-8 sequences are replaced with the [`U+FFFD REPLACEMENT CHARACTER`][U+FFFD].
 
@@ -287,7 +287,7 @@ generated: components: sources: heroku_logs: configuration: {
 				required:      false
 				type: object: options: lossy: {
 					description: """
-						Determines whether or not to replace invalid UTF-8 sequences instead of failing.
+						Determines whether to replace invalid UTF-8 sequences instead of failing.
 
 						When true, invalid UTF-8 sequences are replaced with the [`U+FFFD REPLACEMENT CHARACTER`][U+FFFD].
 
@@ -319,7 +319,7 @@ generated: components: sources: heroku_logs: configuration: {
 																time zone. The time zone name may be any name in the [TZ database][tz_database], or `local`
 																to indicate system local time.
 
-																If not set, `local` will be used.
+																If not set, `local` is used.
 
 																[tz_database]: https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
 																"""
@@ -393,7 +393,7 @@ generated: components: sources: heroku_logs: configuration: {
 																be dropped. If this option is not set, the decoder does not limit the length of messages and
 																the per-message memory is unbounded.
 
-																Note that a message can be composed of multiple chunks and this limit is applied to the whole
+																**Note**: A message can be composed of multiple chunks and this limit is applied to the whole
 																message, not to individual chunks.
 
 																This limit takes only into account the message's payload and the GELF header bytes are excluded from the calculation.
@@ -593,7 +593,7 @@ generated: components: sources: heroku_logs: configuration: {
 			}
 			enabled: {
 				description: """
-					Whether or not to require TLS for incoming or outgoing connections.
+					Whether to require TLS for incoming or outgoing connections.
 
 					When enabled and used for incoming connections, an identity certificate is also required. See `tls.crt_file` for
 					more information.
diff --git a/website/cue/reference/components/sources/generated/http.cue b/website/cue/reference/components/sources/generated/http.cue
index 0f88f04044236..2d5d9842b2b46 100644
--- a/website/cue/reference/components/sources/generated/http.cue
+++ b/website/cue/reference/components/sources/generated/http.cue
@@ -93,7 +93,7 @@ generated: components: sources: http: configuration: {
 					schema: {
 						description: """
 																The Avro schema definition.
-																Please note that the following [`apache_avro::types::Value`] variants are currently *not* supported:
+																**Note**: The following [`apache_avro::types::Value`] variants are *not* supported:
 																* `Date`
 																* `Decimal`
 																* `Duration`
@@ -105,7 +105,7 @@ generated: components: sources: http: configuration: {
 					}
 					strip_schema_id_prefix: {
 						description: """
-																For Avro datum encoded in Kafka messages, the bytes are prefixed with the schema ID.  Set this to true to strip the schema ID prefix.
+																For Avro datum encoded in Kafka messages, the bytes are prefixed with the schema ID.  Set this to `true` to strip the schema ID prefix.
 																According to [Confluent Kafka's document](https://docs.confluent.io/platform/current/schema-registry/fundamentals/serdes-develop/index.html#wire-format).
 																"""
 						required: true
@@ -129,7 +129,7 @@ generated: components: sources: http: configuration: {
 						This codec is experimental for the following reason:
 
 						The GELF specification is more strict than the actual Graylog receiver.
-						Vector's decoder currently adheres more strictly to the GELF spec, with
+						Vector's decoder adheres more strictly to the GELF spec, with
 						the exception that some characters such as `@`  are allowed in field names.
 
 						Other GELF codecs such as Loki's, use a [Go SDK][implementation] that is maintained
@@ -198,7 +198,7 @@ generated: components: sources: http: configuration: {
 				required:      false
 				type: object: options: lossy: {
 					description: """
-						Determines whether or not to replace invalid UTF-8 sequences instead of failing.
+						Determines whether to replace invalid UTF-8 sequences instead of failing.
 
 						When true, invalid UTF-8 sequences are replaced with the [`U+FFFD REPLACEMENT CHARACTER`][U+FFFD].
 
@@ -214,7 +214,7 @@ generated: components: sources: http: configuration: {
 				required:      false
 				type: object: options: lossy: {
 					description: """
-						Determines whether or not to replace invalid UTF-8 sequences instead of failing.
+						Determines whether to replace invalid UTF-8 sequences instead of failing.
 
 						When true, invalid UTF-8 sequences are replaced with the [`U+FFFD REPLACEMENT CHARACTER`][U+FFFD].
 
@@ -230,7 +230,7 @@ generated: components: sources: http: configuration: {
 				required:      false
 				type: object: options: lossy: {
 					description: """
-						Determines whether or not to replace invalid UTF-8 sequences instead of failing.
+						Determines whether to replace invalid UTF-8 sequences instead of failing.
 
 						When true, invalid UTF-8 sequences are replaced with the [`U+FFFD REPLACEMENT CHARACTER`][U+FFFD].
 
@@ -246,7 +246,7 @@ generated: components: sources: http: configuration: {
 				required:      false
 				type: object: options: lossy: {
 					description: """
-						Determines whether or not to replace invalid UTF-8 sequences instead of failing.
+						Determines whether to replace invalid UTF-8 sequences instead of failing.
 
 						When true, invalid UTF-8 sequences are replaced with the [`U+FFFD REPLACEMENT CHARACTER`][U+FFFD].
 
@@ -288,7 +288,7 @@ generated: components: sources: http: configuration: {
 				required:      false
 				type: object: options: lossy: {
 					description: """
-						Determines whether or not to replace invalid UTF-8 sequences instead of failing.
+						Determines whether to replace invalid UTF-8 sequences instead of failing.
 
 						When true, invalid UTF-8 sequences are replaced with the [`U+FFFD REPLACEMENT CHARACTER`][U+FFFD].
 
@@ -320,7 +320,7 @@ generated: components: sources: http: configuration: {
 																time zone. The time zone name may be any name in the [TZ database][tz_database], or `local`
 																to indicate system local time.
 
-																If not set, `local` will be used.
+																If not set, `local` is used.
 
 																[tz_database]: https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
 																"""
@@ -408,7 +408,7 @@ generated: components: sources: http: configuration: {
 																be dropped. If this option is not set, the decoder does not limit the length of messages and
 																the per-message memory is unbounded.
 
-																Note that a message can be composed of multiple chunks and this limit is applied to the whole
+																**Note**: A message can be composed of multiple chunks and this limit is applied to the whole
 																message, not to individual chunks.
 
 																This limit takes only into account the message's payload and the GELF header bytes are excluded from the calculation.
@@ -684,7 +684,7 @@ generated: components: sources: http: configuration: {
 			}
 			enabled: {
 				description: """
-					Whether or not to require TLS for incoming or outgoing connections.
+					Whether to require TLS for incoming or outgoing connections.
 
 					When enabled and used for incoming connections, an identity certificate is also required. See `tls.crt_file` for
 					more information.
diff --git a/website/cue/reference/components/sources/generated/http_client.cue b/website/cue/reference/components/sources/generated/http_client.cue
index c564a7365e0aa..ae72a3002935b 100644
--- a/website/cue/reference/components/sources/generated/http_client.cue
+++ b/website/cue/reference/components/sources/generated/http_client.cue
@@ -111,7 +111,7 @@ generated: components: sources: http_client: configuration: {
 																The optional [RoleSessionName][role_session_name] is a unique session identifier for your assumed role.
 
 																Should be unique per principal or reason.
-																If not set, session name will be autogenerated like assume-role-provider-1736428351340
+																If not set, the session name is autogenerated like assume-role-provider-1736428351340
 
 																[role_session_name]: https://docs.aws.amazon.com/STS/latest/APIReference/API_AssumeRole.html
 																"""
@@ -148,7 +148,7 @@ generated: components: sources: http_client: configuration: {
 					basic: """
 						Basic authentication.
 
-						The username and password are concatenated and encoded via [base64][base64].
+						The username and password are concatenated and encoded using [base64][base64].
 
 						[base64]: https://en.wikipedia.org/wiki/Base64
 						"""
@@ -188,7 +188,7 @@ generated: components: sources: http_client: configuration: {
 					schema: {
 						description: """
 																The Avro schema definition.
-																Please note that the following [`apache_avro::types::Value`] variants are currently *not* supported:
+																**Note**: The following [`apache_avro::types::Value`] variants are *not* supported:
 																* `Date`
 																* `Decimal`
 																* `Duration`
@@ -200,7 +200,7 @@ generated: components: sources: http_client: configuration: {
 					}
 					strip_schema_id_prefix: {
 						description: """
-																For Avro datum encoded in Kafka messages, the bytes are prefixed with the schema ID.  Set this to true to strip the schema ID prefix.
+																For Avro datum encoded in Kafka messages, the bytes are prefixed with the schema ID.  Set this to `true` to strip the schema ID prefix.
 																According to [Confluent Kafka's document](https://docs.confluent.io/platform/current/schema-registry/fundamentals/serdes-develop/index.html#wire-format).
 																"""
 						required: true
@@ -226,7 +226,7 @@ generated: components: sources: http_client: configuration: {
 															This codec is experimental for the following reason:
 
 															The GELF specification is more strict than the actual Graylog receiver.
-															Vector's decoder currently adheres more strictly to the GELF spec, with
+															Vector's decoder adheres more strictly to the GELF spec, with
 															the exception that some characters such as `@`  are allowed in field names.
 
 															Other GELF codecs such as Loki's, use a [Go SDK][implementation] that is maintained
@@ -296,7 +296,7 @@ generated: components: sources: http_client: configuration: {
 				required:      false
 				type: object: options: lossy: {
 					description: """
-						Determines whether or not to replace invalid UTF-8 sequences instead of failing.
+						Determines whether to replace invalid UTF-8 sequences instead of failing.
 
 						When true, invalid UTF-8 sequences are replaced with the [`U+FFFD REPLACEMENT CHARACTER`][U+FFFD].
 
@@ -312,7 +312,7 @@ generated: components: sources: http_client: configuration: {
 				required:      false
 				type: object: options: lossy: {
 					description: """
-						Determines whether or not to replace invalid UTF-8 sequences instead of failing.
+						Determines whether to replace invalid UTF-8 sequences instead of failing.
 
 						When true, invalid UTF-8 sequences are replaced with the [`U+FFFD REPLACEMENT CHARACTER`][U+FFFD].
 
@@ -328,7 +328,7 @@ generated: components: sources: http_client: configuration: {
 				required:      false
 				type: object: options: lossy: {
 					description: """
-						Determines whether or not to replace invalid UTF-8 sequences instead of failing.
+						Determines whether to replace invalid UTF-8 sequences instead of failing.
 
 						When true, invalid UTF-8 sequences are replaced with the [`U+FFFD REPLACEMENT CHARACTER`][U+FFFD].
 
@@ -344,7 +344,7 @@ generated: components: sources: http_client: configuration: {
 				required:      false
 				type: object: options: lossy: {
 					description: """
-						Determines whether or not to replace invalid UTF-8 sequences instead of failing.
+						Determines whether to replace invalid UTF-8 sequences instead of failing.
 
 						When true, invalid UTF-8 sequences are replaced with the [`U+FFFD REPLACEMENT CHARACTER`][U+FFFD].
 
@@ -386,7 +386,7 @@ generated: components: sources: http_client: configuration: {
 				required:      false
 				type: object: options: lossy: {
 					description: """
-						Determines whether or not to replace invalid UTF-8 sequences instead of failing.
+						Determines whether to replace invalid UTF-8 sequences instead of failing.
 
 						When true, invalid UTF-8 sequences are replaced with the [`U+FFFD REPLACEMENT CHARACTER`][U+FFFD].
 
@@ -418,7 +418,7 @@ generated: components: sources: http_client: configuration: {
 																time zone. The time zone name may be any name in the [TZ database][tz_database], or `local`
 																to indicate system local time.
 
-																If not set, `local` will be used.
+																If not set, `local` is used.
 
 																[tz_database]: https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
 																"""
@@ -495,7 +495,7 @@ generated: components: sources: http_client: configuration: {
 																be dropped. If this option is not set, the decoder does not limit the length of messages and
 																the per-message memory is unbounded.
 
-																Note that a message can be composed of multiple chunks and this limit is applied to the whole
+																**Note**: A message can be composed of multiple chunks and this limit is applied to the whole
 																message, not to individual chunks.
 
 																This limit takes only into account the message's payload and the GELF header bytes are excluded from the calculation.
diff --git a/website/cue/reference/components/sources/generated/http_server.cue b/website/cue/reference/components/sources/generated/http_server.cue
index 00e973da362c1..b87a6af6977d2 100644
--- a/website/cue/reference/components/sources/generated/http_server.cue
+++ b/website/cue/reference/components/sources/generated/http_server.cue
@@ -93,7 +93,7 @@ generated: components: sources: http_server: configuration: {
 					schema: {
 						description: """
 																The Avro schema definition.
-																Please note that the following [`apache_avro::types::Value`] variants are currently *not* supported:
+																**Note**: The following [`apache_avro::types::Value`] variants are *not* supported:
 																* `Date`
 																* `Decimal`
 																* `Duration`
@@ -105,7 +105,7 @@ generated: components: sources: http_server: configuration: {
 					}
 					strip_schema_id_prefix: {
 						description: """
-																For Avro datum encoded in Kafka messages, the bytes are prefixed with the schema ID.  Set this to true to strip the schema ID prefix.
+																For Avro datum encoded in Kafka messages, the bytes are prefixed with the schema ID.  Set this to `true` to strip the schema ID prefix.
 																According to [Confluent Kafka's document](https://docs.confluent.io/platform/current/schema-registry/fundamentals/serdes-develop/index.html#wire-format).
 																"""
 						required: true
@@ -129,7 +129,7 @@ generated: components: sources: http_server: configuration: {
 						This codec is experimental for the following reason:
 
 						The GELF specification is more strict than the actual Graylog receiver.
-						Vector's decoder currently adheres more strictly to the GELF spec, with
+						Vector's decoder adheres more strictly to the GELF spec, with
 						the exception that some characters such as `@`  are allowed in field names.
 
 						Other GELF codecs such as Loki's, use a [Go SDK][implementation] that is maintained
@@ -198,7 +198,7 @@ generated: components: sources: http_server: configuration: {
 				required:      false
 				type: object: options: lossy: {
 					description: """
-						Determines whether or not to replace invalid UTF-8 sequences instead of failing.
+						Determines whether to replace invalid UTF-8 sequences instead of failing.
 
 						When true, invalid UTF-8 sequences are replaced with the [`U+FFFD REPLACEMENT CHARACTER`][U+FFFD].
 
@@ -214,7 +214,7 @@ generated: components: sources: http_server: configuration: {
 				required:      false
 				type: object: options: lossy: {
 					description: """
-						Determines whether or not to replace invalid UTF-8 sequences instead of failing.
+						Determines whether to replace invalid UTF-8 sequences instead of failing.
 
 						When true, invalid UTF-8 sequences are replaced with the [`U+FFFD REPLACEMENT CHARACTER`][U+FFFD].
 
@@ -230,7 +230,7 @@ generated: components: sources: http_server: configuration: {
 				required:      false
 				type: object: options: lossy: {
 					description: """
-						Determines whether or not to replace invalid UTF-8 sequences instead of failing.
+						Determines whether to replace invalid UTF-8 sequences instead of failing.
 
 						When true, invalid UTF-8 sequences are replaced with the [`U+FFFD REPLACEMENT CHARACTER`][U+FFFD].
 
@@ -246,7 +246,7 @@ generated: components: sources: http_server: configuration: {
 				required:      false
 				type: object: options: lossy: {
 					description: """
-						Determines whether or not to replace invalid UTF-8 sequences instead of failing.
+						Determines whether to replace invalid UTF-8 sequences instead of failing.
 
 						When true, invalid UTF-8 sequences are replaced with the [`U+FFFD REPLACEMENT CHARACTER`][U+FFFD].
 
@@ -288,7 +288,7 @@ generated: components: sources: http_server: configuration: {
 				required:      false
 				type: object: options: lossy: {
 					description: """
-						Determines whether or not to replace invalid UTF-8 sequences instead of failing.
+						Determines whether to replace invalid UTF-8 sequences instead of failing.
 
 						When true, invalid UTF-8 sequences are replaced with the [`U+FFFD REPLACEMENT CHARACTER`][U+FFFD].
 
@@ -320,7 +320,7 @@ generated: components: sources: http_server: configuration: {
 																time zone. The time zone name may be any name in the [TZ database][tz_database], or `local`
 																to indicate system local time.
 
-																If not set, `local` will be used.
+																If not set, `local` is used.
 
 																[tz_database]: https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
 																"""
@@ -408,7 +408,7 @@ generated: components: sources: http_server: configuration: {
 																be dropped. If this option is not set, the decoder does not limit the length of messages and
 																the per-message memory is unbounded.
 
-																Note that a message can be composed of multiple chunks and this limit is applied to the whole
+																**Note**: A message can be composed of multiple chunks and this limit is applied to the whole
 																message, not to individual chunks.
 
 																This limit takes only into account the message's payload and the GELF header bytes are excluded from the calculation.
@@ -684,7 +684,7 @@ generated: components: sources: http_server: configuration: {
 			}
 			enabled: {
 				description: """
-					Whether or not to require TLS for incoming or outgoing connections.
+					Whether to require TLS for incoming or outgoing connections.
 
 					When enabled and used for incoming connections, an identity certificate is also required. See `tls.crt_file` for
 					more information.
diff --git a/website/cue/reference/components/sources/generated/kafka.cue b/website/cue/reference/components/sources/generated/kafka.cue
index 1aed17b904acc..96ed13ee0b276 100644
--- a/website/cue/reference/components/sources/generated/kafka.cue
+++ b/website/cue/reference/components/sources/generated/kafka.cue
@@ -70,7 +70,7 @@ generated: components: sources: kafka: configuration: {
 					schema: {
 						description: """
 																The Avro schema definition.
-																Please note that the following [`apache_avro::types::Value`] variants are currently *not* supported:
+																**Note**: The following [`apache_avro::types::Value`] variants are *not* supported:
 																* `Date`
 																* `Decimal`
 																* `Duration`
@@ -82,7 +82,7 @@ generated: components: sources: kafka: configuration: {
 					}
 					strip_schema_id_prefix: {
 						description: """
-																For Avro datum encoded in Kafka messages, the bytes are prefixed with the schema ID.  Set this to true to strip the schema ID prefix.
+																For Avro datum encoded in Kafka messages, the bytes are prefixed with the schema ID.  Set this to `true` to strip the schema ID prefix.
 																According to [Confluent Kafka's document](https://docs.confluent.io/platform/current/schema-registry/fundamentals/serdes-develop/index.html#wire-format).
 																"""
 						required: true
@@ -108,7 +108,7 @@ generated: components: sources: kafka: configuration: {
 															This codec is experimental for the following reason:
 
 															The GELF specification is more strict than the actual Graylog receiver.
-															Vector's decoder currently adheres more strictly to the GELF spec, with
+															Vector's decoder adheres more strictly to the GELF spec, with
 															the exception that some characters such as `@`  are allowed in field names.
 
 															Other GELF codecs such as Loki's, use a [Go SDK][implementation] that is maintained
@@ -178,7 +178,7 @@ generated: components: sources: kafka: configuration: {
 				required:      false
 				type: object: options: lossy: {
 					description: """
-						Determines whether or not to replace invalid UTF-8 sequences instead of failing.
+						Determines whether to replace invalid UTF-8 sequences instead of failing.
 
 						When true, invalid UTF-8 sequences are replaced with the [`U+FFFD REPLACEMENT CHARACTER`][U+FFFD].
 
@@ -194,7 +194,7 @@ generated: components: sources: kafka: configuration: {
 				required:      false
 				type: object: options: lossy: {
 					description: """
-						Determines whether or not to replace invalid UTF-8 sequences instead of failing.
+						Determines whether to replace invalid UTF-8 sequences instead of failing.
 
 						When true, invalid UTF-8 sequences are replaced with the [`U+FFFD REPLACEMENT CHARACTER`][U+FFFD].
 
@@ -210,7 +210,7 @@ generated: components: sources: kafka: configuration: {
 				required:      false
 				type: object: options: lossy: {
 					description: """
-						Determines whether or not to replace invalid UTF-8 sequences instead of failing.
+						Determines whether to replace invalid UTF-8 sequences instead of failing.
 
 						When true, invalid UTF-8 sequences are replaced with the [`U+FFFD REPLACEMENT CHARACTER`][U+FFFD].
 
@@ -226,7 +226,7 @@ generated: components: sources: kafka: configuration: {
 				required:      false
 				type: object: options: lossy: {
 					description: """
-						Determines whether or not to replace invalid UTF-8 sequences instead of failing.
+						Determines whether to replace invalid UTF-8 sequences instead of failing.
 
 						When true, invalid UTF-8 sequences are replaced with the [`U+FFFD REPLACEMENT CHARACTER`][U+FFFD].
 
@@ -268,7 +268,7 @@ generated: components: sources: kafka: configuration: {
 				required:      false
 				type: object: options: lossy: {
 					description: """
-						Determines whether or not to replace invalid UTF-8 sequences instead of failing.
+						Determines whether to replace invalid UTF-8 sequences instead of failing.
 
 						When true, invalid UTF-8 sequences are replaced with the [`U+FFFD REPLACEMENT CHARACTER`][U+FFFD].
 
@@ -300,7 +300,7 @@ generated: components: sources: kafka: configuration: {
 																time zone. The time zone name may be any name in the [TZ database][tz_database], or `local`
 																to indicate system local time.
 
-																If not set, `local` will be used.
+																If not set, `local` is used.
 
 																[tz_database]: https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
 																"""
@@ -398,7 +398,7 @@ generated: components: sources: kafka: configuration: {
 																be dropped. If this option is not set, the decoder does not limit the length of messages and
 																the per-message memory is unbounded.
 
-																Note that a message can be composed of multiple chunks and this limit is applied to the whole
+																**Note**: A message can be composed of multiple chunks and this limit is applied to the whole
 																message, not to individual chunks.
 
 																This limit takes only into account the message's payload and the GELF header bytes are excluded from the calculation.
@@ -696,7 +696,7 @@ generated: components: sources: kafka: configuration: {
 			}
 			enabled: {
 				description: """
-					Whether or not to require TLS for incoming or outgoing connections.
+					Whether to require TLS for incoming or outgoing connections.
 
 					When enabled and used for incoming connections, an identity certificate is also required. See `tls.crt_file` for
 					more information.
diff --git a/website/cue/reference/components/sources/generated/logstash.cue b/website/cue/reference/components/sources/generated/logstash.cue
index 9964e4eb12eb0..7feb95f53d68b 100644
--- a/website/cue/reference/components/sources/generated/logstash.cue
+++ b/website/cue/reference/components/sources/generated/logstash.cue
@@ -103,7 +103,7 @@ generated: components: sources: logstash: configuration: {
 			}
 			enabled: {
 				description: """
-					Whether or not to require TLS for incoming or outgoing connections.
+					Whether to require TLS for incoming or outgoing connections.
 
 					When enabled and used for incoming connections, an identity certificate is also required. See `tls.crt_file` for
 					more information.
diff --git a/website/cue/reference/components/sources/generated/mqtt.cue b/website/cue/reference/components/sources/generated/mqtt.cue
index 52daf10a5d1e2..d7da82d6eb75c 100644
--- a/website/cue/reference/components/sources/generated/mqtt.cue
+++ b/website/cue/reference/components/sources/generated/mqtt.cue
@@ -21,7 +21,7 @@ generated: components: sources: mqtt: configuration: {
 					schema: {
 						description: """
 																The Avro schema definition.
-																Please note that the following [`apache_avro::types::Value`] variants are currently *not* supported:
+																**Note**: The following [`apache_avro::types::Value`] variants are *not* supported:
 																* `Date`
 																* `Decimal`
 																* `Duration`
@@ -33,7 +33,7 @@ generated: components: sources: mqtt: configuration: {
 					}
 					strip_schema_id_prefix: {
 						description: """
-																For Avro datum encoded in Kafka messages, the bytes are prefixed with the schema ID.  Set this to true to strip the schema ID prefix.
+																For Avro datum encoded in Kafka messages, the bytes are prefixed with the schema ID.  Set this to `true` to strip the schema ID prefix.
 																According to [Confluent Kafka's document](https://docs.confluent.io/platform/current/schema-registry/fundamentals/serdes-develop/index.html#wire-format).
 																"""
 						required: true
@@ -59,7 +59,7 @@ generated: components: sources: mqtt: configuration: {
 															This codec is experimental for the following reason:
 
 															The GELF specification is more strict than the actual Graylog receiver.
-															Vector's decoder currently adheres more strictly to the GELF spec, with
+															Vector's decoder adheres more strictly to the GELF spec, with
 															the exception that some characters such as `@`  are allowed in field names.
 
 															Other GELF codecs such as Loki's, use a [Go SDK][implementation] that is maintained
@@ -129,7 +129,7 @@ generated: components: sources: mqtt: configuration: {
 				required:      false
 				type: object: options: lossy: {
 					description: """
-						Determines whether or not to replace invalid UTF-8 sequences instead of failing.
+						Determines whether to replace invalid UTF-8 sequences instead of failing.
 
 						When true, invalid UTF-8 sequences are replaced with the [`U+FFFD REPLACEMENT CHARACTER`][U+FFFD].
 
@@ -145,7 +145,7 @@ generated: components: sources: mqtt: configuration: {
 				required:      false
 				type: object: options: lossy: {
 					description: """
-						Determines whether or not to replace invalid UTF-8 sequences instead of failing.
+						Determines whether to replace invalid UTF-8 sequences instead of failing.
 
 						When true, invalid UTF-8 sequences are replaced with the [`U+FFFD REPLACEMENT CHARACTER`][U+FFFD].
 
@@ -161,7 +161,7 @@ generated: components: sources: mqtt: configuration: {
 				required:      false
 				type: object: options: lossy: {
 					description: """
-						Determines whether or not to replace invalid UTF-8 sequences instead of failing.
+						Determines whether to replace invalid UTF-8 sequences instead of failing.
 
 						When true, invalid UTF-8 sequences are replaced with the [`U+FFFD REPLACEMENT CHARACTER`][U+FFFD].
 
@@ -177,7 +177,7 @@ generated: components: sources: mqtt: configuration: {
 				required:      false
 				type: object: options: lossy: {
 					description: """
-						Determines whether or not to replace invalid UTF-8 sequences instead of failing.
+						Determines whether to replace invalid UTF-8 sequences instead of failing.
 
 						When true, invalid UTF-8 sequences are replaced with the [`U+FFFD REPLACEMENT CHARACTER`][U+FFFD].
 
@@ -219,7 +219,7 @@ generated: components: sources: mqtt: configuration: {
 				required:      false
 				type: object: options: lossy: {
 					description: """
-						Determines whether or not to replace invalid UTF-8 sequences instead of failing.
+						Determines whether to replace invalid UTF-8 sequences instead of failing.
 
 						When true, invalid UTF-8 sequences are replaced with the [`U+FFFD REPLACEMENT CHARACTER`][U+FFFD].
 
@@ -251,7 +251,7 @@ generated: components: sources: mqtt: configuration: {
 																time zone. The time zone name may be any name in the [TZ database][tz_database], or `local`
 																to indicate system local time.
 
-																If not set, `local` will be used.
+																If not set, `local` is used.
 
 																[tz_database]: https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
 																"""
@@ -325,7 +325,7 @@ generated: components: sources: mqtt: configuration: {
 																be dropped. If this option is not set, the decoder does not limit the length of messages and
 																the per-message memory is unbounded.
 
-																Note that a message can be composed of multiple chunks and this limit is applied to the whole
+																**Note**: A message can be composed of multiple chunks and this limit is applied to the whole
 																message, not to individual chunks.
 
 																This limit takes only into account the message's payload and the GELF header bytes are excluded from the calculation.
@@ -495,7 +495,7 @@ generated: components: sources: mqtt: configuration: {
 			}
 			enabled: {
 				description: """
-					Whether or not to require TLS for incoming or outgoing connections.
+					Whether to require TLS for incoming or outgoing connections.
 
 					When enabled and used for incoming connections, an identity certificate is also required. See `tls.crt_file` for
 					more information.
diff --git a/website/cue/reference/components/sources/generated/nats.cue b/website/cue/reference/components/sources/generated/nats.cue
index 251aa17e87c7a..b8def0bd6d28e 100644
--- a/website/cue/reference/components/sources/generated/nats.cue
+++ b/website/cue/reference/components/sources/generated/nats.cue
@@ -113,7 +113,7 @@ generated: components: sources: nats: configuration: {
 					schema: {
 						description: """
 																The Avro schema definition.
-																Please note that the following [`apache_avro::types::Value`] variants are currently *not* supported:
+																**Note**: The following [`apache_avro::types::Value`] variants are *not* supported:
 																* `Date`
 																* `Decimal`
 																* `Duration`
@@ -125,7 +125,7 @@ generated: components: sources: nats: configuration: {
 					}
 					strip_schema_id_prefix: {
 						description: """
-																For Avro datum encoded in Kafka messages, the bytes are prefixed with the schema ID.  Set this to true to strip the schema ID prefix.
+																For Avro datum encoded in Kafka messages, the bytes are prefixed with the schema ID.  Set this to `true` to strip the schema ID prefix.
 																According to [Confluent Kafka's document](https://docs.confluent.io/platform/current/schema-registry/fundamentals/serdes-develop/index.html#wire-format).
 																"""
 						required: true
@@ -151,7 +151,7 @@ generated: components: sources: nats: configuration: {
 															This codec is experimental for the following reason:
 
 															The GELF specification is more strict than the actual Graylog receiver.
-															Vector's decoder currently adheres more strictly to the GELF spec, with
+															Vector's decoder adheres more strictly to the GELF spec, with
 															the exception that some characters such as `@`  are allowed in field names.
 
 															Other GELF codecs such as Loki's, use a [Go SDK][implementation] that is maintained
@@ -221,7 +221,7 @@ generated: components: sources: nats: configuration: {
 				required:      false
 				type: object: options: lossy: {
 					description: """
-						Determines whether or not to replace invalid UTF-8 sequences instead of failing.
+						Determines whether to replace invalid UTF-8 sequences instead of failing.
 
 						When true, invalid UTF-8 sequences are replaced with the [`U+FFFD REPLACEMENT CHARACTER`][U+FFFD].
 
@@ -237,7 +237,7 @@ generated: components: sources: nats: configuration: {
 				required:      false
 				type: object: options: lossy: {
 					description: """
-						Determines whether or not to replace invalid UTF-8 sequences instead of failing.
+						Determines whether to replace invalid UTF-8 sequences instead of failing.
 
 						When true, invalid UTF-8 sequences are replaced with the [`U+FFFD REPLACEMENT CHARACTER`][U+FFFD].
 
@@ -253,7 +253,7 @@ generated: components: sources: nats: configuration: {
 				required:      false
 				type: object: options: lossy: {
 					description: """
-						Determines whether or not to replace invalid UTF-8 sequences instead of failing.
+						Determines whether to replace invalid UTF-8 sequences instead of failing.
 
 						When true, invalid UTF-8 sequences are replaced with the [`U+FFFD REPLACEMENT CHARACTER`][U+FFFD].
 
@@ -269,7 +269,7 @@ generated: components: sources: nats: configuration: {
 				required:      false
 				type: object: options: lossy: {
 					description: """
-						Determines whether or not to replace invalid UTF-8 sequences instead of failing.
+						Determines whether to replace invalid UTF-8 sequences instead of failing.
 
 						When true, invalid UTF-8 sequences are replaced with the [`U+FFFD REPLACEMENT CHARACTER`][U+FFFD].
 
@@ -311,7 +311,7 @@ generated: components: sources: nats: configuration: {
 				required:      false
 				type: object: options: lossy: {
 					description: """
-						Determines whether or not to replace invalid UTF-8 sequences instead of failing.
+						Determines whether to replace invalid UTF-8 sequences instead of failing.
 
 						When true, invalid UTF-8 sequences are replaced with the [`U+FFFD REPLACEMENT CHARACTER`][U+FFFD].
 
@@ -343,7 +343,7 @@ generated: components: sources: nats: configuration: {
 																time zone. The time zone name may be any name in the [TZ database][tz_database], or `local`
 																to indicate system local time.
 
-																If not set, `local` will be used.
+																If not set, `local` is used.
 
 																[tz_database]: https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
 																"""
@@ -417,7 +417,7 @@ generated: components: sources: nats: configuration: {
 																be dropped. If this option is not set, the decoder does not limit the length of messages and
 																the per-message memory is unbounded.
 
-																Note that a message can be composed of multiple chunks and this limit is applied to the whole
+																**Note**: A message can be composed of multiple chunks and this limit is applied to the whole
 																message, not to individual chunks.
 
 																This limit takes only into account the message's payload and the GELF header bytes are excluded from the calculation.
@@ -600,7 +600,7 @@ generated: components: sources: nats: configuration: {
 			}
 			enabled: {
 				description: """
-					Whether or not to require TLS for incoming or outgoing connections.
+					Whether to require TLS for incoming or outgoing connections.
 
 					When enabled and used for incoming connections, an identity certificate is also required. See `tls.crt_file` for
 					more information.
diff --git a/website/cue/reference/components/sources/generated/nginx_metrics.cue b/website/cue/reference/components/sources/generated/nginx_metrics.cue
index 775a0b75a845e..0bd5cde5535a0 100644
--- a/website/cue/reference/components/sources/generated/nginx_metrics.cue
+++ b/website/cue/reference/components/sources/generated/nginx_metrics.cue
@@ -116,7 +116,7 @@ generated: components: sources: nginx_metrics: configuration: {
 																The optional [RoleSessionName][role_session_name] is a unique session identifier for your assumed role.
 
 																Should be unique per principal or reason.
-																If not set, session name will be autogenerated like assume-role-provider-1736428351340
+																If not set, the session name is autogenerated like assume-role-provider-1736428351340
 
 																[role_session_name]: https://docs.aws.amazon.com/STS/latest/APIReference/API_AssumeRole.html
 																"""
@@ -153,7 +153,7 @@ generated: components: sources: nginx_metrics: configuration: {
 					basic: """
 						Basic authentication.
 
-						The username and password are concatenated and encoded via [base64][base64].
+						The username and password are concatenated and encoded using [base64][base64].
 
 						[base64]: https://en.wikipedia.org/wiki/Base64
 						"""
diff --git a/website/cue/reference/components/sources/generated/opentelemetry.cue b/website/cue/reference/components/sources/generated/opentelemetry.cue
index 9316a4c0764c7..2ab191d1d6fdb 100644
--- a/website/cue/reference/components/sources/generated/opentelemetry.cue
+++ b/website/cue/reference/components/sources/generated/opentelemetry.cue
@@ -76,7 +76,7 @@ generated: components: sources: opentelemetry: configuration: {
 						}
 						enabled: {
 							description: """
-																Whether or not to require TLS for incoming or outgoing connections.
+																Whether to require TLS for incoming or outgoing connections.
 
 																When enabled and used for incoming connections, an identity certificate is also required. See `tls.crt_file` for
 																more information.
@@ -255,7 +255,7 @@ generated: components: sources: opentelemetry: configuration: {
 						}
 						enabled: {
 							description: """
-																Whether or not to require TLS for incoming or outgoing connections.
+																Whether to require TLS for incoming or outgoing connections.
 
 																When enabled and used for incoming connections, an identity certificate is also required. See `tls.crt_file` for
 																more information.
diff --git a/website/cue/reference/components/sources/generated/prometheus_pushgateway.cue b/website/cue/reference/components/sources/generated/prometheus_pushgateway.cue
index e0026cb0bd52e..33567c12c91d1 100644
--- a/website/cue/reference/components/sources/generated/prometheus_pushgateway.cue
+++ b/website/cue/reference/components/sources/generated/prometheus_pushgateway.cue
@@ -159,7 +159,7 @@ generated: components: sources: prometheus_pushgateway: configuration: {
 			}
 			enabled: {
 				description: """
-					Whether or not to require TLS for incoming or outgoing connections.
+					Whether to require TLS for incoming or outgoing connections.
 
 					When enabled and used for incoming connections, an identity certificate is also required. See `tls.crt_file` for
 					more information.
diff --git a/website/cue/reference/components/sources/generated/prometheus_remote_write.cue b/website/cue/reference/components/sources/generated/prometheus_remote_write.cue
index b384c2426d2cf..23faddc59d1ec 100644
--- a/website/cue/reference/components/sources/generated/prometheus_remote_write.cue
+++ b/website/cue/reference/components/sources/generated/prometheus_remote_write.cue
@@ -149,7 +149,7 @@ generated: components: sources: prometheus_remote_write: configuration: {
 			}
 			enabled: {
 				description: """
-					Whether or not to require TLS for incoming or outgoing connections.
+					Whether to require TLS for incoming or outgoing connections.
 
 					When enabled and used for incoming connections, an identity certificate is also required. See `tls.crt_file` for
 					more information.
diff --git a/website/cue/reference/components/sources/generated/prometheus_scrape.cue b/website/cue/reference/components/sources/generated/prometheus_scrape.cue
index 938fb4c34294c..7ccfafd6676fa 100644
--- a/website/cue/reference/components/sources/generated/prometheus_scrape.cue
+++ b/website/cue/reference/components/sources/generated/prometheus_scrape.cue
@@ -116,7 +116,7 @@ generated: components: sources: prometheus_scrape: configuration: {
 																The optional [RoleSessionName][role_session_name] is a unique session identifier for your assumed role.
 
 																Should be unique per principal or reason.
-																If not set, session name will be autogenerated like assume-role-provider-1736428351340
+																If not set, the session name is autogenerated like assume-role-provider-1736428351340
 
 																[role_session_name]: https://docs.aws.amazon.com/STS/latest/APIReference/API_AssumeRole.html
 																"""
@@ -153,7 +153,7 @@ generated: components: sources: prometheus_scrape: configuration: {
 					basic: """
 						Basic authentication.
 
-						The username and password are concatenated and encoded via [base64][base64].
+						The username and password are concatenated and encoded using [base64][base64].
 
 						[base64]: https://en.wikipedia.org/wiki/Base64
 						"""
diff --git a/website/cue/reference/components/sources/generated/pulsar.cue b/website/cue/reference/components/sources/generated/pulsar.cue
index 467c3de709dea..bc6a3a6fd0e81 100644
--- a/website/cue/reference/components/sources/generated/pulsar.cue
+++ b/website/cue/reference/components/sources/generated/pulsar.cue
@@ -119,7 +119,7 @@ generated: components: sources: pulsar: configuration: {
 					schema: {
 						description: """
 																The Avro schema definition.
-																Please note that the following [`apache_avro::types::Value`] variants are currently *not* supported:
+																**Note**: The following [`apache_avro::types::Value`] variants are *not* supported:
 																* `Date`
 																* `Decimal`
 																* `Duration`
@@ -131,7 +131,7 @@ generated: components: sources: pulsar: configuration: {
 					}
 					strip_schema_id_prefix: {
 						description: """
-																For Avro datum encoded in Kafka messages, the bytes are prefixed with the schema ID.  Set this to true to strip the schema ID prefix.
+																For Avro datum encoded in Kafka messages, the bytes are prefixed with the schema ID.  Set this to `true` to strip the schema ID prefix.
 																According to [Confluent Kafka's document](https://docs.confluent.io/platform/current/schema-registry/fundamentals/serdes-develop/index.html#wire-format).
 																"""
 						required: true
@@ -157,7 +157,7 @@ generated: components: sources: pulsar: configuration: {
 															This codec is experimental for the following reason:
 
 															The GELF specification is more strict than the actual Graylog receiver.
-															Vector's decoder currently adheres more strictly to the GELF spec, with
+															Vector's decoder adheres more strictly to the GELF spec, with
 															the exception that some characters such as `@`  are allowed in field names.
 
 															Other GELF codecs such as Loki's, use a [Go SDK][implementation] that is maintained
@@ -227,7 +227,7 @@ generated: components: sources: pulsar: configuration: {
 				required:      false
 				type: object: options: lossy: {
 					description: """
-						Determines whether or not to replace invalid UTF-8 sequences instead of failing.
+						Determines whether to replace invalid UTF-8 sequences instead of failing.
 
 						When true, invalid UTF-8 sequences are replaced with the [`U+FFFD REPLACEMENT CHARACTER`][U+FFFD].
 
@@ -243,7 +243,7 @@ generated: components: sources: pulsar: configuration: {
 				required:      false
 				type: object: options: lossy: {
 					description: """
-						Determines whether or not to replace invalid UTF-8 sequences instead of failing.
+						Determines whether to replace invalid UTF-8 sequences instead of failing.
 
 						When true, invalid UTF-8 sequences are replaced with the [`U+FFFD REPLACEMENT CHARACTER`][U+FFFD].
 
@@ -259,7 +259,7 @@ generated: components: sources: pulsar: configuration: {
 				required:      false
 				type: object: options: lossy: {
 					description: """
-						Determines whether or not to replace invalid UTF-8 sequences instead of failing.
+						Determines whether to replace invalid UTF-8 sequences instead of failing.
 
 						When true, invalid UTF-8 sequences are replaced with the [`U+FFFD REPLACEMENT CHARACTER`][U+FFFD].
 
@@ -275,7 +275,7 @@ generated: components: sources: pulsar: configuration: {
 				required:      false
 				type: object: options: lossy: {
 					description: """
-						Determines whether or not to replace invalid UTF-8 sequences instead of failing.
+						Determines whether to replace invalid UTF-8 sequences instead of failing.
 
 						When true, invalid UTF-8 sequences are replaced with the [`U+FFFD REPLACEMENT CHARACTER`][U+FFFD].
 
@@ -317,7 +317,7 @@ generated: components: sources: pulsar: configuration: {
 				required:      false
 				type: object: options: lossy: {
 					description: """
-						Determines whether or not to replace invalid UTF-8 sequences instead of failing.
+						Determines whether to replace invalid UTF-8 sequences instead of failing.
 
 						When true, invalid UTF-8 sequences are replaced with the [`U+FFFD REPLACEMENT CHARACTER`][U+FFFD].
 
@@ -349,7 +349,7 @@ generated: components: sources: pulsar: configuration: {
 																time zone. The time zone name may be any name in the [TZ database][tz_database], or `local`
 																to indicate system local time.
 
-																If not set, `local` will be used.
+																If not set, `local` is used.
 
 																[tz_database]: https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
 																"""
@@ -428,7 +428,7 @@ generated: components: sources: pulsar: configuration: {
 																be dropped. If this option is not set, the decoder does not limit the length of messages and
 																the per-message memory is unbounded.
 
-																Note that a message can be composed of multiple chunks and this limit is applied to the whole
+																**Note**: A message can be composed of multiple chunks and this limit is applied to the whole
 																message, not to individual chunks.
 
 																This limit takes only into account the message's payload and the GELF header bytes are excluded from the calculation.
diff --git a/website/cue/reference/components/sources/generated/redis.cue b/website/cue/reference/components/sources/generated/redis.cue
index 567435f06bdc6..0b562454eb49e 100644
--- a/website/cue/reference/components/sources/generated/redis.cue
+++ b/website/cue/reference/components/sources/generated/redis.cue
@@ -31,7 +31,7 @@ generated: components: sources: redis: configuration: {
 					schema: {
 						description: """
 																The Avro schema definition.
-																Please note that the following [`apache_avro::types::Value`] variants are currently *not* supported:
+																**Note**: The following [`apache_avro::types::Value`] variants are *not* supported:
 																* `Date`
 																* `Decimal`
 																* `Duration`
@@ -43,7 +43,7 @@ generated: components: sources: redis: configuration: {
 					}
 					strip_schema_id_prefix: {
 						description: """
-																For Avro datum encoded in Kafka messages, the bytes are prefixed with the schema ID.  Set this to true to strip the schema ID prefix.
+																For Avro datum encoded in Kafka messages, the bytes are prefixed with the schema ID.  Set this to `true` to strip the schema ID prefix.
 																According to [Confluent Kafka's document](https://docs.confluent.io/platform/current/schema-registry/fundamentals/serdes-develop/index.html#wire-format).
 																"""
 						required: true
@@ -69,7 +69,7 @@ generated: components: sources: redis: configuration: {
 															This codec is experimental for the following reason:
 
 															The GELF specification is more strict than the actual Graylog receiver.
-															Vector's decoder currently adheres more strictly to the GELF spec, with
+															Vector's decoder adheres more strictly to the GELF spec, with
 															the exception that some characters such as `@`  are allowed in field names.
 
 															Other GELF codecs such as Loki's, use a [Go SDK][implementation] that is maintained
@@ -139,7 +139,7 @@ generated: components: sources: redis: configuration: {
 				required:      false
 				type: object: options: lossy: {
 					description: """
-						Determines whether or not to replace invalid UTF-8 sequences instead of failing.
+						Determines whether to replace invalid UTF-8 sequences instead of failing.
 
 						When true, invalid UTF-8 sequences are replaced with the [`U+FFFD REPLACEMENT CHARACTER`][U+FFFD].
 
@@ -155,7 +155,7 @@ generated: components: sources: redis: configuration: {
 				required:      false
 				type: object: options: lossy: {
 					description: """
-						Determines whether or not to replace invalid UTF-8 sequences instead of failing.
+						Determines whether to replace invalid UTF-8 sequences instead of failing.
 
 						When true, invalid UTF-8 sequences are replaced with the [`U+FFFD REPLACEMENT CHARACTER`][U+FFFD].
 
@@ -171,7 +171,7 @@ generated: components: sources: redis: configuration: {
 				required:      false
 				type: object: options: lossy: {
 					description: """
-						Determines whether or not to replace invalid UTF-8 sequences instead of failing.
+						Determines whether to replace invalid UTF-8 sequences instead of failing.
 
 						When true, invalid UTF-8 sequences are replaced with the [`U+FFFD REPLACEMENT CHARACTER`][U+FFFD].
 
@@ -187,7 +187,7 @@ generated: components: sources: redis: configuration: {
 				required:      false
 				type: object: options: lossy: {
 					description: """
-						Determines whether or not to replace invalid UTF-8 sequences instead of failing.
+						Determines whether to replace invalid UTF-8 sequences instead of failing.
 
 						When true, invalid UTF-8 sequences are replaced with the [`U+FFFD REPLACEMENT CHARACTER`][U+FFFD].
 
@@ -229,7 +229,7 @@ generated: components: sources: redis: configuration: {
 				required:      false
 				type: object: options: lossy: {
 					description: """
-						Determines whether or not to replace invalid UTF-8 sequences instead of failing.
+						Determines whether to replace invalid UTF-8 sequences instead of failing.
 
 						When true, invalid UTF-8 sequences are replaced with the [`U+FFFD REPLACEMENT CHARACTER`][U+FFFD].
 
@@ -261,7 +261,7 @@ generated: components: sources: redis: configuration: {
 																time zone. The time zone name may be any name in the [TZ database][tz_database], or `local`
 																to indicate system local time.
 
-																If not set, `local` will be used.
+																If not set, `local` is used.
 
 																[tz_database]: https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
 																"""
@@ -335,7 +335,7 @@ generated: components: sources: redis: configuration: {
 																be dropped. If this option is not set, the decoder does not limit the length of messages and
 																the per-message memory is unbounded.
 
-																Note that a message can be composed of multiple chunks and this limit is applied to the whole
+																**Note**: A message can be composed of multiple chunks and this limit is applied to the whole
 																message, not to individual chunks.
 
 																This limit takes only into account the message's payload and the GELF header bytes are excluded from the calculation.
diff --git a/website/cue/reference/components/sources/generated/socket.cue b/website/cue/reference/components/sources/generated/socket.cue
index b7482c3ea3b86..14c7d6e69f7af 100644
--- a/website/cue/reference/components/sources/generated/socket.cue
+++ b/website/cue/reference/components/sources/generated/socket.cue
@@ -33,7 +33,7 @@ generated: components: sources: socket: configuration: {
 					schema: {
 						description: """
 																The Avro schema definition.
-																Please note that the following [`apache_avro::types::Value`] variants are currently *not* supported:
+																**Note**: The following [`apache_avro::types::Value`] variants are *not* supported:
 																* `Date`
 																* `Decimal`
 																* `Duration`
@@ -45,7 +45,7 @@ generated: components: sources: socket: configuration: {
 					}
 					strip_schema_id_prefix: {
 						description: """
-																For Avro datum encoded in Kafka messages, the bytes are prefixed with the schema ID.  Set this to true to strip the schema ID prefix.
+																For Avro datum encoded in Kafka messages, the bytes are prefixed with the schema ID.  Set this to `true` to strip the schema ID prefix.
 																According to [Confluent Kafka's document](https://docs.confluent.io/platform/current/schema-registry/fundamentals/serdes-develop/index.html#wire-format).
 																"""
 						required: true
@@ -71,7 +71,7 @@ generated: components: sources: socket: configuration: {
 															This codec is experimental for the following reason:
 
 															The GELF specification is more strict than the actual Graylog receiver.
-															Vector's decoder currently adheres more strictly to the GELF spec, with
+															Vector's decoder adheres more strictly to the GELF spec, with
 															the exception that some characters such as `@`  are allowed in field names.
 
 															Other GELF codecs such as Loki's, use a [Go SDK][implementation] that is maintained
@@ -141,7 +141,7 @@ generated: components: sources: socket: configuration: {
 				required:      false
 				type: object: options: lossy: {
 					description: """
-						Determines whether or not to replace invalid UTF-8 sequences instead of failing.
+						Determines whether to replace invalid UTF-8 sequences instead of failing.
 
 						When true, invalid UTF-8 sequences are replaced with the [`U+FFFD REPLACEMENT CHARACTER`][U+FFFD].
 
@@ -157,7 +157,7 @@ generated: components: sources: socket: configuration: {
 				required:      false
 				type: object: options: lossy: {
 					description: """
-						Determines whether or not to replace invalid UTF-8 sequences instead of failing.
+						Determines whether to replace invalid UTF-8 sequences instead of failing.
 
 						When true, invalid UTF-8 sequences are replaced with the [`U+FFFD REPLACEMENT CHARACTER`][U+FFFD].
 
@@ -173,7 +173,7 @@ generated: components: sources: socket: configuration: {
 				required:      false
 				type: object: options: lossy: {
 					description: """
-						Determines whether or not to replace invalid UTF-8 sequences instead of failing.
+						Determines whether to replace invalid UTF-8 sequences instead of failing.
 
 						When true, invalid UTF-8 sequences are replaced with the [`U+FFFD REPLACEMENT CHARACTER`][U+FFFD].
 
@@ -189,7 +189,7 @@ generated: components: sources: socket: configuration: {
 				required:      false
 				type: object: options: lossy: {
 					description: """
-						Determines whether or not to replace invalid UTF-8 sequences instead of failing.
+						Determines whether to replace invalid UTF-8 sequences instead of failing.
 
 						When true, invalid UTF-8 sequences are replaced with the [`U+FFFD REPLACEMENT CHARACTER`][U+FFFD].
 
@@ -231,7 +231,7 @@ generated: components: sources: socket: configuration: {
 				required:      false
 				type: object: options: lossy: {
 					description: """
-						Determines whether or not to replace invalid UTF-8 sequences instead of failing.
+						Determines whether to replace invalid UTF-8 sequences instead of failing.
 
 						When true, invalid UTF-8 sequences are replaced with the [`U+FFFD REPLACEMENT CHARACTER`][U+FFFD].
 
@@ -263,7 +263,7 @@ generated: components: sources: socket: configuration: {
 																time zone. The time zone name may be any name in the [TZ database][tz_database], or `local`
 																to indicate system local time.
 
-																If not set, `local` will be used.
+																If not set, `local` is used.
 
 																[tz_database]: https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
 																"""
@@ -337,7 +337,7 @@ generated: components: sources: socket: configuration: {
 																be dropped. If this option is not set, the decoder does not limit the length of messages and
 																the per-message memory is unbounded.
 
-																Note that a message can be composed of multiple chunks and this limit is applied to the whole
+																**Note**: A message can be composed of multiple chunks and this limit is applied to the whole
 																message, not to individual chunks.
 
 																This limit takes only into account the message's payload and the GELF header bytes are excluded from the calculation.
@@ -625,7 +625,7 @@ generated: components: sources: socket: configuration: {
 			}
 			enabled: {
 				description: """
-					Whether or not to require TLS for incoming or outgoing connections.
+					Whether to require TLS for incoming or outgoing connections.
 
 					When enabled and used for incoming connections, an identity certificate is also required. See `tls.crt_file` for
 					more information.
diff --git a/website/cue/reference/components/sources/generated/splunk_hec.cue b/website/cue/reference/components/sources/generated/splunk_hec.cue
index 9424e44213ea9..519d879bf4200 100644
--- a/website/cue/reference/components/sources/generated/splunk_hec.cue
+++ b/website/cue/reference/components/sources/generated/splunk_hec.cue
@@ -153,7 +153,7 @@ generated: components: sources: splunk_hec: configuration: {
 			}
 			enabled: {
 				description: """
-					Whether or not to require TLS for incoming or outgoing connections.
+					Whether to require TLS for incoming or outgoing connections.
 
 					When enabled and used for incoming connections, an identity certificate is also required. See `tls.crt_file` for
 					more information.
diff --git a/website/cue/reference/components/sources/generated/statsd.cue b/website/cue/reference/components/sources/generated/statsd.cue
index 4e80208630c11..8c3d6ce8cd3e4 100644
--- a/website/cue/reference/components/sources/generated/statsd.cue
+++ b/website/cue/reference/components/sources/generated/statsd.cue
@@ -132,7 +132,7 @@ generated: components: sources: statsd: configuration: {
 			}
 			enabled: {
 				description: """
-					Whether or not to require TLS for incoming or outgoing connections.
+					Whether to require TLS for incoming or outgoing connections.
 
 					When enabled and used for incoming connections, an identity certificate is also required. See `tls.crt_file` for
 					more information.
diff --git a/website/cue/reference/components/sources/generated/stdin.cue b/website/cue/reference/components/sources/generated/stdin.cue
index 104eed5b39ad6..86cbebd231d4e 100644
--- a/website/cue/reference/components/sources/generated/stdin.cue
+++ b/website/cue/reference/components/sources/generated/stdin.cue
@@ -16,7 +16,7 @@ generated: components: sources: stdin: configuration: {
 					schema: {
 						description: """
 																The Avro schema definition.
-																Please note that the following [`apache_avro::types::Value`] variants are currently *not* supported:
+																**Note**: The following [`apache_avro::types::Value`] variants are *not* supported:
 																* `Date`
 																* `Decimal`
 																* `Duration`
@@ -28,7 +28,7 @@ generated: components: sources: stdin: configuration: {
 					}
 					strip_schema_id_prefix: {
 						description: """
-																For Avro datum encoded in Kafka messages, the bytes are prefixed with the schema ID.  Set this to true to strip the schema ID prefix.
+																For Avro datum encoded in Kafka messages, the bytes are prefixed with the schema ID.  Set this to `true` to strip the schema ID prefix.
 																According to [Confluent Kafka's document](https://docs.confluent.io/platform/current/schema-registry/fundamentals/serdes-develop/index.html#wire-format).
 																"""
 						required: true
@@ -54,7 +54,7 @@ generated: components: sources: stdin: configuration: {
 															This codec is experimental for the following reason:
 
 															The GELF specification is more strict than the actual Graylog receiver.
-															Vector's decoder currently adheres more strictly to the GELF spec, with
+															Vector's decoder adheres more strictly to the GELF spec, with
 															the exception that some characters such as `@`  are allowed in field names.
 
 															Other GELF codecs such as Loki's, use a [Go SDK][implementation] that is maintained
@@ -124,7 +124,7 @@ generated: components: sources: stdin: configuration: {
 				required:      false
 				type: object: options: lossy: {
 					description: """
-						Determines whether or not to replace invalid UTF-8 sequences instead of failing.
+						Determines whether to replace invalid UTF-8 sequences instead of failing.
 
 						When true, invalid UTF-8 sequences are replaced with the [`U+FFFD REPLACEMENT CHARACTER`][U+FFFD].
 
@@ -140,7 +140,7 @@ generated: components: sources: stdin: configuration: {
 				required:      false
 				type: object: options: lossy: {
 					description: """
-						Determines whether or not to replace invalid UTF-8 sequences instead of failing.
+						Determines whether to replace invalid UTF-8 sequences instead of failing.
 
 						When true, invalid UTF-8 sequences are replaced with the [`U+FFFD REPLACEMENT CHARACTER`][U+FFFD].
 
@@ -156,7 +156,7 @@ generated: components: sources: stdin: configuration: {
 				required:      false
 				type: object: options: lossy: {
 					description: """
-						Determines whether or not to replace invalid UTF-8 sequences instead of failing.
+						Determines whether to replace invalid UTF-8 sequences instead of failing.
 
 						When true, invalid UTF-8 sequences are replaced with the [`U+FFFD REPLACEMENT CHARACTER`][U+FFFD].
 
@@ -172,7 +172,7 @@ generated: components: sources: stdin: configuration: {
 				required:      false
 				type: object: options: lossy: {
 					description: """
-						Determines whether or not to replace invalid UTF-8 sequences instead of failing.
+						Determines whether to replace invalid UTF-8 sequences instead of failing.
 
 						When true, invalid UTF-8 sequences are replaced with the [`U+FFFD REPLACEMENT CHARACTER`][U+FFFD].
 
@@ -214,7 +214,7 @@ generated: components: sources: stdin: configuration: {
 				required:      false
 				type: object: options: lossy: {
 					description: """
-						Determines whether or not to replace invalid UTF-8 sequences instead of failing.
+						Determines whether to replace invalid UTF-8 sequences instead of failing.
 
 						When true, invalid UTF-8 sequences are replaced with the [`U+FFFD REPLACEMENT CHARACTER`][U+FFFD].
 
@@ -246,7 +246,7 @@ generated: components: sources: stdin: configuration: {
 																time zone. The time zone name may be any name in the [TZ database][tz_database], or `local`
 																to indicate system local time.
 
-																If not set, `local` will be used.
+																If not set, `local` is used.
 
 																[tz_database]: https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
 																"""
@@ -320,7 +320,7 @@ generated: components: sources: stdin: configuration: {
 																be dropped. If this option is not set, the decoder does not limit the length of messages and
 																the per-message memory is unbounded.
 
-																Note that a message can be composed of multiple chunks and this limit is applied to the whole
+																**Note**: A message can be composed of multiple chunks and this limit is applied to the whole
 																message, not to individual chunks.
 
 																This limit takes only into account the message's payload and the GELF header bytes are excluded from the calculation.
diff --git a/website/cue/reference/components/sources/generated/syslog.cue b/website/cue/reference/components/sources/generated/syslog.cue
index 09ce0d7d4ba38..55a131fce77e2 100644
--- a/website/cue/reference/components/sources/generated/syslog.cue
+++ b/website/cue/reference/components/sources/generated/syslog.cue
@@ -147,7 +147,7 @@ generated: components: sources: syslog: configuration: {
 			}
 			enabled: {
 				description: """
-					Whether or not to require TLS for incoming or outgoing connections.
+					Whether to require TLS for incoming or outgoing connections.
 
 					When enabled and used for incoming connections, an identity certificate is also required. See `tls.crt_file` for
 					more information.
diff --git a/website/cue/reference/components/sources/generated/vector.cue b/website/cue/reference/components/sources/generated/vector.cue
index 239357a91ffd7..3c2fe06b852e7 100644
--- a/website/cue/reference/components/sources/generated/vector.cue
+++ b/website/cue/reference/components/sources/generated/vector.cue
@@ -68,7 +68,7 @@ generated: components: sources: vector: configuration: {
 			}
 			enabled: {
 				description: """
-					Whether or not to require TLS for incoming or outgoing connections.
+					Whether to require TLS for incoming or outgoing connections.
 
 					When enabled and used for incoming connections, an identity certificate is also required. See `tls.crt_file` for
 					more information.
diff --git a/website/cue/reference/generated/configuration.cue b/website/cue/reference/generated/configuration.cue
index 646f06be4d5ef..143ecac9e3171 100644
--- a/website/cue/reference/generated/configuration.cue
+++ b/website/cue/reference/generated/configuration.cue
@@ -358,7 +358,7 @@ generated: configuration: configuration: {
 														The optional [RoleSessionName][role_session_name] is a unique session identifier for your assumed role.
 
 														Should be unique per principal or reason.
-														If not set, session name will be autogenerated like assume-role-provider-1736428351340
+														If not set, the session name is autogenerated like assume-role-provider-1736428351340
 
 														[role_session_name]: https://docs.aws.amazon.com/STS/latest/APIReference/API_AssumeRole.html
 														"""

From 7e488ffaaf3bc68855581fdb8dd71dc6f2fbe92b Mon Sep 17 00:00:00 2001
From: Jake Halaska <26490690+5Dev24@users.noreply.github.com>
Date: Tue, 29 Jul 2025 14:59:13 -0500
Subject: [PATCH 233/305] feat(redis sink): add Redis Sentinel support for
 redis sink (#23355)

* feat: redis sentinel support in sink

* Add changelog entry

* fix spelling

* vdev fmt

* fix integration tests & clippy error

* add on_retriable_error hook in RetryLogic

fix nits

* Add connection id to sentinel ConnectionManager's

Add idempotency token in the form of a connection id to sentinel connection managers
Propagate this connection id through error handling

* remove tuple access and unwraps

* Use background task and watch channel to repair redis connection via sentinel

* update comment

* match -> if let

* fix clippy

---------

Co-authored-by: Pavlos Rontidis <pavlos.rontidis@gmail.com>
---
 Cargo.lock                                    |   1 +
 Cargo.toml                                    |   2 +-
 changelog.d/redis_sentinel_in_sink.feature.md |   3 +
 scripts/integration/redis/compose.yaml        |  23 +-
 scripts/integration/redis/test.yaml           |   3 +-
 src/sinks/redis/config.rs                     | 171 ++++++++++-
 src/sinks/redis/integration_tests.rs          | 169 ++++++++++-
 src/sinks/redis/mod.rs                        |  17 +-
 src/sinks/redis/service.rs                    |  22 +-
 src/sinks/redis/sink.rs                       | 279 +++++++++++++++++-
 src/sinks/util/retries.rs                     |   4 +
 src/sources/redis/mod.rs                      |   2 +-
 .../components/sinks/generated/redis.cue      |  68 +++++
 13 files changed, 719 insertions(+), 45 deletions(-)
 create mode 100644 changelog.d/redis_sentinel_in_sink.feature.md

diff --git a/Cargo.lock b/Cargo.lock
index 76649b716c9bc..35810805b8c9c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -8625,6 +8625,7 @@ dependencies = [
  "num-bigint",
  "percent-encoding",
  "pin-project-lite",
+ "rand 0.9.1",
  "ryu",
  "socket2 0.5.10",
  "tokio",
diff --git a/Cargo.toml b/Cargo.toml
index 34f9ef3b9a568..5cf450079f61f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -376,7 +376,7 @@ quick-junit = { version = "0.5.1" }
 rand.workspace = true
 rand_distr.workspace = true
 rdkafka = { version = "0.37.0", default-features = false, features = ["curl-static", "tokio", "libz", "ssl", "zstd"], optional = true }
-redis = { version = "0.32.3", default-features = false, features = ["connection-manager", "tokio-comp", "tokio-native-tls-comp"], optional = true }
+redis = { version = "0.32.3", default-features = false, features = ["connection-manager", "sentinel", "tokio-comp", "tokio-native-tls-comp"], optional = true }
 regex = { version = "1.11.1", default-features = false, features = ["std", "perf"] }
 roaring = { version = "0.11.0", default-features = false, features = ["std"], optional = true }
 rumqttc = { version = "0.24.0", default-features = false, features = ["use-rustls"], optional = true }
diff --git a/changelog.d/redis_sentinel_in_sink.feature.md b/changelog.d/redis_sentinel_in_sink.feature.md
new file mode 100644
index 0000000000000..82c076b93ff7c
--- /dev/null
+++ b/changelog.d/redis_sentinel_in_sink.feature.md
@@ -0,0 +1,3 @@
+Adds support for Redis Sentinel in the Redis sink.
+
+authors: 5Dev24
diff --git a/scripts/integration/redis/compose.yaml b/scripts/integration/redis/compose.yaml
index a5dd865e43579..1399a12b2a655 100644
--- a/scripts/integration/redis/compose.yaml
+++ b/scripts/integration/redis/compose.yaml
@@ -1,5 +1,26 @@
 version: '3'
 
 services:
-  redis:
+  redis-primary:
     image: docker.io/redis:${CONFIG_VERSION}
+    container_name: redis-primary
+    hostname: redis-primary
+    ports:
+      - "6379:6379"
+
+  redis-sentinel:
+    image: docker.io/redis:${CONFIG_VERSION}
+    container_name: redis-sentinel
+    hostname: redis-sentinel
+    depends_on:
+      - redis-primary
+    ports:
+      - "26379:26379"
+    command: >
+      sh -c 'echo "bind 0.0.0.0" > /etc/sentinel.conf &&
+            echo "sentinel monitor vector redis-primary 6379 1" >> /etc/sentinel.conf &&
+            echo "sentinel resolve-hostnames yes" >> /etc/sentinel.conf &&
+            echo "sentinel down-after-milliseconds vector 5000" >> /etc/sentinel.conf &&
+            echo "sentinel failover-timeout vector 5000" >> /etc/sentinel.conf &&
+            echo "sentinel parallel-syncs vector 1" >> /etc/sentinel.conf &&
+            redis-sentinel /etc/sentinel.conf'
diff --git a/scripts/integration/redis/test.yaml b/scripts/integration/redis/test.yaml
index d2d0577e844ca..6b2d9bfa3745a 100644
--- a/scripts/integration/redis/test.yaml
+++ b/scripts/integration/redis/test.yaml
@@ -4,7 +4,8 @@ features:
 test_filter: "::redis::"
 
 env:
-  REDIS_URL: redis://redis:6379/0
+  REDIS_URL: redis://redis-primary:6379/0
+  SENTINEL_URL: redis://redis-sentinel:26379/
 
 matrix:
   version: [6-alpine]
diff --git a/src/sinks/redis/config.rs b/src/sinks/redis/config.rs
index 4a3de9fc2aec5..6e2143aa75da9 100644
--- a/src/sinks/redis/config.rs
+++ b/src/sinks/redis/config.rs
@@ -1,9 +1,18 @@
-use redis::{aio::ConnectionManager, RedisResult};
+use redis::{
+    sentinel::{Sentinel, SentinelNodeConnectionInfo},
+    ProtocolVersion, RedisConnectionInfo, TlsMode,
+};
 use snafu::prelude::*;
 
-use crate::sinks::{prelude::*, util::service::TowerRequestConfigDefaults};
+use crate::{
+    serde::OneOrMany,
+    sinks::{prelude::*, util::service::TowerRequestConfigDefaults},
+};
 
-use super::{sink::RedisSink, RedisCreateFailedSnafu};
+use super::{
+    sink::{RedisConnection, RedisSink},
+    RedisCreateFailedSnafu,
+};
 
 #[derive(Clone, Copy, Debug)]
 pub struct RedisTowerRequestConfigDefaults;
@@ -92,7 +101,18 @@ pub struct RedisSinkConfig {
     /// `redis` or `rediss` for connections secured via TLS.
     #[configurable(metadata(docs::examples = "redis://127.0.0.1:6379/0"))]
     #[serde(alias = "url")]
-    pub(super) endpoint: String,
+    pub(super) endpoint: OneOrMany<String>,
+
+    /// The service name to use for sentinel.
+    ///
+    /// If this is specified, `endpoint` will be used to reach sentinel instances instead of a
+    /// redis instance.
+    #[configurable]
+    pub(super) sentinel_service: Option<String>,
+
+    #[configurable(derived)]
+    #[serde(default)]
+    pub(super) sentinel_connect: Option<SentinelConnectionSettings>,
 
     /// The Redis key to publish messages to.
     #[configurable(validation(length(min = 1)))]
@@ -139,7 +159,7 @@ impl SinkConfig for RedisSinkConfig {
         if self.key.is_empty() {
             return Err("`key` cannot be empty.".into());
         }
-        let conn = self.build_client().await.context(RedisCreateFailedSnafu)?;
+        let conn = self.build_connection().await?;
         let healthcheck = RedisSinkConfig::healthcheck(conn.clone()).boxed();
         let sink = RedisSink::new(self, conn)?;
         Ok((super::VectorSink::from_event_streamsink(sink), healthcheck))
@@ -155,15 +175,146 @@ impl SinkConfig for RedisSinkConfig {
 }
 
 impl RedisSinkConfig {
-    pub(super) async fn build_client(&self) -> RedisResult<ConnectionManager> {
-        let client = redis::Client::open(self.endpoint.as_str())?;
-        client.get_connection_manager().await
+    pub(super) async fn build_connection(&self) -> crate::Result<RedisConnection> {
+        let endpoints = self.endpoint.clone().to_vec();
+
+        if endpoints.is_empty() {
+            return Err("`endpoint` cannot be empty.".into());
+        }
+
+        if let Some(sentinel_service) = &self.sentinel_service {
+            let sentinel = Sentinel::build(endpoints).context(RedisCreateFailedSnafu)?;
+
+            Ok(RedisConnection::new_sentinel(
+                sentinel,
+                sentinel_service.clone(),
+                self.sentinel_connect.clone().unwrap_or_default().into(),
+            )
+            .await
+            .context(RedisCreateFailedSnafu)?)
+        } else {
+            // SAFETY: endpoints cannot be empty (checked above)
+            let client =
+                redis::Client::open(endpoints[0].as_str()).context(RedisCreateFailedSnafu)?;
+            let conn = client
+                .get_connection_manager()
+                .await
+                .context(RedisCreateFailedSnafu)?;
+
+            Ok(RedisConnection::new_direct(conn))
+        }
     }
 
-    async fn healthcheck(mut conn: ConnectionManager) -> crate::Result<()> {
+    async fn healthcheck(mut conn: RedisConnection) -> crate::Result<()> {
         redis::cmd("PING")
-            .query_async(&mut conn)
+            .query_async(&mut conn.get_connection_manager().await?.connection)
             .await
             .map_err(Into::into)
     }
 }
+
+/// Controls how Redis Sentinel will connect to the servers belonging to it.
+#[configurable_component]
+#[derive(Clone, Debug, Default)]
+#[serde(deny_unknown_fields)]
+pub struct SentinelConnectionSettings {
+    #[configurable(derived)]
+    #[serde(default)]
+    pub tls: MaybeTlsMode,
+
+    #[configurable(derived)]
+    #[serde(default)]
+    pub connections: Option<RedisConnectionSettings>,
+}
+
+impl From<SentinelConnectionSettings> for SentinelNodeConnectionInfo {
+    fn from(value: SentinelConnectionSettings) -> Self {
+        SentinelNodeConnectionInfo {
+            tls_mode: value.tls.into(),
+            redis_connection_info: value.connections.map(Into::into),
+        }
+    }
+}
+
+/// How/if TLS should be established.
+#[configurable_component]
+#[derive(Clone, Copy, Debug, Derivative, Eq, PartialEq)]
+#[derivative(Default)]
+#[serde(rename_all = "lowercase")]
+pub enum MaybeTlsMode {
+    /// Don't use TLS.
+    ///
+    /// This is the default.
+    #[derivative(Default)]
+    None,
+
+    /// Enable TLS with certificate verification.
+    Secure,
+
+    /// Enable TLS without certificate verification.
+    Insecure,
+}
+
+impl From<MaybeTlsMode> for Option<TlsMode> {
+    fn from(value: MaybeTlsMode) -> Self {
+        match value {
+            MaybeTlsMode::None => None,
+            MaybeTlsMode::Secure => Some(TlsMode::Secure),
+            MaybeTlsMode::Insecure => Some(TlsMode::Insecure),
+        }
+    }
+}
+
+/// Connection independent information used to establish a connection
+/// to a redis instance sentinel owns.
+#[configurable_component]
+#[derive(Clone, Debug, Derivative)]
+#[derivative(Default)]
+pub struct RedisConnectionSettings {
+    /// The database number to use. Usually `0`.
+    pub db: i64,
+
+    /// Optionally, the username to connection with.
+    pub username: Option<String>,
+
+    /// Optionally, the password to connection with.
+    pub password: Option<String>,
+
+    /// The version of RESP to use.
+    pub protocol: RedisProtocolVersion,
+}
+
+impl From<RedisConnectionSettings> for RedisConnectionInfo {
+    fn from(value: RedisConnectionSettings) -> Self {
+        RedisConnectionInfo {
+            db: value.db,
+            username: value.username,
+            password: value.password,
+            protocol: value.protocol.into(),
+        }
+    }
+}
+
+/// The communication protocol to use with the redis server.
+#[configurable_component]
+#[derive(Clone, Copy, Debug, Derivative, Eq, PartialEq)]
+#[derivative(Default)]
+pub enum RedisProtocolVersion {
+    /// Use RESP2.
+    ///
+    /// This is the default.
+    #[derivative(Default)]
+    RESP2,
+
+    /// Use RESP3.
+    RESP3,
+}
+
+impl From<RedisProtocolVersion> for ProtocolVersion {
+    fn from(value: RedisProtocolVersion) -> Self {
+        match value {
+            RedisProtocolVersion::RESP2 => ProtocolVersion::RESP2,
+            RedisProtocolVersion::RESP3 => ProtocolVersion::RESP3,
+        }
+    }
+}
diff --git a/src/sinks/redis/integration_tests.rs b/src/sinks/redis/integration_tests.rs
index a7059d67aaaab..379f33f082834 100644
--- a/src/sinks/redis/integration_tests.rs
+++ b/src/sinks/redis/integration_tests.rs
@@ -13,6 +13,7 @@ use crate::event::{
 
 use super::config::{DataTypeConfig, ListOption, Method, RedisSinkConfig};
 use crate::{
+    serde::OneOrMany,
     sinks::prelude::*,
     test_util::{
         components::{
@@ -27,6 +28,119 @@ fn redis_server() -> String {
     std::env::var("REDIS_URL").unwrap_or_else(|_| "redis://127.0.0.1:6379/0".to_owned())
 }
 
+fn redis_sentinel_server() -> Vec<String> {
+    vec![std::env::var("SENTINEL_URL").unwrap_or_else(|_| "redis://127.0.0.1:26379/".to_owned())]
+}
+
+#[tokio::test]
+async fn redis_sink_sentinel_reaches_primary() {
+    trace_init();
+
+    let cnf = RedisSinkConfig {
+        endpoint: OneOrMany::Many(redis_sentinel_server()),
+        key: Template::try_from(format!("test-{}", random_string(10)))
+            .expect("should not fail to create key template"),
+        encoding: JsonSerializerConfig::default().into(),
+        data_type: DataTypeConfig::List,
+        list_option: Some(ListOption {
+            method: Method::RPush,
+        }),
+        batch: BatchConfig::default(),
+        request: TowerRequestConfig {
+            rate_limit_num: u64::MAX,
+            ..Default::default()
+        },
+        sentinel_service: Some("vector".to_owned()),
+        sentinel_connect: None,
+        acknowledgements: Default::default(),
+    };
+
+    let mut redis_connection = cnf.build_connection().await.unwrap();
+    let mut conn = redis_connection
+        .get_connection_manager()
+        .await
+        .unwrap()
+        .connection;
+
+    assert!(redis::cmd("PING")
+        .query_async::<()>(&mut conn)
+        .await
+        .is_ok());
+}
+
+#[tokio::test]
+async fn redis_sink_sentinel_rpush() {
+    trace_init();
+
+    let key = Template::try_from(format!("test-{}", random_string(10)))
+        .expect("should not fail to create key template");
+    debug!("Test key name: {}.", key);
+    let mut rng = rand::rng();
+    let num_events = rng.random_range(10000..20000);
+    debug!("Test events num: {}.", num_events);
+
+    let cnf = RedisSinkConfig {
+        endpoint: OneOrMany::Many(redis_sentinel_server()),
+        key: key.clone(),
+        encoding: JsonSerializerConfig::default().into(),
+        data_type: DataTypeConfig::List,
+        list_option: Some(ListOption {
+            method: Method::RPush,
+        }),
+        batch: BatchConfig::default(),
+        request: TowerRequestConfig {
+            rate_limit_num: u64::MAX,
+            ..Default::default()
+        },
+        sentinel_service: Some("vector".to_owned()),
+        sentinel_connect: None,
+        acknowledgements: Default::default(),
+    };
+
+    let mut events: Vec<Event> = Vec::new();
+    for i in 0..num_events {
+        let s: String = i.to_string();
+        let e = LogEvent::from(s);
+        events.push(e.into());
+    }
+    let input = stream::iter(events.clone().into_iter().map(Into::into));
+
+    // Publish events.
+    let cnf2 = cnf.clone();
+    assert_sink_compliance(&SINK_TAGS, async move {
+        // let conn = cnf2.build_connection().await.unwrap().get_connection_manager().await.unwrap().connection;
+        let cx = SinkContext::default();
+        let (sink, _healthcheck) = cnf2.build(cx).await.unwrap();
+        sink.run(input).await
+    })
+    .await
+    .expect("Running sink failed");
+
+    let mut conn = cnf
+        .build_connection()
+        .await
+        .unwrap()
+        .get_connection_manager()
+        .await
+        .unwrap()
+        .connection;
+
+    let key_exists: bool = conn.exists(key.to_string()).await.unwrap();
+    debug!("Test key: {} exists: {}.", key, key_exists);
+    assert!(key_exists);
+    let llen: usize = conn.llen(key.clone().to_string()).await.unwrap();
+    debug!("Test key: {} len: {}.", key, llen);
+    assert_eq!(llen, num_events);
+
+    for i in 0..num_events {
+        let e = events.get(i).unwrap().as_log();
+        let s = serde_json::to_string(e).unwrap_or_default();
+        let payload: (String, String) = conn.blpop(key.clone().to_string(), 2000.0).await.unwrap();
+        let val = payload.1;
+        assert_eq!(val, s);
+    }
+}
+
 #[tokio::test]
 async fn redis_sink_list_lpush() {
     trace_init();
@@ -39,7 +153,7 @@ async fn redis_sink_list_lpush() {
     debug!("Test events num: {}.", num_events);
 
     let cnf = RedisSinkConfig {
-        endpoint: redis_server(),
+        endpoint: OneOrMany::One(redis_server()),
         key: key.clone(),
         encoding: JsonSerializerConfig::default().into(),
         data_type: DataTypeConfig::List,
@@ -51,6 +165,8 @@ async fn redis_sink_list_lpush() {
             rate_limit_num: u64::MAX,
             ..Default::default()
         },
+        sentinel_service: None,
+        sentinel_connect: None,
         acknowledgements: Default::default(),
     };
 
@@ -65,7 +181,7 @@ async fn redis_sink_list_lpush() {
     // Publish events.
     let cnf2 = cnf.clone();
     assert_sink_compliance(&SINK_TAGS, async move {
-        // let conn = cnf2.build_client().await.unwrap();
+        // let conn = cnf2.build_connection().await.unwrap().get_connection_manager().await.unwrap().connection;
         let cx = SinkContext::default();
         let (sink, _healthcheck) = cnf2.build(cx).await.unwrap();
         sink.run(input).await
@@ -73,7 +189,14 @@ async fn redis_sink_list_lpush() {
     .await
     .expect("Running sink failed");
 
-    let mut conn = cnf.build_client().await.unwrap();
+    let mut conn = cnf
+        .build_connection()
+        .await
+        .unwrap()
+        .get_connection_manager()
+        .await
+        .unwrap()
+        .connection;
 
     let key_exists: bool = conn.exists(key.clone().to_string()).await.unwrap();
     debug!("Test key: {} exists: {}.", key, key_exists);
@@ -103,7 +226,7 @@ async fn redis_sink_list_rpush() {
     debug!("Test events num: {}.", num_events);
 
     let cnf = RedisSinkConfig {
-        endpoint: redis_server(),
+        endpoint: OneOrMany::One(redis_server()),
         key: key.clone(),
         encoding: JsonSerializerConfig::default().into(),
         data_type: DataTypeConfig::List,
@@ -115,6 +238,8 @@ async fn redis_sink_list_rpush() {
             rate_limit_num: u64::MAX,
             ..Default::default()
         },
+        sentinel_service: None,
+        sentinel_connect: None,
         acknowledgements: Default::default(),
     };
 
@@ -129,7 +254,7 @@ async fn redis_sink_list_rpush() {
     // Publish events.
     let cnf2 = cnf.clone();
     assert_sink_compliance(&SINK_TAGS, async move {
-        // let conn = cnf2.build_client().await.unwrap();
+        // let conn = cnf2.build_connection().await.unwrap().get_connection_manager().await.unwrap().connection;
         let cx = SinkContext::default();
         let (sink, _healthcheck) = cnf2.build(cx).await.unwrap();
         sink.run(input).await
@@ -137,7 +262,14 @@ async fn redis_sink_list_rpush() {
     .await
     .expect("Running sink failed");
 
-    let mut conn = cnf.build_client().await.unwrap();
+    let mut conn = cnf
+        .build_connection()
+        .await
+        .unwrap()
+        .get_connection_manager()
+        .await
+        .unwrap()
+        .connection;
 
     let key_exists: bool = conn.exists(key.to_string()).await.unwrap();
     debug!("Test key: {} exists: {}.", key, key_exists);
@@ -182,7 +314,7 @@ async fn redis_sink_channel() {
     let mut pubsub_stream = pubsub_conn.on_message();
 
     let cnf = RedisSinkConfig {
-        endpoint: redis_server(),
+        endpoint: OneOrMany::One(redis_server()),
         key: key.clone(),
         encoding: JsonSerializerConfig::default().into(),
         data_type: DataTypeConfig::Channel,
@@ -192,6 +324,8 @@ async fn redis_sink_channel() {
             rate_limit_num: u64::MAX,
             ..Default::default()
         },
+        sentinel_service: None,
+        sentinel_connect: None,
         acknowledgements: Default::default(),
     };
 
@@ -257,7 +391,7 @@ async fn redis_sink_channel_data_volume_tags() {
     let mut pubsub_stream = pubsub_conn.on_message();
 
     let cnf = RedisSinkConfig {
-        endpoint: redis_server(),
+        endpoint: OneOrMany::One(redis_server()),
         key: key.clone(),
         encoding: JsonSerializerConfig::default().into(),
         data_type: DataTypeConfig::Channel,
@@ -267,6 +401,8 @@ async fn redis_sink_channel_data_volume_tags() {
             rate_limit_num: u64::MAX,
             ..Default::default()
         },
+        sentinel_service: None,
+        sentinel_connect: None,
         acknowledgements: Default::default(),
     };
 
@@ -304,7 +440,7 @@ async fn redis_sink_metrics() {
     debug!("Test events num: {}.", num_events);
 
     let cnf = RedisSinkConfig {
-        endpoint: redis_server(),
+        endpoint: OneOrMany::One(redis_server()),
         key: key.clone(),
         encoding: JsonSerializerConfig::default().into(),
         data_type: DataTypeConfig::List,
@@ -316,6 +452,8 @@ async fn redis_sink_metrics() {
             rate_limit_num: u64::MAX,
             ..Default::default()
         },
+        sentinel_service: None,
+        sentinel_connect: None,
         acknowledgements: Default::default(),
     };
 
@@ -352,7 +490,14 @@ async fn redis_sink_metrics() {
     .expect("Running sink failed");
 
     // Verify metrics were stored correctly
-    let mut conn = cnf.build_client().await.unwrap();
+    let mut conn = cnf
+        .build_connection()
+        .await
+        .unwrap()
+        .get_connection_manager()
+        .await
+        .unwrap()
+        .connection;
 
     let key_exists: bool = conn.exists(key.to_string()).await.unwrap();
     debug!("Test key: {} exists: {}.", key, key_exists);
@@ -398,7 +543,7 @@ async fn redis_sink_traces() {
         // Setup Redis sink config
         let key = Template::try_from(format!("test-traces-{}", random_string(10))).unwrap();
         let config = RedisSinkConfig {
-            endpoint: redis_server(),
+            endpoint: OneOrMany::One(redis_server()),
             key: key.clone(),
             encoding: JsonSerializerConfig::default().into(),
             data_type: DataTypeConfig::List,
@@ -407,6 +552,8 @@ async fn redis_sink_traces() {
             }),
             batch: BatchConfig::default(),
             request: TowerRequestConfig::default(),
+            sentinel_service: None,
+            sentinel_connect: None,
             acknowledgements: Default::default(),
         };
 
diff --git a/src/sinks/redis/mod.rs b/src/sinks/redis/mod.rs
index 15f88ae50949c..753f79810335a 100644
--- a/src/sinks/redis/mod.rs
+++ b/src/sinks/redis/mod.rs
@@ -16,19 +16,28 @@ mod integration_tests;
 use bytes::Bytes;
 use redis::RedisError;
 use snafu::Snafu;
+use tokio::sync::watch::error::RecvError;
 
 use crate::sinks::prelude::*;
 
-use self::config::Method;
+use self::{config::Method, sink::GenerationCount};
 
 use super::util::EncodedLength;
 
 #[derive(Debug, Snafu)]
 pub(super) enum RedisSinkError {
-    #[snafu(display("Creating Redis producer failed: {}", source))]
+    #[snafu(display("Creating Redis producer failed: {source}"))]
     RedisCreateFailed { source: RedisError },
-    #[snafu(display("Error sending query: {}", source))]
-    SendError { source: RedisError },
+    #[snafu(display(
+        "Error sending query: {source}{}",
+        if let Some(gen) = generation { format!(", gen={gen}") } else { String::new() }
+    ))]
+    SendError {
+        source: RedisError,
+        generation: Option<GenerationCount>,
+    },
+    #[snafu(display("Repair channel was closed: {source}"))]
+    RepairChannelError { source: RecvError },
 }
 
 #[derive(Clone, Copy, Debug, Derivative)]
diff --git a/src/sinks/redis/service.rs b/src/sinks/redis/service.rs
index 52d4a215eaa40..7070b28e7ae99 100644
--- a/src/sinks/redis/service.rs
+++ b/src/sinks/redis/service.rs
@@ -1,14 +1,16 @@
 use std::task::{Context, Poll};
 
-use redis::aio::ConnectionManager;
-
 use crate::sinks::prelude::*;
 
-use super::{config::Method, RedisRequest, RedisSinkError};
+use super::{
+    config::Method,
+    sink::{ConnectionState, RedisConnection},
+    RedisRequest, RedisSinkError,
+};
 
 #[derive(Clone)]
 pub struct RedisService {
-    pub(super) conn: ConnectionManager,
+    pub(super) conn: RedisConnection,
     pub(super) data_type: super::DataType,
 }
 
@@ -26,7 +28,7 @@ impl Service<RedisRequest> for RedisService {
     fn call(&mut self, kvs: RedisRequest) -> Self::Future {
         let count = kvs.request.len();
 
-        let mut conn = self.conn.clone();
+        let mut redis_conn = self.conn.clone();
         let mut pipe = redis::pipe();
 
         for kv in kvs.request {
@@ -60,13 +62,21 @@ impl Service<RedisRequest> for RedisService {
         let byte_size = kvs.metadata.events_byte_size();
 
         Box::pin(async move {
+            let ConnectionState {
+                connection: mut conn,
+                generation,
+            } = redis_conn.get_connection_manager().await?;
+
             match pipe.query_async(&mut conn).await {
                 Ok(event_status) => Ok(RedisResponse {
                     event_status,
                     events_byte_size: kvs.metadata.into_events_estimated_json_encoded_byte_size(),
                     byte_size,
                 }),
-                Err(error) => Err(RedisSinkError::SendError { source: error }),
+                Err(error) => Err(RedisSinkError::SendError {
+                    source: error,
+                    generation,
+                }),
             }
         })
     }
diff --git a/src/sinks/redis/sink.rs b/src/sinks/redis/sink.rs
index 5cac95f7698d7..e19963fc0686e 100644
--- a/src/sinks/redis/sink.rs
+++ b/src/sinks/redis/sink.rs
@@ -1,28 +1,267 @@
-use std::future;
+use snafu::prelude::*;
+use std::{future, sync::Arc, time::Duration};
 
-use redis::{aio::ConnectionManager, RedisError};
+use redis::{
+    aio::ConnectionManager,
+    sentinel::{Sentinel, SentinelNodeConnectionInfo},
+    RedisResult,
+};
+use tokio::{
+    sync::watch::{self, Receiver, Sender},
+    task::JoinHandle,
+    time::sleep,
+};
 
-use crate::sinks::{prelude::*, util::retries::RetryAction};
+use crate::sinks::{prelude::*, redis::RedisSinkError, util::retries::RetryAction};
 
 use super::{
     config::{DataTypeConfig, RedisSinkConfig, RedisTowerRequestConfigDefaults},
     request_builder::request_builder,
     service::{RedisResponse, RedisService},
-    RedisEvent,
+    RedisEvent, RepairChannelSnafu,
 };
 
+pub(super) type GenerationCount = u64;
+
+pub(super) enum RepairState {
+    Active { state: ConnectionStateInner },
+    Broken,
+}
+
+impl RepairState {
+    pub(super) const fn needs_repair(&self) -> bool {
+        matches!(self, RepairState::Broken)
+    }
+
+    pub(super) const fn is_active(&self) -> bool {
+        matches!(self, RepairState::Active { .. })
+    }
+
+    pub(super) const fn get_active_state(&self) -> Option<&ConnectionStateInner> {
+        if let RepairState::Active { state } = self {
+            Some(state)
+        } else {
+            None
+        }
+    }
+}
+
+#[derive(Clone)]
+pub(super) struct ConnectionStateInner {
+    connection: ConnectionManager,
+    generation: GenerationCount,
+}
+
+impl From<ConnectionStateInner> for ConnectionState {
+    fn from(value: ConnectionStateInner) -> Self {
+        ConnectionState {
+            connection: value.connection,
+            generation: Some(value.generation),
+        }
+    }
+}
+
+#[derive(Clone)]
+pub(super) struct ConnectionState {
+    pub connection: ConnectionManager,
+    pub generation: Option<GenerationCount>,
+}
+
+impl ConnectionState {
+    pub const fn new_no_generation(conn: ConnectionManager) -> Self {
+        Self {
+            connection: conn,
+            generation: None,
+        }
+    }
+}
+
+#[derive(Clone)]
+pub(super) enum RedisConnection {
+    Direct(ConnectionManager),
+    Sentinel {
+        connection_recv: Receiver<RepairState>,
+        connection_send: Sender<RepairState>,
+        // Background task that fixes the redis connection when it breaks
+        repair_task: Arc<JoinHandle<()>>,
+    },
+}
+
+impl Drop for RedisConnection {
+    fn drop(&mut self) {
+        // Stop repair task if all connections are dropped
+        let Self::Sentinel { repair_task, .. } = self else {
+            return;
+        };
+        let Some(repair_task) = Arc::get_mut(repair_task) else {
+            return;
+        };
+        repair_task.abort();
+    }
+}
+
+impl RedisConnection {
+    pub(super) const fn new_direct(conn: ConnectionManager) -> Self {
+        Self::Direct(conn)
+    }
+
+    async fn sentinel_connection_manager(
+        sentinel: &mut Sentinel,
+        service_name: &str,
+        node_connection_info: &SentinelNodeConnectionInfo,
+    ) -> RedisResult<ConnectionManager> {
+        let master = sentinel
+            .async_master_for(service_name, Some(node_connection_info))
+            .await?;
+        master.get_connection_manager().await
+    }
+
+    pub(super) async fn new_sentinel(
+        mut sentinel: Sentinel,
+        service_name: String,
+        node_connection_info: SentinelNodeConnectionInfo,
+    ) -> RedisResult<Self> {
+        let conn = Self::sentinel_connection_manager(
+            &mut sentinel,
+            service_name.as_str(),
+            &node_connection_info,
+        )
+        .await?;
+
+        let (conn_tx, conn_rx) = watch::channel(RepairState::Active {
+            state: ConnectionStateInner {
+                connection: conn,
+                generation: 0,
+            },
+        });
+
+        let task_conn_tx = conn_tx.clone();
+
+        Ok(Self::Sentinel {
+            connection_send: conn_tx,
+            connection_recv: conn_rx,
+            repair_task: Arc::new(tokio::spawn(async move {
+                Self::repair_connection_manager_task(
+                    sentinel,
+                    service_name,
+                    node_connection_info,
+                    task_conn_tx,
+                )
+                .await
+            })),
+        })
+    }
+
+    async fn repair_connection_manager_task(
+        mut sentinel: Sentinel,
+        service_name: String,
+        node_connection_info: SentinelNodeConnectionInfo,
+        conn_send: Sender<RepairState>,
+    ) -> ! {
+        let mut conn_recv = conn_send.subscribe();
+        let mut current_generation: GenerationCount = 0;
+        let mut repairing = false;
+
+        loop {
+            if !repairing {
+                // Wait until a repair is needed
+                if let Err(error) = conn_recv.wait_for(|state| state.needs_repair()).await {
+                    warn!("Connection state channel was dropped {error:?}.");
+                    continue;
+                }
+
+                repairing = true;
+            }
+
+            let new_state = match Self::sentinel_connection_manager(
+                &mut sentinel,
+                service_name.as_str(),
+                &node_connection_info,
+            )
+            .await
+            {
+                Ok(new_conn) => {
+                    current_generation = current_generation.wrapping_add(1);
+
+                    ConnectionStateInner {
+                        connection: new_conn,
+                        generation: current_generation,
+                    }
+                }
+                Err(error) => {
+                    warn!("Failed to repair ConnectionManager via sentinel (gen: {current_generation}): {error:?}.");
+                    sleep(Duration::from_millis(250)).await;
+                    continue;
+                }
+            };
+
+            conn_send.send_modify(|state| {
+                *state = RepairState::Active { state: new_state };
+                repairing = false;
+                debug!("Connection manager repaired successfully (new generation: {current_generation}).");
+            });
+        }
+    }
+
+    pub(super) async fn get_connection_manager(
+        &mut self,
+    ) -> Result<ConnectionState, RedisSinkError> {
+        match self {
+            Self::Direct(conn) => Ok(ConnectionState::new_no_generation(conn.clone())),
+            Self::Sentinel {
+                connection_recv, ..
+            } => {
+                match connection_recv.wait_for(|state| state.is_active()).await {
+                    Ok(repair_state) => {
+                        // SAFETY: we wait until we're in the active state before this runs
+                        let state = repair_state
+                            .get_active_state()
+                            .expect("wait invariant broken");
+
+                        Ok(state.clone().into())
+                    }
+                    Err(error) => Err(error).context(RepairChannelSnafu),
+                }
+            }
+        }
+    }
+
+    pub(super) fn signal_broken(&self, generation: Option<GenerationCount>) {
+        if let Self::Sentinel {
+            connection_send, ..
+        } = self
+        {
+            connection_send.send_if_modified(|state| {
+                if let RepairState::Active { state: conn_state } = state {
+                    match generation {
+                        // If old generation is bad, disregard
+                        Some(broken_gen) if broken_gen != conn_state.generation => false,
+                        _ => {
+                            *state = RepairState::Broken;
+                            true
+                        }
+                    }
+                } else {
+                    // If already broken, disregard
+                    false
+                }
+            });
+        }
+    }
+}
+
 pub(super) struct RedisSink {
     request: TowerRequestConfig<RedisTowerRequestConfigDefaults>,
     encoder: crate::codecs::Encoder<()>,
     transformer: crate::codecs::Transformer,
-    conn: ConnectionManager,
+    conn: RedisConnection,
     data_type: super::DataType,
     key: Template,
     batcher_settings: BatcherSettings,
 }
 
 impl RedisSink {
-    pub(super) fn new(config: &RedisSinkConfig, conn: ConnectionManager) -> crate::Result<Self> {
+    pub(super) fn new(config: &RedisSinkConfig, conn: RedisConnection) -> crate::Result<Self> {
         let method = config.list_option.map(|option| option.method);
         let data_type = match config.data_type {
             DataTypeConfig::Channel => super::DataType::Channel,
@@ -75,7 +314,12 @@ impl RedisSink {
         };
 
         let service = ServiceBuilder::new()
-            .settings(request, RedisRetryLogic)
+            .settings(
+                request,
+                RedisRetryLogic {
+                    connection: self.conn.clone(),
+                },
+            )
             .service(service);
 
         let mut encoder = self.encoder.clone();
@@ -100,17 +344,32 @@ impl StreamSink<Event> for RedisSink {
     }
 }
 
-#[derive(Debug, Clone)]
-pub(super) struct RedisRetryLogic;
+#[derive(Clone)]
+pub(super) struct RedisRetryLogic {
+    connection: RedisConnection,
+}
 
 impl RetryLogic for RedisRetryLogic {
-    type Error = RedisError;
+    type Error = RedisSinkError;
     type Response = RedisResponse;
 
     fn is_retriable_error(&self, _error: &Self::Error) -> bool {
         true
     }
 
+    fn on_retriable_error(&self, error: &Self::Error) {
+        if let RedisSinkError::SendError { source, generation } = error {
+            if matches!(
+                source.kind(),
+                redis::ErrorKind::MasterDown
+                    | redis::ErrorKind::ReadOnly
+                    | redis::ErrorKind::IoError
+            ) {
+                self.connection.signal_broken(*generation);
+            }
+        }
+    }
+
     fn should_retry_response(&self, response: &Self::Response) -> RetryAction {
         if response.is_successful() {
             RetryAction::Successful
diff --git a/src/sinks/util/retries.rs b/src/sinks/util/retries.rs
index 129288fe9ff1b..08d967473e485 100644
--- a/src/sinks/util/retries.rs
+++ b/src/sinks/util/retries.rs
@@ -41,6 +41,9 @@ pub trait RetryLogic: Clone + Send + Sync + 'static {
         // Treat the default as the request is successful
         RetryAction::Successful
     }
+
+    /// Optional hook run when an error is determined to be retriable.
+    fn on_retriable_error(&self, _error: &Self::Error) {}
 }
 
 /// The jitter mode to use for retry backoff behavior.
@@ -169,6 +172,7 @@ where
 
                 if let Some(expected) = error.downcast_ref::<L::Error>() {
                     if self.logic.is_retriable_error(expected) {
+                        self.logic.on_retriable_error(expected);
                         warn!(message = "Retrying after error.", error = %expected, internal_log_rate_limit = true);
                         Some(self.build_retry())
                     } else {
diff --git a/src/sources/redis/mod.rs b/src/sources/redis/mod.rs
index 242bfddd3d371..b18c3c2ce12d7 100644
--- a/src/sources/redis/mod.rs
+++ b/src/sources/redis/mod.rs
@@ -322,7 +322,7 @@ mod integration_test {
     };
     use vrl::value;
 
-    const REDIS_SERVER: &str = "redis://redis:6379/0";
+    const REDIS_SERVER: &str = "redis://redis-primary:6379/0";
 
     #[tokio::test]
     async fn redis_source_list_rpop() {
diff --git a/website/cue/reference/components/sinks/generated/redis.cue b/website/cue/reference/components/sinks/generated/redis.cue
index 6d6cfd21451a0..dff0cbb97387d 100644
--- a/website/cue/reference/components/sinks/generated/redis.cue
+++ b/website/cue/reference/components/sinks/generated/redis.cue
@@ -654,4 +654,72 @@ generated: components: sinks: redis: configuration: {
 			}
 		}
 	}
+	sentinel_connect: {
+		description: "Controls how Redis Sentinel will connect to the servers belonging to it."
+		required:    false
+		type: object: options: {
+			connections: {
+				description: """
+					Connection independent information used to establish a connection
+					to a redis instance sentinel owns.
+					"""
+				required: false
+				type: object: options: {
+					db: {
+						description: "The database number to use. Usually `0`."
+						required:    true
+						type: int: {}
+					}
+					password: {
+						description: "Optionally, the password to connection with."
+						required:    false
+						type: string: {}
+					}
+					protocol: {
+						description: "The version of RESP to use."
+						required:    true
+						type: string: enum: {
+							RESP2: """
+																			Use RESP2.
+
+																			This is the default.
+																			"""
+							RESP3: "Use RESP3."
+						}
+					}
+					username: {
+						description: "Optionally, the username to connection with."
+						required:    false
+						type: string: {}
+					}
+				}
+			}
+			tls: {
+				description: "How/if TLS should be established."
+				required:    false
+				type: string: {
+					default: "none"
+					enum: {
+						insecure: "Enable TLS without certificate verification."
+						none: """
+															Don't use TLS.
+
+															This is the default.
+															"""
+						secure: "Enable TLS with certificate verification."
+					}
+				}
+			}
+		}
+	}
+	sentinel_service: {
+		description: """
+			The service name to use for sentinel.
+
+			If this is specified, `endpoint` will be used to reach sentinel instances instead of a
+			redis instance.
+			"""
+		required: false
+		type: string: {}
+	}
 }

From f4c1ac570badfeb00564ebd02146b86a6f5bb370 Mon Sep 17 00:00:00 2001
From: Thomas <thomas.schneider@datadoghq.com>
Date: Wed, 30 Jul 2025 14:09:02 -0400
Subject: [PATCH 234/305] chore(deps): bump indicatif to 0.18.0 (#23470)

---
 Cargo.lock      | 4 ++--
 vdev/Cargo.toml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 35810805b8c9c..53d0ea401031e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5260,9 +5260,9 @@ dependencies = [
 
 [[package]]
 name = "indicatif"
-version = "0.17.12"
+version = "0.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4adb2ee6ad319a912210a36e56e3623555817bcc877a7e6e8802d1d69c4d8056"
+checksum = "70a646d946d06bedbbc4cac4c218acf4bbf2d87757a784857025f4d447e4e1cd"
 dependencies = [
  "console 0.16.0",
  "portable-atomic",
diff --git a/vdev/Cargo.toml b/vdev/Cargo.toml
index b3a760fb6d595..3ab3a9f02fe8e 100644
--- a/vdev/Cargo.toml
+++ b/vdev/Cargo.toml
@@ -20,7 +20,7 @@ dunce = "1.0.5"
 glob.workspace = true
 hex = "0.4.3"
 indexmap.workspace = true
-indicatif = { version = "0.17.12", features = ["improved_unicode"] }
+indicatif = { version = "0.18.0", features = ["improved_unicode"] }
 itertools = "0.14.0"
 log = "0.4.27"
 # watch https://github.com/epage/anstyle for official interop with Clap

From e6bd05955d4418e4beda13e001dd0612de7b42f7 Mon Sep 17 00:00:00 2001
From: Pavlos Rontidis <pavlos.rontidis@gmail.com>
Date: Wed, 30 Jul 2025 14:24:55 -0400
Subject: [PATCH 235/305] chore(website): improve Vector support page (#23471)

* chore(website): improve Vector support page

* Remove whitespace

---------

Co-authored-by: Thomas <thomas.schneider@datadoghq.com>
---
 website/content/en/community/_index.md | 26 +++++++++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

diff --git a/website/content/en/community/_index.md b/website/content/en/community/_index.md
index 88457cd083c73..b7f4d6bcbea55 100644
--- a/website/content/en/community/_index.md
+++ b/website/content/en/community/_index.md
@@ -23,7 +23,21 @@ aliases: [ "/mailing_list" ]
 
 ### Support
 
-For questions and support, please use [GitHub Discussions][discussion].
+#### Vector
+
+* For questions and help: [Create a Vector GitHub Discussions][vector_discussions]
+* For bug reports: [Create a Vector GitHub issue][vector_bug_report]
+* For feedback on pull requests, ping the Vector team directly on GitHub with @vectordotdev/vector
+
+#### VRL
+
+* For VRL bugs: [Create a VRL GitHub issue][vrl_bug_report]
+* For VRL discussions: [Create a VRL GitHub discussion][vrl_discussion]
+
+#### Discord
+
+The Discord server is meant for community conversations and getting help from other users.
+The Vector team doesn't actively monitor the Discord channels.
 
 ### How do I contribute to Vector?
 
@@ -65,8 +79,6 @@ Vector has adopted the Rust community model and practices for engaging with peop
 
 [contribution]: https://github.com/vectordotdev/vector/blob/master/CONTRIBUTING.md
 
-[discussion]: https://github.com/vectordotdev/vector/discussions
-
 [first_issues]: https://github.com/vectordotdev/vector/contribute
 
 [kernel]: https://bestpractices.coreinfrastructure.org/en/projects/34
@@ -80,3 +92,11 @@ Vector has adopted the Rust community model and practices for engaging with peop
 [rust_community]: https://www.rust-lang.org/community
 
 [rust_lang]: https://www.rust-lang.org
+
+[vector_discussions]: https://github.com/vectordotdev/vector/discussions/new?category=q-a
+
+[vector_bug_report]: https://github.com/vectordotdev/vector/issues/new?assignees=&labels=type%3A+bug&projects=&template=bug.yml
+
+[vrl_bug_report]: https://github.com/vectordotdev/vrl/issues/new?template=bug.yml
+
+[vrl_discussion]: https://github.com/vectordotdev/vrl/discussions/new?category=q-a

From 2ae37a7ee4e8ee9da2d16e097ca60ecc049c48d6 Mon Sep 17 00:00:00 2001
From: Thomas <thomas.schneider@datadoghq.com>
Date: Wed, 30 Jul 2025 15:45:15 -0400
Subject: [PATCH 236/305] chore(ci): disable splunk ITs (#23473)

* Revert "fix(ci): re-enable splunk ITs (#23360)"

This reverts commit a9366ad55888c85258d0be206710e44a3de389df.

* Update issue link
---
 .github/workflows/integration.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
index edf42f963e32f..6be5aab2e02d0 100644
--- a/.github/workflows/integration.yml
+++ b/.github/workflows/integration.yml
@@ -69,13 +69,14 @@ jobs:
     if: ${{ !failure() && !cancelled() && (needs.check-secrets.outputs.can_access_secrets == 'true' || github.event_name == 'merge_group') }}
     strategy:
       matrix:
+        # TODO: Add "splunk" back once https://github.com/vectordotdev/vector/issues/23474 is fixed.
         # If you modify this list, please also update the `int_tests` job in changes.yml.
         service: [
           "amqp", "appsignal", "axiom", "aws", "azure", "clickhouse", "databend", "datadog-agent",
           "datadog-logs", "datadog-metrics", "datadog-traces", "dnstap", "docker-logs", "elasticsearch",
           "eventstoredb", "fluent", "gcp", "greptimedb", "http-client", "influxdb", "kafka", "logstash",
           "loki", "mongodb", "nats", "nginx", "opentelemetry", "postgres", "prometheus", "pulsar",
-          "redis", "splunk", "webhdfs"
+          "redis", "webhdfs"
         ]
     timeout-minutes: 90
     steps:

From 48caeaebc78a3d56eff509141d4a87d9fa5a3759 Mon Sep 17 00:00:00 2001
From: Thomas <thomas.schneider@datadoghq.com>
Date: Wed, 30 Jul 2025 16:30:25 -0400
Subject: [PATCH 237/305] chore(dev): remove unused scripts (#23462)

* remove grease from bootstrap

* Remove unused ruby scripts
---
 scripts/environment/bootstrap-ubuntu-24.04.sh |  12 --
 scripts/util/commit.rb                        | 166 ------------------
 scripts/util/conventional_commit.rb           |  97 ----------
 scripts/util/git_log_commit.rb                | 122 -------------
 scripts/util/printer.rb                       |  74 --------
 scripts/util/release.rb                       |  39 ----
 scripts/util/version.rb                       |  45 -----
 7 files changed, 555 deletions(-)
 delete mode 100644 scripts/util/commit.rb
 delete mode 100644 scripts/util/conventional_commit.rb
 delete mode 100644 scripts/util/git_log_commit.rb
 delete mode 100644 scripts/util/printer.rb
 delete mode 100644 scripts/util/release.rb
 delete mode 100644 scripts/util/version.rb

diff --git a/scripts/environment/bootstrap-ubuntu-24.04.sh b/scripts/environment/bootstrap-ubuntu-24.04.sh
index df729728b67b7..664efef7b68ab 100755
--- a/scripts/environment/bootstrap-ubuntu-24.04.sh
+++ b/scripts/environment/bootstrap-ubuntu-24.04.sh
@@ -60,18 +60,6 @@ tar \
 cp "${TEMP}/cue" /usr/bin/cue
 rm -rf "$TEMP"
 
-# Grease
-# Grease is used for the `make release-github` task.
-TEMP=$(mktemp -d)
-curl \
-    -L https://github.com/vectordotdev/grease/releases/download/v1.0.1/grease-1.0.1-linux-amd64.tar.gz \
-    -o "${TEMP}/grease-1.0.1-linux-amd64.tar.gz"
-tar \
-    -xvf "${TEMP}/grease-1.0.1-linux-amd64.tar.gz" \
-    -C "${TEMP}"
-cp "${TEMP}/grease/bin/grease" /usr/bin/grease
-rm -rf "$TEMP"
-
 # Locales
 locale-gen en_US.UTF-8
 dpkg-reconfigure locales
diff --git a/scripts/util/commit.rb b/scripts/util/commit.rb
deleted file mode 100644
index 8b4f5baba1ca1..0000000000000
--- a/scripts/util/commit.rb
+++ /dev/null
@@ -1,166 +0,0 @@
-require_relative "conventional_commit"
-require_relative "git_log_commit"
-
-module Vector
-  class Commit
-    class << self
-      def fetch_since(last_version)
-        git_log = GitLogCommit.fetch_since!(last_version)
-        git_log.collect do |git_log_commit|
-          from_git_log_commit(git_log_commit)
-        end
-      end
-
-      def fetch_since!(last_version)
-        git_log = GitLogCommit.fetch_since!(last_version)
-        git_log.collect do |git_log_commit|
-          from_git_log_commit!(git_log_commit)
-        end
-      end
-
-      def from_git_log!(git_log)
-        git_log.collect do |git_log_commit|
-          from_git_log_commit!(git_log_commit)
-        end
-      end
-
-      private
-        def from_git_log_commit(git_log_commit)
-          conventional_commit = ConventionalCommit.parse(git_log_commit.message)
-          hash = git_log_commit.to_h.merge(conventional_commit.to_h)
-          new(hash)
-        end
-
-        def from_git_log_commit!(git_log_commit)
-          conventional_commit = ConventionalCommit.parse!(git_log_commit.message)
-          hash = git_log_commit.to_h.merge(conventional_commit.to_h)
-          new(hash)
-        end
-    end
-
-    attr_reader :author,
-      :breaking_change,
-      :date,
-      :deletions_count,
-      :description,
-      :files_count,
-      :insertions_count,
-      :pr_number,
-      :scopes,
-      :sha,
-      :type
-
-    def initialize(hash)
-      @author = hash.fetch("author")
-      @breaking_change = hash.fetch("breaking_change")
-      @date = hash.fetch("date")
-      @deletions_count = hash.fetch("deletions_count")
-      @description = hash.fetch("description")
-      @files_count = hash.fetch("files_count")
-      @insertions_count = hash.fetch("insertions_count")
-      @pr_number = hash.fetch("pr_number")
-      @scopes = hash.fetch("scopes")
-      @sha = hash.fetch("sha")
-      @type = hash.fetch("type")
-    end
-
-    def eql?(other)
-      sha == other.sha || pr_number == other.pr_number
-    end
-
-    def breaking_change?
-      breaking_change == true
-    end
-
-    def fix?
-      type == "fix"
-    end
-
-    def new_feature?
-      type == "feat"
-    end
-
-    def to_cue_struct
-      "{" +
-        "sha: #{sha.to_json}, " +
-        "date: #{date.to_json}, " +
-        "description: #{description.to_json}, " +
-        "pr_number: #{pr_number.to_json}, " +
-        "scopes: #{scopes.to_json}, " +
-        "type: #{type.to_json}, " +
-        "breaking_change: #{breaking_change.to_json}, " +
-        "author: #{author.to_json}, " +
-        "files_count: #{files_count.to_json}, " +
-        "insertions_count: #{insertions_count.to_json}, " +
-        "deletions_count: #{deletions_count.to_json}}"
-    end
-
-    def validate!
-      if !type.nil? && !TYPES.include?(type)
-        raise <<~EOF
-        The following commit has an invalid type!
-
-          #{to_s}
-
-        The type must be one of #{TYPES.inspect}.
-
-          #{type.inspect}
-
-        Please correct in the release /.meta file and retry.
-        EOF
-      end
-
-      if TYPES_THAT_REQUIRE_SCOPES.include?(type) && scopes.empty?
-        raise <<~EOF
-        The following commit does not have a scope
-
-          #{to_s}
-
-        A scope is required for commits of type #{TYPES_THAT_REQUIRE_SCOPES.inspect}.
-
-          #{description}
-
-        Please correct in the release /.meta file and retry.
-        EOF
-      end
-
-      true
-    end
-
-    def to_git_log_commit
-      message = ""
-
-      if type
-        message = "#{message}#{type.clone}"
-      end
-
-      if scopes.any?
-        message = "#{message}(#{scopes.join(", ")})"
-      end
-
-      if breaking_change?
-        message = "#{message}!"
-      end
-
-      message = "#{message}: #{description}"
-
-      if pr_number
-        message = "#{message} (##{pr_number})"
-      end
-
-      GitLogCommit.new({
-        "author" => author,
-        "date" => date,
-        "deletions_count" => deletions_count,
-        "files_count" => files_count,
-        "insertions_count" => insertions_count,
-        "message" => message,
-        "sha" => sha
-      })
-    end
-
-    def to_s
-      "#{sha} #{type}(#{scopes.join(", ")})#{breaking_change? ? "!" : ""}: #{description} (##{pr_number})"
-    end
-  end
-end
diff --git a/scripts/util/conventional_commit.rb b/scripts/util/conventional_commit.rb
deleted file mode 100644
index 5944bb407f663..0000000000000
--- a/scripts/util/conventional_commit.rb
+++ /dev/null
@@ -1,97 +0,0 @@
-module Vector
-  class ConventionalCommit
-    class << self
-      def parse(message)
-        hash = parse_commit_message(message)
-        new(hash)
-      end
-
-      def parse!(message)
-        hash = parse_commit_message!(message)
-        new(hash)
-      end
-
-      private
-        def parse_commit_message(message)
-          begin
-            parse_commit_message!(message)
-          rescue Exception => e
-            if message.include?("Use `namespace` field in metric sources")
-              raise e
-            end
-
-            {
-              "breaking_change" => nil,
-              "description" => message,
-              "pr_number" => nil,
-              "scopes" => [],
-              "type" => nil
-            }
-          end
-        end
-
-        def parse_commit_message!(message)
-          match = message.match(/^(?<type>[a-z]*)(\((?<scope>[a-z0-9_, ]*)\))?(?<breaking_change>!)?: (?<description>.*?)( \(#(?<pr_number>[0-9]*)\))?$/)
-
-          if match.nil?
-            raise <<~EOF
-            Commit message does not conform to the conventional commit format.
-
-            Unable to parse at all!
-
-              #{message}
-
-            Please correct in the release /.meta file and retry.
-            EOF
-          end
-
-          attributes =
-            {
-              "type" => match[:type],
-              "breaking_change" => !match[:breaking_change].nil?,
-              "description" => match[:description]
-            }
-
-          attributes["scopes"] =
-            if match[:scope]
-              match[:scope].split(",").collect(&:strip)
-            else
-              []
-            end
-
-          attributes["pr_number"] =
-            if match[:pr_number]
-              match[:pr_number].to_i
-            else
-              nil
-            end
-
-          attributes
-        end
-    end
-
-    attr_reader :breaking_change,
-      :description,
-      :pr_number,
-      :type,
-      :scopes
-
-    def initialize(hash)
-      @breaking_change = hash.fetch("breaking_change")
-      @description = hash.fetch("description")
-      @pr_number = hash.fetch("pr_number")
-      @type = hash.fetch("type")
-      @scopes = hash.fetch("scopes")
-    end
-
-    def to_h
-      {
-          "breaking_change" => breaking_change,
-          "description" => description,
-          "pr_number" => pr_number,
-          "type" => type,
-          "scopes" => scopes
-      }
-    end
-  end
-end
diff --git a/scripts/util/git_log_commit.rb b/scripts/util/git_log_commit.rb
deleted file mode 100644
index fe8425209a86d..0000000000000
--- a/scripts/util/git_log_commit.rb
+++ /dev/null
@@ -1,122 +0,0 @@
-module Vector
-  class GitLogCommit
-    class << self
-      def fetch_since!(last_version)
-        range = "v#{last_version}..."
-        commit_log = `git log #{range} --cherry-pick --right-only --no-merges --pretty=format:'%H\t%s\t%aN\t%ad'`.chomp
-        commit_lines = commit_log.split("\n").reverse
-
-        commit_lines.collect do |commit_line|
-          hash = parse_commit_line!(commit_line)
-          new(hash)
-        end
-      end
-
-      def from_file!(path)
-        contents = File.read(path)
-        contents.split("\n").collect do |line|
-          hash = parse_commit_line!(line)
-          new(hash)
-        end
-      end
-
-      private
-        # This is used for the `files_count`, `insertions_count`, and `deletions_count`
-        # attributes. It helps to communicate stats and the depth of changes in our
-        # release notes.
-        def get_commit_stats(sha)
-          `git show --shortstat --oneline #{sha}`.split("\n").last
-        end
-
-        def parse_commit_line!(commit_line)
-          # Parse the full commit line
-          line_parts = commit_line.split("\t")
-          sha = line_parts.fetch(0)
-          message = line_parts.fetch(1)
-          author = line_parts.fetch(2)
-          date = Time.parse(line_parts.fetch(3)).utc
-
-          attributes =
-            {
-              "sha" =>  sha,
-              "author" => author,
-              "date" => date,
-              "message" => message
-            }
-
-          # Parse the stats
-          stats = get_commit_stats(attributes.fetch("sha"))
-          if /^\W*\p{Digit}+ files? changed,/.match(stats)
-            stats_attributes = parse_commit_stats!(stats)
-            attributes.merge!(stats_attributes)
-          end
-
-          attributes
-        end
-
-        # Parses the data from `#get_commit_stats`.
-        def parse_commit_stats!(stats)
-          attributes = {}
-
-          stats.split(", ").each do |stats_part|
-            stats_part.strip!
-
-            key =
-              case stats_part
-              when /insertions?/
-                "insertions_count"
-              when /deletions?/
-                "deletions_count"
-              when /files? changed/
-                "files_count"
-              else
-                raise "Invalid commit stat: #{stats_part}"
-              end
-
-            count = stats_part.match(/^(?<count>[0-9]*) /)[:count].to_i
-            attributes[key] = count
-          end
-
-          attributes["insertions_count"] ||= 0
-          attributes["deletions_count"] ||= 0
-          attributes["files_count"] ||= 0
-          attributes
-        end
-    end
-
-    attr_reader :author,
-      :date,
-      :deletions_count,
-      :files_count,
-      :insertions_count,
-      :message,
-      :raw,
-      :sha
-
-    def initialize(hash)
-      @author = hash.fetch("author")
-      @date = hash.fetch("date")
-      @deletions_count = hash.fetch("deletions_count", 0)
-      @files_count = hash.fetch("files_count", 0)
-      @insertions_count = hash.fetch("insertions_count", 0)
-      @message = hash.fetch("message")
-      @sha = hash.fetch("sha")
-    end
-
-    def to_h
-      {
-        "author" => author,
-        "date" => date,
-        "deletions_count" => deletions_count,
-        "files_count" => files_count,
-        "insertions_count" => insertions_count,
-        "message" => message,
-        "sha" => sha
-      }
-    end
-
-    def to_raw
-      "#{sha}\t#{message}\t#{author}\t#{date.strftime("%a %b %d %H:%M:%S %Y %z")}"
-    end
-  end
-end
diff --git a/scripts/util/printer.rb b/scripts/util/printer.rb
deleted file mode 100644
index 4f65f2d904359..0000000000000
--- a/scripts/util/printer.rb
+++ /dev/null
@@ -1,74 +0,0 @@
-require "paint"
-
-module Util
-  module Printer
-    PROMPT = "---> "
-    INDENT = "     "
-    SEPARATOR = "-" * 80
-    TITLE_PROMPT = "#### "
-
-    extend self
-
-    def error!(message)
-      Printer.say(message, color: :red)
-      exit(1)
-    end
-
-    def Printer.get(words, choices = nil)
-      question = "#{words.strip}"
-
-      if !choices.nil?
-        question += " (" + choices.join("/") + ")"
-      end
-
-      Printer.say(question)
-
-      print INDENT
-
-      input = gets().chomp
-
-      if choices && !choices.include?(input)
-        Printer.say("You must enter one of #{choices.join(", ")}", color: :red)
-        Printer.get(words, choices)
-      else
-        input
-      end
-    end
-
-    def invalid(words)
-      Printer.say(words, color: :yellow)
-    end
-
-    def say(words, color: nil, new: true, prompt: PROMPT)
-      prefix = new ? prompt : INDENT
-
-      if color
-        words = Paint[prefix + words, color]
-      else
-        words = prefix + words
-      end
-
-      puts words.gsub("\n", "\n#{INDENT}")
-    end
-
-    def separate(color: nil)
-      string = SEPARATOR
-
-      if color
-        string = Paint[string, color]
-      end
-
-      puts ""
-      puts string
-    end
-
-    def success(words)
-      Printer.say(words, color: :green)
-    end
-
-    def title(words)
-      separate(color: :cyan)
-      Printer.say(words, color: :cyan, prompt: TITLE_PROMPT)
-    end
-  end
-end
diff --git a/scripts/util/release.rb b/scripts/util/release.rb
deleted file mode 100644
index 112ee39e19536..0000000000000
--- a/scripts/util/release.rb
+++ /dev/null
@@ -1,39 +0,0 @@
-require_relative "commit"
-require_relative "version"
-
-module Vector
-  class Release
-    class << self
-      def all!(dir)
-        release_meta_paths = Dir.glob("#{dir}/*.cue").to_a
-
-        release_meta_paths.
-          collect do |release_meta_path|
-            urls_cue_path = File.join(File.dirname(release_meta_path), "..", "urls.cue")
-            release_json = `cue export #{urls_cue_path} #{release_meta_path}`
-            release_hash = JSON.parse(release_json)
-            name = release_hash.fetch("releases").keys.first
-            hash = release_hash.fetch("releases").values.first
-            new(hash.merge({"name" => name}))
-          end.
-          sort_by(&:version)
-      end
-    end
-
-    attr_reader :codename,
-      :commits,
-      :date,
-      :name,
-      :version,
-      :whats_next
-
-    def initialize(hash)
-      @codename = hash.fetch("codename", "")
-      @commits = hash.fetch("commits").collect { |commit_hash| Commit.new(commit_hash) }
-      @date = hash.fetch("date")
-      @name = hash.fetch("name")
-      @version = Util::Version.new(@name)
-      @whats_next = hash.fetch("whats_next", [])
-    end
-  end
-end
diff --git a/scripts/util/version.rb b/scripts/util/version.rb
deleted file mode 100644
index afc69ab15483f..0000000000000
--- a/scripts/util/version.rb
+++ /dev/null
@@ -1,45 +0,0 @@
-module Util
-  class Version < Gem::Version
-    def bump_type(other_version)
-      # Return nil if the other version is not greater than the current version
-      if other_version <= self
-        return nil
-      end
-
-      bumped_version = bump
-      next_major = segments.first + 1
-
-      if other_version.prerelease?
-        "pre"
-      elsif other_version < bumped_version
-        "patch"
-      elsif other_version == bumped_version
-        "minor"
-      elsif other_version.segments.first == next_major
-        "major"
-      else
-        nil
-      end
-    end
-
-    def major
-      segments[0]
-    end
-
-    def major_x
-      "#{segments[0]}.X"
-    end
-
-    def minor
-      segments[1]
-    end
-
-    def minor_x
-      "#{segments[0]}.#{segments[1]}.X"
-    end
-
-    def patch
-      segments[2]
-    end
-  end
-end

From cc78555a413f2cc6506d56b10c89686545aabae5 Mon Sep 17 00:00:00 2001
From: Jorge Hermo <jorgehermogonzalez@gmail.com>
Date: Thu, 31 Jul 2025 16:46:00 +0200
Subject: [PATCH 238/305] fix(postgres sink): properly disable postgres sink's
 healthcheck (#23441)

* fix(postgres sink): allow disabled healthcheck

* docs: add changelog

* fix: typo

* docs: update changelog

* test: fix slow test

* fix: typo

* test: add expect message

* fix: merge conflict
---
 Cargo.lock                                    |  2 +-
 ..._postgres_sink_healthcheck_disabled.fix.md |  3 ++
 src/config/sink.rs                            |  2 +-
 src/extra_context.rs                          |  2 +-
 src/sinks/postgres/config.rs                  |  3 +-
 src/sinks/postgres/integration_tests.rs       | 45 +++++++++++++++----
 6 files changed, 43 insertions(+), 14 deletions(-)
 create mode 100644 changelog.d/23111_postgres_sink_healthcheck_disabled.fix.md

diff --git a/Cargo.lock b/Cargo.lock
index 53d0ea401031e..6c698ed1c35aa 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4838,7 +4838,7 @@ dependencies = [
  "httpdate",
  "itoa",
  "pin-project-lite",
- "socket2 0.4.10",
+ "socket2 0.5.10",
  "tokio",
  "tower-service",
  "tracing 0.1.41",
diff --git a/changelog.d/23111_postgres_sink_healthcheck_disabled.fix.md b/changelog.d/23111_postgres_sink_healthcheck_disabled.fix.md
new file mode 100644
index 0000000000000..5c522def04b59
--- /dev/null
+++ b/changelog.d/23111_postgres_sink_healthcheck_disabled.fix.md
@@ -0,0 +1,3 @@
+Fixes a bug where the healthcheck in the Postgres sink was not being properly disabled.
+
+authors: jorgehermo9
diff --git a/src/config/sink.rs b/src/config/sink.rs
index e322243c5acdd..b4b6ac23c085c 100644
--- a/src/config/sink.rs
+++ b/src/config/sink.rs
@@ -268,7 +268,7 @@ pub trait SinkConfig: DynClone + NamedComponent + core::fmt::Debug + Send + Sync
 
 dyn_clone::clone_trait_object!(SinkConfig);
 
-#[derive(Clone)]
+#[derive(Clone, Debug)]
 pub struct SinkContext {
     pub healthcheck: SinkHealthcheckOptions,
     pub globals: GlobalOptions,
diff --git a/src/extra_context.rs b/src/extra_context.rs
index 025093b2ad22d..b80586bc714fd 100644
--- a/src/extra_context.rs
+++ b/src/extra_context.rs
@@ -8,7 +8,7 @@ use std::{
 
 /// Structure containing any extra data.
 /// The data is held in an [`Arc`] so is cheap to clone.
-#[derive(Clone, Default)]
+#[derive(Clone, Debug, Default)]
 pub struct ExtraContext(Arc<HashMap<TypeId, ContextItem>>);
 
 type ContextItem = Box<dyn Any + Send + Sync>;
diff --git a/src/sinks/postgres/config.rs b/src/sinks/postgres/config.rs
index c9ebbb05fc855..2a56827cf23e7 100644
--- a/src/sinks/postgres/config.rs
+++ b/src/sinks/postgres/config.rs
@@ -92,8 +92,7 @@ impl SinkConfig for PostgresConfig {
     async fn build(&self, _cx: SinkContext) -> crate::Result<(VectorSink, Healthcheck)> {
         let connection_pool = PgPoolOptions::new()
             .max_connections(self.pool_size)
-            .connect(&self.endpoint)
-            .await?;
+            .connect_lazy(&self.endpoint)?;
 
         let healthcheck = healthcheck(connection_pool.clone()).boxed();
 
diff --git a/src/sinks/postgres/integration_tests.rs b/src/sinks/postgres/integration_tests.rs
index 198132712e300..7136da90d81fa 100644
--- a/src/sinks/postgres/integration_tests.rs
+++ b/src/sinks/postgres/integration_tests.rs
@@ -7,7 +7,7 @@ use crate::{
         components::{
             run_and_assert_sink_compliance, run_and_assert_sink_error, COMPONENT_ERROR_TAGS,
         },
-        random_table_name, trace_init,
+        next_addr, random_table_name, trace_init,
     },
 };
 use chrono::{DateTime, Utc};
@@ -168,27 +168,54 @@ async fn prepare_config() -> (PostgresConfig, String, PgConnection) {
 async fn healthcheck_passes() {
     trace_init();
     let (config, _table, _connection) = prepare_config().await;
-    let (_sink, healthcheck) = config.build(SinkContext::default()).await.unwrap();
-    healthcheck.await.unwrap();
+    let (_sink, healthcheck) = config
+        .build(SinkContext::default())
+        .await
+        .expect("sink should build successfully");
+    assert!(healthcheck.await.is_ok());
 }
 
-// This test does not actually fail in the healthcheck query, but in the connection pool creation at
-// `PostgresConfig::build`
 #[tokio::test]
-async fn healthcheck_fails() {
+async fn healthcheck_fails_unknown_host() {
     trace_init();
 
     let table = random_table_name();
-    let endpoint = "postgres://user:pass?host=/unknown_socket_path".to_string();
+    let endpoint = "postgres://unknown_host".to_string();
     let config_str = format!(
         r#"
             endpoint = "{endpoint}"
             table = "{table}"
         "#,
     );
-    let (config, _) = load_sink::<PostgresConfig>(&config_str).unwrap();
+    let (config, cx) = load_sink::<PostgresConfig>(&config_str).unwrap();
+
+    let (_sink, healthcheck) = config
+        .build(cx)
+        .await
+        .expect("sink should build successfully");
+    assert!(healthcheck.await.is_err());
+}
+
+#[tokio::test(start_paused = true)]
+async fn healthcheck_fails_timed_out() {
+    trace_init();
+
+    let free_addr = next_addr();
+    let endpoint = format!("postgres://{free_addr}");
+    let table = random_table_name();
+    let config_str = format!(
+        r#"
+            endpoint = "{endpoint}"
+            table = "{table}"
+        "#,
+    );
+    let (config, cx) = load_sink::<PostgresConfig>(&config_str).unwrap();
 
-    assert!(config.build(SinkContext::default()).await.is_err());
+    let (_sink, healthcheck) = config
+        .build(cx)
+        .await
+        .expect("sink should build successfully");
+    assert!(healthcheck.await.is_err());
 }
 
 #[tokio::test]

From 735b0ee4702067f7d08664cadad72278743a2bc6 Mon Sep 17 00:00:00 2001
From: Antoine Sauzeau <72159603+AntoineSauzeau@users.noreply.github.com>
Date: Thu, 31 Jul 2025 16:50:07 +0200
Subject: [PATCH 239/305] docs(external): Update to_unix_timestamp function
 fallibility status (#23466)

* docs(external): Update to_unix_timestamp function fallibility status

to_unix_timestamp may fail since the 0.44.0 release and this had not been taken into account in the documentation of the function.
See PR https://github.com/vectordotdev/vrl/pull/979.

Signed-off-by: Antoine Sauzeau <antoine.sauzeau3@gmail.com>

* Fix format issue

---------

Signed-off-by: Antoine Sauzeau <antoine.sauzeau3@gmail.com>
Co-authored-by: Pavlos Rontidis <pavlos.rontidis@gmail.com>
---
 website/cue/reference/remap/functions/to_unix_timestamp.cue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/website/cue/reference/remap/functions/to_unix_timestamp.cue b/website/cue/reference/remap/functions/to_unix_timestamp.cue
index c80b50327aad4..2a622576f2678 100644
--- a/website/cue/reference/remap/functions/to_unix_timestamp.cue
+++ b/website/cue/reference/remap/functions/to_unix_timestamp.cue
@@ -28,7 +28,9 @@ remap: functions: to_unix_timestamp: {
 			default: "seconds"
 		},
 	]
-	internal_failure_reasons: []
+	internal_failure_reasons: [
+		"`value` cannot be represented in nanoseconds. Result is too large or too small for a 64 bit integer.",
+	]
 	return: types: ["integer"]
 
 	examples: [

From aad876a4bb4828c5de2ff9ff99df59399f4127e5 Mon Sep 17 00:00:00 2001
From: Thomas <thomas.schneider@datadoghq.com>
Date: Thu, 31 Jul 2025 11:04:30 -0400
Subject: [PATCH 240/305] chore(deps): bump toml to v9 (#23475)

* Bump toml to v9

* Add serde feature to toml

* cargo vdev build licenses

* Use toml::de::ValueDeserializer::parse

* Fix test
---
 Cargo.lock                                 | 80 +++++++++++++++++-----
 Cargo.toml                                 |  4 +-
 LICENSE-3rdparty.csv                       |  2 +
 src/sinks/appsignal/tests.rs               |  6 +-
 src/sinks/gcp/stackdriver/logs/tests.rs    |  6 +-
 src/sinks/gcp/stackdriver/metrics/tests.rs |  6 +-
 src/sinks/honeycomb/tests.rs               |  6 +-
 src/sinks/new_relic/tests.rs               |  6 +-
 src/sinks/papertrail.rs                    |  6 +-
 src/transforms/log_to_metric.rs            |  5 +-
 10 files changed, 93 insertions(+), 34 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 6c698ed1c35aa..474b411d70fa4 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2001,7 +2001,7 @@ checksum = "c06acb4f71407ba205a07cb453211e0e6a67b21904e47f6ba1f9589e38f2e454"
 dependencies = [
  "semver 1.0.26",
  "serde",
- "toml",
+ "toml 0.8.23",
  "url",
 ]
 
@@ -2417,7 +2417,7 @@ dependencies = [
  "directories",
  "serde",
  "thiserror 2.0.3",
- "toml",
+ "toml 0.8.23",
 ]
 
 [[package]]
@@ -8028,7 +8028,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "be769465445e8c1474e9c5dac2018218498557af32d9ed057325ec9a41ae81bf"
 dependencies = [
  "heck 0.5.0",
- "itertools 0.10.5",
+ "itertools 0.14.0",
  "log",
  "multimap",
  "once_cell",
@@ -8074,7 +8074,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8a56d757972c98b346a9b766e3f02746cde6dd1cd1d1d563472929fdd74bec4d"
 dependencies = [
  "anyhow",
- "itertools 0.10.5",
+ "itertools 0.14.0",
  "proc-macro2 1.0.95",
  "quote 1.0.40",
  "syn 2.0.104",
@@ -9544,11 +9544,11 @@ dependencies = [
 
 [[package]]
 name = "serde-toml-merge"
-version = "0.3.9"
+version = "0.3.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5817202d670278fb4dded71a70bae5181e00112543b1313463b02d43fc2d9243"
+checksum = "0fc44799282f511a5d403d72a4ff028dc2c87f7fe6830abe3c33bb2fa6dfccec"
 dependencies = [
- "toml",
+ "toml 0.9.4",
 ]
 
 [[package]]
@@ -9664,6 +9664,15 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "serde_spanned"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "40734c41988f7306bb04f0ecf60ec0f3f1caa34290e4e8ea471dcd3346483b83"
+dependencies = [
+ "serde",
+]
+
 [[package]]
 name = "serde_urlencoded"
 version = "0.7.1"
@@ -10967,11 +10976,26 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dc1beb996b9d83529a9e75c17a1686767d148d70663143c7854d8b4a09ced362"
 dependencies = [
  "serde",
- "serde_spanned",
- "toml_datetime",
+ "serde_spanned 0.6.9",
+ "toml_datetime 0.6.11",
  "toml_edit 0.22.27",
 ]
 
+[[package]]
+name = "toml"
+version = "0.9.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41ae868b5a0f67631c14589f7e250c1ea2c574ee5ba21c6c8dd4b1485705a5a1"
+dependencies = [
+ "indexmap 2.10.0",
+ "serde",
+ "serde_spanned 1.0.0",
+ "toml_datetime 0.7.0",
+ "toml_parser",
+ "toml_writer",
+ "winnow 0.7.10",
+]
+
 [[package]]
 name = "toml_datetime"
 version = "0.6.11"
@@ -10981,6 +11005,15 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "toml_datetime"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bade1c3e902f58d73d3f294cd7f20391c1cb2fbcb643b73566bc773971df91e3"
+dependencies = [
+ "serde",
+]
+
 [[package]]
 name = "toml_edit"
 version = "0.19.15"
@@ -10988,7 +11021,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
 dependencies = [
  "indexmap 2.10.0",
- "toml_datetime",
+ "toml_datetime 0.6.11",
  "winnow 0.5.18",
 ]
 
@@ -11000,18 +11033,33 @@ checksum = "41fe8c660ae4257887cf66394862d21dbca4a6ddd26f04a3560410406a2f819a"
 dependencies = [
  "indexmap 2.10.0",
  "serde",
- "serde_spanned",
- "toml_datetime",
+ "serde_spanned 0.6.9",
+ "toml_datetime 0.6.11",
  "toml_write",
  "winnow 0.7.10",
 ]
 
+[[package]]
+name = "toml_parser"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97200572db069e74c512a14117b296ba0a80a30123fbbb5aa1f4a348f639ca30"
+dependencies = [
+ "winnow 0.7.10",
+]
+
 [[package]]
 name = "toml_write"
 version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5d99f8c9a7727884afe522e9bd5edbfc91a3312b36a77b5fb8926e4c31a41801"
 
+[[package]]
+name = "toml_writer"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fcc842091f2def52017664b53082ecbbeb5c7731092bad69d2c63050401dfd64"
+
 [[package]]
 name = "tonic"
 version = "0.11.0"
@@ -11802,7 +11850,7 @@ dependencies = [
  "serde_yaml",
  "sha2",
  "tempfile",
- "toml",
+ "toml 0.9.4",
 ]
 
 [[package]]
@@ -11986,7 +12034,7 @@ dependencies = [
  "tokio-test",
  "tokio-tungstenite 0.20.1",
  "tokio-util",
- "toml",
+ "toml 0.9.4",
  "tonic 0.11.0",
  "tonic-build 0.11.0",
  "tower 0.5.2",
@@ -12116,7 +12164,7 @@ dependencies = [
  "serde_json",
  "serde_with 3.14.0",
  "snafu 0.8.6",
- "toml",
+ "toml 0.9.4",
  "tracing 0.1.41",
  "url",
  "vector-config-common",
@@ -12216,7 +12264,7 @@ dependencies = [
  "tokio-stream",
  "tokio-test",
  "tokio-util",
- "toml",
+ "toml 0.9.4",
  "tonic 0.11.0",
  "tracing 0.1.41",
  "tracing-subscriber",
diff --git a/Cargo.toml b/Cargo.toml
index 5cf450079f61f..055f4c77e5949 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -168,7 +168,7 @@ serde = { version = "1.0.219", default-features = false, features = ["alloc", "d
 snafu = { version = "0.8.6", default-features = false, features = ["futures", "std"] }
 tempfile = "3.20.0"
 tokio = { version = "1.45.1", default-features = false, features = ["full"] }
-toml = { version = "0.8.23", default-features = false, features = ["display", "parse"] }
+toml = { version = "0.9.4", default-features = false, features = ["serde", "display", "parse"] }
 tonic = { version = "0.11", default-features = false, features = ["transport", "codegen", "prost", "tls", "tls-roots", "gzip"] }
 tonic-build = { version = "0.11", default-features = false, features = ["transport", "prost"] }
 uuid = { version = "1.17.0", features = ["v4", "v7", "serde"] }
@@ -271,7 +271,7 @@ tower = { version = "0.5.2", default-features = false, features = ["buffer", "li
 tower-http = { version = "0.4.4", default-features = false, features = ["compression-full", "decompression-gzip", "trace"] }
 # Serde
 serde.workspace = true
-serde-toml-merge = { version = "0.3.9", default-features = false }
+serde-toml-merge = { version = "0.3.11", default-features = false }
 serde_bytes = { version = "0.11.17", default-features = false, features = ["std"], optional = true }
 serde_json.workspace = true
 serde_with = { version = "3.14.0", default-features = false, features = ["macros", "std"] }
diff --git a/LICENSE-3rdparty.csv b/LICENSE-3rdparty.csv
index bacbc08ecd534..54200d6409361 100644
--- a/LICENSE-3rdparty.csv
+++ b/LICENSE-3rdparty.csv
@@ -673,7 +673,9 @@ toml,https://github.com/toml-rs/toml,MIT OR Apache-2.0,The toml Authors
 toml_datetime,https://github.com/toml-rs/toml,MIT OR Apache-2.0,The toml_datetime Authors
 toml_edit,https://github.com/toml-rs/toml,MIT OR Apache-2.0,"Andronik Ordian <write@reusable.software>, Ed Page <eopage@gmail.com>"
 toml_edit,https://github.com/toml-rs/toml,MIT OR Apache-2.0,The toml_edit Authors
+toml_parser,https://github.com/toml-rs/toml,MIT OR Apache-2.0,The toml_parser Authors
 toml_write,https://github.com/toml-rs/toml,MIT OR Apache-2.0,The toml_write Authors
+toml_writer,https://github.com/toml-rs/toml,MIT OR Apache-2.0,The toml_writer Authors
 tonic,https://github.com/hyperium/tonic,MIT,Lucio Franco <luciofranco14@gmail.com>
 tower,https://github.com/tower-rs/tower,MIT,Tower Maintainers <team@tower-rs.com>
 tower-http,https://github.com/tower-rs/tower-http,MIT,Tower Maintainers <team@tower-rs.com>
diff --git a/src/sinks/appsignal/tests.rs b/src/sinks/appsignal/tests.rs
index 769fba9282518..a93c67ec158b1 100644
--- a/src/sinks/appsignal/tests.rs
+++ b/src/sinks/appsignal/tests.rs
@@ -18,8 +18,10 @@ async fn component_spec_compliance() {
     let mock_endpoint = spawn_blackhole_http_server(always_200_response).await;
 
     let config = AppsignalConfig::generate_config().to_string();
-    let mut config = AppsignalConfig::deserialize(toml::de::ValueDeserializer::new(&config))
-        .expect("config should be valid");
+    let mut config = AppsignalConfig::deserialize(
+        toml::de::ValueDeserializer::parse(&config).expect("value should deserialize"),
+    )
+    .expect("config should be valid");
     config.endpoint = mock_endpoint.to_string();
 
     let context = SinkContext::default();
diff --git a/src/sinks/gcp/stackdriver/logs/tests.rs b/src/sinks/gcp/stackdriver/logs/tests.rs
index 55fa99709a6ce..cde8fe964206f 100644
--- a/src/sinks/gcp/stackdriver/logs/tests.rs
+++ b/src/sinks/gcp/stackdriver/logs/tests.rs
@@ -47,8 +47,10 @@ async fn component_spec_compliance() {
     let mock_endpoint = spawn_blackhole_http_server(always_200_response).await;
 
     let config = StackdriverConfig::generate_config().to_string();
-    let mut config = StackdriverConfig::deserialize(toml::de::ValueDeserializer::new(&config))
-        .expect("config should be valid");
+    let mut config = StackdriverConfig::deserialize(
+        toml::de::ValueDeserializer::parse(&config).expect("toml should deserialize"),
+    )
+    .expect("config should be valid");
 
     // If we don't override the credentials path/API key, it tries to directly call out to the Google Instance
     // Metadata API, which we clearly don't have in unit tests. :)
diff --git a/src/sinks/gcp/stackdriver/metrics/tests.rs b/src/sinks/gcp/stackdriver/metrics/tests.rs
index 391803a741ae9..9662b749acebe 100644
--- a/src/sinks/gcp/stackdriver/metrics/tests.rs
+++ b/src/sinks/gcp/stackdriver/metrics/tests.rs
@@ -25,8 +25,10 @@ async fn component_spec_compliance() {
     let mock_endpoint = spawn_blackhole_http_server(always_200_response).await;
 
     let config = StackdriverConfig::generate_config().to_string();
-    let mut config = StackdriverConfig::deserialize(toml::de::ValueDeserializer::new(&config))
-        .expect("config should be valid");
+    let mut config = StackdriverConfig::deserialize(
+        toml::de::ValueDeserializer::parse(&config).expect("toml should deserialize"),
+    )
+    .expect("config should be valid");
 
     // If we don't override the credentials path/API key, it tries to directly call out to the Google Instance
     // Metadata API, which we clearly don't have in unit tests. :)
diff --git a/src/sinks/honeycomb/tests.rs b/src/sinks/honeycomb/tests.rs
index 29186f47f8012..76d5ae5ebbbb3 100644
--- a/src/sinks/honeycomb/tests.rs
+++ b/src/sinks/honeycomb/tests.rs
@@ -23,8 +23,10 @@ async fn component_spec_compliance() {
     let mock_endpoint = spawn_blackhole_http_server(always_200_response).await;
 
     let config = HoneycombConfig::generate_config().to_string();
-    let mut config = HoneycombConfig::deserialize(toml::de::ValueDeserializer::new(&config))
-        .expect("config should be valid");
+    let mut config = HoneycombConfig::deserialize(
+        toml::de::ValueDeserializer::parse(&config).expect("toml should deserialize"),
+    )
+    .expect("config should be valid");
     config.endpoint = mock_endpoint.to_string();
 
     let context = SinkContext::default();
diff --git a/src/sinks/new_relic/tests.rs b/src/sinks/new_relic/tests.rs
index f68accfd7a251..648c90c5ac067 100644
--- a/src/sinks/new_relic/tests.rs
+++ b/src/sinks/new_relic/tests.rs
@@ -29,8 +29,10 @@ async fn sink() -> (VectorSink, Event) {
     let mock_endpoint = spawn_blackhole_http_server(always_200_response).await;
 
     let config = NewRelicConfig::generate_config().to_string();
-    let mut config = NewRelicConfig::deserialize(toml::de::ValueDeserializer::new(&config))
-        .expect("config should be valid");
+    let mut config = NewRelicConfig::deserialize(
+        toml::de::ValueDeserializer::parse(&config).expect("toml should deserialize"),
+    )
+    .expect("config should be valid");
     config.override_uri = Some(mock_endpoint);
 
     let context = SinkContext::default();
diff --git a/src/sinks/papertrail.rs b/src/sinks/papertrail.rs
index a7356c78a26e9..d74f2a6e0e88b 100644
--- a/src/sinks/papertrail.rs
+++ b/src/sinks/papertrail.rs
@@ -208,8 +208,10 @@ mod tests {
         let mock_endpoint = spawn_blackhole_http_server(always_200_response).await;
 
         let config = PapertrailConfig::generate_config().to_string();
-        let mut config = PapertrailConfig::deserialize(toml::de::ValueDeserializer::new(&config))
-            .expect("config should be valid");
+        let mut config = PapertrailConfig::deserialize(
+            toml::de::ValueDeserializer::parse(&config).expect("toml should deserialize"),
+        )
+        .expect("config should be valid");
         config.endpoint = mock_endpoint.into();
         config.tls = Some(TlsEnableableConfig::default());
 
diff --git a/src/transforms/log_to_metric.rs b/src/transforms/log_to_metric.rs
index 4b7bf172f1039..4d75b0e9fe095 100644
--- a/src/transforms/log_to_metric.rs
+++ b/src/transforms/log_to_metric.rs
@@ -1216,10 +1216,7 @@ mod tests {
         let metric = do_transform(config, event).await.unwrap().into_metric();
         let tags = metric.tags().expect("Metric should have tags");
 
-        assert_eq!(
-            tags.iter_single().collect::<Vec<_>>(),
-            vec![("l1_key1", "val2")]
-        );
+        assert_eq!(tags.iter_single().collect::<Vec<_>>()[0].0, "l1_key1");
 
         assert_eq!(tags.iter_all().count(), 2);
         for (name, value) in tags.iter_all() {

From 862524746cf3e2d7049aaf812f60f6845c97e67b Mon Sep 17 00:00:00 2001
From: Taylor Chaparro <33099255+notchairmk@users.noreply.github.com>
Date: Thu, 31 Jul 2025 08:11:22 -0700
Subject: [PATCH 241/305] enhancement(http sink): support for template headers
 (#23422)

* enhancement(http sink): support for template headers

* update changelog

* Update changelog.d/201_http_sink_header_templates.enhancement.md

Co-authored-by: Pavlos Rontidis <pavlos.rontidis@gmail.com>

* IndexMap -> BTreeMap

* formatting

* update static headers unwrap

* formatting, cleanup custom hash impl

* update component docs

* revert unintentional doc changes from header template spike in 46a3bca81472cdbfbf12f6497c9e095a775ef2f2

---------

Co-authored-by: Pavlos Rontidis <pavlos.rontidis@gmail.com>
---
 ..._http_sink_header_templates.enhancement.md |   3 +
 src/sinks/datadog/logs/service.rs             |  22 ++--
 src/sinks/http/config.rs                      |  35 ++++--
 src/sinks/http/service.rs                     |  24 ++--
 src/sinks/http/sink.rs                        |  31 ++++-
 src/sinks/http/tests.rs                       | 110 ++++++++++++++++++
 src/sinks/util/http.rs                        |  81 ++++++++++---
 .../sinks/generated/aws_cloudwatch_logs.cue   |   4 +-
 .../components/sinks/generated/axiom.cue      |   4 +-
 .../sinks/generated/datadog_logs.cue          |   4 +-
 .../sinks/generated/elasticsearch.cue         |   4 +-
 .../components/sinks/generated/http.cue       |   4 +-
 .../sinks/generated/opentelemetry.cue         |   4 +-
 13 files changed, 280 insertions(+), 50 deletions(-)
 create mode 100644 changelog.d/201_http_sink_header_templates.enhancement.md

diff --git a/changelog.d/201_http_sink_header_templates.enhancement.md b/changelog.d/201_http_sink_header_templates.enhancement.md
new file mode 100644
index 0000000000000..2b2b46e16a5a7
--- /dev/null
+++ b/changelog.d/201_http_sink_header_templates.enhancement.md
@@ -0,0 +1,3 @@
+The `http` sink now supports templated header values.
+
+authors: notchairmk
diff --git a/src/sinks/datadog/logs/service.rs b/src/sinks/datadog/logs/service.rs
index d0baffee6d631..4ae96ecb2c51e 100644
--- a/src/sinks/datadog/logs/service.rs
+++ b/src/sinks/datadog/logs/service.rs
@@ -5,13 +5,12 @@ use std::{
 
 use bytes::Bytes;
 use futures::future::BoxFuture;
-use headers::HeaderName;
 use http::{
     header::{CONTENT_ENCODING, CONTENT_LENGTH, CONTENT_TYPE},
     HeaderValue, Request, Uri,
 };
 use hyper::Body;
-use indexmap::IndexMap;
+use std::collections::BTreeMap;
 use tower::Service;
 use tracing::Instrument;
 use vector_lib::event::{EventFinalizers, EventStatus, Finalizable};
@@ -21,7 +20,10 @@ use vector_lib::stream::DriverResponse;
 use crate::{
     http::HttpClient,
     sinks::util::{retries::RetryLogic, Compression},
-    sinks::{datadog::DatadogApiError, util::http::validate_headers},
+    sinks::{
+        datadog::DatadogApiError,
+        util::http::{validate_headers, OrderedHeaderName},
+    },
 };
 
 #[derive(Debug, Default, Clone)]
@@ -92,26 +94,26 @@ impl DriverResponse for LogApiResponse {
 pub struct LogApiService {
     client: HttpClient,
     uri: Uri,
-    user_provided_headers: IndexMap<HeaderName, HeaderValue>,
-    dd_evp_headers: IndexMap<HeaderName, HeaderValue>,
+    user_provided_headers: BTreeMap<OrderedHeaderName, HeaderValue>,
+    dd_evp_headers: BTreeMap<OrderedHeaderName, HeaderValue>,
 }
 
 impl LogApiService {
     pub fn new(
         client: HttpClient,
         uri: Uri,
-        headers: IndexMap<String, String>,
+        headers: BTreeMap<String, String>,
         dd_evp_origin: String,
     ) -> crate::Result<Self> {
         let user_provided_headers = validate_headers(&headers)?;
 
-        let dd_evp_headers = &[
+        let dd_evp_headers: BTreeMap<String, String> = [
             ("DD-EVP-ORIGIN".to_string(), dd_evp_origin),
             ("DD-EVP-ORIGIN-VERSION".to_string(), crate::get_version()),
         ]
         .into_iter()
         .collect();
-        let dd_evp_headers = validate_headers(dd_evp_headers)?;
+        let dd_evp_headers = validate_headers(&dd_evp_headers)?;
 
         Ok(Self {
             client,
@@ -154,11 +156,11 @@ impl Service<LogApiRequest> for LogApiService {
         if let Some(headers) = http_request.headers_mut() {
             for (name, value) in &self.user_provided_headers {
                 // Replace rather than append to any existing header values
-                headers.insert(name, value.clone());
+                headers.insert(name.inner(), value.clone());
             }
             // Set DD EVP headers last so that they cannot be overridden.
             for (name, value) in &self.dd_evp_headers {
-                headers.insert(name, value.clone());
+                headers.insert(name.inner(), value.clone());
             }
         }
 
diff --git a/src/sinks/http/config.rs b/src/sinks/http/config.rs
index cf72ffbc164ff..e2d5c0840659e 100644
--- a/src/sinks/http/config.rs
+++ b/src/sinks/http/config.rs
@@ -6,7 +6,7 @@ use aws_config::meta::region::ProvideRegion;
 use aws_types::region::Region;
 use http::{header::AUTHORIZATION, HeaderName, HeaderValue, Method, Request, StatusCode};
 use hyper::Body;
-use indexmap::IndexMap;
+use std::collections::BTreeMap;
 use std::path::PathBuf;
 use vector_lib::codecs::{
     encoding::{Framer, Serializer},
@@ -29,7 +29,7 @@ use crate::{
     sinks::{
         prelude::*,
         util::{
-            http::{http_response_retry_logic, HttpService, RequestConfig},
+            http::{http_response_retry_logic, HttpService, OrderedHeaderName, RequestConfig},
             RealtimeSizeBasedDefaultBatchSettings, UriSerde,
         },
     },
@@ -62,7 +62,7 @@ pub struct HttpSinkConfig {
     #[configurable(metadata(
         docs::additional_props_description = "An HTTP request header and it's value."
     ))]
-    pub headers: Option<IndexMap<String, String>>,
+    pub headers: Option<BTreeMap<String, String>>,
 
     #[configurable(derived)]
     #[serde(default)]
@@ -200,13 +200,13 @@ async fn healthcheck(uri: UriSerde, auth: Option<Auth>, client: HttpClient) -> c
 }
 
 pub(super) fn validate_headers(
-    headers: &IndexMap<String, String>,
+    headers: &BTreeMap<String, String>,
     configures_auth: bool,
-) -> crate::Result<IndexMap<HeaderName, HeaderValue>> {
+) -> crate::Result<BTreeMap<OrderedHeaderName, HeaderValue>> {
     let headers = crate::sinks::util::http::validate_headers(headers)?;
 
     for name in headers.keys() {
-        if configures_auth && name == AUTHORIZATION {
+        if configures_auth && name.inner() == AUTHORIZATION {
             return Err("Authorization header can not be used with defined auth options".into());
         }
     }
@@ -246,7 +246,8 @@ impl SinkConfig for HttpSinkConfig {
         let mut request = self.request.clone();
         request.add_old_option(self.headers.clone());
 
-        let headers = validate_headers(&request.headers, self.auth.is_some())?;
+        validate_headers(&request.headers, self.auth.is_some())?;
+        let (static_headers, template_headers) = request.split_headers();
 
         let (payload_prefix, payload_suffix) =
             validate_payload_wrapper(&self.payload_prefix, &self.payload_suffix, &encoder)?;
@@ -285,10 +286,20 @@ impl SinkConfig for HttpSinkConfig {
                 .to_string()
         });
 
+        let converted_static_headers = static_headers
+            .into_iter()
+            .map(|(name, value)| -> crate::Result<_> {
+                let header_name =
+                    HeaderName::from_bytes(name.as_bytes()).map(OrderedHeaderName::from)?;
+                let header_value = HeaderValue::try_from(value)?;
+                Ok((header_name, header_value))
+            })
+            .collect::<Result<BTreeMap<_, _>, _>>()?;
+
         let http_sink_request_builder = HttpSinkRequestBuilder::new(
             self.method,
             self.auth.clone(),
-            headers,
+            converted_static_headers,
             content_type,
             content_encoding,
         );
@@ -329,7 +340,13 @@ impl SinkConfig for HttpSinkConfig {
             .settings(request_limits, http_response_retry_logic())
             .service(service);
 
-        let sink = HttpSink::new(service, self.uri.clone(), batch_settings, request_builder);
+        let sink = HttpSink::new(
+            service,
+            self.uri.clone(),
+            template_headers,
+            batch_settings,
+            request_builder,
+        );
 
         Ok((VectorSink::from_event_streamsink(sink), healthcheck))
     }
diff --git a/src/sinks/http/service.rs b/src/sinks/http/service.rs
index c8e9503ea2dce..69ce79842bb35 100644
--- a/src/sinks/http/service.rs
+++ b/src/sinks/http/service.rs
@@ -1,5 +1,6 @@
 //! Service implementation for the `http` sink.
 
+use std::collections::BTreeMap;
 use std::str::FromStr;
 
 use bytes::Bytes;
@@ -7,13 +8,12 @@ use http::{
     header::{CONTENT_ENCODING, CONTENT_TYPE},
     HeaderName, HeaderValue, Method, Request,
 };
-use indexmap::IndexMap;
 
 use crate::{
     http::{Auth, MaybeAuth},
     sinks::{
         util::{
-            http::{HttpRequest, HttpServiceRequestBuilder},
+            http::{HttpRequest, HttpServiceRequestBuilder, OrderedHeaderName},
             UriSerde,
         },
         HTTPRequestBuilderSnafu,
@@ -28,7 +28,7 @@ use super::sink::PartitionKey;
 pub(super) struct HttpSinkRequestBuilder {
     method: HttpMethod,
     auth: Option<Auth>,
-    headers: IndexMap<HeaderName, HeaderValue>,
+    static_headers: BTreeMap<OrderedHeaderName, HeaderValue>,
     content_type: Option<String>,
     content_encoding: Option<String>,
 }
@@ -38,14 +38,14 @@ impl HttpSinkRequestBuilder {
     pub(super) const fn new(
         method: HttpMethod,
         auth: Option<Auth>,
-        headers: IndexMap<HeaderName, HeaderValue>,
+        static_headers: BTreeMap<OrderedHeaderName, HeaderValue>,
         content_type: Option<String>,
         content_encoding: Option<String>,
     ) -> Self {
         Self {
             method,
             auth,
-            headers,
+            static_headers,
             content_type,
             content_encoding,
         }
@@ -80,8 +80,18 @@ impl HttpServiceRequestBuilder<PartitionKey> for HttpSinkRequestBuilder {
             // The request building should not have errors at this point, and if it did it would fail in the call to `body()` also.
             .expect("Failed to access headers in http::Request builder- builder has errors.");
 
-        for (header, value) in self.headers.iter() {
-            headers.insert(header, value.clone());
+        // Static headers from config
+        for (header_name, header_value) in self.static_headers.iter() {
+            headers.insert(header_name.inner(), header_value.clone());
+        }
+
+        // Template headers from the partition key
+        for (name, value) in metadata.headers.iter() {
+            let header_name = HeaderName::from_bytes(name.as_bytes())
+                .map_err(|e| format!("Invalid header name '{name}': {e}"))?;
+            let header_value = HeaderValue::from_bytes(value.as_bytes())
+                .map_err(|e| format!("Invalid header value '{value}': {e}"))?;
+            headers.insert(header_name, header_value);
         }
 
         // The request building should not have errors at this point
diff --git a/src/sinks/http/sink.rs b/src/sinks/http/sink.rs
index dee308a3521d1..2cb07c299f993 100644
--- a/src/sinks/http/sink.rs
+++ b/src/sinks/http/sink.rs
@@ -1,12 +1,14 @@
 //! Implementation of the `http` sink.
 
 use crate::sinks::{prelude::*, util::http::HttpRequest};
+use std::collections::BTreeMap;
 
 use super::{batch::HttpBatchSizer, request_builder::HttpRequestBuilder};
 
 pub(super) struct HttpSink<S> {
     service: S,
     uri: Template,
+    headers: BTreeMap<String, Template>,
     batch_settings: BatcherSettings,
     request_builder: HttpRequestBuilder,
 }
@@ -22,12 +24,14 @@ where
     pub(super) const fn new(
         service: S,
         uri: Template,
+        headers: BTreeMap<String, Template>,
         batch_settings: BatcherSettings,
         request_builder: HttpRequestBuilder,
     ) -> Self {
         Self {
             service,
             uri,
+            headers,
             batch_settings,
             request_builder,
         }
@@ -39,7 +43,7 @@ where
         };
         input
             // Batch the input stream with size calculation based on the configured codec
-            .batched_partitioned(KeyPartitioner::new(self.uri), || {
+            .batched_partitioned(KeyPartitioner::new(self.uri, self.headers), || {
                 self.batch_settings.as_item_size_config(batch_sizer.clone())
             })
             .filter_map(|(key, batch)| async move { key.map(move |k| (k, batch)) })
@@ -82,18 +86,20 @@ where
     }
 }
 
-#[derive(Hash, Eq, PartialEq, Clone, Debug)]
+#[derive(Eq, PartialEq, Clone, Debug, Hash)]
 pub struct PartitionKey {
     pub uri: String,
+    pub headers: BTreeMap<String, String>,
 }
 
 struct KeyPartitioner {
     uri: Template,
+    headers: BTreeMap<String, Template>,
 }
 
 impl KeyPartitioner {
-    const fn new(uri: Template) -> Self {
-        Self { uri }
+    const fn new(uri: Template, headers: BTreeMap<String, Template>) -> Self {
+        Self { uri, headers }
     }
 }
 
@@ -114,6 +120,21 @@ impl Partitioner for KeyPartitioner {
             })
             .ok()?;
 
-        Some(PartitionKey { uri })
+        let mut headers = BTreeMap::new();
+        for (name, template) in &self.headers {
+            let value = template
+                .render_string(event)
+                .map_err(|error| {
+                    emit!(TemplateRenderingError {
+                        error,
+                        field: Some("headers"),
+                        drop_event: true,
+                    });
+                })
+                .ok()?;
+            headers.insert(name.clone(), value);
+        }
+
+        Some(PartitionKey { uri, headers })
     }
 }
diff --git a/src/sinks/http/tests.rs b/src/sinks/http/tests.rs
index 7d166a2d39095..1b96f267093e7 100644
--- a/src/sinks/http/tests.rs
+++ b/src/sinks/http/tests.rs
@@ -271,6 +271,96 @@ async fn http_passes_custom_headers() {
     .await;
 }
 
+#[tokio::test]
+async fn http_passes_template_headers() {
+    run_sink_with_events(
+        r#"
+        [request.headers]
+        Static-Header = "static-value"
+        Accept = "application/vnd.api+json"
+        X-Event-Level = "{{level}}"
+        X-Event-Message = "{{message}}"
+        X-Static-Template = "constant-value"
+    "#,
+        || {
+            let mut event = Event::Log(LogEvent::from("test message"));
+            event.as_mut_log().insert("level", "info");
+            event.as_mut_log().insert("message", "templated message");
+            event
+        },
+        10,
+        |parts| {
+            assert_eq!(
+                Some("static-value"),
+                parts
+                    .headers
+                    .get("Static-Header")
+                    .map(|v| v.to_str().unwrap())
+            );
+
+            assert_eq!(
+                Some("application/vnd.api+json"),
+                parts.headers.get("Accept").map(|v| v.to_str().unwrap())
+            );
+
+            assert_eq!(
+                Some("constant-value"),
+                parts
+                    .headers
+                    .get("X-Static-Template")
+                    .map(|v| v.to_str().unwrap())
+            );
+
+            assert_eq!(
+                Some("info"),
+                parts
+                    .headers
+                    .get("X-Event-Level")
+                    .map(|v| v.to_str().unwrap())
+            );
+            assert_eq!(
+                Some("templated message"),
+                parts
+                    .headers
+                    .get("X-Event-Message")
+                    .map(|v| v.to_str().unwrap())
+            );
+        },
+    )
+    .await;
+}
+
+#[tokio::test]
+async fn http_template_headers_missing_fields() {
+    run_sink_with_events(
+        r#"
+        [request.headers]
+        X-Required-Field = "{{required_field}}"
+        X-Static = "static-value"
+    "#,
+        || {
+            let mut event = Event::Log(LogEvent::from("good event"));
+            event.as_mut_log().insert("required_field", "present");
+            event
+        },
+        10,
+        |parts| {
+            assert_eq!(
+                Some("present"),
+                parts
+                    .headers
+                    .get("X-Required-Field")
+                    .map(|v| v.to_str().unwrap())
+            );
+            assert_eq!(
+                Some("static-value"),
+                parts.headers.get("X-Static").map(|v| v.to_str().unwrap())
+            );
+        },
+    )
+    .await;
+}
+
 #[tokio::test]
 async fn retries_on_no_connection() {
     components::assert_sink_compliance(&HTTP_SINK_TAGS, async {
@@ -803,6 +893,26 @@ async fn run_sink(extra_config: &str, assert_parts: impl Fn(http::request::Parts
     assert_eq!(input_lines, output_lines);
 }
 
+async fn run_sink_with_events(
+    extra_config: &str,
+    event_generator: impl Fn() -> Event + Clone,
+    num_events: usize,
+    assert_parts: impl Fn(http::request::Parts),
+) {
+    let (in_addr, sink) = build_sink(extra_config).await;
+    let (rx, trigger, server) = build_test_server(in_addr);
+    tokio::spawn(server);
+
+    let (events, mut receiver) = create_events_batch_with_fn(event_generator, num_events);
+    let events = stream::iter(events);
+
+    components::run_and_assert_sink_compliance(sink, events, &HTTP_SINK_TAGS).await;
+    drop(trigger);
+
+    assert_eq!(receiver.try_recv(), Ok(BatchStatus::Delivered));
+    let _output_lines = get_received_gzip(rx, assert_parts).await;
+}
+
 async fn build_sink(extra_config: &str) -> (std::net::SocketAddr, crate::sinks::VectorSink) {
     let in_addr = next_addr();
 
diff --git a/src/sinks/util/http.rs b/src/sinks/util/http.rs
index 89eed3d7bcd72..163417c667e1e 100644
--- a/src/sinks/util/http.rs
+++ b/src/sinks/util/http.rs
@@ -6,11 +6,42 @@ use bytes::{Buf, Bytes};
 use futures::{future::BoxFuture, Sink};
 use headers::HeaderName;
 use http::{header, HeaderValue, Request, Response, StatusCode};
+
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
+pub struct OrderedHeaderName(HeaderName);
+
+impl OrderedHeaderName {
+    pub const fn new(header_name: HeaderName) -> Self {
+        Self(header_name)
+    }
+
+    pub const fn inner(&self) -> &HeaderName {
+        &self.0
+    }
+}
+
+impl From<HeaderName> for OrderedHeaderName {
+    fn from(header_name: HeaderName) -> Self {
+        Self(header_name)
+    }
+}
+
+impl Ord for OrderedHeaderName {
+    fn cmp(&self, other: &Self) -> std::cmp::Ordering {
+        self.0.as_str().cmp(other.0.as_str())
+    }
+}
+
+impl PartialOrd for OrderedHeaderName {
+    fn partial_cmp(&self, other: &Self) -> Option<std::cmp::Ordering> {
+        Some(self.cmp(other))
+    }
+}
 use hyper::{body, Body};
-use indexmap::IndexMap;
 use pin_project::pin_project;
 use snafu::{ResultExt, Snafu};
 use std::{
+    collections::BTreeMap,
     fmt,
     future::Future,
     hash::Hash,
@@ -42,6 +73,7 @@ use crate::{
     http::{HttpClient, HttpError},
     internal_events::{EndpointBytesSent, SinkRequestBuildError},
     sinks::prelude::*,
+    template::Template,
 };
 
 pub trait HttpEventEncoder<Output> {
@@ -611,26 +643,49 @@ pub struct RequestConfig {
     /// Additional HTTP headers to add to every HTTP request.
     #[serde(default)]
     #[configurable(metadata(
-        docs::additional_props_description = "An HTTP request header and it's value."
+        docs::additional_props_description = "An HTTP request header and its value. Both header names and values support templating with event data."
     ))]
     #[configurable(metadata(docs::examples = "headers_examples()"))]
-    pub headers: IndexMap<String, String>,
+    pub headers: BTreeMap<String, String>,
 }
 
-fn headers_examples() -> IndexMap<String, String> {
-    IndexMap::<_, _>::from_iter([
-        ("Accept".to_owned(), "text/plain".to_owned()),
-        ("X-My-Custom-Header".to_owned(), "A-Value".to_owned()),
-    ])
+fn headers_examples() -> BTreeMap<String, String> {
+    btreemap! {
+        "Accept" => "text/plain",
+        "X-My-Custom-Header" => "A-Value",
+        "X-Event-Level" => "{{level}}",
+        "X-Event-Timestamp" => "{{timestamp}}",
+    }
 }
 
 impl RequestConfig {
-    pub fn add_old_option(&mut self, headers: Option<IndexMap<String, String>>) {
+    pub fn add_old_option(&mut self, headers: Option<BTreeMap<String, String>>) {
         if let Some(headers) = headers {
             warn!("Option `headers` has been deprecated. Use `request.headers` instead.");
             self.headers.extend(headers);
         }
     }
+
+    pub fn split_headers(&self) -> (BTreeMap<String, String>, BTreeMap<String, Template>) {
+        let mut static_headers = BTreeMap::new();
+        let mut template_headers = BTreeMap::new();
+
+        for (name, value) in &self.headers {
+            match Template::try_from(value.as_str()) {
+                Ok(template) if !template.is_dynamic() => {
+                    static_headers.insert(name.clone(), value.clone());
+                }
+                Ok(template) => {
+                    template_headers.insert(name.clone(), template);
+                }
+                Err(_) => {
+                    static_headers.insert(name.clone(), value.clone());
+                }
+            }
+        }
+
+        (static_headers, template_headers)
+    }
 }
 
 #[derive(Debug, Snafu)]
@@ -648,16 +703,16 @@ pub enum HeaderValidationError {
 }
 
 pub fn validate_headers(
-    headers: &IndexMap<String, String>,
-) -> crate::Result<IndexMap<HeaderName, HeaderValue>> {
-    let mut validated_headers = IndexMap::new();
+    headers: &BTreeMap<String, String>,
+) -> crate::Result<BTreeMap<OrderedHeaderName, HeaderValue>> {
+    let mut validated_headers = BTreeMap::new();
     for (name, value) in headers {
         let name = HeaderName::from_bytes(name.as_bytes())
             .with_context(|_| InvalidHeaderNameSnafu { name })?;
         let value = HeaderValue::from_bytes(value.as_bytes())
             .with_context(|_| InvalidHeaderValueSnafu { value })?;
 
-        validated_headers.insert(name, value);
+        validated_headers.insert(name.into(), value);
     }
 
     Ok(validated_headers)
diff --git a/website/cue/reference/components/sinks/generated/aws_cloudwatch_logs.cue b/website/cue/reference/components/sinks/generated/aws_cloudwatch_logs.cue
index a042b84d8da1d..1cb420a635a15 100644
--- a/website/cue/reference/components/sinks/generated/aws_cloudwatch_logs.cue
+++ b/website/cue/reference/components/sinks/generated/aws_cloudwatch_logs.cue
@@ -730,10 +730,12 @@ generated: components: sinks: aws_cloudwatch_logs: configuration: {
 				type: object: {
 					examples: [{
 						Accept:               "text/plain"
+						"X-Event-Level":      "{{level}}"
+						"X-Event-Timestamp":  "{{timestamp}}"
 						"X-My-Custom-Header": "A-Value"
 					}]
 					options: "*": {
-						description: "An HTTP request header and it's value."
+						description: "An HTTP request header and its value. Both header names and values support templating with event data."
 						required:    true
 						type: string: {}
 					}
diff --git a/website/cue/reference/components/sinks/generated/axiom.cue b/website/cue/reference/components/sinks/generated/axiom.cue
index 258845138f138..feabae946cef9 100644
--- a/website/cue/reference/components/sinks/generated/axiom.cue
+++ b/website/cue/reference/components/sinks/generated/axiom.cue
@@ -204,10 +204,12 @@ generated: components: sinks: axiom: configuration: {
 				type: object: {
 					examples: [{
 						Accept:               "text/plain"
+						"X-Event-Level":      "{{level}}"
+						"X-Event-Timestamp":  "{{timestamp}}"
 						"X-My-Custom-Header": "A-Value"
 					}]
 					options: "*": {
-						description: "An HTTP request header and it's value."
+						description: "An HTTP request header and its value. Both header names and values support templating with event data."
 						required:    true
 						type: string: {}
 					}
diff --git a/website/cue/reference/components/sinks/generated/datadog_logs.cue b/website/cue/reference/components/sinks/generated/datadog_logs.cue
index 298f91ba5bc7e..70c4ace9c87ab 100644
--- a/website/cue/reference/components/sinks/generated/datadog_logs.cue
+++ b/website/cue/reference/components/sinks/generated/datadog_logs.cue
@@ -267,10 +267,12 @@ generated: components: sinks: datadog_logs: configuration: {
 				type: object: {
 					examples: [{
 						Accept:               "text/plain"
+						"X-Event-Level":      "{{level}}"
+						"X-Event-Timestamp":  "{{timestamp}}"
 						"X-My-Custom-Header": "A-Value"
 					}]
 					options: "*": {
-						description: "An HTTP request header and it's value."
+						description: "An HTTP request header and its value. Both header names and values support templating with event data."
 						required:    true
 						type: string: {}
 					}
diff --git a/website/cue/reference/components/sinks/generated/elasticsearch.cue b/website/cue/reference/components/sinks/generated/elasticsearch.cue
index 6bc6e1857a9f9..09f9d7a1ed95b 100644
--- a/website/cue/reference/components/sinks/generated/elasticsearch.cue
+++ b/website/cue/reference/components/sinks/generated/elasticsearch.cue
@@ -751,10 +751,12 @@ generated: components: sinks: elasticsearch: configuration: {
 				type: object: {
 					examples: [{
 						Accept:               "text/plain"
+						"X-Event-Level":      "{{level}}"
+						"X-Event-Timestamp":  "{{timestamp}}"
 						"X-My-Custom-Header": "A-Value"
 					}]
 					options: "*": {
-						description: "An HTTP request header and it's value."
+						description: "An HTTP request header and its value. Both header names and values support templating with event data."
 						required:    true
 						type: string: {}
 					}
diff --git a/website/cue/reference/components/sinks/generated/http.cue b/website/cue/reference/components/sinks/generated/http.cue
index 02fd3f4f1597a..ee690e09acdb0 100644
--- a/website/cue/reference/components/sinks/generated/http.cue
+++ b/website/cue/reference/components/sinks/generated/http.cue
@@ -840,10 +840,12 @@ generated: components: sinks: http: configuration: {
 				type: object: {
 					examples: [{
 						Accept:               "text/plain"
+						"X-Event-Level":      "{{level}}"
+						"X-Event-Timestamp":  "{{timestamp}}"
 						"X-My-Custom-Header": "A-Value"
 					}]
 					options: "*": {
-						description: "An HTTP request header and it's value."
+						description: "An HTTP request header and its value. Both header names and values support templating with event data."
 						required:    true
 						type: string: {}
 					}
diff --git a/website/cue/reference/components/sinks/generated/opentelemetry.cue b/website/cue/reference/components/sinks/generated/opentelemetry.cue
index 261521adbefca..3e812cb8c1cef 100644
--- a/website/cue/reference/components/sinks/generated/opentelemetry.cue
+++ b/website/cue/reference/components/sinks/generated/opentelemetry.cue
@@ -841,10 +841,12 @@ generated: components: sinks: opentelemetry: configuration: protocol: {
 					type: object: {
 						examples: [{
 							Accept:               "text/plain"
+							"X-Event-Level":      "{{level}}"
+							"X-Event-Timestamp":  "{{timestamp}}"
 							"X-My-Custom-Header": "A-Value"
 						}]
 						options: "*": {
-							description: "An HTTP request header and it's value."
+							description: "An HTTP request header and its value. Both header names and values support templating with event data."
 							required:    true
 							type: string: {}
 						}

From c7eaf6529079fb1070f913aaf2a3d5145c5f4001 Mon Sep 17 00:00:00 2001
From: Thomas <thomas.schneider@datadoghq.com>
Date: Thu, 31 Jul 2025 11:45:16 -0400
Subject: [PATCH 242/305] fix(dev): correctly set HOSTNAME in docker
 environment (#23452)

* fix(dev): correctly set HOSTNAME in docker environment

* Fix shellcheck

* Explain black magic

* Update scripts/environment/entrypoint.sh

---------

Co-authored-by: Pavlos Rontidis <pavlos.rontidis@gmail.com>
---
 Makefile                          |  7 ++++++-
 scripts/environment/entrypoint.sh | 13 +++++++++++--
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 7e3848ec79207..a77dcda4ad750 100644
--- a/Makefile
+++ b/Makefile
@@ -119,6 +119,9 @@ define MAYBE_ENVIRONMENT_COPY_ARTIFACTS
 endef
 endif
 
+# docker container id file needs to live in the host machine and is later mounted into the container
+CIDFILE := $(shell mktemp -u /tmp/vector-environment-docker-cid.XXXXXX)
+
 # We use a volume here as non-Linux hosts are extremely slow to share disks, and Linux hosts tend to get permissions clobbered.
 define ENVIRONMENT_EXEC
 	${ENVIRONMENT_PREPARE}
@@ -134,11 +137,13 @@ define ENVIRONMENT_EXEC
 			$(if $(ENVIRONMENT_NETWORK),--network $(ENVIRONMENT_NETWORK),) \
 			--mount type=bind,source=${CURRENT_DIR},target=/git/vectordotdev/vector \
 			$(if $(findstring docker,$(CONTAINER_TOOL)),--mount type=bind$(COMMA)source=/var/run/docker.sock$(COMMA)target=/var/run/docker.sock,) \
+			$(if $(findstring docker,$(CONTAINER_TOOL)),--cidfile $(CIDFILE),) \
+			$(if $(findstring docker,$(CONTAINER_TOOL)),--mount type=bind$(COMMA)source=$(CIDFILE)$(COMMA)target=/.docker-container-id,) \
 			--mount type=volume,source=vector-target,target=/git/vectordotdev/vector/target \
 			--mount type=volume,source=vector-cargo-cache,target=/root/.cargo \
 			--mount type=volume,source=vector-rustup-cache,target=/root/.rustup \
 			$(foreach publish,$(ENVIRONMENT_PUBLISH),--publish $(publish)) \
-			$(ENVIRONMENT_UPSTREAM)
+			$(ENVIRONMENT_UPSTREAM); rm -f $(CIDFILE)
 endef
 
 
diff --git a/scripts/environment/entrypoint.sh b/scripts/environment/entrypoint.sh
index 67121796d5908..b97484e991fc6 100755
--- a/scripts/environment/entrypoint.sh
+++ b/scripts/environment/entrypoint.sh
@@ -1,7 +1,16 @@
 #!/usr/bin/env bash
 
 # set HOSTNAME to container id for `cross`
-HOSTNAME="$(head -1 /proc/self/cgroup|cut -d/ -f3)"
-export HOSTNAME
+if [ -f /.docker-container-id ]; then
+  HOSTNAME="$(cat /.docker-container-id)"
+  export HOSTNAME
+fi
+
+if [ -z "$HOSTNAME" ]; then
+  echo "Failed to properly set HOSTNAME, cross may not work"
+  # Fallback if everything else fails
+  HOSTNAME="vector-environment"
+  export HOSTNAME
+fi
 
 exec "$@"

From f64089a198291de31f7c15affe423737600a6dc3 Mon Sep 17 00:00:00 2001
From: Vitalii Parfonov <vparfono@redhat.com>
Date: Thu, 31 Jul 2025 20:41:52 +0300
Subject: [PATCH 243/305] fix(buffers): Prevent negative buffer size and event
 gauges (#23453)

* fix(buffers): Prevent negative buffer size and event gauges

Signed-off-by: Vitalii Parfonov <vparfono@redhat.com>

* add changelog

Signed-off-by: Vitalii Parfonov <vparfono@redhat.com>

* fix formatting

Signed-off-by: Vitalii Parfonov <vparfonov@redhat.com>

* Update changelog.d/23453_prevent_negative_buffer_size_and_event_gauges.fix.md

Co-authored-by: Pavlos Rontidis <pavlos.rontidis@gmail.com>

* Handle value capping. Add recorder-based unit tests

Signed-off-by: Vitalii Parfonov <vparfono@redhat.com>

* Improve cast operation

* rename function with better name

Signed-off-by: Vitalii Parfonov <vparfono@redhat.com>

---------

Signed-off-by: Vitalii Parfonov <vparfono@redhat.com>
Signed-off-by: Vitalii Parfonov <vparfonov@redhat.com>
Co-authored-by: Pavlos Rontidis <pavlos.rontidis@gmail.com>
---
 Cargo.lock                                    |   2 +
 ...gative_buffer_size_and_event_gauges.fix.md |   3 +
 lib/vector-buffers/Cargo.toml                 |   2 +
 lib/vector-buffers/src/cast_utils.rs          |  19 ++
 lib/vector-buffers/src/internal_events.rs     | 248 ++++++++++++++++--
 lib/vector-buffers/src/lib.rs                 |   1 +
 6 files changed, 259 insertions(+), 16 deletions(-)
 create mode 100644 changelog.d/23453_prevent_negative_buffer_size_and_event_gauges.fix.md
 create mode 100644 lib/vector-buffers/src/cast_utils.rs

diff --git a/Cargo.lock b/Cargo.lock
index 474b411d70fa4..0be8517fea3bd 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -12095,6 +12095,7 @@ dependencies = [
  "criterion",
  "crossbeam-queue",
  "crossbeam-utils",
+ "dashmap",
  "derivative",
  "fslock",
  "futures 0.3.31",
@@ -12104,6 +12105,7 @@ dependencies = [
  "metrics-tracing-context",
  "metrics-util",
  "num-traits",
+ "ordered-float 4.6.0",
  "paste",
  "proptest",
  "quickcheck",
diff --git a/changelog.d/23453_prevent_negative_buffer_size_and_event_gauges.fix.md b/changelog.d/23453_prevent_negative_buffer_size_and_event_gauges.fix.md
new file mode 100644
index 0000000000000..95cbd2231abd7
--- /dev/null
+++ b/changelog.d/23453_prevent_negative_buffer_size_and_event_gauges.fix.md
@@ -0,0 +1,3 @@
+Fixed race condition bug causing negative values to be reported by the `vector_buffer_byte_size` and `vector_buffer_events` gauges.
+
+authors: vparfonov
diff --git a/lib/vector-buffers/Cargo.toml b/lib/vector-buffers/Cargo.toml
index 66b84459c7864..7c56d5b07a351 100644
--- a/lib/vector-buffers/Cargo.toml
+++ b/lib/vector-buffers/Cargo.toml
@@ -32,6 +32,8 @@ tokio = { version = "1.45.1", default-features = false, features = ["rt", "macro
 tracing = { version = "0.1.34", default-features = false, features = ["attributes"] }
 vector-config = { path = "../vector-config", default-features = false }
 vector-common = { path = "../vector-common", default-features = false, features = ["byte_size_of"] }
+dashmap = { version = "6.1", default-features = false }
+ordered-float = { version = "4.6.0", default-features = false }
 
 [dev-dependencies]
 clap.workspace = true
diff --git a/lib/vector-buffers/src/cast_utils.rs b/lib/vector-buffers/src/cast_utils.rs
new file mode 100644
index 0000000000000..f9161c5bff680
--- /dev/null
+++ b/lib/vector-buffers/src/cast_utils.rs
@@ -0,0 +1,19 @@
+// Maximum i64 value that can be represented exactly in f64 (2^53).
+pub const F64_SAFE_INT_MAX: i64 = 1_i64 << 53;
+
+pub fn i64_to_f64_safe(value: i64) -> f64 {
+    let capped = value.clamp(0, F64_SAFE_INT_MAX);
+    debug_assert!(capped <= F64_SAFE_INT_MAX);
+    #[allow(clippy::cast_precision_loss)]
+    {
+        capped as f64
+    }
+}
+
+pub fn u64_to_f64_safe(value: u64) -> f64 {
+    let capped = value.min(F64_SAFE_INT_MAX as u64);
+    #[allow(clippy::cast_precision_loss)]
+    {
+        capped as f64
+    }
+}
diff --git a/lib/vector-buffers/src/internal_events.rs b/lib/vector-buffers/src/internal_events.rs
index 055f09ebb6e62..ea024cf186e4d 100644
--- a/lib/vector-buffers/src/internal_events.rs
+++ b/lib/vector-buffers/src/internal_events.rs
@@ -1,11 +1,42 @@
+use dashmap::DashMap;
+use std::sync::atomic::{AtomicI64, Ordering};
+use std::sync::LazyLock;
 use std::time::Duration;
 
+use crate::cast_utils::{i64_to_f64_safe, u64_to_f64_safe};
 use metrics::{counter, gauge, histogram, Histogram};
 use vector_common::{
     internal_event::{error_type, InternalEvent},
     registered_event,
 };
 
+static BUFFER_COUNTERS: LazyLock<DashMap<usize, (AtomicI64, AtomicI64)>> =
+    LazyLock::new(DashMap::new);
+
+fn update_and_get(counter: &AtomicI64, delta: i64) -> i64 {
+    let mut new_val = 0;
+    counter
+        .fetch_update(Ordering::SeqCst, Ordering::SeqCst, |current| {
+            let updated = current.saturating_add(delta).clamp(0, i64::MAX);
+            new_val = updated;
+            Some(updated)
+        })
+        .ok();
+    new_val
+}
+
+fn update_buffer_gauge(stage: usize, events_delta: i64, bytes_delta: i64) {
+    let counters = BUFFER_COUNTERS
+        .entry(stage)
+        .or_insert_with(|| (AtomicI64::new(0), AtomicI64::new(0)));
+
+    let new_events = update_and_get(&counters.0, events_delta);
+    let new_bytes = update_and_get(&counters.1, bytes_delta);
+
+    gauge!("buffer_events", "stage" => stage.to_string()).set(i64_to_f64_safe(new_events));
+    gauge!("buffer_byte_size", "stage" => stage.to_string()).set(i64_to_f64_safe(new_bytes));
+}
+
 pub struct BufferCreated {
     pub idx: usize,
     pub max_size_events: usize,
@@ -13,15 +44,14 @@ pub struct BufferCreated {
 }
 
 impl InternalEvent for BufferCreated {
-    #[allow(clippy::cast_precision_loss)]
     fn emit(self) {
         if self.max_size_events != 0 {
             gauge!("buffer_max_event_size", "stage" => self.idx.to_string())
-                .set(self.max_size_events as f64);
+                .set(u64_to_f64_safe(self.max_size_events as u64));
         }
         if self.max_size_bytes != 0 {
             gauge!("buffer_max_byte_size", "stage" => self.idx.to_string())
-                .set(self.max_size_bytes as f64);
+                .set(u64_to_f64_safe(self.max_size_bytes));
         }
     }
 }
@@ -33,15 +63,15 @@ pub struct BufferEventsReceived {
 }
 
 impl InternalEvent for BufferEventsReceived {
-    #[allow(clippy::cast_precision_loss)]
     fn emit(self) {
         counter!("buffer_received_events_total", "stage" => self.idx.to_string())
             .increment(self.count);
         counter!("buffer_received_bytes_total", "stage" => self.idx.to_string())
             .increment(self.byte_size);
-        gauge!("buffer_events", "stage" => self.idx.to_string()).increment(self.count as f64);
-        gauge!("buffer_byte_size", "stage" => self.idx.to_string())
-            .increment(self.byte_size as f64);
+
+        let count_delta = i64::try_from(self.count).unwrap_or(i64::MAX);
+        let bytes_delta = i64::try_from(self.byte_size).unwrap_or(i64::MAX);
+        update_buffer_gauge(self.idx, count_delta, bytes_delta);
     }
 }
 
@@ -52,14 +82,14 @@ pub struct BufferEventsSent {
 }
 
 impl InternalEvent for BufferEventsSent {
-    #[allow(clippy::cast_precision_loss)]
     fn emit(self) {
         counter!("buffer_sent_events_total", "stage" => self.idx.to_string()).increment(self.count);
         counter!("buffer_sent_bytes_total", "stage" => self.idx.to_string())
             .increment(self.byte_size);
-        gauge!("buffer_events", "stage" => self.idx.to_string()).decrement(self.count as f64);
-        gauge!("buffer_byte_size", "stage" => self.idx.to_string())
-            .decrement(self.byte_size as f64);
+
+        let count_delta = i64::try_from(self.count).unwrap_or(i64::MAX);
+        let bytes_delta = i64::try_from(self.byte_size).unwrap_or(i64::MAX);
+        update_buffer_gauge(self.idx, -count_delta, -bytes_delta);
     }
 }
 
@@ -72,7 +102,6 @@ pub struct BufferEventsDropped {
 }
 
 impl InternalEvent for BufferEventsDropped {
-    #[allow(clippy::cast_precision_loss)]
     fn emit(self) {
         let intentional_str = if self.intentional { "true" } else { "false" };
         if self.intentional {
@@ -96,9 +125,10 @@ impl InternalEvent for BufferEventsDropped {
             "buffer_discarded_events_total", "intentional" => intentional_str,
         )
         .increment(self.count);
-        gauge!("buffer_events", "stage" => self.idx.to_string()).decrement(self.count as f64);
-        gauge!("buffer_byte_size", "stage" => self.idx.to_string())
-            .decrement(self.byte_size as f64);
+
+        let count_delta = i64::try_from(self.count).unwrap_or(i64::MAX);
+        let bytes_delta = i64::try_from(self.byte_size).unwrap_or(i64::MAX);
+        update_buffer_gauge(self.idx, -count_delta, -bytes_delta);
     }
 }
 
@@ -115,7 +145,6 @@ impl InternalEvent for BufferReadError {
             error_code = self.error_code,
             error_type = error_type::READER_FAILED,
             stage = "processing",
-
         );
         counter!(
             "buffer_errors_total", "error_code" => self.error_code,
@@ -137,3 +166,190 @@ registered_event! {
         self.send_duration.record(duration);
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::cast_utils::F64_SAFE_INT_MAX;
+    use metrics::{Key, Label};
+    use metrics_util::debugging::{DebugValue, DebuggingRecorder};
+    use metrics_util::{CompositeKey, MetricKind};
+    use ordered_float::OrderedFloat;
+    use std::sync::Mutex;
+    use std::thread;
+
+    static TEST_LOCK: LazyLock<Mutex<()>> = LazyLock::new(|| Mutex::new(()));
+
+    fn reset_counters() {
+        BUFFER_COUNTERS.clear();
+    }
+
+    fn get_counter_values(stage: usize) -> (i64, i64) {
+        match BUFFER_COUNTERS.get(&stage) {
+            Some(counters) => {
+                let events = counters.0.load(Ordering::Relaxed);
+                let bytes = counters.1.load(Ordering::Relaxed);
+                (events, bytes)
+            }
+            None => (0, 0),
+        }
+    }
+
+    fn assert_gauge_state(
+        stage: usize,
+        updates: &[(i64, i64)],
+        expected_events: f64,
+        expected_bytes: f64,
+    ) {
+        let _guard = TEST_LOCK.lock().unwrap();
+        reset_counters();
+
+        let recorder = DebuggingRecorder::default();
+        let snapshotter = recorder.snapshotter();
+
+        metrics::with_local_recorder(&recorder, move || {
+            for (events_delta, bytes_delta) in updates {
+                update_buffer_gauge(stage, *events_delta, *bytes_delta);
+            }
+
+            let mut metrics = snapshotter.snapshot().into_vec();
+
+            let stage_label = Label::new("stage", stage.to_string());
+            let mut expected_metrics = vec![
+                (
+                    CompositeKey::new(
+                        MetricKind::Gauge,
+                        Key::from_parts("buffer_events", vec![stage_label.clone()]),
+                    ),
+                    None,
+                    None,
+                    DebugValue::Gauge(OrderedFloat(expected_events)),
+                ),
+                (
+                    CompositeKey::new(
+                        MetricKind::Gauge,
+                        Key::from_parts("buffer_byte_size", vec![stage_label]),
+                    ),
+                    None,
+                    None,
+                    DebugValue::Gauge(OrderedFloat(expected_bytes)),
+                ),
+            ];
+
+            metrics.sort_by_key(|(key, ..)| key.clone());
+            expected_metrics.sort_by_key(|(key, ..)| key.clone());
+
+            assert_eq!(metrics, expected_metrics);
+        });
+    }
+
+    #[test]
+    fn test_increment() {
+        let _guard = TEST_LOCK.lock().unwrap();
+        reset_counters();
+
+        update_buffer_gauge(0, 10, 1024);
+        let (events, bytes) = get_counter_values(0);
+        assert_eq!(events, 10);
+        assert_eq!(bytes, 1024);
+    }
+
+    #[test]
+    fn test_increment_and_decrement() {
+        let _guard = TEST_LOCK.lock().unwrap();
+        reset_counters();
+
+        update_buffer_gauge(1, 100, 2048);
+        update_buffer_gauge(1, -50, -1024);
+        let (events, bytes) = get_counter_values(1);
+        assert_eq!(events, 50);
+        assert_eq!(bytes, 1024);
+    }
+
+    #[test]
+    fn test_decrement_below_zero_clamped_to_zero() {
+        let _guard = TEST_LOCK.lock().unwrap();
+        reset_counters();
+
+        update_buffer_gauge(2, 5, 100);
+        update_buffer_gauge(2, -10, -200);
+        let (events, bytes) = get_counter_values(2);
+
+        assert_eq!(events, 0);
+        assert_eq!(bytes, 0);
+    }
+
+    #[test]
+    fn test_multiple_stages_are_independent() {
+        let _guard = TEST_LOCK.lock().unwrap();
+        reset_counters();
+
+        update_buffer_gauge(0, 10, 100);
+        update_buffer_gauge(1, 20, 200);
+        let (events0, bytes0) = get_counter_values(0);
+        let (events1, bytes1) = get_counter_values(1);
+        assert_eq!(events0, 10);
+        assert_eq!(bytes0, 100);
+        assert_eq!(events1, 20);
+        assert_eq!(bytes1, 200);
+    }
+
+    #[test]
+    fn test_multithreaded_updates_are_correct() {
+        let _guard = TEST_LOCK.lock().unwrap();
+        reset_counters();
+
+        let num_threads = 10;
+        let increments_per_thread = 1000;
+        let mut handles = vec![];
+
+        for _ in 0..num_threads {
+            let handle = thread::spawn(move || {
+                for _ in 0..increments_per_thread {
+                    update_buffer_gauge(0, 1, 10);
+                }
+            });
+            handles.push(handle);
+        }
+
+        for handle in handles {
+            handle.join().unwrap();
+        }
+
+        let (final_events, final_bytes) = get_counter_values(0);
+        let expected_events = i64::from(num_threads * increments_per_thread);
+        let expected_bytes = i64::from(num_threads * increments_per_thread * 10);
+
+        assert_eq!(final_events, expected_events);
+        assert_eq!(final_bytes, expected_bytes);
+    }
+
+    #[test]
+    fn test_large_values_capped_to_f64_safe_max() {
+        let _guard = TEST_LOCK.lock().unwrap();
+        reset_counters();
+
+        update_buffer_gauge(3, F64_SAFE_INT_MAX * 2, F64_SAFE_INT_MAX * 2);
+
+        let (events, bytes) = get_counter_values(3);
+
+        assert!(events > F64_SAFE_INT_MAX);
+        assert!(bytes > F64_SAFE_INT_MAX);
+
+        let capped_events = events.min(F64_SAFE_INT_MAX);
+        let capped_bytes = bytes.min(F64_SAFE_INT_MAX);
+
+        assert_eq!(capped_events, F64_SAFE_INT_MAX);
+        assert_eq!(capped_bytes, F64_SAFE_INT_MAX);
+    }
+
+    #[test]
+    fn test_increment_with_recorder() {
+        assert_gauge_state(0, &[(100, 2048), (200, 1024)], 300.0, 3072.0);
+    }
+
+    #[test]
+    fn test_should_not_be_negative_with_recorder() {
+        assert_gauge_state(0, &[(100, 1024), (-200, -4096)], 0.0, 0.0);
+    }
+}
diff --git a/lib/vector-buffers/src/lib.rs b/lib/vector-buffers/src/lib.rs
index 795c8bb0eee06..6f89cf565e45f 100644
--- a/lib/vector-buffers/src/lib.rs
+++ b/lib/vector-buffers/src/lib.rs
@@ -31,6 +31,7 @@ mod internal_events;
 pub mod test;
 pub mod topology;
 
+mod cast_utils;
 pub(crate) mod variants;
 
 use std::fmt::Debug;

From af893011aea9fa39817deaf5c26b1c7bab890d1b Mon Sep 17 00:00:00 2001
From: Danila Matveev <optician_owl@fastmail.com>
Date: Fri, 1 Aug 2025 18:04:00 +0400
Subject: [PATCH 244/305] fix(config): allowed symbols in secrets #23220
 (#23465)

* fix(config): #23220 Allows hyphens in secrets.

* adds changelog for #23220

* fix(config): #23220 changelog

* fix(config): #23220 fix changelog markdown

---------

Co-authored-by: Pavlos Rontidis <pavlos.rontidis@gmail.com>
---
 changelog.d/23220_hyphens_in_secrets.fix.md | 3 +++
 src/config/loading/secret.rs                | 6 ++++--
 2 files changed, 7 insertions(+), 2 deletions(-)
 create mode 100644 changelog.d/23220_hyphens_in_secrets.fix.md

diff --git a/changelog.d/23220_hyphens_in_secrets.fix.md b/changelog.d/23220_hyphens_in_secrets.fix.md
new file mode 100644
index 0000000000000..af755628ce447
--- /dev/null
+++ b/changelog.d/23220_hyphens_in_secrets.fix.md
@@ -0,0 +1,3 @@
+Secrets names in the configuration allow hyphens.
+
+authors: optician
diff --git a/src/config/loading/secret.rs b/src/config/loading/secret.rs
index 2107ec6757b44..c3a9cf8f86bb8 100644
--- a/src/config/loading/secret.rs
+++ b/src/config/loading/secret.rs
@@ -28,7 +28,7 @@ use crate::{
 // - "SECRET[secret_name]" will not match
 // - "SECRET[.secret.name]" will not match
 pub static COLLECTOR: LazyLock<Regex> =
-    LazyLock::new(|| Regex::new(r"SECRET\[([[:word:]]+)\.([[:word:].]+)\]").unwrap());
+    LazyLock::new(|| Regex::new(r"SECRET\[([[:word:]]+)\.([[:word:].-]+)\]").unwrap());
 
 /// Helper type for specifically deserializing secrets backends.
 #[derive(Debug, Default, Deserialize, Serialize)]
@@ -201,6 +201,7 @@ mod tests {
         collect_secret_keys(
             indoc! {r"
             SECRET[first_backend.secret_key]
+            SECRET[first_backend.secret-key]
             SECRET[first_backend.another_secret_key]
             SECRET[second_backend.secret_key]
             SECRET[second_backend.secret.key]
@@ -216,8 +217,9 @@ mod tests {
         assert!(keys.contains_key("second_backend"));
 
         let first_backend_keys = keys.get("first_backend").unwrap();
-        assert_eq!(first_backend_keys.len(), 4);
+        assert_eq!(first_backend_keys.len(), 5);
         assert!(first_backend_keys.contains("secret_key"));
+        assert!(first_backend_keys.contains("secret-key"));
         assert!(first_backend_keys.contains("another_secret_key"));
         assert!(first_backend_keys.contains("a_third.secret_key"));
         assert!(first_backend_keys.contains("..an_extra_secret_key"));

From 46689f41145826611b82ad14b50ccc3fa2bfcc83 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Aug 2025 10:29:10 -0400
Subject: [PATCH 245/305] chore(deps): Bump crc32fast from 1.4.2 to 1.5.0
 (#23496)

Bumps [crc32fast](https://github.com/srijs/rust-crc32fast) from 1.4.2 to 1.5.0.
- [Commits](https://github.com/srijs/rust-crc32fast/compare/v1.4.2...v1.5.0)

---
updated-dependencies:
- dependency-name: crc32fast
  dependency-version: 1.5.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock                    | 4 ++--
 lib/vector-buffers/Cargo.toml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 0be8517fea3bd..38894de600ca4 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2625,9 +2625,9 @@ dependencies = [
 
 [[package]]
 name = "crc32fast"
-version = "1.4.2"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3"
+checksum = "9481c1c90cbf2ac953f07c8d4a58aa3945c425b7185c9154d67a65e4230da511"
 dependencies = [
  "cfg-if",
 ]
diff --git a/lib/vector-buffers/Cargo.toml b/lib/vector-buffers/Cargo.toml
index 7c56d5b07a351..c7e32a51f1840 100644
--- a/lib/vector-buffers/Cargo.toml
+++ b/lib/vector-buffers/Cargo.toml
@@ -14,7 +14,7 @@ async-stream = "0.3.6"
 async-trait = { version = "0.1", default-features = false }
 bytecheck = { version = "0.6.9", default-features = false, features = ["std"] }
 bytes = { version = "1.10.1", default-features = false }
-crc32fast = { version = "1.4.2", default-features = false }
+crc32fast = { version = "1.5.0", default-features = false }
 crossbeam-queue = { version = "0.3.12", default-features = false, features = ["std"] }
 crossbeam-utils = { version = "0.8.21", default-features = false }
 derivative = { version = "2.2.0", default-features =  false }

From 8e33bb236b3fe8492b7a8cbe621db57e229bdba8 Mon Sep 17 00:00:00 2001
From: Thomas <thomas.schneider@datadoghq.com>
Date: Fri, 1 Aug 2025 10:29:13 -0400
Subject: [PATCH 246/305] chore(deps): update deps and add some workspace deps
 (#23476)

* Make socket2 and itertools workspace deps

* Use workspace deps in crates
---
 Cargo.toml                 | 12 +++++++-----
 lib/vector-core/Cargo.toml |  2 +-
 vdev/Cargo.toml            |  2 +-
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 055f4c77e5949..09ed90b0da658 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -146,8 +146,9 @@ glob = { version = "0.3.2", default-features = false }
 hickory-proto = { version = "0.25.2", default-features = false, features = ["dnssec-ring"] }
 humantime = { version = "2.2.0", default-features = false }
 indexmap = { version = "2.10.0", default-features = false, features = ["serde", "std"] }
-inventory = { version = "0.3" }
 indoc = { version = "2.0.6" }
+inventory = { version = "0.3" }
+itertools = { version = "0.14.0", default-features = false, features = ["use_alloc"] }
 metrics = "0.24.2"
 metrics-tracing-context = { version = "0.17.0", default-features = false }
 metrics-util = { version = "0.18.0", default-features = false, features = ["registry"] }
@@ -163,9 +164,10 @@ prost-types = { version = "0.12", default-features = false }
 rand = { version = "0.9.1", default-features = false, features = ["small_rng", "thread_rng"] }
 rand_distr = { version = "0.5.1", default-features = false }
 semver = { version = "1.0.26", default-features = false, features = ["serde", "std"] }
-serde_json = { version = "1.0.140", default-features = false, features = ["raw_value", "std"] }
 serde = { version = "1.0.219", default-features = false, features = ["alloc", "derive", "rc"] }
+serde_json = { version = "1.0.140", default-features = false, features = ["raw_value", "std"] }
 snafu = { version = "0.8.6", default-features = false, features = ["futures", "std"] }
+socket2 = { version = "0.5.10", default-features = false }
 tempfile = "3.20.0"
 tokio = { version = "1.45.1", default-features = false, features = ["full"] }
 toml = { version = "0.9.4", default-features = false, features = ["serde", "display", "parse"] }
@@ -354,7 +356,7 @@ hyper-proxy = { version = "0.9.1", default-features = false, features = ["openss
 indexmap.workspace = true
 inventory = { version = "0.3.20", default-features = false }
 ipnet = { version = "2", default-features = false, optional = true, features = ["serde", "std"] }
-itertools = { version = "0.14.0", default-features = false, optional = false, features = ["use_alloc"] }
+itertools.workspace = true
 k8s-openapi = { version = "0.22.0", default-features = false, features = ["v1_26"], optional = true }
 kube = { version = "0.93.0", default-features = false, features = ["client", "openssl-tls", "runtime"], optional = true }
 listenfd = { version = "1.0.2", default-features = false, optional = true }
@@ -383,7 +385,7 @@ rumqttc = { version = "0.24.0", default-features = false, features = ["use-rustl
 seahash = { version = "4.1.0", default-features = false }
 smallvec = { version = "1", default-features = false, features = ["union", "serde"] }
 snap = { version = "1.1.1", default-features = false }
-socket2 = { version = "0.5.10", default-features = false }
+socket2.workspace = true
 sqlx = { version = "0.8.6", default-features = false, features = ["derive", "postgres", "chrono", "runtime-tokio"], optional=true }
 stream-cancel = { version = "0.8.2", default-features = false }
 strip-ansi-escapes = { version = "0.2.1", default-features = false }
@@ -438,7 +440,7 @@ azure_storage_blobs = { version = "0.17", default-features = false, features = [
 azure_storage = { version = "0.17", default-features = false }
 base64 = "0.22.1"
 criterion = { version = "0.6.0", features = ["html_reports", "async_tokio"] }
-itertools = { version = "0.14.0", default-features = false, features = ["use_alloc"] }
+itertools.workspace = true
 libc = "0.2.174"
 similar-asserts = "1.7.0"
 proptest.workspace = true
diff --git a/lib/vector-core/Cargo.toml b/lib/vector-core/Cargo.toml
index b76c1b06f868f..21be31064bb13 100644
--- a/lib/vector-core/Cargo.toml
+++ b/lib/vector-core/Cargo.toml
@@ -48,7 +48,7 @@ serde_json.workspace = true
 serde_with = { version = "3.14.0", default-features = false, features = ["std", "macros"] }
 smallvec = { version = "1", default-features = false, features = ["serde", "const_generics"] }
 snafu.workspace = true
-socket2 = { version = "0.5.10", default-features = false }
+socket2.workspace = true
 tokio = { version = "1.45.1", default-features = false, features = ["net"] }
 tokio-openssl = { version = "0.6.5", default-features = false }
 tokio-stream = { version = "0.1", default-features = false, features = ["time"], optional = true }
diff --git a/vdev/Cargo.toml b/vdev/Cargo.toml
index 3ab3a9f02fe8e..9cbfcb90a5616 100644
--- a/vdev/Cargo.toml
+++ b/vdev/Cargo.toml
@@ -21,7 +21,7 @@ glob.workspace = true
 hex = "0.4.3"
 indexmap.workspace = true
 indicatif = { version = "0.18.0", features = ["improved_unicode"] }
-itertools = "0.14.0"
+itertools.workspace = true
 log = "0.4.27"
 # watch https://github.com/epage/anstyle for official interop with Clap
 owo-colors = { version = "4.2.2", features = ["supports-colors"] }

From 64e26937616e5f71321a97d1e61beb297a96ac97 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Aug 2025 14:32:56 +0000
Subject: [PATCH 247/305] chore(deps): Bump proptest-derive from 0.5.1 to 0.6.0
 (#23494)

Bumps [proptest-derive](https://github.com/proptest-rs/proptest) from 0.5.1 to 0.6.0.
- [Release notes](https://github.com/proptest-rs/proptest/releases)
- [Changelog](https://github.com/proptest-rs/proptest/blob/0.6.0/CHANGELOG.md)
- [Commits](https://github.com/proptest-rs/proptest/compare/0.5.1...0.6.0)

---
updated-dependencies:
- dependency-name: proptest-derive
  dependency-version: 0.6.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock | 17 +++--------------
 Cargo.toml |  2 +-
 2 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 38894de600ca4..5549a709bd580 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -7926,17 +7926,6 @@ dependencies = [
  "unarray",
 ]
 
-[[package]]
-name = "proptest-derive"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ee1c9ac207483d5e7db4940700de86a9aae46ef90c48b57f99fe7edb8345e49"
-dependencies = [
- "proc-macro2 1.0.95",
- "quote 1.0.40",
- "syn 2.0.104",
-]
-
 [[package]]
 name = "proptest-derive"
 version = "0.6.0"
@@ -11984,7 +11973,7 @@ dependencies = [
  "portpicker",
  "postgres-openssl",
  "proptest",
- "proptest-derive 0.5.1",
+ "proptest-derive",
  "prost 0.12.6",
  "prost-build 0.12.6",
  "prost-reflect",
@@ -12306,7 +12295,7 @@ name = "vector-lookup"
 version = "0.1.0"
 dependencies = [
  "proptest",
- "proptest-derive 0.5.1",
+ "proptest-derive",
  "serde",
  "vector-config",
  "vector-config-macros",
@@ -12485,7 +12474,7 @@ dependencies = [
  "prettydiff",
  "prettytable-rs",
  "proptest",
- "proptest-derive 0.6.0",
+ "proptest-derive",
  "prost 0.13.5",
  "prost-reflect",
  "psl",
diff --git a/Cargo.toml b/Cargo.toml
index 09ed90b0da658..2b543b79e6900 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -156,7 +156,7 @@ nom = { version = "8.0.0", default-features = false }
 paste = { version = "1.0.15" }
 pin-project = { version = "1.1.10", default-features = false }
 proptest = { version = "1.7" }
-proptest-derive = { version = "0.5.1" }
+proptest-derive = { version = "0.6.0" }
 prost = { version = "0.12", default-features = false, features = ["std"] }
 prost-build = { version = "0.12", default-features = false }
 prost-reflect = { version = "0.14", features = ["serde"], default-features = false }

From 81e238e0fc5dab87af618574bc363fcb5fb6a7cf Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Aug 2025 14:35:42 +0000
Subject: [PATCH 248/305] chore(deps): Bump lru from 0.15.0 to 0.16.0 (#23495)

Bumps [lru](https://github.com/jeromefroe/lru-rs) from 0.15.0 to 0.16.0.
- [Changelog](https://github.com/jeromefroe/lru-rs/blob/master/CHANGELOG.md)
- [Commits](https://github.com/jeromefroe/lru-rs/compare/0.15.0...0.16.0)

---
updated-dependencies:
- dependency-name: lru
  dependency-version: 0.16.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock | 6 +++---
 Cargo.toml | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 5549a709bd580..6ccbc577868ef 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6026,9 +6026,9 @@ dependencies = [
 
 [[package]]
 name = "lru"
-version = "0.15.0"
+version = "0.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0281c2e25e62316a5c9d98f2d2e9e95a37841afdaf4383c177dbb5c1dfab0568"
+checksum = "86ea4e65087ff52f3862caff188d489f1fab49a0cb09e01b2e3f1a617b10aaed"
 
 [[package]]
 name = "lru-cache"
@@ -11945,7 +11945,7 @@ dependencies = [
  "libc",
  "listenfd",
  "loki-logproto",
- "lru 0.15.0",
+ "lru 0.16.0",
  "maxminddb",
  "md-5",
  "metrics",
diff --git a/Cargo.toml b/Cargo.toml
index 2b543b79e6900..12458eada7761 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -360,7 +360,7 @@ itertools.workspace = true
 k8s-openapi = { version = "0.22.0", default-features = false, features = ["v1_26"], optional = true }
 kube = { version = "0.93.0", default-features = false, features = ["client", "openssl-tls", "runtime"], optional = true }
 listenfd = { version = "1.0.2", default-features = false, optional = true }
-lru = { version = "0.15.0", default-features = false, optional = true }
+lru = { version = "0.16.0", default-features = false, optional = true }
 maxminddb = { version = "0.26.0", default-features = false, optional = true, features = ["simdutf8"] }
 md-5 = { version = "0.10", default-features = false, optional = true }
 mongodb = { version = "2.8.2", default-features = false, features = ["tokio-runtime"], optional = true }

From 10795e9d7fd080cd49976eecb8654a69a2d0c05a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Aug 2025 14:39:21 +0000
Subject: [PATCH 249/305] chore(deps): Bump rstest from 0.25.0 to 0.26.1
 (#23492)

Bumps [rstest](https://github.com/la10736/rstest) from 0.25.0 to 0.26.1.
- [Release notes](https://github.com/la10736/rstest/releases)
- [Changelog](https://github.com/la10736/rstest/blob/master/CHANGELOG.md)
- [Commits](https://github.com/la10736/rstest/compare/v0.25.0...v0.26.1)

---
updated-dependencies:
- dependency-name: rstest
  dependency-version: 0.26.1
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock            | 9 ++++-----
 Cargo.toml            | 2 +-
 lib/codecs/Cargo.toml | 2 +-
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 6ccbc577868ef..3fbc6db9e27b8 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -9032,21 +9032,20 @@ dependencies = [
 
 [[package]]
 name = "rstest"
-version = "0.25.0"
+version = "0.26.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6fc39292f8613e913f7df8fa892b8944ceb47c247b78e1b1ae2f09e019be789d"
+checksum = "f5a3193c063baaa2a95a33f03035c8a72b83d97a54916055ba22d35ed3839d49"
 dependencies = [
  "futures-timer",
  "futures-util",
  "rstest_macros",
- "rustc_version 0.4.1",
 ]
 
 [[package]]
 name = "rstest_macros"
-version = "0.25.0"
+version = "0.26.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f168d99749d307be9de54d23fd226628d99768225ef08f6ffb52e0182a27746"
+checksum = "9c845311f0ff7951c5506121a9ad75aec44d083c31583b2ea5a30bcb0b0abba0"
 dependencies = [
  "cfg-if",
  "glob",
diff --git a/Cargo.toml b/Cargo.toml
index 12458eada7761..0a0a9821b4458 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -446,7 +446,7 @@ similar-asserts = "1.7.0"
 proptest.workspace = true
 quickcheck = "1.0.3"
 reqwest = { version = "0.11", features = ["json"] }
-rstest = { version = "0.25.0" }
+rstest = { version = "0.26.1" }
 tempfile.workspace = true
 test-generator = "0.3.1"
 tokio = { version = "1.45.1", features = ["test-util"] }
diff --git a/lib/codecs/Cargo.toml b/lib/codecs/Cargo.toml
index 1ab5c53027a9f..3a26a46eb3fa7 100644
--- a/lib/codecs/Cargo.toml
+++ b/lib/codecs/Cargo.toml
@@ -46,7 +46,7 @@ indoc.workspace = true
 tokio = { version = "1", features = ["test-util"] }
 similar-asserts = "1.7.0"
 vector-core = { path = "../vector-core", default-features = false, features = ["vrl", "test"] }
-rstest = "0.25.0"
+rstest = "0.26.1"
 tracing-test = "0.2.5"
 uuid.workspace = true
 vrl.workspace = true

From 9bd70fddcba34e4f8f65c961a17a179349fa0c64 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Aug 2025 15:50:04 +0000
Subject: [PATCH 250/305] chore(deps): Bump opendal from 0.53.3 to 0.54.0
 (#23490)

* chore(deps): Bump opendal from 0.53.3 to 0.54.0

Bumps [opendal](https://github.com/apache/opendal) from 0.53.3 to 0.54.0.
- [Release notes](https://github.com/apache/opendal/releases)
- [Changelog](https://github.com/apache/opendal/blob/main/CHANGELOG.md)
- [Commits](https://github.com/apache/opendal/compare/v0.53.3...v0.54.0)

---
updated-dependencies:
- dependency-name: opendal
  dependency-version: 0.54.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* update licenses

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Pavlos Rontidis <pavlos.rontidis@gmail.com>
---
 Cargo.lock           | 36 +++++++++++++++++++++++++++++-------
 Cargo.toml           |  2 +-
 LICENSE-3rdparty.csv |  1 +
 3 files changed, 31 insertions(+), 8 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 3fbc6db9e27b8..b770bb7ee5808 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5366,6 +5366,17 @@ dependencies = [
  "windows-sys 0.48.0",
 ]
 
+[[package]]
+name = "io-uring"
+version = "0.7.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d93587f37623a1a17d94ef2bc9ada592f5465fe7732084ab7beefabe5c77c0c4"
+dependencies = [
+ "bitflags 2.9.0",
+ "cfg-if",
+ "libc",
+]
+
 [[package]]
 name = "iovec"
 version = "0.1.4"
@@ -7087,12 +7098,11 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"
 
 [[package]]
 name = "opendal"
-version = "0.53.3"
+version = "0.54.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f947c4efbca344c1a125753366033c8107f552b2e3f8251815ed1908f116ca3e"
+checksum = "ffb9838d0575c6dbaf3fcec7255af8d5771996d4af900bbb6fa9a314dec00a1a"
 dependencies = [
  "anyhow",
- "async-trait",
  "backon",
  "base64 0.22.1",
  "bytes 1.10.1",
@@ -10026,6 +10036,16 @@ dependencies = [
  "windows-sys 0.52.0",
 ]
 
+[[package]]
+name = "socket2"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "233504af464074f9d066d7b5416c5f9b894a5862a6506e306f7b816cdd6f1807"
+dependencies = [
+ "libc",
+ "windows-sys 0.59.0",
+]
+
 [[package]]
 name = "spin"
 version = "0.5.2"
@@ -10755,21 +10775,23 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.45.1"
+version = "1.47.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75ef51a33ef1da925cea3e4eb122833cb377c61439ca401b770f54902b806779"
+checksum = "89e49afdadebb872d3145a5638b59eb0691ea23e46ca484037cfab3b76b95038"
 dependencies = [
  "backtrace",
  "bytes 1.10.1",
+ "io-uring",
  "libc",
  "mio",
  "parking_lot",
  "pin-project-lite",
  "signal-hook-registry",
- "socket2 0.5.10",
+ "slab",
+ "socket2 0.6.0",
  "tokio-macros",
  "tracing 0.1.41",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
diff --git a/Cargo.toml b/Cargo.toml
index 0a0a9821b4458..b389f1b04fd0e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -266,7 +266,7 @@ azure_storage = { version = "0.17", default-features = false, optional = true }
 azure_storage_blobs = { version = "0.17", default-features = false, optional = true }
 
 # OpenDAL
-opendal = { version = "0.53", default-features = false, features = ["services-webhdfs"], optional = true }
+opendal = { version = "0.54", default-features = false, features = ["services-webhdfs"], optional = true }
 
 # Tower
 tower = { version = "0.5.2", default-features = false, features = ["buffer", "limit", "retry", "timeout", "util", "balance", "discover"] }
diff --git a/LICENSE-3rdparty.csv b/LICENSE-3rdparty.csv
index 54200d6409361..600c883362c7e 100644
--- a/LICENSE-3rdparty.csv
+++ b/LICENSE-3rdparty.csv
@@ -336,6 +336,7 @@ instability,https://github.com/ratatui-org/instability,MIT,"Stephen M. Coakley <
 instant,https://github.com/sebcrozet/instant,BSD-3-Clause,sebcrozet <developer@crozet.re>
 inventory,https://github.com/dtolnay/inventory,MIT OR Apache-2.0,David Tolnay <dtolnay@gmail.com>
 io-lifetimes,https://github.com/sunfishcode/io-lifetimes,Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT,Dan Gohman <dev@sunfishcode.online>
+io-uring,https://github.com/tokio-rs/io-uring,MIT OR Apache-2.0,quininer <quininer@live.com>
 iovec,https://github.com/carllerche/iovec,MIT OR Apache-2.0,Carl Lerche <me@carllerche.com>
 ipconfig,https://github.com/liranringel/ipconfig,MIT OR Apache-2.0,Liran Ringel <liranringel@gmail.com>
 ipnet,https://github.com/krisprice/ipnet,MIT OR Apache-2.0,Kris Price <kris@krisprice.nz>

From 6a17a5423d886d98e96d8a4bc24bbfb03a6785d3 Mon Sep 17 00:00:00 2001
From: Benjamin Dornel <benjamindornel@gmail.com>
Date: Fri, 1 Aug 2025 23:55:48 +0800
Subject: [PATCH 251/305] feat(new source): add initial `websocket` source
 (#23449)

* Refactor: extract websocket connect logic

* Refactor: extract backoff

* Refactor: extract ping utility

* Refactor: extract is_closed

* Add WsMessageReceived internal event

* Add websocket source implementation

* Handle binary messages

* [review] make check-clippy happy

* [review] Remove name field from WebSocketEvent

It was suggested to use the `WebSocketConfig::NAME` constant (it's
macro-generated), but it seemed more sensible to define an ad hoc
constant instead of importing the struct just to use this const.

* [review] Make WsMessageReceived compliant with the component specification

* [review] Move ping back into websocket common logic

* [review] improve visibility of pub items

* [review] feature-gate websocket source and move it

* chore: fix imports & clippy

* chore: drop enterprise code

* refactor: use common config for websocket source & sink

* fix: remove manual pong reply to prevent timeout

* chore: add missing source type metadata

* docs: add more generic docstring for websocket config

* chore: add missing punctuation for logs

* chore: add tests to validate schema

* chore: add internal events for websocket source errors

* chore: add integration test for websocket source

* feat: allow initial_message to be sent to server

* feat: add support for custom ping and pong

* chore: clean up ping variable

* chore: simplify main loop

* chore: remove redundant get_decoding_config helper

* refactor: improve encapsulation of websocket source

* chore: rename send_initial_message -> maybe_send_initial_message

* refactor: move reconnect logic to separate function

* refactor: move ping logic + timeout checking to wrapper

* chore: add test for binary events

* chore: add test for reconnection

* chore: avoid infinite reconnect

* chore: add test for rejected initial message

* chore: add pong timeout test

* chore: add test for connection timeout

* chore: update config for websocket

* chore: add changelog fragment

* chore: handle arms for message in separate function

* chore: improve ordering of functions

* chore: drop dangling binary decode error

* chore: clippy

* fix: ping timeout not triggering correctly

* refactor: move string matching logic to pong enum

* chore: make record_pong into const

* chore: update test for custom pong

* docs: update websocket source

* refactor: improve error handling with dedicated enum

* chore: add 'reconnected' log message

* refactor: use websocket instead of ws shorthand for types

* chore: add new docs for websocket source

* chore: add missing dep for integration test

* chore: add missing import for integration test

* chore: exposet internal events for integration test

* chore: only enable healthcheck for sink

* chore: fix docs

* chore: update docs

---------

Co-authored-by: Leonardo Barcaroli <leonardo@koyeb.com>
Co-authored-by: Pavlos Rontidis <pavlos.rontidis@gmail.com>
---
 Cargo.toml                                    |   5 +
 .../6491_add_websocket_source.feature.md      |   3 +
 src/common/backoff.rs                         |  81 ++
 src/common/mod.rs                             |   4 +
 src/common/websocket.rs                       | 241 ++++++
 src/internal_events/mod.rs                    |   4 +-
 src/internal_events/websocket.rs              | 189 +++-
 src/internal_events/websocket_server.rs       |  26 +-
 src/sinks/util/retries.rs                     |  80 --
 src/sinks/util/service/health.rs              |   2 +-
 src/sinks/util/service/net/mod.rs             |   3 +-
 src/sinks/util/tcp.rs                         |   2 +-
 src/sinks/util/udp.rs                         |   6 +-
 src/sinks/util/unix.rs                        |   2 +-
 src/sinks/websocket/config.rs                 |  57 +-
 src/sinks/websocket/sink.rs                   | 282 ++----
 src/sinks/websocket_server/sink.rs            |  20 +-
 src/sources/mod.rs                            |   2 +
 src/sources/websocket/config.rs               | 267 ++++++
 src/sources/websocket/mod.rs                  |   2 +
 src/sources/websocket/source.rs               | 729 ++++++++++++++++
 .../configuration/sinks/websocket.md          |   2 +-
 .../configuration/sinks/websocket_server.md   |   2 +-
 .../configuration/sources/websocket.md        |  14 +
 .../components/sinks/generated/websocket.cue  |  28 +-
 .../sources/generated/websocket.cue           | 812 ++++++++++++++++++
 .../components/sources/websocket.cue          | 121 +++
 27 files changed, 2578 insertions(+), 408 deletions(-)
 create mode 100644 changelog.d/6491_add_websocket_source.feature.md
 create mode 100644 src/common/backoff.rs
 create mode 100644 src/common/websocket.rs
 create mode 100644 src/sources/websocket/config.rs
 create mode 100644 src/sources/websocket/mod.rs
 create mode 100644 src/sources/websocket/source.rs
 create mode 100644 website/content/en/docs/reference/configuration/sources/websocket.md
 create mode 100644 website/cue/reference/components/sources/generated/websocket.cue
 create mode 100644 website/cue/reference/components/sources/websocket.cue

diff --git a/Cargo.toml b/Cargo.toml
index b389f1b04fd0e..ff91c5a4d38c0 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -597,6 +597,7 @@ sources-logs = [
   "sources-stdin",
   "sources-syslog",
   "sources-vector",
+  "sources-websocket",
 ]
 sources-metrics = [
   "dep:prost",
@@ -612,6 +613,7 @@ sources-metrics = [
   "sources-static_metrics",
   "sources-statsd",
   "sources-vector",
+  "sources-websocket",
 ]
 
 sources-amqp = ["lapin"]
@@ -670,6 +672,7 @@ sources-utils-net = ["sources-utils-net-tcp", "sources-utils-net-udp", "sources-
 sources-utils-net-tcp = ["listenfd", "dep:ipnet"]
 sources-utils-net-udp = ["listenfd"]
 sources-utils-net-unix = []
+sources-websocket = ["dep:tokio-tungstenite"]
 
 sources-vector = ["dep:prost", "dep:tonic", "protobuf-build"]
 
@@ -888,6 +891,7 @@ all-integration-tests = [
   "redis-integration-tests",
   "splunk-integration-tests",
   "webhdfs-integration-tests",
+  "websocket-integration-tests",
 ]
 
 amqp-integration-tests = ["sources-amqp", "sinks-amqp"]
@@ -954,6 +958,7 @@ redis-integration-tests = ["sinks-redis", "sources-redis"]
 splunk-integration-tests = ["sinks-splunk_hec"]
 dnstap-integration-tests = ["sources-dnstap", "dep:bollard"]
 webhdfs-integration-tests = ["sinks-webhdfs"]
+websocket-integration-tests = ["sources-websocket", "dep:tokio-tungstenite"]
 disable-resolv-conf = []
 shutdown-tests = ["api", "sinks-blackhole", "sinks-console", "sinks-prometheus", "sources", "transforms-lua", "transforms-remap", "unix"]
 cli-tests = ["sinks-blackhole", "sinks-socket", "sources-demo_logs", "sources-file"]
diff --git a/changelog.d/6491_add_websocket_source.feature.md b/changelog.d/6491_add_websocket_source.feature.md
new file mode 100644
index 0000000000000..4b48e30403312
--- /dev/null
+++ b/changelog.d/6491_add_websocket_source.feature.md
@@ -0,0 +1,3 @@
+Adds a new `websocket` source.
+
+authors: benjamin-awd
diff --git a/src/common/backoff.rs b/src/common/backoff.rs
new file mode 100644
index 0000000000000..9c18593678f6c
--- /dev/null
+++ b/src/common/backoff.rs
@@ -0,0 +1,81 @@
+use std::time::Duration;
+
+// `tokio-retry` crate
+// MIT License
+// Copyright (c) 2017 Sam Rijs
+//
+/// A retry strategy driven by exponential back-off.
+///
+/// The power corresponds to the number of past attempts.
+#[derive(Debug, Clone)]
+pub(crate) struct ExponentialBackoff {
+    current: u64,
+    base: u64,
+    factor: u64,
+    max_delay: Option<Duration>,
+}
+
+impl ExponentialBackoff {
+    /// Constructs a new exponential back-off strategy,
+    /// given a base duration in milliseconds.
+    ///
+    /// The resulting duration is calculated by taking the base to the `n`-th power,
+    /// where `n` denotes the number of past attempts.
+    pub(crate) const fn from_millis(base: u64) -> ExponentialBackoff {
+        ExponentialBackoff {
+            current: base,
+            base,
+            factor: 1u64,
+            max_delay: None,
+        }
+    }
+
+    /// A multiplicative factor that will be applied to the retry delay.
+    ///
+    /// For example, using a factor of `1000` will make each delay in units of seconds.
+    ///
+    /// Default factor is `1`.
+    pub(crate) const fn factor(mut self, factor: u64) -> ExponentialBackoff {
+        self.factor = factor;
+        self
+    }
+
+    /// Apply a maximum delay. No retry delay will be longer than this `Duration`.
+    pub(crate) const fn max_delay(mut self, duration: Duration) -> ExponentialBackoff {
+        self.max_delay = Some(duration);
+        self
+    }
+
+    /// Resents the exponential back-off strategy to its initial state.
+    pub(crate) const fn reset(&mut self) {
+        self.current = self.base;
+    }
+}
+
+impl Iterator for ExponentialBackoff {
+    type Item = Duration;
+
+    fn next(&mut self) -> Option<Duration> {
+        // set delay duration by applying factor
+        let duration = if let Some(duration) = self.current.checked_mul(self.factor) {
+            Duration::from_millis(duration)
+        } else {
+            Duration::from_millis(u64::MAX)
+        };
+
+        // check if we reached max delay
+        if let Some(ref max_delay) = self.max_delay {
+            if duration > *max_delay {
+                return Some(*max_delay);
+            }
+        }
+
+        if let Some(next) = self.current.checked_mul(self.base) {
+            self.current = next;
+        } else {
+            self.current = u64::MAX;
+        }
+
+        Some(duration)
+    }
+}
diff --git a/src/common/mod.rs b/src/common/mod.rs
index 9caf79b8c7fbd..1c9a6eb45e6d6 100644
--- a/src/common/mod.rs
+++ b/src/common/mod.rs
@@ -18,6 +18,10 @@ pub(crate) mod sqs;
 #[cfg(any(feature = "sources-aws_s3", feature = "sinks-aws_s3"))]
 pub(crate) mod s3;
 
+#[cfg(any(feature = "sources-websocket", feature = "sinks-websocket"))]
+pub(crate) mod websocket;
+
+pub(crate) mod backoff;
 #[cfg(any(feature = "sources-mqtt", feature = "sinks-mqtt",))]
 /// Common MQTT configuration shared by MQTT components.
 pub mod mqtt;
diff --git a/src/common/websocket.rs b/src/common/websocket.rs
new file mode 100644
index 0000000000000..f545bc92adb1b
--- /dev/null
+++ b/src/common/websocket.rs
@@ -0,0 +1,241 @@
+use std::{
+    fmt::Debug,
+    net::SocketAddr,
+    num::NonZeroU64,
+    task::{Context, Poll},
+    time::Duration,
+};
+use vector_config_macros::configurable_component;
+
+use snafu::{ResultExt, Snafu};
+use tokio::{net::TcpStream, time};
+use tokio_tungstenite::{
+    client_async_with_config,
+    tungstenite::{
+        client::{uri_mode, IntoClientRequest},
+        error::{Error as TungsteniteError, ProtocolError, UrlError},
+        handshake::client::Request,
+        protocol::WebSocketConfig,
+        stream::Mode as UriMode,
+    },
+    WebSocketStream,
+};
+
+use crate::{
+    common::backoff::ExponentialBackoff,
+    dns,
+    http::Auth,
+    internal_events::{WebSocketConnectionEstablished, WebSocketConnectionFailedError},
+    tls::{MaybeTlsSettings, MaybeTlsStream, TlsEnableableConfig, TlsError},
+};
+
+#[allow(unreachable_pub)]
+#[derive(Debug, Snafu)]
+#[snafu(visibility(pub))]
+pub enum WebSocketError {
+    #[snafu(display("Creating WebSocket client failed: {}", source))]
+    CreateFailed { source: TungsteniteError },
+    #[snafu(display("Connect error: {}", source))]
+    ConnectError { source: TlsError },
+    #[snafu(display("Unable to resolve DNS: {}", source))]
+    DnsError { source: dns::DnsError },
+    #[snafu(display("No addresses returned."))]
+    NoAddresses,
+}
+
+#[derive(Clone)]
+pub(crate) struct WebSocketConnector {
+    uri: String,
+    host: String,
+    port: u16,
+    tls: MaybeTlsSettings,
+    auth: Option<Auth>,
+}
+
+impl WebSocketConnector {
+    pub(crate) fn new(
+        uri: String,
+        tls: MaybeTlsSettings,
+        auth: Option<Auth>,
+    ) -> Result<Self, WebSocketError> {
+        let request = (&uri).into_client_request().context(CreateFailedSnafu)?;
+        let (host, port) = Self::extract_host_and_port(&request).context(CreateFailedSnafu)?;
+
+        Ok(Self {
+            uri,
+            host,
+            port,
+            tls,
+            auth,
+        })
+    }
+
+    fn extract_host_and_port(request: &Request) -> Result<(String, u16), TungsteniteError> {
+        let host = request
+            .uri()
+            .host()
+            .ok_or(TungsteniteError::Url(UrlError::NoHostName))?
+            .to_string();
+        let mode = uri_mode(request.uri())?;
+        let port = request.uri().port_u16().unwrap_or(match mode {
+            UriMode::Tls => 443,
+            UriMode::Plain => 80,
+        });
+
+        Ok((host, port))
+    }
+
+    const fn fresh_backoff() -> ExponentialBackoff {
+        ExponentialBackoff::from_millis(2)
+            .factor(250)
+            .max_delay(Duration::from_secs(60))
+    }
+
+    async fn tls_connect(&self) -> Result<MaybeTlsStream<TcpStream>, WebSocketError> {
+        let ip = dns::Resolver
+            .lookup_ip(self.host.clone())
+            .await
+            .context(DnsSnafu)?
+            .next()
+            .ok_or(WebSocketError::NoAddresses)?;
+
+        let addr = SocketAddr::new(ip, self.port);
+        self.tls
+            .connect(&self.host, &addr)
+            .await
+            .context(ConnectSnafu)
+    }
+
+    async fn connect(&self) -> Result<WebSocketStream<MaybeTlsStream<TcpStream>>, WebSocketError> {
+        let mut request = (&self.uri)
+            .into_client_request()
+            .context(CreateFailedSnafu)?;
+
+        if let Some(auth) = &self.auth {
+            auth.apply(&mut request);
+        }
+
+        let maybe_tls = self.tls_connect().await?;
+
+        let ws_config = WebSocketConfig::default();
+
+        let (ws_stream, _response) = client_async_with_config(request, maybe_tls, Some(ws_config))
+            .await
+            .context(CreateFailedSnafu)?;
+
+        Ok(ws_stream)
+    }
+
+    pub(crate) async fn connect_backoff(&self) -> WebSocketStream<MaybeTlsStream<TcpStream>> {
+        let mut backoff = Self::fresh_backoff();
+        loop {
+            match self.connect().await {
+                Ok(ws_stream) => {
+                    emit!(WebSocketConnectionEstablished {});
+                    return ws_stream;
+                }
+                Err(error) => {
+                    emit!(WebSocketConnectionFailedError {
+                        error: Box::new(error)
+                    });
+                    time::sleep(backoff.next().unwrap()).await;
+                }
+            }
+        }
+    }
+
+    #[cfg(feature = "sinks-websocket")]
+    pub(crate) async fn healthcheck(&self) -> crate::Result<()> {
+        self.connect().await.map(|_| ()).map_err(Into::into)
+    }
+}
+
+pub(crate) const fn is_closed(error: &TungsteniteError) -> bool {
+    matches!(
+        error,
+        TungsteniteError::ConnectionClosed
+            | TungsteniteError::AlreadyClosed
+            | TungsteniteError::Protocol(ProtocolError::ResetWithoutClosingHandshake)
+    )
+}
+
+pub(crate) struct PingInterval {
+    interval: Option<time::Interval>,
+}
+
+impl PingInterval {
+    pub(crate) fn new(period: Option<u64>) -> Self {
+        Self {
+            interval: period.map(|period| time::interval(Duration::from_secs(period))),
+        }
+    }
+
+    pub(crate) fn poll_tick(&mut self, cx: &mut Context<'_>) -> Poll<time::Instant> {
+        match self.interval.as_mut() {
+            Some(interval) => interval.poll_tick(cx),
+            None => Poll::Pending,
+        }
+    }
+
+    pub(crate) async fn tick(&mut self) -> time::Instant {
+        std::future::poll_fn(|cx| self.poll_tick(cx)).await
+    }
+}
+
+/// Shared websocket configuration for sources and sinks.
+#[configurable_component]
+#[derive(Clone, Debug)]
+#[serde(deny_unknown_fields)]
+pub struct WebSocketCommonConfig {
+    /// The WebSocket URI to connect to.
+    ///
+    /// This should include the protocol and host, but can also include the port, path, and any other valid part of a URI.
+    ///  **Note**: Using the `wss://` protocol requires enabling `tls`.
+    #[configurable(metadata(docs::examples = "ws://localhost:8080"))]
+    #[configurable(metadata(docs::examples = "wss://example.com/socket"))]
+    pub uri: String,
+
+    /// The interval, in seconds, between sending [Ping][ping]s to the remote peer.
+    ///
+    /// If this option is not configured, pings are not sent on an interval.
+    ///
+    /// If the `ping_timeout` is not set, pings are still sent but there is no expectation of pong
+    /// response times.
+    ///
+    /// [ping]: https://www.rfc-editor.org/rfc/rfc6455#section-5.5.2
+    #[configurable(metadata(docs::type_unit = "seconds"))]
+    #[configurable(metadata(docs::advanced))]
+    #[configurable(metadata(docs::examples = 30))]
+    pub ping_interval: Option<NonZeroU64>,
+
+    /// The number of seconds to wait for a [Pong][pong] response from the remote peer.
+    ///
+    /// If a response is not received within this time, the connection is re-established.
+    ///
+    /// [pong]: https://www.rfc-editor.org/rfc/rfc6455#section-5.5.3
+    // NOTE: this option is not relevant if the `ping_interval` is not configured.
+    #[configurable(metadata(docs::type_unit = "seconds"))]
+    #[configurable(metadata(docs::advanced))]
+    #[configurable(metadata(docs::examples = 5))]
+    pub ping_timeout: Option<NonZeroU64>,
+
+    /// TLS configuration.
+    #[configurable(derived)]
+    pub tls: Option<TlsEnableableConfig>,
+
+    /// HTTP Authentication.
+    #[configurable(derived)]
+    pub auth: Option<Auth>,
+}
+
+impl Default for WebSocketCommonConfig {
+    fn default() -> Self {
+        Self {
+            uri: "ws://127.0.0.1:8080".to_owned(),
+            ping_interval: None,
+            ping_timeout: None,
+            tls: None,
+            auth: None,
+        }
+    }
+}
diff --git a/src/internal_events/mod.rs b/src/internal_events/mod.rs
index 52c5cafb7a6e7..a77796cc8af16 100644
--- a/src/internal_events/mod.rs
+++ b/src/internal_events/mod.rs
@@ -125,7 +125,7 @@ mod template;
 mod throttle;
 mod udp;
 mod unix;
-#[cfg(feature = "sinks-websocket")]
+#[cfg(any(feature = "sources-websocket", feature = "sinks-websocket"))]
 mod websocket;
 #[cfg(feature = "sinks-websocket-server")]
 mod websocket_server;
@@ -263,7 +263,7 @@ pub(crate) use self::tag_cardinality_limit::*;
 pub(crate) use self::throttle::*;
 #[cfg(unix)]
 pub(crate) use self::unix::*;
-#[cfg(feature = "sinks-websocket")]
+#[cfg(any(feature = "sources-websocket", feature = "sinks-websocket"))]
 pub(crate) use self::websocket::*;
 #[cfg(feature = "sinks-websocket-server")]
 pub(crate) use self::websocket_server::*;
diff --git a/src/internal_events/websocket.rs b/src/internal_events/websocket.rs
index bd3bbb78a6ede..20c8b3091b09b 100644
--- a/src/internal_events/websocket.rs
+++ b/src/internal_events/websocket.rs
@@ -1,43 +1,49 @@
 use std::error::Error;
-use std::fmt::Debug;
+use std::fmt::{Debug, Display, Formatter, Result};
 
-use metrics::counter;
+use metrics::{counter, histogram};
+use tokio_tungstenite::tungstenite::error::Error as TungsteniteError;
 use vector_lib::internal_event::InternalEvent;
 
-use vector_lib::internal_event::{error_stage, error_type};
+use vector_common::{
+    internal_event::{error_stage, error_type},
+    json_size::JsonSize,
+};
+
+pub const PROTOCOL: &str = "websocket";
 
 #[derive(Debug)]
-pub struct WsConnectionEstablished;
+pub struct WebSocketConnectionEstablished;
 
-impl InternalEvent for WsConnectionEstablished {
+impl InternalEvent for WebSocketConnectionEstablished {
     fn emit(self) {
         debug!(message = "Connected.");
         counter!("connection_established_total").increment(1);
     }
 
     fn name(&self) -> Option<&'static str> {
-        Some("WsConnectionEstablished")
+        Some("WebSocketConnectionEstablished")
     }
 }
 
 #[derive(Debug)]
-pub struct WsConnectionFailedError {
+pub struct WebSocketConnectionFailedError {
     pub error: Box<dyn Error>,
 }
 
-impl InternalEvent for WsConnectionFailedError {
+impl InternalEvent for WebSocketConnectionFailedError {
     fn emit(self) {
         error!(
             message = "WebSocket connection failed.",
             error = %self.error,
-            error_code = "ws_connection_error",
+            error_code = "websocket_connection_error",
             error_type = error_type::CONNECTION_FAILED,
             stage = error_stage::SENDING,
 
         );
         counter!(
             "component_errors_total",
-            "error_code" => "ws_connection_failed",
+            "error_code" => "websocket_connection_failed",
             "error_type" => error_type::CONNECTION_FAILED,
             "stage" => error_stage::SENDING,
         )
@@ -45,42 +51,43 @@ impl InternalEvent for WsConnectionFailedError {
     }
 
     fn name(&self) -> Option<&'static str> {
-        Some("WsConnectionFailed")
+        Some("WebSocketConnectionFailedError")
     }
 }
 
 #[derive(Debug)]
-pub struct WsConnectionShutdown;
+pub struct WebSocketConnectionShutdown;
 
-impl InternalEvent for WsConnectionShutdown {
+impl InternalEvent for WebSocketConnectionShutdown {
     fn emit(self) {
         warn!(message = "Closed by the server.");
         counter!("connection_shutdown_total").increment(1);
     }
 
     fn name(&self) -> Option<&'static str> {
-        Some("WsConnectionShutdown")
+        Some("WebSocketConnectionShutdown")
     }
 }
 
 #[derive(Debug)]
-pub struct WsConnectionError {
+pub struct WebSocketConnectionError {
     pub error: tokio_tungstenite::tungstenite::Error,
 }
 
-impl InternalEvent for WsConnectionError {
+impl InternalEvent for WebSocketConnectionError {
     fn emit(self) {
         error!(
             message = "WebSocket connection error.",
             error = %self.error,
-            error_code = "ws_connection_error",
+            error_code = "websocket_connection_error",
             error_type = error_type::WRITER_FAILED,
             stage = error_stage::SENDING,
 
         );
         counter!(
             "component_errors_total",
-            "error_code" => "ws_connection_error",
+            "protocol" => PROTOCOL,
+            "error_code" => "websocket_connection_error",
             "error_type" => error_type::WRITER_FAILED,
             "stage" => error_stage::SENDING,
         )
@@ -88,6 +95,150 @@ impl InternalEvent for WsConnectionError {
     }
 
     fn name(&self) -> Option<&'static str> {
-        Some("WsConnectionError")
+        Some("WebSocketConnectionError")
+    }
+}
+
+#[allow(dead_code)]
+#[derive(Debug, Copy, Clone)]
+pub enum WebSocketKind {
+    Ping,
+    Pong,
+    Text,
+    Binary,
+    Close,
+    Frame,
+}
+
+impl Display for WebSocketKind {
+    fn fmt(&self, f: &mut Formatter<'_>) -> Result {
+        write!(f, "{self:?}")
+    }
+}
+
+#[derive(Debug)]
+pub struct WebSocketBytesReceived<'a> {
+    pub byte_size: usize,
+    pub url: &'a str,
+    pub protocol: &'static str,
+    pub kind: WebSocketKind,
+}
+
+impl InternalEvent for WebSocketBytesReceived<'_> {
+    fn emit(self) {
+        trace!(
+            message = "Bytes received.",
+            byte_size = %self.byte_size,
+            url = %self.url,
+            protocol = %self.protocol,
+            kind = %self.kind
+        );
+        let counter = counter!(
+            "component_received_bytes_total",
+            "url" => self.url.to_string(),
+            "protocol" => self.protocol,
+            "kind" => self.kind.to_string()
+        );
+        counter.increment(self.byte_size as u64);
+    }
+}
+
+#[derive(Debug)]
+pub struct WebSocketMessageReceived<'a> {
+    pub count: usize,
+    pub byte_size: JsonSize,
+    pub url: &'a str,
+    pub protocol: &'static str,
+    pub kind: WebSocketKind,
+}
+
+impl InternalEvent for WebSocketMessageReceived<'_> {
+    fn emit(self) {
+        trace!(
+            message = "Events received.",
+            count = %self.count,
+            byte_size = %self.byte_size,
+            url =  %self.url,
+            protcol = %self.protocol,
+            kind = %self.kind
+        );
+
+        let histogram = histogram!("component_received_events_count");
+        histogram.record(self.count as f64);
+        let counter = counter!(
+            "component_received_events_total",
+            "uri" => self.url.to_string(),
+            "protocol" => PROTOCOL,
+            "kind" => self.kind.to_string()
+        );
+        counter.increment(self.count as u64);
+        let counter = counter!(
+            "component_received_event_bytes_total",
+            "url" => self.url.to_string(),
+            "protocol" => PROTOCOL,
+            "kind" => self.kind.to_string()
+        );
+        counter.increment(self.byte_size.get() as u64);
+    }
+
+    fn name(&self) -> Option<&'static str> {
+        Some("WebSocketMessageReceived")
+    }
+}
+
+#[derive(Debug)]
+pub struct WebSocketReceiveError<'a> {
+    pub error: &'a TungsteniteError,
+}
+
+impl InternalEvent for WebSocketReceiveError<'_> {
+    fn emit(self) {
+        error!(
+            message = "Error receiving message from websocket.",
+            error = %self.error,
+            error_code = "websocket_receive_error",
+            error_type = error_type::CONNECTION_FAILED,
+            stage = error_stage::PROCESSING,
+        );
+        counter!(
+            "component_errors_total",
+            "protocol" => PROTOCOL,
+            "error_code" => "websocket_receive_error",
+            "error_type" => error_type::CONNECTION_FAILED,
+            "stage" => error_stage::PROCESSING,
+        )
+        .increment(1);
+    }
+
+    fn name(&self) -> Option<&'static str> {
+        Some("WebSocketReceiveError")
+    }
+}
+
+#[derive(Debug)]
+pub struct WebSocketSendError<'a> {
+    pub error: &'a TungsteniteError,
+}
+
+impl InternalEvent for WebSocketSendError<'_> {
+    fn emit(self) {
+        error!(
+            message = "Error sending message to websocket.",
+            error = %self.error,
+            error_code = "websocket_send_error",
+            error_type = error_type::CONNECTION_FAILED,
+            stage = error_stage::PROCESSING,
+        );
+        counter!(
+            "component_errors_total",
+            "error_code" => "websocket_send_error",
+            "error_type" => error_type::CONNECTION_FAILED,
+            "stage" => error_stage::PROCESSING,
+        )
+        .increment(1);
+    }
+
+    fn name(&self) -> Option<&'static str> {
+        Some("WebSocketSendError")
     }
 }
diff --git a/src/internal_events/websocket_server.rs b/src/internal_events/websocket_server.rs
index 881cba02a0b9d..b3209c70a9994 100644
--- a/src/internal_events/websocket_server.rs
+++ b/src/internal_events/websocket_server.rs
@@ -7,12 +7,12 @@ use vector_lib::internal_event::InternalEvent;
 use vector_lib::internal_event::{error_stage, error_type};
 
 #[derive(Debug)]
-pub struct WsListenerConnectionEstablished {
+pub struct WebSocketListenerConnectionEstablished {
     pub client_count: usize,
     pub extra_tags: Vec<(String, String)>,
 }
 
-impl InternalEvent for WsListenerConnectionEstablished {
+impl InternalEvent for WebSocketListenerConnectionEstablished {
     fn emit(self) {
         debug!(
             message = format!(
@@ -25,17 +25,17 @@ impl InternalEvent for WsListenerConnectionEstablished {
     }
 
     fn name(&self) -> Option<&'static str> {
-        Some("WsListenerConnectionEstablished")
+        Some("WebSocketListenerConnectionEstablished")
     }
 }
 
 #[derive(Debug)]
-pub struct WsListenerConnectionFailedError {
+pub struct WebSocketListenerConnectionFailedError {
     pub error: Box<dyn Error>,
     pub extra_tags: Vec<(String, String)>,
 }
 
-impl InternalEvent for WsListenerConnectionFailedError {
+impl InternalEvent for WebSocketListenerConnectionFailedError {
     fn emit(self) {
         error!(
             message = "WebSocket connection failed.",
@@ -65,12 +65,12 @@ impl InternalEvent for WsListenerConnectionFailedError {
 }
 
 #[derive(Debug)]
-pub struct WsListenerConnectionShutdown {
+pub struct WebSocketListenerConnectionShutdown {
     pub client_count: usize,
     pub extra_tags: Vec<(String, String)>,
 }
 
-impl InternalEvent for WsListenerConnectionShutdown {
+impl InternalEvent for WebSocketListenerConnectionShutdown {
     fn emit(self) {
         info!(
             message = format!(
@@ -83,16 +83,16 @@ impl InternalEvent for WsListenerConnectionShutdown {
     }
 
     fn name(&self) -> Option<&'static str> {
-        Some("WsListenerConnectionShutdown")
+        Some("WebSocketListenerConnectionShutdown")
     }
 }
 
 #[derive(Debug)]
-pub struct WsListenerSendError {
+pub struct WebSocketListenerSendError {
     pub error: Box<dyn Error>,
 }
 
-impl InternalEvent for WsListenerSendError {
+impl InternalEvent for WebSocketListenerSendError {
     fn emit(self) {
         error!(
             message = "WebSocket message send error.",
@@ -117,12 +117,12 @@ impl InternalEvent for WsListenerSendError {
 }
 
 #[derive(Debug)]
-pub struct WsListenerMessageSent {
+pub struct WebSocketListenerMessageSent {
     pub message_size: usize,
     pub extra_tags: Vec<(String, String)>,
 }
 
-impl InternalEvent for WsListenerMessageSent {
+impl InternalEvent for WebSocketListenerMessageSent {
     fn emit(self) {
         counter!("websocket_messages_sent_total", &self.extra_tags).increment(1);
         counter!("websocket_bytes_sent_total", &self.extra_tags)
@@ -130,6 +130,6 @@ impl InternalEvent for WsListenerMessageSent {
     }
 
     fn name(&self) -> Option<&'static str> {
-        Some("WsListenerMessageSent")
+        Some("WebSocketListenerMessageSent")
     }
 }
diff --git a/src/sinks/util/retries.rs b/src/sinks/util/retries.rs
index 08d967473e485..4198231ff4d36 100644
--- a/src/sinks/util/retries.rs
+++ b/src/sinks/util/retries.rs
@@ -232,86 +232,6 @@ impl RetryAction {
     }
 }
 
-// `tokio-retry` crate
-// MIT License
-// Copyright (c) 2017 Sam Rijs
-//
-/// A retry strategy driven by exponential back-off.
-///
-/// The power corresponds to the number of past attempts.
-#[derive(Debug, Clone)]
-pub struct ExponentialBackoff {
-    current: u64,
-    base: u64,
-    factor: u64,
-    max_delay: Option<Duration>,
-}
-
-impl ExponentialBackoff {
-    /// Constructs a new exponential back-off strategy,
-    /// given a base duration in milliseconds.
-    ///
-    /// The resulting duration is calculated by taking the base to the `n`-th power,
-    /// where `n` denotes the number of past attempts.
-    pub const fn from_millis(base: u64) -> ExponentialBackoff {
-        ExponentialBackoff {
-            current: base,
-            base,
-            factor: 1u64,
-            max_delay: None,
-        }
-    }
-
-    /// A multiplicative factor that will be applied to the retry delay.
-    ///
-    /// For example, using a factor of `1000` will make each delay in units of seconds.
-    ///
-    /// Default factor is `1`.
-    pub const fn factor(mut self, factor: u64) -> ExponentialBackoff {
-        self.factor = factor;
-        self
-    }
-
-    /// Apply a maximum delay. No retry delay will be longer than this `Duration`.
-    pub const fn max_delay(mut self, duration: Duration) -> ExponentialBackoff {
-        self.max_delay = Some(duration);
-        self
-    }
-
-    /// Resents the exponential back-off strategy to its initial state.
-    pub const fn reset(&mut self) {
-        self.current = self.base;
-    }
-}
-
-impl Iterator for ExponentialBackoff {
-    type Item = Duration;
-
-    fn next(&mut self) -> Option<Duration> {
-        // set delay duration by applying factor
-        let duration = if let Some(duration) = self.current.checked_mul(self.factor) {
-            Duration::from_millis(duration)
-        } else {
-            Duration::from_millis(u64::MAX)
-        };
-
-        // check if we reached max delay
-        if let Some(ref max_delay) = self.max_delay {
-            if duration > *max_delay {
-                return Some(*max_delay);
-            }
-        }
-
-        if let Some(next) = self.current.checked_mul(self.base) {
-            self.current = next;
-        } else {
-            self.current = u64::MAX;
-        }
-
-        Some(duration)
-    }
-}
-
 #[cfg(test)]
 mod tests {
     use std::{fmt, time::Duration};
diff --git a/src/sinks/util/service/health.rs b/src/sinks/util/service/health.rs
index bd04b6ba660da..a6864df76309e 100644
--- a/src/sinks/util/service/health.rs
+++ b/src/sinks/util/service/health.rs
@@ -18,8 +18,8 @@ use tower::Service;
 use vector_lib::{configurable::configurable_component, emit};
 
 use crate::{
+    common::backoff::ExponentialBackoff,
     internal_events::{EndpointsActive, OpenGauge},
-    sinks::util::retries::ExponentialBackoff,
 };
 
 const RETRY_MAX_DURATION_SECONDS_DEFAULT: u64 = 3_600;
diff --git a/src/sinks/util/service/net/mod.rs b/src/sinks/util/service/net/mod.rs
index aa5f6451a4a69..ba1c427ad6957 100644
--- a/src/sinks/util/service/net/mod.rs
+++ b/src/sinks/util/service/net/mod.rs
@@ -15,10 +15,11 @@ use std::{
 use {crate::sinks::util::unix::UnixEither, std::path::PathBuf};
 
 use crate::{
+    common::backoff::ExponentialBackoff,
     internal_events::{
         SocketOutgoingConnectionError, TcpSocketConnectionEstablished, UdpSendIncompleteError,
     },
-    sinks::{util::retries::ExponentialBackoff, Healthcheck},
+    sinks::Healthcheck,
 };
 
 #[cfg(unix)]
diff --git a/src/sinks/util/tcp.rs b/src/sinks/util/tcp.rs
index c4be41f377885..1cc7a9cc316cf 100644
--- a/src/sinks/util/tcp.rs
+++ b/src/sinks/util/tcp.rs
@@ -22,6 +22,7 @@ use vector_lib::{ByteSizeOf, EstimatedJsonEncodedSizeOf};
 
 use crate::{
     codecs::Transformer,
+    common::backoff::ExponentialBackoff,
     dns,
     event::Event,
     internal_events::{
@@ -31,7 +32,6 @@ use crate::{
     sink_ext::VecSinkExt,
     sinks::{
         util::{
-            retries::ExponentialBackoff,
             socket_bytes_sink::{BytesSink, ShutdownCheck},
             EncodedEvent, SinkBuildError, StreamSink,
         },
diff --git a/src/sinks/util/udp.rs b/src/sinks/util/udp.rs
index e681e7fd0dc66..db525fa2bb24f 100644
--- a/src/sinks/util/udp.rs
+++ b/src/sinks/util/udp.rs
@@ -18,14 +18,12 @@ use super::{
 };
 use crate::{
     codecs::Transformer,
+    common::backoff::ExponentialBackoff,
     dns,
     event::Event,
     internal_events::{UdpSocketConnectionEstablished, UdpSocketOutgoingConnectionError},
     net,
-    sinks::{
-        util::{retries::ExponentialBackoff, StreamSink},
-        Healthcheck, VectorSink,
-    },
+    sinks::{util::StreamSink, Healthcheck, VectorSink},
 };
 
 #[derive(Debug, Snafu)]
diff --git a/src/sinks/util/unix.rs b/src/sinks/util/unix.rs
index 9dd6e6f671e49..bb09e61997ccd 100644
--- a/src/sinks/util/unix.rs
+++ b/src/sinks/util/unix.rs
@@ -25,6 +25,7 @@ use vector_lib::{ByteSizeOf, EstimatedJsonEncodedSizeOf};
 
 use crate::{
     codecs::Transformer,
+    common::backoff::ExponentialBackoff,
     event::{Event, Finalizable},
     internal_events::{
         ConnectionOpen, OpenGauge, SocketMode, UnixSocketConnectionEstablished,
@@ -33,7 +34,6 @@ use crate::{
     sink_ext::VecSinkExt,
     sinks::{
         util::{
-            retries::ExponentialBackoff,
             service::net::UnixMode,
             socket_bytes_sink::{BytesSink, ShutdownCheck},
             EncodedEvent, StreamSink,
diff --git a/src/sinks/websocket/config.rs b/src/sinks/websocket/config.rs
index 743e62fddb964..7fac1402625f8 100644
--- a/src/sinks/websocket/config.rs
+++ b/src/sinks/websocket/config.rs
@@ -1,18 +1,14 @@
-use std::num::NonZeroU64;
-
 use snafu::ResultExt;
 use vector_lib::codecs::JsonSerializerConfig;
 use vector_lib::configurable::configurable_component;
 
+use crate::common::websocket::WebSocketCommonConfig;
 use crate::{
     codecs::EncodingConfig,
+    common::websocket::{ConnectSnafu, WebSocketConnector, WebSocketError},
     config::{AcknowledgementsConfig, GenerateConfig, Input, SinkConfig, SinkContext},
-    http::Auth,
-    sinks::{
-        websocket::sink::{ConnectSnafu, WebSocketConnector, WebSocketError, WebSocketSink},
-        Healthcheck, VectorSink,
-    },
-    tls::{MaybeTlsSettings, TlsEnableableConfig},
+    sinks::{websocket::sink::WebSocketSink, Healthcheck, VectorSink},
+    tls::MaybeTlsSettings,
 };
 
 /// Configuration for the `websocket` sink.
@@ -22,37 +18,12 @@ use crate::{
 ))]
 #[derive(Clone, Debug)]
 pub struct WebSocketSinkConfig {
-    /// The WebSocket URI to connect to.
-    ///
-    /// This should include the protocol and host, but can also include the port, path, and any other valid part of a URI.
-    pub uri: String,
-
-    #[configurable(derived)]
-    pub tls: Option<TlsEnableableConfig>,
+    #[serde(flatten)]
+    pub common: WebSocketCommonConfig,
 
     #[configurable(derived)]
     pub encoding: EncodingConfig,
 
-    /// The interval, in seconds, between sending [Ping][ping]s to the remote peer.
-    ///
-    /// If this option is not configured, pings are not sent on an interval.
-    ///
-    /// If the `ping_timeout` is not set, pings are still sent but there is no expectation of pong
-    /// response times.
-    ///
-    /// [ping]: https://www.rfc-editor.org/rfc/rfc6455#section-5.5.2
-    #[configurable(metadata(docs::type_unit = "seconds"))]
-    pub ping_interval: Option<NonZeroU64>,
-
-    /// The number of seconds to wait for a [Pong][pong] response from the remote peer.
-    ///
-    /// If a response is not received within this time, the connection is re-established.
-    ///
-    /// [pong]: https://www.rfc-editor.org/rfc/rfc6455#section-5.5.3
-    // NOTE: this option is not relevant if the `ping_interval` is not configured.
-    #[configurable(metadata(docs::type_unit = "seconds"))]
-    pub ping_timeout: Option<NonZeroU64>,
-
     #[configurable(derived)]
     #[serde(
         default,
@@ -60,21 +31,16 @@ pub struct WebSocketSinkConfig {
         skip_serializing_if = "crate::serde::is_default"
     )]
     pub acknowledgements: AcknowledgementsConfig,
-
-    #[configurable(derived)]
-    pub auth: Option<Auth>,
 }
 
 impl GenerateConfig for WebSocketSinkConfig {
     fn generate_config() -> toml::Value {
         toml::Value::try_from(Self {
-            uri: "ws://127.0.0.1:9000/endpoint".into(),
-            tls: None,
+            common: WebSocketCommonConfig {
+                ..Default::default()
+            },
             encoding: JsonSerializerConfig::default().into(),
-            ping_interval: None,
-            ping_timeout: None,
             acknowledgements: Default::default(),
-            auth: None,
         })
         .unwrap()
     }
@@ -104,8 +70,9 @@ impl SinkConfig for WebSocketSinkConfig {
 
 impl WebSocketSinkConfig {
     fn build_connector(&self) -> Result<WebSocketConnector, WebSocketError> {
-        let tls = MaybeTlsSettings::from_config(self.tls.as_ref(), false).context(ConnectSnafu)?;
-        WebSocketConnector::new(self.uri.clone(), tls, self.auth.clone())
+        let tls =
+            MaybeTlsSettings::from_config(self.common.tls.as_ref(), false).context(ConnectSnafu)?;
+        WebSocketConnector::new(self.common.uri.clone(), tls, self.common.auth.clone())
     }
 }
 
diff --git a/src/sinks/websocket/sink.rs b/src/sinks/websocket/sink.rs
index 8f00da2bc9b97..e715bef4a55a2 100644
--- a/src/sinks/websocket/sink.rs
+++ b/src/sinks/websocket/sink.rs
@@ -1,28 +1,13 @@
 use std::{
-    fmt::Debug,
     io,
-    net::SocketAddr,
     num::NonZeroU64,
-    task::{Context, Poll},
     time::{Duration, Instant},
 };
 
 use async_trait::async_trait;
 use bytes::BytesMut;
 use futures::{pin_mut, sink::SinkExt, stream::BoxStream, Sink, Stream, StreamExt};
-use snafu::{ResultExt, Snafu};
-use tokio::{net::TcpStream, time};
-use tokio_tungstenite::{
-    client_async_with_config,
-    tungstenite::{
-        client::{uri_mode, IntoClientRequest},
-        error::{Error as WsError, ProtocolError, UrlError},
-        handshake::client::Request as WsRequest,
-        protocol::{Message, WebSocketConfig},
-        stream::Mode as UriMode,
-    },
-    WebSocketStream as WsStream,
-};
+use tokio_tungstenite::tungstenite::{error::Error as TungsteniteError, protocol::Message};
 use tokio_util::codec::Encoder as _;
 use vector_lib::{
     emit,
@@ -34,160 +19,15 @@ use vector_lib::{
 
 use crate::{
     codecs::{Encoder, Transformer},
-    dns,
+    common::websocket::{is_closed, PingInterval, WebSocketConnector},
     event::{Event, EventStatus, Finalizable},
-    http::Auth,
     internal_events::{
-        ConnectionOpen, OpenGauge, WsConnectionError, WsConnectionEstablished,
-        WsConnectionFailedError, WsConnectionShutdown,
+        ConnectionOpen, OpenGauge, WebSocketConnectionError, WebSocketConnectionShutdown,
     },
-    sinks::util::{retries::ExponentialBackoff, StreamSink},
+    sinks::util::StreamSink,
     sinks::websocket::config::WebSocketSinkConfig,
-    tls::{MaybeTlsSettings, MaybeTlsStream, TlsError},
 };
 
-#[derive(Debug, Snafu)]
-#[snafu(visibility(pub))]
-pub enum WebSocketError {
-    #[snafu(display("Creating WebSocket client failed: {}", source))]
-    CreateFailed { source: WsError },
-    #[snafu(display("Connect error: {}", source))]
-    ConnectError { source: TlsError },
-    #[snafu(display("Unable to resolve DNS: {}", source))]
-    DnsError { source: dns::DnsError },
-    #[snafu(display("No addresses returned."))]
-    NoAddresses,
-}
-
-#[derive(Clone)]
-pub struct WebSocketConnector {
-    uri: String,
-    host: String,
-    port: u16,
-    tls: MaybeTlsSettings,
-    auth: Option<Auth>,
-}
-
-impl WebSocketConnector {
-    pub fn new(
-        uri: String,
-        tls: MaybeTlsSettings,
-        auth: Option<Auth>,
-    ) -> Result<Self, WebSocketError> {
-        let request = (&uri).into_client_request().context(CreateFailedSnafu)?;
-        let (host, port) = Self::extract_host_and_port(&request).context(CreateFailedSnafu)?;
-
-        Ok(Self {
-            uri,
-            host,
-            port,
-            tls,
-            auth,
-        })
-    }
-
-    fn extract_host_and_port(request: &WsRequest) -> Result<(String, u16), WsError> {
-        let host = request
-            .uri()
-            .host()
-            .ok_or(WsError::Url(UrlError::NoHostName))?
-            .to_string();
-        let mode = uri_mode(request.uri())?;
-        let port = request.uri().port_u16().unwrap_or(match mode {
-            UriMode::Tls => 443,
-            UriMode::Plain => 80,
-        });
-
-        Ok((host, port))
-    }
-
-    const fn fresh_backoff() -> ExponentialBackoff {
-        ExponentialBackoff::from_millis(2)
-            .factor(250)
-            .max_delay(Duration::from_secs(60))
-    }
-
-    async fn tls_connect(&self) -> Result<MaybeTlsStream<TcpStream>, WebSocketError> {
-        let ip = dns::Resolver
-            .lookup_ip(self.host.clone())
-            .await
-            .context(DnsSnafu)?
-            .next()
-            .ok_or(WebSocketError::NoAddresses)?;
-
-        let addr = SocketAddr::new(ip, self.port);
-        self.tls
-            .connect(&self.host, &addr)
-            .await
-            .context(ConnectSnafu)
-    }
-
-    async fn connect(&self) -> Result<WsStream<MaybeTlsStream<TcpStream>>, WebSocketError> {
-        let mut request = (&self.uri)
-            .into_client_request()
-            .context(CreateFailedSnafu)?;
-
-        if let Some(auth) = &self.auth {
-            auth.apply(&mut request);
-        }
-
-        let maybe_tls = self.tls_connect().await?;
-
-        let ws_config = WebSocketConfig::default();
-
-        let (ws_stream, _response) = client_async_with_config(request, maybe_tls, Some(ws_config))
-            .await
-            .context(CreateFailedSnafu)?;
-
-        Ok(ws_stream)
-    }
-
-    async fn connect_backoff(&self) -> WsStream<MaybeTlsStream<TcpStream>> {
-        let mut backoff = Self::fresh_backoff();
-        loop {
-            match self.connect().await {
-                Ok(ws_stream) => {
-                    emit!(WsConnectionEstablished {});
-                    return ws_stream;
-                }
-                Err(error) => {
-                    emit!(WsConnectionFailedError {
-                        error: Box::new(error)
-                    });
-                    time::sleep(backoff.next().unwrap()).await;
-                }
-            }
-        }
-    }
-
-    pub async fn healthcheck(&self) -> crate::Result<()> {
-        self.connect().await.map(|_| ()).map_err(Into::into)
-    }
-}
-
-struct PingInterval {
-    interval: Option<time::Interval>,
-}
-
-impl PingInterval {
-    fn new(period: Option<u64>) -> Self {
-        Self {
-            interval: period.map(|period| time::interval(Duration::from_secs(period))),
-        }
-    }
-
-    fn poll_tick(&mut self, cx: &mut Context<'_>) -> Poll<time::Instant> {
-        match self.interval.as_mut() {
-            Some(interval) => interval.poll_tick(cx),
-            None => Poll::Pending,
-        }
-    }
-
-    async fn tick(&mut self) -> time::Instant {
-        std::future::poll_fn(|cx| self.poll_tick(cx)).await
-    }
-}
-
 pub struct WebSocketSink {
     transformer: Transformer,
     encoder: Encoder<()>,
@@ -197,7 +37,10 @@ pub struct WebSocketSink {
 }
 
 impl WebSocketSink {
-    pub fn new(config: &WebSocketSinkConfig, connector: WebSocketConnector) -> crate::Result<Self> {
+    pub(crate) fn new(
+        config: &WebSocketSinkConfig,
+        connector: WebSocketConnector,
+    ) -> crate::Result<Self> {
         let transformer = config.encoding.transformer();
         let serializer = config.encoding.build()?;
         let encoder = Encoder::<()>::new(serializer);
@@ -206,25 +49,25 @@ impl WebSocketSink {
             transformer,
             encoder,
             connector,
-            ping_interval: config.ping_interval,
-            ping_timeout: config.ping_timeout,
+            ping_interval: config.common.ping_interval,
+            ping_timeout: config.common.ping_timeout,
         })
     }
 
     async fn create_sink_and_stream(
         &self,
     ) -> (
-        impl Sink<Message, Error = WsError> + use<>,
-        impl Stream<Item = Result<Message, WsError>> + use<>,
+        impl Sink<Message, Error = TungsteniteError>,
+        impl Stream<Item = Result<Message, TungsteniteError>>,
     ) {
         let ws_stream = self.connector.connect_backoff().await;
         ws_stream.split()
     }
 
-    fn check_received_pong_time(&self, last_pong: Instant) -> Result<(), WsError> {
+    fn check_received_pong_time(&self, last_pong: Instant) -> Result<(), TungsteniteError> {
         if let Some(ping_timeout) = self.ping_timeout {
             if last_pong.elapsed() > Duration::from_secs(ping_timeout.into()) {
-                return Err(WsError::Io(io::Error::new(
+                return Err(TungsteniteError::Io(io::Error::new(
                     io::ErrorKind::TimedOut,
                     "Pong not received in time",
                 )));
@@ -253,8 +96,8 @@ impl WebSocketSink {
     ) -> Result<(), ()>
     where
         I: Stream<Item = Event> + Unpin,
-        WS: Stream<Item = Result<Message, WsError>> + Unpin,
-        O: Sink<Message, Error = WsError> + Unpin,
+        WS: Stream<Item = Result<Message, TungsteniteError>> + Unpin,
+        O: Sink<Message, Error = TungsteniteError> + Unpin,
     {
         const PING: &[u8] = b"PING";
 
@@ -263,7 +106,7 @@ impl WebSocketSink {
         let mut ping_interval = PingInterval::new(self.ping_interval.map(u64::from));
 
         if let Err(error) = ws_sink.send(Message::Ping(PING.to_vec())).await {
-            emit!(WsConnectionError { error });
+            emit!(WebSocketConnectionError { error });
             return Err(());
         }
         let mut last_pong = Instant::now();
@@ -338,9 +181,9 @@ impl WebSocketSink {
 
             if let Err(error) = result {
                 if is_closed(&error) {
-                    emit!(WsConnectionShutdown);
+                    emit!(WebSocketConnectionShutdown);
                 } else {
-                    emit!(WsConnectionError { error });
+                    emit!(WebSocketConnectionError { error });
                 }
                 return Err(());
             }
@@ -376,37 +219,32 @@ impl StreamSink<Event> for WebSocketSink {
     }
 }
 
-const fn is_closed(error: &WsError) -> bool {
-    matches!(
-        error,
-        WsError::ConnectionClosed
-            | WsError::AlreadyClosed
-            | WsError::Protocol(ProtocolError::ResetWithoutClosingHandshake)
-    )
-}
-
 #[cfg(test)]
 mod tests {
     use std::net::SocketAddr;
 
     use futures::{future, FutureExt, StreamExt};
     use serde_json::Value as JsonValue;
-    use tokio::time::timeout;
+    use tokio::{time, time::timeout};
     use tokio_tungstenite::{
         accept_async, accept_hdr_async,
-        tungstenite::error::{Error as WsError, ProtocolError},
-        tungstenite::handshake::server::{Request, Response},
+        tungstenite::{
+            error::ProtocolError,
+            handshake::server::{Request, Response},
+        },
     };
     use vector_lib::codecs::JsonSerializerConfig;
 
     use super::*;
     use crate::{
+        common::websocket::WebSocketCommonConfig,
         config::{SinkConfig, SinkContext},
+        http::Auth,
         test_util::{
             components::{run_and_assert_sink_compliance, SINK_TAGS},
             next_addr, random_lines_with_stream, trace_init, CountReceiver,
         },
-        tls::{self, TlsConfig, TlsEnableableConfig},
+        tls::{self, MaybeTlsSettings, TlsConfig, TlsEnableableConfig},
     };
 
     #[tokio::test(flavor = "multi_thread")]
@@ -415,13 +253,15 @@ mod tests {
 
         let addr = next_addr();
         let config = WebSocketSinkConfig {
-            uri: format!("ws://{addr}"),
-            tls: None,
+            common: WebSocketCommonConfig {
+                uri: format!("ws://{addr}"),
+                tls: None,
+                ping_interval: None,
+                ping_timeout: None,
+                auth: None,
+            },
             encoding: JsonSerializerConfig::default().into(),
-            ping_interval: None,
-            ping_timeout: None,
             acknowledgements: Default::default(),
-            auth: None,
         };
         let tls = MaybeTlsSettings::Raw(());
 
@@ -438,13 +278,15 @@ mod tests {
         let auth_clone = auth.clone();
         let addr = next_addr();
         let config = WebSocketSinkConfig {
-            uri: format!("ws://{addr}"),
-            tls: None,
+            common: WebSocketCommonConfig {
+                uri: format!("ws://{addr}"),
+                tls: None,
+                ping_interval: None,
+                ping_timeout: None,
+                auth: None,
+            },
             encoding: JsonSerializerConfig::default().into(),
-            ping_interval: None,
-            ping_timeout: None,
             acknowledgements: Default::default(),
-            auth,
         };
         let tls = MaybeTlsSettings::Raw(());
 
@@ -460,21 +302,23 @@ mod tests {
         let tls = MaybeTlsSettings::from_config(tls_config.as_ref(), true).unwrap();
 
         let config = WebSocketSinkConfig {
-            uri: format!("wss://{addr}"),
-            tls: Some(TlsEnableableConfig {
-                enabled: Some(true),
-                options: TlsConfig {
-                    verify_certificate: Some(false),
-                    verify_hostname: Some(true),
-                    ca_file: Some(tls::TEST_PEM_CRT_PATH.into()),
-                    ..Default::default()
-                },
-            }),
+            common: WebSocketCommonConfig {
+                uri: format!("wss://{addr}"),
+                tls: Some(TlsEnableableConfig {
+                    enabled: Some(true),
+                    options: TlsConfig {
+                        verify_certificate: Some(false),
+                        verify_hostname: Some(true),
+                        ca_file: Some(tls::TEST_PEM_CRT_PATH.into()),
+                        ..Default::default()
+                    },
+                }),
+                ping_timeout: None,
+                ping_interval: None,
+                auth: None,
+            },
             encoding: JsonSerializerConfig::default().into(),
-            ping_timeout: None,
-            ping_interval: None,
             acknowledgements: Default::default(),
-            auth: None,
         };
 
         send_events_and_assert(addr, config, tls, None).await;
@@ -486,13 +330,15 @@ mod tests {
 
         let addr = next_addr();
         let config = WebSocketSinkConfig {
-            uri: format!("ws://{addr}"),
-            tls: None,
+            common: WebSocketCommonConfig {
+                uri: format!("ws://{addr}"),
+                tls: None,
+                ping_interval: None,
+                ping_timeout: None,
+                auth: None,
+            },
             encoding: JsonSerializerConfig::default().into(),
-            ping_interval: None,
-            ping_timeout: None,
             acknowledgements: Default::default(),
-            auth: None,
         };
         let tls = MaybeTlsSettings::Raw(());
 
@@ -606,7 +452,7 @@ mod tests {
                                         Ok(msg) if msg.is_text() => {
                                             Some(Ok(msg.into_text().unwrap()))
                                         }
-                                        Err(WsError::Protocol(
+                                        Err(TungsteniteError::Protocol(
                                             ProtocolError::ResetWithoutClosingHandshake,
                                         )) => None,
                                         Err(e) => Some(Err(e)),
diff --git a/src/sinks/websocket_server/sink.rs b/src/sinks/websocket_server/sink.rs
index 4eaf94bd06499..53409aa06c818 100644
--- a/src/sinks/websocket_server/sink.rs
+++ b/src/sinks/websocket_server/sink.rs
@@ -37,9 +37,9 @@ use crate::{
     codecs::{Encoder, Transformer},
     common::http::server_auth::HttpServerAuthMatcher,
     internal_events::{
-        ConnectionOpen, OpenGauge, WsListenerConnectionEstablished,
-        WsListenerConnectionFailedError, WsListenerConnectionShutdown, WsListenerMessageSent,
-        WsListenerSendError,
+        ConnectionOpen, OpenGauge, WebSocketListenerConnectionEstablished,
+        WebSocketListenerConnectionFailedError, WebSocketListenerConnectionShutdown,
+        WebSocketListenerMessageSent, WebSocketListenerSendError,
     },
     sinks::{
         prelude::*,
@@ -266,7 +266,7 @@ impl WebSocketListenerSink {
             .await
             .map_err(|err| {
                 debug!("Error during websocket handshake: {}", err);
-                emit!(WsListenerConnectionFailedError {
+                emit!(WebSocketListenerConnectionFailedError {
                     error: Box::new(err),
                     extra_tags: extra_tags.clone()
                 })
@@ -283,7 +283,7 @@ impl WebSocketListenerSink {
                 &buffer.lock().expect("mutex poisoned"),
                 |(_, message)| {
                     if let Err(error) = tx.unbounded_send(message.clone()) {
-                        emit!(WsListenerSendError {
+                        emit!(WebSocketListenerSendError {
                             error: Box::new(error)
                         });
                     }
@@ -293,7 +293,7 @@ impl WebSocketListenerSink {
             debug!("WebSocket connection established: {}", addr);
 
             peers.insert(addr, tx);
-            emit!(WsListenerConnectionEstablished {
+            emit!(WebSocketListenerConnectionEstablished {
                 client_count: peers.len(),
                 extra_tags: extra_tags.clone()
             });
@@ -322,7 +322,7 @@ impl WebSocketListenerSink {
         });
         let forward_data_to_client = rx
             .map(|message| {
-                emit!(WsListenerMessageSent {
+                emit!(WebSocketListenerMessageSent {
                     message_size: message.len(),
                     extra_tags: extra_tags.clone()
                 });
@@ -336,7 +336,7 @@ impl WebSocketListenerSink {
             .factor_first()
             .0
         {
-            emit!(WsListenerSendError {
+            emit!(WebSocketListenerSendError {
                 error: Box::new(error)
             })
         }
@@ -345,7 +345,7 @@ impl WebSocketListenerSink {
             let mut peers = peers.lock().expect("mutex poisoned");
             debug!("{} disconnected.", &addr);
             peers.remove(&addr);
-            emit!(WsListenerConnectionShutdown {
+            emit!(WebSocketListenerConnectionShutdown {
                 client_count: peers.len(),
                 extra_tags: extra_tags.clone()
             });
@@ -423,7 +423,7 @@ impl StreamSink<Event> for WebSocketListenerSink {
                     let broadcast_recipients = peers.values();
                     for recp in broadcast_recipients {
                         if let Err(error) = recp.unbounded_send(message.clone()) {
-                            emit!(WsListenerSendError {
+                            emit!(WebSocketListenerSendError {
                                 error: Box::new(error)
                             });
                         } else {
diff --git a/src/sources/mod.rs b/src/sources/mod.rs
index 91e6c333d3705..20244ce6c177d 100644
--- a/src/sources/mod.rs
+++ b/src/sources/mod.rs
@@ -90,6 +90,8 @@ pub mod statsd;
 pub mod syslog;
 #[cfg(feature = "sources-vector")]
 pub mod vector;
+#[cfg(feature = "sources-websocket")]
+pub mod websocket;
 
 pub mod util;
 
diff --git a/src/sources/websocket/config.rs b/src/sources/websocket/config.rs
new file mode 100644
index 0000000000000..c693161a692de
--- /dev/null
+++ b/src/sources/websocket/config.rs
@@ -0,0 +1,267 @@
+use futures::TryFutureExt;
+use serde_with::serde_as;
+use snafu::ResultExt;
+use std::time::Duration;
+use vector_lib::codecs::decoding::{DeserializerConfig, FramingConfig};
+
+use super::source::{WebSocketSource, WebSocketSourceParams};
+use crate::common::websocket::WebSocketCommonConfig;
+use crate::{
+    codecs::DecodingConfig,
+    common::websocket::{ConnectSnafu, WebSocketConnector},
+    config::{SourceConfig, SourceContext},
+    serde::{default_decoding, default_framing_message_based},
+    sources::Source,
+    tls::MaybeTlsSettings,
+};
+use vector_config::configurable_component;
+use vector_lib::config::{LogNamespace, SourceOutput};
+
+/// Defines the different shapes the `pong_message` config can take.
+#[derive(Clone, Debug)]
+#[configurable_component]
+#[serde(untagged)]
+pub enum PongMessage {
+    /// For exact string matching.
+    /// e.g., pong_message: "pong"
+    Simple(String),
+
+    /// For advanced matching strategies.
+    /// e.g., pong_message: { type: contains, value: "pong" }
+    Advanced(PongValidation),
+}
+
+impl PongMessage {
+    pub fn matches(&self, msg: &str) -> bool {
+        match self {
+            PongMessage::Simple(expected) => msg == expected,
+            PongMessage::Advanced(validation) => validation.matches(msg),
+        }
+    }
+}
+
+/// Defines the advanced validation strategies for a pong message.
+#[derive(Clone, Debug)]
+#[configurable_component]
+#[serde(tag = "type")]
+#[serde(rename_all = "snake_case")]
+#[configurable(metadata(
+    docs::enum_tag_description = "The matching strategy to use for the pong message."
+))]
+pub enum PongValidation {
+    /// The entire message must be an exact match.
+    Exact {
+        /// The string value to match against.
+        value: String,
+    },
+
+    /// The message must contain the value as a substring.
+    Contains {
+        /// The string value to match against.
+        value: String,
+    },
+}
+
+impl PongValidation {
+    pub fn matches(&self, msg: &str) -> bool {
+        match self {
+            PongValidation::Exact { value: expected } => msg == expected,
+            PongValidation::Contains { value: substring } => msg.contains(substring),
+        }
+    }
+}
+
+/// Configuration for the `websocket` source.
+#[serde_as]
+#[configurable_component(source("websocket", "Collect events from a websocket endpoint.",))]
+#[derive(Clone, Debug)]
+pub struct WebSocketConfig {
+    #[serde(flatten)]
+    pub common: WebSocketCommonConfig,
+
+    /// Decoder to use on each received message.
+    #[configurable(derived)]
+    #[serde(default = "default_decoding")]
+    pub decoding: DeserializerConfig,
+
+    /// Framing to use in the decoding.
+    #[configurable(derived)]
+    #[serde(default = "default_framing_message_based")]
+    pub framing: FramingConfig,
+
+    /// Number of seconds before timing out while connecting.
+    #[serde_as(as = "serde_with::DurationSeconds<u64>")]
+    #[serde(default = "default_connect_timeout_secs")]
+    #[configurable(metadata(docs::advanced))]
+    #[configurable(metadata(docs::examples = 10))]
+    pub connect_timeout_secs: Duration,
+
+    /// Number of seconds before timing out while waiting for a reply to the initial message.
+    /// This is only used when `initial_message` is also configured.
+    #[serde_as(as = "serde_with::DurationSeconds<u64>")]
+    #[serde(default = "default_initial_message_timeout_secs")]
+    #[configurable(metadata(docs::advanced))]
+    #[configurable(metadata(docs::examples = 5))]
+    pub initial_message_timeout_secs: Duration,
+
+    /// An optional message to send to the server upon connection.
+    #[configurable(metadata(docs::advanced))]
+    #[configurable(metadata(docs::examples = "SUBSCRIBE logs"))]
+    #[serde(default)]
+    pub initial_message: Option<String>,
+
+    /// An optional application-level ping message to send over the WebSocket connection.
+    /// If not set, a standard WebSocket ping control frame is sent instead.
+    #[configurable(metadata(docs::advanced))]
+    #[serde(default)]
+    pub ping_message: Option<String>,
+
+    /// The expected application-level pong message to listen for as a response to a custom `ping_message`.
+    /// This is only used when `ping_message` is also configured. When a custom ping is sent,
+    /// receiving this specific message confirms that the connection is still alive.
+    #[configurable(metadata(docs::advanced))]
+    #[serde(default)]
+    pub pong_message: Option<PongMessage>,
+
+    /// The namespace to use for logs. This overrides the global setting.
+    #[configurable(metadata(docs::hidden))]
+    #[serde(default)]
+    pub log_namespace: Option<bool>,
+}
+
+const fn default_connect_timeout_secs() -> Duration {
+    Duration::from_secs(30)
+}
+
+const fn default_initial_message_timeout_secs() -> Duration {
+    Duration::from_secs(2)
+}
+
+impl Default for WebSocketConfig {
+    fn default() -> Self {
+        Self {
+            common: WebSocketCommonConfig::default(),
+            decoding: default_decoding(),
+            framing: default_framing_message_based(),
+            connect_timeout_secs: default_connect_timeout_secs(),
+            initial_message: None,
+            initial_message_timeout_secs: default_initial_message_timeout_secs(),
+            ping_message: None,
+            pong_message: None,
+            log_namespace: None,
+        }
+    }
+}
+
+impl_generate_config_from_default!(WebSocketConfig);
+
+#[async_trait::async_trait]
+#[typetag::serde(name = "websocket")]
+impl SourceConfig for WebSocketConfig {
+    async fn build(&self, cx: SourceContext) -> crate::Result<Source> {
+        let tls =
+            MaybeTlsSettings::from_config(self.common.tls.as_ref(), false).context(ConnectSnafu)?;
+        let connector =
+            WebSocketConnector::new(self.common.uri.clone(), tls, self.common.auth.clone())?;
+
+        let log_namespace = cx.log_namespace(self.log_namespace);
+        let decoder =
+            DecodingConfig::new(self.framing.clone(), self.decoding.clone(), log_namespace)
+                .build()?;
+
+        let params = WebSocketSourceParams {
+            connector,
+            decoder,
+            log_namespace,
+        };
+
+        let source = WebSocketSource::new(self.clone(), params);
+
+        Ok(Box::pin(source.run(cx).map_err(|_err| ())))
+    }
+
+    fn outputs(&self, global_log_namespace: LogNamespace) -> Vec<SourceOutput> {
+        let log_namespace = global_log_namespace.merge(self.log_namespace);
+
+        let schema_definition = self
+            .decoding
+            .schema_definition(log_namespace)
+            .with_standard_vector_source_metadata();
+
+        vec![SourceOutput::new_maybe_logs(
+            self.decoding.output_type(),
+            schema_definition,
+        )]
+    }
+
+    fn can_acknowledge(&self) -> bool {
+        false
+    }
+}
+
+#[cfg(test)]
+mod test {
+    use super::*;
+    use vector_lib::schema::Definition;
+    use vector_lib::{config::LogNamespace, lookup::OwnedTargetPath, schema};
+    use vrl::owned_value_path;
+    use vrl::value::kind::{Collection, Kind};
+
+    #[test]
+    fn generate_config() {
+        crate::test_util::test_generate_config::<WebSocketConfig>();
+    }
+
+    #[test]
+    fn output_schema_definition_vector_namespace() {
+        let config = WebSocketConfig {
+            log_namespace: Some(true),
+            ..Default::default()
+        };
+
+        let definition = config
+            .outputs(LogNamespace::Vector)
+            .remove(0)
+            .schema_definition(true);
+
+        let expected_definition =
+            Definition::new_with_default_metadata(Kind::bytes(), [LogNamespace::Vector])
+                .with_meaning(OwnedTargetPath::event_root(), "message")
+                .with_metadata_field(
+                    &owned_value_path!("vector", "source_type"),
+                    Kind::bytes(),
+                    None,
+                )
+                .with_metadata_field(
+                    &owned_value_path!("vector", "ingest_timestamp"),
+                    Kind::timestamp(),
+                    None,
+                );
+
+        assert_eq!(definition, Some(expected_definition));
+    }
+
+    #[test]
+    fn output_schema_definition_legacy_namespace() {
+        let config = WebSocketConfig::default();
+
+        let definition = config
+            .outputs(LogNamespace::Legacy)
+            .remove(0)
+            .schema_definition(true);
+
+        let expected_definition = schema::Definition::new_with_default_metadata(
+            Kind::object(Collection::empty()),
+            [LogNamespace::Legacy],
+        )
+        .with_event_field(
+            &owned_value_path!("message"),
+            Kind::bytes(),
+            Some("message"),
+        )
+        .with_event_field(&owned_value_path!("timestamp"), Kind::timestamp(), None)
+        .with_event_field(&owned_value_path!("source_type"), Kind::bytes(), None);
+
+        assert_eq!(definition, Some(expected_definition));
+    }
+}
diff --git a/src/sources/websocket/mod.rs b/src/sources/websocket/mod.rs
new file mode 100644
index 0000000000000..838bce4d299bb
--- /dev/null
+++ b/src/sources/websocket/mod.rs
@@ -0,0 +1,2 @@
+pub mod config;
+pub mod source;
diff --git a/src/sources/websocket/source.rs b/src/sources/websocket/source.rs
new file mode 100644
index 0000000000000..cd35c84484d0c
--- /dev/null
+++ b/src/sources/websocket/source.rs
@@ -0,0 +1,729 @@
+use crate::vector_lib::codecs::StreamDecodingError;
+use crate::{
+    codecs::Decoder,
+    common::websocket::{is_closed, PingInterval, WebSocketConnector},
+    config::SourceContext,
+    internal_events::{
+        ConnectionOpen, OpenGauge, WebSocketBytesReceived, WebSocketConnectionError,
+        WebSocketConnectionEstablished, WebSocketConnectionFailedError,
+        WebSocketConnectionShutdown, WebSocketKind, WebSocketMessageReceived,
+        WebSocketReceiveError, WebSocketSendError, PROTOCOL,
+    },
+    sources::websocket::config::WebSocketConfig,
+    SourceSender,
+};
+use chrono::Utc;
+use futures::{pin_mut, sink::SinkExt, Sink, Stream, StreamExt};
+use snafu::Snafu;
+use std::pin::Pin;
+use tokio::time;
+use tokio_tungstenite::tungstenite::protocol::CloseFrame;
+use tokio_tungstenite::tungstenite::{error::Error as TungsteniteError, Message};
+use tokio_util::codec::FramedRead;
+use vector_lib::internal_event::{CountByteSize, EventsReceived, InternalEventHandle as _};
+use vector_lib::{
+    config::LogNamespace,
+    event::{Event, LogEvent},
+    EstimatedJsonEncodedSizeOf,
+};
+
+macro_rules! fail_with_event {
+    ($context:expr) => {{
+        emit!(WebSocketConnectionFailedError {
+            error: Box::new($context.build())
+        });
+        return $context.fail();
+    }};
+}
+
+type WebSocketSink = Pin<Box<dyn Sink<Message, Error = TungsteniteError> + Send>>;
+type WebSocketStream = Pin<Box<dyn Stream<Item = Result<Message, TungsteniteError>> + Send>>;
+
+pub(crate) struct WebSocketSourceParams {
+    pub connector: WebSocketConnector,
+    pub decoder: Decoder,
+    pub log_namespace: LogNamespace,
+}
+
+pub(crate) struct WebSocketSource {
+    config: WebSocketConfig,
+    params: WebSocketSourceParams,
+}
+
+#[derive(Debug, Snafu)]
+pub enum WebSocketSourceError {
+    #[snafu(display("Connection attempt timed out"))]
+    ConnectTimeout,
+
+    #[snafu(display("Server did not respond to the initial message in time"))]
+    InitialMessageTimeout,
+
+    #[snafu(display(
+        "The connection was closed after sending the initial message, but before a response."
+    ))]
+    ConnectionClosedPrematurely,
+
+    #[snafu(display("Connection closed by server with code '{}' and reason: '{}'", frame.code, frame.reason))]
+    RemoteClosed { frame: CloseFrame<'static> },
+
+    #[snafu(display("Connection closed by server without a close frame"))]
+    RemoteClosedEmpty,
+
+    #[snafu(display("Connection timed out while waiting for a pong response"))]
+    PongTimeout,
+
+    #[snafu(display("A WebSocket error occurred: {}", source))]
+    Tungstenite { source: TungsteniteError },
+}
+
+impl WebSocketSource {
+    pub const fn new(config: WebSocketConfig, params: WebSocketSourceParams) -> Self {
+        Self { config, params }
+    }
+
+    pub async fn run(self, cx: SourceContext) -> Result<(), WebSocketSourceError> {
+        let _open_token = OpenGauge::new().open(|count| emit!(ConnectionOpen { count }));
+        let mut ping_manager = PingManager::new(&self.config);
+
+        let mut out = cx.out;
+
+        let (ws_sink, ws_source) = self.connect(&mut out).await?;
+
+        pin_mut!(ws_sink, ws_source);
+
+        loop {
+            let result = tokio::select! {
+                _ = cx.shutdown.clone() => {
+                    info!("Received shutdown signal.");
+                    break;
+                },
+
+                res = ping_manager.tick(&mut ws_sink) => res,
+
+                Some(msg_result) = ws_source.next() => {
+                    match msg_result {
+                        Ok(msg) => self.handle_message(msg, &mut ping_manager, &mut out).await,
+                        Err(error) => {
+                            emit!(WebSocketReceiveError { error: &error });
+                            Err(WebSocketSourceError::Tungstenite { source: error })
+                        }
+                    }
+                }
+            };
+
+            if let Err(error) = result {
+                match error {
+                    WebSocketSourceError::RemoteClosed { frame } => {
+                        warn!(
+                            message = "Connection closed by server.",
+                            code = %frame.code,
+                            reason = %frame.reason
+                        );
+                        emit!(WebSocketConnectionShutdown);
+                    }
+                    WebSocketSourceError::RemoteClosedEmpty => {
+                        warn!("Connection closed by server without a close frame.");
+                        emit!(WebSocketConnectionShutdown);
+                    }
+                    WebSocketSourceError::PongTimeout => {
+                        error!("Disconnecting due to pong timeout.");
+                        emit!(WebSocketReceiveError {
+                            error: &TungsteniteError::Io(std::io::Error::new(
+                                std::io::ErrorKind::TimedOut,
+                                "Pong timeout"
+                            ))
+                        });
+                        emit!(WebSocketConnectionShutdown);
+                        return Err(error);
+                    }
+                    WebSocketSourceError::Tungstenite { source: ws_err } => {
+                        if is_closed(&ws_err) {
+                            emit!(WebSocketConnectionShutdown);
+                        }
+                        error!(message = "WebSocket connection error.", error = %ws_err);
+                    }
+                    // These errors should only happen during `connect` or `reconnect`,
+                    // not in the main loop's result.
+                    WebSocketSourceError::ConnectTimeout
+                    | WebSocketSourceError::InitialMessageTimeout
+                    | WebSocketSourceError::ConnectionClosedPrematurely => {
+                        unreachable!(
+                            "Encountered a connection-time error during runtime: {:?}",
+                            error
+                        );
+                    }
+                }
+                if self
+                    .reconnect(&mut out, &mut ws_sink, &mut ws_source)
+                    .await
+                    .is_err()
+                {
+                    break;
+                }
+            }
+        }
+        Ok(())
+    }
+
+    async fn handle_message(
+        &self,
+        msg: Message,
+        ping_manager: &mut PingManager,
+        out: &mut SourceSender,
+    ) -> Result<(), WebSocketSourceError> {
+        match msg {
+            Message::Pong(_) => {
+                ping_manager.record_pong();
+                Ok(())
+            }
+            Message::Text(msg_txt) => {
+                if self.is_custom_pong(&msg_txt) {
+                    ping_manager.record_pong();
+                    debug!("Received custom pong response.");
+                } else {
+                    self.process_message(&msg_txt, WebSocketKind::Text, out)
+                        .await;
+                }
+                Ok(())
+            }
+            Message::Binary(msg_bytes) => {
+                self.process_message(&msg_bytes, WebSocketKind::Binary, out)
+                    .await;
+                Ok(())
+            }
+            Message::Ping(_) => Ok(()),
+            Message::Close(frame) => self.handle_close_frame(frame),
+            Message::Frame(_) => {
+                warn!("Unsupported message type received: frame.");
+                Ok(())
+            }
+        }
+    }
+
+    async fn process_message<T>(&self, payload: &T, kind: WebSocketKind, out: &mut SourceSender)
+    where
+        T: AsRef<[u8]> + ?Sized,
+    {
+        let payload_bytes = payload.as_ref();
+
+        emit!(WebSocketBytesReceived {
+            byte_size: payload_bytes.len(),
+            url: &self.config.common.uri,
+            protocol: PROTOCOL,
+            kind,
+        });
+        let mut stream = FramedRead::new(payload_bytes, self.params.decoder.clone());
+
+        while let Some(result) = stream.next().await {
+            match result {
+                Ok((events, _)) => {
+                    if events.is_empty() {
+                        continue;
+                    }
+
+                    let event_count = events.len();
+                    let byte_size = events.estimated_json_encoded_size_of();
+
+                    register!(EventsReceived).emit(CountByteSize(event_count, byte_size));
+                    emit!(WebSocketMessageReceived {
+                        count: event_count,
+                        byte_size,
+                        url: &self.config.common.uri,
+                        protocol: PROTOCOL,
+                        kind,
+                    });
+
+                    let events_with_meta = events.into_iter().map(|mut event| {
+                        if let Event::Log(event) = &mut event {
+                            self.add_metadata(event);
+                        }
+                        event
+                    });
+
+                    if let Err(error) = out.send_batch(events_with_meta).await {
+                        error!(message = "Error sending events.", %error);
+                    }
+                }
+                Err(error) => {
+                    if !error.can_continue() {
+                        break;
+                    }
+                }
+            }
+        }
+    }
+
+    fn add_metadata(&self, event: &mut LogEvent) {
+        self.params
+            .log_namespace
+            .insert_standard_vector_source_metadata(event, WebSocketConfig::NAME, Utc::now());
+    }
+
+    async fn reconnect(
+        &self,
+        out: &mut SourceSender,
+        ws_sink: &mut WebSocketSink,
+        ws_source: &mut WebSocketStream,
+    ) -> Result<(), WebSocketSourceError> {
+        info!("Reconnecting to WebSocket...");
+
+        let (new_sink, new_source) = self.connect(out).await?;
+
+        *ws_sink = new_sink;
+        *ws_source = new_source;
+
+        info!("Reconnected.");
+
+        Ok(())
+    }
+
+    async fn connect(
+        &self,
+        out: &mut SourceSender,
+    ) -> Result<(WebSocketSink, WebSocketStream), WebSocketSourceError> {
+        let (mut ws_sink, mut ws_source) = self.try_create_sink_and_stream().await?;
+
+        if self.config.initial_message.is_some() {
+            self.send_initial_message(&mut ws_sink, &mut ws_source, out)
+                .await?;
+        }
+
+        Ok((ws_sink, ws_source))
+    }
+
+    async fn try_create_sink_and_stream(
+        &self,
+    ) -> Result<(WebSocketSink, WebSocketStream), WebSocketSourceError> {
+        let connect_future = self.params.connector.connect_backoff();
+        let timeout = self.config.connect_timeout_secs;
+
+        let ws_stream = match time::timeout(timeout, connect_future).await {
+            Ok(ws) => ws,
+            Err(_) => {
+                emit!(WebSocketConnectionError {
+                    error: TungsteniteError::Io(std::io::Error::new(
+                        std::io::ErrorKind::TimedOut,
+                        "Connection attempt timed out",
+                    ))
+                });
+                return Err(WebSocketSourceError::ConnectTimeout);
+            }
+        };
+
+        emit!(WebSocketConnectionEstablished {});
+        let (sink, stream) = ws_stream.split();
+
+        Ok((Box::pin(sink), Box::pin(stream)))
+    }
+
+    async fn send_initial_message(
+        &self,
+        ws_sink: &mut WebSocketSink,
+        ws_source: &mut WebSocketStream,
+        out: &mut SourceSender,
+    ) -> Result<(), WebSocketSourceError> {
+        let initial_message = self.config.initial_message.as_ref().unwrap();
+        ws_sink
+            .send(Message::Text(initial_message.clone()))
+            .await
+            .map_err(|error| {
+                emit!(WebSocketSendError { error: &error });
+                WebSocketSourceError::Tungstenite { source: error }
+            })?;
+
+        debug!("Sent initial message, awaiting response from server.");
+
+        let response =
+            match time::timeout(self.config.initial_message_timeout_secs, ws_source.next()).await {
+                Ok(Some(msg)) => msg,
+                Ok(None) => fail_with_event!(ConnectionClosedPrematurelySnafu),
+                Err(_) => fail_with_event!(InitialMessageTimeoutSnafu),
+            };
+
+        let message = response.map_err(|source| {
+            emit!(WebSocketReceiveError { error: &source });
+            WebSocketSourceError::Tungstenite { source }
+        })?;
+
+        match message {
+            Message::Text(txt) => {
+                self.process_message(&txt, WebSocketKind::Text, out).await;
+                Ok(())
+            }
+            Message::Binary(bin) => {
+                self.process_message(&bin, WebSocketKind::Binary, out).await;
+                Ok(())
+            }
+            Message::Close(frame) => self.handle_close_frame(frame),
+            _ => Ok(()),
+        }
+    }
+
+    fn handle_close_frame(
+        &self,
+        frame: Option<CloseFrame<'_>>,
+    ) -> Result<(), WebSocketSourceError> {
+        let (error_message, specific_error) = match frame {
+            Some(frame) => {
+                let msg = format!(
+                    "Connection closed by server with code '{}' and reason: '{}'",
+                    frame.code, frame.reason
+                );
+                let err = WebSocketSourceError::RemoteClosed {
+                    frame: frame.into_owned(),
+                };
+                (msg, err)
+            }
+            None => (
+                "Connection closed by server without a close frame".to_string(),
+                WebSocketSourceError::RemoteClosedEmpty,
+            ),
+        };
+
+        let error = TungsteniteError::Io(std::io::Error::new(
+            std::io::ErrorKind::ConnectionAborted,
+            error_message,
+        ));
+        emit!(WebSocketReceiveError { error: &error });
+
+        Err(specific_error)
+    }
+
+    fn is_custom_pong(&self, msg_txt: &str) -> bool {
+        match self.config.pong_message.as_ref() {
+            Some(config) => config.matches(msg_txt),
+            None => false,
+        }
+    }
+}
+
+struct PingManager {
+    interval: PingInterval,
+    waiting_for_pong: bool,
+    message: Message,
+}
+
+impl PingManager {
+    fn new(config: &WebSocketConfig) -> Self {
+        let ping_message = if let Some(ping_msg) = &config.ping_message {
+            Message::Text(ping_msg.clone())
+        } else {
+            Message::Ping(vec![])
+        };
+
+        Self {
+            interval: PingInterval::new(config.common.ping_interval.map(u64::from)),
+            waiting_for_pong: false,
+            message: ping_message,
+        }
+    }
+
+    const fn record_pong(&mut self) {
+        self.waiting_for_pong = false;
+    }
+
+    async fn tick(&mut self, ws_sink: &mut WebSocketSink) -> Result<(), WebSocketSourceError> {
+        self.interval.tick().await;
+
+        if self.waiting_for_pong {
+            return Err(WebSocketSourceError::PongTimeout);
+        }
+
+        ws_sink.send(self.message.clone()).await.map_err(|error| {
+            emit!(WebSocketSendError { error: &error });
+            WebSocketSourceError::Tungstenite { source: error }
+        })?;
+
+        self.waiting_for_pong = true;
+        Ok(())
+    }
+}
+
+#[cfg(feature = "websocket-integration-tests")]
+#[cfg(test)]
+mod integration_test {
+    use crate::test_util::components::run_and_assert_source_error;
+    use crate::{
+        common::websocket::WebSocketCommonConfig,
+        sources::websocket::config::PongMessage,
+        sources::websocket::config::WebSocketConfig,
+        test_util::{
+            components::{run_and_assert_source_compliance, SOURCE_TAGS},
+            next_addr,
+        },
+    };
+    use futures::{sink::SinkExt, StreamExt};
+    use std::borrow::Cow;
+    use std::num::NonZeroU64;
+    use tokio::{net::TcpListener, time::Duration};
+    use tokio_tungstenite::tungstenite::{
+        protocol::frame::coding::CloseCode, protocol::frame::CloseFrame,
+    };
+    use tokio_tungstenite::{accept_async, tungstenite::Message};
+    use url::Url;
+    use vector_lib::codecs::decoding::DeserializerConfig;
+
+    fn make_config(uri: &str) -> WebSocketConfig {
+        WebSocketConfig {
+            common: WebSocketCommonConfig {
+                uri: Url::parse(uri).unwrap().to_string(),
+                ..Default::default()
+            },
+            ..Default::default()
+        }
+    }
+
+    /// Starts a WebSocket server that pushes a binary message to the first client.
+    async fn start_binary_push_server() -> String {
+        let addr = next_addr();
+        let listener = TcpListener::bind(&addr).await.expect("Failed to bind");
+        let server_addr = format!("ws://{}", listener.local_addr().unwrap());
+
+        tokio::spawn(async move {
+            let (stream, _) = listener.accept().await.unwrap();
+            let mut websocket = accept_async(stream).await.expect("Failed to accept");
+
+            let binary_payload = br#"{"message": "binary data"}"#.to_vec();
+            websocket
+                .send(Message::Binary(binary_payload))
+                .await
+                .unwrap();
+        });
+
+        server_addr
+    }
+
+    /// Starts a WebSocket server that pushes a message to the first client that connects.
+    async fn start_push_server() -> String {
+        let addr = next_addr();
+        let listener = TcpListener::bind(&addr).await.expect("Failed to bind");
+        let server_addr = format!("ws://{}", listener.local_addr().unwrap());
+
+        tokio::spawn(async move {
+            // Accept one connection
+            let (stream, _) = listener.accept().await.unwrap();
+            let mut websocket = accept_async(stream).await.expect("Failed to accept");
+
+            // Immediately send a message to the connected client (which will be our source)
+            websocket
+                .send(Message::Text("message from server".to_string()))
+                .await
+                .unwrap();
+        });
+
+        server_addr
+    }
+
+    /// Starts a WebSocket server that waits for an initial message from the client,
+    /// and upon receiving it, sends a confirmation message back.
+    async fn start_subscribe_server(initial_message: String, response_message: String) -> String {
+        let addr = next_addr();
+        let listener = TcpListener::bind(&addr).await.expect("Failed to bind");
+        let server_addr = format!("ws://{}", listener.local_addr().unwrap());
+
+        tokio::spawn(async move {
+            let (stream, _) = listener.accept().await.unwrap();
+            let mut websocket = accept_async(stream).await.expect("Failed to accept");
+
+            // Wait for the initial message from the client
+            if let Some(Ok(Message::Text(msg))) = websocket.next().await {
+                if msg == initial_message {
+                    // Received correct initial message, send response
+                    websocket
+                        .send(Message::Text(response_message))
+                        .await
+                        .unwrap();
+                }
+            }
+        });
+
+        server_addr
+    }
+
+    async fn start_reconnect_server() -> String {
+        let addr = next_addr();
+        let listener = TcpListener::bind(&addr).await.expect("Failed to bind");
+        let server_addr = format!("ws://{}", listener.local_addr().unwrap());
+
+        tokio::spawn(async move {
+            // First connection
+            let (stream, _) = listener.accept().await.unwrap();
+            let mut websocket = accept_async(stream).await.expect("Failed to accept");
+            websocket
+                .send(Message::Text("first message".to_string()))
+                .await
+                .unwrap();
+            // Close the connection to force a reconnect from the client
+            websocket.close(None).await.unwrap();
+
+            // Second connection
+            let (stream, _) = listener.accept().await.unwrap();
+            let mut websocket = accept_async(stream).await.expect("Failed to accept");
+            websocket
+                .send(Message::Text("second message".to_string()))
+                .await
+                .unwrap();
+        });
+
+        server_addr
+    }
+
+    #[tokio::test(flavor = "multi_thread")]
+    async fn websocket_source_reconnects_after_disconnect() {
+        let server_addr = start_reconnect_server().await;
+        let config = make_config(&server_addr);
+
+        // Run for a longer duration to allow for reconnection
+        let events =
+            run_and_assert_source_compliance(config, Duration::from_secs(5), &SOURCE_TAGS).await;
+
+        assert_eq!(
+            events.len(),
+            2,
+            "Should have received messages from both connections"
+        );
+
+        let event = events[0].as_log();
+        assert_eq!(event["message"], "first message".into());
+
+        let event = events[1].as_log();
+        assert_eq!(event["message"], "second message".into());
+    }
+
+    #[tokio::test(flavor = "multi_thread")]
+    async fn websocket_source_consume_binary_event() {
+        let server_addr = start_binary_push_server().await;
+        let mut config = make_config(&server_addr);
+        let decoding = DeserializerConfig::Json(Default::default());
+        config.decoding = decoding;
+
+        let events =
+            run_and_assert_source_compliance(config, Duration::from_secs(2), &SOURCE_TAGS).await;
+
+        assert!(!events.is_empty(), "No events received from source");
+        let event = events[0].as_log();
+        assert_eq!(event["message"], "binary data".into());
+        assert_eq!(*event.get_source_type().unwrap(), "websocket".into());
+    }
+
+    #[tokio::test(flavor = "multi_thread")]
+    async fn websocket_source_consume_event() {
+        let server_addr = start_push_server().await;
+        let config = make_config(&server_addr);
+
+        // Run the source, which will connect to the server and receive the pushed message.
+        let events =
+            run_and_assert_source_compliance(config, Duration::from_secs(2), &SOURCE_TAGS).await;
+
+        // Now assert that the event was received and is correct.
+        assert!(!events.is_empty(), "No events received from source");
+        let event = events[0].as_log();
+        assert_eq!(event["message"], "message from server".into());
+        assert_eq!(*event.get_source_type().unwrap(), "websocket".into());
+    }
+
+    #[tokio::test(flavor = "multi_thread")]
+    async fn websocket_source_sends_initial_message() {
+        let initial_msg = "{\"action\":\"subscribe\",\"topic\":\"test\"}".to_string();
+        let response_msg = "{\"status\":\"subscribed\",\"topic\":\"test\"}".to_string();
+        let server_addr = start_subscribe_server(initial_msg.clone(), response_msg.clone()).await;
+
+        let mut config = make_config(&server_addr);
+        config.initial_message = Some(initial_msg);
+
+        let events =
+            run_and_assert_source_compliance(config, Duration::from_secs(2), &SOURCE_TAGS).await;
+
+        assert!(!events.is_empty(), "No events received from source");
+        let event = events[0].as_log();
+        assert_eq!(event["message"], response_msg.into());
+        assert_eq!(*event.get_source_type().unwrap(), "websocket".into());
+    }
+
+    async fn start_reject_initial_message_server() -> String {
+        let addr = next_addr();
+        let listener = TcpListener::bind(&addr).await.expect("Failed to bind");
+        let server_addr = format!("ws://{}", listener.local_addr().unwrap());
+
+        tokio::spawn(async move {
+            let (stream, _) = listener.accept().await.unwrap();
+            let mut websocket = accept_async(stream).await.expect("Failed to accept");
+
+            if websocket.next().await.is_some() {
+                let close_frame = CloseFrame {
+                    code: CloseCode::Error,
+                    reason: Cow::from("Simulated Internal Server Error"),
+                };
+                let _ = websocket.close(Some(close_frame)).await;
+            }
+        });
+
+        server_addr
+    }
+
+    #[tokio::test(flavor = "multi_thread")]
+    async fn websocket_source_exits_on_rejected_intial_messsage() {
+        let server_addr = start_reject_initial_message_server().await;
+
+        let mut config = make_config(&server_addr);
+        config.initial_message = Some("hello, server!".to_string());
+        config.initial_message_timeout_secs = Duration::from_secs(1);
+
+        run_and_assert_source_error(config, Duration::from_secs(5), &SOURCE_TAGS).await;
+    }
+
+    async fn start_unresponsive_server() -> String {
+        let addr = next_addr();
+        let listener = TcpListener::bind(&addr).await.expect("Failed to bind");
+        let server_addr = format!("ws://{}", listener.local_addr().unwrap());
+
+        tokio::spawn(async move {
+            if let Ok((stream, _)) = listener.accept().await {
+                // Accept the connection to establish the WebSocket.
+                let mut websocket = accept_async(stream).await.expect("Failed to accept");
+                // Simply wait forever without responding to pings.
+                while websocket.next().await.is_some() {
+                    // Do nothing
+                }
+            }
+        });
+
+        server_addr
+    }
+
+    #[tokio::test(flavor = "multi_thread")]
+    async fn websocket_source_exits_on_pong_timeout() {
+        let server_addr = start_unresponsive_server().await;
+
+        let mut config = make_config(&server_addr);
+        config.common.ping_interval = NonZeroU64::new(3);
+        config.common.ping_timeout = NonZeroU64::new(1);
+        config.ping_message = Some("ping".to_string());
+        config.pong_message = Some(PongMessage::Simple("pong".to_string()));
+
+        // The source should fail because the server never sends a pong.
+        run_and_assert_source_error(config, Duration::from_secs(5), &SOURCE_TAGS).await;
+    }
+
+    async fn start_blackhole_server() -> String {
+        let addr = next_addr();
+        let listener = TcpListener::bind(&addr).await.expect("Failed to bind");
+        let server_addr = format!("ws://{}", listener.local_addr().unwrap());
+
+        tokio::spawn(async move {
+            let (mut _socket, _) = listener.accept().await.unwrap();
+            tokio::time::sleep(Duration::from_secs(10)).await;
+        });
+
+        server_addr
+    }
+
+    #[tokio::test(flavor = "multi_thread")]
+    async fn websocket_source_exits_on_connection_timeout() {
+        let server_addr = start_blackhole_server().await;
+        let mut config = make_config(&server_addr);
+        config.connect_timeout_secs = Duration::from_secs(1);
+
+        run_and_assert_source_error(config, Duration::from_secs(5), &SOURCE_TAGS).await;
+    }
+}
diff --git a/website/content/en/docs/reference/configuration/sinks/websocket.md b/website/content/en/docs/reference/configuration/sinks/websocket.md
index c18d9c11d148f..cdaee0d4ea23f 100644
--- a/website/content/en/docs/reference/configuration/sinks/websocket.md
+++ b/website/content/en/docs/reference/configuration/sinks/websocket.md
@@ -1,5 +1,5 @@
 ---
-title: Websocket
+title: WebSocket
 description: Deliver observability event data to a websocket listener
 component_kind: sink
 layout: component
diff --git a/website/content/en/docs/reference/configuration/sinks/websocket_server.md b/website/content/en/docs/reference/configuration/sinks/websocket_server.md
index b30978e23b744..e9e1952b96dd8 100644
--- a/website/content/en/docs/reference/configuration/sinks/websocket_server.md
+++ b/website/content/en/docs/reference/configuration/sinks/websocket_server.md
@@ -1,5 +1,5 @@
 ---
-title: Websocket Server
+title: WebSocket Server
 description: Deliver observability event data to websocket clients
 component_kind: sink
 layout: component
diff --git a/website/content/en/docs/reference/configuration/sources/websocket.md b/website/content/en/docs/reference/configuration/sources/websocket.md
new file mode 100644
index 0000000000000..c079ec2ba8f1b
--- /dev/null
+++ b/website/content/en/docs/reference/configuration/sources/websocket.md
@@ -0,0 +1,14 @@
+---
+title: WebSocket
+description: Receive events from a [WebSocket](https://en.wikipedia.org/wiki/WebSocket) server.
+component_kind: source
+layout: component
+tags: ["websocket", "component", "source"]
+---
+
+{{/*
+This doc is generated using:
+
+1. The template in layouts/docs/component.html
+2. The relevant CUE data in cue/reference/components/...
+*/}}
diff --git a/website/cue/reference/components/sinks/generated/websocket.cue b/website/cue/reference/components/sinks/generated/websocket.cue
index a30cd703f5f9a..6667b2d3a1910 100644
--- a/website/cue/reference/components/sinks/generated/websocket.cue
+++ b/website/cue/reference/components/sinks/generated/websocket.cue
@@ -28,13 +28,8 @@ generated: components: sinks: websocket: configuration: {
 		}
 	}
 	auth: {
-		description: """
-			Configuration of the authentication strategy for HTTP requests.
-
-			HTTP authentication should be used with HTTPS only, as the authentication credentials are passed as an
-			HTTP header without any additional encryption beyond what is provided by the transport itself.
-			"""
-		required: false
+		description: "HTTP Authentication."
+		required:    false
 		type: object: options: {
 			auth: {
 				description:   "The AWS authentication configuration."
@@ -564,7 +559,12 @@ generated: components: sinks: websocket: configuration: {
 			[ping]: https://www.rfc-editor.org/rfc/rfc6455#section-5.5.2
 			"""
 		required: false
-		type: uint: unit: "seconds"
+		type: uint: {
+			examples: [
+				30,
+			]
+			unit: "seconds"
+		}
 	}
 	ping_timeout: {
 		description: """
@@ -575,10 +575,15 @@ generated: components: sinks: websocket: configuration: {
 			[pong]: https://www.rfc-editor.org/rfc/rfc6455#section-5.5.3
 			"""
 		required: false
-		type: uint: unit: "seconds"
+		type: uint: {
+			examples: [
+				5,
+			]
+			unit: "seconds"
+		}
 	}
 	tls: {
-		description: "Configures the TLS options for incoming/outgoing connections."
+		description: "TLS configuration."
 		required:    false
 		type: object: options: {
 			alpn_protocols: {
@@ -686,8 +691,9 @@ generated: components: sinks: websocket: configuration: {
 			The WebSocket URI to connect to.
 
 			This should include the protocol and host, but can also include the port, path, and any other valid part of a URI.
+			 **Note**: Using the `wss://` protocol requires enabling `tls`.
 			"""
 		required: true
-		type: string: {}
+		type: string: examples: ["ws://localhost:8080", "wss://example.com/socket"]
 	}
 }
diff --git a/website/cue/reference/components/sources/generated/websocket.cue b/website/cue/reference/components/sources/generated/websocket.cue
new file mode 100644
index 0000000000000..12ca25a8ec1eb
--- /dev/null
+++ b/website/cue/reference/components/sources/generated/websocket.cue
@@ -0,0 +1,812 @@
+package metadata
+
+generated: components: sources: websocket: configuration: {
+	auth: {
+		description: "HTTP Authentication."
+		required:    false
+		type: object: options: {
+			auth: {
+				description:   "The AWS authentication configuration."
+				relevant_when: "strategy = \"aws\""
+				required:      true
+				type: object: options: {
+					access_key_id: {
+						description: "The AWS access key ID."
+						required:    true
+						type: string: examples: ["AKIAIOSFODNN7EXAMPLE"]
+					}
+					assume_role: {
+						description: """
+																The ARN of an [IAM role][iam_role] to assume.
+
+																[iam_role]: https://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles.html
+																"""
+						required: true
+						type: string: examples: ["arn:aws:iam::123456789098:role/my_role"]
+					}
+					credentials_file: {
+						description: "Path to the credentials file."
+						required:    true
+						type: string: examples: ["/my/aws/credentials"]
+					}
+					external_id: {
+						description: """
+																The optional unique external ID in conjunction with role to assume.
+
+																[external_id]: https://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_create_for-user_externalid.html
+																"""
+						required: false
+						type: string: examples: ["randomEXAMPLEidString"]
+					}
+					imds: {
+						description: "Configuration for authenticating with AWS through IMDS."
+						required:    false
+						type: object: options: {
+							connect_timeout_seconds: {
+								description: "Connect timeout for IMDS."
+								required:    false
+								type: uint: {
+									default: 1
+									unit:    "seconds"
+								}
+							}
+							max_attempts: {
+								description: "Number of IMDS retries for fetching tokens and metadata."
+								required:    false
+								type: uint: default: 4
+							}
+							read_timeout_seconds: {
+								description: "Read timeout for IMDS."
+								required:    false
+								type: uint: {
+									default: 1
+									unit:    "seconds"
+								}
+							}
+						}
+					}
+					load_timeout_secs: {
+						description: """
+																Timeout for successfully loading any credentials, in seconds.
+
+																Relevant when the default credentials chain or `assume_role` is used.
+																"""
+						required: false
+						type: uint: {
+							examples: [30]
+							unit: "seconds"
+						}
+					}
+					profile: {
+						description: """
+																The credentials profile to use.
+
+																Used to select AWS credentials from a provided credentials file.
+																"""
+						required: false
+						type: string: {
+							default: "default"
+							examples: ["develop"]
+						}
+					}
+					region: {
+						description: """
+																The [AWS region][aws_region] to send STS requests to.
+
+																If not set, this defaults to the configured region
+																for the service itself.
+
+																[aws_region]: https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints
+																"""
+						required: false
+						type: string: examples: ["us-west-2"]
+					}
+					secret_access_key: {
+						description: "The AWS secret access key."
+						required:    true
+						type: string: examples: ["wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY"]
+					}
+					session_name: {
+						description: """
+																The optional [RoleSessionName][role_session_name] is a unique session identifier for your assumed role.
+
+																Should be unique per principal or reason.
+																If not set, the session name is autogenerated like assume-role-provider-1736428351340
+
+																[role_session_name]: https://docs.aws.amazon.com/STS/latest/APIReference/API_AssumeRole.html
+																"""
+						required: false
+						type: string: examples: ["vector-indexer-role"]
+					}
+					session_token: {
+						description: """
+																The AWS session token.
+																See [AWS temporary credentials](https://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_temp_use-resources.html)
+																"""
+						required: false
+						type: string: examples: ["AQoDYXdz...AQoDYXdz..."]
+					}
+				}
+			}
+			password: {
+				description:   "The basic authentication password."
+				relevant_when: "strategy = \"basic\""
+				required:      true
+				type: string: examples: ["${PASSWORD}", "password"]
+			}
+			service: {
+				description:   "The AWS service name to use for signing."
+				relevant_when: "strategy = \"aws\""
+				required:      true
+				type: string: {}
+			}
+			strategy: {
+				description: "The authentication strategy to use."
+				required:    true
+				type: string: enum: {
+					aws: "AWS authentication."
+					basic: """
+						Basic authentication.
+
+						The username and password are concatenated and encoded using [base64][base64].
+
+						[base64]: https://en.wikipedia.org/wiki/Base64
+						"""
+					bearer: """
+						Bearer authentication.
+
+						The bearer token value (OAuth2, JWT, etc.) is passed as-is.
+						"""
+				}
+			}
+			token: {
+				description:   "The bearer authentication token."
+				relevant_when: "strategy = \"bearer\""
+				required:      true
+				type: string: {}
+			}
+			user: {
+				description:   "The basic authentication username."
+				relevant_when: "strategy = \"basic\""
+				required:      true
+				type: string: examples: ["${USERNAME}", "username"]
+			}
+		}
+	}
+	connect_timeout_secs: {
+		description: "Number of seconds before timing out while connecting."
+		required:    false
+		type: uint: {
+			default: 30
+			examples: [
+				10,
+			]
+			unit: "seconds"
+		}
+	}
+	decoding: {
+		description: "Decoder to use on each received message."
+		required:    false
+		type: object: options: {
+			avro: {
+				description:   "Apache Avro-specific encoder options."
+				relevant_when: "codec = \"avro\""
+				required:      true
+				type: object: options: {
+					schema: {
+						description: """
+																The Avro schema definition.
+																**Note**: The following [`apache_avro::types::Value`] variants are *not* supported:
+																* `Date`
+																* `Decimal`
+																* `Duration`
+																* `Fixed`
+																* `TimeMillis`
+																"""
+						required: true
+						type: string: examples: ["{ \"type\": \"record\", \"name\": \"log\", \"fields\": [{ \"name\": \"message\", \"type\": \"string\" }] }"]
+					}
+					strip_schema_id_prefix: {
+						description: """
+																For Avro datum encoded in Kafka messages, the bytes are prefixed with the schema ID.  Set this to `true` to strip the schema ID prefix.
+																According to [Confluent Kafka's document](https://docs.confluent.io/platform/current/schema-registry/fundamentals/serdes-develop/index.html#wire-format).
+																"""
+						required: true
+						type: bool: {}
+					}
+				}
+			}
+			codec: {
+				description: "The codec to use for decoding events."
+				required:    false
+				type: string: {
+					default: "bytes"
+					enum: {
+						avro: """
+															Decodes the raw bytes as as an [Apache Avro][apache_avro] message.
+
+															[apache_avro]: https://avro.apache.org/
+															"""
+						bytes: "Uses the raw bytes as-is."
+						gelf: """
+															Decodes the raw bytes as a [GELF][gelf] message.
+
+															This codec is experimental for the following reason:
+
+															The GELF specification is more strict than the actual Graylog receiver.
+															Vector's decoder adheres more strictly to the GELF spec, with
+															the exception that some characters such as `@`  are allowed in field names.
+
+															Other GELF codecs such as Loki's, use a [Go SDK][implementation] that is maintained
+															by Graylog, and is much more relaxed than the GELF spec.
+
+															Going forward, Vector will use that [Go SDK][implementation] as the reference implementation, which means
+															the codec may continue to relax the enforcement of specification.
+
+															[gelf]: https://docs.graylog.org/docs/gelf
+															[implementation]: https://github.com/Graylog2/go-gelf/blob/v2/gelf/reader.go
+															"""
+						influxdb: """
+															Decodes the raw bytes as an [Influxdb Line Protocol][influxdb] message.
+
+															[influxdb]: https://docs.influxdata.com/influxdb/cloud/reference/syntax/line-protocol
+															"""
+						json: """
+															Decodes the raw bytes as [JSON][json].
+
+															[json]: https://www.json.org/
+															"""
+						native: """
+															Decodes the raw bytes as [native Protocol Buffers format][vector_native_protobuf].
+
+															This decoder can output all types of events (logs, metrics, traces).
+
+															This codec is **[experimental][experimental]**.
+
+															[vector_native_protobuf]: https://github.com/vectordotdev/vector/blob/master/lib/vector-core/proto/event.proto
+															[experimental]: https://vector.dev/highlights/2022-03-31-native-event-codecs
+															"""
+						native_json: """
+															Decodes the raw bytes as [native JSON format][vector_native_json].
+
+															This decoder can output all types of events (logs, metrics, traces).
+
+															This codec is **[experimental][experimental]**.
+
+															[vector_native_json]: https://github.com/vectordotdev/vector/blob/master/lib/codecs/tests/data/native_encoding/schema.cue
+															[experimental]: https://vector.dev/highlights/2022-03-31-native-event-codecs
+															"""
+						protobuf: """
+															Decodes the raw bytes as [protobuf][protobuf].
+
+															[protobuf]: https://protobuf.dev/
+															"""
+						syslog: """
+															Decodes the raw bytes as a Syslog message.
+
+															Decodes either as the [RFC 3164][rfc3164]-style format ("old" style) or the
+															[RFC 5424][rfc5424]-style format ("new" style, includes structured data).
+
+															[rfc3164]: https://www.ietf.org/rfc/rfc3164.txt
+															[rfc5424]: https://www.ietf.org/rfc/rfc5424.txt
+															"""
+						vrl: """
+															Decodes the raw bytes as a string and passes them as input to a [VRL][vrl] program.
+
+															[vrl]: https://vector.dev/docs/reference/vrl
+															"""
+					}
+				}
+			}
+			gelf: {
+				description:   "GELF-specific decoding options."
+				relevant_when: "codec = \"gelf\""
+				required:      false
+				type: object: options: lossy: {
+					description: """
+						Determines whether to replace invalid UTF-8 sequences instead of failing.
+
+						When true, invalid UTF-8 sequences are replaced with the [`U+FFFD REPLACEMENT CHARACTER`][U+FFFD].
+
+						[U+FFFD]: https://en.wikipedia.org/wiki/Specials_(Unicode_block)#Replacement_character
+						"""
+					required: false
+					type: bool: default: true
+				}
+			}
+			influxdb: {
+				description:   "Influxdb-specific decoding options."
+				relevant_when: "codec = \"influxdb\""
+				required:      false
+				type: object: options: lossy: {
+					description: """
+						Determines whether to replace invalid UTF-8 sequences instead of failing.
+
+						When true, invalid UTF-8 sequences are replaced with the [`U+FFFD REPLACEMENT CHARACTER`][U+FFFD].
+
+						[U+FFFD]: https://en.wikipedia.org/wiki/Specials_(Unicode_block)#Replacement_character
+						"""
+					required: false
+					type: bool: default: true
+				}
+			}
+			json: {
+				description:   "JSON-specific decoding options."
+				relevant_when: "codec = \"json\""
+				required:      false
+				type: object: options: lossy: {
+					description: """
+						Determines whether to replace invalid UTF-8 sequences instead of failing.
+
+						When true, invalid UTF-8 sequences are replaced with the [`U+FFFD REPLACEMENT CHARACTER`][U+FFFD].
+
+						[U+FFFD]: https://en.wikipedia.org/wiki/Specials_(Unicode_block)#Replacement_character
+						"""
+					required: false
+					type: bool: default: true
+				}
+			}
+			native_json: {
+				description:   "Vector's native JSON-specific decoding options."
+				relevant_when: "codec = \"native_json\""
+				required:      false
+				type: object: options: lossy: {
+					description: """
+						Determines whether to replace invalid UTF-8 sequences instead of failing.
+
+						When true, invalid UTF-8 sequences are replaced with the [`U+FFFD REPLACEMENT CHARACTER`][U+FFFD].
+
+						[U+FFFD]: https://en.wikipedia.org/wiki/Specials_(Unicode_block)#Replacement_character
+						"""
+					required: false
+					type: bool: default: true
+				}
+			}
+			protobuf: {
+				description:   "Protobuf-specific decoding options."
+				relevant_when: "codec = \"protobuf\""
+				required:      false
+				type: object: options: {
+					desc_file: {
+						description: """
+																The path to the protobuf descriptor set file.
+
+																This file is the output of `protoc -I <include path> -o <desc output path> <proto>`
+
+																You can read more [here](https://buf.build/docs/reference/images/#how-buf-images-work).
+																"""
+						required: false
+						type: string: default: ""
+					}
+					message_type: {
+						description: "The name of the message type to use for serializing."
+						required:    false
+						type: string: {
+							default: ""
+							examples: ["package.Message"]
+						}
+					}
+				}
+			}
+			syslog: {
+				description:   "Syslog-specific decoding options."
+				relevant_when: "codec = \"syslog\""
+				required:      false
+				type: object: options: lossy: {
+					description: """
+						Determines whether to replace invalid UTF-8 sequences instead of failing.
+
+						When true, invalid UTF-8 sequences are replaced with the [`U+FFFD REPLACEMENT CHARACTER`][U+FFFD].
+
+						[U+FFFD]: https://en.wikipedia.org/wiki/Specials_(Unicode_block)#Replacement_character
+						"""
+					required: false
+					type: bool: default: true
+				}
+			}
+			vrl: {
+				description:   "VRL-specific decoding options."
+				relevant_when: "codec = \"vrl\""
+				required:      true
+				type: object: options: {
+					source: {
+						description: """
+																The [Vector Remap Language][vrl] (VRL) program to execute for each event.
+																Note that the final contents of the `.` target will be used as the decoding result.
+																Compilation error or use of 'abort' in a program will result in a decoding error.
+
+																[vrl]: https://vector.dev/docs/reference/vrl
+																"""
+						required: true
+						type: string: {}
+					}
+					timezone: {
+						description: """
+																The name of the timezone to apply to timestamp conversions that do not contain an explicit
+																time zone. The time zone name may be any name in the [TZ database][tz_database], or `local`
+																to indicate system local time.
+
+																If not set, `local` is used.
+
+																[tz_database]: https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
+																"""
+						required: false
+						type: string: examples: ["local", "America/New_York", "EST5EDT"]
+					}
+				}
+			}
+		}
+	}
+	framing: {
+		description: "Framing to use in the decoding."
+		required:    false
+		type: object: options: {
+			character_delimited: {
+				description:   "Options for the character delimited decoder."
+				relevant_when: "method = \"character_delimited\""
+				required:      true
+				type: object: options: {
+					delimiter: {
+						description: "The character that delimits byte sequences."
+						required:    true
+						type: ascii_char: {}
+					}
+					max_length: {
+						description: """
+																The maximum length of the byte buffer.
+
+																This length does *not* include the trailing delimiter.
+
+																By default, there is no maximum length enforced. If events are malformed, this can lead to
+																additional resource usage as events continue to be buffered in memory, and can potentially
+																lead to memory exhaustion in extreme cases.
+
+																If there is a risk of processing malformed data, such as logs with user-controlled input,
+																consider setting the maximum length to a reasonably large value as a safety net. This
+																ensures that processing is not actually unbounded.
+																"""
+						required: false
+						type: uint: {}
+					}
+				}
+			}
+			chunked_gelf: {
+				description:   "Options for the chunked GELF decoder."
+				relevant_when: "method = \"chunked_gelf\""
+				required:      false
+				type: object: options: {
+					decompression: {
+						description: "Decompression configuration for GELF messages."
+						required:    false
+						type: string: {
+							default: "Auto"
+							enum: {
+								Auto: "Automatically detect the decompression method based on the magic bytes of the message."
+								Gzip: "Use Gzip decompression."
+								None: "Do not decompress the message."
+								Zlib: "Use Zlib decompression."
+							}
+						}
+					}
+					max_length: {
+						description: """
+																The maximum length of a single GELF message, in bytes. Messages longer than this length will
+																be dropped. If this option is not set, the decoder does not limit the length of messages and
+																the per-message memory is unbounded.
+
+																**Note**: A message can be composed of multiple chunks and this limit is applied to the whole
+																message, not to individual chunks.
+
+																This limit takes only into account the message's payload and the GELF header bytes are excluded from the calculation.
+																The message's payload is the concatenation of all the chunks' payloads.
+																"""
+						required: false
+						type: uint: {}
+					}
+					pending_messages_limit: {
+						description: """
+																The maximum number of pending incomplete messages. If this limit is reached, the decoder starts
+																dropping chunks of new messages, ensuring the memory usage of the decoder's state is bounded.
+																If this option is not set, the decoder does not limit the number of pending messages and the memory usage
+																of its messages buffer can grow unbounded. This matches Graylog Server's behavior.
+																"""
+						required: false
+						type: uint: {}
+					}
+					timeout_secs: {
+						description: """
+																The timeout, in seconds, for a message to be fully received. If the timeout is reached, the
+																decoder drops all the received chunks of the timed out message.
+																"""
+						required: false
+						type: float: default: 5.0
+					}
+				}
+			}
+			length_delimited: {
+				description:   "Options for the length delimited decoder."
+				relevant_when: "method = \"length_delimited\""
+				required:      true
+				type: object: options: {
+					length_field_is_big_endian: {
+						description: "Length field byte order (little or big endian)"
+						required:    false
+						type: bool: default: true
+					}
+					length_field_length: {
+						description: "Number of bytes representing the field length"
+						required:    false
+						type: uint: default: 4
+					}
+					length_field_offset: {
+						description: "Number of bytes in the header before the length field"
+						required:    false
+						type: uint: default: 0
+					}
+					max_frame_length: {
+						description: "Maximum frame length"
+						required:    false
+						type: uint: default: 8388608
+					}
+				}
+			}
+			method: {
+				description: "The framing method."
+				required:    false
+				type: string: {
+					default: "bytes"
+					enum: {
+						bytes:               "Byte frames are passed through as-is according to the underlying I/O boundaries (for example, split between messages or stream segments)."
+						character_delimited: "Byte frames which are delimited by a chosen character."
+						chunked_gelf: """
+															Byte frames which are chunked GELF messages.
+
+															[chunked_gelf]: https://go2docs.graylog.org/current/getting_in_log_data/gelf.html
+															"""
+						length_delimited:  "Byte frames which are prefixed by an unsigned big-endian 32-bit integer indicating the length."
+						newline_delimited: "Byte frames which are delimited by a newline character."
+						octet_counting: """
+															Byte frames according to the [octet counting][octet_counting] format.
+
+															[octet_counting]: https://tools.ietf.org/html/rfc6587#section-3.4.1
+															"""
+					}
+				}
+			}
+			newline_delimited: {
+				description:   "Options for the newline delimited decoder."
+				relevant_when: "method = \"newline_delimited\""
+				required:      false
+				type: object: options: max_length: {
+					description: """
+						The maximum length of the byte buffer.
+
+						This length does *not* include the trailing delimiter.
+
+						By default, there is no maximum length enforced. If events are malformed, this can lead to
+						additional resource usage as events continue to be buffered in memory, and can potentially
+						lead to memory exhaustion in extreme cases.
+
+						If there is a risk of processing malformed data, such as logs with user-controlled input,
+						consider setting the maximum length to a reasonably large value as a safety net. This
+						ensures that processing is not actually unbounded.
+						"""
+					required: false
+					type: uint: {}
+				}
+			}
+			octet_counting: {
+				description:   "Options for the octet counting decoder."
+				relevant_when: "method = \"octet_counting\""
+				required:      false
+				type: object: options: max_length: {
+					description: "The maximum length of the byte buffer."
+					required:    false
+					type: uint: {}
+				}
+			}
+		}
+	}
+	initial_message: {
+		description: "An optional message to send to the server upon connection."
+		required:    false
+		type: string: examples: ["SUBSCRIBE logs"]
+	}
+	initial_message_timeout_secs: {
+		description: """
+			Number of seconds before timing out while waiting for a reply to the initial message.
+			This is only used when `initial_message` is also configured.
+			"""
+		required: false
+		type: uint: {
+			default: 2
+			examples: [
+				5,
+			]
+			unit: "seconds"
+		}
+	}
+	ping_interval: {
+		description: """
+			The interval, in seconds, between sending [Ping][ping]s to the remote peer.
+
+			If this option is not configured, pings are not sent on an interval.
+
+			If the `ping_timeout` is not set, pings are still sent but there is no expectation of pong
+			response times.
+
+			[ping]: https://www.rfc-editor.org/rfc/rfc6455#section-5.5.2
+			"""
+		required: false
+		type: uint: {
+			examples: [
+				30,
+			]
+			unit: "seconds"
+		}
+	}
+	ping_message: {
+		description: """
+			An optional application-level ping message to send over the WebSocket connection.
+			If not set, a standard WebSocket ping control frame is sent instead.
+			"""
+		required: false
+		type: string: {}
+	}
+	ping_timeout: {
+		description: """
+			The number of seconds to wait for a [Pong][pong] response from the remote peer.
+
+			If a response is not received within this time, the connection is re-established.
+
+			[pong]: https://www.rfc-editor.org/rfc/rfc6455#section-5.5.3
+			"""
+		required: false
+		type: uint: {
+			examples: [
+				5,
+			]
+			unit: "seconds"
+		}
+	}
+	pong_message: {
+		description: """
+			The expected application-level pong message to listen for as a response to a custom `ping_message`.
+			This is only used when `ping_message` is also configured. When a custom ping is sent,
+			receiving this specific message confirms that the connection is still alive.
+			"""
+		required: false
+		type: {
+			object: options: {
+				type: {
+					description: "The matching strategy to use for the pong message."
+					required:    true
+					type: string: enum: {
+						contains: "The message must contain the value as a substring."
+						exact:    "The entire message must be an exact match."
+					}
+				}
+				value: {
+					description: "The string value to match against."
+					required:    true
+					type: string: {}
+				}
+			}
+			string: {}
+		}
+	}
+	tls: {
+		description: "TLS configuration."
+		required:    false
+		type: object: options: {
+			alpn_protocols: {
+				description: """
+					Sets the list of supported ALPN protocols.
+
+					Declare the supported ALPN protocols, which are used during negotiation with a peer. They are prioritized in the order
+					that they are defined.
+					"""
+				required: false
+				type: array: items: type: string: examples: ["h2"]
+			}
+			ca_file: {
+				description: """
+					Absolute path to an additional CA certificate file.
+
+					The certificate must be in the DER or PEM (X.509) format. Additionally, the certificate can be provided as an inline string in PEM format.
+					"""
+				required: false
+				type: string: examples: ["/path/to/certificate_authority.crt"]
+			}
+			crt_file: {
+				description: """
+					Absolute path to a certificate file used to identify this server.
+
+					The certificate must be in DER, PEM (X.509), or PKCS#12 format. Additionally, the certificate can be provided as
+					an inline string in PEM format.
+
+					If this is set _and_ is not a PKCS#12 archive, `key_file` must also be set.
+					"""
+				required: false
+				type: string: examples: ["/path/to/host_certificate.crt"]
+			}
+			enabled: {
+				description: """
+					Whether to require TLS for incoming or outgoing connections.
+
+					When enabled and used for incoming connections, an identity certificate is also required. See `tls.crt_file` for
+					more information.
+					"""
+				required: false
+				type: bool: {}
+			}
+			key_file: {
+				description: """
+					Absolute path to a private key file used to identify this server.
+
+					The key must be in DER or PEM (PKCS#8) format. Additionally, the key can be provided as an inline string in PEM format.
+					"""
+				required: false
+				type: string: examples: ["/path/to/host_certificate.key"]
+			}
+			key_pass: {
+				description: """
+					Passphrase used to unlock the encrypted key file.
+
+					This has no effect unless `key_file` is set.
+					"""
+				required: false
+				type: string: examples: ["${KEY_PASS_ENV_VAR}", "PassWord1"]
+			}
+			server_name: {
+				description: """
+					Server name to use when using Server Name Indication (SNI).
+
+					Only relevant for outgoing connections.
+					"""
+				required: false
+				type: string: examples: ["www.example.com"]
+			}
+			verify_certificate: {
+				description: """
+					Enables certificate verification. For components that create a server, this requires that the
+					client connections have a valid client certificate. For components that initiate requests,
+					this validates that the upstream has a valid certificate.
+
+					If enabled, certificates must not be expired and must be issued by a trusted
+					issuer. This verification operates in a hierarchical manner, checking that the leaf certificate (the
+					certificate presented by the client/server) is not only valid, but that the issuer of that certificate is also valid, and
+					so on, until the verification process reaches a root certificate.
+
+					Do NOT set this to `false` unless you understand the risks of not verifying the validity of certificates.
+					"""
+				required: false
+				type: bool: {}
+			}
+			verify_hostname: {
+				description: """
+					Enables hostname verification.
+
+					If enabled, the hostname used to connect to the remote host must be present in the TLS certificate presented by
+					the remote host, either as the Common Name or as an entry in the Subject Alternative Name extension.
+
+					Only relevant for outgoing connections.
+
+					Do NOT set this to `false` unless you understand the risks of not verifying the remote hostname.
+					"""
+				required: false
+				type: bool: {}
+			}
+		}
+	}
+	uri: {
+		description: """
+			The WebSocket URI to connect to.
+
+			This should include the protocol and host, but can also include the port, path, and any other valid part of a URI.
+			 **Note**: Using the `wss://` protocol requires enabling `tls`.
+			"""
+		required: true
+		type: string: examples: ["ws://localhost:8080", "wss://example.com/socket"]
+	}
+}
diff --git a/website/cue/reference/components/sources/websocket.cue b/website/cue/reference/components/sources/websocket.cue
new file mode 100644
index 0000000000000..0969ee3fe0894
--- /dev/null
+++ b/website/cue/reference/components/sources/websocket.cue
@@ -0,0 +1,121 @@
+package metadata
+
+components: sources: websocket: {
+	title: "WebSocket"
+
+	classes: {
+		commonly_used: false
+		delivery:      "best_effort"
+		deployment_roles: ["aggregator"]
+		development:   "beta"
+		egress_method: "stream"
+		stateful:      false
+	}
+
+	features: {
+		acknowledgements: false
+		auto_generated:   true
+		codecs: {
+			enabled:         true
+			default_framing: "message_based"
+		}
+		multiline: enabled: false
+		collect: {
+			checkpoint: {
+				enabled: false
+			}
+			proxy: {
+				enabled: true
+			}
+			tls: {
+				enabled:                true
+				can_verify_certificate: true
+				can_verify_hostname:    true
+				enabled_by_scheme:      true
+				enabled_default:        false
+			}
+			from: {
+				service: services.websocket
+				interface: {
+					socket: {
+						direction: "outgoing"
+						protocols: ["tcp"]
+						ssl: "optional"
+					}
+				}
+			}
+		}
+	}
+
+	support: {
+		targets: {
+			"aarch64-unknown-linux-gnu":      true
+			"aarch64-unknown-linux-musl":     true
+			"armv7-unknown-linux-gnueabihf":  true
+			"armv7-unknown-linux-musleabihf": true
+			"x86_64-apple-darwin":            true
+			"x86_64-unknown-linux-gnu":       true
+			"x86_64-unknown-linux-musl":      true
+		}
+		requirements: []
+		warnings: []
+		notices: []
+	}
+
+	configuration: generated.components.sources.websocket.configuration & {
+		ping_timeout: warnings: ["This option is ignored if the `ping_interval` option is not set."]
+	}
+
+	configuration_examples: [
+		{
+			title: "Common"
+			configuration: {
+				type: "websocket"
+				uri:  "ws://127.0.0.1:8080/events"
+			}
+		},
+		{
+			title: "Advanced"
+			configuration: {
+				type:            "websocket"
+				uri:             "wss://data.example.com/stream"
+				initial_message: "SUBSCRIBE logs"
+				auth: {
+					strategy: "basic"
+					user:     "my_user"
+					password: "${WS_PASSWORD}"
+				}
+				tls: {
+					enabled: true
+				}
+				ping_interval: 30
+				ping_timeout:  10
+				ping_message:  "PING"
+				pong_message:  "PONG"
+			}
+		},
+	]
+
+	output: {
+		logs: event: {
+			description: "An event received from the WebSocket server."
+			fields: {
+				message: {
+					description: "The raw message payload."
+					required:    true
+					type: string: {
+						examples: ["{\"level\":\"info\",\"message\":\"foo\"}"]
+					}
+				}
+				source_type: {
+					description: "The component type."
+					required:    true
+					type: string: {
+						examples: ["websocket"]
+					}
+				}
+				timestamp: fields._current_timestamp
+			}
+		}
+	}
+}

From 963219f6449ae6504bcd053cbf16a87847df1f32 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Aug 2025 16:02:25 +0000
Subject: [PATCH 252/305] chore(deps): Bump criterion from 0.6.0 to 0.7.0
 (#23493)

Bumps [criterion](https://github.com/bheisler/criterion.rs) from 0.6.0 to 0.7.0.
- [Changelog](https://github.com/bheisler/criterion.rs/blob/master/CHANGELOG.md)
- [Commits](https://github.com/bheisler/criterion.rs/compare/0.6.0...0.7.0)

---
updated-dependencies:
- dependency-name: criterion
  dependency-version: 0.7.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock                    | 10 +++++-----
 Cargo.toml                    |  2 +-
 lib/dnsmsg-parser/Cargo.toml  |  2 +-
 lib/file-source/Cargo.toml    |  2 +-
 lib/tracing-limit/Cargo.toml  |  2 +-
 lib/vector-buffers/Cargo.toml |  2 +-
 lib/vector-core/Cargo.toml    |  2 +-
 7 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index b770bb7ee5808..f4974104e2248 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2643,9 +2643,9 @@ dependencies = [
 
 [[package]]
 name = "criterion"
-version = "0.6.0"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3bf7af66b0989381bd0be551bd7cc91912a655a58c6918420c9527b1fd8b4679"
+checksum = "e1c047a62b0cc3e145fa84415a3191f628e980b194c2755aa12300a4e6cbd928"
 dependencies = [
  "anes",
  "cast",
@@ -2667,12 +2667,12 @@ dependencies = [
 
 [[package]]
 name = "criterion-plot"
-version = "0.5.0"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b50826342786a51a89e2da3a28f1c32b06e387201bc2d19791f622c673706b1"
+checksum = "9b1bcc0dc7dfae599d84ad0b1a55f80cde8af3725da8313b528da95ef783e338"
 dependencies = [
  "cast",
- "itertools 0.10.5",
+ "itertools 0.13.0",
 ]
 
 [[package]]
diff --git a/Cargo.toml b/Cargo.toml
index ff91c5a4d38c0..e2dd665f2a904 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -439,7 +439,7 @@ azure_identity = { version = "0.17", default-features = false, features = ["enab
 azure_storage_blobs = { version = "0.17", default-features = false, features = ["azurite_workaround"] }
 azure_storage = { version = "0.17", default-features = false }
 base64 = "0.22.1"
-criterion = { version = "0.6.0", features = ["html_reports", "async_tokio"] }
+criterion = { version = "0.7.0", features = ["html_reports", "async_tokio"] }
 itertools.workspace = true
 libc = "0.2.174"
 similar-asserts = "1.7.0"
diff --git a/lib/dnsmsg-parser/Cargo.toml b/lib/dnsmsg-parser/Cargo.toml
index 69378f2e56b99..bc32ecfe35fd0 100644
--- a/lib/dnsmsg-parser/Cargo.toml
+++ b/lib/dnsmsg-parser/Cargo.toml
@@ -12,7 +12,7 @@ hickory-proto.workspace = true
 snafu.workspace = true
 
 [dev-dependencies]
-criterion = "0.6"
+criterion = "0.7"
 
 [lib]
 bench = false
diff --git a/lib/file-source/Cargo.toml b/lib/file-source/Cargo.toml
index e4ff2274d7c59..36c1addc6cb2f 100644
--- a/lib/file-source/Cargo.toml
+++ b/lib/file-source/Cargo.toml
@@ -73,7 +73,7 @@ default-features = false
 features = ["full"]
 
 [dev-dependencies]
-criterion = "0.6"
+criterion = "0.7"
 quickcheck = "1"
 tempfile.workspace = true
 similar-asserts = "1.7.0"
diff --git a/lib/tracing-limit/Cargo.toml b/lib/tracing-limit/Cargo.toml
index 8d8b430c9033a..2cf44e8873b9f 100644
--- a/lib/tracing-limit/Cargo.toml
+++ b/lib/tracing-limit/Cargo.toml
@@ -12,7 +12,7 @@ tracing-subscriber = { version = "0.3", default-features = false, features = ["r
 dashmap = { version = "6.1.0", default-features = false }
 
 [dev-dependencies]
-criterion = "0.6"
+criterion = "0.7"
 tracing = "0.1.34"
 mock_instant = { version = "0.6" }
 tracing-subscriber = { version = "0.3.19", default-features = false, features = ["env-filter", "fmt"] }
diff --git a/lib/vector-buffers/Cargo.toml b/lib/vector-buffers/Cargo.toml
index c7e32a51f1840..4fcdd77e67946 100644
--- a/lib/vector-buffers/Cargo.toml
+++ b/lib/vector-buffers/Cargo.toml
@@ -37,7 +37,7 @@ ordered-float = { version = "4.6.0", default-features = false }
 
 [dev-dependencies]
 clap.workspace = true
-criterion = { version = "0.6", features = ["html_reports", "async_tokio"] }
+criterion = { version = "0.7", features = ["html_reports", "async_tokio"] }
 crossbeam-queue = "0.3.12"
 hdrhistogram = "7.5.4"
 metrics-tracing-context.workspace = true
diff --git a/lib/vector-core/Cargo.toml b/lib/vector-core/Cargo.toml
index 21be31064bb13..921ff66e0d57d 100644
--- a/lib/vector-core/Cargo.toml
+++ b/lib/vector-core/Cargo.toml
@@ -78,7 +78,7 @@ prost-build.workspace = true
 [dev-dependencies]
 base64 = "0.22.1"
 chrono-tz.workspace = true
-criterion = { version = "0.6.0", features = ["html_reports"] }
+criterion = { version = "0.7.0", features = ["html_reports"] }
 env-test-util = "1.0.1"
 quickcheck = "1"
 quickcheck_macros = "1"

From c4db7972cdfcc94dc8bba13b3ccae34de890d8c8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Aug 2025 13:13:32 -0400
Subject: [PATCH 253/305] chore(deps): Bump databend-client from 0.27.1 to
 0.28.0 (#23491)

Bumps [databend-client](https://github.com/databendlabs/bendsql) from 0.27.1 to 0.28.0.
- [Release notes](https://github.com/databendlabs/bendsql/releases)
- [Commits](https://github.com/databendlabs/bendsql/compare/v0.27.1...v0.28.0)

---
updated-dependencies:
- dependency-name: databend-client
  dependency-version: 0.28.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock | 9 +++++----
 Cargo.toml | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index f4974104e2248..3da59c665617f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2993,9 +2993,9 @@ checksum = "5c297a1c74b71ae29df00c3e22dd9534821d60eb9af5a0192823fa2acea70c2a"
 
 [[package]]
 name = "databend-client"
-version = "0.27.1"
+version = "0.28.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "98306030d9bd9802fa38866eb8b9254f2eeeda44094b4191623d3d73d20b02d2"
+checksum = "08e0717e89fa2d123f4fa6b0ffee9eb3ed1441b73164308bd1e45be2028389c9"
 dependencies = [
  "cookie",
  "log",
@@ -3003,6 +3003,7 @@ dependencies = [
  "parking_lot",
  "percent-encoding",
  "reqwest 0.12.9",
+ "semver 1.0.26",
  "serde",
  "serde_json",
  "tokio",
@@ -7054,9 +7055,9 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.20.2"
+version = "1.21.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775"
+checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
 dependencies = [
  "critical-section",
  "portable-atomic",
diff --git a/Cargo.toml b/Cargo.toml
index e2dd665f2a904..cb8feb4116e0a 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -327,7 +327,7 @@ chrono.workspace = true
 chrono-tz.workspace = true
 colored = { version = "3.0.0", default-features = false }
 csv = { version = "1.3", default-features = false }
-databend-client = { version = "0.27.1", default-features = false, features = ["rustls"], optional = true }
+databend-client = { version = "0.28.0", default-features = false, features = ["rustls"], optional = true }
 derivative = { version = "2.2.0", default-features = false }
 dirs-next = { version = "2.0.0", default-features = false, optional = true }
 dyn-clone = { version = "1.0.19", default-features = false }

From d1ecc0499c6a89aeed25cbdefffe7524ee7abc4f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Aug 2025 17:19:31 +0000
Subject: [PATCH 254/305] chore(ci): Bump github/codeql-action from 3.29.4 to
 3.29.5 (#23505)

Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.29.4 to 3.29.5.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/4e828ff8d448a8a6e532957b1811f387a63867e8...51f77329afa6477de8c49fc9c7046c15b9a4e79d)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-version: 3.29.5
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/scorecard.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index c4e8214594e38..70ba6da880d76 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -68,6 +68,6 @@ jobs:
       # Upload the results to GitHub's code scanning dashboard (optional).
       # Commenting out will disable upload of results to your repo's Code Scanning dashboard
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@4e828ff8d448a8a6e532957b1811f387a63867e8 # v3.29.4
+        uses: github/codeql-action/upload-sarif@51f77329afa6477de8c49fc9c7046c15b9a4e79d # v3.29.5
         with:
           sarif_file: results.sarif

From 81b05d1869cfb7f6a8b97fbc41d01a69b2e28edd Mon Sep 17 00:00:00 2001
From: Benjamin Dornel <benjamindornel@gmail.com>
Date: Sat, 2 Aug 2025 01:20:44 +0800
Subject: [PATCH 255/305] fix(websocket source): treat websocket source tests
 as unit (#23503)

* fix(websocket source): treat websocket source tests as unit

* chore: update semantic
---
 .github/workflows/semantic.yml  | 1 +
 Cargo.toml                      | 2 --
 src/sources/websocket/source.rs | 3 +--
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/semantic.yml b/.github/workflows/semantic.yml
index 4f1dfd98c24f3..0c647d50c9230 100644
--- a/.github/workflows/semantic.yml
+++ b/.github/workflows/semantic.yml
@@ -169,6 +169,7 @@ jobs:
             stdin source
             syslog source
             vector source
+            websocket source
             aws_ec2_metadata transform
             dedupe transform
             filter transform
diff --git a/Cargo.toml b/Cargo.toml
index cb8feb4116e0a..d50b685b888b1 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -891,7 +891,6 @@ all-integration-tests = [
   "redis-integration-tests",
   "splunk-integration-tests",
   "webhdfs-integration-tests",
-  "websocket-integration-tests",
 ]
 
 amqp-integration-tests = ["sources-amqp", "sinks-amqp"]
@@ -958,7 +957,6 @@ redis-integration-tests = ["sinks-redis", "sources-redis"]
 splunk-integration-tests = ["sinks-splunk_hec"]
 dnstap-integration-tests = ["sources-dnstap", "dep:bollard"]
 webhdfs-integration-tests = ["sinks-webhdfs"]
-websocket-integration-tests = ["sources-websocket", "dep:tokio-tungstenite"]
 disable-resolv-conf = []
 shutdown-tests = ["api", "sinks-blackhole", "sinks-console", "sinks-prometheus", "sources", "transforms-lua", "transforms-remap", "unix"]
 cli-tests = ["sinks-blackhole", "sinks-socket", "sources-demo_logs", "sources-file"]
diff --git a/src/sources/websocket/source.rs b/src/sources/websocket/source.rs
index cd35c84484d0c..6a1c98e2b1c57 100644
--- a/src/sources/websocket/source.rs
+++ b/src/sources/websocket/source.rs
@@ -439,9 +439,8 @@ impl PingManager {
     }
 }
 
-#[cfg(feature = "websocket-integration-tests")]
 #[cfg(test)]
-mod integration_test {
+mod tests {
     use crate::test_util::components::run_and_assert_source_error;
     use crate::{
         common::websocket::WebSocketCommonConfig,

From 9f95c21f5644f6a109c0439bce90835824623f84 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Aug 2025 17:38:01 +0000
Subject: [PATCH 256/305] chore(ci): Bump docker/metadata-action from 5.7.0 to
 5.8.0 (#23506)

* chore(ci): Bump docker/metadata-action from 5.7.0 to 5.8.0

Bumps [docker/metadata-action](https://github.com/docker/metadata-action) from 5.7.0 to 5.8.0.
- [Release notes](https://github.com/docker/metadata-action/releases)
- [Commits](https://github.com/docker/metadata-action/compare/902fa8ec7d6ecbf8d84d538b9b233a880e428804...c1e51972afc2121e065aed6d45c65596fe445f3f)

---
updated-dependencies:
- dependency-name: docker/metadata-action
  dependency-version: 5.8.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* Add semver

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Thomas <thomas.schneider@datadoghq.com>
---
 .github/workflows/environment.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/environment.yml b/.github/workflows/environment.yml
index 383edd1d984e9..4540484612559 100644
--- a/.github/workflows/environment.yml
+++ b/.github/workflows/environment.yml
@@ -50,7 +50,7 @@ jobs:
           password: ${{ secrets.CI_DOCKER_PASSWORD }}
       - name: Extract metadata (tags, labels) for Docker
         id: meta
-        uses: docker/metadata-action@902fa8ec7d6ecbf8d84d538b9b233a880e428804
+        uses: docker/metadata-action@c1e51972afc2121e065aed6d45c65596fe445f3f # v5.8.0
         with:
           images: timberio/vector-dev
           flavor: |

From 2003d617c7befdc7aa7f73a37263d272cd4a3718 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Aug 2025 17:38:44 +0000
Subject: [PATCH 257/305] chore(deps): Bump notify from 8.0.0 to 8.1.0 (#23489)

* chore(deps): Bump notify from 8.0.0 to 8.1.0

Bumps [notify](https://github.com/notify-rs/notify) from 8.0.0 to 8.1.0.
- [Release notes](https://github.com/notify-rs/notify/releases)
- [Changelog](https://github.com/notify-rs/notify/blob/main/CHANGELOG.md)
- [Commits](https://github.com/notify-rs/notify/compare/notify-8.0.0...notify-8.1.0)

---
updated-dependencies:
- dependency-name: notify
  dependency-version: 8.1.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* update licenses

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Pavlos Rontidis <pavlos.rontidis@gmail.com>
---
 Cargo.lock           | 32 +++++---------------------------
 Cargo.toml           |  2 +-
 LICENSE-3rdparty.csv |  1 -
 3 files changed, 6 insertions(+), 29 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 3da59c665617f..23ed55a28facb 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3788,18 +3788,6 @@ dependencies = [
  "winapi",
 ]
 
-[[package]]
-name = "filetime"
-version = "0.2.22"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4029edd3e734da6fe05b6cd7bd2960760a616bd2ddd0d59a0124746d6272af0"
-dependencies = [
- "cfg-if",
- "libc",
- "redox_syscall 0.3.5",
- "windows-sys 0.48.0",
-]
-
 [[package]]
 name = "finl_unicode"
 version = "1.2.0"
@@ -5653,9 +5641,9 @@ dependencies = [
 
 [[package]]
 name = "kqueue"
-version = "1.0.8"
+version = "1.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7447f1ca1b7b563588a205fe93dea8df60fd981423a768bc1c0ded35ed147d0c"
+checksum = "eac30106d7dce88daf4a3fcb4879ea939476d5074a9b7ddd0fb97fa4bed5596a"
 dependencies = [
  "kqueue-sys",
  "libc",
@@ -6725,12 +6713,11 @@ checksum = "38bf9645c8b145698bb0b18a4637dcacbc421ea49bef2317e4fd8065a387cf21"
 
 [[package]]
 name = "notify"
-version = "8.0.0"
+version = "8.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2fee8403b3d66ac7b26aee6e40a897d85dc5ce26f44da36b8b73e987cc52e943"
+checksum = "3163f59cd3fa0e9ef8c32f242966a7b9994fd7378366099593e0e73077cd8c97"
 dependencies = [
  "bitflags 2.9.0",
- "filetime",
  "fsevent-sys",
  "inotify",
  "kqueue",
@@ -6739,7 +6726,7 @@ dependencies = [
  "mio",
  "notify-types",
  "walkdir",
- "windows-sys 0.59.0",
+ "windows-sys 0.60.2",
 ]
 
 [[package]]
@@ -8643,15 +8630,6 @@ dependencies = [
  "bitflags 1.3.2",
 ]
 
-[[package]]
-name = "redox_syscall"
-version = "0.3.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29"
-dependencies = [
- "bitflags 1.3.2",
-]
-
 [[package]]
 name = "redox_syscall"
 version = "0.4.1"
diff --git a/Cargo.toml b/Cargo.toml
index d50b685b888b1..fff35d3002303 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -367,7 +367,7 @@ mongodb = { version = "2.8.2", default-features = false, features = ["tokio-runt
 async-nats = { version = "0.33.0", default-features = false, optional = true }
 nkeys = { version = "0.4.4", default-features = false, optional = true }
 nom = { workspace = true, optional = true }
-notify = { version = "8.0.0", default-features = false, features = ["macos_fsevent"] }
+notify = { version = "8.1.0", default-features = false, features = ["macos_fsevent"] }
 openssl = { version = "0.10.73", default-features = false, features = ["vendored"] }
 openssl-probe = { version = "0.1.6", default-features = false }
 ordered-float = { version = "4.6.0", default-features = false }
diff --git a/LICENSE-3rdparty.csv b/LICENSE-3rdparty.csv
index 600c883362c7e..577690bff65aa 100644
--- a/LICENSE-3rdparty.csv
+++ b/LICENSE-3rdparty.csv
@@ -234,7 +234,6 @@ fancy-regex,https://github.com/fancy-regex/fancy-regex,MIT,"Raph Levien <raph@go
 fastrand,https://github.com/smol-rs/fastrand,Apache-2.0 OR MIT,Stjepan Glavina <stjepang@gmail.com>
 ff,https://github.com/zkcrypto/ff,MIT OR Apache-2.0,"Sean Bowe <ewillbefull@gmail.com>, Jack Grigg <thestr4d@gmail.com>"
 fiat-crypto,https://github.com/mit-plv/fiat-crypto,MIT OR Apache-2.0 OR BSD-1-Clause,Fiat Crypto library authors <jgross@mit.edu>
-filetime,https://github.com/alexcrichton/filetime,MIT OR Apache-2.0,Alex Crichton <alex@alexcrichton.com>
 finl_unicode,https://github.com/dahosek/finl_unicode,MIT OR Apache-2.0,The finl_unicode Authors
 flate2,https://github.com/rust-lang/flate2-rs,MIT OR Apache-2.0,"Alex Crichton <alex@alexcrichton.com>, Josh Triplett <josh@joshtriplett.org>"
 float_eq,https://github.com/jtempest/float_eq-rs,MIT OR Apache-2.0,jtempest

From ab36caa0f85f4d22358f0a31621b341311eb61d6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 4 Aug 2025 09:41:51 -0400
Subject: [PATCH 258/305] chore(deps): Bump the patches group with 20 updates
 (#23484)

Bumps the patches group with 20 updates:

| Package | From | To |
| --- | --- | --- |
| [clap](https://github.com/clap-rs/clap) | `4.5.40` | `4.5.42` |
| [aws-runtime](https://github.com/smithy-lang/smithy-rs) | `1.5.8` | `1.5.9` |
| [aws-credential-types](https://github.com/smithy-lang/smithy-rs) | `1.2.3` | `1.2.4` |
| [aws-types](https://github.com/smithy-lang/smithy-rs) | `1.3.7` | `1.3.8` |
| [aws-smithy-http](https://github.com/smithy-lang/smithy-rs) | `0.62.1` | `0.62.2` |
| [aws-smithy-runtime](https://github.com/smithy-lang/smithy-rs) | `1.8.3` | `1.8.4` |
| [aws-smithy-runtime-api](https://github.com/smithy-lang/smithy-rs) | `1.8.1` | `1.8.5` |
| [serde_json](https://github.com/serde-rs/json) | `1.0.140` | `1.0.142` |
| [async-compression](https://github.com/Nullus157/async-compression) | `0.4.25` | `0.4.27` |
| [chrono-tz](https://github.com/chronotope/chrono-tz) | `0.10.3` | `0.10.4` |
| [dyn-clone](https://github.com/dtolnay/dyn-clone) | `1.0.19` | `1.0.20` |
| [nkeys](https://github.com/wasmcloud/nkeys) | `0.4.4` | `0.4.5` |
| [rand](https://github.com/rust-random/rand) | `0.9.1` | `0.9.2` |
| [redis](https://github.com/redis-rs/redis-rs) | `0.32.3` | `0.32.4` |
| [roaring](https://github.com/RoaringBitmap/roaring-rs) | `0.11.0` | `0.11.2` |
| [sysinfo](https://github.com/GuillaumeGomez/sysinfo) | `0.36.0` | `0.36.1` |
| [openssl-src](https://github.com/alexcrichton/openssl-src-rs) | `300.5.0+3.5.0` | `300.5.1+3.5.1` |
| [memmap2](https://github.com/RazrFalcon/memmap2-rs) | `0.9.5` | `0.9.7` |
| [web-sys](https://github.com/rustwasm/wasm-bindgen) | `0.3.65` | `0.3.77` |
| [clap_complete](https://github.com/clap-rs/clap) | `4.5.54` | `4.5.55` |


Updates `clap` from 4.5.40 to 4.5.42
- [Release notes](https://github.com/clap-rs/clap/releases)
- [Changelog](https://github.com/clap-rs/clap/blob/master/CHANGELOG.md)
- [Commits](https://github.com/clap-rs/clap/compare/clap_complete-v4.5.40...clap_complete-v4.5.42)

Updates `aws-runtime` from 1.5.8 to 1.5.9
- [Release notes](https://github.com/smithy-lang/smithy-rs/releases)
- [Changelog](https://github.com/smithy-lang/smithy-rs/blob/main/CHANGELOG.md)
- [Commits](https://github.com/smithy-lang/smithy-rs/commits)

Updates `aws-credential-types` from 1.2.3 to 1.2.4
- [Release notes](https://github.com/smithy-lang/smithy-rs/releases)
- [Changelog](https://github.com/smithy-lang/smithy-rs/blob/main/CHANGELOG.md)
- [Commits](https://github.com/smithy-lang/smithy-rs/commits)

Updates `aws-types` from 1.3.7 to 1.3.8
- [Release notes](https://github.com/smithy-lang/smithy-rs/releases)
- [Changelog](https://github.com/smithy-lang/smithy-rs/blob/main/CHANGELOG.md)
- [Commits](https://github.com/smithy-lang/smithy-rs/commits)

Updates `aws-smithy-http` from 0.62.1 to 0.62.2
- [Release notes](https://github.com/smithy-lang/smithy-rs/releases)
- [Changelog](https://github.com/smithy-lang/smithy-rs/blob/main/CHANGELOG.md)
- [Commits](https://github.com/smithy-lang/smithy-rs/commits)

Updates `aws-smithy-runtime` from 1.8.3 to 1.8.4
- [Release notes](https://github.com/smithy-lang/smithy-rs/releases)
- [Changelog](https://github.com/smithy-lang/smithy-rs/blob/main/CHANGELOG.md)
- [Commits](https://github.com/smithy-lang/smithy-rs/commits)

Updates `aws-smithy-runtime-api` from 1.8.1 to 1.8.5
- [Release notes](https://github.com/smithy-lang/smithy-rs/releases)
- [Changelog](https://github.com/smithy-lang/smithy-rs/blob/main/CHANGELOG.md)
- [Commits](https://github.com/smithy-lang/smithy-rs/commits)

Updates `serde_json` from 1.0.140 to 1.0.142
- [Release notes](https://github.com/serde-rs/json/releases)
- [Commits](https://github.com/serde-rs/json/compare/v1.0.140...v1.0.142)

Updates `async-compression` from 0.4.25 to 0.4.27
- [Release notes](https://github.com/Nullus157/async-compression/releases)
- [Changelog](https://github.com/Nullus157/async-compression/blob/main/CHANGELOG.md)
- [Commits](https://github.com/Nullus157/async-compression/compare/v0.4.25...v0.4.27)

Updates `chrono-tz` from 0.10.3 to 0.10.4
- [Release notes](https://github.com/chronotope/chrono-tz/releases)
- [Commits](https://github.com/chronotope/chrono-tz/compare/v0.10.3...v0.10.4)

Updates `dyn-clone` from 1.0.19 to 1.0.20
- [Release notes](https://github.com/dtolnay/dyn-clone/releases)
- [Commits](https://github.com/dtolnay/dyn-clone/compare/1.0.19...1.0.20)

Updates `nkeys` from 0.4.4 to 0.4.5
- [Release notes](https://github.com/wasmcloud/nkeys/releases)
- [Commits](https://github.com/wasmcloud/nkeys/compare/v0.4.4...v0.4.5)

Updates `rand` from 0.9.1 to 0.9.2
- [Release notes](https://github.com/rust-random/rand/releases)
- [Changelog](https://github.com/rust-random/rand/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rust-random/rand/compare/rand_core-0.9.1...rand_core-0.9.2)

Updates `redis` from 0.32.3 to 0.32.4
- [Release notes](https://github.com/redis-rs/redis-rs/releases)
- [Commits](https://github.com/redis-rs/redis-rs/compare/redis-0.32.3...redis-0.32.4)

Updates `roaring` from 0.11.0 to 0.11.2
- [Release notes](https://github.com/RoaringBitmap/roaring-rs/releases)
- [Commits](https://github.com/RoaringBitmap/roaring-rs/compare/v0.11.0...v0.11.2)

Updates `sysinfo` from 0.36.0 to 0.36.1
- [Changelog](https://github.com/GuillaumeGomez/sysinfo/blob/master/CHANGELOG.md)
- [Commits](https://github.com/GuillaumeGomez/sysinfo/compare/v0.36.0...v0.36.1)

Updates `openssl-src` from 300.5.0+3.5.0 to 300.5.1+3.5.1
- [Release notes](https://github.com/alexcrichton/openssl-src-rs/releases)
- [Commits](https://github.com/alexcrichton/openssl-src-rs/commits)

Updates `memmap2` from 0.9.5 to 0.9.7
- [Changelog](https://github.com/RazrFalcon/memmap2-rs/blob/master/CHANGELOG.md)
- [Commits](https://github.com/RazrFalcon/memmap2-rs/commits)

Updates `web-sys` from 0.3.65 to 0.3.77
- [Release notes](https://github.com/rustwasm/wasm-bindgen/releases)
- [Changelog](https://github.com/wasm-bindgen/wasm-bindgen/blob/main/CHANGELOG.md)
- [Commits](https://github.com/rustwasm/wasm-bindgen/commits)

Updates `clap_complete` from 4.5.54 to 4.5.55
- [Release notes](https://github.com/clap-rs/clap/releases)
- [Changelog](https://github.com/clap-rs/clap/blob/master/CHANGELOG.md)
- [Commits](https://github.com/clap-rs/clap/compare/clap_complete-v4.5.54...clap_complete-v4.5.55)

---
updated-dependencies:
- dependency-name: clap
  dependency-version: 4.5.42
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: patches
- dependency-name: aws-runtime
  dependency-version: 1.5.9
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: patches
- dependency-name: aws-credential-types
  dependency-version: 1.2.4
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: patches
- dependency-name: aws-types
  dependency-version: 1.3.8
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: patches
- dependency-name: aws-smithy-http
  dependency-version: 0.62.2
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: patches
- dependency-name: aws-smithy-runtime
  dependency-version: 1.8.4
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: patches
- dependency-name: aws-smithy-runtime-api
  dependency-version: 1.8.5
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: patches
- dependency-name: serde_json
  dependency-version: 1.0.142
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: patches
- dependency-name: async-compression
  dependency-version: 0.4.27
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: patches
- dependency-name: chrono-tz
  dependency-version: 0.10.4
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: patches
- dependency-name: dyn-clone
  dependency-version: 1.0.20
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: patches
- dependency-name: nkeys
  dependency-version: 0.4.5
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: patches
- dependency-name: rand
  dependency-version: 0.9.2
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: patches
- dependency-name: redis
  dependency-version: 0.32.4
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: patches
- dependency-name: roaring
  dependency-version: 0.11.2
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: patches
- dependency-name: sysinfo
  dependency-version: 0.36.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: patches
- dependency-name: openssl-src
  dependency-version: 300.5.1+3.5.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: patches
- dependency-name: memmap2
  dependency-version: 0.9.7
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: patches
- dependency-name: web-sys
  dependency-version: 0.3.77
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: patches
- dependency-name: clap_complete
  dependency-version: 4.5.55
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: patches
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock                    | 201 ++++++++++++++++------------------
 Cargo.toml                    |  26 ++---
 lib/enrichment/Cargo.toml     |   2 +-
 lib/vector-buffers/Cargo.toml |   2 +-
 lib/vector-core/Cargo.toml    |   2 +-
 vdev/Cargo.toml               |   2 +-
 6 files changed, 110 insertions(+), 125 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 23ed55a28facb..1534eb2c9f10c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -422,9 +422,9 @@ dependencies = [
 
 [[package]]
 name = "async-compression"
-version = "0.4.25"
+version = "0.4.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "40f6024f3f856663b45fd0c9b6f2024034a702f453549449e0d84a305900dad4"
+checksum = "ddb939d66e4ae03cee6091612804ba446b12878410cfa17f785f4dd67d4014e8"
 dependencies = [
  "brotli",
  "flate2",
@@ -826,9 +826,9 @@ dependencies = [
 
 [[package]]
 name = "aws-credential-types"
-version = "1.2.3"
+version = "1.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "687bc16bc431a8533fe0097c7f0182874767f920989d7260950172ae8e3c4465"
+checksum = "b68c2194a190e1efc999612792e25b1ab3abfefe4306494efaaabc25933c0cbe"
 dependencies = [
  "aws-smithy-async",
  "aws-smithy-runtime-api",
@@ -838,9 +838,9 @@ dependencies = [
 
 [[package]]
 name = "aws-runtime"
-version = "1.5.8"
+version = "1.5.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f6c68419d8ba16d9a7463671593c54f81ba58cab466e9b759418da606dcc2e2"
+checksum = "b2090e664216c78e766b6bac10fe74d2f451c02441d43484cd76ac9a295075f7"
 dependencies = [
  "aws-credential-types",
  "aws-sigv4",
@@ -1251,9 +1251,9 @@ dependencies = [
 
 [[package]]
 name = "aws-smithy-eventstream"
-version = "0.60.9"
+version = "0.60.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "338a3642c399c0a5d157648426110e199ca7fd1c689cc395676b81aa563700c4"
+checksum = "604c7aec361252b8f1c871a7641d5e0ba3a7f5a586e51b66bc9510a5519594d9"
 dependencies = [
  "aws-smithy-types",
  "bytes 1.10.1",
@@ -1262,9 +1262,9 @@ dependencies = [
 
 [[package]]
 name = "aws-smithy-http"
-version = "0.62.1"
+version = "0.62.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99335bec6cdc50a346fda1437f9fefe33abf8c99060739a546a16457f2862ca9"
+checksum = "43c82ba4cab184ea61f6edaafc1072aad3c2a17dcf4c0fce19ac5694b90d8b5f"
 dependencies = [
  "aws-smithy-eventstream",
  "aws-smithy-runtime-api",
@@ -1283,13 +1283,14 @@ dependencies = [
 
 [[package]]
 name = "aws-smithy-http-client"
-version = "1.0.1"
+version = "1.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8aff1159006441d02e57204bf57a1b890ba68bedb6904ffd2873c1c4c11c546b"
+checksum = "f108f1ca850f3feef3009bdcc977be201bca9a91058864d9de0684e64514bee0"
 dependencies = [
  "aws-smithy-async",
  "aws-smithy-runtime-api",
  "aws-smithy-types",
+ "h2 0.3.26",
  "h2 0.4.11",
  "http 0.2.9",
  "http-body 0.4.5",
@@ -1331,9 +1332,9 @@ dependencies = [
 
 [[package]]
 name = "aws-smithy-runtime"
-version = "1.8.3"
+version = "1.8.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14302f06d1d5b7d333fd819943075b13d27c7700b414f574c3c35859bfb55d5e"
+checksum = "c3aaec682eb189e43c8a19c3dab2fe54590ad5f2cc2d26ab27608a20f2acf81c"
 dependencies = [
  "aws-smithy-async",
  "aws-smithy-http",
@@ -1355,9 +1356,9 @@ dependencies = [
 
 [[package]]
 name = "aws-smithy-runtime-api"
-version = "1.8.1"
+version = "1.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd8531b6d8882fd8f48f82a9754e682e29dd44cff27154af51fa3eb730f59efb"
+checksum = "937a49ecf061895fca4a6dd8e864208ed9be7546c0527d04bc07d502ec5fba1c"
 dependencies = [
  "aws-smithy-async",
  "aws-smithy-types",
@@ -1407,9 +1408,9 @@ dependencies = [
 
 [[package]]
 name = "aws-types"
-version = "1.3.7"
+version = "1.3.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a322fec39e4df22777ed3ad8ea868ac2f94cd15e1a55f6ee8d8d6305057689a"
+checksum = "b069d19bf01e46298eaedd7c6f283fe565a59263e53eebec945f3e6398f42390"
 dependencies = [
  "aws-credential-types",
  "aws-smithy-async",
@@ -1615,9 +1616,9 @@ dependencies = [
 
 [[package]]
 name = "backon"
-version = "1.5.0"
+version = "1.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd0b50b1b78dbadd44ab18b3c794e496f3a139abb9fbc27d9c94c4eebbb96496"
+checksum = "592277618714fbcecda9a02ba7a8781f319d26532a88553bbacc77ba5d2b3a8d"
 dependencies = [
  "fastrand 2.3.0",
  "gloo-timers",
@@ -1786,7 +1787,7 @@ version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "489d2af57852b78a86478273ac6a1ef912061b6af3a439694c49f309f6ea3bdd"
 dependencies = [
- "siphasher",
+ "siphasher 0.3.11",
 ]
 
 [[package]]
@@ -2124,26 +2125,15 @@ dependencies = [
 
 [[package]]
 name = "chrono-tz"
-version = "0.10.3"
+version = "0.10.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "efdce149c370f133a071ca8ef6ea340b7b88748ab0810097a9e2976eaa34b4f3"
+checksum = "a6139a8597ed92cf816dfb33f5dd6cf0bb93a6adc938f11039f371bc5bcd26c3"
 dependencies = [
  "chrono",
- "chrono-tz-build",
- "phf",
+ "phf 0.12.1",
  "serde",
 ]
 
-[[package]]
-name = "chrono-tz-build"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e94fea34d77a245229e7746bd2beb786cd2a896f306ff491fb8cecb3074b10a7"
-dependencies = [
- "parse-zoneinfo",
- "phf_codegen",
-]
-
 [[package]]
 name = "ciborium"
 version = "0.2.2"
@@ -2190,9 +2180,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.5.40"
+version = "4.5.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "40b6887a1d8685cebccf115538db5c0efe625ccac9696ad45c409d96566e910f"
+checksum = "ed87a9d530bb41a67537289bafcac159cb3ee28460e0a4571123d2a778a6a882"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -2210,9 +2200,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.5.40"
+version = "4.5.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0c66c08ce9f0c698cbce5c0279d0bb6ac936d8674174fe48f736533b964f59e"
+checksum = "64f4f3f3c77c94aff3c7e9aac9a2ca1974a5adf392a8bb751e827d6d127ab966"
 dependencies = [
  "anstream",
  "anstyle",
@@ -2223,18 +2213,18 @@ dependencies = [
 
 [[package]]
 name = "clap_complete"
-version = "4.5.54"
+version = "4.5.55"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aad5b1b4de04fead402672b48897030eec1f3bfe1550776322f59f6d6e6a5677"
+checksum = "a5abde44486daf70c5be8b8f8f1b66c49f86236edf6fa2abadb4d961c4c6229a"
 dependencies = [
  "clap",
 ]
 
 [[package]]
 name = "clap_derive"
-version = "4.5.40"
+version = "4.5.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2c7947ae4cc3d851207c1adb5b5e260ff0cca11446b1d6d1423788e442257ce"
+checksum = "ef4f52386a59ca4c860f7393bcf8abd8dfd91ecccc0f774635ff68e92eeef491"
 dependencies = [
  "heck 0.5.0",
  "proc-macro2 1.0.95",
@@ -2295,7 +2285,7 @@ dependencies = [
  "ordered-float 4.6.0",
  "prost 0.12.6",
  "prost-reflect",
- "rand 0.9.1",
+ "rand 0.9.2",
  "regex",
  "rstest",
  "serde",
@@ -3342,9 +3332,9 @@ checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813"
 
 [[package]]
 name = "dyn-clone"
-version = "1.0.19"
+version = "1.0.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c7a8fb8a9fbf66c1f703fe16184d10ca0ee9d23be5b4436400408ba54a95005"
+checksum = "d0881ea181b1df73ff77ffaaf9c7544ecc11e82fba9b5f27b262a3c73a332555"
 
 [[package]]
 name = "ecdsa"
@@ -3697,7 +3687,7 @@ version = "0.1.0"
 dependencies = [
  "chrono",
  "fakedata_generator",
- "rand 0.9.1",
+ "rand 0.9.2",
 ]
 
 [[package]]
@@ -4203,7 +4193,7 @@ dependencies = [
  "nonzero_ext",
  "parking_lot",
  "portable-atomic",
- "rand 0.9.1",
+ "rand 0.9.2",
  "smallvec",
  "spinning_top",
  "web-time",
@@ -4294,7 +4284,7 @@ dependencies = [
  "greptime-proto",
  "parking_lot",
  "prost 0.12.6",
- "rand 0.9.1",
+ "rand 0.9.2",
  "snafu 0.8.6",
  "tokio",
  "tokio-stream",
@@ -4641,7 +4631,7 @@ dependencies = [
  "idna 1.0.3",
  "ipnet",
  "once_cell",
- "rand 0.9.1",
+ "rand 0.9.2",
  "ring",
  "rustls-pki-types",
  "thiserror 2.0.3",
@@ -5584,7 +5574,7 @@ dependencies = [
  "indoc",
  "k8s-openapi 0.16.0",
  "k8s-test-framework",
- "rand 0.9.1",
+ "rand 0.9.2",
  "regex",
  "reqwest 0.11.26",
  "serde_json",
@@ -6179,9 +6169,9 @@ checksum = "32a282da65faaf38286cf3be983213fcf1d2e2a58700e808f83f4ea9a4804bc0"
 
 [[package]]
 name = "memmap2"
-version = "0.9.5"
+version = "0.9.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd3f7eed9d3848f8b98834af67102b720745c4ec028fcd0aa0239277e7de374f"
+checksum = "483758ad303d734cec05e5c12b41d7e93e6a6390c5e9dae6bdeb7c1259012d28"
 dependencies = [
  "libc",
 ]
@@ -6639,9 +6629,9 @@ dependencies = [
 
 [[package]]
 name = "nkeys"
-version = "0.4.4"
+version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f49e787f4c61cbd0f9320b31cc26e58719f6aa5068e34697dd3aea361412fe3"
+checksum = "879011babc47a1c7fdf5a935ae3cfe94f34645ca0cac1c7f6424b36fc743d1bf"
 dependencies = [
  "data-encoding",
  "ed25519",
@@ -7176,9 +7166,9 @@ checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e"
 
 [[package]]
 name = "openssl-src"
-version = "300.5.0+3.5.0"
+version = "300.5.1+3.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8ce546f549326b0e6052b649198487d91320875da901e7bd11a06d1ee3f9c2f"
+checksum = "735230c832b28c000e3bc117119e6466a663ec73506bc0a9907ea4187508e42a"
 dependencies = [
  "cc",
 ]
@@ -7337,15 +7327,6 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "487f2ccd1e17ce8c1bfab3a65c89525af41cfad4c8659021a1e9a2aacd73b89b"
 
-[[package]]
-name = "parse-zoneinfo"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c705f256449c60da65e11ff6626e0c16a0a0b96aaa348de61376b249bc340f41"
-dependencies = [
- "regex",
-]
-
 [[package]]
 name = "passt"
 version = "0.3.0"
@@ -7463,41 +7444,39 @@ dependencies = [
 ]
 
 [[package]]
-name = "phf_codegen"
-version = "0.11.2"
+name = "phf"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8d39688d359e6b34654d328e262234662d16cc0f60ec8dcbe5e718709342a5a"
+checksum = "913273894cec178f401a31ec4b656318d95473527be05c0752cc41cdc32be8b7"
 dependencies = [
- "phf_generator",
- "phf_shared 0.11.2",
+ "phf_shared 0.12.1",
 ]
 
 [[package]]
-name = "phf_generator"
-version = "0.11.2"
+name = "phf_shared"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0"
+checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096"
 dependencies = [
- "phf_shared 0.11.2",
- "rand 0.8.5",
+ "siphasher 0.3.11",
 ]
 
 [[package]]
 name = "phf_shared"
-version = "0.10.0"
+version = "0.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096"
+checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b"
 dependencies = [
- "siphasher",
+ "siphasher 0.3.11",
 ]
 
 [[package]]
 name = "phf_shared"
-version = "0.11.2"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b"
+checksum = "06005508882fb681fd97892ecff4b7fd0fee13ef1aa569f8695dae7ab9099981"
 dependencies = [
- "siphasher",
+ "siphasher 1.0.1",
 ]
 
 [[package]]
@@ -7677,7 +7656,7 @@ dependencies = [
 name = "portpicker"
 version = "1.0.0"
 dependencies = [
- "rand 0.9.1",
+ "rand 0.9.2",
 ]
 
 [[package]]
@@ -7705,7 +7684,7 @@ dependencies = [
  "hmac",
  "md-5",
  "memchr",
- "rand 0.9.1",
+ "rand 0.9.2",
  "sha2",
  "stringprep",
 ]
@@ -7915,7 +7894,7 @@ dependencies = [
  "bitflags 2.9.0",
  "lazy_static",
  "num-traits",
- "rand 0.9.1",
+ "rand 0.9.2",
  "rand_chacha 0.9.0",
  "rand_xorshift",
  "regex-syntax 0.8.5",
@@ -8392,9 +8371,9 @@ dependencies = [
 
 [[package]]
 name = "rand"
-version = "0.9.1"
+version = "0.9.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fbfd9d094a40bf3ae768db9361049ace4c0e04a4fd6b359518bd7b73a73dd97"
+checksum = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1"
 dependencies = [
  "rand_chacha 0.9.0",
  "rand_core 0.9.0",
@@ -8465,7 +8444,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6a8615d50dcf34fa31f7ab52692afec947c4dd0ab803cc87cb3b0b4570ff7463"
 dependencies = [
  "num-traits",
- "rand 0.9.1",
+ "rand 0.9.2",
 ]
 
 [[package]]
@@ -8596,9 +8575,9 @@ dependencies = [
 
 [[package]]
 name = "redis"
-version = "0.32.3"
+version = "0.32.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f0f6a8c53351d89a3869a703459995a0bcadcfa846002707fbc7e5cca235c4a"
+checksum = "e1f66bf4cac9733a23bcdf1e0e01effbaaad208567beba68be8f67e5f4af3ee1"
 dependencies = [
  "arc-swap",
  "backon",
@@ -8612,9 +8591,9 @@ dependencies = [
  "num-bigint",
  "percent-encoding",
  "pin-project-lite",
- "rand 0.9.1",
+ "rand 0.9.2",
  "ryu",
- "socket2 0.5.10",
+ "socket2 0.6.0",
  "tokio",
  "tokio-native-tls",
  "tokio-util",
@@ -8985,9 +8964,9 @@ dependencies = [
 
 [[package]]
 name = "roaring"
-version = "0.11.0"
+version = "0.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a728d3a68e1cf244b26b3fec3d045a6d69b7890eda1ba6ea451ea88889824e01"
+checksum = "f08d6a905edb32d74a5d5737a0c9d7e950c312f3c46cb0ca0a2ca09ea11878a0"
 dependencies = [
  "bytemuck",
  "byteorder",
@@ -9571,9 +9550,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.140"
+version = "1.0.142"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373"
+checksum = "030fedb782600dcbd6f02d479bf0d817ac3bb40d644745b769d6a96bc3afc5a7"
 dependencies = [
  "indexmap 2.10.0",
  "itoa",
@@ -9887,6 +9866,12 @@ version = "0.3.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d"
 
+[[package]]
+name = "siphasher"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d"
+
 [[package]]
 name = "sketches-ddsketch"
 version = "0.3.0"
@@ -10452,9 +10437,9 @@ dependencies = [
 
 [[package]]
 name = "sysinfo"
-version = "0.36.0"
+version = "0.36.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aab138f5c1bb35231de19049060a87977ad23e04f2303e953bc5c2947ac7dec4"
+checksum = "252800745060e7b9ffb7b2badbd8b31cfa4aa2e61af879d0a3bf2a317c20217d"
 dependencies = [
  "libc",
  "memchr",
@@ -10841,11 +10826,11 @@ dependencies = [
  "log",
  "parking_lot",
  "percent-encoding",
- "phf",
+ "phf 0.11.2",
  "pin-project-lite",
  "postgres-protocol",
  "postgres-types",
- "rand 0.9.1",
+ "rand 0.9.2",
  "socket2 0.5.10",
  "tokio",
  "tokio-util",
@@ -11781,7 +11766,7 @@ checksum = "3cf4199d1e5d15ddd86a694e4d0dffa9c323ce759fea589f00fef9d81cc1931d"
 dependencies = [
  "getrandom 0.3.1",
  "js-sys",
- "rand 0.9.1",
+ "rand 0.9.2",
  "serde",
  "wasm-bindgen",
 ]
@@ -11957,7 +11942,7 @@ dependencies = [
  "netlink-packet-utils",
  "netlink-sys",
  "nix 0.26.2",
- "nkeys 0.4.4",
+ "nkeys 0.4.5",
  "nom 8.0.0",
  "notify",
  "num-format",
@@ -11981,7 +11966,7 @@ dependencies = [
  "pulsar",
  "quick-junit",
  "quickcheck",
- "rand 0.9.1",
+ "rand 0.9.2",
  "rand_distr",
  "ratatui",
  "rdkafka",
@@ -12098,7 +12083,7 @@ dependencies = [
  "paste",
  "proptest",
  "quickcheck",
- "rand 0.9.1",
+ "rand 0.9.2",
  "rkyv",
  "serde",
  "serde_yaml",
@@ -12236,7 +12221,7 @@ dependencies = [
  "quanta",
  "quickcheck",
  "quickcheck_macros",
- "rand 0.9.1",
+ "rand 0.9.2",
  "rand_distr",
  "regex",
  "ryu",
@@ -12311,7 +12296,7 @@ dependencies = [
  "futures-util",
  "pin-project",
  "proptest",
- "rand 0.9.1",
+ "rand 0.9.2",
  "rand_distr",
  "tokio",
  "tokio-util",
@@ -12702,9 +12687,9 @@ dependencies = [
 
 [[package]]
 name = "web-sys"
-version = "0.3.65"
+version = "0.3.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5db499c5f66323272151db0e666cd34f78617522fb0c1604d31a27c50c206a85"
+checksum = "33b6dd2ef9186f1f2072e409e99cd22a975331a6b3591b12c764e0e55c60d5d2"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
diff --git a/Cargo.toml b/Cargo.toml
index fff35d3002303..ca22f73b017e8 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -137,8 +137,8 @@ members = [
 anyhow = "1.0.98"
 cfg-if = { version = "1.0.1", default-features = false }
 chrono = { version = "0.4.41", default-features = false, features = ["clock", "serde"] }
-chrono-tz = { version = "0.10.3", default-features = false, features = ["serde"] }
-clap = { version = "4.5.40", default-features = false, features = ["derive", "error-context", "env", "help", "std", "string", "usage", "wrap_help"] }
+chrono-tz = { version = "0.10.4", default-features = false, features = ["serde"] }
+clap = { version = "4.5.42", default-features = false, features = ["derive", "error-context", "env", "help", "std", "string", "usage", "wrap_help"] }
 darling = { version = "0.20.11", default-features = false, features = ["suggestions"] }
 flate2 = { version = "1.1.2", default-features = false, features = ["zlib-rs"] }
 futures = { version = "0.3.31", default-features = false, features = ["compat", "io-compat", "std"], package = "futures" }
@@ -161,11 +161,11 @@ prost = { version = "0.12", default-features = false, features = ["std"] }
 prost-build = { version = "0.12", default-features = false }
 prost-reflect = { version = "0.14", features = ["serde"], default-features = false }
 prost-types = { version = "0.12", default-features = false }
-rand = { version = "0.9.1", default-features = false, features = ["small_rng", "thread_rng"] }
+rand = { version = "0.9.2", default-features = false, features = ["small_rng", "thread_rng"] }
 rand_distr = { version = "0.5.1", default-features = false }
 semver = { version = "1.0.26", default-features = false, features = ["serde", "std"] }
 serde = { version = "1.0.219", default-features = false, features = ["alloc", "derive", "rc"] }
-serde_json = { version = "1.0.140", default-features = false, features = ["raw_value", "std"] }
+serde_json = { version = "1.0.142", default-features = false, features = ["raw_value", "std"] }
 snafu = { version = "0.8.6", default-features = false, features = ["futures", "std"] }
 socket2 = { version = "0.5.10", default-features = false }
 tempfile = "3.20.0"
@@ -229,9 +229,9 @@ metrics.workspace = true
 metrics-tracing-context.workspace = true
 
 # AWS - Official SDK
-aws-runtime = { version = "1.5.8", optional = true }
+aws-runtime = { version = "1.5.9", optional = true }
 aws-config = { version = "1.6.1", default-features = false, features = ["behavior-version-latest", "credentials-process", "sso", "rt-tokio"], optional = true }
-aws-credential-types = { version = "1.2.3", default-features = false, features = ["hardcoded-credentials"], optional = true }
+aws-credential-types = { version = "1.2.4", default-features = false, features = ["hardcoded-credentials"], optional = true }
 aws-sdk-cloudwatch = { version = "1.70.0", default-features = false, features = ["behavior-version-latest", "rt-tokio"], optional = true }
 aws-sdk-cloudwatchlogs = { version = "1.76.0", default-features = false, features = ["behavior-version-latest", "rt-tokio"], optional = true }
 aws-sdk-elasticsearch = { version = "1.67.0", default-features = false, features = ["behavior-version-latest", "rt-tokio"], optional = true }
@@ -242,7 +242,7 @@ aws-sdk-s3 = { version = "1.15.0", default-features = false, features = ["behavi
 aws-sdk-secretsmanager = { version = "1.76.0", default-features = false, features = ["behavior-version-latest", "rt-tokio"], optional = true }
 aws-sdk-sns = { version = "1.73.0", default-features = false, features = ["behavior-version-latest", "rt-tokio"], optional = true }
 aws-sdk-sqs = { version = "1.64.0", default-features = false, features = ["behavior-version-latest", "rt-tokio"], optional = true }
-aws-types = { version = "1.3.7", default-features = false, optional = true }
+aws-types = { version = "1.3.8", default-features = false, optional = true }
 
 # The sts crate is needed despite not being referred to anywhere in the code because we need to set the
 # `behavior-version-latest` feature. Without this we get a runtime panic when `auth.assume_role` authentication
@@ -315,7 +315,7 @@ greptimedb-ingester = { git = "https://github.com/GreptimeTeam/greptimedb-ingest
 
 # External libs
 arc-swap = { version = "1.7", default-features = false, optional = true }
-async-compression = { version = "0.4.25", default-features = false, features = ["tokio", "gzip", "zstd"], optional = true }
+async-compression = { version = "0.4.27", default-features = false, features = ["tokio", "gzip", "zstd"], optional = true }
 apache-avro = { version = "0.16.0", default-features = false, optional = true }
 axum = { version = "0.6.20", default-features = false }
 base64 = { version = "0.22.1", default-features = false, optional = true }
@@ -330,7 +330,7 @@ csv = { version = "1.3", default-features = false }
 databend-client = { version = "0.28.0", default-features = false, features = ["rustls"], optional = true }
 derivative = { version = "2.2.0", default-features = false }
 dirs-next = { version = "2.0.0", default-features = false, optional = true }
-dyn-clone = { version = "1.0.19", default-features = false }
+dyn-clone = { version = "1.0.20", default-features = false }
 encoding_rs = { version = "0.8.35", default-features = false, features = ["serde"] }
 enum_dispatch = { version = "0.3.13", default-features = false }
 evmap = { version = "10.0.2", default-features = false, optional = true }
@@ -365,7 +365,7 @@ maxminddb = { version = "0.26.0", default-features = false, optional = true, fea
 md-5 = { version = "0.10", default-features = false, optional = true }
 mongodb = { version = "2.8.2", default-features = false, features = ["tokio-runtime"], optional = true }
 async-nats = { version = "0.33.0", default-features = false, optional = true }
-nkeys = { version = "0.4.4", default-features = false, optional = true }
+nkeys = { version = "0.4.5", default-features = false, optional = true }
 nom = { workspace = true, optional = true }
 notify = { version = "8.1.0", default-features = false, features = ["macos_fsevent"] }
 openssl = { version = "0.10.73", default-features = false, features = ["vendored"] }
@@ -378,9 +378,9 @@ quick-junit = { version = "0.5.1" }
 rand.workspace = true
 rand_distr.workspace = true
 rdkafka = { version = "0.37.0", default-features = false, features = ["curl-static", "tokio", "libz", "ssl", "zstd"], optional = true }
-redis = { version = "0.32.3", default-features = false, features = ["connection-manager", "sentinel", "tokio-comp", "tokio-native-tls-comp"], optional = true }
+redis = { version = "0.32.4", default-features = false, features = ["connection-manager", "sentinel", "tokio-comp", "tokio-native-tls-comp"], optional = true }
 regex = { version = "1.11.1", default-features = false, features = ["std", "perf"] }
-roaring = { version = "0.11.0", default-features = false, features = ["std"], optional = true }
+roaring = { version = "0.11.2", default-features = false, features = ["std"], optional = true }
 rumqttc = { version = "0.24.0", default-features = false, features = ["use-rustls"], optional = true }
 seahash = { version = "4.1.0", default-features = false }
 smallvec = { version = "1", default-features = false, features = ["union", "serde"] }
@@ -409,7 +409,7 @@ heim = { git = "https://github.com/vectordotdev/heim.git", branch = "update-nix"
 
 # make sure to update the external docs when the Lua version changes
 mlua = { version = "0.10.5", default-features = false, features = ["lua54", "send", "vendored", "macros"], optional = true }
-sysinfo = "0.36.0"
+sysinfo = "0.36.1"
 byteorder = "1.5.0"
 
 [target.'cfg(windows)'.dependencies]
diff --git a/lib/enrichment/Cargo.toml b/lib/enrichment/Cargo.toml
index d03d71e607046..d6939de55ee95 100644
--- a/lib/enrichment/Cargo.toml
+++ b/lib/enrichment/Cargo.toml
@@ -8,5 +8,5 @@ publish = false
 [dependencies]
 arc-swap = { version = "1.7.1", default-features = false }
 chrono.workspace = true
-dyn-clone = { version = "1.0.19", default-features = false }
+dyn-clone = { version = "1.0.20", default-features = false }
 vrl.workspace = true
diff --git a/lib/vector-buffers/Cargo.toml b/lib/vector-buffers/Cargo.toml
index 4fcdd77e67946..3af8bfa27e229 100644
--- a/lib/vector-buffers/Cargo.toml
+++ b/lib/vector-buffers/Cargo.toml
@@ -20,7 +20,7 @@ crossbeam-utils = { version = "0.8.21", default-features = false }
 derivative = { version = "2.2.0", default-features =  false }
 fslock = { version = "0.2.1", default-features = false, features = ["std"] }
 futures.workspace = true
-memmap2 = { version = "0.9.5", default-features = false }
+memmap2 = { version = "0.9.7", default-features = false }
 metrics.workspace = true
 num-traits = { version = "0.2.19", default-features = false }
 paste.workspace = true
diff --git a/lib/vector-core/Cargo.toml b/lib/vector-core/Cargo.toml
index 921ff66e0d57d..a9b120ef660f0 100644
--- a/lib/vector-core/Cargo.toml
+++ b/lib/vector-core/Cargo.toml
@@ -16,7 +16,7 @@ chrono.workspace = true
 chrono-tz.workspace = true
 crossbeam-utils = { version = "0.8.21", default-features = false }
 derivative = { version = "2.2.0", default-features = false }
-dyn-clone = { version = "1.0.19", default-features = false }
+dyn-clone = { version = "1.0.20", default-features = false }
 enumflags2 = { version = "0.7.12", default-features = false }
 float_eq = { version = "1.0", default-features = false }
 futures.workspace = true
diff --git a/vdev/Cargo.toml b/vdev/Cargo.toml
index 9cbfcb90a5616..a55ba19964645 100644
--- a/vdev/Cargo.toml
+++ b/vdev/Cargo.toml
@@ -12,7 +12,7 @@ anyhow.workspace = true
 chrono.workspace = true
 clap.workspace = true
 clap-verbosity-flag = "3.0.3"
-clap_complete = "4.5.54"
+clap_complete = "4.5.55"
 confy = "1.0.0"
 directories = "6.0.0"
 # remove this when stabilized https://doc.rust-lang.org/stable/std/path/fn.absolute.html

From 51f39d67e56e5d998172b3d5749e23857de01ee7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B2=A1=E5=B4=8E?=
 <61766487+okazaki-kk@users.noreply.github.com>
Date: Tue, 5 Aug 2025 01:21:48 +0900
Subject: [PATCH 259/305] docs(external): Fix instances of removed to_timestamp
 in documentation (#23512)

docs: Fix instances of removed to_timestamp in documentation
---
 website/content/en/docs/administration/monitoring.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/website/content/en/docs/administration/monitoring.md b/website/content/en/docs/administration/monitoring.md
index 72d1dbd41baac..d9947a1b55e67 100644
--- a/website/content/en/docs/administration/monitoring.md
+++ b/website/content/en/docs/administration/monitoring.md
@@ -59,7 +59,7 @@ transforms:
     inputs:
       - vector_logs
     source: |
-      .timestamp = to_unix_timestamp!(to_timestamp!(.timestamp))
+      .timestamp = to_unix_timestamp!(.timestamp)
 
 sinks:
   database:

From 1a07ec4ea801ee778b128abf4fd8410052ca6ac7 Mon Sep 17 00:00:00 2001
From: Pavlos Rontidis <pavlos.rontidis@gmail.com>
Date: Tue, 5 Aug 2025 11:26:34 -0400
Subject: [PATCH 260/305] fix(log_to_metric transform): fix config parsing
 (#23526)

* fix(log_to_metric transform): fix config parsing

* ran cargo fmt

* changelog

* revert edit

* fix docs and regen
---
 changelog.d/log_to_metric_config.fix.md       |   3 +
 src/transforms/log_to_metric.rs               | 128 ++++++++----------
 .../transforms/generated/log_to_metric.cue    |  19 +--
 3 files changed, 67 insertions(+), 83 deletions(-)
 create mode 100644 changelog.d/log_to_metric_config.fix.md

diff --git a/changelog.d/log_to_metric_config.fix.md b/changelog.d/log_to_metric_config.fix.md
new file mode 100644
index 0000000000000..a9f5a2b9fc3e2
--- /dev/null
+++ b/changelog.d/log_to_metric_config.fix.md
@@ -0,0 +1,3 @@
+Fixed a `log_to_metric` config bug, now `all_metrics` can be specified without the need to also set a `metrics` field.
+
+authors: pront
diff --git a/src/transforms/log_to_metric.rs b/src/transforms/log_to_metric.rs
index 4d75b0e9fe095..bf566852598d6 100644
--- a/src/transforms/log_to_metric.rs
+++ b/src/transforms/log_to_metric.rs
@@ -46,13 +46,15 @@ const ORIGIN_SERVICE_VALUE: u32 = 3;
 #[serde(deny_unknown_fields)]
 pub struct LogToMetricConfig {
     /// A list of metrics to generate.
-    pub metrics: Vec<MetricConfig>,
-    /// Setting this flag changes the behavior of this transformation.<br />
-    /// <p>Notably the `metrics` field will be ignored.</p>
-    /// <p>All incoming events will be processed and if possible they will be converted to log events.
-    /// Otherwise, only items specified in the 'metrics' field will be processed.</p>
-    /// <pre class="chroma"><code class="language-toml" data-lang="toml">use serde_json::json;
-    /// let json_event = json!({
+    pub metrics: Option<Vec<MetricConfig>>,
+
+    /// Setting this flag changes the behavior of this transformation.
+    /// Notably the `metrics` field will be ignored.
+    /// All incoming events will be processed and if possible they will be converted to log events.
+    /// Otherwise, only items specified in the `metrics` field will be processed.
+    ///
+    /// Example:
+    /// <pre class="chroma"><code class="language-toml" data-lang="toml">{
     ///     "counter": {
     ///         "value": 10.0
     ///     },
@@ -62,10 +64,10 @@ pub struct LogToMetricConfig {
     ///         "env": "test_env",
     ///         "host": "localhost"
     ///     }
-    /// });
+    /// }
     /// </code></pre>
     ///
-    /// This is an example JSON representation of a counter with the following properties:
+    /// This is a JSON representation of a counter with the following properties:
     ///
     /// - `counter`: An object with a single property `value` representing the counter value, in this case, `10.0`).
     /// - `kind`: A string indicating the kind of counter, in this case, "incremental".
@@ -173,13 +175,14 @@ const fn default_kind() -> MetricKind {
 
 #[derive(Debug, Clone)]
 pub struct LogToMetric {
-    config: LogToMetricConfig,
+    pub metrics: Vec<MetricConfig>,
+    pub all_metrics: bool,
 }
 
 impl GenerateConfig for LogToMetricConfig {
     fn generate_config() -> toml::Value {
         toml::Value::try_from(Self {
-            metrics: vec![MetricConfig {
+            metrics: Some(vec![MetricConfig {
                 field: "field_name".try_into().expect("Fixed template"),
                 name: None,
                 namespace: None,
@@ -188,7 +191,7 @@ impl GenerateConfig for LogToMetricConfig {
                     increment_by_value: false,
                     kind: MetricKind::Incremental,
                 }),
-            }],
+            }]),
             all_metrics: Some(true),
         })
         .unwrap()
@@ -199,7 +202,10 @@ impl GenerateConfig for LogToMetricConfig {
 #[typetag::serde(name = "log_to_metric")]
 impl TransformConfig for LogToMetricConfig {
     async fn build(&self, _context: &TransformContext) -> crate::Result<Transform> {
-        Ok(Transform::function(LogToMetric::new(self.clone())))
+        Ok(Transform::function(LogToMetric {
+            metrics: self.metrics.clone().unwrap_or_default(),
+            all_metrics: self.all_metrics.unwrap_or_default(),
+        }))
     }
 
     fn input(&self) -> Input {
@@ -221,12 +227,6 @@ impl TransformConfig for LogToMetricConfig {
     }
 }
 
-impl LogToMetric {
-    pub const fn new(config: LogToMetricConfig) -> Self {
-        LogToMetric { config }
-    }
-}
-
 /// Kinds of TranformError for Parsing
 #[configurable_component]
 #[derive(Clone, Debug)]
@@ -858,12 +858,8 @@ fn to_metrics(event: &Event) -> Result<Metric, TransformError> {
 impl FunctionTransform for LogToMetric {
     fn transform(&mut self, output: &mut OutputBuffer, event: Event) {
         // Metrics are "all or none" for a specific log. If a single fails, none are produced.
-        let mut buffer = Vec::with_capacity(self.config.metrics.len());
-        if self
-            .config
-            .all_metrics
-            .is_some_and(|all_metrics| all_metrics)
-        {
+        let mut buffer = Vec::with_capacity(self.metrics.len());
+        if self.all_metrics {
             match to_metrics(&event) {
                 Ok(metric) => {
                     output.push(Event::Metric(metric));
@@ -895,7 +891,7 @@ impl FunctionTransform for LogToMetric {
                 }
             }
         } else {
-            for config in self.config.metrics.iter() {
+            for config in self.metrics.iter() {
                 match to_metric_with_config(config, &event) {
                     Ok(metric) => {
                         buffer.push(Event::Metric(metric));
@@ -1819,12 +1815,10 @@ mod tests {
 
     #[tokio::test]
     async fn transform_gauge() {
-        let config = parse_yaml_config(
-            r"
-            metrics: []
-            all_metrics: true
-            ",
-        );
+        let config = LogToMetricConfig {
+            metrics: None,
+            all_metrics: Some(true),
+        };
 
         let json_str = r#"{
           "gauge": {
@@ -1858,12 +1852,10 @@ mod tests {
 
     #[tokio::test]
     async fn transform_histogram() {
-        let config = parse_yaml_config(
-            r"
-            metrics: []
-            all_metrics: true
-            ",
-        );
+        let config = LogToMetricConfig {
+            metrics: None,
+            all_metrics: Some(true),
+        };
 
         let json_str = r#"{
           "histogram": {
@@ -1937,12 +1929,10 @@ mod tests {
 
     #[tokio::test]
     async fn transform_distribution_histogram() {
-        let config = parse_yaml_config(
-            r"
-            metrics: []
-            all_metrics: true
-            ",
-        );
+        let config = LogToMetricConfig {
+            metrics: None,
+            all_metrics: Some(true),
+        };
 
         let json_str = r#"{
           "distribution": {
@@ -1998,12 +1988,10 @@ mod tests {
 
     #[tokio::test]
     async fn transform_distribution_summary() {
-        let config = parse_yaml_config(
-            r"
-            metrics: []
-            all_metrics: true
-            ",
-        );
+        let config = LogToMetricConfig {
+            metrics: None,
+            all_metrics: Some(true),
+        };
 
         let json_str = r#"{
           "distribution": {
@@ -2059,12 +2047,10 @@ mod tests {
 
     #[tokio::test]
     async fn transform_summary() {
-        let config = parse_yaml_config(
-            r"
-            metrics: []
-            all_metrics: true
-            ",
-        );
+        let config = LogToMetricConfig {
+            metrics: None,
+            all_metrics: Some(true),
+        };
 
         let json_str = r#"{
           "summary": {
@@ -2122,12 +2108,10 @@ mod tests {
 
     #[tokio::test]
     async fn transform_counter() {
-        let config = parse_yaml_config(
-            r"
-            metrics: []
-            all_metrics: true
-            ",
-        );
+        let config = LogToMetricConfig {
+            metrics: None,
+            all_metrics: Some(true),
+        };
 
         let json_str = r#"{
           "counter": {
@@ -2161,12 +2145,10 @@ mod tests {
 
     #[tokio::test]
     async fn transform_set() {
-        let config = parse_yaml_config(
-            r"
-            metrics: []
-            all_metrics: true
-            ",
-        );
+        let config = LogToMetricConfig {
+            metrics: None,
+            all_metrics: Some(true),
+        };
 
         let json_str = r#"{
           "set": {
@@ -2202,12 +2184,10 @@ mod tests {
 
     #[tokio::test]
     async fn transform_all_metrics_optional_namespace() {
-        let config = parse_yaml_config(
-            r"
-            metrics: []
-            all_metrics: true
-            ",
-        );
+        let config = LogToMetricConfig {
+            metrics: None,
+            all_metrics: Some(true),
+        };
 
         let json_str = r#"{
           "counter": {
diff --git a/website/cue/reference/components/transforms/generated/log_to_metric.cue b/website/cue/reference/components/transforms/generated/log_to_metric.cue
index 34930849334bd..aa277b95b2024 100644
--- a/website/cue/reference/components/transforms/generated/log_to_metric.cue
+++ b/website/cue/reference/components/transforms/generated/log_to_metric.cue
@@ -3,12 +3,13 @@ package metadata
 generated: components: transforms: log_to_metric: configuration: {
 	all_metrics: {
 		description: """
-			Setting this flag changes the behavior of this transformation.<br />
-			<p>Notably the `metrics` field will be ignored.</p>
-			<p>All incoming events will be processed and if possible they will be converted to log events.
-			Otherwise, only items specified in the 'metrics' field will be processed.</p>
-			<pre class="chroma"><code class="language-toml" data-lang="toml">use serde_json::json;
-			let json_event = json!({
+			Setting this flag changes the behavior of this transformation.
+			Notably the `metrics` field will be ignored.
+			All incoming events will be processed and if possible they will be converted to log events.
+			Otherwise, only items specified in the `metrics` field will be processed.
+
+			Example:
+			<pre class="chroma"><code class="language-toml" data-lang="toml">{
 			    "counter": {
 			        "value": 10.0
 			    },
@@ -18,10 +19,10 @@ generated: components: transforms: log_to_metric: configuration: {
 			        "env": "test_env",
 			        "host": "localhost"
 			    }
-			});
+			}
 			</code></pre>
 
-			This is an example JSON representation of a counter with the following properties:
+			This is a JSON representation of a counter with the following properties:
 
 			- `counter`: An object with a single property `value` representing the counter value, in this case, `10.0`).
 			- `kind`: A string indicating the kind of counter, in this case, "incremental".
@@ -35,7 +36,7 @@ generated: components: transforms: log_to_metric: configuration: {
 	}
 	metrics: {
 		description: "A list of metrics to generate."
-		required:    true
+		required:    false
 		type: array: items: type: object: options: {
 			field: {
 				description: "Name of the field in the event to generate the metric."

From 71b378aedb993f78d5dc6febbaffb1c37c1f88fd Mon Sep 17 00:00:00 2001
From: Pavlos Rontidis <pavlos.rontidis@gmail.com>
Date: Tue, 5 Aug 2025 12:20:37 -0400
Subject: [PATCH 261/305] chore(website): rename 'common' to 'minimal' (#23527)

---
 .../partials/components/example-configs.html  |  4 +-
 website/scripts/create-config-examples.js     | 40 +++++++++----------
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/website/layouts/partials/components/example-configs.html b/website/layouts/partials/components/example-configs.html
index 79a75c81bbe48..6eac78732f54b 100644
--- a/website/layouts/partials/components/example-configs.html
+++ b/website/layouts/partials/components/example-configs.html
@@ -1,7 +1,7 @@
 {{ $examples := .examples }}
-{{ $levels := slice "common" "advanced" }}
+{{ $levels := slice "minimal" "advanced" }}
 {{ $formats := slice "yaml"  "toml" "json" }}
-<div x-data="{ level: 'common', format: $store.global.format }" class="no-prose mb-4 border dark:border-gray-700 rounded-md shadow py-4 px-6">
+<div x-data="{ level: 'minimal', format: $store.global.format }" class="no-prose mb-4 border dark:border-gray-700 rounded-md shadow py-4 px-6">
   <span>
     {{ partial "heading.html" (dict "text" "Example configurations" "level" 3) }}
   </span>
diff --git a/website/scripts/create-config-examples.js b/website/scripts/create-config-examples.js
index 164d64ed29d96..64a47363464fd 100755
--- a/website/scripts/create-config-examples.js
+++ b/website/scripts/create-config-examples.js
@@ -158,22 +158,22 @@ const setExampleValue = (exampleConfig, paramName, param) => {
   });
 }
 
-// Assemble the "common" params for an example config
-const makeCommonParams = (configuration) => {
-  var common = {};
+// Assemble the "minimal" params for an example config
+const makeMinimalParams = (configuration) => {
+  var minimal = {};
 
   for (const paramName in configuration) {
     if (paramName != "type") {
       const param = configuration[paramName];
 
-      // Restrict to common params only
-      if (param.common || param.required) {
-        setExampleValue(common, paramName, param);
+      // Restrict to minimal params only
+      if (param.minimal || param.required) {
+        setExampleValue(minimal, paramName, param);
       }
     }
   }
 
-  return common;
+  return minimal;
 }
 
 // Assemble the "advanced" params for an example config
@@ -282,30 +282,30 @@ const main = () => {
         const component = componentsOfKind[componentType];
         const configuration = component.configuration;
 
-        const commonParams = Object.makeExampleParams(
+        const minimalParams = Object.makeExampleParams(
           configuration,
-          p => p.required || p.common,
-          p => p.required || p.common,
+            p => p.required || p.minimal,
+            p => p.required || p.minimal,
         );
         const advancedParams = Object.makeExampleParams(
           configuration,
           _ => true,
-          p => p.required || p.common || p.relevant_when,
+            p => p.required || p.minimal || p.relevant_when,
         );
         const useCaseExamples = makeUseCaseExamples(component);
 
         const keyName = `my_${kind.substring(0, kind.length - 1)}_id`;
 
-        let commonExampleConfig, advancedExampleConfig;
+        let minimalExampleConfig, advancedExampleConfig;
 
         // Sinks and transforms are treated differently because they need an `inputs` field
         if (['sinks', 'transforms'].includes(kind)) {
-          commonExampleConfig = {
+          minimalExampleConfig = {
             [kind]: {
               [keyName]: {
                 "type": componentType,
                 inputs: ['my-source-or-transform-id'],
-                ...commonParams,
+                ...minimalParams,
               }
             }
           };
@@ -320,11 +320,11 @@ const main = () => {
             }
           };
         } else {
-          commonExampleConfig = {
+          minimalExampleConfig = {
             [kind]: {
               [keyName]: {
                 "type": componentType,
-                ...commonParams,
+                ...minimalParams,
               }
             }
           };
@@ -342,10 +342,10 @@ const main = () => {
         docs['components'][kind][componentType]['examples'] = useCaseExamples;
 
         docs['components'][kind][componentType]['example_configs'] = {
-          common: {
-            toml: toToml(commonExampleConfig),
-            yaml: toYaml(commonExampleConfig),
-            json: toJson(commonExampleConfig),
+          minimal: {
+            toml: toToml(minimalExampleConfig),
+            yaml: toYaml(minimalExampleConfig),
+            json: toJson(minimalExampleConfig),
           },
           advanced: {
             toml: toToml(advancedExampleConfig),

From 06727eb0f1dd1fb3b4c6229ea5017a7afdc376a0 Mon Sep 17 00:00:00 2001
From: Jake Halaska <26490690+5Dev24@users.noreply.github.com>
Date: Tue, 5 Aug 2025 12:07:39 -0500
Subject: [PATCH 262/305] feat(redis sink): add Redis ZADD support for redis
 sink (#23464)

* feat: redis zadd support in sink

* update spell-checking

* adopt visibility changes

* inline params

* merge score into `SortedSetOption` and move examples into Rustdocs

* Make `sorted set` method optional

* update redis integration test
---
 .github/actions/spelling/allow.txt            |   2 +
 changelog.d/redis_zadd_in_sink.feature.md     |   3 +
 src/sinks/redis/config.rs                     |  48 +++++-
 src/sinks/redis/integration_tests.rs          | 155 ++++++++++++++----
 src/sinks/redis/mod.rs                        |  14 +-
 src/sinks/redis/request_builder.rs            |  12 +-
 src/sinks/redis/service.rs                    |  19 ++-
 src/sinks/redis/sink.rs                       |  32 +++-
 src/sinks/redis/tests.rs                      |  25 +++
 .../components/sinks/generated/redis.cue      |  37 +++++
 10 files changed, 302 insertions(+), 45 deletions(-)
 create mode 100644 changelog.d/redis_zadd_in_sink.feature.md

diff --git a/.github/actions/spelling/allow.txt b/.github/actions/spelling/allow.txt
index 2ca815cca913b..b4ac8ee77e9c1 100644
--- a/.github/actions/spelling/allow.txt
+++ b/.github/actions/spelling/allow.txt
@@ -461,6 +461,7 @@ Softbank
 Sogou
 solarwinds
 Soref
+sortedset
 splunk
 ssh
 staticuser
@@ -524,6 +525,7 @@ XSALSA
 yandex
 Yarvik
 Yifang
+zadd
 zeek
 zookeeper
 Zopo
diff --git a/changelog.d/redis_zadd_in_sink.feature.md b/changelog.d/redis_zadd_in_sink.feature.md
new file mode 100644
index 0000000000000..febd7ffe0b267
--- /dev/null
+++ b/changelog.d/redis_zadd_in_sink.feature.md
@@ -0,0 +1,3 @@
+Adds support for the Redis ZADD command in the Redis sink.
+
+authors: 5Dev24
diff --git a/src/sinks/redis/config.rs b/src/sinks/redis/config.rs
index 6e2143aa75da9..a8a49d01e02fc 100644
--- a/src/sinks/redis/config.rs
+++ b/src/sinks/redis/config.rs
@@ -35,6 +35,12 @@ pub enum DataTypeConfig {
     #[derivative(Default)]
     List,
 
+    /// The Redis `sorted set` type.
+    ///
+    /// This resembles a priority queue, where messages can be pushed and popped with an
+    /// associated score.
+    SortedSet,
+
     /// The Redis `channel` type.
     ///
     /// Redis channels function in a pub/sub fashion, allowing many-to-many broadcasting and receiving.
@@ -47,7 +53,7 @@ pub enum DataTypeConfig {
 #[serde(rename_all = "lowercase")]
 pub struct ListOption {
     /// The method to use for pushing messages into a `list`.
-    pub(super) method: Method,
+    pub method: ListMethod,
 }
 
 /// Method for pushing messages into a `list`.
@@ -55,7 +61,7 @@ pub struct ListOption {
 #[derive(Clone, Copy, Debug, Derivative, Eq, PartialEq)]
 #[derivative(Default)]
 #[serde(rename_all = "lowercase")]
-pub enum Method {
+pub enum ListMethod {
     /// Use the `rpush` method.
     ///
     /// This pushes messages onto the tail of the list.
@@ -70,6 +76,40 @@ pub enum Method {
     LPush,
 }
 
+/// Sorted Set-specific options
+#[configurable_component]
+#[derive(Clone, Debug, Derivative, Eq, PartialEq)]
+#[serde(rename_all = "lowercase")]
+pub struct SortedSetOption {
+    /// The method to use for pushing messages into a `sorted set`.
+    pub method: Option<SortedSetMethod>,
+
+    /// The score to publish a message with to a `sorted set`.
+    ///
+    /// Examples:
+    /// - `%s`
+    /// - `%Y%m%d%H%M%S`
+    // Examples added in Rustdoc as `vector-config`'s metadata doesn't handle
+    // UnsignedIntTemplate's properly yet. TODO: Improve this.
+    #[configurable(validation(length(min = 1)))]
+    pub score: Option<UnsignedIntTemplate>,
+}
+
+/// Method for pushing messages into a `sorted set`.
+#[configurable_component]
+#[derive(Clone, Copy, Debug, Derivative, Eq, PartialEq)]
+#[derivative(Default)]
+#[serde(rename_all = "lowercase")]
+pub enum SortedSetMethod {
+    /// Use the `zadd` method.
+    ///
+    /// This adds messages onto a queue with a score.
+    ///
+    /// This is the default.
+    #[derivative(Default)]
+    ZAdd,
+}
+
 #[derive(Clone, Copy, Debug, Default)]
 pub struct RedisDefaultBatchSettings;
 
@@ -95,6 +135,10 @@ pub struct RedisSinkConfig {
     #[serde(alias = "list")]
     pub(super) list_option: Option<ListOption>,
 
+    #[configurable(derived)]
+    #[serde(alias = "sorted_set")]
+    pub(super) sorted_set_option: Option<SortedSetOption>,
+
     /// The URL of the Redis endpoint to connect to.
     ///
     /// The URL _must_ take the form of `protocol://server:port/db` where the protocol can either be
diff --git a/src/sinks/redis/integration_tests.rs b/src/sinks/redis/integration_tests.rs
index 379f33f082834..341e527f69fc3 100644
--- a/src/sinks/redis/integration_tests.rs
+++ b/src/sinks/redis/integration_tests.rs
@@ -11,7 +11,9 @@ use crate::event::{
     BatchNotifier, BatchStatus, Event, Metric, MetricKind, MetricValue, TraceEvent,
 };
 
-use super::config::{DataTypeConfig, ListOption, Method, RedisSinkConfig};
+use super::config::{
+    DataTypeConfig, ListMethod, ListOption, RedisSinkConfig, SortedSetMethod, SortedSetOption,
+};
 use crate::{
     serde::OneOrMany,
     sinks::prelude::*,
@@ -43,8 +45,9 @@ async fn redis_sink_sentinel_reaches_primary() {
         encoding: JsonSerializerConfig::default().into(),
         data_type: DataTypeConfig::List,
         list_option: Some(ListOption {
-            method: Method::RPush,
+            method: ListMethod::RPush,
         }),
+        sorted_set_option: None,
         batch: BatchConfig::default(),
         request: TowerRequestConfig {
             rate_limit_num: u64::MAX,
@@ -74,10 +77,10 @@ async fn redis_sink_sentinel_rpush() {
 
     let key = Template::try_from(format!("test-{}", random_string(10)))
         .expect("should not fail to create key template");
-    debug!("Test key name: {}.", key);
+    debug!("Test key name: {key}.");
     let mut rng = rand::rng();
     let num_events = rng.random_range(10000..20000);
-    debug!("Test events num: {}.", num_events);
+    debug!("Test events num: {num_events}.");
 
     let cnf = RedisSinkConfig {
         endpoint: OneOrMany::Many(redis_sentinel_server()),
@@ -85,8 +88,9 @@ async fn redis_sink_sentinel_rpush() {
         encoding: JsonSerializerConfig::default().into(),
         data_type: DataTypeConfig::List,
         list_option: Some(ListOption {
-            method: Method::RPush,
+            method: ListMethod::RPush,
         }),
+        sorted_set_option: None,
         batch: BatchConfig::default(),
         request: TowerRequestConfig {
             rate_limit_num: u64::MAX,
@@ -126,10 +130,10 @@ async fn redis_sink_sentinel_rpush() {
         .connection;
 
     let key_exists: bool = conn.exists(key.to_string()).await.unwrap();
-    debug!("Test key: {} exists: {}.", key, key_exists);
+    debug!("Test key: {key} exists: {key_exists}.");
     assert!(key_exists);
     let llen: usize = conn.llen(key.clone().to_string()).await.unwrap();
-    debug!("Test key: {} len: {}.", key, llen);
+    debug!("Test key: {key} len: {llen}.");
     assert_eq!(llen, num_events);
 
     for i in 0..num_events {
@@ -147,10 +151,10 @@ async fn redis_sink_list_lpush() {
 
     let key = Template::try_from(format!("test-{}", random_string(10)))
         .expect("should not fail to create key template");
-    debug!("Test key name: {}.", key);
+    debug!("Test key name: {key}.");
     let mut rng = rand::rng();
     let num_events = rng.random_range(10000..20000);
-    debug!("Test events num: {}.", num_events);
+    debug!("Test events num: {num_events}.");
 
     let cnf = RedisSinkConfig {
         endpoint: OneOrMany::One(redis_server()),
@@ -158,8 +162,9 @@ async fn redis_sink_list_lpush() {
         encoding: JsonSerializerConfig::default().into(),
         data_type: DataTypeConfig::List,
         list_option: Some(ListOption {
-            method: Method::LPush,
+            method: ListMethod::LPush,
         }),
+        sorted_set_option: None,
         batch: BatchConfig::default(),
         request: TowerRequestConfig {
             rate_limit_num: u64::MAX,
@@ -199,10 +204,10 @@ async fn redis_sink_list_lpush() {
         .connection;
 
     let key_exists: bool = conn.exists(key.clone().to_string()).await.unwrap();
-    debug!("Test key: {} exists: {}.", key, key_exists);
+    debug!("Test key: {key} exists: {key_exists}.");
     assert!(key_exists);
     let llen: usize = conn.llen(key.clone().to_string()).await.unwrap();
-    debug!("Test key: {} len: {}.", key, llen);
+    debug!("Test key: {key} len: {llen}.");
     assert_eq!(llen, num_events);
 
     for i in 0..num_events {
@@ -220,10 +225,10 @@ async fn redis_sink_list_rpush() {
 
     let key = Template::try_from(format!("test-{}", random_string(10)))
         .expect("should not fail to create key template");
-    debug!("Test key name: {}.", key);
+    debug!("Test key name: {key}.");
     let mut rng = rand::rng();
     let num_events = rng.random_range(10000..20000);
-    debug!("Test events num: {}.", num_events);
+    debug!("Test events num: {num_events}.");
 
     let cnf = RedisSinkConfig {
         endpoint: OneOrMany::One(redis_server()),
@@ -231,8 +236,9 @@ async fn redis_sink_list_rpush() {
         encoding: JsonSerializerConfig::default().into(),
         data_type: DataTypeConfig::List,
         list_option: Some(ListOption {
-            method: Method::RPush,
+            method: ListMethod::RPush,
         }),
+        sorted_set_option: None,
         batch: BatchConfig::default(),
         request: TowerRequestConfig {
             rate_limit_num: u64::MAX,
@@ -272,10 +278,10 @@ async fn redis_sink_list_rpush() {
         .connection;
 
     let key_exists: bool = conn.exists(key.to_string()).await.unwrap();
-    debug!("Test key: {} exists: {}.", key, key_exists);
+    debug!("Test key: {key} exists: {key_exists}.");
     assert!(key_exists);
     let llen: usize = conn.llen(key.clone().to_string()).await.unwrap();
-    debug!("Test key: {} len: {}.", key, llen);
+    debug!("Test key: {key} len: {llen}.");
     assert_eq!(llen, num_events);
 
     for i in 0..num_events {
@@ -287,16 +293,95 @@ async fn redis_sink_list_rpush() {
     }
 }
 
+#[tokio::test]
+async fn redis_sink_sorted_set_zadd() {
+    trace_init();
+
+    let key = Template::try_from(format!("test-{}", random_string(10)))
+        .expect("should not fail to create key template");
+    debug!("Test key name: {key}.");
+    let mut rng = rand::rng();
+    let num_events = rng.random_range(10000..20000);
+    debug!("Test events num: {num_events}.");
+
+    let cnf = RedisSinkConfig {
+        endpoint: OneOrMany::One(redis_server()),
+        key: key.clone(),
+        encoding: JsonSerializerConfig::default().into(),
+        data_type: DataTypeConfig::SortedSet,
+        list_option: None,
+        sorted_set_option: Some(SortedSetOption {
+            method: Some(SortedSetMethod::ZAdd),
+            score: Some(UnsignedIntTemplate::try_from("{{ num }}").unwrap()),
+        }),
+        batch: BatchConfig::default(),
+        request: TowerRequestConfig {
+            rate_limit_num: u64::MAX,
+            ..Default::default()
+        },
+        sentinel_service: None,
+        sentinel_connect: None,
+        acknowledgements: Default::default(),
+    };
+
+    let mut events: Vec<Event> = Vec::new();
+    for i in 0..num_events {
+        let s: String = i.to_string();
+        let mut e = LogEvent::from(s);
+        e.insert("num", i);
+        events.push(e.into());
+    }
+    let input = stream::iter(events.clone().into_iter().map(Into::into));
+
+    // Publish events.
+    let cnf2 = cnf.clone();
+    assert_sink_compliance(&SINK_TAGS, async move {
+        // let conn = cnf2.build_connection().await.unwrap().get_connection_manager().await.unwrap().connection;
+        let cx = SinkContext::default();
+        let (sink, _healthcheck) = cnf2.build(cx).await.unwrap();
+        sink.run(input).await
+    })
+    .await
+    .expect("Running sink failed");
+
+    let mut conn = cnf
+        .build_connection()
+        .await
+        .unwrap()
+        .get_connection_manager()
+        .await
+        .unwrap()
+        .connection;
+
+    let key_exists: bool = conn.exists(key.clone().to_string()).await.unwrap();
+    debug!("Test key: {key} exists: {key_exists}.");
+    assert!(key_exists);
+    let zcount: usize = conn
+        .zcount(key.clone().to_string(), 0, num_events - 1)
+        .await
+        .unwrap();
+    debug!("Test key: {key} count: {zcount}.");
+    assert_eq!(zcount, events.len());
+
+    for i in 0..num_events {
+        let e = events.get(i).unwrap().as_log();
+        let s = serde_json::to_string(e).unwrap_or_default();
+        let payload: Vec<String> = conn.zpopmin(key.clone().to_string(), 1).await.unwrap();
+        let val = payload.into_iter().next().unwrap();
+        assert_eq!(val, s);
+    }
+}
+
 #[tokio::test]
 async fn redis_sink_channel() {
     trace_init();
 
     let key = Template::try_from(format!("test-{}", random_string(10)))
         .expect("should not fail to create key template");
-    debug!("Test key name: {}.", key);
+    debug!("Test key name: {key}.");
     let mut rng = rand::rng();
     let num_events = rng.random_range(10000..20000);
-    debug!("Test events num: {}.", num_events);
+    debug!("Test events num: {num_events}.");
 
     let client = redis::Client::open(redis_server()).unwrap();
     debug!("Get Redis async connection.");
@@ -305,12 +390,12 @@ async fn redis_sink_channel() {
         .await
         .expect("Failed to get Redis async connection.");
     debug!("Get Redis async connection success.");
-    debug!("Subscribe channel:{}.", key);
+    debug!("Subscribe channel:{key}.");
     pubsub_conn
         .subscribe(key.clone().to_string())
         .await
         .unwrap_or_else(|_| panic!("Failed to subscribe channel:{key}."));
-    debug!("Subscribed to channel:{}.", key);
+    debug!("Subscribed to channel:{key}.");
     let mut pubsub_stream = pubsub_conn.on_message();
 
     let cnf = RedisSinkConfig {
@@ -319,6 +404,7 @@ async fn redis_sink_channel() {
         encoding: JsonSerializerConfig::default().into(),
         data_type: DataTypeConfig::Channel,
         list_option: None,
+        sorted_set_option: None,
         batch: BatchConfig::default(),
         request: TowerRequestConfig {
             rate_limit_num: u64::MAX,
@@ -344,7 +430,7 @@ async fn redis_sink_channel() {
     loop {
         let _msg = pubsub_stream.next().await.unwrap();
         received_msg_num += 1;
-        debug!("Received msg num:{}.", received_msg_num);
+        debug!("Received msg num:{received_msg_num}.");
         if received_msg_num == num_events {
             assert_eq!(received_msg_num, num_events);
             break;
@@ -370,10 +456,10 @@ async fn redis_sink_channel_data_volume_tags() {
 
     let key = Template::try_from(format!("test-{}", random_string(10)))
         .expect("should not fail to create key template");
-    debug!("Test key name: {}.", key);
+    debug!("Test key name: {key}.");
     let mut rng = rand::rng();
     let num_events = rng.random_range(10000..20000);
-    debug!("Test events num: {}.", num_events);
+    debug!("Test events num: {num_events}.");
 
     let client = redis::Client::open(redis_server()).unwrap();
     debug!("Get Redis async connection.");
@@ -382,12 +468,12 @@ async fn redis_sink_channel_data_volume_tags() {
         .await
         .expect("Failed to get Redis async connection.");
     debug!("Get Redis async connection success.");
-    debug!("Subscribe channel:{}.", key);
+    debug!("Subscribe channel:{key}.");
     pubsub_conn
         .subscribe(key.clone().to_string())
         .await
         .unwrap_or_else(|_| panic!("Failed to subscribe channel:{key}."));
-    debug!("Subscribed to channel:{}.", key);
+    debug!("Subscribed to channel:{key}.");
     let mut pubsub_stream = pubsub_conn.on_message();
 
     let cnf = RedisSinkConfig {
@@ -396,6 +482,7 @@ async fn redis_sink_channel_data_volume_tags() {
         encoding: JsonSerializerConfig::default().into(),
         data_type: DataTypeConfig::Channel,
         list_option: None,
+        sorted_set_option: None,
         batch: BatchConfig::default(),
         request: TowerRequestConfig {
             rate_limit_num: u64::MAX,
@@ -421,7 +508,7 @@ async fn redis_sink_channel_data_volume_tags() {
     loop {
         let _msg = pubsub_stream.next().await.unwrap();
         received_msg_num += 1;
-        debug!("Received msg num:{}.", received_msg_num);
+        debug!("Received msg num:{received_msg_num}.");
         if received_msg_num == num_events {
             assert_eq!(received_msg_num, num_events);
             break;
@@ -435,9 +522,9 @@ async fn redis_sink_metrics() {
 
     let key = Template::try_from(format!("test-metrics-{}", random_string(10)))
         .expect("should not fail to create key template");
-    debug!("Test key name: {}.", key);
+    debug!("Test key name: {key}.");
     let num_events = 1000;
-    debug!("Test events num: {}.", num_events);
+    debug!("Test events num: {num_events}.");
 
     let cnf = RedisSinkConfig {
         endpoint: OneOrMany::One(redis_server()),
@@ -445,8 +532,9 @@ async fn redis_sink_metrics() {
         encoding: JsonSerializerConfig::default().into(),
         data_type: DataTypeConfig::List,
         list_option: Some(ListOption {
-            method: Method::RPush,
+            method: ListMethod::RPush,
         }),
+        sorted_set_option: None,
         batch: BatchConfig::default(),
         request: TowerRequestConfig {
             rate_limit_num: u64::MAX,
@@ -500,11 +588,11 @@ async fn redis_sink_metrics() {
         .connection;
 
     let key_exists: bool = conn.exists(key.to_string()).await.unwrap();
-    debug!("Test key: {} exists: {}.", key, key_exists);
+    debug!("Test key: {key} exists: {key_exists}.");
     assert!(key_exists);
 
     let llen: usize = conn.llen(key.clone().to_string()).await.unwrap();
-    debug!("Test key: {} len: {}.", key, llen);
+    debug!("Test key: {key} len: {llen}.");
     assert_eq!(llen, num_events);
 
     // Verify the content of each metric
@@ -548,8 +636,9 @@ async fn redis_sink_traces() {
             encoding: JsonSerializerConfig::default().into(),
             data_type: DataTypeConfig::List,
             list_option: Some(ListOption {
-                method: Method::RPush,
+                method: ListMethod::RPush,
             }),
+            sorted_set_option: None,
             batch: BatchConfig::default(),
             request: TowerRequestConfig::default(),
             sentinel_service: None,
diff --git a/src/sinks/redis/mod.rs b/src/sinks/redis/mod.rs
index 753f79810335a..17ef4ec907d5e 100644
--- a/src/sinks/redis/mod.rs
+++ b/src/sinks/redis/mod.rs
@@ -20,7 +20,10 @@ use tokio::sync::watch::error::RecvError;
 
 use crate::sinks::prelude::*;
 
-use self::{config::Method, sink::GenerationCount};
+use self::{
+    config::{ListMethod, SortedSetMethod},
+    sink::GenerationCount,
+};
 
 use super::util::EncodedLength;
 
@@ -47,7 +50,12 @@ pub enum DataType {
     ///
     /// This resembles a deque, where messages can be popped and pushed from either end.
     #[derivative(Default)]
-    List(Method),
+    List(ListMethod),
+
+    /// The Redis `sorted set` type.
+    ///
+    /// This resembles a priority queue, where messages can be pushed with a score.
+    SortedSet(SortedSetMethod),
 
     /// The Redis `channel` type.
     ///
@@ -59,6 +67,7 @@ pub enum DataType {
 pub(super) struct RedisEvent {
     event: Event,
     key: String,
+    score: Option<u64>,
 }
 
 impl Finalizable for RedisEvent {
@@ -112,6 +121,7 @@ impl MetaDescriptive for RedisRequest {
 pub(super) struct RedisKvEntry {
     key: String,
     value: Bytes,
+    score: Option<u64>,
 }
 
 impl EncodedLength for RedisKvEntry {
diff --git a/src/sinks/redis/request_builder.rs b/src/sinks/redis/request_builder.rs
index e4504b0287394..f2133cf5630d2 100644
--- a/src/sinks/redis/request_builder.rs
+++ b/src/sinks/redis/request_builder.rs
@@ -9,6 +9,7 @@ use super::{RedisEvent, RedisKvEntry, RedisRequest};
 pub(super) fn encode_event(
     mut event: Event,
     key: String,
+    score: Option<u64>,
     transformer: &Transformer,
     encoder: &mut Encoder<()>,
     byte_size: &mut GroupedCountByteSize,
@@ -23,7 +24,7 @@ pub(super) fn encode_event(
 
     let value = bytes.freeze();
 
-    let event = RedisKvEntry { key, value };
+    let event = RedisKvEntry { key, value, score };
     Some(event)
 }
 
@@ -36,7 +37,14 @@ fn encode_events(
     let request = events
         .into_iter()
         .filter_map(|event| {
-            encode_event(event.event, event.key, transformer, encoder, &mut byte_size)
+            encode_event(
+                event.event,
+                event.key,
+                event.score,
+                transformer,
+                encoder,
+                &mut byte_size,
+            )
         })
         .collect::<Vec<_>>();
 
diff --git a/src/sinks/redis/service.rs b/src/sinks/redis/service.rs
index 7070b28e7ae99..935409a10bcd4 100644
--- a/src/sinks/redis/service.rs
+++ b/src/sinks/redis/service.rs
@@ -3,7 +3,7 @@ use std::task::{Context, Poll};
 use crate::sinks::prelude::*;
 
 use super::{
-    config::Method,
+    config::{ListMethod, SortedSetMethod},
     sink::{ConnectionState, RedisConnection},
     RedisRequest, RedisSinkError,
 };
@@ -34,14 +34,14 @@ impl Service<RedisRequest> for RedisService {
         for kv in kvs.request {
             match self.data_type {
                 super::DataType::List(method) => match method {
-                    Method::LPush => {
+                    ListMethod::LPush => {
                         if count > 1 {
                             pipe.atomic().lpush(kv.key, kv.value.as_ref());
                         } else {
                             pipe.lpush(kv.key, kv.value.as_ref());
                         }
                     }
-                    Method::RPush => {
+                    ListMethod::RPush => {
                         if count > 1 {
                             pipe.atomic().rpush(kv.key, kv.value.as_ref());
                         } else {
@@ -49,6 +49,19 @@ impl Service<RedisRequest> for RedisService {
                         }
                     }
                 },
+                super::DataType::SortedSet(method) => match method {
+                    SortedSetMethod::ZAdd => {
+                        if count > 1 {
+                            pipe.atomic().zadd(
+                                kv.key,
+                                kv.value.as_ref(),
+                                kv.score.unwrap_or(0) as f64,
+                            );
+                        } else {
+                            pipe.zadd(kv.key, kv.value.as_ref(), kv.score.unwrap_or(0) as f64);
+                        }
+                    }
+                },
                 super::DataType::Channel => {
                     if count > 1 {
                         pipe.atomic().publish(kv.key, kv.value.as_ref());
diff --git a/src/sinks/redis/sink.rs b/src/sinks/redis/sink.rs
index e19963fc0686e..1df2c37794714 100644
--- a/src/sinks/redis/sink.rs
+++ b/src/sinks/redis/sink.rs
@@ -257,15 +257,25 @@ pub(super) struct RedisSink {
     conn: RedisConnection,
     data_type: super::DataType,
     key: Template,
+    score: Option<UnsignedIntTemplate>,
     batcher_settings: BatcherSettings,
 }
 
 impl RedisSink {
     pub(super) fn new(config: &RedisSinkConfig, conn: RedisConnection) -> crate::Result<Self> {
-        let method = config.list_option.map(|option| option.method);
+        let list_method = config.list_option.map(|option| option.method);
+        let (sorted_set_method, score) = if let Some(option) = &config.sorted_set_option {
+            (option.method, option.score.clone())
+        } else {
+            (None, None)
+        };
+
         let data_type = match config.data_type {
             DataTypeConfig::Channel => super::DataType::Channel,
-            DataTypeConfig::List => super::DataType::List(method.unwrap_or_default()),
+            DataTypeConfig::List => super::DataType::List(list_method.unwrap_or_default()),
+            DataTypeConfig::SortedSet => {
+                super::DataType::SortedSet(sorted_set_method.unwrap_or_default())
+            }
         };
 
         let batcher_settings = config.batch.validate()?.into_batcher_settings()?;
@@ -283,6 +293,7 @@ impl RedisSink {
             conn,
             data_type,
             key,
+            score,
         })
     }
 
@@ -302,7 +313,22 @@ impl RedisSink {
             })
             .ok()?;
 
-        Some(RedisEvent { event, key })
+        let score = self
+            .score
+            .as_ref()
+            .map(|template| {
+                template.render(&event).map_err(|error| {
+                    emit!(TemplateRenderingError {
+                        error,
+                        field: Some("score"),
+                        drop_event: true,
+                    });
+                })
+            })
+            .transpose()
+            .ok()?;
+
+        Some(RedisEvent { event, key, score })
     }
 
     async fn run_inner(self: Box<Self>, input: BoxStream<'_, Event>) -> Result<(), ()> {
diff --git a/src/sinks/redis/tests.rs b/src/sinks/redis/tests.rs
index f93dbf19edecb..e0ddca6fcc95c 100644
--- a/src/sinks/redis/tests.rs
+++ b/src/sinks/redis/tests.rs
@@ -24,6 +24,7 @@ fn redis_log_event_json() {
     let result = encode_event(
         evt.into(),
         "key".to_string(),
+        None,
         &Default::default(),
         &mut Encoder::<()>::new(JsonSerializerConfig::default().build().into()),
         &mut byte_size,
@@ -42,6 +43,7 @@ fn redis_log_event_text() {
     let event = encode_event(
         evt.into(),
         "key".to_string(),
+        None,
         &Default::default(),
         &mut Encoder::<()>::new(TextSerializerConfig::default().build().into()),
         &mut byte_size,
@@ -61,6 +63,7 @@ fn redis_log_encode_event() {
     let result = encode_event(
         evt.into(),
         "key".to_string(),
+        None,
         &Transformer::new(None, Some(vec!["key".into()]), None).unwrap(),
         &mut Encoder::<()>::new(JsonSerializerConfig::default().build().into()),
         &mut byte_size,
@@ -84,6 +87,7 @@ fn redis_metric_encode_event() {
     let result = encode_event(
         metric.into(),
         "metrics.counter".to_string(),
+        None,
         &Default::default(),
         &mut Encoder::<()>::new(JsonSerializerConfig::default().build().into()),
         &mut byte_size,
@@ -97,3 +101,24 @@ fn redis_metric_encode_event() {
     assert_eq!(json["kind"], "absolute");
     assert_eq!(json["counter"]["value"], 42.0);
 }
+
+#[test]
+fn redis_log_scoring() {
+    let msg = "hello_world";
+    let mut evt = LogEvent::from(msg);
+    let mut byte_size = GroupedCountByteSize::new_untagged();
+    evt.insert("key", "value");
+
+    let result = encode_event(
+        evt.into(),
+        "key".to_string(),
+        Some(64),
+        &Default::default(),
+        &mut Encoder::<()>::new(JsonSerializerConfig::default().build().into()),
+        &mut byte_size,
+    )
+    .unwrap()
+    .score;
+
+    assert_eq!(result, Some(64));
+}
diff --git a/website/cue/reference/components/sinks/generated/redis.cue b/website/cue/reference/components/sinks/generated/redis.cue
index dff0cbb97387d..f579e84b9e4f4 100644
--- a/website/cue/reference/components/sinks/generated/redis.cue
+++ b/website/cue/reference/components/sinks/generated/redis.cue
@@ -77,6 +77,12 @@ generated: components: sinks: redis: configuration: {
 
 					This is the default.
 					"""
+				sortedset: """
+					The Redis `sorted set` type.
+
+					This resembles a priority queue, where messages can be pushed and popped with an
+					associated score.
+					"""
 			}
 		}
 	}
@@ -722,4 +728,35 @@ generated: components: sinks: redis: configuration: {
 		required: false
 		type: string: {}
 	}
+	sorted_set_option: {
+		description: "Sorted Set-specific options"
+		required:    false
+		type: object: options: {
+			method: {
+				description: "The method to use for pushing messages into a `sorted set`."
+				required:    false
+				type: string: enum: zadd: """
+					Use the `zadd` method.
+
+					This adds messages onto a queue with a score.
+
+					This is the default.
+					"""
+			}
+			score: {
+				description: """
+					The score to publish a message with to a `sorted set`.
+
+					Examples:
+					- `%s`
+					- `%Y%m%d%H%M%S`
+					"""
+				required: false
+				type: {
+					string: syntax: "template"
+					uint: {}
+				}
+			}
+		}
+	}
 }

From 1be6a9b6650a505fc36e119dd60f7a97678ec6d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ensar=20Saraj=C4=8Di=C4=87?= <dev@ensarsarajcic.com>
Date: Tue, 5 Aug 2025 20:54:08 +0200
Subject: [PATCH 263/305] feat(dedupe transform): add time-based settings to
 dedupe transform (#23480)

* feat(dedupe transform): add time-based settings to dedupe transform

Enables settings for configuring a maximum age for items stored in the deduplication cache.

Closes: #23155

* Add changelog entry

* Clippy fix

* Resolve comments

* Apply code suggestions

---------

Co-authored-by: Pavlos Rontidis <pavlos.rontidis@gmail.com>
---
 benches/transform/dedupe.rs                   |  32 ++++-
 ..._dedupe_transform_time_settings.feature.md |   3 +
 src/transforms/dedupe/common.rs               | 118 ++++++++++++++++++
 src/transforms/dedupe/config.rs               |  99 ++++++++++++++-
 src/transforms/dedupe/mod.rs                  | 108 +---------------
 src/transforms/dedupe/timed_transform.rs      |  69 ++++++++++
 src/transforms/dedupe/transform.rs            |   4 +-
 .../transforms/generated/dedupe.cue           |  16 +++
 8 files changed, 337 insertions(+), 112 deletions(-)
 create mode 100644 changelog.d/23480_dedupe_transform_time_settings.feature.md
 create mode 100644 src/transforms/dedupe/common.rs
 create mode 100644 src/transforms/dedupe/timed_transform.rs

diff --git a/benches/transform/dedupe.rs b/benches/transform/dedupe.rs
index de1fa3081a035..2e95f5d28a9f7 100644
--- a/benches/transform/dedupe.rs
+++ b/benches/transform/dedupe.rs
@@ -6,7 +6,7 @@ use criterion::{
     criterion_group, measurement::WallTime, BatchSize, BenchmarkGroup, BenchmarkId, Criterion,
     SamplingMode, Throughput,
 };
-use vector::transforms::dedupe::common::{CacheConfig, FieldMatchConfig};
+use vector::transforms::dedupe::common::{CacheConfig, FieldMatchConfig, TimedCacheConfig};
 use vector::transforms::dedupe::config::DedupeConfig;
 use vector::transforms::dedupe::transform::Dedupe;
 use vector_lib::transform::Transform;
@@ -45,6 +45,7 @@ fn dedupe(c: &mut Criterion) {
             dedupe_config: DedupeConfig {
                 fields: Some(FieldMatchConfig::IgnoreFields(vec!["message".into()])),
                 cache: cache.clone(),
+                time_settings: None,
             },
         },
         // Modification of previous where field "message" is matched.
@@ -54,6 +55,33 @@ fn dedupe(c: &mut Criterion) {
             dedupe_config: DedupeConfig {
                 fields: Some(FieldMatchConfig::MatchFields(vec!["message".into()])),
                 cache: cache.clone(),
+                time_settings: None,
+            },
+        },
+        // Modification of previous where deduplication with max age is used.
+        Param {
+            slug: "field_match_message_timed",
+            input: fixed_stream.clone(),
+            dedupe_config: DedupeConfig {
+                fields: Some(FieldMatchConfig::MatchFields(vec!["message".into()])),
+                cache: cache.clone(),
+                time_settings: Some(TimedCacheConfig {
+                    max_age_ms: Duration::from_secs(5),
+                    refresh_on_drop: false,
+                }),
+            },
+        },
+        // Modification of previous where refresh on drop is enabled.
+        Param {
+            slug: "field_match_message_timed_refresh_on_drop",
+            input: fixed_stream.clone(),
+            dedupe_config: DedupeConfig {
+                fields: Some(FieldMatchConfig::MatchFields(vec!["message".into()])),
+                cache: cache.clone(),
+                time_settings: Some(TimedCacheConfig {
+                    max_age_ms: Duration::from_secs(5),
+                    refresh_on_drop: true,
+                }),
             },
         },
         // Measurement where ignore fields do not exist in the event.
@@ -69,6 +97,7 @@ fn dedupe(c: &mut Criterion) {
                     "cdeab".into(),
                     "bcdea".into(),
                 ])),
+                time_settings: None,
             },
         },
         // Modification of previous where match fields do not exist in the
@@ -85,6 +114,7 @@ fn dedupe(c: &mut Criterion) {
                     "cdeab".into(),
                     "bcdea".into(),
                 ])),
+                time_settings: None,
             },
         },
     ] {
diff --git a/changelog.d/23480_dedupe_transform_time_settings.feature.md b/changelog.d/23480_dedupe_transform_time_settings.feature.md
new file mode 100644
index 0000000000000..b8f41185e1716
--- /dev/null
+++ b/changelog.d/23480_dedupe_transform_time_settings.feature.md
@@ -0,0 +1,3 @@
+Adds `time_settings` configuration for `dedupe` transform, to enable configuring `max_age` for items in the deduplication cache, helping make a distinction between real duplicates and duplication that is expected in the incoming data over a longer period of time.
+
+authors: esensar Quad9DNS
diff --git a/src/transforms/dedupe/common.rs b/src/transforms/dedupe/common.rs
new file mode 100644
index 0000000000000..47af21150792c
--- /dev/null
+++ b/src/transforms/dedupe/common.rs
@@ -0,0 +1,118 @@
+use std::{num::NonZeroUsize, time::Duration};
+
+use serde_with::serde_as;
+use vector_lib::{configurable::configurable_component, lookup::lookup_v2::ConfigTargetPath};
+
+use crate::config::log_schema;
+
+/// Caching configuration for deduplication.
+#[configurable_component]
+#[derive(Clone, Debug)]
+#[serde(deny_unknown_fields)]
+pub struct CacheConfig {
+    /// Number of events to cache and use for comparing incoming events to previously seen events.
+    pub num_events: NonZeroUsize,
+}
+
+/// Configuration for time based cache.
+#[serde_as]
+#[configurable_component]
+#[derive(Clone, Debug)]
+#[serde(deny_unknown_fields)]
+pub struct TimedCacheConfig {
+    /// Maximum age of items in deduplication cache, before duplicates are allowed again.
+    #[serde_as(as = "serde_with::DurationMilliSeconds<u64>")]
+    pub max_age_ms: Duration,
+
+    /// Set to true if dropped duplicates should refresh the age timer.
+    #[serde(default = "crate::serde::default_false")]
+    pub refresh_on_drop: bool,
+}
+
+pub const fn default_cache_config() -> CacheConfig {
+    CacheConfig {
+        num_events: NonZeroUsize::new(5000).expect("static non-zero number"),
+    }
+}
+
+/// Options to control what fields to match against.
+///
+/// When no field matching configuration is specified, events are matched using the `timestamp`,
+/// `host`, and `message` fields from an event. The specific field names used are those set in
+/// the global [`log schema`][global_log_schema] configuration.
+///
+/// [global_log_schema]: https://vector.dev/docs/reference/configuration/global-options/#log_schema
+// TODO: This enum renders correctly in terms of providing equivalent Cue output when using the
+// machine-generated stuff vs the previously-hand-written Cue... but what it _doesn't_ have in the
+// machine-generated output is any sort of blurb that these "fields" (`match` and `ignore`) are
+// actually mutually exclusive.
+//
+// We know that to be the case when we're generating the output from the configuration schema, so we
+// need to emit something in that output to indicate as much, and further, actually use it on the
+// Cue side to add some sort of boilerplate about them being mutually exclusive, etc.
+#[configurable_component]
+#[derive(Clone, Debug)]
+#[serde(deny_unknown_fields)]
+pub enum FieldMatchConfig {
+    /// Matches events using only the specified fields.
+    #[serde(rename = "match")]
+    MatchFields(
+        #[configurable(metadata(
+            docs::examples = "field1",
+            docs::examples = "parent.child_field"
+        ))]
+        Vec<ConfigTargetPath>,
+    ),
+
+    /// Matches events using all fields except for the ignored ones.
+    #[serde(rename = "ignore")]
+    IgnoreFields(
+        #[configurable(metadata(
+            docs::examples = "field1",
+            docs::examples = "parent.child_field",
+            docs::examples = "host",
+            docs::examples = "hostname"
+        ))]
+        Vec<ConfigTargetPath>,
+    ),
+}
+
+pub fn fill_default_fields_match(maybe_fields: Option<&FieldMatchConfig>) -> FieldMatchConfig {
+    // We provide a default value on `fields`, based on `default_match_fields`, in order to
+    // drive the configuration schema and documentation. Since we're getting the values from the
+    // configured log schema, though, the default field values shown in the configuration
+    // schema/documentation may not be the same as an actual user's Vector configuration.
+    match maybe_fields {
+        Some(FieldMatchConfig::MatchFields(x)) => FieldMatchConfig::MatchFields(x.clone()),
+        Some(FieldMatchConfig::IgnoreFields(y)) => FieldMatchConfig::IgnoreFields(y.clone()),
+        None => FieldMatchConfig::MatchFields(default_match_fields()),
+    }
+}
+
+// TODO: Add support to the `configurable(metadata(..))` helper attribute for passing an expression
+// that will provide the value for the metadata attribute's value, as well as letting all metadata
+// attributes have whatever value they want, so long as it can be serialized by `serde_json`.
+//
+// Once we have that, we could curry these default values (and others) via a metadata attribute
+// instead of via `serde(default = "...")` to allow for displaying default values in the
+// configuration schema _without_ actually changing how a field is populated during deserialization.
+//
+// See the comment in `fill_default_fields_match` for more information on why this is required.
+//
+// TODO: These values are used even for events with the new "Vector" log namespace.
+//   These aren't great defaults in that case, but hard-coding isn't much better since the
+//   structure can vary significantly. This should probably either become a required field
+//   in the future, or maybe the "semantic meaning" can be utilized here.
+fn default_match_fields() -> Vec<ConfigTargetPath> {
+    let mut fields = Vec::new();
+    if let Some(message_key) = log_schema().message_key_target_path() {
+        fields.push(ConfigTargetPath(message_key.clone()));
+    }
+    if let Some(host_key) = log_schema().host_key_target_path() {
+        fields.push(ConfigTargetPath(host_key.clone()));
+    }
+    if let Some(timestamp_key) = log_schema().timestamp_key_target_path() {
+        fields.push(ConfigTargetPath(timestamp_key.clone()));
+    }
+    fields
+}
diff --git a/src/transforms/dedupe/config.rs b/src/transforms/dedupe/config.rs
index 921ed1a56c469..57ac09cb342cb 100644
--- a/src/transforms/dedupe/config.rs
+++ b/src/transforms/dedupe/config.rs
@@ -13,7 +13,11 @@ use crate::{
 };
 
 use super::{
-    common::{default_cache_config, fill_default_fields_match, CacheConfig, FieldMatchConfig},
+    common::{
+        default_cache_config, fill_default_fields_match, CacheConfig, FieldMatchConfig,
+        TimedCacheConfig,
+    },
+    timed_transform::TimedDedupe,
     transform::Dedupe,
 };
 
@@ -29,6 +33,10 @@ pub struct DedupeConfig {
     #[configurable(derived)]
     #[serde(default = "default_cache_config")]
     pub cache: CacheConfig,
+
+    #[configurable(derived)]
+    #[serde(default)]
+    pub time_settings: Option<TimedCacheConfig>,
 }
 
 impl GenerateConfig for DedupeConfig {
@@ -36,6 +44,7 @@ impl GenerateConfig for DedupeConfig {
         toml::Value::try_from(Self {
             fields: None,
             cache: default_cache_config(),
+            time_settings: None,
         })
         .unwrap()
     }
@@ -45,10 +54,18 @@ impl GenerateConfig for DedupeConfig {
 #[typetag::serde(name = "dedupe")]
 impl TransformConfig for DedupeConfig {
     async fn build(&self, _context: &TransformContext) -> crate::Result<Transform> {
-        Ok(Transform::event_task(Dedupe::new(
-            self.cache.num_events,
-            fill_default_fields_match(self.fields.as_ref()),
-        )))
+        if let Some(time_config) = &self.time_settings {
+            Ok(Transform::event_task(TimedDedupe::new(
+                self.cache.num_events,
+                fill_default_fields_match(self.fields.as_ref()),
+                time_config.clone(),
+            )))
+        } else {
+            Ok(Transform::event_task(Dedupe::new(
+                self.cache.num_events,
+                fill_default_fields_match(self.fields.as_ref()),
+            )))
+        }
     }
 
     fn input(&self) -> Input {
@@ -71,6 +88,7 @@ impl TransformConfig for DedupeConfig {
 #[cfg(test)]
 mod tests {
     use std::sync::Arc;
+    use std::time::Duration;
 
     use tokio::sync::mpsc;
     use tokio_stream::wrappers::ReceiverStream;
@@ -79,6 +97,7 @@ mod tests {
     use vector_lib::lookup::lookup_v2::ConfigTargetPath;
 
     use crate::config::schema::Definition;
+    use crate::transforms::dedupe::common::TimedCacheConfig;
     use crate::{
         event::{Event, LogEvent, ObjectMap, Value},
         test_util::components::assert_transform_compliance,
@@ -102,6 +121,7 @@ mod tests {
                 num_events: std::num::NonZeroUsize::new(num_events).expect("non-zero num_events"),
             },
             fields: Some(FieldMatchConfig::MatchFields(fields)),
+            time_settings: None,
         }
     }
 
@@ -118,6 +138,7 @@ mod tests {
                 num_events: std::num::NonZeroUsize::new(num_events).expect("non-zero num_events"),
             },
             fields: Some(FieldMatchConfig::IgnoreFields(fields)),
+            time_settings: None,
         }
     }
 
@@ -374,6 +395,74 @@ mod tests {
         .await;
     }
 
+    #[tokio::test]
+    async fn dedupe_match_timed_age_out() {
+        // Construct transform with timed cache
+        let transform_config = DedupeConfig {
+            time_settings: Some(TimedCacheConfig {
+                max_age_ms: Duration::from_millis(100),
+                refresh_on_drop: false,
+            }),
+            ..make_match_transform_config(5, vec!["matched".into()])
+        };
+        timed_age_out(transform_config).await;
+    }
+
+    #[tokio::test]
+    async fn dedupe_ignore_timed_age_out() {
+        // Construct transform with timed cache
+        let transform_config = DedupeConfig {
+            time_settings: Some(TimedCacheConfig {
+                max_age_ms: Duration::from_millis(100),
+                refresh_on_drop: false,
+            }),
+            ..make_ignore_transform_config(1, vec![])
+        };
+        timed_age_out(transform_config).await;
+    }
+
+    /// Test the eviction behavior of the underlying LruCache
+    async fn timed_age_out(transform_config: DedupeConfig) {
+        assert_transform_compliance(async {
+            let (tx, rx) = mpsc::channel(1);
+            let (topology, mut out) =
+                create_topology(ReceiverStream::new(rx), transform_config).await;
+
+            let mut event1 = Event::Log(LogEvent::from("message"));
+            event1.as_mut_log().insert("matched", "some value");
+
+            // First event should always be passed through as-is.
+            tx.send(event1.clone()).await.unwrap();
+            let new_event = out.recv().await.unwrap();
+
+            event1.set_source_id(Arc::new(ComponentKey::from("in")));
+            event1.set_upstream_id(Arc::new(OutputId::from("transform")));
+
+            // the schema definition is copied from the source for dedupe
+            event1
+                .metadata_mut()
+                .set_schema_definition(&Arc::new(Definition::default_legacy_namespace()));
+            assert_eq!(new_event, event1);
+
+            // Second time the event gets dropped because it's a dupe.
+            tx.send(event1.clone()).await.unwrap();
+
+            tokio::time::sleep(Duration::from_millis(101)).await;
+
+            // Third time the event is a dupe but enought time has passed to accept it.
+            tx.send(event1.clone()).await.unwrap();
+            let new_event = out.recv().await.unwrap();
+
+            event1.set_source_id(Arc::new(ComponentKey::from("in")));
+            assert_eq!(new_event, event1);
+
+            drop(tx);
+            topology.stop().await;
+            assert_eq!(out.recv().await, None);
+        })
+        .await;
+    }
+
     #[tokio::test]
     async fn dedupe_match_type_matching() {
         let transform_config = make_match_transform_config(5, vec!["matched".into()]);
diff --git a/src/transforms/dedupe/mod.rs b/src/transforms/dedupe/mod.rs
index ff0d67c115ab0..6b4deaa0cb278 100644
--- a/src/transforms/dedupe/mod.rs
+++ b/src/transforms/dedupe/mod.rs
@@ -2,110 +2,10 @@
 pub mod config;
 
 #[cfg(feature = "transforms-impl-dedupe")]
-pub mod transform;
+pub mod common;
 
 #[cfg(feature = "transforms-impl-dedupe")]
-pub mod common {
-    use std::num::NonZeroUsize;
-
-    use vector_lib::{configurable::configurable_component, lookup::lookup_v2::ConfigTargetPath};
-
-    use crate::config::log_schema;
-
-    /// Caching configuration for deduplication.
-    #[configurable_component]
-    #[derive(Clone, Debug)]
-    #[serde(deny_unknown_fields)]
-    pub struct CacheConfig {
-        /// Number of events to cache and use for comparing incoming events to previously seen events.
-        pub num_events: NonZeroUsize,
-    }
-
-    pub const fn default_cache_config() -> CacheConfig {
-        CacheConfig {
-            num_events: NonZeroUsize::new(5000).expect("static non-zero number"),
-        }
-    }
-
-    /// Options to control what fields to match against.
-    ///
-    /// When no field matching configuration is specified, events are matched using the `timestamp`,
-    /// `host`, and `message` fields from an event. The specific field names used are those set in
-    /// the global [`log schema`][global_log_schema] configuration.
-    ///
-    /// [global_log_schema]: https://vector.dev/docs/reference/configuration/global-options/#log_schema
-    // TODO: This enum renders correctly in terms of providing equivalent Cue output when using the
-    // machine-generated stuff vs the previously-hand-written Cue... but what it _doesn't_ have in the
-    // machine-generated output is any sort of blurb that these "fields" (`match` and `ignore`) are
-    // actually mutually exclusive.
-    //
-    // We know that to be the case when we're generating the output from the configuration schema, so we
-    // need to emit something in that output to indicate as much, and further, actually use it on the
-    // Cue side to add some sort of boilerplate about them being mutually exclusive, etc.
-    #[configurable_component]
-    #[derive(Clone, Debug)]
-    #[serde(deny_unknown_fields)]
-    pub enum FieldMatchConfig {
-        /// Matches events using only the specified fields.
-        #[serde(rename = "match")]
-        MatchFields(
-            #[configurable(metadata(
-                docs::examples = "field1",
-                docs::examples = "parent.child_field"
-            ))]
-            Vec<ConfigTargetPath>,
-        ),
-
-        /// Matches events using all fields except for the ignored ones.
-        #[serde(rename = "ignore")]
-        IgnoreFields(
-            #[configurable(metadata(
-                docs::examples = "field1",
-                docs::examples = "parent.child_field",
-                docs::examples = "host",
-                docs::examples = "hostname"
-            ))]
-            Vec<ConfigTargetPath>,
-        ),
-    }
-
-    pub fn fill_default_fields_match(maybe_fields: Option<&FieldMatchConfig>) -> FieldMatchConfig {
-        // We provide a default value on `fields`, based on `default_match_fields`, in order to
-        // drive the configuration schema and documentation. Since we're getting the values from the
-        // configured log schema, though, the default field values shown in the configuration
-        // schema/documentation may not be the same as an actual user's Vector configuration.
-        match maybe_fields {
-            Some(FieldMatchConfig::MatchFields(x)) => FieldMatchConfig::MatchFields(x.clone()),
-            Some(FieldMatchConfig::IgnoreFields(y)) => FieldMatchConfig::IgnoreFields(y.clone()),
-            None => FieldMatchConfig::MatchFields(default_match_fields()),
-        }
-    }
+pub mod transform;
 
-    // TODO: Add support to the `configurable(metadata(..))` helper attribute for passing an expression
-    // that will provide the value for the metadata attribute's value, as well as letting all metadata
-    // attributes have whatever value they want, so long as it can be serialized by `serde_json`.
-    //
-    // Once we have that, we could curry these default values (and others) via a metadata attribute
-    // instead of via `serde(default = "...")` to allow for displaying default values in the
-    // configuration schema _without_ actually changing how a field is populated during deserialization.
-    //
-    // See the comment in `fill_default_fields_match` for more information on why this is required.
-    //
-    // TODO: These values are used even for events with the new "Vector" log namespace.
-    //   These aren't great defaults in that case, but hard-coding isn't much better since the
-    //   structure can vary significantly. This should probably either become a required field
-    //   in the future, or maybe the "semantic meaning" can be utilized here.
-    fn default_match_fields() -> Vec<ConfigTargetPath> {
-        let mut fields = Vec::new();
-        if let Some(message_key) = log_schema().message_key_target_path() {
-            fields.push(ConfigTargetPath(message_key.clone()));
-        }
-        if let Some(host_key) = log_schema().host_key_target_path() {
-            fields.push(ConfigTargetPath(host_key.clone()));
-        }
-        if let Some(timestamp_key) = log_schema().timestamp_key_target_path() {
-            fields.push(ConfigTargetPath(timestamp_key.clone()));
-        }
-        fields
-    }
-}
+#[cfg(feature = "transforms-impl-dedupe")]
+pub mod timed_transform;
diff --git a/src/transforms/dedupe/timed_transform.rs b/src/transforms/dedupe/timed_transform.rs
new file mode 100644
index 0000000000000..a092971a46ab3
--- /dev/null
+++ b/src/transforms/dedupe/timed_transform.rs
@@ -0,0 +1,69 @@
+use std::{future::ready, num::NonZeroUsize, pin::Pin, time::Instant};
+
+use futures::{Stream, StreamExt};
+use lru::LruCache;
+
+use crate::{event::Event, internal_events::DedupeEventsDropped, transforms::TaskTransform};
+
+use super::{
+    common::{FieldMatchConfig, TimedCacheConfig},
+    transform::{build_cache_entry, CacheEntry},
+};
+
+#[derive(Clone)]
+pub struct TimedDedupe {
+    fields: FieldMatchConfig,
+    cache: LruCache<CacheEntry, Instant>,
+    time_config: TimedCacheConfig,
+}
+
+impl TimedDedupe {
+    pub fn new(
+        num_entries: NonZeroUsize,
+        fields: FieldMatchConfig,
+        time_config: TimedCacheConfig,
+    ) -> Self {
+        Self {
+            fields,
+            cache: LruCache::new(num_entries),
+            time_config,
+        }
+    }
+
+    pub fn transform_one(&mut self, event: Event) -> Option<Event> {
+        let cache_entry = build_cache_entry(&event, &self.fields);
+        let now = Instant::now();
+        let drop_event = match self.cache.get(&cache_entry) {
+            Some(&time) => {
+                let drop = now.duration_since(time) < self.time_config.max_age_ms;
+                if self.time_config.refresh_on_drop || !drop {
+                    self.cache.put(cache_entry, now);
+                }
+                drop
+            }
+            None => {
+                self.cache.put(cache_entry, now);
+                false
+            }
+        };
+        if drop_event {
+            emit!(DedupeEventsDropped { count: 1 });
+            None
+        } else {
+            Some(event)
+        }
+    }
+}
+
+impl TaskTransform<Event> for TimedDedupe {
+    fn transform(
+        self: Box<Self>,
+        task: Pin<Box<dyn Stream<Item = Event> + Send>>,
+    ) -> Pin<Box<dyn Stream<Item = Event> + Send>>
+    where
+        Self: 'static,
+    {
+        let mut inner = self;
+        Box::pin(task.filter_map(move |v| ready(inner.transform_one(v))))
+    }
+}
diff --git a/src/transforms/dedupe/transform.rs b/src/transforms/dedupe/transform.rs
index 9c1432d2abb12..d1a740e1c0838 100644
--- a/src/transforms/dedupe/transform.rs
+++ b/src/transforms/dedupe/transform.rs
@@ -46,7 +46,7 @@ type TypeId = u8;
 /// CacheEntries for 2 equivalent events will always contain the fields in the
 /// same order.
 #[derive(Clone, PartialEq, Eq, Hash)]
-enum CacheEntry {
+pub(crate) enum CacheEntry {
     Match(Vec<Option<(TypeId, Bytes)>>),
     Ignore(Vec<(OwnedTargetPath, TypeId, Bytes)>),
 }
@@ -88,7 +88,7 @@ impl Dedupe {
 /// Takes in an Event and returns a CacheEntry to place into the LRU cache
 /// containing all relevant information for the fields that need matching
 /// against according to the specified FieldMatchConfig.
-fn build_cache_entry(event: &Event, fields: &FieldMatchConfig) -> CacheEntry {
+pub(crate) fn build_cache_entry(event: &Event, fields: &FieldMatchConfig) -> CacheEntry {
     match &fields {
         FieldMatchConfig::MatchFields(fields) => {
             let mut entry = Vec::new();
diff --git a/website/cue/reference/components/transforms/generated/dedupe.cue b/website/cue/reference/components/transforms/generated/dedupe.cue
index cc5ed2fe9ac5e..9b4f1b9ce0d18 100644
--- a/website/cue/reference/components/transforms/generated/dedupe.cue
+++ b/website/cue/reference/components/transforms/generated/dedupe.cue
@@ -34,4 +34,20 @@ generated: components: transforms: dedupe: configuration: {
 			}
 		}
 	}
+	time_settings: {
+		description: "Configuration for time based cache."
+		required:    false
+		type: object: options: {
+			max_age_ms: {
+				description: "Maximum age of items in deduplication cache, before duplicates are allowed again."
+				required:    true
+				type: uint: unit: "milliseconds"
+			}
+			refresh_on_drop: {
+				description: "Set to true if dropped duplicates should refresh the age timer."
+				required:    false
+				type: bool: default: false
+			}
+		}
+	}
 }

From a1aeae826a4386ced63bcd6ec190cc7b597b0fe1 Mon Sep 17 00:00:00 2001
From: Vitalii Parfonov <vparfono@redhat.com>
Date: Wed, 6 Aug 2025 15:20:50 +0300
Subject: [PATCH 264/305] fix(buffers): buffer_id handling in buffer usage
 metrics reporting (#23507)

* buffer_id handling in buffer usage metrics reporting

Signed-off-by: Vitalii Parfonov <vparfono@redhat.com>

* fix 'cargo clippy' warn

Signed-off-by: Vitalii Parfonov <vparfono@redhat.com>

* add changelog fragments to changelog.d

Signed-off-by: Vitalii Parfonov <vparfono@redhat.com>

* cargo fmt

* remove changelog - no need to explain bug fix for unreleased change

---------

Signed-off-by: Vitalii Parfonov <vparfono@redhat.com>
Co-authored-by: Pavlos Rontidis <pavlos.rontidis@gmail.com>
---
 lib/vector-buffers/src/buffer_usage_data.rs |   7 +-
 lib/vector-buffers/src/internal_events.rs   | 174 ++++++++++++++------
 2 files changed, 131 insertions(+), 50 deletions(-)

diff --git a/lib/vector-buffers/src/buffer_usage_data.rs b/lib/vector-buffers/src/buffer_usage_data.rs
index ac06d2757da93..90277e8c6328e 100644
--- a/lib/vector-buffers/src/buffer_usage_data.rs
+++ b/lib/vector-buffers/src/buffer_usage_data.rs
@@ -242,8 +242,10 @@ impl BufferUsage {
     /// The `buffer_id` should be a unique name -- ideally the `component_id` of the sink using this buffer -- but is
     /// not used for anything other than reporting, and so has no _requirement_ to be unique.
     pub fn install(self, buffer_id: &str) {
+        let buffer_id = buffer_id.to_string();
         let span = self.span;
         let stages = self.stages;
+        let task_name = format!("buffer usage reporter ({buffer_id})");
 
         let task = async move {
             let mut interval = interval(Duration::from_secs(2));
@@ -264,6 +266,7 @@ impl BufferUsage {
                     let received = stage.received.consume();
                     if received.has_updates() {
                         emit(BufferEventsReceived {
+                            buffer_id: buffer_id.clone(),
                             idx: stage.idx,
                             count: received.event_count,
                             byte_size: received.event_byte_size,
@@ -273,6 +276,7 @@ impl BufferUsage {
                     let sent = stage.sent.consume();
                     if sent.has_updates() {
                         emit(BufferEventsSent {
+                            buffer_id: buffer_id.clone(),
                             idx: stage.idx,
                             count: sent.event_count,
                             byte_size: sent.event_byte_size,
@@ -282,6 +286,7 @@ impl BufferUsage {
                     let dropped = stage.dropped.consume();
                     if dropped.has_updates() {
                         emit(BufferEventsDropped {
+                            buffer_id: buffer_id.clone(),
                             idx: stage.idx,
                             intentional: false,
                             reason: "corrupted_events",
@@ -293,6 +298,7 @@ impl BufferUsage {
                     let dropped_intentional = stage.dropped_intentional.consume();
                     if dropped_intentional.has_updates() {
                         emit(BufferEventsDropped {
+                            buffer_id: buffer_id.clone(),
                             idx: stage.idx,
                             intentional: true,
                             reason: "drop_newest",
@@ -304,7 +310,6 @@ impl BufferUsage {
             }
         };
 
-        let task_name = format!("buffer usage reporter ({buffer_id})");
         spawn_named(task.instrument(span.or_current()), task_name.as_str());
     }
 }
diff --git a/lib/vector-buffers/src/internal_events.rs b/lib/vector-buffers/src/internal_events.rs
index ea024cf186e4d..30e92d39135e4 100644
--- a/lib/vector-buffers/src/internal_events.rs
+++ b/lib/vector-buffers/src/internal_events.rs
@@ -10,7 +10,7 @@ use vector_common::{
     registered_event,
 };
 
-static BUFFER_COUNTERS: LazyLock<DashMap<usize, (AtomicI64, AtomicI64)>> =
+static BUFFER_COUNTERS: LazyLock<DashMap<(String, usize), (AtomicI64, AtomicI64)>> =
     LazyLock::new(DashMap::new);
 
 fn update_and_get(counter: &AtomicI64, delta: i64) -> i64 {
@@ -25,16 +25,25 @@ fn update_and_get(counter: &AtomicI64, delta: i64) -> i64 {
     new_val
 }
 
-fn update_buffer_gauge(stage: usize, events_delta: i64, bytes_delta: i64) {
+fn update_buffer_gauge(buffer_id: &str, stage: usize, events_delta: i64, bytes_delta: i64) {
     let counters = BUFFER_COUNTERS
-        .entry(stage)
+        .entry((buffer_id.to_string(), stage))
         .or_insert_with(|| (AtomicI64::new(0), AtomicI64::new(0)));
 
     let new_events = update_and_get(&counters.0, events_delta);
     let new_bytes = update_and_get(&counters.1, bytes_delta);
 
-    gauge!("buffer_events", "stage" => stage.to_string()).set(i64_to_f64_safe(new_events));
-    gauge!("buffer_byte_size", "stage" => stage.to_string()).set(i64_to_f64_safe(new_bytes));
+    gauge!("buffer_events",
+        "buffer_id" => buffer_id.to_string(),
+        "stage" => stage.to_string()
+    )
+    .set(i64_to_f64_safe(new_events));
+
+    gauge!("buffer_byte_size",
+        "buffer_id" => buffer_id.to_string(),
+        "stage" => stage.to_string()
+    )
+    .set(i64_to_f64_safe(new_bytes));
 }
 
 pub struct BufferCreated {
@@ -57,6 +66,7 @@ impl InternalEvent for BufferCreated {
 }
 
 pub struct BufferEventsReceived {
+    pub buffer_id: String,
     pub idx: usize,
     pub count: u64,
     pub byte_size: u64,
@@ -64,18 +74,26 @@ pub struct BufferEventsReceived {
 
 impl InternalEvent for BufferEventsReceived {
     fn emit(self) {
-        counter!("buffer_received_events_total", "stage" => self.idx.to_string())
-            .increment(self.count);
-        counter!("buffer_received_bytes_total", "stage" => self.idx.to_string())
-            .increment(self.byte_size);
+        counter!("buffer_received_events_total",
+            "buffer_id" => self.buffer_id.clone(),
+            "stage" => self.idx.to_string()
+        )
+        .increment(self.count);
+
+        counter!("buffer_received_bytes_total",
+            "buffer_id" => self.buffer_id.clone(),
+            "stage" => self.idx.to_string()
+        )
+        .increment(self.byte_size);
 
         let count_delta = i64::try_from(self.count).unwrap_or(i64::MAX);
         let bytes_delta = i64::try_from(self.byte_size).unwrap_or(i64::MAX);
-        update_buffer_gauge(self.idx, count_delta, bytes_delta);
+        update_buffer_gauge(&self.buffer_id, self.idx, count_delta, bytes_delta);
     }
 }
 
 pub struct BufferEventsSent {
+    pub buffer_id: String,
     pub idx: usize,
     pub count: u64,
     pub byte_size: u64,
@@ -83,17 +101,25 @@ pub struct BufferEventsSent {
 
 impl InternalEvent for BufferEventsSent {
     fn emit(self) {
-        counter!("buffer_sent_events_total", "stage" => self.idx.to_string()).increment(self.count);
-        counter!("buffer_sent_bytes_total", "stage" => self.idx.to_string())
-            .increment(self.byte_size);
+        counter!("buffer_sent_events_total",
+            "buffer_id" => self.buffer_id.clone(),
+            "stage" => self.idx.to_string()
+        )
+        .increment(self.count);
+
+        counter!("buffer_sent_bytes_total",
+            "buffer_id" => self.buffer_id.clone(),
+            "stage" => self.idx.to_string())
+        .increment(self.byte_size);
 
         let count_delta = i64::try_from(self.count).unwrap_or(i64::MAX);
         let bytes_delta = i64::try_from(self.byte_size).unwrap_or(i64::MAX);
-        update_buffer_gauge(self.idx, -count_delta, -bytes_delta);
+        update_buffer_gauge(&self.buffer_id, self.idx, -count_delta, -bytes_delta);
     }
 }
 
 pub struct BufferEventsDropped {
+    pub buffer_id: String,
     pub idx: usize,
     pub count: u64,
     pub byte_size: u64,
@@ -110,6 +136,7 @@ impl InternalEvent for BufferEventsDropped {
                 count = %self.count,
                 intentional = %intentional_str,
                 reason = %self.reason,
+                buffer_id = %self.buffer_id,
                 stage = %self.idx,
             );
         } else {
@@ -118,17 +145,22 @@ impl InternalEvent for BufferEventsDropped {
                 count = %self.count,
                 intentional = %intentional_str,
                 reason = %self.reason,
+                buffer_id = %self.buffer_id,
                 stage = %self.idx,
             );
         }
+
         counter!(
-            "buffer_discarded_events_total", "intentional" => intentional_str,
+            "buffer_discarded_events_total",
+            "buffer_id" => self.buffer_id.clone(),
+            "intentional" => intentional_str,
         )
         .increment(self.count);
 
         let count_delta = i64::try_from(self.count).unwrap_or(i64::MAX);
         let bytes_delta = i64::try_from(self.byte_size).unwrap_or(i64::MAX);
-        update_buffer_gauge(self.idx, -count_delta, -bytes_delta);
+
+        update_buffer_gauge(&self.buffer_id, self.idx, -count_delta, -bytes_delta);
     }
 }
 
@@ -175,6 +207,7 @@ mod tests {
     use metrics_util::debugging::{DebugValue, DebuggingRecorder};
     use metrics_util::{CompositeKey, MetricKind};
     use ordered_float::OrderedFloat;
+    use std::borrow::Cow;
     use std::sync::Mutex;
     use std::thread;
 
@@ -184,8 +217,8 @@ mod tests {
         BUFFER_COUNTERS.clear();
     }
 
-    fn get_counter_values(stage: usize) -> (i64, i64) {
-        match BUFFER_COUNTERS.get(&stage) {
+    fn get_counter_values(buffer_id: &str, stage: usize) -> (i64, i64) {
+        match BUFFER_COUNTERS.get(&(buffer_id.to_string(), stage)) {
             Some(counters) => {
                 let events = counters.0.load(Ordering::Relaxed);
                 let bytes = counters.1.load(Ordering::Relaxed);
@@ -196,12 +229,16 @@ mod tests {
     }
 
     fn assert_gauge_state(
+        buffer_id: &str,
         stage: usize,
         updates: &[(i64, i64)],
         expected_events: f64,
         expected_bytes: f64,
     ) {
-        let _guard = TEST_LOCK.lock().unwrap();
+        let _guard = TEST_LOCK
+            .lock()
+            .unwrap_or_else(std::sync::PoisonError::into_inner);
+
         reset_counters();
 
         let recorder = DebuggingRecorder::default();
@@ -209,17 +246,24 @@ mod tests {
 
         metrics::with_local_recorder(&recorder, move || {
             for (events_delta, bytes_delta) in updates {
-                update_buffer_gauge(stage, *events_delta, *bytes_delta);
+                update_buffer_gauge(buffer_id, stage, *events_delta, *bytes_delta);
             }
 
-            let mut metrics = snapshotter.snapshot().into_vec();
+            let metrics = snapshotter.snapshot().into_vec();
+
+            let buffer_id_cow: Cow<'static, str> = Cow::Owned(buffer_id.to_string());
+            let buffer_id_label = Label::new("buffer_id", buffer_id_cow);
 
             let stage_label = Label::new("stage", stage.to_string());
-            let mut expected_metrics = vec![
+
+            let expected_metrics = vec![
                 (
                     CompositeKey::new(
                         MetricKind::Gauge,
-                        Key::from_parts("buffer_events", vec![stage_label.clone()]),
+                        Key::from_parts(
+                            "buffer_events",
+                            vec![buffer_id_label.clone(), stage_label.clone()],
+                        ),
                     ),
                     None,
                     None,
@@ -228,7 +272,10 @@ mod tests {
                 (
                     CompositeKey::new(
                         MetricKind::Gauge,
-                        Key::from_parts("buffer_byte_size", vec![stage_label]),
+                        Key::from_parts(
+                            "buffer_byte_size",
+                            vec![buffer_id_label.clone(), stage_label],
+                        ),
                     ),
                     None,
                     None,
@@ -236,20 +283,27 @@ mod tests {
                 ),
             ];
 
-            metrics.sort_by_key(|(key, ..)| key.clone());
-            expected_metrics.sort_by_key(|(key, ..)| key.clone());
-
-            assert_eq!(metrics, expected_metrics);
+            // Compare metrics without needing to sort if order doesn't matter
+            assert_eq!(metrics.len(), expected_metrics.len());
+            for expected in &expected_metrics {
+                assert!(
+                    metrics.contains(expected),
+                    "Missing expected metric: {expected:?}"
+                );
+            }
         });
     }
 
     #[test]
     fn test_increment() {
-        let _guard = TEST_LOCK.lock().unwrap();
+        let _guard = TEST_LOCK
+            .lock()
+            .unwrap_or_else(std::sync::PoisonError::into_inner);
+
         reset_counters();
 
-        update_buffer_gauge(0, 10, 1024);
-        let (events, bytes) = get_counter_values(0);
+        update_buffer_gauge("test_buffer", 0, 10, 1024);
+        let (events, bytes) = get_counter_values("test_buffer", 0);
         assert_eq!(events, 10);
         assert_eq!(bytes, 1024);
     }
@@ -259,9 +313,9 @@ mod tests {
         let _guard = TEST_LOCK.lock().unwrap();
         reset_counters();
 
-        update_buffer_gauge(1, 100, 2048);
-        update_buffer_gauge(1, -50, -1024);
-        let (events, bytes) = get_counter_values(1);
+        update_buffer_gauge("test_buffer", 1, 100, 2048);
+        update_buffer_gauge("test_buffer", 1, -50, -1024);
+        let (events, bytes) = get_counter_values("test_buffer", 1);
         assert_eq!(events, 50);
         assert_eq!(bytes, 1024);
     }
@@ -271,9 +325,9 @@ mod tests {
         let _guard = TEST_LOCK.lock().unwrap();
         reset_counters();
 
-        update_buffer_gauge(2, 5, 100);
-        update_buffer_gauge(2, -10, -200);
-        let (events, bytes) = get_counter_values(2);
+        update_buffer_gauge("test_buffer", 2, 5, 100);
+        update_buffer_gauge("test_buffer", 2, -10, -200);
+        let (events, bytes) = get_counter_values("test_buffer", 2);
 
         assert_eq!(events, 0);
         assert_eq!(bytes, 0);
@@ -284,10 +338,10 @@ mod tests {
         let _guard = TEST_LOCK.lock().unwrap();
         reset_counters();
 
-        update_buffer_gauge(0, 10, 100);
-        update_buffer_gauge(1, 20, 200);
-        let (events0, bytes0) = get_counter_values(0);
-        let (events1, bytes1) = get_counter_values(1);
+        update_buffer_gauge("test_buffer", 0, 10, 100);
+        update_buffer_gauge("test_buffer", 1, 20, 200);
+        let (events0, bytes0) = get_counter_values("test_buffer", 0);
+        let (events1, bytes1) = get_counter_values("test_buffer", 1);
         assert_eq!(events0, 10);
         assert_eq!(bytes0, 100);
         assert_eq!(events1, 20);
@@ -296,7 +350,10 @@ mod tests {
 
     #[test]
     fn test_multithreaded_updates_are_correct() {
-        let _guard = TEST_LOCK.lock().unwrap();
+        let _guard = TEST_LOCK
+            .lock()
+            .unwrap_or_else(std::sync::PoisonError::into_inner);
+
         reset_counters();
 
         let num_threads = 10;
@@ -306,7 +363,7 @@ mod tests {
         for _ in 0..num_threads {
             let handle = thread::spawn(move || {
                 for _ in 0..increments_per_thread {
-                    update_buffer_gauge(0, 1, 10);
+                    update_buffer_gauge("test_buffer", 0, 1, 10);
                 }
             });
             handles.push(handle);
@@ -316,7 +373,7 @@ mod tests {
             handle.join().unwrap();
         }
 
-        let (final_events, final_bytes) = get_counter_values(0);
+        let (final_events, final_bytes) = get_counter_values("test_buffer", 0);
         let expected_events = i64::from(num_threads * increments_per_thread);
         let expected_bytes = i64::from(num_threads * increments_per_thread * 10);
 
@@ -326,12 +383,15 @@ mod tests {
 
     #[test]
     fn test_large_values_capped_to_f64_safe_max() {
-        let _guard = TEST_LOCK.lock().unwrap();
+        let _guard = TEST_LOCK
+            .lock()
+            .unwrap_or_else(std::sync::PoisonError::into_inner);
+
         reset_counters();
 
-        update_buffer_gauge(3, F64_SAFE_INT_MAX * 2, F64_SAFE_INT_MAX * 2);
+        update_buffer_gauge("test_buffer", 3, F64_SAFE_INT_MAX * 2, F64_SAFE_INT_MAX * 2);
 
-        let (events, bytes) = get_counter_values(3);
+        let (events, bytes) = get_counter_values("test_buffer", 3);
 
         assert!(events > F64_SAFE_INT_MAX);
         assert!(bytes > F64_SAFE_INT_MAX);
@@ -345,11 +405,27 @@ mod tests {
 
     #[test]
     fn test_increment_with_recorder() {
-        assert_gauge_state(0, &[(100, 2048), (200, 1024)], 300.0, 3072.0);
+        assert_gauge_state("test_buffer", 0, &[(100, 2048), (200, 1024)], 300.0, 3072.0);
     }
 
     #[test]
     fn test_should_not_be_negative_with_recorder() {
-        assert_gauge_state(0, &[(100, 1024), (-200, -4096)], 0.0, 0.0);
+        assert_gauge_state("test_buffer", 1, &[(100, 1024), (-200, -4096)], 0.0, 0.0);
+    }
+
+    #[test]
+    fn test_increment_with_custom_buffer_id() {
+        assert_gauge_state(
+            "buffer_alpha",
+            0,
+            &[(100, 2048), (200, 1024)],
+            300.0,
+            3072.0,
+        );
+    }
+
+    #[test]
+    fn test_increment_with_another_buffer_id() {
+        assert_gauge_state("buffer_beta", 0, &[(10, 100), (5, 50)], 15.0, 150.0);
     }
 }

From 7d81cb69c03f284022c1e035bfce44b429b1c672 Mon Sep 17 00:00:00 2001
From: Kurochan <kuro@kurochan.org>
Date: Wed, 6 Aug 2025 22:56:09 +0900
Subject: [PATCH 265/305] chore(ci): add datadog_common sink to semantic.yml
 (#23533)

---
 .github/workflows/semantic.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/semantic.yml b/.github/workflows/semantic.yml
index 0c647d50c9230..f1833a830bc26 100644
--- a/.github/workflows/semantic.yml
+++ b/.github/workflows/semantic.yml
@@ -200,6 +200,7 @@ jobs:
             blackhole sink
             clickhouse sink
             console sink
+            datadog_common sink
             datadog_archives sink
             datadog_events sink
             datadog_logs sink

From 1d646dad6019ff161c885a6e174eea1e8f1c35dd Mon Sep 17 00:00:00 2001
From: Pavlos Rontidis <pavlos.rontidis@gmail.com>
Date: Wed, 6 Aug 2025 09:36:41 -0400
Subject: [PATCH 266/305] fix(dev): update test config (#23529)

---
 src/api/tests.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/api/tests.rs b/src/api/tests.rs
index b9f06ac3ed20e..6d7cd0a20596f 100644
--- a/src/api/tests.rs
+++ b/src/api/tests.rs
@@ -198,13 +198,13 @@ async fn integration_test_source_metric() {
         "to_metric",
         &["in"],
         LogToMetricConfig {
-            metrics: vec![MetricConfig {
+            metrics: Some(vec![MetricConfig {
                 field: "message".try_into().expect("Fixed template string"),
                 name: None,
                 namespace: None,
                 tags: None,
                 metric: MetricTypeConfig::Gauge,
-            }],
+            }]),
             all_metrics: None,
         },
     );

From e7a3126b3d427a6627deb7eb87a9e76b34724c30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ensar=20Saraj=C4=8Di=C4=87?= <dev@ensarsarajcic.com>
Date: Wed, 6 Aug 2025 16:11:16 +0200
Subject: [PATCH 267/305] fix(dnstap source): increase request limit for TCP
 dnstap source (#23448)

* fix(dnstap source): increase request limit for TCP dnstap source

Closes: #23392

* Add changelog entry

* Clippy fix

---------

Co-authored-by: Pavlos Rontidis <pavlos.rontidis@gmail.com>
---
 changelog.d/23448_dnstap_tcp_source_throughput_issue.fix.md | 3 +++
 src/sources/util/framestream.rs                             | 6 ++++--
 2 files changed, 7 insertions(+), 2 deletions(-)
 create mode 100644 changelog.d/23448_dnstap_tcp_source_throughput_issue.fix.md

diff --git a/changelog.d/23448_dnstap_tcp_source_throughput_issue.fix.md b/changelog.d/23448_dnstap_tcp_source_throughput_issue.fix.md
new file mode 100644
index 0000000000000..b043dd04e5572
--- /dev/null
+++ b/changelog.d/23448_dnstap_tcp_source_throughput_issue.fix.md
@@ -0,0 +1,3 @@
+Fixed an issue with `dnstap` `tcp` source, where it could have a drastically reduced throughput after number of connections exceeded number of available cores.
+
+authors: esensar Quad9DNS
diff --git a/src/sources/util/framestream.rs b/src/sources/util/framestream.rs
index c0f254dabac88..03d69dbf1fc03 100644
--- a/src/sources/util/framestream.rs
+++ b/src/sources/util/framestream.rs
@@ -451,8 +451,10 @@ pub fn build_framestream_tcp_source(
         let connection_gauge = OpenGauge::new();
         let shutdown_clone = shutdown.clone();
 
-        let request_limiter =
-            RequestLimiter::new(MAX_IN_FLIGHT_EVENTS_TARGET, crate::num_threads());
+        let request_limiter = RequestLimiter::new(
+            MAX_IN_FLIGHT_EVENTS_TARGET,
+            frame_handler.max_frame_handling_tasks() as usize,
+        );
 
         listener
             .accept_stream_limited(frame_handler.max_connections())

From 2485565b3773e3b6451ef6c47727934bd8f30201 Mon Sep 17 00:00:00 2001
From: Kurochan <kuro@kurochan.org>
Date: Wed, 6 Aug 2025 23:19:38 +0900
Subject: [PATCH 268/305] fix(config): prevent panic on non-UTF8 environment
 variables (#23513)

* fix(config): prevent panic on non-UTF8 environment variables

* add changelog

* move changelog file
---
 changelog.d/23513_config_prevent_panic.fix.md | 3 +++
 src/config/loading/mod.rs                     | 8 +++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)
 create mode 100644 changelog.d/23513_config_prevent_panic.fix.md

diff --git a/changelog.d/23513_config_prevent_panic.fix.md b/changelog.d/23513_config_prevent_panic.fix.md
new file mode 100644
index 0000000000000..ff6d80ce4e38b
--- /dev/null
+++ b/changelog.d/23513_config_prevent_panic.fix.md
@@ -0,0 +1,3 @@
+Prevent panic on non-UTF8 environment variables.
+
+authors: kurochan
diff --git a/src/config/loading/mod.rs b/src/config/loading/mod.rs
index a4def7e19715d..9fbccfd9f9332 100644
--- a/src/config/loading/mod.rs
+++ b/src/config/loading/mod.rs
@@ -276,7 +276,13 @@ pub fn prepare_input<R: std::io::Read>(mut input: R) -> Result<String, Vec<Strin
         .read_to_string(&mut source_string)
         .map_err(|e| vec![e.to_string()])?;
 
-    let mut vars = std::env::vars().collect::<HashMap<_, _>>();
+    let mut vars: HashMap<String, String> = std::env::vars_os()
+        .filter_map(|(k, v)| match (k.into_string(), v.into_string()) {
+            (Ok(k), Ok(v)) => Some((k, v)),
+            _ => None,
+        })
+        .collect();
+
     if !vars.contains_key("HOSTNAME") {
         if let Ok(hostname) = crate::get_hostname() {
             vars.insert("HOSTNAME".into(), hostname);

From 72ea46b0dfeb0e89f0a59ac0d6de45051ac3d93f Mon Sep 17 00:00:00 2001
From: Kurochan <kuro@kurochan.org>
Date: Wed, 6 Aug 2025 23:21:07 +0900
Subject: [PATCH 269/305] fix(datadog_common sink): prevent panic on invalid
 api key (#23514)

* fix(datadog source): prevent panic on invalid api key

* fix error type

* add changelog

* move changelog file

---------

Co-authored-by: Pavlos Rontidis <pavlos.rontidis@gmail.com>
---
 changelog.d/23514_datadog_prevent_panic.fix.md | 3 +++
 src/sinks/datadog/mod.rs                       | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)
 create mode 100644 changelog.d/23514_datadog_prevent_panic.fix.md

diff --git a/changelog.d/23514_datadog_prevent_panic.fix.md b/changelog.d/23514_datadog_prevent_panic.fix.md
new file mode 100644
index 0000000000000..6f8599dbbd399
--- /dev/null
+++ b/changelog.d/23514_datadog_prevent_panic.fix.md
@@ -0,0 +1,3 @@
+Prevents a panic when DD_API_KEY contains newline characters.
+
+authors: kurochan
diff --git a/src/sinks/datadog/mod.rs b/src/sinks/datadog/mod.rs
index 597dd63eedc81..40c82040334f8 100644
--- a/src/sinks/datadog/mod.rs
+++ b/src/sinks/datadog/mod.rs
@@ -163,7 +163,7 @@ async fn build_healthcheck_future(
     let request = Request::get(validate_endpoint)
         .header("DD-API-KEY", api_key)
         .body(hyper::Body::empty())
-        .unwrap();
+        .map_err(|e| format!("Failed to make HTTP(S) request: {e:?}"))?;
 
     let response = client.send(request).await?;
 

From 7c30315b287c29aaffabb286ab4df77d17b24425 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ensar=20Saraj=C4=8Di=C4=87?= <dev@ensarsarajcic.com>
Date: Wed, 6 Aug 2025 19:07:30 +0200
Subject: [PATCH 270/305] chore(dnstap source): change type of
 `max_frame_handling_tasks` to `usize` (#23537)

* chore(dnstap source): change type of `max_frame_handling_tasks` to `usize`

Related: https://github.com/vectordotdev/vector/pull/23448#discussion_r2257245275

* Clippy fix
---
 src/sources/dnstap/mod.rs       |  6 +++---
 src/sources/dnstap/tcp.rs       |  2 +-
 src/sources/dnstap/unix.rs      |  2 +-
 src/sources/util/framestream.rs | 38 ++++++++++++++++-----------------
 4 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/src/sources/dnstap/mod.rs b/src/sources/dnstap/mod.rs
index 6fd229d590982..bb20d7560a2b5 100644
--- a/src/sources/dnstap/mod.rs
+++ b/src/sources/dnstap/mod.rs
@@ -62,7 +62,7 @@ pub struct DnstapConfig {
     pub multithreaded: Option<bool>,
 
     /// Maximum number of frames that can be processed concurrently.
-    pub max_frame_handling_tasks: Option<u32>,
+    pub max_frame_handling_tasks: Option<usize>,
 
     /// Whether to downcase all DNSTAP hostnames received for consistency
     #[serde(default = "crate::serde::default_false")]
@@ -222,7 +222,7 @@ struct CommonFrameHandler {
     content_type: String,
     raw_data_only: bool,
     multithreaded: bool,
-    max_frame_handling_tasks: u32,
+    max_frame_handling_tasks: usize,
     host_key: Option<OwnedValuePath>,
     timestamp_key: Option<OwnedValuePath>,
     source_type_key: Option<OwnedValuePath>,
@@ -327,7 +327,7 @@ impl FrameHandler for CommonFrameHandler {
         self.multithreaded
     }
 
-    fn max_frame_handling_tasks(&self) -> u32 {
+    fn max_frame_handling_tasks(&self) -> usize {
         self.max_frame_handling_tasks
     }
 
diff --git a/src/sources/dnstap/tcp.rs b/src/sources/dnstap/tcp.rs
index 1f7f8bb467a7f..ff8076043dd5a 100644
--- a/src/sources/dnstap/tcp.rs
+++ b/src/sources/dnstap/tcp.rs
@@ -211,7 +211,7 @@ impl<T: FrameHandler + Clone> FrameHandler for DnstapFrameHandler<T> {
         self.frame_handler.multithreaded()
     }
 
-    fn max_frame_handling_tasks(&self) -> u32 {
+    fn max_frame_handling_tasks(&self) -> usize {
         self.frame_handler.max_frame_handling_tasks()
     }
 
diff --git a/src/sources/dnstap/unix.rs b/src/sources/dnstap/unix.rs
index de8b96f3c7a36..b8742db04907a 100644
--- a/src/sources/dnstap/unix.rs
+++ b/src/sources/dnstap/unix.rs
@@ -116,7 +116,7 @@ impl<T: FrameHandler + Clone> FrameHandler for DnstapFrameHandler<T> {
         self.frame_handler.multithreaded()
     }
 
-    fn max_frame_handling_tasks(&self) -> u32 {
+    fn max_frame_handling_tasks(&self) -> usize {
         self.frame_handler.max_frame_handling_tasks()
     }
 
diff --git a/src/sources/util/framestream.rs b/src/sources/util/framestream.rs
index 03d69dbf1fc03..2daee6f70f359 100644
--- a/src/sources/util/framestream.rs
+++ b/src/sources/util/framestream.rs
@@ -8,7 +8,7 @@ use std::{
     net::SocketAddr,
     path::PathBuf,
     sync::{
-        atomic::{AtomicU32, Ordering},
+        atomic::{AtomicUsize, Ordering},
         Arc, Mutex,
     },
     time::Duration,
@@ -374,7 +374,7 @@ pub trait FrameHandler {
     fn max_frame_length(&self) -> usize;
     fn handle_event(&self, received_from: Option<Bytes>, frame: Bytes) -> Option<Event>;
     fn multithreaded(&self) -> bool;
-    fn max_frame_handling_tasks(&self) -> u32;
+    fn max_frame_handling_tasks(&self) -> usize;
     fn host_key(&self) -> &Option<OwnedValuePath>;
     fn timestamp_key(&self) -> Option<&OwnedValuePath>;
     fn source_type_key(&self) -> Option<&OwnedValuePath>;
@@ -453,7 +453,7 @@ pub fn build_framestream_tcp_source(
 
         let request_limiter = RequestLimiter::new(
             MAX_IN_FLIGHT_EVENTS_TARGET,
-            frame_handler.max_frame_handling_tasks() as usize,
+            frame_handler.max_frame_handling_tasks(),
         );
 
         listener
@@ -606,7 +606,7 @@ async fn handle_stream(
             })
         });
 
-    let active_parsing_task_nums = Arc::new(AtomicU32::new(0));
+    let active_parsing_task_nums = Arc::new(AtomicUsize::new(0));
     loop {
         let mut permit = tokio::select! {
             _ = &mut tripwire => break,
@@ -662,7 +662,7 @@ async fn handle_tcp_frame<T>(
     frame: Bytes,
     event_sink: &mut SourceSender,
     received_from: Option<Bytes>,
-    active_parsing_task_nums: Arc<AtomicU32>,
+    active_parsing_task_nums: Arc<AtomicUsize>,
 ) where
     T: TcpFrameHandler + Send + Sync + Clone + 'static,
 {
@@ -764,7 +764,7 @@ pub fn build_framestream_unix_source(
     };
 
     let fut = async move {
-        let active_parsing_task_nums = Arc::new(AtomicU32::new(0));
+        let active_parsing_task_nums = Arc::new(AtomicUsize::new(0));
 
         info!(message = "Listening...", ?path, r#type = "unix");
 
@@ -834,7 +834,7 @@ fn build_framestream_source<T: Send + 'static>(
     out: SourceSender,
     shutdown: impl Future<Output = T> + Unpin + Send + 'static,
     span: Span,
-    active_task_nums: Arc<AtomicU32>,
+    active_task_nums: Arc<AtomicUsize>,
     error_mapper: impl FnMut(std::io::Error) + Send + 'static,
 ) {
     let content_type = frame_handler.content_type();
@@ -904,8 +904,8 @@ async fn spawn_event_handling_tasks(
     event_handler: impl FrameHandler + Send + Sync + 'static,
     mut event_sink: SourceSender,
     received_from: Option<Bytes>,
-    active_task_nums: Arc<AtomicU32>,
-    max_frame_handling_tasks: u32,
+    active_task_nums: Arc<AtomicUsize>,
+    max_frame_handling_tasks: usize,
 ) -> JoinHandle<()> {
     wait_for_task_quota(&active_task_nums, max_frame_handling_tasks).await;
 
@@ -922,7 +922,7 @@ async fn spawn_event_handling_tasks(
     })
 }
 
-async fn wait_for_task_quota(active_task_nums: &Arc<AtomicU32>, max_tasks: u32) {
+async fn wait_for_task_quota(active_task_nums: &Arc<AtomicUsize>, max_tasks: usize) {
     while max_tasks > 0 && max_tasks < active_task_nums.load(Ordering::Acquire) {
         tokio::time::sleep(Duration::from_millis(3)).await;
     }
@@ -937,7 +937,7 @@ mod test {
     use std::{
         path::PathBuf,
         sync::{
-            atomic::{AtomicU32, Ordering},
+            atomic::{AtomicUsize, Ordering},
             Arc,
         },
         thread,
@@ -986,7 +986,7 @@ mod test {
         content_type: String,
         max_frame_length: usize,
         multithreaded: bool,
-        max_frame_handling_tasks: u32,
+        max_frame_handling_tasks: usize,
         extra_task_handling_routine: F,
         host_key: Option<OwnedValuePath>,
         timestamp_key: Option<OwnedValuePath>,
@@ -1101,7 +1101,7 @@ mod test {
         fn multithreaded(&self) -> bool {
             self.multithreaded
         }
-        fn max_frame_handling_tasks(&self) -> u32 {
+        fn max_frame_handling_tasks(&self) -> usize {
             self.max_frame_handling_tasks
         }
 
@@ -1135,7 +1135,7 @@ mod test {
             self.frame_handler.multithreaded()
         }
 
-        fn max_frame_handling_tasks(&self) -> u32 {
+        fn max_frame_handling_tasks(&self) -> usize {
             self.frame_handler.max_frame_handling_tasks()
         }
 
@@ -1187,7 +1187,7 @@ mod test {
             self.frame_handler.multithreaded()
         }
 
-        fn max_frame_handling_tasks(&self) -> u32 {
+        fn max_frame_handling_tasks(&self) -> usize {
             self.frame_handler.max_frame_handling_tasks()
         }
 
@@ -1747,9 +1747,9 @@ mod test {
         let (out, rx) = SourceSender::new_test();
 
         let max_frame_handling_tasks = 20;
-        let active_task_nums = Arc::new(AtomicU32::new(0));
+        let active_task_nums = Arc::new(AtomicUsize::new(0));
         let active_task_nums_copy = Arc::clone(&active_task_nums);
-        let max_task_nums_reached = Arc::new(AtomicU32::new(0));
+        let max_task_nums_reached = Arc::new(AtomicUsize::new(0));
         let max_task_nums_reached_copy = Arc::clone(&max_task_nums_reached);
 
         let mut join_handles = vec![];
@@ -1766,8 +1766,8 @@ mod test {
 
         join_handles.push(tokio::spawn(async move {
             future::ready({
-                let events = collect_n(rx, total_events as usize).await;
-                assert_eq!(total_events as usize, events.len(), "Missed events");
+                let events = collect_n(rx, total_events).await;
+                assert_eq!(total_events, events.len(), "Missed events");
             })
             .await;
         }));

From cce428651c7be6c11e2be2392de125c7b8b5f86f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 6 Aug 2025 15:22:06 -0400
Subject: [PATCH 271/305] chore(website deps): Bump tmp from 0.2.1 to 0.2.4 in
 /website in the npm_and_yarn group (#23539)

chore(website deps): Bump tmp in /website in the npm_and_yarn group

Bumps the npm_and_yarn group in /website with 1 update: [tmp](https://github.com/raszi/node-tmp).


Updates `tmp` from 0.2.1 to 0.2.4
- [Changelog](https://github.com/raszi/node-tmp/blob/master/CHANGELOG.md)
- [Commits](https://github.com/raszi/node-tmp/compare/v0.2.1...v0.2.4)

---
updated-dependencies:
- dependency-name: tmp
  dependency-version: 0.2.4
  dependency-type: indirect
  dependency-group: npm_and_yarn
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 website/yarn.lock | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/website/yarn.lock b/website/yarn.lock
index 36742edf850c3..24c6571af7d32 100644
--- a/website/yarn.lock
+++ b/website/yarn.lock
@@ -2660,7 +2660,7 @@ glob-promise@^4.2.0:
   dependencies:
     "@types/glob" "^7.1.3"
 
-glob@^7.0.0, glob@^7.1.3, glob@^7.1.7:
+glob@^7.0.0, glob@^7.1.7:
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.0.tgz#d15535af7732e02e948f4c41628bd910293f6023"
   integrity sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==
@@ -3569,13 +3569,6 @@ rgba-regex@^1.0.0:
   resolved "https://registry.yarnpkg.com/rgba-regex/-/rgba-regex-1.0.0.tgz#43374e2e2ca0968b0ef1523460b7d730ff22eeb3"
   integrity sha1-QzdOLiyglosO8VI0YLfXMP8i7rM=
 
-rimraf@^3.0.0:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"
-  integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==
-  dependencies:
-    glob "^7.1.3"
-
 rtl-css-js@^1.14.0:
   version "1.15.0"
   resolved "https://registry.yarnpkg.com/rtl-css-js/-/rtl-css-js-1.15.0.tgz#680ed816e570a9ebccba9e1cd0f202c6a8bb2dc0"
@@ -3818,11 +3811,9 @@ throttle-debounce@^3.0.1:
   integrity sha512-dTEWWNu6JmeVXY0ZYoPuH5cRIwc0MeGbJwah9KUNYSJwommQpCzTySTpEe8Gs1J23aeWEuAobe4Ag7EHVt/LOg==
 
 tmp@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.2.1.tgz#8457fc3037dcf4719c251367a1af6500ee1ccf14"
-  integrity sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==
-  dependencies:
-    rimraf "^3.0.0"
+  version "0.2.4"
+  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.2.4.tgz#c6db987a2ccc97f812f17137b36af2b6521b0d13"
+  integrity sha512-UdiSoX6ypifLmrfQ/XfiawN6hkjSBpCjhKxxZcWlUUmoXLaCKQU0bx4HF/tdDK2uzRuchf1txGvrWBzYREssoQ==
 
 to-regex-range@^5.0.1:
   version "5.0.1"

From 3b8b744ccecf78e2ed184a14565e1d27e09858c8 Mon Sep 17 00:00:00 2001
From: Pavlos Rontidis <pavlos.rontidis@gmail.com>
Date: Wed, 6 Aug 2025 15:53:34 -0400
Subject: [PATCH 272/305] chore(website): remove invalid URL and add info
 section (#23541)

---
 website/content/en/blog/log-namespacing.md | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/website/content/en/blog/log-namespacing.md b/website/content/en/blog/log-namespacing.md
index 12cfe94796f4e..52bcb80bafadc 100644
--- a/website/content/en/blog/log-namespacing.md
+++ b/website/content/en/blog/log-namespacing.md
@@ -10,6 +10,10 @@ badges:
 tags: []
 ---
 
+{{< info >}}
+Please visit our [log namespace guide](/guides/level-up/log_namespace/) for more details.
+{{< /info >}}
+
 The Vector team has been hard at work improving the data model of events in Vector. These
 changes are now available for beta testing for those who want to try it out and give feedback.
 This is an opt-in feature. Nothing should change unless you specifically enable it.
@@ -166,5 +170,3 @@ be used.
 [global log schema]: /docs/reference/configuration/global-options/#log_schema
 [set_semantic_meaning]: /docs/reference/vrl/functions/#set_semantic_meaning
 [remap]: /docs/reference/configuration/transforms/remap/
-
-[//]: # ([global config]: /docs/reference/configuration/global-options/#schema.log_namespace) TODO FIX

From 0a485f5de0caf86909706e1e581cd74301e81f84 Mon Sep 17 00:00:00 2001
From: Pavlos Rontidis <pavlos.rontidis@gmail.com>
Date: Wed, 6 Aug 2025 16:01:19 -0400
Subject: [PATCH 273/305] chore(ci): preview_site_trigger.yml skip instead of
 failing if the website name is invalid (#23540)

* wip

* cleanup
---
 .github/workflows/preview_site_trigger.yml | 66 ++++++++--------------
 1 file changed, 24 insertions(+), 42 deletions(-)

diff --git a/.github/workflows/preview_site_trigger.yml b/.github/workflows/preview_site_trigger.yml
index ba57d8d6e875f..811f5925ae86c 100644
--- a/.github/workflows/preview_site_trigger.yml
+++ b/.github/workflows/preview_site_trigger.yml
@@ -7,62 +7,44 @@ jobs:
     runs-on: ubuntu-24.04
     timeout-minutes: 5
     # Only run for PRs with 'website' in the branch name
-    if: ${{ contains(github.head_ref, 'website') && contains(github.head_ref, '-') }}
+    if: ${{ contains(github.head_ref, 'website') }}
     steps:
-      - name: Echo approval
+      # Validate branch name
+      - name: Validate branch name and set output
+        id: validate
         run: |
-          echo "Workflow has been allowed to run for PR ${{ github.event.number }}. Setting artifacts and then continuing workflow runs"
-
-      # Use GitHub Action to safely validate and store PR information
+          BRANCH="${{ github.head_ref }}"
+          if [[ ! "$BRANCH" =~ ^[a-zA-Z0-9_-]+$ ]]; then
+            echo "valid=false" >> $GITHUB_OUTPUT
+          else
+            echo "valid=true" >> $GITHUB_OUTPUT
+          fi
+
+      # Save PR information (only if branch is valid)
       - name: Validate and save PR information
+        if: steps.validate.outputs.valid == 'true'
         uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
         with:
           script: |
             const fs = require('fs').promises;
             const path = require('path');
             const crypto = require('crypto');
+            const prNumber = context.payload.number;
+            const branchName = context.payload.pull_request.head.ref;
 
-            async function createAndValidateArtifact() {
-              try {
-                // Create directory for artifact
-                await fs.mkdir('./pr', { recursive: true });
-
-                // Get PR number and validate
-                const prNumber = context.payload.number;
-                if (typeof prNumber !== 'number' || !Number.isInteger(prNumber) || prNumber <= 0) {
-                  core.setFailed(`Invalid PR number: ${prNumber}`);
-                  return;
-                }
-
-                // Get branch name and validate
-                const branchName = context.payload.pull_request.head.ref;
-                // Validate branch name (only allow alphanumeric, dash, and underscore)
-                const branchNameRegex = /^[a-zA-Z0-9_\-]+$/;
-                if (!branchNameRegex.test(branchName)) {
-                  core.setFailed(`Invalid branch name detected: ${branchName}`);
-                  return;
-                }
-
-                // Write validated information to files
-                await fs.writeFile('./pr/number', prNumber.toString());
-                await fs.writeFile('./pr/branch', branchName);
-
-                // Log success
-                core.info(`Successfully validated and saved PR #${prNumber} with branch ${branchName}`);
+            await fs.mkdir('./pr', { recursive: true });
+            await fs.writeFile('./pr/number', prNumber.toString());
+            await fs.writeFile('./pr/branch', branchName);
 
-                // Create hash signature of the data
-                const numberHash = crypto.createHash('sha256').update(prNumber.toString()).digest('hex');
-                const branchHash = crypto.createHash('sha256').update(branchName).digest('hex');
-                await fs.writeFile('./pr/integrity', `${numberHash}:${branchHash}`);
-              } catch (error) {
-                core.setFailed(`An error occurred: ${error.message}`);
-              }
-            }
+            const numberHash = crypto.createHash('sha256').update(prNumber.toString()).digest('hex');
+            const branchHash = crypto.createHash('sha256').update(branchName).digest('hex');
+            await fs.writeFile('./pr/integrity', `${numberHash}:${branchHash}`);
 
-            createAndValidateArtifact();
+            core.info(`Saved PR #${prNumber} and branch ${branchName}`);
 
-      # Upload the artifact using latest version
+      # Upload the artifact using latest version (only if branch is valid)
       - name: Upload PR information artifact
+        if: steps.validate.outputs.valid == 'true'
         uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
         with:
           name: pr

From 4c9ed1ea7cfcfb688b243a9448db6c7d1ac38ba1 Mon Sep 17 00:00:00 2001
From: Pavlos Rontidis <pavlos.rontidis@gmail.com>
Date: Wed, 6 Aug 2025 16:05:08 -0400
Subject: [PATCH 274/305] fix(log_to_metric transform): emit PairExpansion
 error (#23538)

* fix(log_to_metric transform): emit PairExpansion error

* ran cargo fmt

* changelog

* use the same msg
---
 .../log_to_metric_pair_expansion_error.fix.md |  3 ++
 src/internal_events/expansion.rs              | 46 +++++++++++++++++++
 src/internal_events/mod.rs                    |  5 ++
 src/transforms/log_to_metric.rs               | 32 ++++++++++---
 4 files changed, 80 insertions(+), 6 deletions(-)
 create mode 100644 changelog.d/log_to_metric_pair_expansion_error.fix.md
 create mode 100644 src/internal_events/expansion.rs

diff --git a/changelog.d/log_to_metric_pair_expansion_error.fix.md b/changelog.d/log_to_metric_pair_expansion_error.fix.md
new file mode 100644
index 0000000000000..ac2f8b17d7bbe
--- /dev/null
+++ b/changelog.d/log_to_metric_pair_expansion_error.fix.md
@@ -0,0 +1,3 @@
+The `log_to_metric` transforms now emits a pair expansion error. This error was previously silently ignored.
+
+authors: pront
diff --git a/src/internal_events/expansion.rs b/src/internal_events/expansion.rs
new file mode 100644
index 0000000000000..4077d4c25f8ab
--- /dev/null
+++ b/src/internal_events/expansion.rs
@@ -0,0 +1,46 @@
+use metrics::counter;
+use vector_lib::internal_event::{error_stage, error_type};
+use vector_lib::internal_event::{ComponentEventsDropped, InternalEvent, UNINTENTIONAL};
+
+pub struct PairExpansionError<'a> {
+    pub key: &'a str,
+    pub value: &'a str,
+    pub drop_event: bool,
+    pub error: serde_json::Error,
+}
+
+impl InternalEvent for PairExpansionError<'_> {
+    fn emit(self) {
+        let message = format!("Failed to expand key: `{}`:`{}`", self.key, self.value);
+
+        if self.drop_event {
+            error!(
+                message = %message,
+                error = %self.error,
+                error_type = error_type::PARSER_FAILED,
+                stage = error_stage::PROCESSING,
+
+            );
+
+            counter!(
+                "component_errors_total",
+                "error_type" => error_type::PARSER_FAILED,
+                "stage" => error_stage::PROCESSING,
+            )
+            .increment(1);
+
+            emit!(ComponentEventsDropped::<UNINTENTIONAL> {
+                count: 1,
+                reason: &message,
+            });
+        } else {
+            warn!(
+                message = %message,
+                error = %self.error,
+                error_type = error_type::PARSER_FAILED,
+                stage = error_stage::PROCESSING,
+
+            );
+        }
+    }
+}
diff --git a/src/internal_events/mod.rs b/src/internal_events/mod.rs
index a77796cc8af16..070c6951b2e50 100644
--- a/src/internal_events/mod.rs
+++ b/src/internal_events/mod.rs
@@ -140,6 +140,11 @@ mod window;
 mod file;
 mod windows;
 
+#[cfg(any(feature = "transforms-log_to_metric", feature = "sinks-loki"))]
+mod expansion;
+#[cfg(any(feature = "transforms-log_to_metric", feature = "sinks-loki"))]
+pub use self::expansion::*;
+
 #[cfg(feature = "sources-mongodb_metrics")]
 pub(crate) use mongodb_metrics::*;
 
diff --git a/src/transforms/log_to_metric.rs b/src/transforms/log_to_metric.rs
index bf566852598d6..f8566b47fc6d6 100644
--- a/src/transforms/log_to_metric.rs
+++ b/src/transforms/log_to_metric.rs
@@ -266,7 +266,11 @@ enum TransformError {
         error: ParseFloatError,
     },
     TemplateRenderingError(TemplateRenderingError),
-    PairExpansionError,
+    PairExpansionError {
+        key: String,
+        value: String,
+        error: serde_json::Error,
+    },
 }
 
 fn render_template(template: &Template, event: &Event) -> Result<String, TransformError> {
@@ -333,7 +337,7 @@ fn render_tag_into(
     static_tags: &mut HashMap<String, String>,
     dynamic_tags: &mut HashMap<String, String>,
 ) -> Result<(), TransformError> {
-    let key_s = match render_template(key_template, event) {
+    let key = match render_template(key_template, event) {
         Ok(key_s) => key_s,
         Err(TransformError::TemplateRenderingError(err)) => {
             emit!(crate::internal_events::TemplateRenderingError {
@@ -347,12 +351,12 @@ fn render_tag_into(
     };
     match value_template {
         None => {
-            result.insert(key_s, TagValue::Bare);
+            result.insert(key, TagValue::Bare);
         }
         Some(template) => match render_template(template, event) {
-            Ok(value_s) => {
-                let expanded_pairs = pair_expansion(&key_s, &value_s, static_tags, dynamic_tags)
-                    .map_err(|_| TransformError::PairExpansionError)?;
+            Ok(value) => {
+                let expanded_pairs = pair_expansion(&key, &value, static_tags, dynamic_tags)
+                    .map_err(|error| TransformError::PairExpansionError { key, value, error })?;
                 result.extend(expanded_pairs);
             }
             Err(TransformError::TemplateRenderingError(value_error)) => {
@@ -886,6 +890,14 @@ impl FunctionTransform for LogToMetric {
                         TransformError::MetricDetailsNotFound => {
                             emit!(MetricMetadataMetricDetailsNotFoundError {})
                         }
+                        TransformError::PairExpansionError { key, value, error } => {
+                            emit!(crate::internal_events::PairExpansionError {
+                                key: &key,
+                                value: &value,
+                                drop_event: true,
+                                error
+                            })
+                        }
                         _ => {}
                     };
                 }
@@ -921,6 +933,14 @@ impl FunctionTransform for LogToMetric {
                                     field: None,
                                 })
                             }
+                            TransformError::PairExpansionError { key, value, error } => {
+                                emit!(crate::internal_events::PairExpansionError {
+                                    key: &key,
+                                    value: &value,
+                                    drop_event: true,
+                                    error
+                                })
+                            }
                             _ => {}
                         };
                         // early return to prevent the partial buffer from being sent

From e8e19ccbc293d0e189282f5341a7d75e61940bac Mon Sep 17 00:00:00 2001
From: simplepad <35456194+simplepad@users.noreply.github.com>
Date: Wed, 6 Aug 2025 23:05:47 +0300
Subject: [PATCH 275/305] feat(config): allow setting max packet size for mqtt
 source and sink (#23515)

* add config options for mqtt max packet size

* make fmt

* generate docs

* combine into one option

* regenerate docs

* add changelog

* fix description
---
 changelog.d/23515_max_packet_size_mqtt.feature.md        | 3 +++
 src/common/mqtt.rs                                       | 9 +++++++++
 src/sinks/mqtt/config.rs                                 | 1 +
 src/sources/mqtt/config.rs                               | 1 +
 .../cue/reference/components/sinks/generated/mqtt.cue    | 5 +++++
 .../cue/reference/components/sources/generated/mqtt.cue  | 5 +++++
 6 files changed, 24 insertions(+)
 create mode 100644 changelog.d/23515_max_packet_size_mqtt.feature.md

diff --git a/changelog.d/23515_max_packet_size_mqtt.feature.md b/changelog.d/23515_max_packet_size_mqtt.feature.md
new file mode 100644
index 0000000000000..87d262a4454fc
--- /dev/null
+++ b/changelog.d/23515_max_packet_size_mqtt.feature.md
@@ -0,0 +1,3 @@
+Added an option to set max packet size for MQTT source and sink.
+
+authors: simplepad
diff --git a/src/common/mqtt.rs b/src/common/mqtt.rs
index 35f3c27812bcc..c5e1190b0b067 100644
--- a/src/common/mqtt.rs
+++ b/src/common/mqtt.rs
@@ -41,6 +41,11 @@ pub struct MqttCommonConfig {
     #[derivative(Default(value = "default_keep_alive()"))]
     pub keep_alive: u16,
 
+    /// Maximum packet size
+    #[serde(default = "default_max_packet_size")]
+    #[derivative(Default(value = "default_max_packet_size()"))]
+    pub max_packet_size: usize,
+
     /// TLS configuration.
     #[configurable(derived)]
     pub tls: Option<TlsEnableableConfig>,
@@ -54,6 +59,10 @@ const fn default_keep_alive() -> u16 {
     60
 }
 
+const fn default_max_packet_size() -> usize {
+    10 * 1024
+}
+
 /// MQTT Error Types
 #[derive(Debug, Snafu)]
 #[snafu(visibility(pub))]
diff --git a/src/sinks/mqtt/config.rs b/src/sinks/mqtt/config.rs
index 8c67c4acadf76..c4cf0225e7417 100644
--- a/src/sinks/mqtt/config.rs
+++ b/src/sinks/mqtt/config.rs
@@ -148,6 +148,7 @@ impl MqttSinkConfig {
             MaybeTlsSettings::from_config(self.common.tls.as_ref(), false).context(TlsSnafu)?;
         let mut options = MqttOptions::new(&client_id, &self.common.host, self.common.port);
         options.set_keep_alive(Duration::from_secs(self.common.keep_alive.into()));
+        options.set_max_packet_size(self.common.max_packet_size, self.common.max_packet_size);
         options.set_clean_session(self.clean_session);
         match (&self.common.user, &self.common.password) {
             (Some(user), Some(password)) => {
diff --git a/src/sources/mqtt/config.rs b/src/sources/mqtt/config.rs
index 4e8c7187edd3a..50fba4d18883b 100644
--- a/src/sources/mqtt/config.rs
+++ b/src/sources/mqtt/config.rs
@@ -132,6 +132,7 @@ impl MqttSourceConfig {
             MaybeTlsSettings::from_config(self.common.tls.as_ref(), false).context(TlsSnafu)?;
         let mut options = MqttOptions::new(client_id, &self.common.host, self.common.port);
         options.set_keep_alive(Duration::from_secs(self.common.keep_alive.into()));
+        options.set_max_packet_size(self.common.max_packet_size, self.common.max_packet_size);
 
         options.set_clean_session(false);
         match (&self.common.user, &self.common.password) {
diff --git a/website/cue/reference/components/sinks/generated/mqtt.cue b/website/cue/reference/components/sinks/generated/mqtt.cue
index 9f2990ecd808a..87096af5b1355 100644
--- a/website/cue/reference/components/sinks/generated/mqtt.cue
+++ b/website/cue/reference/components/sinks/generated/mqtt.cue
@@ -395,6 +395,11 @@ generated: components: sinks: mqtt: configuration: {
 		required:    false
 		type: uint: default: 60
 	}
+	max_packet_size: {
+		description: "Maximum packet size"
+		required:    false
+		type: uint: default: 10240
+	}
 	password: {
 		description: "MQTT password."
 		required:    false
diff --git a/website/cue/reference/components/sources/generated/mqtt.cue b/website/cue/reference/components/sources/generated/mqtt.cue
index d7da82d6eb75c..6668d95216390 100644
--- a/website/cue/reference/components/sources/generated/mqtt.cue
+++ b/website/cue/reference/components/sources/generated/mqtt.cue
@@ -448,6 +448,11 @@ generated: components: sources: mqtt: configuration: {
 		required:    false
 		type: uint: default: 60
 	}
+	max_packet_size: {
+		description: "Maximum packet size"
+		required:    false
+		type: uint: default: 10240
+	}
 	password: {
 		description: "MQTT password."
 		required:    false

From a9c4c1666012b082cbb83ffd86a04f2a6ee79634 Mon Sep 17 00:00:00 2001
From: Benjamin Dornel <benjamindornel@gmail.com>
Date: Thu, 7 Aug 2025 04:24:08 +0800
Subject: [PATCH 276/305] enhancement(nats sink): add support for JetStream
 message headers (#23510)

* feat: add templateable message header

* refactor(tests): dry nats sink config

* chore: add basic test for nats jetstream

* chore: add test for dynamic message id

* refactor: move headers under jetstream config block

* chore: update nats sink docs

* chore: add changelog

* chore: update nats sink docs

* chore: add missing slash to docstring

* chore: update nats sink docs

---------

Co-authored-by: Pavlos Rontidis <pavlos.rontidis@gmail.com>
---
 ...ders_in_nats_jetstream_sink.enhancement.md |   5 +
 scripts/integration/nats/compose.yaml         |   7 +
 scripts/integration/nats/test.yaml            |  19 +-
 src/sinks/nats/config.rs                      |  88 +++-
 src/sinks/nats/integration_tests.rs           | 472 ++++++++++--------
 src/sinks/nats/request_builder.rs             |  13 +-
 src/sinks/nats/service.rs                     |   2 +-
 src/sinks/nats/sink.rs                        |   6 +-
 tests/data/nats/nats-jetstream.conf           |   3 +
 .../components/sinks/generated/nats.cue       |  24 +-
 10 files changed, 401 insertions(+), 238 deletions(-)
 create mode 100644 changelog.d/23509_allow_headers_in_nats_jetstream_sink.enhancement.md
 create mode 100644 tests/data/nats/nats-jetstream.conf

diff --git a/changelog.d/23509_allow_headers_in_nats_jetstream_sink.enhancement.md b/changelog.d/23509_allow_headers_in_nats_jetstream_sink.enhancement.md
new file mode 100644
index 0000000000000..a709c4c9f5c2a
--- /dev/null
+++ b/changelog.d/23509_allow_headers_in_nats_jetstream_sink.enhancement.md
@@ -0,0 +1,5 @@
+The `nats` sink now supports message headers when publishing to JetStream.
+
+It introduces a configurable, templated Nats-Msg-Id header that ensures a unique ID for each message. This enables broker-level deduplication, resulting in stronger delivery guarantees and exactly-once semantics when combined with idempotent consumers.
+
+authors: benjamin-awd
diff --git a/scripts/integration/nats/compose.yaml b/scripts/integration/nats/compose.yaml
index fb36e78d819d4..9be71dc529380 100644
--- a/scripts/integration/nats/compose.yaml
+++ b/scripts/integration/nats/compose.yaml
@@ -43,3 +43,10 @@ services:
     - /usr/share/nats/config/nats-jwt.conf
     volumes:
     - ../../../tests/data/nats:/usr/share/nats/config
+  nats-jetstream-test:
+    image: docker.io/library/nats:${CONFIG_VERSION}
+    command:
+    - --config
+    - /usr/share/nats/config/nats-jetstream.conf
+    volumes:
+    - ../../../tests/data/nats:/usr/share/nats/config
diff --git a/scripts/integration/nats/test.yaml b/scripts/integration/nats/test.yaml
index 553c9efa25257..171a1c4ae6a3e 100644
--- a/scripts/integration/nats/test.yaml
+++ b/scripts/integration/nats/test.yaml
@@ -1,7 +1,7 @@
 features:
-- nats-integration-tests
+  - nats-integration-tests
 
-test_filter: '::nats::'
+test_filter: "::nats::"
 
 env:
   NATS_ADDRESS: nats://nats:4222
@@ -11,6 +11,7 @@ env:
   NATS_TLS_CLIENT_CERT_ADDRESS: nats://nats-tls-client-cert:4222
   NATS_TOKEN_ADDRESS: nats://nats-token:4222
   NATS_USERPASS_ADDRESS: nats://nats-userpass:4222
+  NATS_JETSTREAM_ADDRESS: nats://nats-jetstream-test:4222
 
 matrix:
   version: [latest]
@@ -18,10 +19,10 @@ matrix:
 # changes to these files/paths will invoke the integration test in CI
 # expressions are evaluated using https://github.com/micromatch/picomatch
 paths:
-- "src/internal_events/nats.rs"
-- "src/sources/nats.rs"
-- "src/sources/util/**"
-- "src/sinks/nats/**"
-- "src/sinks/util/**"
-- "src/nats.rs"
-- "scripts/integration/nats/**"
+  - "src/internal_events/nats.rs"
+  - "src/sources/nats.rs"
+  - "src/sources/util/**"
+  - "src/sinks/nats/**"
+  - "src/sinks/util/**"
+  - "src/nats.rs"
+  - "scripts/integration/nats/**"
diff --git a/src/sinks/nats/config.rs b/src/sinks/nats/config.rs
index c5209c54041bf..9082e5123714d 100644
--- a/src/sinks/nats/config.rs
+++ b/src/sinks/nats/config.rs
@@ -1,15 +1,16 @@
+use async_nats::header;
 use bytes::Bytes;
 use futures_util::TryFutureExt;
 use snafu::ResultExt;
 use vector_lib::codecs::JsonSerializerConfig;
 use vector_lib::tls::TlsEnableableConfig;
 
+use super::{sink::NatsSink, ConfigSnafu, ConnectSnafu, NatsError};
 use crate::{
     nats::{from_tls_auth_config, NatsAuthConfig, NatsConfigError},
     sinks::{prelude::*, util::service::TowerRequestConfigDefaults},
 };
-
-use super::{sink::NatsSink, ConfigSnafu, ConnectSnafu, NatsError};
+use async_nats::HeaderMap;
 
 #[derive(Clone, Copy, Debug)]
 pub struct NatsTowerRequestConfigDefaults;
@@ -18,6 +19,61 @@ impl TowerRequestConfigDefaults for NatsTowerRequestConfigDefaults {
     const CONCURRENCY: Concurrency = Concurrency::None;
 }
 
+/// A set of NATS headers that can be added to each message.
+#[configurable_component]
+#[serde_with::serde_as]
+#[derive(Clone, Debug, Default, PartialEq, Eq)]
+#[serde(deny_unknown_fields)]
+pub struct NatsHeaderConfig {
+    /// A unique identifier for the message. Useful for deduplication.
+    ///
+    /// Can be a template that references fields in the event, e.g., `{{ event_id }}`.
+    #[configurable(metadata(docs::templateable))]
+    #[serde(skip_serializing_if = "Option::is_none")]
+    #[configurable(metadata(docs::examples = "{{ event_id }}"))]
+    pub(super) message_id: Option<Template>,
+}
+
+impl NatsHeaderConfig {
+    pub fn build_headers(&self, event: &Event) -> HeaderMap {
+        let mut headers = HeaderMap::new();
+
+        if let Some(template) = &self.message_id {
+            if let Ok(value) = template.render_string(event) {
+                headers.insert(header::NATS_MESSAGE_ID, value.as_str());
+            }
+        }
+
+        headers
+    }
+}
+
+/// Configuration for sending messages using NATS JetStream.
+#[configurable_component]
+#[serde_with::serde_as]
+#[derive(Clone, Debug, Eq, PartialEq, Default)]
+#[serde(deny_unknown_fields)]
+pub struct JetStreamConfig {
+    /// Whether to enable Jetstream.
+    #[configurable(derived)]
+    #[serde(default)]
+    pub enabled: bool,
+
+    /// A map of NATS headers to be included in each message.
+    #[configurable(metadata(docs::templateable))]
+    #[serde(default)]
+    pub(super) headers: Option<NatsHeaderConfig>,
+}
+
+impl From<bool> for JetStreamConfig {
+    fn from(enabled: bool) -> Self {
+        Self {
+            enabled,
+            ..Default::default()
+        }
+    }
+}
+
 /// Configuration for the `nats` sink.
 #[configurable_component(sink(
     "nats",
@@ -86,8 +142,13 @@ pub struct NatsSinkConfig {
     /// If set, the `subject` must belong to an existing JetStream stream.
     ///
     /// [jetstream]: https://docs.nats.io/nats-concepts/jetstream
-    #[serde(default)]
-    pub(super) jetstream: bool,
+    #[configurable(derived)]
+    #[serde(
+        default,
+        deserialize_with = "crate::serde::bool_or_struct",
+        skip_serializing_if = "crate::serde::is_default"
+    )]
+    pub(super) jetstream: JetStreamConfig,
 }
 
 fn default_name() -> String {
@@ -105,7 +166,12 @@ impl GenerateConfig for NatsSinkConfig {
             tls: None,
             url: "nats://127.0.0.1:4222".into(),
             request: Default::default(),
-            jetstream: Default::default(),
+            jetstream: JetStreamConfig {
+                enabled: true,
+                headers: Some(NatsHeaderConfig {
+                    message_id: Some(Template::try_from("{{ event_id }}").unwrap()),
+                }),
+            },
         })
         .unwrap()
     }
@@ -175,7 +241,7 @@ impl NatsSinkConfig {
         let options = self.create_connect_options()?;
         let connection = self.connect(options).await?;
 
-        if self.jetstream {
+        if self.jetstream.enabled {
             Ok(NatsPublisher::JetStream(async_nats::jetstream::new(
                 connection,
             )))
@@ -203,6 +269,7 @@ impl NatsPublisher {
     pub(super) async fn publish<S: async_nats::subject::ToSubject>(
         &self,
         subject: S,
+        headers: HeaderMap,
         payload: Bytes,
     ) -> Result<(), NatsError> {
         match self {
@@ -222,11 +289,12 @@ impl NatsPublisher {
                     .await
             }
             NatsPublisher::JetStream(jetstream) => {
-                let ack = jetstream.publish(subject, payload).await.map_err(|e| {
-                    NatsError::PublishError {
+                let ack = jetstream
+                    .publish_with_headers(subject, headers, payload)
+                    .await
+                    .map_err(|e| NatsError::PublishError {
                         source: Box::new(e),
-                    }
-                })?;
+                    })?;
                 ack.await.map(|_| ()).map_err(|e| NatsError::PublishError {
                     source: Box::new(e),
                 })
diff --git a/src/sinks/nats/integration_tests.rs b/src/sinks/nats/integration_tests.rs
index 3555c55254d98..6e76d362e75c5 100644
--- a/src/sinks/nats/integration_tests.rs
+++ b/src/sinks/nats/integration_tests.rs
@@ -1,11 +1,13 @@
-use std::time::Duration;
-use vector_lib::codecs::TextSerializerConfig;
-
-use super::{config::NatsSinkConfig, sink::NatsSink, ConfigSnafu, NatsError};
+use super::{
+    config::{NatsHeaderConfig, NatsSinkConfig},
+    sink::NatsSink,
+    ConfigSnafu, NatsError,
+};
 use crate::{
     nats::{
         NatsAuthConfig, NatsAuthCredentialsFile, NatsAuthNKey, NatsAuthToken, NatsAuthUserPassword,
     },
+    sinks::nats::config::JetStreamConfig,
     sinks::prelude::*,
     test_util::{
         components::{run_and_assert_sink_compliance, SINK_TAGS},
@@ -13,7 +15,28 @@ use crate::{
     },
     tls::TlsEnableableConfig,
 };
+use async_nats::jetstream::stream::StorageType;
+use futures_util::StreamExt;
+use serde::Deserialize;
 use snafu::ResultExt;
+use std::time::Duration;
+use vector_lib::codecs::{JsonSerializerConfig, TextSerializerConfig};
+use vector_lib::event::{EventArray, LogEvent};
+use vrl::value;
+
+fn generate_sink_config(url: &str, subject: &str) -> NatsSinkConfig {
+    NatsSinkConfig {
+        acknowledgements: Default::default(),
+        encoding: TextSerializerConfig::default().into(),
+        connection_name: "".to_owned(),
+        subject: Template::try_from(subject).unwrap(),
+        url: url.to_string(),
+        tls: None,
+        auth: None,
+        request: Default::default(),
+        jetstream: false.into(),
+    }
+}
 
 async fn publish_and_check(conf: NatsSinkConfig) -> Result<(), NatsError> {
     // Publish `N` messages to NATS.
@@ -71,17 +94,7 @@ async fn nats_no_auth() {
     let url =
         std::env::var("NATS_ADDRESS").unwrap_or_else(|_| String::from("nats://localhost:4222"));
 
-    let conf = NatsSinkConfig {
-        acknowledgements: Default::default(),
-        encoding: TextSerializerConfig::default().into(),
-        connection_name: "".to_owned(),
-        subject: Template::try_from(subject.as_str()).unwrap(),
-        url,
-        tls: None,
-        auth: None,
-        request: Default::default(),
-        jetstream: false,
-    };
+    let conf = generate_sink_config(&url, &subject);
 
     let r = publish_and_check(conf).await;
     assert!(
@@ -98,22 +111,13 @@ async fn nats_userpass_auth_valid() {
     let url = std::env::var("NATS_USERPASS_ADDRESS")
         .unwrap_or_else(|_| String::from("nats://localhost:4222"));
 
-    let conf = NatsSinkConfig {
-        acknowledgements: Default::default(),
-        encoding: TextSerializerConfig::default().into(),
-        connection_name: "".to_owned(),
-        subject: Template::try_from(subject.as_str()).unwrap(),
-        url,
-        tls: None,
-        auth: Some(NatsAuthConfig::UserPassword {
-            user_password: NatsAuthUserPassword {
-                user: "natsuser".to_string(),
-                password: "natspass".to_string().into(),
-            },
-        }),
-        request: Default::default(),
-        jetstream: false,
-    };
+    let mut conf = generate_sink_config(&url, &subject);
+    conf.auth = Some(NatsAuthConfig::UserPassword {
+        user_password: NatsAuthUserPassword {
+            user: "natsuser".to_string(),
+            password: "natspass".to_string().into(),
+        },
+    });
 
     publish_and_check(conf)
         .await
@@ -128,22 +132,13 @@ async fn nats_userpass_auth_invalid() {
     let url = std::env::var("NATS_USERPASS_ADDRESS")
         .unwrap_or_else(|_| String::from("nats://localhost:4222"));
 
-    let conf = NatsSinkConfig {
-        acknowledgements: Default::default(),
-        encoding: TextSerializerConfig::default().into(),
-        connection_name: "".to_owned(),
-        subject: Template::try_from(subject.as_str()).unwrap(),
-        url,
-        tls: None,
-        auth: Some(NatsAuthConfig::UserPassword {
-            user_password: NatsAuthUserPassword {
-                user: "natsuser".to_string(),
-                password: "wrongpass".to_string().into(),
-            },
-        }),
-        request: Default::default(),
-        jetstream: false,
-    };
+    let mut conf = generate_sink_config(&url, &subject);
+    conf.auth = Some(NatsAuthConfig::UserPassword {
+        user_password: NatsAuthUserPassword {
+            user: "natsuser".to_string(),
+            password: "wrongpass".to_string().into(),
+        },
+    });
 
     let r = publish_and_check(conf).await;
     assert!(
@@ -160,21 +155,12 @@ async fn nats_token_auth_valid() {
     let url = std::env::var("NATS_TOKEN_ADDRESS")
         .unwrap_or_else(|_| String::from("nats://localhost:4222"));
 
-    let conf = NatsSinkConfig {
-        acknowledgements: Default::default(),
-        encoding: TextSerializerConfig::default().into(),
-        connection_name: "".to_owned(),
-        subject: Template::try_from(subject.as_str()).unwrap(),
-        url,
-        tls: None,
-        auth: Some(NatsAuthConfig::Token {
-            token: NatsAuthToken {
-                value: "secret".to_string().into(),
-            },
-        }),
-        request: Default::default(),
-        jetstream: false,
-    };
+    let mut conf = generate_sink_config(&url, &subject);
+    conf.auth = Some(NatsAuthConfig::Token {
+        token: NatsAuthToken {
+            value: "secret".to_string().into(),
+        },
+    });
 
     let r = publish_and_check(conf).await;
     assert!(
@@ -191,21 +177,12 @@ async fn nats_token_auth_invalid() {
     let url = std::env::var("NATS_TOKEN_ADDRESS")
         .unwrap_or_else(|_| String::from("nats://localhost:4222"));
 
-    let conf = NatsSinkConfig {
-        acknowledgements: Default::default(),
-        encoding: TextSerializerConfig::default().into(),
-        connection_name: "".to_owned(),
-        subject: Template::try_from(subject.as_str()).unwrap(),
-        url,
-        tls: None,
-        auth: Some(NatsAuthConfig::Token {
-            token: NatsAuthToken {
-                value: "wrongsecret".to_string().into(),
-            },
-        }),
-        request: Default::default(),
-        jetstream: false,
-    };
+    let mut conf = generate_sink_config(&url, &subject);
+    conf.auth = Some(NatsAuthConfig::Token {
+        token: NatsAuthToken {
+            value: "wrongsecret".to_string().into(),
+        },
+    });
 
     let r = publish_and_check(conf).await;
     assert!(
@@ -222,22 +199,13 @@ async fn nats_nkey_auth_valid() {
     let url = std::env::var("NATS_NKEY_ADDRESS")
         .unwrap_or_else(|_| String::from("nats://localhost:4222"));
 
-    let conf = NatsSinkConfig {
-        acknowledgements: Default::default(),
-        encoding: TextSerializerConfig::default().into(),
-        connection_name: "".to_owned(),
-        subject: Template::try_from(subject.as_str()).unwrap(),
-        url,
-        tls: None,
-        auth: Some(NatsAuthConfig::Nkey {
-            nkey: NatsAuthNKey {
-                nkey: "UD345ZYSUJQD7PNCTWQPINYSO3VH4JBSADBSYUZOBT666DRASFRAWAWT".into(),
-                seed: "SUANIRXEZUROTXNFN3TJYMT27K7ZZVMD46FRIHF6KXKS4KGNVBS57YAFGY".into(),
-            },
-        }),
-        request: Default::default(),
-        jetstream: false,
-    };
+    let mut conf = generate_sink_config(&url, &subject);
+    conf.auth = Some(NatsAuthConfig::Nkey {
+        nkey: NatsAuthNKey {
+            nkey: "UD345ZYSUJQD7PNCTWQPINYSO3VH4JBSADBSYUZOBT666DRASFRAWAWT".into(),
+            seed: "SUANIRXEZUROTXNFN3TJYMT27K7ZZVMD46FRIHF6KXKS4KGNVBS57YAFGY".into(),
+        },
+    });
 
     let r = publish_and_check(conf).await;
     assert!(
@@ -254,22 +222,13 @@ async fn nats_nkey_auth_invalid() {
     let url = std::env::var("NATS_NKEY_ADDRESS")
         .unwrap_or_else(|_| String::from("nats://localhost:4222"));
 
-    let conf = NatsSinkConfig {
-        acknowledgements: Default::default(),
-        encoding: TextSerializerConfig::default().into(),
-        connection_name: "".to_owned(),
-        subject: Template::try_from(subject.as_str()).unwrap(),
-        url,
-        tls: None,
-        auth: Some(NatsAuthConfig::Nkey {
-            nkey: NatsAuthNKey {
-                nkey: "UAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA".into(),
-                seed: "SBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB".into(),
-            },
-        }),
-        request: Default::default(),
-        jetstream: false,
-    };
+    let mut conf = generate_sink_config(&url, &subject);
+    conf.auth = Some(NatsAuthConfig::Nkey {
+        nkey: NatsAuthNKey {
+            nkey: "UAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA".into(),
+            seed: "SBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB".into(),
+        },
+    });
 
     let r = publish_and_check(conf).await;
     assert!(
@@ -286,23 +245,14 @@ async fn nats_tls_valid() {
     let url =
         std::env::var("NATS_TLS_ADDRESS").unwrap_or_else(|_| String::from("nats://localhost:4222"));
 
-    let conf = NatsSinkConfig {
-        acknowledgements: Default::default(),
-        encoding: TextSerializerConfig::default().into(),
-        connection_name: "".to_owned(),
-        subject: Template::try_from(subject.as_str()).unwrap(),
-        url,
-        tls: Some(TlsEnableableConfig {
-            enabled: Some(true),
-            options: TlsConfig {
-                ca_file: Some("tests/data/nats/rootCA.pem".into()),
-                ..Default::default()
-            },
-        }),
-        auth: None,
-        request: Default::default(),
-        jetstream: false,
-    };
+    let mut conf = generate_sink_config(&url, &subject);
+    conf.tls = Some(TlsEnableableConfig {
+        enabled: Some(true),
+        options: TlsConfig {
+            ca_file: Some("tests/data/nats/rootCA.pem".into()),
+            ..Default::default()
+        },
+    });
 
     let r = publish_and_check(conf).await;
     assert!(
@@ -319,17 +269,7 @@ async fn nats_tls_invalid() {
     let url =
         std::env::var("NATS_TLS_ADDRESS").unwrap_or_else(|_| String::from("nats://localhost:4222"));
 
-    let conf = NatsSinkConfig {
-        acknowledgements: Default::default(),
-        encoding: TextSerializerConfig::default().into(),
-        connection_name: "".to_owned(),
-        subject: Template::try_from(subject.as_str()).unwrap(),
-        url,
-        tls: None,
-        auth: None,
-        request: Default::default(),
-        jetstream: false,
-    };
+    let conf = generate_sink_config(&url, &subject);
 
     let r = publish_and_check(conf).await;
     assert!(
@@ -346,25 +286,16 @@ async fn nats_tls_client_cert_valid() {
     let url = std::env::var("NATS_TLS_CLIENT_CERT_ADDRESS")
         .unwrap_or_else(|_| String::from("nats://localhost:4222"));
 
-    let conf = NatsSinkConfig {
-        acknowledgements: Default::default(),
-        encoding: TextSerializerConfig::default().into(),
-        connection_name: "".to_owned(),
-        subject: Template::try_from(subject.as_str()).unwrap(),
-        url,
-        tls: Some(TlsEnableableConfig {
-            enabled: Some(true),
-            options: TlsConfig {
-                ca_file: Some("tests/data/nats/rootCA.pem".into()),
-                crt_file: Some("tests/data/nats/nats-client.pem".into()),
-                key_file: Some("tests/data/nats/nats-client.key".into()),
-                ..Default::default()
-            },
-        }),
-        auth: None,
-        request: Default::default(),
-        jetstream: false,
-    };
+    let mut conf = generate_sink_config(&url, &subject);
+    conf.tls = Some(TlsEnableableConfig {
+        enabled: Some(true),
+        options: TlsConfig {
+            ca_file: Some("tests/data/nats/rootCA.pem".into()),
+            crt_file: Some("tests/data/nats/nats-client.pem".into()),
+            key_file: Some("tests/data/nats/nats-client.key".into()),
+            ..Default::default()
+        },
+    });
 
     let r = publish_and_check(conf).await;
     assert!(
@@ -381,23 +312,14 @@ async fn nats_tls_client_cert_invalid() {
     let url = std::env::var("NATS_TLS_CLIENT_CERT_ADDRESS")
         .unwrap_or_else(|_| String::from("nats://localhost:4222"));
 
-    let conf = NatsSinkConfig {
-        acknowledgements: Default::default(),
-        encoding: TextSerializerConfig::default().into(),
-        connection_name: "".to_owned(),
-        subject: Template::try_from(subject.as_str()).unwrap(),
-        url,
-        tls: Some(TlsEnableableConfig {
-            enabled: Some(true),
-            options: TlsConfig {
-                ca_file: Some("tests/data/nats/rootCA.pem".into()),
-                ..Default::default()
-            },
-        }),
-        auth: None,
-        request: Default::default(),
-        jetstream: false,
-    };
+    let mut conf = generate_sink_config(&url, &subject);
+    conf.tls = Some(TlsEnableableConfig {
+        enabled: Some(true),
+        options: TlsConfig {
+            ca_file: Some("tests/data/nats/rootCA.pem".into()),
+            ..Default::default()
+        },
+    });
 
     let r = publish_and_check(conf).await;
     assert!(
@@ -414,27 +336,19 @@ async fn nats_tls_jwt_auth_valid() {
     let url =
         std::env::var("NATS_JWT_ADDRESS").unwrap_or_else(|_| String::from("nats://localhost:4222"));
 
-    let conf = NatsSinkConfig {
-        acknowledgements: Default::default(),
-        encoding: TextSerializerConfig::default().into(),
-        connection_name: "".to_owned(),
-        subject: Template::try_from(subject.as_str()).unwrap(),
-        url,
-        tls: Some(TlsEnableableConfig {
-            enabled: Some(true),
-            options: TlsConfig {
-                ca_file: Some("tests/data/nats/rootCA.pem".into()),
-                ..Default::default()
-            },
-        }),
-        auth: Some(NatsAuthConfig::CredentialsFile {
-            credentials_file: NatsAuthCredentialsFile {
-                path: "tests/data/nats/nats.creds".into(),
-            },
-        }),
-        request: Default::default(),
-        jetstream: false,
-    };
+    let mut conf = generate_sink_config(&url, &subject);
+    conf.tls = Some(TlsEnableableConfig {
+        enabled: Some(true),
+        options: TlsConfig {
+            ca_file: Some("tests/data/nats/rootCA.pem".into()),
+            ..Default::default()
+        },
+    });
+    conf.auth = Some(NatsAuthConfig::CredentialsFile {
+        credentials_file: NatsAuthCredentialsFile {
+            path: "tests/data/nats/nats.creds".into(),
+        },
+    });
 
     let r = publish_and_check(conf).await;
     assert!(
@@ -451,27 +365,19 @@ async fn nats_tls_jwt_auth_invalid() {
     let url =
         std::env::var("NATS_JWT_ADDRESS").unwrap_or_else(|_| String::from("nats://localhost:4222"));
 
-    let conf = NatsSinkConfig {
-        acknowledgements: Default::default(),
-        encoding: TextSerializerConfig::default().into(),
-        connection_name: "".to_owned(),
-        subject: Template::try_from(subject.as_str()).unwrap(),
-        url,
-        tls: Some(TlsEnableableConfig {
-            enabled: Some(true),
-            options: TlsConfig {
-                ca_file: Some("tests/data/nats/rootCA.pem".into()),
-                ..Default::default()
-            },
-        }),
-        auth: Some(NatsAuthConfig::CredentialsFile {
-            credentials_file: NatsAuthCredentialsFile {
-                path: "tests/data/nats/nats-bad.creds".into(),
-            },
-        }),
-        request: Default::default(),
-        jetstream: false,
-    };
+    let mut conf = generate_sink_config(&url, &subject);
+    conf.tls = Some(TlsEnableableConfig {
+        enabled: Some(true),
+        options: TlsConfig {
+            ca_file: Some("tests/data/nats/rootCA.pem".into()),
+            ..Default::default()
+        },
+    });
+    conf.auth = Some(NatsAuthConfig::CredentialsFile {
+        credentials_file: NatsAuthCredentialsFile {
+            path: "tests/data/nats/nats-bad.creds".into(),
+        },
+    });
 
     let r = publish_and_check(conf).await;
     assert!(
@@ -479,3 +385,139 @@ async fn nats_tls_jwt_auth_invalid() {
         "publish_and_check failed, expected NatsError::Connect, got: {r:?}"
     );
 }
+
+#[tokio::test]
+async fn nats_jetstream_valid() {
+    trace_init();
+    let stream_name = format!("EVENTS_{}", random_string(10));
+    let subject = format!("events.test-{}", random_string(10));
+
+    let url = std::env::var("NATS_JETSTREAM_ADDRESS")
+        .unwrap_or_else(|_| String::from("nats://localhost:4222"));
+
+    let client = async_nats::connect(&url)
+        .await
+        .expect("Failed to connect to NATS");
+
+    let js = async_nats::jetstream::new(client);
+
+    js.get_or_create_stream(async_nats::jetstream::stream::Config {
+        name: stream_name.clone(),
+        subjects: vec![subject.clone()],
+        storage: StorageType::Memory,
+        ..Default::default()
+    })
+    .await
+    .expect("Failed to create JetStream stream");
+
+    let mut conf = generate_sink_config(&url, &subject);
+    conf.jetstream = JetStreamConfig {
+        enabled: true,
+        ..Default::default()
+    };
+
+    let r = publish_and_check(conf).await;
+    assert!(
+        r.is_ok(),
+        "publish_and_check failed, expected Ok(()), got: {r:?}"
+    );
+}
+
+#[derive(Debug, Deserialize)]
+struct JetstreamTestEvent {
+    id: String,
+    message: String,
+}
+
+// Check that message ids are dynamically assigned
+// and that they are correctly deduplicated at the stream level
+#[tokio::test]
+async fn nats_jetstream_message_id_valid() {
+    trace_init();
+    let stream_name = format!("EVENTS_MSG_ID_{}", random_string(10));
+    let subject = format!("events.test.msg.id-{}", random_string(10));
+
+    let url = std::env::var("NATS_JETSTREAM_ADDRESS")
+        .unwrap_or_else(|_| String::from("nats://localhost:4222"));
+
+    let client = async_nats::connect(&url).await.unwrap();
+    let js = async_nats::jetstream::new(client);
+    js.get_or_create_stream(async_nats::jetstream::stream::Config {
+        name: stream_name.clone(),
+        subjects: vec![subject.clone()],
+        storage: StorageType::Memory,
+        duplicate_window: std::time::Duration::from_secs(60),
+        ..Default::default()
+    })
+    .await
+    .unwrap();
+
+    let mut conf = generate_sink_config(&url, &subject);
+    conf.encoding = JsonSerializerConfig::default().into();
+
+    let header_config = NatsHeaderConfig {
+        message_id: Some(Template::try_from("{{ id }}").unwrap()),
+    };
+
+    conf.jetstream = JetStreamConfig {
+        enabled: true,
+        headers: Some(header_config),
+    };
+
+    let sink = NatsSink::new(conf.clone()).await.unwrap();
+    let sink = VectorSink::from_event_streamsink(sink);
+
+    let event_id = "123";
+
+    let event1 = LogEvent::from(value!({
+        "id": event_id,
+        "message": "first message",
+    }));
+
+    let event2 = LogEvent::from(value!({
+        "id": event_id,
+        "message": "second message",
+    }));
+
+    let event3 = LogEvent::from(value!({
+        "id": event_id,
+        "message": "third message",
+    }));
+
+    let event_array = EventArray::Logs(vec![event1, event2, event3]);
+    sink.run(futures::stream::iter(vec![event_array]).boxed())
+        .await
+        .unwrap();
+
+    tokio::time::sleep(std::time::Duration::from_secs(2)).await;
+
+    let stream = js.get_stream(&stream_name).await.unwrap();
+    let consumer = stream
+        .create_consumer(async_nats::jetstream::consumer::pull::Config {
+            durable_name: Some(format!("test-consumer-{}", random_string(5))),
+            ..Default::default()
+        })
+        .await
+        .unwrap();
+
+    let mut processed_messages = Vec::new();
+
+    let messages = consumer.fetch().max_messages(2).messages().await;
+    let mut stream = messages.expect("Failed to get stream");
+
+    while let Some(Ok(msg)) = stream.next().await {
+        msg.ack().await.unwrap();
+        processed_messages.push(msg);
+    }
+
+    assert_eq!(
+        processed_messages.len(),
+        1,
+        "Expected only one message due to deduplication"
+    );
+
+    let msg = &processed_messages[0];
+    let received_event: JetstreamTestEvent = serde_json::from_slice(&msg.payload).unwrap();
+    assert_eq!(received_event.id, event_id);
+    assert_eq!(received_event.message, "first message");
+}
diff --git a/src/sinks/nats/request_builder.rs b/src/sinks/nats/request_builder.rs
index 08368e138d368..660810f9b7b53 100644
--- a/src/sinks/nats/request_builder.rs
+++ b/src/sinks/nats/request_builder.rs
@@ -1,12 +1,13 @@
 use std::io;
 
+use async_nats::HeaderMap;
 use bytes::{Bytes, BytesMut};
 use tokio_util::codec::Encoder as _;
 use vector_lib::config::telemetry;
 
 use crate::sinks::prelude::*;
 
-use super::sink::NatsEvent;
+use super::{config::NatsHeaderConfig, sink::NatsEvent};
 
 pub(super) struct NatsEncoder {
     pub(super) transformer: Transformer,
@@ -39,17 +40,20 @@ impl encoding::Encoder<Event> for NatsEncoder {
 
 pub(super) struct NatsMetadata {
     subject: String,
+    headers: HeaderMap,
     finalizers: EventFinalizers,
 }
 
 pub(super) struct NatsRequestBuilder {
     pub(super) encoder: NatsEncoder,
+    pub(super) headers: Option<NatsHeaderConfig>,
 }
 
 #[derive(Clone)]
 pub(super) struct NatsRequest {
     pub(super) bytes: Bytes,
     pub(super) subject: String,
+    pub(super) headers: HeaderMap,
     finalizers: EventFinalizers,
     pub(super) metadata: RequestMetadata,
 }
@@ -91,9 +95,15 @@ impl RequestBuilder<NatsEvent> for NatsRequestBuilder {
         mut input: NatsEvent,
     ) -> (Self::Metadata, RequestMetadataBuilder, Self::Events) {
         let builder = RequestMetadataBuilder::from_event(&input.event);
+        let headers = self
+            .headers
+            .as_ref()
+            .map(|config| config.build_headers(&input.event))
+            .unwrap_or_default();
 
         let metadata = NatsMetadata {
             subject: input.subject,
+            headers,
             finalizers: input.event.take_finalizers(),
         };
 
@@ -110,6 +120,7 @@ impl RequestBuilder<NatsEvent> for NatsRequestBuilder {
         NatsRequest {
             bytes: body,
             subject: nats_metadata.subject,
+            headers: nats_metadata.headers,
             finalizers: nats_metadata.finalizers,
             metadata,
         }
diff --git a/src/sinks/nats/service.rs b/src/sinks/nats/service.rs
index 1aeccced639f9..08b098aae46ff 100644
--- a/src/sinks/nats/service.rs
+++ b/src/sinks/nats/service.rs
@@ -48,7 +48,7 @@ impl Service<NatsRequest> for NatsService {
 
         Box::pin(async move {
             match publisher
-                .publish(req.subject, req.bytes)
+                .publish(req.subject, req.headers, req.bytes)
                 .map_err(async_nats::Error::from)
                 .await
             {
diff --git a/src/sinks/nats/sink.rs b/src/sinks/nats/sink.rs
index a5b94d4a9c759..bfec91a999ae7 100644
--- a/src/sinks/nats/sink.rs
+++ b/src/sinks/nats/sink.rs
@@ -5,7 +5,7 @@ use snafu::ResultExt;
 use crate::sinks::prelude::*;
 
 use super::{
-    config::{NatsPublisher, NatsSinkConfig, NatsTowerRequestConfigDefaults},
+    config::{NatsHeaderConfig, NatsPublisher, NatsSinkConfig, NatsTowerRequestConfigDefaults},
     request_builder::{NatsEncoder, NatsRequestBuilder},
     service::{NatsResponse, NatsService},
     EncodingSnafu, NatsError,
@@ -22,6 +22,7 @@ pub(super) struct NatsSink {
     encoder: Encoder<()>,
     publisher: Arc<NatsPublisher>,
     subject: Template,
+    headers: Option<NatsHeaderConfig>,
 }
 
 impl NatsSink {
@@ -48,6 +49,7 @@ impl NatsSink {
         let encoder = Encoder::<()>::new(serializer);
         let request = config.request;
         let subject = config.subject;
+        let headers = config.jetstream.headers;
 
         Ok(NatsSink {
             request,
@@ -55,6 +57,7 @@ impl NatsSink {
             encoder,
             publisher,
             subject,
+            headers,
         })
     }
 
@@ -66,6 +69,7 @@ impl NatsSink {
                 encoder: self.encoder.clone(),
                 transformer: self.transformer.clone(),
             },
+            headers: self.headers.clone(),
         };
 
         let service = ServiceBuilder::new()
diff --git a/tests/data/nats/nats-jetstream.conf b/tests/data/nats/nats-jetstream.conf
new file mode 100644
index 0000000000000..528e6ab71d92f
--- /dev/null
+++ b/tests/data/nats/nats-jetstream.conf
@@ -0,0 +1,3 @@
+jetstream {
+  store_dir: "/tmp/nats/jetstream"
+}
diff --git a/website/cue/reference/components/sinks/generated/nats.cue b/website/cue/reference/components/sinks/generated/nats.cue
index edb77b2b1bbe1..0260a118b89a4 100644
--- a/website/cue/reference/components/sinks/generated/nats.cue
+++ b/website/cue/reference/components/sinks/generated/nats.cue
@@ -484,7 +484,29 @@ generated: components: sinks: nats: configuration: {
 			[jetstream]: https://docs.nats.io/nats-concepts/jetstream
 			"""
 		required: false
-		type: bool: default: false
+		type: object: options: {
+			enabled: {
+				description: "Whether to enable Jetstream."
+				required:    false
+				type: bool: default: false
+			}
+			headers: {
+				description: "A map of NATS headers to be included in each message."
+				required:    false
+				type: object: options: message_id: {
+					description: """
+						A unique identifier for the message. Useful for deduplication.
+
+						Can be a template that references fields in the event, e.g., `{{ event_id }}`.
+						"""
+					required: false
+					type: string: {
+						examples: ["{{ event_id }}"]
+						syntax: "template"
+					}
+				}
+			}
+		}
 	}
 	request: {
 		description: """

From d9bef7e49987313afa064b52dc55762e98d1c7d7 Mon Sep 17 00:00:00 2001
From: Serendo <biiyunfei@gmail.com>
Date: Thu, 7 Aug 2025 21:27:00 +0800
Subject: [PATCH 277/305] feat(elasticsearch sink): fix partial retry logic
 (#22431)

* Update to tower 0.5.
- Adjustments of Buffer type definition in Tower 0.5
- As policy is directly modified in Tower 0.5. Removed the policy part in the RetryPolicyFuture.
- The change args to mutable for the retry function and clone_request function. It's changed in Tower 0.5.
- Changed the RetryPolicyFuture Output to (). This is also changed in Tower 0.5.
- Modified some tests as policy is now modified in advance function;

* Add a RetryPartial variant to RetryAction. which is a closure and impls a RetryPartialFunction trait to modify the old request.

In the elasticsearch sink. When there are errors in the response, the response's status_codes are keeped in a closure which is later used by the modify_request func in RetryPartialFunction trait.

* add a changelog fragment for elasticsearch sink retry partial

* changed some threshold of the tests. But I dont quite understand how these stats ranges are related with the test params.

* add newline to changelog end

* cargo.lock update

* Update changelog.d/elasticsearch_sink_skip_retrying_succeeded_documents.feature.md

* remove unwrap for safety.

* cleanup the code.

* Put original events and es request builder  into the ElasticsearchRequest
Now the request to be retried are constructed from the filtered original events. The metadata should be correct now.

* fix merge conflict

* Update src/sinks/util/retries.rs

change error message to warn message

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* Update src/sinks/elasticsearch/retry.rs

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* Update src/sinks/elasticsearch/retry.rs

Co-authored-by: Pavlos Rontidis <pavlos.rontidis@gmail.com>

* as pront suggested

* Remove downcast ref and trait usage from partial retry logic

* Fix make check-clippy errors

* Revert "Fix make check-clippy errors"

This reverts commit 79e7dd386f70109c6beb4e1e28b9d5a9366ad6ba.

* Revert "Remove downcast ref and trait usage from partial retry logic"

This reverts commit e972da4ea747bda459e5e16068a88f6ebce45d4d.

* Revert cmake bump in Cargo.lock

* cargo fmt

* Address PR feedback

---------

Co-authored-by: Pavlos Rontidis <pavlos.rontidis@gmail.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Co-authored-by: Thomas <thomas.schneider@datadoghq.com>
---
 ...ip_retrying_succeeded_documents.feature.md |  3 +
 src/sinks/elasticsearch/encoder.rs            |  8 +-
 src/sinks/elasticsearch/request_builder.rs    |  4 +
 src/sinks/elasticsearch/retry.rs              | 91 +++++++++++++++----
 src/sinks/elasticsearch/service.rs            | 13 ++-
 src/sinks/util/retries.rs                     | 38 +++++++-
 6 files changed, 131 insertions(+), 26 deletions(-)
 create mode 100644 changelog.d/elasticsearch_sink_skip_retrying_succeeded_documents.feature.md

diff --git a/changelog.d/elasticsearch_sink_skip_retrying_succeeded_documents.feature.md b/changelog.d/elasticsearch_sink_skip_retrying_succeeded_documents.feature.md
new file mode 100644
index 0000000000000..57e51daf395cd
--- /dev/null
+++ b/changelog.d/elasticsearch_sink_skip_retrying_succeeded_documents.feature.md
@@ -0,0 +1,3 @@
+The `request_retry_partial` behavior for the `elasticsearch` was changed. Now only the failed retriable requests in a bulk will be retried (instead of all requests in the bulk).
+
+authors: Serendo
diff --git a/src/sinks/elasticsearch/encoder.rs b/src/sinks/elasticsearch/encoder.rs
index e4f1ace676181..1e3b4b354c4e4 100644
--- a/src/sinks/elasticsearch/encoder.rs
+++ b/src/sinks/elasticsearch/encoder.rs
@@ -19,7 +19,7 @@ use crate::{
     },
 };
 
-#[derive(Serialize)]
+#[derive(Serialize, Clone, Debug)]
 pub enum DocumentVersionType {
     External,
     ExternalGte,
@@ -34,20 +34,20 @@ impl DocumentVersionType {
     }
 }
 
-#[derive(Serialize)]
+#[derive(Serialize, Clone, Debug)]
 pub struct DocumentVersion {
     pub kind: DocumentVersionType,
     pub value: u64,
 }
 
-#[derive(Serialize)]
+#[derive(Serialize, Clone, Debug)]
 pub enum DocumentMetadata {
     WithoutId,
     Id(String),
     IdAndVersion(String, DocumentVersion),
 }
 
-#[derive(Serialize)]
+#[derive(Serialize, Clone, Debug)]
 pub struct ProcessedEvent {
     pub index: String,
     pub bulk_action: BulkAction,
diff --git a/src/sinks/elasticsearch/request_builder.rs b/src/sinks/elasticsearch/request_builder.rs
index 9d80539a50931..5314c78527f48 100644
--- a/src/sinks/elasticsearch/request_builder.rs
+++ b/src/sinks/elasticsearch/request_builder.rs
@@ -26,6 +26,7 @@ pub struct Metadata {
     finalizers: EventFinalizers,
     batch_size: usize,
     events_byte_size: JsonSize,
+    original_events: Vec<ProcessedEvent>,
 }
 
 impl RequestBuilder<Vec<ProcessedEvent>> for ElasticsearchRequestBuilder {
@@ -60,6 +61,7 @@ impl RequestBuilder<Vec<ProcessedEvent>> for ElasticsearchRequestBuilder {
             finalizers: events.take_finalizers(),
             batch_size: events.len(),
             events_byte_size,
+            original_events: events.clone(),
         };
         (es_metadata, metadata_builder, events)
     }
@@ -76,6 +78,8 @@ impl RequestBuilder<Vec<ProcessedEvent>> for ElasticsearchRequestBuilder {
             batch_size: es_metadata.batch_size,
             events_byte_size: es_metadata.events_byte_size,
             metadata,
+            original_events: es_metadata.original_events,
+            elasticsearch_request_builder: self.clone(),
         }
     }
 }
diff --git a/src/sinks/elasticsearch/retry.rs b/src/sinks/elasticsearch/retry.rs
index 7cf2e6c51f14a..284ecb60cc2f4 100644
--- a/src/sinks/elasticsearch/retry.rs
+++ b/src/sinks/elasticsearch/retry.rs
@@ -1,13 +1,19 @@
-use http::StatusCode;
-use serde::Deserialize;
-
+use crate::sinks::{
+    elasticsearch::encoder::ProcessedEvent,
+    util::{metadata::RequestMetadataBuilder, request_builder::RequestBuilder},
+};
 use crate::{
+    event::Finalizable,
     http::HttpError,
     sinks::{
-        elasticsearch::service::ElasticsearchResponse,
-        util::retries::{RetryAction, RetryLogic},
+        elasticsearch::service::{ElasticsearchRequest, ElasticsearchResponse},
+        util::retries::{RetryAction, RetryLogic, RetryPartialFunction},
     },
 };
+use http::StatusCode;
+use serde::Deserialize;
+use vector_lib::json_size::JsonSize;
+use vector_lib::EstimatedJsonEncodedSizeOf;
 
 #[derive(Deserialize, Debug)]
 struct EsResultResponse {
@@ -86,6 +92,23 @@ pub struct ElasticsearchRetryLogic {
     pub retry_partial: bool,
 }
 
+// construct a closure by EsRetryClosure { closure: Box::new(|req: ElasticsearchRequest| { new_req }) }
+struct EsRetryClosure {
+    closure: Box<dyn Fn(ElasticsearchRequest) -> ElasticsearchRequest + Send + Sync>,
+}
+
+impl RetryPartialFunction for EsRetryClosure {
+    fn modify_request(&self, request: Box<dyn std::any::Any>) -> Box<dyn std::any::Any> {
+        match request.downcast::<ElasticsearchRequest>() {
+            Ok(request) => {
+                let new_request = (self.closure)(*request);
+                Box::new(new_request)
+            }
+            Err(request) => request,
+        }
+    }
+}
+
 impl RetryLogic for ElasticsearchRetryLogic {
     type Error = HttpError;
     type Response = ElasticsearchResponse;
@@ -124,21 +147,57 @@ impl RetryLogic for ElasticsearchRetryLogic {
                                 // We will retry if there exists at least one item that
                                 // failed with a retriable error.
                                 // Those are backpressure and server errors.
-                                if let Some((status, error)) =
+                                let status_codes: Vec<bool> = resp
+                                    .iter_status()
+                                    .map(|(status, _)| {
+                                        status == StatusCode::TOO_MANY_REQUESTS
+                                            || status.is_server_error()
+                                    })
+                                    .collect();
+                                if let Some((_status, _error)) =
                                     resp.iter_status().find(|(status, _)| {
                                         *status == StatusCode::TOO_MANY_REQUESTS
                                             || status.is_server_error()
                                     })
                                 {
-                                    let msg = if let Some(error) = error {
-                                        format!(
-                                            "partial error, status: {}, error type: {}, reason: {}",
-                                            status, error.err_type, error.reason
-                                        )
-                                    } else {
-                                        format!("partial error, status: {status}")
-                                    };
-                                    return RetryAction::Retry(msg.into());
+                                    return RetryAction::RetryPartial(Box::new(EsRetryClosure {
+                                        closure: Box::new(move |req: ElasticsearchRequest| {
+                                            let mut failed_events: Vec<ProcessedEvent> = req
+                                                .original_events
+                                                .clone()
+                                                .into_iter()
+                                                .zip(status_codes.iter())
+                                                .filter(|(_, &flag)| flag)
+                                                .map(|(item, _)| item)
+                                                .collect();
+                                            let finalizers = failed_events.take_finalizers();
+                                            let batch_size = failed_events.len();
+                                            let events_byte_size = failed_events
+                                                .iter()
+                                                .map(|x| x.log.estimated_json_encoded_size_of())
+                                                .fold(JsonSize::zero(), |a, b| a + b);
+                                            let encode_result = match req
+                                                .elasticsearch_request_builder
+                                                .encode_events(failed_events.clone())
+                                            {
+                                                Ok(s) => s,
+                                                Err(_) => return req,
+                                            };
+                                            let metadata_builder =
+                                                RequestMetadataBuilder::from_events(&failed_events);
+                                            let metadata = metadata_builder.build(&encode_result);
+                                            ElasticsearchRequest {
+                                                payload: encode_result.into_payload(),
+                                                finalizers,
+                                                batch_size,
+                                                events_byte_size,
+                                                metadata,
+                                                original_events: failed_events,
+                                                elasticsearch_request_builder: req
+                                                    .elasticsearch_request_builder,
+                                            }
+                                        }),
+                                    }));
                                 }
                             }
 
@@ -201,7 +260,7 @@ mod tests {
                 event_status: EventStatus::Errored,
                 events_byte_size: CountByteSize(1, JsonSize::new(1)).into(),
             }),
-            RetryAction::Retry(_)
+            RetryAction::RetryPartial(_)
         ));
     }
 
diff --git a/src/sinks/elasticsearch/service.rs b/src/sinks/elasticsearch/service.rs
index b7be9dcda0ead..61066783335e2 100644
--- a/src/sinks/elasticsearch/service.rs
+++ b/src/sinks/elasticsearch/service.rs
@@ -19,10 +19,13 @@ use super::{ElasticsearchCommon, ElasticsearchConfig};
 use crate::{
     event::{EventFinalizers, EventStatus, Finalizable},
     http::HttpClient,
-    sinks::util::{
-        auth::Auth,
-        http::{HttpBatchService, RequestConfig},
-        Compression, ElementCount,
+    sinks::{
+        elasticsearch::{encoder::ProcessedEvent, request_builder::ElasticsearchRequestBuilder},
+        util::{
+            auth::Auth,
+            http::{HttpBatchService, RequestConfig},
+            Compression, ElementCount,
+        },
     },
 };
 
@@ -33,6 +36,8 @@ pub struct ElasticsearchRequest {
     pub batch_size: usize,
     pub events_byte_size: JsonSize,
     pub metadata: RequestMetadata,
+    pub original_events: Vec<ProcessedEvent>, //store original_events for reconstruct request when retrying
+    pub elasticsearch_request_builder: ElasticsearchRequestBuilder,
 }
 
 impl ByteSizeOf for ElasticsearchRequest {
diff --git a/src/sinks/util/retries.rs b/src/sinks/util/retries.rs
index 4198231ff4d36..e596268290c5d 100644
--- a/src/sinks/util/retries.rs
+++ b/src/sinks/util/retries.rs
@@ -17,12 +17,18 @@ use crate::Error;
 pub enum RetryAction {
     /// Indicate that this request should be retried with a reason
     Retry(Cow<'static, str>),
+    /// Indicate that a portion of this request should be retried with a generic function
+    RetryPartial(Box<dyn RetryPartialFunction>),
     /// Indicate that this request should not be retried with a reason
     DontRetry(Cow<'static, str>),
     /// Indicate that this request should not be retried but the request was successful
     Successful,
 }
 
+pub trait RetryPartialFunction {
+    fn modify_request(&self, request: Box<dyn std::any::Any>) -> Box<dyn std::any::Any>;
+}
+
 pub trait RetryLogic: Clone + Send + Sync + 'static {
     type Error: std::error::Error + Send + Sync + 'static;
     type Response;
@@ -141,7 +147,7 @@ where
 
     // NOTE: in the error cases- `Error` and `EventsDropped` internal events are emitted by the
     // driver, so only need to log here.
-    fn retry(&mut self, _: &mut Req, result: &mut Result<Res, Error>) -> Option<Self::Future> {
+    fn retry(&mut self, req: &mut Req, result: &mut Result<Res, Error>) -> Option<Self::Future> {
         match result {
             Ok(response) => match self.logic.should_retry_response(response) {
                 RetryAction::Retry(reason) => {
@@ -157,6 +163,34 @@ where
                     Some(self.build_retry())
                 }
 
+                RetryAction::RetryPartial(rebuild_request_fn) => {
+                    if self.remaining_attempts == 0 {
+                        error!(
+                            message =
+                                "OK/retry response but retries exhausted; dropping the request.",
+                            internal_log_rate_limit = true,
+                        );
+                        return None;
+                    }
+                    let output = rebuild_request_fn.modify_request(Box::new(req.clone()));
+                    if let Ok(output) = output.downcast::<Req>() {
+                        *req = *output;
+                        error!(
+                            message = "OK/retrying partial after response.",
+                            internal_log_rate_limit = true
+                        );
+                        Some(self.build_retry())
+                    } else {
+                        // unlikely to go here.
+                        error!(
+                            message =
+                                "OK/retry response but invalid request; dropping the request.",
+                            internal_log_rate_limit = true,
+                        );
+                        None
+                    }
+                }
+
                 RetryAction::DontRetry(reason) => {
                     error!(message = "Not retriable; dropping the request.", reason = ?reason, internal_log_rate_limit = true);
                     None
@@ -220,7 +254,7 @@ impl Future for RetryPolicyFuture {
 
 impl RetryAction {
     pub const fn is_retryable(&self) -> bool {
-        matches!(self, RetryAction::Retry(_))
+        matches!(self, RetryAction::Retry(_) | RetryAction::RetryPartial(_))
     }
 
     pub const fn is_not_retryable(&self) -> bool {

From ab519c5bb17177b9d4b7f44b283727cfad2ae7f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ensar=20Saraj=C4=8Di=C4=87?= <dev@ensarsarajcic.com>
Date: Thu, 7 Aug 2025 15:30:58 +0200
Subject: [PATCH 278/305] feat(cli): watch enrichment tables with
 `--watch-config` CLI option (#23442)

* feat(cli): add `--watch-enrichment-tables` CLI option

Adds an additional option to monitor enrichment tables and reload if needed.

Closes: #11817

* Remove the `--watch-enrichment-tables` CLI flag and cover it in `--watch-config`

* Add changelog entry

* Prevent sending both `ReloadTables` and `ReloadComponents` signals

* Fix formatting

* Update src/config/mod.rs

Co-authored-by: Pavlos Rontidis <pavlos.rontidis@gmail.com>

* Update src/signal.rs

Co-authored-by: Pavlos Rontidis <pavlos.rontidis@gmail.com>

* Apply comments suggestions

---------

Co-authored-by: Pavlos Rontidis <pavlos.rontidis@gmail.com>
---
 ..._watch_enrichment_table_changes.feature.md |  3 ++
 src/app.rs                                    | 35 ++++++++++++---
 src/config/mod.rs                             | 20 +++++++--
 src/config/watcher.rs                         | 40 +++++++++++------
 src/enrichment_tables/geoip.rs                | 15 ++++---
 src/enrichment_tables/mmdb.rs                 | 11 ++---
 src/enrichment_tables/mod.rs                  | 17 ++++++++
 src/signal.rs                                 |  3 ++
 src/topology/builder.rs                       | 43 +++++++++++++++++++
 src/topology/running.rs                       |  7 ++-
 10 files changed, 161 insertions(+), 33 deletions(-)
 create mode 100644 changelog.d/23442_watch_enrichment_table_changes.feature.md

diff --git a/changelog.d/23442_watch_enrichment_table_changes.feature.md b/changelog.d/23442_watch_enrichment_table_changes.feature.md
new file mode 100644
index 0000000000000..4c30bccafc143
--- /dev/null
+++ b/changelog.d/23442_watch_enrichment_table_changes.feature.md
@@ -0,0 +1,3 @@
+The `--watch-config` flag now also watches for changes in enrichment table files.
+
+authors: esensar Quad9DNS
diff --git a/src/app.rs b/src/app.rs
index 2095ce57fbbb6..e9b0cc8dff7df 100644
--- a/src/app.rs
+++ b/src/app.rs
@@ -13,7 +13,6 @@ use tokio::runtime::{self, Runtime};
 use tokio::sync::{broadcast::error::RecvError, MutexGuard};
 use tokio_stream::wrappers::UnboundedReceiverStream;
 
-use crate::extra_context::ExtraContext;
 #[cfg(feature = "api")]
 use crate::{api, internal_events::ApiStarted};
 use crate::{
@@ -28,6 +27,7 @@ use crate::{
     },
     trace,
 };
+use crate::{config::ComponentType, extra_context::ExtraContext};
 
 #[cfg(unix)]
 use std::os::unix::process::ExitStatusExt;
@@ -379,6 +379,15 @@ async fn handle_signal(
 
             reload_config_from_result(topology_controller, new_config).await
         }
+        Ok(SignalTo::ReloadEnrichmentTables) => {
+            let topology_controller = topology_controller.lock().await;
+
+            topology_controller
+                .topology
+                .reload_enrichment_tables()
+                .await;
+            None
+        }
         Err(RecvError::Lagged(amt)) => {
             warn!("Overflow, dropped {} signals.", amt);
             None
@@ -535,15 +544,31 @@ pub async fn load_configs(
     if let Some(watcher_conf) = watcher_conf {
         for (name, transform) in config.transforms() {
             let files = transform.inner.files_to_watch();
-            let component_config =
-                ComponentConfig::new(files.into_iter().cloned().collect(), name.clone());
+            let component_config = ComponentConfig::new(
+                files.into_iter().cloned().collect(),
+                name.clone(),
+                ComponentType::Transform,
+            );
             watched_component_paths.push(component_config);
         }
 
         for (name, sink) in config.sinks() {
             let files = sink.inner.files_to_watch();
-            let component_config =
-                ComponentConfig::new(files.into_iter().cloned().collect(), name.clone());
+            let component_config = ComponentConfig::new(
+                files.into_iter().cloned().collect(),
+                name.clone(),
+                ComponentType::Sink,
+            );
+            watched_component_paths.push(component_config);
+        }
+
+        for (name, table) in config.enrichment_tables() {
+            let files = table.inner.files_to_watch();
+            let component_config = ComponentConfig::new(
+                files.into_iter().cloned().collect(),
+                name.clone(),
+                ComponentType::EnrichmentTable,
+            );
             watched_component_paths.push(component_config);
         }
 
diff --git a/src/config/mod.rs b/src/config/mod.rs
index 4f17de80f59b6..a718df2c4300c 100644
--- a/src/config/mod.rs
+++ b/src/config/mod.rs
@@ -77,14 +77,27 @@ pub use vector_lib::{
     id::Inputs,
 };
 
+#[derive(Debug, Clone, Ord, PartialOrd, Eq, PartialEq)]
+// // This is not a comprehensive set; variants are added as needed.
+pub enum ComponentType {
+    Transform,
+    Sink,
+    EnrichmentTable,
+}
+
 #[derive(Debug, Clone, Ord, PartialOrd, Eq, PartialEq)]
 pub struct ComponentConfig {
     pub config_paths: Vec<PathBuf>,
     pub component_key: ComponentKey,
+    pub component_type: ComponentType,
 }
 
 impl ComponentConfig {
-    pub fn new(config_paths: Vec<PathBuf>, component_key: ComponentKey) -> Self {
+    pub fn new(
+        config_paths: Vec<PathBuf>,
+        component_key: ComponentKey,
+        component_type: ComponentType,
+    ) -> Self {
         let canonicalized_paths = config_paths
             .into_iter()
             .filter_map(|p| fs::canonicalize(p).ok())
@@ -93,12 +106,13 @@ impl ComponentConfig {
         Self {
             config_paths: canonicalized_paths,
             component_key,
+            component_type,
         }
     }
 
-    pub fn contains(&self, config_paths: &[PathBuf]) -> Option<ComponentKey> {
+    pub fn contains(&self, config_paths: &[PathBuf]) -> Option<(ComponentKey, ComponentType)> {
         if config_paths.iter().any(|p| self.config_paths.contains(p)) {
-            return Some(self.component_key.clone());
+            return Some((self.component_key.clone(), self.component_type.clone()));
         }
         None
     }
diff --git a/src/config/watcher.rs b/src/config/watcher.rs
index 245a8a12c7448..8e643ba557ceb 100644
--- a/src/config/watcher.rs
+++ b/src/config/watcher.rs
@@ -1,5 +1,5 @@
-use crate::config::ComponentConfig;
-use std::collections::HashSet;
+use crate::config::{ComponentConfig, ComponentType};
+use std::collections::HashMap;
 use std::{
     path::{Path, PathBuf},
     time::Duration,
@@ -61,7 +61,7 @@ impl Watcher {
     }
 }
 
-/// Sends a ReloadFromDisk on config_path changes.
+/// Sends a ReloadFromDisk or ReloadEnrichmentTables on config_path changes.
 /// Accumulates file changes until no change for given duration has occurred.
 /// Has best effort guarantee of detecting all file changes from the end of
 /// this function until the main thread stops.
@@ -103,7 +103,7 @@ pub fn spawn_thread<'a>(
 
                     debug!(message = "Consumed file change events for delay.", delay = ?delay);
 
-                    let component_keys: HashSet<_> = component_configs
+                    let changed_components: HashMap<_, _> = component_configs
                         .clone()
                         .into_iter()
                         .flat_map(|p| p.contains(&event.paths))
@@ -119,11 +119,24 @@ pub fn spawn_thread<'a>(
                     debug!(message = "Reloaded paths.");
 
                     info!("Configuration file changed.");
-                    if !component_keys.is_empty() {
-                        info!("Component {:?} configuration changed.", component_keys);
-                        _ = signal_tx.send(crate::signal::SignalTo::ReloadComponents(component_keys)).map_err(|error| {
-                            error!(message = "Unable to reload component configuration. Restart Vector to reload it.", cause = %error)
-                        });
+                    if !changed_components.is_empty() {
+                        info!(
+                            "Component {:?} configuration changed.",
+                            changed_components.keys()
+                        );
+                        if changed_components
+                            .iter()
+                            .all(|(_, t)| *t == ComponentType::EnrichmentTable)
+                        {
+                            info!("Only enrichment tables have changed.",);
+                            _ = signal_tx.send(crate::signal::SignalTo::ReloadEnrichmentTables).map_err(|error| {
+                                error!(message = "Unable to reload enrichment tables.", cause = %error)
+                            });
+                        } else {
+                            _ = signal_tx.send(crate::signal::SignalTo::ReloadComponents(changed_components.into_keys().collect())).map_err(|error| {
+                                error!(message = "Unable to reload component configuration. Restart Vector to reload it.", cause = %error)
+                            });
+                        }
                     } else {
                         _ = signal_tx.send(crate::signal::SignalTo::ReloadFromDisk)
                             .map_err(|error| {
@@ -187,7 +200,7 @@ mod tests {
         signal::SignalRx,
         test_util::{temp_dir, temp_file, trace_init},
     };
-    use std::{fs::File, io::Write, time::Duration};
+    use std::{collections::HashSet, fs::File, io::Write, time::Duration};
     use tokio::sync::broadcast;
 
     async fn test_signal(
@@ -221,8 +234,11 @@ mod tests {
             .iter()
             .map(|file| File::create(file).unwrap())
             .collect();
-        let component_config =
-            ComponentConfig::new(component_file_path.clone(), http_component.clone());
+        let component_config = ComponentConfig::new(
+            component_file_path.clone(),
+            http_component.clone(),
+            ComponentType::Sink,
+        );
 
         let (signal_tx, signal_rx) = broadcast::channel(128);
         spawn_thread(
diff --git a/src/enrichment_tables/geoip.rs b/src/enrichment_tables/geoip.rs
index fd3dbcf899ab3..6e09105a8c2c3 100644
--- a/src/enrichment_tables/geoip.rs
+++ b/src/enrichment_tables/geoip.rs
@@ -4,7 +4,7 @@
 //!
 //! [maxmind]: https://dev.maxmind.com/geoip/geoip2/downloadable
 //! [geolite]: https://dev.maxmind.com/geoip/geoip2/geolite2/#Download_Access
-use std::{collections::BTreeMap, fs, net::IpAddr, sync::Arc, time::SystemTime};
+use std::{collections::BTreeMap, fs, net::IpAddr, path::PathBuf, sync::Arc, time::SystemTime};
 
 use maxminddb::{
     geoip2::{AnonymousIp, City, ConnectionType, Isp},
@@ -56,7 +56,7 @@ pub struct GeoipConfig {
     ///
     /// [geoip2]: https://dev.maxmind.com/geoip/geoip2/downloadable
     /// [geolite2]: https://dev.maxmind.com/geoip/geoip2/geolite2/#Download_Access
-    pub path: String,
+    pub path: PathBuf,
 
     /// The locale to use when querying the database.
     ///
@@ -87,7 +87,7 @@ fn default_locale() -> String {
 impl GenerateConfig for GeoipConfig {
     fn generate_config() -> toml::Value {
         toml::Value::try_from(Self {
-            path: "/path/to/GeoLite2-City.mmdb".to_string(),
+            path: "/path/to/GeoLite2-City.mmdb".into(),
             locale: default_locale(),
         })
         .unwrap()
@@ -115,7 +115,7 @@ pub struct Geoip {
 impl Geoip {
     /// Creates a new GeoIP struct from the provided config.
     pub fn new(config: GeoipConfig) -> crate::Result<Self> {
-        let dbreader = Arc::new(Reader::open_readfile(config.path.clone())?);
+        let dbreader = Arc::new(Reader::open_readfile(&config.path)?);
         let dbkind =
             DatabaseKind::try_from(dbreader.metadata.database_type.as_str()).map_err(|_| {
                 format!(
@@ -335,7 +335,8 @@ impl std::fmt::Debug for Geoip {
         write!(
             f,
             "Geoip {} database {})",
-            self.config.locale, self.config.path
+            self.config.locale,
+            self.config.path.display()
         )
     }
 }
@@ -470,7 +471,7 @@ mod tests {
     #[test]
     fn custom_mmdb_type_error() {
         let result = Geoip::new(GeoipConfig {
-            path: "tests/data/custom-type.mmdb".to_string(),
+            path: "tests/data/custom-type.mmdb".into(),
             locale: default_locale(),
         });
 
@@ -504,7 +505,7 @@ mod tests {
 
     fn find_select(ip: &str, database: &str, select: Option<&[String]>) -> Option<ObjectMap> {
         Geoip::new(GeoipConfig {
-            path: database.to_string(),
+            path: database.into(),
             locale: default_locale(),
         })
         .unwrap()
diff --git a/src/enrichment_tables/mmdb.rs b/src/enrichment_tables/mmdb.rs
index 0c47c1d52d4b4..91b8d22a99d8c 100644
--- a/src/enrichment_tables/mmdb.rs
+++ b/src/enrichment_tables/mmdb.rs
@@ -2,6 +2,7 @@
 //! Enrichment data is loaded from any database in [MaxMind][maxmind] format.
 //!
 //! [maxmind]: https://maxmind.com
+use std::path::PathBuf;
 use std::{fs, net::IpAddr, sync::Arc, time::SystemTime};
 
 use maxminddb::Reader;
@@ -18,13 +19,13 @@ pub struct MmdbConfig {
     /// Path to the [MaxMind][maxmind] database
     ///
     /// [maxmind]: https://maxmind.com
-    pub path: String,
+    pub path: PathBuf,
 }
 
 impl GenerateConfig for MmdbConfig {
     fn generate_config() -> toml::Value {
         toml::Value::try_from(Self {
-            path: "/path/to/GeoLite2-City.mmdb".to_string(),
+            path: "/path/to/GeoLite2-City.mmdb".into(),
         })
         .unwrap()
     }
@@ -50,7 +51,7 @@ pub struct Mmdb {
 impl Mmdb {
     /// Creates a new Mmdb struct from the provided config.
     pub fn new(config: MmdbConfig) -> crate::Result<Self> {
-        let dbreader = Arc::new(Reader::open_readfile(config.path.clone())?);
+        let dbreader = Arc::new(Reader::open_readfile(&config.path)?);
 
         // Check if we can read database with dummy Ip.
         let ip = IpAddr::V4(std::net::Ipv4Addr::UNSPECIFIED);
@@ -166,7 +167,7 @@ impl Table for Mmdb {
 
 impl std::fmt::Debug for Mmdb {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, "Maxmind database {})", self.config.path)
+        write!(f, "Maxmind database {})", self.config.path.display())
     }
 }
 
@@ -261,7 +262,7 @@ mod tests {
 
     fn find_select(ip: &str, database: &str, select: Option<&[String]>) -> Option<ObjectMap> {
         Mmdb::new(MmdbConfig {
-            path: database.to_string(),
+            path: database.into(),
         })
         .unwrap()
         .find_table_rows(
diff --git a/src/enrichment_tables/mod.rs b/src/enrichment_tables/mod.rs
index d067262a1ea74..f814e175f576e 100644
--- a/src/enrichment_tables/mod.rs
+++ b/src/enrichment_tables/mod.rs
@@ -1,4 +1,6 @@
 //! Functionality to handle enrichment tables.
+use std::path::PathBuf;
+
 use enum_dispatch::enum_dispatch;
 use vector_lib::configurable::configurable_component;
 pub use vector_lib::enrichment::{Condition, IndexHandle, Table};
@@ -77,3 +79,18 @@ impl GenerateConfig for EnrichmentTables {
         .unwrap()
     }
 }
+
+impl EnrichmentTables {
+    /// Gets the files to watch to trigger reload
+    pub fn files_to_watch(&self) -> Vec<&PathBuf> {
+        match self {
+            EnrichmentTables::File(file_config) => vec![&file_config.file.path],
+            #[cfg(feature = "enrichment-tables-memory")]
+            EnrichmentTables::Memory(_) => vec![],
+            #[cfg(feature = "enrichment-tables-geoip")]
+            EnrichmentTables::Geoip(geoip_config) => vec![&geoip_config.path],
+            #[cfg(feature = "enrichment-tables-mmdb")]
+            EnrichmentTables::Mmdb(mmdb_config) => vec![&mmdb_config.path],
+        }
+    }
+}
diff --git a/src/signal.rs b/src/signal.rs
index ef095ad55be6b..af0d01d1c3d60 100644
--- a/src/signal.rs
+++ b/src/signal.rs
@@ -21,6 +21,8 @@ pub enum SignalTo {
     ReloadFromConfigBuilder(ConfigBuilder),
     /// Signal to reload config from the filesystem.
     ReloadFromDisk,
+    /// Signal to reload all enrichment tables.
+    ReloadEnrichmentTables,
     /// Signal to shutdown process.
     Shutdown(Option<ShutdownError>),
     /// Shutdown process immediately.
@@ -36,6 +38,7 @@ impl PartialEq for SignalTo {
             // TODO: This will require a lot of plumbing but ultimately we can derive equality for config builders.
             (ReloadFromConfigBuilder(_), ReloadFromConfigBuilder(_)) => true,
             (ReloadFromDisk, ReloadFromDisk) => true,
+            (ReloadEnrichmentTables, ReloadEnrichmentTables) => true,
             (Shutdown(a), Shutdown(b)) => a == b,
             (Quit, Quit) => true,
             _ => false,
diff --git a/src/topology/builder.rs b/src/topology/builder.rs
index e06b617dbd9d4..454b901399ee1 100644
--- a/src/topology/builder.rs
+++ b/src/topology/builder.rs
@@ -712,6 +712,49 @@ impl<'a> Builder<'a> {
     }
 }
 
+pub async fn reload_enrichment_tables(config: &Config) {
+    let mut enrichment_tables = HashMap::new();
+    // Build enrichment tables
+    'tables: for (name, table_outer) in config.enrichment_tables.iter() {
+        let table_name = name.to_string();
+        if ENRICHMENT_TABLES.needs_reload(&table_name) {
+            let indexes = Some(ENRICHMENT_TABLES.index_fields(&table_name));
+
+            let mut table = match table_outer.inner.build(&config.global).await {
+                Ok(table) => table,
+                Err(error) => {
+                    error!("Enrichment table \"{name}\" reload failed: {error}");
+                    continue;
+                }
+            };
+
+            if let Some(indexes) = indexes {
+                for (case, index) in indexes {
+                    match table
+                        .add_index(case, &index.iter().map(|s| s.as_ref()).collect::<Vec<_>>())
+                    {
+                        Ok(_) => (),
+                        Err(error) => {
+                            // If there is an error adding an index we do not want to use the reloaded
+                            // data, the previously loaded data will still need to be used.
+                            // Just report the error and continue.
+                            error!(message = "Unable to add index to reloaded enrichment table.",
+                                    table = ?name.to_string(),
+                                    %error);
+                            continue 'tables;
+                        }
+                    }
+                }
+            }
+
+            enrichment_tables.insert(table_name, table);
+        }
+    }
+
+    ENRICHMENT_TABLES.load(enrichment_tables);
+    ENRICHMENT_TABLES.finish_load();
+}
+
 pub struct TopologyPieces {
     pub(super) inputs: HashMap<ComponentKey, (BufferSender<EventArray>, Inputs<OutputId>)>,
     pub(crate) outputs: HashMap<ComponentKey, HashMap<Option<String>, fanout::ControlChannel>>,
diff --git a/src/topology/running.rs b/src/topology/running.rs
index 5c763ea6e7eba..419c8880673d7 100644
--- a/src/topology/running.rs
+++ b/src/topology/running.rs
@@ -7,7 +7,7 @@ use std::{
 };
 
 use super::{
-    builder::{self, TopologyPieces},
+    builder::{self, reload_enrichment_tables, TopologyPieces},
     fanout::{ControlChannel, ControlMessage},
     handle_errors, retain, take_healthchecks,
     task::{Task, TaskOutput},
@@ -335,6 +335,11 @@ impl RunningTopology {
         Err(())
     }
 
+    /// Attempts to reload enrichment tables.
+    pub(crate) async fn reload_enrichment_tables(&self) {
+        reload_enrichment_tables(&self.config).await;
+    }
+
     pub(crate) async fn run_healthchecks(
         &mut self,
         diff: &ConfigDiff,

From 317f151ea649199ec0aa1c78f9fabc90191d3d30 Mon Sep 17 00:00:00 2001
From: Thomas <thomas.schneider@datadoghq.com>
Date: Thu, 7 Aug 2025 10:37:13 -0400
Subject: [PATCH 279/305] fix(ci): fail when jobs are cancelled (#23545)

This standardizes the last step in many workflows that were only checking for failure and missed the
check for cancelled
---
 .github/workflows/ci-integration-review.yml | 11 ++++++-----
 .github/workflows/e2e.yml                   | 11 +++++------
 .github/workflows/integration.yml           |  9 +++------
 .github/workflows/k8s_e2e.yml               | 11 ++++++-----
 .github/workflows/master_merge_queue.yml    | 10 ++++------
 .github/workflows/regression.yml            | 10 ++++------
 6 files changed, 28 insertions(+), 34 deletions(-)

diff --git a/.github/workflows/ci-integration-review.yml b/.github/workflows/ci-integration-review.yml
index 4f59527acf6ab..5c47a53afe430 100644
--- a/.github/workflows/ci-integration-review.yml
+++ b/.github/workflows/ci-integration-review.yml
@@ -161,7 +161,7 @@ jobs:
       - e2e-tests
     if: always() && (startsWith(github.event.review.body, '/ci-run-integration') || contains(github.event.review.body, '/ci-run-all'))
     env:
-      FAILED: ${{ contains(needs.*.result, 'failure') }}
+      FAILED: ${{ contains(needs.*.result, 'failure') || contains(needs.*.result, 'cancelled') }}
     steps:
       - name: Generate authentication token
         id: generate_token
@@ -186,10 +186,11 @@ jobs:
           token: ${{ secrets.GITHUB_TOKEN }}
           status: 'success'
 
-      - run: |
-          echo "failed=${{ env.FAILED }}"
-          if [[ "$FAILED" == "true" ]] ; then
+      - name: Check all jobs status
+        run: |
+          if [[ "${{ env.FAILED }}" == "true" ]]; then
+            echo "One or more jobs failed or were cancelled"
             exit 1
           else
-            exit 0
+            echo "All jobs completed successfully"
           fi
diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
index c0d2eb6516ac6..edd6353e04c9c 100644
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -117,13 +117,12 @@ jobs:
     timeout-minutes: 5
     if: always()
     needs: e2e-tests
-    env:
-      FAILED: ${{ contains(needs.*.result, 'failure') }}
     steps:
-      - run: |
-          echo "failed=${{ env.FAILED }}"
-          if [[ "$FAILED" == "true" ]] ; then
+      - name: Check all jobs status
+        run: |
+          if [[ "${{ contains(needs.*.result, 'failure') || contains(needs.*.result, 'cancelled') }}" == "true" ]]; then
+            echo "One or more jobs failed or were cancelled"
             exit 1
           else
-            exit 0
+            echo "All jobs completed successfully"
           fi
diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
index 6be5aab2e02d0..4c4692f3079fd 100644
--- a/.github/workflows/integration.yml
+++ b/.github/workflows/integration.yml
@@ -121,17 +121,14 @@ jobs:
   integration-test-suite:
     name: Integration Test Suite
     runs-on: ubuntu-24.04
-    timeout-minutes: 5
     if: always()
     needs:
       - integration-tests
-    env:
-      FAILED: ${{ contains(needs.*.result, 'failure') }}
     steps:
       - run: |
-          echo "failed=${{ env.FAILED }}"
-          if [[ "$FAILED" == "true" ]] ; then
+          if [[ "${{ contains(needs.*.result, 'failure') || contains(needs.*.result, 'cancelled') }}" == "true" ]]; then
+            echo "One or more jobs failed or were cancelled"
             exit 1
           else
-            exit 0
+            echo "All jobs completed successfully"
           fi
diff --git a/.github/workflows/k8s_e2e.yml b/.github/workflows/k8s_e2e.yml
index 95d82f2cec366..602308378ca72 100644
--- a/.github/workflows/k8s_e2e.yml
+++ b/.github/workflows/k8s_e2e.yml
@@ -245,7 +245,7 @@ jobs:
       - test-e2e-kubernetes
     if: always()
     env:
-      FAILED: ${{ contains(needs.*.result, 'failure') }}
+      FAILED: ${{ contains(needs.*.result, 'failure') || contains(needs.*.result, 'cancelled') }}
     steps:
       - name: (PR review) Get PR branch
         if: github.event_name == 'pull_request_review' && env.FAILED != 'true'
@@ -260,10 +260,11 @@ jobs:
           token: ${{ secrets.GITHUB_TOKEN }}
           status: 'success'
 
-      - run: |
-          echo "failed=${{ env.FAILED }}"
-          if [[ "$FAILED" == "true" ]] ; then
+      - name: Check all jobs status
+        run: |
+          if [[ "${{ env.FAILED }}" == "true" ]]; then
+            echo "One or more jobs failed or were cancelled"
             exit 1
           else
-            exit 0
+            echo "All jobs completed successfully"
           fi
diff --git a/.github/workflows/master_merge_queue.yml b/.github/workflows/master_merge_queue.yml
index 1218d1428a7dd..b6cf9486e1c38 100644
--- a/.github/workflows/master_merge_queue.yml
+++ b/.github/workflows/master_merge_queue.yml
@@ -114,14 +114,12 @@ jobs:
       - unit-mac
       - unit-windows
       - install-sh
-    env:
-      FAILED: ${{ contains(needs.*.result, 'failure') }}
     steps:
-      - name: exit
+      - name: Check all jobs status
         run: |
-          echo "failed=${{ env.FAILED }}"
-          if [[ "$FAILED" == "true" ]] ; then
+          if [[ "${{ contains(needs.*.result, 'failure') || contains(needs.*.result, 'cancelled') }}" == "true" ]]; then
+            echo "One or more jobs failed or were cancelled"
             exit 1
           else
-            exit 0
+            echo "All jobs completed successfully"
           fi
diff --git a/.github/workflows/regression.yml b/.github/workflows/regression.yml
index 9a4efea8c62a3..680ddddafa318 100644
--- a/.github/workflows/regression.yml
+++ b/.github/workflows/regression.yml
@@ -544,8 +544,6 @@ jobs:
       - submit-job
       - detect-regression
       - analyze-experiment
-    env:
-      FAILED: ${{ contains(needs.*.result, 'failure') }}
     steps:
       - name: Download capture-artifacts
         continue-on-error: true
@@ -563,11 +561,11 @@ jobs:
             echo "Did not find ${REPORT_MD} file."
           fi
 
-      - name: exit
+      - name: Check all jobs status
         run: |
-          echo "failed=${{ env.FAILED }}"
-          if [[ "$FAILED" == "true" ]] ; then
+          if [[ "${{ contains(needs.*.result, 'failure') || contains(needs.*.result, 'cancelled') }}" == "true" ]]; then
+            echo "One or more jobs failed or were cancelled"
             exit 1
           else
-            exit 0
+            echo "All jobs completed successfully"
           fi

From 7cf8457a0a6eafaef5c41a46a4da0a8728a6371b Mon Sep 17 00:00:00 2001
From: Pavlos Rontidis <pavlos.rontidis@gmail.com>
Date: Thu, 7 Aug 2025 11:04:44 -0400
Subject: [PATCH 280/305] docs(internal): fix typo (#23549)

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 334ced93f3e95..bf4db29273e00 100644
--- a/README.md
+++ b/README.md
@@ -32,7 +32,7 @@ faster than every alternative in the space.
 To get started, follow our [**quickstart guide**][docs.quickstart] or [**install
 Vector**][docs.installation].
 
-Vector is maintained by the Datadog's [Community Open Source Engineering team](https://opensource.datadoghq.com/about/#the-community-open-source-engineering-team).
+Vector is maintained by Datadog's [Community Open Source Engineering team](https://opensource.datadoghq.com/about/#the-community-open-source-engineering-team).
 
 ### Principles
 

From f9d2800d873d2e5a15b1920ad49c7e357702a890 Mon Sep 17 00:00:00 2001
From: Pavlos Rontidis <pavlos.rontidis@gmail.com>
Date: Thu, 7 Aug 2025 11:31:19 -0400
Subject: [PATCH 281/305] chore(codecs protobuf): allow all telemetry types
 (#23550)

* chore(codecs protobuf): allow all telemetry types

* changelog

* fix
---
 .github/workflows/semantic.yml             | 1 +
 changelog.d/proto_codecs.enhancement.md    | 3 +++
 lib/codecs/src/decoding/format/protobuf.rs | 2 +-
 lib/codecs/src/encoding/format/protobuf.rs | 2 +-
 4 files changed, 6 insertions(+), 2 deletions(-)
 create mode 100644 changelog.d/proto_codecs.enhancement.md

diff --git a/.github/workflows/semantic.yml b/.github/workflows/semantic.yml
index f1833a830bc26..9a8644b375e60 100644
--- a/.github/workflows/semantic.yml
+++ b/.github/workflows/semantic.yml
@@ -40,6 +40,7 @@ jobs:
             ci
             cli
             codecs
+            codecs protobuf
             compression
             config
             core
diff --git a/changelog.d/proto_codecs.enhancement.md b/changelog.d/proto_codecs.enhancement.md
new file mode 100644
index 0000000000000..4c6f3909949a2
--- /dev/null
+++ b/changelog.d/proto_codecs.enhancement.md
@@ -0,0 +1,3 @@
+The `protobuf` codecs now support all telemetry data types (logs, metrics, traces).
+
+authors: pront
diff --git a/lib/codecs/src/decoding/format/protobuf.rs b/lib/codecs/src/decoding/format/protobuf.rs
index 26330028d26aa..cacd7912b9cbc 100644
--- a/lib/codecs/src/decoding/format/protobuf.rs
+++ b/lib/codecs/src/decoding/format/protobuf.rs
@@ -33,7 +33,7 @@ impl ProtobufDeserializerConfig {
 
     /// Return the type of event build by this deserializer.
     pub fn output_type(&self) -> DataType {
-        DataType::Log
+        DataType::all_bits()
     }
 
     /// The schema produced by the deserializer.
diff --git a/lib/codecs/src/encoding/format/protobuf.rs b/lib/codecs/src/encoding/format/protobuf.rs
index c014a529455e1..9d65ede9f7f60 100644
--- a/lib/codecs/src/encoding/format/protobuf.rs
+++ b/lib/codecs/src/encoding/format/protobuf.rs
@@ -30,7 +30,7 @@ impl ProtobufSerializerConfig {
 
     /// The data type of events that are accepted by `ProtobufSerializer`.
     pub fn input_type(&self) -> DataType {
-        DataType::Log
+        DataType::all_bits()
     }
 
     /// The schema required by the serializer.

From 92b19362265a6140d9f816e556171be80eeed2d5 Mon Sep 17 00:00:00 2001
From: Pavlos Rontidis <pavlos.rontidis@gmail.com>
Date: Thu, 7 Aug 2025 12:51:05 -0400
Subject: [PATCH 282/305] chore(deps): cargo update -p vrl (#23553)

* chore(deps): cargo update -p vrl

* chore(dev): cargo vdev build licenses
---
 Cargo.lock           | 38 +++++++++++++++++++++++++-------------
 LICENSE-3rdparty.csv |  1 +
 2 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 1534eb2c9f10c..0a3465e045218 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3710,9 +3710,21 @@ checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7"
 
 [[package]]
 name = "fancy-regex"
-version = "0.14.0"
+version = "0.15.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d6215aee357f8c7c989ebb4b8466ca4d7dc93b3957039f2fc3ea2ade8ea5f279"
+dependencies = [
+ "bit-set",
+ "derivative",
+ "regex-automata 0.4.8",
+ "regex-syntax 0.8.5",
+]
+
+[[package]]
+name = "fancy-regex"
+version = "0.16.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e24cb5a94bcae1e5408b0effca5cd7172ea3c5755049c5f3af4cd283a165298"
+checksum = "bf04c5ec15464ace8355a7b440a33aece288993475556d461154d7a62ad9947c"
 dependencies = [
  "bit-set",
  "regex-automata 0.4.8",
@@ -4817,7 +4829,7 @@ dependencies = [
  "httpdate",
  "itoa",
  "pin-project-lite",
- "socket2 0.5.10",
+ "socket2 0.4.10",
  "tokio",
  "tower-service",
  "tracing 0.1.41",
@@ -5541,15 +5553,15 @@ dependencies = [
 
 [[package]]
 name = "jsonschema"
-version = "0.30.0"
+version = "0.32.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1b46a0365a611fbf1d2143104dcf910aada96fafd295bab16c60b802bf6fa1d"
+checksum = "24690c68dfcdde5980d676b0f1820981841016b1f29eecb4c42ad48ab4118681"
 dependencies = [
  "ahash 0.8.11",
  "base64 0.22.1",
  "bytecount",
  "email_address",
- "fancy-regex",
+ "fancy-regex 0.16.1",
  "fraction",
  "idna 1.0.3",
  "itoa",
@@ -7994,7 +8006,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "be769465445e8c1474e9c5dac2018218498557af32d9ed057325ec9a41ae81bf"
 dependencies = [
  "heck 0.5.0",
- "itertools 0.14.0",
+ "itertools 0.10.5",
  "log",
  "multimap",
  "once_cell",
@@ -8040,7 +8052,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8a56d757972c98b346a9b766e3f02746cde6dd1cd1d1d563472929fdd74bec4d"
 dependencies = [
  "anyhow",
- "itertools 0.14.0",
+ "itertools 0.10.5",
  "proc-macro2 1.0.95",
  "quote 1.0.40",
  "syn 2.0.104",
@@ -8671,9 +8683,9 @@ dependencies = [
 
 [[package]]
 name = "referencing"
-version = "0.30.0"
+version = "0.32.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8eff4fa778b5c2a57e85c5f2fe3a709c52f0e60d23146e2151cbef5893f420e"
+checksum = "7a3d769362109497b240e66462606bc28af68116436c8669bac17069533b908e"
 dependencies = [
  "ahash 0.8.11",
  "fluent-uri 0.3.2",
@@ -12394,8 +12406,8 @@ checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d"
 
 [[package]]
 name = "vrl"
-version = "0.25.0"
-source = "git+https://github.com/vectordotdev/vrl.git?branch=main#834e80187f508a48b06b4ea7cf0acf7dae81ebc9"
+version = "0.26.0"
+source = "git+https://github.com/vectordotdev/vrl.git?branch=main#40d3f6dfa395ef5dd306432e6cfd03af9966da00"
 dependencies = [
  "aes",
  "aes-siv",
@@ -12428,7 +12440,7 @@ dependencies = [
  "dyn-clone",
  "encoding_rs",
  "exitcode",
- "fancy-regex",
+ "fancy-regex 0.15.0",
  "flate2",
  "grok",
  "hex",
diff --git a/LICENSE-3rdparty.csv b/LICENSE-3rdparty.csv
index 577690bff65aa..f4c960eb06064 100644
--- a/LICENSE-3rdparty.csv
+++ b/LICENSE-3rdparty.csv
@@ -231,6 +231,7 @@ exitcode,https://github.com/benwilber/exitcode,Apache-2.0,Ben Wilber <benwilber@
 fakedata_generator,https://github.com/kevingimbel/fakedata_generator,MIT,Kevin Gimbel <hallo@kevingimbel.com>
 fallible-iterator,https://github.com/sfackler/rust-fallible-iterator,MIT OR Apache-2.0,Steven Fackler <sfackler@gmail.com>
 fancy-regex,https://github.com/fancy-regex/fancy-regex,MIT,"Raph Levien <raph@google.com>, Robin Stocker <robin@nibor.org>"
+fancy-regex,https://github.com/fancy-regex/fancy-regex,MIT,"Raph Levien <raph@google.com>, Robin Stocker <robin@nibor.org>, Keith Hall <keith.hall@available.systems>"
 fastrand,https://github.com/smol-rs/fastrand,Apache-2.0 OR MIT,Stjepan Glavina <stjepang@gmail.com>
 ff,https://github.com/zkcrypto/ff,MIT OR Apache-2.0,"Sean Bowe <ewillbefull@gmail.com>, Jack Grigg <thestr4d@gmail.com>"
 fiat-crypto,https://github.com/mit-plv/fiat-crypto,MIT OR Apache-2.0 OR BSD-1-Clause,Fiat Crypto library authors <jgross@mit.edu>

From a1c1fc3493f33093e844b0fda9569e10acdfef13 Mon Sep 17 00:00:00 2001
From: Pavlos Rontidis <pavlos.rontidis@gmail.com>
Date: Thu, 7 Aug 2025 12:54:46 -0400
Subject: [PATCH 283/305] chore(opentelemetry lib): improve build.rs (#23551)

---
 .github/workflows/semantic.yml     |  1 +
 Cargo.lock                         |  1 +
 lib/opentelemetry-proto/Cargo.toml |  1 +
 lib/opentelemetry-proto/build.rs   | 36 +++++++++++++++++-------------
 4 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/semantic.yml b/.github/workflows/semantic.yml
index 9a8644b375e60..3fb45b8d322e1 100644
--- a/.github/workflows/semantic.yml
+++ b/.github/workflows/semantic.yml
@@ -254,3 +254,4 @@ jobs:
             website deps
 
             config provider
+            opentelemetry lib
diff --git a/Cargo.lock b/Cargo.lock
index 0a3465e045218..308aa895e1dc1 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -7204,6 +7204,7 @@ version = "0.1.0"
 dependencies = [
  "bytes 1.10.1",
  "chrono",
+ "glob",
  "hex",
  "ordered-float 4.6.0",
  "prost 0.12.6",
diff --git a/lib/opentelemetry-proto/Cargo.toml b/lib/opentelemetry-proto/Cargo.toml
index 76c7f9b98aeea..147d17b778067 100644
--- a/lib/opentelemetry-proto/Cargo.toml
+++ b/lib/opentelemetry-proto/Cargo.toml
@@ -8,6 +8,7 @@ publish = false
 [build-dependencies]
 prost-build.workspace = true
 tonic-build.workspace = true
+glob.workspace = true
 
 [dependencies]
 bytes = { version = "1.10.1", default-features = false, features = ["serde"] }
diff --git a/lib/opentelemetry-proto/build.rs b/lib/opentelemetry-proto/build.rs
index 4e642ce8ab283..19fc3d533bbc7 100644
--- a/lib/opentelemetry-proto/build.rs
+++ b/lib/opentelemetry-proto/build.rs
@@ -1,22 +1,28 @@
-use std::io::Error;
+use glob::glob;
+use std::{env, io::Result, path::PathBuf};
+
+fn main() -> Result<()> {
+    let proto_root = PathBuf::from("src/proto/opentelemetry-proto");
+    let include_path = proto_root.clone();
+
+    let proto_paths: Vec<_> = glob(&format!("{}/**/*.proto", proto_root.display()))
+        .expect("Failed to read glob pattern")
+        .filter_map(|result| result.ok())
+        .collect();
+
+    // Set up re-run triggers
+    for proto in &proto_paths {
+        println!("cargo:rerun-if-changed={}", proto.display());
+    }
+
+    let out_dir = PathBuf::from(env::var("OUT_DIR").unwrap());
+    let descriptor_path = out_dir.join("opentelemetry-proto.desc");
 
-fn main() -> Result<(), Error> {
     tonic_build::configure()
         .build_client(true)
         .build_server(true)
-        .compile(
-            &[
-                "src/proto/opentelemetry-proto/opentelemetry/proto/common/v1/common.proto",
-                "src/proto/opentelemetry-proto/opentelemetry/proto/resource/v1/resource.proto",
-                "src/proto/opentelemetry-proto/opentelemetry/proto/logs/v1/logs.proto",
-                "src/proto/opentelemetry-proto/opentelemetry/proto/metrics/v1/metrics.proto",
-                "src/proto/opentelemetry-proto/opentelemetry/proto/trace/v1/trace.proto",
-                "src/proto/opentelemetry-proto/opentelemetry/proto/collector/trace/v1/trace_service.proto",
-                "src/proto/opentelemetry-proto/opentelemetry/proto/collector/logs/v1/logs_service.proto",
-                "src/proto/opentelemetry-proto/opentelemetry/proto/collector/metrics/v1/metrics_service.proto",
-            ],
-            &["src/proto/opentelemetry-proto"],
-        )?;
+        .file_descriptor_set_path(&descriptor_path)
+        .compile(&proto_paths, &[include_path])?;
 
     Ok(())
 }

From 0b3c886d6c64b461ce2d56e6e9405b2d7f5ffc37 Mon Sep 17 00:00:00 2001
From: Thomas <thomas.schneider@datadoghq.com>
Date: Thu, 7 Aug 2025 14:27:01 -0400
Subject: [PATCH 284/305] chore(sinks): remove downcast and trait in sink retry
 code (#23543)

* Reapply "Remove downcast ref and trait usage from partial retry logic"

This reverts commit 3bd9c0d9b7444a16872ae36dde055144a8e3e379.

* Reapply "Fix make check-clippy errors"

This reverts commit abeb520a85f69ed75a9b033b3a50289c897727ed.

* Use Fn instead of FnOnce
---
 src/sinks/aws_cloudwatch_logs/retry.rs        |  26 +++--
 src/sinks/aws_cloudwatch_logs/service.rs      |   2 +-
 src/sinks/aws_cloudwatch_metrics/mod.rs       |   1 +
 src/sinks/aws_kinesis/config.rs               |   2 +-
 src/sinks/aws_kinesis/firehose/config.rs      |   4 +-
 src/sinks/aws_kinesis/streams/config.rs       |   4 +-
 src/sinks/aws_s_s/retry.rs                    |   3 +-
 src/sinks/azure_common/config.rs              |   1 +
 src/sinks/clickhouse/service.rs               |   5 +-
 src/sinks/clickhouse/sink.rs                  |   2 +-
 src/sinks/databend/service.rs                 |   1 +
 src/sinks/datadog/logs/service.rs             |   1 +
 src/sinks/datadog/metrics/service.rs          |   1 +
 src/sinks/datadog/traces/service.rs           |   3 +-
 src/sinks/elasticsearch/retry.rs              |  33 ++----
 src/sinks/gcp/cloud_storage.rs                |   2 +-
 .../gcp_chronicle/chronicle_unstructured.rs   |   2 +-
 src/sinks/gcs_common/config.rs                |  28 ++++-
 .../greptimedb/logs/http_request_builder.rs   |   5 +-
 src/sinks/greptimedb/metrics/request.rs       |   5 +-
 src/sinks/influxdb/metrics.rs                 |   2 +-
 src/sinks/loki/service.rs                     |   1 +
 src/sinks/nats/sink.rs                        |   3 +-
 src/sinks/new_relic/config.rs                 |   5 +-
 src/sinks/postgres/service.rs                 |   1 +
 src/sinks/redis/sink.rs                       |   5 +-
 src/sinks/s3_common/config.rs                 |   3 +-
 src/sinks/sematext/metrics.rs                 |   2 +-
 src/sinks/splunk_hec/logs/config.rs           |   2 +-
 src/sinks/splunk_hec/metrics/config.rs        |   2 +-
 .../util/adaptive_concurrency/service.rs      |   1 +
 src/sinks/util/adaptive_concurrency/tests.rs  |   1 +
 src/sinks/util/http.rs                        | 101 +++++++++++-------
 src/sinks/util/retries.rs                     |  45 +++-----
 src/sinks/util/service.rs                     |  11 +-
 src/sinks/vector/config.rs                    |   3 +-
 36 files changed, 183 insertions(+), 136 deletions(-)

diff --git a/src/sinks/aws_cloudwatch_logs/retry.rs b/src/sinks/aws_cloudwatch_logs/retry.rs
index 86689f4a89178..b2722054de097 100644
--- a/src/sinks/aws_cloudwatch_logs/retry.rs
+++ b/src/sinks/aws_cloudwatch_logs/retry.rs
@@ -9,28 +9,34 @@ use crate::aws::is_retriable_error;
 use crate::sinks::{aws_cloudwatch_logs::service::CloudwatchError, util::retries::RetryLogic};
 
 #[derive(Debug)]
-pub struct CloudwatchRetryLogic<T> {
-    phantom: PhantomData<T>,
+pub struct CloudwatchRetryLogic<Request, Response> {
+    request: PhantomData<Request>,
+    response: PhantomData<Response>,
 }
-impl<T> CloudwatchRetryLogic<T> {
-    pub const fn new() -> CloudwatchRetryLogic<T> {
+impl<Request, Response> CloudwatchRetryLogic<Request, Response> {
+    pub const fn new() -> CloudwatchRetryLogic<Request, Response> {
         CloudwatchRetryLogic {
-            phantom: PhantomData,
+            request: PhantomData,
+            response: PhantomData,
         }
     }
 }
 
-impl<T> Clone for CloudwatchRetryLogic<T> {
+impl<Request, Response> Clone for CloudwatchRetryLogic<Request, Response> {
     fn clone(&self) -> Self {
         CloudwatchRetryLogic {
-            phantom: PhantomData,
+            request: PhantomData,
+            response: PhantomData,
         }
     }
 }
 
-impl<T: Send + Sync + 'static> RetryLogic for CloudwatchRetryLogic<T> {
+impl<Request: Send + Sync + 'static, Response: Send + Sync + 'static> RetryLogic
+    for CloudwatchRetryLogic<Request, Response>
+{
     type Error = CloudwatchError;
-    type Response = T;
+    type Request = Request;
+    type Response = Response;
 
     // TODO this match may not be necessary given the logic in `is_retriable_error()`
     #[allow(clippy::cognitive_complexity)] // long, but just a hair over our limit
@@ -84,7 +90,7 @@ mod test {
 
     #[test]
     fn test_throttle_retry() {
-        let retry_logic: CloudwatchRetryLogic<()> = CloudwatchRetryLogic::new();
+        let retry_logic: CloudwatchRetryLogic<(), ()> = CloudwatchRetryLogic::new();
 
         let meta_err = aws_smithy_types::error::ErrorMetadata::builder()
             .code("ThrottlingException")
diff --git a/src/sinks/aws_cloudwatch_logs/service.rs b/src/sinks/aws_cloudwatch_logs/service.rs
index 52f50678bbd35..4546aa42b4b71 100644
--- a/src/sinks/aws_cloudwatch_logs/service.rs
+++ b/src/sinks/aws_cloudwatch_logs/service.rs
@@ -50,7 +50,7 @@ type Svc = Buffer<
     <ConcurrencyLimit<
         RateLimit<
             Retry<
-                FibonacciRetryPolicy<CloudwatchRetryLogic<()>>,
+                FibonacciRetryPolicy<CloudwatchRetryLogic<Vec<InputLogEvent>, ()>>,
                 Buffer<
                     Vec<InputLogEvent>,
                     <Timeout<CloudwatchLogsSvc> as Service<Vec<InputLogEvent>>>::Future,
diff --git a/src/sinks/aws_cloudwatch_metrics/mod.rs b/src/sinks/aws_cloudwatch_metrics/mod.rs
index c7954d5ffa4dd..d8f7e35aac1c6 100644
--- a/src/sinks/aws_cloudwatch_metrics/mod.rs
+++ b/src/sinks/aws_cloudwatch_metrics/mod.rs
@@ -201,6 +201,7 @@ struct CloudWatchMetricsRetryLogic;
 
 impl RetryLogic for CloudWatchMetricsRetryLogic {
     type Error = SdkError<PutMetricDataError>;
+    type Request = PartitionInnerBuffer<Vec<Metric>, String>;
     type Response = ();
 
     fn is_retriable_error(&self, error: &Self::Error) -> bool {
diff --git a/src/sinks/aws_kinesis/config.rs b/src/sinks/aws_kinesis/config.rs
index ce12349698dc1..259129a014a4e 100644
--- a/src/sinks/aws_kinesis/config.rs
+++ b/src/sinks/aws_kinesis/config.rs
@@ -99,7 +99,7 @@ where
     R: Send + 'static,
     RR: Record + Record<T = R> + Clone + Send + Sync + Unpin + 'static,
     E: Send + 'static,
-    RT: RetryLogic<Response = KinesisResponse> + Default,
+    RT: RetryLogic<Request = BatchKinesisRequest<RR>, Response = KinesisResponse> + Default,
 {
     let request_limits = config.request.into_settings();
 
diff --git a/src/sinks/aws_kinesis/firehose/config.rs b/src/sinks/aws_kinesis/firehose/config.rs
index ad6323ea21f33..85ebb6034aa54 100644
--- a/src/sinks/aws_kinesis/firehose/config.rs
+++ b/src/sinks/aws_kinesis/firehose/config.rs
@@ -16,6 +16,7 @@ use crate::{
     },
 };
 
+use super::sink::BatchKinesisRequest;
 use super::{
     build_sink,
     record::{KinesisFirehoseClient, KinesisFirehoseRecord},
@@ -173,6 +174,7 @@ struct KinesisRetryLogic {
 
 impl RetryLogic for KinesisRetryLogic {
     type Error = SdkError<KinesisError, HttpResponse>;
+    type Request = BatchKinesisRequest<KinesisFirehoseRecord>;
     type Response = KinesisResponse;
 
     fn is_retriable_error(&self, error: &Self::Error) -> bool {
@@ -187,7 +189,7 @@ impl RetryLogic for KinesisRetryLogic {
         is_retriable_error(error)
     }
 
-    fn should_retry_response(&self, response: &Self::Response) -> RetryAction {
+    fn should_retry_response(&self, response: &Self::Response) -> RetryAction<Self::Request> {
         if response.failure_count > 0 && self.retry_partial {
             let msg = format!("partial error count {}", response.failure_count);
             RetryAction::Retry(msg.into())
diff --git a/src/sinks/aws_kinesis/streams/config.rs b/src/sinks/aws_kinesis/streams/config.rs
index 5c97f0b019b04..2f42865fe8df8 100644
--- a/src/sinks/aws_kinesis/streams/config.rs
+++ b/src/sinks/aws_kinesis/streams/config.rs
@@ -15,6 +15,7 @@ use crate::{
     },
 };
 
+use super::sink::BatchKinesisRequest;
 use super::{
     build_sink,
     record::{KinesisStreamClient, KinesisStreamRecord},
@@ -170,6 +171,7 @@ struct KinesisRetryLogic {
 
 impl RetryLogic for KinesisRetryLogic {
     type Error = SdkError<KinesisError, HttpResponse>;
+    type Request = BatchKinesisRequest<KinesisStreamRecord>;
     type Response = KinesisResponse;
 
     fn is_retriable_error(&self, error: &Self::Error) -> bool {
@@ -190,7 +192,7 @@ impl RetryLogic for KinesisRetryLogic {
         is_retriable_error(error)
     }
 
-    fn should_retry_response(&self, response: &Self::Response) -> RetryAction {
+    fn should_retry_response(&self, response: &Self::Response) -> RetryAction<Self::Request> {
         if response.failure_count > 0 && self.retry_partial {
             let msg = format!("partial error count {}", response.failure_count);
             RetryAction::Retry(msg.into())
diff --git a/src/sinks/aws_s_s/retry.rs b/src/sinks/aws_s_s/retry.rs
index 569c9a083969a..bc9aba3eb58f8 100644
--- a/src/sinks/aws_s_s/retry.rs
+++ b/src/sinks/aws_s_s/retry.rs
@@ -2,7 +2,7 @@ use std::marker::PhantomData;
 
 use aws_smithy_runtime_api::client::{orchestrator::HttpResponse, result::SdkError};
 
-use super::service::SendMessageResponse;
+use super::{request_builder::SendMessageEntry, service::SendMessageResponse};
 use crate::{aws::is_retriable_error, sinks::util::retries::RetryLogic};
 
 #[derive(Debug)]
@@ -26,6 +26,7 @@ where
     E: std::fmt::Debug + std::fmt::Display + std::error::Error + Sync + Send + 'static,
 {
     type Error = SdkError<E, HttpResponse>;
+    type Request = SendMessageEntry;
     type Response = SendMessageResponse;
 
     fn is_retriable_error(&self, error: &Self::Error) -> bool {
diff --git a/src/sinks/azure_common/config.rs b/src/sinks/azure_common/config.rs
index 5e10ea797c305..ca6b1c7dd87fc 100644
--- a/src/sinks/azure_common/config.rs
+++ b/src/sinks/azure_common/config.rs
@@ -57,6 +57,7 @@ pub struct AzureBlobRetryLogic;
 
 impl RetryLogic for AzureBlobRetryLogic {
     type Error = HttpError;
+    type Request = AzureBlobRequest;
     type Response = AzureBlobResponse;
 
     fn is_retriable_error(&self, error: &Self::Error) -> bool {
diff --git a/src/sinks/clickhouse/service.rs b/src/sinks/clickhouse/service.rs
index aa45017a4caef..ca865fa0cf4fd 100644
--- a/src/sinks/clickhouse/service.rs
+++ b/src/sinks/clickhouse/service.rs
@@ -23,18 +23,19 @@ use snafu::ResultExt;
 
 #[derive(Debug, Default, Clone)]
 pub struct ClickhouseRetryLogic {
-    inner: HttpRetryLogic,
+    inner: HttpRetryLogic<HttpRequest<PartitionKey>>,
 }
 
 impl RetryLogic for ClickhouseRetryLogic {
     type Error = HttpError;
+    type Request = HttpRequest<PartitionKey>;
     type Response = HttpResponse;
 
     fn is_retriable_error(&self, error: &Self::Error) -> bool {
         self.inner.is_retriable_error(error)
     }
 
-    fn should_retry_response(&self, response: &Self::Response) -> RetryAction {
+    fn should_retry_response(&self, response: &Self::Response) -> RetryAction<Self::Request> {
         match response.http_response.status() {
             StatusCode::INTERNAL_SERVER_ERROR => {
                 let body = response.http_response.body();
diff --git a/src/sinks/clickhouse/sink.rs b/src/sinks/clickhouse/sink.rs
index 6e30172ba5a7d..e86f484d89024 100644
--- a/src/sinks/clickhouse/sink.rs
+++ b/src/sinks/clickhouse/sink.rs
@@ -83,7 +83,7 @@ where
 
 /// PartitionKey used to partition events by (database, table) pair.
 #[derive(Hash, Eq, PartialEq, Clone, Debug)]
-pub(super) struct PartitionKey {
+pub struct PartitionKey {
     pub database: String,
     pub table: String,
     pub format: Format,
diff --git a/src/sinks/databend/service.rs b/src/sinks/databend/service.rs
index 88a504e3e6ec7..2069771088fd4 100644
--- a/src/sinks/databend/service.rs
+++ b/src/sinks/databend/service.rs
@@ -23,6 +23,7 @@ pub struct DatabendRetryLogic;
 
 impl RetryLogic for DatabendRetryLogic {
     type Error = DatabendError;
+    type Request = DatabendRequest;
     type Response = DatabendResponse;
 
     fn is_retriable_error(&self, error: &Self::Error) -> bool {
diff --git a/src/sinks/datadog/logs/service.rs b/src/sinks/datadog/logs/service.rs
index 4ae96ecb2c51e..0375708d97ad1 100644
--- a/src/sinks/datadog/logs/service.rs
+++ b/src/sinks/datadog/logs/service.rs
@@ -31,6 +31,7 @@ pub struct LogApiRetry;
 
 impl RetryLogic for LogApiRetry {
     type Error = DatadogApiError;
+    type Request = LogApiRequest;
     type Response = LogApiResponse;
 
     fn is_retriable_error(&self, error: &Self::Error) -> bool {
diff --git a/src/sinks/datadog/metrics/service.rs b/src/sinks/datadog/metrics/service.rs
index d4106871d507d..c1d0d6e52fc69 100644
--- a/src/sinks/datadog/metrics/service.rs
+++ b/src/sinks/datadog/metrics/service.rs
@@ -26,6 +26,7 @@ pub struct DatadogMetricsRetryLogic;
 
 impl RetryLogic for DatadogMetricsRetryLogic {
     type Error = DatadogApiError;
+    type Request = DatadogMetricsRequest;
     type Response = DatadogMetricsResponse;
 
     fn is_retriable_error(&self, error: &Self::Error) -> bool {
diff --git a/src/sinks/datadog/traces/service.rs b/src/sinks/datadog/traces/service.rs
index d561263a72fa9..89f6a56a412db 100644
--- a/src/sinks/datadog/traces/service.rs
+++ b/src/sinks/datadog/traces/service.rs
@@ -23,13 +23,14 @@ pub struct TraceApiRetry;
 
 impl RetryLogic for TraceApiRetry {
     type Error = HttpError;
+    type Request = TraceApiRequest;
     type Response = TraceApiResponse;
 
     fn is_retriable_error(&self, _error: &Self::Error) -> bool {
         true
     }
 
-    fn should_retry_response(&self, response: &Self::Response) -> RetryAction {
+    fn should_retry_response(&self, response: &Self::Response) -> RetryAction<Self::Request> {
         let status = response.status_code;
         match status {
             // Use the same status code/retry policy as the Trace agent, additionally retrying
diff --git a/src/sinks/elasticsearch/retry.rs b/src/sinks/elasticsearch/retry.rs
index 284ecb60cc2f4..becdcc62ed194 100644
--- a/src/sinks/elasticsearch/retry.rs
+++ b/src/sinks/elasticsearch/retry.rs
@@ -7,7 +7,7 @@ use crate::{
     http::HttpError,
     sinks::{
         elasticsearch::service::{ElasticsearchRequest, ElasticsearchResponse},
-        util::retries::{RetryAction, RetryLogic, RetryPartialFunction},
+        util::retries::{RetryAction, RetryLogic},
     },
 };
 use http::StatusCode;
@@ -92,32 +92,19 @@ pub struct ElasticsearchRetryLogic {
     pub retry_partial: bool,
 }
 
-// construct a closure by EsRetryClosure { closure: Box::new(|req: ElasticsearchRequest| { new_req }) }
-struct EsRetryClosure {
-    closure: Box<dyn Fn(ElasticsearchRequest) -> ElasticsearchRequest + Send + Sync>,
-}
-
-impl RetryPartialFunction for EsRetryClosure {
-    fn modify_request(&self, request: Box<dyn std::any::Any>) -> Box<dyn std::any::Any> {
-        match request.downcast::<ElasticsearchRequest>() {
-            Ok(request) => {
-                let new_request = (self.closure)(*request);
-                Box::new(new_request)
-            }
-            Err(request) => request,
-        }
-    }
-}
-
 impl RetryLogic for ElasticsearchRetryLogic {
     type Error = HttpError;
+    type Request = ElasticsearchRequest;
     type Response = ElasticsearchResponse;
 
     fn is_retriable_error(&self, _error: &Self::Error) -> bool {
         true
     }
 
-    fn should_retry_response(&self, response: &ElasticsearchResponse) -> RetryAction {
+    fn should_retry_response(
+        &self,
+        response: &ElasticsearchResponse,
+    ) -> RetryAction<ElasticsearchRequest> {
         let status = response.http_response.status();
 
         match status {
@@ -160,8 +147,8 @@ impl RetryLogic for ElasticsearchRetryLogic {
                                             || status.is_server_error()
                                     })
                                 {
-                                    return RetryAction::RetryPartial(Box::new(EsRetryClosure {
-                                        closure: Box::new(move |req: ElasticsearchRequest| {
+                                    return RetryAction::RetryPartial(Box::new(
+                                        move |req: ElasticsearchRequest| {
                                             let mut failed_events: Vec<ProcessedEvent> = req
                                                 .original_events
                                                 .clone()
@@ -196,8 +183,8 @@ impl RetryLogic for ElasticsearchRetryLogic {
                                                 elasticsearch_request_builder: req
                                                     .elasticsearch_request_builder,
                                             }
-                                        }),
-                                    }));
+                                        },
+                                    ));
                                 }
                             }
 
diff --git a/src/sinks/gcp/cloud_storage.rs b/src/sinks/gcp/cloud_storage.rs
index 933419d638746..4004565fb2e31 100644
--- a/src/sinks/gcp/cloud_storage.rs
+++ b/src/sinks/gcp/cloud_storage.rs
@@ -276,7 +276,7 @@ impl GcsSinkConfig {
         let protocol = get_http_scheme_from_uri(&base_url.parse::<Uri>().unwrap());
 
         let svc = ServiceBuilder::new()
-            .settings(request, GcsRetryLogic)
+            .settings(request, GcsRetryLogic::default())
             .service(GcsService::new(client, base_url, auth));
 
         let request_settings = RequestSettings::new(self, cx)?;
diff --git a/src/sinks/gcp_chronicle/chronicle_unstructured.rs b/src/sinks/gcp_chronicle/chronicle_unstructured.rs
index 8727e789c137b..dcd775c87f9f3 100644
--- a/src/sinks/gcp_chronicle/chronicle_unstructured.rs
+++ b/src/sinks/gcp_chronicle/chronicle_unstructured.rs
@@ -347,7 +347,7 @@ impl ChronicleUnstructuredConfig {
         let partitioner = self.partitioner()?;
 
         let svc = ServiceBuilder::new()
-            .settings(request, GcsRetryLogic)
+            .settings(request, GcsRetryLogic::default())
             .service(ChronicleService::new(client, base_url, creds));
 
         let request_settings = ChronicleRequestBuilder::new(self)?;
diff --git a/src/sinks/gcs_common/config.rs b/src/sinks/gcs_common/config.rs
index 7c88c3c0990f5..65ee3794cc6ad 100644
--- a/src/sinks/gcs_common/config.rs
+++ b/src/sinks/gcs_common/config.rs
@@ -1,3 +1,5 @@
+use std::marker::PhantomData;
+
 use futures::FutureExt;
 use http::{StatusCode, Uri};
 use hyper::Body;
@@ -138,19 +140,37 @@ pub fn healthcheck_response(
     }
 }
 
-#[derive(Clone)]
-pub struct GcsRetryLogic;
+pub struct GcsRetryLogic<Request> {
+    request: PhantomData<Request>,
+}
+
+impl<Request> Default for GcsRetryLogic<Request> {
+    fn default() -> Self {
+        Self {
+            request: PhantomData,
+        }
+    }
+}
+
+impl<Request> Clone for GcsRetryLogic<Request> {
+    fn clone(&self) -> Self {
+        Self {
+            request: PhantomData,
+        }
+    }
+}
 
 // This is a clone of HttpRetryLogic for the Body type, should get merged
-impl RetryLogic for GcsRetryLogic {
+impl<Request: Clone + Send + Sync + 'static> RetryLogic for GcsRetryLogic<Request> {
     type Error = hyper::Error;
+    type Request = Request;
     type Response = GcsResponse;
 
     fn is_retriable_error(&self, _error: &Self::Error) -> bool {
         true
     }
 
-    fn should_retry_response(&self, response: &Self::Response) -> RetryAction {
+    fn should_retry_response(&self, response: &Self::Response) -> RetryAction<Self::Request> {
         let status = response.inner.status();
 
         match status {
diff --git a/src/sinks/greptimedb/logs/http_request_builder.rs b/src/sinks/greptimedb/logs/http_request_builder.rs
index 8f888ec4c0dd7..62672e56faf56 100644
--- a/src/sinks/greptimedb/logs/http_request_builder.rs
+++ b/src/sinks/greptimedb/logs/http_request_builder.rs
@@ -239,18 +239,19 @@ pub(super) async fn http_healthcheck(
 /// GreptimeDB HTTP retry logic.
 #[derive(Clone, Default)]
 pub(super) struct GreptimeDBHttpRetryLogic {
-    inner: HttpRetryLogic,
+    inner: HttpRetryLogic<HttpRequest<PartitionKey>>,
 }
 
 impl RetryLogic for GreptimeDBHttpRetryLogic {
     type Error = HttpError;
+    type Request = HttpRequest<PartitionKey>;
     type Response = HttpResponse;
 
     fn is_retriable_error(&self, error: &Self::Error) -> bool {
         error.is_retriable()
     }
 
-    fn should_retry_response(&self, response: &Self::Response) -> RetryAction {
+    fn should_retry_response(&self, response: &Self::Response) -> RetryAction<Self::Request> {
         self.inner.should_retry_response(&response.http_response)
     }
 }
diff --git a/src/sinks/greptimedb/metrics/request.rs b/src/sinks/greptimedb/metrics/request.rs
index 1a7cd8556b6eb..082c6c6709b54 100644
--- a/src/sinks/greptimedb/metrics/request.rs
+++ b/src/sinks/greptimedb/metrics/request.rs
@@ -13,7 +13,7 @@ use vector_lib::event::Metric;
 /// that is used to send metrics to GreptimeDB.
 /// It also contains the finalizers and metadata that are used to
 #[derive(Clone)]
-pub(super) struct GreptimeDBGrpcRequest {
+pub struct GreptimeDBGrpcRequest {
     pub(super) items: RowInsertRequests,
     pub(super) finalizers: EventFinalizers,
     pub(super) metadata: RequestMetadata,
@@ -90,8 +90,9 @@ impl DriverResponse for GreptimeDBGrpcBatchOutput {
 pub struct GreptimeDBGrpcRetryLogic;
 
 impl RetryLogic for GreptimeDBGrpcRetryLogic {
-    type Response = GreptimeDBGrpcBatchOutput;
     type Error = GreptimeError;
+    type Request = GreptimeDBGrpcRequest;
+    type Response = GreptimeDBGrpcBatchOutput;
 
     fn is_retriable_error(&self, error: &Self::Error) -> bool {
         error.is_retriable()
diff --git a/src/sinks/influxdb/metrics.rs b/src/sinks/influxdb/metrics.rs
index fd21c1025d2fe..81ad81f4fc1ea 100644
--- a/src/sinks/influxdb/metrics.rs
+++ b/src/sinks/influxdb/metrics.rs
@@ -167,7 +167,7 @@ impl InfluxDbSvc {
 
         let sink = request
             .batch_sink(
-                HttpRetryLogic,
+                HttpRetryLogic::default(),
                 influxdb_http_service,
                 MetricsBuffer::new(batch.size),
                 batch.timeout,
diff --git a/src/sinks/loki/service.rs b/src/sinks/loki/service.rs
index 2a4c33280732f..3fbbf7deb988f 100644
--- a/src/sinks/loki/service.rs
+++ b/src/sinks/loki/service.rs
@@ -15,6 +15,7 @@ pub struct LokiRetryLogic;
 
 impl RetryLogic for LokiRetryLogic {
     type Error = LokiError;
+    type Request = LokiRequest;
     type Response = LokiResponse;
 
     fn is_retriable_error(&self, error: &Self::Error) -> bool {
diff --git a/src/sinks/nats/sink.rs b/src/sinks/nats/sink.rs
index bfec91a999ae7..bb58b58b9192b 100644
--- a/src/sinks/nats/sink.rs
+++ b/src/sinks/nats/sink.rs
@@ -6,7 +6,7 @@ use crate::sinks::prelude::*;
 
 use super::{
     config::{NatsHeaderConfig, NatsPublisher, NatsSinkConfig, NatsTowerRequestConfigDefaults},
-    request_builder::{NatsEncoder, NatsRequestBuilder},
+    request_builder::{NatsEncoder, NatsRequest, NatsRequestBuilder},
     service::{NatsResponse, NatsService},
     EncodingSnafu, NatsError,
 };
@@ -109,6 +109,7 @@ pub(super) struct NatsRetryLogic;
 
 impl RetryLogic for NatsRetryLogic {
     type Error = NatsError;
+    type Request = NatsRequest;
     type Response = NatsResponse;
 
     fn is_retriable_error(&self, _error: &Self::Error) -> bool {
diff --git a/src/sinks/new_relic/config.rs b/src/sinks/new_relic/config.rs
index d77dacf34dafa..bc7a25e141388 100644
--- a/src/sinks/new_relic/config.rs
+++ b/src/sinks/new_relic/config.rs
@@ -5,8 +5,8 @@ use tower::ServiceBuilder;
 use vector_lib::sensitive_string::SensitiveString;
 
 use super::{
-    healthcheck, NewRelicApiResponse, NewRelicApiService, NewRelicEncoder, NewRelicSink,
-    NewRelicSinkError,
+    healthcheck, service::NewRelicApiRequest, NewRelicApiResponse, NewRelicApiService,
+    NewRelicEncoder, NewRelicSink, NewRelicSinkError,
 };
 
 use crate::{http::HttpClient, sinks::prelude::*};
@@ -56,6 +56,7 @@ pub struct NewRelicApiRetry;
 
 impl RetryLogic for NewRelicApiRetry {
     type Error = NewRelicSinkError;
+    type Request = NewRelicApiRequest;
     type Response = NewRelicApiResponse;
 
     fn is_retriable_error(&self, _error: &Self::Error) -> bool {
diff --git a/src/sinks/postgres/service.rs b/src/sinks/postgres/service.rs
index d1edcdce16505..54389d6a66c88 100644
--- a/src/sinks/postgres/service.rs
+++ b/src/sinks/postgres/service.rs
@@ -21,6 +21,7 @@ pub struct PostgresRetryLogic;
 
 impl RetryLogic for PostgresRetryLogic {
     type Error = PostgresServiceError;
+    type Request = PostgresRequest;
     type Response = PostgresResponse;
 
     fn is_retriable_error(&self, error: &Self::Error) -> bool {
diff --git a/src/sinks/redis/sink.rs b/src/sinks/redis/sink.rs
index 1df2c37794714..aaea351fece3e 100644
--- a/src/sinks/redis/sink.rs
+++ b/src/sinks/redis/sink.rs
@@ -18,7 +18,7 @@ use super::{
     config::{DataTypeConfig, RedisSinkConfig, RedisTowerRequestConfigDefaults},
     request_builder::request_builder,
     service::{RedisResponse, RedisService},
-    RedisEvent, RepairChannelSnafu,
+    RedisEvent, RedisRequest, RepairChannelSnafu,
 };
 
 pub(super) type GenerationCount = u64;
@@ -377,6 +377,7 @@ pub(super) struct RedisRetryLogic {
 
 impl RetryLogic for RedisRetryLogic {
     type Error = RedisSinkError;
+    type Request = RedisRequest;
     type Response = RedisResponse;
 
     fn is_retriable_error(&self, _error: &Self::Error) -> bool {
@@ -396,7 +397,7 @@ impl RetryLogic for RedisRetryLogic {
         }
     }
 
-    fn should_retry_response(&self, response: &Self::Response) -> RetryAction {
+    fn should_retry_response(&self, response: &Self::Response) -> RetryAction<Self::Request> {
         if response.is_successful() {
             RetryAction::Successful
         } else {
diff --git a/src/sinks/s3_common/config.rs b/src/sinks/s3_common/config.rs
index f4dd5cce7a365..3d3caac50fc0d 100644
--- a/src/sinks/s3_common/config.rs
+++ b/src/sinks/s3_common/config.rs
@@ -13,7 +13,7 @@ use futures::FutureExt;
 use snafu::Snafu;
 use vector_lib::configurable::configurable_component;
 
-use super::service::{S3Response, S3Service};
+use super::service::{S3Request, S3Response, S3Service};
 use crate::{
     aws::{create_client, is_retriable_error, AwsAuthentication, RegionOrEndpoint},
     common::s3::S3ClientBuilder,
@@ -360,6 +360,7 @@ pub enum RetryStrategy {
 
 impl RetryLogic for RetryStrategy {
     type Error = SdkError<PutObjectError, HttpResponse>;
+    type Request = S3Request;
     type Response = S3Response;
 
     fn is_retriable_error(&self, error: &Self::Error) -> bool {
diff --git a/src/sinks/sematext/metrics.rs b/src/sinks/sematext/metrics.rs
index 88cc3fa5d0818..64941c3571666 100644
--- a/src/sinks/sematext/metrics.rs
+++ b/src/sinks/sematext/metrics.rs
@@ -176,7 +176,7 @@ impl SematextMetricsService {
 
         let sink = request
             .batch_sink(
-                HttpRetryLogic,
+                HttpRetryLogic::default(),
                 sematext_service,
                 MetricsBuffer::new(batch.size),
                 batch.timeout,
diff --git a/src/sinks/splunk_hec/logs/config.rs b/src/sinks/splunk_hec/logs/config.rs
index 7479a58d0b2ba..000b26b21de05 100644
--- a/src/sinks/splunk_hec/logs/config.rs
+++ b/src/sinks/splunk_hec/logs/config.rs
@@ -241,7 +241,7 @@ impl HecLogsSinkConfig {
             self.compression,
         ));
         let http_service = ServiceBuilder::new()
-            .settings(request_settings, HttpRetryLogic)
+            .settings(request_settings, HttpRetryLogic::default())
             .service(build_http_batch_service(
                 client,
                 Arc::clone(&http_request_builder),
diff --git a/src/sinks/splunk_hec/metrics/config.rs b/src/sinks/splunk_hec/metrics/config.rs
index 521e88daf5b18..38cb8470d0f90 100644
--- a/src/sinks/splunk_hec/metrics/config.rs
+++ b/src/sinks/splunk_hec/metrics/config.rs
@@ -185,7 +185,7 @@ impl HecMetricsSinkConfig {
             self.compression,
         ));
         let http_service = ServiceBuilder::new()
-            .settings(request_settings, HttpRetryLogic)
+            .settings(request_settings, HttpRetryLogic::default())
             .service(build_http_batch_service(
                 client,
                 Arc::clone(&http_request_builder),
diff --git a/src/sinks/util/adaptive_concurrency/service.rs b/src/sinks/util/adaptive_concurrency/service.rs
index 6aa929f62fe15..5f9861c35ed4a 100644
--- a/src/sinks/util/adaptive_concurrency/service.rs
+++ b/src/sinks/util/adaptive_concurrency/service.rs
@@ -156,6 +156,7 @@ mod tests {
     struct TestRetryLogic;
     impl RetryLogic for TestRetryLogic {
         type Error = TestError;
+        type Request = ();
         type Response = String;
         fn is_retriable_error(&self, _error: &Self::Error) -> bool {
             true
diff --git a/src/sinks/util/adaptive_concurrency/tests.rs b/src/sinks/util/adaptive_concurrency/tests.rs
index 0b209aca85c15..e22509b7e73b5 100644
--- a/src/sinks/util/adaptive_concurrency/tests.rs
+++ b/src/sinks/util/adaptive_concurrency/tests.rs
@@ -321,6 +321,7 @@ enum Error {
 struct TestRetryLogic;
 
 impl RetryLogic for TestRetryLogic {
+    type Request = Vec<Event>;
     type Response = Response;
     type Error = Error;
 
diff --git a/src/sinks/util/http.rs b/src/sinks/util/http.rs
index 163417c667e1e..4bbe767a3074d 100644
--- a/src/sinks/util/http.rs
+++ b/src/sinks/util/http.rs
@@ -109,12 +109,14 @@ pub trait HttpSink: Send + Sync + 'static {
 ///
 /// Note: This has been deprecated, please do not use when creating new Sinks.
 #[pin_project]
-pub struct BatchedHttpSink<T, B, RL = HttpRetryLogic>
+pub struct BatchedHttpSink<T, B, RL = HttpRetryLogic<<B as Batch>::Output>>
 where
     B: Batch,
-    B::Output: ByteSizeOf + Clone + Send + 'static,
+    B::Output: ByteSizeOf + Clone + Sync + Send + 'static,
     T: HttpSink<Input = B::Input, Output = B::Output>,
-    RL: RetryLogic<Response = http::Response<Bytes>> + Send + 'static,
+    RL: RetryLogic<Request = <B as Batch>::Output, Response = http::Response<Bytes>>
+        + Send
+        + 'static,
 {
     sink: Arc<T>,
     #[pin]
@@ -133,7 +135,7 @@ where
 impl<T, B> BatchedHttpSink<T, B>
 where
     B: Batch,
-    B::Output: ByteSizeOf + Clone + Send + 'static,
+    B::Output: ByteSizeOf + Clone + Sync + Send + 'static,
     T: HttpSink<Input = B::Input, Output = B::Output>,
 {
     pub fn new(
@@ -146,7 +148,7 @@ where
         Self::with_logic(
             sink,
             batch,
-            HttpRetryLogic,
+            HttpRetryLogic::default(),
             request_settings,
             batch_timeout,
             client,
@@ -157,8 +159,10 @@ where
 impl<T, B, RL> BatchedHttpSink<T, B, RL>
 where
     B: Batch,
-    B::Output: ByteSizeOf + Clone + Send + 'static,
-    RL: RetryLogic<Response = http::Response<Bytes>, Error = HttpError> + Send + 'static,
+    B::Output: ByteSizeOf + Clone + Sync + Send + 'static,
+    RL: RetryLogic<Request = B::Output, Response = http::Response<Bytes>, Error = HttpError>
+        + Send
+        + 'static,
     T: HttpSink<Input = B::Input, Output = B::Output>,
 {
     pub fn with_logic(
@@ -193,9 +197,11 @@ where
 impl<T, B, RL> Sink<Event> for BatchedHttpSink<T, B, RL>
 where
     B: Batch,
-    B::Output: ByteSizeOf + Clone + Send + 'static,
+    B::Output: ByteSizeOf + Clone + Sync + Send + 'static,
     T: HttpSink<Input = B::Input, Output = B::Output>,
-    RL: RetryLogic<Response = http::Response<Bytes>> + Send + 'static,
+    RL: RetryLogic<Request = <B as Batch>::Output, Response = http::Response<Bytes>>
+        + Send
+        + 'static,
 {
     type Error = crate::Error;
 
@@ -249,14 +255,14 @@ where
 
 /// Note: This has been deprecated, please do not use when creating new Sinks.
 #[pin_project]
-pub struct PartitionHttpSink<T, B, K, RL = HttpRetryLogic>
+pub struct PartitionHttpSink<T, B, K, RL = HttpRetryLogic<<B as Batch>::Output>>
 where
     B: Batch,
-    B::Output: ByteSizeOf + Clone + Send + 'static,
+    B::Output: ByteSizeOf + Clone + Sync + Send + 'static,
     B::Input: Partition<K>,
     K: Hash + Eq + Clone + Send + 'static,
     T: HttpSink<Input = B::Input, Output = B::Output>,
-    RL: RetryLogic<Response = http::Response<Bytes>> + Send + 'static,
+    RL: RetryLogic<Request = B::Output, Response = http::Response<Bytes>> + Send + 'static,
 {
     sink: Arc<T>,
     #[pin]
@@ -270,10 +276,10 @@ where
     slot: Option<EncodedEvent<B::Input>>,
 }
 
-impl<T, B, K> PartitionHttpSink<T, B, K, HttpRetryLogic>
+impl<T, B, K> PartitionHttpSink<T, B, K, HttpRetryLogic<<B as Batch>::Output>>
 where
     B: Batch,
-    B::Output: ByteSizeOf + Clone + Send + 'static,
+    B::Output: ByteSizeOf + Clone + Sync + Send + 'static,
     B::Input: Partition<K>,
     K: Hash + Eq + Clone + Send + 'static,
     T: HttpSink<Input = B::Input, Output = B::Output>,
@@ -288,7 +294,7 @@ where
         Self::with_retry_logic(
             sink,
             batch,
-            HttpRetryLogic,
+            HttpRetryLogic::default(),
             request_settings,
             batch_timeout,
             client,
@@ -299,11 +305,13 @@ where
 impl<T, B, K, RL> PartitionHttpSink<T, B, K, RL>
 where
     B: Batch,
-    B::Output: ByteSizeOf + Clone + Send + 'static,
+    B::Output: ByteSizeOf + Clone + Sync + Send + 'static,
     B::Input: Partition<K>,
     K: Hash + Eq + Clone + Send + 'static,
     T: HttpSink<Input = B::Input, Output = B::Output>,
-    RL: RetryLogic<Response = http::Response<Bytes>, Error = HttpError> + Send + 'static,
+    RL: RetryLogic<Request = B::Output, Response = http::Response<Bytes>, Error = HttpError>
+        + Send
+        + 'static,
 {
     pub fn with_retry_logic(
         sink: T,
@@ -343,11 +351,11 @@ where
 impl<T, B, K, RL> Sink<Event> for PartitionHttpSink<T, B, K, RL>
 where
     B: Batch,
-    B::Output: ByteSizeOf + Clone + Send + 'static,
+    B::Output: ByteSizeOf + Clone + Sync + Send + 'static,
     B::Input: Partition<K>,
     K: Hash + Eq + Clone + Send + 'static,
     T: HttpSink<Input = B::Input, Output = B::Output>,
-    RL: RetryLogic<Response = http::Response<Bytes>> + Send + 'static,
+    RL: RetryLogic<Request = B::Output, Response = http::Response<Bytes>> + Send + 'static,
 {
     type Error = crate::Error;
 
@@ -541,18 +549,28 @@ impl<T: fmt::Debug> sink::Response for http::Response<T> {
     }
 }
 
-#[derive(Debug, Default, Clone)]
-pub struct HttpRetryLogic;
+#[derive(Debug, Clone)]
+pub struct HttpRetryLogic<Req> {
+    request: PhantomData<Req>,
+}
+impl<Req> Default for HttpRetryLogic<Req> {
+    fn default() -> Self {
+        Self {
+            request: PhantomData,
+        }
+    }
+}
 
-impl RetryLogic for HttpRetryLogic {
+impl<Req: Clone + Send + Sync + 'static> RetryLogic for HttpRetryLogic<Req> {
     type Error = HttpError;
+    type Request = Req;
     type Response = hyper::Response<Bytes>;
 
     fn is_retriable_error(&self, _error: &Self::Error) -> bool {
         true
     }
 
-    fn should_retry_response(&self, response: &Self::Response) -> RetryAction {
+    fn should_retry_response(&self, response: &Self::Response) -> RetryAction<Self::Request> {
         let status = response.status();
 
         match status {
@@ -573,37 +591,42 @@ impl RetryLogic for HttpRetryLogic {
 /// A more generic version of `HttpRetryLogic` that accepts anything that can be converted
 /// to a status code
 #[derive(Debug)]
-pub struct HttpStatusRetryLogic<F, T> {
+pub struct HttpStatusRetryLogic<F, Req, Res> {
     func: F,
-    request: PhantomData<T>,
+    request: PhantomData<Req>,
+    response: PhantomData<Res>,
 }
 
-impl<F, T> HttpStatusRetryLogic<F, T>
+impl<F, Req, Res> HttpStatusRetryLogic<F, Req, Res>
 where
-    F: Fn(&T) -> StatusCode + Clone + Send + Sync + 'static,
-    T: Send + Sync + 'static,
+    F: Fn(&Res) -> StatusCode + Clone + Send + Sync + 'static,
+    Req: Send + Sync + 'static,
+    Res: Send + Sync + 'static,
 {
-    pub const fn new(func: F) -> HttpStatusRetryLogic<F, T> {
+    pub const fn new(func: F) -> HttpStatusRetryLogic<F, Req, Res> {
         HttpStatusRetryLogic {
             func,
             request: PhantomData,
+            response: PhantomData,
         }
     }
 }
 
-impl<F, T> RetryLogic for HttpStatusRetryLogic<F, T>
+impl<F, Req, Res> RetryLogic for HttpStatusRetryLogic<F, Req, Res>
 where
-    F: Fn(&T) -> StatusCode + Clone + Send + Sync + 'static,
-    T: Send + Sync + 'static,
+    F: Fn(&Res) -> StatusCode + Clone + Send + Sync + 'static,
+    Req: Send + Sync + 'static,
+    Res: Send + Sync + 'static,
 {
     type Error = HttpError;
-    type Response = T;
+    type Request = Req;
+    type Response = Res;
 
     fn is_retriable_error(&self, _error: &Self::Error) -> bool {
         true
     }
 
-    fn should_retry_response(&self, response: &T) -> RetryAction {
+    fn should_retry_response(&self, response: &Res) -> RetryAction<Req> {
         let status = (self.func)(response);
 
         match status {
@@ -621,7 +644,7 @@ where
     }
 }
 
-impl<F, T> Clone for HttpStatusRetryLogic<F, T>
+impl<F, Req, Res> Clone for HttpStatusRetryLogic<F, Req, Res>
 where
     F: Clone,
 {
@@ -629,6 +652,7 @@ where
         Self {
             func: self.func.clone(),
             request: PhantomData,
+            response: PhantomData,
         }
     }
 }
@@ -719,7 +743,7 @@ pub fn validate_headers(
 }
 
 /// Request type for use in the `Service` implementation of HTTP stream sinks.
-#[derive(Clone)]
+#[derive(Debug, Clone)]
 pub struct HttpRequest<T: Send> {
     payload: Bytes,
     finalizers: EventFinalizers,
@@ -802,8 +826,9 @@ impl DriverResponse for HttpResponse {
 }
 
 /// Creates a `RetryLogic` for use with `HttpResponse`.
-pub fn http_response_retry_logic() -> HttpStatusRetryLogic<
+pub fn http_response_retry_logic<Request: Clone + Send + Sync + 'static>() -> HttpStatusRetryLogic<
     impl Fn(&HttpResponse) -> StatusCode + Clone + Send + Sync + 'static,
+    Request,
     HttpResponse,
 > {
     HttpStatusRetryLogic::new(|req: &HttpResponse| req.http_response.status())
@@ -928,7 +953,7 @@ mod test {
 
     #[test]
     fn util_http_retry_logic() {
-        let logic = HttpRetryLogic;
+        let logic = HttpRetryLogic::<()>::default();
 
         let response_408 = Response::builder().status(408).body(Bytes::new()).unwrap();
         let response_429 = Response::builder().status(429).body(Bytes::new()).unwrap();
diff --git a/src/sinks/util/retries.rs b/src/sinks/util/retries.rs
index e596268290c5d..9daaec01ca5b4 100644
--- a/src/sinks/util/retries.rs
+++ b/src/sinks/util/retries.rs
@@ -14,23 +14,20 @@ use vector_lib::configurable::configurable_component;
 
 use crate::Error;
 
-pub enum RetryAction {
+pub enum RetryAction<Request = ()> {
     /// Indicate that this request should be retried with a reason
     Retry(Cow<'static, str>),
     /// Indicate that a portion of this request should be retried with a generic function
-    RetryPartial(Box<dyn RetryPartialFunction>),
+    RetryPartial(Box<dyn Fn(Request) -> Request + Send + Sync>),
     /// Indicate that this request should not be retried with a reason
     DontRetry(Cow<'static, str>),
     /// Indicate that this request should not be retried but the request was successful
     Successful,
 }
 
-pub trait RetryPartialFunction {
-    fn modify_request(&self, request: Box<dyn std::any::Any>) -> Box<dyn std::any::Any>;
-}
-
 pub trait RetryLogic: Clone + Send + Sync + 'static {
     type Error: std::error::Error + Send + Sync + 'static;
+    type Request;
     type Response;
 
     /// When the Service call returns an `Err` response, this function allows
@@ -43,7 +40,7 @@ pub trait RetryLogic: Clone + Send + Sync + 'static {
     /// of a sink returns a transport protocol layer success but error data in the
     /// response body. For example, an HTTP 200 status, but the body of the response
     /// contains a list of errors encountered while processing.
-    fn should_retry_response(&self, _response: &Self::Response) -> RetryAction {
+    fn should_retry_response(&self, _response: &Self::Response) -> RetryAction<Self::Request> {
         // Treat the default as the request is successful
         RetryAction::Successful
     }
@@ -140,8 +137,8 @@ impl<L: RetryLogic> FibonacciRetryPolicy<L> {
 
 impl<Req, Res, L> Policy<Req, Res, Error> for FibonacciRetryPolicy<L>
 where
-    Req: Clone + 'static,
-    L: RetryLogic<Response = Res>,
+    Req: Clone + Send + 'static,
+    L: RetryLogic<Request = Req, Response = Res>,
 {
     type Future = RetryPolicyFuture;
 
@@ -162,8 +159,7 @@ where
                     warn!(message = "Retrying after response.", reason = %reason, internal_log_rate_limit = true);
                     Some(self.build_retry())
                 }
-
-                RetryAction::RetryPartial(rebuild_request_fn) => {
+                RetryAction::RetryPartial(modify_request) => {
                     if self.remaining_attempts == 0 {
                         error!(
                             message =
@@ -172,25 +168,13 @@ where
                         );
                         return None;
                     }
-                    let output = rebuild_request_fn.modify_request(Box::new(req.clone()));
-                    if let Ok(output) = output.downcast::<Req>() {
-                        *req = *output;
-                        error!(
-                            message = "OK/retrying partial after response.",
-                            internal_log_rate_limit = true
-                        );
-                        Some(self.build_retry())
-                    } else {
-                        // unlikely to go here.
-                        error!(
-                            message =
-                                "OK/retry response but invalid request; dropping the request.",
-                            internal_log_rate_limit = true,
-                        );
-                        None
-                    }
+                    *req = modify_request(req.clone());
+                    error!(
+                        message = "OK/retrying partial after response.",
+                        internal_log_rate_limit = true
+                    );
+                    Some(self.build_retry())
                 }
-
                 RetryAction::DontRetry(reason) => {
                     error!(message = "Not retriable; dropping the request.", reason = ?reason, internal_log_rate_limit = true);
                     None
@@ -252,7 +236,7 @@ impl Future for RetryPolicyFuture {
     }
 }
 
-impl RetryAction {
+impl<Request> RetryAction<Request> {
     pub const fn is_retryable(&self) -> bool {
         matches!(self, RetryAction::Retry(_) | RetryAction::RetryPartial(_))
     }
@@ -439,6 +423,7 @@ mod tests {
 
     impl RetryLogic for SvcRetryLogic {
         type Error = Error;
+        type Request = &'static str;
         type Response = &'static str;
 
         fn is_retriable_error(&self, error: &Self::Error) -> bool {
diff --git a/src/sinks/util/service.rs b/src/sinks/util/service.rs
index ab5160b8741ce..61fa9224a930a 100644
--- a/src/sinks/util/service.rs
+++ b/src/sinks/util/service.rs
@@ -269,7 +269,7 @@ impl TowerRequestSettings {
         batch_timeout: Duration,
     ) -> TowerPartitionSink<S, B, RL, K>
     where
-        RL: RetryLogic<Response = S::Response>,
+        RL: RetryLogic<Request = <B as Batch>::Output, Response = S::Response>,
         S: Service<B::Output> + Clone + Send + 'static,
         S::Error: Into<crate::Error> + Send + Sync + 'static,
         S::Response: Send + Response,
@@ -294,7 +294,7 @@ impl TowerRequestSettings {
         batch_timeout: Duration,
     ) -> TowerBatchedSink<S, B, RL>
     where
-        RL: RetryLogic<Response = S::Response>,
+        RL: RetryLogic<Request = <B as Batch>::Output, Response = S::Response>,
         S: Service<B::Output> + Clone + Send + 'static,
         S::Error: Into<crate::Error> + Send + Sync + 'static,
         S::Response: Send + Response,
@@ -537,7 +537,7 @@ mod tests {
         let svc = {
             let sent_requests = Arc::clone(&sent_requests);
             let delay = Arc::new(AtomicBool::new(true));
-            tower::service_fn(move |req: PartitionInnerBuffer<_, _>| {
+            tower::service_fn(move |req: PartitionInnerBuffer<Vec<usize>, Vec<usize>>| {
                 let (req, _) = req.into_parts();
                 if delay.swap(false, AcqRel) {
                     // Error on first request
@@ -561,7 +561,7 @@ mod tests {
         );
         sink.ordered();
 
-        let input = (0..20).map(|i| PartitionInnerBuffer::new(i, 0));
+        let input = (0..20).map(|i| PartitionInnerBuffer::new(i, vec![0]));
         sink.sink_map_err(drop)
             .send_all(
                 &mut stream::iter(input)
@@ -582,13 +582,14 @@ mod tests {
 
     impl RetryLogic for RetryAlways {
         type Error = std::io::Error;
+        type Request = PartitionInnerBuffer<Vec<usize>, Vec<usize>>;
         type Response = ();
 
         fn is_retriable_error(&self, _: &Self::Error) -> bool {
             true
         }
 
-        fn should_retry_response(&self, _response: &Self::Response) -> RetryAction {
+        fn should_retry_response(&self, _response: &Self::Response) -> RetryAction<Self::Request> {
             // Treat the default as the request is successful
             RetryAction::Successful
         }
diff --git a/src/sinks/vector/config.rs b/src/sinks/vector/config.rs
index 28d857dae42da..d35daeb0dd150 100644
--- a/src/sinks/vector/config.rs
+++ b/src/sinks/vector/config.rs
@@ -7,7 +7,7 @@ use tower::ServiceBuilder;
 use vector_lib::configurable::configurable_component;
 
 use super::{
-    service::{VectorResponse, VectorService},
+    service::{VectorRequest, VectorResponse, VectorService},
     sink::VectorSink,
     VectorSinkError,
 };
@@ -220,6 +220,7 @@ struct VectorGrpcRetryLogic;
 
 impl RetryLogic for VectorGrpcRetryLogic {
     type Error = VectorSinkError;
+    type Request = VectorRequest;
     type Response = VectorResponse;
 
     fn is_retriable_error(&self, err: &Self::Error) -> bool {

From 3f8cc10bde1baa631332e67b457cc9719365b24d Mon Sep 17 00:00:00 2001
From: Thomas <thomas.schneider@datadoghq.com>
Date: Fri, 8 Aug 2025 13:12:13 -0400
Subject: [PATCH 285/305] chore(dev): re-add deleted utils (#23562)

---
 scripts/util/commit.rb              | 166 ++++++++++++++++++++++++++++
 scripts/util/conventional_commit.rb |  97 ++++++++++++++++
 scripts/util/git_log_commit.rb      | 122 ++++++++++++++++++++
 scripts/util/printer.rb             |  74 +++++++++++++
 scripts/util/release.rb             |  39 +++++++
 scripts/util/version.rb             |  45 ++++++++
 6 files changed, 543 insertions(+)
 create mode 100644 scripts/util/commit.rb
 create mode 100644 scripts/util/conventional_commit.rb
 create mode 100644 scripts/util/git_log_commit.rb
 create mode 100644 scripts/util/printer.rb
 create mode 100644 scripts/util/release.rb
 create mode 100644 scripts/util/version.rb

diff --git a/scripts/util/commit.rb b/scripts/util/commit.rb
new file mode 100644
index 0000000000000..8b4f5baba1ca1
--- /dev/null
+++ b/scripts/util/commit.rb
@@ -0,0 +1,166 @@
+require_relative "conventional_commit"
+require_relative "git_log_commit"
+
+module Vector
+  class Commit
+    class << self
+      def fetch_since(last_version)
+        git_log = GitLogCommit.fetch_since!(last_version)
+        git_log.collect do |git_log_commit|
+          from_git_log_commit(git_log_commit)
+        end
+      end
+
+      def fetch_since!(last_version)
+        git_log = GitLogCommit.fetch_since!(last_version)
+        git_log.collect do |git_log_commit|
+          from_git_log_commit!(git_log_commit)
+        end
+      end
+
+      def from_git_log!(git_log)
+        git_log.collect do |git_log_commit|
+          from_git_log_commit!(git_log_commit)
+        end
+      end
+
+      private
+        def from_git_log_commit(git_log_commit)
+          conventional_commit = ConventionalCommit.parse(git_log_commit.message)
+          hash = git_log_commit.to_h.merge(conventional_commit.to_h)
+          new(hash)
+        end
+
+        def from_git_log_commit!(git_log_commit)
+          conventional_commit = ConventionalCommit.parse!(git_log_commit.message)
+          hash = git_log_commit.to_h.merge(conventional_commit.to_h)
+          new(hash)
+        end
+    end
+
+    attr_reader :author,
+      :breaking_change,
+      :date,
+      :deletions_count,
+      :description,
+      :files_count,
+      :insertions_count,
+      :pr_number,
+      :scopes,
+      :sha,
+      :type
+
+    def initialize(hash)
+      @author = hash.fetch("author")
+      @breaking_change = hash.fetch("breaking_change")
+      @date = hash.fetch("date")
+      @deletions_count = hash.fetch("deletions_count")
+      @description = hash.fetch("description")
+      @files_count = hash.fetch("files_count")
+      @insertions_count = hash.fetch("insertions_count")
+      @pr_number = hash.fetch("pr_number")
+      @scopes = hash.fetch("scopes")
+      @sha = hash.fetch("sha")
+      @type = hash.fetch("type")
+    end
+
+    def eql?(other)
+      sha == other.sha || pr_number == other.pr_number
+    end
+
+    def breaking_change?
+      breaking_change == true
+    end
+
+    def fix?
+      type == "fix"
+    end
+
+    def new_feature?
+      type == "feat"
+    end
+
+    def to_cue_struct
+      "{" +
+        "sha: #{sha.to_json}, " +
+        "date: #{date.to_json}, " +
+        "description: #{description.to_json}, " +
+        "pr_number: #{pr_number.to_json}, " +
+        "scopes: #{scopes.to_json}, " +
+        "type: #{type.to_json}, " +
+        "breaking_change: #{breaking_change.to_json}, " +
+        "author: #{author.to_json}, " +
+        "files_count: #{files_count.to_json}, " +
+        "insertions_count: #{insertions_count.to_json}, " +
+        "deletions_count: #{deletions_count.to_json}}"
+    end
+
+    def validate!
+      if !type.nil? && !TYPES.include?(type)
+        raise <<~EOF
+        The following commit has an invalid type!
+
+          #{to_s}
+
+        The type must be one of #{TYPES.inspect}.
+
+          #{type.inspect}
+
+        Please correct in the release /.meta file and retry.
+        EOF
+      end
+
+      if TYPES_THAT_REQUIRE_SCOPES.include?(type) && scopes.empty?
+        raise <<~EOF
+        The following commit does not have a scope
+
+          #{to_s}
+
+        A scope is required for commits of type #{TYPES_THAT_REQUIRE_SCOPES.inspect}.
+
+          #{description}
+
+        Please correct in the release /.meta file and retry.
+        EOF
+      end
+
+      true
+    end
+
+    def to_git_log_commit
+      message = ""
+
+      if type
+        message = "#{message}#{type.clone}"
+      end
+
+      if scopes.any?
+        message = "#{message}(#{scopes.join(", ")})"
+      end
+
+      if breaking_change?
+        message = "#{message}!"
+      end
+
+      message = "#{message}: #{description}"
+
+      if pr_number
+        message = "#{message} (##{pr_number})"
+      end
+
+      GitLogCommit.new({
+        "author" => author,
+        "date" => date,
+        "deletions_count" => deletions_count,
+        "files_count" => files_count,
+        "insertions_count" => insertions_count,
+        "message" => message,
+        "sha" => sha
+      })
+    end
+
+    def to_s
+      "#{sha} #{type}(#{scopes.join(", ")})#{breaking_change? ? "!" : ""}: #{description} (##{pr_number})"
+    end
+  end
+end
diff --git a/scripts/util/conventional_commit.rb b/scripts/util/conventional_commit.rb
new file mode 100644
index 0000000000000..5944bb407f663
--- /dev/null
+++ b/scripts/util/conventional_commit.rb
@@ -0,0 +1,97 @@
+module Vector
+  class ConventionalCommit
+    class << self
+      def parse(message)
+        hash = parse_commit_message(message)
+        new(hash)
+      end
+
+      def parse!(message)
+        hash = parse_commit_message!(message)
+        new(hash)
+      end
+
+      private
+        def parse_commit_message(message)
+          begin
+            parse_commit_message!(message)
+          rescue Exception => e
+            if message.include?("Use `namespace` field in metric sources")
+              raise e
+            end
+
+            {
+              "breaking_change" => nil,
+              "description" => message,
+              "pr_number" => nil,
+              "scopes" => [],
+              "type" => nil
+            }
+          end
+        end
+
+        def parse_commit_message!(message)
+          match = message.match(/^(?<type>[a-z]*)(\((?<scope>[a-z0-9_, ]*)\))?(?<breaking_change>!)?: (?<description>.*?)( \(#(?<pr_number>[0-9]*)\))?$/)
+
+          if match.nil?
+            raise <<~EOF
+            Commit message does not conform to the conventional commit format.
+
+            Unable to parse at all!
+
+              #{message}
+
+            Please correct in the release /.meta file and retry.
+            EOF
+          end
+
+          attributes =
+            {
+              "type" => match[:type],
+              "breaking_change" => !match[:breaking_change].nil?,
+              "description" => match[:description]
+            }
+
+          attributes["scopes"] =
+            if match[:scope]
+              match[:scope].split(",").collect(&:strip)
+            else
+              []
+            end
+
+          attributes["pr_number"] =
+            if match[:pr_number]
+              match[:pr_number].to_i
+            else
+              nil
+            end
+
+          attributes
+        end
+    end
+
+    attr_reader :breaking_change,
+      :description,
+      :pr_number,
+      :type,
+      :scopes
+
+    def initialize(hash)
+      @breaking_change = hash.fetch("breaking_change")
+      @description = hash.fetch("description")
+      @pr_number = hash.fetch("pr_number")
+      @type = hash.fetch("type")
+      @scopes = hash.fetch("scopes")
+    end
+
+    def to_h
+      {
+          "breaking_change" => breaking_change,
+          "description" => description,
+          "pr_number" => pr_number,
+          "type" => type,
+          "scopes" => scopes
+      }
+    end
+  end
+end
diff --git a/scripts/util/git_log_commit.rb b/scripts/util/git_log_commit.rb
new file mode 100644
index 0000000000000..fe8425209a86d
--- /dev/null
+++ b/scripts/util/git_log_commit.rb
@@ -0,0 +1,122 @@
+module Vector
+  class GitLogCommit
+    class << self
+      def fetch_since!(last_version)
+        range = "v#{last_version}..."
+        commit_log = `git log #{range} --cherry-pick --right-only --no-merges --pretty=format:'%H\t%s\t%aN\t%ad'`.chomp
+        commit_lines = commit_log.split("\n").reverse
+
+        commit_lines.collect do |commit_line|
+          hash = parse_commit_line!(commit_line)
+          new(hash)
+        end
+      end
+
+      def from_file!(path)
+        contents = File.read(path)
+        contents.split("\n").collect do |line|
+          hash = parse_commit_line!(line)
+          new(hash)
+        end
+      end
+
+      private
+        # This is used for the `files_count`, `insertions_count`, and `deletions_count`
+        # attributes. It helps to communicate stats and the depth of changes in our
+        # release notes.
+        def get_commit_stats(sha)
+          `git show --shortstat --oneline #{sha}`.split("\n").last
+        end
+
+        def parse_commit_line!(commit_line)
+          # Parse the full commit line
+          line_parts = commit_line.split("\t")
+          sha = line_parts.fetch(0)
+          message = line_parts.fetch(1)
+          author = line_parts.fetch(2)
+          date = Time.parse(line_parts.fetch(3)).utc
+
+          attributes =
+            {
+              "sha" =>  sha,
+              "author" => author,
+              "date" => date,
+              "message" => message
+            }
+
+          # Parse the stats
+          stats = get_commit_stats(attributes.fetch("sha"))
+          if /^\W*\p{Digit}+ files? changed,/.match(stats)
+            stats_attributes = parse_commit_stats!(stats)
+            attributes.merge!(stats_attributes)
+          end
+
+          attributes
+        end
+
+        # Parses the data from `#get_commit_stats`.
+        def parse_commit_stats!(stats)
+          attributes = {}
+
+          stats.split(", ").each do |stats_part|
+            stats_part.strip!
+
+            key =
+              case stats_part
+              when /insertions?/
+                "insertions_count"
+              when /deletions?/
+                "deletions_count"
+              when /files? changed/
+                "files_count"
+              else
+                raise "Invalid commit stat: #{stats_part}"
+              end
+
+            count = stats_part.match(/^(?<count>[0-9]*) /)[:count].to_i
+            attributes[key] = count
+          end
+
+          attributes["insertions_count"] ||= 0
+          attributes["deletions_count"] ||= 0
+          attributes["files_count"] ||= 0
+          attributes
+        end
+    end
+
+    attr_reader :author,
+      :date,
+      :deletions_count,
+      :files_count,
+      :insertions_count,
+      :message,
+      :raw,
+      :sha
+
+    def initialize(hash)
+      @author = hash.fetch("author")
+      @date = hash.fetch("date")
+      @deletions_count = hash.fetch("deletions_count", 0)
+      @files_count = hash.fetch("files_count", 0)
+      @insertions_count = hash.fetch("insertions_count", 0)
+      @message = hash.fetch("message")
+      @sha = hash.fetch("sha")
+    end
+
+    def to_h
+      {
+        "author" => author,
+        "date" => date,
+        "deletions_count" => deletions_count,
+        "files_count" => files_count,
+        "insertions_count" => insertions_count,
+        "message" => message,
+        "sha" => sha
+      }
+    end
+
+    def to_raw
+      "#{sha}\t#{message}\t#{author}\t#{date.strftime("%a %b %d %H:%M:%S %Y %z")}"
+    end
+  end
+end
diff --git a/scripts/util/printer.rb b/scripts/util/printer.rb
new file mode 100644
index 0000000000000..4f65f2d904359
--- /dev/null
+++ b/scripts/util/printer.rb
@@ -0,0 +1,74 @@
+require "paint"
+
+module Util
+  module Printer
+    PROMPT = "---> "
+    INDENT = "     "
+    SEPARATOR = "-" * 80
+    TITLE_PROMPT = "#### "
+
+    extend self
+
+    def error!(message)
+      Printer.say(message, color: :red)
+      exit(1)
+    end
+
+    def Printer.get(words, choices = nil)
+      question = "#{words.strip}"
+
+      if !choices.nil?
+        question += " (" + choices.join("/") + ")"
+      end
+
+      Printer.say(question)
+
+      print INDENT
+
+      input = gets().chomp
+
+      if choices && !choices.include?(input)
+        Printer.say("You must enter one of #{choices.join(", ")}", color: :red)
+        Printer.get(words, choices)
+      else
+        input
+      end
+    end
+
+    def invalid(words)
+      Printer.say(words, color: :yellow)
+    end
+
+    def say(words, color: nil, new: true, prompt: PROMPT)
+      prefix = new ? prompt : INDENT
+
+      if color
+        words = Paint[prefix + words, color]
+      else
+        words = prefix + words
+      end
+
+      puts words.gsub("\n", "\n#{INDENT}")
+    end
+
+    def separate(color: nil)
+      string = SEPARATOR
+
+      if color
+        string = Paint[string, color]
+      end
+
+      puts ""
+      puts string
+    end
+
+    def success(words)
+      Printer.say(words, color: :green)
+    end
+
+    def title(words)
+      separate(color: :cyan)
+      Printer.say(words, color: :cyan, prompt: TITLE_PROMPT)
+    end
+  end
+end
diff --git a/scripts/util/release.rb b/scripts/util/release.rb
new file mode 100644
index 0000000000000..112ee39e19536
--- /dev/null
+++ b/scripts/util/release.rb
@@ -0,0 +1,39 @@
+require_relative "commit"
+require_relative "version"
+
+module Vector
+  class Release
+    class << self
+      def all!(dir)
+        release_meta_paths = Dir.glob("#{dir}/*.cue").to_a
+
+        release_meta_paths.
+          collect do |release_meta_path|
+            urls_cue_path = File.join(File.dirname(release_meta_path), "..", "urls.cue")
+            release_json = `cue export #{urls_cue_path} #{release_meta_path}`
+            release_hash = JSON.parse(release_json)
+            name = release_hash.fetch("releases").keys.first
+            hash = release_hash.fetch("releases").values.first
+            new(hash.merge({"name" => name}))
+          end.
+          sort_by(&:version)
+      end
+    end
+
+    attr_reader :codename,
+      :commits,
+      :date,
+      :name,
+      :version,
+      :whats_next
+
+    def initialize(hash)
+      @codename = hash.fetch("codename", "")
+      @commits = hash.fetch("commits").collect { |commit_hash| Commit.new(commit_hash) }
+      @date = hash.fetch("date")
+      @name = hash.fetch("name")
+      @version = Util::Version.new(@name)
+      @whats_next = hash.fetch("whats_next", [])
+    end
+  end
+end
diff --git a/scripts/util/version.rb b/scripts/util/version.rb
new file mode 100644
index 0000000000000..afc69ab15483f
--- /dev/null
+++ b/scripts/util/version.rb
@@ -0,0 +1,45 @@
+module Util
+  class Version < Gem::Version
+    def bump_type(other_version)
+      # Return nil if the other version is not greater than the current version
+      if other_version <= self
+        return nil
+      end
+
+      bumped_version = bump
+      next_major = segments.first + 1
+
+      if other_version.prerelease?
+        "pre"
+      elsif other_version < bumped_version
+        "patch"
+      elsif other_version == bumped_version
+        "minor"
+      elsif other_version.segments.first == next_major
+        "major"
+      else
+        nil
+      end
+    end
+
+    def major
+      segments[0]
+    end
+
+    def major_x
+      "#{segments[0]}.X"
+    end
+
+    def minor
+      segments[1]
+    end
+
+    def minor_x
+      "#{segments[0]}.#{segments[1]}.X"
+    end
+
+    def patch
+      segments[2]
+    end
+  end
+end

From 51ba4eaa0021c994edca3f9606b5e8ff95477dd2 Mon Sep 17 00:00:00 2001
From: Paul Symons <36790149+paulmech@users.noreply.github.com>
Date: Mon, 11 Aug 2025 22:06:18 +0800
Subject: [PATCH 286/305] chore(website): correct typo on footer title Abount
 -> About (#23569)

---
 website/config.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/website/config.toml b/website/config.toml
index 052b3b96780b9..e0c74e378ed95 100644
--- a/website/config.toml
+++ b/website/config.toml
@@ -156,7 +156,7 @@ weight = 7
 
 # Footer menu
 [[languages.en.menus.footer]]
-name = "Abount"
+name = "About"
 identifier = "introduction"
 weight = 1
 

From 343d0d222d6608f416aa5d60d79ad98cbd4906f9 Mon Sep 17 00:00:00 2001
From: Pavlos Rontidis <pavlos.rontidis@gmail.com>
Date: Mon, 11 Aug 2025 10:47:56 -0400
Subject: [PATCH 287/305] chore(website): fix author link (#23571)

---
 .../layouts/partials/author-with-avatar.html  | 44 ++++++-------------
 1 file changed, 14 insertions(+), 30 deletions(-)

diff --git a/website/layouts/partials/author-with-avatar.html b/website/layouts/partials/author-with-avatar.html
index b27a88ef65c67..ff366ff31f4fa 100644
--- a/website/layouts/partials/author-with-avatar.html
+++ b/website/layouts/partials/author-with-avatar.html
@@ -1,33 +1,17 @@
-<div class="flex items-center">
-  {{ if or (not .Params.authors) (eq (len .Params.authors) 0) }}
-    <div class="ml-4 flex flex-col space-y-1">
-      <span class="text-md font-bold tracking-tight text-gray-700 dark:text-gray-200">
-        Unknown author
+<div class="flex flex-col space-y-2">
+  {{ range .Params.authors }}
+    {{ $handle := . }}
+    {{ $img := printf "https://github.com/%s.png" $handle }}
+    {{ $link := printf "https://github.com/%s" $handle }}
+    <a href="{{ $link }}" class="flex items-center space-x-3 group" rel="noopener" target="_blank">
+      <img
+        class="h-12 w-12 rounded-full ring-1 ring-white dark:ring-dark"
+        src="{{ $img }}"
+        alt="Author avatar for {{ $handle }}"
+      />
+      <span class="text-md font-bold tracking-tight text-gray-700 group-hover:text-secondary dark:text-gray-200">
+        {{ $handle }}
       </span>
-    </div>
-  {{ else }}
-    <div class="flex-shrink-0">
-      <div class="flex -space-x-1 relative z-0 overflow-hidden">
-        {{ range .Params.authors }}
-          {{ $handle := . }}
-          {{ $img := printf "https://github.com/%s.png" $handle }}
-          <img class="relative z-30 inline-block h-12 w-12 rounded-full ring-1 ring-white dark:ring-dark"
-               src="{{ $img }}"
-               alt="Author avatar for {{ $handle }}">
-        {{ end }}
-      </div>
-    </div>
-
-    <div class="ml-4 flex flex-col space-y-1">
-      {{ range .Params.authors }}
-        {{ $handle := . }}
-        {{ $link := printf "https://github.com/%s" $handle }}
-        <a href="{{ $link }}"
-           class="text-md font-bold tracking-tight text-gray-700 hover:text-secondary dark:text-gray-200"
-           rel="noopener" target="_blank">
-          {{ $handle }}
-        </a>
-      {{ end }}
-    </div>
+    </a>
   {{ end }}
 </div>

From f49c6cbf75f7396fbd640d1413e78d0fce36e630 Mon Sep 17 00:00:00 2001
From: Pavlos Rontidis <pavlos.rontidis@gmail.com>
Date: Mon, 11 Aug 2025 12:06:39 -0400
Subject: [PATCH 288/305] revert(internal_logs source): disable
 `internal_log_rate_limit` by default (#23566)

* Revert "feat(dev): Enable `internal_log_rate_limit` by default (#22899)"

This reverts commit dffcb5a02c881dd94a84470722ca4e6040a9cc43.

* added internal_log_rate_limit = true to new traces

* cargo fmt

* Fix compilation errors and remaning missed logs

* Checkout file from dffcb5a~1

* Fix clippy

---------

Co-authored-by: Thomas <thomas.schneider@datadoghq.com>
---
 .../src/decoding/framing/chunked_gelf.rs      |  2 +
 lib/dnstap-parser/src/internal_events.rs      |  2 +-
 lib/tracing-limit/benches/limit.rs            |  1 +
 lib/tracing-limit/examples/basic.rs           |  6 ++-
 lib/tracing-limit/examples/by_span.rs         |  1 +
 lib/tracing-limit/src/lib.rs                  | 45 ++++++-------------
 lib/vector-buffers/src/internal_events.rs     |  1 +
 .../component_events_dropped.rs               |  2 +
 .../src/internal_event/service.rs             |  3 +-
 src/app.rs                                    |  5 ++-
 src/cli.rs                                    |  1 -
 src/components/validation/resources/http.rs   |  4 +-
 src/config/watcher.rs                         | 12 +++--
 src/internal_events/amqp.rs                   |  6 +--
 src/internal_events/apache_metrics.rs         |  2 +-
 src/internal_events/aws_cloudwatch_logs.rs    |  1 +
 src/internal_events/aws_ec2_metadata.rs       |  2 +-
 src/internal_events/aws_ecs_metrics.rs        |  4 +-
 src/internal_events/aws_kinesis.rs            |  2 +-
 src/internal_events/aws_kinesis_firehose.rs   |  3 +-
 src/internal_events/aws_sqs.rs                | 10 ++---
 src/internal_events/batch.rs                  |  2 +-
 src/internal_events/codecs.rs                 | 10 ++---
 src/internal_events/common.rs                 |  5 ++-
 src/internal_events/conditions.rs             |  1 +
 src/internal_events/datadog_agent.rs          |  2 +-
 src/internal_events/datadog_metrics.rs        |  1 +
 src/internal_events/datadog_traces.rs         |  4 +-
 src/internal_events/dnstap.rs                 |  2 +-
 src/internal_events/docker_logs.rs            |  2 +-
 src/internal_events/encoding_transcode.rs     |  1 +
 src/internal_events/eventstoredb_metrics.rs   |  4 +-
 src/internal_events/exec.rs                   |  9 ++--
 src/internal_events/expansion.rs              |  4 +-
 src/internal_events/file.rs                   |  9 ++--
 src/internal_events/fluent.rs                 |  2 +-
 src/internal_events/gcp_pubsub.rs             |  6 +--
 src/internal_events/host_metrics.rs           |  5 ++-
 src/internal_events/http.rs                   |  2 +-
 src/internal_events/http_client.rs            |  2 +-
 src/internal_events/http_client_source.rs     |  4 +-
 src/internal_events/influxdb.rs               |  1 +
 src/internal_events/journald.rs               |  9 ++--
 src/internal_events/kafka.rs                  |  5 ++-
 src/internal_events/kubernetes_logs.rs        | 10 ++---
 src/internal_events/logplex.rs                |  2 +-
 src/internal_events/loki.rs                   |  4 ++
 src/internal_events/lua.rs                    |  3 +-
 src/internal_events/metric_to_log.rs          |  1 +
 src/internal_events/mongodb_metrics.rs        |  4 +-
 src/internal_events/mqtt.rs                   |  2 +-
 src/internal_events/nginx_metrics.rs          |  4 +-
 src/internal_events/parser.rs                 |  1 +
 src/internal_events/postgresql_metrics.rs     |  2 +-
 src/internal_events/process.rs                |  3 ++
 src/internal_events/prometheus.rs             |  5 ++-
 src/internal_events/pulsar.rs                 | 10 ++---
 src/internal_events/redis.rs                  |  2 +-
 src/internal_events/reduce.rs                 |  2 +-
 src/internal_events/remap.rs                  |  2 +-
 src/internal_events/sematext_metrics.rs       |  4 +-
 src/internal_events/socket.rs                 |  6 +--
 src/internal_events/splunk_hec.rs             | 10 ++---
 src/internal_events/statsd_sink.rs            |  2 +-
 src/internal_events/tag_cardinality_limit.rs  |  2 +
 src/internal_events/tcp.rs                    |  4 ++
 src/internal_events/template.rs               |  4 +-
 src/internal_events/udp.rs                    |  1 +
 src/internal_events/unix.rs                   |  7 +--
 src/internal_events/websocket.rs              |  6 ++-
 src/internal_events/websocket_server.rs       |  4 +-
 src/internal_events/windows.rs                |  1 +
 src/sinks/amqp/channel.rs                     |  3 +-
 src/sinks/datadog/logs/sink.rs                |  1 +
 src/sinks/datadog/traces/apm_stats/flusher.rs |  1 +
 src/sinks/gcp/stackdriver/logs/encoder.rs     |  1 +
 src/sinks/redis/sink.rs                       |  7 ++-
 .../util/adaptive_concurrency/controller.rs   |  1 +
 src/sinks/util/retries.rs                     |  4 +-
 src/sources/datadog_agent/metrics.rs          |  5 ++-
 src/sources/heroku_logs.rs                    |  1 +
 src/sources/http_client/client.rs             |  6 +--
 src/sources/socket/udp.rs                     |  2 +
 src/sources/util/framestream.rs               | 10 ++++-
 src/sources/websocket/source.rs               | 31 +++++++++----
 src/topology/builder.rs                       | 17 ++++---
 src/transforms/lua/v1/mod.rs                  |  1 +
 87 files changed, 242 insertions(+), 164 deletions(-)

diff --git a/lib/codecs/src/decoding/framing/chunked_gelf.rs b/lib/codecs/src/decoding/framing/chunked_gelf.rs
index 51ffd53fb6f1b..9c34e002cce43 100644
--- a/lib/codecs/src/decoding/framing/chunked_gelf.rs
+++ b/lib/codecs/src/decoding/framing/chunked_gelf.rs
@@ -387,6 +387,7 @@ impl ChunkedGelfDecoder {
                     warn!(
                         message_id = message_id,
                         timeout_secs = timeout.as_secs_f64(),
+                        internal_log_rate_limit = true,
                         "Message was not fully received within the timeout window. Discarding it."
                     );
                 }
@@ -408,6 +409,7 @@ impl ChunkedGelfDecoder {
             debug!(
                 message_id = message_id,
                 sequence_number = sequence_number,
+                internal_log_rate_limit = true,
                 "Received a duplicate chunk. Ignoring it."
             );
             return Ok(None);
diff --git a/lib/dnstap-parser/src/internal_events.rs b/lib/dnstap-parser/src/internal_events.rs
index 2ce75acb19709..ab1635c9b3e03 100644
--- a/lib/dnstap-parser/src/internal_events.rs
+++ b/lib/dnstap-parser/src/internal_events.rs
@@ -14,7 +14,7 @@ impl<E: std::fmt::Display> InternalEvent for DnstapParseWarning<E> {
             error = %self.error,
             stage = error_stage::PROCESSING,
             error_type = error_type::PARSER_FAILED,
-
+            internal_log_rate_limit = true,
         );
     }
 }
diff --git a/lib/tracing-limit/benches/limit.rs b/lib/tracing-limit/benches/limit.rs
index 3a43707d7f992..79ed62b6de3d4 100644
--- a/lib/tracing-limit/benches/limit.rs
+++ b/lib/tracing-limit/benches/limit.rs
@@ -58,6 +58,7 @@ fn bench(c: &mut Criterion) {
                             bar = "bar",
                             baz = 3,
                             quuux = ?0.99,
+                            internal_log_rate_limit = true
                         )
                     }
                 })
diff --git a/lib/tracing-limit/examples/basic.rs b/lib/tracing-limit/examples/basic.rs
index 86c973739b13a..3b4428d540997 100644
--- a/lib/tracing-limit/examples/basic.rs
+++ b/lib/tracing-limit/examples/basic.rs
@@ -14,7 +14,11 @@ fn main() {
     tracing::dispatcher::with_default(&dispatch, || {
         for i in 0..40usize {
             trace!("This field is not rate limited!");
-            info!(message = "This message is rate limited", count = &i,);
+            info!(
+                message = "This message is rate limited",
+                count = &i,
+                internal_log_rate_limit = true,
+            );
             std::thread::sleep(std::time::Duration::from_millis(1000));
         }
     })
diff --git a/lib/tracing-limit/examples/by_span.rs b/lib/tracing-limit/examples/by_span.rs
index 0c7e81666d279..63b8775d9905d 100644
--- a/lib/tracing-limit/examples/by_span.rs
+++ b/lib/tracing-limit/examples/by_span.rs
@@ -28,6 +28,7 @@ fn main() {
                         message =
                             "This message is rate limited by its component and vrl_line_number",
                         count = &i,
+                        internal_log_rate_limit = true,
                     );
                 }
             }
diff --git a/lib/tracing-limit/src/lib.rs b/lib/tracing-limit/src/lib.rs
index 3f29cd7fa6c1d..7367f8c8c7612 100644
--- a/lib/tracing-limit/src/lib.rs
+++ b/lib/tracing-limit/src/lib.rs
@@ -129,7 +129,7 @@ where
         let mut limit_visitor = LimitVisitor::default();
         event.record(&mut limit_visitor);
 
-        let limit_exists = limit_visitor.limit.unwrap_or(true);
+        let limit_exists = limit_visitor.limit.unwrap_or(false);
         if !limit_exists {
             return self.inner.on_event(event, ctx);
         }
@@ -264,8 +264,11 @@ where
             let valueset = fields.value_set(&values);
             let event = Event::new(metadata, &valueset);
             self.inner.on_event(&event, ctx.clone());
-        } else if let Some(ratelimit_field) = fields.field(RATE_LIMIT_FIELD) {
-            let values = [(&ratelimit_field, Some(&rate_limit as &dyn Value))];
+        } else {
+            let values = [(
+                &fields.field(RATE_LIMIT_FIELD).unwrap(),
+                Some(&rate_limit as &dyn Value),
+            )];
 
             let valueset = fields.value_set(&values);
             let event = Event::new(metadata, &valueset);
@@ -522,34 +525,6 @@ mod test {
         );
     }
 
-    #[test]
-    fn rate_limits_default() {
-        let events: Arc<Mutex<Vec<String>>> = Default::default();
-
-        let recorder = RecordingLayer::new(Arc::clone(&events));
-        let sub = tracing_subscriber::registry::Registry::default()
-            .with(RateLimitedLayer::new(recorder).with_default_limit(10));
-        tracing::subscriber::with_default(sub, || {
-            for _ in 0..21 {
-                info!(message = "Hello world!");
-                MockClock::advance(Duration::from_millis(100));
-            }
-        });
-
-        let events = events.lock().unwrap();
-
-        assert_eq!(
-            *events,
-            vec![
-                "Hello world!",
-                "Internal log [Hello world!] is being suppressed to avoid flooding.",
-            ]
-            .into_iter()
-            .map(std::borrow::ToOwned::to_owned)
-            .collect::<Vec<String>>()
-        );
-    }
-
     #[test]
     fn override_rate_limit_at_callsite() {
         let events: Arc<Mutex<Vec<String>>> = Default::default();
@@ -559,7 +534,11 @@ mod test {
             .with(RateLimitedLayer::new(recorder).with_default_limit(100));
         tracing::subscriber::with_default(sub, || {
             for _ in 0..21 {
-                info!(message = "Hello world!", internal_log_rate_secs = 1);
+                info!(
+                    message = "Hello world!",
+                    internal_log_rate_limit = true,
+                    internal_log_rate_secs = 1
+                );
                 MockClock::advance(Duration::from_millis(100));
             }
         });
@@ -599,6 +578,7 @@ mod test {
                         let _enter = span.enter();
                         info!(
                             message = format!("Hello {key} on line_number {line_number}!").as_str(),
+                            internal_log_rate_limit = true
                         );
                     }
                 }
@@ -659,6 +639,7 @@ mod test {
                     for line_number in &[1, 2] {
                         info!(
                             message = format!("Hello {key} on line_number {line_number}!").as_str(),
+                            internal_log_rate_limit = true,
                             component_id = &key,
                             vrl_position = &line_number
                         );
diff --git a/lib/vector-buffers/src/internal_events.rs b/lib/vector-buffers/src/internal_events.rs
index 30e92d39135e4..659622415847b 100644
--- a/lib/vector-buffers/src/internal_events.rs
+++ b/lib/vector-buffers/src/internal_events.rs
@@ -177,6 +177,7 @@ impl InternalEvent for BufferReadError {
             error_code = self.error_code,
             error_type = error_type::READER_FAILED,
             stage = "processing",
+            internal_log_rate_limit = true,
         );
         counter!(
             "buffer_errors_total", "error_code" => self.error_code,
diff --git a/lib/vector-common/src/internal_event/component_events_dropped.rs b/lib/vector-common/src/internal_event/component_events_dropped.rs
index f8838911ff8a0..c7d2bd9eedd32 100644
--- a/lib/vector-common/src/internal_event/component_events_dropped.rs
+++ b/lib/vector-common/src/internal_event/component_events_dropped.rs
@@ -58,6 +58,7 @@ impl<const INTENDED: bool> InternalEventHandle for DroppedHandle<'_, INTENDED> {
                 intentional = INTENDED,
                 count = data.0,
                 reason = self.reason,
+                internal_log_rate_limit = true,
             );
         } else {
             error!(
@@ -65,6 +66,7 @@ impl<const INTENDED: bool> InternalEventHandle for DroppedHandle<'_, INTENDED> {
                 intentional = INTENDED,
                 count = data.0,
                 reason = self.reason,
+                internal_log_rate_limit = true,
             );
         }
         self.discarded_events.increment(data.0 as u64);
diff --git a/lib/vector-common/src/internal_event/service.rs b/lib/vector-common/src/internal_event/service.rs
index d6c912f9d3fbc..20132cc99fc61 100644
--- a/lib/vector-common/src/internal_event/service.rs
+++ b/lib/vector-common/src/internal_event/service.rs
@@ -14,6 +14,7 @@ impl<E: std::fmt::Debug> InternalEvent for PollReadyError<E> {
             error = ?self.error,
             error_type = error_type::REQUEST_FAILED,
             stage = error_stage::SENDING,
+            internal_log_rate_limit = true,
         );
         counter!(
             "component_errors_total",
@@ -44,7 +45,7 @@ impl<E: std::fmt::Debug> InternalEvent for CallError<E> {
             request_id = self.request_id,
             error_type = error_type::REQUEST_FAILED,
             stage = error_stage::SENDING,
-
+            internal_log_rate_limit = true,
         );
         counter!(
             "component_errors_total",
diff --git a/src/app.rs b/src/app.rs
index e9b0cc8dff7df..c5c69a8209a9c 100644
--- a/src/app.rs
+++ b/src/app.rs
@@ -615,7 +615,10 @@ pub fn init_logging(color: bool, format: LogFormat, log_level: &str, rate: u64)
     };
 
     trace::init(color, json, &level, rate);
-    debug!(message = "Internal log rate limit configured.",);
+    debug!(
+        message = "Internal log rate limit configured.",
+        internal_log_rate_secs = rate,
+    );
     info!(message = "Log level is enabled.", level = ?level);
 }
 
diff --git a/src/cli.rs b/src/cli.rs
index 93e1dfea4d6bd..279560154585c 100644
--- a/src/cli.rs
+++ b/src/cli.rs
@@ -178,7 +178,6 @@ pub struct RootOpts {
     pub watch_config_poll_interval_seconds: NonZeroU64,
 
     /// Set the internal log rate limit
-    /// Note that traces are throttled by default unless tagged with `internal_log_rate_limit = false`.
     #[arg(
         short,
         long,
diff --git a/src/components/validation/resources/http.rs b/src/components/validation/resources/http.rs
index 59c4504654ce9..0be7d4de4bd3c 100644
--- a/src/components/validation/resources/http.rs
+++ b/src/components/validation/resources/http.rs
@@ -336,11 +336,11 @@ impl HttpResourceOutputContext<'_> {
                                     // entire payload which may contain multiple frames and their delimiters.
                                     Ok(Some((events, decoded_byte_size))) => {
                                         if should_reject {
-                                            info!("HTTP server external output resource decoded {decoded_byte_size} bytes but test case configured to reject.");
+                                            info!(internal_log_rate_limit = true, "HTTP server external output resource decoded {decoded_byte_size:?} bytes but test case configured to reject.", );
                                         } else {
                                             let mut output_runner_metrics =
                                                 output_runner_metrics.lock().await;
-                                            info!("HTTP server external output resource decoded {decoded_byte_size} bytes.");
+                                            info!(internal_log_rate_limit = true, "HTTP server external output resource decoded {decoded_byte_size:?} bytes.");
 
                                             // Update the runner metrics for the received events. This will later
                                             // be used in the Validators, as the "expected" case.
diff --git a/src/config/watcher.rs b/src/config/watcher.rs
index 8e643ba557ceb..641c29343121f 100644
--- a/src/config/watcher.rs
+++ b/src/config/watcher.rs
@@ -121,6 +121,7 @@ pub fn spawn_thread<'a>(
                     info!("Configuration file changed.");
                     if !changed_components.is_empty() {
                         info!(
+                            internal_log_rate_limit = true,
                             "Component {:?} configuration changed.",
                             changed_components.keys()
                         );
@@ -128,19 +129,22 @@ pub fn spawn_thread<'a>(
                             .iter()
                             .all(|(_, t)| *t == ComponentType::EnrichmentTable)
                         {
-                            info!("Only enrichment tables have changed.",);
+                            info!(
+                                internal_log_rate_limit = true,
+                                "Only enrichment tables have changed."
+                            );
                             _ = signal_tx.send(crate::signal::SignalTo::ReloadEnrichmentTables).map_err(|error| {
-                                error!(message = "Unable to reload enrichment tables.", cause = %error)
+                                error!(message = "Unable to reload enrichment tables.", cause = %error, internal_log_rate_limit = true)
                             });
                         } else {
                             _ = signal_tx.send(crate::signal::SignalTo::ReloadComponents(changed_components.into_keys().collect())).map_err(|error| {
-                                error!(message = "Unable to reload component configuration. Restart Vector to reload it.", cause = %error)
+                                error!(message = "Unable to reload component configuration. Restart Vector to reload it.", cause = %error, internal_log_rate_limit = true)
                             });
                         }
                     } else {
                         _ = signal_tx.send(crate::signal::SignalTo::ReloadFromDisk)
                             .map_err(|error| {
-                                error!(message = "Unable to reload configuration file. Restart Vector to reload it.", cause = %error)
+                                error!(message = "Unable to reload configuration file. Restart Vector to reload it.", cause = %error, internal_log_rate_limit = true)
                             });
                     }
                 } else {
diff --git a/src/internal_events/amqp.rs b/src/internal_events/amqp.rs
index 677ec605ea234..c66a3d9087016 100644
--- a/src/internal_events/amqp.rs
+++ b/src/internal_events/amqp.rs
@@ -36,7 +36,7 @@ pub mod source {
                    error = ?self.error,
                    error_type = error_type::REQUEST_FAILED,
                    stage = error_stage::RECEIVING,
-
+                   internal_log_rate_limit = true,
             );
             counter!(
                 "component_errors_total",
@@ -58,7 +58,7 @@ pub mod source {
                    error = ?self.error,
                    error_type = error_type::ACKNOWLEDGMENT_FAILED,
                    stage = error_stage::RECEIVING,
-
+                   internal_log_rate_limit = true,
             );
             counter!(
                 "component_errors_total",
@@ -80,7 +80,7 @@ pub mod source {
                    error = ?self.error,
                    error_type = error_type::COMMAND_FAILED,
                    stage = error_stage::RECEIVING,
-
+                   internal_log_rate_limit = true,
             );
             counter!(
                 "component_errors_total",
diff --git a/src/internal_events/apache_metrics.rs b/src/internal_events/apache_metrics.rs
index 849741e44dd41..79ae7dced79b4 100644
--- a/src/internal_events/apache_metrics.rs
+++ b/src/internal_events/apache_metrics.rs
@@ -46,7 +46,7 @@ impl InternalEvent for ApacheMetricsParseError<'_> {
             stage = error_stage::PROCESSING,
             error_type = error_type::PARSER_FAILED,
             endpoint = %self.endpoint,
-
+            internal_log_rate_limit = true,
         );
         counter!(
             "component_errors_total",
diff --git a/src/internal_events/aws_cloudwatch_logs.rs b/src/internal_events/aws_cloudwatch_logs.rs
index d8c4838dab7e1..d4bfe0328a53b 100644
--- a/src/internal_events/aws_cloudwatch_logs.rs
+++ b/src/internal_events/aws_cloudwatch_logs.rs
@@ -18,6 +18,7 @@ impl InternalEvent for AwsCloudwatchLogsMessageSizeError {
             error_code = "message_too_long",
             error_type = error_type::ENCODER_FAILED,
             stage = error_stage::PROCESSING,
+            internal_log_rate_limit = true,
         );
         counter!(
             "component_errors_total",
diff --git a/src/internal_events/aws_ec2_metadata.rs b/src/internal_events/aws_ec2_metadata.rs
index 3eafadf20222d..3e0996a3c9f60 100644
--- a/src/internal_events/aws_ec2_metadata.rs
+++ b/src/internal_events/aws_ec2_metadata.rs
@@ -24,7 +24,7 @@ impl InternalEvent for AwsEc2MetadataRefreshError {
             error = %self.error,
             error_type = error_type::REQUEST_FAILED,
             stage = error_stage::PROCESSING,
-
+            internal_log_rate_limit = true,
         );
         counter!(
             "component_errors_total",
diff --git a/src/internal_events/aws_ecs_metrics.rs b/src/internal_events/aws_ecs_metrics.rs
index 969c5c33aa2e6..1a2f7133094ce 100644
--- a/src/internal_events/aws_ecs_metrics.rs
+++ b/src/internal_events/aws_ecs_metrics.rs
@@ -50,12 +50,12 @@ impl InternalEvent for AwsEcsMetricsParseError<'_> {
             error = ?self.error,
             stage = error_stage::PROCESSING,
             error_type = error_type::PARSER_FAILED,
-
+            internal_log_rate_limit = true,
         );
         debug!(
             message = %format!("Failed to parse response:\\n\\n{}\\n\\n", self.body.escape_debug()),
             endpoint = %self.endpoint,
-
+            internal_log_rate_limit = true,
         );
         counter!("parse_errors_total").increment(1);
         counter!(
diff --git a/src/internal_events/aws_kinesis.rs b/src/internal_events/aws_kinesis.rs
index fd5f73bb7e11f..332f55d08b25e 100644
--- a/src/internal_events/aws_kinesis.rs
+++ b/src/internal_events/aws_kinesis.rs
@@ -17,7 +17,7 @@ impl InternalEvent for AwsKinesisStreamNoPartitionKeyError<'_> {
             partition_key_field = %self.partition_key_field,
             error_type = error_type::PARSER_FAILED,
             stage = error_stage::PROCESSING,
-
+            internal_log_rate_limit = true,
         );
 
         counter!(
diff --git a/src/internal_events/aws_kinesis_firehose.rs b/src/internal_events/aws_kinesis_firehose.rs
index 317435696b799..d98d5ed5fa1c4 100644
--- a/src/internal_events/aws_kinesis_firehose.rs
+++ b/src/internal_events/aws_kinesis_firehose.rs
@@ -48,6 +48,7 @@ impl InternalEvent for AwsKinesisFirehoseRequestError<'_> {
             error_type = error_type::REQUEST_FAILED,
             error_code = %self.error_code,
             request_id = %self.request_id.unwrap_or(""),
+            internal_log_rate_limit = true,
         );
         counter!(
             "component_errors_total",
@@ -74,7 +75,7 @@ impl InternalEvent for AwsKinesisFirehoseAutomaticRecordDecodeError {
             error_type = error_type::PARSER_FAILED,
             error_code = %io_error_code(&self.error),
             compression = %self.compression,
-
+            internal_log_rate_limit = true,
         );
         counter!(
             "component_errors_total",
diff --git a/src/internal_events/aws_sqs.rs b/src/internal_events/aws_sqs.rs
index 37f4ea98d25ec..490a65f004190 100644
--- a/src/internal_events/aws_sqs.rs
+++ b/src/internal_events/aws_sqs.rs
@@ -30,7 +30,7 @@ mod s3 {
                 error_code = "failed_processing_sqs_message",
                 error_type = error_type::PARSER_FAILED,
                 stage = error_stage::PROCESSING,
-
+                internal_log_rate_limit = true,
             );
             counter!(
                 "component_errors_total",
@@ -74,7 +74,7 @@ mod s3 {
                 error_code = "failed_deleting_some_sqs_messages",
                 error_type = error_type::ACKNOWLEDGMENT_FAILED,
                 stage = error_stage::PROCESSING,
-
+                internal_log_rate_limit = true,
             );
             counter!(
                 "component_errors_total",
@@ -104,7 +104,7 @@ mod s3 {
                 error_code = "failed_deleting_all_sqs_messages",
                 error_type = error_type::ACKNOWLEDGMENT_FAILED,
                 stage = error_stage::PROCESSING,
-
+                internal_log_rate_limit = true,
             );
             counter!(
                 "component_errors_total",
@@ -204,7 +204,7 @@ impl<E: std::fmt::Display> InternalEvent for SqsMessageReceiveError<'_, E> {
             error_code = "failed_fetching_sqs_events",
             error_type = error_type::REQUEST_FAILED,
             stage = error_stage::RECEIVING,
-
+            internal_log_rate_limit = true,
         );
         counter!(
             "component_errors_total",
@@ -257,7 +257,7 @@ impl<E: std::fmt::Display> InternalEvent for SqsMessageDeleteError<'_, E> {
             error = %self.error,
             error_type = error_type::WRITER_FAILED,
             stage = error_stage::PROCESSING,
-
+            internal_log_rate_limit = true,
         );
         counter!(
             "component_errors_total",
diff --git a/src/internal_events/batch.rs b/src/internal_events/batch.rs
index 5afc99d47f1bf..816afa4398d5f 100644
--- a/src/internal_events/batch.rs
+++ b/src/internal_events/batch.rs
@@ -17,7 +17,7 @@ impl InternalEvent for LargeEventDroppedError {
             length = %self.length,
             error_type = error_type::CONDITION_FAILED,
             stage = error_stage::SENDING,
-
+            internal_log_rate_limit = true,
         );
         counter!(
             "component_errors_total",
diff --git a/src/internal_events/codecs.rs b/src/internal_events/codecs.rs
index e876db1dab5ab..50251bf089cd3 100644
--- a/src/internal_events/codecs.rs
+++ b/src/internal_events/codecs.rs
@@ -15,7 +15,7 @@ impl<E: std::fmt::Display> InternalEvent for DecoderFramingError<E> {
             error_code = "decoder_frame",
             error_type = error_type::PARSER_FAILED,
             stage = error_stage::PROCESSING,
-
+            internal_log_rate_limit = true,
         );
         counter!(
             "component_errors_total",
@@ -40,7 +40,7 @@ impl InternalEvent for DecoderDeserializeError<'_> {
             error_code = "decoder_deserialize",
             error_type = error_type::PARSER_FAILED,
             stage = error_stage::PROCESSING,
-
+            internal_log_rate_limit = true,
         );
         counter!(
             "component_errors_total",
@@ -66,7 +66,7 @@ impl InternalEvent for EncoderFramingError<'_> {
             error_code = "encoder_frame",
             error_type = error_type::ENCODER_FAILED,
             stage = error_stage::SENDING,
-
+            internal_log_rate_limit = true,
         );
         counter!(
             "component_errors_total",
@@ -93,7 +93,7 @@ impl InternalEvent for EncoderSerializeError<'_> {
             error_code = "encoder_serialize",
             error_type = error_type::ENCODER_FAILED,
             stage = error_stage::SENDING,
-
+            internal_log_rate_limit = true,
         );
         counter!(
             "component_errors_total",
@@ -120,7 +120,7 @@ impl<E: std::fmt::Display> InternalEvent for EncoderWriteError<'_, E> {
             error = %self.error,
             error_type = error_type::IO_FAILED,
             stage = error_stage::SENDING,
-
+            internal_log_rate_limit = true,
         );
         counter!(
             "component_errors_total",
diff --git a/src/internal_events/common.rs b/src/internal_events/common.rs
index f342710daedb2..78971840d7dba 100644
--- a/src/internal_events/common.rs
+++ b/src/internal_events/common.rs
@@ -66,7 +66,7 @@ impl<E: std::error::Error> InternalEvent for SocketOutgoingConnectionError<E> {
             error_code = "failed_connecting",
             error_type = error_type::CONNECTION_FAILED,
             stage = error_stage::SENDING,
-
+            internal_log_rate_limit = true,
         );
         counter!(
             "component_errors_total",
@@ -92,6 +92,7 @@ impl InternalEvent for StreamClosedError {
             error_code = STREAM_CLOSED,
             error_type = error_type::WRITER_FAILED,
             stage = error_stage::SENDING,
+            internal_log_rate_limit = true,
         );
         counter!(
             "component_errors_total",
@@ -136,7 +137,7 @@ impl<E: std::fmt::Display> InternalEvent for SinkRequestBuildError<E> {
             error = %self.error,
             error_type = error_type::ENCODER_FAILED,
             stage = error_stage::PROCESSING,
-
+            internal_log_rate_limit = true,
         );
         counter!(
             "component_errors_total",
diff --git a/src/internal_events/conditions.rs b/src/internal_events/conditions.rs
index 0f7cb70962b08..bf825213c6719 100644
--- a/src/internal_events/conditions.rs
+++ b/src/internal_events/conditions.rs
@@ -14,6 +14,7 @@ impl InternalEvent for VrlConditionExecutionError<'_> {
             error = %self.error,
             error_type = error_type::SCRIPT_FAILED,
             stage = error_stage::PROCESSING,
+            internal_log_rate_limit = true,
         );
         counter!(
             "component_errors_total",
diff --git a/src/internal_events/datadog_agent.rs b/src/internal_events/datadog_agent.rs
index 686e3e0e3179c..02f017bc076bb 100644
--- a/src/internal_events/datadog_agent.rs
+++ b/src/internal_events/datadog_agent.rs
@@ -15,7 +15,7 @@ impl InternalEvent for DatadogAgentJsonParseError<'_> {
             error = ?self.error,
             error_type = error_type::PARSER_FAILED,
             stage = error_stage::PROCESSING,
-
+            internal_log_rate_limit = true,
         );
         counter!(
             "component_errors_total",
diff --git a/src/internal_events/datadog_metrics.rs b/src/internal_events/datadog_metrics.rs
index 03812c2c81def..8875b29281ac7 100644
--- a/src/internal_events/datadog_metrics.rs
+++ b/src/internal_events/datadog_metrics.rs
@@ -17,6 +17,7 @@ impl InternalEvent for DatadogMetricsEncodingError<'_> {
             error_type = error_type::ENCODER_FAILED,
             intentional = "false",
             stage = error_stage::PROCESSING,
+            internal_log_rate_limit = true,
         );
         counter!(
             "component_errors_total",
diff --git a/src/internal_events/datadog_traces.rs b/src/internal_events/datadog_traces.rs
index aee946528391b..dd1df213cdf06 100644
--- a/src/internal_events/datadog_traces.rs
+++ b/src/internal_events/datadog_traces.rs
@@ -18,7 +18,7 @@ impl InternalEvent for DatadogTracesEncodingError {
             error_reason = %self.error_reason,
             error_type = error_type::ENCODER_FAILED,
             stage = error_stage::PROCESSING,
-
+            internal_log_rate_limit = true,
         );
         counter!(
             "component_errors_total",
@@ -48,7 +48,7 @@ impl<E: std::fmt::Display> InternalEvent for DatadogTracesAPMStatsError<E> {
             error = %self.error,
             error_type = error_type::WRITER_FAILED,
             stage = error_stage::SENDING,
-
+            internal_log_rate_limit = true,
         );
         counter!(
             "component_errors_total",
diff --git a/src/internal_events/dnstap.rs b/src/internal_events/dnstap.rs
index adf9ea8688d6c..231a6527830d7 100644
--- a/src/internal_events/dnstap.rs
+++ b/src/internal_events/dnstap.rs
@@ -14,7 +14,7 @@ impl<E: std::fmt::Display> InternalEvent for DnstapParseError<E> {
             error = %self.error,
             stage = error_stage::PROCESSING,
             error_type = error_type::PARSER_FAILED,
-
+            internal_log_rate_limit = true,
         );
         counter!(
             "component_errors_total",
diff --git a/src/internal_events/docker_logs.rs b/src/internal_events/docker_logs.rs
index f1daaa6c2d4f4..81950b1fa947a 100644
--- a/src/internal_events/docker_logs.rs
+++ b/src/internal_events/docker_logs.rs
@@ -170,7 +170,7 @@ impl InternalEvent for DockerLogsLoggingDriverUnsupportedError<'_> {
             error_type = error_type::CONFIGURATION_FAILED,
             stage = error_stage::RECEIVING,
             container_id = ?self.container_id,
-
+            internal_log_rate_limit = true,
         );
         counter!(
             "component_errors_total",
diff --git a/src/internal_events/encoding_transcode.rs b/src/internal_events/encoding_transcode.rs
index 869423fb98241..0a377f52ca1ee 100644
--- a/src/internal_events/encoding_transcode.rs
+++ b/src/internal_events/encoding_transcode.rs
@@ -27,6 +27,7 @@ impl InternalEvent for DecoderMalformedReplacement {
         warn!(
             message = "Replaced malformed sequences with replacement character while decoding to utf8.",
             from_encoding = %self.from_encoding,
+            internal_log_rate_limit = true
         );
         // NOT the actual number of replacements in the output: there's no easy
         // way to get that from the lib we use here (encoding_rs)
diff --git a/src/internal_events/eventstoredb_metrics.rs b/src/internal_events/eventstoredb_metrics.rs
index 7ee7f36cf9f50..b5d7fadd088dc 100644
--- a/src/internal_events/eventstoredb_metrics.rs
+++ b/src/internal_events/eventstoredb_metrics.rs
@@ -14,7 +14,7 @@ impl InternalEvent for EventStoreDbMetricsHttpError {
             error = ?self.error,
             stage = error_stage::RECEIVING,
             error_type = error_type::REQUEST_FAILED,
-
+            internal_log_rate_limit = true,
         );
         counter!(
             "component_errors_total",
@@ -37,7 +37,7 @@ impl InternalEvent for EventStoreDbStatsParsingError {
             error = ?self.error,
             stage = error_stage::PROCESSING,
             error_type = error_type::PARSER_FAILED,
-
+            internal_log_rate_limit = true,
         );
         counter!(
             "component_errors_total",
diff --git a/src/internal_events/exec.rs b/src/internal_events/exec.rs
index 1cb656cd493c6..fea1f498b725f 100644
--- a/src/internal_events/exec.rs
+++ b/src/internal_events/exec.rs
@@ -53,7 +53,7 @@ impl InternalEvent for ExecFailedError<'_> {
             error_type = error_type::COMMAND_FAILED,
             error_code = %io_error_code(&self.error),
             stage = error_stage::RECEIVING,
-
+            internal_log_rate_limit = true,
         );
         counter!(
             "component_errors_total",
@@ -82,7 +82,7 @@ impl InternalEvent for ExecTimeoutError<'_> {
             error = %self.error,
             error_type = error_type::TIMED_OUT,
             stage = error_stage::RECEIVING,
-
+            internal_log_rate_limit = true,
         );
         counter!(
             "component_errors_total",
@@ -118,7 +118,7 @@ impl InternalEvent for ExecCommandExecuted<'_> {
             command = %self.command,
             exit_status = %exit_status,
             elapsed_millis = %self.exec_duration.as_millis(),
-
+            internal_log_rate_limit = true,
         );
         counter!(
             "command_executed_total",
@@ -194,7 +194,7 @@ impl InternalEvent for ExecFailedToSignalChildError<'_> {
             error_code = %self.error.to_error_code(),
             error_type = error_type::COMMAND_FAILED,
             stage = error_stage::RECEIVING,
-
+            internal_log_rate_limit = true,
         );
         counter!(
             "component_errors_total",
@@ -216,6 +216,7 @@ impl InternalEvent for ExecChannelClosedError {
             message = exec_reason,
             error_type = error_type::COMMAND_FAILED,
             stage = error_stage::RECEIVING,
+            internal_log_rate_limit = true,
         );
         counter!(
             "component_errors_total",
diff --git a/src/internal_events/expansion.rs b/src/internal_events/expansion.rs
index 4077d4c25f8ab..62a96afca1068 100644
--- a/src/internal_events/expansion.rs
+++ b/src/internal_events/expansion.rs
@@ -19,7 +19,7 @@ impl InternalEvent for PairExpansionError<'_> {
                 error = %self.error,
                 error_type = error_type::PARSER_FAILED,
                 stage = error_stage::PROCESSING,
-
+                internal_log_rate_limit = true,
             );
 
             counter!(
@@ -39,7 +39,7 @@ impl InternalEvent for PairExpansionError<'_> {
                 error = %self.error,
                 error_type = error_type::PARSER_FAILED,
                 stage = error_stage::PROCESSING,
-
+                internal_log_rate_limit = true,
             );
         }
     }
diff --git a/src/internal_events/file.rs b/src/internal_events/file.rs
index c6d80460143f2..4697c93c89ca7 100644
--- a/src/internal_events/file.rs
+++ b/src/internal_events/file.rs
@@ -83,6 +83,7 @@ impl<P: std::fmt::Debug> InternalEvent for FileIoError<'_, P> {
             error_code = %self.code,
             error_type = error_type::IO_FAILED,
             stage = error_stage::SENDING,
+            internal_log_rate_limit = true,
         );
         counter!(
             "component_errors_total",
@@ -223,7 +224,7 @@ mod source {
                 error_code = "reading_fingerprint",
                 error_type = error_type::READER_FAILED,
                 stage = error_stage::RECEIVING,
-
+                internal_log_rate_limit = true,
             );
             if self.include_file_metric_tag {
                 counter!(
@@ -263,6 +264,7 @@ mod source {
                 error_code = DELETION_FAILED,
                 error_type = error_type::COMMAND_FAILED,
                 stage = error_stage::RECEIVING,
+                internal_log_rate_limit = true,
             );
             if self.include_file_metric_tag {
                 counter!(
@@ -355,7 +357,7 @@ mod source {
                 error_type = error_type::COMMAND_FAILED,
                 stage = error_stage::RECEIVING,
                 file = %self.file.display(),
-
+                internal_log_rate_limit = true,
             );
             if self.include_file_metric_tag {
                 counter!(
@@ -457,7 +459,7 @@ mod source {
                 error_code = "writing_checkpoints",
                 error_type = error_type::WRITER_FAILED,
                 stage = error_stage::RECEIVING,
-
+                internal_log_rate_limit = true,
             );
             counter!(
                 "component_errors_total",
@@ -484,6 +486,7 @@ mod source {
                 error_type = error_type::READER_FAILED,
                 stage = error_stage::RECEIVING,
                 path = %self.path.display(),
+                internal_log_rate_limit = true,
             );
             counter!(
                 "component_errors_total",
diff --git a/src/internal_events/fluent.rs b/src/internal_events/fluent.rs
index aa0d26610b72a..3493db9cd762d 100644
--- a/src/internal_events/fluent.rs
+++ b/src/internal_events/fluent.rs
@@ -30,7 +30,7 @@ impl InternalEvent for FluentMessageDecodeError<'_> {
             base64_encoded_message = %self.base64_encoded_message,
             error_type = error_type::PARSER_FAILED,
             stage = error_stage::PROCESSING,
-
+            internal_log_rate_limit = true,
         );
         counter!(
             "component_errors_total",
diff --git a/src/internal_events/gcp_pubsub.rs b/src/internal_events/gcp_pubsub.rs
index be3f274e8d225..1f6a7b5253514 100644
--- a/src/internal_events/gcp_pubsub.rs
+++ b/src/internal_events/gcp_pubsub.rs
@@ -14,7 +14,7 @@ impl InternalEvent for GcpPubsubConnectError {
             error_code = "failed_connecting",
             error_type = error_type::CONNECTION_FAILED,
             stage = error_stage::RECEIVING,
-
+            internal_log_rate_limit = true,
         );
 
         counter!(
@@ -39,7 +39,7 @@ impl InternalEvent for GcpPubsubStreamingPullError {
             error_code = "failed_streaming_pull",
             error_type = error_type::REQUEST_FAILED,
             stage = error_stage::RECEIVING,
-
+            internal_log_rate_limit = true,
         );
 
         counter!(
@@ -64,7 +64,7 @@ impl InternalEvent for GcpPubsubReceiveError {
             error_code = "failed_fetching_events",
             error_type = error_type::REQUEST_FAILED,
             stage = error_stage::RECEIVING,
-
+            internal_log_rate_limit = true,
         );
 
         counter!(
diff --git a/src/internal_events/host_metrics.rs b/src/internal_events/host_metrics.rs
index 56d5649159dfb..3352e529edf0a 100644
--- a/src/internal_events/host_metrics.rs
+++ b/src/internal_events/host_metrics.rs
@@ -13,6 +13,7 @@ impl InternalEvent for HostMetricsScrapeError {
             message = self.message,
             error_type = error_type::READER_FAILED,
             stage = error_stage::RECEIVING,
+            internal_log_rate_limit = true,
         );
 
         counter!(
@@ -37,7 +38,7 @@ impl<E: std::fmt::Display> InternalEvent for HostMetricsScrapeDetailError<E> {
             error = %self.error,
             error_type = error_type::READER_FAILED,
             stage = error_stage::RECEIVING,
-
+            internal_log_rate_limit = true,
         );
 
         counter!(
@@ -64,7 +65,7 @@ impl InternalEvent for HostMetricsScrapeFilesystemError {
             error = %self.error,
             error_type = error_type::READER_FAILED,
             stage = error_stage::RECEIVING,
-
+            internal_log_rate_limit = true,
         );
 
         counter!(
diff --git a/src/internal_events/http.rs b/src/internal_events/http.rs
index 5a1e818dcc484..b2b3bfec4ad95 100644
--- a/src/internal_events/http.rs
+++ b/src/internal_events/http.rs
@@ -127,7 +127,7 @@ impl InternalEvent for HttpBadRequest<'_> {
             error_type = error_type::REQUEST_FAILED,
             error_stage = error_stage::RECEIVING,
             http_code = %self.code,
-
+            internal_log_rate_limit = true,
         );
         counter!(
             "component_errors_total",
diff --git a/src/internal_events/http_client.rs b/src/internal_events/http_client.rs
index 4aabe421d083c..a35d290395be3 100644
--- a/src/internal_events/http_client.rs
+++ b/src/internal_events/http_client.rs
@@ -86,7 +86,7 @@ impl InternalEvent for GotHttpWarning<'_> {
             error = %self.error,
             error_type = error_type::REQUEST_FAILED,
             stage = error_stage::PROCESSING,
-
+            internal_log_rate_limit = true,
         );
         counter!("http_client_errors_total", "error_kind" => self.error.to_string()).increment(1);
         histogram!("http_client_rtt_seconds").record(self.roundtrip);
diff --git a/src/internal_events/http_client_source.rs b/src/internal_events/http_client_source.rs
index ad1b989d3969a..376adf35eda56 100644
--- a/src/internal_events/http_client_source.rs
+++ b/src/internal_events/http_client_source.rs
@@ -49,7 +49,7 @@ impl InternalEvent for HttpClientHttpResponseError {
             stage = error_stage::RECEIVING,
             error_type = error_type::REQUEST_FAILED,
             error_code = %http_error_code(self.code.as_u16()),
-
+            internal_log_rate_limit = true,
         );
         counter!(
             "component_errors_total",
@@ -76,7 +76,7 @@ impl InternalEvent for HttpClientHttpError {
             error = ?self.error,
             error_type = error_type::REQUEST_FAILED,
             stage = error_stage::RECEIVING,
-
+            internal_log_rate_limit = true,
         );
         counter!(
             "component_errors_total",
diff --git a/src/internal_events/influxdb.rs b/src/internal_events/influxdb.rs
index d487353b8dc68..007f5565f1a8f 100644
--- a/src/internal_events/influxdb.rs
+++ b/src/internal_events/influxdb.rs
@@ -16,6 +16,7 @@ impl InternalEvent for InfluxdbEncodingError {
             error = %self.error_message,
             error_type = error_type::ENCODER_FAILED,
             stage = error_stage::PROCESSING,
+            internal_log_rate_limit = true,
         );
         counter!(
             "component_errors_total",
diff --git a/src/internal_events/journald.rs b/src/internal_events/journald.rs
index 9f7e9a694f9ca..f467137186baa 100644
--- a/src/internal_events/journald.rs
+++ b/src/internal_events/journald.rs
@@ -17,7 +17,7 @@ impl InternalEvent for JournaldInvalidRecordError {
             text = %self.text,
             error_type = error_type::PARSER_FAILED,
             stage = error_stage::PROCESSING,
-
+            internal_log_rate_limit = true,
         );
         counter!(
             "component_errors_total",
@@ -40,7 +40,7 @@ impl InternalEvent for JournaldStartJournalctlError {
             error = %self.error,
             error_type = error_type::COMMAND_FAILED,
             stage = error_stage::RECEIVING,
-
+            internal_log_rate_limit = true,
         );
         counter!(
             "component_errors_total",
@@ -63,7 +63,7 @@ impl InternalEvent for JournaldReadError {
             error = %self.error,
             error_type = error_type::READER_FAILED,
             stage = error_stage::PROCESSING,
-
+            internal_log_rate_limit = true,
         );
         counter!(
             "component_errors_total",
@@ -88,6 +88,7 @@ impl InternalEvent for JournaldCheckpointSetError {
             error = %self.error,
             error_type = error_type::IO_FAILED,
             stage = error_stage::PROCESSING,
+            internal_log_rate_limit = true,
         );
         counter!(
             "component_errors_total",
@@ -112,7 +113,7 @@ impl InternalEvent for JournaldCheckpointFileOpenError {
             error = %self.error,
             error_type = error_type::IO_FAILED,
             stage = error_stage::RECEIVING,
-
+            internal_log_rate_limit = true,
         );
         counter!(
             "component_errors_total",
diff --git a/src/internal_events/kafka.rs b/src/internal_events/kafka.rs
index 05e06ea5161ff..ea1b198be7053 100644
--- a/src/internal_events/kafka.rs
+++ b/src/internal_events/kafka.rs
@@ -78,7 +78,7 @@ impl InternalEvent for KafkaOffsetUpdateError {
             error_code = "kafka_offset_update",
             error_type = error_type::READER_FAILED,
             stage = error_stage::SENDING,
-
+            internal_log_rate_limit = true,
         );
         counter!(
             "component_errors_total",
@@ -103,7 +103,7 @@ impl InternalEvent for KafkaReadError {
             error_code = "reading_message",
             error_type = error_type::READER_FAILED,
             stage = error_stage::RECEIVING,
-
+            internal_log_rate_limit = true,
         );
         counter!(
             "component_errors_total",
@@ -163,6 +163,7 @@ impl InternalEvent for KafkaHeaderExtractionError<'_> {
             error_type = error_type::PARSER_FAILED,
             stage = error_stage::RECEIVING,
             header_field = self.header_field.to_string(),
+            internal_log_rate_limit = true,
         );
         counter!(
             "component_errors_total",
diff --git a/src/internal_events/kubernetes_logs.rs b/src/internal_events/kubernetes_logs.rs
index ed68c14790656..39d27649cef5e 100644
--- a/src/internal_events/kubernetes_logs.rs
+++ b/src/internal_events/kubernetes_logs.rs
@@ -71,7 +71,7 @@ impl InternalEvent for KubernetesLogsEventAnnotationError<'_> {
             error_code = ANNOTATION_FAILED,
             error_type = error_type::READER_FAILED,
             stage = error_stage::PROCESSING,
-
+            internal_log_rate_limit = true,
         );
         counter!(
             "component_errors_total",
@@ -96,7 +96,7 @@ impl InternalEvent for KubernetesLogsEventNamespaceAnnotationError<'_> {
             error_code = ANNOTATION_FAILED,
             error_type = error_type::READER_FAILED,
             stage = error_stage::PROCESSING,
-
+            internal_log_rate_limit = true,
         );
         counter!(
             "component_errors_total",
@@ -122,7 +122,7 @@ impl InternalEvent for KubernetesLogsEventNodeAnnotationError<'_> {
             error_code = ANNOTATION_FAILED,
             error_type = error_type::READER_FAILED,
             stage = error_stage::PROCESSING,
-
+            internal_log_rate_limit = true,
         );
         counter!(
             "component_errors_total",
@@ -162,7 +162,7 @@ impl InternalEvent for KubernetesLogsDockerFormatParseError<'_> {
             error = %self.error,
             error_type = error_type::PARSER_FAILED,
             stage = error_stage::PROCESSING,
-
+            internal_log_rate_limit = true,
         );
         counter!(
             "component_errors_total",
@@ -191,7 +191,7 @@ impl<E: std::fmt::Display> InternalEvent for KubernetesLifecycleError<E> {
             error_code = KUBERNETES_LIFECYCLE,
             error_type = error_type::READER_FAILED,
             stage = error_stage::PROCESSING,
-
+            internal_log_rate_limit = true,
         );
         counter!(
             "component_errors_total",
diff --git a/src/internal_events/logplex.rs b/src/internal_events/logplex.rs
index b08df7c624d4f..160947fb0d147 100644
--- a/src/internal_events/logplex.rs
+++ b/src/internal_events/logplex.rs
@@ -36,7 +36,7 @@ impl InternalEvent for HerokuLogplexRequestReadError {
             error_type = error_type::READER_FAILED,
             error_code = io_error_code(&self.error),
             stage = error_stage::PROCESSING,
-
+            internal_log_rate_limit = true,
         );
         counter!(
             "component_errors_total",
diff --git a/src/internal_events/loki.rs b/src/internal_events/loki.rs
index 6a5e7567b65b2..2c95d524c655f 100644
--- a/src/internal_events/loki.rs
+++ b/src/internal_events/loki.rs
@@ -12,6 +12,7 @@ impl InternalEvent for LokiEventUnlabeledError {
             error_code = "unlabeled_event",
             error_type = error_type::CONDITION_FAILED,
             stage = error_stage::PROCESSING,
+            internal_log_rate_limit = true,
         );
 
         counter!(
@@ -38,6 +39,7 @@ impl InternalEvent for LokiOutOfOrderEventDroppedError {
             error_code = "out_of_order",
             error_type = error_type::CONDITION_FAILED,
             stage = error_stage::PROCESSING,
+            internal_log_rate_limit = true,
         );
 
         emit!(ComponentEventsDropped::<INTENTIONAL> {
@@ -66,6 +68,7 @@ impl InternalEvent for LokiOutOfOrderEventRewritten {
             message = "Timestamps rewritten.",
             count = self.count,
             reason = "out_of_order",
+            internal_log_rate_limit = true,
         );
         counter!("rewritten_timestamp_events_total").increment(self.count as u64);
     }
@@ -83,6 +86,7 @@ impl InternalEvent for LokiTimestampNonParsableEventsDropped {
             error_code = "non-parsable_timestamp",
             error_type = error_type::CONDITION_FAILED,
             stage = error_stage::PROCESSING,
+            internal_log_rate_limit = true,
         );
 
         emit!(ComponentEventsDropped::<INTENTIONAL> { count: 1, reason });
diff --git a/src/internal_events/lua.rs b/src/internal_events/lua.rs
index 392f1b8b26199..2805b5b57917d 100644
--- a/src/internal_events/lua.rs
+++ b/src/internal_events/lua.rs
@@ -28,6 +28,7 @@ impl InternalEvent for LuaScriptError {
             error_code = mlua_error_code(&self.error),
             error_type = error_type::COMMAND_FAILED,
             stage = error_stage::PROCESSING,
+            internal_log_rate_limit = true,
         );
         counter!(
             "component_errors_total",
@@ -57,7 +58,7 @@ impl InternalEvent for LuaBuildError {
             error_type = error_type::SCRIPT_FAILED,
             error_code = lua_build_error_code(&self.error),
             stage = error_stage::PROCESSING,
-
+            internal_log_rate_limit = true,
         );
         counter!(
             "component_errors_total",
diff --git a/src/internal_events/metric_to_log.rs b/src/internal_events/metric_to_log.rs
index 5bbceeb5017c6..79a9d117054a8 100644
--- a/src/internal_events/metric_to_log.rs
+++ b/src/internal_events/metric_to_log.rs
@@ -16,6 +16,7 @@ impl InternalEvent for MetricToLogSerializeError {
             error = ?self.error,
             error_type = error_type::ENCODER_FAILED,
             stage = error_stage::PROCESSING,
+            internal_log_rate_limit = true
         );
         counter!(
             "component_errors_total",
diff --git a/src/internal_events/mongodb_metrics.rs b/src/internal_events/mongodb_metrics.rs
index cf57b7af94e6a..8d292342d3f0d 100644
--- a/src/internal_events/mongodb_metrics.rs
+++ b/src/internal_events/mongodb_metrics.rs
@@ -48,7 +48,7 @@ impl InternalEvent for MongoDbMetricsRequestError<'_> {
             error = ?self.error,
             error_type = error_type::REQUEST_FAILED,
             stage = error_stage::RECEIVING,
-
+            internal_log_rate_limit = true,
         );
         counter!(
             "component_errors_total",
@@ -72,7 +72,7 @@ impl InternalEvent for MongoDbMetricsBsonParseError<'_> {
             error = ?self.error,
             error_type = error_type::PARSER_FAILED,
             stage = error_stage::RECEIVING,
-
+            internal_log_rate_limit = true,
         );
         counter!(
             "component_errors_total",
diff --git a/src/internal_events/mqtt.rs b/src/internal_events/mqtt.rs
index 507f4aea2464c..d20ccad0bad98 100644
--- a/src/internal_events/mqtt.rs
+++ b/src/internal_events/mqtt.rs
@@ -18,7 +18,7 @@ impl InternalEvent for MqttConnectionError {
             error_code = "mqtt_connection_error",
             error_type = error_type::WRITER_FAILED,
             stage = error_stage::SENDING,
-
+            internal_log_rate_limit = true,
         );
         counter!(
             "component_errors_total",
diff --git a/src/internal_events/nginx_metrics.rs b/src/internal_events/nginx_metrics.rs
index d6561ccf21096..02f3309aec3a1 100644
--- a/src/internal_events/nginx_metrics.rs
+++ b/src/internal_events/nginx_metrics.rs
@@ -48,7 +48,7 @@ impl InternalEvent for NginxMetricsRequestError<'_> {
             error = %self.error,
             error_type = error_type::REQUEST_FAILED,
             stage = error_stage::RECEIVING,
-
+            internal_log_rate_limit = true,
         );
         counter!(
             "component_errors_total",
@@ -73,7 +73,7 @@ impl InternalEvent for NginxMetricsStubStatusParseError<'_> {
             error = %self.error,
             error_type = error_type::PARSER_FAILED,
             stage = error_stage::PROCESSING,
-
+            internal_log_rate_limit = true,
         );
         counter!(
             "component_errors_total",
diff --git a/src/internal_events/parser.rs b/src/internal_events/parser.rs
index 3638ab4189e7b..84cd0556b4821 100644
--- a/src/internal_events/parser.rs
+++ b/src/internal_events/parser.rs
@@ -30,6 +30,7 @@ impl InternalEvent for ParserMatchError<'_> {
             error_type = error_type::CONDITION_FAILED,
             stage = error_stage::PROCESSING,
             field = &truncate_string_at(&String::from_utf8_lossy(self.value), 60)[..],
+            internal_log_rate_limit = true
         );
         counter!(
             "component_errors_total",
diff --git a/src/internal_events/postgresql_metrics.rs b/src/internal_events/postgresql_metrics.rs
index d7979f8dd1185..8843140cb54e7 100644
--- a/src/internal_events/postgresql_metrics.rs
+++ b/src/internal_events/postgresql_metrics.rs
@@ -16,7 +16,7 @@ impl InternalEvent for PostgresqlMetricsCollectError<'_> {
             error_type = error_type::REQUEST_FAILED,
             stage = error_stage::RECEIVING,
             endpoint = %self.endpoint,
-
+            internal_log_rate_limit = true,
         );
         counter!(
             "component_errors_total",
diff --git a/src/internal_events/process.rs b/src/internal_events/process.rs
index ef30c1ea9e7e2..5a54154eca849 100644
--- a/src/internal_events/process.rs
+++ b/src/internal_events/process.rs
@@ -73,6 +73,7 @@ impl InternalEvent for VectorReloadError {
             error_code = "reload",
             error_type = error_type::CONFIGURATION_FAILED,
             stage = error_stage::PROCESSING,
+            internal_log_rate_limit = true,
         );
         counter!(
             "component_errors_total",
@@ -94,6 +95,7 @@ impl InternalEvent for VectorConfigLoadError {
             error_code = "config_load",
             error_type = error_type::CONFIGURATION_FAILED,
             stage = error_stage::PROCESSING,
+            internal_log_rate_limit = true,
         );
         counter!(
             "component_errors_total",
@@ -115,6 +117,7 @@ impl InternalEvent for VectorRecoveryError {
             error_code = "recovery",
             error_type = error_type::CONFIGURATION_FAILED,
             stage = error_stage::PROCESSING,
+            internal_log_rate_limit = true,
         );
         counter!(
             "component_errors_total",
diff --git a/src/internal_events/prometheus.rs b/src/internal_events/prometheus.rs
index 2285ee1323773..752e8e238fac4 100644
--- a/src/internal_events/prometheus.rs
+++ b/src/internal_events/prometheus.rs
@@ -24,7 +24,7 @@ impl InternalEvent for PrometheusParseError<'_> {
             error = ?self.error,
             error_type = error_type::PARSER_FAILED,
             stage = error_stage::PROCESSING,
-
+            internal_log_rate_limit = true,
         );
         debug!(
             message = %format!("Failed to parse response:\n\n{}\n\n", self.body),
@@ -53,7 +53,7 @@ impl InternalEvent for PrometheusRemoteWriteParseError {
             error = ?self.error,
             error_type = error_type::PARSER_FAILED,
             stage = error_stage::PROCESSING,
-
+            internal_log_rate_limit = true,
         );
         counter!(
             "component_errors_total",
@@ -74,6 +74,7 @@ impl InternalEvent for PrometheusNormalizationError {
             message = normalization_reason,
             error_type = error_type::CONVERSION_FAILED,
             stage = error_stage::PROCESSING,
+            internal_log_rate_limit = true,
         );
         counter!(
             "component_errors_total",
diff --git a/src/internal_events/pulsar.rs b/src/internal_events/pulsar.rs
index 416768fcff6a5..c03dea3870086 100644
--- a/src/internal_events/pulsar.rs
+++ b/src/internal_events/pulsar.rs
@@ -19,7 +19,7 @@ impl InternalEvent for PulsarSendingError {
             error = %self.error,
             error_type = error_type::REQUEST_FAILED,
             stage = error_stage::SENDING,
-
+            internal_log_rate_limit = true,
         );
         counter!(
             "component_errors_total",
@@ -46,7 +46,7 @@ impl<F: std::fmt::Display> InternalEvent for PulsarPropertyExtractionError<F> {
             error_type = error_type::PARSER_FAILED,
             stage = error_stage::PROCESSING,
             property_field = %self.property_field,
-
+            internal_log_rate_limit = true,
         );
         counter!(
             "component_errors_total",
@@ -105,7 +105,7 @@ registered_event!(
                     error_code = "reading_message",
                     error_type = error_type::READER_FAILED,
                     stage = error_stage::RECEIVING,
-
+                    internal_log_rate_limit = true,
                 );
 
                 self.read_errors.increment(1_u64);
@@ -117,7 +117,7 @@ registered_event!(
                     error_code = "acknowledge_message",
                     error_type = error_type::ACKNOWLEDGMENT_FAILED,
                     stage = error_stage::RECEIVING,
-
+                    internal_log_rate_limit = true,
                 );
 
                 self.ack_errors.increment(1_u64);
@@ -129,7 +129,7 @@ registered_event!(
                     error_code = "negative_acknowledge_message",
                     error_type = error_type::ACKNOWLEDGMENT_FAILED,
                     stage = error_stage::RECEIVING,
-
+                    internal_log_rate_limit = true,
                 );
 
                 self.nack_errors.increment(1_u64);
diff --git a/src/internal_events/redis.rs b/src/internal_events/redis.rs
index 32af514f4215d..0ac9e9e59d417 100644
--- a/src/internal_events/redis.rs
+++ b/src/internal_events/redis.rs
@@ -23,7 +23,7 @@ impl InternalEvent for RedisReceiveEventError {
             error_code = %self.error_code,
             error_type = error_type::READER_FAILED,
             stage = error_stage::SENDING,
-
+            internal_log_rate_limit = true,
         );
         counter!(
             "component_errors_total",
diff --git a/src/internal_events/reduce.rs b/src/internal_events/reduce.rs
index c62c1ed3639fa..b9887aaf54bb7 100644
--- a/src/internal_events/reduce.rs
+++ b/src/internal_events/reduce.rs
@@ -26,7 +26,7 @@ impl InternalEvent for ReduceAddEventError {
             error = ?self.error,
             error_type = error_type::CONDITION_FAILED,
             stage = error_stage::PROCESSING,
-
+            internal_log_rate_limit = true,
         );
         counter!(
             "component_errors_total",
diff --git a/src/internal_events/remap.rs b/src/internal_events/remap.rs
index 93193941b23fe..d05e6dfb9c874 100644
--- a/src/internal_events/remap.rs
+++ b/src/internal_events/remap.rs
@@ -19,7 +19,7 @@ impl InternalEvent for RemapMappingError {
             error = ?self.error,
             error_type = error_type::CONVERSION_FAILED,
             stage = error_stage::PROCESSING,
-
+            internal_log_rate_limit = true,
         );
         counter!(
             "component_errors_total",
diff --git a/src/internal_events/sematext_metrics.rs b/src/internal_events/sematext_metrics.rs
index 67839e8c90e79..b4b5be737fb2e 100644
--- a/src/internal_events/sematext_metrics.rs
+++ b/src/internal_events/sematext_metrics.rs
@@ -19,7 +19,7 @@ impl InternalEvent for SematextMetricsInvalidMetricError<'_> {
             stage = error_stage::PROCESSING,
             value = ?self.metric.value(),
             kind = ?self.metric.kind(),
-
+            internal_log_rate_limit = true,
         );
         counter!(
             "component_errors_total",
@@ -46,7 +46,7 @@ impl<E: std::fmt::Display> InternalEvent for SematextMetricsEncodeEventError<E>
             error = %self.error,
             error_type = error_type::ENCODER_FAILED,
             stage = error_stage::PROCESSING,
-
+            internal_log_rate_limit = true,
         );
         counter!(
             "component_errors_total",
diff --git a/src/internal_events/socket.rs b/src/internal_events/socket.rs
index 389adb0f478af..5f2f7aac301e4 100644
--- a/src/internal_events/socket.rs
+++ b/src/internal_events/socket.rs
@@ -124,7 +124,7 @@ impl<E: std::fmt::Display> InternalEvent for SocketBindError<E> {
             error_type = error_type::IO_FAILED,
             stage = error_stage::INITIALIZING,
             %mode,
-
+            internal_log_rate_limit = true,
         );
         counter!(
             "component_errors_total",
@@ -191,7 +191,7 @@ impl<E: std::fmt::Display> InternalEvent for SocketReceiveError<E> {
             error_type = error_type::READER_FAILED,
             stage = error_stage::RECEIVING,
             %mode,
-
+            internal_log_rate_limit = true,
         );
         counter!(
             "component_errors_total",
@@ -221,7 +221,7 @@ impl<E: std::fmt::Display> InternalEvent for SocketSendError<E> {
             error_type = error_type::WRITER_FAILED,
             stage = error_stage::SENDING,
             %mode,
-
+            internal_log_rate_limit = true,
         );
         counter!(
             "component_errors_total",
diff --git a/src/internal_events/splunk_hec.rs b/src/internal_events/splunk_hec.rs
index e4853c1a8b40e..4ff5838cdc0b7 100644
--- a/src/internal_events/splunk_hec.rs
+++ b/src/internal_events/splunk_hec.rs
@@ -33,7 +33,7 @@ mod sink {
                 error_code = "serializing_json",
                 error_type = error_type::ENCODER_FAILED,
                 stage = error_stage::PROCESSING,
-
+                internal_log_rate_limit = true,
             );
             counter!(
                 "component_errors_total",
@@ -62,7 +62,7 @@ mod sink {
                 stage = error_stage::PROCESSING,
                 value = ?self.value,
                 kind = ?self.kind,
-
+                internal_log_rate_limit = true,
             );
             counter!(
                 "component_errors_total",
@@ -92,7 +92,7 @@ mod sink {
                 error_code = "invalid_response",
                 error_type = error_type::PARSER_FAILED,
                 stage = error_stage::SENDING,
-
+                internal_log_rate_limit = true,
             );
             counter!(
                 "component_errors_total",
@@ -118,7 +118,7 @@ mod sink {
                 error_code = "indexer_ack_failed",
                 error_type = error_type::ACKNOWLEDGMENT_FAILED,
                 stage = error_stage::SENDING,
-
+                internal_log_rate_limit = true,
             );
             counter!(
                 "component_errors_total",
@@ -143,7 +143,7 @@ mod sink {
                 error_code = "indexer_ack_unavailable",
                 error_type = error_type::ACKNOWLEDGMENT_FAILED,
                 stage = error_stage::SENDING,
-
+                internal_log_rate_limit = true,
             );
             counter!(
                 "component_errors_total",
diff --git a/src/internal_events/statsd_sink.rs b/src/internal_events/statsd_sink.rs
index b7ee84cfbc457..165ef885eabbd 100644
--- a/src/internal_events/statsd_sink.rs
+++ b/src/internal_events/statsd_sink.rs
@@ -20,7 +20,7 @@ impl InternalEvent for StatsdInvalidMetricError<'_> {
             stage = error_stage::PROCESSING,
             value = ?self.value,
             kind = ?self.kind,
-
+            internal_log_rate_limit = true,
         );
         counter!(
             "component_errors_total",
diff --git a/src/internal_events/tag_cardinality_limit.rs b/src/internal_events/tag_cardinality_limit.rs
index e0a79e583bbcc..4c0c315eb11c1 100644
--- a/src/internal_events/tag_cardinality_limit.rs
+++ b/src/internal_events/tag_cardinality_limit.rs
@@ -14,6 +14,7 @@ impl InternalEvent for TagCardinalityLimitRejectingEvent<'_> {
             metric_name = self.metric_name,
             tag_key = self.tag_key,
             tag_value = self.tag_value,
+            internal_log_rate_limit = true,
         );
         counter!("tag_value_limit_exceeded_total").increment(1);
 
@@ -37,6 +38,7 @@ impl InternalEvent for TagCardinalityLimitRejectingTag<'_> {
             metric_name = self.metric_name,
             tag_key = self.tag_key,
             tag_value = self.tag_value,
+            internal_log_rate_limit = true,
         );
         counter!("tag_value_limit_exceeded_total").increment(1);
     }
diff --git a/src/internal_events/tcp.rs b/src/internal_events/tcp.rs
index ae050b99be309..23ec1fc88e830 100644
--- a/src/internal_events/tcp.rs
+++ b/src/internal_events/tcp.rs
@@ -60,6 +60,7 @@ impl<E: std::fmt::Display> InternalEvent for TcpSocketError<'_, E> {
             peer_addr = ?self.peer_addr,
             error_type = error_type::CONNECTION_FAILED,
             stage = error_stage::PROCESSING,
+            internal_log_rate_limit = true,
         );
         counter!(
             "component_errors_total",
@@ -88,6 +89,7 @@ impl InternalEvent for TcpSocketTlsConnectionError {
                 debug!(
                     message = "Connection error, probably a healthcheck.",
                     error = %self.error,
+                    internal_log_rate_limit = true,
                 );
             }
             _ => {
@@ -97,6 +99,7 @@ impl InternalEvent for TcpSocketTlsConnectionError {
                     error_code = "connection_failed",
                     error_type = error_type::WRITER_FAILED,
                     stage = error_stage::SENDING,
+                    internal_log_rate_limit = true,
                 );
                 counter!(
                     "component_errors_total",
@@ -124,6 +127,7 @@ impl InternalEvent for TcpSendAckError {
             error_code = "ack_failed",
             error_type = error_type::WRITER_FAILED,
             stage = error_stage::SENDING,
+            internal_log_rate_limit = true,
         );
         counter!(
             "component_errors_total",
diff --git a/src/internal_events/template.rs b/src/internal_events/template.rs
index 610acf9e7a166..6ecc62b859363 100644
--- a/src/internal_events/template.rs
+++ b/src/internal_events/template.rs
@@ -23,7 +23,7 @@ impl InternalEvent for TemplateRenderingError<'_> {
                 error = %self.error,
                 error_type = error_type::TEMPLATE_FAILED,
                 stage = error_stage::PROCESSING,
-
+                internal_log_rate_limit = true,
             );
 
             counter!(
@@ -43,7 +43,7 @@ impl InternalEvent for TemplateRenderingError<'_> {
                 error = %self.error,
                 error_type = error_type::TEMPLATE_FAILED,
                 stage = error_stage::PROCESSING,
-
+                internal_log_rate_limit = true,
             );
         }
     }
diff --git a/src/internal_events/udp.rs b/src/internal_events/udp.rs
index b983543e6cae1..15e9df4c2b07b 100644
--- a/src/internal_events/udp.rs
+++ b/src/internal_events/udp.rs
@@ -47,6 +47,7 @@ impl InternalEvent for UdpSendIncompleteError {
             dropped = self.data_size - self.sent,
             error_type = error_type::WRITER_FAILED,
             stage = error_stage::SENDING,
+            internal_log_rate_limit = true,
         );
         counter!(
             "component_errors_total",
diff --git a/src/internal_events/unix.rs b/src/internal_events/unix.rs
index f66327011da98..a45777ab8f2e1 100644
--- a/src/internal_events/unix.rs
+++ b/src/internal_events/unix.rs
@@ -54,7 +54,7 @@ impl<E: std::fmt::Display> InternalEvent for UnixSocketError<'_, E> {
             path = ?self.path,
             error_type = error_type::CONNECTION_FAILED,
             stage = error_stage::PROCESSING,
-
+            internal_log_rate_limit = true,
         );
         counter!(
             "component_errors_total",
@@ -80,7 +80,7 @@ impl<E: std::fmt::Display> InternalEvent for UnixSocketSendError<'_, E> {
             path = ?self.path,
             error_type = error_type::WRITER_FAILED,
             stage = error_stage::SENDING,
-
+            internal_log_rate_limit = true,
         );
         counter!(
             "component_errors_total",
@@ -109,6 +109,7 @@ impl InternalEvent for UnixSendIncompleteError {
             dropped = self.data_size - self.sent,
             error_type = error_type::WRITER_FAILED,
             stage = error_stage::SENDING,
+            internal_log_rate_limit = true,
         );
         counter!(
             "component_errors_total",
@@ -136,7 +137,7 @@ impl InternalEvent for UnixSocketFileDeleteError<'_> {
             error_code = "delete_socket_file",
             error_type = error_type::WRITER_FAILED,
             stage = error_stage::PROCESSING,
-
+            internal_log_rate_limit = true,
         );
         counter!(
             "component_errors_total",
diff --git a/src/internal_events/websocket.rs b/src/internal_events/websocket.rs
index 20c8b3091b09b..3dac157e31472 100644
--- a/src/internal_events/websocket.rs
+++ b/src/internal_events/websocket.rs
@@ -39,7 +39,7 @@ impl InternalEvent for WebSocketConnectionFailedError {
             error_code = "websocket_connection_error",
             error_type = error_type::CONNECTION_FAILED,
             stage = error_stage::SENDING,
-
+            internal_log_rate_limit = true,
         );
         counter!(
             "component_errors_total",
@@ -82,7 +82,7 @@ impl InternalEvent for WebSocketConnectionError {
             error_code = "websocket_connection_error",
             error_type = error_type::WRITER_FAILED,
             stage = error_stage::SENDING,
-
+            internal_log_rate_limit = true,
         );
         counter!(
             "component_errors_total",
@@ -199,6 +199,7 @@ impl InternalEvent for WebSocketReceiveError<'_> {
             error_code = "websocket_receive_error",
             error_type = error_type::CONNECTION_FAILED,
             stage = error_stage::PROCESSING,
+            internal_log_rate_limit = true,
         );
         counter!(
             "component_errors_total",
@@ -228,6 +229,7 @@ impl InternalEvent for WebSocketSendError<'_> {
             error_code = "websocket_send_error",
             error_type = error_type::CONNECTION_FAILED,
             stage = error_stage::PROCESSING,
+            internal_log_rate_limit = true,
         );
         counter!(
             "component_errors_total",
diff --git a/src/internal_events/websocket_server.rs b/src/internal_events/websocket_server.rs
index b3209c70a9994..b928385e669b9 100644
--- a/src/internal_events/websocket_server.rs
+++ b/src/internal_events/websocket_server.rs
@@ -43,7 +43,7 @@ impl InternalEvent for WebSocketListenerConnectionFailedError {
             error_code = "ws_connection_error",
             error_type = error_type::CONNECTION_FAILED,
             stage = error_stage::SENDING,
-
+            internal_log_rate_limit = true,
         );
         let mut all_tags = self.extra_tags.clone();
         all_tags.extend([
@@ -100,7 +100,7 @@ impl InternalEvent for WebSocketListenerSendError {
             error_code = "ws_server_connection_error",
             error_type = error_type::WRITER_FAILED,
             stage = error_stage::SENDING,
-
+            internal_log_rate_limit = true,
         );
         counter!(
             "component_errors_total",
diff --git a/src/internal_events/windows.rs b/src/internal_events/windows.rs
index f44c0a26bc8f3..994b89345e3c0 100644
--- a/src/internal_events/windows.rs
+++ b/src/internal_events/windows.rs
@@ -102,6 +102,7 @@ impl InternalEvent for WindowsServiceDoesNotExistError<'_> {
             error_code = "service_missing",
             error_type = error_type::CONDITION_FAILED,
             stage = error_stage::PROCESSING,
+            internal_log_rate_limit = true,
         );
         counter!(
             "component_errors_total",
diff --git a/src/sinks/amqp/channel.rs b/src/sinks/amqp/channel.rs
index 862ff06e5d0dc..6bb8f6f47c475 100644
--- a/src/sinks/amqp/channel.rs
+++ b/src/sinks/amqp/channel.rs
@@ -41,7 +41,8 @@ impl deadpool::managed::Manager for AmqpSinkChannelManager {
         let channel = Self::new_channel(&self.config).await?;
         info!(
             message = "Created a new channel to the AMQP broker.",
-            id = channel.id()
+            id = channel.id(),
+            internal_log_rate_limit = true,
         );
         Ok(channel)
     }
diff --git a/src/sinks/datadog/logs/sink.rs b/src/sinks/datadog/logs/sink.rs
index cff96f92fd3dc..79d873f2044c5 100644
--- a/src/sinks/datadog/logs/sink.rs
+++ b/src/sinks/datadog/logs/sink.rs
@@ -200,6 +200,7 @@ pub fn position_reserved_attr_event_root(
                 message = "Semantic meaning is defined, but the event path already exists. Renaming to not overwrite.",
                 meaning = meaning,
                 renamed = &rename_attr,
+                internal_log_rate_limit = true,
             );
             log.rename_key(desired_path, rename_path);
         }
diff --git a/src/sinks/datadog/traces/apm_stats/flusher.rs b/src/sinks/datadog/traces/apm_stats/flusher.rs
index e529f49869dbd..d1ee1e73e949b 100644
--- a/src/sinks/datadog/traces/apm_stats/flusher.rs
+++ b/src/sinks/datadog/traces/apm_stats/flusher.rs
@@ -70,6 +70,7 @@ pub async fn flush_apm_stats_thread(
             }
             Err(_) => {
                 error!(
+                    internal_log_rate_limit = true,
                     message = "Tokio Sender unexpectedly dropped."
                 );
                 break;
diff --git a/src/sinks/gcp/stackdriver/logs/encoder.rs b/src/sinks/gcp/stackdriver/logs/encoder.rs
index 82fa672f1d58e..76359ca5fdd7c 100644
--- a/src/sinks/gcp/stackdriver/logs/encoder.rs
+++ b/src/sinks/gcp/stackdriver/logs/encoder.rs
@@ -173,6 +173,7 @@ pub(super) fn remap_severity(severity: Value) -> Value {
                         warn!(
                             message = "Unknown severity value string, using DEFAULT.",
                             value = %s,
+                            internal_log_rate_limit = true
                         );
                         0
                     }
diff --git a/src/sinks/redis/sink.rs b/src/sinks/redis/sink.rs
index aaea351fece3e..0f17d769268b2 100644
--- a/src/sinks/redis/sink.rs
+++ b/src/sinks/redis/sink.rs
@@ -166,7 +166,10 @@ impl RedisConnection {
             if !repairing {
                 // Wait until a repair is needed
                 if let Err(error) = conn_recv.wait_for(|state| state.needs_repair()).await {
-                    warn!("Connection state channel was dropped {error:?}.");
+                    warn!(
+                        internal_log_rate_limit = true,
+                        "Connection state channel was dropped {error:?}."
+                    );
                     continue;
                 }
 
@@ -189,7 +192,7 @@ impl RedisConnection {
                     }
                 }
                 Err(error) => {
-                    warn!("Failed to repair ConnectionManager via sentinel (gen: {current_generation}): {error:?}.");
+                    warn!(internal_log_rate_limit = true, "Failed to repair ConnectionManager via sentinel (gen: {current_generation}): {error:?}.");
                     sleep(Duration::from_millis(250)).await;
                     continue;
                 }
diff --git a/src/sinks/util/adaptive_concurrency/controller.rs b/src/sinks/util/adaptive_concurrency/controller.rs
index 0f05639a92ed0..ed7fe472cf3f6 100644
--- a/src/sinks/util/adaptive_concurrency/controller.rs
+++ b/src/sinks/util/adaptive_concurrency/controller.rs
@@ -293,6 +293,7 @@ where
                     warn!(
                         message = "Unhandled error response.",
                         %error,
+                        internal_log_rate_limit = true
                     );
                     false
                 }
diff --git a/src/sinks/util/retries.rs b/src/sinks/util/retries.rs
index 9daaec01ca5b4..cdb5310d9b361 100644
--- a/src/sinks/util/retries.rs
+++ b/src/sinks/util/retries.rs
@@ -152,6 +152,7 @@ where
                         error!(
                             message = "OK/retry response but retries exhausted; dropping the request.",
                             reason = ?reason,
+                            internal_log_rate_limit = true,
                         );
                         return None;
                     }
@@ -197,7 +198,7 @@ where
                         error!(
                             message = "Non-retriable error; dropping the request.",
                             %error,
-
+                            internal_log_rate_limit = true,
                         );
                         None
                     }
@@ -211,6 +212,7 @@ where
                     error!(
                         message = "Unexpected error type; dropping the request.",
                         %error,
+                        internal_log_rate_limit = true
                     );
                     None
                 }
diff --git a/src/sources/datadog_agent/metrics.rs b/src/sources/datadog_agent/metrics.rs
index 7e5df463a16c2..4cac3d47a3026 100644
--- a/src/sources/datadog_agent/metrics.rs
+++ b/src/sources/datadog_agent/metrics.rs
@@ -182,7 +182,10 @@ fn decode_datadog_sketches(
 ) -> Result<Vec<Event>, ErrorMessage> {
     if body.is_empty() {
         // The datadog agent may send an empty payload as a keep alive
-        debug!(message = "Empty payload ignored.",);
+        debug!(
+            message = "Empty payload ignored.",
+            internal_log_rate_limit = true
+        );
         return Ok(Vec::new());
     }
 
diff --git a/src/sources/heroku_logs.rs b/src/sources/heroku_logs.rs
index 8417ce2dad7d4..c2daf516746de 100644
--- a/src/sources/heroku_logs.rs
+++ b/src/sources/heroku_logs.rs
@@ -407,6 +407,7 @@ fn line_to_events(
         warn!(
             message = "Line didn't match expected logplex format, so raw message is forwarded.",
             fields = parts.len(),
+            internal_log_rate_limit = true
         );
 
         events.push(LogEvent::from_str_legacy(line).into())
diff --git a/src/sources/http_client/client.rs b/src/sources/http_client/client.rs
index 2fde06fc6b88a..85b792c9ef545 100644
--- a/src/sources/http_client/client.rs
+++ b/src/sources/http_client/client.rs
@@ -251,7 +251,7 @@ impl Query {
                         let warnings = Formatter::new(param.value(), compilation_result.warnings)
                             .colored()
                             .to_string();
-                        warn!(message = "VRL compilation warnings.", %warnings);
+                        warn!(message = "VRL compilation warnings.", %warnings, internal_log_rate_limit = true);
                     }
                     Some(compilation_result.program)
                 }
@@ -259,7 +259,7 @@ impl Query {
                     let error = Formatter::new(param.value(), diagnostics)
                         .colored()
                         .to_string();
-                    warn!(message = "VRL compilation failed.", %error);
+                    warn!(message = "VRL compilation failed.", %error, internal_log_rate_limit = true);
                     None
                 }
             }
@@ -428,7 +428,7 @@ fn resolve_vrl(value: &str, program: &Program) -> Option<String> {
     Runtime::default()
         .resolve(&mut target, program, &timezone)
         .map_err(|error| {
-            warn!(message = "VRL runtime error.", source = %value, %error);
+            warn!(message = "VRL runtime error.", source = %value, %error, internal_log_rate_limit = true);
         })
         .ok()
         .and_then(|vrl_value| {
diff --git a/src/sources/socket/udp.rs b/src/sources/socket/udp.rs
index 24ea971752eed..c60d32d5abb66 100644
--- a/src/sources/socket/udp.rs
+++ b/src/sources/socket/udp.rs
@@ -231,6 +231,7 @@ pub(super) fn udp(
                                     warn!(
                                         message = "Discarding frame larger than max_length.",
                                         max_length = max_length,
+                                        internal_log_rate_limit = true
                                     );
                                     continue;
                                 }
@@ -258,6 +259,7 @@ pub(super) fn udp(
                                     warn!(
                                         message = "Discarding frame larger than max_length.",
                                         max_length = max_length,
+                                        internal_log_rate_limit = true
                                     );
                                 }
 
diff --git a/src/sources/util/framestream.rs b/src/sources/util/framestream.rs
index 2daee6f70f359..a864d42d193a5 100644
--- a/src/sources/util/framestream.rs
+++ b/src/sources/util/framestream.rs
@@ -678,7 +678,10 @@ async fn handle_tcp_frame<T>(
         .await;
     } else if let Some(event) = frame_handler.handle_event(received_from, frame) {
         if let Err(e) = event_sink.send_event(event).await {
-            error!("Error sending event: {e:?}.");
+            error!(
+                internal_log_rate_limit = true,
+                "Error sending event: {e:?}."
+            );
         }
     }
 }
@@ -864,7 +867,10 @@ fn build_framestream_source<T: Send + 'static>(
 
         let handler = async move {
             if let Err(e) = event_sink.send_event_stream(&mut events).await {
-                error!("Error sending event: {:?}.", e);
+                error!(
+                    internal_log_rate_limit = true,
+                    "Error sending event: {:?}.", e
+                );
             }
 
             info!("Finished sending.");
diff --git a/src/sources/websocket/source.rs b/src/sources/websocket/source.rs
index 6a1c98e2b1c57..c54f4cb717365 100644
--- a/src/sources/websocket/source.rs
+++ b/src/sources/websocket/source.rs
@@ -94,7 +94,7 @@ impl WebSocketSource {
         loop {
             let result = tokio::select! {
                 _ = cx.shutdown.clone() => {
-                    info!("Received shutdown signal.");
+                    info!(internal_log_rate_limit = true, "Received shutdown signal.");
                     break;
                 },
 
@@ -117,16 +117,23 @@ impl WebSocketSource {
                         warn!(
                             message = "Connection closed by server.",
                             code = %frame.code,
-                            reason = %frame.reason
+                            reason = %frame.reason,
+                            internal_log_rate_limit = true
                         );
                         emit!(WebSocketConnectionShutdown);
                     }
                     WebSocketSourceError::RemoteClosedEmpty => {
-                        warn!("Connection closed by server without a close frame.");
+                        warn!(
+                            internal_log_rate_limit = true,
+                            "Connection closed by server without a close frame."
+                        );
                         emit!(WebSocketConnectionShutdown);
                     }
                     WebSocketSourceError::PongTimeout => {
-                        error!("Disconnecting due to pong timeout.");
+                        error!(
+                            internal_log_rate_limit = true,
+                            "Disconnecting due to pong timeout."
+                        );
                         emit!(WebSocketReceiveError {
                             error: &TungsteniteError::Io(std::io::Error::new(
                                 std::io::ErrorKind::TimedOut,
@@ -140,7 +147,7 @@ impl WebSocketSource {
                         if is_closed(&ws_err) {
                             emit!(WebSocketConnectionShutdown);
                         }
-                        error!(message = "WebSocket connection error.", error = %ws_err);
+                        error!(message = "WebSocket connection error.", error = %ws_err, internal_log_rate_limit = true);
                     }
                     // These errors should only happen during `connect` or `reconnect`,
                     // not in the main loop's result.
@@ -194,7 +201,10 @@ impl WebSocketSource {
             Message::Ping(_) => Ok(()),
             Message::Close(frame) => self.handle_close_frame(frame),
             Message::Frame(_) => {
-                warn!("Unsupported message type received: frame.");
+                warn!(
+                    internal_log_rate_limit = true,
+                    "Unsupported message type received: frame."
+                );
                 Ok(())
             }
         }
@@ -241,7 +251,7 @@ impl WebSocketSource {
                     });
 
                     if let Err(error) = out.send_batch(events_with_meta).await {
-                        error!(message = "Error sending events.", %error);
+                        error!(message = "Error sending events.", %error, internal_log_rate_limit = true);
                     }
                 }
                 Err(error) => {
@@ -265,14 +275,17 @@ impl WebSocketSource {
         ws_sink: &mut WebSocketSink,
         ws_source: &mut WebSocketStream,
     ) -> Result<(), WebSocketSourceError> {
-        info!("Reconnecting to WebSocket...");
+        info!(
+            internal_log_rate_limit = true,
+            "Reconnecting to WebSocket..."
+        );
 
         let (new_sink, new_source) = self.connect(out).await?;
 
         *ws_sink = new_sink;
         *ws_source = new_source;
 
-        info!("Reconnected.");
+        info!(internal_log_rate_limit = true, "Reconnected to Websocket.");
 
         Ok(())
     }
diff --git a/src/topology/builder.rs b/src/topology/builder.rs
index 454b901399ee1..a872435e968e4 100644
--- a/src/topology/builder.rs
+++ b/src/topology/builder.rs
@@ -191,7 +191,8 @@ impl<'a> Builder<'a> {
                                 // Just report the error and continue.
                                 error!(message = "Unable to add index to reloaded enrichment table.",
                                     table = ?name.to_string(),
-                                    %error);
+                                    %error,
+                                    internal_log_rate_limit = true);
                                 continue 'tables;
                             }
                         }
@@ -723,7 +724,10 @@ pub async fn reload_enrichment_tables(config: &Config) {
             let mut table = match table_outer.inner.build(&config.global).await {
                 Ok(table) => table,
                 Err(error) => {
-                    error!("Enrichment table \"{name}\" reload failed: {error}");
+                    error!(
+                        internal_log_rate_limit = true,
+                        "Enrichment table \"{name}\" reload failed: {error}",
+                    );
                     continue;
                 }
             };
@@ -738,9 +742,12 @@ pub async fn reload_enrichment_tables(config: &Config) {
                             // If there is an error adding an index we do not want to use the reloaded
                             // data, the previously loaded data will still need to be used.
                             // Just report the error and continue.
-                            error!(message = "Unable to add index to reloaded enrichment table.",
-                                    table = ?name.to_string(),
-                                    %error);
+                            error!(
+                                internal_log_rate_limit = true,
+                                message = "Unable to add index to reloaded enrichment table.",
+                                table = ?name.to_string(),
+                                %error
+                            );
                             continue 'tables;
                         }
                     }
diff --git a/src/transforms/lua/v1/mod.rs b/src/transforms/lua/v1/mod.rs
index f196d645dd9a8..8f8817bedb5c8 100644
--- a/src/transforms/lua/v1/mod.rs
+++ b/src/transforms/lua/v1/mod.rs
@@ -255,6 +255,7 @@ impl mlua::UserData for LuaEvent {
                             message =
                                 "Could not set field to Lua value of invalid type, dropping field.",
                             field = key.as_str(),
+                            internal_log_rate_limit = true
                         );
                         this.inner.as_mut_log().remove(&key_path);
                     }

From 63f52f22463bb028678548545b541ae580493b59 Mon Sep 17 00:00:00 2001
From: Thomas <thomas.schneider@datadoghq.com>
Date: Mon, 11 Aug 2025 14:52:55 -0400
Subject: [PATCH 289/305] chore(ci): skip int tests on website only PRs
 (#23572)

* chore(ci): skip int tests on website only PRs

* Fix script

* Add dedicated error message
---
 .github/workflows/integration.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
index 4c4692f3079fd..81f7d08287568 100644
--- a/.github/workflows/integration.yml
+++ b/.github/workflows/integration.yml
@@ -104,6 +104,11 @@ jobs:
               should_run=false
             fi
 
+            if [[ "${{ needs.changes.outputs.website_only }}" == "true" ]]; then
+              echo "Skipping ${{ matrix.service }} test since only website changes were detected"
+              exit 0
+            fi
+
             # Check if any of the three conditions is true
             if [[ "${{ github.event_name }}" == "merge_group" || \
                   "${{ github.event_name }}" == "workflow_dispatch" || \

From bfded155d39925b4d06f4e6547aa09d07d611c79 Mon Sep 17 00:00:00 2001
From: Thomas <thomas.schneider@datadoghq.com>
Date: Mon, 11 Aug 2025 16:20:11 -0400
Subject: [PATCH 290/305] fix(ci): fix not_website matcher (#23574)

Fix not_website matcher
---
 .github/workflows/changes.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/changes.yml b/.github/workflows/changes.yml
index 8a51ba0e1ad98..e1c31195919e4 100644
--- a/.github/workflows/changes.yml
+++ b/.github/workflows/changes.yml
@@ -201,7 +201,6 @@ jobs:
           website:
             - "website/**"
           not_website:
-            - "**"
             - "!website/**"
 
   # Detects changes that are specific to integration tests

From 35e3719cd9b00677bf88c81d274e14b4d1ac2afb Mon Sep 17 00:00:00 2001
From: Thomas <thomas.schneider@datadoghq.com>
Date: Mon, 11 Aug 2025 16:20:25 -0400
Subject: [PATCH 291/305] chore(website): Add a margin between the author and
 the badges (#23573)

---
 website/layouts/highlights/li.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/website/layouts/highlights/li.html b/website/layouts/highlights/li.html
index d23132bd5f44e..02bc47080c38f 100644
--- a/website/layouts/highlights/li.html
+++ b/website/layouts/highlights/li.html
@@ -28,7 +28,7 @@
         {{ partial  "author-with-avatar.html" . }}
 
 
-        <div class="block space-y-1.5">
+        <div class="block space-y-1.5 mt-1.5">
           {{ with $badges.type }}
             {{ $color := cond (eq . "deprecation") "red" "blue" }}
             {{ partial "badge.html" (dict "prefix" "type" "word" . "color" $color "inline" true) }}

From a8cbfb76461a6c3d3e3a82bff158c65c42e2d2fc Mon Sep 17 00:00:00 2001
From: Thomas <thomas.schneider@datadoghq.com>
Date: Tue, 12 Aug 2025 15:17:19 -0400
Subject: [PATCH 292/305] chore(releasing): v0.49.0 release (#23579)

* chore(releasing): prepare v0.49.0 release (#23563)

* chore(releasing): Pinned VRL version to 0.26.0

* chore(releasing): Generated release CUE file

* chore(releasing): Updated website/cue/reference/administration/interfaces/kubectl.cue vector version to 0.49.0

* chore(releasing): Updated distribution/install.sh vector version to 0.49.0

* chore(releasing): Add 0.49.0 to versions.cue

* chore(releasing): Created release md file

* Apply suggestions from code review

* edit

* added description

* authors

* add upgrade guide wip

* upgrade guide changes

* Apply suggestions from code review

Co-authored-by: Pavlos Rontidis <pavlos.rontidis@gmail.com>

* improve breaking guide

---------

Co-authored-by: Thomas <thomas.schneider@datadoghq.com>

* cargo vdev build manifests

* Bump version to next release

---------

Co-authored-by: Pavlos Rontidis <pavlos.rontidis@gmail.com>
---
 .github/actions/spelling/allow.txt            |   7 +
 Cargo.lock                                    |   6 +-
 Cargo.toml                                    |   2 +-
 ...aws_sink_retry_logic_update.enhancement.md |   3 -
 ...1155_http_sink_templateable_uri.feature.md |   4 -
 ..._http_sink_header_templates.enhancement.md |   3 -
 ...70_utilization_metric_periodic_emit.fix.md |   3 -
 ...22764_clickhouse_query_settings.feature.md |   3 -
 ...e_bounded_date_range_search.enhancement.md |   3 -
 ..._uri_provided_basic_auth_opensearch.fix.md |   3 -
 ..._postgres_sink_healthcheck_disabled.fix.md |   3 -
 changelog.d/23220_hyphens_in_secrets.fix.md   |   3 -
 ...23279_logs_sources_output_logs.breaking.md |   4 -
 ...7_fix_nats_sink_ignored_healthcheck.fix.md |   3 -
 changelog.d/23361_interval_ms_readable.fix.md |   3 -
 ...c-tag-values-full-unmodifiable-tags.fix.md |   3 -
 ..._watch_enrichment_table_changes.feature.md |   3 -
 ..._dnstap_tcp_source_throughput_issue.fix.md |   3 -
 ...gative_buffer_size_and_event_gauges.fix.md |   3 -
 ..._dedupe_transform_time_settings.feature.md |   3 -
 ...ders_in_nats_jetstream_sink.enhancement.md |   5 -
 changelog.d/23513_config_prevent_panic.fix.md |   3 -
 .../23514_datadog_prevent_panic.fix.md        |   3 -
 .../23515_max_packet_size_mqtt.feature.md     |   3 -
 .../6491_add_websocket_source.feature.md      |   3 -
 ...upport_max_bytes_memory_buffers.feature.md |   3 -
 changelog.d/batch-newline.fix.md              |   3 -
 ...ip_retrying_succeeded_documents.feature.md |   3 -
 .../fix_concurrent_map_potential_hang.fix.md  |   3 -
 .../fix_metric_set_memory_growth.feature.md   |   6 -
 changelog.d/log_to_metric_config.fix.md       |   3 -
 .../log_to_metric_pair_expansion_error.fix.md |   3 -
 changelog.d/proto_codecs.enhancement.md       |   3 -
 changelog.d/redis_sentinel_in_sink.feature.md |   3 -
 changelog.d/redis_zadd_in_sink.feature.md     |   3 -
 ...s_in_unsigned_int_templates.enhancement.md |   3 -
 distribution/install.sh                       |   2 +-
 .../kubernetes/vector-agent/README.md         |   2 +-
 .../kubernetes/vector-agent/configmap.yaml    |   2 +-
 .../kubernetes/vector-agent/daemonset.yaml    |   4 +-
 .../kubernetes/vector-agent/rbac.yaml         |   4 +-
 .../vector-agent/service-headless.yaml        |   2 +-
 .../vector-agent/serviceaccount.yaml          |   2 +-
 .../kubernetes/vector-aggregator/README.md    |   2 +-
 .../vector-aggregator/configmap.yaml          |   2 +-
 .../vector-aggregator/service-headless.yaml   |   2 +-
 .../kubernetes/vector-aggregator/service.yaml |   2 +-
 .../vector-aggregator/serviceaccount.yaml     |   2 +-
 .../vector-aggregator/statefulset.yaml        |   4 +-
 .../vector-stateless-aggregator/README.md     |   2 +-
 .../configmap.yaml                            |   2 +-
 .../deployment.yaml                           |   4 +-
 .../service-headless.yaml                     |   2 +-
 .../vector-stateless-aggregator/service.yaml  |   2 +-
 .../serviceaccount.yaml                       |   2 +-
 .../2025-08-12-0-49-0-upgrade-guide.md        | 104 ++++
 website/content/en/releases/0.49.0.md         |   4 +
 .../administration/interfaces/kubectl.cue     |   2 +-
 website/cue/reference/releases/0.49.0.cue     | 451 ++++++++++++++++++
 website/cue/reference/versions.cue            |   1 +
 60 files changed, 595 insertions(+), 134 deletions(-)
 delete mode 100644 changelog.d/10870_aws_sink_retry_logic_update.enhancement.md
 delete mode 100644 changelog.d/1155_http_sink_templateable_uri.feature.md
 delete mode 100644 changelog.d/201_http_sink_header_templates.enhancement.md
 delete mode 100644 changelog.d/22070_utilization_metric_periodic_emit.fix.md
 delete mode 100644 changelog.d/22764_clickhouse_query_settings.feature.md
 delete mode 100644 changelog.d/23074_enrichment_function_single_bounded_date_range_search.enhancement.md
 delete mode 100644 changelog.d/23103_fix_uri_provided_basic_auth_opensearch.fix.md
 delete mode 100644 changelog.d/23111_postgres_sink_healthcheck_disabled.fix.md
 delete mode 100644 changelog.d/23220_hyphens_in_secrets.fix.md
 delete mode 100644 changelog.d/23279_logs_sources_output_logs.breaking.md
 delete mode 100644 changelog.d/23287_fix_nats_sink_ignored_healthcheck.fix.md
 delete mode 100644 changelog.d/23361_interval_ms_readable.fix.md
 delete mode 100644 changelog.d/23371_metric-tag-values-full-unmodifiable-tags.fix.md
 delete mode 100644 changelog.d/23442_watch_enrichment_table_changes.feature.md
 delete mode 100644 changelog.d/23448_dnstap_tcp_source_throughput_issue.fix.md
 delete mode 100644 changelog.d/23453_prevent_negative_buffer_size_and_event_gauges.fix.md
 delete mode 100644 changelog.d/23480_dedupe_transform_time_settings.feature.md
 delete mode 100644 changelog.d/23509_allow_headers_in_nats_jetstream_sink.enhancement.md
 delete mode 100644 changelog.d/23513_config_prevent_panic.fix.md
 delete mode 100644 changelog.d/23514_datadog_prevent_panic.fix.md
 delete mode 100644 changelog.d/23515_max_packet_size_mqtt.feature.md
 delete mode 100644 changelog.d/6491_add_websocket_source.feature.md
 delete mode 100644 changelog.d/8679_add_support_max_bytes_memory_buffers.feature.md
 delete mode 100644 changelog.d/batch-newline.fix.md
 delete mode 100644 changelog.d/elasticsearch_sink_skip_retrying_succeeded_documents.feature.md
 delete mode 100644 changelog.d/fix_concurrent_map_potential_hang.fix.md
 delete mode 100644 changelog.d/fix_metric_set_memory_growth.feature.md
 delete mode 100644 changelog.d/log_to_metric_config.fix.md
 delete mode 100644 changelog.d/log_to_metric_pair_expansion_error.fix.md
 delete mode 100644 changelog.d/proto_codecs.enhancement.md
 delete mode 100644 changelog.d/redis_sentinel_in_sink.feature.md
 delete mode 100644 changelog.d/redis_zadd_in_sink.feature.md
 delete mode 100644 changelog.d/strftime_items_in_unsigned_int_templates.enhancement.md
 create mode 100644 website/content/en/highlights/2025-08-12-0-49-0-upgrade-guide.md
 create mode 100644 website/content/en/releases/0.49.0.md
 create mode 100644 website/cue/reference/releases/0.49.0.cue

diff --git a/.github/actions/spelling/allow.txt b/.github/actions/spelling/allow.txt
index b4ac8ee77e9c1..301c272018cb1 100644
--- a/.github/actions/spelling/allow.txt
+++ b/.github/actions/spelling/allow.txt
@@ -535,3 +535,10 @@ ZTE
 Zync
 envsubst
 jimmystewpot
+esensar
+jchap-pnnl
+jhbigler-pnnl
+jlambatl
+jorgehermo9
+notchairmk
+yjagdale
diff --git a/Cargo.lock b/Cargo.lock
index 308aa895e1dc1..151cfc77efd3d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -8007,7 +8007,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "be769465445e8c1474e9c5dac2018218498557af32d9ed057325ec9a41ae81bf"
 dependencies = [
  "heck 0.5.0",
- "itertools 0.10.5",
+ "itertools 0.11.0",
  "log",
  "multimap",
  "once_cell",
@@ -8053,7 +8053,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8a56d757972c98b346a9b766e3f02746cde6dd1cd1d1d563472929fdd74bec4d"
 dependencies = [
  "anyhow",
- "itertools 0.10.5",
+ "itertools 0.11.0",
  "proc-macro2 1.0.95",
  "quote 1.0.40",
  "syn 2.0.104",
@@ -11842,7 +11842,7 @@ dependencies = [
 
 [[package]]
 name = "vector"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "apache-avro",
  "approx",
diff --git a/Cargo.toml b/Cargo.toml
index ca22f73b017e8..a13e4ee929e2f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "vector"
-version = "0.49.0"
+version = "0.50.0"
 authors = ["Vector Contributors <vector@datadoghq.com>"]
 edition = "2021"
 description = "A lightweight and ultra-fast tool for building observability pipelines"
diff --git a/changelog.d/10870_aws_sink_retry_logic_update.enhancement.md b/changelog.d/10870_aws_sink_retry_logic_update.enhancement.md
deleted file mode 100644
index ee467d0c600a2..0000000000000
--- a/changelog.d/10870_aws_sink_retry_logic_update.enhancement.md
+++ /dev/null
@@ -1,3 +0,0 @@
-Extends retry logic in AWS sink by allowing users to configure the sink to retry specific or all failed request attempts.
-
-authors: jchap-pnnl jhbigler-pnnl
diff --git a/changelog.d/1155_http_sink_templateable_uri.feature.md b/changelog.d/1155_http_sink_templateable_uri.feature.md
deleted file mode 100644
index 5d0a44fca7e9c..0000000000000
--- a/changelog.d/1155_http_sink_templateable_uri.feature.md
+++ /dev/null
@@ -1,4 +0,0 @@
-`http` sink's uri config is now templateable, allowing to use fields from events
-to build the uri.
-
-authors: jorgehermo9
diff --git a/changelog.d/201_http_sink_header_templates.enhancement.md b/changelog.d/201_http_sink_header_templates.enhancement.md
deleted file mode 100644
index 2b2b46e16a5a7..0000000000000
--- a/changelog.d/201_http_sink_header_templates.enhancement.md
+++ /dev/null
@@ -1,3 +0,0 @@
-The `http` sink now supports templated header values.
-
-authors: notchairmk
diff --git a/changelog.d/22070_utilization_metric_periodic_emit.fix.md b/changelog.d/22070_utilization_metric_periodic_emit.fix.md
deleted file mode 100644
index 27dd9de778d79..0000000000000
--- a/changelog.d/22070_utilization_metric_periodic_emit.fix.md
+++ /dev/null
@@ -1,3 +0,0 @@
-The `utilization` metric is now properly published periodically, even when no events are flowing through the components.
-
-authors: esensar Quad9DNS
diff --git a/changelog.d/22764_clickhouse_query_settings.feature.md b/changelog.d/22764_clickhouse_query_settings.feature.md
deleted file mode 100644
index 10e4a7f4ef85a..0000000000000
--- a/changelog.d/22764_clickhouse_query_settings.feature.md
+++ /dev/null
@@ -1,3 +0,0 @@
-Add a `query_settings` and `async_insert_settings` option in the `clickhouse` sink, which allows users to configure asynchronous inserts.
-
-authors: pm5
diff --git a/changelog.d/23074_enrichment_function_single_bounded_date_range_search.enhancement.md b/changelog.d/23074_enrichment_function_single_bounded_date_range_search.enhancement.md
deleted file mode 100644
index f1e08baad96ab..0000000000000
--- a/changelog.d/23074_enrichment_function_single_bounded_date_range_search.enhancement.md
+++ /dev/null
@@ -1,3 +0,0 @@
-The [enrichment functions](https://vector.dev/docs/reference/vrl/functions/#enrichment-functions) now support an optional wildcard parameter where a match will succeed if the field value equals either the wildcard or the actual comparison value.
-
-authors: nzxwang
diff --git a/changelog.d/23103_fix_uri_provided_basic_auth_opensearch.fix.md b/changelog.d/23103_fix_uri_provided_basic_auth_opensearch.fix.md
deleted file mode 100644
index 124071e9bbb4f..0000000000000
--- a/changelog.d/23103_fix_uri_provided_basic_auth_opensearch.fix.md
+++ /dev/null
@@ -1,3 +0,0 @@
-Fix URI provided for basic auth in OpenSearch. Credentials provided in the URI were ignored. It is now being used correctly.
-
-authors: ynachi
diff --git a/changelog.d/23111_postgres_sink_healthcheck_disabled.fix.md b/changelog.d/23111_postgres_sink_healthcheck_disabled.fix.md
deleted file mode 100644
index 5c522def04b59..0000000000000
--- a/changelog.d/23111_postgres_sink_healthcheck_disabled.fix.md
+++ /dev/null
@@ -1,3 +0,0 @@
-Fixes a bug where the healthcheck in the Postgres sink was not being properly disabled.
-
-authors: jorgehermo9
diff --git a/changelog.d/23220_hyphens_in_secrets.fix.md b/changelog.d/23220_hyphens_in_secrets.fix.md
deleted file mode 100644
index af755628ce447..0000000000000
--- a/changelog.d/23220_hyphens_in_secrets.fix.md
+++ /dev/null
@@ -1,3 +0,0 @@
-Secrets names in the configuration allow hyphens.
-
-authors: optician
diff --git a/changelog.d/23279_logs_sources_output_logs.breaking.md b/changelog.d/23279_logs_sources_output_logs.breaking.md
deleted file mode 100644
index e6a747cfc9619..0000000000000
--- a/changelog.d/23279_logs_sources_output_logs.breaking.md
+++ /dev/null
@@ -1,4 +0,0 @@
-Previously heroku_logs and demo_logs could output logs, metrics and traces depending on the decoding. Now they can only output logs.
-This behavior was unintuitive and undocumented.
-
-authors: thomasqueirozb
diff --git a/changelog.d/23287_fix_nats_sink_ignored_healthcheck.fix.md b/changelog.d/23287_fix_nats_sink_ignored_healthcheck.fix.md
deleted file mode 100644
index 5e143f6a220ad..0000000000000
--- a/changelog.d/23287_fix_nats_sink_ignored_healthcheck.fix.md
+++ /dev/null
@@ -1,3 +0,0 @@
-The `nats` sink now does not return an error when an unresolvable or unavailable URL is provided. Note that if `--require-healthy` is set then Vector will stop on startup.
-
-authors: rdwr-tomers
diff --git a/changelog.d/23361_interval_ms_readable.fix.md b/changelog.d/23361_interval_ms_readable.fix.md
deleted file mode 100644
index ac122825e6a73..0000000000000
--- a/changelog.d/23361_interval_ms_readable.fix.md
+++ /dev/null
@@ -1,3 +0,0 @@
-VRL programs can now read the `interval_ms` field. This field was previously writeable but not readable.
-
-authors: thomasqueirozb
diff --git a/changelog.d/23371_metric-tag-values-full-unmodifiable-tags.fix.md b/changelog.d/23371_metric-tag-values-full-unmodifiable-tags.fix.md
deleted file mode 100644
index 85613f056e0ed..0000000000000
--- a/changelog.d/23371_metric-tag-values-full-unmodifiable-tags.fix.md
+++ /dev/null
@@ -1,3 +0,0 @@
-Fix an issue where tags were not modifiable via VRL if `metrics-tag-values` was set to `full`.
-
-authors: thomasqueirozb
diff --git a/changelog.d/23442_watch_enrichment_table_changes.feature.md b/changelog.d/23442_watch_enrichment_table_changes.feature.md
deleted file mode 100644
index 4c30bccafc143..0000000000000
--- a/changelog.d/23442_watch_enrichment_table_changes.feature.md
+++ /dev/null
@@ -1,3 +0,0 @@
-The `--watch-config` flag now also watches for changes in enrichment table files.
-
-authors: esensar Quad9DNS
diff --git a/changelog.d/23448_dnstap_tcp_source_throughput_issue.fix.md b/changelog.d/23448_dnstap_tcp_source_throughput_issue.fix.md
deleted file mode 100644
index b043dd04e5572..0000000000000
--- a/changelog.d/23448_dnstap_tcp_source_throughput_issue.fix.md
+++ /dev/null
@@ -1,3 +0,0 @@
-Fixed an issue with `dnstap` `tcp` source, where it could have a drastically reduced throughput after number of connections exceeded number of available cores.
-
-authors: esensar Quad9DNS
diff --git a/changelog.d/23453_prevent_negative_buffer_size_and_event_gauges.fix.md b/changelog.d/23453_prevent_negative_buffer_size_and_event_gauges.fix.md
deleted file mode 100644
index 95cbd2231abd7..0000000000000
--- a/changelog.d/23453_prevent_negative_buffer_size_and_event_gauges.fix.md
+++ /dev/null
@@ -1,3 +0,0 @@
-Fixed race condition bug causing negative values to be reported by the `vector_buffer_byte_size` and `vector_buffer_events` gauges.
-
-authors: vparfonov
diff --git a/changelog.d/23480_dedupe_transform_time_settings.feature.md b/changelog.d/23480_dedupe_transform_time_settings.feature.md
deleted file mode 100644
index b8f41185e1716..0000000000000
--- a/changelog.d/23480_dedupe_transform_time_settings.feature.md
+++ /dev/null
@@ -1,3 +0,0 @@
-Adds `time_settings` configuration for `dedupe` transform, to enable configuring `max_age` for items in the deduplication cache, helping make a distinction between real duplicates and duplication that is expected in the incoming data over a longer period of time.
-
-authors: esensar Quad9DNS
diff --git a/changelog.d/23509_allow_headers_in_nats_jetstream_sink.enhancement.md b/changelog.d/23509_allow_headers_in_nats_jetstream_sink.enhancement.md
deleted file mode 100644
index a709c4c9f5c2a..0000000000000
--- a/changelog.d/23509_allow_headers_in_nats_jetstream_sink.enhancement.md
+++ /dev/null
@@ -1,5 +0,0 @@
-The `nats` sink now supports message headers when publishing to JetStream.
-
-It introduces a configurable, templated Nats-Msg-Id header that ensures a unique ID for each message. This enables broker-level deduplication, resulting in stronger delivery guarantees and exactly-once semantics when combined with idempotent consumers.
-
-authors: benjamin-awd
diff --git a/changelog.d/23513_config_prevent_panic.fix.md b/changelog.d/23513_config_prevent_panic.fix.md
deleted file mode 100644
index ff6d80ce4e38b..0000000000000
--- a/changelog.d/23513_config_prevent_panic.fix.md
+++ /dev/null
@@ -1,3 +0,0 @@
-Prevent panic on non-UTF8 environment variables.
-
-authors: kurochan
diff --git a/changelog.d/23514_datadog_prevent_panic.fix.md b/changelog.d/23514_datadog_prevent_panic.fix.md
deleted file mode 100644
index 6f8599dbbd399..0000000000000
--- a/changelog.d/23514_datadog_prevent_panic.fix.md
+++ /dev/null
@@ -1,3 +0,0 @@
-Prevents a panic when DD_API_KEY contains newline characters.
-
-authors: kurochan
diff --git a/changelog.d/23515_max_packet_size_mqtt.feature.md b/changelog.d/23515_max_packet_size_mqtt.feature.md
deleted file mode 100644
index 87d262a4454fc..0000000000000
--- a/changelog.d/23515_max_packet_size_mqtt.feature.md
+++ /dev/null
@@ -1,3 +0,0 @@
-Added an option to set max packet size for MQTT source and sink.
-
-authors: simplepad
diff --git a/changelog.d/6491_add_websocket_source.feature.md b/changelog.d/6491_add_websocket_source.feature.md
deleted file mode 100644
index 4b48e30403312..0000000000000
--- a/changelog.d/6491_add_websocket_source.feature.md
+++ /dev/null
@@ -1,3 +0,0 @@
-Adds a new `websocket` source.
-
-authors: benjamin-awd
diff --git a/changelog.d/8679_add_support_max_bytes_memory_buffers.feature.md b/changelog.d/8679_add_support_max_bytes_memory_buffers.feature.md
deleted file mode 100644
index 78bde9a474bcd..0000000000000
--- a/changelog.d/8679_add_support_max_bytes_memory_buffers.feature.md
+++ /dev/null
@@ -1,3 +0,0 @@
-Adds support for `max_bytes` for memory buffers
-
-authors: graphcareful
diff --git a/changelog.d/batch-newline.fix.md b/changelog.d/batch-newline.fix.md
deleted file mode 100644
index 0c38c41dd74cd..0000000000000
--- a/changelog.d/batch-newline.fix.md
+++ /dev/null
@@ -1,3 +0,0 @@
-Batches encoded using newline delimited framing now end with a trailing newline.
-
-authors: jszwedko
diff --git a/changelog.d/elasticsearch_sink_skip_retrying_succeeded_documents.feature.md b/changelog.d/elasticsearch_sink_skip_retrying_succeeded_documents.feature.md
deleted file mode 100644
index 57e51daf395cd..0000000000000
--- a/changelog.d/elasticsearch_sink_skip_retrying_succeeded_documents.feature.md
+++ /dev/null
@@ -1,3 +0,0 @@
-The `request_retry_partial` behavior for the `elasticsearch` was changed. Now only the failed retriable requests in a bulk will be retried (instead of all requests in the bulk).
-
-authors: Serendo
diff --git a/changelog.d/fix_concurrent_map_potential_hang.fix.md b/changelog.d/fix_concurrent_map_potential_hang.fix.md
deleted file mode 100644
index abb8cdd53a0a7..0000000000000
--- a/changelog.d/fix_concurrent_map_potential_hang.fix.md
+++ /dev/null
@@ -1,3 +0,0 @@
-Fixed a potential hang in the internal concurrent map, this issue could hang vector when shutting it down.
-
-authors: jorgehermo9
diff --git a/changelog.d/fix_metric_set_memory_growth.feature.md b/changelog.d/fix_metric_set_memory_growth.feature.md
deleted file mode 100644
index 525648566668a..0000000000000
--- a/changelog.d/fix_metric_set_memory_growth.feature.md
+++ /dev/null
@@ -1,6 +0,0 @@
-- Add a TTL-based cache for metrics sets
-- Add `expire_metrics_secs` config for Prometheus remote write sink which uses the TTL-based cache
-- This fixes an issue where incremental metrics are preserved for the lifetime of Vector's runtime, which causes
-  indefinite memory growth
-
-authors: GreyLilac09
diff --git a/changelog.d/log_to_metric_config.fix.md b/changelog.d/log_to_metric_config.fix.md
deleted file mode 100644
index a9f5a2b9fc3e2..0000000000000
--- a/changelog.d/log_to_metric_config.fix.md
+++ /dev/null
@@ -1,3 +0,0 @@
-Fixed a `log_to_metric` config bug, now `all_metrics` can be specified without the need to also set a `metrics` field.
-
-authors: pront
diff --git a/changelog.d/log_to_metric_pair_expansion_error.fix.md b/changelog.d/log_to_metric_pair_expansion_error.fix.md
deleted file mode 100644
index ac2f8b17d7bbe..0000000000000
--- a/changelog.d/log_to_metric_pair_expansion_error.fix.md
+++ /dev/null
@@ -1,3 +0,0 @@
-The `log_to_metric` transforms now emits a pair expansion error. This error was previously silently ignored.
-
-authors: pront
diff --git a/changelog.d/proto_codecs.enhancement.md b/changelog.d/proto_codecs.enhancement.md
deleted file mode 100644
index 4c6f3909949a2..0000000000000
--- a/changelog.d/proto_codecs.enhancement.md
+++ /dev/null
@@ -1,3 +0,0 @@
-The `protobuf` codecs now support all telemetry data types (logs, metrics, traces).
-
-authors: pront
diff --git a/changelog.d/redis_sentinel_in_sink.feature.md b/changelog.d/redis_sentinel_in_sink.feature.md
deleted file mode 100644
index 82c076b93ff7c..0000000000000
--- a/changelog.d/redis_sentinel_in_sink.feature.md
+++ /dev/null
@@ -1,3 +0,0 @@
-Adds support for Redis Sentinel in the Redis sink.
-
-authors: 5Dev24
diff --git a/changelog.d/redis_zadd_in_sink.feature.md b/changelog.d/redis_zadd_in_sink.feature.md
deleted file mode 100644
index febd7ffe0b267..0000000000000
--- a/changelog.d/redis_zadd_in_sink.feature.md
+++ /dev/null
@@ -1,3 +0,0 @@
-Adds support for the Redis ZADD command in the Redis sink.
-
-authors: 5Dev24
diff --git a/changelog.d/strftime_items_in_unsigned_int_templates.enhancement.md b/changelog.d/strftime_items_in_unsigned_int_templates.enhancement.md
deleted file mode 100644
index df92d88cafe1b..0000000000000
--- a/changelog.d/strftime_items_in_unsigned_int_templates.enhancement.md
+++ /dev/null
@@ -1,3 +0,0 @@
-Allow strftime items in UnsignedIntTemplate.
-
-authors: 5Dev24
diff --git a/distribution/install.sh b/distribution/install.sh
index 2e6a6afe9a417..ceaad6bae3645 100755
--- a/distribution/install.sh
+++ b/distribution/install.sh
@@ -13,7 +13,7 @@ set -u
 # If PACKAGE_ROOT is unset or empty, default it.
 PACKAGE_ROOT="${PACKAGE_ROOT:-"https://packages.timber.io/vector"}"
 # If VECTOR_VERSION is unset or empty, default it.
-VECTOR_VERSION="${VECTOR_VERSION:-"0.48.0"}"
+VECTOR_VERSION="${VECTOR_VERSION:-"0.49.0"}"
 _divider="--------------------------------------------------------------------------------"
 _prompt=">>>"
 _indent="   "
diff --git a/distribution/kubernetes/vector-agent/README.md b/distribution/kubernetes/vector-agent/README.md
index a2c281d825d08..4c0cfbf8fc128 100644
--- a/distribution/kubernetes/vector-agent/README.md
+++ b/distribution/kubernetes/vector-agent/README.md
@@ -1,6 +1,6 @@
 The kubernetes manifests found in this directory have been automatically generated
 from the [helm chart `vector/vector`](https://github.com/vectordotdev/helm-charts/tree/master/charts/vector)
-version 0.44.0 with the following `values.yaml`:
+version 0.45.0 with the following `values.yaml`:
 
 ```yaml
 role: Agent
diff --git a/distribution/kubernetes/vector-agent/configmap.yaml b/distribution/kubernetes/vector-agent/configmap.yaml
index 7249f8361c433..1e0f0d561d3d5 100644
--- a/distribution/kubernetes/vector-agent/configmap.yaml
+++ b/distribution/kubernetes/vector-agent/configmap.yaml
@@ -9,7 +9,7 @@ metadata:
     app.kubernetes.io/name: vector
     app.kubernetes.io/instance: vector
     app.kubernetes.io/component: Agent
-    app.kubernetes.io/version: "0.48.0-distroless-libc"
+    app.kubernetes.io/version: "0.49.0-distroless-libc"
 data:
   agent.yaml: |
     data_dir: /vector-data-dir
diff --git a/distribution/kubernetes/vector-agent/daemonset.yaml b/distribution/kubernetes/vector-agent/daemonset.yaml
index ccf4c7012a3d9..910d1b042851b 100644
--- a/distribution/kubernetes/vector-agent/daemonset.yaml
+++ b/distribution/kubernetes/vector-agent/daemonset.yaml
@@ -9,7 +9,7 @@ metadata:
     app.kubernetes.io/name: vector
     app.kubernetes.io/instance: vector
     app.kubernetes.io/component: Agent
-    app.kubernetes.io/version: "0.48.0-distroless-libc"
+    app.kubernetes.io/version: "0.49.0-distroless-libc"
 spec:
   selector:
     matchLabels:
@@ -30,7 +30,7 @@ spec:
       dnsPolicy: ClusterFirst
       containers:
         - name: vector
-          image: "timberio/vector:0.48.0-distroless-libc"
+          image: "timberio/vector:0.49.0-distroless-libc"
           imagePullPolicy: IfNotPresent
           args:
             - --config-dir
diff --git a/distribution/kubernetes/vector-agent/rbac.yaml b/distribution/kubernetes/vector-agent/rbac.yaml
index 52706a906caa7..d1bdf5b57f8de 100644
--- a/distribution/kubernetes/vector-agent/rbac.yaml
+++ b/distribution/kubernetes/vector-agent/rbac.yaml
@@ -10,7 +10,7 @@ metadata:
     app.kubernetes.io/name: vector
     app.kubernetes.io/instance: vector
     app.kubernetes.io/component: Agent
-    app.kubernetes.io/version: "0.48.0-distroless-libc"
+    app.kubernetes.io/version: "0.49.0-distroless-libc"
 rules:
   - apiGroups:
       - ""
@@ -31,7 +31,7 @@ metadata:
     app.kubernetes.io/name: vector
     app.kubernetes.io/instance: vector
     app.kubernetes.io/component: Agent
-    app.kubernetes.io/version: "0.48.0-distroless-libc"
+    app.kubernetes.io/version: "0.49.0-distroless-libc"
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
diff --git a/distribution/kubernetes/vector-agent/service-headless.yaml b/distribution/kubernetes/vector-agent/service-headless.yaml
index 47b1e5eb01786..f9c1ed731f311 100644
--- a/distribution/kubernetes/vector-agent/service-headless.yaml
+++ b/distribution/kubernetes/vector-agent/service-headless.yaml
@@ -9,7 +9,7 @@ metadata:
     app.kubernetes.io/name: vector
     app.kubernetes.io/instance: vector
     app.kubernetes.io/component: Agent
-    app.kubernetes.io/version: "0.48.0-distroless-libc"
+    app.kubernetes.io/version: "0.49.0-distroless-libc"
   annotations:
 spec:
   clusterIP: None
diff --git a/distribution/kubernetes/vector-agent/serviceaccount.yaml b/distribution/kubernetes/vector-agent/serviceaccount.yaml
index 98e97909f02ba..feccbcb04dbb1 100644
--- a/distribution/kubernetes/vector-agent/serviceaccount.yaml
+++ b/distribution/kubernetes/vector-agent/serviceaccount.yaml
@@ -9,5 +9,5 @@ metadata:
     app.kubernetes.io/name: vector
     app.kubernetes.io/instance: vector
     app.kubernetes.io/component: Agent
-    app.kubernetes.io/version: "0.48.0-distroless-libc"
+    app.kubernetes.io/version: "0.49.0-distroless-libc"
 automountServiceAccountToken: true
diff --git a/distribution/kubernetes/vector-aggregator/README.md b/distribution/kubernetes/vector-aggregator/README.md
index d8ef30ba866bb..cbecb3df87692 100644
--- a/distribution/kubernetes/vector-aggregator/README.md
+++ b/distribution/kubernetes/vector-aggregator/README.md
@@ -1,6 +1,6 @@
 The kubernetes manifests found in this directory have been automatically generated
 from the [helm chart `vector/vector`](https://github.com/vectordotdev/helm-charts/tree/master/charts/vector)
-version 0.44.0 with the following `values.yaml`:
+version 0.45.0 with the following `values.yaml`:
 
 ```yaml
 
diff --git a/distribution/kubernetes/vector-aggregator/configmap.yaml b/distribution/kubernetes/vector-aggregator/configmap.yaml
index 9aba164839b89..020bc89eed6fa 100644
--- a/distribution/kubernetes/vector-aggregator/configmap.yaml
+++ b/distribution/kubernetes/vector-aggregator/configmap.yaml
@@ -9,7 +9,7 @@ metadata:
     app.kubernetes.io/name: vector
     app.kubernetes.io/instance: vector
     app.kubernetes.io/component: Aggregator
-    app.kubernetes.io/version: "0.48.0-distroless-libc"
+    app.kubernetes.io/version: "0.49.0-distroless-libc"
 data:
   aggregator.yaml: |
     data_dir: /vector-data-dir
diff --git a/distribution/kubernetes/vector-aggregator/service-headless.yaml b/distribution/kubernetes/vector-aggregator/service-headless.yaml
index b8a0b0acddd6c..554ced0faafc9 100644
--- a/distribution/kubernetes/vector-aggregator/service-headless.yaml
+++ b/distribution/kubernetes/vector-aggregator/service-headless.yaml
@@ -9,7 +9,7 @@ metadata:
     app.kubernetes.io/name: vector
     app.kubernetes.io/instance: vector
     app.kubernetes.io/component: Aggregator
-    app.kubernetes.io/version: "0.48.0-distroless-libc"
+    app.kubernetes.io/version: "0.49.0-distroless-libc"
   annotations:
 spec:
   clusterIP: None
diff --git a/distribution/kubernetes/vector-aggregator/service.yaml b/distribution/kubernetes/vector-aggregator/service.yaml
index 001bdfa32753a..8daa6a12b421d 100644
--- a/distribution/kubernetes/vector-aggregator/service.yaml
+++ b/distribution/kubernetes/vector-aggregator/service.yaml
@@ -9,7 +9,7 @@ metadata:
     app.kubernetes.io/name: vector
     app.kubernetes.io/instance: vector
     app.kubernetes.io/component: Aggregator
-    app.kubernetes.io/version: "0.48.0-distroless-libc"
+    app.kubernetes.io/version: "0.49.0-distroless-libc"
   annotations:
 spec:
   ports:
diff --git a/distribution/kubernetes/vector-aggregator/serviceaccount.yaml b/distribution/kubernetes/vector-aggregator/serviceaccount.yaml
index 193853224def2..bfac6910540f9 100644
--- a/distribution/kubernetes/vector-aggregator/serviceaccount.yaml
+++ b/distribution/kubernetes/vector-aggregator/serviceaccount.yaml
@@ -9,5 +9,5 @@ metadata:
     app.kubernetes.io/name: vector
     app.kubernetes.io/instance: vector
     app.kubernetes.io/component: Aggregator
-    app.kubernetes.io/version: "0.48.0-distroless-libc"
+    app.kubernetes.io/version: "0.49.0-distroless-libc"
 automountServiceAccountToken: true
diff --git a/distribution/kubernetes/vector-aggregator/statefulset.yaml b/distribution/kubernetes/vector-aggregator/statefulset.yaml
index 8c7700752d288..ac25b64588011 100644
--- a/distribution/kubernetes/vector-aggregator/statefulset.yaml
+++ b/distribution/kubernetes/vector-aggregator/statefulset.yaml
@@ -9,7 +9,7 @@ metadata:
     app.kubernetes.io/name: vector
     app.kubernetes.io/instance: vector
     app.kubernetes.io/component: Aggregator
-    app.kubernetes.io/version: "0.48.0-distroless-libc"
+    app.kubernetes.io/version: "0.49.0-distroless-libc"
   annotations: {}
 spec:
   replicas: 1
@@ -34,7 +34,7 @@ spec:
       dnsPolicy: ClusterFirst
       containers:
         - name: vector
-          image: "timberio/vector:0.48.0-distroless-libc"
+          image: "timberio/vector:0.49.0-distroless-libc"
           imagePullPolicy: IfNotPresent
           args:
             - --config-dir
diff --git a/distribution/kubernetes/vector-stateless-aggregator/README.md b/distribution/kubernetes/vector-stateless-aggregator/README.md
index 3805e31a4fa94..a2e9e8fe81c46 100644
--- a/distribution/kubernetes/vector-stateless-aggregator/README.md
+++ b/distribution/kubernetes/vector-stateless-aggregator/README.md
@@ -1,6 +1,6 @@
 The kubernetes manifests found in this directory have been automatically generated
 from the [helm chart `vector/vector`](https://github.com/vectordotdev/helm-charts/tree/master/charts/vector)
-version 0.44.0 with the following `values.yaml`:
+version 0.45.0 with the following `values.yaml`:
 
 ```yaml
 role: Stateless-Aggregator
diff --git a/distribution/kubernetes/vector-stateless-aggregator/configmap.yaml b/distribution/kubernetes/vector-stateless-aggregator/configmap.yaml
index c5c6bf9999984..07174c2028a1b 100644
--- a/distribution/kubernetes/vector-stateless-aggregator/configmap.yaml
+++ b/distribution/kubernetes/vector-stateless-aggregator/configmap.yaml
@@ -9,7 +9,7 @@ metadata:
     app.kubernetes.io/name: vector
     app.kubernetes.io/instance: vector
     app.kubernetes.io/component: Stateless-Aggregator
-    app.kubernetes.io/version: "0.48.0-distroless-libc"
+    app.kubernetes.io/version: "0.49.0-distroless-libc"
 data:
   aggregator.yaml: |
     data_dir: /vector-data-dir
diff --git a/distribution/kubernetes/vector-stateless-aggregator/deployment.yaml b/distribution/kubernetes/vector-stateless-aggregator/deployment.yaml
index 8c17457b4dd82..4805960f163a6 100644
--- a/distribution/kubernetes/vector-stateless-aggregator/deployment.yaml
+++ b/distribution/kubernetes/vector-stateless-aggregator/deployment.yaml
@@ -9,7 +9,7 @@ metadata:
     app.kubernetes.io/name: vector
     app.kubernetes.io/instance: vector
     app.kubernetes.io/component: Stateless-Aggregator
-    app.kubernetes.io/version: "0.48.0-distroless-libc"
+    app.kubernetes.io/version: "0.49.0-distroless-libc"
   annotations: {}
 spec:
   replicas: 1
@@ -32,7 +32,7 @@ spec:
       dnsPolicy: ClusterFirst
       containers:
         - name: vector
-          image: "timberio/vector:0.48.0-distroless-libc"
+          image: "timberio/vector:0.49.0-distroless-libc"
           imagePullPolicy: IfNotPresent
           args:
             - --config-dir
diff --git a/distribution/kubernetes/vector-stateless-aggregator/service-headless.yaml b/distribution/kubernetes/vector-stateless-aggregator/service-headless.yaml
index 114fb02de8c54..39b4aee2d0993 100644
--- a/distribution/kubernetes/vector-stateless-aggregator/service-headless.yaml
+++ b/distribution/kubernetes/vector-stateless-aggregator/service-headless.yaml
@@ -9,7 +9,7 @@ metadata:
     app.kubernetes.io/name: vector
     app.kubernetes.io/instance: vector
     app.kubernetes.io/component: Stateless-Aggregator
-    app.kubernetes.io/version: "0.48.0-distroless-libc"
+    app.kubernetes.io/version: "0.49.0-distroless-libc"
   annotations:
 spec:
   clusterIP: None
diff --git a/distribution/kubernetes/vector-stateless-aggregator/service.yaml b/distribution/kubernetes/vector-stateless-aggregator/service.yaml
index 175021e357b2e..b3ea61a5f1366 100644
--- a/distribution/kubernetes/vector-stateless-aggregator/service.yaml
+++ b/distribution/kubernetes/vector-stateless-aggregator/service.yaml
@@ -9,7 +9,7 @@ metadata:
     app.kubernetes.io/name: vector
     app.kubernetes.io/instance: vector
     app.kubernetes.io/component: Stateless-Aggregator
-    app.kubernetes.io/version: "0.48.0-distroless-libc"
+    app.kubernetes.io/version: "0.49.0-distroless-libc"
   annotations:
 spec:
   ports:
diff --git a/distribution/kubernetes/vector-stateless-aggregator/serviceaccount.yaml b/distribution/kubernetes/vector-stateless-aggregator/serviceaccount.yaml
index d52c46f47a713..9ff057a9ab32f 100644
--- a/distribution/kubernetes/vector-stateless-aggregator/serviceaccount.yaml
+++ b/distribution/kubernetes/vector-stateless-aggregator/serviceaccount.yaml
@@ -9,5 +9,5 @@ metadata:
     app.kubernetes.io/name: vector
     app.kubernetes.io/instance: vector
     app.kubernetes.io/component: Stateless-Aggregator
-    app.kubernetes.io/version: "0.48.0-distroless-libc"
+    app.kubernetes.io/version: "0.49.0-distroless-libc"
 automountServiceAccountToken: true
diff --git a/website/content/en/highlights/2025-08-12-0-49-0-upgrade-guide.md b/website/content/en/highlights/2025-08-12-0-49-0-upgrade-guide.md
new file mode 100644
index 0000000000000..3400bdb117c03
--- /dev/null
+++ b/website/content/en/highlights/2025-08-12-0-49-0-upgrade-guide.md
@@ -0,0 +1,104 @@
+---
+date: "2025-08-12"
+title: "0.49 Upgrade Guide"
+description: "An upgrade guide that addresses breaking changes in 0.49.0"
+authors: [ "pront" ]
+release: "0.49.0"
+hide_on_release_notes: false
+badges:
+  type: breaking change
+---
+
+{{< info >}}
+VRL version `0.26.0` included a couple of breaking Changes.
+There are no Vector breaking changes.
+{{< /info >}}
+
+## `encode_lz4` and `decode_lz4` function changes
+
+### Previous Behavior
+
+`encode_lz4`  used to prepend the uncompressed size by default.
+
+### New Behavior
+
+`encode_lz4`  no longer prepends the uncompressed size by default, improving compatibility with standard LZ4 tools.
+A new `prepend_size` flag restores the old behavior if needed.
+Also, `decode_lz4` now also accepts `prepend_size` and a `buf_size` option (default: 1MB).
+
+#### Action needed
+
+Existing users of `encode_lz4` and `decode_lz4` will need to update their functions to include the argument `prepend_size: true` to maintain
+existing compatibility.
+
+## `parse_cef` function changes
+
+The `parse_cef` now trims unnecessary whitespace around escaped values in both headers and extension fields, improving accuracy and
+reliability when dealing with messy input strings.
+
+### Scenario: `parse_cef` with whitespace post cef fields
+
+#### Input
+
+```text
+CEF:1|Security|threatmanager|1.0|100|worm successfully stopped|10| dst=2.1.2.2 msg=Detected a threat. No action needed spt=1232
+```
+
+#### Previous Behavior: Runtime Error
+
+If an input with space added to parse_cef was provided, it would result in a runtime error due to the inability to parse the line
+successfully.
+
+```text
+error[E000]: function call error for "parse_cef" at (0:20): Could not parse whole line successfully
+┌─ :1:1
+│.message = "CEF:1|Security|threatmanager|1.0|100|worm successfully stopped|10| dst=2.1.2.2 msg=Detected a threat. No action needed spt=1232"
+1 │ parse_cef!(.message)
+│ ^^^^^^^^^^^^^^^^^^^^ Could not parse whole line successfully
+│
+= see language documentation at https://vrl.dev
+= try your code in the VRL REPL, learn more at https://vrl.dev/examples
+```
+
+#### New Behavior: parses data correctly
+
+```json
+{
+  "cefVersion": "1",
+  "deviceEventClassId": "100",
+  "deviceProduct": "threatmanager",
+  "deviceVendor": "Security",
+  "deviceVersion": "1.0",
+  "dst": "2.1.2.2",
+  "msg": "Detected a threat. No action needed",
+  "name": "worm successfully stopped",
+  "severity": "10",
+  "spt": "1232"
+}
+```
+
+### Scenario: `parse_cef` with whitespace in cef fields
+
+#### Input
+
+```text
+CEF:1|Security|threatmanager|1.0|100|worm successfully stopped|10| dst=2.1.2.2 msg=Detected a threat. No action needed  spt=1232
+```
+
+#### Previous Behavior: Trailing whitespace
+
+```text
+"msg": "Detected a threat. No action needed   "
+```
+
+#### New Behavior: No trailing whitespace
+
+```text
+"msg": "Detected a threat. No action needed"`
+```
+
+## `parse_syslog` function changes
+
+The `parse_syslog` function now treats RFC 3164 structured data items with no parameters (e.g., `[exampleSDID@32473]`) as part of the main
+message, rather than parsing them as structured data. Items with parameters (e.g., `[exampleSDID@32473 field="value"]`) continue to be
+parsed as structured data.
diff --git a/website/content/en/releases/0.49.0.md b/website/content/en/releases/0.49.0.md
new file mode 100644
index 0000000000000..862f3b29c494f
--- /dev/null
+++ b/website/content/en/releases/0.49.0.md
@@ -0,0 +1,4 @@
+---
+title: Vector v0.49.0 release notes
+weight: 27
+---
diff --git a/website/cue/reference/administration/interfaces/kubectl.cue b/website/cue/reference/administration/interfaces/kubectl.cue
index e39c18992909e..30acdd12fa6d5 100644
--- a/website/cue/reference/administration/interfaces/kubectl.cue
+++ b/website/cue/reference/administration/interfaces/kubectl.cue
@@ -19,7 +19,7 @@ administration: interfaces: kubectl: {
 	role_implementations: [Name=string]: {
 		commands: {
 			_deployment_variant:       string
-			_vector_version:           "0.48"
+			_vector_version:           "0.49"
 			_namespace:                string | *"vector"
 			_controller_resource_type: string
 			_controller_resource_name: string | *_deployment_variant
diff --git a/website/cue/reference/releases/0.49.0.cue b/website/cue/reference/releases/0.49.0.cue
new file mode 100644
index 0000000000000..e5a59d6a35e80
--- /dev/null
+++ b/website/cue/reference/releases/0.49.0.cue
@@ -0,0 +1,451 @@
+package metadata
+
+releases: "0.49.0": {
+	date:     "2025-08-12"
+	codename: ""
+
+	whats_next: []
+
+	description: """
+		The Vector team is excited to announce version `0.49.0`!
+
+		Please refer to the [upgrade guide](/highlights/2025-08-12-0-49-0-upgrade-guide.md) for breaking changes in this release.
+
+		**Release highlights**:
+
+		- A `websocket` source was introduced. A WebSocket source in Vector enables ingestion of real-time data from services that expose WebSocket APIs.
+		- The `http` sink's `uri` and `request.headers` config fields now support templating, enabling dynamic construction based on event data.
+		- The `--watch-config` flag now also watches for changes in enrichment table files.
+		- Fixed a race condition that could cause negative values in the `vector_buffer_byte_size` and `vector_buffer_events` gauges.
+		"""
+
+	changelog: [
+		{
+			type: "enhancement"
+			description: """
+				Extends retry logic in `aws_s3` sink by allowing users to configure which requests to retry.
+				"""
+			contributors: ["jchap-pnnl", "jhbigler-pnnl"]
+		},
+		{
+			type: "feat"
+			description: """
+				The `http` sink's `uri` config is now templateable, allowing for dynamic URI building based on event fields.
+				"""
+			contributors: ["jorgehermo9"]
+		},
+		{
+			type: "enhancement"
+			description: """
+				The `http` sink `request.headers` configuration now supports templated values.
+				"""
+			contributors: ["notchairmk"]
+		},
+		{
+			type: "fix"
+			description: """
+				The `utilization` metric is now properly published periodically, even when no events are flowing through the components.
+				"""
+			contributors: ["esensar", "Quad9DNS"]
+		},
+		{
+			type: "feat"
+			description: """
+				Added a `query_settings` and `async_insert_settings` option in the `clickhouse` sink, which allows users to configure asynchronous inserts.
+				"""
+			contributors: ["pm5"]
+		},
+		{
+			type: "enhancement"
+			description: """
+				The [enrichment functions](https://vector.dev/docs/reference/vrl/functions/#enrichment-functions) now support an optional wildcard parameter where a match will succeed if the field value equals either the wildcard or the actual comparison value.
+				"""
+			contributors: ["nzxwang"]
+		},
+		{
+			type: "fix"
+			description: """
+				Fixed a bug in the `elasticsearch` sink that caused URI credentials to be ignored. They are now correctly used.
+				"""
+			contributors: ["ynachi"]
+		},
+		{
+			type: "fix"
+			description: """
+				Previously the `postgres` sink healthcheck was not implemented correctly. Now Vector can start when `healthcheck.enabled` is set to `false`.
+				"""
+			contributors: ["jorgehermo9"]
+		},
+		{
+			type: "fix"
+			description: """
+				Secret names in the configuration can now contain hyphens. For example `"SECRET[systemd.vm-token]" is now valid.
+				"""
+			contributors: ["optician"]
+		},
+		{
+			type: "chore"
+			description: """
+				Previously `heroku_logs` and `demo_logs` sinks could output logs, metrics and traces depending on the decoding. Now they can only output logs.
+				This behavior was unintuitive and undocumented.
+				"""
+			contributors: ["thomasqueirozb"]
+		},
+		{
+			type: "fix"
+			description: """
+				The `nats` sink now does not return an error when an unresolvable or unavailable URL is provided. Note that if `--require-healthy` is set then Vector will stop on startup.
+				"""
+			contributors: ["rdwr-tomers"]
+		},
+		{
+			type: "fix"
+			description: """
+				VRL programs can now read the `interval_ms` field. This field was previously writeable but not readable.
+				"""
+			contributors: ["thomasqueirozb"]
+		},
+		{
+			type: "fix"
+			description: """
+				Fixed an issue where tags were not modifiable via VRL if `metrics-tag-values` was set to `full`.
+				"""
+			contributors: ["thomasqueirozb"]
+		},
+		{
+			type: "feat"
+			description: """
+				The `--watch-config` flag now also watches for changes in enrichment table files.
+				"""
+			contributors: ["esensar", "Quad9DNS"]
+		},
+		{
+			type: "fix"
+			description: """
+				Fixed an issue in the `dnstap` and `tcp` sources where throughput could drop significantly when the number of connections exceeded the number of available cores.
+				"""
+			contributors: ["esensar", "Quad9DNS"]
+		},
+		{
+			type: "fix"
+			description: """
+				Fixed a race condition that caused negative values to be reported by the `vector_buffer_byte_size` and `vector_buffer_events` gauges.
+				"""
+			contributors: ["vparfonov"]
+		},
+		{
+			type: "feat"
+			description: """
+				Added `time_settings` configuration to the `dedupe` transform, allowing the `max_age` of items in the deduplication cache to be set. This helps distinguish between true duplicates and expected repetition in data over longer periods.
+				"""
+			contributors: ["esensar", "Quad9DNS"]
+		},
+		{
+			type: "enhancement"
+			description: """
+				The `nats` sink now supports message headers when publishing to JetStream.
+				
+				It introduces a configurable, templated Nats-Msg-Id header that ensures a unique ID for each message. This enables broker-level deduplication, resulting in stronger delivery guarantees and exactly-once semantics when combined with idempotent consumers.
+				"""
+			contributors: ["benjamin-awd"]
+		},
+		{
+			type: "fix"
+			description: """
+				Fixed an issue that could cause a panic when reading environment variables containing non-UTF8 data. Such variables are now handled gracefully.
+				"""
+			contributors: ["kurochan"]
+		},
+		{
+			type: "fix"
+			description: """
+				Prevented a panic when `DD_API_KEY` value contains newline characters. Such values are now handled gracefully.
+				"""
+			contributors: ["kurochan"]
+		},
+		{
+			type: "feat"
+			description: """
+				Added a `max_packet_size` option to set max packet size for the `mqtt` source and sink.
+				"""
+			contributors: ["simplepad"]
+		},
+		{
+			type: "feat"
+			description: """
+				Added a new `websocket` source.
+				"""
+			contributors: ["benjamin-awd"]
+		},
+		{
+			type: "feat"
+			description: """
+				Added the `max_size` configuration option for memory buffers.
+				"""
+			contributors: ["graphcareful"]
+		},
+		{
+			type: "fix"
+			description: """
+				Batches encoded using newline-delimited framing now include a trailing newline at the end.
+				"""
+			contributors: ["jszwedko"]
+		},
+		{
+			type: "feat"
+			description: """
+				The `request_retry_partial` behavior for the `elasticsearch` sink was changed. Now only the failed retriable requests in a bulk will be retried (instead of all requests in the bulk).
+				"""
+			contributors: ["Serendo"]
+		},
+		{
+			type: "fix"
+			description: """
+				Fixed a potential hang in Vector core caused by the internal concurrent map. This issue could prevent Vector from shutting down cleanly.
+				"""
+			contributors: ["jorgehermo9"]
+		},
+		{
+			type: "feat"
+			description: """
+				- Added a TTL-based cache for metric sets.
+				- Introduced the `expire_metrics_secs` configuration to the Prometheus remote write sink, leveraging the new TTL-based cache.
+				- This resolves an issue where incremental metrics were retained for the entire lifetime of Vector, leading to unbounded memory growth.
+				"""
+			contributors: ["GreyLilac09"]
+		},
+		{
+			type: "fix"
+			description: """
+				Fixed a `log_to_metric` configuration bug where the `all_metrics` field could not be used without also specifying `metrics`. It can now be set independently.
+				"""
+			contributors: ["pront"]
+		},
+		{
+			type: "fix"
+			description: """
+				The `log_to_metric` transforms now emits a pair expansion error. This error was previously silently ignored.
+				"""
+			contributors: ["pront"]
+		},
+		{
+			type: "enhancement"
+			description: """
+				The `protobuf` codecs now support all telemetry data types (logs, metrics, traces).
+				"""
+			contributors: ["pront"]
+		},
+		{
+			type: "feat"
+			description: """
+				Adds support for Redis Sentinel in the `redis` sink.
+				"""
+			contributors: ["5Dev24"]
+		},
+		{
+			type: "feat"
+			description: """
+				Adds support for the Redis ZADD command in the `redis` sink.
+				"""
+			contributors: ["5Dev24"]
+		},
+		{
+			type: "enhancement"
+			description: """
+				The `UnsignedIntTemplate` now supports `strftime` formatting. For example, this `%Y%m%d%H` template will evaluate timestamps to a number.
+				"""
+			contributors: ["5Dev24"]
+		},
+	]
+
+	vrl_changelog: """
+		### 0.26.0
+		
+		#### Breaking Changes & Upgrade Guide
+		
+		- The `parse_cef` now trims unnecessary whitespace around escaped values in both headers and extension fields, improving accuracy and reliability when dealing with messy input strings.
+			authors: yjagdale (https://github.com/vectordotdev/vrl/pull/1430)
+
+		- The `parse_syslog` function now treats RFC 3164 structured data items with no parameters (e.g., `[exampleSDID@32473]`) as part of the main
+		message, rather than parsing them as structured data. Items with parameters (e.g., `[exampleSDID@32473 field="value"]`) continue to be
+		parsed as structured data. (https://github.com/vectordotdev/vrl/pull/1435)
+
+		- `encode_lz4`  no longer prepends the uncompressed size by default, improving compatibility with standard LZ4 tools. A new `prepend_size` flag restores the old behavior if needed. Also, `decode_lz4` now also accepts `prepend_size` and a `buf_size` option (default: 1MB).
+			authors: jlambatl (https://github.com/vectordotdev/vrl/pull/1447)
+		
+		#### New Features
+		
+		- Added `haversine` function for calculating [haversine](https://en.wikipedia.org/wiki/Haversine_formula) distance and bearing.
+			authors: esensar Quad9DNS (https://github.com/vectordotdev/vrl/pull/1442)
+
+		- Add `validate_json_schema` function for validating JSON payloads against JSON schema files. A optional configuration parameter `ignore_unknown_formats` is provided to change how custom formats are handled by the validator. Unknown formats can be silently ignored by setting this to `true` and validation continues without failing due to those fields.
+			authors: jlambatl (https://github.com/vectordotdev/vrl/pull/1443)
+		"""
+
+	commits: [
+		{sha: "d61446d7471c5c469c77d95591fd46f7da12d33f", date: "2025-06-26 20:38:07 UTC", description: "use defaults in changes.yml", pr_number: 23273, scopes: ["ci"], type: "chore", breaking_change: false, author: "Thomas", files_count: 6, insertions_count: 11, deletions_count: 21},
+		{sha: "25354f71c3df586ecc4402b8bc56841d0ad53c25", date: "2025-06-26 20:59:16 UTC", description: "it suite should run when manually evoked", pr_number: 23274, scopes: ["ci"], type: "fix", breaking_change: false, author: "Pavlos Rontidis", files_count: 1, insertions_count: 8, deletions_count: 37},
+		{sha: "889760f4a7942136bbedd3640bf289d11bb8f906", date: "2025-06-26 22:13:36 UTC", description: "fix shebangs", pr_number: 23276, scopes: ["dev"], type: "chore", breaking_change: false, author: "Thomas", files_count: 9, insertions_count: 9, deletions_count: 9},
+		{sha: "6d484ae90547ebd51ecdee89cb268644b31a4cda", date: "2025-06-27 00:32:43 UTC", description: "Use source changes in integration.yml", pr_number: 23278, scopes: ["ci"], type: "fix", breaking_change: false, author: "Thomas", files_count: 1, insertions_count: 4, deletions_count: 3},
+		{sha: "7f6c41ec69d0f256941be6842a5639e7254850cb", date: "2025-06-27 17:51:13 UTC", description: "require changes to run before downloading artifacts", pr_number: 23281, scopes: ["ci"], type: "fix", breaking_change: false, author: "Thomas", files_count: 1, insertions_count: 1, deletions_count: 0},
+		{sha: "282dfe0d248e12e9e6b7616bdedecf9a9a43d5fa", date: "2025-06-27 18:01:23 UTC", description: "require changes to run before downloading artifacts", pr_number: 23283, scopes: ["ci"], type: "fix", breaking_change: false, author: "Thomas", files_count: 1, insertions_count: 1, deletions_count: 0},
+		{sha: "0557e86edfa4b2deed43a8fe06b11e788e37afeb", date: "2025-06-27 21:57:01 UTC", description: "use YAML for the default config language", pr_number: 23285, scopes: ["website"], type: "chore", breaking_change: false, author: "Thomas", files_count: 1, insertions_count: 1, deletions_count: 1},
+		{sha: "9bee1411c0d23c7a4f4571287230382aaf0c9c36", date: "2025-06-30 16:41:07 UTC", description: "add workflow_dispatch to msrv", pr_number: 23294, scopes: ["ci"], type: "feat", breaking_change: false, author: "Thomas", files_count: 1, insertions_count: 1, deletions_count: 0},
+		{sha: "326caa5c33129f6280885f10a84073a7b39e554a", date: "2025-06-30 17:32:32 UTC", description: "add ability to specify checkout ref in msrv.yml", pr_number: 23295, scopes: ["ci"], type: "feat", breaking_change: false, author: "Thomas", files_count: 1, insertions_count: 8, deletions_count: 1},
+		{sha: "0fef6b2f86eeb6e94c01b1f9af725605b2eee496", date: "2025-06-30 18:07:17 UTC", description: "bump cargo-msrv version", pr_number: 23296, scopes: ["ci"], type: "chore", breaking_change: false, author: "Thomas", files_count: 1, insertions_count: 1, deletions_count: 1},
+		{sha: "6ad09472e986833b7a5b48776767cfe916d03726", date: "2025-06-30 23:19:33 UTC", description: "Bump nom from 7.1.3 to 8.0.0", pr_number: 22302, scopes: ["deps"], type: "chore", breaking_change: false, author: "dependabot[bot]", files_count: 6, insertions_count: 46, deletions_count: 26},
+		{sha: "a16f8301112e2292bf74f63193c8fa38b1171f58", date: "2025-07-01 02:41:18 UTC", description: "Bump bollard from 0.16.1 to 0.19.1", pr_number: 20958, scopes: ["deps"], type: "chore", breaking_change: false, author: "dependabot[bot]", files_count: 6, insertions_count: 163, deletions_count: 129},
+		{sha: "833eece934379c86c0129e84dec93497faadb669", date: "2025-07-01 00:38:54 UTC", description: "improve minor release documentation", pr_number: 23298, scopes: ["releasing"], type: "chore", breaking_change: false, author: "Thomas", files_count: 2, insertions_count: 14, deletions_count: 10},
+		{sha: "dd205d3593e65f1e2c4613414a2b2d59ad74018a", date: "2025-07-01 04:42:53 UTC", description: "Bump governor from 0.7.0 to 0.8.1", pr_number: 22555, scopes: ["deps"], type: "chore", breaking_change: false, author: "dependabot[bot]", files_count: 3, insertions_count: 9, deletions_count: 12},
+		{sha: "bf5d9d05f09b72579ae27a2204f07d1495859e3e", date: "2025-07-01 13:07:09 UTC", description: "use connect_with_local_defaults on all platforms", pr_number: 21088, scopes: ["deps"], type: "chore", breaking_change: false, author: "Bing Wang", files_count: 2, insertions_count: 3, deletions_count: 13},
+		{sha: "ed93c1deeed38fc4ef3323cf79b9423bd8d743e1", date: "2025-07-01 01:35:28 UTC", description: "prep next version and cherry pick release", pr_number: 23300, scopes: ["releasing"], type: "chore", breaking_change: false, author: "Thomas", files_count: 46, insertions_count: 328, deletions_count: 99},
+		{sha: "3281b07f4f4516d408ab7c300bdc7c3cf563702f", date: "2025-07-01 17:46:28 UTC", description: "Bump proptest from 1.6.0 to 1.7.0", pr_number: 23312, scopes: ["deps"], type: "chore", breaking_change: false, author: "dependabot[bot]", files_count: 5, insertions_count: 12, deletions_count: 12},
+		{sha: "b8edba0f58dda2c73a7351c2da7a12e9ef2aa2cd", date: "2025-07-01 17:54:14 UTC", description: "Bump lru from 0.14.0 to 0.15.0", pr_number: 23303, scopes: ["deps"], type: "chore", breaking_change: false, author: "dependabot[bot]", files_count: 2, insertions_count: 4, deletions_count: 4},
+		{sha: "47cf6acb68ca347e1d48f14456087620bac5c108", date: "2025-07-01 18:05:06 UTC", description: "Bump mock_instant from 0.5.3 to 0.6.0", pr_number: 23301, scopes: ["deps"], type: "chore", breaking_change: false, author: "dependabot[bot]", files_count: 2, insertions_count: 3, deletions_count: 3},
+		{sha: "ffacb27885f5dab2e6ff3a024563d4b3f813b4b8", date: "2025-07-01 22:11:57 UTC", description: "Bump the patches group with 14 updates", pr_number: 23305, scopes: ["deps"], type: "chore", breaking_change: false, author: "dependabot[bot]", files_count: 3, insertions_count: 219, deletions_count: 129},
+		{sha: "4f7195e554509bbeead4a311f4913fb1b56e9ca7", date: "2025-07-01 22:13:48 UTC", description: "Bump security-framework from 2.10.0 to 3.2.0", pr_number: 23314, scopes: ["deps"], type: "chore", breaking_change: false, author: "dependabot[bot]", files_count: 2, insertions_count: 2, deletions_count: 2},
+		{sha: "c59788eb3cab9e92f53acb81a2ae778145032ae4", date: "2025-07-01 22:14:21 UTC", description: "Bump the aws group with 4 updates", pr_number: 23306, scopes: ["deps"], type: "chore", breaking_change: false, author: "dependabot[bot]", files_count: 2, insertions_count: 12, deletions_count: 16},
+		{sha: "03db0287b9452465138b89f2ddee5aacbe530cb7", date: "2025-07-01 22:20:36 UTC", description: "Bump roaring from 0.10.12 to 0.11.0", pr_number: 23311, scopes: ["deps"], type: "chore", breaking_change: false, author: "dependabot[bot]", files_count: 2, insertions_count: 3, deletions_count: 3},
+		{sha: "f491a3a5766bce28a21d00c60cb1eb1b77a98600", date: "2025-07-01 22:21:35 UTC", description: "Bump indexmap from 2.9.0 to 2.10.0", pr_number: 23308, scopes: ["deps"], type: "chore", breaking_change: false, author: "dependabot[bot]", files_count: 3, insertions_count: 29, deletions_count: 29},
+		{sha: "8d4c0918740678fbe3f635c2a2be4be3effc6876", date: "2025-07-01 18:32:09 UTC", description: "install datadog-ci correctly", pr_number: 23318, scopes: ["ci"], type: "fix", breaking_change: false, author: "Pavlos Rontidis", files_count: 1, insertions_count: 2, deletions_count: 3},
+		{sha: "68f7ebc31a3084ddda4c0247022a8f8cfc995801", date: "2025-07-01 20:28:54 UTC", description: "navigation overhaul - part 1", pr_number: 23320, scopes: ["website"], type: "feat", breaking_change: false, author: "Pavlos Rontidis", files_count: 34, insertions_count: 81, deletions_count: 132},
+		{sha: "86b3235e33c3448f356312a7a04af4ed69e6fd74", date: "2025-07-01 20:56:01 UTC", description: "fix broken links due to // in vrl_expressions", pr_number: 23321, scopes: ["website"], type: "fix", breaking_change: false, author: "Thomas", files_count: 1, insertions_count: 2, deletions_count: 2},
+		{sha: "39b6277a5c2ece171a7b810b3bdbd57763a68bdb", date: "2025-07-02 01:51:52 UTC", description: "Bump docker/setup-buildx-action from 3.10.0 to 3.11.1", pr_number: 23322, scopes: ["ci"], type: "chore", breaking_change: false, author: "dependabot[bot]", files_count: 3, insertions_count: 4, deletions_count: 4},
+		{sha: "d8f74708a2703c7f31487482a395d2f4021887ff", date: "2025-07-01 23:43:29 UTC", description: "Bump syslog_loose from 0.21.0 to 0.22.0", pr_number: 23315, scopes: ["deps"], type: "chore", breaking_change: false, author: "dependabot[bot]", files_count: 2, insertions_count: 13, deletions_count: 3},
+		{sha: "dff8802ddc8ea30b2929ce3bc017d7486aa12a9d", date: "2025-07-02 05:02:17 UTC", description: "Bump redis from 0.24.0 to 0.32.3", pr_number: 23307, scopes: ["deps"], type: "chore", breaking_change: false, author: "dependabot[bot]", files_count: 5, insertions_count: 22, deletions_count: 25},
+		{sha: "90ba7c4efe2c1d3540ae99c3db1ec32e2e6bce07", date: "2025-07-02 01:23:08 UTC", description: "navigation overhaul part 2", pr_number: 23324, scopes: ["website"], type: "chore", breaking_change: false, author: "Pavlos Rontidis", files_count: 153, insertions_count: 346, deletions_count: 375},
+		{sha: "a9104b89b6b120160f4321562a7529acc5b50f94", date: "2025-07-02 20:56:49 UTC", description: "updated multiple broken links", pr_number: 23328, scopes: ["website"], type: "fix", breaking_change: false, author: "Pavlos Rontidis", files_count: 29, insertions_count: 87, deletions_count: 157},
+		{sha: "a8f54ebbb00eb7c8b8630bace36f8fe4b9f0b014", date: "2025-07-02 22:29:27 UTC", description: "remove leftover dbg statement", pr_number: 23331, scopes: ["website"], type: "fix", breaking_change: false, author: "Pavlos Rontidis", files_count: 1, insertions_count: 0, deletions_count: 2},
+		{sha: "7847e9253cbdb66550255c7fa2a274128f8b2835", date: "2025-07-03 05:16:56 UTC", description: "fix vector exiting if nats sink url fails dns resolution or is unavailable without --require-healthy", pr_number: 23287, scopes: ["nats sink"], type: "fix", breaking_change: false, author: "rdwr-tomers", files_count: 3, insertions_count: 32, deletions_count: 7},
+		{sha: "c4ace5b5147b328bbf2b81984ffaf25090362d88", date: "2025-07-03 04:59:08 UTC", description: "run a separate task for utilization metric to ensure it is regularly updated", pr_number: 22070, scopes: ["metrics"], type: "fix", breaking_change: false, author: "Ensar Sarajčić", files_count: 4, insertions_count: 213, deletions_count: 72},
+		{sha: "2fa1b6bf207539b931d370bbaa752ac2c79a1899", date: "2025-07-03 00:05:51 UTC", description: "Bump criterion from 0.5.1 to 0.6.0", pr_number: 23133, scopes: ["deps"], type: "chore", breaking_change: false, author: "dependabot[bot]", files_count: 8, insertions_count: 13, deletions_count: 18},
+		{sha: "65d6a86a48e36bb19e8b014b888a979687dd0b27", date: "2025-07-03 20:00:25 UTC", description: "remove broken metrics table rendering", pr_number: 23335, scopes: ["website"], type: "fix", breaking_change: false, author: "Pavlos Rontidis", files_count: 2, insertions_count: 2, deletions_count: 41},
+		{sha: "21bb9f7ed92c98649c89835669a8628bdc51f048", date: "2025-07-03 21:23:51 UTC", description: "integration remove useless setup job", pr_number: 23337, scopes: ["ci"], type: "fix", breaking_change: false, author: "Thomas", files_count: 1, insertions_count: 0, deletions_count: 15},
+		{sha: "1c4472a07e479976eb061d1fbda2f44e184ec8df", date: "2025-07-04 05:09:54 UTC", description: "Bump databend-client from 0.22.2 to 0.27.1", pr_number: 22301, scopes: ["deps"], type: "chore", breaking_change: false, author: "dependabot[bot]", files_count: 6, insertions_count: 71, deletions_count: 31},
+		{sha: "a2c6c442d8254b11d013bf4d2a88f84e5b08d0a6", date: "2025-07-07 19:01:11 UTC", description: "add TTL-based cache for metric sets and add expire_metrics_secs for Prometheus remote write sink", pr_number: 23286, scopes: ["metrics"], type: "feat", breaking_change: false, author: "Derek Zhang", files_count: 7, insertions_count: 242, deletions_count: 45},
+		{sha: "33e44aeaff314a2bf16db8c89f8bb81a92c2d97e", date: "2025-07-08 03:12:39 UTC", description: "Bump serde_with from 3.12.0 to 3.14.0", pr_number: 23313, scopes: ["deps"], type: "chore", breaking_change: false, author: "dependabot[bot]", files_count: 6, insertions_count: 64, deletions_count: 16},
+		{sha: "eb4cb46ccd4a24f06cdb2c969efe87ba734f053d", date: "2025-07-08 21:39:51 UTC", description: "Bump libz-sys for macos compatibility", pr_number: 23347, scopes: ["dev"], type: "chore", breaking_change: false, author: "bas smit", files_count: 1, insertions_count: 2, deletions_count: 2},
+		{sha: "fc8a51de7b5c0f29a06cf6b07f1828c5ce2882aa", date: "2025-07-09 00:00:38 UTC", description: "potential hang in ConcurrentMap", pr_number: 23340, scopes: ["core"], type: "fix", breaking_change: false, author: "Jorge Hermo", files_count: 3, insertions_count: 28, deletions_count: 2},
+		{sha: "a3f648f5351877102d3eb0645492de0a381e000e", date: "2025-07-08 23:15:41 UTC", description: "Bump goauth from 0.14.0 to 0.16.0", pr_number: 20688, scopes: ["deps"], type: "chore", breaking_change: false, author: "dependabot[bot]", files_count: 3, insertions_count: 26, deletions_count: 6},
+		{sha: "31756e041a0652de6e7fbf06369cc502132f91a0", date: "2025-07-10 05:34:46 UTC", description: "update file websocket_server.cue", pr_number: 23348, scopes: ["external"], type: "docs", breaking_change: false, author: "Erlang Parasu", files_count: 1, insertions_count: 1, deletions_count: 1},
+		{sha: "1102f897dfea8cc14255228add5daf54191c0da2", date: "2025-07-09 18:10:54 UTC", description: "add optional wildcard search parameter", pr_number: 23074, scopes: ["enriching"], type: "enhancement", breaking_change: false, author: "Nick Wang", files_count: 14, insertions_count: 384, deletions_count: 45},
+		{sha: "ca0b95121137a35466d472c741c0a897e6061e7c", date: "2025-07-10 19:47:23 UTC", description: "Rename base to generated", pr_number: 23353, scopes: ["website"], type: "chore", breaking_change: false, author: "Thomas", files_count: 256, insertions_count: 280, deletions_count: 280},
+		{sha: "18f3055d89041bfd2ac7e4303f41a9b37cce0938", date: "2025-07-10 21:03:28 UTC", description: "Updated `replace` capture group example ", pr_number: 18785, scopes: ["external"], type: "docs", breaking_change: false, author: "pezkins", files_count: 1, insertions_count: 3, deletions_count: 1},
+		{sha: "a9366ad55888c85258d0be206710e44a3de389df", date: "2025-07-11 18:40:13 UTC", description: "re-enable splunk ITs", pr_number: 23360, scopes: ["ci"], type: "fix", breaking_change: false, author: "Pavlos Rontidis", files_count: 1, insertions_count: 1, deletions_count: 2},
+		{sha: "f83b7e0ba32167ded8d007461298a9aea11ee7d8", date: "2025-07-12 10:04:34 UTC", description: "add query_settings to clickhouse sink", pr_number: 22764, scopes: ["clickhouse sink"], type: "feat", breaking_change: false, author: "Pomin Wu", files_count: 7, insertions_count: 211, deletions_count: 12},
+		{sha: "8d95e2318fd95f57b2ee76069a7a7bfea961bc99", date: "2025-07-14 17:59:48 UTC", description: "unreadable interval_ms", pr_number: 23361, scopes: ["core"], type: "fix", breaking_change: false, author: "Thomas", files_count: 4, insertions_count: 245, deletions_count: 116},
+		{sha: "b63361ae2c908d1d2547d37da69d010cbf728112", date: "2025-07-14 19:45:42 UTC", description: "Ensure that batches using newline delimited framing end in a newline", pr_number: 21097, scopes: ["codecs"], type: "fix", breaking_change: false, author: "Jesse Szwedko", files_count: 3, insertions_count: 32, deletions_count: 7},
+		{sha: "25353d2976285b29127730f27b76d01e0c537a50", date: "2025-07-15 04:22:36 UTC", description: "Bump brace-expansion from 1.1.11 to 1.1.12 in /website in the npm_and_yarn group", pr_number: 23372, scopes: ["website deps"], type: "chore", breaking_change: false, author: "dependabot[bot]", files_count: 1, insertions_count: 3, deletions_count: 3},
+		{sha: "d86dc3bd6186a283b6c10e1d242695ca5c96009a", date: "2025-07-15 01:53:51 UTC", description: "remove token permissions for changelog workflow", pr_number: 23376, scopes: ["ci"], type: "fix", breaking_change: false, author: "Thomas", files_count: 1, insertions_count: 4, deletions_count: 0},
+		{sha: "c5a98b2497cae632df1e51a7048af039f4802a5d", date: "2025-07-15 07:36:15 UTC", description: "templateable uri", pr_number: 23288, scopes: ["http sink"], type: "feat", breaking_change: false, author: "Jorge Hermo", files_count: 12, insertions_count: 419, deletions_count: 49},
+		{sha: "8c199ace3384acb71bc2337f5057976c6827d418", date: "2025-07-14 22:54:38 UTC", description: "Add ability to configure request errors to retry ", pr_number: 23206, scopes: ["aws_s3 sink"], type: "enhancement", breaking_change: false, author: "Joe Chapman", files_count: 6, insertions_count: 102, deletions_count: 11},
+		{sha: "3ab75690b3b1e9ae0a58a61ac917a1aa6c78fcc6", date: "2025-07-15 17:52:29 UTC", description: "remove EOL Debian Buster 10", pr_number: 23380, scopes: ["ci"], type: "fix", breaking_change: false, author: "Thomas", files_count: 1, insertions_count: 0, deletions_count: 1},
+		{sha: "5ff037bfb95ea62d1faa1ef6267be8ba4a2c6080", date: "2025-07-15 20:46:14 UTC", description: "rename name for publish-github job", pr_number: 23381, scopes: ["ci"], type: "chore", breaking_change: false, author: "Thomas", files_count: 1, insertions_count: 1, deletions_count: 1},
+		{sha: "121b9da9e45e372b9f205cec7830e5a054cf0a21", date: "2025-07-15 20:49:36 UTC", description: "Add support for `max_bytes` for memory buffers", pr_number: 23330, scopes: ["sinks"], type: "enhancement", breaking_change: false, author: "Rob Blafford", files_count: 16, insertions_count: 409, deletions_count: 147},
+		{sha: "00c554f87ecfaa225a9523789648ed2362070623", date: "2025-07-15 21:08:46 UTC", description: "`metrics-tag-values: full` made tags unmodifiable", pr_number: 23371, scopes: ["core"], type: "fix", breaking_change: false, author: "Thomas", files_count: 2, insertions_count: 47, deletions_count: 13},
+		{sha: "b2c6c79864b06e81c2ac73657e1a31a0c2b8d991", date: "2025-07-16 01:51:15 UTC", description: "Bump sysinfo from 0.34.2 to 0.35.1", pr_number: 23138, scopes: ["deps"], type: "chore", breaking_change: false, author: "dependabot[bot]", files_count: 3, insertions_count: 81, deletions_count: 24},
+		{sha: "600f3457100bc097c68edaf6882be97c609f85ac", date: "2025-07-16 00:48:33 UTC", description: "checkout changelog script from master", pr_number: 23382, scopes: ["ci"], type: "fix", breaking_change: false, author: "Thomas", files_count: 2, insertions_count: 12, deletions_count: 2},
+		{sha: "efc1c5d6da5f09bd7e2ea8f140b1a753b731794e", date: "2025-07-16 17:29:51 UTC", description: "add MIT-0 to allowed licenses", pr_number: 23386, scopes: ["ci"], type: "fix", breaking_change: false, author: "Pavlos Rontidis", files_count: 1, insertions_count: 1, deletions_count: 0},
+		{sha: "e7de566922b6dc12c946829667379168fe49c0ba", date: "2025-07-17 04:05:43 UTC", description: "opensearch credentials provided in uri not used", pr_number: 23367, scopes: ["elasticsearch sink"], type: "fix", breaking_change: false, author: "Yao Noel Achi", files_count: 5, insertions_count: 185, deletions_count: 39},
+		{sha: "29b323670bcc6ab1baec11cb865b927816aa954e", date: "2025-07-17 18:33:16 UTC", description: "use Debian-native bind package", pr_number: 23389, scopes: ["ci"], type: "fix", breaking_change: false, author: "Pavlos Rontidis", files_count: 1, insertions_count: 2, deletions_count: 6},
+		{sha: "e3ee69876173073f30c3a7a9634dab6e960e20de", date: "2025-07-18 08:36:19 UTC", description: "add timezone option, add performance timing into VRL Playground Website", pr_number: 23343, scopes: ["website"], type: "feat", breaking_change: false, author: "Forking Frenzy", files_count: 6, insertions_count: 137, deletions_count: 17},
+		{sha: "87925298c54984812cc63799f1ccde7c74497865", date: "2025-07-17 18:18:38 UTC", description: "Allow strftime in UnsignedIntTemplate", pr_number: 23387, scopes: ["templating"], type: "enhancement", breaking_change: false, author: "Jake Halaska", files_count: 2, insertions_count: 55, deletions_count: 3},
+		{sha: "74173af63a84695e29d3c3c3ad840c436f5c7832", date: "2025-07-17 23:23:21 UTC", description: "bump Rust toolchain to 1.88", pr_number: 23388, scopes: ["dev"], type: "chore", breaking_change: false, author: "Pavlos Rontidis", files_count: 292, insertions_count: 917, deletions_count: 1169},
+		{sha: "c011a59dae9eac97dcab103f3824c8b0e1a3c730", date: "2025-07-18 18:24:49 UTC", description: "split up test.yml", pr_number: 23383, scopes: ["ci"], type: "feat", breaking_change: false, author: "Thomas", files_count: 3, insertions_count: 160, deletions_count: 86},
+		{sha: "2d4bc0b7d40f5621f99617dcb047e190650526ae", date: "2025-07-18 18:58:40 UTC", description: "pass in GITHUB_TOKEN to bypass rate limits", pr_number: 23396, scopes: ["ci"], type: "fix", breaking_change: false, author: "Thomas", files_count: 1, insertions_count: 5, deletions_count: 0},
+		{sha: "6a6ffa591320bd6c64e6b8b1ec4a42f4ebc17fd1", date: "2025-07-18 22:32:31 UTC", description: "switch to 2024 edition", pr_number: 23395, scopes: ["dev"], type: "chore", breaking_change: false, author: "Pavlos Rontidis", files_count: 60, insertions_count: 328, deletions_count: 275},
+		{sha: "abe333808352eeb71b2e8e2dfe54757f3ff50a78", date: "2025-07-18 22:34:19 UTC", description: "merge test/test-component-validation and upload results", pr_number: 23397, scopes: ["ci"], type: "chore", breaking_change: false, author: "Thomas", files_count: 1, insertions_count: 11, deletions_count: 14},
+		{sha: "af3ec0cfb7106b8f8615d27bfe3eb37f8d2471a0", date: "2025-07-18 23:49:33 UTC", description: "remove unused AWS env vars", pr_number: 23401, scopes: ["ci"], type: "chore", breaking_change: false, author: "Thomas", files_count: 4, insertions_count: 0, deletions_count: 8},
+		{sha: "659a3c3b8afaf3543b6603a9b32db8e8da0666c2", date: "2025-07-19 00:00:52 UTC", description: "allow unused var ", pr_number: 23400, scopes: ["elasticsearch sink"], type: "fix", breaking_change: false, author: "Thomas", files_count: 1, insertions_count: 1, deletions_count: 1},
+		{sha: "1d699ee10269b3e35a3038cab12e98e80d3a4eb3", date: "2025-07-19 00:20:32 UTC", description: "only install datadog-ci if int test runs", pr_number: 23402, scopes: ["ci"], type: "chore", breaking_change: false, author: "Thomas", files_count: 1, insertions_count: 2, deletions_count: 3},
+		{sha: "3abcebd28641a14a664756a3efd36f728b8e6ecd", date: "2025-07-19 00:25:01 UTC", description: "Compare correct decoded byte size in Validator tests", pr_number: 23399, scopes: ["codecs"], type: "chore", breaking_change: false, author: "Rob Blafford", files_count: 1, insertions_count: 6, deletions_count: 3},
+		{sha: "a1a75400919eb308b4895951df22c052468ea57b", date: "2025-07-19 00:42:28 UTC", description: "add workflow badges", pr_number: 23398, scopes: ["dev"], type: "chore", breaking_change: false, author: "Pavlos Rontidis", files_count: 1, insertions_count: 8, deletions_count: 3},
+		{sha: "d654fddd33d0988d3a7272a2257e101933783f5a", date: "2025-07-19 15:12:15 UTC", description: "add documentation for validate_json_schema() function support in VRL", pr_number: 23359, scopes: ["external"], type: "docs", breaking_change: false, author: "jlambatl", files_count: 2, insertions_count: 80, deletions_count: 0},
+		{sha: "144a0af4e05457e3d4434e934b763d5e09db156c", date: "2025-07-21 18:47:04 UTC", description: "add docs for `haversine` VRL function", pr_number: 23336, scopes: ["external"], type: "docs", breaking_change: false, author: "Ensar Sarajčić", files_count: 4, insertions_count: 79, deletions_count: 7},
+		{sha: "dbeae5d0aa338e9c2ada94b79637663eda5cc571", date: "2025-07-21 17:54:15 UTC", description: "match only when feature is enabled", pr_number: 23404, scopes: ["elasticsearch sink"], type: "fix", breaking_change: false, author: "Thomas", files_count: 1, insertions_count: 4, deletions_count: 2},
+		{sha: "91794109acade46e5482ca7dd2fc962cc88be8e9", date: "2025-07-22 02:53:27 UTC", description: "support custom partitioners for gcs and azure sinks", pr_number: 23403, scopes: ["azure_blob sink"], type: "chore", breaking_change: false, author: "Vladimir Zhuk", files_count: 2, insertions_count: 26, deletions_count: 12},
+		{sha: "3778c089726c4299c292fa10ea25fd30d99e8ce1", date: "2025-07-22 17:21:35 UTC", description: "refactor changelog file fetching", pr_number: 23405, scopes: ["ci"], type: "chore", breaking_change: false, author: "Thomas", files_count: 2, insertions_count: 31, deletions_count: 25},
+		{sha: "4d2472f5b1f5160c3ac9a3b5234b55030adeda99", date: "2025-07-22 19:34:41 UTC", description: "pin macos runner image version", pr_number: 23411, scopes: ["ci"], type: "chore", breaking_change: false, author: "Thomas", files_count: 2, insertions_count: 7, deletions_count: 5},
+		{sha: "ea613700f650bc374d0d15a0c5961e46597e46f8", date: "2025-07-22 22:07:40 UTC", description: "add changelog fragments upper limit per PR", pr_number: 23413, scopes: ["ci"], type: "chore", breaking_change: false, author: "Thomas", files_count: 1, insertions_count: 3, deletions_count: 1},
+		{sha: "d2a439936691c71f07d444f5ce8f80e5d46322bb", date: "2025-07-23 00:30:50 UTC", description: "clippy fixes", pr_number: 23414, scopes: ["dev"], type: "chore", breaking_change: false, author: "Pavlos Rontidis", files_count: 15, insertions_count: 167, deletions_count: 162},
+		{sha: "3068480f39688dac5b08273c16140b87b20badda", date: "2025-07-23 21:42:55 UTC", description: "Bump form-data from 4.0.0 to 4.0.4 in /website in the npm_and_yarn group", pr_number: 23408, scopes: ["website deps"], type: "chore", breaking_change: false, author: "dependabot[bot]", files_count: 2, insertions_count: 105, deletions_count: 12},
+		{sha: "fd7c30231a3ff807a49e93a496741cf006943579", date: "2025-07-23 20:27:35 UTC", description: "pin actions versions", pr_number: 23417, scopes: ["ci"], type: "chore", breaking_change: false, author: "Thomas", files_count: 34, insertions_count: 261, deletions_count: 260},
+		{sha: "f372816f0f8207e251352b512f65268684c2097c", date: "2025-07-24 18:28:23 UTC", description: "remove unnecessary traits", pr_number: 23418, scopes: ["vdev"], type: "chore", breaking_change: false, author: "Thomas", files_count: 10, insertions_count: 135, deletions_count: 106},
+		{sha: "01352255c2f3641c9c492b5b9a9dbd5a822d9a51", date: "2025-07-24 18:49:14 UTC", description: "enhance prepare.sh script", pr_number: 23415, scopes: ["ci"], type: "chore", breaking_change: false, author: "Thomas", files_count: 15, insertions_count: 171, deletions_count: 66},
+		{sha: "774060bcccc11e950048652b463f119789feb4ad", date: "2025-07-24 20:27:04 UTC", description: "reduce arbitrary sleep for IT script", pr_number: 23420, scopes: ["dev"], type: "chore", breaking_change: false, author: "Pavlos Rontidis", files_count: 1, insertions_count: 2, deletions_count: 1},
+		{sha: "379ee5851121c476974d955b57c8cefc7e838624", date: "2025-07-24 22:40:04 UTC", description: "allow running E2E suite manually", pr_number: 23423, scopes: ["ci"], type: "chore", breaking_change: false, author: "Pavlos Rontidis", files_count: 1, insertions_count: 9, deletions_count: 2},
+		{sha: "614e1957d121566eb69edba25473a858afe8bb4e", date: "2025-07-25 00:06:47 UTC", description: "introduce OTEL E2E test", pr_number: 23406, scopes: ["dev"], type: "chore", breaking_change: false, author: "Pavlos Rontidis", files_count: 18, insertions_count: 633, deletions_count: 4},
+		{sha: "b695d2291fab68fd4619d180f06d7790ef3beb88", date: "2025-07-25 00:34:48 UTC", description: "allow running E2E suite manually", pr_number: 23425, scopes: ["ci"], type: "chore", breaking_change: false, author: "Pavlos Rontidis", files_count: 1, insertions_count: 3, deletions_count: 1},
+		{sha: "e4cecb5d81544ecc3fc26734a5e02bd54092f734", date: "2025-07-25 00:40:05 UTC", description: "wait 1s before panicking in test", pr_number: 23424, scopes: ["buffers"], type: "fix", breaking_change: false, author: "Thomas", files_count: 1, insertions_count: 12, deletions_count: 3},
+		{sha: "49fae0916f85cd871e59c423bdc72e3eb5c76dec", date: "2025-07-25 17:03:44 UTC", description: "mark as stable", pr_number: 23431, scopes: ["remap transform"], type: "chore", breaking_change: false, author: "Pavlos Rontidis", files_count: 1, insertions_count: 1, deletions_count: 1},
+		{sha: "9b3fb7b7597c34b86ace31e69fd415301258fc66", date: "2025-07-25 18:28:19 UTC", description: "switch macos to xlarge runner", pr_number: 23433, scopes: ["ci"], type: "chore", breaking_change: false, author: "Thomas", files_count: 1, insertions_count: 1, deletions_count: 1},
+		{sha: "7cf4b0fba0ee2b09e90d5c6066e2058471e6bd42", date: "2025-07-25 20:52:42 UTC", description: "scripts/int-e2e-test.sh debugging improvements", pr_number: 23434, scopes: ["ci"], type: "chore", breaking_change: false, author: "Pavlos Rontidis", files_count: 1, insertions_count: 29, deletions_count: 17},
+		{sha: "af98d9f5afe9fc1d1906279d441cd802bfa85b64", date: "2025-07-25 21:53:05 UTC", description: "e2e otel fixes", pr_number: 23435, scopes: ["ci"], type: "chore", breaking_change: false, author: "Pavlos Rontidis", files_count: 2, insertions_count: 4, deletions_count: 16},
+		{sha: "c0c060e6bbdef860bc348122b0729278beb7fb96", date: "2025-07-25 23:37:58 UTC", description: "use cargo binstall in prepare.sh", pr_number: 23436, scopes: ["ci"], type: "chore", breaking_change: false, author: "Thomas", files_count: 2, insertions_count: 106, deletions_count: 9},
+		{sha: "878708f8cd32dd4724890d51d4b9b27fe6188f55", date: "2025-07-25 23:46:37 UTC", description: "half # of tests ran by quickcheck", pr_number: 23439, scopes: ["file source"], type: "chore", breaking_change: false, author: "Thomas", files_count: 2, insertions_count: 4, deletions_count: 4},
+		{sha: "f136fb48edc1f8b2880a420a4f1aa8d8b457003d", date: "2025-07-28 17:38:25 UTC", description: "skip e2e otel until it's fixed", pr_number: 23445, scopes: ["ci"], type: "chore", breaking_change: false, author: "Pavlos Rontidis", files_count: 1, insertions_count: 7, deletions_count: 6},
+		{sha: "041a3b1727137e80897cac2e2738d0ad4a8f5c8f", date: "2025-07-28 17:39:06 UTC", description: "fix trigger for DD logs E2E", pr_number: 23446, scopes: ["ci"], type: "fix", breaking_change: false, author: "Pavlos Rontidis", files_count: 1, insertions_count: 1, deletions_count: 1},
+		{sha: "0cf042e307c12ad297f73665b08a826dc4e61023", date: "2025-07-28 17:56:45 UTC", description: "remove orphan containers", pr_number: 23444, scopes: ["vdev"], type: "chore", breaking_change: false, author: "Pavlos Rontidis", files_count: 1, insertions_count: 5, deletions_count: 1},
+		{sha: "d24b04686ff2b5454b19aaf0b85c850227e3f50f", date: "2025-07-28 18:36:16 UTC", description: "remove arbitrary sleep", pr_number: 23443, scopes: ["ci"], type: "fix", breaking_change: false, author: "Pavlos Rontidis", files_count: 1, insertions_count: 0, deletions_count: 3},
+		{sha: "a0179dc3bb94f0279dc507db11801ec0765787a9", date: "2025-07-28 21:19:58 UTC", description: "workaround vdev issues by using project-name for debug logs", pr_number: 23454, scopes: ["ci"], type: "chore", breaking_change: false, author: "Pavlos Rontidis", files_count: 1, insertions_count: 2, deletions_count: 11},
+		{sha: "42b8c7966e7a8a7524aa5655c09437d3ace4acac", date: "2025-07-28 22:09:40 UTC", description: "fix vdev stop not cleaning up anything", pr_number: 23450, scopes: ["ci"], type: "fix", breaking_change: false, author: "Pavlos Rontidis", files_count: 1, insertions_count: 3, deletions_count: 3},
+		{sha: "0fd22b3fe5e4974073cc81dd15c3107cd158ad4a", date: "2025-07-28 23:20:29 UTC", description: "ignore flaky diskv2 test", pr_number: 23455, scopes: ["buffers"], type: "chore", breaking_change: false, author: "Thomas", files_count: 1, insertions_count: 1, deletions_count: 0},
+		{sha: "affbcc32f75b81e2e6dc7db2e200db254b7f8184", date: "2025-07-29 17:16:06 UTC", description: "fix and renable otel logs e2e", pr_number: 23459, scopes: ["ci"], type: "chore", breaking_change: false, author: "Pavlos Rontidis", files_count: 7, insertions_count: 62, deletions_count: 57},
+		{sha: "e326e652ec5a3f7304fc2d5eba73b782b6d5ce58", date: "2025-07-29 17:14:48 UTC", description: "Emit log when putting an object to s3-compatible storage", pr_number: 23390, scopes: ["aws_s3 sink"], type: "enhancement", breaking_change: false, author: "Jake Halaska", files_count: 2, insertions_count: 25, deletions_count: 5},
+		{sha: "b77915cfb57ad39689f64773d8f09f968b8486d2", date: "2025-07-30 08:38:03 UTC", description: "vrl encode/decode_lz4 documentation update sibling PR", pr_number: 23378, scopes: ["external"], type: "docs", breaking_change: false, author: "jlambatl", files_count: 3, insertions_count: 43, deletions_count: 7},
+		{sha: "182a309445b083b223291d64fe4f1c48507f8fb0", date: "2025-07-30 10:57:21 UTC", description: "improve readability", pr_number: 23460, scopes: ["external"], type: "docs", breaking_change: false, author: "Benjamin Dornel", files_count: 76, insertions_count: 293, deletions_count: 293},
+		{sha: "7e488ffaaf3bc68855581fdb8dd71dc6f2fbe92b", date: "2025-07-29 22:59:13 UTC", description: "add Redis Sentinel support for redis sink", pr_number: 23355, scopes: ["redis sink"], type: "feat", breaking_change: false, author: "Jake Halaska", files_count: 13, insertions_count: 719, deletions_count: 45},
+		{sha: "f4c1ac570badfeb00564ebd02146b86a6f5bb370", date: "2025-07-30 22:09:02 UTC", description: "bump indicatif to 0.18.0", pr_number: 23470, scopes: ["deps"], type: "chore", breaking_change: false, author: "Thomas", files_count: 2, insertions_count: 3, deletions_count: 3},
+		{sha: "e6bd05955d4418e4beda13e001dd0612de7b42f7", date: "2025-07-30 22:24:55 UTC", description: "improve Vector support page", pr_number: 23471, scopes: ["website"], type: "chore", breaking_change: false, author: "Pavlos Rontidis", files_count: 1, insertions_count: 23, deletions_count: 3},
+		{sha: "2ae37a7ee4e8ee9da2d16e097ca60ecc049c48d6", date: "2025-07-30 23:45:15 UTC", description: "disable splunk ITs", pr_number: 23473, scopes: ["ci"], type: "chore", breaking_change: false, author: "Thomas", files_count: 1, insertions_count: 2, deletions_count: 1},
+		{sha: "48caeaebc78a3d56eff509141d4a87d9fa5a3759", date: "2025-07-31 00:30:25 UTC", description: "remove unused scripts", pr_number: 23462, scopes: ["dev"], type: "chore", breaking_change: false, author: "Thomas", files_count: 7, insertions_count: 0, deletions_count: 555},
+		{sha: "cc78555a413f2cc6506d56b10c89686545aabae5", date: "2025-08-01 00:46:00 UTC", description: "properly disable postgres sink's healthcheck", pr_number: 23441, scopes: ["postgres sink"], type: "fix", breaking_change: false, author: "Jorge Hermo", files_count: 6, insertions_count: 43, deletions_count: 14},
+		{sha: "735b0ee4702067f7d08664cadad72278743a2bc6", date: "2025-08-01 00:50:07 UTC", description: "Update to_unix_timestamp function fallibility status", pr_number: 23466, scopes: ["external"], type: "docs", breaking_change: false, author: "Antoine Sauzeau", files_count: 1, insertions_count: 3, deletions_count: 1},
+		{sha: "aad876a4bb4828c5de2ff9ff99df59399f4127e5", date: "2025-07-31 19:04:30 UTC", description: "bump toml to v9", pr_number: 23475, scopes: ["deps"], type: "chore", breaking_change: false, author: "Thomas", files_count: 10, insertions_count: 93, deletions_count: 34},
+		{sha: "862524746cf3e2d7049aaf812f60f6845c97e67b", date: "2025-07-31 16:11:22 UTC", description: "support for template headers", pr_number: 23422, scopes: ["http sink"], type: "enhancement", breaking_change: false, author: "Taylor Chaparro", files_count: 13, insertions_count: 280, deletions_count: 50},
+		{sha: "c7eaf6529079fb1070f913aaf2a3d5145c5f4001", date: "2025-07-31 19:45:16 UTC", description: "correctly set HOSTNAME in docker environment", pr_number: 23452, scopes: ["dev"], type: "fix", breaking_change: false, author: "Thomas", files_count: 2, insertions_count: 17, deletions_count: 3},
+		{sha: "f64089a198291de31f7c15affe423737600a6dc3", date: "2025-08-01 04:41:52 UTC", description: "Prevent negative buffer size and event gauges", pr_number: 23453, scopes: ["buffers"], type: "fix", breaking_change: false, author: "Vitalii Parfonov", files_count: 6, insertions_count: 259, deletions_count: 16},
+		{sha: "af893011aea9fa39817deaf5c26b1c7bab890d1b", date: "2025-08-02 02:04:00 UTC", description: "allowed symbols in secrets #23220", pr_number: 23465, scopes: ["config"], type: "fix", breaking_change: false, author: "Danila Matveev", files_count: 2, insertions_count: 7, deletions_count: 2},
+		{sha: "46689f41145826611b82ad14b50ccc3fa2bfcc83", date: "2025-08-01 18:29:10 UTC", description: "Bump crc32fast from 1.4.2 to 1.5.0", pr_number: 23496, scopes: ["deps"], type: "chore", breaking_change: false, author: "dependabot[bot]", files_count: 2, insertions_count: 3, deletions_count: 3},
+		{sha: "8e33bb236b3fe8492b7a8cbe621db57e229bdba8", date: "2025-08-01 18:29:13 UTC", description: "update deps and add some workspace deps", pr_number: 23476, scopes: ["deps"], type: "chore", breaking_change: false, author: "Thomas", files_count: 3, insertions_count: 9, deletions_count: 7},
+		{sha: "64e26937616e5f71321a97d1e61beb297a96ac97", date: "2025-08-01 22:32:56 UTC", description: "Bump proptest-derive from 0.5.1 to 0.6.0", pr_number: 23494, scopes: ["deps"], type: "chore", breaking_change: false, author: "dependabot[bot]", files_count: 2, insertions_count: 4, deletions_count: 15},
+		{sha: "81e238e0fc5dab87af618574bc363fcb5fb6a7cf", date: "2025-08-01 22:35:42 UTC", description: "Bump lru from 0.15.0 to 0.16.0", pr_number: 23495, scopes: ["deps"], type: "chore", breaking_change: false, author: "dependabot[bot]", files_count: 2, insertions_count: 4, deletions_count: 4},
+		{sha: "10795e9d7fd080cd49976eecb8654a69a2d0c05a", date: "2025-08-01 22:39:21 UTC", description: "Bump rstest from 0.25.0 to 0.26.1", pr_number: 23492, scopes: ["deps"], type: "chore", breaking_change: false, author: "dependabot[bot]", files_count: 3, insertions_count: 6, deletions_count: 7},
+		{sha: "9bd70fddcba34e4f8f65c961a17a179349fa0c64", date: "2025-08-01 23:50:04 UTC", description: "Bump opendal from 0.53.3 to 0.54.0", pr_number: 23490, scopes: ["deps"], type: "chore", breaking_change: false, author: "dependabot[bot]", files_count: 3, insertions_count: 31, deletions_count: 8},
+		{sha: "6a17a5423d886d98e96d8a4bc24bbfb03a6785d3", date: "2025-08-02 07:55:48 UTC", description: "add initial `websocket` source", pr_number: 23449, scopes: ["new source"], type: "feat", breaking_change: false, author: "Benjamin Dornel", files_count: 27, insertions_count: 2578, deletions_count: 408},
+		{sha: "963219f6449ae6504bcd053cbf16a87847df1f32", date: "2025-08-02 00:02:25 UTC", description: "Bump criterion from 0.6.0 to 0.7.0", pr_number: 23493, scopes: ["deps"], type: "chore", breaking_change: false, author: "dependabot[bot]", files_count: 7, insertions_count: 11, deletions_count: 11},
+		{sha: "c4db7972cdfcc94dc8bba13b3ccae34de890d8c8", date: "2025-08-01 21:13:32 UTC", description: "Bump databend-client from 0.27.1 to 0.28.0", pr_number: 23491, scopes: ["deps"], type: "chore", breaking_change: false, author: "dependabot[bot]", files_count: 2, insertions_count: 6, deletions_count: 5},
+		{sha: "d1ecc0499c6a89aeed25cbdefffe7524ee7abc4f", date: "2025-08-02 01:19:31 UTC", description: "Bump github/codeql-action from 3.29.4 to 3.29.5", pr_number: 23505, scopes: ["ci"], type: "chore", breaking_change: false, author: "dependabot[bot]", files_count: 1, insertions_count: 1, deletions_count: 1},
+		{sha: "81b05d1869cfb7f6a8b97fbc41d01a69b2e28edd", date: "2025-08-02 09:20:44 UTC", description: "treat websocket source tests as unit", pr_number: 23503, scopes: ["websocket source"], type: "fix", breaking_change: false, author: "Benjamin Dornel", files_count: 3, insertions_count: 2, deletions_count: 4},
+		{sha: "9f95c21f5644f6a109c0439bce90835824623f84", date: "2025-08-02 01:38:01 UTC", description: "Bump docker/metadata-action from 5.7.0 to 5.8.0", pr_number: 23506, scopes: ["ci"], type: "chore", breaking_change: false, author: "dependabot[bot]", files_count: 1, insertions_count: 1, deletions_count: 1},
+		{sha: "2003d617c7befdc7aa7f73a37263d272cd4a3718", date: "2025-08-02 01:38:44 UTC", description: "Bump notify from 8.0.0 to 8.1.0", pr_number: 23489, scopes: ["deps"], type: "chore", breaking_change: false, author: "dependabot[bot]", files_count: 3, insertions_count: 6, deletions_count: 29},
+		{sha: "ab36caa0f85f4d22358f0a31621b341311eb61d6", date: "2025-08-04 17:41:51 UTC", description: "Bump the patches group with 20 updates", pr_number: 23484, scopes: ["deps"], type: "chore", breaking_change: false, author: "dependabot[bot]", files_count: 6, insertions_count: 110, deletions_count: 125},
+		{sha: "51f39d67e56e5d998172b3d5749e23857de01ee7", date: "2025-08-05 09:21:48 UTC", description: "Fix instances of removed to_timestamp in documentation", pr_number: 23512, scopes: ["external"], type: "docs", breaking_change: false, author: "岡崎", files_count: 1, insertions_count: 1, deletions_count: 1},
+		{sha: "1a07ec4ea801ee778b128abf4fd8410052ca6ac7", date: "2025-08-05 19:26:34 UTC", description: "fix config parsing", pr_number: 23526, scopes: ["log_to_metric transform"], type: "fix", breaking_change: false, author: "Pavlos Rontidis", files_count: 3, insertions_count: 67, deletions_count: 83},
+		{sha: "71b378aedb993f78d5dc6febbaffb1c37c1f88fd", date: "2025-08-05 20:20:37 UTC", description: "rename 'common' to 'minimal'", pr_number: 23527, scopes: ["website"], type: "chore", breaking_change: false, author: "Pavlos Rontidis", files_count: 2, insertions_count: 22, deletions_count: 22},
+		{sha: "06727eb0f1dd1fb3b4c6229ea5017a7afdc376a0", date: "2025-08-05 20:07:39 UTC", description: "add Redis ZADD support for redis sink", pr_number: 23464, scopes: ["redis sink"], type: "feat", breaking_change: false, author: "Jake Halaska", files_count: 10, insertions_count: 302, deletions_count: 45},
+		{sha: "1be6a9b6650a505fc36e119dd60f7a97678ec6d0", date: "2025-08-06 04:54:08 UTC", description: "add time-based settings to dedupe transform", pr_number: 23480, scopes: ["dedupe transform"], type: "feat", breaking_change: false, author: "Ensar Sarajčić", files_count: 8, insertions_count: 337, deletions_count: 112},
+		{sha: "a1aeae826a4386ced63bcd6ec190cc7b597b0fe1", date: "2025-08-06 23:20:50 UTC", description: "buffer_id handling in buffer usage metrics reporting", pr_number: 23507, scopes: ["buffers"], type: "fix", breaking_change: false, author: "Vitalii Parfonov", files_count: 2, insertions_count: 131, deletions_count: 50},
+		{sha: "7d81cb69c03f284022c1e035bfce44b429b1c672", date: "2025-08-07 06:56:09 UTC", description: "add datadog_common sink to semantic.yml", pr_number: 23533, scopes: ["ci"], type: "chore", breaking_change: false, author: "Kurochan", files_count: 1, insertions_count: 1, deletions_count: 0},
+		{sha: "1d646dad6019ff161c885a6e174eea1e8f1c35dd", date: "2025-08-06 17:36:41 UTC", description: "update test config", pr_number: 23529, scopes: ["dev"], type: "fix", breaking_change: false, author: "Pavlos Rontidis", files_count: 1, insertions_count: 2, deletions_count: 2},
+		{sha: "e7a3126b3d427a6627deb7eb87a9e76b34724c30", date: "2025-08-07 00:11:16 UTC", description: "increase request limit for TCP dnstap source", pr_number: 23448, scopes: ["dnstap source"], type: "fix", breaking_change: false, author: "Ensar Sarajčić", files_count: 2, insertions_count: 7, deletions_count: 2},
+		{sha: "2485565b3773e3b6451ef6c47727934bd8f30201", date: "2025-08-07 07:19:38 UTC", description: "prevent panic on non-UTF8 environment variables", pr_number: 23513, scopes: ["config"], type: "fix", breaking_change: false, author: "Kurochan", files_count: 2, insertions_count: 10, deletions_count: 1},
+		{sha: "72ea46b0dfeb0e89f0a59ac0d6de45051ac3d93f", date: "2025-08-07 07:21:07 UTC", description: "prevent panic on invalid api key", pr_number: 23514, scopes: ["datadog_common sink"], type: "fix", breaking_change: false, author: "Kurochan", files_count: 2, insertions_count: 4, deletions_count: 1},
+		{sha: "7c30315b287c29aaffabb286ab4df77d17b24425", date: "2025-08-07 03:07:30 UTC", description: "change type of `max_frame_handling_tasks` to `usize`", pr_number: 23537, scopes: ["dnstap source"], type: "chore", breaking_change: false, author: "Ensar Sarajčić", files_count: 4, insertions_count: 24, deletions_count: 24},
+		{sha: "cce428651c7be6c11e2be2392de125c7b8b5f86f", date: "2025-08-06 23:22:06 UTC", description: "Bump tmp from 0.2.1 to 0.2.4 in /website in the npm_and_yarn group", pr_number: 23539, scopes: ["website deps"], type: "chore", breaking_change: false, author: "dependabot[bot]", files_count: 1, insertions_count: 4, deletions_count: 13},
+		{sha: "3b8b744ccecf78e2ed184a14565e1d27e09858c8", date: "2025-08-06 23:53:34 UTC", description: "remove invalid URL and add info section", pr_number: 23541, scopes: ["website"], type: "chore", breaking_change: false, author: "Pavlos Rontidis", files_count: 1, insertions_count: 4, deletions_count: 2},
+		{sha: "0a485f5de0caf86909706e1e581cd74301e81f84", date: "2025-08-07 00:01:19 UTC", description: "preview_site_trigger.yml skip instead of failing if the website name is invalid", pr_number: 23540, scopes: ["ci"], type: "chore", breaking_change: false, author: "Pavlos Rontidis", files_count: 1, insertions_count: 24, deletions_count: 42},
+		{sha: "4c9ed1ea7cfcfb688b243a9448db6c7d1ac38ba1", date: "2025-08-07 00:05:08 UTC", description: "emit PairExpansion error", pr_number: 23538, scopes: ["log_to_metric transform"], type: "fix", breaking_change: false, author: "Pavlos Rontidis", files_count: 4, insertions_count: 80, deletions_count: 6},
+		{sha: "e8e19ccbc293d0e189282f5341a7d75e61940bac", date: "2025-08-07 07:05:47 UTC", description: "allow setting max packet size for mqtt source and sink", pr_number: 23515, scopes: ["config"], type: "feat", breaking_change: false, author: "simplepad", files_count: 6, insertions_count: 24, deletions_count: 0},
+		{sha: "a9c4c1666012b082cbb83ffd86a04f2a6ee79634", date: "2025-08-07 12:24:08 UTC", description: "add support for JetStream message headers", pr_number: 23510, scopes: ["nats sink"], type: "enhancement", breaking_change: false, author: "Benjamin Dornel", files_count: 10, insertions_count: 401, deletions_count: 238},
+		{sha: "d9bef7e49987313afa064b52dc55762e98d1c7d7", date: "2025-08-08 05:27:00 UTC", description: "fix partial retry logic", pr_number: 22431, scopes: ["elasticsearch sink"], type: "feat", breaking_change: false, author: "Serendo", files_count: 6, insertions_count: 131, deletions_count: 26},
+		{sha: "ab519c5bb17177b9d4b7f44b283727cfad2ae7f5", date: "2025-08-07 23:30:58 UTC", description: "watch enrichment tables with `--watch-config` CLI option", pr_number: 23442, scopes: ["cli"], type: "feat", breaking_change: false, author: "Ensar Sarajčić", files_count: 10, insertions_count: 161, deletions_count: 33},
+		{sha: "317f151ea649199ec0aa1c78f9fabc90191d3d30", date: "2025-08-07 18:37:13 UTC", description: "fail when jobs are cancelled", pr_number: 23545, scopes: ["ci"], type: "fix", breaking_change: false, author: "Thomas", files_count: 6, insertions_count: 28, deletions_count: 34},
+		{sha: "7cf8457a0a6eafaef5c41a46a4da0a8728a6371b", date: "2025-08-07 19:04:44 UTC", description: "fix typo", pr_number: 23549, scopes: ["internal"], type: "docs", breaking_change: false, author: "Pavlos Rontidis", files_count: 1, insertions_count: 1, deletions_count: 1},
+		{sha: "f9d2800d873d2e5a15b1920ad49c7e357702a890", date: "2025-08-07 19:31:19 UTC", description: "allow all telemetry types", pr_number: 23550, scopes: ["codecs protobuf"], type: "chore", breaking_change: false, author: "Pavlos Rontidis", files_count: 4, insertions_count: 6, deletions_count: 2},
+		{sha: "92b19362265a6140d9f816e556171be80eeed2d5", date: "2025-08-07 20:51:05 UTC", description: "cargo update -p vrl", pr_number: 23553, scopes: ["deps"], type: "chore", breaking_change: false, author: "Pavlos Rontidis", files_count: 2, insertions_count: 26, deletions_count: 13},
+		{sha: "a1c1fc3493f33093e844b0fda9569e10acdfef13", date: "2025-08-07 20:54:46 UTC", description: "improve build.rs", pr_number: 23551, scopes: ["opentelemetry lib"], type: "chore", breaking_change: false, author: "Pavlos Rontidis", files_count: 4, insertions_count: 24, deletions_count: 15},
+		{sha: "0b3c886d6c64b461ce2d56e6e9405b2d7f5ffc37", date: "2025-08-07 22:27:01 UTC", description: "remove downcast and trait in sink retry code", pr_number: 23543, scopes: ["sinks"], type: "chore", breaking_change: false, author: "Thomas", files_count: 36, insertions_count: 183, deletions_count: 136},
+		{sha: "3f8cc10bde1baa631332e67b457cc9719365b24d", date: "2025-08-08 21:12:13 UTC", description: "re-add deleted utils", pr_number: 23562, scopes: ["dev"], type: "chore", breaking_change: false, author: "Thomas", files_count: 6, insertions_count: 543, deletions_count: 0},
+	]
+}
diff --git a/website/cue/reference/versions.cue b/website/cue/reference/versions.cue
index 5ea34d5a8bda7..b215189c9b395 100644
--- a/website/cue/reference/versions.cue
+++ b/website/cue/reference/versions.cue
@@ -2,6 +2,7 @@ package metadata
 
 // This has to be maintained manually because there's currently no way to sort versions programmatically
 versions: [string, ...string] & [
+	"0.49.0",
 	"0.48.0",
 	"0.47.0",
 	"0.46.1",

From 94d56e79c20a49a090b52318ad60e89ee5d7f72a Mon Sep 17 00:00:00 2001
From: Pavlos Rontidis <pavlos.rontidis@gmail.com>
Date: Tue, 12 Aug 2025 15:50:33 -0400
Subject: [PATCH 293/305] chore(vrl): playground fix build when `path` vrl dep
 is used (#23577)

* unrelated web-playground build fix

* ran cargo fmt
---
 lib/vector-vrl/web-playground/Cargo.toml |  3 ++
 lib/vector-vrl/web-playground/build.rs   | 51 ++++++++++++------------
 2 files changed, 28 insertions(+), 26 deletions(-)

diff --git a/lib/vector-vrl/web-playground/Cargo.toml b/lib/vector-vrl/web-playground/Cargo.toml
index 544359ff7fac6..30a2c44a7716c 100644
--- a/lib/vector-vrl/web-playground/Cargo.toml
+++ b/lib/vector-vrl/web-playground/Cargo.toml
@@ -2,6 +2,9 @@
 name = "vector-vrl-web-playground"
 version = "0.1.0"
 edition = "2021"
+repository = "https://github.com/vectordotdev/vector"
+description = "A playground for experimenting with VRL"
+license = "MPL-2.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
diff --git a/lib/vector-vrl/web-playground/build.rs b/lib/vector-vrl/web-playground/build.rs
index b6bc46a33cc80..9f6bc26293068 100644
--- a/lib/vector-vrl/web-playground/build.rs
+++ b/lib/vector-vrl/web-playground/build.rs
@@ -55,40 +55,39 @@ fn write_vrl_constants(lockfile: &Lockfile, output_file: &mut File) {
         .find(|&package| package.name.as_str() == "vrl")
         .expect("missing VRL dependency");
 
-    let vrl_source = vrl_dep.source.clone().expect("missing VRL source id");
-
-    let (version, link) = match vrl_source.kind() {
-        SourceKind::Git(_) => {
-            let precise = vrl_source
-                .precise()
-                .expect("git reference should have precise")
-                .to_string();
-            (
-                precise.clone(),
-                format!("{}/tree/{precise}", vrl_source.url()),
-            )
-        }
-        SourceKind::Registry if vrl_source.is_default_registry() => {
-            let version = vrl_dep.version.to_string();
-            (
-                version.to_string(),
-                format!("https://crates.io/crates/vrl/{version}"),
-            )
+    let (version, link) = if let Some(vrl_source) = vrl_dep.source.clone() {
+        match vrl_source.kind() {
+            SourceKind::Git(_) => {
+                let precise = vrl_source
+                    .precise()
+                    .expect("git reference should have precise")
+                    .to_string();
+                (
+                    precise.clone(),
+                    Some(format!("{}/tree/{precise}", vrl_source.url())),
+                )
+            }
+            SourceKind::Registry if vrl_source.is_default_registry() => {
+                let version = vrl_dep.version.to_string();
+                (
+                    version.clone(),
+                    Some(format!("https://crates.io/crates/vrl/{version}")),
+                )
+            }
+            SourceKind::Path => (vrl_dep.version.to_string(), None),
+            kind => unimplemented!("unhandled source kind: {:?}", kind),
         }
-        SourceKind::Path
-        | SourceKind::Registry
-        | SourceKind::SparseRegistry
-        | SourceKind::LocalRegistry
-        | SourceKind::Directory => unimplemented!("unhandled source kind: {:?}", vrl_source.kind()),
-        _ => unimplemented!("unknown source kind: {:?}", vrl_source.kind()),
+    } else {
+        (vrl_dep.version.to_string(), None)
     };
 
     output_file
         .write_all(create_const_statement("VRL_VERSION", &version).as_bytes())
         .expect("Failed to write VRL version constant");
 
+    let link_str = link.as_deref().unwrap_or("");
     output_file
-        .write_all(create_const_statement("VRL_LINK", &link).as_bytes())
+        .write_all(create_const_statement("VRL_LINK", link_str).as_bytes())
         .expect("Failed to write VRL_LINK constant");
 }
 

From f4c7b08cb436127ad6df916c447cf8d5ed70ef79 Mon Sep 17 00:00:00 2001
From: Pavlos Rontidis <pavlos.rontidis@gmail.com>
Date: Tue, 12 Aug 2025 16:20:43 -0400
Subject: [PATCH 294/305] chore(website): 0.49.0 release - address docs review
 (#23581)

* chore(website): 0.49.0 release - address docs review

* Update website/content/en/highlights/2025-08-12-0-49-0-upgrade-guide.md

Co-authored-by: Thomas <thomas.schneider@datadoghq.com>

---------

Co-authored-by: Thomas <thomas.schneider@datadoghq.com>
---
 .../highlights/2025-08-12-0-49-0-upgrade-guide.md  |  3 +--
 website/cue/reference/releases/0.49.0.cue          | 14 +++++++-------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/website/content/en/highlights/2025-08-12-0-49-0-upgrade-guide.md b/website/content/en/highlights/2025-08-12-0-49-0-upgrade-guide.md
index 3400bdb117c03..e7a4b77edb1e5 100644
--- a/website/content/en/highlights/2025-08-12-0-49-0-upgrade-guide.md
+++ b/website/content/en/highlights/2025-08-12-0-49-0-upgrade-guide.md
@@ -46,8 +46,7 @@ CEF:1|Security|threatmanager|1.0|100|worm successfully stopped|10| dst=2.1.2.2 m
 
 #### Previous Behavior: Runtime Error
 
-If an input with space added to parse_cef was provided, it would result in a runtime error due to the inability to parse the line
-successfully.
+If an input for `parse_cef` included spaces (` `), the line couldn't be parsed correctly and resulted in a runtime error.
 
 ```text
 error[E000]: function call error for "parse_cef" at (0:20): Could not parse whole line successfully
diff --git a/website/cue/reference/releases/0.49.0.cue b/website/cue/reference/releases/0.49.0.cue
index e5a59d6a35e80..8f4aa96f754bf 100644
--- a/website/cue/reference/releases/0.49.0.cue
+++ b/website/cue/reference/releases/0.49.0.cue
@@ -44,7 +44,7 @@ releases: "0.49.0": {
 		{
 			type: "fix"
 			description: """
-				The `utilization` metric is now properly published periodically, even when no events are flowing through the components.
+				The `utilization` metric is now properly published periodically, even when there are no events flowing through the components.
 				"""
 			contributors: ["esensar", "Quad9DNS"]
 		},
@@ -58,7 +58,7 @@ releases: "0.49.0": {
 		{
 			type: "enhancement"
 			description: """
-				The [enrichment functions](https://vector.dev/docs/reference/vrl/functions/#enrichment-functions) now support an optional wildcard parameter where a match will succeed if the field value equals either the wildcard or the actual comparison value.
+				The [enrichment functions](https://vector.dev/docs/reference/vrl/functions/#enrichment-functions) now support an optional wildcard parameter where a match succeeds if the field value equals either the wildcard or the actual comparison value.
 				"""
 			contributors: ["nzxwang"]
 		},
@@ -94,7 +94,7 @@ releases: "0.49.0": {
 		{
 			type: "fix"
 			description: """
-				The `nats` sink now does not return an error when an unresolvable or unavailable URL is provided. Note that if `--require-healthy` is set then Vector will stop on startup.
+				The `nats` sink now does not return an error when an unresolvable or unavailable URL is provided.**Note**: If `--require-healthy` is set, Vector stops on startup.
 				"""
 			contributors: ["rdwr-tomers"]
 		},
@@ -136,7 +136,7 @@ releases: "0.49.0": {
 		{
 			type: "feat"
 			description: """
-				Added `time_settings` configuration to the `dedupe` transform, allowing the `max_age` of items in the deduplication cache to be set. This helps distinguish between true duplicates and expected repetition in data over longer periods.
+				Added `time_settings` configuration to the `dedupe` transform, allowing the `max_age` of items in the deduplication cache to be set. This helps distinguish between true duplicates and expected repetition in data over longer periods of time.
 				"""
 			contributors: ["esensar", "Quad9DNS"]
 		},
@@ -194,7 +194,7 @@ releases: "0.49.0": {
 		{
 			type: "feat"
 			description: """
-				The `request_retry_partial` behavior for the `elasticsearch` sink was changed. Now only the failed retriable requests in a bulk will be retried (instead of all requests in the bulk).
+				The `request_retry_partial` behavior for the `elasticsearch` sink was changed. Now only the failed retriable requests in a bulk is retried (instead of all requests).
 				"""
 			contributors: ["Serendo"]
 		},
@@ -252,7 +252,7 @@ releases: "0.49.0": {
 		{
 			type: "enhancement"
 			description: """
-				The `UnsignedIntTemplate` now supports `strftime` formatting. For example, this `%Y%m%d%H` template will evaluate timestamps to a number.
+				The `UnsignedIntTemplate` now supports `strftime` formatting. For example, this `%Y%m%d%H` template evaluates timestamps to a number.
 				"""
 			contributors: ["5Dev24"]
 		},
@@ -278,7 +278,7 @@ releases: "0.49.0": {
 		- Added `haversine` function for calculating [haversine](https://en.wikipedia.org/wiki/Haversine_formula) distance and bearing.
 			authors: esensar Quad9DNS (https://github.com/vectordotdev/vrl/pull/1442)
 
-		- Add `validate_json_schema` function for validating JSON payloads against JSON schema files. A optional configuration parameter `ignore_unknown_formats` is provided to change how custom formats are handled by the validator. Unknown formats can be silently ignored by setting this to `true` and validation continues without failing due to those fields.
+		- Add `validate_json_schema` function for validating JSON payloads against JSON schema files. An optional configuration parameter `ignore_unknown_formats` is provided to change how custom formats are handled by the validator. Unknown formats can be silently ignored by setting this to `true` and validation continues without failing due to those fields.
 			authors: jlambatl (https://github.com/vectordotdev/vrl/pull/1443)
 		"""
 

From dcfbbde7f7e92e30d7e7be11e2b2b8ac4545dc40 Mon Sep 17 00:00:00 2001
From: Pavlos Rontidis <pavlos.rontidis@gmail.com>
Date: Tue, 12 Aug 2025 16:34:06 -0400
Subject: [PATCH 295/305] chore(opentelemetry source): config module and reduce
 duplication (#23580)

* chore(opentelemetry source): config module and reduce duplication

* ran cargo fmt

* fix and reorganize imports

* ran cargo fmt
---
 src/sources/opentelemetry/config.rs           | 336 ++++++++++++++++++
 src/sources/opentelemetry/grpc.rs             |   2 +-
 src/sources/opentelemetry/http.rs             |   8 +-
 .../opentelemetry/integration_tests.rs        |   6 +-
 src/sources/opentelemetry/mod.rs              | 332 +----------------
 src/sources/opentelemetry/tests.rs            | 180 ++++------
 6 files changed, 414 insertions(+), 450 deletions(-)
 create mode 100644 src/sources/opentelemetry/config.rs

diff --git a/src/sources/opentelemetry/config.rs b/src/sources/opentelemetry/config.rs
new file mode 100644
index 0000000000000..6d5c08c0676e9
--- /dev/null
+++ b/src/sources/opentelemetry/config.rs
@@ -0,0 +1,336 @@
+use std::net::SocketAddr;
+
+use futures::FutureExt;
+use futures_util::{future::join, TryFutureExt};
+
+use tonic::{codec::CompressionEncoding, transport::server::RoutesBuilder};
+
+use vector_lib::{
+    config::{log_schema, LegacyKey, LogNamespace},
+    configurable::configurable_component,
+    internal_event::{BytesReceived, EventsReceived, Protocol},
+    lookup::{owned_value_path, OwnedTargetPath},
+    opentelemetry::{
+        logs::{
+            ATTRIBUTES_KEY, DROPPED_ATTRIBUTES_COUNT_KEY, FLAGS_KEY, OBSERVED_TIMESTAMP_KEY,
+            RESOURCE_KEY, SEVERITY_NUMBER_KEY, SEVERITY_TEXT_KEY, SPAN_ID_KEY, TRACE_ID_KEY,
+        },
+        proto::collector::{
+            logs::v1::logs_service_server::LogsServiceServer,
+            metrics::v1::metrics_service_server::MetricsServiceServer,
+            trace::v1::trace_service_server::TraceServiceServer,
+        },
+    },
+    schema::Definition,
+    tls::{MaybeTlsSettings, TlsEnableableConfig},
+};
+
+use crate::{
+    config::{
+        DataType, GenerateConfig, Resource, SourceAcknowledgementsConfig, SourceConfig,
+        SourceContext, SourceOutput,
+    },
+    http::KeepaliveConfig,
+    serde::bool_or_struct,
+    sources::{
+        http_server::{build_param_matcher, remove_duplicates},
+        opentelemetry::{
+            grpc::Service,
+            http::{build_warp_filter, run_http_server},
+        },
+        util::grpc::run_grpc_server_with_routes,
+        Source,
+    },
+};
+
+use vrl::value::{kind::Collection, Kind};
+
+pub const LOGS: &str = "logs";
+pub const METRICS: &str = "metrics";
+pub const TRACES: &str = "traces";
+
+/// Configuration for the `opentelemetry` source.
+#[configurable_component(source("opentelemetry", "Receive OTLP data through gRPC or HTTP."))]
+#[derive(Clone, Debug)]
+#[serde(deny_unknown_fields)]
+pub struct OpentelemetryConfig {
+    #[configurable(derived)]
+    pub grpc: GrpcConfig,
+
+    #[configurable(derived)]
+    pub http: HttpConfig,
+
+    #[configurable(derived)]
+    #[serde(default, deserialize_with = "bool_or_struct")]
+    pub acknowledgements: SourceAcknowledgementsConfig,
+
+    /// The namespace to use for logs. This overrides the global setting.
+    #[configurable(metadata(docs::hidden))]
+    #[serde(default)]
+    pub log_namespace: Option<bool>,
+}
+
+/// Configuration for the `opentelemetry` gRPC server.
+#[configurable_component]
+#[configurable(metadata(docs::examples = "example_grpc_config()"))]
+#[derive(Clone, Debug)]
+#[serde(deny_unknown_fields)]
+pub struct GrpcConfig {
+    /// The socket address to listen for connections on.
+    ///
+    /// It _must_ include a port.
+    #[configurable(metadata(docs::examples = "0.0.0.0:4317", docs::examples = "localhost:4317"))]
+    pub address: SocketAddr,
+
+    #[configurable(derived)]
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub tls: Option<TlsEnableableConfig>,
+}
+
+fn example_grpc_config() -> GrpcConfig {
+    GrpcConfig {
+        address: "0.0.0.0:4317".parse().unwrap(),
+        tls: None,
+    }
+}
+
+/// Configuration for the `opentelemetry` HTTP server.
+#[configurable_component]
+#[configurable(metadata(docs::examples = "example_http_config()"))]
+#[derive(Clone, Debug)]
+#[serde(deny_unknown_fields)]
+pub struct HttpConfig {
+    /// The socket address to listen for connections on.
+    ///
+    /// It _must_ include a port.
+    #[configurable(metadata(docs::examples = "0.0.0.0:4318", docs::examples = "localhost:4318"))]
+    pub address: SocketAddr,
+
+    #[configurable(derived)]
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub tls: Option<TlsEnableableConfig>,
+
+    #[configurable(derived)]
+    #[serde(default)]
+    pub keepalive: KeepaliveConfig,
+
+    /// A list of HTTP headers to include in the log event.
+    ///
+    /// Accepts the wildcard (`*`) character for headers matching a specified pattern.
+    ///
+    /// Specifying "*" results in all headers included in the log event.
+    ///
+    /// These headers are not included in the JSON payload if a field with a conflicting name exists.
+    #[serde(default)]
+    #[configurable(metadata(docs::examples = "User-Agent"))]
+    #[configurable(metadata(docs::examples = "X-My-Custom-Header"))]
+    #[configurable(metadata(docs::examples = "X-*"))]
+    #[configurable(metadata(docs::examples = "*"))]
+    pub headers: Vec<String>,
+}
+
+fn example_http_config() -> HttpConfig {
+    HttpConfig {
+        address: "0.0.0.0:4318".parse().unwrap(),
+        tls: None,
+        keepalive: KeepaliveConfig::default(),
+        headers: vec![],
+    }
+}
+
+impl GenerateConfig for OpentelemetryConfig {
+    fn generate_config() -> toml::Value {
+        toml::Value::try_from(Self {
+            grpc: example_grpc_config(),
+            http: example_http_config(),
+            acknowledgements: Default::default(),
+            log_namespace: None,
+        })
+        .unwrap()
+    }
+}
+
+#[async_trait::async_trait]
+#[typetag::serde(name = "opentelemetry")]
+impl SourceConfig for OpentelemetryConfig {
+    async fn build(&self, cx: SourceContext) -> crate::Result<Source> {
+        let acknowledgements = cx.do_acknowledgements(self.acknowledgements);
+        let events_received = register!(EventsReceived);
+        let log_namespace = cx.log_namespace(self.log_namespace);
+
+        let grpc_tls_settings = MaybeTlsSettings::from_config(self.grpc.tls.as_ref(), true)?;
+
+        let log_service = LogsServiceServer::new(Service {
+            pipeline: cx.out.clone(),
+            acknowledgements,
+            log_namespace,
+            events_received: events_received.clone(),
+        })
+        .accept_compressed(CompressionEncoding::Gzip)
+        .max_decoding_message_size(usize::MAX);
+
+        let trace_service = TraceServiceServer::new(Service {
+            pipeline: cx.out.clone(),
+            acknowledgements,
+            log_namespace,
+            events_received: events_received.clone(),
+        })
+        .accept_compressed(CompressionEncoding::Gzip)
+        .max_decoding_message_size(usize::MAX);
+
+        let metrics_service = MetricsServiceServer::new(Service {
+            pipeline: cx.out.clone(),
+            acknowledgements,
+            log_namespace,
+            events_received: events_received.clone(),
+        })
+        .accept_compressed(CompressionEncoding::Gzip)
+        .max_decoding_message_size(usize::MAX);
+
+        let mut builder = RoutesBuilder::default();
+        builder
+            .add_service(log_service)
+            .add_service(metrics_service)
+            .add_service(trace_service);
+        let grpc_source = run_grpc_server_with_routes(
+            self.grpc.address,
+            grpc_tls_settings,
+            builder.routes(),
+            cx.shutdown.clone(),
+        )
+        .map_err(|error| {
+            error!(message = "Source future failed.", %error);
+        });
+
+        let http_tls_settings = MaybeTlsSettings::from_config(self.http.tls.as_ref(), true)?;
+        let protocol = http_tls_settings.http_protocol_name();
+        let bytes_received = register!(BytesReceived::from(Protocol::from(protocol)));
+        let headers =
+            build_param_matcher(&remove_duplicates(self.http.headers.clone(), "headers"))?;
+        let filters = build_warp_filter(
+            acknowledgements,
+            log_namespace,
+            cx.out,
+            bytes_received,
+            events_received,
+            headers,
+        );
+        let http_source = run_http_server(
+            self.http.address,
+            http_tls_settings,
+            filters,
+            cx.shutdown,
+            self.http.keepalive.clone(),
+        );
+
+        Ok(join(grpc_source, http_source).map(|_| Ok(())).boxed())
+    }
+
+    // TODO: appropriately handle "severity" meaning across both "severity_text" and "severity_number",
+    // as both are optional and can be converted to/from.
+    fn outputs(&self, global_log_namespace: LogNamespace) -> Vec<SourceOutput> {
+        let log_namespace = global_log_namespace.merge(self.log_namespace);
+        let schema_definition = Definition::new_with_default_metadata(Kind::any(), [log_namespace])
+            .with_source_metadata(
+                Self::NAME,
+                Some(LegacyKey::Overwrite(owned_value_path!(RESOURCE_KEY))),
+                &owned_value_path!(RESOURCE_KEY),
+                Kind::object(Collection::from_unknown(Kind::any())).or_undefined(),
+                None,
+            )
+            .with_source_metadata(
+                Self::NAME,
+                Some(LegacyKey::Overwrite(owned_value_path!(ATTRIBUTES_KEY))),
+                &owned_value_path!(ATTRIBUTES_KEY),
+                Kind::object(Collection::from_unknown(Kind::any())).or_undefined(),
+                None,
+            )
+            .with_source_metadata(
+                Self::NAME,
+                Some(LegacyKey::Overwrite(owned_value_path!(TRACE_ID_KEY))),
+                &owned_value_path!(TRACE_ID_KEY),
+                Kind::bytes().or_undefined(),
+                None,
+            )
+            .with_source_metadata(
+                Self::NAME,
+                Some(LegacyKey::Overwrite(owned_value_path!(SPAN_ID_KEY))),
+                &owned_value_path!(SPAN_ID_KEY),
+                Kind::bytes().or_undefined(),
+                None,
+            )
+            .with_source_metadata(
+                Self::NAME,
+                Some(LegacyKey::Overwrite(owned_value_path!(SEVERITY_TEXT_KEY))),
+                &owned_value_path!(SEVERITY_TEXT_KEY),
+                Kind::bytes().or_undefined(),
+                Some("severity"),
+            )
+            .with_source_metadata(
+                Self::NAME,
+                Some(LegacyKey::Overwrite(owned_value_path!(SEVERITY_NUMBER_KEY))),
+                &owned_value_path!(SEVERITY_NUMBER_KEY),
+                Kind::integer().or_undefined(),
+                None,
+            )
+            .with_source_metadata(
+                Self::NAME,
+                Some(LegacyKey::Overwrite(owned_value_path!(FLAGS_KEY))),
+                &owned_value_path!(FLAGS_KEY),
+                Kind::integer().or_undefined(),
+                None,
+            )
+            .with_source_metadata(
+                Self::NAME,
+                Some(LegacyKey::Overwrite(owned_value_path!(
+                    DROPPED_ATTRIBUTES_COUNT_KEY
+                ))),
+                &owned_value_path!(DROPPED_ATTRIBUTES_COUNT_KEY),
+                Kind::integer(),
+                None,
+            )
+            .with_source_metadata(
+                Self::NAME,
+                Some(LegacyKey::Overwrite(owned_value_path!(
+                    OBSERVED_TIMESTAMP_KEY
+                ))),
+                &owned_value_path!(OBSERVED_TIMESTAMP_KEY),
+                Kind::timestamp(),
+                None,
+            )
+            .with_source_metadata(
+                Self::NAME,
+                None,
+                &owned_value_path!("timestamp"),
+                Kind::timestamp(),
+                Some("timestamp"),
+            )
+            .with_standard_vector_source_metadata();
+
+        let schema_definition = match log_namespace {
+            LogNamespace::Vector => {
+                schema_definition.with_meaning(OwnedTargetPath::event_root(), "message")
+            }
+            LogNamespace::Legacy => {
+                schema_definition.with_meaning(log_schema().owned_message_path(), "message")
+            }
+        };
+
+        vec![
+            SourceOutput::new_maybe_logs(DataType::Log, schema_definition).with_port(LOGS),
+            SourceOutput::new_metrics().with_port(METRICS),
+            SourceOutput::new_traces().with_port(TRACES),
+        ]
+    }
+
+    fn resources(&self) -> Vec<Resource> {
+        vec![
+            Resource::tcp(self.grpc.address),
+            Resource::tcp(self.http.address),
+        ]
+    }
+
+    fn can_acknowledge(&self) -> bool {
+        true
+    }
+}
diff --git a/src/sources/opentelemetry/grpc.rs b/src/sources/opentelemetry/grpc.rs
index 32a4d766c17a2..6b894b8c626e0 100644
--- a/src/sources/opentelemetry/grpc.rs
+++ b/src/sources/opentelemetry/grpc.rs
@@ -21,7 +21,7 @@ use vector_lib::{
 
 use crate::{
     internal_events::{EventsReceived, StreamClosedError},
-    sources::opentelemetry::{LOGS, METRICS, TRACES},
+    sources::opentelemetry::config::{LOGS, METRICS, TRACES},
     SourceSender,
 };
 
diff --git a/src/sources/opentelemetry/http.rs b/src/sources/opentelemetry/http.rs
index d3c3798dd14d6..c3c9fc51f4ac7 100644
--- a/src/sources/opentelemetry/http.rs
+++ b/src/sources/opentelemetry/http.rs
@@ -42,8 +42,8 @@ use crate::{
     SourceSender,
 };
 
-use super::OpentelemetryConfig;
 use super::{reply::protobuf, status::Status};
+use crate::sources::opentelemetry::config::{OpentelemetryConfig, LOGS, METRICS, TRACES};
 
 #[derive(Clone, Copy, Debug, Snafu)]
 pub(crate) enum ApiError {
@@ -171,7 +171,7 @@ fn build_warp_log_filter(
                     events,
                     acknowledgements,
                     out.clone(),
-                    super::LOGS,
+                    LOGS,
                     ExportLogsServiceResponse::default(),
                 )
             },
@@ -203,7 +203,7 @@ fn build_warp_metrics_filter(
                 events,
                 acknowledgements,
                 out.clone(),
-                super::METRICS,
+                METRICS,
                 ExportMetricsServiceResponse::default(),
             )
         })
@@ -234,7 +234,7 @@ fn build_warp_trace_filter(
                 events,
                 acknowledgements,
                 out.clone(),
-                super::TRACES,
+                TRACES,
                 ExportTraceServiceResponse::default(),
             )
         })
diff --git a/src/sources/opentelemetry/integration_tests.rs b/src/sources/opentelemetry/integration_tests.rs
index feb7717460884..0d6644e9070b7 100644
--- a/src/sources/opentelemetry/integration_tests.rs
+++ b/src/sources/opentelemetry/integration_tests.rs
@@ -3,10 +3,12 @@ use std::time::{Duration, SystemTime, UNIX_EPOCH};
 use itertools::Itertools;
 use serde_json::json;
 
-use super::{LOGS, METRICS, TRACES};
 use crate::{
     config::{log_schema, SourceConfig, SourceContext},
     event::EventStatus,
+    sources::opentelemetry::config::{
+        GrpcConfig, HttpConfig, OpentelemetryConfig, LOGS, METRICS, TRACES,
+    },
     test_util::{
         collect_n,
         components::{assert_source_compliance, SOURCE_TAGS},
@@ -15,7 +17,7 @@ use crate::{
 };
 use prost::Message;
 
-use super::{tests::new_source, GrpcConfig, HttpConfig, OpentelemetryConfig};
+use super::tests::new_source;
 use vector_lib::opentelemetry::proto::{
     collector::{metrics::v1::ExportMetricsServiceRequest, trace::v1::ExportTraceServiceRequest},
     common::v1::{any_value::Value::StringValue, AnyValue, InstrumentationScope, KeyValue},
diff --git a/src/sources/opentelemetry/mod.rs b/src/sources/opentelemetry/mod.rs
index 8f79673d86186..0e4129798b525 100644
--- a/src/sources/opentelemetry/mod.rs
+++ b/src/sources/opentelemetry/mod.rs
@@ -3,338 +3,8 @@ mod integration_tests;
 #[cfg(test)]
 mod tests;
 
+pub mod config;
 mod grpc;
 mod http;
 mod reply;
 mod status;
-
-use std::net::SocketAddr;
-
-use futures::{future::join, FutureExt, TryFutureExt};
-use tonic::codec::CompressionEncoding;
-use vector_lib::lookup::{owned_value_path, OwnedTargetPath};
-use vector_lib::opentelemetry::logs::{
-    ATTRIBUTES_KEY, DROPPED_ATTRIBUTES_COUNT_KEY, FLAGS_KEY, OBSERVED_TIMESTAMP_KEY, RESOURCE_KEY,
-    SEVERITY_NUMBER_KEY, SEVERITY_TEXT_KEY, SPAN_ID_KEY, TRACE_ID_KEY,
-};
-
-use tonic::transport::server::RoutesBuilder;
-use vector_lib::configurable::configurable_component;
-use vector_lib::internal_event::{BytesReceived, EventsReceived, Protocol};
-use vector_lib::opentelemetry::proto::collector::{
-    logs::v1::logs_service_server::LogsServiceServer,
-    metrics::v1::metrics_service_server::MetricsServiceServer,
-    trace::v1::trace_service_server::TraceServiceServer,
-};
-use vector_lib::{
-    config::{log_schema, LegacyKey, LogNamespace},
-    schema::Definition,
-};
-use vrl::value::{kind::Collection, Kind};
-
-use self::{
-    grpc::Service,
-    http::{build_warp_filter, run_http_server},
-};
-use crate::{
-    config::{
-        DataType, GenerateConfig, Resource, SourceAcknowledgementsConfig, SourceConfig,
-        SourceContext, SourceOutput,
-    },
-    http::KeepaliveConfig,
-    serde::bool_or_struct,
-    sources::{util::grpc::run_grpc_server_with_routes, Source},
-    tls::{MaybeTlsSettings, TlsEnableableConfig},
-};
-
-use super::http_server::{build_param_matcher, remove_duplicates};
-
-pub const LOGS: &str = "logs";
-pub const METRICS: &str = "metrics";
-pub const TRACES: &str = "traces";
-
-/// Configuration for the `opentelemetry` source.
-#[configurable_component(source("opentelemetry", "Receive OTLP data through gRPC or HTTP."))]
-#[derive(Clone, Debug)]
-#[serde(deny_unknown_fields)]
-pub struct OpentelemetryConfig {
-    #[configurable(derived)]
-    grpc: GrpcConfig,
-
-    #[configurable(derived)]
-    http: HttpConfig,
-
-    #[configurable(derived)]
-    #[serde(default, deserialize_with = "bool_or_struct")]
-    acknowledgements: SourceAcknowledgementsConfig,
-
-    /// The namespace to use for logs. This overrides the global setting.
-    #[configurable(metadata(docs::hidden))]
-    #[serde(default)]
-    log_namespace: Option<bool>,
-}
-
-/// Configuration for the `opentelemetry` gRPC server.
-#[configurable_component]
-#[configurable(metadata(docs::examples = "example_grpc_config()"))]
-#[derive(Clone, Debug)]
-#[serde(deny_unknown_fields)]
-struct GrpcConfig {
-    /// The socket address to listen for connections on.
-    ///
-    /// It _must_ include a port.
-    #[configurable(metadata(docs::examples = "0.0.0.0:4317", docs::examples = "localhost:4317"))]
-    address: SocketAddr,
-
-    #[configurable(derived)]
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    tls: Option<TlsEnableableConfig>,
-}
-
-fn example_grpc_config() -> GrpcConfig {
-    GrpcConfig {
-        address: "0.0.0.0:4317".parse().unwrap(),
-        tls: None,
-    }
-}
-
-/// Configuration for the `opentelemetry` HTTP server.
-#[configurable_component]
-#[configurable(metadata(docs::examples = "example_http_config()"))]
-#[derive(Clone, Debug)]
-#[serde(deny_unknown_fields)]
-struct HttpConfig {
-    /// The socket address to listen for connections on.
-    ///
-    /// It _must_ include a port.
-    #[configurable(metadata(docs::examples = "0.0.0.0:4318", docs::examples = "localhost:4318"))]
-    address: SocketAddr,
-
-    #[configurable(derived)]
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    tls: Option<TlsEnableableConfig>,
-
-    #[configurable(derived)]
-    #[serde(default)]
-    keepalive: KeepaliveConfig,
-
-    /// A list of HTTP headers to include in the log event.
-    ///
-    /// Accepts the wildcard (`*`) character for headers matching a specified pattern.
-    ///
-    /// Specifying "*" results in all headers included in the log event.
-    ///
-    /// These headers are not included in the JSON payload if a field with a conflicting name exists.
-    #[serde(default)]
-    #[configurable(metadata(docs::examples = "User-Agent"))]
-    #[configurable(metadata(docs::examples = "X-My-Custom-Header"))]
-    #[configurable(metadata(docs::examples = "X-*"))]
-    #[configurable(metadata(docs::examples = "*"))]
-    headers: Vec<String>,
-}
-
-fn example_http_config() -> HttpConfig {
-    HttpConfig {
-        address: "0.0.0.0:4318".parse().unwrap(),
-        tls: None,
-        keepalive: KeepaliveConfig::default(),
-        headers: vec![],
-    }
-}
-
-impl GenerateConfig for OpentelemetryConfig {
-    fn generate_config() -> toml::Value {
-        toml::Value::try_from(Self {
-            grpc: example_grpc_config(),
-            http: example_http_config(),
-            acknowledgements: Default::default(),
-            log_namespace: None,
-        })
-        .unwrap()
-    }
-}
-
-#[async_trait::async_trait]
-#[typetag::serde(name = "opentelemetry")]
-impl SourceConfig for OpentelemetryConfig {
-    async fn build(&self, cx: SourceContext) -> crate::Result<Source> {
-        let acknowledgements = cx.do_acknowledgements(self.acknowledgements);
-        let events_received = register!(EventsReceived);
-        let log_namespace = cx.log_namespace(self.log_namespace);
-
-        let grpc_tls_settings = MaybeTlsSettings::from_config(self.grpc.tls.as_ref(), true)?;
-
-        let log_service = LogsServiceServer::new(Service {
-            pipeline: cx.out.clone(),
-            acknowledgements,
-            log_namespace,
-            events_received: events_received.clone(),
-        })
-        .accept_compressed(CompressionEncoding::Gzip)
-        .max_decoding_message_size(usize::MAX);
-
-        let trace_service = TraceServiceServer::new(Service {
-            pipeline: cx.out.clone(),
-            acknowledgements,
-            log_namespace,
-            events_received: events_received.clone(),
-        })
-        .accept_compressed(CompressionEncoding::Gzip)
-        .max_decoding_message_size(usize::MAX);
-
-        let metrics_service = MetricsServiceServer::new(Service {
-            pipeline: cx.out.clone(),
-            acknowledgements,
-            log_namespace,
-            events_received: events_received.clone(),
-        })
-        .accept_compressed(CompressionEncoding::Gzip)
-        .max_decoding_message_size(usize::MAX);
-
-        let mut builder = RoutesBuilder::default();
-        builder
-            .add_service(log_service)
-            .add_service(metrics_service)
-            .add_service(trace_service);
-        let grpc_source = run_grpc_server_with_routes(
-            self.grpc.address,
-            grpc_tls_settings,
-            builder.routes(),
-            cx.shutdown.clone(),
-        )
-        .map_err(|error| {
-            error!(message = "Source future failed.", %error);
-        });
-
-        let http_tls_settings = MaybeTlsSettings::from_config(self.http.tls.as_ref(), true)?;
-        let protocol = http_tls_settings.http_protocol_name();
-        let bytes_received = register!(BytesReceived::from(Protocol::from(protocol)));
-        let headers =
-            build_param_matcher(&remove_duplicates(self.http.headers.clone(), "headers"))?;
-        let filters = build_warp_filter(
-            acknowledgements,
-            log_namespace,
-            cx.out,
-            bytes_received,
-            events_received,
-            headers,
-        );
-        let http_source = run_http_server(
-            self.http.address,
-            http_tls_settings,
-            filters,
-            cx.shutdown,
-            self.http.keepalive.clone(),
-        );
-
-        Ok(join(grpc_source, http_source).map(|_| Ok(())).boxed())
-    }
-
-    // TODO: appropriately handle "severity" meaning across both "severity_text" and "severity_number",
-    // as both are optional and can be converted to/from.
-    fn outputs(&self, global_log_namespace: LogNamespace) -> Vec<SourceOutput> {
-        let log_namespace = global_log_namespace.merge(self.log_namespace);
-        let schema_definition = Definition::new_with_default_metadata(Kind::any(), [log_namespace])
-            .with_source_metadata(
-                Self::NAME,
-                Some(LegacyKey::Overwrite(owned_value_path!(RESOURCE_KEY))),
-                &owned_value_path!(RESOURCE_KEY),
-                Kind::object(Collection::from_unknown(Kind::any())).or_undefined(),
-                None,
-            )
-            .with_source_metadata(
-                Self::NAME,
-                Some(LegacyKey::Overwrite(owned_value_path!(ATTRIBUTES_KEY))),
-                &owned_value_path!(ATTRIBUTES_KEY),
-                Kind::object(Collection::from_unknown(Kind::any())).or_undefined(),
-                None,
-            )
-            .with_source_metadata(
-                Self::NAME,
-                Some(LegacyKey::Overwrite(owned_value_path!(TRACE_ID_KEY))),
-                &owned_value_path!(TRACE_ID_KEY),
-                Kind::bytes().or_undefined(),
-                None,
-            )
-            .with_source_metadata(
-                Self::NAME,
-                Some(LegacyKey::Overwrite(owned_value_path!(SPAN_ID_KEY))),
-                &owned_value_path!(SPAN_ID_KEY),
-                Kind::bytes().or_undefined(),
-                None,
-            )
-            .with_source_metadata(
-                Self::NAME,
-                Some(LegacyKey::Overwrite(owned_value_path!(SEVERITY_TEXT_KEY))),
-                &owned_value_path!(SEVERITY_TEXT_KEY),
-                Kind::bytes().or_undefined(),
-                Some("severity"),
-            )
-            .with_source_metadata(
-                Self::NAME,
-                Some(LegacyKey::Overwrite(owned_value_path!(SEVERITY_NUMBER_KEY))),
-                &owned_value_path!(SEVERITY_NUMBER_KEY),
-                Kind::integer().or_undefined(),
-                None,
-            )
-            .with_source_metadata(
-                Self::NAME,
-                Some(LegacyKey::Overwrite(owned_value_path!(FLAGS_KEY))),
-                &owned_value_path!(FLAGS_KEY),
-                Kind::integer().or_undefined(),
-                None,
-            )
-            .with_source_metadata(
-                Self::NAME,
-                Some(LegacyKey::Overwrite(owned_value_path!(
-                    DROPPED_ATTRIBUTES_COUNT_KEY
-                ))),
-                &owned_value_path!(DROPPED_ATTRIBUTES_COUNT_KEY),
-                Kind::integer(),
-                None,
-            )
-            .with_source_metadata(
-                Self::NAME,
-                Some(LegacyKey::Overwrite(owned_value_path!(
-                    OBSERVED_TIMESTAMP_KEY
-                ))),
-                &owned_value_path!(OBSERVED_TIMESTAMP_KEY),
-                Kind::timestamp(),
-                None,
-            )
-            .with_source_metadata(
-                Self::NAME,
-                None,
-                &owned_value_path!("timestamp"),
-                Kind::timestamp(),
-                Some("timestamp"),
-            )
-            .with_standard_vector_source_metadata();
-
-        let schema_definition = match log_namespace {
-            LogNamespace::Vector => {
-                schema_definition.with_meaning(OwnedTargetPath::event_root(), "message")
-            }
-            LogNamespace::Legacy => {
-                schema_definition.with_meaning(log_schema().owned_message_path(), "message")
-            }
-        };
-
-        vec![
-            SourceOutput::new_maybe_logs(DataType::Log, schema_definition).with_port(LOGS),
-            SourceOutput::new_metrics().with_port(METRICS),
-            SourceOutput::new_traces().with_port(TRACES),
-        ]
-    }
-
-    fn resources(&self) -> Vec<Resource> {
-        vec![
-            Resource::tcp(self.grpc.address),
-            Resource::tcp(self.http.address),
-        ]
-    }
-
-    fn can_acknowledge(&self) -> bool {
-        true
-    }
-}
diff --git a/src/sources/opentelemetry/tests.rs b/src/sources/opentelemetry/tests.rs
index a0fa9868acc58..f8920cdd3c89e 100644
--- a/src/sources/opentelemetry/tests.rs
+++ b/src/sources/opentelemetry/tests.rs
@@ -6,7 +6,7 @@ use crate::{
     event::{
         into_event_stream, Event, EventStatus, LogEvent, Metric as MetricEvent, ObjectMap, Value,
     },
-    sources::opentelemetry::{GrpcConfig, HttpConfig, OpentelemetryConfig, LOGS, METRICS},
+    sources::opentelemetry::config::{GrpcConfig, HttpConfig, OpentelemetryConfig, LOGS, METRICS},
     test_util::{
         self,
         components::{assert_source_compliance, SOURCE_TAGS},
@@ -24,27 +24,77 @@ use std::time::{SystemTime, UNIX_EPOCH};
 use tonic::Request;
 use vector_lib::config::LogNamespace;
 use vector_lib::lookup::path;
-use vector_lib::opentelemetry::proto::collector::metrics::v1::metrics_service_client::MetricsServiceClient;
-use vector_lib::opentelemetry::proto::collector::metrics::v1::ExportMetricsServiceRequest;
-use vector_lib::opentelemetry::proto::common::v1::any_value::Value::StringValue;
-use vector_lib::opentelemetry::proto::metrics::v1::exponential_histogram_data_point::Buckets;
-use vector_lib::opentelemetry::proto::metrics::v1::metric::Data;
-use vector_lib::opentelemetry::proto::metrics::v1::summary_data_point::ValueAtQuantile;
-use vector_lib::opentelemetry::proto::metrics::v1::{
-    AggregationTemporality, ExponentialHistogram, ExponentialHistogramDataPoint, Gauge, Histogram,
-    HistogramDataPoint, Metric, NumberDataPoint, ResourceMetrics, ScopeMetrics, Sum, Summary,
-    SummaryDataPoint,
-};
-use vector_lib::opentelemetry::proto::resource::v1::Resource;
 use vector_lib::opentelemetry::proto::{
-    collector::logs::v1::{logs_service_client::LogsServiceClient, ExportLogsServiceRequest},
-    common::v1::{any_value, AnyValue, InstrumentationScope, KeyValue},
+    collector::{
+        logs::v1::{logs_service_client::LogsServiceClient, ExportLogsServiceRequest},
+        metrics::v1::{metrics_service_client::MetricsServiceClient, ExportMetricsServiceRequest},
+    },
+    common::v1::{
+        any_value, any_value::Value::StringValue, AnyValue, InstrumentationScope, KeyValue,
+    },
     logs::v1::{LogRecord, ResourceLogs, ScopeLogs},
-    resource::v1::Resource as OtelResource,
+    metrics::v1::{
+        exponential_histogram_data_point::Buckets, metric::Data,
+        summary_data_point::ValueAtQuantile, AggregationTemporality, ExponentialHistogram,
+        ExponentialHistogramDataPoint, Gauge, Histogram, HistogramDataPoint, Metric,
+        NumberDataPoint, ResourceMetrics, ScopeMetrics, Sum, Summary, SummaryDataPoint,
+    },
+    resource::v1::{Resource, Resource as OtelResource},
 };
 use vrl::value;
 use warp::http::HeaderMap;
 
+fn create_test_logs_request() -> Request<ExportLogsServiceRequest> {
+    Request::new(ExportLogsServiceRequest {
+        resource_logs: vec![ResourceLogs {
+            resource: Some(OtelResource {
+                attributes: vec![KeyValue {
+                    key: "res_key".into(),
+                    value: Some(AnyValue {
+                        value: Some(StringValue("res_val".into())),
+                    }),
+                }],
+                dropped_attributes_count: 0,
+            }),
+            scope_logs: vec![ScopeLogs {
+                scope: Some(InstrumentationScope {
+                    name: "some.scope.name".into(),
+                    version: "1.2.3".into(),
+                    attributes: vec![KeyValue {
+                        key: "scope_attr".into(),
+                        value: Some(AnyValue {
+                            value: Some(StringValue("scope_val".into())),
+                        }),
+                    }],
+                    dropped_attributes_count: 7,
+                }),
+                log_records: vec![LogRecord {
+                    time_unix_nano: 1,
+                    observed_time_unix_nano: 2,
+                    severity_number: 9,
+                    severity_text: "info".into(),
+                    body: Some(AnyValue {
+                        value: Some(StringValue("log body".into())),
+                    }),
+                    attributes: vec![KeyValue {
+                        key: "attr_key".into(),
+                        value: Some(AnyValue {
+                            value: Some(StringValue("attr_val".into())),
+                        }),
+                    }],
+                    dropped_attributes_count: 3,
+                    flags: 4,
+                    // opentelemetry sdk will hex::decode the given trace_id and span_id
+                    trace_id: str_into_hex_bytes("4ac52aadf321c2e531db005df08792f5"),
+                    span_id: str_into_hex_bytes("0b9e4bda2a55530d"),
+                }],
+                schema_url: "v1".into(),
+            }],
+            schema_url: "v1".into(),
+        }],
+    })
+}
+
 #[test]
 fn generate_config() {
     test_util::test_generate_config::<OpentelemetryConfig>();
@@ -64,54 +114,7 @@ async fn receive_grpc_logs_vector_namespace() {
         let mut client = LogsServiceClient::connect(format!("http://{}", env.grpc_addr))
             .await
             .unwrap();
-        let req = Request::new(ExportLogsServiceRequest {
-            resource_logs: vec![ResourceLogs {
-                resource: Some(OtelResource {
-                    attributes: vec![KeyValue {
-                        key: "res_key".into(),
-                        value: Some(AnyValue {
-                            value: Some(StringValue("res_val".into())),
-                        }),
-                    }],
-                    dropped_attributes_count: 0,
-                }),
-                scope_logs: vec![ScopeLogs {
-                    scope: Some(InstrumentationScope {
-                        name: "some.scope.name".into(),
-                        version: "1.2.3".into(),
-                        attributes: vec![KeyValue {
-                            key: "scope_attr".into(),
-                            value: Some(AnyValue {
-                                value: Some(StringValue("scope_val".into())),
-                            }),
-                        }],
-                        dropped_attributes_count: 7,
-                    }),
-                    log_records: vec![LogRecord {
-                        time_unix_nano: 1,
-                        observed_time_unix_nano: 2,
-                        severity_number: 9,
-                        severity_text: "info".into(),
-                        body: Some(AnyValue {
-                            value: Some(StringValue("log body".into())),
-                        }),
-                        attributes: vec![KeyValue {
-                            key: "attr_key".into(),
-                            value: Some(AnyValue {
-                                value: Some(StringValue("attr_val".into())),
-                            }),
-                        }],
-                        dropped_attributes_count: 3,
-                        flags: 4,
-                        // opentelemetry sdk will hex::decode the given trace_id and span_id
-                        trace_id: str_into_hex_bytes("4ac52aadf321c2e531db005df08792f5"),
-                        span_id: str_into_hex_bytes("0b9e4bda2a55530d"),
-                    }],
-                    schema_url: "v1".into(),
-                }],
-                schema_url: "v1".into(),
-            }],
-        });
+        let req = create_test_logs_request();
         _ = client.export(req).await;
         let mut output = test_util::collect_ready(env.output).await;
         // we just send one, so only one output
@@ -209,54 +212,7 @@ async fn receive_grpc_logs_legacy_namespace() {
         let mut client = LogsServiceClient::connect(format!("http://{}", env.grpc_addr))
             .await
             .unwrap();
-        let req = Request::new(ExportLogsServiceRequest {
-            resource_logs: vec![ResourceLogs {
-                resource: Some(OtelResource {
-                    attributes: vec![KeyValue {
-                        key: "res_key".into(),
-                        value: Some(AnyValue {
-                            value: Some(StringValue("res_val".into())),
-                        }),
-                    }],
-                    dropped_attributes_count: 0,
-                }),
-                scope_logs: vec![ScopeLogs {
-                    scope: Some(InstrumentationScope {
-                        name: "some.scope.name".into(),
-                        version: "1.2.3".into(),
-                        attributes: vec![KeyValue {
-                            key: "scope_attr".into(),
-                            value: Some(AnyValue {
-                                value: Some(StringValue("scope_val".into())),
-                            }),
-                        }],
-                        dropped_attributes_count: 7,
-                    }),
-                    log_records: vec![LogRecord {
-                        time_unix_nano: 1,
-                        observed_time_unix_nano: 2,
-                        severity_number: 9,
-                        severity_text: "info".into(),
-                        body: Some(AnyValue {
-                            value: Some(StringValue("log body".into())),
-                        }),
-                        attributes: vec![KeyValue {
-                            key: "attr_key".into(),
-                            value: Some(AnyValue {
-                                value: Some(StringValue("attr_val".into())),
-                            }),
-                        }],
-                        dropped_attributes_count: 3,
-                        flags: 4,
-                        // opentelemetry sdk will hex::decode the given trace_id and span_id
-                        trace_id: str_into_hex_bytes("4ac52aadf321c2e531db005df08792f5"),
-                        span_id: str_into_hex_bytes("0b9e4bda2a55530d"),
-                    }],
-                    schema_url: "v1".into(),
-                }],
-                schema_url: "v1".into(),
-            }],
-        });
+        let req = create_test_logs_request();
         _ = client.export(req).await;
         let mut output = test_util::collect_ready(env.output).await;
         // we just send one, so only one output

From 4dc7c7701e0bda1a4c4238c360c708ccf6620474 Mon Sep 17 00:00:00 2001
From: Benjamin Dornel <benjamindornel@gmail.com>
Date: Wed, 13 Aug 2025 04:35:44 +0800
Subject: [PATCH 296/305] chore(deps): bump async-nats from 0.33.0 to 0.42.0
 (#23564)

* chore(deps): bump async-nats from 0.33.0 to 0.42.0

* chore: update license
---
 Cargo.lock                          | 79 ++++++++++++++++++-----------
 Cargo.toml                          |  2 +-
 LICENSE-3rdparty.csv                |  2 +
 src/sinks/nats/integration_tests.rs |  4 +-
 src/sources/nats.rs                 |  4 +-
 5 files changed, 55 insertions(+), 36 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 151cfc77efd3d..b6cd3eb1ad6a6 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -633,25 +633,25 @@ dependencies = [
 
 [[package]]
 name = "async-nats"
-version = "0.33.0"
+version = "0.42.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dbc1f1a75fd07f0f517322d103211f12d757658e91676def9a2e688774656c60"
+checksum = "08f6da6d49a956424ca4e28fe93656f790d748b469eaccbc7488fec545315180"
 dependencies = [
- "base64 0.21.7",
+ "base64 0.22.1",
  "bytes 1.10.1",
  "futures 0.3.31",
- "http 0.2.9",
  "memchr",
- "nkeys 0.3.2",
+ "nkeys",
  "nuid",
  "once_cell",
+ "pin-project",
+ "portable-atomic",
  "rand 0.8.5",
  "regex",
  "ring",
- "rustls 0.21.12",
- "rustls-native-certs 0.6.3",
- "rustls-pemfile 1.0.4",
- "rustls-webpki 0.101.7",
+ "rustls-native-certs 0.7.0",
+ "rustls-pemfile 2.1.0",
+ "rustls-webpki 0.102.8",
  "serde",
  "serde_json",
  "serde_nanos",
@@ -659,9 +659,11 @@ dependencies = [
  "thiserror 1.0.68",
  "time",
  "tokio",
- "tokio-retry",
- "tokio-rustls 0.24.1",
+ "tokio-rustls 0.26.2",
+ "tokio-util",
+ "tokio-websockets",
  "tracing 0.1.41",
+ "tryhard",
  "url",
 ]
 
@@ -4829,7 +4831,7 @@ dependencies = [
  "httpdate",
  "itoa",
  "pin-project-lite",
- "socket2 0.4.10",
+ "socket2 0.5.10",
  "tokio",
  "tower-service",
  "tracing 0.1.41",
@@ -6623,22 +6625,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "nkeys"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aad178aad32087b19042ee36dfd450b73f5f934fbfb058b59b198684dfec4c47"
-dependencies = [
- "byteorder",
- "data-encoding",
- "ed25519",
- "ed25519-dalek",
- "getrandom 0.2.15",
- "log",
- "rand 0.8.5",
- "signatory",
-]
-
 [[package]]
 name = "nkeys"
 version = "0.4.5"
@@ -8007,7 +7993,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "be769465445e8c1474e9c5dac2018218498557af32d9ed057325ec9a41ae81bf"
 dependencies = [
  "heck 0.5.0",
- "itertools 0.11.0",
+ "itertools 0.14.0",
  "log",
  "multimap",
  "once_cell",
@@ -8053,7 +8039,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8a56d757972c98b346a9b766e3f02746cde6dd1cd1d1d563472929fdd74bec4d"
 dependencies = [
  "anyhow",
- "itertools 0.11.0",
+ "itertools 0.14.0",
  "proc-macro2 1.0.95",
  "quote 1.0.40",
  "syn 2.0.104",
@@ -10956,6 +10942,27 @@ dependencies = [
  "tokio",
 ]
 
+[[package]]
+name = "tokio-websockets"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f591660438b3038dd04d16c938271c79e7e06260ad2ea2885a4861bfb238605d"
+dependencies = [
+ "base64 0.22.1",
+ "bytes 1.10.1",
+ "futures-core",
+ "futures-sink",
+ "http 1.1.0",
+ "httparse",
+ "rand 0.8.5",
+ "ring",
+ "rustls-pki-types",
+ "tokio",
+ "tokio-rustls 0.26.2",
+ "tokio-util",
+ "webpki-roots 0.26.1",
+]
+
 [[package]]
 name = "toml"
 version = "0.8.23"
@@ -11468,6 +11475,16 @@ version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed"
 
+[[package]]
+name = "tryhard"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9fe58ebd5edd976e0fe0f8a14d2a04b7c81ef153ea9a54eebc42e67c2c23b4e5"
+dependencies = [
+ "pin-project-lite",
+ "tokio",
+]
+
 [[package]]
 name = "tungstenite"
 version = "0.20.1"
@@ -11955,7 +11972,7 @@ dependencies = [
  "netlink-packet-utils",
  "netlink-sys",
  "nix 0.26.2",
- "nkeys 0.4.5",
+ "nkeys",
  "nom 8.0.0",
  "notify",
  "num-format",
diff --git a/Cargo.toml b/Cargo.toml
index a13e4ee929e2f..aefad578698dc 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -364,7 +364,7 @@ lru = { version = "0.16.0", default-features = false, optional = true }
 maxminddb = { version = "0.26.0", default-features = false, optional = true, features = ["simdutf8"] }
 md-5 = { version = "0.10", default-features = false, optional = true }
 mongodb = { version = "2.8.2", default-features = false, features = ["tokio-runtime"], optional = true }
-async-nats = { version = "0.33.0", default-features = false, optional = true }
+async-nats = { version = "0.42.0", default-features = false, optional = true, features = ["ring"] }
 nkeys = { version = "0.4.5", default-features = false, optional = true }
 nom = { workspace = true, optional = true }
 notify = { version = "8.1.0", default-features = false, features = ["macos_fsevent"] }
diff --git a/LICENSE-3rdparty.csv b/LICENSE-3rdparty.csv
index f4c960eb06064..567df49b9eba4 100644
--- a/LICENSE-3rdparty.csv
+++ b/LICENSE-3rdparty.csv
@@ -670,6 +670,7 @@ tokio-postgres,https://github.com/sfackler/rust-postgres,MIT OR Apache-2.0,Steve
 tokio-retry,https://github.com/srijs/rust-tokio-retry,MIT,Sam Rijs <srijs@airpost.net>
 tokio-rustls,https://github.com/rustls/tokio-rustls,MIT OR Apache-2.0,The tokio-rustls Authors
 tokio-tungstenite,https://github.com/snapview/tokio-tungstenite,MIT,"Daniel Abramov <dabramov@snapview.de>, Alexey Galakhov <agalakhov@snapview.de>"
+tokio-websockets,https://github.com/Gelbpunkt/tokio-websockets,MIT,The tokio-websockets Authors
 toml,https://github.com/toml-rs/toml,MIT OR Apache-2.0,The toml Authors
 toml_datetime,https://github.com/toml-rs/toml,MIT OR Apache-2.0,The toml_datetime Authors
 toml_edit,https://github.com/toml-rs/toml,MIT OR Apache-2.0,"Andronik Ordian <write@reusable.software>, Ed Page <eopage@gmail.com>"
@@ -691,6 +692,7 @@ triomphe,https://github.com/Manishearth/triomphe,MIT OR Apache-2.0,"Manish Goreg
 trust-dns-proto,https://github.com/bluejekyll/trust-dns,MIT OR Apache-2.0,Benjamin Fry <benjaminfry@me.com>
 trust-dns-resolver,https://github.com/bluejekyll/trust-dns,MIT OR Apache-2.0,Benjamin Fry <benjaminfry@me.com>
 try-lock,https://github.com/seanmonstar/try-lock,MIT,Sean McArthur <sean@seanmonstar.com>
+tryhard,https://github.com/EmbarkStudios/tryhard,MIT OR Apache-2.0,Embark <opensource@embark-studios.com>
 tungstenite,https://github.com/snapview/tungstenite-rs,MIT OR Apache-2.0,"Alexey Galakhov, Daniel Abramov"
 twox-hash,https://github.com/shepmaster/twox-hash,MIT,Jake Goulding <jake.goulding@gmail.com>
 typed-builder,https://github.com/idanarye/rust-typed-builder,MIT OR Apache-2.0,"IdanArye <idanarye@gmail.com>, Chris Morgan <me@chrismorgan.info>"
diff --git a/src/sinks/nats/integration_tests.rs b/src/sinks/nats/integration_tests.rs
index 6e76d362e75c5..e506e4a826478 100644
--- a/src/sinks/nats/integration_tests.rs
+++ b/src/sinks/nats/integration_tests.rs
@@ -381,8 +381,8 @@ async fn nats_tls_jwt_auth_invalid() {
 
     let r = publish_and_check(conf).await;
     assert!(
-        matches!(r, Err(NatsError::Connect { .. })),
-        "publish_and_check failed, expected NatsError::Connect, got: {r:?}"
+        matches!(r, Err(NatsError::Config { .. })),
+        "publish_and_check failed, expected NatsError::Config, got: {r:?}"
     );
 }
 
diff --git a/src/sources/nats.rs b/src/sources/nats.rs
index 8e60316a397f5..ece2934af6863 100644
--- a/src/sources/nats.rs
+++ b/src/sources/nats.rs
@@ -846,8 +846,8 @@ mod integration_tests {
 
         let r = publish_and_check(conf).await;
         assert!(
-            matches!(r, Err(BuildError::Connect { .. })),
-            "publish_and_check failed, expected BuildError::Connect, got: {r:?}"
+            matches!(r, Err(BuildError::Config { .. })),
+            "publish_and_check failed, expected BuildError::Config, got: {r:?}"
         );
     }
 

From 6417a85adb0aa805763b093631fd0f458012ded5 Mon Sep 17 00:00:00 2001
From: Thomas <thomas.schneider@datadoghq.com>
Date: Tue, 12 Aug 2025 17:06:51 -0400
Subject: [PATCH 297/305] fix(ci): use sha instead of ref in changes.yml
 (#23582)

---
 .github/workflows/changes.yml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/changes.yml b/.github/workflows/changes.yml
index e1c31195919e4..111ab22e97c9b 100644
--- a/.github/workflows/changes.yml
+++ b/.github/workflows/changes.yml
@@ -126,8 +126,8 @@ on:
       e2e-opentelemetry-logs:
         value: ${{ jobs.e2e_tests.outputs.opentelemetry-logs }}
 env:
-  BASE_REF: ${{ inputs.base_ref || (github.event_name == 'merge_group' && github.event.merge_group.base_ref) || github.event.pull_request.base.ref }}
-  HEAD_REF: ${{ inputs.head_ref  || (github.event_name == 'merge_group' && github.event.merge_group.head_ref)  || github.event.pull_request.head.ref }}
+  BASE_SHA: ${{ inputs.base_ref || (github.event_name == 'merge_group' && github.event.merge_group.base_sha) || github.event.pull_request.base.sha }}
+  HEAD_SHA: ${{ inputs.head_ref || (github.event_name == 'merge_group' && github.event.merge_group.head_sha) || github.event.pull_request.head.sha }}
 
 jobs:
   # Detects changes that are not specific to integration tests
@@ -151,8 +151,8 @@ jobs:
     - uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36 # v3.0.2
       id: filter
       with:
-        base: ${{ env.BASE_REF }}
-        ref:  ${{ env.HEAD_REF }}
+        base: ${{ env.BASE_SHA }}
+        ref:  ${{ env.HEAD_SHA }}
         filters: |
           source:
             - ".github/workflows/test.yml"
@@ -257,8 +257,8 @@ jobs:
       - uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36 # v3.0.2
         id: filter
         with:
-          base: ${{ env.BASE_REF }}
-          ref:  ${{ env.HEAD_REF }}
+          base: ${{ env.BASE_SHA }}
+          ref:  ${{ env.HEAD_SHA }}
           filters: int_test_filters.yaml
 
       # This JSON hack was introduced because GitHub Actions does not support dynamic expressions in the
@@ -335,6 +335,6 @@ jobs:
       - uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36 # v3.0.2
         id: filter
         with:
-          base: ${{ env.BASE_REF }}
-          ref:  ${{ env.HEAD_REF }}
+          base: ${{ env.BASE_SHA }}
+          ref:  ${{ env.HEAD_SHA }}
           filters: int_test_filters.yaml

From d2e3bd177448f6a6f6b086cbe9a25d97b9982a6a Mon Sep 17 00:00:00 2001
From: Pavlos Rontidis <pavlos.rontidis@gmail.com>
Date: Wed, 13 Aug 2025 10:41:08 -0400
Subject: [PATCH 298/305] chore(website): add one more highlight (#23586)

---
 website/cue/reference/releases/0.49.0.cue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/website/cue/reference/releases/0.49.0.cue b/website/cue/reference/releases/0.49.0.cue
index 8f4aa96f754bf..02067f0901c3f 100644
--- a/website/cue/reference/releases/0.49.0.cue
+++ b/website/cue/reference/releases/0.49.0.cue
@@ -17,6 +17,7 @@ releases: "0.49.0": {
 		- The `http` sink's `uri` and `request.headers` config fields now support templating, enabling dynamic construction based on event data.
 		- The `--watch-config` flag now also watches for changes in enrichment table files.
 		- Fixed a race condition that could cause negative values in the `vector_buffer_byte_size` and `vector_buffer_events` gauges.
+		- The `prometheus_remote_write` sink now offers a `expire_metrics_secs` config option. This fixes an issue where incremental metrics were preserved for the lifetime of Vector's runtime causing indefinite memory growth.
 		"""
 
 	changelog: [

From 8dfd2a07f0b668afe1289d422e110836d0fa605b Mon Sep 17 00:00:00 2001
From: Pavlos Rontidis <pavlos.rontidis@gmail.com>
Date: Wed, 13 Aug 2025 10:57:26 -0400
Subject: [PATCH 299/305] chore(ci): sort semantic scopes (#23587)

* chore(ci): sort semantic scopes

* trailing spaces
---
 .github/workflows/semantic.yml | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/semantic.yml b/.github/workflows/semantic.yml
index 3fb45b8d322e1..99c6cf0d66b83 100644
--- a/.github/workflows/semantic.yml
+++ b/.github/workflows/semantic.yml
@@ -28,12 +28,9 @@ jobs:
             revert
 
           scopes: |
-            new source
-            new transform
-            new sink
-            ARC
             administration
             api
+            ARC
             architecture
             auth
             buffers
@@ -43,13 +40,14 @@ jobs:
             codecs protobuf
             compression
             config
+            config provider
             core
             data model
             delivery
             deployment
+            deprecations
             deps
             dev
-            vdev
             durability
             enriching
             enrichment tables
@@ -64,6 +62,9 @@ jobs:
             logs
             metrics
             networking
+            new sink
+            new source
+            new transform
             observability
             parsing
             performance
@@ -88,7 +89,9 @@ jobs:
             traces
             transforms
             unit tests
+            vdev
             vrl
+
             amazon-linux platform
             apt platform
             arm platform
@@ -113,7 +116,6 @@ jobs:
             x86_64 platform
             yum platform
 
-            service providers
             aws service
             azure service
             confluent service
@@ -129,8 +131,10 @@ jobs:
             new relic service
             papertrail service
             sematext service
+            service providers
             splunk service
             yandex service
+
             apache_metrics source
             aws_ecs_metrics source
             aws_kinesis_firehose source
@@ -171,8 +175,10 @@ jobs:
             syslog source
             vector source
             websocket source
+
             aws_ec2_metadata transform
             dedupe transform
+            exclusive_route transform
             filter transform
             geoip transform
             log_to_metric transform
@@ -183,10 +189,10 @@ jobs:
             reduce transform
             remap transform
             route transform
-            exclusive_route transform
             sample transform
             tag_cardinality_limit transform
             throttle transform
+
             amqp sink
             apex sink
             aws_cloudwatch_logs sink
@@ -201,8 +207,8 @@ jobs:
             blackhole sink
             clickhouse sink
             console sink
-            datadog_common sink
             datadog_archives sink
+            datadog_common sink
             datadog_events sink
             datadog_logs sink
             datadog_metrics sink
@@ -213,8 +219,8 @@ jobs:
             gcp_pubsub sink
             gcp_stackdriver_logs sink
             gcp_stackdriver_metrics sink
-            greptimedb_metrics sink
             greptimedb_logs sink
+            greptimedb_metrics sink
             honeycomb sink
             http sink
             humio_logs sink
@@ -243,6 +249,7 @@ jobs:
             vector sink
             websocket sink
             websocket_server sink
+
             blog website
             css website
             guides website
@@ -253,5 +260,4 @@ jobs:
             website
             website deps
 
-            config provider
             opentelemetry lib

From 6389f2f0c16a157579e2cfe4662d280e8688608a Mon Sep 17 00:00:00 2001
From: Brian Stack <brian@render.com>
Date: Thu, 8 May 2025 14:39:00 -0700
Subject: [PATCH 300/305] Add a config flag to allow not listwatching
 namespaces

The namespaces cache will be an empty store in this case. Down
the line all of the code _should_ just work for instance emitting
an error log if you try to access namespace labels.
---
 src/sources/kubernetes_logs/mod.rs | 51 +++++++++++++++++++-----------
 1 file changed, 32 insertions(+), 19 deletions(-)

diff --git a/src/sources/kubernetes_logs/mod.rs b/src/sources/kubernetes_logs/mod.rs
index 7552df0abd8c6..42fb6b932a2a0 100644
--- a/src/sources/kubernetes_logs/mod.rs
+++ b/src/sources/kubernetes_logs/mod.rs
@@ -107,6 +107,13 @@ pub struct Config {
     ))]
     extra_namespace_label_selector: String,
 
+    /// Specifies whether or not to enrich with namespace fields.
+    ///
+    /// This can be useful to make Vector not pull in namespaces to reduce load on
+    /// kube-apiserver and daemonset memory usage in clusters with  lots of namespaces.
+    ///
+    add_namespace_fields: bool,
+
     /// The name of the Kubernetes [Node][node] that is running.
     ///
     /// Configured to use an environment variable by default, to be evaluated to a value provided by
@@ -290,6 +297,7 @@ impl Default for Config {
         Self {
             extra_label_selector: "".to_string(),
             extra_namespace_label_selector: "".to_string(),
+            add_namespace_fields: true,
             self_node_name: default_self_node_name_env_template(),
             extra_field_selector: "".to_string(),
             auto_partial_merge: true,
@@ -555,6 +563,7 @@ struct Source {
     field_selector: String,
     label_selector: String,
     namespace_label_selector: String,
+    add_namespace_fields: bool,
     node_selector: String,
     self_node_name: String,
     include_paths: Vec<glob::Pattern>,
@@ -643,6 +652,7 @@ impl Source {
             field_selector,
             label_selector,
             namespace_label_selector,
+            add_namespace_fields: config.add_namespace_fields,
             node_selector,
             self_node_name,
             include_paths,
@@ -679,6 +689,7 @@ impl Source {
             field_selector,
             label_selector,
             namespace_label_selector,
+            add_namespace_fields,
             node_selector,
             self_node_name,
             include_paths,
@@ -733,27 +744,29 @@ impl Source {
 
         // -----------------------------------------------------------------
 
-        let namespaces = Api::<Namespace>::all(client.clone());
-        let ns_watcher = watcher(
-            namespaces,
-            watcher::Config {
-                label_selector: Some(namespace_label_selector),
-                list_semantic: list_semantic.clone(),
-                page_size: get_page_size(use_apiserver_cache),
-                ..Default::default()
-            },
-        )
-        .backoff(watcher::DefaultBackoff::default());
         let ns_store_w = reflector::store::Writer::default();
         let ns_state = ns_store_w.as_reader();
-        let ns_cacher = MetaCache::new();
-
-        reflectors.push(tokio::spawn(custom_reflector(
-            ns_store_w,
-            ns_cacher,
-            ns_watcher,
-            delay_deletion,
-        )));
+        if add_namespace_fields {
+            let namespaces = Api::<Namespace>::all(client.clone());
+            let ns_watcher = watcher(
+                namespaces,
+                watcher::Config {
+                    label_selector: Some(namespace_label_selector),
+                    list_semantic: list_semantic.clone(),
+                    page_size: get_page_size(use_apiserver_cache),
+                    ..Default::default()
+                },
+            )
+            .backoff(watcher::DefaultBackoff::default());
+            let ns_cacher = MetaCache::new();
+
+            reflectors.push(tokio::spawn(custom_reflector(
+                ns_store_w,
+                ns_cacher,
+                ns_watcher,
+                delay_deletion,
+            )));
+        }
 
         // -----------------------------------------------------------------
 

From 1d093221e2beb382829acb4ec77cf2bf3ff1e87f Mon Sep 17 00:00:00 2001
From: Brian Stack <brian@render.com>
Date: Fri, 15 Aug 2025 04:09:28 +0000
Subject: [PATCH 301/305] Add some tests for this feature

---
 src/sources/kubernetes_logs/mod.rs | 53 ++++++++++++++++++++++++++++++
 1 file changed, 53 insertions(+)

diff --git a/src/sources/kubernetes_logs/mod.rs b/src/sources/kubernetes_logs/mod.rs
index 42fb6b932a2a0..5856781f297bf 100644
--- a/src/sources/kubernetes_logs/mod.rs
+++ b/src/sources/kubernetes_logs/mod.rs
@@ -1177,6 +1177,59 @@ mod tests {
         crate::test_util::test_generate_config::<Config>();
     }
 
+    #[test]
+    fn test_default_config_add_namespace_fields() {
+        let config = Config::default();
+        assert_eq!(config.add_namespace_fields, true);
+    }
+
+    #[test]
+    fn test_config_add_namespace_fields_disabled() {
+        let config = Config {
+            add_namespace_fields: false,
+            ..Default::default()
+        };
+        assert_eq!(config.add_namespace_fields, false);
+    }
+
+    #[test]
+    fn test_config_serialization_add_namespace_fields() {
+        // Test that the flag serializes/deserializes correctly from TOML
+        let toml_config = r#"
+            add_namespace_fields = false
+        "#;
+        let config: Config = toml::from_str(toml_config).unwrap();
+        assert_eq!(config.add_namespace_fields, false);
+        
+        let default_toml = "";
+        let default_config: Config = toml::from_str(default_toml).unwrap();
+        assert_eq!(default_config.add_namespace_fields, true);
+    }
+
+    #[test]
+    fn test_add_namespace_fields_affects_behavior() {
+        // Test that the config field properly controls namespace watching behavior
+        // This is a unit test for the conditional logic in the run method
+        let enabled_config = Config {
+            add_namespace_fields: true,
+            ..Default::default()
+        };
+        let disabled_config = Config {
+            add_namespace_fields: false,
+            ..Default::default()
+        };
+        
+        // The main validation is that the flag is passed through correctly
+        // and can be used in conditional logic
+        assert!(should_watch_namespaces(&enabled_config));
+        assert!(!should_watch_namespaces(&disabled_config));
+    }
+    
+    // Helper function to simulate the conditional logic from the run method
+    fn should_watch_namespaces(config: &Config) -> bool {
+        config.add_namespace_fields
+    }
+
     #[test]
     fn prepare_exclude_paths() {
         let cases = vec![

From 0a6fbb4e000afb724e1838c7752b54a927b4b455 Mon Sep 17 00:00:00 2001
From: Brian Stack <brian@render.com>
Date: Fri, 15 Aug 2025 20:10:31 +0000
Subject: [PATCH 302/305] Fix formatting

---
 src/sources/kubernetes_logs/mod.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/sources/kubernetes_logs/mod.rs b/src/sources/kubernetes_logs/mod.rs
index 5856781f297bf..e3881606170b3 100644
--- a/src/sources/kubernetes_logs/mod.rs
+++ b/src/sources/kubernetes_logs/mod.rs
@@ -1200,7 +1200,7 @@ mod tests {
         "#;
         let config: Config = toml::from_str(toml_config).unwrap();
         assert_eq!(config.add_namespace_fields, false);
-        
+
         let default_toml = "";
         let default_config: Config = toml::from_str(default_toml).unwrap();
         assert_eq!(default_config.add_namespace_fields, true);
@@ -1218,13 +1218,13 @@ mod tests {
             add_namespace_fields: false,
             ..Default::default()
         };
-        
+
         // The main validation is that the flag is passed through correctly
         // and can be used in conditional logic
         assert!(should_watch_namespaces(&enabled_config));
         assert!(!should_watch_namespaces(&disabled_config));
     }
-    
+
     // Helper function to simulate the conditional logic from the run method
     fn should_watch_namespaces(config: &Config) -> bool {
         config.add_namespace_fields

From deb737a2c69fd361853f5a34d594cd2fe842a104 Mon Sep 17 00:00:00 2001
From: Brian Stack <brian@render.com>
Date: Fri, 15 Aug 2025 22:20:57 +0000
Subject: [PATCH 303/305] Update docs

---
 .../components/sources/generated/kubernetes_logs.cue   | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/website/cue/reference/components/sources/generated/kubernetes_logs.cue b/website/cue/reference/components/sources/generated/kubernetes_logs.cue
index 459a70a9287be..db11ff9e281cb 100644
--- a/website/cue/reference/components/sources/generated/kubernetes_logs.cue
+++ b/website/cue/reference/components/sources/generated/kubernetes_logs.cue
@@ -1,6 +1,16 @@
 package metadata
 
 generated: components: sources: kubernetes_logs: configuration: {
+	add_namespace_fields: {
+		description: """
+			Specifies whether or not to enrich with namespace fields.
+
+			This can be useful to make Vector not pull in namespaces to reduce load on
+			kube-apiserver and daemonset memory usage in clusters with  lots of namespaces.
+			"""
+		required: false
+		type: bool: default: true
+	}
 	auto_partial_merge: {
 		description: """
 			Whether or not to automatically merge partial events.

From 3e2d8cdaa003db19ec2d6b73d0b4c1e4c57aaed2 Mon Sep 17 00:00:00 2001
From: Brian Stack <brian@render.com>
Date: Fri, 15 Aug 2025 22:35:24 +0000
Subject: [PATCH 304/305] Add changelog fragment

---
 changelog.d/22990_allow_not_watching_k8s_ns.enhancement.md | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 changelog.d/22990_allow_not_watching_k8s_ns.enhancement.md

diff --git a/changelog.d/22990_allow_not_watching_k8s_ns.enhancement.md b/changelog.d/22990_allow_not_watching_k8s_ns.enhancement.md
new file mode 100644
index 0000000000000..50e2ce6d92f66
--- /dev/null
+++ b/changelog.d/22990_allow_not_watching_k8s_ns.enhancement.md
@@ -0,0 +1,4 @@
+Allow disabling listwatching of Kubernetes namespaces to reduce resource usage in clusters with
+large numbers of namespaces.
+
+authors: imbstack

From 4db6d7a05f961946859940aa27f6172c296a08b0 Mon Sep 17 00:00:00 2001
From: Brian Stack <brian@render.com>
Date: Fri, 15 Aug 2025 22:52:02 +0000
Subject: [PATCH 305/305] Improve docs

---
 src/sources/kubernetes_logs/mod.rs                        | 8 ++++++++
 .../components/sources/generated/kubernetes_logs.cue      | 2 ++
 2 files changed, 10 insertions(+)

diff --git a/src/sources/kubernetes_logs/mod.rs b/src/sources/kubernetes_logs/mod.rs
index e3881606170b3..1e31717be976e 100644
--- a/src/sources/kubernetes_logs/mod.rs
+++ b/src/sources/kubernetes_logs/mod.rs
@@ -111,7 +111,10 @@ pub struct Config {
     ///
     /// This can be useful to make Vector not pull in namespaces to reduce load on
     /// kube-apiserver and daemonset memory usage in clusters with  lots of namespaces.
+    /// In the case that this is set to `false`, fields based on namespace labels will not
+    /// be available.
     ///
+    #[serde(default = "default_add_namespace_fields")]
     add_namespace_fields: bool,
 
     /// The name of the Kubernetes [Node][node] that is running.
@@ -1059,6 +1062,11 @@ const fn default_oldest_first() -> bool {
     true
 }
 
+// We'd like to add these in all but clusters with very many namespaces
+const fn default_add_namespace_fields() -> bool {
+    true
+}
+
 const fn default_max_line_bytes() -> usize {
     // NOTE: The below comment documents an incorrect assumption, see
     // https://github.com/vectordotdev/vector/issues/6967
diff --git a/website/cue/reference/components/sources/generated/kubernetes_logs.cue b/website/cue/reference/components/sources/generated/kubernetes_logs.cue
index db11ff9e281cb..1d57e38fffd74 100644
--- a/website/cue/reference/components/sources/generated/kubernetes_logs.cue
+++ b/website/cue/reference/components/sources/generated/kubernetes_logs.cue
@@ -7,6 +7,8 @@ generated: components: sources: kubernetes_logs: configuration: {
 
 			This can be useful to make Vector not pull in namespaces to reduce load on
 			kube-apiserver and daemonset memory usage in clusters with  lots of namespaces.
+			In the case that this is set to `false`, fields based on namespace labels will not
+			be available.
 			"""
 		required: false
 		type: bool: default: true