From cddb83570d8accf5b528254f53502b00385ee268 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 24 Oct 2023 13:57:18 +0000
Subject: [PATCH 01/28] chore(deps): Bump the clap group with 1 update (#18906)

Bumps the clap group with 1 update: [clap-verbosity-flag](https://github.com/clap-rs/clap-verbosity-flag).

- [Changelog](https://github.com/clap-rs/clap-verbosity-flag/blob/master/CHANGELOG.md)
- [Commits](https://github.com/clap-rs/clap-verbosity-flag/compare/v2.0.1...v2.1.0)

---
updated-dependencies:
- dependency-name: clap-verbosity-flag
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: clap
...

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

diff --git a/Cargo.lock b/Cargo.lock
index dcdf1a92b2d9f..805d01e59721c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2077,9 +2077,9 @@ dependencies = [
 
 [[package]]
 name = "clap-verbosity-flag"
-version = "2.0.1"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1eef05769009513df2eb1c3b4613e7fad873a14c600ff025b08f250f59fee7de"
+checksum = "e5fdbb015d790cfb378aca82caf9cc52a38be96a7eecdb92f31b4366a8afc019"
 dependencies = [
  "clap 4.4.6",
  "log",
diff --git a/vdev/Cargo.toml b/vdev/Cargo.toml
index 54bd6bcfd1bbc..4b0fcc62099c8 100644
--- a/vdev/Cargo.toml
+++ b/vdev/Cargo.toml
@@ -13,7 +13,7 @@ atty = "0.2.14"
 cached = "0.46.0"
 chrono = { version = "0.4.31", default-features = false, features = ["serde", "clock"] }
 clap = { version = "4.4.6", features = ["derive"] }
-clap-verbosity-flag = "2.0.1"
+clap-verbosity-flag = "2.1.0"
 clap_complete = "4.4.3"
 confy = "0.5.1"
 directories = "5.0.1"

From 249330a3a01b132feea17cd3fbd4b0ed22429524 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 24 Oct 2023 11:31:20 -0600
Subject: [PATCH 02/28] chore(deps): Bump toml from 0.8.3 to 0.8.4 (#18913)

Bumps [toml](https://github.com/toml-rs/toml) from 0.8.3 to 0.8.4.
- [Commits](https://github.com/toml-rs/toml/compare/toml-v0.8.3...toml-v0.8.4)

---
updated-dependencies:
- dependency-name: toml
  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>
---
 Cargo.lock                   | 24 ++++++++++++------------
 Cargo.toml                   |  2 +-
 lib/vector-config/Cargo.toml |  2 +-
 lib/vector-core/Cargo.toml   |  4 ++--
 vdev/Cargo.toml              |  2 +-
 5 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 805d01e59721c..53a279c8c4ad7 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1872,7 +1872,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e3f9629bc6c4388ea699781dc988c2b99766d7679b151c81990b4fa1208fafd3"
 dependencies = [
  "serde",
- "toml 0.8.3",
+ "toml 0.8.4",
 ]
 
 [[package]]
@@ -7813,7 +7813,7 @@ version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "af5ae5f42c16d60b098ae5d4afd75c1d3b6512e6ca5d0b9b916e2ced30df264c"
 dependencies = [
- "toml 0.8.3",
+ "toml 0.8.4",
 ]
 
 [[package]]
@@ -8936,9 +8936,9 @@ dependencies = [
 
 [[package]]
 name = "toml"
-version = "0.8.3"
+version = "0.8.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b150d2f463da7b52f12110d3995dc86598bf90d535e929e5f5af15ab89155011"
+checksum = "2ef75d881185fd2df4a040793927c153d863651108a93c7e17a9e591baa95cc6"
 dependencies = [
  "serde",
  "serde_spanned",
@@ -8948,18 +8948,18 @@ dependencies = [
 
 [[package]]
 name = "toml_datetime"
-version = "0.6.4"
+version = "0.6.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51cc078118ed25af325985ff674c00c8416b0f962be67da4946854ebfc99f334"
+checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1"
 dependencies = [
  "serde",
 ]
 
 [[package]]
 name = "toml_edit"
-version = "0.20.3"
+version = "0.20.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a2534c1aa199edef7108fb7d970facaa17f8f8cc5ce6bde75372cfa1051ed91"
+checksum = "380f9e8120405471f7c9ad1860a713ef5ece6a670c7eae39225e477340f32fc4"
 dependencies = [
  "indexmap 2.0.2",
  "serde",
@@ -9672,7 +9672,7 @@ dependencies = [
  "serde_yaml 0.9.25",
  "sha2",
  "tempfile",
- "toml 0.8.3",
+ "toml 0.8.4",
 ]
 
 [[package]]
@@ -9848,7 +9848,7 @@ dependencies = [
  "tokio-test",
  "tokio-tungstenite",
  "tokio-util",
- "toml 0.8.3",
+ "toml 0.8.4",
  "tonic 0.10.2",
  "tonic-build 0.10.2",
  "tower",
@@ -9996,7 +9996,7 @@ dependencies = [
  "serde_json",
  "serde_with 3.4.0",
  "snafu",
- "toml 0.8.3",
+ "toml 0.8.4",
  "tracing 0.1.37",
  "url",
  "vector-config-common",
@@ -10097,7 +10097,7 @@ dependencies = [
  "tokio-stream",
  "tokio-test",
  "tokio-util",
- "toml 0.8.3",
+ "toml 0.8.4",
  "tonic 0.10.2",
  "tracing 0.1.37",
  "tracing-core 0.1.30",
diff --git a/Cargo.toml b/Cargo.toml
index 3d48ecf208b66..7637cac5ff91e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -324,7 +324,7 @@ syslog = { version = "6.1.0", default-features = false, optional = true }
 tikv-jemallocator = { version = "0.5.4", default-features = false, optional = true }
 tokio-postgres = { version = "0.7.10", default-features = false, features = ["runtime", "with-chrono-0_4"], optional = true }
 tokio-tungstenite = {version = "0.20.1", default-features = false, features = ["connect"], optional = true}
-toml = { version = "0.8.3", default-features = false, features = ["parse", "display"] }
+toml = { version = "0.8.4", default-features = false, features = ["parse", "display"] }
 tonic = { version = "0.10", optional = true, default-features = false, features = ["transport", "codegen", "prost", "tls", "tls-roots", "gzip"] }
 trust-dns-proto = { version = "0.23.2", default-features = false, features = ["dnssec"], optional = true }
 typetag = { version = "0.2.13", default-features = false }
diff --git a/lib/vector-config/Cargo.toml b/lib/vector-config/Cargo.toml
index 86fde0b7d2c44..3011248797838 100644
--- a/lib/vector-config/Cargo.toml
+++ b/lib/vector-config/Cargo.toml
@@ -22,7 +22,7 @@ serde = { version = "1.0", default-features = false }
 serde_json = { version = "1.0", default-features = false, features = ["std"] }
 serde_with = { version = "3.4.0", default-features = false, features = ["std"] }
 snafu = { version = "0.7.5", default-features = false }
-toml = { version = "0.8.3", default-features = false }
+toml = { version = "0.8.4", default-features = false }
 tracing = { version = "0.1.34", default-features = false }
 url = { version = "2.4.1", default-features = false, features = ["serde"] }
 http = { version = "0.2.9", default-features = false }
diff --git a/lib/vector-core/Cargo.toml b/lib/vector-core/Cargo.toml
index 9b1e4009fef74..c33f3f54485f7 100644
--- a/lib/vector-core/Cargo.toml
+++ b/lib/vector-core/Cargo.toml
@@ -50,7 +50,7 @@ tokio = { version = "1.33.0", default-features = false, features = ["net"] }
 tokio-openssl = { version = "0.6.3", 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"] }
-toml = { version = "0.8.3", default-features = false }
+toml = { version = "0.8.4", default-features = false }
 tonic = { version = "0.10", default-features = false, features = ["transport"] }
 tracing = { version = "0.1.34", default-features = false }
 tracing-core = { version = "0.1.26", default-features = false }
@@ -84,7 +84,7 @@ quickcheck_macros = "1"
 proptest = "1.3"
 similar-asserts = "1.5.0"
 tokio-test = "0.4.3"
-toml = { version = "0.8.3", default-features = false, features = ["parse"] }
+toml = { version = "0.8.4", default-features = false, features = ["parse"] }
 ndarray = "0.15.6"
 ndarray-stats = "0.5.1"
 noisy_float = "0.2.0"
diff --git a/vdev/Cargo.toml b/vdev/Cargo.toml
index 4b0fcc62099c8..ce33910260155 100644
--- a/vdev/Cargo.toml
+++ b/vdev/Cargo.toml
@@ -37,4 +37,4 @@ serde_json = "1.0.107"
 serde_yaml = "0.9.25"
 sha2 = "0.10.8"
 tempfile = "3.8.0"
-toml = { version = "0.8.3", default-features = false, features = ["parse"] }
+toml = { version = "0.8.4", default-features = false, features = ["parse"] }

From 26f430c77138ef2373e86182966d5d5085b68514 Mon Sep 17 00:00:00 2001
From: Doug Smith <dsmith3197@users.noreply.github.com>
Date: Tue, 24 Oct 2023 14:16:33 -0400
Subject: [PATCH 03/28] fix(amqp sink): remove unnecessary unwrap & emit event
 dropped errors (#18923)

* fix(amqp sink): remove unnecessary unwrap & emit event dropped errors

* return error too

* fix checks

* feedback
---
 src/internal_events/amqp.rs | 36 ++++++++++++++++++++++++++++++------
 src/sinks/amqp/service.rs   | 25 ++++++++++---------------
 src/sinks/amqp/sink.rs      |  1 +
 3 files changed, 41 insertions(+), 21 deletions(-)

diff --git a/src/internal_events/amqp.rs b/src/internal_events/amqp.rs
index dd5dde7b8e7b8..a042b86278ed3 100644
--- a/src/internal_events/amqp.rs
+++ b/src/internal_events/amqp.rs
@@ -105,9 +105,9 @@ pub mod sink {
 
     impl InternalEvent for AmqpDeliveryError<'_> {
         fn emit(self) {
-            let deliver_reason = "Unable to deliver.";
+            const DELIVER_REASON: &str = "Unable to deliver.";
 
-            error!(message = deliver_reason,
+            error!(message = DELIVER_REASON,
                    error = ?self.error,
                    error_type = error_type::REQUEST_FAILED,
                    stage = error_stage::SENDING,
@@ -120,7 +120,7 @@ pub mod sink {
             );
             emit!(ComponentEventsDropped::<UNINTENTIONAL> {
                 count: 1,
-                reason: deliver_reason
+                reason: DELIVER_REASON
             });
         }
     }
@@ -132,9 +132,9 @@ pub mod sink {
 
     impl InternalEvent for AmqpAcknowledgementError<'_> {
         fn emit(self) {
-            let ack_reason = "Acknowledgement failed.";
+            const ACK_REASON: &str = "Acknowledgement failed.";
 
-            error!(message = ack_reason,
+            error!(message = ACK_REASON,
                    error = ?self.error,
                    error_type = error_type::REQUEST_FAILED,
                    stage = error_stage::SENDING,
@@ -147,7 +147,31 @@ pub mod sink {
             );
             emit!(ComponentEventsDropped::<UNINTENTIONAL> {
                 count: 1,
-                reason: ack_reason
+                reason: ACK_REASON
+            });
+        }
+    }
+
+    #[derive(Debug)]
+    pub struct AmqpNackError;
+
+    impl InternalEvent for AmqpNackError {
+        fn emit(self) {
+            const DELIVER_REASON: &str = "Received Negative Acknowledgement from AMQP broker.";
+            error!(
+                message = DELIVER_REASON,
+                error_type = error_type::ACKNOWLEDGMENT_FAILED,
+                stage = error_stage::SENDING,
+                internal_log_rate_limit = true,
+            );
+            counter!(
+                "component_errors_total", 1,
+                "error_type" => error_type::ACKNOWLEDGMENT_FAILED,
+                "stage" => error_stage::SENDING,
+            );
+            emit!(ComponentEventsDropped::<UNINTENTIONAL> {
+                count: 1,
+                reason: DELIVER_REASON
             });
         }
     }
diff --git a/src/sinks/amqp/service.rs b/src/sinks/amqp/service.rs
index 42ccf467e5692..36e2845afa821 100644
--- a/src/sinks/amqp/service.rs
+++ b/src/sinks/amqp/service.rs
@@ -1,7 +1,7 @@
 //! The main tower service that takes the request created by the request builder
 //! and sends it to `AMQP`.
 use crate::{
-    internal_events::sink::{AmqpAcknowledgementError, AmqpDeliveryError},
+    internal_events::sink::{AmqpAcknowledgementError, AmqpDeliveryError, AmqpNackError},
     sinks::prelude::*,
 };
 use bytes::Bytes;
@@ -88,10 +88,13 @@ pub(super) struct AmqpService {
 #[derive(Debug, Snafu)]
 pub(super) enum AmqpError {
     #[snafu(display("Failed retrieving Acknowledgement: {}", error))]
-    AmqpAcknowledgementFailed { error: lapin::Error },
+    AcknowledgementFailed { error: lapin::Error },
 
     #[snafu(display("Failed AMQP request: {}", error))]
-    AmqpDeliveryFailed { error: lapin::Error },
+    DeliveryFailed { error: lapin::Error },
+
+    #[snafu(display("Received Negative Acknowledgement from AMQP broker."))]
+    Nack,
 }
 
 impl Service<AmqpRequest> for AmqpService {
@@ -109,11 +112,6 @@ impl Service<AmqpRequest> for AmqpService {
         let channel = Arc::clone(&self.channel);
 
         Box::pin(async move {
-            channel
-                .confirm_select(lapin::options::ConfirmSelectOptions::default())
-                .await
-                .unwrap();
-
             let byte_size = req.body.len();
             let fut = channel
                 .basic_publish(
@@ -128,16 +126,13 @@ impl Service<AmqpRequest> for AmqpService {
             match fut {
                 Ok(result) => match result.await {
                     Ok(lapin::publisher_confirm::Confirmation::Nack(_)) => {
-                        warn!("Received Negative Acknowledgement from AMQP server.");
-                        Ok(AmqpResponse {
-                            json_size: req.metadata.into_events_estimated_json_encoded_byte_size(),
-                            byte_size,
-                        })
+                        emit!(AmqpNackError);
+                        Err(AmqpError::Nack)
                     }
                     Err(error) => {
                         // TODO: In due course the caller could emit these on error.
                         emit!(AmqpAcknowledgementError { error: &error });
-                        Err(AmqpError::AmqpAcknowledgementFailed { error })
+                        Err(AmqpError::AcknowledgementFailed { error })
                     }
                     Ok(_) => Ok(AmqpResponse {
                         json_size: req.metadata.into_events_estimated_json_encoded_byte_size(),
@@ -147,7 +142,7 @@ impl Service<AmqpRequest> for AmqpService {
                 Err(error) => {
                     // TODO: In due course the caller could emit these on error.
                     emit!(AmqpDeliveryError { error: &error });
-                    Err(AmqpError::AmqpDeliveryFailed { error })
+                    Err(AmqpError::DeliveryFailed { error })
                 }
             }
         })
diff --git a/src/sinks/amqp/sink.rs b/src/sinks/amqp/sink.rs
index 7039c6217993d..922065a58a7a3 100644
--- a/src/sinks/amqp/sink.rs
+++ b/src/sinks/amqp/sink.rs
@@ -43,6 +43,7 @@ impl AmqpSink {
             .await
             .map_err(|e| BuildError::AmqpCreateFailed { source: e })?;
 
+        // Enable confirmations on the channel.
         channel
             .confirm_select(ConfirmSelectOptions::default())
             .await

From bf56ac5b98569902b5a58e94b8afecd846545d14 Mon Sep 17 00:00:00 2001
From: neuronull <neuronull@pm.me>
Date: Tue, 24 Oct 2023 12:52:49 -0600
Subject: [PATCH 04/28] chore(ci): filter team members from gardener issue
 comment workflow (#18915)

* chore(ci): filter team members from gardener issue comment workflow

* fix logic
---
 .github/workflows/gardener_issue_comment.yml | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/gardener_issue_comment.yml b/.github/workflows/gardener_issue_comment.yml
index f25dc9da5e02a..b55221ef32a42 100644
--- a/.github/workflows/gardener_issue_comment.yml
+++ b/.github/workflows/gardener_issue_comment.yml
@@ -1,7 +1,8 @@
 # Gardener Issue Comment
 #
 # This workflow moves GH issues from the Gardener board's "Blocked / Waiting" column
-# to the "Triage", so that the Gardener can assess the issue in light of new information.
+# to "Triage", when a comment is posted on an issue from a non-team member
+# so that the Gardener can assess the issue in light of new information.
 
 name: Gardener Issue Comment
 
@@ -15,7 +16,23 @@ jobs:
     runs-on: ubuntu-latest
     if: contains(github.event.issue.url, 'issues')
     steps:
+      - name: Generate authentication token
+        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 }}
+
+      - name: Get PR comment author
+        id: comment
+        uses: tspascoal/get-user-teams-membership@v3
+        with:
+          username: ${{ github.actor }}
+          team: 'Vector'
+          GITHUB_TOKEN: ${{ steps.generate_token.outputs.token }}
+
       - name: Move issue back to Triage if status is Blocked/Waiting
+        if: steps.comment.outputs.isTeamMember == 'false'
         env:
           GH_TOKEN: ${{ secrets.GH_PROJECT_PAT }}
         run: |

From 78934c211d085dabe3be4c183b804b05d49303c4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 24 Oct 2023 15:03:54 -0600
Subject: [PATCH 05/28] chore(deps): Bump the clap group with 2 updates
 (#18925)

Bumps the clap group with 2 updates: [clap](https://github.com/clap-rs/clap) and [clap_complete](https://github.com/clap-rs/clap).


Updates `clap` from 4.4.6 to 4.4.7
- [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/v4.4.6...v4.4.7)

Updates `clap_complete` from 4.4.3 to 4.4.4
- [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.4.3...clap_complete-v4.4.4)

---
updated-dependencies:
- dependency-name: clap
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: clap
- dependency-name: clap_complete
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: clap
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock                       | 40 ++++++++++++++++----------------
 Cargo.toml                       |  2 +-
 lib/vector-api-client/Cargo.toml |  2 +-
 lib/vector-buffers/Cargo.toml    |  2 +-
 lib/vector-vrl/cli/Cargo.toml    |  2 +-
 lib/vector-vrl/tests/Cargo.toml  |  2 +-
 vdev/Cargo.toml                  |  4 ++--
 7 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 53a279c8c4ad7..389d7355930c5 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2067,9 +2067,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.4.6"
+version = "4.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d04704f56c2cde07f43e8e2c154b43f216dc5c92fc98ada720177362f953b956"
+checksum = "ac495e00dcec98c83465d5ad66c5c4fabd652fd6686e7c6269b117e729a6f17b"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -2081,15 +2081,15 @@ version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e5fdbb015d790cfb378aca82caf9cc52a38be96a7eecdb92f31b4366a8afc019"
 dependencies = [
- "clap 4.4.6",
+ "clap 4.4.7",
  "log",
 ]
 
 [[package]]
 name = "clap_builder"
-version = "4.4.6"
+version = "4.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e231faeaca65ebd1ea3c737966bf858971cd38c3849107aa3ea7de90a804e45"
+checksum = "c77ed9a32a62e6ca27175d00d29d05ca32e396ea1eb5fb01d8256b669cec7663"
 dependencies = [
  "anstream",
  "anstyle 1.0.0",
@@ -2100,18 +2100,18 @@ dependencies = [
 
 [[package]]
 name = "clap_complete"
-version = "4.4.3"
+version = "4.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3ae8ba90b9d8b007efe66e55e48fb936272f5ca00349b5b0e89877520d35ea7"
+checksum = "bffe91f06a11b4b9420f62103854e90867812cd5d01557f853c5ee8e791b12ae"
 dependencies = [
- "clap 4.4.6",
+ "clap 4.4.7",
 ]
 
 [[package]]
 name = "clap_derive"
-version = "4.4.2"
+version = "4.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0862016ff20d69b84ef8247369fabf5c008a7417002411897d40ee1f4532b873"
+checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442"
 dependencies = [
  "heck 0.4.1",
  "proc-macro2 1.0.69",
@@ -2121,9 +2121,9 @@ dependencies = [
 
 [[package]]
 name = "clap_lex"
-version = "0.5.0"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b"
+checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1"
 
 [[package]]
 name = "clipboard-win"
@@ -2439,7 +2439,7 @@ dependencies = [
  "anes",
  "cast",
  "ciborium",
- "clap 4.4.6",
+ "clap 4.4.7",
  "criterion-plot",
  "futures 0.3.28",
  "is-terminal",
@@ -9649,7 +9649,7 @@ dependencies = [
  "atty",
  "cached",
  "chrono",
- "clap 4.4.6",
+ "clap 4.4.7",
  "clap-verbosity-flag",
  "clap_complete",
  "confy",
@@ -9726,7 +9726,7 @@ dependencies = [
  "bytesize",
  "chrono",
  "cidr-utils",
- "clap 4.4.6",
+ "clap 4.4.7",
  "codecs",
  "colored",
  "console-subscriber",
@@ -9888,7 +9888,7 @@ dependencies = [
  "anyhow",
  "async-trait",
  "chrono",
- "clap 4.4.6",
+ "clap 4.4.7",
  "futures 0.3.28",
  "graphql_client",
  "indoc",
@@ -9911,7 +9911,7 @@ dependencies = [
  "async-trait",
  "bytecheck",
  "bytes 1.5.0",
- "clap 4.4.6",
+ "clap 4.4.7",
  "crc32fast",
  "criterion",
  "crossbeam-queue",
@@ -10148,7 +10148,7 @@ dependencies = [
 name = "vector-vrl-cli"
 version = "0.1.0"
 dependencies = [
- "clap 4.4.6",
+ "clap 4.4.7",
  "vector-vrl-functions",
  "vrl",
 ]
@@ -10167,7 +10167,7 @@ dependencies = [
  "ansi_term",
  "chrono",
  "chrono-tz",
- "clap 4.4.6",
+ "clap 4.4.7",
  "enrichment",
  "glob",
  "prettydiff",
@@ -10228,7 +10228,7 @@ dependencies = [
  "chrono",
  "chrono-tz",
  "cidr-utils",
- "clap 4.4.6",
+ "clap 4.4.7",
  "codespan-reporting",
  "community-id",
  "crypto_secretbox",
diff --git a/Cargo.toml b/Cargo.toml
index 7637cac5ff91e..cf794391c783c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -257,7 +257,7 @@ bytes = { version = "1.5.0", default-features = false, features = ["serde"] }
 bytesize = { version = "1.3.0", default-features = false }
 chrono = { version = "0.4.31", default-features = false, features = ["serde"] }
 cidr-utils = { version = "0.5.11", default-features = false }
-clap = { version = "4.4.6", default-features = false, features = ["derive", "error-context", "env", "help", "std", "string", "usage", "wrap_help"] }
+clap = { version = "4.4.7", default-features = false, features = ["derive", "error-context", "env", "help", "std", "string", "usage", "wrap_help"] }
 colored = { version = "2.0.4", default-features = false }
 csv = { version = "1.3", default-features = false }
 derivative = { version = "2.2.0", default-features = false }
diff --git a/lib/vector-api-client/Cargo.toml b/lib/vector-api-client/Cargo.toml
index df849abbc3683..2a408c0c74bb0 100644
--- a/lib/vector-api-client/Cargo.toml
+++ b/lib/vector-api-client/Cargo.toml
@@ -30,7 +30,7 @@ tokio-tungstenite = { version = "0.20.1", default-features = false, features = [
 
 # External libs
 chrono = { version = "0.4.31", default-features = false, features = ["serde"] }
-clap = { version = "4.4.6", default-features = false, features = ["derive"] }
+clap = { version = "4.4.7", default-features = false, features = ["derive"] }
 url = { version = "2.4.1", default-features = false }
 uuid = { version = "1", default-features = false, features = ["serde", "v4"] }
 indoc = { version = "2.0.4", default-features = false }
diff --git a/lib/vector-buffers/Cargo.toml b/lib/vector-buffers/Cargo.toml
index 18f031fbbf694..5e1938772f0b0 100644
--- a/lib/vector-buffers/Cargo.toml
+++ b/lib/vector-buffers/Cargo.toml
@@ -32,7 +32,7 @@ vector-config-macros = { path = "../vector-config-macros", default-features = fa
 vector-common = { path = "../vector-common", default-features = false, features = ["byte_size_of", "serde"] }
 
 [dev-dependencies]
-clap = "4.4.6"
+clap = "4.4.7"
 criterion = { version = "0.5", features = ["html_reports", "async_tokio"] }
 crossbeam-queue = "0.3.8"
 hdrhistogram = "7.5.2"
diff --git a/lib/vector-vrl/cli/Cargo.toml b/lib/vector-vrl/cli/Cargo.toml
index 5e06e58ca9c3b..e374afc1894c3 100644
--- a/lib/vector-vrl/cli/Cargo.toml
+++ b/lib/vector-vrl/cli/Cargo.toml
@@ -7,6 +7,6 @@ publish = false
 license = "MPL-2.0"
 
 [dependencies]
-clap = { version = "4.4.6", features = ["derive"] }
+clap = { version = "4.4.7", features = ["derive"] }
 vector-vrl-functions = { path = "../functions" }
 vrl.workspace = true
diff --git a/lib/vector-vrl/tests/Cargo.toml b/lib/vector-vrl/tests/Cargo.toml
index 73e6d9e5df72f..067e8cae41fe1 100644
--- a/lib/vector-vrl/tests/Cargo.toml
+++ b/lib/vector-vrl/tests/Cargo.toml
@@ -13,7 +13,7 @@ vector-vrl-functions = { path = "../../vector-vrl/functions" }
 ansi_term = "0.12"
 chrono = "0.4"
 chrono-tz = "0.8"
-clap = { version = "4.4.6", features = ["derive"] }
+clap = { version = "4.4.7", features = ["derive"] }
 glob = "0.3"
 prettydiff = "0.6"
 regex = "1"
diff --git a/vdev/Cargo.toml b/vdev/Cargo.toml
index ce33910260155..f82e632feb1a9 100644
--- a/vdev/Cargo.toml
+++ b/vdev/Cargo.toml
@@ -12,9 +12,9 @@ anyhow = "1.0.75"
 atty = "0.2.14"
 cached = "0.46.0"
 chrono = { version = "0.4.31", default-features = false, features = ["serde", "clock"] }
-clap = { version = "4.4.6", features = ["derive"] }
+clap = { version = "4.4.7", features = ["derive"] }
 clap-verbosity-flag = "2.1.0"
-clap_complete = "4.4.3"
+clap_complete = "4.4.4"
 confy = "0.5.1"
 directories = "5.0.1"
 # remove this when stabilized https://doc.rust-lang.org/stable/std/path/fn.absolute.html

From a1863e65cc22cd83d12c7806ec13baa6f65f8491 Mon Sep 17 00:00:00 2001
From: Doug Smith <dsmith3197@users.noreply.github.com>
Date: Tue, 24 Oct 2023 17:21:51 -0400
Subject: [PATCH 06/28] fix(kafka sink): Make KafkaService return
 `Poll::Pending` when producer queue is full (#18770)

* fix(kafka sink): set concurrency limits equal to kafka producer queue limits

* use send_result to better track state

* nits

* clippy
---
 src/sinks/kafka/service.rs | 95 ++++++++++++++++++++++++++++++--------
 src/sinks/kafka/sink.rs    |  9 +---
 2 files changed, 78 insertions(+), 26 deletions(-)

diff --git a/src/sinks/kafka/service.rs b/src/sinks/kafka/service.rs
index 0f1d122b7750c..607e7cd5fd4ea 100644
--- a/src/sinks/kafka/service.rs
+++ b/src/sinks/kafka/service.rs
@@ -1,11 +1,18 @@
-use std::task::{Context, Poll};
+use std::{
+    sync::{
+        atomic::{AtomicUsize, Ordering},
+        Arc,
+    },
+    task::{Context, Poll},
+    time::Duration,
+};
 
 use bytes::Bytes;
 use rdkafka::{
     error::KafkaError,
     message::OwnedHeaders,
     producer::{FutureProducer, FutureRecord},
-    util::Timeout,
+    types::RDKafkaErrorCode,
 };
 
 use crate::{kafka::KafkaStatisticsContext, sinks::prelude::*};
@@ -59,16 +66,38 @@ impl MetaDescriptive for KafkaRequest {
     }
 }
 
+/// BlockedRecordState manages state for a record blocked from being enqueued on the producer.
+struct BlockedRecordState {
+    records_blocked: Arc<AtomicUsize>,
+}
+
+impl BlockedRecordState {
+    fn new(records_blocked: Arc<AtomicUsize>) -> Self {
+        records_blocked.fetch_add(1, Ordering::Relaxed);
+        Self { records_blocked }
+    }
+}
+
+impl Drop for BlockedRecordState {
+    fn drop(&mut self) {
+        self.records_blocked.fetch_sub(1, Ordering::Relaxed);
+    }
+}
+
 #[derive(Clone)]
 pub struct KafkaService {
     kafka_producer: FutureProducer<KafkaStatisticsContext>,
+
+    /// The number of records blocked from being enqueued on the producer.
+    records_blocked: Arc<AtomicUsize>,
 }
 
 impl KafkaService {
-    pub(crate) const fn new(
-        kafka_producer: FutureProducer<KafkaStatisticsContext>,
-    ) -> KafkaService {
-        KafkaService { kafka_producer }
+    pub(crate) fn new(kafka_producer: FutureProducer<KafkaStatisticsContext>) -> KafkaService {
+        KafkaService {
+            kafka_producer,
+            records_blocked: Arc::new(AtomicUsize::new(0)),
+        }
     }
 }
 
@@ -78,13 +107,21 @@ impl Service<KafkaRequest> for KafkaService {
     type Future = BoxFuture<'static, Result<Self::Response, Self::Error>>;
 
     fn poll_ready(&mut self, _cx: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
-        Poll::Ready(Ok(()))
+        // The Kafka service is at capacity if any records are currently blocked from being enqueued
+        // on the producer.
+        if self.records_blocked.load(Ordering::Relaxed) > 0 {
+            Poll::Pending
+        } else {
+            Poll::Ready(Ok(()))
+        }
     }
 
     fn call(&mut self, request: KafkaRequest) -> Self::Future {
         let this = self.clone();
 
         Box::pin(async move {
+            let raw_byte_size =
+                request.body.len() + request.metadata.key.as_ref().map_or(0, |x| x.len());
             let event_byte_size = request
                 .request_metadata
                 .into_events_estimated_json_encoded_byte_size();
@@ -101,17 +138,39 @@ impl Service<KafkaRequest> for KafkaService {
                 record = record.headers(headers);
             }
 
-            // rdkafka will internally retry forever if the queue is full
-            match this.kafka_producer.send(record, Timeout::Never).await {
-                Ok((_partition, _offset)) => {
-                    let raw_byte_size =
-                        request.body.len() + request.metadata.key.map_or(0, |x| x.len());
-                    Ok(KafkaResponse {
-                        event_byte_size,
-                        raw_byte_size,
-                    })
-                }
-                Err((kafka_err, _original_record)) => Err(kafka_err),
+            // Manually poll [FutureProducer::send_result] instead of [FutureProducer::send] to track
+            // records that fail to be enqueued on the producer.
+            let mut blocked_state: Option<BlockedRecordState> = None;
+            loop {
+                match this.kafka_producer.send_result(record) {
+                    // Record was successfully enqueued on the producer.
+                    Ok(fut) => {
+                        // Drop the blocked state (if any), as the producer is no longer blocked.
+                        drop(blocked_state.take());
+                        return fut
+                            .await
+                            .expect("producer unexpectedly dropped")
+                            .map(|_| KafkaResponse {
+                                event_byte_size,
+                                raw_byte_size,
+                            })
+                            .map_err(|(err, _)| err);
+                    }
+                    // Producer queue is full.
+                    Err((
+                        KafkaError::MessageProduction(RDKafkaErrorCode::QueueFull),
+                        original_record,
+                    )) => {
+                        if blocked_state.is_none() {
+                            blocked_state =
+                                Some(BlockedRecordState::new(Arc::clone(&this.records_blocked)));
+                        }
+                        record = original_record;
+                        tokio::time::sleep(Duration::from_millis(100)).await;
+                    }
+                    // A different error occurred.
+                    Err((err, _)) => return Err(err),
+                };
             }
         })
     }
diff --git a/src/sinks/kafka/sink.rs b/src/sinks/kafka/sink.rs
index 141c32f7cb3b7..db4395db15799 100644
--- a/src/sinks/kafka/sink.rs
+++ b/src/sinks/kafka/sink.rs
@@ -6,7 +6,6 @@ use rdkafka::{
 };
 use snafu::{ResultExt, Snafu};
 use tokio::time::Duration;
-use tower::limit::ConcurrencyLimit;
 use vrl::path::OwnedTargetPath;
 
 use super::config::{KafkaRole, KafkaSinkConfig};
@@ -62,11 +61,6 @@ impl KafkaSink {
     }
 
     async fn run_inner(self: Box<Self>, input: BoxStream<'_, Event>) -> Result<(), ()> {
-        // rdkafka will internally retry forever, so we need some limit to prevent this from overflowing.
-        // 64 should be plenty concurrency here, as a rdkafka send operation does not block until its underlying
-        // buffer is full.
-        let service = ConcurrencyLimit::new(self.service.clone(), 64);
-
         let request_builder = KafkaRequestBuilder {
             key_field: self.key_field,
             headers_key: self.headers_key,
@@ -100,8 +94,7 @@ impl KafkaSink {
                     Ok(req) => Some(req),
                 }
             })
-            .into_driver(service)
-            .protocol("kafka")
+            .into_driver(self.service)
             .protocol("kafka")
             .run()
             .await

From 5c1707f5972ff37d6bcd5782a157afac89efaa3d Mon Sep 17 00:00:00 2001
From: Stephen Wakely <fungus.humungus@gmail.com>
Date: Wed, 25 Oct 2023 10:28:24 +0100
Subject: [PATCH 07/28] chore(prometheus_remote_write sink): remote write sink
 rewrite (#18676)

* Refactor prometheus remote write sink

Signed-off-by: Stephen Wakely <fungus.humungus@gmail.com>

* WIP

Signed-off-by: Stephen Wakely <fungus.humungus@gmail.com>

* Made tests pass

Signed-off-by: Stephen Wakely <fungus.humungus@gmail.com>

* Use shared compression

Signed-off-by: Stephen Wakely <fungus.humungus@gmail.com>

* Clippy

Signed-off-by: Stephen Wakely <fungus.humungus@gmail.com>

* Some comments

Signed-off-by: Stephen Wakely <fungus.humungus@gmail.com>

* Use HttpResponse

Signed-off-by: Stephen Wakely <fungus.humungus@gmail.com>

* Update request builder default

Signed-off-by: Stephen Wakely <fungus.humungus@gmail.com>

* Update PartitionBatcher to use BatchConfig

Signed-off-by: Stephen Wakely <fungus.humungus@gmail.com>

* Update PartitionBatcher to use BatchConfig

Signed-off-by: Stephen Wakely <fungus.humungus@gmail.com>

* Remove zorkwonk

Signed-off-by: Stephen Wakely <fungus.humungus@gmail.com>

* Make into fns as fns instead

Signed-off-by: Stephen Wakely <fungus.humungus@gmail.com>

* Spelling

Signed-off-by: Stephen Wakely <fungus.humungus@gmail.com>

* Don't box the closure

Signed-off-by: Stephen Wakely <fungus.humungus@gmail.com>

* Clippy

Signed-off-by: Stephen Wakely <fungus.humungus@gmail.com>

* Only insert timeout if we add the batch to the list

Signed-off-by: Stephen Wakely <fungus.humungus@gmail.com>

* Allow the timer to remove an item

Signed-off-by: Stephen Wakely <fungus.humungus@gmail.com>

* Allow partitions to be types other than Vec

Signed-off-by: Stephen Wakely <fungus.humungus@gmail.com>

* Clippy

Signed-off-by: Stephen Wakely <fungus.humungus@gmail.com>

* Added test for aggregation

Signed-off-by: Stephen Wakely <fungus.humungus@gmail.com>

* Allow a custom object to be used for the reducer

Signed-off-by: Stephen Wakely <fungus.humungus@gmail.com>

* Make aggregating optional

Signed-off-by: Stephen Wakely <fungus.humungus@gmail.com>

* Adde test for non aggregation

Signed-off-by: Stephen Wakely <fungus.humungus@gmail.com>

* Clippy

Signed-off-by: Stephen Wakely <fungus.humungus@gmail.com>

* Component docs

Signed-off-by: Stephen Wakely <fungus.humungus@gmail.com>

* Feedback from Kyle and Doug

Signed-off-by: Stephen Wakely <fungus.humungus@gmail.com>

* Use generic compression options

Signed-off-by: Stephen Wakely <fungus.humungus@gmail.com>

* Default compression to Snappy

Signed-off-by: Stephen Wakely <fungus.humungus@gmail.com>

* Update docs

Signed-off-by: Stephen Wakely <fungus.humungus@gmail.com>

* Add snappy to the compression docs

Signed-off-by: Stephen Wakely <fungus.humungus@gmail.com>

* Remove proptest file

Signed-off-by: Stephen Wakely <fungus.humungus@gmail.com>

* Snappy is no longer optional

Signed-off-by: Stephen Wakely <fungus.humungus@gmail.com>

---------

Signed-off-by: Stephen Wakely <fungus.humungus@gmail.com>
---
 Cargo.toml                                    |   8 +-
 lib/vector-stream/src/partitioned_batcher.rs  |  55 +-
 src/sinks/prometheus/remote_write.rs          | 790 ------------------
 src/sinks/prometheus/remote_write/config.rs   | 229 +++++
 .../remote_write/integration_tests.rs         | 109 +++
 src/sinks/prometheus/remote_write/mod.rs      |  48 ++
 .../remote_write/request_builder.rs           | 131 +++
 src/sinks/prometheus/remote_write/service.rs  | 139 +++
 src/sinks/prometheus/remote_write/sink.rs     | 233 ++++++
 src/sinks/prometheus/remote_write/tests.rs    | 290 +++++++
 src/sinks/util/buffer/compression.rs          |  34 +-
 src/sinks/util/buffer/metrics/normalize.rs    |  12 +-
 src/sinks/util/buffer/mod.rs                  |   9 +
 src/sinks/util/builder.rs                     |   4 +-
 src/sinks/util/compressor.rs                  |  11 +-
 src/sinks/util/http.rs                        |   4 +-
 src/sinks/util/mod.rs                         |   1 +
 src/sinks/util/snappy.rs                      |  88 ++
 src/sinks/vector/sink.rs                      |   8 +-
 src/sources/prometheus/remote_write.rs        | 214 +++--
 .../components/sinks/base/appsignal.cue       |   5 +
 .../sinks/base/aws_cloudwatch_logs.cue        |   5 +
 .../sinks/base/aws_cloudwatch_metrics.cue     |   5 +
 .../sinks/base/aws_kinesis_firehose.cue       |   5 +
 .../sinks/base/aws_kinesis_streams.cue        |   5 +
 .../components/sinks/base/aws_s3.cue          |   5 +
 .../reference/components/sinks/base/axiom.cue |   5 +
 .../components/sinks/base/azure_blob.cue      |   5 +
 .../components/sinks/base/clickhouse.cue      |   5 +
 .../components/sinks/base/datadog_logs.cue    |   5 +
 .../components/sinks/base/datadog_traces.cue  |   5 +
 .../components/sinks/base/elasticsearch.cue   |   5 +
 .../sinks/base/gcp_cloud_storage.cue          |   5 +
 .../reference/components/sinks/base/http.cue  |   5 +
 .../components/sinks/base/humio_logs.cue      |   5 +
 .../components/sinks/base/humio_metrics.cue   |   5 +
 .../components/sinks/base/new_relic.cue       |   5 +
 .../sinks/base/prometheus_remote_write.cue    |  39 +-
 .../components/sinks/base/splunk_hec_logs.cue |   5 +
 .../sinks/base/splunk_hec_metrics.cue         |   5 +
 .../components/sinks/base/webhdfs.cue         |   5 +
 41 files changed, 1597 insertions(+), 959 deletions(-)
 delete mode 100644 src/sinks/prometheus/remote_write.rs
 create mode 100644 src/sinks/prometheus/remote_write/config.rs
 create mode 100644 src/sinks/prometheus/remote_write/integration_tests.rs
 create mode 100644 src/sinks/prometheus/remote_write/mod.rs
 create mode 100644 src/sinks/prometheus/remote_write/request_builder.rs
 create mode 100644 src/sinks/prometheus/remote_write/service.rs
 create mode 100644 src/sinks/prometheus/remote_write/sink.rs
 create mode 100644 src/sinks/prometheus/remote_write/tests.rs
 create mode 100644 src/sinks/util/snappy.rs

diff --git a/Cargo.toml b/Cargo.toml
index cf794391c783c..3a5b607be302d 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -316,7 +316,7 @@ seahash = { version = "4.1.0", default-features = false }
 semver = { version = "1.0.20", default-features = false, features = ["serde", "std"], optional = true }
 smallvec = { version = "1", default-features = false, features = ["union", "serde"] }
 snafu = { version = "0.7.5", default-features = false, features = ["futures"] }
-snap = { version = "1.1.0", default-features = false, optional = true }
+snap = { version = "1.1.0", default-features = false }
 socket2 = { version = "0.5.5", default-features = false }
 stream-cancel = { version = "0.8.1", default-features = false }
 strip-ansi-escapes = { version = "0.2.0", default-features = false }
@@ -560,9 +560,9 @@ sources-splunk_hec = ["dep:roaring"]
 sources-statsd = ["sources-utils-net", "tokio-util/net"]
 sources-stdin = ["tokio-util/io"]
 sources-syslog = ["codecs-syslog", "sources-utils-net", "tokio-util/net"]
-sources-utils-http = ["dep:snap", "sources-utils-http-auth", "sources-utils-http-encoding", "sources-utils-http-error", "sources-utils-http-prelude"]
+sources-utils-http = ["sources-utils-http-auth", "sources-utils-http-encoding", "sources-utils-http-error", "sources-utils-http-prelude"]
 sources-utils-http-auth = ["sources-utils-http-error"]
-sources-utils-http-encoding = ["dep:snap", "sources-utils-http-error"]
+sources-utils-http-encoding = ["sources-utils-http-error"]
 sources-utils-http-error = []
 sources-utils-http-prelude = ["sources-utils-http", "sources-utils-http-auth", "sources-utils-http-encoding", "sources-utils-http-error"]
 sources-utils-http-query = []
@@ -715,7 +715,7 @@ sinks-nats = ["dep:async-nats", "dep:nkeys"]
 sinks-new_relic_logs = ["sinks-http"]
 sinks-new_relic = []
 sinks-papertrail = ["dep:syslog"]
-sinks-prometheus = ["dep:base64", "dep:prometheus-parser", "dep:snap"]
+sinks-prometheus = ["dep:base64", "dep:prometheus-parser"]
 sinks-pulsar = ["dep:apache-avro", "dep:pulsar", "dep:lru"]
 sinks-redis = ["dep:redis"]
 sinks-sematext = ["sinks-elasticsearch", "sinks-influxdb"]
diff --git a/lib/vector-stream/src/partitioned_batcher.rs b/lib/vector-stream/src/partitioned_batcher.rs
index 0d73cc5267098..b865216c1f764 100644
--- a/lib/vector-stream/src/partitioned_batcher.rs
+++ b/lib/vector-stream/src/partitioned_batcher.rs
@@ -15,7 +15,7 @@ use vector_core::{partition::Partitioner, time::KeyedTimer, ByteSizeOf};
 
 use crate::batcher::{
     config::BatchConfigParts,
-    data::BatchReduce,
+    data::BatchData,
     limiter::{ByteSizeOfItemSize, ItemBatchSize, SizeLimit},
     BatchConfig,
 };
@@ -155,16 +155,15 @@ impl BatcherSettings {
     }
 
     /// A batcher config using the `ItemBatchSize` trait to determine batch sizes.
-    /// The output is built with the supplied reducer function.
-    pub fn into_reducer_config<I, T, F, S>(
-        self,
+    /// The output is built with the supplied object implementing [`BatchData`].
+    pub fn as_reducer_config<I, T, B>(
+        &self,
         item_size: I,
-        reducer: F,
-    ) -> BatchConfigParts<SizeLimit<I>, BatchReduce<F, S>>
+        reducer: B,
+    ) -> BatchConfigParts<SizeLimit<I>, B>
     where
         I: ItemBatchSize<T>,
-        F: FnMut(&mut S, T),
-        S: Default,
+        B: BatchData<T>,
     {
         BatchConfigParts {
             batch_limiter: SizeLimit {
@@ -173,14 +172,14 @@ impl BatcherSettings {
                 current_size: 0,
                 item_size_calculator: item_size,
             },
-            batch_data: BatchReduce::new(reducer),
+            batch_data: reducer,
             timeout: self.timeout,
         }
     }
 }
 
 #[pin_project]
-pub struct PartitionedBatcher<St, Prt, KT, C, F>
+pub struct PartitionedBatcher<St, Prt, KT, C, F, B>
 where
     Prt: Partitioner,
 {
@@ -193,7 +192,7 @@ where
     /// The store of 'closed' batches. When this is not empty it will be
     /// preferentially flushed prior to consuming any new items from the
     /// underlying stream.
-    closed_batches: Vec<(Prt::Key, Vec<Prt::Item>)>,
+    closed_batches: Vec<(Prt::Key, B)>,
     /// The queue of pending batch expirations
     timer: KT,
     /// The partitioner for this `Batcher`
@@ -203,7 +202,7 @@ where
     stream: Fuse<St>,
 }
 
-impl<St, Prt, C, F> PartitionedBatcher<St, Prt, ExpirationQueue<Prt::Key>, C, F>
+impl<St, Prt, C, F, B> PartitionedBatcher<St, Prt, ExpirationQueue<Prt::Key>, C, F, B>
 where
     St: Stream<Item = Prt::Item>,
     Prt: Partitioner + Unpin,
@@ -226,7 +225,7 @@ where
 }
 
 #[cfg(test)]
-impl<St, Prt, KT, C, F> PartitionedBatcher<St, Prt, KT, C, F>
+impl<St, Prt, KT, C, F, B> PartitionedBatcher<St, Prt, KT, C, F, B>
 where
     St: Stream<Item = Prt::Item>,
     Prt: Partitioner + Unpin,
@@ -247,17 +246,17 @@ where
     }
 }
 
-impl<St, Prt, KT, C, F> Stream for PartitionedBatcher<St, Prt, KT, C, F>
+impl<St, Prt, KT, C, F, B> Stream for PartitionedBatcher<St, Prt, KT, C, F, B>
 where
     St: Stream<Item = Prt::Item>,
     Prt: Partitioner + Unpin,
     Prt::Key: Eq + Hash + Clone,
     Prt::Item: ByteSizeOf,
     KT: KeyedTimer<Prt::Key>,
-    C: BatchConfig<Prt::Item, Batch = Vec<Prt::Item>>,
+    C: BatchConfig<Prt::Item, Batch = B>,
     F: Fn() -> C + Send,
 {
-    type Item = (Prt::Key, Vec<Prt::Item>);
+    type Item = (Prt::Key, B);
 
     fn size_hint(&self) -> (usize, Option<usize>) {
         self.stream.size_hint()
@@ -270,20 +269,18 @@ where
                 return Poll::Ready(this.closed_batches.pop());
             }
             match this.stream.as_mut().poll_next(cx) {
-                Poll::Pending => {
-                    match this.timer.poll_expired(cx) {
-                        // Unlike normal streams, `DelayQueue` can return `None`
-                        // here but still be usable later if more entries are added.
-                        Poll::Pending | Poll::Ready(None) => return Poll::Pending,
-                        Poll::Ready(Some(item_key)) => {
-                            let mut batch = this
-                                .batches
-                                .remove(&item_key)
-                                .expect("batch should exist if it is set to expire");
-                            this.closed_batches.push((item_key, batch.take_batch()));
-                        }
+                Poll::Pending => match this.timer.poll_expired(cx) {
+                    // Unlike normal streams, `DelayQueue` can return `None`
+                    // here but still be usable later if more entries are added.
+                    Poll::Pending | Poll::Ready(None) => return Poll::Pending,
+                    Poll::Ready(Some(item_key)) => {
+                        let mut batch = this
+                            .batches
+                            .remove(&item_key)
+                            .expect("batch should exist if it is set to expire");
+                        this.closed_batches.push((item_key, batch.take_batch()));
                     }
-                }
+                },
                 Poll::Ready(None) => {
                     // Now that the underlying stream is closed, we need to
                     // clear out our batches, including all expiration
diff --git a/src/sinks/prometheus/remote_write.rs b/src/sinks/prometheus/remote_write.rs
deleted file mode 100644
index 043254630b63e..0000000000000
--- a/src/sinks/prometheus/remote_write.rs
+++ /dev/null
@@ -1,790 +0,0 @@
-use std::io::Read;
-use std::sync::Arc;
-use std::task;
-
-#[cfg(feature = "aws-core")]
-use aws_credential_types::provider::SharedCredentialsProvider;
-#[cfg(feature = "aws-core")]
-use aws_types::region::Region;
-use bytes::{Bytes, BytesMut};
-use futures::{future::BoxFuture, stream, FutureExt, SinkExt};
-use http::{Request, Uri};
-use prost::Message;
-use snafu::{ResultExt, Snafu};
-use tower::Service;
-use vector_config::configurable_component;
-use vector_core::{ByteSizeOf, EstimatedJsonEncodedSizeOf};
-
-use super::collector::{self, MetricCollector as _};
-use crate::{
-    config::{self, AcknowledgementsConfig, Input, SinkConfig},
-    event::{Event, Metric},
-    http::HttpClient,
-    internal_events::{EndpointBytesSent, TemplateRenderingError},
-    sinks::{
-        self,
-        prometheus::PrometheusRemoteWriteAuth,
-        util::{
-            auth::Auth,
-            batch::BatchConfig,
-            buffer::metrics::{MetricNormalize, MetricNormalizer, MetricSet, MetricsBuffer},
-            http::HttpRetryLogic,
-            uri, EncodedEvent, PartitionBuffer, PartitionInnerBuffer, SinkBatchSettings,
-            TowerRequestConfig,
-        },
-    },
-    template::Template,
-    tls::{TlsConfig, TlsSettings},
-};
-
-#[derive(Clone, Copy, Debug, Default)]
-pub struct PrometheusRemoteWriteDefaultBatchSettings;
-
-impl SinkBatchSettings for PrometheusRemoteWriteDefaultBatchSettings {
-    const MAX_EVENTS: Option<usize> = Some(1_000);
-    const MAX_BYTES: Option<usize> = None;
-    const TIMEOUT_SECS: f64 = 1.0;
-}
-
-#[derive(Debug, Snafu)]
-enum Errors {
-    #[snafu(display(r#"Prometheus remote_write sink cannot accept "set" metrics"#))]
-    SetMetricInvalid,
-    #[cfg(feature = "aws-core")]
-    #[snafu(display("aws.region required when AWS authentication is in use"))]
-    AwsRegionRequired,
-}
-
-/// Configuration for the `prometheus_remote_write` sink.
-#[configurable_component(sink(
-    "prometheus_remote_write",
-    "Deliver metric data to a Prometheus remote write endpoint."
-))]
-#[derive(Clone, Debug, Default)]
-#[serde(deny_unknown_fields)]
-pub struct RemoteWriteConfig {
-    /// The endpoint to send data to.
-    ///
-    /// The endpoint should include the scheme and the path to write to.
-    #[configurable(metadata(docs::examples = "https://localhost:8087/api/v1/write"))]
-    pub endpoint: String,
-
-    /// The default namespace for any metrics sent.
-    ///
-    /// This namespace is only used if a metric has no existing namespace. When a namespace is
-    /// present, it is used as a prefix to the metric name, and separated with an underscore (`_`).
-    ///
-    /// It should follow the Prometheus [naming conventions][prom_naming_docs].
-    ///
-    /// [prom_naming_docs]: https://prometheus.io/docs/practices/naming/#metric-names
-    #[configurable(metadata(docs::examples = "service"))]
-    #[configurable(metadata(docs::advanced))]
-    pub default_namespace: Option<String>,
-
-    /// 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
-    #[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
-    #[serde(default = "super::default_summary_quantiles")]
-    #[configurable(metadata(docs::advanced))]
-    pub quantiles: Vec<f64>,
-
-    #[configurable(derived)]
-    #[serde(default)]
-    pub batch: BatchConfig<PrometheusRemoteWriteDefaultBatchSettings>,
-
-    #[configurable(derived)]
-    #[serde(default)]
-    pub request: TowerRequestConfig,
-
-    /// The tenant ID to send.
-    ///
-    /// If set, a header named `X-Scope-OrgID` is added to outgoing requests with the value of this setting.
-    ///
-    /// This may be used by Cortex or other remote services to identify the tenant making the request.
-    #[serde(default)]
-    #[configurable(metadata(docs::examples = "my-domain"))]
-    #[configurable(metadata(docs::advanced))]
-    pub tenant_id: Option<Template>,
-
-    #[configurable(derived)]
-    pub tls: Option<TlsConfig>,
-
-    #[configurable(derived)]
-    pub auth: Option<PrometheusRemoteWriteAuth>,
-
-    #[cfg(feature = "aws-core")]
-    #[configurable(derived)]
-    #[configurable(metadata(docs::advanced))]
-    pub aws: Option<crate::aws::RegionOrEndpoint>,
-
-    #[configurable(derived)]
-    #[serde(
-        default,
-        deserialize_with = "crate::serde::bool_or_struct",
-        skip_serializing_if = "crate::serde::skip_serializing_if_default"
-    )]
-    pub acknowledgements: AcknowledgementsConfig,
-
-    #[configurable(derived)]
-    #[configurable(metadata(docs::advanced))]
-    #[serde(default)]
-    pub compression: Compression,
-}
-
-impl_generate_config_from_default!(RemoteWriteConfig);
-
-/// Supported compression types for Prometheus Remote Write.
-#[configurable_component]
-#[derive(Clone, Copy, Debug, Derivative)]
-#[derivative(Default)]
-#[serde(rename_all = "lowercase")]
-pub enum Compression {
-    /// Snappy.
-    #[derivative(Default)]
-    Snappy,
-
-    /// Gzip.
-    Gzip,
-
-    /// Zstandard.
-    Zstd,
-}
-
-const fn convert_compression_to_content_encoding(compression: Compression) -> &'static str {
-    match compression {
-        Compression::Snappy => "snappy",
-        Compression::Gzip => "gzip",
-        Compression::Zstd => "zstd",
-    }
-}
-
-#[async_trait::async_trait]
-#[typetag::serde(name = "prometheus_remote_write")]
-impl SinkConfig for RemoteWriteConfig {
-    async fn build(
-        &self,
-        cx: config::SinkContext,
-    ) -> crate::Result<(sinks::VectorSink, sinks::Healthcheck)> {
-        let endpoint = self.endpoint.parse::<Uri>().context(sinks::UriParseSnafu)?;
-        let tls_settings = TlsSettings::from_options(&self.tls)?;
-        let batch = self.batch.into_batch_settings()?;
-        let request_settings = self.request.unwrap_with(&TowerRequestConfig::default());
-        let buckets = self.buckets.clone();
-        let quantiles = self.quantiles.clone();
-
-        let client = HttpClient::new(tls_settings, cx.proxy())?;
-        let tenant_id = self.tenant_id.clone();
-
-        let auth = match &self.auth {
-            Some(PrometheusRemoteWriteAuth::Basic { user, password }) => {
-                Some(Auth::Basic(crate::http::Auth::Basic {
-                    user: user.clone(),
-                    password: password.clone().into(),
-                }))
-            }
-            Some(PrometheusRemoteWriteAuth::Bearer { token }) => {
-                Some(Auth::Basic(crate::http::Auth::Bearer {
-                    token: token.clone(),
-                }))
-            }
-            #[cfg(feature = "aws-core")]
-            Some(PrometheusRemoteWriteAuth::Aws(aws_auth)) => {
-                let region = self
-                    .aws
-                    .as_ref()
-                    .map(|config| config.region())
-                    .ok_or(Errors::AwsRegionRequired)?
-                    .ok_or(Errors::AwsRegionRequired)?;
-                Some(Auth::Aws {
-                    credentials_provider: aws_auth.credentials_provider(region.clone()).await?,
-                    region,
-                })
-            }
-            None => None,
-        };
-
-        let http_request_builder = Arc::new(HttpRequestBuilder {
-            endpoint: endpoint.clone(),
-            auth,
-            compression: self.compression,
-        });
-
-        let healthcheck = healthcheck(client.clone(), Arc::clone(&http_request_builder)).boxed();
-        let service = RemoteWriteService {
-            default_namespace: self.default_namespace.clone(),
-            client,
-            buckets,
-            quantiles,
-            http_request_builder,
-            compression: self.compression,
-        };
-
-        let sink = {
-            let buffer = PartitionBuffer::new(MetricsBuffer::new(batch.size));
-            let mut normalizer = MetricNormalizer::<PrometheusMetricNormalize>::default();
-
-            request_settings
-                .partition_sink(HttpRetryLogic, service, buffer, batch.timeout)
-                .with_flat_map(move |event: Event| {
-                    let byte_size = event.size_of();
-                    let json_size = event.estimated_json_encoded_size_of();
-
-                    stream::iter(normalizer.normalize(event.into_metric()).map(|event| {
-                        let tenant_id = tenant_id.as_ref().and_then(|template| {
-                            template
-                                .render_string(&event)
-                                .map_err(|error| {
-                                    emit!(TemplateRenderingError {
-                                        error,
-                                        field: Some("tenant_id"),
-                                        drop_event: true,
-                                    })
-                                })
-                                .ok()
-                        });
-                        let key = PartitionKey { tenant_id };
-                        Ok(EncodedEvent::new(
-                            PartitionInnerBuffer::new(event, key),
-                            byte_size,
-                            json_size,
-                        ))
-                    }))
-                })
-                .sink_map_err(
-                    |error| error!(message = "Prometheus remote_write sink error.", %error),
-                )
-        };
-
-        #[allow(deprecated)]
-        Ok((sinks::VectorSink::from_event_sink(sink), healthcheck))
-    }
-
-    fn input(&self) -> Input {
-        Input::metric()
-    }
-
-    fn acknowledgements(&self) -> &AcknowledgementsConfig {
-        &self.acknowledgements
-    }
-}
-
-#[derive(Clone, Eq, Hash, PartialEq)]
-struct PartitionKey {
-    tenant_id: Option<String>,
-}
-
-async fn healthcheck(
-    client: HttpClient,
-    http_request_builder: Arc<HttpRequestBuilder>,
-) -> crate::Result<()> {
-    let body = bytes::Bytes::new();
-    let request = http_request_builder
-        .build_request(http::Method::GET, body.into(), None)
-        .await?;
-    let response = client.send(request).await?;
-
-    match response.status() {
-        http::StatusCode::OK => Ok(()),
-        other => Err(sinks::HealthcheckError::UnexpectedStatus { status: other }.into()),
-    }
-}
-
-#[derive(Default)]
-pub struct PrometheusMetricNormalize;
-
-impl MetricNormalize for PrometheusMetricNormalize {
-    fn normalize(&mut self, state: &mut MetricSet, metric: Metric) -> Option<Metric> {
-        state.make_absolute(metric)
-    }
-}
-
-#[derive(Clone)]
-struct RemoteWriteService {
-    default_namespace: Option<String>,
-    client: HttpClient,
-    buckets: Vec<f64>,
-    quantiles: Vec<f64>,
-    http_request_builder: Arc<HttpRequestBuilder>,
-    compression: Compression,
-}
-
-impl RemoteWriteService {
-    fn encode_events(&self, metrics: Vec<Metric>) -> Bytes {
-        let mut time_series = collector::TimeSeries::new();
-        for metric in metrics {
-            time_series.encode_metric(
-                self.default_namespace.as_deref(),
-                &self.buckets,
-                &self.quantiles,
-                &metric,
-            );
-        }
-        let request = time_series.finish();
-
-        let mut out = BytesMut::with_capacity(request.encoded_len());
-        request.encode(&mut out).expect("Out of memory");
-        out.freeze()
-    }
-}
-
-impl Service<PartitionInnerBuffer<Vec<Metric>, PartitionKey>> for RemoteWriteService {
-    type Response = http::Response<Bytes>;
-    type Error = crate::Error;
-    type Future = BoxFuture<'static, Result<Self::Response, Self::Error>>;
-
-    // Emission of an internal event in case of errors is handled upstream by the caller.
-    fn poll_ready(&mut self, _task: &mut task::Context<'_>) -> task::Poll<Result<(), Self::Error>> {
-        task::Poll::Ready(Ok(()))
-    }
-
-    // Emission of internal events for errors and dropped events is handled upstream by the caller.
-    fn call(&mut self, buffer: PartitionInnerBuffer<Vec<Metric>, PartitionKey>) -> Self::Future {
-        let (events, key) = buffer.into_parts();
-        let body = self.encode_events(events);
-        let body = compress_block(self.compression, body);
-
-        let client = self.client.clone();
-        let request_builder = Arc::clone(&self.http_request_builder);
-
-        Box::pin(async move {
-            let request = request_builder
-                .build_request(http::Method::POST, body, key.tenant_id)
-                .await?;
-
-            let (protocol, endpoint) = uri::protocol_endpoint(request.uri().clone());
-
-            let response = client.send(request).await?;
-            let (parts, body) = response.into_parts();
-            let body = hyper::body::to_bytes(body).await?;
-
-            emit!(EndpointBytesSent {
-                byte_size: body.len(),
-                protocol: &protocol,
-                endpoint: &endpoint
-            });
-
-            Ok(hyper::Response::from_parts(parts, body))
-        })
-    }
-}
-
-pub struct HttpRequestBuilder {
-    pub endpoint: Uri,
-    pub auth: Option<Auth>,
-    pub compression: Compression,
-}
-
-impl HttpRequestBuilder {
-    pub async fn build_request(
-        &self,
-        method: http::Method,
-        body: Vec<u8>,
-        tenant_id: Option<String>,
-    ) -> Result<Request<hyper::Body>, crate::Error> {
-        let content_encoding = convert_compression_to_content_encoding(self.compression);
-
-        let mut builder = http::Request::builder()
-            .method(method)
-            .uri(self.endpoint.clone())
-            .header("X-Prometheus-Remote-Write-Version", "0.1.0")
-            .header("Content-Encoding", content_encoding)
-            .header("Content-Type", "application/x-protobuf");
-
-        if let Some(tenant_id) = &tenant_id {
-            builder = builder.header("X-Scope-OrgID", tenant_id);
-        }
-
-        let mut request: Request<Bytes> = builder.body(body.into()).unwrap();
-        if let Some(auth) = &self.auth {
-            match auth {
-                Auth::Basic(http_auth) => http_auth.apply(&mut request),
-                #[cfg(feature = "aws-core")]
-                Auth::Aws {
-                    credentials_provider: provider,
-                    region,
-                } => sign_request(&mut request, provider, &Some(region.clone())).await?,
-            }
-        }
-
-        let (parts, body) = request.into_parts();
-        let request: Request<hyper::Body> = hyper::Request::from_parts(parts, body.into());
-
-        Ok(request)
-    }
-}
-
-fn compress_block(compression: Compression, data: Bytes) -> Vec<u8> {
-    match compression {
-        Compression::Snappy => snap::raw::Encoder::new()
-            .compress_vec(&data)
-            .expect("snap compression failed, please report"),
-        Compression::Gzip => {
-            let mut buf = Vec::new();
-            flate2::read::GzEncoder::new(data.as_ref(), flate2::Compression::default())
-                .read_to_end(&mut buf)
-                .expect("gzip compression failed, please report");
-            buf
-        }
-        Compression::Zstd => {
-            zstd::encode_all(data.as_ref(), 0).expect("zstd compression failed, please report")
-        }
-    }
-}
-
-#[cfg(feature = "aws-core")]
-async fn sign_request(
-    request: &mut http::Request<Bytes>,
-    credentials_provider: &SharedCredentialsProvider,
-    region: &Option<Region>,
-) -> crate::Result<()> {
-    crate::aws::sign_request("aps", request, credentials_provider, region).await
-}
-
-#[cfg(test)]
-mod tests {
-    use futures::StreamExt;
-    use http::HeaderMap;
-    use indoc::indoc;
-    use prometheus_parser::proto;
-    use vector_core::metric_tags;
-
-    use super::*;
-    use crate::{
-        config::SinkContext,
-        event::{MetricKind, MetricValue},
-        sinks::util::test::build_test_server,
-        test_util::{
-            self,
-            components::{assert_sink_compliance, HTTP_SINK_TAGS},
-        },
-    };
-
-    #[test]
-    fn generate_config() {
-        crate::test_util::test_generate_config::<RemoteWriteConfig>();
-    }
-
-    macro_rules! labels {
-        ( $( $name:expr => $value:expr ),* ) => {
-            vec![ $( proto::Label {
-                name: $name.to_string(),
-                value: $value.to_string()
-            }, )* ]
-        }
-    }
-
-    #[tokio::test]
-    async fn sends_request() {
-        let outputs = send_request("", vec![create_event("gauge-2".into(), 32.0)]).await;
-        assert_eq!(outputs.len(), 1);
-        let (headers, req) = &outputs[0];
-
-        assert!(!headers.contains_key("x-scope-orgid"));
-
-        assert_eq!(req.timeseries.len(), 1);
-        assert_eq!(
-            req.timeseries[0].labels,
-            labels!("__name__" => "gauge-2", "production" => "true", "region" => "us-west-1")
-        );
-        assert_eq!(req.timeseries[0].samples.len(), 1);
-        assert_eq!(req.timeseries[0].samples[0].value, 32.0);
-        assert_eq!(req.metadata.len(), 1);
-        assert_eq!(req.metadata[0].r#type, proto::MetricType::Gauge as i32);
-        assert_eq!(req.metadata[0].metric_family_name, "gauge-2");
-    }
-
-    #[tokio::test]
-    async fn sends_authenticated_request() {
-        let outputs = send_request(
-            indoc! {r#"
-                tenant_id = "tenant-%Y"
-                [auth]
-                strategy = "basic"
-                user = "user"
-                password = "password"
-            "#},
-            vec![create_event("gauge-2".into(), 32.0)],
-        )
-        .await;
-
-        assert_eq!(outputs.len(), 1);
-        let (_headers, req) = &outputs[0];
-
-        assert_eq!(req.timeseries.len(), 1);
-        assert_eq!(
-            req.timeseries[0].labels,
-            labels!("__name__" => "gauge-2", "production" => "true", "region" => "us-west-1")
-        );
-        assert_eq!(req.timeseries[0].samples.len(), 1);
-        assert_eq!(req.timeseries[0].samples[0].value, 32.0);
-        assert_eq!(req.metadata.len(), 1);
-        assert_eq!(req.metadata[0].r#type, proto::MetricType::Gauge as i32);
-        assert_eq!(req.metadata[0].metric_family_name, "gauge-2");
-    }
-
-    #[tokio::test]
-    async fn sends_authenticated_aws_request() {
-        let outputs = send_request(
-            indoc! {r#"
-                tenant_id = "tenant-%Y"
-                [aws]
-                region = "foo"
-                [auth]
-                strategy = "aws"
-                access_key_id = "foo"
-                secret_access_key = "bar"
-            "#},
-            vec![create_event("gauge-2".into(), 32.0)],
-        )
-        .await;
-
-        assert_eq!(outputs.len(), 1);
-        let (headers, _req) = &outputs[0];
-
-        let auth = headers["authorization"]
-            .to_str()
-            .expect("Missing AWS authorization header");
-        assert!(auth.starts_with("AWS4-HMAC-SHA256"));
-    }
-
-    #[tokio::test]
-    async fn sends_x_scope_orgid_header() {
-        let outputs = send_request(
-            r#"tenant_id = "tenant""#,
-            vec![create_event("gauge-3".into(), 12.0)],
-        )
-        .await;
-
-        assert_eq!(outputs.len(), 1);
-        let (headers, _) = &outputs[0];
-        assert_eq!(headers["x-scope-orgid"], "tenant");
-    }
-
-    #[tokio::test]
-    async fn sends_templated_x_scope_orgid_header() {
-        let outputs = send_request(
-            r#"tenant_id = "tenant-%Y""#,
-            vec![create_event("gauge-3".into(), 12.0)],
-        )
-        .await;
-
-        assert_eq!(outputs.len(), 1);
-        let (headers, _) = &outputs[0];
-        let orgid = headers["x-scope-orgid"]
-            .to_str()
-            .expect("Missing x-scope-orgid header");
-        assert!(orgid.starts_with("tenant-20"));
-        assert_eq!(orgid.len(), 11);
-    }
-
-    #[tokio::test]
-    async fn retains_state_between_requests() {
-        // This sink converts all incremental events to absolute, and
-        // should accumulate their totals between batches.
-        let outputs = send_request(
-            r#"batch.max_events = 1"#,
-            vec![
-                create_inc_event("counter-1".into(), 12.0),
-                create_inc_event("counter-2".into(), 13.0),
-                create_inc_event("counter-1".into(), 14.0),
-            ],
-        )
-        .await;
-
-        assert_eq!(outputs.len(), 3);
-
-        let check_output = |index: usize, name: &str, value: f64| {
-            let (_, req) = &outputs[index];
-            assert_eq!(req.timeseries.len(), 1);
-            assert_eq!(req.timeseries[0].labels, labels!("__name__" => name));
-            assert_eq!(req.timeseries[0].samples.len(), 1);
-            assert_eq!(req.timeseries[0].samples[0].value, value);
-        };
-        check_output(0, "counter-1", 12.0);
-        check_output(1, "counter-2", 13.0);
-        check_output(2, "counter-1", 26.0);
-    }
-
-    async fn send_request(
-        config: &str,
-        events: Vec<Event>,
-    ) -> Vec<(HeaderMap, proto::WriteRequest)> {
-        assert_sink_compliance(&HTTP_SINK_TAGS, async {
-            let addr = test_util::next_addr();
-            let (rx, trigger, server) = build_test_server(addr);
-            tokio::spawn(server);
-
-            let config = format!("endpoint = \"http://{}/write\"\n{}", addr, config);
-            let config: RemoteWriteConfig = toml::from_str(&config).unwrap();
-            let cx = SinkContext::default();
-
-            let (sink, _) = config.build(cx).await.unwrap();
-            sink.run_events(events).await.unwrap();
-
-            drop(trigger);
-
-            rx.map(|(parts, body)| {
-                assert_eq!(parts.method, "POST");
-                assert_eq!(parts.uri.path(), "/write");
-                let headers = parts.headers;
-                assert_eq!(headers["x-prometheus-remote-write-version"], "0.1.0");
-                assert_eq!(headers["content-encoding"], "snappy");
-                assert_eq!(headers["content-type"], "application/x-protobuf");
-
-                if config.auth.is_some() {
-                    assert!(headers.contains_key("authorization"));
-                }
-
-                let decoded = snap::raw::Decoder::new()
-                    .decompress_vec(&body)
-                    .expect("Invalid snappy compressed data");
-                let request =
-                    proto::WriteRequest::decode(Bytes::from(decoded)).expect("Invalid protobuf");
-                (headers, request)
-            })
-            .collect::<Vec<_>>()
-            .await
-        })
-        .await
-    }
-
-    pub(super) fn create_event(name: String, value: f64) -> Event {
-        Metric::new(name, MetricKind::Absolute, MetricValue::Gauge { value })
-            .with_tags(Some(metric_tags!(
-                "region" => "us-west-1",
-                "production" => "true",
-            )))
-            .with_timestamp(Some(chrono::Utc::now()))
-            .into()
-    }
-
-    fn create_inc_event(name: String, value: f64) -> Event {
-        Metric::new(
-            name,
-            MetricKind::Incremental,
-            MetricValue::Counter { value },
-        )
-        .with_timestamp(Some(chrono::Utc::now()))
-        .into()
-    }
-}
-
-#[cfg(all(test, feature = "prometheus-integration-tests"))]
-mod integration_tests {
-    use std::{collections::HashMap, ops::Range};
-
-    use serde_json::Value;
-
-    use super::{tests::*, *};
-    use crate::{
-        config::{SinkConfig, SinkContext},
-        event::{metric::MetricValue, Event},
-        sinks::influxdb::test_util::{cleanup_v1, format_timestamp, onboarding_v1, query_v1},
-        test_util::components::{assert_sink_compliance, HTTP_SINK_TAGS},
-        tls::{self, TlsConfig},
-    };
-
-    const HTTP_URL: &str = "http://influxdb-v1:8086";
-    const HTTPS_URL: &str = "https://influxdb-v1-tls:8087";
-
-    #[tokio::test]
-    async fn insert_metrics_over_http() {
-        insert_metrics(HTTP_URL).await;
-    }
-
-    #[tokio::test]
-    async fn insert_metrics_over_https() {
-        insert_metrics(HTTPS_URL).await;
-    }
-
-    async fn insert_metrics(url: &str) {
-        assert_sink_compliance(&HTTP_SINK_TAGS, async {
-            let database = onboarding_v1(url).await;
-
-            let cx = SinkContext::default();
-
-            let config = RemoteWriteConfig {
-                endpoint: format!("{}/api/v1/prom/write?db={}", url, database),
-                tls: Some(TlsConfig {
-                    ca_file: Some(tls::TEST_PEM_CA_PATH.into()),
-                    ..Default::default()
-                }),
-                ..Default::default()
-            };
-            let events = create_events(0..5, |n| n * 11.0);
-
-            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 values = &result["results"][0]["series"][0]["values"];
-            assert_eq!(values.as_array().unwrap().len(), 5);
-
-            for event in events {
-                let metric = event.into_metric();
-                let result = query(
-                    url,
-                    &format!(r#"SELECT * FROM "{}".."{}""#, database, metric.name()),
-                )
-                .await;
-
-                let metrics = decode_metrics(&result["results"][0]["series"][0]);
-                assert_eq!(metrics.len(), 1);
-                let output = &metrics[0];
-
-                match metric.value() {
-                    MetricValue::Gauge { value } => {
-                        assert_eq!(output["value"], Value::Number((*value as u32).into()))
-                    }
-                    _ => panic!("Unhandled metric value, fix the test"),
-                }
-                for (tag, value) in metric.tags().unwrap().iter_single() {
-                    assert_eq!(output[tag], Value::String(value.to_string()));
-                }
-                let timestamp =
-                    format_timestamp(metric.timestamp().unwrap(), chrono::SecondsFormat::Millis);
-                assert_eq!(output["time"], Value::String(timestamp));
-            }
-
-            cleanup_v1(url, &database).await;
-        })
-        .await
-    }
-
-    async fn query(url: &str, query: &str) -> Value {
-        let result = query_v1(url, query).await;
-        let text = result.text().await.unwrap();
-        serde_json::from_str(&text).expect("error when parsing InfluxDB response JSON")
-    }
-
-    fn decode_metrics(data: &Value) -> Vec<HashMap<String, Value>> {
-        let data = data.as_object().expect("Data is not an object");
-        let columns = data["columns"].as_array().expect("Columns is not an array");
-        data["values"]
-            .as_array()
-            .expect("Values is not an array")
-            .iter()
-            .map(|values| {
-                columns
-                    .iter()
-                    .zip(values.as_array().unwrap().iter())
-                    .map(|(column, value)| (column.as_str().unwrap().to_owned(), value.clone()))
-                    .collect()
-            })
-            .collect()
-    }
-
-    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)))
-            .collect()
-    }
-}
diff --git a/src/sinks/prometheus/remote_write/config.rs b/src/sinks/prometheus/remote_write/config.rs
new file mode 100644
index 0000000000000..8f9f065642bdf
--- /dev/null
+++ b/src/sinks/prometheus/remote_write/config.rs
@@ -0,0 +1,229 @@
+use http::Uri;
+use snafu::prelude::*;
+
+use crate::{
+    http::HttpClient,
+    sinks::{
+        prelude::*,
+        prometheus::PrometheusRemoteWriteAuth,
+        util::{auth::Auth, http::http_response_retry_logic},
+        UriParseSnafu,
+    },
+};
+
+use super::{
+    service::{build_request, RemoteWriteService},
+    sink::{PrometheusRemoteWriteDefaultBatchSettings, RemoteWriteSink},
+};
+
+#[cfg(feature = "aws-core")]
+use super::Errors;
+
+/// The batch config for remote write.
+#[configurable_component]
+#[derive(Clone, Copy, Debug, Derivative)]
+#[derivative(Default)]
+pub struct RemoteWriteBatchConfig {
+    #[configurable(derived)]
+    #[serde(flatten)]
+    pub batch_settings: BatchConfig<PrometheusRemoteWriteDefaultBatchSettings>,
+
+    /// Whether or not to aggregate metrics within a batch.
+    #[serde(default = "crate::serde::default_true")]
+    #[derivative(Default(value = "true"))]
+    pub aggregate: bool,
+}
+
+/// Configuration for the `prometheus_remote_write` sink.
+#[configurable_component(sink(
+    "prometheus_remote_write",
+    "Deliver metric data to a Prometheus remote write endpoint."
+))]
+#[derive(Clone, Debug, Derivative)]
+#[derivative(Default)]
+#[serde(deny_unknown_fields)]
+pub struct RemoteWriteConfig {
+    /// The endpoint to send data to.
+    ///
+    /// The endpoint should include the scheme and the path to write to.
+    #[configurable(metadata(docs::examples = "https://localhost:8087/api/v1/write"))]
+    pub endpoint: String,
+
+    /// The default namespace for any metrics sent.
+    ///
+    /// This namespace is only used if a metric has no existing namespace. When a namespace is
+    /// present, it is used as a prefix to the metric name, and separated with an underscore (`_`).
+    ///
+    /// It should follow the Prometheus [naming conventions][prom_naming_docs].
+    ///
+    /// [prom_naming_docs]: https://prometheus.io/docs/practices/naming/#metric-names
+    #[configurable(metadata(docs::examples = "service"))]
+    #[configurable(metadata(docs::advanced))]
+    pub default_namespace: Option<String>,
+
+    /// 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
+    #[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
+    #[serde(default = "crate::sinks::prometheus::default_summary_quantiles")]
+    #[configurable(metadata(docs::advanced))]
+    pub quantiles: Vec<f64>,
+
+    #[configurable(derived)]
+    #[serde(default)]
+    pub batch: RemoteWriteBatchConfig,
+
+    #[configurable(derived)]
+    #[serde(default)]
+    pub request: TowerRequestConfig,
+
+    /// The tenant ID to send.
+    ///
+    /// If set, a header named `X-Scope-OrgID` is added to outgoing requests with the value of this setting.
+    ///
+    /// This may be used by Cortex or other remote services to identify the tenant making the request.
+    #[serde(default)]
+    #[configurable(metadata(docs::examples = "my-domain"))]
+    #[configurable(metadata(docs::advanced))]
+    pub tenant_id: Option<Template>,
+
+    #[configurable(derived)]
+    pub tls: Option<TlsConfig>,
+
+    #[configurable(derived)]
+    pub auth: Option<PrometheusRemoteWriteAuth>,
+
+    #[cfg(feature = "aws-config")]
+    #[configurable(derived)]
+    #[configurable(metadata(docs::advanced))]
+    pub aws: Option<crate::aws::RegionOrEndpoint>,
+
+    #[configurable(derived)]
+    #[serde(
+        default,
+        deserialize_with = "crate::serde::bool_or_struct",
+        skip_serializing_if = "crate::serde::skip_serializing_if_default"
+    )]
+    pub acknowledgements: AcknowledgementsConfig,
+
+    #[configurable(derived)]
+    #[configurable(metadata(docs::advanced))]
+    #[serde(default = "default_compression")]
+    #[derivative(Default(value = "default_compression()"))]
+    pub compression: Compression,
+}
+
+const fn default_compression() -> Compression {
+    Compression::Snappy
+}
+
+impl_generate_config_from_default!(RemoteWriteConfig);
+
+#[async_trait::async_trait]
+#[typetag::serde(name = "prometheus_remote_write")]
+impl SinkConfig for RemoteWriteConfig {
+    fn acknowledgements(&self) -> &AcknowledgementsConfig {
+        &self.acknowledgements
+    }
+
+    async fn build(&self, cx: SinkContext) -> crate::Result<(VectorSink, Healthcheck)> {
+        let endpoint = self.endpoint.parse::<Uri>().context(UriParseSnafu)?;
+        let tls_settings = TlsSettings::from_options(&self.tls)?;
+        let request_settings = self.request.unwrap_with(&TowerRequestConfig::default());
+        let buckets = self.buckets.clone();
+        let quantiles = self.quantiles.clone();
+        let default_namespace = self.default_namespace.clone();
+
+        let client = HttpClient::new(tls_settings, cx.proxy())?;
+
+        let auth = match &self.auth {
+            Some(PrometheusRemoteWriteAuth::Basic { user, password }) => {
+                Some(Auth::Basic(crate::http::Auth::Basic {
+                    user: user.clone(),
+                    password: password.clone().into(),
+                }))
+            }
+            Some(PrometheusRemoteWriteAuth::Bearer { token }) => {
+                Some(Auth::Basic(crate::http::Auth::Bearer {
+                    token: token.clone(),
+                }))
+            }
+            #[cfg(feature = "aws-core")]
+            Some(PrometheusRemoteWriteAuth::Aws(aws_auth)) => {
+                let region = self
+                    .aws
+                    .as_ref()
+                    .map(|config| config.region())
+                    .ok_or(Errors::AwsRegionRequired)?
+                    .ok_or(Errors::AwsRegionRequired)?;
+                Some(Auth::Aws {
+                    credentials_provider: aws_auth.credentials_provider(region.clone()).await?,
+                    region,
+                })
+            }
+            None => None,
+        };
+
+        let healthcheck = healthcheck(
+            client.clone(),
+            endpoint.clone(),
+            self.compression,
+            auth.clone(),
+        )
+        .boxed();
+
+        let service = RemoteWriteService {
+            endpoint,
+            client,
+            auth,
+            compression: self.compression,
+        };
+        let service = ServiceBuilder::new()
+            .settings(request_settings, http_response_retry_logic())
+            .service(service);
+
+        let sink = RemoteWriteSink {
+            tenant_id: self.tenant_id.clone(),
+            compression: self.compression,
+            aggregate: self.batch.aggregate,
+            batch_settings: self
+                .batch
+                .batch_settings
+                .validate()?
+                .into_batcher_settings()?,
+            buckets,
+            quantiles,
+            default_namespace,
+            service,
+        };
+
+        Ok((VectorSink::from_event_streamsink(sink), healthcheck))
+    }
+
+    fn input(&self) -> Input {
+        Input::metric()
+    }
+}
+
+async fn healthcheck(
+    client: HttpClient,
+    endpoint: Uri,
+    compression: Compression,
+    auth: Option<Auth>,
+) -> crate::Result<()> {
+    let body = bytes::Bytes::new();
+    let request =
+        build_request(http::Method::GET, &endpoint, compression, body, None, auth).await?;
+    let response = client.send(request).await?;
+
+    match response.status() {
+        http::StatusCode::OK => Ok(()),
+        other => Err(HealthcheckError::UnexpectedStatus { status: other }.into()),
+    }
+}
diff --git a/src/sinks/prometheus/remote_write/integration_tests.rs b/src/sinks/prometheus/remote_write/integration_tests.rs
new file mode 100644
index 0000000000000..07f106053fdad
--- /dev/null
+++ b/src/sinks/prometheus/remote_write/integration_tests.rs
@@ -0,0 +1,109 @@
+use std::{collections::HashMap, ops::Range};
+
+use serde_json::Value;
+
+use super::{tests::*, *};
+use crate::{
+    config::{SinkConfig, SinkContext},
+    event::{metric::MetricValue, Event},
+    sinks::influxdb::test_util::{cleanup_v1, format_timestamp, onboarding_v1, query_v1},
+    test_util::components::{assert_sink_compliance, HTTP_SINK_TAGS},
+    tls::{self, TlsConfig},
+};
+
+const HTTP_URL: &str = "http://influxdb-v1:8086";
+const HTTPS_URL: &str = "https://influxdb-v1-tls:8087";
+
+#[tokio::test]
+async fn insert_metrics_over_http() {
+    insert_metrics(HTTP_URL).await;
+}
+
+#[tokio::test]
+async fn insert_metrics_over_https() {
+    insert_metrics(HTTPS_URL).await;
+}
+
+async fn insert_metrics(url: &str) {
+    assert_sink_compliance(&HTTP_SINK_TAGS, async {
+        let database = onboarding_v1(url).await;
+
+        let cx = SinkContext::default();
+
+        let config = RemoteWriteConfig {
+            endpoint: format!("{}/api/v1/prom/write?db={}", url, database),
+            tls: Some(TlsConfig {
+                ca_file: Some(tls::TEST_PEM_CA_PATH.into()),
+                ..Default::default()
+            }),
+            ..Default::default()
+        };
+        let events = create_events(0..5, |n| n * 11.0);
+
+        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 values = &result["results"][0]["series"][0]["values"];
+        assert_eq!(values.as_array().unwrap().len(), 5);
+
+        for event in events {
+            let metric = event.into_metric();
+            let result = query(
+                url,
+                &format!(r#"SELECT * FROM "{}".."{}""#, database, metric.name()),
+            )
+            .await;
+
+            let metrics = decode_metrics(&result["results"][0]["series"][0]);
+            assert_eq!(metrics.len(), 1);
+            let output = &metrics[0];
+
+            match metric.value() {
+                MetricValue::Gauge { value } => {
+                    assert_eq!(output["value"], Value::Number((*value as u32).into()))
+                }
+                _ => panic!("Unhandled metric value, fix the test"),
+            }
+            for (tag, value) in metric.tags().unwrap().iter_single() {
+                assert_eq!(output[tag], Value::String(value.to_string()));
+            }
+            let timestamp =
+                format_timestamp(metric.timestamp().unwrap(), chrono::SecondsFormat::Millis);
+            assert_eq!(output["time"], Value::String(timestamp));
+        }
+
+        cleanup_v1(url, &database).await;
+    })
+    .await
+}
+
+async fn query(url: &str, query: &str) -> Value {
+    let result = query_v1(url, query).await;
+    let text = result.text().await.unwrap();
+    serde_json::from_str(&text).expect("error when parsing InfluxDB response JSON")
+}
+
+fn decode_metrics(data: &Value) -> Vec<HashMap<String, Value>> {
+    let data = data.as_object().expect("Data is not an object");
+    let columns = data["columns"].as_array().expect("Columns is not an array");
+    data["values"]
+        .as_array()
+        .expect("Values is not an array")
+        .iter()
+        .map(|values| {
+            columns
+                .iter()
+                .zip(values.as_array().unwrap().iter())
+                .map(|(column, value)| (column.as_str().unwrap().to_owned(), value.clone()))
+                .collect()
+        })
+        .collect()
+}
+
+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)))
+        .collect()
+}
diff --git a/src/sinks/prometheus/remote_write/mod.rs b/src/sinks/prometheus/remote_write/mod.rs
new file mode 100644
index 0000000000000..3442c88de812f
--- /dev/null
+++ b/src/sinks/prometheus/remote_write/mod.rs
@@ -0,0 +1,48 @@
+//! The Prometheus Remote Write [`vector_core::sink::VectorSink`].
+//! Contains the [`vector_core::sink::VectorSink`] instance that is responsible
+//! for taking a stream of [`vector_core::event::Event`] and forwarding
+//! them to a server via the [Prometheus Remote Write protocol][remote_write].
+//!
+//! [remote_write]: https://prometheus.io/docs/concepts/remote_write_spec/
+
+use snafu::prelude::*;
+use vector_core::event::Metric;
+
+use crate::sinks::{
+    prelude::*,
+    util::buffer::metrics::{MetricNormalize, MetricSet},
+};
+
+mod config;
+mod request_builder;
+mod service;
+mod sink;
+
+#[cfg(test)]
+mod tests;
+
+#[cfg(all(test, feature = "prometheus-integration-tests"))]
+mod integration_tests;
+
+pub use config::RemoteWriteConfig;
+
+#[derive(Debug, Snafu)]
+enum Errors {
+    #[cfg(feature = "aws-core")]
+    #[snafu(display("aws.region required when AWS authentication is in use"))]
+    AwsRegionRequired,
+}
+
+#[derive(Clone, Eq, Hash, PartialEq)]
+struct PartitionKey {
+    tenant_id: Option<String>,
+}
+
+#[derive(Default)]
+pub struct PrometheusMetricNormalize;
+
+impl MetricNormalize for PrometheusMetricNormalize {
+    fn normalize(&mut self, state: &mut MetricSet, metric: Metric) -> Option<Metric> {
+        state.make_absolute(metric)
+    }
+}
diff --git a/src/sinks/prometheus/remote_write/request_builder.rs b/src/sinks/prometheus/remote_write/request_builder.rs
new file mode 100644
index 0000000000000..a2e156c42cfb8
--- /dev/null
+++ b/src/sinks/prometheus/remote_write/request_builder.rs
@@ -0,0 +1,131 @@
+use std::io;
+
+use bytes::{Bytes, BytesMut};
+use prost::Message;
+use vector_core::{config::telemetry, event::Metric};
+
+use crate::sinks::{
+    prelude::*,
+    prometheus::{collector, collector::MetricCollector as _},
+};
+
+use super::{sink::EventCollection, PartitionKey};
+
+pub(crate) struct RemoteWriteEncoder {
+    pub(super) default_namespace: Option<String>,
+    pub(super) buckets: Vec<f64>,
+    pub(super) quantiles: Vec<f64>,
+}
+
+impl encoding::Encoder<Vec<Metric>> for RemoteWriteEncoder {
+    fn encode_input(
+        &self,
+        input: Vec<Metric>,
+        writer: &mut dyn io::Write,
+    ) -> io::Result<(usize, GroupedCountByteSize)> {
+        let mut byte_size = telemetry().create_request_count_byte_size();
+
+        let mut time_series = collector::TimeSeries::new();
+        let len = input.len();
+        for metric in input {
+            byte_size.add_event(&metric, metric.estimated_json_encoded_size_of());
+
+            time_series.encode_metric(
+                self.default_namespace.as_deref(),
+                &self.buckets,
+                &self.quantiles,
+                &metric,
+            );
+        }
+        let request = time_series.finish();
+
+        let mut out = BytesMut::with_capacity(request.encoded_len());
+        request.encode(&mut out).expect("Out of memory");
+        let body = out.freeze();
+
+        write_all(writer, len, body.as_ref())?;
+
+        Ok((body.len(), byte_size))
+    }
+}
+
+#[derive(Clone)]
+pub(super) struct RemoteWriteRequest {
+    pub(super) request: Bytes,
+    pub(super) tenant_id: Option<String>,
+    finalizers: EventFinalizers,
+    metadata: RequestMetadata,
+}
+
+impl Finalizable for RemoteWriteRequest {
+    fn take_finalizers(&mut self) -> EventFinalizers {
+        std::mem::take(&mut self.finalizers)
+    }
+}
+
+impl MetaDescriptive for RemoteWriteRequest {
+    fn get_metadata(&self) -> &RequestMetadata {
+        &self.metadata
+    }
+
+    fn metadata_mut(&mut self) -> &mut RequestMetadata {
+        &mut self.metadata
+    }
+}
+
+pub(super) struct RemoteWriteMetadata {
+    finalizers: EventFinalizers,
+    tenant_id: Option<String>,
+}
+
+pub(super) struct RemoteWriteRequestBuilder {
+    pub(super) compression: Compression,
+    pub(super) encoder: RemoteWriteEncoder,
+}
+
+impl RequestBuilder<(PartitionKey, EventCollection)> for RemoteWriteRequestBuilder {
+    type Metadata = RemoteWriteMetadata;
+    type Events = Vec<Metric>;
+    type Encoder = RemoteWriteEncoder;
+    type Payload = Bytes;
+    type Request = RemoteWriteRequest;
+    type Error = io::Error;
+
+    fn compression(&self) -> Compression {
+        self.compression
+    }
+
+    fn encoder(&self) -> &Self::Encoder {
+        &self.encoder
+    }
+
+    fn split_input(
+        &self,
+        input: (PartitionKey, EventCollection),
+    ) -> (Self::Metadata, RequestMetadataBuilder, Self::Events) {
+        let (key, events) = input;
+        let finalizers = events.finalizers;
+        let metrics = events.events.into_metrics();
+        let builder = RequestMetadataBuilder::from_events(&metrics);
+        let metadata = RemoteWriteMetadata {
+            finalizers,
+            tenant_id: key.tenant_id,
+        };
+
+        (metadata, builder, metrics)
+    }
+
+    fn build_request(
+        &self,
+        metadata: Self::Metadata,
+        request_metadata: RequestMetadata,
+        payload: EncodeResult<Self::Payload>,
+    ) -> Self::Request {
+        RemoteWriteRequest {
+            request: payload.into_payload(),
+            finalizers: metadata.finalizers,
+            tenant_id: metadata.tenant_id,
+            metadata: request_metadata,
+        }
+    }
+}
diff --git a/src/sinks/prometheus/remote_write/service.rs b/src/sinks/prometheus/remote_write/service.rs
new file mode 100644
index 0000000000000..fb459d7c4bd8e
--- /dev/null
+++ b/src/sinks/prometheus/remote_write/service.rs
@@ -0,0 +1,139 @@
+use std::task::{Context, Poll};
+
+#[cfg(feature = "aws-core")]
+use aws_credential_types::provider::SharedCredentialsProvider;
+#[cfg(feature = "aws-core")]
+use aws_types::region::Region;
+
+use bytes::Bytes;
+use http::Uri;
+
+use super::request_builder::RemoteWriteRequest;
+use crate::{
+    http::HttpClient,
+    internal_events::EndpointBytesSent,
+    sinks::{
+        prelude::*,
+        util::{auth::Auth, http::HttpResponse},
+    },
+};
+
+/// Constants for header strings.
+mod headers {
+    pub(super) const X_PROMETHEUS_REMOTE_WRITE_VERSION: &str = "X-Prometheus-Remote-Write-Version";
+    pub(super) const CONTENT_ENCODING: &str = "Content-Encoding";
+    pub(super) const CONTENT_TYPE: &str = "Content-Type";
+    pub(super) const X_SCOPE_ORGID: &str = "X-Scope-OrgID";
+
+    pub(super) const VERSION: &str = "0.1.0";
+    pub(super) const APPLICATION_X_PROTOBUF: &str = "application/x-protobuf";
+}
+
+#[derive(Clone)]
+pub(super) struct RemoteWriteService {
+    pub(super) endpoint: Uri,
+    pub(super) auth: Option<Auth>,
+    pub(super) client: HttpClient,
+    pub(super) compression: super::Compression,
+}
+
+impl Service<RemoteWriteRequest> for RemoteWriteService {
+    type Response = HttpResponse;
+    type Error = crate::Error;
+    type Future = BoxFuture<'static, Result<Self::Response, Self::Error>>;
+
+    fn poll_ready(&mut self, _task: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
+        Poll::Ready(Ok(()))
+    }
+
+    // Emission of internal events for errors and dropped events is handled upstream by the caller.
+    fn call(&mut self, mut request: RemoteWriteRequest) -> Self::Future {
+        let client = self.client.clone();
+        let endpoint = self.endpoint.clone();
+        let auth = self.auth.clone();
+        let compression = self.compression;
+
+        Box::pin(async move {
+            let metadata = std::mem::take(request.metadata_mut());
+            let json_size = metadata.into_events_estimated_json_encoded_byte_size();
+            let raw_byte_size = request.request.len();
+
+            let http_request = build_request(
+                http::Method::POST,
+                &endpoint,
+                compression,
+                request.request,
+                request.tenant_id.as_ref(),
+                auth,
+            )
+            .await?;
+
+            let response = client.send(http_request).await?;
+            let (parts, body) = response.into_parts();
+            let body = hyper::body::to_bytes(body).await?;
+            let http_response = hyper::Response::from_parts(parts, body);
+
+            if http_response.status().is_success() {
+                // We can't rely on the framework to emit this because we need to specify the additional `endpoint` tag.
+                emit!(EndpointBytesSent {
+                    byte_size: raw_byte_size,
+                    protocol: "http",
+                    endpoint: &endpoint.to_string(),
+                });
+            }
+
+            Ok(HttpResponse {
+                events_byte_size: json_size,
+                http_response,
+                raw_byte_size,
+            })
+        })
+    }
+}
+
+#[cfg(feature = "aws-core")]
+async fn sign_request(
+    request: &mut http::Request<Bytes>,
+    credentials_provider: &SharedCredentialsProvider,
+    region: &Option<Region>,
+) -> crate::Result<()> {
+    crate::aws::sign_request("aps", request, credentials_provider, region).await
+}
+
+pub(super) async fn build_request(
+    method: http::Method,
+    endpoint: &Uri,
+    compression: Compression,
+    body: Bytes,
+    tenant_id: Option<&String>,
+    auth: Option<Auth>,
+) -> crate::Result<http::Request<hyper::Body>> {
+    let mut builder = http::Request::builder()
+        .method(method)
+        .uri(endpoint)
+        .header(headers::X_PROMETHEUS_REMOTE_WRITE_VERSION, headers::VERSION)
+        .header(headers::CONTENT_TYPE, headers::APPLICATION_X_PROTOBUF);
+
+    if let Some(content_encoding) = compression.content_encoding() {
+        builder = builder.header(headers::CONTENT_ENCODING, content_encoding);
+    }
+
+    if let Some(tenant_id) = tenant_id {
+        builder = builder.header(headers::X_SCOPE_ORGID, tenant_id);
+    }
+
+    let mut request = builder.body(body)?;
+
+    if let Some(auth) = auth {
+        match auth {
+            Auth::Basic(http_auth) => http_auth.apply(&mut request),
+            #[cfg(feature = "aws-core")]
+            Auth::Aws {
+                credentials_provider: provider,
+                region,
+            } => sign_request(&mut request, &provider, &Some(region.clone())).await?,
+        }
+    }
+
+    Ok(request.map(hyper::Body::from))
+}
diff --git a/src/sinks/prometheus/remote_write/sink.rs b/src/sinks/prometheus/remote_write/sink.rs
new file mode 100644
index 0000000000000..1551f846ea92b
--- /dev/null
+++ b/src/sinks/prometheus/remote_write/sink.rs
@@ -0,0 +1,233 @@
+use std::fmt;
+
+use vector_common::byte_size_of::ByteSizeOf;
+use vector_core::event::Metric;
+use vector_stream::batcher::{data::BatchData, limiter::ByteSizeOfItemSize};
+
+use crate::sinks::{prelude::*, util::buffer::metrics::MetricSet};
+
+use super::{
+    request_builder::{RemoteWriteEncoder, RemoteWriteRequest, RemoteWriteRequestBuilder},
+    PartitionKey, PrometheusMetricNormalize,
+};
+
+pub(super) struct RemoteWriteMetric {
+    pub(super) metric: Metric,
+    tenant_id: Option<String>,
+}
+
+impl Finalizable for RemoteWriteMetric {
+    fn take_finalizers(&mut self) -> EventFinalizers {
+        self.metric.take_finalizers()
+    }
+}
+
+impl GetEventCountTags for RemoteWriteMetric {
+    fn get_tags(&self) -> TaggedEventsSent {
+        self.metric.get_tags()
+    }
+}
+
+impl EstimatedJsonEncodedSizeOf for RemoteWriteMetric {
+    fn estimated_json_encoded_size_of(&self) -> JsonSize {
+        self.metric.estimated_json_encoded_size_of()
+    }
+}
+
+impl ByteSizeOf for RemoteWriteMetric {
+    fn allocated_bytes(&self) -> usize {
+        self.metric.allocated_bytes()
+    }
+}
+
+#[derive(Clone, Copy, Debug, Default)]
+pub struct PrometheusRemoteWriteDefaultBatchSettings;
+
+impl SinkBatchSettings for PrometheusRemoteWriteDefaultBatchSettings {
+    const MAX_EVENTS: Option<usize> = Some(1_000);
+    const MAX_BYTES: Option<usize> = None;
+    const TIMEOUT_SECS: f64 = 1.0;
+}
+
+pub(super) struct PrometheusTenantIdPartitioner;
+
+impl Partitioner for PrometheusTenantIdPartitioner {
+    type Item = RemoteWriteMetric;
+    type Key = PartitionKey;
+
+    fn partition(&self, item: &Self::Item) -> Self::Key {
+        PartitionKey {
+            tenant_id: item.tenant_id.clone(),
+        }
+    }
+}
+
+pub(super) enum BatchedMetrics {
+    Aggregated(MetricSet),
+    Unaggregated(Vec<Metric>),
+}
+
+impl BatchedMetrics {
+    pub(super) fn into_metrics(self) -> Vec<Metric> {
+        match self {
+            BatchedMetrics::Aggregated(metrics) => metrics.into_metrics(),
+            BatchedMetrics::Unaggregated(metrics) => metrics,
+        }
+    }
+
+    pub(super) fn insert_update(&mut self, metric: Metric) {
+        match self {
+            BatchedMetrics::Aggregated(metrics) => metrics.insert_update(metric),
+            BatchedMetrics::Unaggregated(metrics) => metrics.push(metric),
+        }
+    }
+
+    pub(super) fn len(&self) -> usize {
+        match self {
+            BatchedMetrics::Aggregated(metrics) => metrics.len(),
+            BatchedMetrics::Unaggregated(metrics) => metrics.len(),
+        }
+    }
+}
+
+pub(super) struct EventCollection {
+    pub(super) finalizers: EventFinalizers,
+    pub(super) events: BatchedMetrics,
+    pub(super) events_byte_size: usize,
+    pub(super) events_json_byte_size: GroupedCountByteSize,
+}
+
+impl EventCollection {
+    /// Creates a new event collection that will either aggregate the incremental metrics
+    /// or store all the metrics, depending on the value of the `aggregate` parameter.
+    fn new(aggregate: bool) -> Self {
+        Self {
+            finalizers: Default::default(),
+            events: if aggregate {
+                BatchedMetrics::Aggregated(Default::default())
+            } else {
+                BatchedMetrics::Unaggregated(Default::default())
+            },
+            events_byte_size: Default::default(),
+            events_json_byte_size: telemetry().create_request_count_byte_size(),
+        }
+    }
+
+    const fn is_aggregated(&self) -> bool {
+        matches!(self.events, BatchedMetrics::Aggregated(_))
+    }
+}
+
+impl BatchData<RemoteWriteMetric> for EventCollection {
+    type Batch = Self;
+
+    fn len(&self) -> usize {
+        self.events.len()
+    }
+
+    fn take_batch(&mut self) -> Self::Batch {
+        let mut new = Self::new(self.is_aggregated());
+        std::mem::swap(self, &mut new);
+        new
+    }
+
+    fn push_item(&mut self, mut item: RemoteWriteMetric) {
+        self.finalizers
+            .merge(item.metric.metadata_mut().take_finalizers());
+        self.events_byte_size += item.size_of();
+        self.events_json_byte_size
+            .add_event(&item.metric, item.estimated_json_encoded_size_of());
+        self.events.insert_update(item.metric);
+    }
+}
+
+pub(super) struct RemoteWriteSink<S> {
+    pub(super) tenant_id: Option<Template>,
+    pub(super) batch_settings: BatcherSettings,
+    pub(super) aggregate: bool,
+    pub(super) compression: super::Compression,
+    pub(super) default_namespace: Option<String>,
+    pub(super) buckets: Vec<f64>,
+    pub(super) quantiles: Vec<f64>,
+    pub(super) service: S,
+}
+
+impl<S> RemoteWriteSink<S>
+where
+    S: Service<RemoteWriteRequest> + Send + 'static,
+    S::Future: Send + 'static,
+    S::Response: DriverResponse + Send + 'static,
+    S::Error: fmt::Debug + Into<crate::Error> + Send,
+{
+    async fn run_inner(self: Box<Self>, input: BoxStream<'_, Event>) -> Result<(), ()> {
+        let request_builder = RemoteWriteRequestBuilder {
+            compression: self.compression,
+            encoder: RemoteWriteEncoder {
+                default_namespace: self.default_namespace.clone(),
+                buckets: self.buckets.clone(),
+                quantiles: self.quantiles.clone(),
+            },
+        };
+
+        let batch_settings = self.batch_settings;
+        let tenant_id = self.tenant_id.clone();
+        let service = self.service;
+
+        input
+            .filter_map(|event| future::ready(event.try_into_metric()))
+            .normalized_with_default::<PrometheusMetricNormalize>()
+            .filter_map(move |event| {
+                future::ready(make_remote_write_event(tenant_id.as_ref(), event))
+            })
+            .batched_partitioned(PrometheusTenantIdPartitioner, || {
+                batch_settings
+                    .as_reducer_config(ByteSizeOfItemSize, EventCollection::new(self.aggregate))
+            })
+            .request_builder(default_request_builder_concurrency_limit(), request_builder)
+            .filter_map(|request| async move {
+                match request {
+                    Err(e) => {
+                        error!("Failed to build Remote Write request: {:?}.", e);
+                        None
+                    }
+                    Ok(req) => Some(req),
+                }
+            })
+            .into_driver(service)
+            .run()
+            .await
+    }
+}
+
+#[async_trait]
+impl<S> StreamSink<Event> for RemoteWriteSink<S>
+where
+    S: Service<RemoteWriteRequest> + Send + 'static,
+    S::Future: Send + 'static,
+    S::Response: DriverResponse + Send + 'static,
+    S::Error: fmt::Debug + Into<crate::Error> + Send,
+{
+    async fn run(self: Box<Self>, input: BoxStream<'_, Event>) -> Result<(), ()> {
+        self.run_inner(input).await
+    }
+}
+
+fn make_remote_write_event(
+    tenant_id: Option<&Template>,
+    metric: Metric,
+) -> Option<RemoteWriteMetric> {
+    let tenant_id = tenant_id.and_then(|template| {
+        template
+            .render_string(&metric)
+            .map_err(|error| {
+                emit!(TemplateRenderingError {
+                    error,
+                    field: Some("tenant_id"),
+                    drop_event: true,
+                })
+            })
+            .ok()
+    });
+
+    Some(RemoteWriteMetric { metric, tenant_id })
+}
diff --git a/src/sinks/prometheus/remote_write/tests.rs b/src/sinks/prometheus/remote_write/tests.rs
new file mode 100644
index 0000000000000..190d3723bce6d
--- /dev/null
+++ b/src/sinks/prometheus/remote_write/tests.rs
@@ -0,0 +1,290 @@
+use bytes::Bytes;
+use futures::StreamExt;
+use http::HeaderMap;
+use indoc::indoc;
+use prometheus_parser::proto;
+use prost::Message;
+use vector_core::metric_tags;
+
+use super::*;
+use crate::{
+    config::SinkContext,
+    event::{MetricKind, MetricValue},
+    sinks::{prometheus::remote_write::RemoteWriteConfig, util::test::build_test_server},
+    test_util::{
+        self,
+        components::{assert_sink_compliance, HTTP_SINK_TAGS},
+    },
+};
+
+#[test]
+fn generate_config() {
+    crate::test_util::test_generate_config::<RemoteWriteConfig>();
+}
+
+macro_rules! labels {
+        ( $( $name:expr => $value:expr ),* ) => {
+            vec![ $( proto::Label {
+                name: $name.to_string(),
+                value: $value.to_string()
+            }, )* ]
+        }
+    }
+
+#[tokio::test]
+async fn sends_request() {
+    let outputs = send_request("", vec![create_event("gauge-2".into(), 32.0)]).await;
+    assert_eq!(outputs.len(), 1);
+    let (headers, req) = &outputs[0];
+
+    assert!(!headers.contains_key("x-scope-orgid"));
+
+    assert_eq!(req.timeseries.len(), 1);
+    assert_eq!(
+        req.timeseries[0].labels,
+        labels!("__name__" => "gauge-2", "production" => "true", "region" => "us-west-1")
+    );
+    assert_eq!(req.timeseries[0].samples.len(), 1);
+    assert_eq!(req.timeseries[0].samples[0].value, 32.0);
+    assert_eq!(req.metadata.len(), 1);
+    assert_eq!(req.metadata[0].r#type, proto::MetricType::Gauge as i32);
+    assert_eq!(req.metadata[0].metric_family_name, "gauge-2");
+}
+
+#[tokio::test]
+async fn sends_authenticated_request() {
+    let outputs = send_request(
+        indoc! {r#"
+                tenant_id = "tenant-%Y"
+                [auth]
+                strategy = "basic"
+                user = "user"
+                password = "password"
+            "#},
+        vec![create_event("gauge-2".into(), 32.0)],
+    )
+    .await;
+
+    assert_eq!(outputs.len(), 1);
+    let (_headers, req) = &outputs[0];
+
+    assert_eq!(req.timeseries.len(), 1);
+    assert_eq!(
+        req.timeseries[0].labels,
+        labels!("__name__" => "gauge-2", "production" => "true", "region" => "us-west-1")
+    );
+    assert_eq!(req.timeseries[0].samples.len(), 1);
+    assert_eq!(req.timeseries[0].samples[0].value, 32.0);
+    assert_eq!(req.metadata.len(), 1);
+    assert_eq!(req.metadata[0].r#type, proto::MetricType::Gauge as i32);
+    assert_eq!(req.metadata[0].metric_family_name, "gauge-2");
+}
+
+#[cfg(feature = "aws-config")]
+#[tokio::test]
+async fn sends_authenticated_aws_request() {
+    let outputs = send_request(
+        indoc! {r#"
+                tenant_id = "tenant-%Y"
+                [aws]
+                region = "foo"
+                [auth]
+                strategy = "aws"
+                access_key_id = "foo"
+                secret_access_key = "bar"
+            "#},
+        vec![create_event("gauge-2".into(), 32.0)],
+    )
+    .await;
+
+    assert_eq!(outputs.len(), 1);
+    let (headers, _req) = &outputs[0];
+
+    let auth = headers["authorization"]
+        .to_str()
+        .expect("Missing AWS authorization header");
+    assert!(auth.starts_with("AWS4-HMAC-SHA256"));
+}
+
+#[tokio::test]
+async fn sends_x_scope_orgid_header() {
+    let outputs = send_request(
+        r#"tenant_id = "tenant""#,
+        vec![create_event("gauge-3".into(), 12.0)],
+    )
+    .await;
+
+    assert_eq!(outputs.len(), 1);
+    let (headers, _) = &outputs[0];
+    assert_eq!(headers["x-scope-orgid"], "tenant");
+}
+
+#[tokio::test]
+async fn sends_templated_x_scope_orgid_header() {
+    let outputs = send_request(
+        r#"tenant_id = "tenant-%Y""#,
+        vec![create_event("gauge-3".into(), 12.0)],
+    )
+    .await;
+
+    assert_eq!(outputs.len(), 1);
+    let (headers, _) = &outputs[0];
+    let orgid = headers["x-scope-orgid"]
+        .to_str()
+        .expect("Missing x-scope-orgid header");
+    assert!(orgid.starts_with("tenant-20"));
+    assert_eq!(orgid.len(), 11);
+}
+
+#[tokio::test]
+async fn retains_state_between_requests() {
+    // This sink converts all incremental events to absolute, and
+    // should accumulate their totals between batches.
+    let outputs = send_request(
+        r#"batch.max_events = 1"#,
+        vec![
+            create_inc_event("counter-1".into(), 12.0),
+            create_inc_event("counter-2".into(), 13.0),
+            create_inc_event("counter-1".into(), 14.0),
+        ],
+    )
+    .await;
+
+    assert_eq!(outputs.len(), 3);
+
+    let check_output = |index: usize, name: &str, value: f64| {
+        let (_, req) = &outputs[index];
+        assert_eq!(req.timeseries.len(), 1);
+        assert_eq!(req.timeseries[0].labels, labels!("__name__" => name));
+        assert_eq!(req.timeseries[0].samples.len(), 1);
+        assert_eq!(req.timeseries[0].samples[0].value, value);
+    };
+    check_output(0, "counter-1", 12.0);
+    check_output(1, "counter-2", 13.0);
+    check_output(2, "counter-1", 26.0);
+}
+
+#[tokio::test]
+async fn aggregates_batches() {
+    let outputs = send_request(
+        r#"batch.max_events = 3"#,
+        vec![
+            create_inc_event("counter-1".into(), 12.0),
+            create_inc_event("counter-1".into(), 14.0),
+            create_inc_event("counter-2".into(), 13.0),
+            create_inc_event("counter-2".into(), 14.0),
+        ],
+    )
+    .await;
+
+    assert_eq!(outputs.len(), 1);
+
+    let (_, req) = &outputs[0];
+    assert_eq!(req.timeseries.len(), 2);
+    assert_eq!(req.timeseries[0].labels, labels!("__name__" => "counter-1"));
+    assert_eq!(req.timeseries[0].samples.len(), 1);
+    assert_eq!(req.timeseries[0].samples[0].value, 26.0);
+
+    assert_eq!(req.timeseries[1].labels, labels!("__name__" => "counter-2"));
+    assert_eq!(req.timeseries[1].samples.len(), 1);
+    assert_eq!(req.timeseries[1].samples[0].value, 27.0);
+}
+
+#[tokio::test]
+async fn doesnt_aggregate_batches() {
+    let outputs = send_request(
+        indoc! {
+            r#"
+            batch.max_events = 3
+            batch.aggregate = false
+            "#
+        },
+        vec![
+            create_inc_event("counter-1".into(), 12.0),
+            create_inc_event("counter-1".into(), 14.0),
+            create_inc_event("counter-2".into(), 13.0),
+            create_inc_event("counter-2".into(), 14.0),
+        ],
+    )
+    .await;
+
+    assert_eq!(outputs.len(), 2);
+
+    // The first three metrics are in the first batch.
+    let (_, req) = &outputs[0];
+    assert_eq!(req.timeseries.len(), 2);
+    assert_eq!(req.timeseries[0].labels, labels!("__name__" => "counter-1"));
+    assert_eq!(req.timeseries[0].samples.len(), 2);
+    assert_eq!(req.timeseries[0].samples[0].value, 12.0);
+    assert_eq!(req.timeseries[0].samples[1].value, 26.0);
+
+    assert_eq!(req.timeseries[1].labels, labels!("__name__" => "counter-2"));
+    assert_eq!(req.timeseries[1].samples.len(), 1);
+    assert_eq!(req.timeseries[1].samples[0].value, 13.0);
+
+    // The last metric is in the last batch.
+    let (_, req) = &outputs[1];
+    assert_eq!(req.timeseries[0].labels, labels!("__name__" => "counter-2"));
+    assert_eq!(req.timeseries[0].samples.len(), 1);
+    assert_eq!(req.timeseries[0].samples[0].value, 27.0);
+}
+
+async fn send_request(config: &str, events: Vec<Event>) -> Vec<(HeaderMap, proto::WriteRequest)> {
+    assert_sink_compliance(&HTTP_SINK_TAGS, async {
+        let addr = test_util::next_addr();
+        let (rx, trigger, server) = build_test_server(addr);
+        tokio::spawn(server);
+
+        let config = format!("endpoint = \"http://{}/write\"\n{}", addr, config);
+        let config: RemoteWriteConfig = toml::from_str(&config).unwrap();
+        let cx = SinkContext::default();
+
+        let (sink, _) = config.build(cx).await.unwrap();
+        sink.run_events(events).await.unwrap();
+
+        drop(trigger);
+
+        rx.map(|(parts, body)| {
+            assert_eq!(parts.method, "POST");
+            assert_eq!(parts.uri.path(), "/write");
+            let headers = parts.headers;
+            assert_eq!(headers["x-prometheus-remote-write-version"], "0.1.0");
+            assert_eq!(headers["content-encoding"], "snappy");
+            assert_eq!(headers["content-type"], "application/x-protobuf");
+
+            if config.auth.is_some() {
+                assert!(headers.contains_key("authorization"));
+            }
+
+            let decoded = snap::raw::Decoder::new()
+                .decompress_vec(&body)
+                .expect("Invalid snappy compressed data");
+            let request =
+                proto::WriteRequest::decode(Bytes::from(decoded)).expect("Invalid protobuf");
+            (headers, request)
+        })
+        .collect::<Vec<_>>()
+        .await
+    })
+    .await
+}
+
+pub(super) fn create_event(name: String, value: f64) -> Event {
+    Metric::new(name, MetricKind::Absolute, MetricValue::Gauge { value })
+        .with_tags(Some(metric_tags!(
+            "region" => "us-west-1",
+            "production" => "true",
+        )))
+        .with_timestamp(Some(chrono::Utc::now()))
+        .into()
+}
+
+fn create_inc_event(name: String, value: f64) -> Event {
+    Metric::new(
+        name,
+        MetricKind::Incremental,
+        MetricValue::Counter { value },
+    )
+    .with_timestamp(Some(chrono::Utc::now()))
+    .into()
+}
diff --git a/src/sinks/util/buffer/compression.rs b/src/sinks/util/buffer/compression.rs
index 11796b046104a..943232ad25be5 100644
--- a/src/sinks/util/buffer/compression.rs
+++ b/src/sinks/util/buffer/compression.rs
@@ -37,6 +37,11 @@ pub enum Compression {
     ///
     /// [zstd]: https://facebook.github.io/zstd/
     Zstd(CompressionLevel),
+
+    /// [Snappy][snappy] compression.
+    ///
+    /// [snappy]: https://github.com/google/snappy/blob/main/docs/README.md
+    Snappy,
 }
 
 impl Compression {
@@ -70,6 +75,7 @@ impl Compression {
             Self::Gzip(_) => Some("gzip"),
             Self::Zlib(_) => Some("deflate"),
             Self::Zstd(_) => Some("zstd"),
+            Self::Snappy => Some("snappy"),
         }
     }
 
@@ -78,6 +84,7 @@ impl Compression {
             Self::Gzip(_) => Some("gzip"),
             Self::Zlib(_) => Some("deflate"),
             Self::Zstd(_) => Some("zstd"),
+            Self::Snappy => Some("snappy"),
             _ => None,
         }
     }
@@ -88,6 +95,7 @@ impl Compression {
             Self::Gzip(_) => "log.gz",
             Self::Zlib(_) => "log.zz",
             Self::Zstd(_) => "log.zst",
+            Self::Snappy => "log.snappy",
         }
     }
 
@@ -97,12 +105,13 @@ impl Compression {
             Compression::Gzip(_) => 9,
             Compression::Zlib(_) => 9,
             Compression::Zstd(_) => 21,
+            Compression::Snappy => 0,
         }
     }
 
     pub const fn compression_level(self) -> CompressionLevel {
         match self {
-            Self::None => CompressionLevel::None,
+            Self::None | Self::Snappy => CompressionLevel::None,
             Self::Gzip(level) | Self::Zlib(level) | Self::Zstd(level) => level,
         }
     }
@@ -117,6 +126,7 @@ impl fmt::Display for Compression {
             Compression::Zstd(ref level) => {
                 write!(f, "zstd({})", ZstdCompressionLevel::from(*level))
             }
+            Compression::Snappy => write!(f, "snappy"),
         }
     }
 }
@@ -144,6 +154,7 @@ impl<'de> de::Deserialize<'de> for Compression {
                     "gzip" => Ok(Compression::gzip_default()),
                     "zlib" => Ok(Compression::zlib_default()),
                     "zstd" => Ok(Compression::zstd_default()),
+                    "snappy" => Ok(Compression::Snappy),
                     _ => Err(de::Error::invalid_value(
                         de::Unexpected::Str(s),
                         &r#""none" or "gzip" or "zlib" or "zstd""#,
@@ -187,9 +198,13 @@ impl<'de> de::Deserialize<'de> for Compression {
                     "gzip" => Ok(Compression::Gzip(level.unwrap_or_default())),
                     "zlib" => Ok(Compression::Zlib(level.unwrap_or_default())),
                     "zstd" => Ok(Compression::Zstd(level.unwrap_or_default())),
+                    "snappy" => match level {
+                        Some(_) => Err(de::Error::unknown_field("level", &[])),
+                        None => Ok(Compression::Snappy),
+                    },
                     algorithm => Err(de::Error::unknown_variant(
                         algorithm,
-                        &["none", "gzip", "zlib", "zstd"],
+                        &["none", "gzip", "zlib", "zstd", "snappy"],
                     )),
                 }?;
 
@@ -252,6 +267,7 @@ impl ser::Serialize for Compression {
                     serializer.serialize_str("zstd")
                 }
             }
+            Compression::Snappy => serializer.serialize_str("snappy"),
         }
     }
 }
@@ -314,11 +330,18 @@ impl Configurable for Compression {
             "[zstd]: https://facebook.github.io/zstd/",
         );
 
+        let snappy_string_subschema = generate_string_schema(
+            "Snappy",
+            Some("[Snappy][snappy] compression."),
+            "[snappy]: https://github.com/google/snappy/blob/main/docs/README.md",
+        );
+
         let mut all_string_oneof_subschema = generate_one_of_schema(&[
             none_string_subschema,
             gzip_string_subschema,
             zlib_string_subschema,
             zstd_string_subschema,
+            snappy_string_subschema,
         ]);
         apply_base_metadata(&mut all_string_oneof_subschema, string_metadata);
 
@@ -509,6 +532,7 @@ mod test {
             (r#""none""#, Compression::None),
             (r#""gzip""#, Compression::Gzip(CompressionLevel::default())),
             (r#""zlib""#, Compression::Zlib(CompressionLevel::default())),
+            (r#""snappy""#, Compression::Snappy),
             (r#"{"algorithm": "none"}"#, Compression::None),
             (
                 r#"{"algorithm": "gzip"}"#,
@@ -551,7 +575,7 @@ mod test {
             ),
             (
                 r#"{"algorithm": "b42"}"#,
-                r#"unknown variant `b42`, expected one of `none`, `gzip`, `zlib`, `zstd` at line 1 column 20"#,
+                r#"unknown variant `b42`, expected one of `none`, `gzip`, `zlib`, `zstd`, `snappy` at line 1 column 20"#,
             ),
             (
                 r#"{"algorithm": "none", "level": "default"}"#,
@@ -581,6 +605,10 @@ mod test {
                 r#"{"algorithm": "zstd", "level": 22}"#,
                 r#"invalid value `22`, expected value in range [0, 21] at line 1 column 34"#,
             ),
+            (
+                r#"{"algorithm": "snappy", "level": 3}"#,
+                r#"unknown field `level`, there are no fields at line 1 column 35"#,
+            ),
         ];
         for (source, result) in fixtures_invalid.iter() {
             let deserialized: Result<Compression, _> = serde_json::from_str(source);
diff --git a/src/sinks/util/buffer/metrics/normalize.rs b/src/sinks/util/buffer/metrics/normalize.rs
index afd39f8c31c73..16812fcd26333 100644
--- a/src/sinks/util/buffer/metrics/normalize.rs
+++ b/src/sinks/util/buffer/metrics/normalize.rs
@@ -1,5 +1,4 @@
-use std::collections::HashMap;
-
+use indexmap::IndexMap;
 use vector_core::event::{
     metric::{MetricData, MetricSeries},
     EventMetadata, Metric, MetricKind,
@@ -83,10 +82,11 @@ type MetricEntry = (MetricData, EventMetadata);
 
 /// Metric storage for use with normalization.
 ///
-/// This is primarily a wrapper around `HashMap` with convenience methods to make it easier to perform
+/// 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)]
-pub struct MetricSet(HashMap<MetricSeries, MetricEntry>);
+#[derive(Clone, Default, Debug)]
+pub struct MetricSet(IndexMap<MetricSeries, MetricEntry>);
 
 impl MetricSet {
     /// Creates an empty `MetricSet` with the specified capacity.
@@ -94,7 +94,7 @@ impl MetricSet {
     /// The metric set will be able to hold at least `capacity` elements without reallocating. If `capacity` is 0, the
     /// metric set will not allocate.
     pub fn with_capacity(capacity: usize) -> Self {
-        Self(HashMap::with_capacity(capacity))
+        Self(IndexMap::with_capacity(capacity))
     }
 
     /// Returns the number of elements in the set.
diff --git a/src/sinks/util/buffer/mod.rs b/src/sinks/util/buffer/mod.rs
index 296e14b02f9c8..f0ab3dd6af8fb 100644
--- a/src/sinks/util/buffer/mod.rs
+++ b/src/sinks/util/buffer/mod.rs
@@ -5,6 +5,7 @@ use flate2::write::{GzEncoder, ZlibEncoder};
 
 use super::{
     batch::{err_event_too_large, Batch, BatchSize, PushResult},
+    snappy::SnappyEncoder,
     zstd::ZstdEncoder,
 };
 
@@ -32,6 +33,7 @@ pub enum InnerBuffer {
     Gzip(GzEncoder<bytes::buf::Writer<BytesMut>>),
     Zlib(ZlibEncoder<bytes::buf::Writer<BytesMut>>),
     Zstd(ZstdEncoder<bytes::buf::Writer<BytesMut>>),
+    Snappy(SnappyEncoder<bytes::buf::Writer<BytesMut>>),
 }
 
 impl Buffer {
@@ -62,6 +64,7 @@ impl Buffer {
                     ZstdEncoder::new(writer, level.into())
                         .expect("Zstd encoder should not fail on init."),
                 ),
+                Compression::Snappy => InnerBuffer::Snappy(SnappyEncoder::new(writer)),
             }
         })
     }
@@ -81,6 +84,7 @@ impl Buffer {
             InnerBuffer::Zstd(inner) => {
                 inner.write_all(input).unwrap();
             }
+            InnerBuffer::Snappy(inner) => inner.write_all(input).unwrap(),
         }
     }
 
@@ -92,6 +96,7 @@ impl Buffer {
                 InnerBuffer::Gzip(inner) => inner.get_ref().get_ref().is_empty(),
                 InnerBuffer::Zlib(inner) => inner.get_ref().get_ref().is_empty(),
                 InnerBuffer::Zstd(inner) => inner.get_ref().get_ref().is_empty(),
+                InnerBuffer::Snappy(inner) => inner.is_empty(),
             })
             .unwrap_or(true)
     }
@@ -142,6 +147,10 @@ impl Batch for Buffer {
                 .finish()
                 .expect("This can't fail because the inner writer is a Vec")
                 .into_inner(),
+            Some(InnerBuffer::Snappy(inner)) => inner
+                .finish()
+                .expect("This can't fail because the inner writer is a Vec")
+                .into_inner(),
             None => BytesMut::new(),
         }
     }
diff --git a/src/sinks/util/builder.rs b/src/sinks/util/builder.rs
index 7e5fb0d8ca954..da74aeb20f6bf 100644
--- a/src/sinks/util/builder.rs
+++ b/src/sinks/util/builder.rs
@@ -44,11 +44,11 @@ pub trait SinkBuilderExt: Stream {
     /// The stream will yield batches of events, with their partition key, when either a batch fills
     /// up or times out. [`Partitioner`] operates on a per-event basis, and has access to the event
     /// itself, and so can access any and all fields of an event.
-    fn batched_partitioned<P, C, F>(
+    fn batched_partitioned<P, C, F, B>(
         self,
         partitioner: P,
         settings: F,
-    ) -> PartitionedBatcher<Self, P, ExpirationQueue<P::Key>, C, F>
+    ) -> PartitionedBatcher<Self, P, ExpirationQueue<P::Key>, C, F, B>
     where
         Self: Stream<Item = P::Item> + Sized,
         P: Partitioner + Unpin,
diff --git a/src/sinks/util/compressor.rs b/src/sinks/util/compressor.rs
index b918893a39bd2..f6d3c01ccca87 100644
--- a/src/sinks/util/compressor.rs
+++ b/src/sinks/util/compressor.rs
@@ -3,13 +3,14 @@ use std::io;
 use bytes::{BufMut, BytesMut};
 use flate2::write::{GzEncoder, ZlibEncoder};
 
-use super::{zstd::ZstdEncoder, Compression};
+use super::{snappy::SnappyEncoder, zstd::ZstdEncoder, Compression};
 
 enum Writer {
     Plain(bytes::buf::Writer<BytesMut>),
     Gzip(GzEncoder<bytes::buf::Writer<BytesMut>>),
     Zlib(ZlibEncoder<bytes::buf::Writer<BytesMut>>),
     Zstd(ZstdEncoder<bytes::buf::Writer<BytesMut>>),
+    Snappy(SnappyEncoder<bytes::buf::Writer<BytesMut>>),
 }
 
 impl Writer {
@@ -19,6 +20,7 @@ impl Writer {
             Writer::Gzip(inner) => inner.get_ref().get_ref(),
             Writer::Zlib(inner) => inner.get_ref().get_ref(),
             Writer::Zstd(inner) => inner.get_ref().get_ref(),
+            Writer::Snappy(inner) => inner.get_ref().get_ref(),
         }
     }
 }
@@ -35,6 +37,7 @@ impl From<Compression> for Writer {
                     .expect("Zstd encoder should not fail on init.");
                 Writer::Zstd(encoder)
             }
+            Compression::Snappy => Writer::Snappy(SnappyEncoder::new(writer)),
         }
     }
 }
@@ -47,6 +50,7 @@ impl io::Write for Writer {
             Writer::Gzip(writer) => writer.write(buf),
             Writer::Zlib(writer) => writer.write(buf),
             Writer::Zstd(writer) => writer.write(buf),
+            Writer::Snappy(writer) => writer.write(buf),
         }
     }
 
@@ -56,6 +60,7 @@ impl io::Write for Writer {
             Writer::Gzip(writer) => writer.flush(),
             Writer::Zlib(writer) => writer.flush(),
             Writer::Zstd(writer) => writer.flush(),
+            Writer::Snappy(writer) => writer.flush(),
         }
     }
 }
@@ -98,6 +103,7 @@ impl Compressor {
             Writer::Gzip(writer) => writer.finish()?,
             Writer::Zlib(writer) => writer.finish()?,
             Writer::Zstd(writer) => writer.finish()?,
+            Writer::Snappy(writer) => writer.finish()?,
         }
         .into_inner();
 
@@ -125,6 +131,9 @@ impl Compressor {
             Writer::Zstd(writer) => writer
                 .finish()
                 .expect("zstd writer should not fail to finish"),
+            Writer::Snappy(writer) => writer
+                .finish()
+                .expect("snappy writer should not fail to finish"),
         }
         .into_inner()
     }
diff --git a/src/sinks/util/http.rs b/src/sinks/util/http.rs
index eb67ca9772ba3..635618664fcd6 100644
--- a/src/sinks/util/http.rs
+++ b/src/sinks/util/http.rs
@@ -653,8 +653,8 @@ impl ByteSizeOf for HttpRequest {
 /// Response type for use in the `Service` implementation of HTTP stream sinks.
 pub struct HttpResponse {
     pub http_response: Response<Bytes>,
-    events_byte_size: GroupedCountByteSize,
-    raw_byte_size: usize,
+    pub events_byte_size: GroupedCountByteSize,
+    pub raw_byte_size: usize,
 }
 
 impl DriverResponse for HttpResponse {
diff --git a/src/sinks/util/mod.rs b/src/sinks/util/mod.rs
index 1fcae4842cd7f..f5c09b97f380f 100644
--- a/src/sinks/util/mod.rs
+++ b/src/sinks/util/mod.rs
@@ -16,6 +16,7 @@ pub mod request_builder;
 pub mod retries;
 pub mod service;
 pub mod sink;
+pub mod snappy;
 pub mod socket_bytes_sink;
 pub mod statistic;
 pub mod tcp;
diff --git a/src/sinks/util/snappy.rs b/src/sinks/util/snappy.rs
new file mode 100644
index 0000000000000..a46edd41ebf97
--- /dev/null
+++ b/src/sinks/util/snappy.rs
@@ -0,0 +1,88 @@
+//! An encoder for [Snappy] compression.
+//! Whilst there does exist a [Writer] implementation for Snappy, this compresses
+//! using the [Snappy frame format][frame], which is not quite what we want. So
+//! instead this encoder buffers the data in a [`Vec`] until the end. The `raw`
+//! compressor is then used to compress the data and writes it to the provided
+//! writer.
+//!
+//! [Snappy]: https://github.com/google/snappy/blob/main/docs/README.md
+//! [Writer]: https://docs.rs/snap/latest/snap/write/struct.FrameEncoder.html
+//! [frame]: https://github.com/google/snappy/blob/master/framing_format.txt
+
+use std::io;
+
+use snap::raw::Encoder;
+
+pub struct SnappyEncoder<W: io::Write> {
+    writer: W,
+    buffer: Vec<u8>,
+}
+
+impl<W: io::Write> SnappyEncoder<W> {
+    pub fn new(writer: W) -> Self {
+        Self {
+            writer,
+            buffer: Vec::new(),
+        }
+    }
+
+    pub fn finish(mut self) -> io::Result<W> {
+        let mut encoder = Encoder::new();
+        let compressed = encoder.compress_vec(&self.buffer)?;
+
+        self.writer.write_all(&compressed)?;
+
+        Ok(self.writer)
+    }
+
+    pub const fn get_ref(&self) -> &W {
+        &self.writer
+    }
+
+    pub fn is_empty(&self) -> bool {
+        self.buffer.is_empty()
+    }
+}
+
+impl<W: io::Write> io::Write for SnappyEncoder<W> {
+    fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
+        self.buffer.extend_from_slice(buf);
+        Ok(buf.len())
+    }
+
+    fn flush(&mut self) -> io::Result<()> {
+        Ok(())
+    }
+}
+
+impl<W: io::Write + std::fmt::Debug> std::fmt::Debug for SnappyEncoder<W> {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        f.debug_struct("SnappyEncoder")
+            .field("inner", &self.get_ref())
+            .finish()
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use std::io::Write;
+
+    use bytes::{BufMut, BytesMut};
+
+    use super::*;
+
+    #[test]
+    fn is_empty() {
+        let writer = BytesMut::with_capacity(64).writer();
+        let mut encoder = SnappyEncoder::new(writer);
+
+        encoder.write_all(b"I am a potato").unwrap();
+
+        // Because we are buffering the results until the end, the writer will be
+        // empty, but our buffer won't be. The `is_empty` function is provided to
+        // allow us to determine if data has been written to the encoder without having
+        // to check the writer.
+        assert!(encoder.get_ref().get_ref().is_empty());
+        assert!(!encoder.is_empty());
+    }
+}
diff --git a/src/sinks/vector/sink.rs b/src/sinks/vector/sink.rs
index 8d6527326d5b4..0375302b95b6c 100644
--- a/src/sinks/vector/sink.rs
+++ b/src/sinks/vector/sink.rs
@@ -6,7 +6,7 @@ use prost::Message;
 use tower::Service;
 use vector_common::request_metadata::GroupedCountByteSize;
 use vector_core::{config::telemetry, ByteSizeOf, EstimatedJsonEncodedSizeOf};
-use vector_stream::{BatcherSettings, DriverResponse};
+use vector_stream::{batcher::data::BatchReduce, BatcherSettings, DriverResponse};
 
 use super::service::VectorRequest;
 use crate::{
@@ -68,14 +68,14 @@ where
                     wrapper: EventWrapper::from(event),
                 }
             })
-            .batched(self.batch_settings.into_reducer_config(
+            .batched(self.batch_settings.as_reducer_config(
                 |data: &EventData| data.wrapper.encoded_len(),
-                |event_collection: &mut EventCollection, item: EventData| {
+                BatchReduce::new(|event_collection: &mut EventCollection, item: EventData| {
                     event_collection.finalizers.merge(item.finalizers);
                     event_collection.events.push(item.wrapper);
                     event_collection.events_byte_size += item.byte_size;
                     event_collection.events_json_byte_size += item.json_byte_size;
-                },
+                }),
             ))
             .map(|event_collection| {
                 let builder = RequestMetadataBuilder::new(
diff --git a/src/sources/prometheus/remote_write.rs b/src/sources/prometheus/remote_write.rs
index 6fe08a32c7b51..9a2e4356975b6 100644
--- a/src/sources/prometheus/remote_write.rs
+++ b/src/sources/prometheus/remote_write.rs
@@ -155,11 +155,7 @@ mod test {
     use crate::{
         config::{SinkConfig, SinkContext},
         sinks::prometheus::remote_write::RemoteWriteConfig,
-        test_util::{
-            self,
-            components::{assert_source_compliance, HTTP_PUSH_SOURCE_TAGS},
-            wait_for_tcp,
-        },
+        test_util::{self, wait_for_tcp},
         tls::MaybeTlsSettings,
         SourceSender,
     };
@@ -180,54 +176,51 @@ mod test {
     }
 
     async fn receives_metrics(tls: Option<TlsEnableableConfig>) {
-        assert_source_compliance(&HTTP_PUSH_SOURCE_TAGS, async {
-            let address = test_util::next_addr();
-            let (tx, rx) = SourceSender::new_test_finalize(EventStatus::Delivered);
-
-            let proto = MaybeTlsSettings::from_config(&tls, true)
-                .unwrap()
-                .http_protocol_name();
-            let source = PrometheusRemoteWriteConfig {
-                address,
-                auth: None,
-                tls: tls.clone(),
-                acknowledgements: SourceAcknowledgementsConfig::default(),
-            };
-            let source = source
-                .build(SourceContext::new_test(tx, None))
-                .await
-                .unwrap();
-            tokio::spawn(source);
-            wait_for_tcp(address).await;
-
-            let sink = RemoteWriteConfig {
-                endpoint: format!("{}://localhost:{}/", proto, address.port()),
-                tls: tls.map(|tls| tls.options),
-                ..Default::default()
-            };
-            let (sink, _) = sink
-                .build(SinkContext::default())
-                .await
-                .expect("Error building config.");
-
-            let events = make_events();
-            let events_copy = events.clone();
-            let mut output = test_util::spawn_collect_ready(
-                async move {
-                    sink.run_events(events_copy).await.unwrap();
-                },
-                rx,
-                1,
-            )
-            .await;
-
-            // The MetricBuffer used by the sink may reorder the metrics, so
-            // put them back into order before comparing.
-            output.sort_unstable_by_key(|event| event.as_metric().name().to_owned());
+        let address = test_util::next_addr();
+        let (tx, rx) = SourceSender::new_test_finalize(EventStatus::Delivered);
 
-            vector_common::assert_event_data_eq!(events, output);
-        })
+        let proto = MaybeTlsSettings::from_config(&tls, true)
+            .unwrap()
+            .http_protocol_name();
+        let source = PrometheusRemoteWriteConfig {
+            address,
+            auth: None,
+            tls: tls.clone(),
+            acknowledgements: SourceAcknowledgementsConfig::default(),
+        };
+        let source = source
+            .build(SourceContext::new_test(tx, None))
+            .await
+            .unwrap();
+        tokio::spawn(source);
+        wait_for_tcp(address).await;
+
+        let sink = RemoteWriteConfig {
+            endpoint: format!("{}://localhost:{}/", proto, address.port()),
+            tls: tls.map(|tls| tls.options),
+            ..Default::default()
+        };
+        let (sink, _) = sink
+            .build(SinkContext::default())
+            .await
+            .expect("Error building config.");
+
+        let events = make_events();
+        let events_copy = events.clone();
+        let mut output = test_util::spawn_collect_ready(
+            async move {
+                sink.run_events(events_copy).await.unwrap();
+            },
+            rx,
+            1,
+        )
         .await;
+
+        // The MetricBuffer used by the sink may reorder the metrics, so
+        // put them back into order before comparing.
+        output.sort_unstable_by_key(|event| event.as_metric().name().to_owned());
+
+        vector_common::assert_event_data_eq!(events, output);
     }
 
     fn make_events() -> Vec<Event> {
@@ -278,69 +271,66 @@ mod test {
     /// we accept the metric, but take the last label in the list.
     #[tokio::test]
     async fn receives_metrics_duplicate_labels() {
-        assert_source_compliance(&HTTP_PUSH_SOURCE_TAGS, async {
-            let address = test_util::next_addr();
-            let (tx, rx) = SourceSender::new_test_finalize(EventStatus::Delivered);
-
-            let source = PrometheusRemoteWriteConfig {
-                address,
-                auth: None,
-                tls: None,
-                acknowledgements: SourceAcknowledgementsConfig::default(),
-            };
-            let source = source
-                .build(SourceContext::new_test(tx, None))
-                .await
-                .unwrap();
-            tokio::spawn(source);
-            wait_for_tcp(address).await;
-
-            let sink = RemoteWriteConfig {
-                endpoint: format!("http://localhost:{}/", address.port()),
-                ..Default::default()
-            };
-            let (sink, _) = sink
-                .build(SinkContext::default())
-                .await
-                .expect("Error building config.");
-
-            let timestamp = Utc::now().trunc_subsecs(3);
-
-            let events = vec![Metric::new(
-                "gauge_2",
-                MetricKind::Absolute,
-                MetricValue::Gauge { value: 41.0 },
-            )
-            .with_timestamp(Some(timestamp))
-            .with_tags(Some(metric_tags! {
-                "code" => "200".to_string(),
-                "code" => "success".to_string(),
-            }))
-            .into()];
-
-            let expected = vec![Metric::new(
-                "gauge_2",
-                MetricKind::Absolute,
-                MetricValue::Gauge { value: 41.0 },
-            )
-            .with_timestamp(Some(timestamp))
-            .with_tags(Some(metric_tags! {
-                "code" => "success".to_string(),
-            }))
-            .into()];
-
-            let output = test_util::spawn_collect_ready(
-                async move {
-                    sink.run_events(events).await.unwrap();
-                },
-                rx,
-                1,
-            )
-            .await;
+        let address = test_util::next_addr();
+        let (tx, rx) = SourceSender::new_test_finalize(EventStatus::Delivered);
 
-            vector_common::assert_event_data_eq!(expected, output);
-        })
+        let source = PrometheusRemoteWriteConfig {
+            address,
+            auth: None,
+            tls: None,
+            acknowledgements: SourceAcknowledgementsConfig::default(),
+        };
+        let source = source
+            .build(SourceContext::new_test(tx, None))
+            .await
+            .unwrap();
+        tokio::spawn(source);
+        wait_for_tcp(address).await;
+
+        let sink = RemoteWriteConfig {
+            endpoint: format!("http://localhost:{}/", address.port()),
+            ..Default::default()
+        };
+        let (sink, _) = sink
+            .build(SinkContext::default())
+            .await
+            .expect("Error building config.");
+
+        let timestamp = Utc::now().trunc_subsecs(3);
+
+        let events = vec![Metric::new(
+            "gauge_2",
+            MetricKind::Absolute,
+            MetricValue::Gauge { value: 41.0 },
+        )
+        .with_timestamp(Some(timestamp))
+        .with_tags(Some(metric_tags! {
+            "code" => "200".to_string(),
+            "code" => "success".to_string(),
+        }))
+        .into()];
+
+        let expected = vec![Metric::new(
+            "gauge_2",
+            MetricKind::Absolute,
+            MetricValue::Gauge { value: 41.0 },
+        )
+        .with_timestamp(Some(timestamp))
+        .with_tags(Some(metric_tags! {
+            "code" => "success".to_string(),
+        }))
+        .into()];
+
+        let output = test_util::spawn_collect_ready(
+            async move {
+                sink.run_events(events).await.unwrap();
+            },
+            rx,
+            1,
+        )
         .await;
+
+        vector_common::assert_event_data_eq!(expected, output);
     }
 }
 
diff --git a/website/cue/reference/components/sinks/base/appsignal.cue b/website/cue/reference/components/sinks/base/appsignal.cue
index 68904ee5046e6..48b3e4b518f7c 100644
--- a/website/cue/reference/components/sinks/base/appsignal.cue
+++ b/website/cue/reference/components/sinks/base/appsignal.cue
@@ -78,6 +78,11 @@ base: components: sinks: appsignal: configuration: {
 					[gzip]: https://www.gzip.org/
 					"""
 				none: "No compression."
+				snappy: """
+					[Snappy][snappy] compression.
+
+					[snappy]: https://github.com/google/snappy/blob/main/docs/README.md
+					"""
 				zlib: """
 					[Zlib][zlib] compression.
 
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 fd8bebd59bdc0..162b8dbe4853f 100644
--- a/website/cue/reference/components/sinks/base/aws_cloudwatch_logs.cue
+++ b/website/cue/reference/components/sinks/base/aws_cloudwatch_logs.cue
@@ -180,6 +180,11 @@ base: components: sinks: aws_cloudwatch_logs: configuration: {
 					[gzip]: https://www.gzip.org/
 					"""
 				none: "No compression."
+				snappy: """
+					[Snappy][snappy] compression.
+
+					[snappy]: https://github.com/google/snappy/blob/main/docs/README.md
+					"""
 				zlib: """
 					[Zlib][zlib] compression.
 
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 daa94b379ffda..16e90e50e5193 100644
--- a/website/cue/reference/components/sinks/base/aws_cloudwatch_metrics.cue
+++ b/website/cue/reference/components/sinks/base/aws_cloudwatch_metrics.cue
@@ -177,6 +177,11 @@ base: components: sinks: aws_cloudwatch_metrics: configuration: {
 					[gzip]: https://www.gzip.org/
 					"""
 				none: "No compression."
+				snappy: """
+					[Snappy][snappy] compression.
+
+					[snappy]: https://github.com/google/snappy/blob/main/docs/README.md
+					"""
 				zlib: """
 					[Zlib][zlib] compression.
 
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 3e4ac7c1d325b..c5ba35bba8dea 100644
--- a/website/cue/reference/components/sinks/base/aws_kinesis_firehose.cue
+++ b/website/cue/reference/components/sinks/base/aws_kinesis_firehose.cue
@@ -180,6 +180,11 @@ base: components: sinks: aws_kinesis_firehose: configuration: {
 					[gzip]: https://www.gzip.org/
 					"""
 				none: "No compression."
+				snappy: """
+					[Snappy][snappy] compression.
+
+					[snappy]: https://github.com/google/snappy/blob/main/docs/README.md
+					"""
 				zlib: """
 					[Zlib][zlib] compression.
 
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 a2a7a659b8b46..1e4e3387b2581 100644
--- a/website/cue/reference/components/sinks/base/aws_kinesis_streams.cue
+++ b/website/cue/reference/components/sinks/base/aws_kinesis_streams.cue
@@ -180,6 +180,11 @@ base: components: sinks: aws_kinesis_streams: configuration: {
 					[gzip]: https://www.gzip.org/
 					"""
 				none: "No compression."
+				snappy: """
+					[Snappy][snappy] compression.
+
+					[snappy]: https://github.com/google/snappy/blob/main/docs/README.md
+					"""
 				zlib: """
 					[Zlib][zlib] compression.
 
diff --git a/website/cue/reference/components/sinks/base/aws_s3.cue b/website/cue/reference/components/sinks/base/aws_s3.cue
index 5e6e0fef81491..55ad8f643d934 100644
--- a/website/cue/reference/components/sinks/base/aws_s3.cue
+++ b/website/cue/reference/components/sinks/base/aws_s3.cue
@@ -264,6 +264,11 @@ base: components: sinks: aws_s3: configuration: {
 					[gzip]: https://www.gzip.org/
 					"""
 				none: "No compression."
+				snappy: """
+					[Snappy][snappy] compression.
+
+					[snappy]: https://github.com/google/snappy/blob/main/docs/README.md
+					"""
 				zlib: """
 					[Zlib][zlib] compression.
 
diff --git a/website/cue/reference/components/sinks/base/axiom.cue b/website/cue/reference/components/sinks/base/axiom.cue
index a20276b2ee26b..2de88265fc8f8 100644
--- a/website/cue/reference/components/sinks/base/axiom.cue
+++ b/website/cue/reference/components/sinks/base/axiom.cue
@@ -43,6 +43,11 @@ base: components: sinks: axiom: configuration: {
 					[gzip]: https://www.gzip.org/
 					"""
 				none: "No compression."
+				snappy: """
+					[Snappy][snappy] compression.
+
+					[snappy]: https://github.com/google/snappy/blob/main/docs/README.md
+					"""
 				zlib: """
 					[Zlib][zlib] compression.
 
diff --git a/website/cue/reference/components/sinks/base/azure_blob.cue b/website/cue/reference/components/sinks/base/azure_blob.cue
index 34d92a850d390..482f927432613 100644
--- a/website/cue/reference/components/sinks/base/azure_blob.cue
+++ b/website/cue/reference/components/sinks/base/azure_blob.cue
@@ -127,6 +127,11 @@ base: components: sinks: azure_blob: configuration: {
 					[gzip]: https://www.gzip.org/
 					"""
 				none: "No compression."
+				snappy: """
+					[Snappy][snappy] compression.
+
+					[snappy]: https://github.com/google/snappy/blob/main/docs/README.md
+					"""
 				zlib: """
 					[Zlib][zlib] compression.
 
diff --git a/website/cue/reference/components/sinks/base/clickhouse.cue b/website/cue/reference/components/sinks/base/clickhouse.cue
index acd2cafb2c588..52c00efdd4b71 100644
--- a/website/cue/reference/components/sinks/base/clickhouse.cue
+++ b/website/cue/reference/components/sinks/base/clickhouse.cue
@@ -122,6 +122,11 @@ base: components: sinks: clickhouse: configuration: {
 					[gzip]: https://www.gzip.org/
 					"""
 				none: "No compression."
+				snappy: """
+					[Snappy][snappy] compression.
+
+					[snappy]: https://github.com/google/snappy/blob/main/docs/README.md
+					"""
 				zlib: """
 					[Zlib][zlib] compression.
 
diff --git a/website/cue/reference/components/sinks/base/datadog_logs.cue b/website/cue/reference/components/sinks/base/datadog_logs.cue
index 1858aab1659eb..6e2961f8b39af 100644
--- a/website/cue/reference/components/sinks/base/datadog_logs.cue
+++ b/website/cue/reference/components/sinks/base/datadog_logs.cue
@@ -76,6 +76,11 @@ base: components: sinks: datadog_logs: configuration: {
 				[gzip]: https://www.gzip.org/
 				"""
 			none: "No compression."
+			snappy: """
+				[Snappy][snappy] compression.
+
+				[snappy]: https://github.com/google/snappy/blob/main/docs/README.md
+				"""
 			zlib: """
 				[Zlib][zlib] compression.
 
diff --git a/website/cue/reference/components/sinks/base/datadog_traces.cue b/website/cue/reference/components/sinks/base/datadog_traces.cue
index edf6ec6d65bc7..1564e8f720f2d 100644
--- a/website/cue/reference/components/sinks/base/datadog_traces.cue
+++ b/website/cue/reference/components/sinks/base/datadog_traces.cue
@@ -76,6 +76,11 @@ base: components: sinks: datadog_traces: configuration: {
 				[gzip]: https://www.gzip.org/
 				"""
 			none: "No compression."
+			snappy: """
+				[Snappy][snappy] compression.
+
+				[snappy]: https://github.com/google/snappy/blob/main/docs/README.md
+				"""
 			zlib: """
 				[Zlib][zlib] compression.
 
diff --git a/website/cue/reference/components/sinks/base/elasticsearch.cue b/website/cue/reference/components/sinks/base/elasticsearch.cue
index 9e0041fcdd068..1e039927ff1bc 100644
--- a/website/cue/reference/components/sinks/base/elasticsearch.cue
+++ b/website/cue/reference/components/sinks/base/elasticsearch.cue
@@ -279,6 +279,11 @@ base: components: sinks: elasticsearch: configuration: {
 					[gzip]: https://www.gzip.org/
 					"""
 				none: "No compression."
+				snappy: """
+					[Snappy][snappy] compression.
+
+					[snappy]: https://github.com/google/snappy/blob/main/docs/README.md
+					"""
 				zlib: """
 					[Zlib][zlib] compression.
 
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 d28a12a3693c7..8bcf9922c23a0 100644
--- a/website/cue/reference/components/sinks/base/gcp_cloud_storage.cue
+++ b/website/cue/reference/components/sinks/base/gcp_cloud_storage.cue
@@ -151,6 +151,11 @@ base: components: sinks: gcp_cloud_storage: configuration: {
 					[gzip]: https://www.gzip.org/
 					"""
 				none: "No compression."
+				snappy: """
+					[Snappy][snappy] compression.
+
+					[snappy]: https://github.com/google/snappy/blob/main/docs/README.md
+					"""
 				zlib: """
 					[Zlib][zlib] compression.
 
diff --git a/website/cue/reference/components/sinks/base/http.cue b/website/cue/reference/components/sinks/base/http.cue
index 4f2733fba9158..43a14b957d084 100644
--- a/website/cue/reference/components/sinks/base/http.cue
+++ b/website/cue/reference/components/sinks/base/http.cue
@@ -122,6 +122,11 @@ base: components: sinks: http: configuration: {
 					[gzip]: https://www.gzip.org/
 					"""
 				none: "No compression."
+				snappy: """
+					[Snappy][snappy] compression.
+
+					[snappy]: https://github.com/google/snappy/blob/main/docs/README.md
+					"""
 				zlib: """
 					[Zlib][zlib] compression.
 
diff --git a/website/cue/reference/components/sinks/base/humio_logs.cue b/website/cue/reference/components/sinks/base/humio_logs.cue
index 74fe040a84fcb..6529d8294f36a 100644
--- a/website/cue/reference/components/sinks/base/humio_logs.cue
+++ b/website/cue/reference/components/sinks/base/humio_logs.cue
@@ -75,6 +75,11 @@ base: components: sinks: humio_logs: configuration: {
 					[gzip]: https://www.gzip.org/
 					"""
 				none: "No compression."
+				snappy: """
+					[Snappy][snappy] compression.
+
+					[snappy]: https://github.com/google/snappy/blob/main/docs/README.md
+					"""
 				zlib: """
 					[Zlib][zlib] compression.
 
diff --git a/website/cue/reference/components/sinks/base/humio_metrics.cue b/website/cue/reference/components/sinks/base/humio_metrics.cue
index 2d39e4dca0b90..c45509ce09b10 100644
--- a/website/cue/reference/components/sinks/base/humio_metrics.cue
+++ b/website/cue/reference/components/sinks/base/humio_metrics.cue
@@ -75,6 +75,11 @@ base: components: sinks: humio_metrics: configuration: {
 					[gzip]: https://www.gzip.org/
 					"""
 				none: "No compression."
+				snappy: """
+					[Snappy][snappy] compression.
+
+					[snappy]: https://github.com/google/snappy/blob/main/docs/README.md
+					"""
 				zlib: """
 					[Zlib][zlib] compression.
 
diff --git a/website/cue/reference/components/sinks/base/new_relic.cue b/website/cue/reference/components/sinks/base/new_relic.cue
index 1adcd87c1e0d8..535650bb074d4 100644
--- a/website/cue/reference/components/sinks/base/new_relic.cue
+++ b/website/cue/reference/components/sinks/base/new_relic.cue
@@ -92,6 +92,11 @@ base: components: sinks: new_relic: configuration: {
 					[gzip]: https://www.gzip.org/
 					"""
 				none: "No compression."
+				snappy: """
+					[Snappy][snappy] compression.
+
+					[snappy]: https://github.com/google/snappy/blob/main/docs/README.md
+					"""
 				zlib: """
 					[Zlib][zlib] compression.
 
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 4f825fdac5752..8858c0f99ed74 100644
--- a/website/cue/reference/components/sinks/base/prometheus_remote_write.cue
+++ b/website/cue/reference/components/sinks/base/prometheus_remote_write.cue
@@ -190,9 +190,14 @@ base: components: sinks: prometheus_remote_write: configuration: {
 		}
 	}
 	batch: {
-		description: "Event batching behavior."
+		description: "The batch config for remote write."
 		required:    false
 		type: object: options: {
+			aggregate: {
+				description: "Whether or not to aggregate metrics within a batch."
+				required:    false
+				type: bool: default: true
+			}
 			max_bytes: {
 				description: """
 					The maximum size of a batch that is processed by a sink.
@@ -234,14 +239,36 @@ base: components: sinks: prometheus_remote_write: configuration: {
 		}
 	}
 	compression: {
-		description: "Supported compression types for Prometheus Remote Write."
-		required:    false
+		description: """
+			Compression configuration.
+
+			All compression algorithms use the default compression level unless otherwise specified.
+			"""
+		required: false
 		type: string: {
 			default: "snappy"
 			enum: {
-				gzip:   "Gzip."
-				snappy: "Snappy."
-				zstd:   "Zstandard."
+				gzip: """
+					[Gzip][gzip] compression.
+
+					[gzip]: https://www.gzip.org/
+					"""
+				none: "No compression."
+				snappy: """
+					[Snappy][snappy] compression.
+
+					[snappy]: https://github.com/google/snappy/blob/main/docs/README.md
+					"""
+				zlib: """
+					[Zlib][zlib] compression.
+
+					[zlib]: https://zlib.net/
+					"""
+				zstd: """
+					[Zstandard][zstd] compression.
+
+					[zstd]: https://facebook.github.io/zstd/
+					"""
 			}
 		}
 	}
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 f105e81aad584..cfb3fc32268aa 100644
--- a/website/cue/reference/components/sinks/base/splunk_hec_logs.cue
+++ b/website/cue/reference/components/sinks/base/splunk_hec_logs.cue
@@ -116,6 +116,11 @@ base: components: sinks: splunk_hec_logs: configuration: {
 					[gzip]: https://www.gzip.org/
 					"""
 				none: "No compression."
+				snappy: """
+					[Snappy][snappy] compression.
+
+					[snappy]: https://github.com/google/snappy/blob/main/docs/README.md
+					"""
 				zlib: """
 					[Zlib][zlib] compression.
 
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 96c8517576f39..820454b8e867d 100644
--- a/website/cue/reference/components/sinks/base/splunk_hec_metrics.cue
+++ b/website/cue/reference/components/sinks/base/splunk_hec_metrics.cue
@@ -102,6 +102,11 @@ base: components: sinks: splunk_hec_metrics: configuration: {
 					[gzip]: https://www.gzip.org/
 					"""
 				none: "No compression."
+				snappy: """
+					[Snappy][snappy] compression.
+
+					[snappy]: https://github.com/google/snappy/blob/main/docs/README.md
+					"""
 				zlib: """
 					[Zlib][zlib] compression.
 
diff --git a/website/cue/reference/components/sinks/base/webhdfs.cue b/website/cue/reference/components/sinks/base/webhdfs.cue
index e85dc6de61bf1..a757159037863 100644
--- a/website/cue/reference/components/sinks/base/webhdfs.cue
+++ b/website/cue/reference/components/sinks/base/webhdfs.cue
@@ -75,6 +75,11 @@ base: components: sinks: webhdfs: configuration: {
 					[gzip]: https://www.gzip.org/
 					"""
 				none: "No compression."
+				snappy: """
+					[Snappy][snappy] compression.
+
+					[snappy]: https://github.com/google/snappy/blob/main/docs/README.md
+					"""
 				zlib: """
 					[Zlib][zlib] compression.
 

From c9c184ea3b6785823c723a818eb2b804b429cc3e Mon Sep 17 00:00:00 2001
From: Bruce Guenter <bruce.guenter@datadoghq.com>
Date: Wed, 25 Oct 2023 09:23:35 -0600
Subject: [PATCH 08/28] chore(core): Set up internal topology API (#18919)

* Rename `Pieces` to `TopologyPieces`

* Move `topology::start_validated` into `impl RunningTopology`

* Move `topology::builder::build_pieces` into `impl TopologyPieces`

* Move `topology::build_or_log_errors` into `TopologyPieces`

* Add helper function to `RunningTopology` for initial startup

* Simplify topology start return type

* Add support for internal topologies

* Add demo of internal pipeline

* Create the internal config manually

* Revert the sample use of the interface
---
 src/app.rs                                    |  57 ++++++----
 src/components/validation/runner/mod.rs       |  14 +--
 src/config/mod.rs                             |   2 +-
 src/config/unit_test/mod.rs                   |  11 +-
 .../traces/apm_stats/integration_tests.rs     |  11 +-
 src/test_util/mod.rs                          |  21 +---
 src/topology/builder.rs                       |  46 +++++---
 src/topology/mod.rs                           |  80 +-------------
 src/topology/running.rs                       | 104 ++++++++++++++----
 src/topology/test/crash.rs                    |   8 +-
 src/topology/test/end_to_end.rs               |  14 ++-
 src/topology/test/mod.rs                      |  17 +--
 src/topology/test/reload.rs                   |   4 +-
 src/validate.rs                               |   8 +-
 14 files changed, 193 insertions(+), 204 deletions(-)

diff --git a/src/app.rs b/src/app.rs
index 18ac0c1798571..259d846ea94eb 100644
--- a/src/app.rs
+++ b/src/app.rs
@@ -1,7 +1,5 @@
 #![allow(missing_docs)]
-use std::{
-    collections::HashMap, num::NonZeroUsize, path::PathBuf, process::ExitStatus, time::Duration,
-};
+use std::{num::NonZeroUsize, path::PathBuf, process::ExitStatus, time::Duration};
 
 use exitcode::ExitCode;
 use futures::StreamExt;
@@ -9,10 +7,7 @@ use futures::StreamExt;
 use futures_util::future::BoxFuture;
 use once_cell::race::OnceNonZeroUsize;
 use openssl::provider::Provider;
-use tokio::{
-    runtime::{self, Runtime},
-    sync::mpsc,
-};
+use tokio::runtime::{self, Runtime};
 use tokio_stream::wrappers::UnboundedReceiverStream;
 
 #[cfg(feature = "enterprise")]
@@ -28,9 +23,10 @@ use crate::{
     cli::{handle_config_errors, LogFormat, Opts, RootOpts},
     config::{self, Config, ConfigPath},
     heartbeat,
-    signal::{ShutdownError, SignalHandler, SignalPair, SignalRx, SignalTo},
+    signal::{SignalHandler, SignalPair, SignalRx, SignalTo},
     topology::{
-        self, ReloadOutcome, RunningTopology, SharedTopologyController, TopologyController,
+        ReloadOutcome, RunningTopology, SharedTopologyController, ShutdownErrorReceiver,
+        TopologyController,
     },
     trace,
 };
@@ -50,8 +46,8 @@ use tokio::sync::broadcast::error::RecvError;
 pub struct ApplicationConfig {
     pub config_paths: Vec<config::ConfigPath>,
     pub topology: RunningTopology,
-    pub graceful_crash_sender: mpsc::UnboundedSender<ShutdownError>,
-    pub graceful_crash_receiver: mpsc::UnboundedReceiver<ShutdownError>,
+    pub graceful_crash_receiver: ShutdownErrorReceiver,
+    pub internal_topologies: Vec<RunningTopology>,
     #[cfg(feature = "api")]
     pub api: config::api::Options,
     #[cfg(feature = "enterprise")]
@@ -99,23 +95,18 @@ impl ApplicationConfig {
         #[cfg(feature = "enterprise")]
         let enterprise = build_enterprise(&mut config, config_paths.clone())?;
 
-        let diff = config::ConfigDiff::initial(&config);
-        let pieces = topology::build_or_log_errors(&config, &diff, HashMap::new())
-            .await
-            .ok_or(exitcode::CONFIG)?;
-
         #[cfg(feature = "api")]
         let api = config.api;
 
-        let result = topology::start_validated(config, diff, pieces).await;
-        let (topology, (graceful_crash_sender, graceful_crash_receiver)) =
-            result.ok_or(exitcode::CONFIG)?;
+        let (topology, graceful_crash_receiver) = RunningTopology::start_init_validated(config)
+            .await
+            .ok_or(exitcode::CONFIG)?;
 
         Ok(Self {
             config_paths,
             topology,
-            graceful_crash_sender,
             graceful_crash_receiver,
+            internal_topologies: Vec::new(),
             #[cfg(feature = "api")]
             api,
             #[cfg(feature = "enterprise")]
@@ -123,6 +114,14 @@ impl ApplicationConfig {
         })
     }
 
+    pub async fn add_internal_config(&mut self, config: Config) -> Result<(), ExitCode> {
+        let Some((topology, _)) = RunningTopology::start_init_validated(config).await else {
+            return Err(exitcode::CONFIG);
+        };
+        self.internal_topologies.push(topology);
+        Ok(())
+    }
+
     /// Configure the API server, if applicable
     #[cfg(feature = "api")]
     pub fn setup_api(&self, handle: &Handle) -> Option<api::Server> {
@@ -145,8 +144,9 @@ impl ApplicationConfig {
                     let error = error.to_string();
                     error!("An error occurred that Vector couldn't handle: {}.", error);
                     _ = self
-                        .graceful_crash_sender
-                        .send(ShutdownError::ApiFailed { error });
+                        .topology
+                        .abort_tx
+                        .send(crate::signal::ShutdownError::ApiFailed { error });
                     None
                 }
             }
@@ -254,6 +254,7 @@ impl Application {
 
         Ok(StartedApplication {
             config_paths: config.config_paths,
+            internal_topologies: config.internal_topologies,
             graceful_crash_receiver: config.graceful_crash_receiver,
             signals,
             topology_controller,
@@ -264,7 +265,8 @@ impl Application {
 
 pub struct StartedApplication {
     pub config_paths: Vec<ConfigPath>,
-    pub graceful_crash_receiver: mpsc::UnboundedReceiver<ShutdownError>,
+    pub internal_topologies: Vec<RunningTopology>,
+    pub graceful_crash_receiver: ShutdownErrorReceiver,
     pub signals: SignalPair,
     pub topology_controller: SharedTopologyController,
     pub openssl_providers: Option<Vec<Provider>>,
@@ -282,6 +284,7 @@ impl StartedApplication {
             signals,
             topology_controller,
             openssl_providers,
+            internal_topologies,
         } = self;
 
         let mut graceful_crash = UnboundedReceiverStream::new(graceful_crash_receiver);
@@ -314,6 +317,7 @@ impl StartedApplication {
             signal_rx,
             topology_controller,
             openssl_providers,
+            internal_topologies,
         }
     }
 }
@@ -369,6 +373,7 @@ pub struct FinishedApplication {
     pub signal_rx: SignalRx,
     pub topology_controller: SharedTopologyController,
     pub openssl_providers: Option<Vec<Provider>>,
+    pub internal_topologies: Vec<RunningTopology>,
 }
 
 impl FinishedApplication {
@@ -378,6 +383,7 @@ impl FinishedApplication {
             signal_rx,
             topology_controller,
             openssl_providers,
+            internal_topologies,
         } = self;
 
         // At this point, we'll have the only reference to the shared topology controller and can
@@ -392,6 +398,11 @@ impl FinishedApplication {
             SignalTo::Quit => Self::quit(),
             _ => unreachable!(),
         };
+
+        for topology in internal_topologies {
+            topology.stop().await;
+        }
+
         drop(openssl_providers);
         status
     }
diff --git a/src/components/validation/runner/mod.rs b/src/components/validation/runner/mod.rs
index f38bdc75a3f41..cce737e9358be 100644
--- a/src/components/validation/runner/mod.rs
+++ b/src/components/validation/runner/mod.rs
@@ -24,8 +24,8 @@ use vector_core::{event::Event, EstimatedJsonEncodedSizeOf};
 use crate::{
     codecs::Encoder,
     components::validation::{RunnerMetrics, TestCase},
-    config::{ConfigBuilder, ConfigDiff},
-    topology,
+    config::ConfigBuilder,
+    topology::RunningTopology,
 };
 
 use super::{
@@ -471,7 +471,6 @@ fn spawn_component_topology(
         .build()
         .expect("config should not have any errors");
     config.healthchecks.set_require_healthy(Some(true));
-    let config_diff = ConfigDiff::initial(&config);
 
     _ = std::thread::spawn(move || {
         let test_runtime = Builder::new_current_thread()
@@ -482,13 +481,8 @@ fn spawn_component_topology(
         test_runtime.block_on(async move {
             debug!("Building component topology...");
 
-            let pieces = topology::build_or_log_errors(&config, &config_diff, HashMap::new())
-                .await
-                .unwrap();
-            let (topology, (_, mut crash_rx)) =
-                topology::start_validated(config, config_diff, pieces)
-                    .await
-                    .unwrap();
+            let (topology, mut crash_rx) =
+                RunningTopology::start_init_validated(config).await.unwrap();
 
             debug!("Component topology built and spawned.");
             topology_started.mark_as_done();
diff --git a/src/config/mod.rs b/src/config/mod.rs
index c65de18da77d4..23b6bf45bafb4 100644
--- a/src/config/mod.rs
+++ b/src/config/mod.rs
@@ -566,7 +566,7 @@ mod tests {
                 let c2 = config::load_from_str(config, format).unwrap();
                 match (
                     config::warnings(&c2),
-                    topology::builder::build_pieces(&c, &diff, HashMap::new()).await,
+                    topology::TopologyPieces::build(&c, &diff, HashMap::new()).await,
                 ) {
                     (warnings, Ok(_pieces)) => Ok(warnings),
                     (_, Err(errors)) => Err(errors),
diff --git a/src/config/unit_test/mod.rs b/src/config/unit_test/mod.rs
index f61917d336835..4727ee6479615 100644
--- a/src/config/unit_test/mod.rs
+++ b/src/config/unit_test/mod.rs
@@ -29,16 +29,13 @@ use crate::{
     },
     event::{Event, LogEvent, Value},
     signal,
-    topology::{
-        self,
-        builder::{self, Pieces},
-    },
+    topology::{builder::TopologyPieces, RunningTopology},
 };
 
 pub struct UnitTest {
     pub name: String,
     config: Config,
-    pieces: Pieces,
+    pieces: TopologyPieces,
     test_result_rxs: Vec<Receiver<UnitTestSinkResult>>,
 }
 
@@ -49,7 +46,7 @@ pub struct UnitTestResult {
 impl UnitTest {
     pub async fn run(self) -> UnitTestResult {
         let diff = config::ConfigDiff::initial(&self.config);
-        let (topology, _) = topology::start_validated(self.config, diff, self.pieces)
+        let (topology, _) = RunningTopology::start_validated(self.config, diff, self.pieces)
             .await
             .unwrap();
         topology.sources_finished().await;
@@ -422,7 +419,7 @@ async fn build_unit_test(
     }
     let config = config_builder.build()?;
     let diff = config::ConfigDiff::initial(&config);
-    let pieces = builder::build_pieces(&config, &diff, HashMap::new()).await?;
+    let pieces = TopologyPieces::build(&config, &diff, HashMap::new()).await?;
 
     Ok(UnitTest {
         name: test.name,
diff --git a/src/sinks/datadog/traces/apm_stats/integration_tests.rs b/src/sinks/datadog/traces/apm_stats/integration_tests.rs
index 50c49066d9dfa..fbd2eb6d19b41 100644
--- a/src/sinks/datadog/traces/apm_stats/integration_tests.rs
+++ b/src/sinks/datadog/traces/apm_stats/integration_tests.rs
@@ -16,11 +16,10 @@ use tokio::time::{sleep, Duration};
 
 use crate::{
     config::ConfigBuilder,
-    signal::ShutdownError,
     sinks::datadog::traces::{apm_stats::StatsPayload, DatadogTracesConfig},
     sources::datadog_agent::DatadogAgentConfig,
     test_util::{start_topology, trace_init},
-    topology::RunningTopology,
+    topology::{RunningTopology, ShutdownErrorReceiver},
 };
 
 /// The port on which the Agent will send traces to vector, and vector `datadog_agent` source will
@@ -320,13 +319,7 @@ fn validate_stats(agent_stats: &StatsPayload, vector_stats: &StatsPayload) {
 /// This creates a scenario where the stats payload that is output by the sink after processing the
 /// *second* batch of events (the second event) *should* contain the aggregated statistics of both
 /// of the trace events. i.e , the hit count for that bucket should be equal to "2" , not "1".
-async fn start_vector() -> (
-    RunningTopology,
-    (
-        tokio::sync::mpsc::UnboundedSender<ShutdownError>,
-        tokio::sync::mpsc::UnboundedReceiver<ShutdownError>,
-    ),
-) {
+async fn start_vector() -> (RunningTopology, ShutdownErrorReceiver) {
     let dd_agent_address = format!("0.0.0.0:{}", vector_receive_port());
 
     let source_config = toml::from_str::<DatadogAgentConfig>(&format!(
diff --git a/src/test_util/mod.rs b/src/test_util/mod.rs
index 655e872f9fe52..b91c2ffb0dd97 100644
--- a/src/test_util/mod.rs
+++ b/src/test_util/mod.rs
@@ -40,9 +40,8 @@ use vector_core::event::{BatchNotifier, Event, EventArray, LogEvent};
 use zstd::Decoder as ZstdDecoder;
 
 use crate::{
-    config::{Config, ConfigDiff, GenerateConfig},
-    signal::ShutdownError,
-    topology::{self, RunningTopology},
+    config::{Config, GenerateConfig},
+    topology::{RunningTopology, ShutdownErrorReceiver},
     trace,
 };
 
@@ -681,21 +680,9 @@ impl CountReceiver<Event> {
 pub async fn start_topology(
     mut config: Config,
     require_healthy: impl Into<Option<bool>>,
-) -> (
-    RunningTopology,
-    (
-        tokio::sync::mpsc::UnboundedSender<ShutdownError>,
-        tokio::sync::mpsc::UnboundedReceiver<ShutdownError>,
-    ),
-) {
+) -> (RunningTopology, ShutdownErrorReceiver) {
     config.healthchecks.set_require_healthy(require_healthy);
-    let diff = ConfigDiff::initial(&config);
-    let pieces = topology::build_or_log_errors(&config, &diff, HashMap::new())
-        .await
-        .unwrap();
-    topology::start_validated(config, diff, pieces)
-        .await
-        .unwrap()
+    RunningTopology::start_init_validated(config).await.unwrap()
 }
 
 /// Collect the first `n` events from a stream while a future is spawned
diff --git a/src/topology/builder.rs b/src/topology/builder.rs
index 9215848d6c224..4f74b202325e2 100644
--- a/src/topology/builder.rs
+++ b/src/topology/builder.rs
@@ -41,8 +41,8 @@ use super::{
 };
 use crate::{
     config::{
-        ComponentKey, DataType, EnrichmentTableConfig, Input, Inputs, OutputId, ProxyConfig,
-        SinkContext, SourceContext, TransformContext, TransformOuter, TransformOutput,
+        ComponentKey, Config, DataType, EnrichmentTableConfig, Input, Inputs, OutputId,
+        ProxyConfig, SinkContext, SourceContext, TransformContext, TransformOuter, TransformOutput,
     },
     event::{EventArray, EventContainer},
     internal_events::EventsReceived,
@@ -73,15 +73,6 @@ static TRANSFORM_CONCURRENCY_LIMIT: Lazy<usize> = Lazy::new(|| {
 
 const INTERNAL_SOURCES: [&str; 2] = ["internal_logs", "internal_metrics"];
 
-/// Builds only the new pieces, and doesn't check their topology.
-pub async fn build_pieces(
-    config: &super::Config,
-    diff: &ConfigDiff,
-    buffers: HashMap<ComponentKey, BuiltBuffer>,
-) -> Result<Pieces, Vec<String>> {
-    Builder::new(config, diff, buffers).build().await
-}
-
 struct Builder<'a> {
     config: &'a super::Config,
     diff: &'a ConfigDiff,
@@ -116,7 +107,7 @@ impl<'a> Builder<'a> {
     }
 
     /// Builds the new pieces of the topology found in `self.diff`.
-    async fn build(mut self) -> Result<Pieces, Vec<String>> {
+    async fn build(mut self) -> Result<TopologyPieces, Vec<String>> {
         let enrichment_tables = self.load_enrichment_tables().await;
         let source_tasks = self.build_sources().await;
         self.build_transforms(enrichment_tables).await;
@@ -127,7 +118,7 @@ impl<'a> Builder<'a> {
         enrichment_tables.finish_load();
 
         if self.errors.is_empty() {
-            Ok(Pieces {
+            Ok(TopologyPieces {
                 inputs: self.inputs,
                 outputs: Self::finalize_outputs(self.outputs),
                 tasks: self.tasks,
@@ -677,7 +668,7 @@ impl<'a> Builder<'a> {
     }
 }
 
-pub struct Pieces {
+pub struct TopologyPieces {
     pub(super) inputs: HashMap<ComponentKey, (BufferSender<EventArray>, Inputs<OutputId>)>,
     pub(crate) outputs: HashMap<ComponentKey, HashMap<Option<String>, fanout::ControlChannel>>,
     pub(super) tasks: HashMap<ComponentKey, Task>,
@@ -687,6 +678,33 @@ pub struct Pieces {
     pub(crate) detach_triggers: HashMap<ComponentKey, Trigger>,
 }
 
+impl TopologyPieces {
+    pub async fn build_or_log_errors(
+        config: &Config,
+        diff: &ConfigDiff,
+        buffers: HashMap<ComponentKey, BuiltBuffer>,
+    ) -> Option<Self> {
+        match TopologyPieces::build(config, diff, buffers).await {
+            Err(errors) => {
+                for error in errors {
+                    error!(message = "Configuration error.", %error);
+                }
+                None
+            }
+            Ok(new_pieces) => Some(new_pieces),
+        }
+    }
+
+    /// Builds only the new pieces, and doesn't check their topology.
+    pub async fn build(
+        config: &super::Config,
+        diff: &ConfigDiff,
+        buffers: HashMap<ComponentKey, BuiltBuffer>,
+    ) -> Result<Self, Vec<String>> {
+        Builder::new(config, diff, buffers).build().await
+    }
+}
+
 const fn filter_events_type(events: &EventArray, data_type: DataType) -> bool {
     match events {
         EventArray::Logs(_) => data_type.contains(DataType::Log),
diff --git a/src/topology/mod.rs b/src/topology/mod.rs
index 2b3991914cd8a..06adb8d63bd39 100644
--- a/src/topology/mod.rs
+++ b/src/topology/mod.rs
@@ -25,21 +25,21 @@ use std::{
     sync::{Arc, Mutex},
 };
 
-pub use controller::{ReloadOutcome, SharedTopologyController, TopologyController};
 use futures::{Future, FutureExt};
-pub(super) use running::RunningTopology;
 use tokio::sync::{mpsc, watch};
 use vector_buffers::topology::channel::{BufferReceiverStream, BufferSender};
 
+pub use self::builder::TopologyPieces;
+pub use self::controller::{ReloadOutcome, SharedTopologyController, TopologyController};
+pub use self::running::{RunningTopology, ShutdownErrorReceiver};
+
+use self::task::{Task, TaskError, TaskResult};
 use crate::{
     config::{ComponentKey, Config, ConfigDiff, Inputs, OutputId},
     event::EventArray,
     signal::ShutdownError,
-    topology::{builder::Pieces, task::Task},
 };
 
-use self::task::{TaskError, TaskResult};
-
 type TaskHandle = tokio::task::JoinHandle<TaskResult>;
 
 type BuiltBuffer = (
@@ -75,77 +75,9 @@ pub struct TapResource {
 type WatchTx = watch::Sender<TapResource>;
 pub type WatchRx = watch::Receiver<TapResource>;
 
-pub async fn start_validated(
-    config: Config,
-    diff: ConfigDiff,
-    mut pieces: Pieces,
-) -> Option<(
-    RunningTopology,
-    (
-        mpsc::UnboundedSender<ShutdownError>,
-        mpsc::UnboundedReceiver<ShutdownError>,
-    ),
-)> {
-    let (abort_tx, abort_rx) = mpsc::unbounded_channel();
-
-    let expire_metrics = match (
-        config.global.expire_metrics,
-        config.global.expire_metrics_secs,
-    ) {
-        (Some(e), None) => {
-            warn!(
-                "DEPRECATED: `expire_metrics` setting is deprecated and will be removed in a future version. Use `expire_metrics_secs` instead."
-            );
-            Some(e.as_secs_f64())
-        }
-        (Some(_), Some(_)) => {
-            error!("Cannot set both `expire_metrics` and `expire_metrics_secs`.");
-            return None;
-        }
-        (None, e) => e,
-    };
-
-    if let Err(error) = crate::metrics::Controller::get()
-        .expect("Metrics must be initialized")
-        .set_expiry(expire_metrics)
-    {
-        error!(message = "Invalid metrics expiry.", %error);
-        return None;
-    }
-
-    let mut running_topology = RunningTopology::new(config, abort_tx.clone());
-
-    if !running_topology
-        .run_healthchecks(&diff, &mut pieces, running_topology.config.healthchecks)
-        .await
-    {
-        return None;
-    }
-    running_topology.connect_diff(&diff, &mut pieces).await;
-    running_topology.spawn_diff(&diff, pieces);
-
-    Some((running_topology, (abort_tx, abort_rx)))
-}
-
-pub async fn build_or_log_errors(
-    config: &Config,
-    diff: &ConfigDiff,
-    buffers: HashMap<ComponentKey, BuiltBuffer>,
-) -> Option<Pieces> {
-    match builder::build_pieces(config, diff, buffers).await {
-        Err(errors) => {
-            for error in errors {
-                error!(message = "Configuration error.", %error);
-            }
-            None
-        }
-        Ok(new_pieces) => Some(new_pieces),
-    }
-}
-
 pub(super) fn take_healthchecks(
     diff: &ConfigDiff,
-    pieces: &mut Pieces,
+    pieces: &mut TopologyPieces,
 ) -> Vec<(ComponentKey, Task)> {
     (&diff.sinks.to_change | &diff.sinks.to_add)
         .into_iter()
diff --git a/src/topology/running.rs b/src/topology/running.rs
index bb300dd7e5652..c068dfe73664b 100644
--- a/src/topology/running.rs
+++ b/src/topology/running.rs
@@ -15,23 +15,24 @@ use tracing::Instrument;
 use vector_buffers::topology::channel::BufferSender;
 use vector_common::trigger::DisabledTrigger;
 
-use super::{TapOutput, TapResource};
+use super::{
+    builder,
+    builder::TopologyPieces,
+    fanout::{ControlChannel, ControlMessage},
+    handle_errors, retain, take_healthchecks,
+    task::TaskOutput,
+    BuiltBuffer, TapOutput, TapResource, TaskHandle, WatchRx, WatchTx,
+};
 use crate::{
     config::{ComponentKey, Config, ConfigDiff, HealthcheckOptions, Inputs, OutputId, Resource},
     event::EventArray,
     shutdown::SourceShutdownCoordinator,
     signal::ShutdownError,
     spawn_named,
-    topology::{
-        build_or_log_errors, builder,
-        builder::Pieces,
-        fanout::{ControlChannel, ControlMessage},
-        handle_errors, retain, take_healthchecks,
-        task::TaskOutput,
-        BuiltBuffer, TaskHandle, WatchRx, WatchTx,
-    },
 };
 
+pub type ShutdownErrorReceiver = mpsc::UnboundedReceiver<ShutdownError>;
+
 #[allow(dead_code)]
 pub struct RunningTopology {
     inputs: HashMap<ComponentKey, BufferSender<EventArray>>,
@@ -43,7 +44,7 @@ pub struct RunningTopology {
     shutdown_coordinator: SourceShutdownCoordinator,
     detach_triggers: HashMap<ComponentKey, DisabledTrigger>,
     pub(crate) config: Config,
-    abort_tx: mpsc::UnboundedSender<ShutdownError>,
+    pub(crate) abort_tx: mpsc::UnboundedSender<ShutdownError>,
     watch: (WatchTx, WatchRx),
     pub(crate) running: Arc<AtomicBool>,
     graceful_shutdown_duration: Option<Duration>,
@@ -248,7 +249,8 @@ impl RunningTopology {
         // Try to build all of the new components coming from the new configuration.  If we can
         // successfully build them, we'll attempt to connect them up to the topology and spawn their
         // respective component tasks.
-        if let Some(mut new_pieces) = build_or_log_errors(&new_config, &diff, buffers.clone()).await
+        if let Some(mut new_pieces) =
+            TopologyPieces::build_or_log_errors(&new_config, &diff, buffers.clone()).await
         {
             // If healthchecks are configured for any of the changing/new components, try running
             // them before moving forward with connecting and spawning.  In some cases, healthchecks
@@ -273,7 +275,9 @@ impl RunningTopology {
         warn!("Failed to completely load new configuration. Restoring old configuration.");
 
         let diff = diff.flip();
-        if let Some(mut new_pieces) = build_or_log_errors(&self.config, &diff, buffers).await {
+        if let Some(mut new_pieces) =
+            TopologyPieces::build_or_log_errors(&self.config, &diff, buffers).await
+        {
             if self
                 .run_healthchecks(&diff, &mut new_pieces, self.config.healthchecks)
                 .await
@@ -295,7 +299,7 @@ impl RunningTopology {
     pub(crate) async fn run_healthchecks(
         &mut self,
         diff: &ConfigDiff,
-        pieces: &mut Pieces,
+        pieces: &mut TopologyPieces,
         options: HealthcheckOptions,
     ) -> bool {
         if options.enabled {
@@ -527,7 +531,11 @@ impl RunningTopology {
     }
 
     /// Connects all changed/added components in the given configuration diff.
-    pub(crate) async fn connect_diff(&mut self, diff: &ConfigDiff, new_pieces: &mut Pieces) {
+    pub(crate) async fn connect_diff(
+        &mut self,
+        diff: &ConfigDiff,
+        new_pieces: &mut TopologyPieces,
+    ) {
         debug!("Connecting changed/added component(s).");
 
         // Update tap metadata
@@ -654,7 +662,11 @@ impl RunningTopology {
         }
     }
 
-    async fn setup_outputs(&mut self, key: &ComponentKey, new_pieces: &mut builder::Pieces) {
+    async fn setup_outputs(
+        &mut self,
+        key: &ComponentKey,
+        new_pieces: &mut builder::TopologyPieces,
+    ) {
         let outputs = new_pieces.outputs.remove(key).unwrap();
         for (port, output) in outputs {
             debug!(component = %key, output_id = ?port, "Configuring output for component.");
@@ -672,7 +684,7 @@ impl RunningTopology {
         &mut self,
         key: &ComponentKey,
         diff: &ConfigDiff,
-        new_pieces: &mut builder::Pieces,
+        new_pieces: &mut builder::TopologyPieces,
     ) {
         let (tx, inputs) = new_pieces.inputs.remove(key).unwrap();
 
@@ -794,7 +806,7 @@ impl RunningTopology {
     }
 
     /// Starts any new or changed components in the given configuration diff.
-    pub(crate) fn spawn_diff(&mut self, diff: &ConfigDiff, mut new_pieces: Pieces) {
+    pub(crate) fn spawn_diff(&mut self, diff: &ConfigDiff, mut new_pieces: TopologyPieces) {
         for key in &diff.sources.to_change {
             debug!(message = "Spawning changed source.", key = %key);
             self.spawn_source(key, &mut new_pieces);
@@ -826,7 +838,7 @@ impl RunningTopology {
         }
     }
 
-    fn spawn_sink(&mut self, key: &ComponentKey, new_pieces: &mut builder::Pieces) {
+    fn spawn_sink(&mut self, key: &ComponentKey, new_pieces: &mut builder::TopologyPieces) {
         let task = new_pieces.tasks.remove(key).unwrap();
         let span = error_span!(
             "sink",
@@ -869,7 +881,7 @@ impl RunningTopology {
         }
     }
 
-    fn spawn_transform(&mut self, key: &ComponentKey, new_pieces: &mut builder::Pieces) {
+    fn spawn_transform(&mut self, key: &ComponentKey, new_pieces: &mut builder::TopologyPieces) {
         let task = new_pieces.tasks.remove(key).unwrap();
         let span = error_span!(
             "transform",
@@ -912,7 +924,7 @@ impl RunningTopology {
         }
     }
 
-    fn spawn_source(&mut self, key: &ComponentKey, new_pieces: &mut builder::Pieces) {
+    fn spawn_source(&mut self, key: &ComponentKey, new_pieces: &mut builder::TopologyPieces) {
         let task = new_pieces.tasks.remove(key).unwrap();
         let span = error_span!(
             "source",
@@ -970,6 +982,58 @@ impl RunningTopology {
         self.source_tasks
             .insert(key.clone(), spawn_named(source_task, task_name.as_ref()));
     }
+
+    pub async fn start_init_validated(config: Config) -> Option<(Self, ShutdownErrorReceiver)> {
+        let diff = ConfigDiff::initial(&config);
+        let pieces = TopologyPieces::build_or_log_errors(&config, &diff, HashMap::new()).await?;
+        Self::start_validated(config, diff, pieces).await
+    }
+
+    pub async fn start_validated(
+        config: Config,
+        diff: ConfigDiff,
+        mut pieces: TopologyPieces,
+    ) -> Option<(Self, ShutdownErrorReceiver)> {
+        let (abort_tx, abort_rx) = mpsc::unbounded_channel();
+
+        let expire_metrics = match (
+            config.global.expire_metrics,
+            config.global.expire_metrics_secs,
+        ) {
+            (Some(e), None) => {
+                warn!(
+                "DEPRECATED: `expire_metrics` setting is deprecated and will be removed in a future version. Use `expire_metrics_secs` instead."
+            );
+                Some(e.as_secs_f64())
+            }
+            (Some(_), Some(_)) => {
+                error!("Cannot set both `expire_metrics` and `expire_metrics_secs`.");
+                return None;
+            }
+            (None, e) => e,
+        };
+
+        if let Err(error) = crate::metrics::Controller::get()
+            .expect("Metrics must be initialized")
+            .set_expiry(expire_metrics)
+        {
+            error!(message = "Invalid metrics expiry.", %error);
+            return None;
+        }
+
+        let mut running_topology = Self::new(config, abort_tx);
+
+        if !running_topology
+            .run_healthchecks(&diff, &mut pieces, running_topology.config.healthchecks)
+            .await
+        {
+            return None;
+        }
+        running_topology.connect_diff(&diff, &mut pieces).await;
+        running_topology.spawn_diff(&diff, pieces);
+
+        Some((running_topology, abort_rx))
+    }
 }
 
 fn get_changed_outputs(diff: &ConfigDiff, output_ids: Inputs<OutputId>) -> Vec<OutputId> {
diff --git a/src/topology/test/crash.rs b/src/topology/test/crash.rs
index 254dce3662fb8..21ce692d1a89c 100644
--- a/src/topology/test/crash.rs
+++ b/src/topology/test/crash.rs
@@ -33,7 +33,7 @@ async fn test_source_error() {
 
     let mut output_lines = CountReceiver::receive_lines(out_addr);
 
-    let (topology, (_, crash)) = start_topology(config.build().unwrap(), false).await;
+    let (topology, crash) = start_topology(config.build().unwrap(), false).await;
 
     // Wait for our source to become ready to accept connections, and likewise, wait for our sink's target server to
     // receive its connection from the output sink.
@@ -78,7 +78,7 @@ async fn test_source_panic() {
     let mut output_lines = CountReceiver::receive_lines(out_addr);
 
     std::panic::set_hook(Box::new(|_| {})); // Suppress panic print on background thread
-    let (topology, (_, crash)) = start_topology(config.build().unwrap(), false).await;
+    let (topology, crash) = start_topology(config.build().unwrap(), false).await;
 
     // Wait for our source to become ready to accept connections, and likewise, wait for our sink's target server to
     // receive its connection from the output sink.
@@ -125,7 +125,7 @@ async fn test_sink_error() {
 
     let mut output_lines = CountReceiver::receive_lines(out_addr);
 
-    let (topology, (_, crash)) = start_topology(config.build().unwrap(), false).await;
+    let (topology, crash) = start_topology(config.build().unwrap(), false).await;
 
     // Wait for our sources to become ready to accept connections, and likewise, wait for our sink's target server to
     // receive its connection from the output sink.
@@ -174,7 +174,7 @@ async fn test_sink_panic() {
     let mut output_lines = CountReceiver::receive_lines(out_addr);
 
     std::panic::set_hook(Box::new(|_| {})); // Suppress panic print on background thread
-    let (topology, (_, crash)) = start_topology(config.build().unwrap(), false).await;
+    let (topology, crash) = start_topology(config.build().unwrap(), false).await;
 
     // Wait for our sources to become ready to accept connections, and likewise, wait for our sink's target server to
     // receive its connection from the output sink.
diff --git a/src/topology/test/end_to_end.rs b/src/topology/test/end_to_end.rs
index 75580479ed58c..e5e46fc87ac89 100644
--- a/src/topology/test/end_to_end.rs
+++ b/src/topology/test/end_to_end.rs
@@ -1,9 +1,5 @@
 use std::{collections::HashMap, net::SocketAddr, sync::Arc};
 
-use crate::{
-    config::{self, ConfigDiff, Format},
-    test_util, topology, Error,
-};
 use hyper::{
     service::{make_service_fn, service_fn},
     Body, Request, Response, Server, StatusCode,
@@ -14,6 +10,12 @@ use tokio::{
     time::{timeout, Duration},
 };
 
+use super::{RunningTopology, TopologyPieces};
+use crate::{
+    config::{self, ConfigDiff, Format},
+    test_util, Error,
+};
+
 type Lock = Arc<Mutex<()>>;
 
 pub async fn respond(
@@ -101,10 +103,10 @@ uri = "http://{address2}/"
     )
     .unwrap();
     let diff = ConfigDiff::initial(&config);
-    let pieces = topology::build_or_log_errors(&config, &diff, HashMap::new())
+    let pieces = TopologyPieces::build_or_log_errors(&config, &diff, HashMap::new())
         .await
         .unwrap();
-    let (_topology, _) = topology::start_validated(config, diff, pieces)
+    let (_topology, _) = RunningTopology::start_validated(config, diff, pieces)
         .await
         .unwrap();
 
diff --git a/src/topology/test/mod.rs b/src/topology/test/mod.rs
index 5519c173b3345..a17d42a5fce1a 100644
--- a/src/topology/test/mod.rs
+++ b/src/topology/test/mod.rs
@@ -19,7 +19,7 @@ use crate::{
         },
         start_topology, trace_init,
     },
-    topology::{self, builder},
+    topology::{RunningTopology, TopologyPieces},
 };
 use futures::{future, stream, StreamExt};
 use tokio::{
@@ -784,12 +784,7 @@ async fn topology_rebuild_connected_transform() {
 async fn topology_required_healthcheck_fails_start() {
     let mut config = basic_config_with_sink_failing_healthcheck();
     config.healthchecks.require_healthy = true;
-    let diff = ConfigDiff::initial(&config);
-    let pieces = topology::build_or_log_errors(&config, &diff, HashMap::new())
-        .await
-        .unwrap();
-
-    assert!(topology::start_validated(config, diff, pieces)
+    assert!(RunningTopology::start_init_validated(config)
         .await
         .is_none());
 }
@@ -797,11 +792,7 @@ async fn topology_required_healthcheck_fails_start() {
 #[tokio::test]
 async fn topology_optional_healthcheck_does_not_fail_start() {
     let config = basic_config_with_sink_failing_healthcheck();
-    let diff = ConfigDiff::initial(&config);
-    let pieces = topology::build_or_log_errors(&config, &diff, HashMap::new())
-        .await
-        .unwrap();
-    assert!(topology::start_validated(config, diff, pieces)
+    assert!(RunningTopology::start_init_validated(config)
         .await
         .is_some());
 }
@@ -915,7 +906,7 @@ async fn topology_transform_error_definition() {
 
     let config = config.build().unwrap();
     let diff = ConfigDiff::initial(&config);
-    let errors = match builder::build_pieces(&config, &diff, HashMap::new()).await {
+    let errors = match TopologyPieces::build(&config, &diff, HashMap::new()).await {
         Ok(_) => panic!("build pieces should not succeed"),
         Err(err) => err,
     };
diff --git a/src/topology/test/reload.rs b/src/topology/test/reload.rs
index 91cb9439c6106..165a93b52f1a1 100644
--- a/src/topology/test/reload.rs
+++ b/src/topology/test/reload.rs
@@ -250,7 +250,7 @@ async fn topology_readd_input() {
     old_config.add_source("in1", internal_metrics_source());
     old_config.add_source("in2", internal_metrics_source());
     old_config.add_sink("out", &["in1", "in2"], prom_exporter_sink(address_0, 1));
-    let (mut topology, (_, crash)) = start_topology(old_config.build().unwrap(), false).await;
+    let (mut topology, crash) = start_topology(old_config.build().unwrap(), false).await;
 
     // remove in2
     let mut new_config = Config::builder();
@@ -289,7 +289,7 @@ async fn reload_sink_test(
     new_address: SocketAddr,
 ) {
     // Start a topology from the "old" configuration, which should result in a component listening on `old_address`.
-    let (mut topology, (_, crash)) = start_topology(old_config, false).await;
+    let (mut topology, crash) = start_topology(old_config, false).await;
     let mut crash_stream = UnboundedReceiverStream::new(crash);
 
     wait_for_tcp(old_address).await;
diff --git a/src/validate.rs b/src/validate.rs
index bd35909e47822..7fe876c168857 100644
--- a/src/validate.rs
+++ b/src/validate.rs
@@ -8,7 +8,7 @@ use exitcode::ExitCode;
 
 use crate::{
     config::{self, Config, ConfigDiff},
-    topology::{self, builder::Pieces},
+    topology::{self, builder::TopologyPieces},
 };
 
 const TEMPORARY_DIRECTORY: &str = "validate_tmp";
@@ -185,8 +185,8 @@ async fn validate_components(
     config: &Config,
     diff: &ConfigDiff,
     fmt: &mut Formatter,
-) -> Option<Pieces> {
-    match topology::builder::build_pieces(config, diff, HashMap::new()).await {
+) -> Option<TopologyPieces> {
+    match topology::TopologyPieces::build(config, diff, HashMap::new()).await {
         Ok(pieces) => {
             fmt.success("Component configuration");
             Some(pieces)
@@ -203,7 +203,7 @@ async fn validate_healthchecks(
     opts: &Opts,
     config: &Config,
     diff: &ConfigDiff,
-    pieces: &mut Pieces,
+    pieces: &mut TopologyPieces,
     fmt: &mut Formatter,
 ) -> bool {
     if !config.healthchecks.enabled {

From 00c40d7cbe90287a0ee22ed2707576948a89cfff Mon Sep 17 00:00:00 2001
From: Bruce Guenter <bruce.guenter@datadoghq.com>
Date: Wed, 25 Oct 2023 09:29:05 -0600
Subject: [PATCH 09/28] chore(dev): Set up `vector-lib` wrapper crate with
 `vector-common` (#18927)

* Rationalize imports in vector-core

* chore(deps): Set up unified `vector-lib` crate for re-exporting symbols

* Move `vector_common`
---
 Cargo.lock                                    |   9 +-
 Cargo.toml                                    |   3 +-
 lib/vector-core/src/config/output_id.rs       |   3 +-
 lib/vector-core/src/event/array.rs            |   2 +-
 lib/vector-core/src/event/log_event.rs        |  13 +-
 lib/vector-core/src/event/lua/event.rs        |   4 +-
 lib/vector-core/src/event/lua/log.rs          |   2 +-
 lib/vector-core/src/event/lua/metric.rs       |  14 +-
 lib/vector-core/src/event/merge_state.rs      |   5 +-
 lib/vector-core/src/event/metadata.rs         |   4 +-
 lib/vector-core/src/event/metric/mod.rs       |  12 +-
 lib/vector-core/src/event/metric/series.rs    |   3 +-
 lib/vector-core/src/event/mod.rs              |   5 +-
 lib/vector-core/src/event/proto.rs            | 162 +++++++++---------
 lib/vector-core/src/event/test/common.rs      |  16 +-
 lib/vector-core/src/event/test/size_of.rs     |   3 +-
 lib/vector-core/src/event/trace.rs            |   5 +-
 lib/vector-core/src/event/vrl_target.rs       |   3 +-
 lib/vector-core/src/schema/definition.rs      |   3 +-
 lib/vector-lib/Cargo.toml                     |   9 +
 lib/vector-lib/src/lib.rs                     |   6 +
 lib/vrl/value/Cargo.toml                      |  42 -----
 src/api/schema/events/log.rs                  |   2 +-
 src/api/schema/events/metric.rs               |   2 +-
 src/api/schema/events/trace.rs                |   2 +-
 src/aws/auth.rs                               |   2 +-
 src/codecs/decoding/config.rs                 |   2 +-
 src/codecs/encoding/transformer.rs            |   2 +-
 src/components/validation/resources/http.rs   |   4 +-
 src/components/validation/resources/mod.rs    |   6 +-
 src/components/validation/runner/io.rs        |   2 +-
 src/components/validation/runner/mod.rs       |   4 +-
 src/conditions/vrl.rs                         |   2 +-
 src/config/loading/secret.rs                  |   2 +-
 src/config/mod.rs                             |   2 +-
 src/enrichment_tables/file.rs                 |   2 +-
 src/gcp.rs                                    |   2 +-
 src/http.rs                                   |   2 +-
 src/internal_events/adaptive_concurrency.rs   |   2 +-
 src/internal_events/amqp.rs                   |   6 +-
 src/internal_events/apache_metrics.rs         |   4 +-
 src/internal_events/aws.rs                    |   2 +-
 src/internal_events/aws_cloudwatch_logs.rs    |   4 +-
 src/internal_events/aws_ec2_metadata.rs       |   2 +-
 src/internal_events/aws_ecs_metrics.rs        |   4 +-
 src/internal_events/aws_kinesis.rs            |   4 +-
 src/internal_events/aws_kinesis_firehose.rs   |   2 +-
 src/internal_events/aws_sqs.rs                |   2 +-
 src/internal_events/batch.rs                  |   4 +-
 src/internal_events/codecs.rs                 |   4 +-
 src/internal_events/common.rs                 |   4 +-
 src/internal_events/conditions.rs             |   2 +-
 src/internal_events/datadog_metrics.rs        |   4 +-
 src/internal_events/datadog_traces.rs         |   4 +-
 src/internal_events/dnstap.rs                 |   2 +-
 src/internal_events/docker_logs.rs            |   4 +-
 src/internal_events/eventstoredb_metrics.rs   |   2 +-
 src/internal_events/exec.rs                   |   4 +-
 src/internal_events/file.rs                   |   4 +-
 src/internal_events/file_descriptor.rs        |   2 +-
 src/internal_events/filter.rs                 |   4 +-
 src/internal_events/fluent.rs                 |   2 +-
 src/internal_events/gcp_pubsub.rs             |   2 +-
 src/internal_events/grpc.rs                   |   2 +-
 src/internal_events/host_metrics.rs           |   2 +-
 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               |   4 +-
 src/internal_events/internal_logs.rs          |   2 +-
 src/internal_events/journald.rs               |   2 +-
 src/internal_events/kafka.rs                  |   2 +-
 src/internal_events/kubernetes_logs.rs        |   2 +-
 src/internal_events/log_to_metric.rs          |   4 +-
 src/internal_events/logplex.rs                |   2 +-
 src/internal_events/loki.rs                   |   2 +-
 src/internal_events/lua.rs                    |   4 +-
 src/internal_events/metric_to_log.rs          |   4 +-
 src/internal_events/mod.rs                    |   8 +-
 src/internal_events/mongodb_metrics.rs        |   2 +-
 src/internal_events/nginx_metrics.rs          |   2 +-
 src/internal_events/parser.rs                 |   4 +-
 src/internal_events/postgresql_metrics.rs     |   2 +-
 src/internal_events/process.rs                |   2 +-
 src/internal_events/prometheus.rs             |   4 +-
 src/internal_events/pulsar.rs                 |   6 +-
 src/internal_events/redis.rs                  |   2 +-
 src/internal_events/remap.rs                  |   2 +-
 src/internal_events/sematext_metrics.rs       |   4 +-
 src/internal_events/socket.rs                 |   4 +-
 src/internal_events/splunk_hec.rs             |   6 +-
 src/internal_events/statsd_sink.rs            |   4 +-
 src/internal_events/tcp.rs                    |   2 +-
 src/internal_events/template.rs               |   2 +-
 src/internal_events/udp.rs                    |   4 +-
 src/internal_events/unix.rs                   |   4 +-
 src/internal_events/websocket.rs              |   2 +-
 src/internal_events/windows.rs                |   2 +-
 src/kafka.rs                                  |   2 +-
 src/lib.rs                                    |   2 +-
 src/nats.rs                                   |   2 +-
 src/sinks/appsignal/config.rs                 |   2 +-
 src/sinks/appsignal/encoder.rs                |   2 +-
 src/sinks/appsignal/request_builder.rs        |   4 +-
 src/sinks/appsignal/service.rs                |   2 +-
 .../aws_cloudwatch_logs/request_builder.rs    |   2 +-
 src/sinks/aws_cloudwatch_logs/service.rs      |   2 +-
 src/sinks/aws_cloudwatch_logs/sink.rs         |   2 +-
 src/sinks/aws_kinesis/request_builder.rs      |   2 +-
 src/sinks/aws_s3/sink.rs                      |   2 +-
 src/sinks/aws_s_s/request_builder.rs          |   2 +-
 src/sinks/aws_s_s/service.rs                  |   2 +-
 src/sinks/axiom.rs                            |   2 +-
 src/sinks/azure_blob/config.rs                |   2 +-
 src/sinks/azure_blob/request_builder.rs       |   2 +-
 src/sinks/azure_blob/test.rs                  |   2 +-
 src/sinks/azure_common/config.rs              |   2 +-
 src/sinks/azure_monitor_logs/config.rs        |   2 +-
 src/sinks/blackhole/sink.rs                   |   4 +-
 src/sinks/databend/integration_tests.rs       |   2 +-
 src/sinks/databend/request_builder.rs         |   4 +-
 src/sinks/databend/service.rs                 |   4 +-
 src/sinks/datadog/events/request_builder.rs   |   2 +-
 src/sinks/datadog/events/service.rs           |   2 +-
 src/sinks/datadog/logs/service.rs             |   2 +-
 src/sinks/datadog/metrics/encoder.rs          |   2 +-
 src/sinks/datadog/metrics/request_builder.rs  |   2 +-
 src/sinks/datadog/metrics/service.rs          |   2 +-
 src/sinks/datadog/mod.rs                      |   2 +-
 src/sinks/datadog/traces/apm_stats/flusher.rs |   2 +-
 src/sinks/datadog/traces/request_builder.rs   |   2 +-
 src/sinks/datadog/traces/service.rs           |   2 +-
 src/sinks/elasticsearch/encoder.rs            |   4 +-
 src/sinks/elasticsearch/mod.rs                |   2 +-
 src/sinks/elasticsearch/request_builder.rs    |   2 +-
 src/sinks/elasticsearch/retry.rs              |   2 +-
 src/sinks/elasticsearch/service.rs            |   4 +-
 src/sinks/gcp/chronicle_unstructured.rs       |   2 +-
 src/sinks/gcp/cloud_storage.rs                |   4 +-
 src/sinks/gcs_common/service.rs               |   2 +-
 src/sinks/greptimedb/mod.rs                   |   2 +-
 src/sinks/honeycomb/config.rs                 |   2 +-
 src/sinks/honeycomb/service.rs                |   2 +-
 src/sinks/humio/logs.rs                       |   2 +-
 src/sinks/humio/metrics.rs                    |   2 +-
 src/sinks/influxdb/mod.rs                     |   2 +-
 src/sinks/loki/integration_tests.rs           |   2 +-
 src/sinks/mezmo.rs                            |   2 +-
 src/sinks/new_relic/config.rs                 |   2 +-
 src/sinks/new_relic/encoding.rs               |   2 +-
 src/sinks/new_relic/model.rs                  |   2 +-
 src/sinks/prelude.rs                          |  12 +-
 src/sinks/prometheus/exporter.rs              |   8 +-
 src/sinks/prometheus/mod.rs                   |   2 +-
 src/sinks/prometheus/remote_write/sink.rs     |   2 +-
 src/sinks/pulsar/config.rs                    |   2 +-
 src/sinks/pulsar/encoder.rs                   |   2 +-
 src/sinks/redis/tests.rs                      |   2 +-
 src/sinks/s3_common/service.rs                |   2 +-
 src/sinks/sematext/logs.rs                    |   2 +-
 src/sinks/sematext/metrics.rs                 |   2 +-
 src/sinks/splunk_hec/common/request.rs        |   2 +-
 src/sinks/splunk_hec/common/response.rs       |   2 +-
 src/sinks/splunk_hec/common/service.rs        |   4 +-
 src/sinks/splunk_hec/logs/config.rs           |   2 +-
 src/sinks/splunk_hec/logs/encoder.rs          |   2 +-
 src/sinks/splunk_hec/logs/request_builder.rs  |   2 +-
 src/sinks/splunk_hec/metrics/config.rs        |   2 +-
 src/sinks/splunk_hec/metrics/encoder.rs       |   2 +-
 .../splunk_hec/metrics/request_builder.rs     |   2 +-
 src/sinks/statsd/config.rs                    |   2 +-
 src/sinks/statsd/encoder.rs                   |  14 +-
 src/sinks/statsd/request_builder.rs           |   2 +-
 src/sinks/statsd/service.rs                   |   2 +-
 src/sinks/statsd/sink.rs                      |   2 +-
 .../util/adaptive_concurrency/controller.rs   |   2 +-
 src/sinks/util/adaptive_concurrency/tests.rs  |   2 +-
 src/sinks/util/batch.rs                       |   2 +-
 src/sinks/util/buffer/mod.rs                  |   2 +-
 src/sinks/util/encoding.rs                    |   4 +-
 src/sinks/util/metadata.rs                    |   2 +-
 src/sinks/util/mod.rs                         |   2 +-
 src/sinks/util/processed_event.rs             |   6 +-
 src/sinks/util/request_builder.rs             |   2 +-
 src/sinks/util/service.rs                     |   2 +-
 src/sinks/util/sink.rs                        |   4 +-
 src/sinks/util/socket_bytes_sink.rs           |   2 +-
 src/sinks/util/tcp.rs                         |   2 +-
 src/sinks/util/udp.rs                         |   4 +-
 src/sinks/util/unix.rs                        |   2 +-
 src/sinks/vector/service.rs                   |   2 +-
 src/sinks/vector/sink.rs                      |   2 +-
 src/sinks/webhdfs/test.rs                     |   2 +-
 src/source_sender/mod.rs                      |   2 +-
 src/sources/amqp.rs                           |  10 +-
 src/sources/apache_metrics/parser.rs          |   2 +-
 src/sources/aws_ecs_metrics/mod.rs            |   2 +-
 src/sources/aws_ecs_metrics/parser.rs         |   2 +-
 src/sources/aws_kinesis_firehose/filters.rs   |   2 +-
 src/sources/aws_kinesis_firehose/handlers.rs  |  12 +-
 src/sources/aws_kinesis_firehose/mod.rs       |   4 +-
 src/sources/aws_s3/sqs.rs                     |   4 +-
 src/sources/aws_sqs/source.rs                 |   4 +-
 src/sources/datadog_agent/logs.rs             |   2 +-
 src/sources/datadog_agent/metrics.rs          |   2 +-
 src/sources/datadog_agent/mod.rs              |   2 +-
 src/sources/datadog_agent/traces.rs           |   2 +-
 src/sources/demo_logs.rs                      |   6 +-
 src/sources/dnstap/mod.rs                     |   4 +-
 src/sources/docker_logs/mod.rs                |   6 +-
 src/sources/eventstoredb_metrics/mod.rs       |   6 +-
 src/sources/exec/mod.rs                       |   2 +-
 src/sources/file.rs                           |   2 +-
 src/sources/file_descriptors/mod.rs           |   6 +-
 src/sources/fluent/mod.rs                     |   2 +-
 src/sources/gcp_pubsub.rs                     |   8 +-
 src/sources/host_metrics/mod.rs               |   6 +-
 src/sources/http_server.rs                    |   2 +-
 src/sources/internal_metrics.rs               |   2 +-
 src/sources/journald.rs                       |  12 +-
 src/sources/kafka.rs                          |   2 +-
 src/sources/kubernetes_logs/mod.rs            |   6 +-
 src/sources/kubernetes_logs/parser/cri.rs     |   2 +-
 src/sources/nats.rs                           |   6 +-
 src/sources/opentelemetry/grpc.rs             |   2 +-
 src/sources/opentelemetry/http.rs             |   6 +-
 src/sources/opentelemetry/mod.rs              |   2 +-
 src/sources/postgresql_metrics.rs             |   8 +-
 src/sources/prometheus/parser.rs              |   2 +-
 src/sources/prometheus/remote_write.rs        |   4 +-
 src/sources/redis/mod.rs                      |   6 +-
 src/sources/socket/udp.rs                     |   2 +-
 src/sources/socket/unix.rs                    |   2 +-
 src/sources/splunk_hec/acknowledgements.rs    |   2 +-
 src/sources/splunk_hec/mod.rs                 |   6 +-
 src/sources/statsd/mod.rs                     |   2 +-
 src/sources/statsd/parser.rs                  |   4 +-
 src/sources/syslog.rs                         |   2 +-
 src/sources/util/grpc/decompression.rs        |   2 +-
 src/sources/util/http/auth.rs                 |   2 +-
 src/sources/util/http_client.rs               |   4 +-
 src/sources/util/message_decoding.rs          |   4 +-
 src/sources/util/net/tcp/mod.rs               |   2 +-
 src/sources/util/unix_datagram.rs             |   2 +-
 src/sources/util/unix_stream.rs               |   2 +-
 src/sources/vector/mod.rs                     |   4 +-
 src/test_util/mock/sinks/basic.rs             |   2 +-
 src/topology/builder.rs                       |   6 +-
 src/topology/running.rs                       |   2 +-
 src/topology/test/compliance.rs               |   2 +-
 src/topology/test/mod.rs                      |   2 +-
 src/transforms/aggregate.rs                   |   2 +-
 src/transforms/aws_ec2_metadata.rs            |   2 +-
 src/transforms/dedupe.rs                      |   2 +-
 src/transforms/filter.rs                      |   4 +-
 src/transforms/log_to_metric.rs               |   2 +-
 src/transforms/metric_to_log.rs               |   4 +-
 src/transforms/remap.rs                       |   2 +-
 src/transforms/tag_cardinality_limit/tests.rs |   2 +-
 src/types.rs                                  |   2 +-
 260 files changed, 488 insertions(+), 552 deletions(-)
 create mode 100644 lib/vector-lib/Cargo.toml
 create mode 100644 lib/vector-lib/src/lib.rs
 delete mode 100644 lib/vrl/value/Cargo.toml

diff --git a/Cargo.lock b/Cargo.lock
index 389d7355930c5..6ab6f9f1eb7ba 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -9866,11 +9866,11 @@ dependencies = [
  "uuid",
  "vector-api-client",
  "vector-buffers",
- "vector-common",
  "vector-config",
  "vector-config-common",
  "vector-config-macros",
  "vector-core",
+ "vector-lib",
  "vector-lookup",
  "vector-stream",
  "vector-vrl-functions",
@@ -10114,6 +10114,13 @@ dependencies = [
  "vrl",
 ]
 
+[[package]]
+name = "vector-lib"
+version = "0.1.0"
+dependencies = [
+ "vector-common",
+]
+
 [[package]]
 name = "vector-lookup"
 version = "0.1.0"
diff --git a/Cargo.toml b/Cargo.toml
index 3a5b607be302d..286900ecaf0ea 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -109,6 +109,7 @@ members = [
   "lib/vector-config-common",
   "lib/vector-config-macros",
   "lib/vector-core",
+  "lib/vector-lib",
   "lib/vector-lookup",
   "lib/vector-stream",
   "lib/vector-vrl/cli",
@@ -140,11 +141,11 @@ opentelemetry-proto = { path = "lib/opentelemetry-proto", optional = true }
 tracing-limit = { path = "lib/tracing-limit" }
 vector-api-client = { path = "lib/vector-api-client", optional = true }
 vector-buffers = { path = "lib/vector-buffers", default-features = false }
-vector-common = { path = "lib/vector-common" }
 vector-config = { path = "lib/vector-config" }
 vector-config-common = { path = "lib/vector-config-common" }
 vector-config-macros = { path = "lib/vector-config-macros" }
 vector-core = { path = "lib/vector-core", default-features = false, features = ["vrl"] }
+vector-lib = { path = "lib/vector-lib", default-features = false }
 vector-stream = { path = "lib/vector-stream" }
 vector-vrl-functions = { path = "lib/vector-vrl/functions" }
 loki-logproto = { path = "lib/loki-logproto", optional = true }
diff --git a/lib/vector-core/src/config/output_id.rs b/lib/vector-core/src/config/output_id.rs
index c4491e210a271..f2d8bc9d6b54d 100644
--- a/lib/vector-core/src/config/output_id.rs
+++ b/lib/vector-core/src/config/output_id.rs
@@ -2,7 +2,8 @@ use std::fmt;
 
 use vector_common::config::ComponentKey;
 
-use crate::{config::configurable_component, schema};
+use super::configurable_component;
+use crate::schema;
 
 /// Component output identifier.
 #[configurable_component]
diff --git a/lib/vector-core/src/event/array.rs b/lib/vector-core/src/event/array.rs
index f03d6393e8ac7..0519920ace4ff 100644
--- a/lib/vector-core/src/event/array.rs
+++ b/lib/vector-core/src/event/array.rs
@@ -9,6 +9,7 @@ use futures::{stream, Stream};
 use quickcheck::{Arbitrary, Gen};
 use vector_buffers::EventCount;
 use vector_common::{
+    byte_size_of::ByteSizeOf,
     config::ComponentKey,
     finalization::{AddBatchNotifier, BatchNotifier, EventFinalizers, Finalizable},
     json_size::JsonSize,
@@ -18,7 +19,6 @@ use super::{
     EstimatedJsonEncodedSizeOf, Event, EventDataEq, EventFinalizer, EventMutRef, EventRef,
     LogEvent, Metric, TraceEvent,
 };
-use crate::ByteSizeOf;
 
 /// The type alias for an array of `LogEvent` elements.
 pub type LogArray = Vec<LogEvent>;
diff --git a/lib/vector-core/src/event/log_event.rs b/lib/vector-core/src/event/log_event.rs
index f27f2b7af64fb..25306f350b3ea 100644
--- a/lib/vector-core/src/event/log_event.rs
+++ b/lib/vector-core/src/event/log_event.rs
@@ -13,28 +13,29 @@ use std::{
 use crossbeam_utils::atomic::AtomicCell;
 use lookup::lookup_v2::TargetPath;
 use lookup::PathPrefix;
+use lookup::{metadata_path, path};
+use once_cell::sync::Lazy;
 use serde::{Deserialize, Serialize, Serializer};
 use vector_common::{
+    byte_size_of::ByteSizeOf,
     internal_event::{OptionalTag, TaggedEventsSent},
     json_size::{JsonSize, NonZeroJsonSize},
     request_metadata::GetEventCountTags,
     EventDataEq,
 };
 use vrl::path::{parse_target_path, OwnedTargetPath, PathParseError};
+use vrl::{event_path, owned_value_path};
 
 use super::{
     estimated_json_encoded_size_of::EstimatedJsonEncodedSizeOf,
     finalization::{BatchNotifier, EventFinalizer},
     metadata::EventMetadata,
-    util, EventFinalizers, Finalizable, Value,
+    util,
+    util::log::{all_fields, all_metadata_fields},
+    EventFinalizers, Finalizable, MaybeAsLogMut, Value,
 };
 use crate::config::LogNamespace;
 use crate::config::{log_schema, telemetry};
-use crate::event::util::log::{all_fields, all_metadata_fields};
-use crate::{event::MaybeAsLogMut, ByteSizeOf};
-use lookup::{metadata_path, path};
-use once_cell::sync::Lazy;
-use vrl::{event_path, owned_value_path};
 
 static VECTOR_SOURCE_TYPE_PATH: Lazy<Option<OwnedTargetPath>> = Lazy::new(|| {
     Some(OwnedTargetPath::metadata(owned_value_path!(
diff --git a/lib/vector-core/src/event/lua/event.rs b/lib/vector-core/src/event/lua/event.rs
index ded7dab1728ec..2e477d7568a99 100644
--- a/lib/vector-core/src/event/lua/event.rs
+++ b/lib/vector-core/src/event/lua/event.rs
@@ -1,7 +1,7 @@
 use mlua::prelude::*;
 
-use crate::event::lua::metric::LuaMetric;
-use crate::event::{Event, LogEvent, Metric};
+use super::super::{Event, LogEvent, Metric};
+use super::metric::LuaMetric;
 
 pub struct LuaEvent {
     pub event: Event,
diff --git a/lib/vector-core/src/event/lua/log.rs b/lib/vector-core/src/event/lua/log.rs
index 8d05055ef1a3c..03c7855bc780f 100644
--- a/lib/vector-core/src/event/lua/log.rs
+++ b/lib/vector-core/src/event/lua/log.rs
@@ -1,6 +1,6 @@
 use mlua::prelude::*;
 
-use crate::event::{EventMetadata, LogEvent, Value};
+use super::super::{EventMetadata, LogEvent, Value};
 
 impl<'a> IntoLua<'a> for LogEvent {
     #![allow(clippy::wrong_self_convention)] // this trait is defined by mlua
diff --git a/lib/vector-core/src/event/lua/metric.rs b/lib/vector-core/src/event/lua/metric.rs
index f1bdbb73e8344..6c062767cce64 100644
--- a/lib/vector-core/src/event/lua/metric.rs
+++ b/lib/vector-core/src/event/lua/metric.rs
@@ -2,15 +2,13 @@ use std::collections::BTreeMap;
 
 use mlua::prelude::*;
 
-use super::util::{table_to_timestamp, timestamp_to_table};
-use crate::event::metric::TagValue;
-use crate::{
-    event::{
-        metric::{self, MetricSketch, MetricTags, TagValueSet},
-        Metric, MetricKind, MetricValue, StatisticKind,
-    },
-    metrics::AgentDDSketch,
+use super::super::{
+    metric::TagValue,
+    metric::{self, MetricSketch, MetricTags, TagValueSet},
+    Metric, MetricKind, MetricValue, StatisticKind,
 };
+use super::util::{table_to_timestamp, timestamp_to_table};
+use crate::metrics::AgentDDSketch;
 
 pub struct LuaMetric {
     pub metric: Metric,
diff --git a/lib/vector-core/src/event/merge_state.rs b/lib/vector-core/src/event/merge_state.rs
index 9f210e785e266..6c1322d93daba 100644
--- a/lib/vector-core/src/event/merge_state.rs
+++ b/lib/vector-core/src/event/merge_state.rs
@@ -1,4 +1,4 @@
-use crate::event::LogEvent;
+use super::LogEvent;
 
 /// Encapsulates the inductive events merging algorithm.
 ///
@@ -38,8 +38,7 @@ impl LogEventMergeState {
 
 #[cfg(test)]
 mod test {
-    use super::LogEventMergeState;
-    use crate::event::LogEvent;
+    use super::*;
 
     fn log_event_with_message(message: &str) -> LogEvent {
         LogEvent::from(message)
diff --git a/lib/vector-core/src/event/metadata.rs b/lib/vector-core/src/event/metadata.rs
index a9942fd64d65b..0030464ac06c5 100644
--- a/lib/vector-core/src/event/metadata.rs
+++ b/lib/vector-core/src/event/metadata.rs
@@ -3,7 +3,7 @@
 use std::{borrow::Cow, collections::BTreeMap, fmt, sync::Arc};
 
 use serde::{Deserialize, Serialize};
-use vector_common::{config::ComponentKey, EventDataEq};
+use vector_common::{byte_size_of::ByteSizeOf, config::ComponentKey, EventDataEq};
 use vrl::{
     compiler::SecretTarget,
     value::{Kind, Value},
@@ -12,7 +12,7 @@ use vrl::{
 use super::{BatchNotifier, EventFinalizer, EventFinalizers, EventStatus};
 use crate::{
     config::{LogNamespace, OutputId},
-    schema, ByteSizeOf,
+    schema,
 };
 
 const DATADOG_API_KEY: &str = "datadog_api_key";
diff --git a/lib/vector-core/src/event/metric/mod.rs b/lib/vector-core/src/event/metric/mod.rs
index f27c24ae119fb..d3a8b77756f48 100644
--- a/lib/vector-core/src/event/metric/mod.rs
+++ b/lib/vector-core/src/event/metric/mod.rs
@@ -12,6 +12,7 @@ use std::{
 
 use chrono::{DateTime, Utc};
 use vector_common::{
+    byte_size_of::ByteSizeOf,
     internal_event::{OptionalTag, TaggedEventsSent},
     json_size::JsonSize,
     request_metadata::GetEventCountTags,
@@ -19,14 +20,11 @@ use vector_common::{
 };
 use vector_config::configurable_component;
 
-use crate::{
-    config::telemetry,
-    event::{
-        estimated_json_encoded_size_of::EstimatedJsonEncodedSizeOf, BatchNotifier, EventFinalizer,
-        EventFinalizers, EventMetadata, Finalizable,
-    },
-    ByteSizeOf,
+use super::{
+    estimated_json_encoded_size_of::EstimatedJsonEncodedSizeOf, BatchNotifier, EventFinalizer,
+    EventFinalizers, EventMetadata, Finalizable,
 };
+use crate::config::telemetry;
 
 #[cfg(any(test, feature = "test"))]
 mod arbitrary;
diff --git a/lib/vector-core/src/event/metric/series.rs b/lib/vector-core/src/event/metric/series.rs
index ac81389cd9de2..4c2da4a3c8988 100644
--- a/lib/vector-core/src/event/metric/series.rs
+++ b/lib/vector-core/src/event/metric/series.rs
@@ -1,10 +1,9 @@
 use core::fmt;
 
-use crate::event::metric::TagValue;
 use vector_common::byte_size_of::ByteSizeOf;
 use vector_config::configurable_component;
 
-use super::{write_list, write_word, MetricTags};
+use super::{write_list, write_word, MetricTags, TagValue};
 
 /// Metrics series.
 #[configurable_component]
diff --git a/lib/vector-core/src/event/mod.rs b/lib/vector-core/src/event/mod.rs
index 5bb7d144f91b2..3b9d237339268 100644
--- a/lib/vector-core/src/event/mod.rs
+++ b/lib/vector-core/src/event/mod.rs
@@ -1,7 +1,5 @@
 use std::{collections::BTreeMap, convert::TryInto, fmt::Debug, sync::Arc};
 
-use crate::config::LogNamespace;
-use crate::{config::OutputId, ByteSizeOf};
 pub use array::{into_event_stream, EventArray, EventContainer, LogArray, MetricArray, TraceArray};
 pub use estimated_json_encoded_size_of::EstimatedJsonEncodedSizeOf;
 pub use finalization::{
@@ -23,6 +21,9 @@ pub use vrl::value::Value;
 #[cfg(feature = "vrl")]
 pub use vrl_target::{TargetEvents, VrlTarget};
 
+use crate::config::LogNamespace;
+use crate::{config::OutputId, ByteSizeOf};
+
 pub mod array;
 pub mod discriminant;
 mod estimated_json_encoded_size_of;
diff --git a/lib/vector-core/src/event/proto.rs b/lib/vector-core/src/event/proto.rs
index f5be0af1062f8..d767306343cb6 100644
--- a/lib/vector-core/src/event/proto.rs
+++ b/lib/vector-core/src/event/proto.rs
@@ -3,10 +3,8 @@ use std::sync::Arc;
 use chrono::TimeZone;
 use ordered_float::NotNan;
 
-use crate::{
-    event::{self, BTreeMap, MetricTags, WithMetadata},
-    metrics::AgentDDSketch,
-};
+use super::{BTreeMap, MetricTags, WithMetadata};
+use crate::metrics::AgentDDSketch;
 
 #[allow(warnings, clippy::all, clippy::pedantic)]
 mod proto_event {
@@ -91,7 +89,7 @@ impl From<Trace> for Event {
     }
 }
 
-impl From<Log> for event::LogEvent {
+impl From<Log> for super::LogEvent {
     fn from(log: Log) -> Self {
         #[allow(deprecated)]
         let metadata = log
@@ -119,7 +117,7 @@ impl From<Log> for event::LogEvent {
     }
 }
 
-impl From<Trace> for event::TraceEvent {
+impl From<Trace> for super::TraceEvent {
     fn from(trace: Trace) -> Self {
         #[allow(deprecated)]
         let metadata = trace
@@ -139,11 +137,11 @@ impl From<Trace> for event::TraceEvent {
             .filter_map(|(k, v)| decode_value(v).map(|value| (k, value)))
             .collect::<BTreeMap<_, _>>();
 
-        Self::from(event::LogEvent::from_map(fields, metadata))
+        Self::from(super::LogEvent::from_map(fields, metadata))
     }
 }
 
-impl From<MetricValue> for event::MetricValue {
+impl From<MetricValue> for super::MetricValue {
     fn from(value: MetricValue) -> Self {
         match value {
             MetricValue::Counter(counter) => Self::Counter {
@@ -155,14 +153,14 @@ impl From<MetricValue> for event::MetricValue {
             },
             MetricValue::Distribution1(dist) => Self::Distribution {
                 statistic: dist.statistic().into(),
-                samples: event::metric::zip_samples(dist.values, dist.sample_rates),
+                samples: super::metric::zip_samples(dist.values, dist.sample_rates),
             },
             MetricValue::Distribution2(dist) => Self::Distribution {
                 statistic: dist.statistic().into(),
                 samples: dist.samples.into_iter().map(Into::into).collect(),
             },
             MetricValue::AggregatedHistogram1(hist) => Self::AggregatedHistogram {
-                buckets: event::metric::zip_buckets(
+                buckets: super::metric::zip_buckets(
                     hist.buckets,
                     hist.counts.iter().map(|h| u64::from(*h)),
                 ),
@@ -180,7 +178,7 @@ impl From<MetricValue> for event::MetricValue {
                 sum: hist.sum,
             },
             MetricValue::AggregatedSummary1(summary) => Self::AggregatedSummary {
-                quantiles: event::metric::zip_quantiles(summary.quantiles, summary.values),
+                quantiles: super::metric::zip_quantiles(summary.quantiles, summary.values),
                 count: u64::from(summary.count),
                 sum: summary.sum,
             },
@@ -203,11 +201,11 @@ impl From<MetricValue> for event::MetricValue {
     }
 }
 
-impl From<Metric> for event::Metric {
+impl From<Metric> for super::Metric {
     fn from(metric: Metric) -> Self {
         let kind = match metric.kind() {
-            metric::Kind::Incremental => event::MetricKind::Incremental,
-            metric::Kind::Absolute => event::MetricKind::Absolute,
+            metric::Kind::Incremental => super::MetricKind::Incremental,
+            metric::Kind::Absolute => super::MetricKind::Absolute,
         };
 
         let name = metric.name;
@@ -231,7 +229,7 @@ impl From<Metric> for event::Metric {
                         values
                             .values
                             .into_iter()
-                            .map(|value| event::metric::TagValue::from(value.value))
+                            .map(|value| super::metric::TagValue::from(value.value))
                             .collect(),
                     )
                 })
@@ -243,7 +241,7 @@ impl From<Metric> for event::Metric {
         tags.extend(metric.tags_v1);
         let tags = (!tags.is_empty()).then_some(tags);
 
-        let value = event::MetricValue::from(metric.value.unwrap());
+        let value = super::MetricValue::from(metric.value.unwrap());
 
         #[allow(deprecated)]
         let metadata = metric
@@ -265,7 +263,7 @@ impl From<Metric> for event::Metric {
     }
 }
 
-impl From<EventWrapper> for event::Event {
+impl From<EventWrapper> for super::Event {
     fn from(proto: EventWrapper) -> Self {
         let event = proto.event.unwrap();
 
@@ -277,20 +275,20 @@ impl From<EventWrapper> for event::Event {
     }
 }
 
-impl From<event::LogEvent> for Log {
-    fn from(log_event: event::LogEvent) -> Self {
+impl From<super::LogEvent> for Log {
+    fn from(log_event: super::LogEvent) -> Self {
         WithMetadata::<Self>::from(log_event).data
     }
 }
 
-impl From<event::TraceEvent> for Trace {
-    fn from(trace: event::TraceEvent) -> Self {
+impl From<super::TraceEvent> for Trace {
+    fn from(trace: super::TraceEvent) -> Self {
         WithMetadata::<Self>::from(trace).data
     }
 }
 
-impl From<event::LogEvent> for WithMetadata<Log> {
-    fn from(log_event: event::LogEvent) -> Self {
+impl From<super::LogEvent> for WithMetadata<Log> {
+    fn from(log_event: super::LogEvent) -> Self {
         let (value, metadata) = log_event.into_parts();
 
         // Due to the backwards compatibility requirement by the
@@ -330,8 +328,8 @@ impl From<event::LogEvent> for WithMetadata<Log> {
     }
 }
 
-impl From<event::TraceEvent> for WithMetadata<Trace> {
-    fn from(trace: event::TraceEvent) -> Self {
+impl From<super::TraceEvent> for WithMetadata<Trace> {
+    fn from(trace: super::TraceEvent) -> Self {
         let (fields, metadata) = trace.into_parts();
         let fields = fields
             .into_iter()
@@ -349,31 +347,31 @@ impl From<event::TraceEvent> for WithMetadata<Trace> {
     }
 }
 
-impl From<event::Metric> for Metric {
-    fn from(metric: event::Metric) -> Self {
+impl From<super::Metric> for Metric {
+    fn from(metric: super::Metric) -> Self {
         WithMetadata::<Self>::from(metric).data
     }
 }
 
-impl From<event::MetricValue> for MetricValue {
-    fn from(value: event::MetricValue) -> Self {
+impl From<super::MetricValue> for MetricValue {
+    fn from(value: super::MetricValue) -> Self {
         match value {
-            event::MetricValue::Counter { value } => Self::Counter(Counter { value }),
-            event::MetricValue::Gauge { value } => Self::Gauge(Gauge { value }),
-            event::MetricValue::Set { values } => Self::Set(Set {
+            super::MetricValue::Counter { value } => Self::Counter(Counter { value }),
+            super::MetricValue::Gauge { value } => Self::Gauge(Gauge { value }),
+            super::MetricValue::Set { values } => Self::Set(Set {
                 values: values.into_iter().collect(),
             }),
-            event::MetricValue::Distribution { samples, statistic } => {
+            super::MetricValue::Distribution { samples, statistic } => {
                 Self::Distribution2(Distribution2 {
                     samples: samples.into_iter().map(Into::into).collect(),
                     statistic: match statistic {
-                        event::StatisticKind::Histogram => StatisticKind::Histogram,
-                        event::StatisticKind::Summary => StatisticKind::Summary,
+                        super::StatisticKind::Histogram => StatisticKind::Histogram,
+                        super::StatisticKind::Summary => StatisticKind::Summary,
                     }
                     .into(),
                 })
             }
-            event::MetricValue::AggregatedHistogram {
+            super::MetricValue::AggregatedHistogram {
                 buckets,
                 count,
                 sum,
@@ -382,7 +380,7 @@ impl From<event::MetricValue> for MetricValue {
                 count,
                 sum,
             }),
-            event::MetricValue::AggregatedSummary {
+            super::MetricValue::AggregatedSummary {
                 quantiles,
                 count,
                 sum,
@@ -391,7 +389,7 @@ impl From<event::MetricValue> for MetricValue {
                 count,
                 sum,
             }),
-            event::MetricValue::Sketch { sketch } => match sketch {
+            super::MetricValue::Sketch { sketch } => match sketch {
                 MetricSketch::AgentDDSketch(ddsketch) => {
                     let bin_map = ddsketch.bin_map();
                     let (keys, counts) = bin_map.into_parts();
@@ -415,8 +413,8 @@ impl From<event::MetricValue> for MetricValue {
     }
 }
 
-impl From<event::Metric> for WithMetadata<Metric> {
-    fn from(metric: event::Metric) -> Self {
+impl From<super::Metric> for WithMetadata<Metric> {
+    fn from(metric: super::Metric) -> Self {
         let (series, data, metadata) = metric.into_parts();
         let name = series.name.name;
         let namespace = series.name.namespace.unwrap_or_default();
@@ -431,8 +429,8 @@ impl From<event::Metric> for WithMetadata<Metric> {
         let tags = series.tags.unwrap_or_default();
 
         let kind = match data.kind {
-            event::MetricKind::Incremental => metric::Kind::Incremental,
-            event::MetricKind::Absolute => metric::Kind::Absolute,
+            super::MetricKind::Incremental => metric::Kind::Incremental,
+            super::MetricKind::Absolute => metric::Kind::Absolute,
         }
         .into();
 
@@ -482,30 +480,30 @@ impl From<event::Metric> for WithMetadata<Metric> {
     }
 }
 
-impl From<event::Event> for Event {
-    fn from(event: event::Event) -> Self {
+impl From<super::Event> for Event {
+    fn from(event: super::Event) -> Self {
         WithMetadata::<Self>::from(event).data
     }
 }
 
-impl From<event::Event> for WithMetadata<Event> {
-    fn from(event: event::Event) -> Self {
+impl From<super::Event> for WithMetadata<Event> {
+    fn from(event: super::Event) -> Self {
         match event {
-            event::Event::Log(log_event) => WithMetadata::<Log>::from(log_event).into(),
-            event::Event::Metric(metric) => WithMetadata::<Metric>::from(metric).into(),
-            event::Event::Trace(trace) => WithMetadata::<Trace>::from(trace).into(),
+            super::Event::Log(log_event) => WithMetadata::<Log>::from(log_event).into(),
+            super::Event::Metric(metric) => WithMetadata::<Metric>::from(metric).into(),
+            super::Event::Trace(trace) => WithMetadata::<Trace>::from(trace).into(),
         }
     }
 }
 
-impl From<event::Event> for EventWrapper {
-    fn from(event: event::Event) -> Self {
+impl From<super::Event> for EventWrapper {
+    fn from(event: super::Event) -> Self {
         WithMetadata::<EventWrapper>::from(event).data
     }
 }
 
-impl From<event::Event> for WithMetadata<EventWrapper> {
-    fn from(event: event::Event) -> Self {
+impl From<super::Event> for WithMetadata<EventWrapper> {
+    fn from(event: super::Event) -> Self {
         WithMetadata::<Event>::from(event).into()
     }
 }
@@ -562,15 +560,15 @@ impl From<sketch::AgentDdSketch> for MetricSketch {
     }
 }
 
-impl From<event::metadata::Secrets> for Secrets {
-    fn from(value: event::metadata::Secrets) -> Self {
+impl From<super::metadata::Secrets> for Secrets {
+    fn from(value: super::metadata::Secrets) -> Self {
         Self {
             entries: value.into_iter().map(|(k, v)| (k, v.to_string())).collect(),
         }
     }
 }
 
-impl From<Secrets> for event::metadata::Secrets {
+impl From<Secrets> for super::metadata::Secrets {
     fn from(value: Secrets) -> Self {
         let mut secrets = Self::new();
         for (k, v) in value.entries {
@@ -581,8 +579,8 @@ impl From<Secrets> for event::metadata::Secrets {
     }
 }
 
-impl From<event::DatadogMetricOriginMetadata> for DatadogOriginMetadata {
-    fn from(value: event::DatadogMetricOriginMetadata) -> Self {
+impl From<super::DatadogMetricOriginMetadata> for DatadogOriginMetadata {
+    fn from(value: super::DatadogMetricOriginMetadata) -> Self {
         Self {
             origin_product: value.product(),
             origin_category: value.category(),
@@ -591,7 +589,7 @@ impl From<event::DatadogMetricOriginMetadata> for DatadogOriginMetadata {
     }
 }
 
-impl From<DatadogOriginMetadata> for event::DatadogMetricOriginMetadata {
+impl From<DatadogOriginMetadata> for super::DatadogMetricOriginMetadata {
     fn from(value: DatadogOriginMetadata) -> Self {
         Self::new(
             value.origin_product,
@@ -677,21 +675,21 @@ impl From<Metadata> for EventMetadata {
     }
 }
 
-fn decode_value(input: Value) -> Option<event::Value> {
+fn decode_value(input: Value) -> Option<super::Value> {
     match input.kind {
-        Some(value::Kind::RawBytes(data)) => Some(event::Value::Bytes(data)),
-        Some(value::Kind::Timestamp(ts)) => Some(event::Value::Timestamp(
+        Some(value::Kind::RawBytes(data)) => Some(super::Value::Bytes(data)),
+        Some(value::Kind::Timestamp(ts)) => Some(super::Value::Timestamp(
             chrono::Utc
                 .timestamp_opt(ts.seconds, ts.nanos as u32)
                 .single()
                 .expect("invalid timestamp"),
         )),
-        Some(value::Kind::Integer(value)) => Some(event::Value::Integer(value)),
-        Some(value::Kind::Float(value)) => Some(event::Value::Float(NotNan::new(value).unwrap())),
-        Some(value::Kind::Boolean(value)) => Some(event::Value::Boolean(value)),
+        Some(value::Kind::Integer(value)) => Some(super::Value::Integer(value)),
+        Some(value::Kind::Float(value)) => Some(super::Value::Float(NotNan::new(value).unwrap())),
+        Some(value::Kind::Boolean(value)) => Some(super::Value::Boolean(value)),
         Some(value::Kind::Map(map)) => decode_map(map.fields),
         Some(value::Kind::Array(array)) => decode_array(array.items),
-        Some(value::Kind::Null(_)) => Some(event::Value::Null),
+        Some(value::Kind::Null(_)) => Some(super::Value::Null),
         None => {
             error!("Encoded event contains unknown value kind.");
             None
@@ -699,42 +697,42 @@ fn decode_value(input: Value) -> Option<event::Value> {
     }
 }
 
-fn decode_map(fields: BTreeMap<String, Value>) -> Option<event::Value> {
+fn decode_map(fields: BTreeMap<String, Value>) -> Option<super::Value> {
     fields
         .into_iter()
         .map(|(key, value)| decode_value(value).map(|value| (key, value)))
         .collect::<Option<BTreeMap<_, _>>>()
-        .map(event::Value::Object)
+        .map(super::Value::Object)
 }
 
-fn decode_array(items: Vec<Value>) -> Option<event::Value> {
+fn decode_array(items: Vec<Value>) -> Option<super::Value> {
     items
         .into_iter()
         .map(decode_value)
         .collect::<Option<Vec<_>>>()
-        .map(event::Value::Array)
+        .map(super::Value::Array)
 }
 
-fn encode_value(value: event::Value) -> Value {
+fn encode_value(value: super::Value) -> Value {
     Value {
         kind: match value {
-            event::Value::Bytes(b) => Some(value::Kind::RawBytes(b)),
-            event::Value::Regex(regex) => Some(value::Kind::RawBytes(regex.as_bytes())),
-            event::Value::Timestamp(ts) => Some(value::Kind::Timestamp(prost_types::Timestamp {
+            super::Value::Bytes(b) => Some(value::Kind::RawBytes(b)),
+            super::Value::Regex(regex) => Some(value::Kind::RawBytes(regex.as_bytes())),
+            super::Value::Timestamp(ts) => Some(value::Kind::Timestamp(prost_types::Timestamp {
                 seconds: ts.timestamp(),
                 nanos: ts.timestamp_subsec_nanos() as i32,
             })),
-            event::Value::Integer(value) => Some(value::Kind::Integer(value)),
-            event::Value::Float(value) => Some(value::Kind::Float(value.into_inner())),
-            event::Value::Boolean(value) => Some(value::Kind::Boolean(value)),
-            event::Value::Object(fields) => Some(value::Kind::Map(encode_map(fields))),
-            event::Value::Array(items) => Some(value::Kind::Array(encode_array(items))),
-            event::Value::Null => Some(value::Kind::Null(ValueNull::NullValue as i32)),
+            super::Value::Integer(value) => Some(value::Kind::Integer(value)),
+            super::Value::Float(value) => Some(value::Kind::Float(value.into_inner())),
+            super::Value::Boolean(value) => Some(value::Kind::Boolean(value)),
+            super::Value::Object(fields) => Some(value::Kind::Map(encode_map(fields))),
+            super::Value::Array(items) => Some(value::Kind::Array(encode_array(items))),
+            super::Value::Null => Some(value::Kind::Null(ValueNull::NullValue as i32)),
         },
     }
 }
 
-fn encode_map(fields: BTreeMap<String, event::Value>) -> ValueMap {
+fn encode_map(fields: BTreeMap<String, super::Value>) -> ValueMap {
     ValueMap {
         fields: fields
             .into_iter()
@@ -743,7 +741,7 @@ fn encode_map(fields: BTreeMap<String, event::Value>) -> ValueMap {
     }
 }
 
-fn encode_array(items: Vec<event::Value>) -> ValueArray {
+fn encode_array(items: Vec<super::Value>) -> ValueArray {
     ValueArray {
         items: items.into_iter().map(encode_value).collect(),
     }
diff --git a/lib/vector-core/src/event/test/common.rs b/lib/vector-core/src/event/test/common.rs
index c7ccca9521f70..0f7d00908e152 100644
--- a/lib/vector-core/src/event/test/common.rs
+++ b/lib/vector-core/src/event/test/common.rs
@@ -6,17 +6,15 @@ use std::{
 use chrono::{DateTime, NaiveDateTime, Utc};
 use quickcheck::{empty_shrinker, Arbitrary, Gen};
 
-use crate::{
-    event::{
-        metric::{
-            Bucket, MetricData, MetricName, MetricSeries, MetricSketch, MetricTags, MetricTime,
-            Quantile, Sample,
-        },
-        Event, EventMetadata, LogEvent, Metric, MetricKind, MetricValue, StatisticKind, TraceEvent,
-        Value,
+use super::super::{
+    metric::{
+        Bucket, MetricData, MetricName, MetricSeries, MetricSketch, MetricTags, MetricTime,
+        Quantile, Sample,
     },
-    metrics::AgentDDSketch,
+    Event, EventMetadata, LogEvent, Metric, MetricKind, MetricValue, StatisticKind, TraceEvent,
+    Value,
 };
+use crate::metrics::AgentDDSketch;
 
 const MAX_F64_SIZE: f64 = 1_000_000.0;
 const MAX_MAP_SIZE: usize = 4;
diff --git a/lib/vector-core/src/event/test/size_of.rs b/lib/vector-core/src/event/test/size_of.rs
index 522b0f0520fe4..6db19a96db1e1 100644
--- a/lib/vector-core/src/event/test/size_of.rs
+++ b/lib/vector-core/src/event/test/size_of.rs
@@ -2,9 +2,10 @@ use std::mem;
 
 use lookup::{path, PathPrefix};
 use quickcheck::{Arbitrary, Gen, QuickCheck, TestResult};
+use vector_common::byte_size_of::ByteSizeOf;
 
+use super::common::Name;
 use super::*;
-use crate::{event::test::common::Name, ByteSizeOf};
 
 #[test]
 fn at_least_wrapper_size() {
diff --git a/lib/vector-core/src/event/trace.rs b/lib/vector-core/src/event/trace.rs
index 120c6c55f490b..851c504592d86 100644
--- a/lib/vector-core/src/event/trace.rs
+++ b/lib/vector-core/src/event/trace.rs
@@ -4,8 +4,8 @@ use lookup::lookup_v2::TargetPath;
 use serde::{Deserialize, Serialize};
 use vector_buffers::EventCount;
 use vector_common::{
-    internal_event::TaggedEventsSent, json_size::JsonSize, request_metadata::GetEventCountTags,
-    EventDataEq,
+    byte_size_of::ByteSizeOf, internal_event::TaggedEventsSent, json_size::JsonSize,
+    request_metadata::GetEventCountTags, EventDataEq,
 };
 use vrl::path::PathParseError;
 
@@ -13,7 +13,6 @@ use super::{
     BatchNotifier, EstimatedJsonEncodedSizeOf, EventFinalizer, EventFinalizers, EventMetadata,
     Finalizable, LogEvent, Value,
 };
-use crate::ByteSizeOf;
 
 /// Traces are a newtype of `LogEvent`
 #[derive(Clone, Debug, Default, Deserialize, PartialEq, Serialize)]
diff --git a/lib/vector-core/src/event/vrl_target.rs b/lib/vector-core/src/event/vrl_target.rs
index b29439a9a1e43..fd94f307fd245 100644
--- a/lib/vector-core/src/event/vrl_target.rs
+++ b/lib/vector-core/src/event/vrl_target.rs
@@ -9,9 +9,8 @@ use vrl::compiler::{ProgramInfo, SecretTarget, Target};
 use vrl::prelude::Collection;
 use vrl::value::{Kind, Value};
 
-use super::{Event, EventMetadata, LogEvent, Metric, MetricKind, TraceEvent};
+use super::{metric::TagValue, Event, EventMetadata, LogEvent, Metric, MetricKind, TraceEvent};
 use crate::config::{log_schema, LogNamespace};
-use crate::event::metric::TagValue;
 use crate::schema::Definition;
 
 const VALID_METRIC_PATHS_SET: &str = ".name, .namespace, .timestamp, .kind, .tags";
diff --git a/lib/vector-core/src/schema/definition.rs b/lib/vector-core/src/schema/definition.rs
index 421b0b91a043a..b802cdd48cc9c 100644
--- a/lib/vector-core/src/schema/definition.rs
+++ b/lib/vector-core/src/schema/definition.rs
@@ -1,10 +1,11 @@
 use std::collections::{BTreeMap, BTreeSet};
 
-use crate::config::{log_schema, LegacyKey, LogNamespace};
 use lookup::lookup_v2::TargetPath;
 use lookup::{owned_value_path, OwnedTargetPath, OwnedValuePath, PathPrefix};
 use vrl::value::{kind::Collection, Kind};
 
+use crate::config::{log_schema, LegacyKey, LogNamespace};
+
 /// The definition of a schema.
 ///
 /// This struct contains all the information needed to inspect the schema of an event emitted by
diff --git a/lib/vector-lib/Cargo.toml b/lib/vector-lib/Cargo.toml
new file mode 100644
index 0000000000000..51e6cdc6e7f80
--- /dev/null
+++ b/lib/vector-lib/Cargo.toml
@@ -0,0 +1,9 @@
+[package]
+name = "vector-lib"
+version = "0.1.0"
+authors = ["Vector Contributors <vector@datadoghq.com>"]
+edition = "2021"
+publish = false
+
+[dependencies]
+vector-common = { path = "../vector-common", default-features = false }
diff --git a/lib/vector-lib/src/lib.rs b/lib/vector-lib/src/lib.rs
new file mode 100644
index 0000000000000..f089e7d004aaf
--- /dev/null
+++ b/lib/vector-lib/src/lib.rs
@@ -0,0 +1,6 @@
+pub use vector_common::{
+    assert_event_data_eq, btreemap, byte_size_of, byte_size_of::ByteSizeOf, config, conversion,
+    encode_logfmt, finalization, finalizer, impl_event_data_eq, internal_event, json_size,
+    registered_event, request_metadata, sensitive_string, shutdown, trigger, Error, Result,
+    TimeZone,
+};
diff --git a/lib/vrl/value/Cargo.toml b/lib/vrl/value/Cargo.toml
deleted file mode 100644
index 11854a880617f..0000000000000
--- a/lib/vrl/value/Cargo.toml
+++ /dev/null
@@ -1,42 +0,0 @@
-[package]
-name = "value"
-version = "0.1.0"
-authors = ["Vector Contributors <vector@timber.io>"]
-edition = "2021"
-license = "MPL-2.0"
-readme = "README.md"
-publish = false
-
-[dependencies]
-bytes = { version = "1.4.0", default-features = false, features = ["serde"] }
-chrono = { version = "0.4.19", default-features = false, features = ["serde", "std"] }
-lookup = { path = "../lookup", default-features = false }
-ordered-float = { version = "3.7.0", default-features = false }
-regex = { version = "1.7.2", default-features = false, features = ["std", "perf"]}
-snafu = { version = "0.7.4", default-features = false }
-tracing = { version = "0.1.34", default-features = false, features = ["attributes"] }
-
-# Optional
-async-graphql = { version = "5.0.7", default-features = false, optional = true }
-mlua = { version = "0.9.1", default-features = false, features = ["lua54", "send", "vendored"], optional = true}
-serde = { version = "1.0.158", default-features = false, features = ["derive", "rc"], optional = true }
-serde_json = { version = "1.0.94", optional = true }
-toml = { version = "0.7.3", default-features = false, optional = true }
-quickcheck = { version = "1.0.3", optional = true }
-
-[features]
-lua = ["dep:mlua"]
-api = ["dep:async-graphql", "json"]
-json = ["dep:serde", "dep:serde_json"]
-test = []
-arbitrary = ["dep:quickcheck"]
-
-[dev-dependencies]
-async-graphql = { version = "5.0.7", default-features = false }
-indoc = { version = "2.0.1", default-features = false }
-quickcheck = "1.0.3"
-lookup = { path = "../lookup", default-features = false, features = ["arbitrary"] }
-serde = { version = "1.0.158", default-features = false, features = ["derive", "rc"]}
-serde_json = { version = "1.0.94"}
-toml = { version = "0.7.3", default-features = false }
-mlua = { version = "0.9.1", default-features = false, features = ["lua54", "send", "vendored"]}
diff --git a/src/api/schema/events/log.rs b/src/api/schema/events/log.rs
index ad53474622510..1faedfa509ad6 100644
--- a/src/api/schema/events/log.rs
+++ b/src/api/schema/events/log.rs
@@ -2,7 +2,7 @@ use std::borrow::Cow;
 
 use async_graphql::Object;
 use chrono::{DateTime, Utc};
-use vector_common::encode_logfmt;
+use vector_lib::encode_logfmt;
 use vrl::event_path;
 
 use super::EventEncodingType;
diff --git a/src/api/schema/events/metric.rs b/src/api/schema/events/metric.rs
index 23975758b3a5d..31786b579bfc5 100644
--- a/src/api/schema/events/metric.rs
+++ b/src/api/schema/events/metric.rs
@@ -3,7 +3,7 @@ use std::collections::BTreeMap;
 use async_graphql::{Enum, Object};
 use chrono::{DateTime, Utc};
 use serde_json::Value;
-use vector_common::encode_logfmt;
+use vector_lib::encode_logfmt;
 
 use super::EventEncodingType;
 use crate::{
diff --git a/src/api/schema/events/trace.rs b/src/api/schema/events/trace.rs
index 9bd52d3ce053e..db2606fac5c95 100644
--- a/src/api/schema/events/trace.rs
+++ b/src/api/schema/events/trace.rs
@@ -1,5 +1,5 @@
 use async_graphql::Object;
-use vector_common::encode_logfmt;
+use vector_lib::encode_logfmt;
 use vrl::event_path;
 
 use super::EventEncodingType;
diff --git a/src/aws/auth.rs b/src/aws/auth.rs
index d05d479aaaab1..776a57f4c25b6 100644
--- a/src/aws/auth.rs
+++ b/src/aws/auth.rs
@@ -14,8 +14,8 @@ use aws_credential_types::{
 };
 use aws_types::region::Region;
 use serde_with::serde_as;
-use vector_common::sensitive_string::SensitiveString;
 use vector_config::configurable_component;
+use vector_lib::sensitive_string::SensitiveString;
 
 // matches default load timeout from the SDK as of 0.10.1, but lets us confidently document the
 // default rather than relying on the SDK default to not change
diff --git a/src/codecs/decoding/config.rs b/src/codecs/decoding/config.rs
index b4a01245bcfe0..00e0c7e67d73b 100644
--- a/src/codecs/decoding/config.rs
+++ b/src/codecs/decoding/config.rs
@@ -41,7 +41,7 @@ impl DecodingConfig {
     }
 
     /// Builds a `Decoder` from the provided configuration.
-    pub fn build(&self) -> vector_common::Result<Decoder> {
+    pub fn build(&self) -> vector_lib::Result<Decoder> {
         // Build the framer.
         let framer = self.framing.build();
 
diff --git a/src/codecs/encoding/transformer.rs b/src/codecs/encoding/transformer.rs
index 4e5ed9e195793..6b2690b6c5cc1 100644
--- a/src/codecs/encoding/transformer.rs
+++ b/src/codecs/encoding/transformer.rs
@@ -267,8 +267,8 @@ pub enum TimestampFormat {
 mod tests {
     use indoc::indoc;
     use lookup::path::parse_target_path;
-    use vector_common::btreemap;
     use vector_core::config::{log_schema, LogNamespace};
+    use vector_lib::btreemap;
     use vrl::value::Kind;
 
     use crate::config::schema;
diff --git a/src/components/validation/resources/http.rs b/src/components/validation/resources/http.rs
index 7fd6105b579e6..5e9be4edb2a2c 100644
--- a/src/components/validation/resources/http.rs
+++ b/src/components/validation/resources/http.rs
@@ -62,7 +62,7 @@ impl HttpResourceConfig {
         codec: ResourceCodec,
         output_tx: mpsc::Sender<Vec<Event>>,
         task_coordinator: &TaskCoordinator<Configuring>,
-    ) -> vector_common::Result<()> {
+    ) -> vector_lib::Result<()> {
         match direction {
             // We'll pull data from the sink.
             ResourceDirection::Pull => Ok(spawn_output_http_client(
@@ -230,7 +230,7 @@ fn spawn_output_http_server(
     codec: ResourceCodec,
     output_tx: mpsc::Sender<Vec<Event>>,
     task_coordinator: &TaskCoordinator<Configuring>,
-) -> vector_common::Result<()> {
+) -> vector_lib::Result<()> {
     // This HTTP server will wait for events to be sent by a sink, and collect them and send them on
     // via an output sender. We accept/collect events until we're told to shutdown.
 
diff --git a/src/components/validation/resources/mod.rs b/src/components/validation/resources/mod.rs
index b66e9832c0f0f..5d48427f70b45 100644
--- a/src/components/validation/resources/mod.rs
+++ b/src/components/validation/resources/mod.rs
@@ -96,7 +96,7 @@ impl ResourceCodec {
     ///
     /// The decoder is generated as an inverse to the input codec: if an encoding configuration was
     /// given, we generate a decoder that satisfies that encoding configuration, and vice versa.
-    pub fn into_decoder(&self) -> vector_common::Result<Decoder> {
+    pub fn into_decoder(&self) -> vector_lib::Result<Decoder> {
         let (framer, deserializer) = match self {
             Self::Decoding(config) => return config.build(),
             Self::Encoding(config) => (
@@ -187,7 +187,7 @@ fn decoder_framing_to_encoding_framer(framing: &decoding::FramingConfig) -> enco
 
 fn serializer_config_to_deserializer(
     config: &SerializerConfig,
-) -> vector_common::Result<decoding::Deserializer> {
+) -> vector_lib::Result<decoding::Deserializer> {
     let deserializer_config = match config {
         SerializerConfig::Avro { .. } => todo!(),
         SerializerConfig::Csv { .. } => todo!(),
@@ -328,7 +328,7 @@ impl ExternalResource {
         self,
         output_tx: mpsc::Sender<Vec<Event>>,
         task_coordinator: &TaskCoordinator<Configuring>,
-    ) -> vector_common::Result<()> {
+    ) -> vector_lib::Result<()> {
         match self.definition {
             ResourceDefinition::Http(http_config) => {
                 http_config.spawn_as_output(self.direction, self.codec, output_tx, task_coordinator)
diff --git a/src/components/validation/runner/io.rs b/src/components/validation/runner/io.rs
index 55e4fca1eaecf..b554140e04788 100644
--- a/src/components/validation/runner/io.rs
+++ b/src/components/validation/runner/io.rs
@@ -9,8 +9,8 @@ use tonic::{
     Status,
 };
 use tower::Service;
-use vector_common::shutdown::ShutdownSignal;
 use vector_core::{event::Event, tls::MaybeTlsSettings};
+use vector_lib::shutdown::ShutdownSignal;
 
 use crate::{
     components::validation::{
diff --git a/src/components/validation/runner/mod.rs b/src/components/validation/runner/mod.rs
index cce737e9358be..527eca3d8d9c9 100644
--- a/src/components/validation/runner/mod.rs
+++ b/src/components/validation/runner/mod.rs
@@ -191,7 +191,7 @@ impl Runner {
         }
     }
 
-    pub async fn run_validation(self) -> Result<Vec<RunnerResults>, vector_common::Error> {
+    pub async fn run_validation(self) -> Result<Vec<RunnerResults>, vector_lib::Error> {
         // Initialize our test environment.
         initialize_test_environment();
 
@@ -413,7 +413,7 @@ fn build_external_resource(
     configuration: &ValidationConfiguration,
     input_task_coordinator: &TaskCoordinator<Configuring>,
     output_task_coordinator: &TaskCoordinator<Configuring>,
-) -> Result<(RunnerInput, RunnerOutput, Option<Encoder<encoding::Framer>>), vector_common::Error> {
+) -> Result<(RunnerInput, RunnerOutput, Option<Encoder<encoding::Framer>>), vector_lib::Error> {
     let component_type = configuration.component_type();
     let maybe_external_resource = configuration.external_resource();
     let maybe_encoder = maybe_external_resource
diff --git a/src/conditions/vrl.rs b/src/conditions/vrl.rs
index 8011f8cba4701..3a14089f82c83 100644
--- a/src/conditions/vrl.rs
+++ b/src/conditions/vrl.rs
@@ -1,6 +1,6 @@
-use vector_common::TimeZone;
 use vector_config::configurable_component;
 use vector_core::compile_vrl;
+use vector_lib::TimeZone;
 use vrl::compiler::runtime::{Runtime, RuntimeResult, Terminate};
 use vrl::compiler::{CompilationResult, CompileConfig, Program, TypeState, VrlRuntime};
 use vrl::diagnostic::Formatter;
diff --git a/src/config/loading/secret.rs b/src/config/loading/secret.rs
index 09a32260708e1..909fa30b13f90 100644
--- a/src/config/loading/secret.rs
+++ b/src/config/loading/secret.rs
@@ -8,7 +8,7 @@ use once_cell::sync::Lazy;
 use regex::{Captures, Regex};
 use serde::{Deserialize, Serialize};
 use toml::value::Table;
-use vector_common::config::ComponentKey;
+use vector_lib::config::ComponentKey;
 
 use crate::{
     config::{
diff --git a/src/config/mod.rs b/src/config/mod.rs
index 23b6bf45bafb4..894531126485b 100644
--- a/src/config/mod.rs
+++ b/src/config/mod.rs
@@ -1452,8 +1452,8 @@ mod resource_config_tests {
     fn generate_component_config_schema() {
         use crate::config::{SinkOuter, SourceOuter, TransformOuter};
         use indexmap::IndexMap;
-        use vector_common::config::ComponentKey;
         use vector_config::configurable_component;
+        use vector_lib::config::ComponentKey;
 
         /// Top-level Vector configuration.
         #[configurable_component]
diff --git a/src/enrichment_tables/file.rs b/src/enrichment_tables/file.rs
index 6c92bf395f244..0401a118e4f5e 100644
--- a/src/enrichment_tables/file.rs
+++ b/src/enrichment_tables/file.rs
@@ -10,8 +10,8 @@ use std::{
 use bytes::Bytes;
 use enrichment::{Case, Condition, IndexHandle, Table};
 use tracing::trace;
-use vector_common::{conversion::Conversion, TimeZone};
 use vector_config::configurable_component;
+use vector_lib::{conversion::Conversion, TimeZone};
 use vrl::value::Value;
 
 use crate::config::EnrichmentTableConfig;
diff --git a/src/gcp.rs b/src/gcp.rs
index dd235cd52c404..485cc51dd3a27 100644
--- a/src/gcp.rs
+++ b/src/gcp.rs
@@ -17,8 +17,8 @@ use once_cell::sync::Lazy;
 use smpl_jwt::Jwt;
 use snafu::{ResultExt, Snafu};
 use tokio::{sync::watch, time::Instant};
-use vector_common::sensitive_string::SensitiveString;
 use vector_config::configurable_component;
+use vector_lib::sensitive_string::SensitiveString;
 
 use crate::{config::ProxyConfig, http::HttpClient, http::HttpError};
 
diff --git a/src/http.rs b/src/http.rs
index 84e0364c00515..ae3c7ae09300c 100644
--- a/src/http.rs
+++ b/src/http.rs
@@ -17,8 +17,8 @@ use hyper_proxy::ProxyConnector;
 use snafu::{ResultExt, Snafu};
 use tower::Service;
 use tracing::Instrument;
-use vector_common::sensitive_string::SensitiveString;
 use vector_config::configurable_component;
+use vector_lib::sensitive_string::SensitiveString;
 
 use crate::{
     config::ProxyConfig,
diff --git a/src/internal_events/adaptive_concurrency.rs b/src/internal_events/adaptive_concurrency.rs
index 8aa5cf5344dc3..e0d7bb7c2cf7e 100644
--- a/src/internal_events/adaptive_concurrency.rs
+++ b/src/internal_events/adaptive_concurrency.rs
@@ -1,7 +1,7 @@
 use std::time::Duration;
 
 use metrics::{register_histogram, Histogram};
-use vector_common::registered_event;
+use vector_lib::registered_event;
 
 #[derive(Clone, Copy)]
 pub struct AdaptiveConcurrencyLimitData {
diff --git a/src/internal_events/amqp.rs b/src/internal_events/amqp.rs
index a042b86278ed3..c0b05313b4b53 100644
--- a/src/internal_events/amqp.rs
+++ b/src/internal_events/amqp.rs
@@ -1,8 +1,8 @@
 #[cfg(feature = "sources-amqp")]
 pub mod source {
     use metrics::counter;
-    use vector_common::internal_event::{error_stage, error_type};
     use vector_core::internal_event::InternalEvent;
+    use vector_lib::internal_event::{error_stage, error_type};
 
     #[derive(Debug)]
     pub struct AmqpBytesReceived {
@@ -93,10 +93,10 @@ pub mod source {
 pub mod sink {
     use crate::emit;
     use metrics::counter;
-    use vector_common::internal_event::{
+    use vector_core::internal_event::InternalEvent;
+    use vector_lib::internal_event::{
         error_stage, error_type, ComponentEventsDropped, UNINTENTIONAL,
     };
-    use vector_core::internal_event::InternalEvent;
 
     #[derive(Debug)]
     pub struct AmqpDeliveryError<'a> {
diff --git a/src/internal_events/apache_metrics.rs b/src/internal_events/apache_metrics.rs
index 0e42463f960e8..88c3d74613dd3 100644
--- a/src/internal_events/apache_metrics.rs
+++ b/src/internal_events/apache_metrics.rs
@@ -1,10 +1,10 @@
 use metrics::counter;
 
-use vector_common::{
+use vector_core::internal_event::InternalEvent;
+use vector_lib::{
     internal_event::{error_stage, error_type},
     json_size::JsonSize,
 };
-use vector_core::internal_event::InternalEvent;
 
 use super::prelude::http_error_code;
 use crate::sources::apache_metrics;
diff --git a/src/internal_events/aws.rs b/src/internal_events/aws.rs
index 140253f41d807..b2b100136a903 100644
--- a/src/internal_events/aws.rs
+++ b/src/internal_events/aws.rs
@@ -1,5 +1,5 @@
 use metrics::counter;
-use vector_common::internal_event::InternalEvent;
+use vector_lib::internal_event::InternalEvent;
 
 pub struct AwsBytesSent {
     pub byte_size: usize,
diff --git a/src/internal_events/aws_cloudwatch_logs.rs b/src/internal_events/aws_cloudwatch_logs.rs
index ca1069e7733c5..857827849b892 100644
--- a/src/internal_events/aws_cloudwatch_logs.rs
+++ b/src/internal_events/aws_cloudwatch_logs.rs
@@ -1,8 +1,6 @@
 use metrics::counter;
-use vector_common::internal_event::{
-    error_stage, error_type, ComponentEventsDropped, UNINTENTIONAL,
-};
 use vector_core::internal_event::InternalEvent;
+use vector_lib::internal_event::{error_stage, error_type, ComponentEventsDropped, UNINTENTIONAL};
 
 use crate::emit;
 
diff --git a/src/internal_events/aws_ec2_metadata.rs b/src/internal_events/aws_ec2_metadata.rs
index dc1b2f6523447..eefa592d871d5 100644
--- a/src/internal_events/aws_ec2_metadata.rs
+++ b/src/internal_events/aws_ec2_metadata.rs
@@ -1,7 +1,7 @@
 use metrics::counter;
 use vector_core::internal_event::InternalEvent;
 
-use vector_common::internal_event::{error_stage, error_type};
+use vector_lib::internal_event::{error_stage, error_type};
 
 #[derive(Debug)]
 pub struct AwsEc2MetadataRefreshSuccessful;
diff --git a/src/internal_events/aws_ecs_metrics.rs b/src/internal_events/aws_ecs_metrics.rs
index 2ae8081697a66..d15061ad0e9c6 100644
--- a/src/internal_events/aws_ecs_metrics.rs
+++ b/src/internal_events/aws_ecs_metrics.rs
@@ -1,11 +1,11 @@
 use std::borrow::Cow;
 
 use metrics::counter;
-use vector_common::{
+use vector_core::internal_event::InternalEvent;
+use vector_lib::{
     internal_event::{error_stage, error_type},
     json_size::JsonSize,
 };
-use vector_core::internal_event::InternalEvent;
 
 use super::prelude::{http_error_code, hyper_error_code};
 
diff --git a/src/internal_events/aws_kinesis.rs b/src/internal_events/aws_kinesis.rs
index ef928dc6b38a7..0af8de5a03517 100644
--- a/src/internal_events/aws_kinesis.rs
+++ b/src/internal_events/aws_kinesis.rs
@@ -1,10 +1,8 @@
 /// Used in both `aws_kinesis_streams` and `aws_kinesis_firehose` sinks
 use crate::emit;
 use metrics::counter;
-use vector_common::internal_event::{
-    error_stage, error_type, ComponentEventsDropped, UNINTENTIONAL,
-};
 use vector_core::internal_event::InternalEvent;
+use vector_lib::internal_event::{error_stage, error_type, ComponentEventsDropped, UNINTENTIONAL};
 
 #[derive(Debug)]
 pub struct AwsKinesisStreamNoPartitionKeyError<'a> {
diff --git a/src/internal_events/aws_kinesis_firehose.rs b/src/internal_events/aws_kinesis_firehose.rs
index ae992633e7248..65906c1e4d155 100644
--- a/src/internal_events/aws_kinesis_firehose.rs
+++ b/src/internal_events/aws_kinesis_firehose.rs
@@ -1,6 +1,6 @@
 use metrics::counter;
-use vector_common::internal_event::{error_stage, error_type};
 use vector_core::internal_event::InternalEvent;
+use vector_lib::internal_event::{error_stage, error_type};
 
 use super::prelude::{http_error_code, io_error_code};
 use crate::sources::aws_kinesis_firehose::Compression;
diff --git a/src/internal_events/aws_sqs.rs b/src/internal_events/aws_sqs.rs
index 6a0f114e0371a..3cdd6e9539974 100644
--- a/src/internal_events/aws_sqs.rs
+++ b/src/internal_events/aws_sqs.rs
@@ -4,7 +4,7 @@ pub use s3::*;
 use vector_core::internal_event::InternalEvent;
 
 #[cfg(any(feature = "sources-aws_s3", feature = "sources-aws_sqs"))]
-use vector_common::internal_event::{error_stage, error_type};
+use vector_lib::internal_event::{error_stage, error_type};
 
 #[cfg(feature = "sources-aws_s3")]
 mod s3 {
diff --git a/src/internal_events/batch.rs b/src/internal_events/batch.rs
index 1044d1cca82ab..72462905a086c 100644
--- a/src/internal_events/batch.rs
+++ b/src/internal_events/batch.rs
@@ -2,9 +2,7 @@ use crate::emit;
 use metrics::counter;
 use vector_core::internal_event::InternalEvent;
 
-use vector_common::internal_event::{
-    error_stage, error_type, ComponentEventsDropped, UNINTENTIONAL,
-};
+use vector_lib::internal_event::{error_stage, error_type, ComponentEventsDropped, UNINTENTIONAL};
 
 #[derive(Debug)]
 pub struct LargeEventDroppedError {
diff --git a/src/internal_events/codecs.rs b/src/internal_events/codecs.rs
index 1801bce38d3c1..0794c0e21a450 100644
--- a/src/internal_events/codecs.rs
+++ b/src/internal_events/codecs.rs
@@ -2,9 +2,7 @@ use crate::emit;
 use metrics::counter;
 use vector_core::internal_event::InternalEvent;
 
-use vector_common::internal_event::{
-    error_stage, error_type, ComponentEventsDropped, UNINTENTIONAL,
-};
+use vector_lib::internal_event::{error_stage, error_type, ComponentEventsDropped, UNINTENTIONAL};
 
 #[derive(Debug)]
 pub struct DecoderFramingError<E> {
diff --git a/src/internal_events/common.rs b/src/internal_events/common.rs
index 0bf94f54ae25a..0099c24524ddc 100644
--- a/src/internal_events/common.rs
+++ b/src/internal_events/common.rs
@@ -5,9 +5,7 @@ use metrics::{counter, histogram};
 pub use vector_core::internal_event::EventsReceived;
 use vector_core::internal_event::InternalEvent;
 
-use vector_common::internal_event::{
-    error_stage, error_type, ComponentEventsDropped, UNINTENTIONAL,
-};
+use vector_lib::internal_event::{error_stage, error_type, ComponentEventsDropped, UNINTENTIONAL};
 
 #[derive(Debug)]
 pub struct EndpointBytesReceived<'a> {
diff --git a/src/internal_events/conditions.rs b/src/internal_events/conditions.rs
index 31ddeecc60bae..88576b8dac425 100644
--- a/src/internal_events/conditions.rs
+++ b/src/internal_events/conditions.rs
@@ -1,7 +1,7 @@
 use metrics::counter;
 use vector_core::internal_event::InternalEvent;
 
-use vector_common::internal_event::{error_stage, error_type};
+use vector_lib::internal_event::{error_stage, error_type};
 
 #[derive(Debug, Copy, Clone)]
 pub struct VrlConditionExecutionError<'a> {
diff --git a/src/internal_events/datadog_metrics.rs b/src/internal_events/datadog_metrics.rs
index c4daf1d3ce7f8..417629547ba78 100644
--- a/src/internal_events/datadog_metrics.rs
+++ b/src/internal_events/datadog_metrics.rs
@@ -2,9 +2,7 @@ use crate::emit;
 use metrics::counter;
 use vector_core::internal_event::InternalEvent;
 
-use vector_common::internal_event::{
-    error_stage, error_type, ComponentEventsDropped, UNINTENTIONAL,
-};
+use vector_lib::internal_event::{error_stage, error_type, ComponentEventsDropped, UNINTENTIONAL};
 
 #[derive(Debug)]
 pub struct DatadogMetricsEncodingError<'a> {
diff --git a/src/internal_events/datadog_traces.rs b/src/internal_events/datadog_traces.rs
index e6724a9adb484..77d3b2935a222 100644
--- a/src/internal_events/datadog_traces.rs
+++ b/src/internal_events/datadog_traces.rs
@@ -2,9 +2,7 @@ use crate::emit;
 use metrics::counter;
 use vector_core::internal_event::InternalEvent;
 
-use vector_common::internal_event::{
-    error_stage, error_type, ComponentEventsDropped, UNINTENTIONAL,
-};
+use vector_lib::internal_event::{error_stage, error_type, ComponentEventsDropped, UNINTENTIONAL};
 
 #[derive(Debug)]
 pub struct DatadogTracesEncodingError {
diff --git a/src/internal_events/dnstap.rs b/src/internal_events/dnstap.rs
index ce1fe24812d6c..4b68b965c58c0 100644
--- a/src/internal_events/dnstap.rs
+++ b/src/internal_events/dnstap.rs
@@ -1,7 +1,7 @@
 use metrics::counter;
 use vector_core::internal_event::InternalEvent;
 
-use vector_common::internal_event::{error_stage, error_type};
+use vector_lib::internal_event::{error_stage, error_type};
 
 #[derive(Debug)]
 pub(crate) struct DnstapParseError<E> {
diff --git a/src/internal_events/docker_logs.rs b/src/internal_events/docker_logs.rs
index 6992eb1b7ead4..49b423a5d4d1d 100644
--- a/src/internal_events/docker_logs.rs
+++ b/src/internal_events/docker_logs.rs
@@ -1,11 +1,11 @@
 use bollard::errors::Error;
 use chrono::ParseError;
 use metrics::counter;
-use vector_common::{
+use vector_core::internal_event::InternalEvent;
+use vector_lib::{
     internal_event::{error_stage, error_type},
     json_size::JsonSize,
 };
-use vector_core::internal_event::InternalEvent;
 
 #[derive(Debug)]
 pub struct DockerLogsEventsReceived<'a> {
diff --git a/src/internal_events/eventstoredb_metrics.rs b/src/internal_events/eventstoredb_metrics.rs
index 360192363d4fe..19dbff55b2ac4 100644
--- a/src/internal_events/eventstoredb_metrics.rs
+++ b/src/internal_events/eventstoredb_metrics.rs
@@ -1,7 +1,7 @@
 use metrics::counter;
 use vector_core::internal_event::InternalEvent;
 
-use vector_common::internal_event::{error_stage, error_type};
+use vector_lib::internal_event::{error_stage, error_type};
 
 #[derive(Debug)]
 pub struct EventStoreDbMetricsHttpError {
diff --git a/src/internal_events/exec.rs b/src/internal_events/exec.rs
index 4fd3461a1f822..4d5baabcd91c0 100644
--- a/src/internal_events/exec.rs
+++ b/src/internal_events/exec.rs
@@ -3,11 +3,11 @@ use std::time::Duration;
 use crate::emit;
 use metrics::{counter, histogram};
 use tokio::time::error::Elapsed;
-use vector_common::{
+use vector_core::internal_event::InternalEvent;
+use vector_lib::{
     internal_event::{error_stage, error_type, ComponentEventsDropped, UNINTENTIONAL},
     json_size::JsonSize,
 };
-use vector_core::internal_event::InternalEvent;
 
 use super::prelude::io_error_code;
 
diff --git a/src/internal_events/file.rs b/src/internal_events/file.rs
index aedac3d74afb2..d947698b2bc81 100644
--- a/src/internal_events/file.rs
+++ b/src/internal_events/file.rs
@@ -7,7 +7,7 @@ use crate::emit;
 #[cfg(any(feature = "sources-file", feature = "sources-kubernetes_logs"))]
 pub use self::source::*;
 
-use vector_common::internal_event::{error_stage, error_type};
+use vector_lib::internal_event::{error_stage, error_type};
 
 #[derive(Debug)]
 pub struct FileOpen {
@@ -87,7 +87,7 @@ mod source {
 
     use super::{FileOpen, InternalEvent};
     use crate::emit;
-    use vector_common::{
+    use vector_lib::{
         internal_event::{error_stage, error_type},
         json_size::JsonSize,
     };
diff --git a/src/internal_events/file_descriptor.rs b/src/internal_events/file_descriptor.rs
index 9d6b484c85f53..45f73bfc400cf 100644
--- a/src/internal_events/file_descriptor.rs
+++ b/src/internal_events/file_descriptor.rs
@@ -1,6 +1,6 @@
 use metrics::counter;
-use vector_common::internal_event::{error_stage, error_type};
 use vector_core::internal_event::InternalEvent;
+use vector_lib::internal_event::{error_stage, error_type};
 
 #[derive(Debug)]
 pub struct FileDescriptorReadError<E> {
diff --git a/src/internal_events/filter.rs b/src/internal_events/filter.rs
index 44d3c607f4f1f..867dbffa915da 100644
--- a/src/internal_events/filter.rs
+++ b/src/internal_events/filter.rs
@@ -1,8 +1,8 @@
-use vector_common::internal_event::{ComponentEventsDropped, Count, Registered, INTENTIONAL};
+use vector_lib::internal_event::{ComponentEventsDropped, Count, Registered, INTENTIONAL};
 
 use crate::register;
 
-vector_common::registered_event! (
+vector_lib::registered_event! (
     FilterEventsDropped => {
         events_dropped: Registered<ComponentEventsDropped<'static, INTENTIONAL>>
             = register!(ComponentEventsDropped::<INTENTIONAL>::from(
diff --git a/src/internal_events/fluent.rs b/src/internal_events/fluent.rs
index 9fbcdc0031e5f..5ac8685a65802 100644
--- a/src/internal_events/fluent.rs
+++ b/src/internal_events/fluent.rs
@@ -2,7 +2,7 @@ use metrics::counter;
 use vector_core::internal_event::InternalEvent;
 
 use crate::sources::fluent::DecodeError;
-use vector_common::internal_event::{error_stage, error_type};
+use vector_lib::internal_event::{error_stage, error_type};
 
 #[derive(Debug)]
 pub struct FluentMessageReceived {
diff --git a/src/internal_events/gcp_pubsub.rs b/src/internal_events/gcp_pubsub.rs
index 05621bc66b924..9e669620448d4 100644
--- a/src/internal_events/gcp_pubsub.rs
+++ b/src/internal_events/gcp_pubsub.rs
@@ -1,7 +1,7 @@
 use metrics::counter;
 use vector_core::internal_event::InternalEvent;
 
-use vector_common::internal_event::{error_stage, error_type};
+use vector_lib::internal_event::{error_stage, error_type};
 
 pub struct GcpPubsubConnectError {
     pub error: tonic::transport::Error,
diff --git a/src/internal_events/grpc.rs b/src/internal_events/grpc.rs
index e30388ed4710b..7f48b2930b290 100644
--- a/src/internal_events/grpc.rs
+++ b/src/internal_events/grpc.rs
@@ -1,6 +1,6 @@
 use metrics::counter;
-use vector_common::internal_event::{error_stage, error_type};
 use vector_core::internal_event::InternalEvent;
+use vector_lib::internal_event::{error_stage, error_type};
 
 #[derive(Debug)]
 pub struct GrpcInvalidCompressionSchemeError<'a> {
diff --git a/src/internal_events/host_metrics.rs b/src/internal_events/host_metrics.rs
index fc25394486111..59b957ff071e0 100644
--- a/src/internal_events/host_metrics.rs
+++ b/src/internal_events/host_metrics.rs
@@ -1,7 +1,7 @@
 use metrics::counter;
 use vector_core::internal_event::InternalEvent;
 
-use vector_common::internal_event::{error_stage, error_type};
+use vector_lib::internal_event::{error_stage, error_type};
 
 #[derive(Debug)]
 pub struct HostMetricsScrapeError {
diff --git a/src/internal_events/http.rs b/src/internal_events/http.rs
index 5243cf47628f5..ce4bae4ede61d 100644
--- a/src/internal_events/http.rs
+++ b/src/internal_events/http.rs
@@ -3,7 +3,7 @@ use std::error::Error;
 use metrics::{counter, histogram};
 use vector_core::internal_event::InternalEvent;
 
-use vector_common::{
+use vector_lib::{
     internal_event::{error_stage, error_type},
     json_size::JsonSize,
 };
diff --git a/src/internal_events/http_client.rs b/src/internal_events/http_client.rs
index e6cca8b743188..5d47336c8dad0 100644
--- a/src/internal_events/http_client.rs
+++ b/src/internal_events/http_client.rs
@@ -8,7 +8,7 @@ use hyper::{body::HttpBody, Error};
 use metrics::{counter, histogram};
 use vector_core::internal_event::InternalEvent;
 
-use vector_common::internal_event::{error_stage, error_type};
+use vector_lib::internal_event::{error_stage, error_type};
 
 #[derive(Debug)]
 pub struct AboutToSendHttpRequest<'a, T> {
diff --git a/src/internal_events/http_client_source.rs b/src/internal_events/http_client_source.rs
index b5eb27e8a3fd9..55a868c1da597 100644
--- a/src/internal_events/http_client_source.rs
+++ b/src/internal_events/http_client_source.rs
@@ -1,9 +1,9 @@
 use metrics::counter;
-use vector_common::{
+use vector_core::internal_event::InternalEvent;
+use vector_lib::{
     internal_event::{error_stage, error_type},
     json_size::JsonSize,
 };
-use vector_core::internal_event::InternalEvent;
 
 use super::prelude::http_error_code;
 
diff --git a/src/internal_events/influxdb.rs b/src/internal_events/influxdb.rs
index cbd1e36c0c472..4dcbbcf081264 100644
--- a/src/internal_events/influxdb.rs
+++ b/src/internal_events/influxdb.rs
@@ -1,9 +1,7 @@
 use crate::emit;
 use metrics::counter;
-use vector_common::internal_event::{
-    error_stage, error_type, ComponentEventsDropped, UNINTENTIONAL,
-};
 use vector_core::internal_event::InternalEvent;
+use vector_lib::internal_event::{error_stage, error_type, ComponentEventsDropped, UNINTENTIONAL};
 
 #[derive(Debug)]
 pub struct InfluxdbEncodingError {
diff --git a/src/internal_events/internal_logs.rs b/src/internal_events/internal_logs.rs
index 5d6637bfec986..9f0806db7b0a1 100644
--- a/src/internal_events/internal_logs.rs
+++ b/src/internal_events/internal_logs.rs
@@ -1,6 +1,6 @@
 use metrics::counter;
-use vector_common::json_size::JsonSize;
 use vector_core::internal_event::InternalEvent;
+use vector_lib::json_size::JsonSize;
 
 #[derive(Debug)]
 pub struct InternalLogsBytesReceived {
diff --git a/src/internal_events/journald.rs b/src/internal_events/journald.rs
index 1863990c4b9ee..5f0fc62cc767f 100644
--- a/src/internal_events/journald.rs
+++ b/src/internal_events/journald.rs
@@ -2,7 +2,7 @@ use codecs::decoding::BoxedFramingError;
 use metrics::counter;
 use vector_core::internal_event::InternalEvent;
 
-use vector_common::internal_event::{error_stage, error_type};
+use vector_lib::internal_event::{error_stage, error_type};
 
 #[derive(Debug)]
 pub struct JournaldInvalidRecordError {
diff --git a/src/internal_events/kafka.rs b/src/internal_events/kafka.rs
index 7a968626d0cb9..b6d50da6407ba 100644
--- a/src/internal_events/kafka.rs
+++ b/src/internal_events/kafka.rs
@@ -2,7 +2,7 @@ use metrics::{counter, gauge};
 use vector_core::{internal_event::InternalEvent, update_counter};
 use vrl::path::OwnedTargetPath;
 
-use vector_common::{
+use vector_lib::{
     internal_event::{error_stage, error_type},
     json_size::JsonSize,
 };
diff --git a/src/internal_events/kubernetes_logs.rs b/src/internal_events/kubernetes_logs.rs
index aff0109295078..44a7964070028 100644
--- a/src/internal_events/kubernetes_logs.rs
+++ b/src/internal_events/kubernetes_logs.rs
@@ -3,7 +3,7 @@ use vector_core::internal_event::InternalEvent;
 
 use crate::emit;
 use crate::event::Event;
-use vector_common::{
+use vector_lib::{
     internal_event::{error_stage, error_type, ComponentEventsDropped, UNINTENTIONAL},
     json_size::JsonSize,
 };
diff --git a/src/internal_events/log_to_metric.rs b/src/internal_events/log_to_metric.rs
index 1925dd135efba..800d2693a4d3b 100644
--- a/src/internal_events/log_to_metric.rs
+++ b/src/internal_events/log_to_metric.rs
@@ -4,9 +4,7 @@ use metrics::counter;
 use vector_core::internal_event::InternalEvent;
 
 use crate::emit;
-use vector_common::internal_event::{
-    error_stage, error_type, ComponentEventsDropped, UNINTENTIONAL,
-};
+use vector_lib::internal_event::{error_stage, error_type, ComponentEventsDropped, UNINTENTIONAL};
 
 pub struct LogToMetricFieldNullError<'a> {
     pub field: &'a str,
diff --git a/src/internal_events/logplex.rs b/src/internal_events/logplex.rs
index ab0be914847d0..2d1e07cd8cad1 100644
--- a/src/internal_events/logplex.rs
+++ b/src/internal_events/logplex.rs
@@ -1,6 +1,6 @@
 use metrics::counter;
-use vector_common::internal_event::{error_stage, error_type};
 use vector_core::internal_event::InternalEvent;
+use vector_lib::internal_event::{error_stage, error_type};
 
 use super::prelude::io_error_code;
 
diff --git a/src/internal_events/loki.rs b/src/internal_events/loki.rs
index eff93d7a7a429..ea88bf2207fbf 100644
--- a/src/internal_events/loki.rs
+++ b/src/internal_events/loki.rs
@@ -1,7 +1,7 @@
 use crate::emit;
 use metrics::counter;
-use vector_common::internal_event::{error_stage, error_type};
 use vector_core::internal_event::{ComponentEventsDropped, InternalEvent, INTENTIONAL};
+use vector_lib::internal_event::{error_stage, error_type};
 
 #[derive(Debug)]
 pub struct LokiEventUnlabeledError;
diff --git a/src/internal_events/lua.rs b/src/internal_events/lua.rs
index a18665d87b419..f9fb819af7557 100644
--- a/src/internal_events/lua.rs
+++ b/src/internal_events/lua.rs
@@ -3,9 +3,7 @@ use vector_core::internal_event::InternalEvent;
 
 use crate::emit;
 use crate::transforms::lua::v2::BuildError;
-use vector_common::internal_event::{
-    error_stage, error_type, ComponentEventsDropped, UNINTENTIONAL,
-};
+use vector_lib::internal_event::{error_stage, error_type, ComponentEventsDropped, UNINTENTIONAL};
 
 #[derive(Debug)]
 pub struct LuaGcTriggered {
diff --git a/src/internal_events/metric_to_log.rs b/src/internal_events/metric_to_log.rs
index 14463782d3adc..efec0705507fa 100644
--- a/src/internal_events/metric_to_log.rs
+++ b/src/internal_events/metric_to_log.rs
@@ -3,9 +3,7 @@ use serde_json::Error;
 use vector_core::internal_event::InternalEvent;
 
 use crate::emit;
-use vector_common::internal_event::{
-    error_stage, error_type, ComponentEventsDropped, UNINTENTIONAL,
-};
+use vector_lib::internal_event::{error_stage, error_type, ComponentEventsDropped, UNINTENTIONAL};
 
 #[derive(Debug)]
 pub struct MetricToLogSerializeError {
diff --git a/src/internal_events/mod.rs b/src/internal_events/mod.rs
index 2692212dc9e2e..64b8664aeef0d 100644
--- a/src/internal_events/mod.rs
+++ b/src/internal_events/mod.rs
@@ -276,7 +276,7 @@ pub use self::{
 #[macro_export]
 macro_rules! emit {
     ($event:expr) => {
-        vector_common::internal_event::emit(vector_common::internal_event::DefaultName {
+        vector_lib::internal_event::emit(vector_lib::internal_event::DefaultName {
             event: $event,
             name: stringify!($event),
         })
@@ -287,7 +287,7 @@ macro_rules! emit {
 #[macro_export]
 macro_rules! emit {
     ($event:expr) => {
-        vector_common::internal_event::emit($event)
+        vector_lib::internal_event::emit($event)
     };
 }
 
@@ -295,7 +295,7 @@ macro_rules! emit {
 #[macro_export]
 macro_rules! register {
     ($event:expr) => {
-        vector_common::internal_event::register(vector_common::internal_event::DefaultName {
+        vector_lib::internal_event::register(vector_lib::internal_event::DefaultName {
             event: $event,
             name: stringify!($event),
         })
@@ -306,6 +306,6 @@ macro_rules! register {
 #[macro_export]
 macro_rules! register {
     ($event:expr) => {
-        vector_common::internal_event::register($event)
+        vector_lib::internal_event::register($event)
     };
 }
diff --git a/src/internal_events/mongodb_metrics.rs b/src/internal_events/mongodb_metrics.rs
index 1e749dc5ba8c2..715a886ff48e2 100644
--- a/src/internal_events/mongodb_metrics.rs
+++ b/src/internal_events/mongodb_metrics.rs
@@ -2,7 +2,7 @@ use metrics::counter;
 use mongodb::{bson, error::Error as MongoError};
 use vector_core::internal_event::InternalEvent;
 
-use vector_common::{
+use vector_lib::{
     internal_event::{error_stage, error_type},
     json_size::JsonSize,
 };
diff --git a/src/internal_events/nginx_metrics.rs b/src/internal_events/nginx_metrics.rs
index eb5adcf8485d1..7d5fab1d272e3 100644
--- a/src/internal_events/nginx_metrics.rs
+++ b/src/internal_events/nginx_metrics.rs
@@ -2,7 +2,7 @@ use metrics::counter;
 use vector_core::internal_event::InternalEvent;
 
 use crate::sources::nginx_metrics::parser::ParseError;
-use vector_common::{
+use vector_lib::{
     internal_event::{error_stage, error_type},
     json_size::JsonSize,
 };
diff --git a/src/internal_events/parser.rs b/src/internal_events/parser.rs
index 07826e3b6f155..fe29ccfc363be 100644
--- a/src/internal_events/parser.rs
+++ b/src/internal_events/parser.rs
@@ -4,9 +4,7 @@ use metrics::counter;
 use vector_core::internal_event::InternalEvent;
 
 use crate::emit;
-use vector_common::internal_event::{
-    error_stage, error_type, ComponentEventsDropped, UNINTENTIONAL,
-};
+use vector_lib::internal_event::{error_stage, error_type, ComponentEventsDropped, UNINTENTIONAL};
 
 fn truncate_string_at(s: &str, maxlen: usize) -> Cow<str> {
     let ellipsis: &str = "[...]";
diff --git a/src/internal_events/postgresql_metrics.rs b/src/internal_events/postgresql_metrics.rs
index 77dc451152c15..bc5ca8a230587 100644
--- a/src/internal_events/postgresql_metrics.rs
+++ b/src/internal_events/postgresql_metrics.rs
@@ -1,7 +1,7 @@
 use metrics::counter;
 use vector_core::internal_event::InternalEvent;
 
-use vector_common::internal_event::{error_stage, error_type};
+use vector_lib::internal_event::{error_stage, error_type};
 
 #[derive(Debug)]
 pub struct PostgresqlMetricsCollectError<'a> {
diff --git a/src/internal_events/process.rs b/src/internal_events/process.rs
index 82fb2add4c09d..0ed898aa77297 100644
--- a/src/internal_events/process.rs
+++ b/src/internal_events/process.rs
@@ -3,7 +3,7 @@ use metrics::gauge;
 use vector_core::internal_event::InternalEvent;
 
 use crate::{built_info, config};
-use vector_common::internal_event::{error_stage, error_type};
+use vector_lib::internal_event::{error_stage, error_type};
 
 #[derive(Debug)]
 pub struct VectorStarted;
diff --git a/src/internal_events/prometheus.rs b/src/internal_events/prometheus.rs
index 1f0c96684ba19..4a85609ec7fca 100644
--- a/src/internal_events/prometheus.rs
+++ b/src/internal_events/prometheus.rs
@@ -8,9 +8,7 @@ use prometheus_parser::ParserError;
 use vector_core::internal_event::InternalEvent;
 
 use crate::emit;
-use vector_common::internal_event::{
-    error_stage, error_type, ComponentEventsDropped, UNINTENTIONAL,
-};
+use vector_lib::internal_event::{error_stage, error_type, ComponentEventsDropped, UNINTENTIONAL};
 
 #[cfg(feature = "sources-prometheus-scrape")]
 #[derive(Debug)]
diff --git a/src/internal_events/pulsar.rs b/src/internal_events/pulsar.rs
index ffa5f51883d8a..f714e77d40a35 100644
--- a/src/internal_events/pulsar.rs
+++ b/src/internal_events/pulsar.rs
@@ -2,14 +2,12 @@ use metrics::counter;
 use vector_core::internal_event::InternalEvent;
 
 use crate::emit;
-use vector_common::internal_event::{
-    error_stage, error_type, ComponentEventsDropped, UNINTENTIONAL,
-};
+use vector_lib::internal_event::{error_stage, error_type, ComponentEventsDropped, UNINTENTIONAL};
 
 #[derive(Debug)]
 pub struct PulsarSendingError {
     pub count: usize,
-    pub error: vector_common::Error,
+    pub error: vector_lib::Error,
 }
 
 impl InternalEvent for PulsarSendingError {
diff --git a/src/internal_events/redis.rs b/src/internal_events/redis.rs
index 6a25b79af1a39..998b81fc48a35 100644
--- a/src/internal_events/redis.rs
+++ b/src/internal_events/redis.rs
@@ -1,7 +1,7 @@
 use metrics::counter;
 use vector_core::internal_event::InternalEvent;
 
-use vector_common::internal_event::{error_stage, error_type};
+use vector_lib::internal_event::{error_stage, error_type};
 
 #[derive(Debug)]
 pub struct RedisReceiveEventError {
diff --git a/src/internal_events/remap.rs b/src/internal_events/remap.rs
index 7a6bb5500cc30..66fbaa67b4212 100644
--- a/src/internal_events/remap.rs
+++ b/src/internal_events/remap.rs
@@ -2,7 +2,7 @@ use crate::emit;
 use metrics::counter;
 use vector_core::internal_event::InternalEvent;
 
-use vector_common::internal_event::{
+use vector_lib::internal_event::{
     error_stage, error_type, ComponentEventsDropped, INTENTIONAL, UNINTENTIONAL,
 };
 
diff --git a/src/internal_events/sematext_metrics.rs b/src/internal_events/sematext_metrics.rs
index fea41b796c9f1..af14d78fa8367 100644
--- a/src/internal_events/sematext_metrics.rs
+++ b/src/internal_events/sematext_metrics.rs
@@ -2,9 +2,7 @@ use metrics::counter;
 use vector_core::internal_event::InternalEvent;
 
 use crate::{emit, event::metric::Metric};
-use vector_common::internal_event::{
-    error_stage, error_type, ComponentEventsDropped, UNINTENTIONAL,
-};
+use vector_lib::internal_event::{error_stage, error_type, ComponentEventsDropped, UNINTENTIONAL};
 
 #[derive(Debug)]
 pub struct SematextMetricsInvalidMetricError<'a> {
diff --git a/src/internal_events/socket.rs b/src/internal_events/socket.rs
index daa03a27991b5..d68cb41cf1a88 100644
--- a/src/internal_events/socket.rs
+++ b/src/internal_events/socket.rs
@@ -1,9 +1,9 @@
 use metrics::counter;
-use vector_common::{
+use vector_core::internal_event::{ComponentEventsDropped, InternalEvent, UNINTENTIONAL};
+use vector_lib::{
     internal_event::{error_stage, error_type},
     json_size::JsonSize,
 };
-use vector_core::internal_event::{ComponentEventsDropped, InternalEvent, UNINTENTIONAL};
 
 use crate::emit;
 
diff --git a/src/internal_events/splunk_hec.rs b/src/internal_events/splunk_hec.rs
index 8dd7040a1f781..5b155386db401 100644
--- a/src/internal_events/splunk_hec.rs
+++ b/src/internal_events/splunk_hec.rs
@@ -16,13 +16,13 @@ mod sink {
         event::metric::{MetricKind, MetricValue},
         sinks::splunk_hec::common::acknowledgements::HecAckApiError,
     };
-    use vector_common::internal_event::{
+    use vector_lib::internal_event::{
         error_stage, error_type, ComponentEventsDropped, UNINTENTIONAL,
     };
 
     #[derive(Debug)]
     pub struct SplunkEventEncodeError {
-        pub error: vector_common::Error,
+        pub error: vector_lib::Error,
     }
 
     impl InternalEvent for SplunkEventEncodeError {
@@ -201,7 +201,7 @@ mod source {
     use vector_core::internal_event::InternalEvent;
 
     use crate::sources::splunk_hec::ApiError;
-    use vector_common::internal_event::{error_stage, error_type};
+    use vector_lib::internal_event::{error_stage, error_type};
 
     #[derive(Debug)]
     pub struct SplunkHecRequestReceived<'a> {
diff --git a/src/internal_events/statsd_sink.rs b/src/internal_events/statsd_sink.rs
index 20766f3376aad..73be541eeea23 100644
--- a/src/internal_events/statsd_sink.rs
+++ b/src/internal_events/statsd_sink.rs
@@ -3,9 +3,7 @@ use vector_core::internal_event::InternalEvent;
 
 use crate::emit;
 use crate::event::metric::{MetricKind, MetricValue};
-use vector_common::internal_event::{
-    error_stage, error_type, ComponentEventsDropped, UNINTENTIONAL,
-};
+use vector_lib::internal_event::{error_stage, error_type, ComponentEventsDropped, UNINTENTIONAL};
 
 #[derive(Debug)]
 pub struct StatsdInvalidMetricError<'a> {
diff --git a/src/internal_events/tcp.rs b/src/internal_events/tcp.rs
index 5c915278bba9e..1bd99e835172e 100644
--- a/src/internal_events/tcp.rs
+++ b/src/internal_events/tcp.rs
@@ -1,8 +1,8 @@
 use std::net::SocketAddr;
 
 use metrics::counter;
-use vector_common::internal_event::{error_stage, error_type};
 use vector_core::internal_event::InternalEvent;
+use vector_lib::internal_event::{error_stage, error_type};
 
 use crate::{emit, internal_events::SocketOutgoingConnectionError, tls::TlsError};
 
diff --git a/src/internal_events/template.rs b/src/internal_events/template.rs
index b9ecd702d0dca..c263e46250c4a 100644
--- a/src/internal_events/template.rs
+++ b/src/internal_events/template.rs
@@ -2,7 +2,7 @@ use crate::emit;
 use metrics::counter;
 use vector_core::internal_event::{ComponentEventsDropped, InternalEvent, UNINTENTIONAL};
 
-use vector_common::internal_event::{error_stage, error_type};
+use vector_lib::internal_event::{error_stage, error_type};
 
 pub struct TemplateRenderingError<'a> {
     pub field: Option<&'a str>,
diff --git a/src/internal_events/udp.rs b/src/internal_events/udp.rs
index e74ef16b16abd..0821107b19e01 100644
--- a/src/internal_events/udp.rs
+++ b/src/internal_events/udp.rs
@@ -1,8 +1,6 @@
 use metrics::counter;
-use vector_common::internal_event::{
-    error_stage, error_type, ComponentEventsDropped, UNINTENTIONAL,
-};
 use vector_core::internal_event::InternalEvent;
+use vector_lib::internal_event::{error_stage, error_type, ComponentEventsDropped, UNINTENTIONAL};
 
 use crate::{emit, internal_events::SocketOutgoingConnectionError};
 
diff --git a/src/internal_events/unix.rs b/src/internal_events/unix.rs
index 2f004ec38b826..4affef0370ea9 100644
--- a/src/internal_events/unix.rs
+++ b/src/internal_events/unix.rs
@@ -1,10 +1,8 @@
 use std::{io::Error, path::Path};
 
 use metrics::counter;
-use vector_common::internal_event::{
-    error_stage, error_type, ComponentEventsDropped, UNINTENTIONAL,
-};
 use vector_core::internal_event::InternalEvent;
+use vector_lib::internal_event::{error_stage, error_type, ComponentEventsDropped, UNINTENTIONAL};
 
 use crate::{emit, internal_events::SocketOutgoingConnectionError};
 
diff --git a/src/internal_events/websocket.rs b/src/internal_events/websocket.rs
index 93cfb11128f6b..acc7c25203b0e 100644
--- a/src/internal_events/websocket.rs
+++ b/src/internal_events/websocket.rs
@@ -4,7 +4,7 @@ use std::fmt::Debug;
 use metrics::counter;
 use vector_core::internal_event::InternalEvent;
 
-use vector_common::internal_event::{error_stage, error_type};
+use vector_lib::internal_event::{error_stage, error_type};
 
 #[derive(Debug)]
 pub struct WsConnectionEstablished;
diff --git a/src/internal_events/windows.rs b/src/internal_events/windows.rs
index b0adc6f3d6beb..3634ab99af1f8 100644
--- a/src/internal_events/windows.rs
+++ b/src/internal_events/windows.rs
@@ -1,7 +1,7 @@
 use metrics::counter;
 use vector_core::internal_event::InternalEvent;
 
-use vector_common::internal_event::{error_stage, error_type};
+use vector_lib::internal_event::{error_stage, error_type};
 
 #[derive(Debug)]
 pub struct WindowsServiceStart<'a> {
diff --git a/src/kafka.rs b/src/kafka.rs
index 9c940511275e0..97776e0b014c9 100644
--- a/src/kafka.rs
+++ b/src/kafka.rs
@@ -3,8 +3,8 @@ use std::path::{Path, PathBuf};
 
 use rdkafka::{consumer::ConsumerContext, ClientConfig, ClientContext, Statistics};
 use snafu::Snafu;
-use vector_common::sensitive_string::SensitiveString;
 use vector_config::configurable_component;
+use vector_lib::sensitive_string::SensitiveString;
 
 use crate::{
     internal_events::KafkaStatisticsReceived, tls::TlsEnableableConfig, tls::PEM_START_MARKER,
diff --git a/src/lib.rs b/src/lib.rs
index b133205c844b9..8b726b0144b7a 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -121,8 +121,8 @@ pub mod validate;
 pub mod vector_windows;
 
 pub use source_sender::SourceSender;
-pub use vector_common::{shutdown, Error, Result};
 pub use vector_core::{event, metrics, schema, tcp, tls};
+pub use vector_lib::{shutdown, Error, Result};
 
 static APP_NAME_SLUG: std::sync::OnceLock<String> = std::sync::OnceLock::new();
 
diff --git a/src/nats.rs b/src/nats.rs
index 5d20516d49939..edcac86fd68db 100644
--- a/src/nats.rs
+++ b/src/nats.rs
@@ -1,7 +1,7 @@
 use nkeys::error::Error as NKeysError;
 use snafu::{ResultExt, Snafu};
-use vector_common::sensitive_string::SensitiveString;
 use vector_config::configurable_component;
+use vector_lib::sensitive_string::SensitiveString;
 
 use crate::tls::TlsEnableableConfig;
 
diff --git a/src/sinks/appsignal/config.rs b/src/sinks/appsignal/config.rs
index 7d85422fbccc2..94bcf770c32b7 100644
--- a/src/sinks/appsignal/config.rs
+++ b/src/sinks/appsignal/config.rs
@@ -2,12 +2,12 @@ use futures::FutureExt;
 use http::{header::AUTHORIZATION, Request, Uri};
 use hyper::Body;
 use tower::ServiceBuilder;
-use vector_common::sensitive_string::SensitiveString;
 use vector_config::configurable_component;
 use vector_core::{
     config::{proxy::ProxyConfig, AcknowledgementsConfig, DataType, Input},
     tls::{MaybeTlsSettings, TlsEnableableConfig},
 };
+use vector_lib::sensitive_string::SensitiveString;
 
 use crate::{
     codecs::Transformer,
diff --git a/src/sinks/appsignal/encoder.rs b/src/sinks/appsignal/encoder.rs
index f56edd04c2f68..59731316ab66f 100644
--- a/src/sinks/appsignal/encoder.rs
+++ b/src/sinks/appsignal/encoder.rs
@@ -1,6 +1,6 @@
 use serde_json::{json, Value};
-use vector_common::request_metadata::GroupedCountByteSize;
 use vector_core::{config::telemetry, event::Event, EstimatedJsonEncodedSizeOf};
+use vector_lib::request_metadata::GroupedCountByteSize;
 
 use crate::{
     codecs::Transformer,
diff --git a/src/sinks/appsignal/request_builder.rs b/src/sinks/appsignal/request_builder.rs
index 96c0cece7e6f4..83e9923461d2a 100644
--- a/src/sinks/appsignal/request_builder.rs
+++ b/src/sinks/appsignal/request_builder.rs
@@ -1,11 +1,11 @@
 use bytes::Bytes;
 
-use vector_common::{
+use vector_core::event::Event;
+use vector_lib::{
     byte_size_of::ByteSizeOf,
     finalization::{EventFinalizers, Finalizable},
     request_metadata::{MetaDescriptive, RequestMetadata},
 };
-use vector_core::event::Event;
 
 use crate::sinks::util::{
     metadata::RequestMetadataBuilder, request_builder::EncodeResult, Compression, RequestBuilder,
diff --git a/src/sinks/appsignal/service.rs b/src/sinks/appsignal/service.rs
index 188972eae7963..e505ab1569c7c 100644
--- a/src/sinks/appsignal/service.rs
+++ b/src/sinks/appsignal/service.rs
@@ -9,7 +9,7 @@ use http::{header::AUTHORIZATION, Request, StatusCode, Uri};
 use hyper::Body;
 use tower::{Service, ServiceExt};
 
-use vector_common::{
+use vector_lib::{
     finalization::EventStatus, request_metadata::GroupedCountByteSize,
     request_metadata::MetaDescriptive, sensitive_string::SensitiveString,
 };
diff --git a/src/sinks/aws_cloudwatch_logs/request_builder.rs b/src/sinks/aws_cloudwatch_logs/request_builder.rs
index 177a9ccc5a5e8..ac8d6a0367833 100644
--- a/src/sinks/aws_cloudwatch_logs/request_builder.rs
+++ b/src/sinks/aws_cloudwatch_logs/request_builder.rs
@@ -3,11 +3,11 @@ use std::num::NonZeroUsize;
 use bytes::BytesMut;
 use chrono::Utc;
 use tokio_util::codec::Encoder as _;
-use vector_common::request_metadata::{MetaDescriptive, RequestMetadata};
 use vector_core::{
     event::{EventFinalizers, Finalizable},
     ByteSizeOf,
 };
+use vector_lib::request_metadata::{MetaDescriptive, RequestMetadata};
 
 use super::TemplateRenderingError;
 use crate::{
diff --git a/src/sinks/aws_cloudwatch_logs/service.rs b/src/sinks/aws_cloudwatch_logs/service.rs
index 0df88c82bf565..5189563bac725 100644
--- a/src/sinks/aws_cloudwatch_logs/service.rs
+++ b/src/sinks/aws_cloudwatch_logs/service.rs
@@ -22,7 +22,7 @@ use tower::{
     timeout::Timeout,
     Service, ServiceBuilder, ServiceExt,
 };
-use vector_common::{
+use vector_lib::{
     finalization::EventStatus,
     request_metadata::{GroupedCountByteSize, MetaDescriptive},
 };
diff --git a/src/sinks/aws_cloudwatch_logs/sink.rs b/src/sinks/aws_cloudwatch_logs/sink.rs
index b734774bfbb9b..ff4e65bf9bc8c 100644
--- a/src/sinks/aws_cloudwatch_logs/sink.rs
+++ b/src/sinks/aws_cloudwatch_logs/sink.rs
@@ -4,8 +4,8 @@ use async_trait::async_trait;
 use chrono::{Duration, Utc};
 use futures::{future, stream::BoxStream, StreamExt};
 use tower::Service;
-use vector_common::request_metadata::{MetaDescriptive, RequestMetadata};
 use vector_core::{partition::Partitioner, sink::StreamSink};
+use vector_lib::request_metadata::{MetaDescriptive, RequestMetadata};
 use vector_stream::{BatcherSettings, DriverResponse};
 
 use crate::{
diff --git a/src/sinks/aws_kinesis/request_builder.rs b/src/sinks/aws_kinesis/request_builder.rs
index 0483dd01e318b..9e3d271e2388c 100644
--- a/src/sinks/aws_kinesis/request_builder.rs
+++ b/src/sinks/aws_kinesis/request_builder.rs
@@ -1,8 +1,8 @@
 use std::{io, marker::PhantomData};
 
 use bytes::Bytes;
-use vector_common::request_metadata::{MetaDescriptive, RequestMetadata};
 use vector_core::ByteSizeOf;
+use vector_lib::request_metadata::{MetaDescriptive, RequestMetadata};
 
 use super::{
     record::Record,
diff --git a/src/sinks/aws_s3/sink.rs b/src/sinks/aws_s3/sink.rs
index c9849cf834e13..4c4f745fedd32 100644
--- a/src/sinks/aws_s3/sink.rs
+++ b/src/sinks/aws_s3/sink.rs
@@ -4,8 +4,8 @@ use bytes::Bytes;
 use chrono::Utc;
 use codecs::encoding::Framer;
 use uuid::Uuid;
-use vector_common::request_metadata::RequestMetadata;
 use vector_core::event::Finalizable;
+use vector_lib::request_metadata::RequestMetadata;
 
 use crate::{
     codecs::{Encoder, Transformer},
diff --git a/src/sinks/aws_s_s/request_builder.rs b/src/sinks/aws_s_s/request_builder.rs
index fb977244e932c..afb4f1bf882f7 100644
--- a/src/sinks/aws_s_s/request_builder.rs
+++ b/src/sinks/aws_s_s/request_builder.rs
@@ -1,6 +1,6 @@
 use bytes::Bytes;
-use vector_common::request_metadata::{MetaDescriptive, RequestMetadata};
 use vector_core::ByteSizeOf;
+use vector_lib::request_metadata::{MetaDescriptive, RequestMetadata};
 
 use crate::codecs::EncodingConfig;
 use crate::{
diff --git a/src/sinks/aws_s_s/service.rs b/src/sinks/aws_s_s/service.rs
index 4d4d1f88832f1..5d02d0e2fff49 100644
--- a/src/sinks/aws_s_s/service.rs
+++ b/src/sinks/aws_s_s/service.rs
@@ -4,8 +4,8 @@ use std::task::{Context, Poll};
 use aws_sdk_sqs::types::SdkError;
 use futures::future::BoxFuture;
 use tower::Service;
-use vector_common::request_metadata::GroupedCountByteSize;
 use vector_core::{event::EventStatus, ByteSizeOf};
+use vector_lib::request_metadata::GroupedCountByteSize;
 use vector_stream::DriverResponse;
 
 use super::{client::Client, request_builder::SendMessageEntry};
diff --git a/src/sinks/axiom.rs b/src/sinks/axiom.rs
index e3213f3ea04ed..2e33da17b2071 100644
--- a/src/sinks/axiom.rs
+++ b/src/sinks/axiom.rs
@@ -1,7 +1,7 @@
 use std::collections::HashMap;
 
-use vector_common::sensitive_string::SensitiveString;
 use vector_config::configurable_component;
+use vector_lib::sensitive_string::SensitiveString;
 
 use crate::{
     config::{AcknowledgementsConfig, DataType, GenerateConfig, Input, SinkConfig, SinkContext},
diff --git a/src/sinks/azure_blob/config.rs b/src/sinks/azure_blob/config.rs
index 2fb5287fa9ca3..01a7369dfdd81 100644
--- a/src/sinks/azure_blob/config.rs
+++ b/src/sinks/azure_blob/config.rs
@@ -3,8 +3,8 @@ use std::sync::Arc;
 use azure_storage_blobs::prelude::*;
 use codecs::{encoding::Framer, JsonSerializerConfig, NewlineDelimitedEncoderConfig};
 use tower::ServiceBuilder;
-use vector_common::sensitive_string::SensitiveString;
 use vector_config::configurable_component;
+use vector_lib::sensitive_string::SensitiveString;
 
 use super::request_builder::AzureBlobRequestOptions;
 use crate::{
diff --git a/src/sinks/azure_blob/request_builder.rs b/src/sinks/azure_blob/request_builder.rs
index 0ae3fb848d922..a12417ec5c684 100644
--- a/src/sinks/azure_blob/request_builder.rs
+++ b/src/sinks/azure_blob/request_builder.rs
@@ -2,8 +2,8 @@ use bytes::Bytes;
 use chrono::Utc;
 use codecs::encoding::Framer;
 use uuid::Uuid;
-use vector_common::request_metadata::RequestMetadata;
 use vector_core::EstimatedJsonEncodedSizeOf;
+use vector_lib::request_metadata::RequestMetadata;
 
 use crate::{
     codecs::{Encoder, Transformer},
diff --git a/src/sinks/azure_blob/test.rs b/src/sinks/azure_blob/test.rs
index d35606ac12938..3733a9b992926 100644
--- a/src/sinks/azure_blob/test.rs
+++ b/src/sinks/azure_blob/test.rs
@@ -4,8 +4,8 @@ use codecs::{
     encoding::{Framer, FramingConfig},
     NewlineDelimitedEncoder, TextSerializerConfig,
 };
-use vector_common::request_metadata::GroupedCountByteSize;
 use vector_core::{partition::Partitioner, EstimatedJsonEncodedSizeOf};
+use vector_lib::request_metadata::GroupedCountByteSize;
 
 use super::config::AzureBlobSinkConfig;
 use super::request_builder::AzureBlobRequestOptions;
diff --git a/src/sinks/azure_common/config.rs b/src/sinks/azure_common/config.rs
index 1fa8494221e3e..1d6fdf32e9258 100644
--- a/src/sinks/azure_common/config.rs
+++ b/src/sinks/azure_common/config.rs
@@ -8,7 +8,7 @@ use bytes::Bytes;
 use futures::FutureExt;
 use http::StatusCode;
 use snafu::Snafu;
-use vector_common::{
+use vector_lib::{
     json_size::JsonSize,
     request_metadata::{GroupedCountByteSize, MetaDescriptive, RequestMetadata},
 };
diff --git a/src/sinks/azure_monitor_logs/config.rs b/src/sinks/azure_monitor_logs/config.rs
index 7a48b88c7b82b..44a3ee2afd485 100644
--- a/src/sinks/azure_monitor_logs/config.rs
+++ b/src/sinks/azure_monitor_logs/config.rs
@@ -1,9 +1,9 @@
 use lookup::{lookup_v2::OptionalValuePath, OwnedValuePath};
 use openssl::{base64, pkey};
 
-use vector_common::sensitive_string::SensitiveString;
 use vector_config::configurable_component;
 use vector_core::{config::log_schema, schema};
+use vector_lib::sensitive_string::SensitiveString;
 use vrl::value::Kind;
 
 use crate::{
diff --git a/src/sinks/blackhole/sink.rs b/src/sinks/blackhole/sink.rs
index 09fb5f6353d94..9ed7164e44309 100644
--- a/src/sinks/blackhole/sink.rs
+++ b/src/sinks/blackhole/sink.rs
@@ -13,10 +13,10 @@ use tokio::{
     sync::watch,
     time::{interval, sleep_until},
 };
-use vector_common::internal_event::{
+use vector_core::EstimatedJsonEncodedSizeOf;
+use vector_lib::internal_event::{
     ByteSize, BytesSent, CountByteSize, EventsSent, InternalEventHandle as _, Output, Protocol,
 };
-use vector_core::EstimatedJsonEncodedSizeOf;
 
 use crate::{
     event::{EventArray, EventContainer},
diff --git a/src/sinks/databend/integration_tests.rs b/src/sinks/databend/integration_tests.rs
index 5438775a4d385..7bc592c843274 100644
--- a/src/sinks/databend/integration_tests.rs
+++ b/src/sinks/databend/integration_tests.rs
@@ -3,9 +3,9 @@ use std::collections::BTreeMap;
 use futures::future::ready;
 use futures::stream;
 
-use vector_common::sensitive_string::SensitiveString;
 use vector_core::config::proxy::ProxyConfig;
 use vector_core::event::{BatchNotifier, BatchStatus, BatchStatusReceiver, Event, LogEvent};
+use vector_lib::sensitive_string::SensitiveString;
 
 use crate::sinks::util::test::load_sink;
 use crate::{
diff --git a/src/sinks/databend/request_builder.rs b/src/sinks/databend/request_builder.rs
index 7636e43aa165a..ddbbff1e1f6e4 100644
--- a/src/sinks/databend/request_builder.rs
+++ b/src/sinks/databend/request_builder.rs
@@ -2,9 +2,9 @@ use std::io;
 
 use bytes::Bytes;
 use codecs::encoding::Framer;
-use vector_common::finalization::{EventFinalizers, Finalizable};
-use vector_common::request_metadata::RequestMetadata;
 use vector_core::event::Event;
+use vector_lib::finalization::{EventFinalizers, Finalizable};
+use vector_lib::request_metadata::RequestMetadata;
 
 use crate::sinks::util::Compression;
 use crate::{
diff --git a/src/sinks/databend/service.rs b/src/sinks/databend/service.rs
index 463c880749b3d..b76d366afd1ed 100644
--- a/src/sinks/databend/service.rs
+++ b/src/sinks/databend/service.rs
@@ -8,8 +8,8 @@ use rand::{thread_rng, Rng};
 use rand_distr::Alphanumeric;
 use snafu::Snafu;
 use tower::Service;
-use vector_common::finalization::{EventFinalizers, EventStatus, Finalizable};
-use vector_common::request_metadata::{GroupedCountByteSize, MetaDescriptive, RequestMetadata};
+use vector_lib::finalization::{EventFinalizers, EventStatus, Finalizable};
+use vector_lib::request_metadata::{GroupedCountByteSize, MetaDescriptive, RequestMetadata};
 use vector_stream::DriverResponse;
 
 use crate::{internal_events::EndpointBytesSent, sinks::util::retries::RetryLogic};
diff --git a/src/sinks/datadog/events/request_builder.rs b/src/sinks/datadog/events/request_builder.rs
index bbb2c53e22fd7..ab770b0d8dc56 100644
--- a/src/sinks/datadog/events/request_builder.rs
+++ b/src/sinks/datadog/events/request_builder.rs
@@ -3,8 +3,8 @@ use std::{io, sync::Arc};
 use bytes::Bytes;
 use codecs::JsonSerializerConfig;
 use lookup::lookup_v2::ConfigValuePath;
-use vector_common::request_metadata::{MetaDescriptive, RequestMetadata};
 use vector_core::ByteSizeOf;
+use vector_lib::request_metadata::{MetaDescriptive, RequestMetadata};
 
 use crate::{
     codecs::{Encoder, TimestampFormat, Transformer},
diff --git a/src/sinks/datadog/events/service.rs b/src/sinks/datadog/events/service.rs
index 89035116390db..a7254f20868b5 100644
--- a/src/sinks/datadog/events/service.rs
+++ b/src/sinks/datadog/events/service.rs
@@ -8,7 +8,7 @@ use futures::{
 use http::Request;
 use hyper::Body;
 use tower::{Service, ServiceExt};
-use vector_common::request_metadata::{GroupedCountByteSize, MetaDescriptive};
+use vector_lib::request_metadata::{GroupedCountByteSize, MetaDescriptive};
 use vector_stream::DriverResponse;
 
 use crate::{
diff --git a/src/sinks/datadog/logs/service.rs b/src/sinks/datadog/logs/service.rs
index 6c80fbc8a482d..94cdb6b276797 100644
--- a/src/sinks/datadog/logs/service.rs
+++ b/src/sinks/datadog/logs/service.rs
@@ -14,8 +14,8 @@ use hyper::Body;
 use indexmap::IndexMap;
 use tower::Service;
 use tracing::Instrument;
-use vector_common::request_metadata::{GroupedCountByteSize, MetaDescriptive, RequestMetadata};
 use vector_core::event::{EventFinalizers, EventStatus, Finalizable};
+use vector_lib::request_metadata::{GroupedCountByteSize, MetaDescriptive, RequestMetadata};
 use vector_stream::DriverResponse;
 
 use crate::{
diff --git a/src/sinks/datadog/metrics/encoder.rs b/src/sinks/datadog/metrics/encoder.rs
index b93a19a008476..fdc4914e65aae 100644
--- a/src/sinks/datadog/metrics/encoder.rs
+++ b/src/sinks/datadog/metrics/encoder.rs
@@ -9,13 +9,13 @@ use bytes::{BufMut, Bytes};
 use chrono::{DateTime, Utc};
 use once_cell::sync::Lazy;
 use snafu::{ResultExt, Snafu};
-use vector_common::request_metadata::GroupedCountByteSize;
 use vector_core::{
     config::{log_schema, telemetry, LogSchema},
     event::{metric::MetricSketch, DatadogMetricOriginMetadata, Metric, MetricTags, MetricValue},
     metrics::AgentDDSketch,
     EstimatedJsonEncodedSizeOf,
 };
+use vector_lib::request_metadata::GroupedCountByteSize;
 
 use super::config::{
     DatadogMetricsEndpoint, SeriesApiVersion, MAXIMUM_PAYLOAD_COMPRESSED_SIZE, MAXIMUM_PAYLOAD_SIZE,
diff --git a/src/sinks/datadog/metrics/request_builder.rs b/src/sinks/datadog/metrics/request_builder.rs
index f84c95d482669..e4fb34a9fa0c3 100644
--- a/src/sinks/datadog/metrics/request_builder.rs
+++ b/src/sinks/datadog/metrics/request_builder.rs
@@ -1,8 +1,8 @@
 use bytes::Bytes;
 use snafu::Snafu;
 use std::sync::Arc;
-use vector_common::request_metadata::RequestMetadata;
 use vector_core::event::{EventFinalizers, Finalizable, Metric};
+use vector_lib::request_metadata::RequestMetadata;
 
 use super::{
     config::{DatadogMetricsEndpoint, DatadogMetricsEndpointConfiguration},
diff --git a/src/sinks/datadog/metrics/service.rs b/src/sinks/datadog/metrics/service.rs
index f51728cb2cf18..e73f85c0c70ed 100644
--- a/src/sinks/datadog/metrics/service.rs
+++ b/src/sinks/datadog/metrics/service.rs
@@ -10,8 +10,8 @@ use http::{
 use hyper::Body;
 use snafu::ResultExt;
 use tower::Service;
-use vector_common::request_metadata::{GroupedCountByteSize, MetaDescriptive, RequestMetadata};
 use vector_core::event::{EventFinalizers, EventStatus, Finalizable};
+use vector_lib::request_metadata::{GroupedCountByteSize, MetaDescriptive, RequestMetadata};
 use vector_stream::DriverResponse;
 
 use crate::{
diff --git a/src/sinks/datadog/mod.rs b/src/sinks/datadog/mod.rs
index 40dbc42428ffa..745495dcc3a16 100644
--- a/src/sinks/datadog/mod.rs
+++ b/src/sinks/datadog/mod.rs
@@ -2,9 +2,9 @@ use futures_util::FutureExt;
 use http::{Request, StatusCode, Uri};
 use hyper::body::Body;
 use snafu::Snafu;
-use vector_common::sensitive_string::SensitiveString;
 use vector_config::configurable_component;
 use vector_core::{config::AcknowledgementsConfig, tls::TlsEnableableConfig};
+use vector_lib::sensitive_string::SensitiveString;
 
 use crate::{
     common::datadog::{get_api_base_endpoint, get_base_domain_region, Region, DD_US_SITE},
diff --git a/src/sinks/datadog/traces/apm_stats/flusher.rs b/src/sinks/datadog/traces/apm_stats/flusher.rs
index d8a670473fc18..d1ee1e73e949b 100644
--- a/src/sinks/datadog/traces/apm_stats/flusher.rs
+++ b/src/sinks/datadog/traces/apm_stats/flusher.rs
@@ -6,7 +6,7 @@ use std::{
 use bytes::Bytes;
 use snafu::ResultExt;
 use tokio::sync::oneshot::{Receiver, Sender};
-use vector_common::{finalization::EventFinalizers, request_metadata::RequestMetadata};
+use vector_lib::{finalization::EventFinalizers, request_metadata::RequestMetadata};
 
 use super::{
     aggregation::Aggregator, build_request, DDTracesMetadata, DatadogTracesEndpoint,
diff --git a/src/sinks/datadog/traces/request_builder.rs b/src/sinks/datadog/traces/request_builder.rs
index 01ec1742a381e..4fea8d4468724 100644
--- a/src/sinks/datadog/traces/request_builder.rs
+++ b/src/sinks/datadog/traces/request_builder.rs
@@ -8,8 +8,8 @@ use std::{
 use bytes::Bytes;
 use prost::Message;
 use snafu::Snafu;
-use vector_common::request_metadata::RequestMetadata;
 use vector_core::event::{EventFinalizers, Finalizable};
+use vector_lib::request_metadata::RequestMetadata;
 use vrl::event_path;
 
 use super::{
diff --git a/src/sinks/datadog/traces/service.rs b/src/sinks/datadog/traces/service.rs
index 01f820f841431..5e305e906952c 100644
--- a/src/sinks/datadog/traces/service.rs
+++ b/src/sinks/datadog/traces/service.rs
@@ -9,8 +9,8 @@ use http::{Request, StatusCode, Uri};
 use hyper::Body;
 use snafu::ResultExt;
 use tower::Service;
-use vector_common::request_metadata::{GroupedCountByteSize, MetaDescriptive, RequestMetadata};
 use vector_core::event::{EventFinalizers, EventStatus, Finalizable};
+use vector_lib::request_metadata::{GroupedCountByteSize, MetaDescriptive, RequestMetadata};
 use vector_stream::DriverResponse;
 
 use crate::{
diff --git a/src/sinks/elasticsearch/encoder.rs b/src/sinks/elasticsearch/encoder.rs
index cdee7812097e6..53925277295f3 100644
--- a/src/sinks/elasticsearch/encoder.rs
+++ b/src/sinks/elasticsearch/encoder.rs
@@ -2,12 +2,12 @@ use std::{io, io::Write};
 
 use serde::Serialize;
 use vector_buffers::EventCount;
-use vector_common::{
+use vector_core::{config::telemetry, event::Event, ByteSizeOf, EstimatedJsonEncodedSizeOf};
+use vector_lib::{
     internal_event::TaggedEventsSent,
     json_size::JsonSize,
     request_metadata::{GetEventCountTags, GroupedCountByteSize},
 };
-use vector_core::{config::telemetry, event::Event, ByteSizeOf, EstimatedJsonEncodedSizeOf};
 
 use crate::{
     codecs::Transformer,
diff --git a/src/sinks/elasticsearch/mod.rs b/src/sinks/elasticsearch/mod.rs
index 4f4502d39c286..687a79023594c 100644
--- a/src/sinks/elasticsearch/mod.rs
+++ b/src/sinks/elasticsearch/mod.rs
@@ -21,8 +21,8 @@ pub use config::*;
 pub use encoder::ElasticsearchEncoder;
 use http::{uri::InvalidUri, Request};
 use snafu::Snafu;
-use vector_common::sensitive_string::SensitiveString;
 use vector_config::configurable_component;
+use vector_lib::sensitive_string::SensitiveString;
 
 use crate::{
     event::{EventRef, LogEvent},
diff --git a/src/sinks/elasticsearch/request_builder.rs b/src/sinks/elasticsearch/request_builder.rs
index c5918df6e384c..0fbbf465e1e74 100644
--- a/src/sinks/elasticsearch/request_builder.rs
+++ b/src/sinks/elasticsearch/request_builder.rs
@@ -1,6 +1,6 @@
 use bytes::Bytes;
-use vector_common::{json_size::JsonSize, request_metadata::RequestMetadata};
 use vector_core::EstimatedJsonEncodedSizeOf;
+use vector_lib::{json_size::JsonSize, request_metadata::RequestMetadata};
 
 use crate::{
     event::{EventFinalizers, Finalizable},
diff --git a/src/sinks/elasticsearch/retry.rs b/src/sinks/elasticsearch/retry.rs
index bf40d1751f051..a97096542c724 100644
--- a/src/sinks/elasticsearch/retry.rs
+++ b/src/sinks/elasticsearch/retry.rs
@@ -160,7 +160,7 @@ mod tests {
     use bytes::Bytes;
     use http::Response;
     use similar_asserts::assert_eq;
-    use vector_common::{internal_event::CountByteSize, json_size::JsonSize};
+    use vector_lib::{internal_event::CountByteSize, json_size::JsonSize};
 
     use super::*;
     use crate::event::EventStatus;
diff --git a/src/sinks/elasticsearch/service.rs b/src/sinks/elasticsearch/service.rs
index 95bc4fdd1be60..9f466e582230c 100644
--- a/src/sinks/elasticsearch/service.rs
+++ b/src/sinks/elasticsearch/service.rs
@@ -9,11 +9,11 @@ use futures::future::BoxFuture;
 use http::{Response, Uri};
 use hyper::{service::Service, Body, Request};
 use tower::ServiceExt;
-use vector_common::{
+use vector_core::ByteSizeOf;
+use vector_lib::{
     json_size::JsonSize,
     request_metadata::{GroupedCountByteSize, MetaDescriptive, RequestMetadata},
 };
-use vector_core::ByteSizeOf;
 use vector_stream::DriverResponse;
 
 use super::{ElasticsearchCommon, ElasticsearchConfig};
diff --git a/src/sinks/gcp/chronicle_unstructured.rs b/src/sinks/gcp/chronicle_unstructured.rs
index 3043cc2ba519c..76ce1324d18fc 100644
--- a/src/sinks/gcp/chronicle_unstructured.rs
+++ b/src/sinks/gcp/chronicle_unstructured.rs
@@ -12,7 +12,6 @@ use snafu::Snafu;
 use std::io;
 use tokio_util::codec::Encoder as _;
 use tower::{Service, ServiceBuilder};
-use vector_common::request_metadata::{GroupedCountByteSize, MetaDescriptive, RequestMetadata};
 use vector_config::configurable_component;
 use vector_core::{
     config::{telemetry, AcknowledgementsConfig, Input},
@@ -20,6 +19,7 @@ use vector_core::{
     sink::VectorSink,
     EstimatedJsonEncodedSizeOf,
 };
+use vector_lib::request_metadata::{GroupedCountByteSize, MetaDescriptive, RequestMetadata};
 use vrl::value::Kind;
 
 use crate::{
diff --git a/src/sinks/gcp/cloud_storage.rs b/src/sinks/gcp/cloud_storage.rs
index 45b051a87ca3d..9d2185f53ad79 100644
--- a/src/sinks/gcp/cloud_storage.rs
+++ b/src/sinks/gcp/cloud_storage.rs
@@ -10,9 +10,9 @@ use snafu::ResultExt;
 use snafu::Snafu;
 use tower::ServiceBuilder;
 use uuid::Uuid;
-use vector_common::request_metadata::RequestMetadata;
 use vector_config::configurable_component;
 use vector_core::event::{EventFinalizers, Finalizable};
+use vector_lib::request_metadata::RequestMetadata;
 
 use crate::sinks::util::metadata::RequestMetadataBuilder;
 use crate::{
@@ -410,9 +410,9 @@ mod tests {
     use codecs::encoding::FramingConfig;
     use codecs::{JsonSerializerConfig, NewlineDelimitedEncoderConfig, TextSerializerConfig};
     use futures_util::{future::ready, stream};
-    use vector_common::request_metadata::GroupedCountByteSize;
     use vector_core::partition::Partitioner;
     use vector_core::EstimatedJsonEncodedSizeOf;
+    use vector_lib::request_metadata::GroupedCountByteSize;
 
     use crate::event::LogEvent;
     use crate::test_util::{
diff --git a/src/sinks/gcs_common/service.rs b/src/sinks/gcs_common/service.rs
index 455df2eb919fe..3271e28755161 100644
--- a/src/sinks/gcs_common/service.rs
+++ b/src/sinks/gcs_common/service.rs
@@ -8,7 +8,7 @@ use http::{
 };
 use hyper::Body;
 use tower::Service;
-use vector_common::request_metadata::{GroupedCountByteSize, MetaDescriptive, RequestMetadata};
+use vector_lib::request_metadata::{GroupedCountByteSize, MetaDescriptive, RequestMetadata};
 use vector_stream::DriverResponse;
 
 use crate::{
diff --git a/src/sinks/greptimedb/mod.rs b/src/sinks/greptimedb/mod.rs
index af0588e34b12b..ab1d132adc98b 100644
--- a/src/sinks/greptimedb/mod.rs
+++ b/src/sinks/greptimedb/mod.rs
@@ -21,7 +21,7 @@
 //!
 use greptimedb_client::Client;
 use snafu::Snafu;
-use vector_common::sensitive_string::SensitiveString;
+use vector_lib::sensitive_string::SensitiveString;
 
 use crate::sinks::prelude::*;
 
diff --git a/src/sinks/honeycomb/config.rs b/src/sinks/honeycomb/config.rs
index 0a53bf16369cc..6dda01074f7f0 100644
--- a/src/sinks/honeycomb/config.rs
+++ b/src/sinks/honeycomb/config.rs
@@ -3,7 +3,7 @@
 use bytes::Bytes;
 use futures::FutureExt;
 use http::{Request, StatusCode, Uri};
-use vector_common::sensitive_string::SensitiveString;
+use vector_lib::sensitive_string::SensitiveString;
 use vrl::value::Kind;
 
 use crate::{
diff --git a/src/sinks/honeycomb/service.rs b/src/sinks/honeycomb/service.rs
index 57eda27501558..3e97c981382b6 100644
--- a/src/sinks/honeycomb/service.rs
+++ b/src/sinks/honeycomb/service.rs
@@ -2,7 +2,7 @@
 
 use bytes::Bytes;
 use http::{Request, Uri};
-use vector_common::sensitive_string::SensitiveString;
+use vector_lib::sensitive_string::SensitiveString;
 
 use crate::sinks::util::http::HttpServiceRequestBuilder;
 
diff --git a/src/sinks/humio/logs.rs b/src/sinks/humio/logs.rs
index bdfddfda59f2e..a8f55d4c6c3d4 100644
--- a/src/sinks/humio/logs.rs
+++ b/src/sinks/humio/logs.rs
@@ -1,7 +1,7 @@
 use codecs::JsonSerializerConfig;
 use lookup::lookup_v2::{ConfigValuePath, OptionalValuePath};
-use vector_common::sensitive_string::SensitiveString;
 use vector_config::configurable_component;
+use vector_lib::sensitive_string::SensitiveString;
 
 use super::config_host_key;
 use crate::sinks::splunk_hec::common::config_timestamp_key;
diff --git a/src/sinks/humio/metrics.rs b/src/sinks/humio/metrics.rs
index 1142206e1dfdf..2b9248eb26f85 100644
--- a/src/sinks/humio/metrics.rs
+++ b/src/sinks/humio/metrics.rs
@@ -4,9 +4,9 @@ use futures::StreamExt;
 use futures_util::stream::BoxStream;
 use indoc::indoc;
 use lookup::lookup_v2::{ConfigValuePath, OptionalValuePath};
-use vector_common::sensitive_string::SensitiveString;
 use vector_config::configurable_component;
 use vector_core::sink::StreamSink;
+use vector_lib::sensitive_string::SensitiveString;
 
 use super::{
     config_host_key,
diff --git a/src/sinks/influxdb/mod.rs b/src/sinks/influxdb/mod.rs
index a2b322c74ddf8..090fdc4f46518 100644
--- a/src/sinks/influxdb/mod.rs
+++ b/src/sinks/influxdb/mod.rs
@@ -9,9 +9,9 @@ use futures::FutureExt;
 use http::{StatusCode, Uri};
 use snafu::{ResultExt, Snafu};
 use tower::Service;
-use vector_common::sensitive_string::SensitiveString;
 use vector_config::configurable_component;
 use vector_core::event::MetricTags;
+use vector_lib::sensitive_string::SensitiveString;
 
 use crate::http::HttpClient;
 
diff --git a/src/sinks/loki/integration_tests.rs b/src/sinks/loki/integration_tests.rs
index f93828b353956..20d4e2441a50e 100644
--- a/src/sinks/loki/integration_tests.rs
+++ b/src/sinks/loki/integration_tests.rs
@@ -5,11 +5,11 @@ use bytes::Bytes;
 use chrono::{DateTime, Duration, Utc};
 use futures::stream;
 use lookup::owned_value_path;
-use vector_common::encode_logfmt;
 use vector_core::{
     config::{init_telemetry, LogNamespace, Tags, Telemetry},
     event::{BatchNotifier, BatchStatus, Event, LogEvent},
 };
+use vector_lib::encode_logfmt;
 use vrl::value::{kind::Collection, Kind};
 
 use super::config::{LokiConfig, OutOfOrderAction};
diff --git a/src/sinks/mezmo.rs b/src/sinks/mezmo.rs
index 25999e73163f0..b25864db37134 100644
--- a/src/sinks/mezmo.rs
+++ b/src/sinks/mezmo.rs
@@ -4,8 +4,8 @@ use bytes::Bytes;
 use futures::{FutureExt, SinkExt};
 use http::{Request, StatusCode, Uri};
 use serde_json::json;
-use vector_common::sensitive_string::SensitiveString;
 use vector_config::configurable_component;
+use vector_lib::sensitive_string::SensitiveString;
 use vrl::event_path;
 use vrl::value::{Kind, Value};
 
diff --git a/src/sinks/new_relic/config.rs b/src/sinks/new_relic/config.rs
index af892849f0964..6ac338929a0aa 100644
--- a/src/sinks/new_relic/config.rs
+++ b/src/sinks/new_relic/config.rs
@@ -2,7 +2,7 @@ use std::{fmt::Debug, sync::Arc};
 
 use http::Uri;
 use tower::ServiceBuilder;
-use vector_common::sensitive_string::SensitiveString;
+use vector_lib::sensitive_string::SensitiveString;
 
 use super::{
     healthcheck, NewRelicApiResponse, NewRelicApiService, NewRelicEncoder, NewRelicSink,
diff --git a/src/sinks/new_relic/encoding.rs b/src/sinks/new_relic/encoding.rs
index f058161d20fb9..f103369c89cde 100644
--- a/src/sinks/new_relic/encoding.rs
+++ b/src/sinks/new_relic/encoding.rs
@@ -1,8 +1,8 @@
 use std::{io, sync::Arc};
 
 use serde::Serialize;
-use vector_common::request_metadata::GroupedCountByteSize;
 use vector_core::{config::telemetry, event::Event, EstimatedJsonEncodedSizeOf};
+use vector_lib::request_metadata::GroupedCountByteSize;
 
 use super::{
     EventsApiModel, LogsApiModel, MetricsApiModel, NewRelicApi, NewRelicApiModel,
diff --git a/src/sinks/new_relic/model.rs b/src/sinks/new_relic/model.rs
index 5a8b2fc800897..1014d3c54925a 100644
--- a/src/sinks/new_relic/model.rs
+++ b/src/sinks/new_relic/model.rs
@@ -8,7 +8,7 @@ use std::{
 use chrono::{DateTime, Utc};
 use ordered_float::NotNan;
 use serde::{Deserialize, Serialize};
-use vector_common::internal_event::{ComponentEventsDropped, INTENTIONAL, UNINTENTIONAL};
+use vector_lib::internal_event::{ComponentEventsDropped, INTENTIONAL, UNINTENTIONAL};
 use vrl::event_path;
 
 use super::NewRelicSinkError;
diff --git a/src/sinks/prelude.rs b/src/sinks/prelude.rs
index 100811537062c..1d20c67edfc7b 100644
--- a/src/sinks/prelude.rs
+++ b/src/sinks/prelude.rs
@@ -5,12 +5,6 @@ pub use async_trait::async_trait;
 pub use futures::{future, future::BoxFuture, stream::BoxStream, FutureExt, StreamExt};
 pub use tower::{Service, ServiceBuilder};
 pub use vector_buffers::EventCount;
-pub use vector_common::{
-    finalization::{EventFinalizers, EventStatus, Finalizable},
-    internal_event::{CountByteSize, TaggedEventsSent},
-    json_size::JsonSize,
-    request_metadata::{GetEventCountTags, GroupedCountByteSize, MetaDescriptive, RequestMetadata},
-};
 pub use vector_config::configurable_component;
 pub use vector_core::{
     config::{telemetry, AcknowledgementsConfig, Input},
@@ -21,6 +15,12 @@ pub use vector_core::{
     tls::TlsSettings,
     ByteSizeOf, EstimatedJsonEncodedSizeOf,
 };
+pub use vector_lib::{
+    finalization::{EventFinalizers, EventStatus, Finalizable},
+    internal_event::{CountByteSize, TaggedEventsSent},
+    json_size::JsonSize,
+    request_metadata::{GetEventCountTags, GroupedCountByteSize, MetaDescriptive, RequestMetadata},
+};
 pub use vector_stream::{BatcherSettings, DriverResponse};
 
 pub use crate::{
diff --git a/src/sinks/prometheus/exporter.rs b/src/sinks/prometheus/exporter.rs
index 63a882e8dfa98..f71ad1c42fa85 100644
--- a/src/sinks/prometheus/exporter.rs
+++ b/src/sinks/prometheus/exporter.rs
@@ -608,14 +608,14 @@ mod tests {
     use indoc::indoc;
     use similar_asserts::assert_eq;
     use tokio::{sync::oneshot::error::TryRecvError, time};
-    use vector_common::{
-        finalization::{BatchNotifier, BatchStatus},
-        sensitive_string::SensitiveString,
-    };
     use vector_core::{
         event::{MetricTags, StatisticKind},
         metric_tags, samples,
     };
+    use vector_lib::{
+        finalization::{BatchNotifier, BatchStatus},
+        sensitive_string::SensitiveString,
+    };
 
     use super::*;
     use crate::{
diff --git a/src/sinks/prometheus/mod.rs b/src/sinks/prometheus/mod.rs
index 2012397547ba9..dc1b3f1991db8 100644
--- a/src/sinks/prometheus/mod.rs
+++ b/src/sinks/prometheus/mod.rs
@@ -1,6 +1,6 @@
-use vector_common::sensitive_string::SensitiveString;
 #[cfg(test)]
 use vector_core::event::Metric;
+use vector_lib::sensitive_string::SensitiveString;
 
 mod collector;
 pub(crate) mod exporter;
diff --git a/src/sinks/prometheus/remote_write/sink.rs b/src/sinks/prometheus/remote_write/sink.rs
index 1551f846ea92b..14545d58c4b57 100644
--- a/src/sinks/prometheus/remote_write/sink.rs
+++ b/src/sinks/prometheus/remote_write/sink.rs
@@ -1,7 +1,7 @@
 use std::fmt;
 
-use vector_common::byte_size_of::ByteSizeOf;
 use vector_core::event::Metric;
+use vector_lib::byte_size_of::ByteSizeOf;
 use vector_stream::batcher::{data::BatchData, limiter::ByteSizeOfItemSize};
 
 use crate::sinks::{prelude::*, util::buffer::metrics::MetricSet};
diff --git a/src/sinks/pulsar/config.rs b/src/sinks/pulsar/config.rs
index ab53a350f32b5..71ea7c6efb521 100644
--- a/src/sinks/pulsar/config.rs
+++ b/src/sinks/pulsar/config.rs
@@ -17,8 +17,8 @@ use pulsar::{
 };
 use pulsar::{error::AuthenticationError, OperationRetryOptions};
 use snafu::ResultExt;
-use vector_common::sensitive_string::SensitiveString;
 use vector_core::config::DataType;
+use vector_lib::sensitive_string::SensitiveString;
 use vrl::value::Kind;
 
 /// Configuration for the `pulsar` sink.
diff --git a/src/sinks/pulsar/encoder.rs b/src/sinks/pulsar/encoder.rs
index e324c4b0ea376..fcd60dd2a4248 100644
--- a/src/sinks/pulsar/encoder.rs
+++ b/src/sinks/pulsar/encoder.rs
@@ -6,8 +6,8 @@ use crate::{
 use bytes::BytesMut;
 use std::io;
 use tokio_util::codec::Encoder as _;
-use vector_common::request_metadata::GroupedCountByteSize;
 use vector_core::{config::telemetry, EstimatedJsonEncodedSizeOf};
+use vector_lib::request_metadata::GroupedCountByteSize;
 
 #[derive(Clone, Debug)]
 pub(super) struct PulsarEncoder {
diff --git a/src/sinks/redis/tests.rs b/src/sinks/redis/tests.rs
index c9d148b4d823d..5b0bcc6a33a69 100644
--- a/src/sinks/redis/tests.rs
+++ b/src/sinks/redis/tests.rs
@@ -1,8 +1,8 @@
 use std::collections::HashMap;
 
 use codecs::{JsonSerializerConfig, TextSerializerConfig};
-use vector_common::request_metadata::GroupedCountByteSize;
 use vector_core::event::LogEvent;
+use vector_lib::request_metadata::GroupedCountByteSize;
 
 use super::{config::RedisSinkConfig, request_builder::encode_event};
 use crate::{
diff --git a/src/sinks/s3_common/service.rs b/src/sinks/s3_common/service.rs
index a13ebdfb001b1..d29bde4ea0c07 100644
--- a/src/sinks/s3_common/service.rs
+++ b/src/sinks/s3_common/service.rs
@@ -11,8 +11,8 @@ use futures::future::BoxFuture;
 use md5::Digest;
 use tower::Service;
 use tracing::Instrument;
-use vector_common::request_metadata::{GroupedCountByteSize, MetaDescriptive, RequestMetadata};
 use vector_core::event::{EventFinalizers, EventStatus, Finalizable};
+use vector_lib::request_metadata::{GroupedCountByteSize, MetaDescriptive, RequestMetadata};
 use vector_stream::DriverResponse;
 
 use super::config::S3Options;
diff --git a/src/sinks/sematext/logs.rs b/src/sinks/sematext/logs.rs
index e5ba64f7e9524..4c791b01c0568 100644
--- a/src/sinks/sematext/logs.rs
+++ b/src/sinks/sematext/logs.rs
@@ -1,8 +1,8 @@
 use async_trait::async_trait;
 use futures::stream::{BoxStream, StreamExt};
 use indoc::indoc;
-use vector_common::sensitive_string::SensitiveString;
 use vector_config::configurable_component;
+use vector_lib::sensitive_string::SensitiveString;
 use vrl::event_path;
 
 use super::Region;
diff --git a/src/sinks/sematext/metrics.rs b/src/sinks/sematext/metrics.rs
index 3e09630d556f6..2a5d20f3ca22c 100644
--- a/src/sinks/sematext/metrics.rs
+++ b/src/sinks/sematext/metrics.rs
@@ -6,9 +6,9 @@ use http::{StatusCode, Uri};
 use hyper::{Body, Request};
 use indoc::indoc;
 use tower::Service;
-use vector_common::sensitive_string::SensitiveString;
 use vector_config::configurable_component;
 use vector_core::{ByteSizeOf, EstimatedJsonEncodedSizeOf};
+use vector_lib::sensitive_string::SensitiveString;
 
 use super::Region;
 use crate::{
diff --git a/src/sinks/splunk_hec/common/request.rs b/src/sinks/splunk_hec/common/request.rs
index f1fc2366b6b30..9338f3fc883ab 100644
--- a/src/sinks/splunk_hec/common/request.rs
+++ b/src/sinks/splunk_hec/common/request.rs
@@ -1,11 +1,11 @@
 use std::sync::Arc;
 
 use bytes::Bytes;
-use vector_common::request_metadata::{MetaDescriptive, RequestMetadata};
 use vector_core::{
     event::{EventFinalizers, Finalizable},
     ByteSizeOf,
 };
+use vector_lib::request_metadata::{MetaDescriptive, RequestMetadata};
 
 use crate::sinks::util::ElementCount;
 
diff --git a/src/sinks/splunk_hec/common/response.rs b/src/sinks/splunk_hec/common/response.rs
index 413d0b7f5e7f1..eb5e61153975c 100644
--- a/src/sinks/splunk_hec/common/response.rs
+++ b/src/sinks/splunk_hec/common/response.rs
@@ -1,5 +1,5 @@
-use vector_common::request_metadata::GroupedCountByteSize;
 use vector_core::event::EventStatus;
+use vector_lib::request_metadata::GroupedCountByteSize;
 use vector_stream::DriverResponse;
 
 pub struct HecResponse {
diff --git a/src/sinks/splunk_hec/common/service.rs b/src/sinks/splunk_hec/common/service.rs
index ce9b324c10fcd..9e1c99af7eb8e 100644
--- a/src/sinks/splunk_hec/common/service.rs
+++ b/src/sinks/splunk_hec/common/service.rs
@@ -13,8 +13,8 @@ use tokio::sync::{mpsc, oneshot, OwnedSemaphorePermit, Semaphore};
 use tokio_util::sync::PollSemaphore;
 use tower::Service;
 use uuid::Uuid;
-use vector_common::request_metadata::MetaDescriptive;
 use vector_core::event::EventStatus;
+use vector_lib::request_metadata::MetaDescriptive;
 
 use super::{
     acknowledgements::{run_acknowledgements, HecClientAcknowledgementsConfig},
@@ -282,11 +282,11 @@ mod tests {
     use bytes::Bytes;
     use futures_util::{poll, stream::FuturesUnordered, StreamExt};
     use tower::{util::BoxService, Service, ServiceExt};
-    use vector_common::internal_event::CountByteSize;
     use vector_core::{
         config::proxy::ProxyConfig,
         event::{EventFinalizers, EventStatus},
     };
+    use vector_lib::internal_event::CountByteSize;
     use wiremock::{
         matchers::{header, header_exists, method, path},
         Mock, MockServer, Request, Respond, ResponseTemplate,
diff --git a/src/sinks/splunk_hec/logs/config.rs b/src/sinks/splunk_hec/logs/config.rs
index ef056693bdc53..4d59ba1a20346 100644
--- a/src/sinks/splunk_hec/logs/config.rs
+++ b/src/sinks/splunk_hec/logs/config.rs
@@ -4,9 +4,9 @@ use codecs::TextSerializerConfig;
 use futures_util::FutureExt;
 use lookup::lookup_v2::{ConfigValuePath, OptionalValuePath};
 use tower::ServiceBuilder;
-use vector_common::sensitive_string::SensitiveString;
 use vector_config::configurable_component;
 use vector_core::sink::VectorSink;
+use vector_lib::sensitive_string::SensitiveString;
 
 use super::{encoder::HecLogsEncoder, request_builder::HecLogsRequestBuilder, sink::HecLogsSink};
 use crate::sinks::splunk_hec::common::config_timestamp_key;
diff --git a/src/sinks/splunk_hec/logs/encoder.rs b/src/sinks/splunk_hec/logs/encoder.rs
index 0f0270ce28a42..70fc861da9c73 100644
--- a/src/sinks/splunk_hec/logs/encoder.rs
+++ b/src/sinks/splunk_hec/logs/encoder.rs
@@ -3,8 +3,8 @@ use std::borrow::Cow;
 use bytes::BytesMut;
 use serde::Serialize;
 use tokio_util::codec::Encoder as _;
-use vector_common::request_metadata::GroupedCountByteSize;
 use vector_core::{config::telemetry, EstimatedJsonEncodedSizeOf};
+use vector_lib::request_metadata::GroupedCountByteSize;
 
 use super::sink::HecProcessedEvent;
 use crate::{
diff --git a/src/sinks/splunk_hec/logs/request_builder.rs b/src/sinks/splunk_hec/logs/request_builder.rs
index 0a6ea5cd57fb0..c03b13725f29a 100644
--- a/src/sinks/splunk_hec/logs/request_builder.rs
+++ b/src/sinks/splunk_hec/logs/request_builder.rs
@@ -1,8 +1,8 @@
 use std::sync::Arc;
 
 use bytes::Bytes;
-use vector_common::request_metadata::RequestMetadata;
 use vector_core::event::{EventFinalizers, Finalizable};
+use vector_lib::request_metadata::RequestMetadata;
 
 use super::{
     encoder::HecLogsEncoder,
diff --git a/src/sinks/splunk_hec/metrics/config.rs b/src/sinks/splunk_hec/metrics/config.rs
index 96c1c645fb7ae..cf73e6102aea2 100644
--- a/src/sinks/splunk_hec/metrics/config.rs
+++ b/src/sinks/splunk_hec/metrics/config.rs
@@ -3,9 +3,9 @@ use std::sync::Arc;
 use futures_util::FutureExt;
 use lookup::lookup_v2::OptionalValuePath;
 use tower::ServiceBuilder;
-use vector_common::sensitive_string::SensitiveString;
 use vector_config::configurable_component;
 use vector_core::sink::VectorSink;
+use vector_lib::sensitive_string::SensitiveString;
 
 use super::{request_builder::HecMetricsRequestBuilder, sink::HecMetricsSink};
 use crate::{
diff --git a/src/sinks/splunk_hec/metrics/encoder.rs b/src/sinks/splunk_hec/metrics/encoder.rs
index 5b0198825f9eb..d96a801a96242 100644
--- a/src/sinks/splunk_hec/metrics/encoder.rs
+++ b/src/sinks/splunk_hec/metrics/encoder.rs
@@ -1,8 +1,8 @@
 use std::{collections::BTreeMap, iter};
 
 use serde::Serialize;
-use vector_common::request_metadata::GroupedCountByteSize;
 use vector_core::{config::telemetry, EstimatedJsonEncodedSizeOf};
+use vector_lib::request_metadata::GroupedCountByteSize;
 
 use super::sink::HecProcessedEvent;
 use crate::{internal_events::SplunkEventEncodeError, sinks::util::encoding::Encoder};
diff --git a/src/sinks/splunk_hec/metrics/request_builder.rs b/src/sinks/splunk_hec/metrics/request_builder.rs
index 46489da12c5ff..aa1cc9aef48a7 100644
--- a/src/sinks/splunk_hec/metrics/request_builder.rs
+++ b/src/sinks/splunk_hec/metrics/request_builder.rs
@@ -1,8 +1,8 @@
 use std::sync::Arc;
 
 use bytes::Bytes;
-use vector_common::request_metadata::RequestMetadata;
 use vector_core::event::{EventFinalizers, Finalizable};
+use vector_lib::request_metadata::RequestMetadata;
 
 use super::{encoder::HecMetricsEncoder, sink::HecProcessedEvent};
 use crate::sinks::{
diff --git a/src/sinks/statsd/config.rs b/src/sinks/statsd/config.rs
index 6e0b88699687a..f580ee77abff4 100644
--- a/src/sinks/statsd/config.rs
+++ b/src/sinks/statsd/config.rs
@@ -1,12 +1,12 @@
 use std::net::{IpAddr, Ipv4Addr, SocketAddr};
 
 use async_trait::async_trait;
-use vector_common::internal_event::Protocol;
 use vector_config::{component::GenerateConfig, configurable_component};
 use vector_core::{
     config::{AcknowledgementsConfig, Input},
     sink::VectorSink,
 };
+use vector_lib::internal_event::Protocol;
 
 use crate::{
     config::{SinkConfig, SinkContext},
diff --git a/src/sinks/statsd/encoder.rs b/src/sinks/statsd/encoder.rs
index c75661cb97a30..fe3464b6caa1c 100644
--- a/src/sinks/statsd/encoder.rs
+++ b/src/sinks/statsd/encoder.rs
@@ -241,7 +241,7 @@ mod tests {
 
         let frame = encode_metric(&input);
         let mut output = parse_encoded_metrics(&frame);
-        vector_common::assert_event_data_eq!(input, output.remove(0));
+        vector_lib::assert_event_data_eq!(input, output.remove(0));
     }
 
     #[cfg(feature = "sources-statsd")]
@@ -271,7 +271,7 @@ mod tests {
 
         let frame = encode_metric(&input);
         let mut output = parse_encoded_metrics(&frame);
-        vector_common::assert_event_data_eq!(input, output.remove(0));
+        vector_lib::assert_event_data_eq!(input, output.remove(0));
     }
 
     #[cfg(feature = "sources-statsd")]
@@ -286,7 +286,7 @@ mod tests {
 
         let frame = encode_metric(&input);
         let mut output = parse_encoded_metrics(&frame);
-        vector_common::assert_event_data_eq!(input, output.remove(0));
+        vector_lib::assert_event_data_eq!(input, output.remove(0));
     }
 
     #[cfg(feature = "sources-statsd")]
@@ -314,7 +314,7 @@ mod tests {
 
         let frame = encode_metric(&input);
         let mut output = parse_encoded_metrics(&frame);
-        vector_common::assert_event_data_eq!(expected, output.remove(0));
+        vector_lib::assert_event_data_eq!(expected, output.remove(0));
     }
 
     #[cfg(feature = "sources-statsd")]
@@ -351,8 +351,8 @@ mod tests {
 
         let frame = encode_metric(&input);
         let mut output = parse_encoded_metrics(&frame);
-        vector_common::assert_event_data_eq!(expected1, output.remove(0));
-        vector_common::assert_event_data_eq!(expected2, output.remove(0));
+        vector_lib::assert_event_data_eq!(expected1, output.remove(0));
+        vector_lib::assert_event_data_eq!(expected2, output.remove(0));
     }
 
     #[cfg(feature = "sources-statsd")]
@@ -369,6 +369,6 @@ mod tests {
 
         let frame = encode_metric(&input);
         let mut output = parse_encoded_metrics(&frame);
-        vector_common::assert_event_data_eq!(input, output.remove(0));
+        vector_lib::assert_event_data_eq!(input, output.remove(0));
     }
 }
diff --git a/src/sinks/statsd/request_builder.rs b/src/sinks/statsd/request_builder.rs
index 08034cb101f5b..75aad1bdd2ce4 100644
--- a/src/sinks/statsd/request_builder.rs
+++ b/src/sinks/statsd/request_builder.rs
@@ -3,12 +3,12 @@ use std::convert::Infallible;
 use bytes::BytesMut;
 use snafu::Snafu;
 use tokio_util::codec::Encoder;
-use vector_common::request_metadata::RequestMetadata;
 use vector_core::{
     config::telemetry,
     event::{EventFinalizers, Finalizable, Metric},
     EstimatedJsonEncodedSizeOf,
 };
+use vector_lib::request_metadata::RequestMetadata;
 
 use super::{encoder::StatsdEncoder, service::StatsdRequest};
 use crate::{
diff --git a/src/sinks/statsd/service.rs b/src/sinks/statsd/service.rs
index f04ac83ad9f8f..fa555a441cc2f 100644
--- a/src/sinks/statsd/service.rs
+++ b/src/sinks/statsd/service.rs
@@ -2,7 +2,7 @@ use std::task::{Context, Poll};
 
 use futures_util::future::BoxFuture;
 use tower::Service;
-use vector_common::{
+use vector_lib::{
     finalization::{EventFinalizers, EventStatus, Finalizable},
     request_metadata::{GroupedCountByteSize, MetaDescriptive, RequestMetadata},
 };
diff --git a/src/sinks/statsd/sink.rs b/src/sinks/statsd/sink.rs
index 3b79f177022ea..9c6a24859529d 100644
--- a/src/sinks/statsd/sink.rs
+++ b/src/sinks/statsd/sink.rs
@@ -6,8 +6,8 @@ use futures_util::{
     StreamExt,
 };
 use tower::Service;
-use vector_common::internal_event::Protocol;
 use vector_core::{event::Event, sink::StreamSink};
+use vector_lib::internal_event::Protocol;
 use vector_stream::{BatcherSettings, DriverResponse};
 
 use crate::sinks::util::SinkBuilderExt;
diff --git a/src/sinks/util/adaptive_concurrency/controller.rs b/src/sinks/util/adaptive_concurrency/controller.rs
index 19615f7ba2742..8f14408e2bac6 100644
--- a/src/sinks/util/adaptive_concurrency/controller.rs
+++ b/src/sinks/util/adaptive_concurrency/controller.rs
@@ -6,7 +6,7 @@ use std::{
 
 use tokio::sync::OwnedSemaphorePermit;
 use tower::timeout::error::Elapsed;
-use vector_common::internal_event::{InternalEventHandle as _, Registered};
+use vector_lib::internal_event::{InternalEventHandle as _, Registered};
 
 use super::{instant_now, semaphore::ShrinkableSemaphore, AdaptiveConcurrencySettings};
 #[cfg(test)]
diff --git a/src/sinks/util/adaptive_concurrency/tests.rs b/src/sinks/util/adaptive_concurrency/tests.rs
index 9c2cd0272215a..6c56b63eaff4f 100644
--- a/src/sinks/util/adaptive_concurrency/tests.rs
+++ b/src/sinks/util/adaptive_concurrency/tests.rs
@@ -25,8 +25,8 @@ use serde::Deserialize;
 use snafu::Snafu;
 use tokio::time::{self, sleep, Duration, Instant};
 use tower::Service;
-use vector_common::json_size::JsonSize;
 use vector_config::configurable_component;
+use vector_lib::json_size::JsonSize;
 
 use super::controller::ControllerStatistics;
 use crate::{
diff --git a/src/sinks/util/batch.rs b/src/sinks/util/batch.rs
index f0a9a896b8131..be9ac6b21c220 100644
--- a/src/sinks/util/batch.rs
+++ b/src/sinks/util/batch.rs
@@ -3,8 +3,8 @@ use std::{marker::PhantomData, num::NonZeroUsize, time::Duration};
 use derivative::Derivative;
 use serde_with::serde_as;
 use snafu::Snafu;
-use vector_common::json_size::JsonSize;
 use vector_config::configurable_component;
+use vector_lib::json_size::JsonSize;
 use vector_stream::BatcherSettings;
 
 use super::EncodedEvent;
diff --git a/src/sinks/util/buffer/mod.rs b/src/sinks/util/buffer/mod.rs
index f0ab3dd6af8fb..25760b345388e 100644
--- a/src/sinks/util/buffer/mod.rs
+++ b/src/sinks/util/buffer/mod.rs
@@ -170,7 +170,7 @@ mod test {
     use bytes::{Buf, BytesMut};
     use futures::{future, stream, SinkExt, StreamExt};
     use tokio::time::Duration;
-    use vector_common::json_size::JsonSize;
+    use vector_lib::json_size::JsonSize;
 
     use super::{Buffer, Compression};
     use crate::sinks::util::{BatchSettings, BatchSink, EncodedEvent};
diff --git a/src/sinks/util/encoding.rs b/src/sinks/util/encoding.rs
index c5083ed601311..340183e547253 100644
--- a/src/sinks/util/encoding.rs
+++ b/src/sinks/util/encoding.rs
@@ -4,8 +4,8 @@ use bytes::BytesMut;
 use codecs::encoding::Framer;
 use itertools::{Itertools, Position};
 use tokio_util::codec::Encoder as _;
-use vector_common::request_metadata::GroupedCountByteSize;
 use vector_core::{config::telemetry, EstimatedJsonEncodedSizeOf};
+use vector_lib::request_metadata::GroupedCountByteSize;
 
 use crate::{codecs::Transformer, event::Event, internal_events::EncoderWriteError};
 
@@ -150,8 +150,8 @@ mod tests {
         CharacterDelimitedEncoder, JsonSerializerConfig, NewlineDelimitedEncoder,
         TextSerializerConfig,
     };
-    use vector_common::{internal_event::CountByteSize, json_size::JsonSize};
     use vector_core::event::LogEvent;
+    use vector_lib::{internal_event::CountByteSize, json_size::JsonSize};
     use vrl::value::Value;
 
     use super::*;
diff --git a/src/sinks/util/metadata.rs b/src/sinks/util/metadata.rs
index b9418c128244a..6a3a77403ae4f 100644
--- a/src/sinks/util/metadata.rs
+++ b/src/sinks/util/metadata.rs
@@ -1,7 +1,7 @@
 use std::num::NonZeroUsize;
 
-use vector_common::request_metadata::{GetEventCountTags, GroupedCountByteSize, RequestMetadata};
 use vector_core::{config, ByteSizeOf, EstimatedJsonEncodedSizeOf};
+use vector_lib::request_metadata::{GetEventCountTags, GroupedCountByteSize, RequestMetadata};
 
 use super::request_builder::EncodeResult;
 
diff --git a/src/sinks/util/mod.rs b/src/sinks/util/mod.rs
index f5c09b97f380f..f0a233b7037e9 100644
--- a/src/sinks/util/mod.rs
+++ b/src/sinks/util/mod.rs
@@ -52,7 +52,7 @@ pub use service::{
 pub use sink::{BatchSink, PartitionBatchSink, StreamSink};
 use snafu::Snafu;
 pub use uri::UriSerde;
-use vector_common::json_size::JsonSize;
+use vector_lib::json_size::JsonSize;
 
 use crate::event::EventFinalizers;
 
diff --git a/src/sinks/util/processed_event.rs b/src/sinks/util/processed_event.rs
index 63b6ba8e1425b..46fd04a3cf7e4 100644
--- a/src/sinks/util/processed_event.rs
+++ b/src/sinks/util/processed_event.rs
@@ -1,11 +1,11 @@
 use serde::Serialize;
-use vector_common::{
-    internal_event::TaggedEventsSent, json_size::JsonSize, request_metadata::GetEventCountTags,
-};
 use vector_core::{
     event::{EventFinalizers, Finalizable, LogEvent, MaybeAsLogMut},
     ByteSizeOf, EstimatedJsonEncodedSizeOf,
 };
+use vector_lib::{
+    internal_event::TaggedEventsSent, json_size::JsonSize, request_metadata::GetEventCountTags,
+};
 
 /// An event alongside metadata from preprocessing. This is useful for sinks
 /// like Splunk HEC that process events prior to encoding.
diff --git a/src/sinks/util/request_builder.rs b/src/sinks/util/request_builder.rs
index 5ee5ea62423b3..2a553c0d5a529 100644
--- a/src/sinks/util/request_builder.rs
+++ b/src/sinks/util/request_builder.rs
@@ -1,7 +1,7 @@
 use std::{io, num::NonZeroUsize};
 
 use bytes::Bytes;
-use vector_common::request_metadata::{GroupedCountByteSize, RequestMetadata};
+use vector_lib::request_metadata::{GroupedCountByteSize, RequestMetadata};
 
 use super::{encoding::Encoder, metadata::RequestMetadataBuilder, Compression, Compressor};
 
diff --git a/src/sinks/util/service.rs b/src/sinks/util/service.rs
index e9c1a2d61377e..18b14e5a74197 100644
--- a/src/sinks/util/service.rs
+++ b/src/sinks/util/service.rs
@@ -440,7 +440,7 @@ mod tests {
 
     use futures::{future, stream, FutureExt, SinkExt, StreamExt};
     use tokio::time::Duration;
-    use vector_common::json_size::JsonSize;
+    use vector_lib::json_size::JsonSize;
 
     use super::*;
     use crate::sinks::util::{
diff --git a/src/sinks/util/sink.rs b/src/sinks/util/sink.rs
index 2b318b4ef7ab1..b288eb20422fa 100644
--- a/src/sinks/util/sink.rs
+++ b/src/sinks/util/sink.rs
@@ -48,7 +48,7 @@ use tokio::{
 };
 use tower::{Service, ServiceBuilder};
 use tracing::Instrument;
-use vector_common::internal_event::{
+use vector_lib::internal_event::{
     CallError, CountByteSize, EventsSent, InternalEventHandle as _, Output,
 };
 // === StreamSink<Event> ===
@@ -576,7 +576,7 @@ mod tests {
     use bytes::Bytes;
     use futures::{future, stream, task::noop_waker_ref, SinkExt, StreamExt};
     use tokio::{task::yield_now, time::Instant};
-    use vector_common::{
+    use vector_lib::{
         finalization::{BatchNotifier, BatchStatus, EventFinalizer, EventFinalizers},
         json_size::JsonSize,
     };
diff --git a/src/sinks/util/socket_bytes_sink.rs b/src/sinks/util/socket_bytes_sink.rs
index 7d668c0201fb4..da453c0d155c7 100644
--- a/src/sinks/util/socket_bytes_sink.rs
+++ b/src/sinks/util/socket_bytes_sink.rs
@@ -10,7 +10,7 @@ use futures::Sink;
 use pin_project::{pin_project, pinned_drop};
 use tokio::io::AsyncWrite;
 use tokio_util::codec::{BytesCodec, FramedWrite};
-use vector_common::{
+use vector_lib::{
     finalization::{EventFinalizers, EventStatus},
     json_size::JsonSize,
 };
diff --git a/src/sinks/util/tcp.rs b/src/sinks/util/tcp.rs
index 1fd97fa744e99..b0372407f8890 100644
--- a/src/sinks/util/tcp.rs
+++ b/src/sinks/util/tcp.rs
@@ -17,9 +17,9 @@ use tokio::{
     time::sleep,
 };
 use tokio_util::codec::Encoder;
-use vector_common::json_size::JsonSize;
 use vector_config::configurable_component;
 use vector_core::{ByteSizeOf, EstimatedJsonEncodedSizeOf};
+use vector_lib::json_size::JsonSize;
 
 use crate::{
     codecs::Transformer,
diff --git a/src/sinks/util/udp.rs b/src/sinks/util/udp.rs
index 4afc14871a979..1a31fb4d16569 100644
--- a/src/sinks/util/udp.rs
+++ b/src/sinks/util/udp.rs
@@ -10,11 +10,9 @@ use futures::{stream::BoxStream, FutureExt, StreamExt};
 use snafu::{ResultExt, Snafu};
 use tokio::{net::UdpSocket, time::sleep};
 use tokio_util::codec::Encoder;
-use vector_common::internal_event::{
-    ByteSize, BytesSent, InternalEventHandle, Protocol, Registered,
-};
 use vector_config::configurable_component;
 use vector_core::EstimatedJsonEncodedSizeOf;
+use vector_lib::internal_event::{ByteSize, BytesSent, InternalEventHandle, Protocol, Registered};
 
 use super::SinkBuildError;
 use crate::{
diff --git a/src/sinks/util/unix.rs b/src/sinks/util/unix.rs
index c8a3a8b93603b..84c1b4746df83 100644
--- a/src/sinks/util/unix.rs
+++ b/src/sinks/util/unix.rs
@@ -6,9 +6,9 @@ use futures::{stream::BoxStream, SinkExt, StreamExt};
 use snafu::{ResultExt, Snafu};
 use tokio::{net::UnixStream, time::sleep};
 use tokio_util::codec::Encoder;
-use vector_common::json_size::JsonSize;
 use vector_config::configurable_component;
 use vector_core::{ByteSizeOf, EstimatedJsonEncodedSizeOf};
+use vector_lib::json_size::JsonSize;
 
 use crate::{
     codecs::Transformer,
diff --git a/src/sinks/vector/service.rs b/src/sinks/vector/service.rs
index 5e8b278866e02..87cd11fea3ec4 100644
--- a/src/sinks/vector/service.rs
+++ b/src/sinks/vector/service.rs
@@ -8,7 +8,7 @@ use hyper_proxy::ProxyConnector;
 use prost::Message;
 use tonic::{body::BoxBody, IntoRequest};
 use tower::Service;
-use vector_common::request_metadata::{GroupedCountByteSize, MetaDescriptive, RequestMetadata};
+use vector_lib::request_metadata::{GroupedCountByteSize, MetaDescriptive, RequestMetadata};
 use vector_stream::DriverResponse;
 
 use super::VectorSinkError;
diff --git a/src/sinks/vector/sink.rs b/src/sinks/vector/sink.rs
index 0375302b95b6c..89f8d93c90b2a 100644
--- a/src/sinks/vector/sink.rs
+++ b/src/sinks/vector/sink.rs
@@ -4,8 +4,8 @@ use async_trait::async_trait;
 use futures::{stream::BoxStream, StreamExt};
 use prost::Message;
 use tower::Service;
-use vector_common::request_metadata::GroupedCountByteSize;
 use vector_core::{config::telemetry, ByteSizeOf, EstimatedJsonEncodedSizeOf};
+use vector_lib::request_metadata::GroupedCountByteSize;
 use vector_stream::{batcher::data::BatchReduce, BatcherSettings, DriverResponse};
 
 use super::service::VectorRequest;
diff --git a/src/sinks/webhdfs/test.rs b/src/sinks/webhdfs/test.rs
index 7d4aa66e2e251..865980ae42b5b 100644
--- a/src/sinks/webhdfs/test.rs
+++ b/src/sinks/webhdfs/test.rs
@@ -1,7 +1,7 @@
 use bytes::Bytes;
 use codecs::{encoding::Framer, JsonSerializerConfig, NewlineDelimitedEncoderConfig};
-use vector_common::request_metadata::GroupedCountByteSize;
 use vector_core::partition::Partitioner;
+use vector_lib::request_metadata::GroupedCountByteSize;
 
 use super::config::WebHdfsConfig;
 use crate::{
diff --git a/src/source_sender/mod.rs b/src/source_sender/mod.rs
index 97c4bfdedd83b..c13d56e96cabf 100644
--- a/src/source_sender/mod.rs
+++ b/src/source_sender/mod.rs
@@ -7,7 +7,6 @@ use futures::{Stream, StreamExt};
 use metrics::{register_histogram, Histogram};
 use tracing::Span;
 use vector_buffers::topology::channel::{self, LimitedReceiver, LimitedSender};
-use vector_common::internal_event::{ComponentEventsDropped, UNINTENTIONAL};
 #[cfg(test)]
 use vector_core::event::{into_event_stream, EventStatus};
 use vector_core::{
@@ -18,6 +17,7 @@ use vector_core::{
     },
     ByteSizeOf, EstimatedJsonEncodedSizeOf,
 };
+use vector_lib::internal_event::{ComponentEventsDropped, UNINTENTIONAL};
 use vrl::value::Value;
 
 mod errors;
diff --git a/src/sources/amqp.rs b/src/sources/amqp.rs
index 3b45a8cedd680..64dcbaebe87a2 100644
--- a/src/sources/amqp.rs
+++ b/src/sources/amqp.rs
@@ -24,16 +24,16 @@ use lookup::{lookup_v2::OptionalValuePath, metadata_path, owned_value_path, path
 use snafu::Snafu;
 use std::{io::Cursor, pin::Pin};
 use tokio_util::codec::FramedRead;
-use vector_common::{
-    finalizer::UnorderedFinalizer,
-    internal_event::{CountByteSize, EventsReceived, InternalEventHandle as _},
-};
 use vector_config::configurable_component;
 use vector_core::{
     config::{log_schema, LegacyKey, LogNamespace, SourceAcknowledgementsConfig},
     event::Event,
     EstimatedJsonEncodedSizeOf,
 };
+use vector_lib::{
+    finalizer::UnorderedFinalizer,
+    internal_event::{CountByteSize, EventsReceived, InternalEventHandle as _},
+};
 use vrl::value::Kind;
 
 #[derive(Debug, Snafu)]
@@ -127,7 +127,7 @@ fn default_offset_key() -> OptionalValuePath {
 impl_generate_config_from_default!(AmqpSourceConfig);
 
 impl AmqpSourceConfig {
-    fn decoder(&self, log_namespace: LogNamespace) -> vector_common::Result<Decoder> {
+    fn decoder(&self, log_namespace: LogNamespace) -> vector_lib::Result<Decoder> {
         DecodingConfig::new(self.framing.clone(), self.decoding.clone(), log_namespace).build()
     }
 }
diff --git a/src/sources/apache_metrics/parser.rs b/src/sources/apache_metrics/parser.rs
index 754d0e7708793..a782b718d70a2 100644
--- a/src/sources/apache_metrics/parser.rs
+++ b/src/sources/apache_metrics/parser.rs
@@ -479,8 +479,8 @@ impl error::Error for ParseError {
 mod test {
     use chrono::{DateTime, Utc};
     use similar_asserts::assert_eq;
-    use vector_common::assert_event_data_eq;
     use vector_core::metric_tags;
+    use vector_lib::assert_event_data_eq;
 
     use super::*;
     use crate::event::metric::{Metric, MetricKind, MetricValue};
diff --git a/src/sources/aws_ecs_metrics/mod.rs b/src/sources/aws_ecs_metrics/mod.rs
index 09dc5f92c2b89..33f919ba084e3 100644
--- a/src/sources/aws_ecs_metrics/mod.rs
+++ b/src/sources/aws_ecs_metrics/mod.rs
@@ -5,9 +5,9 @@ use hyper::{Body, Client, Request};
 use serde_with::serde_as;
 use tokio::time;
 use tokio_stream::wrappers::IntervalStream;
-use vector_common::internal_event::{ByteSize, BytesReceived, InternalEventHandle as _, Protocol};
 use vector_config::configurable_component;
 use vector_core::{config::LogNamespace, EstimatedJsonEncodedSizeOf};
+use vector_lib::internal_event::{ByteSize, BytesReceived, InternalEventHandle as _, Protocol};
 
 use crate::{
     config::{GenerateConfig, SourceConfig, SourceContext, SourceOutput},
diff --git a/src/sources/aws_ecs_metrics/parser.rs b/src/sources/aws_ecs_metrics/parser.rs
index 2d1bbf9def0b2..8dedf726d3458 100644
--- a/src/sources/aws_ecs_metrics/parser.rs
+++ b/src/sources/aws_ecs_metrics/parser.rs
@@ -560,8 +560,8 @@ pub(super) fn parse(
 #[cfg(test)]
 mod test {
     use chrono::{offset::TimeZone, DateTime, Timelike, Utc};
-    use vector_common::assert_event_data_eq;
     use vector_core::metric_tags;
+    use vector_lib::assert_event_data_eq;
 
     use super::parse;
     use crate::event::metric::{Metric, MetricKind, MetricValue};
diff --git a/src/sources/aws_kinesis_firehose/filters.rs b/src/sources/aws_kinesis_firehose/filters.rs
index b9d36a627aece..5c4e566913336 100644
--- a/src/sources/aws_kinesis_firehose/filters.rs
+++ b/src/sources/aws_kinesis_firehose/filters.rs
@@ -4,8 +4,8 @@ use bytes::{Buf, Bytes};
 use chrono::Utc;
 use flate2::read::MultiGzDecoder;
 use snafu::ResultExt;
-use vector_common::internal_event::{BytesReceived, Protocol};
 use vector_core::config::LogNamespace;
+use vector_lib::internal_event::{BytesReceived, Protocol};
 use warp::{http::StatusCode, Filter};
 
 use super::{
diff --git a/src/sources/aws_kinesis_firehose/handlers.rs b/src/sources/aws_kinesis_firehose/handlers.rs
index 388e6187cd20f..af1e82a634ff0 100644
--- a/src/sources/aws_kinesis_firehose/handlers.rs
+++ b/src/sources/aws_kinesis_firehose/handlers.rs
@@ -9,17 +9,17 @@ use futures::StreamExt;
 use lookup::{metadata_path, path, PathPrefix};
 use snafu::{ResultExt, Snafu};
 use tokio_util::codec::FramedRead;
-use vector_common::{
-    finalization::AddBatchNotifier,
-    internal_event::{
-        ByteSize, BytesReceived, CountByteSize, InternalEventHandle as _, Registered,
-    },
-};
 use vector_core::{
     config::{LegacyKey, LogNamespace},
     event::BatchNotifier,
     EstimatedJsonEncodedSizeOf,
 };
+use vector_lib::{
+    finalization::AddBatchNotifier,
+    internal_event::{
+        ByteSize, BytesReceived, CountByteSize, InternalEventHandle as _, Registered,
+    },
+};
 use vrl::compiler::SecretTarget;
 use warp::reject;
 
diff --git a/src/sources/aws_kinesis_firehose/mod.rs b/src/sources/aws_kinesis_firehose/mod.rs
index add2787d48037..3ef3730d67b35 100644
--- a/src/sources/aws_kinesis_firehose/mod.rs
+++ b/src/sources/aws_kinesis_firehose/mod.rs
@@ -4,9 +4,9 @@ use codecs::decoding::{DeserializerConfig, FramingConfig};
 use futures::FutureExt;
 use lookup::owned_value_path;
 use tracing::Span;
-use vector_common::sensitive_string::SensitiveString;
 use vector_config::configurable_component;
 use vector_core::config::{LegacyKey, LogNamespace};
+use vector_lib::sensitive_string::SensitiveString;
 use vrl::value::Kind;
 use warp::Filter;
 
@@ -255,7 +255,7 @@ mod tests {
     use lookup::path;
     use similar_asserts::assert_eq;
     use tokio::time::{sleep, Duration};
-    use vector_common::assert_event_data_eq;
+    use vector_lib::assert_event_data_eq;
     use vrl::value;
 
     use super::*;
diff --git a/src/sources/aws_s3/sqs.rs b/src/sources/aws_s3/sqs.rs
index a7f827c920b69..1a9154e6daffe 100644
--- a/src/sources/aws_s3/sqs.rs
+++ b/src/sources/aws_s3/sqs.rs
@@ -22,10 +22,10 @@ use snafu::{ResultExt, Snafu};
 use tokio::{pin, select};
 use tokio_util::codec::FramedRead;
 use tracing::Instrument;
-use vector_common::internal_event::{
+use vector_config::configurable_component;
+use vector_lib::internal_event::{
     ByteSize, BytesReceived, CountByteSize, InternalEventHandle as _, Protocol, Registered,
 };
-use vector_config::configurable_component;
 
 use crate::codecs::Decoder;
 use crate::event::{Event, LogEvent};
diff --git a/src/sources/aws_sqs/source.rs b/src/sources/aws_sqs/source.rs
index 0f69b0740f8f1..28fc9dfc0cdef 100644
--- a/src/sources/aws_sqs/source.rs
+++ b/src/sources/aws_sqs/source.rs
@@ -8,9 +8,9 @@ use chrono::{DateTime, TimeZone, Utc};
 use futures::{FutureExt, StreamExt};
 use tokio::{pin, select};
 use tracing_futures::Instrument;
-use vector_common::finalizer::UnorderedFinalizer;
-use vector_common::internal_event::{EventsReceived, Registered};
 use vector_core::config::LogNamespace;
+use vector_lib::finalizer::UnorderedFinalizer;
+use vector_lib::internal_event::{EventsReceived, Registered};
 
 use crate::{
     codecs::Decoder,
diff --git a/src/sources/datadog_agent/logs.rs b/src/sources/datadog_agent/logs.rs
index b957487dcd3bc..47201917d986f 100644
--- a/src/sources/datadog_agent/logs.rs
+++ b/src/sources/datadog_agent/logs.rs
@@ -6,8 +6,8 @@ use codecs::StreamDecodingError;
 use http::StatusCode;
 use lookup::path;
 use tokio_util::codec::Decoder;
-use vector_common::internal_event::{CountByteSize, InternalEventHandle as _};
 use vector_core::{config::LegacyKey, EstimatedJsonEncodedSizeOf};
+use vector_lib::internal_event::{CountByteSize, InternalEventHandle as _};
 use warp::{filters::BoxedFilter, path as warp_path, path::FullPath, reply::Response, Filter};
 
 use crate::{
diff --git a/src/sources/datadog_agent/metrics.rs b/src/sources/datadog_agent/metrics.rs
index ee1c998c13ced..8912a2958e081 100644
--- a/src/sources/datadog_agent/metrics.rs
+++ b/src/sources/datadog_agent/metrics.rs
@@ -7,12 +7,12 @@ use prost::Message;
 use serde::{Deserialize, Serialize};
 use warp::{filters::BoxedFilter, path, path::FullPath, reply::Response, Filter};
 
-use vector_common::internal_event::{CountByteSize, InternalEventHandle as _, Registered};
 use vector_core::{
     event::{DatadogMetricOriginMetadata, EventMetadata},
     metrics::AgentDDSketch,
     EstimatedJsonEncodedSizeOf,
 };
+use vector_lib::internal_event::{CountByteSize, InternalEventHandle as _, Registered};
 
 use crate::{
     common::datadog::{DatadogMetricType, DatadogSeriesMetric},
diff --git a/src/sources/datadog_agent/mod.rs b/src/sources/datadog_agent/mod.rs
index becaf033a9bb1..d95920456b984 100644
--- a/src/sources/datadog_agent/mod.rs
+++ b/src/sources/datadog_agent/mod.rs
@@ -30,10 +30,10 @@ use regex::Regex;
 use serde::{Deserialize, Serialize};
 use snafu::Snafu;
 use tracing::Span;
-use vector_common::internal_event::{EventsReceived, Registered};
 use vector_config::configurable_component;
 use vector_core::config::{LegacyKey, LogNamespace};
 use vector_core::event::{BatchNotifier, BatchStatus};
+use vector_lib::internal_event::{EventsReceived, Registered};
 use vrl::path::OwnedTargetPath;
 use vrl::value::Kind;
 use warp::{filters::BoxedFilter, reject::Rejection, reply::Response, Filter, Reply};
diff --git a/src/sources/datadog_agent/traces.rs b/src/sources/datadog_agent/traces.rs
index c5daa9a4b2910..93f5be5208a69 100644
--- a/src/sources/datadog_agent/traces.rs
+++ b/src/sources/datadog_agent/traces.rs
@@ -9,8 +9,8 @@ use prost::Message;
 use vrl::event_path;
 use warp::{filters::BoxedFilter, path, path::FullPath, reply::Response, Filter, Rejection, Reply};
 
-use vector_common::internal_event::{CountByteSize, InternalEventHandle as _};
 use vector_core::EstimatedJsonEncodedSizeOf;
+use vector_lib::internal_event::{CountByteSize, InternalEventHandle as _};
 
 use crate::{
     event::{Event, TraceEvent, Value},
diff --git a/src/sources/demo_logs.rs b/src/sources/demo_logs.rs
index 1b391c553eb29..afe1eba364e60 100644
--- a/src/sources/demo_logs.rs
+++ b/src/sources/demo_logs.rs
@@ -12,14 +12,14 @@ use snafu::Snafu;
 use std::task::Poll;
 use tokio::time::{self, Duration};
 use tokio_util::codec::FramedRead;
-use vector_common::internal_event::{
-    ByteSize, BytesReceived, CountByteSize, InternalEventHandle as _, Protocol,
-};
 use vector_config::configurable_component;
 use vector_core::{
     config::{LegacyKey, LogNamespace},
     EstimatedJsonEncodedSizeOf,
 };
+use vector_lib::internal_event::{
+    ByteSize, BytesReceived, CountByteSize, InternalEventHandle as _, Protocol,
+};
 use vrl::value::Kind;
 
 use crate::{
diff --git a/src/sources/dnstap/mod.rs b/src/sources/dnstap/mod.rs
index c76fbc6f01450..aa57d66bcb635 100644
--- a/src/sources/dnstap/mod.rs
+++ b/src/sources/dnstap/mod.rs
@@ -3,10 +3,10 @@ use std::path::PathBuf;
 use base64::prelude::{Engine as _, BASE64_STANDARD};
 use bytes::Bytes;
 use lookup::{owned_value_path, path, OwnedValuePath};
-use vector_common::internal_event::{
+use vector_config::configurable_component;
+use vector_lib::internal_event::{
     ByteSize, BytesReceived, InternalEventHandle as _, Protocol, Registered,
 };
-use vector_config::configurable_component;
 use vrl::path::PathPrefix;
 use vrl::value::{kind::Collection, Kind};
 
diff --git a/src/sources/docker_logs/mod.rs b/src/sources/docker_logs/mod.rs
index ba18aa07d012b..2cc85ec62724d 100644
--- a/src/sources/docker_logs/mod.rs
+++ b/src/sources/docker_logs/mod.rs
@@ -20,11 +20,11 @@ use once_cell::sync::Lazy;
 use serde_with::serde_as;
 use tokio::sync::mpsc;
 use tracing_futures::Instrument;
-use vector_common::internal_event::{
-    ByteSize, BytesReceived, InternalEventHandle as _, Protocol, Registered,
-};
 use vector_config::configurable_component;
 use vector_core::config::{LegacyKey, LogNamespace};
+use vector_lib::internal_event::{
+    ByteSize, BytesReceived, InternalEventHandle as _, Protocol, Registered,
+};
 use vrl::event_path;
 use vrl::value::{kind::Collection, Kind};
 
diff --git a/src/sources/eventstoredb_metrics/mod.rs b/src/sources/eventstoredb_metrics/mod.rs
index 7b15edff19035..2bd0e14c7f1a5 100644
--- a/src/sources/eventstoredb_metrics/mod.rs
+++ b/src/sources/eventstoredb_metrics/mod.rs
@@ -5,12 +5,12 @@ use http::Uri;
 use hyper::{Body, Request};
 use serde_with::serde_as;
 use tokio_stream::wrappers::IntervalStream;
-use vector_common::internal_event::{
-    ByteSize, BytesReceived, CountByteSize, InternalEventHandle as _, Protocol,
-};
 use vector_config::configurable_component;
 use vector_core::config::LogNamespace;
 use vector_core::EstimatedJsonEncodedSizeOf;
+use vector_lib::internal_event::{
+    ByteSize, BytesReceived, CountByteSize, InternalEventHandle as _, Protocol,
+};
 
 use self::types::Stats;
 use crate::{
diff --git a/src/sources/exec/mod.rs b/src/sources/exec/mod.rs
index 1b43e05258d6b..567b7a6ff131b 100644
--- a/src/sources/exec/mod.rs
+++ b/src/sources/exec/mod.rs
@@ -21,9 +21,9 @@ use tokio::{
 };
 use tokio_stream::wrappers::IntervalStream;
 use tokio_util::codec::FramedRead;
-use vector_common::internal_event::{ByteSize, BytesReceived, InternalEventHandle as _, Protocol};
 use vector_config::configurable_component;
 use vector_core::{config::LegacyKey, EstimatedJsonEncodedSizeOf};
+use vector_lib::internal_event::{ByteSize, BytesReceived, InternalEventHandle as _, Protocol};
 use vrl::path::OwnedValuePath;
 use vrl::value::Kind;
 
diff --git a/src/sources/file.rs b/src/sources/file.rs
index 6a4d2224db2d9..c59a1d947efa4 100644
--- a/src/sources/file.rs
+++ b/src/sources/file.rs
@@ -16,12 +16,12 @@ use serde_with::serde_as;
 use snafu::{ResultExt, Snafu};
 use tokio::{sync::oneshot, task::spawn_blocking};
 use tracing::{Instrument, Span};
-use vector_common::finalizer::OrderedFinalizer;
 use vector_config::configurable_component;
 use vector_core::{
     config::{LegacyKey, LogNamespace},
     EstimatedJsonEncodedSizeOf,
 };
+use vector_lib::finalizer::OrderedFinalizer;
 use vrl::value::Kind;
 
 use super::util::{EncodingConfig, MultilineConfig};
diff --git a/src/sources/file_descriptors/mod.rs b/src/sources/file_descriptors/mod.rs
index 2d2ec2979c47e..24c5fec623860 100644
--- a/src/sources/file_descriptors/mod.rs
+++ b/src/sources/file_descriptors/mod.rs
@@ -10,15 +10,15 @@ use codecs::{
 use futures::{channel::mpsc, executor, SinkExt, StreamExt};
 use lookup::{lookup_v2::OptionalValuePath, owned_value_path, path, OwnedValuePath};
 use tokio_util::{codec::FramedRead, io::StreamReader};
-use vector_common::internal_event::{
-    ByteSize, BytesReceived, CountByteSize, InternalEventHandle as _, Protocol,
-};
 use vector_config::NamedComponent;
 use vector_core::{
     config::{LegacyKey, LogNamespace},
     event::Event,
     EstimatedJsonEncodedSizeOf,
 };
+use vector_lib::internal_event::{
+    ByteSize, BytesReceived, CountByteSize, InternalEventHandle as _, Protocol,
+};
 use vrl::value::Kind;
 
 use crate::{
diff --git a/src/sources/fluent/mod.rs b/src/sources/fluent/mod.rs
index d8d559cbefa1b..0e1ad42c08ce8 100644
--- a/src/sources/fluent/mod.rs
+++ b/src/sources/fluent/mod.rs
@@ -638,8 +638,8 @@ mod tests {
         time::{error::Elapsed, timeout, Duration},
     };
     use tokio_util::codec::Decoder;
-    use vector_common::assert_event_data_eq;
     use vector_core::{event::Value, schema::Definition};
+    use vector_lib::assert_event_data_eq;
     use vrl::value::kind::Collection;
 
     use super::{message::FluentMessageOptions, *};
diff --git a/src/sources/gcp_pubsub.rs b/src/sources/gcp_pubsub.rs
index 3f1e3b5f1f529..49a402f7e65ca 100644
--- a/src/sources/gcp_pubsub.rs
+++ b/src/sources/gcp_pubsub.rs
@@ -20,12 +20,12 @@ use tonic::{
     transport::{Certificate, ClientTlsConfig, Endpoint, Identity},
     Code, Request, Status,
 };
-use vector_common::internal_event::{
-    ByteSize, BytesReceived, EventsReceived, InternalEventHandle as _, Protocol, Registered,
-};
-use vector_common::{byte_size_of::ByteSizeOf, finalizer::UnorderedFinalizer};
 use vector_config::configurable_component;
 use vector_core::config::{LegacyKey, LogNamespace};
+use vector_lib::internal_event::{
+    ByteSize, BytesReceived, EventsReceived, InternalEventHandle as _, Protocol, Registered,
+};
+use vector_lib::{byte_size_of::ByteSizeOf, finalizer::UnorderedFinalizer};
 use vrl::path;
 use vrl::value::{kind::Collection, Kind};
 
diff --git a/src/sources/host_metrics/mod.rs b/src/sources/host_metrics/mod.rs
index 636169ccbf547..6f08abc45e01a 100644
--- a/src/sources/host_metrics/mod.rs
+++ b/src/sources/host_metrics/mod.rs
@@ -12,12 +12,12 @@ use heim::units::time::second;
 use serde_with::serde_as;
 use tokio::time;
 use tokio_stream::wrappers::IntervalStream;
-use vector_common::internal_event::{
-    ByteSize, BytesReceived, CountByteSize, InternalEventHandle as _, Protocol, Registered,
-};
 use vector_config::configurable_component;
 use vector_core::config::LogNamespace;
 use vector_core::EstimatedJsonEncodedSizeOf;
+use vector_lib::internal_event::{
+    ByteSize, BytesReceived, CountByteSize, InternalEventHandle as _, Protocol, Registered,
+};
 
 use crate::{
     config::{SourceConfig, SourceContext, SourceOutput},
diff --git a/src/sources/http_server.rs b/src/sources/http_server.rs
index 8b5cfefcf57ae..479c02190f6da 100644
--- a/src/sources/http_server.rs
+++ b/src/sources/http_server.rs
@@ -52,7 +52,7 @@ impl GenerateConfig for HttpConfig {
 #[async_trait::async_trait]
 #[typetag::serde(name = "http")]
 impl SourceConfig for HttpConfig {
-    async fn build(&self, cx: SourceContext) -> vector_common::Result<super::Source> {
+    async fn build(&self, cx: SourceContext) -> vector_lib::Result<super::Source> {
         self.0.build(cx).await
     }
 
diff --git a/src/sources/internal_metrics.rs b/src/sources/internal_metrics.rs
index 6ae574436160a..fe15e09d57ec2 100644
--- a/src/sources/internal_metrics.rs
+++ b/src/sources/internal_metrics.rs
@@ -5,9 +5,9 @@ use lookup::lookup_v2::OptionalValuePath;
 use serde_with::serde_as;
 use tokio::time;
 use tokio_stream::wrappers::IntervalStream;
-use vector_common::internal_event::{CountByteSize, InternalEventHandle as _};
 use vector_config::configurable_component;
 use vector_core::{config::LogNamespace, ByteSizeOf, EstimatedJsonEncodedSizeOf};
+use vector_lib::internal_event::{CountByteSize, InternalEventHandle as _};
 
 use crate::{
     config::{log_schema, SourceConfig, SourceContext, SourceOutput},
diff --git a/src/sources/journald.rs b/src/sources/journald.rs
index 2d7c7fd5b49d7..a9d4fb7e9fa8a 100644
--- a/src/sources/journald.rs
+++ b/src/sources/journald.rs
@@ -28,18 +28,18 @@ use tokio::{
     time::sleep,
 };
 use tokio_util::codec::FramedRead;
-use vector_common::{
-    finalizer::OrderedFinalizer,
-    internal_event::{
-        ByteSize, BytesReceived, CountByteSize, InternalEventHandle as _, Protocol, Registered,
-    },
-};
 use vector_config::configurable_component;
 use vector_core::{
     config::{LegacyKey, LogNamespace},
     schema::Definition,
     EstimatedJsonEncodedSizeOf,
 };
+use vector_lib::{
+    finalizer::OrderedFinalizer,
+    internal_event::{
+        ByteSize, BytesReceived, CountByteSize, InternalEventHandle as _, Protocol, Registered,
+    },
+};
 use vrl::event_path;
 use vrl::value::{kind::Collection, Kind, Value};
 
diff --git a/src/sources/kafka.rs b/src/sources/kafka.rs
index 6bcba0de51682..e8d5bdf019cfc 100644
--- a/src/sources/kafka.rs
+++ b/src/sources/kafka.rs
@@ -42,12 +42,12 @@ use tokio::{
 };
 use tokio_util::codec::FramedRead;
 
-use vector_common::finalizer::OrderedFinalizer;
 use vector_config::configurable_component;
 use vector_core::{
     config::{LegacyKey, LogNamespace},
     EstimatedJsonEncodedSizeOf,
 };
+use vector_lib::finalizer::OrderedFinalizer;
 use vrl::value::{kind::Collection, Kind};
 
 use crate::{
diff --git a/src/sources/kubernetes_logs/mod.rs b/src/sources/kubernetes_logs/mod.rs
index 6bd20e9b77c93..9d5632a24aa76 100644
--- a/src/sources/kubernetes_logs/mod.rs
+++ b/src/sources/kubernetes_logs/mod.rs
@@ -26,12 +26,12 @@ use kube::{
 use lifecycle::Lifecycle;
 use lookup::{lookup_v2::OptionalTargetPath, owned_value_path, path, OwnedTargetPath};
 use serde_with::serde_as;
-use vector_common::{
+use vector_config::configurable_component;
+use vector_core::{config::LegacyKey, config::LogNamespace, EstimatedJsonEncodedSizeOf};
+use vector_lib::{
     internal_event::{ByteSize, BytesReceived, InternalEventHandle as _, Protocol},
     TimeZone,
 };
-use vector_config::configurable_component;
-use vector_core::{config::LegacyKey, config::LogNamespace, EstimatedJsonEncodedSizeOf};
 use vrl::value::{kind::Collection, Kind};
 
 use crate::sources::kubernetes_logs::partial_events_merger::merge_partial_events;
diff --git a/src/sources/kubernetes_logs/parser/cri.rs b/src/sources/kubernetes_logs/parser/cri.rs
index a1c8f5dd24f16..044c5a0463c9b 100644
--- a/src/sources/kubernetes_logs/parser/cri.rs
+++ b/src/sources/kubernetes_logs/parser/cri.rs
@@ -1,8 +1,8 @@
 use chrono::{DateTime, Utc};
 use derivative::Derivative;
 use lookup::path;
-use vector_common::conversion;
 use vector_core::config::{log_schema, LegacyKey, LogNamespace};
+use vector_lib::conversion;
 
 use crate::sources::kubernetes_logs::transform_utils::get_message_path;
 use crate::{
diff --git a/src/sources/nats.rs b/src/sources/nats.rs
index a6fb139759fef..d6654846e23df 100644
--- a/src/sources/nats.rs
+++ b/src/sources/nats.rs
@@ -4,14 +4,14 @@ use futures::{pin_mut, StreamExt};
 use lookup::{lookup_v2::OptionalValuePath, owned_value_path};
 use snafu::{ResultExt, Snafu};
 use tokio_util::codec::FramedRead;
-use vector_common::internal_event::{
-    ByteSize, BytesReceived, CountByteSize, EventsReceived, InternalEventHandle as _, Protocol,
-};
 use vector_config::configurable_component;
 use vector_core::{
     config::{LegacyKey, LogNamespace},
     EstimatedJsonEncodedSizeOf,
 };
+use vector_lib::internal_event::{
+    ByteSize, BytesReceived, CountByteSize, EventsReceived, InternalEventHandle as _, Protocol,
+};
 use vrl::value::Kind;
 
 use crate::{
diff --git a/src/sources/opentelemetry/grpc.rs b/src/sources/opentelemetry/grpc.rs
index 9916043520a3a..06c400626ea6b 100644
--- a/src/sources/opentelemetry/grpc.rs
+++ b/src/sources/opentelemetry/grpc.rs
@@ -3,12 +3,12 @@ use opentelemetry_proto::proto::collector::logs::v1::{
     logs_service_server::LogsService, ExportLogsServiceRequest, ExportLogsServiceResponse,
 };
 use tonic::{Request, Response, Status};
-use vector_common::internal_event::{CountByteSize, InternalEventHandle as _, Registered};
 use vector_core::{
     config::LogNamespace,
     event::{BatchNotifier, BatchStatus, BatchStatusReceiver, Event},
     EstimatedJsonEncodedSizeOf,
 };
+use vector_lib::internal_event::{CountByteSize, InternalEventHandle as _, Registered};
 
 use crate::{
     internal_events::{EventsReceived, StreamClosedError},
diff --git a/src/sources/opentelemetry/http.rs b/src/sources/opentelemetry/http.rs
index be7ebef83ef7a..8d914fb046281 100644
--- a/src/sources/opentelemetry/http.rs
+++ b/src/sources/opentelemetry/http.rs
@@ -9,14 +9,14 @@ use opentelemetry_proto::proto::collector::logs::v1::{
 use prost::Message;
 use snafu::Snafu;
 use tracing::Span;
-use vector_common::internal_event::{
-    ByteSize, BytesReceived, CountByteSize, InternalEventHandle as _, Registered,
-};
 use vector_core::{
     config::LogNamespace,
     event::{BatchNotifier, BatchStatus},
     EstimatedJsonEncodedSizeOf,
 };
+use vector_lib::internal_event::{
+    ByteSize, BytesReceived, CountByteSize, InternalEventHandle as _, Registered,
+};
 use warp::{filters::BoxedFilter, reject::Rejection, reply::Response, Filter, Reply};
 
 use crate::{
diff --git a/src/sources/opentelemetry/mod.rs b/src/sources/opentelemetry/mod.rs
index caeffa87e46d8..24624ac470efb 100644
--- a/src/sources/opentelemetry/mod.rs
+++ b/src/sources/opentelemetry/mod.rs
@@ -18,12 +18,12 @@ use opentelemetry_proto::convert::{
 };
 
 use opentelemetry_proto::proto::collector::logs::v1::logs_service_server::LogsServiceServer;
-use vector_common::internal_event::{BytesReceived, EventsReceived, Protocol};
 use vector_config::configurable_component;
 use vector_core::{
     config::{log_schema, LegacyKey, LogNamespace},
     schema::Definition,
 };
+use vector_lib::internal_event::{BytesReceived, EventsReceived, Protocol};
 use vrl::value::{kind::Collection, Kind};
 
 use self::{
diff --git a/src/sources/postgresql_metrics.rs b/src/sources/postgresql_metrics.rs
index 25fefe02d7d57..64bef39a5eaa4 100644
--- a/src/sources/postgresql_metrics.rs
+++ b/src/sources/postgresql_metrics.rs
@@ -25,13 +25,13 @@ use tokio_postgres::{
     Client, Config, Error as PgError, NoTls, Row,
 };
 use tokio_stream::wrappers::IntervalStream;
-use vector_common::{
-    internal_event::{CountByteSize, InternalEventHandle as _, Registered},
-    json_size::JsonSize,
-};
 use vector_config::configurable_component;
 use vector_core::config::LogNamespace;
 use vector_core::{metric_tags, ByteSizeOf, EstimatedJsonEncodedSizeOf};
+use vector_lib::{
+    internal_event::{CountByteSize, InternalEventHandle as _, Registered},
+    json_size::JsonSize,
+};
 
 use crate::{
     config::{SourceConfig, SourceContext, SourceOutput},
diff --git a/src/sources/prometheus/parser.rs b/src/sources/prometheus/parser.rs
index 36c5d8dc57ed3..4fe8ea4e3131c 100644
--- a/src/sources/prometheus/parser.rs
+++ b/src/sources/prometheus/parser.rs
@@ -137,8 +137,8 @@ mod test {
     use chrono::{TimeZone, Timelike, Utc};
     use once_cell::sync::Lazy;
     use similar_asserts::assert_eq;
-    use vector_common::assert_event_data_eq;
     use vector_core::metric_tags;
+    use vector_lib::assert_event_data_eq;
 
     use super::*;
     use crate::event::metric::{Metric, MetricKind, MetricValue};
diff --git a/src/sources/prometheus/remote_write.rs b/src/sources/prometheus/remote_write.rs
index 9a2e4356975b6..dcec68ade1e30 100644
--- a/src/sources/prometheus/remote_write.rs
+++ b/src/sources/prometheus/remote_write.rs
@@ -220,7 +220,7 @@ mod test {
         // put them back into order before comparing.
         output.sort_unstable_by_key(|event| event.as_metric().name().to_owned());
 
-        vector_common::assert_event_data_eq!(events, output);
+        vector_lib::assert_event_data_eq!(events, output);
     }
 
     fn make_events() -> Vec<Event> {
@@ -330,7 +330,7 @@ mod test {
         )
         .await;
 
-        vector_common::assert_event_data_eq!(expected, output);
+        vector_lib::assert_event_data_eq!(expected, output);
     }
 }
 
diff --git a/src/sources/redis/mod.rs b/src/sources/redis/mod.rs
index 9dd343211c9ea..568a84701268c 100644
--- a/src/sources/redis/mod.rs
+++ b/src/sources/redis/mod.rs
@@ -8,14 +8,14 @@ use futures::StreamExt;
 use lookup::{lookup_v2::OptionalValuePath, owned_value_path, path, OwnedValuePath};
 use snafu::{ResultExt, Snafu};
 use tokio_util::codec::FramedRead;
-use vector_common::internal_event::{
-    ByteSize, BytesReceived, CountByteSize, InternalEventHandle as _, Protocol, Registered,
-};
 use vector_config::configurable_component;
 use vector_core::{
     config::{LegacyKey, LogNamespace},
     EstimatedJsonEncodedSizeOf,
 };
+use vector_lib::internal_event::{
+    ByteSize, BytesReceived, CountByteSize, InternalEventHandle as _, Protocol, Registered,
+};
 use vrl::value::Kind;
 
 use crate::{
diff --git a/src/sources/socket/udp.rs b/src/sources/socket/udp.rs
index a2793a6bae0cd..4add14a1694e8 100644
--- a/src/sources/socket/udp.rs
+++ b/src/sources/socket/udp.rs
@@ -8,12 +8,12 @@ use futures::StreamExt;
 use listenfd::ListenFd;
 use lookup::{lookup_v2::OptionalValuePath, owned_value_path, path};
 use tokio_util::codec::FramedRead;
-use vector_common::internal_event::{ByteSize, BytesReceived, InternalEventHandle as _, Protocol};
 use vector_config::configurable_component;
 use vector_core::{
     config::{LegacyKey, LogNamespace},
     EstimatedJsonEncodedSizeOf,
 };
+use vector_lib::internal_event::{ByteSize, BytesReceived, InternalEventHandle as _, Protocol};
 
 use crate::{
     codecs::Decoder,
diff --git a/src/sources/socket/unix.rs b/src/sources/socket/unix.rs
index 4d09e128a2c94..52a0b362dd6c2 100644
--- a/src/sources/socket/unix.rs
+++ b/src/sources/socket/unix.rs
@@ -4,9 +4,9 @@ use bytes::Bytes;
 use chrono::Utc;
 use codecs::decoding::{DeserializerConfig, FramingConfig};
 use lookup::{lookup_v2::OptionalValuePath, path};
-use vector_common::shutdown::ShutdownSignal;
 use vector_config::configurable_component;
 use vector_core::config::{LegacyKey, LogNamespace};
+use vector_lib::shutdown::ShutdownSignal;
 
 use crate::{
     codecs::Decoder,
diff --git a/src/sources/splunk_hec/acknowledgements.rs b/src/sources/splunk_hec/acknowledgements.rs
index 68a4980e0969b..644bd2eecea03 100644
--- a/src/sources/splunk_hec/acknowledgements.rs
+++ b/src/sources/splunk_hec/acknowledgements.rs
@@ -12,8 +12,8 @@ use futures::StreamExt;
 use roaring::RoaringTreemap;
 use serde::{Deserialize, Serialize};
 use tokio::time::interval;
-use vector_common::{finalization::BatchStatusReceiver, finalizer::UnorderedFinalizer};
 use vector_config::configurable_component;
+use vector_lib::{finalization::BatchStatusReceiver, finalizer::UnorderedFinalizer};
 use warp::Rejection;
 
 use super::ApiError;
diff --git a/src/sources/splunk_hec/mod.rs b/src/sources/splunk_hec/mod.rs
index ac597caf2be06..1326cb48a234b 100644
--- a/src/sources/splunk_hec/mod.rs
+++ b/src/sources/splunk_hec/mod.rs
@@ -16,8 +16,6 @@ use serde::Serialize;
 use serde_json::{de::Read as JsonRead, Deserializer, Value as JsonValue};
 use snafu::Snafu;
 use tracing::Span;
-use vector_common::internal_event::{CountByteSize, InternalEventHandle as _, Registered};
-use vector_common::sensitive_string::SensitiveString;
 use vector_config::configurable_component;
 use vector_core::{
     config::{LegacyKey, LogNamespace},
@@ -25,6 +23,8 @@ use vector_core::{
     schema::meaning,
     EstimatedJsonEncodedSizeOf,
 };
+use vector_lib::internal_event::{CountByteSize, InternalEventHandle as _, Registered};
+use vector_lib::sensitive_string::SensitiveString;
 use vrl::value::{kind::Collection, Kind};
 use warp::{filters::BoxedFilter, path, reject::Rejection, reply::Response, Filter, Reply};
 
@@ -1213,8 +1213,8 @@ mod tests {
     use futures_util::Stream;
     use reqwest::{RequestBuilder, Response};
     use serde::Deserialize;
-    use vector_common::sensitive_string::SensitiveString;
     use vector_core::{event::EventStatus, schema::Definition};
+    use vector_lib::sensitive_string::SensitiveString;
     use vrl::path::PathPrefix;
 
     use super::*;
diff --git a/src/sources/statsd/mod.rs b/src/sources/statsd/mod.rs
index e483578780c0b..df9227a3be956 100644
--- a/src/sources/statsd/mod.rs
+++ b/src/sources/statsd/mod.rs
@@ -13,9 +13,9 @@ use listenfd::ListenFd;
 use serde_with::serde_as;
 use smallvec::{smallvec, SmallVec};
 use tokio_util::udp::UdpFramed;
-use vector_common::internal_event::{CountByteSize, InternalEventHandle as _, Registered};
 use vector_config::configurable_component;
 use vector_core::EstimatedJsonEncodedSizeOf;
+use vector_lib::internal_event::{CountByteSize, InternalEventHandle as _, Registered};
 
 use self::parser::ParseError;
 use super::util::net::{try_bind_udp_socket, SocketListenAddr, TcpNullAcker, TcpSource};
diff --git a/src/sources/statsd/parser.rs b/src/sources/statsd/parser.rs
index a21a6e128dd53..8696726177dc2 100644
--- a/src/sources/statsd/parser.rs
+++ b/src/sources/statsd/parser.rs
@@ -197,7 +197,7 @@ impl fmt::Display for ParseError {
     }
 }
 
-vector_common::impl_event_data_eq!(ParseError);
+vector_lib::impl_event_data_eq!(ParseError);
 
 impl error::Error for ParseError {}
 
@@ -215,8 +215,8 @@ impl From<ParseFloatError> for ParseError {
 
 #[cfg(test)]
 mod test {
-    use vector_common::assert_event_data_eq;
     use vector_core::{event::metric::TagValue, metric_tags};
+    use vector_lib::assert_event_data_eq;
 
     use super::{parse, sanitize_key, sanitize_sampling};
     use crate::event::metric::{Metric, MetricKind, MetricValue, StatisticKind};
diff --git a/src/sources/syslog.rs b/src/sources/syslog.rs
index 1418d77730d6f..7ab6c5586fa3b 100644
--- a/src/sources/syslog.rs
+++ b/src/sources/syslog.rs
@@ -448,8 +448,8 @@ mod test {
     use serde::Deserialize;
     use tokio::time::{sleep, Duration, Instant};
     use tokio_util::codec::BytesCodec;
-    use vector_common::assert_event_data_eq;
     use vector_core::{config::ComponentKey, schema::Definition};
+    use vector_lib::assert_event_data_eq;
     use vrl::value::{kind::Collection, Kind, Value};
 
     use super::*;
diff --git a/src/sources/util/grpc/decompression.rs b/src/sources/util/grpc/decompression.rs
index bf23e1761b179..d57d773471574 100644
--- a/src/sources/util/grpc/decompression.rs
+++ b/src/sources/util/grpc/decompression.rs
@@ -18,7 +18,7 @@ use std::future::Future;
 use tokio::{pin, select};
 use tonic::{body::BoxBody, metadata::AsciiMetadataValue, Status};
 use tower::{Layer, Service};
-use vector_common::internal_event::{
+use vector_lib::internal_event::{
     ByteSize, BytesReceived, InternalEventHandle as _, Protocol, Registered,
 };
 
diff --git a/src/sources/util/http/auth.rs b/src/sources/util/http/auth.rs
index a75788cf42c04..4b3f47ca5bd10 100644
--- a/src/sources/util/http/auth.rs
+++ b/src/sources/util/http/auth.rs
@@ -1,8 +1,8 @@
 use std::convert::TryFrom;
 
 use headers::{Authorization, HeaderMapExt};
-use vector_common::sensitive_string::SensitiveString;
 use vector_config::configurable_component;
+use vector_lib::sensitive_string::SensitiveString;
 use warp::http::HeaderMap;
 
 #[cfg(any(
diff --git a/src/sources/util/http_client.rs b/src/sources/util/http_client.rs
index 25678a90ae344..2ec764f47b859 100644
--- a/src/sources/util/http_client.rs
+++ b/src/sources/util/http_client.rs
@@ -15,7 +15,7 @@ use hyper::{Body, Request};
 use std::time::{Duration, Instant};
 use std::{collections::HashMap, future::ready};
 use tokio_stream::wrappers::IntervalStream;
-use vector_common::json_size::JsonSize;
+use vector_lib::json_size::JsonSize;
 
 use crate::{
     http::{Auth, HttpClient},
@@ -27,8 +27,8 @@ use crate::{
     tls::TlsSettings,
     SourceSender,
 };
-use vector_common::shutdown::ShutdownSignal;
 use vector_core::{config::proxy::ProxyConfig, event::Event, EstimatedJsonEncodedSizeOf};
+use vector_lib::shutdown::ShutdownSignal;
 
 /// Contains the inputs generic to any http client.
 pub(crate) struct GenericHttpClientInputs {
diff --git a/src/sources/util/message_decoding.rs b/src/sources/util/message_decoding.rs
index 379f8c1b09583..b1fdece0264a2 100644
--- a/src/sources/util/message_decoding.rs
+++ b/src/sources/util/message_decoding.rs
@@ -5,10 +5,10 @@ use chrono::{DateTime, Utc};
 use codecs::StreamDecodingError;
 use lookup::{metadata_path, path, PathPrefix};
 use tokio_util::codec::Decoder as _;
-use vector_common::internal_event::{
+use vector_core::{config::LogNamespace, EstimatedJsonEncodedSizeOf};
+use vector_lib::internal_event::{
     CountByteSize, EventsReceived, InternalEventHandle as _, Registered,
 };
-use vector_core::{config::LogNamespace, EstimatedJsonEncodedSizeOf};
 
 use crate::{codecs::Decoder, config::log_schema, event::BatchNotifier, event::Event};
 
diff --git a/src/sources/util/net/tcp/mod.rs b/src/sources/util/net/tcp/mod.rs
index a31ba249a172d..d72b8dd27d878 100644
--- a/src/sources/util/net/tcp/mod.rs
+++ b/src/sources/util/net/tcp/mod.rs
@@ -17,11 +17,11 @@ use tokio::{
 };
 use tokio_util::codec::{Decoder, FramedRead};
 use tracing::Instrument;
-use vector_common::finalization::AddBatchNotifier;
 use vector_core::{
     config::{LegacyKey, LogNamespace, SourceAcknowledgementsConfig},
     EstimatedJsonEncodedSizeOf,
 };
+use vector_lib::finalization::AddBatchNotifier;
 use vrl::value::Value;
 
 use self::request_limiter::RequestLimiter;
diff --git a/src/sources/util/unix_datagram.rs b/src/sources/util/unix_datagram.rs
index aa5c957cad060..f452dddf334d1 100644
--- a/src/sources/util/unix_datagram.rs
+++ b/src/sources/util/unix_datagram.rs
@@ -6,8 +6,8 @@ use futures::StreamExt;
 use tokio::net::UnixDatagram;
 use tokio_util::codec::FramedRead;
 use tracing::field;
-use vector_common::internal_event::{ByteSize, BytesReceived, InternalEventHandle as _, Protocol};
 use vector_core::EstimatedJsonEncodedSizeOf;
+use vector_lib::internal_event::{ByteSize, BytesReceived, InternalEventHandle as _, Protocol};
 
 use crate::{
     codecs::Decoder,
diff --git a/src/sources/util/unix_stream.rs b/src/sources/util/unix_stream.rs
index 3748ae005be16..9a035b835d58e 100644
--- a/src/sources/util/unix_stream.rs
+++ b/src/sources/util/unix_stream.rs
@@ -11,8 +11,8 @@ use tokio::{
 use tokio_stream::wrappers::UnixListenerStream;
 use tokio_util::codec::FramedRead;
 use tracing::{field, Instrument};
-use vector_common::internal_event::{ByteSize, BytesReceived, InternalEventHandle as _, Protocol};
 use vector_core::EstimatedJsonEncodedSizeOf;
+use vector_lib::internal_event::{ByteSize, BytesReceived, InternalEventHandle as _, Protocol};
 
 use super::AfterReadExt;
 use crate::{
diff --git a/src/sources/vector/mod.rs b/src/sources/vector/mod.rs
index 7c680b4f9a49d..45fdd5113e7dd 100644
--- a/src/sources/vector/mod.rs
+++ b/src/sources/vector/mod.rs
@@ -5,13 +5,13 @@ use chrono::Utc;
 use codecs::NativeDeserializerConfig;
 use futures::TryFutureExt;
 use tonic::{Request, Response, Status};
-use vector_common::internal_event::{CountByteSize, InternalEventHandle as _};
 use vector_config::configurable_component;
 use vector_core::{
     config::LogNamespace,
     event::{BatchNotifier, BatchStatus, BatchStatusReceiver, Event},
     EstimatedJsonEncodedSizeOf,
 };
+use vector_lib::internal_event::{CountByteSize, InternalEventHandle as _};
 
 use crate::{
     config::{
@@ -281,8 +281,8 @@ mod tests {
         sinks::vector::VectorConfig as SinkConfig,
         test_util, SourceSender,
     };
-    use vector_common::assert_event_data_eq;
     use vector_core::config::log_schema;
+    use vector_lib::assert_event_data_eq;
 
     async fn run_test(vector_source_config_str: &str, addr: SocketAddr) {
         let config = format!(r#"address = "{}""#, addr);
diff --git a/src/test_util/mock/sinks/basic.rs b/src/test_util/mock/sinks/basic.rs
index a7463aace4f14..abd7faefe7824 100644
--- a/src/test_util/mock/sinks/basic.rs
+++ b/src/test_util/mock/sinks/basic.rs
@@ -2,13 +2,13 @@ use async_trait::async_trait;
 use futures_util::{stream::BoxStream, FutureExt, StreamExt};
 use snafu::Snafu;
 use tokio::sync::oneshot;
-use vector_common::finalization::Finalizable;
 use vector_config::configurable_component;
 use vector_core::{
     config::{AcknowledgementsConfig, Input},
     event::Event,
     sink::{StreamSink, VectorSink},
 };
+use vector_lib::finalization::Finalizable;
 
 use crate::{
     config::{SinkConfig, SinkContext},
diff --git a/src/topology/builder.rs b/src/topology/builder.rs
index 4f74b202325e2..df40da7c25e83 100644
--- a/src/topology/builder.rs
+++ b/src/topology/builder.rs
@@ -16,9 +16,6 @@ use tokio::{
     time::{timeout, Duration},
 };
 use tracing::Instrument;
-use vector_common::internal_event::{
-    self, CountByteSize, EventsSent, InternalEventHandle as _, Registered,
-};
 use vector_core::config::LogNamespace;
 use vector_core::transform::update_runtime_schema_definition;
 use vector_core::{
@@ -32,6 +29,9 @@ use vector_core::{
     schema::Definition,
     EstimatedJsonEncodedSizeOf,
 };
+use vector_lib::internal_event::{
+    self, CountByteSize, EventsSent, InternalEventHandle as _, Registered,
+};
 
 use super::{
     fanout::{self, Fanout},
diff --git a/src/topology/running.rs b/src/topology/running.rs
index c068dfe73664b..e7e65a7cae092 100644
--- a/src/topology/running.rs
+++ b/src/topology/running.rs
@@ -13,7 +13,7 @@ use tokio::{
 };
 use tracing::Instrument;
 use vector_buffers::topology::channel::BufferSender;
-use vector_common::trigger::DisabledTrigger;
+use vector_lib::trigger::DisabledTrigger;
 
 use super::{
     builder,
diff --git a/src/topology/test/compliance.rs b/src/topology/test/compliance.rs
index 8f4602aa1bba3..001fbbc422643 100644
--- a/src/topology/test/compliance.rs
+++ b/src/topology/test/compliance.rs
@@ -1,9 +1,9 @@
 use std::sync::Arc;
 
 use tokio::sync::oneshot::{channel, Receiver};
-use vector_common::config::ComponentKey;
 use vector_core::config::OutputId;
 use vector_core::event::{Event, EventArray, EventContainer, LogEvent};
+use vector_lib::config::ComponentKey;
 
 use crate::config::schema::Definition;
 use crate::{
diff --git a/src/topology/test/mod.rs b/src/topology/test/mod.rs
index a17d42a5fce1a..79388ee5f83cf 100644
--- a/src/topology/test/mod.rs
+++ b/src/topology/test/mod.rs
@@ -27,8 +27,8 @@ use tokio::{
     time::{sleep, Duration},
 };
 use vector_buffers::{BufferConfig, BufferType, WhenFull};
-use vector_common::config::ComponentKey;
 use vector_core::config::OutputId;
+use vector_lib::config::ComponentKey;
 
 mod backpressure;
 mod compliance;
diff --git a/src/transforms/aggregate.rs b/src/transforms/aggregate.rs
index 797666d892883..bea73ed8dae0f 100644
--- a/src/transforms/aggregate.rs
+++ b/src/transforms/aggregate.rs
@@ -155,7 +155,7 @@ mod tests {
     use futures::stream;
     use tokio::sync::mpsc;
     use tokio_stream::wrappers::ReceiverStream;
-    use vector_common::config::ComponentKey;
+    use vector_lib::config::ComponentKey;
     use vrl::value::Kind;
 
     use super::*;
diff --git a/src/transforms/aws_ec2_metadata.rs b/src/transforms/aws_ec2_metadata.rs
index b79fbafccf7a4..0353ba846a97d 100644
--- a/src/transforms/aws_ec2_metadata.rs
+++ b/src/transforms/aws_ec2_metadata.rs
@@ -761,7 +761,7 @@ mod integration_tests {
         transforms::test::create_topology,
     };
     use std::collections::BTreeMap;
-    use vector_common::assert_event_data_eq;
+    use vector_lib::assert_event_data_eq;
     use vrl::value::Value;
     use warp::Filter;
 
diff --git a/src/transforms/dedupe.rs b/src/transforms/dedupe.rs
index f0e31cd77f5b1..a24e2c81cea0d 100644
--- a/src/transforms/dedupe.rs
+++ b/src/transforms/dedupe.rs
@@ -298,8 +298,8 @@ mod tests {
     use lookup::lookup_v2::ConfigTargetPath;
     use tokio::sync::mpsc;
     use tokio_stream::wrappers::ReceiverStream;
-    use vector_common::config::ComponentKey;
     use vector_core::config::OutputId;
+    use vector_lib::config::ComponentKey;
 
     use crate::config::schema::Definition;
     use crate::{
diff --git a/src/transforms/filter.rs b/src/transforms/filter.rs
index e14f0c7347ab7..7a195b3be1e68 100644
--- a/src/transforms/filter.rs
+++ b/src/transforms/filter.rs
@@ -1,6 +1,6 @@
-use vector_common::internal_event::{Count, InternalEventHandle as _, Registered};
 use vector_config::configurable_component;
 use vector_core::config::{clone_input_definitions, LogNamespace};
+use vector_lib::internal_event::{Count, InternalEventHandle as _, Registered};
 
 use crate::{
     conditions::{AnyCondition, Condition},
@@ -100,8 +100,8 @@ mod test {
 
     use tokio::sync::mpsc;
     use tokio_stream::wrappers::ReceiverStream;
-    use vector_common::config::ComponentKey;
     use vector_core::event::{Metric, MetricKind, MetricValue};
+    use vector_lib::config::ComponentKey;
 
     use super::*;
     use crate::config::schema::Definition;
diff --git a/src/transforms/log_to_metric.rs b/src/transforms/log_to_metric.rs
index f6ba686e09de2..8bc0ed531a5e1 100644
--- a/src/transforms/log_to_metric.rs
+++ b/src/transforms/log_to_metric.rs
@@ -436,8 +436,8 @@ mod tests {
     use std::time::Duration;
     use tokio::sync::mpsc;
     use tokio_stream::wrappers::ReceiverStream;
-    use vector_common::config::ComponentKey;
     use vector_core::metric_tags;
+    use vector_lib::config::ComponentKey;
 
     #[test]
     fn generate_config() {
diff --git a/src/transforms/metric_to_log.rs b/src/transforms/metric_to_log.rs
index 40fd26fe2b932..a36ee54dea5d3 100644
--- a/src/transforms/metric_to_log.rs
+++ b/src/transforms/metric_to_log.rs
@@ -3,9 +3,9 @@ use codecs::MetricTagValues;
 use lookup::{event_path, owned_value_path, path, PathPrefix};
 use serde_json::Value;
 use std::collections::{BTreeMap, BTreeSet};
-use vector_common::TimeZone;
 use vector_config::configurable_component;
 use vector_core::config::LogNamespace;
+use vector_lib::TimeZone;
 use vrl::path::OwnedValuePath;
 use vrl::value::kind::Collection;
 use vrl::value::Kind;
@@ -353,8 +353,8 @@ mod tests {
     use similar_asserts::assert_eq;
     use tokio::sync::mpsc;
     use tokio_stream::wrappers::ReceiverStream;
-    use vector_common::config::ComponentKey;
     use vector_core::{event::EventMetadata, metric_tags};
+    use vector_lib::config::ComponentKey;
 
     use super::*;
     use crate::event::{
diff --git a/src/transforms/remap.rs b/src/transforms/remap.rs
index dad1e54d95c62..ef5aa18b0c518 100644
--- a/src/transforms/remap.rs
+++ b/src/transforms/remap.rs
@@ -9,11 +9,11 @@ use std::{
 use codecs::MetricTagValues;
 use lookup::{metadata_path, owned_value_path, PathPrefix};
 use snafu::{ResultExt, Snafu};
-use vector_common::TimeZone;
 use vector_config::configurable_component;
 use vector_core::compile_vrl;
 use vector_core::config::LogNamespace;
 use vector_core::schema::Definition;
+use vector_lib::TimeZone;
 use vector_vrl_functions::set_semantic_meaning::MeaningList;
 use vrl::compiler::runtime::{Runtime, Terminate};
 use vrl::compiler::state::ExternalEnv;
diff --git a/src/transforms/tag_cardinality_limit/tests.rs b/src/transforms/tag_cardinality_limit/tests.rs
index 54c8b0bc4ac2f..67018e329e561 100644
--- a/src/transforms/tag_cardinality_limit/tests.rs
+++ b/src/transforms/tag_cardinality_limit/tests.rs
@@ -1,9 +1,9 @@
 use std::sync::Arc;
 
-use vector_common::config::ComponentKey;
 use vector_core::config::OutputId;
 use vector_core::event::EventMetadata;
 use vector_core::metric_tags;
+use vector_lib::config::ComponentKey;
 
 use super::*;
 use crate::config::schema::Definition;
diff --git a/src/types.rs b/src/types.rs
index e8aee6d9b3698..4dff0fa98505c 100644
--- a/src/types.rs
+++ b/src/types.rs
@@ -1,4 +1,4 @@
 #![allow(missing_docs)]
-pub use vector_common::conversion::{
+pub use vector_lib::conversion::{
     parse_check_conversion_map, parse_conversion_map, Conversion, Error,
 };

From 08b45a576bedd302d8dd6e4914f43c873052a998 Mon Sep 17 00:00:00 2001
From: Pavlos Rontidis <pavlos.rontidis@gmail.com>
Date: Wed, 25 Oct 2023 11:38:20 -0400
Subject: [PATCH 10/28] feat(docs): add fallibility examples (#18931)

---
 .../remap/expressions/function_call.cue          | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/website/cue/reference/remap/expressions/function_call.cue b/website/cue/reference/remap/expressions/function_call.cue
index 2226dd23652f9..8d414d4027abb 100644
--- a/website/cue/reference/remap/expressions/function_call.cue
+++ b/website/cue/reference/remap/expressions/function_call.cue
@@ -167,5 +167,21 @@ remap: expressions: function_call: {
 				"""#
 			return: ["hello", "world!"]
 		},
+		{
+			title: "Infallible function invocation"
+			source: #"""
+				split("apples and pears and bananas", " and ")
+				"""#
+			return: ["apples", "pears", "bananas"]
+		},
+		{
+			title: "Fallible function invocation"
+			input: log: message: "apples and pears and bananas"
+			source: #"""
+				# The compiler cannot determine the argument type thus we need to do error handling.
+				split!(.message, " and ")
+				"""#
+			return: ["apples", "pears", "bananas"]
+		},
 	]
 }

From 239cf942c165f067b4b21b43912ff0dac579db50 Mon Sep 17 00:00:00 2001
From: Spencer Gilbert <spencer.gilbert@datadoghq.com>
Date: Wed, 25 Oct 2023 11:57:44 -0400
Subject: [PATCH 11/28] docs: Add announcement for new repository URLs (#18798)

* docs: Add announcement for new repository URLs

* chore: Update check-spelling words

* chore: Update install documentation on package manager pages

* Address PR feedback

* Apply suggestions from code review

Co-authored-by: May Lee <may.lee@datadoghq.com>

* update dates to match new plan

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

* spelling

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

* add redirect

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

---------

Signed-off-by: Jesse Szwedko <jesse.szwedko@datadoghq.com>
Co-authored-by: May Lee <may.lee@datadoghq.com>
Co-authored-by: Jesse Szwedko <jesse.szwedko@datadoghq.com>
---
 .github/actions/spelling/expect.txt           |   5 +
 netlify.toml                                  |   6 +
 .../installation/package-managers/apt.md      |   4 +-
 .../installation/package-managers/dpkg.md     |  14 +-
 .../installation/package-managers/rpm.md      |   4 +-
 .../installation/package-managers/yum.md      |   3 +-
 .../highlights/2023-11-07-new-linux-repos.md  | 130 ++++++++++++++++++
 7 files changed, 155 insertions(+), 11 deletions(-)
 create mode 100644 website/content/en/highlights/2023-11-07-new-linux-repos.md

diff --git a/.github/actions/spelling/expect.txt b/.github/actions/spelling/expect.txt
index a43d538d21a55..7a236c2056167 100644
--- a/.github/actions/spelling/expect.txt
+++ b/.github/actions/spelling/expect.txt
@@ -69,6 +69,7 @@ badunit
 bak
 barfoo
 barieom
+basearch
 baseof
 basevalue
 baskinc
@@ -450,6 +451,8 @@ gogoproto
 goldberg
 goldmark
 GPB
+gpgcheck
+gpgkey
 gqlgen
 graphqlconfig
 grault
@@ -575,6 +578,7 @@ kernelmode
 keybase
 keyclock
 keyid
+keyring
 keyxxxxx
 khvzak
 kib
@@ -635,6 +639,7 @@ lukesteensen
 macports
 MAINPID
 majorly
+makecache
 MAKECMDGOALS
 Makefiles
 markability
diff --git a/netlify.toml b/netlify.toml
index 72d98500c7609..bcf59eb205b40 100644
--- a/netlify.toml
+++ b/netlify.toml
@@ -82,6 +82,12 @@ to = "https://www.datadoghq.com/product/observability-pipelines"
 status = 301
 force = true
 
+[[redirects]]
+from = "https://setup.vector.dev/*"
+to = "https://s3.amazonaws.com/dd-agent/scripts/install_script_vector0.sh"
+status = 302
+force = true
+
 # Removed pages redirects
 [[redirects]]
 from = "/docs/reference/configuration/field-path-notation/"
diff --git a/website/content/en/docs/setup/installation/package-managers/apt.md b/website/content/en/docs/setup/installation/package-managers/apt.md
index c22384f18d00d..396961f906b8a 100644
--- a/website/content/en/docs/setup/installation/package-managers/apt.md
+++ b/website/content/en/docs/setup/installation/package-managers/apt.md
@@ -19,9 +19,7 @@ Our APT repositories are provided by [Cloudsmith] and you can find [instructions
 First, add the Vector repo:
 
 ```shell
-curl -1sLf \
-  'https://repositories.timber.io/public/vector/cfg/setup/bash.deb.sh' \
-| sudo -E bash
+bash -c "$(curl -L https://setup.vector.dev)"
 ```
 
 Then you can install the `vector` package:
diff --git a/website/content/en/docs/setup/installation/package-managers/dpkg.md b/website/content/en/docs/setup/installation/package-managers/dpkg.md
index 7b1bd75ff9868..dfb00509ece14 100644
--- a/website/content/en/docs/setup/installation/package-managers/dpkg.md
+++ b/website/content/en/docs/setup/installation/package-managers/dpkg.md
@@ -12,25 +12,31 @@ weight: 2
 curl \
   --proto '=https' \
   --tlsv1.2 -O \
-  https://packages.timber.io/vector/{{< version >}}/vector_{{< version >}}-1_amd64.deb
+  https://apt.vector.dev/pool/v/ve/vector_{{< version >}}-1_{arch}.deb
 
-sudo dpkg -i vector_{{< version >}}-1_amd64.deb
+sudo dpkg -i vector_{{< version >}}-1_{arch}.deb
 ```
 
+Make sure to replace `{arch}` with one of the following:
+
+* `amd64`
+* `arm64`
+* `armhf`
+
 ## Other actions
 
 {{< tabs default="Upgrade Vector" >}}
 {{< tab title="Upgrade Vector" >}}
 
 ```shell
-dpkg -i vector-{{< version >}}-amd64
+dpkg -i vector-{{< version >}}-{arch}
 ```
 
 {{< /tab >}}
 {{< tab title="Uninstall Vector" >}}
 
 ```shell
-dpkg -r vector-{{< version >}}-amd64
+dpkg -r vector-{{< version >}}-{arch}
 ```
 
 {{< /tab >}}
diff --git a/website/content/en/docs/setup/installation/package-managers/rpm.md b/website/content/en/docs/setup/installation/package-managers/rpm.md
index 80a847afa0fd9..adaa99ccb1c87 100644
--- a/website/content/en/docs/setup/installation/package-managers/rpm.md
+++ b/website/content/en/docs/setup/installation/package-managers/rpm.md
@@ -9,14 +9,14 @@ RPM Package Manager is a free and open source package management system for inst
 ## Installation
 
 ```shell
-sudo rpm -i https://packages.timber.io/vector/{{< version >}}/vector-{{< version >}}-1.{arch}.rpm
+sudo rpm -i https://yum.vector.dev/stable/vector-0/{arch}/vector-{{< version >}}-1.{arch}.rpm
 ```
 
 Make sure to replace `{arch}` with one of the following:
 
 * `x86_64`
 * `aarch64`
-* `armv7`
+* `armv7hl`
 
 ## Other actions
 
diff --git a/website/content/en/docs/setup/installation/package-managers/yum.md b/website/content/en/docs/setup/installation/package-managers/yum.md
index cf8970be354b3..769ada412d23d 100644
--- a/website/content/en/docs/setup/installation/package-managers/yum.md
+++ b/website/content/en/docs/setup/installation/package-managers/yum.md
@@ -13,8 +13,7 @@ Our Yum repositories are provided by [Cloudsmith] and you can find [instructions
 Add the repo:
 
 ```shell
-curl -1sLf 'https://repositories.timber.io/public/vector/cfg/setup/bash.rpm.sh' \
-  | sudo -E bash
+bash -c "$(curl -L https://setup.vector.dev)"
 ```
 
 Then you can install Vector:
diff --git a/website/content/en/highlights/2023-11-07-new-linux-repos.md b/website/content/en/highlights/2023-11-07-new-linux-repos.md
new file mode 100644
index 0000000000000..83ad54738fca4
--- /dev/null
+++ b/website/content/en/highlights/2023-11-07-new-linux-repos.md
@@ -0,0 +1,130 @@
+---
+date: "2023-11-07"
+title: "A New Home for Linux Packages"
+description: ""
+authors: ["spencergilbert"]
+pr_numbers: []
+release: "0.34.0"
+hide_on_release_notes: false
+badges:
+  type: "announcement"
+---
+
+Starting with Vector's `0.34.0` release, the `deb` and `rpm` packages will have
+a new home at `vector.dev` courtesy of Datadog.
+
+We will continue to maintain the existing `timber.io` hosting  until **February
+28th**, but we **will not** publish future minor release versions to them
+starting with the next release, `0.35.0`. Any patch releases for `0.34.0` will
+be published to the existing repositories, as well as the new ones.
+
+{{< warning >}}
+On February 28th, the `timber.io` package repositories will be decommissioned.
+All future minor releases will only be published to the new `vector.dev` package
+repositories and not to the `timber.io` repositories.
+{{< /warning >}}
+
+We aim to make this a seamless transition by providing time for you to switch
+repositories, as well as by publishing previous versions of Vector with the new
+repository as a drop-in replacement, so you don't have to update your Vector
+version at the same time.
+
+If you have any questions or concerns don't hesitate to reach out on [Discord]
+or [Discussions]!
+
+## Migration guide
+
+The following command **removes** the existing repository and configures the
+new repository.
+
+```sh
+CSM_MIGRATE=true bash -c "$(curl -L https://setup.vector.dev)"
+```
+
+Alternatively, `CSM_MIGRATE` may be left unset to leave the removal of the
+existing repository to your discretion.
+
+### Manual step-by-step instructions
+
+<details>
+  <summary>APT</summary>
+1. Remove the existing repository:
+
+```sh
+rm "/etc/apt/sources.list.d/timber-vector.list"
+```
+
+2. Run the following commands to set up APT to download through HTTPS:
+
+```sh
+sudo apt-get update
+sudo apt-get install apt-transport-https curl gnupg
+```
+
+3. Run the following commands to set up the Vector `deb` repo on your system
+and create a Datadog archive keyring:
+
+```sh
+echo "deb [signed-by=/usr/share/keyrings/datadog-archive-keyring.gpg] https://apt.vector.dev/ stable vector-0" | sudo tee "/etc/apt/sources.list.d/vector.list"
+sudo touch /usr/share/keyrings/datadog-archive-keyring.gpg
+sudo chmod a+r /usr/share/keyrings/datadog-archive-keyring.gpg
+curl https://keys.datadoghq.com/DATADOG_APT_KEY_CURRENT.public | sudo gpg --no-default-keyring --keyring /usr/share/keyrings/datadog-archive-keyring.gpg --import --batch
+curl https://keys.datadoghq.com/DATADOG_APT_KEY_F14F620E.public | sudo gpg --no-default-keyring --keyring /usr/share/keyrings/datadog-archive-keyring.gpg --import --batch
+curl https://keys.datadoghq.com/DATADOG_APT_KEY_C0962C7D.public | sudo gpg --no-default-keyring --keyring /usr/share/keyrings/datadog-archive-keyring.gpg --import --batch
+```
+
+4. Run the following commands to update your local `apt` repo and install Vector:
+
+```sh
+sudo apt-get update
+sudo apt-get install vector
+```
+
+</details>
+
+<details>
+  <summary>RPM</summary>
+
+1. Remove the existing repository:
+
+```sh
+rm "/etc/yum.repos.d/timber-vector.repo"
+```
+
+2. Run the following commands to set up the Vector `rpm` repo on your system:
+
+```sh
+cat <<EOF > /etc/yum.repos.d/vector.repo
+[vector]
+name = Vector
+baseurl = https://yum.vector.dev/stable/vector-0/\$basearch/
+enabled=1
+gpgcheck=1
+repo_gpgcheck=1
+gpgkey=https://keys.datadoghq.com/DATADOG_RPM_KEY_CURRENT.public
+       https://keys.datadoghq.com/DATADOG_RPM_KEY_B01082D3.public
+       https://keys.datadoghq.com/DATADOG_RPM_KEY_FD4BF915.public
+EOF
+```
+
+**Note:** If you are running RHEL 8.1 or CentOS 8.1, use `repo_gpgcheck=0` instead of `repo_gpgcheck=1` in the configuration above.
+
+3. Update your packages and install Vector:
+
+```sh
+sudo yum makecache
+sudo yum install vector
+```
+
+</details>
+
+### Notes
+
+* While the existing packages were migrated without rebuilding them, the RPM
+packages _were_ re-signed with a Datadog GPG key. This will cause checksums
+to not match between equivalent packages from `vector.dev` and `timber.io`.
+* Once packages are released only to `vector.dev`, APT packages will be signed
+by a Datadog GPG key. This update will be announced in advance.
+
+[Discord]: https://chat.vector.dev/
+[Discussions]: https://discussions.vector.dev/

From 270fdfd6002f58275610995e232aae241ada4822 Mon Sep 17 00:00:00 2001
From: Bruce Guenter <bruce.guenter@datadoghq.com>
Date: Wed, 25 Oct 2023 13:16:52 -0600
Subject: [PATCH 12/28] chore(dev): Wrap `vector-core` in `vector-lib` (#18934)

* chore(dev): Wrap `vector-core` in `vector-lib`

This is where things get a little more interesting. Both `vector-common` and
`vector-core` export a `config` module, so we need to create a virtual module
pulling in the relevant symbols. I have made those imports explicit so as to
eliminate the ambiguity of which symbol comes from which package.

* Feature flag fixes
---
 Cargo.lock                                    |  2 +-
 Cargo.toml                                    | 11 +++++-----
 lib/vector-lib/Cargo.toml                     |  7 +++++++
 lib/vector-lib/src/lib.rs                     | 21 ++++++++++++++++++-
 src/api/schema/components/mod.rs              |  2 +-
 src/api/schema/metrics/output.rs              |  2 +-
 src/codecs/decoding/config.rs                 |  2 +-
 src/codecs/decoding/decoder.rs                |  2 +-
 src/codecs/encoding/encoder.rs                |  2 +-
 src/codecs/encoding/transformer.rs            |  6 +++---
 src/common/datadog.rs                         |  2 +-
 src/components/validation/resources/event.rs  |  2 +-
 src/components/validation/resources/http.rs   |  2 +-
 src/components/validation/resources/mod.rs    |  2 +-
 src/components/validation/runner/io.rs        |  2 +-
 src/components/validation/runner/mod.rs       |  2 +-
 src/components/validation/runner/telemetry.rs |  2 +-
 .../validators/component_spec/mod.rs          |  4 ++--
 .../validators/component_spec/sources.rs      |  6 +++---
 src/components/validation/validators/mod.rs   |  2 +-
 src/conditions/datadog_search.rs              |  4 ++--
 src/conditions/vrl.rs                         |  4 ++--
 src/config/builder.rs                         |  2 +-
 src/config/compiler.rs                        |  2 +-
 src/config/enrichment_table.rs                |  2 +-
 src/config/enterprise.rs                      |  4 ++--
 src/config/graph.rs                           |  2 +-
 src/config/id.rs                              |  2 +-
 src/config/mod.rs                             |  6 +++---
 src/config/schema.rs                          |  2 +-
 src/config/sink.rs                            |  6 +++---
 src/config/source.rs                          |  4 ++--
 src/config/transform.rs                       |  2 +-
 src/config/unit_test/unit_test_components.rs  |  2 +-
 src/config/validation.rs                      |  2 +-
 src/generate.rs                               |  2 +-
 src/internal_events/aggregate.rs              |  2 +-
 src/internal_events/amqp.rs                   |  4 ++--
 src/internal_events/apache_metrics.rs         |  2 +-
 src/internal_events/api.rs                    |  2 +-
 src/internal_events/aws_cloudwatch_logs.rs    |  2 +-
 src/internal_events/aws_ec2_metadata.rs       |  2 +-
 src/internal_events/aws_ecs_metrics.rs        |  2 +-
 src/internal_events/aws_kinesis.rs            |  2 +-
 src/internal_events/aws_kinesis_firehose.rs   |  2 +-
 src/internal_events/aws_sqs.rs                |  2 +-
 src/internal_events/batch.rs                  |  2 +-
 src/internal_events/codecs.rs                 |  2 +-
 src/internal_events/common.rs                 |  4 ++--
 src/internal_events/conditions.rs             |  2 +-
 src/internal_events/datadog_metrics.rs        |  2 +-
 src/internal_events/datadog_traces.rs         |  2 +-
 src/internal_events/dedupe.rs                 |  2 +-
 src/internal_events/demo_logs.rs              |  2 +-
 src/internal_events/dnstap.rs                 |  2 +-
 src/internal_events/docker_logs.rs            |  2 +-
 src/internal_events/encoding_transcode.rs     |  2 +-
 src/internal_events/eventstoredb_metrics.rs   |  2 +-
 src/internal_events/exec.rs                   |  2 +-
 src/internal_events/file.rs                   |  2 +-
 src/internal_events/file_descriptor.rs        |  2 +-
 src/internal_events/fluent.rs                 |  2 +-
 src/internal_events/gcp_pubsub.rs             |  2 +-
 src/internal_events/grpc.rs                   |  2 +-
 src/internal_events/heartbeat.rs              |  2 +-
 src/internal_events/host_metrics.rs           |  2 +-
 src/internal_events/http.rs                   |  2 +-
 src/internal_events/http_client.rs            |  2 +-
 src/internal_events/http_client_source.rs     |  2 +-
 src/internal_events/influxdb.rs               |  2 +-
 src/internal_events/internal_logs.rs          |  2 +-
 src/internal_events/internal_metrics.rs       |  2 +-
 src/internal_events/journald.rs               |  2 +-
 src/internal_events/kafka.rs                  |  2 +-
 src/internal_events/kubernetes_logs.rs        |  2 +-
 src/internal_events/log_to_metric.rs          |  2 +-
 src/internal_events/logplex.rs                |  2 +-
 src/internal_events/loki.rs                   |  2 +-
 src/internal_events/lua.rs                    |  2 +-
 src/internal_events/metric_to_log.rs          |  2 +-
 src/internal_events/mongodb_metrics.rs        |  2 +-
 src/internal_events/nginx_metrics.rs          |  2 +-
 src/internal_events/open.rs                   |  2 +-
 src/internal_events/parser.rs                 |  2 +-
 src/internal_events/postgresql_metrics.rs     |  2 +-
 src/internal_events/process.rs                |  2 +-
 src/internal_events/prometheus.rs             |  2 +-
 src/internal_events/pulsar.rs                 |  2 +-
 src/internal_events/redis.rs                  |  2 +-
 src/internal_events/reduce.rs                 |  2 +-
 src/internal_events/remap.rs                  |  2 +-
 src/internal_events/sample.rs                 |  2 +-
 src/internal_events/sematext_metrics.rs       |  2 +-
 src/internal_events/socket.rs                 |  2 +-
 src/internal_events/splunk_hec.rs             |  4 ++--
 src/internal_events/statsd_sink.rs            |  2 +-
 src/internal_events/tag_cardinality_limit.rs  |  2 +-
 src/internal_events/tcp.rs                    |  2 +-
 src/internal_events/template.rs               |  2 +-
 src/internal_events/throttle.rs               |  2 +-
 src/internal_events/udp.rs                    |  2 +-
 src/internal_events/unix.rs                   |  2 +-
 src/internal_events/websocket.rs              |  2 +-
 src/internal_events/windows.rs                |  2 +-
 src/lib.rs                                    |  2 +-
 src/serde.rs                                  |  2 +-
 src/sinks/amqp/encoder.rs                     |  2 +-
 src/sinks/amqp/integration_tests.rs           |  2 +-
 src/sinks/appsignal/config.rs                 |  4 ++--
 src/sinks/appsignal/encoder.rs                |  2 +-
 src/sinks/appsignal/integration_tests.rs      |  2 +-
 src/sinks/appsignal/normalizer.rs             |  2 +-
 src/sinks/appsignal/request_builder.rs        |  2 +-
 src/sinks/appsignal/tests.rs                  |  2 +-
 src/sinks/aws_cloudwatch_logs/config.rs       |  2 +-
 .../aws_cloudwatch_logs/request_builder.rs    |  8 +++----
 src/sinks/aws_cloudwatch_logs/sink.rs         |  2 +-
 .../integration_tests.rs                      |  4 ++--
 src/sinks/aws_cloudwatch_metrics/mod.rs       |  2 +-
 src/sinks/aws_cloudwatch_metrics/tests.rs     |  4 ++--
 src/sinks/aws_kinesis/request_builder.rs      |  2 +-
 src/sinks/aws_s3/config.rs                    |  2 +-
 src/sinks/aws_s3/integration_tests.rs         |  2 +-
 src/sinks/aws_s3/sink.rs                      |  2 +-
 src/sinks/aws_s_s/request_builder.rs          |  2 +-
 src/sinks/aws_s_s/service.rs                  |  2 +-
 src/sinks/axiom.rs                            |  2 +-
 src/sinks/azure_blob/integration_tests.rs     |  2 +-
 src/sinks/azure_blob/request_builder.rs       |  2 +-
 src/sinks/azure_blob/test.rs                  |  2 +-
 src/sinks/azure_monitor_logs/config.rs        |  2 +-
 src/sinks/azure_monitor_logs/mod.rs           |  6 +++---
 src/sinks/azure_monitor_logs/tests.rs         |  2 +-
 src/sinks/blackhole/sink.rs                   |  2 +-
 src/sinks/clickhouse/integration_tests.rs     |  2 +-
 src/sinks/clickhouse/mod.rs                   |  6 +++---
 src/sinks/console/sink.rs                     |  4 ++--
 src/sinks/databend/config.rs                  |  2 +-
 src/sinks/databend/integration_tests.rs       |  4 ++--
 src/sinks/databend/request_builder.rs         |  2 +-
 src/sinks/datadog/events/config.rs            |  4 ++--
 src/sinks/datadog/events/request_builder.rs   |  2 +-
 src/sinks/datadog/events/tests.rs             |  2 +-
 src/sinks/datadog/logs/config.rs              |  2 +-
 src/sinks/datadog/logs/integration_tests.rs   |  2 +-
 src/sinks/datadog/logs/mod.rs                 |  6 +++---
 src/sinks/datadog/logs/service.rs             |  2 +-
 src/sinks/datadog/logs/tests.rs               |  2 +-
 src/sinks/datadog/metrics/config.rs           |  2 +-
 src/sinks/datadog/metrics/encoder.rs          |  6 +++---
 .../datadog/metrics/integration_tests.rs      |  2 +-
 src/sinks/datadog/metrics/normalizer.rs       |  4 ++--
 src/sinks/datadog/metrics/request_builder.rs  |  2 +-
 src/sinks/datadog/metrics/service.rs          |  2 +-
 src/sinks/datadog/metrics/sink.rs             |  4 ++--
 src/sinks/datadog/mod.rs                      |  2 +-
 src/sinks/datadog/traces/apm_stats/mod.rs     |  2 +-
 src/sinks/datadog/traces/config.rs            |  2 +-
 src/sinks/datadog/traces/integration_tests.rs |  2 +-
 src/sinks/datadog/traces/mod.rs               |  6 +++---
 src/sinks/datadog/traces/request_builder.rs   |  2 +-
 src/sinks/datadog/traces/service.rs           |  2 +-
 src/sinks/datadog/traces/sink.rs              |  2 +-
 src/sinks/datadog/traces/tests.rs             |  2 +-
 src/sinks/elasticsearch/common.rs             |  4 ++--
 src/sinks/elasticsearch/config.rs             |  2 +-
 src/sinks/elasticsearch/encoder.rs            |  2 +-
 src/sinks/elasticsearch/integration_tests.rs  |  2 +-
 src/sinks/elasticsearch/request_builder.rs    |  2 +-
 src/sinks/elasticsearch/service.rs            |  2 +-
 src/sinks/file/mod.rs                         |  4 ++--
 src/sinks/gcp/chronicle_unstructured.rs       |  6 +++---
 src/sinks/gcp/cloud_storage.rs                |  6 +++---
 src/sinks/gcp/pubsub.rs                       |  2 +-
 src/sinks/gcp/stackdriver/logs/mod.rs         |  6 +++---
 .../stackdriver/metrics/request_builder.rs    |  2 +-
 src/sinks/gcp/stackdriver/metrics/sink.rs     |  2 +-
 src/sinks/gcp/stackdriver/metrics/tests.rs    |  2 +-
 src/sinks/greptimedb/batch.rs                 |  2 +-
 src/sinks/greptimedb/integration_tests.rs     |  4 ++--
 src/sinks/greptimedb/request_builder.rs       | 12 +++++------
 src/sinks/greptimedb/service.rs               |  2 +-
 src/sinks/greptimedb/sink.rs                  |  2 +-
 src/sinks/honeycomb/mod.rs                    |  6 +++---
 src/sinks/http/batch.rs                       |  2 +-
 src/sinks/http/mod.rs                         |  6 +++---
 src/sinks/http/tests.rs                       |  2 +-
 src/sinks/humio/metrics.rs                    |  6 +++---
 src/sinks/influxdb/logs.rs                    | 10 ++++-----
 src/sinks/influxdb/metrics.rs                 | 18 ++++++++--------
 src/sinks/influxdb/mod.rs                     |  4 ++--
 src/sinks/kafka/tests.rs                      |  2 +-
 src/sinks/loki/event.rs                       |  2 +-
 src/sinks/loki/integration_tests.rs           |  4 ++--
 src/sinks/loki/sink.rs                        |  2 +-
 src/sinks/loki/tests.rs                       |  2 +-
 src/sinks/mezmo.rs                            |  2 +-
 src/sinks/mod.rs                              |  2 +-
 src/sinks/nats/config.rs                      |  2 +-
 src/sinks/nats/request_builder.rs             |  2 +-
 src/sinks/new_relic/encoding.rs               |  2 +-
 src/sinks/new_relic/tests.rs                  |  2 +-
 src/sinks/papertrail.rs                       |  2 +-
 src/sinks/prelude.rs                          |  2 +-
 src/sinks/prometheus/collector.rs             | 10 ++++-----
 src/sinks/prometheus/exporter.rs              |  4 ++--
 src/sinks/prometheus/mod.rs                   |  2 +-
 src/sinks/prometheus/remote_write/mod.rs      |  2 +-
 .../remote_write/request_builder.rs           |  2 +-
 src/sinks/prometheus/remote_write/sink.rs     |  2 +-
 src/sinks/prometheus/remote_write/tests.rs    |  2 +-
 src/sinks/pulsar/config.rs                    |  2 +-
 src/sinks/pulsar/encoder.rs                   |  2 +-
 src/sinks/pulsar/util.rs                      |  2 +-
 src/sinks/redis/integration_tests.rs          |  2 +-
 src/sinks/redis/request_builder.rs            |  2 +-
 src/sinks/redis/tests.rs                      |  2 +-
 src/sinks/s3_common/partitioner.rs            |  2 +-
 src/sinks/s3_common/service.rs                |  2 +-
 src/sinks/sematext/metrics.rs                 |  4 ++--
 .../splunk_hec/common/acknowledgements.rs     |  4 ++--
 src/sinks/splunk_hec/common/request.rs        |  4 ++--
 src/sinks/splunk_hec/common/response.rs       |  2 +-
 src/sinks/splunk_hec/common/service.rs        |  6 +++---
 src/sinks/splunk_hec/common/util.rs           |  6 +++---
 src/sinks/splunk_hec/logs/config.rs           |  2 +-
 src/sinks/splunk_hec/logs/encoder.rs          |  2 +-
 .../splunk_hec/logs/integration_tests.rs      |  2 +-
 src/sinks/splunk_hec/logs/request_builder.rs  |  2 +-
 src/sinks/splunk_hec/logs/tests.rs            |  2 +-
 src/sinks/splunk_hec/metrics/config.rs        |  2 +-
 src/sinks/splunk_hec/metrics/encoder.rs       |  2 +-
 .../splunk_hec/metrics/integration_tests.rs   |  2 +-
 .../splunk_hec/metrics/request_builder.rs     |  2 +-
 src/sinks/splunk_hec/metrics/sink.rs          |  2 +-
 src/sinks/splunk_hec/metrics/tests.rs         |  2 +-
 src/sinks/statsd/batch.rs                     |  2 +-
 src/sinks/statsd/config.rs                    |  4 ++--
 src/sinks/statsd/encoder.rs                   | 16 +++++++-------
 src/sinks/statsd/normalizer.rs                |  4 ++--
 src/sinks/statsd/request_builder.rs           |  4 ++--
 src/sinks/statsd/sink.rs                      |  2 +-
 src/sinks/statsd/tests.rs                     |  4 ++--
 src/sinks/util/buffer/metrics/mod.rs          | 16 +++++++-------
 src/sinks/util/buffer/metrics/normalize.rs    |  3 ++-
 src/sinks/util/buffer/metrics/split.rs        |  4 ++--
 src/sinks/util/buffer/partition.rs            |  2 +-
 src/sinks/util/builder.rs                     |  2 +-
 src/sinks/util/encoding.rs                    |  4 ++--
 src/sinks/util/http.rs                        |  2 +-
 src/sinks/util/metadata.rs                    |  2 +-
 src/sinks/util/normalizer.rs                  |  2 +-
 src/sinks/util/partitioner.rs                 |  2 +-
 src/sinks/util/processed_event.rs             |  2 +-
 src/sinks/util/service/net/mod.rs             |  2 +-
 src/sinks/util/service/net/tcp.rs             |  2 +-
 src/sinks/util/sink.rs                        |  2 +-
 src/sinks/util/tcp.rs                         |  2 +-
 src/sinks/util/udp.rs                         |  2 +-
 src/sinks/util/unix.rs                        |  2 +-
 src/sinks/vector/mod.rs                       |  2 +-
 src/sinks/vector/sink.rs                      |  2 +-
 src/sinks/webhdfs/config.rs                   |  2 +-
 src/sinks/webhdfs/integration_tests.rs        |  2 +-
 src/sinks/webhdfs/test.rs                     |  2 +-
 src/sinks/websocket/sink.rs                   |  2 +-
 src/source_sender/mod.rs                      |  8 +++----
 src/sources/amqp.rs                           |  8 +++----
 src/sources/apache_metrics/mod.rs             |  4 ++--
 src/sources/apache_metrics/parser.rs          |  2 +-
 src/sources/aws_ecs_metrics/mod.rs            |  2 +-
 src/sources/aws_ecs_metrics/parser.rs         |  2 +-
 src/sources/aws_kinesis_firehose/filters.rs   |  2 +-
 src/sources/aws_kinesis_firehose/handlers.rs  |  2 +-
 src/sources/aws_kinesis_firehose/mod.rs       |  2 +-
 src/sources/aws_s3/mod.rs                     |  2 +-
 src/sources/aws_s3/sqs.rs                     |  4 ++--
 src/sources/aws_sqs/config.rs                 |  2 +-
 src/sources/aws_sqs/source.rs                 |  2 +-
 src/sources/datadog_agent/logs.rs             |  2 +-
 src/sources/datadog_agent/metrics.rs          |  4 ++--
 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                      |  8 +++----
 src/sources/dnstap/mod.rs                     | 13 +++++-------
 src/sources/dnstap/parser.rs                  |  2 +-
 src/sources/dnstap/schema.rs                  | 12 +++++------
 src/sources/docker_logs/mod.rs                |  2 +-
 src/sources/eventstoredb_metrics/mod.rs       |  4 ++--
 src/sources/exec/mod.rs                       |  4 ++--
 src/sources/exec/tests.rs                     |  2 +-
 src/sources/file.rs                           |  6 +++---
 .../file_descriptors/file_descriptor.rs       |  2 +-
 src/sources/file_descriptors/mod.rs           | 10 ++++-----
 src/sources/file_descriptors/stdin.rs         |  2 +-
 src/sources/fluent/message.rs                 |  4 ++--
 src/sources/fluent/mod.rs                     |  8 +++----
 src/sources/gcp_pubsub.rs                     |  6 +++---
 src/sources/heroku_logs.rs                    |  4 ++--
 src/sources/host_metrics/cgroups.rs           |  4 ++--
 src/sources/host_metrics/cpu.rs               |  2 +-
 src/sources/host_metrics/disk.rs              |  2 +-
 src/sources/host_metrics/filesystem.rs        |  2 +-
 src/sources/host_metrics/memory.rs            |  2 +-
 src/sources/host_metrics/mod.rs               |  4 ++--
 src/sources/host_metrics/network.rs           |  2 +-
 src/sources/http_client/client.rs             |  2 +-
 src/sources/http_client/integration_tests.rs  |  2 +-
 src/sources/http_client/tests.rs              |  2 +-
 src/sources/http_server.rs                    |  8 +++----
 src/sources/internal_logs.rs                  |  6 +++---
 src/sources/internal_metrics.rs               |  4 ++--
 src/sources/journald.rs                       |  2 +-
 src/sources/kafka.rs                          |  8 +++----
 src/sources/kubernetes_logs/mod.rs            |  4 ++--
 .../namespace_metadata_annotator.rs           |  2 +-
 .../node_metadata_annotator.rs                |  2 +-
 src/sources/kubernetes_logs/parser/cri.rs     |  2 +-
 src/sources/kubernetes_logs/parser/docker.rs  |  2 +-
 src/sources/kubernetes_logs/parser/mod.rs     |  2 +-
 .../kubernetes_logs/parser/test_util.rs       |  2 +-
 .../kubernetes_logs/partial_events_merger.rs  |  4 ++--
 .../kubernetes_logs/pod_metadata_annotator.rs |  2 +-
 .../kubernetes_logs/transform_utils/mod.rs    |  2 +-
 src/sources/logstash.rs                       |  2 +-
 src/sources/mod.rs                            |  2 +-
 src/sources/mongodb_metrics/mod.rs            |  4 ++--
 src/sources/nats.rs                           | 12 +++++------
 src/sources/nginx_metrics/mod.rs              |  4 ++--
 src/sources/opentelemetry/grpc.rs             |  4 ++--
 src/sources/opentelemetry/http.rs             |  8 +++----
 src/sources/opentelemetry/mod.rs              |  4 ++--
 src/sources/opentelemetry/tests.rs            |  2 +-
 src/sources/postgresql_metrics.rs             |  4 ++--
 src/sources/prometheus/parser.rs              | 18 ++++++++--------
 src/sources/prometheus/remote_write.rs        |  8 +++----
 src/sources/prometheus/scrape.rs              |  4 ++--
 src/sources/redis/mod.rs                      |  8 +++----
 src/sources/socket/mod.rs                     |  4 ++--
 src/sources/socket/tcp.rs                     |  2 +-
 src/sources/socket/udp.rs                     |  4 ++--
 src/sources/socket/unix.rs                    |  2 +-
 src/sources/splunk_hec/acknowledgements.rs    |  2 +-
 src/sources/splunk_hec/mod.rs                 | 12 +++++------
 src/sources/statsd/mod.rs                     |  6 +++---
 src/sources/statsd/parser.rs                  | 10 ++++-----
 src/sources/syslog.rs                         |  4 ++--
 src/sources/util/framestream.rs               |  2 +-
 src/sources/util/http/prelude.rs              |  4 ++--
 src/sources/util/http/query.rs                |  2 +-
 src/sources/util/http_client.rs               |  2 +-
 src/sources/util/message_decoding.rs          |  2 +-
 src/sources/util/mod.rs                       |  4 ++--
 src/sources/util/net/tcp/mod.rs               |  4 ++--
 src/sources/util/unix_datagram.rs             |  2 +-
 src/sources/util/unix_stream.rs               |  2 +-
 src/sources/vector/mod.rs                     |  8 +++----
 src/template.rs                               |  2 +-
 src/test_util/components.rs                   |  2 +-
 src/test_util/metrics.rs                      | 12 +++++------
 src/test_util/mock/mod.rs                     |  2 +-
 src/test_util/mock/sinks/basic.rs             |  4 ++--
 src/test_util/mock/sinks/error.rs             |  2 +-
 src/test_util/mock/sinks/oneshot.rs           |  2 +-
 src/test_util/mock/sinks/panic.rs             |  2 +-
 src/test_util/mock/sources/backpressure.rs    |  4 ++--
 src/test_util/mock/sources/basic.rs           |  4 ++--
 src/test_util/mock/sources/error.rs           |  6 +++---
 src/test_util/mock/sources/panic.rs           |  6 +++---
 src/test_util/mock/sources/tripwire.rs        |  6 +++---
 src/test_util/mock/transforms/basic.rs        |  4 ++--
 .../mock/transforms/error_definitions.rs      |  2 +-
 src/test_util/mock/transforms/noop.rs         |  4 ++--
 src/test_util/mod.rs                          |  4 ++--
 src/test_util/stats.rs                        |  2 +-
 src/top/state.rs                              |  2 +-
 src/topology/builder.rs                       | 12 +++++------
 src/topology/mod.rs                           |  2 +-
 src/topology/schema.rs                        |  4 ++--
 src/topology/task.rs                          |  2 +-
 src/topology/test/backpressure.rs             |  2 +-
 src/topology/test/compliance.rs               |  4 ++--
 src/topology/test/mod.rs                      |  2 +-
 src/topology/test/reload.rs                   |  2 +-
 src/transforms/aggregate.rs                   |  2 +-
 src/transforms/aws_ec2_metadata.rs            |  2 +-
 src/transforms/dedupe.rs                      |  4 ++--
 src/transforms/filter.rs                      |  4 ++--
 src/transforms/log_to_metric.rs               | 12 +++++------
 src/transforms/lua/mod.rs                     |  2 +-
 src/transforms/lua/v2/mod.rs                  |  4 ++--
 src/transforms/metric_to_log.rs               | 10 ++++-----
 src/transforms/mod.rs                         |  4 ++--
 src/transforms/reduce/mod.rs                  |  2 +-
 src/transforms/remap.rs                       |  8 +++----
 src/transforms/route.rs                       | 12 ++++-------
 src/transforms/sample.rs                      |  2 +-
 .../tag_cardinality_limit/config.rs           |  2 +-
 src/transforms/tag_cardinality_limit/tests.rs |  6 +++---
 src/transforms/throttle.rs                    |  2 +-
 401 files changed, 677 insertions(+), 658 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 6ab6f9f1eb7ba..2fa9f4baaf2f8 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -9869,7 +9869,6 @@ dependencies = [
  "vector-config",
  "vector-config-common",
  "vector-config-macros",
- "vector-core",
  "vector-lib",
  "vector-lookup",
  "vector-stream",
@@ -10119,6 +10118,7 @@ name = "vector-lib"
 version = "0.1.0"
 dependencies = [
  "vector-common",
+ "vector-core",
 ]
 
 [[package]]
diff --git a/Cargo.toml b/Cargo.toml
index 286900ecaf0ea..7dddc4e4b4ba6 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -144,8 +144,7 @@ vector-buffers = { path = "lib/vector-buffers", default-features = false }
 vector-config = { path = "lib/vector-config" }
 vector-config-common = { path = "lib/vector-config-common" }
 vector-config-macros = { path = "lib/vector-config-macros" }
-vector-core = { path = "lib/vector-core", default-features = false, features = ["vrl"] }
-vector-lib = { path = "lib/vector-lib", default-features = false }
+vector-lib = { path = "lib/vector-lib", default-features = false, features = ["vrl"] }
 vector-stream = { path = "lib/vector-stream" }
 vector-vrl-functions = { path = "lib/vector-vrl/functions" }
 loki-logproto = { path = "lib/loki-logproto", optional = true }
@@ -377,7 +376,7 @@ test-generator = "0.3.1"
 tokio = { version = "1.33.0", features = ["test-util"] }
 tokio-test = "0.4.3"
 tower-test = "0.4.0"
-vector-core = { path = "lib/vector-core", default-features = false, features = ["vrl", "test"] }
+vector-lib = { path = "lib/vector-lib", default-features = false, features = ["vrl", "test"] }
 vrl = { version = "0.7.0", features = ["cli", "test", "test_framework", "arbitrary"] }
 
 wiremock = "0.5.19"
@@ -438,7 +437,7 @@ api = [
   "dep:async-graphql",
   "dep:async-graphql-warp",
   "dep:base64",
-  "vector-core/api",
+  "vector-lib/api",
 ]
 
 # API client
@@ -447,7 +446,7 @@ api-client = [
   "dep:num-format",
   "dep:number_prefix",
   "dep:ratatui",
-  "vector-core/api",
+  "vector-lib/api",
   "dep:vector-api-client",
 ]
 
@@ -608,7 +607,7 @@ transforms-aws_ec2_metadata = ["dep:arc-swap"]
 transforms-dedupe = ["dep:lru"]
 transforms-filter = []
 transforms-log_to_metric = []
-transforms-lua = ["dep:mlua", "vector-core/lua"]
+transforms-lua = ["dep:mlua", "vector-lib/lua"]
 transforms-metric_to_log = []
 transforms-pipelines = ["transforms-filter", "transforms-route"]
 transforms-reduce = []
diff --git a/lib/vector-lib/Cargo.toml b/lib/vector-lib/Cargo.toml
index 51e6cdc6e7f80..a66408303abb5 100644
--- a/lib/vector-lib/Cargo.toml
+++ b/lib/vector-lib/Cargo.toml
@@ -7,3 +7,10 @@ publish = false
 
 [dependencies]
 vector-common = { path = "../vector-common", default-features = false }
+vector-core = { path = "../vector-core", default-features = false }
+
+[features]
+api = ["vector-core/api"]
+lua = ["vector-core/lua"]
+test = ["vector-core/test"]
+vrl = ["vector-core/vrl"]
diff --git a/lib/vector-lib/src/lib.rs b/lib/vector-lib/src/lib.rs
index f089e7d004aaf..166bdac69c17a 100644
--- a/lib/vector-lib/src/lib.rs
+++ b/lib/vector-lib/src/lib.rs
@@ -1,6 +1,25 @@
 pub use vector_common::{
-    assert_event_data_eq, btreemap, byte_size_of, byte_size_of::ByteSizeOf, config, conversion,
+    assert_event_data_eq, btreemap, byte_size_of, byte_size_of::ByteSizeOf, conversion,
     encode_logfmt, finalization, finalizer, impl_event_data_eq, internal_event, json_size,
     registered_event, request_metadata, sensitive_string, shutdown, trigger, Error, Result,
     TimeZone,
 };
+#[cfg(feature = "vrl")]
+pub use vector_core::compile_vrl;
+#[cfg(feature = "test")]
+pub use vector_core::event_test_util;
+pub use vector_core::{
+    buckets, buffers, default_data_dir, event, fanout, metric_tags, metrics, partition, quantiles,
+    samples, schema, serde, sink, source, tcp, tls, transform, update_counter,
+    EstimatedJsonEncodedSizeOf,
+};
+
+pub mod config {
+    pub use vector_common::config::ComponentKey;
+    pub use vector_core::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,
+    };
+}
diff --git a/src/api/schema/components/mod.rs b/src/api/schema/components/mod.rs
index 1b5e4cf82a201..a8cb08731c19d 100644
--- a/src/api/schema/components/mod.rs
+++ b/src/api/schema/components/mod.rs
@@ -11,7 +11,7 @@ use std::{
 use async_graphql::{Enum, InputObject, Interface, Object, Subscription};
 use once_cell::sync::Lazy;
 use tokio_stream::{wrappers::BroadcastStream, Stream, StreamExt};
-use vector_core::internal_event::DEFAULT_OUTPUT;
+use vector_lib::internal_event::DEFAULT_OUTPUT;
 
 use crate::{
     api::schema::{
diff --git a/src/api/schema/metrics/output.rs b/src/api/schema/metrics/output.rs
index c1282c689c479..1bf67791dc7c1 100644
--- a/src/api/schema/metrics/output.rs
+++ b/src/api/schema/metrics/output.rs
@@ -1,5 +1,5 @@
 use async_graphql::Object;
-use vector_core::config::ComponentKey;
+use vector_lib::config::ComponentKey;
 
 use super::{by_component_key, sum_metrics, SentEventsTotal};
 use crate::event::Metric;
diff --git a/src/codecs/decoding/config.rs b/src/codecs/decoding/config.rs
index 00e0c7e67d73b..80a78cb7594ed 100644
--- a/src/codecs/decoding/config.rs
+++ b/src/codecs/decoding/config.rs
@@ -1,6 +1,6 @@
 use codecs::decoding::{DeserializerConfig, FramingConfig};
 use serde::{Deserialize, Serialize};
-use vector_core::config::LogNamespace;
+use vector_lib::config::LogNamespace;
 
 use crate::codecs::Decoder;
 
diff --git a/src/codecs/decoding/decoder.rs b/src/codecs/decoding/decoder.rs
index cf4749ca64d58..6229961a4f4f1 100644
--- a/src/codecs/decoding/decoder.rs
+++ b/src/codecs/decoding/decoder.rs
@@ -4,7 +4,7 @@ use codecs::decoding::{
     NewlineDelimitedDecoder,
 };
 use smallvec::SmallVec;
-use vector_core::config::LogNamespace;
+use vector_lib::config::LogNamespace;
 
 use crate::{
     event::Event,
diff --git a/src/codecs/encoding/encoder.rs b/src/codecs/encoding/encoder.rs
index f7bfe086e2085..1ee47131ebcd7 100644
--- a/src/codecs/encoding/encoder.rs
+++ b/src/codecs/encoding/encoder.rs
@@ -187,7 +187,7 @@ mod tests {
     use codecs::encoding::BoxedFramingError;
     use futures_util::{SinkExt, StreamExt};
     use tokio_util::codec::FramedWrite;
-    use vector_core::event::LogEvent;
+    use vector_lib::event::LogEvent;
 
     use super::*;
 
diff --git a/src/codecs/encoding/transformer.rs b/src/codecs/encoding/transformer.rs
index 6b2690b6c5cc1..d919a8872a39b 100644
--- a/src/codecs/encoding/transformer.rs
+++ b/src/codecs/encoding/transformer.rs
@@ -9,8 +9,8 @@ use lookup::{event_path, PathPrefix};
 use ordered_float::NotNan;
 use serde::{Deserialize, Deserializer};
 use vector_config::configurable_component;
-use vector_core::event::{LogEvent, MaybeAsLogMut};
-use vector_core::schema::meaning;
+use vector_lib::event::{LogEvent, MaybeAsLogMut};
+use vector_lib::schema::meaning;
 use vrl::path::OwnedValuePath;
 use vrl::value::Value;
 
@@ -267,8 +267,8 @@ pub enum TimestampFormat {
 mod tests {
     use indoc::indoc;
     use lookup::path::parse_target_path;
-    use vector_core::config::{log_schema, LogNamespace};
     use vector_lib::btreemap;
+    use vector_lib::config::{log_schema, LogNamespace};
     use vrl::value::Kind;
 
     use crate::config::schema;
diff --git a/src/common/datadog.rs b/src/common/datadog.rs
index 306ff41f837b6..2bdd3ee200c30 100644
--- a/src/common/datadog.rs
+++ b/src/common/datadog.rs
@@ -4,7 +4,7 @@
 #![allow(unreachable_pub)]
 use serde::{Deserialize, Serialize};
 use vector_config::configurable_component;
-use vector_core::event::DatadogMetricOriginMetadata;
+use vector_lib::event::DatadogMetricOriginMetadata;
 
 pub const DD_US_SITE: &str = "datadoghq.com";
 pub const DD_EU_SITE: &str = "datadoghq.eu";
diff --git a/src/components/validation/resources/event.rs b/src/components/validation/resources/event.rs
index 1f91acfbe660d..c36a13cf7dfe6 100644
--- a/src/components/validation/resources/event.rs
+++ b/src/components/validation/resources/event.rs
@@ -8,7 +8,7 @@ use codecs::{
     encoding, JsonSerializer, LengthDelimitedEncoder, LogfmtSerializer, MetricTagValues,
     NewlineDelimitedEncoder,
 };
-use vector_core::event::{Event, LogEvent};
+use vector_lib::event::{Event, LogEvent};
 
 /// A test case event for deserialization from yaml file.
 /// This is an intermediary step to TestEvent.
diff --git a/src/components/validation/resources/http.rs b/src/components/validation/resources/http.rs
index 5e9be4edb2a2c..052dabec52cf8 100644
--- a/src/components/validation/resources/http.rs
+++ b/src/components/validation/resources/http.rs
@@ -21,7 +21,7 @@ use tokio::{
 use tokio_util::codec::Decoder;
 
 use crate::components::validation::sync::{Configuring, TaskCoordinator};
-use vector_core::event::Event;
+use vector_lib::event::Event;
 
 use super::{encode_test_event, ResourceCodec, ResourceDirection, TestEvent};
 
diff --git a/src/components/validation/resources/mod.rs b/src/components/validation/resources/mod.rs
index 5d48427f70b45..0f6b77abbcb55 100644
--- a/src/components/validation/resources/mod.rs
+++ b/src/components/validation/resources/mod.rs
@@ -9,7 +9,7 @@ use codecs::{
     BytesEncoder,
 };
 use tokio::sync::mpsc;
-use vector_core::{config::DataType, event::Event};
+use vector_lib::{config::DataType, event::Event};
 
 use crate::codecs::{Decoder, DecodingConfig, Encoder, EncodingConfig, EncodingConfigWithFraming};
 
diff --git a/src/components/validation/runner/io.rs b/src/components/validation/runner/io.rs
index b554140e04788..9e4e51e85651d 100644
--- a/src/components/validation/runner/io.rs
+++ b/src/components/validation/runner/io.rs
@@ -9,8 +9,8 @@ use tonic::{
     Status,
 };
 use tower::Service;
-use vector_core::{event::Event, tls::MaybeTlsSettings};
 use vector_lib::shutdown::ShutdownSignal;
+use vector_lib::{event::Event, tls::MaybeTlsSettings};
 
 use crate::{
     components::validation::{
diff --git a/src/components/validation/runner/mod.rs b/src/components/validation/runner/mod.rs
index 527eca3d8d9c9..0ad661c4d101f 100644
--- a/src/components/validation/runner/mod.rs
+++ b/src/components/validation/runner/mod.rs
@@ -19,7 +19,7 @@ use tokio::{
 use tokio_util::codec::Encoder as _;
 
 use codecs::encoding;
-use vector_core::{event::Event, EstimatedJsonEncodedSizeOf};
+use vector_lib::{event::Event, EstimatedJsonEncodedSizeOf};
 
 use crate::{
     codecs::Encoder,
diff --git a/src/components/validation/runner/telemetry.rs b/src/components/validation/runner/telemetry.rs
index 76e8c29f62a9f..d5bb8f5b438d3 100644
--- a/src/components/validation/runner/telemetry.rs
+++ b/src/components/validation/runner/telemetry.rs
@@ -1,7 +1,7 @@
 use std::time::Duration;
 
 use tokio::{select, sync::mpsc, task::JoinHandle};
-use vector_core::event::Event;
+use vector_lib::event::Event;
 
 use crate::{
     components::validation::{
diff --git a/src/components/validation/validators/component_spec/mod.rs b/src/components/validation/validators/component_spec/mod.rs
index f6758a44fe7cf..cfd1f8a5a88f5 100644
--- a/src/components/validation/validators/component_spec/mod.rs
+++ b/src/components/validation/validators/component_spec/mod.rs
@@ -1,6 +1,6 @@
 mod sources;
 
-use vector_core::event::{Event, Metric};
+use vector_lib::event::{Event, Metric};
 
 use crate::components::validation::{ComponentType, RunnerMetrics, TestCaseExpectation, TestEvent};
 
@@ -124,7 +124,7 @@ fn filter_events_by_metric_and_component<'a>(
     let metrics: Vec<&Metric> = telemetry_events
         .iter()
         .flat_map(|e| {
-            if let vector_core::event::Event::Metric(m) = e {
+            if let vector_lib::event::Event::Metric(m) = e {
                 Some(m)
             } else {
                 None
diff --git a/src/components/validation/validators/component_spec/sources.rs b/src/components/validation/validators/component_spec/sources.rs
index 6002b0b4878e9..e4c6d3383f688 100644
--- a/src/components/validation/validators/component_spec/sources.rs
+++ b/src/components/validation/validators/component_spec/sources.rs
@@ -1,6 +1,6 @@
 use std::fmt::{Display, Formatter};
 
-use vector_core::event::{Event, MetricKind};
+use vector_lib::event::{Event, MetricKind};
 
 use crate::components::validation::RunnerMetrics;
 
@@ -68,14 +68,14 @@ pub fn validate_sources(
 
 fn sum_counters(
     metric_name: &SourceMetricType,
-    metrics: &[&vector_core::event::Metric],
+    metrics: &[&vector_lib::event::Metric],
 ) -> Result<u64, Vec<String>> {
     let mut sum: f64 = 0.0;
     let mut errs = Vec::new();
 
     for m in metrics {
         match m.value() {
-            vector_core::event::MetricValue::Counter { value } => {
+            vector_lib::event::MetricValue::Counter { value } => {
                 if let MetricKind::Absolute = m.data().kind {
                     sum = *value;
                 } else {
diff --git a/src/components/validation/validators/mod.rs b/src/components/validation/validators/mod.rs
index e563488d7f416..b89441d8adc9a 100644
--- a/src/components/validation/validators/mod.rs
+++ b/src/components/validation/validators/mod.rs
@@ -2,7 +2,7 @@ mod component_spec;
 
 pub use self::component_spec::ComponentSpecValidator;
 
-use vector_core::event::Event;
+use vector_lib::event::Event;
 
 use super::{ComponentType, RunnerMetrics, TestCaseExpectation, TestEvent};
 
diff --git a/src/conditions/datadog_search.rs b/src/conditions/datadog_search.rs
index 90e9641567038..1f11edc86e2e9 100644
--- a/src/conditions/datadog_search.rs
+++ b/src/conditions/datadog_search.rs
@@ -2,7 +2,7 @@ use std::borrow::Cow;
 
 use bytes::Bytes;
 use vector_config::configurable_component;
-use vector_core::event::{Event, LogEvent, Value};
+use vector_lib::event::{Event, LogEvent, Value};
 use vrl::datadog_filter::{
     build_matcher,
     regex::{wildcard_regex, word_regex},
@@ -325,7 +325,7 @@ where
 #[cfg(test)]
 mod test {
     use serde_json::json;
-    use vector_core::event::Event;
+    use vector_lib::event::Event;
     use vrl::datadog_filter::{build_matcher, Filter, Resolver};
     use vrl::datadog_search_syntax::parse;
 
diff --git a/src/conditions/vrl.rs b/src/conditions/vrl.rs
index 3a14089f82c83..7cd39712ceb2a 100644
--- a/src/conditions/vrl.rs
+++ b/src/conditions/vrl.rs
@@ -1,5 +1,5 @@
 use vector_config::configurable_component;
-use vector_core::compile_vrl;
+use vector_lib::compile_vrl;
 use vector_lib::TimeZone;
 use vrl::compiler::runtime::{Runtime, RuntimeResult, Terminate};
 use vrl::compiler::{CompilationResult, CompileConfig, Program, TypeState, VrlRuntime};
@@ -170,7 +170,7 @@ impl Conditional for Vrl {
 
 #[cfg(test)]
 mod test {
-    use vector_core::metric_tags;
+    use vector_lib::metric_tags;
 
     use super::*;
     use crate::{
diff --git a/src/config/builder.rs b/src/config/builder.rs
index 3645ef3755987..e7968fd587e37 100644
--- a/src/config/builder.rs
+++ b/src/config/builder.rs
@@ -6,7 +6,7 @@ use indexmap::IndexMap;
 #[cfg(feature = "enterprise")]
 use serde_json::Value;
 use vector_config::configurable_component;
-use vector_core::config::GlobalOptions;
+use vector_lib::config::GlobalOptions;
 
 use crate::{enrichment_tables::EnrichmentTables, providers::Providers, secrets::SecretBackends};
 
diff --git a/src/config/compiler.rs b/src/config/compiler.rs
index 32465a479ab44..cff03862375b9 100644
--- a/src/config/compiler.rs
+++ b/src/config/compiler.rs
@@ -198,7 +198,7 @@ fn expand_globs_inner(inputs: &mut Inputs<String>, id: &str, candidates: &IndexS
 mod test {
     use super::*;
     use crate::test_util::mock::{basic_sink, basic_source, basic_transform};
-    use vector_core::config::ComponentKey;
+    use vector_lib::config::ComponentKey;
 
     #[test]
     fn glob_expansion() {
diff --git a/src/config/enrichment_table.rs b/src/config/enrichment_table.rs
index 60e68d92d7bd1..6d4f9d06ffdc6 100644
--- a/src/config/enrichment_table.rs
+++ b/src/config/enrichment_table.rs
@@ -1,7 +1,7 @@
 use async_trait::async_trait;
 use enum_dispatch::enum_dispatch;
 use vector_config::{configurable_component, NamedComponent};
-use vector_core::config::GlobalOptions;
+use vector_lib::config::GlobalOptions;
 
 use crate::enrichment_tables::EnrichmentTables;
 
diff --git a/src/config/enterprise.rs b/src/config/enterprise.rs
index bce787aa7d183..e5af10ee9009a 100644
--- a/src/config/enterprise.rs
+++ b/src/config/enterprise.rs
@@ -14,7 +14,7 @@ use tokio::{
     time::{sleep, Duration},
 };
 use url::{ParseError, Url};
-use vector_core::config::proxy::ProxyConfig;
+use vector_lib::config::proxy::ProxyConfig;
 
 use super::{
     load_source_from_paths, process_paths, ComponentKey, Config, ConfigPath, OutputId, SinkOuter,
@@ -832,7 +832,7 @@ mod test {
     use http::StatusCode;
     use indexmap::IndexMap;
     use tokio::time::sleep;
-    use vector_core::config::proxy::ProxyConfig;
+    use vector_lib::config::proxy::ProxyConfig;
     use vrl::btreemap;
     use vrl::compiler::state::ExternalEnv;
     use vrl::compiler::{compile, compile_with_external, CompileConfig};
diff --git a/src/config/graph.rs b/src/config/graph.rs
index 6f4cdb81d4451..bf54d31604870 100644
--- a/src/config/graph.rs
+++ b/src/config/graph.rs
@@ -367,7 +367,7 @@ impl Graph {
 #[cfg(test)]
 mod test {
     use similar_asserts::assert_eq;
-    use vector_core::schema::Definition;
+    use vector_lib::schema::Definition;
 
     use super::*;
 
diff --git a/src/config/id.rs b/src/config/id.rs
index 8355fd22f1033..253ec0c35cb44 100644
--- a/src/config/id.rs
+++ b/src/config/id.rs
@@ -1,7 +1,7 @@
 use std::ops::Deref;
 
 use vector_config::configurable_component;
-pub use vector_core::config::ComponentKey;
+pub use vector_lib::config::ComponentKey;
 
 /// A list of upstream [source][sources] or [transform][transforms] IDs.
 ///
diff --git a/src/config/mod.rs b/src/config/mod.rs
index 894531126485b..7999f13e24d72 100644
--- a/src/config/mod.rs
+++ b/src/config/mod.rs
@@ -12,7 +12,7 @@ use indexmap::IndexMap;
 use serde::Serialize;
 pub use vector_config::component::{GenerateConfig, SinkDescription, TransformDescription};
 use vector_config::configurable_component;
-pub use vector_core::config::{
+pub use vector_lib::config::{
     AcknowledgementsConfig, DataType, GlobalOptions, Input, LogNamespace,
     SourceAcknowledgementsConfig, SourceOutput, TransformOutput,
 };
@@ -63,7 +63,7 @@ pub use transform::{
 pub use unit_test::{build_unit_tests, build_unit_tests_main, UnitTestResult};
 pub use validation::warnings;
 pub use vars::{interpolate, ENVIRONMENT_VARIABLE_INTERPOLATION_REGEX};
-pub use vector_core::config::{
+pub use vector_lib::config::{
     init_telemetry, log_schema, proxy::ProxyConfig, telemetry, LogSchema, OutputId,
 };
 
@@ -73,7 +73,7 @@ pub use vector_core::config::{
 /// If deny is set, will panic if schema has already been set.
 pub fn init_log_schema(config_paths: &[ConfigPath], deny_if_set: bool) -> Result<(), Vec<String>> {
     let (builder, _) = load_builder_from_paths(config_paths)?;
-    vector_core::config::init_log_schema(builder.global.log_schema, deny_if_set);
+    vector_lib::config::init_log_schema(builder.global.log_schema, deny_if_set);
     Ok(())
 }
 
diff --git a/src/config/schema.rs b/src/config/schema.rs
index 2f7e61534bc8e..1a0b5d276e4e6 100644
--- a/src/config/schema.rs
+++ b/src/config/schema.rs
@@ -1,5 +1,5 @@
 use vector_config::configurable_component;
-use vector_core::config::LogNamespace;
+use vector_lib::config::LogNamespace;
 
 pub(crate) use crate::schema::Definition;
 
diff --git a/src/config/sink.rs b/src/config/sink.rs
index 050e437f87a77..fa1199d31281e 100644
--- a/src/config/sink.rs
+++ b/src/config/sink.rs
@@ -9,7 +9,7 @@ use vector_config::{
 };
 use vector_config_common::attributes::CustomAttribute;
 use vector_config_common::schema::{SchemaGenerator, SchemaObject};
-use vector_core::{
+use vector_lib::{
     config::{AcknowledgementsConfig, GlobalOptions, Input},
     sink::VectorSink,
 };
@@ -68,14 +68,14 @@ where
     #[configurable(derived)]
     #[serde(
         default,
-        skip_serializing_if = "vector_core::serde::skip_serializing_if_default"
+        skip_serializing_if = "vector_lib::serde::skip_serializing_if_default"
     )]
     pub buffer: BufferConfig,
 
     #[configurable(derived)]
     #[serde(
         default,
-        skip_serializing_if = "vector_core::serde::skip_serializing_if_default"
+        skip_serializing_if = "vector_lib::serde::skip_serializing_if_default"
     )]
     proxy: ProxyConfig,
 
diff --git a/src/config/source.rs b/src/config/source.rs
index 5e53ebbad1725..2be18502e7d5b 100644
--- a/src/config/source.rs
+++ b/src/config/source.rs
@@ -8,7 +8,7 @@ use vector_config::{
 };
 use vector_config_common::attributes::CustomAttribute;
 use vector_config_common::schema::{SchemaGenerator, SchemaObject};
-use vector_core::{
+use vector_lib::{
     config::{
         AcknowledgementsConfig, GlobalOptions, LogNamespace, SourceAcknowledgementsConfig,
         SourceOutput,
@@ -53,7 +53,7 @@ pub struct SourceOuter {
     #[configurable(derived)]
     #[serde(
         default,
-        skip_serializing_if = "vector_core::serde::skip_serializing_if_default"
+        skip_serializing_if = "vector_lib::serde::skip_serializing_if_default"
     )]
     pub proxy: ProxyConfig,
 
diff --git a/src/config/transform.rs b/src/config/transform.rs
index 1b9f442ef0786..8d8c59352fd6a 100644
--- a/src/config/transform.rs
+++ b/src/config/transform.rs
@@ -10,7 +10,7 @@ use vector_config::{
     Configurable, GenerateError, Metadata, NamedComponent,
 };
 use vector_config_common::attributes::CustomAttribute;
-use vector_core::{
+use vector_lib::{
     config::{GlobalOptions, Input, LogNamespace, TransformOutput},
     schema,
     transform::Transform,
diff --git a/src/config/unit_test/unit_test_components.rs b/src/config/unit_test/unit_test_components.rs
index 3166e396a17e4..3f1442598be77 100644
--- a/src/config/unit_test/unit_test_components.rs
+++ b/src/config/unit_test/unit_test_components.rs
@@ -4,7 +4,7 @@ use futures::{stream, Sink, Stream};
 use futures_util::{future, stream::BoxStream, FutureExt, StreamExt};
 use tokio::sync::{oneshot, Mutex};
 use vector_config::configurable_component;
-use vector_core::{
+use vector_lib::{
     config::{DataType, Input, LogNamespace},
     event::Event,
     schema,
diff --git a/src/config/validation.rs b/src/config/validation.rs
index 07ba4639dc71f..53bbe64b95543 100644
--- a/src/config/validation.rs
+++ b/src/config/validation.rs
@@ -3,7 +3,7 @@ use futures_util::{stream, FutureExt, StreamExt, TryFutureExt, TryStreamExt};
 use heim::{disk::Partition, units::information::byte};
 use indexmap::IndexMap;
 use std::{collections::HashMap, path::PathBuf};
-use vector_core::internal_event::DEFAULT_OUTPUT;
+use vector_lib::internal_event::DEFAULT_OUTPUT;
 
 use super::{
     builder::ConfigBuilder, transform::get_transform_output_ids, ComponentKey, Config, OutputId,
diff --git a/src/generate.rs b/src/generate.rs
index e06a431c1afe7..41a22cad597cc 100644
--- a/src/generate.rs
+++ b/src/generate.rs
@@ -13,7 +13,7 @@ use toml::{map::Map, Value};
 use vector_config::component::{
     ExampleError, SinkDescription, SourceDescription, TransformDescription,
 };
-use vector_core::{buffers::BufferConfig, config::GlobalOptions, default_data_dir};
+use vector_lib::{buffers::BufferConfig, config::GlobalOptions, default_data_dir};
 
 use crate::config::{format, Format, SinkHealthcheckOptions};
 
diff --git a/src/internal_events/aggregate.rs b/src/internal_events/aggregate.rs
index ae33faa5a1307..aa0d97e242521 100644
--- a/src/internal_events/aggregate.rs
+++ b/src/internal_events/aggregate.rs
@@ -1,5 +1,5 @@
 use metrics::counter;
-use vector_core::internal_event::InternalEvent;
+use vector_lib::internal_event::InternalEvent;
 
 #[derive(Debug)]
 pub struct AggregateEventRecorded;
diff --git a/src/internal_events/amqp.rs b/src/internal_events/amqp.rs
index c0b05313b4b53..4577753d83590 100644
--- a/src/internal_events/amqp.rs
+++ b/src/internal_events/amqp.rs
@@ -1,7 +1,7 @@
 #[cfg(feature = "sources-amqp")]
 pub mod source {
     use metrics::counter;
-    use vector_core::internal_event::InternalEvent;
+    use vector_lib::internal_event::InternalEvent;
     use vector_lib::internal_event::{error_stage, error_type};
 
     #[derive(Debug)]
@@ -93,7 +93,7 @@ pub mod source {
 pub mod sink {
     use crate::emit;
     use metrics::counter;
-    use vector_core::internal_event::InternalEvent;
+    use vector_lib::internal_event::InternalEvent;
     use vector_lib::internal_event::{
         error_stage, error_type, ComponentEventsDropped, UNINTENTIONAL,
     };
diff --git a/src/internal_events/apache_metrics.rs b/src/internal_events/apache_metrics.rs
index 88c3d74613dd3..bb467f82d4972 100644
--- a/src/internal_events/apache_metrics.rs
+++ b/src/internal_events/apache_metrics.rs
@@ -1,6 +1,6 @@
 use metrics::counter;
 
-use vector_core::internal_event::InternalEvent;
+use vector_lib::internal_event::InternalEvent;
 use vector_lib::{
     internal_event::{error_stage, error_type},
     json_size::JsonSize,
diff --git a/src/internal_events/api.rs b/src/internal_events/api.rs
index 1fadf5300aad7..e0f58608d8ad8 100644
--- a/src/internal_events/api.rs
+++ b/src/internal_events/api.rs
@@ -1,7 +1,7 @@
 use std::net::SocketAddr;
 
 use metrics::counter;
-use vector_core::internal_event::InternalEvent;
+use vector_lib::internal_event::InternalEvent;
 
 #[derive(Debug)]
 pub struct ApiStarted {
diff --git a/src/internal_events/aws_cloudwatch_logs.rs b/src/internal_events/aws_cloudwatch_logs.rs
index 857827849b892..435342858848b 100644
--- a/src/internal_events/aws_cloudwatch_logs.rs
+++ b/src/internal_events/aws_cloudwatch_logs.rs
@@ -1,5 +1,5 @@
 use metrics::counter;
-use vector_core::internal_event::InternalEvent;
+use vector_lib::internal_event::InternalEvent;
 use vector_lib::internal_event::{error_stage, error_type, ComponentEventsDropped, UNINTENTIONAL};
 
 use crate::emit;
diff --git a/src/internal_events/aws_ec2_metadata.rs b/src/internal_events/aws_ec2_metadata.rs
index eefa592d871d5..6b9473aab17bd 100644
--- a/src/internal_events/aws_ec2_metadata.rs
+++ b/src/internal_events/aws_ec2_metadata.rs
@@ -1,5 +1,5 @@
 use metrics::counter;
-use vector_core::internal_event::InternalEvent;
+use vector_lib::internal_event::InternalEvent;
 
 use vector_lib::internal_event::{error_stage, error_type};
 
diff --git a/src/internal_events/aws_ecs_metrics.rs b/src/internal_events/aws_ecs_metrics.rs
index d15061ad0e9c6..8b86ba9b783c8 100644
--- a/src/internal_events/aws_ecs_metrics.rs
+++ b/src/internal_events/aws_ecs_metrics.rs
@@ -1,7 +1,7 @@
 use std::borrow::Cow;
 
 use metrics::counter;
-use vector_core::internal_event::InternalEvent;
+use vector_lib::internal_event::InternalEvent;
 use vector_lib::{
     internal_event::{error_stage, error_type},
     json_size::JsonSize,
diff --git a/src/internal_events/aws_kinesis.rs b/src/internal_events/aws_kinesis.rs
index 0af8de5a03517..bd0a156c5254b 100644
--- a/src/internal_events/aws_kinesis.rs
+++ b/src/internal_events/aws_kinesis.rs
@@ -1,7 +1,7 @@
 /// Used in both `aws_kinesis_streams` and `aws_kinesis_firehose` sinks
 use crate::emit;
 use metrics::counter;
-use vector_core::internal_event::InternalEvent;
+use vector_lib::internal_event::InternalEvent;
 use vector_lib::internal_event::{error_stage, error_type, ComponentEventsDropped, UNINTENTIONAL};
 
 #[derive(Debug)]
diff --git a/src/internal_events/aws_kinesis_firehose.rs b/src/internal_events/aws_kinesis_firehose.rs
index 65906c1e4d155..2f8ea137a0b35 100644
--- a/src/internal_events/aws_kinesis_firehose.rs
+++ b/src/internal_events/aws_kinesis_firehose.rs
@@ -1,5 +1,5 @@
 use metrics::counter;
-use vector_core::internal_event::InternalEvent;
+use vector_lib::internal_event::InternalEvent;
 use vector_lib::internal_event::{error_stage, error_type};
 
 use super::prelude::{http_error_code, io_error_code};
diff --git a/src/internal_events/aws_sqs.rs b/src/internal_events/aws_sqs.rs
index 3cdd6e9539974..3e1e4993f3f7e 100644
--- a/src/internal_events/aws_sqs.rs
+++ b/src/internal_events/aws_sqs.rs
@@ -1,7 +1,7 @@
 use metrics::counter;
 #[cfg(feature = "sources-aws_s3")]
 pub use s3::*;
-use vector_core::internal_event::InternalEvent;
+use vector_lib::internal_event::InternalEvent;
 
 #[cfg(any(feature = "sources-aws_s3", feature = "sources-aws_sqs"))]
 use vector_lib::internal_event::{error_stage, error_type};
diff --git a/src/internal_events/batch.rs b/src/internal_events/batch.rs
index 72462905a086c..e8a1c3e64d80b 100644
--- a/src/internal_events/batch.rs
+++ b/src/internal_events/batch.rs
@@ -1,6 +1,6 @@
 use crate::emit;
 use metrics::counter;
-use vector_core::internal_event::InternalEvent;
+use vector_lib::internal_event::InternalEvent;
 
 use vector_lib::internal_event::{error_stage, error_type, ComponentEventsDropped, UNINTENTIONAL};
 
diff --git a/src/internal_events/codecs.rs b/src/internal_events/codecs.rs
index 0794c0e21a450..e6867be7628dc 100644
--- a/src/internal_events/codecs.rs
+++ b/src/internal_events/codecs.rs
@@ -1,6 +1,6 @@
 use crate::emit;
 use metrics::counter;
-use vector_core::internal_event::InternalEvent;
+use vector_lib::internal_event::InternalEvent;
 
 use vector_lib::internal_event::{error_stage, error_type, ComponentEventsDropped, UNINTENTIONAL};
 
diff --git a/src/internal_events/common.rs b/src/internal_events/common.rs
index 0099c24524ddc..661a96d2d074b 100644
--- a/src/internal_events/common.rs
+++ b/src/internal_events/common.rs
@@ -2,8 +2,8 @@ use std::time::Instant;
 
 use crate::emit;
 use metrics::{counter, histogram};
-pub use vector_core::internal_event::EventsReceived;
-use vector_core::internal_event::InternalEvent;
+pub use vector_lib::internal_event::EventsReceived;
+use vector_lib::internal_event::InternalEvent;
 
 use vector_lib::internal_event::{error_stage, error_type, ComponentEventsDropped, UNINTENTIONAL};
 
diff --git a/src/internal_events/conditions.rs b/src/internal_events/conditions.rs
index 88576b8dac425..92a8828e435b6 100644
--- a/src/internal_events/conditions.rs
+++ b/src/internal_events/conditions.rs
@@ -1,5 +1,5 @@
 use metrics::counter;
-use vector_core::internal_event::InternalEvent;
+use vector_lib::internal_event::InternalEvent;
 
 use vector_lib::internal_event::{error_stage, error_type};
 
diff --git a/src/internal_events/datadog_metrics.rs b/src/internal_events/datadog_metrics.rs
index 417629547ba78..9d6d35c78d35d 100644
--- a/src/internal_events/datadog_metrics.rs
+++ b/src/internal_events/datadog_metrics.rs
@@ -1,6 +1,6 @@
 use crate::emit;
 use metrics::counter;
-use vector_core::internal_event::InternalEvent;
+use vector_lib::internal_event::InternalEvent;
 
 use vector_lib::internal_event::{error_stage, error_type, ComponentEventsDropped, UNINTENTIONAL};
 
diff --git a/src/internal_events/datadog_traces.rs b/src/internal_events/datadog_traces.rs
index 77d3b2935a222..92df6f58e23f9 100644
--- a/src/internal_events/datadog_traces.rs
+++ b/src/internal_events/datadog_traces.rs
@@ -1,6 +1,6 @@
 use crate::emit;
 use metrics::counter;
-use vector_core::internal_event::InternalEvent;
+use vector_lib::internal_event::InternalEvent;
 
 use vector_lib::internal_event::{error_stage, error_type, ComponentEventsDropped, UNINTENTIONAL};
 
diff --git a/src/internal_events/dedupe.rs b/src/internal_events/dedupe.rs
index caf0dd9c204e1..e9bd7710ee8b6 100644
--- a/src/internal_events/dedupe.rs
+++ b/src/internal_events/dedupe.rs
@@ -1,5 +1,5 @@
 use crate::emit;
-use vector_core::internal_event::{ComponentEventsDropped, InternalEvent, INTENTIONAL};
+use vector_lib::internal_event::{ComponentEventsDropped, InternalEvent, INTENTIONAL};
 
 #[derive(Debug)]
 pub struct DedupeEventsDropped {
diff --git a/src/internal_events/demo_logs.rs b/src/internal_events/demo_logs.rs
index e2484590010f2..796c9e9fca7bd 100644
--- a/src/internal_events/demo_logs.rs
+++ b/src/internal_events/demo_logs.rs
@@ -1,4 +1,4 @@
-use vector_core::internal_event::InternalEvent;
+use vector_lib::internal_event::InternalEvent;
 
 #[derive(Debug)]
 pub struct DemoLogsEventProcessed;
diff --git a/src/internal_events/dnstap.rs b/src/internal_events/dnstap.rs
index 4b68b965c58c0..90525b5f217d0 100644
--- a/src/internal_events/dnstap.rs
+++ b/src/internal_events/dnstap.rs
@@ -1,5 +1,5 @@
 use metrics::counter;
-use vector_core::internal_event::InternalEvent;
+use vector_lib::internal_event::InternalEvent;
 
 use vector_lib::internal_event::{error_stage, error_type};
 
diff --git a/src/internal_events/docker_logs.rs b/src/internal_events/docker_logs.rs
index 49b423a5d4d1d..617b987ae6d83 100644
--- a/src/internal_events/docker_logs.rs
+++ b/src/internal_events/docker_logs.rs
@@ -1,7 +1,7 @@
 use bollard::errors::Error;
 use chrono::ParseError;
 use metrics::counter;
-use vector_core::internal_event::InternalEvent;
+use vector_lib::internal_event::InternalEvent;
 use vector_lib::{
     internal_event::{error_stage, error_type},
     json_size::JsonSize,
diff --git a/src/internal_events/encoding_transcode.rs b/src/internal_events/encoding_transcode.rs
index ec36f05a309bd..d8532a4e96aab 100644
--- a/src/internal_events/encoding_transcode.rs
+++ b/src/internal_events/encoding_transcode.rs
@@ -1,5 +1,5 @@
 use metrics::counter;
-use vector_core::internal_event::InternalEvent;
+use vector_lib::internal_event::InternalEvent;
 
 #[derive(Debug)]
 pub struct DecoderBomRemoval {
diff --git a/src/internal_events/eventstoredb_metrics.rs b/src/internal_events/eventstoredb_metrics.rs
index 19dbff55b2ac4..1ed248d45511f 100644
--- a/src/internal_events/eventstoredb_metrics.rs
+++ b/src/internal_events/eventstoredb_metrics.rs
@@ -1,5 +1,5 @@
 use metrics::counter;
-use vector_core::internal_event::InternalEvent;
+use vector_lib::internal_event::InternalEvent;
 
 use vector_lib::internal_event::{error_stage, error_type};
 
diff --git a/src/internal_events/exec.rs b/src/internal_events/exec.rs
index 4d5baabcd91c0..3315734d56024 100644
--- a/src/internal_events/exec.rs
+++ b/src/internal_events/exec.rs
@@ -3,7 +3,7 @@ use std::time::Duration;
 use crate::emit;
 use metrics::{counter, histogram};
 use tokio::time::error::Elapsed;
-use vector_core::internal_event::InternalEvent;
+use vector_lib::internal_event::InternalEvent;
 use vector_lib::{
     internal_event::{error_stage, error_type, ComponentEventsDropped, UNINTENTIONAL},
     json_size::JsonSize,
diff --git a/src/internal_events/file.rs b/src/internal_events/file.rs
index d947698b2bc81..871be8a93ce7b 100644
--- a/src/internal_events/file.rs
+++ b/src/internal_events/file.rs
@@ -1,6 +1,6 @@
 use metrics::{counter, gauge};
 use std::borrow::Cow;
-use vector_core::internal_event::{ComponentEventsDropped, InternalEvent, UNINTENTIONAL};
+use vector_lib::internal_event::{ComponentEventsDropped, InternalEvent, UNINTENTIONAL};
 
 use crate::emit;
 
diff --git a/src/internal_events/file_descriptor.rs b/src/internal_events/file_descriptor.rs
index 45f73bfc400cf..a27ac7875ab71 100644
--- a/src/internal_events/file_descriptor.rs
+++ b/src/internal_events/file_descriptor.rs
@@ -1,5 +1,5 @@
 use metrics::counter;
-use vector_core::internal_event::InternalEvent;
+use vector_lib::internal_event::InternalEvent;
 use vector_lib::internal_event::{error_stage, error_type};
 
 #[derive(Debug)]
diff --git a/src/internal_events/fluent.rs b/src/internal_events/fluent.rs
index 5ac8685a65802..a5bfd3201ab71 100644
--- a/src/internal_events/fluent.rs
+++ b/src/internal_events/fluent.rs
@@ -1,5 +1,5 @@
 use metrics::counter;
-use vector_core::internal_event::InternalEvent;
+use vector_lib::internal_event::InternalEvent;
 
 use crate::sources::fluent::DecodeError;
 use vector_lib::internal_event::{error_stage, error_type};
diff --git a/src/internal_events/gcp_pubsub.rs b/src/internal_events/gcp_pubsub.rs
index 9e669620448d4..5d7754ad13403 100644
--- a/src/internal_events/gcp_pubsub.rs
+++ b/src/internal_events/gcp_pubsub.rs
@@ -1,5 +1,5 @@
 use metrics::counter;
-use vector_core::internal_event::InternalEvent;
+use vector_lib::internal_event::InternalEvent;
 
 use vector_lib::internal_event::{error_stage, error_type};
 
diff --git a/src/internal_events/grpc.rs b/src/internal_events/grpc.rs
index 7f48b2930b290..ee18a1bd225db 100644
--- a/src/internal_events/grpc.rs
+++ b/src/internal_events/grpc.rs
@@ -1,5 +1,5 @@
 use metrics::counter;
-use vector_core::internal_event::InternalEvent;
+use vector_lib::internal_event::InternalEvent;
 use vector_lib::internal_event::{error_stage, error_type};
 
 #[derive(Debug)]
diff --git a/src/internal_events/heartbeat.rs b/src/internal_events/heartbeat.rs
index 41417f312064a..8a7dc6beb9ef4 100644
--- a/src/internal_events/heartbeat.rs
+++ b/src/internal_events/heartbeat.rs
@@ -1,7 +1,7 @@
 use std::time::Instant;
 
 use metrics::gauge;
-use vector_core::internal_event::InternalEvent;
+use vector_lib::internal_event::InternalEvent;
 
 #[derive(Debug)]
 pub struct Heartbeat {
diff --git a/src/internal_events/host_metrics.rs b/src/internal_events/host_metrics.rs
index 59b957ff071e0..7c2b9c0ee2bfb 100644
--- a/src/internal_events/host_metrics.rs
+++ b/src/internal_events/host_metrics.rs
@@ -1,5 +1,5 @@
 use metrics::counter;
-use vector_core::internal_event::InternalEvent;
+use vector_lib::internal_event::InternalEvent;
 
 use vector_lib::internal_event::{error_stage, error_type};
 
diff --git a/src/internal_events/http.rs b/src/internal_events/http.rs
index ce4bae4ede61d..bcef588f533ff 100644
--- a/src/internal_events/http.rs
+++ b/src/internal_events/http.rs
@@ -1,7 +1,7 @@
 use std::error::Error;
 
 use metrics::{counter, histogram};
-use vector_core::internal_event::InternalEvent;
+use vector_lib::internal_event::InternalEvent;
 
 use vector_lib::{
     internal_event::{error_stage, error_type},
diff --git a/src/internal_events/http_client.rs b/src/internal_events/http_client.rs
index 5d47336c8dad0..43d2001b01c88 100644
--- a/src/internal_events/http_client.rs
+++ b/src/internal_events/http_client.rs
@@ -6,7 +6,7 @@ use http::{
 };
 use hyper::{body::HttpBody, Error};
 use metrics::{counter, histogram};
-use vector_core::internal_event::InternalEvent;
+use vector_lib::internal_event::InternalEvent;
 
 use vector_lib::internal_event::{error_stage, error_type};
 
diff --git a/src/internal_events/http_client_source.rs b/src/internal_events/http_client_source.rs
index 55a868c1da597..b1450a5c8c71d 100644
--- a/src/internal_events/http_client_source.rs
+++ b/src/internal_events/http_client_source.rs
@@ -1,5 +1,5 @@
 use metrics::counter;
-use vector_core::internal_event::InternalEvent;
+use vector_lib::internal_event::InternalEvent;
 use vector_lib::{
     internal_event::{error_stage, error_type},
     json_size::JsonSize,
diff --git a/src/internal_events/influxdb.rs b/src/internal_events/influxdb.rs
index 4dcbbcf081264..babe206896a72 100644
--- a/src/internal_events/influxdb.rs
+++ b/src/internal_events/influxdb.rs
@@ -1,6 +1,6 @@
 use crate::emit;
 use metrics::counter;
-use vector_core::internal_event::InternalEvent;
+use vector_lib::internal_event::InternalEvent;
 use vector_lib::internal_event::{error_stage, error_type, ComponentEventsDropped, UNINTENTIONAL};
 
 #[derive(Debug)]
diff --git a/src/internal_events/internal_logs.rs b/src/internal_events/internal_logs.rs
index 9f0806db7b0a1..9321e9e7a81da 100644
--- a/src/internal_events/internal_logs.rs
+++ b/src/internal_events/internal_logs.rs
@@ -1,5 +1,5 @@
 use metrics::counter;
-use vector_core::internal_event::InternalEvent;
+use vector_lib::internal_event::InternalEvent;
 use vector_lib::json_size::JsonSize;
 
 #[derive(Debug)]
diff --git a/src/internal_events/internal_metrics.rs b/src/internal_events/internal_metrics.rs
index 1e29cb664ccd2..680b209c7e1eb 100644
--- a/src/internal_events/internal_metrics.rs
+++ b/src/internal_events/internal_metrics.rs
@@ -1,5 +1,5 @@
 use metrics::counter;
-use vector_core::internal_event::InternalEvent;
+use vector_lib::internal_event::InternalEvent;
 
 #[derive(Debug)]
 pub struct InternalMetricsBytesReceived {
diff --git a/src/internal_events/journald.rs b/src/internal_events/journald.rs
index 5f0fc62cc767f..713d87b36df23 100644
--- a/src/internal_events/journald.rs
+++ b/src/internal_events/journald.rs
@@ -1,6 +1,6 @@
 use codecs::decoding::BoxedFramingError;
 use metrics::counter;
-use vector_core::internal_event::InternalEvent;
+use vector_lib::internal_event::InternalEvent;
 
 use vector_lib::internal_event::{error_stage, error_type};
 
diff --git a/src/internal_events/kafka.rs b/src/internal_events/kafka.rs
index b6d50da6407ba..6c4d24e63cfb7 100644
--- a/src/internal_events/kafka.rs
+++ b/src/internal_events/kafka.rs
@@ -1,5 +1,5 @@
 use metrics::{counter, gauge};
-use vector_core::{internal_event::InternalEvent, update_counter};
+use vector_lib::{internal_event::InternalEvent, update_counter};
 use vrl::path::OwnedTargetPath;
 
 use vector_lib::{
diff --git a/src/internal_events/kubernetes_logs.rs b/src/internal_events/kubernetes_logs.rs
index 44a7964070028..dece04e8bbdf5 100644
--- a/src/internal_events/kubernetes_logs.rs
+++ b/src/internal_events/kubernetes_logs.rs
@@ -1,5 +1,5 @@
 use metrics::counter;
-use vector_core::internal_event::InternalEvent;
+use vector_lib::internal_event::InternalEvent;
 
 use crate::emit;
 use crate::event::Event;
diff --git a/src/internal_events/log_to_metric.rs b/src/internal_events/log_to_metric.rs
index 800d2693a4d3b..dd6fa930a23c8 100644
--- a/src/internal_events/log_to_metric.rs
+++ b/src/internal_events/log_to_metric.rs
@@ -1,7 +1,7 @@
 use std::num::ParseFloatError;
 
 use metrics::counter;
-use vector_core::internal_event::InternalEvent;
+use vector_lib::internal_event::InternalEvent;
 
 use crate::emit;
 use vector_lib::internal_event::{error_stage, error_type, ComponentEventsDropped, UNINTENTIONAL};
diff --git a/src/internal_events/logplex.rs b/src/internal_events/logplex.rs
index 2d1e07cd8cad1..4c725e825ed65 100644
--- a/src/internal_events/logplex.rs
+++ b/src/internal_events/logplex.rs
@@ -1,5 +1,5 @@
 use metrics::counter;
-use vector_core::internal_event::InternalEvent;
+use vector_lib::internal_event::InternalEvent;
 use vector_lib::internal_event::{error_stage, error_type};
 
 use super::prelude::io_error_code;
diff --git a/src/internal_events/loki.rs b/src/internal_events/loki.rs
index ea88bf2207fbf..3290f8faf2761 100644
--- a/src/internal_events/loki.rs
+++ b/src/internal_events/loki.rs
@@ -1,7 +1,7 @@
 use crate::emit;
 use metrics::counter;
-use vector_core::internal_event::{ComponentEventsDropped, InternalEvent, INTENTIONAL};
 use vector_lib::internal_event::{error_stage, error_type};
+use vector_lib::internal_event::{ComponentEventsDropped, InternalEvent, INTENTIONAL};
 
 #[derive(Debug)]
 pub struct LokiEventUnlabeledError;
diff --git a/src/internal_events/lua.rs b/src/internal_events/lua.rs
index f9fb819af7557..dba6dc0a529fe 100644
--- a/src/internal_events/lua.rs
+++ b/src/internal_events/lua.rs
@@ -1,5 +1,5 @@
 use metrics::{counter, gauge};
-use vector_core::internal_event::InternalEvent;
+use vector_lib::internal_event::InternalEvent;
 
 use crate::emit;
 use crate::transforms::lua::v2::BuildError;
diff --git a/src/internal_events/metric_to_log.rs b/src/internal_events/metric_to_log.rs
index efec0705507fa..f3c34d249363e 100644
--- a/src/internal_events/metric_to_log.rs
+++ b/src/internal_events/metric_to_log.rs
@@ -1,6 +1,6 @@
 use metrics::counter;
 use serde_json::Error;
-use vector_core::internal_event::InternalEvent;
+use vector_lib::internal_event::InternalEvent;
 
 use crate::emit;
 use vector_lib::internal_event::{error_stage, error_type, ComponentEventsDropped, UNINTENTIONAL};
diff --git a/src/internal_events/mongodb_metrics.rs b/src/internal_events/mongodb_metrics.rs
index 715a886ff48e2..6a4992cc627d5 100644
--- a/src/internal_events/mongodb_metrics.rs
+++ b/src/internal_events/mongodb_metrics.rs
@@ -1,6 +1,6 @@
 use metrics::counter;
 use mongodb::{bson, error::Error as MongoError};
-use vector_core::internal_event::InternalEvent;
+use vector_lib::internal_event::InternalEvent;
 
 use vector_lib::{
     internal_event::{error_stage, error_type},
diff --git a/src/internal_events/nginx_metrics.rs b/src/internal_events/nginx_metrics.rs
index 7d5fab1d272e3..9a975abe463c1 100644
--- a/src/internal_events/nginx_metrics.rs
+++ b/src/internal_events/nginx_metrics.rs
@@ -1,5 +1,5 @@
 use metrics::counter;
-use vector_core::internal_event::InternalEvent;
+use vector_lib::internal_event::InternalEvent;
 
 use crate::sources::nginx_metrics::parser::ParseError;
 use vector_lib::{
diff --git a/src/internal_events/open.rs b/src/internal_events/open.rs
index e811014f05bfa..daf395394a567 100644
--- a/src/internal_events/open.rs
+++ b/src/internal_events/open.rs
@@ -7,7 +7,7 @@ use std::{
 };
 
 use metrics::gauge;
-use vector_core::internal_event::InternalEvent;
+use vector_lib::internal_event::InternalEvent;
 
 #[derive(Debug)]
 pub struct ConnectionOpen {
diff --git a/src/internal_events/parser.rs b/src/internal_events/parser.rs
index fe29ccfc363be..ab1ffa466f8be 100644
--- a/src/internal_events/parser.rs
+++ b/src/internal_events/parser.rs
@@ -1,7 +1,7 @@
 use std::borrow::Cow;
 
 use metrics::counter;
-use vector_core::internal_event::InternalEvent;
+use vector_lib::internal_event::InternalEvent;
 
 use crate::emit;
 use vector_lib::internal_event::{error_stage, error_type, ComponentEventsDropped, UNINTENTIONAL};
diff --git a/src/internal_events/postgresql_metrics.rs b/src/internal_events/postgresql_metrics.rs
index bc5ca8a230587..42bb8aa7d0047 100644
--- a/src/internal_events/postgresql_metrics.rs
+++ b/src/internal_events/postgresql_metrics.rs
@@ -1,5 +1,5 @@
 use metrics::counter;
-use vector_core::internal_event::InternalEvent;
+use vector_lib::internal_event::InternalEvent;
 
 use vector_lib::internal_event::{error_stage, error_type};
 
diff --git a/src/internal_events/process.rs b/src/internal_events/process.rs
index 0ed898aa77297..c9712cbeecc77 100644
--- a/src/internal_events/process.rs
+++ b/src/internal_events/process.rs
@@ -1,6 +1,6 @@
 use metrics::counter;
 use metrics::gauge;
-use vector_core::internal_event::InternalEvent;
+use vector_lib::internal_event::InternalEvent;
 
 use crate::{built_info, config};
 use vector_lib::internal_event::{error_stage, error_type};
diff --git a/src/internal_events/prometheus.rs b/src/internal_events/prometheus.rs
index 4a85609ec7fca..4d5c0e3da24ca 100644
--- a/src/internal_events/prometheus.rs
+++ b/src/internal_events/prometheus.rs
@@ -5,7 +5,7 @@ use hyper::StatusCode;
 use metrics::counter;
 #[cfg(feature = "sources-prometheus-scrape")]
 use prometheus_parser::ParserError;
-use vector_core::internal_event::InternalEvent;
+use vector_lib::internal_event::InternalEvent;
 
 use crate::emit;
 use vector_lib::internal_event::{error_stage, error_type, ComponentEventsDropped, UNINTENTIONAL};
diff --git a/src/internal_events/pulsar.rs b/src/internal_events/pulsar.rs
index f714e77d40a35..66fd8704bbacf 100644
--- a/src/internal_events/pulsar.rs
+++ b/src/internal_events/pulsar.rs
@@ -1,5 +1,5 @@
 use metrics::counter;
-use vector_core::internal_event::InternalEvent;
+use vector_lib::internal_event::InternalEvent;
 
 use crate::emit;
 use vector_lib::internal_event::{error_stage, error_type, ComponentEventsDropped, UNINTENTIONAL};
diff --git a/src/internal_events/redis.rs b/src/internal_events/redis.rs
index 998b81fc48a35..67ca84a59e886 100644
--- a/src/internal_events/redis.rs
+++ b/src/internal_events/redis.rs
@@ -1,5 +1,5 @@
 use metrics::counter;
-use vector_core::internal_event::InternalEvent;
+use vector_lib::internal_event::InternalEvent;
 
 use vector_lib::internal_event::{error_stage, error_type};
 
diff --git a/src/internal_events/reduce.rs b/src/internal_events/reduce.rs
index af3eb2d141093..ae355696e17cb 100644
--- a/src/internal_events/reduce.rs
+++ b/src/internal_events/reduce.rs
@@ -1,5 +1,5 @@
 use metrics::counter;
-use vector_core::internal_event::InternalEvent;
+use vector_lib::internal_event::InternalEvent;
 
 #[derive(Debug)]
 pub struct ReduceStaleEventFlushed;
diff --git a/src/internal_events/remap.rs b/src/internal_events/remap.rs
index 66fbaa67b4212..3727069ff40a1 100644
--- a/src/internal_events/remap.rs
+++ b/src/internal_events/remap.rs
@@ -1,6 +1,6 @@
 use crate::emit;
 use metrics::counter;
-use vector_core::internal_event::InternalEvent;
+use vector_lib::internal_event::InternalEvent;
 
 use vector_lib::internal_event::{
     error_stage, error_type, ComponentEventsDropped, INTENTIONAL, UNINTENTIONAL,
diff --git a/src/internal_events/sample.rs b/src/internal_events/sample.rs
index cded9a1a13343..23cfc35633a9d 100644
--- a/src/internal_events/sample.rs
+++ b/src/internal_events/sample.rs
@@ -1,5 +1,5 @@
 use crate::emit;
-use vector_core::internal_event::{ComponentEventsDropped, InternalEvent, INTENTIONAL};
+use vector_lib::internal_event::{ComponentEventsDropped, InternalEvent, INTENTIONAL};
 
 #[derive(Debug)]
 pub struct SampleEventDiscarded;
diff --git a/src/internal_events/sematext_metrics.rs b/src/internal_events/sematext_metrics.rs
index af14d78fa8367..49a1ef83fb892 100644
--- a/src/internal_events/sematext_metrics.rs
+++ b/src/internal_events/sematext_metrics.rs
@@ -1,5 +1,5 @@
 use metrics::counter;
-use vector_core::internal_event::InternalEvent;
+use vector_lib::internal_event::InternalEvent;
 
 use crate::{emit, event::metric::Metric};
 use vector_lib::internal_event::{error_stage, error_type, ComponentEventsDropped, UNINTENTIONAL};
diff --git a/src/internal_events/socket.rs b/src/internal_events/socket.rs
index d68cb41cf1a88..f5b5cf2b3d36e 100644
--- a/src/internal_events/socket.rs
+++ b/src/internal_events/socket.rs
@@ -1,5 +1,5 @@
 use metrics::counter;
-use vector_core::internal_event::{ComponentEventsDropped, InternalEvent, UNINTENTIONAL};
+use vector_lib::internal_event::{ComponentEventsDropped, InternalEvent, UNINTENTIONAL};
 use vector_lib::{
     internal_event::{error_stage, error_type},
     json_size::JsonSize,
diff --git a/src/internal_events/splunk_hec.rs b/src/internal_events/splunk_hec.rs
index 5b155386db401..da73879da22eb 100644
--- a/src/internal_events/splunk_hec.rs
+++ b/src/internal_events/splunk_hec.rs
@@ -9,7 +9,7 @@ pub use self::source::*;
 mod sink {
     use metrics::{counter, decrement_gauge, increment_gauge};
     use serde_json::Error;
-    use vector_core::internal_event::InternalEvent;
+    use vector_lib::internal_event::InternalEvent;
 
     use crate::{
         emit,
@@ -198,7 +198,7 @@ mod sink {
 #[cfg(feature = "sources-splunk_hec")]
 mod source {
     use metrics::counter;
-    use vector_core::internal_event::InternalEvent;
+    use vector_lib::internal_event::InternalEvent;
 
     use crate::sources::splunk_hec::ApiError;
     use vector_lib::internal_event::{error_stage, error_type};
diff --git a/src/internal_events/statsd_sink.rs b/src/internal_events/statsd_sink.rs
index 73be541eeea23..c7c1dbfc498dc 100644
--- a/src/internal_events/statsd_sink.rs
+++ b/src/internal_events/statsd_sink.rs
@@ -1,5 +1,5 @@
 use metrics::counter;
-use vector_core::internal_event::InternalEvent;
+use vector_lib::internal_event::InternalEvent;
 
 use crate::emit;
 use crate::event::metric::{MetricKind, MetricValue};
diff --git a/src/internal_events/tag_cardinality_limit.rs b/src/internal_events/tag_cardinality_limit.rs
index c24e038eb5714..6e5dd89029152 100644
--- a/src/internal_events/tag_cardinality_limit.rs
+++ b/src/internal_events/tag_cardinality_limit.rs
@@ -1,6 +1,6 @@
 use crate::emit;
 use metrics::counter;
-use vector_core::internal_event::{ComponentEventsDropped, InternalEvent, INTENTIONAL};
+use vector_lib::internal_event::{ComponentEventsDropped, InternalEvent, INTENTIONAL};
 
 pub struct TagCardinalityLimitRejectingEvent<'a> {
     pub metric_name: &'a str,
diff --git a/src/internal_events/tcp.rs b/src/internal_events/tcp.rs
index 1bd99e835172e..6b7607cbb6a4e 100644
--- a/src/internal_events/tcp.rs
+++ b/src/internal_events/tcp.rs
@@ -1,7 +1,7 @@
 use std::net::SocketAddr;
 
 use metrics::counter;
-use vector_core::internal_event::InternalEvent;
+use vector_lib::internal_event::InternalEvent;
 use vector_lib::internal_event::{error_stage, error_type};
 
 use crate::{emit, internal_events::SocketOutgoingConnectionError, tls::TlsError};
diff --git a/src/internal_events/template.rs b/src/internal_events/template.rs
index c263e46250c4a..433422d7dc58c 100644
--- a/src/internal_events/template.rs
+++ b/src/internal_events/template.rs
@@ -1,6 +1,6 @@
 use crate::emit;
 use metrics::counter;
-use vector_core::internal_event::{ComponentEventsDropped, InternalEvent, UNINTENTIONAL};
+use vector_lib::internal_event::{ComponentEventsDropped, InternalEvent, UNINTENTIONAL};
 
 use vector_lib::internal_event::{error_stage, error_type};
 
diff --git a/src/internal_events/throttle.rs b/src/internal_events/throttle.rs
index 17ceeaac95590..d742ce5cc4a02 100644
--- a/src/internal_events/throttle.rs
+++ b/src/internal_events/throttle.rs
@@ -1,6 +1,6 @@
 use crate::emit;
 use metrics::counter;
-use vector_core::internal_event::{ComponentEventsDropped, InternalEvent, INTENTIONAL};
+use vector_lib::internal_event::{ComponentEventsDropped, InternalEvent, INTENTIONAL};
 
 #[derive(Debug)]
 pub(crate) struct ThrottleEventDiscarded {
diff --git a/src/internal_events/udp.rs b/src/internal_events/udp.rs
index 0821107b19e01..bac40d963c29a 100644
--- a/src/internal_events/udp.rs
+++ b/src/internal_events/udp.rs
@@ -1,5 +1,5 @@
 use metrics::counter;
-use vector_core::internal_event::InternalEvent;
+use vector_lib::internal_event::InternalEvent;
 use vector_lib::internal_event::{error_stage, error_type, ComponentEventsDropped, UNINTENTIONAL};
 
 use crate::{emit, internal_events::SocketOutgoingConnectionError};
diff --git a/src/internal_events/unix.rs b/src/internal_events/unix.rs
index 4affef0370ea9..1417e27630834 100644
--- a/src/internal_events/unix.rs
+++ b/src/internal_events/unix.rs
@@ -1,7 +1,7 @@
 use std::{io::Error, path::Path};
 
 use metrics::counter;
-use vector_core::internal_event::InternalEvent;
+use vector_lib::internal_event::InternalEvent;
 use vector_lib::internal_event::{error_stage, error_type, ComponentEventsDropped, UNINTENTIONAL};
 
 use crate::{emit, internal_events::SocketOutgoingConnectionError};
diff --git a/src/internal_events/websocket.rs b/src/internal_events/websocket.rs
index acc7c25203b0e..604f627940866 100644
--- a/src/internal_events/websocket.rs
+++ b/src/internal_events/websocket.rs
@@ -2,7 +2,7 @@ use std::error::Error;
 use std::fmt::Debug;
 
 use metrics::counter;
-use vector_core::internal_event::InternalEvent;
+use vector_lib::internal_event::InternalEvent;
 
 use vector_lib::internal_event::{error_stage, error_type};
 
diff --git a/src/internal_events/windows.rs b/src/internal_events/windows.rs
index 3634ab99af1f8..42636888bca14 100644
--- a/src/internal_events/windows.rs
+++ b/src/internal_events/windows.rs
@@ -1,5 +1,5 @@
 use metrics::counter;
-use vector_core::internal_event::InternalEvent;
+use vector_lib::internal_event::InternalEvent;
 
 use vector_lib::internal_event::{error_stage, error_type};
 
diff --git a/src/lib.rs b/src/lib.rs
index 8b726b0144b7a..0657aeb65dccc 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -121,7 +121,7 @@ pub mod validate;
 pub mod vector_windows;
 
 pub use source_sender::SourceSender;
-pub use vector_core::{event, metrics, schema, tcp, tls};
+pub use vector_lib::{event, metrics, schema, tcp, tls};
 pub use vector_lib::{shutdown, Error, Result};
 
 static APP_NAME_SLUG: std::sync::OnceLock<String> = std::sync::OnceLock::new();
diff --git a/src/serde.rs b/src/serde.rs
index 1e43bf8d1120c..284ecb6bc2fcf 100644
--- a/src/serde.rs
+++ b/src/serde.rs
@@ -6,7 +6,7 @@ use codecs::{
 use indexmap::map::IndexMap;
 use serde::{Deserialize, Serialize};
 use vector_config::configurable_component;
-pub use vector_core::serde::{bool_or_struct, skip_serializing_if_default};
+pub use vector_lib::serde::{bool_or_struct, skip_serializing_if_default};
 
 pub const fn default_true() -> bool {
     true
diff --git a/src/sinks/amqp/encoder.rs b/src/sinks/amqp/encoder.rs
index a1af7ec54e77b..7529fa12b6ffa 100644
--- a/src/sinks/amqp/encoder.rs
+++ b/src/sinks/amqp/encoder.rs
@@ -3,7 +3,7 @@ use crate::sinks::prelude::*;
 use bytes::BytesMut;
 use std::io;
 use tokio_util::codec::Encoder as _;
-use vector_core::config::telemetry;
+use vector_lib::config::telemetry;
 
 #[derive(Clone, Debug)]
 pub(super) struct AmqpEncoder {
diff --git a/src/sinks/amqp/integration_tests.rs b/src/sinks/amqp/integration_tests.rs
index 7ac1d9caa78dc..b5f1bdd320d6d 100644
--- a/src/sinks/amqp/integration_tests.rs
+++ b/src/sinks/amqp/integration_tests.rs
@@ -12,7 +12,7 @@ use crate::{
 };
 use futures::StreamExt;
 use std::{collections::HashSet, sync::Arc, time::Duration};
-use vector_core::config::LogNamespace;
+use vector_lib::config::LogNamespace;
 
 pub fn make_config() -> AmqpSinkConfig {
     let mut config = AmqpSinkConfig {
diff --git a/src/sinks/appsignal/config.rs b/src/sinks/appsignal/config.rs
index 94bcf770c32b7..6a33f75968286 100644
--- a/src/sinks/appsignal/config.rs
+++ b/src/sinks/appsignal/config.rs
@@ -3,11 +3,11 @@ use http::{header::AUTHORIZATION, Request, Uri};
 use hyper::Body;
 use tower::ServiceBuilder;
 use vector_config::configurable_component;
-use vector_core::{
+use vector_lib::sensitive_string::SensitiveString;
+use vector_lib::{
     config::{proxy::ProxyConfig, AcknowledgementsConfig, DataType, Input},
     tls::{MaybeTlsSettings, TlsEnableableConfig},
 };
-use vector_lib::sensitive_string::SensitiveString;
 
 use crate::{
     codecs::Transformer,
diff --git a/src/sinks/appsignal/encoder.rs b/src/sinks/appsignal/encoder.rs
index 59731316ab66f..2a3ff5ead28b7 100644
--- a/src/sinks/appsignal/encoder.rs
+++ b/src/sinks/appsignal/encoder.rs
@@ -1,6 +1,6 @@
 use serde_json::{json, Value};
-use vector_core::{config::telemetry, event::Event, EstimatedJsonEncodedSizeOf};
 use vector_lib::request_metadata::GroupedCountByteSize;
+use vector_lib::{config::telemetry, event::Event, EstimatedJsonEncodedSizeOf};
 
 use crate::{
     codecs::Transformer,
diff --git a/src/sinks/appsignal/integration_tests.rs b/src/sinks/appsignal/integration_tests.rs
index 8054da4eb92cc..773d9fb6eae8e 100644
--- a/src/sinks/appsignal/integration_tests.rs
+++ b/src/sinks/appsignal/integration_tests.rs
@@ -3,7 +3,7 @@ use futures::{channel::mpsc::Receiver, stream, StreamExt};
 use http::header::AUTHORIZATION;
 use hyper::StatusCode;
 use indoc::indoc;
-use vector_core::event::{
+use vector_lib::event::{
     BatchNotifier, BatchStatus, Event, LogEvent, Metric, MetricKind, MetricValue,
 };
 
diff --git a/src/sinks/appsignal/normalizer.rs b/src/sinks/appsignal/normalizer.rs
index 0108de6516b3f..e1b6db4d1d680 100644
--- a/src/sinks/appsignal/normalizer.rs
+++ b/src/sinks/appsignal/normalizer.rs
@@ -1,4 +1,4 @@
-use vector_core::event::{Metric, MetricValue};
+use vector_lib::event::{Metric, MetricValue};
 
 use crate::sinks::util::buffer::metrics::{MetricNormalize, MetricSet};
 
diff --git a/src/sinks/appsignal/request_builder.rs b/src/sinks/appsignal/request_builder.rs
index 83e9923461d2a..7a2dddd0f9852 100644
--- a/src/sinks/appsignal/request_builder.rs
+++ b/src/sinks/appsignal/request_builder.rs
@@ -1,6 +1,6 @@
 use bytes::Bytes;
 
-use vector_core::event::Event;
+use vector_lib::event::Event;
 use vector_lib::{
     byte_size_of::ByteSizeOf,
     finalization::{EventFinalizers, Finalizable},
diff --git a/src/sinks/appsignal/tests.rs b/src/sinks/appsignal/tests.rs
index 8bc5fd94e0143..10afdbcdd4b74 100644
--- a/src/sinks/appsignal/tests.rs
+++ b/src/sinks/appsignal/tests.rs
@@ -1,7 +1,7 @@
 use futures::{future::ready, stream};
 use serde::Deserialize;
 use vector_config::component::GenerateConfig;
-use vector_core::event::{Event, LogEvent};
+use vector_lib::event::{Event, LogEvent};
 
 use crate::{
     config::{SinkConfig, SinkContext},
diff --git a/src/sinks/aws_cloudwatch_logs/config.rs b/src/sinks/aws_cloudwatch_logs/config.rs
index 0be371f8b67cd..f55c0cdd24c81 100644
--- a/src/sinks/aws_cloudwatch_logs/config.rs
+++ b/src/sinks/aws_cloudwatch_logs/config.rs
@@ -4,7 +4,7 @@ use codecs::JsonSerializerConfig;
 use futures::FutureExt;
 use tower::ServiceBuilder;
 use vector_config::configurable_component;
-use vector_core::schema;
+use vector_lib::schema;
 use vrl::value::Kind;
 
 use crate::{
diff --git a/src/sinks/aws_cloudwatch_logs/request_builder.rs b/src/sinks/aws_cloudwatch_logs/request_builder.rs
index ac8d6a0367833..44ac6d562e4f5 100644
--- a/src/sinks/aws_cloudwatch_logs/request_builder.rs
+++ b/src/sinks/aws_cloudwatch_logs/request_builder.rs
@@ -3,11 +3,11 @@ use std::num::NonZeroUsize;
 use bytes::BytesMut;
 use chrono::Utc;
 use tokio_util::codec::Encoder as _;
-use vector_core::{
+use vector_lib::request_metadata::{MetaDescriptive, RequestMetadata};
+use vector_lib::{
     event::{EventFinalizers, Finalizable},
     ByteSizeOf,
 };
-use vector_lib::request_metadata::{MetaDescriptive, RequestMetadata};
 
 use super::TemplateRenderingError;
 use crate::{
@@ -138,8 +138,8 @@ impl ByteSizeOf for CloudwatchRequest {
 #[cfg(test)]
 mod tests {
     use chrono::Utc;
-    use vector_core::config::log_schema;
-    use vector_core::event::LogEvent;
+    use vector_lib::config::log_schema;
+    use vector_lib::event::LogEvent;
 
     use super::CloudwatchRequestBuilder;
 
diff --git a/src/sinks/aws_cloudwatch_logs/sink.rs b/src/sinks/aws_cloudwatch_logs/sink.rs
index ff4e65bf9bc8c..5d50294b08dc2 100644
--- a/src/sinks/aws_cloudwatch_logs/sink.rs
+++ b/src/sinks/aws_cloudwatch_logs/sink.rs
@@ -4,8 +4,8 @@ use async_trait::async_trait;
 use chrono::{Duration, Utc};
 use futures::{future, stream::BoxStream, StreamExt};
 use tower::Service;
-use vector_core::{partition::Partitioner, sink::StreamSink};
 use vector_lib::request_metadata::{MetaDescriptive, RequestMetadata};
+use vector_lib::{partition::Partitioner, sink::StreamSink};
 use vector_stream::{BatcherSettings, DriverResponse};
 
 use crate::{
diff --git a/src/sinks/aws_cloudwatch_metrics/integration_tests.rs b/src/sinks/aws_cloudwatch_metrics/integration_tests.rs
index 3af1c28597fc3..636210b2fb0ec 100644
--- a/src/sinks/aws_cloudwatch_metrics/integration_tests.rs
+++ b/src/sinks/aws_cloudwatch_metrics/integration_tests.rs
@@ -1,6 +1,6 @@
 use chrono::{offset::TimeZone, Timelike, Utc};
 use rand::seq::SliceRandom;
-use vector_core::metric_tags;
+use vector_lib::metric_tags;
 
 use super::*;
 use crate::{
@@ -75,7 +75,7 @@ async fn cloudwatch_metrics_put_data() {
                 format!("distribution-{}", distribution_name),
                 MetricKind::Incremental,
                 MetricValue::Distribution {
-                    samples: vector_core::samples![i as f64 => 100],
+                    samples: vector_lib::samples![i as f64 => 100],
                     statistic: StatisticKind::Histogram,
                 },
             )
diff --git a/src/sinks/aws_cloudwatch_metrics/mod.rs b/src/sinks/aws_cloudwatch_metrics/mod.rs
index 9a507d91a3795..86a77f78effbe 100644
--- a/src/sinks/aws_cloudwatch_metrics/mod.rs
+++ b/src/sinks/aws_cloudwatch_metrics/mod.rs
@@ -15,7 +15,7 @@ use futures_util::{future, future::BoxFuture};
 use std::task::{Context, Poll};
 use tower::Service;
 use vector_config::configurable_component;
-use vector_core::{sink::VectorSink, ByteSizeOf, EstimatedJsonEncodedSizeOf};
+use vector_lib::{sink::VectorSink, ByteSizeOf, EstimatedJsonEncodedSizeOf};
 
 use crate::{
     aws::{
diff --git a/src/sinks/aws_cloudwatch_metrics/tests.rs b/src/sinks/aws_cloudwatch_metrics/tests.rs
index d8d8e2d2cc209..ef5ecf773af2c 100644
--- a/src/sinks/aws_cloudwatch_metrics/tests.rs
+++ b/src/sinks/aws_cloudwatch_metrics/tests.rs
@@ -1,7 +1,7 @@
 use aws_sdk_cloudwatch::types::DateTime;
 use chrono::{offset::TimeZone, Timelike, Utc};
 use similar_asserts::assert_eq;
-use vector_core::metric_tags;
+use vector_lib::metric_tags;
 
 use super::*;
 use crate::event::metric::{Metric, MetricKind, MetricValue, StatisticKind};
@@ -114,7 +114,7 @@ async fn encode_events_distribution() {
         "latency",
         MetricKind::Incremental,
         MetricValue::Distribution {
-            samples: vector_core::samples![11.0 => 100, 12.0 => 50],
+            samples: vector_lib::samples![11.0 => 100, 12.0 => 50],
             statistic: StatisticKind::Histogram,
         },
     )];
diff --git a/src/sinks/aws_kinesis/request_builder.rs b/src/sinks/aws_kinesis/request_builder.rs
index 9e3d271e2388c..b2cfaa202fc90 100644
--- a/src/sinks/aws_kinesis/request_builder.rs
+++ b/src/sinks/aws_kinesis/request_builder.rs
@@ -1,8 +1,8 @@
 use std::{io, marker::PhantomData};
 
 use bytes::Bytes;
-use vector_core::ByteSizeOf;
 use vector_lib::request_metadata::{MetaDescriptive, RequestMetadata};
+use vector_lib::ByteSizeOf;
 
 use super::{
     record::Record,
diff --git a/src/sinks/aws_s3/config.rs b/src/sinks/aws_s3/config.rs
index 6123ee737d22f..b31f9391afc17 100644
--- a/src/sinks/aws_s3/config.rs
+++ b/src/sinks/aws_s3/config.rs
@@ -7,7 +7,7 @@ use codecs::{
 };
 use tower::ServiceBuilder;
 use vector_config::configurable_component;
-use vector_core::sink::VectorSink;
+use vector_lib::sink::VectorSink;
 
 use super::sink::S3RequestOptions;
 use crate::{
diff --git a/src/sinks/aws_s3/integration_tests.rs b/src/sinks/aws_s3/integration_tests.rs
index 5a5cfeb3248df..ee66a346c2886 100644
--- a/src/sinks/aws_s3/integration_tests.rs
+++ b/src/sinks/aws_s3/integration_tests.rs
@@ -21,7 +21,7 @@ use flate2::read::MultiGzDecoder;
 use futures::{stream, Stream};
 use similar_asserts::assert_eq;
 use tokio_stream::StreamExt;
-use vector_core::{
+use vector_lib::{
     config::proxy::ProxyConfig,
     event::{BatchNotifier, BatchStatus, BatchStatusReceiver, Event, EventArray, LogEvent},
 };
diff --git a/src/sinks/aws_s3/sink.rs b/src/sinks/aws_s3/sink.rs
index 4c4f745fedd32..8223b3bfcd0fb 100644
--- a/src/sinks/aws_s3/sink.rs
+++ b/src/sinks/aws_s3/sink.rs
@@ -4,7 +4,7 @@ use bytes::Bytes;
 use chrono::Utc;
 use codecs::encoding::Framer;
 use uuid::Uuid;
-use vector_core::event::Finalizable;
+use vector_lib::event::Finalizable;
 use vector_lib::request_metadata::RequestMetadata;
 
 use crate::{
diff --git a/src/sinks/aws_s_s/request_builder.rs b/src/sinks/aws_s_s/request_builder.rs
index afb4f1bf882f7..4d64ebe85f7ea 100644
--- a/src/sinks/aws_s_s/request_builder.rs
+++ b/src/sinks/aws_s_s/request_builder.rs
@@ -1,6 +1,6 @@
 use bytes::Bytes;
-use vector_core::ByteSizeOf;
 use vector_lib::request_metadata::{MetaDescriptive, RequestMetadata};
+use vector_lib::ByteSizeOf;
 
 use crate::codecs::EncodingConfig;
 use crate::{
diff --git a/src/sinks/aws_s_s/service.rs b/src/sinks/aws_s_s/service.rs
index 5d02d0e2fff49..0049a52ac4f96 100644
--- a/src/sinks/aws_s_s/service.rs
+++ b/src/sinks/aws_s_s/service.rs
@@ -4,8 +4,8 @@ use std::task::{Context, Poll};
 use aws_sdk_sqs::types::SdkError;
 use futures::future::BoxFuture;
 use tower::Service;
-use vector_core::{event::EventStatus, ByteSizeOf};
 use vector_lib::request_metadata::GroupedCountByteSize;
+use vector_lib::{event::EventStatus, ByteSizeOf};
 use vector_stream::DriverResponse;
 
 use super::{client::Client, request_builder::SendMessageEntry};
diff --git a/src/sinks/axiom.rs b/src/sinks/axiom.rs
index 2e33da17b2071..7281e70246091 100644
--- a/src/sinks/axiom.rs
+++ b/src/sinks/axiom.rs
@@ -145,7 +145,7 @@ mod integration_tests {
     use futures::stream;
     use serde::{Deserialize, Serialize};
     use std::env;
-    use vector_core::event::{BatchNotifier, BatchStatus, Event, LogEvent};
+    use vector_lib::event::{BatchNotifier, BatchStatus, Event, LogEvent};
 
     use super::*;
     use crate::{
diff --git a/src/sinks/azure_blob/integration_tests.rs b/src/sinks/azure_blob/integration_tests.rs
index 352e6ce313bdb..c810b8017c456 100644
--- a/src/sinks/azure_blob/integration_tests.rs
+++ b/src/sinks/azure_blob/integration_tests.rs
@@ -13,7 +13,7 @@ use codecs::{
 use flate2::read::GzDecoder;
 use futures::{stream, Stream, StreamExt};
 use http::StatusCode;
-use vector_core::ByteSizeOf;
+use vector_lib::ByteSizeOf;
 
 use super::config::AzureBlobSinkConfig;
 use crate::{
diff --git a/src/sinks/azure_blob/request_builder.rs b/src/sinks/azure_blob/request_builder.rs
index a12417ec5c684..60fe5758418ff 100644
--- a/src/sinks/azure_blob/request_builder.rs
+++ b/src/sinks/azure_blob/request_builder.rs
@@ -2,8 +2,8 @@ use bytes::Bytes;
 use chrono::Utc;
 use codecs::encoding::Framer;
 use uuid::Uuid;
-use vector_core::EstimatedJsonEncodedSizeOf;
 use vector_lib::request_metadata::RequestMetadata;
+use vector_lib::EstimatedJsonEncodedSizeOf;
 
 use crate::{
     codecs::{Encoder, Transformer},
diff --git a/src/sinks/azure_blob/test.rs b/src/sinks/azure_blob/test.rs
index 3733a9b992926..a0f93fb1d6584 100644
--- a/src/sinks/azure_blob/test.rs
+++ b/src/sinks/azure_blob/test.rs
@@ -4,8 +4,8 @@ use codecs::{
     encoding::{Framer, FramingConfig},
     NewlineDelimitedEncoder, TextSerializerConfig,
 };
-use vector_core::{partition::Partitioner, EstimatedJsonEncodedSizeOf};
 use vector_lib::request_metadata::GroupedCountByteSize;
+use vector_lib::{partition::Partitioner, EstimatedJsonEncodedSizeOf};
 
 use super::config::AzureBlobSinkConfig;
 use super::request_builder::AzureBlobRequestOptions;
diff --git a/src/sinks/azure_monitor_logs/config.rs b/src/sinks/azure_monitor_logs/config.rs
index 44a3ee2afd485..a5a57d2e5275c 100644
--- a/src/sinks/azure_monitor_logs/config.rs
+++ b/src/sinks/azure_monitor_logs/config.rs
@@ -2,8 +2,8 @@ use lookup::{lookup_v2::OptionalValuePath, OwnedValuePath};
 use openssl::{base64, pkey};
 
 use vector_config::configurable_component;
-use vector_core::{config::log_schema, schema};
 use vector_lib::sensitive_string::SensitiveString;
+use vector_lib::{config::log_schema, schema};
 use vrl::value::Kind;
 
 use crate::{
diff --git a/src/sinks/azure_monitor_logs/mod.rs b/src/sinks/azure_monitor_logs/mod.rs
index e025b912f9b13..8033d892d0740 100644
--- a/src/sinks/azure_monitor_logs/mod.rs
+++ b/src/sinks/azure_monitor_logs/mod.rs
@@ -1,7 +1,7 @@
-//! The Azure Monitor Logs [`vector_core::sink::VectorSink`]
+//! The Azure Monitor Logs [`vector_lib::sink::VectorSink`]
 //!
-//! This module contains the [`vector_core::sink::VectorSink`] instance that is responsible for
-//! taking a stream of [`vector_core::event::Event`] instances and forwarding them to the Azure
+//! This module contains the [`vector_lib::sink::VectorSink`] instance that is responsible for
+//! taking a stream of [`vector_lib::event::Event`] instances and forwarding them to the Azure
 //! Monitor Logs service.
 
 mod config;
diff --git a/src/sinks/azure_monitor_logs/tests.rs b/src/sinks/azure_monitor_logs/tests.rs
index a28e84e47b3be..9050297eebc9d 100644
--- a/src/sinks/azure_monitor_logs/tests.rs
+++ b/src/sinks/azure_monitor_logs/tests.rs
@@ -5,7 +5,7 @@ use http::Response;
 use hyper::body;
 use openssl::{base64, hash, pkey, sign};
 use tokio::time::timeout;
-use vector_core::config::log_schema;
+use vector_lib::config::log_schema;
 
 use super::{
     config::{default_host, AzureMonitorLogsConfig},
diff --git a/src/sinks/blackhole/sink.rs b/src/sinks/blackhole/sink.rs
index 9ed7164e44309..514e3e3071a8d 100644
--- a/src/sinks/blackhole/sink.rs
+++ b/src/sinks/blackhole/sink.rs
@@ -13,10 +13,10 @@ use tokio::{
     sync::watch,
     time::{interval, sleep_until},
 };
-use vector_core::EstimatedJsonEncodedSizeOf;
 use vector_lib::internal_event::{
     ByteSize, BytesSent, CountByteSize, EventsSent, InternalEventHandle as _, Output, Protocol,
 };
+use vector_lib::EstimatedJsonEncodedSizeOf;
 
 use crate::{
     event::{EventArray, EventContainer},
diff --git a/src/sinks/clickhouse/integration_tests.rs b/src/sinks/clickhouse/integration_tests.rs
index 2408a892999f2..1a1bf060d1f18 100644
--- a/src/sinks/clickhouse/integration_tests.rs
+++ b/src/sinks/clickhouse/integration_tests.rs
@@ -15,7 +15,7 @@ use http::StatusCode;
 use serde::Deserialize;
 use serde_json::Value;
 use tokio::time::{timeout, Duration};
-use vector_core::event::{BatchNotifier, BatchStatus, BatchStatusReceiver, Event, LogEvent};
+use vector_lib::event::{BatchNotifier, BatchStatus, BatchStatusReceiver, Event, LogEvent};
 use warp::Filter;
 
 use super::*;
diff --git a/src/sinks/clickhouse/mod.rs b/src/sinks/clickhouse/mod.rs
index 488df9181a8bf..b03eb89417691 100644
--- a/src/sinks/clickhouse/mod.rs
+++ b/src/sinks/clickhouse/mod.rs
@@ -1,7 +1,7 @@
-//! The Clickhouse [`vector_core::sink::VectorSink`]
+//! The Clickhouse [`vector_lib::sink::VectorSink`]
 //!
-//! This module contains the [`vector_core::sink::VectorSink`] instance that is responsible for
-//! taking a stream of [`vector_core::event::Event`] instances and forwarding them to Clickhouse.
+//! This module contains the [`vector_lib::sink::VectorSink`] instance that is responsible for
+//! taking a stream of [`vector_lib::event::Event`] instances and forwarding them to Clickhouse.
 //!
 //! Events are sent to Clickhouse using the HTTP interface with a query of the following structure:
 //! `INSERT INTO my_db.my_table FORMAT JSONEachRow`. The event payload is encoded as new-line
diff --git a/src/sinks/console/sink.rs b/src/sinks/console/sink.rs
index ddf870333da7d..788630eda5e93 100644
--- a/src/sinks/console/sink.rs
+++ b/src/sinks/console/sink.rs
@@ -4,7 +4,7 @@ use codecs::encoding::Framer;
 use futures::{stream::BoxStream, StreamExt};
 use tokio::{io, io::AsyncWriteExt};
 use tokio_util::codec::Encoder as _;
-use vector_core::{
+use vector_lib::{
     internal_event::{
         ByteSize, BytesSent, CountByteSize, EventsSent, InternalEventHandle as _, Output, Protocol,
     },
@@ -68,7 +68,7 @@ mod test {
     use codecs::{JsonSerializerConfig, NewlineDelimitedEncoder};
     use futures::future::ready;
     use futures_util::stream;
-    use vector_core::sink::VectorSink;
+    use vector_lib::sink::VectorSink;
 
     use super::*;
     use crate::{
diff --git a/src/sinks/databend/config.rs b/src/sinks/databend/config.rs
index 69a464090c445..5029f7b650699 100644
--- a/src/sinks/databend/config.rs
+++ b/src/sinks/databend/config.rs
@@ -4,7 +4,7 @@ use codecs::encoding::{Framer, FramingConfig};
 use futures::future::FutureExt;
 use tower::ServiceBuilder;
 use vector_config::{component::GenerateConfig, configurable_component};
-use vector_core::tls::TlsSettings;
+use vector_lib::tls::TlsSettings;
 
 use crate::{
     codecs::{Encoder, EncodingConfig},
diff --git a/src/sinks/databend/integration_tests.rs b/src/sinks/databend/integration_tests.rs
index 7bc592c843274..ccb7ed2878dbc 100644
--- a/src/sinks/databend/integration_tests.rs
+++ b/src/sinks/databend/integration_tests.rs
@@ -3,8 +3,8 @@ use std::collections::BTreeMap;
 use futures::future::ready;
 use futures::stream;
 
-use vector_core::config::proxy::ProxyConfig;
-use vector_core::event::{BatchNotifier, BatchStatus, BatchStatusReceiver, Event, LogEvent};
+use vector_lib::config::proxy::ProxyConfig;
+use vector_lib::event::{BatchNotifier, BatchStatus, BatchStatusReceiver, Event, LogEvent};
 use vector_lib::sensitive_string::SensitiveString;
 
 use crate::sinks::util::test::load_sink;
diff --git a/src/sinks/databend/request_builder.rs b/src/sinks/databend/request_builder.rs
index ddbbff1e1f6e4..db5eebc1adf6d 100644
--- a/src/sinks/databend/request_builder.rs
+++ b/src/sinks/databend/request_builder.rs
@@ -2,7 +2,7 @@ use std::io;
 
 use bytes::Bytes;
 use codecs::encoding::Framer;
-use vector_core::event::Event;
+use vector_lib::event::Event;
 use vector_lib::finalization::{EventFinalizers, Finalizable};
 use vector_lib::request_metadata::RequestMetadata;
 
diff --git a/src/sinks/datadog/events/config.rs b/src/sinks/datadog/events/config.rs
index 606d364b32ec8..71f431d0ce9c0 100644
--- a/src/sinks/datadog/events/config.rs
+++ b/src/sinks/datadog/events/config.rs
@@ -1,8 +1,8 @@
 use indoc::indoc;
 use tower::ServiceBuilder;
 use vector_config::configurable_component;
-use vector_core::config::proxy::ProxyConfig;
-use vector_core::schema;
+use vector_lib::config::proxy::ProxyConfig;
+use vector_lib::schema;
 use vrl::value::Kind;
 
 use crate::{
diff --git a/src/sinks/datadog/events/request_builder.rs b/src/sinks/datadog/events/request_builder.rs
index ab770b0d8dc56..3a0fbf92fc17b 100644
--- a/src/sinks/datadog/events/request_builder.rs
+++ b/src/sinks/datadog/events/request_builder.rs
@@ -3,8 +3,8 @@ use std::{io, sync::Arc};
 use bytes::Bytes;
 use codecs::JsonSerializerConfig;
 use lookup::lookup_v2::ConfigValuePath;
-use vector_core::ByteSizeOf;
 use vector_lib::request_metadata::{MetaDescriptive, RequestMetadata};
+use vector_lib::ByteSizeOf;
 
 use crate::{
     codecs::{Encoder, TimestampFormat, Transformer},
diff --git a/src/sinks/datadog/events/tests.rs b/src/sinks/datadog/events/tests.rs
index ea006829327f1..b15ce6c68bdf8 100644
--- a/src/sinks/datadog/events/tests.rs
+++ b/src/sinks/datadog/events/tests.rs
@@ -9,7 +9,7 @@ use futures::{
 use hyper::StatusCode;
 use indoc::indoc;
 use similar_asserts::assert_eq;
-use vector_core::event::{BatchNotifier, BatchStatus};
+use vector_lib::event::{BatchNotifier, BatchStatus};
 
 use super::*;
 use crate::{
diff --git a/src/sinks/datadog/logs/config.rs b/src/sinks/datadog/logs/config.rs
index 13050d3a87da8..d58cd6b106edf 100644
--- a/src/sinks/datadog/logs/config.rs
+++ b/src/sinks/datadog/logs/config.rs
@@ -3,7 +3,7 @@ use std::{convert::TryFrom, sync::Arc};
 use indoc::indoc;
 use tower::ServiceBuilder;
 use vector_config::configurable_component;
-use vector_core::{config::proxy::ProxyConfig, schema::meaning};
+use vector_lib::{config::proxy::ProxyConfig, schema::meaning};
 use vrl::value::Kind;
 
 use super::{service::LogApiRetry, sink::LogSinkBuilder};
diff --git a/src/sinks/datadog/logs/integration_tests.rs b/src/sinks/datadog/logs/integration_tests.rs
index 0d34486ec0897..b5308ac926c62 100644
--- a/src/sinks/datadog/logs/integration_tests.rs
+++ b/src/sinks/datadog/logs/integration_tests.rs
@@ -1,5 +1,5 @@
 use indoc::indoc;
-use vector_core::event::{BatchNotifier, BatchStatus};
+use vector_lib::event::{BatchNotifier, BatchStatus};
 
 use super::config::DatadogLogsConfig;
 use crate::{
diff --git a/src/sinks/datadog/logs/mod.rs b/src/sinks/datadog/logs/mod.rs
index 0f99ee8dc8947..f9b489ab3fa10 100644
--- a/src/sinks/datadog/logs/mod.rs
+++ b/src/sinks/datadog/logs/mod.rs
@@ -1,7 +1,7 @@
-//! The Datadog Logs [`vector_core::sink::VectorSink`]
+//! The Datadog Logs [`vector_lib::sink::VectorSink`]
 //!
-//! This module contains the [`vector_core::sink::VectorSink`] instance that is responsible for
-//! taking a stream of [`vector_core::event::Event`] instances and getting them flung out to the
+//! This module contains the [`vector_lib::sink::VectorSink`] instance that is responsible for
+//! taking a stream of [`vector_lib::event::Event`] instances and getting them flung out to the
 //! Datadog Log API. The log API is relatively generous in terms of its
 //! constraints, except that:
 //!
diff --git a/src/sinks/datadog/logs/service.rs b/src/sinks/datadog/logs/service.rs
index 94cdb6b276797..4cc1f80fea69d 100644
--- a/src/sinks/datadog/logs/service.rs
+++ b/src/sinks/datadog/logs/service.rs
@@ -14,7 +14,7 @@ use hyper::Body;
 use indexmap::IndexMap;
 use tower::Service;
 use tracing::Instrument;
-use vector_core::event::{EventFinalizers, EventStatus, Finalizable};
+use vector_lib::event::{EventFinalizers, EventStatus, Finalizable};
 use vector_lib::request_metadata::{GroupedCountByteSize, MetaDescriptive, RequestMetadata};
 use vector_stream::DriverResponse;
 
diff --git a/src/sinks/datadog/logs/tests.rs b/src/sinks/datadog/logs/tests.rs
index ce2a828bd84f9..eedabc7493224 100644
--- a/src/sinks/datadog/logs/tests.rs
+++ b/src/sinks/datadog/logs/tests.rs
@@ -11,7 +11,7 @@ use futures::{
 use http::request::Parts;
 use hyper::StatusCode;
 use indoc::indoc;
-use vector_core::{
+use vector_lib::{
     config::{init_telemetry, Tags, Telemetry},
     event::{BatchNotifier, BatchStatus, Event, LogEvent},
 };
diff --git a/src/sinks/datadog/metrics/config.rs b/src/sinks/datadog/metrics/config.rs
index bfddadd64d6d9..81eeb48028288 100644
--- a/src/sinks/datadog/metrics/config.rs
+++ b/src/sinks/datadog/metrics/config.rs
@@ -4,7 +4,7 @@ use http::Uri;
 use snafu::ResultExt;
 use tower::ServiceBuilder;
 use vector_config::configurable_component;
-use vector_core::config::proxy::ProxyConfig;
+use vector_lib::config::proxy::ProxyConfig;
 
 use super::{
     request_builder::DatadogMetricsRequestBuilder,
diff --git a/src/sinks/datadog/metrics/encoder.rs b/src/sinks/datadog/metrics/encoder.rs
index fdc4914e65aae..dec74803d0c77 100644
--- a/src/sinks/datadog/metrics/encoder.rs
+++ b/src/sinks/datadog/metrics/encoder.rs
@@ -9,13 +9,13 @@ use bytes::{BufMut, Bytes};
 use chrono::{DateTime, Utc};
 use once_cell::sync::Lazy;
 use snafu::{ResultExt, Snafu};
-use vector_core::{
+use vector_lib::request_metadata::GroupedCountByteSize;
+use vector_lib::{
     config::{log_schema, telemetry, LogSchema},
     event::{metric::MetricSketch, DatadogMetricOriginMetadata, Metric, MetricTags, MetricValue},
     metrics::AgentDDSketch,
     EstimatedJsonEncodedSizeOf,
 };
-use vector_lib::request_metadata::GroupedCountByteSize;
 
 use super::config::{
     DatadogMetricsEndpoint, SeriesApiVersion, MAXIMUM_PAYLOAD_COMPRESSED_SIZE, MAXIMUM_PAYLOAD_SIZE,
@@ -1014,7 +1014,7 @@ mod tests {
         proptest, strategy::Strategy, string::string_regex,
     };
     use prost::Message;
-    use vector_core::{
+    use vector_lib::{
         config::{log_schema, LogSchema},
         event::{
             metric::{MetricSketch, TagValue},
diff --git a/src/sinks/datadog/metrics/integration_tests.rs b/src/sinks/datadog/metrics/integration_tests.rs
index 8c993b22bca04..761d9f1693b32 100644
--- a/src/sinks/datadog/metrics/integration_tests.rs
+++ b/src/sinks/datadog/metrics/integration_tests.rs
@@ -10,7 +10,7 @@ use indoc::indoc;
 use prost::Message;
 use rand::{thread_rng, Rng};
 
-use vector_core::{
+use vector_lib::{
     config::{init_telemetry, Tags, Telemetry},
     event::{BatchNotifier, BatchStatus, Event, Metric, MetricKind, MetricValue},
     metric_tags,
diff --git a/src/sinks/datadog/metrics/normalizer.rs b/src/sinks/datadog/metrics/normalizer.rs
index 6b6d27b1c0649..2c5df07cd108f 100644
--- a/src/sinks/datadog/metrics/normalizer.rs
+++ b/src/sinks/datadog/metrics/normalizer.rs
@@ -1,4 +1,4 @@
-use vector_core::{
+use vector_lib::{
     event::{Metric, MetricValue},
     metrics::AgentDDSketch,
 };
@@ -38,7 +38,7 @@ impl MetricNormalize for DatadogMetricsNormalizer {
 
 #[cfg(test)]
 mod tests {
-    use vector_core::{
+    use vector_lib::{
         event::{metric::MetricSketch, Metric, MetricKind, MetricValue},
         metrics::AgentDDSketch,
     };
diff --git a/src/sinks/datadog/metrics/request_builder.rs b/src/sinks/datadog/metrics/request_builder.rs
index e4fb34a9fa0c3..e9b2fcb1514c6 100644
--- a/src/sinks/datadog/metrics/request_builder.rs
+++ b/src/sinks/datadog/metrics/request_builder.rs
@@ -1,7 +1,7 @@
 use bytes::Bytes;
 use snafu::Snafu;
 use std::sync::Arc;
-use vector_core::event::{EventFinalizers, Finalizable, Metric};
+use vector_lib::event::{EventFinalizers, Finalizable, Metric};
 use vector_lib::request_metadata::RequestMetadata;
 
 use super::{
diff --git a/src/sinks/datadog/metrics/service.rs b/src/sinks/datadog/metrics/service.rs
index e73f85c0c70ed..dd7eb7c69ffbe 100644
--- a/src/sinks/datadog/metrics/service.rs
+++ b/src/sinks/datadog/metrics/service.rs
@@ -10,7 +10,7 @@ use http::{
 use hyper::Body;
 use snafu::ResultExt;
 use tower::Service;
-use vector_core::event::{EventFinalizers, EventStatus, Finalizable};
+use vector_lib::event::{EventFinalizers, EventStatus, Finalizable};
 use vector_lib::request_metadata::{GroupedCountByteSize, MetaDescriptive, RequestMetadata};
 use vector_stream::DriverResponse;
 
diff --git a/src/sinks/datadog/metrics/sink.rs b/src/sinks/datadog/metrics/sink.rs
index 329b46ea9745c..ebe925e752da4 100644
--- a/src/sinks/datadog/metrics/sink.rs
+++ b/src/sinks/datadog/metrics/sink.rs
@@ -8,7 +8,7 @@ use futures_util::{
     StreamExt,
 };
 use tower::Service;
-use vector_core::{
+use vector_lib::{
     event::{Event, Metric, MetricValue},
     partition::Partitioner,
     sink::StreamSink,
@@ -233,7 +233,7 @@ mod tests {
 
     use chrono::{DateTime, Utc};
     use proptest::prelude::*;
-    use vector_core::{
+    use vector_lib::{
         event::{Metric, MetricKind, MetricValue},
         metric_tags,
     };
diff --git a/src/sinks/datadog/mod.rs b/src/sinks/datadog/mod.rs
index 745495dcc3a16..98df036b05243 100644
--- a/src/sinks/datadog/mod.rs
+++ b/src/sinks/datadog/mod.rs
@@ -3,8 +3,8 @@ use http::{Request, StatusCode, Uri};
 use hyper::body::Body;
 use snafu::Snafu;
 use vector_config::configurable_component;
-use vector_core::{config::AcknowledgementsConfig, tls::TlsEnableableConfig};
 use vector_lib::sensitive_string::SensitiveString;
+use vector_lib::{config::AcknowledgementsConfig, tls::TlsEnableableConfig};
 
 use crate::{
     common::datadog::{get_api_base_endpoint, get_base_domain_region, Region, DD_US_SITE},
diff --git a/src/sinks/datadog/traces/apm_stats/mod.rs b/src/sinks/datadog/traces/apm_stats/mod.rs
index 58ec6c26bbcae..e778b9af7064a 100644
--- a/src/sinks/datadog/traces/apm_stats/mod.rs
+++ b/src/sinks/datadog/traces/apm_stats/mod.rs
@@ -8,7 +8,7 @@
 use std::sync::{Arc, Mutex};
 
 use serde::{Deserialize, Serialize};
-use vector_core::event::TraceEvent;
+use vector_lib::event::TraceEvent;
 
 pub use self::aggregation::Aggregator;
 pub use self::flusher::flush_apm_stats_thread;
diff --git a/src/sinks/datadog/traces/config.rs b/src/sinks/datadog/traces/config.rs
index bb8f4d183d63d..08f43ba4c95c7 100644
--- a/src/sinks/datadog/traces/config.rs
+++ b/src/sinks/datadog/traces/config.rs
@@ -6,7 +6,7 @@ use snafu::ResultExt;
 use tokio::sync::oneshot::{channel, Sender};
 use tower::ServiceBuilder;
 use vector_config::configurable_component;
-use vector_core::config::{proxy::ProxyConfig, AcknowledgementsConfig};
+use vector_lib::config::{proxy::ProxyConfig, AcknowledgementsConfig};
 
 use super::{
     apm_stats::{flush_apm_stats_thread, Aggregator},
diff --git a/src/sinks/datadog/traces/integration_tests.rs b/src/sinks/datadog/traces/integration_tests.rs
index 5b4f55b94eafd..dbfcbcdc7c691 100644
--- a/src/sinks/datadog/traces/integration_tests.rs
+++ b/src/sinks/datadog/traces/integration_tests.rs
@@ -13,7 +13,7 @@ use crate::{
         map_event_batch_stream,
     },
 };
-use vector_core::event::{BatchNotifier, BatchStatus};
+use vector_lib::event::{BatchNotifier, BatchStatus};
 
 #[tokio::test]
 async fn to_real_traces_endpoint() {
diff --git a/src/sinks/datadog/traces/mod.rs b/src/sinks/datadog/traces/mod.rs
index af175bcd10086..dd490499cecf1 100644
--- a/src/sinks/datadog/traces/mod.rs
+++ b/src/sinks/datadog/traces/mod.rs
@@ -1,7 +1,7 @@
-//! The Datadog Traces [`vector_core::sink::VectorSink`]
+//! The Datadog Traces [`vector_lib::sink::VectorSink`]
 //!
-//! This module contains the [`vector_core::sink::VectorSink`] instance responsible for taking
-//! a stream of [`vector_core::event::Event`], partition them following the right directions and
+//! This module contains the [`vector_lib::sink::VectorSink`] instance responsible for taking
+//! a stream of [`vector_lib::event::Event`], partition them following the right directions and
 //! sending them to the Datadog Trace intake.
 //! This module use the same protocol as the official Datadog trace-agent to
 //! submit traces to the Datadog intake.
diff --git a/src/sinks/datadog/traces/request_builder.rs b/src/sinks/datadog/traces/request_builder.rs
index 4fea8d4468724..dc176e8cdb08a 100644
--- a/src/sinks/datadog/traces/request_builder.rs
+++ b/src/sinks/datadog/traces/request_builder.rs
@@ -8,7 +8,7 @@ use std::{
 use bytes::Bytes;
 use prost::Message;
 use snafu::Snafu;
-use vector_core::event::{EventFinalizers, Finalizable};
+use vector_lib::event::{EventFinalizers, Finalizable};
 use vector_lib::request_metadata::RequestMetadata;
 use vrl::event_path;
 
diff --git a/src/sinks/datadog/traces/service.rs b/src/sinks/datadog/traces/service.rs
index 5e305e906952c..ecda3c93c23ce 100644
--- a/src/sinks/datadog/traces/service.rs
+++ b/src/sinks/datadog/traces/service.rs
@@ -9,7 +9,7 @@ use http::{Request, StatusCode, Uri};
 use hyper::Body;
 use snafu::ResultExt;
 use tower::Service;
-use vector_core::event::{EventFinalizers, EventStatus, Finalizable};
+use vector_lib::event::{EventFinalizers, EventStatus, Finalizable};
 use vector_lib::request_metadata::{GroupedCountByteSize, MetaDescriptive, RequestMetadata};
 use vector_stream::DriverResponse;
 
diff --git a/src/sinks/datadog/traces/sink.rs b/src/sinks/datadog/traces/sink.rs
index 57735ca1699d1..b907759f5cd8d 100644
--- a/src/sinks/datadog/traces/sink.rs
+++ b/src/sinks/datadog/traces/sink.rs
@@ -7,7 +7,7 @@ use futures_util::{
 };
 use tokio::sync::oneshot::{channel, Sender};
 use tower::Service;
-use vector_core::{config::log_schema, event::Event, partition::Partitioner, sink::StreamSink};
+use vector_lib::{config::log_schema, event::Event, partition::Partitioner, sink::StreamSink};
 use vector_stream::{BatcherSettings, DriverResponse};
 use vrl::event_path;
 use vrl::path::PathPrefix;
diff --git a/src/sinks/datadog/traces/tests.rs b/src/sinks/datadog/traces/tests.rs
index af9723c236970..ed9c19378830b 100644
--- a/src/sinks/datadog/traces/tests.rs
+++ b/src/sinks/datadog/traces/tests.rs
@@ -8,7 +8,7 @@ use indoc::indoc;
 use ordered_float::NotNan;
 use prost::Message;
 use rmp_serde;
-use vector_core::event::{BatchNotifier, BatchStatus, Event};
+use vector_lib::event::{BatchNotifier, BatchStatus, Event};
 use vrl::event_path;
 
 use super::{apm_stats::StatsPayload, dd_proto, ddsketch_full, DatadogTracesConfig};
diff --git a/src/sinks/elasticsearch/common.rs b/src/sinks/elasticsearch/common.rs
index fc6be16ea42a1..27b71e527dae1 100644
--- a/src/sinks/elasticsearch/common.rs
+++ b/src/sinks/elasticsearch/common.rs
@@ -5,8 +5,8 @@ use http::{Response, StatusCode, Uri};
 use hyper::{body, Body};
 use serde::Deserialize;
 use snafu::ResultExt;
-use vector_core::config::proxy::ProxyConfig;
-use vector_core::config::LogNamespace;
+use vector_lib::config::proxy::ProxyConfig;
+use vector_lib::config::LogNamespace;
 
 use super::{
     request_builder::ElasticsearchRequestBuilder, ElasticsearchApiVersion, ElasticsearchEncoder,
diff --git a/src/sinks/elasticsearch/config.rs b/src/sinks/elasticsearch/config.rs
index 6df73422ee1cd..5f175f8f57530 100644
--- a/src/sinks/elasticsearch/config.rs
+++ b/src/sinks/elasticsearch/config.rs
@@ -33,7 +33,7 @@ use crate::{
 };
 use lookup::event_path;
 use lookup::lookup_v2::ConfigValuePath;
-use vector_core::schema::Requirement;
+use vector_lib::schema::Requirement;
 use vrl::value::Kind;
 
 /// The field name for the timestamp required by data stream mode
diff --git a/src/sinks/elasticsearch/encoder.rs b/src/sinks/elasticsearch/encoder.rs
index 53925277295f3..3fec60ba1c1b8 100644
--- a/src/sinks/elasticsearch/encoder.rs
+++ b/src/sinks/elasticsearch/encoder.rs
@@ -2,7 +2,7 @@ use std::{io, io::Write};
 
 use serde::Serialize;
 use vector_buffers::EventCount;
-use vector_core::{config::telemetry, event::Event, ByteSizeOf, EstimatedJsonEncodedSizeOf};
+use vector_lib::{config::telemetry, event::Event, ByteSizeOf, EstimatedJsonEncodedSizeOf};
 use vector_lib::{
     internal_event::TaggedEventsSent,
     json_size::JsonSize,
diff --git a/src/sinks/elasticsearch/integration_tests.rs b/src/sinks/elasticsearch/integration_tests.rs
index 85d603724be28..c218d3069bc50 100644
--- a/src/sinks/elasticsearch/integration_tests.rs
+++ b/src/sinks/elasticsearch/integration_tests.rs
@@ -7,7 +7,7 @@ use futures::StreamExt;
 use futures::{future::ready, stream};
 use http::{Request, StatusCode};
 use serde_json::{json, Value};
-use vector_core::{
+use vector_lib::{
     config::{init_telemetry, log_schema, Tags, Telemetry},
     event::{BatchNotifier, BatchStatus, Event, LogEvent},
 };
diff --git a/src/sinks/elasticsearch/request_builder.rs b/src/sinks/elasticsearch/request_builder.rs
index 0fbbf465e1e74..9d80539a50931 100644
--- a/src/sinks/elasticsearch/request_builder.rs
+++ b/src/sinks/elasticsearch/request_builder.rs
@@ -1,5 +1,5 @@
 use bytes::Bytes;
-use vector_core::EstimatedJsonEncodedSizeOf;
+use vector_lib::EstimatedJsonEncodedSizeOf;
 use vector_lib::{json_size::JsonSize, request_metadata::RequestMetadata};
 
 use crate::{
diff --git a/src/sinks/elasticsearch/service.rs b/src/sinks/elasticsearch/service.rs
index 9f466e582230c..dad9c51c90f07 100644
--- a/src/sinks/elasticsearch/service.rs
+++ b/src/sinks/elasticsearch/service.rs
@@ -9,7 +9,7 @@ use futures::future::BoxFuture;
 use http::{Response, Uri};
 use hyper::{service::Service, Body, Request};
 use tower::ServiceExt;
-use vector_core::ByteSizeOf;
+use vector_lib::ByteSizeOf;
 use vector_lib::{
     json_size::JsonSize,
     request_metadata::{GroupedCountByteSize, MetaDescriptive, RequestMetadata},
diff --git a/src/sinks/file/mod.rs b/src/sinks/file/mod.rs
index 3a2261e517b3e..9dadb7a9a6f31 100644
--- a/src/sinks/file/mod.rs
+++ b/src/sinks/file/mod.rs
@@ -20,7 +20,7 @@ use tokio::{
 };
 use tokio_util::codec::Encoder as _;
 use vector_config::configurable_component;
-use vector_core::{
+use vector_lib::{
     internal_event::{CountByteSize, EventsSent, InternalEventHandle as _, Output, Registered},
     EstimatedJsonEncodedSizeOf,
 };
@@ -427,7 +427,7 @@ mod tests {
 
     use futures::{stream, SinkExt};
     use similar_asserts::assert_eq;
-    use vector_core::{event::LogEvent, sink::VectorSink};
+    use vector_lib::{event::LogEvent, sink::VectorSink};
 
     use super::*;
     use crate::{
diff --git a/src/sinks/gcp/chronicle_unstructured.rs b/src/sinks/gcp/chronicle_unstructured.rs
index 76ce1324d18fc..30e6277105e35 100644
--- a/src/sinks/gcp/chronicle_unstructured.rs
+++ b/src/sinks/gcp/chronicle_unstructured.rs
@@ -13,13 +13,13 @@ use std::io;
 use tokio_util::codec::Encoder as _;
 use tower::{Service, ServiceBuilder};
 use vector_config::configurable_component;
-use vector_core::{
+use vector_lib::request_metadata::{GroupedCountByteSize, MetaDescriptive, RequestMetadata};
+use vector_lib::{
     config::{telemetry, AcknowledgementsConfig, Input},
     event::{Event, EventFinalizers, Finalizable},
     sink::VectorSink,
     EstimatedJsonEncodedSizeOf,
 };
-use vector_lib::request_metadata::{GroupedCountByteSize, MetaDescriptive, RequestMetadata};
 use vrl::value::Kind;
 
 use crate::{
@@ -512,7 +512,7 @@ impl Service<ChronicleRequest> for ChronicleService {
 mod integration_tests {
     use reqwest::{Client, Method, Response};
     use serde::{Deserialize, Serialize};
-    use vector_core::event::{BatchNotifier, BatchStatus};
+    use vector_lib::event::{BatchNotifier, BatchStatus};
 
     use super::*;
     use crate::test_util::{
diff --git a/src/sinks/gcp/cloud_storage.rs b/src/sinks/gcp/cloud_storage.rs
index 9d2185f53ad79..1c2c0e0acea5e 100644
--- a/src/sinks/gcp/cloud_storage.rs
+++ b/src/sinks/gcp/cloud_storage.rs
@@ -11,7 +11,7 @@ use snafu::Snafu;
 use tower::ServiceBuilder;
 use uuid::Uuid;
 use vector_config::configurable_component;
-use vector_core::event::{EventFinalizers, Finalizable};
+use vector_lib::event::{EventFinalizers, Finalizable};
 use vector_lib::request_metadata::RequestMetadata;
 
 use crate::sinks::util::metadata::RequestMetadataBuilder;
@@ -410,9 +410,9 @@ mod tests {
     use codecs::encoding::FramingConfig;
     use codecs::{JsonSerializerConfig, NewlineDelimitedEncoderConfig, TextSerializerConfig};
     use futures_util::{future::ready, stream};
-    use vector_core::partition::Partitioner;
-    use vector_core::EstimatedJsonEncodedSizeOf;
+    use vector_lib::partition::Partitioner;
     use vector_lib::request_metadata::GroupedCountByteSize;
+    use vector_lib::EstimatedJsonEncodedSizeOf;
 
     use crate::event::LogEvent;
     use crate::test_util::{
diff --git a/src/sinks/gcp/pubsub.rs b/src/sinks/gcp/pubsub.rs
index c7c562999d1e9..4660e32040a7d 100644
--- a/src/sinks/gcp/pubsub.rs
+++ b/src/sinks/gcp/pubsub.rs
@@ -272,7 +272,7 @@ mod integration_tests {
     use reqwest::{Client, Method, Response};
     use serde::{Deserialize, Serialize};
     use serde_json::{json, Value};
-    use vector_core::event::{BatchNotifier, BatchStatus};
+    use vector_lib::event::{BatchNotifier, BatchStatus};
 
     use super::*;
     use crate::gcp;
diff --git a/src/sinks/gcp/stackdriver/logs/mod.rs b/src/sinks/gcp/stackdriver/logs/mod.rs
index 5f5ca2cf03ae5..86ebb3802a220 100644
--- a/src/sinks/gcp/stackdriver/logs/mod.rs
+++ b/src/sinks/gcp/stackdriver/logs/mod.rs
@@ -1,7 +1,7 @@
-//! The GCP Stackdriver Logs [`vector_core::sink::VectorSink`].
+//! The GCP Stackdriver Logs [`vector_lib::sink::VectorSink`].
 //!
-//! This module contains the [`vector_core::sink::VectorSink`] instance that is responsible for
-//! taking a stream of [`vector_core::event::Event`]s and forwarding them to the GCP
+//! This module contains the [`vector_lib::sink::VectorSink`] instance that is responsible for
+//! taking a stream of [`vector_lib::event::Event`]s and forwarding them to the GCP
 //! Stackdriver service.
 
 mod config;
diff --git a/src/sinks/gcp/stackdriver/metrics/request_builder.rs b/src/sinks/gcp/stackdriver/metrics/request_builder.rs
index 12e4526f055f5..ababa8c598cc5 100644
--- a/src/sinks/gcp/stackdriver/metrics/request_builder.rs
+++ b/src/sinks/gcp/stackdriver/metrics/request_builder.rs
@@ -2,7 +2,7 @@ use std::io;
 
 use bytes::Bytes;
 use chrono::Utc;
-use vector_core::event::{Metric, MetricValue};
+use vector_lib::event::{Metric, MetricValue};
 
 use crate::sinks::{gcp, prelude::*, util::http::HttpRequest};
 
diff --git a/src/sinks/gcp/stackdriver/metrics/sink.rs b/src/sinks/gcp/stackdriver/metrics/sink.rs
index 91ba22a640824..e87e69dcbe1b7 100644
--- a/src/sinks/gcp/stackdriver/metrics/sink.rs
+++ b/src/sinks/gcp/stackdriver/metrics/sink.rs
@@ -1,4 +1,4 @@
-use vector_core::event::{Metric, MetricValue};
+use vector_lib::event::{Metric, MetricValue};
 
 use crate::sinks::{
     prelude::*,
diff --git a/src/sinks/gcp/stackdriver/metrics/tests.rs b/src/sinks/gcp/stackdriver/metrics/tests.rs
index a27194f1900e4..391803a741ae9 100644
--- a/src/sinks/gcp/stackdriver/metrics/tests.rs
+++ b/src/sinks/gcp/stackdriver/metrics/tests.rs
@@ -1,7 +1,7 @@
 use chrono::Utc;
 use futures::{future::ready, stream};
 use serde::Deserialize;
-use vector_core::event::{Metric, MetricKind, MetricValue};
+use vector_lib::event::{Metric, MetricKind, MetricValue};
 
 use super::config::StackdriverConfig;
 use crate::{
diff --git a/src/sinks/greptimedb/batch.rs b/src/sinks/greptimedb/batch.rs
index d5bf70c47505f..e69bc17157001 100644
--- a/src/sinks/greptimedb/batch.rs
+++ b/src/sinks/greptimedb/batch.rs
@@ -1,4 +1,4 @@
-use vector_core::event::{Metric, MetricValue};
+use vector_lib::event::{Metric, MetricValue};
 use vector_stream::batcher::limiter::ItemBatchSize;
 
 use super::request_builder::{
diff --git a/src/sinks/greptimedb/integration_tests.rs b/src/sinks/greptimedb/integration_tests.rs
index 598c49e1b1e23..6b342a0e455fa 100644
--- a/src/sinks/greptimedb/integration_tests.rs
+++ b/src/sinks/greptimedb/integration_tests.rs
@@ -1,7 +1,7 @@
 use chrono::{DateTime, Duration, Utc};
 use futures::stream;
-use vector_core::event::{Event, Metric, MetricKind, MetricValue};
-use vector_core::metric_tags;
+use vector_lib::event::{Event, Metric, MetricKind, MetricValue};
+use vector_lib::metric_tags;
 
 use crate::sinks::util::test::load_sink;
 use crate::{
diff --git a/src/sinks/greptimedb/request_builder.rs b/src/sinks/greptimedb/request_builder.rs
index 06c92059c6f4e..350aaaa6c9b1f 100644
--- a/src/sinks/greptimedb/request_builder.rs
+++ b/src/sinks/greptimedb/request_builder.rs
@@ -1,9 +1,9 @@
 use chrono::Utc;
 use greptimedb_client::api::v1::column::*;
 use greptimedb_client::api::v1::*;
-use vector_core::event::metric::{Bucket, MetricSketch, Quantile, Sample};
-use vector_core::event::{Metric, MetricValue};
-use vector_core::metrics::AgentDDSketch;
+use vector_lib::event::metric::{Bucket, MetricSketch, Quantile, Sample};
+use vector_lib::event::{Metric, MetricValue};
+use vector_lib::metrics::AgentDDSketch;
 
 use crate::sinks::util::statistic::DistributionStatistic;
 
@@ -253,7 +253,7 @@ mod tests {
             "cpu_seconds_total",
             MetricKind::Incremental,
             MetricValue::Distribution {
-                samples: vector_core::samples![1.0 => 2, 2.0 => 4, 3.0 => 2],
+                samples: vector_lib::samples![1.0 => 2, 2.0 => 4, 3.0 => 2],
                 statistic: StatisticKind::Histogram,
             },
         );
@@ -277,7 +277,7 @@ mod tests {
 
     #[test]
     fn test_histogram() {
-        let buckets = vector_core::buckets![1.0 => 1, 2.0 => 2, 3.0 => 1];
+        let buckets = vector_lib::buckets![1.0 => 1, 2.0 => 2, 3.0 => 1];
         let buckets_len = buckets.len();
         let metric = Metric::new(
             "cpu_seconds_total",
@@ -303,7 +303,7 @@ mod tests {
 
     #[test]
     fn test_summary() {
-        let quantiles = vector_core::quantiles![0.01 => 1.5, 0.5 => 2.0, 0.99 => 3.0];
+        let quantiles = vector_lib::quantiles![0.01 => 1.5, 0.5 => 2.0, 0.99 => 3.0];
         let quantiles_len = quantiles.len();
         let metric = Metric::new(
             "cpu_seconds_total",
diff --git a/src/sinks/greptimedb/service.rs b/src/sinks/greptimedb/service.rs
index 6f8278b55d598..6045ed2ff2271 100644
--- a/src/sinks/greptimedb/service.rs
+++ b/src/sinks/greptimedb/service.rs
@@ -6,7 +6,7 @@ use greptimedb_client::api::v1::auth_header::AuthScheme;
 use greptimedb_client::api::v1::*;
 use greptimedb_client::channel_manager::*;
 use greptimedb_client::{Client, Database, Error as GreptimeError};
-use vector_core::event::Metric;
+use vector_lib::event::Metric;
 
 use crate::sinks::prelude::*;
 
diff --git a/src/sinks/greptimedb/sink.rs b/src/sinks/greptimedb/sink.rs
index b4b36a10bf5db..8268fd341c7c0 100644
--- a/src/sinks/greptimedb/sink.rs
+++ b/src/sinks/greptimedb/sink.rs
@@ -2,7 +2,7 @@ use async_trait::async_trait;
 
 use futures::StreamExt;
 use futures_util::stream::BoxStream;
-use vector_core::event::{Metric, MetricValue};
+use vector_lib::event::{Metric, MetricValue};
 
 use crate::sinks::prelude::*;
 use crate::sinks::util::buffer::metrics::MetricNormalize;
diff --git a/src/sinks/honeycomb/mod.rs b/src/sinks/honeycomb/mod.rs
index e93745194e92d..4debfe1e7a741 100644
--- a/src/sinks/honeycomb/mod.rs
+++ b/src/sinks/honeycomb/mod.rs
@@ -1,7 +1,7 @@
-//! The Honeycomb [`vector_core::sink::VectorSink`].
+//! The Honeycomb [`vector_lib::sink::VectorSink`].
 //!
-//! This module contains the [`vector_core::sink::VectorSink`] instance that is responsible for
-//! taking a stream of [`vector_core::event::Event`]s and forwarding them to the Honeycomb service.
+//! This module contains the [`vector_lib::sink::VectorSink`] instance that is responsible for
+//! taking a stream of [`vector_lib::event::Event`]s and forwarding them to the Honeycomb service.
 
 mod config;
 mod encoder;
diff --git a/src/sinks/http/batch.rs b/src/sinks/http/batch.rs
index 244d90e20df44..19ee7230b39bd 100644
--- a/src/sinks/http/batch.rs
+++ b/src/sinks/http/batch.rs
@@ -1,7 +1,7 @@
 //! Batch settings for the `http` sink.
 
 use codecs::encoding::Framer;
-use vector_core::{event::Event, ByteSizeOf, EstimatedJsonEncodedSizeOf};
+use vector_lib::{event::Event, ByteSizeOf, EstimatedJsonEncodedSizeOf};
 use vector_stream::batcher::limiter::ItemBatchSize;
 
 use crate::codecs::Encoder;
diff --git a/src/sinks/http/mod.rs b/src/sinks/http/mod.rs
index 8b4680e9f41cb..d3b8c6a83d33a 100644
--- a/src/sinks/http/mod.rs
+++ b/src/sinks/http/mod.rs
@@ -1,7 +1,7 @@
-//! The HTTP [`vector_core::sink::VectorSink`].
+//! The HTTP [`vector_lib::sink::VectorSink`].
 //!
-//! This module contains the [`vector_core::sink::VectorSink`] instance that is responsible for
-//! taking a stream of [`vector_core::event::Event`]s and forwarding them to an HTTP server.
+//! This module contains the [`vector_lib::sink::VectorSink`] instance that is responsible for
+//! taking a stream of [`vector_lib::event::Event`]s and forwarding them to an HTTP server.
 
 mod batch;
 mod config;
diff --git a/src/sinks/http/tests.rs b/src/sinks/http/tests.rs
index 4cda846156d64..4953c1d86ff2e 100644
--- a/src/sinks/http/tests.rs
+++ b/src/sinks/http/tests.rs
@@ -17,7 +17,7 @@ use http::request::Parts;
 use hyper::{Body, Method, Response, StatusCode};
 use serde::{de, Deserialize};
 
-use vector_core::event::{BatchNotifier, BatchStatus, Event, LogEvent};
+use vector_lib::event::{BatchNotifier, BatchStatus, Event, LogEvent};
 
 use crate::{
     assert_downcast_matches,
diff --git a/src/sinks/humio/metrics.rs b/src/sinks/humio/metrics.rs
index 2b9248eb26f85..e7a11424b4df3 100644
--- a/src/sinks/humio/metrics.rs
+++ b/src/sinks/humio/metrics.rs
@@ -5,8 +5,8 @@ use futures_util::stream::BoxStream;
 use indoc::indoc;
 use lookup::lookup_v2::{ConfigValuePath, OptionalValuePath};
 use vector_config::configurable_component;
-use vector_core::sink::StreamSink;
 use vector_lib::sensitive_string::SensitiveString;
+use vector_lib::sink::StreamSink;
 
 use super::{
     config_host_key,
@@ -227,7 +227,7 @@ mod tests {
     use futures::stream;
     use indoc::indoc;
     use similar_asserts::assert_eq;
-    use vector_core::metric_tags;
+    use vector_lib::metric_tags;
 
     use super::*;
     use crate::{
@@ -305,7 +305,7 @@ mod tests {
                     "metric2",
                     MetricKind::Absolute,
                     MetricValue::Distribution {
-                        samples: vector_core::samples![1.0 => 100, 2.0 => 200, 3.0 => 300],
+                        samples: vector_lib::samples![1.0 => 100, 2.0 => 200, 3.0 => 300],
                         statistic: StatisticKind::Histogram,
                     },
                 )
diff --git a/src/sinks/influxdb/logs.rs b/src/sinks/influxdb/logs.rs
index f84b75daef9a6..30cbf6e1fd79a 100644
--- a/src/sinks/influxdb/logs.rs
+++ b/src/sinks/influxdb/logs.rs
@@ -11,8 +11,8 @@ use vrl::value::Kind;
 use lookup::lookup_v2::OptionalValuePath;
 use lookup::PathPrefix;
 use vector_config::configurable_component;
-use vector_core::config::log_schema;
-use vector_core::schema;
+use vector_lib::config::log_schema;
+use vector_lib::schema;
 
 use crate::{
     codecs::Transformer,
@@ -404,7 +404,7 @@ mod tests {
     use indoc::indoc;
 
     use lookup::owned_value_path;
-    use vector_core::event::{BatchNotifier, BatchStatus, Event, LogEvent};
+    use vector_lib::event::{BatchNotifier, BatchStatus, Event, LogEvent};
 
     use crate::{
         sinks::{
@@ -883,8 +883,8 @@ mod integration_tests {
 
     use codecs::BytesDeserializerConfig;
     use lookup::{owned_value_path, path};
-    use vector_core::config::{LegacyKey, LogNamespace};
-    use vector_core::event::{BatchNotifier, BatchStatus, Event, LogEvent};
+    use vector_lib::config::{LegacyKey, LogNamespace};
+    use vector_lib::event::{BatchNotifier, BatchStatus, Event, LogEvent};
 
     use crate::{
         config::SinkContext,
diff --git a/src/sinks/influxdb/metrics.rs b/src/sinks/influxdb/metrics.rs
index 31faab4ffe644..0b8669a66c175 100644
--- a/src/sinks/influxdb/metrics.rs
+++ b/src/sinks/influxdb/metrics.rs
@@ -5,7 +5,7 @@ use futures::{future::BoxFuture, stream, SinkExt};
 use serde::Serialize;
 use tower::Service;
 use vector_config::configurable_component;
-use vector_core::{
+use vector_lib::{
     event::metric::{MetricSketch, MetricTags, Quantile},
     ByteSizeOf, EstimatedJsonEncodedSizeOf,
 };
@@ -543,7 +543,7 @@ mod tests {
             "requests",
             MetricKind::Absolute,
             MetricValue::AggregatedHistogram {
-                buckets: vector_core::buckets![1.0 => 1, 2.1 => 2, 3.0 => 3],
+                buckets: vector_lib::buckets![1.0 => 1, 2.1 => 2, 3.0 => 3],
                 count: 6,
                 sum: 12.5,
             },
@@ -584,7 +584,7 @@ mod tests {
             "requests",
             MetricKind::Absolute,
             MetricValue::AggregatedHistogram {
-                buckets: vector_core::buckets![1.0 => 1, 2.1 => 2, 3.0 => 3],
+                buckets: vector_lib::buckets![1.0 => 1, 2.1 => 2, 3.0 => 3],
                 count: 6,
                 sum: 12.5,
             },
@@ -625,7 +625,7 @@ mod tests {
             "requests_sum",
             MetricKind::Absolute,
             MetricValue::AggregatedSummary {
-                quantiles: vector_core::quantiles![0.01 => 1.5, 0.5 => 2.0, 0.99 => 3.0],
+                quantiles: vector_lib::quantiles![0.01 => 1.5, 0.5 => 2.0, 0.99 => 3.0],
                 count: 6,
                 sum: 12.0,
             },
@@ -666,7 +666,7 @@ mod tests {
             "requests_sum",
             MetricKind::Absolute,
             MetricValue::AggregatedSummary {
-                quantiles: vector_core::quantiles![0.01 => 1.5, 0.5 => 2.0, 0.99 => 3.0],
+                quantiles: vector_lib::quantiles![0.01 => 1.5, 0.5 => 2.0, 0.99 => 3.0],
                 count: 6,
                 sum: 12.0,
             },
@@ -708,7 +708,7 @@ mod tests {
                 "requests",
                 MetricKind::Incremental,
                 MetricValue::Distribution {
-                    samples: vector_core::samples![1.0 => 3, 2.0 => 3, 3.0 => 2],
+                    samples: vector_lib::samples![1.0 => 3, 2.0 => 3, 3.0 => 2],
                     statistic: StatisticKind::Histogram,
                 },
             )
@@ -835,7 +835,7 @@ mod tests {
             "requests",
             MetricKind::Incremental,
             MetricValue::Distribution {
-                samples: vector_core::samples![1.0 => 0, 2.0 => 0],
+                samples: vector_lib::samples![1.0 => 0, 2.0 => 0],
                 statistic: StatisticKind::Histogram,
             },
         )
@@ -853,7 +853,7 @@ mod tests {
             "requests",
             MetricKind::Incremental,
             MetricValue::Distribution {
-                samples: vector_core::samples![1.0 => 3, 2.0 => 3, 3.0 => 2],
+                samples: vector_lib::samples![1.0 => 3, 2.0 => 3, 3.0 => 2],
                 statistic: StatisticKind::Summary,
             },
         )
@@ -953,7 +953,7 @@ mod integration_tests {
     use chrono::{SecondsFormat, Utc};
     use futures::stream;
     use similar_asserts::assert_eq;
-    use vector_core::metric_tags;
+    use vector_lib::metric_tags;
 
     use crate::{
         config::{SinkConfig, SinkContext},
diff --git a/src/sinks/influxdb/mod.rs b/src/sinks/influxdb/mod.rs
index 090fdc4f46518..9928d32797885 100644
--- a/src/sinks/influxdb/mod.rs
+++ b/src/sinks/influxdb/mod.rs
@@ -10,7 +10,7 @@ use http::{StatusCode, Uri};
 use snafu::{ResultExt, Snafu};
 use tower::Service;
 use vector_config::configurable_component;
-use vector_core::event::MetricTags;
+use vector_lib::event::MetricTags;
 use vector_lib::sensitive_string::SensitiveString;
 
 use crate::http::HttpClient;
@@ -380,7 +380,7 @@ pub mod test_util {
     use std::{fs::File, io::Read};
 
     use chrono::{offset::TimeZone, DateTime, SecondsFormat, Timelike, Utc};
-    use vector_core::metric_tags;
+    use vector_lib::metric_tags;
 
     use super::*;
     use crate::tls;
diff --git a/src/sinks/kafka/tests.rs b/src/sinks/kafka/tests.rs
index fee36ca9af5eb..e7cd3d221db48 100644
--- a/src/sinks/kafka/tests.rs
+++ b/src/sinks/kafka/tests.rs
@@ -19,7 +19,7 @@ mod integration_test {
         message::Headers,
         Message, Offset, TopicPartitionList,
     };
-    use vector_core::{
+    use vector_lib::{
         config::{init_telemetry, Tags, Telemetry},
         event::{BatchNotifier, BatchStatus},
     };
diff --git a/src/sinks/loki/event.rs b/src/sinks/loki/event.rs
index bae1fa3d2448e..45239a57efbf0 100644
--- a/src/sinks/loki/event.rs
+++ b/src/sinks/loki/event.rs
@@ -3,7 +3,7 @@ use std::{collections::HashMap, io};
 use crate::sinks::{prelude::*, util::encoding::Encoder};
 use bytes::Bytes;
 use serde::{ser::SerializeSeq, Serialize};
-use vector_core::config::telemetry;
+use vector_lib::config::telemetry;
 
 pub type Labels = Vec<(String, String)>;
 
diff --git a/src/sinks/loki/integration_tests.rs b/src/sinks/loki/integration_tests.rs
index 20d4e2441a50e..3fb9f66ca6481 100644
--- a/src/sinks/loki/integration_tests.rs
+++ b/src/sinks/loki/integration_tests.rs
@@ -5,11 +5,11 @@ use bytes::Bytes;
 use chrono::{DateTime, Duration, Utc};
 use futures::stream;
 use lookup::owned_value_path;
-use vector_core::{
+use vector_lib::encode_logfmt;
+use vector_lib::{
     config::{init_telemetry, LogNamespace, Tags, Telemetry},
     event::{BatchNotifier, BatchStatus, Event, LogEvent},
 };
-use vector_lib::encode_logfmt;
 use vrl::value::{kind::Collection, Kind};
 
 use super::config::{LokiConfig, OutOfOrderAction};
diff --git a/src/sinks/loki/sink.rs b/src/sinks/loki/sink.rs
index 1b0d45bb3092b..b2362b16fa956 100644
--- a/src/sinks/loki/sink.rs
+++ b/src/sinks/loki/sink.rs
@@ -522,7 +522,7 @@ mod tests {
 
     use codecs::JsonSerializerConfig;
     use futures::stream::StreamExt;
-    use vector_core::event::{Event, LogEvent, Value};
+    use vector_lib::event::{Event, LogEvent, Value};
 
     use super::{EventEncoder, KeyPartitioner, RecordFilter};
     use crate::{
diff --git a/src/sinks/loki/tests.rs b/src/sinks/loki/tests.rs
index cf34b729684c1..281e61682c7f1 100644
--- a/src/sinks/loki/tests.rs
+++ b/src/sinks/loki/tests.rs
@@ -1,4 +1,4 @@
-use vector_core::config::proxy::ProxyConfig;
+use vector_lib::config::proxy::ProxyConfig;
 
 use super::{config::LokiConfig, healthcheck::healthcheck, sink::LokiSink};
 use crate::{
diff --git a/src/sinks/mezmo.rs b/src/sinks/mezmo.rs
index b25864db37134..599201d01702d 100644
--- a/src/sinks/mezmo.rs
+++ b/src/sinks/mezmo.rs
@@ -402,7 +402,7 @@ mod tests {
     use futures_util::stream;
     use http::{request::Parts, StatusCode};
     use serde_json::json;
-    use vector_core::event::{BatchNotifier, BatchStatus, Event, LogEvent};
+    use vector_lib::event::{BatchNotifier, BatchStatus, Event, LogEvent};
 
     use super::*;
     use crate::{
diff --git a/src/sinks/mod.rs b/src/sinks/mod.rs
index 1a5b03e06c63e..2ccd4c3f9818a 100644
--- a/src/sinks/mod.rs
+++ b/src/sinks/mod.rs
@@ -100,7 +100,7 @@ pub mod webhdfs;
 #[cfg(feature = "sinks-websocket")]
 pub mod websocket;
 
-pub use vector_core::{config::Input, sink::VectorSink};
+pub use vector_lib::{config::Input, sink::VectorSink};
 
 pub type Healthcheck = BoxFuture<'static, crate::Result<()>>;
 
diff --git a/src/sinks/nats/config.rs b/src/sinks/nats/config.rs
index 4ce334cda070a..28f5b1a08e251 100644
--- a/src/sinks/nats/config.rs
+++ b/src/sinks/nats/config.rs
@@ -1,7 +1,7 @@
 use codecs::JsonSerializerConfig;
 use futures_util::TryFutureExt;
 use snafu::ResultExt;
-use vector_core::tls::TlsEnableableConfig;
+use vector_lib::tls::TlsEnableableConfig;
 
 use crate::{
     nats::{from_tls_auth_config, NatsAuthConfig, NatsConfigError},
diff --git a/src/sinks/nats/request_builder.rs b/src/sinks/nats/request_builder.rs
index 6ff785b15a28e..0709d391b060d 100644
--- a/src/sinks/nats/request_builder.rs
+++ b/src/sinks/nats/request_builder.rs
@@ -2,7 +2,7 @@ use std::io;
 
 use bytes::{Bytes, BytesMut};
 use tokio_util::codec::Encoder as _;
-use vector_core::config::telemetry;
+use vector_lib::config::telemetry;
 
 use crate::sinks::prelude::*;
 
diff --git a/src/sinks/new_relic/encoding.rs b/src/sinks/new_relic/encoding.rs
index f103369c89cde..8ad282b47f462 100644
--- a/src/sinks/new_relic/encoding.rs
+++ b/src/sinks/new_relic/encoding.rs
@@ -1,8 +1,8 @@
 use std::{io, sync::Arc};
 
 use serde::Serialize;
-use vector_core::{config::telemetry, event::Event, EstimatedJsonEncodedSizeOf};
 use vector_lib::request_metadata::GroupedCountByteSize;
+use vector_lib::{config::telemetry, event::Event, EstimatedJsonEncodedSizeOf};
 
 use super::{
     EventsApiModel, LogsApiModel, MetricsApiModel, NewRelicApi, NewRelicApiModel,
diff --git a/src/sinks/new_relic/tests.rs b/src/sinks/new_relic/tests.rs
index c433e9dd27a78..69fd59898df78 100644
--- a/src/sinks/new_relic/tests.rs
+++ b/src/sinks/new_relic/tests.rs
@@ -3,7 +3,7 @@ use std::{collections::HashMap, convert::TryFrom, num::NonZeroU32, time::SystemT
 use chrono::{DateTime, Utc};
 use futures::{future::ready, stream};
 use serde::Deserialize;
-use vector_core::config::{init_telemetry, Tags, Telemetry};
+use vector_lib::config::{init_telemetry, Tags, Telemetry};
 
 use super::*;
 use crate::{
diff --git a/src/sinks/papertrail.rs b/src/sinks/papertrail.rs
index bf2c45c6710b1..557eb0c339c01 100644
--- a/src/sinks/papertrail.rs
+++ b/src/sinks/papertrail.rs
@@ -189,7 +189,7 @@ mod tests {
     use codecs::JsonSerializerConfig;
     use futures::{future::ready, stream};
     use tokio_util::codec::Encoder as _;
-    use vector_core::event::{Event, LogEvent};
+    use vector_lib::event::{Event, LogEvent};
 
     use crate::test_util::{
         components::{run_and_assert_sink_compliance, SINK_TAGS},
diff --git a/src/sinks/prelude.rs b/src/sinks/prelude.rs
index 1d20c67edfc7b..5139bcb2f353d 100644
--- a/src/sinks/prelude.rs
+++ b/src/sinks/prelude.rs
@@ -6,7 +6,7 @@ pub use futures::{future, future::BoxFuture, stream::BoxStream, FutureExt, Strea
 pub use tower::{Service, ServiceBuilder};
 pub use vector_buffers::EventCount;
 pub use vector_config::configurable_component;
-pub use vector_core::{
+pub use vector_lib::{
     config::{telemetry, AcknowledgementsConfig, Input},
     event::Value,
     partition::Partitioner,
diff --git a/src/sinks/prometheus/collector.rs b/src/sinks/prometheus/collector.rs
index d5429259e8dee..7d26b21d58429 100644
--- a/src/sinks/prometheus/collector.rs
+++ b/src/sinks/prometheus/collector.rs
@@ -3,7 +3,7 @@ use std::{collections::BTreeMap, fmt::Write as _};
 use chrono::Utc;
 use indexmap::map::IndexMap;
 use prometheus_parser::{proto, METRIC_NAME_LABEL};
-use vector_core::event::metric::{samples_to_buckets, MetricSketch, MetricTags, Quantile};
+use vector_lib::event::metric::{samples_to_buckets, MetricSketch, MetricTags, Quantile};
 
 use crate::{
     event::metric::{Metric, MetricKind, MetricValue, StatisticKind},
@@ -440,7 +440,7 @@ mod tests {
     use chrono::{DateTime, TimeZone, Timelike};
     use indoc::indoc;
     use similar_asserts::assert_eq;
-    use vector_core::metric_tags;
+    use vector_lib::metric_tags;
 
     use super::{super::default_summary_quantiles, *};
     use crate::{
@@ -668,7 +668,7 @@ mod tests {
             "requests".to_owned(),
             MetricKind::Absolute,
             MetricValue::Distribution {
-                samples: vector_core::samples![1.0 => 3, 2.0 => 3, 3.0 => 2],
+                samples: vector_lib::samples![1.0 => 3, 2.0 => 3, 3.0 => 2],
                 statistic: StatisticKind::Histogram,
             },
         )
@@ -803,7 +803,7 @@ mod tests {
             "requests".to_owned(),
             MetricKind::Absolute,
             MetricValue::AggregatedSummary {
-                quantiles: vector_core::quantiles![0.01 => 1.5, 0.5 => 2.0, 0.99 => 3.0],
+                quantiles: vector_lib::quantiles![0.01 => 1.5, 0.5 => 2.0, 0.99 => 3.0],
                 count: 6,
                 sum: 12.0,
             },
@@ -860,7 +860,7 @@ mod tests {
             "requests".to_owned(),
             MetricKind::Absolute,
             MetricValue::Distribution {
-                samples: vector_core::samples![1.0 => 3, 2.0 => 3, 3.0 => 2],
+                samples: vector_lib::samples![1.0 => 3, 2.0 => 3, 3.0 => 2],
                 statistic: StatisticKind::Summary,
             },
         )
diff --git a/src/sinks/prometheus/exporter.rs b/src/sinks/prometheus/exporter.rs
index f71ad1c42fa85..e047b53043c46 100644
--- a/src/sinks/prometheus/exporter.rs
+++ b/src/sinks/prometheus/exporter.rs
@@ -21,7 +21,7 @@ use snafu::Snafu;
 use stream_cancel::{Trigger, Tripwire};
 use tracing::{Instrument, Span};
 use vector_config::configurable_component;
-use vector_core::{
+use vector_lib::{
     internal_event::{
         ByteSize, BytesSent, CountByteSize, EventsSent, InternalEventHandle as _, Output, Protocol,
         Registered,
@@ -608,7 +608,7 @@ mod tests {
     use indoc::indoc;
     use similar_asserts::assert_eq;
     use tokio::{sync::oneshot::error::TryRecvError, time};
-    use vector_core::{
+    use vector_lib::{
         event::{MetricTags, StatisticKind},
         metric_tags, samples,
     };
diff --git a/src/sinks/prometheus/mod.rs b/src/sinks/prometheus/mod.rs
index dc1b3f1991db8..1e8508ac935d1 100644
--- a/src/sinks/prometheus/mod.rs
+++ b/src/sinks/prometheus/mod.rs
@@ -1,5 +1,5 @@
 #[cfg(test)]
-use vector_core::event::Metric;
+use vector_lib::event::Metric;
 use vector_lib::sensitive_string::SensitiveString;
 
 mod collector;
diff --git a/src/sinks/prometheus/remote_write/mod.rs b/src/sinks/prometheus/remote_write/mod.rs
index 3442c88de812f..3ebda7df8bf18 100644
--- a/src/sinks/prometheus/remote_write/mod.rs
+++ b/src/sinks/prometheus/remote_write/mod.rs
@@ -6,7 +6,7 @@
 //! [remote_write]: https://prometheus.io/docs/concepts/remote_write_spec/
 
 use snafu::prelude::*;
-use vector_core::event::Metric;
+use vector_lib::event::Metric;
 
 use crate::sinks::{
     prelude::*,
diff --git a/src/sinks/prometheus/remote_write/request_builder.rs b/src/sinks/prometheus/remote_write/request_builder.rs
index a2e156c42cfb8..716923edd381b 100644
--- a/src/sinks/prometheus/remote_write/request_builder.rs
+++ b/src/sinks/prometheus/remote_write/request_builder.rs
@@ -2,7 +2,7 @@ use std::io;
 
 use bytes::{Bytes, BytesMut};
 use prost::Message;
-use vector_core::{config::telemetry, event::Metric};
+use vector_lib::{config::telemetry, event::Metric};
 
 use crate::sinks::{
     prelude::*,
diff --git a/src/sinks/prometheus/remote_write/sink.rs b/src/sinks/prometheus/remote_write/sink.rs
index 14545d58c4b57..fdff3b605db9c 100644
--- a/src/sinks/prometheus/remote_write/sink.rs
+++ b/src/sinks/prometheus/remote_write/sink.rs
@@ -1,7 +1,7 @@
 use std::fmt;
 
-use vector_core::event::Metric;
 use vector_lib::byte_size_of::ByteSizeOf;
+use vector_lib::event::Metric;
 use vector_stream::batcher::{data::BatchData, limiter::ByteSizeOfItemSize};
 
 use crate::sinks::{prelude::*, util::buffer::metrics::MetricSet};
diff --git a/src/sinks/prometheus/remote_write/tests.rs b/src/sinks/prometheus/remote_write/tests.rs
index 190d3723bce6d..a9d00cd10a0fa 100644
--- a/src/sinks/prometheus/remote_write/tests.rs
+++ b/src/sinks/prometheus/remote_write/tests.rs
@@ -4,7 +4,7 @@ use http::HeaderMap;
 use indoc::indoc;
 use prometheus_parser::proto;
 use prost::Message;
-use vector_core::metric_tags;
+use vector_lib::metric_tags;
 
 use super::*;
 use crate::{
diff --git a/src/sinks/pulsar/config.rs b/src/sinks/pulsar/config.rs
index 71ea7c6efb521..64f5d6afcbfe2 100644
--- a/src/sinks/pulsar/config.rs
+++ b/src/sinks/pulsar/config.rs
@@ -17,7 +17,7 @@ use pulsar::{
 };
 use pulsar::{error::AuthenticationError, OperationRetryOptions};
 use snafu::ResultExt;
-use vector_core::config::DataType;
+use vector_lib::config::DataType;
 use vector_lib::sensitive_string::SensitiveString;
 use vrl::value::Kind;
 
diff --git a/src/sinks/pulsar/encoder.rs b/src/sinks/pulsar/encoder.rs
index fcd60dd2a4248..fd8fc8b9acd90 100644
--- a/src/sinks/pulsar/encoder.rs
+++ b/src/sinks/pulsar/encoder.rs
@@ -6,8 +6,8 @@ use crate::{
 use bytes::BytesMut;
 use std::io;
 use tokio_util::codec::Encoder as _;
-use vector_core::{config::telemetry, EstimatedJsonEncodedSizeOf};
 use vector_lib::request_metadata::GroupedCountByteSize;
+use vector_lib::{config::telemetry, EstimatedJsonEncodedSizeOf};
 
 #[derive(Clone, Debug)]
 pub(super) struct PulsarEncoder {
diff --git a/src/sinks/pulsar/util.rs b/src/sinks/pulsar/util.rs
index b14500252c8d4..120782f6af3f3 100644
--- a/src/sinks/pulsar/util.rs
+++ b/src/sinks/pulsar/util.rs
@@ -5,7 +5,7 @@ use crate::template::Template;
 use bytes::Bytes;
 use lookup::lookup_v2::OptionalTargetPath;
 use std::collections::HashMap;
-use vector_core::event::Event;
+use vector_lib::event::Event;
 use vrl::value::Value;
 
 /// Transforms an event into a Pulsar event by rendering the required template fields.
diff --git a/src/sinks/redis/integration_tests.rs b/src/sinks/redis/integration_tests.rs
index 577210555361c..38e04eb10776d 100644
--- a/src/sinks/redis/integration_tests.rs
+++ b/src/sinks/redis/integration_tests.rs
@@ -2,7 +2,7 @@ use codecs::JsonSerializerConfig;
 use futures::stream;
 use rand::Rng;
 use redis::AsyncCommands;
-use vector_core::{
+use vector_lib::{
     config::{init_telemetry, Tags, Telemetry},
     event::LogEvent,
 };
diff --git a/src/sinks/redis/request_builder.rs b/src/sinks/redis/request_builder.rs
index f38a1c7de7a81..e4504b0287394 100644
--- a/src/sinks/redis/request_builder.rs
+++ b/src/sinks/redis/request_builder.rs
@@ -1,6 +1,6 @@
 use bytes::BytesMut;
 use tokio_util::codec::Encoder as _;
-use vector_core::config::telemetry;
+use vector_lib::config::telemetry;
 
 use crate::sinks::{prelude::*, util::EncodedLength};
 
diff --git a/src/sinks/redis/tests.rs b/src/sinks/redis/tests.rs
index 5b0bcc6a33a69..e3c20a4e88787 100644
--- a/src/sinks/redis/tests.rs
+++ b/src/sinks/redis/tests.rs
@@ -1,7 +1,7 @@
 use std::collections::HashMap;
 
 use codecs::{JsonSerializerConfig, TextSerializerConfig};
-use vector_core::event::LogEvent;
+use vector_lib::event::LogEvent;
 use vector_lib::request_metadata::GroupedCountByteSize;
 
 use super::{config::RedisSinkConfig, request_builder::encode_event};
diff --git a/src/sinks/s3_common/partitioner.rs b/src/sinks/s3_common/partitioner.rs
index 16d1e636e3d08..b367646982775 100644
--- a/src/sinks/s3_common/partitioner.rs
+++ b/src/sinks/s3_common/partitioner.rs
@@ -1,4 +1,4 @@
-use vector_core::{event::Event, partition::Partitioner};
+use vector_lib::{event::Event, partition::Partitioner};
 
 use crate::{internal_events::TemplateRenderingError, template::Template};
 
diff --git a/src/sinks/s3_common/service.rs b/src/sinks/s3_common/service.rs
index d29bde4ea0c07..f734928dc7f64 100644
--- a/src/sinks/s3_common/service.rs
+++ b/src/sinks/s3_common/service.rs
@@ -11,7 +11,7 @@ use futures::future::BoxFuture;
 use md5::Digest;
 use tower::Service;
 use tracing::Instrument;
-use vector_core::event::{EventFinalizers, EventStatus, Finalizable};
+use vector_lib::event::{EventFinalizers, EventStatus, Finalizable};
 use vector_lib::request_metadata::{GroupedCountByteSize, MetaDescriptive, RequestMetadata};
 use vector_stream::DriverResponse;
 
diff --git a/src/sinks/sematext/metrics.rs b/src/sinks/sematext/metrics.rs
index 2a5d20f3ca22c..2ff9945d3260c 100644
--- a/src/sinks/sematext/metrics.rs
+++ b/src/sinks/sematext/metrics.rs
@@ -7,8 +7,8 @@ use hyper::{Body, Request};
 use indoc::indoc;
 use tower::Service;
 use vector_config::configurable_component;
-use vector_core::{ByteSizeOf, EstimatedJsonEncodedSizeOf};
 use vector_lib::sensitive_string::SensitiveString;
+use vector_lib::{ByteSizeOf, EstimatedJsonEncodedSizeOf};
 
 use super::Region;
 use crate::{
@@ -310,7 +310,7 @@ mod tests {
     use chrono::{offset::TimeZone, Timelike, Utc};
     use futures::StreamExt;
     use indoc::indoc;
-    use vector_core::metric_tags;
+    use vector_lib::metric_tags;
 
     use super::*;
     use crate::{
diff --git a/src/sinks/splunk_hec/common/acknowledgements.rs b/src/sinks/splunk_hec/common/acknowledgements.rs
index 9ef7fb9e9bb09..7ca8ade82782d 100644
--- a/src/sinks/splunk_hec/common/acknowledgements.rs
+++ b/src/sinks/splunk_hec/common/acknowledgements.rs
@@ -9,7 +9,7 @@ use hyper::Body;
 use serde::{Deserialize, Serialize};
 use tokio::sync::{mpsc::Receiver, oneshot::Sender};
 use vector_config::configurable_component;
-use vector_core::event::EventStatus;
+use vector_lib::event::EventStatus;
 
 use super::service::{HttpRequestBuilder, MetadataFields};
 use crate::{
@@ -287,7 +287,7 @@ mod tests {
 
     use futures_util::{stream::FuturesUnordered, StreamExt};
     use tokio::sync::oneshot::{self, Receiver};
-    use vector_core::{config::proxy::ProxyConfig, event::EventStatus};
+    use vector_lib::{config::proxy::ProxyConfig, event::EventStatus};
 
     use super::HecAckClient;
     use crate::{
diff --git a/src/sinks/splunk_hec/common/request.rs b/src/sinks/splunk_hec/common/request.rs
index 9338f3fc883ab..f644107e46676 100644
--- a/src/sinks/splunk_hec/common/request.rs
+++ b/src/sinks/splunk_hec/common/request.rs
@@ -1,11 +1,11 @@
 use std::sync::Arc;
 
 use bytes::Bytes;
-use vector_core::{
+use vector_lib::request_metadata::{MetaDescriptive, RequestMetadata};
+use vector_lib::{
     event::{EventFinalizers, Finalizable},
     ByteSizeOf,
 };
-use vector_lib::request_metadata::{MetaDescriptive, RequestMetadata};
 
 use crate::sinks::util::ElementCount;
 
diff --git a/src/sinks/splunk_hec/common/response.rs b/src/sinks/splunk_hec/common/response.rs
index eb5e61153975c..745c45a9b882c 100644
--- a/src/sinks/splunk_hec/common/response.rs
+++ b/src/sinks/splunk_hec/common/response.rs
@@ -1,4 +1,4 @@
-use vector_core::event::EventStatus;
+use vector_lib::event::EventStatus;
 use vector_lib::request_metadata::GroupedCountByteSize;
 use vector_stream::DriverResponse;
 
diff --git a/src/sinks/splunk_hec/common/service.rs b/src/sinks/splunk_hec/common/service.rs
index 9e1c99af7eb8e..592ec7e0293f4 100644
--- a/src/sinks/splunk_hec/common/service.rs
+++ b/src/sinks/splunk_hec/common/service.rs
@@ -13,7 +13,7 @@ use tokio::sync::{mpsc, oneshot, OwnedSemaphorePermit, Semaphore};
 use tokio_util::sync::PollSemaphore;
 use tower::Service;
 use uuid::Uuid;
-use vector_core::event::EventStatus;
+use vector_lib::event::EventStatus;
 use vector_lib::request_metadata::MetaDescriptive;
 
 use super::{
@@ -282,11 +282,11 @@ mod tests {
     use bytes::Bytes;
     use futures_util::{poll, stream::FuturesUnordered, StreamExt};
     use tower::{util::BoxService, Service, ServiceExt};
-    use vector_core::{
+    use vector_lib::internal_event::CountByteSize;
+    use vector_lib::{
         config::proxy::ProxyConfig,
         event::{EventFinalizers, EventStatus},
     };
-    use vector_lib::internal_event::CountByteSize;
     use wiremock::{
         matchers::{header, header_exists, method, path},
         Mock, MockServer, Request, Respond, ResponseTemplate,
diff --git a/src/sinks/splunk_hec/common/util.rs b/src/sinks/splunk_hec/common/util.rs
index b81974e1d5288..6fc513b788143 100644
--- a/src/sinks/splunk_hec/common/util.rs
+++ b/src/sinks/splunk_hec/common/util.rs
@@ -6,7 +6,7 @@ use http::{Request, StatusCode, Uri};
 use hyper::Body;
 use lookup::lookup_v2::OptionalValuePath;
 use snafu::{ResultExt, Snafu};
-use vector_core::{config::proxy::ProxyConfig, event::EventRef};
+use vector_lib::{config::proxy::ProxyConfig, event::EventRef};
 
 use super::{
     request::HecRequest,
@@ -168,7 +168,7 @@ pub fn render_template_string<'a>(
 mod tests {
     use bytes::Bytes;
     use http::{HeaderValue, Uri};
-    use vector_core::config::proxy::ProxyConfig;
+    use vector_lib::config::proxy::ProxyConfig;
     use wiremock::{
         matchers::{header, method, path},
         Mock, MockServer, ResponseTemplate,
@@ -397,7 +397,7 @@ mod integration_tests {
 
     use http::StatusCode;
     use tokio::time::Duration;
-    use vector_core::config::proxy::ProxyConfig;
+    use vector_lib::config::proxy::ProxyConfig;
     use warp::Filter;
 
     use super::{
diff --git a/src/sinks/splunk_hec/logs/config.rs b/src/sinks/splunk_hec/logs/config.rs
index 4d59ba1a20346..0c5eb42d26ee3 100644
--- a/src/sinks/splunk_hec/logs/config.rs
+++ b/src/sinks/splunk_hec/logs/config.rs
@@ -5,8 +5,8 @@ use futures_util::FutureExt;
 use lookup::lookup_v2::{ConfigValuePath, OptionalValuePath};
 use tower::ServiceBuilder;
 use vector_config::configurable_component;
-use vector_core::sink::VectorSink;
 use vector_lib::sensitive_string::SensitiveString;
+use vector_lib::sink::VectorSink;
 
 use super::{encoder::HecLogsEncoder, request_builder::HecLogsRequestBuilder, sink::HecLogsSink};
 use crate::sinks::splunk_hec::common::config_timestamp_key;
diff --git a/src/sinks/splunk_hec/logs/encoder.rs b/src/sinks/splunk_hec/logs/encoder.rs
index 70fc861da9c73..9f8faa841fde6 100644
--- a/src/sinks/splunk_hec/logs/encoder.rs
+++ b/src/sinks/splunk_hec/logs/encoder.rs
@@ -3,8 +3,8 @@ use std::borrow::Cow;
 use bytes::BytesMut;
 use serde::Serialize;
 use tokio_util::codec::Encoder as _;
-use vector_core::{config::telemetry, EstimatedJsonEncodedSizeOf};
 use vector_lib::request_metadata::GroupedCountByteSize;
+use vector_lib::{config::telemetry, EstimatedJsonEncodedSizeOf};
 
 use super::sink::HecProcessedEvent;
 use crate::{
diff --git a/src/sinks/splunk_hec/logs/integration_tests.rs b/src/sinks/splunk_hec/logs/integration_tests.rs
index 63a3214265824..dca874ea73567 100644
--- a/src/sinks/splunk_hec/logs/integration_tests.rs
+++ b/src/sinks/splunk_hec/logs/integration_tests.rs
@@ -6,7 +6,7 @@ use futures::{future::ready, stream};
 use lookup::lookup_v2::{ConfigValuePath, OptionalValuePath};
 use serde_json::Value as JsonValue;
 use tokio::time::{sleep, Duration};
-use vector_core::{
+use vector_lib::{
     config::{init_telemetry, Tags, Telemetry},
     event::{BatchNotifier, BatchStatus, Event, LogEvent},
 };
diff --git a/src/sinks/splunk_hec/logs/request_builder.rs b/src/sinks/splunk_hec/logs/request_builder.rs
index c03b13725f29a..91d37d7b5ebd1 100644
--- a/src/sinks/splunk_hec/logs/request_builder.rs
+++ b/src/sinks/splunk_hec/logs/request_builder.rs
@@ -1,7 +1,7 @@
 use std::sync::Arc;
 
 use bytes::Bytes;
-use vector_core::event::{EventFinalizers, Finalizable};
+use vector_lib::event::{EventFinalizers, Finalizable};
 use vector_lib::request_metadata::RequestMetadata;
 
 use super::{
diff --git a/src/sinks/splunk_hec/logs/tests.rs b/src/sinks/splunk_hec/logs/tests.rs
index 2cc982aed85f9..9e5851e151f92 100644
--- a/src/sinks/splunk_hec/logs/tests.rs
+++ b/src/sinks/splunk_hec/logs/tests.rs
@@ -6,7 +6,7 @@ use futures_util::StreamExt;
 use lookup::lookup_v2::OptionalValuePath;
 use lookup::{OwnedValuePath, PathPrefix};
 use serde::Deserialize;
-use vector_core::{
+use vector_lib::{
     config::log_schema,
     event::{Event, LogEvent, Value},
 };
diff --git a/src/sinks/splunk_hec/metrics/config.rs b/src/sinks/splunk_hec/metrics/config.rs
index cf73e6102aea2..a8636da1487a5 100644
--- a/src/sinks/splunk_hec/metrics/config.rs
+++ b/src/sinks/splunk_hec/metrics/config.rs
@@ -4,8 +4,8 @@ use futures_util::FutureExt;
 use lookup::lookup_v2::OptionalValuePath;
 use tower::ServiceBuilder;
 use vector_config::configurable_component;
-use vector_core::sink::VectorSink;
 use vector_lib::sensitive_string::SensitiveString;
+use vector_lib::sink::VectorSink;
 
 use super::{request_builder::HecMetricsRequestBuilder, sink::HecMetricsSink};
 use crate::{
diff --git a/src/sinks/splunk_hec/metrics/encoder.rs b/src/sinks/splunk_hec/metrics/encoder.rs
index d96a801a96242..9a2430f48bfc9 100644
--- a/src/sinks/splunk_hec/metrics/encoder.rs
+++ b/src/sinks/splunk_hec/metrics/encoder.rs
@@ -1,8 +1,8 @@
 use std::{collections::BTreeMap, iter};
 
 use serde::Serialize;
-use vector_core::{config::telemetry, EstimatedJsonEncodedSizeOf};
 use vector_lib::request_metadata::GroupedCountByteSize;
+use vector_lib::{config::telemetry, EstimatedJsonEncodedSizeOf};
 
 use super::sink::HecProcessedEvent;
 use crate::{internal_events::SplunkEventEncodeError, sinks::util::encoding::Encoder};
diff --git a/src/sinks/splunk_hec/metrics/integration_tests.rs b/src/sinks/splunk_hec/metrics/integration_tests.rs
index 0cadb38084c02..74fb8ad45ed61 100644
--- a/src/sinks/splunk_hec/metrics/integration_tests.rs
+++ b/src/sinks/splunk_hec/metrics/integration_tests.rs
@@ -3,7 +3,7 @@ use std::convert::TryFrom;
 use futures::{future::ready, stream};
 use lookup::lookup_v2::OptionalValuePath;
 use serde_json::Value as JsonValue;
-use vector_core::{
+use vector_lib::{
     config::{init_telemetry, Tags, Telemetry},
     event::{BatchNotifier, BatchStatus, Event, MetricValue},
     metric_tags,
diff --git a/src/sinks/splunk_hec/metrics/request_builder.rs b/src/sinks/splunk_hec/metrics/request_builder.rs
index aa1cc9aef48a7..d57f4634237ce 100644
--- a/src/sinks/splunk_hec/metrics/request_builder.rs
+++ b/src/sinks/splunk_hec/metrics/request_builder.rs
@@ -1,7 +1,7 @@
 use std::sync::Arc;
 
 use bytes::Bytes;
-use vector_core::event::{EventFinalizers, Finalizable};
+use vector_lib::event::{EventFinalizers, Finalizable};
 use vector_lib::request_metadata::RequestMetadata;
 
 use super::{encoder::HecMetricsEncoder, sink::HecProcessedEvent};
diff --git a/src/sinks/splunk_hec/metrics/sink.rs b/src/sinks/splunk_hec/metrics/sink.rs
index 6f6ad5d74b9dd..5017fa8191c37 100644
--- a/src/sinks/splunk_hec/metrics/sink.rs
+++ b/src/sinks/splunk_hec/metrics/sink.rs
@@ -1,7 +1,7 @@
 use std::{fmt, sync::Arc};
 
 use serde::Serialize;
-use vector_core::event::{Metric, MetricValue};
+use vector_lib::event::{Metric, MetricValue};
 use vrl::path::OwnedValuePath;
 
 use super::request_builder::HecMetricsRequestBuilder;
diff --git a/src/sinks/splunk_hec/metrics/tests.rs b/src/sinks/splunk_hec/metrics/tests.rs
index e068ee26b41fd..7eed102d43a70 100644
--- a/src/sinks/splunk_hec/metrics/tests.rs
+++ b/src/sinks/splunk_hec/metrics/tests.rs
@@ -3,7 +3,7 @@ use std::{collections::BTreeSet, sync::Arc};
 use chrono::{DateTime, Utc};
 use futures_util::StreamExt;
 use serde_json::{json, Value as JsonValue};
-use vector_core::{
+use vector_lib::{
     event::{Event, Metric, MetricKind, MetricValue},
     metric_tags, ByteSizeOf,
 };
diff --git a/src/sinks/statsd/batch.rs b/src/sinks/statsd/batch.rs
index 9aefaed21f5e0..a3b73588f8133 100644
--- a/src/sinks/statsd/batch.rs
+++ b/src/sinks/statsd/batch.rs
@@ -1,4 +1,4 @@
-use vector_core::event::Metric;
+use vector_lib::event::Metric;
 use vector_stream::batcher::limiter::ItemBatchSize;
 
 // This accounts for the separators, the metric type string, the length of the value itself. It can
diff --git a/src/sinks/statsd/config.rs b/src/sinks/statsd/config.rs
index f580ee77abff4..3cfaf5e7d0d20 100644
--- a/src/sinks/statsd/config.rs
+++ b/src/sinks/statsd/config.rs
@@ -2,11 +2,11 @@ use std::net::{IpAddr, Ipv4Addr, SocketAddr};
 
 use async_trait::async_trait;
 use vector_config::{component::GenerateConfig, configurable_component};
-use vector_core::{
+use vector_lib::internal_event::Protocol;
+use vector_lib::{
     config::{AcknowledgementsConfig, Input},
     sink::VectorSink,
 };
-use vector_lib::internal_event::Protocol;
 
 use crate::{
     config::{SinkConfig, SinkContext},
diff --git a/src/sinks/statsd/encoder.rs b/src/sinks/statsd/encoder.rs
index fe3464b6caa1c..a9242a035f895 100644
--- a/src/sinks/statsd/encoder.rs
+++ b/src/sinks/statsd/encoder.rs
@@ -5,7 +5,7 @@ use std::{
 
 use bytes::{BufMut, BytesMut};
 use tokio_util::codec::Encoder;
-use vector_core::event::{Metric, MetricKind, MetricTags, MetricValue, StatisticKind};
+use vector_lib::event::{Metric, MetricKind, MetricTags, MetricValue, StatisticKind};
 
 use crate::{
     internal_events::StatsdInvalidMetricError,
@@ -153,7 +153,7 @@ fn encode_and_write_single_event<V: Display>(
 
 #[cfg(test)]
 mod tests {
-    use vector_core::{
+    use vector_lib::{
         event::{metric::TagValue, MetricTags},
         metric_tags,
     };
@@ -161,7 +161,7 @@ mod tests {
     use super::encode_tags;
 
     #[cfg(feature = "sources-statsd")]
-    use vector_core::event::{Metric, MetricKind, MetricValue, StatisticKind};
+    use vector_lib::event::{Metric, MetricKind, MetricValue, StatisticKind};
 
     #[cfg(feature = "sources-statsd")]
     fn encode_metric(metric: &Metric) -> bytes::BytesMut {
@@ -296,7 +296,7 @@ mod tests {
             "distribution",
             MetricKind::Incremental,
             MetricValue::Distribution {
-                samples: vector_core::samples![1.5 => 1, 1.5 => 1],
+                samples: vector_lib::samples![1.5 => 1, 1.5 => 1],
                 statistic: StatisticKind::Histogram,
             },
         )
@@ -306,7 +306,7 @@ mod tests {
             "distribution",
             MetricKind::Incremental,
             MetricValue::Distribution {
-                samples: vector_core::samples![1.5 => 2],
+                samples: vector_lib::samples![1.5 => 2],
                 statistic: StatisticKind::Histogram,
             },
         )
@@ -324,7 +324,7 @@ mod tests {
             "distribution",
             MetricKind::Incremental,
             MetricValue::Distribution {
-                samples: vector_core::samples![2.5 => 1, 1.5 => 1, 1.5 => 1],
+                samples: vector_lib::samples![2.5 => 1, 1.5 => 1, 1.5 => 1],
                 statistic: StatisticKind::Histogram,
             },
         )
@@ -334,7 +334,7 @@ mod tests {
             "distribution",
             MetricKind::Incremental,
             MetricValue::Distribution {
-                samples: vector_core::samples![1.5 => 2],
+                samples: vector_lib::samples![1.5 => 2],
                 statistic: StatisticKind::Histogram,
             },
         )
@@ -343,7 +343,7 @@ mod tests {
             "distribution",
             MetricKind::Incremental,
             MetricValue::Distribution {
-                samples: vector_core::samples![2.5 => 1],
+                samples: vector_lib::samples![2.5 => 1],
                 statistic: StatisticKind::Histogram,
             },
         )
diff --git a/src/sinks/statsd/normalizer.rs b/src/sinks/statsd/normalizer.rs
index 2592292e7023c..994bcee316c74 100644
--- a/src/sinks/statsd/normalizer.rs
+++ b/src/sinks/statsd/normalizer.rs
@@ -1,4 +1,4 @@
-use vector_core::event::{Metric, MetricValue};
+use vector_lib::event::{Metric, MetricValue};
 
 use crate::sinks::util::buffer::metrics::{MetricNormalize, MetricSet};
 
@@ -20,7 +20,7 @@ impl MetricNormalize for StatsdNormalizer {
 
 #[cfg(test)]
 mod tests {
-    use vector_core::event::MetricKind;
+    use vector_lib::event::MetricKind;
 
     use super::StatsdNormalizer;
 
diff --git a/src/sinks/statsd/request_builder.rs b/src/sinks/statsd/request_builder.rs
index 75aad1bdd2ce4..d1c90798f660d 100644
--- a/src/sinks/statsd/request_builder.rs
+++ b/src/sinks/statsd/request_builder.rs
@@ -3,12 +3,12 @@ use std::convert::Infallible;
 use bytes::BytesMut;
 use snafu::Snafu;
 use tokio_util::codec::Encoder;
-use vector_core::{
+use vector_lib::request_metadata::RequestMetadata;
+use vector_lib::{
     config::telemetry,
     event::{EventFinalizers, Finalizable, Metric},
     EstimatedJsonEncodedSizeOf,
 };
-use vector_lib::request_metadata::RequestMetadata;
 
 use super::{encoder::StatsdEncoder, service::StatsdRequest};
 use crate::{
diff --git a/src/sinks/statsd/sink.rs b/src/sinks/statsd/sink.rs
index 9c6a24859529d..3c16d177458f0 100644
--- a/src/sinks/statsd/sink.rs
+++ b/src/sinks/statsd/sink.rs
@@ -6,8 +6,8 @@ use futures_util::{
     StreamExt,
 };
 use tower::Service;
-use vector_core::{event::Event, sink::StreamSink};
 use vector_lib::internal_event::Protocol;
+use vector_lib::{event::Event, sink::StreamSink};
 use vector_stream::{BatcherSettings, DriverResponse};
 
 use crate::sinks::util::SinkBuilderExt;
diff --git a/src/sinks/statsd/tests.rs b/src/sinks/statsd/tests.rs
index b2311bd8fbec9..9284e54d8bd92 100644
--- a/src/sinks/statsd/tests.rs
+++ b/src/sinks/statsd/tests.rs
@@ -4,7 +4,7 @@ use futures_util::stream;
 use tokio::{net::UdpSocket, sync::mpsc};
 use tokio_stream::wrappers::ReceiverStream;
 use tokio_util::{codec::BytesCodec, udp::UdpFramed};
-use vector_core::{
+use vector_lib::{
     event::{metric::TagValue, Event, Metric, MetricKind, MetricTags, MetricValue, StatisticKind},
     metric_tags,
 };
@@ -62,7 +62,7 @@ async fn test_send_to_statsd() {
                 "histogram",
                 MetricKind::Incremental,
                 MetricValue::Distribution {
-                    samples: vector_core::samples![2.0 => 100],
+                    samples: vector_lib::samples![2.0 => 100],
                     statistic: StatisticKind::Histogram,
                 },
             )
diff --git a/src/sinks/util/buffer/metrics/mod.rs b/src/sinks/util/buffer/metrics/mod.rs
index e66b3c2364140..59c542aff5d85 100644
--- a/src/sinks/util/buffer/metrics/mod.rs
+++ b/src/sinks/util/buffer/metrics/mod.rs
@@ -1,6 +1,6 @@
 use std::cmp::Ordering;
 
-use vector_core::event::metric::{Metric, MetricValue, Sample};
+use vector_lib::event::metric::{Metric, MetricValue, Sample};
 
 use crate::sinks::util::{
     batch::{Batch, BatchConfig, BatchError, BatchSize, PushResult},
@@ -125,8 +125,8 @@ pub fn compress_distribution(samples: &mut Vec<Sample>) -> Vec<Sample> {
 #[cfg(test)]
 mod tests {
     use similar_asserts::assert_eq;
-    use vector_core::event::metric::{MetricKind, MetricKind::*, MetricValue, StatisticKind};
-    use vector_core::metric_tags;
+    use vector_lib::event::metric::{MetricKind, MetricKind::*, MetricValue, StatisticKind};
+    use vector_lib::metric_tags;
 
     use super::*;
     use crate::{
@@ -164,7 +164,7 @@ mod tests {
             format!("dist-{}", num),
             kind,
             MetricValue::Distribution {
-                samples: vector_core::samples![num as f64 => rate],
+                samples: vector_lib::samples![num as f64 => rate],
                 statistic: StatisticKind::Histogram,
             },
         )
@@ -181,7 +181,7 @@ mod tests {
             format!("buckets-{}", num),
             kind,
             MetricValue::AggregatedHistogram {
-                buckets: vector_core::buckets![
+                buckets: vector_lib::buckets![
                     1.0 => cfactor,
                     bpower.exp2() => cfactor * 2,
                     4.0f64.powf(bpower) => cfactor * 4
@@ -197,7 +197,7 @@ mod tests {
             format!("quantiles-{}", num),
             kind,
             MetricValue::AggregatedSummary {
-                quantiles: vector_core::quantiles![
+                quantiles: vector_lib::quantiles![
                     0.0 => factor,
                     0.5 => factor * 2.0,
                     1.0 => factor * 4.0
@@ -565,7 +565,7 @@ mod tests {
 
     #[test]
     fn compress_distributions() {
-        let mut samples = vector_core::samples![
+        let mut samples = vector_lib::samples![
             2.0 => 12,
             2.0 => 12,
             3.0 => 13,
@@ -577,7 +577,7 @@ mod tests {
 
         assert_eq!(
             compress_distribution(&mut samples),
-            vector_core::samples![1.0 => 11, 2.0 => 48, 3.0 => 26]
+            vector_lib::samples![1.0 => 11, 2.0 => 48, 3.0 => 26]
         );
     }
 
diff --git a/src/sinks/util/buffer/metrics/normalize.rs b/src/sinks/util/buffer/metrics/normalize.rs
index 16812fcd26333..41df185657684 100644
--- a/src/sinks/util/buffer/metrics/normalize.rs
+++ b/src/sinks/util/buffer/metrics/normalize.rs
@@ -1,5 +1,6 @@
 use indexmap::IndexMap;
-use vector_core::event::{
+
+use vector_lib::event::{
     metric::{MetricData, MetricSeries},
     EventMetadata, Metric, MetricKind,
 };
diff --git a/src/sinks/util/buffer/metrics/split.rs b/src/sinks/util/buffer/metrics/split.rs
index fa5f33477d97d..fb1a352ab3604 100644
--- a/src/sinks/util/buffer/metrics/split.rs
+++ b/src/sinks/util/buffer/metrics/split.rs
@@ -1,6 +1,6 @@
 use std::collections::VecDeque;
 
-use vector_core::event::{metric::MetricData, Metric, MetricValue};
+use vector_lib::event::{metric::MetricData, Metric, MetricValue};
 
 #[allow(clippy::large_enum_variant)]
 enum SplitState {
@@ -189,7 +189,7 @@ impl MetricSplit for AggregatedSummarySplitter {
 mod tests {
     use std::collections::BTreeSet;
 
-    use vector_core::event::{
+    use vector_lib::event::{
         metric::{Bucket, MetricTags, Quantile, Sample},
         Metric, MetricKind, MetricValue, StatisticKind,
     };
diff --git a/src/sinks/util/buffer/partition.rs b/src/sinks/util/buffer/partition.rs
index 20fb00f991645..2b673a2101822 100644
--- a/src/sinks/util/buffer/partition.rs
+++ b/src/sinks/util/buffer/partition.rs
@@ -1,4 +1,4 @@
-use vector_core::ByteSizeOf;
+use vector_lib::ByteSizeOf;
 
 use super::super::{
     batch::{Batch, BatchConfig, BatchError, PushResult},
diff --git a/src/sinks/util/builder.rs b/src/sinks/util/builder.rs
index da74aeb20f6bf..50056941d1cf1 100644
--- a/src/sinks/util/builder.rs
+++ b/src/sinks/util/builder.rs
@@ -12,7 +12,7 @@ use std::{
 use futures_util::{stream::Map, Stream, StreamExt};
 use pin_project::pin_project;
 use tower::Service;
-use vector_core::{
+use vector_lib::{
     event::{Finalizable, Metric},
     partition::Partitioner,
     ByteSizeOf,
diff --git a/src/sinks/util/encoding.rs b/src/sinks/util/encoding.rs
index 340183e547253..0f39f75887068 100644
--- a/src/sinks/util/encoding.rs
+++ b/src/sinks/util/encoding.rs
@@ -4,8 +4,8 @@ use bytes::BytesMut;
 use codecs::encoding::Framer;
 use itertools::{Itertools, Position};
 use tokio_util::codec::Encoder as _;
-use vector_core::{config::telemetry, EstimatedJsonEncodedSizeOf};
 use vector_lib::request_metadata::GroupedCountByteSize;
+use vector_lib::{config::telemetry, EstimatedJsonEncodedSizeOf};
 
 use crate::{codecs::Transformer, event::Event, internal_events::EncoderWriteError};
 
@@ -150,7 +150,7 @@ mod tests {
         CharacterDelimitedEncoder, JsonSerializerConfig, NewlineDelimitedEncoder,
         TextSerializerConfig,
     };
-    use vector_core::event::LogEvent;
+    use vector_lib::event::LogEvent;
     use vector_lib::{internal_event::CountByteSize, json_size::JsonSize};
     use vrl::value::Value;
 
diff --git a/src/sinks/util/http.rs b/src/sinks/util/http.rs
index 635618664fcd6..499f7640f497c 100644
--- a/src/sinks/util/http.rs
+++ b/src/sinks/util/http.rs
@@ -20,7 +20,7 @@ use snafu::{ResultExt, Snafu};
 use tower::{Service, ServiceBuilder};
 use tower_http::decompression::DecompressionLayer;
 use vector_config::configurable_component;
-use vector_core::{ByteSizeOf, EstimatedJsonEncodedSizeOf};
+use vector_lib::{ByteSizeOf, EstimatedJsonEncodedSizeOf};
 use vector_stream::batcher::limiter::ItemBatchSize;
 
 use super::{
diff --git a/src/sinks/util/metadata.rs b/src/sinks/util/metadata.rs
index 6a3a77403ae4f..3089799421903 100644
--- a/src/sinks/util/metadata.rs
+++ b/src/sinks/util/metadata.rs
@@ -1,7 +1,7 @@
 use std::num::NonZeroUsize;
 
-use vector_core::{config, ByteSizeOf, EstimatedJsonEncodedSizeOf};
 use vector_lib::request_metadata::{GetEventCountTags, GroupedCountByteSize, RequestMetadata};
+use vector_lib::{config, ByteSizeOf, EstimatedJsonEncodedSizeOf};
 
 use super::request_builder::EncodeResult;
 
diff --git a/src/sinks/util/normalizer.rs b/src/sinks/util/normalizer.rs
index 7cc1dc76dd91e..c1ab6cd047913 100644
--- a/src/sinks/util/normalizer.rs
+++ b/src/sinks/util/normalizer.rs
@@ -5,7 +5,7 @@ use std::{
 
 use futures_util::{stream::Fuse, Stream, StreamExt};
 use pin_project::pin_project;
-use vector_core::event::Metric;
+use vector_lib::event::Metric;
 
 use super::buffer::metrics::{MetricNormalize, MetricNormalizer};
 
diff --git a/src/sinks/util/partitioner.rs b/src/sinks/util/partitioner.rs
index c2f226544c9a0..67ccec3738909 100644
--- a/src/sinks/util/partitioner.rs
+++ b/src/sinks/util/partitioner.rs
@@ -1,4 +1,4 @@
-use vector_core::{event::Event, partition::Partitioner};
+use vector_lib::{event::Event, partition::Partitioner};
 
 use crate::{internal_events::TemplateRenderingError, template::Template};
 
diff --git a/src/sinks/util/processed_event.rs b/src/sinks/util/processed_event.rs
index 46fd04a3cf7e4..6ee0c30960d94 100644
--- a/src/sinks/util/processed_event.rs
+++ b/src/sinks/util/processed_event.rs
@@ -1,5 +1,5 @@
 use serde::Serialize;
-use vector_core::{
+use vector_lib::{
     event::{EventFinalizers, Finalizable, LogEvent, MaybeAsLogMut},
     ByteSizeOf, EstimatedJsonEncodedSizeOf,
 };
diff --git a/src/sinks/util/service/net/mod.rs b/src/sinks/util/service/net/mod.rs
index bf571f46100f0..5dc7c34c93e6e 100644
--- a/src/sinks/util/service/net/mod.rs
+++ b/src/sinks/util/service/net/mod.rs
@@ -45,7 +45,7 @@ use tokio::{
 };
 use tower::Service;
 use vector_config::configurable_component;
-use vector_core::tls::{MaybeTlsStream, TlsError};
+use vector_lib::tls::{MaybeTlsStream, TlsError};
 
 /// Hostname and port tuple.
 ///
diff --git a/src/sinks/util/service/net/tcp.rs b/src/sinks/util/service/net/tcp.rs
index 5cf97cb2ca1e5..f90c28d673a1a 100644
--- a/src/sinks/util/service/net/tcp.rs
+++ b/src/sinks/util/service/net/tcp.rs
@@ -4,7 +4,7 @@ use snafu::ResultExt;
 use tokio::net::TcpStream;
 
 use vector_config::configurable_component;
-use vector_core::{
+use vector_lib::{
     tcp::TcpKeepaliveConfig,
     tls::{MaybeTlsSettings, MaybeTlsStream, TlsEnableableConfig},
 };
diff --git a/src/sinks/util/sink.rs b/src/sinks/util/sink.rs
index b288eb20422fa..e8a31d13f1a1f 100644
--- a/src/sinks/util/sink.rs
+++ b/src/sinks/util/sink.rs
@@ -52,7 +52,7 @@ use vector_lib::internal_event::{
     CallError, CountByteSize, EventsSent, InternalEventHandle as _, Output,
 };
 // === StreamSink<Event> ===
-pub use vector_core::sink::StreamSink;
+pub use vector_lib::sink::StreamSink;
 
 use super::{
     batch::{Batch, EncodedBatch, FinalizersBatch, PushResult, StatefulBatch},
diff --git a/src/sinks/util/tcp.rs b/src/sinks/util/tcp.rs
index b0372407f8890..417a884a6902c 100644
--- a/src/sinks/util/tcp.rs
+++ b/src/sinks/util/tcp.rs
@@ -18,8 +18,8 @@ use tokio::{
 };
 use tokio_util::codec::Encoder;
 use vector_config::configurable_component;
-use vector_core::{ByteSizeOf, EstimatedJsonEncodedSizeOf};
 use vector_lib::json_size::JsonSize;
+use vector_lib::{ByteSizeOf, EstimatedJsonEncodedSizeOf};
 
 use crate::{
     codecs::Transformer,
diff --git a/src/sinks/util/udp.rs b/src/sinks/util/udp.rs
index 1a31fb4d16569..87227c3ce6b89 100644
--- a/src/sinks/util/udp.rs
+++ b/src/sinks/util/udp.rs
@@ -11,8 +11,8 @@ use snafu::{ResultExt, Snafu};
 use tokio::{net::UdpSocket, time::sleep};
 use tokio_util::codec::Encoder;
 use vector_config::configurable_component;
-use vector_core::EstimatedJsonEncodedSizeOf;
 use vector_lib::internal_event::{ByteSize, BytesSent, InternalEventHandle, Protocol, Registered};
+use vector_lib::EstimatedJsonEncodedSizeOf;
 
 use super::SinkBuildError;
 use crate::{
diff --git a/src/sinks/util/unix.rs b/src/sinks/util/unix.rs
index 84c1b4746df83..d30d0c2a0a203 100644
--- a/src/sinks/util/unix.rs
+++ b/src/sinks/util/unix.rs
@@ -7,8 +7,8 @@ use snafu::{ResultExt, Snafu};
 use tokio::{net::UnixStream, time::sleep};
 use tokio_util::codec::Encoder;
 use vector_config::configurable_component;
-use vector_core::{ByteSizeOf, EstimatedJsonEncodedSizeOf};
 use vector_lib::json_size::JsonSize;
+use vector_lib::{ByteSizeOf, EstimatedJsonEncodedSizeOf};
 
 use crate::{
     codecs::Transformer,
diff --git a/src/sinks/vector/mod.rs b/src/sinks/vector/mod.rs
index e3a6b2b1b918a..78b170f38b429 100644
--- a/src/sinks/vector/mod.rs
+++ b/src/sinks/vector/mod.rs
@@ -45,7 +45,7 @@ mod tests {
     use http::request::Parts;
     use hyper::Method;
     use prost::Message;
-    use vector_core::{
+    use vector_lib::{
         config::{init_telemetry, Tags, Telemetry},
         event::{BatchNotifier, BatchStatus},
     };
diff --git a/src/sinks/vector/sink.rs b/src/sinks/vector/sink.rs
index 89f8d93c90b2a..ef965f413431a 100644
--- a/src/sinks/vector/sink.rs
+++ b/src/sinks/vector/sink.rs
@@ -4,8 +4,8 @@ use async_trait::async_trait;
 use futures::{stream::BoxStream, StreamExt};
 use prost::Message;
 use tower::Service;
-use vector_core::{config::telemetry, ByteSizeOf, EstimatedJsonEncodedSizeOf};
 use vector_lib::request_metadata::GroupedCountByteSize;
+use vector_lib::{config::telemetry, ByteSizeOf, EstimatedJsonEncodedSizeOf};
 use vector_stream::{batcher::data::BatchReduce, BatcherSettings, DriverResponse};
 
 use super::service::VectorRequest;
diff --git a/src/sinks/webhdfs/config.rs b/src/sinks/webhdfs/config.rs
index 05e4df4cbf901..df0d03d9e03ec 100644
--- a/src/sinks/webhdfs/config.rs
+++ b/src/sinks/webhdfs/config.rs
@@ -2,7 +2,7 @@ use codecs::{encoding::Framer, JsonSerializerConfig, NewlineDelimitedEncoderConf
 use opendal::{layers::LoggingLayer, services::Webhdfs, Operator};
 use tower::ServiceBuilder;
 use vector_config::configurable_component;
-use vector_core::{
+use vector_lib::{
     config::{AcknowledgementsConfig, DataType, Input},
     sink::VectorSink,
 };
diff --git a/src/sinks/webhdfs/integration_tests.rs b/src/sinks/webhdfs/integration_tests.rs
index 419c3a7629bd5..935da81f226c5 100644
--- a/src/sinks/webhdfs/integration_tests.rs
+++ b/src/sinks/webhdfs/integration_tests.rs
@@ -7,7 +7,7 @@ use codecs::{encoding::FramingConfig, TextSerializerConfig};
 use futures::{stream, StreamExt};
 use opendal::{Entry, Metakey};
 use similar_asserts::assert_eq;
-use vector_core::event::{Event, LogEvent};
+use vector_lib::event::{Event, LogEvent};
 
 use super::WebHdfsConfig;
 use crate::{
diff --git a/src/sinks/webhdfs/test.rs b/src/sinks/webhdfs/test.rs
index 865980ae42b5b..3e2eed0697d27 100644
--- a/src/sinks/webhdfs/test.rs
+++ b/src/sinks/webhdfs/test.rs
@@ -1,6 +1,6 @@
 use bytes::Bytes;
 use codecs::{encoding::Framer, JsonSerializerConfig, NewlineDelimitedEncoderConfig};
-use vector_core::partition::Partitioner;
+use vector_lib::partition::Partitioner;
 use vector_lib::request_metadata::GroupedCountByteSize;
 
 use super::config::WebHdfsConfig;
diff --git a/src/sinks/websocket/sink.rs b/src/sinks/websocket/sink.rs
index 93590c6c4ba96..47fcf53f2b3d3 100644
--- a/src/sinks/websocket/sink.rs
+++ b/src/sinks/websocket/sink.rs
@@ -24,7 +24,7 @@ use tokio_tungstenite::{
     WebSocketStream as WsStream,
 };
 use tokio_util::codec::Encoder as _;
-use vector_core::{
+use vector_lib::{
     internal_event::{
         ByteSize, BytesSent, CountByteSize, EventsSent, InternalEventHandle as _, Output, Protocol,
     },
diff --git a/src/source_sender/mod.rs b/src/source_sender/mod.rs
index c13d56e96cabf..59d6e0902315d 100644
--- a/src/source_sender/mod.rs
+++ b/src/source_sender/mod.rs
@@ -8,8 +8,9 @@ use metrics::{register_histogram, Histogram};
 use tracing::Span;
 use vector_buffers::topology::channel::{self, LimitedReceiver, LimitedSender};
 #[cfg(test)]
-use vector_core::event::{into_event_stream, EventStatus};
-use vector_core::{
+use vector_lib::event::{into_event_stream, EventStatus};
+use vector_lib::internal_event::{ComponentEventsDropped, UNINTENTIONAL};
+use vector_lib::{
     config::{log_schema, SourceOutput},
     event::{array, Event, EventArray, EventContainer, EventRef},
     internal_event::{
@@ -17,7 +18,6 @@ use vector_core::{
     },
     ByteSizeOf, EstimatedJsonEncodedSizeOf,
 };
-use vector_lib::internal_event::{ComponentEventsDropped, UNINTENTIONAL};
 use vrl::value::Value;
 
 mod errors;
@@ -472,7 +472,7 @@ mod tests {
     use chrono::{DateTime, Duration};
     use rand::{thread_rng, Rng};
     use tokio::time::timeout;
-    use vector_core::event::{LogEvent, Metric, MetricKind, MetricValue, TraceEvent};
+    use vector_lib::event::{LogEvent, Metric, MetricKind, MetricValue, TraceEvent};
     use vrl::event_path;
 
     use super::*;
diff --git a/src/sources/amqp.rs b/src/sources/amqp.rs
index 64dcbaebe87a2..68333d0f47b98 100644
--- a/src/sources/amqp.rs
+++ b/src/sources/amqp.rs
@@ -25,7 +25,7 @@ use snafu::Snafu;
 use std::{io::Cursor, pin::Pin};
 use tokio_util::codec::FramedRead;
 use vector_config::configurable_component;
-use vector_core::{
+use vector_lib::{
     config::{log_schema, LegacyKey, LogNamespace, SourceAcknowledgementsConfig},
     event::Event,
     EstimatedJsonEncodedSizeOf,
@@ -493,8 +493,8 @@ async fn handle_ack(status: BatchStatus, entry: FinalizerEntry) {
 #[cfg(test)]
 pub mod test {
     use lookup::OwnedTargetPath;
-    use vector_core::schema::Definition;
-    use vector_core::tls::TlsConfig;
+    use vector_lib::schema::Definition;
+    use vector_lib::tls::TlsConfig;
     use vrl::value::kind::Collection;
 
     use super::*;
@@ -624,7 +624,7 @@ mod integration_test {
     use lapin::options::*;
     use lapin::BasicProperties;
     use tokio::time::Duration;
-    use vector_core::config::log_schema;
+    use vector_lib::config::log_schema;
 
     #[tokio::test]
     async fn amqp_source_create_ok() {
diff --git a/src/sources/apache_metrics/mod.rs b/src/sources/apache_metrics/mod.rs
index ebcabce4525e1..d44820e70d2a8 100644
--- a/src/sources/apache_metrics/mod.rs
+++ b/src/sources/apache_metrics/mod.rs
@@ -11,7 +11,7 @@ use serde_with::serde_as;
 use snafu::ResultExt;
 use tokio_stream::wrappers::IntervalStream;
 use vector_config::configurable_component;
-use vector_core::{metric_tags, EstimatedJsonEncodedSizeOf};
+use vector_lib::{metric_tags, EstimatedJsonEncodedSizeOf};
 
 use crate::{
     config::{GenerateConfig, ProxyConfig, SourceConfig, SourceContext, SourceOutput},
@@ -28,7 +28,7 @@ use crate::{
 mod parser;
 
 pub use parser::ParseError;
-use vector_core::config::LogNamespace;
+use vector_lib::config::LogNamespace;
 
 /// Configuration for the `apache_metrics` source.
 #[serde_as]
diff --git a/src/sources/apache_metrics/parser.rs b/src/sources/apache_metrics/parser.rs
index a782b718d70a2..1ebc3e3485afe 100644
--- a/src/sources/apache_metrics/parser.rs
+++ b/src/sources/apache_metrics/parser.rs
@@ -479,8 +479,8 @@ impl error::Error for ParseError {
 mod test {
     use chrono::{DateTime, Utc};
     use similar_asserts::assert_eq;
-    use vector_core::metric_tags;
     use vector_lib::assert_event_data_eq;
+    use vector_lib::metric_tags;
 
     use super::*;
     use crate::event::metric::{Metric, MetricKind, MetricValue};
diff --git a/src/sources/aws_ecs_metrics/mod.rs b/src/sources/aws_ecs_metrics/mod.rs
index 33f919ba084e3..c9dc51073132c 100644
--- a/src/sources/aws_ecs_metrics/mod.rs
+++ b/src/sources/aws_ecs_metrics/mod.rs
@@ -6,8 +6,8 @@ use serde_with::serde_as;
 use tokio::time;
 use tokio_stream::wrappers::IntervalStream;
 use vector_config::configurable_component;
-use vector_core::{config::LogNamespace, EstimatedJsonEncodedSizeOf};
 use vector_lib::internal_event::{ByteSize, BytesReceived, InternalEventHandle as _, Protocol};
+use vector_lib::{config::LogNamespace, EstimatedJsonEncodedSizeOf};
 
 use crate::{
     config::{GenerateConfig, SourceConfig, SourceContext, SourceOutput},
diff --git a/src/sources/aws_ecs_metrics/parser.rs b/src/sources/aws_ecs_metrics/parser.rs
index 8dedf726d3458..f4a066d0b712e 100644
--- a/src/sources/aws_ecs_metrics/parser.rs
+++ b/src/sources/aws_ecs_metrics/parser.rs
@@ -560,8 +560,8 @@ pub(super) fn parse(
 #[cfg(test)]
 mod test {
     use chrono::{offset::TimeZone, DateTime, Timelike, Utc};
-    use vector_core::metric_tags;
     use vector_lib::assert_event_data_eq;
+    use vector_lib::metric_tags;
 
     use super::parse;
     use crate::event::metric::{Metric, MetricKind, MetricValue};
diff --git a/src/sources/aws_kinesis_firehose/filters.rs b/src/sources/aws_kinesis_firehose/filters.rs
index 5c4e566913336..afd3ec507f9f2 100644
--- a/src/sources/aws_kinesis_firehose/filters.rs
+++ b/src/sources/aws_kinesis_firehose/filters.rs
@@ -4,7 +4,7 @@ use bytes::{Buf, Bytes};
 use chrono::Utc;
 use flate2::read::MultiGzDecoder;
 use snafu::ResultExt;
-use vector_core::config::LogNamespace;
+use vector_lib::config::LogNamespace;
 use vector_lib::internal_event::{BytesReceived, Protocol};
 use warp::{http::StatusCode, Filter};
 
diff --git a/src/sources/aws_kinesis_firehose/handlers.rs b/src/sources/aws_kinesis_firehose/handlers.rs
index af1e82a634ff0..0a479f0af63ee 100644
--- a/src/sources/aws_kinesis_firehose/handlers.rs
+++ b/src/sources/aws_kinesis_firehose/handlers.rs
@@ -9,7 +9,7 @@ use futures::StreamExt;
 use lookup::{metadata_path, path, PathPrefix};
 use snafu::{ResultExt, Snafu};
 use tokio_util::codec::FramedRead;
-use vector_core::{
+use vector_lib::{
     config::{LegacyKey, LogNamespace},
     event::BatchNotifier,
     EstimatedJsonEncodedSizeOf,
diff --git a/src/sources/aws_kinesis_firehose/mod.rs b/src/sources/aws_kinesis_firehose/mod.rs
index 3ef3730d67b35..a7df07b4bafe3 100644
--- a/src/sources/aws_kinesis_firehose/mod.rs
+++ b/src/sources/aws_kinesis_firehose/mod.rs
@@ -5,7 +5,7 @@ use futures::FutureExt;
 use lookup::owned_value_path;
 use tracing::Span;
 use vector_config::configurable_component;
-use vector_core::config::{LegacyKey, LogNamespace};
+use vector_lib::config::{LegacyKey, LogNamespace};
 use vector_lib::sensitive_string::SensitiveString;
 use vrl::value::Kind;
 use warp::Filter;
diff --git a/src/sources/aws_s3/mod.rs b/src/sources/aws_s3/mod.rs
index 5338ba144bef4..d0dd76f3ee684 100644
--- a/src/sources/aws_s3/mod.rs
+++ b/src/sources/aws_s3/mod.rs
@@ -9,7 +9,7 @@ use lookup::owned_value_path;
 use snafu::Snafu;
 use tokio_util::io::StreamReader;
 use vector_config::configurable_component;
-use vector_core::config::{LegacyKey, LogNamespace};
+use vector_lib::config::{LegacyKey, LogNamespace};
 use vrl::value::{kind::Collection, Kind};
 
 use super::util::MultilineConfig;
diff --git a/src/sources/aws_s3/sqs.rs b/src/sources/aws_s3/sqs.rs
index 1a9154e6daffe..2960a6fecfff9 100644
--- a/src/sources/aws_s3/sqs.rs
+++ b/src/sources/aws_s3/sqs.rs
@@ -45,8 +45,8 @@ use crate::{
     SourceSender,
 };
 use lookup::{metadata_path, path, PathPrefix};
-use vector_core::config::{log_schema, LegacyKey, LogNamespace};
-use vector_core::event::MaybeAsLogMut;
+use vector_lib::config::{log_schema, LegacyKey, LogNamespace};
+use vector_lib::event::MaybeAsLogMut;
 
 static SUPPORTED_S3_EVENT_VERSION: Lazy<semver::VersionReq> =
     Lazy::new(|| semver::VersionReq::parse("~2").unwrap());
diff --git a/src/sources/aws_sqs/config.rs b/src/sources/aws_sqs/config.rs
index 604cb4a6bb3b4..a9cd3b31f613b 100644
--- a/src/sources/aws_sqs/config.rs
+++ b/src/sources/aws_sqs/config.rs
@@ -3,7 +3,7 @@ use std::num::NonZeroUsize;
 use codecs::decoding::{DeserializerConfig, FramingConfig};
 use lookup::owned_value_path;
 use vector_config::configurable_component;
-use vector_core::config::{LegacyKey, LogNamespace};
+use vector_lib::config::{LegacyKey, LogNamespace};
 use vrl::value::Kind;
 
 use crate::aws::create_client;
diff --git a/src/sources/aws_sqs/source.rs b/src/sources/aws_sqs/source.rs
index 28fc9dfc0cdef..c463e38cd7074 100644
--- a/src/sources/aws_sqs/source.rs
+++ b/src/sources/aws_sqs/source.rs
@@ -8,7 +8,7 @@ use chrono::{DateTime, TimeZone, Utc};
 use futures::{FutureExt, StreamExt};
 use tokio::{pin, select};
 use tracing_futures::Instrument;
-use vector_core::config::LogNamespace;
+use vector_lib::config::LogNamespace;
 use vector_lib::finalizer::UnorderedFinalizer;
 use vector_lib::internal_event::{EventsReceived, Registered};
 
diff --git a/src/sources/datadog_agent/logs.rs b/src/sources/datadog_agent/logs.rs
index 47201917d986f..e9b59f40a71ac 100644
--- a/src/sources/datadog_agent/logs.rs
+++ b/src/sources/datadog_agent/logs.rs
@@ -6,8 +6,8 @@ use codecs::StreamDecodingError;
 use http::StatusCode;
 use lookup::path;
 use tokio_util::codec::Decoder;
-use vector_core::{config::LegacyKey, EstimatedJsonEncodedSizeOf};
 use vector_lib::internal_event::{CountByteSize, InternalEventHandle as _};
+use vector_lib::{config::LegacyKey, EstimatedJsonEncodedSizeOf};
 use warp::{filters::BoxedFilter, path as warp_path, path::FullPath, reply::Response, Filter};
 
 use crate::{
diff --git a/src/sources/datadog_agent/metrics.rs b/src/sources/datadog_agent/metrics.rs
index 8912a2958e081..597eeb0f201bf 100644
--- a/src/sources/datadog_agent/metrics.rs
+++ b/src/sources/datadog_agent/metrics.rs
@@ -7,12 +7,12 @@ use prost::Message;
 use serde::{Deserialize, Serialize};
 use warp::{filters::BoxedFilter, path, path::FullPath, reply::Response, Filter};
 
-use vector_core::{
+use vector_lib::internal_event::{CountByteSize, InternalEventHandle as _, Registered};
+use vector_lib::{
     event::{DatadogMetricOriginMetadata, EventMetadata},
     metrics::AgentDDSketch,
     EstimatedJsonEncodedSizeOf,
 };
-use vector_lib::internal_event::{CountByteSize, InternalEventHandle as _, Registered};
 
 use crate::{
     common::datadog::{DatadogMetricType, DatadogSeriesMetric},
diff --git a/src/sources/datadog_agent/mod.rs b/src/sources/datadog_agent/mod.rs
index d95920456b984..1001c5fe040a6 100644
--- a/src/sources/datadog_agent/mod.rs
+++ b/src/sources/datadog_agent/mod.rs
@@ -31,8 +31,8 @@ use serde::{Deserialize, Serialize};
 use snafu::Snafu;
 use tracing::Span;
 use vector_config::configurable_component;
-use vector_core::config::{LegacyKey, LogNamespace};
-use vector_core::event::{BatchNotifier, BatchStatus};
+use vector_lib::config::{LegacyKey, LogNamespace};
+use vector_lib::event::{BatchNotifier, BatchStatus};
 use vector_lib::internal_event::{EventsReceived, Registered};
 use vrl::path::OwnedTargetPath;
 use vrl::value::Kind;
diff --git a/src/sources/datadog_agent/tests.rs b/src/sources/datadog_agent/tests.rs
index c6a6fe6341218..9f98f83a0b662 100644
--- a/src/sources/datadog_agent/tests.rs
+++ b/src/sources/datadog_agent/tests.rs
@@ -19,7 +19,7 @@ use ordered_float::NotNan;
 use prost::Message;
 use quickcheck::{Arbitrary, Gen, QuickCheck, TestResult};
 use similar_asserts::assert_eq;
-use vector_core::{
+use vector_lib::{
     config::LogNamespace,
     event::{metric::TagValue, MetricTags},
     metric_tags,
diff --git a/src/sources/datadog_agent/traces.rs b/src/sources/datadog_agent/traces.rs
index 93f5be5208a69..47ac974307831 100644
--- a/src/sources/datadog_agent/traces.rs
+++ b/src/sources/datadog_agent/traces.rs
@@ -9,8 +9,8 @@ use prost::Message;
 use vrl::event_path;
 use warp::{filters::BoxedFilter, path, path::FullPath, reply::Response, Filter, Rejection, Reply};
 
-use vector_core::EstimatedJsonEncodedSizeOf;
 use vector_lib::internal_event::{CountByteSize, InternalEventHandle as _};
+use vector_lib::EstimatedJsonEncodedSizeOf;
 
 use crate::{
     event::{Event, TraceEvent, Value},
diff --git a/src/sources/demo_logs.rs b/src/sources/demo_logs.rs
index afe1eba364e60..b98bbd755edd6 100644
--- a/src/sources/demo_logs.rs
+++ b/src/sources/demo_logs.rs
@@ -13,13 +13,13 @@ use std::task::Poll;
 use tokio::time::{self, Duration};
 use tokio_util::codec::FramedRead;
 use vector_config::configurable_component;
-use vector_core::{
-    config::{LegacyKey, LogNamespace},
-    EstimatedJsonEncodedSizeOf,
-};
 use vector_lib::internal_event::{
     ByteSize, BytesReceived, CountByteSize, InternalEventHandle as _, Protocol,
 };
+use vector_lib::{
+    config::{LegacyKey, LogNamespace},
+    EstimatedJsonEncodedSizeOf,
+};
 use vrl::value::Kind;
 
 use crate::{
diff --git a/src/sources/dnstap/mod.rs b/src/sources/dnstap/mod.rs
index aa57d66bcb635..97cc464853bbc 100644
--- a/src/sources/dnstap/mod.rs
+++ b/src/sources/dnstap/mod.rs
@@ -25,7 +25,7 @@ use crate::sources::dnstap::schema::DNSTAP_VALUE_PATHS;
 use dnsmsg_parser::{dns_message, dns_message_parser};
 use lookup::lookup_v2::OptionalValuePath;
 pub use schema::DnstapEventSchema;
-use vector_core::{
+use vector_lib::{
     config::{LegacyKey, LogNamespace},
     EstimatedJsonEncodedSizeOf,
 };
@@ -109,15 +109,12 @@ impl DnstapConfig {
         "protobuf:dnstap.Dnstap".to_string() //content-type for framestream
     }
 
-    pub fn schema_definition(
-        &self,
-        log_namespace: LogNamespace,
-    ) -> vector_core::schema::Definition {
+    pub fn schema_definition(&self, log_namespace: LogNamespace) -> vector_lib::schema::Definition {
         let event_schema = DnstapEventSchema;
 
         match log_namespace {
             LogNamespace::Legacy => {
-                let schema = vector_core::schema::Definition::empty_legacy_namespace();
+                let schema = vector_lib::schema::Definition::empty_legacy_namespace();
 
                 if self.raw_data_only.unwrap_or(false) {
                     if let Some(message_key) = log_schema().message_key() {
@@ -131,7 +128,7 @@ impl DnstapConfig {
                 event_schema.schema_definition(schema)
             }
             LogNamespace::Vector => {
-                let schema = vector_core::schema::Definition::new_with_default_metadata(
+                let schema = vector_lib::schema::Definition::new_with_default_metadata(
                     Kind::object(Collection::empty()),
                     [log_namespace],
                 )
@@ -397,7 +394,7 @@ mod tests {
         event.as_mut_log().insert("timestamp", chrono::Utc::now());
 
         let definition = DnstapEventSchema;
-        let schema = vector_core::schema::Definition::empty_legacy_namespace()
+        let schema = vector_lib::schema::Definition::empty_legacy_namespace()
             .with_standard_vector_source_metadata();
 
         definition
diff --git a/src/sources/dnstap/parser.rs b/src/sources/dnstap/parser.rs
index 0a12f7426443a..ac2c1c0bf4b7b 100644
--- a/src/sources/dnstap/parser.rs
+++ b/src/sources/dnstap/parser.rs
@@ -35,7 +35,7 @@ use dnstap_proto::{
 };
 use lookup::lookup_v2::ValuePath;
 use lookup::PathPrefix;
-use vector_core::config::log_schema;
+use vector_lib::config::log_schema;
 
 use super::{
     dns_message::{
diff --git a/src/sources/dnstap/schema.rs b/src/sources/dnstap/schema.rs
index 23ce53cdbfd92..3d6919b08cee9 100644
--- a/src/sources/dnstap/schema.rs
+++ b/src/sources/dnstap/schema.rs
@@ -133,8 +133,8 @@ impl DnstapEventSchema {
     /// Schema definition for fields stored in the root.
     fn root_schema_definition(
         &self,
-        schema: vector_core::schema::Definition,
-    ) -> vector_core::schema::Definition {
+        schema: vector_lib::schema::Definition,
+    ) -> vector_lib::schema::Definition {
         schema
             .optional_field(&DNSTAP_VALUE_PATHS.server_identity, Kind::bytes(), None)
             .optional_field(&DNSTAP_VALUE_PATHS.server_version, Kind::bytes(), None)
@@ -150,8 +150,8 @@ impl DnstapEventSchema {
     /// Schema definition from the message.
     pub fn message_schema_definition(
         &self,
-        schema: vector_core::schema::Definition,
-    ) -> vector_core::schema::Definition {
+        schema: vector_lib::schema::Definition,
+    ) -> vector_lib::schema::Definition {
         schema
             .optional_field(&DNSTAP_VALUE_PATHS.socket_family, Kind::bytes(), None)
             .optional_field(&DNSTAP_VALUE_PATHS.socket_protocol, Kind::bytes(), None)
@@ -177,8 +177,8 @@ impl DnstapEventSchema {
     /// The schema definition for a dns tap message.
     pub fn schema_definition(
         &self,
-        schema: vector_core::schema::Definition,
-    ) -> vector_core::schema::Definition {
+        schema: vector_lib::schema::Definition,
+    ) -> vector_lib::schema::Definition {
         self.root_schema_definition(self.message_schema_definition(schema))
     }
 }
diff --git a/src/sources/docker_logs/mod.rs b/src/sources/docker_logs/mod.rs
index 2cc85ec62724d..a2587b8122ade 100644
--- a/src/sources/docker_logs/mod.rs
+++ b/src/sources/docker_logs/mod.rs
@@ -21,7 +21,7 @@ use serde_with::serde_as;
 use tokio::sync::mpsc;
 use tracing_futures::Instrument;
 use vector_config::configurable_component;
-use vector_core::config::{LegacyKey, LogNamespace};
+use vector_lib::config::{LegacyKey, LogNamespace};
 use vector_lib::internal_event::{
     ByteSize, BytesReceived, InternalEventHandle as _, Protocol, Registered,
 };
diff --git a/src/sources/eventstoredb_metrics/mod.rs b/src/sources/eventstoredb_metrics/mod.rs
index 2bd0e14c7f1a5..84bc793767a23 100644
--- a/src/sources/eventstoredb_metrics/mod.rs
+++ b/src/sources/eventstoredb_metrics/mod.rs
@@ -6,11 +6,11 @@ use hyper::{Body, Request};
 use serde_with::serde_as;
 use tokio_stream::wrappers::IntervalStream;
 use vector_config::configurable_component;
-use vector_core::config::LogNamespace;
-use vector_core::EstimatedJsonEncodedSizeOf;
+use vector_lib::config::LogNamespace;
 use vector_lib::internal_event::{
     ByteSize, BytesReceived, CountByteSize, InternalEventHandle as _, Protocol,
 };
+use vector_lib::EstimatedJsonEncodedSizeOf;
 
 use self::types::Stats;
 use crate::{
diff --git a/src/sources/exec/mod.rs b/src/sources/exec/mod.rs
index 567b7a6ff131b..fd3ecab3cefe3 100644
--- a/src/sources/exec/mod.rs
+++ b/src/sources/exec/mod.rs
@@ -22,8 +22,8 @@ use tokio::{
 use tokio_stream::wrappers::IntervalStream;
 use tokio_util::codec::FramedRead;
 use vector_config::configurable_component;
-use vector_core::{config::LegacyKey, EstimatedJsonEncodedSizeOf};
 use vector_lib::internal_event::{ByteSize, BytesReceived, InternalEventHandle as _, Protocol};
+use vector_lib::{config::LegacyKey, EstimatedJsonEncodedSizeOf};
 use vrl::path::OwnedValuePath;
 use vrl::value::Kind;
 
@@ -40,7 +40,7 @@ use crate::{
     SourceSender,
 };
 use lookup::{owned_value_path, path};
-use vector_core::config::{log_schema, LogNamespace};
+use vector_lib::config::{log_schema, LogNamespace};
 
 #[cfg(test)]
 mod tests;
diff --git a/src/sources/exec/tests.rs b/src/sources/exec/tests.rs
index e1f46e078f4a2..df8ac3017a452 100644
--- a/src/sources/exec/tests.rs
+++ b/src/sources/exec/tests.rs
@@ -3,7 +3,7 @@ use crate::{event::LogEvent, test_util::trace_init};
 use bytes::Bytes;
 use std::ffi::OsStr;
 use std::io::Cursor;
-use vector_core::event::EventMetadata;
+use vector_lib::event::EventMetadata;
 use vrl::value;
 
 #[cfg(unix)]
diff --git a/src/sources/file.rs b/src/sources/file.rs
index c59a1d947efa4..1e1b38d453970 100644
--- a/src/sources/file.rs
+++ b/src/sources/file.rs
@@ -17,11 +17,11 @@ use snafu::{ResultExt, Snafu};
 use tokio::{sync::oneshot, task::spawn_blocking};
 use tracing::{Instrument, Span};
 use vector_config::configurable_component;
-use vector_core::{
+use vector_lib::finalizer::OrderedFinalizer;
+use vector_lib::{
     config::{LegacyKey, LogNamespace},
     EstimatedJsonEncodedSizeOf,
 };
-use vector_lib::finalizer::OrderedFinalizer;
 use vrl::value::Kind;
 
 use super::util::{EncodingConfig, MultilineConfig};
@@ -818,7 +818,7 @@ mod tests {
     use similar_asserts::assert_eq;
     use tempfile::tempdir;
     use tokio::time::{sleep, timeout, Duration};
-    use vector_core::schema::Definition;
+    use vector_lib::schema::Definition;
     use vrl::value::kind::Collection;
 
     use super::*;
diff --git a/src/sources/file_descriptors/file_descriptor.rs b/src/sources/file_descriptors/file_descriptor.rs
index 908ea1e02a5f5..55767441d7e42 100644
--- a/src/sources/file_descriptors/file_descriptor.rs
+++ b/src/sources/file_descriptors/file_descriptor.rs
@@ -5,7 +5,7 @@ use codecs::decoding::{DeserializerConfig, FramingConfig};
 use indoc::indoc;
 use lookup::lookup_v2::OptionalValuePath;
 use vector_config::configurable_component;
-use vector_core::config::LogNamespace;
+use vector_lib::config::LogNamespace;
 
 use crate::{
     config::{GenerateConfig, Resource, SourceConfig, SourceContext, SourceOutput},
diff --git a/src/sources/file_descriptors/mod.rs b/src/sources/file_descriptors/mod.rs
index 24c5fec623860..125cf69e16ede 100644
--- a/src/sources/file_descriptors/mod.rs
+++ b/src/sources/file_descriptors/mod.rs
@@ -11,14 +11,14 @@ use futures::{channel::mpsc, executor, SinkExt, StreamExt};
 use lookup::{lookup_v2::OptionalValuePath, owned_value_path, path, OwnedValuePath};
 use tokio_util::{codec::FramedRead, io::StreamReader};
 use vector_config::NamedComponent;
-use vector_core::{
+use vector_lib::internal_event::{
+    ByteSize, BytesReceived, CountByteSize, InternalEventHandle as _, Protocol,
+};
+use vector_lib::{
     config::{LegacyKey, LogNamespace},
     event::Event,
     EstimatedJsonEncodedSizeOf,
 };
-use vector_lib::internal_event::{
-    ByteSize, BytesReceived, CountByteSize, InternalEventHandle as _, Protocol,
-};
 use vrl::value::Kind;
 
 use crate::{
@@ -200,7 +200,7 @@ async fn process_stream(
     }
 }
 
-/// Builds the `vector_core::config::Outputs` for stdin and
+/// Builds the `vector_lib::config::Outputs` for stdin and
 /// file_descriptor sources.
 fn outputs(
     log_namespace: LogNamespace,
diff --git a/src/sources/file_descriptors/stdin.rs b/src/sources/file_descriptors/stdin.rs
index c598758670afc..bf0497942b2de 100644
--- a/src/sources/file_descriptors/stdin.rs
+++ b/src/sources/file_descriptors/stdin.rs
@@ -3,7 +3,7 @@ use std::io;
 use codecs::decoding::{DeserializerConfig, FramingConfig};
 use lookup::lookup_v2::OptionalValuePath;
 use vector_config::configurable_component;
-use vector_core::config::LogNamespace;
+use vector_lib::config::LogNamespace;
 
 use crate::{
     config::{Resource, SourceConfig, SourceContext, SourceOutput},
diff --git a/src/sources/fluent/message.rs b/src/sources/fluent/message.rs
index d3746839dd8b6..bb9e3326fd7b8 100644
--- a/src/sources/fluent/message.rs
+++ b/src/sources/fluent/message.rs
@@ -3,7 +3,7 @@ use std::{collections::BTreeMap, convert::TryInto};
 use chrono::{serde::ts_seconds, DateTime, TimeZone, Utc};
 use ordered_float::NotNan;
 use serde::{Deserialize, Serialize};
-use vector_core::event::Value;
+use vector_lib::event::Value;
 
 /// Fluent msgpack messages can be encoded in one of three ways, each with and
 /// without options, all using arrays to encode the top-level fields.
@@ -229,7 +229,7 @@ mod test {
 
     use approx::assert_relative_eq;
     use quickcheck::quickcheck;
-    use vector_core::event::Value;
+    use vector_lib::event::Value;
 
     use crate::sources::fluent::message::FluentValue;
 
diff --git a/src/sources/fluent/mod.rs b/src/sources/fluent/mod.rs
index 0e1ad42c08ce8..8dd1f23c6b496 100644
--- a/src/sources/fluent/mod.rs
+++ b/src/sources/fluent/mod.rs
@@ -15,8 +15,8 @@ use serde::{Deserialize, Serialize};
 use smallvec::{smallvec, SmallVec};
 use tokio_util::codec::Decoder;
 use vector_config::configurable_component;
-use vector_core::config::{LegacyKey, LogNamespace};
-use vector_core::schema::Definition;
+use vector_lib::config::{LegacyKey, LogNamespace};
+use vector_lib::schema::Definition;
 use vrl::value::kind::Collection;
 use vrl::value::{Kind, Value};
 
@@ -638,8 +638,8 @@ mod tests {
         time::{error::Elapsed, timeout, Duration},
     };
     use tokio_util::codec::Decoder;
-    use vector_core::{event::Value, schema::Definition};
     use vector_lib::assert_event_data_eq;
+    use vector_lib::{event::Value, schema::Definition};
     use vrl::value::kind::Collection;
 
     use super::{message::FluentMessageOptions, *};
@@ -1050,7 +1050,7 @@ mod integration_tests {
 
     use futures::Stream;
     use tokio::time::sleep;
-    use vector_core::event::{Event, EventStatus};
+    use vector_lib::event::{Event, EventStatus};
 
     use crate::{
         config::{SourceConfig, SourceContext},
diff --git a/src/sources/gcp_pubsub.rs b/src/sources/gcp_pubsub.rs
index 49a402f7e65ca..2dc1b3069fc46 100644
--- a/src/sources/gcp_pubsub.rs
+++ b/src/sources/gcp_pubsub.rs
@@ -21,7 +21,7 @@ use tonic::{
     Code, Request, Status,
 };
 use vector_config::configurable_component;
-use vector_core::config::{LegacyKey, LogNamespace};
+use vector_lib::config::{LegacyKey, LogNamespace};
 use vector_lib::internal_event::{
     ByteSize, BytesReceived, EventsReceived, InternalEventHandle as _, Protocol, Registered,
 };
@@ -68,7 +68,7 @@ type Finalizer = UnorderedFinalizer<Vec<String>>;
 mod proto {
     include!(concat!(env!("OUT_DIR"), "/google.pubsub.v1.rs"));
 
-    use vector_core::ByteSizeOf;
+    use vector_lib::ByteSizeOf;
 
     impl ByteSizeOf for StreamingPullResponse {
         fn allocated_bytes(&self) -> usize {
@@ -745,7 +745,7 @@ impl Future for Task {
 #[cfg(test)]
 mod tests {
     use lookup::OwnedTargetPath;
-    use vector_core::schema::Definition;
+    use vector_lib::schema::Definition;
 
     use super::*;
 
diff --git a/src/sources/heroku_logs.rs b/src/sources/heroku_logs.rs
index fd728def7b254..1664f887ef9fe 100644
--- a/src/sources/heroku_logs.rs
+++ b/src/sources/heroku_logs.rs
@@ -18,7 +18,7 @@ use vrl::value::{kind::Collection, Kind};
 use warp::http::{HeaderMap, StatusCode};
 
 use vector_config::configurable_component;
-use vector_core::{
+use vector_lib::{
     config::{LegacyKey, LogNamespace},
     schema::Definition,
 };
@@ -410,7 +410,7 @@ mod tests {
     use futures::Stream;
     use lookup::{owned_value_path, OwnedTargetPath};
     use similar_asserts::assert_eq;
-    use vector_core::{
+    use vector_lib::{
         config::LogNamespace,
         event::{Event, EventStatus, Value},
         schema::Definition,
diff --git a/src/sources/host_metrics/cgroups.rs b/src/sources/host_metrics/cgroups.rs
index 40636cbc3f788..2f88a4f164222 100644
--- a/src/sources/host_metrics/cgroups.rs
+++ b/src/sources/host_metrics/cgroups.rs
@@ -6,7 +6,7 @@ use tokio::{
     fs::{self, File},
     io::AsyncReadExt,
 };
-use vector_core::metric_tags;
+use vector_lib::metric_tags;
 
 use super::{filter_result_sync, CGroupsConfig, HostMetrics, MetricsBuffer};
 use crate::event::MetricTags;
@@ -438,7 +438,7 @@ mod tests {
     use rand::{rngs::ThreadRng, Rng};
     use similar_asserts::assert_eq;
     use tempfile::TempDir;
-    use vector_core::event::Metric;
+    use vector_lib::event::Metric;
 
     use super::{
         super::{
diff --git a/src/sources/host_metrics/cpu.rs b/src/sources/host_metrics/cpu.rs
index 108cd6d48c35e..1d7a276845b0f 100644
--- a/src/sources/host_metrics/cpu.rs
+++ b/src/sources/host_metrics/cpu.rs
@@ -3,7 +3,7 @@ use futures::StreamExt;
 #[cfg(target_os = "linux")]
 use heim::cpu::os::linux::CpuTimeExt;
 use heim::units::time::second;
-use vector_core::{event::MetricTags, metric_tags};
+use vector_lib::{event::MetricTags, metric_tags};
 
 use super::{filter_result, HostMetrics};
 
diff --git a/src/sources/host_metrics/disk.rs b/src/sources/host_metrics/disk.rs
index 427125216f387..5c91cbb1faedf 100644
--- a/src/sources/host_metrics/disk.rs
+++ b/src/sources/host_metrics/disk.rs
@@ -2,7 +2,7 @@ use crate::internal_events::HostMetricsScrapeDetailError;
 use futures::StreamExt;
 use heim::units::information::byte;
 use vector_config::configurable_component;
-use vector_core::metric_tags;
+use vector_lib::metric_tags;
 
 use super::{default_all_devices, example_devices, filter_result, FilterList, HostMetrics};
 
diff --git a/src/sources/host_metrics/filesystem.rs b/src/sources/host_metrics/filesystem.rs
index adb8423b249a2..3c066f7e07992 100644
--- a/src/sources/host_metrics/filesystem.rs
+++ b/src/sources/host_metrics/filesystem.rs
@@ -3,7 +3,7 @@ use heim::units::information::byte;
 #[cfg(not(windows))]
 use heim::units::ratio::ratio;
 use vector_config::configurable_component;
-use vector_core::metric_tags;
+use vector_lib::metric_tags;
 
 use crate::internal_events::{HostMetricsScrapeDetailError, HostMetricsScrapeFilesystemError};
 
diff --git a/src/sources/host_metrics/memory.rs b/src/sources/host_metrics/memory.rs
index cbb5ce245cbaa..3c439113b5a4a 100644
--- a/src/sources/host_metrics/memory.rs
+++ b/src/sources/host_metrics/memory.rs
@@ -5,7 +5,7 @@ use heim::memory::os::macos::MemoryExt;
 #[cfg(not(windows))]
 use heim::memory::os::SwapExt;
 use heim::units::information::byte;
-use vector_core::event::MetricTags;
+use vector_lib::event::MetricTags;
 
 use crate::internal_events::HostMetricsScrapeDetailError;
 
diff --git a/src/sources/host_metrics/mod.rs b/src/sources/host_metrics/mod.rs
index 6f08abc45e01a..0894e1aa9222b 100644
--- a/src/sources/host_metrics/mod.rs
+++ b/src/sources/host_metrics/mod.rs
@@ -13,11 +13,11 @@ use serde_with::serde_as;
 use tokio::time;
 use tokio_stream::wrappers::IntervalStream;
 use vector_config::configurable_component;
-use vector_core::config::LogNamespace;
-use vector_core::EstimatedJsonEncodedSizeOf;
+use vector_lib::config::LogNamespace;
 use vector_lib::internal_event::{
     ByteSize, BytesReceived, CountByteSize, InternalEventHandle as _, Protocol, Registered,
 };
+use vector_lib::EstimatedJsonEncodedSizeOf;
 
 use crate::{
     config::{SourceConfig, SourceContext, SourceOutput},
diff --git a/src/sources/host_metrics/network.rs b/src/sources/host_metrics/network.rs
index 02d38628a8873..158d70fb306d2 100644
--- a/src/sources/host_metrics/network.rs
+++ b/src/sources/host_metrics/network.rs
@@ -5,7 +5,7 @@ use heim::net::os::linux::IoCountersExt;
 use heim::net::os::windows::IoCountersExt;
 use heim::units::information::byte;
 use vector_config::configurable_component;
-use vector_core::metric_tags;
+use vector_lib::metric_tags;
 
 use crate::internal_events::HostMetricsScrapeDetailError;
 
diff --git a/src/sources/http_client/client.rs b/src/sources/http_client/client.rs
index 1f13c1dc1f490..98f805e990e6a 100644
--- a/src/sources/http_client/client.rs
+++ b/src/sources/http_client/client.rs
@@ -33,7 +33,7 @@ use codecs::{
     StreamDecodingError,
 };
 use vector_config::configurable_component;
-use vector_core::{
+use vector_lib::{
     config::{log_schema, LogNamespace, SourceOutput},
     event::Event,
 };
diff --git a/src/sources/http_client/integration_tests.rs b/src/sources/http_client/integration_tests.rs
index 68e4842ba99d5..256b31aa63713 100644
--- a/src/sources/http_client/integration_tests.rs
+++ b/src/sources/http_client/integration_tests.rs
@@ -16,7 +16,7 @@ use crate::{
     SourceSender,
 };
 use codecs::decoding::DeserializerConfig;
-use vector_core::config::log_schema;
+use vector_lib::config::log_schema;
 
 use super::{
     tests::{run_compliance, INTERVAL, TIMEOUT},
diff --git a/src/sources/http_client/tests.rs b/src/sources/http_client/tests.rs
index bb97289807fbd..99e12534d36c2 100644
--- a/src/sources/http_client/tests.rs
+++ b/src/sources/http_client/tests.rs
@@ -6,7 +6,7 @@ use warp::{http::HeaderMap, Filter};
 use crate::sources::util::http::HttpMethod;
 use crate::{serde::default_decoding, serde::default_framing_message_based};
 use codecs::decoding::{CharacterDelimitedDecoderOptions, DeserializerConfig, FramingConfig};
-use vector_core::event::Event;
+use vector_lib::event::Event;
 
 use super::HttpClientConfig;
 use crate::test_util::{
diff --git a/src/sources/http_server.rs b/src/sources/http_server.rs
index 479c02190f6da..a59e6a834cb3b 100644
--- a/src/sources/http_server.rs
+++ b/src/sources/http_server.rs
@@ -15,7 +15,7 @@ use codecs::{
 };
 use lookup::{lookup_v2::OptionalValuePath, owned_value_path, path};
 use vector_config::configurable_component;
-use vector_core::{
+use vector_lib::{
     config::{DataType, LegacyKey, LogNamespace},
     schema::Definition,
 };
@@ -495,9 +495,9 @@ mod tests {
     };
     use lookup::lookup_v2::OptionalValuePath;
     use lookup::{event_path, owned_value_path, OwnedTargetPath};
-    use vector_core::config::LogNamespace;
-    use vector_core::event::LogEvent;
-    use vector_core::schema::Definition;
+    use vector_lib::config::LogNamespace;
+    use vector_lib::event::LogEvent;
+    use vector_lib::schema::Definition;
 
     use crate::sources::http_server::HttpMethod;
     use crate::{
diff --git a/src/sources/internal_logs.rs b/src/sources/internal_logs.rs
index 1034a37b508ef..dcb697e7ad726 100644
--- a/src/sources/internal_logs.rs
+++ b/src/sources/internal_logs.rs
@@ -4,8 +4,8 @@ use futures::{stream, StreamExt};
 use lookup::lookup_v2::OptionalValuePath;
 use lookup::{owned_value_path, path, OwnedValuePath};
 use vector_config::configurable_component;
-use vector_core::config::log_schema;
-use vector_core::{
+use vector_lib::config::log_schema;
+use vector_lib::{
     config::{LegacyKey, LogNamespace},
     schema::Definition,
 };
@@ -206,7 +206,7 @@ mod tests {
     use futures::Stream;
     use lookup::OwnedTargetPath;
     use tokio::time::{sleep, Duration};
-    use vector_core::event::Value;
+    use vector_lib::event::Value;
     use vrl::value::kind::Collection;
 
     use super::*;
diff --git a/src/sources/internal_metrics.rs b/src/sources/internal_metrics.rs
index fe15e09d57ec2..d17a28d042777 100644
--- a/src/sources/internal_metrics.rs
+++ b/src/sources/internal_metrics.rs
@@ -6,8 +6,8 @@ use serde_with::serde_as;
 use tokio::time;
 use tokio_stream::wrappers::IntervalStream;
 use vector_config::configurable_component;
-use vector_core::{config::LogNamespace, ByteSizeOf, EstimatedJsonEncodedSizeOf};
 use vector_lib::internal_event::{CountByteSize, InternalEventHandle as _};
+use vector_lib::{config::LogNamespace, ByteSizeOf, EstimatedJsonEncodedSizeOf};
 
 use crate::{
     config::{log_schema, SourceConfig, SourceContext, SourceOutput},
@@ -203,7 +203,7 @@ mod tests {
     use std::collections::BTreeMap;
 
     use metrics::{counter, gauge, histogram};
-    use vector_core::metric_tags;
+    use vector_lib::metric_tags;
 
     use super::*;
     use crate::{
diff --git a/src/sources/journald.rs b/src/sources/journald.rs
index a9d4fb7e9fa8a..3e59a5b472888 100644
--- a/src/sources/journald.rs
+++ b/src/sources/journald.rs
@@ -29,7 +29,7 @@ use tokio::{
 };
 use tokio_util::codec::FramedRead;
 use vector_config::configurable_component;
-use vector_core::{
+use vector_lib::{
     config::{LegacyKey, LogNamespace},
     schema::Definition,
     EstimatedJsonEncodedSizeOf,
diff --git a/src/sources/kafka.rs b/src/sources/kafka.rs
index e8d5bdf019cfc..49d57878733ac 100644
--- a/src/sources/kafka.rs
+++ b/src/sources/kafka.rs
@@ -43,11 +43,11 @@ use tokio::{
 use tokio_util::codec::FramedRead;
 
 use vector_config::configurable_component;
-use vector_core::{
+use vector_lib::finalizer::OrderedFinalizer;
+use vector_lib::{
     config::{LegacyKey, LogNamespace},
     EstimatedJsonEncodedSizeOf,
 };
-use vector_lib::finalizer::OrderedFinalizer;
 use vrl::value::{kind::Collection, Kind};
 
 use crate::{
@@ -1364,7 +1364,7 @@ impl ConsumerContext for KafkaSourceContext {
 #[cfg(test)]
 mod test {
     use lookup::OwnedTargetPath;
-    use vector_core::schema::Definition;
+    use vector_lib::schema::Definition;
 
     use super::*;
 
@@ -1532,7 +1532,7 @@ mod integration_test {
     use stream_cancel::{Trigger, Tripwire};
     use tokio::time::sleep;
     use vector_buffers::topology::channel::BufferReceiver;
-    use vector_core::event::EventStatus;
+    use vector_lib::event::EventStatus;
     use vrl::{event_path, value};
 
     use super::{test::*, *};
diff --git a/src/sources/kubernetes_logs/mod.rs b/src/sources/kubernetes_logs/mod.rs
index 9d5632a24aa76..a482b6115bcc6 100644
--- a/src/sources/kubernetes_logs/mod.rs
+++ b/src/sources/kubernetes_logs/mod.rs
@@ -27,7 +27,7 @@ use lifecycle::Lifecycle;
 use lookup::{lookup_v2::OptionalTargetPath, owned_value_path, path, OwnedTargetPath};
 use serde_with::serde_as;
 use vector_config::configurable_component;
-use vector_core::{config::LegacyKey, config::LogNamespace, EstimatedJsonEncodedSizeOf};
+use vector_lib::{config::LegacyKey, config::LogNamespace, EstimatedJsonEncodedSizeOf};
 use vector_lib::{
     internal_event::{ByteSize, BytesReceived, InternalEventHandle as _, Protocol},
     TimeZone,
@@ -1047,7 +1047,7 @@ fn prepare_label_selector(selector: &str) -> String {
 mod tests {
     use lookup::{owned_value_path, OwnedTargetPath};
     use similar_asserts::assert_eq;
-    use vector_core::{config::LogNamespace, schema::Definition};
+    use vector_lib::{config::LogNamespace, schema::Definition};
     use vrl::value::{kind::Collection, Kind};
 
     use crate::config::SourceConfig;
diff --git a/src/sources/kubernetes_logs/namespace_metadata_annotator.rs b/src/sources/kubernetes_logs/namespace_metadata_annotator.rs
index ab0ffe0e5c7c5..084dfa0593344 100644
--- a/src/sources/kubernetes_logs/namespace_metadata_annotator.rs
+++ b/src/sources/kubernetes_logs/namespace_metadata_annotator.rs
@@ -7,7 +7,7 @@ use kube::runtime::reflector::{store::Store, ObjectRef};
 use lookup::lookup_v2::OptionalTargetPath;
 use lookup::{lookup_v2::ValuePath, owned_value_path, path, OwnedTargetPath};
 use vector_config::configurable_component;
-use vector_core::config::{LegacyKey, LogNamespace};
+use vector_lib::config::{LegacyKey, LogNamespace};
 
 use crate::event::{Event, LogEvent};
 
diff --git a/src/sources/kubernetes_logs/node_metadata_annotator.rs b/src/sources/kubernetes_logs/node_metadata_annotator.rs
index 23e75d3c86f17..7e13cf5129ddd 100644
--- a/src/sources/kubernetes_logs/node_metadata_annotator.rs
+++ b/src/sources/kubernetes_logs/node_metadata_annotator.rs
@@ -8,7 +8,7 @@ use kube::runtime::reflector::{store::Store, ObjectRef};
 use lookup::lookup_v2::OptionalTargetPath;
 use lookup::{lookup_v2::ValuePath, owned_value_path, path, OwnedTargetPath};
 use vector_config::configurable_component;
-use vector_core::config::{LegacyKey, LogNamespace};
+use vector_lib::config::{LegacyKey, LogNamespace};
 
 use super::Config;
 
diff --git a/src/sources/kubernetes_logs/parser/cri.rs b/src/sources/kubernetes_logs/parser/cri.rs
index 044c5a0463c9b..ee1d5f18a65ab 100644
--- a/src/sources/kubernetes_logs/parser/cri.rs
+++ b/src/sources/kubernetes_logs/parser/cri.rs
@@ -1,7 +1,7 @@
 use chrono::{DateTime, Utc};
 use derivative::Derivative;
 use lookup::path;
-use vector_core::config::{log_schema, LegacyKey, LogNamespace};
+use vector_lib::config::{log_schema, LegacyKey, LogNamespace};
 use vector_lib::conversion;
 
 use crate::sources::kubernetes_logs::transform_utils::get_message_path;
diff --git a/src/sources/kubernetes_logs/parser/docker.rs b/src/sources/kubernetes_logs/parser/docker.rs
index df29f444c68cb..ee19343f44993 100644
--- a/src/sources/kubernetes_logs/parser/docker.rs
+++ b/src/sources/kubernetes_logs/parser/docker.rs
@@ -3,7 +3,7 @@ use chrono::{DateTime, Utc};
 use lookup::{path, OwnedTargetPath};
 use serde_json::Value as JsonValue;
 use snafu::{OptionExt, ResultExt, Snafu};
-use vector_core::config::{LegacyKey, LogNamespace};
+use vector_lib::config::{LegacyKey, LogNamespace};
 
 use crate::sources::kubernetes_logs::transform_utils::get_message_path;
 use crate::{
diff --git a/src/sources/kubernetes_logs/parser/mod.rs b/src/sources/kubernetes_logs/parser/mod.rs
index bcfa1923a3bb0..263f26c069ead 100644
--- a/src/sources/kubernetes_logs/parser/mod.rs
+++ b/src/sources/kubernetes_logs/parser/mod.rs
@@ -2,7 +2,7 @@ mod cri;
 mod docker;
 mod test_util;
 
-use vector_core::config::LogNamespace;
+use vector_lib::config::LogNamespace;
 
 use crate::sources::kubernetes_logs::transform_utils::get_message_path;
 use crate::{
diff --git a/src/sources/kubernetes_logs/parser/test_util.rs b/src/sources/kubernetes_logs/parser/test_util.rs
index fb89b88d7ab65..25657fe7a1cc6 100644
--- a/src/sources/kubernetes_logs/parser/test_util.rs
+++ b/src/sources/kubernetes_logs/parser/test_util.rs
@@ -3,7 +3,7 @@ use similar_asserts::assert_eq;
 
 use chrono::{DateTime, Utc};
 use lookup::{event_path, metadata_path};
-use vector_core::{config::LogNamespace, event};
+use vector_lib::{config::LogNamespace, event};
 use vrl::value;
 use vrl::value::Value;
 
diff --git a/src/sources/kubernetes_logs/partial_events_merger.rs b/src/sources/kubernetes_logs/partial_events_merger.rs
index 1151993b9050b..d3effb22c1c62 100644
--- a/src/sources/kubernetes_logs/partial_events_merger.rs
+++ b/src/sources/kubernetes_logs/partial_events_merger.rs
@@ -5,7 +5,7 @@ use futures::{Stream, StreamExt};
 use lookup::OwnedTargetPath;
 use std::collections::HashMap;
 use std::time::{Duration, Instant};
-use vector_core::config::LogNamespace;
+use vector_lib::config::LogNamespace;
 use vector_stream::expiration_map::{map_with_expiration, Emitter};
 use vrl::owned_value_path;
 
@@ -155,7 +155,7 @@ fn merge_partial_events_with_custom_expiration(
 #[cfg(test)]
 mod test {
     use super::*;
-    use vector_core::event::LogEvent;
+    use vector_lib::event::LogEvent;
     use vrl::value;
 
     #[tokio::test]
diff --git a/src/sources/kubernetes_logs/pod_metadata_annotator.rs b/src/sources/kubernetes_logs/pod_metadata_annotator.rs
index 04f253b16a59e..7cbdeefd708b6 100644
--- a/src/sources/kubernetes_logs/pod_metadata_annotator.rs
+++ b/src/sources/kubernetes_logs/pod_metadata_annotator.rs
@@ -12,7 +12,7 @@ use lookup::{
     owned_value_path, path, OwnedTargetPath,
 };
 use vector_config::configurable_component;
-use vector_core::config::{LegacyKey, LogNamespace};
+use vector_lib::config::{LegacyKey, LogNamespace};
 
 use super::{
     path_helpers::{parse_log_file_path, LogFileInfo},
diff --git a/src/sources/kubernetes_logs/transform_utils/mod.rs b/src/sources/kubernetes_logs/transform_utils/mod.rs
index 0a0bef487cd09..307d0f72d6fa8 100644
--- a/src/sources/kubernetes_logs/transform_utils/mod.rs
+++ b/src/sources/kubernetes_logs/transform_utils/mod.rs
@@ -1,4 +1,4 @@
-use vector_core::config::{log_schema, LogNamespace};
+use vector_lib::config::{log_schema, LogNamespace};
 use vrl::owned_value_path;
 use vrl::path::OwnedTargetPath;
 
diff --git a/src/sources/logstash.rs b/src/sources/logstash.rs
index ec3a038bd9739..59739ef5b0681 100644
--- a/src/sources/logstash.rs
+++ b/src/sources/logstash.rs
@@ -14,7 +14,7 @@ use smallvec::{smallvec, SmallVec};
 use snafu::{ResultExt, Snafu};
 use tokio_util::codec::Decoder;
 use vector_config::configurable_component;
-use vector_core::{
+use vector_lib::{
     config::{LegacyKey, LogNamespace},
     schema::Definition,
 };
diff --git a/src/sources/mod.rs b/src/sources/mod.rs
index 332dccd7f5e82..cb23446a98217 100644
--- a/src/sources/mod.rs
+++ b/src/sources/mod.rs
@@ -86,7 +86,7 @@ pub mod vector;
 
 pub mod util;
 
-pub use vector_core::source::Source;
+pub use vector_lib::source::Source;
 
 /// Common build errors
 #[derive(Debug, Snafu)]
diff --git a/src/sources/mongodb_metrics/mod.rs b/src/sources/mongodb_metrics/mod.rs
index 6c0798ef2278f..d39ce6dbca91d 100644
--- a/src/sources/mongodb_metrics/mod.rs
+++ b/src/sources/mongodb_metrics/mod.rs
@@ -16,7 +16,7 @@ use snafu::{ResultExt, Snafu};
 use tokio::time;
 use tokio_stream::wrappers::IntervalStream;
 use vector_config::configurable_component;
-use vector_core::{metric_tags, ByteSizeOf, EstimatedJsonEncodedSizeOf};
+use vector_lib::{metric_tags, ByteSizeOf, EstimatedJsonEncodedSizeOf};
 
 use crate::{
     config::{SourceConfig, SourceContext, SourceOutput},
@@ -29,7 +29,7 @@ use crate::{
 
 mod types;
 use types::{CommandBuildInfo, CommandIsMaster, CommandServerStatus, NodeType};
-use vector_core::config::LogNamespace;
+use vector_lib::config::LogNamespace;
 
 macro_rules! tags {
     ($tags:expr) => { $tags.clone() };
diff --git a/src/sources/nats.rs b/src/sources/nats.rs
index d6654846e23df..a8cf1730a5026 100644
--- a/src/sources/nats.rs
+++ b/src/sources/nats.rs
@@ -5,13 +5,13 @@ use lookup::{lookup_v2::OptionalValuePath, owned_value_path};
 use snafu::{ResultExt, Snafu};
 use tokio_util::codec::FramedRead;
 use vector_config::configurable_component;
-use vector_core::{
-    config::{LegacyKey, LogNamespace},
-    EstimatedJsonEncodedSizeOf,
-};
 use vector_lib::internal_event::{
     ByteSize, BytesReceived, CountByteSize, EventsReceived, InternalEventHandle as _, Protocol,
 };
+use vector_lib::{
+    config::{LegacyKey, LogNamespace},
+    EstimatedJsonEncodedSizeOf,
+};
 use vrl::value::Kind;
 
 use crate::{
@@ -271,7 +271,7 @@ mod tests {
     #![allow(clippy::print_stdout)] //tests
 
     use lookup::{owned_value_path, OwnedTargetPath};
-    use vector_core::schema::Definition;
+    use vector_lib::schema::Definition;
     use vrl::value::{kind::Collection, Kind};
 
     use super::*;
@@ -346,7 +346,7 @@ mod integration_tests {
     #![allow(clippy::print_stdout)] //tests
 
     use bytes::Bytes;
-    use vector_core::config::log_schema;
+    use vector_lib::config::log_schema;
 
     use super::*;
     use crate::nats::{NatsAuthCredentialsFile, NatsAuthNKey, NatsAuthToken, NatsAuthUserPassword};
diff --git a/src/sources/nginx_metrics/mod.rs b/src/sources/nginx_metrics/mod.rs
index b58c3e7d5416f..d010d8dbc7515 100644
--- a/src/sources/nginx_metrics/mod.rs
+++ b/src/sources/nginx_metrics/mod.rs
@@ -13,7 +13,7 @@ use snafu::{ResultExt, Snafu};
 use tokio::time;
 use tokio_stream::wrappers::IntervalStream;
 use vector_config::configurable_component;
-use vector_core::{metric_tags, EstimatedJsonEncodedSizeOf};
+use vector_lib::{metric_tags, EstimatedJsonEncodedSizeOf};
 
 use crate::{
     config::{SourceConfig, SourceContext, SourceOutput},
@@ -28,7 +28,7 @@ use crate::{
 
 pub mod parser;
 use parser::NginxStubStatus;
-use vector_core::config::LogNamespace;
+use vector_lib::config::LogNamespace;
 
 macro_rules! counter {
     ($value:expr) => {
diff --git a/src/sources/opentelemetry/grpc.rs b/src/sources/opentelemetry/grpc.rs
index 06c400626ea6b..1fb04ca7d4748 100644
--- a/src/sources/opentelemetry/grpc.rs
+++ b/src/sources/opentelemetry/grpc.rs
@@ -3,12 +3,12 @@ use opentelemetry_proto::proto::collector::logs::v1::{
     logs_service_server::LogsService, ExportLogsServiceRequest, ExportLogsServiceResponse,
 };
 use tonic::{Request, Response, Status};
-use vector_core::{
+use vector_lib::internal_event::{CountByteSize, InternalEventHandle as _, Registered};
+use vector_lib::{
     config::LogNamespace,
     event::{BatchNotifier, BatchStatus, BatchStatusReceiver, Event},
     EstimatedJsonEncodedSizeOf,
 };
-use vector_lib::internal_event::{CountByteSize, InternalEventHandle as _, Registered};
 
 use crate::{
     internal_events::{EventsReceived, StreamClosedError},
diff --git a/src/sources/opentelemetry/http.rs b/src/sources/opentelemetry/http.rs
index 8d914fb046281..86989f0efd55d 100644
--- a/src/sources/opentelemetry/http.rs
+++ b/src/sources/opentelemetry/http.rs
@@ -9,14 +9,14 @@ use opentelemetry_proto::proto::collector::logs::v1::{
 use prost::Message;
 use snafu::Snafu;
 use tracing::Span;
-use vector_core::{
+use vector_lib::internal_event::{
+    ByteSize, BytesReceived, CountByteSize, InternalEventHandle as _, Registered,
+};
+use vector_lib::{
     config::LogNamespace,
     event::{BatchNotifier, BatchStatus},
     EstimatedJsonEncodedSizeOf,
 };
-use vector_lib::internal_event::{
-    ByteSize, BytesReceived, CountByteSize, InternalEventHandle as _, Registered,
-};
 use warp::{filters::BoxedFilter, reject::Rejection, reply::Response, Filter, Reply};
 
 use crate::{
diff --git a/src/sources/opentelemetry/mod.rs b/src/sources/opentelemetry/mod.rs
index 24624ac470efb..c532577e26847 100644
--- a/src/sources/opentelemetry/mod.rs
+++ b/src/sources/opentelemetry/mod.rs
@@ -19,11 +19,11 @@ use opentelemetry_proto::convert::{
 
 use opentelemetry_proto::proto::collector::logs::v1::logs_service_server::LogsServiceServer;
 use vector_config::configurable_component;
-use vector_core::{
+use vector_lib::internal_event::{BytesReceived, EventsReceived, Protocol};
+use vector_lib::{
     config::{log_schema, LegacyKey, LogNamespace},
     schema::Definition,
 };
-use vector_lib::internal_event::{BytesReceived, EventsReceived, Protocol};
 use vrl::value::{kind::Collection, Kind};
 
 use self::{
diff --git a/src/sources/opentelemetry/tests.rs b/src/sources/opentelemetry/tests.rs
index fc538efad199d..30db2bbcfd264 100644
--- a/src/sources/opentelemetry/tests.rs
+++ b/src/sources/opentelemetry/tests.rs
@@ -12,7 +12,7 @@ use similar_asserts::assert_eq;
 use std::collections::BTreeMap;
 use std::sync::Arc;
 use tonic::Request;
-use vector_core::config::LogNamespace;
+use vector_lib::config::LogNamespace;
 use vrl::value;
 
 use crate::config::OutputId;
diff --git a/src/sources/postgresql_metrics.rs b/src/sources/postgresql_metrics.rs
index 64bef39a5eaa4..9ab9de3613ad8 100644
--- a/src/sources/postgresql_metrics.rs
+++ b/src/sources/postgresql_metrics.rs
@@ -26,12 +26,12 @@ use tokio_postgres::{
 };
 use tokio_stream::wrappers::IntervalStream;
 use vector_config::configurable_component;
-use vector_core::config::LogNamespace;
-use vector_core::{metric_tags, ByteSizeOf, EstimatedJsonEncodedSizeOf};
+use vector_lib::config::LogNamespace;
 use vector_lib::{
     internal_event::{CountByteSize, InternalEventHandle as _, Registered},
     json_size::JsonSize,
 };
+use vector_lib::{metric_tags, ByteSizeOf, EstimatedJsonEncodedSizeOf};
 
 use crate::{
     config::{SourceConfig, SourceContext, SourceOutput},
diff --git a/src/sources/prometheus/parser.rs b/src/sources/prometheus/parser.rs
index 4fe8ea4e3131c..9f7b4a64904f0 100644
--- a/src/sources/prometheus/parser.rs
+++ b/src/sources/prometheus/parser.rs
@@ -137,8 +137,8 @@ mod test {
     use chrono::{TimeZone, Timelike, Utc};
     use once_cell::sync::Lazy;
     use similar_asserts::assert_eq;
-    use vector_core::metric_tags;
     use vector_lib::assert_event_data_eq;
+    use vector_lib::metric_tags;
 
     use super::*;
     use crate::event::metric::{Metric, MetricKind, MetricValue};
@@ -658,7 +658,7 @@ mod test {
                 "http_request_duration_seconds",
                 MetricKind::Absolute,
                 MetricValue::AggregatedHistogram {
-                    buckets: vector_core::buckets![
+                    buckets: vector_lib::buckets![
                         0.05 => 24054, 0.1 => 9390, 0.2 => 66948, 0.5 => 28997, 1.0 => 4599
                     ],
                     count: 144320,
@@ -686,7 +686,7 @@ mod test {
                 "duration",
                 MetricKind::Absolute,
                 MetricValue::AggregatedHistogram {
-                    buckets: vector_core::buckets![1.0 => 133988],
+                    buckets: vector_lib::buckets![1.0 => 133988],
                     count: 144320,
                     sum: 53423.0,
                 },
@@ -713,7 +713,7 @@ mod test {
                 "duration",
                 MetricKind::Absolute,
                 MetricValue::AggregatedHistogram {
-                    buckets: vector_core::buckets![1.0 => 2000, 10.0 => 0],
+                    buckets: vector_lib::buckets![1.0 => 2000, 10.0 => 0],
                     count: 2000,
                     sum: 2000.0,
                 },
@@ -773,7 +773,7 @@ mod test {
             Ok(vec![
                 Metric::new(
                     "gitlab_runner_job_duration_seconds", MetricKind::Absolute, MetricValue::AggregatedHistogram {
-                        buckets: vector_core::buckets![
+                        buckets: vector_lib::buckets![
                             30.0 => 327,
                             60.0 => 147,
                             300.0 => 61,
@@ -793,7 +793,7 @@ mod test {
                     .with_timestamp(Some(*TIMESTAMP)),
                 Metric::new(
                     "gitlab_runner_job_duration_seconds", MetricKind::Absolute, MetricValue::AggregatedHistogram {
-                        buckets: vector_core::buckets![
+                        buckets: vector_lib::buckets![
                             30.0 => 1,
                             60.0 => 0,
                             300.0 => 0,
@@ -813,7 +813,7 @@ mod test {
                     .with_timestamp(Some(*TIMESTAMP)),
                 Metric::new(
                     "gitlab_runner_job_duration_seconds", MetricKind::Absolute, MetricValue::AggregatedHistogram {
-                        buckets: vector_core::buckets![
+                        buckets: vector_lib::buckets![
                             30.0 => 285, 60.0 => 880, 300.0 => 1906, 600.0 => 80, 1800.0 => 101, 3600.0 => 3,
                             7200.0 => 0, 10800.0 => 0, 18000.0 => 0, 36000.0 => 0
                         ],
@@ -857,7 +857,7 @@ mod test {
                     "rpc_duration_seconds",
                     MetricKind::Absolute,
                     MetricValue::AggregatedSummary {
-                        quantiles: vector_core::quantiles![
+                        quantiles: vector_lib::quantiles![
                             0.01 => 3102.0,
                             0.05 => 3272.0,
                             0.5 => 4773.0,
@@ -874,7 +874,7 @@ mod test {
                     "go_gc_duration_seconds",
                     MetricKind::Absolute,
                     MetricValue::AggregatedSummary {
-                        quantiles: vector_core::quantiles![
+                        quantiles: vector_lib::quantiles![
                             0.0 => 0.009460965,
                             0.25 => 0.009793382,
                             0.5 => 0.009870205,
diff --git a/src/sources/prometheus/remote_write.rs b/src/sources/prometheus/remote_write.rs
index dcec68ade1e30..54b568c381b98 100644
--- a/src/sources/prometheus/remote_write.rs
+++ b/src/sources/prometheus/remote_write.rs
@@ -4,7 +4,7 @@ use bytes::Bytes;
 use prometheus_parser::proto;
 use prost::Message;
 use vector_config::configurable_component;
-use vector_core::config::LogNamespace;
+use vector_lib::config::LogNamespace;
 use warp::http::{HeaderMap, StatusCode};
 
 use super::parser;
@@ -146,7 +146,7 @@ impl HttpSource for RemoteWriteSource {
 #[cfg(test)]
 mod test {
     use chrono::{SubsecRound as _, Utc};
-    use vector_core::{
+    use vector_lib::{
         event::{EventStatus, Metric, MetricKind, MetricValue},
         metric_tags,
     };
@@ -244,7 +244,7 @@ mod test {
                 "histogram_3",
                 MetricKind::Absolute,
                 MetricValue::AggregatedHistogram {
-                    buckets: vector_core::buckets![ 2.3 => 11, 4.2 => 85 ],
+                    buckets: vector_lib::buckets![ 2.3 => 11, 4.2 => 85 ],
                     count: 96,
                     sum: 156.2,
                 },
@@ -255,7 +255,7 @@ mod test {
                 "summary_4",
                 MetricKind::Absolute,
                 MetricValue::AggregatedSummary {
-                    quantiles: vector_core::quantiles![ 0.1 => 1.2, 0.5 => 3.6, 0.9 => 5.2 ],
+                    quantiles: vector_lib::quantiles![ 0.1 => 1.2, 0.5 => 3.6, 0.9 => 5.2 ],
                     count: 23,
                     sum: 8.6,
                 },
diff --git a/src/sources/prometheus/scrape.rs b/src/sources/prometheus/scrape.rs
index 2d6135348a198..62cf5bd10e600 100644
--- a/src/sources/prometheus/scrape.rs
+++ b/src/sources/prometheus/scrape.rs
@@ -7,7 +7,7 @@ use http::{response::Parts, Uri};
 use serde_with::serde_as;
 use snafu::{ResultExt, Snafu};
 use vector_config::configurable_component;
-use vector_core::{config::LogNamespace, event::Event};
+use vector_lib::{config::LogNamespace, event::Event};
 
 use super::parser;
 use crate::sources::util::http::HttpMethod;
@@ -534,7 +534,7 @@ mod test {
         .await;
         assert!(!events.is_empty());
 
-        let metrics: Vec<vector_core::event::Metric> = events
+        let metrics: Vec<vector_lib::event::Metric> = events
             .into_iter()
             .map(|event| event.into_metric())
             .collect();
diff --git a/src/sources/redis/mod.rs b/src/sources/redis/mod.rs
index 568a84701268c..066ec8ddc8f83 100644
--- a/src/sources/redis/mod.rs
+++ b/src/sources/redis/mod.rs
@@ -9,13 +9,13 @@ use lookup::{lookup_v2::OptionalValuePath, owned_value_path, path, OwnedValuePat
 use snafu::{ResultExt, Snafu};
 use tokio_util::codec::FramedRead;
 use vector_config::configurable_component;
-use vector_core::{
-    config::{LegacyKey, LogNamespace},
-    EstimatedJsonEncodedSizeOf,
-};
 use vector_lib::internal_event::{
     ByteSize, BytesReceived, CountByteSize, InternalEventHandle as _, Protocol, Registered,
 };
+use vector_lib::{
+    config::{LegacyKey, LogNamespace},
+    EstimatedJsonEncodedSizeOf,
+};
 use vrl::value::Kind;
 
 use crate::{
diff --git a/src/sources/socket/mod.rs b/src/sources/socket/mod.rs
index 896d1f374b968..d62b3d57d6ce6 100644
--- a/src/sources/socket/mod.rs
+++ b/src/sources/socket/mod.rs
@@ -6,7 +6,7 @@ mod unix;
 use codecs::decoding::DeserializerConfig;
 use lookup::{lookup_v2::OptionalValuePath, owned_value_path};
 use vector_config::configurable_component;
-use vector_core::config::{log_schema, LegacyKey, LogNamespace};
+use vector_lib::config::{log_schema, LegacyKey, LogNamespace};
 use vrl::value::{kind::Collection, Kind};
 
 #[cfg(unix)]
@@ -343,7 +343,7 @@ mod test {
         task::JoinHandle,
         time::{timeout, Duration, Instant},
     };
-    use vector_core::event::EventContainer;
+    use vector_lib::event::EventContainer;
     use vrl::btreemap;
     use vrl::value;
     use vrl::value::Value;
diff --git a/src/sources/socket/tcp.rs b/src/sources/socket/tcp.rs
index 1c0fb4574b101..d3d1a9c5f849b 100644
--- a/src/sources/socket/tcp.rs
+++ b/src/sources/socket/tcp.rs
@@ -6,7 +6,7 @@ use lookup::{lookup_v2::OptionalValuePath, owned_value_path, path};
 use serde_with::serde_as;
 use smallvec::SmallVec;
 use vector_config::configurable_component;
-use vector_core::config::{LegacyKey, LogNamespace};
+use vector_lib::config::{LegacyKey, LogNamespace};
 
 use crate::{
     codecs::Decoder,
diff --git a/src/sources/socket/udp.rs b/src/sources/socket/udp.rs
index 4add14a1694e8..e44e5abc3cdd7 100644
--- a/src/sources/socket/udp.rs
+++ b/src/sources/socket/udp.rs
@@ -9,11 +9,11 @@ use listenfd::ListenFd;
 use lookup::{lookup_v2::OptionalValuePath, owned_value_path, path};
 use tokio_util::codec::FramedRead;
 use vector_config::configurable_component;
-use vector_core::{
+use vector_lib::internal_event::{ByteSize, BytesReceived, InternalEventHandle as _, Protocol};
+use vector_lib::{
     config::{LegacyKey, LogNamespace},
     EstimatedJsonEncodedSizeOf,
 };
-use vector_lib::internal_event::{ByteSize, BytesReceived, InternalEventHandle as _, Protocol};
 
 use crate::{
     codecs::Decoder,
diff --git a/src/sources/socket/unix.rs b/src/sources/socket/unix.rs
index 52a0b362dd6c2..3b697b80210c1 100644
--- a/src/sources/socket/unix.rs
+++ b/src/sources/socket/unix.rs
@@ -5,7 +5,7 @@ use chrono::Utc;
 use codecs::decoding::{DeserializerConfig, FramingConfig};
 use lookup::{lookup_v2::OptionalValuePath, path};
 use vector_config::configurable_component;
-use vector_core::config::{LegacyKey, LogNamespace};
+use vector_lib::config::{LegacyKey, LogNamespace};
 use vector_lib::shutdown::ShutdownSignal;
 
 use crate::{
diff --git a/src/sources/splunk_hec/acknowledgements.rs b/src/sources/splunk_hec/acknowledgements.rs
index 644bd2eecea03..87075d5247f20 100644
--- a/src/sources/splunk_hec/acknowledgements.rs
+++ b/src/sources/splunk_hec/acknowledgements.rs
@@ -283,7 +283,7 @@ mod tests {
     use std::num::NonZeroU64;
 
     use tokio::{time, time::sleep};
-    use vector_core::event::{BatchNotifier, EventFinalizer, EventStatus};
+    use vector_lib::event::{BatchNotifier, EventFinalizer, EventStatus};
 
     use super::{Channel, HecAcknowledgementsConfig, IndexerAcknowledgement};
     use crate::shutdown::ShutdownSignal;
diff --git a/src/sources/splunk_hec/mod.rs b/src/sources/splunk_hec/mod.rs
index 1326cb48a234b..7b358df13443b 100644
--- a/src/sources/splunk_hec/mod.rs
+++ b/src/sources/splunk_hec/mod.rs
@@ -17,14 +17,14 @@ use serde_json::{de::Read as JsonRead, Deserializer, Value as JsonValue};
 use snafu::Snafu;
 use tracing::Span;
 use vector_config::configurable_component;
-use vector_core::{
+use vector_lib::internal_event::{CountByteSize, InternalEventHandle as _, Registered};
+use vector_lib::sensitive_string::SensitiveString;
+use vector_lib::{
     config::{LegacyKey, LogNamespace},
     event::BatchNotifier,
     schema::meaning,
     EstimatedJsonEncodedSizeOf,
 };
-use vector_lib::internal_event::{CountByteSize, InternalEventHandle as _, Registered};
-use vector_lib::sensitive_string::SensitiveString;
 use vrl::value::{kind::Collection, Kind};
 use warp::{filters::BoxedFilter, path, reject::Rejection, reply::Response, Filter, Reply};
 
@@ -182,7 +182,7 @@ impl SourceConfig for SplunkConfig {
 
         let schema_definition = match log_namespace {
             LogNamespace::Legacy => {
-                let definition = vector_core::schema::Definition::empty_legacy_namespace()
+                let definition = vector_lib::schema::Definition::empty_legacy_namespace()
                     .with_event_field(
                         &owned_value_path!("line"),
                         Kind::object(Collection::empty())
@@ -201,7 +201,7 @@ impl SourceConfig for SplunkConfig {
                     definition
                 }
             }
-            LogNamespace::Vector => vector_core::schema::Definition::new_with_default_metadata(
+            LogNamespace::Vector => vector_lib::schema::Definition::new_with_default_metadata(
                 Kind::bytes().or_object(Collection::empty()),
                 [log_namespace],
             ),
@@ -1213,8 +1213,8 @@ mod tests {
     use futures_util::Stream;
     use reqwest::{RequestBuilder, Response};
     use serde::Deserialize;
-    use vector_core::{event::EventStatus, schema::Definition};
     use vector_lib::sensitive_string::SensitiveString;
+    use vector_lib::{event::EventStatus, schema::Definition};
     use vrl::path::PathPrefix;
 
     use super::*;
diff --git a/src/sources/statsd/mod.rs b/src/sources/statsd/mod.rs
index df9227a3be956..8f4090c1e1a03 100644
--- a/src/sources/statsd/mod.rs
+++ b/src/sources/statsd/mod.rs
@@ -14,8 +14,8 @@ use serde_with::serde_as;
 use smallvec::{smallvec, SmallVec};
 use tokio_util::udp::UdpFramed;
 use vector_config::configurable_component;
-use vector_core::EstimatedJsonEncodedSizeOf;
 use vector_lib::internal_event::{CountByteSize, InternalEventHandle as _, Registered};
+use vector_lib::EstimatedJsonEncodedSizeOf;
 
 use self::parser::ParseError;
 use super::util::net::{try_bind_udp_socket, SocketListenAddr, TcpNullAcker, TcpSource};
@@ -41,7 +41,7 @@ mod unix;
 use parser::parse;
 #[cfg(unix)]
 use unix::{statsd_unix, UnixConfig};
-use vector_core::config::LogNamespace;
+use vector_lib::config::LogNamespace;
 
 /// Configuration for the `statsd` source.
 #[configurable_component(source("statsd", "Collect metrics emitted by the StatsD aggregator."))]
@@ -341,7 +341,7 @@ mod test {
         net::UdpSocket,
         time::{sleep, Duration, Instant},
     };
-    use vector_core::{
+    use vector_lib::{
         config::ComponentKey,
         event::{metric::TagValue, EventContainer},
     };
diff --git a/src/sources/statsd/parser.rs b/src/sources/statsd/parser.rs
index 8696726177dc2..a5c6f46c0d5a9 100644
--- a/src/sources/statsd/parser.rs
+++ b/src/sources/statsd/parser.rs
@@ -68,7 +68,7 @@ pub fn parse(packet: &str) -> Result<Metric, ParseError> {
             let val: f64 = parts[0].parse()?;
             Metric::new(
                 name, MetricKind::Incremental, MetricValue::Distribution {
-                    samples: vector_core::samples![convert_to_base_units(unit, val) => sample_rate as u32],
+                    samples: vector_lib::samples![convert_to_base_units(unit, val) => sample_rate as u32],
                     statistic: convert_to_statistic(unit),
                 },
             ).with_tags(tags)
@@ -215,8 +215,8 @@ impl From<ParseFloatError> for ParseError {
 
 #[cfg(test)]
 mod test {
-    use vector_core::{event::metric::TagValue, metric_tags};
     use vector_lib::assert_event_data_eq;
+    use vector_lib::{event::metric::TagValue, metric_tags};
 
     use super::{parse, sanitize_key, sanitize_sampling};
     use crate::event::metric::{Metric, MetricKind, MetricValue, StatisticKind};
@@ -301,7 +301,7 @@ mod test {
                 "glork",
                 MetricKind::Incremental,
                 MetricValue::Distribution {
-                    samples: vector_core::samples![0.320 => 10],
+                    samples: vector_lib::samples![0.320 => 10],
                     statistic: StatisticKind::Histogram
                 },
             )),
@@ -316,7 +316,7 @@ mod test {
                 "glork",
                 MetricKind::Incremental,
                 MetricValue::Distribution {
-                    samples: vector_core::samples![320.0 => 10],
+                    samples: vector_lib::samples![320.0 => 10],
                     statistic: StatisticKind::Histogram
                 },
             )
@@ -336,7 +336,7 @@ mod test {
                 "glork",
                 MetricKind::Incremental,
                 MetricValue::Distribution {
-                    samples: vector_core::samples![320.0 => 10],
+                    samples: vector_lib::samples![320.0 => 10],
                     statistic: StatisticKind::Summary
                 },
             )
diff --git a/src/sources/syslog.rs b/src/sources/syslog.rs
index 7ab6c5586fa3b..36a50291d80f9 100644
--- a/src/sources/syslog.rs
+++ b/src/sources/syslog.rs
@@ -14,7 +14,7 @@ use lookup::{lookup_v2::OptionalValuePath, path, OwnedValuePath};
 use smallvec::SmallVec;
 use tokio_util::udp::UdpFramed;
 use vector_config::configurable_component;
-use vector_core::config::{LegacyKey, LogNamespace};
+use vector_lib::config::{LegacyKey, LogNamespace};
 use vrl::event_path;
 
 #[cfg(unix)]
@@ -448,8 +448,8 @@ mod test {
     use serde::Deserialize;
     use tokio::time::{sleep, Duration, Instant};
     use tokio_util::codec::BytesCodec;
-    use vector_core::{config::ComponentKey, schema::Definition};
     use vector_lib::assert_event_data_eq;
+    use vector_lib::{config::ComponentKey, schema::Definition};
     use vrl::value::{kind::Collection, Kind, Value};
 
     use super::*;
diff --git a/src/sources/util/framestream.rs b/src/sources/util/framestream.rs
index 48555cc908a9e..0583c0413cf4b 100644
--- a/src/sources/util/framestream.rs
+++ b/src/sources/util/framestream.rs
@@ -603,7 +603,7 @@ mod test {
         time::{Duration, Instant},
     };
     use tokio_util::codec::{length_delimited, Framed};
-    use vector_core::config::{LegacyKey, LogNamespace};
+    use vector_lib::config::{LegacyKey, LogNamespace};
 
     use super::{
         build_framestream_unix_source, spawn_event_handling_tasks, ControlField, ControlHeader,
diff --git a/src/sources/util/http/prelude.rs b/src/sources/util/http/prelude.rs
index 3d96d1971c2f2..42482ef00aea4 100644
--- a/src/sources/util/http/prelude.rs
+++ b/src/sources/util/http/prelude.rs
@@ -1,11 +1,11 @@
 use std::{collections::HashMap, convert::TryFrom, fmt, net::SocketAddr};
-use vector_core::EstimatedJsonEncodedSizeOf;
+use vector_lib::EstimatedJsonEncodedSizeOf;
 
 use async_trait::async_trait;
 use bytes::Bytes;
 use futures::{FutureExt, TryFutureExt};
 use tracing::Span;
-use vector_core::{
+use vector_lib::{
     config::SourceAcknowledgementsConfig,
     event::{BatchNotifier, BatchStatus, BatchStatusReceiver, Event},
 };
diff --git a/src/sources/util/http/query.rs b/src/sources/util/http/query.rs
index 59a0bcb02c117..53dbf4fbf51c8 100644
--- a/src/sources/util/http/query.rs
+++ b/src/sources/util/http/query.rs
@@ -1,7 +1,7 @@
 use std::collections::HashMap;
 
 use lookup::path;
-use vector_core::{
+use vector_lib::{
     config::{LegacyKey, LogNamespace},
     event::Event,
 };
diff --git a/src/sources/util/http_client.rs b/src/sources/util/http_client.rs
index 2ec764f47b859..bc460851769c1 100644
--- a/src/sources/util/http_client.rs
+++ b/src/sources/util/http_client.rs
@@ -27,8 +27,8 @@ use crate::{
     tls::TlsSettings,
     SourceSender,
 };
-use vector_core::{config::proxy::ProxyConfig, event::Event, EstimatedJsonEncodedSizeOf};
 use vector_lib::shutdown::ShutdownSignal;
+use vector_lib::{config::proxy::ProxyConfig, event::Event, EstimatedJsonEncodedSizeOf};
 
 /// Contains the inputs generic to any http client.
 pub(crate) struct GenericHttpClientInputs {
diff --git a/src/sources/util/message_decoding.rs b/src/sources/util/message_decoding.rs
index b1fdece0264a2..255d7391e2c76 100644
--- a/src/sources/util/message_decoding.rs
+++ b/src/sources/util/message_decoding.rs
@@ -5,10 +5,10 @@ use chrono::{DateTime, Utc};
 use codecs::StreamDecodingError;
 use lookup::{metadata_path, path, PathPrefix};
 use tokio_util::codec::Decoder as _;
-use vector_core::{config::LogNamespace, EstimatedJsonEncodedSizeOf};
 use vector_lib::internal_event::{
     CountByteSize, EventsReceived, InternalEventHandle as _, Registered,
 };
+use vector_lib::{config::LogNamespace, EstimatedJsonEncodedSizeOf};
 
 use crate::{codecs::Decoder, config::log_schema, event::BatchNotifier, event::Event};
 
diff --git a/src/sources/util/mod.rs b/src/sources/util/mod.rs
index db8660fb05f94..779f42f149f32 100644
--- a/src/sources/util/mod.rs
+++ b/src/sources/util/mod.rs
@@ -74,8 +74,8 @@ pub use self::message_decoding::decode_message;
 #[cfg(any(feature = "sources-statsd", feature = "sources-datadog_agent"))]
 pub fn extract_tag_key_and_value<S: AsRef<str>>(
     tag_chunk: S,
-) -> (String, vector_core::event::metric::TagValue) {
-    use vector_core::event::metric::TagValue;
+) -> (String, vector_lib::event::metric::TagValue) {
+    use vector_lib::event::metric::TagValue;
 
     let tag_chunk = tag_chunk.as_ref();
 
diff --git a/src/sources/util/net/tcp/mod.rs b/src/sources/util/net/tcp/mod.rs
index d72b8dd27d878..c9d049f224d7b 100644
--- a/src/sources/util/net/tcp/mod.rs
+++ b/src/sources/util/net/tcp/mod.rs
@@ -17,11 +17,11 @@ use tokio::{
 };
 use tokio_util::codec::{Decoder, FramedRead};
 use tracing::Instrument;
-use vector_core::{
+use vector_lib::finalization::AddBatchNotifier;
+use vector_lib::{
     config::{LegacyKey, LogNamespace, SourceAcknowledgementsConfig},
     EstimatedJsonEncodedSizeOf,
 };
-use vector_lib::finalization::AddBatchNotifier;
 use vrl::value::Value;
 
 use self::request_limiter::RequestLimiter;
diff --git a/src/sources/util/unix_datagram.rs b/src/sources/util/unix_datagram.rs
index f452dddf334d1..bc9371e06b109 100644
--- a/src/sources/util/unix_datagram.rs
+++ b/src/sources/util/unix_datagram.rs
@@ -6,8 +6,8 @@ use futures::StreamExt;
 use tokio::net::UnixDatagram;
 use tokio_util::codec::FramedRead;
 use tracing::field;
-use vector_core::EstimatedJsonEncodedSizeOf;
 use vector_lib::internal_event::{ByteSize, BytesReceived, InternalEventHandle as _, Protocol};
+use vector_lib::EstimatedJsonEncodedSizeOf;
 
 use crate::{
     codecs::Decoder,
diff --git a/src/sources/util/unix_stream.rs b/src/sources/util/unix_stream.rs
index 9a035b835d58e..8c1712477063d 100644
--- a/src/sources/util/unix_stream.rs
+++ b/src/sources/util/unix_stream.rs
@@ -11,8 +11,8 @@ use tokio::{
 use tokio_stream::wrappers::UnixListenerStream;
 use tokio_util::codec::FramedRead;
 use tracing::{field, Instrument};
-use vector_core::EstimatedJsonEncodedSizeOf;
 use vector_lib::internal_event::{ByteSize, BytesReceived, InternalEventHandle as _, Protocol};
+use vector_lib::EstimatedJsonEncodedSizeOf;
 
 use super::AfterReadExt;
 use crate::{
diff --git a/src/sources/vector/mod.rs b/src/sources/vector/mod.rs
index 45fdd5113e7dd..5780aff0638e4 100644
--- a/src/sources/vector/mod.rs
+++ b/src/sources/vector/mod.rs
@@ -6,12 +6,12 @@ use codecs::NativeDeserializerConfig;
 use futures::TryFutureExt;
 use tonic::{Request, Response, Status};
 use vector_config::configurable_component;
-use vector_core::{
+use vector_lib::internal_event::{CountByteSize, InternalEventHandle as _};
+use vector_lib::{
     config::LogNamespace,
     event::{BatchNotifier, BatchStatus, BatchStatusReceiver, Event},
     EstimatedJsonEncodedSizeOf,
 };
-use vector_lib::internal_event::{CountByteSize, InternalEventHandle as _};
 
 use crate::{
     config::{
@@ -215,7 +215,7 @@ impl SourceConfig for VectorConfig {
 #[cfg(test)]
 mod test {
     use lookup::owned_value_path;
-    use vector_core::{config::LogNamespace, schema::Definition};
+    use vector_lib::{config::LogNamespace, schema::Definition};
     use vrl::value::{kind::Collection, Kind};
 
     use crate::config::SourceConfig;
@@ -281,8 +281,8 @@ mod tests {
         sinks::vector::VectorConfig as SinkConfig,
         test_util, SourceSender,
     };
-    use vector_core::config::log_schema;
     use vector_lib::assert_event_data_eq;
+    use vector_lib::config::log_schema;
 
     async fn run_test(vector_source_config_str: &str, addr: SocketAddr) {
         let config = format!(r#"address = "{}""#, addr);
diff --git a/src/template.rs b/src/template.rs
index 570b27a55fa0a..f1db00d4792a4 100644
--- a/src/template.rs
+++ b/src/template.rs
@@ -374,7 +374,7 @@ fn render_timestamp(items: &ParsedStrftime, event: EventRef<'_>) -> String {
 mod tests {
     use chrono::TimeZone;
     use lookup::metadata_path;
-    use vector_core::metric_tags;
+    use vector_lib::metric_tags;
 
     use super::*;
     use crate::event::{Event, LogEvent, MetricKind, MetricValue};
diff --git a/src/test_util/components.rs b/src/test_util/components.rs
index e819bee0352bf..8e08275a9bcb5 100644
--- a/src/test_util/components.rs
+++ b/src/test_util/components.rs
@@ -13,7 +13,7 @@ use futures::{stream, SinkExt, Stream, StreamExt};
 use futures_util::Future;
 use once_cell::sync::Lazy;
 use tokio::{pin, select, time::sleep};
-use vector_core::event_test_util;
+use vector_lib::event_test_util;
 
 use crate::{
     config::{SourceConfig, SourceContext},
diff --git a/src/test_util/metrics.rs b/src/test_util/metrics.rs
index 749df9d736ce9..fb9b82833d456 100644
--- a/src/test_util/metrics.rs
+++ b/src/test_util/metrics.rs
@@ -2,7 +2,7 @@ use std::collections::{HashMap, HashSet};
 
 use std::fmt::Display;
 
-use vector_core::event::{
+use vector_lib::event::{
     metric::{Bucket, MetricData, MetricSeries, Sample},
     Event, EventMetadata, Metric, MetricValue, StatisticKind,
 };
@@ -144,8 +144,8 @@ pub fn read_set_values(metrics: &SplitMetrics, series: MetricSeries) -> Option<H
 #[macro_export]
 macro_rules! series {
 	($name:expr) => {
-		vector_core::event::metric::MetricSeries {
-			name: vector_core::event::metric::MetricName {
+		vector_lib::event::metric::MetricSeries {
+			name: vector_lib::event::metric::MetricName {
 				name: $name.into(),
 				namespace: None,
 			},
@@ -153,12 +153,12 @@ macro_rules! series {
 		}
 	};
 	($name:expr, $($tk:expr => $tv:expr),*) => {
-		vector_core::event::metric::MetricSeries {
-			name: vector_core::event::metric::MetricName {
+		vector_lib::event::metric::MetricSeries {
+			name: vector_lib::event::metric::MetricName {
 				name: $name.into(),
 				namespace: None,
 			},
-			tags: Some(vector_core::metric_tags!( $( $tk => $tv, )* )),
+			tags: Some(vector_lib::metric_tags!( $( $tk => $tv, )* )),
 		}
 	};
 }
diff --git a/src/test_util/mock/mod.rs b/src/test_util/mock/mod.rs
index 3fb594b677e7a..e63a23fcdaf8b 100644
--- a/src/test_util/mock/mod.rs
+++ b/src/test_util/mock/mod.rs
@@ -3,7 +3,7 @@ use std::sync::{atomic::AtomicUsize, Arc};
 use futures_util::Stream;
 use stream_cancel::Trigger;
 use tokio::sync::oneshot::Sender;
-use vector_core::event::EventArray;
+use vector_lib::event::EventArray;
 
 use crate::SourceSender;
 
diff --git a/src/test_util/mock/sinks/basic.rs b/src/test_util/mock/sinks/basic.rs
index abd7faefe7824..be772d7e6de38 100644
--- a/src/test_util/mock/sinks/basic.rs
+++ b/src/test_util/mock/sinks/basic.rs
@@ -3,12 +3,12 @@ use futures_util::{stream::BoxStream, FutureExt, StreamExt};
 use snafu::Snafu;
 use tokio::sync::oneshot;
 use vector_config::configurable_component;
-use vector_core::{
+use vector_lib::finalization::Finalizable;
+use vector_lib::{
     config::{AcknowledgementsConfig, Input},
     event::Event,
     sink::{StreamSink, VectorSink},
 };
-use vector_lib::finalization::Finalizable;
 
 use crate::{
     config::{SinkConfig, SinkContext},
diff --git a/src/test_util/mock/sinks/error.rs b/src/test_util/mock/sinks/error.rs
index bb6c7d6a9e323..94960d4f270cf 100644
--- a/src/test_util/mock/sinks/error.rs
+++ b/src/test_util/mock/sinks/error.rs
@@ -6,7 +6,7 @@ use std::{
 use async_trait::async_trait;
 use futures_util::{future::ok, FutureExt, Sink};
 use vector_config::configurable_component;
-use vector_core::{
+use vector_lib::{
     config::{AcknowledgementsConfig, Input},
     event::Event,
     sink::VectorSink,
diff --git a/src/test_util/mock/sinks/oneshot.rs b/src/test_util/mock/sinks/oneshot.rs
index 3ebc5a27e4b9e..045dc6d4e6f25 100644
--- a/src/test_util/mock/sinks/oneshot.rs
+++ b/src/test_util/mock/sinks/oneshot.rs
@@ -4,7 +4,7 @@ use async_trait::async_trait;
 use futures_util::{stream::BoxStream, StreamExt};
 use tokio::sync::oneshot::Sender;
 use vector_config::configurable_component;
-use vector_core::{
+use vector_lib::{
     config::{AcknowledgementsConfig, Input},
     event::EventArray,
     sink::{StreamSink, VectorSink},
diff --git a/src/test_util/mock/sinks/panic.rs b/src/test_util/mock/sinks/panic.rs
index 22f56157679ed..75ba456fd10b3 100644
--- a/src/test_util/mock/sinks/panic.rs
+++ b/src/test_util/mock/sinks/panic.rs
@@ -6,7 +6,7 @@ use std::{
 use async_trait::async_trait;
 use futures_util::{future::ok, FutureExt, Sink};
 use vector_config::configurable_component;
-use vector_core::{
+use vector_lib::{
     config::{AcknowledgementsConfig, Input},
     event::Event,
     sink::VectorSink,
diff --git a/src/test_util/mock/sources/backpressure.rs b/src/test_util/mock/sources/backpressure.rs
index 146a3b6d2a828..67598b87e42f6 100644
--- a/src/test_util/mock/sources/backpressure.rs
+++ b/src/test_util/mock/sources/backpressure.rs
@@ -6,12 +6,12 @@ use std::sync::{
 use async_trait::async_trait;
 use futures_util::FutureExt;
 use vector_config::configurable_component;
-use vector_core::{
+use vector_lib::{
     config::LogNamespace,
     event::{Event, LogEvent},
     schema::Definition,
 };
-use vector_core::{
+use vector_lib::{
     config::{DataType, SourceOutput},
     source::Source,
 };
diff --git a/src/test_util/mock/sources/basic.rs b/src/test_util/mock/sources/basic.rs
index 7ffeb6d3d0da2..7ec4b50939116 100644
--- a/src/test_util/mock/sources/basic.rs
+++ b/src/test_util/mock/sources/basic.rs
@@ -6,8 +6,8 @@ use std::sync::{
 use async_trait::async_trait;
 use vector_buffers::topology::channel::{limited, LimitedReceiver};
 use vector_config::configurable_component;
-use vector_core::{config::LogNamespace, schema::Definition};
-use vector_core::{
+use vector_lib::{config::LogNamespace, schema::Definition};
+use vector_lib::{
     config::{DataType, SourceOutput},
     event::{EventArray, EventContainer},
     source::Source,
diff --git a/src/test_util/mock/sources/error.rs b/src/test_util/mock/sources/error.rs
index 360f15632c1e4..daedd17e9cdbf 100644
--- a/src/test_util/mock/sources/error.rs
+++ b/src/test_util/mock/sources/error.rs
@@ -1,9 +1,9 @@
 use async_trait::async_trait;
 use futures_util::{future::err, FutureExt};
 use vector_config::configurable_component;
-use vector_core::config::LogNamespace;
-use vector_core::schema::Definition;
-use vector_core::{
+use vector_lib::config::LogNamespace;
+use vector_lib::schema::Definition;
+use vector_lib::{
     config::{DataType, SourceOutput},
     source::Source,
 };
diff --git a/src/test_util/mock/sources/panic.rs b/src/test_util/mock/sources/panic.rs
index 65f895f9eaf6d..2ca6cf402174f 100644
--- a/src/test_util/mock/sources/panic.rs
+++ b/src/test_util/mock/sources/panic.rs
@@ -1,8 +1,8 @@
 use async_trait::async_trait;
 use vector_config::configurable_component;
-use vector_core::config::LogNamespace;
-use vector_core::schema::Definition;
-use vector_core::{
+use vector_lib::config::LogNamespace;
+use vector_lib::schema::Definition;
+use vector_lib::{
     config::{DataType, SourceOutput},
     source::Source,
 };
diff --git a/src/test_util/mock/sources/tripwire.rs b/src/test_util/mock/sources/tripwire.rs
index 5a8d91a143a62..81b2cb05d84d8 100644
--- a/src/test_util/mock/sources/tripwire.rs
+++ b/src/test_util/mock/sources/tripwire.rs
@@ -4,9 +4,9 @@ use async_trait::async_trait;
 use futures_util::{future, FutureExt};
 use stream_cancel::{Trigger, Tripwire};
 use vector_config::configurable_component;
-use vector_core::config::LogNamespace;
-use vector_core::schema::Definition;
-use vector_core::{
+use vector_lib::config::LogNamespace;
+use vector_lib::schema::Definition;
+use vector_lib::{
     config::{DataType, SourceOutput},
     source::Source,
 };
diff --git a/src/test_util/mock/transforms/basic.rs b/src/test_util/mock/transforms/basic.rs
index e7906351706f9..4aecc2398f76d 100644
--- a/src/test_util/mock/transforms/basic.rs
+++ b/src/test_util/mock/transforms/basic.rs
@@ -2,8 +2,8 @@ use std::collections::BTreeSet;
 
 use async_trait::async_trait;
 use vector_config::configurable_component;
-use vector_core::config::LogNamespace;
-use vector_core::{
+use vector_lib::config::LogNamespace;
+use vector_lib::{
     config::{DataType, Input, TransformOutput},
     event::{
         metric::{MetricData, Sample},
diff --git a/src/test_util/mock/transforms/error_definitions.rs b/src/test_util/mock/transforms/error_definitions.rs
index 00c2a40223e3a..2b9a4333589f3 100644
--- a/src/test_util/mock/transforms/error_definitions.rs
+++ b/src/test_util/mock/transforms/error_definitions.rs
@@ -1,7 +1,7 @@
 use async_trait::async_trait;
 use snafu::Snafu;
 use vector_config::configurable_component;
-use vector_core::{
+use vector_lib::{
     config::{DataType, Input, LogNamespace, TransformOutput},
     schema::Definition,
     transform::Transform,
diff --git a/src/test_util/mock/transforms/noop.rs b/src/test_util/mock/transforms/noop.rs
index b1d23002734e9..7e19e020602ef 100644
--- a/src/test_util/mock/transforms/noop.rs
+++ b/src/test_util/mock/transforms/noop.rs
@@ -3,8 +3,8 @@ use std::pin::Pin;
 use async_trait::async_trait;
 use futures_util::Stream;
 use vector_config::configurable_component;
-use vector_core::config::LogNamespace;
-use vector_core::{
+use vector_lib::config::LogNamespace;
+use vector_lib::{
     config::{DataType, Input, TransformOutput},
     event::{Event, EventContainer},
     schema::Definition,
diff --git a/src/test_util/mod.rs b/src/test_util/mod.rs
index b91c2ffb0dd97..a58ef0bcf5369 100644
--- a/src/test_util/mod.rs
+++ b/src/test_util/mod.rs
@@ -35,7 +35,7 @@ use tokio_stream::wrappers::TcpListenerStream;
 use tokio_stream::wrappers::UnixListenerStream;
 use tokio_util::codec::{Encoder, FramedRead, FramedWrite, LinesCodec};
 use vector_buffers::topology::channel::LimitedReceiver;
-use vector_core::event::{BatchNotifier, Event, EventArray, LogEvent};
+use vector_lib::event::{BatchNotifier, Event, EventArray, LogEvent};
 #[cfg(test)]
 use zstd::Decoder as ZstdDecoder;
 
@@ -133,7 +133,7 @@ pub fn trace_init() {
     trace::init(color, false, &levels, 10);
 
     // Initialize metrics as well
-    vector_core::metrics::init_test();
+    vector_lib::metrics::init_test();
 }
 
 pub async fn send_lines(
diff --git a/src/test_util/stats.rs b/src/test_util/stats.rs
index b05e7d3b9d9fc..6e09de735df90 100644
--- a/src/test_util/stats.rs
+++ b/src/test_util/stats.rs
@@ -7,7 +7,7 @@ use std::{
 };
 
 use ordered_float::OrderedFloat;
-use vector_core::event::metric::Bucket;
+use vector_lib::event::metric::Bucket;
 
 #[derive(Copy, Clone, Debug, Default)]
 pub struct HistogramStats {
diff --git a/src/top/state.rs b/src/top/state.rs
index bf478e43dea8c..09026bbde13f8 100644
--- a/src/top/state.rs
+++ b/src/top/state.rs
@@ -6,7 +6,7 @@ use ratatui::{
     text::Span,
 };
 use tokio::sync::mpsc;
-use vector_core::internal_event::DEFAULT_OUTPUT;
+use vector_lib::internal_event::DEFAULT_OUTPUT;
 
 use crate::config::ComponentKey;
 
diff --git a/src/topology/builder.rs b/src/topology/builder.rs
index df40da7c25e83..dc8f268258b1c 100644
--- a/src/topology/builder.rs
+++ b/src/topology/builder.rs
@@ -16,9 +16,12 @@ use tokio::{
     time::{timeout, Duration},
 };
 use tracing::Instrument;
-use vector_core::config::LogNamespace;
-use vector_core::transform::update_runtime_schema_definition;
-use vector_core::{
+use vector_lib::config::LogNamespace;
+use vector_lib::internal_event::{
+    self, CountByteSize, EventsSent, InternalEventHandle as _, Registered,
+};
+use vector_lib::transform::update_runtime_schema_definition;
+use vector_lib::{
     buffers::{
         topology::{
             builder::TopologyBuilder,
@@ -29,9 +32,6 @@ use vector_core::{
     schema::Definition,
     EstimatedJsonEncodedSizeOf,
 };
-use vector_lib::internal_event::{
-    self, CountByteSize, EventsSent, InternalEventHandle as _, Registered,
-};
 
 use super::{
     fanout::{self, Fanout},
diff --git a/src/topology/mod.rs b/src/topology/mod.rs
index 06adb8d63bd39..8d3b2c604f24f 100644
--- a/src/topology/mod.rs
+++ b/src/topology/mod.rs
@@ -7,7 +7,7 @@
 //! part contains config related items including config traits for
 //! each type of component.
 
-pub(super) use vector_core::fanout;
+pub(super) use vector_lib::fanout;
 pub mod schema;
 
 pub mod builder;
diff --git a/src/topology/schema.rs b/src/topology/schema.rs
index bd0974a5adeaf..47380fbf13e94 100644
--- a/src/topology/schema.rs
+++ b/src/topology/schema.rs
@@ -1,7 +1,7 @@
 use std::collections::HashMap;
 
 use snafu::Snafu;
-use vector_core::config::SourceOutput;
+use vector_lib::config::SourceOutput;
 
 pub(super) use crate::schema::Definition;
 
@@ -444,7 +444,7 @@ mod tests {
     use indexmap::IndexMap;
     use lookup::owned_value_path;
     use similar_asserts::assert_eq;
-    use vector_core::config::{DataType, SourceOutput, TransformOutput};
+    use vector_lib::config::{DataType, SourceOutput, TransformOutput};
     use vrl::value::Kind;
 
     use super::*;
diff --git a/src/topology/task.rs b/src/topology/task.rs
index c09b3a25e1c4f..85175d236db00 100644
--- a/src/topology/task.rs
+++ b/src/topology/task.rs
@@ -10,7 +10,7 @@ use pin_project::pin_project;
 use snafu::Snafu;
 use tokio::task::JoinError;
 use vector_buffers::topology::channel::BufferReceiverStream;
-use vector_core::event::EventArray;
+use vector_lib::event::EventArray;
 
 use crate::{config::ComponentKey, utilization::Utilization};
 
diff --git a/src/topology/test/backpressure.rs b/src/topology/test/backpressure.rs
index bf16f93611e04..08d3043da4cd1 100644
--- a/src/topology/test/backpressure.rs
+++ b/src/topology/test/backpressure.rs
@@ -3,7 +3,7 @@ use std::sync::Arc;
 
 use tokio::time::Duration;
 use vector_buffers::{BufferConfig, BufferType, WhenFull};
-use vector_core::config::MEMORY_BUFFER_DEFAULT_MAX_EVENTS;
+use vector_lib::config::MEMORY_BUFFER_DEFAULT_MAX_EVENTS;
 
 use crate::{config::Config, test_util, test_util::start_topology};
 use crate::{config::SinkOuter, test_util::mock::backpressure_source};
diff --git a/src/topology/test/compliance.rs b/src/topology/test/compliance.rs
index 001fbbc422643..537418d155878 100644
--- a/src/topology/test/compliance.rs
+++ b/src/topology/test/compliance.rs
@@ -1,9 +1,9 @@
 use std::sync::Arc;
 
 use tokio::sync::oneshot::{channel, Receiver};
-use vector_core::config::OutputId;
-use vector_core::event::{Event, EventArray, EventContainer, LogEvent};
 use vector_lib::config::ComponentKey;
+use vector_lib::config::OutputId;
+use vector_lib::event::{Event, EventArray, EventContainer, LogEvent};
 
 use crate::config::schema::Definition;
 use crate::{
diff --git a/src/topology/test/mod.rs b/src/topology/test/mod.rs
index 79388ee5f83cf..53c7b84e471e7 100644
--- a/src/topology/test/mod.rs
+++ b/src/topology/test/mod.rs
@@ -27,8 +27,8 @@ use tokio::{
     time::{sleep, Duration},
 };
 use vector_buffers::{BufferConfig, BufferType, WhenFull};
-use vector_core::config::OutputId;
 use vector_lib::config::ComponentKey;
+use vector_lib::config::OutputId;
 
 mod backpressure;
 mod compliance;
diff --git a/src/topology/test/reload.rs b/src/topology/test/reload.rs
index 165a93b52f1a1..4c05a5d00a9b2 100644
--- a/src/topology/test/reload.rs
+++ b/src/topology/test/reload.rs
@@ -8,7 +8,7 @@ use futures::StreamExt;
 use tokio::time::sleep;
 use tokio_stream::wrappers::UnboundedReceiverStream;
 use vector_buffers::{BufferConfig, BufferType, WhenFull};
-use vector_core::config::ComponentKey;
+use vector_lib::config::ComponentKey;
 
 use crate::{
     config::Config,
diff --git a/src/transforms/aggregate.rs b/src/transforms/aggregate.rs
index bea73ed8dae0f..3b6c78988a1c5 100644
--- a/src/transforms/aggregate.rs
+++ b/src/transforms/aggregate.rs
@@ -7,7 +7,7 @@ use std::{
 use async_stream::stream;
 use futures::{Stream, StreamExt};
 use vector_config::configurable_component;
-use vector_core::config::LogNamespace;
+use vector_lib::config::LogNamespace;
 
 use crate::{
     config::{DataType, Input, OutputId, TransformConfig, TransformContext, TransformOutput},
diff --git a/src/transforms/aws_ec2_metadata.rs b/src/transforms/aws_ec2_metadata.rs
index 0353ba846a97d..995fbafe9b4c5 100644
--- a/src/transforms/aws_ec2_metadata.rs
+++ b/src/transforms/aws_ec2_metadata.rs
@@ -15,7 +15,7 @@ use snafu::ResultExt as _;
 use tokio::time::{sleep, Duration, Instant};
 use tracing::Instrument;
 use vector_config::configurable_component;
-use vector_core::config::LogNamespace;
+use vector_lib::config::LogNamespace;
 use vrl::value::kind::Collection;
 use vrl::value::Kind;
 
diff --git a/src/transforms/dedupe.rs b/src/transforms/dedupe.rs
index a24e2c81cea0d..16794b5ff8f78 100644
--- a/src/transforms/dedupe.rs
+++ b/src/transforms/dedupe.rs
@@ -5,7 +5,7 @@ use futures::{Stream, StreamExt};
 use lookup::lookup_v2::ConfigTargetPath;
 use lru::LruCache;
 use vector_config::configurable_component;
-use vector_core::config::{clone_input_definitions, LogNamespace};
+use vector_lib::config::{clone_input_definitions, LogNamespace};
 use vrl::path::OwnedTargetPath;
 
 use crate::{
@@ -298,8 +298,8 @@ mod tests {
     use lookup::lookup_v2::ConfigTargetPath;
     use tokio::sync::mpsc;
     use tokio_stream::wrappers::ReceiverStream;
-    use vector_core::config::OutputId;
     use vector_lib::config::ComponentKey;
+    use vector_lib::config::OutputId;
 
     use crate::config::schema::Definition;
     use crate::{
diff --git a/src/transforms/filter.rs b/src/transforms/filter.rs
index 7a195b3be1e68..ec6013d18037c 100644
--- a/src/transforms/filter.rs
+++ b/src/transforms/filter.rs
@@ -1,5 +1,5 @@
 use vector_config::configurable_component;
-use vector_core::config::{clone_input_definitions, LogNamespace};
+use vector_lib::config::{clone_input_definitions, LogNamespace};
 use vector_lib::internal_event::{Count, InternalEventHandle as _, Registered};
 
 use crate::{
@@ -100,8 +100,8 @@ mod test {
 
     use tokio::sync::mpsc;
     use tokio_stream::wrappers::ReceiverStream;
-    use vector_core::event::{Metric, MetricKind, MetricValue};
     use vector_lib::config::ComponentKey;
+    use vector_lib::event::{Metric, MetricKind, MetricValue};
 
     use super::*;
     use crate::config::schema::Definition;
diff --git a/src/transforms/log_to_metric.rs b/src/transforms/log_to_metric.rs
index 8bc0ed531a5e1..95e6a7f25cc57 100644
--- a/src/transforms/log_to_metric.rs
+++ b/src/transforms/log_to_metric.rs
@@ -4,7 +4,7 @@ use std::{collections::HashMap, num::ParseFloatError};
 use chrono::Utc;
 use indexmap::IndexMap;
 use vector_config::configurable_component;
-use vector_core::{config::LogNamespace, event::DatadogMetricOriginMetadata};
+use vector_lib::{config::LogNamespace, event::DatadogMetricOriginMetadata};
 use vrl::path::parse_target_path;
 
 use crate::config::schema::Definition;
@@ -324,7 +324,7 @@ fn to_metric(config: &MetricConfig, event: &Event) -> Result<Metric, TransformEr
             (
                 MetricKind::Incremental,
                 MetricValue::Distribution {
-                    samples: vector_core::samples![value => 1],
+                    samples: vector_lib::samples![value => 1],
                     statistic: StatisticKind::Histogram,
                 },
             )
@@ -340,7 +340,7 @@ fn to_metric(config: &MetricConfig, event: &Event) -> Result<Metric, TransformEr
             (
                 MetricKind::Incremental,
                 MetricValue::Distribution {
-                    samples: vector_core::samples![value => 1],
+                    samples: vector_lib::samples![value => 1],
                     statistic: StatisticKind::Summary,
                 },
             )
@@ -436,8 +436,8 @@ mod tests {
     use std::time::Duration;
     use tokio::sync::mpsc;
     use tokio_stream::wrappers::ReceiverStream;
-    use vector_core::metric_tags;
     use vector_lib::config::ComponentKey;
+    use vector_lib::metric_tags;
 
     #[test]
     fn generate_config() {
@@ -1084,7 +1084,7 @@ mod tests {
                 "response_time",
                 MetricKind::Incremental,
                 MetricValue::Distribution {
-                    samples: vector_core::samples![2.5 => 1],
+                    samples: vector_lib::samples![2.5 => 1],
                     statistic: StatisticKind::Histogram
                 },
                 metadata
@@ -1127,7 +1127,7 @@ mod tests {
                 "response_time",
                 MetricKind::Incremental,
                 MetricValue::Distribution {
-                    samples: vector_core::samples![2.5 => 1],
+                    samples: vector_lib::samples![2.5 => 1],
                     statistic: StatisticKind::Summary
                 },
                 metadata
diff --git a/src/transforms/lua/mod.rs b/src/transforms/lua/mod.rs
index ee9767f9f20b2..b3b543162fa3c 100644
--- a/src/transforms/lua/mod.rs
+++ b/src/transforms/lua/mod.rs
@@ -2,7 +2,7 @@ pub mod v1;
 pub mod v2;
 
 use vector_config::configurable_component;
-use vector_core::config::{ComponentKey, LogNamespace};
+use vector_lib::config::{ComponentKey, LogNamespace};
 
 use crate::{
     config::{GenerateConfig, Input, OutputId, TransformConfig, TransformContext, TransformOutput},
diff --git a/src/transforms/lua/v2/mod.rs b/src/transforms/lua/v2/mod.rs
index 787e69731f301..d4be1e88ab6aa 100644
--- a/src/transforms/lua/v2/mod.rs
+++ b/src/transforms/lua/v2/mod.rs
@@ -4,8 +4,8 @@ use codecs::MetricTagValues;
 use serde_with::serde_as;
 use snafu::{ResultExt, Snafu};
 use vector_config::configurable_component;
-pub use vector_core::event::lua;
-use vector_core::transform::runtime_transform::{RuntimeTransform, Timer};
+pub use vector_lib::event::lua;
+use vector_lib::transform::runtime_transform::{RuntimeTransform, Timer};
 
 use crate::config::{ComponentKey, OutputId};
 use crate::event::lua::event::LuaEvent;
diff --git a/src/transforms/metric_to_log.rs b/src/transforms/metric_to_log.rs
index a36ee54dea5d3..ac67ba0850e8b 100644
--- a/src/transforms/metric_to_log.rs
+++ b/src/transforms/metric_to_log.rs
@@ -4,7 +4,7 @@ use lookup::{event_path, owned_value_path, path, PathPrefix};
 use serde_json::Value;
 use std::collections::{BTreeMap, BTreeSet};
 use vector_config::configurable_component;
-use vector_core::config::LogNamespace;
+use vector_lib::config::LogNamespace;
 use vector_lib::TimeZone;
 use vrl::path::OwnedValuePath;
 use vrl::value::kind::Collection;
@@ -353,8 +353,8 @@ mod tests {
     use similar_asserts::assert_eq;
     use tokio::sync::mpsc;
     use tokio_stream::wrappers::ReceiverStream;
-    use vector_core::{event::EventMetadata, metric_tags};
     use vector_lib::config::ComponentKey;
+    use vector_lib::{event::EventMetadata, metric_tags};
 
     use super::*;
     use crate::event::{
@@ -511,7 +511,7 @@ mod tests {
             "distro",
             MetricKind::Absolute,
             MetricValue::Distribution {
-                samples: vector_core::samples![1.0 => 10, 2.0 => 20],
+                samples: vector_lib::samples![1.0 => 10, 2.0 => 20],
                 statistic: StatisticKind::Histogram,
             },
             event_metadata(),
@@ -562,7 +562,7 @@ mod tests {
             "histo",
             MetricKind::Absolute,
             MetricValue::AggregatedHistogram {
-                buckets: vector_core::buckets![1.0 => 10, 2.0 => 20],
+                buckets: vector_lib::buckets![1.0 => 10, 2.0 => 20],
                 count: 30,
                 sum: 50.0,
             },
@@ -612,7 +612,7 @@ mod tests {
             "summary",
             MetricKind::Absolute,
             MetricValue::AggregatedSummary {
-                quantiles: vector_core::quantiles![50.0 => 10.0, 90.0 => 20.0],
+                quantiles: vector_lib::quantiles![50.0 => 10.0, 90.0 => 20.0],
                 count: 30,
                 sum: 50.0,
             },
diff --git a/src/transforms/mod.rs b/src/transforms/mod.rs
index 361e5d68db413..46c53c8ccf158 100644
--- a/src/transforms/mod.rs
+++ b/src/transforms/mod.rs
@@ -31,7 +31,7 @@ pub mod tag_cardinality_limit;
 #[cfg(feature = "transforms-throttle")]
 pub mod throttle;
 
-pub use vector_core::transform::{
+pub use vector_lib::transform::{
     FunctionTransform, OutputBuffer, SyncTransform, TaskTransform, Transform, TransformOutputs,
     TransformOutputsBuf,
 };
@@ -51,7 +51,7 @@ mod test {
     use futures_util::SinkExt;
     use tokio::sync::mpsc;
     use tokio_util::sync::PollSender;
-    use vector_core::transform::FunctionTransform;
+    use vector_lib::transform::FunctionTransform;
 
     use crate::{
         config::{
diff --git a/src/transforms/reduce/mod.rs b/src/transforms/reduce/mod.rs
index d1f318b990218..c8d0d851f1aeb 100644
--- a/src/transforms/reduce/mod.rs
+++ b/src/transforms/reduce/mod.rs
@@ -27,7 +27,7 @@ mod merge_strategy;
 use crate::config::schema::Definition;
 use crate::event::Value;
 pub use merge_strategy::*;
-use vector_core::config::LogNamespace;
+use vector_lib::config::LogNamespace;
 use vector_stream::expiration_map::{map_with_expiration, Emitter};
 use vrl::value::kind::Collection;
 use vrl::value::Kind;
diff --git a/src/transforms/remap.rs b/src/transforms/remap.rs
index ef5aa18b0c518..bd2535f011c0b 100644
--- a/src/transforms/remap.rs
+++ b/src/transforms/remap.rs
@@ -10,9 +10,9 @@ use codecs::MetricTagValues;
 use lookup::{metadata_path, owned_value_path, PathPrefix};
 use snafu::{ResultExt, Snafu};
 use vector_config::configurable_component;
-use vector_core::compile_vrl;
-use vector_core::config::LogNamespace;
-use vector_core::schema::Definition;
+use vector_lib::compile_vrl;
+use vector_lib::config::LogNamespace;
+use vector_lib::schema::Definition;
 use vector_lib::TimeZone;
 use vector_vrl_functions::set_semantic_meaning::MeaningList;
 use vrl::compiler::runtime::{Runtime, Terminate};
@@ -608,7 +608,7 @@ mod tests {
     use std::sync::Arc;
 
     use indoc::{formatdoc, indoc};
-    use vector_core::{config::GlobalOptions, event::EventMetadata, metric_tags};
+    use vector_lib::{config::GlobalOptions, event::EventMetadata, metric_tags};
     use vrl::value::kind::Collection;
     use vrl::{btreemap, event_path};
 
diff --git a/src/transforms/route.rs b/src/transforms/route.rs
index a7d71c4fc4696..4370a098e6a69 100644
--- a/src/transforms/route.rs
+++ b/src/transforms/route.rs
@@ -1,7 +1,7 @@
 use indexmap::IndexMap;
 use vector_config::configurable_component;
-use vector_core::config::{clone_input_definitions, LogNamespace};
-use vector_core::transform::SyncTransform;
+use vector_lib::config::{clone_input_definitions, LogNamespace};
+use vector_lib::transform::SyncTransform;
 
 use crate::{
     conditions::{AnyCondition, Condition},
@@ -37,11 +37,7 @@ impl Route {
 }
 
 impl SyncTransform for Route {
-    fn transform(
-        &mut self,
-        event: Event,
-        output: &mut vector_core::transform::TransformOutputsBuf,
-    ) {
+    fn transform(&mut self, event: Event, output: &mut vector_lib::transform::TransformOutputsBuf) {
         let mut check_failed: usize = 0;
         for (output_name, condition) in &self.conditions {
             let (result, event) = condition.check(event.clone());
@@ -155,7 +151,7 @@ mod test {
     use std::collections::HashMap;
 
     use indoc::indoc;
-    use vector_core::transform::TransformOutputsBuf;
+    use vector_lib::transform::TransformOutputsBuf;
 
     use super::*;
     use crate::{
diff --git a/src/transforms/sample.rs b/src/transforms/sample.rs
index 1d06ef96dcb98..5e51e063f3209 100644
--- a/src/transforms/sample.rs
+++ b/src/transforms/sample.rs
@@ -1,5 +1,5 @@
 use vector_config::configurable_component;
-use vector_core::config::{LegacyKey, LogNamespace};
+use vector_lib::config::{LegacyKey, LogNamespace};
 use vrl::value::Kind;
 use vrl::{event_path, owned_value_path};
 
diff --git a/src/transforms/tag_cardinality_limit/config.rs b/src/transforms/tag_cardinality_limit/config.rs
index 4ea1833fb216d..e4ede27afb734 100644
--- a/src/transforms/tag_cardinality_limit/config.rs
+++ b/src/transforms/tag_cardinality_limit/config.rs
@@ -7,7 +7,7 @@ use crate::schema;
 use crate::transforms::tag_cardinality_limit::TagCardinalityLimit;
 use crate::transforms::Transform;
 use vector_config::configurable_component;
-use vector_core::config::LogNamespace;
+use vector_lib::config::LogNamespace;
 
 /// Configuration for the `tag_cardinality_limit` transform.
 #[configurable_component(transform(
diff --git a/src/transforms/tag_cardinality_limit/tests.rs b/src/transforms/tag_cardinality_limit/tests.rs
index 67018e329e561..d4e63b0820ec8 100644
--- a/src/transforms/tag_cardinality_limit/tests.rs
+++ b/src/transforms/tag_cardinality_limit/tests.rs
@@ -1,9 +1,9 @@
 use std::sync::Arc;
 
-use vector_core::config::OutputId;
-use vector_core::event::EventMetadata;
-use vector_core::metric_tags;
 use vector_lib::config::ComponentKey;
+use vector_lib::config::OutputId;
+use vector_lib::event::EventMetadata;
+use vector_lib::metric_tags;
 
 use super::*;
 use crate::config::schema::Definition;
diff --git a/src/transforms/throttle.rs b/src/transforms/throttle.rs
index 9c64f95a7d3cc..dff11c6f50bdd 100644
--- a/src/transforms/throttle.rs
+++ b/src/transforms/throttle.rs
@@ -6,7 +6,7 @@ use governor::{clock, Quota, RateLimiter};
 use serde_with::serde_as;
 use snafu::Snafu;
 use vector_config::configurable_component;
-use vector_core::config::{clone_input_definitions, LogNamespace};
+use vector_lib::config::{clone_input_definitions, LogNamespace};
 
 use crate::{
     conditions::{AnyCondition, Condition},

From ffed6f70603a1f6702e85a96c45096a98924564a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 25 Oct 2023 20:53:50 +0000
Subject: [PATCH 13/28] chore(deps): Bump serde-wasm-bindgen from 0.6.0 to
 0.6.1 (#18935)

Bumps [serde-wasm-bindgen](https://github.com/cloudflare/serde-wasm-bindgen) from 0.6.0 to 0.6.1.
- [Commits](https://github.com/cloudflare/serde-wasm-bindgen/compare/v0.6.0...v0.6.1)

---
updated-dependencies:
- dependency-name: serde-wasm-bindgen
  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>
---
 Cargo.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 2fa9f4baaf2f8..469b9ca9cdb76 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -7828,9 +7828,9 @@ dependencies = [
 
 [[package]]
 name = "serde-wasm-bindgen"
-version = "0.6.0"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30c9933e5689bd420dc6c87b7a1835701810cbc10cd86a26e4da45b73e6b1d78"
+checksum = "17ba92964781421b6cef36bf0d7da26d201e96d84e1b10e7ae6ed416e516906d"
 dependencies = [
  "js-sys",
  "serde",

From a9166056653cc3ed2d7598f40281a70aed78d074 Mon Sep 17 00:00:00 2001
From: Doug Smith <dsmith3197@users.noreply.github.com>
Date: Wed, 25 Oct 2023 17:03:05 -0400
Subject: [PATCH 14/28] fix(amqp sink): remove duplicate events (#18932)

---
 src/internal_events/amqp.rs | 88 -------------------------------------
 src/sinks/amqp/service.rs   | 22 ++--------
 2 files changed, 4 insertions(+), 106 deletions(-)

diff --git a/src/internal_events/amqp.rs b/src/internal_events/amqp.rs
index 4577753d83590..fa5c46db4a18d 100644
--- a/src/internal_events/amqp.rs
+++ b/src/internal_events/amqp.rs
@@ -88,91 +88,3 @@ pub mod source {
         }
     }
 }
-
-#[cfg(feature = "sinks-amqp")]
-pub mod sink {
-    use crate::emit;
-    use metrics::counter;
-    use vector_lib::internal_event::InternalEvent;
-    use vector_lib::internal_event::{
-        error_stage, error_type, ComponentEventsDropped, UNINTENTIONAL,
-    };
-
-    #[derive(Debug)]
-    pub struct AmqpDeliveryError<'a> {
-        pub error: &'a lapin::Error,
-    }
-
-    impl InternalEvent for AmqpDeliveryError<'_> {
-        fn emit(self) {
-            const DELIVER_REASON: &str = "Unable to deliver.";
-
-            error!(message = DELIVER_REASON,
-                   error = ?self.error,
-                   error_type = error_type::REQUEST_FAILED,
-                   stage = error_stage::SENDING,
-                   internal_log_rate_limit = true,
-            );
-            counter!(
-                "component_errors_total", 1,
-                "error_type" => error_type::REQUEST_FAILED,
-                "stage" => error_stage::SENDING,
-            );
-            emit!(ComponentEventsDropped::<UNINTENTIONAL> {
-                count: 1,
-                reason: DELIVER_REASON
-            });
-        }
-    }
-
-    #[derive(Debug)]
-    pub struct AmqpAcknowledgementError<'a> {
-        pub error: &'a lapin::Error,
-    }
-
-    impl InternalEvent for AmqpAcknowledgementError<'_> {
-        fn emit(self) {
-            const ACK_REASON: &str = "Acknowledgement failed.";
-
-            error!(message = ACK_REASON,
-                   error = ?self.error,
-                   error_type = error_type::REQUEST_FAILED,
-                   stage = error_stage::SENDING,
-                   internal_log_rate_limit = true,
-            );
-            counter!(
-                "component_errors_total", 1,
-                "error_type" => error_type::REQUEST_FAILED,
-                "stage" => error_stage::SENDING,
-            );
-            emit!(ComponentEventsDropped::<UNINTENTIONAL> {
-                count: 1,
-                reason: ACK_REASON
-            });
-        }
-    }
-
-    #[derive(Debug)]
-    pub struct AmqpNackError;
-
-    impl InternalEvent for AmqpNackError {
-        fn emit(self) {
-            const DELIVER_REASON: &str = "Received Negative Acknowledgement from AMQP broker.";
-            error!(
-                message = DELIVER_REASON,
-                error_type = error_type::ACKNOWLEDGMENT_FAILED,
-                stage = error_stage::SENDING,
-                internal_log_rate_limit = true,
-            );
-            counter!(
-                "component_errors_total", 1,
-                "error_type" => error_type::ACKNOWLEDGMENT_FAILED,
-                "stage" => error_stage::SENDING,
-            );
-            emit!(ComponentEventsDropped::<UNINTENTIONAL> {
-                count: 1,
-                reason: DELIVER_REASON
-            });
-        }
-    }
-}
diff --git a/src/sinks/amqp/service.rs b/src/sinks/amqp/service.rs
index 36e2845afa821..babc502b9c193 100644
--- a/src/sinks/amqp/service.rs
+++ b/src/sinks/amqp/service.rs
@@ -1,9 +1,6 @@
 //! The main tower service that takes the request created by the request builder
 //! and sends it to `AMQP`.
-use crate::{
-    internal_events::sink::{AmqpAcknowledgementError, AmqpDeliveryError, AmqpNackError},
-    sinks::prelude::*,
-};
+use crate::sinks::prelude::*;
 use bytes::Bytes;
 use futures::future::BoxFuture;
 use lapin::{options::BasicPublishOptions, BasicProperties};
@@ -125,25 +122,14 @@ impl Service<AmqpRequest> for AmqpService {
 
             match fut {
                 Ok(result) => match result.await {
-                    Ok(lapin::publisher_confirm::Confirmation::Nack(_)) => {
-                        emit!(AmqpNackError);
-                        Err(AmqpError::Nack)
-                    }
-                    Err(error) => {
-                        // TODO: In due course the caller could emit these on error.
-                        emit!(AmqpAcknowledgementError { error: &error });
-                        Err(AmqpError::AcknowledgementFailed { error })
-                    }
+                    Ok(lapin::publisher_confirm::Confirmation::Nack(_)) => Err(AmqpError::Nack),
+                    Err(error) => Err(AmqpError::AcknowledgementFailed { error }),
                     Ok(_) => Ok(AmqpResponse {
                         json_size: req.metadata.into_events_estimated_json_encoded_byte_size(),
                         byte_size,
                     }),
                 },
-                Err(error) => {
-                    // TODO: In due course the caller could emit these on error.
-                    emit!(AmqpDeliveryError { error: &error });
-                    Err(AmqpError::DeliveryFailed { error })
-                }
+                Err(error) => Err(AmqpError::DeliveryFailed { error }),
             }
         })
     }

From a75a043523cb3839c4c186719565aeeeceba01cf Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 25 Oct 2023 21:53:29 +0000
Subject: [PATCH 15/28] chore(deps): Bump openssl-src from 300.1.5+3.1.3 to
 300.1.6+3.1.4 (#18936)

Bumps [openssl-src](https://github.com/alexcrichton/openssl-src-rs) from 300.1.5+3.1.3 to 300.1.6+3.1.4.
- [Release notes](https://github.com/alexcrichton/openssl-src-rs/releases)
- [Commits](https://github.com/alexcrichton/openssl-src-rs/commits)

---
updated-dependencies:
- dependency-name: openssl-src
  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>
---
 Cargo.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 469b9ca9cdb76..3766f75ddd9bf 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5928,9 +5928,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
 
 [[package]]
 name = "openssl-src"
-version = "300.1.5+3.1.3"
+version = "300.1.6+3.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "559068e4c12950d7dcaa1857a61725c0d38d4fc03ff8e070ab31a75d6e316491"
+checksum = "439fac53e092cd7442a3660c85dde4643ab3b5bd39040912388dcdabf6b88085"
 dependencies = [
  "cc",
 ]

From 30a1e2613f63eaeed3e8768ee6423dba568fca4d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 25 Oct 2023 22:22:19 +0000
Subject: [PATCH 16/28] chore(deps): Bump tracing-log from 0.1.4 to 0.2.0
 (#18941)

* chore(deps): Bump tracing-log from 0.1.4 to 0.2.0

Bumps [tracing-log](https://github.com/tokio-rs/tracing) from 0.1.4 to 0.2.0.
- [Release notes](https://github.com/tokio-rs/tracing/releases)
- [Commits](https://github.com/tokio-rs/tracing/compare/tracing-log-0.1.4...tracing-log-0.2.0)

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

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

* remove the explicit dep

---------

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

diff --git a/Cargo.lock b/Cargo.lock
index 3766f75ddd9bf..48e44c2fd150a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -10100,7 +10100,6 @@ dependencies = [
  "tonic 0.10.2",
  "tracing 0.1.37",
  "tracing-core 0.1.30",
- "tracing-log",
  "tracing-subscriber",
  "typetag",
  "url",
diff --git a/lib/vector-core/Cargo.toml b/lib/vector-core/Cargo.toml
index c33f3f54485f7..cdc0d5f8d1ae7 100644
--- a/lib/vector-core/Cargo.toml
+++ b/lib/vector-core/Cargo.toml
@@ -54,7 +54,6 @@ toml = { version = "0.8.4", default-features = false }
 tonic = { version = "0.10", default-features = false, features = ["transport"] }
 tracing = { version = "0.1.34", default-features = false }
 tracing-core = { version = "0.1.26", default-features = false }
-tracing-log = { version = "0.1.4", default-features = false }
 tracing-subscriber = { version = "0.3.17", default-features = false, features = ["std"] }
 typetag = { version = "0.2.13", default-features = false }
 url = { version = "2", default-features = false }

From f42751d84a086a104bb8135f4fc419476070455c Mon Sep 17 00:00:00 2001
From: Doug Smith <dsmith3197@users.noreply.github.com>
Date: Thu, 26 Oct 2023 11:01:30 -0400
Subject: [PATCH 17/28] chore(datadog)!: remove deprecated config options
 (#18940)

* chore(datadog)!: remove deprecated config options

* update cue and add upgrade guide

* Update website/content/en/highlights/2023-11-07-0-34-0-upgrade-guide.md

Co-authored-by: Jesse Szwedko <jesse.szwedko@datadoghq.com>

---------

Co-authored-by: Jesse Szwedko <jesse.szwedko@datadoghq.com>
---
 .github/semantic.yml                          |  1 -
 src/common/datadog.rs                         | 32 -------------------
 src/config/enterprise.rs                      | 28 ++--------------
 src/sinks/datadog/events/config.rs            | 12 ++-----
 src/sinks/datadog/logs/config.rs              | 25 ++++-----------
 src/sinks/datadog/metrics/config.rs           | 12 ++-----
 src/sinks/datadog/mod.rs                      | 14 +++-----
 src/sinks/datadog/traces/config.rs            |  2 +-
 .../2023-11-07-0-34-0-upgrade-guide.md        | 28 ++++++++++++++++
 .../components/sinks/base/datadog_events.cue  | 10 ------
 .../components/sinks/base/datadog_logs.cue    | 10 ------
 .../components/sinks/base/datadog_metrics.cue | 10 ------
 12 files changed, 45 insertions(+), 139 deletions(-)
 create mode 100644 website/content/en/highlights/2023-11-07-0-34-0-upgrade-guide.md

diff --git a/.github/semantic.yml b/.github/semantic.yml
index b794afc310dbd..84340954ea7ba 100644
--- a/.github/semantic.yml
+++ b/.github/semantic.yml
@@ -199,7 +199,6 @@ scopes:
   - clickhouse sink # Anything `clickhouse` sink related
   - console sink # Anything `console` sink related
   - databend sink # Anything `databend` sink related
-  - datadog_archives sink # Anything `datadog_archives` sink related
   - datadog_events sink # Anything `datadog_events` sink related
   - datadog_logs sink # Anything `datadog_logs` sink related
   - datadog_metrics sink # Anything `datadog_metrics` sink related
diff --git a/src/common/datadog.rs b/src/common/datadog.rs
index 2bdd3ee200c30..4d1129385809c 100644
--- a/src/common/datadog.rs
+++ b/src/common/datadog.rs
@@ -3,7 +3,6 @@
 #![allow(dead_code)]
 #![allow(unreachable_pub)]
 use serde::{Deserialize, Serialize};
-use vector_config::configurable_component;
 use vector_lib::event::DatadogMetricOriginMetadata;
 
 pub const DD_US_SITE: &str = "datadoghq.com";
@@ -43,37 +42,6 @@ pub(crate) enum DatadogMetricType {
 #[derive(Debug, Clone, PartialEq, Deserialize, Serialize)]
 pub(crate) struct DatadogPoint<T>(pub(crate) i64, pub(crate) T);
 
-/// A Datadog region.
-#[configurable_component]
-#[derive(Clone, Copy, Debug, PartialEq, Eq)]
-#[serde(rename_all = "snake_case")]
-pub enum Region {
-    /// US region.
-    Us,
-
-    /// EU region.
-    Eu,
-}
-
-/// Gets the base domain to use for any calls to Datadog.
-///
-/// This is a helper function for Datadog component configs using the deprecated `region` field.
-///
-/// If `region` is not specified, we fallback to `site`.
-///
-/// TODO: This should be deleted when the deprecated `region` config option is fully removed,
-///       and the callers will replace the result of this function call with just `site`.
-pub(crate) const fn get_base_domain_region<'a>(site: &'a str, region: Option<&Region>) -> &'a str {
-    if let Some(region) = region {
-        match region {
-            Region::Eu => DD_EU_SITE,
-            Region::Us => DD_US_SITE,
-        }
-    } else {
-        site
-    }
-}
-
 /// Gets the base API endpoint to use for any calls to Datadog.
 ///
 /// If `endpoint` is not specified, we fallback to `site`.
diff --git a/src/config/enterprise.rs b/src/config/enterprise.rs
index e5af10ee9009a..8aea56f058251 100644
--- a/src/config/enterprise.rs
+++ b/src/config/enterprise.rs
@@ -21,7 +21,7 @@ use super::{
     SourceOuter, TransformOuter,
 };
 use crate::{
-    common::datadog::{get_api_base_endpoint, get_base_domain_region, Region},
+    common::datadog::get_api_base_endpoint,
     conditions::AnyCondition,
     http::{HttpClient, HttpError},
     sinks::{
@@ -79,12 +79,6 @@ pub struct Options {
     #[serde(default = "default_site")]
     site: String,
 
-    /// The Datadog region to send data to.
-    ///
-    /// This option is deprecated, and the `site` field should be used instead.
-    #[configurable(deprecated)]
-    region: Option<Region>,
-
     /// The Datadog endpoint to send data to.
     ///
     /// This is an advanced setting that is generally meant only for testing, and overrides both
@@ -100,12 +94,6 @@ pub struct Options {
     #[serde(default)]
     pub api_key: Option<String>,
 
-    /// The Datadog application key.
-    ///
-    /// This is deprecated.
-    #[configurable(deprecated)]
-    pub application_key: Option<String>,
-
     /// The configuration key for Observability Pipelines.
     pub configuration_key: String,
 
@@ -134,10 +122,8 @@ impl Default for Options {
             enabled: default_enabled(),
             enable_logs_reporting: default_enable_logs_reporting(),
             site: default_site(),
-            region: None,
             endpoint: None,
             api_key: None,
-            application_key: None,
             configuration_key: "".to_owned(),
             reporting_interval_secs: default_reporting_interval_secs(),
             max_retries: default_max_retries(),
@@ -332,12 +318,6 @@ impl TryFrom<&Config> for EnterpriseMetadata {
             },
         };
 
-        if opts.application_key.is_some() {
-            warn!(
-                "Datadog application key is deprecated. You can safely remove `application_key` from the config."
-            );
-        }
-
         info!(
             "Datadog API key provided. Integration with {} is enabled.",
             DATADOG_REPORTING_PRODUCT
@@ -487,7 +467,6 @@ fn setup_logs_reporting(
             default_api_key: api_key.into(),
             ..Default::default()
         },
-        region: datadog.region,
         request: RequestConfig {
             headers: IndexMap::from([(
                 "DD-EVP-ORIGIN".to_string(),
@@ -595,7 +574,6 @@ fn setup_metrics_reporting(
             default_api_key: api_key.into(),
             ..Default::default()
         },
-        region: datadog.region,
         ..Default::default()
     };
 
@@ -684,7 +662,6 @@ pub(crate) fn report_configuration(
         let endpoint = get_reporting_endpoint(
             opts.endpoint.as_ref(),
             opts.site.as_str(),
-            opts.region,
             &opts.configuration_key,
         );
         // Datadog uses a JSON:API, so we'll serialize the config to a JSON
@@ -721,10 +698,9 @@ pub(crate) fn report_configuration(
 fn get_reporting_endpoint(
     endpoint: Option<&String>,
     site: &str,
-    region: Option<Region>,
     configuration_key: &str,
 ) -> String {
-    let base = get_base_domain_region(site, region.as_ref());
+    let base = site;
 
     format!(
         "{}{}/{}/versions",
diff --git a/src/sinks/datadog/events/config.rs b/src/sinks/datadog/events/config.rs
index 71f431d0ce9c0..979c37822bf32 100644
--- a/src/sinks/datadog/events/config.rs
+++ b/src/sinks/datadog/events/config.rs
@@ -6,7 +6,6 @@ use vector_lib::schema;
 use vrl::value::Kind;
 
 use crate::{
-    common::datadog::{get_base_domain_region, Region},
     config::{AcknowledgementsConfig, GenerateConfig, Input, SinkConfig, SinkContext},
     http::HttpClient,
     sinks::{
@@ -34,11 +33,6 @@ pub struct DatadogEventsConfig {
     #[serde(flatten)]
     pub dd_common: DatadogCommonConfig,
 
-    /// The Datadog region to send events to.
-    #[configurable(deprecated = "This option has been deprecated, use the `site` option instead.")]
-    #[serde(default)]
-    pub region: Option<Region>,
-
     #[configurable(derived)]
     #[serde(default)]
     pub request: TowerRequestConfig,
@@ -57,7 +51,7 @@ impl DatadogEventsConfig {
     fn get_api_events_endpoint(&self) -> http::Uri {
         let api_base_endpoint = get_api_base_endpoint(
             self.dd_common.endpoint.as_ref(),
-            get_base_domain_region(self.dd_common.site.as_str(), self.region.as_ref()),
+            self.dd_common.site.as_str(),
         );
 
         // We know this URI will be valid since we have just built it up ourselves.
@@ -96,9 +90,7 @@ impl DatadogEventsConfig {
 impl SinkConfig for DatadogEventsConfig {
     async fn build(&self, cx: SinkContext) -> crate::Result<(VectorSink, Healthcheck)> {
         let client = self.build_client(cx.proxy())?;
-        let healthcheck = self
-            .dd_common
-            .build_healthcheck(client.clone(), self.region.as_ref())?;
+        let healthcheck = self.dd_common.build_healthcheck(client.clone())?;
         let sink = self.build_sink(client)?;
 
         Ok((sink, healthcheck))
diff --git a/src/sinks/datadog/logs/config.rs b/src/sinks/datadog/logs/config.rs
index d58cd6b106edf..6018d568d5543 100644
--- a/src/sinks/datadog/logs/config.rs
+++ b/src/sinks/datadog/logs/config.rs
@@ -9,7 +9,6 @@ use vrl::value::Kind;
 use super::{service::LogApiRetry, sink::LogSinkBuilder};
 use crate::{
     codecs::Transformer,
-    common::datadog::Region,
     config::{AcknowledgementsConfig, GenerateConfig, Input, SinkConfig, SinkContext},
     http::HttpClient,
     schema,
@@ -53,11 +52,6 @@ pub struct DatadogLogsConfig {
     #[serde(flatten)]
     pub dd_common: DatadogCommonConfig,
 
-    /// The Datadog region to send logs to.
-    #[configurable(deprecated = "This option has been deprecated, use the `site` option instead.")]
-    #[serde(default)]
-    pub region: Option<Region>,
-
     #[configurable(derived)]
     #[serde(default)]
     pub compression: Option<Compression>,
@@ -91,16 +85,11 @@ impl DatadogLogsConfig {
     // TODO: We should probably hoist this type of base URI generation so that all DD sinks can
     // utilize it, since it all follows the same pattern.
     fn get_uri(&self) -> http::Uri {
-        let base_url = self.dd_common.endpoint.clone().unwrap_or_else(|| {
-            if let Some(region) = self.region {
-                match region {
-                    Region::Eu => "https://http-intake.logs.datadoghq.eu".to_string(),
-                    Region::Us => "https://http-intake.logs.datadoghq.com".to_string(),
-                }
-            } else {
-                format!("https://http-intake.logs.{}", self.dd_common.site)
-            }
-        });
+        let base_url = self
+            .dd_common
+            .endpoint
+            .clone()
+            .unwrap_or_else(|| format!("https://http-intake.logs.{}", self.dd_common.site));
 
         http::Uri::try_from(format!("{}/api/v2/logs", base_url)).expect("URI not valid")
     }
@@ -165,9 +154,7 @@ impl SinkConfig for DatadogLogsConfig {
     async fn build(&self, cx: SinkContext) -> crate::Result<(VectorSink, Healthcheck)> {
         let client = self.create_client(&cx.proxy)?;
 
-        let healthcheck = self
-            .dd_common
-            .build_healthcheck(client.clone(), self.region.as_ref())?;
+        let healthcheck = self.dd_common.build_healthcheck(client.clone())?;
 
         let sink = self.build_processor(client, cx.app_name_slug)?;
 
diff --git a/src/sinks/datadog/metrics/config.rs b/src/sinks/datadog/metrics/config.rs
index 81eeb48028288..ae2852c9e3fa2 100644
--- a/src/sinks/datadog/metrics/config.rs
+++ b/src/sinks/datadog/metrics/config.rs
@@ -12,7 +12,6 @@ use super::{
     sink::DatadogMetricsSink,
 };
 use crate::{
-    common::datadog::{get_base_domain_region, Region},
     config::{AcknowledgementsConfig, Input, SinkConfig, SinkContext},
     http::HttpClient,
     sinks::{
@@ -144,11 +143,6 @@ pub struct DatadogMetricsConfig {
     #[serde(default)]
     pub default_namespace: Option<String>,
 
-    /// The Datadog region to send metrics to.
-    #[configurable(deprecated = "This option has been deprecated, use the `site` option instead.")]
-    #[serde(default)]
-    pub region: Option<Region>,
-
     #[configurable(derived)]
     #[serde(default)]
     pub batch: BatchConfig<DatadogMetricsDefaultBatchSettings>,
@@ -165,9 +159,7 @@ impl_generate_config_from_default!(DatadogMetricsConfig);
 impl SinkConfig for DatadogMetricsConfig {
     async fn build(&self, cx: SinkContext) -> crate::Result<(VectorSink, Healthcheck)> {
         let client = self.build_client(&cx.proxy)?;
-        let healthcheck = self
-            .dd_common
-            .build_healthcheck(client.clone(), self.region.as_ref())?;
+        let healthcheck = self.dd_common.build_healthcheck(client.clone())?;
         let sink = self.build_sink(client)?;
 
         Ok((sink, healthcheck))
@@ -197,7 +189,7 @@ impl DatadogMetricsConfig {
             format!(
                 "https://{}-vector.agent.{}",
                 version,
-                get_base_domain_region(self.dd_common.site.as_str(), self.region.as_ref())
+                self.dd_common.site.as_str()
             )
         })
     }
diff --git a/src/sinks/datadog/mod.rs b/src/sinks/datadog/mod.rs
index 98df036b05243..3e49a8ce6f74e 100644
--- a/src/sinks/datadog/mod.rs
+++ b/src/sinks/datadog/mod.rs
@@ -7,7 +7,7 @@ use vector_lib::sensitive_string::SensitiveString;
 use vector_lib::{config::AcknowledgementsConfig, tls::TlsEnableableConfig};
 
 use crate::{
-    common::datadog::{get_api_base_endpoint, get_base_domain_region, Region, DD_US_SITE},
+    common::datadog::{get_api_base_endpoint, DD_US_SITE},
     http::{HttpClient, HttpError},
     sinks::HealthcheckError,
 };
@@ -93,15 +93,9 @@ impl Default for DatadogCommonConfig {
 impl DatadogCommonConfig {
     /// Returns a `Healthcheck` which is a future that will be used to ensure the
     /// `<site>/api/v1/validate` endpoint is reachable.
-    fn build_healthcheck(
-        &self,
-        client: HttpClient,
-        region: Option<&Region>,
-    ) -> crate::Result<Healthcheck> {
-        let validate_endpoint = get_api_validate_endpoint(
-            self.endpoint.as_ref(),
-            get_base_domain_region(self.site.as_str(), region),
-        )?;
+    fn build_healthcheck(&self, client: HttpClient) -> crate::Result<Healthcheck> {
+        let validate_endpoint =
+            get_api_validate_endpoint(self.endpoint.as_ref(), self.site.as_str())?;
 
         let api_key: String = self.default_api_key.clone().into();
 
diff --git a/src/sinks/datadog/traces/config.rs b/src/sinks/datadog/traces/config.rs
index 08f43ba4c95c7..c5162d99ec0bc 100644
--- a/src/sinks/datadog/traces/config.rs
+++ b/src/sinks/datadog/traces/config.rs
@@ -215,7 +215,7 @@ impl DatadogTracesConfig {
 impl SinkConfig for DatadogTracesConfig {
     async fn build(&self, cx: SinkContext) -> crate::Result<(VectorSink, Healthcheck)> {
         let client = self.build_client(&cx.proxy)?;
-        let healthcheck = self.dd_common.build_healthcheck(client.clone(), None)?;
+        let healthcheck = self.dd_common.build_healthcheck(client.clone())?;
         let sink = self.build_sink(client)?;
 
         Ok((sink, healthcheck))
diff --git a/website/content/en/highlights/2023-11-07-0-34-0-upgrade-guide.md b/website/content/en/highlights/2023-11-07-0-34-0-upgrade-guide.md
new file mode 100644
index 0000000000000..318f7cf5513d0
--- /dev/null
+++ b/website/content/en/highlights/2023-11-07-0-34-0-upgrade-guide.md
@@ -0,0 +1,28 @@
+---
+date: "2023-11-07"
+title: "0.34 Upgrade Guide"
+description: "An upgrade guide that addresses breaking changes in 0.34.0"
+authors: ["dsmith3197"]
+release: "0.34.0"
+hide_on_release_notes: false
+badges:
+  type: breaking change
+---
+
+Vector's 0.34.0 release includes **breaking changes**:
+
+1. [Removal of Deprecated Datadog Component Config Options](#datadog-deprecated-config-options)
+
+We cover them below to help you upgrade quickly:
+
+## Upgrade guide
+
+### Breaking changes
+
+#### Removal of Deprecated Datadog Component Config Options {#datadog-deprecated-config-options}
+
+The `region` config option has been removed from the Datadog Events, Logs,
+and Metrics sinks. Instead the `site` option should be used.
+
+The `region` and `application_key` config options have
+been removed from the Enterprise configuration. Instead of `region`, `site` should be used. `application_key` is no longer required.
diff --git a/website/cue/reference/components/sinks/base/datadog_events.cue b/website/cue/reference/components/sinks/base/datadog_events.cue
index 217dbd481ce38..e6ca4d22c11cf 100644
--- a/website/cue/reference/components/sinks/base/datadog_events.cue
+++ b/website/cue/reference/components/sinks/base/datadog_events.cue
@@ -52,16 +52,6 @@ base: components: sinks: datadog_events: configuration: {
 		required: false
 		type: string: examples: ["http://127.0.0.1:8080", "http://example.com:12345"]
 	}
-	region: {
-		deprecated:         true
-		deprecated_message: "This option has been deprecated, use the `site` option instead."
-		description:        "The Datadog region to send events to."
-		required:           false
-		type: string: enum: {
-			eu: "EU region."
-			us: "US region."
-		}
-	}
 	request: {
 		description: """
 			Middleware settings for outbound requests.
diff --git a/website/cue/reference/components/sinks/base/datadog_logs.cue b/website/cue/reference/components/sinks/base/datadog_logs.cue
index 6e2961f8b39af..af56186188a53 100644
--- a/website/cue/reference/components/sinks/base/datadog_logs.cue
+++ b/website/cue/reference/components/sinks/base/datadog_logs.cue
@@ -146,16 +146,6 @@ base: components: sinks: datadog_logs: configuration: {
 		required: false
 		type: string: examples: ["http://127.0.0.1:8080", "http://example.com:12345"]
 	}
-	region: {
-		deprecated:         true
-		deprecated_message: "This option has been deprecated, use the `site` option instead."
-		description:        "The Datadog region to send logs to."
-		required:           false
-		type: string: enum: {
-			eu: "EU region."
-			us: "US region."
-		}
-	}
 	request: {
 		description: "Outbound HTTP request settings."
 		required:    false
diff --git a/website/cue/reference/components/sinks/base/datadog_metrics.cue b/website/cue/reference/components/sinks/base/datadog_metrics.cue
index f4cf4efa19500..77333e8c2d722 100644
--- a/website/cue/reference/components/sinks/base/datadog_metrics.cue
+++ b/website/cue/reference/components/sinks/base/datadog_metrics.cue
@@ -94,16 +94,6 @@ base: components: sinks: datadog_metrics: configuration: {
 		required: false
 		type: string: examples: ["http://127.0.0.1:8080", "http://example.com:12345"]
 	}
-	region: {
-		deprecated:         true
-		deprecated_message: "This option has been deprecated, use the `site` option instead."
-		description:        "The Datadog region to send metrics to."
-		required:           false
-		type: string: enum: {
-			eu: "EU region."
-			us: "US region."
-		}
-	}
 	request: {
 		description: """
 			Middleware settings for outbound requests.

From bf58b06baf18fdaaaa059d76bc84d159f6ca24e0 Mon Sep 17 00:00:00 2001
From: mutron3k <asloan7@gmail.com>
Date: Thu, 26 Oct 2023 12:40:30 -0400
Subject: [PATCH 18/28] updating the doc, 2 urls were 404 (#18949)

updating the doc 2 urls were 404

updating the 2 "distribution/kubernetes" paths to include "tree/master"
---
 .../en/docs/setup/installation/platforms/kubernetes.md        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/website/content/en/docs/setup/installation/platforms/kubernetes.md b/website/content/en/docs/setup/installation/platforms/kubernetes.md
index 1d79cfcdf0a62..d52137b5bd5d9 100644
--- a/website/content/en/docs/setup/installation/platforms/kubernetes.md
+++ b/website/content/en/docs/setup/installation/platforms/kubernetes.md
@@ -53,7 +53,7 @@ namespace: vector
 
 bases:
   # Include Vector recommended base (from git).
-  - github.com/vectordotdev/vector/distribution/kubernetes/vector-agent
+  - github.com/vectordotdev/vector/tree/master/distribution/kubernetes/vector-agent
 
 images:
   # Override the Vector image to pin the version used.
@@ -112,7 +112,7 @@ namespace: vector
 
 bases:
   # Include Vector recommended base (from git).
-  - github.com/vectordotdev/vector/distribution/kubernetes/vector-aggregator
+  - github.com/vectordotdev/vector/tree/master/distribution/kubernetes/vector-aggregator
 
 images:
   # Override the Vector image to pin the version used.

From cb53588f95a832f9cba60c5cf20b5cbf8375e56c Mon Sep 17 00:00:00 2001
From: neuronull <neuronull@pm.me>
Date: Thu, 26 Oct 2023 10:46:29 -0600
Subject: [PATCH 19/28] fix(amqp sink): remove unused feature flag (#18948)

---
 src/internal_events/mod.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/internal_events/mod.rs b/src/internal_events/mod.rs
index 64b8664aeef0d..3e5a860a918bb 100644
--- a/src/internal_events/mod.rs
+++ b/src/internal_events/mod.rs
@@ -139,7 +139,7 @@ pub(crate) use mongodb_metrics::*;
 
 #[cfg(feature = "transforms-aggregate")]
 pub(crate) use self::aggregate::*;
-#[cfg(any(feature = "sources-amqp", feature = "sinks-amqp"))]
+#[cfg(feature = "sources-amqp")]
 pub(crate) use self::amqp::*;
 #[cfg(feature = "sources-apache_metrics")]
 pub(crate) use self::apache_metrics::*;

From 42beb3f099f34c20b890b2d5f9f9ee07dc5697de Mon Sep 17 00:00:00 2001
From: Bruce Guenter <bruce.guenter@datadoghq.com>
Date: Thu, 26 Oct 2023 15:02:11 -0600
Subject: [PATCH 20/28] chore(dev): Wrap `vector-config` in `vector-lib` as
 `configurable` (#18944)

* chore(dev): Wrap `vector-config` in `vector-lib` as `configurable`

There already exists a `vector_lib::config` export so I figured adding
`vector-config` to that module would make things too confusing. Since most of
`vector-config` has to do with the `configurable` terminology, that seemed a
natural fit for this export.

Note that, unlike the previous wrappers, we are unable to get rid of the import
of `vector-config` into the base package. This is because the macros in
`vector-config-macros` explicitly assume the use of `vector-config` in their
coding.

* Add package name hack to avoid needing to import `vector-config` in the root

* Fixup stray FIXME

* Drop the imports of `vector-config-*` into `vector-lib`
---
 Cargo.lock                                    |   4 +-
 Cargo.toml                                    |   3 -
 lib/vector-config-common/src/lib.rs           |  29 ++++-
 lib/vector-config-common/src/validation.rs    |  33 +++---
 lib/vector-config-macros/src/ast/field.rs     |   5 +-
 .../src/component_name.rs                     |   4 +-
 lib/vector-config-macros/src/configurable.rs  | 111 +++++++++++-------
 .../src/configurable_component.rs             |  24 ++--
 lib/vector-config/src/lib.rs                  |   4 +-
 lib/vector-lib/Cargo.toml                     |   3 +-
 lib/vector-lib/src/lib.rs                     |   1 +
 src/amqp.rs                                   |   2 +-
 src/aws/auth.rs                               |   2 +-
 src/aws/region.rs                             |   2 +-
 src/codecs/encoding/config.rs                 |   2 +-
 src/codecs/encoding/transformer.rs            |   2 +-
 src/conditions/datadog_search.rs              |   2 +-
 src/conditions/mod.rs                         |   2 +-
 src/conditions/vrl.rs                         |   2 +-
 src/config/api.rs                             |   2 +-
 src/config/builder.rs                         |   2 +-
 src/config/cmd.rs                             |   4 +-
 src/config/enrichment_table.rs                |   2 +-
 src/config/enterprise.rs                      |   2 +-
 src/config/id.rs                              |   2 +-
 src/config/loading/mod.rs                     |   2 +-
 src/config/mod.rs                             |  10 +-
 src/config/provider.rs                        |   2 +-
 src/config/schema.rs                          |   2 +-
 src/config/secret.rs                          |   2 +-
 src/config/sink.rs                            |   8 +-
 src/config/source.rs                          |   8 +-
 src/config/transform.rs                       |   6 +-
 src/config/unit_test/unit_test_components.rs  |   2 +-
 src/docker.rs                                 |   2 +-
 src/enrichment_tables/file.rs                 |   2 +-
 src/enrichment_tables/geoip.rs                |   2 +-
 src/enrichment_tables/mod.rs                  |   2 +-
 src/gcp.rs                                    |   2 +-
 src/generate.rs                               |   2 +-
 src/generate_schema.rs                        |   2 +-
 src/http.rs                                   |   2 +-
 src/kafka.rs                                  |   2 +-
 src/line_agg.rs                               |   2 +-
 src/list.rs                                   |   2 +-
 src/nats.rs                                   |   2 +-
 src/providers/http.rs                         |   2 +-
 src/providers/mod.rs                          |   2 +-
 src/secrets/exec.rs                           |   2 +-
 src/secrets/mod.rs                            |   2 +-
 src/secrets/test.rs                           |   2 +-
 src/serde.rs                                  |   2 +-
 src/sinks/appsignal/config.rs                 |   2 +-
 src/sinks/appsignal/tests.rs                  |   2 +-
 src/sinks/aws_cloudwatch_logs/config.rs       |   2 +-
 src/sinks/aws_cloudwatch_metrics/mod.rs       |   2 +-
 src/sinks/aws_kinesis/firehose/config.rs      |   2 +-
 src/sinks/aws_kinesis/streams/config.rs       |   2 +-
 src/sinks/aws_s3/config.rs                    |   2 +-
 src/sinks/aws_s_s/config.rs                   |   2 +-
 src/sinks/aws_s_s/sns/config.rs               |   2 +-
 src/sinks/aws_s_s/sqs/config.rs               |   2 +-
 src/sinks/axiom.rs                            |   2 +-
 src/sinks/azure_blob/config.rs                |   2 +-
 src/sinks/azure_monitor_logs/config.rs        |   2 +-
 src/sinks/blackhole/config.rs                 |   2 +-
 src/sinks/console/config.rs                   |   2 +-
 src/sinks/databend/compression.rs             |   2 +-
 src/sinks/databend/config.rs                  |   2 +-
 src/sinks/databend/encoding.rs                |   2 +-
 src/sinks/datadog/events/config.rs            |   2 +-
 src/sinks/datadog/logs/config.rs              |   2 +-
 src/sinks/datadog/metrics/config.rs           |   2 +-
 src/sinks/datadog/mod.rs                      |   2 +-
 src/sinks/datadog/traces/config.rs            |   2 +-
 src/sinks/elasticsearch/config.rs             |   2 +-
 src/sinks/elasticsearch/mod.rs                |   2 +-
 src/sinks/file/mod.rs                         |   2 +-
 src/sinks/gcp/chronicle_unstructured.rs       |   2 +-
 src/sinks/gcp/cloud_storage.rs                |   2 +-
 src/sinks/gcp/mod.rs                          |   2 +-
 src/sinks/gcp/pubsub.rs                       |   2 +-
 src/sinks/gcs_common/config.rs                |   2 +-
 src/sinks/humio/logs.rs                       |   2 +-
 src/sinks/humio/metrics.rs                    |   2 +-
 src/sinks/influxdb/logs.rs                    |   2 +-
 src/sinks/influxdb/metrics.rs                 |   2 +-
 src/sinks/influxdb/mod.rs                     |   2 +-
 src/sinks/kafka/config.rs                     |   2 +-
 src/sinks/mezmo.rs                            |   2 +-
 src/sinks/papertrail.rs                       |   2 +-
 src/sinks/prelude.rs                          |   2 +-
 src/sinks/prometheus/exporter.rs              |   2 +-
 src/sinks/prometheus/mod.rs                   |   2 +-
 src/sinks/pulsar/tests.rs                     |   2 +-
 src/sinks/s3_common/config.rs                 |   2 +-
 src/sinks/sematext/logs.rs                    |   2 +-
 src/sinks/sematext/metrics.rs                 |   2 +-
 src/sinks/sematext/mod.rs                     |   2 +-
 src/sinks/socket.rs                           |   2 +-
 .../splunk_hec/common/acknowledgements.rs     |   2 +-
 src/sinks/splunk_hec/common/mod.rs            |   2 +-
 src/sinks/splunk_hec/logs/config.rs           |   2 +-
 src/sinks/splunk_hec/metrics/config.rs        |   2 +-
 src/sinks/statsd/config.rs                    |   2 +-
 src/sinks/util/adaptive_concurrency/mod.rs    |   2 +-
 src/sinks/util/adaptive_concurrency/tests.rs  |   2 +-
 src/sinks/util/batch.rs                       |   2 +-
 src/sinks/util/buffer/compression.rs          |   4 +-
 src/sinks/util/http.rs                        |   2 +-
 src/sinks/util/service.rs                     |   2 +-
 src/sinks/util/service/concurrency.rs         |   4 +-
 src/sinks/util/service/health.rs              |   2 +-
 src/sinks/util/service/net/mod.rs             |   2 +-
 src/sinks/util/service/net/tcp.rs             |   2 +-
 src/sinks/util/service/net/udp.rs             |   2 +-
 src/sinks/util/service/net/unix.rs            |   2 +-
 src/sinks/util/tcp.rs                         |   2 +-
 src/sinks/util/udp.rs                         |   2 +-
 src/sinks/util/unix.rs                        |   2 +-
 src/sinks/util/uri.rs                         |   2 +-
 src/sinks/vector/config.rs                    |   2 +-
 src/sinks/vector/mod.rs                       |   2 +-
 src/sinks/webhdfs/config.rs                   |   2 +-
 src/sinks/websocket/config.rs                 |   2 +-
 src/sources/amqp.rs                           |   2 +-
 src/sources/apache_metrics/mod.rs             |   2 +-
 src/sources/aws_ecs_metrics/mod.rs            |   2 +-
 src/sources/aws_kinesis_firehose/mod.rs       |   2 +-
 src/sources/aws_s3/mod.rs                     |   2 +-
 src/sources/aws_s3/sqs.rs                     |   2 +-
 src/sources/aws_sqs/config.rs                 |   2 +-
 src/sources/datadog_agent/mod.rs              |   2 +-
 src/sources/demo_logs.rs                      |   2 +-
 src/sources/dnstap/mod.rs                     |   2 +-
 src/sources/docker_logs/mod.rs                |   2 +-
 src/sources/eventstoredb_metrics/mod.rs       |   2 +-
 src/sources/exec/mod.rs                       |   2 +-
 src/sources/file.rs                           |   2 +-
 .../file_descriptors/file_descriptor.rs       |   2 +-
 src/sources/file_descriptors/mod.rs           |   2 +-
 src/sources/file_descriptors/stdin.rs         |   2 +-
 src/sources/fluent/mod.rs                     |   2 +-
 src/sources/gcp_pubsub.rs                     |   2 +-
 src/sources/heroku_logs.rs                    |   2 +-
 src/sources/host_metrics/disk.rs              |   2 +-
 src/sources/host_metrics/filesystem.rs        |   2 +-
 src/sources/host_metrics/mod.rs               |   2 +-
 src/sources/host_metrics/network.rs           |   2 +-
 src/sources/http_client/client.rs             |   2 +-
 src/sources/http_server.rs                    |   2 +-
 src/sources/internal_logs.rs                  |   2 +-
 src/sources/internal_metrics.rs               |   2 +-
 src/sources/journald.rs                       |   2 +-
 src/sources/kafka.rs                          |   2 +-
 src/sources/kubernetes_logs/mod.rs            |   2 +-
 .../namespace_metadata_annotator.rs           |   2 +-
 .../node_metadata_annotator.rs                |   2 +-
 .../kubernetes_logs/pod_metadata_annotator.rs |   2 +-
 src/sources/logstash.rs                       |   2 +-
 src/sources/mongodb_metrics/mod.rs            |   2 +-
 src/sources/nats.rs                           |   2 +-
 src/sources/nginx_metrics/mod.rs              |   2 +-
 src/sources/opentelemetry/mod.rs              |   2 +-
 src/sources/postgresql_metrics.rs             |   2 +-
 src/sources/prometheus/remote_write.rs        |   2 +-
 src/sources/prometheus/scrape.rs              |   2 +-
 src/sources/redis/mod.rs                      |   2 +-
 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/acknowledgements.rs    |   2 +-
 src/sources/splunk_hec/mod.rs                 |   2 +-
 src/sources/statsd/mod.rs                     |   2 +-
 src/sources/statsd/unix.rs                    |   2 +-
 src/sources/syslog.rs                         |   2 +-
 src/sources/util/body_decoding.rs             |   2 +-
 src/sources/util/encoding_config.rs           |   2 +-
 src/sources/util/http/auth.rs                 |   2 +-
 src/sources/util/http/method.rs               |   2 +-
 src/sources/util/multiline_config.rs          |   2 +-
 src/sources/util/net/mod.rs                   |   2 +-
 src/sources/vector/mod.rs                     |   2 +-
 src/template.rs                               |   2 +-
 src/test_util/mock/sinks/backpressure.rs      |   2 +-
 src/test_util/mock/sinks/basic.rs             |   2 +-
 src/test_util/mock/sinks/error.rs             |   2 +-
 src/test_util/mock/sinks/oneshot.rs           |   2 +-
 src/test_util/mock/sinks/panic.rs             |   2 +-
 src/test_util/mock/sources/backpressure.rs    |   2 +-
 src/test_util/mock/sources/basic.rs           |   2 +-
 src/test_util/mock/sources/error.rs           |   2 +-
 src/test_util/mock/sources/panic.rs           |   2 +-
 src/test_util/mock/sources/tripwire.rs        |   2 +-
 src/test_util/mock/transforms/basic.rs        |   2 +-
 .../mock/transforms/error_definitions.rs      |   2 +-
 src/test_util/mock/transforms/mod.rs          |   2 +-
 src/test_util/mock/transforms/noop.rs         |   2 +-
 src/transforms/aggregate.rs                   |   2 +-
 src/transforms/aws_ec2_metadata.rs            |   2 +-
 src/transforms/dedupe.rs                      |   2 +-
 src/transforms/filter.rs                      |   2 +-
 src/transforms/log_to_metric.rs               |   2 +-
 src/transforms/lua/mod.rs                     |   2 +-
 src/transforms/lua/v1/mod.rs                  |   2 +-
 src/transforms/lua/v2/mod.rs                  |   2 +-
 src/transforms/metric_to_log.rs               |   2 +-
 src/transforms/reduce/merge_strategy.rs       |   2 +-
 src/transforms/reduce/mod.rs                  |   2 +-
 src/transforms/remap.rs                       |   2 +-
 src/transforms/route.rs                       |   2 +-
 src/transforms/sample.rs                      |   2 +-
 .../tag_cardinality_limit/config.rs           |   2 +-
 src/transforms/throttle.rs                    |   2 +-
 215 files changed, 359 insertions(+), 300 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 48e44c2fd150a..b3fe498a51624 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -9866,9 +9866,6 @@ dependencies = [
  "uuid",
  "vector-api-client",
  "vector-buffers",
- "vector-config",
- "vector-config-common",
- "vector-config-macros",
  "vector-lib",
  "vector-lookup",
  "vector-stream",
@@ -10117,6 +10114,7 @@ name = "vector-lib"
 version = "0.1.0"
 dependencies = [
  "vector-common",
+ "vector-config",
  "vector-core",
 ]
 
diff --git a/Cargo.toml b/Cargo.toml
index 7dddc4e4b4ba6..9ca6ef0b2d279 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -141,9 +141,6 @@ opentelemetry-proto = { path = "lib/opentelemetry-proto", optional = true }
 tracing-limit = { path = "lib/tracing-limit" }
 vector-api-client = { path = "lib/vector-api-client", optional = true }
 vector-buffers = { path = "lib/vector-buffers", default-features = false }
-vector-config = { path = "lib/vector-config" }
-vector-config-common = { path = "lib/vector-config-common" }
-vector-config-macros = { path = "lib/vector-config-macros" }
 vector-lib = { path = "lib/vector-lib", default-features = false, features = ["vrl"] }
 vector-stream = { path = "lib/vector-stream" }
 vector-vrl-functions = { path = "lib/vector-vrl/functions" }
diff --git a/lib/vector-config-common/src/lib.rs b/lib/vector-config-common/src/lib.rs
index f7305a3abea50..297e9aa7ace72 100644
--- a/lib/vector-config-common/src/lib.rs
+++ b/lib/vector-config-common/src/lib.rs
@@ -1,3 +1,5 @@
+#![deny(warnings)]
+
 // TODO: `darling` is currently strict about accepting only matching literal types for scalar fields i.e. a `f64` field
 // can only be parsed from a string or float literal, but not an integer literal... and float literals have to be in the
 // form of `1000.0`, not `1000`.
@@ -10,10 +12,35 @@
 // `#[configurable(validation(length(min = 1)))]` to indicate the string cannot be empty, when
 // something like `#[configurable(validation(not_empty)]` is a bit more self-evident, and shorter to boot
 
-#![deny(warnings)]
+use std::sync::OnceLock;
+
 pub mod attributes;
 pub mod constants;
 pub mod human_friendly;
 pub mod num;
 pub mod schema;
 pub mod validation;
+
+/// Generate the package name to reach `vector_config` in the output of the macros. This should be
+/// `vector_lib::configurable` in all packages that can import `vector_lib` to allow for a single
+/// import interface, but it needs to explicitly name `vector_config` in all packages that
+/// themselves import `vector_lib`.
+pub fn configurable_package_name_hack() -> proc_macro2::TokenStream {
+    // `TokenStream2` does not implement `Sync`, so we can't use it directly in `OnceLock`. As such,
+    // this hack needs to recreate the package name token stream each time. We can also not return a
+    // string type, which could be stored in the `OnceLock`, as one of the options is a multi-token
+    // value and the string will always be parsed as a single token.
+    static RUNNING_IN_LIB: OnceLock<bool> = OnceLock::new();
+    // We can't use `env!("CARGO_PKG_NAME")` to be able to create a `const`, as that is evaluated
+    // once when this macro package is built rather than when they are evaluated. This has to be
+    // evaluated in the context of the package in which the macro is being expanded.
+    let running_in_lib = *RUNNING_IN_LIB.get_or_init(|| {
+        let package = std::env::var("CARGO_PKG_NAME").expect("Must be built by cargo");
+        package.starts_with("vector-") || package == "file-source" || package == "codecs"
+    });
+    if running_in_lib {
+        syn::parse_quote! { ::vector_config }
+    } else {
+        syn::parse_quote! { ::vector_lib::configurable }
+    }
+}
diff --git a/lib/vector-config-common/src/validation.rs b/lib/vector-config-common/src/validation.rs
index 569f80cf33007..b8209cba097a1 100644
--- a/lib/vector-config-common/src/validation.rs
+++ b/lib/vector-config-common/src/validation.rs
@@ -4,6 +4,7 @@ use quote::{quote, ToTokens};
 use syn::{Expr, Lit, Meta};
 
 use crate::{
+    configurable_package_name_hack,
     num::{ERR_NUMERIC_OUT_OF_RANGE, NUMERIC_ENFORCED_LOWER_BOUND, NUMERIC_ENFORCED_UPPER_BOUND},
     schema::{InstanceType, SchemaObject},
 };
@@ -138,18 +139,19 @@ impl Format {
 
 impl ToTokens for Format {
     fn to_tokens(&self, tokens: &mut TokenStream) {
+        let vector_config = configurable_package_name_hack();
         let format_tokens = match self {
-            Format::Date => quote! { ::vector_config::validation::Format::Date },
-            Format::Time => quote! { ::vector_config::validation::Format::Time },
-            Format::DateTime => quote! { ::vector_config::validation::Format::DateTime },
-            Format::Duration => quote! { ::vector_config::validation::Format::Duration },
-            Format::Email => quote! { ::vector_config::validation::Format::Email },
-            Format::Hostname => quote! { ::vector_config::validation::Format::Hostname },
-            Format::Uri => quote! { ::vector_config::validation::Format::Uri },
-            Format::IPv4 => quote! { ::vector_config::validation::Format::IPv4 },
-            Format::IPv6 => quote! { ::vector_config::validation::Format::IPv6 },
-            Format::Uuid => quote! { ::vector_config::validation::Format::Uuid },
-            Format::Regex => quote! { ::vector_config::validation::Format::Regex },
+            Format::Date => quote! { #vector_config::validation::Format::Date },
+            Format::Time => quote! { #vector_config::validation::Format::Time },
+            Format::DateTime => quote! { #vector_config::validation::Format::DateTime },
+            Format::Duration => quote! { #vector_config::validation::Format::Duration },
+            Format::Email => quote! { #vector_config::validation::Format::Email },
+            Format::Hostname => quote! { #vector_config::validation::Format::Hostname },
+            Format::Uri => quote! { #vector_config::validation::Format::Uri },
+            Format::IPv4 => quote! { #vector_config::validation::Format::IPv4 },
+            Format::IPv6 => quote! { #vector_config::validation::Format::IPv6 },
+            Format::Uuid => quote! { #vector_config::validation::Format::Uuid },
+            Format::Regex => quote! { #vector_config::validation::Format::Regex },
         };
 
         tokens.extend(format_tokens);
@@ -292,24 +294,25 @@ impl Validation {
 
 impl ToTokens for Validation {
     fn to_tokens(&self, tokens: &mut TokenStream) {
+        let vector_config = configurable_package_name_hack();
         let validation_tokens = match self {
             Validation::KnownFormat(format) => {
-                quote! { ::vector_config::validation::Validation::KnownFormat(#format) }
+                quote! { #vector_config::validation::Validation::KnownFormat(#format) }
             }
             Validation::Length { minimum, maximum } => {
                 let min_tokens = option_as_token(*minimum);
                 let max_tokens = option_as_token(*maximum);
 
-                quote! { ::vector_config::validation::Validation::Length { minimum: #min_tokens, maximum: #max_tokens } }
+                quote! { #vector_config::validation::Validation::Length { minimum: #min_tokens, maximum: #max_tokens } }
             }
             Validation::Range { minimum, maximum } => {
                 let min_tokens = option_as_token(*minimum);
                 let max_tokens = option_as_token(*maximum);
 
-                quote! { ::vector_config::validation::Validation::Range { minimum: #min_tokens, maximum: #max_tokens } }
+                quote! { #vector_config::validation::Validation::Range { minimum: #min_tokens, maximum: #max_tokens } }
             }
             Validation::Pattern(pattern) => {
-                quote! { ::vector_config::validation::Validation::Pattern(#pattern.to_string()) }
+                quote! { #vector_config::validation::Validation::Pattern(#pattern.to_string()) }
             }
         };
 
diff --git a/lib/vector-config-macros/src/ast/field.rs b/lib/vector-config-macros/src/ast/field.rs
index 09f2d85a33dc5..b473cd675a349 100644
--- a/lib/vector-config-macros/src/ast/field.rs
+++ b/lib/vector-config-macros/src/ast/field.rs
@@ -6,7 +6,7 @@ use proc_macro2::{Span, TokenStream};
 use quote::ToTokens;
 use serde_derive_internals::ast as serde_ast;
 use syn::{parse_quote, ExprPath, Ident};
-use vector_config_common::validation::Validation;
+use vector_config_common::{configurable_package_name_hack, validation::Validation};
 
 use super::{
     util::{
@@ -352,7 +352,8 @@ impl Attributes {
             // serialize wrapper, since we know we'll have to do that in a few different places
             // during codegen, so it's cleaner to do it here.
             let field_ty = field.ty;
-            parse_quote! { ::vector_config::ser::Delegated<#field_ty, #virtual_ty> }
+            let vector_config = configurable_package_name_hack();
+            parse_quote! { #vector_config::ser::Delegated<#field_ty, #virtual_ty> }
         });
 
         Ok(self)
diff --git a/lib/vector-config-macros/src/component_name.rs b/lib/vector-config-macros/src/component_name.rs
index 8c7e5efd2e65e..77e07c7f79470 100644
--- a/lib/vector-config-macros/src/component_name.rs
+++ b/lib/vector-config-macros/src/component_name.rs
@@ -3,6 +3,7 @@ use proc_macro::TokenStream;
 
 use quote::quote;
 use syn::{parse_macro_input, spanned::Spanned, Attribute, DeriveInput, Error, LitStr};
+use vector_config_common::configurable_package_name_hack;
 
 use crate::attrs::{self, path_matches};
 
@@ -89,12 +90,13 @@ pub fn derive_component_name_impl(input: TokenStream) -> TokenStream {
 
     // We have a single, valid component name, so let's actually spit out our derive.
     let (impl_generics, ty_generics, where_clause) = input.generics.split_for_impl();
+    let vector_config = configurable_package_name_hack();
     let derived = quote! {
         impl #impl_generics #ident #ty_generics #where_clause {
             pub(super) const NAME: &'static str = #component_name;
         }
 
-        impl #impl_generics ::vector_config::NamedComponent for #ident #ty_generics #where_clause {
+        impl #impl_generics #vector_config::NamedComponent for #ident #ty_generics #where_clause {
             fn get_component_name(&self) -> &'static str {
                 #component_name
             }
diff --git a/lib/vector-config-macros/src/configurable.rs b/lib/vector-config-macros/src/configurable.rs
index b26e317b998f5..cc39c1fa3401f 100644
--- a/lib/vector-config-macros/src/configurable.rs
+++ b/lib/vector-config-macros/src/configurable.rs
@@ -5,7 +5,7 @@ use syn::{
     parse_macro_input, parse_quote, spanned::Spanned, token::PathSep, DeriveInput, ExprPath, Ident,
     PathArguments, Type,
 };
-use vector_config_common::validation::Validation;
+use vector_config_common::{configurable_package_name_hack, validation::Validation};
 
 use crate::ast::{Container, Data, Field, LazyCustomAttribute, Style, Tagging, Variant};
 
@@ -25,6 +25,7 @@ pub fn derive_configurable_impl(input: TokenStream) -> TokenStream {
     };
 
     let mut generics = container.generics().clone();
+    let vector_config = configurable_package_name_hack();
 
     // We need to construct an updated where clause that properly constrains any generic types which are used as fields
     // on the container. We _only_ care about fields that are pure generic types, because anything that's a concrete
@@ -35,7 +36,7 @@ pub fn derive_configurable_impl(input: TokenStream) -> TokenStream {
         let where_clause = generics.make_where_clause();
         for typ in generic_field_types {
             let ty = &typ.ident;
-            let predicate = parse_quote! { #ty: ::vector_config::Configurable + ::serde::Serialize + ::vector_config::ToValue };
+            let predicate = parse_quote! { #ty: #vector_config::Configurable + ::serde::Serialize + #vector_config::ToValue };
 
             where_clause.predicates.push(predicate);
         }
@@ -64,7 +65,7 @@ pub fn derive_configurable_impl(input: TokenStream) -> TokenStream {
         const _: () = {
             #[automatically_derived]
             #[allow(unused_qualifications)]
-            impl #impl_generics ::vector_config::Configurable for #name #ty_generics #where_clause {
+            impl #impl_generics #vector_config::Configurable for #name #ty_generics #where_clause {
                 fn referenceable_name() -> Option<&'static str> {
                     // If the type name we get back from `std::any::type_name` doesn't start with
                     // the module path, use a concatenated version.
@@ -97,7 +98,7 @@ pub fn derive_configurable_impl(input: TokenStream) -> TokenStream {
                 #generate_schema_fn
             }
 
-            impl #impl_generics ::vector_config::ToValue for #name #ty_generics #where_clause {
+            impl #impl_generics #vector_config::ToValue for #name #ty_generics #where_clause {
                 #to_value_fn
             }
         };
@@ -109,9 +110,10 @@ pub fn derive_configurable_impl(input: TokenStream) -> TokenStream {
 fn build_metadata_fn(container: &Container<'_>) -> proc_macro2::TokenStream {
     let meta_ident = Ident::new("metadata", Span::call_site());
     let container_metadata = generate_container_metadata(&meta_ident, container);
+    let vector_config = configurable_package_name_hack();
 
     quote! {
-        fn metadata() -> ::vector_config::Metadata {
+        fn metadata() -> #vector_config::Metadata {
             #container_metadata
             #meta_ident
         }
@@ -119,19 +121,21 @@ fn build_metadata_fn(container: &Container<'_>) -> proc_macro2::TokenStream {
 }
 
 fn build_to_value_fn(_container: &Container<'_>) -> proc_macro2::TokenStream {
+    let vector_config = configurable_package_name_hack();
     quote! {
-        fn to_value(&self) -> ::vector_config::serde_json::Value {
-            ::vector_config::serde_json::to_value(self)
+        fn to_value(&self) -> #vector_config::serde_json::Value {
+            #vector_config::serde_json::to_value(self)
                 .expect("Could not convert value to JSON")
         }
     }
 }
 
 fn build_virtual_newtype_schema_fn(virtual_ty: Type) -> proc_macro2::TokenStream {
+    let vector_config = configurable_package_name_hack();
     quote! {
-        fn generate_schema(schema_gen: &::std::cell::RefCell<::vector_config::schema::SchemaGenerator>) -> std::result::Result<::vector_config::schema::SchemaObject, ::vector_config::GenerateError> {
-            ::vector_config::schema::get_or_generate_schema(
-                &<#virtual_ty as ::vector_config::Configurable>::as_configurable_ref(),
+        fn generate_schema(schema_gen: &::std::cell::RefCell<#vector_config::schema::SchemaGenerator>) -> std::result::Result<#vector_config::schema::SchemaObject, #vector_config::GenerateError> {
+            #vector_config::schema::get_or_generate_schema(
+                &<#virtual_ty as #vector_config::Configurable>::as_configurable_ref(),
                 schema_gen,
                 None,
             )
@@ -143,6 +147,8 @@ fn build_enum_generate_schema_fn(
     container: &Container,
     variants: &[Variant<'_>],
 ) -> proc_macro2::TokenStream {
+    let vector_config = configurable_package_name_hack();
+
     // First, figure out if we have a potentially "ambiguous" enum schema. This will influence the
     // code we generate, which will, at runtime, attempt to figure out if we need to emit an `anyOf`
     // schema, rather than a `oneOf` schema, to handle validation of enums where variants overlap in
@@ -165,15 +171,15 @@ fn build_enum_generate_schema_fn(
     // If we never generate any entries in the discriminant map, then this will end up just calling
     // the `oneOf` method.
     let generate_block = quote! {
-        if ::vector_config::schema::has_ambiguous_discriminants(&discriminant_map) {
-            Ok(::vector_config::schema::generate_any_of_schema(&subschemas))
+        if #vector_config::schema::has_ambiguous_discriminants(&discriminant_map) {
+            Ok(#vector_config::schema::generate_any_of_schema(&subschemas))
         } else {
-            Ok(::vector_config::schema::generate_one_of_schema(&subschemas))
+            Ok(#vector_config::schema::generate_one_of_schema(&subschemas))
         }
     };
 
     quote! {
-        fn generate_schema(schema_gen: &::std::cell::RefCell<::vector_config::schema::SchemaGenerator>) -> std::result::Result<::vector_config::schema::SchemaObject, ::vector_config::GenerateError> {
+        fn generate_schema(schema_gen: &::std::cell::RefCell<#vector_config::schema::SchemaGenerator>) -> std::result::Result<#vector_config::schema::SchemaObject, #vector_config::GenerateError> {
             let mut subschemas = ::std::vec::Vec::new();
             let mut discriminant_map = ::std::collections::HashMap::new();
 
@@ -226,9 +232,10 @@ fn generate_struct_field(field: &Field<'_>) -> proc_macro2::TokenStream {
     let field_metadata = generate_field_metadata(&field_metadata_ref, field);
     let field_schema_ty = get_field_schema_ty(field);
 
+    let vector_config = configurable_package_name_hack();
     let spanned_generate_schema = quote_spanned! {field.span()=>
-        ::vector_config::schema::get_or_generate_schema(
-            &<#field_schema_ty as ::vector_config::Configurable>::as_configurable_ref(),
+        #vector_config::schema::get_or_generate_schema(
+            &<#field_schema_ty as #vector_config::Configurable>::as_configurable_ref(),
             schema_gen,
             Some(#field_metadata_ref),
         )?
@@ -256,6 +263,7 @@ fn generate_named_struct_field(
     let field_key = field.name();
 
     let field_schema = generate_struct_field(field);
+    let vector_config = configurable_package_name_hack();
 
     // If the field is flattened, we store it into a different list of flattened subschemas vs adding it directly as a
     // field via `properties`/`required`.
@@ -271,7 +279,7 @@ fn generate_named_struct_field(
         // field is a part of, then we consider it required unless the field type itself is inherently
         // optional, such as being `Option<T>`.
         let spanned_is_optional = quote_spanned! {field.span()=>
-            <#field_schema_ty as ::vector_config::Configurable>::is_optional()
+            <#field_schema_ty as #vector_config::Configurable>::is_optional()
         };
         let maybe_field_required =
             if container.default_value().is_none() && field.default_value().is_none() {
@@ -316,6 +324,7 @@ fn build_named_struct_generate_schema_fn(
     container: &Container<'_>,
     fields: &[Field<'_>],
 ) -> proc_macro2::TokenStream {
+    let vector_config = configurable_package_name_hack();
     let mapped_fields = fields
         .iter()
         // Don't map this field if it's marked to be skipped for both serialization and deserialization.
@@ -323,18 +332,18 @@ fn build_named_struct_generate_schema_fn(
         .map(|field| generate_named_struct_field(container, field));
 
     quote! {
-        fn generate_schema(schema_gen: &::std::cell::RefCell<::vector_config::schema::SchemaGenerator>) -> std::result::Result<::vector_config::schema::SchemaObject, ::vector_config::GenerateError> {
-            let mut properties = ::vector_config::indexmap::IndexMap::new();
+        fn generate_schema(schema_gen: &::std::cell::RefCell<#vector_config::schema::SchemaGenerator>) -> std::result::Result<#vector_config::schema::SchemaObject, #vector_config::GenerateError> {
+            let mut properties = #vector_config::indexmap::IndexMap::new();
             let mut required = ::std::collections::BTreeSet::new();
             let mut flattened_subschemas = ::std::vec::Vec::new();
 
-            let metadata = <Self as ::vector_config::Configurable>::metadata();
+            let metadata = <Self as #vector_config::Configurable>::metadata();
             #(#mapped_fields)*
 
             let had_unflatted_properties = !properties.is_empty();
 
             let additional_properties = None;
-            let mut schema = ::vector_config::schema::generate_struct_schema(
+            let mut schema = #vector_config::schema::generate_struct_schema(
                 properties,
                 required,
                 additional_properties,
@@ -352,7 +361,7 @@ fn build_named_struct_generate_schema_fn(
                     schema = flattened_subschemas.remove(0);
                 }
 
-                ::vector_config::schema::convert_to_flattened_schema(&mut schema, flattened_subschemas);
+                #vector_config::schema::convert_to_flattened_schema(&mut schema, flattened_subschemas);
             }
 
             Ok(schema)
@@ -361,6 +370,7 @@ fn build_named_struct_generate_schema_fn(
 }
 
 fn build_tuple_struct_generate_schema_fn(fields: &[Field<'_>]) -> proc_macro2::TokenStream {
+    let vector_config = configurable_package_name_hack();
     let mapped_fields = fields
         .iter()
         // Don't map this field if it's marked to be skipped for both serialization and deserialization.
@@ -368,12 +378,12 @@ fn build_tuple_struct_generate_schema_fn(fields: &[Field<'_>]) -> proc_macro2::T
         .map(generate_tuple_struct_field);
 
     quote! {
-        fn generate_schema(schema_gen: &::std::cell::RefCell<::vector_config::schema::SchemaGenerator>) -> std::result::Result<::vector_config::schema::SchemaObject, ::vector_config::GenerateError> {
+        fn generate_schema(schema_gen: &::std::cell::RefCell<#vector_config::schema::SchemaGenerator>) -> std::result::Result<#vector_config::schema::SchemaObject, #vector_config::GenerateError> {
             let mut subschemas = ::std::collections::Vec::new();
 
             #(#mapped_fields)*
 
-            Ok(::vector_config::schema::generate_tuple_schema(&subschemas))
+            Ok(#vector_config::schema::generate_tuple_schema(&subschemas))
         }
     }
 }
@@ -392,9 +402,10 @@ fn build_newtype_struct_generate_schema_fn(fields: &[Field<'_>]) -> proc_macro2:
     }
 
     let field_schema = mapped_fields.remove(0);
+    let vector_config = configurable_package_name_hack();
 
     quote! {
-        fn generate_schema(schema_gen: &::std::cell::RefCell<::vector_config::schema::SchemaGenerator>) -> std::result::Result<::vector_config::schema::SchemaObject, ::vector_config::GenerateError> {
+        fn generate_schema(schema_gen: &::std::cell::RefCell<#vector_config::schema::SchemaGenerator>) -> std::result::Result<#vector_config::schema::SchemaObject, #vector_config::GenerateError> {
             #field_schema
 
             Ok(subschema)
@@ -427,8 +438,9 @@ fn generate_container_metadata(
     let enum_metadata =
         get_metadata_custom_attributes(meta_ident, enum_metadata_attrs.into_iter().flatten());
 
+    let vector_config = configurable_package_name_hack();
     quote! {
-        let mut #meta_ident = ::vector_config::Metadata::default();
+        let mut #meta_ident = #vector_config::Metadata::default();
         #maybe_title
         #maybe_description
         #maybe_default_value
@@ -470,8 +482,9 @@ fn generate_field_metadata(meta_ident: &Ident, field: &Field<'_>) -> proc_macro2
     let maybe_validation = get_metadata_validation(meta_ident, field.validation());
     let maybe_custom_attributes = get_metadata_custom_attributes(meta_ident, field.metadata());
 
+    let vector_config = configurable_package_name_hack();
     quote! {
-        let mut #meta_ident = ::vector_config::Metadata::default();
+        let mut #meta_ident = #vector_config::Metadata::default();
         #maybe_clear_title_description
         #maybe_title
         #maybe_description
@@ -516,8 +529,9 @@ fn generate_variant_metadata(
     // variant, but there's no unique concrete type for a variant, only the type of the enum
     // container it exists within. We also don't want to use the metadata of the enum container, as
     // it might have values that would conflict with the metadata of this specific variant.
+    let vector_config = configurable_package_name_hack();
     quote! {
-        let mut #meta_ident = ::vector_config::Metadata::default();
+        let mut #meta_ident = #vector_config::Metadata::default();
         #maybe_title
         #maybe_description
         #maybe_deprecated
@@ -540,8 +554,9 @@ fn generate_variant_tag_metadata(
     // variant, but there's no unique concrete type for a variant, only the type of the enum
     // container it exists within. We also don't want to use the metadata of the enum container, as
     // it might have values that would conflict with the metadata of this specific variant.
+    let vector_config = configurable_package_name_hack();
     quote! {
-        let mut #meta_ident = ::vector_config::Metadata::default();
+        let mut #meta_ident = #vector_config::Metadata::default();
         #maybe_title
         #maybe_description
     }
@@ -644,13 +659,14 @@ fn get_metadata_custom_attributes(
     meta_ident: &Ident,
     custom_attributes: impl Iterator<Item = LazyCustomAttribute>,
 ) -> proc_macro2::TokenStream {
+    let vector_config = configurable_package_name_hack();
     let mapped_custom_attributes = custom_attributes
         .map(|attr| match attr {
             LazyCustomAttribute::Flag(key) => quote! {
-                #meta_ident.add_custom_attribute(::vector_config_common::attributes::CustomAttribute::flag(#key));
+                #meta_ident.add_custom_attribute(#vector_config::attributes::CustomAttribute::flag(#key));
             },
             LazyCustomAttribute::KeyValue { key, value } => quote! {
-                #meta_ident.add_custom_attribute(::vector_config_common::attributes::CustomAttribute::kv(
+                #meta_ident.add_custom_attribute(#vector_config::attributes::CustomAttribute::kv(
                     #key, #value
                 ));
             },
@@ -685,8 +701,9 @@ fn generate_named_enum_field(field: &Field<'_>) -> proc_macro2::TokenStream {
     // Fields that have no default value are inherently required.  Unlike fields on a normal
     // struct, we can't derive a default value for an individual field because `serde`
     // doesn't allow even specifying a default value for an enum overall, only structs.
+    let vector_config = configurable_package_name_hack();
     let spanned_is_optional = quote_spanned! {field.span()=>
-        <#field_ty as ::vector_config::Configurable>::is_optional()
+        <#field_ty as #vector_config::Configurable>::is_optional()
     };
     let maybe_field_required = if field.default_value().is_none() {
         Some(quote! {
@@ -729,9 +746,10 @@ fn generate_enum_struct_named_variant_schema(
         }
     });
 
+    let vector_config = configurable_package_name_hack();
     quote! {
         {
-            let mut properties = ::vector_config::indexmap::IndexMap::new();
+            let mut properties = #vector_config::indexmap::IndexMap::new();
             let mut required = ::std::collections::BTreeSet::new();
 
             #(#mapped_fields)*
@@ -740,7 +758,7 @@ fn generate_enum_struct_named_variant_schema(
 
             #maybe_fill_discriminant_map
 
-            ::vector_config::schema::generate_struct_schema(
+            #vector_config::schema::generate_struct_schema(
                 properties,
                 required,
                 None
@@ -769,9 +787,10 @@ fn generate_enum_variant_tag_schema(variant: &Variant<'_>) -> proc_macro2::Token
     let variant_name = variant.name();
     let apply_variant_tag_metadata = generate_enum_variant_tag_apply_metadata(variant);
 
+    let vector_config = configurable_package_name_hack();
     quote! {
         {
-            let mut tag_subschema = ::vector_config::schema::generate_const_string_schema(#variant_name.to_string());
+            let mut tag_subschema = #vector_config::schema::generate_const_string_schema(#variant_name.to_string());
             #apply_variant_tag_metadata
             tag_subschema
         }
@@ -790,6 +809,7 @@ fn generate_enum_variant_schema(
     //   Unnamed(bool),
     //   Unit,
     // }
+    let vector_config = configurable_package_name_hack();
     let variant_name = variant.name();
     let variant_schema = match variant.tagging() {
         // The variant is represented "externally" by wrapping the contents of the variant as an
@@ -874,12 +894,12 @@ fn generate_enum_variant_schema(
                 let tag_schema = generate_enum_variant_tag_schema(variant);
 
                 quote! {
-                    let tag_schema = ::vector_config::schema::generate_internal_tagged_variant_schema(#tag.to_string(), #tag_schema);
+                    let tag_schema = #vector_config::schema::generate_internal_tagged_variant_schema(#tag.to_string(), #tag_schema);
                     let mut flattened_subschemas = ::std::vec::Vec::new();
                     flattened_subschemas.push(tag_schema);
 
                     let mut newtype_schema = #newtype_schema;
-                    ::vector_config::schema::convert_to_flattened_schema(&mut newtype_schema, flattened_subschemas);
+                    #vector_config::schema::convert_to_flattened_schema(&mut newtype_schema, flattened_subschemas);
 
                     newtype_schema
                 }
@@ -926,7 +946,7 @@ fn generate_enum_variant_schema(
             });
 
             quote! {
-                let mut wrapper_properties = ::vector_config::indexmap::IndexMap::new();
+                let mut wrapper_properties = #vector_config::indexmap::IndexMap::new();
                 let mut wrapper_required = ::std::collections::BTreeSet::new();
 
                 wrapper_properties.insert(#tag.to_string(), #tag_schema);
@@ -934,7 +954,7 @@ fn generate_enum_variant_schema(
 
                 #maybe_content_schema
 
-                ::vector_config::schema::generate_struct_schema(
+                #vector_config::schema::generate_struct_schema(
                     wrapper_properties,
                     wrapper_required,
                     None
@@ -973,7 +993,7 @@ fn generate_enum_variant_schema(
                 ),
                 Style::Tuple => panic!("tuple variants should be rejected during AST parsing"),
                 Style::Newtype => generate_enum_newtype_struct_variant_schema(variant),
-                Style::Unit => quote! { ::vector_config::schema::generate_null_schema() },
+                Style::Unit => quote! { #vector_config::schema::generate_null_schema() },
             }
         }
     };
@@ -985,15 +1005,16 @@ fn generate_single_field_struct_schema(
     property_name: &str,
     property_schema: proc_macro2::TokenStream,
 ) -> proc_macro2::TokenStream {
+    let vector_config = configurable_package_name_hack();
     quote! {
         {
-            let mut wrapper_properties = ::vector_config::indexmap::IndexMap::new();
+            let mut wrapper_properties = #vector_config::indexmap::IndexMap::new();
             let mut wrapper_required = ::std::collections::BTreeSet::new();
 
             wrapper_properties.insert(#property_name.to_string(), #property_schema);
             wrapper_required.insert(#property_name.to_string());
 
-            ::vector_config::schema::generate_struct_schema(
+            #vector_config::schema::generate_struct_schema(
                 wrapper_properties,
                 wrapper_required,
                 None
@@ -1006,9 +1027,10 @@ fn generate_enum_variant_apply_metadata(variant: &Variant<'_>) -> proc_macro2::T
     let variant_metadata_ref = Ident::new("variant_metadata", Span::call_site());
     let variant_metadata = generate_variant_metadata(&variant_metadata_ref, variant);
 
+    let vector_config = configurable_package_name_hack();
     quote! {
         #variant_metadata
-        ::vector_config::schema::apply_base_metadata(&mut subschema, #variant_metadata_ref);
+        #vector_config::schema::apply_base_metadata(&mut subschema, #variant_metadata_ref);
     }
 }
 
@@ -1016,9 +1038,10 @@ fn generate_enum_variant_tag_apply_metadata(variant: &Variant<'_>) -> proc_macro
     let variant_tag_metadata_ref = Ident::new("variant_tag_metadata", Span::call_site());
     let variant_tag_metadata = generate_variant_tag_metadata(&variant_tag_metadata_ref, variant);
 
+    let vector_config = configurable_package_name_hack();
     quote! {
         #variant_tag_metadata
-        ::vector_config::schema::apply_base_metadata(&mut tag_subschema, #variant_tag_metadata_ref);
+        #vector_config::schema::apply_base_metadata(&mut tag_subschema, #variant_tag_metadata_ref);
     }
 }
 
diff --git a/lib/vector-config-macros/src/configurable_component.rs b/lib/vector-config-macros/src/configurable_component.rs
index 42d7813768aa6..8aa35c097f6a8 100644
--- a/lib/vector-config-macros/src/configurable_component.rs
+++ b/lib/vector-config-macros/src/configurable_component.rs
@@ -7,7 +7,8 @@ use syn::{
     token::Comma, DeriveInput, Lit, LitStr, Meta, MetaList, Path,
 };
 use vector_config_common::{
-    constants::ComponentType, human_friendly::generate_human_friendly_string,
+    configurable_package_name_hack, constants::ComponentType,
+    human_friendly::generate_human_friendly_string,
 };
 
 use crate::attrs;
@@ -78,24 +79,25 @@ impl TypedComponent {
         &self,
         input: &DeriveInput,
     ) -> Option<proc_macro2::TokenStream> {
+        let vector_config = configurable_package_name_hack();
         self.component_name.as_ref().map(|component_name| {
             let config_ty = &input.ident;
             let desc_ty: syn::Type = match self.component_type {
                 ComponentType::EnrichmentTable => {
-                    parse_quote! { ::vector_config::component::EnrichmentTableDescription }
+                    parse_quote! { #vector_config::component::EnrichmentTableDescription }
                 }
                 ComponentType::Provider => {
-                    parse_quote! { ::vector_config::component::ProviderDescription }
+                    parse_quote! { #vector_config::component::ProviderDescription }
                 }
                 ComponentType::Secrets => {
-                    parse_quote! { ::vector_config::component::SecretsDescription }
+                    parse_quote! { #vector_config::component::SecretsDescription }
                 }
-                ComponentType::Sink => parse_quote! { ::vector_config::component::SinkDescription },
+                ComponentType::Sink => parse_quote! { #vector_config::component::SinkDescription },
                 ComponentType::Source => {
-                    parse_quote! { ::vector_config::component::SourceDescription }
+                    parse_quote! { #vector_config::component::SourceDescription }
                 }
                 ComponentType::Transform => {
-                    parse_quote! { ::vector_config::component::TransformDescription }
+                    parse_quote! { #vector_config::component::TransformDescription }
                 }
             };
 
@@ -129,13 +131,14 @@ impl TypedComponent {
     /// Creates the component name registration code.
     fn get_component_name_registration(&self) -> proc_macro2::TokenStream {
         let helper_attr = get_named_component_helper_ident(self.component_type);
+        let vector_config = configurable_package_name_hack();
         match self.component_name.as_ref() {
             None => quote_spanned! {self.span=>
-                #[derive(::vector_config_macros::NamedComponent)]
+                #[derive(#vector_config::NamedComponent)]
                 #[#helper_attr]
             },
             Some(component_name) => quote_spanned! {self.span=>
-                #[derive(::vector_config_macros::NamedComponent)]
+                #[derive(#vector_config::NamedComponent)]
                 #[#helper_attr(#component_name)]
             },
         }
@@ -306,8 +309,9 @@ pub fn configurable_component_impl(args: TokenStream, item: TokenStream) -> Toke
 
     // Generate and apply all of the necessary derives.
     let mut derives = Punctuated::<Path, Comma>::new();
+    let vector_config = configurable_package_name_hack();
     derives.push(parse_quote_spanned! {input.ident.span()=>
-        ::vector_config_macros::Configurable
+        #vector_config::Configurable
     });
 
     if !options.skip_derive_ser() {
diff --git a/lib/vector-config/src/lib.rs b/lib/vector-config/src/lib.rs
index b18a6897505fd..4232fbeac8256 100644
--- a/lib/vector-config/src/lib.rs
+++ b/lib/vector-config/src/lib.rs
@@ -138,9 +138,7 @@ pub use vector_config_macros::*;
 // The crate exists so that both `vector_config_macros` and `vector_config` can import the types and work with them
 // natively, but from a codegen and usage perspective, it's much cleaner to export everything needed to use
 // `Configurable` from `vector_config` itself, and not leak out the crate arrangement as an impl detail.
-pub mod validation {
-    pub use vector_config_common::validation::*;
-}
+pub use vector_config_common::{attributes, validation};
 
 #[doc(hidden)]
 pub fn __ensure_numeric_validation_bounds<N>(metadata: &Metadata) -> Result<(), GenerateError>
diff --git a/lib/vector-lib/Cargo.toml b/lib/vector-lib/Cargo.toml
index a66408303abb5..dcc4c585f6020 100644
--- a/lib/vector-lib/Cargo.toml
+++ b/lib/vector-lib/Cargo.toml
@@ -6,7 +6,8 @@ edition = "2021"
 publish = false
 
 [dependencies]
-vector-common = { path = "../vector-common", default-features = false }
+vector-common = { path = "../vector-common" }
+vector-config = { path = "../vector-config" }
 vector-core = { path = "../vector-core", default-features = false }
 
 [features]
diff --git a/lib/vector-lib/src/lib.rs b/lib/vector-lib/src/lib.rs
index 166bdac69c17a..0e81ca7cbb9bc 100644
--- a/lib/vector-lib/src/lib.rs
+++ b/lib/vector-lib/src/lib.rs
@@ -4,6 +4,7 @@ pub use vector_common::{
     registered_event, request_metadata, sensitive_string, shutdown, trigger, Error, Result,
     TimeZone,
 };
+pub use vector_config as configurable;
 #[cfg(feature = "vrl")]
 pub use vector_core::compile_vrl;
 #[cfg(feature = "test")]
diff --git a/src/amqp.rs b/src/amqp.rs
index 247ad4d03099e..4fe87d86962de 100644
--- a/src/amqp.rs
+++ b/src/amqp.rs
@@ -1,6 +1,6 @@
 //! Functionality supporting both the `[crate::sources::amqp]` source and `[crate::sinks::amqp]` sink.
 use lapin::tcp::{OwnedIdentity, OwnedTLSConfig};
-use vector_config::configurable_component;
+use vector_lib::configurable::configurable_component;
 
 /// AMQP connection options.
 #[configurable_component]
diff --git a/src/aws/auth.rs b/src/aws/auth.rs
index 776a57f4c25b6..715f494f7f694 100644
--- a/src/aws/auth.rs
+++ b/src/aws/auth.rs
@@ -14,7 +14,7 @@ use aws_credential_types::{
 };
 use aws_types::region::Region;
 use serde_with::serde_as;
-use vector_config::configurable_component;
+use vector_lib::configurable::configurable_component;
 use vector_lib::sensitive_string::SensitiveString;
 
 // matches default load timeout from the SDK as of 0.10.1, but lets us confidently document the
diff --git a/src/aws/region.rs b/src/aws/region.rs
index b9db93a56bf5f..506812d81df7a 100644
--- a/src/aws/region.rs
+++ b/src/aws/region.rs
@@ -1,5 +1,5 @@
 use aws_types::region::Region;
-use vector_config::configurable_component;
+use vector_lib::configurable::configurable_component;
 
 /// Configuration of the region/endpoint to use when interacting with an AWS service.
 #[configurable_component]
diff --git a/src/codecs/encoding/config.rs b/src/codecs/encoding/config.rs
index c2e6b57106c4f..6f974e4d7854c 100644
--- a/src/codecs/encoding/config.rs
+++ b/src/codecs/encoding/config.rs
@@ -3,7 +3,7 @@ use codecs::{
     encoding::{Framer, FramingConfig, Serializer, SerializerConfig},
     CharacterDelimitedEncoder, LengthDelimitedEncoder, NewlineDelimitedEncoder,
 };
-use vector_config::configurable_component;
+use vector_lib::configurable::configurable_component;
 
 /// Encoding configuration.
 #[configurable_component]
diff --git a/src/codecs/encoding/transformer.rs b/src/codecs/encoding/transformer.rs
index d919a8872a39b..126d526935699 100644
--- a/src/codecs/encoding/transformer.rs
+++ b/src/codecs/encoding/transformer.rs
@@ -8,7 +8,7 @@ use lookup::lookup_v2::ConfigValuePath;
 use lookup::{event_path, PathPrefix};
 use ordered_float::NotNan;
 use serde::{Deserialize, Deserializer};
-use vector_config::configurable_component;
+use vector_lib::configurable::configurable_component;
 use vector_lib::event::{LogEvent, MaybeAsLogMut};
 use vector_lib::schema::meaning;
 use vrl::path::OwnedValuePath;
diff --git a/src/conditions/datadog_search.rs b/src/conditions/datadog_search.rs
index 1f11edc86e2e9..d5f1ddcdd2513 100644
--- a/src/conditions/datadog_search.rs
+++ b/src/conditions/datadog_search.rs
@@ -1,7 +1,7 @@
 use std::borrow::Cow;
 
 use bytes::Bytes;
-use vector_config::configurable_component;
+use vector_lib::configurable::configurable_component;
 use vector_lib::event::{Event, LogEvent, Value};
 use vrl::datadog_filter::{
     build_matcher,
diff --git a/src/conditions/mod.rs b/src/conditions/mod.rs
index a55c84a2f163a..f1dc829daf42a 100644
--- a/src/conditions/mod.rs
+++ b/src/conditions/mod.rs
@@ -1,5 +1,5 @@
 #![allow(missing_docs)]
-use vector_config::configurable_component;
+use vector_lib::configurable::configurable_component;
 
 use crate::event::Event;
 
diff --git a/src/conditions/vrl.rs b/src/conditions/vrl.rs
index 7cd39712ceb2a..16cae9bff6006 100644
--- a/src/conditions/vrl.rs
+++ b/src/conditions/vrl.rs
@@ -1,5 +1,5 @@
-use vector_config::configurable_component;
 use vector_lib::compile_vrl;
+use vector_lib::configurable::configurable_component;
 use vector_lib::TimeZone;
 use vrl::compiler::runtime::{Runtime, RuntimeResult, Terminate};
 use vrl::compiler::{CompilationResult, CompileConfig, Program, TypeState, VrlRuntime};
diff --git a/src/config/api.rs b/src/config/api.rs
index 280851ad249f7..2da33bc134152 100644
--- a/src/config/api.rs
+++ b/src/config/api.rs
@@ -1,7 +1,7 @@
 use std::net::{Ipv4Addr, SocketAddr};
 
 use url::Url;
-use vector_config::configurable_component;
+use vector_lib::configurable::configurable_component;
 
 /// API options.
 #[configurable_component]
diff --git a/src/config/builder.rs b/src/config/builder.rs
index e7968fd587e37..e3febfba5843a 100644
--- a/src/config/builder.rs
+++ b/src/config/builder.rs
@@ -5,8 +5,8 @@ use std::{path::Path, time::Duration};
 use indexmap::IndexMap;
 #[cfg(feature = "enterprise")]
 use serde_json::Value;
-use vector_config::configurable_component;
 use vector_lib::config::GlobalOptions;
+use vector_lib::configurable::configurable_component;
 
 use crate::{enrichment_tables::EnrichmentTables, providers::Providers, secrets::SecretBackends};
 
diff --git a/src/config/cmd.rs b/src/config/cmd.rs
index 64b04aeafb546..7a2ac61e9b14e 100644
--- a/src/config/cmd.rs
+++ b/src/config/cmd.rs
@@ -200,7 +200,9 @@ mod tests {
         SeedableRng,
     };
     use serde_json::json;
-    use vector_config::component::{SinkDescription, SourceDescription, TransformDescription};
+    use vector_lib::configurable::component::{
+        SinkDescription, SourceDescription, TransformDescription,
+    };
 
     use crate::config::Format;
     use crate::{
diff --git a/src/config/enrichment_table.rs b/src/config/enrichment_table.rs
index 6d4f9d06ffdc6..4810638df83ca 100644
--- a/src/config/enrichment_table.rs
+++ b/src/config/enrichment_table.rs
@@ -1,7 +1,7 @@
 use async_trait::async_trait;
 use enum_dispatch::enum_dispatch;
-use vector_config::{configurable_component, NamedComponent};
 use vector_lib::config::GlobalOptions;
+use vector_lib::configurable::{configurable_component, NamedComponent};
 
 use crate::enrichment_tables::EnrichmentTables;
 
diff --git a/src/config/enterprise.rs b/src/config/enterprise.rs
index 8aea56f058251..f964694348eb7 100644
--- a/src/config/enterprise.rs
+++ b/src/config/enterprise.rs
@@ -38,7 +38,7 @@ use crate::{
     },
     transforms::{filter::FilterConfig, remap::RemapConfig},
 };
-use vector_config::configurable_component;
+use vector_lib::configurable::configurable_component;
 
 static HOST_METRICS_KEY: &str = "_datadog_host_metrics";
 static TAG_METRICS_KEY: &str = "_datadog_tag_metrics";
diff --git a/src/config/id.rs b/src/config/id.rs
index 253ec0c35cb44..f38779546f255 100644
--- a/src/config/id.rs
+++ b/src/config/id.rs
@@ -1,7 +1,7 @@
 use std::ops::Deref;
 
-use vector_config::configurable_component;
 pub use vector_lib::config::ComponentKey;
+use vector_lib::configurable::configurable_component;
 
 /// A list of upstream [source][sources] or [transform][transforms] IDs.
 ///
diff --git a/src/config/loading/mod.rs b/src/config/loading/mod.rs
index 092fc826dac6e..ad5fe33371e79 100644
--- a/src/config/loading/mod.rs
+++ b/src/config/loading/mod.rs
@@ -18,7 +18,7 @@ use loader::process::Process;
 pub use loader::*;
 pub use secret::*;
 pub use source::*;
-use vector_config::NamedComponent;
+use vector_lib::configurable::NamedComponent;
 
 use super::{
     builder::ConfigBuilder, format, validation, vars, Config, ConfigPath, Format, FormatHint,
diff --git a/src/config/mod.rs b/src/config/mod.rs
index 7999f13e24d72..5386cdcc2d147 100644
--- a/src/config/mod.rs
+++ b/src/config/mod.rs
@@ -10,12 +10,14 @@ use std::{
 
 use indexmap::IndexMap;
 use serde::Serialize;
-pub use vector_config::component::{GenerateConfig, SinkDescription, TransformDescription};
-use vector_config::configurable_component;
 pub use vector_lib::config::{
     AcknowledgementsConfig, DataType, GlobalOptions, Input, LogNamespace,
     SourceAcknowledgementsConfig, SourceOutput, TransformOutput,
 };
+pub use vector_lib::configurable::component::{
+    GenerateConfig, SinkDescription, TransformDescription,
+};
+use vector_lib::configurable::configurable_component;
 
 use crate::{conditions, event::Metric, secrets::SecretBackends, serde::OneOrMany};
 
@@ -1421,7 +1423,7 @@ mod resource_tests {
 #[cfg(all(test, feature = "sources-stdin", feature = "sinks-console"))]
 mod resource_config_tests {
     use indoc::indoc;
-    use vector_config::schema::generate_root_schema;
+    use vector_lib::configurable::schema::generate_root_schema;
 
     use super::{load_from_str, Format};
 
@@ -1452,8 +1454,8 @@ mod resource_config_tests {
     fn generate_component_config_schema() {
         use crate::config::{SinkOuter, SourceOuter, TransformOuter};
         use indexmap::IndexMap;
-        use vector_config::configurable_component;
         use vector_lib::config::ComponentKey;
+        use vector_lib::configurable::configurable_component;
 
         /// Top-level Vector configuration.
         #[configurable_component]
diff --git a/src/config/provider.rs b/src/config/provider.rs
index 14152ce93372c..f2ae9595ee2c4 100644
--- a/src/config/provider.rs
+++ b/src/config/provider.rs
@@ -1,6 +1,6 @@
 use async_trait::async_trait;
 use enum_dispatch::enum_dispatch;
-use vector_config::NamedComponent;
+use vector_lib::configurable::NamedComponent;
 
 use crate::{providers::BuildResult, signal};
 
diff --git a/src/config/schema.rs b/src/config/schema.rs
index 1a0b5d276e4e6..2245e84e758f3 100644
--- a/src/config/schema.rs
+++ b/src/config/schema.rs
@@ -1,5 +1,5 @@
-use vector_config::configurable_component;
 use vector_lib::config::LogNamespace;
+use vector_lib::configurable::configurable_component;
 
 pub(crate) use crate::schema::Definition;
 
diff --git a/src/config/secret.rs b/src/config/secret.rs
index a77bb040d8ece..7bf7d66fd4d42 100644
--- a/src/config/secret.rs
+++ b/src/config/secret.rs
@@ -1,7 +1,7 @@
 use std::collections::{HashMap, HashSet};
 
 use enum_dispatch::enum_dispatch;
-use vector_config::NamedComponent;
+use vector_lib::configurable::NamedComponent;
 
 use crate::signal;
 
diff --git a/src/config/sink.rs b/src/config/sink.rs
index fa1199d31281e..83eee0315e09b 100644
--- a/src/config/sink.rs
+++ b/src/config/sink.rs
@@ -4,11 +4,11 @@ use async_trait::async_trait;
 use dyn_clone::DynClone;
 use serde::Serialize;
 use vector_buffers::{BufferConfig, BufferType};
-use vector_config::{
+use vector_lib::configurable::attributes::CustomAttribute;
+use vector_lib::configurable::schema::{SchemaGenerator, SchemaObject};
+use vector_lib::configurable::{
     configurable_component, Configurable, GenerateError, Metadata, NamedComponent,
 };
-use vector_config_common::attributes::CustomAttribute;
-use vector_config_common::schema::{SchemaGenerator, SchemaObject};
 use vector_lib::{
     config::{AcknowledgementsConfig, GlobalOptions, Input},
     sink::VectorSink,
@@ -33,7 +33,7 @@ impl Configurable for BoxedSink {
     }
 
     fn generate_schema(gen: &RefCell<SchemaGenerator>) -> Result<SchemaObject, GenerateError> {
-        vector_config::component::SinkDescription::generate_schemas(gen)
+        vector_lib::configurable::component::SinkDescription::generate_schemas(gen)
     }
 }
 
diff --git a/src/config/source.rs b/src/config/source.rs
index 2be18502e7d5b..b700a93f650e5 100644
--- a/src/config/source.rs
+++ b/src/config/source.rs
@@ -3,11 +3,11 @@ use std::collections::HashMap;
 
 use async_trait::async_trait;
 use dyn_clone::DynClone;
-use vector_config::{
+use vector_lib::configurable::attributes::CustomAttribute;
+use vector_lib::configurable::schema::{SchemaGenerator, SchemaObject};
+use vector_lib::configurable::{
     configurable_component, Configurable, GenerateError, Metadata, NamedComponent,
 };
-use vector_config_common::attributes::CustomAttribute;
-use vector_config_common::schema::{SchemaGenerator, SchemaObject};
 use vector_lib::{
     config::{
         AcknowledgementsConfig, GlobalOptions, LogNamespace, SourceAcknowledgementsConfig,
@@ -35,7 +35,7 @@ impl Configurable for BoxedSource {
     }
 
     fn generate_schema(gen: &RefCell<SchemaGenerator>) -> Result<SchemaObject, GenerateError> {
-        vector_config::component::SourceDescription::generate_schemas(gen)
+        vector_lib::configurable::component::SourceDescription::generate_schemas(gen)
     }
 }
 
diff --git a/src/config/transform.rs b/src/config/transform.rs
index 8d8c59352fd6a..ce5a63eeb9009 100644
--- a/src/config/transform.rs
+++ b/src/config/transform.rs
@@ -4,12 +4,12 @@ use std::collections::{HashMap, HashSet};
 use async_trait::async_trait;
 use dyn_clone::DynClone;
 use serde::Serialize;
-use vector_config::{
+use vector_lib::configurable::attributes::CustomAttribute;
+use vector_lib::configurable::{
     configurable_component,
     schema::{SchemaGenerator, SchemaObject},
     Configurable, GenerateError, Metadata, NamedComponent,
 };
-use vector_config_common::attributes::CustomAttribute;
 use vector_lib::{
     config::{GlobalOptions, Input, LogNamespace, TransformOutput},
     schema,
@@ -36,7 +36,7 @@ impl Configurable for BoxedTransform {
     }
 
     fn generate_schema(gen: &RefCell<SchemaGenerator>) -> Result<SchemaObject, GenerateError> {
-        vector_config::component::TransformDescription::generate_schemas(gen)
+        vector_lib::configurable::component::TransformDescription::generate_schemas(gen)
     }
 }
 
diff --git a/src/config/unit_test/unit_test_components.rs b/src/config/unit_test/unit_test_components.rs
index 3f1442598be77..f99d7d5380f32 100644
--- a/src/config/unit_test/unit_test_components.rs
+++ b/src/config/unit_test/unit_test_components.rs
@@ -3,7 +3,7 @@ use std::sync::Arc;
 use futures::{stream, Sink, Stream};
 use futures_util::{future, stream::BoxStream, FutureExt, StreamExt};
 use tokio::sync::{oneshot, Mutex};
-use vector_config::configurable_component;
+use vector_lib::configurable::configurable_component;
 use vector_lib::{
     config::{DataType, Input, LogNamespace},
     event::Event,
diff --git a/src/docker.rs b/src/docker.rs
index b66413be8e266..58e9c1819f7a8 100644
--- a/src/docker.rs
+++ b/src/docker.rs
@@ -11,7 +11,7 @@ use bollard::{
 use futures::StreamExt;
 use http::uri::Uri;
 use snafu::Snafu;
-use vector_config::configurable_component;
+use vector_lib::configurable::configurable_component;
 
 // From bollard source.
 const DEFAULT_TIMEOUT: u64 = 120;
diff --git a/src/enrichment_tables/file.rs b/src/enrichment_tables/file.rs
index 0401a118e4f5e..462d40f93c14e 100644
--- a/src/enrichment_tables/file.rs
+++ b/src/enrichment_tables/file.rs
@@ -10,7 +10,7 @@ use std::{
 use bytes::Bytes;
 use enrichment::{Case, Condition, IndexHandle, Table};
 use tracing::trace;
-use vector_config::configurable_component;
+use vector_lib::configurable::configurable_component;
 use vector_lib::{conversion::Conversion, TimeZone};
 use vrl::value::Value;
 
diff --git a/src/enrichment_tables/geoip.rs b/src/enrichment_tables/geoip.rs
index c9289c2c2198e..10847945b5e4b 100644
--- a/src/enrichment_tables/geoip.rs
+++ b/src/enrichment_tables/geoip.rs
@@ -14,7 +14,7 @@ use ordered_float::NotNan;
 use vrl::value::Value;
 
 use enrichment::{Case, Condition, IndexHandle, Table};
-use vector_config::configurable_component;
+use vector_lib::configurable::configurable_component;
 
 use crate::config::{EnrichmentTableConfig, GenerateConfig};
 
diff --git a/src/enrichment_tables/mod.rs b/src/enrichment_tables/mod.rs
index c95bf3bca242b..de1f514d24e12 100644
--- a/src/enrichment_tables/mod.rs
+++ b/src/enrichment_tables/mod.rs
@@ -1,7 +1,7 @@
 //! Functionality to handle enrichment tables.
 pub use enrichment::{Condition, IndexHandle, Table};
 use enum_dispatch::enum_dispatch;
-use vector_config::{configurable_component, NamedComponent};
+use vector_lib::configurable::{configurable_component, NamedComponent};
 
 use crate::config::{EnrichmentTableConfig, GlobalOptions};
 
diff --git a/src/gcp.rs b/src/gcp.rs
index 485cc51dd3a27..bfc486f92808a 100644
--- a/src/gcp.rs
+++ b/src/gcp.rs
@@ -17,7 +17,7 @@ use once_cell::sync::Lazy;
 use smpl_jwt::Jwt;
 use snafu::{ResultExt, Snafu};
 use tokio::{sync::watch, time::Instant};
-use vector_config::configurable_component;
+use vector_lib::configurable::configurable_component;
 use vector_lib::sensitive_string::SensitiveString;
 
 use crate::{config::ProxyConfig, http::HttpClient, http::HttpError};
diff --git a/src/generate.rs b/src/generate.rs
index 41a22cad597cc..5adb8335e53c7 100644
--- a/src/generate.rs
+++ b/src/generate.rs
@@ -10,7 +10,7 @@ use colored::*;
 use indexmap::IndexMap;
 use serde::Serialize;
 use toml::{map::Map, Value};
-use vector_config::component::{
+use vector_lib::configurable::component::{
     ExampleError, SinkDescription, SourceDescription, TransformDescription,
 };
 use vector_lib::{buffers::BufferConfig, config::GlobalOptions, default_data_dir};
diff --git a/src/generate_schema.rs b/src/generate_schema.rs
index ffe40c860020c..ab8e830d77c11 100644
--- a/src/generate_schema.rs
+++ b/src/generate_schema.rs
@@ -1,5 +1,5 @@
 #![allow(missing_docs)]
-use vector_config::schema::generate_root_schema;
+use vector_lib::configurable::schema::generate_root_schema;
 
 use crate::config::ConfigBuilder;
 
diff --git a/src/http.rs b/src/http.rs
index ae3c7ae09300c..39ed37053a786 100644
--- a/src/http.rs
+++ b/src/http.rs
@@ -17,7 +17,7 @@ use hyper_proxy::ProxyConnector;
 use snafu::{ResultExt, Snafu};
 use tower::Service;
 use tracing::Instrument;
-use vector_config::configurable_component;
+use vector_lib::configurable::configurable_component;
 use vector_lib::sensitive_string::SensitiveString;
 
 use crate::{
diff --git a/src/kafka.rs b/src/kafka.rs
index 97776e0b014c9..cebf34bb23fb3 100644
--- a/src/kafka.rs
+++ b/src/kafka.rs
@@ -3,7 +3,7 @@ use std::path::{Path, PathBuf};
 
 use rdkafka::{consumer::ConsumerContext, ClientConfig, ClientContext, Statistics};
 use snafu::Snafu;
-use vector_config::configurable_component;
+use vector_lib::configurable::configurable_component;
 use vector_lib::sensitive_string::SensitiveString;
 
 use crate::{
diff --git a/src/line_agg.rs b/src/line_agg.rs
index 1eb3cfae96e3d..a1e391cba2d85 100644
--- a/src/line_agg.rs
+++ b/src/line_agg.rs
@@ -15,7 +15,7 @@ use futures::{Stream, StreamExt};
 use pin_project::pin_project;
 use regex::bytes::Regex;
 use tokio_util::time::delay_queue::{DelayQueue, Key};
-use vector_config::configurable_component;
+use vector_lib::configurable::configurable_component;
 
 /// Mode of operation of the line aggregator.
 #[configurable_component]
diff --git a/src/list.rs b/src/list.rs
index bc65e0b137d5c..566b07215d486 100644
--- a/src/list.rs
+++ b/src/list.rs
@@ -2,7 +2,7 @@
 use clap::Parser;
 use serde::Serialize;
 
-use vector_config::component::{
+use vector_lib::configurable::component::{
     EnrichmentTableDescription, SinkDescription, SourceDescription, TransformDescription,
 };
 
diff --git a/src/nats.rs b/src/nats.rs
index edcac86fd68db..93a0a765ede55 100644
--- a/src/nats.rs
+++ b/src/nats.rs
@@ -1,6 +1,6 @@
 use nkeys::error::Error as NKeysError;
 use snafu::{ResultExt, Snafu};
-use vector_config::configurable_component;
+use vector_lib::configurable::configurable_component;
 use vector_lib::sensitive_string::SensitiveString;
 
 use crate::tls::TlsEnableableConfig;
diff --git a/src/providers/http.rs b/src/providers/http.rs
index 7fef82a429639..fd10c955513d4 100644
--- a/src/providers/http.rs
+++ b/src/providers/http.rs
@@ -5,7 +5,7 @@ use hyper::Body;
 use indexmap::IndexMap;
 use tokio::time;
 use url::Url;
-use vector_config::configurable_component;
+use vector_lib::configurable::configurable_component;
 
 use crate::{
     config::{self, provider::ProviderConfig, ProxyConfig},
diff --git a/src/providers/mod.rs b/src/providers/mod.rs
index 2d693aad17f3d..1a7f8a1ab97e8 100644
--- a/src/providers/mod.rs
+++ b/src/providers/mod.rs
@@ -1,6 +1,6 @@
 #![allow(missing_docs)]
 use enum_dispatch::enum_dispatch;
-use vector_config::{configurable_component, NamedComponent};
+use vector_lib::configurable::{configurable_component, NamedComponent};
 
 use crate::{
     config::{ConfigBuilder, ProviderConfig},
diff --git a/src/secrets/exec.rs b/src/secrets/exec.rs
index d983f0583a53a..0c192adffd583 100644
--- a/src/secrets/exec.rs
+++ b/src/secrets/exec.rs
@@ -6,7 +6,7 @@ use futures_util::StreamExt;
 use serde::{Deserialize, Serialize};
 use tokio::{io::AsyncWriteExt, process::Command, time};
 use tokio_util::codec;
-use vector_config::{component::GenerateConfig, configurable_component};
+use vector_lib::configurable::{component::GenerateConfig, configurable_component};
 
 use crate::{config::SecretBackend, signal};
 
diff --git a/src/secrets/mod.rs b/src/secrets/mod.rs
index 14978705c3d23..83eea23c4ea42 100644
--- a/src/secrets/mod.rs
+++ b/src/secrets/mod.rs
@@ -2,7 +2,7 @@
 use std::collections::{HashMap, HashSet};
 
 use enum_dispatch::enum_dispatch;
-use vector_config::{configurable_component, NamedComponent};
+use vector_lib::configurable::{configurable_component, NamedComponent};
 
 use crate::{config::SecretBackend, signal};
 
diff --git a/src/secrets/test.rs b/src/secrets/test.rs
index c6e059eade070..920fbe1ba2adc 100644
--- a/src/secrets/test.rs
+++ b/src/secrets/test.rs
@@ -1,6 +1,6 @@
 use std::collections::{HashMap, HashSet};
 
-use vector_config::configurable_component;
+use vector_lib::configurable::configurable_component;
 
 use crate::{config::SecretBackend, signal};
 
diff --git a/src/serde.rs b/src/serde.rs
index 284ecb6bc2fcf..04f80c51ab858 100644
--- a/src/serde.rs
+++ b/src/serde.rs
@@ -5,7 +5,7 @@ use codecs::{
 };
 use indexmap::map::IndexMap;
 use serde::{Deserialize, Serialize};
-use vector_config::configurable_component;
+use vector_lib::configurable::configurable_component;
 pub use vector_lib::serde::{bool_or_struct, skip_serializing_if_default};
 
 pub const fn default_true() -> bool {
diff --git a/src/sinks/appsignal/config.rs b/src/sinks/appsignal/config.rs
index 6a33f75968286..2fc0bdb4907b5 100644
--- a/src/sinks/appsignal/config.rs
+++ b/src/sinks/appsignal/config.rs
@@ -2,7 +2,7 @@ use futures::FutureExt;
 use http::{header::AUTHORIZATION, Request, Uri};
 use hyper::Body;
 use tower::ServiceBuilder;
-use vector_config::configurable_component;
+use vector_lib::configurable::configurable_component;
 use vector_lib::sensitive_string::SensitiveString;
 use vector_lib::{
     config::{proxy::ProxyConfig, AcknowledgementsConfig, DataType, Input},
diff --git a/src/sinks/appsignal/tests.rs b/src/sinks/appsignal/tests.rs
index 10afdbcdd4b74..769fba9282518 100644
--- a/src/sinks/appsignal/tests.rs
+++ b/src/sinks/appsignal/tests.rs
@@ -1,6 +1,6 @@
 use futures::{future::ready, stream};
 use serde::Deserialize;
-use vector_config::component::GenerateConfig;
+use vector_lib::configurable::component::GenerateConfig;
 use vector_lib::event::{Event, LogEvent};
 
 use crate::{
diff --git a/src/sinks/aws_cloudwatch_logs/config.rs b/src/sinks/aws_cloudwatch_logs/config.rs
index f55c0cdd24c81..8827bd708fb12 100644
--- a/src/sinks/aws_cloudwatch_logs/config.rs
+++ b/src/sinks/aws_cloudwatch_logs/config.rs
@@ -3,7 +3,7 @@ use aws_smithy_types::retry::RetryConfig;
 use codecs::JsonSerializerConfig;
 use futures::FutureExt;
 use tower::ServiceBuilder;
-use vector_config::configurable_component;
+use vector_lib::configurable::configurable_component;
 use vector_lib::schema;
 use vrl::value::Kind;
 
diff --git a/src/sinks/aws_cloudwatch_metrics/mod.rs b/src/sinks/aws_cloudwatch_metrics/mod.rs
index 86a77f78effbe..af81043a29bdb 100644
--- a/src/sinks/aws_cloudwatch_metrics/mod.rs
+++ b/src/sinks/aws_cloudwatch_metrics/mod.rs
@@ -14,7 +14,7 @@ use futures::{stream, FutureExt, SinkExt};
 use futures_util::{future, future::BoxFuture};
 use std::task::{Context, Poll};
 use tower::Service;
-use vector_config::configurable_component;
+use vector_lib::configurable::configurable_component;
 use vector_lib::{sink::VectorSink, ByteSizeOf, EstimatedJsonEncodedSizeOf};
 
 use crate::{
diff --git a/src/sinks/aws_kinesis/firehose/config.rs b/src/sinks/aws_kinesis/firehose/config.rs
index ed601bf488bd1..4c5ccccfd5bdf 100644
--- a/src/sinks/aws_kinesis/firehose/config.rs
+++ b/src/sinks/aws_kinesis/firehose/config.rs
@@ -6,7 +6,7 @@ use aws_sdk_firehose::{
 };
 use futures::FutureExt;
 use snafu::Snafu;
-use vector_config::configurable_component;
+use vector_lib::configurable::configurable_component;
 
 use crate::sinks::util::retries::RetryAction;
 use crate::{
diff --git a/src/sinks/aws_kinesis/streams/config.rs b/src/sinks/aws_kinesis/streams/config.rs
index 8ace03b2b602b..3d975da3ab82d 100644
--- a/src/sinks/aws_kinesis/streams/config.rs
+++ b/src/sinks/aws_kinesis/streams/config.rs
@@ -5,7 +5,7 @@ use aws_sdk_kinesis::{
 use futures::FutureExt;
 use lookup::lookup_v2::ConfigValuePath;
 use snafu::Snafu;
-use vector_config::{component::GenerateConfig, configurable_component};
+use vector_lib::configurable::{component::GenerateConfig, configurable_component};
 
 use crate::sinks::util::retries::RetryAction;
 use crate::{
diff --git a/src/sinks/aws_s3/config.rs b/src/sinks/aws_s3/config.rs
index b31f9391afc17..80e2ecb552ea0 100644
--- a/src/sinks/aws_s3/config.rs
+++ b/src/sinks/aws_s3/config.rs
@@ -6,7 +6,7 @@ use codecs::{
     TextSerializerConfig,
 };
 use tower::ServiceBuilder;
-use vector_config::configurable_component;
+use vector_lib::configurable::configurable_component;
 use vector_lib::sink::VectorSink;
 
 use super::sink::S3RequestOptions;
diff --git a/src/sinks/aws_s_s/config.rs b/src/sinks/aws_s_s/config.rs
index aaf0a112d2f6b..702e4b0aae960 100644
--- a/src/sinks/aws_s_s/config.rs
+++ b/src/sinks/aws_s_s/config.rs
@@ -2,7 +2,7 @@ use std::convert::TryFrom;
 
 use snafu::{ResultExt, Snafu};
 
-use vector_config::configurable_component;
+use vector_lib::configurable::configurable_component;
 
 use crate::{
     aws::AwsAuthentication,
diff --git a/src/sinks/aws_s_s/sns/config.rs b/src/sinks/aws_s_s/sns/config.rs
index a9ea5f283f579..8912cdaf0f21e 100644
--- a/src/sinks/aws_s_s/sns/config.rs
+++ b/src/sinks/aws_s_s/sns/config.rs
@@ -5,7 +5,7 @@ use crate::aws::RegionOrEndpoint;
 use crate::config::{
     AcknowledgementsConfig, DataType, GenerateConfig, Input, ProxyConfig, SinkConfig, SinkContext,
 };
-use vector_config::configurable_component;
+use vector_lib::configurable::configurable_component;
 
 use super::{
     client::SnsMessagePublisher, message_deduplication_id, message_group_id, BaseSSSinkConfig,
diff --git a/src/sinks/aws_s_s/sqs/config.rs b/src/sinks/aws_s_s/sqs/config.rs
index 803e6e253e15d..32e2ce179b21c 100644
--- a/src/sinks/aws_s_s/sqs/config.rs
+++ b/src/sinks/aws_s_s/sqs/config.rs
@@ -5,7 +5,7 @@ use crate::aws::RegionOrEndpoint;
 use crate::config::{
     AcknowledgementsConfig, DataType, GenerateConfig, Input, ProxyConfig, SinkConfig, SinkContext,
 };
-use vector_config::configurable_component;
+use vector_lib::configurable::configurable_component;
 
 use super::{
     client::SqsMessagePublisher, message_deduplication_id, message_group_id, BaseSSSinkConfig,
diff --git a/src/sinks/axiom.rs b/src/sinks/axiom.rs
index 7281e70246091..7b1c61a5f8047 100644
--- a/src/sinks/axiom.rs
+++ b/src/sinks/axiom.rs
@@ -1,6 +1,6 @@
 use std::collections::HashMap;
 
-use vector_config::configurable_component;
+use vector_lib::configurable::configurable_component;
 use vector_lib::sensitive_string::SensitiveString;
 
 use crate::{
diff --git a/src/sinks/azure_blob/config.rs b/src/sinks/azure_blob/config.rs
index 01a7369dfdd81..5822dce243162 100644
--- a/src/sinks/azure_blob/config.rs
+++ b/src/sinks/azure_blob/config.rs
@@ -3,7 +3,7 @@ use std::sync::Arc;
 use azure_storage_blobs::prelude::*;
 use codecs::{encoding::Framer, JsonSerializerConfig, NewlineDelimitedEncoderConfig};
 use tower::ServiceBuilder;
-use vector_config::configurable_component;
+use vector_lib::configurable::configurable_component;
 use vector_lib::sensitive_string::SensitiveString;
 
 use super::request_builder::AzureBlobRequestOptions;
diff --git a/src/sinks/azure_monitor_logs/config.rs b/src/sinks/azure_monitor_logs/config.rs
index a5a57d2e5275c..1cd6b74414b19 100644
--- a/src/sinks/azure_monitor_logs/config.rs
+++ b/src/sinks/azure_monitor_logs/config.rs
@@ -1,7 +1,7 @@
 use lookup::{lookup_v2::OptionalValuePath, OwnedValuePath};
 use openssl::{base64, pkey};
 
-use vector_config::configurable_component;
+use vector_lib::configurable::configurable_component;
 use vector_lib::sensitive_string::SensitiveString;
 use vector_lib::{config::log_schema, schema};
 use vrl::value::Kind;
diff --git a/src/sinks/blackhole/config.rs b/src/sinks/blackhole/config.rs
index d2d69e75cc44f..80d42487a48ad 100644
--- a/src/sinks/blackhole/config.rs
+++ b/src/sinks/blackhole/config.rs
@@ -2,7 +2,7 @@ use std::time::Duration;
 
 use futures::{future, FutureExt};
 use serde_with::serde_as;
-use vector_config::configurable_component;
+use vector_lib::configurable::configurable_component;
 
 use crate::{
     config::{AcknowledgementsConfig, GenerateConfig, Input, SinkConfig, SinkContext},
diff --git a/src/sinks/console/config.rs b/src/sinks/console/config.rs
index 3aa1c46bb62af..7ae4a648b6017 100644
--- a/src/sinks/console/config.rs
+++ b/src/sinks/console/config.rs
@@ -4,7 +4,7 @@ use codecs::{
 };
 use futures::{future, FutureExt};
 use tokio::io;
-use vector_config::configurable_component;
+use vector_lib::configurable::configurable_component;
 
 use crate::{
     codecs::{Encoder, EncodingConfigWithFraming, SinkType},
diff --git a/src/sinks/databend/compression.rs b/src/sinks/databend/compression.rs
index f4e652e5b4217..da47748f44d88 100644
--- a/src/sinks/databend/compression.rs
+++ b/src/sinks/databend/compression.rs
@@ -1,4 +1,4 @@
-use vector_config::configurable_component;
+use vector_lib::configurable::configurable_component;
 
 /// Compression configuration.
 #[configurable_component]
diff --git a/src/sinks/databend/config.rs b/src/sinks/databend/config.rs
index 5029f7b650699..6b0caa4a0dc7d 100644
--- a/src/sinks/databend/config.rs
+++ b/src/sinks/databend/config.rs
@@ -3,7 +3,7 @@ use std::collections::BTreeMap;
 use codecs::encoding::{Framer, FramingConfig};
 use futures::future::FutureExt;
 use tower::ServiceBuilder;
-use vector_config::{component::GenerateConfig, configurable_component};
+use vector_lib::configurable::{component::GenerateConfig, configurable_component};
 use vector_lib::tls::TlsSettings;
 
 use crate::{
diff --git a/src/sinks/databend/encoding.rs b/src/sinks/databend/encoding.rs
index 300b85ed68019..f0fd102352514 100644
--- a/src/sinks/databend/encoding.rs
+++ b/src/sinks/databend/encoding.rs
@@ -1,5 +1,5 @@
 use codecs::{encoding::SerializerConfig, CsvSerializerConfig, JsonSerializerConfig};
-use vector_config::configurable_component;
+use vector_lib::configurable::configurable_component;
 
 use crate::codecs::{EncodingConfig, Transformer};
 
diff --git a/src/sinks/datadog/events/config.rs b/src/sinks/datadog/events/config.rs
index 979c37822bf32..166881667db91 100644
--- a/src/sinks/datadog/events/config.rs
+++ b/src/sinks/datadog/events/config.rs
@@ -1,7 +1,7 @@
 use indoc::indoc;
 use tower::ServiceBuilder;
-use vector_config::configurable_component;
 use vector_lib::config::proxy::ProxyConfig;
+use vector_lib::configurable::configurable_component;
 use vector_lib::schema;
 use vrl::value::Kind;
 
diff --git a/src/sinks/datadog/logs/config.rs b/src/sinks/datadog/logs/config.rs
index 6018d568d5543..e69181c38e65e 100644
--- a/src/sinks/datadog/logs/config.rs
+++ b/src/sinks/datadog/logs/config.rs
@@ -2,7 +2,7 @@ use std::{convert::TryFrom, sync::Arc};
 
 use indoc::indoc;
 use tower::ServiceBuilder;
-use vector_config::configurable_component;
+use vector_lib::configurable::configurable_component;
 use vector_lib::{config::proxy::ProxyConfig, schema::meaning};
 use vrl::value::Kind;
 
diff --git a/src/sinks/datadog/metrics/config.rs b/src/sinks/datadog/metrics/config.rs
index ae2852c9e3fa2..b774beccc2001 100644
--- a/src/sinks/datadog/metrics/config.rs
+++ b/src/sinks/datadog/metrics/config.rs
@@ -3,8 +3,8 @@ use std::sync::OnceLock;
 use http::Uri;
 use snafu::ResultExt;
 use tower::ServiceBuilder;
-use vector_config::configurable_component;
 use vector_lib::config::proxy::ProxyConfig;
+use vector_lib::configurable::configurable_component;
 
 use super::{
     request_builder::DatadogMetricsRequestBuilder,
diff --git a/src/sinks/datadog/mod.rs b/src/sinks/datadog/mod.rs
index 3e49a8ce6f74e..0c08f6efcc613 100644
--- a/src/sinks/datadog/mod.rs
+++ b/src/sinks/datadog/mod.rs
@@ -2,7 +2,7 @@ use futures_util::FutureExt;
 use http::{Request, StatusCode, Uri};
 use hyper::body::Body;
 use snafu::Snafu;
-use vector_config::configurable_component;
+use vector_lib::configurable::configurable_component;
 use vector_lib::sensitive_string::SensitiveString;
 use vector_lib::{config::AcknowledgementsConfig, tls::TlsEnableableConfig};
 
diff --git a/src/sinks/datadog/traces/config.rs b/src/sinks/datadog/traces/config.rs
index c5162d99ec0bc..b3fe500ba2311 100644
--- a/src/sinks/datadog/traces/config.rs
+++ b/src/sinks/datadog/traces/config.rs
@@ -5,8 +5,8 @@ use indoc::indoc;
 use snafu::ResultExt;
 use tokio::sync::oneshot::{channel, Sender};
 use tower::ServiceBuilder;
-use vector_config::configurable_component;
 use vector_lib::config::{proxy::ProxyConfig, AcknowledgementsConfig};
+use vector_lib::configurable::configurable_component;
 
 use super::{
     apm_stats::{flush_apm_stats_thread, Aggregator},
diff --git a/src/sinks/elasticsearch/config.rs b/src/sinks/elasticsearch/config.rs
index 5f175f8f57530..04fe7776ded0f 100644
--- a/src/sinks/elasticsearch/config.rs
+++ b/src/sinks/elasticsearch/config.rs
@@ -4,7 +4,7 @@ use std::{
 };
 
 use futures::{FutureExt, TryFutureExt};
-use vector_config::configurable_component;
+use vector_lib::configurable::configurable_component;
 
 use crate::{
     codecs::Transformer,
diff --git a/src/sinks/elasticsearch/mod.rs b/src/sinks/elasticsearch/mod.rs
index 687a79023594c..9b480aaec7c56 100644
--- a/src/sinks/elasticsearch/mod.rs
+++ b/src/sinks/elasticsearch/mod.rs
@@ -21,7 +21,7 @@ pub use config::*;
 pub use encoder::ElasticsearchEncoder;
 use http::{uri::InvalidUri, Request};
 use snafu::Snafu;
-use vector_config::configurable_component;
+use vector_lib::configurable::configurable_component;
 use vector_lib::sensitive_string::SensitiveString;
 
 use crate::{
diff --git a/src/sinks/file/mod.rs b/src/sinks/file/mod.rs
index 9dadb7a9a6f31..0c17058f2008e 100644
--- a/src/sinks/file/mod.rs
+++ b/src/sinks/file/mod.rs
@@ -19,7 +19,7 @@ use tokio::{
     io::AsyncWriteExt,
 };
 use tokio_util::codec::Encoder as _;
-use vector_config::configurable_component;
+use vector_lib::configurable::configurable_component;
 use vector_lib::{
     internal_event::{CountByteSize, EventsSent, InternalEventHandle as _, Output, Registered},
     EstimatedJsonEncodedSizeOf,
diff --git a/src/sinks/gcp/chronicle_unstructured.rs b/src/sinks/gcp/chronicle_unstructured.rs
index 30e6277105e35..a0fe97cd9073b 100644
--- a/src/sinks/gcp/chronicle_unstructured.rs
+++ b/src/sinks/gcp/chronicle_unstructured.rs
@@ -12,7 +12,7 @@ use snafu::Snafu;
 use std::io;
 use tokio_util::codec::Encoder as _;
 use tower::{Service, ServiceBuilder};
-use vector_config::configurable_component;
+use vector_lib::configurable::configurable_component;
 use vector_lib::request_metadata::{GroupedCountByteSize, MetaDescriptive, RequestMetadata};
 use vector_lib::{
     config::{telemetry, AcknowledgementsConfig, Input},
diff --git a/src/sinks/gcp/cloud_storage.rs b/src/sinks/gcp/cloud_storage.rs
index 1c2c0e0acea5e..e43607bbfdca9 100644
--- a/src/sinks/gcp/cloud_storage.rs
+++ b/src/sinks/gcp/cloud_storage.rs
@@ -10,7 +10,7 @@ use snafu::ResultExt;
 use snafu::Snafu;
 use tower::ServiceBuilder;
 use uuid::Uuid;
-use vector_config::configurable_component;
+use vector_lib::configurable::configurable_component;
 use vector_lib::event::{EventFinalizers, Finalizable};
 use vector_lib::request_metadata::RequestMetadata;
 
diff --git a/src/sinks/gcp/mod.rs b/src/sinks/gcp/mod.rs
index 537ea336fc05b..68bd9518f1aca 100644
--- a/src/sinks/gcp/mod.rs
+++ b/src/sinks/gcp/mod.rs
@@ -1,7 +1,7 @@
 use std::collections::HashMap;
 
 use serde::{Deserialize, Serialize};
-use vector_config::configurable_component;
+use vector_lib::configurable::configurable_component;
 
 pub mod chronicle_unstructured;
 pub mod cloud_storage;
diff --git a/src/sinks/gcp/pubsub.rs b/src/sinks/gcp/pubsub.rs
index 4660e32040a7d..29e8e43e69460 100644
--- a/src/sinks/gcp/pubsub.rs
+++ b/src/sinks/gcp/pubsub.rs
@@ -7,7 +7,7 @@ use indoc::indoc;
 use serde_json::{json, Value};
 use snafu::{ResultExt, Snafu};
 use tokio_util::codec::Encoder as _;
-use vector_config::configurable_component;
+use vector_lib::configurable::configurable_component;
 
 use crate::{
     codecs::{Encoder, EncodingConfig, Transformer},
diff --git a/src/sinks/gcs_common/config.rs b/src/sinks/gcs_common/config.rs
index 880d9f788b459..914d780c815b4 100644
--- a/src/sinks/gcs_common/config.rs
+++ b/src/sinks/gcs_common/config.rs
@@ -2,7 +2,7 @@ use futures::FutureExt;
 use http::{StatusCode, Uri};
 use hyper::Body;
 use snafu::Snafu;
-use vector_config::configurable_component;
+use vector_lib::configurable::configurable_component;
 
 use crate::{
     gcp::{GcpAuthenticator, GcpError},
diff --git a/src/sinks/humio/logs.rs b/src/sinks/humio/logs.rs
index a8f55d4c6c3d4..357a3bf1c9bf8 100644
--- a/src/sinks/humio/logs.rs
+++ b/src/sinks/humio/logs.rs
@@ -1,6 +1,6 @@
 use codecs::JsonSerializerConfig;
 use lookup::lookup_v2::{ConfigValuePath, OptionalValuePath};
-use vector_config::configurable_component;
+use vector_lib::configurable::configurable_component;
 use vector_lib::sensitive_string::SensitiveString;
 
 use super::config_host_key;
diff --git a/src/sinks/humio/metrics.rs b/src/sinks/humio/metrics.rs
index e7a11424b4df3..1c197ef3aedd2 100644
--- a/src/sinks/humio/metrics.rs
+++ b/src/sinks/humio/metrics.rs
@@ -4,7 +4,7 @@ use futures::StreamExt;
 use futures_util::stream::BoxStream;
 use indoc::indoc;
 use lookup::lookup_v2::{ConfigValuePath, OptionalValuePath};
-use vector_config::configurable_component;
+use vector_lib::configurable::configurable_component;
 use vector_lib::sensitive_string::SensitiveString;
 use vector_lib::sink::StreamSink;
 
diff --git a/src/sinks/influxdb/logs.rs b/src/sinks/influxdb/logs.rs
index 30cbf6e1fd79a..322dce392ef7a 100644
--- a/src/sinks/influxdb/logs.rs
+++ b/src/sinks/influxdb/logs.rs
@@ -10,8 +10,8 @@ use vrl::value::Kind;
 
 use lookup::lookup_v2::OptionalValuePath;
 use lookup::PathPrefix;
-use vector_config::configurable_component;
 use vector_lib::config::log_schema;
+use vector_lib::configurable::configurable_component;
 use vector_lib::schema;
 
 use crate::{
diff --git a/src/sinks/influxdb/metrics.rs b/src/sinks/influxdb/metrics.rs
index 0b8669a66c175..cf5e5c7bd2549 100644
--- a/src/sinks/influxdb/metrics.rs
+++ b/src/sinks/influxdb/metrics.rs
@@ -4,7 +4,7 @@ use bytes::{Bytes, BytesMut};
 use futures::{future::BoxFuture, stream, SinkExt};
 use serde::Serialize;
 use tower::Service;
-use vector_config::configurable_component;
+use vector_lib::configurable::configurable_component;
 use vector_lib::{
     event::metric::{MetricSketch, MetricTags, Quantile},
     ByteSizeOf, EstimatedJsonEncodedSizeOf,
diff --git a/src/sinks/influxdb/mod.rs b/src/sinks/influxdb/mod.rs
index 9928d32797885..146bd83f6ffb8 100644
--- a/src/sinks/influxdb/mod.rs
+++ b/src/sinks/influxdb/mod.rs
@@ -9,7 +9,7 @@ use futures::FutureExt;
 use http::{StatusCode, Uri};
 use snafu::{ResultExt, Snafu};
 use tower::Service;
-use vector_config::configurable_component;
+use vector_lib::configurable::configurable_component;
 use vector_lib::event::MetricTags;
 use vector_lib::sensitive_string::SensitiveString;
 
diff --git a/src/sinks/kafka/config.rs b/src/sinks/kafka/config.rs
index 487b572d73367..c5d5d3e02bc8b 100644
--- a/src/sinks/kafka/config.rs
+++ b/src/sinks/kafka/config.rs
@@ -5,7 +5,7 @@ use futures::FutureExt;
 use lookup::lookup_v2::ConfigTargetPath;
 use rdkafka::ClientConfig;
 use serde_with::serde_as;
-use vector_config::configurable_component;
+use vector_lib::configurable::configurable_component;
 use vrl::value::Kind;
 
 use crate::{
diff --git a/src/sinks/mezmo.rs b/src/sinks/mezmo.rs
index 599201d01702d..149b2c024c812 100644
--- a/src/sinks/mezmo.rs
+++ b/src/sinks/mezmo.rs
@@ -4,7 +4,7 @@ use bytes::Bytes;
 use futures::{FutureExt, SinkExt};
 use http::{Request, StatusCode, Uri};
 use serde_json::json;
-use vector_config::configurable_component;
+use vector_lib::configurable::configurable_component;
 use vector_lib::sensitive_string::SensitiveString;
 use vrl::event_path;
 use vrl::value::{Kind, Value};
diff --git a/src/sinks/papertrail.rs b/src/sinks/papertrail.rs
index 557eb0c339c01..2e02d9c187672 100644
--- a/src/sinks/papertrail.rs
+++ b/src/sinks/papertrail.rs
@@ -1,6 +1,6 @@
 use bytes::{BufMut, BytesMut};
 use syslog::{Facility, Formatter3164, LogFormat, Severity};
-use vector_config::configurable_component;
+use vector_lib::configurable::configurable_component;
 use vrl::value::Kind;
 
 use crate::{
diff --git a/src/sinks/prelude.rs b/src/sinks/prelude.rs
index 5139bcb2f353d..44adc400cf72a 100644
--- a/src/sinks/prelude.rs
+++ b/src/sinks/prelude.rs
@@ -5,7 +5,7 @@ pub use async_trait::async_trait;
 pub use futures::{future, future::BoxFuture, stream::BoxStream, FutureExt, StreamExt};
 pub use tower::{Service, ServiceBuilder};
 pub use vector_buffers::EventCount;
-pub use vector_config::configurable_component;
+pub use vector_lib::configurable::configurable_component;
 pub use vector_lib::{
     config::{telemetry, AcknowledgementsConfig, Input},
     event::Value,
diff --git a/src/sinks/prometheus/exporter.rs b/src/sinks/prometheus/exporter.rs
index e047b53043c46..ecbcf6537b0c3 100644
--- a/src/sinks/prometheus/exporter.rs
+++ b/src/sinks/prometheus/exporter.rs
@@ -20,7 +20,7 @@ use serde_with::serde_as;
 use snafu::Snafu;
 use stream_cancel::{Trigger, Tripwire};
 use tracing::{Instrument, Span};
-use vector_config::configurable_component;
+use vector_lib::configurable::configurable_component;
 use vector_lib::{
     internal_event::{
         ByteSize, BytesSent, CountByteSize, EventsSent, InternalEventHandle as _, Output, Protocol,
diff --git a/src/sinks/prometheus/mod.rs b/src/sinks/prometheus/mod.rs
index 1e8508ac935d1..2e2ddc0e00694 100644
--- a/src/sinks/prometheus/mod.rs
+++ b/src/sinks/prometheus/mod.rs
@@ -6,7 +6,7 @@ mod collector;
 pub(crate) mod exporter;
 pub(crate) mod remote_write;
 
-use vector_config::configurable_component;
+use vector_lib::configurable::configurable_component;
 
 /// Authentication strategies.
 #[configurable_component]
diff --git a/src/sinks/pulsar/tests.rs b/src/sinks/pulsar/tests.rs
index 5dae4bb67846c..1fbee5cba0eec 100644
--- a/src/sinks/pulsar/tests.rs
+++ b/src/sinks/pulsar/tests.rs
@@ -2,7 +2,7 @@ use crate::event::Event;
 use crate::sinks::pulsar::config::PulsarSinkConfig;
 use lookup::lookup_v2::OptionalTargetPath;
 use std::collections::BTreeMap;
-use vector_config::component::GenerateConfig;
+use vector_lib::configurable::component::GenerateConfig;
 use vrl::value::Value;
 
 use bytes::Bytes;
diff --git a/src/sinks/s3_common/config.rs b/src/sinks/s3_common/config.rs
index 115d4b7e9596b..7abdf9f2175e1 100644
--- a/src/sinks/s3_common/config.rs
+++ b/src/sinks/s3_common/config.rs
@@ -9,7 +9,7 @@ use aws_smithy_client::SdkError;
 use futures::FutureExt;
 use http::StatusCode;
 use snafu::Snafu;
-use vector_config::configurable_component;
+use vector_lib::configurable::configurable_component;
 
 use super::service::{S3Response, S3Service};
 use crate::{
diff --git a/src/sinks/sematext/logs.rs b/src/sinks/sematext/logs.rs
index 4c791b01c0568..8272e425e152c 100644
--- a/src/sinks/sematext/logs.rs
+++ b/src/sinks/sematext/logs.rs
@@ -1,7 +1,7 @@
 use async_trait::async_trait;
 use futures::stream::{BoxStream, StreamExt};
 use indoc::indoc;
-use vector_config::configurable_component;
+use vector_lib::configurable::configurable_component;
 use vector_lib::sensitive_string::SensitiveString;
 use vrl::event_path;
 
diff --git a/src/sinks/sematext/metrics.rs b/src/sinks/sematext/metrics.rs
index 2ff9945d3260c..982c1393b2919 100644
--- a/src/sinks/sematext/metrics.rs
+++ b/src/sinks/sematext/metrics.rs
@@ -6,7 +6,7 @@ use http::{StatusCode, Uri};
 use hyper::{Body, Request};
 use indoc::indoc;
 use tower::Service;
-use vector_config::configurable_component;
+use vector_lib::configurable::configurable_component;
 use vector_lib::sensitive_string::SensitiveString;
 use vector_lib::{ByteSizeOf, EstimatedJsonEncodedSizeOf};
 
diff --git a/src/sinks/sematext/mod.rs b/src/sinks/sematext/mod.rs
index d7002d5ddaacc..b730aad7586fc 100644
--- a/src/sinks/sematext/mod.rs
+++ b/src/sinks/sematext/mod.rs
@@ -3,7 +3,7 @@ pub mod metrics;
 
 pub use self::{logs::SematextLogsConfig, metrics::SematextMetricsConfig};
 
-use vector_config::configurable_component;
+use vector_lib::configurable::configurable_component;
 
 /// The Sematext region to send data to.
 #[configurable_component]
diff --git a/src/sinks/socket.rs b/src/sinks/socket.rs
index c6947f7658512..0e63bc1613cb9 100644
--- a/src/sinks/socket.rs
+++ b/src/sinks/socket.rs
@@ -2,7 +2,7 @@ use codecs::{
     encoding::{Framer, FramingConfig},
     TextSerializerConfig,
 };
-use vector_config::configurable_component;
+use vector_lib::configurable::configurable_component;
 
 #[cfg(unix)]
 use crate::sinks::util::unix::UnixSinkConfig;
diff --git a/src/sinks/splunk_hec/common/acknowledgements.rs b/src/sinks/splunk_hec/common/acknowledgements.rs
index 7ca8ade82782d..89ca0a93ba267 100644
--- a/src/sinks/splunk_hec/common/acknowledgements.rs
+++ b/src/sinks/splunk_hec/common/acknowledgements.rs
@@ -8,7 +8,7 @@ use std::{
 use hyper::Body;
 use serde::{Deserialize, Serialize};
 use tokio::sync::{mpsc::Receiver, oneshot::Sender};
-use vector_config::configurable_component;
+use vector_lib::configurable::configurable_component;
 use vector_lib::event::EventStatus;
 
 use super::service::{HttpRequestBuilder, MetadataFields};
diff --git a/src/sinks/splunk_hec/common/mod.rs b/src/sinks/splunk_hec/common/mod.rs
index 968d234d2d45e..042c2b7a21772 100644
--- a/src/sinks/splunk_hec/common/mod.rs
+++ b/src/sinks/splunk_hec/common/mod.rs
@@ -5,7 +5,7 @@ pub mod service;
 pub mod util;
 
 pub use util::*;
-use vector_config::configurable_component;
+use vector_lib::configurable::configurable_component;
 
 pub(super) const SOURCE_FIELD: &str = "source";
 pub(super) const SOURCETYPE_FIELD: &str = "sourcetype";
diff --git a/src/sinks/splunk_hec/logs/config.rs b/src/sinks/splunk_hec/logs/config.rs
index 0c5eb42d26ee3..f4bcdd90b92a4 100644
--- a/src/sinks/splunk_hec/logs/config.rs
+++ b/src/sinks/splunk_hec/logs/config.rs
@@ -4,7 +4,7 @@ use codecs::TextSerializerConfig;
 use futures_util::FutureExt;
 use lookup::lookup_v2::{ConfigValuePath, OptionalValuePath};
 use tower::ServiceBuilder;
-use vector_config::configurable_component;
+use vector_lib::configurable::configurable_component;
 use vector_lib::sensitive_string::SensitiveString;
 use vector_lib::sink::VectorSink;
 
diff --git a/src/sinks/splunk_hec/metrics/config.rs b/src/sinks/splunk_hec/metrics/config.rs
index a8636da1487a5..832c8da762421 100644
--- a/src/sinks/splunk_hec/metrics/config.rs
+++ b/src/sinks/splunk_hec/metrics/config.rs
@@ -3,7 +3,7 @@ use std::sync::Arc;
 use futures_util::FutureExt;
 use lookup::lookup_v2::OptionalValuePath;
 use tower::ServiceBuilder;
-use vector_config::configurable_component;
+use vector_lib::configurable::configurable_component;
 use vector_lib::sensitive_string::SensitiveString;
 use vector_lib::sink::VectorSink;
 
diff --git a/src/sinks/statsd/config.rs b/src/sinks/statsd/config.rs
index 3cfaf5e7d0d20..48f3cd5fb3d00 100644
--- a/src/sinks/statsd/config.rs
+++ b/src/sinks/statsd/config.rs
@@ -1,7 +1,7 @@
 use std::net::{IpAddr, Ipv4Addr, SocketAddr};
 
 use async_trait::async_trait;
-use vector_config::{component::GenerateConfig, configurable_component};
+use vector_lib::configurable::{component::GenerateConfig, configurable_component};
 use vector_lib::internal_event::Protocol;
 use vector_lib::{
     config::{AcknowledgementsConfig, Input},
diff --git a/src/sinks/util/adaptive_concurrency/mod.rs b/src/sinks/util/adaptive_concurrency/mod.rs
index ab5afd6c53f87..dedbc8d1221b1 100644
--- a/src/sinks/util/adaptive_concurrency/mod.rs
+++ b/src/sinks/util/adaptive_concurrency/mod.rs
@@ -15,7 +15,7 @@ pub(super) const MAX_CONCURRENCY: usize = 200;
 
 pub(crate) use layer::AdaptiveConcurrencyLimitLayer;
 pub(crate) use service::AdaptiveConcurrencyLimit;
-use vector_config::configurable_component;
+use vector_lib::configurable::configurable_component;
 
 fn instant_now() -> std::time::Instant {
     tokio::time::Instant::now().into()
diff --git a/src/sinks/util/adaptive_concurrency/tests.rs b/src/sinks/util/adaptive_concurrency/tests.rs
index 6c56b63eaff4f..0aa059fd11a81 100644
--- a/src/sinks/util/adaptive_concurrency/tests.rs
+++ b/src/sinks/util/adaptive_concurrency/tests.rs
@@ -25,7 +25,7 @@ use serde::Deserialize;
 use snafu::Snafu;
 use tokio::time::{self, sleep, Duration, Instant};
 use tower::Service;
-use vector_config::configurable_component;
+use vector_lib::configurable::configurable_component;
 use vector_lib::json_size::JsonSize;
 
 use super::controller::ControllerStatistics;
diff --git a/src/sinks/util/batch.rs b/src/sinks/util/batch.rs
index be9ac6b21c220..30dfdd4b181b8 100644
--- a/src/sinks/util/batch.rs
+++ b/src/sinks/util/batch.rs
@@ -3,7 +3,7 @@ use std::{marker::PhantomData, num::NonZeroUsize, time::Duration};
 use derivative::Derivative;
 use serde_with::serde_as;
 use snafu::Snafu;
-use vector_config::configurable_component;
+use vector_lib::configurable::configurable_component;
 use vector_lib::json_size::JsonSize;
 use vector_stream::BatcherSettings;
 
diff --git a/src/sinks/util/buffer/compression.rs b/src/sinks/util/buffer/compression.rs
index 943232ad25be5..88f8b931c2009 100644
--- a/src/sinks/util/buffer/compression.rs
+++ b/src/sinks/util/buffer/compression.rs
@@ -3,7 +3,8 @@ use std::{cell::RefCell, collections::BTreeSet, fmt};
 use indexmap::IndexMap;
 use serde::{de, ser};
 use serde_json::Value;
-use vector_config::{
+use vector_lib::configurable::attributes::CustomAttribute;
+use vector_lib::configurable::{
     schema::{
         apply_base_metadata, generate_const_string_schema, generate_enum_schema,
         generate_one_of_schema, generate_struct_schema, get_or_generate_schema, SchemaGenerator,
@@ -11,7 +12,6 @@ use vector_config::{
     },
     Configurable, GenerateError, Metadata, ToValue,
 };
-use vector_config_common::attributes::CustomAttribute;
 
 use crate::sinks::util::zstd::ZstdCompressionLevel;
 
diff --git a/src/sinks/util/http.rs b/src/sinks/util/http.rs
index 499f7640f497c..f4461633948ba 100644
--- a/src/sinks/util/http.rs
+++ b/src/sinks/util/http.rs
@@ -19,7 +19,7 @@ use pin_project::pin_project;
 use snafu::{ResultExt, Snafu};
 use tower::{Service, ServiceBuilder};
 use tower_http::decompression::DecompressionLayer;
-use vector_config::configurable_component;
+use vector_lib::configurable::configurable_component;
 use vector_lib::{ByteSizeOf, EstimatedJsonEncodedSizeOf};
 use vector_stream::batcher::limiter::ItemBatchSize;
 
diff --git a/src/sinks/util/service.rs b/src/sinks/util/service.rs
index 18b14e5a74197..0b01cfabfa353 100644
--- a/src/sinks/util/service.rs
+++ b/src/sinks/util/service.rs
@@ -12,7 +12,7 @@ use tower::{
     timeout::Timeout,
     Service, ServiceBuilder,
 };
-use vector_config::configurable_component;
+use vector_lib::configurable::configurable_component;
 
 pub use crate::sinks::util::service::{
     concurrency::{concurrency_is_adaptive, Concurrency},
diff --git a/src/sinks/util/service/concurrency.rs b/src/sinks/util/service/concurrency.rs
index b8f1bbe6e3fef..cc77ef0338fc0 100644
--- a/src/sinks/util/service/concurrency.rs
+++ b/src/sinks/util/service/concurrency.rs
@@ -2,14 +2,14 @@ use std::{cell::RefCell, fmt};
 
 use serde::Serializer;
 use serde_json::Value;
-use vector_config::{
+use vector_lib::configurable::attributes::CustomAttribute;
+use vector_lib::configurable::{
     schema::{
         apply_base_metadata, generate_const_string_schema, generate_number_schema,
         generate_one_of_schema, SchemaGenerator, SchemaObject,
     },
     Configurable, GenerateError, Metadata, ToValue,
 };
-use vector_config_common::attributes::CustomAttribute;
 
 use serde::{
     de::{self, Unexpected, Visitor},
diff --git a/src/sinks/util/service/health.rs b/src/sinks/util/service/health.rs
index 6fdb202afd846..a9b5e2b98abc0 100644
--- a/src/sinks/util/service/health.rs
+++ b/src/sinks/util/service/health.rs
@@ -15,7 +15,7 @@ use serde_with::serde_as;
 use stream_cancel::{Trigger, Tripwire};
 use tokio::time::{sleep, Duration};
 use tower::Service;
-use vector_config::configurable_component;
+use vector_lib::configurable::configurable_component;
 
 use crate::{
     emit,
diff --git a/src/sinks/util/service/net/mod.rs b/src/sinks/util/service/net/mod.rs
index 5dc7c34c93e6e..3ad532f747994 100644
--- a/src/sinks/util/service/net/mod.rs
+++ b/src/sinks/util/service/net/mod.rs
@@ -44,7 +44,7 @@ use tokio::{
     time::sleep,
 };
 use tower::Service;
-use vector_config::configurable_component;
+use vector_lib::configurable::configurable_component;
 use vector_lib::tls::{MaybeTlsStream, TlsError};
 
 /// Hostname and port tuple.
diff --git a/src/sinks/util/service/net/tcp.rs b/src/sinks/util/service/net/tcp.rs
index f90c28d673a1a..d85d84fce593b 100644
--- a/src/sinks/util/service/net/tcp.rs
+++ b/src/sinks/util/service/net/tcp.rs
@@ -3,7 +3,7 @@ use std::net::SocketAddr;
 use snafu::ResultExt;
 use tokio::net::TcpStream;
 
-use vector_config::configurable_component;
+use vector_lib::configurable::configurable_component;
 use vector_lib::{
     tcp::TcpKeepaliveConfig,
     tls::{MaybeTlsSettings, MaybeTlsStream, TlsEnableableConfig},
diff --git a/src/sinks/util/service/net/udp.rs b/src/sinks/util/service/net/udp.rs
index 86a4ceaab7f53..c4cb9c2fa1ff2 100644
--- a/src/sinks/util/service/net/udp.rs
+++ b/src/sinks/util/service/net/udp.rs
@@ -3,7 +3,7 @@ use std::net::SocketAddr;
 use snafu::ResultExt;
 use tokio::net::UdpSocket;
 
-use vector_config::configurable_component;
+use vector_lib::configurable::configurable_component;
 
 use crate::{dns, net};
 
diff --git a/src/sinks/util/service/net/unix.rs b/src/sinks/util/service/net/unix.rs
index 5bd1e4219d7a8..f0655015f06fe 100644
--- a/src/sinks/util/service/net/unix.rs
+++ b/src/sinks/util/service/net/unix.rs
@@ -10,7 +10,7 @@ use tokio::{
     net::{UnixDatagram, UnixStream},
 };
 
-use vector_config::configurable_component;
+use vector_lib::configurable::configurable_component;
 
 use crate::net;
 
diff --git a/src/sinks/util/tcp.rs b/src/sinks/util/tcp.rs
index 417a884a6902c..505cbb93a6ad5 100644
--- a/src/sinks/util/tcp.rs
+++ b/src/sinks/util/tcp.rs
@@ -17,7 +17,7 @@ use tokio::{
     time::sleep,
 };
 use tokio_util::codec::Encoder;
-use vector_config::configurable_component;
+use vector_lib::configurable::configurable_component;
 use vector_lib::json_size::JsonSize;
 use vector_lib::{ByteSizeOf, EstimatedJsonEncodedSizeOf};
 
diff --git a/src/sinks/util/udp.rs b/src/sinks/util/udp.rs
index 87227c3ce6b89..65396fc9d1935 100644
--- a/src/sinks/util/udp.rs
+++ b/src/sinks/util/udp.rs
@@ -10,7 +10,7 @@ use futures::{stream::BoxStream, FutureExt, StreamExt};
 use snafu::{ResultExt, Snafu};
 use tokio::{net::UdpSocket, time::sleep};
 use tokio_util::codec::Encoder;
-use vector_config::configurable_component;
+use vector_lib::configurable::configurable_component;
 use vector_lib::internal_event::{ByteSize, BytesSent, InternalEventHandle, Protocol, Registered};
 use vector_lib::EstimatedJsonEncodedSizeOf;
 
diff --git a/src/sinks/util/unix.rs b/src/sinks/util/unix.rs
index d30d0c2a0a203..510615f23234b 100644
--- a/src/sinks/util/unix.rs
+++ b/src/sinks/util/unix.rs
@@ -6,7 +6,7 @@ use futures::{stream::BoxStream, SinkExt, StreamExt};
 use snafu::{ResultExt, Snafu};
 use tokio::{net::UnixStream, time::sleep};
 use tokio_util::codec::Encoder;
-use vector_config::configurable_component;
+use vector_lib::configurable::configurable_component;
 use vector_lib::json_size::JsonSize;
 use vector_lib::{ByteSizeOf, EstimatedJsonEncodedSizeOf};
 
diff --git a/src/sinks/util/uri.rs b/src/sinks/util/uri.rs
index 34f82f03a8326..ce61414c06539 100644
--- a/src/sinks/util/uri.rs
+++ b/src/sinks/util/uri.rs
@@ -2,7 +2,7 @@ use std::{fmt, str::FromStr};
 
 use http::uri::{Authority, PathAndQuery, Scheme, Uri};
 use percent_encoding::percent_decode_str;
-use vector_config::configurable_component;
+use vector_lib::configurable::configurable_component;
 
 use crate::http::Auth;
 
diff --git a/src/sinks/vector/config.rs b/src/sinks/vector/config.rs
index b0e2b6c5a8e6f..095eda4a4503c 100644
--- a/src/sinks/vector/config.rs
+++ b/src/sinks/vector/config.rs
@@ -4,7 +4,7 @@ use hyper_openssl::HttpsConnector;
 use hyper_proxy::ProxyConnector;
 use tonic::body::BoxBody;
 use tower::ServiceBuilder;
-use vector_config::configurable_component;
+use vector_lib::configurable::configurable_component;
 
 use super::{
     service::{VectorResponse, VectorService},
diff --git a/src/sinks/vector/mod.rs b/src/sinks/vector/mod.rs
index 78b170f38b429..1ed61448e2a25 100644
--- a/src/sinks/vector/mod.rs
+++ b/src/sinks/vector/mod.rs
@@ -1,6 +1,6 @@
 use snafu::Snafu;
 
-use vector_config::configurable_component;
+use vector_lib::configurable::configurable_component;
 
 mod config;
 mod service;
diff --git a/src/sinks/webhdfs/config.rs b/src/sinks/webhdfs/config.rs
index df0d03d9e03ec..1c638837efe87 100644
--- a/src/sinks/webhdfs/config.rs
+++ b/src/sinks/webhdfs/config.rs
@@ -1,7 +1,7 @@
 use codecs::{encoding::Framer, JsonSerializerConfig, NewlineDelimitedEncoderConfig};
 use opendal::{layers::LoggingLayer, services::Webhdfs, Operator};
 use tower::ServiceBuilder;
-use vector_config::configurable_component;
+use vector_lib::configurable::configurable_component;
 use vector_lib::{
     config::{AcknowledgementsConfig, DataType, Input},
     sink::VectorSink,
diff --git a/src/sinks/websocket/config.rs b/src/sinks/websocket/config.rs
index 76a3391ff0eac..31f3ecc5a4b53 100644
--- a/src/sinks/websocket/config.rs
+++ b/src/sinks/websocket/config.rs
@@ -2,7 +2,7 @@ use std::num::NonZeroU64;
 
 use codecs::JsonSerializerConfig;
 use snafu::ResultExt;
-use vector_config::configurable_component;
+use vector_lib::configurable::configurable_component;
 
 use crate::{
     codecs::EncodingConfig,
diff --git a/src/sources/amqp.rs b/src/sources/amqp.rs
index 68333d0f47b98..7e3528b5d66d1 100644
--- a/src/sources/amqp.rs
+++ b/src/sources/amqp.rs
@@ -24,7 +24,7 @@ use lookup::{lookup_v2::OptionalValuePath, metadata_path, owned_value_path, path
 use snafu::Snafu;
 use std::{io::Cursor, pin::Pin};
 use tokio_util::codec::FramedRead;
-use vector_config::configurable_component;
+use vector_lib::configurable::configurable_component;
 use vector_lib::{
     config::{log_schema, LegacyKey, LogNamespace, SourceAcknowledgementsConfig},
     event::Event,
diff --git a/src/sources/apache_metrics/mod.rs b/src/sources/apache_metrics/mod.rs
index d44820e70d2a8..78692c03e7e97 100644
--- a/src/sources/apache_metrics/mod.rs
+++ b/src/sources/apache_metrics/mod.rs
@@ -10,7 +10,7 @@ use hyper::{Body, Request};
 use serde_with::serde_as;
 use snafu::ResultExt;
 use tokio_stream::wrappers::IntervalStream;
-use vector_config::configurable_component;
+use vector_lib::configurable::configurable_component;
 use vector_lib::{metric_tags, EstimatedJsonEncodedSizeOf};
 
 use crate::{
diff --git a/src/sources/aws_ecs_metrics/mod.rs b/src/sources/aws_ecs_metrics/mod.rs
index c9dc51073132c..15c9e6d48a790 100644
--- a/src/sources/aws_ecs_metrics/mod.rs
+++ b/src/sources/aws_ecs_metrics/mod.rs
@@ -5,7 +5,7 @@ use hyper::{Body, Client, Request};
 use serde_with::serde_as;
 use tokio::time;
 use tokio_stream::wrappers::IntervalStream;
-use vector_config::configurable_component;
+use vector_lib::configurable::configurable_component;
 use vector_lib::internal_event::{ByteSize, BytesReceived, InternalEventHandle as _, Protocol};
 use vector_lib::{config::LogNamespace, EstimatedJsonEncodedSizeOf};
 
diff --git a/src/sources/aws_kinesis_firehose/mod.rs b/src/sources/aws_kinesis_firehose/mod.rs
index a7df07b4bafe3..b3116c2825b97 100644
--- a/src/sources/aws_kinesis_firehose/mod.rs
+++ b/src/sources/aws_kinesis_firehose/mod.rs
@@ -4,8 +4,8 @@ use codecs::decoding::{DeserializerConfig, FramingConfig};
 use futures::FutureExt;
 use lookup::owned_value_path;
 use tracing::Span;
-use vector_config::configurable_component;
 use vector_lib::config::{LegacyKey, LogNamespace};
+use vector_lib::configurable::configurable_component;
 use vector_lib::sensitive_string::SensitiveString;
 use vrl::value::Kind;
 use warp::Filter;
diff --git a/src/sources/aws_s3/mod.rs b/src/sources/aws_s3/mod.rs
index d0dd76f3ee684..4fc2abe3d753a 100644
--- a/src/sources/aws_s3/mod.rs
+++ b/src/sources/aws_s3/mod.rs
@@ -8,8 +8,8 @@ use futures::{stream, stream::StreamExt, TryStreamExt};
 use lookup::owned_value_path;
 use snafu::Snafu;
 use tokio_util::io::StreamReader;
-use vector_config::configurable_component;
 use vector_lib::config::{LegacyKey, LogNamespace};
+use vector_lib::configurable::configurable_component;
 use vrl::value::{kind::Collection, Kind};
 
 use super::util::MultilineConfig;
diff --git a/src/sources/aws_s3/sqs.rs b/src/sources/aws_s3/sqs.rs
index 2960a6fecfff9..0fc66ea6b1921 100644
--- a/src/sources/aws_s3/sqs.rs
+++ b/src/sources/aws_s3/sqs.rs
@@ -22,7 +22,7 @@ use snafu::{ResultExt, Snafu};
 use tokio::{pin, select};
 use tokio_util::codec::FramedRead;
 use tracing::Instrument;
-use vector_config::configurable_component;
+use vector_lib::configurable::configurable_component;
 use vector_lib::internal_event::{
     ByteSize, BytesReceived, CountByteSize, InternalEventHandle as _, Protocol, Registered,
 };
diff --git a/src/sources/aws_sqs/config.rs b/src/sources/aws_sqs/config.rs
index a9cd3b31f613b..e3e43a74692aa 100644
--- a/src/sources/aws_sqs/config.rs
+++ b/src/sources/aws_sqs/config.rs
@@ -2,8 +2,8 @@ use std::num::NonZeroUsize;
 
 use codecs::decoding::{DeserializerConfig, FramingConfig};
 use lookup::owned_value_path;
-use vector_config::configurable_component;
 use vector_lib::config::{LegacyKey, LogNamespace};
+use vector_lib::configurable::configurable_component;
 use vrl::value::Kind;
 
 use crate::aws::create_client;
diff --git a/src/sources/datadog_agent/mod.rs b/src/sources/datadog_agent/mod.rs
index 1001c5fe040a6..76686629276d1 100644
--- a/src/sources/datadog_agent/mod.rs
+++ b/src/sources/datadog_agent/mod.rs
@@ -30,8 +30,8 @@ use regex::Regex;
 use serde::{Deserialize, Serialize};
 use snafu::Snafu;
 use tracing::Span;
-use vector_config::configurable_component;
 use vector_lib::config::{LegacyKey, LogNamespace};
+use vector_lib::configurable::configurable_component;
 use vector_lib::event::{BatchNotifier, BatchStatus};
 use vector_lib::internal_event::{EventsReceived, Registered};
 use vrl::path::OwnedTargetPath;
diff --git a/src/sources/demo_logs.rs b/src/sources/demo_logs.rs
index b98bbd755edd6..3f464b137fb6f 100644
--- a/src/sources/demo_logs.rs
+++ b/src/sources/demo_logs.rs
@@ -12,7 +12,7 @@ use snafu::Snafu;
 use std::task::Poll;
 use tokio::time::{self, Duration};
 use tokio_util::codec::FramedRead;
-use vector_config::configurable_component;
+use vector_lib::configurable::configurable_component;
 use vector_lib::internal_event::{
     ByteSize, BytesReceived, CountByteSize, InternalEventHandle as _, Protocol,
 };
diff --git a/src/sources/dnstap/mod.rs b/src/sources/dnstap/mod.rs
index 97cc464853bbc..34c30ee675201 100644
--- a/src/sources/dnstap/mod.rs
+++ b/src/sources/dnstap/mod.rs
@@ -3,7 +3,7 @@ use std::path::PathBuf;
 use base64::prelude::{Engine as _, BASE64_STANDARD};
 use bytes::Bytes;
 use lookup::{owned_value_path, path, OwnedValuePath};
-use vector_config::configurable_component;
+use vector_lib::configurable::configurable_component;
 use vector_lib::internal_event::{
     ByteSize, BytesReceived, InternalEventHandle as _, Protocol, Registered,
 };
diff --git a/src/sources/docker_logs/mod.rs b/src/sources/docker_logs/mod.rs
index a2587b8122ade..8ebea56ec6f0b 100644
--- a/src/sources/docker_logs/mod.rs
+++ b/src/sources/docker_logs/mod.rs
@@ -20,8 +20,8 @@ use once_cell::sync::Lazy;
 use serde_with::serde_as;
 use tokio::sync::mpsc;
 use tracing_futures::Instrument;
-use vector_config::configurable_component;
 use vector_lib::config::{LegacyKey, LogNamespace};
+use vector_lib::configurable::configurable_component;
 use vector_lib::internal_event::{
     ByteSize, BytesReceived, InternalEventHandle as _, Protocol, Registered,
 };
diff --git a/src/sources/eventstoredb_metrics/mod.rs b/src/sources/eventstoredb_metrics/mod.rs
index 84bc793767a23..9f06ace61d50b 100644
--- a/src/sources/eventstoredb_metrics/mod.rs
+++ b/src/sources/eventstoredb_metrics/mod.rs
@@ -5,8 +5,8 @@ use http::Uri;
 use hyper::{Body, Request};
 use serde_with::serde_as;
 use tokio_stream::wrappers::IntervalStream;
-use vector_config::configurable_component;
 use vector_lib::config::LogNamespace;
+use vector_lib::configurable::configurable_component;
 use vector_lib::internal_event::{
     ByteSize, BytesReceived, CountByteSize, InternalEventHandle as _, Protocol,
 };
diff --git a/src/sources/exec/mod.rs b/src/sources/exec/mod.rs
index fd3ecab3cefe3..924ad5db9ca33 100644
--- a/src/sources/exec/mod.rs
+++ b/src/sources/exec/mod.rs
@@ -21,7 +21,7 @@ use tokio::{
 };
 use tokio_stream::wrappers::IntervalStream;
 use tokio_util::codec::FramedRead;
-use vector_config::configurable_component;
+use vector_lib::configurable::configurable_component;
 use vector_lib::internal_event::{ByteSize, BytesReceived, InternalEventHandle as _, Protocol};
 use vector_lib::{config::LegacyKey, EstimatedJsonEncodedSizeOf};
 use vrl::path::OwnedValuePath;
diff --git a/src/sources/file.rs b/src/sources/file.rs
index 1e1b38d453970..cec4afafee781 100644
--- a/src/sources/file.rs
+++ b/src/sources/file.rs
@@ -16,7 +16,7 @@ use serde_with::serde_as;
 use snafu::{ResultExt, Snafu};
 use tokio::{sync::oneshot, task::spawn_blocking};
 use tracing::{Instrument, Span};
-use vector_config::configurable_component;
+use vector_lib::configurable::configurable_component;
 use vector_lib::finalizer::OrderedFinalizer;
 use vector_lib::{
     config::{LegacyKey, LogNamespace},
diff --git a/src/sources/file_descriptors/file_descriptor.rs b/src/sources/file_descriptors/file_descriptor.rs
index 55767441d7e42..44cb42b006d86 100644
--- a/src/sources/file_descriptors/file_descriptor.rs
+++ b/src/sources/file_descriptors/file_descriptor.rs
@@ -4,8 +4,8 @@ use super::{outputs, FileDescriptorConfig};
 use codecs::decoding::{DeserializerConfig, FramingConfig};
 use indoc::indoc;
 use lookup::lookup_v2::OptionalValuePath;
-use vector_config::configurable_component;
 use vector_lib::config::LogNamespace;
+use vector_lib::configurable::configurable_component;
 
 use crate::{
     config::{GenerateConfig, Resource, SourceConfig, SourceContext, SourceOutput},
diff --git a/src/sources/file_descriptors/mod.rs b/src/sources/file_descriptors/mod.rs
index 125cf69e16ede..f48732fc22658 100644
--- a/src/sources/file_descriptors/mod.rs
+++ b/src/sources/file_descriptors/mod.rs
@@ -10,7 +10,7 @@ use codecs::{
 use futures::{channel::mpsc, executor, SinkExt, StreamExt};
 use lookup::{lookup_v2::OptionalValuePath, owned_value_path, path, OwnedValuePath};
 use tokio_util::{codec::FramedRead, io::StreamReader};
-use vector_config::NamedComponent;
+use vector_lib::configurable::NamedComponent;
 use vector_lib::internal_event::{
     ByteSize, BytesReceived, CountByteSize, InternalEventHandle as _, Protocol,
 };
diff --git a/src/sources/file_descriptors/stdin.rs b/src/sources/file_descriptors/stdin.rs
index bf0497942b2de..d538d63c32750 100644
--- a/src/sources/file_descriptors/stdin.rs
+++ b/src/sources/file_descriptors/stdin.rs
@@ -2,8 +2,8 @@ use std::io;
 
 use codecs::decoding::{DeserializerConfig, FramingConfig};
 use lookup::lookup_v2::OptionalValuePath;
-use vector_config::configurable_component;
 use vector_lib::config::LogNamespace;
+use vector_lib::configurable::configurable_component;
 
 use crate::{
     config::{Resource, SourceConfig, SourceContext, SourceOutput},
diff --git a/src/sources/fluent/mod.rs b/src/sources/fluent/mod.rs
index 8dd1f23c6b496..1bb61b0e1624c 100644
--- a/src/sources/fluent/mod.rs
+++ b/src/sources/fluent/mod.rs
@@ -14,8 +14,8 @@ use rmp_serde::{decode, Deserializer, Serializer};
 use serde::{Deserialize, Serialize};
 use smallvec::{smallvec, SmallVec};
 use tokio_util::codec::Decoder;
-use vector_config::configurable_component;
 use vector_lib::config::{LegacyKey, LogNamespace};
+use vector_lib::configurable::configurable_component;
 use vector_lib::schema::Definition;
 use vrl::value::kind::Collection;
 use vrl::value::{Kind, Value};
diff --git a/src/sources/gcp_pubsub.rs b/src/sources/gcp_pubsub.rs
index 2dc1b3069fc46..5f61534545bb7 100644
--- a/src/sources/gcp_pubsub.rs
+++ b/src/sources/gcp_pubsub.rs
@@ -20,8 +20,8 @@ use tonic::{
     transport::{Certificate, ClientTlsConfig, Endpoint, Identity},
     Code, Request, Status,
 };
-use vector_config::configurable_component;
 use vector_lib::config::{LegacyKey, LogNamespace};
+use vector_lib::configurable::configurable_component;
 use vector_lib::internal_event::{
     ByteSize, BytesReceived, EventsReceived, InternalEventHandle as _, Protocol, Registered,
 };
diff --git a/src/sources/heroku_logs.rs b/src/sources/heroku_logs.rs
index 1664f887ef9fe..3cc33314f3424 100644
--- a/src/sources/heroku_logs.rs
+++ b/src/sources/heroku_logs.rs
@@ -17,7 +17,7 @@ use tokio_util::codec::Decoder as _;
 use vrl::value::{kind::Collection, Kind};
 use warp::http::{HeaderMap, StatusCode};
 
-use vector_config::configurable_component;
+use vector_lib::configurable::configurable_component;
 use vector_lib::{
     config::{LegacyKey, LogNamespace},
     schema::Definition,
diff --git a/src/sources/host_metrics/disk.rs b/src/sources/host_metrics/disk.rs
index 5c91cbb1faedf..a24d20cf8b241 100644
--- a/src/sources/host_metrics/disk.rs
+++ b/src/sources/host_metrics/disk.rs
@@ -1,7 +1,7 @@
 use crate::internal_events::HostMetricsScrapeDetailError;
 use futures::StreamExt;
 use heim::units::information::byte;
-use vector_config::configurable_component;
+use vector_lib::configurable::configurable_component;
 use vector_lib::metric_tags;
 
 use super::{default_all_devices, example_devices, filter_result, FilterList, HostMetrics};
diff --git a/src/sources/host_metrics/filesystem.rs b/src/sources/host_metrics/filesystem.rs
index 3c066f7e07992..d01094ffb3951 100644
--- a/src/sources/host_metrics/filesystem.rs
+++ b/src/sources/host_metrics/filesystem.rs
@@ -2,7 +2,7 @@ use futures::StreamExt;
 use heim::units::information::byte;
 #[cfg(not(windows))]
 use heim::units::ratio::ratio;
-use vector_config::configurable_component;
+use vector_lib::configurable::configurable_component;
 use vector_lib::metric_tags;
 
 use crate::internal_events::{HostMetricsScrapeDetailError, HostMetricsScrapeFilesystemError};
diff --git a/src/sources/host_metrics/mod.rs b/src/sources/host_metrics/mod.rs
index 0894e1aa9222b..31bf36e584573 100644
--- a/src/sources/host_metrics/mod.rs
+++ b/src/sources/host_metrics/mod.rs
@@ -12,8 +12,8 @@ use heim::units::time::second;
 use serde_with::serde_as;
 use tokio::time;
 use tokio_stream::wrappers::IntervalStream;
-use vector_config::configurable_component;
 use vector_lib::config::LogNamespace;
+use vector_lib::configurable::configurable_component;
 use vector_lib::internal_event::{
     ByteSize, BytesReceived, CountByteSize, InternalEventHandle as _, Protocol, Registered,
 };
diff --git a/src/sources/host_metrics/network.rs b/src/sources/host_metrics/network.rs
index 158d70fb306d2..d97559ad3f9ab 100644
--- a/src/sources/host_metrics/network.rs
+++ b/src/sources/host_metrics/network.rs
@@ -4,7 +4,7 @@ use heim::net::os::linux::IoCountersExt;
 #[cfg(windows)]
 use heim::net::os::windows::IoCountersExt;
 use heim::units::information::byte;
-use vector_config::configurable_component;
+use vector_lib::configurable::configurable_component;
 use vector_lib::metric_tags;
 
 use crate::internal_events::HostMetricsScrapeDetailError;
diff --git a/src/sources/http_client/client.rs b/src/sources/http_client/client.rs
index 98f805e990e6a..d1fa5c1bb035c 100644
--- a/src/sources/http_client/client.rs
+++ b/src/sources/http_client/client.rs
@@ -32,7 +32,7 @@ use codecs::{
     decoding::{DeserializerConfig, FramingConfig},
     StreamDecodingError,
 };
-use vector_config::configurable_component;
+use vector_lib::configurable::configurable_component;
 use vector_lib::{
     config::{log_schema, LogNamespace, SourceOutput},
     event::Event,
diff --git a/src/sources/http_server.rs b/src/sources/http_server.rs
index a59e6a834cb3b..bfca943edbc58 100644
--- a/src/sources/http_server.rs
+++ b/src/sources/http_server.rs
@@ -14,7 +14,7 @@ use codecs::{
     NewlineDelimitedDecoderConfig,
 };
 use lookup::{lookup_v2::OptionalValuePath, owned_value_path, path};
-use vector_config::configurable_component;
+use vector_lib::configurable::configurable_component;
 use vector_lib::{
     config::{DataType, LegacyKey, LogNamespace},
     schema::Definition,
diff --git a/src/sources/internal_logs.rs b/src/sources/internal_logs.rs
index dcb697e7ad726..92d4f9702679a 100644
--- a/src/sources/internal_logs.rs
+++ b/src/sources/internal_logs.rs
@@ -3,8 +3,8 @@ use codecs::BytesDeserializerConfig;
 use futures::{stream, StreamExt};
 use lookup::lookup_v2::OptionalValuePath;
 use lookup::{owned_value_path, path, OwnedValuePath};
-use vector_config::configurable_component;
 use vector_lib::config::log_schema;
+use vector_lib::configurable::configurable_component;
 use vector_lib::{
     config::{LegacyKey, LogNamespace},
     schema::Definition,
diff --git a/src/sources/internal_metrics.rs b/src/sources/internal_metrics.rs
index d17a28d042777..be1c93fc2a99c 100644
--- a/src/sources/internal_metrics.rs
+++ b/src/sources/internal_metrics.rs
@@ -5,7 +5,7 @@ use lookup::lookup_v2::OptionalValuePath;
 use serde_with::serde_as;
 use tokio::time;
 use tokio_stream::wrappers::IntervalStream;
-use vector_config::configurable_component;
+use vector_lib::configurable::configurable_component;
 use vector_lib::internal_event::{CountByteSize, InternalEventHandle as _};
 use vector_lib::{config::LogNamespace, ByteSizeOf, EstimatedJsonEncodedSizeOf};
 
diff --git a/src/sources/journald.rs b/src/sources/journald.rs
index 3e59a5b472888..47ca086a9ccee 100644
--- a/src/sources/journald.rs
+++ b/src/sources/journald.rs
@@ -28,7 +28,7 @@ use tokio::{
     time::sleep,
 };
 use tokio_util::codec::FramedRead;
-use vector_config::configurable_component;
+use vector_lib::configurable::configurable_component;
 use vector_lib::{
     config::{LegacyKey, LogNamespace},
     schema::Definition,
diff --git a/src/sources/kafka.rs b/src/sources/kafka.rs
index 49d57878733ac..a7a3f3dc022f0 100644
--- a/src/sources/kafka.rs
+++ b/src/sources/kafka.rs
@@ -42,7 +42,7 @@ use tokio::{
 };
 use tokio_util::codec::FramedRead;
 
-use vector_config::configurable_component;
+use vector_lib::configurable::configurable_component;
 use vector_lib::finalizer::OrderedFinalizer;
 use vector_lib::{
     config::{LegacyKey, LogNamespace},
diff --git a/src/sources/kubernetes_logs/mod.rs b/src/sources/kubernetes_logs/mod.rs
index a482b6115bcc6..49c3e81053c89 100644
--- a/src/sources/kubernetes_logs/mod.rs
+++ b/src/sources/kubernetes_logs/mod.rs
@@ -26,7 +26,7 @@ use kube::{
 use lifecycle::Lifecycle;
 use lookup::{lookup_v2::OptionalTargetPath, owned_value_path, path, OwnedTargetPath};
 use serde_with::serde_as;
-use vector_config::configurable_component;
+use vector_lib::configurable::configurable_component;
 use vector_lib::{config::LegacyKey, config::LogNamespace, EstimatedJsonEncodedSizeOf};
 use vector_lib::{
     internal_event::{ByteSize, BytesReceived, InternalEventHandle as _, Protocol},
diff --git a/src/sources/kubernetes_logs/namespace_metadata_annotator.rs b/src/sources/kubernetes_logs/namespace_metadata_annotator.rs
index 084dfa0593344..1ea034033183b 100644
--- a/src/sources/kubernetes_logs/namespace_metadata_annotator.rs
+++ b/src/sources/kubernetes_logs/namespace_metadata_annotator.rs
@@ -6,8 +6,8 @@ use k8s_openapi::{api::core::v1::Namespace, apimachinery::pkg::apis::meta::v1::O
 use kube::runtime::reflector::{store::Store, ObjectRef};
 use lookup::lookup_v2::OptionalTargetPath;
 use lookup::{lookup_v2::ValuePath, owned_value_path, path, OwnedTargetPath};
-use vector_config::configurable_component;
 use vector_lib::config::{LegacyKey, LogNamespace};
+use vector_lib::configurable::configurable_component;
 
 use crate::event::{Event, LogEvent};
 
diff --git a/src/sources/kubernetes_logs/node_metadata_annotator.rs b/src/sources/kubernetes_logs/node_metadata_annotator.rs
index 7e13cf5129ddd..25260cb321620 100644
--- a/src/sources/kubernetes_logs/node_metadata_annotator.rs
+++ b/src/sources/kubernetes_logs/node_metadata_annotator.rs
@@ -7,8 +7,8 @@ use k8s_openapi::{api::core::v1::Node, apimachinery::pkg::apis::meta::v1::Object
 use kube::runtime::reflector::{store::Store, ObjectRef};
 use lookup::lookup_v2::OptionalTargetPath;
 use lookup::{lookup_v2::ValuePath, owned_value_path, path, OwnedTargetPath};
-use vector_config::configurable_component;
 use vector_lib::config::{LegacyKey, LogNamespace};
+use vector_lib::configurable::configurable_component;
 
 use super::Config;
 
diff --git a/src/sources/kubernetes_logs/pod_metadata_annotator.rs b/src/sources/kubernetes_logs/pod_metadata_annotator.rs
index 7cbdeefd708b6..933e5887489b2 100644
--- a/src/sources/kubernetes_logs/pod_metadata_annotator.rs
+++ b/src/sources/kubernetes_logs/pod_metadata_annotator.rs
@@ -11,8 +11,8 @@ use lookup::{
     lookup_v2::{OptionalTargetPath, ValuePath},
     owned_value_path, path, OwnedTargetPath,
 };
-use vector_config::configurable_component;
 use vector_lib::config::{LegacyKey, LogNamespace};
+use vector_lib::configurable::configurable_component;
 
 use super::{
     path_helpers::{parse_log_file_path, LogFileInfo},
diff --git a/src/sources/logstash.rs b/src/sources/logstash.rs
index 59739ef5b0681..d130cfee4ccfd 100644
--- a/src/sources/logstash.rs
+++ b/src/sources/logstash.rs
@@ -13,7 +13,7 @@ use lookup::{event_path, metadata_path, owned_value_path, path, OwnedValuePath};
 use smallvec::{smallvec, SmallVec};
 use snafu::{ResultExt, Snafu};
 use tokio_util::codec::Decoder;
-use vector_config::configurable_component;
+use vector_lib::configurable::configurable_component;
 use vector_lib::{
     config::{LegacyKey, LogNamespace},
     schema::Definition,
diff --git a/src/sources/mongodb_metrics/mod.rs b/src/sources/mongodb_metrics/mod.rs
index d39ce6dbca91d..d80e6b1b0a1dd 100644
--- a/src/sources/mongodb_metrics/mod.rs
+++ b/src/sources/mongodb_metrics/mod.rs
@@ -15,7 +15,7 @@ use serde_with::serde_as;
 use snafu::{ResultExt, Snafu};
 use tokio::time;
 use tokio_stream::wrappers::IntervalStream;
-use vector_config::configurable_component;
+use vector_lib::configurable::configurable_component;
 use vector_lib::{metric_tags, ByteSizeOf, EstimatedJsonEncodedSizeOf};
 
 use crate::{
diff --git a/src/sources/nats.rs b/src/sources/nats.rs
index a8cf1730a5026..7337d35cc676c 100644
--- a/src/sources/nats.rs
+++ b/src/sources/nats.rs
@@ -4,7 +4,7 @@ use futures::{pin_mut, StreamExt};
 use lookup::{lookup_v2::OptionalValuePath, owned_value_path};
 use snafu::{ResultExt, Snafu};
 use tokio_util::codec::FramedRead;
-use vector_config::configurable_component;
+use vector_lib::configurable::configurable_component;
 use vector_lib::internal_event::{
     ByteSize, BytesReceived, CountByteSize, EventsReceived, InternalEventHandle as _, Protocol,
 };
diff --git a/src/sources/nginx_metrics/mod.rs b/src/sources/nginx_metrics/mod.rs
index d010d8dbc7515..f3e409c5c7aec 100644
--- a/src/sources/nginx_metrics/mod.rs
+++ b/src/sources/nginx_metrics/mod.rs
@@ -12,7 +12,7 @@ use serde_with::serde_as;
 use snafu::{ResultExt, Snafu};
 use tokio::time;
 use tokio_stream::wrappers::IntervalStream;
-use vector_config::configurable_component;
+use vector_lib::configurable::configurable_component;
 use vector_lib::{metric_tags, EstimatedJsonEncodedSizeOf};
 
 use crate::{
diff --git a/src/sources/opentelemetry/mod.rs b/src/sources/opentelemetry/mod.rs
index c532577e26847..a4358a80d2adf 100644
--- a/src/sources/opentelemetry/mod.rs
+++ b/src/sources/opentelemetry/mod.rs
@@ -18,7 +18,7 @@ use opentelemetry_proto::convert::{
 };
 
 use opentelemetry_proto::proto::collector::logs::v1::logs_service_server::LogsServiceServer;
-use vector_config::configurable_component;
+use vector_lib::configurable::configurable_component;
 use vector_lib::internal_event::{BytesReceived, EventsReceived, Protocol};
 use vector_lib::{
     config::{log_schema, LegacyKey, LogNamespace},
diff --git a/src/sources/postgresql_metrics.rs b/src/sources/postgresql_metrics.rs
index 9ab9de3613ad8..a354da27d32a9 100644
--- a/src/sources/postgresql_metrics.rs
+++ b/src/sources/postgresql_metrics.rs
@@ -25,8 +25,8 @@ use tokio_postgres::{
     Client, Config, Error as PgError, NoTls, Row,
 };
 use tokio_stream::wrappers::IntervalStream;
-use vector_config::configurable_component;
 use vector_lib::config::LogNamespace;
+use vector_lib::configurable::configurable_component;
 use vector_lib::{
     internal_event::{CountByteSize, InternalEventHandle as _, Registered},
     json_size::JsonSize,
diff --git a/src/sources/prometheus/remote_write.rs b/src/sources/prometheus/remote_write.rs
index 54b568c381b98..84fa60de444ce 100644
--- a/src/sources/prometheus/remote_write.rs
+++ b/src/sources/prometheus/remote_write.rs
@@ -3,8 +3,8 @@ use std::{collections::HashMap, net::SocketAddr};
 use bytes::Bytes;
 use prometheus_parser::proto;
 use prost::Message;
-use vector_config::configurable_component;
 use vector_lib::config::LogNamespace;
+use vector_lib::configurable::configurable_component;
 use warp::http::{HeaderMap, StatusCode};
 
 use super::parser;
diff --git a/src/sources/prometheus/scrape.rs b/src/sources/prometheus/scrape.rs
index 62cf5bd10e600..ec9112a65f517 100644
--- a/src/sources/prometheus/scrape.rs
+++ b/src/sources/prometheus/scrape.rs
@@ -6,7 +6,7 @@ use futures_util::FutureExt;
 use http::{response::Parts, Uri};
 use serde_with::serde_as;
 use snafu::{ResultExt, Snafu};
-use vector_config::configurable_component;
+use vector_lib::configurable::configurable_component;
 use vector_lib::{config::LogNamespace, event::Event};
 
 use super::parser;
diff --git a/src/sources/redis/mod.rs b/src/sources/redis/mod.rs
index 066ec8ddc8f83..4ca3bc3b73e46 100644
--- a/src/sources/redis/mod.rs
+++ b/src/sources/redis/mod.rs
@@ -8,7 +8,7 @@ use futures::StreamExt;
 use lookup::{lookup_v2::OptionalValuePath, owned_value_path, path, OwnedValuePath};
 use snafu::{ResultExt, Snafu};
 use tokio_util::codec::FramedRead;
-use vector_config::configurable_component;
+use vector_lib::configurable::configurable_component;
 use vector_lib::internal_event::{
     ByteSize, BytesReceived, CountByteSize, InternalEventHandle as _, Protocol, Registered,
 };
diff --git a/src/sources/socket/mod.rs b/src/sources/socket/mod.rs
index d62b3d57d6ce6..7773ec0984a23 100644
--- a/src/sources/socket/mod.rs
+++ b/src/sources/socket/mod.rs
@@ -5,8 +5,8 @@ mod unix;
 
 use codecs::decoding::DeserializerConfig;
 use lookup::{lookup_v2::OptionalValuePath, owned_value_path};
-use vector_config::configurable_component;
 use vector_lib::config::{log_schema, LegacyKey, LogNamespace};
+use vector_lib::configurable::configurable_component;
 use vrl::value::{kind::Collection, Kind};
 
 #[cfg(unix)]
diff --git a/src/sources/socket/tcp.rs b/src/sources/socket/tcp.rs
index d3d1a9c5f849b..1d2899563a896 100644
--- a/src/sources/socket/tcp.rs
+++ b/src/sources/socket/tcp.rs
@@ -5,8 +5,8 @@ use codecs::decoding::{DeserializerConfig, FramingConfig};
 use lookup::{lookup_v2::OptionalValuePath, owned_value_path, path};
 use serde_with::serde_as;
 use smallvec::SmallVec;
-use vector_config::configurable_component;
 use vector_lib::config::{LegacyKey, LogNamespace};
+use vector_lib::configurable::configurable_component;
 
 use crate::{
     codecs::Decoder,
diff --git a/src/sources/socket/udp.rs b/src/sources/socket/udp.rs
index e44e5abc3cdd7..3831926009de2 100644
--- a/src/sources/socket/udp.rs
+++ b/src/sources/socket/udp.rs
@@ -8,7 +8,7 @@ use futures::StreamExt;
 use listenfd::ListenFd;
 use lookup::{lookup_v2::OptionalValuePath, owned_value_path, path};
 use tokio_util::codec::FramedRead;
-use vector_config::configurable_component;
+use vector_lib::configurable::configurable_component;
 use vector_lib::internal_event::{ByteSize, BytesReceived, InternalEventHandle as _, Protocol};
 use vector_lib::{
     config::{LegacyKey, LogNamespace},
diff --git a/src/sources/socket/unix.rs b/src/sources/socket/unix.rs
index 3b697b80210c1..78dad0fcf059b 100644
--- a/src/sources/socket/unix.rs
+++ b/src/sources/socket/unix.rs
@@ -4,8 +4,8 @@ use bytes::Bytes;
 use chrono::Utc;
 use codecs::decoding::{DeserializerConfig, FramingConfig};
 use lookup::{lookup_v2::OptionalValuePath, path};
-use vector_config::configurable_component;
 use vector_lib::config::{LegacyKey, LogNamespace};
+use vector_lib::configurable::configurable_component;
 use vector_lib::shutdown::ShutdownSignal;
 
 use crate::{
diff --git a/src/sources/splunk_hec/acknowledgements.rs b/src/sources/splunk_hec/acknowledgements.rs
index 87075d5247f20..2e261582afaf5 100644
--- a/src/sources/splunk_hec/acknowledgements.rs
+++ b/src/sources/splunk_hec/acknowledgements.rs
@@ -12,7 +12,7 @@ use futures::StreamExt;
 use roaring::RoaringTreemap;
 use serde::{Deserialize, Serialize};
 use tokio::time::interval;
-use vector_config::configurable_component;
+use vector_lib::configurable::configurable_component;
 use vector_lib::{finalization::BatchStatusReceiver, finalizer::UnorderedFinalizer};
 use warp::Rejection;
 
diff --git a/src/sources/splunk_hec/mod.rs b/src/sources/splunk_hec/mod.rs
index 7b358df13443b..7e666796a8177 100644
--- a/src/sources/splunk_hec/mod.rs
+++ b/src/sources/splunk_hec/mod.rs
@@ -16,7 +16,7 @@ use serde::Serialize;
 use serde_json::{de::Read as JsonRead, Deserializer, Value as JsonValue};
 use snafu::Snafu;
 use tracing::Span;
-use vector_config::configurable_component;
+use vector_lib::configurable::configurable_component;
 use vector_lib::internal_event::{CountByteSize, InternalEventHandle as _, Registered};
 use vector_lib::sensitive_string::SensitiveString;
 use vector_lib::{
diff --git a/src/sources/statsd/mod.rs b/src/sources/statsd/mod.rs
index 8f4090c1e1a03..0f9a29c341486 100644
--- a/src/sources/statsd/mod.rs
+++ b/src/sources/statsd/mod.rs
@@ -13,7 +13,7 @@ use listenfd::ListenFd;
 use serde_with::serde_as;
 use smallvec::{smallvec, SmallVec};
 use tokio_util::udp::UdpFramed;
-use vector_config::configurable_component;
+use vector_lib::configurable::configurable_component;
 use vector_lib::internal_event::{CountByteSize, InternalEventHandle as _, Registered};
 use vector_lib::EstimatedJsonEncodedSizeOf;
 
diff --git a/src/sources/statsd/unix.rs b/src/sources/statsd/unix.rs
index 7209268f9aa05..fd2116f1859a1 100644
--- a/src/sources/statsd/unix.rs
+++ b/src/sources/statsd/unix.rs
@@ -4,7 +4,7 @@ use codecs::{
     decoding::{Deserializer, Framer},
     NewlineDelimitedDecoder,
 };
-use vector_config::configurable_component;
+use vector_lib::configurable::configurable_component;
 
 use super::StatsdDeserializer;
 use crate::{
diff --git a/src/sources/syslog.rs b/src/sources/syslog.rs
index 36a50291d80f9..8e3e800991cdd 100644
--- a/src/sources/syslog.rs
+++ b/src/sources/syslog.rs
@@ -13,8 +13,8 @@ use listenfd::ListenFd;
 use lookup::{lookup_v2::OptionalValuePath, path, OwnedValuePath};
 use smallvec::SmallVec;
 use tokio_util::udp::UdpFramed;
-use vector_config::configurable_component;
 use vector_lib::config::{LegacyKey, LogNamespace};
+use vector_lib::configurable::configurable_component;
 use vrl::event_path;
 
 #[cfg(unix)]
diff --git a/src/sources/util/body_decoding.rs b/src/sources/util/body_decoding.rs
index ba90e3ef0efb3..6a99da3240792 100644
--- a/src/sources/util/body_decoding.rs
+++ b/src/sources/util/body_decoding.rs
@@ -1,4 +1,4 @@
-use vector_config::configurable_component;
+use vector_lib::configurable::configurable_component;
 
 /// Content encoding.
 #[configurable_component]
diff --git a/src/sources/util/encoding_config.rs b/src/sources/util/encoding_config.rs
index fed928e48a6d9..e24a2420181fe 100644
--- a/src/sources/util/encoding_config.rs
+++ b/src/sources/util/encoding_config.rs
@@ -1,4 +1,4 @@
-use vector_config::configurable_component;
+use vector_lib::configurable::configurable_component;
 
 /// Character set encoding.
 #[configurable_component]
diff --git a/src/sources/util/http/auth.rs b/src/sources/util/http/auth.rs
index 4b3f47ca5bd10..f902cf3734db8 100644
--- a/src/sources/util/http/auth.rs
+++ b/src/sources/util/http/auth.rs
@@ -1,7 +1,7 @@
 use std::convert::TryFrom;
 
 use headers::{Authorization, HeaderMapExt};
-use vector_config::configurable_component;
+use vector_lib::configurable::configurable_component;
 use vector_lib::sensitive_string::SensitiveString;
 use warp::http::HeaderMap;
 
diff --git a/src/sources/util/http/method.rs b/src/sources/util/http/method.rs
index 8f1783e594e1e..a816dc42f7cdc 100644
--- a/src/sources/util/http/method.rs
+++ b/src/sources/util/http/method.rs
@@ -1,5 +1,5 @@
 use http::Method;
-use vector_config::configurable_component;
+use vector_lib::configurable::configurable_component;
 
 /// HTTP method.
 #[configurable_component]
diff --git a/src/sources/util/multiline_config.rs b/src/sources/util/multiline_config.rs
index 9a8d9df734798..2736fb3398a77 100644
--- a/src/sources/util/multiline_config.rs
+++ b/src/sources/util/multiline_config.rs
@@ -3,7 +3,7 @@ use std::{convert::TryFrom, time::Duration};
 use regex::bytes::Regex;
 use serde_with::serde_as;
 use snafu::{ResultExt, Snafu};
-use vector_config::configurable_component;
+use vector_lib::configurable::configurable_component;
 
 use crate::line_agg;
 
diff --git a/src/sources/util/net/mod.rs b/src/sources/util/net/mod.rs
index a7d7bf4192e55..6a3329c88e0ff 100644
--- a/src/sources/util/net/mod.rs
+++ b/src/sources/util/net/mod.rs
@@ -6,7 +6,7 @@ mod udp;
 use std::{fmt, net::SocketAddr};
 
 use snafu::Snafu;
-use vector_config::configurable_component;
+use vector_lib::configurable::configurable_component;
 
 use crate::config::{Protocol, Resource};
 
diff --git a/src/sources/vector/mod.rs b/src/sources/vector/mod.rs
index 5780aff0638e4..0d006952ba439 100644
--- a/src/sources/vector/mod.rs
+++ b/src/sources/vector/mod.rs
@@ -5,7 +5,7 @@ use chrono::Utc;
 use codecs::NativeDeserializerConfig;
 use futures::TryFutureExt;
 use tonic::{Request, Response, Status};
-use vector_config::configurable_component;
+use vector_lib::configurable::configurable_component;
 use vector_lib::internal_event::{CountByteSize, InternalEventHandle as _};
 use vector_lib::{
     config::LogNamespace,
diff --git a/src/template.rs b/src/template.rs
index f1db00d4792a4..510679ff70ee7 100644
--- a/src/template.rs
+++ b/src/template.rs
@@ -10,7 +10,7 @@ use lookup::lookup_v2::parse_target_path;
 use once_cell::sync::Lazy;
 use regex::Regex;
 use snafu::Snafu;
-use vector_config::{configurable_component, ConfigurableString};
+use vector_lib::configurable::{configurable_component, ConfigurableString};
 
 use crate::{
     config::log_schema,
diff --git a/src/test_util/mock/sinks/backpressure.rs b/src/test_util/mock/sinks/backpressure.rs
index 1c3974a71e168..44745a5fbfb25 100644
--- a/src/test_util/mock/sinks/backpressure.rs
+++ b/src/test_util/mock/sinks/backpressure.rs
@@ -1,7 +1,7 @@
 use async_trait::async_trait;
 use futures::stream::BoxStream;
 use futures::{FutureExt, StreamExt};
-use vector_config::configurable_component;
+use vector_lib::configurable::configurable_component;
 
 use crate::config::{AcknowledgementsConfig, Input, SinkConfig, SinkContext};
 use crate::event::Event;
diff --git a/src/test_util/mock/sinks/basic.rs b/src/test_util/mock/sinks/basic.rs
index be772d7e6de38..d6af6ac66aaaa 100644
--- a/src/test_util/mock/sinks/basic.rs
+++ b/src/test_util/mock/sinks/basic.rs
@@ -2,7 +2,7 @@ use async_trait::async_trait;
 use futures_util::{stream::BoxStream, FutureExt, StreamExt};
 use snafu::Snafu;
 use tokio::sync::oneshot;
-use vector_config::configurable_component;
+use vector_lib::configurable::configurable_component;
 use vector_lib::finalization::Finalizable;
 use vector_lib::{
     config::{AcknowledgementsConfig, Input},
diff --git a/src/test_util/mock/sinks/error.rs b/src/test_util/mock/sinks/error.rs
index 94960d4f270cf..8b7bb585fbc4f 100644
--- a/src/test_util/mock/sinks/error.rs
+++ b/src/test_util/mock/sinks/error.rs
@@ -5,7 +5,7 @@ use std::{
 
 use async_trait::async_trait;
 use futures_util::{future::ok, FutureExt, Sink};
-use vector_config::configurable_component;
+use vector_lib::configurable::configurable_component;
 use vector_lib::{
     config::{AcknowledgementsConfig, Input},
     event::Event,
diff --git a/src/test_util/mock/sinks/oneshot.rs b/src/test_util/mock/sinks/oneshot.rs
index 045dc6d4e6f25..81a6089f0c1a6 100644
--- a/src/test_util/mock/sinks/oneshot.rs
+++ b/src/test_util/mock/sinks/oneshot.rs
@@ -3,7 +3,7 @@ use std::sync::{Arc, Mutex};
 use async_trait::async_trait;
 use futures_util::{stream::BoxStream, StreamExt};
 use tokio::sync::oneshot::Sender;
-use vector_config::configurable_component;
+use vector_lib::configurable::configurable_component;
 use vector_lib::{
     config::{AcknowledgementsConfig, Input},
     event::EventArray,
diff --git a/src/test_util/mock/sinks/panic.rs b/src/test_util/mock/sinks/panic.rs
index 75ba456fd10b3..4da861033ef27 100644
--- a/src/test_util/mock/sinks/panic.rs
+++ b/src/test_util/mock/sinks/panic.rs
@@ -5,7 +5,7 @@ use std::{
 
 use async_trait::async_trait;
 use futures_util::{future::ok, FutureExt, Sink};
-use vector_config::configurable_component;
+use vector_lib::configurable::configurable_component;
 use vector_lib::{
     config::{AcknowledgementsConfig, Input},
     event::Event,
diff --git a/src/test_util/mock/sources/backpressure.rs b/src/test_util/mock/sources/backpressure.rs
index 67598b87e42f6..46d66b3372eb0 100644
--- a/src/test_util/mock/sources/backpressure.rs
+++ b/src/test_util/mock/sources/backpressure.rs
@@ -5,7 +5,7 @@ use std::sync::{
 
 use async_trait::async_trait;
 use futures_util::FutureExt;
-use vector_config::configurable_component;
+use vector_lib::configurable::configurable_component;
 use vector_lib::{
     config::LogNamespace,
     event::{Event, LogEvent},
diff --git a/src/test_util/mock/sources/basic.rs b/src/test_util/mock/sources/basic.rs
index 7ec4b50939116..59310030a08db 100644
--- a/src/test_util/mock/sources/basic.rs
+++ b/src/test_util/mock/sources/basic.rs
@@ -5,7 +5,7 @@ use std::sync::{
 
 use async_trait::async_trait;
 use vector_buffers::topology::channel::{limited, LimitedReceiver};
-use vector_config::configurable_component;
+use vector_lib::configurable::configurable_component;
 use vector_lib::{config::LogNamespace, schema::Definition};
 use vector_lib::{
     config::{DataType, SourceOutput},
diff --git a/src/test_util/mock/sources/error.rs b/src/test_util/mock/sources/error.rs
index daedd17e9cdbf..b523dd6ef6718 100644
--- a/src/test_util/mock/sources/error.rs
+++ b/src/test_util/mock/sources/error.rs
@@ -1,7 +1,7 @@
 use async_trait::async_trait;
 use futures_util::{future::err, FutureExt};
-use vector_config::configurable_component;
 use vector_lib::config::LogNamespace;
+use vector_lib::configurable::configurable_component;
 use vector_lib::schema::Definition;
 use vector_lib::{
     config::{DataType, SourceOutput},
diff --git a/src/test_util/mock/sources/panic.rs b/src/test_util/mock/sources/panic.rs
index 2ca6cf402174f..c495ec250c1c3 100644
--- a/src/test_util/mock/sources/panic.rs
+++ b/src/test_util/mock/sources/panic.rs
@@ -1,6 +1,6 @@
 use async_trait::async_trait;
-use vector_config::configurable_component;
 use vector_lib::config::LogNamespace;
+use vector_lib::configurable::configurable_component;
 use vector_lib::schema::Definition;
 use vector_lib::{
     config::{DataType, SourceOutput},
diff --git a/src/test_util/mock/sources/tripwire.rs b/src/test_util/mock/sources/tripwire.rs
index 81b2cb05d84d8..e01d5f6d78620 100644
--- a/src/test_util/mock/sources/tripwire.rs
+++ b/src/test_util/mock/sources/tripwire.rs
@@ -3,8 +3,8 @@ use std::sync::{Arc, Mutex};
 use async_trait::async_trait;
 use futures_util::{future, FutureExt};
 use stream_cancel::{Trigger, Tripwire};
-use vector_config::configurable_component;
 use vector_lib::config::LogNamespace;
+use vector_lib::configurable::configurable_component;
 use vector_lib::schema::Definition;
 use vector_lib::{
     config::{DataType, SourceOutput},
diff --git a/src/test_util/mock/transforms/basic.rs b/src/test_util/mock/transforms/basic.rs
index 4aecc2398f76d..37f1291230152 100644
--- a/src/test_util/mock/transforms/basic.rs
+++ b/src/test_util/mock/transforms/basic.rs
@@ -1,8 +1,8 @@
 use std::collections::BTreeSet;
 
 use async_trait::async_trait;
-use vector_config::configurable_component;
 use vector_lib::config::LogNamespace;
+use vector_lib::configurable::configurable_component;
 use vector_lib::{
     config::{DataType, Input, TransformOutput},
     event::{
diff --git a/src/test_util/mock/transforms/error_definitions.rs b/src/test_util/mock/transforms/error_definitions.rs
index 2b9a4333589f3..b3062ab1280e2 100644
--- a/src/test_util/mock/transforms/error_definitions.rs
+++ b/src/test_util/mock/transforms/error_definitions.rs
@@ -1,6 +1,6 @@
 use async_trait::async_trait;
 use snafu::Snafu;
-use vector_config::configurable_component;
+use vector_lib::configurable::configurable_component;
 use vector_lib::{
     config::{DataType, Input, LogNamespace, TransformOutput},
     schema::Definition,
diff --git a/src/test_util/mock/transforms/mod.rs b/src/test_util/mock/transforms/mod.rs
index 57f558aa0f2e4..ca5bba30be961 100644
--- a/src/test_util/mock/transforms/mod.rs
+++ b/src/test_util/mock/transforms/mod.rs
@@ -1,4 +1,4 @@
-use vector_config::configurable_component;
+use vector_lib::configurable::configurable_component;
 
 mod basic;
 pub use self::basic::BasicTransformConfig;
diff --git a/src/test_util/mock/transforms/noop.rs b/src/test_util/mock/transforms/noop.rs
index 7e19e020602ef..a9285a28b7cbd 100644
--- a/src/test_util/mock/transforms/noop.rs
+++ b/src/test_util/mock/transforms/noop.rs
@@ -2,8 +2,8 @@ use std::pin::Pin;
 
 use async_trait::async_trait;
 use futures_util::Stream;
-use vector_config::configurable_component;
 use vector_lib::config::LogNamespace;
+use vector_lib::configurable::configurable_component;
 use vector_lib::{
     config::{DataType, Input, TransformOutput},
     event::{Event, EventContainer},
diff --git a/src/transforms/aggregate.rs b/src/transforms/aggregate.rs
index 3b6c78988a1c5..8255eb4f45f9d 100644
--- a/src/transforms/aggregate.rs
+++ b/src/transforms/aggregate.rs
@@ -6,8 +6,8 @@ use std::{
 
 use async_stream::stream;
 use futures::{Stream, StreamExt};
-use vector_config::configurable_component;
 use vector_lib::config::LogNamespace;
+use vector_lib::configurable::configurable_component;
 
 use crate::{
     config::{DataType, Input, OutputId, TransformConfig, TransformContext, TransformOutput},
diff --git a/src/transforms/aws_ec2_metadata.rs b/src/transforms/aws_ec2_metadata.rs
index 995fbafe9b4c5..56ea9a0b92e45 100644
--- a/src/transforms/aws_ec2_metadata.rs
+++ b/src/transforms/aws_ec2_metadata.rs
@@ -14,8 +14,8 @@ use serde_with::serde_as;
 use snafu::ResultExt as _;
 use tokio::time::{sleep, Duration, Instant};
 use tracing::Instrument;
-use vector_config::configurable_component;
 use vector_lib::config::LogNamespace;
+use vector_lib::configurable::configurable_component;
 use vrl::value::kind::Collection;
 use vrl::value::Kind;
 
diff --git a/src/transforms/dedupe.rs b/src/transforms/dedupe.rs
index 16794b5ff8f78..a159998d8c8ff 100644
--- a/src/transforms/dedupe.rs
+++ b/src/transforms/dedupe.rs
@@ -4,8 +4,8 @@ use bytes::Bytes;
 use futures::{Stream, StreamExt};
 use lookup::lookup_v2::ConfigTargetPath;
 use lru::LruCache;
-use vector_config::configurable_component;
 use vector_lib::config::{clone_input_definitions, LogNamespace};
+use vector_lib::configurable::configurable_component;
 use vrl::path::OwnedTargetPath;
 
 use crate::{
diff --git a/src/transforms/filter.rs b/src/transforms/filter.rs
index ec6013d18037c..2c431f06cc3a8 100644
--- a/src/transforms/filter.rs
+++ b/src/transforms/filter.rs
@@ -1,5 +1,5 @@
-use vector_config::configurable_component;
 use vector_lib::config::{clone_input_definitions, LogNamespace};
+use vector_lib::configurable::configurable_component;
 use vector_lib::internal_event::{Count, InternalEventHandle as _, Registered};
 
 use crate::{
diff --git a/src/transforms/log_to_metric.rs b/src/transforms/log_to_metric.rs
index 95e6a7f25cc57..b2448dde6ae07 100644
--- a/src/transforms/log_to_metric.rs
+++ b/src/transforms/log_to_metric.rs
@@ -3,7 +3,7 @@ use std::{collections::HashMap, num::ParseFloatError};
 
 use chrono::Utc;
 use indexmap::IndexMap;
-use vector_config::configurable_component;
+use vector_lib::configurable::configurable_component;
 use vector_lib::{config::LogNamespace, event::DatadogMetricOriginMetadata};
 use vrl::path::parse_target_path;
 
diff --git a/src/transforms/lua/mod.rs b/src/transforms/lua/mod.rs
index b3b543162fa3c..e6fd152bfaf96 100644
--- a/src/transforms/lua/mod.rs
+++ b/src/transforms/lua/mod.rs
@@ -1,8 +1,8 @@
 pub mod v1;
 pub mod v2;
 
-use vector_config::configurable_component;
 use vector_lib::config::{ComponentKey, LogNamespace};
+use vector_lib::configurable::configurable_component;
 
 use crate::{
     config::{GenerateConfig, Input, OutputId, TransformConfig, TransformContext, TransformOutput},
diff --git a/src/transforms/lua/v1/mod.rs b/src/transforms/lua/v1/mod.rs
index 5fb82cf9610a3..b329cd732a4a8 100644
--- a/src/transforms/lua/v1/mod.rs
+++ b/src/transforms/lua/v1/mod.rs
@@ -5,7 +5,7 @@ use mlua::ExternalError;
 use mlua::FromLua;
 use ordered_float::NotNan;
 use snafu::{ResultExt, Snafu};
-use vector_config::configurable_component;
+use vector_lib::configurable::configurable_component;
 use vrl::path::parse_target_path;
 
 use crate::config::OutputId;
diff --git a/src/transforms/lua/v2/mod.rs b/src/transforms/lua/v2/mod.rs
index d4be1e88ab6aa..e2f60bc5c9c48 100644
--- a/src/transforms/lua/v2/mod.rs
+++ b/src/transforms/lua/v2/mod.rs
@@ -3,7 +3,7 @@ use std::{path::PathBuf, sync::Arc, time::Duration};
 use codecs::MetricTagValues;
 use serde_with::serde_as;
 use snafu::{ResultExt, Snafu};
-use vector_config::configurable_component;
+use vector_lib::configurable::configurable_component;
 pub use vector_lib::event::lua;
 use vector_lib::transform::runtime_transform::{RuntimeTransform, Timer};
 
diff --git a/src/transforms/metric_to_log.rs b/src/transforms/metric_to_log.rs
index ac67ba0850e8b..082af69b84c1c 100644
--- a/src/transforms/metric_to_log.rs
+++ b/src/transforms/metric_to_log.rs
@@ -3,8 +3,8 @@ use codecs::MetricTagValues;
 use lookup::{event_path, owned_value_path, path, PathPrefix};
 use serde_json::Value;
 use std::collections::{BTreeMap, BTreeSet};
-use vector_config::configurable_component;
 use vector_lib::config::LogNamespace;
+use vector_lib::configurable::configurable_component;
 use vector_lib::TimeZone;
 use vrl::path::OwnedValuePath;
 use vrl::value::kind::Collection;
diff --git a/src/transforms/reduce/merge_strategy.rs b/src/transforms/reduce/merge_strategy.rs
index e7ddd9cd80386..2580636f09cec 100644
--- a/src/transforms/reduce/merge_strategy.rs
+++ b/src/transforms/reduce/merge_strategy.rs
@@ -3,7 +3,7 @@ use std::collections::HashSet;
 use bytes::{Bytes, BytesMut};
 use chrono::{DateTime, Utc};
 use ordered_float::NotNan;
-use vector_config::configurable_component;
+use vector_lib::configurable::configurable_component;
 use vrl::event_path;
 
 use crate::event::{LogEvent, Value};
diff --git a/src/transforms/reduce/mod.rs b/src/transforms/reduce/mod.rs
index c8d0d851f1aeb..4d99c5cd650f9 100644
--- a/src/transforms/reduce/mod.rs
+++ b/src/transforms/reduce/mod.rs
@@ -10,7 +10,7 @@ use std::{
     pin::Pin,
     time::{Duration, Instant},
 };
-use vector_config::configurable_component;
+use vector_lib::configurable::configurable_component;
 
 use crate::config::OutputId;
 use crate::{
diff --git a/src/transforms/remap.rs b/src/transforms/remap.rs
index bd2535f011c0b..099aaf0ccc9fc 100644
--- a/src/transforms/remap.rs
+++ b/src/transforms/remap.rs
@@ -9,9 +9,9 @@ use std::{
 use codecs::MetricTagValues;
 use lookup::{metadata_path, owned_value_path, PathPrefix};
 use snafu::{ResultExt, Snafu};
-use vector_config::configurable_component;
 use vector_lib::compile_vrl;
 use vector_lib::config::LogNamespace;
+use vector_lib::configurable::configurable_component;
 use vector_lib::schema::Definition;
 use vector_lib::TimeZone;
 use vector_vrl_functions::set_semantic_meaning::MeaningList;
diff --git a/src/transforms/route.rs b/src/transforms/route.rs
index 4370a098e6a69..c1f17345f4584 100644
--- a/src/transforms/route.rs
+++ b/src/transforms/route.rs
@@ -1,6 +1,6 @@
 use indexmap::IndexMap;
-use vector_config::configurable_component;
 use vector_lib::config::{clone_input_definitions, LogNamespace};
+use vector_lib::configurable::configurable_component;
 use vector_lib::transform::SyncTransform;
 
 use crate::{
diff --git a/src/transforms/sample.rs b/src/transforms/sample.rs
index 5e51e063f3209..240cf03108f22 100644
--- a/src/transforms/sample.rs
+++ b/src/transforms/sample.rs
@@ -1,5 +1,5 @@
-use vector_config::configurable_component;
 use vector_lib::config::{LegacyKey, LogNamespace};
+use vector_lib::configurable::configurable_component;
 use vrl::value::Kind;
 use vrl::{event_path, owned_value_path};
 
diff --git a/src/transforms/tag_cardinality_limit/config.rs b/src/transforms/tag_cardinality_limit/config.rs
index e4ede27afb734..4864fc2abc6cc 100644
--- a/src/transforms/tag_cardinality_limit/config.rs
+++ b/src/transforms/tag_cardinality_limit/config.rs
@@ -6,8 +6,8 @@ use crate::config::{
 use crate::schema;
 use crate::transforms::tag_cardinality_limit::TagCardinalityLimit;
 use crate::transforms::Transform;
-use vector_config::configurable_component;
 use vector_lib::config::LogNamespace;
+use vector_lib::configurable::configurable_component;
 
 /// Configuration for the `tag_cardinality_limit` transform.
 #[configurable_component(transform(
diff --git a/src/transforms/throttle.rs b/src/transforms/throttle.rs
index dff11c6f50bdd..c1e12e0fd5eaa 100644
--- a/src/transforms/throttle.rs
+++ b/src/transforms/throttle.rs
@@ -5,8 +5,8 @@ use futures::{Stream, StreamExt};
 use governor::{clock, Quota, RateLimiter};
 use serde_with::serde_as;
 use snafu::Snafu;
-use vector_config::configurable_component;
 use vector_lib::config::{clone_input_definitions, LogNamespace};
+use vector_lib::configurable::configurable_component;
 
 use crate::{
     conditions::{AnyCondition, Condition},

From e7b563d1955a0acc350364aba90e5dcd8c7b3c6e Mon Sep 17 00:00:00 2001
From: Doug Smith <dsmith3197@users.noreply.github.com>
Date: Thu, 26 Oct 2023 17:39:39 -0400
Subject: [PATCH 21/28] enhancement(nats source): add subscriber_capacity
 option (#18899)

* enhancement(nats source): add subscriber_capacity option

* feedback and fix tests
---
 src/sources/nats.rs                           | 30 +++++++++++++++++++
 .../components/sources/base/nats.cue          | 14 +++++++++
 2 files changed, 44 insertions(+)

diff --git a/src/sources/nats.rs b/src/sources/nats.rs
index 7337d35cc676c..0f5a4613c19e8 100644
--- a/src/sources/nats.rs
+++ b/src/sources/nats.rs
@@ -97,12 +97,28 @@ pub struct NatsSourceConfig {
     /// The `NATS` subject key.
     #[serde(default = "default_subject_key_field")]
     subject_key_field: OptionalValuePath,
+
+    /// The buffer capacity of the underlying NATS subscriber.
+    ///
+    /// This value determines how many messages the NATS subscriber buffers
+    /// before incoming messages are dropped.
+    ///
+    /// See the [async_nats documentation][async_nats_subscription_capacity] for more information.
+    ///
+    /// [async_nats_subscription_capacity]: https://docs.rs/async-nats/latest/async_nats/struct.ConnectOptions.html#method.subscription_capacity
+    #[serde(default = "default_subscription_capacity")]
+    #[derivative(Default(value = "default_subscription_capacity()"))]
+    subscriber_capacity: usize,
 }
 
 fn default_subject_key_field() -> OptionalValuePath {
     OptionalValuePath::from(owned_value_path!("subject"))
 }
 
+const fn default_subscription_capacity() -> usize {
+    4096
+}
+
 impl GenerateConfig for NatsSourceConfig {
     fn generate_config() -> toml::Value {
         toml::from_str(
@@ -178,6 +194,7 @@ impl TryFrom<&NatsSourceConfig> for async_nats::ConnectOptions {
 
     fn try_from(config: &NatsSourceConfig) -> Result<Self, Self::Error> {
         from_tls_auth_config(&config.connection_name, &config.auth, &config.tls)
+            .map(|options| options.subscription_capacity(config.subscriber_capacity))
     }
 }
 
@@ -415,6 +432,7 @@ mod integration_tests {
             auth: None,
             log_namespace: None,
             subject_key_field: default_subject_key_field(),
+            ..Default::default()
         };
 
         let r = publish_and_check(conf).await;
@@ -447,6 +465,7 @@ mod integration_tests {
             }),
             log_namespace: None,
             subject_key_field: default_subject_key_field(),
+            ..Default::default()
         };
 
         let r = publish_and_check(conf).await;
@@ -479,6 +498,7 @@ mod integration_tests {
             }),
             log_namespace: None,
             subject_key_field: default_subject_key_field(),
+            ..Default::default()
         };
 
         let r = publish_and_check(conf).await;
@@ -510,6 +530,7 @@ mod integration_tests {
             }),
             log_namespace: None,
             subject_key_field: default_subject_key_field(),
+            ..Default::default()
         };
 
         let r = publish_and_check(conf).await;
@@ -541,6 +562,7 @@ mod integration_tests {
             }),
             log_namespace: None,
             subject_key_field: default_subject_key_field(),
+            ..Default::default()
         };
 
         let r = publish_and_check(conf).await;
@@ -573,6 +595,7 @@ mod integration_tests {
             }),
             log_namespace: None,
             subject_key_field: default_subject_key_field(),
+            ..Default::default()
         };
 
         let r = publish_and_check(conf).await;
@@ -605,6 +628,7 @@ mod integration_tests {
             }),
             log_namespace: None,
             subject_key_field: default_subject_key_field(),
+            ..Default::default()
         };
 
         let r = publish_and_check(conf).await;
@@ -638,6 +662,7 @@ mod integration_tests {
             auth: None,
             log_namespace: None,
             subject_key_field: default_subject_key_field(),
+            ..Default::default()
         };
 
         let r = publish_and_check(conf).await;
@@ -665,6 +690,7 @@ mod integration_tests {
             auth: None,
             log_namespace: None,
             subject_key_field: default_subject_key_field(),
+            ..Default::default()
         };
 
         let r = publish_and_check(conf).await;
@@ -700,6 +726,7 @@ mod integration_tests {
             auth: None,
             log_namespace: None,
             subject_key_field: default_subject_key_field(),
+            ..Default::default()
         };
 
         let r = publish_and_check(conf).await;
@@ -733,6 +760,7 @@ mod integration_tests {
             auth: None,
             log_namespace: None,
             subject_key_field: default_subject_key_field(),
+            ..Default::default()
         };
 
         let r = publish_and_check(conf).await;
@@ -770,6 +798,7 @@ mod integration_tests {
             }),
             log_namespace: None,
             subject_key_field: default_subject_key_field(),
+            ..Default::default()
         };
 
         let r = publish_and_check(conf).await;
@@ -807,6 +836,7 @@ mod integration_tests {
             }),
             log_namespace: None,
             subject_key_field: default_subject_key_field(),
+            ..Default::default()
         };
 
         let r = publish_and_check(conf).await;
diff --git a/website/cue/reference/components/sources/base/nats.cue b/website/cue/reference/components/sources/base/nats.cue
index 81bc4bdca5b86..21d814c94df9f 100644
--- a/website/cue/reference/components/sources/base/nats.cue
+++ b/website/cue/reference/components/sources/base/nats.cue
@@ -345,6 +345,20 @@ base: components: sources: nats: configuration: {
 		required:    false
 		type: string: default: "subject"
 	}
+	subscriber_capacity: {
+		description: """
+			The buffer capacity of the underlying NATS subscriber.
+
+			This value determines how many messages the NATS subscriber buffers
+			before incoming messages are dropped.
+
+			See the [async_nats documentation][async_nats_subscription_capacity] for more information.
+
+			[async_nats_subscription_capacity]: https://docs.rs/async-nats/latest/async_nats/struct.ConnectOptions.html#method.subscription_capacity
+			"""
+		required: false
+		type: uint: default: 4096
+	}
 	tls: {
 		description: "Configures the TLS options for incoming/outgoing connections."
 		required:    false

From c6f5d2b62520cb6b9b923e029298c1e794011a3f Mon Sep 17 00:00:00 2001
From: Doug Smith <dsmith3197@users.noreply.github.com>
Date: Thu, 26 Oct 2023 18:07:23 -0400
Subject: [PATCH 22/28] chore(observability)!: remove deprecated
 `component_name` metric tag (#18942)

* chore(datadog)!: remove deprecated config options

* update cue and add upgrade guide

* Update website/content/en/highlights/2023-11-07-0-34-0-upgrade-guide.md

Co-authored-by: Jesse Szwedko <jesse.szwedko@datadoghq.com>

* chore(observability)!: remove deprecated `component_name` metric tag

* remove remaining references

---------

Co-authored-by: Jesse Szwedko <jesse.szwedko@datadoghq.com>
---
 lib/vector-core/src/metrics/label_filter.rs            |  1 -
 src/config/source.rs                                   |  2 +-
 src/topology/builder.rs                                | 10 ----------
 src/topology/running.rs                                |  6 ------
 .../en/highlights/2023-11-07-0-34-0-upgrade-guide.md   |  5 +++++
 .../reference/components/sources/internal_metrics.cue  |  6 ------
 6 files changed, 6 insertions(+), 24 deletions(-)

diff --git a/lib/vector-core/src/metrics/label_filter.rs b/lib/vector-core/src/metrics/label_filter.rs
index 1f6d5283e548f..48cb1513752ac 100644
--- a/lib/vector-core/src/metrics/label_filter.rs
+++ b/lib/vector-core/src/metrics/label_filter.rs
@@ -10,7 +10,6 @@ impl LabelFilter for VectorLabelFilter {
         key == "component_id"
             || key == "component_type"
             || key == "component_kind"
-            || key == "component_name"
             || key == "buffer_type"
     }
 }
diff --git a/src/config/source.rs b/src/config/source.rs
index b700a93f650e5..c67eb45915a11 100644
--- a/src/config/source.rs
+++ b/src/config/source.rs
@@ -181,7 +181,7 @@ impl SourceContext {
         if config.enabled() {
             warn!(
                 message = "Enabling `acknowledgements` on sources themselves is deprecated in favor of enabling them in the sink configuration, and will be removed in a future version.",
-                component_name = self.key.id(),
+                component_id = self.key.id(),
             );
         }
 
diff --git a/src/topology/builder.rs b/src/topology/builder.rs
index dc8f268258b1c..73ece17c2fa11 100644
--- a/src/topology/builder.rs
+++ b/src/topology/builder.rs
@@ -219,8 +219,6 @@ impl<'a> Builder<'a> {
                 component_kind = "source",
                 component_id = %key.id(),
                 component_type = %source.inner.get_component_name(),
-                // maintained for compatibility
-                component_name = %key.id(),
             );
             let _entered_span = span.enter();
 
@@ -428,8 +426,6 @@ impl<'a> Builder<'a> {
                 component_kind = "transform",
                 component_id = %key.id(),
                 component_type = %transform.inner.get_component_name(),
-                // maintained for compatibility
-                component_name = %key.id(),
             );
 
             // Create a map of the outputs to the list of possible definitions from those outputs.
@@ -514,8 +510,6 @@ impl<'a> Builder<'a> {
                 component_kind = "sink",
                 component_id = %key.id(),
                 component_type = %sink.inner.get_component_name(),
-                // maintained for compatibility
-                component_name = %key.id(),
             );
             let _entered_span = span.enter();
 
@@ -634,8 +628,6 @@ impl<'a> Builder<'a> {
                                     component_kind = "sink",
                                     component_type = typetag,
                                     component_id = %component_key.id(),
-                                    // maintained for compatibility
-                                    component_name = %component_key.id(),
                                 );
                                 Err(TaskError::wrapped(error))
                             }
@@ -645,8 +637,6 @@ impl<'a> Builder<'a> {
                                     component_kind = "sink",
                                     component_type = typetag,
                                     component_id = %component_key.id(),
-                                    // maintained for compatibility
-                                    component_name = %component_key.id(),
                                 );
                                 Err(TaskError::wrapped(Box::new(e)))
                             }
diff --git a/src/topology/running.rs b/src/topology/running.rs
index e7e65a7cae092..aaee1a5eddbdf 100644
--- a/src/topology/running.rs
+++ b/src/topology/running.rs
@@ -845,8 +845,6 @@ impl RunningTopology {
             component_kind = "sink",
             component_id = %task.id(),
             component_type = %task.typetag(),
-            // maintained for compatibility
-            component_name = %task.id(),
         );
 
         let task_span = span.or_current();
@@ -888,8 +886,6 @@ impl RunningTopology {
             component_kind = "transform",
             component_id = %task.id(),
             component_type = %task.typetag(),
-            // maintained for compatibility
-            component_name = %task.id(),
         );
 
         let task_span = span.or_current();
@@ -931,8 +927,6 @@ impl RunningTopology {
             component_kind = "source",
             component_id = %task.id(),
             component_type = %task.typetag(),
-            // maintained for compatibility
-            component_name = %task.id(),
         );
 
         let task_span = span.or_current();
diff --git a/website/content/en/highlights/2023-11-07-0-34-0-upgrade-guide.md b/website/content/en/highlights/2023-11-07-0-34-0-upgrade-guide.md
index 318f7cf5513d0..96ec22414075b 100644
--- a/website/content/en/highlights/2023-11-07-0-34-0-upgrade-guide.md
+++ b/website/content/en/highlights/2023-11-07-0-34-0-upgrade-guide.md
@@ -12,6 +12,7 @@ badges:
 Vector's 0.34.0 release includes **breaking changes**:
 
 1. [Removal of Deprecated Datadog Component Config Options](#datadog-deprecated-config-options)
+1. [Removal of Deprecated `component_name` Metric Tag](#deprecated-component-name)
 
 We cover them below to help you upgrade quickly:
 
@@ -26,3 +27,7 @@ and Metrics sinks. Instead the `site` option should be used.
 
 The `region` and `application_key` config options have
 been removed from the Enterprise configuration. Instead of `region`, `site` should be used. `application_key` is no longer required.
+
+#### Removal of Deprecated `component_name` Metric Tag {#deprecated-component-name}
+
+The deprecated `component_name` tag has been removed from all internal metrics. Instead the `component_id` tag should be used.
diff --git a/website/cue/reference/components/sources/internal_metrics.cue b/website/cue/reference/components/sources/internal_metrics.cue
index e399573e7d91a..8a0bc527cddc3 100644
--- a/website/cue/reference/components/sources/internal_metrics.cue
+++ b/website/cue/reference/components/sources/internal_metrics.cue
@@ -1094,7 +1094,6 @@ components: sources: internal_metrics: {
 		_component_tags: _internal_metrics_tags & {
 			component_kind: _component_kind
 			component_id:   _component_id
-			component_name: _component_name
 			component_type: _component_type
 		}
 
@@ -1117,11 +1116,6 @@ components: sources: internal_metrics: {
 			required:    true
 			examples: ["my_source", "my_sink"]
 		}
-		_component_name: {
-			description: "Deprecated, use `component_id` instead. The value is the same as `component_id`."
-			required:    true
-			examples: ["my_source", "my_sink"]
-		}
 		_component_type: {
 			description: "The Vector component type."
 			required:    true

From 73afddb4292b113f659e9dc82d3d32d8ff3bf98d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 26 Oct 2023 23:05:54 +0000
Subject: [PATCH 23/28] chore(deps): Bump serde from 1.0.189 to 1.0.190
 (#18945)

Bumps [serde](https://github.com/serde-rs/serde) from 1.0.189 to 1.0.190.
- [Release notes](https://github.com/serde-rs/serde/releases)
- [Commits](https://github.com/serde-rs/serde/compare/v1.0.189...v1.0.190)

---
updated-dependencies:
- dependency-name: serde
  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>
---
 Cargo.lock                          | 8 ++++----
 Cargo.toml                          | 2 +-
 lib/vector-api-client/Cargo.toml    | 2 +-
 lib/vector-buffers/Cargo.toml       | 2 +-
 lib/vector-common/Cargo.toml        | 2 +-
 lib/vector-config-macros/Cargo.toml | 2 +-
 lib/vector-core/Cargo.toml          | 2 +-
 lib/vector-lookup/Cargo.toml        | 2 +-
 8 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index b3fe498a51624..df1ca88d028c0 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -7800,9 +7800,9 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
 
 [[package]]
 name = "serde"
-version = "1.0.189"
+version = "1.0.190"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e422a44e74ad4001bdc8eede9a4570ab52f71190e9c076d14369f38b9200537"
+checksum = "91d3c334ca1ee894a2c6f6ad698fe8c435b76d504b13d436f0685d648d6d96f7"
 dependencies = [
  "serde_derive",
 ]
@@ -7848,9 +7848,9 @@ dependencies = [
 
 [[package]]
 name = "serde_derive"
-version = "1.0.189"
+version = "1.0.190"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e48d1f918009ce3145511378cf68d613e3b3d9137d67272562080d68a2b32d5"
+checksum = "67c5609f394e5c2bd7fc51efda478004ea80ef42fee983d5c67a65e34f32c0e3"
 dependencies = [
  "proc-macro2 1.0.69",
  "quote 1.0.33",
diff --git a/Cargo.toml b/Cargo.toml
index 9ca6ef0b2d279..772e06282ff63 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -200,7 +200,7 @@ opendal = {version = "0.38", default-features = false, features = ["native-tls",
 tower = { version = "0.4.13", default-features = false, features = ["buffer", "limit", "retry", "timeout", "util", "balance", "discover"] }
 tower-http = { version = "0.4.4", default-features = false, features = ["decompression-gzip"]}
 # Serde
-serde = { version = "1.0.189", default-features = false, features = ["derive"] }
+serde = { version = "1.0.190", default-features = false, features = ["derive"] }
 serde-toml-merge = { version = "0.3.3", default-features = false }
 serde_bytes = { version = "0.11.12", default-features = false, features = ["std"], optional = true }
 serde_json = { version = "1.0.107", default-features = false, features = ["raw_value"] }
diff --git a/lib/vector-api-client/Cargo.toml b/lib/vector-api-client/Cargo.toml
index 2a408c0c74bb0..16325ba1958ee 100644
--- a/lib/vector-api-client/Cargo.toml
+++ b/lib/vector-api-client/Cargo.toml
@@ -9,7 +9,7 @@ license = "MPL-2.0"
 [dependencies]
 
 # Serde
-serde = { version = "1.0.189", default-features = false, features = ["derive"] }
+serde = { version = "1.0.190", default-features = false, features = ["derive"] }
 serde_json = { version = "1.0.107", default-features = false, features = ["raw_value"] }
 
 # Error handling
diff --git a/lib/vector-buffers/Cargo.toml b/lib/vector-buffers/Cargo.toml
index 5e1938772f0b0..e510262b25bf5 100644
--- a/lib/vector-buffers/Cargo.toml
+++ b/lib/vector-buffers/Cargo.toml
@@ -21,7 +21,7 @@ metrics = "0.21.1"
 num-traits = { version = "0.2.17", default-features = false }
 pin-project.workspace = true
 rkyv = { version = "0.7.40", default-features = false, features = ["size_32", "std", "strict", "validation"] }
-serde = { version = "1.0.189", default-features = false, features = ["derive"] }
+serde = { version = "1.0.190", default-features = false, features = ["derive"] }
 snafu = { version = "0.7.5", default-features = false, features = ["std"] }
 tokio-util = { version = "0.7.0", default-features = false }
 tokio = { version = "1.33.0", default-features = false, features = ["rt", "macros", "rt-multi-thread", "sync", "fs", "io-util", "time"] }
diff --git a/lib/vector-common/Cargo.toml b/lib/vector-common/Cargo.toml
index 3da6dd52c3e2f..3bc10071b859b 100644
--- a/lib/vector-common/Cargo.toml
+++ b/lib/vector-common/Cargo.toml
@@ -56,7 +56,7 @@ paste = "1.0.14"
 pin-project.workspace = true
 ryu = { version = "1", default-features = false }
 serde_json = { version = "1.0.107", default-features = false, features = ["std", "raw_value"] }
-serde = { version = "1.0.189", optional = true, features = ["derive"] }
+serde = { version = "1.0.190", optional = true, features = ["derive"] }
 smallvec = { version = "1", default-features = false }
 snafu = { version = "0.7", optional = true }
 stream-cancel = { version = "0.8.1", default-features = false }
diff --git a/lib/vector-config-macros/Cargo.toml b/lib/vector-config-macros/Cargo.toml
index c8fc6d64e967b..c3de4173ec567 100644
--- a/lib/vector-config-macros/Cargo.toml
+++ b/lib/vector-config-macros/Cargo.toml
@@ -16,5 +16,5 @@ syn = { version = "2.0", default-features = false, features = ["full", "extra-tr
 vector-config-common = { path = "../vector-config-common" }
 
 [dev-dependencies]
-serde = { version = "1.0.189", default-features = false }
+serde = { version = "1.0.190", default-features = false }
 vector-config = { path = "../vector-config" }
diff --git a/lib/vector-core/Cargo.toml b/lib/vector-core/Cargo.toml
index cdc0d5f8d1ae7..9c30aafaab6f0 100644
--- a/lib/vector-core/Cargo.toml
+++ b/lib/vector-core/Cargo.toml
@@ -40,7 +40,7 @@ prost = { version = "0.12", default-features = false, features = ["std"] }
 quanta = { version = "0.12.0", default-features = false }
 regex = { version = "1.10.2", default-features = false, features = ["std", "perf"] }
 ryu = { version = "1", default-features = false }
-serde = { version = "1.0.189", default-features = false, features = ["derive", "rc"] }
+serde = { version = "1.0.190", default-features = false, features = ["derive", "rc"] }
 serde_json = { version = "1.0.107", default-features = false }
 serde_with = { version = "3.4.0", default-features = false, features = ["std", "macros"] }
 smallvec = { version = "1", default-features = false, features = ["serde", "const_generics"] }
diff --git a/lib/vector-lookup/Cargo.toml b/lib/vector-lookup/Cargo.toml
index 77dd89e0c134a..2d2c28475e011 100644
--- a/lib/vector-lookup/Cargo.toml
+++ b/lib/vector-lookup/Cargo.toml
@@ -7,7 +7,7 @@ publish = false
 license = "MPL-2.0"
 
 [dependencies]
-serde = { version = "1.0.189", default-features = false, features = ["derive", "alloc"] }
+serde = { version = "1.0.190", default-features = false, features = ["derive", "alloc"] }
 vector-config = { path = "../vector-config" }
 vector-config-macros = { path = "../vector-config-macros" }
 vrl.workspace = true

From 4a525a833432ce340e00e174b769ec8ab9a38abb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 26 Oct 2023 23:06:09 +0000
Subject: [PATCH 24/28] chore(deps): Bump toml from 0.8.4 to 0.8.5 (#18950)

Bumps [toml](https://github.com/toml-rs/toml) from 0.8.4 to 0.8.5.
- [Commits](https://github.com/toml-rs/toml/compare/toml-v0.8.4...toml-v0.8.5)

---
updated-dependencies:
- dependency-name: toml
  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>
---
 Cargo.lock                   | 20 ++++++++++----------
 Cargo.toml                   |  2 +-
 lib/vector-config/Cargo.toml |  2 +-
 lib/vector-core/Cargo.toml   |  4 ++--
 vdev/Cargo.toml              |  2 +-
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index df1ca88d028c0..ff384663f9f75 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1872,7 +1872,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e3f9629bc6c4388ea699781dc988c2b99766d7679b151c81990b4fa1208fafd3"
 dependencies = [
  "serde",
- "toml 0.8.4",
+ "toml 0.8.5",
 ]
 
 [[package]]
@@ -7813,7 +7813,7 @@ version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "af5ae5f42c16d60b098ae5d4afd75c1d3b6512e6ca5d0b9b916e2ced30df264c"
 dependencies = [
- "toml 0.8.4",
+ "toml 0.8.5",
 ]
 
 [[package]]
@@ -8936,9 +8936,9 @@ dependencies = [
 
 [[package]]
 name = "toml"
-version = "0.8.4"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2ef75d881185fd2df4a040793927c153d863651108a93c7e17a9e591baa95cc6"
+checksum = "3efaf127c78d5339cc547cce4e4d973bd5e4f56e949a06d091c082ebeef2f800"
 dependencies = [
  "serde",
  "serde_spanned",
@@ -8957,9 +8957,9 @@ dependencies = [
 
 [[package]]
 name = "toml_edit"
-version = "0.20.4"
+version = "0.20.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "380f9e8120405471f7c9ad1860a713ef5ece6a670c7eae39225e477340f32fc4"
+checksum = "782bf6c2ddf761c1e7855405e8975472acf76f7f36d0d4328bd3b7a2fae12a85"
 dependencies = [
  "indexmap 2.0.2",
  "serde",
@@ -9672,7 +9672,7 @@ dependencies = [
  "serde_yaml 0.9.25",
  "sha2",
  "tempfile",
- "toml 0.8.4",
+ "toml 0.8.5",
 ]
 
 [[package]]
@@ -9848,7 +9848,7 @@ dependencies = [
  "tokio-test",
  "tokio-tungstenite",
  "tokio-util",
- "toml 0.8.4",
+ "toml 0.8.5",
  "tonic 0.10.2",
  "tonic-build 0.10.2",
  "tower",
@@ -9992,7 +9992,7 @@ dependencies = [
  "serde_json",
  "serde_with 3.4.0",
  "snafu",
- "toml 0.8.4",
+ "toml 0.8.5",
  "tracing 0.1.37",
  "url",
  "vector-config-common",
@@ -10093,7 +10093,7 @@ dependencies = [
  "tokio-stream",
  "tokio-test",
  "tokio-util",
- "toml 0.8.4",
+ "toml 0.8.5",
  "tonic 0.10.2",
  "tracing 0.1.37",
  "tracing-core 0.1.30",
diff --git a/Cargo.toml b/Cargo.toml
index 772e06282ff63..578ee56dfdeb1 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -321,7 +321,7 @@ syslog = { version = "6.1.0", default-features = false, optional = true }
 tikv-jemallocator = { version = "0.5.4", default-features = false, optional = true }
 tokio-postgres = { version = "0.7.10", default-features = false, features = ["runtime", "with-chrono-0_4"], optional = true }
 tokio-tungstenite = {version = "0.20.1", default-features = false, features = ["connect"], optional = true}
-toml = { version = "0.8.4", default-features = false, features = ["parse", "display"] }
+toml = { version = "0.8.5", default-features = false, features = ["parse", "display"] }
 tonic = { version = "0.10", optional = true, default-features = false, features = ["transport", "codegen", "prost", "tls", "tls-roots", "gzip"] }
 trust-dns-proto = { version = "0.23.2", default-features = false, features = ["dnssec"], optional = true }
 typetag = { version = "0.2.13", default-features = false }
diff --git a/lib/vector-config/Cargo.toml b/lib/vector-config/Cargo.toml
index 3011248797838..e84205723d300 100644
--- a/lib/vector-config/Cargo.toml
+++ b/lib/vector-config/Cargo.toml
@@ -22,7 +22,7 @@ serde = { version = "1.0", default-features = false }
 serde_json = { version = "1.0", default-features = false, features = ["std"] }
 serde_with = { version = "3.4.0", default-features = false, features = ["std"] }
 snafu = { version = "0.7.5", default-features = false }
-toml = { version = "0.8.4", default-features = false }
+toml = { version = "0.8.5", default-features = false }
 tracing = { version = "0.1.34", default-features = false }
 url = { version = "2.4.1", default-features = false, features = ["serde"] }
 http = { version = "0.2.9", default-features = false }
diff --git a/lib/vector-core/Cargo.toml b/lib/vector-core/Cargo.toml
index 9c30aafaab6f0..535c4e51e4483 100644
--- a/lib/vector-core/Cargo.toml
+++ b/lib/vector-core/Cargo.toml
@@ -50,7 +50,7 @@ tokio = { version = "1.33.0", default-features = false, features = ["net"] }
 tokio-openssl = { version = "0.6.3", 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"] }
-toml = { version = "0.8.4", default-features = false }
+toml = { version = "0.8.5", default-features = false }
 tonic = { version = "0.10", default-features = false, features = ["transport"] }
 tracing = { version = "0.1.34", default-features = false }
 tracing-core = { version = "0.1.26", default-features = false }
@@ -83,7 +83,7 @@ quickcheck_macros = "1"
 proptest = "1.3"
 similar-asserts = "1.5.0"
 tokio-test = "0.4.3"
-toml = { version = "0.8.4", default-features = false, features = ["parse"] }
+toml = { version = "0.8.5", default-features = false, features = ["parse"] }
 ndarray = "0.15.6"
 ndarray-stats = "0.5.1"
 noisy_float = "0.2.0"
diff --git a/vdev/Cargo.toml b/vdev/Cargo.toml
index f82e632feb1a9..636d4f98c0b6f 100644
--- a/vdev/Cargo.toml
+++ b/vdev/Cargo.toml
@@ -37,4 +37,4 @@ serde_json = "1.0.107"
 serde_yaml = "0.9.25"
 sha2 = "0.10.8"
 tempfile = "3.8.0"
-toml = { version = "0.8.4", default-features = false, features = ["parse"] }
+toml = { version = "0.8.5", default-features = false, features = ["parse"] }

From 741aec36702efb80ebb3fa1a58c21a61ff181642 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 26 Oct 2023 23:06:19 +0000
Subject: [PATCH 25/28] chore(deps): Bump futures-util from 0.3.28 to 0.3.29
 (#18951)

Bumps [futures-util](https://github.com/rust-lang/futures-rs) from 0.3.28 to 0.3.29.
- [Release notes](https://github.com/rust-lang/futures-rs/releases)
- [Changelog](https://github.com/rust-lang/futures-rs/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rust-lang/futures-rs/compare/0.3.28...0.3.29)

---
updated-dependencies:
- dependency-name: futures-util
  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>
---
 Cargo.lock                   | 28 ++++++++++++++--------------
 Cargo.toml                   |  2 +-
 lib/vector-core/Cargo.toml   |  2 +-
 lib/vector-stream/Cargo.toml |  2 +-
 4 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index ff384663f9f75..41b95bd1c02be 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3538,9 +3538,9 @@ dependencies = [
 
 [[package]]
 name = "futures-channel"
-version = "0.3.28"
+version = "0.3.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2"
+checksum = "ff4dd66668b557604244583e3e1e1eada8c5c2e96a6d0d6653ede395b78bbacb"
 dependencies = [
  "futures-core",
  "futures-sink",
@@ -3548,9 +3548,9 @@ dependencies = [
 
 [[package]]
 name = "futures-core"
-version = "0.3.28"
+version = "0.3.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c"
+checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c"
 
 [[package]]
 name = "futures-executor"
@@ -3565,9 +3565,9 @@ dependencies = [
 
 [[package]]
 name = "futures-io"
-version = "0.3.28"
+version = "0.3.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964"
+checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa"
 
 [[package]]
 name = "futures-lite"
@@ -3586,9 +3586,9 @@ dependencies = [
 
 [[package]]
 name = "futures-macro"
-version = "0.3.28"
+version = "0.3.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72"
+checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb"
 dependencies = [
  "proc-macro2 1.0.69",
  "quote 1.0.33",
@@ -3597,15 +3597,15 @@ dependencies = [
 
 [[package]]
 name = "futures-sink"
-version = "0.3.28"
+version = "0.3.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e"
+checksum = "e36d3378ee38c2a36ad710c5d30c2911d752cb941c00c72dbabfb786a7970817"
 
 [[package]]
 name = "futures-task"
-version = "0.3.28"
+version = "0.3.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65"
+checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2"
 
 [[package]]
 name = "futures-timer"
@@ -3615,9 +3615,9 @@ checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c"
 
 [[package]]
 name = "futures-util"
-version = "0.3.28"
+version = "0.3.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533"
+checksum = "a19526d624e703a3179b3d322efec918b6246ea0fa51d41124525f00f1cc8104"
 dependencies = [
  "futures 0.1.31",
  "futures-channel",
diff --git a/Cargo.toml b/Cargo.toml
index 578ee56dfdeb1..4ee0a0abea4b6 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -264,7 +264,7 @@ encoding_rs = { version = "0.8.33", default-features = false, features = ["serde
 enum_dispatch = { version = "0.3.12", default-features = false }
 exitcode = { version = "1.1.2", default-features = false }
 flate2 = { version = "1.0.28", default-features = false, features = ["default"] }
-futures-util = { version = "0.3.28", default-features = false }
+futures-util = { version = "0.3.29", default-features = false }
 glob = { version = "0.3.1", default-features = false }
 governor = { version = "0.6.0", default-features = false, features = ["dashmap", "jitter", "std"], optional = true }
 grok = { version = "2.0.0", default-features = false, optional = true }
diff --git a/lib/vector-core/Cargo.toml b/lib/vector-core/Cargo.toml
index 535c4e51e4483..818b5eacde4a8 100644
--- a/lib/vector-core/Cargo.toml
+++ b/lib/vector-core/Cargo.toml
@@ -18,7 +18,7 @@ enrichment = { path = "../enrichment", optional = true }
 enumflags2 = { version = "0.7.8", default-features = false }
 float_eq = { version = "1.0", default-features = false }
 futures = { version = "0.3.28", default-features = false, features = ["std"] }
-futures-util = { version = "0.3.28", default-features = false, features = ["std"] }
+futures-util = { version = "0.3.29", default-features = false, features = ["std"] }
 headers = { version = "0.3.9", default-features = false }
 http = { version = "0.2.9", default-features = false }
 hyper-proxy = { version = "0.9.1", default-features = false, features = ["openssl-tls"] }
diff --git a/lib/vector-stream/Cargo.toml b/lib/vector-stream/Cargo.toml
index a5e7cfc926a0b..8519365b97591 100644
--- a/lib/vector-stream/Cargo.toml
+++ b/lib/vector-stream/Cargo.toml
@@ -8,7 +8,7 @@ publish = false
 [dependencies]
 async-stream = { version = "0.3.5", default-features = false }
 futures = { version = "0.3.28", default-features = false, features = ["std"] }
-futures-util = { version = "0.3.28", default-features = false, features = ["std"] }
+futures-util = { version = "0.3.29", default-features = false, features = ["std"] }
 pin-project.workspace = true
 tokio = { version = "1.33.0", default-features = false, features = ["net"] }
 tokio-util = { version = "0.7.0", default-features = false, features = ["time"] }

From 8a02b168d4904d0837028b1ef9fc9743d9dee345 Mon Sep 17 00:00:00 2001
From: Bruce Guenter <bruce.guenter@datadoghq.com>
Date: Thu, 26 Oct 2023 21:10:19 -0600
Subject: [PATCH 26/28] chore(dev): Wrap `vector-stream` in `vector-lib`
 (#18953)

---
 Cargo.lock                                           | 2 +-
 Cargo.toml                                           | 1 -
 lib/vector-lib/Cargo.toml                            | 1 +
 lib/vector-lib/src/lib.rs                            | 1 +
 src/sinks/appsignal/service.rs                       | 2 +-
 src/sinks/aws_cloudwatch_logs/service.rs             | 2 +-
 src/sinks/aws_cloudwatch_logs/sink.rs                | 2 +-
 src/sinks/aws_kinesis/config.rs                      | 2 +-
 src/sinks/aws_s_s/service.rs                         | 2 +-
 src/sinks/azure_common/config.rs                     | 2 +-
 src/sinks/databend/service.rs                        | 2 +-
 src/sinks/datadog/events/service.rs                  | 2 +-
 src/sinks/datadog/logs/service.rs                    | 2 +-
 src/sinks/datadog/metrics/service.rs                 | 2 +-
 src/sinks/datadog/metrics/sink.rs                    | 2 +-
 src/sinks/datadog/traces/service.rs                  | 2 +-
 src/sinks/datadog/traces/sink.rs                     | 2 +-
 src/sinks/elasticsearch/service.rs                   | 2 +-
 src/sinks/gcs_common/service.rs                      | 2 +-
 src/sinks/greptimedb/batch.rs                        | 2 +-
 src/sinks/http/batch.rs                              | 2 +-
 src/sinks/prelude.rs                                 | 2 +-
 src/sinks/prometheus/remote_write/sink.rs            | 2 +-
 src/sinks/s3_common/service.rs                       | 2 +-
 src/sinks/splunk_hec/common/response.rs              | 2 +-
 src/sinks/statsd/batch.rs                            | 2 +-
 src/sinks/statsd/service.rs                          | 2 +-
 src/sinks/statsd/sink.rs                             | 2 +-
 src/sinks/util/batch.rs                              | 2 +-
 src/sinks/util/builder.rs                            | 8 ++++----
 src/sinks/util/http.rs                               | 2 +-
 src/sinks/vector/service.rs                          | 2 +-
 src/sinks/vector/sink.rs                             | 2 +-
 src/sources/kubernetes_logs/partial_events_merger.rs | 2 +-
 src/transforms/reduce/mod.rs                         | 2 +-
 35 files changed, 37 insertions(+), 36 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 41b95bd1c02be..a523be885a85b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -9868,7 +9868,6 @@ dependencies = [
  "vector-buffers",
  "vector-lib",
  "vector-lookup",
- "vector-stream",
  "vector-vrl-functions",
  "vrl",
  "warp",
@@ -10116,6 +10115,7 @@ dependencies = [
  "vector-common",
  "vector-config",
  "vector-core",
+ "vector-stream",
 ]
 
 [[package]]
diff --git a/Cargo.toml b/Cargo.toml
index 4ee0a0abea4b6..bfffda55b751c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -142,7 +142,6 @@ tracing-limit = { path = "lib/tracing-limit" }
 vector-api-client = { path = "lib/vector-api-client", optional = true }
 vector-buffers = { path = "lib/vector-buffers", default-features = false }
 vector-lib = { path = "lib/vector-lib", default-features = false, features = ["vrl"] }
-vector-stream = { path = "lib/vector-stream" }
 vector-vrl-functions = { path = "lib/vector-vrl/functions" }
 loki-logproto = { path = "lib/loki-logproto", optional = true }
 
diff --git a/lib/vector-lib/Cargo.toml b/lib/vector-lib/Cargo.toml
index dcc4c585f6020..ce943c519d916 100644
--- a/lib/vector-lib/Cargo.toml
+++ b/lib/vector-lib/Cargo.toml
@@ -9,6 +9,7 @@ publish = false
 vector-common = { path = "../vector-common" }
 vector-config = { path = "../vector-config" }
 vector-core = { path = "../vector-core", default-features = false }
+vector-stream = { path = "../vector-stream" }
 
 [features]
 api = ["vector-core/api"]
diff --git a/lib/vector-lib/src/lib.rs b/lib/vector-lib/src/lib.rs
index 0e81ca7cbb9bc..949d69d2f60ec 100644
--- a/lib/vector-lib/src/lib.rs
+++ b/lib/vector-lib/src/lib.rs
@@ -14,6 +14,7 @@ pub use vector_core::{
     samples, schema, serde, sink, source, tcp, tls, transform, update_counter,
     EstimatedJsonEncodedSizeOf,
 };
+pub use vector_stream as stream;
 
 pub mod config {
     pub use vector_common::config::ComponentKey;
diff --git a/src/sinks/appsignal/service.rs b/src/sinks/appsignal/service.rs
index e505ab1569c7c..ce6aad1e688f3 100644
--- a/src/sinks/appsignal/service.rs
+++ b/src/sinks/appsignal/service.rs
@@ -9,11 +9,11 @@ use http::{header::AUTHORIZATION, Request, StatusCode, Uri};
 use hyper::Body;
 use tower::{Service, ServiceExt};
 
+use vector_lib::stream::DriverResponse;
 use vector_lib::{
     finalization::EventStatus, request_metadata::GroupedCountByteSize,
     request_metadata::MetaDescriptive, sensitive_string::SensitiveString,
 };
-use vector_stream::DriverResponse;
 
 use crate::{
     http::HttpClient,
diff --git a/src/sinks/aws_cloudwatch_logs/service.rs b/src/sinks/aws_cloudwatch_logs/service.rs
index 5189563bac725..d3d6fcb4dc44b 100644
--- a/src/sinks/aws_cloudwatch_logs/service.rs
+++ b/src/sinks/aws_cloudwatch_logs/service.rs
@@ -22,11 +22,11 @@ use tower::{
     timeout::Timeout,
     Service, ServiceBuilder, ServiceExt,
 };
+use vector_lib::stream::DriverResponse;
 use vector_lib::{
     finalization::EventStatus,
     request_metadata::{GroupedCountByteSize, MetaDescriptive},
 };
-use vector_stream::DriverResponse;
 
 use crate::sinks::{
     aws_cloudwatch_logs::{
diff --git a/src/sinks/aws_cloudwatch_logs/sink.rs b/src/sinks/aws_cloudwatch_logs/sink.rs
index 5d50294b08dc2..0624f9f204b17 100644
--- a/src/sinks/aws_cloudwatch_logs/sink.rs
+++ b/src/sinks/aws_cloudwatch_logs/sink.rs
@@ -5,8 +5,8 @@ use chrono::{Duration, Utc};
 use futures::{future, stream::BoxStream, StreamExt};
 use tower::Service;
 use vector_lib::request_metadata::{MetaDescriptive, RequestMetadata};
+use vector_lib::stream::{BatcherSettings, DriverResponse};
 use vector_lib::{partition::Partitioner, sink::StreamSink};
-use vector_stream::{BatcherSettings, DriverResponse};
 
 use crate::{
     event::{Event, EventFinalizers, Finalizable},
diff --git a/src/sinks/aws_kinesis/config.rs b/src/sinks/aws_kinesis/config.rs
index f294025b23d60..4fea310284a44 100644
--- a/src/sinks/aws_kinesis/config.rs
+++ b/src/sinks/aws_kinesis/config.rs
@@ -1,7 +1,7 @@
 use lookup::lookup_v2::ConfigValuePath;
 use std::marker::PhantomData;
 
-use vector_stream::BatcherSettings;
+use vector_lib::stream::BatcherSettings;
 
 use crate::{
     aws::{AwsAuthentication, RegionOrEndpoint},
diff --git a/src/sinks/aws_s_s/service.rs b/src/sinks/aws_s_s/service.rs
index 0049a52ac4f96..4060fc6bab7ca 100644
--- a/src/sinks/aws_s_s/service.rs
+++ b/src/sinks/aws_s_s/service.rs
@@ -5,8 +5,8 @@ use aws_sdk_sqs::types::SdkError;
 use futures::future::BoxFuture;
 use tower::Service;
 use vector_lib::request_metadata::GroupedCountByteSize;
+use vector_lib::stream::DriverResponse;
 use vector_lib::{event::EventStatus, ByteSizeOf};
-use vector_stream::DriverResponse;
 
 use super::{client::Client, request_builder::SendMessageEntry};
 
diff --git a/src/sinks/azure_common/config.rs b/src/sinks/azure_common/config.rs
index 1d6fdf32e9258..5e10ea797c305 100644
--- a/src/sinks/azure_common/config.rs
+++ b/src/sinks/azure_common/config.rs
@@ -8,11 +8,11 @@ use bytes::Bytes;
 use futures::FutureExt;
 use http::StatusCode;
 use snafu::Snafu;
+use vector_lib::stream::DriverResponse;
 use vector_lib::{
     json_size::JsonSize,
     request_metadata::{GroupedCountByteSize, MetaDescriptive, RequestMetadata},
 };
-use vector_stream::DriverResponse;
 
 use crate::{
     event::{EventFinalizers, EventStatus, Finalizable},
diff --git a/src/sinks/databend/service.rs b/src/sinks/databend/service.rs
index b76d366afd1ed..29767a1e9208e 100644
--- a/src/sinks/databend/service.rs
+++ b/src/sinks/databend/service.rs
@@ -10,7 +10,7 @@ use snafu::Snafu;
 use tower::Service;
 use vector_lib::finalization::{EventFinalizers, EventStatus, Finalizable};
 use vector_lib::request_metadata::{GroupedCountByteSize, MetaDescriptive, RequestMetadata};
-use vector_stream::DriverResponse;
+use vector_lib::stream::DriverResponse;
 
 use crate::{internal_events::EndpointBytesSent, sinks::util::retries::RetryLogic};
 
diff --git a/src/sinks/datadog/events/service.rs b/src/sinks/datadog/events/service.rs
index a7254f20868b5..0d95981f95b15 100644
--- a/src/sinks/datadog/events/service.rs
+++ b/src/sinks/datadog/events/service.rs
@@ -9,7 +9,7 @@ use http::Request;
 use hyper::Body;
 use tower::{Service, ServiceExt};
 use vector_lib::request_metadata::{GroupedCountByteSize, MetaDescriptive};
-use vector_stream::DriverResponse;
+use vector_lib::stream::DriverResponse;
 
 use crate::{
     event::EventStatus,
diff --git a/src/sinks/datadog/logs/service.rs b/src/sinks/datadog/logs/service.rs
index 4cc1f80fea69d..d0baffee6d631 100644
--- a/src/sinks/datadog/logs/service.rs
+++ b/src/sinks/datadog/logs/service.rs
@@ -16,7 +16,7 @@ use tower::Service;
 use tracing::Instrument;
 use vector_lib::event::{EventFinalizers, EventStatus, Finalizable};
 use vector_lib::request_metadata::{GroupedCountByteSize, MetaDescriptive, RequestMetadata};
-use vector_stream::DriverResponse;
+use vector_lib::stream::DriverResponse;
 
 use crate::{
     http::HttpClient,
diff --git a/src/sinks/datadog/metrics/service.rs b/src/sinks/datadog/metrics/service.rs
index dd7eb7c69ffbe..85f5fdc47fb2e 100644
--- a/src/sinks/datadog/metrics/service.rs
+++ b/src/sinks/datadog/metrics/service.rs
@@ -12,7 +12,7 @@ use snafu::ResultExt;
 use tower::Service;
 use vector_lib::event::{EventFinalizers, EventStatus, Finalizable};
 use vector_lib::request_metadata::{GroupedCountByteSize, MetaDescriptive, RequestMetadata};
-use vector_stream::DriverResponse;
+use vector_lib::stream::DriverResponse;
 
 use crate::{
     http::{BuildRequestSnafu, CallRequestSnafu, HttpClient},
diff --git a/src/sinks/datadog/metrics/sink.rs b/src/sinks/datadog/metrics/sink.rs
index ebe925e752da4..b5f62d956b18b 100644
--- a/src/sinks/datadog/metrics/sink.rs
+++ b/src/sinks/datadog/metrics/sink.rs
@@ -8,12 +8,12 @@ use futures_util::{
     StreamExt,
 };
 use tower::Service;
+use vector_lib::stream::{BatcherSettings, DriverResponse};
 use vector_lib::{
     event::{Event, Metric, MetricValue},
     partition::Partitioner,
     sink::StreamSink,
 };
-use vector_stream::{BatcherSettings, DriverResponse};
 
 use super::{
     config::DatadogMetricsEndpoint, normalizer::DatadogMetricsNormalizer,
diff --git a/src/sinks/datadog/traces/service.rs b/src/sinks/datadog/traces/service.rs
index ecda3c93c23ce..7af9469d94883 100644
--- a/src/sinks/datadog/traces/service.rs
+++ b/src/sinks/datadog/traces/service.rs
@@ -11,7 +11,7 @@ use snafu::ResultExt;
 use tower::Service;
 use vector_lib::event::{EventFinalizers, EventStatus, Finalizable};
 use vector_lib::request_metadata::{GroupedCountByteSize, MetaDescriptive, RequestMetadata};
-use vector_stream::DriverResponse;
+use vector_lib::stream::DriverResponse;
 
 use crate::{
     http::{BuildRequestSnafu, CallRequestSnafu, HttpClient, HttpError},
diff --git a/src/sinks/datadog/traces/sink.rs b/src/sinks/datadog/traces/sink.rs
index b907759f5cd8d..0d62cdd9ce59f 100644
--- a/src/sinks/datadog/traces/sink.rs
+++ b/src/sinks/datadog/traces/sink.rs
@@ -7,8 +7,8 @@ use futures_util::{
 };
 use tokio::sync::oneshot::{channel, Sender};
 use tower::Service;
+use vector_lib::stream::{BatcherSettings, DriverResponse};
 use vector_lib::{config::log_schema, event::Event, partition::Partitioner, sink::StreamSink};
-use vector_stream::{BatcherSettings, DriverResponse};
 use vrl::event_path;
 use vrl::path::PathPrefix;
 
diff --git a/src/sinks/elasticsearch/service.rs b/src/sinks/elasticsearch/service.rs
index dad9c51c90f07..9824c0e38b177 100644
--- a/src/sinks/elasticsearch/service.rs
+++ b/src/sinks/elasticsearch/service.rs
@@ -9,12 +9,12 @@ use futures::future::BoxFuture;
 use http::{Response, Uri};
 use hyper::{service::Service, Body, Request};
 use tower::ServiceExt;
+use vector_lib::stream::DriverResponse;
 use vector_lib::ByteSizeOf;
 use vector_lib::{
     json_size::JsonSize,
     request_metadata::{GroupedCountByteSize, MetaDescriptive, RequestMetadata},
 };
-use vector_stream::DriverResponse;
 
 use super::{ElasticsearchCommon, ElasticsearchConfig};
 use crate::{
diff --git a/src/sinks/gcs_common/service.rs b/src/sinks/gcs_common/service.rs
index 3271e28755161..eafd47fbe4285 100644
--- a/src/sinks/gcs_common/service.rs
+++ b/src/sinks/gcs_common/service.rs
@@ -9,7 +9,7 @@ use http::{
 use hyper::Body;
 use tower::Service;
 use vector_lib::request_metadata::{GroupedCountByteSize, MetaDescriptive, RequestMetadata};
-use vector_stream::DriverResponse;
+use vector_lib::stream::DriverResponse;
 
 use crate::{
     event::{EventFinalizers, EventStatus, Finalizable},
diff --git a/src/sinks/greptimedb/batch.rs b/src/sinks/greptimedb/batch.rs
index e69bc17157001..7bfd7bcce2863 100644
--- a/src/sinks/greptimedb/batch.rs
+++ b/src/sinks/greptimedb/batch.rs
@@ -1,5 +1,5 @@
 use vector_lib::event::{Metric, MetricValue};
-use vector_stream::batcher::limiter::ItemBatchSize;
+use vector_lib::stream::batcher::limiter::ItemBatchSize;
 
 use super::request_builder::{
     DISTRIBUTION_QUANTILES, DISTRIBUTION_STAT_FIELD_COUNT, SUMMARY_STAT_FIELD_COUNT,
diff --git a/src/sinks/http/batch.rs b/src/sinks/http/batch.rs
index 19ee7230b39bd..c3d03a621088d 100644
--- a/src/sinks/http/batch.rs
+++ b/src/sinks/http/batch.rs
@@ -1,8 +1,8 @@
 //! Batch settings for the `http` sink.
 
 use codecs::encoding::Framer;
+use vector_lib::stream::batcher::limiter::ItemBatchSize;
 use vector_lib::{event::Event, ByteSizeOf, EstimatedJsonEncodedSizeOf};
-use vector_stream::batcher::limiter::ItemBatchSize;
 
 use crate::codecs::Encoder;
 
diff --git a/src/sinks/prelude.rs b/src/sinks/prelude.rs
index 44adc400cf72a..3bee1b9f73fa1 100644
--- a/src/sinks/prelude.rs
+++ b/src/sinks/prelude.rs
@@ -6,6 +6,7 @@ pub use futures::{future, future::BoxFuture, stream::BoxStream, FutureExt, Strea
 pub use tower::{Service, ServiceBuilder};
 pub use vector_buffers::EventCount;
 pub use vector_lib::configurable::configurable_component;
+pub use vector_lib::stream::{BatcherSettings, DriverResponse};
 pub use vector_lib::{
     config::{telemetry, AcknowledgementsConfig, Input},
     event::Value,
@@ -21,7 +22,6 @@ pub use vector_lib::{
     json_size::JsonSize,
     request_metadata::{GetEventCountTags, GroupedCountByteSize, MetaDescriptive, RequestMetadata},
 };
-pub use vector_stream::{BatcherSettings, DriverResponse};
 
 pub use crate::{
     codecs::{Encoder, EncodingConfig, Transformer},
diff --git a/src/sinks/prometheus/remote_write/sink.rs b/src/sinks/prometheus/remote_write/sink.rs
index fdff3b605db9c..093cb7e0bc26b 100644
--- a/src/sinks/prometheus/remote_write/sink.rs
+++ b/src/sinks/prometheus/remote_write/sink.rs
@@ -2,7 +2,7 @@ use std::fmt;
 
 use vector_lib::byte_size_of::ByteSizeOf;
 use vector_lib::event::Metric;
-use vector_stream::batcher::{data::BatchData, limiter::ByteSizeOfItemSize};
+use vector_lib::stream::batcher::{data::BatchData, limiter::ByteSizeOfItemSize};
 
 use crate::sinks::{prelude::*, util::buffer::metrics::MetricSet};
 
diff --git a/src/sinks/s3_common/service.rs b/src/sinks/s3_common/service.rs
index f734928dc7f64..2175005bfb61e 100644
--- a/src/sinks/s3_common/service.rs
+++ b/src/sinks/s3_common/service.rs
@@ -13,7 +13,7 @@ use tower::Service;
 use tracing::Instrument;
 use vector_lib::event::{EventFinalizers, EventStatus, Finalizable};
 use vector_lib::request_metadata::{GroupedCountByteSize, MetaDescriptive, RequestMetadata};
-use vector_stream::DriverResponse;
+use vector_lib::stream::DriverResponse;
 
 use super::config::S3Options;
 use super::partitioner::S3PartitionKey;
diff --git a/src/sinks/splunk_hec/common/response.rs b/src/sinks/splunk_hec/common/response.rs
index 745c45a9b882c..c3714eaae6861 100644
--- a/src/sinks/splunk_hec/common/response.rs
+++ b/src/sinks/splunk_hec/common/response.rs
@@ -1,6 +1,6 @@
 use vector_lib::event::EventStatus;
 use vector_lib::request_metadata::GroupedCountByteSize;
-use vector_stream::DriverResponse;
+use vector_lib::stream::DriverResponse;
 
 pub struct HecResponse {
     pub event_status: EventStatus,
diff --git a/src/sinks/statsd/batch.rs b/src/sinks/statsd/batch.rs
index a3b73588f8133..245ec1e3ac81f 100644
--- a/src/sinks/statsd/batch.rs
+++ b/src/sinks/statsd/batch.rs
@@ -1,5 +1,5 @@
 use vector_lib::event::Metric;
-use vector_stream::batcher::limiter::ItemBatchSize;
+use vector_lib::stream::batcher::limiter::ItemBatchSize;
 
 // This accounts for the separators, the metric type string, the length of the value itself. It can
 // never be too small, as the above values will always take at least 4 bytes.
diff --git a/src/sinks/statsd/service.rs b/src/sinks/statsd/service.rs
index fa555a441cc2f..8acd729685360 100644
--- a/src/sinks/statsd/service.rs
+++ b/src/sinks/statsd/service.rs
@@ -2,11 +2,11 @@ use std::task::{Context, Poll};
 
 use futures_util::future::BoxFuture;
 use tower::Service;
+use vector_lib::stream::DriverResponse;
 use vector_lib::{
     finalization::{EventFinalizers, EventStatus, Finalizable},
     request_metadata::{GroupedCountByteSize, MetaDescriptive, RequestMetadata},
 };
-use vector_stream::DriverResponse;
 
 /// Generalized request for sending metrics to a StatsD endpoint.
 #[derive(Clone, Debug)]
diff --git a/src/sinks/statsd/sink.rs b/src/sinks/statsd/sink.rs
index 3c16d177458f0..dd78f203ef341 100644
--- a/src/sinks/statsd/sink.rs
+++ b/src/sinks/statsd/sink.rs
@@ -7,8 +7,8 @@ use futures_util::{
 };
 use tower::Service;
 use vector_lib::internal_event::Protocol;
+use vector_lib::stream::{BatcherSettings, DriverResponse};
 use vector_lib::{event::Event, sink::StreamSink};
-use vector_stream::{BatcherSettings, DriverResponse};
 
 use crate::sinks::util::SinkBuilderExt;
 
diff --git a/src/sinks/util/batch.rs b/src/sinks/util/batch.rs
index 30dfdd4b181b8..0bf04de202ae4 100644
--- a/src/sinks/util/batch.rs
+++ b/src/sinks/util/batch.rs
@@ -5,7 +5,7 @@ use serde_with::serde_as;
 use snafu::Snafu;
 use vector_lib::configurable::configurable_component;
 use vector_lib::json_size::JsonSize;
-use vector_stream::BatcherSettings;
+use vector_lib::stream::BatcherSettings;
 
 use super::EncodedEvent;
 use crate::{event::EventFinalizers, internal_events::LargeEventDroppedError};
diff --git a/src/sinks/util/builder.rs b/src/sinks/util/builder.rs
index 50056941d1cf1..bdf98a21df1f4 100644
--- a/src/sinks/util/builder.rs
+++ b/src/sinks/util/builder.rs
@@ -12,15 +12,15 @@ use std::{
 use futures_util::{stream::Map, Stream, StreamExt};
 use pin_project::pin_project;
 use tower::Service;
+use vector_lib::stream::{
+    batcher::{config::BatchConfig, Batcher},
+    ConcurrentMap, Driver, DriverResponse, ExpirationQueue, PartitionedBatcher,
+};
 use vector_lib::{
     event::{Finalizable, Metric},
     partition::Partitioner,
     ByteSizeOf,
 };
-use vector_stream::{
-    batcher::{config::BatchConfig, Batcher},
-    ConcurrentMap, Driver, DriverResponse, ExpirationQueue, PartitionedBatcher,
-};
 
 use super::{
     buffer::metrics::MetricNormalize, IncrementalRequestBuilder, Normalizer, RequestBuilder,
diff --git a/src/sinks/util/http.rs b/src/sinks/util/http.rs
index f4461633948ba..8508f18acdbb3 100644
--- a/src/sinks/util/http.rs
+++ b/src/sinks/util/http.rs
@@ -20,8 +20,8 @@ use snafu::{ResultExt, Snafu};
 use tower::{Service, ServiceBuilder};
 use tower_http::decompression::DecompressionLayer;
 use vector_lib::configurable::configurable_component;
+use vector_lib::stream::batcher::limiter::ItemBatchSize;
 use vector_lib::{ByteSizeOf, EstimatedJsonEncodedSizeOf};
-use vector_stream::batcher::limiter::ItemBatchSize;
 
 use super::{
     retries::{RetryAction, RetryLogic},
diff --git a/src/sinks/vector/service.rs b/src/sinks/vector/service.rs
index 87cd11fea3ec4..1a0b240e4338d 100644
--- a/src/sinks/vector/service.rs
+++ b/src/sinks/vector/service.rs
@@ -9,7 +9,7 @@ use prost::Message;
 use tonic::{body::BoxBody, IntoRequest};
 use tower::Service;
 use vector_lib::request_metadata::{GroupedCountByteSize, MetaDescriptive, RequestMetadata};
-use vector_stream::DriverResponse;
+use vector_lib::stream::DriverResponse;
 
 use super::VectorSinkError;
 use crate::{
diff --git a/src/sinks/vector/sink.rs b/src/sinks/vector/sink.rs
index ef965f413431a..b5d97541c74e7 100644
--- a/src/sinks/vector/sink.rs
+++ b/src/sinks/vector/sink.rs
@@ -5,8 +5,8 @@ use futures::{stream::BoxStream, StreamExt};
 use prost::Message;
 use tower::Service;
 use vector_lib::request_metadata::GroupedCountByteSize;
+use vector_lib::stream::{batcher::data::BatchReduce, BatcherSettings, DriverResponse};
 use vector_lib::{config::telemetry, ByteSizeOf, EstimatedJsonEncodedSizeOf};
-use vector_stream::{batcher::data::BatchReduce, BatcherSettings, DriverResponse};
 
 use super::service::VectorRequest;
 use crate::{
diff --git a/src/sources/kubernetes_logs/partial_events_merger.rs b/src/sources/kubernetes_logs/partial_events_merger.rs
index d3effb22c1c62..4a0ac987f8eb8 100644
--- a/src/sources/kubernetes_logs/partial_events_merger.rs
+++ b/src/sources/kubernetes_logs/partial_events_merger.rs
@@ -6,7 +6,7 @@ use lookup::OwnedTargetPath;
 use std::collections::HashMap;
 use std::time::{Duration, Instant};
 use vector_lib::config::LogNamespace;
-use vector_stream::expiration_map::{map_with_expiration, Emitter};
+use vector_lib::stream::expiration_map::{map_with_expiration, Emitter};
 use vrl::owned_value_path;
 
 use crate::event;
diff --git a/src/transforms/reduce/mod.rs b/src/transforms/reduce/mod.rs
index 4d99c5cd650f9..957983188a47e 100644
--- a/src/transforms/reduce/mod.rs
+++ b/src/transforms/reduce/mod.rs
@@ -28,7 +28,7 @@ use crate::config::schema::Definition;
 use crate::event::Value;
 pub use merge_strategy::*;
 use vector_lib::config::LogNamespace;
-use vector_stream::expiration_map::{map_with_expiration, Emitter};
+use vector_lib::stream::expiration_map::{map_with_expiration, Emitter};
 use vrl::value::kind::Collection;
 use vrl::value::Kind;
 

From dc9d966120f3f518ac1f1a07f4716020b69772eb Mon Sep 17 00:00:00 2001
From: neuronull <neuronull@pm.me>
Date: Fri, 27 Oct 2023 08:39:11 -0600
Subject: [PATCH 27/28] fix(datadog_agent source, datadog_metrics sink): handle
 interval for non-rate series metrics (#18889)

* fix(datadog_agent source, datadog_metrics sink): handle interval for non-rate series metrics

* spelling

* more spelling

* validate the correct gauge

* update code comment w more details

* feedback toby
---
 src/sinks/datadog/metrics/encoder.rs          | 189 +++++++++++-------
 .../datadog/metrics/integration_tests.rs      |  16 +-
 src/sources/datadog_agent/metrics.rs          |  28 +++
 src/sources/datadog_agent/tests.rs            |  16 +-
 4 files changed, 169 insertions(+), 80 deletions(-)

diff --git a/src/sinks/datadog/metrics/encoder.rs b/src/sinks/datadog/metrics/encoder.rs
index dec74803d0c77..5cc265992440c 100644
--- a/src/sinks/datadog/metrics/encoder.rs
+++ b/src/sinks/datadog/metrics/encoder.rs
@@ -609,42 +609,46 @@ fn series_to_proto_message(
 
     let timestamp = encode_timestamp(metric.timestamp());
 
-    let (points, metric_type, interval) = match (metric.value(), metric.interval_ms()) {
-        (MetricValue::Counter { value }, maybe_interval_ms) => {
-            let (value, interval, metric_type) = match maybe_interval_ms {
-                None => (*value, 0, ddmetric_proto::metric_payload::MetricType::Count),
+    // our internal representation is in milliseconds but the expected output is in seconds
+    let maybe_interval = metric.interval_ms().map(|i| i.get() / 1000);
+
+    let (points, metric_type) = match metric.value() {
+        MetricValue::Counter { value } => {
+            if let Some(interval) = maybe_interval {
                 // When an interval is defined, it implies the value should be in a per-second form,
                 // so we need to get back to seconds from our milliseconds-based interval, and then
                 // divide our value by that amount as well.
-                Some(interval_ms) => (
-                    (*value) * 1000.0 / (interval_ms.get() as f64),
-                    interval_ms.get() as i64 / 1000,
+                let value = *value / (interval as f64);
+                (
+                    vec![ddmetric_proto::metric_payload::MetricPoint { value, timestamp }],
                     ddmetric_proto::metric_payload::MetricType::Rate,
-                ),
-            };
-            let points = vec![ddmetric_proto::metric_payload::MetricPoint { value, timestamp }];
-            (points, metric_type, interval)
+                )
+            } else {
+                (
+                    vec![ddmetric_proto::metric_payload::MetricPoint {
+                        value: *value,
+                        timestamp,
+                    }],
+                    ddmetric_proto::metric_payload::MetricType::Count,
+                )
+            }
         }
-        (MetricValue::Set { values }, _) => {
-            let points = vec![ddmetric_proto::metric_payload::MetricPoint {
+        MetricValue::Set { values } => (
+            vec![ddmetric_proto::metric_payload::MetricPoint {
                 value: values.len() as f64,
                 timestamp,
-            }];
-            let metric_type = ddmetric_proto::metric_payload::MetricType::Gauge;
-            let interval = 0;
-            (points, metric_type, interval)
-        }
-        (MetricValue::Gauge { value }, _) => {
-            let points = vec![ddmetric_proto::metric_payload::MetricPoint {
+            }],
+            ddmetric_proto::metric_payload::MetricType::Gauge,
+        ),
+        MetricValue::Gauge { value } => (
+            vec![ddmetric_proto::metric_payload::MetricPoint {
                 value: *value,
                 timestamp,
-            }];
-            let metric_type = ddmetric_proto::metric_payload::MetricType::Gauge;
-            let interval = 0;
-            (points, metric_type, interval)
-        }
+            }],
+            ddmetric_proto::metric_payload::MetricType::Gauge,
+        ),
         // NOTE: AggregatedSummary will have been previously split into counters and gauges during normalization
-        (value, _) => {
+        value => {
             // this case should have already been surfaced by encode_single_metric() so this should never be reached
             return Err(EncoderError::InvalidMetric {
                 expected: "series",
@@ -662,7 +666,7 @@ fn series_to_proto_message(
         // unit is omitted
         unit: "".to_string(),
         source_type_name,
-        interval,
+        interval: maybe_interval.unwrap_or(0) as i64,
         metadata,
     })
 }
@@ -822,6 +826,9 @@ fn generate_series_metrics(
     let ts = encode_timestamp(metric.timestamp());
     let tags = Some(encode_tags(&tags));
 
+    // our internal representation is in milliseconds but the expected output is in seconds
+    let maybe_interval = metric.interval_ms().map(|i| i.get() / 1000);
+
     let event_metadata = metric.metadata();
     let metadata = generate_series_metadata(
         event_metadata.datadog_origin_metadata(),
@@ -831,56 +838,25 @@ fn generate_series_metrics(
 
     trace!(?metadata, "Generated series metadata.");
 
-    let results = match (metric.value(), metric.interval_ms()) {
-        (MetricValue::Counter { value }, maybe_interval_ms) => {
-            let (value, interval, metric_type) = match maybe_interval_ms {
-                None => (*value, None, DatadogMetricType::Count),
+    let (points, metric_type) = match metric.value() {
+        MetricValue::Counter { value } => {
+            if let Some(interval) = maybe_interval {
                 // When an interval is defined, it implies the value should be in a per-second form,
                 // so we need to get back to seconds from our milliseconds-based interval, and then
                 // divide our value by that amount as well.
-                Some(interval_ms) => (
-                    (*value) * 1000.0 / (interval_ms.get() as f64),
-                    Some(interval_ms.get() / 1000),
-                    DatadogMetricType::Rate,
-                ),
-            };
-
-            vec![DatadogSeriesMetric {
-                metric: name,
-                r#type: metric_type,
-                interval,
-                points: vec![DatadogPoint(ts, value)],
-                tags,
-                host,
-                source_type_name,
-                device,
-                metadata,
-            }]
+                let value = *value / (interval as f64);
+                (vec![DatadogPoint(ts, value)], DatadogMetricType::Rate)
+            } else {
+                (vec![DatadogPoint(ts, *value)], DatadogMetricType::Count)
+            }
         }
-        (MetricValue::Set { values }, _) => vec![DatadogSeriesMetric {
-            metric: name,
-            r#type: DatadogMetricType::Gauge,
-            interval: None,
-            points: vec![DatadogPoint(ts, values.len() as f64)],
-            tags,
-            host,
-            source_type_name,
-            device,
-            metadata,
-        }],
-        (MetricValue::Gauge { value }, _) => vec![DatadogSeriesMetric {
-            metric: name,
-            r#type: DatadogMetricType::Gauge,
-            interval: None,
-            points: vec![DatadogPoint(ts, *value)],
-            tags,
-            host,
-            source_type_name,
-            device,
-            metadata,
-        }],
+        MetricValue::Set { values } => (
+            vec![DatadogPoint(ts, values.len() as f64)],
+            DatadogMetricType::Gauge,
+        ),
+        MetricValue::Gauge { value } => (vec![DatadogPoint(ts, *value)], DatadogMetricType::Gauge),
         // NOTE: AggregatedSummary will have been previously split into counters and gauges during normalization
-        (value, _) => {
+        value => {
             return Err(EncoderError::InvalidMetric {
                 expected: "series",
                 metric_value: value.as_name(),
@@ -888,7 +864,17 @@ fn generate_series_metrics(
         }
     };
 
-    Ok(results)
+    Ok(vec![DatadogSeriesMetric {
+        metric: name,
+        r#type: metric_type,
+        interval: maybe_interval,
+        points,
+        tags,
+        host,
+        source_type_name,
+        device,
+        metadata,
+    }])
 }
 
 fn get_compressor() -> Compressor {
@@ -1244,6 +1230,63 @@ mod tests {
         }
     }
 
+    #[test]
+    fn encode_non_rate_metric_with_interval() {
+        // It is possible that the Agent sends Gauges with an interval set. This
+        // Occurs when the origin of the metric is Dogstatsd, where the interval
+        // is set to 10.
+
+        let value = 423.1331;
+        let interval_ms = 10000;
+
+        let gauge = Metric::new(
+            "basic_gauge",
+            MetricKind::Incremental,
+            MetricValue::Gauge { value },
+        )
+        .with_timestamp(Some(ts()))
+        .with_interval_ms(NonZeroU32::new(interval_ms));
+
+        let expected_value = value; // For gauge, the value should not be modified by interval
+        let expected_interval = interval_ms / 1000;
+
+        // series v1
+        {
+            // Encode the metric and make sure we did the rate conversion correctly.
+            let result = generate_series_metrics(
+                &gauge,
+                &None,
+                log_schema(),
+                DEFAULT_DD_ORIGIN_PRODUCT_VALUE,
+            );
+            assert!(result.is_ok());
+
+            let metrics = result.unwrap();
+            assert_eq!(metrics.len(), 1);
+
+            let actual = &metrics[0];
+            assert_eq!(actual.r#type, DatadogMetricType::Gauge);
+            assert_eq!(actual.interval, Some(expected_interval));
+            assert_eq!(actual.points.len(), 1);
+            assert_eq!(actual.points[0].1, expected_value);
+        }
+
+        // series v2
+        {
+            let series_proto = series_to_proto_message(
+                &gauge,
+                &None,
+                log_schema(),
+                DEFAULT_DD_ORIGIN_PRODUCT_VALUE,
+            )
+            .unwrap();
+            assert_eq!(series_proto.r#type, 3);
+            assert_eq!(series_proto.interval, expected_interval as i64);
+            assert_eq!(series_proto.points.len(), 1);
+            assert_eq!(series_proto.points[0].value, expected_value);
+        }
+    }
+
     #[test]
     fn encode_origin_metadata_pass_through() {
         let product = 10;
diff --git a/src/sinks/datadog/metrics/integration_tests.rs b/src/sinks/datadog/metrics/integration_tests.rs
index 761d9f1693b32..45f96a62d365a 100644
--- a/src/sinks/datadog/metrics/integration_tests.rs
+++ b/src/sinks/datadog/metrics/integration_tests.rs
@@ -72,11 +72,15 @@ fn generate_counter_gauge_set() -> Vec<Event> {
     let ts = Utc::now().trunc_subsecs(3);
     let events = vec![
         // gauge
-        Event::Metric(Metric::new(
-            "gauge",
-            MetricKind::Incremental,
-            MetricValue::Gauge { value: 5678.0 },
-        )),
+        Event::Metric(
+            Metric::new(
+                "gauge",
+                MetricKind::Incremental,
+                MetricValue::Gauge { value: 5678.0 },
+            )
+            // Dogstatsd outputs gauges with an interval
+            .with_interval_ms(NonZeroU32::new(10000)),
+        ),
         // counter with interval
         Event::Metric(
             Metric::new(
@@ -318,7 +322,7 @@ fn validate_protobuf_set_gauge_rate(request: &(Parts, Bytes)) {
             ddmetric_proto::metric_payload::MetricType::Gauge
         );
         assert_eq!(gauge.points[0].value, 5678.0);
-        assert_eq!(gauge.interval, 0);
+        assert_eq!(gauge.interval, 10);
     }
 
     // validate counter w interval = rate
diff --git a/src/sources/datadog_agent/metrics.rs b/src/sources/datadog_agent/metrics.rs
index 597eeb0f201bf..fd3bcdfe66e83 100644
--- a/src/sources/datadog_agent/metrics.rs
+++ b/src/sources/datadog_agent/metrics.rs
@@ -266,6 +266,33 @@ pub(crate) fn decode_ddseries_v2(
 
             let event_metadata = get_event_metadata(serie.metadata.as_ref());
 
+            // It is possible to receive non-rate metrics from the Agent with an interval set.
+            // That interval can be applied with the `as_rate` function in the Datadog UI.
+            // The scenario this happens is when DogStatsD emits non-rate series metrics to the Agent,
+            // in which it sets an interval to 10. See
+            //    - https://github.com/DataDog/datadog-agent/blob/9f0a85c926596ec9aebe2d8e1f2a8b1af6e45635/pkg/aggregator/time_sampler.go#L49C1-L49C1
+            //    - https://github.com/DataDog/datadog-agent/blob/209b70529caff9ec1c30b6b2eed27bce725ed153/pkg/aggregator/aggregator.go#L39
+            //
+            // Note that DogStatsD is the only scenario this occurs; regular Agent checks/services do not set the
+            // interval for non-rate series metrics.
+            //
+            // Note that because Vector does not yet have a specific Metric type to handle Rate,
+            // we are distinguishing Rate from Count by setting an interval to Rate but not Count.
+            // Luckily, the only time a Count metric type is emitted by DogStatsD, is in the Sketch endpoint.
+            // (Regular Count metrics are emitted by DogStatsD as Rate metrics).
+            //
+            // In theory we should be safe to set this non-rate-interval to Count metrics below, but to be safe,
+            // we will only set it for Rate and Gauge. Since Rates already need an interval, the only "odd" case
+            // is Gauges.
+            //
+            // Ultimately if we had a unique internal representation of a Rate metric type, we wouldn't need to
+            // have special handling for the interval, we would just apply it to all metrics that it came in with.
+            let non_rate_interval = if serie.interval.is_positive() {
+                NonZeroU32::new(serie.interval as u32 * 1000) // incoming is seconds, convert to milliseconds
+            } else {
+                None
+            };
+
             serie.resources.into_iter().for_each(|r| {
                 // As per https://github.com/DataDog/datadog-agent/blob/a62ac9fb13e1e5060b89e731b8355b2b20a07c5b/pkg/serializer/internal/metrics/iterable_series.go#L180-L189
                 // the hostname can be found in MetricSeries::resources and that is the only value stored there.
@@ -323,6 +350,7 @@ pub(crate) fn decode_ddseries_v2(
                         ))
                         .with_tags(Some(tags.clone()))
                         .with_namespace(namespace)
+                        .with_interval_ms(non_rate_interval)
                     })
                     .collect::<Vec<_>>(),
                 Ok(metric_payload::MetricType::Rate) => serie
diff --git a/src/sources/datadog_agent/tests.rs b/src/sources/datadog_agent/tests.rs
index 9f98f83a0b662..9c5bec4fb67cf 100644
--- a/src/sources/datadog_agent/tests.rs
+++ b/src/sources/datadog_agent/tests.rs
@@ -1902,7 +1902,7 @@ async fn decode_series_endpoint_v2() {
                 r#type: ddmetric_proto::metric_payload::MetricType::Gauge as i32,
                 unit: "".to_string(),
                 source_type_name: "a_random_source_type_name".to_string(),
-                interval: 0,
+                interval: 10, // Dogstatsd sets Gauge interval to 10 by default
                 metadata: None,
             },
             ddmetric_proto::metric_payload::MetricSeries {
@@ -1982,6 +1982,13 @@ async fn decode_series_endpoint_v2() {
                 )
             );
             assert_eq!(metric.kind(), MetricKind::Absolute);
+            assert_eq!(
+                metric
+                    .interval_ms()
+                    .expect("should have set interval")
+                    .get(),
+                10000
+            );
             assert_eq!(*metric.value(), MetricValue::Gauge { value: 3.14 });
             assert_tags(
                 metric,
@@ -2006,6 +2013,13 @@ async fn decode_series_endpoint_v2() {
             );
             assert_eq!(metric.kind(), MetricKind::Absolute);
             assert_eq!(*metric.value(), MetricValue::Gauge { value: 3.1415 });
+            assert_eq!(
+                metric
+                    .interval_ms()
+                    .expect("should have set interval")
+                    .get(),
+                10000
+            );
             assert_tags(
                 metric,
                 metric_tags!(

From c23efce846ab8aec9ce12e638ba16d11281ec203 Mon Sep 17 00:00:00 2001
From: neuronull <neuronull@pm.me>
Date: Fri, 27 Oct 2023 11:23:27 -0600
Subject: [PATCH 28/28] chore(ci): add dependabot group for futures (#18954)

---
 .github/dependabot.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 967072ef5d300..62185d54bd758 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -26,6 +26,10 @@ updates:
       csv:
         patterns:
         - "csv*"
+      futures:
+        patterns:
+        - "futures"
+        - "futures-util"
       phf:
         patterns:
         - "phf*"