diff --git a/.github/ISSUE_TEMPLATE/minor-release.md b/.github/ISSUE_TEMPLATE/minor-release.md
index 0ea25a30c0432..71ba54de40652 100644
--- a/.github/ISSUE_TEMPLATE/minor-release.md
+++ b/.github/ISSUE_TEMPLATE/minor-release.md
@@ -41,8 +41,8 @@ On the day of release:
 - [ ] Merge release preparation branch into the release branch
     - `git co v0.<new version number> && git merge --ff-only prepare-v0.<new version number>`
 - [ ] Tag new release
-  - [ ] `git tag v0.<minor>.0 -a -m v0.<minor>.0``
-  - [ ] `git push origin v0.<minor>.0
+  - [ ] `git tag v0.<minor>.0 -a -m v0.<minor>.0`
+  - [ ] `git push origin v0.<minor>.0`
 - [ ] Wait for release workflow to complete
   - Discoverable via [https://github.com/timberio/vector/actions/workflows/release.yml](https://github.com/timberio/vector/actions/workflows/release.yml)
 - [ ] Release updated Helm chart. See [releasing Helm chart](https://github.com/vectordotdev/helm-charts#releasing).
diff --git a/.github/actions/spelling/allow.txt b/.github/actions/spelling/allow.txt
index d9b13fcf742c0..aaa3f302b430a 100644
--- a/.github/actions/spelling/allow.txt
+++ b/.github/actions/spelling/allow.txt
@@ -36,6 +36,7 @@ Celkon
 Ceph
 Chromecast
 Citrix
+Cloudflare
 Cloudfone
 Cmx
 Coby
@@ -52,6 +53,7 @@ Enot
 Evercoss
 Explay
 FAQs
+FDO
 FQDNs
 Fabro
 Figma
@@ -165,6 +167,7 @@ Samsung
 Sega
 Segoe
 Shopify
+SIGINTs
 Simvalley
 Skype
 Skytex
@@ -244,6 +247,7 @@ compiletime
 coredns
 corejs
 coreutils
+curta
 daemonset
 databend
 datacenter
@@ -295,6 +299,9 @@ gpg
 gql
 grafana
 graphiql
+greptime
+greptimecloud
+greptimedb
 gvisor
 gws
 hadoop
@@ -313,6 +320,7 @@ https
 humungus
 icecream
 ifeq
+ifneq
 imobile
 influxd
 ionik
@@ -418,6 +426,8 @@ userguide
 webhdfs
 winapi
 workarounds
+XCHACHA
+XSALSA
 yandex
 zeek
 zookeeper
diff --git a/.github/actions/spelling/excludes.txt b/.github/actions/spelling/excludes.txt
index fd124acd37b4d..620bf03ad6410 100644
--- a/.github/actions/spelling/excludes.txt
+++ b/.github/actions/spelling/excludes.txt
@@ -48,6 +48,7 @@
 \.otf$
 \.p12$
 \.pattern$
+\.pb$
 \.pdf$
 \.pem$
 \.png$
@@ -68,11 +69,13 @@
 \.zst$
 ^\.github/actions/spelling/
 ^\Q.cargo/config.toml\E$
-^\Q.github/workflows/spelling.yml\E$
 ^\Q.github/workflows/gardener_issue_comment.yml\E$
+^\Q.github/workflows/spelling.yml\E$
 ^\Qbenches/codecs/moby_dick.txt\E$
 ^\Qbenches/dnstap/mod.rs\E$
 ^\Qbenches/transform/route.rs\E$
+^\Qlib/codecs/tests/data/decoding/protobuf/test_protobuf.desc\E$
+^\Qlib/codecs/tests/data/decoding/protobuf/test_protobuf3.desc\E$
 ^\Qlib/dnsmsg-parser/benches/benches.rs\E$
 ^\Qlib/dnsmsg-parser/src/dns_message_parser.rs\E$
 ^\Qlib/lookup/tests/fixtures/lookup/quoted\E$
diff --git a/.github/actions/spelling/expect.txt b/.github/actions/spelling/expect.txt
index ed5c241d38b0f..eeae2da48b292 100644
--- a/.github/actions/spelling/expect.txt
+++ b/.github/actions/spelling/expect.txt
@@ -1,9 +1,7 @@
 abcd
 abcdefghijklm
 abcdefghijklmnopqrstuvwxyzand
-abced
 abortable
-acb
 ack'ing
 acking
 Acq
@@ -37,10 +35,8 @@ ARNOTAREALIDD
 arshiyasolei
 asdf
 asdfasdf
-ASMS
 assertverify
 Asterix
-asynk
 atag
 atx
 aty
@@ -140,7 +136,6 @@ casttype
 castvalue
 cbe
 CBOR
-cbs
 cddl
 cdeab
 cdylib
@@ -224,6 +219,7 @@ cwl
 Dailywarehousing
 daschl
 dashmap
+datadir
 dataflows
 datafuselabs
 datasources
@@ -234,6 +230,7 @@ datname
 dbkind
 dbreader
 DBserver
+DCMAKE
 ddagent
 ddev
 ddmetric
@@ -304,7 +301,6 @@ ebfcee
 edenhill
 edns
 eeyun
-efg
 efgh
 Elhage
 emca
@@ -325,7 +321,6 @@ ENVARS
 envsubst
 EOIG
 EOL'ed
-Erfxl
 Err'ing
 errorf
 Errorsfor
@@ -464,12 +459,12 @@ gty
 Guangzhou
 guenter
 gzip'ed
+hadolint
 halfsies
 hannes
 Hashbang
 hashbrown
 hashindex
-hashlink
 hashring
 hashset
 hashsum
@@ -574,7 +569,6 @@ kernelmode
 keybase
 keyclock
 keyid
-keypair
 keyxxxxx
 khvzak
 kib
@@ -778,6 +772,7 @@ NQTP
 nresamples
 nullishness
 numbackends
+oahd
 oap
 OKD
 omfwd
@@ -821,6 +816,7 @@ pathgen
 peekable
 PEMS
 pgmajfault
+pgrep
 PII
 Pitbull
 pkc
@@ -873,6 +869,7 @@ qwe
 raboof
 rande
 RANDFILE
+ratatui
 rawconfig
 rawstring
 rdkafka
@@ -1053,7 +1050,6 @@ supertrait
 suser
 sustainability
 svalue
-Sya
 sysfs
 sysinit
 syslogng
@@ -1114,7 +1110,6 @@ Tomola
 tonydanza
 toolbars
 toolchains
-TOOLSDIRECTORY
 toolset
 toor
 topdir
@@ -1201,6 +1196,7 @@ watchexec
 watchlogs
 wayfor
 webgraphviz
+webpki
 webservers
 websites
 weee
diff --git a/.github/workflows/changes.yml.upstream b/.github/workflows/changes.yml.upstream
index db6c4225073e0..653d3395bdfda 100644
--- a/.github/workflows/changes.yml.upstream
+++ b/.github/workflows/changes.yml.upstream
@@ -70,6 +70,8 @@ on:
         value: ${{ jobs.int_tests.outputs.fluent }}
       gcp:
         value: ${{ jobs.int_tests.outputs.gcp }}
+      greptimedb:
+        value: ${{ jobs.int_tests.outputs.greptimedb }}
       humio:
         value: ${{ jobs.int_tests.outputs.humio }}
       http-client:
@@ -194,6 +196,7 @@ jobs:
       eventstoredb: ${{ steps.filter.outputs.eventstoredb }}
       fluent: ${{ steps.filter.outputs.fluent }}
       gcp: ${{ steps.filter.outputs.gcp }}
+      greptimedb: ${{ steps.filter.outputs.greptimedb }}
       humio: ${{ steps.filter.outputs.humio }}
       http-client: ${{ steps.filter.outputs.http-client }}
       influxdb: ${{ steps.filter.outputs.influxdb }}
diff --git a/.github/workflows/comment-trigger.yml.upstream b/.github/workflows/comment-trigger.yml.upstream
index 84cabd825ccf3..8cb2c3780887e 100644
--- a/.github/workflows/comment-trigger.yml.upstream
+++ b/.github/workflows/comment-trigger.yml.upstream
@@ -15,6 +15,7 @@
 # /ci-run-unit-windows        : runs Unit - Windows
 # /ci-run-environment         : runs Environment Suite
 # /ci-run-regression          : runs Regression Detection Suite
+# /ci-run-k8s                 : runs K8s E2E Suite
 
 name: Comment Trigger
 
@@ -55,15 +56,22 @@ jobs:
           || contains(github.event.comment.body, '/ci-run-unit-windows')
           || contains(github.event.comment.body, '/ci-run-environment')
           || contains(github.event.comment.body, '/ci-run-regression')
+          || contains(github.event.comment.body, '/ci-run-k8s')
       )
     steps:
+      - name: Generate authentication token
+        id: generate_token
+        uses: tibdex/github-app-token@b62528385c34dbc9f38e5f4225ac829252d1ea92
+        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@v2
         with:
           username: ${{ github.actor }}
           team: 'Vector'
-          GITHUB_TOKEN: ${{ secrets.GH_PAT_ORG }}
+          GITHUB_TOKEN: ${{ steps.generate_token.outputs.token }}
 
       - name: Validate author membership
         if: steps.comment.outputs.isTeamMember == 'false'
@@ -116,3 +124,9 @@ jobs:
     if: contains(github.event.comment.body, '/ci-run-all') || contains(github.event.comment.body, '/ci-run-regression')
     uses: ./.github/workflows/regression.yml
     secrets: inherit
+
+  k8s:
+    needs: validate
+    if: contains(github.event.comment.body, '/ci-run-all') || contains(github.event.comment.body, '/ci-run-k8s')
+    uses: ./.github/workflows/k8s_e2e.yml
+    secrets: inherit
diff --git a/.github/workflows/environment.yml.upstream b/.github/workflows/environment.yml.upstream
index cdddb0a980db8..7aa76a5cc2bbb 100644
--- a/.github/workflows/environment.yml.upstream
+++ b/.github/workflows/environment.yml.upstream
@@ -42,7 +42,7 @@ jobs:
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v2.2.0
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2.8.0
+        uses: docker/setup-buildx-action@v2.9.1
       - name: Login to DockerHub
         uses: docker/login-action@v2.1.0
         if: github.ref == 'refs/heads/master'
diff --git a/.github/workflows/gardener_issue_comment.yml.upstream b/.github/workflows/gardener_issue_comment.yml.upstream
index 8ea89fb315145..f25dc9da5e02a 100644
--- a/.github/workflows/gardener_issue_comment.yml.upstream
+++ b/.github/workflows/gardener_issue_comment.yml.upstream
@@ -20,50 +20,74 @@ jobs:
           GH_TOKEN: ${{ secrets.GH_PROJECT_PAT }}
         run: |
           issue_id=${{ github.event.issue.node_id }}
+          echo "issue_id: $issue_id"
 
           # IDs fetched from https://docs.github.com/en/graphql/overview/explorer
           project_id="PVT_kwDOAQFeYs4AAsTr" # Gardener
           status_field_id="PVTF_lADOAQFeYs4AAsTrzgAXRuU" # Status
           triage_option_id="2a08fafa"
 
-          # ensures that the issue is already on board but also seems to be the only way to fetch
-          # the item id
-          item_id="$(gh api graphql -f query='
-            mutation($project_id: ID!, $content_id: ID!) {
-                addProjectV2ItemById(input: {projectId: $project_id, contentId: $content_id}) {
-                  item {
-                    id
-                  }
-                }
-            }' -f project_id="$project_id" -f content_id="$issue_id" -q '.data.addProjectV2ItemById.item.id'
-          )"
-
-          echo "item_id: $item_id"
-
-          if [ -z "$item_id" ] ; then
-            echo "Issue not found in Gardener board"
-            exit 0
-          else
-            echo "Found issue on Gardener board"
-          fi
-
-          current_status="$(gh api graphql -f query='
+          # Query for project items for the given issue
+          project_items="$(gh api graphql -f query='
             query($item_id: ID!) {
               node(id: $item_id) {
-                ... on ProjectV2Item {
-                  fieldValueByName(name: "Status") {
-                    ... on ProjectV2ItemFieldSingleSelectValue {
-                      name
+                ... on Issue {
+                  projectItems(first: 50) {
+                    ... on ProjectV2ItemConnection {
+                      nodes {
+                        fieldValueByName(name: "Status") {
+                          ... on ProjectV2ItemFieldSingleSelectValue {
+                            name
+                          }
+                        }
+                        ... on ProjectV2Item {
+                          id
+                          project {
+                            ... on ProjectV2 {
+                              id
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                }
+                ... on PullRequest {
+                  projectItems(first: 50) {
+                    ... on ProjectV2ItemConnection {
+                      nodes {
+                        fieldValueByName(name: "Status") {
+                          ... on ProjectV2ItemFieldSingleSelectValue {
+                            name
+                          }
+                        }
+                        ... on ProjectV2Item {
+                          id
+                          project {
+                            ... on ProjectV2 {
+                              id
+                            }
+                          }
+                        }
+                      }
                     }
                   }
                 }
               }
-            }' -f item_id="$item_id"
+            }' -f item_id="$issue_id"
           )"
 
-          current_status=$(echo $current_status | jq -c -r '.["data"]["node"]["fieldValueByName"]["name"]')
+          # Extract the item in the Gardener project
+          project=$(echo $project_items | jq -c -r --arg project_id $project_id '.data.node.projectItems.nodes[] | select(.project.id == $project_id)')
+          current_status=$(echo $project | jq -c -r '.fieldValueByName.name')
+          item_id=$(echo $project | jq -c '.id')
 
-          echo "Current issue status is: '${current_status}'"
+          if [ -z "$current_status" ] ; then
+            echo "Issue not found in Gardener board"
+            exit 0
+          else
+            echo "Found issue on Gardener board. Current issue status is: '${current_status}'"
+          fi
 
           if [ "$current_status" = "Blocked / Waiting" ] ; then
             echo "Moving issue from 'Blocked / Waiting' to 'Triage'"
diff --git a/.github/workflows/gardener_open_pr.yml.upstream b/.github/workflows/gardener_open_pr.yml.upstream
index e9b0fef67ba05..4fc84c07cc5ea 100644
--- a/.github/workflows/gardener_open_pr.yml.upstream
+++ b/.github/workflows/gardener_open_pr.yml.upstream
@@ -13,12 +13,18 @@ jobs:
     runs-on: ubuntu-latest
     if: ${{ github.actor != 'dependabot[bot]' }}
     steps:
+      - name: Generate authentication token
+        id: generate_token
+        uses: tibdex/github-app-token@b62528385c34dbc9f38e5f4225ac829252d1ea92
+        with:
+          app_id: ${{ secrets.GH_APP_DATADOG_VECTOR_CI_APP_ID }}
+          private_key: ${{ secrets.GH_APP_DATADOG_VECTOR_CI_APP_PRIVATE_KEY }}
       - uses: tspascoal/get-user-teams-membership@v2
         id: checkVectorMember
         with:
           username: ${{ github.actor }}
           team: vector
-          GITHUB_TOKEN: ${{ secrets.GH_PAT_ORG }}
+          GITHUB_TOKEN: ${{ steps.generate_token.outputs.token }}
       - uses: actions/add-to-project@v0.5.0
         if: ${{ steps.checkVectorMember.outputs.isTeamMember == 'false' }}
         with:
diff --git a/.github/workflows/integration-comment.yml.upstream b/.github/workflows/integration-comment.yml.upstream
index d915a956e2bb8..f6ed21bda71b5 100644
--- a/.github/workflows/integration-comment.yml.upstream
+++ b/.github/workflows/integration-comment.yml.upstream
@@ -47,13 +47,19 @@ jobs:
     runs-on: ubuntu-latest
     if: contains(github.event.comment.body, '/ci-run-integration') || contains(github.event.comment.body, '/ci-run-all')
     steps:
+      - name: Generate authentication token
+        id: generate_token
+        uses: tibdex/github-app-token@b62528385c34dbc9f38e5f4225ac829252d1ea92
+        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@v2
         with:
           username: ${{ github.actor }}
           team: 'Vector'
-          GITHUB_TOKEN: ${{ secrets.GH_PAT_ORG }}
+          GITHUB_TOKEN: ${{ steps.generate_token.outputs.token }}
 
       - name: Validate author membership
         if: steps.comment.outputs.isTeamMember == 'false'
@@ -70,107 +76,330 @@ jobs:
           token: ${{ secrets.GITHUB_TOKEN }}
           status: pending
 
-  test-integration:
-    uses: ./.github/workflows/integration-test.yml
-    with:
-      if: ${{ matrix.run.if }}
-      test_name: ${{ matrix.run.test_name }}
+  integration-tests:
     needs: prep-pr
-    secrets: inherit
-    strategy:
-      fail-fast: false
-      matrix:
-        run:
-          - test_name: 'amqp'
-            if: ${{ contains(github.event.comment.body, '/ci-run-integration-amqp')          || contains(github.event.comment.body, '/ci-run-all') }}
-          - test_name: 'appsignal'
-            if: ${{ contains(github.event.comment.body, '/ci-run-integration-appsignal')     || contains(github.event.comment.body, '/ci-run-all') }}
-          - test_name: 'aws'
-            if: ${{ contains(github.event.comment.body, '/ci-run-integration-aws')           || contains(github.event.comment.body, '/ci-run-all') }}
-          - test_name: 'axiom'
-            if: ${{ contains(github.event.comment.body, '/ci-run-integration-axiom')         || contains(github.event.comment.body, '/ci-run-all') }}
-          - test_name: 'azure'
-            if: ${{ contains(github.event.comment.body, '/ci-run-integration-azure')         || contains(github.event.comment.body, '/ci-run-all') }}
-          - test_name: 'clickhouse'
-            if: ${{ contains(github.event.comment.body, '/ci-run-integration-clickhouse')    || contains(github.event.comment.body, '/ci-run-all') }}
-          - test_name: 'databend'
-            if: ${{ contains(github.event.comment.body, '/ci-run-integration-databend')      || contains(github.event.comment.body, '/ci-run-all') }}
-          - test_name: 'datadog-agent'
-            if: ${{ contains(github.event.comment.body, '/ci-run-integration-datadog')       || contains(github.event.comment.body, '/ci-run-all') }}
-          - test_name: 'datadog-logs'
-            if: ${{ contains(github.event.comment.body, '/ci-run-integration-datadog')       || contains(github.event.comment.body, '/ci-run-all') }}
-          - test_name: 'datadog-metrics'
-            if: ${{ contains(github.event.comment.body, '/ci-run-integration-datadog')       || contains(github.event.comment.body, '/ci-run-all') }}
-          - test_name: 'datadog-traces'
-            if: ${{ contains(github.event.comment.body, '/ci-run-integration-datadog')       || contains(github.event.comment.body, '/ci-run-all') }}
-          - test_name: 'dnstap'
-            if: ${{ contains(github.event.comment.body, '/ci-run-integration-dnstap')        || contains(github.event.comment.body, '/ci-run-all') }}
-          - test_name: 'docker-logs'
-            if: ${{ contains(github.event.comment.body, '/ci-run-integration-docker-logs')   || contains(github.event.comment.body, '/ci-run-all') }}
-          - test_name: 'elasticsearch'
-            if: ${{ contains(github.event.comment.body, '/ci-run-integration-elasticsearch') || contains(github.event.comment.body, '/ci-run-all') }}
-          - test_name: 'eventstoredb'
-            if: ${{ contains(github.event.comment.body, '/ci-run-integration-eventstoredb')  || contains(github.event.comment.body, '/ci-run-all') }}
-          - test_name: 'fluent'
-            if: ${{ contains(github.event.comment.body, '/ci-run-integration-fluent')        || contains(github.event.comment.body, '/ci-run-all') }}
-          - test_name: 'gcp'
-            if: ${{ contains(github.event.comment.body, '/ci-run-integration-gcp')           || contains(github.event.comment.body, '/ci-run-all') }}
-          - test_name: 'humio'
-            if: ${{ contains(github.event.comment.body, '/ci-run-integration-humio')         || contains(github.event.comment.body, '/ci-run-all') }}
-          - test_name: 'http-client'
-            if: ${{ contains(github.event.comment.body, '/ci-run-integration-http-client')   || contains(github.event.comment.body, '/ci-run-all') }}
-          - test_name: 'influxdb'
-            if: ${{ contains(github.event.comment.body, '/ci-run-integration-influxdb')      || contains(github.event.comment.body, '/ci-run-all') }}
-          - test_name: 'kafka'
-            if: ${{ contains(github.event.comment.body, '/ci-run-integration-kafka')         || contains(github.event.comment.body, '/ci-run-all') }}
-          - test_name: 'logstash'
-            if: ${{ contains(github.event.comment.body, '/ci-run-integration-logstash')      || contains(github.event.comment.body, '/ci-run-all') }}
-          - test_name: 'loki'
-            if: ${{ contains(github.event.comment.body, '/ci-run-integration-loki')          || contains(github.event.comment.body, '/ci-run-all') }}
-          - test_name: 'mongodb'
-            if: ${{ contains(github.event.comment.body, '/ci-run-integration-mongodb')       || contains(github.event.comment.body, '/ci-run-all') }}
-          - test_name: 'nats'
-            if: ${{ contains(github.event.comment.body, '/ci-run-integration-nats')          || contains(github.event.comment.body, '/ci-run-all') }}
-          - test_name: 'nginx'
-            if: ${{ contains(github.event.comment.body, '/ci-run-integration-nginx')         || contains(github.event.comment.body, '/ci-run-all') }}
-          - test_name: 'opentelemetry'
-            if: ${{ contains(github.event.comment.body, '/ci-run-integration-opentelemetry') || contains(github.event.comment.body, '/ci-run-all') }}
-          - test_name: 'postgres'
-            if: ${{ contains(github.event.comment.body, '/ci-run-integration-postgres')      || contains(github.event.comment.body, '/ci-run-all') }}
-          - test_name: 'prometheus'
-            if: ${{ contains(github.event.comment.body, '/ci-run-integration-prometheus')    || contains(github.event.comment.body, '/ci-run-all') }}
-          - test_name: 'pulsar'
-            if: ${{ contains(github.event.comment.body, '/ci-run-integration-pulsar')        || contains(github.event.comment.body, '/ci-run-all') }}
-          - test_name: 'redis'
-            if: ${{ contains(github.event.comment.body, '/ci-run-integration-redis')         || contains(github.event.comment.body, '/ci-run-all') }}
-          - test_name: 'shutdown'
-            if: ${{ contains(github.event.comment.body, '/ci-run-integration-shutdown')      || contains(github.event.comment.body, '/ci-run-all') }}
-          - test_name: 'splunk'
-            if: ${{ contains(github.event.comment.body, '/ci-run-integration-splunk')        || contains(github.event.comment.body, '/ci-run-all') }}
-          - test_name: 'webhdfs'
-            if: ${{ contains(github.event.comment.body, '/ci-run-integration-webhdfs')       || contains(github.event.comment.body, '/ci-run-all') }}
+    runs-on: [linux, ubuntu-20.04-4core]
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          submodules: "recursive"
+
+      - run: sudo npm -g install @datadog/datadog-ci
+
+      - run: docker image prune -af ; docker container prune -f
+
+      - name: amqp
+        if: ${{ contains(github.event.comment.body, '/ci-run-integration-amqp') || contains(github.event.comment.body, '/ci-run-all') }}
+        uses: nick-fields/retry@v2
+        with:
+          # First one requires more time, as we need to build the image from scratch
+          timeout_minutes: 30
+          max_attempts: 3
+          command: bash scripts/ci-integration-test.sh amqp
+
+      - name: appsignal
+        if: ${{ contains(github.event.comment.body, '/ci-run-integration-appsignal') || contains(github.event.comment.body, '/ci-run-all') }}
+        uses: nick-fields/retry@v2
+        with:
+          timeout_minutes: 30
+          max_attempts: 3
+          command: bash scripts/ci-integration-test.sh appsignal
+
+      - name: aws
+        if: ${{ contains(github.event.comment.body, '/ci-run-integration-aws') || contains(github.event.comment.body, '/ci-run-all') }}
+        uses: nick-fields/retry@v2
+        with:
+          timeout_minutes: 30
+          max_attempts: 3
+          command: bash scripts/ci-integration-test.sh aws
+
+      - name: axiom
+        if: ${{ contains(github.event.comment.body, '/ci-run-integration-axiom') || contains(github.event.comment.body, '/ci-run-all') }}
+        uses: nick-fields/retry@v2
+        with:
+          timeout_minutes: 30
+          max_attempts: 3
+          command: bash scripts/ci-integration-test.sh axiom
+
+      - name: azure
+        if: ${{ contains(github.event.comment.body, '/ci-run-integration-azure') || contains(github.event.comment.body, '/ci-run-all') }}
+        uses: nick-fields/retry@v2
+        with:
+          timeout_minutes: 30
+          max_attempts: 3
+          command: bash scripts/ci-integration-test.sh azure
+
+      - name: clickhouse
+        if: ${{ contains(github.event.comment.body, '/ci-run-integration-clickhouse') || contains(github.event.comment.body, '/ci-run-all') }}
+        uses: nick-fields/retry@v2
+        with:
+          timeout_minutes: 30
+          max_attempts: 3
+          command: bash scripts/ci-integration-test.sh clickhouse
+
+      - name: databend
+        if: ${{ contains(github.event.comment.body, '/ci-run-integration-databend') || contains(github.event.comment.body, '/ci-run-all') }}
+        uses: nick-fields/retry@v2
+        with:
+          timeout_minutes: 30
+          max_attempts: 3
+          command: bash scripts/ci-integration-test.sh databend
+
+      - name: datadog-agent
+        if: ${{ contains(github.event.comment.body, '/ci-run-integration-datadog-agent') || contains(github.event.comment.body, '/ci-run-all') }}
+        uses: nick-fields/retry@v2
+        with:
+          timeout_minutes: 30
+          max_attempts: 3
+          command: bash scripts/ci-integration-test.sh datadog-agent
+
+      - name: datadog-logs
+        if: ${{ contains(github.event.comment.body, '/ci-run-integration-datadog-logs') || contains(github.event.comment.body, '/ci-run-all') }}
+        uses: nick-fields/retry@v2
+        with:
+          timeout_minutes: 30
+          max_attempts: 3
+          command: bash scripts/ci-integration-test.sh datadog-logs
+
+      - name: datadog-metrics
+        if: ${{ contains(github.event.comment.body, '/ci-run-integration-datadog-metrics') || contains(github.event.comment.body, '/ci-run-all') }}
+        uses: nick-fields/retry@v2
+        with:
+          timeout_minutes: 30
+          max_attempts: 3
+          command: bash scripts/ci-integration-test.sh datadog-metrics
+
+      - name: datadog-traces
+        if: ${{ contains(github.event.comment.body, '/ci-run-integration-datadog-traces') || contains(github.event.comment.body, '/ci-run-all') }}
+        uses: nick-fields/retry@v2
+        with:
+          timeout_minutes: 30
+          max_attempts: 3
+          command: bash scripts/ci-integration-test.sh datadog-traces
+
+      - name: dnstap
+        if: ${{ contains(github.event.comment.body, '/ci-run-integration-dnstap') || contains(github.event.comment.body, '/ci-run-all') }}
+        uses: nick-fields/retry@v2
+        with:
+          timeout_minutes: 30
+          max_attempts: 3
+          command: bash scripts/ci-integration-test.sh dnstap
+
+      - run: docker image prune -af --filter=label!=vector-test-runner=true ; docker container prune -f
+
+      - name: docker-logs
+        if: ${{ contains(github.event.comment.body, '/ci-run-integration-docker-logs') || contains(github.event.comment.body, '/ci-run-all') }}
+        uses: nick-fields/retry@v2
+        with:
+          timeout_minutes: 30
+          max_attempts: 3
+          command: bash scripts/ci-integration-test.sh docker-logs
+
+      - name: elasticsearch
+        if: ${{ contains(github.event.comment.body, '/ci-run-integration-elasticsearch') || contains(github.event.comment.body, '/ci-run-all') }}
+        uses: nick-fields/retry@v2
+        with:
+          timeout_minutes: 30
+          max_attempts: 3
+          command: bash scripts/ci-integration-test.sh elasticsearch
+
+      - name: eventstoredb
+        if: ${{ contains(github.event.comment.body, '/ci-run-integration-eventstoredb') || contains(github.event.comment.body, '/ci-run-all') }}
+        uses: nick-fields/retry@v2
+        with:
+          timeout_minutes: 30
+          max_attempts: 3
+          command: bash scripts/ci-integration-test.sh eventstoredb
+
+      - name: fluent
+        if: ${{ contains(github.event.comment.body, '/ci-run-integration-fluent') || contains(github.event.comment.body, '/ci-run-all') }}
+        uses: nick-fields/retry@v2
+        with:
+          timeout_minutes: 30
+          max_attempts: 3
+          command: bash scripts/ci-integration-test.sh fluent
+
+      - name: gcp
+        if: ${{ contains(github.event.comment.body, '/ci-run-integration-gcp') || contains(github.event.comment.body, '/ci-run-all') }}
+        uses: nick-fields/retry@v2
+        with:
+          timeout_minutes: 30
+          max_attempts: 3
+          command: bash scripts/ci-integration-test.sh gcp
+
+      - name: greptimedb
+        if: ${{ contains(github.event.comment.body, '/ci-run-integration-greptimedb') || contains(github.event.comment.body, '/ci-run-all') }}
+        uses: nick-fields/retry@v2
+        with:
+          timeout_minutes: 30
+          max_attempts: 3
+          command: bash scripts/ci-integration-test.sh greptimedb
+
+      - name: humio
+        if: ${{ contains(github.event.comment.body, '/ci-run-integration-humio') || contains(github.event.comment.body, '/ci-run-all') }}
+        uses: nick-fields/retry@v2
+        with:
+          timeout_minutes: 30
+          max_attempts: 3
+          command: bash scripts/ci-integration-test.sh humio
+
+      - name: http-client
+        if: ${{ contains(github.event.comment.body, '/ci-run-integration-http-client') || contains(github.event.comment.body, '/ci-run-all') }}
+        uses: nick-fields/retry@v2
+        with:
+          timeout_minutes: 30
+          max_attempts: 3
+          command: bash scripts/ci-integration-test.sh http-client
+
+      - name: influxdb
+        if: ${{ contains(github.event.comment.body, '/ci-run-integration-influxdb') || contains(github.event.comment.body, '/ci-run-all') }}
+        uses: nick-fields/retry@v2
+        with:
+          timeout_minutes: 30
+          max_attempts: 3
+          command: bash scripts/ci-integration-test.sh influxdb
+
+      - name: kafka
+        if: ${{ contains(github.event.comment.body, '/ci-run-integration-kafka') || contains(github.event.comment.body, '/ci-run-all') }}
+        uses: nick-fields/retry@v2
+        with:
+          timeout_minutes: 30
+          max_attempts: 3
+          command: bash scripts/ci-integration-test.sh kafka
+
+      - name: logstash
+        if: ${{ contains(github.event.comment.body, '/ci-run-integration-logstash') || contains(github.event.comment.body, '/ci-run-all') }}
+        uses: nick-fields/retry@v2
+        with:
+          timeout_minutes: 30
+          max_attempts: 3
+          command: bash scripts/ci-integration-test.sh logstash
+
+      - name: loki
+        if: ${{ contains(github.event.comment.body, '/ci-run-integration-loki') || contains(github.event.comment.body, '/ci-run-all') }}
+        uses: nick-fields/retry@v2
+        with:
+          timeout_minutes: 30
+          max_attempts: 3
+          command: bash scripts/ci-integration-test.sh loki
+
+      - name: mongodb
+        if: ${{ contains(github.event.comment.body, '/ci-run-integration-mongodb') || contains(github.event.comment.body, '/ci-run-all') }}
+        uses: nick-fields/retry@v2
+        with:
+          timeout_minutes: 30
+          max_attempts: 3
+          command: bash scripts/ci-integration-test.sh mongodb
+
+      - run: docker image prune -af --filter=label!=vector-test-runner=true ; docker container prune -f
+
+      - name: nats
+        if: ${{ contains(github.event.comment.body, '/ci-run-integration-nats') || contains(github.event.comment.body, '/ci-run-all') }}
+        uses: nick-fields/retry@v2
+        with:
+          timeout_minutes: 30
+          max_attempts: 3
+          command: bash scripts/ci-integration-test.sh nats
+
+      - name: nginx
+        if: ${{ contains(github.event.comment.body, '/ci-run-integration-nginx') || contains(github.event.comment.body, '/ci-run-all') }}
+        uses: nick-fields/retry@v2
+        with:
+          timeout_minutes: 30
+          max_attempts: 3
+          command: bash scripts/ci-integration-test.sh nginx
+
+      - name: opentelemetry
+        if: ${{ contains(github.event.comment.body, '/ci-run-integration-opentelemetry') || contains(github.event.comment.body, '/ci-run-all') }}
+        uses: nick-fields/retry@v2
+        with:
+          timeout_minutes: 30
+          max_attempts: 3
+          command: bash scripts/ci-integration-test.sh opentelemetry
+
+      - name: postgres
+        if: ${{ contains(github.event.comment.body, '/ci-run-integration-postgres') || contains(github.event.comment.body, '/ci-run-all') }}
+        uses: nick-fields/retry@v2
+        with:
+          timeout_minutes: 30
+          max_attempts: 3
+          command: bash scripts/ci-integration-test.sh postgres
+
+      - name: prometheus
+        if: ${{ contains(github.event.comment.body, '/ci-run-integration-prometheus') || contains(github.event.comment.body, '/ci-run-all') }}
+        uses: nick-fields/retry@v2
+        with:
+          timeout_minutes: 30
+          max_attempts: 3
+          command: bash scripts/ci-integration-test.sh prometheus
+
+      - name: pulsar
+        if: ${{ contains(github.event.comment.body, '/ci-run-integration-pulsar') || contains(github.event.comment.body, '/ci-run-all') }}
+        uses: nick-fields/retry@v2
+        with:
+          timeout_minutes: 30
+          max_attempts: 3
+          command: bash scripts/ci-integration-test.sh pulsar
+
+      - name: redis
+        if: ${{ contains(github.event.comment.body, '/ci-run-integration-redis') || contains(github.event.comment.body, '/ci-run-all') }}
+        uses: nick-fields/retry@v2
+        with:
+          timeout_minutes: 30
+          max_attempts: 3
+          command: bash scripts/ci-integration-test.sh redis
+
+      - name: shutdown
+        if: ${{ contains(github.event.comment.body, '/ci-run-integration-shutdown') || contains(github.event.comment.body, '/ci-run-all') }}
+        uses: nick-fields/retry@v2
+        with:
+          timeout_minutes: 30
+          max_attempts: 3
+          command: bash scripts/ci-integration-test.sh shutdown
+
+      - name: splunk
+        if: ${{ contains(github.event.comment.body, '/ci-run-integration-splunk') || contains(github.event.comment.body, '/ci-run-all') }}
+        uses: nick-fields/retry@v2
+        with:
+          timeout_minutes: 30
+          max_attempts: 3
+          command: bash scripts/ci-integration-test.sh splunk
+
+      - name: webhdfs
+        if: ${{ contains(github.event.comment.body, '/ci-run-integration-webhdfs') || contains(github.event.comment.body, '/ci-run-all') }}
+        uses: nick-fields/retry@v2
+        with:
+          timeout_minutes: 30
+          max_attempts: 3
+          command: bash scripts/ci-integration-test.sh webhdfs
 
   update-pr-status:
     name: Signal result to PR
     runs-on: ubuntu-latest
-    needs: test-integration
+    needs: integration-tests
     if: always() && (contains(github.event.comment.body, '/ci-run-integration') || contains(github.event.comment.body, '/ci-run-all'))
     steps:
+      - name: Generate authentication token
+        id: generate_token
+        uses: tibdex/github-app-token@b62528385c34dbc9f38e5f4225ac829252d1ea92
+        with:
+          app_id: ${{ secrets.GH_APP_DATADOG_VECTOR_CI_APP_ID }}
+          private_key: ${{ secrets.GH_APP_DATADOG_VECTOR_CI_APP_PRIVATE_KEY }}
       - name: Validate issue comment
         if: github.event_name == 'issue_comment'
         uses: tspascoal/get-user-teams-membership@v2
         with:
           username: ${{ github.actor }}
           team: 'Vector'
-          GITHUB_TOKEN: ${{ secrets.GH_PAT_ORG }}
+          GITHUB_TOKEN: ${{ steps.generate_token.outputs.token }}
 
       - name: (PR comment) Get PR branch
         uses: xt0rted/pull-request-comment-branch@v2
         id: comment-branch
 
-      - name: (PR comment) Submit PR result as ${{ needs.test-integration.result }}
+      - name: (PR comment) Submit PR result as ${{ needs.integration-tests.result }}
         uses: myrotvorets/set-commit-status-action@v1.1.7
         with:
           sha: ${{ steps.comment-branch.outputs.head_sha }}
           token: ${{ secrets.GITHUB_TOKEN }}
-          status: ${{ needs.test-integration.result }}
+          status: ${{ needs.integration-tests.result }}
diff --git a/.github/workflows/integration-test.yml.upstream b/.github/workflows/integration-test.yml.upstream
index 4d8d635fcb477..ce0dbb195ab4b 100644
--- a/.github/workflows/integration-test.yml.upstream
+++ b/.github/workflows/integration-test.yml.upstream
@@ -1,22 +1,12 @@
-# This workflow is used to run an integration test.
-# The most common use case is that it is triggered by another workflow,
-# such as the Master Merge Queue Suite, or the Integration Comment.
+# Integration Test
 #
-# It can also be triggered on manual dispatch in CI however.
-# In that use case, an input for the test name needs to be provided.
+# This workflow is used to run an integration test on demand.
+# An input for the test name needs to be provided.
 # TODO: check if the input is "all" , and run all, without a timeout?
 
 name: Integration Test
 
 on:
-  workflow_call:
-    inputs:
-      if:
-         required: false
-         type: boolean
-      test_name:
-        required: true
-        type: string
   workflow_dispatch:
     inputs:
       test_name:
diff --git a/.github/workflows/integration.yml.upstream b/.github/workflows/integration.yml.upstream
index 7f85870e7dff4..01a2a7dabca3a 100644
--- a/.github/workflows/integration.yml.upstream
+++ b/.github/workflows/integration.yml.upstream
@@ -22,6 +22,9 @@ env:
   CONTAINER_TOOL: "docker"
   DD_ENV: "ci"
   DD_API_KEY: ${{ secrets.DD_API_KEY }}
+  TEST_DATADOG_API_KEY: ${{ secrets.CI_TEST_DATADOG_API_KEY }}
+  TEST_APPSIGNAL_PUSH_API_KEY: ${{ secrets.TEST_APPSIGNAL_PUSH_API_KEY }}
+  AXIOM_TOKEN: ${{ secrets.AXIOM_TOKEN }}
   RUST_BACKTRACE: full
   TEST_LOG: vector=debug
   VERBOSE: true
@@ -34,6 +37,7 @@ env:
 jobs:
 
   changes:
+    if: github.event_name == 'pull_request'
     uses: ./.github/workflows/changes.yml
     with:
       base_ref: ${{ github.event.pull_request.base.ref }}
@@ -42,94 +46,365 @@ jobs:
       int_tests: true
     secrets: inherit
 
-  # Calls the Integration Test workflow for each integration that was detected to have files changed that impact it.
-  integration-matrix:
-    uses: ./.github/workflows/integration-test.yml
-    with:
-      if: ${{ matrix.run.if }}
-      test_name: ${{ matrix.run.test_name }}
-    secrets: inherit
+  integration-tests:
+    name: Integration Tests
+    runs-on: [linux, ubuntu-20.04-4core]
     needs: changes
-    strategy:
-      fail-fast: false
-      matrix:
-        run:
-          - test_name: 'amqp'
-            if: ${{ github.event_name == 'merge_group' || needs.changes.outputs.int-all == 'true' || needs.changes.outputs.amqp == 'true' }}
-          - test_name: 'appsignal'
-            if: ${{ github.event_name == 'merge_group' || needs.changes.outputs.int-all == 'true' || needs.changes.outputs.appsignal == 'true' }}
-          - test_name: 'aws'
-            if: ${{ github.event_name == 'merge_group' || needs.changes.outputs.int-all == 'true' || needs.changes.outputs.aws == 'true' }}
-          - test_name: 'axiom'
-            if: ${{ github.event_name == 'merge_group' || needs.changes.outputs.int-all == 'true' || needs.changes.outputs.axiom == 'true' }}
-          - test_name: 'azure'
-            if: ${{ github.event_name == 'merge_group' || needs.changes.outputs.int-all == 'true' || needs.changes.outputs.azure == 'true' }}
-          - test_name: 'clickhouse'
-            if: ${{ github.event_name == 'merge_group' || needs.changes.outputs.int-all == 'true' || needs.changes.outputs.clickhouse == 'true' }}
-          - test_name: 'databend'
-            if: ${{ github.event_name == 'merge_group' || needs.changes.outputs.int-all == 'true' || needs.changes.outputs.databend == 'true' }}
-          - test_name: 'datadog-agent'
-            if: ${{ github.event_name == 'merge_group' || needs.changes.outputs.int-all == 'true' || needs.changes.outputs.datadog == 'true' }}
-          - test_name: 'datadog-logs'
-            if: ${{ github.event_name == 'merge_group' || needs.changes.outputs.int-all == 'true' || needs.changes.outputs.datadog == 'true' }}
-          - test_name: 'datadog-metrics'
-            if: ${{ github.event_name == 'merge_group' || needs.changes.outputs.int-all == 'true' || needs.changes.outputs.datadog == 'true' }}
-          - test_name: 'datadog-traces'
-            if: ${{ github.event_name == 'merge_group' || needs.changes.outputs.int-all == 'true' || needs.changes.outputs.datadog == 'true' }}
-          - test_name: 'dnstap'
-            if: ${{ github.event_name == 'merge_group' || needs.changes.outputs.int-all == 'true' || needs.changes.outputs.dnstap == 'true' }}
-          - test_name: 'docker-logs'
-            if: ${{ github.event_name == 'merge_group' || needs.changes.outputs.int-all == 'true' || needs.changes.outputs.docker-logs == 'true' }}
-          - test_name: 'elasticsearch'
-            if: ${{ github.event_name == 'merge_group' || needs.changes.outputs.int-all == 'true' || needs.changes.outputs.elasticsearch == 'true' }}
-          - test_name: 'eventstoredb'
-            if: ${{ github.event_name == 'merge_group' || needs.changes.outputs.int-all == 'true' || needs.changes.outputs.eventstoredb == 'true' }}
-          - test_name: 'fluent'
-            if: ${{ github.event_name == 'merge_group' || needs.changes.outputs.int-all == 'true' || needs.changes.outputs.fluent == 'true' }}
-          - test_name: 'gcp'
-            if: ${{ github.event_name == 'merge_group' || needs.changes.outputs.int-all == 'true' || needs.changes.outputs.gcp == 'true' }}
-          - test_name: 'humio'
-            if: ${{ github.event_name == 'merge_group' || needs.changes.outputs.int-all == 'true' || needs.changes.outputs.humio == 'true' }}
-          - test_name: 'http-client'
-            if: ${{ github.event_name == 'merge_group' || needs.changes.outputs.int-all == 'true' || needs.changes.outputs.http-client == 'true' }}
-          - test_name: 'influxdb'
-            if: ${{ github.event_name == 'merge_group' || needs.changes.outputs.int-all == 'true' || needs.changes.outputs.influxdb == 'true' }}
-          - test_name: 'kafka'
-            if: ${{ github.event_name == 'merge_group' || needs.changes.outputs.int-all == 'true' || needs.changes.outputs.kafka == 'true' }}
-          - test_name: 'logstash'
-            if: ${{ github.event_name == 'merge_group' || needs.changes.outputs.int-all == 'true' || needs.changes.outputs.logstash == 'true' }}
-          - test_name: 'loki'
-            if: ${{ github.event_name == 'merge_group' || needs.changes.outputs.int-all == 'true' || needs.changes.outputs.loki == 'true' }}
-          - test_name: 'mongodb'
-            if: ${{ github.event_name == 'merge_group' || needs.changes.outputs.int-all == 'true' || needs.changes.outputs.mongodb == 'true' }}
-          - test_name: 'nats'
-            if: ${{ github.event_name == 'merge_group' || needs.changes.outputs.int-all == 'true' || needs.changes.outputs.nats == 'true' }}
-          - test_name: 'nginx'
-            if: ${{ github.event_name == 'merge_group' || needs.changes.outputs.int-all == 'true' || needs.changes.outputs.nginx == 'true' }}
-          - test_name: 'opentelemetry'
-            if: ${{ github.event_name == 'merge_group' || needs.changes.outputs.int-all == 'true' || needs.changes.outputs.opentelemetry == 'true' }}
-          - test_name: 'postgres'
-            if: ${{ github.event_name == 'merge_group' || needs.changes.outputs.int-all == 'true' || needs.changes.outputs.postgres == 'true' }}
-          - test_name: 'prometheus'
-            if: ${{ github.event_name == 'merge_group' || needs.changes.outputs.int-all == 'true' || needs.changes.outputs.prometheus == 'true' }}
-          - test_name: 'pulsar'
-            if: ${{ github.event_name == 'merge_group' || needs.changes.outputs.int-all == 'true' || needs.changes.outputs.pulsar == 'true' }}
-          - test_name: 'redis'
-            if: ${{ github.event_name == 'merge_group' || needs.changes.outputs.int-all == 'true' || needs.changes.outputs.redis == 'true' }}
-          - test_name: 'shutdown'
-            if: ${{ github.event_name == 'merge_group' || needs.changes.outputs.int-all == 'true' }}
-          - test_name: 'splunk'
-            if: ${{ github.event_name == 'merge_group' || needs.changes.outputs.int-all == 'true' || needs.changes.outputs.splunk == 'true' }}
-          - test_name: 'webhdfs'
-            if: ${{ github.event_name == 'merge_group' || needs.changes.outputs.int-all == 'true' || needs.changes.outputs.webhdfs == 'true' }}
-
-  # This is a required status check, so it always needs to run if prior jobs failed, in order to mark the status correctly.
-  integration:
+    if: always() && (
+      github.event_name == 'merge_group' || (
+          needs.changes.outputs.all-int == 'true'
+            || needs.changes.outputs.amqp == 'true'
+            || needs.changes.outputs.appsignal == 'true'
+            || needs.changes.outputs.aws == 'true'
+            || needs.changes.outputs.axiom == 'true'
+            || needs.changes.outputs.azure == 'true'
+            || needs.changes.outputs.clickhouse == 'true'
+            || needs.changes.outputs.databend == 'true'
+            || needs.changes.outputs.datadog == 'true'
+            || needs.changes.outputs.dnstap == 'true'
+            || needs.changes.outputs.docker-logs == 'true'
+            || needs.changes.outputs.elasticsearch == 'true'
+            || needs.changes.outputs.eventstoredb == 'true'
+            || needs.changes.outputs.fluent == 'true'
+            || needs.changes.outputs.gcp == 'true'
+            || needs.changes.outputs.greptimedb == 'true'
+            || needs.changes.outputs.humio == 'true'
+            || needs.changes.outputs.http-client == 'true'
+            || needs.changes.outputs.influxdb == 'true'
+            || needs.changes.outputs.kafka == 'true'
+            || needs.changes.outputs.logstash == 'true'
+            || needs.changes.outputs.loki == 'true'
+            || needs.changes.outputs.mongodb == 'true'
+            || needs.changes.outputs.nats == 'true'
+            || needs.changes.outputs.nginx == 'true'
+            || needs.changes.outputs.opentelemetry == 'true'
+            || needs.changes.outputs.postgres == 'true'
+            || needs.changes.outputs.prometheus == 'true'
+            || needs.changes.outputs.pulsar == 'true'
+            || needs.changes.outputs.redis == 'true'
+            || needs.changes.outputs.splunk == 'true'
+            || needs.changes.outputs.webhdfs == 'true'
+        )
+      )
+    timeout-minutes: 75
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          submodules: "recursive"
+
+      - run: sudo npm -g install @datadog/datadog-ci
+
+      - run: docker image prune -af ; docker container prune -f
+
+      - name: Determine if secrets are defined (PR author is team member).
+        if: github.event_name == 'pull_request'
+        env:
+          GH_APP_DATADOG_VECTOR_CI_APP_ID: ${{ secrets.GH_APP_DATADOG_VECTOR_CI_APP_ID }}
+        run: |
+          if [[ "$GH_APP_DATADOG_VECTOR_CI_APP_ID" != "" ]] ; then
+            echo "PR_HAS_ACCESS_TO_SECRETS=true" >> "$GITHUB_ENV"
+          else
+            echo "PR_HAS_ACCESS_TO_SECRETS=false" >> "$GITHUB_ENV"
+          fi
+
+      - if: ${{ github.event_name == 'merge_group' || needs.changes.outputs.all-int == 'true' || needs.changes.outputs.amqp == 'true' }}
+        name: amqp
+        uses: nick-fields/retry@v2
+        with:
+          timeout_minutes: 30
+          max_attempts: 3
+          command: bash scripts/ci-integration-test.sh amqp
+
+      - if: (github.event_name == 'merge_group' || needs.changes.outputs.all-int == 'true' || needs.changes.outputs.appsignal == 'true') &&
+          (github.event_name != 'pull_request' || env.PR_HAS_ACCESS_TO_SECRETS == 'true')
+        name: appsignal
+        uses: nick-fields/retry@v2
+        with:
+          timeout_minutes: 30
+          max_attempts: 3
+          command: bash scripts/ci-integration-test.sh  appsignal
+
+      - if: ${{ github.event_name == 'merge_group' || needs.changes.outputs.all-int == 'true' || needs.changes.outputs.aws == 'true' }}
+        name: aws
+        uses: nick-fields/retry@v2
+        with:
+          timeout_minutes: 30
+          max_attempts: 3
+          command: bash scripts/ci-integration-test.sh  aws
+
+      - if: (github.event_name == 'merge_group' || needs.changes.outputs.all-int == 'true' || needs.changes.outputs.axiom == 'true') &&
+          (github.event_name != 'pull_request' || env.PR_HAS_ACCESS_TO_SECRETS == 'true')
+        name: axiom
+        uses: nick-fields/retry@v2
+        with:
+          timeout_minutes: 30
+          max_attempts: 3
+          command: bash scripts/ci-integration-test.sh  axiom
+
+      - if: ${{ github.event_name == 'merge_group' || needs.changes.outputs.all-int == 'true' || needs.changes.outputs.azure == 'true' }}
+        name: azure
+        uses: nick-fields/retry@v2
+        with:
+          timeout_minutes: 30
+          max_attempts: 3
+          command: bash scripts/ci-integration-test.sh  azure
+
+      - if: ${{ github.event_name == 'merge_group' || needs.changes.outputs.all-int == 'true' || needs.changes.outputs.clickhouse == 'true' }}
+        name: clickhouse
+        uses: nick-fields/retry@v2
+        with:
+          timeout_minutes: 30
+          max_attempts: 3
+          command: bash scripts/ci-integration-test.sh  clickhouse
+
+      - if: (github.event_name == 'merge_group' || needs.changes.outputs.all-int == 'true' || needs.changes.outputs.databend == 'true') &&
+          (github.event_name != 'pull_request' || env.PR_HAS_ACCESS_TO_SECRETS == 'true')
+        name: databend
+        uses: nick-fields/retry@v2
+        with:
+          timeout_minutes: 30
+          max_attempts: 3
+          command: bash scripts/ci-integration-test.sh  databend
+
+      - if: (github.event_name == 'merge_group' || needs.changes.outputs.all-int == 'true' || needs.changes.outputs.datadog == 'true') &&
+          (github.event_name != 'pull_request' || env.PR_HAS_ACCESS_TO_SECRETS == 'true')
+        name: datadog-agent
+        uses: nick-fields/retry@v2
+        with:
+          timeout_minutes: 30
+          max_attempts: 3
+          command: bash scripts/ci-integration-test.sh  datadog-agent
+
+      - if: (github.event_name == 'merge_group' || needs.changes.outputs.all-int == 'true' || needs.changes.outputs.datadog == 'true') &&
+          (github.event_name != 'pull_request' || env.PR_HAS_ACCESS_TO_SECRETS == 'true')
+        name: datadog-logs
+        uses: nick-fields/retry@v2
+        with:
+          timeout_minutes: 30
+          max_attempts: 3
+          command: bash scripts/ci-integration-test.sh  datadog-logs
+
+      - if: (github.event_name == 'merge_group' || needs.changes.outputs.all-int == 'true' || needs.changes.outputs.datadog == 'true') &&
+          (github.event_name != 'pull_request' || env.PR_HAS_ACCESS_TO_SECRETS == 'true')
+        name: datadog-metrics
+        uses: nick-fields/retry@v2
+        with:
+          timeout_minutes: 30
+          max_attempts: 3
+          command: bash scripts/ci-integration-test.sh  datadog-metrics
+
+      - if: (github.event_name == 'merge_group' || needs.changes.outputs.all-int == 'true' || needs.changes.outputs.datadog == 'true') &&
+          (github.event_name != 'pull_request' || env.PR_HAS_ACCESS_TO_SECRETS == 'true')
+        name: datadog-traces
+        uses: nick-fields/retry@v2
+        with:
+          timeout_minutes: 30
+          max_attempts: 3
+          command: bash scripts/ci-integration-test.sh  datadog-traces
+
+      - if: ${{ github.event_name == 'merge_group' || needs.changes.outputs.all-int == 'true' || needs.changes.outputs.dnstap == 'true' }}
+        name: dnstap
+        uses: nick-fields/retry@v2
+        with:
+          timeout_minutes: 30
+          max_attempts: 3
+          command: bash scripts/ci-integration-test.sh  dnstap
+
+      - run: docker image prune -af --filter=label!=vector-test-runner=true ; docker container prune -f
+
+      - if: ${{ github.event_name == 'merge_group' || needs.changes.outputs.all-int == 'true' || needs.changes.outputs.docker-logs == 'true' }}
+        name: docker-logs
+        uses: nick-fields/retry@v2
+        with:
+          timeout_minutes: 30
+          max_attempts: 3
+          command: bash scripts/ci-integration-test.sh  docker-logs
+
+      - if: ${{ github.event_name == 'merge_group' || needs.changes.outputs.all-int == 'true' || needs.changes.outputs.elasticsearch == 'true' }}
+        name: elasticsearch
+        uses: nick-fields/retry@v2
+        with:
+          timeout_minutes: 30
+          max_attempts: 3
+          command: bash scripts/ci-integration-test.sh  elasticsearch
+
+      - if: ${{ github.event_name == 'merge_group' || needs.changes.outputs.all-int == 'true' || needs.changes.outputs.eventstoredb == 'true' }}
+        name: eventstoredb
+        uses: nick-fields/retry@v2
+        with:
+          timeout_minutes: 30
+          max_attempts: 3
+          command: bash scripts/ci-integration-test.sh  eventstoredb
+
+      - if: ${{ github.event_name == 'merge_group' || needs.changes.outputs.all-int == 'true' || needs.changes.outputs.fluent == 'true' }}
+        name: fluent
+        uses: nick-fields/retry@v2
+        with:
+          timeout_minutes: 30
+          max_attempts: 3
+          command: bash scripts/ci-integration-test.sh  fluent
+
+      - if: ${{ github.event_name == 'merge_group' || needs.changes.outputs.all-int == 'true' || needs.changes.outputs.gcp == 'true' }}
+        name: gcp
+        uses: nick-fields/retry@v2
+        with:
+          timeout_minutes: 30
+          max_attempts: 3
+          command: bash scripts/ci-integration-test.sh  gcp
+
+      - if: ${{ github.event_name == 'merge_group' || needs.changes.outputs.all-int == 'true' || needs.changes.outputs.greptimedb == 'true' }}
+        name: greptimedb
+        uses: nick-fields/retry@v2
+        with:
+          timeout_minutes: 30
+          max_attempts: 3
+          command: bash scripts/ci-integration-test.sh  greptimedb
+
+      - if: ${{ github.event_name == 'merge_group' || needs.changes.outputs.all-int == 'true' || needs.changes.outputs.humio == 'true' }}
+        name: humio
+        uses: nick-fields/retry@v2
+        with:
+          timeout_minutes: 30
+          max_attempts: 3
+          command: bash scripts/ci-integration-test.sh  humio
+
+      - if: ${{ github.event_name == 'merge_group' || needs.changes.outputs.all-int == 'true' || needs.changes.outputs.http-client == 'true' }}
+        name: http-client
+        uses: nick-fields/retry@v2
+        with:
+          timeout_minutes: 30
+          max_attempts: 3
+          command: bash scripts/ci-integration-test.sh  http-client
+
+      - if: ${{ github.event_name == 'merge_group' || needs.changes.outputs.all-int == 'true' || needs.changes.outputs.influxdb == 'true' }}
+        name: influxdb
+        uses: nick-fields/retry@v2
+        with:
+          timeout_minutes: 30
+          max_attempts: 3
+          command: bash scripts/ci-integration-test.sh  influxdb
+
+      - if: ${{ github.event_name == 'merge_group' || needs.changes.outputs.all-int == 'true' || needs.changes.outputs.kafka == 'true' }}
+        name: kafka
+        uses: nick-fields/retry@v2
+        with:
+          timeout_minutes: 30
+          max_attempts: 3
+          command: bash scripts/ci-integration-test.sh  kafka
+
+      - if: ${{ github.event_name == 'merge_group' || needs.changes.outputs.all-int == 'true' || needs.changes.outputs.logstash == 'true' }}
+        name: logstash
+        uses: nick-fields/retry@v2
+        with:
+          timeout_minutes: 30
+          max_attempts: 3
+          command: bash scripts/ci-integration-test.sh  logstash
+
+      - if: ${{ github.event_name == 'merge_group' || needs.changes.outputs.all-int == 'true' || needs.changes.outputs.loki == 'true' }}
+        name: loki
+        uses: nick-fields/retry@v2
+        with:
+          timeout_minutes: 30
+          max_attempts: 3
+          command: bash scripts/ci-integration-test.sh  loki
+
+      - if: ${{ github.event_name == 'merge_group' || needs.changes.outputs.all-int == 'true' || needs.changes.outputs.mongodb == 'true' }}
+        name: mongodb
+        uses: nick-fields/retry@v2
+        with:
+          timeout_minutes: 30
+          max_attempts: 3
+          command: bash scripts/ci-integration-test.sh  mongodb
+
+      - run: docker image prune -af --filter=label!=vector-test-runner=true ; docker container prune -f
+
+      - if: ${{ github.event_name == 'merge_group' || needs.changes.outputs.all-int == 'true' || needs.changes.outputs.nats == 'true' }}
+        name: nats
+        uses: nick-fields/retry@v2
+        with:
+          timeout_minutes: 30
+          max_attempts: 3
+          command: bash scripts/ci-integration-test.sh  nats
+
+      - if: ${{ github.event_name == 'merge_group' || needs.changes.outputs.all-int == 'true' || needs.changes.outputs.nginx == 'true' }}
+        name: nginx
+        uses: nick-fields/retry@v2
+        with:
+          timeout_minutes: 30
+          max_attempts: 3
+          command: bash scripts/ci-integration-test.sh  nginx
+
+      - if: ${{ github.event_name == 'merge_group' || needs.changes.outputs.all-int == 'true' || needs.changes.outputs.opentelemetry == 'true' }}
+        name: opentelemetry
+        uses: nick-fields/retry@v2
+        with:
+          timeout_minutes: 30
+          max_attempts: 3
+          command: bash scripts/ci-integration-test.sh  opentelemetry
+
+      - if: ${{ github.event_name == 'merge_group' || needs.changes.outputs.all-int == 'true' || needs.changes.outputs.postgres == 'true' }}
+        name: postgres
+        uses: nick-fields/retry@v2
+        with:
+          timeout_minutes: 30
+          max_attempts: 3
+          command: bash scripts/ci-integration-test.sh  postgres
+
+      - if: ${{ github.event_name == 'merge_group' || needs.changes.outputs.all-int == 'true' || needs.changes.outputs.prometheus == 'true' }}
+        name: prometheus
+        uses: nick-fields/retry@v2
+        with:
+          timeout_minutes: 30
+          max_attempts: 3
+          command: bash scripts/ci-integration-test.sh  prometheus
+
+      - if: ${{ github.event_name == 'merge_group' || needs.changes.outputs.all-int == 'true' || needs.changes.outputs.pulsar == 'true' }}
+        name: pulsar
+        uses: nick-fields/retry@v2
+        with:
+          timeout_minutes: 30
+          max_attempts: 3
+          command: bash scripts/ci-integration-test.sh  pulsar
+
+      - if: ${{ github.event_name == 'merge_group' || needs.changes.outputs.all-int == 'true' || needs.changes.outputs.redis == 'true' }}
+        name: redis
+        uses: nick-fields/retry@v2
+        with:
+          timeout_minutes: 30
+          max_attempts: 3
+          command: bash scripts/ci-integration-test.sh  redis
+
+      - if: ${{ github.event_name == 'merge_group' || needs.changes.outputs.all-int == 'true' }}
+        name: shutdown
+        uses: nick-fields/retry@v2
+        with:
+          timeout_minutes: 30
+          max_attempts: 3
+          command: bash scripts/ci-integration-test.sh  shutdown
+
+      - if: ${{ github.event_name == 'merge_group' || needs.changes.outputs.all-int == 'true' || needs.changes.outputs.splunk == 'true' }}
+        name: splunk
+        uses: nick-fields/retry@v2
+        with:
+          timeout_minutes: 30
+          max_attempts: 3
+          command: bash scripts/ci-integration-test.sh  splunk
+
+      - if: ${{ github.event_name == 'merge_group' || needs.changes.outputs.all-int == 'true' || needs.changes.outputs.webhdfs == 'true' }}
+        name: webhdfs
+        uses: nick-fields/retry@v2
+        with:
+          timeout_minutes: 30
+          max_attempts: 3
+          command: bash scripts/ci-integration-test.sh  webhdfs
+
+  integration-test-suite:
     name: Integration Test Suite
     runs-on: ubuntu-latest
     if: always()
     needs:
-      - integration-matrix
+      - changes
+      - integration-tests
     env:
       FAILED: ${{ contains(needs.*.result, 'failure') }}
     steps:
diff --git a/.github/workflows/k8s_e2e.yml.upstream b/.github/workflows/k8s_e2e.yml.upstream
index e7faa3a59555a..a2c09a760a8cf 100644
--- a/.github/workflows/k8s_e2e.yml.upstream
+++ b/.github/workflows/k8s_e2e.yml.upstream
@@ -16,9 +16,8 @@ name: K8S E2E Suite
 
 on:
   workflow_dispatch:
+  workflow_call:
   pull_request:
-  issue_comment:
-    types: [created]
   merge_group:
     types: [checks_requested]
   schedule:
@@ -27,7 +26,6 @@ on:
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.number || github.event.comment.html_url || github.event.merge_group.head_sha || github.event.schedule || github.sha }}
-
   cancel-in-progress: true
 
 env:
@@ -42,31 +40,9 @@ env:
   PROFILE: debug
 
 jobs:
-  validate:
-    name: Validate comment
-    runs-on: ubuntu-latest
-    if: |
-      github.event_name != 'issue_comment' ||
-      ( github.event.issue.pull_request &&
-        ( contains(github.event.comment.body, '/ci-run-all') ||
-          contains(github.event.comment.body, '/ci-run-k8s')
-        )
-      )
-    steps:
-      - name: Get PR comment author
-        id: comment
-        uses: tspascoal/get-user-teams-membership@v2
-        with:
-          username: ${{ github.actor }}
-          team: 'Vector'
-          GITHUB_TOKEN: ${{ secrets.GH_PAT_ORG }}
-
-      - name: Validate author membership
-        if: steps.comment.outputs.isTeamMember == 'false'
-        run: exit 1
-
   changes:
-    needs: validate
+    # Only evaluate files changed on pull request trigger
+    if: github.event_name == 'pull_request'
     uses: ./.github/workflows/changes.yml
     with:
       base_ref: ${{ github.event.pull_request.base.ref }}
@@ -76,8 +52,9 @@ jobs:
   build-x86_64-unknown-linux-gnu:
     name: Build - x86_64-unknown-linux-gnu
     runs-on: [linux, ubuntu-20.04-4core]
-    needs: [changes, validate]
-    if: github.event_name != 'pull_request' || needs.changes.outputs.k8s == 'true'
+    needs: changes
+    # Run this job even if `changes` job is skipped (non- pull request trigger)
+    if: ${{ !failure() && !cancelled() && (github.event_name != 'pull_request' || needs.changes.outputs.k8s == 'true') }}
     # cargo-deb requires a release build, but we don't need optimizations for tests
     env:
       CARGO_PROFILE_RELEASE_OPT_LEVEL: 0
@@ -141,8 +118,9 @@ jobs:
   compute-k8s-test-plan:
     name: Compute K8s test plan
     runs-on: ubuntu-latest
-    needs: [changes, validate]
-    if: github.event_name != 'pull_request' || needs.changes.outputs.k8s == 'true'
+    needs: changes
+    # Run this job even if `changes` job is skipped
+    if: ${{ !failure() && !cancelled() && (github.event_name != 'pull_request' || needs.changes.outputs.k8s == 'true') }}
     outputs:
       matrix: ${{ steps.set-matrix.outputs.matrix }}
     steps:
@@ -195,9 +173,10 @@ jobs:
     name: K8s ${{ matrix.kubernetes_version.version }} / ${{ matrix.container_runtime }} (${{ matrix.kubernetes_version.role }})
     runs-on: [linux, ubuntu-20.04-4core]
     needs:
-      - validate
       - build-x86_64-unknown-linux-gnu
       - compute-k8s-test-plan
+    # because `changes` job might be skipped
+    if: always() && needs.build-x86_64-unknown-linux-gnu.result == 'success' && needs.compute-k8s-test-plan.result == 'success'
     strategy:
       matrix: ${{ fromJson(needs.compute-k8s-test-plan.outputs.matrix) }}
       fail-fast: false
@@ -246,20 +225,22 @@ jobs:
   final-result:
     name: K8s E2E Suite
     runs-on: ubuntu-latest
-    needs: [test-e2e-kubernetes, validate]
-    if: |
-      always() && (github.event_name != 'issue_comment' || (github.event.issue.pull_request
-        && (contains(github.event.comment.body, '/ci-run-k8s') || contains(github.event.comment.body, '/ci-run-all'))))
+    needs:
+      - changes
+      - build-x86_64-unknown-linux-gnu
+      - compute-k8s-test-plan
+      - test-e2e-kubernetes
+    if: always()
     env:
       FAILED: ${{ contains(needs.*.result, 'failure') }}
     steps:
       - name: (PR comment) Get PR branch
-        if: success() && github.event_name == 'issue_comment'
+        if: github.event_name == 'issue_comment' && env.FAILED != 'true'
         uses: xt0rted/pull-request-comment-branch@v2
         id: comment-branch
 
       - name: (PR comment) Submit PR result as success
-        if: success() && github.event_name == 'issue_comment'
+        if: github.event_name == 'issue_comment' && env.FAILED != 'true'
         uses: myrotvorets/set-commit-status-action@v1.1.7
         with:
           sha: ${{ steps.comment-branch.outputs.head_sha }}
diff --git a/.github/workflows/publish.yml.upstream b/.github/workflows/publish.yml.upstream
index 8265f10e6f5c0..20644e2bba50e 100644
--- a/.github/workflows/publish.yml.upstream
+++ b/.github/workflows/publish.yml.upstream
@@ -296,10 +296,10 @@ jobs:
           - ubuntu:18.04
           - ubuntu:20.04
           - ubuntu:22.04
-          - ubuntu:22.10
           - ubuntu:23.04
           - debian:10
           - debian:11
+          - debian:12
     container:
       image: ${{ matrix.container }}
     steps:
@@ -441,7 +441,7 @@ jobs:
           platforms: all
       - name: Set up Docker Buildx
         id: buildx
-        uses: docker/setup-buildx-action@v2.8.0
+        uses: docker/setup-buildx-action@v2.9.1
         with:
           version: latest
           install: true
diff --git a/.github/workflows/regression.yml.upstream b/.github/workflows/regression.yml.upstream
index 4d770d496486f..d50a5d4969ea8 100644
--- a/.github/workflows/regression.yml.upstream
+++ b/.github/workflows/regression.yml.upstream
@@ -37,6 +37,9 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.event.merge_group.head_sha || github.sha }}
   cancel-in-progress: true
 
+env:
+  SINGLE_MACHINE_PERFORMANCE_API: ${{ secrets.SINGLE_MACHINE_PERFORMANCE_API }}
+
 jobs:
 
   # Only run this workflow if files changed in areas that could possibly introduce a regression
@@ -229,8 +232,8 @@ jobs:
           export REPLICAS="10"
           export TOTAL_SAMPLES="600"
           export P_VALUE="0.1"
-          export SMP_CRATE_VERSION="0.7.3"
-          export LADING_VERSION="0.12.0"
+          export SMP_CRATE_VERSION="0.10.0"
+          export LADING_VERSION="0.18.0"
 
           echo "warmup seconds: ${WARMUP_SECONDS}"
           echo "replicas: ${REPLICAS}"
@@ -295,7 +298,7 @@ jobs:
 
       - name: Set up Docker Buildx
         id: buildx
-        uses: docker/setup-buildx-action@v2.8.0
+        uses: docker/setup-buildx-action@v2.9.1
 
       - name: Build 'vector' target image
         uses: docker/build-push-action@v4.1.1
@@ -332,7 +335,7 @@ jobs:
 
       - name: Set up Docker Buildx
         id: buildx
-        uses: docker/setup-buildx-action@v2.8.0
+        uses: docker/setup-buildx-action@v2.9.1
 
       - name: Build 'vector' target image
         uses: docker/build-push-action@v4.1.1
diff --git a/.github/workflows/test.yml.upstream b/.github/workflows/test.yml.upstream
index 918880c6b8ada..6d68eaf5ffb38 100644
--- a/.github/workflows/test.yml.upstream
+++ b/.github/workflows/test.yml.upstream
@@ -124,7 +124,7 @@ jobs:
     name: Test Suite
     runs-on: ubuntu-20.04
     if: always()
-    needs: checks
+    needs: [changes, checks]
     env:
       FAILED: ${{ contains(needs.*.result, 'failure') }}
     steps:
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index c993c8de4dc1a..fe68054dd30dc 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -224,13 +224,13 @@ Integration tests are not run by default when running
 
 ### Deprecations
 
-When deprecating functionality in Vector, see [DEPRECATION.md](DEPRECATION.md).
+When deprecating functionality in Vector, see [DEPRECATION.md](docs/DEPRECATION.md).
 
 ### Dependencies
 
 When adding, modifying, or removing a dependency in Vector you may find that you need to update the
 inventory of third-party licenses maintained in `LICENSE-3rdparty.csv`. This file is generated using
-[rust-license-tool](https://github.com/DataDog/rust-license-tool.git) and can be updated using
+[dd-rust-license-tool](https://github.com/DataDog/rust-license-tool.git) and can be updated using
 `cargo vdev build licenses`.
 
 ## Next steps
@@ -238,9 +238,9 @@ inventory of third-party licenses maintained in `LICENSE-3rdparty.csv`. This fil
 As discussed in the [`README`](README.md), you should continue to the following
 documents:
 
-1. **[DEVELOPING.md](DEVELOPING.md)** - Everything necessary to develop
-2. **[DOCUMENTING.md](DOCUMENTING.md)** - Preparing your change for Vector users
-3. **[DEPRECATION.md](DEPRECATION.md)** - Deprecating functionality in Vector
+1. **[DEVELOPING.md](docs/DEVELOPING.md)** - Everything necessary to develop
+2. **[DOCUMENTING.md](docs/DOCUMENTING.md)** - Preparing your change for Vector users
+3. **[DEPRECATION.md](docs/DEPRECATION.md)** - Deprecating functionality in Vector
 
 ## Legal
 
diff --git a/Cargo.lock b/Cargo.lock
index 1a08d3073263d..efa09ba0b000b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -20,9 +20,9 @@ checksum = "8b5ace29ee3216de37c0546865ad08edef58b0f9e76838ed8959a84a990e58c5"
 
 [[package]]
 name = "addr2line"
-version = "0.21.0"
+version = "0.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb"
+checksum = "a76fd60b23679b7d19bd066031410fb7e458ccc5e958eb5c325888ce4baedc97"
 dependencies = [
  "gimli",
 ]
@@ -39,6 +39,16 @@ version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "aae1277d39aeec15cb388266ecc24b11c80469deae6067e17a1a7aa9e5c1f234"
 
+[[package]]
+name = "aead"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d122413f284cf2d62fb1b7db97e02edb8cda96d769b16e443a4f6195e35662b0"
+dependencies = [
+ "crypto-common",
+ "generic-array",
+]
+
 [[package]]
 name = "aes"
 version = "0.8.2"
@@ -63,24 +73,14 @@ dependencies = [
 
 [[package]]
 name = "ahash"
-version = "0.8.6"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91429305e9f0a25f6205c5b8e0d2db09e0708a7a6df0f42212bb56c32c8ac97a"
+checksum = "bf6ccdb167abbf410dcb915cabd428929d7f6a04980b54a11f26a39f1c7f7107"
 dependencies = [
  "cfg-if",
  "getrandom 0.2.10",
  "once_cell",
  "version_check",
- "zerocopy 0.7.31",
-]
-
-[[package]]
-name = "aho-corasick"
-version = "0.7.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac"
-dependencies = [
- "memchr",
 ]
 
 [[package]]
@@ -170,6 +170,21 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "anstream"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0ca84f3628370c59db74ee214b3263d58f9aadd9b4fe7e711fd87dc452b7f163"
+dependencies = [
+ "anstyle 1.0.0",
+ "anstyle-parse",
+ "anstyle-query",
+ "anstyle-wincon",
+ "colorchoice",
+ "is-terminal",
+ "utf8parse",
+]
+
 [[package]]
 name = "anstyle"
 version = "0.3.1"
@@ -182,11 +197,39 @@ version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "41ed9a86bf92ae6580e0a31281f65a1b1d867c0cc68d5346e2ae128dddfa6a7d"
 
+[[package]]
+name = "anstyle-parse"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "938874ff5980b03a87c5524b3ae5b59cf99b1d6bc836848df7bc5ada9643c333"
+dependencies = [
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle-query"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b"
+dependencies = [
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "anstyle-wincon"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "180abfa45703aebe0093f79badacc01b8fd4ea2e35118747e5811127f926e188"
+dependencies = [
+ "anstyle 1.0.0",
+ "windows-sys 0.48.0",
+]
+
 [[package]]
 name = "anyhow"
-version = "1.0.71"
+version = "1.0.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8"
+checksum = "3b13c32d80ecc7ab747b80c3784bce54ee8a7a0cc4fbda9bf4cda2cf6fe90854"
 
 [[package]]
 name = "anymap"
@@ -196,12 +239,12 @@ checksum = "8f1f8f5a6f3d50d89e3797d7593a50f96bb2aaa20ca0cc7be1fb673232c91d72"
 
 [[package]]
 name = "apache-avro"
-version = "0.14.0"
+version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8cf4144857f9e4d7dd6cc4ba4c78efd2a46bad682b029bd0d91e76a021af1b2a"
+checksum = "9c0fdddc3fdac97394ffcc5c89c634faa9c1c166ced54189af34e407c97b6ee7"
 dependencies = [
  "byteorder",
- "digest 0.10.7",
+ "digest",
  "lazy_static",
  "libflate",
  "log",
@@ -214,9 +257,9 @@ dependencies = [
  "strum",
  "strum_macros",
  "thiserror",
- "typed-builder",
+ "typed-builder 0.14.0",
  "uuid",
- "zerocopy 0.6.1",
+ "zerocopy",
 ]
 
 [[package]]
@@ -261,7 +304,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9c6368f9ae5c6ec403ca910327ae0c9437b0a85255b6950c90d497e6177f6e5e"
 dependencies = [
  "proc-macro-hack",
- "quote 1.0.33",
+ "quote 1.0.32",
  "syn 1.0.109",
 ]
 
@@ -311,7 +354,7 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5d94121b572ccf1d1b38a1004155e59c64f4c6ff7793070d84a8807e0550881e"
 dependencies = [
- "quote 1.0.33",
+ "quote 1.0.32",
  "syn 1.0.109",
 ]
 
@@ -338,12 +381,12 @@ dependencies = [
 
 [[package]]
 name = "assert_cmd"
-version = "2.0.11"
+version = "2.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86d6b683edf8d1119fe420a94f8a7e389239666aa72e65495d91c00462510151"
+checksum = "88903cb14723e4d4003335bb7f8a14f27691649105346a0f0957466c096adfe6"
 dependencies = [
  "anstyle 1.0.0",
- "bstr 1.5.0",
+ "bstr 1.6.0",
  "doc-comment",
  "predicates 3.0.1",
  "predicates-core",
@@ -377,9 +420,9 @@ dependencies = [
 
 [[package]]
 name = "async-compression"
-version = "0.4.0"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b0122885821398cc923ece939e24d1056a2384ee719432397fa9db87230ff11"
+checksum = "62b74f44609f0f91493e3082d3734d98497e094777144380ea4db9f9905dd5b6"
 dependencies = [
  "flate2",
  "futures-core",
@@ -448,14 +491,13 @@ version = "5.0.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b35ef8f9be23ee30fe1eb1cf175c689bc33517c6c6d0fd0669dade611e5ced7f"
 dependencies = [
- "async-graphql-derive",
- "async-graphql-parser",
- "async-graphql-value",
+ "async-graphql-derive 5.0.10",
+ "async-graphql-parser 5.0.10",
+ "async-graphql-value 5.0.10",
  "async-stream",
  "async-trait",
  "base64 0.13.1",
  "bytes 1.4.0",
- "chrono",
  "fnv",
  "futures-util",
  "http",
@@ -473,6 +515,37 @@ dependencies = [
  "thiserror",
 ]
 
+[[package]]
+name = "async-graphql"
+version = "6.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0d1f56ef571e325930c41685502269651505160ae0d7e0d7413dd84afe86432c"
+dependencies = [
+ "async-graphql-derive 6.0.0",
+ "async-graphql-parser 6.0.0",
+ "async-graphql-value 6.0.0",
+ "async-stream",
+ "async-trait",
+ "base64 0.13.1",
+ "bytes 1.4.0",
+ "chrono",
+ "fnv",
+ "futures-util",
+ "http",
+ "indexmap 2.0.0",
+ "mime",
+ "multer",
+ "num-traits",
+ "once_cell",
+ "pin-project-lite",
+ "regex",
+ "serde",
+ "serde_json",
+ "serde_urlencoded",
+ "static_assertions",
+ "thiserror",
+]
+
 [[package]]
 name = "async-graphql-derive"
 version = "5.0.10"
@@ -480,22 +553,51 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1a0f6ceed3640b4825424da70a5107e79d48d9b2bc6318dfc666b2fc4777f8c4"
 dependencies = [
  "Inflector",
- "async-graphql-parser",
+ "async-graphql-parser 5.0.10",
  "darling 0.14.2",
  "proc-macro-crate 1.2.1",
- "proc-macro2 1.0.70",
- "quote 1.0.33",
+ "proc-macro2 1.0.66",
+ "quote 1.0.32",
  "syn 1.0.109",
  "thiserror",
 ]
 
+[[package]]
+name = "async-graphql-derive"
+version = "6.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0a3a4c50aafce65a48d1aba749aaa946173a52d274abb5b9f76360a966ce17c6"
+dependencies = [
+ "Inflector",
+ "async-graphql-parser 6.0.0",
+ "darling 0.20.3",
+ "proc-macro-crate 1.2.1",
+ "proc-macro2 1.0.66",
+ "quote 1.0.32",
+ "strum",
+ "syn 2.0.28",
+ "thiserror",
+]
+
 [[package]]
 name = "async-graphql-parser"
 version = "5.0.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ecc308cd3bc611ee86c9cf19182d2b5ee583da40761970e41207f088be3db18f"
 dependencies = [
- "async-graphql-value",
+ "async-graphql-value 5.0.10",
+ "pest",
+ "serde",
+ "serde_json",
+]
+
+[[package]]
+name = "async-graphql-parser"
+version = "6.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a64488a0f0afd284f829977437a2e49e9f62cb72ea5fbd96aec19f87351576df"
+dependencies = [
+ "async-graphql-value 6.0.0",
  "pest",
  "serde",
  "serde_json",
@@ -513,13 +615,25 @@ dependencies = [
  "serde_json",
 ]
 
+[[package]]
+name = "async-graphql-value"
+version = "6.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "86046bbced96c0fab3ff5d2b3c769c0c55b0b3a7d67f9e2f2044f349f2e7d501"
+dependencies = [
+ "bytes 1.4.0",
+ "indexmap 2.0.0",
+ "serde",
+ "serde_json",
+]
+
 [[package]]
 name = "async-graphql-warp"
-version = "5.0.10"
+version = "6.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce971f92675defe1adf14f9e70b8798d797db9f454463b611a552bffd5532188"
+checksum = "4de785650dd90a223b5f5968c5345215160a36d196c9295c6c9a316cb29cba04"
 dependencies = [
- "async-graphql",
+ "async-graphql 6.0.0",
  "futures-util",
  "serde_json",
  "warp",
@@ -555,6 +669,40 @@ dependencies = [
  "futures-lite",
 ]
 
+[[package]]
+name = "async-nats"
+version = "0.31.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8257238e2a3629ee5618502a75d1b91f8017c24638c75349fc8d2d80cf1f7c4c"
+dependencies = [
+ "base64 0.21.2",
+ "bytes 1.4.0",
+ "futures 0.3.28",
+ "http",
+ "itoa",
+ "memchr",
+ "nkeys",
+ "nuid",
+ "once_cell",
+ "rand 0.8.5",
+ "regex",
+ "ring",
+ "rustls-native-certs",
+ "rustls-pemfile",
+ "rustls-webpki",
+ "serde",
+ "serde_json",
+ "serde_nanos",
+ "serde_repr",
+ "thiserror",
+ "time",
+ "tokio",
+ "tokio-retry",
+ "tokio-rustls 0.24.0",
+ "tracing 0.1.37",
+ "url",
+]
+
 [[package]]
 name = "async-net"
 version = "1.7.0"
@@ -603,9 +751,9 @@ version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0e97ce7de6cf12de5d7226c73f5ba9811622f4db3a5b91b55c53e987e5f91cba"
 dependencies = [
- "proc-macro2 1.0.70",
- "quote 1.0.33",
- "syn 2.0.41",
+ "proc-macro2 1.0.66",
+ "quote 1.0.32",
+ "syn 2.0.28",
 ]
 
 [[package]]
@@ -625,9 +773,9 @@ version = "0.3.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193"
 dependencies = [
- "proc-macro2 1.0.70",
- "quote 1.0.33",
- "syn 2.0.41",
+ "proc-macro2 1.0.66",
+ "quote 1.0.32",
+ "syn 2.0.28",
 ]
 
 [[package]]
@@ -638,13 +786,13 @@ checksum = "7a40729d2133846d9ed0ea60a8b9541bccddab49cd30f0715a1da672fe9a2524"
 
 [[package]]
 name = "async-trait"
-version = "0.1.74"
+version = "0.1.73"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9"
+checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0"
 dependencies = [
- "proc-macro2 1.0.70",
- "quote 1.0.33",
- "syn 2.0.41",
+ "proc-macro2 1.0.66",
+ "quote 1.0.32",
+ "syn 2.0.28",
 ]
 
 [[package]]
@@ -993,7 +1141,7 @@ dependencies = [
  "once_cell",
  "percent-encoding",
  "regex",
- "sha2 0.10.7",
+ "sha2",
  "time",
  "tracing 0.1.37",
 ]
@@ -1025,7 +1173,7 @@ dependencies = [
  "md-5",
  "pin-project-lite",
  "sha1",
- "sha2 0.10.7",
+ "sha2",
  "tracing 0.1.37",
 ]
 
@@ -1167,9 +1315,9 @@ dependencies = [
 
 [[package]]
 name = "axum"
-version = "0.6.18"
+version = "0.6.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8175979259124331c1d7bf6586ee7e0da434155e4b2d48ec2c8386281d8df39"
+checksum = "3b829e4e32b91e643de6eafe82b1d90675f5874230191a4ffbc1b336dec4d6bf"
 dependencies = [
  "async-trait",
  "axum-core",
@@ -1213,11 +1361,12 @@ dependencies = [
 
 [[package]]
 name = "azure_core"
-version = "0.5.0"
-source = "git+https://github.com/Azure/azure-sdk-for-rust.git?rev=b4544d4920fa3064eb921340054cd9cc130b7664#b4544d4920fa3064eb921340054cd9cc130b7664"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "86b0f0eea648347e40f5f7f7e6bfea4553bcefad0fbf52044ea339e5ce3aba61"
 dependencies = [
  "async-trait",
- "base64 0.13.1",
+ "base64 0.21.2",
  "bytes 1.4.0",
  "dyn-clone",
  "futures 0.3.28",
@@ -1226,11 +1375,11 @@ dependencies = [
  "log",
  "paste",
  "pin-project",
+ "quick-xml 0.29.0",
  "rand 0.8.5",
  "reqwest",
  "rustc_version 0.4.0",
  "serde",
- "serde-xml-rs",
  "serde_json",
  "time",
  "url",
@@ -1239,17 +1388,18 @@ dependencies = [
 
 [[package]]
 name = "azure_identity"
-version = "0.6.0"
-source = "git+https://github.com/Azure/azure-sdk-for-rust.git?rev=b4544d4920fa3064eb921340054cd9cc130b7664#b4544d4920fa3064eb921340054cd9cc130b7664"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "61712538f43d64b56725f335bc931d0eb42d2b082fb157056465bbadfdeb5dd3"
 dependencies = [
  "async-lock",
  "async-trait",
  "azure_core",
- "base64 0.13.1",
  "fix-hidden-lifetime-bug",
  "futures 0.3.28",
  "log",
  "oauth2",
+ "pin-project",
  "serde",
  "serde_json",
  "time",
@@ -1259,23 +1409,22 @@ dependencies = [
 
 [[package]]
 name = "azure_storage"
-version = "0.6.0"
-source = "git+https://github.com/Azure/azure-sdk-for-rust.git?rev=b4544d4920fa3064eb921340054cd9cc130b7664#b4544d4920fa3064eb921340054cd9cc130b7664"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32d9cfa13ed9acb51cd663e04f343bd550a92b455add96c90de387a9a6bc4dbc"
 dependencies = [
  "RustyXML",
  "async-trait",
  "azure_core",
- "base64 0.13.1",
  "bytes 1.4.0",
  "futures 0.3.28",
  "hmac",
  "log",
  "once_cell",
  "serde",
- "serde-xml-rs",
  "serde_derive",
  "serde_json",
- "sha2 0.10.7",
+ "sha2",
  "time",
  "url",
  "uuid",
@@ -1283,19 +1432,17 @@ dependencies = [
 
 [[package]]
 name = "azure_storage_blobs"
-version = "0.6.0"
-source = "git+https://github.com/Azure/azure-sdk-for-rust.git?rev=b4544d4920fa3064eb921340054cd9cc130b7664#b4544d4920fa3064eb921340054cd9cc130b7664"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "57cb0fe58af32a3fb49e560613cb1e4937f9f13161a2c1caf1bba0224435f2af"
 dependencies = [
  "RustyXML",
  "azure_core",
  "azure_storage",
- "base64 0.13.1",
  "bytes 1.4.0",
  "futures 0.3.28",
  "log",
- "md5",
  "serde",
- "serde-xml-rs",
  "serde_derive",
  "serde_json",
  "time",
@@ -1328,15 +1475,15 @@ dependencies = [
 
 [[package]]
 name = "backtrace"
-version = "0.3.69"
+version = "0.3.67"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837"
+checksum = "233d376d6d185f2a3093e58f283f60f880315b6c60075b01f36b3b85154564ca"
 dependencies = [
  "addr2line",
  "cc",
  "cfg-if",
  "libc",
- "miniz_oxide",
+ "miniz_oxide 0.6.2",
  "object",
  "rustc-demangle",
 ]
@@ -1374,15 +1521,6 @@ dependencies = [
  "simd-abstraction",
 ]
 
-[[package]]
-name = "base64-url"
-version = "1.4.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67a99c239d0c7e77c85dddfa9cebce48704b3c49550fcd3b84dd637e4484899f"
-dependencies = [
- "base64 0.13.1",
-]
-
 [[package]]
 name = "base64ct"
 version = "1.5.3"
@@ -1395,15 +1533,9 @@ version = "0.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1"
 dependencies = [
- "bit-vec 0.6.3",
+ "bit-vec",
 ]
 
-[[package]]
-name = "bit-vec"
-version = "0.4.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02b4ff8b16e6076c3e14220b39fbc1fabb6737522281a388998046859400895f"
-
 [[package]]
 name = "bit-vec"
 version = "0.6.3"
@@ -1418,18 +1550,18 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bitflags"
-version = "2.4.1"
+version = "2.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"
+checksum = "6dbe3c979c178231552ecba20214a8272df4e09f232a87aef4320cf06539aded"
 
 [[package]]
 name = "bitmask-enum"
-version = "2.1.0"
+version = "2.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd9e32d7420c85055e8107e5b2463c4eeefeaac18b52359fe9f9c08a18f342b2"
+checksum = "49fb8528abca6895a5ada33d62aedd538a5c33e77068256483b44a3230270163"
 dependencies = [
- "quote 1.0.33",
- "syn 1.0.109",
+ "quote 1.0.32",
+ "syn 2.0.28",
 ]
 
 [[package]]
@@ -1450,16 +1582,7 @@ version = "0.10.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "46502ad458c9a52b69d4d4d32775c788b7a1b85e8bc9d482d92250fc0e3f8efe"
 dependencies = [
- "digest 0.10.7",
-]
-
-[[package]]
-name = "block-buffer"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4"
-dependencies = [
- "generic-array",
+ "digest",
 ]
 
 [[package]]
@@ -1495,12 +1618,12 @@ dependencies = [
 ]
 
 [[package]]
-name = "bloom"
-version = "0.3.2"
+name = "bloomy"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d00ac8e5056d6d65376a3c1aa5c7c34850d6949ace17f0266953a254eb3d6fe8"
+checksum = "489d2af57852b78a86478273ac6a1ef912061b6af3a439694c49f309f6ea3bdd"
 dependencies = [
- "bit-vec 0.4.4",
+ "siphasher",
 ]
 
 [[package]]
@@ -1524,8 +1647,8 @@ dependencies = [
  "log",
  "pin-project-lite",
  "rustls 0.20.7",
- "rustls-native-certs 0.6.2",
- "rustls-pemfile 1.0.1",
+ "rustls-native-certs",
+ "rustls-pemfile",
  "serde",
  "serde_derive",
  "serde_json",
@@ -1535,7 +1658,7 @@ dependencies = [
  "tokio",
  "tokio-util",
  "url",
- "webpki 0.22.0",
+ "webpki",
  "webpki-roots",
  "winapi",
 ]
@@ -1558,7 +1681,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "822462c1e7b17b31961798a6874b36daea6818e99e0cb7d3b7b0fa3c477751c3"
 dependencies = [
  "borsh-derive",
- "hashbrown 0.13.2",
+ "hashbrown 0.13.1",
 ]
 
 [[package]]
@@ -1570,7 +1693,7 @@ dependencies = [
  "borsh-derive-internal",
  "borsh-schema-derive-internal",
  "proc-macro-crate 0.1.5",
- "proc-macro2 1.0.70",
+ "proc-macro2 1.0.66",
  "syn 1.0.109",
 ]
 
@@ -1580,8 +1703,8 @@ version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "61820b4c5693eafb998b1e67485423c923db4a75f72585c247bdee32bad81e7b"
 dependencies = [
- "proc-macro2 1.0.70",
- "quote 1.0.33",
+ "proc-macro2 1.0.66",
+ "quote 1.0.32",
  "syn 1.0.109",
 ]
 
@@ -1591,8 +1714,8 @@ version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c76cdbfa13def20d1f8af3ae7b3c6771f06352a74221d8851262ac384c122b8e"
 dependencies = [
- "proc-macro2 1.0.70",
- "quote 1.0.33",
+ "proc-macro2 1.0.66",
+ "quote 1.0.32",
  "syn 1.0.109",
 ]
 
@@ -1630,13 +1753,12 @@ dependencies = [
 
 [[package]]
 name = "bstr"
-version = "1.5.0"
+version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a246e68bb43f6cd9db24bea052a53e40405417c5fb372e3d1a8a7f770a564ef5"
+checksum = "6798148dccfbff0fae41c7574d2fa8f1ef3492fba0face179de5d8d447d67b05"
 dependencies = [
  "memchr",
- "once_cell",
- "regex-automata 0.1.10",
+ "regex-automata 0.3.6",
  "serde",
 ]
 
@@ -1662,8 +1784,8 @@ version = "0.6.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "13e576ebe98e605500b3c8041bb888e966653577172df6dd97398714eb30b9bf"
 dependencies = [
- "proc-macro2 1.0.70",
- "quote 1.0.33",
+ "proc-macro2 1.0.66",
+ "quote 1.0.32",
  "syn 1.0.109",
 ]
 
@@ -1736,7 +1858,7 @@ dependencies = [
  "cached_proc_macro",
  "cached_proc_macro_types",
  "futures 0.3.28",
- "hashbrown 0.13.2",
+ "hashbrown 0.13.1",
  "instant",
  "once_cell",
  "thiserror",
@@ -1751,8 +1873,8 @@ checksum = "b48814962d2fd604c50d2b9433c2a41a0ab567779ee2c02f7fba6eca1221f082"
 dependencies = [
  "cached_proc_macro_types",
  "darling 0.14.2",
- "proc-macro2 1.0.70",
- "quote 1.0.33",
+ "proc-macro2 1.0.66",
+ "quote 1.0.32",
  "syn 1.0.109",
 ]
 
@@ -1788,7 +1910,7 @@ checksum = "4acbb09d9ee8e23699b9634375c72795d095bf268439da88562cf9b501f181fa"
 dependencies = [
  "camino",
  "cargo-platform",
- "semver 1.0.17",
+ "semver 1.0.18",
  "serde",
  "serde_json",
 ]
@@ -1816,11 +1938,12 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.0.77"
+version = "1.0.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e9f73505338f7d905b19d18738976aae232eb46b8efc15554ffc56deb5d9ebe4"
+checksum = "305fe645edc1442a0fa8b6726ba61d422798d37a52e12eaecf4b022ebbb88f01"
 dependencies = [
  "jobserver",
+ "libc",
 ]
 
 [[package]]
@@ -1844,6 +1967,30 @@ version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
+[[package]]
+name = "chacha20"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c7fc89c7c5b9e7a02dfe45cd2367bae382f9ed31c61ca8debe5f827c420a2f08"
+dependencies = [
+ "cfg-if",
+ "cipher",
+ "cpufeatures",
+]
+
+[[package]]
+name = "chacha20poly1305"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "10cd79432192d1c0f4e1a0fef9527696cc039165d729fb41b3f4f4f354c2dc35"
+dependencies = [
+ "aead",
+ "chacha20",
+ "cipher",
+ "poly1305",
+ "zeroize",
+]
+
 [[package]]
 name = "charset"
 version = "0.1.3"
@@ -1870,9 +2017,9 @@ dependencies = [
 
 [[package]]
 name = "chrono-tz"
-version = "0.8.4"
+version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e23185c0e21df6ed832a12e2bda87c7d1def6842881fb634a8511ced741b0d76"
+checksum = "f1369bc6b9e9a7dfdae2055f6ec151fe9c554a9d23d357c0237cee2e25eaabb7"
 dependencies = [
  "chrono",
  "chrono-tz-build",
@@ -1882,9 +2029,9 @@ dependencies = [
 
 [[package]]
 name = "chrono-tz-build"
-version = "0.2.1"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "433e39f13c9a060046954e0592a8d0a4bcb1040125cbf91cb8ee58964cfb350f"
+checksum = "e2f5ebdc942f57ed96d560a6d1a459bae5851102a25d5bf89dc04ae453e31ecf"
 dependencies = [
  "parse-zoneinfo",
  "phf",
@@ -1939,6 +2086,7 @@ checksum = "d1873270f8f7942c191139cb8a40fd228da6c3fd2fc376d7e92d47aa14aeb59e"
 dependencies = [
  "crypto-common",
  "inout",
+ "zeroize",
 ]
 
 [[package]]
@@ -1958,9 +2106,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.1.14"
+version = "4.3.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "906f7fe1da4185b7a282b2bc90172a496f9def1aca4545fe7526810741591e14"
+checksum = "c27cdf28c0f604ba3f512b0c9a409f8de8513e4816705deb0498b627e7c3a3fd"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -1973,50 +2121,49 @@ version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1eef05769009513df2eb1c3b4613e7fad873a14c600ff025b08f250f59fee7de"
 dependencies = [
- "clap 4.1.14",
+ "clap 4.3.21",
  "log",
 ]
 
 [[package]]
 name = "clap_builder"
-version = "4.1.14"
+version = "4.3.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "351f9ad9688141ed83dfd8f5fb998a06225ef444b48ff4dc43de6d409b7fd10b"
+checksum = "08a9f1ab5e9f01a9b81f202e8562eb9a10de70abf9eaeac1be465c28b75aa4aa"
 dependencies = [
- "bitflags 1.3.2",
+ "anstream",
+ "anstyle 1.0.0",
  "clap_lex",
- "is-terminal",
  "strsim 0.10.0",
- "termcolor",
  "terminal_size 0.2.2",
 ]
 
 [[package]]
 name = "clap_complete"
-version = "4.3.1"
+version = "4.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f6b5c519bab3ea61843a7923d074b04245624bb84a64a8c150f5deb014e388b"
+checksum = "5fc443334c81a804575546c5a8a79b4913b50e28d69232903604cada1de817ce"
 dependencies = [
- "clap 4.1.14",
+ "clap 4.3.21",
 ]
 
 [[package]]
 name = "clap_derive"
-version = "4.1.14"
+version = "4.3.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81d7dc0031c3a59a04fc2ba395c8e2dd463cba1859275f065d225f6122221b45"
+checksum = "54a9bb5758fc5dfe728d1019941681eccaf0cf8a4189b692a0ee2f2ecf90a050"
 dependencies = [
- "heck 0.4.0",
- "proc-macro2 1.0.70",
- "quote 1.0.33",
- "syn 2.0.41",
+ "heck 0.4.1",
+ "proc-macro2 1.0.66",
+ "quote 1.0.32",
+ "syn 2.0.28",
 ]
 
 [[package]]
 name = "clap_lex"
-version = "0.4.1"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a2dd5a6fe8c6e3502f568a6353e5273bbb15193ad9a89e457b9970798efbea1"
+checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b"
 
 [[package]]
 name = "clipboard-win"
@@ -2057,6 +2204,7 @@ dependencies = [
  "ordered-float 3.7.0",
  "prometheus-remote-write",
  "prost",
+ "prost-reflect",
  "quick-protobuf",
  "regex",
  "serde",
@@ -2088,15 +2236,21 @@ dependencies = [
  "unicode-width",
 ]
 
+[[package]]
+name = "colorchoice"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7"
+
 [[package]]
 name = "colored"
-version = "2.0.0"
+version = "2.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3616f750b84d8f0de8a58bda93e08e2a81ad3f523089b05f1dffecab48c6cbd"
+checksum = "2674ec482fbc38012cf31e6c42ba0177b431a0cb6f15fe40efa5aab1bda516f6"
 dependencies = [
- "atty",
+ "is-terminal",
  "lazy_static",
- "winapi",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
@@ -2184,9 +2338,9 @@ dependencies = [
 
 [[package]]
 name = "console-subscriber"
-version = "0.1.9"
+version = "0.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57ab2224a0311582eb03adba4caaf18644f7b1f10a760803a803b9b605187fc7"
+checksum = "d4cf42660ac07fcebed809cfe561dd8730bcd35b075215e6479c516bcd0d11cb"
 dependencies = [
  "console-api",
  "crossbeam-channel",
@@ -2208,9 +2362,9 @@ dependencies = [
 
 [[package]]
 name = "const-oid"
-version = "0.6.2"
+version = "0.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d6f2aa4d0537bcc1c74df8755072bd31c1ef1a3a1b85a68e8404a8c353b7b8b"
+checksum = "28c122c3980598d243d63d9a704629a2d748d101f278052ff068be5a4423ab6f"
 
 [[package]]
 name = "convert_case"
@@ -2251,9 +2405,9 @@ checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc"
 
 [[package]]
 name = "cpufeatures"
-version = "0.2.11"
+version = "0.2.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce420fe07aecd3e67c5f910618fe65e94158f6dcc0adf44e00d69ce2bdfe0fd0"
+checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1"
 dependencies = [
  "libc",
 ]
@@ -2300,7 +2454,7 @@ dependencies = [
  "anes",
  "cast",
  "ciborium",
- "clap 4.1.14",
+ "clap 4.3.21",
  "criterion-plot",
  "futures 0.3.28",
  "is-terminal",
@@ -2382,22 +2536,6 @@ dependencies = [
  "cfg-if",
 ]
 
-[[package]]
-name = "crossterm"
-version = "0.25.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e64e6c0fbe2c17357405f7c758c1ef960fce08bdfb2c03d88d2a18d7e09c4b67"
-dependencies = [
- "bitflags 1.3.2",
- "crossterm_winapi",
- "libc",
- "mio",
- "parking_lot",
- "signal-hook",
- "signal-hook-mio",
- "winapi",
-]
-
 [[package]]
 name = "crossterm"
 version = "0.26.1"
@@ -2437,9 +2575,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
 dependencies = [
  "generic-array",
+ "rand_core 0.6.4",
  "typenum",
 ]
 
+[[package]]
+name = "crypto_secretbox"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b9d6cf87adf719ddf43a805e92c6870a531aedda35ff640442cbaf8674e141e1"
+dependencies = [
+ "aead",
+ "cipher",
+ "generic-array",
+ "poly1305",
+ "salsa20",
+ "subtle",
+ "zeroize",
+]
+
 [[package]]
 name = "csv"
 version = "1.2.2"
@@ -2461,6 +2615,16 @@ dependencies = [
  "memchr",
 ]
 
+[[package]]
+name = "ctor"
+version = "0.1.26"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096"
+dependencies = [
+ "quote 1.0.32",
+ "syn 1.0.109",
+]
+
 [[package]]
 name = "ctr"
 version = "0.9.2"
@@ -2478,15 +2642,29 @@ checksum = "b365fabc795046672053e29c954733ec3b05e4be654ab130fe8f1f94d7051f35"
 
 [[package]]
 name = "curve25519-dalek"
-version = "3.2.0"
+version = "4.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b9fdf9972b2bd6af2d913799d9ebc165ea4d2e65878e329d9c6b372c4491b61"
+checksum = "f711ade317dd348950a9910f81c5947e3d8907ebd2b83f76203ff1807e6a2bc2"
 dependencies = [
- "byteorder",
- "digest 0.9.0",
- "rand_core 0.5.1",
+ "cfg-if",
+ "cpufeatures",
+ "curve25519-dalek-derive",
+ "digest",
+ "fiat-crypto",
+ "platforms 3.0.2",
+ "rustc_version 0.4.0",
  "subtle",
- "zeroize",
+]
+
+[[package]]
+name = "curve25519-dalek-derive"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "83fdaf97f4804dcebfa5862639bc9ce4121e82140bec2a987ac5140294865b5b"
+dependencies = [
+ "proc-macro2 1.0.66",
+ "quote 1.0.32",
+ "syn 2.0.28",
 ]
 
 [[package]]
@@ -2510,8 +2688,8 @@ dependencies = [
  "cc",
  "codespan-reporting",
  "once_cell",
- "proc-macro2 1.0.70",
- "quote 1.0.33",
+ "proc-macro2 1.0.66",
+ "quote 1.0.32",
  "scratch",
  "syn 1.0.109",
 ]
@@ -2528,8 +2706,8 @@ version = "1.0.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a08a6e2fcc370a089ad3b4aaf54db3b1b4cee38ddabce5896b33eb693275f470"
 dependencies = [
- "proc-macro2 1.0.70",
- "quote 1.0.33",
+ "proc-macro2 1.0.66",
+ "quote 1.0.32",
  "syn 1.0.109",
 ]
 
@@ -2553,6 +2731,16 @@ dependencies = [
  "darling_macro 0.14.2",
 ]
 
+[[package]]
+name = "darling"
+version = "0.20.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0209d94da627ab5605dcccf08bb18afa5009cfbef48d8a8b7d7bdbc79be25c5e"
+dependencies = [
+ "darling_core 0.20.3",
+ "darling_macro 0.20.3",
+]
+
 [[package]]
 name = "darling_core"
 version = "0.13.4"
@@ -2561,8 +2749,8 @@ checksum = "859d65a907b6852c9361e3185c862aae7fafd2887876799fa55f5f99dc40d610"
 dependencies = [
  "fnv",
  "ident_case",
- "proc-macro2 1.0.70",
- "quote 1.0.33",
+ "proc-macro2 1.0.66",
+ "quote 1.0.32",
  "strsim 0.10.0",
  "syn 1.0.109",
 ]
@@ -2575,12 +2763,26 @@ checksum = "a784d2ccaf7c98501746bf0be29b2022ba41fd62a2e622af997a03e9f972859f"
 dependencies = [
  "fnv",
  "ident_case",
- "proc-macro2 1.0.70",
- "quote 1.0.33",
+ "proc-macro2 1.0.66",
+ "quote 1.0.32",
  "strsim 0.10.0",
  "syn 1.0.109",
 ]
 
+[[package]]
+name = "darling_core"
+version = "0.20.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "177e3443818124b357d8e76f53be906d60937f0d3a90773a664fa63fa253e621"
+dependencies = [
+ "fnv",
+ "ident_case",
+ "proc-macro2 1.0.66",
+ "quote 1.0.32",
+ "strsim 0.10.0",
+ "syn 2.0.28",
+]
+
 [[package]]
 name = "darling_macro"
 version = "0.13.4"
@@ -2588,7 +2790,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835"
 dependencies = [
  "darling_core 0.13.4",
- "quote 1.0.33",
+ "quote 1.0.32",
  "syn 1.0.109",
 ]
 
@@ -2599,18 +2801,29 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7618812407e9402654622dd402b0a89dff9ba93badd6540781526117b92aab7e"
 dependencies = [
  "darling_core 0.14.2",
- "quote 1.0.33",
+ "quote 1.0.32",
  "syn 1.0.109",
 ]
 
+[[package]]
+name = "darling_macro"
+version = "0.20.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5"
+dependencies = [
+ "darling_core 0.20.3",
+ "quote 1.0.32",
+ "syn 2.0.28",
+]
+
 [[package]]
 name = "dashmap"
-version = "5.4.0"
+version = "5.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "907076dfda823b0b36d2a1bb5f90c96660a5bbcd7729e10727f07858f22c4edc"
+checksum = "6943ae99c34386c84a470c499d3414f66502a41340aa895406e0d2e4a207b91d"
 dependencies = [
  "cfg-if",
- "hashbrown 0.12.3",
+ "hashbrown 0.14.0",
  "lock_api",
  "once_cell",
  "parking_lot_core",
@@ -2676,11 +2889,13 @@ checksum = "f578e8e2c440e7297e008bb5486a3a8a194775224bbc23729b0dbdfaeebf162e"
 
 [[package]]
 name = "der"
-version = "0.4.5"
+version = "0.7.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79b71cca7d95d7681a4b3b9cdf63c8dbc3730d0584c2c74e31416d64a90493f4"
+checksum = "fffa369a668c8af7dbf8b5e56c9f744fbd399949ed171606040001947de40b1c"
 dependencies = [
  "const-oid",
+ "pem-rfc7468",
+ "zeroize",
 ]
 
 [[package]]
@@ -2689,20 +2904,20 @@ version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b"
 dependencies = [
- "proc-macro2 1.0.70",
- "quote 1.0.33",
+ "proc-macro2 1.0.66",
+ "quote 1.0.32",
  "syn 1.0.109",
 ]
 
 [[package]]
 name = "derive_arbitrary"
-version = "1.3.0"
+version = "1.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3cdeb9ec472d588e539a818b2dee436825730da08ad0017c4b1a17676bdc8b7"
+checksum = "53e0efad4403bfc52dc201159c4b842a246a14b98c64b55dfd0f2d89729dfeb8"
 dependencies = [
- "proc-macro2 1.0.70",
- "quote 1.0.33",
- "syn 1.0.109",
+ "proc-macro2 1.0.66",
+ "quote 1.0.32",
+ "syn 2.0.28",
 ]
 
 [[package]]
@@ -2712,8 +2927,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321"
 dependencies = [
  "convert_case 0.4.0",
- "proc-macro2 1.0.70",
- "quote 1.0.33",
+ "proc-macro2 1.0.66",
+ "quote 1.0.32",
  "rustc_version 0.4.0",
  "syn 1.0.109",
 ]
@@ -2736,22 +2951,13 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8"
 
-[[package]]
-name = "digest"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066"
-dependencies = [
- "generic-array",
-]
-
 [[package]]
 name = "digest"
 version = "0.10.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
 dependencies = [
- "block-buffer 0.10.3",
+ "block-buffer",
  "crypto-common",
  "subtle",
 ]
@@ -2829,9 +3035,9 @@ dependencies = [
 
 [[package]]
 name = "dns-lookup"
-version = "2.0.4"
+version = "2.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5766087c2235fec47fafa4cfecc81e494ee679d0fd4a59887ea0919bfb0e4fc"
+checksum = "8f332aa79f9e9de741ac013237294ef42ce2e9c6394dc7d766725812f1238812"
 dependencies = [
  "cfg-if",
  "libc",
@@ -2895,29 +3101,29 @@ checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b"
 
 [[package]]
 name = "dyn-clone"
-version = "1.0.11"
+version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68b0cf012f1230e43cd00ebb729c6bb58707ecfa8ad08b52ef3a4ccd2697fc30"
+checksum = "304e6508efa593091e97a9abbc10f90aa7ca635b6d2784feff3c89d41dd12272"
 
 [[package]]
 name = "ed25519"
-version = "1.5.3"
+version = "2.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91cff35c70bba8a626e3185d8cd48cc11b5437e1a5bcd15b9b5fa3c64b6dfee7"
+checksum = "60f6d271ca33075c88028be6f04d502853d63a5ece419d269c15315d4fc1cf1d"
 dependencies = [
  "signature",
 ]
 
 [[package]]
 name = "ed25519-dalek"
-version = "1.0.1"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c762bae6dcaf24c4c84667b8579785430908723d5c889f469d76a41d59cc7a9d"
+checksum = "7277392b266383ef8396db7fdeb1e77b6c52fed775f5df15bb24f35b72156980"
 dependencies = [
  "curve25519-dalek",
  "ed25519",
- "sha2 0.9.9",
- "zeroize",
+ "sha2",
+ "signature",
 ]
 
 [[package]]
@@ -2979,9 +3185,9 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "21cdad81446a7f7dc43f6a77409efeb9733d2fa65553efef6018ef257c959b73"
 dependencies = [
- "heck 0.4.0",
- "proc-macro2 1.0.70",
- "quote 1.0.33",
+ "heck 0.4.1",
+ "proc-macro2 1.0.66",
+ "quote 1.0.32",
  "syn 1.0.109",
 ]
 
@@ -2991,22 +3197,22 @@ version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c9720bba047d567ffc8a3cba48bf19126600e249ab7f128e9233e6376976a116"
 dependencies = [
- "heck 0.4.0",
- "proc-macro2 1.0.70",
- "quote 1.0.33",
+ "heck 0.4.1",
+ "proc-macro2 1.0.66",
+ "quote 1.0.32",
  "syn 1.0.109",
 ]
 
 [[package]]
 name = "enum_dispatch"
-version = "0.3.11"
+version = "0.3.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "11f36e95862220b211a6e2aa5eca09b4fa391b13cd52ceb8035a24bf65a79de2"
+checksum = "8f33313078bb8d4d05a2733a94ac4c2d8a0df9a2b84424ebf4f33bfc224a890e"
 dependencies = [
  "once_cell",
- "proc-macro2 1.0.70",
- "quote 1.0.33",
- "syn 1.0.109",
+ "proc-macro2 1.0.66",
+ "quote 1.0.32",
+ "syn 2.0.28",
 ]
 
 [[package]]
@@ -3024,9 +3230,9 @@ version = "0.7.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5e9a1f9f7d83e59740248a6e14ecf93929ade55027844dfcea78beafccc15745"
 dependencies = [
- "proc-macro2 1.0.70",
- "quote 1.0.33",
- "syn 2.0.41",
+ "proc-macro2 1.0.66",
+ "quote 1.0.32",
+ "syn 2.0.28",
 ]
 
 [[package]]
@@ -3073,15 +3279,15 @@ dependencies = [
 
 [[package]]
 name = "equivalent"
-version = "1.0.1"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
+checksum = "88bffebc5d80432c9b140ee17875ff173a8ab62faad5b257da912bd2f6c1c0a1"
 
 [[package]]
 name = "erased-serde"
-version = "0.3.23"
+version = "0.3.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54558e0ba96fbe24280072642eceb9d7d442e32c7ec0ea9e7ecd7b4ea2cf4e11"
+checksum = "f94c0e13118e7d7533271f754a168ae8400e6a1cc043f2bfd53cc7290f1a1de3"
 dependencies = [
  "serde",
 ]
@@ -3165,8 +3371,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f47da3a72ec598d9c8937a7ebca8962a5c7a1f28444e38c2b33c771ba3f55f05"
 dependencies = [
  "proc-macro-error",
- "proc-macro2 1.0.70",
- "quote 1.0.33",
+ "proc-macro2 1.0.66",
+ "quote 1.0.32",
  "syn 1.0.109",
 ]
 
@@ -3235,11 +3441,17 @@ dependencies = [
  "instant",
 ]
 
+[[package]]
+name = "fiat-crypto"
+version = "0.1.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e825f6987101665dea6ec934c09ec6d721de7bc1bf92248e1d5810c8cd636b77"
+
 [[package]]
 name = "file-source"
 version = "0.1.0"
 dependencies = [
- "bstr 1.5.0",
+ "bstr 1.6.0",
  "bytes 1.4.0",
  "chrono",
  "crc",
@@ -3248,7 +3460,7 @@ dependencies = [
  "flate2",
  "futures 0.3.28",
  "glob",
- "indexmap 2.0.2",
+ "indexmap 2.0.0",
  "libc",
  "quickcheck",
  "scan_fmt",
@@ -3291,8 +3503,8 @@ version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e4c81935e123ab0741c4c4f0d9b8377e5fb21d3de7e062fa4b1263b1fbcba1ea"
 dependencies = [
- "proc-macro2 1.0.70",
- "quote 1.0.33",
+ "proc-macro2 1.0.66",
+ "quote 1.0.32",
  "syn 1.0.109",
 ]
 
@@ -3315,7 +3527,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743"
 dependencies = [
  "crc32fast",
- "miniz_oxide",
+ "miniz_oxide 0.7.1",
 ]
 
 [[package]]
@@ -3487,9 +3699,9 @@ version = "0.3.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72"
 dependencies = [
- "proc-macro2 1.0.70",
- "quote 1.0.33",
- "syn 2.0.41",
+ "proc-macro2 1.0.66",
+ "quote 1.0.32",
+ "syn 2.0.28",
 ]
 
 [[package]]
@@ -3532,12 +3744,13 @@ dependencies = [
 
 [[package]]
 name = "generic-array"
-version = "0.14.6"
+version = "0.14.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9"
+checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
 dependencies = [
  "typenum",
  "version_check",
+ "zeroize",
 ]
 
 [[package]]
@@ -3574,22 +3787,11 @@ dependencies = [
  "wasm-bindgen",
 ]
 
-[[package]]
-name = "ghost"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb19fe8de3ea0920d282f7b77dd4227aea6b8b999b42cdf0ca41b2472b14443a"
-dependencies = [
- "proc-macro2 1.0.70",
- "quote 1.0.33",
- "syn 1.0.109",
-]
-
 [[package]]
 name = "gimli"
-version = "0.28.1"
+version = "0.27.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253"
+checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e"
 
 [[package]]
 name = "glob"
@@ -3599,9 +3801,9 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
 
 [[package]]
 name = "gloo-utils"
-version = "0.1.7"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "037fcb07216cb3a30f7292bd0176b050b7b9a052ba830ef7d5d65f6dc64ba58e"
+checksum = "0b5555354113b18c547c1d3a98fbf7fb32a9ff4f6fa112ce823a21641a0ba3aa"
 dependencies = [
  "js-sys",
  "serde",
@@ -3631,9 +3833,9 @@ dependencies = [
 
 [[package]]
 name = "governor"
-version = "0.5.1"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c390a940a5d157878dd057c78680a33ce3415bcd05b4799509ea44210914b4d5"
+checksum = "821239e5672ff23e2a7060901fa622950bbd80b649cdaadd78d1c1767ed14eb4"
 dependencies = [
  "cfg-if",
  "dashmap",
@@ -3684,10 +3886,10 @@ checksum = "a40f793251171991c4eb75bd84bc640afa8b68ff6907bc89d3b712a22f700506"
 dependencies = [
  "graphql-introspection-query",
  "graphql-parser",
- "heck 0.4.0",
+ "heck 0.4.1",
  "lazy_static",
- "proc-macro2 1.0.70",
- "quote 1.0.33",
+ "proc-macro2 1.0.66",
+ "quote 1.0.32",
  "serde",
  "serde_json",
  "syn 1.0.109",
@@ -3700,10 +3902,43 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "00bda454f3d313f909298f626115092d348bc231025699f557b27e248475f48c"
 dependencies = [
  "graphql_client_codegen",
- "proc-macro2 1.0.70",
+ "proc-macro2 1.0.66",
  "syn 1.0.109",
 ]
 
+[[package]]
+name = "greptime-proto"
+version = "0.1.0"
+source = "git+https://github.com/GreptimeTeam/greptime-proto.git?tag=0.2.1#4398d20c56d5f7939cc2960789cb1fa7dd18e6fe"
+dependencies = [
+ "prost",
+ "serde",
+ "serde_json",
+ "tonic",
+ "tonic-build",
+]
+
+[[package]]
+name = "greptimedb-client"
+version = "0.1.0"
+source = "git+https://github.com/GreptimeTeam/greptimedb-client-rust.git?rev=bc32362adf0df17a41a95bae4221d6d8f1775656#bc32362adf0df17a41a95bae4221d6d8f1775656"
+dependencies = [
+ "dashmap",
+ "enum_dispatch",
+ "futures 0.3.28",
+ "futures-util",
+ "greptime-proto",
+ "parking_lot",
+ "prost",
+ "rand 0.8.5",
+ "snafu",
+ "tokio",
+ "tokio-stream",
+ "tonic",
+ "tonic-build",
+ "tower",
+]
+
 [[package]]
 name = "grok"
 version = "2.0.0"
@@ -3716,9 +3951,9 @@ dependencies = [
 
 [[package]]
 name = "h2"
-version = "0.3.22"
+version = "0.3.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d6250322ef6e60f93f9a2162799302cd6f68f79f6e5d85c8c16f14d1d958178"
+checksum = "97ec8491ebaf99c8eaa73058b045fe58073cd6be7f596ac993ced0b0a0c01049"
 dependencies = [
  "bytes 1.4.0",
  "fnv",
@@ -3726,7 +3961,7 @@ dependencies = [
  "futures-sink",
  "futures-util",
  "http",
- "indexmap 2.0.2",
+ "indexmap 1.9.3",
  "slab",
  "tokio",
  "tokio-util",
@@ -3756,20 +3991,20 @@ dependencies = [
 
 [[package]]
 name = "hashbrown"
-version = "0.13.2"
+version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
+checksum = "33ff8ae62cd3a9102e5637afc8452c55acf3844001bd5374e0b0bd7b6616c038"
 dependencies = [
- "ahash 0.8.6",
+ "ahash 0.8.2",
 ]
 
 [[package]]
 name = "hashbrown"
-version = "0.14.3"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
+checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a"
 dependencies = [
- "ahash 0.8.6",
+ "ahash 0.8.2",
 ]
 
 [[package]]
@@ -3822,9 +4057,9 @@ dependencies = [
 
 [[package]]
 name = "heck"
-version = "0.4.0"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9"
+checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
 
 [[package]]
 name = "heim"
@@ -3905,7 +4140,7 @@ dependencies = [
  "log",
  "mach",
  "ntapi",
- "platforms",
+ "platforms 1.1.0",
  "winapi",
 ]
 
@@ -3987,7 +4222,7 @@ version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e"
 dependencies = [
- "digest 0.10.7",
+ "digest",
 ]
 
 [[package]]
@@ -4168,7 +4403,7 @@ dependencies = [
  "hyper",
  "log",
  "rustls 0.20.7",
- "rustls-native-certs 0.6.2",
+ "rustls-native-certs",
  "tokio",
  "tokio-rustls 0.23.4",
 ]
@@ -4181,7 +4416,7 @@ checksum = "0646026eb1b3eea4cd9ba47912ea5ce9cc07713d105b1a14698f4e6433d348b7"
 dependencies = [
  "http",
  "hyper",
- "rustls 0.21.0",
+ "rustls 0.21.6",
  "tokio",
  "tokio-rustls 0.24.0",
 ]
@@ -4294,20 +4529,20 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.0.2"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8adf3ddd720272c6ea8bf59463c04e0f93d0bbf7c5439b691bca2987e0270897"
+checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d"
 dependencies = [
  "equivalent",
- "hashbrown 0.14.3",
+ "hashbrown 0.14.0",
  "serde",
 ]
 
 [[package]]
 name = "indicatif"
-version = "0.17.5"
+version = "0.17.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ff8cc23a7393a397ed1d7f56e6365cba772aba9f9912ab968b03043c395d057"
+checksum = "0b297dc40733f23a0e52728a58fa9489a5b7638a324932de16b41adc3ef80730"
 dependencies = [
  "console",
  "instant",
@@ -4319,9 +4554,9 @@ dependencies = [
 
 [[package]]
 name = "indoc"
-version = "2.0.1"
+version = "2.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f2cb48b81b1dc9f39676bf99f5499babfec7cd8fe14307f7b3d747208fb5690"
+checksum = "2c785eefb63ebd0e33416dfcb8d6da0bf27ce752843a45632a67bf10d4d4b5c4"
 
 [[package]]
 name = "infer"
@@ -4331,9 +4566,9 @@ checksum = "64e9829a50b42bb782c1df523f78d332fe371b10c661e78b7a3c34b0198e9fac"
 
 [[package]]
 name = "infer"
-version = "0.14.0"
+version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbb78f4c4a058ef30a9ff77322e758f7e60f871274b602d7fdc1b0956b0cb88e"
+checksum = "cb33622da908807a06f9513c19b3c1ad50fab3e4137d82a78107d502075aa199"
 
 [[package]]
 name = "inotify"
@@ -4376,12 +4611,9 @@ dependencies = [
 
 [[package]]
 name = "inventory"
-version = "0.3.6"
+version = "0.3.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0539b5de9241582ce6bd6b0ba7399313560151e58c9aaf8b74b711b1bdce644"
-dependencies = [
- "ghost",
-]
+checksum = "a53088c87cf71c9d4f3372a2cb9eea1e7b8a0b1bf8b7f7d23fe5b76dbb07e63b"
 
 [[package]]
 name = "io-lifetimes"
@@ -4518,12 +4750,6 @@ dependencies = [
  "wasm-bindgen",
 ]
 
-[[package]]
-name = "json"
-version = "0.12.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "078e285eafdfb6c4b434e0d31e8cfcb5115b651496faca5749b88fafd4f23bfd"
-
 [[package]]
 name = "json-patch"
 version = "1.0.0"
@@ -4682,7 +4908,7 @@ dependencies = [
  "secrecy",
  "serde",
  "serde_json",
- "serde_yaml 0.9.27",
+ "serde_yaml 0.9.25",
  "thiserror",
  "tokio",
  "tokio-util",
@@ -4714,7 +4940,7 @@ version = "0.82.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ed8442b2f1d6c1d630677ade9e5d5ebe793dec099a75fb582d56d77b8eb8cee8"
 dependencies = [
- "ahash 0.8.6",
+ "ahash 0.8.2",
  "async-trait",
  "backoff",
  "derivative",
@@ -4748,7 +4974,7 @@ dependencies = [
  "lalrpop-util",
  "petgraph",
  "regex",
- "regex-syntax 0.7.2",
+ "regex-syntax 0.7.4",
  "string_cache",
  "term",
  "tiny-keccak",
@@ -4763,9 +4989,9 @@ checksum = "3f35c735096c0293d313e8f2a641627472b83d01b937177fe76e5e2708d31e0d"
 
 [[package]]
 name = "lapin"
-version = "2.2.1"
+version = "2.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "acc13beaa09eed710f406201f46b961345b4d061dd90ec3d3ccc70721e70342a"
+checksum = "5f3067a1fcfbc3fc46455809c023e69b8f6602463201010f4ae5a3b572adb9dc"
 dependencies = [
  "amq-protocol",
  "async-global-executor-trait",
@@ -4791,9 +5017,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
 
 [[package]]
 name = "libc"
-version = "0.2.151"
+version = "0.2.147"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "302d7ab3130588088d277783b1e2d2e10c9e9e4a16dd9050e6ec93fb3e7048f4"
+checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3"
 
 [[package]]
 name = "libflate"
@@ -4882,9 +5108,9 @@ dependencies = [
 
 [[package]]
 name = "lock_api"
-version = "0.4.9"
+version = "0.4.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df"
+checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16"
 dependencies = [
  "autocfg",
  "scopeguard",
@@ -4898,9 +5124,9 @@ checksum = "8166fbddef141acbea89cf3425ed97d4c22d14a68161977fc01c301175a4fb89"
 
 [[package]]
 name = "log"
-version = "0.4.19"
+version = "0.4.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4"
+checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f"
 
 [[package]]
 name = "logfmt"
@@ -4922,9 +5148,9 @@ dependencies = [
 
 [[package]]
 name = "lru"
-version = "0.10.1"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "718e8fae447df0c7e1ba7f5189829e63fd536945c8988d61444c19039f16b670"
+checksum = "eedb2bdbad7e0634f83989bf596f497b070130daaa398ab22d84c39e266deec5"
 
 [[package]]
 name = "lru-cache"
@@ -5060,20 +5286,14 @@ version = "0.10.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6365506850d44bff6e2fbcb5176cf63650e48bd45ef2fe2665ae1570e0f4b9ca"
 dependencies = [
- "digest 0.10.7",
+ "digest",
 ]
 
-[[package]]
-name = "md5"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "490cc448043f947bae3cbee9c203358d62dbee0db12107a74be5c30ccfd09771"
-
 [[package]]
 name = "memchr"
-version = "2.6.4"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167"
+checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
 
 [[package]]
 name = "memmap2"
@@ -5104,11 +5324,11 @@ dependencies = [
 
 [[package]]
 name = "metrics"
-version = "0.21.0"
+version = "0.21.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa8ebbd1a9e57bbab77b9facae7f5136aea44c356943bf9a198f647da64285d6"
+checksum = "fde3af1a009ed76a778cb84fdef9e7dbbdf5775ae3e4cc1f434a6a307f6f76c5"
 dependencies = [
- "ahash 0.8.6",
+ "ahash 0.8.2",
  "metrics-macros",
  "portable-atomic",
 ]
@@ -5119,9 +5339,9 @@ version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ddece26afd34c31585c74a4db0630c376df271c285d682d1e55012197830b6df"
 dependencies = [
- "proc-macro2 1.0.70",
- "quote 1.0.33",
- "syn 2.0.41",
+ "proc-macro2 1.0.66",
+ "quote 1.0.32",
+ "syn 2.0.28",
 ]
 
 [[package]]
@@ -5142,14 +5362,14 @@ dependencies = [
 
 [[package]]
 name = "metrics-util"
-version = "0.15.0"
+version = "0.15.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "111cb375987443c3de8d503580b536f77dc8416d32db62d9456db5d93bd7ac47"
+checksum = "4de2ed6e491ed114b40b732e4d1659a9d53992ebd87490c44a6ffe23739d973e"
 dependencies = [
- "aho-corasick 0.7.20",
+ "aho-corasick",
  "crossbeam-epoch",
  "crossbeam-utils",
- "hashbrown 0.13.2",
+ "hashbrown 0.13.1",
  "indexmap 1.9.3",
  "metrics",
  "num_cpus",
@@ -5181,6 +5401,15 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
 
+[[package]]
+name = "miniz_oxide"
+version = "0.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa"
+dependencies = [
+ "adler",
+]
+
 [[package]]
 name = "miniz_oxide"
 version = "0.7.1"
@@ -5192,9 +5421,9 @@ dependencies = [
 
 [[package]]
 name = "mio"
-version = "0.8.10"
+version = "0.8.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09"
+checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2"
 dependencies = [
  "libc",
  "log",
@@ -5246,8 +5475,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "22ce75669015c4f47b289fd4d4f56e894e4c96003ffdf3ac51313126f94c6cbb"
 dependencies = [
  "cfg-if",
- "proc-macro2 1.0.70",
- "quote 1.0.33",
+ "proc-macro2 1.0.66",
+ "quote 1.0.32",
  "syn 1.0.109",
 ]
 
@@ -5275,9 +5504,9 @@ dependencies = [
 
 [[package]]
 name = "mongodb"
-version = "2.6.1"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16928502631c0db72214720aa479c722397fe5aed6bf1c740a3830b3fe4bfcfe"
+checksum = "ebcd85ec209a5b84fd9f54b9e381f6fa17462bc74160d018fc94fd8b9f61faa8"
 dependencies = [
  "async-trait",
  "base64 0.13.1",
@@ -5299,12 +5528,12 @@ dependencies = [
  "rand 0.8.5",
  "rustc_version_runtime",
  "rustls 0.20.7",
- "rustls-pemfile 1.0.1",
+ "rustls-pemfile",
  "serde",
  "serde_bytes",
  "serde_with 1.14.0",
  "sha-1",
- "sha2 0.10.7",
+ "sha2",
  "socket2 0.4.9",
  "stringprep",
  "strsim 0.10.0",
@@ -5315,7 +5544,7 @@ dependencies = [
  "tokio-util",
  "trust-dns-proto 0.21.2",
  "trust-dns-resolver",
- "typed-builder",
+ "typed-builder 0.10.0",
  "uuid",
  "webpki-roots",
 ]
@@ -5362,42 +5591,6 @@ dependencies = [
  "tempfile",
 ]
 
-[[package]]
-name = "nats"
-version = "0.24.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2eebb39ba0555bcf232817d42ed3346499f14f6f8d4de1c0ca4517bda99c1a7b"
-dependencies = [
- "base64 0.13.1",
- "base64-url",
- "blocking",
- "crossbeam-channel",
- "fastrand",
- "itoa",
- "json",
- "lazy_static",
- "libc",
- "log",
- "memchr",
- "nkeys 0.2.0",
- "nuid",
- "once_cell",
- "parking_lot",
- "regex",
- "ring",
- "rustls 0.19.1",
- "rustls-native-certs 0.5.0",
- "rustls-pemfile 0.2.1",
- "serde",
- "serde_json",
- "serde_nanos",
- "serde_repr",
- "time",
- "url",
- "webpki 0.21.4",
- "winapi",
-]
-
 [[package]]
 name = "ndarray"
 version = "0.15.6"
@@ -5474,27 +5667,13 @@ dependencies = [
 
 [[package]]
 name = "nkeys"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e66a7cd1358277b2a6f77078e70aea7315ff2f20db969cc61153103ec162594"
-dependencies = [
- "byteorder",
- "data-encoding",
- "ed25519-dalek",
- "getrandom 0.2.10",
- "log",
- "rand 0.8.5",
- "signatory",
-]
-
-[[package]]
-name = "nkeys"
-version = "0.3.0"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c2d151f6ece2f3d1077f6c779268de2516653d8344ddde65addd785cce764fe5"
+checksum = "aad178aad32087b19042ee36dfd450b73f5f934fbfb058b59b198684dfec4c47"
 dependencies = [
  "byteorder",
  "data-encoding",
+ "ed25519",
  "ed25519-dalek",
  "getrandom 0.2.10",
  "log",
@@ -5504,9 +5683,9 @@ dependencies = [
 
 [[package]]
 name = "no-proxy"
-version = "0.3.2"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b24b826bdb92c7a2c6f22ed4cf649001bd237f936587ee0b76cd9dea86003d01"
+checksum = "5cc5956cc74e3574924e108ad12e14340a64183e1cd1d69a7e41e9680c109e67"
 dependencies = [
  "cidr-utils",
  "serde",
@@ -5685,9 +5864,9 @@ dependencies = [
 
 [[package]]
 name = "num-traits"
-version = "0.2.15"
+version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd"
+checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2"
 dependencies = [
  "autocfg",
  "libm",
@@ -5728,8 +5907,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799"
 dependencies = [
  "proc-macro-crate 1.2.1",
- "proc-macro2 1.0.70",
- "quote 1.0.33",
+ "proc-macro2 1.0.66",
+ "quote 1.0.32",
  "syn 1.0.109",
 ]
 
@@ -5740,9 +5919,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "96667db765a921f7b295ffee8b60472b686a51d4f21c2ee4ffdb94c7013b65a6"
 dependencies = [
  "proc-macro-crate 1.2.1",
- "proc-macro2 1.0.70",
- "quote 1.0.33",
- "syn 2.0.41",
+ "proc-macro2 1.0.66",
+ "quote 1.0.32",
+ "syn 2.0.28",
 ]
 
 [[package]]
@@ -5762,9 +5941,9 @@ checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3"
 
 [[package]]
 name = "oauth2"
-version = "4.4.2"
+version = "4.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c38841cdd844847e3e7c8d29cef9dcfed8877f8f56f9071f77843ecf3baf937f"
+checksum = "eeaf26a72311c087f8c5ba617c96fac67a5c04f430e716ac8d8ab2de62e23368"
 dependencies = [
  "base64 0.13.1",
  "chrono",
@@ -5775,7 +5954,7 @@ dependencies = [
  "serde",
  "serde_json",
  "serde_path_to_error",
- "sha2 0.10.7",
+ "sha2",
  "thiserror",
  "url",
 ]
@@ -5791,9 +5970,9 @@ dependencies = [
 
 [[package]]
 name = "object"
-version = "0.32.1"
+version = "0.30.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0"
+checksum = "03b4680b86d9cfafba8fc491dc9b6df26b68cf40e9e6cd73909194759a63c385"
 dependencies = [
  "memchr",
 ]
@@ -5870,7 +6049,7 @@ dependencies = [
  "parking_lot",
  "percent-encoding",
  "pin-project",
- "quick-xml",
+ "quick-xml 0.27.1",
  "reqwest",
  "serde",
  "serde_json",
@@ -5880,9 +6059,9 @@ dependencies = [
 
 [[package]]
 name = "openidconnect"
-version = "2.5.1"
+version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "98dd5b7049bac4fdd2233b8c9767d42c05da8006fdb79cc903258556d2b18009"
+checksum = "87af7097640fedbe64718ac1c9b0549d72da747a3f527cd089215f96c6f691d5"
 dependencies = [
  "base64 0.13.1",
  "chrono",
@@ -5898,18 +6077,15 @@ dependencies = [
  "serde_derive",
  "serde_json",
  "serde_path_to_error",
- "serde_plain",
- "serde_with 1.14.0",
- "subtle",
  "thiserror",
  "url",
 ]
 
 [[package]]
 name = "openssl"
-version = "0.10.55"
+version = "0.10.56"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "345df152bc43501c5eb9e4654ff05f794effb78d4efe3d53abc158baddc0703d"
+checksum = "729b745ad4a5575dd06a3e1af1414bd330ee561c01b3899eb584baeaa8def17e"
 dependencies = [
  "bitflags 1.3.2",
  "cfg-if",
@@ -5926,8 +6102,8 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c"
 dependencies = [
- "proc-macro2 1.0.70",
- "quote 1.0.33",
+ "proc-macro2 1.0.66",
+ "quote 1.0.32",
  "syn 1.0.109",
 ]
 
@@ -5939,18 +6115,16 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
 
 [[package]]
 name = "openssl-src"
-version = "111.25.0+1.1.1t"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3173cd3626c43e3854b1b727422a276e568d9ec5fe8cec197822cf52cfb743d6"
+version = "300.1.3+3.1.2"
+source = "git+https://github.com/vectordotdev/openssl-src-rs.git?tag=release-300-force-engine+3.1.2#98b1172bcef15358ad7bbf4baa3a3aa59d831e81"
 dependencies = [
  "cc",
 ]
 
 [[package]]
 name = "openssl-sys"
-version = "0.9.90"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "374533b0e45f3a7ced10fcaeccca020e66656bc03dac384f852e4e5a7a8104a6"
+version = "0.9.91"
+source = "git+https://github.com/vectordotdev/rust-openssl.git?tag=openssl-sys-v0.9.91+3.0.0#c3a8b494e0a8ab88db692c239d30c903353b56a3"
 dependencies = [
  "cc",
  "libc",
@@ -6034,6 +6208,15 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "output_vt100"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "628223faebab4e3e40667ee0b2336d34a5b960ff60ea743ddfdbcf7770bcfb66"
+dependencies = [
+ "winapi",
+]
+
 [[package]]
 name = "outref"
 version = "0.1.0"
@@ -6082,15 +6265,15 @@ dependencies = [
 
 [[package]]
 name = "parking_lot_core"
-version = "0.9.4"
+version = "0.9.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4dc9e0dc2adc1c69d09143aff38d3d30c5c3f0df0dad82e6d25547af174ebec0"
+checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447"
 dependencies = [
  "cfg-if",
  "libc",
- "redox_syscall 0.2.16",
+ "redox_syscall 0.3.5",
  "smallvec",
- "windows-sys 0.42.0",
+ "windows-targets 0.48.0",
 ]
 
 [[package]]
@@ -6104,9 +6287,9 @@ dependencies = [
 
 [[package]]
 name = "paste"
-version = "1.0.12"
+version = "1.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f746c4065a8fa3fe23974dd82f15431cc8d40779821001404d10d2e79ca7d79"
+checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c"
 
 [[package]]
 name = "pb-rs"
@@ -6126,7 +6309,7 @@ version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917"
 dependencies = [
- "digest 0.10.7",
+ "digest",
 ]
 
 [[package]]
@@ -6146,9 +6329,9 @@ dependencies = [
 
 [[package]]
 name = "pem-rfc7468"
-version = "0.2.3"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f22eb0e3c593294a99e9ff4b24cf6b752d43f193aa4415fe5077c159996d497"
+checksum = "88b39c9bfcfc231068454382784bb460aae594343fb030d46e9f50a645418412"
 dependencies = [
  "base64ct",
 ]
@@ -6161,9 +6344,9 @@ checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94"
 
 [[package]]
 name = "pest"
-version = "2.5.6"
+version = "2.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8cbd939b234e95d72bc393d51788aec68aeeb5d51e748ca08ff3aad58cb722f7"
+checksum = "1acb4a4365a13f749a93f1a094a7805e5cfa0955373a9de860d962eaa3a5fe5a"
 dependencies = [
  "thiserror",
  "ucd-trie",
@@ -6171,9 +6354,9 @@ dependencies = [
 
 [[package]]
 name = "pest_derive"
-version = "2.5.6"
+version = "2.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a81186863f3d0a27340815be8f2078dd8050b14cd71913db9fbda795e5f707d7"
+checksum = "666d00490d4ac815001da55838c500eafb0320019bbaa44444137c48b443a853"
 dependencies = [
  "pest",
  "pest_generator",
@@ -6181,26 +6364,26 @@ dependencies = [
 
 [[package]]
 name = "pest_generator"
-version = "2.5.6"
+version = "2.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75a1ef20bf3193c15ac345acb32e26b3dc3223aff4d77ae4fc5359567683796b"
+checksum = "68ca01446f50dbda87c1786af8770d535423fa8a53aec03b8f4e3d7eb10e0929"
 dependencies = [
  "pest",
  "pest_meta",
- "proc-macro2 1.0.70",
- "quote 1.0.33",
- "syn 1.0.109",
+ "proc-macro2 1.0.66",
+ "quote 1.0.32",
+ "syn 2.0.28",
 ]
 
 [[package]]
 name = "pest_meta"
-version = "2.5.6"
+version = "2.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e3b284b1f13a20dc5ebc90aff59a51b8d7137c221131b52a7260c08cbc1cc80"
+checksum = "56af0a30af74d0445c0bf6d9d051c979b516a1a5af790d251daee76005420a48"
 dependencies = [
  "once_cell",
  "pest",
- "sha2 0.10.7",
+ "sha2",
 ]
 
 [[package]]
@@ -6275,16 +6458,16 @@ version = "1.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405"
 dependencies = [
- "proc-macro2 1.0.70",
- "quote 1.0.33",
- "syn 2.0.41",
+ "proc-macro2 1.0.66",
+ "quote 1.0.32",
+ "syn 2.0.28",
 ]
 
 [[package]]
 name = "pin-project-lite"
-version = "0.2.13"
+version = "0.2.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58"
+checksum = "12cc1b0bf1727a77a54b6654e7b5f1af8604923edc8b81885f8ec92f9e3f0a05"
 
 [[package]]
 name = "pin-utils"
@@ -6306,14 +6489,12 @@ dependencies = [
 
 [[package]]
 name = "pkcs8"
-version = "0.7.6"
+version = "0.10.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee3ef9b64d26bad0536099c816c6734379e45bbd5f14798def6809e5cc350447"
+checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7"
 dependencies = [
  "der",
- "pem-rfc7468",
  "spki",
- "zeroize",
 ]
 
 [[package]]
@@ -6328,6 +6509,12 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "989d43012e2ca1c4a02507c67282691a0a3207f9dc67cec596b43fe925b3d325"
 
+[[package]]
+name = "platforms"
+version = "3.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e3d7ddaed09e0eb771a79ab0fd64609ba0afb0a8366421957936ad14cbd13630"
+
 [[package]]
 name = "plotters"
 version = "0.3.4"
@@ -6370,6 +6557,17 @@ dependencies = [
  "windows-sys 0.42.0",
 ]
 
+[[package]]
+name = "poly1305"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8159bd90725d2df49889a078b54f4f79e87f1f8a8444194cdca81d38f5393abf"
+dependencies = [
+ "cpufeatures",
+ "opaque-debug",
+ "universal-hash",
+]
+
 [[package]]
 name = "portable-atomic"
 version = "1.3.1"
@@ -6410,7 +6608,7 @@ dependencies = [
  "md-5",
  "memchr",
  "rand 0.8.5",
- "sha2 0.10.7",
+ "sha2",
  "stringprep",
 ]
 
@@ -6485,11 +6683,13 @@ dependencies = [
 
 [[package]]
 name = "pretty_assertions"
-version = "1.4.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af7cee1a6c8a5b9208b3cb1061f10c0cb689087b3d8ce85fb9d2dd7a29b6ba66"
+checksum = "a25e9bcb20aa780fd0bb16b72403a9064d6b3f22f026946029acb941a50af755"
 dependencies = [
+ "ctor",
  "diff",
+ "output_vt100",
  "yansi",
 ]
 
@@ -6511,7 +6711,7 @@ version = "0.1.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c142c0e46b57171fe0c528bee8c5b7569e80f0c17e377cd0e30ea57dbc11bb51"
 dependencies = [
- "proc-macro2 1.0.70",
+ "proc-macro2 1.0.66",
  "syn 1.0.109",
 ]
 
@@ -6556,8 +6756,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
 dependencies = [
  "proc-macro-error-attr",
- "proc-macro2 1.0.70",
- "quote 1.0.33",
+ "proc-macro2 1.0.66",
+ "quote 1.0.32",
  "syn 1.0.109",
  "version_check",
 ]
@@ -6568,8 +6768,8 @@ version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
 dependencies = [
- "proc-macro2 1.0.70",
- "quote 1.0.33",
+ "proc-macro2 1.0.66",
+ "quote 1.0.32",
  "version_check",
 ]
 
@@ -6596,9 +6796,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.70"
+version = "1.0.66"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
+checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9"
 dependencies = [
  "unicode-ident",
 ]
@@ -6607,7 +6807,7 @@ dependencies = [
 name = "prometheus-parser"
 version = "0.1.0"
 dependencies = [
- "indexmap 2.0.2",
+ "indexmap 2.0.0",
  "nom",
  "num_enum 0.6.1",
  "prost",
@@ -6668,7 +6868,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "119533552c9a7ffacc21e099c24a0ac8bb19c2a2a3f363de84cd9b844feab270"
 dependencies = [
  "bytes 1.4.0",
- "heck 0.4.0",
+ "heck 0.4.1",
  "itertools 0.10.5",
  "lazy_static",
  "log",
@@ -6691,20 +6891,23 @@ checksum = "e5d2d8d10f3c6ded6da8b05b5fb3b8a5082514344d56c9f871412d29b4e075b4"
 dependencies = [
  "anyhow",
  "itertools 0.10.5",
- "proc-macro2 1.0.70",
- "quote 1.0.33",
+ "proc-macro2 1.0.66",
+ "quote 1.0.32",
  "syn 1.0.109",
 ]
 
 [[package]]
 name = "prost-reflect"
-version = "0.11.5"
+version = "0.11.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b823de344848e011658ac981009100818b322421676740546f8b52ed5249428"
+checksum = "000e1e05ebf7b26e1eba298e66fe4eee6eb19c567d0ffb35e0dd34231cdac4c8"
 dependencies = [
+ "base64 0.21.2",
  "once_cell",
  "prost",
  "prost-types",
+ "serde",
+ "serde-value",
 ]
 
 [[package]]
@@ -6731,8 +6934,8 @@ version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "16b845dbfca988fa33db069c0e230574d15a3088f147a87b64c7589eb662c9ac"
 dependencies = [
- "proc-macro2 1.0.70",
- "quote 1.0.33",
+ "proc-macro2 1.0.66",
+ "quote 1.0.32",
  "syn 1.0.109",
 ]
 
@@ -6754,7 +6957,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e6eb95b2e36b92d3e0536be87eaf7accb17db39f5a44452759b43f1328e82dc9"
 dependencies = [
  "async-trait",
- "bit-vec 0.6.3",
+ "bit-vec",
  "bytes 1.4.0",
  "chrono",
  "crc",
@@ -6833,6 +7036,16 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "quick-xml"
+version = "0.29.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "81b9228215d82c7b61490fec1de287136b5de6f5700f6e58ea9ad61a7964ca51"
+dependencies = [
+ "memchr",
+ "serde",
+]
+
 [[package]]
 name = "quickcheck"
 version = "1.0.3"
@@ -6850,8 +7063,8 @@ version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b22a693222d716a9587786f37ac3f6b4faedb5b80c23914e7303ff5a1d8016e9"
 dependencies = [
- "proc-macro2 1.0.70",
- "quote 1.0.33",
+ "proc-macro2 1.0.66",
+ "quote 1.0.32",
  "syn 1.0.109",
 ]
 
@@ -6866,11 +7079,11 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.33"
+version = "1.0.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
+checksum = "50f3b39ccfb720540debaa0164757101c08ecb8d326b15358ce76a62c7e85965"
 dependencies = [
- "proc-macro2 1.0.70",
+ "proc-macro2 1.0.66",
 ]
 
 [[package]]
@@ -6985,6 +7198,21 @@ dependencies = [
  "rand_core 0.6.4",
 ]
 
+[[package]]
+name = "ratatui"
+version = "0.22.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8285baa38bdc9f879d92c0e37cb562ef38aa3aeefca22b3200186bc39242d3d5"
+dependencies = [
+ "bitflags 2.3.2",
+ "cassowary",
+ "crossterm",
+ "indoc",
+ "paste",
+ "unicode-segmentation",
+ "unicode-width",
+]
+
 [[package]]
 name = "raw-cpuid"
 version = "10.6.0"
@@ -7034,9 +7262,9 @@ dependencies = [
 
 [[package]]
 name = "rdkafka"
-version = "0.32.2"
+version = "0.33.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8733bc5dc0b192d1a4b28073f9bff1326ad9e4fecd4d9b025d6fc358d1c3e79"
+checksum = "da18026aad1c24033da3da726200de7e911e75c2e2cc2f77ffb9b4502720faae"
 dependencies = [
  "futures-channel",
  "futures-util",
@@ -7079,9 +7307,9 @@ dependencies = [
 
 [[package]]
 name = "redis"
-version = "0.23.0"
+version = "0.23.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ea8c51b5dc1d8e5fd3350ec8167f464ec0995e79f2e90a075b63371500d557f"
+checksum = "ffd6543a7bc6428396845f6854ccf3d1ae8823816592e2cbe74f20f50f209d02"
 dependencies = [
  "arc-swap",
  "async-trait",
@@ -7096,6 +7324,7 @@ dependencies = [
  "ryu",
  "tokio",
  "tokio-native-tls",
+ "tokio-retry",
  "tokio-util",
  "url",
 ]
@@ -7131,14 +7360,14 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "1.10.2"
+version = "1.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343"
+checksum = "81bc1d4caf89fac26a70747fe603c130093b53c773888797a6329091246d651a"
 dependencies = [
- "aho-corasick 1.0.1",
+ "aho-corasick",
  "memchr",
- "regex-automata 0.4.3",
- "regex-syntax 0.8.2",
+ "regex-automata 0.3.6",
+ "regex-syntax 0.7.4",
 ]
 
 [[package]]
@@ -7152,13 +7381,13 @@ dependencies = [
 
 [[package]]
 name = "regex-automata"
-version = "0.4.3"
+version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f"
+checksum = "fed1ceff11a1dddaee50c9dc8e4938bd106e9d89ae372f192311e7da498e3b69"
 dependencies = [
- "aho-corasick 1.0.1",
+ "aho-corasick",
  "memchr",
- "regex-syntax 0.8.2",
+ "regex-syntax 0.7.4",
 ]
 
 [[package]]
@@ -7169,15 +7398,9 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
 
 [[package]]
 name = "regex-syntax"
-version = "0.7.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78"
-
-[[package]]
-name = "regex-syntax"
-version = "0.8.2"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f"
+checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2"
 
 [[package]]
 name = "rend"
@@ -7213,8 +7436,8 @@ dependencies = [
  "once_cell",
  "percent-encoding",
  "pin-project-lite",
- "rustls 0.21.0",
- "rustls-pemfile 1.0.1",
+ "rustls 0.21.6",
+ "rustls-pemfile",
  "serde",
  "serde_json",
  "serde_urlencoded",
@@ -7283,8 +7506,8 @@ version = "0.7.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ff26ed6c7c4dfc2aa9480b86a60e3c7233543a270a680e10758a507c5a4ce476"
 dependencies = [
- "proc-macro2 1.0.70",
- "quote 1.0.33",
+ "proc-macro2 1.0.66",
+ "quote 1.0.32",
  "syn 1.0.109",
 ]
 
@@ -7307,9 +7530,9 @@ dependencies = [
 
 [[package]]
 name = "rmp-serde"
-version = "1.1.1"
+version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c5b13be192e0220b8afb7222aa5813cb62cc269ebb5cac346ca6487681d2913e"
+checksum = "bffea85eea980d8a74453e5d02a8d93028f3c34725de143085a844ebe953258a"
 dependencies = [
  "byteorder",
  "rmp",
@@ -7330,9 +7553,9 @@ dependencies = [
 
 [[package]]
 name = "roaring"
-version = "0.10.1"
+version = "0.10.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef0fb5e826a8bde011ecae6a8539dd333884335c57ff0f003fbe27c25bbe8f71"
+checksum = "6106b5cf8587f5834158895e9715a3c6c9716c8aefab57f1f7680917191c7873"
 dependencies = [
  "bytemuck",
  "byteorder",
@@ -7402,7 +7625,7 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
 dependencies = [
- "semver 1.0.17",
+ "semver 1.0.18",
 ]
 
 [[package]]
@@ -7443,19 +7666,6 @@ dependencies = [
  "windows-sys 0.48.0",
 ]
 
-[[package]]
-name = "rustls"
-version = "0.19.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "35edb675feee39aec9c99fa5ff985081995a06d594114ae14cbe797ad7b7a6d7"
-dependencies = [
- "base64 0.13.1",
- "log",
- "ring",
- "sct 0.6.1",
- "webpki 0.21.4",
-]
-
 [[package]]
 name = "rustls"
 version = "0.20.7"
@@ -7464,69 +7674,48 @@ checksum = "539a2bfe908f471bfa933876bd1eb6a19cf2176d375f82ef7f99530a40e48c2c"
 dependencies = [
  "log",
  "ring",
- "sct 0.7.0",
- "webpki 0.22.0",
+ "sct",
+ "webpki",
 ]
 
 [[package]]
 name = "rustls"
-version = "0.21.0"
+version = "0.21.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07180898a28ed6a7f7ba2311594308f595e3dd2e3c3812fa0a80a47b45f17e5d"
+checksum = "1d1feddffcfcc0b33f5c6ce9a29e341e4cd59c3f78e7ee45f4a40c038b1d6cbb"
 dependencies = [
  "log",
  "ring",
  "rustls-webpki",
- "sct 0.7.0",
-]
-
-[[package]]
-name = "rustls-native-certs"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a07b7c1885bd8ed3831c289b7870b13ef46fe0e856d288c30d9cc17d75a2092"
-dependencies = [
- "openssl-probe",
- "rustls 0.19.1",
- "schannel",
- "security-framework",
-]
-
-[[package]]
-name = "rustls-native-certs"
-version = "0.6.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0167bac7a9f490495f3c33013e7722b53cb087ecbe082fb0c6387c96f634ea50"
-dependencies = [
- "openssl-probe",
- "rustls-pemfile 1.0.1",
- "schannel",
- "security-framework",
+ "sct",
 ]
 
 [[package]]
-name = "rustls-pemfile"
-version = "0.2.1"
+name = "rustls-native-certs"
+version = "0.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5eebeaeb360c87bfb72e84abdb3447159c0eaececf1bef2aecd65a8be949d1c9"
+checksum = "0167bac7a9f490495f3c33013e7722b53cb087ecbe082fb0c6387c96f634ea50"
 dependencies = [
- "base64 0.13.1",
+ "openssl-probe",
+ "rustls-pemfile",
+ "schannel",
+ "security-framework",
 ]
 
 [[package]]
 name = "rustls-pemfile"
-version = "1.0.1"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0864aeff53f8c05aa08d86e5ef839d3dfcf07aeba2db32f12db0ef716e87bd55"
+checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2"
 dependencies = [
- "base64 0.13.1",
+ "base64 0.21.2",
 ]
 
 [[package]]
 name = "rustls-webpki"
-version = "0.100.1"
+version = "0.101.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6207cd5ed3d8dca7816f8f3725513a34609c0c765bf652b8c3cb4cfd87db46b"
+checksum = "7d93931baf2d282fff8d3a532bbfd7653f734643161b87e3e01e59a04439bf0d"
 dependencies = [
  "ring",
  "untrusted",
@@ -7556,7 +7745,7 @@ version = "12.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "994eca4bca05c87e86e15d90fc7a91d1be64b4482b38cb2d27474568fe7c9db9"
 dependencies = [
- "bitflags 2.4.1",
+ "bitflags 2.3.2",
  "cfg-if",
  "clipboard-win",
  "libc",
@@ -7572,9 +7761,18 @@ dependencies = [
 
 [[package]]
 name = "ryu"
-version = "1.0.13"
+version = "1.0.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741"
+
+[[package]]
+name = "salsa20"
+version = "0.10.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041"
+checksum = "97a22f5af31f73a954c10289c93e8a50cc23d971e80ee446f1f6f7137a088213"
+dependencies = [
+ "cipher",
+]
 
 [[package]]
 name = "same-file"
@@ -7609,11 +7807,11 @@ dependencies = [
 
 [[package]]
 name = "schannel"
-version = "0.1.21"
+version = "0.1.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "713cfb06c7059f3588fb8044c0fad1d09e3c01d225e25b9220dbfdcf16dbb1b3"
+checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88"
 dependencies = [
- "windows-sys 0.42.0",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
@@ -7643,16 +7841,6 @@ version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9c8132065adcfd6e02db789d9285a0deb2f3fcb04002865ab67d5fb103533898"
 
-[[package]]
-name = "sct"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b362b83898e0e69f38515b82ee15aa80636befe47c3b6d3d89a911e78fc228ce"
-dependencies = [
- "ring",
- "untrusted",
-]
-
 [[package]]
 name = "sct"
 version = "0.7.0"
@@ -7681,9 +7869,9 @@ dependencies = [
 
 [[package]]
 name = "security-framework"
-version = "2.9.1"
+version = "2.9.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fc758eb7bffce5b308734e9b0c1468893cae9ff70ebf13e7090be8dcbcc83a8"
+checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de"
 dependencies = [
  "bitflags 1.3.2",
  "core-foundation",
@@ -7713,9 +7901,9 @@ dependencies = [
 
 [[package]]
 name = "semver"
-version = "1.0.17"
+version = "1.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed"
+checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918"
 dependencies = [
  "serde",
 ]
@@ -7741,7 +7929,7 @@ version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a78072b550e5c20bc4a9d1384be28809cbdb7b25b2b4707ddc6d908b7e6de3bf"
 dependencies = [
- "toml 0.7.8",
+ "toml 0.7.6",
 ]
 
 [[package]]
@@ -7765,23 +7953,11 @@ dependencies = [
  "wasm-bindgen",
 ]
 
-[[package]]
-name = "serde-xml-rs"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb3aa78ecda1ebc9ec9847d5d3aba7d618823446a049ba2491940506da6e2782"
-dependencies = [
- "log",
- "serde",
- "thiserror",
- "xml-rs",
-]
-
 [[package]]
 name = "serde_bytes"
-version = "0.11.9"
+version = "0.11.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "416bda436f9aab92e02c8e10d49a15ddd339cea90b6e340fe51ed97abb548294"
+checksum = "ab33ec92f677585af6d88c65593ae2375adde54efdbf16d597f2cbc7a6d368ff"
 dependencies = [
  "serde",
 ]
@@ -7792,29 +7968,29 @@ version = "1.0.193"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3"
 dependencies = [
- "proc-macro2 1.0.70",
- "quote 1.0.33",
- "syn 2.0.41",
+ "proc-macro2 1.0.66",
+ "quote 1.0.32",
+ "syn 2.0.28",
 ]
 
 [[package]]
 name = "serde_derive_internals"
-version = "0.26.0"
+version = "0.28.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85bf8229e7920a9f636479437026331ce11aa132b4dde37d121944a44d6e5f3c"
+checksum = "e578a843d40b4189a4d66bba51d7684f57da5bd7c304c64e14bd63efbef49509"
 dependencies = [
- "proc-macro2 1.0.70",
- "quote 1.0.33",
- "syn 1.0.109",
+ "proc-macro2 1.0.66",
+ "quote 1.0.32",
+ "syn 2.0.28",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.108"
+version = "1.0.104"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b"
+checksum = "076066c5f1078eac5b722a31827a8832fe108bed65dfa75e233c89f8206e976c"
 dependencies = [
- "indexmap 2.0.2",
+ "indexmap 2.0.0",
  "itoa",
  "ryu",
  "serde",
@@ -7822,9 +7998,9 @@ dependencies = [
 
 [[package]]
 name = "serde_nanos"
-version = "0.1.2"
+version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e44969a61f5d316be20a42ff97816efb3b407a924d06824c3d8a49fa8450de0e"
+checksum = "8ae801b7733ca8d6a2b580debe99f67f36826a0f5b8a36055dc6bc40f8d6bc71"
 dependencies = [
  "serde",
 ]
@@ -7838,15 +8014,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "serde_plain"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ce1fc6db65a611022b23a0dec6975d63fb80a302cb3388835ff02c097258d50"
-dependencies = [
- "serde",
-]
-
 [[package]]
 name = "serde_qs"
 version = "0.8.5"
@@ -7860,20 +8027,20 @@ dependencies = [
 
 [[package]]
 name = "serde_repr"
-version = "0.1.9"
+version = "0.1.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fe39d9fbb0ebf5eb2c7cb7e2a47e4f462fad1379f1166b8ae49ad9eae89a7ca"
+checksum = "8725e1dfadb3a50f7e5ce0b1a540466f6ed3fe7a0fca2ac2b8b831d31316bd00"
 dependencies = [
- "proc-macro2 1.0.70",
- "quote 1.0.33",
- "syn 1.0.109",
+ "proc-macro2 1.0.66",
+ "quote 1.0.32",
+ "syn 2.0.28",
 ]
 
 [[package]]
 name = "serde_spanned"
-version = "0.6.4"
+version = "0.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12022b835073e5b11e90a14f86838ceb1c8fb0325b72416845c487ac0fa95e80"
+checksum = "96426c9936fd7a0124915f9185ea1d20aa9445cc9821142f0a73bc9207a2e186"
 dependencies = [
  "serde",
 ]
@@ -7912,7 +8079,23 @@ dependencies = [
  "indexmap 1.9.3",
  "serde",
  "serde_json",
- "serde_with_macros 2.3.2",
+ "time",
+]
+
+[[package]]
+name = "serde_with"
+version = "3.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1402f54f9a3b9e2efe71c1cea24e648acce55887983553eeb858cf3115acfd49"
+dependencies = [
+ "base64 0.21.2",
+ "chrono",
+ "hex",
+ "indexmap 1.9.3",
+ "indexmap 2.0.0",
+ "serde",
+ "serde_json",
+ "serde_with_macros 3.2.0",
  "time",
 ]
 
@@ -7923,21 +8106,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e182d6ec6f05393cc0e5ed1bf81ad6db3a8feedf8ee515ecdd369809bcce8082"
 dependencies = [
  "darling 0.13.4",
- "proc-macro2 1.0.70",
- "quote 1.0.33",
+ "proc-macro2 1.0.66",
+ "quote 1.0.32",
  "syn 1.0.109",
 ]
 
 [[package]]
 name = "serde_with_macros"
-version = "2.3.2"
+version = "3.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "859011bddcc11f289f07f467cc1fe01c7a941daa4d8f6c40d4d1c92eb6d9319c"
+checksum = "9197f1ad0e3c173a0222d3c4404fb04c3afe87e962bcb327af73e8301fa203c7"
 dependencies = [
- "darling 0.14.2",
- "proc-macro2 1.0.70",
- "quote 1.0.33",
- "syn 1.0.109",
+ "darling 0.20.3",
+ "proc-macro2 1.0.66",
+ "quote 1.0.32",
+ "syn 2.0.28",
 ]
 
 [[package]]
@@ -7954,11 +8137,11 @@ dependencies = [
 
 [[package]]
 name = "serde_yaml"
-version = "0.9.27"
+version = "0.9.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3cc7a1570e38322cfe4154732e5110f887ea57e22b76f4bfd32b5bdd3368666c"
+checksum = "1a49e178e4452f45cb61d0cd8cebc1b0fafd3e41929e996cef79aa3aca91f574"
 dependencies = [
- "indexmap 2.0.2",
+ "indexmap 2.0.0",
  "itoa",
  "ryu",
  "serde",
@@ -7985,8 +8168,8 @@ version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "079a83df15f85d89a68d64ae1238f142f172b1fa915d0d76b26a7cba1b659a69"
 dependencies = [
- "proc-macro2 1.0.70",
- "quote 1.0.33",
+ "proc-macro2 1.0.66",
+ "quote 1.0.32",
  "syn 1.0.109",
 ]
 
@@ -7998,7 +8181,7 @@ checksum = "f5058ada175748e33390e40e872bd0fe59a19f265d0158daa551c5a88a76009c"
 dependencies = [
  "cfg-if",
  "cpufeatures",
- "digest 0.10.7",
+ "digest",
 ]
 
 [[package]]
@@ -8009,20 +8192,7 @@ checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3"
 dependencies = [
  "cfg-if",
  "cpufeatures",
- "digest 0.10.7",
-]
-
-[[package]]
-name = "sha2"
-version = "0.9.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800"
-dependencies = [
- "block-buffer 0.9.0",
- "cfg-if",
- "cpufeatures",
- "digest 0.9.0",
- "opaque-debug",
+ "digest",
 ]
 
 [[package]]
@@ -8033,7 +8203,7 @@ checksum = "479fb9d862239e610720565ca91403019f2f00410f1864c5aa7479b950a76ed8"
 dependencies = [
  "cfg-if",
  "cpufeatures",
- "digest 0.10.7",
+ "digest",
 ]
 
 [[package]]
@@ -8042,7 +8212,7 @@ version = "0.10.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bdf0c33fae925bdc080598b84bc15c55e7b9a4a43b3c704da051f977469691c9"
 dependencies = [
- "digest 0.10.7",
+ "digest",
  "keccak",
 ]
 
@@ -8097,9 +8267,9 @@ dependencies = [
 
 [[package]]
 name = "signatory"
-version = "0.23.2"
+version = "0.27.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5dfecc059e81632eef1dd9b79e22fc28b8fe69b30d3357512a77a0ad8ee3c782"
+checksum = "c1e303f8205714074f6068773f0e29527e0453937fe837c9717d066635b65f31"
 dependencies = [
  "pkcs8",
  "rand_core 0.6.4",
@@ -8109,9 +8279,12 @@ dependencies = [
 
 [[package]]
 name = "signature"
-version = "1.6.4"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c"
+checksum = "8fe458c98333f9c8152221191a77e2a44e8325d0193484af2e9421a53019e57d"
+dependencies = [
+ "digest",
+]
 
 [[package]]
 name = "simd-abstraction"
@@ -8186,9 +8359,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.10.0"
+version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0"
+checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9"
 dependencies = [
  "serde",
 ]
@@ -8229,9 +8402,9 @@ dependencies = [
 
 [[package]]
 name = "snafu"
-version = "0.7.4"
+version = "0.7.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb0656e7e3ffb70f6c39b3c2a86332bb74aa3c679da781642590f3c1118c5045"
+checksum = "e4de37ad025c587a29e8f3f5605c00f70b98715ef90b9061a815b9e59e9042d6"
 dependencies = [
  "doc-comment",
  "futures-core",
@@ -8241,13 +8414,13 @@ dependencies = [
 
 [[package]]
 name = "snafu-derive"
-version = "0.7.4"
+version = "0.7.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "475b3bbe5245c26f2d8a6f62d67c1f30eb9fffeccee721c45d162c3ebbdf81b2"
+checksum = "990079665f075b699031e9c08fd3ab99be5029b96f3b78dc0709e8f77e4efebf"
 dependencies = [
- "heck 0.4.0",
- "proc-macro2 1.0.70",
- "quote 1.0.33",
+ "heck 0.4.1",
+ "proc-macro2 1.0.66",
+ "quote 1.0.32",
  "syn 1.0.109",
 ]
 
@@ -8294,10 +8467,11 @@ dependencies = [
 
 [[package]]
 name = "spki"
-version = "0.4.1"
+version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c01a0c15da1b0b0e1494112e7af814a678fec9bd157881b49beac661e9b6f32"
+checksum = "9d1e996ef02c474957d681f1b05213dfb0abab947b446a62d37770b23500184a"
 dependencies = [
+ "base64ct",
  "der",
 ]
 
@@ -8353,7 +8527,16 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "011cbb39cf7c1f62871aea3cc46e5817b0937b49e9447370c93cacbe93a766d8"
 dependencies = [
- "vte",
+ "vte 0.10.1",
+]
+
+[[package]]
+name = "strip-ansi-escapes"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "55ff8ef943b384c414f54aefa961dd2bd853add74ec75e7ac74cf91dba62bcfa"
+dependencies = [
+ "vte 0.11.1",
 ]
 
 [[package]]
@@ -8387,28 +8570,31 @@ checksum = "dcb5ae327f9cc13b68763b5749770cb9e048a99bd9dfdfa58d0cf05d5f64afe0"
 dependencies = [
  "heck 0.3.3",
  "proc-macro-error",
- "proc-macro2 1.0.70",
- "quote 1.0.33",
+ "proc-macro2 1.0.66",
+ "quote 1.0.32",
  "syn 1.0.109",
 ]
 
 [[package]]
 name = "strum"
-version = "0.24.1"
+version = "0.25.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "063e6045c0e62079840579a7e47a355ae92f60eb74daaf156fb1e84ba164e63f"
+checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125"
+dependencies = [
+ "strum_macros",
+]
 
 [[package]]
 name = "strum_macros"
-version = "0.24.3"
+version = "0.25.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59"
+checksum = "6069ca09d878a33f883cc06aaa9718ede171841d3832450354410b718b097232"
 dependencies = [
- "heck 0.4.0",
- "proc-macro2 1.0.70",
- "quote 1.0.33",
+ "heck 0.4.1",
+ "proc-macro2 1.0.66",
+ "quote 1.0.32",
  "rustversion",
- "syn 1.0.109",
+ "syn 2.0.28",
 ]
 
 [[package]]
@@ -8453,19 +8639,19 @@ version = "1.0.109"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
 dependencies = [
- "proc-macro2 1.0.70",
- "quote 1.0.33",
+ "proc-macro2 1.0.66",
+ "quote 1.0.32",
  "unicode-ident",
 ]
 
 [[package]]
 name = "syn"
-version = "2.0.41"
+version = "2.0.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
+checksum = "04361975b3f5e348b2189d8dc55bc942f278b2d482a6a0365de5bdd62d351567"
 dependencies = [
- "proc-macro2 1.0.70",
- "quote 1.0.33",
+ "proc-macro2 1.0.66",
+ "quote 1.0.32",
  "unicode-ident",
 ]
 
@@ -8475,18 +8661,6 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "20518fe4a4c9acf048008599e464deb21beeae3d3578418951a189c235a7a9a8"
 
-[[package]]
-name = "synstructure"
-version = "0.12.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f"
-dependencies = [
- "proc-macro2 1.0.70",
- "quote 1.0.33",
- "syn 1.0.109",
- "unicode-xid 0.2.4",
-]
-
 [[package]]
 name = "syslog"
 version = "6.1.0"
@@ -8502,9 +8676,9 @@ dependencies = [
 
 [[package]]
 name = "syslog_loose"
-version = "0.18.0"
+version = "0.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97fb75f176928530867b2a659e470f9c9ff71904695bab6556f7ad30f9039efd"
+checksum = "acf5252d1adec0a489a0225f867c1a7fd445e41674530a396d0629cff0c4b211"
 dependencies = [
  "chrono",
  "nom",
@@ -8636,22 +8810,22 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "1.0.40"
+version = "1.0.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac"
+checksum = "611040a08a0439f8248d1990b111c95baa9c704c805fa1f62104b39655fd7f90"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.40"
+version = "1.0.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f"
+checksum = "090198534930841fab3a5d1bb637cde49e339654e606195f8d9c76eeb081dc96"
 dependencies = [
- "proc-macro2 1.0.70",
- "quote 1.0.33",
- "syn 2.0.41",
+ "proc-macro2 1.0.66",
+ "quote 1.0.32",
+ "syn 2.0.28",
 ]
 
 [[package]]
@@ -8676,9 +8850,9 @@ dependencies = [
 
 [[package]]
 name = "tikv-jemallocator"
-version = "0.5.0"
+version = "0.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "20612db8a13a6c06d57ec83953694185a367e16945f66565e8028d2c0bd76979"
+checksum = "965fe0c26be5c56c94e38ba547249074803efd52adfb66de62107d95aab3eaca"
 dependencies = [
  "libc",
  "tikv-jemalloc-sys",
@@ -8686,9 +8860,9 @@ dependencies = [
 
 [[package]]
 name = "time"
-version = "0.3.17"
+version = "0.3.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a561bf4617eebd33bca6434b988f39ed798e527f51a1e797d0ee4f61c0a38376"
+checksum = "59e399c068f43a5d116fedaf73b203fa4f9c519f17e2b34f63221d3792f81446"
 dependencies = [
  "itoa",
  "libc",
@@ -8700,15 +8874,15 @@ dependencies = [
 
 [[package]]
 name = "time-core"
-version = "0.1.0"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd"
+checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb"
 
 [[package]]
 name = "time-macros"
-version = "0.2.6"
+version = "0.2.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d967f99f534ca7e495c575c62638eebc2898a8c84c119b89e250477bc4ba16b2"
+checksum = "96ba15a897f3c86766b757e5ac7221554c6750054d74d5b28844fce5fb36a6c4"
 dependencies = [
  "time-core",
 ]
@@ -8749,9 +8923,9 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
 
 [[package]]
 name = "tokio"
-version = "1.33.0"
+version = "1.30.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f38200e3ef7995e5ef13baec2f432a6da0aa9ac495b2c0e8f3b7eec2c92d653"
+checksum = "2d3ce25f50619af8b0aec2eb23deebe84249e19e2ddd393a6e16e3300a6dadfd"
 dependencies = [
  "backtrace",
  "bytes 1.4.0",
@@ -8794,16 +8968,16 @@ version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e"
 dependencies = [
- "proc-macro2 1.0.70",
- "quote 1.0.33",
- "syn 2.0.41",
+ "proc-macro2 1.0.66",
+ "quote 1.0.32",
+ "syn 2.0.28",
 ]
 
 [[package]]
 name = "tokio-native-tls"
-version = "0.3.1"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2"
+checksum = "f7d995660bd2b7f8c1568414c1126076c13fbb725c40112dc0120b78eb9b717b"
 dependencies = [
  "native-tls",
  "tokio",
@@ -8845,6 +9019,17 @@ dependencies = [
  "tokio-util",
 ]
 
+[[package]]
+name = "tokio-retry"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f57eb36ecbe0fc510036adff84824dd3c24bb781e21bfa67b69d556aa85214f"
+dependencies = [
+ "pin-project",
+ "rand 0.8.5",
+ "tokio",
+]
+
 [[package]]
 name = "tokio-rustls"
 version = "0.23.4"
@@ -8853,7 +9038,7 @@ checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59"
 dependencies = [
  "rustls 0.20.7",
  "tokio",
- "webpki 0.22.0",
+ "webpki",
 ]
 
 [[package]]
@@ -8862,7 +9047,7 @@ version = "0.24.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e0d409377ff5b1e3ca6437aa86c1eb7d40c134bfec254e44c830defa92669db5"
 dependencies = [
- "rustls 0.21.0",
+ "rustls 0.21.6",
  "tokio",
 ]
 
@@ -8903,19 +9088,6 @@ dependencies = [
  "tungstenite 0.18.0",
 ]
 
-[[package]]
-name = "tokio-tungstenite"
-version = "0.19.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec509ac96e9a0c43427c74f003127d953a265737636129424288d27cb5c4b12c"
-dependencies = [
- "futures-util",
- "log",
- "rustls 0.21.0",
- "tokio",
- "tungstenite 0.19.0",
-]
-
 [[package]]
 name = "tokio-tungstenite"
 version = "0.20.1"
@@ -8924,14 +9096,15 @@ checksum = "212d5dcb2a1ce06d81107c3d0ffa3121fe974b73f068c8282cb1c32328113b6c"
 dependencies = [
  "futures-util",
  "log",
+ "rustls 0.21.6",
  "tokio",
  "tungstenite 0.20.1",
 ]
 
 [[package]]
 name = "tokio-util"
-version = "0.7.4"
-source = "git+https://github.com/vectordotdev/tokio?branch=tokio-util-0.7.4-framed-read-continue-on-error#53a17f257b599a9d18bd75249de98d0b6fc28cfa"
+version = "0.7.8"
+source = "git+https://github.com/vectordotdev/tokio?branch=tokio-util-0.7.8-framed-read-continue-on-error#3747655f8f0443e13fe20da3f613ea65c23347c2"
 dependencies = [
  "bytes 1.4.0",
  "futures-core",
@@ -8954,9 +9127,9 @@ dependencies = [
 
 [[package]]
 name = "toml"
-version = "0.7.8"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257"
+checksum = "c17e963a819c331dcacd7ab957d80bc2b9a9c1e71c804826d2f283dd65306542"
 dependencies = [
  "serde",
  "serde_spanned",
@@ -8966,20 +9139,20 @@ dependencies = [
 
 [[package]]
 name = "toml_datetime"
-version = "0.6.5"
+version = "0.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1"
+checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b"
 dependencies = [
  "serde",
 ]
 
 [[package]]
 name = "toml_edit"
-version = "0.19.15"
+version = "0.19.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
+checksum = "c500344a19072298cd05a7224b3c0c629348b78692bf48466c5238656e315a78"
 dependencies = [
- "indexmap 2.0.2",
+ "indexmap 2.0.0",
  "serde",
  "serde_spanned",
  "toml_datetime",
@@ -9008,8 +9181,8 @@ dependencies = [
  "percent-encoding",
  "pin-project",
  "prost",
- "rustls-native-certs 0.6.2",
- "rustls-pemfile 1.0.1",
+ "rustls-native-certs",
+ "rustls-pemfile",
  "tokio",
  "tokio-rustls 0.24.0",
  "tokio-stream",
@@ -9026,9 +9199,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a6fdaae4c2c638bb70fe42803a26fbd6fc6ac8c72f5c59f67ecc2a2dcabf4b07"
 dependencies = [
  "prettyplease",
- "proc-macro2 1.0.70",
+ "proc-macro2 1.0.66",
  "prost-build",
- "quote 1.0.33",
+ "quote 1.0.32",
  "syn 1.0.109",
 ]
 
@@ -9054,13 +9227,13 @@ dependencies = [
 
 [[package]]
 name = "tower-http"
-version = "0.4.4"
+version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61c5bb1d698276a2443e5ecfabc1008bf15a36c12e6a7176e7bf089ea9131140"
+checksum = "55ae70283aba8d2a8b411c695c437fe25b8b5e44e23e780662002fc72fb47a82"
 dependencies = [
  "async-compression",
  "base64 0.21.2",
- "bitflags 2.4.1",
+ "bitflags 2.3.2",
  "bytes 1.4.0",
  "futures-core",
  "futures-util",
@@ -9131,8 +9304,8 @@ version = "0.1.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a"
 dependencies = [
- "proc-macro2 1.0.70",
- "quote 1.0.33",
+ "proc-macro2 1.0.66",
+ "quote 1.0.32",
  "syn 1.0.109",
 ]
 
@@ -9341,19 +9514,6 @@ version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642"
 
-[[package]]
-name = "tui"
-version = "0.19.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ccdd26cbd674007e649a272da4475fb666d3aa0ad0531da7136db6fab0e5bad1"
-dependencies = [
- "bitflags 1.3.2",
- "cassowary",
- "crossterm 0.25.0",
- "unicode-segmentation",
- "unicode-width",
-]
-
 [[package]]
 name = "tungstenite"
 version = "0.18.0"
@@ -9373,25 +9533,6 @@ dependencies = [
  "utf-8",
 ]
 
-[[package]]
-name = "tungstenite"
-version = "0.19.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "15fba1a6d6bb030745759a9a2a588bfe8490fc8b4751a277db3a0be1c9ebbf67"
-dependencies = [
- "byteorder",
- "bytes 1.4.0",
- "data-encoding",
- "http",
- "httparse",
- "log",
- "rand 0.8.5",
- "sha1",
- "thiserror",
- "url",
- "utf-8",
-]
-
 [[package]]
 name = "tungstenite"
 version = "0.20.1"
@@ -9427,8 +9568,19 @@ version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "89851716b67b937e393b3daa8423e67ddfc4bbbf1654bcf05488e95e0828db0c"
 dependencies = [
- "proc-macro2 1.0.70",
- "quote 1.0.33",
+ "proc-macro2 1.0.66",
+ "quote 1.0.32",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "typed-builder"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "64cba322cb9b7bc6ca048de49e83918223f35e7a86311267013afff257004870"
+dependencies = [
+ "proc-macro2 1.0.66",
+ "quote 1.0.32",
  "syn 1.0.109",
 ]
 
@@ -9440,9 +9592,9 @@ checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987"
 
 [[package]]
 name = "typetag"
-version = "0.2.8"
+version = "0.2.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a6898cc6f6a32698cc3e14d5632a14d2b23ed9f7b11e6b8e05ce685990acc22"
+checksum = "aec6850cc671cd0cfb3ab285465e48a3b927d9de155051c35797446b32f9169f"
 dependencies = [
  "erased-serde",
  "inventory",
@@ -9453,20 +9605,20 @@ dependencies = [
 
 [[package]]
 name = "typetag-impl"
-version = "0.2.8"
+version = "0.2.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c3e1c30cedd24fc597f7d37a721efdbdc2b1acae012c1ef1218f4c7c2c0f3e7"
+checksum = "30c49a6815b4f8379c36f06618bc1b80ca77aaf8a3fd4d8549dca6fdb016000f"
 dependencies = [
- "proc-macro2 1.0.70",
- "quote 1.0.33",
- "syn 2.0.41",
+ "proc-macro2 1.0.66",
+ "quote 1.0.32",
+ "syn 2.0.28",
 ]
 
 [[package]]
 name = "uaparser"
-version = "0.6.0"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3d705ae455d32248d299de9af5316a79ce9dc502c0b533aaeaf5f1c2fc02cc5"
+checksum = "cf694e7b0434d4fad6c879e984e8fdc3a62f5533c3d421762244f9e9d03f6927"
 dependencies = [
  "derive_more",
  "lazy_static",
@@ -9542,6 +9694,16 @@ version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c"
 
+[[package]]
+name = "universal-hash"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fc1de2c688dc15305988b563c3854064043356019f97a4b46276fe734c4f07ea"
+dependencies = [
+ "crypto-common",
+ "subtle",
+]
+
 [[package]]
 name = "unreachable"
 version = "1.0.0"
@@ -9606,15 +9768,15 @@ checksum = "5190c9442dcdaf0ddd50f37420417d219ae5261bbf5db120d0f9bab996c9cba1"
 
 [[package]]
 name = "utf8parse"
-version = "0.2.0"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "936e4b492acfd135421d8dca4b1aa80a7bfc26e702ef3af710e0752684df5372"
+checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
 
 [[package]]
 name = "uuid"
-version = "1.6.1"
+version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e395fcf16a7a3d8127ec99782007af141946b4795001f876d54fb0d55978560"
+checksum = "79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d"
 dependencies = [
  "getrandom 0.2.10",
  "md-5",
@@ -9643,7 +9805,7 @@ dependencies = [
  "atty",
  "cached",
  "chrono",
- "clap 4.1.14",
+ "clap 4.3.21",
  "clap-verbosity-flag",
  "clap_complete",
  "confy",
@@ -9651,7 +9813,7 @@ dependencies = [
  "dunce",
  "glob",
  "hex",
- "indexmap 2.0.2",
+ "indexmap 2.0.0",
  "indicatif",
  "itertools 0.11.0",
  "log",
@@ -9663,10 +9825,10 @@ dependencies = [
  "reqwest",
  "serde",
  "serde_json",
- "serde_yaml 0.9.27",
- "sha2 0.10.7",
+ "serde_yaml 0.9.25",
+ "sha2",
  "tempfile",
- "toml 0.7.8",
+ "toml 0.7.6",
 ]
 
 [[package]]
@@ -9677,7 +9839,7 @@ checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191"
 
 [[package]]
 name = "vector"
-version = "0.31.0"
+version = "0.32.2"
 dependencies = [
  "apache-avro",
  "approx",
@@ -9686,8 +9848,9 @@ dependencies = [
  "assay",
  "assert_cmd",
  "async-compression",
- "async-graphql",
+ "async-graphql 6.0.0",
  "async-graphql-warp",
+ "async-nats",
  "async-stream",
  "async-trait",
  "atty",
@@ -9714,18 +9877,18 @@ dependencies = [
  "azure_storage_blobs",
  "base64 0.21.2",
  "blake2",
- "bloom",
+ "bloomy",
  "bollard",
  "bytes 1.4.0",
  "bytesize",
  "chrono",
  "cidr-utils",
- "clap 4.1.14",
+ "clap 4.3.21",
  "codecs",
  "colored",
  "console-subscriber",
  "criterion",
- "crossterm 0.26.1",
+ "crossterm",
  "csv",
  "deadpool-postgres",
  "derivative",
@@ -9745,10 +9908,11 @@ dependencies = [
  "glob",
  "goauth",
  "governor",
+ "greptimedb-client",
  "grok",
  "h2",
  "hash_hasher",
- "hashbrown 0.14.3",
+ "hashbrown 0.14.0",
  "headers",
  "heim",
  "hex",
@@ -9759,9 +9923,9 @@ dependencies = [
  "hyper",
  "hyper-openssl",
  "hyper-proxy",
- "indexmap 2.0.2",
+ "indexmap 2.0.0",
  "indoc",
- "infer 0.14.0",
+ "infer 0.15.0",
  "inventory",
  "itertools 0.11.0",
  "k8s-openapi 0.18.0",
@@ -9780,9 +9944,8 @@ dependencies = [
  "mockall",
  "moka",
  "mongodb",
- "nats",
  "nix 0.26.2",
- "nkeys 0.3.0",
+ "nkeys",
  "nom",
  "notify",
  "num",
@@ -9810,6 +9973,7 @@ dependencies = [
  "quickcheck",
  "rand 0.8.5",
  "rand_distr",
+ "ratatui",
  "rdkafka",
  "redis",
  "regex",
@@ -9818,15 +9982,15 @@ dependencies = [
  "rmpv",
  "roaring",
  "seahash",
- "semver 1.0.17",
+ "semver 1.0.18",
  "serde",
  "serde-toml-merge",
  "serde_bytes",
  "serde_json",
- "serde_with 2.3.2",
- "serde_yaml 0.9.27",
+ "serde_with 3.2.0",
+ "serde_yaml 0.9.25",
  "serial_test",
- "sha2 0.10.7",
+ "sha2",
  "similar-asserts",
  "smallvec",
  "smpl_jwt",
@@ -9834,7 +9998,7 @@ dependencies = [
  "snap",
  "socket2 0.5.3",
  "stream-cancel",
- "strip-ansi-escapes",
+ "strip-ansi-escapes 0.2.0",
  "syslog",
  "temp-env",
  "tempfile",
@@ -9847,7 +10011,7 @@ dependencies = [
  "tokio-test",
  "tokio-tungstenite 0.20.1",
  "tokio-util",
- "toml 0.7.8",
+ "toml 0.7.6",
  "tonic",
  "tonic-build",
  "tower",
@@ -9860,7 +10024,6 @@ dependencies = [
  "tracing-subscriber",
  "tracing-tower",
  "trust-dns-proto 0.22.0",
- "tui",
  "typetag",
  "url",
  "urlencoding",
@@ -9888,7 +10051,7 @@ dependencies = [
  "anyhow",
  "async-trait",
  "chrono",
- "clap 4.1.14",
+ "clap 4.3.21",
  "futures 0.3.28",
  "graphql_client",
  "indoc",
@@ -9897,7 +10060,7 @@ dependencies = [
  "serde_json",
  "tokio",
  "tokio-stream",
- "tokio-tungstenite 0.19.0",
+ "tokio-tungstenite 0.20.1",
  "url",
  "uuid",
 ]
@@ -9911,7 +10074,7 @@ dependencies = [
  "async-trait",
  "bytecheck",
  "bytes 1.4.0",
- "clap 4.1.14",
+ "clap 4.3.21",
  "crc32fast",
  "criterion",
  "crossbeam-queue",
@@ -9931,7 +10094,7 @@ dependencies = [
  "rand 0.8.5",
  "rkyv",
  "serde",
- "serde_yaml 0.9.27",
+ "serde_yaml 0.9.25",
  "snafu",
  "temp-dir",
  "tokio",
@@ -9957,7 +10120,7 @@ dependencies = [
  "crossbeam-utils",
  "derivative",
  "futures 0.3.28",
- "indexmap 2.0.2",
+ "indexmap 2.0.0",
  "metrics",
  "nom",
  "ordered-float 3.7.0",
@@ -9987,16 +10150,16 @@ dependencies = [
  "chrono",
  "chrono-tz",
  "encoding_rs",
- "indexmap 2.0.2",
+ "indexmap 2.0.0",
  "inventory",
  "no-proxy",
  "num-traits",
  "once_cell",
  "serde",
  "serde_json",
- "serde_with 2.3.2",
+ "serde_with 3.2.0",
  "snafu",
- "toml 0.7.8",
+ "toml 0.7.6",
  "tracing 0.1.37",
  "url",
  "vector-config-common",
@@ -10009,13 +10172,13 @@ name = "vector-config-common"
 version = "0.1.0"
 dependencies = [
  "convert_case 0.6.0",
- "darling 0.13.4",
+ "darling 0.20.3",
  "once_cell",
- "proc-macro2 1.0.70",
- "quote 1.0.33",
+ "proc-macro2 1.0.66",
+ "quote 1.0.32",
  "serde",
  "serde_json",
- "syn 1.0.109",
+ "syn 2.0.28",
  "tracing 0.1.37",
 ]
 
@@ -10023,12 +10186,12 @@ dependencies = [
 name = "vector-config-macros"
 version = "0.1.0"
 dependencies = [
- "darling 0.13.4",
- "proc-macro2 1.0.70",
- "quote 1.0.33",
+ "darling 0.20.3",
+ "proc-macro2 1.0.66",
+ "quote 1.0.32",
  "serde",
  "serde_derive_internals",
- "syn 1.0.109",
+ "syn 2.0.28",
  "vector-config",
  "vector-config-common",
 ]
@@ -10037,7 +10200,7 @@ dependencies = [
 name = "vector-core"
 version = "0.1.0"
 dependencies = [
- "async-graphql",
+ "async-graphql 5.0.10",
  "async-trait",
  "base64 0.21.2",
  "bitmask-enum",
@@ -10059,7 +10222,7 @@ dependencies = [
  "http",
  "httptest",
  "hyper-proxy",
- "indexmap 2.0.2",
+ "indexmap 2.0.0",
  "metrics",
  "metrics-tracing-context",
  "metrics-util",
@@ -10090,7 +10253,7 @@ dependencies = [
  "security-framework",
  "serde",
  "serde_json",
- "serde_with 2.3.2",
+ "serde_with 3.2.0",
  "similar-asserts",
  "smallvec",
  "snafu",
@@ -10101,7 +10264,7 @@ dependencies = [
  "tokio-stream",
  "tokio-test",
  "tokio-util",
- "toml 0.7.8",
+ "toml 0.7.6",
  "tonic",
  "tower",
  "tracing 0.1.37",
@@ -10136,7 +10299,7 @@ dependencies = [
 name = "vector-vrl-cli"
 version = "0.1.0"
 dependencies = [
- "clap 4.1.14",
+ "clap 4.3.21",
  "vector-vrl-functions",
  "vrl",
 ]
@@ -10155,7 +10318,7 @@ dependencies = [
  "ansi_term",
  "chrono",
  "chrono-tz",
- "clap 4.1.14",
+ "clap 4.3.21",
  "enrichment",
  "glob",
  "prettydiff",
@@ -10196,8 +10359,8 @@ checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d"
 
 [[package]]
 name = "vrl"
-version = "0.5.0"
-source = "git+ssh://git@github.com/answerbook/vrl.git?rev=v0.7.0#2457db0764e0bac16e4da3e41b032507dc509d62"
+version = "0.6.0"
+source = "git+ssh://git@github.com/answerbook/vrl.git?rev=v0.8.0#e729f555a66908108ecc2d9c3ea0423cc578c276"
 dependencies = [
  "aes",
  "ansi_term",
@@ -10209,12 +10372,14 @@ dependencies = [
  "cbc",
  "cfb-mode",
  "cfg-if",
+ "chacha20poly1305",
  "charset",
  "chrono",
  "chrono-tz",
  "cidr-utils",
- "clap 4.1.14",
+ "clap 4.3.21",
  "codespan-reporting",
+ "crypto_secretbox",
  "csv",
  "ctr",
  "data-encoding",
@@ -10226,7 +10391,7 @@ dependencies = [
  "hex",
  "hmac",
  "hostname",
- "indexmap 2.0.2",
+ "indexmap 2.0.0",
  "indoc",
  "itertools 0.11.0",
  "lalrpop",
@@ -10255,10 +10420,10 @@ dependencies = [
  "serde",
  "serde_json",
  "sha-1",
- "sha2 0.10.7",
+ "sha2",
  "sha3",
  "snafu",
- "strip-ansi-escapes",
+ "strip-ansi-escapes 0.1.1",
  "substring",
  "syslog_loose",
  "termcolor",
@@ -10284,14 +10449,24 @@ dependencies = [
  "vte_generate_state_changes",
 ]
 
+[[package]]
+name = "vte"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f5022b5fbf9407086c180e9557be968742d839e68346af7792b8592489732197"
+dependencies = [
+ "utf8parse",
+ "vte_generate_state_changes",
+]
+
 [[package]]
 name = "vte_generate_state_changes"
 version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d257817081c7dffcdbab24b9e62d2def62e2ff7d00b1c20062551e6cccc145ff"
 dependencies = [
- "proc-macro2 1.0.70",
- "quote 1.0.33",
+ "proc-macro2 1.0.66",
+ "quote 1.0.32",
 ]
 
 [[package]]
@@ -10347,7 +10522,7 @@ dependencies = [
  "mime_guess",
  "percent-encoding",
  "pin-project",
- "rustls-pemfile 1.0.1",
+ "rustls-pemfile",
  "scoped-tls",
  "serde",
  "serde_json",
@@ -10391,9 +10566,9 @@ dependencies = [
  "bumpalo",
  "log",
  "once_cell",
- "proc-macro2 1.0.70",
- "quote 1.0.33",
- "syn 2.0.41",
+ "proc-macro2 1.0.66",
+ "quote 1.0.32",
+ "syn 2.0.28",
  "wasm-bindgen-shared",
 ]
 
@@ -10415,7 +10590,7 @@ version = "0.2.87"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d"
 dependencies = [
- "quote 1.0.33",
+ "quote 1.0.32",
  "wasm-bindgen-macro-support",
 ]
 
@@ -10425,9 +10600,9 @@ version = "0.2.87"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b"
 dependencies = [
- "proc-macro2 1.0.70",
- "quote 1.0.33",
- "syn 2.0.41",
+ "proc-macro2 1.0.66",
+ "quote 1.0.32",
+ "syn 2.0.28",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
@@ -10478,16 +10653,6 @@ dependencies = [
  "web-sys",
 ]
 
-[[package]]
-name = "webpki"
-version = "0.21.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8e38c0608262c46d4a56202ebabdeb094cef7e560ca7a226c6bf055188aa4ea"
-dependencies = [
- "ring",
- "untrusted",
-]
-
 [[package]]
 name = "webpki"
 version = "0.22.0"
@@ -10504,7 +10669,7 @@ version = "0.22.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "368bfe657969fb01238bb756d351dcade285e0f6fcbd36dcb23359a5169975be"
 dependencies = [
- "webpki 0.22.0",
+ "webpki",
 ]
 
 [[package]]
@@ -10736,9 +10901,9 @@ checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a"
 
 [[package]]
 name = "winnow"
-version = "0.5.28"
+version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c830786f7720c2fd27a1a0e27a709dbd3c4d009b56d098fc742d4f4eab91fe2"
+checksum = "61de7bac303dc551fe038e2b3cef0f571087a47571ea6e79a87692ac99b99699"
 dependencies = [
  "memchr",
 ]
@@ -10793,12 +10958,6 @@ dependencies = [
  "tap",
 ]
 
-[[package]]
-name = "xml-rs"
-version = "0.8.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52839dc911083a8ef63efa4d039d1f58b5e409f923e44c80828f206f66e5541c"
-
 [[package]]
 name = "xmlparser"
 version = "0.13.5"
@@ -10827,16 +10986,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "332f188cc1bcf1fe1064b8c58d150f497e697f49774aa846f2dc949d9a25f236"
 dependencies = [
  "byteorder",
- "zerocopy-derive 0.3.2",
-]
-
-[[package]]
-name = "zerocopy"
-version = "0.7.31"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c4061bedbb353041c12f413700357bec76df2c7e2ca8e4df8bac24c6bf68e3d"
-dependencies = [
- "zerocopy-derive 0.7.31",
+ "zerocopy-derive",
 ]
 
 [[package]]
@@ -10845,42 +10995,16 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6505e6815af7de1746a08f69c69606bb45695a17149517680f3b2149713b19a3"
 dependencies = [
- "proc-macro2 1.0.70",
- "quote 1.0.33",
+ "proc-macro2 1.0.66",
+ "quote 1.0.32",
  "syn 1.0.109",
 ]
 
-[[package]]
-name = "zerocopy-derive"
-version = "0.7.31"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3c129550b3e6de3fd0ba67ba5c81818f9805e58b8d7fee80a3a59d2c9fc601a"
-dependencies = [
- "proc-macro2 1.0.70",
- "quote 1.0.33",
- "syn 2.0.41",
-]
-
 [[package]]
 name = "zeroize"
-version = "1.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d"
-dependencies = [
- "zeroize_derive",
-]
-
-[[package]]
-name = "zeroize_derive"
-version = "1.3.2"
+version = "1.5.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f8f187641dad4f680d25c4bfc4225b418165984179f26ca76ec4fb6441d3a17"
-dependencies = [
- "proc-macro2 1.0.70",
- "quote 1.0.33",
- "syn 1.0.109",
- "synstructure",
-]
+checksum = "c394b5bd0c6f669e7275d9c20aa90ae064cb22e75a1cad54e1b34088034b149f"
 
 [[package]]
 name = "zstd"
diff --git a/Cargo.toml b/Cargo.toml
index c45bbfb12a14c..6c6453f6831b3 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "vector"
-version = "0.31.0"
+version = "0.32.2"
 authors = ["Vector Contributors <vector@datadoghq.com>"]
 edition = "2021"
 description = "A lightweight and ultra-fast tool for building observability pipelines"
@@ -57,7 +57,10 @@ assets = [
   ["config/vector.toml", "/etc/vector/vector.toml", "644"],
   ["config/examples/*", "/etc/vector/examples/", "644"],
   ["distribution/systemd/vector.service", "/lib/systemd/system/vector.service", "644"],
-  ["distribution/systemd/vector.default", "/etc/default/vector", "600"]
+  ["distribution/systemd/vector.default", "/etc/default/vector", "600"],
+  ["licenses/*", "/usr/share/vector/licenses/", "644"],
+  ["NOTICE", "/usr/share/vector/NOTICE", "644"],
+  ["LICENSE-3rdparty.csv", "/usr/share/vector/LICENSE-3rdparty.csv", "644"],
 ]
 license-file = ["target/debian-license.txt"]
 extended-description-file = "target/debian-extended-description.txt"
@@ -118,7 +121,7 @@ members = [
 ]
 
 [workspace.dependencies]
-vrl = { git = "ssh://git@github.com/answerbook/vrl.git", rev = "v0.7.0", features = ["cli", "test", "test_framework", "arbitrary"] }
+vrl = { git = "ssh://git@github.com/answerbook/vrl.git", rev = "v0.8.0", features = ["cli", "test", "test_framework", "arbitrary"] }
 
 [dependencies]
 vrl.workspace = true
@@ -146,13 +149,13 @@ loki-logproto = { path = "lib/loki-logproto", optional = true }
 
 # Tokio / Futures
 async-stream = { version = "0.3.5", default-features = false }
-async-trait = { version = "0.1.68", default-features = false }
+async-trait = { version = "0.1.73", default-features = false }
 futures = { version = "0.3.28", default-features = false, features = ["compat", "io-compat"], package = "futures" }
-tokio = { version = "1.29.0", default-features = false, features = ["full"] }
+tokio = { version = "1.30.0", default-features = false, features = ["full"] }
 tokio-openssl = { version = "0.6.3", default-features = false }
 tokio-stream = { version = "0.1.14", default-features = false, features = ["net", "sync", "time"] }
 tokio-util = { version = "0.7", default-features = false, features = ["io", "time"] }
-console-subscriber = { version = "0.1.9", default-features = false, optional = true }
+console-subscriber = { version = "0.1.10", default-features = false, optional = true }
 
 # Tracing
 tracing = { version = "0.1.34", default-features = false }
@@ -162,7 +165,7 @@ tracing-subscriber = { version = "0.3.17", default-features = false, features =
 tracing-tower = { git = "https://github.com/tokio-rs/tracing", default-features = false, rev = "e0642d949891546a3bb7e47080365ee7274f05cd" }
 
 # Metrics
-metrics = "0.21.0"
+metrics = "0.21.1"
 metrics-tracing-context = { version = "0.14.0", default-features = false }
 
 # AWS - Official SDK
@@ -185,27 +188,27 @@ aws-smithy-http-tower = { git = "https://github.com/vectordotdev/aws-sdk-rust",
 aws-smithy-types = { git = "https://github.com/vectordotdev/aws-sdk-rust", rev = "3d6aefb7fcfced5fc2a7e761a87e4ddbda1ee670", default-features = false, optional = true }
 
 # Azure
-azure_core = { git = "https://github.com/Azure/azure-sdk-for-rust.git", rev = "b4544d4920fa3064eb921340054cd9cc130b7664", default-features = false, features = ["enable_reqwest"], optional = true }
-azure_identity = { git = "https://github.com/Azure/azure-sdk-for-rust.git", rev = "b4544d4920fa3064eb921340054cd9cc130b7664", default-features = false, features = ["enable_reqwest"], optional = true }
-azure_storage = { git = "https://github.com/Azure/azure-sdk-for-rust.git", rev = "b4544d4920fa3064eb921340054cd9cc130b7664", default-features = false, optional = true }
-azure_storage_blobs = { git = "https://github.com/Azure/azure-sdk-for-rust.git", rev = "b4544d4920fa3064eb921340054cd9cc130b7664", default-features = false, optional = true }
+azure_core = { version = "0.13", default-features = false, features = ["enable_reqwest"], optional = true }
+azure_identity = { version = "0.13", default-features = false, features = ["enable_reqwest"], optional = true }
+azure_storage = { version = "0.13", default-features = false, optional = true }
+azure_storage_blobs = { version = "0.13", default-features = false, optional = true }
 
 # OpenDAL
 opendal = {version = "0.38", default-features = false, features = ["native-tls", "services-webhdfs"], optional = true}
 
 # Tower
 tower = { version = "0.4.13", default-features = false, features = ["buffer", "limit", "retry", "timeout", "util", "balance", "discover"] }
-tower-http = { version = "0.4.1", default-features = false, features = ["decompression-gzip"]}
+tower-http = { version = "0.4.3", default-features = false, features = ["decompression-gzip"]}
 # Serde
-serde = { version = "1.0.164", default-features = false, features = ["derive"] }
+serde = { version = "1.0.183", default-features = false, features = ["derive"] }
 serde-toml-merge = { version = "0.3.0", default-features = false }
-serde_bytes = { version = "0.11.9", default-features = false, features = ["std"], optional = true }
-serde_json = { version = "1.0.99", default-features = false, features = ["raw_value"] }
-serde_with = { version = "2.3.2", default-features = false, features = ["macros", "std"] }
-serde_yaml = { version = "0.9.22", default-features = false }
+serde_bytes = { version = "0.11.12", default-features = false, features = ["std"], optional = true }
+serde_json = { version = "1.0.104", default-features = false, features = ["raw_value"] }
+serde_with = { version = "3.2.0", default-features = false, features = ["macros", "std"] }
+serde_yaml = { version = "0.9.25", default-features = false }
 
 # Messagepack
-rmp-serde = { version = "1.1.1", default-features = false, optional = true }
+rmp-serde = { version = "1.1.2", default-features = false, optional = true }
 rmpv = { version = "1.0.0", default-features = false, features = ["with-serde"], optional = true }
 
 # Prost / Protocol Buffers
@@ -219,18 +222,18 @@ smpl_jwt = { version = "0.7.1", default-features = false, optional = true }
 
 # AMQP
 # Mezmo: we have enabled openssl instead of native-tls (upstream) LOG-16435
-lapin = { version = "2.1.1", default-features = false, features = ["openssl"], optional = true }
+lapin = { version = "2.3.1", default-features = false, features = ["openssl"], optional = true }
 
 # API
-async-graphql = { version = "5.0.10", default-features = false, optional = true, features = ["chrono"] }
-async-graphql-warp = { version = "5.0.10", default-features = false, optional = true }
+async-graphql = { version = "6.0.0", default-features = false, optional = true, features = ["chrono", "playground"] }
+async-graphql-warp = { version = "6.0.0", default-features = false, optional = true }
 itertools = { version = "0.11.0", default-features = false, optional = true }
 
 # API client
 crossterm = { version = "0.26.1", default-features = false, features = ["event-stream"], optional = true }
 num-format = { version = "0.4.4", default-features = false, features = ["with-num-bigint"], optional = true }
 number_prefix = { version = "0.4.0", default-features = false, features = ["std"], optional = true }
-tui = { version = "0.19.0", optional = true, default-features = false, features = ["crossterm"] }
+ratatui = { version = "0.22.0", optional = true, default-features = false, features = ["crossterm"] }
 
 # Datadog Pipelines
 # datadog-filter = { package = "datadog-filter", git = "ssh://git@github.com/answerbook/vrl.git", rev = "next" }
@@ -239,33 +242,36 @@ tui = { version = "0.19.0", optional = true, default-features = false, features
 hex = { version = "0.4.3", default-features = false}
 sha2 = { version = "0.10.7", default-features = false}
 
+# GreptimeDB
+greptimedb-client = { git = "https://github.com/GreptimeTeam/greptimedb-client-rust.git", rev = "bc32362adf0df17a41a95bae4221d6d8f1775656", optional = true }
+
 # External libs
 arc-swap = { version = "1.6", default-features = false, optional = true }
-async-compression = { version = "0.4.0", default-features = false, features = ["tokio", "gzip", "zstd"], optional = true }
-apache-avro = { version = "0.14.0", default-features = false, optional = true }
-axum = { version = "0.6.18", default-features = false }
+async-compression = { version = "0.4.1", default-features = false, features = ["tokio", "gzip", "zstd"], optional = true }
+apache-avro = { version = "0.15.0", default-features = false, optional = true }
+axum = { version = "0.6.20", default-features = false }
 base64 = { version = "0.21.2", default-features = false, optional = true }
-bloom = { version = "0.3.2", default-features = false, optional = true }
+bloomy  = { version = "1.2.0", default-features = false, optional = true }
 bollard = { version = "0.14.0", default-features = false, features = ["ssl", "chrono"], optional = true }
 bytes = { version = "1.4.0", default-features = false, features = ["serde"] }
 blake2 = { version = "0.10.6", default-features = false, optional = true }
 bytesize = { version = "1.2.0", default-features = false }
 chrono = { version = "0.4.26", default-features = false, features = ["serde"] }
 cidr-utils = { version = "0.5.10", default-features = false }
-clap = { version = "4.1.14", default-features = false, features = ["derive", "error-context", "env", "help", "std", "string", "usage", "wrap_help"] }
-colored = { version = "2.0.0", default-features = false }
+clap = { version = "4.3.21", 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.2", default-features = false }
 deadpool-postgres = { version = "0.10.2"}
 derivative = { version = "2.2.0", default-features = false }
 dirs-next = { version = "2.0.0", default-features = false, optional = true }
-dyn-clone = { version = "1.0.11", default-features = false }
+dyn-clone = { version = "1.0.12", default-features = false }
 encoding_rs = { version = "0.8.32", default-features = false, features = ["serde"] }
-enum_dispatch = { version = "0.3.11", default-features = false }
+enum_dispatch = { version = "0.3.12", default-features = false }
 exitcode = { version = "1.1.2", default-features = false }
 flate2 = { version = "1.0.26", default-features = false, features = ["default"] }
 futures-util = { version = "0.3.28", default-features = false }
 glob = { version = "0.3.1", default-features = false }
-governor = { version = "0.5.1", default-features = false, features = ["dashmap", "jitter", "std"], optional = true }
+governor = { version = "0.6.0", default-features = false, features = ["dashmap", "jitter", "std"], optional = true }
 grok = { version = "2.0.0", default-features = false, optional = true }
 h2 = { version = "0.3.20", default-features = false, optional = true }
 hash_hasher = { version = "2.0.0", default-features = false }
@@ -278,58 +284,58 @@ hyper = { version = "0.14.27", default-features = false, features = ["client", "
 hyper-openssl = { version = "0.9.2", default-features = false }
 hyper-proxy = { version = "0.9.1", default-features = false, features = ["openssl-tls"] }
 indexmap = { version = "~2.0.0", default-features = false, features = ["serde", "std"] }
-infer = { version = "0.14.0", default-features = false, optional = true}
-indoc = { version = "2.0.1", default-features = false }
-inventory = { version = "0.3.6", default-features = false }
+infer = { version = "0.15.0", default-features = false, optional = true}
+indoc = { version = "2.0.3", default-features = false }
+inventory = { version = "0.3.11", default-features = false }
 k8s-openapi = { version = "0.18.0", default-features = false, features = ["api", "v1_26"], optional = true }
 kube = { version = "0.82.0", default-features = false, features = ["client", "openssl-tls", "runtime"], optional = true }
 listenfd = { version = "1.0.1", default-features = false, optional = true }
 logfmt = { version = "0.0.2", default-features = false, optional = true }
-lru = { version = "0.10.1", default-features = false, optional = true }
+lru = { version = "0.11.0", default-features = false, optional = true }
 maxminddb = { version = "0.23.0", default-features = false, optional = true }
 md-5 = { version = "0.10", default-features = false, optional = true }
 mongodb = { version = "2.6.0", default-features = false, features = ["tokio-runtime"], optional = true }
-nats = { version = "0.24.0", default-features = false, optional = true }
-nkeys = { version = "0.3.0", default-features = false, optional = true }
+async-nats = { version = "0.31.0", default-features = false, optional = true }
+nkeys = { version = "0.3.1", default-features = false, optional = true }
 nom = { version = "7.1.3", default-features = false, optional = true }
 notify = { version = "6.0.1", default-features = false, features = ["macos_fsevent"] }
 once_cell = { version = "1.18", default-features = false }
-openssl = { version = "0.10.55", default-features = false, features = ["vendored"] }
+openssl = { version = "0.10.56", default-features = false, features = ["vendored"] }
 openssl-probe = { version = "0.1.5", default-features = false }
 ordered-float = { version = "3.7.0", default-features = false }
-paste = "1.0.12"
+paste = "1.0.14"
 percent-encoding = { version = "2.3.0", default-features = false }
-pin-project = { version = "1.1.1", default-features = false }
+pin-project = { version = "1.1.3", default-features = false }
 postgres-openssl = { version = "0.5.0", default-features = false, features = ["runtime"], optional = true }
 pulsar = { version = "6.0.1", default-features = false, features = ["tokio-runtime", "auth-oauth2", "flate2", "lz4", "snap", "zstd"], optional = true }
 rand = { version = "0.8.5", default-features = false, features = ["small_rng"] }
 rand_distr = { version = "0.4.3", default-features = false }
 reqwest = { version = "0.11", features = ["json"] }
-rdkafka = { version = "0.32.2", default-features = false, features = ["tokio", "libz", "ssl", "zstd"], optional = true }
-redis = { version = "0.23.0", default-features = false, features = ["connection-manager", "tokio-comp", "tokio-native-tls-comp"], optional = true }
-regex = { version = "1.8.4", default-features = false, features = ["std", "perf"] }
-roaring = { version = "0.10.1", default-features = false, optional = true }
+rdkafka = { version = "0.33.2", default-features = false, features = ["tokio", "libz", "ssl", "zstd"], optional = true }
+redis = { version = "0.23.2", default-features = false, features = ["connection-manager", "tokio-comp", "tokio-native-tls-comp"], optional = true }
+regex = { version = "1.9.3", default-features = false, features = ["std", "perf"] }
+roaring = { version = "0.10.2", default-features = false, optional = true }
 seahash = { version = "4.1.0", default-features = false }
-semver = { version = "1.0.17", default-features = false, features = ["serde", "std"], optional = true }
+semver = { version = "1.0.18", default-features = false, features = ["serde", "std"], optional = true }
 smallvec = { version = "1", default-features = false, features = ["union", "serde"] }
-snafu = { version = "0.7.4", default-features = false, features = ["futures"] }
+snafu = { version = "0.7.5", default-features = false, features = ["futures"] }
 snap = { version = "1.1.0", default-features = false, optional = true }
 socket2 = { version = "0.5.3", default-features = false }
 stream-cancel = { version = "0.8.1", default-features = false }
-strip-ansi-escapes = { version = "0.1.1", default-features = false }
+strip-ansi-escapes = { version = "0.2.0", default-features = false }
 syslog = { version = "6.1.0", default-features = false, optional = true }
 urlencoding = { version = "2.1.0", default-features = false }
-tikv-jemallocator = { version = "0.5.0", default-features = false, optional = true }
+tikv-jemallocator = { version = "0.5.4", default-features = false, optional = true }
 tokio-postgres = { version = "0.7.7", 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.7.5", default-features = false, features = ["parse", "display"] }
+toml = { version = "0.7.6", default-features = false, features = ["parse", "display"] }
 tonic = { version = "0.9", optional = true, default-features = false, features = ["transport", "codegen", "prost", "tls", "tls-roots", "gzip"] }
 trust-dns-proto = { version = "0.22.0", default-features = false, features = ["dnssec"], optional = true }
-typetag = { version = "0.2.8", default-features = false }
+typetag = { version = "0.2.12", default-features = false }
 url = { version = "2.4.0", default-features = false, features = ["serde"] }
 uuid = { version = "1", default-features = false, features = ["serde", "v4"] }
 warp = { version = "0.3.5", default-features = false }
-zstd = { version = "0.12.3", default-features = false }
+zstd = { version = "0.12.4", default-features = false }
 arr_macro = { version = "0.2.1" }
 moka = { version = "0.11" }
 num = { version = "0.4.0" }
@@ -354,15 +360,15 @@ nix = { version = "0.26.2", default-features = false, features = ["socket", "sig
 [build-dependencies]
 prost-build = { version = "0.11", default-features = false, optional = true }
 tonic-build = { version = "0.9", default-features = false, features = ["transport", "prost"], optional = true }
-openssl-src = { version = "111", default-features = false, features = ["force-engine"] }
+openssl-src = { version = "300", default-features = false, features = ["force-engine", "legacy"] }
 
 [dev-dependencies]
 approx = "0.5.1"
-assert_cmd = { version = "2.0.11", default-features = false }
-azure_core = { git = "https://github.com/Azure/azure-sdk-for-rust.git", rev = "b4544d4920fa3064eb921340054cd9cc130b7664", default-features = false, features = ["enable_reqwest", "azurite_workaround"] }
-azure_identity = { git = "https://github.com/Azure/azure-sdk-for-rust.git", rev = "b4544d4920fa3064eb921340054cd9cc130b7664", default-features = false, features = ["enable_reqwest"] }
-azure_storage_blobs = { git = "https://github.com/Azure/azure-sdk-for-rust.git", rev = "b4544d4920fa3064eb921340054cd9cc130b7664", default-features = false, features = ["azurite_workaround"] }
-azure_storage = { git = "https://github.com/Azure/azure-sdk-for-rust.git", rev = "b4544d4920fa3064eb921340054cd9cc130b7664", default-features = false, features = ["azurite_workaround"] }
+assert_cmd = { version = "2.0.12", default-features = false }
+azure_core = { version = "0.13", default-features = false, features = ["enable_reqwest", "azurite_workaround"] }
+azure_identity = { version = "0.13", default-features = false, features = ["enable_reqwest"] }
+azure_storage_blobs = { version = "0.13", default-features = false, features = ["azurite_workaround"] }
+azure_storage = { version = "0.13", default-features = false }
 mockall = "0.11.4"
 httptest = "0.15.4"
 base64 = "0.21.2"
@@ -376,12 +382,12 @@ serial_test = "1.0.0"
 tempfile = "3.6.0"
 test-generator = "0.3.1"
 tokio-test = "0.4.2"
-tokio = { version = "1.29.0", features = ["test-util"] }
+tokio = { version = "1.30.0", features = ["test-util"] }
 tower-test = "0.4.0"
 vector-core = { path = "lib/vector-core", default-features = false, features = ["vrl", "test"] }
 snap = "1"
 wiremock = "0.5.19"
-zstd = { version = "0.12.3", default-features = false }
+zstd = { version = "0.12.4", default-features = false }
 assay = "0.1.1"
 temp-env = "0.3.1"
 
@@ -390,11 +396,17 @@ temp-env = "0.3.1"
 # https://github.com/chronotope/chrono/pull/578
 chrono = { git = "https://github.com/vectordotdev/chrono.git", tag = "v0.4.26-no-default-time-1" }
 # The upgrade for `tokio-util` >= 0.6.9 is blocked on https://github.com/vectordotdev/vector/issues/11257.
-tokio-util = { git = "https://github.com/vectordotdev/tokio", branch = "tokio-util-0.7.4-framed-read-continue-on-error" }
+tokio-util = { git = "https://github.com/vectordotdev/tokio", branch = "tokio-util-0.7.8-framed-read-continue-on-error" }
 nix = { git = "https://github.com/vectordotdev/nix.git", branch = "memfd/gnu/musl" }
 # The `heim` crates depend on `ntapi` 0.3.7 on Windows, but that version has an
 # unaligned access bug fixed in the following revision.
 ntapi = { git = "https://github.com/MSxDOS/ntapi.git", rev = "24fc1e47677fc9f6e38e5f154e6011dc9b270da6" }
+# The current `openssl-sys` crate will vendor the OpenSSL sources via
+# `openssl-src` at version 1.1.1*, but we want version 3.1.*. Bring in forked
+# version of that crate with the appropriate dependency patched in.
+openssl-sys = { git = "https://github.com/vectordotdev/rust-openssl.git", tag = "openssl-sys-v0.9.91+3.0.0" }
+openssl-src = { git = "https://github.com/vectordotdev/openssl-src-rs.git", tag = "release-300-force-engine+3.1.2"}
+
 
 [features]
 # Default features for *-unknown-linux-gnu and *-apple-darwin
@@ -452,7 +464,7 @@ api-client = [
   "dep:crossterm",
   "dep:num-format",
   "dep:number_prefix",
-  "dep:tui",
+  "dep:ratatui",
   "vector-core/api",
   "dep:vector-api-client",
 ]
@@ -576,7 +588,7 @@ sources-kafka = ["dep:rdkafka"]
 sources-kubernetes_logs = ["dep:file-source", "kubernetes", "transforms-reduce"]
 sources-logstash = ["sources-utils-net-tcp", "tokio-util/net"]
 sources-mongodb_metrics = ["dep:mongodb"]
-sources-nats = ["dep:nats", "dep:nkeys"]
+sources-nats = ["dep:async-nats", "dep:nkeys"]
 sources-nginx_metrics = ["dep:nom"]
 sources-opentelemetry = ["dep:opentelemetry-proto", "dep:prost-types", "sources-http_server", "sources-utils-http", "sources-vector"]
 sources-postgresql_metrics = ["dep:postgres-openssl", "dep:tokio-postgres"]
@@ -668,11 +680,11 @@ transforms-mezmo_aggregate = []
 transforms-mezmo_log_to_metric = []
 transforms-mezmo_log_clustering = ["dep:lru", "dep:blake2", "dep:base64", "dep:tokio-postgres"]
 transforms-mezmo_log_classification = ["dep:grok"]
-transforms-mezmo_tag_cardinality_limit = ["dep:bloom", "dep:hashbrown"]
+transforms-mezmo_tag_cardinality_limit = ["dep:bloomy", "dep:hashbrown"]
 transforms-remap = []
 transforms-route = []
 transforms-sample = []
-transforms-tag_cardinality_limit = ["dep:bloom", "dep:hashbrown"]
+transforms-tag_cardinality_limit = ["dep:bloomy", "dep:hashbrown"]
 transforms-throttle = ["dep:governor"]
 transforms-protobuf_to_metric = []
 transforms-protobuf_to_log = []
@@ -756,6 +768,7 @@ sinks-metrics = [
   "sinks-blackhole",
   "sinks-console",
   "sinks-datadog_metrics",
+  "sinks-greptimedb",
   "sinks-humio",
   "sinks-influxdb",
   "sinks-kafka",
@@ -800,6 +813,7 @@ sinks-datadog_traces = ["protobuf-build", "dep:rmpv", "dep:rmp-serde", "dep:serd
 sinks-elasticsearch = ["aws-core", "transforms-metric_to_log"]
 sinks-file = ["dep:async-compression"]
 sinks-gcp = ["dep:base64", "gcp"]
+sinks-greptimedb = ["dep:greptimedb-client"]
 sinks-honeycomb = []
 sinks-http = []
 sinks-humio = ["sinks-splunk_hec", "transforms-metric_to_log"]
@@ -807,7 +821,7 @@ sinks-influxdb = []
 sinks-kafka = ["dep:rdkafka"]
 sinks-mezmo = []
 sinks-loki = ["loki-logproto"]
-sinks-nats = ["dep:nats", "dep:nkeys"]
+sinks-nats = ["dep:async-nats", "dep:nkeys"]
 sinks-new_relic_logs = ["sinks-http"]
 sinks-new_relic = []
 sinks-papertrail = ["dep:syslog"]
@@ -862,6 +876,7 @@ all-integration-tests = [
   "gcp-cloud-storage-integration-tests",
   "gcp-integration-tests",
   "gcp-pubsub-integration-tests",
+  "greptimedb-integration-tests",
   "http-client-integration-tests",
   "humio-integration-tests",
   "influxdb-integration-tests",
@@ -924,6 +939,7 @@ fluent-integration-tests = ["docker", "sources-fluent"]
 gcp-cloud-storage-integration-tests = ["sinks-gcp"]
 gcp-integration-tests = ["sinks-gcp"]
 gcp-pubsub-integration-tests = ["sinks-gcp", "sources-gcp_pubsub"]
+greptimedb-integration-tests = ["sinks-greptimedb"]
 humio-integration-tests = ["sinks-humio"]
 http-client-integration-tests = ["sources-http_client"]
 influxdb-integration-tests = ["sinks-influxdb"]
diff --git a/Jenkinsfile b/Jenkinsfile
index 75fdd5c9b21bf..b63118d5f4fc3 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -151,7 +151,9 @@ pipeline {
     }
     stage('Feature build and publish') {
       when {
-        branch pattern: "(feature\\/LOG-\\d+)", comparator: "REGEXP"
+        expression {
+          CURRENT_BRANCH ==~ /feature\/LOG-\d+/
+        }
       }
       steps {
         script {
diff --git a/LICENSE-3rdparty.csv b/LICENSE-3rdparty.csv
index fd759a75ab82a..33d1067e89910 100644
--- a/LICENSE-3rdparty.csv
+++ b/LICENSE-3rdparty.csv
@@ -4,6 +4,7 @@ RustyXML,https://github.com/Florob/RustyXML,MIT OR Apache-2.0,Florian Zeitz <flo
 addr2line,https://github.com/gimli-rs/addr2line,Apache-2.0 OR MIT,The addr2line Authors
 adler,https://github.com/jonas-schievink/adler,0BSD OR MIT OR Apache-2.0,Jonas Schievink <jonasschievink@gmail.com>
 adler32,https://github.com/remram44/adler32-rs,Zlib,Remi Rampin <remirampin@gmail.com>
+aead,https://github.com/RustCrypto/traits,MIT OR Apache-2.0,RustCrypto Developers
 aes,https://github.com/RustCrypto/block-ciphers,MIT OR Apache-2.0,RustCrypto Developers
 ahash,https://github.com/tkaitchuck/ahash,MIT OR Apache-2.0,Tom Kaitchuck <Tom.Kaitchuck@gmail.com>
 aho-corasick,https://github.com/BurntSushi/aho-corasick,Unlicense OR MIT,Andrew Gallant <jamslam@gmail.com>
@@ -11,6 +12,11 @@ amq-protocol,https://github.com/amqp-rs/amq-protocol,BSD-2-Clause,Marc-Antoine P
 android-tzdata,https://github.com/RumovZ/android-tzdata,MIT OR Apache-2.0,RumovZ
 android_system_properties,https://github.com/nical/android_system_properties,MIT OR Apache-2.0,Nicolas Silva <nical@fastmail.com>
 ansi_term,https://github.com/ogham/rust-ansi-term,MIT,"ogham@bsago.me, Ryan Scheel (Havvy) <ryan.havvy@gmail.com>, Josh Triplett <josh@joshtriplett.org>"
+anstream,https://github.com/rust-cli/anstyle,MIT OR Apache-2.0,The anstream Authors
+anstyle,https://github.com/rust-cli/anstyle,MIT OR Apache-2.0,The anstyle Authors
+anstyle-parse,https://github.com/rust-cli/anstyle,MIT OR Apache-2.0,The anstyle-parse Authors
+anstyle-query,https://github.com/rust-cli/anstyle,MIT OR Apache-2.0,The anstyle-query Authors
+anstyle-wincon,https://github.com/rust-cli/anstyle,MIT OR Apache-2.0,The anstyle-wincon Authors
 anyhow,https://github.com/dtolnay/anyhow,MIT OR Apache-2.0,David Tolnay <dtolnay@gmail.com>
 anymap,https://github.com/chris-morgan/anymap,BlueOak-1.0.0 OR MIT OR Apache-2.0,Chris Morgan <rust@chrismorgan.info>
 apache-avro,https://github.com/apache/avro,Apache-2.0,Apache Avro team <dev@avro.apache.org>
@@ -22,7 +28,6 @@ ascii,https://github.com/tomprogrammer/rust-ascii,Apache-2.0  OR  MIT,"Thomas Ba
 assert-json-diff,https://github.com/davidpdrsn/assert-json-diff,MIT,David Pedersen <david.pdrsn@gmail.com>
 async-channel,https://github.com/smol-rs/async-channel,Apache-2.0 OR MIT,Stjepan Glavina <stjepang@gmail.com>
 async-compat,https://github.com/smol-rs/async-compat,Apache-2.0 OR MIT,Stjepan Glavina <stjepang@gmail.com>
-async-compression,https://github.com/Nemo157/async-compression,MIT OR Apache-2.0,"Wim Looman <wim@nemo157.com>, Allen Bui <fairingrey@gmail.com>"
 async-compression,https://github.com/Nullus157/async-compression,MIT OR Apache-2.0,"Wim Looman <wim@nemo157.com>, Allen Bui <fairingrey@gmail.com>"
 async-executor,https://github.com/smol-rs/async-executor,Apache-2.0 OR MIT,Stjepan Glavina <stjepang@gmail.com>
 async-fs,https://github.com/smol-rs/async-fs,Apache-2.0 OR MIT,Stjepan Glavina <stjepang@gmail.com>
@@ -30,6 +35,7 @@ async-global-executor,https://github.com/Keruspe/async-global-executor,Apache-2.
 async-graphql,https://github.com/async-graphql/async-graphql,MIT OR Apache-2.0,"sunli <scott_s829@163.com>, Koxiaet"
 async-io,https://github.com/smol-rs/async-io,Apache-2.0 OR MIT,Stjepan Glavina <stjepang@gmail.com>
 async-lock,https://github.com/smol-rs/async-lock,Apache-2.0 OR MIT,Stjepan Glavina <stjepang@gmail.com>
+async-nats,https://github.com/nats-io/nats.rs,Apache-2.0,"Tomasz Pietrek <tomasz@nats.io>, Casper Beyer <caspervonb@pm.me>"
 async-net,https://github.com/smol-rs/async-net,Apache-2.0 OR MIT,Stjepan Glavina <stjepang@gmail.com>
 async-process,https://github.com/smol-rs/async-process,Apache-2.0 OR MIT,Stjepan Glavina <stjepang@gmail.com>
 async-reactor-trait,https://github.com/amqp-rs/reactor-trait,Apache-2.0 OR MIT,Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
@@ -77,7 +83,6 @@ backtrace,https://github.com/rust-lang/backtrace-rs,MIT OR Apache-2.0,The Rust P
 base16,https://github.com/thomcc/rust-base16,CC0-1.0,Thom Chiovoloni <tchiovoloni@mozilla.com>
 base64,https://github.com/marshallpierce/rust-base64,MIT OR Apache-2.0,"Alice Maz <alice@alicemaz.com>, Marshall Pierce <marshall@mpierce.org>"
 base64-simd,https://github.com/Nugine/simd,MIT,The base64-simd Authors
-base64-url,https://github.com/magiclen/base64-url,MIT,Magic Len <len@magiclen.org>
 base64ct,https://github.com/RustCrypto/formats/tree/master/base64ct,Apache-2.0 OR MIT,RustCrypto Developers
 bit-set,https://github.com/contain-rs/bit-set,MIT OR Apache-2.0,Alexis Beingessner <a.beingessner@gmail.com>
 bit-vec,https://github.com/contain-rs/bit-vec,MIT OR Apache-2.0,Alexis Beingessner <a.beingessner@gmail.com>
@@ -87,7 +92,7 @@ bitvec,https://github.com/bitvecto-rs/bitvec,MIT,The bitvec Authors
 block-buffer,https://github.com/RustCrypto/utils,MIT OR Apache-2.0,RustCrypto Developers
 block-padding,https://github.com/RustCrypto/utils,MIT OR Apache-2.0,RustCrypto Developers
 blocking,https://github.com/smol-rs/blocking,Apache-2.0 OR MIT,Stjepan Glavina <stjepang@gmail.com>
-bloom,https://github.com/nicklan/bloom-rs,GPL-2.0,Nick Lanham <nick@afternight.org>
+bloomy,https://docs.rs/bloomy/,MIT,"Aleksandr Bezobchuk <aleks.bezobchuk@gmail.com>, Alexis Sellier <self@cloudhead.io>"
 bollard,https://github.com/fussybeaver/bollard,Apache-2.0,Bollard contributors
 borsh,https://github.com/near/borsh-rs,MIT OR Apache-2.0,Near Inc <hello@near.org>
 borsh-derive,https://github.com/nearprotocol/borsh,Apache-2.0,Near Inc <hello@nearprotocol.com>
@@ -109,6 +114,8 @@ cbc,https://github.com/RustCrypto/block-modes,MIT OR Apache-2.0,RustCrypto Devel
 cesu8,https://github.com/emk/cesu8-rs,Apache-2.0 OR MIT,Eric Kidd <git@randomhacks.net>
 cfb-mode,https://github.com/RustCrypto/block-modes,MIT OR Apache-2.0,RustCrypto Developers
 cfg-if,https://github.com/alexcrichton/cfg-if,MIT OR Apache-2.0,Alex Crichton <alex@alexcrichton.com>
+chacha20,https://github.com/RustCrypto/stream-ciphers,Apache-2.0 OR MIT,RustCrypto Developers
+chacha20poly1305,https://github.com/RustCrypto/AEADs/tree/master/chacha20poly1305,Apache-2.0 OR MIT,RustCrypto Developers
 charset,https://github.com/hsivonen/charset,MIT OR Apache-2.0,Henri Sivonen <hsivonen@hsivonen.fi>
 chrono,https://github.com/chronotope/chrono,MIT OR Apache-2.0,The chrono Authors
 chrono-tz,https://github.com/chronotope/chrono-tz,MIT OR Apache-2.0,The chrono-tz Authors
@@ -121,6 +128,7 @@ clap_derive,https://github.com/clap-rs/clap/tree/master/clap_derive,MIT OR Apach
 clap_lex,https://github.com/clap-rs/clap/tree/master/clap_lex,MIT OR Apache-2.0,The clap_lex Authors
 clipboard-win,https://github.com/DoumanAsh/clipboard-win,BSL-1.0,Douman <douman@gmx.se>
 codespan-reporting,https://github.com/brendanzab/codespan,Apache-2.0,Brendan Zabarauskas <bjzaba@yahoo.com.au>
+colorchoice,https://github.com/rust-cli/anstyle,MIT OR Apache-2.0,The colorchoice Authors
 colored,https://github.com/mackwic/colored,MPL-2.0,Thomas Wickham <mackwic@gmail.com>
 combine,https://github.com/Marwes/combine,MIT,Markus Westerlind <marwes91@gmail.com>
 concurrent-queue,https://github.com/smol-rs/concurrent-queue,Apache-2.0 OR MIT,Stjepan Glavina <stjepang@gmail.com>
@@ -135,18 +143,19 @@ crc,https://github.com/mrhooray/crc-rs,MIT OR Apache-2.0,"Rui Hu <code@mrhooray.
 crc-catalog,https://github.com/akhilles/crc-catalog,MIT OR Apache-2.0,Akhil Velagapudi <akhilvelagapudi@gmail.com>
 crc32c,https://github.com/zowens/crc32c,Apache-2.0 OR MIT,Zack Owens
 crc32fast,https://github.com/srijs/rust-crc32fast,MIT OR Apache-2.0,"Sam Rijs <srijs@airpost.net>, Alex Crichton <alex@alexcrichton.com>"
-crossbeam-channel,https://github.com/crossbeam-rs/crossbeam,MIT OR Apache-2.0,The crossbeam-channel Authors
 crossbeam-epoch,https://github.com/crossbeam-rs/crossbeam,MIT OR Apache-2.0,The crossbeam-epoch Authors
 crossbeam-queue,https://github.com/crossbeam-rs/crossbeam,MIT OR Apache-2.0,The crossbeam-queue Authors
 crossbeam-utils,https://github.com/crossbeam-rs/crossbeam,MIT OR Apache-2.0,The crossbeam-utils Authors
 crossterm,https://github.com/crossterm-rs/crossterm,MIT,T. Post
 crossterm_winapi,https://github.com/crossterm-rs/crossterm-winapi,MIT,T. Post
 crypto-common,https://github.com/RustCrypto/traits,MIT OR Apache-2.0,RustCrypto Developers
+crypto_secretbox,https://github.com/RustCrypto/nacl-compat/tree/master/crypto_secretbox,Apache-2.0 OR MIT,RustCrypto Developers
 csv,https://github.com/BurntSushi/rust-csv,Unlicense OR MIT,Andrew Gallant <jamslam@gmail.com>
 ctor,https://github.com/mmastrac/rust-ctor,Apache-2.0 OR MIT,Matt Mastracci <matthew@mastracci.com>
 ctr,https://github.com/RustCrypto/block-modes,MIT OR Apache-2.0,RustCrypto Developers
 cty,https://github.com/japaric/cty,MIT OR Apache-2.0,Jorge Aparicio <jorge@japaric.io>
 curve25519-dalek,https://github.com/dalek-cryptography/curve25519-dalek,BSD-3-Clause,"Isis Lovecruft <isis@patternsinthevoid.net>, Henry de Valence <hdevalence@hdevalence.ca>"
+curve25519-dalek-derive,https://github.com/dalek-cryptography/curve25519-dalek,MIT OR Apache-2.0,The curve25519-dalek-derive Authors
 cxx,https://github.com/dtolnay/cxx,MIT OR Apache-2.0,David Tolnay <dtolnay@gmail.com>
 darling,https://github.com/TedDriggs/darling,MIT,Ted Driggs <ted.driggs@outlook.com>
 dashmap,https://github.com/xacrimon/dashmap,MIT,Acrimon <joel.wejdenstal@gmail.com>
@@ -167,7 +176,7 @@ dns-lookup,https://github.com/keeperofdakeys/dns-lookup,MIT OR Apache-2.0,Josh D
 doc-comment,https://github.com/GuillaumeGomez/doc-comment,MIT,Guillaume Gomez <guillaume1.gomez@gmail.com>
 dyn-clone,https://github.com/dtolnay/dyn-clone,MIT OR Apache-2.0,David Tolnay <dtolnay@gmail.com>
 ed25519,https://github.com/RustCrypto/signatures/tree/master/ed25519,Apache-2.0 OR MIT,RustCrypto Developers
-ed25519-dalek,https://github.com/dalek-cryptography/ed25519-dalek,BSD-3-Clause,isis lovecruft <isis@patternsinthevoid.net>
+ed25519-dalek,https://github.com/dalek-cryptography/ed25519-dalek,BSD-3-Clause,"isis lovecruft <isis@patternsinthevoid.net>, Tony Arcieri <bascule@gmail.com>, Michael Rosenberg <michael@mrosenberg.pub>"
 either,https://github.com/bluss/either,MIT OR Apache-2.0,bluss
 encode_unicode,https://github.com/tormol/encode_unicode,Apache-2.0 OR MIT,Torbjørn Birch Moltu <t.b.moltu@lyse.net>
 encoding_rs,https://github.com/hsivonen/encoding_rs,(Apache-2.0 OR MIT) AND BSD-3-Clause,Henri Sivonen <hsivonen@hsivonen.fi>
@@ -189,6 +198,7 @@ extend,https://github.com/davidpdrsn/ext,MIT,David Pedersen <david.pdrsn@gmail.c
 fakedata_generator,https://github.com/kevingimbel/fakedata_generator,MIT,Kevin Gimbel <hallo@kevingimbel.com>
 fallible-iterator,https://github.com/sfackler/rust-fallible-iterator,MIT OR Apache-2.0,Steven Fackler <sfackler@gmail.com>
 fastrand,https://github.com/smol-rs/fastrand,Apache-2.0 OR MIT,Stjepan Glavina <stjepang@gmail.com>
+fiat-crypto,https://github.com/mit-plv/fiat-crypto,MIT OR Apache-2.0 OR BSD-1-Clause,Fiat Crypto library authors <jgross@mit.edu>
 filetime,https://github.com/alexcrichton/filetime,MIT OR Apache-2.0,Alex Crichton <alex@alexcrichton.com>
 fix-hidden-lifetime-bug,https://github.com/danielhenrymantilla/fix-hidden-lifetime-bug.rs,Zlib OR MIT OR Apache-2.0,Daniel Henry-Mantilla <daniel.henry.mantilla@gmail.com>
 fix-hidden-lifetime-bug-proc_macros,https://github.com/danielhenrymantilla/fix-hidden-lifetime-bug.rs,Zlib OR MIT OR Apache-2.0,Daniel Henry-Mantilla <daniel.henry.mantilla@gmail.com>
@@ -215,7 +225,6 @@ futures-timer,https://github.com/async-rs/futures-timer,MIT OR Apache-2.0,Alex C
 futures-util,https://github.com/rust-lang/futures-rs,MIT OR Apache-2.0,The futures-util Authors
 generic-array,https://github.com/fizyk20/generic-array,MIT,"Bartłomiej Kamiński <fizyk20@gmail.com>, Aaron Trent <novacrazy@gmail.com>"
 getrandom,https://github.com/rust-random/getrandom,MIT OR Apache-2.0,The Rand Project Developers
-ghost,https://github.com/dtolnay/ghost,MIT OR Apache-2.0,David Tolnay <dtolnay@gmail.com>
 gimli,https://github.com/gimli-rs/gimli,MIT OR Apache-2.0,The gimli Authors
 glob,https://github.com/rust-lang/glob,MIT OR Apache-2.0,The Rust Project Developers
 goauth,https://github.com/durch/rust-goauth,MIT,Drazen Urch <github@drazenur.ch>
@@ -225,6 +234,8 @@ graphql-parser,https://github.com/graphql-rust/graphql-parser,MIT OR Apache-2.0,
 graphql_client,https://github.com/graphql-rust/graphql-client,Apache-2.0 OR MIT,Tom Houlé <tom@tomhoule.com>
 graphql_client_codegen,https://github.com/graphql-rust/graphql-client,Apache-2.0 OR MIT,Tom Houlé <tom@tomhoule.com>
 graphql_query_derive,https://github.com/graphql-rust/graphql-client,Apache-2.0 OR MIT,Tom Houlé <tom@tomhoule.com>
+greptime-proto,https://github.com/GreptimeTeam/greptime-proto,Apache-2.0,The greptime-proto Authors
+greptimedb-client,https://github.com/GreptimeTeam/greptimedb-client-rust,Apache-2.0,The greptimedb-client Authors
 grok,https://github.com/daschl/grok,Apache-2.0,Michael Nitschinger <michael@nitschinger.at>
 h2,https://github.com/hyperium/h2,MIT,"Carl Lerche <me@carllerche.com>, Sean McArthur <sean@seanmonstar.com>"
 hash_hasher,https://github.com/Fraser999/Hash-Hasher,Apache-2.0 OR MIT,Fraser Hutchison <fraser.hutchison@maidsafe.net>
@@ -273,7 +284,6 @@ itoa,https://github.com/dtolnay/itoa,MIT OR Apache-2.0,David Tolnay <dtolnay@gma
 jni,https://github.com/jni-rs/jni-rs,MIT OR Apache-2.0,Josh Chase <josh@prevoty.com>
 jni-sys,https://github.com/sfackler/rust-jni-sys,MIT OR Apache-2.0,Steven Fackler <sfackler@gmail.com>
 js-sys,https://github.com/rustwasm/wasm-bindgen/tree/master/crates/js-sys,MIT OR Apache-2.0,The wasm-bindgen Developers
-json,https://github.com/maciejhirsz/json-rust,MIT OR Apache-2.0,Maciej Hirsz <hello@maciej.codes>
 json-patch,https://github.com/idubrov/json-patch,MIT OR Apache-2.0,Ivan Dubrov <dubrov.ivan@gmail.com>
 jsonpath_lib,https://github.com/freestrings/jsonpath,MIT,Changseok Han <freestrings@gmail.com>
 k8s-openapi,https://github.com/Arnavion/k8s-openapi,Apache-2.0,Arnavion <me@arnavion.dev>
@@ -311,7 +321,6 @@ matches,https://github.com/SimonSapin/rust-std-candidates,MIT,Simon Sapin <simon
 matchit,https://github.com/ibraheemdev/matchit,MIT,Ibraheem Ahmed <ibraheem@ibraheem.ca>
 maxminddb,https://github.com/oschwald/maxminddb-rust,ISC,Gregory J. Oschwald <oschwald@gmail.com>
 md-5,https://github.com/RustCrypto/hashes,MIT OR Apache-2.0,RustCrypto Developers
-md5,https://github.com/stainless-steel/md5,Apache-2.0 OR MIT,"Ivan Ukhov <ivan.ukhov@gmail.com>, Kamal Ahmad <shibe@openmailbox.org>, Konstantin Stepanov <milezv@gmail.com>, Lukas Kalbertodt <lukas.kalbertodt@gmail.com>, Nathan Musoke <nathan.musoke@gmail.com>, Scott Mabin <scott@mabez.dev>, Tony Arcieri <bascule@gmail.com>, Wim de With <register@dewith.io>, Yosef Dinerstein <yosefdi@gmail.com>"
 memchr,https://github.com/BurntSushi/memchr,Unlicense OR MIT,"Andrew Gallant <jamslam@gmail.com>, bluss"
 memmap2,https://github.com/RazrFalcon/memmap2-rs,MIT OR Apache-2.0,"Dan Burkert <dan@danburkert.com>, Yevhenii Reizner <razrfalcon@gmail.com>"
 memoffset,https://github.com/Gilnaa/memoffset,MIT,Gilad Naaman <gilad.naaman@gmail.com>
@@ -326,7 +335,6 @@ mlua,https://github.com/khvzak/mlua,MIT,"Aleksandr Orlenko <zxteam@pm.me>, kyren
 mongodb,https://github.com/mongodb/mongo-rust-driver,Apache-2.0,"Saghm Rossi <saghmrossi@gmail.com>, Patrick Freed <patrick.freed@mongodb.com>, Isabel Atkinson <isabel.atkinson@mongodb.com>, Abraham Egnor <abraham.egnor@mongodb.com>, Kaitlin Mahar <kaitlin.mahar@mongodb.com>"
 multer,https://github.com/rousan/multer-rs,MIT,Rousan Ali <hello@rousan.io>
 native-tls,https://github.com/sfackler/rust-native-tls,MIT OR Apache-2.0,Steven Fackler <sfackler@gmail.com>
-nats,https://github.com/nats-io/nats.rs,Apache-2.0,"Derek Collison <derek@nats.io>, Tyler Neely <tyler@nats.io>, Stjepan Glavina <stjepan@nats.io>"
 ndk-context,https://github.com/rust-windowing/android-ndk-rs,MIT OR Apache-2.0,The Rust Windowing contributors
 nibble_vec,https://github.com/michaelsproul/rust_nibble_vec,MIT,Michael Sproul <micsproul@gmail.com>
 nix,https://github.com/nix-rust/nix,MIT,The nix-rust Project Developers
@@ -383,6 +391,7 @@ pinky-swear,https://github.com/amqp-rs/pinky-swear,BSD-2-Clause,Marc-Antoine Per
 pkcs8,https://github.com/RustCrypto/formats/tree/master/pkcs8,Apache-2.0 OR MIT,RustCrypto Developers
 platforms,https://github.com/RustSec/platforms-crate,Apache-2.0 OR MIT,Tony Arcieri <bascule@gmail.com>
 polling,https://github.com/smol-rs/polling,Apache-2.0 OR MIT,Stjepan Glavina <stjepang@gmail.com>
+poly1305,https://github.com/RustCrypto/universal-hashes,Apache-2.0 OR MIT,RustCrypto Developers
 portable-atomic,https://github.com/taiki-e/portable-atomic,Apache-2.0 OR MIT,The portable-atomic Authors
 postgres-openssl,https://github.com/sfackler/rust-postgres,MIT OR Apache-2.0,Steven Fackler <sfackler@gmail.com>
 postgres-protocol,https://github.com/sfackler/rust-postgres,MIT OR Apache-2.0,Steven Fackler <sfackler@gmail.com>
@@ -415,14 +424,18 @@ rand_chacha,https://github.com/rust-random/rand,MIT OR Apache-2.0,"The Rand Proj
 rand_distr,https://github.com/rust-random/rand,MIT OR Apache-2.0,The Rand Project Developers
 rand_hc,https://github.com/rust-random/rand,MIT OR Apache-2.0,The Rand Project Developers
 rand_xorshift,https://github.com/rust-random/rngs,MIT OR Apache-2.0,"The Rand Project Developers, The Rust Project Developers"
+ratatui,https://github.com/tui-rs-revival/ratatui,MIT,"Florian Dehau <work@fdehau.com>, The Ratatui Developers"
 raw-cpuid,https://github.com/gz/rust-cpuid,MIT,Gerd Zellweger <mail@gerdzellweger.com>
 raw-window-handle,https://github.com/rust-windowing/raw-window-handle,MIT OR Apache-2.0 OR Zlib,Osspial <osspial@gmail.com>
 rdkafka,https://github.com/fede1024/rust-rdkafka,MIT,Federico Giraud <giraud.federico@gmail.com>
 redis,https://github.com/redis-rs/redis-rs,BSD-3-Clause,The redis Authors
 redox_syscall,https://gitlab.redox-os.org/redox-os/syscall,MIT,Jeremy Soller <jackpot51@gmail.com>
 redox_users,https://gitlab.redox-os.org/redox-os/users,MIT,"Jose Narvaez <goyox86@gmail.com>, Wesley Hershberger <mggmugginsmc@gmail.com>"
-regex,https://github.com/rust-lang/regex,MIT OR Apache-2.0,The Rust Project Developers
+regex,https://github.com/rust-lang/regex,MIT OR Apache-2.0,"The Rust Project Developers, Andrew Gallant <jamslam@gmail.com>"
 regex-automata,https://github.com/BurntSushi/regex-automata,Unlicense OR MIT,Andrew Gallant <jamslam@gmail.com>
+regex-automata,https://github.com/rust-lang/regex/tree/master/regex-automata,MIT OR Apache-2.0,"The Rust Project Developers, Andrew Gallant <jamslam@gmail.com>"
+regex-syntax,https://github.com/rust-lang/regex,MIT OR Apache-2.0,The Rust Project Developers
+regex-syntax,https://github.com/rust-lang/regex/tree/master/regex-syntax,MIT OR Apache-2.0,"The Rust Project Developers, Andrew Gallant <jamslam@gmail.com>"
 rend,https://github.com/djkoloski/rend,MIT,David Koloski <djkoloski@gmail.com>
 reqwest,https://github.com/seanmonstar/reqwest,MIT OR Apache-2.0,Sean McArthur <sean@seanmonstar.com>
 resolv-conf,http://github.com/tailhook/resolv-conf,MIT OR Apache-2.0,paul@colomiets.name
@@ -442,16 +455,15 @@ rustc-hash,https://github.com/rust-lang-nursery/rustc-hash,Apache-2.0 OR MIT,The
 rustc_version,https://github.com/Kimundi/rustc-version-rs,MIT OR Apache-2.0,Marvin Löbel <loebel.marvin@gmail.com>
 rustc_version_runtime,https://github.com/seppo0010/rustc-version-runtime-rs,MIT,Sebastian Waisbrot <seppo0010@gmail.com>
 rustix,https://github.com/bytecodealliance/rustix,Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT,"Dan Gohman <dev@sunfishcode.online>, Jakub Konka <kubkon@jakubkonka.com>"
-rustls,https://github.com/ctz/rustls,Apache-2.0 OR ISC OR MIT,Joseph Birr-Pixton <jpixton@gmail.com>
 rustls,https://github.com/rustls/rustls,Apache-2.0 OR ISC OR MIT,The rustls Authors
 rustls-native-certs,https://github.com/ctz/rustls-native-certs,Apache-2.0 OR ISC OR MIT,Joseph Birr-Pixton <jpixton@gmail.com>
-rustls-pemfile,https://github.com/rustls/pemfile,Apache-2.0 OR ISC OR MIT,Joseph Birr-Pixton <jpixton@gmail.com>
 rustls-pemfile,https://github.com/rustls/pemfile,Apache-2.0 OR ISC OR MIT,The rustls-pemfile Authors
 rustls-webpki,https://github.com/rustls/webpki,ISC,The rustls-webpki Authors
 rustversion,https://github.com/dtolnay/rustversion,MIT OR Apache-2.0,David Tolnay <dtolnay@gmail.com>
 rusty-fork,https://github.com/altsysrq/rusty-fork,MIT OR Apache-2.0,Jason Lingle
 rustyline,https://github.com/kkawakam/rustyline,MIT,Katsu Kawakami <kkawa1570@gmail.com>
 ryu,https://github.com/dtolnay/ryu,Apache-2.0 OR BSL-1.0,David Tolnay <dtolnay@gmail.com>
+salsa20,https://github.com/RustCrypto/stream-ciphers,MIT OR Apache-2.0,RustCrypto Developers
 same-file,https://github.com/BurntSushi/same-file,Unlicense OR MIT,Andrew Gallant <jamslam@gmail.com>
 sasl2-sys,https://github.com/MaterializeInc/rust-sasl,Apache-2.0,"Materialize, Inc."
 scan_fmt,https://github.com/wlentz/scan_fmt,MIT,wlentz
@@ -468,8 +480,8 @@ semver-parser,https://github.com/steveklabnik/semver-parser,MIT OR Apache-2.0,St
 serde,https://github.com/serde-rs/serde,MIT OR Apache-2.0,"Erick Tryzelaar <erick.tryzelaar@gmail.com>, David Tolnay <dtolnay@gmail.com>"
 serde-toml-merge,https://github.com/jdrouet/serde-toml-merge,MIT,Jeremie Drouet <jeremie.drouet@gmail.com>
 serde-value,https://github.com/arcnmx/serde-value,MIT,arcnmx
-serde-xml-rs,https://github.com/RReverser/serde-xml-rs,MIT,Ingvar Stepanyan <me@rreverser.com>
 serde_bytes,https://github.com/serde-rs/bytes,MIT OR Apache-2.0,David Tolnay <dtolnay@gmail.com>
+serde_derive,https://github.com/serde-rs/serde,MIT OR Apache-2.0,David Tolnay <dtolnay@gmail.com>
 serde_json,https://github.com/serde-rs/json,MIT OR Apache-2.0,"Erick Tryzelaar <erick.tryzelaar@gmail.com>, David Tolnay <dtolnay@gmail.com>"
 serde_nanos,https://github.com/caspervonb/serde_nanos,MIT OR Apache-2.0,Casper Beyer <caspervonb@pm.me>
 serde_path_to_error,https://github.com/dtolnay/path-to-error,MIT OR Apache-2.0,David Tolnay <dtolnay@gmail.com>
@@ -516,7 +528,6 @@ strum,https://github.com/Peternator7/strum,MIT,Peter Glotfelty <peter.glotfelty@
 subtle,https://github.com/dalek-cryptography/subtle,BSD-3-Clause,"Isis Lovecruft <isis@patternsinthevoid.net>, Henry de Valence <hdevalence@hdevalence.ca>"
 syn,https://github.com/dtolnay/syn,MIT OR Apache-2.0,David Tolnay <dtolnay@gmail.com>
 sync_wrapper,https://github.com/Actyx/sync_wrapper,Apache-2.0,Actyx AG <developer@actyx.io>
-synstructure,https://github.com/mystor/synstructure,MIT,Nika Layzell <nika@thelayzells.com>
 syslog,https://github.com/Geal/rust-syslog,MIT,contact@geoffroycouprie.com
 syslog_loose,https://github.com/FungusHumungus/syslog-loose,MIT,Stephen Wakely <fungus.humungus@gmail.com>
 take_mut,https://github.com/Sgeo/take_mut,MIT,Sgeo <sgeoster@gmail.com>
@@ -540,6 +551,7 @@ tokio-io-timeout,https://github.com/sfackler/tokio-io-timeout,MIT OR Apache-2.0,
 tokio-native-tls,https://github.com/tokio-rs/tls,MIT,Tokio Contributors <team@tokio.rs>
 tokio-openssl,https://github.com/sfackler/tokio-openssl,MIT OR Apache-2.0,Alex Crichton <alex@alexcrichton.com>
 tokio-postgres,https://github.com/sfackler/rust-postgres,MIT OR Apache-2.0,Steven Fackler <sfackler@gmail.com>
+tokio-retry,https://github.com/srijs/rust-tokio-retry,MIT,Sam Rijs <srijs@airpost.net>
 tokio-rustls,https://github.com/tokio-rs/tls,MIT OR Apache-2.0,quininer kel <quininer@live.com>
 tokio-tungstenite,https://github.com/snapview/tokio-tungstenite,MIT,"Daniel Abramov <dabramov@snapview.de>, Alexey Galakhov <agalakhov@snapview.de>"
 toml,https://github.com/toml-rs/toml,MIT OR Apache-2.0,Alex Crichton <alex@alexcrichton.com>
@@ -558,7 +570,6 @@ treediff,https://github.com/Byron/treediff-rs,MIT OR Apache-2.0,Sebastian Thiel
 trust-dns-proto,https://github.com/bluejekyll/trust-dns,MIT OR Apache-2.0,Benjamin Fry <benjaminfry@me.com>
 trust-dns-resolver,https://github.com/bluejekyll/trust-dns,MIT OR Apache-2.0,Benjamin Fry <benjaminfry@me.com>
 try-lock,https://github.com/seanmonstar/try-lock,MIT,Sean McArthur <sean@seanmonstar.com>
-tui,https://github.com/fdehau/tui-rs,MIT,Florian Dehau <work@fdehau.com>
 tungstenite,https://github.com/snapview/tungstenite-rs,MIT OR Apache-2.0,"Alexey Galakhov, Daniel Abramov"
 twox-hash,https://github.com/shepmaster/twox-hash,MIT,Jake Goulding <jake.goulding@gmail.com>
 typed-builder,https://github.com/idanarye/rust-typed-builder,MIT OR Apache-2.0,"IdanArye <idanarye@gmail.com>, Chris Morgan <me@chrismorgan.info>"
@@ -573,7 +584,7 @@ unicode-ident,https://github.com/dtolnay/unicode-ident,(MIT OR Apache-2.0) AND U
 unicode-normalization,https://github.com/unicode-rs/unicode-normalization,MIT OR Apache-2.0,"kwantam <kwantam@gmail.com>, Manish Goregaokar <manishsmail@gmail.com>"
 unicode-segmentation,https://github.com/unicode-rs/unicode-segmentation,MIT OR Apache-2.0,"kwantam <kwantam@gmail.com>, Manish Goregaokar <manishsmail@gmail.com>"
 unicode-width,https://github.com/unicode-rs/unicode-width,MIT OR Apache-2.0,"kwantam <kwantam@gmail.com>, Manish Goregaokar <manishsmail@gmail.com>"
-unicode-xid,https://github.com/unicode-rs/unicode-xid,MIT OR Apache-2.0,"erick.tryzelaar <erick.tryzelaar@gmail.com>, kwantam <kwantam@gmail.com>, Manish Goregaokar <manishsmail@gmail.com>"
+universal-hash,https://github.com/RustCrypto/traits,MIT OR Apache-2.0,RustCrypto Developers
 unreachable,https://github.com/reem/rust-unreachable,MIT  OR  Apache-2.0,Jonathan Reem <jonathan.reem@gmail.com>
 unsafe-libyaml,https://github.com/dtolnay/unsafe-libyaml,MIT,David Tolnay <dtolnay@gmail.com>
 untrusted,https://github.com/briansmith/untrusted,ISC,Brian Smith <brian@briansmith.org>
@@ -582,7 +593,6 @@ url,https://github.com/servo/rust-url,MIT OR Apache-2.0,The rust-url developers
 urlencoding,https://github.com/kornelski/rust_urlencoding,MIT,"Kornel <kornel@geekhood.net>, Bertram Truong <b@bertramtruong.com>"
 utf-8,https://github.com/SimonSapin/rust-utf8,MIT OR Apache-2.0,Simon Sapin <simon.sapin@exyr.org>
 utf8-width,https://github.com/magiclen/utf8-width,MIT,Magic Len <len@magiclen.org>
-utf8parse,https://github.com/jwilm/vte,Apache-2.0 OR MIT,"Joe Wilm <joe@jwilm.com>, Christian Duerr <contact@christianduerr.com>"
 uuid,https://github.com/uuid-rs/uuid,Apache-2.0 OR MIT,"Ashley Mannix<ashleymannix@live.com.au>, Christopher Armstrong, Dylan DPC<dylan.dpc@gmail.com>, Hunar Roop Kahlon<hunar.roop@gmail.com>"
 valuable,https://github.com/tokio-rs/valuable,MIT,The valuable Authors
 vec_map,https://github.com/contain-rs/vec-map,MIT OR Apache-2.0,"Alex Crichton <alex@alexcrichton.com>, Jorge Aparicio <japaricious@gmail.com>, Alexis Beingessner <a.beingessner@gmail.com>, Brian Anderson <>, tbu- <>, Manish Goregaokar <>, Aaron Turon <aturon@mozilla.com>, Adolfo Ochagavía <>, Niko Matsakis <>, Steven Fackler <>, Chase Southwood <csouth3@illinois.edu>, Eduard Burtescu <>, Florian Wilkens <>, Félix Raimundo <>, Tibor Benke <>, Markus Siemens <markus@m-siemens.de>, Josh Branchaud <jbranchaud@gmail.com>, Huon Wilson <dbau.pp@gmail.com>, Corey Farwell <coref@rwell.org>, Aaron Liblong <>, Nick Cameron <nrc@ncameron.org>, Patrick Walton <pcwalton@mimiga.net>, Felix S Klock II <>, Andrew Paseltiner <apaseltiner@gmail.com>, Sean McArthur <sean.monstar@gmail.com>, Vadim Petrochenkov <>"
@@ -626,14 +636,12 @@ winnow,https://github.com/winnow-rs/winnow,MIT,The winnow Authors
 winreg,https://github.com/gentoo90/winreg-rs,MIT,Igor Shaula <gentoo90@gmail.com>
 woothee,https://github.com/woothee/woothee-rust,Apache-2.0,hhatto <hhatto.jp@gmail.com>
 wyz,https://github.com/myrrlyn/wyz,MIT,myrrlyn <self@myrrlyn.dev>
-xml-rs,https://github.com/kornelski/xml-rs,MIT,Vladimir Matveev <vmatveev@citrine.cc>
 xmlparser,https://github.com/RazrFalcon/xmlparser,MIT OR Apache-2.0,Evgeniy Reizner <razrfalcon@gmail.com>
 yaml-rust,https://github.com/chyh1990/yaml-rust,MIT OR Apache-2.0,Yuheng Chen <yuhengchen@sensetime.com>
 yansi,https://github.com/SergioBenitez/yansi,MIT OR Apache-2.0,Sergio Benitez <sb@sergio.bz>
 zerocopy,https://fuchsia.googlesource.com/fuchsia/+/HEAD/src/lib/zerocopy,BSD-2-Clause,Joshua Liebow-Feeser <joshlf@google.com>
 zerocopy-derive,https://github.com/google/zerocopy,BSD-2-Clause,Joshua Liebow-Feeser <joshlf@google.com>
 zeroize,https://github.com/RustCrypto/utils/tree/master/zeroize,Apache-2.0 OR MIT,The RustCrypto Project Developers
-zeroize_derive,https://github.com/RustCrypto/utils/tree/master/zeroize/derive,Apache-2.0 OR MIT,The RustCrypto Project Developers
 zstd,https://github.com/gyscos/zstd-rs,MIT,Alexandre Bury <alexandre.bury@gmail.com>
 zstd-safe,https://github.com/gyscos/zstd-rs,MIT OR Apache-2.0,Alexandre Bury <alexandre.bury@gmail.com>
 zstd-sys,https://github.com/gyscos/zstd-rs,MIT OR Apache-2.0,Alexandre Bury <alexandre.bury@gmail.com>
diff --git a/Makefile b/Makefile
index 5ababc8144521..a6d4b3c580977 100644
--- a/Makefile
+++ b/Makefile
@@ -56,7 +56,13 @@ export VERBOSE ?= false
 # Override the container tool. Tries docker first and then tries podman.
 export CONTAINER_TOOL ?= auto
 ifeq ($(CONTAINER_TOOL),auto)
-	override CONTAINER_TOOL = $(shell docker version >/dev/null 2>&1 && echo docker || echo podman)
+	ifeq ($(shell docker version >/dev/null 2>&1 && echo docker), docker)
+		override CONTAINER_TOOL = docker
+	else ifeq ($(shell podman version >/dev/null 2>&1 && echo podman), podman)
+		override CONTAINER_TOOL = podman
+	else
+		override CONTAINER_TOOL = unknown
+	endif
 endif
 # If we're using podman create pods else if we're using docker create networks.
 export CURRENT_DIR = $(shell pwd)
@@ -76,7 +82,7 @@ export AWS_ACCESS_KEY_ID ?= "dummy"
 export AWS_SECRET_ACCESS_KEY ?= "dummy"
 
 # Set version
-export VERSION ?= $(shell cargo vdev version)
+export VERSION ?= $(shell command -v cargo >/dev/null && cargo vdev version || echo unknown)
 
 # Set if you are on the CI and actually want the things to happen. (Non-CI users should never set this.)
 export CI ?= false
@@ -157,6 +163,7 @@ define ENVIRONMENT_EXEC
 endef
 
 
+ifneq ($(CONTAINER_TOOL), unknown)
 ifeq ($(ENVIRONMENT_AUTOBUILD), true)
 define ENVIRONMENT_PREPARE
 	@echo "Building the environment. (ENVIRONMENT_AUTOBUILD=true) This may take a few minutes..."
@@ -171,6 +178,11 @@ define ENVIRONMENT_PREPARE
 	$(CONTAINER_TOOL) pull $(ENVIRONMENT_UPSTREAM)
 endef
 endif
+else
+define ENVIRONMENT_PREPARE
+$(error "Please install a container tool such as Docker or Podman")
+endef
+endif
 
 .PHONY: check-container-tool
 check-container-tool: ## Checks what container tool is installed
@@ -237,9 +249,11 @@ build-graphql-schema: ## Generate the `schema.json` for Vector's GraphQL API
 
 .PHONY: check-build-tools
 check-build-tools:
-ifeq (, $(shell which cargo))
+ifneq ($(ENVIRONMENT), true)
+ifeq ($(shell command -v cargo >/dev/null || echo not-found), not-found)
 	$(error "Please install Rust: https://www.rust-lang.org/tools/install")
 endif
+endif
 
 ##@ Cross Compiling
 .PHONY: cross-enable
@@ -299,6 +313,9 @@ target/%/vector.tar.gz: target/%/vector CARGO_HANDLES_FRESHNESS
 	cp -R -f -v \
 		README.md \
 		LICENSE \
+		licenses \
+		NOTICE \
+		LICENSE-3rdparty.csv \
 		config \
 		target/scratch/vector-${TRIPLE}/
 	cp -R -f -v \
@@ -361,7 +378,7 @@ test-behavior: test-behavior-transforms test-behavior-formats test-behavior-conf
 test-integration: ## Runs all integration tests
 test-integration: test-integration-amqp test-integration-appsignal test-integration-aws test-integration-axiom test-integration-azure test-integration-chronicle test-integration-clickhouse
 test-integration: test-integration-databend test-integration-docker-logs test-integration-elasticsearch
-test-integration: test-integration-eventstoredb test-integration-fluent test-integration-gcp test-integration-humio test-integration-http-client test-integration-influxdb
+test-integration: test-integration-eventstoredb test-integration-fluent test-integration-gcp test-integration-greptimedb test-integration-humio test-integration-http-client test-integration-influxdb
 test-integration: test-integration-kafka test-integration-logstash test-integration-loki test-integration-mongodb test-integration-nats
 test-integration: test-integration-nginx test-integration-opentelemetry test-integration-postgres test-integration-prometheus test-integration-pulsar
 test-integration: test-integration-redis test-integration-splunk test-integration-dnstap test-integration-datadog-agent test-integration-datadog-logs
diff --git a/STYLE.md b/STYLE.md
index 4e3e70818f708..b817dbac18793 100644
--- a/STYLE.md
+++ b/STYLE.md
@@ -229,7 +229,7 @@ would know that the queue size was _currently_ zero but we'd also know that we j
   [Component
   Specification](https://github.com/vectordotdev/vector/blob/master/docs/specs/component.md).
 - **Don't** emit metrics in tight loops. Each metric emission carries an overhead, and emitting them
-  in tight loops can cause that overhead to become noticable in terms of CPU usage and throughput
+  in tight loops can cause that overhead to become noticeable in terms of CPU usage and throughput
   reduction. Instead of incrementing a counter every time a loop iteration occurs, you might
   consider incrementing a local variable instead, and then emitting that sum after the loop is over.
 - **Don't** update a counter to measure the total number of operations/events/etc if you're already
@@ -327,3 +327,22 @@ you'll need to use an asynchronous-specific synchronization primitives, namely t
 itself. The documentation on `tokio`'s own
 [`Mutex`](https://docs.rs/tokio/latest/tokio/sync/struct.Mutex.html), for example, calls out the
 specifics of when and where you might need to use it vs the one from `std::sync`.
+
+
+## New Configuration Fields vs CLI flags
+
+Vector makes the distinction between configuration items that are essential to understand data
+pipelines and runtime flags that determine the details of the runtime behavior. The main configuration
+generally lives in a file in the current directory or in `/etc/vector`.
+
+Examples of main configuration fields are source, transformation, and sink declaration, as well as
+information about where any disk buffers should be persisted.
+
+For configuration items that purely inform details of Vector's runtime behavior, CLI flags without
+corresponding configuration fields should be used.
+
+An example of a runtime flag is
+`vector run --no-graceful-shutdown-limit`, which tells Vector to ignore SIGINTs and to continue running
+as normal until a SIGKILL is received. In this case, as the configuration describes the desired runtime
+behavior in a specific environment and not to the underlying data pipeline, no corresponding field in
+the configuration file should exist.
diff --git a/Tiltfile b/Tiltfile
index 6c0c9246042b4..9050565afe259 100644
--- a/Tiltfile
+++ b/Tiltfile
@@ -7,7 +7,7 @@ load('ext://helm_resource', 'helm_resource', 'helm_repo')
 docker_build(
     ref='timberio/vector',
     context='.',
-    build_args={'RUST_VERSION': '1.70.0'},
+    build_args={'RUST_VERSION': '1.71.1'},
     dockerfile='tilt/Dockerfile'
     )
 
diff --git a/benches/codecs/character_delimited_bytes.rs b/benches/codecs/character_delimited_bytes.rs
index 9e8774edacf3e..90e6f9d996f3c 100644
--- a/benches/codecs/character_delimited_bytes.rs
+++ b/benches/codecs/character_delimited_bytes.rs
@@ -55,7 +55,7 @@ fn decoding(c: &mut Criterion) {
                                 .map(|ml| CharacterDelimitedDecoder::new_with_max_length(b'a', ml))
                                 .unwrap_or(CharacterDelimitedDecoder::new(b'a')),
                         );
-                        let deserializer = Deserializer::Bytes(BytesDeserializer::new());
+                        let deserializer = Deserializer::Bytes(BytesDeserializer);
                         let decoder = vector::codecs::Decoder::new(framer, deserializer);
 
                         (Box::new(decoder), param.input.clone())
diff --git a/benches/codecs/newline_bytes.rs b/benches/codecs/newline_bytes.rs
index e7b4bce8a0392..a3fc1751a6df7 100644
--- a/benches/codecs/newline_bytes.rs
+++ b/benches/codecs/newline_bytes.rs
@@ -53,7 +53,7 @@ fn decoding(c: &mut Criterion) {
                                 .map(|ml| NewlineDelimitedDecoder::new_with_max_length(ml))
                                 .unwrap_or(NewlineDelimitedDecoder::new()),
                         );
-                        let deserializer = Deserializer::Bytes(BytesDeserializer::new());
+                        let deserializer = Deserializer::Bytes(BytesDeserializer);
                         let decoder = vector::codecs::Decoder::new(framer, deserializer);
 
                         (Box::new(decoder), param.input.clone())
diff --git a/benches/dnstap/mod.rs b/benches/dnstap/mod.rs
index e4dda4b5f3d4b..37839b41ace06 100644
--- a/benches/dnstap/mod.rs
+++ b/benches/dnstap/mod.rs
@@ -1,14 +1,10 @@
 use bytes::Bytes;
 use criterion::{criterion_group, criterion_main, BatchSize, Criterion, Throughput};
-use vector::{
-    event::LogEvent,
-    sources::dnstap::{schema::DnstapEventSchema, DnstapParser},
-};
+use vector::event::LogEvent;
+use vector::sources::dnstap::parser::DnstapParser;
 
 fn benchmark_query_parsing(c: &mut Criterion) {
     let mut event = LogEvent::default();
-    let schema = DnstapEventSchema::new();
-    let mut parser = DnstapParser::new(&schema, &mut event);
     let raw_dnstap_data = "ChVqYW1lcy1WaXJ0dWFsLU1hY2hpbmUSC0JJTkQgOS4xNi4zcnoIAxACGAEiEAAAAAAAAA\
     AAAAAAAAAAAAAqECABBQJwlAAAAAAAAAAAADAw8+0CODVA7+zq9wVNMU3WNlI2kwIAAAABAAAAAAABCWZhY2Vib29rMQNjb\
     20AAAEAAQAAKQIAAACAAAAMAAoACOxjCAG9zVgzWgUDY29tAHgB";
@@ -19,7 +15,7 @@ fn benchmark_query_parsing(c: &mut Criterion) {
     group.bench_function("dns_query_parsing", |b| {
         b.iter_batched(
             || dnstap_data.clone(),
-            |dnstap_data| parser.parse_dnstap_data(Bytes::from(dnstap_data)).unwrap(),
+            |dnstap_data| DnstapParser::parse(&mut event, Bytes::from(dnstap_data)).unwrap(),
             BatchSize::SmallInput,
         )
     });
@@ -29,8 +25,6 @@ fn benchmark_query_parsing(c: &mut Criterion) {
 
 fn benchmark_update_parsing(c: &mut Criterion) {
     let mut event = LogEvent::default();
-    let schema = DnstapEventSchema::new();
-    let mut parser = DnstapParser::new(&schema, &mut event);
     let raw_dnstap_data = "ChVqYW1lcy1WaXJ0dWFsLU1hY2hpbmUSC0JJTkQgOS4xNi4zcmsIDhABGAEiBH8AAA\
     EqBH8AAAEwrG44AEC+iu73BU14gfofUh1wi6gAAAEAAAAAAAAHZXhhbXBsZQNjb20AAAYAAWC+iu73BW0agDwvch1wi6gAA\
     AEAAAAAAAAHZXhhbXBsZQNjb20AAAYAAXgB";
@@ -41,7 +35,7 @@ fn benchmark_update_parsing(c: &mut Criterion) {
     group.bench_function("dns_update_parsing", |b| {
         b.iter_batched(
             || dnstap_data.clone(),
-            |dnstap_data| parser.parse_dnstap_data(Bytes::from(dnstap_data)).unwrap(),
+            |dnstap_data| DnstapParser::parse(&mut event, Bytes::from(dnstap_data)).unwrap(),
             BatchSize::SmallInput,
         )
     });
diff --git a/benches/event.rs b/benches/event.rs
index c28d0756a1a37..0f8322da087fd 100644
--- a/benches/event.rs
+++ b/benches/event.rs
@@ -1,6 +1,7 @@
 use bytes::Bytes;
 use criterion::{criterion_group, BatchSize, Criterion};
 use vector::event::LogEvent;
+use vrl::event_path;
 
 fn benchmark_event_iterate(c: &mut Criterion) {
     let mut group = c.benchmark_group("event/iterate");
@@ -9,9 +10,9 @@ fn benchmark_event_iterate(c: &mut Criterion) {
         b.iter_batched_ref(
             || {
                 let mut log = LogEvent::default();
-                log.insert("key1", Bytes::from("value1"));
-                log.insert("key2", Bytes::from("value2"));
-                log.insert("key3", Bytes::from("value3"));
+                log.insert(event_path!("key1"), Bytes::from("value1"));
+                log.insert(event_path!("key2"), Bytes::from("value2"));
+                log.insert(event_path!("key3"), Bytes::from("value3"));
                 log
             },
             |e| e.all_fields().unwrap().count(),
@@ -23,9 +24,15 @@ fn benchmark_event_iterate(c: &mut Criterion) {
         b.iter_batched_ref(
             || {
                 let mut log = LogEvent::default();
-                log.insert("key1.nested1.nested2", Bytes::from("value1"));
-                log.insert("key1.nested1.nested3", Bytes::from("value4"));
-                log.insert("key3", Bytes::from("value3"));
+                log.insert(
+                    event_path!("key1", "nested1", "nested2"),
+                    Bytes::from("value1"),
+                );
+                log.insert(
+                    event_path!("key1", "nested1", "nested3"),
+                    Bytes::from("value4"),
+                );
+                log.insert(event_path!("key3"), Bytes::from("value3"));
                 log
             },
             |e| e.all_fields().unwrap().count(),
@@ -37,8 +44,8 @@ fn benchmark_event_iterate(c: &mut Criterion) {
         b.iter_batched_ref(
             || {
                 let mut log = LogEvent::default();
-                log.insert("key1.nested1[0]", Bytes::from("value1"));
-                log.insert("key1.nested1[1]", Bytes::from("value2"));
+                log.insert(event_path!("key1", "nested1", 0), Bytes::from("value1"));
+                log.insert(event_path!("key1", "nested1", 1), Bytes::from("value2"));
                 log
             },
             |e| e.all_fields().unwrap().count(),
@@ -53,25 +60,31 @@ fn benchmark_event_create(c: &mut Criterion) {
     group.bench_function("single-level", |b| {
         b.iter(|| {
             let mut log = LogEvent::default();
-            log.insert("key1", Bytes::from("value1"));
-            log.insert("key2", Bytes::from("value2"));
-            log.insert("key3", Bytes::from("value3"));
+            log.insert(event_path!("key1"), Bytes::from("value1"));
+            log.insert(event_path!("key2"), Bytes::from("value2"));
+            log.insert(event_path!("key3"), Bytes::from("value3"));
         })
     });
 
     group.bench_function("nested-keys", |b| {
         b.iter(|| {
             let mut log = LogEvent::default();
-            log.insert("key1.nested1.nested2", Bytes::from("value1"));
-            log.insert("key1.nested1.nested3", Bytes::from("value4"));
-            log.insert("key3", Bytes::from("value3"));
+            log.insert(
+                event_path!("key1", "nested1", "nested2"),
+                Bytes::from("value1"),
+            );
+            log.insert(
+                event_path!("key1", "nested1", "nested3"),
+                Bytes::from("value4"),
+            );
+            log.insert(event_path!("key3"), Bytes::from("value3"));
         })
     });
     group.bench_function("array", |b| {
         b.iter(|| {
             let mut log = LogEvent::default();
-            log.insert("key1.nested1[0]", Bytes::from("value1"));
-            log.insert("key1.nested1[1]", Bytes::from("value2"));
+            log.insert(event_path!("key1", "nested1", 0), Bytes::from("value1"));
+            log.insert(event_path!("key1", "nested1", 1), Bytes::from("value2"));
         })
     });
 }
diff --git a/benches/lua.rs b/benches/lua.rs
index 3eda8a9572d98..7aabba2996890 100644
--- a/benches/lua.rs
+++ b/benches/lua.rs
@@ -9,6 +9,7 @@ use vector::{
     test_util::collect_ready,
     transforms::{self, OutputBuffer, Transform},
 };
+use vrl::event_path;
 
 fn bench_add_fields(c: &mut Criterion) {
     let event = Event::from(LogEvent::default());
@@ -87,7 +88,7 @@ fn bench_field_filter(c: &mut Criterion) {
     let events = (0..num_events)
         .map(|i| {
             let mut event = LogEvent::default();
-            event.insert("the_field", (i % 10).to_string());
+            event.insert(event_path!("the_field"), (i % 10).to_string());
             Event::from(event)
         })
         .collect::<Vec<_>>();
diff --git a/benches/remap.rs b/benches/remap.rs
index 2f371d93db1a6..8fd2629c17b8e 100644
--- a/benches/remap.rs
+++ b/benches/remap.rs
@@ -12,6 +12,7 @@ use vector::{
     },
 };
 use vector_common::TimeZone;
+use vrl::event_path;
 use vrl::prelude::*;
 
 criterion_group!(
@@ -35,9 +36,18 @@ fn benchmark_remap(c: &mut Criterion) {
         let result = outputs.take_primary();
         let output_1 = result.first().unwrap().as_log();
 
-        debug_assert_eq!(output_1.get("foo").unwrap().to_string_lossy(), "bar");
-        debug_assert_eq!(output_1.get("bar").unwrap().to_string_lossy(), "baz");
-        debug_assert_eq!(output_1.get("copy").unwrap().to_string_lossy(), "buz");
+        debug_assert_eq!(
+            output_1.get(event_path!("foo")).unwrap().to_string_lossy(),
+            "bar"
+        );
+        debug_assert_eq!(
+            output_1.get(event_path!("bar")).unwrap().to_string_lossy(),
+            "baz"
+        );
+        debug_assert_eq!(
+            output_1.get(event_path!("copy")).unwrap().to_string_lossy(),
+            "buz"
+        );
 
         result
     };
@@ -67,7 +77,9 @@ fn benchmark_remap(c: &mut Criterion) {
 
         let event = {
             let mut event = Event::Log(LogEvent::from("augment me"));
-            event.as_mut_log().insert("copy_from", "buz".to_owned());
+            event
+                .as_mut_log()
+                .insert(event_path!("copy_from"), "buz".to_owned());
             event
         };
 
@@ -88,11 +100,11 @@ fn benchmark_remap(c: &mut Criterion) {
         let output_1 = result.first().unwrap().as_log();
 
         debug_assert_eq!(
-            output_1.get("foo").unwrap().to_string_lossy(),
+            output_1.get(event_path!("foo")).unwrap().to_string_lossy(),
             r#"{"key": "value"}"#
         );
         debug_assert_eq!(
-            output_1.get("bar").unwrap().to_string_lossy(),
+            output_1.get(event_path!("bar")).unwrap().to_string_lossy(),
             r#"{"key":"value"}"#
         );
 
@@ -141,10 +153,16 @@ fn benchmark_remap(c: &mut Criterion) {
             let result = outputs.take_primary();
             let output_1 = result.first().unwrap().as_log();
 
-            debug_assert_eq!(output_1.get("number").unwrap(), &Value::Integer(1234));
-            debug_assert_eq!(output_1.get("bool").unwrap(), &Value::Boolean(true));
             debug_assert_eq!(
-                output_1.get("timestamp").unwrap(),
+                output_1.get(event_path!("number")).unwrap(),
+                &Value::Integer(1234)
+            );
+            debug_assert_eq!(
+                output_1.get(event_path!("bool")).unwrap(),
+                &Value::Boolean(true)
+            );
+            debug_assert_eq!(
+                output_1.get(event_path!("timestamp")).unwrap(),
                 &Value::Timestamp(timestamp),
             );
 
@@ -176,7 +194,7 @@ fn benchmark_remap(c: &mut Criterion) {
             ("bool", "yes"),
             ("timestamp", "19/06/2019:17:20:49 -0400"),
         ] {
-            event.as_mut_log().insert(key, value.to_owned());
+            event.as_mut_log().insert(event_path!(key), value.to_owned());
         }
 
         let timestamp =
diff --git a/benches/template.rs b/benches/template.rs
index 949f0beeb52b5..008df426c98bc 100644
--- a/benches/template.rs
+++ b/benches/template.rs
@@ -13,10 +13,7 @@ fn bench_elasticsearch_index(c: &mut Criterion) {
         let index = Template::try_from("index-%Y.%m.%d").unwrap();
         let mut event = Event::Log(LogEvent::from("hello world"));
         event.as_mut_log().insert(
-            (
-                lookup::PathPrefix::Event,
-                log_schema().timestamp_key().unwrap(),
-            ),
+            log_schema().timestamp_key_target_path().unwrap(),
             Utc::now(),
         );
 
@@ -31,10 +28,7 @@ fn bench_elasticsearch_index(c: &mut Criterion) {
         let index = Template::try_from("index").unwrap();
         let mut event = Event::Log(LogEvent::from("hello world"));
         event.as_mut_log().insert(
-            (
-                lookup::PathPrefix::Event,
-                log_schema().timestamp_key().unwrap(),
-            ),
+            log_schema().timestamp_key_target_path().unwrap(),
             Utc::now(),
         );
 
diff --git a/build.rs b/build.rs
index 42316c102da33..4e8c4f4986304 100644
--- a/build.rs
+++ b/build.rs
@@ -1,8 +1,5 @@
 use std::{collections::HashSet, env, fs::File, io::Write, path::Path, process::Command};
 
-#[cfg(feature = "protobuf-build")]
-use std::path::PathBuf;
-
 struct TrackedEnv {
     tracked: HashSet<String>,
 }
@@ -133,7 +130,7 @@ fn main() {
         // in a type-safe way, which is necessary for incrementally building certain payloads, like
         // the ones generated in the `datadog_metrics` sink.
         let protobuf_fds_path =
-            PathBuf::from(std::env::var("OUT_DIR").expect("OUT_DIR environment variable not set"))
+            Path::new(&std::env::var("OUT_DIR").expect("OUT_DIR environment variable not set"))
                 .join("protobuf-fds.bin");
 
         let mut prost_build = prost_build::Config::new();
diff --git a/deny.toml b/deny.toml
index 22181e1e0727b..726a94cf04e89 100644
--- a/deny.toml
+++ b/deny.toml
@@ -1,22 +1,33 @@
 [licenses]
+unlicensed = "deny"
+default = "deny"
+copyleft = "deny"
 allow = [
-  "MIT",
+  "0BSD",
+  "Apache-2.0",
+  "BSD-2-Clause",
+  "BSD-3-Clause",
+  "BSL-1.0",
   "CC0-1.0",
   "ISC",
+  "MIT",
   "OpenSSL",
-  "Unlicense",
-  "BSD-2-Clause",
-  "BSD-3-Clause",
-  "Apache-2.0",
-  "Apache-2.0 WITH LLVM-exception",
-  "Zlib",
+  "Unicode-DFS-2016",
+  "Zlib"
 ]
 
-unlicensed = "warn"
-default = "warn"
-
 private = { ignore = true }
 
+exceptions = [
+    # MPL-2.0 are added case-by-case to make sure we are in compliance. To be in
+    # compliance we cannot be modifying the source files.
+    { allow = ["MPL-2.0"], name = "colored", version = "*" },
+    { allow = ["MPL-2.0"], name = "webpki-roots", version = "*" },
+    { allow = ["MPL-2.0"], name = "vector-config-common", version = "*" },
+    { allow = ["MPL-2.0"], name = "vector-config-macros", version = "*" },
+    { allow = ["MPL-2.0"], name = "vrl", version = "*" },
+]
+
 [[licenses.clarify]]
 name = "ring"
 version = "*"
diff --git a/distribution/docker/alpine/Dockerfile b/distribution/docker/alpine/Dockerfile
index c3479f1001191..c749e9fc0540a 100644
--- a/distribution/docker/alpine/Dockerfile
+++ b/distribution/docker/alpine/Dockerfile
@@ -8,6 +8,8 @@ RUN tar -xvf vector-0*-"$(cat /etc/apk/arch)"-unknown-linux-musl*.tar.gz --strip
 RUN mkdir -p /var/lib/vector
 
 FROM docker.io/alpine:3.18
+# we want the latest versions of these
+# hadolint ignore=DL3018
 RUN apk --no-cache add ca-certificates tzdata
 
 COPY --from=builder /vector/bin/* /usr/local/bin/
diff --git a/distribution/docker/debian/Dockerfile b/distribution/docker/debian/Dockerfile
index 46afabb2480e4..c678dfd3080ee 100644
--- a/distribution/docker/debian/Dockerfile
+++ b/distribution/docker/debian/Dockerfile
@@ -1,4 +1,4 @@
-FROM docker.io/debian:bullseye-slim AS builder
+FROM docker.io/debian:bookworm-slim AS builder
 
 WORKDIR /vector
 
@@ -7,11 +7,14 @@ RUN dpkg -i vector_*_"$(dpkg --print-architecture)".deb
 
 RUN mkdir -p /var/lib/vector
 
-FROM docker.io/debian:bullseye-slim
+FROM docker.io/debian:bookworm-slim
 
+# we want the latest versions of these
+# hadolint ignore=DL3008
 RUN apt-get update && apt-get install -y --no-install-recommends ca-certificates tzdata systemd && rm -rf /var/lib/apt/lists/*
 
 COPY --from=builder /usr/bin/vector /usr/bin/vector
+COPY --from=builder /usr/share/vector /usr/share/vector
 COPY --from=builder /usr/share/doc/vector /usr/share/doc/vector
 COPY --from=builder /etc/vector /etc/vector
 COPY --from=builder /var/lib/vector /var/lib/vector
diff --git a/distribution/docker/distroless-libc/Dockerfile b/distribution/docker/distroless-libc/Dockerfile
index 6c164dcd07dfe..773aeadcbdc93 100644
--- a/distribution/docker/distroless-libc/Dockerfile
+++ b/distribution/docker/distroless-libc/Dockerfile
@@ -1,4 +1,4 @@
-FROM docker.io/debian:bullseye-slim AS builder
+FROM docker.io/debian:bookworm-slim AS builder
 
 WORKDIR /vector
 
@@ -7,10 +7,13 @@ RUN dpkg -i vector_*_"$(dpkg --print-architecture)".deb
 
 RUN mkdir -p /var/lib/vector
 
-FROM gcr.io/distroless/cc-debian11
+# distroless doesn't use static tags
+# hadolint ignore=DL3007
+FROM gcr.io/distroless/cc-debian11:latest
 
 COPY --from=builder /usr/bin/vector /usr/bin/vector
 COPY --from=builder /usr/share/doc/vector /usr/share/doc/vector
+COPY --from=builder /usr/share/vector /usr/share/vector
 COPY --from=builder /etc/vector /etc/vector
 COPY --from=builder /var/lib/vector /var/lib/vector
 
diff --git a/distribution/docker/distroless-static/Dockerfile b/distribution/docker/distroless-static/Dockerfile
index 874c165d64457..280c7d6be25d0 100644
--- a/distribution/docker/distroless-static/Dockerfile
+++ b/distribution/docker/distroless-static/Dockerfile
@@ -7,7 +7,9 @@ RUN tar -xvf vector-0*-"$(cat /etc/apk/arch)"-unknown-linux-musl*.tar.gz --strip
 
 RUN mkdir -p /var/lib/vector
 
-FROM gcr.io/distroless/static
+# distroless doesn't use static tags
+# hadolint ignore=DL3007
+FROM gcr.io/distroless/static:latest
 
 COPY --from=builder /vector/bin/* /usr/local/bin/
 COPY --from=builder /vector/config/vector.toml /etc/vector/vector.toml
diff --git a/distribution/install.sh b/distribution/install.sh
index 4fbfb8f10b059..bc639ddab3320 100755
--- a/distribution/install.sh
+++ b/distribution/install.sh
@@ -12,7 +12,7 @@ set -u
 
 # If PACKAGE_ROOT is unset or empty, default it.
 PACKAGE_ROOT="${PACKAGE_ROOT:-"https://packages.timber.io/vector"}"
-VECTOR_VERSION="0.31.0"
+VECTOR_VERSION="0.32.2"
 _divider="--------------------------------------------------------------------------------"
 _prompt=">>>"
 _indent="   "
@@ -152,6 +152,16 @@ install_from_archive() {
         x86_64-*linux*-musl)
             _archive_arch="x86_64-unknown-linux-musl"
             ;;
+        aarch64-apple-darwin)
+            # This if statement can be removed when Vector publishes aarch64-apple-darwin builds
+            if /usr/bin/pgrep oahd >/dev/null 2>&1; then
+                echo "Rosetta is installed, installing x86_64-apple-darwin archive"
+                _archive_arch="x86_64-apple-darwin"
+            else
+                echo "Builds for Apple Silicon are not published today, please install Rosetta"
+                err "unsupported arch: $_arch"
+            fi
+            ;;
         aarch64-*linux*)
             _archive_arch="aarch64-unknown-linux-musl"
             ;;
diff --git a/distribution/kubernetes/vector-agent/README.md b/distribution/kubernetes/vector-agent/README.md
index 58bc8ff221193..531ce3abac357 100644
--- a/distribution/kubernetes/vector-agent/README.md
+++ b/distribution/kubernetes/vector-agent/README.md
@@ -1,6 +1,6 @@
 The kubernetes manifests found in this directory have been automatically generated
 from the [helm chart `vector/vector`](https://github.com/vectordotdev/helm-charts/tree/master/charts/vector)
-version 0.22.0 with the following `values.yaml`:
+version 0.23.0 with the following `values.yaml`:
 
 ```yaml
 role: Agent
diff --git a/distribution/kubernetes/vector-agent/configmap.yaml b/distribution/kubernetes/vector-agent/configmap.yaml
index d7c928b159f7c..cc4d0a701a446 100644
--- a/distribution/kubernetes/vector-agent/configmap.yaml
+++ b/distribution/kubernetes/vector-agent/configmap.yaml
@@ -8,7 +8,7 @@ metadata:
     app.kubernetes.io/name: vector
     app.kubernetes.io/instance: vector
     app.kubernetes.io/component: Agent
-    app.kubernetes.io/version: "0.30.0-distroless-libc"
+    app.kubernetes.io/version: "0.31.0-distroless-libc"
 data:
   agent.yaml: |
     data_dir: /vector-data-dir
diff --git a/distribution/kubernetes/vector-agent/daemonset.yaml b/distribution/kubernetes/vector-agent/daemonset.yaml
index 8508420956313..5deb05f8a834b 100644
--- a/distribution/kubernetes/vector-agent/daemonset.yaml
+++ b/distribution/kubernetes/vector-agent/daemonset.yaml
@@ -8,7 +8,7 @@ metadata:
     app.kubernetes.io/name: vector
     app.kubernetes.io/instance: vector
     app.kubernetes.io/component: Agent
-    app.kubernetes.io/version: "0.30.0-distroless-libc"
+    app.kubernetes.io/version: "0.31.0-distroless-libc"
   annotations: {}
 spec:
   selector:
@@ -16,6 +16,7 @@ spec:
       app.kubernetes.io/name: vector
       app.kubernetes.io/instance: vector
       app.kubernetes.io/component: Agent
+  minReadySeconds: 0
   template:
     metadata:
       annotations: {}
@@ -29,7 +30,7 @@ spec:
       dnsPolicy: ClusterFirst
       containers:
         - name: vector
-          image: "timberio/vector:0.30.0-distroless-libc"
+          image: "timberio/vector:0.31.0-distroless-libc"
           imagePullPolicy: IfNotPresent
           args:
             - --config-dir
@@ -51,6 +52,8 @@ spec:
               value: "/host/proc"
             - name: SYSFS_ROOT
               value: "/host/sys"
+            - name: VECTOR_LOG
+              value: "info"
           ports:
             - name: prom-exporter
               containerPort: 9090
@@ -61,17 +64,17 @@ spec:
             - name: config
               mountPath: "/etc/vector/"
               readOnly: true
-            - name: var-log
-              mountPath: "/var/log/"
+            - mountPath: /var/log/
+              name: var-log
               readOnly: true
-            - name: var-lib
-              mountPath: "/var/lib"
+            - mountPath: /var/lib
+              name: var-lib
               readOnly: true
-            - name: procfs
-              mountPath: "/host/proc"
+            - mountPath: /host/proc
+              name: procfs
               readOnly: true
-            - name: sysfs
-              mountPath: "/host/sys"
+            - mountPath: /host/sys
+              name: sysfs
               readOnly: true
       terminationGracePeriodSeconds: 60
       volumes:
@@ -83,15 +86,15 @@ spec:
         - name: data
           hostPath:
             path: "/var/lib/vector"
-        - name: var-log
-          hostPath:
-            path: "/var/log/"
-        - name: var-lib
-          hostPath:
-            path: "/var/lib/"
-        - name: procfs
-          hostPath:
-            path: "/proc"
-        - name: sysfs
-          hostPath:
-            path: "/sys"
+        - hostPath:
+            path: /var/log/
+          name: var-log
+        - hostPath:
+            path: /var/lib/
+          name: var-lib
+        - hostPath:
+            path: /proc
+          name: procfs
+        - hostPath:
+            path: /sys
+          name: sysfs
diff --git a/distribution/kubernetes/vector-agent/rbac.yaml b/distribution/kubernetes/vector-agent/rbac.yaml
index 2ad572473e7d7..2309c07b8b9d2 100644
--- a/distribution/kubernetes/vector-agent/rbac.yaml
+++ b/distribution/kubernetes/vector-agent/rbac.yaml
@@ -10,7 +10,7 @@ metadata:
     app.kubernetes.io/name: vector
     app.kubernetes.io/instance: vector
     app.kubernetes.io/component: Agent
-    app.kubernetes.io/version: "0.30.0-distroless-libc"
+    app.kubernetes.io/version: "0.31.0-distroless-libc"
 rules:
   - apiGroups:
       - ""
@@ -31,7 +31,7 @@ metadata:
     app.kubernetes.io/name: vector
     app.kubernetes.io/instance: vector
     app.kubernetes.io/component: Agent
-    app.kubernetes.io/version: "0.30.0-distroless-libc"
+    app.kubernetes.io/version: "0.31.0-distroless-libc"
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
diff --git a/distribution/kubernetes/vector-agent/service-headless.yaml b/distribution/kubernetes/vector-agent/service-headless.yaml
index 18ea854b8f9e7..1ef8fb122e0e3 100644
--- a/distribution/kubernetes/vector-agent/service-headless.yaml
+++ b/distribution/kubernetes/vector-agent/service-headless.yaml
@@ -8,7 +8,7 @@ metadata:
     app.kubernetes.io/name: vector
     app.kubernetes.io/instance: vector
     app.kubernetes.io/component: Agent
-    app.kubernetes.io/version: "0.30.0-distroless-libc"
+    app.kubernetes.io/version: "0.31.0-distroless-libc"
   annotations:
 spec:
   clusterIP: None
diff --git a/distribution/kubernetes/vector-agent/serviceaccount.yaml b/distribution/kubernetes/vector-agent/serviceaccount.yaml
index 18d7093b583f8..389773e9101a3 100644
--- a/distribution/kubernetes/vector-agent/serviceaccount.yaml
+++ b/distribution/kubernetes/vector-agent/serviceaccount.yaml
@@ -8,5 +8,5 @@ metadata:
     app.kubernetes.io/name: vector
     app.kubernetes.io/instance: vector
     app.kubernetes.io/component: Agent
-    app.kubernetes.io/version: "0.30.0-distroless-libc"
+    app.kubernetes.io/version: "0.31.0-distroless-libc"
 automountServiceAccountToken: true
diff --git a/distribution/kubernetes/vector-aggregator/README.md b/distribution/kubernetes/vector-aggregator/README.md
index 194d80cc3ebb1..4c5a3b4fcb1b4 100644
--- a/distribution/kubernetes/vector-aggregator/README.md
+++ b/distribution/kubernetes/vector-aggregator/README.md
@@ -1,6 +1,6 @@
 The kubernetes manifests found in this directory have been automatically generated
 from the [helm chart `vector/vector`](https://github.com/vectordotdev/helm-charts/tree/master/charts/vector)
-version 0.22.0 with the following `values.yaml`:
+version 0.23.0 with the following `values.yaml`:
 
 ```yaml
 
diff --git a/distribution/kubernetes/vector-aggregator/configmap.yaml b/distribution/kubernetes/vector-aggregator/configmap.yaml
index 028a2f273a075..3f82d196965e4 100644
--- a/distribution/kubernetes/vector-aggregator/configmap.yaml
+++ b/distribution/kubernetes/vector-aggregator/configmap.yaml
@@ -8,7 +8,7 @@ metadata:
     app.kubernetes.io/name: vector
     app.kubernetes.io/instance: vector
     app.kubernetes.io/component: Aggregator
-    app.kubernetes.io/version: "0.30.0-distroless-libc"
+    app.kubernetes.io/version: "0.31.0-distroless-libc"
 data:
   aggregator.yaml: |
     data_dir: /vector-data-dir
diff --git a/distribution/kubernetes/vector-aggregator/service-headless.yaml b/distribution/kubernetes/vector-aggregator/service-headless.yaml
index 06cad3551b635..643102caccd3c 100644
--- a/distribution/kubernetes/vector-aggregator/service-headless.yaml
+++ b/distribution/kubernetes/vector-aggregator/service-headless.yaml
@@ -8,7 +8,7 @@ metadata:
     app.kubernetes.io/name: vector
     app.kubernetes.io/instance: vector
     app.kubernetes.io/component: Aggregator
-    app.kubernetes.io/version: "0.30.0-distroless-libc"
+    app.kubernetes.io/version: "0.31.0-distroless-libc"
   annotations:
 spec:
   clusterIP: None
diff --git a/distribution/kubernetes/vector-aggregator/service.yaml b/distribution/kubernetes/vector-aggregator/service.yaml
index 449a24950bc1e..023e8dfd0f557 100644
--- a/distribution/kubernetes/vector-aggregator/service.yaml
+++ b/distribution/kubernetes/vector-aggregator/service.yaml
@@ -8,7 +8,7 @@ metadata:
     app.kubernetes.io/name: vector
     app.kubernetes.io/instance: vector
     app.kubernetes.io/component: Aggregator
-    app.kubernetes.io/version: "0.30.0-distroless-libc"
+    app.kubernetes.io/version: "0.31.0-distroless-libc"
   annotations:
 spec:
   ports:
diff --git a/distribution/kubernetes/vector-aggregator/serviceaccount.yaml b/distribution/kubernetes/vector-aggregator/serviceaccount.yaml
index 0bf2da2d58d3b..024e2f65b3b1b 100644
--- a/distribution/kubernetes/vector-aggregator/serviceaccount.yaml
+++ b/distribution/kubernetes/vector-aggregator/serviceaccount.yaml
@@ -8,5 +8,5 @@ metadata:
     app.kubernetes.io/name: vector
     app.kubernetes.io/instance: vector
     app.kubernetes.io/component: Aggregator
-    app.kubernetes.io/version: "0.30.0-distroless-libc"
+    app.kubernetes.io/version: "0.31.0-distroless-libc"
 automountServiceAccountToken: true
diff --git a/distribution/kubernetes/vector-aggregator/statefulset.yaml b/distribution/kubernetes/vector-aggregator/statefulset.yaml
index 2eef56ffd5ad9..ad5a0d0086a2b 100644
--- a/distribution/kubernetes/vector-aggregator/statefulset.yaml
+++ b/distribution/kubernetes/vector-aggregator/statefulset.yaml
@@ -8,7 +8,7 @@ metadata:
     app.kubernetes.io/name: vector
     app.kubernetes.io/instance: vector
     app.kubernetes.io/component: Aggregator
-    app.kubernetes.io/version: "0.30.0-distroless-libc"
+    app.kubernetes.io/version: "0.31.0-distroless-libc"
   annotations: {}
 spec:
   replicas: 1
@@ -32,7 +32,7 @@ spec:
       dnsPolicy: ClusterFirst
       containers:
         - name: vector
-          image: "timberio/vector:0.30.0-distroless-libc"
+          image: "timberio/vector:0.31.0-distroless-libc"
           imagePullPolicy: IfNotPresent
           args:
             - --config-dir
diff --git a/distribution/kubernetes/vector-stateless-aggregator/README.md b/distribution/kubernetes/vector-stateless-aggregator/README.md
index 2703746f5d435..69466743c76ec 100644
--- a/distribution/kubernetes/vector-stateless-aggregator/README.md
+++ b/distribution/kubernetes/vector-stateless-aggregator/README.md
@@ -1,6 +1,6 @@
 The kubernetes manifests found in this directory have been automatically generated
 from the [helm chart `vector/vector`](https://github.com/vectordotdev/helm-charts/tree/master/charts/vector)
-version 0.22.0 with the following `values.yaml`:
+version 0.23.0 with the following `values.yaml`:
 
 ```yaml
 role: Stateless-Aggregator
diff --git a/distribution/kubernetes/vector-stateless-aggregator/configmap.yaml b/distribution/kubernetes/vector-stateless-aggregator/configmap.yaml
index 766c693669f7b..38de88fe03a06 100644
--- a/distribution/kubernetes/vector-stateless-aggregator/configmap.yaml
+++ b/distribution/kubernetes/vector-stateless-aggregator/configmap.yaml
@@ -8,7 +8,7 @@ metadata:
     app.kubernetes.io/name: vector
     app.kubernetes.io/instance: vector
     app.kubernetes.io/component: Stateless-Aggregator
-    app.kubernetes.io/version: "0.30.0-distroless-libc"
+    app.kubernetes.io/version: "0.31.0-distroless-libc"
 data:
   aggregator.yaml: |
     data_dir: /vector-data-dir
diff --git a/distribution/kubernetes/vector-stateless-aggregator/deployment.yaml b/distribution/kubernetes/vector-stateless-aggregator/deployment.yaml
index 6ff20dc958816..6072b5464fa86 100644
--- a/distribution/kubernetes/vector-stateless-aggregator/deployment.yaml
+++ b/distribution/kubernetes/vector-stateless-aggregator/deployment.yaml
@@ -8,7 +8,7 @@ metadata:
     app.kubernetes.io/name: vector
     app.kubernetes.io/instance: vector
     app.kubernetes.io/component: Stateless-Aggregator
-    app.kubernetes.io/version: "0.30.0-distroless-libc"
+    app.kubernetes.io/version: "0.31.0-distroless-libc"
   annotations: {}
 spec:
   replicas: 1
@@ -30,7 +30,7 @@ spec:
       dnsPolicy: ClusterFirst
       containers:
         - name: vector
-          image: "timberio/vector:0.30.0-distroless-libc"
+          image: "timberio/vector:0.31.0-distroless-libc"
           imagePullPolicy: IfNotPresent
           args:
             - --config-dir
diff --git a/distribution/kubernetes/vector-stateless-aggregator/service-headless.yaml b/distribution/kubernetes/vector-stateless-aggregator/service-headless.yaml
index 3230af57fbd76..a7d86afb480c5 100644
--- a/distribution/kubernetes/vector-stateless-aggregator/service-headless.yaml
+++ b/distribution/kubernetes/vector-stateless-aggregator/service-headless.yaml
@@ -8,7 +8,7 @@ metadata:
     app.kubernetes.io/name: vector
     app.kubernetes.io/instance: vector
     app.kubernetes.io/component: Stateless-Aggregator
-    app.kubernetes.io/version: "0.30.0-distroless-libc"
+    app.kubernetes.io/version: "0.31.0-distroless-libc"
   annotations:
 spec:
   clusterIP: None
diff --git a/distribution/kubernetes/vector-stateless-aggregator/service.yaml b/distribution/kubernetes/vector-stateless-aggregator/service.yaml
index a22d86ff0925f..9d9f59d239018 100644
--- a/distribution/kubernetes/vector-stateless-aggregator/service.yaml
+++ b/distribution/kubernetes/vector-stateless-aggregator/service.yaml
@@ -8,7 +8,7 @@ metadata:
     app.kubernetes.io/name: vector
     app.kubernetes.io/instance: vector
     app.kubernetes.io/component: Stateless-Aggregator
-    app.kubernetes.io/version: "0.30.0-distroless-libc"
+    app.kubernetes.io/version: "0.31.0-distroless-libc"
   annotations:
 spec:
   ports:
diff --git a/distribution/kubernetes/vector-stateless-aggregator/serviceaccount.yaml b/distribution/kubernetes/vector-stateless-aggregator/serviceaccount.yaml
index 50bba163cf9f5..d46fee95872d7 100644
--- a/distribution/kubernetes/vector-stateless-aggregator/serviceaccount.yaml
+++ b/distribution/kubernetes/vector-stateless-aggregator/serviceaccount.yaml
@@ -8,5 +8,5 @@ metadata:
     app.kubernetes.io/name: vector
     app.kubernetes.io/instance: vector
     app.kubernetes.io/component: Stateless-Aggregator
-    app.kubernetes.io/version: "0.30.0-distroless-libc"
+    app.kubernetes.io/version: "0.31.0-distroless-libc"
 automountServiceAccountToken: true
diff --git a/distribution/rpm/vector.spec b/distribution/rpm/vector.spec
index 04a57d4564b6a..3a895ace15f21 100644
--- a/distribution/rpm/vector.spec
+++ b/distribution/rpm/vector.spec
@@ -52,6 +52,7 @@ mkdir -p %{buildroot}%{_bindir}
 mkdir -p %{buildroot}%{_sysconfdir}/%{_name}
 mkdir -p %{buildroot}%{_sysconfdir}/default
 mkdir -p %{buildroot}%{_sharedstatedir}/%{_name}
+mkdir -p %{buildroot}%{_datadir}/%{_name}
 mkdir -p %{buildroot}%{_unitdir}
 
 cp -a %{_builddir}/bin/vector %{buildroot}%{_bindir}
@@ -59,6 +60,9 @@ cp -a %{_builddir}/config/vector.toml %{buildroot}%{_sysconfdir}/%{_name}/vector
 cp -a %{_builddir}/config/examples/. %{buildroot}%{_sysconfdir}/%{_name}/examples
 cp -a %{_builddir}/systemd/vector.service %{buildroot}%{_unitdir}/vector.service
 cp -a %{_builddir}/systemd/vector.default %{buildroot}%{_sysconfdir}/default/vector
+cp -a %{_builddir}/licenses/. %{buildroot}%{_datadir}/%{_name}/licenses
+cp -a %{_builddir}/NOTICE %{buildroot}%{_datadir}/%{_name}/NOTICE
+cp -a %{_builddir}/LICENSE-3rdparty.csv %{buildroot}%{_datadir}/%{_name}/LICENSE-3rdparty.csv
 
 %post
 getent passwd %{_username} > /dev/null || \
@@ -80,6 +84,9 @@ rm -rf %{buildroot}
 %config %{_sysconfdir}/%{_name}/examples/*
 %dir %{_sharedstatedir}/%{_name}
 %doc README.md
+%doc %{_datadir}/%{_name}/NOTICE
+%doc %{_datadir}/%{_name}/licenses/*
+%doc %{_datadir}/%{_name}/LICENSE-3rdparty.csv
 %license LICENSE
 
 %changelog
diff --git a/docs/DEVELOPING.md b/docs/DEVELOPING.md
index d7512a980bd6c..cf66c472587df 100644
--- a/docs/DEVELOPING.md
+++ b/docs/DEVELOPING.md
@@ -121,9 +121,10 @@ To build Vector on your own host will require a fairly complete development envi
 Loosely, you'll need the following:
 
 - **To build Vector:** Have working Rustup, Protobuf tools, C++/C build tools (LLVM, GCC, or MSVC), Python, and Perl, `make` (the GNU one preferably), `bash`, `cmake`, `GNU coreutils`, and `autotools`.
+- **To run `make test`:** Install [`cargo-nextest`](https://nexte.st/)
 - **To run integration tests:** Have `docker` available, or a real live version of that service. (Use `AUTOSPAWN=false`)
 - **To run `make check-component-features`:** Have `remarshal` installed.
-- **To run `make check-licenses` or `cargo vdev build licenses`:** Have `rust-license-tool` [installed](https://github.com/DataDog/rust-license-tool).
+- **To run `make check-licenses` or `cargo vdev build licenses`:** Have `dd-rust-license-tool` [installed](https://github.com/DataDog/rust-license-tool).
 - **To run `cargo vdev build component-docs`:** Have `cue` [installed](https://cuelang.org/docs/install/).
 
 If you find yourself needing to run something inside the Docker environment described above, that's totally fine, they won't collide or hurt each other. In this case, you'd just run `make environment-generate`.
@@ -141,19 +142,19 @@ cargo build
 make build-dev
 # Validate your test pass
 cargo test sources::example
-make test scope="sources::example"
+make test SCOPE="sources::example"
 # Validate tests (that do not require other services) pass
 cargo test
 make test
 # Validate your tests pass (starting required services in Docker)
-make test-integration scope="sources::example"
+make test-integration SCOPE="sources::example"
 # Validate your tests pass against a live service.
-make test-integration scope="sources::example" autospawn=false
+make test-integration SCOPE="sources::example" autospawn=false
 cargo test --features docker sources::example
 # Validate all tests pass (starting required services in Docker)
 make test-integration
 # Run your benchmarks
-make bench scope="transforms::example"
+make bench SCOPE="transforms::example"
 cargo bench transforms::example
 # Format your code before pushing!
 make fmt
diff --git a/docs/REVIEWING.md b/docs/REVIEWING.md
index f8356f7a2f271..26dfd8943d896 100644
--- a/docs/REVIEWING.md
+++ b/docs/REVIEWING.md
@@ -36,6 +36,42 @@ following items should also be checked:
 - [ ] Does it comply with [component spec](specs/component.md)?
 - [ ] Does it comply with the [instrumentation spec](specs/instrumentation.md)?
 
+
+### Checklist - new sink
+
+This checklist is specific for Vector's sink code.
+
+#### Logic
+
+- [ ] Does it work? Do you understand what it is supposed to be doing?
+- [ ] Does the retry logic make sense?
+- [ ] Are the tests testing that the sink is emitting the correct metrics?
+- [ ] Are there integration tests?
+
+#### Code structure
+
+- [ ] Is it using the sink prelude (`use crate::sinks::prelude::*`)?
+- [ ] Is the sink a stream based sink?
+      Check that the return value from `SinkConfig::build` is the return from `VectorSink::from_event_streamsink`.
+- [ ] Is it gated by sensible feature flags?
+- [ ] Is the code modularized into `mod.rs`, `config.rs`, `sink.rs`,  `request_builder.rs`, `service.rs`
+- [ ] Does the code follow our [style guidelines].
+
+#### Documentation
+
+- [ ] Look at the doc preview on Netlify. Does it look good?
+- [ ] Is there a `cue` file linking to `base`?
+- [ ] Is there a markdown file under `/website/content/en/docs/reference/configuration/sinks/`?
+- [ ] Are module comments included in `mod.rs` linking to any relevant areas in the external services documentation?
+
+#### Configuration
+
+- [ ] Are TLS settings configurable?
+- [ ] Are the Request settings configurable?
+- [ ] Should it have proxy settings? If so, are they in place?
+- [ ] Does it need batch settings? If so, are they used?
+
+
 ## Expectations
 
 We endeavour to review all PRs within 2 working days (Monday to Friday) of submission.
@@ -131,3 +167,5 @@ your best judgment, some code requires more testing than others depending
 on its importance.
 
 For integrations, consider whether the code could be integration tested.
+
+[style guidelines]: https://github.com/vectordotdev/vector/blob/master/STYLE.md
diff --git a/docs/tutorials/sinks/1_basic_sink.md b/docs/tutorials/sinks/1_basic_sink.md
index 18194636eb469..ae49909f91dd2 100644
--- a/docs/tutorials/sinks/1_basic_sink.md
+++ b/docs/tutorials/sinks/1_basic_sink.md
@@ -33,7 +33,7 @@ is deserialized to the fields in this struct so the user can customise the
 sink's behaviour.
 
 ```rust
-#[configurable_component(sink("basic", "Basic sink."))]
+#[configurable_component(sink("basic"))]
 #[derive(Clone, Debug)]
 /// A basic sink that dumps its output to stdout.
 pub struct BasicConfig {
@@ -273,7 +273,7 @@ emit the event. Change the body of `run_inner` to look like the following:
 
 ## EventSent
 
-[`EventSent`][events_sent] is emmitted by each component in Vector to
+[`EventSent`][events_sent] is emitted by each component in Vector to
 instrument how many bytes have been sent to the next downstream component.
 
 Add the following after emitting `BytesSent`:
@@ -284,7 +284,7 @@ Add the following after emitting `BytesSent`:
 +         count: 1,
 +         byte_size: event_byte_size,
 +         output: None,
-+     })
++     });
 ```
 
 More details about instrumenting Vector can be found
diff --git a/docs/tutorials/sinks/2_http_sink.md b/docs/tutorials/sinks/2_http_sink.md
index 66fcb2e4d6f97..179ff4192c8cc 100644
--- a/docs/tutorials/sinks/2_http_sink.md
+++ b/docs/tutorials/sinks/2_http_sink.md
@@ -16,6 +16,7 @@ use crate::{
     http::HttpClient,
     internal_events::SinkRequestBuildError,
 };
+use vector_core::config::telemetry;
 use bytes::Bytes;
 ```
 
@@ -81,12 +82,12 @@ struct BasicEncoder;
 The Encoder must implement the [`Encoder`][encoder] trait:
 
 ```rust
-impl Encoder<Event> for BasicEncoder {
+impl encoding::Encoder<Event> for BasicEncoder {
     fn encode_input(
         &self,
         input: Event,
         writer: &mut dyn std::io::Write,
-    ) -> std::io::Result<usize> {
+    ) -> std::io::Result<(usize, GroupedCountByteSize)> {
     }
 }
 ```
@@ -98,16 +99,25 @@ sending batches of events, or they may send a completely different type if each
 event is processed in some way prior to encoding.
 
 [`encode_input`][encoder_encode_input] serializes the event to a String and
-writes these bytes:
+writes these bytes. The function also creates a [`GroupedCountByteSize`]
+[grouped_count_byte_size] object. This object tracks the size of the event
+that is sent by the sink, optionally grouped by the source and  service that
+originated the event if Vector has been configured to do so. It is necessary to
+calculate the sizes in this function since the encode function sometimes drops
+fields from the event prior to encoding. We need the size to be calculated after
+these fields have been dropped.
 
 ```rust
     fn encode_input(
         &self,
         input: Event,
         writer: &mut dyn std::io::Write,
-    ) -> std::io::Result<usize> {
+    ) -> std::io::Result<(usize, GroupedCountByteSize)> {
+        let mut byte_size = telemetry().create_request_count_byte_size();
+        byte_size.add_event(&input, input.estimated_json_encoded_size_of());
+
         let event = serde_json::to_string(&input).unwrap();
-        write_all(writer, 1, event.as_bytes()).map(|()| event.len())
+        write_all(writer, 1, event.as_bytes()).map(|()| (event.len(), byte_size))
     }
 ```
 
@@ -152,8 +162,12 @@ We need to implement a number of traits for the request to access these fields:
 
 ```rust
 impl MetaDescriptive for BasicRequest {
-    fn get_metadata(&self) -> RequestMetadata {
-        self.metadata
+    fn get_metadata(&self) -> &RequestMetadata {
+        &self.metadata
+    }
+
+    fn metadata_mut(&mut self) -> &mut RequestMetadata {
+        &mut self.metadata
     }
 }
 
@@ -249,7 +263,7 @@ when sending the event to an `amqp` server.
         mut input: Event,
     ) -> (Self::Metadata, RequestMetadataBuilder, Self::Events) {
         let finalizers = input.take_finalizers();
-        let metadata_builder = RequestMetadataBuilder::from_events(&input);
+        let metadata_builder = RequestMetadataBuilder::from_event(&input);
         (finalizers, metadata_builder, input)
     }
 ```
@@ -338,7 +352,12 @@ that will be invoked to send the actual data.
             match client.call(req).await {
                 Ok(response) => {
                     if response.status().is_success() {
-                        Ok(BasicResponse { byte_size })
+                        Ok(BasicResponse {
+                            byte_size,
+                            json_size: request
+                                .metadata
+                                .into_events_estimated_json_encoded_byte_size(),
+                        })
                     } else {
                         Err("received error response")
                     }
@@ -359,6 +378,7 @@ The return from our service must be an object that implements the
 ```rust
 struct BasicResponse {
     byte_size: usize,
+    json_size: GroupedCountByteSize,
 }
 
 impl DriverResponse for BasicResponse {
@@ -366,11 +386,13 @@ impl DriverResponse for BasicResponse {
         EventStatus::Delivered
     }
 
-    fn events_sent(&self) -> RequestCountByteSize {
-        // (events count, byte size)
-        CountByteSize(1, self.byte_size).into()
+    fn events_sent(&self) -> &GroupedCountByteSize {
+        &self.json_size
     }
-}
+
+    fn bytes_sent(&self) -> Option<usize> {
+        Some(self.byte_size)
+    }}
 ```
 
 Vector calls the methods in this trait to determine if the event was delivered successfully.
@@ -469,7 +491,7 @@ BODY:
 {"log":{"host":"computer","message":"zork","source_type":"stdin","timestamp":"2023-01-23T10:21:57.215019942Z"}}
 ```
 
-[tutorial_1]: https://github.com/vectordotdev/vector/tree/master/docs/tutorials/sinsk/1_basic_sink.md
+[tutorial_1]: https://github.com/vectordotdev/vector/tree/master/docs/tutorials/sinks/1_basic_sink.md
 [tower]: https://docs.rs/tower/latest/tower/
 [tower_service]: https://docs.rs/tower/latest/tower/trait.Service.html
 [hyper_docs]: https://docs.rs/hyper/latest/hyper/
@@ -492,3 +514,4 @@ BODY:
 [sinkbuilder_ext_into_driver]: https://rust-doc.vector.dev/vector/sinks/util/builder/trait.sinkbuilderext#method.into_driver
 [stream_filter_map]: https://docs.rs/futures/latest/futures/stream/trait.StreamExt.html#method.filter_map
 [driver]: https://rust-doc.vector.dev/vector_core/stream/struct.driver
+[grouped_count_byte_size]: https://rust-doc.vector.dev/vector_common/request_metadata/enum.groupedcountbytesize
diff --git a/lib/codecs/Cargo.toml b/lib/codecs/Cargo.toml
index 612951fc488cc..3914aa99553e5 100644
--- a/lib/codecs/Cargo.toml
+++ b/lib/codecs/Cargo.toml
@@ -6,7 +6,7 @@ edition = "2021"
 publish = false
 
 [dependencies]
-apache-avro = { version = "0.14.0", default-features = false }
+apache-avro = { version = "0.15.0", default-features = false }
 bytes = { version = "1", default-features = false }
 chrono = { version = "0.4", default-features = false }
 csv = { version = "1.2", default-features = false }
@@ -19,13 +19,14 @@ once_cell = { version = "1.18", default-features = false }
 ordered-float = { version = "3.7.0", default-features = false }
 prometheus-remote-write = { version = "1.1", tag =  "v1.1.3", git = "ssh://git@github.com/answerbook/prometheus-remote-write-rs.git" }
 prost = { version = "0.11.8", default-features = false, features = ["std"] }
-regex = { version = "1.8.4", default-features = false, features = ["std", "perf"] }
+prost-reflect = { version = "0.11", default-features = false, features = ["serde"] }
+regex = { version = "1.9.3", default-features = false, features = ["std", "perf"] }
 serde = { version = "1", default-features = false, features = ["derive"] }
 serde_json = { version = "1", default-features = false }
 smallvec = { version = "1", default-features = false, features = ["union"] }
-snafu = { version = "0.7.4", default-features = false, features = ["futures"] }
+snafu = { version = "0.7.5", default-features = false, features = ["futures"] }
 snap = "1"
-syslog_loose = { version = "0.18", default-features = false, optional = true }
+syslog_loose = { version = "0.19", default-features = false, optional = true }
 tokio-util = { version = "0.7", default-features = false, features = ["codec"] }
 tracing = { version = "0.1", default-features = false }
 vrl.workspace = true
diff --git a/lib/codecs/src/decoding/format/bytes.rs b/lib/codecs/src/decoding/format/bytes.rs
index e27df861cf1e0..06a97b67c2950 100644
--- a/lib/codecs/src/decoding/format/bytes.rs
+++ b/lib/codecs/src/decoding/format/bytes.rs
@@ -1,9 +1,9 @@
 use bytes::Bytes;
-use lookup::lookup_v2::parse_value_path;
 use lookup::OwnedTargetPath;
 use serde::{Deserialize, Serialize};
 use smallvec::{smallvec, SmallVec};
 use vector_core::config::LogNamespace;
+use vector_core::schema::meaning;
 use vector_core::{
     config::{log_schema, DataType},
     event::{Event, LogEvent},
@@ -25,7 +25,7 @@ impl BytesDeserializerConfig {
 
     /// Build the `BytesDeserializer` from this configuration.
     pub fn build(&self) -> BytesDeserializer {
-        BytesDeserializer::new()
+        BytesDeserializer
     }
 
     /// Return the type of event build by this deserializer.
@@ -36,11 +36,17 @@ impl BytesDeserializerConfig {
     /// The schema produced by the deserializer.
     pub fn schema_definition(&self, log_namespace: LogNamespace) -> schema::Definition {
         match log_namespace {
-            LogNamespace::Legacy => schema::Definition::empty_legacy_namespace().with_event_field(
-                &parse_value_path(log_schema().message_key()).expect("valid message key"),
-                Kind::bytes(),
-                Some("message"),
-            ),
+            LogNamespace::Legacy => {
+                let definition = schema::Definition::empty_legacy_namespace();
+                if let Some(message_key) = log_schema().message_key() {
+                    return definition.with_event_field(
+                        message_key,
+                        Kind::bytes(),
+                        Some(meaning::MESSAGE),
+                    );
+                }
+                definition
+            }
             LogNamespace::Vector => {
                 schema::Definition::new_with_default_metadata(Kind::bytes(), [log_namespace])
                     .with_meaning(OwnedTargetPath::event_root(), "message")
@@ -54,32 +60,16 @@ impl BytesDeserializerConfig {
 /// This deserializer can be considered as the no-op action for input where no
 /// further decoding has been specified.
 #[derive(Debug, Clone)]
-pub struct BytesDeserializer {
-    // Only used with the "Legacy" namespace. The "Vector" namespace decodes the data at the root of the event.
-    log_schema_message_key: &'static str,
-}
-
-impl Default for BytesDeserializer {
-    fn default() -> Self {
-        Self::new()
-    }
-}
+pub struct BytesDeserializer;
 
 impl BytesDeserializer {
-    /// Creates a new `BytesDeserializer`.
-    pub fn new() -> Self {
-        Self {
-            log_schema_message_key: log_schema().message_key(),
-        }
-    }
-
     /// Deserializes the given bytes, which will always produce a single `LogEvent`.
     pub fn parse_single(&self, bytes: Bytes, log_namespace: LogNamespace) -> LogEvent {
         match log_namespace {
             LogNamespace::Vector => log_namespace.new_log_from_data(bytes),
             LogNamespace::Legacy => {
                 let mut log = LogEvent::default();
-                log.insert(self.log_schema_message_key, bytes);
+                log.maybe_insert(log_schema().message_key_target_path(), bytes);
                 log
             }
         }
@@ -99,15 +89,13 @@ impl Deserializer for BytesDeserializer {
 
 #[cfg(test)]
 mod tests {
-    use vector_core::config::log_schema;
-    use vrl::value::Value;
-
     use super::*;
+    use vrl::value::Value;
 
     #[test]
     fn deserialize_bytes_legacy_namespace() {
         let input = Bytes::from("foo");
-        let deserializer = BytesDeserializer::new();
+        let deserializer = BytesDeserializer;
 
         let events = deserializer.parse(input, LogNamespace::Legacy).unwrap();
         let mut events = events.into_iter();
@@ -115,7 +103,7 @@ mod tests {
         {
             let event = events.next().unwrap();
             let log = event.as_log();
-            assert_eq!(log[log_schema().message_key()], "foo".into());
+            assert_eq!(*log.get_message().unwrap(), "foo".into());
         }
 
         assert_eq!(events.next(), None);
@@ -124,7 +112,7 @@ mod tests {
     #[test]
     fn deserialize_bytes_vector_namespace() {
         let input = Bytes::from("foo");
-        let deserializer = BytesDeserializer::new();
+        let deserializer = BytesDeserializer;
 
         let events = deserializer.parse(input, LogNamespace::Vector).unwrap();
         assert_eq!(events.len(), 1);
diff --git a/lib/codecs/src/decoding/format/gelf.rs b/lib/codecs/src/decoding/format/gelf.rs
index e5b7dbe96c315..eae4c30739880 100644
--- a/lib/codecs/src/decoding/format/gelf.rs
+++ b/lib/codecs/src/decoding/format/gelf.rs
@@ -1,7 +1,7 @@
 use bytes::Bytes;
 use chrono::{DateTime, NaiveDateTime, Utc};
 use derivative::Derivative;
-use lookup::{event_path, owned_value_path, PathPrefix};
+use lookup::{event_path, owned_value_path};
 use serde::{Deserialize, Serialize};
 use smallvec::{smallvec, SmallVec};
 use std::collections::HashMap;
@@ -17,11 +17,12 @@ use vrl::value::kind::Collection;
 use vrl::value::{Kind, Value};
 
 use super::{default_lossy, Deserializer};
+use crate::gelf::GELF_TARGET_PATHS;
 use crate::{gelf_fields::*, VALID_FIELD_REGEX};
 
 /// On GELF decoding behavior:
 ///   Graylog has a relaxed decoding. They are much more lenient than the spec would
-///   suggest. We've elected to take a more strict approach to maintain backwards compatability
+///   suggest. We've elected to take a more strict approach to maintain backwards compatibility
 ///   in the event that we need to change the behavior to be more relaxed, so that prior versions
 ///   of vector will still work with the new relaxed decoding.
 
@@ -123,44 +124,41 @@ impl GelfDeserializer {
             .into());
         }
 
-        log.insert(VERSION, parsed.version.to_string());
-        log.insert(HOST, parsed.host.to_string());
+        log.insert(&GELF_TARGET_PATHS.version, parsed.version.to_string());
+        log.insert(&GELF_TARGET_PATHS.host, parsed.host.to_string());
 
         if let Some(full_message) = &parsed.full_message {
-            log.insert(FULL_MESSAGE, full_message.to_string());
+            log.insert(&GELF_TARGET_PATHS.full_message, full_message.to_string());
         }
 
-        if let Some(timestamp_key) = log_schema().timestamp_key() {
+        if let Some(timestamp_key) = log_schema().timestamp_key_target_path() {
             if let Some(timestamp) = parsed.timestamp {
                 let naive = NaiveDateTime::from_timestamp_opt(
                     f64::trunc(timestamp) as i64,
                     f64::fract(timestamp) as u32,
                 )
                 .expect("invalid timestamp");
-                log.insert(
-                    (PathPrefix::Event, timestamp_key),
-                    DateTime::<Utc>::from_utc(naive, Utc),
-                );
+                log.insert(timestamp_key, DateTime::<Utc>::from_utc(naive, Utc));
                 // per GELF spec- add timestamp if not provided
             } else {
-                log.insert((PathPrefix::Event, timestamp_key), Utc::now());
+                log.insert(timestamp_key, Utc::now());
             }
         }
 
         if let Some(level) = parsed.level {
-            log.insert(LEVEL, level);
+            log.insert(&GELF_TARGET_PATHS.level, level);
         }
         if let Some(facility) = &parsed.facility {
-            log.insert(FACILITY, facility.to_string());
+            log.insert(&GELF_TARGET_PATHS.facility, facility.to_string());
         }
         if let Some(line) = parsed.line {
             log.insert(
-                LINE,
+                &GELF_TARGET_PATHS.line,
                 Value::Float(ordered_float::NotNan::new(line).expect("JSON doesn't allow NaNs")),
             );
         }
         if let Some(file) = &parsed.file {
-            log.insert(FILE, file.to_string());
+            log.insert(&GELF_TARGET_PATHS.file, file.to_string());
         }
 
         if let Some(add) = &parsed.additional_fields {
@@ -293,7 +291,7 @@ mod tests {
             Some(&Value::Bytes(Bytes::from_static(b"example.org")))
         );
         assert_eq!(
-            log.get(log_schema().message_key()),
+            log.get(log_schema().message_key_target_path().unwrap()),
             Some(&Value::Bytes(Bytes::from_static(
                 b"A short message that helps you identify what is going on"
             )))
@@ -348,7 +346,7 @@ mod tests {
             let events = deserialize_gelf_input(&input).unwrap();
             assert_eq!(events.len(), 1);
             let log = events[0].as_log();
-            assert!(log.contains(log_schema().message_key()));
+            assert!(log.contains(log_schema().message_key_target_path().unwrap()));
         }
 
         // filter out id
diff --git a/lib/codecs/src/decoding/format/json.rs b/lib/codecs/src/decoding/format/json.rs
index 67e7bc624bbdf..0906f739b803a 100644
--- a/lib/codecs/src/decoding/format/json.rs
+++ b/lib/codecs/src/decoding/format/json.rs
@@ -3,7 +3,6 @@ use std::convert::TryInto;
 use bytes::Bytes;
 use chrono::Utc;
 use derivative::Derivative;
-use lookup::PathPrefix;
 use smallvec::{smallvec, SmallVec};
 use vector_config::configurable_component;
 use vector_core::{
@@ -133,11 +132,11 @@ impl Deserializer for JsonDeserializer {
             LogNamespace::Legacy => {
                 let timestamp = Utc::now();
 
-                if let Some(timestamp_key) = log_schema().timestamp_key() {
+                if let Some(timestamp_key) = log_schema().timestamp_key_target_path() {
                     for event in &mut events {
                         let log = event.as_mut_log();
-                        if !log.contains((PathPrefix::Event, timestamp_key)) {
-                            log.insert((PathPrefix::Event, timestamp_key), timestamp);
+                        if !log.contains(timestamp_key) {
+                            log.insert(timestamp_key, timestamp);
                         }
                     }
                 }
@@ -218,7 +217,7 @@ mod tests {
                 let log = event.as_log();
                 assert_eq!(log["bar"], 456.into());
                 assert_eq!(
-                    log.get((PathPrefix::Event, log_schema().timestamp_key().unwrap()))
+                    log.get(log_schema().timestamp_key_target_path().unwrap())
                         .is_some(),
                     namespace == LogNamespace::Legacy
                 );
diff --git a/lib/codecs/src/decoding/format/mezmo/open_telemetry/log_parser.rs b/lib/codecs/src/decoding/format/mezmo/open_telemetry/log_parser.rs
index 5f2aa5432942a..ef1eb37db0ad9 100644
--- a/lib/codecs/src/decoding/format/mezmo/open_telemetry/log_parser.rs
+++ b/lib/codecs/src/decoding/format/mezmo/open_telemetry/log_parser.rs
@@ -170,7 +170,7 @@ pub fn to_events(log_request: ExportLogsServiceRequest) -> SmallVec<[Event; 1]>
                             Value::from(metadata),
                         ),
                         // Add the actual line
-                        (log_schema().message_key().to_string(), line),
+                        (log_schema().message_key().unwrap().to_string(), line),
                     ]);
 
                     // Wrap line in mezmo format
diff --git a/lib/codecs/src/decoding/format/mezmo/open_telemetry/trace_parser.rs b/lib/codecs/src/decoding/format/mezmo/open_telemetry/trace_parser.rs
index ae5e7de5f6385..560eb4b820884 100644
--- a/lib/codecs/src/decoding/format/mezmo/open_telemetry/trace_parser.rs
+++ b/lib/codecs/src/decoding/format/mezmo/open_telemetry/trace_parser.rs
@@ -260,7 +260,10 @@ pub fn to_events(trace_request: ExportTraceServiceRequest) -> SmallVec<[Event; 1
                     user_metadata.insert("attributes".to_string(), filtered_attributes);
 
                     let log_line = BTreeMap::from_iter([
-                        (log_schema().message_key().to_string(), message.into()),
+                        (
+                            log_schema().message_key().unwrap().to_string(),
+                            message.into(),
+                        ),
                         (
                             log_schema().user_metadata_key().to_string(),
                             user_metadata.into(),
diff --git a/lib/codecs/src/decoding/format/mod.rs b/lib/codecs/src/decoding/format/mod.rs
index 76942d49af244..61a42a0a6eb81 100644
--- a/lib/codecs/src/decoding/format/mod.rs
+++ b/lib/codecs/src/decoding/format/mod.rs
@@ -8,6 +8,7 @@ mod gelf;
 mod json;
 mod native;
 mod native_json;
+mod protobuf;
 #[cfg(feature = "syslog")]
 mod syslog;
 
@@ -25,6 +26,7 @@ pub use native::{NativeDeserializer, NativeDeserializerConfig};
 pub use native_json::{
     NativeJsonDeserializer, NativeJsonDeserializerConfig, NativeJsonDeserializerOptions,
 };
+pub use protobuf::{ProtobufDeserializer, ProtobufDeserializerConfig};
 use smallvec::SmallVec;
 #[cfg(feature = "syslog")]
 pub use syslog::{SyslogDeserializer, SyslogDeserializerConfig, SyslogDeserializerOptions};
diff --git a/lib/codecs/src/decoding/format/native.rs b/lib/codecs/src/decoding/format/native.rs
index 1f47414e103f5..5258e96e6f282 100644
--- a/lib/codecs/src/decoding/format/native.rs
+++ b/lib/codecs/src/decoding/format/native.rs
@@ -19,7 +19,7 @@ pub struct NativeDeserializerConfig;
 impl NativeDeserializerConfig {
     /// Build the `NativeDeserializer` from this configuration.
     pub fn build(&self) -> NativeDeserializer {
-        NativeDeserializer::default()
+        NativeDeserializer
     }
 
     /// Return the type of event build by this deserializer.
diff --git a/lib/codecs/src/decoding/format/protobuf.rs b/lib/codecs/src/decoding/format/protobuf.rs
new file mode 100644
index 0000000000000..71bd98c1567fa
--- /dev/null
+++ b/lib/codecs/src/decoding/format/protobuf.rs
@@ -0,0 +1,366 @@
+use std::collections::BTreeMap;
+use std::fs;
+use std::path::PathBuf;
+
+use bytes::Bytes;
+use chrono::Utc;
+use derivative::Derivative;
+use ordered_float::NotNan;
+use prost_reflect::{DescriptorPool, DynamicMessage, MessageDescriptor, ReflectMessage};
+use smallvec::{smallvec, SmallVec};
+use vector_config::configurable_component;
+use vector_core::event::LogEvent;
+use vector_core::{
+    config::{log_schema, DataType, LogNamespace},
+    event::Event,
+    schema,
+};
+use vrl::value::Kind;
+
+use super::Deserializer;
+
+/// Config used to build a `ProtobufDeserializer`.
+#[configurable_component]
+#[derive(Debug, Clone, Default)]
+pub struct ProtobufDeserializerConfig {
+    /// Protobuf-specific decoding options.
+    #[serde(
+        default,
+        skip_serializing_if = "vector_core::serde::skip_serializing_if_default"
+    )]
+    pub protobuf: ProtobufDeserializerOptions,
+}
+
+impl ProtobufDeserializerConfig {
+    /// Build the `ProtobufDeserializer` from this configuration.
+    pub fn build(&self) -> vector_common::Result<ProtobufDeserializer> {
+        ProtobufDeserializer::try_from(self)
+    }
+
+    /// Return the type of event build by this deserializer.
+    pub fn output_type(&self) -> DataType {
+        DataType::Log
+    }
+
+    /// The schema produced by the deserializer.
+    pub fn schema_definition(&self, log_namespace: LogNamespace) -> schema::Definition {
+        match log_namespace {
+            LogNamespace::Legacy => {
+                let mut definition =
+                    schema::Definition::empty_legacy_namespace().unknown_fields(Kind::any());
+
+                if let Some(timestamp_key) = log_schema().timestamp_key() {
+                    definition = definition.try_with_field(
+                        timestamp_key,
+                        // The protobuf decoder will try to insert a new `timestamp`-type value into the
+                        // "timestamp_key" field, but only if that field doesn't already exist.
+                        Kind::any().or_timestamp(),
+                        Some("timestamp"),
+                    );
+                }
+                definition
+            }
+            LogNamespace::Vector => {
+                schema::Definition::new_with_default_metadata(Kind::any(), [log_namespace])
+            }
+        }
+    }
+}
+
+/// Protobuf-specific decoding options.
+#[configurable_component]
+#[derive(Debug, Clone, PartialEq, Eq, Derivative)]
+#[derivative(Default)]
+pub struct ProtobufDeserializerOptions {
+    /// Path to desc file
+    desc_file: PathBuf,
+
+    /// message type. e.g package.message
+    message_type: String,
+}
+
+/// Deserializer that builds `Event`s from a byte frame containing protobuf.
+#[derive(Debug, Clone)]
+pub struct ProtobufDeserializer {
+    message_descriptor: MessageDescriptor,
+}
+
+impl ProtobufDeserializer {
+    /// Creates a new `ProtobufDeserializer`.
+    pub fn new(message_descriptor: MessageDescriptor) -> Self {
+        Self { message_descriptor }
+    }
+
+    fn get_message_descriptor(
+        desc_file: &PathBuf,
+        message_type: String,
+    ) -> vector_common::Result<MessageDescriptor> {
+        let b = fs::read(desc_file)
+            .map_err(|e| format!("Failed to open protobuf desc file '{desc_file:?}': {e}",))?;
+        let pool = DescriptorPool::decode(b.as_slice())
+            .map_err(|e| format!("Failed to parse protobuf desc file '{desc_file:?}': {e}"))?;
+        Ok(pool.get_message_by_name(&message_type).unwrap_or_else(|| {
+            panic!("The message type '{message_type}' could not be found in '{desc_file:?}'")
+        }))
+    }
+}
+
+impl Deserializer for ProtobufDeserializer {
+    fn parse(
+        &self,
+        bytes: Bytes,
+        log_namespace: LogNamespace,
+    ) -> vector_common::Result<SmallVec<[Event; 1]>> {
+        let dynamic_message = DynamicMessage::decode(self.message_descriptor.clone(), bytes)
+            .map_err(|error| format!("Error parsing protobuf: {:?}", error))?;
+
+        let proto_vrl = to_vrl(&prost_reflect::Value::Message(dynamic_message), None)?;
+        let mut event = Event::Log(LogEvent::from(proto_vrl));
+        let event = match log_namespace {
+            LogNamespace::Vector => event,
+            LogNamespace::Legacy => {
+                let timestamp = Utc::now();
+                if let Some(timestamp_key) = log_schema().timestamp_key_target_path() {
+                    let log = event.as_mut_log();
+                    if !log.contains(timestamp_key) {
+                        log.insert(timestamp_key, timestamp);
+                    }
+                }
+                event
+            }
+        };
+
+        Ok(smallvec![event])
+    }
+}
+
+impl TryFrom<&ProtobufDeserializerConfig> for ProtobufDeserializer {
+    type Error = vector_common::Error;
+    fn try_from(config: &ProtobufDeserializerConfig) -> vector_common::Result<Self> {
+        let message_descriptor = ProtobufDeserializer::get_message_descriptor(
+            &config.protobuf.desc_file,
+            config.protobuf.message_type.clone(),
+        )?;
+        Ok(Self::new(message_descriptor))
+    }
+}
+
+fn to_vrl(
+    prost_reflect_value: &prost_reflect::Value,
+    field_descriptor: Option<&prost_reflect::FieldDescriptor>,
+) -> vector_common::Result<vrl::value::Value> {
+    let vrl_value = match prost_reflect_value {
+        prost_reflect::Value::Bool(v) => vrl::value::Value::from(*v),
+        prost_reflect::Value::I32(v) => vrl::value::Value::from(*v),
+        prost_reflect::Value::I64(v) => vrl::value::Value::from(*v),
+        prost_reflect::Value::U32(v) => vrl::value::Value::from(*v),
+        prost_reflect::Value::U64(v) => vrl::value::Value::from(*v),
+        prost_reflect::Value::F32(v) => vrl::value::Value::Float(
+            NotNan::new(f64::from(*v)).map_err(|_e| "Float number cannot be Nan")?,
+        ),
+        prost_reflect::Value::F64(v) => {
+            vrl::value::Value::Float(NotNan::new(*v).map_err(|_e| "F64 number cannot be Nan")?)
+        }
+        prost_reflect::Value::String(v) => vrl::value::Value::from(v.as_str()),
+        prost_reflect::Value::Bytes(v) => vrl::value::Value::from(v.clone()),
+        prost_reflect::Value::EnumNumber(v) => {
+            if let Some(field_descriptor) = field_descriptor {
+                let kind = field_descriptor.kind();
+                let enum_desc = kind.as_enum().ok_or_else(|| {
+                    format!(
+                        "Internal error while parsing protobuf enum. Field descriptor: {:?}",
+                        field_descriptor
+                    )
+                })?;
+                vrl::value::Value::from(
+                    enum_desc
+                        .get_value(*v)
+                        .ok_or_else(|| {
+                            format!("The number {} cannot be in '{}'", v, enum_desc.name())
+                        })?
+                        .name(),
+                )
+            } else {
+                Err("Expected valid field descriptor")?
+            }
+        }
+        prost_reflect::Value::Message(v) => {
+            let mut obj_map = BTreeMap::new();
+            for field_desc in v.descriptor().fields() {
+                let field_value = v.get_field(&field_desc);
+                let out = to_vrl(field_value.as_ref(), Some(&field_desc))?;
+                obj_map.insert(field_desc.name().to_string(), out);
+            }
+            vrl::value::Value::from(obj_map)
+        }
+        prost_reflect::Value::List(v) => {
+            let vec = v
+                .iter()
+                .map(|o| to_vrl(o, field_descriptor))
+                .collect::<Result<Vec<_>, vector_common::Error>>()?;
+            vrl::value::Value::from(vec)
+        }
+        prost_reflect::Value::Map(v) => {
+            if let Some(field_descriptor) = field_descriptor {
+                let kind = field_descriptor.kind();
+                let message_desc = kind.as_message().ok_or_else(|| {
+                    format!(
+                        "Internal error while parsing protobuf field descriptor: {:?}",
+                        field_descriptor
+                    )
+                })?;
+                vrl::value::Value::from(
+                    v.iter()
+                        .map(|kv| {
+                            Ok((
+                                kv.0.as_str()
+                                    .ok_or_else(|| {
+                                        format!(
+                                            "Internal error while parsing protobuf map. Field descriptor: {:?}",
+                                            field_descriptor
+                                        )
+                                    })?
+                                    .to_string(),
+                                to_vrl(kv.1, Some(&message_desc.map_entry_value_field()))?,
+                            ))
+                        })
+                        .collect::<vector_common::Result<BTreeMap<String, _>>>()?,
+                )
+            } else {
+                Err("Expected valid field descriptor")?
+            }
+        }
+    };
+    Ok(vrl_value)
+}
+
+#[cfg(test)]
+mod tests {
+    // TODO: add test for bad file path & invalid message_type
+
+    use std::path::PathBuf;
+    use std::{env, fs};
+    use vector_core::config::log_schema;
+
+    use super::*;
+
+    fn test_data_dir() -> PathBuf {
+        PathBuf::from(env::var_os("CARGO_MANIFEST_DIR").unwrap())
+            .join("tests/data/decoding/protobuf")
+    }
+
+    fn parse_and_validate(
+        protobuf_bin_message: String,
+        protobuf_desc_path: PathBuf,
+        message_type: &str,
+        validate_log: fn(&LogEvent),
+    ) {
+        let input = Bytes::from(protobuf_bin_message);
+        let message_descriptor = ProtobufDeserializer::get_message_descriptor(
+            &protobuf_desc_path,
+            message_type.to_string(),
+        )
+        .unwrap();
+        let deserializer = ProtobufDeserializer::new(message_descriptor);
+
+        for namespace in [LogNamespace::Legacy, LogNamespace::Vector] {
+            let events = deserializer.parse(input.clone(), namespace).unwrap();
+            let mut events = events.into_iter();
+
+            {
+                let event = events.next().unwrap();
+                let log = event.as_log();
+                validate_log(log);
+                assert_eq!(
+                    log.get(log_schema().timestamp_key_target_path().unwrap())
+                        .is_some(),
+                    namespace == LogNamespace::Legacy
+                );
+            }
+
+            assert_eq!(events.next(), None);
+        }
+    }
+
+    #[test]
+    fn deserialize_protobuf() {
+        let protobuf_bin_message_path = test_data_dir().join("person_someone.pb");
+        let protobuf_desc_path = test_data_dir().join("test_protobuf.desc");
+        let message_type = "test_protobuf.Person";
+        let validate_log = |log: &LogEvent| {
+            assert_eq!(log["name"], "someone".into());
+            assert_eq!(
+                log["phones"].as_array().unwrap()[0].as_object().unwrap()["number"]
+                    .as_str()
+                    .unwrap(),
+                "123456"
+            );
+        };
+
+        parse_and_validate(
+            fs::read_to_string(protobuf_bin_message_path).unwrap(),
+            protobuf_desc_path,
+            message_type,
+            validate_log,
+        );
+    }
+
+    #[test]
+    fn deserialize_protobuf3() {
+        let protobuf_bin_message_path = test_data_dir().join("person_someone3.pb");
+        let protobuf_desc_path = test_data_dir().join("test_protobuf3.desc");
+        let message_type = "test_protobuf3.Person";
+        let validate_log = |log: &LogEvent| {
+            assert_eq!(log["name"], "someone".into());
+            assert_eq!(
+                log["phones"].as_array().unwrap()[0].as_object().unwrap()["number"]
+                    .as_str()
+                    .unwrap(),
+                "1234"
+            );
+            assert_eq!(
+                log["data"].as_object().unwrap()["data_phone"],
+                "HOME".into()
+            );
+        };
+
+        parse_and_validate(
+            fs::read_to_string(protobuf_bin_message_path).unwrap(),
+            protobuf_desc_path,
+            message_type,
+            validate_log,
+        );
+    }
+
+    #[test]
+    fn deserialize_empty_buffer() {
+        let protobuf_bin_message = "".to_string();
+        let protobuf_desc_path = test_data_dir().join("test_protobuf.desc");
+        let message_type = "test_protobuf.Person";
+        let validate_log = |log: &LogEvent| {
+            assert_eq!(log["name"], "".into());
+        };
+
+        parse_and_validate(
+            protobuf_bin_message,
+            protobuf_desc_path,
+            message_type,
+            validate_log,
+        );
+    }
+
+    #[test]
+    fn deserialize_error_invalid_protobuf() {
+        let input = Bytes::from("{ foo");
+        let message_descriptor = ProtobufDeserializer::get_message_descriptor(
+            &test_data_dir().join("test_protobuf.desc"),
+            "test_protobuf.Person".to_string(),
+        )
+        .unwrap();
+        let deserializer = ProtobufDeserializer::new(message_descriptor);
+
+        for namespace in [LogNamespace::Legacy, LogNamespace::Vector] {
+            assert!(deserializer.parse(input.clone(), namespace).is_err());
+        }
+    }
+}
diff --git a/lib/codecs/src/decoding/format/syslog.rs b/lib/codecs/src/decoding/format/syslog.rs
index 336d7c1aa232f..041d6a4c93cc6 100644
--- a/lib/codecs/src/decoding/format/syslog.rs
+++ b/lib/codecs/src/decoding/format/syslog.rs
@@ -1,12 +1,11 @@
 use bytes::Bytes;
 use chrono::{DateTime, Datelike, Utc};
 use derivative::Derivative;
-use lookup::lookup_v2::parse_value_path;
-use lookup::{event_path, owned_value_path, OwnedTargetPath, OwnedValuePath, PathPrefix};
+use lookup::{event_path, owned_value_path, OwnedTargetPath, OwnedValuePath};
 use smallvec::{smallvec, SmallVec};
 use std::borrow::Cow;
 use std::collections::BTreeMap;
-use syslog_loose::{IncompleteDate, Message, ProcId, Protocol};
+use syslog_loose::{IncompleteDate, Message, ProcId, Protocol, Variant};
 use vector_config::configurable_component;
 use vector_core::config::{LegacyKey, LogNamespace};
 use vector_core::{
@@ -71,7 +70,7 @@ impl SyslogDeserializerConfig {
                     // The `message` field is always defined. If parsing fails, the entire body becomes the
                     // message.
                     .with_event_field(
-                        &parse_value_path(log_schema().message_key()).expect("valid message key"),
+                        log_schema().message_key().expect("valid message key"),
                         Kind::bytes(),
                         Some("message"),
                     );
@@ -283,7 +282,8 @@ impl Deserializer for SyslogDeserializer {
             false => Cow::from(std::str::from_utf8(&bytes)?),
         };
         let line = line.trim();
-        let parsed = syslog_loose::parse_message_with_year_exact(line, resolve_year)?;
+        let parsed =
+            syslog_loose::parse_message_with_year_exact(line, resolve_year, Variant::Either)?;
 
         let log = match (self.source, log_namespace) {
             (Some(source), LogNamespace::Vector) => {
@@ -429,7 +429,7 @@ fn insert_fields_from_syslog(
 ) {
     match log_namespace {
         LogNamespace::Legacy => {
-            log.insert(event_path!(log_schema().message_key()), parsed.msg);
+            log.maybe_insert(log_schema().message_key_target_path(), parsed.msg);
         }
         LogNamespace::Vector => {
             log.insert(event_path!("message"), parsed.msg);
@@ -440,9 +440,7 @@ fn insert_fields_from_syslog(
         let timestamp = DateTime::<Utc>::from(timestamp);
         match log_namespace {
             LogNamespace::Legacy => {
-                if let Some(timestamp_key) = log_schema().timestamp_key() {
-                    log.insert((PathPrefix::Event, timestamp_key), timestamp);
-                }
+                log.maybe_insert(log_schema().timestamp_key_target_path(), timestamp);
             }
             LogNamespace::Vector => {
                 log.insert(event_path!("timestamp"), timestamp);
@@ -486,9 +484,8 @@ fn insert_fields_from_syslog(
 
 #[cfg(test)]
 mod tests {
-    use vector_core::config::{init_log_schema, log_schema, LogSchema};
-
     use super::*;
+    use vector_core::config::{init_log_schema, log_schema, LogSchema};
 
     #[test]
     fn deserialize_syslog_legacy_namespace() {
@@ -500,7 +497,10 @@ mod tests {
 
         let events = deserializer.parse(input, LogNamespace::Legacy).unwrap();
         assert_eq!(events.len(), 1);
-        assert_eq!(events[0].as_log()[log_schema().message_key()], "MSG".into());
+        assert_eq!(
+            events[0].as_log()[log_schema().message_key().unwrap().to_string()],
+            "MSG".into()
+        );
         assert!(
             events[0].as_log()[log_schema().timestamp_key().unwrap().to_string()].is_timestamp()
         );
@@ -522,8 +522,12 @@ mod tests {
 
     fn init() {
         let mut schema = LogSchema::default();
-        schema.set_message_key("legacy_message".to_string());
-        schema.set_message_key("legacy_timestamp".to_string());
+        schema.set_message_key(Some(OwnedTargetPath::event(owned_value_path!(
+            "legacy_message"
+        ))));
+        schema.set_message_key(Some(OwnedTargetPath::event(owned_value_path!(
+            "legacy_timestamp"
+        ))));
         init_log_schema(schema, false);
     }
 }
diff --git a/lib/codecs/src/decoding/mod.rs b/lib/codecs/src/decoding/mod.rs
index 5af56aed89de6..c7acefc17919d 100644
--- a/lib/codecs/src/decoding/mod.rs
+++ b/lib/codecs/src/decoding/mod.rs
@@ -12,6 +12,7 @@ pub use format::{
     GelfDeserializerConfig, GelfDeserializerOptions, JsonDeserializer, JsonDeserializerConfig,
     JsonDeserializerOptions, MezmoDeserializer, NativeDeserializer, NativeDeserializerConfig,
     NativeJsonDeserializer, NativeJsonDeserializerConfig, NativeJsonDeserializerOptions,
+    ProtobufDeserializer, ProtobufDeserializerConfig,
 };
 #[cfg(feature = "syslog")]
 pub use format::{SyslogDeserializer, SyslogDeserializerConfig, SyslogDeserializerOptions};
@@ -200,6 +201,11 @@ pub enum DeserializerConfig {
     /// [json]: https://www.json.org/
     Json(JsonDeserializerConfig),
 
+    /// Decodes the raw bytes as [protobuf][protobuf].
+    ///
+    /// [protobuf]: https://protobuf.dev/
+    Protobuf(ProtobufDeserializerConfig),
+
     #[cfg(feature = "syslog")]
     /// Decodes the raw bytes as a Syslog message.
     ///
@@ -277,16 +283,19 @@ impl From<NativeJsonDeserializerConfig> for DeserializerConfig {
 
 impl DeserializerConfig {
     /// Build the `Deserializer` from this configuration.
-    pub fn build(&self) -> Deserializer {
+    pub fn build(&self) -> vector_common::Result<Deserializer> {
         match self {
-            DeserializerConfig::Bytes => Deserializer::Bytes(BytesDeserializerConfig.build()),
-            DeserializerConfig::Json(config) => Deserializer::Json(config.build()),
+            DeserializerConfig::Bytes => Ok(Deserializer::Bytes(BytesDeserializerConfig.build())),
+            DeserializerConfig::Json(config) => Ok(Deserializer::Json(config.build())),
+            DeserializerConfig::Protobuf(config) => Ok(Deserializer::Protobuf(config.build()?)),
             #[cfg(feature = "syslog")]
-            DeserializerConfig::Syslog(config) => Deserializer::Syslog(config.build()),
-            DeserializerConfig::Native => Deserializer::Native(NativeDeserializerConfig.build()),
-            DeserializerConfig::NativeJson(config) => Deserializer::NativeJson(config.build()),
-            DeserializerConfig::Gelf(config) => Deserializer::Gelf(config.build()),
-            DeserializerConfig::Mezmo(config) => Deserializer::Boxed(config.build()),
+            DeserializerConfig::Syslog(config) => Ok(Deserializer::Syslog(config.build())),
+            DeserializerConfig::Native => {
+                Ok(Deserializer::Native(NativeDeserializerConfig.build()))
+            }
+            DeserializerConfig::NativeJson(config) => Ok(Deserializer::NativeJson(config.build())),
+            DeserializerConfig::Gelf(config) => Ok(Deserializer::Gelf(config.build())),
+            DeserializerConfig::Mezmo(config) => Ok(Deserializer::Boxed(config.build())),
         }
     }
 
@@ -300,6 +309,7 @@ impl DeserializerConfig {
             | DeserializerConfig::NativeJson(_) => {
                 FramingConfig::NewlineDelimited(Default::default())
             }
+            DeserializerConfig::Protobuf(_) => FramingConfig::Bytes,
             #[cfg(feature = "syslog")]
             DeserializerConfig::Syslog(_) => FramingConfig::NewlineDelimited(Default::default()),
             DeserializerConfig::Mezmo(config) => config.default_stream_framing(),
@@ -311,6 +321,7 @@ impl DeserializerConfig {
         match self {
             DeserializerConfig::Bytes => BytesDeserializerConfig.output_type(),
             DeserializerConfig::Json(config) => config.output_type(),
+            DeserializerConfig::Protobuf(config) => config.output_type(),
             #[cfg(feature = "syslog")]
             DeserializerConfig::Syslog(config) => config.output_type(),
             DeserializerConfig::Native => NativeDeserializerConfig.output_type(),
@@ -325,6 +336,7 @@ impl DeserializerConfig {
         match self {
             DeserializerConfig::Bytes => BytesDeserializerConfig.schema_definition(log_namespace),
             DeserializerConfig::Json(config) => config.schema_definition(log_namespace),
+            DeserializerConfig::Protobuf(config) => config.schema_definition(log_namespace),
             #[cfg(feature = "syslog")]
             DeserializerConfig::Syslog(config) => config.schema_definition(log_namespace),
             DeserializerConfig::Native => NativeDeserializerConfig.schema_definition(log_namespace),
@@ -354,6 +366,7 @@ impl DeserializerConfig {
                 }),
             ) => "application/json",
             (DeserializerConfig::Native, _) => "application/octet-stream",
+            (DeserializerConfig::Protobuf(_), _) => "application/octet-stream",
             (
                 DeserializerConfig::Json(_)
                 | DeserializerConfig::NativeJson(_)
@@ -375,6 +388,8 @@ pub enum Deserializer {
     Bytes(BytesDeserializer),
     /// Uses a `JsonDeserializer` for deserialization.
     Json(JsonDeserializer),
+    /// Uses a `ProtobufDeserializer` for deserialization.
+    Protobuf(ProtobufDeserializer),
     #[cfg(feature = "syslog")]
     /// Uses a `SyslogDeserializer` for deserialization.
     Syslog(SyslogDeserializer),
@@ -397,6 +412,7 @@ impl format::Deserializer for Deserializer {
         match self {
             Deserializer::Bytes(deserializer) => deserializer.parse(bytes, log_namespace),
             Deserializer::Json(deserializer) => deserializer.parse(bytes, log_namespace),
+            Deserializer::Protobuf(deserializer) => deserializer.parse(bytes, log_namespace),
             #[cfg(feature = "syslog")]
             Deserializer::Syslog(deserializer) => deserializer.parse(bytes, log_namespace),
             Deserializer::Native(deserializer) => deserializer.parse(bytes, log_namespace),
diff --git a/lib/codecs/src/encoding/format/common.rs b/lib/codecs/src/encoding/format/common.rs
new file mode 100644
index 0000000000000..44d7b3e44c88b
--- /dev/null
+++ b/lib/codecs/src/encoding/format/common.rs
@@ -0,0 +1,12 @@
+use vector_core::config::log_schema;
+use vector_core::schema;
+use vrl::value::Kind;
+
+/// Inspect the global log schema and create a schema requirement.
+pub fn get_serializer_schema_requirement() -> schema::Requirement {
+    if let Some(message_key) = log_schema().message_key() {
+        schema::Requirement::empty().required_meaning(message_key.to_string(), Kind::any())
+    } else {
+        schema::Requirement::empty()
+    }
+}
diff --git a/lib/codecs/src/encoding/format/gelf.rs b/lib/codecs/src/encoding/format/gelf.rs
index 3a0c6d0461991..1c12ee5f1dc30 100644
--- a/lib/codecs/src/encoding/format/gelf.rs
+++ b/lib/codecs/src/encoding/format/gelf.rs
@@ -1,3 +1,4 @@
+use crate::gelf::GELF_TARGET_PATHS;
 use crate::{gelf_fields::*, VALID_FIELD_REGEX};
 use bytes::{BufMut, BytesMut};
 use lookup::event_path;
@@ -15,7 +16,7 @@ use vector_core::{
 
 /// On GELF encoding behavior:
 ///   Graylog has a relaxed parsing. They are much more lenient than the spec would
-///   suggest. We've elected to take a more strict approach to maintain backwards compatability
+///   suggest. We've elected to take a more strict approach to maintain backwards compatibility
 ///   in the event that we need to change the behavior to be more relaxed, so that prior versions
 ///   of vector will still work.
 ///   The exception is that if 'Additional fields' are found to be missing an underscore prefix and
@@ -130,21 +131,21 @@ fn coerce_required_fields(mut log: LogEvent) -> vector_common::Result<LogEvent>
     }
 
     // add the VERSION if it does not exist
-    if !log.contains(VERSION) {
-        log.insert(VERSION, GELF_VERSION);
+    if !log.contains(&GELF_TARGET_PATHS.version) {
+        log.insert(&GELF_TARGET_PATHS.version, GELF_VERSION);
     }
 
-    if !log.contains(HOST) {
+    if !log.contains(&GELF_TARGET_PATHS.host) {
         err_missing_field(HOST)?;
     }
 
-    let message_key = log_schema().message_key();
-    if !log.contains(SHORT_MESSAGE) {
-        // rename the log_schema().message_key() to SHORT_MESSAGE
-        if log.contains(message_key) {
-            log.rename_key(message_key, SHORT_MESSAGE);
-        } else {
-            err_missing_field(SHORT_MESSAGE)?;
+    if !log.contains(&GELF_TARGET_PATHS.short_message) {
+        if let Some(message_key) = log_schema().message_key_target_path() {
+            if log.contains(message_key) {
+                log.rename_key(message_key, &GELF_TARGET_PATHS.short_message);
+            } else {
+                err_missing_field(SHORT_MESSAGE)?;
+            }
         }
     }
     Ok(log)
@@ -329,7 +330,7 @@ mod tests {
             let event_fields = btreemap! {
                 VERSION => "1.1",
                 HOST => "example.org",
-                log_schema().message_key() => "Some message",
+                log_schema().message_key().unwrap().to_string() => "Some message",
             };
 
             let jsn = do_serialize(true, event_fields).unwrap();
diff --git a/lib/codecs/src/encoding/format/mod.rs b/lib/codecs/src/encoding/format/mod.rs
index 1d4e008380516..efff723f65b46 100644
--- a/lib/codecs/src/encoding/format/mod.rs
+++ b/lib/codecs/src/encoding/format/mod.rs
@@ -4,6 +4,7 @@
 #![deny(missing_docs)]
 
 mod avro;
+mod common;
 mod csv;
 mod gelf;
 mod json;
diff --git a/lib/codecs/src/encoding/format/raw_message.rs b/lib/codecs/src/encoding/format/raw_message.rs
index b955ae8355dc6..1f341295c12ea 100644
--- a/lib/codecs/src/encoding/format/raw_message.rs
+++ b/lib/codecs/src/encoding/format/raw_message.rs
@@ -1,12 +1,8 @@
+use crate::encoding::format::common::get_serializer_schema_requirement;
 use bytes::{BufMut, BytesMut};
 use serde::{Deserialize, Serialize};
 use tokio_util::codec::Encoder;
-use vector_core::{
-    config::{log_schema, DataType},
-    event::Event,
-    schema,
-};
-use vrl::value::Kind;
+use vector_core::{config::DataType, event::Event, schema};
 
 /// Config used to build a `RawMessageSerializer`.
 #[derive(Debug, Clone, Default, Deserialize, Serialize)]
@@ -30,7 +26,7 @@ impl RawMessageSerializerConfig {
 
     /// The schema required by the serializer.
     pub fn schema_requirement(&self) -> schema::Requirement {
-        schema::Requirement::empty().required_meaning(log_schema().message_key(), Kind::any())
+        get_serializer_schema_requirement()
     }
 }
 
@@ -49,18 +45,10 @@ impl Encoder<Event> for RawMessageSerializer {
     type Error = vector_common::Error;
 
     fn encode(&mut self, event: Event, buffer: &mut BytesMut) -> Result<(), Self::Error> {
-        let message_key = log_schema().message_key();
-
         let log = event.as_log();
-
-        if let Some(bytes) = log
-            .get_by_meaning(message_key)
-            .or_else(|| log.get(message_key))
-            .map(|value| value.coerce_to_bytes())
-        {
+        if let Some(bytes) = log.get_message().map(|value| value.coerce_to_bytes()) {
             buffer.put(bytes);
         }
-
         Ok(())
     }
 }
diff --git a/lib/codecs/src/encoding/format/text.rs b/lib/codecs/src/encoding/format/text.rs
index 0b9e49a44b976..3820c606da2b7 100644
--- a/lib/codecs/src/encoding/format/text.rs
+++ b/lib/codecs/src/encoding/format/text.rs
@@ -1,11 +1,7 @@
+use crate::encoding::format::common::get_serializer_schema_requirement;
 use bytes::{BufMut, BytesMut};
 use tokio_util::codec::Encoder;
-use vector_core::{
-    config::{log_schema, DataType},
-    event::Event,
-    schema,
-};
-use vrl::value::Kind;
+use vector_core::{config::DataType, event::Event, schema};
 
 use crate::MetricTagValues;
 
@@ -42,7 +38,7 @@ impl TextSerializerConfig {
 
     /// The schema required by the serializer.
     pub fn schema_requirement(&self) -> schema::Requirement {
-        schema::Requirement::empty().required_meaning(log_schema().message_key(), Kind::any())
+        get_serializer_schema_requirement()
     }
 }
 
@@ -67,15 +63,9 @@ impl Encoder<Event> for TextSerializer {
     type Error = vector_common::Error;
 
     fn encode(&mut self, event: Event, buffer: &mut BytesMut) -> Result<(), Self::Error> {
-        let message_key = log_schema().message_key();
-
         match event {
             Event::Log(log) => {
-                if let Some(bytes) = log
-                    .get_by_meaning(message_key)
-                    .or_else(|| log.get(message_key))
-                    .map(|value| value.coerce_to_bytes())
-                {
+                if let Some(bytes) = log.get_message().map(|value| value.coerce_to_bytes()) {
                     buffer.put(bytes);
                 }
             }
diff --git a/lib/codecs/src/gelf.rs b/lib/codecs/src/gelf.rs
index d059958f003a1..b78df6cb0e4d9 100644
--- a/lib/codecs/src/gelf.rs
+++ b/lib/codecs/src/gelf.rs
@@ -2,10 +2,11 @@
 
 use once_cell::sync::Lazy;
 use regex::Regex;
+use vrl::owned_value_path;
+use vrl::path::OwnedTargetPath;
 
 /// GELF Message fields. Definitions from <https://docs.graylog.org/docs/gelf>.
 pub mod gelf_fields {
-
     /// (not a field) The latest version of the GELF specification.
     pub const GELF_VERSION: &str = "1.1";
 
@@ -40,6 +41,30 @@ pub mod gelf_fields {
     // < Every field with an underscore (_) prefix will be treated as an additional field. >
 }
 
+/// GELF owned target paths.
+pub(crate) struct GelfTargetPaths {
+    pub version: OwnedTargetPath,
+    pub host: OwnedTargetPath,
+    pub full_message: OwnedTargetPath,
+    pub level: OwnedTargetPath,
+    pub facility: OwnedTargetPath,
+    pub line: OwnedTargetPath,
+    pub file: OwnedTargetPath,
+    pub short_message: OwnedTargetPath,
+}
+
+/// Lazily initialized singleton.
+pub(crate) static GELF_TARGET_PATHS: Lazy<GelfTargetPaths> = Lazy::new(|| GelfTargetPaths {
+    version: OwnedTargetPath::event(owned_value_path!(gelf_fields::VERSION)),
+    host: OwnedTargetPath::event(owned_value_path!(gelf_fields::HOST)),
+    full_message: OwnedTargetPath::event(owned_value_path!(gelf_fields::FULL_MESSAGE)),
+    level: OwnedTargetPath::event(owned_value_path!(gelf_fields::LEVEL)),
+    facility: OwnedTargetPath::event(owned_value_path!(gelf_fields::FACILITY)),
+    line: OwnedTargetPath::event(owned_value_path!(gelf_fields::LINE)),
+    file: OwnedTargetPath::event(owned_value_path!(gelf_fields::FILE)),
+    short_message: OwnedTargetPath::event(owned_value_path!(gelf_fields::SHORT_MESSAGE)),
+});
+
 /// Regex for matching valid field names. Must contain only word chars, periods and dashes.
 /// Additional field names must also be prefixed with an `_` , however that is intentionally
 /// omitted from this regex to be checked separately to create a specific error message.
diff --git a/lib/codecs/tests/data/decoding/protobuf/person_someone.pb b/lib/codecs/tests/data/decoding/protobuf/person_someone.pb
new file mode 100644
index 0000000000000..46b78f47969af
--- /dev/null
+++ b/lib/codecs/tests/data/decoding/protobuf/person_someone.pb
@@ -0,0 +1,3 @@
+
+someone"
+123456
\ No newline at end of file
diff --git a/lib/codecs/tests/data/decoding/protobuf/person_someone.txt b/lib/codecs/tests/data/decoding/protobuf/person_someone.txt
new file mode 100644
index 0000000000000..72e26e70a16df
--- /dev/null
+++ b/lib/codecs/tests/data/decoding/protobuf/person_someone.txt
@@ -0,0 +1,2 @@
+debug print of person_someone.pb with prost
+Person { name: Some("someone"), id: None, email: None, phones: [PhoneNumber { number: Some("123456"), r#type: None }] }
diff --git a/lib/codecs/tests/data/decoding/protobuf/person_someone3.pb b/lib/codecs/tests/data/decoding/protobuf/person_someone3.pb
new file mode 100644
index 0000000000000..80e4ef6f4dfb6
Binary files /dev/null and b/lib/codecs/tests/data/decoding/protobuf/person_someone3.pb differ
diff --git a/lib/codecs/tests/data/decoding/protobuf/person_someone3.txt b/lib/codecs/tests/data/decoding/protobuf/person_someone3.txt
new file mode 100644
index 0000000000000..0a5086c628414
--- /dev/null
+++ b/lib/codecs/tests/data/decoding/protobuf/person_someone3.txt
@@ -0,0 +1,2 @@
+debug print of person_someone3.pb with prost
+Person { name: Some("someone"), id: None, email: None, data: {"data_phone": Home}, phones: [PhoneNumber { number: Some("1234"), r#type: Some(Mobile) }] }
diff --git a/lib/codecs/tests/data/decoding/protobuf/test_protobuf.desc b/lib/codecs/tests/data/decoding/protobuf/test_protobuf.desc
new file mode 100644
index 0000000000000..43e7acf6cf771
Binary files /dev/null and b/lib/codecs/tests/data/decoding/protobuf/test_protobuf.desc differ
diff --git a/lib/codecs/tests/data/decoding/protobuf/test_protobuf.proto b/lib/codecs/tests/data/decoding/protobuf/test_protobuf.proto
new file mode 100644
index 0000000000000..a4cb111f18ec5
--- /dev/null
+++ b/lib/codecs/tests/data/decoding/protobuf/test_protobuf.proto
@@ -0,0 +1,26 @@
+syntax = "proto2";
+
+package test_protobuf;
+
+message Person {
+  optional string name = 1;
+  optional int32 id = 2;
+  optional string email = 3;
+
+  enum PhoneType {
+    MOBILE = 0;
+    HOME = 1;
+    WORK = 2;
+  }
+
+  message PhoneNumber {
+    optional string number = 1;
+    optional PhoneType type = 2 [default = HOME];
+  }
+
+  repeated PhoneNumber phones = 4;
+}
+
+message AddressBook {
+  repeated Person people = 1;
+}
diff --git a/lib/codecs/tests/data/decoding/protobuf/test_protobuf3.desc b/lib/codecs/tests/data/decoding/protobuf/test_protobuf3.desc
new file mode 100644
index 0000000000000..9fcfec71b44b8
Binary files /dev/null and b/lib/codecs/tests/data/decoding/protobuf/test_protobuf3.desc differ
diff --git a/lib/codecs/tests/data/decoding/protobuf/test_protobuf3.proto b/lib/codecs/tests/data/decoding/protobuf/test_protobuf3.proto
new file mode 100644
index 0000000000000..672a05d2fac9a
--- /dev/null
+++ b/lib/codecs/tests/data/decoding/protobuf/test_protobuf3.proto
@@ -0,0 +1,27 @@
+syntax = "proto3";
+
+package test_protobuf3;
+
+message Person {
+  optional string name = 1;
+  optional int32 id = 2;
+  optional string email = 3;
+
+  enum PhoneType {
+    MOBILE = 0;
+    HOME = 1;
+    WORK = 2;
+  }
+
+  message PhoneNumber {
+    optional string number = 1;
+    optional PhoneType type = 2;
+  }
+
+  map<string, PhoneType> data = 4;
+  repeated PhoneNumber phones = 5;
+}
+
+message AddressBook {
+  repeated Person people = 1;
+}
diff --git a/lib/codecs/tests/data/native_encoding/schema.cue b/lib/codecs/tests/data/native_encoding/schema.cue
index 34c1bec6adc3d..91ddb069b885b 100644
--- a/lib/codecs/tests/data/native_encoding/schema.cue
+++ b/lib/codecs/tests/data/native_encoding/schema.cue
@@ -5,8 +5,8 @@
 #Trace: {...}
 
 #Metric: {
-	name:         string
-	namespace?:   string
+	name:       string
+	namespace?: string
 	tags?: {[string]: #TagValueSet}
 	timestamp?:   #Timestamp
 	interval_ms?: int
@@ -40,11 +40,11 @@
 			sum:   number
 			avg:   number
 		}
-	}
+}
 }
 
-#TagValueSet: { #TagValue | [...#TagValue] }
+#TagValueSet: {#TagValue | [...#TagValue]}
 
-#TagValue: { string | null }
+#TagValue: {string | null}
 
 #Timestamp: =~"^\\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2}(.\\d+)?Z"
diff --git a/lib/docs-renderer/Cargo.toml b/lib/docs-renderer/Cargo.toml
index 998d19d95bc3d..f391dc8f63139 100644
--- a/lib/docs-renderer/Cargo.toml
+++ b/lib/docs-renderer/Cargo.toml
@@ -6,10 +6,10 @@ edition = "2021"
 publish = false
 
 [dependencies]
-anyhow = { version = "1.0.71", default-features = false, features = ["std"] }
+anyhow = { version = "1.0.72", default-features = false, features = ["std"] }
 serde = { version = "1.0", default-features = false }
 serde_json = { version = "1.0", default-features = false, features = ["std"] }
-snafu = { version = "0.7.4", default-features = false }
+snafu = { version = "0.7.5", default-features = false }
 tracing = { version = "0.1.34", default-features = false }
 tracing-subscriber = { version = "0.3.17", default-features = false, features = ["ansi", "env-filter", "fmt", "json", "registry", "tracing-log"] }
 vector-config = { path = "../vector-config" }
diff --git a/lib/enrichment/Cargo.toml b/lib/enrichment/Cargo.toml
index 1a8e2467f0fed..f6674c8c96ec3 100644
--- a/lib/enrichment/Cargo.toml
+++ b/lib/enrichment/Cargo.toml
@@ -8,5 +8,5 @@ publish = false
 [dependencies]
 arc-swap = { version = "1.6.0", default-features = false }
 chrono = { version = "0.4.19", default-features = false }
-dyn-clone = { version = "1.0.11", default-features = false }
+dyn-clone = { version = "1.0.12", default-features = false }
 vrl.workspace = true
diff --git a/lib/enrichment/src/find_enrichment_table_records.rs b/lib/enrichment/src/find_enrichment_table_records.rs
index 3ade47b7c55a6..7086709cd208a 100644
--- a/lib/enrichment/src/find_enrichment_table_records.rs
+++ b/lib/enrichment/src/find_enrichment_table_records.rs
@@ -1,6 +1,7 @@
 use std::collections::BTreeMap;
 use vrl::prelude::*;
 
+use crate::vrl_util::is_case_sensitive;
 use crate::{
     vrl_util::{self, add_index, evaluate_condition},
     Case, Condition, IndexHandle, TableRegistry, TableSearch,
@@ -87,7 +88,7 @@ impl Function for FindEnrichmentTableRecords {
 
     fn compile(
         &self,
-        _state: &TypeState,
+        state: &TypeState,
         ctx: &mut FunctionCompileContext,
         arguments: ArgumentList,
     ) -> Compiled {
@@ -102,7 +103,7 @@ impl Function for FindEnrichmentTableRecords {
             .collect::<Vec<_>>();
 
         let table = arguments
-            .required_enum("table", &tables)?
+            .required_enum("table", &tables, state)?
             .try_bytes_utf8_lossy()
             .expect("table is not valid utf8")
             .into_owned();
@@ -110,21 +111,7 @@ impl Function for FindEnrichmentTableRecords {
 
         let select = arguments.optional("select");
 
-        let case_sensitive = arguments
-            .optional_literal("case_sensitive")?
-            .and_then(|literal| literal.resolve_constant())
-            .map(|value| value.try_boolean())
-            .transpose()
-            .expect("case_sensitive should be boolean") // This will have been caught by the type checker.
-            .map(|case_sensitive| {
-                if case_sensitive {
-                    Case::Sensitive
-                } else {
-                    Case::Insensitive
-                }
-            })
-            .unwrap_or(Case::Sensitive);
-
+        let case_sensitive = is_case_sensitive(&arguments, state)?;
         let index = Some(
             add_index(registry, &table, case_sensitive, &condition)
                 .map_err(|err| Box::new(err) as Box<_>)?,
diff --git a/lib/enrichment/src/get_enrichment_table_record.rs b/lib/enrichment/src/get_enrichment_table_record.rs
index 3678d85e4fea0..a028894d89373 100644
--- a/lib/enrichment/src/get_enrichment_table_record.rs
+++ b/lib/enrichment/src/get_enrichment_table_record.rs
@@ -1,6 +1,7 @@
 use std::collections::BTreeMap;
 use vrl::prelude::*;
 
+use crate::vrl_util::is_case_sensitive;
 use crate::{
     vrl_util::{self, add_index, evaluate_condition},
     Case, Condition, IndexHandle, TableRegistry, TableSearch,
@@ -79,7 +80,7 @@ impl Function for GetEnrichmentTableRecord {
 
     fn compile(
         &self,
-        _state: &TypeState,
+        state: &TypeState,
         ctx: &mut FunctionCompileContext,
         arguments: ArgumentList,
     ) -> Compiled {
@@ -94,7 +95,7 @@ impl Function for GetEnrichmentTableRecord {
             .collect::<Vec<_>>();
 
         let table = arguments
-            .required_enum("table", &tables)?
+            .required_enum("table", &tables, state)?
             .try_bytes_utf8_lossy()
             .expect("table is not valid utf8")
             .into_owned();
@@ -102,21 +103,7 @@ impl Function for GetEnrichmentTableRecord {
 
         let select = arguments.optional("select");
 
-        let case_sensitive = arguments
-            .optional_literal("case_sensitive")?
-            .and_then(|literal| literal.resolve_constant())
-            .map(|value| value.try_boolean())
-            .transpose()
-            .expect("case_sensitive should be boolean") // This will have been caught by the type checker.
-            .map(|case_sensitive| {
-                if case_sensitive {
-                    Case::Sensitive
-                } else {
-                    Case::Insensitive
-                }
-            })
-            .unwrap_or(Case::Sensitive);
-
+        let case_sensitive = is_case_sensitive(&arguments, state)?;
         let index = Some(
             add_index(registry, &table, case_sensitive, &condition)
                 .map_err(|err| Box::new(err) as Box<_>)?,
diff --git a/lib/enrichment/src/vrl_util.rs b/lib/enrichment/src/vrl_util.rs
index f6aaa4dac02ce..ccdebd3cdfbb1 100644
--- a/lib/enrichment/src/vrl_util.rs
+++ b/lib/enrichment/src/vrl_util.rs
@@ -80,6 +80,26 @@ pub(crate) fn add_index(
     Ok(index)
 }
 
+pub(crate) fn is_case_sensitive(
+    arguments: &ArgumentList,
+    state: &TypeState,
+) -> Result<Case, function::Error> {
+    Ok(arguments
+        .optional_literal("case_sensitive", state)?
+        .map(|value| {
+            let case_sensitive = value
+                .as_boolean()
+                .expect("case_sensitive should be boolean"); // This will have been caught by the type checker.
+
+            if case_sensitive {
+                Case::Sensitive
+            } else {
+                Case::Insensitive
+            }
+        })
+        .unwrap_or(Case::Sensitive))
+}
+
 #[cfg(test)]
 mod tests {
     use std::sync::{Arc, Mutex};
diff --git a/lib/file-source/Cargo.toml b/lib/file-source/Cargo.toml
index 50631a6765175..fee1a7e065658 100644
--- a/lib/file-source/Cargo.toml
+++ b/lib/file-source/Cargo.toml
@@ -19,7 +19,7 @@ vector-config-common = { path = "../vector-config-common", default-features = fa
 vector-config-macros = { path = "../vector-config-macros", default-features = false }
 
 [dependencies.bstr]
-version = "1.5"
+version = "1.6"
 default-features = false
 features = []
 
@@ -34,7 +34,7 @@ default-features = false
 features = ["clock", "serde"]
 
 [dependencies.dashmap]
-version = "5.2"
+version = "5.5"
 default-features = false
 features = []
 
@@ -69,7 +69,7 @@ default-features = false
 features = []
 
 [dependencies.tokio]
-version = "1.29.0"
+version = "1.30.0"
 default-features = false
 features = ["full"]
 
diff --git a/lib/k8s-e2e-tests/Cargo.toml b/lib/k8s-e2e-tests/Cargo.toml
index fd1a5aa7ab672..df72dab60fd11 100644
--- a/lib/k8s-e2e-tests/Cargo.toml
+++ b/lib/k8s-e2e-tests/Cargo.toml
@@ -14,8 +14,8 @@ k8s-test-framework = { version = "0.1", path = "../k8s-test-framework" }
 regex = "1"
 reqwest = { version = "0.11.18", features = ["json"] }
 serde_json = "1"
-tokio = { version = "1.29.0", features = ["full"] }
-indoc = "2.0.1"
+tokio = { version = "1.30.0", features = ["full"] }
+indoc = "2.0.3"
 env_logger = "0.10"
 tracing = { version = "0.1", features = ["log"] }
 rand = "0.8"
diff --git a/lib/k8s-test-framework/Cargo.toml b/lib/k8s-test-framework/Cargo.toml
index 7ab378add13ff..484a49ce0ea63 100644
--- a/lib/k8s-test-framework/Cargo.toml
+++ b/lib/k8s-test-framework/Cargo.toml
@@ -11,5 +11,5 @@ license = "MPL-2.0"
 k8s-openapi = { version = "0.16.0", default-features = false, features = ["v1_19"] }
 serde_json = "1"
 tempfile = "3"
-tokio = { version = "1.29.0", features = ["full"] }
+tokio = { version = "1.30.0", features = ["full"] }
 log = "0.4"
diff --git a/lib/loki-logproto/Cargo.toml b/lib/loki-logproto/Cargo.toml
index f09e431152d02..c140e168546a9 100644
--- a/lib/loki-logproto/Cargo.toml
+++ b/lib/loki-logproto/Cargo.toml
@@ -2,6 +2,8 @@
 name = "loki-logproto"
 version = "0.1.0"
 edition = "2021"
+license = "MPL-2.0"
+publish = false
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
diff --git a/lib/loki-logproto/LICENSE b/lib/loki-logproto/LICENSE
new file mode 100644
index 0000000000000..e87a115e462e1
--- /dev/null
+++ b/lib/loki-logproto/LICENSE
@@ -0,0 +1,363 @@
+Mozilla Public License, version 2.0
+
+1. Definitions
+
+1.1. "Contributor"
+
+     means each individual or legal entity that creates, contributes to the
+     creation of, or owns Covered Software.
+
+1.2. "Contributor Version"
+
+     means the combination of the Contributions of others (if any) used by a
+     Contributor and that particular Contributor's Contribution.
+
+1.3. "Contribution"
+
+     means Covered Software of a particular Contributor.
+
+1.4. "Covered Software"
+
+     means Source Code Form to which the initial Contributor has attached the
+     notice in Exhibit A, the Executable Form of such Source Code Form, and
+     Modifications of such Source Code Form, in each case including portions
+     thereof.
+
+1.5. "Incompatible With Secondary Licenses"
+     means
+
+     a. that the initial Contributor has attached the notice described in
+        Exhibit B to the Covered Software; or
+
+     b. that the Covered Software was made available under the terms of
+        version 1.1 or earlier of the License, but not also under the terms of
+        a Secondary License.
+
+1.6. "Executable Form"
+
+     means any form of the work other than Source Code Form.
+
+1.7. "Larger Work"
+
+     means a work that combines Covered Software with other material, in a
+     separate file or files, that is not Covered Software.
+
+1.8. "License"
+
+     means this document.
+
+1.9. "Licensable"
+
+     means having the right to grant, to the maximum extent possible, whether
+     at the time of the initial grant or subsequently, any and all of the
+     rights conveyed by this License.
+
+1.10. "Modifications"
+
+     means any of the following:
+
+     a. any file in Source Code Form that results from an addition to,
+        deletion from, or modification of the contents of Covered Software; or
+
+     b. any new file in Source Code Form that contains any Covered Software.
+
+1.11. "Patent Claims" of a Contributor
+
+      means any patent claim(s), including without limitation, method,
+      process, and apparatus claims, in any patent Licensable by such
+      Contributor that would be infringed, but for the grant of the License,
+      by the making, using, selling, offering for sale, having made, import,
+      or transfer of either its Contributions or its Contributor Version.
+
+1.12. "Secondary License"
+
+      means either the GNU General Public License, Version 2.0, the GNU Lesser
+      General Public License, Version 2.1, the GNU Affero General Public
+      License, Version 3.0, or any later versions of those licenses.
+
+1.13. "Source Code Form"
+
+      means the form of the work preferred for making modifications.
+
+1.14. "You" (or "Your")
+
+      means an individual or a legal entity exercising rights under this
+      License. For legal entities, "You" includes any entity that controls, is
+      controlled by, or is under common control with You. For purposes of this
+      definition, "control" means (a) the power, direct or indirect, to cause
+      the direction or management of such entity, whether by contract or
+      otherwise, or (b) ownership of more than fifty percent (50%) of the
+      outstanding shares or beneficial ownership of such entity.
+
+
+2. License Grants and Conditions
+
+2.1. Grants
+
+     Each Contributor hereby grants You a world-wide, royalty-free,
+     non-exclusive license:
+
+     a. under intellectual property rights (other than patent or trademark)
+        Licensable by such Contributor to use, reproduce, make available,
+        modify, display, perform, distribute, and otherwise exploit its
+        Contributions, either on an unmodified basis, with Modifications, or
+        as part of a Larger Work; and
+
+     b. under Patent Claims of such Contributor to make, use, sell, offer for
+        sale, have made, import, and otherwise transfer either its
+        Contributions or its Contributor Version.
+
+2.2. Effective Date
+
+     The licenses granted in Section 2.1 with respect to any Contribution
+     become effective for each Contribution on the date the Contributor first
+     distributes such Contribution.
+
+2.3. Limitations on Grant Scope
+
+     The licenses granted in this Section 2 are the only rights granted under
+     this License. No additional rights or licenses will be implied from the
+     distribution or licensing of Covered Software under this License.
+     Notwithstanding Section 2.1(b) above, no patent license is granted by a
+     Contributor:
+
+     a. for any code that a Contributor has removed from Covered Software; or
+
+     b. for infringements caused by: (i) Your and any other third party's
+        modifications of Covered Software, or (ii) the combination of its
+        Contributions with other software (except as part of its Contributor
+        Version); or
+
+     c. under Patent Claims infringed by Covered Software in the absence of
+        its Contributions.
+
+     This License does not grant any rights in the trademarks, service marks,
+     or logos of any Contributor (except as may be necessary to comply with
+     the notice requirements in Section 3.4).
+
+2.4. Subsequent Licenses
+
+     No Contributor makes additional grants as a result of Your choice to
+     distribute the Covered Software under a subsequent version of this
+     License (see Section 10.2) or under the terms of a Secondary License (if
+     permitted under the terms of Section 3.3).
+
+2.5. Representation
+
+     Each Contributor represents that the Contributor believes its
+     Contributions are its original creation(s) or it has sufficient rights to
+     grant the rights to its Contributions conveyed by this License.
+
+2.6. Fair Use
+
+     This License is not intended to limit any rights You have under
+     applicable copyright doctrines of fair use, fair dealing, or other
+     equivalents.
+
+2.7. Conditions
+
+     Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted in
+     Section 2.1.
+
+
+3. Responsibilities
+
+3.1. Distribution of Source Form
+
+     All distribution of Covered Software in Source Code Form, including any
+     Modifications that You create or to which You contribute, must be under
+     the terms of this License. You must inform recipients that the Source
+     Code Form of the Covered Software is governed by the terms of this
+     License, and how they can obtain a copy of this License. You may not
+     attempt to alter or restrict the recipients' rights in the Source Code
+     Form.
+
+3.2. Distribution of Executable Form
+
+     If You distribute Covered Software in Executable Form then:
+
+     a. such Covered Software must also be made available in Source Code Form,
+        as described in Section 3.1, and You must inform recipients of the
+        Executable Form how they can obtain a copy of such Source Code Form by
+        reasonable means in a timely manner, at a charge no more than the cost
+        of distribution to the recipient; and
+
+     b. You may distribute such Executable Form under the terms of this
+        License, or sublicense it under different terms, provided that the
+        license for the Executable Form does not attempt to limit or alter the
+        recipients' rights in the Source Code Form under this License.
+
+3.3. Distribution of a Larger Work
+
+     You may create and distribute a Larger Work under terms of Your choice,
+     provided that You also comply with the requirements of this License for
+     the Covered Software. If the Larger Work is a combination of Covered
+     Software with a work governed by one or more Secondary Licenses, and the
+     Covered Software is not Incompatible With Secondary Licenses, this
+     License permits You to additionally distribute such Covered Software
+     under the terms of such Secondary License(s), so that the recipient of
+     the Larger Work may, at their option, further distribute the Covered
+     Software under the terms of either this License or such Secondary
+     License(s).
+
+3.4. Notices
+
+     You may not remove or alter the substance of any license notices
+     (including copyright notices, patent notices, disclaimers of warranty, or
+     limitations of liability) contained within the Source Code Form of the
+     Covered Software, except that You may alter any license notices to the
+     extent required to remedy known factual inaccuracies.
+
+3.5. Application of Additional Terms
+
+     You may choose to offer, and to charge a fee for, warranty, support,
+     indemnity or liability obligations to one or more recipients of Covered
+     Software. However, You may do so only on Your own behalf, and not on
+     behalf of any Contributor. You must make it absolutely clear that any
+     such warranty, support, indemnity, or liability obligation is offered by
+     You alone, and You hereby agree to indemnify every Contributor for any
+     liability incurred by such Contributor as a result of warranty, support,
+     indemnity or liability terms You offer. You may include additional
+     disclaimers of warranty and limitations of liability specific to any
+     jurisdiction.
+
+4. Inability to Comply Due to Statute or Regulation
+
+   If it is impossible for You to comply with any of the terms of this License
+   with respect to some or all of the Covered Software due to statute,
+   judicial order, or regulation then You must: (a) comply with the terms of
+   this License to the maximum extent possible; and (b) describe the
+   limitations and the code they affect. Such description must be placed in a
+   text file included with all distributions of the Covered Software under
+   this License. Except to the extent prohibited by statute or regulation,
+   such description must be sufficiently detailed for a recipient of ordinary
+   skill to be able to understand it.
+
+5. Termination
+
+5.1. The rights granted under this License will terminate automatically if You
+     fail to comply with any of its terms. However, if You become compliant,
+     then the rights granted under this License from a particular Contributor
+     are reinstated (a) provisionally, unless and until such Contributor
+     explicitly and finally terminates Your grants, and (b) on an ongoing
+     basis, if such Contributor fails to notify You of the non-compliance by
+     some reasonable means prior to 60 days after You have come back into
+     compliance. Moreover, Your grants from a particular Contributor are
+     reinstated on an ongoing basis if such Contributor notifies You of the
+     non-compliance by some reasonable means, this is the first time You have
+     received notice of non-compliance with this License from such
+     Contributor, and You become compliant prior to 30 days after Your receipt
+     of the notice.
+
+5.2. If You initiate litigation against any entity by asserting a patent
+     infringement claim (excluding declaratory judgment actions,
+     counter-claims, and cross-claims) alleging that a Contributor Version
+     directly or indirectly infringes any patent, then the rights granted to
+     You by any and all Contributors for the Covered Software under Section
+     2.1 of this License shall terminate.
+
+5.3. In the event of termination under Sections 5.1 or 5.2 above, all end user
+     license agreements (excluding distributors and resellers) which have been
+     validly granted by You or Your distributors under this License prior to
+     termination shall survive termination.
+
+6. Disclaimer of Warranty
+
+   Covered Software is provided under this License on an "as is" basis,
+   without warranty of any kind, either expressed, implied, or statutory,
+   including, without limitation, warranties that the Covered Software is free
+   of defects, merchantable, fit for a particular purpose or non-infringing.
+   The entire risk as to the quality and performance of the Covered Software
+   is with You. Should any Covered Software prove defective in any respect,
+   You (not any Contributor) assume the cost of any necessary servicing,
+   repair, or correction. This disclaimer of warranty constitutes an essential
+   part of this License. No use of  any Covered Software is authorized under
+   this License except under this disclaimer.
+
+7. Limitation of Liability
+
+   Under no circumstances and under no legal theory, whether tort (including
+   negligence), contract, or otherwise, shall any Contributor, or anyone who
+   distributes Covered Software as permitted above, be liable to You for any
+   direct, indirect, special, incidental, or consequential damages of any
+   character including, without limitation, damages for lost profits, loss of
+   goodwill, work stoppage, computer failure or malfunction, or any and all
+   other commercial damages or losses, even if such party shall have been
+   informed of the possibility of such damages. This limitation of liability
+   shall not apply to liability for death or personal injury resulting from
+   such party's negligence to the extent applicable law prohibits such
+   limitation. Some jurisdictions do not allow the exclusion or limitation of
+   incidental or consequential damages, so this exclusion and limitation may
+   not apply to You.
+
+8. Litigation
+
+   Any litigation relating to this License may be brought only in the courts
+   of a jurisdiction where the defendant maintains its principal place of
+   business and such litigation shall be governed by laws of that
+   jurisdiction, without reference to its conflict-of-law provisions. Nothing
+   in this Section shall prevent a party's ability to bring cross-claims or
+   counter-claims.
+
+9. Miscellaneous
+
+   This License represents the complete agreement concerning the subject
+   matter hereof. If any provision of this License is held to be
+   unenforceable, such provision shall be reformed only to the extent
+   necessary to make it enforceable. Any law or regulation which provides that
+   the language of a contract shall be construed against the drafter shall not
+   be used to construe this License against a Contributor.
+
+
+10. Versions of the License
+
+10.1. New Versions
+
+      Mozilla Foundation is the license steward. Except as provided in Section
+      10.3, no one other than the license steward has the right to modify or
+      publish new versions of this License. Each version will be given a
+      distinguishing version number.
+
+10.2. Effect of New Versions
+
+      You may distribute the Covered Software under the terms of the version
+      of the License under which You originally received the Covered Software,
+      or under the terms of any subsequent version published by the license
+      steward.
+
+10.3. Modified Versions
+
+      If you create software not governed by this License, and you want to
+      create a new license for such software, you may create and use a
+      modified version of this License if you rename the license and remove
+      any references to the name of the license steward (except to note that
+      such modified license differs from this License).
+
+10.4. Distributing Source Code Form that is Incompatible With Secondary
+      Licenses If You choose to distribute Source Code Form that is
+      Incompatible With Secondary Licenses under the terms of this version of
+      the License, the notice described in Exhibit B of this License must be
+      attached.
+
+Exhibit A - Source Code Form License Notice
+
+      This Source Code Form is subject to the
+      terms of the Mozilla Public License, v.
+      2.0. If a copy of the MPL was not
+      distributed with this file, You can
+      obtain one at
+      http://mozilla.org/MPL/2.0/.
+
+If it is not possible or desirable to put the notice in a particular file,
+then You may include the notice in a location (such as a LICENSE file in a
+relevant directory) where a recipient would be likely to look for such a
+notice.
+
+You may add additional accurate notices of copyright ownership.
+
+Exhibit B - "Incompatible With Secondary Licenses" Notice
+
+      This Source Code Form is "Incompatible
+      With Secondary Licenses", as defined by
+      the Mozilla Public License, v. 2.0.
+
diff --git a/lib/opentelemetry-proto/src/convert.rs b/lib/opentelemetry-proto/src/convert.rs
index 4ccfda0b726ba..875be35d4dd9c 100644
--- a/lib/opentelemetry-proto/src/convert.rs
+++ b/lib/opentelemetry-proto/src/convert.rs
@@ -94,7 +94,7 @@ impl ResourceLog {
             LogNamespace::Legacy => {
                 let mut log = LogEvent::default();
                 if let Some(v) = self.log_record.body.and_then(|av| av.value) {
-                    log.insert(log_schema().message_key(), v);
+                    log.maybe_insert(log_schema().message_key_target_path(), v);
                 }
                 log
             }
@@ -208,7 +208,7 @@ impl ResourceLog {
 
         log_namespace.insert_vector_metadata(
             &mut log,
-            Some(log_schema().source_type_key()),
+            log_schema().source_type_key(),
             path!("source_type"),
             Bytes::from_static(SOURCE_NAME.as_bytes()),
         );
diff --git a/lib/tracing-limit/Cargo.toml b/lib/tracing-limit/Cargo.toml
index 48c0bf0762a98..5eb8fe73f0840 100644
--- a/lib/tracing-limit/Cargo.toml
+++ b/lib/tracing-limit/Cargo.toml
@@ -9,7 +9,7 @@ license = "MPL-2.0"
 [dependencies]
 tracing-core = { version = "0.1", default-features = false }
 tracing-subscriber = { version = "0.3", default-features = false, features = ["registry", "std"] }
-dashmap = { version = "5.2.0", default-features = false }
+dashmap = { version = "5.5.0", default-features = false }
 
 [dev-dependencies]
 criterion = "0.5"
diff --git a/lib/vector-api-client/Cargo.toml b/lib/vector-api-client/Cargo.toml
index ed243d3e368ec..7c47c41c0ce5a 100644
--- a/lib/vector-api-client/Cargo.toml
+++ b/lib/vector-api-client/Cargo.toml
@@ -9,16 +9,16 @@ license = "MPL-2.0"
 [dependencies]
 
 # Serde
-serde = { version = "1.0.164", default-features = false, features = ["derive"] }
-serde_json = { version = "1.0.99", default-features = false, features = ["raw_value"] }
+serde = { version = "1.0.183", default-features = false, features = ["derive"] }
+serde_json = { version = "1.0.104", default-features = false, features = ["raw_value"] }
 
 # Error handling
-anyhow = { version = "1.0.71", default-features = false, features = ["std"] }
+anyhow = { version = "1.0.72", default-features = false, features = ["std"] }
 
 # Tokio / Futures
 async-trait = { version = "0.1", default-features = false }
 futures = { version = "0.3", default-features = false, features = ["compat", "io-compat"] }
-tokio = { version = "1.29.0", default-features = false, features = ["macros", "rt", "sync"] }
+tokio = { version = "1.30.0", default-features = false, features = ["macros", "rt", "sync"] }
 tokio-stream = { version = "0.1.14", default-features = false, features = ["sync"] }
 
 # GraphQL
@@ -26,11 +26,11 @@ graphql_client = { version = "0.13.0", default-features = false, features = ["gr
 
 # HTTP / WebSockets
 reqwest = { version = "0.11.18", default-features = false, features = ["json"] }
-tokio-tungstenite = { version = "0.19.0", default-features = false, features = ["connect", "rustls"] }
+tokio-tungstenite = { version = "0.20.1", default-features = false, features = ["connect", "rustls"] }
 
 # External libs
 chrono = { version = "0.4.6", default-features = false, features = ["serde"] }
-clap = { version = "4.1.14", default-features = false, features = ["derive"] }
+clap = { version = "4.3.21", default-features = false, features = ["derive"] }
 url = { version = "2.4.0", default-features = false }
 uuid = { version = "1", default-features = false, features = ["serde", "v4"] }
-indoc = { version = "2.0.1", default-features = false }
+indoc = { version = "2.0.3", default-features = false }
diff --git a/lib/vector-api-client/src/client.rs b/lib/vector-api-client/src/client.rs
index 01159be74d01f..941ffa7963f27 100644
--- a/lib/vector-api-client/src/client.rs
+++ b/lib/vector-api-client/src/client.rs
@@ -1,8 +1,9 @@
 use anyhow::Context;
 use graphql_client::GraphQLQuery;
-use indoc::indoc;
 use url::Url;
 
+use crate::gql::HealthQueryExt;
+
 /// Wrapped `Result` type, that returns deserialized GraphQL response data.
 pub type QueryResult<T> =
     anyhow::Result<graphql_client::Response<<T as GraphQLQuery>::ResponseData>>;
@@ -19,33 +20,9 @@ impl Client {
         Self { url }
     }
 
-    pub async fn new_with_healthcheck(url: Url) -> Option<Self> {
-        #![allow(clippy::print_stderr)]
-
-        use crate::gql::HealthQueryExt;
-
-        // Create a new API client for connecting to the local/remote Vector instance.
-        let client = Self::new(url.clone());
-
-        // Check that the GraphQL server is reachable
-        match client.health_query().await {
-            Ok(_) => Some(client),
-            _ => {
-                eprintln!(
-                    indoc! {"
-                    Vector API server isn't reachable ({}).
-
-                    Have you enabled the API?
-
-                    To enable the API, add the following to your `vector.toml` config file:
-
-                    [api]
-                      enabled = true"},
-                    url
-                );
-                None
-            }
-        }
+    /// Send a health query
+    pub async fn healthcheck(&self) -> Result<(), ()> {
+        self.health_query().await.map(|_| ()).map_err(|_| ())
     }
 
     /// Issue a GraphQL query using Reqwest, serializing the response to the associated
diff --git a/lib/vector-buffers/Cargo.toml b/lib/vector-buffers/Cargo.toml
index 09de0d0ac6153..633ff8cf658e4 100644
--- a/lib/vector-buffers/Cargo.toml
+++ b/lib/vector-buffers/Cargo.toml
@@ -17,14 +17,14 @@ crossbeam-utils = { version = "0.8.16", default-features = false }
 fslock = { version = "0.2.1", default-features = false, features = ["std"] }
 futures = { version = "0.3.28", default-features = false, features = ["std"] }
 memmap2 = { version = "0.7.1", default-features = false }
-metrics = "0.21.0"
-num-traits = { version = "0.2.15", default-features = false }
-pin-project = { version = "1.1.1", default-features = false }
+metrics = "0.21.1"
+num-traits = { version = "0.2.16", default-features = false }
+pin-project = { version = "1.1.3", default-features = false }
 rkyv = { version = "0.7.40", default-features = false, features = ["size_32", "std", "strict", "validation"] }
-serde = { version = "1.0.164", default-features = false, features = ["derive"] }
-snafu = { version = "0.7.4", default-features = false, features = ["std"] }
+serde = { version = "1.0.183", 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.29.0", default-features = false, features = ["rt", "macros", "rt-multi-thread", "sync", "fs", "io-util", "time"] }
+tokio = { version = "1.30.0", default-features = false, features = ["rt", "macros", "rt-multi-thread", "sync", "fs", "io-util", "time"] }
 tracing = { version = "0.1.34", default-features = false, features = ["attributes"] }
 vector-config = { path = "../vector-config", default-features = false }
 vector-config-common = { path = "../vector-config-common", default-features = false }
@@ -32,12 +32,12 @@ 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.1.14"
+clap = "4.3.21"
 criterion = { version = "0.5", features = ["html_reports", "async_tokio"] }
 crossbeam-queue = "0.3.8"
 hdrhistogram = "7.5.2"
 metrics-tracing-context = { version = "0.14.0", default-features = false }
-metrics-util = { version = "0.15.0", default-features = false, features = ["debugging"] }
+metrics-util = { version = "0.15.1", default-features = false, features = ["debugging"] }
 once_cell = "1.18"
 proptest = "1.2"
 quickcheck = "1.0"
diff --git a/lib/vector-common/Cargo.toml b/lib/vector-common/Cargo.toml
index 24023729e5104..523f403b8f774 100644
--- a/lib/vector-common/Cargo.toml
+++ b/lib/vector-common/Cargo.toml
@@ -49,18 +49,18 @@ crossbeam-utils = { version = "0.8.16", default-features = false }
 derivative = { version = "2.2.0", default-features = false }
 futures = { version = "0.3.28", default-features = false, features = ["std"] }
 indexmap = { version = "~2.0.0", default-features = false, features = ["std"] }
-metrics = "0.21.0"
+metrics = "0.21.1"
 nom = { version = "7", optional = true }
 ordered-float = { version = "3.7.0", default-features = false }
-paste = "1.0.12"
-pin-project = { version = "1.1.1", default-features = false }
+paste = "1.0.14"
+pin-project = { version = "1.1.3", default-features = false }
 ryu = { version = "1", default-features = false }
-serde_json = { version = "1.0.99", default-features = false, features = ["std", "raw_value"] }
-serde = { version = "1.0.164", optional = true, features = ["derive"] }
+serde_json = { version = "1.0.104", default-features = false, features = ["std", "raw_value"] }
+serde = { version = "1.0.183", 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 }
-tokio = { version = "1.29.0", default-features = false, features = ["macros", "time"] }
+tokio = { version = "1.30.0", default-features = false, features = ["macros", "time"] }
 tracing = { version = "0.1.34", default-features = false }
 vrl.workspace = true
 vector-config = { path = "../vector-config" }
@@ -69,6 +69,6 @@ vector-config-macros = { path = "../vector-config-macros" }
 
 [dev-dependencies]
 futures = { version = "0.3.28", default-features = false, features = ["async-await", "std"] }
-tokio = { version = "1.29.0", default-features = false, features = ["rt", "time"] }
+tokio = { version = "1.30.0", default-features = false, features = ["rt", "time"] }
 quickcheck = "1"
 quickcheck_macros = "1"
diff --git a/lib/vector-common/src/finalizer.rs b/lib/vector-common/src/finalizer.rs
index 15bc52ab3510d..9af4237a6a341 100644
--- a/lib/vector-common/src/finalizer.rs
+++ b/lib/vector-common/src/finalizer.rs
@@ -62,7 +62,7 @@ where
             Self {
                 sender: Some(todo_tx),
                 flush: flush1,
-                _phantom: PhantomData::default(),
+                _phantom: PhantomData,
             },
             finalizer_stream(shutdown, todo_rx, S::default(), flush2).boxed(),
         )
@@ -199,7 +199,7 @@ pub struct EmptyStream<T>(PhantomData<T>);
 
 impl<T> Default for EmptyStream<T> {
     fn default() -> Self {
-        Self(PhantomData::default())
+        Self(PhantomData)
     }
 }
 
diff --git a/lib/vector-common/src/internal_event/cached_event.rs b/lib/vector-common/src/internal_event/cached_event.rs
index e672848c93584..54f6b5ed5c64f 100644
--- a/lib/vector-common/src/internal_event/cached_event.rs
+++ b/lib/vector-common/src/internal_event/cached_event.rs
@@ -1,5 +1,6 @@
 use std::{
-    collections::BTreeMap,
+    collections::HashMap,
+    hash::Hash,
     sync::{Arc, RwLock},
 };
 
@@ -17,11 +18,12 @@ use super::{InternalEventHandle, RegisterInternalEvent};
 /// new event is emitted for a previously unseen set of tags an event is registered
 /// and stored in the cache.
 #[derive(Derivative)]
-#[derivative(Clone(bound = ""), Default(bound = ""))]
-pub struct RegisteredEventCache<Event: RegisterTaggedInternalEvent> {
+#[derivative(Clone(bound = "T: Clone"))]
+pub struct RegisteredEventCache<T, Event: RegisterTaggedInternalEvent> {
+    fixed_tags: T,
     cache: Arc<
         RwLock<
-            BTreeMap<
+            HashMap<
                 <Event as RegisterTaggedInternalEvent>::Tags,
                 <Event as RegisterInternalEvent>::Handle,
             >,
@@ -36,16 +38,31 @@ pub trait RegisterTaggedInternalEvent: RegisterInternalEvent {
     /// that will be used when registering the event.
     type Tags;
 
-    fn register(tags: Self::Tags) -> <Self as RegisterInternalEvent>::Handle;
+    /// The type that contains data necessary to extract the tags that will
+    /// be fixed and only need setting up front when the cache is first created.
+    type Fixed;
+
+    fn register(fixed: Self::Fixed, tags: Self::Tags) -> <Self as RegisterInternalEvent>::Handle;
 }
 
-impl<Event, EventHandle, Data, Tags> RegisteredEventCache<Event>
+impl<Event, EventHandle, Data, Tags, FixedTags> RegisteredEventCache<FixedTags, Event>
 where
     Data: Sized,
     EventHandle: InternalEventHandle<Data = Data>,
-    Tags: Ord + Clone,
-    Event: RegisterInternalEvent<Handle = EventHandle> + RegisterTaggedInternalEvent<Tags = Tags>,
+    Tags: Clone + Eq + Hash,
+    FixedTags: Clone,
+    Event: RegisterInternalEvent<Handle = EventHandle>
+        + RegisterTaggedInternalEvent<Tags = Tags, Fixed = FixedTags>,
 {
+    /// Create a new event cache with a set of fixed tags. These tags are passed to
+    /// all registered events.
+    pub fn new(fixed_tags: FixedTags) -> Self {
+        Self {
+            fixed_tags,
+            cache: Arc::default(),
+        }
+    }
+
     /// Emits the event with the given tags.
     /// It will register the event and store in the cache if this has not already
     /// been done.
@@ -58,7 +75,10 @@ where
         if let Some(event) = read.get(tags) {
             event.emit(value);
         } else {
-            let event = <Event as RegisterTaggedInternalEvent>::register(tags.clone());
+            let event = <Event as RegisterTaggedInternalEvent>::register(
+                self.fixed_tags.clone(),
+                tags.clone(),
+            );
             event.emit(value);
 
             // Ensure the read lock is dropped so we can write.
@@ -67,3 +87,43 @@ where
         }
     }
 }
+
+#[cfg(test)]
+mod tests {
+    #![allow(unreachable_pub)]
+    use metrics::{register_counter, Counter};
+
+    use super::*;
+
+    crate::registered_event!(
+        TestEvent {
+            fixed: String,
+            dynamic: String,
+        } => {
+            event: Counter = {
+                register_counter!("test_event_total", "fixed" => self.fixed, "dynamic" => self.dynamic)
+            },
+        }
+
+        fn emit(&self, count: u64) {
+            self.event.increment(count);
+        }
+
+        fn register(fixed: String, dynamic: String) {
+            crate::internal_event::register(TestEvent {
+                fixed,
+                dynamic,
+            })
+        }
+    );
+
+    #[test]
+    fn test_fixed_tag() {
+        let event: RegisteredEventCache<String, TestEvent> =
+            RegisteredEventCache::new("fixed".to_string());
+
+        for tag in 1..=5 {
+            event.emit(&format!("dynamic{tag}"), tag);
+        }
+    }
+}
diff --git a/lib/vector-common/src/internal_event/events_sent.rs b/lib/vector-common/src/internal_event/events_sent.rs
index d12a22bf17e8a..b902b6afaff65 100644
--- a/lib/vector-common/src/internal_event/events_sent.rs
+++ b/lib/vector-common/src/internal_event/events_sent.rs
@@ -3,7 +3,7 @@ use std::sync::Arc;
 use metrics::{register_counter, Counter};
 use tracing::trace;
 
-use crate::{config::ComponentKey, request_metadata::EventCountTags};
+use crate::config::ComponentKey;
 
 use super::{CountByteSize, OptionalTag, Output, SharedString};
 
@@ -91,19 +91,25 @@ crate::registered_event!(
         self.event_bytes.increment(byte_size.get() as u64);
     }
 
-    fn register(tags: EventCountTags) {
-        super::register(TaggedEventsSent::new(
-            tags,
-        ))
+    fn register(_fixed: (), tags: TaggedEventsSent) {
+        super::register(tags)
     }
 );
 
 impl TaggedEventsSent {
     #[must_use]
-    pub fn new(tags: EventCountTags) -> Self {
+    pub fn new_empty() -> Self {
         Self {
-            source: tags.source,
-            service: tags.service,
+            source: OptionalTag::Specified(None),
+            service: OptionalTag::Specified(None),
+        }
+    }
+
+    #[must_use]
+    pub fn new_unspecified() -> Self {
+        Self {
+            source: OptionalTag::Ignored,
+            service: OptionalTag::Ignored,
         }
     }
 }
diff --git a/lib/vector-common/src/internal_event/mod.rs b/lib/vector-common/src/internal_event/mod.rs
index 2915c88797bf8..9dfb1d9acb825 100644
--- a/lib/vector-common/src/internal_event/mod.rs
+++ b/lib/vector-common/src/internal_event/mod.rs
@@ -1,6 +1,6 @@
 mod bytes_received;
 mod bytes_sent;
-mod cached_event;
+pub mod cached_event;
 pub mod component_events_dropped;
 mod events_received;
 mod events_sent;
@@ -195,7 +195,7 @@ impl From<Protocol> for SharedString {
 macro_rules! registered_event {
     // A registered event struct with no fields (zero-sized type).
     ($event:ident => $($tail:tt)*) => {
-        #[derive(Debug)]
+        #[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
         pub struct $event;
 
         $crate::registered_event!(=> $event $($tail)*);
@@ -203,7 +203,7 @@ macro_rules! registered_event {
 
     // A normal registered event struct.
     ($event:ident { $( $field:ident: $type:ty, )* } => $($tail:tt)*) => {
-        #[derive(Debug)]
+        #[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
         pub struct $event {
             $( pub $field: $type, )*
         }
@@ -220,7 +220,7 @@ macro_rules! registered_event {
         fn emit(&$slf:ident, $data_name:ident: $data:ident)
             $emit_body:block
 
-        $(fn register($tags_name:ident: $tags:ty)
+        $(fn register($fixed_name:ident: $fixed_tags:ty, $tags_name:ident: $tags:ty)
             $register_body:block)?
     ) => {
         paste::paste!{
@@ -252,10 +252,12 @@ macro_rules! registered_event {
 
             $(impl $crate::internal_event::cached_event::RegisterTaggedInternalEvent for $event {
                 type Tags = $tags;
+                type Fixed = $fixed_tags;
 
                 fn register(
+                    $fixed_name: $fixed_tags,
                     $tags_name: $tags,
-                ) -> <TaggedEventsSent as super::RegisterInternalEvent>::Handle {
+                ) -> <Self as $crate::internal_event::RegisterInternalEvent>::Handle {
                     $register_body
                 }
             })?
diff --git a/lib/vector-common/src/request_metadata.rs b/lib/vector-common/src/request_metadata.rs
index 9b93a63df7626..12a164d23e437 100644
--- a/lib/vector-common/src/request_metadata.rs
+++ b/lib/vector-common/src/request_metadata.rs
@@ -1,44 +1,20 @@
-use std::ops::Add;
-use std::{collections::HashMap, sync::Arc};
+use std::{
+    collections::HashMap,
+    ops::{Add, AddAssign},
+};
 
 use crate::{
-    config::ComponentKey,
     internal_event::{
-        CountByteSize, InternalEventHandle, OptionalTag, RegisterTaggedInternalEvent,
-        RegisteredEventCache,
+        CountByteSize, InternalEventHandle, RegisterTaggedInternalEvent, RegisteredEventCache,
+        TaggedEventsSent,
     },
     json_size::JsonSize,
 };
 
-/// Tags that are used to group the events within a batch for emitting telemetry.
-#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
-pub struct EventCountTags {
-    pub source: OptionalTag<Arc<ComponentKey>>,
-    pub service: OptionalTag<String>,
-}
-
-impl EventCountTags {
-    #[must_use]
-    pub fn new_empty() -> Self {
-        Self {
-            source: OptionalTag::Specified(None),
-            service: OptionalTag::Specified(None),
-        }
-    }
-
-    #[must_use]
-    pub fn new_unspecified() -> Self {
-        Self {
-            source: OptionalTag::Ignored,
-            service: OptionalTag::Ignored,
-        }
-    }
-}
-
 /// Must be implemented by events to get the tags that will be attached to
 /// the `component_sent_event_*` emitted metrics.
 pub trait GetEventCountTags {
-    fn get_tags(&self) -> EventCountTags;
+    fn get_tags(&self) -> TaggedEventsSent;
 }
 
 /// Keeps track of the estimated json size of a given batch of events by
@@ -48,7 +24,7 @@ pub enum GroupedCountByteSize {
     /// When we need to keep track of the events by certain tags we use this
     /// variant.
     Tagged {
-        sizes: HashMap<EventCountTags, CountByteSize>,
+        sizes: HashMap<TaggedEventsSent, CountByteSize>,
     },
     /// If we don't need to track the events by certain tags we can use
     /// this variant to avoid allocating a `HashMap`,
@@ -85,8 +61,8 @@ impl GroupedCountByteSize {
     /// Returns a `HashMap` of tags => event counts for when we are tracking by tags.
     /// Returns `None` if we are not tracking by tags.
     #[must_use]
-    #[cfg(test)]
-    pub fn sizes(&self) -> Option<&HashMap<EventCountTags, CountByteSize>> {
+    #[cfg(any(test, feature = "test"))]
+    pub fn sizes(&self) -> Option<&HashMap<TaggedEventsSent, CountByteSize>> {
         match self {
             Self::Tagged { sizes } => Some(sizes),
             Self::Untagged { .. } => None,
@@ -95,8 +71,8 @@ impl GroupedCountByteSize {
 
     /// Returns a single count for when we are not tracking by tags.
     #[must_use]
-    #[cfg(test)]
-    fn size(&self) -> Option<CountByteSize> {
+    #[cfg(any(test, feature = "test"))]
+    pub fn size(&self) -> Option<CountByteSize> {
         match self {
             Self::Tagged { .. } => None,
             Self::Untagged { size } => Some(*size),
@@ -129,9 +105,9 @@ impl GroupedCountByteSize {
     }
 
     /// Emits our counts to a `RegisteredEvent` cached event.
-    pub fn emit_event<T, H>(&self, event_cache: &RegisteredEventCache<T>)
+    pub fn emit_event<T, H>(&self, event_cache: &RegisteredEventCache<(), T>)
     where
-        T: RegisterTaggedInternalEvent<Tags = EventCountTags, Handle = H>,
+        T: RegisterTaggedInternalEvent<Tags = TaggedEventsSent, Fixed = (), Handle = H>,
         H: InternalEventHandle<Data = CountByteSize>,
     {
         match self {
@@ -141,10 +117,26 @@ impl GroupedCountByteSize {
                 }
             }
             GroupedCountByteSize::Untagged { size } => {
-                event_cache.emit(&EventCountTags::new_unspecified(), *size);
+                event_cache.emit(&TaggedEventsSent::new_unspecified(), *size);
             }
         }
     }
+
+    /// Returns `true` if we are the `Tagged` variant - keeping track of the byte sizes
+    /// grouped by their relevant tags.
+    #[must_use]
+    pub fn is_tagged(&self) -> bool {
+        match self {
+            GroupedCountByteSize::Tagged { .. } => true,
+            GroupedCountByteSize::Untagged { .. } => false,
+        }
+    }
+
+    /// Returns `true` if we are the `Untagged` variant - keeping a single count for all events.
+    #[must_use]
+    pub fn is_untagged(&self) -> bool {
+        !self.is_tagged()
+    }
 }
 
 impl From<CountByteSize> for GroupedCountByteSize {
@@ -153,34 +145,89 @@ impl From<CountByteSize> for GroupedCountByteSize {
     }
 }
 
+impl AddAssign for GroupedCountByteSize {
+    fn add_assign(&mut self, mut rhs: Self) {
+        if self.is_untagged() && rhs.is_tagged() {
+            // First handle the case where we are untagged and assigning to a tagged value.
+            // We need to change `self` and so need to ensure our match doesn't take ownership of the object.
+            *self = match (&self, &mut rhs) {
+                (Self::Untagged { size }, Self::Tagged { sizes }) => {
+                    let mut sizes = std::mem::take(sizes);
+                    match sizes.get_mut(&TaggedEventsSent::new_empty()) {
+                        Some(empty_size) => *empty_size += *size,
+                        None => {
+                            sizes.insert(TaggedEventsSent::new_empty(), *size);
+                        }
+                    }
+
+                    Self::Tagged { sizes }
+                }
+                _ => {
+                    unreachable!()
+                }
+            };
+
+            return;
+        }
+
+        // For these cases, we know we won't have to change `self` so the match can take ownership.
+        match (self, rhs) {
+            (Self::Tagged { sizes: ref mut lhs }, Self::Tagged { sizes: rhs }) => {
+                for (key, value) in rhs {
+                    match lhs.get_mut(&key) {
+                        Some(size) => *size += value,
+                        None => {
+                            lhs.insert(key.clone(), value);
+                        }
+                    }
+                }
+            }
+
+            (Self::Untagged { size: lhs }, Self::Untagged { size: rhs }) => {
+                *lhs = *lhs + rhs;
+            }
+
+            (Self::Tagged { ref mut sizes }, Self::Untagged { size }) => {
+                match sizes.get_mut(&TaggedEventsSent::new_empty()) {
+                    Some(empty_size) => *empty_size += size,
+                    None => {
+                        sizes.insert(TaggedEventsSent::new_empty(), size);
+                    }
+                }
+            }
+            (Self::Untagged { .. }, Self::Tagged { .. }) => unreachable!(),
+        };
+    }
+}
+
 impl<'a> Add<&'a GroupedCountByteSize> for GroupedCountByteSize {
     type Output = GroupedCountByteSize;
 
     fn add(self, other: &'a Self::Output) -> Self::Output {
         match (self, other) {
-            (Self::Tagged { sizes: mut us }, Self::Tagged { sizes: them }) => {
-                for (key, value) in them {
-                    match us.get_mut(key) {
+            (Self::Tagged { sizes: mut lhs }, Self::Tagged { sizes: rhs }) => {
+                for (key, value) in rhs {
+                    match lhs.get_mut(key) {
                         Some(size) => *size += *value,
                         None => {
-                            us.insert(key.clone(), *value);
+                            lhs.insert(key.clone(), *value);
                         }
                     }
                 }
 
-                Self::Tagged { sizes: us }
+                Self::Tagged { sizes: lhs }
             }
 
-            (Self::Untagged { size: us }, Self::Untagged { size: them }) => {
-                Self::Untagged { size: us + *them }
+            (Self::Untagged { size: lhs }, Self::Untagged { size: rhs }) => {
+                Self::Untagged { size: lhs + *rhs }
             }
 
             // The following two scenarios shouldn't really occur in practice, but are provided for completeness.
             (Self::Tagged { mut sizes }, Self::Untagged { size }) => {
-                match sizes.get_mut(&EventCountTags::new_empty()) {
+                match sizes.get_mut(&TaggedEventsSent::new_empty()) {
                     Some(empty_size) => *empty_size += *size,
                     None => {
-                        sizes.insert(EventCountTags::new_empty(), *size);
+                        sizes.insert(TaggedEventsSent::new_empty(), *size);
                     }
                 }
 
@@ -188,10 +235,10 @@ impl<'a> Add<&'a GroupedCountByteSize> for GroupedCountByteSize {
             }
             (Self::Untagged { size }, Self::Tagged { sizes }) => {
                 let mut sizes = sizes.clone();
-                match sizes.get_mut(&EventCountTags::new_empty()) {
+                match sizes.get_mut(&TaggedEventsSent::new_empty()) {
                     Some(empty_size) => *empty_size += size,
                     None => {
-                        sizes.insert(EventCountTags::new_empty(), size);
+                        sizes.insert(TaggedEventsSent::new_empty(), size);
                     }
                 }
 
@@ -307,6 +354,10 @@ pub trait MetaDescriptive {
 
 #[cfg(test)]
 mod tests {
+    use std::sync::Arc;
+
+    use crate::{config::ComponentKey, internal_event::OptionalTag};
+
     use super::*;
 
     struct DummyEvent {
@@ -315,8 +366,8 @@ mod tests {
     }
 
     impl GetEventCountTags for DummyEvent {
-        fn get_tags(&self) -> EventCountTags {
-            EventCountTags {
+        fn get_tags(&self) -> TaggedEventsSent {
+            TaggedEventsSent {
                 source: self.source.clone(),
                 service: self.service.clone(),
             }
@@ -380,14 +431,14 @@ mod tests {
         assert_eq!(
             vec![
                 (
-                    EventCountTags {
+                    TaggedEventsSent {
                         source: OptionalTag::Ignored,
                         service: Some("cabbage".to_string()).into()
                     },
                     CountByteSize(2, JsonSize::new(78))
                 ),
                 (
-                    EventCountTags {
+                    TaggedEventsSent {
                         source: OptionalTag::Ignored,
                         service: Some("tomato".to_string()).into()
                     },
diff --git a/lib/vector-config-common/Cargo.toml b/lib/vector-config-common/Cargo.toml
index 0d4ddaed219a0..9de0b5159865a 100644
--- a/lib/vector-config-common/Cargo.toml
+++ b/lib/vector-config-common/Cargo.toml
@@ -6,11 +6,11 @@ license = "MPL-2.0"
 
 [dependencies]
 convert_case = { version = "0.6", default-features = false }
-darling = { version = "0.13", default-features = false, features = ["suggestions"] }
+darling = { version = "0.20", default-features = false, features = ["suggestions"] }
 once_cell = { version = "1", default-features = false, features = ["std"] }
 proc-macro2 = { version = "1.0", default-features = false }
 serde = { version = "1.0", default-features = false, features = ["derive"] }
 serde_json = { version = "1.0", default-features = false, features = ["std"] }
-syn = { version = "1.0", features = ["full", "extra-traits", "visit-mut", "visit"] }
+syn = { version = "2.0", features = ["full", "extra-traits", "visit-mut", "visit"] }
 tracing = { version = "0.1.34", default-features = false }
 quote = { version = "1.0", default-features = false }
diff --git a/lib/vector-config-common/src/validation.rs b/lib/vector-config-common/src/validation.rs
index f264b707fe461..569f80cf33007 100644
--- a/lib/vector-config-common/src/validation.rs
+++ b/lib/vector-config-common/src/validation.rs
@@ -1,7 +1,7 @@
 use darling::FromMeta;
 use proc_macro2::TokenStream;
 use quote::{quote, ToTokens};
-use syn::{Lit, Meta};
+use syn::{Expr, Lit, Meta};
 
 use crate::{
     num::{ERR_NUMERIC_OUT_OF_RANGE, NUMERIC_ENFORCED_LOWER_BOUND, NUMERIC_ENFORCED_UPPER_BOUND},
@@ -336,17 +336,19 @@ fn maybe_float_or_int(meta: &Meta) -> darling::Result<Option<f64>> {
     // First make sure we can even get a valid f64 from this meta item.
     let result = match meta {
         Meta::Path(_) => Err(darling::Error::unexpected_type("path")),
-        Meta::List(_) => Err(darling::Error::unexpected_type("path")),
-        Meta::NameValue(nv) => match &nv.lit {
-            Lit::Str(s) => {
-                let s = s.value();
-                s.as_str()
-                    .parse()
-                    .map_err(|_| darling::Error::unknown_value(s.as_str()))
-            }
-            Lit::Int(i) => i.base10_parse::<f64>().map_err(Into::into),
-            Lit::Float(f) => f.base10_parse::<f64>().map_err(Into::into),
-            lit => Err(darling::Error::unexpected_lit_type(lit)),
+        Meta::List(_) => Err(darling::Error::unexpected_type("list")),
+        Meta::NameValue(nv) => match &nv.value {
+            Expr::Lit(expr) => match &expr.lit {
+                Lit::Str(s) => {
+                    let s = s.value();
+                    s.parse()
+                        .map_err(|_| darling::Error::unknown_value(s.as_str()))
+                }
+                Lit::Int(i) => i.base10_parse::<f64>().map_err(Into::into),
+                Lit::Float(f) => f.base10_parse::<f64>().map_err(Into::into),
+                lit => Err(darling::Error::unexpected_lit_type(lit)),
+            },
+            expr => Err(darling::Error::unexpected_expr_type(expr)),
         },
     };
 
diff --git a/lib/vector-config-macros/Cargo.toml b/lib/vector-config-macros/Cargo.toml
index 2a133adaa4fcd..60c0e9b3523d6 100644
--- a/lib/vector-config-macros/Cargo.toml
+++ b/lib/vector-config-macros/Cargo.toml
@@ -8,13 +8,13 @@ license = "MPL-2.0"
 proc-macro = true
 
 [dependencies]
-darling = { version = "0.13", default-features = false, features = ["suggestions"] }
+darling = { version = "0.20", default-features = false, features = ["suggestions"] }
 proc-macro2 = { version = "1.0", default-features = false }
 quote = { version = "1.0", default-features = false }
-serde_derive_internals = "0.26"
-syn = { version = "1.0", default-features = false, features = ["full", "extra-traits", "visit-mut", "visit"] }
+serde_derive_internals = "0.28"
+syn = { version = "2.0", default-features = false, features = ["full", "extra-traits", "visit-mut", "visit"] }
 vector-config-common = { path = "../vector-config-common" }
 
 [dev-dependencies]
-serde = { version = "1.0.164", default-features = false }
+serde = { version = "1.0.183", default-features = false }
 vector-config = { path = "../vector-config" }
diff --git a/lib/vector-config-macros/src/ast/container.rs b/lib/vector-config-macros/src/ast/container.rs
index f4a47e71d18e7..28cc12f69a35a 100644
--- a/lib/vector-config-macros/src/ast/container.rs
+++ b/lib/vector-config-macros/src/ast/container.rs
@@ -368,7 +368,7 @@ impl<'a> Container<'a> {
     /// standard `#[deprecated]` attribute, neither automatically applying it nor deriving the
     /// deprecation status of a field when it is present.
     pub fn deprecated(&self) -> bool {
-        self.attrs.deprecated.is_some()
+        self.attrs.deprecated.is_present()
     }
 
     /// Metadata (custom attributes) for the container, if any.
@@ -584,7 +584,7 @@ mod tests {
         assert_eq!(literals_to_idents(&["T"]), idents);
 
         // We don't support parenthesized type parameters, like when using a function pointer type.
-        let parenthesized_type: Type = parse_quote! { Something<Fn(bool) -> String> };
+        let parenthesized_type: Type = parse_quote! { Something<fn(bool) -> String> };
         let idents = get_generic_type_param_idents(&parenthesized_type);
         assert_eq!(None, idents);
     }
diff --git a/lib/vector-config-macros/src/ast/field.rs b/lib/vector-config-macros/src/ast/field.rs
index 790bf07b7dadd..d38ce6c95417c 100644
--- a/lib/vector-config-macros/src/ast/field.rs
+++ b/lib/vector-config-macros/src/ast/field.rs
@@ -2,9 +2,10 @@ use darling::{
     util::{Flag, Override, SpannedValue},
     FromAttributes,
 };
-use proc_macro2::Span;
+use proc_macro2::{Span, TokenStream};
+use quote::ToTokens;
 use serde_derive_internals::ast as serde_ast;
-use syn::{parse_quote, spanned::Spanned, ExprPath, Ident};
+use syn::{parse_quote, ExprPath, Ident};
 use vector_config_common::validation::Validation;
 
 use super::{
@@ -174,7 +175,7 @@ impl<'a> Field<'a> {
     /// variants, to simply document themselves at the container/variant level and avoid needing to
     /// document that inner field which itself needs no further title/description.
     pub fn transparent(&self) -> bool {
-        self.attrs.transparent.is_some()
+        self.attrs.transparent.is_present()
     }
 
     /// Whether or not the field is deprecated.
@@ -239,12 +240,9 @@ impl<'a> Field<'a> {
     }
 }
 
-impl<'a> Spanned for Field<'a> {
-    fn span(&self) -> proc_macro2::Span {
-        match self.original.ident.as_ref() {
-            Some(ident) => ident.span(),
-            None => self.original.ty.span(),
-        }
+impl<'a> ToTokens for Field<'a> {
+    fn to_tokens(&self, tokens: &mut TokenStream) {
+        self.original.to_tokens(tokens)
     }
 }
 
@@ -300,12 +298,12 @@ impl Attributes {
             // to throw an error if they are. As we're going to forcefully mark the field as
             // transparent, there's no reason to allow setting derived/transparent manually, as it
             // only leads to boilerplate and potential confusion.
-            if self.transparent.is_some() {
-                return Err(err_field_implicit_transparent(&self.transparent));
+            if self.transparent.is_present() {
+                return Err(err_field_implicit_transparent(&self.transparent.span()));
             }
 
-            if self.derived.is_some() {
-                return Err(err_field_implicit_transparent(&self.derived));
+            if self.derived.is_present() {
+                return Err(err_field_implicit_transparent(&self.derived.span()));
             }
 
             self.transparent = SpannedValue::new(Flag::present(), Span::call_site());
@@ -339,8 +337,8 @@ impl Attributes {
         // like a field that is flattened or not visible, it makes no sense to require a description or title for fields
         // in a virtual newtype.
         if self.description.is_none()
-            && !self.derived.is_some()
-            && !self.transparent.is_some()
+            && !self.derived.is_present()
+            && !self.transparent.is_present()
             && self.visible
             && !self.flatten
             && !is_virtual_newtype
diff --git a/lib/vector-config-macros/src/ast/mod.rs b/lib/vector-config-macros/src/ast/mod.rs
index 7688d6f2df511..1825f9e6fd4e9 100644
--- a/lib/vector-config-macros/src/ast/mod.rs
+++ b/lib/vector-config-macros/src/ast/mod.rs
@@ -1,4 +1,4 @@
-use darling::{error::Accumulator, util::path_to_string, FromMeta};
+use darling::{ast::NestedMeta, error::Accumulator, util::path_to_string, FromMeta};
 use quote::ToTokens;
 use serde_derive_internals::{ast as serde_ast, attr as serde_attr};
 
@@ -9,7 +9,7 @@ mod variant;
 
 pub use container::Container;
 pub use field::Field;
-use syn::{Expr, NestedMeta};
+use syn::Expr;
 pub use variant::Variant;
 use vector_config_common::constants;
 
@@ -196,36 +196,46 @@ impl FromMeta for Metadata {
                         errors.push(darling::Error::unexpected_type("list").with_span(nmeta));
                         None
                     }
-                    syn::Meta::NameValue(nv) => match &nv.lit {
-                        // When dealing with a string literal, we check if it ends in `()`. If so,
-                        // we emit that as-is, leading to doing a function call and using the return
-                        // value of that function as the value for this key/value pair.
-                        //
-                        // Otherwise, we just treat the string literal normally.
-                        syn::Lit::Str(s) => {
-                            if s.value().ends_with("()") {
-                                if let Ok(expr) = s.parse::<Expr>() {
-                                    Some(LazyCustomAttribute::KeyValue {
-                                        key: path_to_string(&nv.path),
-                                        value: expr.to_token_stream(),
-                                    })
-                                } else {
-                                    errors.push(
-                                        darling::Error::custom(INVALID_VALUE_EXPR).with_span(nmeta),
-                                    );
-                                    None
+                    syn::Meta::NameValue(nv) => match &nv.value {
+                        Expr::Lit(expr) => {
+                            match &expr.lit {
+                                // When dealing with a string literal, we check if it ends in `()`. If so,
+                                // we emit that as-is, leading to doing a function call and using the return
+                                // value of that function as the value for this key/value pair.
+                                //
+                                // Otherwise, we just treat the string literal normally.
+                                syn::Lit::Str(s) => {
+                                    if s.value().ends_with("()") {
+                                        if let Ok(expr) = s.parse::<Expr>() {
+                                            Some(LazyCustomAttribute::KeyValue {
+                                                key: path_to_string(&nv.path),
+                                                value: expr.to_token_stream(),
+                                            })
+                                        } else {
+                                            errors.push(
+                                                darling::Error::custom(INVALID_VALUE_EXPR)
+                                                    .with_span(nmeta),
+                                            );
+                                            None
+                                        }
+                                    } else {
+                                        Some(LazyCustomAttribute::KeyValue {
+                                            key: path_to_string(&nv.path),
+                                            value: s.value().to_token_stream(),
+                                        })
+                                    }
                                 }
-                            } else {
-                                Some(LazyCustomAttribute::KeyValue {
+                                lit => Some(LazyCustomAttribute::KeyValue {
                                     key: path_to_string(&nv.path),
-                                    value: s.value().to_token_stream(),
-                                })
+                                    value: lit.to_token_stream(),
+                                }),
                             }
                         }
-                        lit => Some(LazyCustomAttribute::KeyValue {
-                            key: path_to_string(&nv.path),
-                            value: lit.to_token_stream(),
-                        }),
+                        expr => {
+                            errors
+                                .push(darling::Error::unexpected_expr_type(expr).with_span(nmeta));
+                            None
+                        }
                     },
                 },
                 NestedMeta::Lit(_) => {
diff --git a/lib/vector-config-macros/src/ast/util.rs b/lib/vector-config-macros/src/ast/util.rs
index 30f66bd6a406a..ddd36c5739448 100644
--- a/lib/vector-config-macros/src/ast/util.rs
+++ b/lib/vector-config-macros/src/ast/util.rs
@@ -1,7 +1,10 @@
-use darling::error::Accumulator;
+use darling::{ast::NestedMeta, error::Accumulator};
 use quote::{quote, ToTokens};
 use serde_derive_internals::{attr as serde_attr, Ctxt};
-use syn::{spanned::Spanned, Attribute, ExprPath, Lit, Meta, MetaNameValue, NestedMeta};
+use syn::{
+    punctuated::Punctuated, spanned::Spanned, token::Comma, Attribute, Expr, ExprLit, ExprPath,
+    Lit, Meta, MetaNameValue,
+};
 
 const ERR_FIELD_MISSING_DESCRIPTION: &str = "field must have a description -- i.e. `/// This is a widget...` or `#[configurable(description = \"...\")] -- or derive it from the underlying type of the field by specifying `#[configurable(derived)]`";
 const ERR_FIELD_IMPLICIT_TRANSPARENT: &str =
@@ -15,12 +18,16 @@ pub fn try_extract_doc_title_description(
     let doc_comments = attributes
         .iter()
         // We only care about `doc` attributes.
-        .filter(|attribute| attribute.path.is_ident("doc"))
+        .filter(|attribute| attribute.path().is_ident("doc"))
         // Extract the value of the attribute if it's in the form of `doc = "..."`.
-        .filter_map(|attribute| match attribute.parse_meta() {
-            Ok(Meta::NameValue(MetaNameValue {
-                lit: Lit::Str(s), ..
-            })) => Some(s.value()),
+        .filter_map(|attribute| match &attribute.meta {
+            Meta::NameValue(MetaNameValue {
+                value:
+                    Expr::Lit(ExprLit {
+                        lit: Lit::Str(s), ..
+                    }),
+                ..
+            }) => Some(s.value()),
             _ => None,
         })
         .collect::<Vec<_>>();
@@ -209,12 +216,13 @@ fn find_name_value_attribute(
     attributes
         .iter()
         // Only take attributes whose name matches `attr_name`.
-        .filter(|attr| path_matches(&attr.path, attr_name))
-        // Make sure the contents actually parse as a normal structured attribute.
-        .filter_map(|attr| attr.parse_meta().ok())
+        .filter(|attr| path_matches(attr.path(), attr_name))
         // Derive macro helper attributes will always be in the list form.
-        .filter_map(|meta| match meta {
-            Meta::List(ml) => Some(ml.nested.into_iter()),
+        .filter_map(|attr| match &attr.meta {
+            Meta::List(ml) => ml
+                .parse_args_with(Punctuated::<NestedMeta, Comma>::parse_terminated)
+                .map(|nested| nested.into_iter())
+                .ok(),
             _ => None,
         })
         .flatten()
@@ -222,7 +230,10 @@ fn find_name_value_attribute(
         // name matches `name_key`, and return their value.
         .find_map(|nm| match nm {
             NestedMeta::Meta(meta) => match meta {
-                Meta::NameValue(nv) if path_matches(&nv.path, name_key) => Some(nv.lit),
+                Meta::NameValue(nv) if path_matches(&nv.path, name_key) => match nv.value {
+                    Expr::Lit(ExprLit { lit, .. }) => Some(lit),
+                    _ => None,
+                },
                 _ => None,
             },
             _ => None,
@@ -259,7 +270,7 @@ fn find_name_value_attribute(
 /// returned.
 pub fn find_delegated_serde_deser_ty(attributes: &[syn::Attribute]) -> Option<syn::Type> {
     // Make sure `#[serde_as(as = "...")]` is present.
-    find_name_value_attribute(attributes, "serde_as", "as")
+    find_name_value_attribute(attributes, "serde_as", "r#as")
         // Make sure `#[serde(with = "...")]` is present, and grab its value.
         .and_then(|_| find_name_value_attribute(attributes, "serde", "with"))
         // Try and parse the value as a type path.
diff --git a/lib/vector-config-macros/src/ast/variant.rs b/lib/vector-config-macros/src/ast/variant.rs
index ea25903a9ec00..5b54ebc30d18f 100644
--- a/lib/vector-config-macros/src/ast/variant.rs
+++ b/lib/vector-config-macros/src/ast/variant.rs
@@ -1,7 +1,7 @@
 use darling::{error::Accumulator, util::Flag, FromAttributes};
-use proc_macro2::Ident;
+use proc_macro2::{Ident, TokenStream};
+use quote::ToTokens;
 use serde_derive_internals::ast as serde_ast;
-use syn::spanned::Spanned;
 
 use super::{
     util::{try_extract_doc_title_description, DarlingResultIterator},
@@ -140,7 +140,7 @@ impl<'a> Variant<'a> {
     /// standard `#[deprecated]` attribute, neither automatically applying it nor deriving the
     /// deprecation status of a variant when it is present.
     pub fn deprecated(&self) -> bool {
-        self.attrs.deprecated.is_some()
+        self.attrs.deprecated.is_present()
     }
 
     /// Whether or not this variant is visible during either serialization or deserialization.
@@ -166,9 +166,9 @@ impl<'a> Variant<'a> {
     }
 }
 
-impl<'a> Spanned for Variant<'a> {
-    fn span(&self) -> proc_macro2::Span {
-        self.original.span()
+impl<'a> ToTokens for Variant<'a> {
+    fn to_tokens(&self, tokens: &mut TokenStream) {
+        self.original.to_tokens(tokens)
     }
 }
 
diff --git a/lib/vector-config-macros/src/component_name.rs b/lib/vector-config-macros/src/component_name.rs
index 1dd974d604a7b..8c7e5efd2e65e 100644
--- a/lib/vector-config-macros/src/component_name.rs
+++ b/lib/vector-config-macros/src/component_name.rs
@@ -106,7 +106,7 @@ pub fn derive_component_name_impl(input: TokenStream) -> TokenStream {
 fn attr_to_component_name(attr: &Attribute) -> Result<Option<String>, Error> {
     // First, filter out anything that isn't ours.
     if !path_matches(
-        &attr.path,
+        attr.path(),
         &[
             attrs::ENRICHMENT_TABLE_COMPONENT,
             attrs::PROVIDER_COMPONENT,
@@ -121,14 +121,14 @@ fn attr_to_component_name(attr: &Attribute) -> Result<Option<String>, Error> {
 
     // Reconstruct the original attribute path (i.e. `source`) from our marker version of it (i.e.
     // `source_component`), so that any error message we emit is contextually relevant.
-    let path_str = path_to_string(&attr.path);
+    let path_str = path_to_string(attr.path());
     let component_type_attr = path_str.replace("_component", "");
     let component_type = component_type_attr.replace('_', " ");
 
     // Make sure the attribute actually has inner tokens. If it doesn't, this means they forgot
     // entirely to specify a component name, and we want to give back a meaningful error that looks
     // correct when applied in the context of `#[configurable_component(...)]`.
-    if attr.tokens.is_empty() {
+    if attr.meta.require_list().is_err() {
         return Err(Error::new(
             attr.span(),
             format!(
@@ -162,6 +162,10 @@ fn check_component_name_validity(component_name: &str) -> Result<(), String> {
     // In a nutshell, component names must contain only lowercase ASCII alphabetic characters, or
     // numbers, or underscores.
 
+    if component_name.is_empty() {
+        return Err("component name must be non-empty".to_string());
+    }
+
     // We only support ASCII names, so get that out of the way.
     if !component_name.is_ascii() {
         return Err("component names may only contain ASCII characters".to_string());
diff --git a/lib/vector-config-macros/src/configurable.rs b/lib/vector-config-macros/src/configurable.rs
index 21c87804e34bf..b26e317b998f5 100644
--- a/lib/vector-config-macros/src/configurable.rs
+++ b/lib/vector-config-macros/src/configurable.rs
@@ -2,7 +2,7 @@ use proc_macro::TokenStream;
 use proc_macro2::Span;
 use quote::{quote, quote_spanned};
 use syn::{
-    parse_macro_input, parse_quote, spanned::Spanned, token::Colon2, DeriveInput, ExprPath, Ident,
+    parse_macro_input, parse_quote, spanned::Spanned, token::PathSep, DeriveInput, ExprPath, Ident,
     PathArguments, Type,
 };
 use vector_config_common::validation::Validation;
@@ -1058,7 +1058,7 @@ fn get_ty_for_expr_pos(ty: &syn::Type) -> syn::Type {
             let mut new_tp = tp.clone();
             for segment in new_tp.path.segments.iter_mut() {
                 if let PathArguments::AngleBracketed(ab) = &mut segment.arguments {
-                    ab.colon2_token = Some(Colon2::default());
+                    ab.colon2_token = Some(PathSep::default());
                 }
             }
 
diff --git a/lib/vector-config-macros/src/configurable_component.rs b/lib/vector-config-macros/src/configurable_component.rs
index 37acc7703f24d..42d7813768aa6 100644
--- a/lib/vector-config-macros/src/configurable_component.rs
+++ b/lib/vector-config-macros/src/configurable_component.rs
@@ -1,10 +1,10 @@
-use darling::{Error, FromMeta};
+use darling::{ast::NestedMeta, Error, FromMeta};
 use proc_macro::TokenStream;
 use proc_macro2::{Ident, Span};
 use quote::{quote, quote_spanned};
 use syn::{
     parse_macro_input, parse_quote, parse_quote_spanned, punctuated::Punctuated, spanned::Spanned,
-    token::Comma, AttributeArgs, DeriveInput, Lit, LitStr, Meta, MetaList, NestedMeta, Path,
+    token::Comma, DeriveInput, Lit, LitStr, Meta, MetaList, Path,
 };
 use vector_config_common::{
     constants::ComponentType, human_friendly::generate_human_friendly_string,
@@ -41,16 +41,19 @@ impl TypedComponent {
     /// If the meta list does not have a path that matches a known component type, `None` is
     /// returned. Otherwise, `Some(...)` is returned with a valid `TypedComponent`.
     fn from_meta_list(ml: &MetaList) -> Option<Self> {
-        let mut items = ml.nested.iter();
+        let mut items = ml
+            .parse_args_with(Punctuated::<NestedMeta, Comma>::parse_terminated)
+            .unwrap_or_default()
+            .into_iter();
         ComponentType::try_from(&ml.path)
             .ok()
             .map(|component_type| {
                 let component_name = match items.next() {
-                    Some(NestedMeta::Lit(Lit::Str(component_name))) => Some(component_name.clone()),
+                    Some(NestedMeta::Lit(Lit::Str(component_name))) => Some(component_name),
                     _ => None,
                 };
                 let description = match items.next() {
-                    Some(NestedMeta::Lit(Lit::Str(description))) => Some(description.clone()),
+                    Some(NestedMeta::Lit(Lit::Str(description))) => Some(description),
                     _ => None,
                 };
                 Self {
@@ -157,7 +160,7 @@ struct Options {
 }
 
 impl FromMeta for Options {
-    fn from_list(items: &[syn::NestedMeta]) -> darling::Result<Self> {
+    fn from_list(items: &[NestedMeta]) -> darling::Result<Self> {
         let mut typed_component = None;
         let mut no_ser = false;
         let mut no_deser = false;
@@ -255,7 +258,10 @@ impl Options {
 }
 
 pub fn configurable_component_impl(args: TokenStream, item: TokenStream) -> TokenStream {
-    let args = parse_macro_input!(args as AttributeArgs);
+    let args: Vec<NestedMeta> =
+        parse_macro_input!(args with Punctuated::<NestedMeta, Comma>::parse_terminated)
+            .into_iter()
+            .collect();
     let input = parse_macro_input!(item as DeriveInput);
 
     let options = match Options::from_list(&args) {
diff --git a/lib/vector-config/Cargo.toml b/lib/vector-config/Cargo.toml
index e1acd6593233c..83432b11e813e 100644
--- a/lib/vector-config/Cargo.toml
+++ b/lib/vector-config/Cargo.toml
@@ -16,14 +16,14 @@ chrono-tz = { version = "0.8.3", default-features = false }
 encoding_rs = { version = "0.8", default-features = false, features = ["alloc", "serde"] }
 indexmap = { version = "2.0", default-features = false, features = ["std"] }
 inventory = { version = "0.3" }
-no-proxy = { version  = "0.3.1", default-features = false, features = ["serialize"] }
-num-traits = { version = "0.2.15", default-features = false }
+no-proxy = { version = "0.3.3", default-features = false, features = ["serialize"] }
+num-traits = { version = "0.2.16", default-features = false }
 once_cell = { version = "1", default-features = false }
 serde = { version = "1.0", default-features = false }
 serde_json = { version = "1.0", default-features = false, features = ["std"] }
-serde_with = { version = "2.3.2", default-features = false, features = ["std"] }
-snafu = { version = "0.7.4", default-features = false }
-toml = { version = "0.7.5", default-features = false }
+serde_with = { version = "3.2.0", default-features = false, features = ["std"] }
+snafu = { version = "0.7.5", default-features = false }
+toml = { version = "0.7.6", default-features = false }
 tracing = { version = "0.1.34", default-features = false }
 url = { version = "2.4.0", default-features = false, features = ["serde"] }
 vrl.workspace = true
@@ -32,4 +32,4 @@ vector-config-macros = { path = "../vector-config-macros" }
 
 [dev-dependencies]
 assert-json-diff = { version = "2", default-features = false }
-serde_with = { version = "2.3.2", default-features = false, features = ["std", "macros"] }
+serde_with = { version = "3.2.0", default-features = false, features = ["std", "macros"] }
diff --git a/lib/vector-config/src/external/serde_with.rs b/lib/vector-config/src/external/serde_with.rs
index 05de17e3bf605..30267e2253943 100644
--- a/lib/vector-config/src/external/serde_with.rs
+++ b/lib/vector-config/src/external/serde_with.rs
@@ -50,7 +50,7 @@ where
 impl Configurable for serde_with::DurationSeconds<u64, serde_with::formats::Strict> {
     fn referenceable_name() -> Option<&'static str> {
         // We're masking the type parameters here because we only deal with whole seconds via this
-        // version, and handle fractional seconds with `DurationSeconds<f64, Strict>`, which we
+        // version, and handle fractional seconds with `DurationSecondsWithFrac<f64, Strict>`, which we
         // expose as `serde_with::DurationFractionalSeconds`.
         Some("serde_with::DurationSeconds")
     }
@@ -76,7 +76,7 @@ impl Configurable for serde_with::DurationSeconds<u64, serde_with::formats::Stri
     }
 }
 
-impl Configurable for serde_with::DurationSeconds<f64, serde_with::formats::Strict> {
+impl Configurable for serde_with::DurationSecondsWithFrac<f64, serde_with::formats::Strict> {
     fn referenceable_name() -> Option<&'static str> {
         // We're masking the type parameters here because we only deal with fractional seconds via this
         // version, and handle whole seconds with `DurationSeconds<u64, Strict>`, which we
diff --git a/lib/vector-config/src/schema/visitors/human_name.rs b/lib/vector-config/src/schema/visitors/human_name.rs
index dc2fb7e57cca9..4b9b2330d5ed2 100644
--- a/lib/vector-config/src/schema/visitors/human_name.rs
+++ b/lib/vector-config/src/schema/visitors/human_name.rs
@@ -127,7 +127,7 @@ mod tests {
             }
         }));
 
-        let mut visitor = GenerateHumanFriendlyNameVisitor::default();
+        let mut visitor = GenerateHumanFriendlyNameVisitor;
         visitor.visit_root_schema(&mut actual_schema);
 
         assert_schemas_eq(expected_schema, actual_schema);
@@ -150,7 +150,7 @@ mod tests {
             }
         }));
 
-        let mut visitor = GenerateHumanFriendlyNameVisitor::default();
+        let mut visitor = GenerateHumanFriendlyNameVisitor;
         visitor.visit_root_schema(&mut actual_schema);
 
         assert_schemas_eq(expected_schema, actual_schema);
@@ -177,7 +177,7 @@ mod tests {
             }
         }));
 
-        let mut visitor = GenerateHumanFriendlyNameVisitor::default();
+        let mut visitor = GenerateHumanFriendlyNameVisitor;
         visitor.visit_root_schema(&mut actual_schema);
 
         assert_schemas_eq(expected_schema, actual_schema);
@@ -204,7 +204,7 @@ mod tests {
             }
         }));
 
-        let mut visitor = GenerateHumanFriendlyNameVisitor::default();
+        let mut visitor = GenerateHumanFriendlyNameVisitor;
         visitor.visit_root_schema(&mut actual_schema);
 
         assert_schemas_eq(expected_schema, actual_schema);
@@ -222,7 +222,7 @@ mod tests {
 
         let expected_schema = actual_schema.clone();
 
-        let mut visitor = GenerateHumanFriendlyNameVisitor::default();
+        let mut visitor = GenerateHumanFriendlyNameVisitor;
         visitor.visit_root_schema(&mut actual_schema);
 
         assert_schemas_eq(expected_schema, actual_schema);
@@ -244,7 +244,7 @@ mod tests {
 
         let expected_schema = actual_schema.clone();
 
-        let mut visitor = GenerateHumanFriendlyNameVisitor::default();
+        let mut visitor = GenerateHumanFriendlyNameVisitor;
         visitor.visit_root_schema(&mut actual_schema);
 
         assert_schemas_eq(expected_schema, actual_schema);
@@ -278,7 +278,7 @@ mod tests {
             }
         }));
 
-        let mut visitor = GenerateHumanFriendlyNameVisitor::default();
+        let mut visitor = GenerateHumanFriendlyNameVisitor;
         visitor.visit_root_schema(&mut actual_schema);
 
         assert_schemas_eq(expected_schema, actual_schema);
diff --git a/lib/vector-core/Cargo.toml b/lib/vector-core/Cargo.toml
index 44e04b859fb92..d5bceb92c9c77 100644
--- a/lib/vector-core/Cargo.toml
+++ b/lib/vector-core/Cargo.toml
@@ -8,13 +8,13 @@ publish = false
 [dependencies]
 async-graphql = { version = "5.0.10", default-features = false, features = ["playground" ], optional = true }
 async-trait = { version = "0.1", default-features = false }
-bitmask-enum = { version = "2.1.0", default-features = false }
+bitmask-enum = { version = "2.2.2", default-features = false }
 bytes = { version = "1.4.0", default-features = false, features = ["serde"] }
 chrono = { version = "0.4.19", default-features = false, features = ["serde"] }
 crossbeam-utils = { version = "0.8.16", default-features = false }
 db-key = { version = "0.0.5", default-features = false, optional = true }
 deadpool-postgres = { version = "0.10.5"}
-dyn-clone = { version = "1.0.11", default-features = false }
+dyn-clone = { version = "1.0.12", default-features = false }
 enrichment = { path = "../enrichment", optional = true }
 enumflags2 = { version = "0.7.7", default-features = false }
 float_eq = { version = "1.0", default-features = false }
@@ -25,42 +25,42 @@ http = { version = "0.2.9", default-features = false }
 hyper-proxy = { version = "0.9.1", default-features = false, features = ["openssl-tls"] }
 indexmap = { version = "~2.0.0", default-features = false, features = ["serde", "std"] }
 lookup = { package = "vector-lookup", path = "../vector-lookup" }
-metrics = "0.21.0"
+metrics = "0.21.1"
 metrics-tracing-context = { version = "0.14.0", default-features = false }
-metrics-util = { version = "0.15.0", default-features = false, features = ["registry"] }
+metrics-util = { version = "0.15.1", default-features = false, features = ["registry"] }
 mlua = { version = "0.8.9", default-features = false, features = ["lua54", "send", "vendored"], optional = true }
-no-proxy = { version  = "0.3.2", default-features = false, features = ["serialize"] }
+no-proxy = { version  = "0.3.3", default-features = false, features = ["serialize"] }
 once_cell = { version = "1.18", default-features = false }
 ordered-float = { version = "3.7.0", default-features = false }
-openssl = { version = "0.10.55", default-features = false, features = ["vendored"] }
+openssl = { version = "0.10.56", default-features = false, features = ["vendored"] }
 parking_lot = { version = "0.12.1", default-features = false }
-pin-project = { version = "1.1.1", default-features = false }
+pin-project = { version = "1.1.3", default-features = false }
 proptest = { version = "1.2", optional = true }
 prost-types = { version = "0.11", default-features = false }
 prost = { version = "0.11", default-features = false, features = ["std"] }
 reqwest = { version = "0.11", features = ["json"] }
 quanta = { version = "0.11.1", default-features = false }
-regex = { version = "1.8.4", default-features = false, features = ["std", "perf"] }
+regex = { version = "1.9.3", default-features = false, features = ["std", "perf"] }
 ryu = { version = "1", default-features = false }
-serde = { version = "1.0.164", default-features = false, features = ["derive", "rc"] }
-serde_json = { version = "1.0.99", default-features = false }
-serde_with = { version = "2.3.2", default-features = false, features = ["std", "macros"] }
+serde = { version = "1.0.183", default-features = false, features = ["derive", "rc"] }
+serde_json = { version = "1.0.104", default-features = false }
+serde_with = { version = "3.2.0", default-features = false, features = ["std", "macros"] }
 smallvec = { version = "1", default-features = false, features = ["serde", "const_generics"] }
-snafu = { version = "0.7.4", default-features = false }
+snafu = { version = "0.7.5", default-features = false }
 socket2 = { version = "0.5.3", default-features = false }
-tokio = { version = "1.29.0", default-features = false, features = ["net"] }
+tokio = { version = "1.30.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"] }
 tokio-postgres = { version = "0.7.7", default-features = false, features = ["runtime", "with-chrono-0_4", "with-uuid-1", "with-serde_json-1"] }
-toml = { version = "0.7.5", default-features = false }
+toml = { version = "0.7.6", default-features = false }
 tonic = { version = "0.9", default-features = false, features = ["transport"] }
 tower = { version = "0.4", default-features = false, features = ["util"] }
 tracing = { version = "0.1.34", default-features = false }
 tracing-core = { version = "0.1.26", default-features = false }
 tracing-log = { version = "0.1.3", default-features = false }
 tracing-subscriber = { version = "0.3.17", default-features = false, features = ["std"] }
-typetag = { version = "0.2.8", default-features = false }
+typetag = { version = "0.2.12", default-features = false }
 twox-hash = { version = "1.6.3", default-features = false }
 url = { version = "2", default-features = false }
 urlencoding = { version = "2.1.0", default-features = false }
@@ -74,10 +74,10 @@ opentelemetry-rs = { version = "1", branch = "main" , git = "ssh://git@github.co
 vrl.workspace = true
 
 [target.'cfg(target_os = "macos")'.dependencies]
-security-framework = "2.9.1"
+security-framework = "2.9.2"
 
 [target.'cfg(windows)'.dependencies]
-schannel = "0.1.21"
+schannel = "0.1.22"
 
 [build-dependencies]
 prost-build = "0.11"
@@ -93,7 +93,7 @@ quickcheck_macros = "1"
 proptest = "1.2"
 similar-asserts = "1.4.2"
 tokio-test = "0.4.2"
-toml = { version = "0.7.5", default-features = false, features = ["parse"] }
+toml = { version = "0.7.6", default-features = false, features = ["parse"] }
 ndarray = "0.15.6"
 ndarray-stats = "0.5.1"
 noisy_float = "0.2.0"
diff --git a/lib/vector-core/benches/event/log_event.rs b/lib/vector-core/benches/event/log_event.rs
index 1b5ea41df44d5..7395ab98a60e4 100644
--- a/lib/vector-core/benches/event/log_event.rs
+++ b/lib/vector-core/benches/event/log_event.rs
@@ -6,6 +6,14 @@ use criterion::{
 use lookup::event_path;
 use vector_core::event::LogEvent;
 
+fn default_log_event() -> LogEvent {
+    let mut log_event = LogEvent::default();
+    log_event.insert(event_path!("one"), 1);
+    log_event.insert(event_path!("two"), 2);
+    log_event.insert(event_path!("three"), 3);
+    log_event
+}
+
 fn rename_key_flat(c: &mut Criterion) {
     let mut group: BenchmarkGroup<WallTime> =
         c.benchmark_group("vector_core::event::log_event::LogEvent::rename_key_flat");
@@ -13,13 +21,7 @@ fn rename_key_flat(c: &mut Criterion) {
 
     group.bench_function("rename_flat_key (key is present)", move |b| {
         b.iter_batched(
-            || {
-                let mut log_event = LogEvent::default();
-                log_event.insert("one", 1);
-                log_event.insert("two", 2);
-                log_event.insert("three", 3);
-                log_event
-            },
+            default_log_event,
             |mut log_event| {
                 log_event.rename_key(event_path!("one"), event_path!("1"));
             },
@@ -29,13 +31,7 @@ fn rename_key_flat(c: &mut Criterion) {
 
     group.bench_function("rename_flat_key (key is NOT present)", move |b| {
         b.iter_batched(
-            || {
-                let mut log_event = LogEvent::default();
-                log_event.insert("one", 1);
-                log_event.insert("two", 2);
-                log_event.insert("three", 3);
-                log_event
-            },
+            default_log_event,
             |mut log_event| {
                 log_event.rename_key(event_path!("four"), event_path!("4"));
             },
diff --git a/lib/vector-core/src/config/log_schema.rs b/lib/vector-core/src/config/log_schema.rs
index 62462c24a5567..9614b72c70202 100644
--- a/lib/vector-core/src/config/log_schema.rs
+++ b/lib/vector-core/src/config/log_schema.rs
@@ -1,11 +1,18 @@
-use lookup::lookup_v2::{parse_target_path, OptionalValuePath};
-use lookup::{owned_value_path, OwnedTargetPath, OwnedValuePath};
+use lookup::lookup_v2::OptionalTargetPath;
+use lookup::{OwnedTargetPath, OwnedValuePath};
 use once_cell::sync::{Lazy, OnceCell};
 use vector_config::configurable_component;
 
 static LOG_SCHEMA: OnceCell<LogSchema> = OnceCell::new();
 static LOG_SCHEMA_DEFAULT: Lazy<LogSchema> = Lazy::new(LogSchema::default);
 
+const MESSAGE: &str = "message";
+const TIMESTAMP: &str = "timestamp";
+const HOST: &str = "host";
+const SOURCE_TYPE: &str = "source_type";
+const METADATA: &str = "metadata";
+const INTERNAL_METADATA: &str = "internal_metadata";
+
 /// Loads Log Schema from configurations and sets global schema. Once this is
 /// done, configurations can be correctly loaded using configured log schema
 /// defaults.
@@ -43,24 +50,24 @@ pub struct LogSchema {
     ///
     /// This would be the field that holds the raw message, such as a raw log line.
     #[serde(default = "LogSchema::default_message_key")]
-    message_key: String,
+    message_key: OptionalTargetPath,
 
     /// The name of the event field to treat as the event timestamp.
     #[serde(default = "LogSchema::default_timestamp_key")]
-    timestamp_key: OptionalValuePath,
+    timestamp_key: OptionalTargetPath,
 
     /// The name of the event field to treat as the host which sent the message.
     ///
     /// This field will generally represent a real host, or container, that generated the message,
     /// but is somewhat source-dependent.
     #[serde(default = "LogSchema::default_host_key")]
-    host_key: String,
+    host_key: OptionalTargetPath,
 
     /// The name of the event field to set the source identifier in.
     ///
     /// This field will be set by the Vector source that the event was created in.
     #[serde(default = "LogSchema::default_source_type_key")]
-    source_type_key: String,
+    source_type_key: OptionalTargetPath,
 
     /// The name of the event field to set the internal event metadata in.
     ///
@@ -71,7 +78,7 @@ pub struct LogSchema {
     /// as it may (now, or in the future from upstream changes) contain information that should
     /// not be available within the pipeline.
     #[serde(default = "LogSchema::default_metadata_key")]
-    metadata_key: String,
+    metadata_key: OptionalTargetPath,
 
     /// The name of the event field for user-facing event metadata
     ///
@@ -101,63 +108,85 @@ impl Default for LogSchema {
 }
 
 impl LogSchema {
-    fn default_message_key() -> String {
-        String::from("message")
-    }
-
-    fn default_timestamp_key() -> OptionalValuePath {
-        OptionalValuePath {
-            path: Some(owned_value_path!("timestamp")),
-        }
+    fn default_message_key() -> OptionalTargetPath {
+        OptionalTargetPath::event(MESSAGE)
     }
 
-    fn default_host_key() -> String {
-        String::from("host")
+    fn default_timestamp_key() -> OptionalTargetPath {
+        OptionalTargetPath::event(TIMESTAMP)
     }
 
-    fn default_source_type_key() -> String {
-        String::from("source_type")
+    fn default_host_key() -> OptionalTargetPath {
+        OptionalTargetPath::event(HOST)
     }
 
-    fn default_metadata_key() -> String {
-        String::from("internal_metadata")
+    fn default_source_type_key() -> OptionalTargetPath {
+        OptionalTargetPath::event(SOURCE_TYPE)
     }
 
     fn default_user_metadata_key() -> String {
-        String::from("metadata")
+        String::from(METADATA)
     }
 
     fn default_annotations_key() -> String {
         String::from("annotations")
     }
 
-    pub fn message_key(&self) -> &str {
-        &self.message_key
+    fn default_metadata_key() -> OptionalTargetPath {
+        OptionalTargetPath::event(INTERNAL_METADATA)
+    }
+
+    pub fn message_key(&self) -> Option<&OwnedValuePath> {
+        self.message_key.path.as_ref().map(|key| &key.path)
     }
 
     /// Returns an `OwnedTargetPath` of the message key.
     /// This parses the path and will panic if it is invalid.
     ///
     /// This should only be used where the result will either be cached,
-    /// or performance isn't critical, since this requires parsing / memory allocation.
+    /// or performance isn't critical, since this requires memory allocation.
     pub fn owned_message_path(&self) -> OwnedTargetPath {
-        parse_target_path(self.message_key()).expect("valid message key")
+        self.message_key
+            .path
+            .as_ref()
+            .expect("valid message key")
+            .clone()
     }
 
     pub fn timestamp_key(&self) -> Option<&OwnedValuePath> {
-        self.timestamp_key.path.as_ref()
+        self.timestamp_key.as_ref().map(|key| &key.path)
+    }
+
+    pub fn host_key(&self) -> Option<&OwnedValuePath> {
+        self.host_key.as_ref().map(|key| &key.path)
+    }
+
+    pub fn source_type_key(&self) -> Option<&OwnedValuePath> {
+        self.source_type_key.as_ref().map(|key| &key.path)
+    }
+
+    pub fn metadata_key(&self) -> Option<&OwnedValuePath> {
+        self.metadata_key.as_ref().map(|key| &key.path)
+    }
+
+    pub fn message_key_target_path(&self) -> Option<&OwnedTargetPath> {
+        self.message_key.as_ref()
+    }
+
+    pub fn timestamp_key_target_path(&self) -> Option<&OwnedTargetPath> {
+        self.timestamp_key.as_ref()
     }
 
-    pub fn host_key(&self) -> &str {
-        &self.host_key
+    pub fn host_key_target_path(&self) -> Option<&OwnedTargetPath> {
+        self.host_key.as_ref()
     }
 
-    pub fn source_type_key(&self) -> &str {
-        &self.source_type_key
+    pub fn source_type_key_target_path(&self) -> Option<&OwnedTargetPath> {
+        self.source_type_key.as_ref()
     }
 
-    pub fn metadata_key(&self) -> &str {
-        &self.metadata_key
+    pub fn metadata_key_target_path(&self) -> Option<&OwnedTargetPath> {
+        self.metadata_key.as_ref()
     }
 
     pub fn user_metadata_key(&self) -> &str {
@@ -168,24 +197,24 @@ impl LogSchema {
         &self.annotations_key
     }
 
-    pub fn set_message_key(&mut self, v: String) {
-        self.message_key = v;
+    pub fn set_message_key(&mut self, path: Option<OwnedTargetPath>) {
+        self.message_key = OptionalTargetPath { path };
     }
 
-    pub fn set_timestamp_key(&mut self, v: Option<OwnedValuePath>) {
-        self.timestamp_key = OptionalValuePath { path: v };
+    pub fn set_timestamp_key(&mut self, path: Option<OwnedTargetPath>) {
+        self.timestamp_key = OptionalTargetPath { path };
     }
 
-    pub fn set_host_key(&mut self, v: String) {
-        self.host_key = v;
+    pub fn set_host_key(&mut self, path: Option<OwnedTargetPath>) {
+        self.host_key = OptionalTargetPath { path };
     }
 
-    pub fn set_source_type_key(&mut self, v: String) {
-        self.source_type_key = v;
+    pub fn set_source_type_key(&mut self, path: Option<OwnedTargetPath>) {
+        self.source_type_key = OptionalTargetPath { path };
     }
 
-    pub fn set_metadata_key(&mut self, v: String) {
-        self.metadata_key = v;
+    pub fn set_metadata_key(&mut self, path: Option<OwnedTargetPath>) {
+        self.metadata_key = OptionalTargetPath { path };
     }
 
     pub fn set_user_metadata_key(&mut self, v: String) {
@@ -208,35 +237,35 @@ impl LogSchema {
             {
                 errors.push("conflicting values for 'log_schema.host_key' found".to_owned());
             } else {
-                self.set_host_key(other.host_key().to_string());
+                self.set_host_key(other.host_key_target_path().cloned());
             }
             if self.message_key() != LOG_SCHEMA_DEFAULT.message_key()
                 && self.message_key() != other.message_key()
             {
                 errors.push("conflicting values for 'log_schema.message_key' found".to_owned());
             } else {
-                self.set_message_key(other.message_key().to_string());
+                self.set_message_key(other.message_key_target_path().cloned());
             }
             if self.timestamp_key() != LOG_SCHEMA_DEFAULT.timestamp_key()
                 && self.timestamp_key() != other.timestamp_key()
             {
                 errors.push("conflicting values for 'log_schema.timestamp_key' found".to_owned());
             } else {
-                self.set_timestamp_key(other.timestamp_key().cloned());
+                self.set_timestamp_key(other.timestamp_key_target_path().cloned());
             }
             if self.source_type_key() != LOG_SCHEMA_DEFAULT.source_type_key()
                 && self.source_type_key() != other.source_type_key()
             {
                 errors.push("conflicting values for 'log_schema.source_type_key' found".to_owned());
             } else {
-                self.set_source_type_key(other.source_type_key().to_string());
+                self.set_source_type_key(other.source_type_key_target_path().cloned());
             }
             if self.metadata_key() != LOG_SCHEMA_DEFAULT.metadata_key()
                 && self.metadata_key() != other.metadata_key()
             {
                 errors.push("conflicting values for 'log_schema.metadata_key' found".to_owned());
             } else {
-                self.set_metadata_key(other.metadata_key().to_string());
+                self.set_metadata_key(other.metadata_key_target_path().cloned());
             }
             if self.user_metadata_key() != LOG_SCHEMA_DEFAULT.user_metadata_key()
                 && self.user_metadata_key() != other.user_metadata_key()
diff --git a/lib/vector-core/src/config/mod.rs b/lib/vector-core/src/config/mod.rs
index 71786155d1d8f..c8a1fa48d149b 100644
--- a/lib/vector-core/src/config/mod.rs
+++ b/lib/vector-core/src/config/mod.rs
@@ -476,7 +476,7 @@ impl LogNamespace {
     ) {
         self.insert_vector_metadata(
             log,
-            Some(log_schema().source_type_key()),
+            log_schema().source_type_key(),
             path!("source_type"),
             Bytes::from_static(source_name.as_bytes()),
         );
@@ -555,10 +555,10 @@ mod test {
 
     #[test]
     fn test_insert_standard_vector_source_metadata() {
-        let nested_path = "a.b.c.d";
-
         let mut schema = LogSchema::default();
-        schema.set_source_type_key(nested_path.to_owned());
+        schema.set_source_type_key(Some(OwnedTargetPath::event(owned_value_path!(
+            "a", "b", "c", "d"
+        ))));
         init_log_schema(schema, false);
 
         let namespace = LogNamespace::Legacy;
diff --git a/lib/vector-core/src/event/discriminant.rs b/lib/vector-core/src/event/discriminant.rs
index 7c1eb40863e1c..fcbd5d0fa818f 100644
--- a/lib/vector-core/src/event/discriminant.rs
+++ b/lib/vector-core/src/event/discriminant.rs
@@ -27,7 +27,13 @@ impl Discriminant {
     pub fn from_log_event(event: &LogEvent, discriminant_fields: &[impl AsRef<str>]) -> Self {
         let values: Vec<Option<Value>> = discriminant_fields
             .iter()
-            .map(|discriminant_field| event.get(discriminant_field.as_ref()).cloned())
+            .map(|discriminant_field| {
+                event
+                    .parse_path_and_get_value(discriminant_field.as_ref())
+                    .ok()
+                    .flatten()
+                    .cloned()
+            })
             .collect();
         Self { values }
     }
diff --git a/lib/vector-core/src/event/estimated_json_encoded_size_of.rs b/lib/vector-core/src/event/estimated_json_encoded_size_of.rs
index b671c8a817919..9bfa3bf50a8b7 100644
--- a/lib/vector-core/src/event/estimated_json_encoded_size_of.rs
+++ b/lib/vector-core/src/event/estimated_json_encoded_size_of.rs
@@ -87,7 +87,7 @@ impl EstimatedJsonEncodedSizeOf for Value {
 /// need for UTF-8 replacement characters.
 ///
 /// This is the main reason why `EstimatedJsonEncodedSizeOf` is named as is, as most other types can
-/// be calculated exactly without a noticable performance penalty.
+/// be calculated exactly without a noticeable performance penalty.
 impl EstimatedJsonEncodedSizeOf for str {
     fn estimated_json_encoded_size_of(&self) -> JsonSize {
         JsonSize::new(QUOTES_SIZE + self.len())
diff --git a/lib/vector-core/src/event/log_event.rs b/lib/vector-core/src/event/log_event.rs
index b656ee014810a..fad0462699fbc 100644
--- a/lib/vector-core/src/event/log_event.rs
+++ b/lib/vector-core/src/event/log_event.rs
@@ -15,11 +15,12 @@ use lookup::lookup_v2::TargetPath;
 use lookup::PathPrefix;
 use serde::{Deserialize, Serialize, Serializer};
 use vector_common::{
-    internal_event::OptionalTag,
+    internal_event::{OptionalTag, TaggedEventsSent},
     json_size::{JsonSize, NonZeroJsonSize},
-    request_metadata::{EventCountTags, GetEventCountTags},
+    request_metadata::GetEventCountTags,
     EventDataEq,
 };
+use vrl::path::{parse_target_path, OwnedTargetPath, PathParseError};
 
 use super::{
     estimated_json_encoded_size_of::EstimatedJsonEncodedSizeOf,
@@ -31,6 +32,15 @@ use crate::config::LogNamespace;
 use crate::config::{log_schema, telemetry};
 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!(
+        "vector",
+        "source_type"
+    )))
+});
 
 #[derive(Debug, Deserialize)]
 struct Inner {
@@ -158,9 +168,10 @@ impl LogEvent {
     /// valid for `LogNamespace::Legacy`
     pub fn from_str_legacy(msg: impl Into<String>) -> Self {
         let mut log = LogEvent::default();
-        log.insert(log_schema().message_key(), msg.into());
-        if let Some(timestamp_key) = log_schema().timestamp_key() {
-            log.insert((PathPrefix::Event, timestamp_key), Utc::now());
+        log.maybe_insert(log_schema().message_key_target_path(), msg.into());
+
+        if let Some(timestamp_key) = log_schema().timestamp_key_target_path() {
+            log.insert(timestamp_key, Utc::now());
         }
 
         log
@@ -223,7 +234,7 @@ impl EstimatedJsonEncodedSizeOf for LogEvent {
 }
 
 impl GetEventCountTags for LogEvent {
-    fn get_tags(&self) -> EventCountTags {
+    fn get_tags(&self) -> TaggedEventsSent {
         let source = if telemetry().tags().emit_source {
             self.metadata().source_id().cloned().into()
         } else {
@@ -238,7 +249,7 @@ impl GetEventCountTags for LogEvent {
             OptionalTag::Ignored
         };
 
-        EventCountTags { source, service }
+        TaggedEventsSent { source, service }
     }
 }
 
@@ -292,6 +303,16 @@ impl LogEvent {
         self.metadata.add_finalizer(finalizer);
     }
 
+    /// Parse the specified `path` and if there are no parsing errors, attempt to get a reference to a value.
+    /// # Errors
+    /// Will return an error if path parsing failed.
+    pub fn parse_path_and_get_value(
+        &self,
+        path: impl AsRef<str>,
+    ) -> Result<Option<&Value>, PathParseError> {
+        parse_target_path(path.as_ref()).map(|path| self.get(&path))
+    }
+
     #[allow(clippy::needless_pass_by_value)] // TargetPath is always a reference
     pub fn get<'a>(&self, key: impl TargetPath<'a>) -> Option<&Value> {
         match key.prefix() {
@@ -300,19 +321,26 @@ impl LogEvent {
         }
     }
 
+    /// Retrieves the value of a field based on it's meaning.
+    /// This will first check if the value has previously been dropped. It is worth being
+    /// aware that if the field has been dropped and then somehow re-added, we still fetch
+    /// the dropped value here.
     pub fn get_by_meaning(&self, meaning: impl AsRef<str>) -> Option<&Value> {
-        self.metadata()
-            .schema_definition()
-            .meaning_path(meaning.as_ref())
-            .and_then(|path| self.get(path))
+        if let Some(dropped) = self.metadata().dropped_field(&meaning) {
+            Some(dropped)
+        } else {
+            self.metadata()
+                .schema_definition()
+                .meaning_path(meaning.as_ref())
+                .and_then(|path| self.get(path))
+        }
     }
 
-    // TODO(Jean): Once the event API uses `Lookup`, the allocation here can be removed.
-    pub fn find_key_by_meaning(&self, meaning: impl AsRef<str>) -> Option<String> {
+    /// Retrieves the target path of a field based on the specified `meaning`.
+    fn find_key_by_meaning(&self, meaning: impl AsRef<str>) -> Option<&OwnedTargetPath> {
         self.metadata()
             .schema_definition()
             .meaning_path(meaning.as_ref())
-            .map(std::string::ToString::to_string)
     }
 
     #[allow(clippy::needless_pass_by_value)] // TargetPath is always a reference
@@ -331,6 +359,19 @@ impl LogEvent {
         }
     }
 
+    /// Parse the specified `path` and if there are no parsing errors, attempt to insert the specified `value`.
+    ///
+    /// # Errors
+    /// Will return an error if path parsing failed.
+    pub fn parse_path_and_insert(
+        &mut self,
+        path: impl AsRef<str>,
+        value: impl Into<Value>,
+    ) -> Result<Option<Value>, PathParseError> {
+        let target_path = parse_target_path(path.as_ref())?;
+        Ok(self.insert(&target_path, value))
+    }
+
     #[allow(clippy::needless_pass_by_value)] // TargetPath is always a reference
     pub fn insert<'a>(
         &mut self,
@@ -346,6 +387,12 @@ impl LogEvent {
         }
     }
 
+    pub fn maybe_insert<'a>(&mut self, path: Option<impl TargetPath<'a>>, value: impl Into<Value>) {
+        if let Some(path) = path {
+            self.insert(path, value);
+        }
+    }
+
     // deprecated - using this means the schema is unknown
     pub fn try_insert<'a>(&mut self, path: impl TargetPath<'a>, value: impl Into<Value>) {
         if !self.contains(path.clone()) {
@@ -418,14 +465,16 @@ impl LogEvent {
     }
 
     /// Merge all fields specified at `fields` from `incoming` to `current`.
+    /// Note that `fields` containing dots and other special characters will be treated as a single segment.
     pub fn merge(&mut self, mut incoming: LogEvent, fields: &[impl AsRef<str>]) {
         for field in fields {
-            let Some(incoming_val) = incoming.remove(field.as_ref()) else {
-                continue;
+            let field_path = event_path!(field.as_ref());
+            let Some(incoming_val) = incoming.remove(field_path) else {
+                continue
             };
-            match self.get_mut(field.as_ref()) {
+            match self.get_mut(field_path) {
                 None => {
-                    self.insert(field.as_ref(), incoming_val);
+                    self.insert(field_path, incoming_val);
                 }
                 Some(current_val) => current_val.merge(incoming_val),
             }
@@ -439,45 +488,37 @@ impl LogEvent {
 impl LogEvent {
     /// Fetches the "message" path of the event. This is either from the "message" semantic meaning (Vector namespace)
     /// or from the message key set on the "Global Log Schema" (Legacy namespace).
-    // TODO: This can eventually return a `&TargetOwnedPath` once Semantic meaning and the
-    //   "Global Log Schema" are updated to the new path lookup code
-    pub fn message_path(&self) -> Option<String> {
+    pub fn message_path(&self) -> Option<&OwnedTargetPath> {
         match self.namespace() {
             LogNamespace::Vector => self.find_key_by_meaning("message"),
-            LogNamespace::Legacy => Some(log_schema().message_key().to_owned()),
+            LogNamespace::Legacy => log_schema().message_key_target_path(),
         }
     }
 
     /// Fetches the "timestamp" path of the event. This is either from the "timestamp" semantic meaning (Vector namespace)
     /// or from the timestamp key set on the "Global Log Schema" (Legacy namespace).
-    // TODO: This can eventually return a `&TargetOwnedPath` once Semantic meaning and the
-    //   "Global Log Schema" are updated to the new path lookup code
-    pub fn timestamp_path(&self) -> Option<String> {
+    pub fn timestamp_path(&self) -> Option<&OwnedTargetPath> {
         match self.namespace() {
             LogNamespace::Vector => self.find_key_by_meaning("timestamp"),
-            LogNamespace::Legacy => log_schema().timestamp_key().map(ToString::to_string),
+            LogNamespace::Legacy => log_schema().timestamp_key_target_path(),
         }
     }
 
     /// Fetches the `host` path of the event. This is either from the "host" semantic meaning (Vector namespace)
     /// or from the host key set on the "Global Log Schema" (Legacy namespace).
-    // TODO: This can eventually return a `&TargetOwnedPath` once Semantic meaning and the
-    //   "Global Log Schema" are updated to the new path lookup code
-    pub fn host_path(&self) -> Option<String> {
+    pub fn host_path(&self) -> Option<&OwnedTargetPath> {
         match self.namespace() {
             LogNamespace::Vector => self.find_key_by_meaning("host"),
-            LogNamespace::Legacy => Some(log_schema().host_key().to_owned()),
+            LogNamespace::Legacy => log_schema().host_key_target_path(),
         }
     }
 
     /// Fetches the `source_type` path of the event. This is either from the `source_type` Vector metadata field (Vector namespace)
     /// or from the `source_type` key set on the "Global Log Schema" (Legacy namespace).
-    // TODO: This can eventually return a `&TargetOwnedPath` once Semantic meaning and the
-    //   "Global Log Schema" are updated to the new path lookup code
-    pub fn source_type_path(&self) -> &'static str {
+    pub fn source_type_path(&self) -> Option<&OwnedTargetPath> {
         match self.namespace() {
-            LogNamespace::Vector => "%vector.source_type",
-            LogNamespace::Legacy => log_schema().source_type_key(),
+            LogNamespace::Vector => VECTOR_SOURCE_TYPE_PATH.as_ref(),
+            LogNamespace::Legacy => log_schema().source_type_key_target_path(),
         }
     }
 
@@ -486,7 +527,9 @@ impl LogEvent {
     pub fn get_message(&self) -> Option<&Value> {
         match self.namespace() {
             LogNamespace::Vector => self.get_by_meaning("message"),
-            LogNamespace::Legacy => self.get((PathPrefix::Event, log_schema().message_key())),
+            LogNamespace::Legacy => log_schema()
+                .message_key_target_path()
+                .and_then(|key| self.get(key)),
         }
     }
 
@@ -496,8 +539,8 @@ impl LogEvent {
         match self.namespace() {
             LogNamespace::Vector => self.get_by_meaning("timestamp"),
             LogNamespace::Legacy => log_schema()
-                .timestamp_key()
-                .and_then(|key| self.get((PathPrefix::Event, key))),
+                .timestamp_key_target_path()
+                .and_then(|key| self.get(key)),
         }
     }
 
@@ -505,7 +548,8 @@ impl LogEvent {
     /// or from the timestamp key set on the "Global Log Schema" (Legacy namespace).
     pub fn remove_timestamp(&mut self) -> Option<Value> {
         self.timestamp_path()
-            .and_then(|key| self.remove(key.as_str()))
+            .cloned()
+            .and_then(|key| self.remove(&key))
     }
 
     /// Fetches the `host` of the event. This is either from the "host" semantic meaning (Vector namespace)
@@ -513,7 +557,9 @@ impl LogEvent {
     pub fn get_host(&self) -> Option<&Value> {
         match self.namespace() {
             LogNamespace::Vector => self.get_by_meaning("host"),
-            LogNamespace::Legacy => self.get((PathPrefix::Event, log_schema().host_key())),
+            LogNamespace::Legacy => log_schema()
+                .host_key_target_path()
+                .and_then(|key| self.get(key)),
         }
     }
 
@@ -522,7 +568,9 @@ impl LogEvent {
     pub fn get_source_type(&self) -> Option<&Value> {
         match self.namespace() {
             LogNamespace::Vector => self.get(metadata_path!("vector", "source_type")),
-            LogNamespace::Legacy => self.get((PathPrefix::Event, log_schema().source_type_key())),
+            LogNamespace::Legacy => log_schema()
+                .source_type_key_target_path()
+                .and_then(|key| self.get(key)),
         }
     }
 }
@@ -552,10 +600,9 @@ mod test_utils {
     impl From<Bytes> for LogEvent {
         fn from(message: Bytes) -> Self {
             let mut log = LogEvent::default();
-
-            log.insert(log_schema().message_key(), message);
-            if let Some(timestamp_key) = log_schema().timestamp_key() {
-                log.insert((PathPrefix::Event, timestamp_key), Utc::now());
+            log.maybe_insert(log_schema().message_key_target_path(), message);
+            if let Some(timestamp_key) = log_schema().timestamp_key_target_path() {
+                log.insert(timestamp_key, Utc::now());
             }
             log
         }
@@ -621,6 +668,7 @@ impl TryInto<serde_json::Value> for LogEvent {
     }
 }
 
+#[cfg(any(test, feature = "test"))]
 impl<T> std::ops::Index<T> for LogEvent
 where
     T: AsRef<str>,
@@ -628,7 +676,9 @@ where
     type Output = Value;
 
     fn index(&self, key: T) -> &Value {
-        self.get(key.as_ref())
+        self.parse_path_and_get_value(key.as_ref())
+            .ok()
+            .flatten()
             .unwrap_or_else(|| panic!("Key is not found: {:?}", key.as_ref()))
     }
 }
@@ -640,7 +690,9 @@ where
 {
     fn extend<I: IntoIterator<Item = (K, V)>>(&mut self, iter: I) {
         for (k, v) in iter {
-            self.insert(k.as_ref(), v.into());
+            if let Ok(path) = parse_target_path(k.as_ref()) {
+                self.insert(&path, v.into());
+            }
         }
     }
 }
@@ -663,6 +715,24 @@ impl Serialize for LogEvent {
     }
 }
 
+// Tracing owned target paths used for tracing to log event conversions.
+struct TracingTargetPaths {
+    pub(crate) timestamp: OwnedTargetPath,
+    pub(crate) kind: OwnedTargetPath,
+    pub(crate) module_path: OwnedTargetPath,
+    pub(crate) level: OwnedTargetPath,
+    pub(crate) target: OwnedTargetPath,
+}
+
+/// Lazily initialized singleton.
+static TRACING_TARGET_PATHS: Lazy<TracingTargetPaths> = Lazy::new(|| TracingTargetPaths {
+    timestamp: OwnedTargetPath::event(owned_value_path!("timestamp")),
+    kind: OwnedTargetPath::event(owned_value_path!("metadata", "kind")),
+    level: OwnedTargetPath::event(owned_value_path!("metadata", "level")),
+    module_path: OwnedTargetPath::event(owned_value_path!("metadata", "module_path")),
+    target: OwnedTargetPath::event(owned_value_path!("metadata", "target")),
+});
+
 impl From<&tracing::Event<'_>> for LogEvent {
     fn from(event: &tracing::Event<'_>) -> Self {
         let now = chrono::Utc::now();
@@ -670,11 +740,11 @@ impl From<&tracing::Event<'_>> for LogEvent {
         event.record(&mut maker);
 
         let mut log = maker;
-        log.insert("timestamp", now);
+        log.insert(&TRACING_TARGET_PATHS.timestamp, now);
 
         let meta = event.metadata();
         log.insert(
-            "metadata.kind",
+            &TRACING_TARGET_PATHS.kind,
             if meta.is_event() {
                 Value::Bytes("event".to_string().into())
             } else if meta.is_span() {
@@ -683,42 +753,42 @@ impl From<&tracing::Event<'_>> for LogEvent {
                 Value::Null
             },
         );
-        log.insert("metadata.level", meta.level().to_string());
+        log.insert(&TRACING_TARGET_PATHS.level, meta.level().to_string());
         log.insert(
-            "metadata.module_path",
+            &TRACING_TARGET_PATHS.module_path,
             meta.module_path()
                 .map_or(Value::Null, |mp| Value::Bytes(mp.to_string().into())),
         );
-        log.insert("metadata.target", meta.target().to_string());
-
+        log.insert(&TRACING_TARGET_PATHS.target, meta.target().to_string());
         log
     }
 }
 
+/// Note that `tracing::field::Field` containing dots and other special characters will be treated as a single segment.
 impl tracing::field::Visit for LogEvent {
     fn record_str(&mut self, field: &tracing::field::Field, value: &str) {
-        self.insert(field.name(), value.to_string());
+        self.insert(event_path!(field.name()), value.to_string());
     }
 
     fn record_debug(&mut self, field: &tracing::field::Field, value: &dyn Debug) {
-        self.insert(field.name(), format!("{value:?}"));
+        self.insert(event_path!(field.name()), format!("{value:?}"));
     }
 
     fn record_i64(&mut self, field: &tracing::field::Field, value: i64) {
-        self.insert(field.name(), value);
+        self.insert(event_path!(field.name()), value);
     }
 
     fn record_u64(&mut self, field: &tracing::field::Field, value: u64) {
-        let field = field.name();
+        let field_path = event_path!(field.name());
         let converted: Result<i64, _> = value.try_into();
         match converted {
-            Ok(value) => self.insert(field, value),
-            Err(_) => self.insert(field, value.to_string()),
+            Ok(value) => self.insert(field_path, value),
+            Err(_) => self.insert(field_path, value.to_string()),
         };
     }
 
     fn record_bool(&mut self, field: &tracing::field::Field, value: bool) {
-        self.insert(field.name(), value);
+        self.insert(event_path!(field.name()), value);
     }
 }
 
diff --git a/lib/vector-core/src/event/metadata.rs b/lib/vector-core/src/event/metadata.rs
index d86884be7582c..f577147e11ded 100644
--- a/lib/vector-core/src/event/metadata.rs
+++ b/lib/vector-core/src/event/metadata.rs
@@ -46,6 +46,14 @@ pub struct EventMetadata {
     /// TODO(Jean): must not skip serialization to track schemas across restarts.
     #[serde(default = "default_schema_definition", skip)]
     schema_definition: Arc<schema::Definition>,
+
+    /// A store of values that may be dropped during the encoding process but may be needed
+    /// later on. The map is indexed by meaning.
+    /// Currently this is just used for the `service`. If the service field is dropped by `only_fields`
+    /// we need to ensure it is still available later on for emitting metrics tagged by the service.
+    /// This field could almost be keyed by `&'static str`, but because it needs to be deserializable
+    /// we have to use `String`.
+    dropped_fields: BTreeMap<String, Value>,
 }
 
 fn default_metadata_value() -> Value {
@@ -123,6 +131,19 @@ impl EventMetadata {
     pub fn set_splunk_hec_token(&mut self, secret: Arc<str>) {
         self.secrets.insert(SPLUNK_HEC_TOKEN, secret);
     }
+
+    /// Adds the value to the dropped fields list.
+    /// There is currently no way to remove a field from this list, so if a field is dropped
+    /// and then the field is re-added with a new value - the dropped value will still be
+    /// retrieved.
+    pub fn add_dropped_field(&mut self, meaning: String, value: Value) {
+        self.dropped_fields.insert(meaning, value);
+    }
+
+    /// Fetches the dropped field by meaning.
+    pub fn dropped_field(&self, meaning: impl AsRef<str>) -> Option<&Value> {
+        self.dropped_fields.get(meaning.as_ref())
+    }
 }
 
 impl Default for EventMetadata {
@@ -134,6 +155,7 @@ impl Default for EventMetadata {
             schema_definition: default_schema_definition(),
             source_id: None,
             upstream_id: None,
+            dropped_fields: BTreeMap::new(),
         }
     }
 }
diff --git a/lib/vector-core/src/event/metric/mezmo/vector.rs b/lib/vector-core/src/event/metric/mezmo/vector.rs
index 54bfb7e3f85ad..5421a1022fdfe 100644
--- a/lib/vector-core/src/event/metric/mezmo/vector.rs
+++ b/lib/vector-core/src/event/metric/mezmo/vector.rs
@@ -249,13 +249,13 @@ pub fn to_metric(log: &LogEvent) -> Result<Metric, TransformError> {
     let metadata = log.metadata().clone();
 
     let root = log
-        .get(log_schema().message_key())
+        .get(log_schema().message_key_target_path().unwrap())
         .ok_or_else(|| TransformError::FieldNotFound {
-            field: log_schema().message_key().into(),
+            field: log_schema().message_key().unwrap().to_string(),
         })?
         .as_object()
         .ok_or_else(|| TransformError::FieldInvalidType {
-            field: log_schema().message_key().into(),
+            field: log_schema().message_key().unwrap().to_string(),
         })?;
 
     let name =
diff --git a/lib/vector-core/src/event/metric/mod.rs b/lib/vector-core/src/event/metric/mod.rs
index 478310428faf1..b19fbe948c381 100644
--- a/lib/vector-core/src/event/metric/mod.rs
+++ b/lib/vector-core/src/event/metric/mod.rs
@@ -12,9 +12,9 @@ use std::{
 
 use chrono::{DateTime, Utc};
 use vector_common::{
-    internal_event::OptionalTag,
+    internal_event::{OptionalTag, TaggedEventsSent},
     json_size::JsonSize,
-    request_metadata::{EventCountTags, GetEventCountTags},
+    request_metadata::GetEventCountTags,
     EventDataEq,
 };
 use vector_config::configurable_component;
@@ -499,7 +499,7 @@ impl Finalizable for Metric {
 }
 
 impl GetEventCountTags for Metric {
-    fn get_tags(&self) -> EventCountTags {
+    fn get_tags(&self) -> TaggedEventsSent {
         let source = if telemetry().tags().emit_source {
             self.metadata().source_id().cloned().into()
         } else {
@@ -516,7 +516,7 @@ impl GetEventCountTags for Metric {
             OptionalTag::Ignored
         };
 
-        EventCountTags { source, service }
+        TaggedEventsSent { source, service }
     }
 }
 
diff --git a/lib/vector-core/src/event/mod.rs b/lib/vector-core/src/event/mod.rs
index 9547f58dc5ed3..5c385df1fd913 100644
--- a/lib/vector-core/src/event/mod.rs
+++ b/lib/vector-core/src/event/mod.rs
@@ -20,11 +20,8 @@ use serde::{Deserialize, Serialize};
 pub use trace::TraceEvent;
 use vector_buffers::EventCount;
 use vector_common::{
-    config::ComponentKey,
-    finalization,
-    json_size::JsonSize,
-    request_metadata::{EventCountTags, GetEventCountTags},
-    EventDataEq,
+    config::ComponentKey, finalization, internal_event::TaggedEventsSent, json_size::JsonSize,
+    request_metadata::GetEventCountTags, EventDataEq,
 };
 pub use vrl::value::Value;
 #[cfg(feature = "vrl")]
@@ -97,7 +94,7 @@ impl Finalizable for Event {
 }
 
 impl GetEventCountTags for Event {
-    fn get_tags(&self) -> EventCountTags {
+    fn get_tags(&self) -> TaggedEventsSent {
         match self {
             Event::Log(log) => log.get_tags(),
             Event::Metric(metric) => metric.get_tags(),
diff --git a/lib/vector-core/src/event/test/size_of.rs b/lib/vector-core/src/event/test/size_of.rs
index 89770273dbadc..522b0f0520fe4 100644
--- a/lib/vector-core/src/event/test/size_of.rs
+++ b/lib/vector-core/src/event/test/size_of.rs
@@ -115,13 +115,12 @@ fn log_operation_maintains_size() {
             match action {
                 Action::InsertFlat { key, value } => {
                     let new_value_sz = value.size_of();
-                    let old_value_sz = log_event
-                        .get((PathPrefix::Event, path!(key.as_str())))
-                        .map_or(0, ByteSizeOf::size_of);
+                    let target_path = (PathPrefix::Event, path!(key.as_str()));
+                    let old_value_sz = log_event.get(target_path).map_or(0, ByteSizeOf::size_of);
                     if !log_event.contains(key.as_str()) {
                         current_size += key.size_of();
                     }
-                    log_event.insert((PathPrefix::Event, path!(&key)), value);
+                    log_event.insert(target_path, value);
                     current_size -= old_value_sz;
                     current_size += new_value_sz;
                 }
diff --git a/lib/vector-core/src/event/trace.rs b/lib/vector-core/src/event/trace.rs
index 3885b50b9f13d..120c6c55f490b 100644
--- a/lib/vector-core/src/event/trace.rs
+++ b/lib/vector-core/src/event/trace.rs
@@ -4,10 +4,10 @@ use lookup::lookup_v2::TargetPath;
 use serde::{Deserialize, Serialize};
 use vector_buffers::EventCount;
 use vector_common::{
-    json_size::JsonSize,
-    request_metadata::{EventCountTags, GetEventCountTags},
+    internal_event::TaggedEventsSent, json_size::JsonSize, request_metadata::GetEventCountTags,
     EventDataEq,
 };
+use vrl::path::PathParseError;
 
 use super::{
     BatchNotifier, EstimatedJsonEncodedSizeOf, EventFinalizer, EventFinalizers, EventMetadata,
@@ -72,25 +72,46 @@ impl TraceEvent {
         self.0.as_map().expect("inner value must be a map")
     }
 
+    /// Parse the specified `path` and if there are no parsing errors, attempt to get a reference to a value.
+    /// # Errors
+    /// Will return an error if path parsing failed.
+    pub fn parse_path_and_get_value(
+        &self,
+        path: impl AsRef<str>,
+    ) -> Result<Option<&Value>, PathParseError> {
+        self.0.parse_path_and_get_value(path)
+    }
+
     #[allow(clippy::needless_pass_by_value)] // TargetPath is always a reference
     pub fn get<'a>(&self, key: impl TargetPath<'a>) -> Option<&Value> {
         self.0.get(key)
     }
 
-    pub fn get_mut(&mut self, key: impl AsRef<str>) -> Option<&mut Value> {
-        self.0.get_mut(key.as_ref())
+    pub fn get_mut<'a>(&mut self, key: impl TargetPath<'a>) -> Option<&mut Value> {
+        self.0.get_mut(key)
     }
 
-    pub fn contains(&self, key: impl AsRef<str>) -> bool {
-        self.0.contains(key.as_ref())
+    pub fn contains<'a>(&self, key: impl TargetPath<'a>) -> bool {
+        self.0.contains(key)
     }
 
-    pub fn insert(
+    pub fn insert<'a>(
         &mut self,
-        key: impl AsRef<str>,
+        key: impl TargetPath<'a>,
         value: impl Into<Value> + Debug,
     ) -> Option<Value> {
-        self.0.insert(key.as_ref(), value.into())
+        self.0.insert(key, value.into())
+    }
+
+    pub fn maybe_insert<'a, F: FnOnce() -> Value>(
+        &mut self,
+        path: Option<impl TargetPath<'a>>,
+        value_callback: F,
+    ) -> Option<Value> {
+        if let Some(path) = path {
+            return self.0.insert(path, value_callback());
+        }
+        None
     }
 }
 
@@ -149,7 +170,7 @@ impl AsMut<LogEvent> for TraceEvent {
 }
 
 impl GetEventCountTags for TraceEvent {
-    fn get_tags(&self) -> EventCountTags {
+    fn get_tags(&self) -> TaggedEventsSent {
         self.0.get_tags()
     }
 }
diff --git a/lib/vector-core/src/event/vrl_target.rs b/lib/vector-core/src/event/vrl_target.rs
index 782aa7ee2ae03..d917d52a66e15 100644
--- a/lib/vector-core/src/event/vrl_target.rs
+++ b/lib/vector-core/src/event/vrl_target.rs
@@ -52,6 +52,12 @@ pub struct TargetIter<T> {
     _marker: PhantomData<T>,
 }
 
+fn create_log_event(value: Value, metadata: EventMetadata) -> LogEvent {
+    let mut log = LogEvent::new_with_metadata(metadata);
+    log.maybe_insert(log_schema().message_key_target_path(), value);
+    log
+}
+
 impl Iterator for TargetIter<LogEvent> {
     type Item = Event;
 
@@ -59,11 +65,7 @@ impl Iterator for TargetIter<LogEvent> {
         self.iter.next().map(|v| {
             match v {
                 value @ Value::Object(_) => LogEvent::from_parts(value, self.metadata.clone()),
-                value => {
-                    let mut log = LogEvent::new_with_metadata(self.metadata.clone());
-                    log.insert(log_schema().message_key(), value);
-                    log
-                }
+                value => create_log_event(value, self.metadata.clone()),
             }
             .into()
         })
@@ -79,11 +81,7 @@ impl Iterator for TargetIter<TraceEvent> {
                 value @ Value::Object(_) => {
                     TraceEvent::from(LogEvent::from_parts(value, self.metadata.clone()))
                 }
-                value => {
-                    let mut log = LogEvent::new_with_metadata(self.metadata.clone());
-                    log.insert(log_schema().message_key(), value);
-                    TraceEvent::from(log)
-                }
+                value => TraceEvent::from(create_log_event(value, self.metadata.clone())),
             }
             .into()
         })
@@ -150,11 +148,7 @@ impl VrlTarget {
                     LogNamespace::Vector => {
                         TargetEvents::One(LogEvent::from_parts(v, metadata).into())
                     }
-                    LogNamespace::Legacy => {
-                        let mut log = LogEvent::new_with_metadata(metadata);
-                        log.insert(log_schema().message_key(), v);
-                        TargetEvents::One(log.into())
-                    }
+                    LogNamespace::Legacy => TargetEvents::One(create_log_event(v, metadata).into()),
                 },
             },
             VrlTarget::Trace(value, metadata) => match value {
@@ -169,11 +163,7 @@ impl VrlTarget {
                     _marker: PhantomData,
                 }),
 
-                v => {
-                    let mut log = LogEvent::new_with_metadata(metadata);
-                    log.insert(log_schema().message_key(), v);
-                    TargetEvents::One(log.into())
-                }
+                v => TargetEvents::One(create_log_event(v, metadata).into()),
             },
             VrlTarget::Metric { metric, .. } => TargetEvents::One(Event::Metric(metric)),
         }
@@ -202,22 +192,24 @@ fn move_field_definitions_into_message(mut definition: Definition) -> Definition
     message.remove_array();
 
     if !message.is_never() {
-        // We need to add the given message type to a field called `message`
-        // in the event.
-        let message = Kind::object(Collection::from(BTreeMap::from([(
-            log_schema().message_key().into(),
-            message,
-        )])));
-
-        definition.event_kind_mut().remove_bytes();
-        definition.event_kind_mut().remove_integer();
-        definition.event_kind_mut().remove_float();
-        definition.event_kind_mut().remove_boolean();
-        definition.event_kind_mut().remove_timestamp();
-        definition.event_kind_mut().remove_regex();
-        definition.event_kind_mut().remove_null();
-
-        *definition.event_kind_mut() = definition.event_kind().union(message);
+        if let Some(message_key) = log_schema().message_key() {
+            // We need to add the given message type to a field called `message`
+            // in the event.
+            let message = Kind::object(Collection::from(BTreeMap::from([(
+                message_key.to_string().into(),
+                message,
+            )])));
+
+            definition.event_kind_mut().remove_bytes();
+            definition.event_kind_mut().remove_integer();
+            definition.event_kind_mut().remove_float();
+            definition.event_kind_mut().remove_boolean();
+            definition.event_kind_mut().remove_timestamp();
+            definition.event_kind_mut().remove_regex();
+            definition.event_kind_mut().remove_null();
+
+            *definition.event_kind_mut() = definition.event_kind().union(message);
+        }
     }
 
     definition
diff --git a/lib/vector-core/src/schema/definition.rs b/lib/vector-core/src/schema/definition.rs
index a3c5afc034cb4..421b0b91a043a 100644
--- a/lib/vector-core/src/schema/definition.rs
+++ b/lib/vector-core/src/schema/definition.rs
@@ -1,7 +1,7 @@
 use std::collections::{BTreeMap, BTreeSet};
 
 use crate::config::{log_schema, LegacyKey, LogNamespace};
-use lookup::lookup_v2::{parse_value_path, TargetPath};
+use lookup::lookup_v2::TargetPath;
 use lookup::{owned_value_path, OwnedTargetPath, OwnedValuePath, PathPrefix};
 use vrl::value::{kind::Collection, Kind};
 
@@ -144,9 +144,7 @@ impl Definition {
     #[must_use]
     pub fn with_standard_vector_source_metadata(self) -> Self {
         self.with_vector_metadata(
-            parse_value_path(log_schema().source_type_key())
-                .ok()
-                .as_ref(),
+            log_schema().source_type_key(),
             &owned_value_path!("source_type"),
             Kind::bytes(),
             None,
diff --git a/lib/vector-core/src/schema/meaning.rs b/lib/vector-core/src/schema/meaning.rs
new file mode 100644
index 0000000000000..ab766b0986924
--- /dev/null
+++ b/lib/vector-core/src/schema/meaning.rs
@@ -0,0 +1,17 @@
+//! Constants for commonly used semantic meanings.
+
+/// The service typically represents the application that generated the event.
+pub const SERVICE: &str = "service";
+
+/// The main text message of the event.
+pub const MESSAGE: &str = "message";
+
+/// The main timestamp of the event.
+pub const TIMESTAMP: &str = "timestamp";
+
+/// The hostname of the machine where the event was generated.
+pub const HOST: &str = "host";
+
+pub const SOURCE: &str = "source";
+pub const SEVERITY: &str = "severity";
+pub const TRACE_ID: &str = "trace_id";
diff --git a/lib/vector-core/src/schema/mod.rs b/lib/vector-core/src/schema/mod.rs
index 96f6d99442fa8..2d1c01b8d281f 100644
--- a/lib/vector-core/src/schema/mod.rs
+++ b/lib/vector-core/src/schema/mod.rs
@@ -1,4 +1,5 @@
 mod definition;
+pub mod meaning;
 mod requirement;
 
 pub use definition::Definition;
diff --git a/lib/vector-core/src/schema/requirement.rs b/lib/vector-core/src/schema/requirement.rs
index 6b3721d606b21..b42e97009ab8d 100644
--- a/lib/vector-core/src/schema/requirement.rs
+++ b/lib/vector-core/src/schema/requirement.rs
@@ -14,7 +14,7 @@ use super::Definition;
 #[derive(Debug, Clone, PartialEq)]
 pub struct Requirement {
     /// Semantic meanings configured for this requirement.
-    meaning: BTreeMap<&'static str, SemanticMeaning>,
+    meaning: BTreeMap<String, SemanticMeaning>,
 }
 
 /// The semantic meaning of an event.
@@ -52,7 +52,7 @@ impl Requirement {
 
     /// Add a restriction to the schema.
     #[must_use]
-    pub fn required_meaning(mut self, meaning: &'static str, kind: Kind) -> Self {
+    pub fn required_meaning(mut self, meaning: impl Into<String>, kind: Kind) -> Self {
         self.insert_meaning(meaning, kind, false);
         self
     }
@@ -63,14 +63,14 @@ impl Requirement {
     /// specified meaning defined, but invalid for that meaning to be defined, but its [`Kind`] not
     /// matching the configured expectation.
     #[must_use]
-    pub fn optional_meaning(mut self, meaning: &'static str, kind: Kind) -> Self {
+    pub fn optional_meaning(mut self, meaning: impl Into<String>, kind: Kind) -> Self {
         self.insert_meaning(meaning, kind, true);
         self
     }
 
-    fn insert_meaning(&mut self, identifier: &'static str, kind: Kind, optional: bool) {
+    fn insert_meaning(&mut self, identifier: impl Into<String>, kind: Kind, optional: bool) {
         let meaning = SemanticMeaning { kind, optional };
-        self.meaning.insert(identifier, meaning);
+        self.meaning.insert(identifier.into(), meaning);
     }
 
     /// Validate the provided [`Definition`] against the current requirement.
@@ -97,7 +97,10 @@ impl Requirement {
             // Check if we're dealing with an invalid meaning, meaning the definition has a single
             // meaning identifier pointing to multiple paths.
             if let Some(paths) = definition.invalid_meaning(identifier).cloned() {
-                errors.push(ValidationError::MeaningDuplicate { identifier, paths });
+                errors.push(ValidationError::MeaningDuplicate {
+                    identifier: identifier.clone(),
+                    paths,
+                });
                 continue;
             }
 
@@ -118,14 +121,16 @@ impl Requirement {
                         // The semantic meaning kind does not match the expected
                         // kind, so we can't use it in the sink.
                         errors.push(ValidationError::MeaningKind {
-                            identifier,
+                            identifier: identifier.clone(),
                             want: req_meaning.kind.clone(),
                             got: definition_kind,
                         });
                     }
                 }
                 None if !req_meaning.optional => {
-                    errors.push(ValidationError::MeaningMissing { identifier });
+                    errors.push(ValidationError::MeaningMissing {
+                        identifier: identifier.clone(),
+                    });
                 }
                 _ => {}
             }
@@ -176,18 +181,18 @@ impl std::fmt::Display for ValidationErrors {
 #[allow(clippy::enum_variant_names)]
 pub enum ValidationError {
     /// A required semantic meaning is missing.
-    MeaningMissing { identifier: &'static str },
+    MeaningMissing { identifier: String },
 
     /// A semantic meaning has an invalid `[Kind]`.
     MeaningKind {
-        identifier: &'static str,
+        identifier: String,
         want: Kind,
         got: Kind,
     },
 
     /// A semantic meaning is pointing to multiple paths.
     MeaningDuplicate {
-        identifier: &'static str,
+        identifier: String,
         paths: BTreeSet<OwnedTargetPath>,
     },
 }
@@ -301,7 +306,9 @@ mod tests {
                 TestCase {
                     requirement: Requirement::empty().required_meaning("foo", Kind::any()),
                     definition: Definition::default_for_namespace(&[LogNamespace::Vector].into()),
-                    errors: vec![ValidationError::MeaningMissing { identifier: "foo" }],
+                    errors: vec![ValidationError::MeaningMissing {
+                        identifier: "foo".into(),
+                    }],
                 },
             ),
             (
@@ -312,8 +319,12 @@ mod tests {
                         .required_meaning("bar", Kind::any()),
                     definition: Definition::default_for_namespace(&[LogNamespace::Vector].into()),
                     errors: vec![
-                        ValidationError::MeaningMissing { identifier: "bar" },
-                        ValidationError::MeaningMissing { identifier: "foo" },
+                        ValidationError::MeaningMissing {
+                            identifier: "bar".into(),
+                        },
+                        ValidationError::MeaningMissing {
+                            identifier: "foo".into(),
+                        },
                     ],
                 },
             ),
@@ -332,7 +343,9 @@ mod tests {
                         .optional_meaning("foo", Kind::any())
                         .required_meaning("bar", Kind::any()),
                     definition: Definition::default_for_namespace(&[LogNamespace::Vector].into()),
-                    errors: vec![ValidationError::MeaningMissing { identifier: "bar" }],
+                    errors: vec![ValidationError::MeaningMissing {
+                        identifier: "bar".into(),
+                    }],
                 },
             ),
             (
@@ -342,7 +355,7 @@ mod tests {
                     definition: Definition::default_for_namespace(&[LogNamespace::Vector].into())
                         .with_event_field(&owned_value_path!("foo"), Kind::integer(), Some("foo")),
                     errors: vec![ValidationError::MeaningKind {
-                        identifier: "foo",
+                        identifier: "foo".into(),
                         want: Kind::boolean(),
                         got: Kind::integer(),
                     }],
@@ -355,7 +368,7 @@ mod tests {
                     definition: Definition::default_for_namespace(&[LogNamespace::Vector].into())
                         .with_event_field(&owned_value_path!("foo"), Kind::integer(), Some("foo")),
                     errors: vec![ValidationError::MeaningKind {
-                        identifier: "foo",
+                        identifier: "foo".into(),
                         want: Kind::boolean(),
                         got: Kind::integer(),
                     }],
@@ -376,7 +389,7 @@ mod tests {
                                 ),
                         ),
                     errors: vec![ValidationError::MeaningDuplicate {
-                        identifier: "foo",
+                        identifier: "foo".into(),
                         paths: BTreeSet::from([
                             parse_target_path("foo").unwrap(),
                             parse_target_path("bar").unwrap(),
diff --git a/lib/vector-core/src/stream/driver.rs b/lib/vector-core/src/stream/driver.rs
index 6ff23014c96d5..1a1ce79e1b27a 100644
--- a/lib/vector-core/src/stream/driver.rs
+++ b/lib/vector-core/src/stream/driver.rs
@@ -99,7 +99,7 @@ where
         pin!(batched_input);
 
         let bytes_sent = protocol.map(|protocol| register(BytesSent { protocol }));
-        let events_sent = RegisteredEventCache::default();
+        let events_sent = RegisteredEventCache::new(());
 
         loop {
             // Core behavior of the loop:
@@ -203,7 +203,7 @@ where
         finalizers: EventFinalizers,
         event_count: usize,
         bytes_sent: &Option<Registered<BytesSent>>,
-        events_sent: &RegisteredEventCache<TaggedEventsSent>,
+        events_sent: &RegisteredEventCache<(), TaggedEventsSent>,
     ) {
         match result {
             Err(error) => {
diff --git a/lib/vector-core/src/usage_metrics/mod.rs b/lib/vector-core/src/usage_metrics/mod.rs
index af1c492ca0b0f..965c67cefb0b4 100644
--- a/lib/vector-core/src/usage_metrics/mod.rs
+++ b/lib/vector-core/src/usage_metrics/mod.rs
@@ -441,7 +441,9 @@ fn get_size_and_profile(array: &EventArray) -> UsageProfileValue {
             for log_event in a {
                 if let Some(fields) = log_event.as_map() {
                     // Account for the value of ".message" and ".meta"
-                    let size = fields.get(log_schema().message_key()).map_or(0, value_size)
+                    let size = fields
+                        .get(&log_schema().message_key().unwrap().to_string())
+                        .map_or(0, value_size)
                         + fields
                             .get(log_schema().user_metadata_key())
                             .map_or(0, value_size);
@@ -1026,7 +1028,7 @@ mod tests {
         let mut event_map: BTreeMap<String, Value> = BTreeMap::new();
         event_map.insert("this_is_ignored".into(), 1u8.into());
         event_map.insert("another_ignored".into(), 1.into());
-        event_map.insert(log_schema().message_key().into(), 9.into());
+        event_map.insert(log_schema().message_key().unwrap().to_string(), 9.into());
         let event: LogEvent = event_map.into();
         let usage_profile = get_size_and_profile(&event.into());
         assert_eq!(
@@ -1039,7 +1041,10 @@ mod tests {
     fn get_size_and_profile_log_message_and_meta_test() {
         let mut event_map: BTreeMap<String, Value> = BTreeMap::new();
         event_map.insert("this_is_ignored".into(), 2.into());
-        event_map.insert(log_schema().message_key().into(), "hello ".into());
+        event_map.insert(
+            log_schema().message_key().unwrap().to_string(),
+            "hello ".into(),
+        );
         event_map.insert(log_schema().user_metadata_key().into(), "world".into());
         let event: LogEvent = event_map.into();
         assert_eq!(
@@ -1057,7 +1062,10 @@ mod tests {
         nested_map.insert("prop2".into(), 1u8.into());
         nested_map.insert("prop3".into(), 1i32.into());
         nested_map.insert("prop4".into(), "abcd".into());
-        event_map.insert(log_schema().message_key().into(), Value::from(nested_map));
+        event_map.insert(
+            log_schema().message_key().unwrap().to_string(),
+            Value::from(nested_map),
+        );
         let event: LogEvent = event_map.into();
         assert_eq!(
             get_size_and_profile(&event.into()).total_size,
diff --git a/lib/vector-lookup/Cargo.toml b/lib/vector-lookup/Cargo.toml
index a159f31561d0f..986f0317a31d6 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.164", default-features = false, features = ["derive", "alloc"] }
+serde = { version = "1.0.183", default-features = false, features = ["derive", "alloc"] }
 vector-config = { path = "../vector-config" }
 vector-config-macros = { path = "../vector-config-macros" }
 vrl.workspace = true
diff --git a/lib/vector-lookup/src/lookup_v2/optional_path.rs b/lib/vector-lookup/src/lookup_v2/optional_path.rs
index 9328aa8a2f138..de5f5d9d67ac0 100644
--- a/lib/vector-lookup/src/lookup_v2/optional_path.rs
+++ b/lib/vector-lookup/src/lookup_v2/optional_path.rs
@@ -1,4 +1,6 @@
 use vector_config::configurable_component;
+use vrl::owned_value_path;
+use vrl::path::PathPrefix;
 
 use crate::lookup_v2::PathParseError;
 use crate::{OwnedTargetPath, OwnedValuePath};
@@ -15,6 +17,25 @@ impl OptionalTargetPath {
     pub fn none() -> Self {
         Self { path: None }
     }
+
+    pub fn event(path: &str) -> Self {
+        Self {
+            path: Some(OwnedTargetPath {
+                prefix: PathPrefix::Event,
+                path: owned_value_path!(path),
+            }),
+        }
+    }
+
+    pub fn from(prefix: PathPrefix, path: Option<OwnedValuePath>) -> Self {
+        Self {
+            path: path.map(|path| OwnedTargetPath { prefix, path }),
+        }
+    }
+
+    pub fn as_ref(&self) -> Option<&OwnedTargetPath> {
+        self.path.as_ref()
+    }
 }
 
 impl TryFrom<String> for OptionalTargetPath {
@@ -56,6 +77,12 @@ impl OptionalValuePath {
     pub fn none() -> Self {
         Self { path: None }
     }
+
+    pub fn new(path: &str) -> Self {
+        Self {
+            path: Some(owned_value_path!(path)),
+        }
+    }
 }
 
 impl TryFrom<String> for OptionalValuePath {
@@ -84,3 +111,11 @@ impl From<OwnedValuePath> for OptionalValuePath {
         Self { path: Some(path) }
     }
 }
+
+impl From<Option<OwnedValuePath>> for OptionalValuePath {
+    fn from(value: Option<OwnedValuePath>) -> Self {
+        value.map_or(OptionalValuePath::none(), |path| {
+            OptionalValuePath::from(path)
+        })
+    }
+}
diff --git a/lib/vector-vrl/cli/Cargo.toml b/lib/vector-vrl/cli/Cargo.toml
index 106e430355c56..f67b06f4e1db4 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.1.14", features = ["derive"] }
+clap = { version = "4.3.21", features = ["derive"] }
 vector-vrl-functions = { path = "../functions" }
 vrl.workspace = true
diff --git a/lib/vector-vrl/functions/src/set_semantic_meaning.rs b/lib/vector-vrl/functions/src/set_semantic_meaning.rs
index 26e61c1671f59..f1b53065d96ed 100644
--- a/lib/vector-vrl/functions/src/set_semantic_meaning.rs
+++ b/lib/vector-vrl/functions/src/set_semantic_meaning.rs
@@ -62,8 +62,7 @@ impl Function for SetSemanticMeaning {
         let query = arguments.required_query("target")?;
 
         let meaning = arguments
-            .required_literal("meaning")?
-            .to_value()
+            .required_literal("meaning", state)?
             .try_bytes_utf8_lossy()
             .expect("meaning not bytes")
             .into_owned();
diff --git a/lib/vector-vrl/tests/Cargo.toml b/lib/vector-vrl/tests/Cargo.toml
index b67b8afa63a4a..0a0ddb25d56ef 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.1.14", features = ["derive"] }
+clap = { version = "4.3.21", features = ["derive"] }
 glob = "0.3"
 prettydiff = "0.6"
 regex = "1"
@@ -22,7 +22,7 @@ serde_json = "1"
 tracing-subscriber = { version = "0.3.17", default-features = false, features = ["fmt"] }
 
 [target.'cfg(not(target_env = "msvc"))'.dependencies]
-tikv-jemallocator = { version = "0.5.0" }
+tikv-jemallocator = { version = "0.5.4" }
 
 [features]
 default = []
diff --git a/lib/vector-vrl/web-playground/Cargo.toml b/lib/vector-vrl/web-playground/Cargo.toml
index b951a29661226..d250fe905d37e 100644
--- a/lib/vector-vrl/web-playground/Cargo.toml
+++ b/lib/vector-vrl/web-playground/Cargo.toml
@@ -13,7 +13,7 @@ wasm-bindgen = "0.2"
 vrl.workspace = true
 serde = { version = "1.0", features = ["derive"] }
 serde-wasm-bindgen = "0.5"
-gloo-utils = { version = "0.1", features = ["serde"] }
+gloo-utils = { version = "0.2", features = ["serde"] }
 getrandom = { version = "0.2", features = ["js"] }
 vector-vrl-functions = { path = "../functions" }
 enrichment = { path = "../../enrichment" }
diff --git a/lib/vector-vrl/web-playground/README.md b/lib/vector-vrl/web-playground/README.md
index 9354b77321205..11faa7a1c172a 100644
--- a/lib/vector-vrl/web-playground/README.md
+++ b/lib/vector-vrl/web-playground/README.md
@@ -13,13 +13,13 @@ To build the project we need to use `wasm-pack`. This compiles our Rust code
 to WebAssembly which can then be used within the browser. Install it by running:
 
 ```shell
-cargo install --version 0.10.3 wasm-pack
+cargo install --locked --version 0.10.3 wasm-pack
 ```
 
 After installing `wasm-pack` we must compile our project by running:
 
 ```shell
-wasm-pack build --target web --out-dir public
+wasm-pack build --target web --out-dir public/pkg
 ```
 
 Notice the `public` directory was populated with `.wasm`, and `.js`,
@@ -30,6 +30,8 @@ For more information on Rust and WebAssembly please visit
 [the mozilla docs][mozilla-wasm-rust-docs] or
 [the Rust book wasm chapter][rust-book-wasm]
 
+## Run locally
+
 The `src/lib.rs` file is the entry point of the `web-playground` crate.
 This file is necessary so we can use the `run_vrl()` function in the browser.
 Notice our `index.html` imports the VRL wasm module from `./vrl_web_playground.js`
@@ -39,6 +41,7 @@ the web browser console.
 To see this in action we host `index.html` locally, for example by running:
 
 ```shell
+cd public
 python3 -m http.server
 ```
 
@@ -65,7 +68,42 @@ but they will either error (enrichment functions) or abort (all the others) at r
 - `get_enrichment_table_record`
 
 Functions from VRL stdlib that are currently not supported can be found
-with this [issue filter][vrl-wasm-unsupported-filter]
+with this [issue filter][vrl-wasm-unsupported-filter].
+
+### macOS Troubleshooting
+
+If you are getting compilation errors on macOS here are some things to check:
+
+```shell
+xcode-select -p
+# Example: '/Library/Developer/CommandLineTools
+# To change this use: xcode-select -s
+```
+
+You can clean and reinstall with:
+
+```shell
+rm -rf /Library/Developer/CommandLineTools # might require sudo elevation
+xcode-select --install
+```
+
+Check your `llvm` installation and ensure that there are no conflicting installations. Check that the following command returns the expected version:
+
+```shell
+clang --version
+# Example:
+# Homebrew clang version 16.0.6
+# Target: arm64-apple-darwin22.5.0
+# Thread model: posix
+# InstalledDir: /opt/homebrew/opt/llvm/bin
+```
+
+The output of the following command should contain `WebAssembly`:
+
+```shell
+llvm-config --targets-built # WebAssembly should be in the results
+# Example: AArch64 <omitted> WebAssembly <omitted>
+```
 
 ## Examples
 
diff --git a/lib/vector-vrl/web-playground/netlify.toml b/lib/vector-vrl/web-playground/netlify.toml
index 3c9447d330e58..824b50e04972f 100644
--- a/lib/vector-vrl/web-playground/netlify.toml
+++ b/lib/vector-vrl/web-playground/netlify.toml
@@ -11,7 +11,7 @@
   publish = "public/"
 
   # Default build command.
-  command = "bash ../../../scripts/ensure-wasm-pack-installed.sh && wasm-pack build --target web --out-dir public"
+  command = "bash ../../../scripts/ensure-wasm-pack-installed.sh && wasm-pack build --target web --out-dir public/pkg"
 
   # Ignore everything except the base directory and changes to vector/lib/
   ignore = "git diff --quiet $CACHED_COMMIT_REF $COMMIT_REF . ../../../lib"
diff --git a/lib/vector-vrl/web-playground/public/.gitignore b/lib/vector-vrl/web-playground/public/.gitignore
deleted file mode 100644
index de695ce7d35fc..0000000000000
--- a/lib/vector-vrl/web-playground/public/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-vector_vrl_web_playground**
diff --git a/lib/vector-vrl/web-playground/public/README.md b/lib/vector-vrl/web-playground/public/README.md
deleted file mode 100644
index b042c0f4a26db..0000000000000
--- a/lib/vector-vrl/web-playground/public/README.md
+++ /dev/null
@@ -1,146 +0,0 @@
-# VRL WASM Web Playground
-
-This directory houses the exposed VRL function to WASM `run_vrl()` used to
-power [Vector Remap Language Playground][vrl-playground], or **VRL Playground**
-for short. Although there is already a [local REPL][vrl-repl] supported for
-use within the terminal, this playground will support running VRL in the web
-browser and test input via uploading event files, or specifying an event via
-a text input field.
-
-## Setup
-
-To build the project we need to use `wasm-pack`. This compiles our Rust code
-to WebAssembly which can then be used within the browser. Install it by running:
-
-```shell
-cargo install --version 0.10.3 wasm-pack
-```
-
-After installing `wasm-pack` we must compile our project by running:
-
-```shell
-wasm-pack build --target web --out-dir public
-```
-
-Notice the `public` directory was populated with `.wasm`, and `.js`,
-files these will be used by our `index.html` to run the `run_vrl()`
-function originally written in Rust.
-
-For more information on Rust and WebAssembly please visit
-[the mozilla docs][mozilla-wasm-rust-docs] or
-[the Rust book wasm chapter][rust-book-wasm]
-
-The `src/lib.rs` file is the entry point of the `web-playground` crate.
-This file is necessary so we can use the `run_vrl()` function in the browser.
-Notice our `index.html` imports the VRL wasm module from `./vrl_web_playground.js`
-and sets the `window.run_vrl` function so that we can test VRL within
-the web browser console.
-
-To see this in action we host `index.html` locally, for example by running:
-
-```shell
-python3 -m http.server
-```
-
-Remember to be in the `public` directory where index.html is located for the
-relative paths specified in `index.html` to work.
-We should also be able to open the `index.html` file in chrome, or use Live Server
-in VSCode to see `index.html` working.
-
-## Support
-
-Some functions of VRL are not supported or don't work as expected at the
-moment due to WASM limitations with some Rust crates, in
-the future we will modify the functions so that they are supported.
-
-List of functions that aren't supported at the moment:
-
-- `log()`
-- `decrypt()`
-- `encrypt()`
-- `get_hostname()`
-- `parse_groks()`
-- `random_bytes()`
-- `reverse_dns()`
-
-Functions from VRL stdlib that are currently not supported can be found
-with this [issue filter][vrl-wasm-unsupported-filter]
-
-## Examples
-
-### React
-
-For now, you can use an old npm-published version of vrl-web-playground,
-please note that this was done for testing purposes and in the future we
-will likely release this automatically upon each version release of Vector,
-probably under a different package name.
-
-Use this dependency in `package.json`
-
-```json
-"dependencies": {
-    "vrl-web-playground": "0.1.0"
-}
-```
-
-Example import and usage in a React component
-
-```javascript
-import init, { run_vrl } from 'vrl-web-playground';
-
-export function VectorExecuteButton() {
-  let vrlInput = {};
-  try {
-    vrlInput = {
-        program: '.something = "added by vrl!"\n.message = "modified by vrl!"',
-        event: JSON.parse('{message: "log message here"}'),
-    };
-  } catch (error) {
-        console.log('error parsing the event contents as JSON object');
-  }
-
-  return (
-      <button
-        onClick={() => {
-            console.log("[DEBUG] Initializing WASM");
-            init().then(() => {
-                console.log("[DEBUG] WASM initialized");
-                console.log("[DEBUG] Attempting to run vrl with input: ", vrlInput);
-
-                let res = run_vrl(vrlInput);
-                console.log("[DEBUG] run_vrl() output", res);
-            });
-        }}
-      />
-  );
-}
-```
-
-### JavaScript
-
-Example usage in vanilla JavaScript
-
-```javascript
-import init, { run_vrl } from "./vrl_web_playground.js";
-let vrlInput = {};
-try {
-    vrlInput = {
-        program: '.something = "added by vrl!"\n.message = "modified by vrl!"',
-        event: JSON.parse('{message: "log message here"}'),
-    };
-} catch (error) {
-    console.log('error parsing the event contents as JSON object');
-}
-init().then(() => {
-    window.run_vrl = run_vrl;
-    console.log(run_vrl(vrlInput));
-});
-```
-
-[vector]: https://vector.dev
-[vrl]: https://vrl.dev
-[vrl-playground]: https://github.com/vectordotdev/vector/issues/14653
-[mozilla-wasm-rust-docs]: https://developer.mozilla.org/en-US/docs/WebAssembly/Rust_to_wasm
-[rust-book-wasm]: https://rustwasm.github.io/docs/book/
-[vrl-repl]: https://github.com/vectordotdev/vector/tree/master/lib/vrl/cli
-[vrl-wasm-unsupported-filter]: https://github.com/vectordotdev/vector/issues?q=is%3Aopen+is%3Aissue+label%3A%22vrl%3A+playground%22+wasm+compatible
diff --git a/lib/vector-vrl/web-playground/public/index.js b/lib/vector-vrl/web-playground/public/index.js
index 6f69af1c6ab98..9ffa959c7de5c 100644
--- a/lib/vector-vrl/web-playground/public/index.js
+++ b/lib/vector-vrl/web-playground/public/index.js
@@ -1,4 +1,4 @@
-import init, { run_vrl } from "./vector_vrl_web_playground.js";
+import init, { run_vrl } from "./pkg/vector_vrl_web_playground.js";
 import { vrlLanguageDefinition, vrlThemeDefinition } from "./vrl-highlighter.js";
 
 const PROGRAM_EDITOR_DEFAULT_VALUE = `# Remove some fields
@@ -100,13 +100,29 @@ export class VrlWebPlayground {
                 program: this.programEditor.getValue(),
                 event: this.eventEditor.getModel().getLinesContent().join("\n"),
                 is_jsonl: true,
+                error: null,
             };
         }
-        return {
-            program: this.programEditor.getValue(),
-            event: JSON.parse((this.eventEditor.getValue().length == 0) ? "{}" : this.eventEditor.getValue()),
-            is_jsonl: false,
-        };
+
+        const editorValue = this.eventEditor.getValue();
+        try {
+            return {
+                program: this.programEditor.getValue(),
+                event: JSON.parse((editorValue.length === 0) ? "{}" : editorValue),
+                is_jsonl: false,
+                error: null,
+            };
+        }
+        catch (error) {
+            console.error(error);
+            return {
+                program: this.programEditor.getValue(),
+                event: null,
+                is_jsonl: false,
+                error: `Could not parse JSON event:\n${editorValue}`,
+            };
+        }
+        return state;
     }
 
     disableJsonLinting() {
@@ -168,6 +184,11 @@ export class VrlWebPlayground {
         if (input == null) {
             input = this.getState();
         }
+        if (input.error) {
+            this.disableJsonLinting();
+            this.outputEditor.setValue(input.error);
+            return input;
+        }
 
         let res = this.run_vrl(input);
         console.log("[DEBUG::handleRunCode()] Printing out res: ", res);
diff --git a/lib/vector-vrl/web-playground/public/package.json b/lib/vector-vrl/web-playground/public/package.json
index e8bfd02f7d3ca..fc6889020fde3 100644
--- a/lib/vector-vrl/web-playground/public/package.json
+++ b/lib/vector-vrl/web-playground/public/package.json
@@ -8,7 +8,5 @@
   ],
   "module": "vector_vrl_web_playground.js",
   "types": "vector_vrl_web_playground.d.ts",
-  "sideEffects": [
-    "./snippets/*"
-  ]
+  "sideEffects": false
 }
diff --git a/licenses/0BSD b/licenses/0BSD
new file mode 100644
index 0000000000000..1baa0f0866069
--- /dev/null
+++ b/licenses/0BSD
@@ -0,0 +1,7 @@
+BSD Zero Clause License
+
+Copyright (C) YEAR by AUTHOR EMAIL
+
+Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
diff --git a/licenses/Apache-2.0 b/licenses/Apache-2.0
new file mode 100644
index 0000000000000..15555da258024
--- /dev/null
+++ b/licenses/Apache-2.0
@@ -0,0 +1,60 @@
+Apache License
+Version 2.0, January 2004
+http://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+"License" shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document.
+
+"Licensor" shall mean the copyright owner or entity authorized by the copyright owner that is granting the License.
+
+"Legal Entity" shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.
+
+"You" (or "Your") shall mean an individual or Legal Entity exercising permissions granted by this License.
+
+"Source" form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files.
+
+"Object" form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types.
+
+"Work" shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below).
+
+"Derivative Works" shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof.
+
+"Contribution" shall mean any work of authorship, including the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner as "Not a Contribution."
+
+"Contributor" shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work.
+
+2. Grant of Copyright License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form.
+3. Grant of Patent License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by such Contributor that are necessarily infringed by their Contribution(s) alone or by combination of their Contribution(s) with the Work to which such Contribution(s) was submitted. If You institute patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Work or a Contribution incorporated within the Work constitutes direct or contributory patent infringement, then any patent licenses granted to You under this License for that Work shall terminate as of the date such litigation is filed.
+4. Redistribution. You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without modifications, and in Source or Object form, provided that You meet the following conditions:
+(a) You must give any other recipients of the Work or Derivative Works a copy of this License; and
+(b) You must cause any modified files to carry prominent notices stating that You changed the files; and
+(c) You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, and attribution notices from the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative Works; and
+(d) If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that You distribute must include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to any part of the Derivative Works, in at least one of the following places: within a NOTICE text file distributed as part of the Derivative Works; within the Source form or documentation, if provided along with the Derivative Works; or, within a display generated by the Derivative Works, if and wherever such third-party notices normally appear. The contents of the NOTICE file are for informational purposes only and do not modify the License. You may add Your own attribution notices within Derivative Works that You distribute, alongside or as an addendum to the NOTICE text from the Work, provided that such additional attribution notices cannot be construed as modifying the License.
+You may add Your own copyright statement to Your modifications and may provide additional or different license terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Derivative Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the conditions stated in this License.
+
+5. Submission of Contributions. Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work by You to the Licensor shall be under the terms and conditions of this License, without any additional terms or conditions. Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate license agreement you may have executed with Licensor regarding such Contributions.
+6. Trademarks. This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the NOTICE file.
+7. Disclaimer of Warranty. Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness of using or redistributing the Work and assume any risks associated with Your exercise of permissions under this License.
+8. Limitation of Liability. In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has been advised of the possibility of such damages.
+9. Accepting Warranty or Additional Liability. While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor, and only if You agree to indemnify, defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability.
+END OF TERMS AND CONDITIONS
+
+APPENDIX: How to apply the Apache License to your work.
+
+To apply the Apache License to your work, attach the following boilerplate notice, with the fields enclosed by brackets "[]" replaced with your own identifying information. (Don't include the brackets!) The text should be enclosed in the appropriate comment syntax for the file format. We also recommend that a file or class name and description of purpose be included on the same "printed page" as the copyright notice for easier identification within third-party archives.
+
+Copyright [yyyy] [name of copyright owner]
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
diff --git a/licenses/BSD-2-Clause b/licenses/BSD-2-Clause
new file mode 100644
index 0000000000000..7dd8d1d4b11ab
--- /dev/null
+++ b/licenses/BSD-2-Clause
@@ -0,0 +1,8 @@
+Copyright (c) <year> <owner>.
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/licenses/BSD-3-Clause b/licenses/BSD-3-Clause
new file mode 100644
index 0000000000000..794c14240493c
--- /dev/null
+++ b/licenses/BSD-3-Clause
@@ -0,0 +1,9 @@
+Copyright (c) <year> <owner>.
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/licenses/BSL-1.0 b/licenses/BSL-1.0
new file mode 100644
index 0000000000000..2d87ab1a9fa42
--- /dev/null
+++ b/licenses/BSL-1.0
@@ -0,0 +1,7 @@
+Boost Software License - Version 1.0 - August 17th, 2003
+
+Permission is hereby granted, free of charge, to any person or organization obtaining a copy of the software and accompanying documentation covered by this license (the "Software") to use, reproduce, display, distribute, execute, and transmit the Software, and to prepare derivative works of the Software, and to permit third-parties to whom the Software is furnished to do so, all subject to the following:
+
+The copyright notices in the Software and this entire statement, including the above license grant, this restriction and the following disclaimer, must be included in all copies of the Software, in whole or in part, and all derivative works of the Software, unless such copies or derivative works are solely in the form of machine-executable object code generated by a source language processor.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/licenses/CC0-1.0 b/licenses/CC0-1.0
new file mode 100644
index 0000000000000..730f2e55b120f
--- /dev/null
+++ b/licenses/CC0-1.0
@@ -0,0 +1,29 @@
+Creative Commons Legal Code
+
+CC0 1.0 Universal
+
+CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE AN ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES REGARDING THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED HEREUNDER, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED HEREUNDER.
+
+Statement of Purpose
+
+The laws of most jurisdictions throughout the world automatically confer exclusive Copyright and Related Rights (defined below) upon the creator and subsequent owner(s) (each and all, an "owner") of an original work of authorship and/or a database (each, a "Work").
+
+Certain owners wish to permanently relinquish those rights to a Work for the purpose of contributing to a commons of creative, cultural and scientific works ("Commons") that the public can reliably and without fear of later claims of infringement build upon, modify, incorporate in other works, reuse and redistribute as freely as possible in any form whatsoever and for any purposes, including without limitation commercial purposes. These owners may contribute to the Commons to promote the ideal of a free culture and the further production of creative, cultural and scientific works, or to gain reputation or greater distribution for their Work in part through the use and efforts of others.
+
+For these and/or other purposes and motivations, and without any expectation of additional consideration or compensation, the person associating CC0 with a Work (the "Affirmer"), to the extent that he or she is an owner of Copyright and Related Rights in the Work, voluntarily elects to apply CC0 to the Work and publicly distribute the Work under its terms, with knowledge of his or her Copyright and Related Rights in the Work and the meaning and intended legal effect of CC0 on those rights.
+
+1. Copyright and Related Rights. A Work made available under CC0 may be protected by copyright and related or neighboring rights ("Copyright and Related Rights"). Copyright and Related Rights include, but are not limited to, the following:
+i. the right to reproduce, adapt, distribute, perform, display, communicate, and translate a Work;
+ii. moral rights retained by the original author(s) and/or performer(s);
+iii. publicity and privacy rights pertaining to a person's image or likeness depicted in a Work;
+iv. rights protecting against unfair competition in regards to a Work, subject to the limitations in paragraph 4(a), below;
+v. rights protecting the extraction, dissemination, use and reuse of data in a Work;
+vi. database rights (such as those arising under Directive 96/9/EC of the European Parliament and of the Council of 11 March 1996 on the legal protection of databases, and under any national implementation thereof, including any amended or successor version of such directive); and
+vii. other similar, equivalent or corresponding rights throughout the world based on applicable law or treaty, and any national implementations thereof.
+2. Waiver. To the greatest extent permitted by, but not in contravention of, applicable law, Affirmer hereby overtly, fully, permanently, irrevocably and unconditionally waives, abandons, and surrenders all of Affirmer's Copyright and Related Rights and associated claims and causes of action, whether now known or unknown (including existing as well as future claims and causes of action), in the Work (i) in all territories worldwide, (ii) for the maximum duration provided by applicable law or treaty (including future time extensions), (iii) in any current or future medium and for any number of copies, and (iv) for any purpose whatsoever, including without limitation commercial, advertising or promotional purposes (the "Waiver"). Affirmer makes the Waiver for the benefit of each member of the public at large and to the detriment of Affirmer's heirs and successors, fully intending that such Waiver shall not be subject to revocation, rescission, cancellation, termination, or any other legal or equitable action to disrupt the quiet enjoyment of the Work by the public as contemplated by Affirmer's express Statement of Purpose.
+3. Public License Fallback. Should any part of the Waiver for any reason be judged legally invalid or ineffective under applicable law, then the Waiver shall be preserved to the maximum extent permitted taking into account Affirmer's express Statement of Purpose. In addition, to the extent the Waiver is so judged Affirmer hereby grants to each affected person a royalty-free, non transferable, non sublicensable, non exclusive, irrevocable and unconditional license to exercise Affirmer's Copyright and Related Rights in the Work (i) in all territories worldwide, (ii) for the maximum duration provided by applicable law or treaty (including future time extensions), (iii) in any current or future medium and for any number of copies, and (iv) for any purpose whatsoever, including without limitation commercial, advertising or promotional purposes (the "License"). The License shall be deemed effective as of the date CC0 was applied by Affirmer to the Work. Should any part of the License for any reason be judged legally invalid or ineffective under applicable law, such partial invalidity or ineffectiveness shall not invalidate the remainder of the License, and in such case Affirmer hereby affirms that he or she will not (i) exercise any of his or her remaining Copyright and Related Rights in the Work or (ii) assert any associated claims and causes of action with respect to the Work, in either case contrary to Affirmer's express Statement of Purpose.
+4. Limitations and Disclaimers.
+a. No trademark or patent rights held by Affirmer are waived, abandoned, surrendered, licensed or otherwise affected by this document.
+b. Affirmer offers the Work as-is and makes no representations or warranties of any kind concerning the Work, express, implied, statutory or otherwise, including without limitation warranties of title, merchantability, fitness for a particular purpose, non infringement, or the absence of latent or other defects, accuracy, or the present or absence of errors, whether or not discoverable, all to the greatest extent permissible under applicable law.
+c. Affirmer disclaims responsibility for clearing rights of other persons that may apply to the Work or any use thereof, including without limitation any person's Copyright and Related Rights in the Work. Further, Affirmer disclaims responsibility for obtaining any necessary consents, permissions or other rights required for any use of the Work.
+d. Affirmer understands and acknowledges that Creative Commons is not a party to this document and has no duty or obligation with respect to this CC0 or use of the Work.
diff --git a/licenses/ISC b/licenses/ISC
new file mode 100644
index 0000000000000..b9bcfa3a4a029
--- /dev/null
+++ b/licenses/ISC
@@ -0,0 +1,7 @@
+ISC License
+
+<copyright notice>
+
+Permission to use, copy, modify, and /or distribute this software for any purpose with or without fee is hereby granted, provided that the above copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
diff --git a/licenses/MIT b/licenses/MIT
new file mode 100644
index 0000000000000..047d53e535516
--- /dev/null
+++ b/licenses/MIT
@@ -0,0 +1,9 @@
+MIT license
+
+Copyright (c) <year> <copyright holders>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice (including the next paragraph) shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/licenses/MPL-2.0 b/licenses/MPL-2.0
new file mode 100644
index 0000000000000..920fa09de0e74
--- /dev/null
+++ b/licenses/MPL-2.0
@@ -0,0 +1,155 @@
+Mozilla Public License Version 2.0
+
+==================================
+
+1. Definitions
+
+--------------
+
+1.1. "Contributor" means each individual or legal entity that creates, contributes to the creation of, or owns Covered Software.
+1.2. "Contributor Version" means the combination of the Contributions of others (if any) used by a Contributor and that particular Contributor's Contribution.
+1.3. "Contribution" means Covered Software of a particular Contributor.
+1.4. "Covered Software" means Source Code Form to which the initial Contributor has attached the notice in Exhibit A, the Executable Form of such Source Code Form, and Modifications of such Source Code Form, in each case including portions thereof.
+1.5. "Incompatible With Secondary Licenses" means
+(a) that the initial Contributor has attached the notice described in Exhibit B to the Covered Software; or
+(b) that the Covered Software was made available under the terms of version 1.1 or earlier of the License, but not also under the terms of a Secondary License.
+1.6. "Executable Form" means any form of the work other than Source Code Form.
+1.7. "Larger Work" means a work that combines Covered Software with other material, in a separate file or files, that is not Covered Software.
+1.8. "License" means this document.
+1.9. "Licensable" means having the right to grant, to the maximum extent possible, whether at the time of the initial grant or subsequently, any and all of the rights conveyed by this License.
+1.10. "Modifications" means any of the following:
+(a) any file in Source Code Form that results from an addition to, deletion from, or modification of the contents of Covered Software; or
+(b) any new file in Source Code Form that contains any Covered Software.
+1.11. "Patent Claims" of a Contributor means any patent claim(s), including without limitation, method, process, and apparatus claims, in any patent Licensable by such Contributor that would be infringed, but for the grant of the License, by the making, using, selling, offering for sale, having made, import, or transfer of either its Contributions or its Contributor Version.
+1.12. "Secondary License" means either the GNU General Public License, Version 2.0, the GNU Lesser General Public License, Version 2.1, the GNU Affero General Public License, Version 3.0, or any later versions of those licenses.
+1.13. "Source Code Form" means the form of the work preferred for making modifications.
+1.14. "You" (or "Your") means an individual or a legal entity exercising rights under this License. For legal entities, "You" includes any entity that controls, is controlled by, or is under common control with You. For purposes of this definition, "control" means (a) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (b) ownership of more than fifty percent (50%) of the outstanding shares or beneficial ownership of such entity.
+2. License Grants and Conditions
+
+--------------------------------
+
+2.1. Grants
+Each Contributor hereby grants You a world-wide, royalty-free, non-exclusive license:
+
+(a) under intellectual property rights (other than patent or trademark) Licensable by such Contributor to use, reproduce, make available, modify, display, perform, distribute, and otherwise exploit its Contributions, either on an unmodified basis, with Modifications, or as part of a Larger Work; and
+(b) under Patent Claims of such Contributor to make, use, sell, offer for sale, have made, import, and otherwise transfer either its Contributions or its Contributor Version.
+2.2. Effective Date
+The licenses granted in Section 2.1 with respect to any Contribution become effective for each Contribution on the date the Contributor first distributes such Contribution.
+
+2.3. Limitations on Grant Scope
+The licenses granted in this Section 2 are the only rights granted under this License. No additional rights or licenses will be implied from the distribution or licensing of Covered Software under this License. Notwithstanding Section 2.1(b) above, no patent license is granted by a Contributor:
+
+(a) for any code that a Contributor has removed from Covered Software; or
+(b) for infringements caused by: (i) Your and any other third party's modifications of Covered Software, or (ii) the combination of its Contributions with other software (except as part of its Contributor Version); or
+(c) under Patent Claims infringed by Covered Software in the absence of its Contributions.
+This License does not grant any rights in the trademarks, service marks, or logos of any Contributor (except as may be necessary to comply with the notice requirements in Section 3.4).
+
+2.4. Subsequent Licenses
+No Contributor makes additional grants as a result of Your choice to distribute the Covered Software under a subsequent version of this License (see Section 10.2) or under the terms of a Secondary License (if permitted under the terms of Section 3.3).
+
+2.5. Representation
+Each Contributor represents that the Contributor believes its Contributions are its original creation(s) or it has sufficient rights to grant the rights to its Contributions conveyed by this License.
+
+2.6. Fair Use
+This License is not intended to limit any rights You have under applicable copyright doctrines of fair use, fair dealing, or other equivalents.
+
+2.7. Conditions
+Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted in Section 2.1.
+
+3. Responsibilities
+
+-------------------
+
+3.1. Distribution of Source Form
+All distribution of Covered Software in Source Code Form, including any Modifications that You create or to which You contribute, must be under the terms of this License. You must inform recipients that the Source Code Form of the Covered Software is governed by the terms of this License, and how they can obtain a copy of this License. You may not attempt to alter or restrict the recipients' rights in the Source Code Form.
+
+3.2. Distribution of Executable Form
+If You distribute Covered Software in Executable Form then:
+
+(a) such Covered Software must also be made available in Source Code Form, as described in Section 3.1, and You must inform recipients of the Executable Form how they can obtain a copy of such Source Code Form by reasonable means in a timely manner, at a charge no more than the cost of distribution to the recipient; and
+(b) You may distribute such Executable Form under the terms of this License, or sublicense it under different terms, provided that the license for the Executable Form does not attempt to limit or alter the recipients' rights in the Source Code Form under this License.
+3.3. Distribution of a Larger Work
+You may create and distribute a Larger Work under terms of Your choice, provided that You also comply with the requirements of this License for the Covered Software. If the Larger Work is a combination of Covered Software with a work governed by one or more Secondary Licenses, and the Covered Software is not Incompatible With Secondary Licenses, this License permits You to additionally distribute such Covered Software under the terms of such Secondary License(s), so that the recipient of the Larger Work may, at their option, further distribute the Covered Software under the terms of either this License or such Secondary License(s).
+
+3.4. Notices
+You may not remove or alter the substance of any license notices (including copyright notices, patent notices, disclaimers of warranty, or limitations of liability) contained within the Source Code Form of the Covered Software, except that You may alter any license notices to the extent required to remedy known factual inaccuracies.
+
+3.5. Application of Additional Terms
+You may choose to offer, and to charge a fee for, warranty, support, indemnity or liability obligations to one or more recipients of Covered Software. However, You may do so only on Your own behalf, and not on behalf of any Contributor. You must make it absolutely clear that any such warranty, support, indemnity, or liability obligation is offered by You alone, and You hereby agree to indemnify every Contributor for any liability incurred by such Contributor as a result of warranty, support, indemnity or liability terms You offer. You may include additional disclaimers of warranty and limitations of liability specific to any jurisdiction.
+
+4. Inability to Comply Due to Statute or Regulation
+
+---------------------------------------------------
+
+If it is impossible for You to comply with any of the terms of this License with respect to some or all of the Covered Software due to statute, judicial order, or regulation then You must: (a) comply with the terms of this License to the maximum extent possible; and (b) describe the limitations and the code they affect. Such description must be placed in a text file included with all distributions of the Covered Software under this License. Except to the extent prohibited by statute or regulation, such description must be sufficiently detailed for a recipient of ordinary skill to be able to understand it.
+
+5. Termination
+
+--------------
+
+5.1. The rights granted under this License will terminate automatically if You fail to comply with any of its terms. However, if You become compliant, then the rights granted under this License from a particular Contributor are reinstated (a) provisionally, unless and until such Contributor explicitly and finally terminates Your grants, and (b) on an ongoing basis, if such Contributor fails to notify You of the non-compliance by some reasonable means prior to 60 days after You have come back into compliance. Moreover, Your grants from a particular Contributor are reinstated on an ongoing basis if such Contributor notifies You of the non-compliance by some reasonable means, this is the first time You have received notice of non-compliance with this License from such Contributor, and You become compliant prior to 30 days after Your receipt of the notice.
+5.2. If You initiate litigation against any entity by asserting a patent infringement claim (excluding declaratory judgment actions, counter-claims, and cross-claims) alleging that a Contributor Version directly or indirectly infringes any patent, then the rights granted to You by any and all Contributors for the Covered Software under Section 2.1 of this License shall terminate.
+5.3. In the event of termination under Sections 5.1 or 5.2 above, all end user license agreements (excluding distributors and resellers) which have been validly granted by You or Your distributors under this License prior to termination shall survive termination.
+************************************************************************
+
+6. Disclaimer of Warranty
+
+* ------------------------- *
+
+Covered Software is provided under this License on an "as is" basis, without warranty of any kind, either expressed, implied, or statutory, including, without limitation, warranties that the Covered Software is free of defects, merchantable, fit for a particular purpose or non-infringing. The entire risk as to the quality and performance of the Covered Software is with You. Should any Covered Software prove defective in any respect, You (not any Contributor) assume the cost of any necessary servicing, repair, or correction. This disclaimer of warranty constitutes an essential part of this License. No use of any Covered Software is authorized under this License except under this disclaimer.
+
+************************************************************************
+
+************************************************************************
+
+7. Limitation of Liability
+
+* -------------------------- *
+
+Under no circumstances and under no legal theory, whether tort (including negligence), contract, or otherwise, shall any Contributor, or anyone who distributes Covered Software as permitted above, be liable to You for any direct, indirect, special, incidental, or consequential damages of any character including, without limitation, damages for lost profits, loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses, even if such party shall have been informed of the possibility of such damages. This limitation of liability shall not apply to liability for death or personal injury resulting from such party's negligence to the extent applicable law prohibits such limitation. Some jurisdictions do not allow the exclusion or limitation of incidental or consequential damages, so this exclusion and limitation may not apply to You.
+
+************************************************************************
+
+8. Litigation
+
+-------------
+
+Any litigation relating to this License may be brought only in the courts of a jurisdiction where the defendant maintains its principal place of business and such litigation shall be governed by laws of that jurisdiction, without reference to its conflict-of-law provisions. Nothing in this Section shall prevent a party's ability to bring cross-claims or counter-claims.
+
+9. Miscellaneous
+
+----------------
+
+This License represents the complete agreement concerning the subject matter hereof. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable. Any law or regulation which provides that the language of a contract shall be construed against the drafter shall not be used to construe this License against a Contributor.
+
+10. Versions of the License
+
+---------------------------
+
+10.1. New Versions
+Mozilla Foundation is the license steward. Except as provided in Section 10.3, no one other than the license steward has the right to modify or publish new versions of this License. Each version will be given a distinguishing version number.
+
+10.2. Effect of New Versions
+You may distribute the Covered Software under the terms of the version of the License under which You originally received the Covered Software, or under the terms of any subsequent version published by the license steward.
+
+10.3. Modified Versions
+If you create software not governed by this License, and you want to create a new license for such software, you may create and use a modified version of this License if you rename the license and remove any references to the name of the license steward (except to note that such modified license differs from this License).
+
+10.4. Distributing Source Code Form that is Incompatible With Secondary Licenses
+If You choose to distribute Source Code Form that is Incompatible With Secondary Licenses under the terms of this version of the License, the notice described in Exhibit B of this License must be attached.
+
+Exhibit A - Source Code Form License Notice
+
+-------------------------------------------
+
+This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+If it is not possible or desirable to put the notice in a particular file, then You may include the notice in a location (such as a LICENSE file in a relevant directory) where a recipient would be likely to look for such a notice.
+
+You may add additional accurate notices of copyright ownership.
+
+Exhibit B - "Incompatible With Secondary Licenses" Notice
+
+---------------------------------------------------------
+
+This Source Code Form is "Incompatible With Secondary Licenses", as defined by the Mozilla Public License, v. 2.0.
diff --git a/licenses/OpenSSL b/licenses/OpenSSL
new file mode 100644
index 0000000000000..654e956a25bfb
--- /dev/null
+++ b/licenses/OpenSSL
@@ -0,0 +1,38 @@
+OpenSSL License
+
+Copyright (c) 1998-2008 The OpenSSL Project. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+3. All advertising materials mentioning features or use of this software must display the following acknowledgment: "This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
+4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to endorse or promote products derived from this software without prior written permission. For written permission, please contact openssl-core@openssl.org.
+5. Products derived from this software may not be called "OpenSSL" nor may "OpenSSL" appear in their names without prior written permission of the OpenSSL Project.
+6. Redistributions of any form whatsoever must retain the following acknowledgment: "This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+This product includes cryptographic software written by Eric Young (eay@cryptsoft.com). This product includes software written by Tim Hudson (tjh@cryptsoft.com).
+
+Original SSLeay License
+
+Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
+All rights reserved.
+
+This package is an SSL implementation written by Eric Young (eay@cryptsoft.com). The implementation was written so as to conform with Netscapes SSL.
+
+This library is free for commercial and non-commercial use as long as the following conditions are aheared to. The following conditions apply to all code found in this distribution, be it the RC4, RSA, lhash, DES, etc., code; not just the SSL code. The SSL documentation included with this distribution is covered by the same copyright terms except that the holder is Tim Hudson (tjh@cryptsoft.com).
+
+Copyright remains Eric Young's, and as such any Copyright notices in the code are not to be removed. If this package is used in a product, Eric Young should be given attribution as the author of the parts of the library used. This can be in the form of a textual message at program startup or in documentation (online or textual) provided with the package.
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the copyright notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+3. All advertising materials mentioning features or use of this software must display the following acknowledgement:
+"This product includes cryptographic software written by Eric Young (eay@cryptsoft.com)"
+The word 'cryptographic' can be left out if the rouines from the library being used are not cryptographic related :-).
+4. If you include any Windows specific code (or a derivative thereof) from the apps directory (application code) you must include an acknowledgement: "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
+THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+The licence and distribution terms for any publically available version or derivative of this code cannot be changed. i.e. this code cannot simply be copied and put under another distribution licence [including the GNU Public Licence.]
diff --git a/licenses/Unicode-DFS-2016 b/licenses/Unicode-DFS-2016
new file mode 100644
index 0000000000000..adda5e89dc7ce
--- /dev/null
+++ b/licenses/Unicode-DFS-2016
@@ -0,0 +1,22 @@
+UNICODE, INC. LICENSE AGREEMENT - DATA FILES AND SOFTWARE
+
+See Terms of Use for definitions of Unicode Inc.'s Data Files and Software.
+Unicode Data Files include all data files under the directories http://www.unicode.org/Public/, http://www.unicode.org/reports/, http://www.unicode.org/cldr/data/, http://source.icu-project.org/repos/icu/, http://www.unicode.org/ivd/data/, and http://www.unicode.org/utility/trac/browser/.
+
+Unicode Data Files do not include PDF online code charts under the directory http://www.unicode.org/Public/.
+
+Software includes any source code published in the Unicode Standard or under the directories http://www.unicode.org/Public/, http://www.unicode.org/reports/, http://www.unicode.org/cldr/data/, http://source.icu-project.org/repos/icu/, and http://www.unicode.org/utility/trac/browser/.
+
+NOTICE TO USER: Carefully read the following legal agreement. BY DOWNLOADING, INSTALLING, COPYING OR OTHERWISE USING UNICODE INC.'S DATA FILES ("DATA FILES"), AND/OR SOFTWARE ("SOFTWARE"), YOU UNEQUIVOCALLY ACCEPT, AND AGREE TO BE BOUND BY, ALL OF THE TERMS AND CONDITIONS OF THIS AGREEMENT. IF YOU DO NOT AGREE, DO NOT DOWNLOAD, INSTALL, COPY, DISTRIBUTE OR USE THE DATA FILES OR SOFTWARE.
+
+COPYRIGHT AND PERMISSION NOTICE
+
+Copyright © 1991-2016 Unicode, Inc. All rights reserved. Distributed under the Terms of Use in http://www.unicode.org/copyright.html.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of the Unicode data files and any associated documentation (the "Data Files") or Unicode software and any associated documentation (the "Software") to deal in the Data Files or Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, and/or sell copies of the Data Files or Software, and to permit persons to whom the Data Files or Software are furnished to do so, provided that either
+
+(a) this copyright and permission notice appear with all copies of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated Documentation.
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder shall not be used in advertising or otherwise to promote the sale, use or other dealings in these Data Files or Software without prior written authorization of the copyright holder.
diff --git a/licenses/Zlib b/licenses/Zlib
new file mode 100644
index 0000000000000..1c32f7c774f7c
--- /dev/null
+++ b/licenses/Zlib
@@ -0,0 +1,11 @@
+zlib License
+
+Copyright (c) <year> <copyright holders>
+
+This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose, including commercial applications, and to alter it and redistribute it freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
diff --git a/regression/Dockerfile b/regression/Dockerfile
index 67bd022687de2..b1b1ca1b5cc1c 100644
--- a/regression/Dockerfile
+++ b/regression/Dockerfile
@@ -19,7 +19,7 @@ RUN --mount=type=cache,target=/usr/local/cargo/registry \
 #
 # TARGET
 #
-FROM docker.io/debian:bullseye-slim@sha256:b0d53c872fd640c2af2608ba1e693cfc7dedea30abcd8f584b23d583ec6dadc7
+FROM docker.io/debian:bookworm-slim@sha256:01bd742e2c269abf94e2fefb47b08b5b61c9a880b993417d23a1d0bd9fa60dc4
 RUN apt-get update && apt-get dist-upgrade -y && apt-get -y --no-install-recommends install zlib1g ca-certificates && rm -rf /var/lib/apt/lists/*
 COPY --from=lading /usr/bin/lading /usr/local/bin/lading
 COPY --from=builder /vector/vector /usr/local/bin/vector
diff --git a/regression/cases/http_to_s3/data/.gitkeep b/regression/cases/http_to_s3/data/.gitkeep
new file mode 100644
index 0000000000000..8b137891791fe
--- /dev/null
+++ b/regression/cases/http_to_s3/data/.gitkeep
@@ -0,0 +1 @@
+
diff --git a/regression/cases/http_to_s3/lading/lading.yaml b/regression/cases/http_to_s3/lading/lading.yaml
new file mode 100644
index 0000000000000..170cec7fb2aa2
--- /dev/null
+++ b/regression/cases/http_to_s3/lading/lading.yaml
@@ -0,0 +1,15 @@
+generator:
+  - http:
+      seed: [2, 3, 5, 7, 11, 13, 17, 19, 23, 29, 31, 37, 41, 43, 47, 53, 59, 61, 67, 71, 73, 79, 83, 89, 97, 101, 103, 107, 109, 113, 127, 131]
+      target_uri: "http://localhost:8282/"
+      bytes_per_second: "100 Mb"
+      parallel_connections: 10
+      method:
+        post:
+          variant: "json"
+          maximum_prebuild_cache_size_bytes: "256 Mb"
+      headers: {}
+
+blackhole:
+  - http:
+      binding_addr: "0.0.0.0:8080"
diff --git a/regression/cases/http_to_s3/vector/vector.toml b/regression/cases/http_to_s3/vector/vector.toml
new file mode 100644
index 0000000000000..1973451a103f7
--- /dev/null
+++ b/regression/cases/http_to_s3/vector/vector.toml
@@ -0,0 +1,38 @@
+data_dir = "/var/lib/vector"
+
+##
+## Sources
+##
+
+[sources.internal_metrics]
+type = "internal_metrics"
+
+[sources.http_source]
+type = "http"
+acknowledgements = false
+address = "0.0.0.0:8282"
+decoding.codec = "json"
+
+##
+## Sinks
+##
+
+[sinks.prometheus]
+type = "prometheus_exporter"
+inputs = ["internal_metrics"]
+address = "0.0.0.0:9090"
+
+[sinks.s3_service]
+type = "aws_s3"
+inputs = ["http_source"]
+
+region = "us-west-2"
+endpoint = "http://localhost:8080"
+bucket = "vector-soak-service"
+
+framing.method = "newline_delimited"
+encoding.codec = "json"
+
+[sinks.s3_service.auth]
+access_key_id = "BADDCAFE"
+secret_access_key = "BADDCAFE"
diff --git a/rfcs/2021-07-27-7117-vrl-string-interpolation.md b/rfcs/2021-07-27-7117-vrl-string-interpolation.md
index 0e7a5b711868a..51fd366b588c6 100644
--- a/rfcs/2021-07-27-7117-vrl-string-interpolation.md
+++ b/rfcs/2021-07-27-7117-vrl-string-interpolation.md
@@ -1,7 +1,7 @@
 # RFC 7117 - 2021-07-27 - VRL string interpolation
 
 VRL needs a better way to format strings. Currently the only way to do this is
-to concatenate strings, which can get unwieldly.
+to concatenate strings, which can get unwieldy.
 
 ## Scope
 
@@ -13,7 +13,7 @@ literals, also known as string interpolation, to format strings.
 Currently the way to create strings is through either string concatenation or
 the `join` function.
 
-Syntactically this is unwieldly. It requires extra key presses and the code
+Syntactically this is unwieldy. It requires extra key presses and the code
 created doesn't necessarily give an instant idea of what the resulting string
 will look like. Thus the true intent behind the code is obfuscated, which can
 result in bugs.
diff --git a/rfcs/2022-03-15-11851-ingest-opentelemetry-traces.md b/rfcs/2022-03-15-11851-ingest-opentelemetry-traces.md
index adb509d35c818..5644fe47c6a0f 100644
--- a/rfcs/2022-03-15-11851-ingest-opentelemetry-traces.md
+++ b/rfcs/2022-03-15-11851-ingest-opentelemetry-traces.md
@@ -156,7 +156,7 @@ universal representation, there is two major possible approaches:
      certain degree of flexibility.
 
 The second option would have to provide a way to store, at least, all fields from both Opentelemetry and Datadog Traces.
-If we consider the protobuf definiton for both Datadog and OpenTelemetry, it is clear that the OpenTelemetry from come
+If we consider the protobuf definition for both Datadog and OpenTelemetry, it is clear that the OpenTelemetry from come
 with extra structured fields that are not present in Datadog traces. However having a generic key/value container in
 virtually all traces formats can be used to store data that do not have a dedicated field in some format. As a reflexion
 basis the Datadog and OpenTelemetry are provided below, there is no hard semantic differences.
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
index 008def46a7a20..08e602710eeb9 100644
--- a/rust-toolchain.toml
+++ b/rust-toolchain.toml
@@ -1,3 +1,3 @@
 [toolchain]
-channel = "1.70.0"
+channel = "1.71.1"
 profile = "default"
diff --git a/scripts/ci-integration-test.sh b/scripts/ci-integration-test.sh
new file mode 100755
index 0000000000000..9687f1c1eafe6
--- /dev/null
+++ b/scripts/ci-integration-test.sh
@@ -0,0 +1,30 @@
+#!/bin/bash
+
+# Used in CI to run and stop an integration test and upload the results of it.
+# This is useful to allow retrying the integration test at a higher level than
+# the nextest and reduce code duplication in the workflow file.
+
+set -u
+
+if [[ -z "${CI:-}" ]]; then
+  echo "Aborted: this script is for use in CI." >&2
+  exit 1
+fi
+
+if [ $# -ne 1 ]
+then
+  echo "usage: $0 INTEGRATION"
+  exit 1
+fi
+
+set -x
+
+INTEGRATION=$1
+
+cargo vdev -v int start "${INTEGRATION}"
+sleep 30
+cargo vdev -v int test --retries 2 -a "${INTEGRATION}"
+RET=$?
+cargo vdev -v int stop -a "${INTEGRATION}"
+./scripts/upload-test-results.sh
+exit $RET
diff --git a/scripts/cross/bootstrap-centos.sh b/scripts/cross/bootstrap-centos.sh
index ce35c53283019..58b1cbba003c6 100755
--- a/scripts/cross/bootstrap-centos.sh
+++ b/scripts/cross/bootstrap-centos.sh
@@ -3,3 +3,7 @@ set -o errexit
 
 yum install -y unzip centos-release-scl
 yum install -y llvm-toolset-7
+
+# needed to compile openssl
+yum install -y perl-IPC-Cmd
+
diff --git a/scripts/environment/bootstrap-ubuntu-20.04.sh b/scripts/environment/bootstrap-ubuntu-20.04.sh
index 69f6293a9c4bd..c88a33d5e1fc3 100755
--- a/scripts/environment/bootstrap-ubuntu-20.04.sh
+++ b/scripts/environment/bootstrap-ubuntu-20.04.sh
@@ -23,14 +23,13 @@ apt install --yes \
 apt upgrade --yes
 
 # Deps
-apt install --yes \
+apt install --yes --no-install-recommends \
     awscli \
     build-essential \
     ca-certificates \
     cmake \
     cmark-gfm \
     curl \
-    docker-compose \
     gawk \
     gnupg2 \
     gnupg-agent \
diff --git a/scripts/environment/prepare.sh b/scripts/environment/prepare.sh
index 73d51c951b1b4..6ef0e034346f9 100755
--- a/scripts/environment/prepare.sh
+++ b/scripts/environment/prepare.sh
@@ -17,8 +17,8 @@ fi
 if ! cargo deny --version >& /dev/null ; then
   rustup run stable cargo install cargo-deny --force --locked
 fi
-if ! rust-license-tool --help >& /dev/null ; then
-  cargo install --git https://github.com/DataDog/rust-license-tool
+if ! dd-rust-license-tool --help >& /dev/null ; then
+  rustup run stable cargo install dd-rust-license-tool --version 1.0.1 --force --locked
 fi
 
 # Currently fixing this to version 0.30 since version 0.31 has introduced
diff --git a/scripts/integration/Dockerfile b/scripts/integration/Dockerfile
index f7ea5908144c7..5b065549f606e 100644
--- a/scripts/integration/Dockerfile
+++ b/scripts/integration/Dockerfile
@@ -1,15 +1,15 @@
 ARG RUST_VERSION
-FROM docker.io/rust:${RUST_VERSION}-slim-bullseye
+FROM docker.io/rust:${RUST_VERSION}-slim-bookworm
 
 RUN apt-get update && apt-get install -y --no-install-recommends \
     build-essential \
     cmake \
     curl \
     g++ \
-    libclang1-9 \
+    libclang1 \
     libsasl2-dev \
     libssl-dev \
-    llvm-9 \
+    llvm \
     pkg-config \
     zlib1g-dev \
     unzip \
diff --git a/scripts/integration/chronicle/compose.yaml b/scripts/integration/chronicle/compose.yaml
deleted file mode 100644
index 09097e24a97de..0000000000000
--- a/scripts/integration/chronicle/compose.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-version: '3'
-
-services:
-  chronicle-emulator:
-    image: docker.io/plork/chronicle-emulator:${CONFIG_VERSION}
-    ports:
-    - 3000:3000
-    volumes:
-    - ./public.pem:/public.pem:ro
-    command:
-    - -p
-    - /public.pem
diff --git a/scripts/integration/chronicle/test.yaml b/scripts/integration/chronicle/test.yaml
deleted file mode 100644
index 048e7adbc3aa9..0000000000000
--- a/scripts/integration/chronicle/test.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-features:
-- chronicle-integration-tests
-
-test_filter: '::chronicle_unstructured::'
-
-env:
-  CHRONICLE_ADDRESS: http://chronicle-emulator:3000
-
-matrix:
-  version: [latest]
diff --git a/scripts/integration/chronicle/auth.json b/scripts/integration/gcp/auth.json
similarity index 100%
rename from scripts/integration/chronicle/auth.json
rename to scripts/integration/gcp/auth.json
diff --git a/scripts/integration/gcp/compose.yaml b/scripts/integration/gcp/compose.yaml
index 643362a2bc76e..3ab1673228b9d 100644
--- a/scripts/integration/gcp/compose.yaml
+++ b/scripts/integration/gcp/compose.yaml
@@ -6,3 +6,12 @@ services:
     environment:
     - PUBSUB_PROJECT1=testproject,topic1:subscription1
     - PUBSUB_PROJECT2=sourceproject,topic2:subscription2
+  chronicle-emulator:
+    image: docker.io/plork/chronicle-emulator:${CONFIG_VERSION}
+    ports:
+    - 3000:3000
+    volumes:
+    - ./public.pem:/public.pem:ro
+    command:
+    - -p
+    - /public.pem
diff --git a/scripts/integration/chronicle/invalidauth.json b/scripts/integration/gcp/invalidauth.json
similarity index 100%
rename from scripts/integration/chronicle/invalidauth.json
rename to scripts/integration/gcp/invalidauth.json
diff --git a/scripts/integration/chronicle/public.pem b/scripts/integration/gcp/public.pem
similarity index 100%
rename from scripts/integration/chronicle/public.pem
rename to scripts/integration/gcp/public.pem
diff --git a/scripts/integration/gcp/test.yaml b/scripts/integration/gcp/test.yaml
index 7e516b716fafb..772a416d2162a 100644
--- a/scripts/integration/gcp/test.yaml
+++ b/scripts/integration/gcp/test.yaml
@@ -1,10 +1,12 @@
 features:
 - gcp-integration-tests
+- chronicle-integration-tests
 
 test_filter: '::gcp::'
 
 env:
   EMULATOR_ADDRESS: http://gcloud-pubsub:8681
+  CHRONICLE_ADDRESS: http://chronicle-emulator:3000
 
 matrix:
   version: [latest]
diff --git a/scripts/integration/greptimedb/compose.yaml b/scripts/integration/greptimedb/compose.yaml
new file mode 100644
index 0000000000000..7cd131240b49d
--- /dev/null
+++ b/scripts/integration/greptimedb/compose.yaml
@@ -0,0 +1,8 @@
+version: '3'
+
+services:
+  greptimedb:
+    image: docker.io/greptime/greptimedb:${CONFIG_VERSION}
+    command: "standalone start --http-addr=0.0.0.0:4000 --rpc-addr=0.0.0.0:4001"
+    healthcheck:
+      test: "curl -f localhost:4000/health || exit 1"
diff --git a/scripts/integration/greptimedb/test.yaml b/scripts/integration/greptimedb/test.yaml
new file mode 100644
index 0000000000000..b428b37a03ed2
--- /dev/null
+++ b/scripts/integration/greptimedb/test.yaml
@@ -0,0 +1,12 @@
+features:
+- greptimedb-integration-tests
+
+test_filter: '::greptimedb::'
+
+runner:
+  env:
+    GREPTIMEDB_ENDPOINT: greptimedb:4001
+    GREPTIMEDB_HTTP: http://greptimedb:4000
+
+matrix:
+  version: ['latest']
diff --git a/scripts/package-archive.sh b/scripts/package-archive.sh
index a19c329a301f0..ca6fe2bda93b1 100755
--- a/scripts/package-archive.sh
+++ b/scripts/package-archive.sh
@@ -87,6 +87,9 @@ cp -av README.md "$ARCHIVE_DIR/README.md$SUFFIX"
 # Create the license file for binary distributions (LICENSE + NOTICE)
 cat LICENSE NOTICE > "$ARCHIVE_DIR/LICENSE$SUFFIX"
 
+cp -av licenses "$ARCHIVE_DIR/licenses"
+cp -av LICENSE-3rdparty.csv "$ARCHIVE_DIR"
+
 # Copy the vector binary to /bin
 
 mkdir -p "$ARCHIVE_DIR/bin"
diff --git a/src/api/schema/components/mod.rs b/src/api/schema/components/mod.rs
index 20880f3a06698..1b5e4cf82a201 100644
--- a/src/api/schema/components/mod.rs
+++ b/src/api/schema/components/mod.rs
@@ -25,8 +25,8 @@ use crate::{
 
 #[derive(Debug, Clone, Interface)]
 #[graphql(
-    field(name = "component_id", type = "String"),
-    field(name = "component_type", type = "String")
+    field(name = "component_id", ty = "String"),
+    field(name = "component_type", ty = "String")
 )]
 pub enum Component {
     Source(source::Source),
diff --git a/src/api/schema/events/log.rs b/src/api/schema/events/log.rs
index 65f4249f9d13f..859c6dff1df48 100644
--- a/src/api/schema/events/log.rs
+++ b/src/api/schema/events/log.rs
@@ -21,7 +21,7 @@ impl Log {
     pub fn get_message(&self) -> Option<Cow<'_, str>> {
         Some(
             self.event
-                .get(log_schema().message_key())?
+                .get(log_schema().message_key_target_path().unwrap())?
                 .to_string_lossy(),
         )
     }
diff --git a/src/api/schema/events/trace.rs b/src/api/schema/events/trace.rs
index 9291e4db2888a..9bd52d3ce053e 100644
--- a/src/api/schema/events/trace.rs
+++ b/src/api/schema/events/trace.rs
@@ -1,5 +1,6 @@
 use async_graphql::Object;
 use vector_common::encode_logfmt;
+use vrl::event_path;
 
 use super::EventEncodingType;
 use crate::{event, topology::TapOutput};
@@ -48,7 +49,7 @@ impl Trace {
 
     /// Get JSON field data on the trace event, by field name
     async fn json(&self, field: String) -> Option<String> {
-        self.event.get(field.as_str()).map(|field| {
+        self.event.get(event_path!(field.as_str())).map(|field| {
             serde_json::to_string(field)
                 .expect("JSON serialization of log event field failed. Please report.")
         })
diff --git a/src/api/schema/metrics/mod.rs b/src/api/schema/metrics/mod.rs
index 11b8abc51ddc5..1a273dc5e9bee 100644
--- a/src/api/schema/metrics/mod.rs
+++ b/src/api/schema/metrics/mod.rs
@@ -37,7 +37,7 @@ pub use uptime::Uptime;
 use crate::config::ComponentKey;
 
 #[derive(Interface)]
-#[graphql(field(name = "timestamp", type = "Option<DateTime<Utc>>"))]
+#[graphql(field(name = "timestamp", ty = "Option<DateTime<Utc>>"))]
 pub enum MetricType {
     Uptime(Uptime),
 }
diff --git a/src/api/schema/metrics/sink/mod.rs b/src/api/schema/metrics/sink/mod.rs
index 97f943a7dbef7..c864270834cec 100644
--- a/src/api/schema/metrics/sink/mod.rs
+++ b/src/api/schema/metrics/sink/mod.rs
@@ -7,9 +7,9 @@ use crate::event::Metric;
 
 #[derive(Debug, Clone, Interface)]
 #[graphql(
-    field(name = "received_events_total", type = "Option<ReceivedEventsTotal>"),
-    field(name = "sent_bytes_total", type = "Option<SentBytesTotal>"),
-    field(name = "sent_events_total", type = "Option<SentEventsTotal>")
+    field(name = "received_events_total", ty = "Option<ReceivedEventsTotal>"),
+    field(name = "sent_bytes_total", ty = "Option<SentBytesTotal>"),
+    field(name = "sent_events_total", ty = "Option<SentEventsTotal>")
 )]
 pub enum SinkMetrics {
     GenericSinkMetrics(generic::GenericSinkMetrics),
diff --git a/src/api/schema/metrics/source/mod.rs b/src/api/schema/metrics/source/mod.rs
index 5463ac0ecf545..fe5c40ff6c346 100644
--- a/src/api/schema/metrics/source/mod.rs
+++ b/src/api/schema/metrics/source/mod.rs
@@ -8,9 +8,9 @@ use crate::event::Metric;
 
 #[derive(Debug, Clone, Interface)]
 #[graphql(
-    field(name = "received_bytes_total", type = "Option<ReceivedBytesTotal>"),
-    field(name = "received_events_total", type = "Option<ReceivedEventsTotal>"),
-    field(name = "sent_events_total", type = "Option<SentEventsTotal>")
+    field(name = "received_bytes_total", ty = "Option<ReceivedBytesTotal>"),
+    field(name = "received_events_total", ty = "Option<ReceivedEventsTotal>"),
+    field(name = "sent_events_total", ty = "Option<SentEventsTotal>")
 )]
 pub enum SourceMetrics {
     GenericSourceMetrics(generic::GenericSourceMetrics),
diff --git a/src/api/schema/metrics/transform/mod.rs b/src/api/schema/metrics/transform/mod.rs
index bfdc8a5a08b30..183a97907f592 100644
--- a/src/api/schema/metrics/transform/mod.rs
+++ b/src/api/schema/metrics/transform/mod.rs
@@ -7,8 +7,8 @@ use crate::event::Metric;
 
 #[derive(Debug, Clone, Interface)]
 #[graphql(
-    field(name = "received_events_total", type = "Option<ReceivedEventsTotal>"),
-    field(name = "sent_events_total", type = "Option<SentEventsTotal>")
+    field(name = "received_events_total", ty = "Option<ReceivedEventsTotal>"),
+    field(name = "sent_events_total", ty = "Option<SentEventsTotal>")
 )]
 pub enum TransformMetrics {
     GenericTransformMetrics(generic::GenericTransformMetrics),
diff --git a/src/api/server.rs b/src/api/server.rs
index e4786f6d108ca..935c0b03ecaa6 100644
--- a/src/api/server.rs
+++ b/src/api/server.rs
@@ -9,6 +9,7 @@ use async_graphql::{
     Data, Request, Schema,
 };
 use async_graphql_warp::{graphql_protocol, GraphQLResponse, GraphQLWebSocket};
+use tokio::runtime::Handle;
 use tokio::sync::oneshot;
 use warp::{filters::BoxedFilter, http::Response, ws::Ws, Filter, Reply};
 
@@ -31,13 +32,13 @@ impl Server {
         config: &config::Config,
         watch_rx: topology::WatchRx,
         running: Arc<AtomicBool>,
-        runtime: &tokio::runtime::Runtime,
+        handle: &Handle,
     ) -> crate::Result<Self> {
         let routes = make_routes(config.api.playground, watch_rx, running);
 
         let (_shutdown, rx) = oneshot::channel();
         // warp uses `tokio::spawn` and so needs us to enter the runtime context.
-        let _guard = runtime.enter();
+        let _guard = handle.enter();
         let (addr, server) = warp::serve(routes)
             .try_bind_with_graceful_shutdown(
                 config.api.address.expect("No socket address"),
@@ -57,7 +58,7 @@ impl Server {
         schema::components::update_config(config);
 
         // Spawn the server in the background.
-        runtime.spawn(server);
+        handle.spawn(server);
 
         Ok(Self { _shutdown, addr })
     }
diff --git a/src/app.rs b/src/app.rs
index 917d95fdc41ee..74450924e23e0 100644
--- a/src/app.rs
+++ b/src/app.rs
@@ -8,6 +8,7 @@ use futures::StreamExt;
 #[cfg(feature = "enterprise")]
 use futures_util::future::BoxFuture;
 use once_cell::race::OnceNonZeroUsize;
+use openssl::provider::Provider;
 use std::time::Instant;
 use tokio::{
     runtime::{self, Runtime},
@@ -33,7 +34,7 @@ use crate::{
         MezmoConfigCompile, MezmoConfigReload, MezmoConfigReloadSignalReceive,
     },
     mezmo,
-    signal::{SignalHandler, SignalPair, SignalRx, SignalTo},
+    signal::{ShutdownError, SignalHandler, SignalPair, SignalRx, SignalTo},
     topology::{
         self, ReloadOutcome, RunningTopology, SharedTopologyController, TopologyController,
     },
@@ -44,6 +45,7 @@ use crate::{
 use std::os::unix::process::ExitStatusExt;
 #[cfg(windows)]
 use std::os::windows::process::ExitStatusExt;
+use tokio::runtime::Handle;
 
 pub static WORKER_THREADS: OnceNonZeroUsize = OnceNonZeroUsize::new();
 
@@ -54,8 +56,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<()>,
-    pub graceful_crash_receiver: mpsc::UnboundedReceiver<()>,
+    pub graceful_crash_sender: mpsc::UnboundedSender<ShutdownError>,
+    pub graceful_crash_receiver: mpsc::UnboundedReceiver<ShutdownError>,
     #[cfg(feature = "api")]
     pub api: config::api::Options,
     #[cfg(feature = "enterprise")]
@@ -67,6 +69,7 @@ pub struct Application {
     pub require_healthy: Option<bool>,
     pub config: ApplicationConfig,
     pub signals: SignalPair,
+    pub openssl_providers: Option<Vec<Provider>>,
 }
 
 impl ApplicationConfig {
@@ -136,13 +139,13 @@ impl ApplicationConfig {
 
     /// Configure the API server, if applicable
     #[cfg(feature = "api")]
-    pub fn setup_api(&self, runtime: &Runtime) -> Option<api::Server> {
+    pub fn setup_api(&self, handle: &Handle) -> Option<api::Server> {
         if self.api.enabled {
             match api::Server::start(
                 self.topology.config(),
                 self.topology.watch(),
                 std::sync::Arc::clone(&self.topology.running),
-                runtime,
+                handle,
             ) {
                 Ok(api_server) => {
                     emit!(ApiStarted {
@@ -152,9 +155,12 @@ impl ApplicationConfig {
 
                     Some(api_server)
                 }
-                Err(e) => {
-                    error!("An error occurred that Vector couldn't handle: {}.", e);
-                    _ = self.graceful_crash_sender.send(());
+                Err(error) => {
+                    let error = error.to_string();
+                    error!("An error occurred that Vector couldn't handle: {}.", error);
+                    _ = self
+                        .graceful_crash_sender
+                        .send(ShutdownError::ApiFailed { error });
                     None
                 }
             }
@@ -173,7 +179,8 @@ impl Application {
     }
 
     pub fn prepare_start() -> Result<(Runtime, StartedApplication), ExitCode> {
-        Self::prepare().and_then(|(runtime, app)| app.start(&runtime).map(|app| (runtime, app)))
+        Self::prepare()
+            .and_then(|(runtime, app)| app.start(runtime.handle()).map(|app| (runtime, app)))
     }
 
     pub fn prepare() -> Result<(Runtime, Self), ExitCode> {
@@ -199,6 +206,12 @@ impl Application {
         );
         mezmo::user_trace::init(opts.root.user_log_rate_limit);
 
+        let openssl_providers = opts
+            .root
+            .openssl_legacy_provider
+            .then(load_openssl_legacy_providers)
+            .transpose()?;
+
         let runtime = build_runtime(opts.root.threads, "vector-worker")?;
 
         // Signal handler for OS and provider messages.
@@ -222,27 +235,29 @@ impl Application {
                 require_healthy: opts.root.require_healthy,
                 config,
                 signals,
+                openssl_providers,
             },
         ))
     }
 
-    pub fn start(self, runtime: &Runtime) -> Result<StartedApplication, ExitCode> {
+    pub fn start(self, handle: &Handle) -> Result<StartedApplication, ExitCode> {
         // Any internal_logs sources will have grabbed a copy of the
         // early buffer by this point and set up a subscriber.
         crate::trace::stop_early_buffering();
 
         emit!(VectorStarted);
-        runtime.spawn(heartbeat::heartbeat());
+        handle.spawn(heartbeat::heartbeat());
 
         let Self {
             require_healthy,
             config,
             signals,
+            openssl_providers,
         } = self;
 
         let topology_controller = SharedTopologyController::new(TopologyController {
             #[cfg(feature = "api")]
-            api_server: config.setup_api(runtime),
+            api_server: config.setup_api(handle),
             topology: config.topology,
             config_paths: config.config_paths.clone(),
             require_healthy,
@@ -256,6 +271,7 @@ impl Application {
             signals,
             topology_controller,
             metrics_tx: config.metrics_tx,
+            openssl_providers,
         })
     }
 }
@@ -305,10 +321,11 @@ fn start_remote_task_execution(
 
 pub struct StartedApplication {
     pub config_paths: Vec<ConfigPath>,
-    pub graceful_crash_receiver: mpsc::UnboundedReceiver<()>,
+    pub graceful_crash_receiver: mpsc::UnboundedReceiver<ShutdownError>,
     pub signals: SignalPair,
     pub topology_controller: SharedTopologyController,
     pub metrics_tx: mpsc::UnboundedSender<UsageMetrics>,
+    pub openssl_providers: Option<Vec<Provider>>,
 }
 
 impl StartedApplication {
@@ -323,19 +340,9 @@ impl StartedApplication {
             signals,
             topology_controller,
             metrics_tx,
+            openssl_providers,
         } = self;
 
-        // LOG-17772: Set a maximum amount of time to wait for configuration reloading before
-        // triggering corrective action. By default, this will wait for 150 seconds / 2.5 minutes.
-        let config_reload_max_sec = std::env::var("CONFIG_RELOAD_MAX_SEC").unwrap_or_else(|_| {
-            warn!("couldn't read value for CONFIG_RELOAD_MAX_SEC env var, default will be used");
-            "150".to_owned()
-        });
-        let config_reload_max_sec = config_reload_max_sec.parse::<usize>().unwrap_or_else(|_| {
-            warn!("failed to parse CONFIG_RELOAD_MAX_SEC value {config_reload_max_sec}, default will be used");
-            150
-        });
-
         let mut graceful_crash = UnboundedReceiverStream::new(graceful_crash_receiver);
 
         let mut signal_handler = signals.handler;
@@ -343,101 +350,20 @@ impl StartedApplication {
 
         let signal = loop {
             tokio::select! {
-                signal = signal_rx.recv() => {
-                    match signal {
-                        Ok(SignalTo::ReloadFromConfigBuilder(config_builder)) => {
-                            emit!(MezmoConfigReloadSignalReceive{});
-                            let start = Instant::now();
-                            let mut topology_controller = topology_controller.lock().await;
-
-                            // We use build_no_validation() to speed up building
-                            // Configs were fully validated when generated and better errors
-                            // won't help us much at this point (as it will blow up anyway)
-                            let new_config = config_builder.build_no_validation().map_err(handle_config_errors).ok();
-                            emit!(MezmoConfigCompile{elapsed: Instant::now() - start});
-                            let mut reload_outcome = ReloadOutcome::NoConfig;
-                            let reload_future = topology_controller.reload_with_metrics(new_config, Some(metrics_tx.clone()));
-                            tokio::pin!(reload_future);
-
-                            let mut reload_future_done = false;
-                            for i in 1..=config_reload_max_sec {
-                                tokio::select! {
-                                    _ = tokio::time::sleep(Duration::from_secs(1)) => {
-                                        info!("Waiting for topology to be reloaded after {i} secs")
-                                    },
-                                    outcome = &mut reload_future => {
-                                        reload_outcome = outcome;
-                                        reload_future_done = true;
-                                        break;
-                                    }
-                                }
-                            }
-
-                            let elapsed = Instant::now() - start;
-
-                            // LOG-17772: If the config reload future doesn't resolve in the allotted
-                            // time, then crash the vector process and allow k8s to respawn the process
-                            // in order to get config reloading to work again. Note that panic! doesn't
-                            // work to terminate the process since the higher level code traps the panic
-                            // and prevents termination.
-                            if !reload_future_done {
-                                emit!(MezmoConfigReload{ elapsed, success: false });
-                                error!("New topology reload future failed to resolved within the limit.");
-                                std::process::abort();
-                            }
-
-                            match reload_outcome {
-                                ReloadOutcome::NoConfig => {
-                                    emit!(MezmoConfigReload{ elapsed, success: false });
-                                    warn!("Config reload resulted in no config");
-                                },
-                                ReloadOutcome::MissingApiKey => {
-                                    emit!(MezmoConfigReload{ elapsed, success: false });
-                                    warn!("Config reload missing API key");
-                                },
-                                ReloadOutcome::Success => {
-                                    emit!(MezmoConfigReload{ elapsed, success: true });
-                                    info!("Config reload succeeded, took {:?}", elapsed);
-                                },
-                                ReloadOutcome::RolledBack => {
-                                    emit!(MezmoConfigReload{ elapsed, success: false });
-                                    warn!("Config reload rolled back");
-                                },
-                                ReloadOutcome::FatalError => {
-                                    emit!(MezmoConfigReload{ elapsed, success: false });
-                                    error!("Config reload fatal error");
-                                    break SignalTo::Shutdown;
-                                },
-                            };
-
-                        },
-                        Ok(SignalTo::ReloadFromDisk) => {
-                            let mut topology_controller = topology_controller.lock().await;
-
-                            // Reload paths
-                            if let Some(paths) = config::process_paths(&config_paths) {
-                                topology_controller.config_paths = paths;
-                            }
-
-                            // Reload config
-                            let new_config = config::load_from_paths_with_provider_and_secrets(&topology_controller.config_paths, &mut signal_handler)
-                                .await
-                                .map_err(handle_config_errors).ok();
-
-                            if let ReloadOutcome::FatalError = topology_controller.reload(new_config).await {
-                                break SignalTo::Shutdown;
-                            }
-                        },
-                        Err(RecvError::Lagged(amt)) => warn!("Overflow, dropped {} signals.", amt),
-                        Err(RecvError::Closed) => break SignalTo::Shutdown,
-                        Ok(signal) => break signal,
-                    }
-                }
+                signal = signal_rx.recv() => if let Some(signal) = handle_signal(
+                    signal,
+                    &topology_controller,
+                    &config_paths,
+                    &mut signal_handler,
+                    &metrics_tx,
+                ).await {
+                    break signal;
+                },
                 // Trigger graceful shutdown if a component crashed, or all sources have ended.
-                _ = graceful_crash.next() => break SignalTo::Shutdown,
+                error = graceful_crash.next() => break SignalTo::Shutdown(error),
                 _ = TopologyController::sources_finished(topology_controller.clone()) => {
                     info!("All sources have finished.");
-                    break SignalTo::Shutdown
+                    break SignalTo::Shutdown(None)
                 } ,
                 else => unreachable!("Signal streams never end"),
             }
@@ -447,22 +373,167 @@ impl StartedApplication {
             signal,
             signal_rx,
             topology_controller,
+            openssl_providers,
         }
     }
 }
 
+async fn handle_signal(
+    signal: Result<SignalTo, RecvError>,
+    topology_controller: &SharedTopologyController,
+    config_paths: &[ConfigPath],
+    signal_handler: &mut SignalHandler,
+    metrics_tx: &mpsc::UnboundedSender<UsageMetrics>,
+) -> Option<SignalTo> {
+    match signal {
+        Ok(SignalTo::ReloadFromConfigBuilder(config_builder)) => {
+            emit!(MezmoConfigReloadSignalReceive {});
+            let start = Instant::now();
+            let mut topology_controller = topology_controller.lock().await;
+
+            // We use build_no_validation() to speed up building
+            // Configs were fully validated when generated and better errors
+            // won't help us much at this point (as it will blow up anyway)
+            let new_config = config_builder
+                .build_no_validation()
+                .map_err(handle_config_errors)
+                .ok();
+
+            emit!(MezmoConfigCompile {
+                elapsed: Instant::now() - start
+            });
+
+            let mut reload_outcome = ReloadOutcome::NoConfig;
+            let reload_future =
+                topology_controller.reload_with_metrics(new_config, Some(metrics_tx.clone()));
+
+            tokio::pin!(reload_future);
+
+            // LOG-17772: Set a maximum amount of time to wait for configuration reloading before
+            // triggering corrective action. By default, this will wait for 150 seconds / 2.5 minutes.
+            let config_reload_max_sec = std::env::var("CONFIG_RELOAD_MAX_SEC").unwrap_or_else(|_| {
+                warn!("couldn't read value for CONFIG_RELOAD_MAX_SEC env var, default will be used");
+                "150".to_owned()
+            });
+            let config_reload_max_sec = config_reload_max_sec.parse::<usize>().unwrap_or_else(|_| {
+                warn!("failed to parse CONFIG_RELOAD_MAX_SEC value {config_reload_max_sec}, default will be used");
+                150
+            });
+            let mut reload_future_done = false;
+            for i in 1..=config_reload_max_sec {
+                tokio::select! {
+                    _ = tokio::time::sleep(Duration::from_secs(1)) => {
+                        info!("Waiting for topology to be reloaded after {i} secs")
+                    },
+                    outcome = &mut reload_future => {
+                        reload_outcome = outcome;
+                        reload_future_done = true;
+                        break;
+                    }
+                }
+            }
+
+            let elapsed = Instant::now() - start;
+
+            // LOG-17772: If the config reload future doesn't resolve in the allotted
+            // time, then crash the vector process and allow k8s to respawn the process
+            // in order to get config reloading to work again. Note that panic! doesn't
+            // work to terminate the process since the higher level code traps the panic
+            // and prevents termination.
+            if !reload_future_done {
+                emit!(MezmoConfigReload {
+                    elapsed,
+                    success: false
+                });
+                error!("New topology reload future failed to resolved within the limit.");
+                std::process::abort();
+            }
+
+            match reload_outcome {
+                ReloadOutcome::NoConfig => {
+                    emit!(MezmoConfigReload {
+                        elapsed,
+                        success: false
+                    });
+                    warn!("Config reload resulted in no config");
+                }
+                ReloadOutcome::MissingApiKey => {
+                    emit!(MezmoConfigReload {
+                        elapsed,
+                        success: false
+                    });
+                    warn!("Config reload missing API key");
+                }
+                ReloadOutcome::Success => {
+                    emit!(MezmoConfigReload {
+                        elapsed,
+                        success: true
+                    });
+                    info!("Config reload succeeded, took {:?}", elapsed);
+                }
+                ReloadOutcome::RolledBack => {
+                    emit!(MezmoConfigReload {
+                        elapsed,
+                        success: false
+                    });
+                    warn!("Config reload rolled back");
+                }
+                ReloadOutcome::FatalError(error) => {
+                    emit!(MezmoConfigReload {
+                        elapsed,
+                        success: false
+                    });
+                    error!("Config reload fatal error");
+                    return Some(SignalTo::Shutdown(Some(error)));
+                }
+            }
+            None
+        }
+        Ok(SignalTo::ReloadFromDisk) => {
+            let mut topology_controller = topology_controller.lock().await;
+
+            // Reload paths
+            if let Some(paths) = config::process_paths(config_paths) {
+                topology_controller.config_paths = paths;
+            }
+
+            // Reload config
+            let new_config = config::load_from_paths_with_provider_and_secrets(
+                &topology_controller.config_paths,
+                signal_handler,
+            )
+            .await
+            .map_err(handle_config_errors)
+            .ok();
+
+            if let ReloadOutcome::FatalError(error) = topology_controller.reload(new_config).await {
+                return Some(SignalTo::Shutdown(Some(error)));
+            }
+            None
+        }
+        Err(RecvError::Lagged(amt)) => {
+            warn!("Overflow, dropped {} signals.", amt);
+            None
+        }
+        Err(RecvError::Closed) => Some(SignalTo::Shutdown(None)),
+        Ok(signal) => Some(signal),
+    }
+}
+
 pub struct FinishedApplication {
     pub signal: SignalTo,
     pub signal_rx: SignalRx,
     pub topology_controller: SharedTopologyController,
+    pub openssl_providers: Option<Vec<Provider>>,
 }
 
 impl FinishedApplication {
     pub async fn shutdown(self) -> ExitStatus {
         let FinishedApplication {
             signal,
-            mut signal_rx,
+            signal_rx,
             topology_controller,
+            openssl_providers,
         } = self;
 
         // At this point, we'll have the only reference to the shared topology controller and can
@@ -472,50 +543,42 @@ impl FinishedApplication {
             .expect("fail to unwrap topology controller")
             .into_inner();
 
-        match signal {
-            SignalTo::Shutdown => {
-                emit!(VectorStopped);
-                tokio::select! {
-                    _ = topology_controller.stop() => ExitStatus::from_raw({
-                            #[cfg(windows)]
-                            {
-                                exitcode::OK as u32
-                            }
-                            #[cfg(unix)]
-                            exitcode::OK
-                    }), // Graceful shutdown finished
-                    _ = signal_rx.recv() => {
-                        // It is highly unlikely that this event will exit from topology.
-                        emit!(VectorQuit);
-                        // Dropping the shutdown future will immediately shut the server down
-                        ExitStatus::from_raw({
-                            #[cfg(windows)]
-                            {
-                                exitcode::UNAVAILABLE as u32
-                            }
-                            #[cfg(unix)]
-                            exitcode::OK
-                        })
-                    }
+        let status = match signal {
+            SignalTo::Shutdown(_) => Self::stop(topology_controller, signal_rx).await,
+            SignalTo::Quit => Self::quit(),
+            _ => unreachable!(),
+        };
+        drop(openssl_providers);
+        status
+    }
 
+    async fn stop(topology_controller: TopologyController, mut signal_rx: SignalRx) -> ExitStatus {
+        emit!(VectorStopped);
+        tokio::select! {
+            _ = topology_controller.stop() => ExitStatus::from_raw({
+                #[cfg(windows)]
+                {
+                    exitcode::OK as u32
                 }
-            }
-            SignalTo::Quit => {
-                // It is highly unlikely that this event will exit from topology.
-                emit!(VectorQuit);
-                drop(topology_controller);
-                ExitStatus::from_raw({
-                    #[cfg(windows)]
-                    {
-                        exitcode::UNAVAILABLE as u32
-                    }
-                    #[cfg(unix)]
-                    exitcode::OK
-                })
-            }
-            _ => unreachable!(),
+                #[cfg(unix)]
+                exitcode::OK
+            }), // Graceful shutdown finished
+            _ = signal_rx.recv() => Self::quit(),
         }
     }
+
+    fn quit() -> ExitStatus {
+        // It is highly unlikely that this event will exit from topology.
+        emit!(VectorQuit);
+        ExitStatus::from_raw({
+            #[cfg(windows)]
+            {
+                exitcode::UNAVAILABLE as u32
+            }
+            #[cfg(unix)]
+            exitcode::OK
+        })
+    }
 }
 
 pub fn init_global() {
@@ -657,3 +720,22 @@ pub fn init_logging(color: bool, format: LogFormat, log_level: &str, rate: u64)
     );
     info!(message = "Log level is enabled.", level = ?level);
 }
+
+/// Load the legacy OpenSSL provider.
+///
+/// The returned [Provider] must stay in scope for the entire lifetime of the application, as it
+/// will be unloaded when it is dropped.
+pub fn load_openssl_legacy_providers() -> Result<Vec<Provider>, ExitCode> {
+    warn!(message = "DEPRECATED The openssl legacy provider provides algorithms and key sizes no longer recommended for use. Set `--openssl-legacy-provider=false` or `VECTOR_OPENSSL_LEGACY_PROVIDER=false` to disable. See https://vector.dev/highlights/2023-08-15-0-32-0-upgrade-guide/#legacy-openssl for details.");
+    ["legacy", "default"].into_iter().map(|provider_name| {
+        Provider::try_load(None, provider_name, true)
+            .map(|provider| {
+                info!(message = "Loaded openssl provider.", provider = provider_name);
+                provider
+            })
+            .map_err(|error| {
+                error!(message = "Failed to load openssl provider.", provider = provider_name, %error);
+                exitcode::UNAVAILABLE
+            })
+    }).collect()
+}
diff --git a/src/aws/auth.rs b/src/aws/auth.rs
index f95256fcf69a1..d05d479aaaab1 100644
--- a/src/aws/auth.rs
+++ b/src/aws/auth.rs
@@ -79,6 +79,12 @@ pub enum AwsAuthentication {
         #[configurable(metadata(docs::examples = "arn:aws:iam::123456789098:role/my_role"))]
         assume_role: Option<String>,
 
+        /// The optional unique external ID in conjunction with role to assume.
+        ///
+        /// [external_id]: https://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_create_for-user_externalid.html
+        #[configurable(metadata(docs::examples = "randomEXAMPLEidString"))]
+        external_id: Option<String>,
+
         /// The [AWS region][aws_region] to send STS requests to.
         ///
         /// If not set, this will default to the configured region
@@ -115,6 +121,12 @@ pub enum AwsAuthentication {
         #[configurable(metadata(docs::examples = "arn:aws:iam::123456789098:role/my_role"))]
         assume_role: String,
 
+        /// The optional unique external ID in conjunction with role to assume.
+        ///
+        /// [external_id]: https://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_create_for-user_externalid.html
+        #[configurable(metadata(docs::examples = "randomEXAMPLEidString"))]
+        external_id: Option<String>,
+
         /// Timeout for assuming the role, in seconds.
         ///
         /// Relevant when the default credentials chain or `assume_role` is used.
@@ -199,6 +211,7 @@ impl AwsAuthentication {
                 access_key_id,
                 secret_access_key,
                 assume_role,
+                external_id,
                 region,
             } => {
                 let provider = SharedCredentialsProvider::new(Credentials::from_keys(
@@ -208,9 +221,15 @@ impl AwsAuthentication {
                 ));
                 if let Some(assume_role) = assume_role {
                     let auth_region = region.clone().map(Region::new).unwrap_or(service_region);
-                    let provider = AssumeRoleProviderBuilder::new(assume_role)
-                        .region(auth_region)
-                        .build(provider);
+                    let mut builder =
+                        AssumeRoleProviderBuilder::new(assume_role).region(auth_region);
+
+                    if let Some(external_id) = external_id {
+                        builder = builder.external_id(external_id)
+                    }
+
+                    let provider = builder.build(provider);
+
                     return Ok(SharedCredentialsProvider::new(provider));
                 }
                 Ok(provider)
@@ -232,14 +251,21 @@ impl AwsAuthentication {
             }
             AwsAuthentication::Role {
                 assume_role,
+                external_id,
                 imds,
                 region,
                 ..
             } => {
                 let auth_region = region.clone().map(Region::new).unwrap_or(service_region);
-                let provider = AssumeRoleProviderBuilder::new(assume_role)
-                    .region(auth_region.clone())
-                    .build(default_credentials_provider(auth_region, *imds).await?);
+                let mut builder =
+                    AssumeRoleProviderBuilder::new(assume_role).region(auth_region.clone());
+
+                if let Some(external_id) = external_id {
+                    builder = builder.external_id(external_id)
+                }
+
+                let provider =
+                    builder.build(default_credentials_provider(auth_region, *imds).await?);
 
                 Ok(SharedCredentialsProvider::new(provider))
             }
@@ -259,6 +285,7 @@ impl AwsAuthentication {
             access_key_id: "dummy".to_string().into(),
             secret_access_key: "dummy".to_string().into(),
             assume_role: None,
+            external_id: None,
             region: None,
         }
     }
@@ -295,6 +322,7 @@ mod tests {
     #[derive(Serialize, Deserialize, Clone, Debug)]
     struct ComponentConfig {
         assume_role: Option<String>,
+        external_id: Option<String>,
         #[serde(default)]
         auth: AwsAuthentication,
     }
@@ -396,6 +424,20 @@ mod tests {
         assert!(matches!(config.auth, AwsAuthentication::Role { .. }));
     }
 
+    #[test]
+    fn parsing_external_id_with_assume_role() {
+        let config = toml::from_str::<ComponentConfig>(
+            r#"
+            auth.assume_role = "root"
+            auth.external_id = "id"
+            auth.load_timeout_secs = 10
+        "#,
+        )
+        .unwrap();
+
+        assert!(matches!(config.auth, AwsAuthentication::Role { .. }));
+    }
+
     #[test]
     fn parsing_assume_role_with_imds_client() {
         let config = toml::from_str::<ComponentConfig>(
@@ -411,11 +453,13 @@ mod tests {
         match config.auth {
             AwsAuthentication::Role {
                 assume_role,
+                external_id,
                 load_timeout_secs,
                 imds,
                 region,
             } => {
                 assert_eq!(&assume_role, "root");
+                assert_eq!(external_id, None);
                 assert_eq!(load_timeout_secs, None);
                 assert!(matches!(
                     imds,
@@ -446,11 +490,13 @@ mod tests {
         match config.auth {
             AwsAuthentication::Role {
                 assume_role,
+                external_id,
                 load_timeout_secs,
                 imds,
                 region,
             } => {
                 assert_eq!(&assume_role, "auth.root");
+                assert_eq!(external_id, None);
                 assert_eq!(load_timeout_secs, Some(10));
                 assert!(matches!(imds, ImdsAuthentication { .. }));
                 assert_eq!(region.unwrap(), "us-west-2");
@@ -501,6 +547,38 @@ mod tests {
         }
     }
 
+    #[test]
+    fn parsing_static_with_assume_role_and_external_id() {
+        let config = toml::from_str::<ComponentConfig>(
+            r#"
+            auth.access_key_id = "key"
+            auth.secret_access_key = "other"
+            auth.assume_role = "root"
+            auth.external_id = "id"
+        "#,
+        )
+        .unwrap();
+
+        match config.auth {
+            AwsAuthentication::AccessKey {
+                access_key_id,
+                secret_access_key,
+                assume_role,
+                external_id,
+                ..
+            } => {
+                assert_eq!(&access_key_id, &SensitiveString::from("key".to_string()));
+                assert_eq!(
+                    &secret_access_key,
+                    &SensitiveString::from("other".to_string())
+                );
+                assert_eq!(&assume_role, &Some("root".to_string()));
+                assert_eq!(&external_id, &Some("id".to_string()));
+            }
+            _ => panic!(),
+        }
+    }
+
     #[test]
     fn parsing_file() {
         let config = toml::from_str::<ComponentConfig>(
diff --git a/src/cli.rs b/src/cli.rs
index fa90277649252..ee1857d7cb5a3 100644
--- a/src/cli.rs
+++ b/src/cli.rs
@@ -198,6 +198,18 @@ pub struct RootOpts {
         default_value = "5000"
     )]
     pub allocation_tracing_reporting_interval_ms: u64,
+
+    /// Load the OpenSSL legacy provider.
+    #[arg(
+        long,
+        env = "VECTOR_OPENSSL_LEGACY_PROVIDER",
+        default_value = "true",
+        default_missing_value = "true",
+        num_args = 0..=1,
+        require_equals = true,
+        action = ArgAction::Set
+    )]
+    pub openssl_legacy_provider: bool,
 }
 
 impl RootOpts {
diff --git a/src/codecs/decoding/config.rs b/src/codecs/decoding/config.rs
index 50a5b6ed4e7f8..b4a01245bcfe0 100644
--- a/src/codecs/decoding/config.rs
+++ b/src/codecs/decoding/config.rs
@@ -41,13 +41,13 @@ impl DecodingConfig {
     }
 
     /// Builds a `Decoder` from the provided configuration.
-    pub fn build(&self) -> Decoder {
+    pub fn build(&self) -> vector_common::Result<Decoder> {
         // Build the framer.
         let framer = self.framing.build();
 
         // Build the deserializer.
-        let deserializer = self.decoding.build();
+        let deserializer = self.decoding.build()?;
 
-        Decoder::new(framer, deserializer).with_log_namespace(self.log_namespace)
+        Ok(Decoder::new(framer, deserializer).with_log_namespace(self.log_namespace))
     }
 }
diff --git a/src/codecs/decoding/decoder.rs b/src/codecs/decoding/decoder.rs
index ecf19c17d715e..cf4749ca64d58 100644
--- a/src/codecs/decoding/decoder.rs
+++ b/src/codecs/decoding/decoder.rs
@@ -27,7 +27,7 @@ impl Default for Decoder {
     fn default() -> Self {
         Self {
             framer: Framer::NewlineDelimited(NewlineDelimitedDecoder::new()),
-            deserializer: Deserializer::Bytes(BytesDeserializer::new()),
+            deserializer: Deserializer::Bytes(BytesDeserializer),
             log_namespace: LogNamespace::Legacy,
         }
     }
diff --git a/src/codecs/encoding/transformer.rs b/src/codecs/encoding/transformer.rs
index aa652cb99d518..048e363d1e7fe 100644
--- a/src/codecs/encoding/transformer.rs
+++ b/src/codecs/encoding/transformer.rs
@@ -13,6 +13,7 @@ use lookup::{
 use serde::{Deserialize, Deserializer};
 use vector_config::configurable_component;
 use vector_core::event::{LogEvent, MaybeAsLogMut};
+use vector_core::schema::meaning;
 use vrl::value::Value;
 
 use crate::{
@@ -170,20 +171,52 @@ impl Transformer {
 
     fn apply_only_fields(&self, log: &mut LogEvent) {
         if let Some(only_fields) = self.only_fields.as_ref() {
-            let old_value = std::mem::replace(log.value_mut(), Value::Object(BTreeMap::new()));
+            let mut old_value = std::mem::replace(log.value_mut(), Value::Object(BTreeMap::new()));
 
             for field in only_fields {
-                if let Some(value) = old_value.get(field) {
-                    log.insert((PathPrefix::Event, field), value.clone());
+                if let Some(value) = old_value.remove(field, true) {
+                    log.insert((PathPrefix::Event, field), value);
+                }
+            }
+
+            // We may need the service field to apply tags to emitted metrics after the log message has been pruned. If there
+            // is a service meaning, we move this value to `dropped_fields` in the metadata.
+            // If the field is still in the new log message after pruning it will have been removed from `old_value` above.
+            let service_path = log
+                .metadata()
+                .schema_definition()
+                .meaning_path(meaning::SERVICE);
+            if let Some(service_path) = service_path {
+                let mut new_log = LogEvent::from(old_value);
+                if let Some(service) = new_log.remove(service_path) {
+                    log.metadata_mut()
+                        .add_dropped_field(meaning::SERVICE.to_string(), service);
                 }
             }
         }
     }
 
     fn apply_except_fields(&self, log: &mut LogEvent) {
+        use lookup::path::TargetPath;
+
         if let Some(except_fields) = self.except_fields.as_ref() {
+            let service_path = log
+                .metadata()
+                .schema_definition()
+                .meaning_path(meaning::SERVICE)
+                .map(|path| path.value_path().to_string());
+
             for field in except_fields {
-                log.remove(field.as_str());
+                let value = log.remove(field.as_str());
+
+                // If we are removing the service field we need to store this in a `dropped_fields` list as we may need to
+                // refer to this later when emitting metrics.
+                if let Some(v) = value {
+                    if matches!(service_path.as_ref(), Some(path) if path == field) {
+                        log.metadata_mut()
+                            .add_dropped_field(meaning::SERVICE.to_string(), v);
+                    }
+                }
             }
         }
     }
@@ -200,7 +233,7 @@ impl Transformer {
                             }
                         }
                         for (k, v) in unix_timestamps {
-                            log.insert(k.as_str(), v);
+                            log.parse_path_and_insert(k, v).unwrap();
                         }
                     } else {
                         // root is not an object
@@ -262,13 +295,17 @@ mod tests {
         Serializer,
     };
     use indoc::indoc;
-    use vector_core::config::log_schema;
+    use lookup::path::parse_target_path;
+    use vector_common::btreemap;
+    use vector_core::config::{log_schema, LogNamespace};
+    use vrl::value::Kind;
+
+    use crate::config::schema;
 
     use super::*;
     use assay::assay;
     use codecs::MetricTagValues;
-    use std::collections::BTreeMap;
-    use vector_common::btreemap;
+    use std::{collections::BTreeMap, sync::Arc};
 
     #[test]
     fn serialize() {
@@ -431,7 +468,7 @@ mod tests {
     fn mezmo_reshaping_env_var_must_be_set() {
         let transformer = Transformer::new_with_mezmo_reshape(Transformer::default(), None);
         let mut log_event = LogEvent::default();
-        let path = format!("{}.nope", log_schema().message_key());
+        let path = format!("{}.nope", log_schema().message_key().unwrap());
         log_event.insert(path.as_str(), "This will not be reshaped");
 
         let mut event = Event::from(log_event);
@@ -453,7 +490,7 @@ mod tests {
     fn mezmo_reshaping_env_var_must_be_set_to_1() {
         let transformer = Transformer::new_with_mezmo_reshape(Transformer::default(), None);
         let mut log_event = LogEvent::default();
-        let path = format!("{}.nope", log_schema().message_key());
+        let path = format!("{}.nope", log_schema().message_key().unwrap());
         log_event.insert(path.as_str(), "This will not be reshaped");
 
         let mut event = Event::from(log_event);
@@ -563,7 +600,7 @@ mod tests {
     fn mezmo_reshaping_successful_reshape_message() {
         let transformer = Transformer::new_with_mezmo_reshape(Transformer::default(), None);
         let mut log_event = LogEvent::default();
-        let message_key = log_schema().message_key();
+        let message_key = log_schema().message_key().unwrap().to_string();
 
         log_event.insert(format!("{}.one", message_key).as_str(), 1);
         log_event.insert(format!("{}.two", message_key).as_str(), 2);
@@ -583,9 +620,90 @@ mod tests {
 
         assert_eq!(event, expected, "message payload was reshaped");
         assert_eq!(
-            event.as_log().get(message_key),
+            event
+                .as_log()
+                .get(log_schema().message_key_target_path().unwrap()),
             None,
             "message property is now gone"
         );
     }
+
+    #[test]
+    fn only_fields_with_service() {
+        let transformer: Transformer = toml::from_str(r#"only_fields = ["message"]"#).unwrap();
+        let mut log = LogEvent::default();
+        {
+            log.insert("message", 1);
+            log.insert("thing.service", "carrot");
+        }
+
+        let schema = schema::Definition::new_with_default_metadata(
+            Kind::object(btreemap! {
+                "thing" => Kind::object(btreemap! {
+                    "service" => Kind::bytes(),
+                })
+            }),
+            [LogNamespace::Vector],
+        );
+
+        let schema = schema.with_meaning(parse_target_path("thing.service").unwrap(), "service");
+
+        let mut event = Event::from(log);
+
+        event
+            .metadata_mut()
+            .set_schema_definition(&Arc::new(schema));
+
+        transformer.transform(&mut event);
+        assert!(event.as_mut_log().contains("message"));
+
+        // Event no longer contains the service field.
+        assert!(!event.as_mut_log().contains("thing.service"));
+
+        // But we can still get the service by meaning.
+        assert_eq!(
+            &Value::from("carrot"),
+            event.as_log().get_by_meaning("service").unwrap()
+        );
+    }
+
+    #[test]
+    fn except_fields_with_service() {
+        let transformer: Transformer =
+            toml::from_str(r#"except_fields = ["thing.service"]"#).unwrap();
+        let mut log = LogEvent::default();
+        {
+            log.insert("message", 1);
+            log.insert("thing.service", "carrot");
+        }
+
+        let schema = schema::Definition::new_with_default_metadata(
+            Kind::object(btreemap! {
+                "thing" => Kind::object(btreemap! {
+                    "service" => Kind::bytes(),
+                })
+            }),
+            [LogNamespace::Vector],
+        );
+
+        let schema = schema.with_meaning(parse_target_path("thing.service").unwrap(), "service");
+
+        let mut event = Event::from(log);
+
+        event
+            .metadata_mut()
+            .set_schema_definition(&Arc::new(schema));
+
+        transformer.transform(&mut event);
+        assert!(event.as_mut_log().contains("message"));
+
+        // Event no longer contains the service field.
+        assert!(!event.as_mut_log().contains("thing.service"));
+
+        // But we can still get the service by meaning.
+        assert_eq!(
+            &Value::from("carrot"),
+            event.as_log().get_by_meaning("service").unwrap()
+        );
+    }
 }
diff --git a/src/components/validation/mod.rs b/src/components/validation/mod.rs
index 7457cd6548ad9..240116cf5e247 100644
--- a/src/components/validation/mod.rs
+++ b/src/components/validation/mod.rs
@@ -170,6 +170,20 @@ macro_rules! register_validatable_component {
     };
 }
 
+/// Input and Output runners populate this structure as they send and receive events.
+/// The structure is passed into the validator to use as the expected values for the
+/// metrics that the components under test actually output.
+#[derive(Default)]
+pub struct RunnerMetrics {
+    pub received_events_total: u64,
+    pub received_event_bytes_total: u64,
+    pub received_bytes_total: u64,
+    pub sent_bytes_total: u64, // a reciprocal for received_bytes_total
+    pub sent_event_bytes_total: u64,
+    pub sent_events_total: u64,
+    pub errors_total: u64,
+}
+
 #[cfg(all(test, feature = "component-validation-tests"))]
 mod tests {
     use std::{
diff --git a/src/components/validation/resources/event.rs b/src/components/validation/resources/event.rs
index 21c38e58bfad5..1f91acfbe660d 100644
--- a/src/components/validation/resources/event.rs
+++ b/src/components/validation/resources/event.rs
@@ -1,10 +1,20 @@
+use bytes::BytesMut;
 use serde::Deserialize;
+use snafu::Snafu;
+use tokio_util::codec::Encoder as _;
+
+use crate::codecs::Encoder;
+use codecs::{
+    encoding, JsonSerializer, LengthDelimitedEncoder, LogfmtSerializer, MetricTagValues,
+    NewlineDelimitedEncoder,
+};
 use vector_core::event::{Event, LogEvent};
 
-/// An event used in a test case.
+/// A test case event for deserialization from yaml file.
+/// This is an intermediary step to TestEvent.
 #[derive(Clone, Debug, Deserialize)]
 #[serde(untagged)]
-pub enum TestEvent {
+pub enum RawTestEvent {
     /// The event is used, as-is, without modification.
     Passthrough(EventData),
 
@@ -20,15 +30,6 @@ pub enum TestEvent {
     Modified { modified: bool, event: EventData },
 }
 
-impl TestEvent {
-    pub fn into_event(self) -> Event {
-        match self {
-            Self::Passthrough(event) => event.into_event(),
-            Self::Modified { event, .. } => event.into_event(),
-        }
-    }
-}
-
 #[derive(Clone, Debug, Deserialize)]
 #[serde(untagged)]
 pub enum EventData {
@@ -44,3 +45,91 @@ impl EventData {
         }
     }
 }
+
+/// An event used in a test case.
+/// It is important to have created the event with all fields, immediately after deserializing from the
+/// test case definition yaml file. This ensures that the event data we are using in the expected/actual
+/// metrics collection is based on the same event. Namely, one issue that can arise from creating the event
+/// from the event data twice (once for the expected and once for actual), it can result in a timestamp in
+/// the event which may or may not have the same millisecond precision as it's counterpart.
+#[derive(Clone, Debug, Deserialize)]
+#[serde(from = "RawTestEvent")]
+#[serde(untagged)]
+pub enum TestEvent {
+    /// The event is used, as-is, without modification.
+    Passthrough(Event),
+
+    /// The event is potentially modified by the external resource.
+    ///
+    /// The modification made is dependent on the external resource, but this mode is made available
+    /// for when a test case wants to exercise the failure path, but cannot cause a failure simply
+    /// by constructing the event in a certain way i.e. adding an invalid field, or removing a
+    /// required field, or using an invalid field value, and so on.
+    ///
+    /// For transforms and sinks, generally, the only way to cause an error is if the event itself
+    /// is malformed in some way, which can be achieved without this test event variant.
+    Modified { modified: bool, event: Event },
+}
+
+impl TestEvent {
+    #[allow(clippy::missing_const_for_fn)] // const cannot run destructor
+    pub fn into_event(self) -> Event {
+        match self {
+            Self::Passthrough(event) => event,
+            Self::Modified { event, .. } => event,
+        }
+    }
+}
+
+#[derive(Clone, Debug, Eq, PartialEq, Snafu)]
+pub enum RawTestEventParseError {}
+
+impl From<RawTestEvent> for TestEvent {
+    fn from(other: RawTestEvent) -> Self {
+        match other {
+            RawTestEvent::Passthrough(event_data) => {
+                TestEvent::Passthrough(event_data.into_event())
+            }
+            RawTestEvent::Modified { modified, event } => TestEvent::Modified {
+                modified,
+                event: event.into_event(),
+            },
+        }
+    }
+}
+
+pub fn encode_test_event(
+    encoder: &mut Encoder<encoding::Framer>,
+    buf: &mut BytesMut,
+    event: TestEvent,
+) {
+    match event {
+        TestEvent::Passthrough(event) => {
+            // Encode the event normally.
+            encoder
+                .encode(event, buf)
+                .expect("should not fail to encode input event");
+        }
+        TestEvent::Modified { event, .. } => {
+            // This is a little fragile, but we check what serializer this encoder uses, and based
+            // on `Serializer::supports_json`, we choose an opposing codec. For example, if the
+            // encoder supports JSON, we'll use a serializer that doesn't support JSON, and vise
+            // versa.
+            let mut alt_encoder = if encoder.serializer().supports_json() {
+                Encoder::<encoding::Framer>::new(
+                    LengthDelimitedEncoder::new().into(),
+                    LogfmtSerializer::new().into(),
+                )
+            } else {
+                Encoder::<encoding::Framer>::new(
+                    NewlineDelimitedEncoder::new().into(),
+                    JsonSerializer::new(MetricTagValues::default()).into(),
+                )
+            };
+
+            alt_encoder
+                .encode(event, buf)
+                .expect("should not fail to encode input event");
+        }
+    }
+}
diff --git a/src/components/validation/resources/http.rs b/src/components/validation/resources/http.rs
index 8fa066b6f3f4a..7fd6105b579e6 100644
--- a/src/components/validation/resources/http.rs
+++ b/src/components/validation/resources/http.rs
@@ -1,5 +1,6 @@
 use std::{
     collections::VecDeque,
+    future::Future,
     net::{IpAddr, SocketAddr},
     str::FromStr,
     sync::Arc,
@@ -11,26 +12,18 @@ use axum::{
     Router,
 };
 use bytes::BytesMut;
-use codecs::{
-    encoding, JsonSerializer, LengthDelimitedEncoder, LogfmtSerializer, MetricTagValues,
-    NewlineDelimitedEncoder,
-};
 use http::{Method, Request, StatusCode, Uri};
 use hyper::{Body, Client, Server};
-use std::future::Future;
 use tokio::{
     select,
     sync::{mpsc, oneshot, Mutex, Notify},
 };
-use tokio_util::codec::{Decoder, Encoder as _};
-use vector_core::event::Event;
+use tokio_util::codec::Decoder;
 
-use crate::{
-    codecs::Encoder,
-    components::validation::sync::{Configuring, TaskCoordinator},
-};
+use crate::components::validation::sync::{Configuring, TaskCoordinator};
+use vector_core::event::Event;
 
-use super::{ResourceCodec, ResourceDirection, TestEvent};
+use super::{encode_test_event, ResourceCodec, ResourceDirection, TestEvent};
 
 /// An HTTP resource.
 #[derive(Clone)]
@@ -67,14 +60,17 @@ impl HttpResourceConfig {
         self,
         direction: ResourceDirection,
         codec: ResourceCodec,
-        output_tx: mpsc::Sender<Event>,
+        output_tx: mpsc::Sender<Vec<Event>>,
         task_coordinator: &TaskCoordinator<Configuring>,
-    ) {
+    ) -> vector_common::Result<()> {
         match direction {
             // We'll pull data from the sink.
-            ResourceDirection::Pull => {
-                spawn_output_http_client(self, codec, output_tx, task_coordinator)
-            }
+            ResourceDirection::Pull => Ok(spawn_output_http_client(
+                self,
+                codec,
+                output_tx,
+                task_coordinator,
+            )),
             // The sink will push data to us.
             ResourceDirection::Push => {
                 spawn_output_http_server(self, codec, output_tx, task_coordinator)
@@ -114,8 +110,10 @@ fn spawn_input_http_server(
 
                     buffer.into_response()
                 } else {
-                    // No outstanding events to send, so just provide an empty response.
-                    StatusCode::NO_CONTENT.into_response()
+                    // We'll send an empty 200 in the response since some
+                    // sources throw errors for anything other than a valid
+                    // response.
+                    StatusCode::OK.into_response()
                 }
             }
         });
@@ -230,14 +228,14 @@ fn spawn_input_http_client(
 fn spawn_output_http_server(
     config: HttpResourceConfig,
     codec: ResourceCodec,
-    output_tx: mpsc::Sender<Event>,
+    output_tx: mpsc::Sender<Vec<Event>>,
     task_coordinator: &TaskCoordinator<Configuring>,
-) {
+) -> vector_common::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.
 
     // First, we'll build and spawn our HTTP server.
-    let decoder = codec.into_decoder();
+    let decoder = codec.into_decoder()?;
 
     let (_, http_server_shutdown_tx) =
         spawn_http_server(task_coordinator, &config, move |request| {
@@ -252,12 +250,10 @@ fn spawn_output_http_server(
                         loop {
                             match decoder.decode_eof(&mut body) {
                                 Ok(Some((events, _byte_size))) => {
-                                    for event in events {
-                                        output_tx
-                                            .send(event)
-                                            .await
-                                            .expect("should not fail to send output event");
-                                    }
+                                    output_tx
+                                        .send(events.to_vec())
+                                        .await
+                                        .expect("should not fail to send output event");
                                 }
                                 Ok(None) => return StatusCode::OK.into_response(),
                                 Err(_) => return StatusCode::INTERNAL_SERVER_ERROR.into_response(),
@@ -283,6 +279,7 @@ fn spawn_output_http_server(
 
         debug!("HTTP server external output resource completed.");
     });
+    Ok(())
 }
 
 /// Spawns an HTTP client that pulls events by making requests to an HTTP server driven by a sink.
@@ -290,7 +287,7 @@ fn spawn_output_http_server(
 fn spawn_output_http_client(
     _config: HttpResourceConfig,
     _codec: ResourceCodec,
-    _output_tx: mpsc::Sender<Event>,
+    _output_tx: mpsc::Sender<Vec<Event>>,
     _task_coordinator: &TaskCoordinator<Configuring>,
 ) {
     // TODO: The `prometheus_exporter` sink is the only sink that exposes an HTTP server which must be
@@ -400,39 +397,3 @@ fn socketaddr_from_uri(uri: &Uri) -> SocketAddr {
 
     SocketAddr::from((uri_host, uri_port))
 }
-
-pub fn encode_test_event(
-    encoder: &mut Encoder<encoding::Framer>,
-    buf: &mut BytesMut,
-    event: TestEvent,
-) {
-    match event {
-        TestEvent::Passthrough(event) => {
-            // Encode the event normally.
-            encoder
-                .encode(event.into_event(), buf)
-                .expect("should not fail to encode input event");
-        }
-        TestEvent::Modified { event, .. } => {
-            // This is a little fragile, but we check what serializer this encoder uses, and based
-            // on `Serializer::supports_json`, we choose an opposing codec. For example, if the
-            // encoder supports JSON, we'll use a serializer that doesn't support JSON, and vise
-            // versa.
-            let mut alt_encoder = if encoder.serializer().supports_json() {
-                Encoder::<encoding::Framer>::new(
-                    LengthDelimitedEncoder::new().into(),
-                    LogfmtSerializer::new().into(),
-                )
-            } else {
-                Encoder::<encoding::Framer>::new(
-                    NewlineDelimitedEncoder::new().into(),
-                    JsonSerializer::new(MetricTagValues::default()).into(),
-                )
-            };
-
-            alt_encoder
-                .encode(event.into_event(), buf)
-                .expect("should not fail to encode input event");
-        }
-    }
-}
diff --git a/src/components/validation/resources/mod.rs b/src/components/validation/resources/mod.rs
index 940bd90846ad7..aee84c35c6549 100644
--- a/src/components/validation/resources/mod.rs
+++ b/src/components/validation/resources/mod.rs
@@ -13,8 +13,8 @@ use vector_core::{config::DataType, event::Event};
 
 use crate::codecs::{Decoder, DecodingConfig, Encoder, EncodingConfig, EncodingConfigWithFraming};
 
-pub use self::event::{EventData, TestEvent};
-pub use self::http::{encode_test_event, HttpResourceConfig};
+pub use self::event::{encode_test_event, TestEvent};
+pub use self::http::HttpResourceConfig;
 
 use super::sync::{Configuring, TaskCoordinator};
 
@@ -96,24 +96,24 @@ 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) -> Decoder {
+    pub fn into_decoder(&self) -> vector_common::Result<Decoder> {
         let (framer, deserializer) = match self {
             Self::Decoding(config) => return config.build(),
             Self::Encoding(config) => (
                 encoder_framing_to_decoding_framer(config.config().default_stream_framing()),
-                serializer_config_to_deserializer(config.config()),
+                serializer_config_to_deserializer(config.config())?,
             ),
             Self::EncodingWithFraming(config) => {
                 let (maybe_framing, serializer) = config.config();
                 let framing = maybe_framing.clone().unwrap_or(FramingConfig::Bytes);
                 (
                     encoder_framing_to_decoding_framer(framing),
-                    serializer_config_to_deserializer(serializer),
+                    serializer_config_to_deserializer(serializer)?,
                 )
             }
         };
 
-        Decoder::new(framer, deserializer)
+        Ok(Decoder::new(framer, deserializer))
     }
 }
 
@@ -142,6 +142,7 @@ fn deserializer_config_to_serializer(config: &DeserializerConfig) -> encoding::S
         // `message` field... but it's close enough for now.
         DeserializerConfig::Bytes => SerializerConfig::Text(TextSerializerConfig::default()),
         DeserializerConfig::Json { .. } => SerializerConfig::Json(JsonSerializerConfig::default()),
+        DeserializerConfig::Protobuf(_) => unimplemented!(),
         // TODO: We need to create an Avro serializer because, certainly, for any source decoding
         // the data as Avro, we can't possibly send anything else without the source just
         // immediately barfing.
@@ -178,7 +179,9 @@ fn decoder_framing_to_encoding_framer(framing: &decoding::FramingConfig) -> enco
     framing_config.build()
 }
 
-fn serializer_config_to_deserializer(config: &SerializerConfig) -> decoding::Deserializer {
+fn serializer_config_to_deserializer(
+    config: &SerializerConfig,
+) -> vector_common::Result<decoding::Deserializer> {
     let deserializer_config = match config {
         SerializerConfig::Avro { .. } => todo!(),
         SerializerConfig::Csv { .. } => todo!(),
@@ -309,9 +312,9 @@ impl ExternalResource {
     /// Spawns this resource for use as an output for a sink.
     pub fn spawn_as_output(
         self,
-        output_tx: mpsc::Sender<Event>,
+        output_tx: mpsc::Sender<Vec<Event>>,
         task_coordinator: &TaskCoordinator<Configuring>,
-    ) {
+    ) -> vector_common::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 c454ba433c847..55e4fca1eaecf 100644
--- a/src/components/validation/runner/io.rs
+++ b/src/components/validation/runner/io.rs
@@ -27,11 +27,11 @@ use crate::{
 
 #[derive(Clone)]
 pub struct EventForwardService {
-    tx: mpsc::Sender<Event>,
+    tx: mpsc::Sender<Vec<Event>>,
 }
 
-impl From<mpsc::Sender<Event>> for EventForwardService {
-    fn from(tx: mpsc::Sender<Event>) -> Self {
+impl From<mpsc::Sender<Vec<Event>>> for EventForwardService {
+    fn from(tx: mpsc::Sender<Vec<Event>>) -> Self {
         Self { tx }
     }
 }
@@ -42,14 +42,17 @@ impl VectorService for EventForwardService {
         &self,
         request: tonic::Request<PushEventsRequest>,
     ) -> Result<tonic::Response<PushEventsResponse>, Status> {
-        let events = request.into_inner().events.into_iter().map(Event::from);
-
-        for event in events {
-            self.tx
-                .send(event)
-                .await
-                .expect("event forward rx should not close first");
-        }
+        let events = request
+            .into_inner()
+            .events
+            .into_iter()
+            .map(Event::from)
+            .collect();
+
+        self.tx
+            .send(events)
+            .await
+            .expect("event forward rx should not close first");
 
         Ok(tonic::Response::new(PushEventsResponse {}))
     }
@@ -74,7 +77,7 @@ pub struct InputEdge {
 pub struct OutputEdge {
     listen_addr: GrpcAddress,
     service: VectorServer<EventForwardService>,
-    rx: mpsc::Receiver<Event>,
+    rx: mpsc::Receiver<Vec<Event>>,
 }
 
 impl InputEdge {
@@ -129,7 +132,7 @@ impl OutputEdge {
     pub fn spawn_output_server(
         self,
         task_coordinator: &TaskCoordinator<Configuring>,
-    ) -> mpsc::Receiver<Event> {
+    ) -> mpsc::Receiver<Vec<Event>> {
         spawn_grpc_server(self.listen_addr, self.service, task_coordinator);
         self.rx
     }
@@ -184,5 +187,5 @@ pub fn spawn_grpc_server<S>(
 
 pub struct ControlledEdges {
     pub input: Option<mpsc::Sender<TestEvent>>,
-    pub output: Option<mpsc::Receiver<Event>>,
+    pub output: Option<mpsc::Receiver<Vec<Event>>>,
 }
diff --git a/src/components/validation/runner/mod.rs b/src/components/validation/runner/mod.rs
index ff31d598a294c..ad727edcb007d 100644
--- a/src/components/validation/runner/mod.rs
+++ b/src/components/validation/runner/mod.rs
@@ -2,18 +2,34 @@ pub mod config;
 mod io;
 mod telemetry;
 
-use std::{collections::HashMap, path::PathBuf, time::Duration};
+use std::{
+    collections::HashMap,
+    path::PathBuf,
+    sync::{Arc, Mutex},
+    time::Duration,
+};
+
+use bytes::BytesMut;
+use tokio::{
+    runtime::Builder,
+    select,
+    sync::mpsc::{self, Receiver, Sender},
+    task::JoinHandle,
+};
+use tokio_util::codec::Encoder as _;
 
-use tokio::{runtime::Builder, select, sync::mpsc};
-use vector_core::event::Event;
+use codecs::encoding;
+use vector_core::{event::Event, EstimatedJsonEncodedSizeOf};
 
 use crate::{
-    components::validation::TestCase,
+    codecs::Encoder,
+    components::validation::{RunnerMetrics, TestCase},
     config::{ConfigBuilder, ConfigDiff},
     topology,
 };
 
 use super::{
+    encode_test_event,
     sync::{Configuring, TaskCoordinator},
     ComponentType, TestCaseExpectation, TestEvent, ValidationConfiguration, Validator,
 };
@@ -73,7 +89,7 @@ pub enum RunnerOutput {
     /// external resource pulls output events from the sink.
     ///
     /// Only sinks have external inputs.
-    External(mpsc::Receiver<Event>),
+    External(mpsc::Receiver<Vec<Event>>),
 
     /// The component uses a "controlled" edge for its output.
     ///
@@ -93,8 +109,8 @@ impl RunnerOutput {
     /// this function will panic, as one or the other must be provided.
     pub fn into_receiver(
         self,
-        controlled_edge: Option<mpsc::Receiver<Event>>,
-    ) -> mpsc::Receiver<Event> {
+        controlled_edge: Option<mpsc::Receiver<Vec<Event>>>,
+    ) -> mpsc::Receiver<Vec<Event>> {
         match (self, controlled_edge) {
             (Self::External(_), Some(_)) => panic!("Runner output declared as external resource, but controlled output edge was also specified."),
             (Self::Controlled, None) => panic!("Runner output declared as controlled, but no controlled output edge was specified."),
@@ -175,7 +191,7 @@ impl Runner {
         }
     }
 
-    pub async fn run_validation(self) -> Result<Vec<RunnerResults>, String> {
+    pub async fn run_validation(self) -> Result<Vec<RunnerResults>, vector_common::Error> {
         // Initialize our test environment.
         initialize_test_environment();
 
@@ -216,6 +232,11 @@ impl Runner {
 
             debug!("Component topology configuration built and telemetry collector spawned.");
 
+            // Create the data structure that the input and output runners will use to store
+            // their received/sent metrics. This is then shared with the Validator for comparison
+            // against the actual metrics output by the component under test.
+            let runner_metrics = Arc::new(Mutex::new(RunnerMetrics::default()));
+
             // After that, we'll build the external resource necessary for this component, if any.
             // Once that's done, we build the input event/output event sender and receiver based on
             // whatever we spawned for an external resource.
@@ -226,13 +247,13 @@ impl Runner {
             // For example, if we're validating a source, we would have added a filler sink for our
             // controlled output edge, which means we then need a server task listening for the
             // events sent by that sink.
-            let (runner_input, runner_output) = build_external_resource(
+            let (runner_input, runner_output, maybe_runner_encoder) = build_external_resource(
                 &self.configuration,
                 &input_task_coordinator,
                 &output_task_coordinator,
-            );
+            )?;
             let input_tx = runner_input.into_sender(controlled_edges.input);
-            let mut output_rx = runner_output.into_receiver(controlled_edges.output);
+            let output_rx = runner_output.into_receiver(controlled_edges.output);
             debug!("External resource (if any) and controlled edges built and spawned.");
 
             // Now with any external resource spawned, as well as any tasks for handling controlled
@@ -261,7 +282,7 @@ impl Runner {
             // send all inputs until we have no more, when we can't send more because we need to
             // drive output collection to allow forward progress to be made, etc.)
 
-            // We sleep for one second here because while we do wait for the component topology to
+            // We sleep for two seconds here because while we do wait for the component topology to
             // mark itself as started, starting the topology does not necessarily mean that all
             // component tasks are actually ready for input, etc.
             //
@@ -271,25 +292,20 @@ impl Runner {
             // like the aforementioned unit tests, switch to any improved mechanism we come up with
             // in the future to make these tests more deterministic and waste less time waiting
             // around if we can avoid it.
-            tokio::time::sleep(Duration::from_secs(1)).await;
-
-            let input_events = test_case.events.clone();
-            let input_driver = tokio::spawn(async move {
-                for input_event in input_events {
-                    input_tx
-                        .send(input_event)
-                        .await
-                        .expect("input channel should not be closed");
-                }
-            });
+            tokio::time::sleep(Duration::from_secs(2)).await;
 
-            let output_driver = tokio::spawn(async move {
-                let mut output_events = Vec::new();
-                while let Some(output_event) = output_rx.recv().await {
-                    output_events.push(output_event);
-                }
-                output_events
-            });
+            let input_driver = spawn_input_driver(
+                test_case.events.clone(),
+                input_tx,
+                &runner_metrics,
+                maybe_runner_encoder.as_ref().cloned(),
+            );
+
+            let output_driver = spawn_output_driver(
+                output_rx,
+                &runner_metrics,
+                maybe_runner_encoder.as_ref().cloned(),
+            );
 
             // At this point, the component topology is running, and all input/output/telemetry
             // tasks are running as well. Our input driver should be sending (or will have already
@@ -334,12 +350,12 @@ impl Runner {
                 .values()
                 .map(|validator| {
                     validator.check_validation(
-                        self.configuration.clone(),
                         component_type,
                         expectation,
                         &input_events,
                         &output_events,
                         &telemetry_events,
+                        &runner_metrics.lock().unwrap(),
                     )
                 })
                 .collect();
@@ -397,9 +413,12 @@ fn build_external_resource(
     configuration: &ValidationConfiguration,
     input_task_coordinator: &TaskCoordinator<Configuring>,
     output_task_coordinator: &TaskCoordinator<Configuring>,
-) -> (RunnerInput, RunnerOutput) {
+) -> Result<(RunnerInput, RunnerOutput, Option<Encoder<encoding::Framer>>), vector_common::Error> {
     let component_type = configuration.component_type();
     let maybe_external_resource = configuration.external_resource();
+    let maybe_encoder = maybe_external_resource
+        .as_ref()
+        .map(|resource| resource.codec.into_encoder());
     match component_type {
         ComponentType::Source => {
             // As an external resource for a source, we create a channel that the validation runner
@@ -411,11 +430,15 @@ fn build_external_resource(
                 maybe_external_resource.expect("a source must always have an external resource");
             resource.spawn_as_input(rx, input_task_coordinator);
 
-            (RunnerInput::External(tx), RunnerOutput::Controlled)
+            Ok((
+                RunnerInput::External(tx),
+                RunnerOutput::Controlled,
+                maybe_encoder,
+            ))
         }
         ComponentType::Transform => {
             // Transforms have no external resources.
-            (RunnerInput::Controlled, RunnerOutput::Controlled)
+            Ok((RunnerInput::Controlled, RunnerOutput::Controlled, None))
         }
         ComponentType::Sink => {
             // As an external resource for a sink, we create a channel that the validation runner
@@ -425,9 +448,13 @@ fn build_external_resource(
             let (tx, rx) = mpsc::channel(1024);
             let resource =
                 maybe_external_resource.expect("a sink must always have an external resource");
-            resource.spawn_as_output(tx, output_task_coordinator);
+            resource.spawn_as_output(tx, output_task_coordinator)?;
 
-            (RunnerInput::Controlled, RunnerOutput::External(rx))
+            Ok((
+                RunnerInput::Controlled,
+                RunnerOutput::External(rx),
+                maybe_encoder,
+            ))
         }
     }
 }
@@ -483,6 +510,88 @@ fn spawn_component_topology(
     });
 }
 
+fn spawn_input_driver(
+    input_events: Vec<TestEvent>,
+    input_tx: Sender<TestEvent>,
+    runner_metrics: &Arc<Mutex<RunnerMetrics>>,
+    mut maybe_encoder: Option<Encoder<encoding::Framer>>,
+) -> JoinHandle<()> {
+    let input_runner_metrics = Arc::clone(runner_metrics);
+
+    tokio::spawn(async move {
+        for input_event in input_events {
+            input_tx
+                .send(input_event.clone())
+                .await
+                .expect("input channel should not be closed");
+
+            // Update the runner metrics for the sent event. This will later
+            // be used in the Validators, as the "expected" case.
+            let mut input_runner_metrics = input_runner_metrics.lock().unwrap();
+
+            if let Some(encoder) = maybe_encoder.as_mut() {
+                let mut buffer = BytesMut::new();
+                encode_test_event(encoder, &mut buffer, input_event.clone());
+
+                input_runner_metrics.sent_bytes_total += buffer.len() as u64;
+            }
+
+            let (modified, event) = match input_event {
+                TestEvent::Passthrough(event) => (false, event),
+                TestEvent::Modified { modified, event } => (modified, event),
+            };
+
+            // account for failure case
+            if modified {
+                input_runner_metrics.errors_total += 1;
+            } else {
+                input_runner_metrics.sent_events_total += 1;
+
+                input_runner_metrics.sent_event_bytes_total +=
+                    vec![event].estimated_json_encoded_size_of().get() as u64;
+            }
+        }
+    })
+}
+
+fn spawn_output_driver(
+    mut output_rx: Receiver<Vec<Event>>,
+    runner_metrics: &Arc<Mutex<RunnerMetrics>>,
+    maybe_encoder: Option<Encoder<encoding::Framer>>,
+) -> JoinHandle<Vec<Event>> {
+    let output_runner_metrics = Arc::clone(runner_metrics);
+
+    tokio::spawn(async move {
+        let mut output_events = Vec::new();
+        while let Some(events) = output_rx.recv().await {
+            output_events.extend(events.clone());
+
+            // Update the runner metrics for the received event. This will later
+            // be used in the Validators, as the "expected" case.
+            let mut output_runner_metrics = output_runner_metrics.lock().unwrap();
+
+            for output_event in events {
+                output_runner_metrics.received_events_total += 1;
+                output_runner_metrics.received_event_bytes_total += vec![output_event.clone()]
+                    .estimated_json_encoded_size_of()
+                    .get()
+                    as u64;
+
+                if let Some(encoder) = maybe_encoder.as_ref() {
+                    let mut buffer = BytesMut::new();
+                    encoder
+                        .clone()
+                        .encode(output_event, &mut buffer)
+                        .expect("should not fail to encode output event");
+
+                    output_runner_metrics.received_bytes_total += buffer.len() as u64;
+                }
+            }
+        }
+        output_events
+    })
+}
+
 fn initialize_test_environment() {
     // Make sure our metrics recorder is installed and in test mode. This is necessary for
     // proper internal telemetry collect when running the component topology, even though it's
diff --git a/src/components/validation/runner/telemetry.rs b/src/components/validation/runner/telemetry.rs
index 9ef813838f1dc..76e8c29f62a9f 100644
--- a/src/components/validation/runner/telemetry.rs
+++ b/src/components/validation/runner/telemetry.rs
@@ -23,14 +23,13 @@ const INTERNAL_LOGS_KEY: &str = "_telemetry_logs";
 const INTERNAL_METRICS_KEY: &str = "_telemetry_metrics";
 const VECTOR_SINK_KEY: &str = "_telemetry_out";
 
-// The metrics event to monitor for before shutting down a telemetry collector.
-const INTERNAL_METRICS_SHUTDOWN_EVENT: &str = "component_received_events_total";
+const SHUTDOWN_TICKS: u8 = 3;
 
 /// Telemetry collector for a component under validation.
 pub struct Telemetry {
     listen_addr: GrpcAddress,
     service: VectorServer<EventForwardService>,
-    rx: mpsc::Receiver<Event>,
+    rx: mpsc::Receiver<Vec<Event>>,
 }
 
 impl Telemetry {
@@ -98,47 +97,49 @@ impl Telemetry {
                 select! {
                     _ = telemetry_shutdown_handle.wait() => {
                         // After we receive the shutdown signal, we need to wait
-                        // for two event emissions from the internal_metrics
+                        // for two batches of event emissions from the internal_metrics
                         // source. This is to ensure that we've received all the
                         // events from the components that we're testing.
                         //
                         // We need exactly two because the internal_metrics
                         // source does not emit component events until after the
                         // component_received_events_total metric has been
-                        // emitted. Thus, two events ensure that all component
+                        // emitted. Thus, two batches ensure that all component
                         // events have been emitted.
 
                         debug!("Telemetry: waiting for final internal_metrics events before shutting down.");
 
-                        let mut events_seen = 0;
-                        let current_time = chrono::Utc::now();
+                        let mut batches_received = 0;
+
+                        let timeout = tokio::time::sleep(Duration::from_secs(5));
+                        tokio::pin!(timeout);
 
                         loop {
-                            match &rx.recv().await {
-                                None => break 'outer,
-                                Some(telemetry_event) => {
-                                    telemetry_events.push(telemetry_event.clone());
-                                    if let Event::Metric(metric) = telemetry_event {
-                                        if let Some(tags) = metric.tags() {
-                                            if metric.name() == INTERNAL_METRICS_SHUTDOWN_EVENT &&
-                                            tags.get("component_name") == Some(INTERNAL_LOGS_KEY) &&
-                                            metric.data().timestamp().unwrap() > &current_time {
-                                                debug!("Telemetry: processed one component_received_events_total event.");
-
-                                                events_seen += 1;
-                                                if events_seen == 2 {
-                                                    break 'outer;
-                                                }
+                            select! {
+                                d = rx.recv() => {
+                                    match d {
+                                        None => break,
+                                        Some(telemetry_event_batch) => {
+                                        telemetry_events.extend(telemetry_event_batch);
+                                            debug!("Telemetry: processed one batch of internal_metrics.");
+                                            batches_received += 1;
+                                            if batches_received == SHUTDOWN_TICKS {
+                                                break;
                                             }
                                         }
                                     }
-                                }
+                                },
+                                _ = &mut timeout => break,
                             }
                         }
+                        if batches_received != SHUTDOWN_TICKS {
+                            panic!("Did not receive {SHUTDOWN_TICKS} events while waiting for shutdown! Only received {batches_received}!");
+                        }
+                        break 'outer;
                     },
                     maybe_telemetry_event = rx.recv() => match maybe_telemetry_event {
                         None => break,
-                        Some(telemetry_event) => telemetry_events.push(telemetry_event),
+                        Some(telemetry_event_batch) => telemetry_events.extend(telemetry_event_batch),
                     },
                 }
             }
diff --git a/src/components/validation/validators/component_spec/mod.rs b/src/components/validation/validators/component_spec/mod.rs
index e566403d95bf9..f6758a44fe7cf 100644
--- a/src/components/validation/validators/component_spec/mod.rs
+++ b/src/components/validation/validators/component_spec/mod.rs
@@ -2,13 +2,11 @@ mod sources;
 
 use vector_core::event::{Event, Metric};
 
-use crate::components::validation::{
-    ComponentType, TestCaseExpectation, TestEvent, ValidationConfiguration,
-};
+use crate::components::validation::{ComponentType, RunnerMetrics, TestCaseExpectation, TestEvent};
 
 use super::Validator;
 
-use self::sources::{validate_sources, SourceMetrics};
+use self::sources::{validate_sources, SourceMetricType};
 
 /// Validates that the component meets the requirements of the [Component Specification][component_spec].
 ///
@@ -28,12 +26,12 @@ impl Validator for ComponentSpecValidator {
 
     fn check_validation(
         &self,
-        configuration: ValidationConfiguration,
         component_type: ComponentType,
         expectation: TestCaseExpectation,
         inputs: &[TestEvent],
         outputs: &[Event],
         telemetry_events: &[Event],
+        runner_metrics: &RunnerMetrics,
     ) -> Result<Vec<String>, Vec<String>> {
         for input in inputs {
             debug!("Validator observed input event: {:?}", input);
@@ -52,7 +50,7 @@ impl Validator for ComponentSpecValidator {
             TestCaseExpectation::Success => {
                 if inputs.len() != outputs.len() {
                     return Err(vec![format!(
-                        "Sent {} inputs but only received {} outputs.",
+                        "Sent {} inputs but received {} outputs.",
                         inputs.len(),
                         outputs.len()
                     )]);
@@ -84,13 +82,7 @@ impl Validator for ComponentSpecValidator {
             format!("received {} telemetry events", telemetry_events.len()),
         ];
 
-        let out = validate_telemetry(
-            configuration,
-            component_type,
-            inputs,
-            outputs,
-            telemetry_events,
-        )?;
+        let out = validate_telemetry(component_type, telemetry_events, runner_metrics)?;
         run_out.extend(out);
 
         Ok(run_out)
@@ -98,18 +90,16 @@ impl Validator for ComponentSpecValidator {
 }
 
 fn validate_telemetry(
-    configuration: ValidationConfiguration,
     component_type: ComponentType,
-    inputs: &[TestEvent],
-    outputs: &[Event],
     telemetry_events: &[Event],
+    runner_metrics: &RunnerMetrics,
 ) -> Result<Vec<String>, Vec<String>> {
     let mut out: Vec<String> = Vec::new();
     let mut errs: Vec<String> = Vec::new();
 
     match component_type {
         ComponentType::Source => {
-            let result = validate_sources(&configuration, inputs, outputs, telemetry_events);
+            let result = validate_sources(telemetry_events, runner_metrics);
             match result {
                 Ok(o) => out.extend(o),
                 Err(e) => errs.extend(e),
@@ -128,9 +118,9 @@ fn validate_telemetry(
 
 fn filter_events_by_metric_and_component<'a>(
     telemetry_events: &'a [Event],
-    metric: SourceMetrics,
+    metric: &SourceMetricType,
     component_name: &'a str,
-) -> Result<Vec<&'a Metric>, Vec<String>> {
+) -> Vec<&'a Metric> {
     let metrics: Vec<&Metric> = telemetry_events
         .iter()
         .flat_map(|e| {
@@ -155,9 +145,5 @@ fn filter_events_by_metric_and_component<'a>(
 
     debug!("{}: {} metrics found.", metric.to_string(), metrics.len(),);
 
-    if metrics.is_empty() {
-        return Err(vec![format!("{}: no metrics were emitted.", metric)]);
-    }
-
-    Ok(metrics)
+    metrics
 }
diff --git a/src/components/validation/validators/component_spec/sources.rs b/src/components/validation/validators/component_spec/sources.rs
index c25b217a399e4..6002b0b4878e9 100644
--- a/src/components/validation/validators/component_spec/sources.rs
+++ b/src/components/validation/validators/component_spec/sources.rs
@@ -1,41 +1,44 @@
 use std::fmt::{Display, Formatter};
 
-use bytes::BytesMut;
-use vector_common::json_size::JsonSize;
 use vector_core::event::{Event, MetricKind};
-use vector_core::EstimatedJsonEncodedSizeOf;
 
-use crate::components::validation::{encode_test_event, TestEvent, ValidationConfiguration};
+use crate::components::validation::RunnerMetrics;
 
 use super::filter_events_by_metric_and_component;
 
 const TEST_SOURCE_NAME: &str = "test_source";
 
-pub enum SourceMetrics {
+pub enum SourceMetricType {
     EventsReceived,
     EventsReceivedBytes,
     ReceivedBytesTotal,
     SentEventsTotal,
     SentEventBytesTotal,
+    ErrorsTotal,
 }
 
-impl SourceMetrics {
+impl SourceMetricType {
     const fn name(&self) -> &'static str {
         match self {
-            SourceMetrics::EventsReceived => "component_received_events_total",
-            SourceMetrics::EventsReceivedBytes => "component_received_event_bytes_total",
-            SourceMetrics::ReceivedBytesTotal => "component_received_bytes_total",
-            SourceMetrics::SentEventsTotal => "component_sent_events_total",
-            SourceMetrics::SentEventBytesTotal => "component_sent_event_bytes_total",
+            SourceMetricType::EventsReceived => "component_received_events_total",
+            SourceMetricType::EventsReceivedBytes => "component_received_event_bytes_total",
+            SourceMetricType::ReceivedBytesTotal => "component_received_bytes_total",
+            SourceMetricType::SentEventsTotal => "component_sent_events_total",
+            SourceMetricType::SentEventBytesTotal => "component_sent_event_bytes_total",
+            SourceMetricType::ErrorsTotal => "component_errors_total",
         }
     }
 }
 
+impl Display for SourceMetricType {
+    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+        write!(f, "{}", self.name())
+    }
+}
+
 pub fn validate_sources(
-    configuration: &ValidationConfiguration,
-    inputs: &[TestEvent],
-    outputs: &[Event],
     telemetry_events: &[Event],
+    runner_metrics: &RunnerMetrics,
 ) -> Result<Vec<String>, Vec<String>> {
     let mut out: Vec<String> = Vec::new();
     let mut errs: Vec<String> = Vec::new();
@@ -46,10 +49,11 @@ pub fn validate_sources(
         validate_component_received_bytes_total,
         validate_component_sent_events_total,
         validate_component_sent_event_bytes_total,
+        validate_component_errors_total,
     ];
 
     for v in validations.iter() {
-        match v(configuration, inputs, outputs, telemetry_events) {
+        match v(telemetry_events, runner_metrics) {
             Err(e) => errs.extend(e),
             Ok(m) => out.extend(m),
         }
@@ -62,63 +66,54 @@ pub fn validate_sources(
     }
 }
 
-impl Display for SourceMetrics {
-    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
-        write!(f, "{}", self.name())
-    }
-}
+fn sum_counters(
+    metric_name: &SourceMetricType,
+    metrics: &[&vector_core::event::Metric],
+) -> Result<u64, Vec<String>> {
+    let mut sum: f64 = 0.0;
+    let mut errs = Vec::new();
 
-fn validate_component_received_events_total(
-    _configuration: &ValidationConfiguration,
-    inputs: &[TestEvent],
-    _outputs: &[Event],
-    telemetry_events: &[Event],
-) -> Result<Vec<String>, Vec<String>> {
-    let mut errs: Vec<String> = Vec::new();
-
-    let metrics = filter_events_by_metric_and_component(
-        telemetry_events,
-        SourceMetrics::EventsReceived,
-        TEST_SOURCE_NAME,
-    )?;
-
-    let mut events = 0;
     for m in metrics {
         match m.value() {
             vector_core::event::MetricValue::Counter { value } => {
                 if let MetricKind::Absolute = m.data().kind {
-                    events = *value as i32
+                    sum = *value;
                 } else {
-                    events += *value as i32
+                    sum += *value;
                 }
             }
-            _ => errs.push(format!(
-                "{}: metric value is not a counter",
-                SourceMetrics::EventsReceived,
-            )),
+            _ => errs.push(format!("{}: metric value is not a counter", metric_name,)),
         }
     }
 
-    let expected_events = inputs.iter().fold(0, |acc, i| {
-        if let TestEvent::Passthrough(_) = i {
-            return acc + 1;
-        }
-        acc
-    });
+    if errs.is_empty() {
+        Ok(sum as u64)
+    } else {
+        Err(errs)
+    }
+}
+
+fn validate_events_total(
+    telemetry_events: &[Event],
+    metric_type: &SourceMetricType,
+    expected_events: u64,
+) -> Result<Vec<String>, Vec<String>> {
+    let mut errs: Vec<String> = Vec::new();
+
+    let metrics =
+        filter_events_by_metric_and_component(telemetry_events, metric_type, TEST_SOURCE_NAME);
+
+    let actual_events = sum_counters(metric_type, &metrics)?;
 
     debug!(
         "{}: {} events, {} expected events.",
-        SourceMetrics::EventsReceived,
-        events,
-        expected_events,
+        metric_type, actual_events, expected_events,
     );
 
-    if events != expected_events {
+    if actual_events != expected_events {
         errs.push(format!(
             "{}: expected {} events, but received {}",
-            SourceMetrics::EventsReceived,
-            expected_events,
-            events
+            metric_type, expected_events, actual_events
         ));
     }
 
@@ -126,66 +121,30 @@ fn validate_component_received_events_total(
         return Err(errs);
     }
 
-    Ok(vec![format!(
-        "{}: {}",
-        SourceMetrics::EventsReceived,
-        events,
-    )])
+    Ok(vec![format!("{}: {}", metric_type, actual_events)])
 }
 
-fn validate_component_received_event_bytes_total(
-    _configuration: &ValidationConfiguration,
-    inputs: &[TestEvent],
-    _outputs: &[Event],
+fn validate_bytes_total(
     telemetry_events: &[Event],
+    metric_type: &SourceMetricType,
+    expected_bytes: u64,
 ) -> Result<Vec<String>, Vec<String>> {
     let mut errs: Vec<String> = Vec::new();
 
-    let metrics = filter_events_by_metric_and_component(
-        telemetry_events,
-        SourceMetrics::EventsReceivedBytes,
-        TEST_SOURCE_NAME,
-    )?;
-
-    let mut metric_bytes: f64 = 0.0;
-    for m in metrics {
-        match m.value() {
-            vector_core::event::MetricValue::Counter { value } => {
-                if let MetricKind::Absolute = m.data().kind {
-                    metric_bytes = *value
-                } else {
-                    metric_bytes += value
-                }
-            }
-            _ => errs.push(format!(
-                "{}: metric value is not a counter",
-                SourceMetrics::EventsReceivedBytes,
-            )),
-        }
-    }
-
-    let expected_bytes = inputs.iter().fold(JsonSize::new(0), |acc, i| {
-        if let TestEvent::Passthrough(_) = i {
-            let size = vec![i.clone().into_event()].estimated_json_encoded_size_of();
-            return acc + size;
-        }
+    let metrics =
+        filter_events_by_metric_and_component(telemetry_events, metric_type, TEST_SOURCE_NAME);
 
-        acc
-    });
+    let actual_bytes = sum_counters(metric_type, &metrics)?;
 
     debug!(
         "{}: {} bytes, {} expected bytes.",
-        SourceMetrics::EventsReceivedBytes,
-        metric_bytes,
-        expected_bytes,
+        metric_type, actual_bytes, expected_bytes,
     );
 
-    if JsonSize::new(metric_bytes as usize) != expected_bytes {
+    if actual_bytes != expected_bytes {
         errs.push(format!(
             "{}: expected {} bytes, but received {}",
-            SourceMetrics::EventsReceivedBytes,
-            expected_bytes,
-            metric_bytes
+            metric_type, expected_bytes, actual_bytes
         ));
     }
 
@@ -193,209 +152,91 @@ fn validate_component_received_event_bytes_total(
         return Err(errs);
     }
 
-    Ok(vec![format!(
-        "{}: {}",
-        SourceMetrics::EventsReceivedBytes,
-        metric_bytes,
-    )])
+    Ok(vec![format!("{}: {}", metric_type, actual_bytes)])
 }
 
-fn validate_component_received_bytes_total(
-    configuration: &ValidationConfiguration,
-    inputs: &[TestEvent],
-    _outputs: &[Event],
+fn validate_component_received_events_total(
     telemetry_events: &[Event],
+    runner_metrics: &RunnerMetrics,
 ) -> Result<Vec<String>, Vec<String>> {
-    let mut errs: Vec<String> = Vec::new();
+    // The reciprocal metric for events received is events sent,
+    // so the expected value is what the input runner sent.
+    let expected_events = runner_metrics.sent_events_total;
 
-    let metrics = filter_events_by_metric_and_component(
+    validate_events_total(
         telemetry_events,
-        SourceMetrics::ReceivedBytesTotal,
-        TEST_SOURCE_NAME,
-    )?;
-
-    let mut metric_bytes: f64 = 0.0;
-    for m in metrics {
-        match m.value() {
-            vector_core::event::MetricValue::Counter { value } => {
-                if let MetricKind::Absolute = m.data().kind {
-                    metric_bytes = *value
-                } else {
-                    metric_bytes += value
-                }
-            }
-            _ => errs.push(format!(
-                "{}: metric value is not a counter",
-                SourceMetrics::ReceivedBytesTotal,
-            )),
-        }
-    }
+        &SourceMetricType::EventsReceived,
+        expected_events,
+    )
+}
 
-    let mut expected_bytes = 0;
-    if let Some(c) = &configuration.external_resource {
-        let mut encoder = c.codec.into_encoder();
-        for i in inputs {
-            let mut buffer = BytesMut::new();
-            encode_test_event(&mut encoder, &mut buffer, i.clone());
-            expected_bytes += buffer.len()
-        }
-    }
+fn validate_component_received_event_bytes_total(
+    telemetry_events: &[Event],
+    runner_metrics: &RunnerMetrics,
+) -> Result<Vec<String>, Vec<String>> {
+    // The reciprocal metric for received_event_bytes is sent_event_bytes,
+    // so the expected value is what the input runner sent.
+    let expected_bytes = runner_metrics.sent_event_bytes_total;
 
-    debug!(
-        "{}: {} bytes, expected at least {} bytes.",
-        SourceMetrics::ReceivedBytesTotal,
-        metric_bytes,
+    validate_bytes_total(
+        telemetry_events,
+        &SourceMetricType::EventsReceivedBytes,
         expected_bytes,
-    );
-
-    // We'll just establish a lower bound because we can't guarantee that the
-    // source will receive an exact number of bytes, since we can't synchronize
-    // with its internal logic. For example, some sources push or pull metrics
-    // on a schedule (http_client).
-    if metric_bytes < expected_bytes as f64 {
-        errs.push(format!(
-            "{}: expected at least {} bytes, but received {}",
-            SourceMetrics::ReceivedBytesTotal,
-            expected_bytes,
-            metric_bytes
-        ));
-    }
+    )
+}
 
-    if !errs.is_empty() {
-        return Err(errs);
-    }
+fn validate_component_received_bytes_total(
+    telemetry_events: &[Event],
+    runner_metrics: &RunnerMetrics,
+) -> Result<Vec<String>, Vec<String>> {
+    // The reciprocal metric for received_bytes is sent_bytes,
+    // so the expected value is what the input runner sent.
+    let expected_bytes = runner_metrics.sent_bytes_total;
 
-    Ok(vec![format!(
-        "{}: {}",
-        SourceMetrics::ReceivedBytesTotal,
-        metric_bytes,
-    )])
+    validate_bytes_total(
+        telemetry_events,
+        &SourceMetricType::ReceivedBytesTotal,
+        expected_bytes,
+    )
 }
 
 fn validate_component_sent_events_total(
-    _configuration: &ValidationConfiguration,
-    inputs: &[TestEvent],
-    _outputs: &[Event],
     telemetry_events: &[Event],
+    runner_metrics: &RunnerMetrics,
 ) -> Result<Vec<String>, Vec<String>> {
-    let mut errs: Vec<String> = Vec::new();
+    // The reciprocal metric for events sent is events received,
+    // so the expected value is what the output runner received.
+    let expected_events = runner_metrics.received_events_total;
 
-    let metrics = filter_events_by_metric_and_component(
+    validate_events_total(
         telemetry_events,
-        SourceMetrics::SentEventsTotal,
-        TEST_SOURCE_NAME,
-    )?;
-
-    let mut events = 0;
-    for m in metrics {
-        match m.value() {
-            vector_core::event::MetricValue::Counter { value } => {
-                if let MetricKind::Absolute = m.data().kind {
-                    events = *value as i32
-                } else {
-                    events += *value as i32
-                }
-            }
-            _ => errs.push(format!(
-                "{}: metric value is not a counter",
-                SourceMetrics::SentEventsTotal,
-            )),
-        }
-    }
-
-    let expected_events = inputs.iter().fold(0, |acc, i| {
-        if let TestEvent::Passthrough(_) = i {
-            return acc + 1;
-        }
-        acc
-    });
-
-    debug!(
-        "{}: {} events, {} expected events.",
-        SourceMetrics::SentEventsTotal,
-        events,
+        &SourceMetricType::SentEventsTotal,
         expected_events,
-    );
-
-    if events != expected_events {
-        errs.push(format!(
-            "{}: expected {} events, but received {}",
-            SourceMetrics::SentEventsTotal,
-            inputs.len(),
-            events
-        ));
-    }
-
-    if !errs.is_empty() {
-        return Err(errs);
-    }
-
-    Ok(vec![format!(
-        "{}: {}",
-        SourceMetrics::SentEventsTotal,
-        events,
-    )])
+    )
 }
 
 fn validate_component_sent_event_bytes_total(
-    _configuration: &ValidationConfiguration,
-    _inputs: &[TestEvent],
-    outputs: &[Event],
     telemetry_events: &[Event],
+    runner_metrics: &RunnerMetrics,
 ) -> Result<Vec<String>, Vec<String>> {
-    let mut errs: Vec<String> = Vec::new();
+    // The reciprocal metric for sent_event_bytes is received_event_bytes,
+    // so the expected value is what the output runner received.
+    let expected_bytes = runner_metrics.received_event_bytes_total;
 
-    let metrics = filter_events_by_metric_and_component(
+    validate_bytes_total(
         telemetry_events,
-        SourceMetrics::SentEventBytesTotal,
-        TEST_SOURCE_NAME,
-    )?;
-
-    let mut metric_bytes: f64 = 0.0;
-    for m in metrics {
-        match m.value() {
-            vector_core::event::MetricValue::Counter { value } => {
-                if let MetricKind::Absolute = m.data().kind {
-                    metric_bytes = *value
-                } else {
-                    metric_bytes += value
-                }
-            }
-            _ => errs.push(format!(
-                "{}: metric value is not a counter",
-                SourceMetrics::SentEventBytesTotal,
-            )),
-        }
-    }
-
-    let mut expected_bytes = JsonSize::zero();
-    for e in outputs {
-        expected_bytes += vec![e].estimated_json_encoded_size_of();
-    }
-
-    debug!(
-        "{}: {} bytes, {} expected bytes.",
-        SourceMetrics::SentEventBytesTotal,
-        metric_bytes,
+        &SourceMetricType::SentEventBytesTotal,
         expected_bytes,
-    );
-
-    if JsonSize::new(metric_bytes as usize) != expected_bytes {
-        errs.push(format!(
-            "{}: expected {} bytes, but received {}.",
-            SourceMetrics::SentEventBytesTotal,
-            expected_bytes,
-            metric_bytes
-        ));
-    }
-
-    if !errs.is_empty() {
-        return Err(errs);
-    }
+    )
+}
 
-    Ok(vec![format!(
-        "{}: {}",
-        SourceMetrics::SentEventBytesTotal,
-        metric_bytes,
-    )])
+fn validate_component_errors_total(
+    telemetry_events: &[Event],
+    runner_metrics: &RunnerMetrics,
+) -> Result<Vec<String>, Vec<String>> {
+    validate_events_total(
+        telemetry_events,
+        &SourceMetricType::ErrorsTotal,
+        runner_metrics.errors_total,
+    )
 }
diff --git a/src/components/validation/validators/mod.rs b/src/components/validation/validators/mod.rs
index 8cb4c8945b16b..e563488d7f416 100644
--- a/src/components/validation/validators/mod.rs
+++ b/src/components/validation/validators/mod.rs
@@ -1,9 +1,10 @@
 mod component_spec;
+
 pub use self::component_spec::ComponentSpecValidator;
 
 use vector_core::event::Event;
 
-use super::{ComponentType, TestCaseExpectation, TestEvent, ValidationConfiguration};
+use super::{ComponentType, RunnerMetrics, TestCaseExpectation, TestEvent};
 
 /// A component validator.
 ///
@@ -19,12 +20,12 @@ pub trait Validator {
     /// provided as well.
     fn check_validation(
         &self,
-        configuration: ValidationConfiguration,
         component_type: ComponentType,
         expectation: TestCaseExpectation,
         inputs: &[TestEvent],
         outputs: &[Event],
         telemetry_events: &[Event],
+        runner_metrics: &RunnerMetrics,
     ) -> Result<Vec<String>, Vec<String>>;
 }
 
diff --git a/src/conditions/datadog_search.rs b/src/conditions/datadog_search.rs
index 2a0a4f4bc1734..dc57ebab4775b 100644
--- a/src/conditions/datadog_search.rs
+++ b/src/conditions/datadog_search.rs
@@ -47,7 +47,7 @@ impl ConditionalConfig for DatadogSearchConfig {
         _mezmo_ctx: Option<MezmoContext>,
     ) -> crate::Result<Condition> {
         let node = parse(&self.source)?;
-        let matcher = as_log(build_matcher(&node, &EventFilter::default()));
+        let matcher = as_log(build_matcher(&node, &EventFilter));
 
         Ok(Condition::DatadogSearch(DatadogSearchRunner { matcher }))
     }
@@ -82,7 +82,12 @@ impl Filter<LogEvent> for EventFilter {
                 any_string_match("tags", move |value| value == field)
             }
             Field::Default(f) | Field::Facet(f) | Field::Reserved(f) => {
-                Run::boxed(move |log: &LogEvent| log.get(f.as_str()).is_some())
+                Run::boxed(move |log: &LogEvent| {
+                    log.parse_path_and_get_value(f.as_str())
+                        .ok()
+                        .flatten()
+                        .is_some()
+                })
             }
         }
     }
@@ -172,8 +177,11 @@ impl Filter<LogEvent> for EventFilter {
         match field {
             // Facets are compared numerically if the value is numeric, or as strings otherwise.
             Field::Facet(f) => {
-                Run::boxed(
-                    move |log: &LogEvent| match (log.get(f.as_str()), &comparison_value) {
+                Run::boxed(move |log: &LogEvent| {
+                    match (
+                        log.parse_path_and_get_value(f.as_str()).ok().flatten(),
+                        &comparison_value,
+                    ) {
                         // Integers.
                         (Some(Value::Integer(lhs)), ComparisonValue::Integer(rhs)) => {
                             match comparator {
@@ -234,8 +242,8 @@ impl Filter<LogEvent> for EventFilter {
                             }
                         }
                         _ => false,
-                    },
-                )
+                    }
+                })
             }
             // Tag values need extracting by "key:value" to be compared.
             Field::Tag(tag) => any_string_match("tags", move |value| match value.split_once(':') {
@@ -273,9 +281,11 @@ where
 {
     let field = field.into();
 
-    Run::boxed(move |log: &LogEvent| match log.get(field.as_str()) {
-        Some(Value::Bytes(v)) => func(String::from_utf8_lossy(v)),
-        _ => false,
+    Run::boxed(move |log: &LogEvent| {
+        match log.parse_path_and_get_value(field.as_str()).ok().flatten() {
+            Some(Value::Bytes(v)) => func(String::from_utf8_lossy(v)),
+            _ => false,
+        }
     })
 }
 
@@ -288,9 +298,11 @@ where
 {
     let field = field.into();
 
-    Run::boxed(move |log: &LogEvent| match log.get(field.as_str()) {
-        Some(Value::Array(values)) => func(values),
-        _ => false,
+    Run::boxed(move |log: &LogEvent| {
+        match log.parse_path_and_get_value(field.as_str()).ok().flatten() {
+            Some(Value::Array(values)) => func(values),
+            _ => false,
+        }
     })
 }
 
@@ -1046,7 +1058,7 @@ mod test {
     #[test]
     /// Parse each Datadog Search Syntax query and check that it passes/fails.
     fn event_filter() {
-        test_filter(EventFilter::default(), |ev| ev.into_log())
+        test_filter(EventFilter, |ev| ev.into_log())
     }
 
     #[test]
diff --git a/src/conditions/vrl.rs b/src/conditions/vrl.rs
index 5230058b68260..2d78d869e0a74 100644
--- a/src/conditions/vrl.rs
+++ b/src/conditions/vrl.rs
@@ -72,6 +72,10 @@ impl ConditionalConfig for VrlConfig {
                 .to_string()
         })?;
 
+        if !program.final_type_info().result.is_boolean() {
+            return Err("VRL conditions must return a boolean.".into());
+        }
+
         if !warnings.is_empty() {
             let warnings = Formatter::new(&self.source, warnings).colored().to_string();
             warn!(message = "VRL compilation warning.", %warnings);
@@ -118,7 +122,7 @@ impl Conditional for Vrl {
         let result = result
             .map(|value| match value {
                 Value::Boolean(boolean) => boolean,
-                _ => false,
+                _ => panic!("VRL condition did not return a boolean type"),
             })
             .unwrap_or_else(|err| {
                 emit!(VrlConditionExecutionError {
@@ -242,6 +246,12 @@ mod test {
                 Ok(()),
                 Ok(()),
             ),
+            (
+                log_event![],
+                r#""i_return_a_string""#,
+                Err("VRL conditions must return a boolean.".into()),
+                Ok(()),
+            ),
         ];
 
         for (event, source, build, check) in checks {
diff --git a/src/config/api.rs b/src/config/api.rs
index 7024b08ee8586..0429f6be3662c 100644
--- a/src/config/api.rs
+++ b/src/config/api.rs
@@ -1,5 +1,6 @@
 use std::net::{Ipv4Addr, SocketAddr};
 
+use url::Url;
 use vector_config::configurable_component;
 
 /// API options.
@@ -41,6 +42,13 @@ pub fn default_address() -> Option<SocketAddr> {
     Some(SocketAddr::new(Ipv4Addr::new(127, 0, 0, 1).into(), 8686))
 }
 
+/// Default GraphQL API address
+pub fn default_graphql_url() -> Url {
+    let addr = default_address().unwrap();
+    Url::parse(&format!("http://{}/graphql", addr))
+        .expect("Couldn't parse default API URL. Please report this.")
+}
+
 const fn default_playground() -> bool {
     true
 }
diff --git a/src/config/mod.rs b/src/config/mod.rs
index 8e1ea09b350c4..0ab55d609b306 100644
--- a/src/config/mod.rs
+++ b/src/config/mod.rs
@@ -843,10 +843,13 @@ mod tests {
         )
         .unwrap();
 
-        assert_eq!("host", config.global.log_schema.host_key().to_string());
+        assert_eq!(
+            "host",
+            config.global.log_schema.host_key().unwrap().to_string()
+        );
         assert_eq!(
             "message",
-            config.global.log_schema.message_key().to_string()
+            config.global.log_schema.message_key().unwrap().to_string()
         );
         assert_eq!(
             "timestamp",
@@ -879,8 +882,14 @@ mod tests {
         )
         .unwrap();
 
-        assert_eq!("this", config.global.log_schema.host_key().to_string());
-        assert_eq!("that", config.global.log_schema.message_key().to_string());
+        assert_eq!(
+            "this",
+            config.global.log_schema.host_key().unwrap().to_string()
+        );
+        assert_eq!(
+            "that",
+            config.global.log_schema.message_key().unwrap().to_string()
+        );
         assert_eq!(
             "then",
             config
diff --git a/src/config/unit_test/mod.rs b/src/config/unit_test/mod.rs
index e11a3536afc53..2de3ebc682a50 100644
--- a/src/config/unit_test/mod.rs
+++ b/src/config/unit_test/mod.rs
@@ -572,7 +572,9 @@ fn build_input_event(input: &TestInput) -> Result<Event, String> {
                             NotNan::new(*f).map_err(|_| "NaN value not supported".to_string())?,
                         ),
                     };
-                    event.insert(path.as_str(), value);
+                    event
+                        .parse_path_and_insert(path, value)
+                        .map_err(|e| e.to_string())?;
                 }
                 Ok(event.into())
             } else {
diff --git a/src/config/watcher.rs b/src/config/watcher.rs
index 6628fd151b5d1..09c8083ae96f4 100644
--- a/src/config/watcher.rs
+++ b/src/config/watcher.rs
@@ -51,7 +51,7 @@ pub fn spawn_thread<'a>(
                     debug!(message = "Configuration file change detected.", event = ?event);
 
                     // Consume events until delay amount of time has passed since the latest event.
-                    while let Ok(..) = receiver.recv_timeout(delay) {}
+                    while receiver.recv_timeout(delay).is_ok() {}
 
                     debug!(message = "Consumed file change events for delay.", delay = ?delay);
 
diff --git a/src/internal_events/nats.rs b/src/internal_events/nats.rs
index 94e06da098108..c68c756a3a377 100644
--- a/src/internal_events/nats.rs
+++ b/src/internal_events/nats.rs
@@ -1,5 +1,3 @@
-use std::io::Error;
-
 use crate::emit;
 use metrics::counter;
 use vector_common::internal_event::{
@@ -7,11 +5,9 @@ use vector_common::internal_event::{
 };
 use vector_core::internal_event::InternalEvent;
 
-use super::prelude::io_error_code;
-
 #[derive(Debug)]
 pub struct NatsEventSendError {
-    pub error: Error,
+    pub error: async_nats::Error,
 }
 
 impl InternalEvent for NatsEventSendError {
@@ -21,14 +17,12 @@ impl InternalEvent for NatsEventSendError {
             message = reason,
             error = %self.error,
             error_type = error_type::WRITER_FAILED,
-            error_code = io_error_code(&self.error),
             stage = error_stage::SENDING,
             internal_log_rate_limit = true,
         );
         counter!(
             "component_errors_total", 1,
             "error_type" => error_type::WRITER_FAILED,
-            "error_code" => io_error_code(&self.error),
             "stage" => error_stage::SENDING,
         );
         emit!(ComponentEventsDropped::<UNINTENTIONAL> { count: 1, reason });
diff --git a/src/lib.rs b/src/lib.rs
index a9d0a1d828dfc..bee15fd024941 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -110,12 +110,12 @@ pub mod sources;
 pub mod stats;
 #[cfg(feature = "api-client")]
 #[allow(unreachable_pub)]
-mod tap;
+pub mod tap;
 pub mod template;
 pub mod test_util;
 #[cfg(feature = "api-client")]
 #[allow(unreachable_pub)]
-pub(crate) mod top;
+pub mod top;
 #[allow(unreachable_pub)]
 pub mod topology;
 pub mod trace;
diff --git a/src/mezmo/mod.rs b/src/mezmo/mod.rs
index 0459a50e943e4..159f428e55f33 100644
--- a/src/mezmo/mod.rs
+++ b/src/mezmo/mod.rs
@@ -159,7 +159,7 @@ impl TryFrom<String> for MezmoContext {
 /// This function moves whatever is in the LogEvent's `message` property into
 /// the root of a new LogEvent message.
 pub fn reshape_log_event_by_message(log: &mut LogEvent) {
-    let message_key = log_schema().message_key();
+    let message_key = log_schema().message_key_target_path().unwrap();
     if log.get(message_key).is_some() {
         log.rename_key(message_key, ".");
     }
@@ -246,7 +246,7 @@ mod tests {
 
     #[test]
     fn reshaping_logevent_works_even_if_message_is_not_an_object() {
-        let message_key = log_schema().message_key();
+        let message_key = log_schema().message_key().unwrap().to_string();
         let mut event = LogEvent::from(btreemap! {
             message_key => "this is not an object event"
         });
@@ -276,7 +276,8 @@ mod tests {
     #[test]
     fn reshaping_successful_reshape_message() {
         let mut event = LogEvent::default();
-        let message_key = log_schema().message_key();
+        let message_key = log_schema().message_key().unwrap().to_string();
+        let message_key_path = log_schema().message_key_target_path().unwrap();
 
         event.insert(format!("{}.one", message_key).as_str(), 1);
         event.insert(format!("{}.two", message_key).as_str(), 2);
@@ -293,13 +294,17 @@ mod tests {
         });
 
         assert_eq!(event, expected, "message payload was reshaped");
-        assert_eq!(event.get(message_key), None, "message property is now gone");
+        assert_eq!(
+            event.get(message_key_path),
+            None,
+            "message property is now gone"
+        );
     }
 
     #[test]
     fn reshaping_successful_and_trashes_other_root_level_properties() {
         let mut event = LogEvent::default();
-        let message_key = log_schema().message_key();
+        let message_key = log_schema().message_key().unwrap().to_string();
 
         event.insert("trash1", "nope");
         event.insert("trash2", true);
diff --git a/src/mezmo/vrl/user_log.rs b/src/mezmo/vrl/user_log.rs
index 73de7c9caac60..f477c1c4b5bdd 100644
--- a/src/mezmo/vrl/user_log.rs
+++ b/src/mezmo/vrl/user_log.rs
@@ -50,7 +50,7 @@ impl Function for UserLog {
 
     fn compile(
         &self,
-        _state: &TypeState,
+        state: &TypeState,
         ctx: &mut FunctionCompileContext,
         arguments: ArgumentList,
     ) -> Compiled {
@@ -58,7 +58,7 @@ impl Function for UserLog {
         let value = arguments.required("value");
         let valid_levels = vec!["debug".into(), "info".into(), "warn".into(), "error".into()];
         let level = arguments
-            .optional_enum("level", &valid_levels)?
+            .optional_enum("level", &valid_levels, state)?
             .unwrap_or_else(|| "info".into())
             .try_bytes()
             .expect("log level not bytes");
diff --git a/src/nats.rs b/src/nats.rs
index 5bad2c9182bd0..5d20516d49939 100644
--- a/src/nats.rs
+++ b/src/nats.rs
@@ -13,6 +13,8 @@ pub enum NatsConfigError {
     TlsMissingKey,
     #[snafu(display("NATS TLS Config Error: missing cert"))]
     TlsMissingCert,
+    #[snafu(display("NATS Credentials file error"))]
+    CredentialsFileError { source: std::io::Error },
 }
 
 /// Configuration of the authentication strategy when interacting with NATS.
@@ -115,30 +117,27 @@ pub(crate) struct NatsAuthNKey {
 }
 
 impl NatsAuthConfig {
-    pub(crate) fn to_nats_options(&self) -> Result<nats::asynk::Options, NatsConfigError> {
+    pub(crate) fn to_nats_options(&self) -> Result<async_nats::ConnectOptions, NatsConfigError> {
         match self {
             NatsAuthConfig::UserPassword { user_password } => {
-                Ok(nats::asynk::Options::with_user_pass(
-                    user_password.user.as_str(),
-                    user_password.password.inner(),
+                Ok(async_nats::ConnectOptions::with_user_and_password(
+                    user_password.user.clone(),
+                    user_password.password.inner().to_string(),
                 ))
             }
-            NatsAuthConfig::CredentialsFile { credentials_file } => Ok(
-                nats::asynk::Options::with_credentials(&credentials_file.path),
-            ),
-            NatsAuthConfig::Nkey { nkey } => nkeys::KeyPair::from_seed(&nkey.seed)
-                .context(AuthConfigSnafu)
-                .map(|kp| {
-                    // The following unwrap is safe because the only way the sign method can fail is if
-                    // keypair does not contain a seed. We are constructing the keypair from a seed in
-                    // the preceding line.
-                    nats::asynk::Options::with_nkey(&nkey.nkey, move |nonce| {
-                        kp.sign(nonce).unwrap()
-                    })
-                }),
-            NatsAuthConfig::Token { token } => {
-                Ok(nats::asynk::Options::with_token(token.value.inner()))
+            NatsAuthConfig::CredentialsFile { credentials_file } => {
+                async_nats::ConnectOptions::with_credentials(
+                    &std::fs::read_to_string(credentials_file.path.clone())
+                        .context(CredentialsFileSnafu)?,
+                )
+                .context(CredentialsFileSnafu)
             }
+            NatsAuthConfig::Nkey { nkey } => {
+                Ok(async_nats::ConnectOptions::with_nkey(nkey.seed.clone()))
+            }
+            NatsAuthConfig::Token { token } => Ok(async_nats::ConnectOptions::with_token(
+                token.value.inner().to_string(),
+            )),
         }
     }
 }
@@ -147,35 +146,33 @@ pub(crate) fn from_tls_auth_config(
     connection_name: &str,
     auth_config: &Option<NatsAuthConfig>,
     tls_config: &Option<TlsEnableableConfig>,
-) -> Result<nats::asynk::Options, NatsConfigError> {
+) -> Result<async_nats::ConnectOptions, NatsConfigError> {
     let nats_options = match &auth_config {
-        None => nats::asynk::Options::new(),
+        None => async_nats::ConnectOptions::new(),
         Some(auth) => auth.to_nats_options()?,
     };
 
-    let nats_options = nats_options
-        .with_name(connection_name)
-        // Set reconnect_buffer_size on the nats client to 0 bytes so that the
-        // client doesn't buffer internally (to avoid message loss).
-        .reconnect_buffer_size(0);
+    let nats_options = nats_options.name(connection_name);
 
     match tls_config {
         None => Ok(nats_options),
         Some(tls_config) => {
             let tls_enabled = tls_config.enabled.unwrap_or(false);
-            let nats_options = nats_options.tls_required(tls_enabled);
+            let nats_options = nats_options.require_tls(tls_enabled);
             if !tls_enabled {
                 return Ok(nats_options);
             }
 
             let nats_options = match &tls_config.options.ca_file {
                 None => nats_options,
-                Some(ca_file) => nats_options.add_root_certificate(ca_file),
+                Some(ca_file) => nats_options.add_root_certificates(ca_file.clone()),
             };
 
             let nats_options = match (&tls_config.options.crt_file, &tls_config.options.key_file) {
                 (None, None) => nats_options,
-                (Some(crt_file), Some(key_file)) => nats_options.client_cert(crt_file, key_file),
+                (Some(crt_file), Some(key_file)) => {
+                    nats_options.add_client_certificate(crt_file.clone(), key_file.clone())
+                }
                 (Some(_crt_file), None) => return Err(NatsConfigError::TlsMissingKey),
                 (None, Some(_key_file)) => return Err(NatsConfigError::TlsMissingCert),
             };
@@ -188,7 +185,7 @@ pub(crate) fn from_tls_auth_config(
 mod tests {
     use super::*;
 
-    fn parse_auth(s: &str) -> Result<nats::asynk::Options, crate::Error> {
+    fn parse_auth(s: &str) -> Result<async_nats::ConnectOptions, crate::Error> {
         toml::from_str(s)
             .map_err(Into::into)
             .and_then(|config: NatsAuthConfig| config.to_nats_options().map_err(Into::into))
@@ -266,7 +263,7 @@ mod tests {
         parse_auth(
             r#"
             strategy = "credentials_file"
-            credentials_file.path = "/path/to/nowhere"
+            credentials_file.path = "tests/data/nats/nats.creds"
         "#,
         )
         .unwrap();
diff --git a/src/secrets/exec.rs b/src/secrets/exec.rs
index 9095ddc6efa90..d983f0583a53a 100644
--- a/src/secrets/exec.rs
+++ b/src/secrets/exec.rs
@@ -134,7 +134,7 @@ async fn query_backend(
     loop {
         tokio::select! {
             biased;
-            Ok(signal::SignalTo::Shutdown | signal::SignalTo::Quit) = signal_rx.recv() => {
+            Ok(signal::SignalTo::Shutdown(_) | signal::SignalTo::Quit) = signal_rx.recv() => {
                 drop(command);
                 return Err("Secret retrieval was interrupted.".into());
             }
diff --git a/src/signal.rs b/src/signal.rs
index cb8666325f361..91a1e3515f798 100644
--- a/src/signal.rs
+++ b/src/signal.rs
@@ -1,9 +1,10 @@
 #![allow(missing_docs)]
 
+use snafu::Snafu;
 use tokio::{runtime::Runtime, sync::broadcast};
 use tokio_stream::{Stream, StreamExt};
 
-use super::config::ConfigBuilder;
+use super::config::{ComponentKey, ConfigBuilder};
 
 pub type ShutdownTx = broadcast::Sender<()>;
 pub type SignalTx = broadcast::Sender<SignalTo>;
@@ -18,11 +19,27 @@ pub enum SignalTo {
     /// Signal to reload config from the filesystem.
     ReloadFromDisk,
     /// Signal to shutdown process.
-    Shutdown,
+    Shutdown(Option<ShutdownError>),
     /// Shutdown process immediately.
     Quit,
 }
 
+#[derive(Clone, Debug, Snafu)]
+pub enum ShutdownError {
+    // For future work: It would be nice if we could keep the actual errors in here, but
+    // `crate::Error` doesn't implement `Clone`, and adding `DynClone` for errors is tricky.
+    #[snafu(display("The API failed to start: {error}"))]
+    ApiFailed { error: String },
+    #[snafu(display("Reload failed, and then failed to restore the previous config"))]
+    ReloadFailedToRestore,
+    #[snafu(display(r#"The task for source "{key}" died during execution: {error}"#))]
+    SourceAborted { key: ComponentKey, error: String },
+    #[snafu(display(r#"The task for transform "{key}" died during execution: {error}"#))]
+    TransformAborted { key: ComponentKey, error: String },
+    #[snafu(display(r#"The task for sink "{key}" died during execution: {error}"#))]
+    SinkAborted { key: ComponentKey, error: String },
+}
+
 /// Convenience struct for app setup handling.
 pub struct SignalPair {
     pub handler: SignalHandler,
@@ -153,11 +170,11 @@ fn os_signals(runtime: &Runtime) -> impl Stream<Item = SignalTo> {
                 let signal = tokio::select! {
                     _ = sigint.recv() => {
                         info!(message = "Signal received.", signal = "SIGINT");
-                        SignalTo::Shutdown
+                        SignalTo::Shutdown(None)
                     },
                     _ = sigterm.recv() => {
                         info!(message = "Signal received.", signal = "SIGTERM");
-                        SignalTo::Shutdown
+                        SignalTo::Shutdown(None)
                     } ,
                     _ = sigquit.recv() => {
                         info!(message = "Signal received.", signal = "SIGQUIT");
@@ -181,7 +198,7 @@ fn os_signals(_: &Runtime) -> impl Stream<Item = SignalTo> {
 
     async_stream::stream! {
         loop {
-            let signal = tokio::signal::ctrl_c().map(|_| SignalTo::Shutdown).await;
+            let signal = tokio::signal::ctrl_c().map(|_| SignalTo::Shutdown(None)).await;
             yield signal;
         }
     }
diff --git a/src/sinks/amqp/encoder.rs b/src/sinks/amqp/encoder.rs
index d3d449811372f..a1af7ec54e77b 100644
--- a/src/sinks/amqp/encoder.rs
+++ b/src/sinks/amqp/encoder.rs
@@ -3,6 +3,7 @@ use crate::sinks::prelude::*;
 use bytes::BytesMut;
 use std::io;
 use tokio_util::codec::Encoder as _;
+use vector_core::config::telemetry;
 
 #[derive(Clone, Debug)]
 pub(super) struct AmqpEncoder {
@@ -11,9 +12,17 @@ pub(super) struct AmqpEncoder {
 }
 
 impl encoding::Encoder<Event> for AmqpEncoder {
-    fn encode_input(&self, mut input: Event, writer: &mut dyn io::Write) -> io::Result<usize> {
+    fn encode_input(
+        &self,
+        mut input: Event,
+        writer: &mut dyn io::Write,
+    ) -> io::Result<(usize, GroupedCountByteSize)> {
         let mut body = BytesMut::new();
         self.transformer.transform(&mut input);
+
+        let mut byte_size = telemetry().create_request_count_byte_size();
+        byte_size.add_event(&input, input.estimated_json_encoded_size_of());
+
         let mut encoder = self.encoder.clone();
         encoder
             .encode(input, &mut body)
@@ -22,6 +31,6 @@ impl encoding::Encoder<Event> for AmqpEncoder {
         let body = body.freeze();
         write_all(writer, 1, body.as_ref())?;
 
-        Ok(body.len())
+        Ok((body.len(), byte_size))
     }
 }
diff --git a/src/sinks/aws_cloudwatch_logs/integration_tests.rs b/src/sinks/aws_cloudwatch_logs/integration_tests.rs
index c0dbf0204260a..872a470216ba8 100644
--- a/src/sinks/aws_cloudwatch_logs/integration_tests.rs
+++ b/src/sinks/aws_cloudwatch_logs/integration_tests.rs
@@ -188,10 +188,7 @@ async fn cloudwatch_insert_out_of_range_timestamp() {
         let line = input_lines.next().unwrap();
         let mut event = LogEvent::from(line.clone());
         event.insert(
-            (
-                lookup::PathPrefix::Event,
-                log_schema().timestamp_key().unwrap(),
-            ),
+            log_schema().timestamp_key_target_path().unwrap(),
             now + offset,
         );
         events.push(Event::Log(event));
diff --git a/src/sinks/aws_cloudwatch_logs/request_builder.rs b/src/sinks/aws_cloudwatch_logs/request_builder.rs
index edbf4a752233c..177a9ccc5a5e8 100644
--- a/src/sinks/aws_cloudwatch_logs/request_builder.rs
+++ b/src/sinks/aws_cloudwatch_logs/request_builder.rs
@@ -154,13 +154,7 @@ mod tests {
         let timestamp = Utc::now();
         let message = "event message";
         let mut event = LogEvent::from(message);
-        event.insert(
-            (
-                lookup::PathPrefix::Event,
-                log_schema().timestamp_key().unwrap(),
-            ),
-            timestamp,
-        );
+        event.insert(log_schema().timestamp_key_target_path().unwrap(), timestamp);
 
         let request = request_builder.build(event.into()).unwrap();
         assert_eq!(request.timestamp, timestamp.timestamp_millis());
diff --git a/src/sinks/azure_blob/integration_tests.rs b/src/sinks/azure_blob/integration_tests.rs
index f33e38b97cb06..3a832c8d3ff29 100644
--- a/src/sinks/azure_blob/integration_tests.rs
+++ b/src/sinks/azure_blob/integration_tests.rs
@@ -120,7 +120,11 @@ async fn azure_blob_insert_json_into_blob() {
     assert_eq!(blobs.len(), 1);
     assert!(blobs[0].clone().ends_with(".log"));
     let (blob, blob_lines) = config.get_blob(blobs[0].clone()).await;
-    assert_eq!(blob.properties.content_type, String::from("text/plain"));
+    assert_eq!(blob.properties.content_encoding, None);
+    assert_eq!(
+        blob.properties.content_type,
+        String::from("application/x-ndjson")
+    );
     let expected = events
         .iter()
         .map(|event| serde_json::to_string(&event.as_log().all_fields().unwrap()).unwrap())
@@ -147,10 +151,8 @@ async fn azure_blob_insert_lines_into_blob_gzip() {
     assert_eq!(blobs.len(), 1);
     assert!(blobs[0].clone().ends_with(".log.gz"));
     let (blob, blob_lines) = config.get_blob(blobs[0].clone()).await;
-    assert_eq!(
-        blob.properties.content_type,
-        String::from("application/gzip")
-    );
+    assert_eq!(blob.properties.content_encoding, Some(String::from("gzip")));
+    assert_eq!(blob.properties.content_type, String::from("text/plain"));
     assert_eq!(lines, blob_lines);
 }
 
@@ -179,9 +181,10 @@ async fn azure_blob_insert_json_into_blob_gzip() {
     assert_eq!(blobs.len(), 1);
     assert!(blobs[0].clone().ends_with(".log.gz"));
     let (blob, blob_lines) = config.get_blob(blobs[0].clone()).await;
+    assert_eq!(blob.properties.content_encoding, Some(String::from("gzip")));
     assert_eq!(
         blob.properties.content_type,
-        String::from("application/gzip")
+        String::from("application/x-ndjson")
     );
     let expected = events
         .iter()
diff --git a/src/sinks/azure_blob/request_builder.rs b/src/sinks/azure_blob/request_builder.rs
index ae8f8770381a5..0ae3fb848d922 100644
--- a/src/sinks/azure_blob/request_builder.rs
+++ b/src/sinks/azure_blob/request_builder.rs
@@ -93,20 +93,9 @@ impl RequestBuilder<(String, Vec<Event>)> for AzureBlobRequestOptions {
         AzureBlobRequest {
             blob_data,
             content_encoding: self.compression.content_encoding(),
-            content_type: self.compression.content_type(),
+            content_type: self.encoder.1.content_type(),
             metadata: azure_metadata,
             request_metadata,
         }
     }
 }
-
-impl Compression {
-    pub const fn content_type(self) -> &'static str {
-        match self {
-            Self::None => "text/plain",
-            Self::Gzip(_) => "application/gzip",
-            Self::Zlib(_) => "application/zlib",
-            Self::Zstd(_) => "application/zstd",
-        }
-    }
-}
diff --git a/src/sinks/azure_blob/test.rs b/src/sinks/azure_blob/test.rs
index ec69cf9074888..d2e12b2f8b507 100644
--- a/src/sinks/azure_blob/test.rs
+++ b/src/sinks/azure_blob/test.rs
@@ -4,7 +4,8 @@ use codecs::{
     encoding::{Framer, FramingConfig},
     NewlineDelimitedEncoder, TextSerializerConfig,
 };
-use vector_core::partition::Partitioner;
+use vector_common::request_metadata::GroupedCountByteSize;
+use vector_core::{partition::Partitioner, EstimatedJsonEncodedSizeOf};
 
 use super::config::AzureBlobSinkConfig;
 use super::request_builder::AzureBlobRequestOptions;
@@ -69,10 +70,13 @@ fn azure_blob_build_request_without_compression() {
         compression,
     };
 
+    let mut byte_size = GroupedCountByteSize::new_untagged();
+    byte_size.add_event(&log, log.estimated_json_encoded_size_of());
+
     let (metadata, request_metadata_builder, _events) =
         request_options.split_input((key, vec![log]));
 
-    let payload = EncodeResult::uncompressed(Bytes::new());
+    let payload = EncodeResult::uncompressed(Bytes::new(), byte_size);
     let request_metadata = request_metadata_builder.build(&payload);
     let request = request_options.build_request(metadata, request_metadata, payload);
 
@@ -113,16 +117,20 @@ fn azure_blob_build_request_with_compression() {
         ),
         compression,
     };
+
+    let mut byte_size = GroupedCountByteSize::new_untagged();
+    byte_size.add_event(&log, log.estimated_json_encoded_size_of());
+
     let (metadata, request_metadata_builder, _events) =
         request_options.split_input((key, vec![log]));
 
-    let payload = EncodeResult::uncompressed(Bytes::new());
+    let payload = EncodeResult::uncompressed(Bytes::new(), byte_size);
     let request_metadata = request_metadata_builder.build(&payload);
     let request = request_options.build_request(metadata, request_metadata, payload);
 
     assert_eq!(request.metadata.partition_key, "blob.log.gz".to_string());
     assert_eq!(request.content_encoding, Some("gzip"));
-    assert_eq!(request.content_type, "application/gzip");
+    assert_eq!(request.content_type, "text/plain");
 }
 
 #[test]
@@ -158,10 +166,13 @@ fn azure_blob_build_request_with_time_format() {
         compression,
     };
 
+    let mut byte_size = GroupedCountByteSize::new_untagged();
+    byte_size.add_event(&log, log.estimated_json_encoded_size_of());
+
     let (metadata, request_metadata_builder, _events) =
         request_options.split_input((key, vec![log]));
 
-    let payload = EncodeResult::uncompressed(Bytes::new());
+    let payload = EncodeResult::uncompressed(Bytes::new(), byte_size);
     let request_metadata = request_metadata_builder.build(&payload);
     let request = request_options.build_request(metadata, request_metadata, payload);
 
@@ -206,10 +217,13 @@ fn azure_blob_build_request_with_uuid() {
         compression,
     };
 
+    let mut byte_size = GroupedCountByteSize::new_untagged();
+    byte_size.add_event(&log, log.estimated_json_encoded_size_of());
+
     let (metadata, request_metadata_builder, _events) =
         request_options.split_input((key, vec![log]));
 
-    let payload = EncodeResult::uncompressed(Bytes::new());
+    let payload = EncodeResult::uncompressed(Bytes::new(), byte_size);
     let request_metadata = request_metadata_builder.build(&payload);
     let request = request_options.build_request(metadata, request_metadata, payload);
 
diff --git a/src/sinks/azure_monitor_logs.rs b/src/sinks/azure_monitor_logs.rs
deleted file mode 100644
index 59759defdb525..0000000000000
--- a/src/sinks/azure_monitor_logs.rs
+++ /dev/null
@@ -1,695 +0,0 @@
-use bytes::Bytes;
-use futures::{FutureExt, SinkExt};
-use http::{
-    header,
-    header::{HeaderMap, HeaderName, HeaderValue},
-    Request, StatusCode, Uri,
-};
-use hyper::Body;
-use lookup::lookup_v2::OptionalValuePath;
-use lookup::{OwnedValuePath, PathPrefix};
-use once_cell::sync::Lazy;
-use openssl::{base64, hash, pkey, sign};
-use regex::Regex;
-use serde::{Deserialize, Serialize};
-use serde_json::Value as JsonValue;
-use vector_common::sensitive_string::SensitiveString;
-use vector_config::configurable_component;
-use vector_core::schema;
-use vrl::value::Kind;
-
-use crate::{
-    codecs::Transformer,
-    config::{log_schema, AcknowledgementsConfig, Input, SinkConfig, SinkContext},
-    event::{Event, Value},
-    http::HttpClient,
-    sinks::{
-        util::{
-            http::{BatchedHttpSink, HttpEventEncoder, HttpSink},
-            BatchConfig, BoxedRawValue, JsonArrayBuffer, RealtimeSizeBasedDefaultBatchSettings,
-            TowerRequestConfig,
-        },
-        Healthcheck, VectorSink,
-    },
-    tls::{TlsConfig, TlsSettings},
-};
-
-fn default_host() -> String {
-    "ods.opinsights.azure.com".into()
-}
-
-/// Configuration for the `azure_monitor_logs` sink.
-#[configurable_component(sink(
-    "azure_monitor_logs",
-    "Publish log events to the Azure Monitor Logs service."
-))]
-#[derive(Clone, Debug)]
-#[serde(deny_unknown_fields)]
-pub struct AzureMonitorLogsConfig {
-    /// The [unique identifier][uniq_id] for the Log Analytics workspace.
-    ///
-    /// [uniq_id]: https://docs.microsoft.com/en-us/azure/azure-monitor/platform/data-collector-api#request-uri-parameters
-    #[configurable(metadata(docs::examples = "5ce893d9-2c32-4b6c-91a9-b0887c2de2d6"))]
-    #[configurable(metadata(docs::examples = "97ce69d9-b4be-4241-8dbd-d265edcf06c4"))]
-    pub customer_id: String,
-
-    /// The [primary or the secondary key][shared_key] for the Log Analytics workspace.
-    ///
-    /// [shared_key]: https://docs.microsoft.com/en-us/azure/azure-monitor/platform/data-collector-api#authorization
-    #[configurable(metadata(
-        docs::examples = "SERsIYhgMVlJB6uPsq49gCxNiruf6v0vhMYE+lfzbSGcXjdViZdV/e5pEMTYtw9f8SkVLf4LFlLCc2KxtRZfCA=="
-    ))]
-    #[configurable(metadata(docs::examples = "${AZURE_MONITOR_SHARED_KEY_ENV_VAR}"))]
-    pub shared_key: SensitiveString,
-
-    /// The [record type][record_type] of the data that is being submitted.
-    ///
-    /// Can only contain letters, numbers, and underscores (_), and may not exceed 100 characters.
-    ///
-    /// [record_type]: https://docs.microsoft.com/en-us/azure/azure-monitor/platform/data-collector-api#request-headers
-    #[configurable(validation(pattern = "[a-zA-Z0-9_]{1,100}"))]
-    #[configurable(metadata(docs::examples = "MyTableName"))]
-    #[configurable(metadata(docs::examples = "MyRecordType"))]
-    pub log_type: String,
-
-    /// The [Resource ID][resource_id] of the Azure resource the data should be associated with.
-    ///
-    /// [resource_id]: https://docs.microsoft.com/en-us/azure/azure-monitor/platform/data-collector-api#request-headers
-    #[configurable(metadata(
-        docs::examples = "/subscriptions/11111111-1111-1111-1111-111111111111/resourceGroups/otherResourceGroup/providers/Microsoft.Storage/storageAccounts/examplestorage"
-    ))]
-    #[configurable(metadata(
-        docs::examples = "/subscriptions/11111111-1111-1111-1111-111111111111/resourceGroups/examplegroup/providers/Microsoft.SQL/servers/serverName/databases/databaseName"
-    ))]
-    pub azure_resource_id: Option<String>,
-
-    /// [Alternative host][alt_host] for dedicated Azure regions.
-    ///
-    /// [alt_host]: https://docs.azure.cn/en-us/articles/guidance/developerdifferences#check-endpoints-in-azure
-    #[configurable(metadata(docs::examples = "ods.opinsights.azure.us"))]
-    #[configurable(metadata(docs::examples = "ods.opinsights.azure.cn"))]
-    #[serde(default = "default_host")]
-    pub(super) host: String,
-
-    #[configurable(derived)]
-    #[serde(
-        default,
-        skip_serializing_if = "crate::serde::skip_serializing_if_default"
-    )]
-    pub encoding: Transformer,
-
-    #[configurable(derived)]
-    #[serde(default)]
-    pub batch: BatchConfig<RealtimeSizeBasedDefaultBatchSettings>,
-
-    #[configurable(derived)]
-    #[serde(default)]
-    pub request: TowerRequestConfig,
-
-    /// Use this option to customize the log field used as [`TimeGenerated`][1] in Azure.
-    ///
-    /// The setting of `log_schema.timestamp_key`, usually `timestamp`, is used here by default.
-    /// This field should be used in rare cases where `TimeGenerated` should point to a specific log
-    /// field. For example, use this field to set the log field `source_timestamp` as holding the
-    /// value that should be used as `TimeGenerated` on the Azure side.
-    ///
-    /// [1]: https://learn.microsoft.com/en-us/azure/azure-monitor/logs/log-standard-columns#timegenerated
-    #[configurable(metadata(docs::examples = "time_generated"))]
-    pub time_generated_key: Option<OptionalValuePath>,
-
-    #[configurable(derived)]
-    pub tls: Option<TlsConfig>,
-
-    #[configurable(derived)]
-    #[serde(
-        default,
-        deserialize_with = "crate::serde::bool_or_struct",
-        skip_serializing_if = "crate::serde::skip_serializing_if_default"
-    )]
-    acknowledgements: AcknowledgementsConfig,
-}
-
-impl Default for AzureMonitorLogsConfig {
-    fn default() -> Self {
-        Self {
-            customer_id: "my-customer-id".to_string(),
-            shared_key: Default::default(),
-            log_type: "MyRecordType".to_string(),
-            azure_resource_id: None,
-            host: default_host(),
-            encoding: Default::default(),
-            batch: Default::default(),
-            request: Default::default(),
-            time_generated_key: None,
-            tls: None,
-            acknowledgements: Default::default(),
-        }
-    }
-}
-
-#[derive(Deserialize, Serialize, Debug, Eq, PartialEq, Clone, Derivative)]
-#[serde(rename_all = "snake_case")]
-#[derivative(Default)]
-pub enum Encoding {
-    #[derivative(Default)]
-    Default,
-}
-
-static LOG_TYPE_REGEX: Lazy<Regex> = Lazy::new(|| Regex::new(r"^\w+$").unwrap());
-static LOG_TYPE_HEADER: Lazy<HeaderName> = Lazy::new(|| HeaderName::from_static("log-type"));
-static X_MS_DATE_HEADER: Lazy<HeaderName> = Lazy::new(|| HeaderName::from_static(X_MS_DATE));
-static X_MS_AZURE_RESOURCE_HEADER: Lazy<HeaderName> =
-    Lazy::new(|| HeaderName::from_static("x-ms-azureresourceid"));
-static TIME_GENERATED_FIELD_HEADER: Lazy<HeaderName> =
-    Lazy::new(|| HeaderName::from_static("time-generated-field"));
-static CONTENT_TYPE_VALUE: Lazy<HeaderValue> = Lazy::new(|| HeaderValue::from_static(CONTENT_TYPE));
-
-impl_generate_config_from_default!(AzureMonitorLogsConfig);
-
-/// Max number of bytes in request body
-const MAX_BATCH_SIZE: usize = 30 * 1024 * 1024;
-/// API endpoint for submitting logs
-const RESOURCE: &str = "/api/logs";
-/// JSON content type of logs
-const CONTENT_TYPE: &str = "application/json";
-/// Custom header used for signing logs
-const X_MS_DATE: &str = "x-ms-date";
-/// Shared key prefix
-const SHARED_KEY: &str = "SharedKey";
-/// API version
-const API_VERSION: &str = "2016-04-01";
-
-#[async_trait::async_trait]
-#[typetag::serde(name = "azure_monitor_logs")]
-impl SinkConfig for AzureMonitorLogsConfig {
-    async fn build(&self, cx: SinkContext) -> crate::Result<(VectorSink, Healthcheck)> {
-        let batch_settings = self
-            .batch
-            .validate()?
-            .limit_max_bytes(MAX_BATCH_SIZE)?
-            .into_batch_settings()?;
-
-        let time_generated_key = self.time_generated_key.clone().and_then(|k| k.path);
-
-        let tls_settings = TlsSettings::from_options(&self.tls)?;
-        let client = HttpClient::new(Some(tls_settings), &cx.proxy)?;
-
-        let sink = AzureMonitorLogsSink::new(self, time_generated_key)?;
-        let request_settings = self.request.unwrap_with(&TowerRequestConfig::default());
-
-        let healthcheck = healthcheck(sink.clone(), client.clone()).boxed();
-
-        let sink = BatchedHttpSink::new(
-            sink,
-            JsonArrayBuffer::new(batch_settings.size),
-            request_settings,
-            batch_settings.timeout,
-            client,
-            cx,
-        )
-        .sink_map_err(|error| error!(message = "Fatal azure_monitor_logs sink error.", %error));
-
-        #[allow(deprecated)]
-        Ok((VectorSink::from_event_sink(sink), healthcheck))
-    }
-
-    fn input(&self) -> Input {
-        let requirements =
-            schema::Requirement::empty().optional_meaning("timestamp", Kind::timestamp());
-
-        Input::log().with_schema_requirement(requirements)
-    }
-
-    fn acknowledgements(&self) -> &AcknowledgementsConfig {
-        &self.acknowledgements
-    }
-}
-
-#[derive(Clone)]
-struct AzureMonitorLogsSink {
-    uri: Uri,
-    customer_id: String,
-    time_generated_key: Option<OwnedValuePath>,
-    transformer: Transformer,
-    shared_key: pkey::PKey<pkey::Private>,
-    default_headers: HeaderMap,
-}
-
-struct AzureMonitorLogsEventEncoder {
-    transformer: Transformer,
-    time_generated_key: Option<OwnedValuePath>,
-}
-
-impl HttpEventEncoder<serde_json::Value> for AzureMonitorLogsEventEncoder {
-    fn encode_event(&mut self, mut event: Event) -> Option<serde_json::Value> {
-        self.transformer.transform(&mut event);
-
-        // it seems like Azure Monitor doesn't support full 9-digit nanosecond precision
-        // adjust the timestamp format accordingly, keeping only milliseconds
-        let mut log = event.into_log();
-
-        // `.remove_timestamp()` will return the `timestamp` value regardless of location in Event or
-        // Metadata, the following `insert()` ensures it's encoded in the request.
-        let timestamp = if let Some(Value::Timestamp(ts)) = log.remove_timestamp() {
-            ts
-        } else {
-            chrono::Utc::now()
-        };
-
-        if let Some(timestamp_key) = &self.time_generated_key {
-            log.insert(
-                (PathPrefix::Event, timestamp_key),
-                JsonValue::String(timestamp.to_rfc3339_opts(chrono::SecondsFormat::Millis, true)),
-            );
-        }
-
-        let entry = serde_json::json!(&log);
-
-        Some(entry)
-    }
-}
-
-#[async_trait::async_trait]
-impl HttpSink for AzureMonitorLogsSink {
-    type Input = serde_json::Value;
-    type Output = Vec<BoxedRawValue>;
-    type Encoder = AzureMonitorLogsEventEncoder;
-
-    fn build_encoder(&self) -> Self::Encoder {
-        AzureMonitorLogsEventEncoder {
-            transformer: self.transformer.clone(),
-            time_generated_key: self.time_generated_key.clone(),
-        }
-    }
-
-    async fn build_request(&self, events: Self::Output) -> crate::Result<Request<Bytes>> {
-        self.build_request_sync(events)
-    }
-}
-
-impl AzureMonitorLogsSink {
-    fn new(
-        config: &AzureMonitorLogsConfig,
-        time_generated_key: Option<OwnedValuePath>,
-    ) -> crate::Result<AzureMonitorLogsSink> {
-        let url = format!(
-            "https://{}.{}{}?api-version={}",
-            config.customer_id, config.host, RESOURCE, API_VERSION
-        );
-        let uri: Uri = url.parse()?;
-
-        if config.shared_key.inner().is_empty() {
-            return Err("shared_key can't be an empty string".into());
-        }
-
-        let time_generated_key =
-            time_generated_key.or_else(|| log_schema().timestamp_key().cloned());
-
-        let shared_key_bytes = base64::decode_block(config.shared_key.inner())?;
-        let shared_key = pkey::PKey::hmac(&shared_key_bytes)?;
-        let mut default_headers = HeaderMap::with_capacity(3);
-
-        if config.log_type.len() > 100 || !LOG_TYPE_REGEX.is_match(&config.log_type) {
-            return Err(format!(
-                "invalid log_type \"{}\": log type can only contain letters, numbers, and underscore (_), and may not exceed 100 characters",
-                config.log_type
-            ).into());
-        }
-
-        let log_type = HeaderValue::from_str(&config.log_type)?;
-        default_headers.insert(LOG_TYPE_HEADER.clone(), log_type);
-
-        if let Some(timestamp_key) = &time_generated_key {
-            default_headers.insert(
-                TIME_GENERATED_FIELD_HEADER.clone(),
-                HeaderValue::try_from(timestamp_key.to_string())?,
-            );
-        }
-
-        if let Some(azure_resource_id) = &config.azure_resource_id {
-            if azure_resource_id.is_empty() {
-                return Err("azure_resource_id can't be an empty string".into());
-            }
-
-            default_headers.insert(
-                X_MS_AZURE_RESOURCE_HEADER.clone(),
-                HeaderValue::from_str(azure_resource_id)?,
-            );
-        }
-
-        default_headers.insert(header::CONTENT_TYPE, CONTENT_TYPE_VALUE.clone());
-
-        Ok(AzureMonitorLogsSink {
-            uri,
-            transformer: config.encoding.clone(),
-            customer_id: config.customer_id.clone(),
-            shared_key,
-            default_headers,
-            time_generated_key,
-        })
-    }
-
-    fn build_request_sync(&self, events: Vec<BoxedRawValue>) -> crate::Result<Request<Bytes>> {
-        let body = crate::serde::json::to_bytes(&events)?.freeze();
-        let len = body.len();
-
-        let mut request = Request::post(self.uri.clone()).body(body)?;
-        let rfc1123date = chrono::Utc::now()
-            .format("%a, %d %b %Y %H:%M:%S GMT")
-            .to_string();
-
-        let authorization = self.build_authorization_header_value(&rfc1123date, len)?;
-
-        *request.headers_mut() = self.default_headers.clone();
-        request
-            .headers_mut()
-            .insert(header::AUTHORIZATION, authorization.parse()?);
-        request
-            .headers_mut()
-            .insert(X_MS_DATE_HEADER.clone(), rfc1123date.parse()?);
-
-        Ok(request)
-    }
-
-    fn build_authorization_header_value(
-        &self,
-        rfc1123date: &str,
-        len: usize,
-    ) -> crate::Result<String> {
-        let string_to_hash = format!(
-            "POST\n{}\n{}\n{}:{}\n{}",
-            len, CONTENT_TYPE, X_MS_DATE, rfc1123date, RESOURCE
-        );
-        let mut signer = sign::Signer::new(hash::MessageDigest::sha256(), &self.shared_key)?;
-        signer.update(string_to_hash.as_bytes())?;
-
-        let signature = signer.sign_to_vec()?;
-        let signature_base64 = base64::encode_block(&signature);
-
-        Ok(format!(
-            "{} {}:{}",
-            SHARED_KEY, self.customer_id, signature_base64
-        ))
-    }
-}
-
-async fn healthcheck(sink: AzureMonitorLogsSink, client: HttpClient) -> crate::Result<()> {
-    let request = sink.build_request(vec![]).await?.map(Body::from);
-
-    let res = client.send(request).await?;
-
-    if res.status().is_server_error() {
-        return Err("Server returned a server error".into());
-    }
-
-    if res.status() == StatusCode::FORBIDDEN {
-        return Err("The service failed to authenticate the request. Verify that the workspace ID and connection key are valid".into());
-    }
-
-    if res.status() == StatusCode::NOT_FOUND {
-        return Err("Either the URL provided is incorrect, or the request is too large".into());
-    }
-
-    if res.status() == StatusCode::BAD_REQUEST {
-        return Err("The workspace has been closed or the request was invalid".into());
-    }
-
-    Ok(())
-}
-
-#[cfg(test)]
-mod tests {
-    use std::time::Duration;
-
-    use futures::{future::ready, stream};
-    use serde_json::value::RawValue;
-
-    use super::*;
-    use crate::{
-        event::LogEvent,
-        sinks::util::BatchSize,
-        test_util::{
-            components::{run_and_assert_sink_compliance, SINK_TAGS},
-            http::{always_200_response, spawn_blackhole_http_server},
-        },
-    };
-
-    #[test]
-    fn generate_config() {
-        crate::test_util::test_generate_config::<AzureMonitorLogsConfig>();
-    }
-
-    #[tokio::test]
-    async fn component_spec_compliance() {
-        let mock_endpoint = spawn_blackhole_http_server(always_200_response).await;
-
-        // This is just a dummy shared key.
-        let shared_key_bytes = base64::decode_block(
-            "ZnNkO2Zhc2RrbGZqYXNkaixmaG5tZXF3dWlsamtmYXNjZmouYXNkbmZrbHFhc2ZtYXNrbA==",
-        )
-        .expect("should not fail to decode base64");
-        let shared_key =
-            pkey::PKey::hmac(&shared_key_bytes).expect("should not fail to create HMAC key");
-
-        let sink = AzureMonitorLogsSink {
-            uri: mock_endpoint,
-            customer_id: "weee".to_string(),
-            time_generated_key: log_schema().timestamp_key().cloned(),
-            transformer: Default::default(),
-            shared_key,
-            default_headers: HeaderMap::new(),
-        };
-
-        let context = SinkContext::default();
-        let client =
-            HttpClient::new(None, &context.proxy).expect("should not fail to create HTTP client");
-
-        let request_settings =
-            TowerRequestConfig::default().unwrap_with(&TowerRequestConfig::default());
-
-        let sink = BatchedHttpSink::new(
-            sink,
-            JsonArrayBuffer::new(BatchSize::const_default()),
-            request_settings,
-            Duration::from_secs(1),
-            client,
-            SinkContext::new_test(),
-        )
-        .sink_map_err(|error| error!(message = "Fatal azure_monitor_logs sink error.", %error));
-
-        let event = Event::Log(LogEvent::from("simple message"));
-        #[allow(deprecated)]
-        run_and_assert_sink_compliance(
-            VectorSink::from_event_sink(sink),
-            stream::once(ready(event)),
-            &SINK_TAGS,
-        )
-        .await;
-    }
-
-    fn insert_timestamp_kv(log: &mut LogEvent) -> (String, String) {
-        let now = chrono::Utc::now();
-
-        let timestamp_key = log_schema().timestamp_key().unwrap();
-        let timestamp_value = now.to_rfc3339_opts(chrono::SecondsFormat::Millis, true);
-        log.insert((PathPrefix::Event, timestamp_key), now);
-
-        (timestamp_key.to_string(), timestamp_value)
-    }
-
-    #[test]
-    fn encode_valid() {
-        let config: AzureMonitorLogsConfig = toml::from_str(
-            r#"
-            # random GUID and random 64 Base-64 encoded bytes
-            customer_id = "97ce69d9-b4be-4241-8dbd-d265edcf06c4"
-            shared_key = "SERsIYhgMVlJB6uPsq49gCxNiruf6v0vhMYE+lfzbSGcXjdViZdV/e5pEMTYtw9f8SkVLf4LFlLCc2KxtRZfCA=="
-            log_type = "Vector"
-        "#,
-        )
-        .unwrap();
-
-        let sink = AzureMonitorLogsSink::new(&config, None).unwrap();
-        let mut log = [("message", "hello world")]
-            .iter()
-            .copied()
-            .collect::<LogEvent>();
-        let (timestamp_key, timestamp_value) = insert_timestamp_kv(&mut log);
-
-        let event = Event::from(log);
-        let mut encoder = sink.build_encoder();
-        let json = encoder.encode_event(event).unwrap();
-        let expected_json = serde_json::json!({
-            timestamp_key: timestamp_value,
-            "message": "hello world"
-        });
-        assert_eq!(json, expected_json);
-    }
-
-    #[test]
-    fn correct_request() {
-        let config: AzureMonitorLogsConfig = toml::from_str(
-            r#"
-            # random GUID and random 64 Base-64 encoded bytes
-            customer_id = "97ce69d9-b4be-4241-8dbd-d265edcf06c4"
-            shared_key = "SERsIYhgMVlJB6uPsq49gCxNiruf6v0vhMYE+lfzbSGcXjdViZdV/e5pEMTYtw9f8SkVLf4LFlLCc2KxtRZfCA=="
-            log_type = "Vector"
-            azure_resource_id = "97ce69d9-b4be-4241-8dbd-d265edcf06c4"
-        "#,
-        )
-        .unwrap();
-
-        let sink = AzureMonitorLogsSink::new(&config, None).unwrap();
-        let mut encoder = sink.build_encoder();
-
-        let mut log1 = [("message", "hello")].iter().copied().collect::<LogEvent>();
-        let (timestamp_key1, timestamp_value1) = insert_timestamp_kv(&mut log1);
-
-        let mut log2 = [("message", "world")].iter().copied().collect::<LogEvent>();
-        let (timestamp_key2, timestamp_value2) = insert_timestamp_kv(&mut log2);
-
-        let event1 = encoder.encode_event(Event::from(log1)).unwrap();
-        let event2 = encoder.encode_event(Event::from(log2)).unwrap();
-
-        let json1 = serde_json::to_string(&event1).unwrap();
-        let json2 = serde_json::to_string(&event2).unwrap();
-        let raw1 = RawValue::from_string(json1).unwrap();
-        let raw2 = RawValue::from_string(json2).unwrap();
-
-        let events = vec![raw1, raw2];
-
-        let request = sink.build_request_sync(events);
-
-        let (parts, body) = request.unwrap().into_parts();
-        assert_eq!(&parts.method.to_string(), "POST");
-
-        let json: serde_json::Value = serde_json::from_slice(&body[..]).unwrap();
-        let expected_json = serde_json::json!([
-            {
-                timestamp_key1: timestamp_value1,
-                "message": "hello"
-            },
-            {
-                timestamp_key2: timestamp_value2,
-                "message": "world"
-            }
-        ]);
-        assert_eq!(json, expected_json);
-
-        let headers = parts.headers;
-        let rfc1123date = headers.get("x-ms-date").unwrap();
-
-        let auth_expected = sink
-            .build_authorization_header_value(rfc1123date.to_str().unwrap(), body.len())
-            .unwrap();
-
-        let authorization = headers.get("authorization").unwrap();
-        assert_eq!(authorization.to_str().unwrap(), &auth_expected);
-
-        let log_type = headers.get("log-type").unwrap();
-        assert_eq!(log_type.to_str().unwrap(), "Vector");
-
-        let time_generated_field = headers.get("time-generated-field").unwrap();
-        let timestamp_key = log_schema().timestamp_key();
-        assert_eq!(
-            time_generated_field.to_str().unwrap(),
-            timestamp_key.unwrap().to_string().as_str()
-        );
-
-        let azure_resource_id = headers.get("x-ms-azureresourceid").unwrap();
-        assert_eq!(
-            azure_resource_id.to_str().unwrap(),
-            "97ce69d9-b4be-4241-8dbd-d265edcf06c4"
-        );
-
-        assert_eq!(
-            &parts.uri.to_string(),
-            "https://97ce69d9-b4be-4241-8dbd-d265edcf06c4.ods.opinsights.azure.com/api/logs?api-version=2016-04-01"
-        );
-    }
-
-    #[tokio::test]
-    async fn fails_missing_creds() {
-        let config: AzureMonitorLogsConfig = toml::from_str(
-            r#"
-            customer_id = "97ce69d9-b4be-4241-8dbd-d265edcf06c4"
-            shared_key = ""
-            log_type = "Vector"
-            azure_resource_id = "97ce69d9-b4be-4241-8dbd-d265edcf06c4"
-        "#,
-        )
-        .unwrap();
-        if config.build(SinkContext::default()).await.is_ok() {
-            panic!("config.build failed to error");
-        }
-    }
-
-    #[test]
-    fn correct_host() {
-        let config_default = toml::from_str::<AzureMonitorLogsConfig>(
-            r#"
-            customer_id = "97ce69d9-b4be-4241-8dbd-d265edcf06c4"
-            shared_key = "SERsIYhgMVlJB6uPsq49gCxNiruf6v0vhMYE+lfzbSGcXjdViZdV/e5pEMTYtw9f8SkVLf4LFlLCc2KxtRZfCA=="
-            log_type = "Vector"
-        "#,
-        )
-        .expect("Config parsing failed without custom host");
-        assert_eq!(config_default.host, default_host());
-
-        let config_cn = toml::from_str::<AzureMonitorLogsConfig>(
-            r#"
-            customer_id = "97ce69d9-b4be-4241-8dbd-d265edcf06c4"
-            shared_key = "SERsIYhgMVlJB6uPsq49gCxNiruf6v0vhMYE+lfzbSGcXjdViZdV/e5pEMTYtw9f8SkVLf4LFlLCc2KxtRZfCA=="
-            log_type = "Vector"
-            host = "ods.opinsights.azure.cn"
-        "#,
-        )
-        .expect("Config parsing failed with .cn custom host");
-        assert_eq!(config_cn.host, "ods.opinsights.azure.cn");
-    }
-
-    #[tokio::test]
-    async fn fails_invalid_base64() {
-        let config: AzureMonitorLogsConfig = toml::from_str(
-            r#"
-            customer_id = "97ce69d9-b4be-4241-8dbd-d265edcf06c4"
-            shared_key = "1Qs77Vz40+iDMBBTRmROKJwnEX"
-            log_type = "Vector"
-            azure_resource_id = "97ce69d9-b4be-4241-8dbd-d265edcf06c4"
-        "#,
-        )
-        .unwrap();
-        if config.build(SinkContext::default()).await.is_ok() {
-            panic!("config.build failed to error");
-        }
-    }
-
-    #[test]
-    fn fails_config_missing_fields() {
-        toml::from_str::<AzureMonitorLogsConfig>(
-            r#"
-            customer_id = "97ce69d9-b4be-4241-8dbd-d265edcf06c4"
-            shared_key = "SERsIYhgMVlJB6uPsq49gCxNiruf6v0vhMYE+lfzbSGcXjdViZdV/e5pEMTYtw9f8SkVLf4LFlLCc2KxtRZfCA=="
-            azure_resource_id = "97ce69d9-b4be-4241-8dbd-d265edcf06c4"
-        "#,
-        )
-        .expect_err("Config parsing failed to error with missing log_type");
-
-        toml::from_str::<AzureMonitorLogsConfig>(
-            r#"
-            customer_id = "97ce69d9-b4be-4241-8dbd-d265edcf06c4"
-            log_type = "Vector"
-            azure_resource_id = "97ce69d9-b4be-4241-8dbd-d265edcf06c4"
-        "#,
-        )
-        .expect_err("Config parsing failed to error with missing shared_key");
-
-        toml::from_str::<AzureMonitorLogsConfig>(
-            r#"
-            shared_key = "SERsIYhgMVlJB6uPsq49gCxNiruf6v0vhMYE+lfzbSGcXjdViZdV/e5pEMTYtw9f8SkVLf4LFlLCc2KxtRZfCA=="
-            log_type = "Vector"
-        "#,
-        )
-        .expect_err("Config parsing failed to error with missing customer_id");
-    }
-}
diff --git a/src/sinks/azure_monitor_logs/config.rs b/src/sinks/azure_monitor_logs/config.rs
new file mode 100644
index 0000000000000..7a48b88c7b82b
--- /dev/null
+++ b/src/sinks/azure_monitor_logs/config.rs
@@ -0,0 +1,225 @@
+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 vrl::value::Kind;
+
+use crate::{
+    http::{get_http_scheme_from_uri, HttpClient},
+    sinks::{
+        prelude::*,
+        util::{http::HttpStatusRetryLogic, RealtimeSizeBasedDefaultBatchSettings, UriSerde},
+    },
+};
+
+use super::{
+    service::{AzureMonitorLogsResponse, AzureMonitorLogsService},
+    sink::AzureMonitorLogsSink,
+};
+
+/// Max number of bytes in request body
+const MAX_BATCH_SIZE: usize = 30 * 1024 * 1024;
+
+pub(super) fn default_host() -> String {
+    "ods.opinsights.azure.com".into()
+}
+
+/// Configuration for the `azure_monitor_logs` sink.
+#[configurable_component(sink(
+    "azure_monitor_logs",
+    "Publish log events to the Azure Monitor Logs service."
+))]
+#[derive(Clone, Debug)]
+#[serde(deny_unknown_fields)]
+pub struct AzureMonitorLogsConfig {
+    /// The [unique identifier][uniq_id] for the Log Analytics workspace.
+    ///
+    /// [uniq_id]: https://docs.microsoft.com/en-us/azure/azure-monitor/platform/data-collector-api#request-uri-parameters
+    #[configurable(metadata(docs::examples = "5ce893d9-2c32-4b6c-91a9-b0887c2de2d6"))]
+    #[configurable(metadata(docs::examples = "97ce69d9-b4be-4241-8dbd-d265edcf06c4"))]
+    pub customer_id: String,
+
+    /// The [primary or the secondary key][shared_key] for the Log Analytics workspace.
+    ///
+    /// [shared_key]: https://docs.microsoft.com/en-us/azure/azure-monitor/platform/data-collector-api#authorization
+    #[configurable(metadata(
+        docs::examples = "SERsIYhgMVlJB6uPsq49gCxNiruf6v0vhMYE+lfzbSGcXjdViZdV/e5pEMTYtw9f8SkVLf4LFlLCc2KxtRZfCA=="
+    ))]
+    #[configurable(metadata(docs::examples = "${AZURE_MONITOR_SHARED_KEY_ENV_VAR}"))]
+    pub shared_key: SensitiveString,
+
+    /// The [record type][record_type] of the data that is being submitted.
+    ///
+    /// Can only contain letters, numbers, and underscores (_), and may not exceed 100 characters.
+    ///
+    /// [record_type]: https://docs.microsoft.com/en-us/azure/azure-monitor/platform/data-collector-api#request-headers
+    #[configurable(validation(pattern = "[a-zA-Z0-9_]{1,100}"))]
+    #[configurable(metadata(docs::examples = "MyTableName"))]
+    #[configurable(metadata(docs::examples = "MyRecordType"))]
+    pub log_type: String,
+
+    /// The [Resource ID][resource_id] of the Azure resource the data should be associated with.
+    ///
+    /// [resource_id]: https://docs.microsoft.com/en-us/azure/azure-monitor/platform/data-collector-api#request-headers
+    #[configurable(metadata(
+        docs::examples = "/subscriptions/11111111-1111-1111-1111-111111111111/resourceGroups/otherResourceGroup/providers/Microsoft.Storage/storageAccounts/examplestorage"
+    ))]
+    #[configurable(metadata(
+        docs::examples = "/subscriptions/11111111-1111-1111-1111-111111111111/resourceGroups/examplegroup/providers/Microsoft.SQL/servers/serverName/databases/databaseName"
+    ))]
+    pub azure_resource_id: Option<String>,
+
+    /// [Alternative host][alt_host] for dedicated Azure regions.
+    ///
+    /// [alt_host]: https://docs.azure.cn/en-us/articles/guidance/developerdifferences#check-endpoints-in-azure
+    #[configurable(metadata(docs::examples = "ods.opinsights.azure.us"))]
+    #[configurable(metadata(docs::examples = "ods.opinsights.azure.cn"))]
+    #[serde(default = "default_host")]
+    pub(super) host: String,
+
+    #[configurable(derived)]
+    #[serde(
+        default,
+        skip_serializing_if = "crate::serde::skip_serializing_if_default"
+    )]
+    pub encoding: Transformer,
+
+    #[configurable(derived)]
+    #[serde(default)]
+    pub batch: BatchConfig<RealtimeSizeBasedDefaultBatchSettings>,
+
+    #[configurable(derived)]
+    #[serde(default)]
+    pub request: TowerRequestConfig,
+
+    /// Use this option to customize the log field used as [`TimeGenerated`][1] in Azure.
+    ///
+    /// The setting of `log_schema.timestamp_key`, usually `timestamp`, is used here by default.
+    /// This field should be used in rare cases where `TimeGenerated` should point to a specific log
+    /// field. For example, use this field to set the log field `source_timestamp` as holding the
+    /// value that should be used as `TimeGenerated` on the Azure side.
+    ///
+    /// [1]: https://learn.microsoft.com/en-us/azure/azure-monitor/logs/log-standard-columns#timegenerated
+    #[configurable(metadata(docs::examples = "time_generated"))]
+    pub time_generated_key: Option<OptionalValuePath>,
+
+    #[configurable(derived)]
+    pub tls: Option<TlsConfig>,
+
+    #[configurable(derived)]
+    #[serde(
+        default,
+        deserialize_with = "crate::serde::bool_or_struct",
+        skip_serializing_if = "crate::serde::skip_serializing_if_default"
+    )]
+    pub acknowledgements: AcknowledgementsConfig,
+}
+
+impl Default for AzureMonitorLogsConfig {
+    fn default() -> Self {
+        Self {
+            customer_id: "my-customer-id".to_string(),
+            shared_key: Default::default(),
+            log_type: "MyRecordType".to_string(),
+            azure_resource_id: None,
+            host: default_host(),
+            encoding: Default::default(),
+            batch: Default::default(),
+            request: Default::default(),
+            time_generated_key: None,
+            tls: None,
+            acknowledgements: Default::default(),
+        }
+    }
+}
+
+impl AzureMonitorLogsConfig {
+    pub(super) fn build_shared_key(&self) -> crate::Result<pkey::PKey<pkey::Private>> {
+        if self.shared_key.inner().is_empty() {
+            return Err("shared_key cannot be an empty string".into());
+        }
+        let shared_key_bytes = base64::decode_block(self.shared_key.inner())?;
+        let shared_key = pkey::PKey::hmac(&shared_key_bytes)?;
+        Ok(shared_key)
+    }
+
+    fn get_time_generated_key(&self) -> Option<OwnedValuePath> {
+        self.time_generated_key
+            .clone()
+            .and_then(|k| k.path)
+            .or_else(|| log_schema().timestamp_key().cloned())
+    }
+
+    pub(super) async fn build_inner(
+        &self,
+        cx: SinkContext,
+        endpoint: UriSerde,
+    ) -> crate::Result<(VectorSink, Healthcheck)> {
+        let endpoint = endpoint.with_default_parts().uri;
+        let protocol = get_http_scheme_from_uri(&endpoint).to_string();
+
+        let batch_settings = self
+            .batch
+            .validate()?
+            .limit_max_bytes(MAX_BATCH_SIZE)?
+            .into_batcher_settings()?;
+
+        let shared_key = self.build_shared_key()?;
+        let time_generated_key = self.get_time_generated_key();
+
+        let tls_settings = TlsSettings::from_options(&self.tls)?;
+        let client = HttpClient::new(Some(tls_settings), &cx.proxy)?;
+
+        let service = AzureMonitorLogsService::new(
+            client,
+            endpoint,
+            self.customer_id.clone(),
+            self.azure_resource_id.as_deref(),
+            &self.log_type,
+            time_generated_key.clone(),
+            shared_key,
+        )?;
+        let healthcheck = service.healthcheck();
+
+        let retry_logic =
+            HttpStatusRetryLogic::new(|res: &AzureMonitorLogsResponse| res.http_status);
+        let request_settings = self.request.unwrap_with(&Default::default());
+        let service = ServiceBuilder::new()
+            .settings(request_settings, retry_logic)
+            .service(service);
+
+        let sink = AzureMonitorLogsSink::new(
+            batch_settings,
+            self.encoding.clone(),
+            service,
+            time_generated_key,
+            protocol,
+        );
+
+        Ok((VectorSink::from_event_streamsink(sink), healthcheck))
+    }
+}
+
+impl_generate_config_from_default!(AzureMonitorLogsConfig);
+
+#[async_trait::async_trait]
+#[typetag::serde(name = "azure_monitor_logs")]
+impl SinkConfig for AzureMonitorLogsConfig {
+    async fn build(&self, cx: SinkContext) -> crate::Result<(VectorSink, Healthcheck)> {
+        let endpoint = format!("https://{}.{}", self.customer_id, self.host).parse()?;
+        self.build_inner(cx, endpoint).await
+    }
+
+    fn input(&self) -> Input {
+        let requirements =
+            schema::Requirement::empty().optional_meaning("timestamp", Kind::timestamp());
+
+        Input::log().with_schema_requirement(requirements)
+    }
+
+    fn acknowledgements(&self) -> &AcknowledgementsConfig {
+        &self.acknowledgements
+    }
+}
diff --git a/src/sinks/azure_monitor_logs/mod.rs b/src/sinks/azure_monitor_logs/mod.rs
new file mode 100644
index 0000000000000..e025b912f9b13
--- /dev/null
+++ b/src/sinks/azure_monitor_logs/mod.rs
@@ -0,0 +1,13 @@
+//! The Azure Monitor Logs [`vector_core::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
+//! Monitor Logs service.
+
+mod config;
+mod service;
+mod sink;
+#[cfg(test)]
+mod tests;
+
+pub use config::AzureMonitorLogsConfig;
diff --git a/src/sinks/azure_monitor_logs/service.rs b/src/sinks/azure_monitor_logs/service.rs
new file mode 100644
index 0000000000000..285edd09e9902
--- /dev/null
+++ b/src/sinks/azure_monitor_logs/service.rs
@@ -0,0 +1,249 @@
+use bytes::Bytes;
+use http::{
+    header::{self, HeaderMap},
+    HeaderName, HeaderValue, Request, StatusCode, Uri,
+};
+use hyper::Body;
+use lookup::lookup_v2::OwnedValuePath;
+use once_cell::sync::Lazy;
+use openssl::{base64, hash, pkey, sign};
+use regex::Regex;
+use std::task::{Context, Poll};
+use tracing::Instrument;
+
+use crate::{http::HttpClient, sinks::prelude::*};
+
+static LOG_TYPE_REGEX: Lazy<Regex> = Lazy::new(|| Regex::new(r"^\w+$").unwrap());
+static LOG_TYPE_HEADER: Lazy<HeaderName> = Lazy::new(|| HeaderName::from_static("log-type"));
+static X_MS_DATE_HEADER: Lazy<HeaderName> = Lazy::new(|| HeaderName::from_static(X_MS_DATE));
+static X_MS_AZURE_RESOURCE_HEADER: Lazy<HeaderName> =
+    Lazy::new(|| HeaderName::from_static("x-ms-azureresourceid"));
+static TIME_GENERATED_FIELD_HEADER: Lazy<HeaderName> =
+    Lazy::new(|| HeaderName::from_static("time-generated-field"));
+static CONTENT_TYPE_VALUE: Lazy<HeaderValue> = Lazy::new(|| HeaderValue::from_static(CONTENT_TYPE));
+
+/// API endpoint for submitting logs
+const RESOURCE: &str = "/api/logs";
+/// JSON content type of logs
+const CONTENT_TYPE: &str = "application/json";
+/// Custom header used for signing logs
+const X_MS_DATE: &str = "x-ms-date";
+/// Shared key prefix
+const SHARED_KEY: &str = "SharedKey";
+/// API version
+const API_VERSION: &str = "2016-04-01";
+
+#[derive(Debug, Clone)]
+pub struct AzureMonitorLogsRequest {
+    pub body: Bytes,
+    pub finalizers: EventFinalizers,
+    pub metadata: RequestMetadata,
+}
+
+impl MetaDescriptive for AzureMonitorLogsRequest {
+    fn get_metadata(&self) -> &RequestMetadata {
+        &self.metadata
+    }
+
+    fn metadata_mut(&mut self) -> &mut RequestMetadata {
+        &mut self.metadata
+    }
+}
+
+impl Finalizable for AzureMonitorLogsRequest {
+    fn take_finalizers(&mut self) -> EventFinalizers {
+        self.finalizers.take_finalizers()
+    }
+}
+
+pub struct AzureMonitorLogsResponse {
+    pub http_status: StatusCode,
+    pub events_byte_size: GroupedCountByteSize,
+    pub raw_byte_size: usize,
+}
+
+impl DriverResponse for AzureMonitorLogsResponse {
+    fn event_status(&self) -> EventStatus {
+        match self.http_status.is_success() {
+            true => EventStatus::Delivered,
+            false => EventStatus::Rejected,
+        }
+    }
+
+    fn events_sent(&self) -> &GroupedCountByteSize {
+        &self.events_byte_size
+    }
+
+    fn bytes_sent(&self) -> Option<usize> {
+        Some(self.raw_byte_size)
+    }
+}
+
+/// `AzureMonitorLogsService` is a `Tower` service used to send logs to Azure.
+#[derive(Debug, Clone)]
+pub struct AzureMonitorLogsService {
+    client: HttpClient,
+    endpoint: Uri,
+    customer_id: String,
+    shared_key: pkey::PKey<pkey::Private>,
+    default_headers: HeaderMap,
+}
+
+impl AzureMonitorLogsService {
+    /// Creates a new `AzureMonitorLogsService`.
+    pub fn new(
+        client: HttpClient,
+        endpoint: Uri,
+        customer_id: String,
+        azure_resource_id: Option<&str>,
+        log_type: &str,
+        time_generated_key: Option<OwnedValuePath>,
+        shared_key: pkey::PKey<pkey::Private>,
+    ) -> crate::Result<Self> {
+        let mut parts = endpoint.into_parts();
+        parts.path_and_query = Some(
+            format!("{RESOURCE}?api-version={API_VERSION}")
+                .parse()
+                .expect("path and query should never fail to parse"),
+        );
+        let endpoint = Uri::from_parts(parts)?;
+
+        let default_headers = {
+            let mut headers = HeaderMap::new();
+
+            if log_type.len() > 100 || !LOG_TYPE_REGEX.is_match(log_type) {
+                return Err(format!(
+                "invalid log_type \"{}\": log type can only contain letters, numbers, and underscore (_), and may not exceed 100 characters",
+                log_type
+            ).into());
+            }
+            let log_type = HeaderValue::from_str(log_type)?;
+            headers.insert(LOG_TYPE_HEADER.clone(), log_type);
+
+            if let Some(timestamp_key) = time_generated_key {
+                headers.insert(
+                    TIME_GENERATED_FIELD_HEADER.clone(),
+                    HeaderValue::try_from(timestamp_key.to_string())?,
+                );
+            }
+
+            if let Some(azure_resource_id) = azure_resource_id {
+                if azure_resource_id.is_empty() {
+                    return Err("azure_resource_id can't be an empty string".into());
+                }
+                headers.insert(
+                    X_MS_AZURE_RESOURCE_HEADER.clone(),
+                    HeaderValue::from_str(azure_resource_id)?,
+                );
+            }
+
+            headers.insert(header::CONTENT_TYPE, CONTENT_TYPE_VALUE.clone());
+            headers
+        };
+
+        Ok(Self {
+            client,
+            endpoint,
+            customer_id,
+            shared_key,
+            default_headers,
+        })
+    }
+
+    fn build_authorization_header_value(
+        &self,
+        rfc1123date: &str,
+        len: usize,
+    ) -> crate::Result<String> {
+        let string_to_hash =
+            format!("POST\n{len}\n{CONTENT_TYPE}\n{X_MS_DATE}:{rfc1123date}\n{RESOURCE}");
+        let mut signer = sign::Signer::new(hash::MessageDigest::sha256(), &self.shared_key)?;
+        signer.update(string_to_hash.as_bytes())?;
+
+        let signature = signer.sign_to_vec()?;
+        let signature_base64 = base64::encode_block(&signature);
+
+        Ok(format!(
+            "{} {}:{}",
+            SHARED_KEY, self.customer_id, signature_base64
+        ))
+    }
+
+    fn build_request(&self, body: Bytes) -> crate::Result<Request<Body>> {
+        let len = body.len();
+
+        let mut request = Request::post(&self.endpoint).body(Body::from(body))?;
+
+        let rfc1123date = chrono::Utc::now()
+            .format("%a, %d %b %Y %H:%M:%S GMT")
+            .to_string();
+        let authorization = self.build_authorization_header_value(&rfc1123date, len)?;
+
+        *request.headers_mut() = self.default_headers.clone();
+        request
+            .headers_mut()
+            .insert(header::AUTHORIZATION, authorization.parse()?);
+        request
+            .headers_mut()
+            .insert(X_MS_DATE_HEADER.clone(), rfc1123date.parse()?);
+
+        Ok(request)
+    }
+
+    pub fn healthcheck(&self) -> Healthcheck {
+        let mut client = self.client.clone();
+        let request = self.build_request(Bytes::from("[]"));
+        Box::pin(async move {
+            let request = request?;
+            let res = client.call(request).in_current_span().await?;
+
+            if res.status().is_server_error() {
+                return Err("Server returned a server error".into());
+            }
+
+            if res.status() == StatusCode::FORBIDDEN {
+                return Err("The service failed to authenticate the request. Verify that the workspace ID and connection key are valid".into());
+            }
+
+            if res.status() == StatusCode::NOT_FOUND {
+                return Err(
+                    "Either the URL provided is incorrect, or the request is too large".into(),
+                );
+            }
+
+            if res.status() == StatusCode::BAD_REQUEST {
+                return Err("The workspace has been closed or the request was invalid".into());
+            }
+
+            Ok(())
+        })
+    }
+}
+
+impl Service<AzureMonitorLogsRequest> for AzureMonitorLogsService {
+    type Response = AzureMonitorLogsResponse;
+    type Error = crate::Error;
+    type Future = BoxFuture<'static, Result<Self::Response, Self::Error>>;
+
+    // Emission of Error internal event is handled upstream by the caller.
+    fn poll_ready(&mut self, _cx: &mut Context) -> Poll<Result<(), Self::Error>> {
+        Poll::Ready(Ok(()))
+    }
+
+    // Emission of Error internal event is handled upstream by the caller.
+    fn call(&mut self, request: AzureMonitorLogsRequest) -> Self::Future {
+        let mut client = self.client.clone();
+        let http_request = self.build_request(request.body);
+        Box::pin(async move {
+            let http_request = http_request?;
+            let response = client.call(http_request).in_current_span().await?;
+            Ok(AzureMonitorLogsResponse {
+                http_status: response.status(),
+                raw_byte_size: request.metadata.request_encoded_size(),
+                events_byte_size: request
+                    .metadata
+                    .into_events_estimated_json_encoded_byte_size(),
+            })
+        })
+    }
+}
diff --git a/src/sinks/azure_monitor_logs/sink.rs b/src/sinks/azure_monitor_logs/sink.rs
new file mode 100644
index 0000000000000..7b610cedebaa9
--- /dev/null
+++ b/src/sinks/azure_monitor_logs/sink.rs
@@ -0,0 +1,176 @@
+use std::{fmt::Debug, io};
+
+use bytes::Bytes;
+use codecs::{encoding::Framer, CharacterDelimitedEncoder, JsonSerializerConfig};
+use lookup::{OwnedValuePath, PathPrefix};
+
+use crate::sinks::prelude::*;
+
+use super::service::AzureMonitorLogsRequest;
+
+pub struct AzureMonitorLogsSink<S> {
+    batch_settings: BatcherSettings,
+    encoding: JsonEncoding,
+    service: S,
+    protocol: String,
+}
+
+impl<S> AzureMonitorLogsSink<S>
+where
+    S: Service<AzureMonitorLogsRequest> + Send + 'static,
+    S::Future: Send + 'static,
+    S::Response: DriverResponse + Send + 'static,
+    S::Error: Debug + Into<crate::Error> + Send,
+{
+    pub fn new(
+        batch_settings: BatcherSettings,
+        transformer: Transformer,
+        service: S,
+        time_generated_key: Option<OwnedValuePath>,
+        protocol: String,
+    ) -> Self {
+        Self {
+            batch_settings,
+            encoding: JsonEncoding::new(transformer, time_generated_key),
+            service,
+            protocol,
+        }
+    }
+
+    async fn run_inner(self: Box<Self>, input: BoxStream<'_, Event>) -> Result<(), ()> {
+        input
+            .batched(self.batch_settings.into_byte_size_config())
+            .request_builder(
+                None,
+                AzureMonitorLogsRequestBuilder {
+                    encoding: self.encoding,
+                },
+            )
+            .filter_map(|request| async {
+                match request {
+                    Err(error) => {
+                        emit!(SinkRequestBuildError { error });
+                        None
+                    }
+                    Ok(req) => Some(req),
+                }
+            })
+            .into_driver(self.service)
+            .protocol(self.protocol.clone())
+            .run()
+            .await
+    }
+}
+
+#[async_trait::async_trait]
+impl<S> StreamSink<Event> for AzureMonitorLogsSink<S>
+where
+    S: Service<AzureMonitorLogsRequest> + Send + 'static,
+    S::Future: Send + 'static,
+    S::Response: DriverResponse + Send + 'static,
+    S::Error: Debug + Into<crate::Error> + Send,
+{
+    async fn run(
+        self: Box<Self>,
+        input: futures_util::stream::BoxStream<'_, Event>,
+    ) -> Result<(), ()> {
+        self.run_inner(input).await
+    }
+}
+
+/// Customized encoding specific to the Azure Monitor Logs sink, as the API does not support full
+/// 9-digit nanosecond precision timestamps.
+#[derive(Clone, Debug)]
+pub(super) struct JsonEncoding {
+    time_generated_key: Option<OwnedValuePath>,
+    encoder: (Transformer, Encoder<Framer>),
+}
+
+impl JsonEncoding {
+    pub fn new(transformer: Transformer, time_generated_key: Option<OwnedValuePath>) -> Self {
+        Self {
+            time_generated_key,
+            encoder: (
+                transformer,
+                Encoder::<Framer>::new(
+                    CharacterDelimitedEncoder::new(b',').into(),
+                    JsonSerializerConfig::default().build().into(),
+                ),
+            ),
+        }
+    }
+}
+
+impl crate::sinks::util::encoding::Encoder<Vec<Event>> for JsonEncoding {
+    fn encode_input(
+        &self,
+        mut input: Vec<Event>,
+        writer: &mut dyn io::Write,
+    ) -> io::Result<(usize, GroupedCountByteSize)> {
+        for event in input.iter_mut() {
+            let log = event.as_mut_log();
+
+            // `.remove_timestamp()` will return the `timestamp` value regardless of location in Event or
+            // Metadata, the following `insert()` ensures it's encoded in the request.
+            let timestamp = if let Some(Value::Timestamp(ts)) = log.remove_timestamp() {
+                ts
+            } else {
+                chrono::Utc::now()
+            };
+
+            if let Some(timestamp_key) = &self.time_generated_key {
+                log.insert(
+                    (PathPrefix::Event, timestamp_key),
+                    serde_json::Value::String(
+                        timestamp.to_rfc3339_opts(chrono::SecondsFormat::Millis, true),
+                    ),
+                );
+            }
+        }
+
+        self.encoder.encode_input(input, writer)
+    }
+}
+
+struct AzureMonitorLogsRequestBuilder {
+    encoding: JsonEncoding,
+}
+
+impl RequestBuilder<Vec<Event>> for AzureMonitorLogsRequestBuilder {
+    type Metadata = EventFinalizers;
+    type Events = Vec<Event>;
+    type Encoder = JsonEncoding;
+    type Payload = Bytes;
+    type Request = AzureMonitorLogsRequest;
+    type Error = std::io::Error;
+
+    fn compression(&self) -> Compression {
+        Compression::None
+    }
+
+    fn encoder(&self) -> &Self::Encoder {
+        &self.encoding
+    }
+
+    fn split_input(
+        &self,
+        mut events: Vec<Event>,
+    ) -> (Self::Metadata, RequestMetadataBuilder, Self::Events) {
+        let finalizers = events.take_finalizers();
+        let builder = RequestMetadataBuilder::from_events(&events);
+        (finalizers, builder, events)
+    }
+
+    fn build_request(
+        &self,
+        finalizers: Self::Metadata,
+        request_metadata: RequestMetadata,
+        payload: EncodeResult<Self::Payload>,
+    ) -> Self::Request {
+        AzureMonitorLogsRequest {
+            body: payload.into_payload(),
+            finalizers,
+            metadata: request_metadata,
+        }
+    }
+}
diff --git a/src/sinks/azure_monitor_logs/tests.rs b/src/sinks/azure_monitor_logs/tests.rs
new file mode 100644
index 0000000000000..a28e84e47b3be
--- /dev/null
+++ b/src/sinks/azure_monitor_logs/tests.rs
@@ -0,0 +1,276 @@
+use std::time::Duration;
+
+use futures::{future::ready, stream};
+use http::Response;
+use hyper::body;
+use openssl::{base64, hash, pkey, sign};
+use tokio::time::timeout;
+use vector_core::config::log_schema;
+
+use super::{
+    config::{default_host, AzureMonitorLogsConfig},
+    sink::JsonEncoding,
+};
+use crate::{
+    event::LogEvent,
+    sinks::{prelude::*, util::encoding::Encoder},
+    test_util::{
+        components::{run_and_assert_sink_compliance, SINK_TAGS},
+        http::{always_200_response, spawn_blackhole_http_server},
+    },
+};
+
+#[test]
+fn generate_config() {
+    crate::test_util::test_generate_config::<AzureMonitorLogsConfig>();
+}
+
+#[tokio::test]
+async fn component_spec_compliance() {
+    let mock_endpoint = spawn_blackhole_http_server(always_200_response).await;
+
+    let config = AzureMonitorLogsConfig {
+        shared_key: "ZnNkO2Zhc2RrbGZqYXNkaixmaG5tZXF3dWlsamtmYXNjZmouYXNkbmZrbHFhc2ZtYXNrbA=="
+            .to_string()
+            .into(),
+        ..Default::default()
+    };
+
+    let context = SinkContext::default();
+    let (sink, _healthcheck) = config
+        .build_inner(context, mock_endpoint.into())
+        .await
+        .unwrap();
+
+    let event = Event::Log(LogEvent::from("simple message"));
+    run_and_assert_sink_compliance(sink, stream::once(ready(event)), &SINK_TAGS).await;
+}
+
+#[tokio::test]
+async fn fails_missing_creds() {
+    let config: AzureMonitorLogsConfig = toml::from_str(
+        r#"
+            customer_id = "97ce69d9-b4be-4241-8dbd-d265edcf06c4"
+            shared_key = ""
+            log_type = "Vector"
+            azure_resource_id = "97ce69d9-b4be-4241-8dbd-d265edcf06c4"
+        "#,
+    )
+    .unwrap();
+    if config.build(SinkContext::default()).await.is_ok() {
+        panic!("config.build failed to error");
+    }
+}
+
+#[test]
+fn correct_host() {
+    let config_default = toml::from_str::<AzureMonitorLogsConfig>(
+            r#"
+            customer_id = "97ce69d9-b4be-4241-8dbd-d265edcf06c4"
+            shared_key = "SERsIYhgMVlJB6uPsq49gCxNiruf6v0vhMYE+lfzbSGcXjdViZdV/e5pEMTYtw9f8SkVLf4LFlLCc2KxtRZfCA=="
+            log_type = "Vector"
+        "#,
+        )
+        .expect("Config parsing failed without custom host");
+    assert_eq!(config_default.host, default_host());
+
+    let config_cn = toml::from_str::<AzureMonitorLogsConfig>(
+            r#"
+            customer_id = "97ce69d9-b4be-4241-8dbd-d265edcf06c4"
+            shared_key = "SERsIYhgMVlJB6uPsq49gCxNiruf6v0vhMYE+lfzbSGcXjdViZdV/e5pEMTYtw9f8SkVLf4LFlLCc2KxtRZfCA=="
+            log_type = "Vector"
+            host = "ods.opinsights.azure.cn"
+        "#,
+        )
+        .expect("Config parsing failed with .cn custom host");
+    assert_eq!(config_cn.host, "ods.opinsights.azure.cn");
+}
+
+#[tokio::test]
+async fn fails_invalid_base64() {
+    let config: AzureMonitorLogsConfig = toml::from_str(
+        r#"
+            customer_id = "97ce69d9-b4be-4241-8dbd-d265edcf06c4"
+            shared_key = "1Qs77Vz40+iDMBBTRmROKJwnEX"
+            log_type = "Vector"
+            azure_resource_id = "97ce69d9-b4be-4241-8dbd-d265edcf06c4"
+        "#,
+    )
+    .unwrap();
+    if config.build(SinkContext::default()).await.is_ok() {
+        panic!("config.build failed to error");
+    }
+}
+
+#[test]
+fn fails_config_missing_fields() {
+    toml::from_str::<AzureMonitorLogsConfig>(
+            r#"
+            customer_id = "97ce69d9-b4be-4241-8dbd-d265edcf06c4"
+            shared_key = "SERsIYhgMVlJB6uPsq49gCxNiruf6v0vhMYE+lfzbSGcXjdViZdV/e5pEMTYtw9f8SkVLf4LFlLCc2KxtRZfCA=="
+            azure_resource_id = "97ce69d9-b4be-4241-8dbd-d265edcf06c4"
+        "#,
+        )
+        .expect_err("Config parsing failed to error with missing log_type");
+
+    toml::from_str::<AzureMonitorLogsConfig>(
+        r#"
+            customer_id = "97ce69d9-b4be-4241-8dbd-d265edcf06c4"
+            log_type = "Vector"
+            azure_resource_id = "97ce69d9-b4be-4241-8dbd-d265edcf06c4"
+        "#,
+    )
+    .expect_err("Config parsing failed to error with missing shared_key");
+
+    toml::from_str::<AzureMonitorLogsConfig>(
+            r#"
+            shared_key = "SERsIYhgMVlJB6uPsq49gCxNiruf6v0vhMYE+lfzbSGcXjdViZdV/e5pEMTYtw9f8SkVLf4LFlLCc2KxtRZfCA=="
+            log_type = "Vector"
+        "#,
+        )
+        .expect_err("Config parsing failed to error with missing customer_id");
+}
+
+fn insert_timestamp_kv(log: &mut LogEvent) -> (String, String) {
+    let now = chrono::Utc::now();
+
+    let timestamp_value = now.to_rfc3339_opts(chrono::SecondsFormat::Millis, true);
+    log.insert(log_schema().timestamp_key_target_path().unwrap(), now);
+
+    (
+        log_schema().timestamp_key().unwrap().to_string(),
+        timestamp_value,
+    )
+}
+
+fn build_authorization_header_value(
+    shared_key: &pkey::PKey<pkey::Private>,
+    customer_id: &str,
+    rfc1123date: &str,
+    len: usize,
+) -> crate::Result<String> {
+    let string_to_hash =
+        format!("POST\n{len}\napplication/json\nx-ms-date:{rfc1123date}\n/api/logs");
+    let mut signer = sign::Signer::new(hash::MessageDigest::sha256(), shared_key)?;
+    signer.update(string_to_hash.as_bytes())?;
+
+    let signature = signer.sign_to_vec()?;
+    let signature_base64 = base64::encode_block(&signature);
+
+    Ok(format!("SharedKey {customer_id}:{signature_base64}"))
+}
+
+#[tokio::test]
+async fn correct_request() {
+    let config: AzureMonitorLogsConfig = toml::from_str(
+            r#"
+            # random GUID and random 64 Base-64 encoded bytes
+            customer_id = "97ce69d9-b4be-4241-8dbd-d265edcf06c4"
+            shared_key = "SERsIYhgMVlJB6uPsq49gCxNiruf6v0vhMYE+lfzbSGcXjdViZdV/e5pEMTYtw9f8SkVLf4LFlLCc2KxtRZfCA=="
+            log_type = "Vector"
+            azure_resource_id = "97ce69d9-b4be-4241-8dbd-d265edcf06c4"
+        "#,
+        )
+        .unwrap();
+
+    let mut log1 = [("message", "hello")].iter().copied().collect::<LogEvent>();
+    let (timestamp_key1, timestamp_value1) = insert_timestamp_kv(&mut log1);
+
+    let mut log2 = [("message", "world")].iter().copied().collect::<LogEvent>();
+    let (timestamp_key2, timestamp_value2) = insert_timestamp_kv(&mut log2);
+
+    let (tx, mut rx) = tokio::sync::mpsc::channel(1);
+    let mock_endpoint = spawn_blackhole_http_server(move |request| {
+        let tx = tx.clone();
+        async move {
+            tx.send(request).await.unwrap();
+            Ok(Response::new(hyper::Body::empty()))
+        }
+    })
+    .await;
+
+    let context = SinkContext::default();
+    let (sink, _healthcheck) = config
+        .build_inner(context, mock_endpoint.into())
+        .await
+        .unwrap();
+
+    run_and_assert_sink_compliance(sink, stream::iter(vec![log1, log2]), &SINK_TAGS).await;
+
+    let request = timeout(Duration::from_millis(500), rx.recv())
+        .await
+        .unwrap()
+        .unwrap();
+
+    let (parts, body) = request.into_parts();
+    assert_eq!(&parts.method.to_string(), "POST");
+
+    let body = body::to_bytes(body).await.unwrap();
+    let json: serde_json::Value = serde_json::from_slice(&body[..]).unwrap();
+    let expected_json = serde_json::json!([
+        {
+            timestamp_key1: timestamp_value1,
+            "message": "hello"
+        },
+        {
+            timestamp_key2: timestamp_value2,
+            "message": "world"
+        }
+    ]);
+    assert_eq!(json, expected_json);
+
+    let headers = parts.headers;
+
+    let rfc1123date = headers.get("x-ms-date").unwrap();
+    let shared_key = config.build_shared_key().unwrap();
+    let auth_expected = build_authorization_header_value(
+        &shared_key,
+        &config.customer_id,
+        rfc1123date.to_str().unwrap(),
+        body.len(),
+    )
+    .unwrap();
+    let authorization = headers.get("authorization").unwrap();
+    assert_eq!(authorization.to_str().unwrap(), &auth_expected);
+
+    let log_type = headers.get("log-type").unwrap();
+    assert_eq!(log_type.to_str().unwrap(), "Vector");
+
+    let time_generated_field = headers.get("time-generated-field").unwrap();
+    let timestamp_key = log_schema().timestamp_key();
+    assert_eq!(
+        time_generated_field.to_str().unwrap(),
+        timestamp_key.unwrap().to_string().as_str()
+    );
+
+    let azure_resource_id = headers.get("x-ms-azureresourceid").unwrap();
+    assert_eq!(
+        azure_resource_id.to_str().unwrap(),
+        "97ce69d9-b4be-4241-8dbd-d265edcf06c4"
+    );
+
+    assert_eq!(
+        &parts.uri.path_and_query().unwrap().to_string(),
+        "/api/logs?api-version=2016-04-01"
+    );
+}
+
+#[test]
+fn encode_valid() {
+    let mut log = [("message", "hello world")]
+        .iter()
+        .copied()
+        .collect::<LogEvent>();
+    let (timestamp_key, timestamp_value) = insert_timestamp_kv(&mut log);
+
+    let event = Event::from(log);
+    let encoder = JsonEncoding::new(Default::default(), log_schema().timestamp_key().cloned());
+    let mut encoded = vec![];
+    encoder.encode_input(vec![event], &mut encoded).unwrap();
+    let expected_json = serde_json::json!([{
+        timestamp_key: timestamp_value,
+        "message": "hello world"
+    }]);
+    let json: serde_json::Value = serde_json::from_slice(&encoded).unwrap();
+    assert_eq!(json, expected_json);
+}
diff --git a/src/sinks/clickhouse/config.rs b/src/sinks/clickhouse/config.rs
index 0efffb97ef3ce..a6fad6a11cdc3 100644
--- a/src/sinks/clickhouse/config.rs
+++ b/src/sinks/clickhouse/config.rs
@@ -25,11 +25,11 @@ pub struct ClickhouseConfig {
 
     /// The table that data is inserted into.
     #[configurable(metadata(docs::examples = "mytable"))]
-    pub table: String,
+    pub table: Template,
 
     /// The database that contains the table that data is inserted into.
     #[configurable(metadata(docs::examples = "mydatabase"))]
-    pub database: Option<String>,
+    pub database: Option<Template>,
 
     /// Sets `input_format_skip_unknown_fields`, allowing ClickHouse to discard fields not present in the table schema.
     #[serde(default)]
@@ -90,12 +90,10 @@ impl SinkConfig for ClickhouseConfig {
         let service = ClickhouseService::new(
             client.clone(),
             auth.clone(),
-            &endpoint,
-            self.database.as_deref(),
-            self.table.as_str(),
+            endpoint.clone(),
             self.skip_unknown_fields,
             self.date_time_best_effort,
-        )?;
+        );
 
         let request_limits = self.request.unwrap_with(&Default::default());
         let service = ServiceBuilder::new()
@@ -103,12 +101,19 @@ impl SinkConfig for ClickhouseConfig {
             .service(service);
 
         let batch_settings = self.batch.into_batcher_settings()?;
+        let database = self.database.clone().unwrap_or_else(|| {
+            "default"
+                .try_into()
+                .expect("'default' should be a valid template")
+        });
         let sink = ClickhouseSink::new(
             batch_settings,
             self.compression,
             self.encoding.clone(),
             service,
             protocol,
+            database,
+            self.table.clone(),
         );
 
         let healthcheck = Box::pin(healthcheck(client, endpoint, auth));
@@ -126,7 +131,6 @@ impl SinkConfig for ClickhouseConfig {
 }
 
 async fn healthcheck(client: HttpClient, endpoint: Uri, auth: Option<Auth>) -> crate::Result<()> {
-    // TODO: check if table exists?
     let uri = format!("{}/?query=SELECT%201", endpoint);
     let mut request = Request::get(uri).body(Body::empty()).unwrap();
 
diff --git a/src/sinks/clickhouse/integration_tests.rs b/src/sinks/clickhouse/integration_tests.rs
index f16b19ffcc7ed..2408a892999f2 100644
--- a/src/sinks/clickhouse/integration_tests.rs
+++ b/src/sinks/clickhouse/integration_tests.rs
@@ -45,7 +45,7 @@ async fn insert_events() {
 
     let config = ClickhouseConfig {
         endpoint: host.parse().unwrap(),
-        table: table.clone(),
+        table: table.clone().try_into().unwrap(),
         compression: Compression::None,
         batch,
         request: TowerRequestConfig {
@@ -94,7 +94,7 @@ async fn skip_unknown_fields() {
 
     let config = ClickhouseConfig {
         endpoint: host.parse().unwrap(),
-        table: table.clone(),
+        table: table.clone().try_into().unwrap(),
         skip_unknown_fields: true,
         compression: Compression::None,
         batch,
@@ -140,7 +140,7 @@ async fn insert_events_unix_timestamps() {
 
     let config = ClickhouseConfig {
         endpoint: host.parse().unwrap(),
-        table: table.clone(),
+        table: table.clone().try_into().unwrap(),
         compression: Compression::None,
         encoding: Transformer::new(None, None, Some(TimestampFormat::Unix)).unwrap(),
         batch,
@@ -178,10 +178,7 @@ async fn insert_events_unix_timestamps() {
         format!(
             "{}",
             exp_event
-                .get((
-                    lookup::PathPrefix::Event,
-                    log_schema().timestamp_key().unwrap()
-                ))
+                .get_timestamp()
                 .unwrap()
                 .as_timestamp()
                 .unwrap()
@@ -242,10 +239,7 @@ timestamp_format = "unix""#,
         format!(
             "{}",
             exp_event
-                .get((
-                    lookup::PathPrefix::Event,
-                    log_schema().timestamp_key().unwrap()
-                ))
+                .get_timestamp()
                 .unwrap()
                 .as_timestamp()
                 .unwrap()
@@ -269,7 +263,7 @@ async fn no_retry_on_incorrect_data() {
 
     let config = ClickhouseConfig {
         endpoint: host.parse().unwrap(),
-        table: table.clone(),
+        table: table.clone().try_into().unwrap(),
         compression: Compression::None,
         batch,
         ..Default::default()
@@ -320,7 +314,7 @@ async fn no_retry_on_incorrect_data_warp() {
 
     let config = ClickhouseConfig {
         endpoint: host.parse().unwrap(),
-        table: gen_table(),
+        table: gen_table().try_into().unwrap(),
         batch,
         ..Default::default()
     };
@@ -338,6 +332,70 @@ async fn no_retry_on_incorrect_data_warp() {
     assert_eq!(receiver.try_recv(), Ok(BatchStatus::Rejected));
 }
 
+#[tokio::test]
+async fn templated_table() {
+    trace_init();
+
+    let n_tables = 2;
+    let table_events: Vec<(String, Event, BatchStatusReceiver)> = (0..n_tables)
+        .map(|_| {
+            let table = gen_table();
+            let (mut event, receiver) = make_event();
+            event.as_mut_log().insert("table", table.as_str());
+            (table, event, receiver)
+        })
+        .collect();
+
+    let host = clickhouse_address();
+
+    let mut batch = BatchConfig::default();
+    batch.max_events = Some(1);
+
+    let config = ClickhouseConfig {
+        endpoint: host.parse().unwrap(),
+        table: "{{ .table }}".try_into().unwrap(),
+        batch,
+        ..Default::default()
+    };
+
+    let client = ClickhouseClient::new(host);
+    for (table, _, _) in &table_events {
+        client
+            .create_table(
+                table,
+                "host String, timestamp String, message String, table String",
+            )
+            .await;
+    }
+
+    let (sink, _hc) = config.build(SinkContext::default()).await.unwrap();
+
+    let events: Vec<Event> = table_events
+        .iter()
+        .map(|(_, event, _)| event.clone())
+        .collect();
+    run_and_assert_sink_compliance(sink, stream::iter(events), &SINK_TAGS).await;
+
+    for (table, event, mut receiver) in table_events {
+        let output = client.select_all(&table).await;
+        assert_eq!(1, output.rows, "table {} should have 1 row", table);
+
+        let expected = serde_json::to_value(event.into_log()).unwrap();
+        assert_eq!(
+            expected, output.data[0],
+            "table \"{}\"'s one row should have the correct data",
+            table
+        );
+
+        assert_eq!(
+            receiver.try_recv(),
+            Ok(BatchStatus::Delivered),
+            "table \"{}\"'s event should have been delivered",
+            table
+        );
+    }
+}
+
 fn make_event() -> (Event, BatchStatusReceiver) {
     let (batch, receiver) = BatchNotifier::new_with_receiver();
     let mut event = LogEvent::from("raw log line").with_batch_notifier(&batch);
diff --git a/src/sinks/clickhouse/service.rs b/src/sinks/clickhouse/service.rs
index ecce62e537290..f912b99e6df22 100644
--- a/src/sinks/clickhouse/service.rs
+++ b/src/sinks/clickhouse/service.rs
@@ -19,6 +19,8 @@ use crate::{
 
 #[derive(Debug, Clone)]
 pub struct ClickhouseRequest {
+    pub database: String,
+    pub table: String,
     pub body: Bytes,
     pub compression: Compression,
     pub finalizers: EventFinalizers,
@@ -107,31 +109,28 @@ impl RetryLogic for ClickhouseRetryLogic {
 #[derive(Debug, Clone)]
 pub struct ClickhouseService {
     client: HttpClient,
-    uri: Uri,
     auth: Option<Auth>,
+    endpoint: Uri,
+    skip_unknown_fields: bool,
+    date_time_best_effort: bool,
 }
 
 impl ClickhouseService {
     /// Creates a new `ClickhouseService`.
-    pub fn new(
+    pub const fn new(
         client: HttpClient,
         auth: Option<Auth>,
-        endpoint: &Uri,
-        database: Option<&str>,
-        table: &str,
+        endpoint: Uri,
         skip_unknown_fields: bool,
         date_time_best_effort: bool,
-    ) -> crate::Result<Self> {
-        // Set the URI query once during initialization, as it won't change throughout the lifecycle
-        // of the service.
-        let uri = set_uri_query(
+    ) -> Self {
+        Self {
+            client,
+            auth,
             endpoint,
-            database.unwrap_or("default"),
-            table,
             skip_unknown_fields,
             date_time_best_effort,
-        )?;
-        Ok(Self { client, auth, uri })
+        }
     }
 }
 
@@ -148,22 +147,32 @@ impl Service<ClickhouseRequest> for ClickhouseService {
     // Emission of Error internal event is handled upstream by the caller.
     fn call(&mut self, request: ClickhouseRequest) -> Self::Future {
         let mut client = self.client.clone();
+        let auth = self.auth.clone();
 
-        let mut builder = Request::post(&self.uri)
-            .header(CONTENT_TYPE, "application/x-ndjson")
-            .header(CONTENT_LENGTH, request.body.len());
-        if let Some(ce) = request.compression.content_encoding() {
-            builder = builder.header(CONTENT_ENCODING, ce);
-        }
-        if let Some(auth) = &self.auth {
-            builder = auth.apply_builder(builder);
-        }
-
-        let http_request = builder
-            .body(Body::from(request.body))
-            .expect("building HTTP request failed unexpectedly");
+        // Build the URI outside of the boxed future to avoid unnecessary clones.
+        let uri = set_uri_query(
+            &self.endpoint,
+            &request.database,
+            &request.table,
+            self.skip_unknown_fields,
+            self.date_time_best_effort,
+        );
 
         Box::pin(async move {
+            let mut builder = Request::post(&uri?)
+                .header(CONTENT_TYPE, "application/x-ndjson")
+                .header(CONTENT_LENGTH, request.body.len());
+            if let Some(ce) = request.compression.content_encoding() {
+                builder = builder.header(CONTENT_ENCODING, ce);
+            }
+            if let Some(auth) = auth {
+                builder = auth.apply_builder(builder);
+            }
+
+            let http_request = builder
+                .body(Body::from(request.body))
+                .expect("building HTTP request failed unexpectedly");
+
             let response = client.call(http_request).in_current_span().await?;
             let (parts, body) = response.into_parts();
             let body = body::to_bytes(body).await?;
diff --git a/src/sinks/clickhouse/sink.rs b/src/sinks/clickhouse/sink.rs
index 805cc50bcf4bc..df2261f1d6738 100644
--- a/src/sinks/clickhouse/sink.rs
+++ b/src/sinks/clickhouse/sink.rs
@@ -2,7 +2,7 @@ use bytes::Bytes;
 use codecs::{encoding::Framer, JsonSerializerConfig, NewlineDelimitedEncoderConfig};
 
 use super::service::{ClickhouseRequest, ClickhouseRetryLogic, ClickhouseService};
-use crate::{internal_events::SinkRequestBuildError, sinks::prelude::*};
+use crate::sinks::prelude::*;
 
 pub struct ClickhouseSink {
     batch_settings: BatcherSettings,
@@ -10,6 +10,8 @@ pub struct ClickhouseSink {
     encoding: (Transformer, Encoder<Framer>),
     service: Svc<ClickhouseService, ClickhouseRetryLogic>,
     protocol: &'static str,
+    database: Template,
+    table: Template,
 }
 
 impl ClickhouseSink {
@@ -19,6 +21,8 @@ impl ClickhouseSink {
         transformer: Transformer,
         service: Svc<ClickhouseService, ClickhouseRetryLogic>,
         protocol: &'static str,
+        database: Template,
+        table: Template,
     ) -> Self {
         Self {
             batch_settings,
@@ -26,18 +30,24 @@ impl ClickhouseSink {
             encoding: (
                 transformer,
                 Encoder::<Framer>::new(
-                    NewlineDelimitedEncoderConfig::default().build().into(),
+                    NewlineDelimitedEncoderConfig.build().into(),
                     JsonSerializerConfig::default().build().into(),
                 ),
             ),
             service,
             protocol,
+            database,
+            table,
         }
     }
 
     async fn run_inner(self: Box<Self>, input: BoxStream<'_, Event>) -> Result<(), ()> {
         input
-            .batched(self.batch_settings.into_byte_size_config())
+            .batched_partitioned(
+                KeyPartitioner::new(self.database, self.table),
+                self.batch_settings,
+            )
+            .filter_map(|(key, batch)| async move { key.map(move |k| (k, batch)) })
             .request_builder(
                 None,
                 ClickhouseRequestBuilder {
@@ -76,8 +86,8 @@ struct ClickhouseRequestBuilder {
     encoding: (Transformer, Encoder<Framer>),
 }
 
-impl RequestBuilder<Vec<Event>> for ClickhouseRequestBuilder {
-    type Metadata = EventFinalizers;
+impl RequestBuilder<(PartitionKey, Vec<Event>)> for ClickhouseRequestBuilder {
+    type Metadata = (PartitionKey, EventFinalizers);
     type Events = Vec<Event>;
     type Encoder = (Transformer, Encoder<Framer>);
     type Payload = Bytes;
@@ -94,11 +104,13 @@ impl RequestBuilder<Vec<Event>> for ClickhouseRequestBuilder {
 
     fn split_input(
         &self,
-        mut events: Vec<Event>,
+        input: (PartitionKey, Vec<Event>),
     ) -> (Self::Metadata, RequestMetadataBuilder, Self::Events) {
+        let (key, mut events) = input;
+
         let finalizers = events.take_finalizers();
         let builder = RequestMetadataBuilder::from_events(&events);
-        (finalizers, builder, events)
+        ((key, finalizers), builder, events)
     }
 
     fn build_request(
@@ -107,11 +119,57 @@ impl RequestBuilder<Vec<Event>> for ClickhouseRequestBuilder {
         request_metadata: RequestMetadata,
         payload: EncodeResult<Self::Payload>,
     ) -> Self::Request {
+        let (key, finalizers) = metadata;
         ClickhouseRequest {
+            database: key.database,
+            table: key.table,
             body: payload.into_payload(),
             compression: self.compression,
-            finalizers: metadata,
+            finalizers,
             metadata: request_metadata,
         }
     }
 }
+
+/// PartitionKey used to partition events by (database, table) pair.
+#[derive(Hash, Eq, PartialEq, Clone, Debug)]
+struct PartitionKey {
+    database: String,
+    table: String,
+}
+
+/// KeyPartitioner that partitions events by (database, table) pair.
+struct KeyPartitioner {
+    database: Template,
+    table: Template,
+}
+
+impl KeyPartitioner {
+    const fn new(database: Template, table: Template) -> Self {
+        Self { database, table }
+    }
+
+    fn render(template: &Template, item: &Event, field: &'static str) -> Option<String> {
+        template
+            .render_string(item)
+            .map_err(|error| {
+                emit!(TemplateRenderingError {
+                    error,
+                    field: Some(field),
+                    drop_event: true,
+                });
+            })
+            .ok()
+    }
+}
+
+impl Partitioner for KeyPartitioner {
+    type Item = Event;
+    type Key = Option<PartitionKey>;
+
+    fn partition(&self, item: &Self::Item) -> Self::Key {
+        let database = Self::render(&self.database, item, "database_key")?;
+        let table = Self::render(&self.table, item, "table_key")?;
+        Some(PartitionKey { database, table })
+    }
+}
diff --git a/src/sinks/datadog/events/sink.rs b/src/sinks/datadog/events/sink.rs
index 0ee8538763268..4a7a1a04facd7 100644
--- a/src/sinks/datadog/events/sink.rs
+++ b/src/sinks/datadog/events/sink.rs
@@ -58,24 +58,27 @@ async fn ensure_required_fields(event: Event) -> Option<Event> {
     if !log.contains("text") {
         let message_path = log
             .message_path()
-            .expect("message is required (make sure the \"message\" semantic meaning is set)");
-        log.rename_key(message_path.as_str(), event_path!("text"))
+            .expect("message is required (make sure the \"message\" semantic meaning is set)")
+            .clone();
+        log.rename_key(&message_path, event_path!("text"));
     }
 
     if !log.contains("host") {
-        if let Some(host_path) = log.host_path() {
-            log.rename_key(host_path.as_str(), event_path!("host"));
+        if let Some(host_path) = log.host_path().cloned().as_ref() {
+            log.rename_key(host_path, event_path!("host"));
         }
     }
 
     if !log.contains("date_happened") {
-        if let Some(timestamp_path) = log.timestamp_path() {
-            log.rename_key(timestamp_path.as_str(), "date_happened");
+        if let Some(timestamp_path) = log.timestamp_path().cloned().as_ref() {
+            log.rename_key(timestamp_path, "date_happened");
         }
     }
 
     if !log.contains("source_type_name") {
-        log.rename_key(log.source_type_path(), "source_type_name")
+        if let Some(source_type_path) = log.source_type_path().cloned().as_ref() {
+            log.rename_key(source_type_path, "source_type_name");
+        }
     }
 
     Some(Event::from(log))
diff --git a/src/sinks/datadog/logs/config.rs b/src/sinks/datadog/logs/config.rs
index 91071379133d3..a2439bc396b5b 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;
+use vector_core::{config::proxy::ProxyConfig, schema::meaning};
 use vrl::value::Kind;
 
 use super::{service::LogApiRetry, sink::LogSinkBuilder};
@@ -179,13 +179,13 @@ impl SinkConfig for DatadogLogsConfig {
 
     fn input(&self) -> Input {
         let requirement = schema::Requirement::empty()
-            .required_meaning("message", Kind::bytes())
-            .required_meaning("timestamp", Kind::timestamp())
-            .optional_meaning("host", Kind::bytes())
-            .optional_meaning("source", Kind::bytes())
-            .optional_meaning("severity", Kind::bytes())
-            .optional_meaning("service", Kind::bytes())
-            .optional_meaning("trace_id", Kind::bytes());
+            .required_meaning(meaning::MESSAGE, Kind::bytes())
+            .required_meaning(meaning::TIMESTAMP, Kind::timestamp())
+            .optional_meaning(meaning::HOST, Kind::bytes())
+            .optional_meaning(meaning::SOURCE, Kind::bytes())
+            .optional_meaning(meaning::SEVERITY, Kind::bytes())
+            .optional_meaning(meaning::SERVICE, Kind::bytes())
+            .optional_meaning(meaning::TRACE_ID, Kind::bytes());
 
         Input::log().with_schema_requirement(requirement)
     }
diff --git a/src/sinks/datadog/logs/sink.rs b/src/sinks/datadog/logs/sink.rs
index fd2f132d13f85..33b823ad3b92c 100644
--- a/src/sinks/datadog/logs/sink.rs
+++ b/src/sinks/datadog/logs/sink.rs
@@ -7,7 +7,7 @@ use futures::stream::{BoxStream, StreamExt};
 use lookup::event_path;
 use snafu::Snafu;
 use tower::Service;
-use vector_common::request_metadata::RequestMetadata;
+use vector_common::request_metadata::{GroupedCountByteSize, RequestMetadata};
 use vector_core::{
     event::{Event, EventFinalizers, Finalizable, Value},
     partition::Partitioner,
@@ -125,24 +125,30 @@ impl JsonEncoding {
 }
 
 impl crate::sinks::util::encoding::Encoder<Vec<Event>> for JsonEncoding {
-    fn encode_input(&self, mut input: Vec<Event>, writer: &mut dyn io::Write) -> io::Result<usize> {
+    fn encode_input(
+        &self,
+        mut input: Vec<Event>,
+        writer: &mut dyn io::Write,
+    ) -> io::Result<(usize, GroupedCountByteSize)> {
         for event in input.iter_mut() {
             let log = event.as_mut_log();
             let message_path = log
                 .message_path()
-                .expect("message is required (make sure the \"message\" semantic meaning is set)");
-            log.rename_key(message_path.as_str(), event_path!("message"));
+                .expect("message is required (make sure the \"message\" semantic meaning is set)")
+                .clone();
+            log.rename_key(&message_path, event_path!("message"));
 
-            if let Some(host_path) = log.host_path() {
-                log.rename_key(host_path.as_str(), event_path!("hostname"));
+            if let Some(host_path) = log.host_path().cloned().as_ref() {
+                log.rename_key(host_path, event_path!("hostname"));
             }
 
-            if let Some(Value::Timestamp(ts)) = log.remove(
-                log
+            let message_path = log
                 .timestamp_path()
-                .expect("timestamp is required (make sure the \"timestamp\" semantic meaning is set)")
-                .as_str()
-            ) {
+                .expect(
+                    "timestamp is required (make sure the \"timestamp\" semantic meaning is set)",
+                )
+                .clone();
+            if let Some(Value::Timestamp(ts)) = log.remove(&message_path) {
                 log.insert(
                     event_path!("timestamp"),
                     Value::Integer(ts.timestamp_millis()),
@@ -219,7 +225,7 @@ impl RequestBuilder<(Option<Arc<str>>, Vec<Event>)> for LogRequestBuilder {
         // to (un)compressed size limitations.
         let mut buf = Vec::new();
         let n_events = events.len();
-        let uncompressed_size = self.encoder().encode_input(events, &mut buf)?;
+        let (uncompressed_size, byte_size) = self.encoder().encode_input(events, &mut buf)?;
         if uncompressed_size > MAX_PAYLOAD_BYTES {
             return Err(RequestBuildError::PayloadTooBig);
         }
@@ -230,9 +236,13 @@ impl RequestBuilder<(Option<Arc<str>>, Vec<Event>)> for LogRequestBuilder {
         let bytes = compressor.into_inner().freeze();
 
         if self.compression.is_compressed() {
-            Ok(EncodeResult::compressed(bytes, uncompressed_size))
+            Ok(EncodeResult::compressed(
+                bytes,
+                uncompressed_size,
+                byte_size,
+            ))
         } else {
-            Ok(EncodeResult::uncompressed(bytes))
+            Ok(EncodeResult::uncompressed(bytes, byte_size))
         }
     }
 
@@ -266,7 +276,7 @@ where
     async fn run_inner(self: Box<Self>, input: BoxStream<'_, Event>) -> Result<(), ()> {
         let default_api_key = Arc::clone(&self.default_api_key);
 
-        let partitioner = EventPartitioner::default();
+        let partitioner = EventPartitioner;
 
         let builder_limit = NonZeroUsize::new(64);
         let input = input.batched_partitioned(partitioner, self.batch_settings);
diff --git a/src/sinks/datadog/metrics/encoder.rs b/src/sinks/datadog/metrics/encoder.rs
index 0dd6c393e31b5..347271d5651ae 100644
--- a/src/sinks/datadog/metrics/encoder.rs
+++ b/src/sinks/datadog/metrics/encoder.rs
@@ -10,10 +10,12 @@ use chrono::{DateTime, Utc};
 use once_cell::sync::OnceCell;
 use prost::Message;
 use snafu::{ResultExt, Snafu};
+use vector_common::request_metadata::GroupedCountByteSize;
 use vector_core::{
-    config::{log_schema, LogSchema},
+    config::{log_schema, telemetry, LogSchema},
     event::{metric::MetricSketch, Metric, MetricTags, MetricValue},
     metrics::AgentDDSketch,
+    EstimatedJsonEncodedSizeOf,
 };
 
 use super::config::{
@@ -122,6 +124,7 @@ struct EncoderState {
     written: usize,
     buf: Vec<u8>,
     processed: Vec<Metric>,
+    byte_size: GroupedCountByteSize,
 }
 
 impl Default for EncoderState {
@@ -131,6 +134,7 @@ impl Default for EncoderState {
             written: 0,
             buf: Vec::with_capacity(1024),
             processed: Vec::new(),
+            byte_size: telemetry().create_request_count_byte_size(),
         }
     }
 }
@@ -202,6 +206,10 @@ impl DatadogMetricsEncoder {
         // Clear our temporary buffer before any encoding.
         self.state.buf.clear();
 
+        self.state
+            .byte_size
+            .add_event(&metric, metric.estimated_json_encoded_size_of());
+
         match self.endpoint {
             // Series metrics are encoded via JSON, in an incremental fashion.
             DatadogMetricsEndpoint::Series => {
@@ -325,6 +333,8 @@ impl DatadogMetricsEncoder {
         self.state.written += n;
 
         let raw_bytes_written = self.state.written;
+        let byte_size = self.state.byte_size.clone();
+
         // Consume the encoder state so we can do our final checks and return the necessary data.
         let state = self.reset_state();
         let payload = state
@@ -349,7 +359,7 @@ impl DatadogMetricsEncoder {
         if recommended_splits == 1 {
             // "One" split means no splits needed: our payload didn't exceed either of the limits.
             Ok((
-                EncodeResult::compressed(payload, raw_bytes_written),
+                EncodeResult::compressed(payload, raw_bytes_written, byte_size),
                 processed,
             ))
         } else {
@@ -385,7 +395,10 @@ fn sketch_to_proto_message(
     let name = get_namespaced_name(metric, default_namespace);
     let ts = encode_timestamp(metric.timestamp());
     let mut tags = metric.tags().cloned().unwrap_or_default();
-    let host = tags.remove(log_schema.host_key()).unwrap_or_default();
+    let host = log_schema
+        .host_key()
+        .map(|key| tags.remove(key.to_string().as_str()).unwrap_or_default())
+        .unwrap_or_default();
     let tags = encode_tags(&tags);
 
     let cnt = ddsketch.count() as i64;
@@ -497,7 +510,10 @@ fn generate_series_metrics(
     let name = get_namespaced_name(metric, default_namespace);
 
     let mut tags = metric.tags().cloned().unwrap_or_default();
-    let host = tags.remove(log_schema.host_key());
+    let host = log_schema
+        .host_key()
+        .map(|key| tags.remove(key.to_string().as_str()).unwrap_or_default());
+
     let source_type_name = tags.remove("source_type_name");
     let device = tags.remove("device");
     let ts = encode_timestamp(metric.timestamp());
diff --git a/src/sinks/datadog/metrics/integration_tests.rs b/src/sinks/datadog/metrics/integration_tests.rs
index 572b304db8f3e..458cc5be987f3 100644
--- a/src/sinks/datadog/metrics/integration_tests.rs
+++ b/src/sinks/datadog/metrics/integration_tests.rs
@@ -4,14 +4,20 @@ use futures::{channel::mpsc::Receiver, stream, StreamExt};
 use hyper::StatusCode;
 use indoc::indoc;
 use rand::{thread_rng, Rng};
-use vector_core::event::{BatchNotifier, BatchStatus, Event, Metric, MetricKind, MetricValue};
+use vector_core::{
+    config::{init_telemetry, Tags, Telemetry},
+    event::{BatchNotifier, BatchStatus, Event, Metric, MetricKind, MetricValue},
+};
 
 use super::DatadogMetricsConfig;
 use crate::{
     config::SinkConfig,
     sinks::util::test::{build_test_server_status, load_sink},
     test_util::{
-        components::{assert_sink_compliance, SINK_TAGS},
+        components::{
+            assert_data_volume_sink_compliance, assert_sink_compliance, DATA_VOLUME_SINK_TAGS,
+            SINK_TAGS,
+        },
         map_event_batch_stream, next_addr,
     },
 };
@@ -168,35 +174,51 @@ async fn smoke() {
     }
 }
 
-#[tokio::test]
-async fn real_endpoint() {
-    assert_sink_compliance(&SINK_TAGS, async {
-        let config = indoc! {r#"
+async fn run_sink() {
+    let config = indoc! {r#"
         default_api_key = "${TEST_DATADOG_API_KEY}"
         default_namespace = "fake.test.integration"
     "#};
-        let api_key = std::env::var("TEST_DATADOG_API_KEY").unwrap();
-        assert!(!api_key.is_empty(), "$TEST_DATADOG_API_KEY required");
-        let config = config.replace("${TEST_DATADOG_API_KEY}", &api_key);
-        let (config, cx) = load_sink::<DatadogMetricsConfig>(config.as_str()).unwrap();
-
-        let (sink, _) = config.build(cx).await.unwrap();
-        let (batch, receiver) = BatchNotifier::new_with_receiver();
-        let events: Vec<_> = (0..10)
-            .map(|index| {
-                Event::Metric(Metric::new(
-                    "counter",
-                    MetricKind::Absolute,
-                    MetricValue::Counter {
-                        value: index as f64,
-                    },
-                ))
-            })
-            .collect();
-        let stream = map_event_batch_stream(stream::iter(events.clone()), Some(batch));
+    let api_key = std::env::var("TEST_DATADOG_API_KEY").unwrap();
+    assert!(!api_key.is_empty(), "$TEST_DATADOG_API_KEY required");
+    let config = config.replace("${TEST_DATADOG_API_KEY}", &api_key);
+    let (config, cx) = load_sink::<DatadogMetricsConfig>(config.as_str()).unwrap();
+
+    let (sink, _) = config.build(cx).await.unwrap();
+    let (batch, receiver) = BatchNotifier::new_with_receiver();
+    let events: Vec<_> = (0..10)
+        .map(|index| {
+            Event::Metric(Metric::new(
+                "counter",
+                MetricKind::Absolute,
+                MetricValue::Counter {
+                    value: index as f64,
+                },
+            ))
+        })
+        .collect();
+    let stream = map_event_batch_stream(stream::iter(events.clone()), Some(batch));
+
+    sink.run(stream).await.unwrap();
+    assert_eq!(receiver.await, BatchStatus::Delivered);
+}
 
-        sink.run(stream).await.unwrap();
-        assert_eq!(receiver.await, BatchStatus::Delivered);
-    })
-    .await;
+#[tokio::test]
+async fn real_endpoint() {
+    assert_sink_compliance(&SINK_TAGS, async { run_sink().await }).await;
+}
+
+#[tokio::test]
+async fn data_volume_tags() {
+    init_telemetry(
+        Telemetry {
+            tags: Tags {
+                emit_service: true,
+                emit_source: true,
+            },
+        },
+        true,
+    );
+
+    assert_data_volume_sink_compliance(&DATA_VOLUME_SINK_TAGS, async { run_sink().await }).await;
 }
diff --git a/src/sinks/datadog/metrics/normalizer.rs b/src/sinks/datadog/metrics/normalizer.rs
index 37ecb29198054..d4e6430250e1c 100644
--- a/src/sinks/datadog/metrics/normalizer.rs
+++ b/src/sinks/datadog/metrics/normalizer.rs
@@ -185,7 +185,7 @@ mod tests {
 
     fn run_comparisons(inputs: Vec<Metric>, expected_outputs: Vec<Option<Metric>>) {
         let mut metric_set = MetricSet::default();
-        let mut normalizer = DatadogMetricsNormalizer::default();
+        let mut normalizer = DatadogMetricsNormalizer;
 
         for (input, expected) in inputs.into_iter().zip(expected_outputs) {
             let result = normalizer.normalize(&mut metric_set, input);
diff --git a/src/sinks/datadog/traces/apm_stats/aggregation.rs b/src/sinks/datadog/traces/apm_stats/aggregation.rs
index 9ae1ae6e50cc5..2c7d3a580e6ad 100644
--- a/src/sinks/datadog/traces/apm_stats/aggregation.rs
+++ b/src/sinks/datadog/traces/apm_stats/aggregation.rs
@@ -1,6 +1,7 @@
 use std::{collections::BTreeMap, sync::Arc};
 
 use chrono::Utc;
+use vrl::event_path;
 
 use super::{
     bucket::Bucket, ClientStatsBucket, ClientStatsPayload, PartitionKey,
@@ -179,7 +180,7 @@ impl Aggregator {
     pub(crate) fn handle_trace(&mut self, partition_key: &PartitionKey, trace: &TraceEvent) {
         // Based on https://github.com/DataDog/datadog-agent/blob/cfa750c7412faa98e87a015f8ee670e5828bbe7f/pkg/trace/stats/concentrator.go#L148-L184
 
-        let spans = match trace.get("spans") {
+        let spans = match trace.get(event_path!("spans")) {
             Some(Value::Array(v)) => v.iter().filter_map(|s| s.as_object()).collect(),
             _ => vec![],
         };
@@ -189,16 +190,16 @@ impl Aggregator {
             env: partition_key.env.clone().unwrap_or_default(),
             hostname: partition_key.hostname.clone().unwrap_or_default(),
             version: trace
-                .get("app_version")
+                .get(event_path!("app_version"))
                 .map(|v| v.to_string_lossy().into_owned())
                 .unwrap_or_default(),
             container_id: trace
-                .get("container_id")
+                .get(event_path!("container_id"))
                 .map(|v| v.to_string_lossy().into_owned())
                 .unwrap_or_default(),
         };
         let synthetics = trace
-            .get("origin")
+            .get(event_path!("origin"))
             .map(|v| v.to_string_lossy().starts_with(TAG_SYNTHETICS))
             .unwrap_or(false);
 
diff --git a/src/sinks/datadog/traces/apm_stats/integration_tests.rs b/src/sinks/datadog/traces/apm_stats/integration_tests.rs
index 187ad1b9d8150..4ca0207e30371 100644
--- a/src/sinks/datadog/traces/apm_stats/integration_tests.rs
+++ b/src/sinks/datadog/traces/apm_stats/integration_tests.rs
@@ -16,6 +16,7 @@ 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},
@@ -322,8 +323,8 @@ fn validate_stats(agent_stats: &StatsPayload, vector_stats: &StatsPayload) {
 async fn start_vector() -> (
     RunningTopology,
     (
-        tokio::sync::mpsc::UnboundedSender<()>,
-        tokio::sync::mpsc::UnboundedReceiver<()>,
+        tokio::sync::mpsc::UnboundedSender<ShutdownError>,
+        tokio::sync::mpsc::UnboundedReceiver<ShutdownError>,
     ),
 ) {
     let dd_agent_address = format!("0.0.0.0:{}", vector_receive_port());
diff --git a/src/sinks/datadog/traces/request_builder.rs b/src/sinks/datadog/traces/request_builder.rs
index dbe57714995fc..64fa9f0d9c7ed 100644
--- a/src/sinks/datadog/traces/request_builder.rs
+++ b/src/sinks/datadog/traces/request_builder.rs
@@ -9,10 +9,8 @@ use bytes::Bytes;
 use prost::Message;
 use snafu::Snafu;
 use vector_common::request_metadata::RequestMetadata;
-use vector_core::{
-    event::{EventFinalizers, Finalizable},
-    EstimatedJsonEncodedSizeOf,
-};
+use vector_core::event::{EventFinalizers, Finalizable};
+use vrl::event_path;
 
 use super::{
     apm_stats::{compute_apm_stats, Aggregator},
@@ -125,7 +123,6 @@ impl IncrementalRequestBuilder<(PartitionKey, Vec<Event>)> for DatadogTracesRequ
             .for_each(|r| match r {
                 Ok((payload, mut processed)) => {
                     let uncompressed_size = payload.len();
-                    let json_size = processed.estimated_json_encoded_size_of();
                     let metadata = DDTracesMetadata {
                         api_key: key
                             .api_key
@@ -137,14 +134,14 @@ impl IncrementalRequestBuilder<(PartitionKey, Vec<Event>)> for DatadogTracesRequ
                         content_type: "application/x-protobuf".to_string(),
                     };
 
+                    // build RequestMetadata
+                    let builder = RequestMetadataBuilder::from_events(&processed);
+
                     let mut compressor = Compressor::from(self.compression);
                     match compressor.write_all(&payload) {
                         Ok(()) => {
                             let bytes = compressor.into_inner().freeze();
 
-                            // build RequestMetadata
-                            let builder =
-                                RequestMetadataBuilder::new(n, uncompressed_size, json_size);
                             let bytes_len = NonZeroUsize::new(bytes.len())
                                 .expect("payload should never be zero length");
                             let request_metadata = builder.with_request_size(bytes_len);
@@ -287,7 +284,7 @@ impl DatadogTracesEncoder {
 
     fn vector_trace_into_dd_tracer_payload(trace: &TraceEvent) -> dd_proto::TracerPayload {
         let tags = trace
-            .get("tags")
+            .get(event_path!("tags"))
             .and_then(|m| m.as_object())
             .map(|m| {
                 m.iter()
@@ -296,7 +293,7 @@ impl DatadogTracesEncoder {
             })
             .unwrap_or_default();
 
-        let spans = match trace.get("spans") {
+        let spans = match trace.get(event_path!("spans")) {
             Some(Value::Array(v)) => v
                 .iter()
                 .filter_map(|s| s.as_object().map(DatadogTracesEncoder::convert_span))
@@ -306,7 +303,7 @@ impl DatadogTracesEncoder {
 
         let chunk = dd_proto::TraceChunk {
             priority: trace
-                .get("priority")
+                .get(event_path!("priority"))
                 .and_then(|v| v.as_integer().map(|v| v as i32))
                 // This should not happen for Datadog originated traces, but in case this field is not populated
                 // we default to 1 (https://github.com/DataDog/datadog-agent/blob/eac2327/pkg/trace/sampler/sampler.go#L54-L55),
@@ -314,11 +311,11 @@ impl DatadogTracesEncoder {
                 // https://github.com/DataDog/datadog-agent/blob/3ea2eb4/pkg/trace/api/otlp.go#L309.
                 .unwrap_or(1i32),
             origin: trace
-                .get("origin")
+                .get(event_path!("origin"))
                 .map(|v| v.to_string_lossy().into_owned())
                 .unwrap_or_default(),
             dropped_trace: trace
-                .get("dropped")
+                .get(event_path!("dropped"))
                 .and_then(|v| v.as_boolean())
                 .unwrap_or(false),
             spans,
@@ -327,37 +324,37 @@ impl DatadogTracesEncoder {
 
         dd_proto::TracerPayload {
             container_id: trace
-                .get("container_id")
+                .get(event_path!("container_id"))
                 .map(|v| v.to_string_lossy().into_owned())
                 .unwrap_or_default(),
             language_name: trace
-                .get("language_name")
+                .get(event_path!("language_name"))
                 .map(|v| v.to_string_lossy().into_owned())
                 .unwrap_or_default(),
             language_version: trace
-                .get("language_version")
+                .get(event_path!("language_version"))
                 .map(|v| v.to_string_lossy().into_owned())
                 .unwrap_or_default(),
             tracer_version: trace
-                .get("tracer_version")
+                .get(event_path!("tracer_version"))
                 .map(|v| v.to_string_lossy().into_owned())
                 .unwrap_or_default(),
             runtime_id: trace
-                .get("runtime_id")
+                .get(event_path!("runtime_id"))
                 .map(|v| v.to_string_lossy().into_owned())
                 .unwrap_or_default(),
             chunks: vec![chunk],
             tags,
             env: trace
-                .get("env")
+                .get(event_path!("env"))
                 .map(|v| v.to_string_lossy().into_owned())
                 .unwrap_or_default(),
             hostname: trace
-                .get("hostname")
+                .get(event_path!("hostname"))
                 .map(|v| v.to_string_lossy().into_owned())
                 .unwrap_or_default(),
             app_version: trace
-                .get("app_version")
+                .get(event_path!("app_version"))
                 .map(|v| v.to_string_lossy().into_owned())
                 .unwrap_or_default(),
         }
diff --git a/src/sinks/datadog/traces/sink.rs b/src/sinks/datadog/traces/sink.rs
index 910e108dfebe0..4cf502a7eebae 100644
--- a/src/sinks/datadog/traces/sink.rs
+++ b/src/sinks/datadog/traces/sink.rs
@@ -7,6 +7,9 @@ use futures_util::{
 };
 use tokio::sync::oneshot::{channel, Sender};
 use tower::Service;
+use vrl::event_path;
+use vrl::path::PathPrefix;
+
 use vector_core::{
     config::log_schema,
     event::Event,
@@ -15,11 +18,13 @@ use vector_core::{
     stream::{BatcherSettings, DriverResponse},
 };
 
-use super::service::TraceApiRequest;
 use crate::{
     internal_events::DatadogTracesEncodingError,
     sinks::{datadog::traces::request_builder::DatadogTracesRequestBuilder, util::SinkBuilderExt},
 };
+
+use super::service::TraceApiRequest;
+
 #[derive(Default)]
 struct EventPartitioner;
 
@@ -50,18 +55,21 @@ impl Partitioner for EventPartitioner {
             }
             Event::Trace(t) => PartitionKey {
                 api_key: item.metadata().datadog_api_key(),
-                env: t.get("env").map(|s| s.to_string_lossy().into_owned()),
-                hostname: t
-                    .get(log_schema().host_key())
+                env: t
+                    .get(event_path!("env"))
                     .map(|s| s.to_string_lossy().into_owned()),
+                hostname: log_schema().host_key().and_then(|key| {
+                    t.get((PathPrefix::Event, key))
+                        .map(|s| s.to_string_lossy().into_owned())
+                }),
                 agent_version: t
-                    .get("agent_version")
+                    .get(event_path!("agent_version"))
                     .map(|s| s.to_string_lossy().into_owned()),
                 target_tps: t
-                    .get("target_tps")
+                    .get(event_path!("target_tps"))
                     .and_then(|tps| tps.as_integer().map(Into::into)),
                 error_tps: t
-                    .get("error_tps")
+                    .get(event_path!("error_tps"))
                     .and_then(|tps| tps.as_integer().map(Into::into)),
             },
         }
diff --git a/src/sinks/datadog/traces/tests.rs b/src/sinks/datadog/traces/tests.rs
index 1ba7468c7d9bb..af9723c236970 100644
--- a/src/sinks/datadog/traces/tests.rs
+++ b/src/sinks/datadog/traces/tests.rs
@@ -9,6 +9,7 @@ use ordered_float::NotNan;
 use prost::Message;
 use rmp_serde;
 use vector_core::event::{BatchNotifier, BatchStatus, Event};
+use vrl::event_path;
 
 use super::{apm_stats::StatsPayload, dd_proto, ddsketch_full, DatadogTracesConfig};
 
@@ -95,15 +96,15 @@ fn simple_span(resource: String) -> BTreeMap<String, Value> {
 
 pub fn simple_trace_event(resource: String) -> TraceEvent {
     let mut t = TraceEvent::default();
-    t.insert("language", "a_language");
-    t.insert("agent_version", "1.23456");
-    t.insert("host", "a_host");
-    t.insert("env", "an_env");
-    t.insert("trace_id", Value::Integer(123));
-    t.insert("target_tps", Value::Integer(10));
-    t.insert("error_tps", Value::Integer(5));
+    t.insert(event_path!("language"), "a_language");
+    t.insert(event_path!("agent_version"), "1.23456");
+    t.insert(event_path!("host"), "a_host");
+    t.insert(event_path!("env"), "an_env");
+    t.insert(event_path!("trace_id"), Value::Integer(123));
+    t.insert(event_path!("target_tps"), Value::Integer(10));
+    t.insert(event_path!("error_tps"), Value::Integer(5));
     t.insert(
-        "spans",
+        event_path!("spans"),
         Value::Array(vec![Value::from(simple_span(resource))]),
     );
     t
diff --git a/src/sinks/elasticsearch/config.rs b/src/sinks/elasticsearch/config.rs
index 20746e9cd8762..5af2c2258732c 100644
--- a/src/sinks/elasticsearch/config.rs
+++ b/src/sinks/elasticsearch/config.rs
@@ -355,15 +355,12 @@ impl DataStreamConfig {
 
     /// If there is a `timestamp` field, rename it to the expected `@timestamp` for Elastic Common Schema.
     pub fn remap_timestamp(&self, log: &mut LogEvent) {
-        if let Some(timestamp_key) = log.timestamp_path() {
-            if timestamp_key == DATA_STREAM_TIMESTAMP_KEY {
+        if let Some(timestamp_key) = log.timestamp_path().cloned() {
+            if timestamp_key.to_string() == DATA_STREAM_TIMESTAMP_KEY {
                 return;
             }
 
-            log.rename_key(
-                timestamp_key.as_str(),
-                event_path!(DATA_STREAM_TIMESTAMP_KEY),
-            )
+            log.rename_key(&timestamp_key, event_path!(DATA_STREAM_TIMESTAMP_KEY));
         }
     }
 
@@ -446,7 +443,9 @@ impl DataStreamConfig {
         let (dtype, dataset, namespace) = if !self.auto_routing {
             (self.dtype(log)?, self.dataset(log)?, self.namespace(log)?)
         } else {
-            let data_stream = log.get("data_stream").and_then(|ds| ds.as_object());
+            let data_stream = log
+                .get(event_path!("data_stream"))
+                .and_then(|ds| ds.as_object());
             let dtype = data_stream
                 .and_then(|ds| ds.get("type"))
                 .map(|value| value.to_string_lossy().into_owned())
@@ -461,7 +460,14 @@ impl DataStreamConfig {
                 .or_else(|| self.namespace(log))?;
             (dtype, dataset, namespace)
         };
-        Some(format!("{}-{}-{}", dtype, dataset, namespace))
+
+        let name = [dtype, dataset, namespace]
+            .into_iter()
+            .filter(|s| !s.is_empty())
+            .collect::<Vec<_>>()
+            .join("-");
+
+        Some(name)
     }
 }
 
diff --git a/src/sinks/elasticsearch/encoder.rs b/src/sinks/elasticsearch/encoder.rs
index f5b39a52b23a0..cdee7812097e6 100644
--- a/src/sinks/elasticsearch/encoder.rs
+++ b/src/sinks/elasticsearch/encoder.rs
@@ -3,10 +3,11 @@ use std::{io, io::Write};
 use serde::Serialize;
 use vector_buffers::EventCount;
 use vector_common::{
+    internal_event::TaggedEventsSent,
     json_size::JsonSize,
-    request_metadata::{EventCountTags, GetEventCountTags},
+    request_metadata::{GetEventCountTags, GroupedCountByteSize},
 };
-use vector_core::{event::Event, ByteSizeOf, EstimatedJsonEncodedSizeOf};
+use vector_core::{config::telemetry, event::Event, ByteSizeOf, EstimatedJsonEncodedSizeOf};
 
 use crate::{
     codecs::Transformer,
@@ -51,7 +52,7 @@ impl EventCount for ProcessedEvent {
 }
 
 impl GetEventCountTags for ProcessedEvent {
-    fn get_tags(&self) -> EventCountTags {
+    fn get_tags(&self) -> TaggedEventsSent {
         self.log.get_tags()
     }
 }
@@ -68,12 +69,15 @@ impl Encoder<Vec<ProcessedEvent>> for ElasticsearchEncoder {
         &self,
         input: Vec<ProcessedEvent>,
         writer: &mut dyn Write,
-    ) -> std::io::Result<usize> {
+    ) -> std::io::Result<(usize, GroupedCountByteSize)> {
         let mut written_bytes = 0;
+        let mut byte_size = telemetry().create_request_count_byte_size();
         for event in input {
             let log = {
                 let mut event = Event::from(event.log);
                 self.transformer.transform(&mut event);
+                byte_size.add_event(&event, event.estimated_json_encoded_size_of());
+
                 event.into_log()
             };
             written_bytes += write_bulk_action(
@@ -92,7 +96,8 @@ impl Encoder<Vec<ProcessedEvent>> for ElasticsearchEncoder {
                     Ok(())
                 })?;
         }
-        Ok(written_bytes)
+
+        Ok((written_bytes, byte_size))
     }
 }
 
diff --git a/src/sinks/elasticsearch/integration_tests.rs b/src/sinks/elasticsearch/integration_tests.rs
index 53ea850ed19e9..40c76124ea70d 100644
--- a/src/sinks/elasticsearch/integration_tests.rs
+++ b/src/sinks/elasticsearch/integration_tests.rs
@@ -8,7 +8,7 @@ use futures::{future::ready, stream};
 use http::{Request, StatusCode};
 use serde_json::{json, Value};
 use vector_core::{
-    config::log_schema,
+    config::{init_telemetry, log_schema, Tags, Telemetry},
     event::{BatchNotifier, BatchStatus, Event, LogEvent},
 };
 
@@ -23,8 +23,8 @@ use crate::{
     },
     test_util::{
         components::{
-            run_and_assert_sink_compliance, run_and_assert_sink_error, COMPONENT_ERROR_TAGS,
-            HTTP_SINK_TAGS,
+            run_and_assert_data_volume_sink_compliance, run_and_assert_sink_compliance,
+            run_and_assert_sink_error, COMPONENT_ERROR_TAGS, DATA_VOLUME_SINK_TAGS, HTTP_SINK_TAGS,
         },
         random_events_with_stream, random_string, trace_init,
     },
@@ -288,7 +288,25 @@ async fn insert_events_over_http() {
             batch: batch_settings(),
             ..Default::default()
         },
-        false,
+        TestType::Normal,
+        BatchStatus::Delivered,
+    )
+    .await;
+}
+
+#[tokio::test]
+async fn insert_events_with_data_volume() {
+    trace_init();
+
+    run_insert_tests(
+        ElasticsearchConfig {
+            endpoints: vec![http_server()],
+            doc_type: "log_lines".into(),
+            compression: Compression::None,
+            batch: batch_settings(),
+            ..Default::default()
+        },
+        TestType::DataVolume,
         BatchStatus::Delivered,
     )
     .await;
@@ -306,7 +324,7 @@ async fn insert_events_over_http_with_gzip_compression() {
             batch: batch_settings(),
             ..Default::default()
         },
-        false,
+        TestType::Normal,
         BatchStatus::Delivered,
     )
     .await;
@@ -332,7 +350,7 @@ async fn insert_events_over_https() {
             batch: batch_settings(),
             ..Default::default()
         },
-        false,
+        TestType::Normal,
         BatchStatus::Delivered,
     )
     .await;
@@ -355,7 +373,7 @@ async fn insert_events_on_aws() {
             batch: batch_settings(),
             ..Default::default()
         },
-        false,
+        TestType::Normal,
         BatchStatus::Delivered,
     )
     .await;
@@ -379,7 +397,7 @@ async fn insert_events_on_aws_with_compression() {
             batch: batch_settings(),
             ..Default::default()
         },
-        false,
+        TestType::Normal,
         BatchStatus::Delivered,
     )
     .await;
@@ -397,7 +415,7 @@ async fn insert_events_with_failure() {
             batch: batch_settings(),
             ..Default::default()
         },
-        true,
+        TestType::Error,
         BatchStatus::Rejected,
     )
     .await;
@@ -415,7 +433,7 @@ async fn insert_events_with_failure_and_gzip_compression() {
             batch: batch_settings(),
             ..Default::default()
         },
-        true,
+        TestType::Error,
         BatchStatus::Rejected,
     )
     .await;
@@ -449,7 +467,7 @@ async fn insert_events_in_data_stream() {
         .await
         .expect("Data stream creation error");
 
-    run_insert_tests_with_config(&cfg, false, BatchStatus::Delivered).await;
+    run_insert_tests_with_config(&cfg, TestType::Normal, BatchStatus::Delivered).await;
 }
 
 #[tokio::test]
@@ -512,14 +530,26 @@ async fn distributed_insert_events_failover() {
 
 async fn run_insert_tests(
     mut config: ElasticsearchConfig,
-    break_events: bool,
+    test_type: TestType,
     status: BatchStatus,
 ) {
+    if test_type == TestType::DataVolume {
+        init_telemetry(
+            Telemetry {
+                tags: Tags {
+                    emit_service: true,
+                    emit_source: true,
+                },
+            },
+            true,
+        );
+    }
+
     config.bulk = BulkConfig {
         index: gen_index(),
         ..Default::default()
     };
-    run_insert_tests_with_config(&config, break_events, status).await;
+    run_insert_tests_with_config(&config, test_type, status).await;
 }
 
 fn create_http_client() -> reqwest::Client {
@@ -537,9 +567,16 @@ fn create_http_client() -> reqwest::Client {
         .expect("Could not build HTTP client")
 }
 
+#[derive(Eq, PartialEq)]
+enum TestType {
+    Error,
+    DataVolume,
+    Normal,
+}
+
 async fn run_insert_tests_with_config(
     config: &ElasticsearchConfig,
-    break_events: bool,
+    test_type: TestType,
     batch_status: BatchStatus,
 ) {
     let common = ElasticsearchCommon::parse_single(config)
@@ -565,22 +602,30 @@ async fn run_insert_tests_with_config(
 
     let (batch, mut receiver) = BatchNotifier::new_with_receiver();
     let (input, events) = random_events_with_stream(100, 100, Some(batch));
-    if break_events {
-        // Break all but the first event to simulate some kind of partial failure
-        let mut doit = false;
-        let events = events.map(move |mut events| {
-            if doit {
-                events.iter_logs_mut().for_each(|log| {
-                    log.insert("_type", 1);
-                });
-            }
-            doit = true;
-            events
-        });
+    match test_type {
+        TestType::Error => {
+            // Break all but the first event to simulate some kind of partial failure
+            let mut doit = false;
+            let events = events.map(move |mut events| {
+                if doit {
+                    events.iter_logs_mut().for_each(|log| {
+                        log.insert("_type", 1);
+                    });
+                }
+                doit = true;
+                events
+            });
+
+            run_and_assert_sink_error(sink, events, &COMPONENT_ERROR_TAGS).await;
+        }
 
-        run_and_assert_sink_error(sink, events, &COMPONENT_ERROR_TAGS).await;
-    } else {
-        run_and_assert_sink_compliance(sink, events, &HTTP_SINK_TAGS).await;
+        TestType::DataVolume => {
+            run_and_assert_data_volume_sink_compliance(sink, events, &DATA_VOLUME_SINK_TAGS).await;
+        }
+
+        TestType::Normal => {
+            run_and_assert_sink_compliance(sink, events, &HTTP_SINK_TAGS).await;
+        }
     }
 
     assert_eq!(receiver.try_recv(), Ok(batch_status));
@@ -607,7 +652,7 @@ async fn run_insert_tests_with_config(
         .or_else(|| response["hits"]["total"].as_u64())
         .expect("Elasticsearch response does not include hits->total nor hits->total->value");
 
-    if break_events {
+    if test_type == TestType::Error {
         assert_ne!(input.len() as u64, total);
     } else {
         assert_eq!(input.len() as u64, total);
diff --git a/src/sinks/elasticsearch/tests.rs b/src/sinks/elasticsearch/tests.rs
index da0d3cecea965..f2672228abfe3 100644
--- a/src/sinks/elasticsearch/tests.rs
+++ b/src/sinks/elasticsearch/tests.rs
@@ -49,7 +49,7 @@ async fn sets_create_action_when_configured() {
     log.insert("action", "crea");
 
     let mut encoded = vec![];
-    let encoded_size = es
+    let (encoded_size, _json_size) = es
         .request_builder
         .encoder
         .encode_input(
@@ -65,10 +65,25 @@ async fn sets_create_action_when_configured() {
     assert_eq!(encoded.len(), encoded_size);
 }
 
-fn data_stream_body() -> BTreeMap<String, Value> {
+fn data_stream_body(
+    dtype: Option<String>,
+    dataset: Option<String>,
+    namespace: Option<String>,
+) -> BTreeMap<String, Value> {
     let mut ds = BTreeMap::<String, Value>::new();
-    ds.insert("type".into(), Value::from("synthetics"));
-    ds.insert("dataset".into(), Value::from("testing"));
+
+    if let Some(dtype) = dtype {
+        ds.insert("type".into(), Value::from(dtype));
+    }
+
+    if let Some(dataset) = dataset {
+        ds.insert("dataset".into(), Value::from(dataset));
+    }
+
+    if let Some(namespace) = namespace {
+        ds.insert("namespace".into(), Value::from(namespace));
+    }
+
     ds
 }
 
@@ -100,10 +115,17 @@ async fn encode_datastream_mode() {
             .single()
             .expect("invalid timestamp"),
     );
-    log.insert("data_stream", data_stream_body());
+    log.insert(
+        "data_stream",
+        data_stream_body(
+            Some("synthetics".to_string()),
+            Some("testing".to_string()),
+            None,
+        ),
+    );
 
     let mut encoded = vec![];
-    let encoded_size = es
+    let (encoded_size, _json_size) = es
         .request_builder
         .encoder
         .encode_input(
@@ -143,7 +165,14 @@ async fn encode_datastream_mode_no_routing() {
     let es = ElasticsearchCommon::parse_single(&config).await.unwrap();
 
     let mut log = LogEvent::from("hello there");
-    log.insert("data_stream", data_stream_body());
+    log.insert(
+        "data_stream",
+        data_stream_body(
+            Some("synthetics".to_string()),
+            Some("testing".to_string()),
+            None,
+        ),
+    );
     log.insert(
         (
             lookup::PathPrefix::Event,
@@ -154,7 +183,7 @@ async fn encode_datastream_mode_no_routing() {
             .expect("invalid timestamp"),
     );
     let mut encoded = vec![];
-    let encoded_size = es
+    let (encoded_size, _json_size) = es
         .request_builder
         .encoder
         .encode_input(
@@ -287,7 +316,14 @@ async fn encode_datastream_mode_no_sync() {
     let es = ElasticsearchCommon::parse_single(&config).await.unwrap();
 
     let mut log = LogEvent::from("hello there");
-    log.insert("data_stream", data_stream_body());
+    log.insert(
+        "data_stream",
+        data_stream_body(
+            Some("synthetics".to_string()),
+            Some("testing".to_string()),
+            None,
+        ),
+    );
     log.insert(
         (
             lookup::PathPrefix::Event,
@@ -299,7 +335,7 @@ async fn encode_datastream_mode_no_sync() {
     );
 
     let mut encoded = vec![];
-    let encoded_size = es
+    let (encoded_size, _json_size) = es
         .request_builder
         .encoder
         .encode_input(
@@ -339,7 +375,7 @@ async fn allows_using_except_fields() {
     log.insert("idx", "purple");
 
     let mut encoded = vec![];
-    let encoded_size = es
+    let (encoded_size, _json_size) = es
         .request_builder
         .encoder
         .encode_input(
@@ -374,7 +410,7 @@ async fn allows_using_only_fields() {
     log.insert("idx", "purple");
 
     let mut encoded = vec![];
-    let encoded_size = es
+    let (encoded_size, _json_size) = es
         .request_builder
         .encoder
         .encode_input(
@@ -389,3 +425,122 @@ async fn allows_using_only_fields() {
     assert_eq!(std::str::from_utf8(&encoded).unwrap(), expected);
     assert_eq!(encoded.len(), encoded_size);
 }
+
+#[tokio::test]
+async fn datastream_index_name() {
+    #[derive(Clone, Debug)]
+    struct TestCase {
+        dtype: Option<String>,
+        namespace: Option<String>,
+        dataset: Option<String>,
+        want: String,
+    }
+
+    let config = ElasticsearchConfig {
+        bulk: BulkConfig {
+            index: parse_template("vector"),
+            ..Default::default()
+        },
+        endpoints: vec![String::from("https://example.com")],
+        mode: ElasticsearchMode::DataStream,
+        api_version: ElasticsearchApiVersion::V6,
+        ..Default::default()
+    };
+    let es = ElasticsearchCommon::parse_single(&config).await.unwrap();
+
+    let test_cases = [
+        TestCase {
+            dtype: Some("type".to_string()),
+            dataset: Some("dataset".to_string()),
+            namespace: Some("namespace".to_string()),
+            want: "type-dataset-namespace".to_string(),
+        },
+        TestCase {
+            dtype: Some("type".to_string()),
+            dataset: Some("".to_string()),
+            namespace: Some("namespace".to_string()),
+            want: "type-namespace".to_string(),
+        },
+        TestCase {
+            dtype: Some("type".to_string()),
+            dataset: None,
+            namespace: Some("namespace".to_string()),
+            want: "type-generic-namespace".to_string(),
+        },
+        TestCase {
+            dtype: Some("type".to_string()),
+            dataset: Some("".to_string()),
+            namespace: Some("".to_string()),
+            want: "type".to_string(),
+        },
+        TestCase {
+            dtype: Some("type".to_string()),
+            dataset: None,
+            namespace: None,
+            want: "type-generic-default".to_string(),
+        },
+        TestCase {
+            dtype: Some("".to_string()),
+            dataset: Some("".to_string()),
+            namespace: Some("".to_string()),
+            want: "".to_string(),
+        },
+        TestCase {
+            dtype: None,
+            dataset: None,
+            namespace: None,
+            want: "logs-generic-default".to_string(),
+        },
+        TestCase {
+            dtype: Some("".to_string()),
+            dataset: Some("dataset".to_string()),
+            namespace: Some("namespace".to_string()),
+            want: "dataset-namespace".to_string(),
+        },
+        TestCase {
+            dtype: None,
+            dataset: Some("dataset".to_string()),
+            namespace: Some("namespace".to_string()),
+            want: "logs-dataset-namespace".to_string(),
+        },
+        TestCase {
+            dtype: Some("".to_string()),
+            dataset: Some("".to_string()),
+            namespace: Some("namespace".to_string()),
+            want: "namespace".to_string(),
+        },
+        TestCase {
+            dtype: None,
+            dataset: None,
+            namespace: Some("namespace".to_string()),
+            want: "logs-generic-namespace".to_string(),
+        },
+        TestCase {
+            dtype: Some("".to_string()),
+            dataset: Some("dataset".to_string()),
+            namespace: Some("".to_string()),
+            want: "dataset".to_string(),
+        },
+        TestCase {
+            dtype: None,
+            dataset: Some("dataset".to_string()),
+            namespace: None,
+            want: "logs-dataset-default".to_string(),
+        },
+    ];
+
+    for test_case in test_cases {
+        let mut log = LogEvent::from("hello there");
+        log.insert(
+            "data_stream",
+            data_stream_body(
+                test_case.dtype.clone(),
+                test_case.dataset.clone(),
+                test_case.namespace.clone(),
+            ),
+        );
+
+        let processed_event = process_log(log, &es.mode, &None, &config.encoding).unwrap();
+        assert_eq!(processed_event.index, test_case.want, "{test_case:?}");
+    }
+}
diff --git a/src/sinks/file/mod.rs b/src/sinks/file/mod.rs
index 04f166aa986fb..3a2261e517b3e 100644
--- a/src/sinks/file/mod.rs
+++ b/src/sinks/file/mod.rs
@@ -556,36 +556,37 @@ mod tests {
             lines_from_file(directory.join("errors-2019-29-07.log")),
         ];
 
+        let message_key = log_schema().message_key().unwrap().to_string();
         assert_eq!(
-            input[0].as_log()[log_schema().message_key()],
+            input[0].as_log()[&message_key],
             From::<&str>::from(&output[0][0])
         );
         assert_eq!(
-            input[1].as_log()[log_schema().message_key()],
+            input[1].as_log()[&message_key],
             From::<&str>::from(&output[1][0])
         );
         assert_eq!(
-            input[2].as_log()[log_schema().message_key()],
+            input[2].as_log()[&message_key],
             From::<&str>::from(&output[0][1])
         );
         assert_eq!(
-            input[3].as_log()[log_schema().message_key()],
+            input[3].as_log()[&message_key],
             From::<&str>::from(&output[3][0])
         );
         assert_eq!(
-            input[4].as_log()[log_schema().message_key()],
+            input[4].as_log()[&message_key],
             From::<&str>::from(&output[2][0])
         );
         assert_eq!(
-            input[5].as_log()[log_schema().message_key()],
+            input[5].as_log()[&message_key],
             From::<&str>::from(&output[2][1])
         );
         assert_eq!(
-            input[6].as_log()[log_schema().message_key()],
+            input[6].as_log()[&message_key],
             From::<&str>::from(&output[4][0])
         );
         assert_eq!(
-            input[7].as_log()[log_schema().message_key()],
+            input[7].as_log()[message_key],
             From::<&str>::from(&output[5][0])
         );
     }
diff --git a/src/sinks/gcp/chronicle_unstructured.rs b/src/sinks/gcp/chronicle_unstructured.rs
index 817f2249a1ba2..afadcad8d4f3d 100644
--- a/src/sinks/gcp/chronicle_unstructured.rs
+++ b/src/sinks/gcp/chronicle_unstructured.rs
@@ -13,12 +13,13 @@ use snafu::Snafu;
 use std::io;
 use tokio_util::codec::Encoder as _;
 use tower::{Service, ServiceBuilder};
-use vector_common::request_metadata::{MetaDescriptive, RequestMetadata};
+use vector_common::request_metadata::{GroupedCountByteSize, MetaDescriptive, RequestMetadata};
 use vector_config::configurable_component;
 use vector_core::{
-    config::{AcknowledgementsConfig, Input},
+    config::{telemetry, AcknowledgementsConfig, Input},
     event::{Event, EventFinalizers, Finalizable},
     sink::VectorSink,
+    EstimatedJsonEncodedSizeOf,
 };
 use vrl::value::Kind;
 
@@ -326,9 +327,10 @@ impl Encoder<(String, Vec<Event>)> for ChronicleEncoder {
         &self,
         input: (String, Vec<Event>),
         writer: &mut dyn io::Write,
-    ) -> io::Result<usize> {
+    ) -> io::Result<(usize, GroupedCountByteSize)> {
         let (partition_key, events) = input;
         let mut encoder = self.encoder.clone();
+        let mut byte_size = telemetry().create_request_count_byte_size();
         let events = events
             .into_iter()
             .filter_map(|mut event| {
@@ -339,6 +341,9 @@ impl Encoder<(String, Vec<Event>)> for ChronicleEncoder {
                     .cloned();
                 let mut bytes = BytesMut::new();
                 self.transformer.transform(&mut event);
+
+                byte_size.add_event(&event, event.estimated_json_encoded_size_of());
+
                 encoder.encode(event, &mut bytes).ok()?;
 
                 let mut value = json!({
@@ -368,7 +373,7 @@ impl Encoder<(String, Vec<Event>)> for ChronicleEncoder {
             Ok(())
         })?;
 
-        Ok(size)
+        Ok((size, byte_size))
     }
 }
 
@@ -582,12 +587,10 @@ mod integration_tests {
         trace_init();
 
         let log_type = random_string(10);
-        let (sink, healthcheck) = config_build(
-            &log_type,
-            "/home/vector/scripts/integration/chronicle/auth.json",
-        )
-        .await
-        .expect("Building sink failed");
+        let (sink, healthcheck) =
+            config_build(&log_type, "/home/vector/scripts/integration/gcp/auth.json")
+                .await
+                .expect("Building sink failed");
 
         healthcheck.await.expect("Health check failed");
 
@@ -617,11 +620,13 @@ mod integration_tests {
         // Test with an auth file that doesnt match the public key sent to the dummy chronicle server.
         let sink = config_build(
             &log_type,
-            "/home/vector/scripts/integration/chronicle/invalidauth.json",
+            "/home/vector/scripts/integration/gcp/invalidauth.json",
         )
         .await;
 
-        assert!(sink.is_err())
+        // This differs from upstream. `build` is coded to warn on auth errors, but allow the build to continue.
+        // Actual sink errors are left up to the healthcheck.
+        assert!(sink.is_ok())
     }
 
     #[tokio::test]
@@ -631,12 +636,10 @@ mod integration_tests {
         // The chronicle-emulator we are testing against is setup so a `log_type` of "INVALID"
         // will return a `400 BAD_REQUEST`.
         let log_type = "INVALID";
-        let (sink, healthcheck) = config_build(
-            log_type,
-            "/home/vector/scripts/integration/chronicle/auth.json",
-        )
-        .await
-        .expect("Building sink failed");
+        let (sink, healthcheck) =
+            config_build(log_type, "/home/vector/scripts/integration/gcp/auth.json")
+                .await
+                .expect("Building sink failed");
 
         healthcheck.await.expect("Health check failed");
 
diff --git a/src/sinks/gcp/cloud_storage.rs b/src/sinks/gcp/cloud_storage.rs
index ae64e14e9dd46..93dcaf2040801 100644
--- a/src/sinks/gcp/cloud_storage.rs
+++ b/src/sinks/gcp/cloud_storage.rs
@@ -424,6 +424,15 @@ fn make_header((name, value): (&String, &String)) -> crate::Result<(HeaderName,
 
 #[cfg(test)]
 mod tests {
+    use codecs::encoding::FramingConfig;
+    use codecs::{
+        JsonSerializerConfig, MetricTagValues, NewlineDelimitedEncoderConfig, TextSerializerConfig,
+    };
+    use futures_util::{future::ready, stream};
+    use vector_common::request_metadata::GroupedCountByteSize;
+    use vector_core::partition::Partitioner;
+    use vector_core::EstimatedJsonEncodedSizeOf;
+
     use crate::event::LogEvent;
     use crate::mezmo::reshape_log_event_by_message;
     use crate::test_util::{
@@ -432,13 +441,7 @@ mod tests {
         random_message_object_events_with_stream,
     };
     use assay::assay;
-    use codecs::encoding::FramingConfig;
-    use codecs::{
-        JsonSerializerConfig, MetricTagValues, NewlineDelimitedEncoderConfig, TextSerializerConfig,
-    };
-    use futures_util::{future::ready, stream};
     use serde_json;
-    use vector_core::partition::Partitioner;
 
     use super::*;
 
@@ -518,11 +521,14 @@ mod tests {
             .unwrap()
             .partition(&log)
             .expect("key wasn't provided");
+
+        let mut byte_size = GroupedCountByteSize::new_untagged();
+        byte_size.add_event(&log, log.estimated_json_encoded_size_of());
+
         let request_settings = request_settings(&sink_config);
         let (metadata, metadata_request_builder, _events) =
             request_settings.split_input((key, vec![log]));
-
-        let payload = EncodeResult::uncompressed(Bytes::new());
+        let payload = EncodeResult::uncompressed(Bytes::new(), byte_size);
         let request_metadata = metadata_request_builder.build(&payload);
 
         request_settings.build_request(metadata, request_metadata, payload)
diff --git a/src/sinks/greptimedb/batch.rs b/src/sinks/greptimedb/batch.rs
new file mode 100644
index 0000000000000..af4ef01096dfb
--- /dev/null
+++ b/src/sinks/greptimedb/batch.rs
@@ -0,0 +1,48 @@
+use vector_core::{
+    event::{Metric, MetricValue},
+    stream::batcher::limiter::ItemBatchSize,
+};
+
+use super::request_builder::{
+    DISTRIBUTION_QUANTILES, DISTRIBUTION_STAT_FIELD_COUNT, SUMMARY_STAT_FIELD_COUNT,
+};
+
+const F64_BYTE_SIZE: usize = 8;
+const I64_BYTE_SIZE: usize = 8;
+
+#[derive(Default)]
+pub(super) struct GreptimeDBBatchSizer;
+
+impl GreptimeDBBatchSizer {
+    pub(super) fn estimated_size_of(&self, item: &Metric) -> usize {
+        // Metric name.
+        item.series().name().name().len()
+        // Metric namespace, with an additional 1 to account for the namespace separator.
+        + item.series().name().namespace().map(|s| s.len() + 1).unwrap_or(0)
+        // Metric tags, with an additional 1 per tag to account for the tag key/value separator.
+        + item.series().tags().map(|t| {
+            t.iter_all().map(|(k, v)| {
+                k.len() + 1 + v.map(|v| v.len()).unwrap_or(0)
+            })
+            .sum()
+        })
+            .unwrap_or(0)
+            // timestamp
+            + I64_BYTE_SIZE
+            +
+        // value size
+            match item.value() {
+                MetricValue::Counter { .. } | MetricValue::Gauge { .. } | MetricValue::Set { ..} => F64_BYTE_SIZE,
+                MetricValue::Distribution { .. } => F64_BYTE_SIZE * (DISTRIBUTION_QUANTILES.len() + DISTRIBUTION_STAT_FIELD_COUNT),
+                MetricValue::AggregatedHistogram { buckets, .. }  => F64_BYTE_SIZE * (buckets.len() + SUMMARY_STAT_FIELD_COUNT),
+                MetricValue::AggregatedSummary { quantiles, .. } => F64_BYTE_SIZE * (quantiles.len() + SUMMARY_STAT_FIELD_COUNT),
+                MetricValue::Sketch { .. } => F64_BYTE_SIZE * (DISTRIBUTION_QUANTILES.len() + DISTRIBUTION_STAT_FIELD_COUNT),
+            }
+    }
+}
+
+impl ItemBatchSize<Metric> for GreptimeDBBatchSizer {
+    fn size(&self, item: &Metric) -> usize {
+        self.estimated_size_of(item)
+    }
+}
diff --git a/src/sinks/greptimedb/integration_tests.rs b/src/sinks/greptimedb/integration_tests.rs
new file mode 100644
index 0000000000000..598c49e1b1e23
--- /dev/null
+++ b/src/sinks/greptimedb/integration_tests.rs
@@ -0,0 +1,88 @@
+use chrono::{DateTime, Duration, Utc};
+use futures::stream;
+use vector_core::event::{Event, Metric, MetricKind, MetricValue};
+use vector_core::metric_tags;
+
+use crate::sinks::util::test::load_sink;
+use crate::{
+    config::{SinkConfig, SinkContext},
+    test_util::{
+        components::{run_and_assert_sink_compliance, SINK_TAGS},
+        trace_init,
+    },
+};
+
+use super::GreptimeDBConfig;
+
+#[tokio::test]
+async fn test_greptimedb_sink() {
+    trace_init();
+    let cfg = format!(
+        r#"endpoint= "{}"
+"#,
+        std::env::var("GREPTIMEDB_ENDPOINT").unwrap_or_else(|_| "localhost:4001".to_owned())
+    );
+
+    let (config, _) = load_sink::<GreptimeDBConfig>(&cfg).unwrap();
+    let (sink, _hc) = config.build(SinkContext::default()).await.unwrap();
+
+    let query_client = query_client();
+
+    // Drop the table and data inside
+    let _ = query_client
+        .get(&format!(
+            "{}/v1/sql",
+            std::env::var("GREPTIMEDB_HTTP").unwrap_or_else(|_| "http://localhost:4000".to_owned())
+        ))
+        .query(&[("sql", "DROP TABLE ns_my_counter")])
+        .send()
+        .await
+        .unwrap();
+
+    let base_time = Utc::now();
+    let events: Vec<_> = (0..10).map(|idx| create_event(idx, base_time)).collect();
+    run_and_assert_sink_compliance(sink, stream::iter(events), &SINK_TAGS).await;
+
+    let query_response = query_client
+        .get(&format!(
+            "{}/v1/sql",
+            std::env::var("GREPTIMEDB_HTTP").unwrap_or_else(|_| "http://localhost:4000".to_owned())
+        ))
+        .query(&[("sql", "SELECT region, val FROM ns_my_counter")])
+        .send()
+        .await
+        .unwrap()
+        .text()
+        .await
+        .expect("Fetch json from greptimedb failed");
+    let result: serde_json::Value =
+        serde_json::from_str(&query_response).expect("Invalid json returned from greptimedb query");
+    assert_eq!(
+        result
+            .pointer("/output/0/records/rows")
+            .and_then(|v| v.as_array())
+            .expect("Error getting greptimedb response array")
+            .len(),
+        10
+    )
+}
+
+fn query_client() -> reqwest::Client {
+    reqwest::Client::builder().build().unwrap()
+}
+
+fn create_event(i: i32, base_time: DateTime<Utc>) -> Event {
+    Event::Metric(
+        Metric::new(
+            "my_counter".to_owned(),
+            MetricKind::Incremental,
+            MetricValue::Counter { value: i as f64 },
+        )
+        .with_namespace(Some("ns"))
+        .with_tags(Some(metric_tags!(
+            "region" => "us-west-1",
+            "production" => "true",
+        )))
+        .with_timestamp(Some(base_time + Duration::seconds(i as i64))),
+    )
+}
diff --git a/src/sinks/greptimedb/mod.rs b/src/sinks/greptimedb/mod.rs
new file mode 100644
index 0000000000000..af0588e34b12b
--- /dev/null
+++ b/src/sinks/greptimedb/mod.rs
@@ -0,0 +1,175 @@
+//! `GreptimeDB` sink for vector.
+//!
+//! This sink writes Vector's metric data into
+//! [GreptimeDB](https://github.com/greptimeteam/greptimedb), a cloud-native
+//! time-series database. It uses GreptimeDB's [gRPC
+//! API](https://docs.greptime.com/user-guide/write-data/grpc) and GreptimeDB's
+//! [rust client](https://github.com/GreptimeTeam/greptimedb-client-rust).
+//!
+//! This sink transforms metrics into GreptimeDB table using following rules:
+//!
+//! - Table name: `{namespace}_{metric_name}`. If the metric doesn't have a
+//! namespace, we will use metric_name for table name.
+//! - Timestamp: timestamp is stored as a column called `ts`.
+//! - Tags: metric tags are stored as string columns with its name as column
+//! name
+//! - Counter and Gauge: the value of counter and gauge are stored in a column
+//! called `val`
+//! - Set: the number of set items is stored in a column called `val`.
+//! - Distribution, Histogram and Summary, Sketch: Statistical attributes like
+//! `sum`, `count`, "max", "min", quantiles and buckets are stored as columns.
+//!
+use greptimedb_client::Client;
+use snafu::Snafu;
+use vector_common::sensitive_string::SensitiveString;
+
+use crate::sinks::prelude::*;
+
+use self::service::GreptimeDBRetryLogic;
+
+mod batch;
+#[cfg(all(test, feature = "greptimedb-integration-tests"))]
+mod integration_tests;
+mod request_builder;
+mod service;
+mod sink;
+
+#[derive(Clone, Copy, Debug, Default)]
+pub struct GreptimeDBDefaultBatchSettings;
+
+impl SinkBatchSettings for GreptimeDBDefaultBatchSettings {
+    const MAX_EVENTS: Option<usize> = Some(20);
+    const MAX_BYTES: Option<usize> = None;
+    const TIMEOUT_SECS: f64 = 1.0;
+}
+
+fn default_dbname() -> String {
+    greptimedb_client::DEFAULT_SCHEMA_NAME.to_string()
+}
+
+/// Configuration items for GreptimeDB
+#[configurable_component(sink("greptimedb", "Ingest metrics data into GreptimeDB."))]
+#[derive(Clone, Debug, Derivative)]
+#[derivative(Default)]
+#[serde(deny_unknown_fields)]
+pub struct GreptimeDBConfig {
+    /// The GreptimeDB [database][database] name to connect.
+    ///
+    /// Default to `public`, the default database of GreptimeDB.
+    ///
+    /// Database can be created via `create database` statement on
+    /// GreptimeDB. If you are using GreptimeCloud, use `dbname` from the
+    /// connection information of your instance.
+    ///
+    /// [database]: https://docs.greptime.com/user-guide/concepts/key-concepts#database
+    #[configurable(metadata(docs::examples = "public"))]
+    #[derivative(Default(value = "default_dbname()"))]
+    #[serde(default = "default_dbname")]
+    pub dbname: String,
+    /// The host and port of GreptimeDB gRPC service.
+    ///
+    /// This sink uses GreptimeDB's gRPC interface for data ingestion. By
+    /// default, GreptimeDB listens to port 4001 for gRPC protocol.
+    ///
+    /// The address _must_ include a port.
+    #[configurable(metadata(docs::examples = "example.com:4001"))]
+    #[configurable(metadata(
+        docs::examples = "1nge17d2r3ns.ap-southeast-1.aws.greptime.cloud:4001"
+    ))]
+    pub endpoint: String,
+    /// The username for your GreptimeDB instance.
+    ///
+    /// This is required if your instance has authentication enabled.
+    #[configurable(metadata(docs::examples = "username"))]
+    #[serde(default)]
+    pub username: Option<String>,
+    /// The password for your GreptimeDB instance.
+    ///
+    /// This is required if your instance has authentication enabled.
+    #[configurable(metadata(docs::examples = "password"))]
+    #[serde(default)]
+    pub password: Option<SensitiveString>,
+
+    #[configurable(derived)]
+    #[serde(default)]
+    pub request: TowerRequestConfig,
+
+    #[configurable(derived)]
+    #[serde(default)]
+    pub batch: BatchConfig<GreptimeDBDefaultBatchSettings>,
+
+    #[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)]
+    pub tls: Option<TlsConfig>,
+}
+
+impl_generate_config_from_default!(GreptimeDBConfig);
+
+#[typetag::serde(name = "greptimedb")]
+#[async_trait::async_trait]
+impl SinkConfig for GreptimeDBConfig {
+    async fn build(&self, _cx: SinkContext) -> crate::Result<(VectorSink, Healthcheck)> {
+        let request_settings = self.request.unwrap_with(&TowerRequestConfig::default());
+        let service = ServiceBuilder::new()
+            .settings(request_settings, GreptimeDBRetryLogic)
+            .service(service::GreptimeDBService::try_new(self)?);
+        let sink = sink::GreptimeDBSink {
+            service,
+            batch_settings: self.batch.into_batcher_settings()?,
+        };
+
+        let healthcheck = healthcheck(self)?;
+        Ok((VectorSink::from_event_streamsink(sink), healthcheck))
+    }
+
+    fn input(&self) -> Input {
+        Input::metric()
+    }
+
+    fn acknowledgements(&self) -> &AcknowledgementsConfig {
+        &self.acknowledgements
+    }
+}
+
+fn healthcheck(config: &GreptimeDBConfig) -> crate::Result<super::Healthcheck> {
+    let client = Client::with_urls(vec![&config.endpoint]);
+
+    Ok(async move { client.health_check().await.map_err(|error| error.into()) }.boxed())
+}
+
+#[derive(Debug, Snafu)]
+pub enum GreptimeDBConfigError {
+    #[snafu(display("greptimedb TLS Config Error: missing key"))]
+    TlsMissingKey,
+    #[snafu(display("greptimedb TLS Config Error: missing cert"))]
+    TlsMissingCert,
+}
+
+#[cfg(test)]
+mod tests {
+    use indoc::indoc;
+
+    use super::*;
+
+    #[test]
+    fn generate_config() {
+        crate::test_util::test_generate_config::<GreptimeDBConfig>();
+    }
+
+    #[test]
+    fn test_config_with_username() {
+        let config = indoc! {r#"
+            endpoint = "foo-bar.ap-southeast-1.aws.greptime.cloud:4001"
+            dbname = "foo-bar"
+        "#};
+
+        toml::from_str::<GreptimeDBConfig>(config).unwrap();
+    }
+}
diff --git a/src/sinks/greptimedb/request_builder.rs b/src/sinks/greptimedb/request_builder.rs
new file mode 100644
index 0000000000000..06c92059c6f4e
--- /dev/null
+++ b/src/sinks/greptimedb/request_builder.rs
@@ -0,0 +1,363 @@
+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 crate::sinks::util::statistic::DistributionStatistic;
+
+pub(super) const DISTRIBUTION_QUANTILES: [f64; 5] = [0.5, 0.75, 0.90, 0.95, 0.99];
+pub(super) const DISTRIBUTION_STAT_FIELD_COUNT: usize = 5;
+pub(super) const SUMMARY_STAT_FIELD_COUNT: usize = 2;
+
+fn f64_field(name: &str, value: f64) -> Column {
+    Column {
+        column_name: name.to_owned(),
+        values: Some(column::Values {
+            f64_values: vec![value],
+            ..Default::default()
+        }),
+        semantic_type: SemanticType::Field as i32,
+        datatype: ColumnDataType::Float64 as i32,
+        ..Default::default()
+    }
+}
+
+fn ts_column(name: &str, value: i64) -> Column {
+    Column {
+        column_name: name.to_owned(),
+        values: Some(column::Values {
+            ts_millisecond_values: vec![value],
+            ..Default::default()
+        }),
+        semantic_type: SemanticType::Timestamp as i32,
+        datatype: ColumnDataType::TimestampMillisecond as i32,
+        ..Default::default()
+    }
+}
+
+fn tag_column(name: &str, value: &str) -> Column {
+    Column {
+        column_name: name.to_owned(),
+        values: Some(column::Values {
+            string_values: vec![value.to_owned()],
+            ..Default::default()
+        }),
+        semantic_type: SemanticType::Tag as i32,
+        datatype: ColumnDataType::String as i32,
+        ..Default::default()
+    }
+}
+
+pub(super) fn metric_to_insert_request(metric: Metric) -> InsertRequest {
+    let ns = metric.namespace();
+    let metric_name = metric.name();
+    let table_name = if let Some(ns) = ns {
+        format!("{ns}_{metric_name}")
+    } else {
+        metric_name.to_owned()
+    };
+
+    let mut columns = Vec::new();
+    // timestamp
+    let timestamp = metric
+        .timestamp()
+        .map(|t| t.timestamp_millis())
+        .unwrap_or_else(|| Utc::now().timestamp_millis());
+    columns.push(ts_column("ts", timestamp));
+
+    // tags
+    if let Some(tags) = metric.tags() {
+        for (key, value) in tags.iter_single() {
+            columns.push(tag_column(key, value));
+        }
+    }
+
+    // fields
+    match metric.value() {
+        MetricValue::Counter { value } => columns.push(f64_field("val", *value)),
+        MetricValue::Gauge { value } => columns.push(f64_field("val", *value)),
+        MetricValue::Set { values } => columns.push(f64_field("val", values.len() as f64)),
+        MetricValue::Distribution { samples, .. } => {
+            encode_distribution(samples, &mut columns);
+        }
+
+        MetricValue::AggregatedHistogram {
+            buckets,
+            count,
+            sum,
+        } => {
+            encode_histogram(buckets.as_ref(), &mut columns);
+            columns.push(f64_field("count", *count as f64));
+            columns.push(f64_field("sum", *sum));
+        }
+        MetricValue::AggregatedSummary {
+            quantiles,
+            count,
+            sum,
+        } => {
+            encode_quantiles(quantiles.as_ref(), &mut columns);
+            columns.push(f64_field("count", *count as f64));
+            columns.push(f64_field("sum", *sum));
+        }
+        MetricValue::Sketch { sketch } => {
+            let MetricSketch::AgentDDSketch(sketch) = sketch;
+            encode_sketch(sketch, &mut columns);
+        }
+    }
+
+    InsertRequest {
+        table_name,
+        columns,
+        row_count: 1,
+        ..Default::default()
+    }
+}
+
+fn encode_distribution(samples: &[Sample], columns: &mut Vec<Column>) {
+    if let Some(stats) = DistributionStatistic::from_samples(samples, &DISTRIBUTION_QUANTILES) {
+        columns.push(f64_field("min", stats.min));
+        columns.push(f64_field("max", stats.max));
+        columns.push(f64_field("avg", stats.avg));
+        columns.push(f64_field("sum", stats.sum));
+        columns.push(f64_field("count", stats.count as f64));
+
+        for (quantile, value) in stats.quantiles {
+            columns.push(f64_field(&format!("p{:02}", quantile * 100f64), value));
+        }
+    }
+}
+
+fn encode_histogram(buckets: &[Bucket], columns: &mut Vec<Column>) {
+    for bucket in buckets {
+        let column_name = format!("b{}", bucket.upper_limit);
+        columns.push(f64_field(&column_name, bucket.count as f64));
+    }
+}
+
+fn encode_quantiles(quantiles: &[Quantile], columns: &mut Vec<Column>) {
+    for quantile in quantiles {
+        let column_name = format!("p{:02}", quantile.quantile * 100f64);
+        columns.push(f64_field(&column_name, quantile.value));
+    }
+}
+
+fn encode_sketch(sketch: &AgentDDSketch, columns: &mut Vec<Column>) {
+    columns.push(f64_field("count", sketch.count() as f64));
+    if let Some(min) = sketch.min() {
+        columns.push(f64_field("min", min));
+    }
+
+    if let Some(max) = sketch.max() {
+        columns.push(f64_field("max", max));
+    }
+
+    if let Some(sum) = sketch.sum() {
+        columns.push(f64_field("sum", sum));
+    }
+
+    if let Some(avg) = sketch.avg() {
+        columns.push(f64_field("avg", avg));
+    }
+
+    for q in DISTRIBUTION_QUANTILES {
+        if let Some(quantile) = sketch.quantile(q) {
+            let column_name = format!("p{:02}", q * 100f64);
+            columns.push(f64_field(&column_name, quantile));
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+
+    use similar_asserts::assert_eq;
+
+    use super::*;
+    use crate::event::metric::{MetricKind, StatisticKind};
+
+    fn get_column(columns: &[Column], name: &str) -> f64 {
+        let col = columns.iter().find(|c| c.column_name == name).unwrap();
+        *(col.values.as_ref().unwrap().f64_values.first().unwrap())
+    }
+
+    #[test]
+    fn test_metric_data_to_insert_request() {
+        let metric = Metric::new(
+            "load1",
+            MetricKind::Absolute,
+            MetricValue::Gauge { value: 1.1 },
+        )
+        .with_namespace(Some("ns"))
+        .with_tags(Some([("host".to_owned(), "my_host".to_owned())].into()))
+        .with_timestamp(Some(Utc::now()));
+
+        let insert = metric_to_insert_request(metric);
+
+        assert_eq!(insert.table_name, "ns_load1");
+        assert_eq!(insert.row_count, 1);
+        assert_eq!(insert.columns.len(), 3);
+
+        let column_names = insert
+            .columns
+            .iter()
+            .map(|c| c.column_name.as_ref())
+            .collect::<Vec<&str>>();
+        assert!(column_names.contains(&"ts"));
+        assert!(column_names.contains(&"host"));
+        assert!(column_names.contains(&"val"));
+
+        assert_eq!(get_column(&insert.columns, "val"), 1.1);
+
+        let metric2 = Metric::new(
+            "load1",
+            MetricKind::Absolute,
+            MetricValue::Gauge { value: 1.1 },
+        );
+        let insert2 = metric_to_insert_request(metric2);
+        assert_eq!(insert2.table_name, "load1");
+    }
+
+    #[test]
+    fn test_counter() {
+        let metric = Metric::new(
+            "cpu_seconds_total",
+            MetricKind::Incremental,
+            MetricValue::Counter { value: 1.1 },
+        );
+        let insert = metric_to_insert_request(metric);
+        assert_eq!(insert.columns.len(), 2);
+
+        assert_eq!(get_column(&insert.columns, "val"), 1.1);
+    }
+
+    #[test]
+    fn test_set() {
+        let metric = Metric::new(
+            "cpu_seconds_total",
+            MetricKind::Absolute,
+            MetricValue::Set {
+                values: ["foo".to_owned(), "bar".to_owned()].into_iter().collect(),
+            },
+        );
+        let insert = metric_to_insert_request(metric);
+        assert_eq!(insert.columns.len(), 2);
+
+        assert_eq!(get_column(&insert.columns, "val"), 2.0);
+    }
+
+    #[test]
+    fn test_distribution() {
+        let metric = Metric::new(
+            "cpu_seconds_total",
+            MetricKind::Incremental,
+            MetricValue::Distribution {
+                samples: vector_core::samples![1.0 => 2, 2.0 => 4, 3.0 => 2],
+                statistic: StatisticKind::Histogram,
+            },
+        );
+        let insert = metric_to_insert_request(metric);
+        assert_eq!(
+            insert.columns.len(),
+            1 + DISTRIBUTION_STAT_FIELD_COUNT + DISTRIBUTION_QUANTILES.len()
+        );
+
+        assert_eq!(get_column(&insert.columns, "max"), 3.0);
+        assert_eq!(get_column(&insert.columns, "min"), 1.0);
+        assert_eq!(get_column(&insert.columns, "avg"), 2.0);
+        assert_eq!(get_column(&insert.columns, "sum"), 16.0);
+        assert_eq!(get_column(&insert.columns, "count"), 8.0);
+        assert_eq!(get_column(&insert.columns, "p50"), 2.0);
+        assert_eq!(get_column(&insert.columns, "p75"), 2.0);
+        assert_eq!(get_column(&insert.columns, "p90"), 3.0);
+        assert_eq!(get_column(&insert.columns, "p95"), 3.0);
+        assert_eq!(get_column(&insert.columns, "p99"), 3.0);
+    }
+
+    #[test]
+    fn test_histogram() {
+        let buckets = vector_core::buckets![1.0 => 1, 2.0 => 2, 3.0 => 1];
+        let buckets_len = buckets.len();
+        let metric = Metric::new(
+            "cpu_seconds_total",
+            MetricKind::Incremental,
+            MetricValue::AggregatedHistogram {
+                buckets,
+                count: 4,
+                sum: 8.0,
+            },
+        );
+        let insert = metric_to_insert_request(metric);
+        assert_eq!(
+            insert.columns.len(),
+            1 + SUMMARY_STAT_FIELD_COUNT + buckets_len
+        );
+
+        assert_eq!(get_column(&insert.columns, "b1"), 1.0);
+        assert_eq!(get_column(&insert.columns, "b2"), 2.0);
+        assert_eq!(get_column(&insert.columns, "b3"), 1.0);
+        assert_eq!(get_column(&insert.columns, "count"), 4.0);
+        assert_eq!(get_column(&insert.columns, "sum"), 8.0);
+    }
+
+    #[test]
+    fn test_summary() {
+        let quantiles = vector_core::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",
+            MetricKind::Incremental,
+            MetricValue::AggregatedSummary {
+                quantiles,
+                count: 6,
+                sum: 12.0,
+            },
+        );
+
+        let insert = metric_to_insert_request(metric);
+        assert_eq!(
+            insert.columns.len(),
+            1 + SUMMARY_STAT_FIELD_COUNT + quantiles_len
+        );
+
+        assert_eq!(get_column(&insert.columns, "p01"), 1.5);
+        assert_eq!(get_column(&insert.columns, "p50"), 2.0);
+        assert_eq!(get_column(&insert.columns, "p99"), 3.0);
+        assert_eq!(get_column(&insert.columns, "count"), 6.0);
+        assert_eq!(get_column(&insert.columns, "sum"), 12.0);
+    }
+
+    #[test]
+    fn test_sketch() {
+        let mut sketch = AgentDDSketch::with_agent_defaults();
+        let samples = 10;
+        for i in 0..samples {
+            sketch.insert(i as f64);
+        }
+
+        let metric = Metric::new(
+            "cpu_seconds_total",
+            MetricKind::Incremental,
+            MetricValue::Sketch {
+                sketch: MetricSketch::AgentDDSketch(sketch),
+            },
+        );
+
+        let insert = metric_to_insert_request(metric);
+        assert_eq!(
+            insert.columns.len(),
+            1 + DISTRIBUTION_QUANTILES.len() + DISTRIBUTION_STAT_FIELD_COUNT
+        );
+
+        assert!(get_column(&insert.columns, "p50") <= 4.0);
+        assert!(get_column(&insert.columns, "p95") > 8.0);
+        assert!(get_column(&insert.columns, "p95") <= 9.0);
+        assert!(get_column(&insert.columns, "p99") > 8.0);
+        assert!(get_column(&insert.columns, "p99") <= 9.0);
+        assert_eq!(get_column(&insert.columns, "count"), samples as f64);
+        assert_eq!(get_column(&insert.columns, "sum"), 45.0);
+        assert_eq!(get_column(&insert.columns, "max"), 9.0);
+        assert_eq!(get_column(&insert.columns, "min"), 0.0);
+    }
+}
diff --git a/src/sinks/greptimedb/service.rs b/src/sinks/greptimedb/service.rs
new file mode 100644
index 0000000000000..6f8278b55d598
--- /dev/null
+++ b/src/sinks/greptimedb/service.rs
@@ -0,0 +1,190 @@
+use std::num::NonZeroUsize;
+use std::sync::Arc;
+use std::task::Poll;
+
+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 crate::sinks::prelude::*;
+
+use super::batch::GreptimeDBBatchSizer;
+use super::request_builder::metric_to_insert_request;
+use super::{GreptimeDBConfig, GreptimeDBConfigError};
+
+#[derive(Clone, Default)]
+pub(super) struct GreptimeDBRetryLogic;
+
+impl RetryLogic for GreptimeDBRetryLogic {
+    type Response = GreptimeDBBatchOutput;
+    type Error = GreptimeError;
+
+    fn is_retriable_error(&self, error: &Self::Error) -> bool {
+        error.is_retriable()
+    }
+}
+
+#[derive(Clone)]
+pub(super) struct GreptimeDBRequest {
+    items: Vec<InsertRequest>,
+    finalizers: EventFinalizers,
+    metadata: RequestMetadata,
+}
+
+impl GreptimeDBRequest {
+    pub(super) fn from_metrics(metrics: Vec<Metric>) -> Self {
+        let mut items = Vec::with_capacity(metrics.len());
+        let mut finalizers = EventFinalizers::default();
+        let mut request_metadata_builder = RequestMetadataBuilder::default();
+
+        let sizer = GreptimeDBBatchSizer;
+        let mut estimated_request_size = 0;
+        for mut metric in metrics.into_iter() {
+            finalizers.merge(metric.take_finalizers());
+            estimated_request_size += sizer.estimated_size_of(&metric);
+
+            request_metadata_builder.track_event(metric.clone());
+
+            items.push(metric_to_insert_request(metric));
+        }
+
+        let request_size =
+            NonZeroUsize::new(estimated_request_size).expect("request should never be zero length");
+
+        GreptimeDBRequest {
+            items,
+            finalizers,
+            metadata: request_metadata_builder.with_request_size(request_size),
+        }
+    }
+}
+
+impl Finalizable for GreptimeDBRequest {
+    fn take_finalizers(&mut self) -> EventFinalizers {
+        std::mem::take(&mut self.finalizers)
+    }
+}
+
+impl MetaDescriptive for GreptimeDBRequest {
+    fn get_metadata(&self) -> &RequestMetadata {
+        &self.metadata
+    }
+
+    fn metadata_mut(&mut self) -> &mut RequestMetadata {
+        &mut self.metadata
+    }
+}
+
+#[derive(Debug)]
+pub struct GreptimeDBBatchOutput {
+    pub item_count: u32,
+    pub metadata: RequestMetadata,
+}
+
+impl DriverResponse for GreptimeDBBatchOutput {
+    fn event_status(&self) -> EventStatus {
+        EventStatus::Delivered
+    }
+
+    fn events_sent(&self) -> &GroupedCountByteSize {
+        self.metadata.events_estimated_json_encoded_byte_size()
+    }
+
+    fn bytes_sent(&self) -> Option<usize> {
+        Some(self.metadata.request_wire_size())
+    }
+}
+
+#[derive(Debug, Clone)]
+pub struct GreptimeDBService {
+    /// the client that connects to greptimedb
+    client: Arc<Database>,
+}
+
+impl GreptimeDBService {
+    pub fn try_new(config: &GreptimeDBConfig) -> crate::Result<Self> {
+        let grpc_client = if let Some(tls_config) = &config.tls {
+            let channel_config = ChannelConfig {
+                client_tls: Self::try_from_tls_config(tls_config)?,
+                ..Default::default()
+            };
+            Client::with_manager_and_urls(
+                ChannelManager::with_tls_config(channel_config).map_err(Box::new)?,
+                vec![&config.endpoint],
+            )
+        } else {
+            Client::with_urls(vec![&config.endpoint])
+        };
+
+        let mut client = Database::new_with_dbname(&config.dbname, grpc_client);
+
+        if let (Some(username), Some(password)) = (&config.username, &config.password) {
+            client.set_auth(AuthScheme::Basic(Basic {
+                username: username.to_owned(),
+                password: password.clone().into(),
+            }))
+        };
+
+        Ok(GreptimeDBService {
+            client: Arc::new(client),
+        })
+    }
+
+    fn try_from_tls_config(tls_config: &TlsConfig) -> crate::Result<Option<ClientTlsOption>> {
+        if let Some(ca_path) = tls_config.ca_file.as_ref() {
+            let cert_path = tls_config
+                .crt_file
+                .as_ref()
+                .ok_or(GreptimeDBConfigError::TlsMissingCert)?;
+            let key_path = tls_config
+                .key_file
+                .as_ref()
+                .ok_or(GreptimeDBConfigError::TlsMissingKey)?;
+
+            if tls_config.key_pass.is_some()
+                || tls_config.alpn_protocols.is_some()
+                || tls_config.verify_certificate.is_some()
+                || tls_config.verify_hostname.is_some()
+            {
+                warn!(
+                    message = "TlsConfig: key_pass, alpn_protocols, verify_certificate and verify_hostname are not supported by greptimedb client at the moment."
+                );
+            }
+
+            Ok(Some(ClientTlsOption {
+                server_ca_cert_path: ca_path.clone(),
+                client_key_path: key_path.clone(),
+                client_cert_path: cert_path.clone(),
+            }))
+        } else {
+            Ok(None)
+        }
+    }
+}
+
+impl Service<GreptimeDBRequest> for GreptimeDBService {
+    type Response = GreptimeDBBatchOutput;
+    type Error = GreptimeError;
+    type Future = BoxFuture<'static, Result<Self::Response, Self::Error>>;
+
+    fn poll_ready(&mut self, _cx: &mut std::task::Context) -> Poll<Result<(), Self::Error>> {
+        Poll::Ready(Ok(()))
+    }
+
+    // Convert vector metrics into GreptimeDB format and send them in batch
+    fn call(&mut self, req: GreptimeDBRequest) -> Self::Future {
+        let client = Arc::clone(&self.client);
+
+        Box::pin(async move {
+            let metadata = req.metadata;
+            let result = client.insert(req.items).await?;
+
+            Ok(GreptimeDBBatchOutput {
+                item_count: result,
+                metadata,
+            })
+        })
+    }
+}
diff --git a/src/sinks/greptimedb/sink.rs b/src/sinks/greptimedb/sink.rs
new file mode 100644
index 0000000000000..fc8e75140708d
--- /dev/null
+++ b/src/sinks/greptimedb/sink.rs
@@ -0,0 +1,55 @@
+use async_trait::async_trait;
+
+use futures::StreamExt;
+use futures_util::stream::BoxStream;
+use vector_core::event::{Metric, MetricValue};
+
+use crate::sinks::prelude::*;
+use crate::sinks::util::buffer::metrics::MetricNormalize;
+use crate::sinks::util::buffer::metrics::MetricSet;
+
+use super::batch::GreptimeDBBatchSizer;
+use super::service::{GreptimeDBRequest, GreptimeDBRetryLogic, GreptimeDBService};
+
+#[derive(Clone, Debug, Default)]
+pub struct GreptimeDBMetricNormalize;
+
+impl MetricNormalize for GreptimeDBMetricNormalize {
+    fn normalize(&mut self, state: &mut MetricSet, metric: Metric) -> Option<Metric> {
+        match (metric.kind(), &metric.value()) {
+            (_, MetricValue::Counter { .. }) => state.make_absolute(metric),
+            (_, MetricValue::Gauge { .. }) => state.make_absolute(metric),
+            // All others are left as-is
+            _ => Some(metric),
+        }
+    }
+}
+
+pub struct GreptimeDBSink {
+    pub(super) service: Svc<GreptimeDBService, GreptimeDBRetryLogic>,
+    pub(super) batch_settings: BatcherSettings,
+}
+
+impl GreptimeDBSink {
+    async fn run_inner(self: Box<Self>, input: BoxStream<'_, Event>) -> Result<(), ()> {
+        input
+            .map(|event| event.into_metric())
+            .normalized_with_default::<GreptimeDBMetricNormalize>()
+            .batched(
+                self.batch_settings
+                    .into_item_size_config(GreptimeDBBatchSizer),
+            )
+            .map(GreptimeDBRequest::from_metrics)
+            .into_driver(self.service)
+            .protocol("grpc")
+            .run()
+            .await
+    }
+}
+
+#[async_trait]
+impl StreamSink<Event> for GreptimeDBSink {
+    async fn run(self: Box<Self>, input: BoxStream<'_, Event>) -> Result<(), ()> {
+        self.run_inner(input).await
+    }
+}
diff --git a/src/sinks/humio/logs.rs b/src/sinks/humio/logs.rs
index b87446ff015f7..617bc9785ec89 100644
--- a/src/sinks/humio/logs.rs
+++ b/src/sinks/humio/logs.rs
@@ -3,7 +3,7 @@ use lookup::lookup_v2::OptionalValuePath;
 use vector_common::sensitive_string::SensitiveString;
 use vector_config::configurable_component;
 
-use super::host_key;
+use super::config_host_key;
 use crate::sinks::splunk_hec::common::config_timestamp_key;
 use crate::{
     codecs::EncodingConfig,
@@ -74,8 +74,8 @@ pub struct HumioLogsConfig {
     /// By default, the [global `log_schema.host_key` option][global_host_key] is used.
     ///
     /// [global_host_key]: https://vector.dev/docs/reference/configuration/global-options/#log_schema.host_key
-    #[serde(default = "host_key")]
-    pub(super) host_key: String,
+    #[serde(default = "config_host_key")]
+    pub(super) host_key: OptionalValuePath,
 
     /// Event fields to be added to Humio’s extra fields.
     ///
@@ -154,7 +154,7 @@ impl GenerateConfig for HumioLogsConfig {
             event_type: None,
             indexed_fields: vec![],
             index: None,
-            host_key: host_key(),
+            host_key: config_host_key(),
             compression: Compression::default(),
             request: TowerRequestConfig::default(),
             batch: BatchConfig::default(),
@@ -223,13 +223,12 @@ mod tests {
 #[cfg(test)]
 #[cfg(feature = "humio-integration-tests")]
 mod integration_tests {
-    use std::{collections::HashMap, convert::TryFrom};
-
     use chrono::{TimeZone, Utc};
     use futures::{future::ready, stream};
     use indoc::indoc;
     use serde::Deserialize;
     use serde_json::{json, Value as JsonValue};
+    use std::{collections::HashMap, convert::TryFrom};
     use tokio::time::Duration;
 
     use super::*;
@@ -262,16 +261,10 @@ mod integration_tests {
         let message = random_string(100);
         let host = "192.168.1.1".to_string();
         let mut event = LogEvent::from(message.clone());
-        event.insert(log_schema().host_key(), host.clone());
+        event.insert(log_schema().host_key_target_path().unwrap(), host.clone());
 
         let ts = Utc.timestamp_nanos(Utc::now().timestamp_millis() * 1_000_000 + 132_456);
-        event.insert(
-            (
-                lookup::PathPrefix::Event,
-                log_schema().timestamp_key().unwrap(),
-            ),
-            ts,
-        );
+        event.insert(log_schema().timestamp_key_target_path().unwrap(), ts);
 
         run_and_assert_sink_compliance(sink, stream::once(ready(event)), &HTTP_SINK_TAGS).await;
 
@@ -387,7 +380,9 @@ mod integration_tests {
             source: None,
             encoding: JsonSerializerConfig::default().into(),
             event_type: None,
-            host_key: log_schema().host_key().to_string(),
+            host_key: OptionalValuePath {
+                path: log_schema().host_key().cloned(),
+            },
             indexed_fields: vec![],
             index: None,
             compression: Compression::None,
diff --git a/src/sinks/humio/metrics.rs b/src/sinks/humio/metrics.rs
index a336f60590aa9..d3ca01cbc33d5 100644
--- a/src/sinks/humio/metrics.rs
+++ b/src/sinks/humio/metrics.rs
@@ -9,7 +9,7 @@ use vector_config::configurable_component;
 use vector_core::sink::StreamSink;
 
 use super::{
-    host_key,
+    config_host_key,
     logs::{HumioLogsConfig, HOST},
 };
 use crate::{
@@ -86,8 +86,8 @@ pub struct HumioMetricsConfig {
     /// By default, the [global `log_schema.host_key` option][global_host_key] is used.
     ///
     /// [global_host_key]: https://vector.dev/docs/reference/configuration/global-options/#log_schema.host_key
-    #[serde(default = "host_key")]
-    host_key: String,
+    #[serde(default = "config_host_key")]
+    host_key: OptionalValuePath,
 
     /// Event fields to be added to Humio’s extra fields.
     ///
diff --git a/src/sinks/humio/mod.rs b/src/sinks/humio/mod.rs
index 4601bbaef5aae..5a4f4f88582f2 100644
--- a/src/sinks/humio/mod.rs
+++ b/src/sinks/humio/mod.rs
@@ -1,6 +1,10 @@
+use lookup::lookup_v2::OptionalValuePath;
+
 pub mod logs;
 pub mod metrics;
 
-fn host_key() -> String {
-    crate::config::log_schema().host_key().to_string()
+pub fn config_host_key() -> OptionalValuePath {
+    OptionalValuePath {
+        path: crate::config::log_schema().host_key().cloned(),
+    }
 }
diff --git a/src/sinks/influxdb/logs.rs b/src/sinks/influxdb/logs.rs
index 35127a59a3fc7..a33547f0618c8 100644
--- a/src/sinks/influxdb/logs.rs
+++ b/src/sinks/influxdb/logs.rs
@@ -4,12 +4,15 @@ use bytes::{Bytes, BytesMut};
 use futures::SinkExt;
 use http::{Request, Uri};
 use indoc::indoc;
-use lookup::lookup_v2::{parse_value_path, OptionalValuePath};
-use lookup::{OwnedValuePath, PathPrefix};
+use vrl::event_path;
+use vrl::path::OwnedValuePath;
+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 vrl::value::Kind;
 
 use crate::{
     codecs::Transformer,
@@ -187,30 +190,24 @@ impl SinkConfig for InfluxDbLogsConfig {
 
         let host_key = self
             .host_key
-            .clone()
-            .and_then(|k| k.path)
-            .unwrap_or_else(|| {
-                parse_value_path(log_schema().host_key())
-                    .expect("global log_schema.host_key to be valid path")
-            });
+            .as_ref()
+            .and_then(|k| k.path.clone())
+            .or_else(|| log_schema().host_key().cloned())
+            .expect("global log_schema.host_key to be valid path");
 
         let message_key = self
             .message_key
-            .clone()
-            .and_then(|k| k.path)
-            .unwrap_or_else(|| {
-                parse_value_path(log_schema().message_key())
-                    .expect("global log_schema.message_key to be valid path")
-            });
+            .as_ref()
+            .and_then(|k| k.path.clone())
+            .or_else(|| log_schema().message_key().cloned())
+            .expect("global log_schema.message_key to be valid path");
 
         let source_type_key = self
             .source_type_key
-            .clone()
-            .and_then(|k| k.path)
-            .unwrap_or_else(|| {
-                parse_value_path(log_schema().source_type_key())
-                    .expect("global log_schema.source_type_key to be valid path")
-            });
+            .as_ref()
+            .and_then(|k| k.path.clone())
+            .or_else(|| log_schema().source_type_key().cloned())
+            .expect("global log_schema.source_type_key to be valid path");
 
         let sink = InfluxDbLogsSink {
             uri,
@@ -269,25 +266,23 @@ impl HttpEventEncoder<BytesMut> for InfluxDbLogsEncoder {
         // the original value that was assigned to the root. To avoid this we intentionally rename
         // the path that points to "message" such that it has a dedicated key.
         // TODO: add a `TargetPath::is_event_root()` to conditionally rename?
-        if let Some(message_path) = log.message_path() {
-            log.rename_key(
-                message_path.as_str(),
-                (PathPrefix::Event, &self.message_key),
-            )
+        if let Some(message_path) = log.message_path().cloned().as_ref() {
+            log.rename_key(message_path, (PathPrefix::Event, &self.message_key));
         }
         // Add the `host` and `source_type` to the HashSet of tags to include
         // Ensure those paths are on the event to be encoded, rather than metadata
-        if let Some(host_path) = log.host_path() {
-            self.tags.replace(host_path.clone());
-            log.rename_key(host_path.as_str(), (PathPrefix::Event, &self.host_key));
+        if let Some(host_path) = log.host_path().cloned().as_ref() {
+            self.tags.replace(host_path.path.to_string());
+            log.rename_key(host_path, (PathPrefix::Event, &self.host_key));
         }
-        self.tags.replace(log.source_type_path().to_string());
-        log.rename_key(
-            log.source_type_path(),
-            (PathPrefix::Event, &self.source_type_key),
-        );
+
+        if let Some(source_type_path) = log.source_type_path().cloned().as_ref() {
+            self.tags.replace(source_type_path.path.to_string());
+            log.rename_key(source_type_path, (PathPrefix::Event, &self.source_type_key));
+        }
+
         self.tags.replace("metric_type".to_string());
-        log.insert("metric_type", "logs");
+        log.insert(event_path!("metric_type"), "logs");
 
         // Timestamp
         let timestamp = encode_timestamp(match log.remove_timestamp() {
@@ -408,10 +403,10 @@ mod tests {
     use futures::{channel::mpsc, stream, StreamExt};
     use http::{request::Parts, StatusCode};
     use indoc::indoc;
+
     use lookup::owned_value_path;
     use vector_core::event::{BatchNotifier, BatchStatus, Event, LogEvent};
 
-    use super::*;
     use crate::{
         sinks::{
             influxdb::test_util::{assert_fields, split_line_protocol, ts},
@@ -426,6 +421,8 @@ mod tests {
         },
     };
 
+    use super::*;
+
     type Receiver = mpsc::Receiver<(Parts, bytes::Bytes)>;
 
     #[test]
@@ -879,16 +876,17 @@ mod tests {
 #[cfg(feature = "influxdb-integration-tests")]
 #[cfg(test)]
 mod integration_tests {
+    use std::sync::Arc;
+
     use chrono::Utc;
-    use codecs::BytesDeserializerConfig;
     use futures::stream;
+    use vrl::value;
+
+    use codecs::BytesDeserializerConfig;
     use lookup::{owned_value_path, path};
-    use std::sync::Arc;
     use vector_core::config::{LegacyKey, LogNamespace};
     use vector_core::event::{BatchNotifier, BatchStatus, Event, LogEvent};
-    use vrl::value;
 
-    use super::*;
     use crate::{
         config::SinkContext,
         sinks::influxdb::{
@@ -899,6 +897,8 @@ mod integration_tests {
         test_util::components::{run_and_assert_sink_compliance, HTTP_SINK_TAGS},
     };
 
+    use super::*;
+
     #[tokio::test]
     async fn influxdb2_logs_put_data() {
         let endpoint = address_v2();
diff --git a/src/sinks/kafka/request_builder.rs b/src/sinks/kafka/request_builder.rs
index 9d1edd0d97c43..c2d3c7aaa9219 100644
--- a/src/sinks/kafka/request_builder.rs
+++ b/src/sinks/kafka/request_builder.rs
@@ -37,8 +37,6 @@ impl KafkaRequestBuilder {
             })
             .ok()?;
 
-        let metadata_builder = RequestMetadataBuilder::from_event(&event);
-
         let metadata = KafkaRequestMetadata {
             finalizers: event.take_finalizers(),
             key: get_key(&event, &self.key_field),
@@ -48,6 +46,10 @@ impl KafkaRequestBuilder {
         };
         self.transformer.transform(&mut event);
         let mut body = BytesMut::new();
+
+        // Ensure the metadata builder is built after transforming the event so we have the event
+        // size taking into account any dropped fields.
+        let metadata_builder = RequestMetadataBuilder::from_event(&event);
         self.encoder.encode(event, &mut body).ok()?;
         let body = body.freeze();
 
diff --git a/src/sinks/loki/event.rs b/src/sinks/loki/event.rs
index 22d399f970710..bae1fa3d2448e 100644
--- a/src/sinks/loki/event.rs
+++ b/src/sinks/loki/event.rs
@@ -3,6 +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;
 
 pub type Labels = Vec<(String, String)>;
 
@@ -20,8 +21,13 @@ impl Encoder<Vec<LokiRecord>> for LokiBatchEncoder {
         &self,
         input: Vec<LokiRecord>,
         writer: &mut dyn io::Write,
-    ) -> io::Result<usize> {
+    ) -> io::Result<(usize, GroupedCountByteSize)> {
         let count = input.len();
+        let mut byte_size = telemetry().create_request_count_byte_size();
+        for event in &input {
+            byte_size.add_event(event, event.estimated_json_encoded_size_of());
+        }
+
         let batch = LokiBatch::from(input);
         let body = match self.0 {
             LokiBatchEncoding::Json => {
@@ -52,7 +58,7 @@ impl Encoder<Vec<LokiRecord>> for LokiBatchEncoder {
                 batch.encode()
             }
         };
-        write_all(writer, count, &body).map(|()| body.len())
+        write_all(writer, count, &body).map(|()| (body.len(), byte_size))
     }
 }
 
@@ -152,7 +158,7 @@ pub struct LokiRecord {
     pub event: LokiEvent,
     pub json_byte_size: JsonSize,
     pub finalizers: EventFinalizers,
-    pub event_count_tags: EventCountTags,
+    pub event_count_tags: TaggedEventsSent,
 }
 
 impl ByteSizeOf for LokiRecord {
@@ -185,7 +191,7 @@ impl Finalizable for LokiRecord {
 }
 
 impl GetEventCountTags for LokiRecord {
-    fn get_tags(&self) -> EventCountTags {
+    fn get_tags(&self) -> TaggedEventsSent {
         self.event_count_tags.clone()
     }
 }
diff --git a/src/sinks/loki/integration_tests.rs b/src/sinks/loki/integration_tests.rs
index 245c8ebcb2c7b..68ec244e04c98 100644
--- a/src/sinks/loki/integration_tests.rs
+++ b/src/sinks/loki/integration_tests.rs
@@ -7,7 +7,7 @@ use futures::stream;
 use lookup::owned_value_path;
 use vector_common::encode_logfmt;
 use vector_core::{
-    config::LogNamespace,
+    config::{init_telemetry, LogNamespace, Tags, Telemetry},
     event::{BatchNotifier, BatchStatus, Event, LogEvent},
 };
 use vrl::value::{kind::Collection, Kind};
@@ -20,7 +20,10 @@ use crate::{
     sinks::{util::test::load_sink, VectorSink},
     template::Template,
     test_util::{
-        components::{run_and_assert_sink_compliance, SINK_TAGS},
+        components::{
+            run_and_assert_data_volume_sink_compliance, run_and_assert_sink_compliance,
+            DATA_VOLUME_SINK_TAGS, SINK_TAGS,
+        },
         generate_events_with_stream, generate_lines_with_stream, random_lines,
     },
 };
@@ -151,6 +154,34 @@ async fn text() {
     }
 }
 
+#[tokio::test]
+async fn data_volume_tags() {
+    init_telemetry(
+        Telemetry {
+            tags: Tags {
+                emit_service: true,
+                emit_source: true,
+            },
+        },
+        true,
+    );
+
+    let (stream, sink) = build_sink("text", false).await;
+
+    let (batch, mut receiver) = BatchNotifier::new_with_receiver();
+    let (lines, events) = generate_lines_with_stream(line_generator, 10, Some(batch));
+    run_and_assert_data_volume_sink_compliance(sink, events, &DATA_VOLUME_SINK_TAGS).await;
+    assert_eq!(receiver.try_recv(), Ok(BatchStatus::Delivered));
+
+    tokio::time::sleep(tokio::time::Duration::new(1, 0)).await;
+
+    let (_, outputs) = fetch_stream(stream.to_string(), "default").await;
+    assert_eq!(lines.len(), outputs.len());
+    for (i, output) in outputs.iter().enumerate() {
+        assert_eq!(output, &lines[i]);
+    }
+}
+
 #[tokio::test]
 async fn namespaced_timestamp() {
     let (stream, sink) = build_sink("json", true).await;
@@ -327,7 +358,7 @@ async fn many_streams() {
         let index = (i % 5) * 2;
         let message = lines[index]
             .as_log()
-            .get(log_schema().message_key())
+            .get(log_schema().message_key_target_path().unwrap())
             .unwrap()
             .to_string_lossy();
         assert_eq!(output, &message);
@@ -337,7 +368,7 @@ async fn many_streams() {
         let index = ((i % 5) * 2) + 1;
         let message = lines[index]
             .as_log()
-            .get(log_schema().message_key())
+            .get(log_schema().message_key_target_path().unwrap())
             .unwrap()
             .to_string_lossy();
         assert_eq!(output, &message);
@@ -384,7 +415,7 @@ async fn interpolate_stream_key() {
     for (i, output) in outputs.iter().enumerate() {
         let message = lines[i]
             .as_log()
-            .get(log_schema().message_key())
+            .get(log_schema().message_key_target_path().unwrap())
             .unwrap()
             .to_string_lossy();
         assert_eq!(output, &message);
@@ -637,7 +668,7 @@ async fn test_out_of_order_events(
         assert_eq!(
             &expected[i]
                 .as_log()
-                .get(log_schema().message_key())
+                .get(log_schema().message_key_target_path().unwrap())
                 .unwrap()
                 .to_string_lossy(),
             output,
diff --git a/src/sinks/loki/sink.rs b/src/sinks/loki/sink.rs
index 74e133887b6b4..fd6aa01bac23d 100644
--- a/src/sinks/loki/sink.rs
+++ b/src/sinks/loki/sink.rs
@@ -453,7 +453,7 @@ impl LokiSink {
             .map(|event| encoder.encode_event(event))
             .filter_map(|event| async { event })
             .map(|record| filter.filter_record(record))
-            .batched_partitioned(RecordPartitioner::default(), self.batch_settings)
+            .batched_partitioned(RecordPartitioner, self.batch_settings)
             .filter_map(|(partition, batch)| async {
                 if let Some(partition) = partition {
                     let mut count: usize = 0;
diff --git a/src/sinks/mezmo.rs b/src/sinks/mezmo.rs
index 6139952fe3a95..d1d010d20311f 100644
--- a/src/sinks/mezmo.rs
+++ b/src/sinks/mezmo.rs
@@ -379,10 +379,13 @@ impl HttpEventEncoder<PartitionInnerBuffer<serde_json::Value, PartitionKey>> for
         mut event: Event,
     ) -> Option<PartitionInnerBuffer<serde_json::Value, PartitionKey>> {
         let key = self.render_key(&event)?;
-        let message_key = crate::config::log_schema().message_key();
+        let message_key = crate::config::log_schema()
+            .message_key_target_path()
+            .unwrap();
 
         self.transformer.transform(&mut event);
         let mut log = event.into_log();
+
         let mut map = serde_json::map::Map::new();
 
         if self.use_message_as_line.unwrap_or(false) {
diff --git a/src/sinks/mod.rs b/src/sinks/mod.rs
index e5195cb89169b..b6e828e5d4d7f 100644
--- a/src/sinks/mod.rs
+++ b/src/sinks/mod.rs
@@ -53,6 +53,8 @@ pub mod file;
 pub mod gcp;
 #[cfg(feature = "sinks-gcp")]
 pub mod gcs_common;
+#[cfg(feature = "sinks-greptimedb")]
+pub mod greptimedb;
 #[cfg(feature = "sinks-honeycomb")]
 pub mod honeycomb;
 #[cfg(feature = "sinks-http")]
diff --git a/src/sinks/nats.rs b/src/sinks/nats.rs
index e80f28245a631..02265df21972b 100644
--- a/src/sinks/nats.rs
+++ b/src/sinks/nats.rs
@@ -33,7 +33,7 @@ enum BuildError {
     #[snafu(display("NATS Config Error: {}", source))]
     Config { source: NatsConfigError },
     #[snafu(display("NATS Connect Error: {}", source))]
-    Connect { source: std::io::Error },
+    Connect { source: async_nats::ConnectError },
 }
 
 /**
@@ -137,7 +137,7 @@ impl SinkConfig for NatsSinkConfig {
     }
 }
 
-impl std::convert::TryFrom<&NatsSinkConfig> for nats::asynk::Options {
+impl std::convert::TryFrom<&NatsSinkConfig> for async_nats::ConnectOptions {
     type Error = NatsConfigError;
 
     fn try_from(config: &NatsSinkConfig) -> Result<Self, Self::Error> {
@@ -146,8 +146,8 @@ impl std::convert::TryFrom<&NatsSinkConfig> for nats::asynk::Options {
 }
 
 impl NatsSinkConfig {
-    async fn connect(&self) -> Result<nats::asynk::Connection, BuildError> {
-        let options: nats::asynk::Options = self.try_into().context(ConfigSnafu)?;
+    async fn connect(&self) -> Result<async_nats::Client, BuildError> {
+        let options: async_nats::ConnectOptions = self.try_into().context(ConfigSnafu)?;
 
         options.connect(&self.url).await.context(ConnectSnafu)
     }
@@ -160,7 +160,7 @@ async fn healthcheck(config: NatsSinkConfig) -> crate::Result<()> {
 pub struct NatsSink {
     transformer: Transformer,
     encoder: Encoder<()>,
-    connection: nats::asynk::Connection,
+    connection: async_nats::Client,
     subject: Template,
 }
 
@@ -213,7 +213,14 @@ impl StreamSink<Event> for NatsSink {
                 continue;
             }
 
-            match self.connection.publish(&subject, &bytes).await {
+            let message_size = bytes.len();
+            match self
+                .connection
+                .publish(subject.clone(), bytes.freeze())
+                .map_err(Into::into)
+                .and_then(|_| self.connection.flush().map_err(Into::into))
+                .await
+            {
                 Err(error) => {
                     finalizers.update_status(EventStatus::Errored);
 
@@ -223,7 +230,7 @@ impl StreamSink<Event> for NatsSink {
                     finalizers.update_status(EventStatus::Delivered);
 
                     events_sent.emit(CountByteSize(1, event_byte_size));
-                    bytes_sent.emit(ByteSize(bytes.len()));
+                    bytes_sent.emit(ByteSize(message_size));
                 }
             }
         }
@@ -246,7 +253,7 @@ mod tests {
 #[cfg(test)]
 mod integration_tests {
     use codecs::TextSerializerConfig;
-    use std::{thread, time::Duration};
+    use std::time::Duration;
 
     use super::*;
     use crate::nats::{NatsAuthCredentialsFile, NatsAuthNKey, NatsAuthToken, NatsAuthUserPassword};
@@ -274,10 +281,14 @@ mod integration_tests {
             .connect()
             .await
             .expect("failed to connect with test consumer");
-        let sub = consumer
-            .subscribe(&subject)
+        let mut sub = consumer
+            .subscribe(subject)
             .await
             .expect("failed to subscribe with test consumer");
+        consumer
+            .flush()
+            .await
+            .expect("failed to flush with the test consumer");
 
         // Publish events.
         let num_events = 1_000;
@@ -286,12 +297,12 @@ mod integration_tests {
         run_and_assert_sink_compliance(sink, events, &SINK_TAGS).await;
 
         // Unsubscribe from the channel.
-        thread::sleep(Duration::from_secs(3));
-        sub.drain().await.unwrap();
+        tokio::time::sleep(Duration::from_secs(3)).await;
+        sub.unsubscribe().await.unwrap();
 
         let mut output: Vec<String> = Vec::new();
         while let Some(msg) = sub.next().await {
-            output.push(String::from_utf8_lossy(&msg.data).to_string())
+            output.push(String::from_utf8_lossy(&msg.payload).to_string())
         }
 
         assert_eq!(output.len(), input.len());
@@ -501,7 +512,7 @@ mod integration_tests {
 
         let r = publish_and_check(conf).await;
         assert!(
-            matches!(r, Err(BuildError::Config { .. })),
+            matches!(r, Err(BuildError::Connect { .. })),
             "publish_and_check failed, expected BuildError::Config, got: {:?}",
             r
         );
diff --git a/src/sinks/new_relic/config.rs b/src/sinks/new_relic/config.rs
index 5900755b12207..af892849f0964 100644
--- a/src/sinks/new_relic/config.rs
+++ b/src/sinks/new_relic/config.rs
@@ -1,25 +1,15 @@
 use std::{fmt::Debug, sync::Arc};
 
-use futures::FutureExt;
 use http::Uri;
 use tower::ServiceBuilder;
 use vector_common::sensitive_string::SensitiveString;
-use vector_config::configurable_component;
 
 use super::{
     healthcheck, NewRelicApiResponse, NewRelicApiService, NewRelicEncoder, NewRelicSink,
     NewRelicSinkError,
 };
-use crate::{
-    codecs::Transformer,
-    config::{AcknowledgementsConfig, DataType, Input, SinkConfig, SinkContext},
-    http::HttpClient,
-    sinks::util::{
-        retries::RetryLogic, service::ServiceBuilderExt, BatchConfig, Compression,
-        SinkBatchSettings, TowerRequestConfig,
-    },
-    tls::TlsSettings,
-};
+
+use crate::{http::HttpClient, sinks::prelude::*};
 
 /// New Relic region.
 #[configurable_component]
@@ -164,8 +154,10 @@ impl SinkConfig for NewRelicConfig {
 
         let sink = NewRelicSink {
             service,
-            transformer: self.encoding.clone(),
-            encoder: NewRelicEncoder,
+            encoder: NewRelicEncoder {
+                transformer: self.encoding.clone(),
+                credentials: Arc::clone(&credentials),
+            },
             credentials,
             compression: self.compression,
             batcher_settings,
diff --git a/src/sinks/new_relic/encoding.rs b/src/sinks/new_relic/encoding.rs
index ec71aa4f40879..f058161d20fb9 100644
--- a/src/sinks/new_relic/encoding.rs
+++ b/src/sinks/new_relic/encoding.rs
@@ -1,28 +1,54 @@
-use std::io;
+use std::{io, sync::Arc};
 
 use serde::Serialize;
+use vector_common::request_metadata::GroupedCountByteSize;
+use vector_core::{config::telemetry, event::Event, EstimatedJsonEncodedSizeOf};
 
-use super::{NewRelicApiModel, NewRelicSinkError};
-use crate::sinks::util::encoding::{as_tracked_write, Encoder};
+use super::{
+    EventsApiModel, LogsApiModel, MetricsApiModel, NewRelicApi, NewRelicApiModel,
+    NewRelicCredentials, NewRelicSinkError,
+};
+use crate::sinks::{
+    prelude::*,
+    util::encoding::{as_tracked_write, Encoder},
+};
 
-pub struct NewRelicEncoder;
+pub struct NewRelicEncoder {
+    pub(super) transformer: Transformer,
+    pub(super) credentials: Arc<NewRelicCredentials>,
+}
 
-impl Encoder<Result<NewRelicApiModel, NewRelicSinkError>> for NewRelicEncoder {
+impl Encoder<Vec<Event>> for NewRelicEncoder {
     fn encode_input(
         &self,
-        input: Result<NewRelicApiModel, NewRelicSinkError>,
+        mut input: Vec<Event>,
         writer: &mut dyn io::Write,
-    ) -> io::Result<usize> {
-        let json = match input? {
+    ) -> io::Result<(usize, GroupedCountByteSize)> {
+        let mut byte_size = telemetry().create_request_count_byte_size();
+
+        for event in input.iter_mut() {
+            self.transformer.transform(event);
+            byte_size.add_event(event, event.estimated_json_encoded_size_of());
+        }
+
+        let api_model = match self.credentials.api {
+            NewRelicApi::Events => NewRelicApiModel::Events(EventsApiModel::try_from(input)?),
+            NewRelicApi::Metrics => NewRelicApiModel::Metrics(MetricsApiModel::try_from(input)?),
+            NewRelicApi::Logs => NewRelicApiModel::Logs(LogsApiModel::try_from(input)?),
+        };
+
+        let json = match api_model {
             NewRelicApiModel::Events(ev_api_model) => to_json(&ev_api_model)?,
             NewRelicApiModel::Metrics(met_api_model) => to_json(&met_api_model)?,
             NewRelicApiModel::Logs(log_api_model) => to_json(&log_api_model)?,
         };
+
         let size = as_tracked_write::<_, _, io::Error>(writer, &json, |writer, json| {
             writer.write_all(json)?;
             Ok(())
         })?;
-        io::Result::Ok(size)
+
+        io::Result::Ok((size, byte_size))
     }
 }
 
diff --git a/src/sinks/new_relic/model.rs b/src/sinks/new_relic/model.rs
index c49337a13e3e4..27cf7292dcdbf 100644
--- a/src/sinks/new_relic/model.rs
+++ b/src/sinks/new_relic/model.rs
@@ -3,6 +3,7 @@ use std::{collections::HashMap, convert::TryFrom, fmt::Debug, time::SystemTime};
 use chrono::{DateTime, Utc};
 use ordered_float::NotNan;
 use serde::{Deserialize, Serialize};
+use vrl::event_path;
 
 use super::NewRelicSinkError;
 use crate::event::{Event, MetricValue, Value};
@@ -117,7 +118,7 @@ impl TryFrom<Vec<Event>> for EventsApiModel {
                     event_model.insert(k, v.clone());
                 }
 
-                if let Some(message) = log.get("message") {
+                if let Some(message) = log.get(event_path!("message")) {
                     let message = message.to_string_lossy().replace("\\\"", "\"");
                     // If message contains a JSON string, parse it and insert all fields into self
                     if let serde_json::Result::Ok(json_map) =
@@ -189,7 +190,7 @@ impl TryFrom<Vec<Event>> for LogsApiModel {
                 for (k, v) in log.convert_to_fields() {
                     log_model.insert(k, v.clone());
                 }
-                if log.get("message").is_none() {
+                if log.get(event_path!("message")).is_none() {
                     log_model.insert(
                         "message".to_owned(),
                         Value::from("log from vector".to_owned()),
diff --git a/src/sinks/new_relic/service.rs b/src/sinks/new_relic/service.rs
index 290276b72b5cf..2b69aae492348 100644
--- a/src/sinks/new_relic/service.rs
+++ b/src/sinks/new_relic/service.rs
@@ -5,21 +5,15 @@ use std::{
 };
 
 use bytes::Bytes;
-use futures::future::BoxFuture;
 use http::{
     header::{CONTENT_ENCODING, CONTENT_LENGTH, CONTENT_TYPE},
     Request,
 };
 use hyper::Body;
-use tower::Service;
 use tracing::Instrument;
-use vector_common::request_metadata::{GroupedCountByteSize, MetaDescriptive, RequestMetadata};
-use vector_core::{
-    event::{EventFinalizers, EventStatus, Finalizable},
-    stream::DriverResponse,
-};
 
 use super::{NewRelicCredentials, NewRelicSinkError};
+use crate::sinks::prelude::*;
 use crate::{http::HttpClient, sinks::util::Compression};
 
 #[derive(Debug, Clone)]
diff --git a/src/sinks/new_relic/sink.rs b/src/sinks/new_relic/sink.rs
index c56c4d4b9f425..384a1b7a54e52 100644
--- a/src/sinks/new_relic/sink.rs
+++ b/src/sinks/new_relic/sink.rs
@@ -1,28 +1,11 @@
-use std::{convert::TryFrom, fmt::Debug, num::NonZeroUsize, sync::Arc};
+use std::{fmt::Debug, num::NonZeroUsize, sync::Arc};
 
 use async_trait::async_trait;
 use bytes::Bytes;
-use futures::stream::{BoxStream, StreamExt};
-use tower::Service;
-use vector_common::request_metadata::RequestMetadata;
-use vector_core::{
-    event::{EventFinalizers, Finalizable},
-    stream::{BatcherSettings, DriverResponse},
-};
 
-use super::{
-    EventsApiModel, LogsApiModel, MetricsApiModel, NewRelicApi, NewRelicApiModel,
-    NewRelicApiRequest, NewRelicCredentials, NewRelicEncoder,
-};
+use super::{NewRelicApiRequest, NewRelicCredentials, NewRelicEncoder};
 use crate::{
-    codecs::Transformer,
-    event::Event,
-    http::get_http_scheme_from_uri,
-    internal_events::SinkRequestBuildError,
-    sinks::util::{
-        builder::SinkBuilderExt, metadata::RequestMetadataBuilder, request_builder::EncodeResult,
-        Compression, RequestBuilder, StreamSink,
-    },
+    http::get_http_scheme_from_uri, internal_events::SinkRequestBuildError, sinks::prelude::*,
 };
 
 #[derive(Debug)]
@@ -69,7 +52,6 @@ impl From<NewRelicSinkError> for std::io::Error {
 }
 
 struct NewRelicRequestBuilder {
-    transformer: Transformer,
     encoder: NewRelicEncoder,
     compression: Compression,
     credentials: Arc<NewRelicCredentials>,
@@ -77,7 +59,7 @@ struct NewRelicRequestBuilder {
 
 impl RequestBuilder<Vec<Event>> for NewRelicRequestBuilder {
     type Metadata = EventFinalizers;
-    type Events = Result<NewRelicApiModel, Self::Error>;
+    type Events = Vec<Event>;
     type Encoder = NewRelicEncoder;
     type Payload = Bytes;
     type Request = NewRelicApiRequest;
@@ -95,26 +77,10 @@ impl RequestBuilder<Vec<Event>> for NewRelicRequestBuilder {
         &self,
         mut input: Vec<Event>,
     ) -> (Self::Metadata, RequestMetadataBuilder, Self::Events) {
-        for event in input.iter_mut() {
-            self.transformer.transform(event);
-        }
-
         let builder = RequestMetadataBuilder::from_events(&input);
-
         let finalizers = input.take_finalizers();
-        let api_model = || -> Result<NewRelicApiModel, Self::Error> {
-            match self.credentials.api {
-                NewRelicApi::Events => {
-                    Ok(NewRelicApiModel::Events(EventsApiModel::try_from(input)?))
-                }
-                NewRelicApi::Metrics => {
-                    Ok(NewRelicApiModel::Metrics(MetricsApiModel::try_from(input)?))
-                }
-                NewRelicApi::Logs => Ok(NewRelicApiModel::Logs(LogsApiModel::try_from(input)?)),
-            }
-        }();
-
-        (finalizers, builder, api_model)
+
+        (finalizers, builder, input)
     }
 
     fn build_request(
@@ -135,7 +101,6 @@ impl RequestBuilder<Vec<Event>> for NewRelicRequestBuilder {
 
 pub struct NewRelicSink<S> {
     pub service: S,
-    pub transformer: Transformer,
     pub encoder: NewRelicEncoder,
     pub credentials: Arc<NewRelicCredentials>,
     pub compression: Compression,
@@ -152,7 +117,6 @@ where
     async fn run_inner(self: Box<Self>, input: BoxStream<'_, Event>) -> Result<(), ()> {
         let builder_limit = NonZeroUsize::new(64);
         let request_builder = NewRelicRequestBuilder {
-            transformer: self.transformer,
             encoder: self.encoder,
             compression: self.compression,
             credentials: Arc::clone(&self.credentials),
diff --git a/src/sinks/new_relic/tests.rs b/src/sinks/new_relic/tests.rs
index 51be807831f56..f977b58f0177c 100644
--- a/src/sinks/new_relic/tests.rs
+++ b/src/sinks/new_relic/tests.rs
@@ -3,13 +3,17 @@ use std::{collections::HashMap, convert::TryFrom, time::SystemTime};
 use chrono::{DateTime, Utc};
 use futures::{future::ready, stream};
 use serde::Deserialize;
+use vector_core::config::{init_telemetry, Tags, Telemetry};
 
 use super::*;
 use crate::{
     config::{GenerateConfig, SinkConfig, SinkContext},
     event::{Event, LogEvent, Metric, MetricKind, MetricValue, Value},
     test_util::{
-        components::{run_and_assert_sink_compliance, SINK_TAGS},
+        components::{
+            run_and_assert_data_volume_sink_compliance, run_and_assert_sink_compliance,
+            DATA_VOLUME_SINK_TAGS, SINK_TAGS,
+        },
         http::{always_200_response, spawn_blackhole_http_server},
     },
 };
@@ -19,8 +23,7 @@ fn generate_config() {
     crate::test_util::test_generate_config::<NewRelicConfig>();
 }
 
-#[tokio::test]
-async fn component_spec_compliance() {
+async fn sink() -> (VectorSink, Event) {
     let mock_endpoint = spawn_blackhole_http_server(always_200_response).await;
 
     let config = NewRelicConfig::generate_config().to_string();
@@ -32,9 +35,39 @@ async fn component_spec_compliance() {
     let (sink, _healthcheck) = config.build(context).await.unwrap();
 
     let event = Event::Log(LogEvent::from("simple message"));
+
+    (sink, event)
+}
+
+#[tokio::test]
+async fn component_spec_compliance() {
+    let (sink, event) = sink().await;
     run_and_assert_sink_compliance(sink, stream::once(ready(event)), &SINK_TAGS).await;
 }
 
+#[tokio::test]
+async fn component_spec_compliance_data_volume() {
+    // We need to configure Vector to emit the service and source tags.
+    // The default is to not emit these.
+    init_telemetry(
+        Telemetry {
+            tags: Tags {
+                emit_service: true,
+                emit_source: true,
+            },
+        },
+        true,
+    );
+
+    let (sink, event) = sink().await;
+    run_and_assert_data_volume_sink_compliance(
+        sink,
+        stream::once(ready(event)),
+        &DATA_VOLUME_SINK_TAGS,
+    )
+    .await;
+}
+
 #[test]
 fn generate_event_api_model() {
     // Without message field
diff --git a/src/sinks/postgresql/config.rs b/src/sinks/postgresql/config.rs
index 192d749b92b32..5344e29bb5eab 100644
--- a/src/sinks/postgresql/config.rs
+++ b/src/sinks/postgresql/config.rs
@@ -26,7 +26,7 @@ impl Default for PostgreSQLFieldConfig {
     fn default() -> Self {
         Self {
             name: "message".to_owned(),
-            path: log_schema().message_key().to_owned(),
+            path: log_schema().message_key().unwrap().to_string(),
         }
     }
 }
diff --git a/src/sinks/prelude.rs b/src/sinks/prelude.rs
index f0bc10546dd13..e111d44d03667 100644
--- a/src/sinks/prelude.rs
+++ b/src/sinks/prelude.rs
@@ -5,7 +5,7 @@ pub use crate::{
     codecs::{Encoder, EncodingConfig, Transformer},
     config::{DataType, GenerateConfig, SinkConfig, SinkContext},
     event::{Event, LogEvent},
-    internal_events::TemplateRenderingError,
+    internal_events::{SinkRequestBuildError, TemplateRenderingError},
     mezmo::{
         user_trace::{MezmoLoggingService, MezmoUserLog, UserLoggingError, UserLoggingResponse},
         MezmoContext,
@@ -33,11 +33,9 @@ pub use tower::{Service, ServiceBuilder};
 pub use vector_buffers::EventCount;
 pub use vector_common::{
     finalization::{EventFinalizers, EventStatus, Finalizable},
-    internal_event::CountByteSize,
+    internal_event::{CountByteSize, TaggedEventsSent},
     json_size::JsonSize,
-    request_metadata::{
-        EventCountTags, GetEventCountTags, GroupedCountByteSize, MetaDescriptive, RequestMetadata,
-    },
+    request_metadata::{GetEventCountTags, GroupedCountByteSize, MetaDescriptive, RequestMetadata},
 };
 pub use vector_config::configurable_component;
 pub use vector_core::{
diff --git a/src/sinks/pulsar/encoder.rs b/src/sinks/pulsar/encoder.rs
index 63d25f2e05711..e324c4b0ea376 100644
--- a/src/sinks/pulsar/encoder.rs
+++ b/src/sinks/pulsar/encoder.rs
@@ -6,6 +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};
 
 #[derive(Clone, Debug)]
 pub(super) struct PulsarEncoder {
@@ -14,9 +16,17 @@ pub(super) struct PulsarEncoder {
 }
 
 impl Encoder<Event> for PulsarEncoder {
-    fn encode_input(&self, mut input: Event, writer: &mut dyn io::Write) -> io::Result<usize> {
+    fn encode_input(
+        &self,
+        mut input: Event,
+        writer: &mut dyn io::Write,
+    ) -> io::Result<(usize, GroupedCountByteSize)> {
         let mut body = BytesMut::new();
         self.transformer.transform(&mut input);
+
+        let mut byte_size = telemetry().create_request_count_byte_size();
+        byte_size.add_event(&input, input.estimated_json_encoded_size_of());
+
         let mut encoder = self.encoder.clone();
         encoder
             .encode(input, &mut body)
@@ -25,6 +35,6 @@ impl Encoder<Event> for PulsarEncoder {
         let body = body.freeze();
         write_all(writer, 1, body.as_ref())?;
 
-        Ok(body.len())
+        Ok((body.len(), byte_size))
     }
 }
diff --git a/src/sinks/redis.rs b/src/sinks/redis.rs
index 402ad28aee906..8960edd8171fb 100644
--- a/src/sinks/redis.rs
+++ b/src/sinks/redis.rs
@@ -429,7 +429,7 @@ mod tests {
         .item
         .value;
         let map: HashMap<String, String> = serde_json::from_slice(&result[..]).unwrap();
-        assert_eq!(msg, map[&log_schema().message_key().to_string()]);
+        assert_eq!(msg, map[&log_schema().message_key().unwrap().to_string()]);
     }
 
     #[test]
diff --git a/src/sinks/sematext/logs.rs b/src/sinks/sematext/logs.rs
index e4a3d05b00452..e5484b5dbd859 100644
--- a/src/sinks/sematext/logs.rs
+++ b/src/sinks/sematext/logs.rs
@@ -143,12 +143,12 @@ fn map_timestamp(mut events: EventArray) -> EventArray {
     match &mut events {
         EventArray::Logs(logs) => {
             for log in logs {
-                if let Some(path) = log.timestamp_path() {
-                    log.rename_key(path.as_str(), "@timestamp");
+                if let Some(path) = log.timestamp_path().cloned().as_ref() {
+                    log.rename_key(path, "@timestamp");
                 }
 
-                if let Some(path) = log.host_path() {
-                    log.rename_key(path.as_str(), "os.host");
+                if let Some(path) = log.host_path().cloned().as_ref() {
+                    log.rename_key(path, "os.host");
                 }
             }
         }
diff --git a/src/sinks/splunk_hec/common/service.rs b/src/sinks/splunk_hec/common/service.rs
index 8f71a85bd39f6..16a6ae873e238 100644
--- a/src/sinks/splunk_hec/common/service.rs
+++ b/src/sinks/splunk_hec/common/service.rs
@@ -282,6 +282,7 @@ 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},
@@ -341,7 +342,11 @@ mod tests {
         let body = Bytes::from("test-message");
         let events_byte_size = body.len();
 
-        let builder = RequestMetadataBuilder::new(1, events_byte_size, events_byte_size.into());
+        let builder = RequestMetadataBuilder::new(
+            1,
+            events_byte_size,
+            CountByteSize(1, events_byte_size.into()).into(),
+        );
         let bytes_len =
             NonZeroUsize::new(events_byte_size).expect("payload should never be zero length");
         let metadata = builder.with_request_size(bytes_len);
diff --git a/src/sinks/splunk_hec/common/util.rs b/src/sinks/splunk_hec/common/util.rs
index a500f743d7f4d..538f5e7b2f3f4 100644
--- a/src/sinks/splunk_hec/common/util.rs
+++ b/src/sinks/splunk_hec/common/util.rs
@@ -141,8 +141,10 @@ pub fn build_uri(
     uri.parse::<Uri>()
 }
 
-pub fn host_key() -> String {
-    crate::config::log_schema().host_key().to_string()
+pub fn config_host_key() -> OptionalValuePath {
+    OptionalValuePath {
+        path: crate::config::log_schema().host_key().cloned(),
+    }
 }
 
 pub fn config_timestamp_key() -> OptionalValuePath {
diff --git a/src/sinks/splunk_hec/logs/config.rs b/src/sinks/splunk_hec/logs/config.rs
index 2f5f4023ed8f6..06ad3fb9817f4 100644
--- a/src/sinks/splunk_hec/logs/config.rs
+++ b/src/sinks/splunk_hec/logs/config.rs
@@ -17,7 +17,7 @@ use crate::{
     sinks::{
         splunk_hec::common::{
             acknowledgements::HecClientAcknowledgementsConfig,
-            build_healthcheck, build_http_batch_service, create_client, host_key,
+            build_healthcheck, build_http_batch_service, config_host_key, create_client,
             service::{HecService, HttpRequestBuilder},
             EndpointTarget, SplunkHecDefaultBatchSettings,
         },
@@ -64,8 +64,8 @@ pub struct HecLogsSinkConfig {
     ///
     /// [global_host_key]: https://vector.dev/docs/reference/configuration/global-options/#log_schema.host_key
     #[configurable(metadata(docs::advanced))]
-    #[serde(default = "host_key")]
-    pub host_key: String,
+    #[serde(default = "config_host_key")]
+    pub host_key: OptionalValuePath,
 
     /// Fields to be [added to Splunk index][splunk_field_index_docs].
     ///
@@ -165,7 +165,7 @@ impl GenerateConfig for HecLogsSinkConfig {
         toml::Value::try_from(Self {
             default_token: "${VECTOR_SPLUNK_HEC_TOKEN}".to_owned().into(),
             endpoint: "endpoint".to_owned(),
-            host_key: host_key(),
+            host_key: config_host_key(),
             indexed_fields: vec![],
             index: None,
             sourcetype: None,
@@ -274,7 +274,7 @@ impl HecLogsSinkConfig {
             source: self.source.clone(),
             index: self.index.clone(),
             indexed_fields: self.indexed_fields.clone(),
-            host: self.host_key.clone(),
+            host_key: self.host_key.path.clone(),
             timestamp_nanos_key: self.timestamp_nanos_key.clone(),
             timestamp_key: self.timestamp_key.path.clone(),
             endpoint_target: self.endpoint_target,
diff --git a/src/sinks/splunk_hec/logs/encoder.rs b/src/sinks/splunk_hec/logs/encoder.rs
index 695294cefae70..0f0270ce28a42 100644
--- a/src/sinks/splunk_hec/logs/encoder.rs
+++ b/src/sinks/splunk_hec/logs/encoder.rs
@@ -3,6 +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 super::sink::HecProcessedEvent;
 use crate::{
@@ -63,8 +65,9 @@ impl Encoder<Vec<HecProcessedEvent>> for HecLogsEncoder {
         &self,
         input: Vec<HecProcessedEvent>,
         writer: &mut dyn std::io::Write,
-    ) -> std::io::Result<usize> {
+    ) -> std::io::Result<(usize, GroupedCountByteSize)> {
         let mut encoder = self.encoder.clone();
+        let mut byte_size = telemetry().create_request_count_byte_size();
         let encoded_input: Vec<u8> = input
             .into_iter()
             .filter_map(|processed_event| {
@@ -72,6 +75,8 @@ impl Encoder<Vec<HecProcessedEvent>> for HecLogsEncoder {
                 let metadata = processed_event.metadata;
                 self.transformer.transform(&mut event);
 
+                byte_size.add_event(&event, event.estimated_json_encoded_size_of());
+
                 let mut bytes = BytesMut::new();
 
                 match metadata.endpoint_target {
@@ -128,6 +133,6 @@ impl Encoder<Vec<HecProcessedEvent>> for HecLogsEncoder {
 
         let encoded_size = encoded_input.len();
         writer.write_all(encoded_input.as_slice())?;
-        Ok(encoded_size)
+        Ok((encoded_size, byte_size))
     }
 }
diff --git a/src/sinks/splunk_hec/logs/integration_tests.rs b/src/sinks/splunk_hec/logs/integration_tests.rs
index b61fa1c09034c..fe3ecb7a808b6 100644
--- a/src/sinks/splunk_hec/logs/integration_tests.rs
+++ b/src/sinks/splunk_hec/logs/integration_tests.rs
@@ -6,7 +6,10 @@ use futures::{future::ready, stream};
 use lookup::lookup_v2::OptionalValuePath;
 use serde_json::Value as JsonValue;
 use tokio::time::{sleep, Duration};
-use vector_core::event::{BatchNotifier, BatchStatus, Event, LogEvent};
+use vector_core::{
+    config::{init_telemetry, Tags, Telemetry},
+    event::{BatchNotifier, BatchStatus, Event, LogEvent},
+};
 
 use crate::{
     codecs::EncodingConfig,
@@ -25,7 +28,10 @@ use crate::{
     },
     template::Template,
     test_util::{
-        components::{run_and_assert_sink_compliance, HTTP_SINK_TAGS},
+        components::{
+            run_and_assert_data_volume_sink_compliance, run_and_assert_sink_compliance,
+            DATA_VOLUME_SINK_TAGS, HTTP_SINK_TAGS,
+        },
         random_lines_with_stream, random_string,
     },
 };
@@ -107,7 +113,7 @@ async fn config(encoding: EncodingConfig, indexed_fields: Vec<String>) -> HecLog
     HecLogsSinkConfig {
         default_token: get_token().await.into(),
         endpoint: splunk_hec_address(),
-        host_key: "host".into(),
+        host_key: OptionalValuePath::new("host"),
         indexed_fields,
         index: None,
         sourcetype: None,
@@ -125,6 +131,18 @@ async fn config(encoding: EncodingConfig, indexed_fields: Vec<String>) -> HecLog
     }
 }
 
+fn enable_telemetry() {
+    init_telemetry(
+        Telemetry {
+            tags: Tags {
+                emit_service: true,
+                emit_source: true,
+            },
+        },
+        true,
+    );
+}
+
 #[tokio::test]
 async fn splunk_insert_message() {
     let cx = SinkContext::default();
@@ -145,6 +163,33 @@ async fn splunk_insert_message() {
     assert!(entry.get("message").is_none());
 }
 
+#[tokio::test]
+async fn splunk_insert_message_data_volume() {
+    enable_telemetry();
+
+    let cx = SinkContext::default();
+
+    let config = config(TextSerializerConfig::default().into(), vec![]).await;
+    let (sink, _) = config.build(cx).await.unwrap();
+
+    let message = random_string(100);
+    let (batch, mut receiver) = BatchNotifier::new_with_receiver();
+    let event = LogEvent::from(message.clone()).with_batch_notifier(&batch);
+    drop(batch);
+    run_and_assert_data_volume_sink_compliance(
+        sink,
+        stream::once(ready(event)),
+        &DATA_VOLUME_SINK_TAGS,
+    )
+    .await;
+    assert_eq!(receiver.try_recv(), Ok(BatchStatus::Delivered));
+
+    let entry = find_entry(message.as_str()).await;
+
+    assert_eq!(message, entry["_raw"].as_str().unwrap());
+    assert!(entry.get("message").is_none());
+}
+
 #[tokio::test]
 async fn splunk_insert_raw_message() {
     let cx = SinkContext::default();
@@ -170,6 +215,38 @@ async fn splunk_insert_raw_message() {
     assert!(entry.get("message").is_none());
 }
 
+#[tokio::test]
+async fn splunk_insert_raw_message_data_volume() {
+    enable_telemetry();
+
+    let cx = SinkContext::default();
+
+    let config = HecLogsSinkConfig {
+        endpoint_target: EndpointTarget::Raw,
+        source: Some(Template::try_from("zork").unwrap()),
+        ..config(TextSerializerConfig::default().into(), vec![]).await
+    };
+    let (sink, _) = config.build(cx).await.unwrap();
+
+    let message = random_string(100);
+    let (batch, mut receiver) = BatchNotifier::new_with_receiver();
+    let event = LogEvent::from(message.clone()).with_batch_notifier(&batch);
+    drop(batch);
+    run_and_assert_data_volume_sink_compliance(
+        sink,
+        stream::once(ready(event)),
+        &DATA_VOLUME_SINK_TAGS,
+    )
+    .await;
+    assert_eq!(receiver.try_recv(), Ok(BatchStatus::Delivered));
+
+    let entry = find_entry(message.as_str()).await;
+
+    assert_eq!(message, entry["_raw"].as_str().unwrap());
+    assert_eq!("zork", entry[SOURCE_FIELD].as_str().unwrap());
+    assert!(entry.get("message").is_none());
+}
+
 #[tokio::test]
 async fn splunk_insert_broken_token() {
     let cx = SinkContext::default();
@@ -327,7 +404,7 @@ async fn splunk_configure_hostname() {
     let cx = SinkContext::default();
 
     let config = HecLogsSinkConfig {
-        host_key: "roast".into(),
+        host_key: OptionalValuePath::new("roast"),
         ..config(JsonSerializerConfig::default().into(), Vec::new()).await
     };
 
diff --git a/src/sinks/splunk_hec/logs/integration_tests_mezmo.rs b/src/sinks/splunk_hec/logs/integration_tests_mezmo.rs
index 7c272973c9362..babc70258397b 100644
--- a/src/sinks/splunk_hec/logs/integration_tests_mezmo.rs
+++ b/src/sinks/splunk_hec/logs/integration_tests_mezmo.rs
@@ -10,6 +10,7 @@ use crate::{
     sinks::{
         splunk_hec::{
             common::{
+                config_host_key,
                 integration_test_helpers::{get_token, splunk_api_address, splunk_hec_address},
                 EndpointTarget,
             },
@@ -87,7 +88,7 @@ async fn config(encoding: EncodingConfig, indexed_fields: Vec<String>) -> HecLog
     HecLogsSinkConfig {
         default_token: get_token().await.into(),
         endpoint: splunk_hec_address(),
-        host_key: "host".into(),
+        host_key: config_host_key(),
         indexed_fields,
         index: None,
         sourcetype: None,
diff --git a/src/sinks/splunk_hec/logs/sink.rs b/src/sinks/splunk_hec/logs/sink.rs
index 75e20c31d2cda..f17bfeaec38df 100644
--- a/src/sinks/splunk_hec/logs/sink.rs
+++ b/src/sinks/splunk_hec/logs/sink.rs
@@ -39,7 +39,7 @@ pub struct HecLogsSink<S> {
     pub source: Option<Template>,
     pub index: Option<Template>,
     pub indexed_fields: Vec<String>,
-    pub host: String,
+    pub host_key: Option<OwnedValuePath>,
     pub timestamp_nanos_key: Option<String>,
     pub timestamp_key: Option<OwnedValuePath>,
     pub endpoint_target: EndpointTarget,
@@ -50,7 +50,7 @@ pub struct HecLogData<'a> {
     pub source: Option<&'a Template>,
     pub index: Option<&'a Template>,
     pub indexed_fields: &'a [String],
-    pub host_key: &'a str,
+    pub host_key: Option<OwnedValuePath>,
     pub timestamp_nanos_key: Option<&'a String>,
     pub timestamp_key: Option<OwnedValuePath>,
     pub endpoint_target: EndpointTarget,
@@ -71,7 +71,7 @@ where
             source: self.source.as_ref(),
             index: self.index.as_ref(),
             indexed_fields: self.indexed_fields.as_slice(),
-            host_key: self.host.as_ref(),
+            host_key: self.host_key.clone(),
             timestamp_nanos_key: self.timestamp_nanos_key.as_ref(),
             timestamp_key: self.timestamp_key.clone(),
             endpoint_target: self.endpoint_target,
@@ -87,7 +87,7 @@ where
                         self.sourcetype.clone(),
                         self.source.clone(),
                         self.index.clone(),
-                        Some(self.host.clone()),
+                        self.host_key.clone(),
                     )
                 } else {
                     EventPartitioner::new(None, None, None, None)
@@ -137,7 +137,7 @@ struct EventPartitioner {
     pub sourcetype: Option<Template>,
     pub source: Option<Template>,
     pub index: Option<Template>,
-    pub host_key: Option<String>,
+    pub host_key: Option<OwnedValuePath>,
 }
 
 impl EventPartitioner {
@@ -145,7 +145,7 @@ impl EventPartitioner {
         sourcetype: Option<Template>,
         source: Option<Template>,
         index: Option<Template>,
-        host_key: Option<String>,
+        host_key: Option<OwnedValuePath>,
     ) -> Self {
         Self {
             sourcetype,
@@ -193,7 +193,7 @@ impl Partitioner for EventPartitioner {
         let host = self
             .host_key
             .as_ref()
-            .and_then(|host_key| item.event.get(host_key.as_str()))
+            .and_then(|host_key| item.event.get((PathPrefix::Event, host_key)))
             .and_then(|value| value.as_str().map(|s| s.to_string()));
 
         Some(Partitioned {
@@ -246,7 +246,11 @@ pub fn process_log(event: Event, data: &HecLogData) -> HecProcessedEvent {
         .index
         .and_then(|index| render_template_string(index, &log, INDEX_FIELD));
 
-    let host = log.get(data.host_key).cloned();
+    let host = data
+        .host_key
+        .as_ref()
+        .and_then(|key| log.get((PathPrefix::Event, key)))
+        .cloned();
 
     let timestamp = data.timestamp_key.as_ref().and_then(|timestamp_key| {
         match log.remove((PathPrefix::Event, timestamp_key)) {
diff --git a/src/sinks/splunk_hec/logs/tests.rs b/src/sinks/splunk_hec/logs/tests.rs
index f98e34870ddab..c0fbd428bfcd1 100644
--- a/src/sinks/splunk_hec/logs/tests.rs
+++ b/src/sinks/splunk_hec/logs/tests.rs
@@ -10,6 +10,7 @@ use vector_core::{
     config::log_schema,
     event::{Event, LogEvent, Value},
 };
+use vrl::owned_value_path;
 
 use super::sink::HecProcessedEvent;
 use crate::sinks::splunk_hec::common::config_timestamp_key;
@@ -84,6 +85,7 @@ fn get_processed_event_timestamp(
     let sourcetype = Template::try_from("{{ event_sourcetype }}".to_string()).ok();
     let source = Template::try_from("{{ event_source }}".to_string()).ok();
     let index = Template::try_from("{{ event_index }}".to_string()).ok();
+    let indexed_fields = vec!["event_field1".to_string(), "event_field2".to_string()];
     let timestamp_nanos_key = Some(String::from("ts_nanos_key"));
 
     process_log(
@@ -92,8 +94,8 @@ fn get_processed_event_timestamp(
             sourcetype: sourcetype.as_ref(),
             source: source.as_ref(),
             index: index.as_ref(),
-            host_key: "host_key",
-            indexed_fields: Vec::new().as_slice(),
+            host_key: Some(owned_value_path!("host_key")),
+            indexed_fields: indexed_fields.as_slice(),
             timestamp_nanos_key: timestamp_nanos_key.as_ref(),
             timestamp_key,
             endpoint_target: EndpointTarget::Event,
@@ -155,7 +157,9 @@ fn splunk_encode_log_event_json() {
     assert_eq!(event.get("key").unwrap(), &serde_json::Value::from("value"));
     assert_eq!(event.get("int_val").unwrap(), &serde_json::Value::from(123));
     assert_eq!(
-        event.get(&log_schema().message_key().to_string()).unwrap(),
+        event
+            .get(&log_schema().message_key().unwrap().to_string())
+            .unwrap(),
         &serde_json::Value::from("hello world")
     );
     assert!(event
@@ -204,7 +208,9 @@ async fn splunk_passthrough_token() {
     let config = HecLogsSinkConfig {
         default_token: "token".to_string().into(),
         endpoint: format!("http://{}", addr),
-        host_key: "host".into(),
+        host_key: OptionalValuePath {
+            path: log_schema().host_key().cloned(),
+        },
         indexed_fields: Vec::new(),
         index: None,
         sourcetype: None,
diff --git a/src/sinks/splunk_hec/metrics/config.rs b/src/sinks/splunk_hec/metrics/config.rs
index 9164c91221eb5..1a5f9d83589c5 100644
--- a/src/sinks/splunk_hec/metrics/config.rs
+++ b/src/sinks/splunk_hec/metrics/config.rs
@@ -1,6 +1,7 @@
 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;
@@ -13,7 +14,7 @@ use crate::{
     sinks::{
         splunk_hec::common::{
             acknowledgements::HecClientAcknowledgementsConfig,
-            build_healthcheck, build_http_batch_service, create_client, host_key,
+            build_healthcheck, build_http_batch_service, config_host_key, create_client,
             service::{HecService, HttpRequestBuilder},
             EndpointTarget, SplunkHecDefaultBatchSettings,
         },
@@ -71,8 +72,8 @@ pub struct HecMetricsSinkConfig {
     ///
     /// [global_host_key]: https://vector.dev/docs/reference/configuration/global-options/#log_schema.host_key
     #[configurable(metadata(docs::advanced))]
-    #[serde(default = "host_key")]
-    pub host_key: String,
+    #[serde(default = "config_host_key")]
+    pub host_key: OptionalValuePath,
 
     /// The name of the index where to send the events to.
     ///
@@ -126,7 +127,7 @@ impl GenerateConfig for HecMetricsSinkConfig {
             default_namespace: None,
             default_token: "${VECTOR_SPLUNK_HEC_TOKEN}".to_owned().into(),
             endpoint: "http://localhost:8088".to_owned(),
-            host_key: host_key(),
+            host_key: config_host_key(),
             index: None,
             sourcetype: None,
             source: None,
@@ -214,7 +215,7 @@ impl HecMetricsSinkConfig {
             sourcetype: self.sourcetype.clone(),
             source: self.source.clone(),
             index: self.index.clone(),
-            host: self.host_key.clone(),
+            host_key: self.host_key.path.clone(),
             default_namespace: self.default_namespace.clone(),
         };
 
diff --git a/src/sinks/splunk_hec/metrics/encoder.rs b/src/sinks/splunk_hec/metrics/encoder.rs
index fea4c058ea72c..5b0198825f9eb 100644
--- a/src/sinks/splunk_hec/metrics/encoder.rs
+++ b/src/sinks/splunk_hec/metrics/encoder.rs
@@ -1,6 +1,8 @@
 use std::{collections::BTreeMap, iter};
 
 use serde::Serialize;
+use vector_common::request_metadata::GroupedCountByteSize;
+use vector_core::{config::telemetry, EstimatedJsonEncodedSizeOf};
 
 use super::sink::HecProcessedEvent;
 use crate::{internal_events::SplunkEventEncodeError, sinks::util::encoding::Encoder};
@@ -95,7 +97,12 @@ impl Encoder<Vec<HecProcessedEvent>> for HecMetricsEncoder {
         &self,
         input: Vec<HecProcessedEvent>,
         writer: &mut dyn std::io::Write,
-    ) -> std::io::Result<usize> {
+    ) -> std::io::Result<(usize, GroupedCountByteSize)> {
+        let mut byte_size = telemetry().create_request_count_byte_size();
+        for event in &input {
+            byte_size.add_event(event, event.estimated_json_encoded_size_of());
+        }
+
         let encoded_input: Vec<u8> = input
             .into_iter()
             .filter_map(Self::encode_event)
@@ -103,6 +110,6 @@ impl Encoder<Vec<HecProcessedEvent>> for HecMetricsEncoder {
             .collect();
         let encoded_size = encoded_input.len();
         writer.write_all(encoded_input.as_slice())?;
-        Ok(encoded_size)
+        Ok((encoded_size, byte_size))
     }
 }
diff --git a/src/sinks/splunk_hec/metrics/integration_tests.rs b/src/sinks/splunk_hec/metrics/integration_tests.rs
index 8227e6431a9db..0cadb38084c02 100644
--- a/src/sinks/splunk_hec/metrics/integration_tests.rs
+++ b/src/sinks/splunk_hec/metrics/integration_tests.rs
@@ -1,9 +1,13 @@
 use std::convert::TryFrom;
 
 use futures::{future::ready, stream};
+use lookup::lookup_v2::OptionalValuePath;
 use serde_json::Value as JsonValue;
-use vector_core::event::{BatchNotifier, BatchStatus, Event, MetricValue};
-use vector_core::metric_tags;
+use vector_core::{
+    config::{init_telemetry, Tags, Telemetry},
+    event::{BatchNotifier, BatchStatus, Event, MetricValue},
+    metric_tags,
+};
 
 use super::config::HecMetricsSinkConfig;
 use crate::{
@@ -16,7 +20,10 @@ use crate::{
         util::{BatchConfig, Compression, TowerRequestConfig},
     },
     template::Template,
-    test_util::components::{run_and_assert_sink_compliance, HTTP_SINK_TAGS},
+    test_util::components::{
+        run_and_assert_data_volume_sink_compliance, run_and_assert_sink_compliance,
+        DATA_VOLUME_SINK_TAGS, HTTP_SINK_TAGS,
+    },
 };
 
 const USERNAME: &str = "admin";
@@ -30,7 +37,7 @@ async fn config() -> HecMetricsSinkConfig {
         default_namespace: None,
         default_token: get_token().await.into(),
         endpoint: splunk_hec_address(),
-        host_key: "host".into(),
+        host_key: OptionalValuePath::new("host"),
         index: None,
         sourcetype: None,
         source: None,
@@ -91,6 +98,48 @@ async fn splunk_insert_counter_metric() {
     );
 }
 
+fn enable_telemetry() {
+    init_telemetry(
+        Telemetry {
+            tags: Tags {
+                emit_service: true,
+                emit_source: true,
+            },
+        },
+        true,
+    );
+}
+
+#[tokio::test]
+async fn splunk_insert_counter_metric_data_volume() {
+    enable_telemetry();
+
+    let cx = SinkContext::default();
+
+    let mut config = config().await;
+    config.index = Template::try_from("testmetrics".to_string()).ok();
+    let (sink, _) = config.build(cx).await.unwrap();
+
+    let (batch, mut receiver) = BatchNotifier::new_with_receiver();
+    let event = get_counter(batch.clone());
+    drop(batch);
+    run_and_assert_data_volume_sink_compliance(
+        sink,
+        stream::once(ready(event)),
+        &DATA_VOLUME_SINK_TAGS,
+    )
+    .await;
+    assert_eq!(receiver.try_recv(), Ok(BatchStatus::Delivered));
+
+    assert!(
+        metric_dimensions_exist(
+            "example-counter",
+            &["host", "source", "sourcetype", "tag_counter_test"],
+        )
+        .await
+    );
+}
+
 #[tokio::test]
 async fn splunk_insert_gauge_metric() {
     let cx = SinkContext::default();
diff --git a/src/sinks/splunk_hec/metrics/sink.rs b/src/sinks/splunk_hec/metrics/sink.rs
index a14e83541dc4a..f41e397a7acac 100644
--- a/src/sinks/splunk_hec/metrics/sink.rs
+++ b/src/sinks/splunk_hec/metrics/sink.rs
@@ -12,6 +12,7 @@ use vector_core::{
     stream::{BatcherSettings, DriverResponse},
     ByteSizeOf,
 };
+use vrl::path::OwnedValuePath;
 
 use super::request_builder::HecMetricsRequestBuilder;
 use crate::{
@@ -32,7 +33,7 @@ pub struct HecMetricsSink<S> {
     pub sourcetype: Option<Template>,
     pub source: Option<Template>,
     pub index: Option<Template>,
-    pub host: String,
+    pub host_key: Option<OwnedValuePath>,
     pub default_namespace: Option<String>,
 }
 
@@ -47,7 +48,7 @@ where
         let sourcetype = self.sourcetype.as_ref();
         let source = self.source.as_ref();
         let index = self.index.as_ref();
-        let host = self.host.as_ref();
+        let host_key = self.host_key.as_ref();
         let default_namespace = self.default_namespace.as_deref();
 
         let builder_limit = NonZeroUsize::new(64);
@@ -60,11 +61,11 @@ where
                     sourcetype,
                     source,
                     index,
-                    host,
+                    host_key,
                     default_namespace,
                 ))
             })
-            .batched_partitioned(EventPartitioner::default(), self.batch_settings)
+            .batched_partitioned(EventPartitioner, self.batch_settings)
             .request_builder(builder_limit, self.request_builder)
             .filter_map(|request| async move {
                 match request {
@@ -158,7 +159,7 @@ pub fn process_metric(
     sourcetype: Option<&Template>,
     source: Option<&Template>,
     index: Option<&Template>,
-    host_key: &str,
+    host_key: Option<&OwnedValuePath>,
     default_namespace: Option<&str>,
 ) -> Option<HecProcessedEvent> {
     let templated_field_keys = [index.as_ref(), source.as_ref(), sourcetype.as_ref()]
@@ -176,7 +177,7 @@ pub fn process_metric(
         sourcetype.and_then(|sourcetype| render_template_string(sourcetype, &metric, "sourcetype"));
     let source = source.and_then(|source| render_template_string(source, &metric, "source"));
     let index = index.and_then(|index| render_template_string(index, &metric, "index"));
-    let host = metric.tag_value(host_key);
+    let host = host_key.and_then(|key| metric.tag_value(key.to_string().as_str()));
 
     let metadata = HecMetricsProcessedEventMetadata {
         event_byte_size,
diff --git a/src/sinks/splunk_hec/metrics/tests.rs b/src/sinks/splunk_hec/metrics/tests.rs
index 7cfd251e307d9..e068ee26b41fd 100644
--- a/src/sinks/splunk_hec/metrics/tests.rs
+++ b/src/sinks/splunk_hec/metrics/tests.rs
@@ -7,8 +7,10 @@ use vector_core::{
     event::{Event, Metric, MetricKind, MetricValue},
     metric_tags, ByteSizeOf,
 };
+use vrl::owned_value_path;
 
 use super::sink::{process_metric, HecProcessedEvent};
+use crate::sinks::splunk_hec::common::config_host_key;
 use crate::{
     config::{SinkConfig, SinkContext},
     sinks::{
@@ -69,7 +71,7 @@ fn get_processed_event(
         sourcetype.as_ref(),
         source.as_ref(),
         index.as_ref(),
-        "host",
+        Some(&owned_value_path!("host")),
         default_namespace,
     )
     .unwrap()
@@ -134,7 +136,7 @@ fn test_process_metric_unsupported_type_returns_none() {
         sourcetype,
         source,
         index,
-        "host_key",
+        Some(&owned_value_path!("host_key")),
         default_namespace
     )
     .is_none());
@@ -319,7 +321,7 @@ async fn splunk_passthrough_token() {
     let config = HecMetricsSinkConfig {
         default_token: "token".to_owned().into(),
         endpoint: format!("http://{}", addr),
-        host_key: "host".into(),
+        host_key: config_host_key(),
         index: None,
         sourcetype: None,
         source: None,
diff --git a/src/sinks/statsd/normalizer.rs b/src/sinks/statsd/normalizer.rs
index fc8a9656a636d..e497d074dfb16 100644
--- a/src/sinks/statsd/normalizer.rs
+++ b/src/sinks/statsd/normalizer.rs
@@ -145,7 +145,7 @@ mod tests {
 
     fn run_comparisons(inputs: Vec<Metric>, expected_outputs: Vec<Option<Metric>>) {
         let mut metric_set = MetricSet::default();
-        let mut normalizer = StatsdNormalizer::default();
+        let mut normalizer = StatsdNormalizer;
 
         for (input, expected) in inputs.into_iter().zip(expected_outputs) {
             let result = normalizer.normalize(&mut metric_set, input);
diff --git a/src/sinks/statsd/request_builder.rs b/src/sinks/statsd/request_builder.rs
index 9cfdf119a08d3..08034cb101f5b 100644
--- a/src/sinks/statsd/request_builder.rs
+++ b/src/sinks/statsd/request_builder.rs
@@ -4,7 +4,11 @@ use bytes::BytesMut;
 use snafu::Snafu;
 use tokio_util::codec::Encoder;
 use vector_common::request_metadata::RequestMetadata;
-use vector_core::event::{EventFinalizers, Finalizable, Metric};
+use vector_core::{
+    config::telemetry,
+    event::{EventFinalizers, Finalizable, Metric},
+    EstimatedJsonEncodedSizeOf,
+};
 
 use super::{encoder::StatsdEncoder, service::StatsdRequest};
 use crate::{
@@ -79,6 +83,7 @@ impl IncrementalRequestBuilder<Vec<Metric>> for StatsdRequestBuilder {
 
         let mut metrics = input.drain(..);
         while metrics.len() != 0 || pending.is_some() {
+            let mut byte_size = telemetry().create_request_count_byte_size();
             let mut n = 0;
 
             let mut request_buf = Vec::new();
@@ -95,6 +100,8 @@ impl IncrementalRequestBuilder<Vec<Metric>> for StatsdRequestBuilder {
                     },
                 };
 
+                byte_size.add_event(&metric, metric.estimated_json_encoded_size_of());
+
                 // Encode the metric. Once we've done that, see if it can fit into the request
                 // buffer without exceeding the maximum request size limit.
                 //
@@ -131,7 +138,7 @@ impl IncrementalRequestBuilder<Vec<Metric>> for StatsdRequestBuilder {
 
             // If we encoded one or more metrics this pass, finalize the request.
             if n > 0 {
-                let encode_result = EncodeResult::uncompressed(request_buf);
+                let encode_result = EncodeResult::uncompressed(request_buf, byte_size);
                 let request_metadata = request_metadata_builder.build(&encode_result);
 
                 results.push(Ok((
diff --git a/src/sinks/statsd/sink.rs b/src/sinks/statsd/sink.rs
index b17097147bed2..a9f0bdf44a9e2 100644
--- a/src/sinks/statsd/sink.rs
+++ b/src/sinks/statsd/sink.rs
@@ -58,10 +58,7 @@ where
             // other metric types in type-specific ways i.e. incremental gauge updates use a
             // different syntax, etc.
             .normalized_with_default::<StatsdNormalizer>()
-            .batched(
-                self.batch_settings
-                    .into_item_size_config(StatsdBatchSizer::default()),
-            )
+            .batched(self.batch_settings.into_item_size_config(StatsdBatchSizer))
             // We build our requests "incrementally", which means that for a single batch of
             // metrics, we might generate N requests to represent all of the metrics in the batch.
             //
diff --git a/src/sinks/sumo_logic/encoding.rs b/src/sinks/sumo_logic/encoding.rs
index 8369500f7aee7..75ebd2e4fe75e 100644
--- a/src/sinks/sumo_logic/encoding.rs
+++ b/src/sinks/sumo_logic/encoding.rs
@@ -1,8 +1,8 @@
 use std::io;
 
-use serde::Serialize;
-
+use crate::sinks::prelude::*;
 use crate::sinks::util::encoding::{as_tracked_write, Encoder};
+use serde::Serialize;
 
 use super::models::{SumoLogicModel, SumoMetricsModel};
 use super::sink::SumoLogicSinkError;
@@ -15,7 +15,7 @@ impl Encoder<Result<SumoLogicModel, SumoLogicSinkError>> for SumoLogicEncoder {
         &self,
         input: Result<SumoLogicModel, SumoLogicSinkError>,
         writer: &mut dyn io::Write,
-    ) -> io::Result<usize> {
+    ) -> io::Result<(usize, GroupedCountByteSize)> {
         let json = match input? {
             SumoLogicModel::Logs(log_model) => to_json(&log_model)?,
             SumoLogicModel::Metrics(metric_model) => metrics_to_utf8(&metric_model)?,
@@ -24,7 +24,12 @@ impl Encoder<Result<SumoLogicModel, SumoLogicSinkError>> for SumoLogicEncoder {
             writer.write_all(json)?;
             Ok(())
         })?;
-        io::Result::Ok(size)
+        io::Result::Ok((
+            size,
+            GroupedCountByteSize::Untagged {
+                size: CountByteSize(size, JsonSize::new(size)),
+            },
+        ))
     }
 }
 
diff --git a/src/sinks/util/adaptive_concurrency/controller.rs b/src/sinks/util/adaptive_concurrency/controller.rs
index 83250994bf752..19615f7ba2742 100644
--- a/src/sinks/util/adaptive_concurrency/controller.rs
+++ b/src/sinks/util/adaptive_concurrency/controller.rs
@@ -69,7 +69,7 @@ impl<L> Controller<L> {
         // current limit and the maximum, effectively bypassing all the
         // mechanisms. Otherwise, the current limit is set to 1 and the
         // maximum to MAX_CONCURRENCY.
-        let current_limit = concurrency.unwrap_or(1);
+        let current_limit = concurrency.unwrap_or(settings.initial_concurrency);
         Self {
             semaphore: Arc::new(ShrinkableSemaphore::new(current_limit)),
             concurrency,
diff --git a/src/sinks/util/adaptive_concurrency/mod.rs b/src/sinks/util/adaptive_concurrency/mod.rs
index a9795f70f2957..228d93d4e28b8 100644
--- a/src/sinks/util/adaptive_concurrency/mod.rs
+++ b/src/sinks/util/adaptive_concurrency/mod.rs
@@ -9,6 +9,8 @@ mod service;
 #[cfg(test)]
 pub mod tests;
 
+// Make sure to update the max range of the `AdaptiveConcurrencySettings::initial_concurrency` when changing
+// this constant.
 pub(super) const MAX_CONCURRENCY: usize = 200;
 
 pub(crate) use layer::AdaptiveConcurrencyLimitLayer;
@@ -29,6 +31,15 @@ pub(self) fn instant_now() -> std::time::Instant {
 #[derive(Clone, Copy, Debug)]
 #[serde(deny_unknown_fields)]
 pub struct AdaptiveConcurrencySettings {
+    /// The initial concurrency limit to use. If not specified, the initial limit will be 1 (no concurrency).
+    ///
+    /// It is recommended to set this value to your service's average limit if you're seeing that it takes a
+    /// long time to ramp up adaptive concurrency after a restart. You can find this value by looking at the
+    /// `adaptive_concurrency_limit` metric.
+    #[configurable(validation(range(min = 1, max = 200)))]
+    #[serde(default = "default_initial_concurrency")]
+    pub(super) initial_concurrency: usize,
+
     /// The fraction of the current value to set the new concurrency limit when decreasing the limit.
     ///
     /// Valid values are greater than `0` and less than `1`. Smaller values cause the algorithm to scale back rapidly
@@ -63,6 +74,10 @@ pub struct AdaptiveConcurrencySettings {
     pub(super) rtt_deviation_scale: f64,
 }
 
+const fn default_initial_concurrency() -> usize {
+    1
+}
+
 const fn default_decrease_ratio() -> f64 {
     0.9
 }
@@ -84,6 +99,7 @@ impl AdaptiveConcurrencySettings {
 impl Default for AdaptiveConcurrencySettings {
     fn default() -> Self {
         Self {
+            initial_concurrency: default_initial_concurrency(),
             decrease_ratio: default_decrease_ratio(),
             ewma_alpha: default_ewma_alpha(),
             rtt_deviation_scale: default_rtt_deviation_scale(),
diff --git a/src/sinks/util/buffer/compression.rs b/src/sinks/util/buffer/compression.rs
index 8171e4a563238..11796b046104a 100644
--- a/src/sinks/util/buffer/compression.rs
+++ b/src/sinks/util/buffer/compression.rs
@@ -431,7 +431,21 @@ impl<'de> de::Deserialize<'de> for CompressionLevel {
             where
                 E: de::Error,
             {
-                Ok(CompressionLevel::Val(v as u32))
+                u32::try_from(v).map(CompressionLevel::Val).map_err(|err| {
+                    de::Error::custom(format!(
+                        "unsigned integer could not be converted to u32: {}",
+                        err
+                    ))
+                })
+            }
+
+            fn visit_i64<E>(self, v: i64) -> Result<Self::Value, E>
+            where
+                E: de::Error,
+            {
+                u32::try_from(v).map(CompressionLevel::Val).map_err(|err| {
+                    de::Error::custom(format!("integer could not be converted to u32: {}", err))
+                })
             }
         }
 
@@ -490,7 +504,7 @@ mod test {
     use super::{Compression, CompressionLevel};
 
     #[test]
-    fn deserialization() {
+    fn deserialization_json() {
         let fixtures_valid = [
             (r#""none""#, Compression::None),
             (r#""gzip""#, Compression::Gzip(CompressionLevel::default())),
@@ -545,7 +559,7 @@ mod test {
             ),
             (
                 r#"{"algorithm": "gzip", "level": -1}"#,
-                r#"invalid type: integer `-1`, expected unsigned number or string at line 1 column 33"#,
+                r#"integer could not be converted to u32: out of range integral type conversion attempted at line 1 column 33"#,
             ),
             (
                 r#"{"algorithm": "gzip", "level": "good"}"#,
@@ -575,6 +589,22 @@ mod test {
         }
     }
 
+    #[test]
+    fn deserialization_toml() {
+        let fixtures_valid = [
+            // TOML differs from YAML and JSON by always parsing integers as signed
+            (
+                r#"algorithm = "gzip"
+                   level = 8"#,
+                Compression::Gzip(CompressionLevel::Val(8)),
+            ),
+        ];
+        for (sources, result) in fixtures_valid.iter() {
+            let deserialized: Result<Compression, _> = toml::from_str(sources);
+            assert_eq!(deserialized.expect("valid source"), *result);
+        }
+    }
+
     #[test]
     fn from_and_to_value() {
         let fixtures_valid = [
diff --git a/src/sinks/util/encoding.rs b/src/sinks/util/encoding.rs
index 00dc6944bdbad..d74b0ad3c2034 100644
--- a/src/sinks/util/encoding.rs
+++ b/src/sinks/util/encoding.rs
@@ -3,6 +3,8 @@ use std::io;
 use bytes::BytesMut;
 use codecs::encoding::Framer;
 use tokio_util::codec::Encoder as _;
+use vector_common::request_metadata::GroupedCountByteSize;
+use vector_core::{config::telemetry, EstimatedJsonEncodedSizeOf};
 
 use crate::{codecs::Transformer, event::Event, internal_events::EncoderWriteError};
 
@@ -12,7 +14,11 @@ pub trait Encoder<T> {
     /// # Errors
     ///
     /// If an I/O error is encountered while encoding the input, an error variant will be returned.
-    fn encode_input(&self, input: T, writer: &mut dyn io::Write) -> io::Result<usize>;
+    fn encode_input(
+        &self,
+        input: T,
+        writer: &mut dyn io::Write,
+    ) -> io::Result<(usize, GroupedCountByteSize)>;
 }
 
 impl Encoder<Vec<Event>> for (Transformer, crate::codecs::Encoder<Framer>) {
@@ -20,16 +26,24 @@ impl Encoder<Vec<Event>> for (Transformer, crate::codecs::Encoder<Framer>) {
         &self,
         mut events: Vec<Event>,
         writer: &mut dyn io::Write,
-    ) -> io::Result<usize> {
+    ) -> io::Result<(usize, GroupedCountByteSize)> {
         let mut encoder = self.1.clone();
         let mut bytes_written = 0;
         let mut n_events_pending = events.len();
         let batch_prefix = encoder.batch_prefix();
         write_all(writer, n_events_pending, batch_prefix)?;
         bytes_written += batch_prefix.len();
+
+        let mut byte_size = telemetry().create_request_count_byte_size();
+
         if let Some(last) = events.pop() {
             for mut event in events {
                 self.0.transform(&mut event);
+
+                // Ensure the json size is calculated after any fields have been removed
+                // by the transformer.
+                byte_size.add_event(&event, event.estimated_json_encoded_size_of());
+
                 let mut bytes = BytesMut::new();
                 encoder
                     .encode(event, &mut bytes)
@@ -40,6 +54,11 @@ impl Encoder<Vec<Event>> for (Transformer, crate::codecs::Encoder<Framer>) {
             }
             let mut event = last;
             self.0.transform(&mut event);
+
+            // Ensure the json size is calculated after any fields have been removed
+            // by the transformer.
+            byte_size.add_event(&event, event.estimated_json_encoded_size_of());
+
             let mut bytes = BytesMut::new();
             encoder
                 .serialize(event, &mut bytes)
@@ -53,20 +72,28 @@ impl Encoder<Vec<Event>> for (Transformer, crate::codecs::Encoder<Framer>) {
         write_all(writer, 0, batch_suffix)?;
         bytes_written += batch_suffix.len();
 
-        Ok(bytes_written)
+        Ok((bytes_written, byte_size))
     }
 }
 
 impl Encoder<Event> for (Transformer, crate::codecs::Encoder<()>) {
-    fn encode_input(&self, mut event: Event, writer: &mut dyn io::Write) -> io::Result<usize> {
+    fn encode_input(
+        &self,
+        mut event: Event,
+        writer: &mut dyn io::Write,
+    ) -> io::Result<(usize, GroupedCountByteSize)> {
         let mut encoder = self.1.clone();
         self.0.transform(&mut event);
+
+        let mut byte_size = telemetry().create_request_count_byte_size();
+        byte_size.add_event(&event, event.estimated_json_encoded_size_of());
+
         let mut bytes = BytesMut::new();
         encoder
             .serialize(event, &mut bytes)
             .map_err(|error| io::Error::new(io::ErrorKind::InvalidData, error))?;
         write_all(writer, 1, &bytes)?;
-        Ok(bytes.len())
+        Ok((bytes.len(), byte_size))
     }
 }
 
@@ -128,6 +155,7 @@ mod tests {
         CharacterDelimitedEncoder, JsonSerializerConfig, NewlineDelimitedEncoder,
         TextSerializerConfig,
     };
+    use vector_common::{internal_event::CountByteSize, json_size::JsonSize};
     use vector_core::event::LogEvent;
     use vrl::value::Value;
 
@@ -144,10 +172,14 @@ mod tests {
         );
 
         let mut writer = Vec::new();
-        let written = encoding.encode_input(vec![], &mut writer).unwrap();
+        let (written, json_size) = encoding.encode_input(vec![], &mut writer).unwrap();
         assert_eq!(written, 2);
 
         assert_eq!(String::from_utf8(writer).unwrap(), "[]");
+        assert_eq!(
+            CountByteSize(0, JsonSize::zero()),
+            json_size.size().unwrap()
+        );
     }
 
     #[test]
@@ -161,18 +193,21 @@ mod tests {
         );
 
         let mut writer = Vec::new();
-        let written = encoding
-            .encode_input(
-                vec![Event::Log(LogEvent::from(BTreeMap::from([(
-                    String::from("key"),
-                    Value::from("value"),
-                )])))],
-                &mut writer,
-            )
-            .unwrap();
+        let input = vec![Event::Log(LogEvent::from(BTreeMap::from([(
+            String::from("key"),
+            Value::from("value"),
+        )])))];
+
+        let input_json_size = input
+            .iter()
+            .map(|event| event.estimated_json_encoded_size_of())
+            .sum::<JsonSize>();
+
+        let (written, json_size) = encoding.encode_input(input, &mut writer).unwrap();
         assert_eq!(written, 17);
 
         assert_eq!(String::from_utf8(writer).unwrap(), r#"[{"key":"value"}]"#);
+        assert_eq!(CountByteSize(1, input_json_size), json_size.size().unwrap());
     }
 
     #[test]
@@ -185,32 +220,36 @@ mod tests {
             ),
         );
 
+        let input = vec![
+            Event::Log(LogEvent::from(BTreeMap::from([(
+                String::from("key"),
+                Value::from("value1"),
+            )]))),
+            Event::Log(LogEvent::from(BTreeMap::from([(
+                String::from("key"),
+                Value::from("value2"),
+            )]))),
+            Event::Log(LogEvent::from(BTreeMap::from([(
+                String::from("key"),
+                Value::from("value3"),
+            )]))),
+        ];
+
+        let input_json_size = input
+            .iter()
+            .map(|event| event.estimated_json_encoded_size_of())
+            .sum::<JsonSize>();
+
         let mut writer = Vec::new();
-        let written = encoding
-            .encode_input(
-                vec![
-                    Event::Log(LogEvent::from(BTreeMap::from([(
-                        String::from("key"),
-                        Value::from("value1"),
-                    )]))),
-                    Event::Log(LogEvent::from(BTreeMap::from([(
-                        String::from("key"),
-                        Value::from("value2"),
-                    )]))),
-                    Event::Log(LogEvent::from(BTreeMap::from([(
-                        String::from("key"),
-                        Value::from("value3"),
-                    )]))),
-                ],
-                &mut writer,
-            )
-            .unwrap();
+        let (written, json_size) = encoding.encode_input(input, &mut writer).unwrap();
         assert_eq!(written, 52);
 
         assert_eq!(
             String::from_utf8(writer).unwrap(),
             r#"[{"key":"value1"},{"key":"value2"},{"key":"value3"}]"#
         );
+
+        assert_eq!(CountByteSize(3, input_json_size), json_size.size().unwrap());
     }
 
     #[test]
@@ -224,10 +263,14 @@ mod tests {
         );
 
         let mut writer = Vec::new();
-        let written = encoding.encode_input(vec![], &mut writer).unwrap();
+        let (written, json_size) = encoding.encode_input(vec![], &mut writer).unwrap();
         assert_eq!(written, 0);
 
         assert_eq!(String::from_utf8(writer).unwrap(), "");
+        assert_eq!(
+            CountByteSize(0, JsonSize::zero()),
+            json_size.size().unwrap()
+        );
     }
 
     #[test]
@@ -241,18 +284,20 @@ mod tests {
         );
 
         let mut writer = Vec::new();
-        let written = encoding
-            .encode_input(
-                vec![Event::Log(LogEvent::from(BTreeMap::from([(
-                    String::from("key"),
-                    Value::from("value"),
-                )])))],
-                &mut writer,
-            )
-            .unwrap();
+        let input = vec![Event::Log(LogEvent::from(BTreeMap::from([(
+            String::from("key"),
+            Value::from("value"),
+        )])))];
+        let input_json_size = input
+            .iter()
+            .map(|event| event.estimated_json_encoded_size_of())
+            .sum::<JsonSize>();
+
+        let (written, json_size) = encoding.encode_input(input, &mut writer).unwrap();
         assert_eq!(written, 15);
 
         assert_eq!(String::from_utf8(writer).unwrap(), r#"{"key":"value"}"#);
+        assert_eq!(CountByteSize(1, input_json_size), json_size.size().unwrap());
     }
 
     #[test]
@@ -266,31 +311,33 @@ mod tests {
         );
 
         let mut writer = Vec::new();
-        let written = encoding
-            .encode_input(
-                vec![
-                    Event::Log(LogEvent::from(BTreeMap::from([(
-                        String::from("key"),
-                        Value::from("value1"),
-                    )]))),
-                    Event::Log(LogEvent::from(BTreeMap::from([(
-                        String::from("key"),
-                        Value::from("value2"),
-                    )]))),
-                    Event::Log(LogEvent::from(BTreeMap::from([(
-                        String::from("key"),
-                        Value::from("value3"),
-                    )]))),
-                ],
-                &mut writer,
-            )
-            .unwrap();
+        let input = vec![
+            Event::Log(LogEvent::from(BTreeMap::from([(
+                String::from("key"),
+                Value::from("value1"),
+            )]))),
+            Event::Log(LogEvent::from(BTreeMap::from([(
+                String::from("key"),
+                Value::from("value2"),
+            )]))),
+            Event::Log(LogEvent::from(BTreeMap::from([(
+                String::from("key"),
+                Value::from("value3"),
+            )]))),
+        ];
+        let input_json_size = input
+            .iter()
+            .map(|event| event.estimated_json_encoded_size_of())
+            .sum::<JsonSize>();
+
+        let (written, json_size) = encoding.encode_input(input, &mut writer).unwrap();
         assert_eq!(written, 50);
 
         assert_eq!(
             String::from_utf8(writer).unwrap(),
             "{\"key\":\"value1\"}\n{\"key\":\"value2\"}\n{\"key\":\"value3\"}"
         );
+        assert_eq!(CountByteSize(3, input_json_size), json_size.size().unwrap());
     }
 
     #[test]
@@ -301,18 +348,17 @@ mod tests {
         );
 
         let mut writer = Vec::new();
-        let written = encoding
-            .encode_input(
-                Event::Log(LogEvent::from(BTreeMap::from([(
-                    String::from("key"),
-                    Value::from("value"),
-                )]))),
-                &mut writer,
-            )
-            .unwrap();
+        let input = Event::Log(LogEvent::from(BTreeMap::from([(
+            String::from("key"),
+            Value::from("value"),
+        )])));
+        let input_json_size = input.estimated_json_encoded_size_of();
+
+        let (written, json_size) = encoding.encode_input(input, &mut writer).unwrap();
         assert_eq!(written, 15);
 
         assert_eq!(String::from_utf8(writer).unwrap(), r#"{"key":"value"}"#);
+        assert_eq!(CountByteSize(1, input_json_size), json_size.size().unwrap());
     }
 
     #[test]
@@ -323,17 +369,16 @@ mod tests {
         );
 
         let mut writer = Vec::new();
-        let written = encoding
-            .encode_input(
-                Event::Log(LogEvent::from(BTreeMap::from([(
-                    String::from("message"),
-                    Value::from("value"),
-                )]))),
-                &mut writer,
-            )
-            .unwrap();
+        let input = Event::Log(LogEvent::from(BTreeMap::from([(
+            String::from("message"),
+            Value::from("value"),
+        )])));
+        let input_json_size = input.estimated_json_encoded_size_of();
+
+        let (written, json_size) = encoding.encode_input(input, &mut writer).unwrap();
         assert_eq!(written, 5);
 
         assert_eq!(String::from_utf8(writer).unwrap(), r#"value"#);
+        assert_eq!(CountByteSize(1, input_json_size), json_size.size().unwrap());
     }
 }
diff --git a/src/sinks/util/metadata.rs b/src/sinks/util/metadata.rs
index e6f4e7739e4d2..b9418c128244a 100644
--- a/src/sinks/util/metadata.rs
+++ b/src/sinks/util/metadata.rs
@@ -1,20 +1,15 @@
 use std::num::NonZeroUsize;
 
+use vector_common::request_metadata::{GetEventCountTags, GroupedCountByteSize, RequestMetadata};
 use vector_core::{config, ByteSizeOf, EstimatedJsonEncodedSizeOf};
 
-use vector_common::{
-    internal_event::CountByteSize,
-    json_size::JsonSize,
-    request_metadata::{GetEventCountTags, GroupedCountByteSize, RequestMetadata},
-};
-
 use super::request_builder::EncodeResult;
 
 #[derive(Clone, Default)]
 pub struct RequestMetadataBuilder {
     event_count: usize,
     events_byte_size: usize,
-    events_estimated_json_encoded_byte_size: GroupedCountByteSize,
+    grouped_events_byte_size: GroupedCountByteSize,
 }
 
 impl RequestMetadataBuilder {
@@ -34,7 +29,7 @@ impl RequestMetadataBuilder {
         Self {
             event_count: events.len(),
             events_byte_size,
-            events_estimated_json_encoded_byte_size: size,
+            grouped_events_byte_size: size,
         }
     }
 
@@ -48,23 +43,19 @@ impl RequestMetadataBuilder {
         Self {
             event_count: 1,
             events_byte_size: event.size_of(),
-            events_estimated_json_encoded_byte_size: size,
+            grouped_events_byte_size: size,
         }
     }
 
-    pub fn new(
+    pub const fn new(
         event_count: usize,
         events_byte_size: usize,
-        events_estimated_json_encoded_byte_size: JsonSize,
+        grouped_events_byte_size: GroupedCountByteSize,
     ) -> Self {
         Self {
             event_count,
             events_byte_size,
-            events_estimated_json_encoded_byte_size: CountByteSize(
-                event_count,
-                events_estimated_json_encoded_byte_size,
-            )
-            .into(),
+            grouped_events_byte_size,
         }
     }
 
@@ -75,10 +66,11 @@ impl RequestMetadataBuilder {
         self.event_count += 1;
         self.events_byte_size += event.size_of();
         let json_size = event.estimated_json_encoded_size_of();
-        self.events_estimated_json_encoded_byte_size
-            .add_event(&event, json_size);
+        self.grouped_events_byte_size.add_event(&event, json_size);
     }
 
+    /// Builds the [`RequestMetadata`] with the given size.
+    /// This is used when there is no encoder in the process to provide an `EncodeResult`
     pub fn with_request_size(&self, size: NonZeroUsize) -> RequestMetadata {
         let size = size.get();
 
@@ -87,10 +79,14 @@ impl RequestMetadataBuilder {
             self.events_byte_size,
             size,
             size,
-            self.events_estimated_json_encoded_byte_size.clone(),
+            self.grouped_events_byte_size.clone(),
         )
     }
 
+    /// Builds the [`RequestMetadata`] from the results of encoding.
+    /// `EncodeResult` provides us with the byte size before and after compression
+    /// and the json size of the events after transforming (dropping unwanted fields) but
+    /// before encoding.
     pub fn build<T>(&self, result: &EncodeResult<T>) -> RequestMetadata {
         RequestMetadata::new(
             self.event_count,
@@ -99,7 +95,9 @@ impl RequestMetadataBuilder {
             result
                 .compressed_byte_size
                 .unwrap_or(result.uncompressed_byte_size),
-            self.events_estimated_json_encoded_byte_size.clone(),
+            // Building from an encoded result, we take the json size from the encoded since that has the size
+            // after transforming the event.
+            result.transformed_json_size.clone(),
         )
     }
 }
diff --git a/src/sinks/util/processed_event.rs b/src/sinks/util/processed_event.rs
index fe4a50a8eb42d..63b6ba8e1425b 100644
--- a/src/sinks/util/processed_event.rs
+++ b/src/sinks/util/processed_event.rs
@@ -1,7 +1,6 @@
 use serde::Serialize;
 use vector_common::{
-    json_size::JsonSize,
-    request_metadata::{EventCountTags, GetEventCountTags},
+    internal_event::TaggedEventsSent, json_size::JsonSize, request_metadata::GetEventCountTags,
 };
 use vector_core::{
     event::{EventFinalizers, Finalizable, LogEvent, MaybeAsLogMut},
@@ -57,7 +56,7 @@ impl<E, M> GetEventCountTags for ProcessedEvent<E, M>
 where
     E: GetEventCountTags,
 {
-    fn get_tags(&self) -> EventCountTags {
+    fn get_tags(&self) -> TaggedEventsSent {
         self.event.get_tags()
     }
 }
diff --git a/src/sinks/util/request_builder.rs b/src/sinks/util/request_builder.rs
index 87280d2ec966e..86501f3a96a04 100644
--- a/src/sinks/util/request_builder.rs
+++ b/src/sinks/util/request_builder.rs
@@ -1,13 +1,14 @@
 use std::io;
 
 use bytes::Bytes;
-use vector_common::request_metadata::RequestMetadata;
+use vector_common::request_metadata::{GroupedCountByteSize, RequestMetadata};
 
 use super::{encoding::Encoder, metadata::RequestMetadataBuilder, Compression, Compressor};
 
 pub struct EncodeResult<P> {
     pub payload: P,
     pub uncompressed_byte_size: usize,
+    pub transformed_json_size: GroupedCountByteSize,
     pub compressed_byte_size: Option<usize>,
 }
 
@@ -15,20 +16,26 @@ impl<P> EncodeResult<P>
 where
     P: AsRef<[u8]>,
 {
-    pub fn uncompressed(payload: P) -> Self {
+    pub fn uncompressed(payload: P, transformed_json_size: GroupedCountByteSize) -> Self {
         let uncompressed_byte_size = payload.as_ref().len();
         Self {
             payload,
             uncompressed_byte_size,
+            transformed_json_size,
             compressed_byte_size: None,
         }
     }
 
-    pub fn compressed(payload: P, uncompressed_byte_size: usize) -> Self {
+    pub fn compressed(
+        payload: P,
+        uncompressed_byte_size: usize,
+        transformed_json_size: GroupedCountByteSize,
+    ) -> Self {
         let compressed_byte_size = payload.as_ref().len();
         Self {
             payload,
             uncompressed_byte_size,
+            transformed_json_size,
             compressed_byte_size: Some(compressed_byte_size),
         }
     }
@@ -74,14 +81,14 @@ pub trait RequestBuilder<Input> {
         // of clash-y with `Self::Metadata`.
         let mut compressor = Compressor::from(self.compression());
         let is_compressed = compressor.is_compressed();
-        _ = self.encoder().encode_input(events, &mut compressor)?;
+        let (_, json_size) = self.encoder().encode_input(events, &mut compressor)?;
 
         let payload = compressor.into_inner().freeze();
         let result = if is_compressed {
             let compressed_byte_size = payload.len();
-            EncodeResult::compressed(payload.into(), compressed_byte_size)
+            EncodeResult::compressed(payload.into(), compressed_byte_size, json_size)
         } else {
-            EncodeResult::uncompressed(payload.into())
+            EncodeResult::uncompressed(payload.into(), json_size)
         };
 
         Ok(result)
diff --git a/src/sinks/vector/config.rs b/src/sinks/vector/config.rs
index 74450c117df01..c83f088c9e35b 100644
--- a/src/sinks/vector/config.rs
+++ b/src/sinks/vector/config.rs
@@ -16,6 +16,7 @@ use crate::{
         AcknowledgementsConfig, GenerateConfig, Input, ProxyConfig, SinkConfig, SinkContext,
         SinkHealthcheckOptions,
     },
+    http::build_proxy_connector,
     proto::vector as proto,
     sinks::{
         util::{
@@ -24,7 +25,7 @@ use crate::{
         },
         Healthcheck, VectorSink as VectorSinkType,
     },
-    tls::{tls_connector_builder, MaybeTlsSettings, TlsEnableableConfig},
+    tls::{MaybeTlsSettings, TlsEnableableConfig},
 };
 
 /// Configuration for the `vector` sink.
@@ -209,23 +210,7 @@ fn new_client(
     tls_settings: &MaybeTlsSettings,
     proxy_config: &ProxyConfig,
 ) -> crate::Result<hyper::Client<ProxyConnector<HttpsConnector<HttpConnector>>, BoxBody>> {
-    let mut http = HttpConnector::new();
-    http.enforce_http(false);
-
-    let tls = tls_connector_builder(tls_settings)?;
-    let mut https = HttpsConnector::with_connector(http, tls)?;
-
-    let settings = tls_settings.tls().cloned();
-    https.set_callback(move |c, _uri| {
-        if let Some(settings) = &settings {
-            settings.apply_connect_configuration(c);
-        }
-
-        Ok(())
-    });
-
-    let mut proxy = ProxyConnector::new(https).unwrap();
-    proxy_config.configure(&mut proxy)?;
+    let proxy = build_proxy_connector(tls_settings.clone(), proxy_config)?;
 
     Ok(hyper::Client::builder().http2_only(true).build(proxy))
 }
@@ -253,6 +238,7 @@ impl RetryLogic for VectorGrpcRetryLogic {
                     | OutOfRange
                     | Unimplemented
                     | Unauthenticated
+                    | DataLoss
             ),
             _ => true,
         }
diff --git a/src/sinks/vector/mod.rs b/src/sinks/vector/mod.rs
index 03d77611ad239..e3a6b2b1b918a 100644
--- a/src/sinks/vector/mod.rs
+++ b/src/sinks/vector/mod.rs
@@ -45,7 +45,10 @@ mod tests {
     use http::request::Parts;
     use hyper::Method;
     use prost::Message;
-    use vector_core::event::{BatchNotifier, BatchStatus};
+    use vector_core::{
+        config::{init_telemetry, Tags, Telemetry},
+        event::{BatchNotifier, BatchStatus},
+    };
 
     use super::config::with_default_scheme;
     use super::*;
@@ -55,7 +58,10 @@ mod tests {
         proto::vector as proto,
         sinks::util::test::build_test_server_generic,
         test_util::{
-            components::{run_and_assert_sink_compliance, HTTP_SINK_TAGS},
+            components::{
+                run_and_assert_data_volume_sink_compliance, run_and_assert_sink_compliance,
+                DATA_VOLUME_SINK_TAGS, HTTP_SINK_TAGS,
+            },
             next_addr, random_lines_with_stream,
         },
     };
@@ -68,8 +74,12 @@ mod tests {
         crate::test_util::test_generate_config::<VectorConfig>();
     }
 
-    #[tokio::test]
-    async fn deliver_message() {
+    enum TestType {
+        Normal,
+        DataVolume,
+    }
+
+    async fn run_sink_test(test_type: TestType) {
         let num_lines = 10;
 
         let in_addr = next_addr();
@@ -93,7 +103,15 @@ mod tests {
         let (batch, mut receiver) = BatchNotifier::new_with_receiver();
         let (input_lines, events) = random_lines_with_stream(8, num_lines, Some(batch));
 
-        run_and_assert_sink_compliance(sink, events, &HTTP_SINK_TAGS).await;
+        match test_type {
+            TestType::Normal => run_and_assert_sink_compliance(sink, events, &HTTP_SINK_TAGS).await,
+
+            TestType::DataVolume => {
+                run_and_assert_data_volume_sink_compliance(sink, events, &DATA_VOLUME_SINK_TAGS)
+                    .await
+            }
+        }
+
         drop(trigger);
 
         assert_eq!(receiver.try_recv(), Ok(BatchStatus::Delivered));
@@ -112,6 +130,26 @@ mod tests {
         assert_eq!(input_lines, output_lines);
     }
 
+    #[tokio::test]
+    async fn deliver_message() {
+        run_sink_test(TestType::Normal).await;
+    }
+
+    #[tokio::test]
+    async fn data_volume_tags() {
+        init_telemetry(
+            Telemetry {
+                tags: Tags {
+                    emit_service: true,
+                    emit_source: true,
+                },
+            },
+            true,
+        );
+
+        run_sink_test(TestType::DataVolume).await;
+    }
+
     #[tokio::test]
     async fn acknowledges_error() {
         let num_lines = 10;
diff --git a/src/sinks/vector/service.rs b/src/sinks/vector/service.rs
index 5277a408634ee..a89271d4f928d 100644
--- a/src/sinks/vector/service.rs
+++ b/src/sinks/vector/service.rs
@@ -119,6 +119,7 @@ impl Service<VectorRequest> for VectorService {
                         protocol: &service.protocol,
                         endpoint: &service.endpoint,
                     });
+
                     VectorResponse { events_byte_size }
                 })
                 .map_err(|source| VectorSinkError::Request { source }.into())
diff --git a/src/sinks/vector/sink.rs b/src/sinks/vector/sink.rs
index 229867194ddfd..fe77de6837883 100644
--- a/src/sinks/vector/sink.rs
+++ b/src/sinks/vector/sink.rs
@@ -4,8 +4,9 @@ use async_trait::async_trait;
 use futures::{stream::BoxStream, StreamExt};
 use prost::Message;
 use tower::Service;
-use vector_common::json_size::JsonSize;
+use vector_common::request_metadata::GroupedCountByteSize;
 use vector_core::{
+    config::telemetry,
     stream::{BatcherSettings, DriverResponse},
     ByteSizeOf, EstimatedJsonEncodedSizeOf,
 };
@@ -20,18 +21,29 @@ use crate::{
 /// Data for a single event.
 struct EventData {
     byte_size: usize,
-    json_byte_size: JsonSize,
+    json_byte_size: GroupedCountByteSize,
     finalizers: EventFinalizers,
     wrapper: EventWrapper,
 }
 
 /// Temporary struct to collect events during batching.
-#[derive(Clone, Default)]
+#[derive(Clone)]
 struct EventCollection {
     pub finalizers: EventFinalizers,
     pub events: Vec<EventWrapper>,
     pub events_byte_size: usize,
-    pub events_json_byte_size: JsonSize,
+    pub events_json_byte_size: GroupedCountByteSize,
+}
+
+impl Default for EventCollection {
+    fn default() -> Self {
+        Self {
+            finalizers: Default::default(),
+            events: Default::default(),
+            events_byte_size: Default::default(),
+            events_json_byte_size: telemetry().create_request_count_byte_size(),
+        }
+    }
 }
 
 pub struct VectorSink<S> {
@@ -48,11 +60,16 @@ where
 {
     async fn run_inner(self: Box<Self>, input: BoxStream<'_, Event>) -> Result<(), ()> {
         input
-            .map(|mut event| EventData {
-                byte_size: event.size_of(),
-                json_byte_size: event.estimated_json_encoded_size_of(),
-                finalizers: event.take_finalizers(),
-                wrapper: EventWrapper::from(event),
+            .map(|mut event| {
+                let mut byte_size = telemetry().create_request_count_byte_size();
+                byte_size.add_event(&event, event.estimated_json_encoded_size_of());
+
+                EventData {
+                    byte_size: event.size_of(),
+                    json_byte_size: byte_size,
+                    finalizers: event.take_finalizers(),
+                    wrapper: EventWrapper::from(event),
+                }
             })
             .batched(self.batch_settings.into_reducer_config(
                 |data: &EventData| data.wrapper.encoded_len(),
diff --git a/src/sinks/webhdfs/test.rs b/src/sinks/webhdfs/test.rs
index 0a558c3470225..7d4aa66e2e251 100644
--- a/src/sinks/webhdfs/test.rs
+++ b/src/sinks/webhdfs/test.rs
@@ -1,5 +1,6 @@
 use bytes::Bytes;
 use codecs::{encoding::Framer, JsonSerializerConfig, NewlineDelimitedEncoderConfig};
+use vector_common::request_metadata::GroupedCountByteSize;
 use vector_core::partition::Partitioner;
 
 use super::config::WebHdfsConfig;
@@ -66,7 +67,8 @@ fn build_request(compression: Compression) -> OpenDalRequest {
     let request_builder = request_builder(&sink_config);
     let (metadata, metadata_request_builder, _events) =
         request_builder.split_input((key, vec![log]));
-    let payload = EncodeResult::uncompressed(Bytes::new());
+    let byte_size = GroupedCountByteSize::new_untagged();
+    let payload = EncodeResult::uncompressed(Bytes::new(), byte_size);
     let request_metadata = metadata_request_builder.build(&payload);
 
     request_builder.build_request(metadata, request_metadata, payload)
diff --git a/src/sinks/websocket/sink.rs b/src/sinks/websocket/sink.rs
index 6acbf99967b43..9cb00d2b53ea9 100644
--- a/src/sinks/websocket/sink.rs
+++ b/src/sinks/websocket/sink.rs
@@ -132,10 +132,7 @@ impl WebSocketConnector {
 
         let maybe_tls = self.tls_connect().await?;
 
-        let ws_config = WebSocketConfig {
-            max_send_queue: None, // don't buffer messages
-            ..Default::default()
-        };
+        let ws_config = WebSocketConfig::default();
 
         let (ws_stream, _response) = client_async_with_config(request, maybe_tls, Some(ws_config))
             .await
@@ -236,6 +233,17 @@ impl WebSocketSink {
         Ok(())
     }
 
+    const fn should_encode_as_binary(&self) -> bool {
+        use codecs::encoding::Serializer::{
+            Avro, Csv, Gelf, Json, Logfmt, Native, NativeJson, RawMessage, Text,
+        };
+
+        match self.encoder.serializer() {
+            RawMessage(_) | Avro(_) | Native(_) => true,
+            Csv(_) | Logfmt(_) | Gelf(_) | Json(_) | Text(_) | NativeJson(_) => false,
+        }
+    }
+
     async fn handle_events<I, WS, O>(
         &mut self,
         input: &mut I,
@@ -261,6 +269,7 @@ impl WebSocketSink {
 
         let bytes_sent = register!(BytesSent::from(Protocol("websocket".into())));
         let events_sent = register!(EventsSent::from(Output(None)));
+        let encode_as_binary = self.should_encode_as_binary();
 
         loop {
             let result = tokio::select! {
@@ -301,7 +310,12 @@ impl WebSocketSink {
                         Ok(()) => {
                             finalizers.update_status(EventStatus::Delivered);
 
-                            let message = Message::text(String::from_utf8_lossy(&bytes));
+                            let message = if encode_as_binary {
+                                Message::binary(bytes)
+                            }
+                            else {
+                                Message::text(String::from_utf8_lossy(&bytes))
+                            };
                             let message_len = message.len();
 
                             ws_sink.send(message).await.map(|_| {
@@ -521,10 +535,13 @@ mod tests {
 
         let output = receiver.await;
         assert_eq!(lines.len(), output.len());
-        let message_key = crate::config::log_schema().message_key();
+        let message_key = crate::config::log_schema()
+            .message_key()
+            .expect("global log_schema.message_key to be valid path")
+            .to_string();
         for (source, received) in lines.iter().zip(output) {
             let json = serde_json::from_str::<JsonValue>(&received).expect("Invalid JSON");
-            let received = json.get(message_key).unwrap().as_str().unwrap();
+            let received = json.get(message_key.as_str()).unwrap().as_str().unwrap();
             assert_eq!(source, received);
         }
     }
diff --git a/src/source_sender/mod.rs b/src/source_sender/mod.rs
index fea4a3980b64d..10e92916d3d62 100644
--- a/src/source_sender/mod.rs
+++ b/src/source_sender/mod.rs
@@ -23,7 +23,6 @@ mod errors;
 use crate::config::{ComponentKey, OutputId};
 use crate::schema::Definition;
 pub use errors::{ClosedError, StreamSendError};
-use lookup::PathPrefix;
 
 pub(crate) const CHUNK_SIZE: usize = 1000;
 
@@ -356,18 +355,23 @@ impl Inner {
     fn emit_lag_time(&self, event: EventRef<'_>, reference: i64) {
         if let Some(lag_time_metric) = &self.lag_time {
             let timestamp = match event {
-                EventRef::Log(log) => log_schema().timestamp_key().and_then(|timestamp_key| {
-                    log.get((PathPrefix::Event, timestamp_key))
-                        .and_then(get_timestamp_millis)
-                }),
+                EventRef::Log(log) => {
+                    log_schema()
+                        .timestamp_key_target_path()
+                        .and_then(|timestamp_key| {
+                            log.get(timestamp_key).and_then(get_timestamp_millis)
+                        })
+                }
                 EventRef::Metric(metric) => metric
                     .timestamp()
                     .map(|timestamp| timestamp.timestamp_millis()),
-                EventRef::Trace(trace) => log_schema().timestamp_key().and_then(|timestamp_key| {
-                    trace
-                        .get((PathPrefix::Event, timestamp_key))
-                        .and_then(get_timestamp_millis)
-                }),
+                EventRef::Trace(trace) => {
+                    log_schema()
+                        .timestamp_key_target_path()
+                        .and_then(|timestamp_key| {
+                            trace.get(timestamp_key).and_then(get_timestamp_millis)
+                        })
+                }
             };
             if let Some(timestamp) = timestamp {
                 // This will truncate precision for values larger than 2**52, but at that point the user
@@ -391,6 +395,7 @@ mod tests {
     use chrono::{DateTime, Duration};
     use rand::{thread_rng, Rng};
     use vector_core::event::{LogEvent, Metric, MetricKind, MetricValue, TraceEvent};
+    use vrl::event_path;
 
     use super::*;
     use crate::metrics::{self, Controller};
@@ -424,7 +429,7 @@ mod tests {
     async fn emits_lag_time_for_trace() {
         emit_and_test(|timestamp| {
             let mut trace = TraceEvent::default();
-            trace.insert("timestamp", timestamp);
+            trace.insert(event_path!("timestamp"), timestamp);
             Event::Trace(trace)
         })
         .await;
diff --git a/src/sources/amqp.rs b/src/sources/amqp.rs
index de71ec9e5e95c..4b6ef02f8da7c 100644
--- a/src/sources/amqp.rs
+++ b/src/sources/amqp.rs
@@ -127,7 +127,7 @@ fn default_offset_key() -> OptionalValuePath {
 impl_generate_config_from_default!(AmqpSourceConfig);
 
 impl AmqpSourceConfig {
-    fn decoder(&self, log_namespace: LogNamespace) -> Decoder {
+    fn decoder(&self, log_namespace: LogNamespace) -> vector_common::Result<Decoder> {
         DecodingConfig::new(self.framing.clone(), self.decoding.clone(), log_namespace).build()
     }
 }
@@ -278,7 +278,7 @@ fn populate_event(
 
     log_namespace.insert_vector_metadata(
         log,
-        Some(log_schema().source_type_key()),
+        log_schema().source_type_key(),
         path!("source_type"),
         Bytes::from_static(AmqpSourceConfig::NAME.as_bytes()),
     );
@@ -317,7 +317,8 @@ async fn receive_event(
     msg: Delivery,
 ) -> Result<(), ()> {
     let payload = Cursor::new(Bytes::copy_from_slice(&msg.data));
-    let mut stream = FramedRead::new(payload, config.decoder(log_namespace));
+    let decoder = config.decoder(log_namespace).map_err(|_e| ())?;
+    let mut stream = FramedRead::new(payload, decoder);
 
     // Extract timestamp from AMQP message
     let timestamp = msg
@@ -747,9 +748,9 @@ mod integration_test {
 
         let log = events[0].as_log();
         trace!("{:?}", log);
-        assert_eq!(log[log_schema().message_key()], "my message".into());
+        assert_eq!(*log.get_message().unwrap(), "my message".into());
         assert_eq!(log["routing"], routing_key.into());
-        assert_eq!(log[log_schema().source_type_key()], "amqp".into());
+        assert_eq!(*log.get_source_type().unwrap(), "amqp".into());
         let log_ts = log[log_schema().timestamp_key().unwrap().to_string()]
             .as_timestamp()
             .unwrap();
diff --git a/src/sources/aws_kinesis_firehose/handlers.rs b/src/sources/aws_kinesis_firehose/handlers.rs
index 11bc526b0648c..388e6187cd20f 100644
--- a/src/sources/aws_kinesis_firehose/handlers.rs
+++ b/src/sources/aws_kinesis_firehose/handlers.rs
@@ -93,7 +93,7 @@ pub(super) async fn firehose(
                         if let Event::Log(ref mut log) = event {
                             log_namespace.insert_vector_metadata(
                                 log,
-                                Some(log_schema().source_type_key()),
+                                log_schema().source_type_key(),
                                 path!("source_type"),
                                 Bytes::from_static(AwsKinesisFirehoseConfig::NAME.as_bytes()),
                             );
diff --git a/src/sources/aws_kinesis_firehose/mod.rs b/src/sources/aws_kinesis_firehose/mod.rs
index 749443044e944..8c7fddc2cf14d 100644
--- a/src/sources/aws_kinesis_firehose/mod.rs
+++ b/src/sources/aws_kinesis_firehose/mod.rs
@@ -142,7 +142,8 @@ impl SourceConfig for AwsKinesisFirehoseConfig {
     async fn build(&self, cx: SourceContext) -> crate::Result<super::Source> {
         let log_namespace = cx.log_namespace(self.log_namespace);
         let decoder =
-            DecodingConfig::new(self.framing.clone(), self.decoding.clone(), log_namespace).build();
+            DecodingConfig::new(self.framing.clone(), self.decoding.clone(), log_namespace)
+                .build()?;
 
         let acknowledgements = cx.do_acknowledgements(self.acknowledgements);
 
diff --git a/src/sources/aws_s3/mod.rs b/src/sources/aws_s3/mod.rs
index 0890a3869467a..7d8618437848f 100644
--- a/src/sources/aws_s3/mod.rs
+++ b/src/sources/aws_s3/mod.rs
@@ -241,7 +241,8 @@ impl AwsS3Config {
         .await?;
 
         let decoder =
-            DecodingConfig::new(self.framing.clone(), self.decoding.clone(), log_namespace).build();
+            DecodingConfig::new(self.framing.clone(), self.decoding.clone(), log_namespace)
+                .build()?;
 
         match self.sqs {
             Some(ref sqs) => {
diff --git a/src/sources/aws_s3/sqs.rs b/src/sources/aws_s3/sqs.rs
index 3ca793f9c6d1e..f495a01deb2bf 100644
--- a/src/sources/aws_s3/sqs.rs
+++ b/src/sources/aws_s3/sqs.rs
@@ -706,7 +706,7 @@ fn handle_single_log(
 
     log_namespace.insert_vector_metadata(
         log,
-        Some(log_schema().source_type_key()),
+        log_schema().source_type_key(),
         path!("source_type"),
         Bytes::from_static(AwsS3Config::NAME.as_bytes()),
     );
diff --git a/src/sources/aws_sqs/config.rs b/src/sources/aws_sqs/config.rs
index a4f8bbb7629c0..604cb4a6bb3b4 100644
--- a/src/sources/aws_sqs/config.rs
+++ b/src/sources/aws_sqs/config.rs
@@ -111,7 +111,8 @@ impl SourceConfig for AwsSqsConfig {
 
         let client = self.build_client(&cx).await?;
         let decoder =
-            DecodingConfig::new(self.framing.clone(), self.decoding.clone(), log_namespace).build();
+            DecodingConfig::new(self.framing.clone(), self.decoding.clone(), log_namespace)
+                .build()?;
         let acknowledgements = cx.do_acknowledgements(self.acknowledgements);
 
         Ok(Box::pin(
diff --git a/src/sources/aws_sqs/integration_tests.rs b/src/sources/aws_sqs/integration_tests.rs
index 62ba72cbe63b0..567ba62cfc383 100644
--- a/src/sources/aws_sqs/integration_tests.rs
+++ b/src/sources/aws_sqs/integration_tests.rs
@@ -109,7 +109,7 @@ pub(crate) async fn test() {
         for event in events {
             let message = event
                 .as_log()
-                .get(log_schema().message_key())
+                .get(log_schema().message_key_target_path().unwrap())
                 .unwrap()
                 .to_string_lossy();
             if !expected_messages.remove(message.as_ref()) {
diff --git a/src/sources/aws_sqs/source.rs b/src/sources/aws_sqs/source.rs
index f05784ab4e5cb..0f69b0740f8f1 100644
--- a/src/sources/aws_sqs/source.rs
+++ b/src/sources/aws_sqs/source.rs
@@ -219,13 +219,12 @@ async fn delete_messages(client: SqsClient, receipts: Vec<String>, queue_url: St
 
 #[cfg(test)]
 mod tests {
-    use crate::codecs::DecodingConfig;
-    use chrono::SecondsFormat;
-    use lookup::path;
-
     use super::*;
+    use crate::codecs::DecodingConfig;
     use crate::config::{log_schema, SourceConfig};
     use crate::sources::aws_sqs::AwsSqsConfig;
+    use chrono::SecondsFormat;
+    use lookup::path;
 
     #[tokio::test]
     async fn test_decode_vector_namespace() {
@@ -246,7 +245,8 @@ mod tests {
                 config.decoding,
                 LogNamespace::Vector,
             )
-            .build(),
+            .build()
+            .unwrap(),
             "aws_sqs",
             b"test",
             Some(now),
@@ -298,7 +298,8 @@ mod tests {
                 config.decoding,
                 LogNamespace::Legacy,
             )
-            .build(),
+            .build()
+            .unwrap(),
             "aws_sqs",
             b"test",
             Some(now),
@@ -312,7 +313,7 @@ mod tests {
             events[0]
                 .clone()
                 .as_log()
-                .get(log_schema().message_key())
+                .get(log_schema().message_key_target_path().unwrap())
                 .unwrap()
                 .to_string_lossy(),
             message
@@ -321,10 +322,7 @@ mod tests {
             events[0]
                 .clone()
                 .as_log()
-                .get((
-                    lookup::PathPrefix::Event,
-                    log_schema().timestamp_key().unwrap()
-                ))
+                .get_timestamp()
                 .unwrap()
                 .to_string_lossy(),
             now.to_rfc3339_opts(SecondsFormat::AutoSi, true)
diff --git a/src/sources/datadog_agent/metrics.rs b/src/sources/datadog_agent/metrics.rs
index 60be1e7cd2791..d4e8260b1b937 100644
--- a/src/sources/datadog_agent/metrics.rs
+++ b/src/sources/datadog_agent/metrics.rs
@@ -5,9 +5,10 @@ use chrono::{TimeZone, Utc};
 use http::StatusCode;
 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::{metrics::AgentDDSketch, EstimatedJsonEncodedSizeOf};
-use warp::{filters::BoxedFilter, path, path::FullPath, reply::Response, Filter};
 
 use crate::{
     common::datadog::{DatadogMetricType, DatadogSeriesMetric},
@@ -243,7 +244,9 @@ pub(crate) fn decode_ddseries_v2(
                 // 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.
                 if r.r#type.eq("host") {
-                    tags.replace(log_schema().host_key().to_string(), r.name);
+                    log_schema()
+                        .host_key()
+                        .and_then(|key| tags.replace(key.to_string(), r.name));
                 } else {
                     // But to avoid losing information if this situation changes, any other resource type/name will be saved in the tags map
                     tags.replace(format!("resource.{}", r.r#type), r.name);
@@ -385,9 +388,12 @@ fn into_vector_metric(
 ) -> Vec<Event> {
     let mut tags = into_metric_tags(dd_metric.tags.unwrap_or_default());
 
-    dd_metric
-        .host
-        .and_then(|host| tags.replace(log_schema().host_key().to_owned(), host));
+    if let Some(key) = log_schema().host_key() {
+        dd_metric
+            .host
+            .and_then(|host| tags.replace(key.to_string(), host));
+    }
+
     dd_metric
         .source_type_name
         .and_then(|source| tags.replace("source_type_name".into(), source));
@@ -497,10 +503,10 @@ pub(crate) fn decode_ddsketch(
         .flat_map(|sketch_series| {
             // sketch_series.distributions is also always empty from payload coming from dd agents
             let mut tags = into_metric_tags(sketch_series.tags);
-            tags.replace(
-                log_schema().host_key().to_string(),
-                sketch_series.host.clone(),
-            );
+            log_schema()
+                .host_key()
+                .and_then(|key| tags.replace(key.to_string(), sketch_series.host.clone()));
+
             sketch_series.dogsketches.into_iter().map(move |sketch| {
                 let k: Vec<i16> = sketch.k.iter().map(|k| *k as i16).collect();
                 let n: Vec<u16> = sketch.n.iter().map(|n| *n as u16).collect();
diff --git a/src/sources/datadog_agent/mod.rs b/src/sources/datadog_agent/mod.rs
index 2e4dbf6656597..becaf033a9bb1 100644
--- a/src/sources/datadog_agent/mod.rs
+++ b/src/sources/datadog_agent/mod.rs
@@ -34,6 +34,7 @@ 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 vrl::path::OwnedTargetPath;
 use vrl::value::Kind;
 use warp::{filters::BoxedFilter, reject::Rejection, reply::Response, Filter, Reply};
 
@@ -155,7 +156,8 @@ impl SourceConfig for DatadogAgentConfig {
             .clone();
 
         let decoder =
-            DecodingConfig::new(self.framing.clone(), self.decoding.clone(), log_namespace).build();
+            DecodingConfig::new(self.framing.clone(), self.decoding.clone(), log_namespace)
+                .build()?;
 
         let tls = MaybeTlsSettings::from_config(&self.tls, true)?;
         let source = DatadogAgentSource::new(
@@ -283,8 +285,8 @@ pub struct ApiKeyQueryParams {
 #[derive(Clone)]
 pub(crate) struct DatadogAgentSource {
     pub(crate) api_key_extractor: ApiKeyExtractor,
-    pub(crate) log_schema_host_key: &'static str,
-    pub(crate) log_schema_source_type_key: &'static str,
+    pub(crate) log_schema_host_key: OwnedTargetPath,
+    pub(crate) log_schema_source_type_key: OwnedTargetPath,
     pub(crate) log_namespace: LogNamespace,
     pub(crate) decoder: Decoder,
     protocol: &'static str,
@@ -333,8 +335,14 @@ impl DatadogAgentSource {
                 matcher: Regex::new(r"^/v1/input/(?P<api_key>[[:alnum:]]{32})/??")
                     .expect("static regex always compiles"),
             },
-            log_schema_host_key: log_schema().host_key(),
-            log_schema_source_type_key: log_schema().source_type_key(),
+            log_schema_host_key: log_schema()
+                .host_key_target_path()
+                .expect("global log_schema.host_key to be valid path")
+                .clone(),
+            log_schema_source_type_key: log_schema()
+                .source_type_key_target_path()
+                .expect("global log_schema.source_type_key to be valid path")
+                .clone(),
             decoder,
             protocol,
             logs_schema_definition: Arc::new(logs_schema_definition),
diff --git a/src/sources/datadog_agent/tests.rs b/src/sources/datadog_agent/tests.rs
index 4fc3ef4321ee1..3cc56a038bb36 100644
--- a/src/sources/datadog_agent/tests.rs
+++ b/src/sources/datadog_agent/tests.rs
@@ -30,7 +30,7 @@ use vrl::value::Kind;
 use crate::schema::Definition;
 use crate::{
     common::datadog::{DatadogMetricType, DatadogPoint, DatadogSeriesMetric},
-    config::{log_schema, SourceConfig, SourceContext},
+    config::{SourceConfig, SourceContext},
     event::{
         into_event_stream,
         metric::{MetricKind, MetricSketch, MetricValue},
@@ -85,7 +85,7 @@ fn test_decode_log_body() {
         let api_key = None;
         let decoder = crate::codecs::Decoder::new(
             Framer::Bytes(BytesDecoder::new()),
-            Deserializer::Bytes(BytesDeserializer::new()),
+            Deserializer::Bytes(BytesDeserializer),
         );
 
         let source = DatadogAgentSource::new(
@@ -238,7 +238,7 @@ async fn full_payload_v1() {
             assert_eq!(log["ddsource"], "curl".into());
             assert_eq!(log["ddtags"], "one,two,three".into());
             assert!(event.metadata().datadog_api_key().is_none());
-            assert_eq!(log[log_schema().source_type_key()], "datadog_agent".into());
+            assert_eq!(*log.get_source_type().unwrap(), "datadog_agent".into());
             assert_eq!(
                 event.metadata().schema_definition(),
                 &test_logs_schema_definition()
@@ -300,7 +300,7 @@ async fn full_payload_v2() {
             assert_eq!(log["ddsource"], "curl".into());
             assert_eq!(log["ddtags"], "one,two,three".into());
             assert!(event.metadata().datadog_api_key().is_none());
-            assert_eq!(log[log_schema().source_type_key()], "datadog_agent".into());
+            assert_eq!(*log.get_source_type().unwrap(), "datadog_agent".into());
             assert_eq!(
                 event.metadata().schema_definition(),
                 &test_logs_schema_definition()
@@ -362,7 +362,7 @@ async fn no_api_key() {
             assert_eq!(log["ddsource"], "curl".into());
             assert_eq!(log["ddtags"], "one,two,three".into());
             assert!(event.metadata().datadog_api_key().is_none());
-            assert_eq!(log[log_schema().source_type_key()], "datadog_agent".into());
+            assert_eq!(*log.get_source_type().unwrap(), "datadog_agent".into());
             assert_eq!(
                 event.metadata().schema_definition(),
                 &test_logs_schema_definition()
@@ -423,7 +423,7 @@ async fn api_key_in_url() {
             assert_eq!(log["service"], "vector".into());
             assert_eq!(log["ddsource"], "curl".into());
             assert_eq!(log["ddtags"], "one,two,three".into());
-            assert_eq!(log[log_schema().source_type_key()], "datadog_agent".into());
+            assert_eq!(*log.get_source_type().unwrap(), "datadog_agent".into());
             assert_eq!(
                 &event.metadata().datadog_api_key().as_ref().unwrap()[..],
                 "12345678abcdefgh12345678abcdefgh"
@@ -488,7 +488,7 @@ async fn api_key_in_query_params() {
             assert_eq!(log["service"], "vector".into());
             assert_eq!(log["ddsource"], "curl".into());
             assert_eq!(log["ddtags"], "one,two,three".into());
-            assert_eq!(log[log_schema().source_type_key()], "datadog_agent".into());
+            assert_eq!(*log.get_source_type().unwrap(), "datadog_agent".into());
             assert_eq!(
                 &event.metadata().datadog_api_key().as_ref().unwrap()[..],
                 "12345678abcdefgh12345678abcdefgh"
@@ -559,7 +559,7 @@ async fn api_key_in_header() {
             assert_eq!(log["service"], "vector".into());
             assert_eq!(log["ddsource"], "curl".into());
             assert_eq!(log["ddtags"], "one,two,three".into());
-            assert_eq!(log[log_schema().source_type_key()], "datadog_agent".into());
+            assert_eq!(*log.get_source_type().unwrap(), "datadog_agent".into());
             assert_eq!(
                 &event.metadata().datadog_api_key().as_ref().unwrap()[..],
                 "12345678abcdefgh12345678abcdefgh"
@@ -706,7 +706,7 @@ async fn ignores_api_key() {
             assert_eq!(log["service"], "vector".into());
             assert_eq!(log["ddsource"], "curl".into());
             assert_eq!(log["ddtags"], "one,two,three".into());
-            assert_eq!(log[log_schema().source_type_key()], "datadog_agent".into());
+            assert_eq!(*log.get_source_type().unwrap(), "datadog_agent".into());
             assert!(event.metadata().datadog_api_key().is_none());
             assert_eq!(
                 event.metadata().schema_definition(),
@@ -1398,7 +1398,7 @@ async fn split_outputs() {
             assert_eq!(log["service"], "vector".into());
             assert_eq!(log["ddsource"], "curl".into());
             assert_eq!(log["ddtags"], "one,two,three".into());
-            assert_eq!(log[log_schema().source_type_key()], "datadog_agent".into());
+            assert_eq!(*log.get_source_type().unwrap(), "datadog_agent".into());
             assert_eq!(
                 &event.metadata().datadog_api_key().as_ref().unwrap()[..],
                 "12345678abcdefgh12345678abcdefgh"
diff --git a/src/sources/datadog_agent/traces.rs b/src/sources/datadog_agent/traces.rs
index 3fb55de8508e6..bd9099c13a2ab 100644
--- a/src/sources/datadog_agent/traces.rs
+++ b/src/sources/datadog_agent/traces.rs
@@ -8,6 +8,7 @@ use ordered_float::NotNan;
 use prost::Message;
 use vector_common::internal_event::{CountByteSize, InternalEventHandle as _};
 use vector_core::EstimatedJsonEncodedSizeOf;
+use vrl::event_path;
 use warp::{filters::BoxedFilter, path, path::FullPath, reply::Response, Filter, Rejection, Reply};
 
 use crate::{
@@ -142,19 +143,19 @@ fn handle_dd_trace_payload_v1(
                     .set_datadog_api_key(Arc::clone(k));
             }
             trace_event.insert(
-                source.log_schema_source_type_key,
+                &source.log_schema_source_type_key,
                 Bytes::from("datadog_agent"),
             );
-            trace_event.insert("payload_version", "v2".to_string());
-            trace_event.insert(source.log_schema_host_key, hostname.clone());
-            trace_event.insert("env", env.clone());
-            trace_event.insert("agent_version", agent_version.clone());
-            trace_event.insert("target_tps", target_tps);
-            trace_event.insert("error_tps", error_tps);
-            if let Some(Value::Object(span_tags)) = trace_event.get_mut("tags") {
+            trace_event.insert(event_path!("payload_version"), "v2".to_string());
+            trace_event.insert(&source.log_schema_host_key, hostname.clone());
+            trace_event.insert(event_path!("env"), env.clone());
+            trace_event.insert(event_path!("agent_version"), agent_version.clone());
+            trace_event.insert(event_path!("target_tps"), target_tps);
+            trace_event.insert(event_path!("error_tps"), error_tps);
+            if let Some(Value::Object(span_tags)) = trace_event.get_mut(event_path!("tags")) {
                 span_tags.extend(tags.clone());
             } else {
-                trace_event.insert("tags", Value::from(tags.clone()));
+                trace_event.insert(event_path!("tags"), Value::from(tags.clone()));
             }
             Event::Trace(trace_event)
         })
@@ -169,15 +170,15 @@ fn convert_dd_tracer_payload(payload: ddtrace_proto::TracerPayload) -> Vec<Trace
         .into_iter()
         .map(|trace| {
             let mut trace_event = TraceEvent::default();
-            trace_event.insert("priority", trace.priority as i64);
-            trace_event.insert("origin", trace.origin);
-            trace_event.insert("dropped", trace.dropped_trace);
+            trace_event.insert(event_path!("priority"), trace.priority as i64);
+            trace_event.insert(event_path!("origin"), trace.origin);
+            trace_event.insert(event_path!("dropped"), trace.dropped_trace);
             let mut trace_tags = convert_tags(trace.tags);
             trace_tags.extend(tags.clone());
-            trace_event.insert("tags", Value::from(trace_tags));
+            trace_event.insert(event_path!("tags"), Value::from(trace_tags));
 
             trace_event.insert(
-                "spans",
+                event_path!("spans"),
                 trace
                     .spans
                     .into_iter()
@@ -185,12 +186,18 @@ fn convert_dd_tracer_payload(payload: ddtrace_proto::TracerPayload) -> Vec<Trace
                     .collect::<Vec<Value>>(),
             );
 
-            trace_event.insert("container_id", payload.container_id.clone());
-            trace_event.insert("language_name", payload.language_name.clone());
-            trace_event.insert("language_version", payload.language_version.clone());
-            trace_event.insert("tracer_version", payload.tracer_version.clone());
-            trace_event.insert("runtime_id", payload.runtime_id.clone());
-            trace_event.insert("app_version", payload.app_version.clone());
+            trace_event.insert(event_path!("container_id"), payload.container_id.clone());
+            trace_event.insert(event_path!("language_name"), payload.language_name.clone());
+            trace_event.insert(
+                event_path!("language_version"),
+                payload.language_version.clone(),
+            );
+            trace_event.insert(
+                event_path!("tracer_version"),
+                payload.tracer_version.clone(),
+            );
+            trace_event.insert(event_path!("runtime_id"), payload.runtime_id.clone());
+            trace_event.insert(event_path!("app_version"), payload.app_version.clone());
             trace_event
         })
         .collect()
@@ -217,11 +224,11 @@ fn handle_dd_trace_payload_v0(
             // TODO trace_id is being forced into an i64 but
             // the incoming payload is u64. This is a bug and needs to be fixed per:
             // https://github.com/vectordotdev/vector/issues/14687
-            trace_event.insert("trace_id", dd_trace.trace_id as i64);
-            trace_event.insert("start_time", Utc.timestamp_nanos(dd_trace.start_time));
-            trace_event.insert("end_time", Utc.timestamp_nanos(dd_trace.end_time));
+            trace_event.insert(event_path!("trace_id"), dd_trace.trace_id as i64);
+            trace_event.insert(event_path!("start_time"), Utc.timestamp_nanos(dd_trace.start_time));
+            trace_event.insert(event_path!("end_time"), Utc.timestamp_nanos(dd_trace.end_time));
             trace_event.insert(
-                "spans",
+                event_path!("spans"),
                 dd_trace
                     .spans
                     .into_iter()
@@ -233,8 +240,8 @@ fn handle_dd_trace_payload_v0(
         //... and each APM event is also mapped into its own event
         .chain(decoded_payload.transactions.into_iter().map(|s| {
             let mut trace_event = TraceEvent::default();
-            trace_event.insert("spans", vec![Value::from(convert_span(s))]);
-            trace_event.insert("dropped", true);
+            trace_event.insert(event_path!("spans"), vec![Value::from(convert_span(s))]);
+            trace_event.insert(event_path!("dropped"), true);
             trace_event
         })).collect();
 
@@ -252,15 +259,15 @@ fn handle_dd_trace_payload_v0(
                     .set_datadog_api_key(Arc::clone(k));
             }
             if let Some(lang) = lang {
-                trace_event.insert("language_name", lang.clone());
+                trace_event.insert(event_path!("language_name"), lang.clone());
             }
             trace_event.insert(
-                source.log_schema_source_type_key,
+                &source.log_schema_source_type_key,
                 Bytes::from("datadog_agent"),
             );
-            trace_event.insert("payload_version", "v1".to_string());
-            trace_event.insert(source.log_schema_host_key, hostname.clone());
-            trace_event.insert("env", env.clone());
+            trace_event.insert(event_path!("payload_version"), "v1".to_string());
+            trace_event.insert(&source.log_schema_host_key, hostname.clone());
+            trace_event.insert(event_path!("env"), env.clone());
             Event::Trace(trace_event)
         })
         .collect();
diff --git a/src/sources/demo_logs.rs b/src/sources/demo_logs.rs
index 5e0789f980005..44c0957b96a45 100644
--- a/src/sources/demo_logs.rs
+++ b/src/sources/demo_logs.rs
@@ -48,7 +48,7 @@ pub struct DemoLogsConfig {
     #[derivative(Default(value = "default_interval()"))]
     #[serde(default = "default_interval")]
     #[configurable(metadata(docs::examples = 1.0, docs::examples = 0.1, docs::examples = 0.01,))]
-    #[serde_as(as = "serde_with::DurationSeconds<f64>")]
+    #[serde_as(as = "serde_with::DurationSecondsWithFrac<f64>")]
     pub interval: Duration,
 
     /// The total number of lines to output.
@@ -292,7 +292,8 @@ impl SourceConfig for DemoLogsConfig {
 
         self.format.validate()?;
         let decoder =
-            DecodingConfig::new(self.framing.clone(), self.decoding.clone(), log_namespace).build();
+            DecodingConfig::new(self.framing.clone(), self.decoding.clone(), log_namespace)
+                .build()?;
         Ok(Box::pin(demo_logs_source(
             self.interval,
             self.count,
@@ -358,7 +359,8 @@ mod tests {
                 default_decoding(),
                 LogNamespace::Legacy,
             )
-            .build();
+            .build()
+            .unwrap();
             demo_logs_source(
                 config.interval,
                 config.count,
@@ -396,7 +398,7 @@ mod tests {
 
     #[tokio::test]
     async fn shuffle_demo_logs_copies_lines() {
-        let message_key = log_schema().message_key();
+        let message_key = log_schema().message_key().unwrap().to_string();
         let mut rx = runit(
             r#"format = "shuffle"
                lines = ["one", "two", "three", "four"]
@@ -436,7 +438,7 @@ mod tests {
 
     #[tokio::test]
     async fn shuffle_demo_logs_adds_sequence() {
-        let message_key = log_schema().message_key();
+        let message_key = log_schema().message_key().unwrap().to_string();
         let mut rx = runit(
             r#"format = "shuffle"
                lines = ["one", "two"]
@@ -536,7 +538,7 @@ mod tests {
 
     #[tokio::test]
     async fn json_format_generates_output() {
-        let message_key = log_schema().message_key();
+        let message_key = log_schema().message_key().unwrap().to_string();
         let mut rx = runit(
             r#"format = "json"
             count = 5"#,
diff --git a/src/sources/dnstap/mod.rs b/src/sources/dnstap/mod.rs
index 69a9d13728805..dbfde6c95a9cd 100644
--- a/src/sources/dnstap/mod.rs
+++ b/src/sources/dnstap/mod.rs
@@ -7,6 +7,7 @@ use vector_common::internal_event::{
     ByteSize, BytesReceived, InternalEventHandle as _, Protocol, Registered,
 };
 use vector_config::configurable_component;
+use vrl::path::PathPrefix;
 use vrl::value::{kind::Collection, Kind};
 
 use super::util::framestream::{build_framestream_unix_source, FrameHandler};
@@ -18,11 +19,11 @@ use crate::{
 };
 
 pub mod parser;
-pub use parser::{parse_dnstap_data, DnstapParser};
-
 pub mod schema;
+use crate::sources::dnstap::parser::DnstapParser;
+use crate::sources::dnstap::schema::DNSTAP_VALUE_PATHS;
 use dnsmsg_parser::{dns_message, dns_message_parser};
-use lookup::lookup_v2::{parse_value_path, OptionalValuePath};
+use lookup::lookup_v2::OptionalValuePath;
 pub use schema::DnstapEventSchema;
 use vector_core::{
     config::{LegacyKey, LogNamespace},
@@ -108,33 +109,26 @@ impl DnstapConfig {
         "protobuf:dnstap.Dnstap".to_string() //content-type for framestream
     }
 
-    fn event_schema(timestamp_key: Option<&OwnedValuePath>) -> DnstapEventSchema {
-        let mut schema = DnstapEventSchema::new();
-        schema
-            .dnstap_root_data_schema_mut()
-            .set_timestamp(timestamp_key.cloned());
-        schema
-    }
-
     pub fn schema_definition(
         &self,
         log_namespace: LogNamespace,
     ) -> vector_core::schema::Definition {
-        let event_schema = Self::event_schema(log_schema().timestamp_key());
+        let event_schema = DnstapEventSchema;
 
         match log_namespace {
             LogNamespace::Legacy => {
                 let schema = vector_core::schema::Definition::empty_legacy_namespace();
 
                 if self.raw_data_only.unwrap_or(false) {
-                    schema.with_event_field(
-                        &owned_value_path!(log_schema().message_key()),
-                        Kind::bytes(),
-                        Some("message"),
-                    )
-                } else {
-                    event_schema.schema_definition(schema)
+                    if let Some(message_key) = log_schema().message_key() {
+                        return schema.with_event_field(
+                            message_key,
+                            Kind::bytes(),
+                            Some("message"),
+                        );
+                    }
                 }
+                event_schema.schema_definition(schema)
             }
             LogNamespace::Vector => {
                 let schema = vector_core::schema::Definition::new_with_default_metadata(
@@ -203,7 +197,6 @@ pub struct DnstapFrameHandler {
     max_frame_length: usize,
     socket_path: PathBuf,
     content_type: String,
-    schema: DnstapEventSchema,
     raw_data_only: bool,
     multithreaded: bool,
     max_frame_handling_tasks: u32,
@@ -212,7 +205,7 @@ pub struct DnstapFrameHandler {
     socket_send_buffer_size: Option<usize>,
     host_key: Option<OwnedValuePath>,
     timestamp_key: Option<OwnedValuePath>,
-    source_type_key: String,
+    source_type_key: Option<OwnedValuePath>,
     bytes_received: Registered<BytesReceived>,
     log_namespace: LogNamespace,
 }
@@ -222,18 +215,15 @@ impl DnstapFrameHandler {
         let source_type_key = log_schema().source_type_key();
         let timestamp_key = log_schema().timestamp_key();
 
-        let schema = DnstapConfig::event_schema(timestamp_key);
-
-        let host_key = config.host_key.clone().map_or_else(
-            || parse_value_path(log_schema().host_key()).ok(),
-            |k| k.path,
-        );
+        let host_key = config
+            .host_key
+            .clone()
+            .map_or(log_schema().host_key().cloned(), |k| k.path);
 
         Self {
             max_frame_length: config.max_frame_length,
             socket_path: config.socket_path.clone(),
             content_type: config.content_type(),
-            schema,
             raw_data_only: config.raw_data_only.unwrap_or(false),
             multithreaded: config.multithreaded.unwrap_or(false),
             max_frame_handling_tasks: config.max_frame_handling_tasks.unwrap_or(1000),
@@ -242,7 +232,7 @@ impl DnstapFrameHandler {
             socket_send_buffer_size: config.socket_send_buffer_size,
             host_key,
             timestamp_key: timestamp_key.cloned(),
-            source_type_key: source_type_key.to_string(),
+            source_type_key: source_type_key.cloned(),
             bytes_received: register!(BytesReceived::from(Protocol::from("protobuf"))),
             log_namespace,
         }
@@ -279,10 +269,10 @@ impl FrameHandler for DnstapFrameHandler {
 
         if self.raw_data_only {
             log_event.insert(
-                self.schema.dnstap_root_data_schema().raw_data(),
+                (PathPrefix::Event, &DNSTAP_VALUE_PATHS.raw_data),
                 BASE64_STANDARD.encode(&frame),
             );
-        } else if let Err(err) = parse_dnstap_data(&self.schema, &mut log_event, frame) {
+        } else if let Err(err) = DnstapParser::parse(&mut log_event, frame) {
             emit!(DnstapParseError {
                 error: format!("Dnstap protobuf decode error {:?}.", err)
             });
@@ -307,7 +297,7 @@ impl FrameHandler for DnstapFrameHandler {
 
         self.log_namespace.insert_vector_metadata(
             &mut log_event,
-            Some(self.source_type_key()),
+            self.source_type_key(),
             path!("source_type"),
             DnstapConfig::NAME,
         );
@@ -343,8 +333,8 @@ impl FrameHandler for DnstapFrameHandler {
         &self.host_key
     }
 
-    fn source_type_key(&self) -> &str {
-        self.source_type_key.as_str()
+    fn source_type_key(&self) -> Option<&OwnedValuePath> {
+        self.source_type_key.as_ref()
     }
 
     fn timestamp_key(&self) -> Option<&OwnedValuePath> {
@@ -406,7 +396,7 @@ mod tests {
         let mut event = Event::from(LogEvent::from(vrl::value::Value::from(json)));
         event.as_mut_log().insert("timestamp", chrono::Utc::now());
 
-        let definition = DnstapConfig::event_schema(Some(&owned_value_path!("timestamp")));
+        let definition = DnstapEventSchema;
         let schema = vector_core::schema::Definition::empty_legacy_namespace()
             .with_standard_vector_source_metadata();
 
diff --git a/src/sources/dnstap/parser.rs b/src/sources/dnstap/parser.rs
index 2ab05d4c86582..0a12f7426443a 100644
--- a/src/sources/dnstap/parser.rs
+++ b/src/sources/dnstap/parser.rs
@@ -15,6 +15,7 @@ use trust_dns_proto::{
     rr::domain::Name,
     serialize::binary::{BinDecodable, BinDecoder},
 };
+use vrl::{owned_value_path, path};
 
 use crate::{
     event::{LogEvent, Value},
@@ -27,12 +28,14 @@ mod dnstap_proto {
     include!(concat!(env!("OUT_DIR"), "/dnstap.rs"));
 }
 
+use crate::sources::dnstap::schema::DNSTAP_VALUE_PATHS;
 use dnstap_proto::{
     message::Type as DnstapMessageType, Dnstap, Message as DnstapMessage, SocketFamily,
     SocketProtocol,
 };
-use lookup::lookup_v2::{OwnedValuePath, ValuePath};
+use lookup::lookup_v2::ValuePath;
 use lookup::PathPrefix;
+use vector_core::config::log_schema;
 
 use super::{
     dns_message::{
@@ -40,11 +43,8 @@ use super::{
         ZoneInfo,
     },
     dns_message_parser::DnsMessageParser,
-    schema::DnstapEventSchema,
 };
 
-const MAX_DNSTAP_QUERY_MESSAGE_TYPE_ID: i32 = 12;
-
 #[derive(Debug, Snafu)]
 enum DnstapParserError {
     #[snafu(display("Unsupported DNSTap message type: {}", "dnstap_message_type_id"))]
@@ -78,86 +78,79 @@ static DNSTAP_MESSAGE_RESPONSE_TYPE_IDS: Lazy<HashSet<i32>> = Lazy::new(|| {
     .collect()
 });
 
-pub struct DnstapParser<'a> {
-    event_schema: &'a DnstapEventSchema,
-    parent_key_path: OwnedValuePath,
-    log_event: &'a mut LogEvent,
-}
+#[derive(Default)]
+pub struct DnstapParser;
 
-pub fn parse_dnstap_data(
-    event_schema: &DnstapEventSchema,
-    log_event: &mut LogEvent,
-    frame: Bytes,
-) -> Result<()> {
-    DnstapParser::new(event_schema, log_event).parse_dnstap_data(frame)
-}
-
-impl<'a> DnstapParser<'a> {
-    pub fn new(event_schema: &'a DnstapEventSchema, log_event: &'a mut LogEvent) -> Self {
-        Self {
-            event_schema,
-            parent_key_path: Vec::new().into(),
-            log_event,
-        }
-    }
-
-    fn insert<'b, 'c: 'b, V>(&'c mut self, key: impl ValuePath<'b>, value: V) -> Option<Value>
+impl DnstapParser {
+    fn insert<'a, V>(
+        event: &mut LogEvent,
+        prefix: impl ValuePath<'a>,
+        path: impl ValuePath<'a>,
+        value: V,
+    ) -> Option<Value>
     where
         V: Into<Value> + Debug,
     {
-        self.log_event.insert(
-            (PathPrefix::Event, (&self.parent_key_path).concat(key)),
-            value,
-        )
+        event.insert((PathPrefix::Event, prefix.concat(path)), value)
     }
 
-    pub fn parse_dnstap_data(&mut self, frame: Bytes) -> Result<()> {
+    pub fn parse(event: &mut LogEvent, frame: Bytes) -> Result<()> {
         //parse frame with dnstap protobuf
         let proto_msg = Dnstap::decode(frame.clone())?;
-
+        let root = owned_value_path!();
         if let Some(server_id) = proto_msg.identity {
-            self.insert(
-                self.event_schema
-                    .dnstap_root_data_schema()
-                    .server_identity(),
-                String::from_utf8(server_id).unwrap_or_default(),
+            DnstapParser::insert(
+                event,
+                &root,
+                &DNSTAP_VALUE_PATHS.server_identity,
+                String::from_utf8(server_id.clone()).unwrap_or_default(),
             );
         }
 
         if let Some(version) = proto_msg.version {
-            self.insert(
-                self.event_schema.dnstap_root_data_schema().server_version(),
+            DnstapParser::insert(
+                event,
+                &root,
+                &DNSTAP_VALUE_PATHS.server_version,
                 String::from_utf8(version).unwrap_or_default(),
             );
         }
 
         if let Some(extra) = proto_msg.extra {
-            self.insert(
-                self.event_schema.dnstap_root_data_schema().extra(),
+            DnstapParser::insert(
+                event,
+                &root,
+                &DNSTAP_VALUE_PATHS.extra,
                 String::from_utf8(extra).unwrap_or_default(),
             );
         }
 
         let dnstap_data_type_id: i32 = proto_msg.r#type;
         let mut need_raw_data = false;
-        self.insert(
-            self.event_schema.dnstap_root_data_schema().data_type_id(),
+        DnstapParser::insert(
+            event,
+            &root,
+            &DNSTAP_VALUE_PATHS.data_type_id,
             dnstap_data_type_id,
         );
 
         if let Some(dnstap_data_type) = to_dnstap_data_type(dnstap_data_type_id) {
-            self.insert(
-                self.event_schema.dnstap_root_data_schema().data_type(),
+            DnstapParser::insert(
+                event,
+                &root,
+                &DNSTAP_VALUE_PATHS.data_type,
                 dnstap_data_type.clone(),
             );
 
             if dnstap_data_type == "Message" {
                 if let Some(message) = proto_msg.message {
-                    if let Err(err) = self.parse_dnstap_message(message) {
+                    if let Err(err) = DnstapParser::parse_dnstap_message(event, &root, message) {
                         emit!(DnstapParseWarning { error: &err });
                         need_raw_data = true;
-                        self.insert(
-                            self.event_schema.dnstap_root_data_schema().error(),
+                        DnstapParser::insert(
+                            event,
+                            &root,
+                            &DNSTAP_VALUE_PATHS.error,
                             err.to_string(),
                         );
                     }
@@ -171,8 +164,10 @@ impl<'a> DnstapParser<'a> {
         }
 
         if need_raw_data {
-            self.insert(
-                self.event_schema.dnstap_root_data_schema().raw_data(),
+            DnstapParser::insert(
+                event,
+                &root,
+                &DNSTAP_VALUE_PATHS.raw_data,
                 BASE64_STANDARD.encode(&frame),
             );
         }
@@ -180,17 +175,28 @@ impl<'a> DnstapParser<'a> {
         Ok(())
     }
 
-    fn parse_dnstap_message(&mut self, dnstap_message: DnstapMessage) -> Result<()> {
+    fn parse_dnstap_message<'a>(
+        event: &mut LogEvent,
+        prefix: impl ValuePath<'a>,
+        dnstap_message: DnstapMessage,
+    ) -> Result<()> {
         if let Some(socket_family) = dnstap_message.socket_family {
-            self.parse_dnstap_message_socket_family(socket_family, &dnstap_message)?;
+            DnstapParser::parse_dnstap_message_socket_family(
+                event,
+                prefix.clone(),
+                socket_family,
+                &dnstap_message,
+            )?;
         }
 
         if let Some(query_zone) = dnstap_message.query_zone.as_ref() {
             let mut decoder: BinDecoder = BinDecoder::new(query_zone);
             match Name::read(&mut decoder) {
                 Ok(raw_data) => {
-                    self.insert(
-                        self.event_schema.dnstap_message_schema().query_zone(),
+                    DnstapParser::insert(
+                        event,
+                        prefix.clone(),
+                        &DNSTAP_VALUE_PATHS.query_zone,
                         raw_data.to_utf8(),
                     );
                 }
@@ -199,71 +205,72 @@ impl<'a> DnstapParser<'a> {
         }
 
         let dnstap_message_type_id = dnstap_message.r#type;
-        self.insert(
-            self.event_schema
-                .dnstap_message_schema()
-                .dnstap_message_type_id(),
+        DnstapParser::insert(
+            event,
+            prefix.clone(),
+            &DNSTAP_VALUE_PATHS.message_type_id,
             dnstap_message_type_id,
         );
 
-        self.insert(
-            self.event_schema
-                .dnstap_message_schema()
-                .dnstap_message_type(),
+        DnstapParser::insert(
+            event,
+            prefix.clone(),
+            &DNSTAP_VALUE_PATHS.message_type,
             to_dnstap_message_type(dnstap_message_type_id),
         );
 
-        let request_message_key = self.event_schema.dnstap_message_schema().request_message();
-        let response_message_key = self.event_schema.dnstap_message_schema().response_message();
-
         if let Some(query_time_sec) = dnstap_message.query_time_sec {
-            self.parse_dnstap_message_time(
+            DnstapParser::parse_dnstap_message_time(
+                event,
+                prefix.clone(),
                 query_time_sec,
                 dnstap_message.query_time_nsec,
                 dnstap_message_type_id,
-                request_message_key,
                 dnstap_message.query_message.as_ref(),
                 &DNSTAP_MESSAGE_REQUEST_TYPE_IDS,
             );
         }
 
         if let Some(response_time_sec) = dnstap_message.response_time_sec {
-            self.parse_dnstap_message_time(
+            DnstapParser::parse_dnstap_message_time(
+                event,
+                prefix.clone(),
                 response_time_sec,
                 dnstap_message.response_time_nsec,
                 dnstap_message_type_id,
-                response_message_key,
                 dnstap_message.response_message.as_ref(),
                 &DNSTAP_MESSAGE_RESPONSE_TYPE_IDS,
             );
         }
 
-        self.parse_dnstap_message_type(
+        DnstapParser::parse_dnstap_message_type(
+            event,
+            prefix.clone(),
             dnstap_message_type_id,
             dnstap_message,
-            request_message_key,
-            response_message_key,
         )?;
 
         Ok(())
     }
 
-    fn parse_dnstap_message_type(
-        &mut self,
+    fn parse_dnstap_message_type<'a>(
+        event: &mut LogEvent,
+        prefix: impl ValuePath<'a>,
         dnstap_message_type_id: i32,
         dnstap_message: DnstapMessage,
-        request_message_key: &'static str,
-        response_message_key: &'static str,
     ) -> Result<()> {
         match dnstap_message_type_id {
             1..=12 => {
                 if let Some(query_message) = dnstap_message.query_message {
                     let mut query_message_parser = DnsMessageParser::new(query_message);
-                    if let Err(error) =
-                        self.parse_dns_query_message(request_message_key, &mut query_message_parser)
-                    {
-                        self.log_raw_dns_message(
-                            request_message_key,
+                    if let Err(error) = DnstapParser::parse_dns_query_message(
+                        event,
+                        prefix.concat(&DNSTAP_VALUE_PATHS.request_message),
+                        &mut query_message_parser,
+                    ) {
+                        DnstapParser::log_raw_dns_message(
+                            event,
+                            prefix.concat(&DNSTAP_VALUE_PATHS.request_message),
                             query_message_parser.raw_message(),
                         );
 
@@ -273,11 +280,14 @@ impl<'a> DnstapParser<'a> {
 
                 if let Some(response_message) = dnstap_message.response_message {
                     let mut response_message_parser = DnsMessageParser::new(response_message);
-                    if let Err(error) = self
-                        .parse_dns_query_message(response_message_key, &mut response_message_parser)
-                    {
-                        self.log_raw_dns_message(
-                            response_message_key,
+                    if let Err(error) = DnstapParser::parse_dns_query_message(
+                        event,
+                        prefix.concat(&DNSTAP_VALUE_PATHS.response_message),
+                        &mut response_message_parser,
+                    ) {
+                        DnstapParser::log_raw_dns_message(
+                            event,
+                            prefix.concat(&DNSTAP_VALUE_PATHS.response_message),
                             response_message_parser.raw_message(),
                         );
 
@@ -289,12 +299,14 @@ impl<'a> DnstapParser<'a> {
                 if let Some(update_request_message) = dnstap_message.query_message {
                     let mut update_request_message_parser =
                         DnsMessageParser::new(update_request_message);
-                    if let Err(error) = self.parse_dns_update_message(
-                        request_message_key,
+                    if let Err(error) = DnstapParser::parse_dns_update_message(
+                        event,
+                        &DNSTAP_VALUE_PATHS.request_message,
                         &mut update_request_message_parser,
                     ) {
-                        self.log_raw_dns_message(
-                            request_message_key,
+                        DnstapParser::log_raw_dns_message(
+                            event,
+                            &DNSTAP_VALUE_PATHS.request_message,
                             update_request_message_parser.raw_message(),
                         );
 
@@ -305,12 +317,14 @@ impl<'a> DnstapParser<'a> {
                 if let Some(update_response_message) = dnstap_message.response_message {
                     let mut update_response_message_parser =
                         DnsMessageParser::new(update_response_message);
-                    if let Err(error) = self.parse_dns_update_message(
-                        response_message_key,
+                    if let Err(error) = DnstapParser::parse_dns_update_message(
+                        event,
+                        &DNSTAP_VALUE_PATHS.response_message,
                         &mut update_response_message_parser,
                     ) {
-                        self.log_raw_dns_message(
-                            response_message_key,
+                        DnstapParser::log_raw_dns_message(
+                            event,
+                            &DNSTAP_VALUE_PATHS.response_message,
                             update_response_message_parser.raw_message(),
                         );
 
@@ -330,12 +344,12 @@ impl<'a> DnstapParser<'a> {
         Ok(())
     }
 
-    fn parse_dnstap_message_time(
-        &mut self,
+    fn parse_dnstap_message_time<'a>(
+        event: &mut LogEvent,
+        prefix: impl ValuePath<'a>,
         time_sec: u64,
         time_nsec: Option<u32>,
         dnstap_message_type_id: i32,
-        message_key: &str,
         message: Option<&Vec<u8>>,
         type_ids: &HashSet<i32>,
     ) {
@@ -345,66 +359,45 @@ impl<'a> DnstapParser<'a> {
         };
 
         if type_ids.contains(&dnstap_message_type_id) {
-            self.log_time(
-                self.event_schema.dnstap_root_data_schema().time(),
-                time_in_nanosec,
-                self.event_schema.dnstap_root_data_schema().time_precision(),
-                "ns",
-            );
+            DnstapParser::log_time(event, prefix.clone(), time_in_nanosec, "ns");
 
             let timestamp = Utc
                 .timestamp_opt(time_sec.try_into().unwrap(), query_time_nsec)
                 .single()
                 .expect("invalid timestamp");
-            if let Some(timestamp_key) = self.event_schema.dnstap_root_data_schema().timestamp() {
-                self.insert(timestamp_key, timestamp);
+            if let Some(timestamp_key) = log_schema().timestamp_key() {
+                DnstapParser::insert(event, prefix.clone(), timestamp_key, timestamp);
             }
         }
 
         if message.is_none() {
-            self.parent_key_path.push_field(message_key);
-
-            let time_key_name = if dnstap_message_type_id <= MAX_DNSTAP_QUERY_MESSAGE_TYPE_ID {
-                self.event_schema.dns_query_message_schema().time()
-            } else {
-                self.event_schema.dns_update_message_schema().time()
-            };
-
-            let time_precision_key_name =
-                if dnstap_message_type_id <= MAX_DNSTAP_QUERY_MESSAGE_TYPE_ID {
-                    self.event_schema
-                        .dns_query_message_schema()
-                        .time_precision()
-                } else {
-                    self.event_schema
-                        .dns_update_message_schema()
-                        .time_precision()
-                };
-
-            self.log_time(
-                time_key_name,
+            DnstapParser::log_time(
+                event,
+                prefix.concat(&DNSTAP_VALUE_PATHS.request_message),
                 time_in_nanosec,
-                time_precision_key_name,
                 "ns",
             );
-
-            self.parent_key_path.segments.pop();
         }
     }
 
-    fn parse_dnstap_message_socket_family(
-        &mut self,
+    fn parse_dnstap_message_socket_family<'a>(
+        event: &mut LogEvent,
+        prefix: impl ValuePath<'a>,
         socket_family: i32,
         dnstap_message: &DnstapMessage,
     ) -> Result<()> {
-        self.insert(
-            self.event_schema.dnstap_message_schema().socket_family(),
+        DnstapParser::insert(
+            event,
+            prefix.clone(),
+            &DNSTAP_VALUE_PATHS.socket_family,
             to_socket_family_name(socket_family)?.to_string(),
         );
 
         if let Some(socket_protocol) = dnstap_message.socket_protocol {
-            self.insert(
-                self.event_schema.dnstap_message_schema().socket_protocol(),
+            DnstapParser::insert(
+                event,
+                prefix.clone(),
+                &DNSTAP_VALUE_PATHS.socket_protocol,
                 to_socket_protocol_name(socket_protocol)?.to_string(),
             );
         }
@@ -418,15 +411,19 @@ impl<'a> DnstapParser<'a> {
                 IpAddr::V6(Ipv6Addr::from(address_buffer))
             };
 
-            self.insert(
-                self.event_schema.dnstap_message_schema().query_address(),
+            DnstapParser::insert(
+                event,
+                prefix.clone(),
+                &DNSTAP_VALUE_PATHS.query_address,
                 source_address.to_string(),
             );
         }
 
         if let Some(query_port) = dnstap_message.query_port {
-            self.insert(
-                self.event_schema.dnstap_message_schema().query_port(),
+            DnstapParser::insert(
+                event,
+                prefix.clone(),
+                &DNSTAP_VALUE_PATHS.query_port,
                 query_port,
             );
         }
@@ -440,441 +437,472 @@ impl<'a> DnstapParser<'a> {
                 IpAddr::V6(Ipv6Addr::from(address_buffer))
             };
 
-            self.insert(
-                self.event_schema.dnstap_message_schema().response_address(),
+            DnstapParser::insert(
+                event,
+                prefix.clone(),
+                &DNSTAP_VALUE_PATHS.response_address,
                 response_addr.to_string(),
             );
         }
 
         Ok(if let Some(response_port) = dnstap_message.response_port {
-            self.insert(
-                self.event_schema.dnstap_message_schema().response_port(),
+            DnstapParser::insert(
+                event,
+                prefix.clone(),
+                &DNSTAP_VALUE_PATHS.response_port,
                 response_port,
             );
         })
     }
 
-    fn log_time(
-        &mut self,
-        time_key: &'static str,
+    fn log_time<'a>(
+        event: &mut LogEvent,
+        prefix: impl ValuePath<'a>,
         time: i64,
-        time_precision_key: &'static str,
         time_precision: &str,
     ) {
-        self.insert(time_key, time);
-
-        self.insert(time_precision_key, time_precision.to_string());
+        DnstapParser::insert(event, prefix.clone(), &DNSTAP_VALUE_PATHS.time, time);
+        DnstapParser::insert(
+            event,
+            prefix.clone(),
+            &DNSTAP_VALUE_PATHS.time_precision,
+            time_precision.to_string(),
+        );
     }
 
-    fn log_raw_dns_message(&mut self, key_prefix: &'static str, raw_dns_message: &[u8]) {
-        self.parent_key_path.push_field(key_prefix);
-
-        self.insert(
-            self.event_schema.dns_query_message_schema().raw_data(),
+    fn log_raw_dns_message<'a>(
+        event: &mut LogEvent,
+        prefix: impl ValuePath<'a>,
+        raw_dns_message: &[u8],
+    ) {
+        DnstapParser::insert(
+            event,
+            prefix.clone(),
+            &DNSTAP_VALUE_PATHS.raw_data,
             BASE64_STANDARD.encode(raw_dns_message),
         );
-
-        self.parent_key_path.segments.pop();
     }
 
-    fn parse_dns_query_message(
-        &mut self,
-        key_prefix: &'static str,
+    fn parse_dns_query_message<'a>(
+        event: &mut LogEvent,
+        prefix: impl ValuePath<'a>,
         dns_message_parser: &mut DnsMessageParser,
     ) -> Result<()> {
         let msg = dns_message_parser.parse_as_query_message()?;
 
-        self.parent_key_path.push_field(key_prefix);
-
-        self.insert(
-            self.event_schema.dns_query_message_schema().response_code(),
+        DnstapParser::insert(
+            event,
+            prefix.clone(),
+            &DNSTAP_VALUE_PATHS.response_code,
             msg.response_code,
         );
 
         if let Some(response) = msg.response {
-            self.insert(
-                self.event_schema.dns_query_message_schema().response(),
+            DnstapParser::insert(
+                event,
+                prefix.clone(),
+                &DNSTAP_VALUE_PATHS.response,
                 response.to_string(),
             );
         }
 
-        self.log_dns_query_message_header(
-            self.event_schema.dns_query_message_schema().header(),
+        DnstapParser::log_dns_query_message_header(
+            event,
+            prefix.concat(&DNSTAP_VALUE_PATHS.header),
             &msg.header,
         );
 
-        self.log_dns_query_message_query_section(
-            self.event_schema
-                .dns_query_message_schema()
-                .question_section(),
+        DnstapParser::log_dns_query_message_query_section(
+            event,
+            prefix.concat(&DNSTAP_VALUE_PATHS.question_section),
             &msg.question_section,
         );
 
-        self.log_dns_message_record_section(
-            self.event_schema
-                .dns_query_message_schema()
-                .answer_section(),
+        DnstapParser::log_dns_message_record_section(
+            event,
+            prefix.concat(&DNSTAP_VALUE_PATHS.answer_section),
             &msg.answer_section,
         );
 
-        self.log_dns_message_record_section(
-            self.event_schema
-                .dns_query_message_schema()
-                .authority_section(),
+        DnstapParser::log_dns_message_record_section(
+            event,
+            prefix.concat(&DNSTAP_VALUE_PATHS.authority_section),
             &msg.authority_section,
         );
 
-        self.log_dns_message_record_section(
-            self.event_schema
-                .dns_query_message_schema()
-                .additional_section(),
+        DnstapParser::log_dns_message_record_section(
+            event,
+            prefix.concat(&DNSTAP_VALUE_PATHS.additional_section),
             &msg.additional_section,
         );
 
-        self.log_edns(
-            self.event_schema
-                .dns_query_message_schema()
-                .opt_pseudo_section(),
+        DnstapParser::log_edns(
+            event,
+            prefix.concat(&DNSTAP_VALUE_PATHS.opt_pseudo_section),
             &msg.opt_pseudo_section,
         );
 
-        self.parent_key_path.segments.pop();
         Ok(())
     }
 
-    fn log_dns_query_message_header(&mut self, parent_key: &'static str, header: &QueryHeader) {
-        self.parent_key_path.push_field(parent_key);
-
-        self.insert(self.event_schema.dns_query_header_schema().id(), header.id);
-
-        self.insert(
-            self.event_schema.dns_query_header_schema().opcode(),
+    fn log_dns_query_message_header<'a>(
+        event: &mut LogEvent,
+        prefix: impl ValuePath<'a>,
+        header: &QueryHeader,
+    ) {
+        DnstapParser::insert(event, prefix.clone(), &DNSTAP_VALUE_PATHS.id, header.id);
+        DnstapParser::insert(
+            event,
+            prefix.clone(),
+            &DNSTAP_VALUE_PATHS.opcode,
             header.opcode,
         );
-
-        self.insert(
-            self.event_schema.dns_query_header_schema().rcode(),
+        DnstapParser::insert(
+            event,
+            prefix.clone(),
+            &DNSTAP_VALUE_PATHS.rcode,
             u16::from(header.rcode),
         );
-
-        self.insert(self.event_schema.dns_query_header_schema().qr(), header.qr);
-
-        self.insert(self.event_schema.dns_query_header_schema().aa(), header.aa);
-
-        self.insert(self.event_schema.dns_query_header_schema().tc(), header.tc);
-
-        self.insert(self.event_schema.dns_query_header_schema().rd(), header.rd);
-
-        self.insert(self.event_schema.dns_query_header_schema().ra(), header.ra);
-
-        self.insert(self.event_schema.dns_query_header_schema().ad(), header.ad);
-
-        self.insert(self.event_schema.dns_query_header_schema().cd(), header.cd);
-
-        self.insert(
-            self.event_schema.dns_query_header_schema().question_count(),
+        DnstapParser::insert(event, prefix.clone(), &DNSTAP_VALUE_PATHS.qr, header.qr);
+        DnstapParser::insert(event, prefix.clone(), &DNSTAP_VALUE_PATHS.aa, header.aa);
+        DnstapParser::insert(event, prefix.clone(), &DNSTAP_VALUE_PATHS.tc, header.tc);
+        DnstapParser::insert(event, prefix.clone(), &DNSTAP_VALUE_PATHS.rd, header.rd);
+        DnstapParser::insert(event, prefix.clone(), &DNSTAP_VALUE_PATHS.ra, header.ra);
+        DnstapParser::insert(event, prefix.clone(), &DNSTAP_VALUE_PATHS.ad, header.ad);
+        DnstapParser::insert(event, prefix.clone(), &DNSTAP_VALUE_PATHS.cd, header.cd);
+        DnstapParser::insert(
+            event,
+            prefix.clone(),
+            &DNSTAP_VALUE_PATHS.question_count,
             header.question_count,
         );
-
-        self.insert(
-            self.event_schema.dns_query_header_schema().answer_count(),
+        DnstapParser::insert(
+            event,
+            prefix.clone(),
+            &DNSTAP_VALUE_PATHS.answer_count,
             header.answer_count,
         );
-
-        self.insert(
-            self.event_schema
-                .dns_query_header_schema()
-                .authority_count(),
+        DnstapParser::insert(
+            event,
+            prefix.clone(),
+            &DNSTAP_VALUE_PATHS.authority_count,
             header.authority_count,
         );
-
-        self.insert(
-            self.event_schema
-                .dns_query_header_schema()
-                .additional_count(),
+        DnstapParser::insert(
+            event,
+            prefix.clone(),
+            &DNSTAP_VALUE_PATHS.ar_count,
             header.additional_count,
         );
-
-        self.parent_key_path.segments.pop();
     }
 
-    fn log_dns_query_message_query_section(
-        &mut self,
-        key_path: &'static str,
+    fn log_dns_query_message_query_section<'a>(
+        event: &mut LogEvent,
+        prefix: impl ValuePath<'a>,
         questions: &[QueryQuestion],
     ) {
-        self.parent_key_path.push_field(key_path);
-
         for (i, query) in questions.iter().enumerate() {
-            self.parent_key_path.push_index(i as isize);
-            self.log_dns_query_question(query);
-            self.parent_key_path.segments.pop();
+            let index_segment = path!(i as isize);
+            DnstapParser::log_dns_query_question(event, prefix.concat(index_segment), query);
         }
-
-        self.parent_key_path.segments.pop();
     }
 
-    fn log_dns_query_question(&mut self, question: &QueryQuestion) {
-        self.insert(
-            self.event_schema.dns_query_question_schema().name(),
+    fn log_dns_query_question<'a>(
+        event: &mut LogEvent,
+        prefix: impl ValuePath<'a>,
+        question: &QueryQuestion,
+    ) {
+        DnstapParser::insert(
+            event,
+            prefix.clone(),
+            &DNSTAP_VALUE_PATHS.domain_name,
             question.name.clone(),
         );
         if let Some(record_type) = question.record_type.clone() {
-            self.insert(
-                self.event_schema
-                    .dns_query_question_schema()
-                    .question_type(),
+            DnstapParser::insert(
+                event,
+                prefix.clone(),
+                &DNSTAP_VALUE_PATHS.question_type,
                 record_type,
             );
         }
-        self.insert(
-            self.event_schema
-                .dns_query_question_schema()
-                .question_type_id(),
+        DnstapParser::insert(
+            event,
+            prefix.clone(),
+            &DNSTAP_VALUE_PATHS.question_type_id,
             question.record_type_id,
         );
-        self.insert(
-            self.event_schema.dns_query_question_schema().class(),
+        DnstapParser::insert(
+            event,
+            prefix.clone(),
+            &DNSTAP_VALUE_PATHS.class,
             question.class.clone(),
         );
     }
 
-    fn parse_dns_update_message(
-        &mut self,
-        key_prefix: &'static str,
+    fn parse_dns_update_message<'a>(
+        event: &mut LogEvent,
+        prefix: impl ValuePath<'a>,
         dns_message_parser: &mut DnsMessageParser,
     ) -> Result<()> {
         let msg = dns_message_parser.parse_as_update_message()?;
 
-        self.parent_key_path.push_field(key_prefix);
-
-        self.insert(
-            self.event_schema
-                .dns_update_message_schema()
-                .response_code(),
+        DnstapParser::insert(
+            event,
+            prefix.clone(),
+            &DNSTAP_VALUE_PATHS.response_code,
             msg.response_code,
         );
 
         if let Some(response) = msg.response {
-            self.insert(
-                self.event_schema.dns_update_message_schema().response(),
+            DnstapParser::insert(
+                event,
+                prefix.clone(),
+                &DNSTAP_VALUE_PATHS.response,
                 response.to_string(),
             );
         }
 
-        self.log_dns_update_message_header(
-            self.event_schema.dns_update_message_schema().header(),
+        DnstapParser::log_dns_update_message_header(
+            event,
+            prefix.concat(&DNSTAP_VALUE_PATHS.header),
             &msg.header,
         );
 
-        self.log_dns_update_message_zone_section(
-            self.event_schema.dns_update_message_schema().zone_section(),
+        DnstapParser::log_dns_update_message_zone_section(
+            event,
+            prefix.concat(&DNSTAP_VALUE_PATHS.zone_section),
             &msg.zone_to_update,
         );
 
-        self.log_dns_message_record_section(
-            self.event_schema
-                .dns_update_message_schema()
-                .prerequisite_section(),
+        DnstapParser::log_dns_message_record_section(
+            event,
+            prefix.concat(&DNSTAP_VALUE_PATHS.prerequisite_section),
             &msg.prerequisite_section,
         );
 
-        self.log_dns_message_record_section(
-            self.event_schema
-                .dns_update_message_schema()
-                .update_section(),
+        DnstapParser::log_dns_message_record_section(
+            event,
+            prefix.concat(&DNSTAP_VALUE_PATHS.update_section),
             &msg.update_section,
         );
 
-        self.log_dns_message_record_section(
-            self.event_schema
-                .dns_update_message_schema()
-                .additional_section(),
+        DnstapParser::log_dns_message_record_section(
+            event,
+            prefix.concat(&DNSTAP_VALUE_PATHS.additional_section),
             &msg.additional_section,
         );
 
-        self.parent_key_path.segments.pop();
         Ok(())
     }
 
-    fn log_dns_update_message_header(&mut self, key_prefix: &'static str, header: &UpdateHeader) {
-        self.parent_key_path.push_field(key_prefix);
-
-        self.insert(self.event_schema.dns_update_header_schema().id(), header.id);
+    fn log_dns_update_message_header<'a>(
+        event: &mut LogEvent,
+        prefix: impl ValuePath<'a>,
+        header: &UpdateHeader,
+    ) {
+        DnstapParser::insert(event, prefix.clone(), &DNSTAP_VALUE_PATHS.id, header.id);
 
-        self.insert(
-            self.event_schema.dns_update_header_schema().opcode(),
+        DnstapParser::insert(
+            event,
+            prefix.clone(),
+            &DNSTAP_VALUE_PATHS.opcode,
             header.opcode,
         );
 
-        self.insert(
-            self.event_schema.dns_update_header_schema().rcode(),
+        DnstapParser::insert(
+            event,
+            prefix.clone(),
+            &DNSTAP_VALUE_PATHS.rcode,
             u16::from(header.rcode),
         );
 
-        self.insert(self.event_schema.dns_update_header_schema().qr(), header.qr);
+        DnstapParser::insert(event, prefix.clone(), &DNSTAP_VALUE_PATHS.qr, header.qr);
 
-        self.insert(
-            self.event_schema.dns_update_header_schema().zone_count(),
+        DnstapParser::insert(
+            event,
+            prefix.clone(),
+            &DNSTAP_VALUE_PATHS.zone_count,
             header.zone_count,
         );
 
-        self.insert(
-            self.event_schema
-                .dns_update_header_schema()
-                .prerequisite_count(),
+        DnstapParser::insert(
+            event,
+            prefix.clone(),
+            &DNSTAP_VALUE_PATHS.prerequisite_count,
             header.prerequisite_count,
         );
 
-        self.insert(
-            self.event_schema.dns_update_header_schema().update_count(),
+        DnstapParser::insert(
+            event,
+            prefix.clone(),
+            &DNSTAP_VALUE_PATHS.update_count,
             header.update_count,
         );
 
-        self.insert(
-            self.event_schema
-                .dns_update_header_schema()
-                .additional_count(),
+        DnstapParser::insert(
+            event,
+            prefix.clone(),
+            &DNSTAP_VALUE_PATHS.ad_count,
             header.additional_count,
         );
-
-        self.parent_key_path.segments.pop();
     }
 
-    fn log_dns_update_message_zone_section(&mut self, key_path: &'static str, zone: &ZoneInfo) {
-        self.parent_key_path.push_field(key_path);
-
-        self.insert(
-            self.event_schema.dns_update_zone_info_schema().zone_name(),
+    fn log_dns_update_message_zone_section<'a>(
+        event: &mut LogEvent,
+        prefix: impl ValuePath<'a>,
+        zone: &ZoneInfo,
+    ) {
+        DnstapParser::insert(
+            event,
+            prefix.clone(),
+            &DNSTAP_VALUE_PATHS.zone_name,
             zone.name.clone(),
         );
         if let Some(zone_type) = zone.zone_type.clone() {
-            self.insert(
-                self.event_schema.dns_update_zone_info_schema().zone_type(),
+            DnstapParser::insert(
+                event,
+                prefix.clone(),
+                &DNSTAP_VALUE_PATHS.zone_type,
                 zone_type,
             );
         }
-        self.insert(
-            self.event_schema
-                .dns_update_zone_info_schema()
-                .zone_type_id(),
+        DnstapParser::insert(
+            event,
+            prefix.clone(),
+            &DNSTAP_VALUE_PATHS.zone_type_id,
             zone.zone_type_id,
         );
-        self.insert(
-            self.event_schema.dns_update_zone_info_schema().zone_class(),
+        DnstapParser::insert(
+            event,
+            prefix.clone(),
+            &DNSTAP_VALUE_PATHS.zone_class,
             zone.class.clone(),
         );
-
-        self.parent_key_path.segments.pop();
     }
 
-    fn log_edns(&mut self, key_prefix: &'static str, opt_section: &Option<OptPseudoSection>) {
-        self.parent_key_path.push_field(key_prefix);
-
+    fn log_edns<'a>(
+        event: &mut LogEvent,
+        prefix: impl ValuePath<'a>,
+        opt_section: &Option<OptPseudoSection>,
+    ) {
         if let Some(edns) = opt_section {
-            self.insert(
-                self.event_schema
-                    .dns_message_opt_pseudo_section_schema()
-                    .extended_rcode(),
+            DnstapParser::insert(
+                event,
+                prefix.clone(),
+                &DNSTAP_VALUE_PATHS.extended_rcode,
                 edns.extended_rcode,
             );
-            self.insert(
-                self.event_schema
-                    .dns_message_opt_pseudo_section_schema()
-                    .version(),
+            DnstapParser::insert(
+                event,
+                prefix.clone(),
+                &DNSTAP_VALUE_PATHS.version,
                 edns.version,
             );
-            self.insert(
-                self.event_schema
-                    .dns_message_opt_pseudo_section_schema()
-                    .do_flag(),
+            DnstapParser::insert(
+                event,
+                prefix.clone(),
+                &DNSTAP_VALUE_PATHS.do_flag,
                 edns.dnssec_ok,
             );
-            self.insert(
-                self.event_schema
-                    .dns_message_opt_pseudo_section_schema()
-                    .udp_max_payload_size(),
+            DnstapParser::insert(
+                event,
+                prefix.clone(),
+                &DNSTAP_VALUE_PATHS.udp_max_payload_size,
                 edns.udp_max_payload_size,
             );
-            self.log_edns_options(
-                self.event_schema
-                    .dns_message_opt_pseudo_section_schema()
-                    .options(),
+            DnstapParser::log_edns_options(
+                event,
+                prefix.concat(&DNSTAP_VALUE_PATHS.options),
                 &edns.options,
             );
         }
-
-        self.parent_key_path.segments.pop();
     }
 
-    fn log_edns_options(&mut self, key_path: &'static str, options: &[EdnsOptionEntry]) {
-        self.parent_key_path.push_field(key_path);
-
+    fn log_edns_options<'a>(
+        event: &mut LogEvent,
+        prefix: impl ValuePath<'a>,
+        options: &[EdnsOptionEntry],
+    ) {
         options.iter().enumerate().for_each(|(i, opt)| {
-            self.parent_key_path.push_index(i as isize);
-            self.log_edns_opt(opt);
-            self.parent_key_path.segments.pop();
+            let index_segment = path!(i as isize);
+            DnstapParser::log_edns_opt(event, prefix.concat(index_segment), opt);
         });
-
-        self.parent_key_path.segments.pop();
     }
 
-    fn log_edns_opt(&mut self, opt: &EdnsOptionEntry) {
-        self.insert(
-            self.event_schema.dns_message_option_schema().opt_code(),
+    fn log_edns_opt<'a>(event: &mut LogEvent, prefix: impl ValuePath<'a>, opt: &EdnsOptionEntry) {
+        DnstapParser::insert(
+            event,
+            prefix.clone(),
+            &DNSTAP_VALUE_PATHS.opt_code,
             opt.opt_code,
         );
-        self.insert(
-            self.event_schema.dns_message_option_schema().opt_name(),
+        DnstapParser::insert(
+            event,
+            prefix.clone(),
+            &DNSTAP_VALUE_PATHS.opt_name,
             opt.opt_name.clone(),
         );
-        self.insert(
-            self.event_schema.dns_message_option_schema().opt_data(),
+        DnstapParser::insert(
+            event,
+            prefix.clone(),
+            &DNSTAP_VALUE_PATHS.opt_data,
             opt.opt_data.clone(),
         );
     }
 
-    fn log_dns_message_record_section(&mut self, key_path: &'static str, records: &[DnsRecord]) {
-        self.parent_key_path.push_field(key_path);
-
+    fn log_dns_message_record_section<'a>(
+        event: &mut LogEvent,
+        prefix: impl ValuePath<'a>,
+        records: &[DnsRecord],
+    ) {
         for (i, record) in records.iter().enumerate() {
-            self.parent_key_path.push_index(i as isize);
-            self.log_dns_record(record);
-            self.parent_key_path.segments.pop();
+            let index_segment = path!(i as isize);
+            DnstapParser::log_dns_record(event, prefix.concat(index_segment), record);
         }
-
-        self.parent_key_path.segments.pop();
     }
 
-    fn log_dns_record(&mut self, record: &DnsRecord) {
-        self.insert(
-            self.event_schema.dns_record_schema().name(),
+    fn log_dns_record<'a>(event: &mut LogEvent, prefix: impl ValuePath<'a>, record: &DnsRecord) {
+        DnstapParser::insert(
+            event,
+            prefix.clone(),
+            &DNSTAP_VALUE_PATHS.domain_name,
             record.name.clone(),
         );
         if let Some(record_type) = record.record_type.clone() {
-            self.insert(
-                self.event_schema.dns_record_schema().record_type(),
+            DnstapParser::insert(
+                event,
+                prefix.clone(),
+                &DNSTAP_VALUE_PATHS.record_type,
                 record_type,
             );
         }
-        self.insert(
-            self.event_schema.dns_record_schema().record_type_id(),
+        DnstapParser::insert(
+            event,
+            prefix.clone(),
+            &DNSTAP_VALUE_PATHS.record_type_id,
             record.record_type_id,
         );
-        self.insert(self.event_schema.dns_record_schema().ttl(), record.ttl);
-        self.insert(
-            self.event_schema.dns_record_schema().class(),
+        DnstapParser::insert(event, prefix.clone(), &DNSTAP_VALUE_PATHS.ttl, record.ttl);
+        DnstapParser::insert(
+            event,
+            prefix.clone(),
+            &DNSTAP_VALUE_PATHS.class,
             record.class.clone(),
         );
         if let Some(rdata) = &record.rdata {
-            self.insert(
-                self.event_schema.dns_record_schema().rdata(),
+            DnstapParser::insert(
+                event,
+                prefix.clone(),
+                &DNSTAP_VALUE_PATHS.rdata,
                 rdata.to_string(),
             );
         };
         if let Some(rdata_bytes) = &record.rdata_bytes {
-            self.insert(
-                self.event_schema.dns_record_schema().rdata_bytes(),
+            DnstapParser::insert(
+                event,
+                prefix.clone(),
+                &DNSTAP_VALUE_PATHS.rdata_bytes,
                 BASE64_STANDARD.encode(rdata_bytes),
             );
         };
@@ -944,122 +972,202 @@ fn to_dnstap_message_type(type_id: i32) -> String {
 
 #[cfg(test)]
 mod tests {
-    use super::{super::schema::DnstapEventSchema, *};
+    use super::*;
     use crate::event::Value;
+    use chrono::DateTime;
+    use std::collections::BTreeMap;
 
     #[test]
     fn test_parse_dnstap_data_with_query_message() {
         let mut log_event = LogEvent::default();
-        let schema = DnstapEventSchema::new();
-        let mut parser = DnstapParser::new(&schema, &mut log_event);
         let raw_dnstap_data = "ChVqYW1lcy1WaXJ0dWFsLU1hY2hpbmUSC0JJTkQgOS4xNi4zcnoIAxACGAEiEAAAAAAAAA\
         AAAAAAAAAAAAAqECABBQJwlAAAAAAAAAAAADAw8+0CODVA7+zq9wVNMU3WNlI2kwIAAAABAAAAAAABCWZhY2Vib29rMQNjb\
         20AAAEAAQAAKQIAAACAAAAMAAoACOxjCAG9zVgzWgUDY29tAHgB";
         let dnstap_data = BASE64_STANDARD
             .decode(raw_dnstap_data)
             .expect("Invalid base64 encoded data.");
-        let parse_result = parser.parse_dnstap_data(Bytes::from(dnstap_data));
+        let parse_result = DnstapParser::parse(&mut log_event, Bytes::from(dnstap_data));
         assert!(parse_result.is_ok());
-        assert!(log_event
-            .all_fields()
-            .unwrap()
-            .any(|(key, value)| key == "time"
-                && match *value {
-                    Value::Integer(time) => time == 1_593_489_007_920_014_129,
-                    _ => false,
-                }));
-        assert!(log_event
-            .all_fields()
-            .unwrap()
-            .any(|(key, value)| key == "timestamp"
-                && match *value {
-                    Value::Timestamp(timestamp) =>
-                        timestamp.timestamp_nanos() == 1_593_489_007_920_014_129,
-                    _ => false,
-                }));
-        assert!(log_event
-            .all_fields()
-            .unwrap()
-            .any(|(key, value)| key == "requestData.header.qr"
-                && match *value {
-                    Value::Integer(qr) => qr == 0,
-                    _ => false,
-                }));
-        assert!(log_event.all_fields().unwrap().any(|(key, value)| key
-            == "requestData.opt.udpPayloadSize"
-            && match *value {
-                Value::Integer(udp_payload_size) => udp_payload_size == 512,
-                _ => false,
-            }));
-        assert!(log_event.all_fields().unwrap().any(|(key, value)| key
-            == "requestData.question[0].domainName"
-            && match value {
-                Value::Bytes(domain_name) => *domain_name == Bytes::from_static(b"facebook1.com."),
-                _ => false,
-            }));
+
+        let expected_map: BTreeMap<&str, Value> = BTreeMap::from([
+            ("dataType", Value::Bytes(Bytes::from("Message"))),
+            ("dataTypeId", Value::Integer(1)),
+            ("messageType", Value::Bytes(Bytes::from("ResolverQuery"))),
+            ("messageTypeId", Value::Integer(3)),
+            ("queryZone", Value::Bytes(Bytes::from("com."))),
+            ("requestData.fullRcode", Value::Integer(0)),
+            ("requestData.header.aa", Value::Boolean(false)),
+            ("requestData.header.ad", Value::Boolean(false)),
+            ("requestData.header.anCount", Value::Integer(0)),
+            ("requestData.header.arCount", Value::Integer(1)),
+            ("requestData.header.cd", Value::Boolean(false)),
+            ("requestData.header.id", Value::Integer(37634)),
+            ("requestData.header.nsCount", Value::Integer(0)),
+            ("requestData.header.opcode", Value::Integer(0)),
+            ("requestData.header.qdCount", Value::Integer(1)),
+            ("requestData.header.qr", Value::Integer(0)),
+            ("requestData.header.ra", Value::Boolean(false)),
+            ("requestData.header.rcode", Value::Integer(0)),
+            ("requestData.header.rd", Value::Boolean(false)),
+            ("requestData.header.tc", Value::Boolean(false)),
+            ("requestData.opt.do", Value::Boolean(true)),
+            ("requestData.opt.ednsVersion", Value::Integer(0)),
+            ("requestData.opt.extendedRcode", Value::Integer(0)),
+            ("requestData.opt.options[0].optCode", Value::Integer(10)),
+            (
+                "requestData.opt.options[0].optName",
+                Value::Bytes(Bytes::from("Cookie")),
+            ),
+            (
+                "requestData.opt.options[0].optValue",
+                Value::Bytes(Bytes::from("7GMIAb3NWDM=")),
+            ),
+            ("requestData.opt.udpPayloadSize", Value::Integer(512)),
+            (
+                "requestData.question[0].class",
+                Value::Bytes(Bytes::from("IN")),
+            ),
+            (
+                "requestData.question[0].domainName",
+                Value::Bytes(Bytes::from("facebook1.com.")),
+            ),
+            (
+                "requestData.question[0].questionType",
+                Value::Bytes(Bytes::from("A")),
+            ),
+            ("requestData.question[0].questionTypeId", Value::Integer(1)),
+            (
+                "requestData.rcodeName",
+                Value::Bytes(Bytes::from("NoError")),
+            ),
+            (
+                "responseAddress",
+                Value::Bytes(Bytes::from("2001:502:7094::30")),
+            ),
+            ("responsePort", Value::Integer(53)),
+            (
+                "serverId",
+                Value::Bytes(Bytes::from("james-Virtual-Machine")),
+            ),
+            ("serverVersion", Value::Bytes(Bytes::from("BIND 9.16.3"))),
+            ("socketFamily", Value::Bytes(Bytes::from("INET6"))),
+            ("socketProtocol", Value::Bytes(Bytes::from("UDP"))),
+            ("sourceAddress", Value::Bytes(Bytes::from("::"))),
+            ("sourcePort", Value::Integer(46835)),
+            ("time", Value::Integer(1_593_489_007_920_014_129)),
+            ("timePrecision", Value::Bytes(Bytes::from("ns"))),
+            (
+                "timestamp",
+                Value::Timestamp(
+                    Utc.from_utc_datetime(
+                        &DateTime::parse_from_rfc3339("2020-06-30T03:50:07.920014129Z")
+                            .unwrap()
+                            .naive_utc(),
+                    ),
+                ),
+            ),
+        ]);
+
+        // The maps need to contain identical keys and values.
+        for (exp_key, exp_value) in expected_map {
+            let value = log_event.get(exp_key).unwrap();
+            assert_eq!(*value, exp_value);
+        }
     }
 
     #[test]
     fn test_parse_dnstap_data_with_update_message() {
         let mut log_event = LogEvent::default();
-        let schema = DnstapEventSchema::new();
-        let mut parser = DnstapParser::new(&schema, &mut log_event);
         let raw_dnstap_data = "ChVqYW1lcy1WaXJ0dWFsLU1hY2hpbmUSC0JJTkQgOS4xNi4zcmsIDhABGAEiBH8AAA\
         EqBH8AAAEwrG44AEC+iu73BU14gfofUh1wi6gAAAEAAAAAAAAHZXhhbXBsZQNjb20AAAYAAWC+iu73BW0agDwvch1wi6gAA\
         AEAAAAAAAAHZXhhbXBsZQNjb20AAAYAAXgB";
         let dnstap_data = BASE64_STANDARD
             .decode(raw_dnstap_data)
             .expect("Invalid base64 encoded data.");
-        let parse_result = parser.parse_dnstap_data(Bytes::from(dnstap_data));
+        let parse_result = DnstapParser::parse(&mut log_event, Bytes::from(dnstap_data));
         assert!(parse_result.is_ok());
-        assert!(log_event
-            .all_fields()
-            .unwrap()
-            .any(|(key, value)| key == "time"
-                && match *value {
-                    Value::Integer(time) => time == 1_593_541_950_792_494_106,
-                    _ => false,
-                }));
-        assert!(log_event
-            .all_fields()
-            .unwrap()
-            .any(|(key, value)| key == "timestamp"
-                && match *value {
-                    Value::Timestamp(timestamp) =>
-                        timestamp.timestamp_nanos() == 1_593_541_950_792_494_106,
-                    _ => false,
-                }));
-        assert!(log_event
-            .all_fields()
-            .unwrap()
-            .any(|(key, value)| key == "requestData.header.qr"
-                && match *value {
-                    Value::Integer(qr) => qr == 1,
-                    _ => false,
-                }));
-        assert!(log_event
-            .all_fields()
-            .unwrap()
-            .any(|(key, value)| key == "messageType"
-                && match value {
-                    Value::Bytes(data_type) => *data_type == Bytes::from_static(b"UpdateResponse"),
-                    _ => false,
-                }));
-        assert!(log_event.all_fields().unwrap().any(|(key, value)| key
-            == "requestData.zone.zName"
-            && match value {
-                Value::Bytes(domain_name) => *domain_name == Bytes::from_static(b"example.com."),
-                _ => false,
-            }));
+
+        let expected_map: BTreeMap<&str, Value> = BTreeMap::from([
+            ("dataType", Value::Bytes(Bytes::from("Message"))),
+            ("dataTypeId", Value::Integer(1)),
+            ("messageType", Value::Bytes(Bytes::from("UpdateResponse"))),
+            ("messageTypeId", Value::Integer(14)),
+            ("requestData.fullRcode", Value::Integer(0)),
+            ("requestData.header.adCount", Value::Integer(0)),
+            ("requestData.header.id", Value::Integer(28811)),
+            ("requestData.header.opcode", Value::Integer(5)),
+            ("requestData.header.prCount", Value::Integer(0)),
+            ("requestData.header.qr", Value::Integer(1)),
+            ("requestData.header.rcode", Value::Integer(0)),
+            ("requestData.header.upCount", Value::Integer(0)),
+            ("requestData.header.zoCount", Value::Integer(1)),
+            (
+                "requestData.rcodeName",
+                Value::Bytes(Bytes::from("NoError")),
+            ),
+            ("requestData.zone.zClass", Value::Bytes(Bytes::from("IN"))),
+            (
+                "requestData.zone.zName",
+                Value::Bytes(Bytes::from("example.com.")),
+            ),
+            ("requestData.zone.zType", Value::Bytes(Bytes::from("SOA"))),
+            ("requestData.zone.zTypeId", Value::Integer(6)),
+            ("responseAddress", Value::Bytes(Bytes::from("127.0.0.1"))),
+            ("responseData.fullRcode", Value::Integer(0)),
+            ("responseData.header.adCount", Value::Integer(0)),
+            ("responseData.header.id", Value::Integer(28811)),
+            ("responseData.header.opcode", Value::Integer(5)),
+            ("responseData.header.prCount", Value::Integer(0)),
+            ("responseData.header.qr", Value::Integer(1)),
+            ("responseData.header.rcode", Value::Integer(0)),
+            ("responseData.header.upCount", Value::Integer(0)),
+            ("responseData.header.zoCount", Value::Integer(1)),
+            (
+                "responseData.rcodeName",
+                Value::Bytes(Bytes::from("NoError")),
+            ),
+            ("responseData.zone.zClass", Value::Bytes(Bytes::from("IN"))),
+            (
+                "responseData.zone.zName",
+                Value::Bytes(Bytes::from("example.com.")),
+            ),
+            ("responseData.zone.zType", Value::Bytes(Bytes::from("SOA"))),
+            ("responseData.zone.zTypeId", Value::Integer(6)),
+            ("responsePort", Value::Integer(0)),
+            (
+                "serverId",
+                Value::Bytes(Bytes::from("james-Virtual-Machine")),
+            ),
+            ("serverVersion", Value::Bytes(Bytes::from("BIND 9.16.3"))),
+            ("socketFamily", Value::Bytes(Bytes::from("INET"))),
+            ("socketProtocol", Value::Bytes(Bytes::from("UDP"))),
+            ("sourceAddress", Value::Bytes(Bytes::from("127.0.0.1"))),
+            ("sourcePort", Value::Integer(14124)),
+            ("time", Value::Integer(1_593_541_950_792_494_106)),
+            ("timePrecision", Value::Bytes(Bytes::from("ns"))),
+            (
+                "timestamp",
+                Value::Timestamp(
+                    Utc.from_utc_datetime(
+                        &DateTime::parse_from_rfc3339("2020-06-30T18:32:30.792494106Z")
+                            .unwrap()
+                            .naive_utc(),
+                    ),
+                ),
+            ),
+        ]);
+
+        // The maps need to contain identical keys and values.
+        for (exp_key, exp_value) in expected_map {
+            let value = log_event.get(exp_key).unwrap();
+            assert_eq!(*value, exp_value);
+        }
     }
 
     #[test]
     fn test_parse_dnstap_data_with_invalid_data() {
         let mut log_event = LogEvent::default();
-        let schema = DnstapEventSchema::new();
-        let mut parser = DnstapParser::new(&schema, &mut log_event);
-        let e = parser
-            .parse_dnstap_data(Bytes::from(vec![1, 2, 3]))
+        let e = DnstapParser::parse(&mut log_event, Bytes::from(vec![1, 2, 3]))
             .expect_err("Expected TrustDnsError.");
         assert!(e.to_string().contains("Protobuf message"));
     }
diff --git a/src/sources/dnstap/schema.rs b/src/sources/dnstap/schema.rs
index 90a76dfa33a44..23ce53cdbfd92 100644
--- a/src/sources/dnstap/schema.rs
+++ b/src/sources/dnstap/schema.rs
@@ -1,4 +1,5 @@
 use lookup::{owned_value_path, OwnedValuePath};
+use once_cell::sync::Lazy;
 use std::collections::BTreeMap;
 use vrl::btreemap;
 use vrl::value::{
@@ -7,151 +8,121 @@ use vrl::value::{
 };
 
 #[derive(Debug, Default, Clone)]
-pub struct DnstapEventSchema {
-    dnstap_root_data_schema: DnstapRootDataSchema,
-    dnstap_message_schema: DnstapMessageSchema,
-    dns_query_message_schema: DnsQueryMessageSchema,
-    dns_query_header_schema: DnsQueryHeaderSchema,
-    dns_update_message_schema: DnsUpdateMessageSchema,
-    dns_update_header_schema: DnsUpdateHeaderSchema,
-    dns_message_opt_pseudo_section_schema: DnsMessageOptPseudoSectionSchema,
-    dns_message_option_schema: DnsMessageOptionSchema,
-    dns_record_schema: DnsRecordSchema,
-    dns_query_question_schema: DnsQueryQuestionSchema,
-    dns_update_zone_info_schema: DnsUpdateZoneInfoSchema,
-}
+pub struct DnstapEventSchema;
 
 impl DnstapEventSchema {
     /// The message schema for the request and response message fields
     fn request_message_schema_definition(&self) -> Collection<Field> {
-        let mut result = BTreeMap::new();
+        let mut result: BTreeMap<Field, Kind> = BTreeMap::new();
         result.insert(
-            self.dns_query_message_schema().time().into(),
+            DNSTAP_VALUE_PATHS.time.to_string().into(),
             Kind::integer().or_undefined(),
         );
 
         result.insert(
-            self.dns_update_message_schema().time().into(),
+            DNSTAP_VALUE_PATHS.time.to_string().into(),
             Kind::integer().or_undefined(),
         );
         result.insert(
-            self.dns_query_message_schema().time_precision().into(),
+            DNSTAP_VALUE_PATHS.time_precision.to_string().into(),
             Kind::bytes().or_undefined(),
         );
         result.insert(
-            self.dns_update_message_schema().time_precision().into(),
+            DNSTAP_VALUE_PATHS.time_precision.to_string().into(),
             Kind::bytes().or_undefined(),
         );
         result.insert(
-            self.dns_query_message_schema().response_code().into(),
+            DNSTAP_VALUE_PATHS.response_code.to_string().into(),
             Kind::integer().or_undefined(),
         );
         result.insert(
-            self.dns_update_message_schema().response_code().into(),
+            DNSTAP_VALUE_PATHS.response_code.to_string().into(),
             Kind::integer().or_undefined(),
         );
         result.insert(
-            self.dns_query_message_schema().response().into(),
+            DNSTAP_VALUE_PATHS.response.to_string().into(),
             Kind::bytes().or_undefined(),
         );
         result.insert(
-            self.dns_update_message_schema().response().into(),
+            DNSTAP_VALUE_PATHS.response.to_string().into(),
             Kind::bytes().or_undefined(),
         );
 
-        if self.dns_query_message_schema().header() == self.dns_update_message_schema().header() {
-            // This branch will always be hit -
-            // we know that both headers are equal since they both pull the values from the common schema.
-            let mut schema = self.dns_query_header_schema().schema_definition();
-            schema.merge(self.dns_update_header_schema().schema_definition(), true);
-
-            result.insert(
-                self.dns_query_message_schema().header().into(),
-                Kind::object(schema).or_undefined(),
-            );
-        } else {
-            result.insert(
-                self.dns_query_message_schema().header().into(),
-                Kind::object(self.dns_query_header_schema().schema_definition()).or_undefined(),
-            );
-            result.insert(
-                self.dns_update_message_schema().header().into(),
-                Kind::object(self.dns_update_header_schema().schema_definition()).or_undefined(),
-            );
-        }
+        let mut schema = DnsQueryHeaderSchema::schema_definition();
+        schema.merge(DnsUpdateHeaderSchema::schema_definition(), true);
+
+        result.insert(
+            DNSTAP_VALUE_PATHS.header.to_string().into(),
+            Kind::object(schema).or_undefined(),
+        );
+
         result.insert(
-            self.dns_update_message_schema().zone_section().into(),
-            Kind::object(self.dns_update_zone_info_schema().schema_definition()).or_undefined(),
+            DNSTAP_VALUE_PATHS.zone_section.to_string().into(),
+            Kind::object(DnsUpdateZoneInfoSchema::schema_definition()).or_undefined(),
         );
 
         result.insert(
-            self.dns_query_message_schema().question_section().into(),
+            DNSTAP_VALUE_PATHS.question_section.to_string().into(),
             Kind::array(Collection::from_unknown(Kind::object(
-                self.dns_query_question_schema().schema_definition(),
+                DnsQueryQuestionSchema::schema_definition(),
             )))
             .or_undefined(),
         );
 
         result.insert(
-            self.dns_query_message_schema().answer_section().into(),
+            DNSTAP_VALUE_PATHS.answer_section.to_string().into(),
             Kind::array(Collection::from_unknown(Kind::object(
-                self.dns_record_schema().schema_definition(),
+                DnsRecordSchema::schema_definition(),
             )))
             .or_undefined(),
         );
 
         result.insert(
-            self.dns_query_message_schema().authority_section().into(),
+            DNSTAP_VALUE_PATHS.authority_section.to_string().into(),
             Kind::array(Collection::from_unknown(Kind::object(
-                self.dns_record_schema().schema_definition(),
+                DnsRecordSchema::schema_definition(),
             )))
             .or_undefined(),
         );
 
         result.insert(
-            self.dns_query_message_schema().additional_section().into(),
+            DNSTAP_VALUE_PATHS.additional_section.to_string().into(),
             Kind::array(Collection::from_unknown(Kind::object(
-                self.dns_record_schema().schema_definition(),
+                DnsRecordSchema::schema_definition(),
             )))
             .or_undefined(),
         );
 
         result.insert(
-            self.dns_query_message_schema().opt_pseudo_section().into(),
-            Kind::object(
-                self.dns_message_opt_pseudo_section_schema()
-                    .schema_definition(self.dns_message_option_schema()),
-            )
-            .or_undefined(),
+            DNSTAP_VALUE_PATHS.opt_pseudo_section.to_string().into(),
+            Kind::object(DnsMessageOptPseudoSectionSchema::schema_definition()).or_undefined(),
         );
 
         result.insert(
-            self.dns_query_message_schema().raw_data().into(),
+            DNSTAP_VALUE_PATHS.raw_data.to_string().into(),
             Kind::bytes().or_undefined(),
         );
 
         result.insert(
-            self.dns_update_message_schema()
-                .prerequisite_section()
-                .into(),
+            DNSTAP_VALUE_PATHS.prerequisite_section.to_string().into(),
             Kind::array(Collection::from_unknown(Kind::object(
-                self.dns_record_schema().schema_definition(),
+                DnsRecordSchema::schema_definition(),
             )))
             .or_undefined(),
         );
 
         result.insert(
-            self.dns_update_message_schema().update_section().into(),
+            DNSTAP_VALUE_PATHS.update_section.to_string().into(),
             Kind::array(Collection::from_unknown(Kind::object(
-                self.dns_record_schema().schema_definition(),
+                DnsRecordSchema::schema_definition(),
             )))
             .or_undefined(),
         );
 
         result.insert(
-            self.dns_update_message_schema().additional_section().into(),
+            DNSTAP_VALUE_PATHS.additional_section.to_string().into(),
             Kind::array(Collection::from_unknown(Kind::object(
-                self.dns_record_schema().schema_definition(),
+                DnsRecordSchema::schema_definition(),
             )))
             .or_undefined(),
         );
@@ -165,51 +136,15 @@ impl DnstapEventSchema {
         schema: vector_core::schema::Definition,
     ) -> vector_core::schema::Definition {
         schema
-            .optional_field(
-                &owned_value_path!(self.dnstap_root_data_schema().server_identity()),
-                Kind::bytes(),
-                None,
-            )
-            .optional_field(
-                &owned_value_path!(self.dnstap_root_data_schema().server_version()),
-                Kind::bytes(),
-                None,
-            )
-            .optional_field(
-                &owned_value_path!(self.dnstap_root_data_schema().extra()),
-                Kind::bytes(),
-                None,
-            )
-            .with_event_field(
-                &owned_value_path!(self.dnstap_root_data_schema().data_type_id()),
-                Kind::integer(),
-                None,
-            )
-            .optional_field(
-                &owned_value_path!(self.dnstap_root_data_schema().data_type()),
-                Kind::bytes(),
-                None,
-            )
-            .optional_field(
-                &owned_value_path!(self.dnstap_root_data_schema().error()),
-                Kind::bytes(),
-                None,
-            )
-            .optional_field(
-                &owned_value_path!(self.dnstap_root_data_schema().raw_data()),
-                Kind::bytes(),
-                None,
-            )
-            .optional_field(
-                &owned_value_path!(self.dnstap_root_data_schema().time()),
-                Kind::integer(),
-                None,
-            )
-            .optional_field(
-                &owned_value_path!(self.dnstap_root_data_schema().time_precision()),
-                Kind::bytes(),
-                None,
-            )
+            .optional_field(&DNSTAP_VALUE_PATHS.server_identity, Kind::bytes(), None)
+            .optional_field(&DNSTAP_VALUE_PATHS.server_version, Kind::bytes(), None)
+            .optional_field(&DNSTAP_VALUE_PATHS.extra, Kind::bytes(), None)
+            .with_event_field(&DNSTAP_VALUE_PATHS.data_type_id, Kind::integer(), None)
+            .optional_field(&DNSTAP_VALUE_PATHS.data_type, Kind::bytes(), None)
+            .optional_field(&DNSTAP_VALUE_PATHS.error, Kind::bytes(), None)
+            .optional_field(&DNSTAP_VALUE_PATHS.raw_data, Kind::bytes(), None)
+            .optional_field(&DNSTAP_VALUE_PATHS.time, Kind::integer(), None)
+            .optional_field(&DNSTAP_VALUE_PATHS.time_precision, Kind::bytes(), None)
     }
 
     /// Schema definition from the message.
@@ -218,58 +153,22 @@ impl DnstapEventSchema {
         schema: vector_core::schema::Definition,
     ) -> vector_core::schema::Definition {
         schema
+            .optional_field(&DNSTAP_VALUE_PATHS.socket_family, Kind::bytes(), None)
+            .optional_field(&DNSTAP_VALUE_PATHS.socket_protocol, Kind::bytes(), None)
+            .optional_field(&DNSTAP_VALUE_PATHS.query_address, Kind::bytes(), None)
+            .optional_field(&DNSTAP_VALUE_PATHS.query_port, Kind::integer(), None)
+            .optional_field(&DNSTAP_VALUE_PATHS.response_address, Kind::bytes(), None)
+            .optional_field(&DNSTAP_VALUE_PATHS.response_port, Kind::integer(), None)
+            .optional_field(&DNSTAP_VALUE_PATHS.query_zone, Kind::bytes(), None)
+            .with_event_field(&DNSTAP_VALUE_PATHS.message_type_id, Kind::integer(), None)
+            .optional_field(&DNSTAP_VALUE_PATHS.message_type, Kind::bytes(), None)
             .optional_field(
-                &owned_value_path!(self.dnstap_message_schema().socket_family()),
-                Kind::bytes(),
-                None,
-            )
-            .optional_field(
-                &owned_value_path!(self.dnstap_message_schema().socket_protocol()),
-                Kind::bytes(),
-                None,
-            )
-            .optional_field(
-                &owned_value_path!(self.dnstap_message_schema().query_address()),
-                Kind::bytes(),
-                None,
-            )
-            .optional_field(
-                &owned_value_path!(self.dnstap_message_schema().query_port()),
-                Kind::integer(),
-                None,
-            )
-            .optional_field(
-                &owned_value_path!(self.dnstap_message_schema().response_address()),
-                Kind::bytes(),
-                None,
-            )
-            .optional_field(
-                &owned_value_path!(self.dnstap_message_schema().response_port()),
-                Kind::integer(),
-                None,
-            )
-            .optional_field(
-                &owned_value_path!(self.dnstap_message_schema().query_zone()),
-                Kind::bytes(),
-                None,
-            )
-            .with_event_field(
-                &owned_value_path!(self.dnstap_message_schema().dnstap_message_type_id()),
-                Kind::integer(),
-                None,
-            )
-            .optional_field(
-                &owned_value_path!(self.dnstap_message_schema().dnstap_message_type()),
-                Kind::bytes(),
-                None,
-            )
-            .optional_field(
-                &owned_value_path!(self.dnstap_message_schema().request_message()),
+                &DNSTAP_VALUE_PATHS.request_message,
                 Kind::object(self.request_message_schema_definition()),
                 None,
             )
             .optional_field(
-                &owned_value_path!(self.dnstap_message_schema().response_message()),
+                &DNSTAP_VALUE_PATHS.response_message,
                 Kind::object(self.request_message_schema_definition()),
                 None,
             )
@@ -282,616 +181,300 @@ impl DnstapEventSchema {
     ) -> vector_core::schema::Definition {
         self.root_schema_definition(self.message_schema_definition(schema))
     }
-
-    pub const fn dnstap_root_data_schema(&self) -> &DnstapRootDataSchema {
-        &self.dnstap_root_data_schema
-    }
-
-    pub const fn dnstap_message_schema(&self) -> &DnstapMessageSchema {
-        &self.dnstap_message_schema
-    }
-
-    pub const fn dns_query_message_schema(&self) -> &DnsQueryMessageSchema {
-        &self.dns_query_message_schema
-    }
-
-    pub const fn dns_query_header_schema(&self) -> &DnsQueryHeaderSchema {
-        &self.dns_query_header_schema
-    }
-
-    pub const fn dns_update_message_schema(&self) -> &DnsUpdateMessageSchema {
-        &self.dns_update_message_schema
-    }
-
-    pub const fn dns_update_header_schema(&self) -> &DnsUpdateHeaderSchema {
-        &self.dns_update_header_schema
-    }
-
-    pub const fn dns_message_opt_pseudo_section_schema(&self) -> &DnsMessageOptPseudoSectionSchema {
-        &self.dns_message_opt_pseudo_section_schema
-    }
-
-    pub const fn dns_message_option_schema(&self) -> &DnsMessageOptionSchema {
-        &self.dns_message_option_schema
-    }
-
-    pub const fn dns_record_schema(&self) -> &DnsRecordSchema {
-        &self.dns_record_schema
-    }
-
-    pub const fn dns_query_question_schema(&self) -> &DnsQueryQuestionSchema {
-        &self.dns_query_question_schema
-    }
-
-    pub const fn dns_update_zone_info_schema(&self) -> &DnsUpdateZoneInfoSchema {
-        &self.dns_update_zone_info_schema
-    }
-
-    pub fn dnstap_root_data_schema_mut(&mut self) -> &mut DnstapRootDataSchema {
-        &mut self.dnstap_root_data_schema
-    }
-
-    pub fn new() -> Self {
-        Self::default()
-    }
 }
 
+/// Collection of owned value paths.
 #[derive(Debug, Clone)]
-pub struct DnstapRootDataSchema {
-    timestamp: Option<OwnedValuePath>,
-}
-
-impl Default for DnstapRootDataSchema {
-    fn default() -> Self {
-        Self {
-            timestamp: Some(owned_value_path!("timestamp")),
-        }
-    }
-}
-
-impl DnstapRootDataSchema {
-    pub const fn server_identity(&self) -> &'static str {
-        "serverId"
-    }
-
-    pub const fn server_version(&self) -> &'static str {
-        "serverVersion"
-    }
-
-    pub const fn extra(&self) -> &'static str {
-        "extraInfo"
-    }
-
-    pub const fn data_type(&self) -> &'static str {
-        "dataType"
-    }
-
-    pub const fn data_type_id(&self) -> &'static str {
-        "dataTypeId"
-    }
-
-    pub const fn timestamp(&self) -> Option<&OwnedValuePath> {
-        self.timestamp.as_ref()
-    }
-
-    pub const fn time(&self) -> &'static str {
-        "time"
-    }
-
-    pub const fn time_precision(&self) -> &'static str {
-        "timePrecision"
-    }
-
-    pub const fn error(&self) -> &'static str {
-        "error"
-    }
-
-    pub const fn raw_data(&self) -> &'static str {
-        "rawData"
-    }
-
-    pub fn set_timestamp(&mut self, val: Option<OwnedValuePath>) -> &mut Self {
-        self.timestamp = val;
-        self
-    }
-}
-
-#[derive(Debug, Default, Clone)]
-pub struct DnstapMessageSchema;
-
-impl DnstapMessageSchema {
-    pub const fn socket_family(&self) -> &'static str {
-        "socketFamily"
-    }
-
-    pub const fn socket_protocol(&self) -> &'static str {
-        "socketProtocol"
-    }
-
-    pub const fn query_address(&self) -> &'static str {
-        "sourceAddress"
-    }
-
-    pub const fn query_port(&self) -> &'static str {
-        "sourcePort"
-    }
-
-    pub const fn response_address(&self) -> &'static str {
-        "responseAddress"
-    }
-
-    pub const fn response_port(&self) -> &'static str {
-        "responsePort"
-    }
-
-    pub const fn query_zone(&self) -> &'static str {
-        "queryZone"
-    }
-
-    pub const fn dnstap_message_type(&self) -> &'static str {
-        "messageType"
-    }
-
-    pub const fn dnstap_message_type_id(&self) -> &'static str {
-        "messageTypeId"
-    }
-
-    pub const fn request_message(&self) -> &'static str {
-        "requestData"
-    }
-
-    pub const fn response_message(&self) -> &'static str {
-        "responseData"
-    }
+pub struct DnstapPaths {
+    // DnstapRootDataSchema
+    pub server_identity: OwnedValuePath,
+    pub server_version: OwnedValuePath,
+    pub extra: OwnedValuePath,
+    pub data_type: OwnedValuePath,
+    pub data_type_id: OwnedValuePath,
+    pub time: OwnedValuePath,
+    pub time_precision: OwnedValuePath,
+    pub error: OwnedValuePath,
+    pub raw_data: OwnedValuePath,
+
+    // DnstapMessageSchema
+    pub socket_family: OwnedValuePath,
+    pub socket_protocol: OwnedValuePath,
+    pub query_address: OwnedValuePath,
+    pub query_port: OwnedValuePath,
+    pub response_address: OwnedValuePath,
+    pub response_port: OwnedValuePath,
+    pub query_zone: OwnedValuePath,
+    pub message_type: OwnedValuePath,
+    pub message_type_id: OwnedValuePath,
+    pub request_message: OwnedValuePath,
+    pub response_message: OwnedValuePath,
+
+    // DnsQueryMessageSchema
+    pub response_code: OwnedValuePath,
+    pub response: OwnedValuePath,
+    pub header: OwnedValuePath,
+    pub question_section: OwnedValuePath,
+    pub answer_section: OwnedValuePath,
+    pub authority_section: OwnedValuePath,
+    pub additional_section: OwnedValuePath,
+    pub opt_pseudo_section: OwnedValuePath,
+
+    // DnsUpdateMessageSchema
+    pub zone_section: OwnedValuePath,
+    pub prerequisite_section: OwnedValuePath,
+    pub update_section: OwnedValuePath,
+
+    // DnsMessageHeaderCommonSchema
+    pub id: OwnedValuePath,
+    pub opcode: OwnedValuePath,
+    pub rcode: OwnedValuePath,
+    pub qr: OwnedValuePath,
+
+    // DnsQueryHeaderSchema
+    pub aa: OwnedValuePath,
+    pub tc: OwnedValuePath,
+    pub rd: OwnedValuePath,
+    pub ra: OwnedValuePath,
+    pub ad: OwnedValuePath,
+    pub cd: OwnedValuePath,
+    pub question_count: OwnedValuePath,
+    pub answer_count: OwnedValuePath,
+    pub authority_count: OwnedValuePath,
+    pub ar_count: OwnedValuePath,
+
+    // DnsUpdateHeaderSchema
+    pub zone_count: OwnedValuePath,
+    pub prerequisite_count: OwnedValuePath,
+    pub update_count: OwnedValuePath,
+    pub ad_count: OwnedValuePath,
+
+    // DnsMessageOptPseudoSectionSchema
+    pub extended_rcode: OwnedValuePath,
+    pub version: OwnedValuePath,
+    pub do_flag: OwnedValuePath,
+    pub udp_max_payload_size: OwnedValuePath,
+    pub options: OwnedValuePath,
+
+    // DnsMessageOptionSchema
+    pub opt_code: OwnedValuePath,
+    pub opt_name: OwnedValuePath,
+    pub opt_data: OwnedValuePath,
+
+    // DnsRecordSchema
+    pub domain_name: OwnedValuePath,
+    pub record_type: OwnedValuePath,
+    pub record_type_id: OwnedValuePath,
+    pub ttl: OwnedValuePath,
+    pub class: OwnedValuePath,
+    pub rdata: OwnedValuePath,
+    pub rdata_bytes: OwnedValuePath,
+
+    // DnsQueryQuestionSchema
+    pub question_type: OwnedValuePath,
+    pub question_type_id: OwnedValuePath,
+
+    // DnsUpdateZoneInfoSchema
+    pub zone_name: OwnedValuePath,
+    pub zone_class: OwnedValuePath,
+    pub zone_type: OwnedValuePath,
+    pub zone_type_id: OwnedValuePath,
 }
 
-#[derive(Debug, Default, Clone)]
-pub struct DnsMessageCommonSchema;
-
-impl DnsMessageCommonSchema {
-    pub const fn response_code() -> &'static str {
-        "fullRcode"
-    }
-
-    pub const fn response() -> &'static str {
-        "rcodeName"
-    }
-
-    pub const fn time() -> &'static str {
-        "time"
-    }
-
-    pub const fn time_precision() -> &'static str {
-        "timePrecision"
-    }
-
-    pub const fn raw_data() -> &'static str {
-        "rawData"
-    }
-
-    pub const fn header() -> &'static str {
-        "header"
-    }
-}
-
-#[derive(Debug, Default, Clone)]
-pub struct DnsQueryMessageSchema;
-
-impl DnsQueryMessageSchema {
-    pub const fn response_code(&self) -> &'static str {
-        DnsMessageCommonSchema::response_code()
-    }
-
-    pub const fn response(&self) -> &'static str {
-        DnsMessageCommonSchema::response()
-    }
-
-    pub const fn time(&self) -> &'static str {
-        DnsMessageCommonSchema::time()
-    }
-
-    pub const fn time_precision(&self) -> &'static str {
-        DnsMessageCommonSchema::time_precision()
-    }
-
-    pub const fn raw_data(&self) -> &'static str {
-        DnsMessageCommonSchema::raw_data()
-    }
-
-    pub const fn header(&self) -> &'static str {
-        DnsMessageCommonSchema::header()
-    }
-
-    pub const fn question_section(&self) -> &'static str {
-        "question"
-    }
-
-    pub const fn answer_section(&self) -> &'static str {
-        "answers"
-    }
-
-    pub const fn authority_section(&self) -> &'static str {
-        "authority"
-    }
-
-    pub const fn additional_section(&self) -> &'static str {
-        "additional"
-    }
-
-    pub const fn opt_pseudo_section(&self) -> &'static str {
-        "opt"
-    }
-}
-
-#[derive(Debug, Default, Clone)]
-pub struct DnsUpdateMessageSchema;
-
-impl DnsUpdateMessageSchema {
-    pub const fn response_code(&self) -> &'static str {
-        DnsMessageCommonSchema::response_code()
-    }
-
-    pub const fn response(&self) -> &'static str {
-        DnsMessageCommonSchema::response()
-    }
-
-    pub const fn time(&self) -> &'static str {
-        DnsMessageCommonSchema::time()
-    }
-
-    pub const fn time_precision(&self) -> &'static str {
-        DnsMessageCommonSchema::time_precision()
-    }
-
-    pub const fn raw_data(&self) -> &'static str {
-        DnsMessageCommonSchema::raw_data()
-    }
-
-    pub const fn header(&self) -> &'static str {
-        DnsMessageCommonSchema::header()
-    }
-
-    pub const fn zone_section(&self) -> &'static str {
-        "zone"
-    }
-
-    pub const fn prerequisite_section(&self) -> &'static str {
-        "prerequisite"
-    }
-
-    pub const fn update_section(&self) -> &'static str {
-        "update"
-    }
-
-    pub const fn additional_section(&self) -> &'static str {
-        "additional"
-    }
-}
-
-#[derive(Debug, Default, Clone)]
-pub struct DnsMessageHeaderCommonSchema;
-
-impl DnsMessageHeaderCommonSchema {
-    pub const fn id() -> &'static str {
-        "id"
-    }
-
-    pub const fn opcode() -> &'static str {
-        "opcode"
-    }
-
-    pub const fn rcode() -> &'static str {
-        "rcode"
-    }
-
-    pub const fn qr() -> &'static str {
-        "qr"
-    }
-}
+/// Lazily initialized singleton.
+pub(crate) static DNSTAP_VALUE_PATHS: Lazy<DnstapPaths> = Lazy::new(|| DnstapPaths {
+    server_identity: owned_value_path!("serverId"),
+    server_version: owned_value_path!("serverVersion"),
+    extra: owned_value_path!("extraInfo"),
+    data_type: owned_value_path!("dataType"),
+    data_type_id: owned_value_path!("dataTypeId"),
+    time: owned_value_path!("time"),
+    time_precision: owned_value_path!("timePrecision"),
+    error: owned_value_path!("error"),
+    raw_data: owned_value_path!("rawData"),
+    socket_family: owned_value_path!("socketFamily"),
+    socket_protocol: owned_value_path!("socketProtocol"),
+    query_address: owned_value_path!("sourceAddress"),
+    query_port: owned_value_path!("sourcePort"),
+    response_address: owned_value_path!("responseAddress"),
+    response_port: owned_value_path!("responsePort"),
+    query_zone: owned_value_path!("queryZone"),
+    message_type: owned_value_path!("messageType"),
+    message_type_id: owned_value_path!("messageTypeId"),
+    request_message: owned_value_path!("requestData"),
+    response_message: owned_value_path!("responseData"),
+    response_code: owned_value_path!("fullRcode"),
+    response: owned_value_path!("rcodeName"),
+    header: owned_value_path!("header"),
+    question_section: owned_value_path!("question"),
+    answer_section: owned_value_path!("answers"),
+    authority_section: owned_value_path!("authority"),
+    additional_section: owned_value_path!("additional"),
+    opt_pseudo_section: owned_value_path!("opt"),
+    zone_section: owned_value_path!("zone"),
+    prerequisite_section: owned_value_path!("prerequisite"),
+    update_section: owned_value_path!("update"),
+    id: owned_value_path!("id"),
+    opcode: owned_value_path!("opcode"),
+    rcode: owned_value_path!("rcode"),
+    qr: owned_value_path!("qr"),
+    aa: owned_value_path!("aa"),
+    tc: owned_value_path!("tc"),
+    rd: owned_value_path!("rd"),
+    ra: owned_value_path!("ra"),
+    ad: owned_value_path!("ad"),
+    cd: owned_value_path!("cd"),
+    question_count: owned_value_path!("qdCount"),
+    answer_count: owned_value_path!("anCount"),
+    authority_count: owned_value_path!("nsCount"),
+    ar_count: owned_value_path!("arCount"),
+    zone_count: owned_value_path!("zoCount"),
+    prerequisite_count: owned_value_path!("prCount"),
+    update_count: owned_value_path!("upCount"),
+    ad_count: owned_value_path!("adCount"),
+    extended_rcode: owned_value_path!("extendedRcode"),
+    version: owned_value_path!("ednsVersion"),
+    do_flag: owned_value_path!("do"),
+    udp_max_payload_size: owned_value_path!("udpPayloadSize"),
+    options: owned_value_path!("options"),
+    opt_code: owned_value_path!("optCode"),
+    opt_name: owned_value_path!("optName"),
+    opt_data: owned_value_path!("optValue"),
+    record_type: owned_value_path!("recordType"),
+    record_type_id: owned_value_path!("recordTypeId"),
+    ttl: owned_value_path!("ttl"),
+    class: owned_value_path!("class"),
+    rdata: owned_value_path!("rData"),
+    rdata_bytes: owned_value_path!("rDataBytes"),
+    domain_name: owned_value_path!("domainName"),
+    question_type: owned_value_path!("questionType"),
+    question_type_id: owned_value_path!("questionTypeId"),
+    zone_name: owned_value_path!("zName"),
+    zone_class: owned_value_path!("zClass"),
+    zone_type: owned_value_path!("zType"),
+    zone_type_id: owned_value_path!("zTypeId"),
+});
 
 #[derive(Debug, Default, Clone)]
 pub struct DnsQueryHeaderSchema;
 
 impl DnsQueryHeaderSchema {
-    pub fn schema_definition(&self) -> Collection<Field> {
+    pub fn schema_definition() -> Collection<Field> {
         btreemap! {
-            self.id() => Kind::integer(),
-            self.opcode() => Kind::integer(),
-            self.rcode() => Kind::integer(),
-            self.qr() => Kind::integer(),
-            self.aa() => Kind::boolean(),
-            self.tc() => Kind::boolean(),
-            self.rd() => Kind::boolean(),
-            self.ra() => Kind::boolean(),
-            self.ad() => Kind::boolean(),
-            self.cd() => Kind::boolean(),
-            self.additional_count() => Kind::integer().or_undefined(),
-            self.question_count() => Kind::integer().or_undefined(),
-            self.answer_count() => Kind::integer().or_undefined(),
-            self.authority_count() => Kind::integer().or_undefined(),
+            DNSTAP_VALUE_PATHS.id.to_string() => Kind::integer(),
+            DNSTAP_VALUE_PATHS.opcode.to_string() => Kind::integer(),
+            DNSTAP_VALUE_PATHS.rcode.to_string() => Kind::integer(),
+            DNSTAP_VALUE_PATHS.qr.to_string() => Kind::integer(),
+            DNSTAP_VALUE_PATHS.aa.to_string() => Kind::boolean(),
+            DNSTAP_VALUE_PATHS.tc.to_string() => Kind::boolean(),
+            DNSTAP_VALUE_PATHS.rd.to_string() => Kind::boolean(),
+            DNSTAP_VALUE_PATHS.ra.to_string() => Kind::boolean(),
+            DNSTAP_VALUE_PATHS.ad.to_string() => Kind::boolean(),
+            DNSTAP_VALUE_PATHS.cd.to_string() => Kind::boolean(),
+            DNSTAP_VALUE_PATHS.ar_count.to_string() => Kind::integer().or_undefined(),
+            DNSTAP_VALUE_PATHS.question_count.to_string() => Kind::integer().or_undefined(),
+            DNSTAP_VALUE_PATHS.answer_count.to_string() => Kind::integer().or_undefined(),
+            DNSTAP_VALUE_PATHS.authority_count.to_string() => Kind::integer().or_undefined(),
         }
         .into()
     }
-
-    pub const fn id(&self) -> &'static str {
-        DnsMessageHeaderCommonSchema::id()
-    }
-
-    pub const fn opcode(&self) -> &'static str {
-        DnsMessageHeaderCommonSchema::opcode()
-    }
-
-    pub const fn rcode(&self) -> &'static str {
-        DnsMessageHeaderCommonSchema::rcode()
-    }
-
-    pub const fn qr(&self) -> &'static str {
-        DnsMessageHeaderCommonSchema::qr()
-    }
-
-    pub const fn aa(&self) -> &'static str {
-        "aa"
-    }
-
-    pub const fn tc(&self) -> &'static str {
-        "tc"
-    }
-
-    pub const fn rd(&self) -> &'static str {
-        "rd"
-    }
-
-    pub const fn ra(&self) -> &'static str {
-        "ra"
-    }
-
-    pub const fn ad(&self) -> &'static str {
-        "ad"
-    }
-
-    pub const fn cd(&self) -> &'static str {
-        "cd"
-    }
-
-    pub const fn question_count(&self) -> &'static str {
-        "qdCount"
-    }
-
-    pub const fn answer_count(&self) -> &'static str {
-        "anCount"
-    }
-
-    pub const fn authority_count(&self) -> &'static str {
-        "nsCount"
-    }
-
-    pub const fn additional_count(&self) -> &'static str {
-        "arCount"
-    }
 }
 
 #[derive(Debug, Default, Clone)]
 pub struct DnsUpdateHeaderSchema;
 
 impl DnsUpdateHeaderSchema {
-    pub fn schema_definition(&self) -> Collection<Field> {
+    pub fn schema_definition() -> Collection<Field> {
         btreemap! {
-            self.id() => Kind::integer(),
-            self.opcode() => Kind::integer(),
-            self.rcode() => Kind::integer(),
-            self.qr() => Kind::integer(),
-            self.zone_count() => Kind::integer().or_undefined(),
-            self.prerequisite_count() => Kind::integer().or_undefined(),
-            self.update_count() => Kind::integer().or_undefined(),
-            self.additional_count() => Kind::integer().or_undefined(),
+            DNSTAP_VALUE_PATHS.id.to_string() => Kind::integer(),
+            DNSTAP_VALUE_PATHS.opcode.to_string() => Kind::integer(),
+            DNSTAP_VALUE_PATHS.rcode.to_string() => Kind::integer(),
+            DNSTAP_VALUE_PATHS.qr.to_string() => Kind::integer(),
+            DNSTAP_VALUE_PATHS.zone_count.to_string() => Kind::integer().or_undefined(),
+            DNSTAP_VALUE_PATHS.prerequisite_count.to_string() => Kind::integer().or_undefined(),
+            DNSTAP_VALUE_PATHS.update_count.to_string() => Kind::integer().or_undefined(),
+            DNSTAP_VALUE_PATHS.ad_count.to_string() => Kind::integer().or_undefined(),
         }
         .into()
     }
-
-    pub const fn id(&self) -> &'static str {
-        DnsMessageHeaderCommonSchema::id()
-    }
-
-    pub const fn opcode(&self) -> &'static str {
-        DnsMessageHeaderCommonSchema::opcode()
-    }
-
-    pub const fn rcode(&self) -> &'static str {
-        DnsMessageHeaderCommonSchema::rcode()
-    }
-
-    pub const fn qr(&self) -> &'static str {
-        DnsMessageHeaderCommonSchema::qr()
-    }
-
-    pub const fn zone_count(&self) -> &'static str {
-        "zoCount"
-    }
-
-    pub const fn prerequisite_count(&self) -> &'static str {
-        "prCount"
-    }
-
-    pub const fn update_count(&self) -> &'static str {
-        "upCount"
-    }
-
-    pub const fn additional_count(&self) -> &'static str {
-        "adCount"
-    }
 }
 
 #[derive(Debug, Default, Clone)]
 pub struct DnsMessageOptPseudoSectionSchema;
 
 impl DnsMessageOptPseudoSectionSchema {
-    pub fn schema_definition(
-        &self,
-        dns_message_option_schema: &DnsMessageOptionSchema,
-    ) -> Collection<Field> {
+    pub fn schema_definition() -> Collection<Field> {
         btreemap! {
-            self.extended_rcode() => Kind::integer(),
-            self.version() => Kind::integer(),
-            self.do_flag() => Kind::boolean(),
-            self.udp_max_payload_size() => Kind::integer(),
-            self.options() => Kind::array(
-                Collection::from_unknown(Kind::object(dns_message_option_schema.schema_definition()))
+            DNSTAP_VALUE_PATHS.extended_rcode.to_string() => Kind::integer(),
+            DNSTAP_VALUE_PATHS.version.to_string() => Kind::integer(),
+            DNSTAP_VALUE_PATHS.do_flag.to_string() => Kind::boolean(),
+            DNSTAP_VALUE_PATHS.udp_max_payload_size.to_string() => Kind::integer(),
+            DNSTAP_VALUE_PATHS.options.to_string() => Kind::array(
+                Collection::from_unknown(Kind::object(DnsMessageOptionSchema::schema_definition()))
             ).or_undefined(),
         }
         .into()
     }
-
-    pub const fn extended_rcode(&self) -> &'static str {
-        "extendedRcode"
-    }
-
-    pub const fn version(&self) -> &'static str {
-        "ednsVersion"
-    }
-
-    pub const fn do_flag(&self) -> &'static str {
-        "do"
-    }
-
-    pub const fn udp_max_payload_size(&self) -> &'static str {
-        "udpPayloadSize"
-    }
-
-    pub const fn options(&self) -> &'static str {
-        "options"
-    }
 }
 
 #[derive(Debug, Default, Clone)]
 pub struct DnsMessageOptionSchema;
 
 impl DnsMessageOptionSchema {
-    pub fn schema_definition(&self) -> Collection<Field> {
+    pub fn schema_definition() -> Collection<Field> {
         btreemap! {
-            self.opt_code() => Kind::integer(),
-            self.opt_name() => Kind::bytes(),
-            self.opt_data() => Kind::bytes(),
+            DNSTAP_VALUE_PATHS.opt_code.to_string() => Kind::integer(),
+            DNSTAP_VALUE_PATHS.opt_name.to_string() => Kind::bytes(),
+            DNSTAP_VALUE_PATHS.opt_data.to_string() => Kind::bytes(),
         }
         .into()
     }
-
-    pub const fn opt_code(&self) -> &'static str {
-        "optCode"
-    }
-
-    pub const fn opt_name(&self) -> &'static str {
-        "optName"
-    }
-
-    pub const fn opt_data(&self) -> &'static str {
-        "optValue"
-    }
 }
 
 #[derive(Debug, Default, Clone)]
 pub struct DnsRecordSchema;
 
 impl DnsRecordSchema {
-    pub fn schema_definition(&self) -> Collection<Field> {
+    pub fn schema_definition() -> Collection<Field> {
         btreemap! {
-            self.name() => Kind::bytes(),
-            self.record_type() => Kind::bytes().or_undefined(),
-            self.record_type_id() => Kind::integer(),
-            self.ttl() => Kind::integer(),
-            self.class() => Kind::bytes(),
-            self.rdata() => Kind::bytes(),
-            self.rdata_bytes() => Kind::bytes().or_undefined(),
+            DNSTAP_VALUE_PATHS.domain_name.to_string() => Kind::bytes(),
+            DNSTAP_VALUE_PATHS.record_type.to_string() => Kind::bytes().or_undefined(),
+            DNSTAP_VALUE_PATHS.record_type_id.to_string() => Kind::integer(),
+            DNSTAP_VALUE_PATHS.ttl.to_string() => Kind::integer(),
+            DNSTAP_VALUE_PATHS.class.to_string() => Kind::bytes(),
+            DNSTAP_VALUE_PATHS.rdata.to_string() => Kind::bytes(),
+            DNSTAP_VALUE_PATHS.rdata_bytes.to_string() => Kind::bytes().or_undefined(),
         }
         .into()
     }
-
-    pub const fn name(&self) -> &'static str {
-        "domainName"
-    }
-
-    pub const fn record_type(&self) -> &'static str {
-        "recordType"
-    }
-
-    pub const fn record_type_id(&self) -> &'static str {
-        "recordTypeId"
-    }
-
-    pub const fn ttl(&self) -> &'static str {
-        "ttl"
-    }
-
-    pub const fn class(&self) -> &'static str {
-        "class"
-    }
-
-    pub const fn rdata(&self) -> &'static str {
-        "rData"
-    }
-
-    pub const fn rdata_bytes(&self) -> &'static str {
-        "rDataBytes"
-    }
 }
 
 #[derive(Debug, Default, Clone)]
 pub struct DnsQueryQuestionSchema;
 
 impl DnsQueryQuestionSchema {
-    pub fn schema_definition(&self) -> Collection<Field> {
+    pub fn schema_definition() -> Collection<Field> {
         btreemap! {
-            self.class() => Kind::bytes(),
-            self.name() => Kind::bytes(),
-            self.question_type() => Kind::bytes(),
-            self.question_type_id() => Kind::integer(),
+            DNSTAP_VALUE_PATHS.class.to_string() => Kind::bytes(),
+            DNSTAP_VALUE_PATHS.domain_name.to_string() => Kind::bytes(),
+            DNSTAP_VALUE_PATHS.question_type.to_string() => Kind::bytes(),
+            DNSTAP_VALUE_PATHS.question_type_id.to_string() => Kind::integer(),
         }
         .into()
     }
-
-    pub const fn name(&self) -> &'static str {
-        "domainName"
-    }
-
-    pub const fn question_type(&self) -> &'static str {
-        "questionType"
-    }
-
-    pub const fn question_type_id(&self) -> &'static str {
-        "questionTypeId"
-    }
-
-    pub const fn class(&self) -> &'static str {
-        "class"
-    }
 }
 
 #[derive(Debug, Default, Clone)]
 pub struct DnsUpdateZoneInfoSchema;
 
 impl DnsUpdateZoneInfoSchema {
-    pub fn schema_definition(&self) -> Collection<Field> {
+    pub fn schema_definition() -> Collection<Field> {
         btreemap! {
-            self.zone_name() => Kind::bytes(),
-            self.zone_type() => Kind::bytes().or_undefined(),
-            self.zone_type_id() => Kind::integer(),
-            self.zone_class() => Kind::bytes(),
+            DNSTAP_VALUE_PATHS.zone_name.to_string() => Kind::bytes(),
+            DNSTAP_VALUE_PATHS.zone_type.to_string() => Kind::bytes().or_undefined(),
+            DNSTAP_VALUE_PATHS.zone_type_id.to_string() => Kind::integer(),
+            DNSTAP_VALUE_PATHS.zone_class.to_string() => Kind::bytes(),
         }
         .into()
     }
-
-    pub const fn zone_name(&self) -> &'static str {
-        "zName"
-    }
-
-    pub const fn zone_class(&self) -> &'static str {
-        "zClass"
-    }
-
-    pub const fn zone_type(&self) -> &'static str {
-        "zType"
-    }
-
-    pub const fn zone_type_id(&self) -> &'static str {
-        "zTypeId"
-    }
 }
diff --git a/src/sources/docker_logs/mod.rs b/src/sources/docker_logs/mod.rs
index 9dc7ffeeedd09..bd32dfac4a431 100644
--- a/src/sources/docker_logs/mod.rs
+++ b/src/sources/docker_logs/mod.rs
@@ -14,8 +14,7 @@ use chrono::{DateTime, FixedOffset, Local, ParseError, Utc};
 use codecs::{BytesDeserializer, BytesDeserializerConfig};
 use futures::{Stream, StreamExt};
 use lookup::{
-    lookup_v2::{parse_value_path, OptionalValuePath},
-    metadata_path, owned_value_path, path, OwnedValuePath, PathPrefix,
+    lookup_v2::OptionalValuePath, metadata_path, owned_value_path, path, OwnedValuePath, PathPrefix,
 };
 use once_cell::sync::Lazy;
 use serde_with::serde_as;
@@ -189,7 +188,7 @@ impl Default for DockerLogsConfig {
 }
 
 fn default_host_key() -> OptionalValuePath {
-    OptionalValuePath::from(owned_value_path!(log_schema().host_key()))
+    log_schema().host_key().cloned().into()
 }
 
 fn default_partial_event_marker_field() -> Option<String> {
@@ -338,9 +337,7 @@ impl SourceConfig for DockerLogsConfig {
                 Some("timestamp"),
             )
             .with_vector_metadata(
-                parse_value_path(log_schema().source_type_key())
-                    .ok()
-                    .as_ref(),
+                log_schema().source_type_key(),
                 &owned_value_path!("source_type"),
                 Kind::bytes(),
                 None,
@@ -1062,7 +1059,7 @@ impl ContainerLogInfo {
         };
 
         // Build the log.
-        let deserializer = BytesDeserializer::new();
+        let deserializer = BytesDeserializer;
         let mut log = deserializer.parse_single(bytes_message, log_namespace);
 
         // Container ID
@@ -1119,7 +1116,7 @@ impl ContainerLogInfo {
 
         log_namespace.insert_vector_metadata(
             &mut log,
-            Some(log_schema().source_type_key()),
+            log_schema().source_type_key(),
             path!("source_type"),
             Bytes::from_static(DockerLogsConfig::NAME.as_bytes()),
         );
@@ -1169,7 +1166,10 @@ impl ContainerLogInfo {
                         LogNamespace::Legacy => {
                             partial_event_merge_state.merge_in_next_event(
                                 log,
-                                &[log_schema().message_key().to_string()],
+                                &[log_schema()
+                                    .message_key()
+                                    .expect("global log_schema.message_key to be valid path")
+                                    .to_string()],
                             );
                         }
                     }
@@ -1190,8 +1190,13 @@ impl ContainerLogInfo {
                     LogNamespace::Vector => {
                         partial_event_merge_state.merge_in_final_event(log, &["."])
                     }
-                    LogNamespace::Legacy => partial_event_merge_state
-                        .merge_in_final_event(log, &[log_schema().message_key().to_string()]),
+                    LogNamespace::Legacy => partial_event_merge_state.merge_in_final_event(
+                        log,
+                        &[log_schema()
+                            .message_key()
+                            .expect("global log_schema.message_key to be valid path")
+                            .to_string()],
+                    ),
                 },
                 None => log,
             }
@@ -1267,7 +1272,12 @@ fn line_agg_adapter(
         let message_value = match log_namespace {
             LogNamespace::Vector => log.remove(".").expect("`.` must exist in the event"),
             LogNamespace::Legacy => log
-                .remove(log_schema().message_key())
+                .remove((
+                    PathPrefix::Event,
+                    log_schema()
+                        .message_key()
+                        .expect("global log_schema.message_key to be valid path"),
+                ))
                 .expect("`message` must exist in the event"),
         };
         let stream_value = match log_namespace {
@@ -1285,7 +1295,15 @@ fn line_agg_adapter(
     line_agg_out.map(move |(_, message, mut log)| {
         match log_namespace {
             LogNamespace::Vector => log.insert(".", message),
-            LogNamespace::Legacy => log.insert(log_schema().message_key(), message),
+            LogNamespace::Legacy => log.insert(
+                (
+                    PathPrefix::Event,
+                    log_schema()
+                        .message_key()
+                        .expect("global log_schema.message_key to be valid path"),
+                ),
+                message,
+            ),
         };
         log
     })
diff --git a/src/sources/docker_logs/tests.rs b/src/sources/docker_logs/tests.rs
index c9569209074ba..f68e3580920c5 100644
--- a/src/sources/docker_logs/tests.rs
+++ b/src/sources/docker_logs/tests.rs
@@ -279,7 +279,7 @@ mod integration_tests {
         // Wait for before message
         let events = collect_n(out, 1).await;
         assert_eq!(
-            events[0].as_log()[log_schema().message_key()],
+            events[0].as_log()[log_schema().message_key().unwrap().to_string()],
             "before".into()
         );
 
@@ -346,7 +346,7 @@ mod integration_tests {
                 .unwrap()
                 .assert_valid_for_event(&events[0]);
             assert_eq!(
-                events[0].as_log()[log_schema().message_key()],
+                events[0].as_log()[log_schema().message_key().unwrap().to_string()],
                 message.into()
             );
         })
@@ -440,14 +440,14 @@ mod integration_tests {
                 .unwrap()
                 .assert_valid_for_event(&events[0]);
             let log = events[0].as_log();
-            assert_eq!(log[log_schema().message_key()], message.into());
+            assert_eq!(*log.get_message().unwrap(), message.into());
             assert_eq!(log[CONTAINER], id.into());
             assert!(log.get(CREATED_AT).is_some());
             assert_eq!(log[IMAGE], "busybox".into());
             assert!(log.get(format!("label.{}", label).as_str()).is_some());
             assert_eq!(events[0].as_log()[&NAME], name.into());
             assert_eq!(
-                events[0].as_log()[log_schema().source_type_key()],
+                events[0].as_log()[log_schema().source_type_key().unwrap().to_string()],
                 DockerLogsConfig::NAME.into()
             );
         })
@@ -479,15 +479,10 @@ mod integration_tests {
             let definition = schema_definitions.unwrap();
 
             definition.assert_valid_for_event(&events[0]);
-            assert_eq!(
-                events[0].as_log()[log_schema().message_key()],
-                message.into()
-            );
+            let message_key = log_schema().message_key().unwrap().to_string();
+            assert_eq!(events[0].as_log()[&message_key], message.into());
             definition.assert_valid_for_event(&events[1]);
-            assert_eq!(
-                events[1].as_log()[log_schema().message_key()],
-                message.into()
-            );
+            assert_eq!(events[1].as_log()[message_key], message.into());
         })
         .await;
     }
@@ -521,7 +516,7 @@ mod integration_tests {
                 .unwrap()
                 .assert_valid_for_event(&events[0]);
             assert_eq!(
-                events[0].as_log()[log_schema().message_key()],
+                events[0].as_log()[log_schema().message_key().unwrap().to_string()],
                 message.into()
             );
         })
@@ -567,18 +562,13 @@ mod integration_tests {
             assert_eq!(events.len(), 2);
 
             let definition = schema_definitions.unwrap();
-
             definition.assert_valid_for_event(&events[0]);
-            assert_eq!(
-                events[0].as_log()[log_schema().message_key()],
-                will_be_read.into()
-            );
+
+            let message_key = log_schema().message_key().unwrap().to_string();
+            assert_eq!(events[0].as_log()[&message_key], will_be_read.into());
 
             definition.assert_valid_for_event(&events[1]);
-            assert_eq!(
-                events[1].as_log()[log_schema().message_key()],
-                will_be_read.into()
-            );
+            assert_eq!(events[1].as_log()[message_key], will_be_read.into());
         })
         .await;
     }
@@ -613,7 +603,7 @@ mod integration_tests {
                 .unwrap()
                 .assert_valid_for_event(&events[0]);
             assert_eq!(
-                events[0].as_log()[log_schema().message_key()],
+                events[0].as_log()[log_schema().message_key().unwrap().to_string()],
                 message.into()
             );
         })
@@ -647,14 +637,14 @@ mod integration_tests {
                 .unwrap()
                 .assert_valid_for_event(&events[0]);
             let log = events[0].as_log();
-            assert_eq!(log[log_schema().message_key()], message.into());
+            assert_eq!(*log.get_message().unwrap(), message.into());
             assert_eq!(log[CONTAINER], id.into());
             assert!(log.get(CREATED_AT).is_some());
             assert_eq!(log[IMAGE], "busybox".into());
             assert!(log.get(format!("label.{}", label).as_str()).is_some());
             assert_eq!(events[0].as_log()[&NAME], name.into());
             assert_eq!(
-                events[0].as_log()[log_schema().source_type_key()],
+                events[0].as_log()[log_schema().source_type_key().unwrap().to_string()],
                 DockerLogsConfig::NAME.into()
             );
         })
@@ -692,7 +682,7 @@ mod integration_tests {
                 .unwrap()
                 .assert_valid_for_event(&events[0]);
             assert_eq!(
-                events[0].as_log()[log_schema().message_key()],
+                events[0].as_log()[log_schema().message_key().unwrap().to_string()],
                 message.into()
             );
         })
@@ -782,7 +772,7 @@ mod integration_tests {
                 .unwrap()
                 .assert_valid_for_event(&events[0]);
             let log = events[0].as_log();
-            assert_eq!(log[log_schema().message_key()], message.into());
+            assert_eq!(*log.get_message().unwrap(), message.into());
             assert_eq!(log[CONTAINER], id.into());
             assert!(log.get(CREATED_AT).is_some());
             assert_eq!(log[IMAGE], "busybox".into());
@@ -795,7 +785,7 @@ mod integration_tests {
                 .is_some());
             assert_eq!(events[0].as_log()[&NAME], name.into());
             assert_eq!(
-                events[0].as_log()[log_schema().source_type_key()],
+                events[0].as_log()[log_schema().source_type_key().unwrap().to_string()],
                 DockerLogsConfig::NAME.into()
             );
         })
@@ -831,7 +821,7 @@ mod integration_tests {
                 .unwrap()
                 .assert_valid_for_event(&events[0]);
             let log = events[0].as_log();
-            assert_eq!(log[log_schema().message_key()], message.into());
+            assert_eq!(*log.get_message().unwrap(), message.into());
         })
         .await;
     }
@@ -968,7 +958,7 @@ mod integration_tests {
 
                     event
                         .into_log()
-                        .remove(crate::config::log_schema().message_key())
+                        .remove(log_schema().message_key_target_path().unwrap())
                         .unwrap()
                         .to_string_lossy()
                         .into_owned()
diff --git a/src/sources/exec/mod.rs b/src/sources/exec/mod.rs
index 7c5a5ed2d65f6..faa5d9cce4c1b 100644
--- a/src/sources/exec/mod.rs
+++ b/src/sources/exec/mod.rs
@@ -23,6 +23,7 @@ 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 vrl::path::OwnedValuePath;
 use vrl::value::Kind;
 
 use crate::{
@@ -234,7 +235,7 @@ impl SourceConfig for ExecConfig {
             .clone()
             .unwrap_or_else(|| self.decoding.default_stream_framing());
         let decoder =
-            DecodingConfig::new(framing, self.decoding.clone(), LogNamespace::Legacy).build();
+            DecodingConfig::new(framing, self.decoding.clone(), LogNamespace::Legacy).build()?;
 
         match &self.mode {
             Mode::Scheduled => {
@@ -277,9 +278,11 @@ impl SourceConfig for ExecConfig {
             .with_standard_vector_source_metadata()
             .with_source_metadata(
                 Self::NAME,
-                Some(LegacyKey::InsertIfEmpty(owned_value_path!(
-                    log_schema().host_key()
-                ))),
+                Some(LegacyKey::InsertIfEmpty(
+                    log_schema()
+                        .host_key()
+                        .map_or(OwnedValuePath::root(), |key| key.clone()),
+                )),
                 &owned_value_path!("host"),
                 Kind::bytes().or_undefined(),
                 Some("host"),
@@ -672,7 +675,7 @@ fn handle_event(
             log_namespace.insert_source_metadata(
                 ExecConfig::NAME,
                 log,
-                Some(LegacyKey::InsertIfEmpty(path!(log_schema().host_key()))),
+                log_schema().host_key().map(LegacyKey::InsertIfEmpty),
                 path!("host"),
                 hostname.clone(),
             );
@@ -726,6 +729,8 @@ fn spawn_reader_thread<R: 'static + AsyncRead + Unpin + std::marker::Send>(
 
 #[cfg(test)]
 mod tests {
+    use super::*;
+    use crate::{event::LogEvent, test_util::trace_init};
     use bytes::Bytes;
     use std::io::Cursor;
     use vector_core::event::EventMetadata;
@@ -734,11 +739,6 @@ mod tests {
     #[cfg(unix)]
     use futures::task::Poll;
 
-    use super::*;
-    use crate::config::log_schema;
-
-    use crate::{event::LogEvent, test_util::trace_init};
-
     #[test]
     fn test_generate_config() {
         crate::test_util::test_generate_config::<ExecConfig>();
@@ -762,18 +762,13 @@ mod tests {
         );
         let log = event.as_log();
 
-        assert_eq!(log[log_schema().host_key()], "Some.Machine".into());
+        assert_eq!(*log.get_host().unwrap(), "Some.Machine".into());
         assert_eq!(log[STREAM_KEY], STDOUT.into());
         assert_eq!(log[PID_KEY], (8888_i64).into());
         assert_eq!(log[COMMAND_KEY], config.command.into());
-        assert_eq!(log[log_schema().message_key()], "hello world".into());
-        assert_eq!(log[log_schema().source_type_key()], "exec".into());
-        assert!(log
-            .get((
-                lookup::PathPrefix::Event,
-                log_schema().timestamp_key().unwrap()
-            ))
-            .is_some());
+        assert_eq!(*log.get_message().unwrap(), "hello world".into());
+        assert_eq!(*log.get_source_type().unwrap(), "exec".into());
+        assert!(log.get_timestamp().is_some());
     }
 
     #[test]
@@ -843,18 +838,13 @@ mod tests {
         );
         let log = event.as_log();
 
-        assert_eq!(log[log_schema().host_key()], "Some.Machine".into());
+        assert_eq!(*log.get_host().unwrap(), "Some.Machine".into());
         assert_eq!(log[STREAM_KEY], STDOUT.into());
         assert_eq!(log[PID_KEY], (8888_i64).into());
         assert_eq!(log[COMMAND_KEY], config.command.into());
-        assert_eq!(log[log_schema().message_key()], "hello world".into());
-        assert_eq!(log[log_schema().source_type_key()], "exec".into());
-        assert!(log
-            .get((
-                lookup::PathPrefix::Event,
-                log_schema().timestamp_key().unwrap()
-            ))
-            .is_some());
+        assert_eq!(*log.get_message().unwrap(), "hello world".into());
+        assert_eq!(*log.get_source_type().unwrap(), "exec".into());
+        assert!(log.get_timestamp().is_some());
     }
 
     #[test]
@@ -955,7 +945,7 @@ mod tests {
             assert_eq!(events.len(), 1);
             let log = events[0].as_log();
             assert_eq!(
-                log[log_schema().message_key()],
+                *log.get_message().unwrap(),
                 Bytes::from("hello world").into()
             );
             assert_eq!(origin, STDOUT);
@@ -967,7 +957,7 @@ mod tests {
             assert_eq!(events.len(), 1);
             let log = events[0].as_log();
             assert_eq!(
-                log[log_schema().message_key()],
+                *log.get_message().unwrap(),
                 Bytes::from("hello rocket 🚀").into()
             );
             assert_eq!(origin, STDOUT);
@@ -1047,16 +1037,11 @@ mod tests {
             let log = event.as_log();
             assert_eq!(log[COMMAND_KEY], config.command.clone().into());
             assert_eq!(log[STREAM_KEY], STDOUT.into());
-            assert_eq!(log[log_schema().source_type_key()], "exec".into());
-            assert_eq!(log[log_schema().message_key()], "Hello World!".into());
-            assert_eq!(log[log_schema().host_key()], "Some.Machine".into());
+            assert_eq!(*log.get_source_type().unwrap(), "exec".into());
+            assert_eq!(*log.get_message().unwrap(), "Hello World!".into());
+            assert_eq!(*log.get_host().unwrap(), "Some.Machine".into());
             assert!(log.get(PID_KEY).is_some());
-            assert!(log
-                .get((
-                    lookup::PathPrefix::Event,
-                    log_schema().timestamp_key().unwrap()
-                ))
-                .is_some());
+            assert!(log.get_timestamp().is_some());
 
             assert_eq!(8, log.all_fields().unwrap().count());
         } else {
@@ -1107,14 +1092,14 @@ mod tests {
 
         if let Poll::Ready(Some(event)) = futures::poll!(rx.next()) {
             let log = event.as_log();
-            assert_eq!(log[log_schema().message_key()], "signal received".into());
+            assert_eq!(*log.get_message().unwrap(), "signal received".into());
         } else {
             panic!("Expected to receive event");
         }
 
         if let Poll::Ready(Some(event)) = futures::poll!(rx.next()) {
             let log = event.as_log();
-            assert_eq!(log[log_schema().message_key()], "slept".into());
+            assert_eq!(*log.get_message().unwrap(), "slept".into());
         } else {
             panic!("Expected to receive event");
         }
diff --git a/src/sources/file.rs b/src/sources/file.rs
index 445840bddf777..7e97426469a99 100644
--- a/src/sources/file.rs
+++ b/src/sources/file.rs
@@ -252,7 +252,7 @@ fn default_file_key() -> OptionalValuePath {
 }
 
 fn default_host_key() -> OptionalValuePath {
-    OptionalValuePath::from(owned_value_path!(log_schema().host_key()))
+    log_schema().host_key().cloned().into()
 }
 
 const fn default_read_from() -> ReadFromConfig {
@@ -745,12 +745,12 @@ fn create_event(
     meta: &EventMetadata,
     log_namespace: LogNamespace,
 ) -> LogEvent {
-    let deserializer = BytesDeserializer::new();
+    let deserializer = BytesDeserializer;
     let mut event = deserializer.parse_single(line, log_namespace);
 
     log_namespace.insert_vector_metadata(
         &mut event,
-        Some(log_schema().source_type_key()),
+        log_schema().source_type_key(),
         path!("source_type"),
         Bytes::from_static(FileConfig::NAME.as_bytes()),
     );
@@ -1027,8 +1027,8 @@ mod tests {
         assert_eq!(log["file"], "some_file.rs".into());
         assert_eq!(log["host"], "Some.Machine".into());
         assert_eq!(log["offset"], 0.into());
-        assert_eq!(log[log_schema().message_key()], "hello world".into());
-        assert_eq!(log[log_schema().source_type_key()], "file".into());
+        assert_eq!(*log.get_message().unwrap(), "hello world".into());
+        assert_eq!(*log.get_source_type().unwrap(), "file".into());
         assert!(log[log_schema().timestamp_key().unwrap().to_string()].is_timestamp());
     }
 
@@ -1049,8 +1049,8 @@ mod tests {
         assert_eq!(log["file_path"], "some_file.rs".into());
         assert_eq!(log["hostname"], "Some.Machine".into());
         assert_eq!(log["off"], 0.into());
-        assert_eq!(log[log_schema().message_key()], "hello world".into());
-        assert_eq!(log[log_schema().source_type_key()], "file".into());
+        assert_eq!(*log.get_message().unwrap(), "hello world".into());
+        assert_eq!(*log.get_source_type().unwrap(), "file".into());
         assert!(log[log_schema().timestamp_key().unwrap().to_string()].is_timestamp());
     }
 
@@ -1139,7 +1139,8 @@ mod tests {
         let mut goodbye_i = 0;
 
         for event in received {
-            let line = event.as_log()[log_schema().message_key()].to_string_lossy();
+            let line =
+                event.as_log()[log_schema().message_key().unwrap().to_string()].to_string_lossy();
             if line.starts_with("hello") {
                 assert_eq!(line, format!("hello {}", hello_i));
                 assert_eq!(
@@ -1233,7 +1234,8 @@ mod tests {
                 path.to_str().unwrap()
             );
 
-            let line = event.as_log()[log_schema().message_key()].to_string_lossy();
+            let line =
+                event.as_log()[log_schema().message_key().unwrap().to_string()].to_string_lossy();
 
             if pre_trunc {
                 assert_eq!(line, format!("pretrunc {}", i));
@@ -1294,7 +1296,8 @@ mod tests {
                 path.to_str().unwrap()
             );
 
-            let line = event.as_log()[log_schema().message_key()].to_string_lossy();
+            let line =
+                event.as_log()[log_schema().message_key().unwrap().to_string()].to_string_lossy();
 
             if pre_rot {
                 assert_eq!(line, format!("prerot {}", i));
@@ -1347,7 +1350,8 @@ mod tests {
         let mut is = [0; 3];
 
         for event in received {
-            let line = event.as_log()[log_schema().message_key()].to_string_lossy();
+            let line =
+                event.as_log()[log_schema().message_key().unwrap().to_string()].to_string_lossy();
             let mut split = line.split(' ');
             let file = split.next().unwrap().parse::<usize>().unwrap();
             assert_ne!(file, 4);
@@ -1454,10 +1458,10 @@ mod tests {
                         .path
                         .expect("file key to exist")
                         .to_string(),
-                    log_schema().host_key().to_string(),
-                    log_schema().message_key().to_string(),
+                    log_schema().host_key().unwrap().to_string(),
+                    log_schema().message_key().unwrap().to_string(),
                     log_schema().timestamp_key().unwrap().to_string(),
-                    log_schema().source_type_key().to_string()
+                    log_schema().source_type_key().unwrap().to_string()
                 ]
                 .into_iter()
                 .collect::<HashSet<_>>()
@@ -1737,12 +1741,16 @@ mod tests {
         let before_lines = received
             .iter()
             .filter(|event| event.as_log()["file"].to_string_lossy().ends_with("before"))
-            .map(|event| event.as_log()[log_schema().message_key()].to_string_lossy())
+            .map(|event| {
+                event.as_log()[log_schema().message_key().unwrap().to_string()].to_string_lossy()
+            })
             .collect::<Vec<_>>();
         let after_lines = received
             .iter()
             .filter(|event| event.as_log()["file"].to_string_lossy().ends_with("after"))
-            .map(|event| event.as_log()[log_schema().message_key()].to_string_lossy())
+            .map(|event| {
+                event.as_log()[log_schema().message_key().unwrap().to_string()].to_string_lossy()
+            })
             .collect::<Vec<_>>();
         assert_eq!(before_lines, vec!["second line"]);
         assert_eq!(after_lines, vec!["_first line", "_second line"]);
@@ -2307,11 +2315,7 @@ mod tests {
         received
             .into_iter()
             .map(Event::into_log)
-            .map(|log| {
-                log[log_schema().message_key()]
-                    .to_string_lossy()
-                    .into_owned()
-            })
+            .map(|log| log.get_message().unwrap().to_string_lossy().into_owned())
             .collect()
     }
 
@@ -2319,7 +2323,7 @@ mod tests {
         received
             .into_iter()
             .map(Event::into_log)
-            .map(|log| log[log_schema().message_key()].clone())
+            .map(|log| log.get_message().unwrap().clone())
             .collect()
     }
 }
diff --git a/src/sources/file_descriptors/file_descriptor.rs b/src/sources/file_descriptors/file_descriptor.rs
index 4e864471124d0..d90487fcd0b20 100644
--- a/src/sources/file_descriptors/file_descriptor.rs
+++ b/src/sources/file_descriptors/file_descriptor.rs
@@ -143,19 +143,16 @@ mod tests {
             config.build(context).await.unwrap().await.unwrap();
 
             let event = stream.next().await;
+            let message_key = log_schema().message_key().unwrap().to_string();
             assert_eq!(
                 Some("hello world".into()),
-                event.map(|event| event.as_log()[log_schema().message_key()]
-                    .to_string_lossy()
-                    .into_owned())
+                event.map(|event| event.as_log()[&message_key].to_string_lossy().into_owned())
             );
 
             let event = stream.next().await;
             assert_eq!(
                 Some("hello world again".into()),
-                event.map(|event| event.as_log()[log_schema().message_key()]
-                    .to_string_lossy()
-                    .into_owned())
+                event.map(|event| event.as_log()[message_key].to_string_lossy().into_owned())
             );
 
             let event = stream.next().await;
diff --git a/src/sources/file_descriptors/mod.rs b/src/sources/file_descriptors/mod.rs
index 04189d33e871c..2d2ec2979c47e 100644
--- a/src/sources/file_descriptors/mod.rs
+++ b/src/sources/file_descriptors/mod.rs
@@ -8,10 +8,7 @@ use codecs::{
     StreamDecodingError,
 };
 use futures::{channel::mpsc, executor, SinkExt, StreamExt};
-use lookup::{
-    lookup_v2::{parse_value_path, OptionalValuePath},
-    owned_value_path, path, OwnedValuePath,
-};
+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,
@@ -53,10 +50,10 @@ pub trait FileDescriptorConfig: NamedComponent {
     where
         R: Send + io::BufRead + 'static,
     {
-        let host_key = self.host_key().map_or_else(
-            || parse_value_path(log_schema().host_key()).ok(),
-            |k| k.path,
-        );
+        let host_key = self
+            .host_key()
+            .and_then(|k| k.path)
+            .or(log_schema().host_key().cloned());
         let hostname = crate::get_hostname().ok();
 
         let description = self.description();
@@ -65,7 +62,7 @@ pub trait FileDescriptorConfig: NamedComponent {
         let framing = self
             .framing()
             .unwrap_or_else(|| decoding.default_stream_framing());
-        let decoder = DecodingConfig::new(framing, decoding, log_namespace).build();
+        let decoder = DecodingConfig::new(framing, decoding, log_namespace).build()?;
 
         let (sender, receiver) = mpsc::channel(1024);
 
@@ -211,17 +208,14 @@ fn outputs(
     decoding: &DeserializerConfig,
     source_name: &'static str,
 ) -> Vec<SourceOutput> {
-    let legacy_host_key = Some(LegacyKey::InsertIfEmpty(
-        host_key.clone().and_then(|k| k.path).unwrap_or_else(|| {
-            parse_value_path(log_schema().host_key()).expect("log_schema.host_key to be valid path")
-        }),
-    ));
-
     let schema_definition = decoding
         .schema_definition(log_namespace)
         .with_source_metadata(
             source_name,
-            legacy_host_key,
+            host_key
+                .clone()
+                .map_or(log_schema().host_key().cloned(), |key| key.path)
+                .map(LegacyKey::Overwrite),
             &owned_value_path!("host"),
             Kind::bytes(),
             Some("host"),
diff --git a/src/sources/file_descriptors/stdin.rs b/src/sources/file_descriptors/stdin.rs
index 0f21db79ac4a3..c598758670afc 100644
--- a/src/sources/file_descriptors/stdin.rs
+++ b/src/sources/file_descriptors/stdin.rs
@@ -142,17 +142,21 @@ mod tests {
             let event = stream.next().await;
             assert_eq!(
                 Some("hello world".into()),
-                event.map(|event| event.as_log()[log_schema().message_key()]
-                    .to_string_lossy()
-                    .into_owned())
+                event.map(
+                    |event| event.as_log()[log_schema().message_key().unwrap().to_string()]
+                        .to_string_lossy()
+                        .into_owned()
+                )
             );
 
             let event = stream.next().await;
             assert_eq!(
                 Some("hello world again".into()),
-                event.map(|event| event.as_log()[log_schema().message_key()]
-                    .to_string_lossy()
-                    .into_owned())
+                event.map(
+                    |event| event.as_log()[log_schema().message_key().unwrap().to_string()]
+                        .to_string_lossy()
+                        .into_owned()
+                )
             );
 
             let event = stream.next().await;
diff --git a/src/sources/fluent/mod.rs b/src/sources/fluent/mod.rs
index f25f413590324..f6ae0955d15eb 100644
--- a/src/sources/fluent/mod.rs
+++ b/src/sources/fluent/mod.rs
@@ -9,7 +9,7 @@ use chrono::Utc;
 use codecs::{BytesDeserializerConfig, StreamDecodingError};
 use flate2::read::MultiGzDecoder;
 use lookup::lookup_v2::parse_value_path;
-use lookup::{metadata_path, owned_value_path, path, OwnedValuePath, PathPrefix};
+use lookup::{metadata_path, owned_value_path, path, OwnedValuePath};
 use rmp_serde::{decode, Deserializer, Serializer};
 use serde::{Deserialize, Serialize};
 use smallvec::{smallvec, SmallVec};
@@ -135,8 +135,9 @@ impl FluentConfig {
     /// Builds the `schema::Definition` for this source using the provided `LogNamespace`.
     fn schema_definition(&self, log_namespace: LogNamespace) -> Definition {
         // `host_key` is only inserted if not present already.
-        let host_key = parse_value_path(log_schema().host_key())
-            .ok()
+        let host_key = log_schema()
+            .host_key()
+            .cloned()
             .map(LegacyKey::InsertIfEmpty);
 
         let tag_key = parse_value_path("tag").ok().map(LegacyKey::Overwrite);
@@ -209,7 +210,7 @@ impl FluentSource {
     fn new(log_namespace: LogNamespace) -> Self {
         Self {
             log_namespace,
-            legacy_host_key_path: parse_value_path(log_schema().host_key()).ok(),
+            legacy_host_key_path: log_schema().host_key().cloned(),
         }
     }
 }
@@ -587,7 +588,7 @@ impl From<FluentEvent<'_>> for LogEvent {
 
         log_namespace.insert_vector_metadata(
             &mut log,
-            Some(log_schema().source_type_key()),
+            log_schema().source_type_key(),
             path!("source_type"),
             Bytes::from_static(FluentConfig::NAME.as_bytes()),
         );
@@ -598,9 +599,7 @@ impl From<FluentEvent<'_>> for LogEvent {
                 log.insert(metadata_path!("vector", "ingest_timestamp"), Utc::now());
             }
             LogNamespace::Legacy => {
-                if let Some(timestamp_key) = log_schema().timestamp_key() {
-                    log.insert((PathPrefix::Event, timestamp_key), timestamp);
-                }
+                log.maybe_insert(log_schema().timestamp_key_target_path(), timestamp);
             }
         }
 
@@ -665,7 +664,7 @@ mod tests {
         Event::Log(LogEvent::from(BTreeMap::from([
             (String::from("message"), Value::from(name)),
             (
-                String::from(log_schema().source_type_key()),
+                log_schema().source_type_key().unwrap().to_string(),
                 Value::from(FluentConfig::NAME),
             ),
             (String::from("tag"), Value::from("tag.name")),
diff --git a/src/sources/gcp_pubsub.rs b/src/sources/gcp_pubsub.rs
index d38688592d4fd..29128200d9e6b 100644
--- a/src/sources/gcp_pubsub.rs
+++ b/src/sources/gcp_pubsub.rs
@@ -162,7 +162,7 @@ pub struct PubsubConfig {
     /// How often to poll the currently active streams to see if they
     /// are all busy and so open a new stream.
     #[serde(default = "default_poll_time")]
-    #[serde_as(as = "serde_with::DurationSeconds<f64>")]
+    #[serde_as(as = "serde_with::DurationSecondsWithFrac<f64>")]
     #[configurable(metadata(docs::human_name = "Poll Time"))]
     pub poll_time_seconds: Duration,
 
@@ -184,7 +184,7 @@ pub struct PubsubConfig {
 
     /// The amount of time, in seconds, to wait between retry attempts after an error.
     #[serde(default = "default_retry_delay")]
-    #[serde_as(as = "serde_with::DurationSeconds<f64>")]
+    #[serde_as(as = "serde_with::DurationSecondsWithFrac<f64>")]
     #[configurable(metadata(docs::human_name = "Retry Delay"))]
     pub retry_delay_secs: Duration,
 
@@ -198,7 +198,7 @@ pub struct PubsubConfig {
     /// before sending a keepalive request. If this is set larger than
     /// `60`, you may see periodic errors sent from the server.
     #[serde(default = "default_keepalive")]
-    #[serde_as(as = "serde_with::DurationSeconds<f64>")]
+    #[serde_as(as = "serde_with::DurationSecondsWithFrac<f64>")]
     #[configurable(metadata(docs::human_name = "Keepalive"))]
     pub keepalive_secs: Duration,
 
@@ -314,7 +314,7 @@ impl SourceConfig for PubsubConfig {
                 self.decoding.clone(),
                 log_namespace,
             )
-            .build(),
+            .build()?,
             acknowledgements: cx.do_acknowledgements(self.acknowledgements),
             shutdown: cx.shutdown,
             out: cx.out,
diff --git a/src/sources/heroku_logs.rs b/src/sources/heroku_logs.rs
index a55a7e21e26af..befdc9fbf803f 100644
--- a/src/sources/heroku_logs.rs
+++ b/src/sources/heroku_logs.rs
@@ -95,9 +95,10 @@ impl LogplexConfig {
             )
             .with_source_metadata(
                 LogplexConfig::NAME,
-                Some(LegacyKey::InsertIfEmpty(owned_value_path!(
-                    log_schema().host_key()
-                ))),
+                log_schema()
+                    .host_key()
+                    .cloned()
+                    .map(LegacyKey::InsertIfEmpty),
                 &owned_value_path!("host"),
                 Kind::bytes(),
                 Some("host"),
@@ -162,7 +163,8 @@ impl SourceConfig for LogplexConfig {
         let log_namespace = cx.log_namespace(self.log_namespace);
 
         let decoder =
-            DecodingConfig::new(self.framing.clone(), self.decoding.clone(), log_namespace).build();
+            DecodingConfig::new(self.framing.clone(), self.decoding.clone(), log_namespace)
+                .build()?;
 
         let source = LogplexSource {
             query_parameters: self.query_parameters.clone(),
@@ -321,7 +323,7 @@ fn line_to_events(
         let mut buffer = BytesMut::new();
         buffer.put(message.as_bytes());
 
-        let legacy_host_key = parse_value_path(log_schema().host_key()).ok();
+        let legacy_host_key = log_schema().host_key().cloned();
         let legacy_app_key = parse_value_path("app_name").ok();
         let legacy_proc_key = parse_value_path("proc_id").ok();
 
@@ -517,7 +519,7 @@ mod tests {
             let log = event.as_log();
 
             assert_eq!(
-                log[log_schema().message_key()],
+                *log.get_message().unwrap(),
                 r#"at=info method=GET path="/cart_link" host=lumberjack-store.timber.io request_id=05726858-c44e-4f94-9a20-37df73be9006 fwd="73.75.38.87" dyno=web.1 connect=1ms service=22ms status=304 bytes=656 protocol=http"#.into()
             );
             assert_eq!(
@@ -527,8 +529,8 @@ mod tests {
                     .unwrap()
                     .into()
             );
-            assert_eq!(log[&log_schema().host_key()], "host".into());
-            assert_eq!(log[log_schema().source_type_key()], "heroku_logs".into());
+            assert_eq!(*log.get_host().unwrap(), "host".into());
+            assert_eq!(*log.get_source_type().unwrap(), "heroku_logs".into());
             assert_eq!(log["appname"], "lumberjack-store".into());
             assert_eq!(log["absent"], Value::Null);
         }).await;
@@ -602,7 +604,7 @@ mod tests {
         let events = super::line_to_events(Default::default(), log_namespace, body.into());
         let log = events[0].as_log();
 
-        assert_eq!(log[log_schema().message_key()], "foo bar baz".into());
+        assert_eq!(*log.get_message().unwrap(), "foo bar baz".into());
         assert_eq!(
             log[log_schema().timestamp_key().unwrap().to_string()],
             "2020-01-08T22:33:57.353034+00:00"
@@ -610,8 +612,8 @@ mod tests {
                 .unwrap()
                 .into()
         );
-        assert_eq!(log[log_schema().host_key()], "host".into());
-        assert_eq!(log[log_schema().source_type_key()], "heroku_logs".into());
+        assert_eq!(*log.get_host().unwrap(), "host".into());
+        assert_eq!(*log.get_source_type().unwrap(), "heroku_logs".into());
     }
 
     #[test]
@@ -621,17 +623,9 @@ mod tests {
         let events = super::line_to_events(Default::default(), log_namespace, body.into());
         let log = events[0].as_log();
 
-        assert_eq!(
-            log[log_schema().message_key()],
-            "what am i doing here".into()
-        );
-        assert!(log
-            .get((
-                lookup::PathPrefix::Event,
-                log_schema().timestamp_key().unwrap()
-            ))
-            .is_some());
-        assert_eq!(log[log_schema().source_type_key()], "heroku_logs".into());
+        assert_eq!(*log.get_message().unwrap(), "what am i doing here".into());
+        assert!(log.get_timestamp().is_some());
+        assert_eq!(*log.get_source_type().unwrap(), "heroku_logs".into());
     }
 
     #[test]
@@ -641,7 +635,7 @@ mod tests {
         let events = super::line_to_events(Default::default(), log_namespace, body.into());
         let log = events[0].as_log();
 
-        assert_eq!(log[log_schema().message_key()], "i'm not that long".into());
+        assert_eq!(*log.get_message().unwrap(), "i'm not that long".into());
         assert_eq!(
             log[log_schema().timestamp_key().unwrap().to_string()],
             "2020-01-08T22:33:57.353034+00:00"
@@ -649,8 +643,8 @@ mod tests {
                 .unwrap()
                 .into()
         );
-        assert_eq!(log[log_schema().host_key()], "host".into());
-        assert_eq!(log[log_schema().source_type_key()], "heroku_logs".into());
+        assert_eq!(*log.get_host().unwrap(), "host".into());
+        assert_eq!(*log.get_source_type().unwrap(), "heroku_logs".into());
     }
 
     #[test]
diff --git a/src/sources/http_client/client.rs b/src/sources/http_client/client.rs
index 55036ccde446b..a6c80782d5f44 100644
--- a/src/sources/http_client/client.rs
+++ b/src/sources/http_client/client.rs
@@ -20,7 +20,8 @@ use crate::{
     sources::util::{
         http::HttpMethod,
         http_client::{
-            build_url, call, default_interval, GenericHttpClientInputs, HttpClientBuilder,
+            build_url, call, default_interval, default_timeout, warn_if_interval_too_low,
+            GenericHttpClientInputs, HttpClientBuilder,
         },
     },
     tls::{TlsConfig, TlsSettings},
@@ -51,13 +52,22 @@ pub struct HttpClientConfig {
     #[configurable(metadata(docs::examples = "http://127.0.0.1:9898/logs"))]
     pub endpoint: String,
 
-    /// The interval between calls.
+    /// The interval between scrapes. Requests are run concurrently so if a scrape takes longer
+    /// than the interval a new scrape will be started. This can take extra resources, set the timeout
+    /// to a value lower than the scrape interval to prevent this from happening.
     #[serde(default = "default_interval")]
     #[serde_as(as = "serde_with::DurationSeconds<u64>")]
     #[serde(rename = "scrape_interval_secs")]
     #[configurable(metadata(docs::human_name = "Scrape Interval"))]
     pub interval: Duration,
 
+    /// The timeout for each scrape request.
+    #[serde(default = "default_timeout")]
+    #[serde_as(as = "serde_with:: DurationSecondsWithFrac<f64>")]
+    #[serde(rename = "scrape_timeout_secs")]
+    #[configurable(metadata(docs::human_name = "Scrape Timeout"))]
+    pub timeout: Duration,
+
     /// Custom parameters for the HTTP request query string.
     ///
     /// One or more values for the same parameter key can be provided.
@@ -153,6 +163,7 @@ impl Default for HttpClientConfig {
             endpoint: "http://localhost:9898/logs".to_string(),
             query: HashMap::new(),
             interval: default_interval(),
+            timeout: default_timeout(),
             decoding: default_decoding(),
             framing: default_framing_message_based(),
             headers: HashMap::new(),
@@ -183,7 +194,7 @@ impl SourceConfig for HttpClientConfig {
         let log_namespace = cx.log_namespace(self.log_namespace);
 
         // build the decoder
-        let decoder = self.get_decoding_config(Some(log_namespace)).build();
+        let decoder = self.get_decoding_config(Some(log_namespace)).build()?;
 
         let content_type = self.decoding.content_type(&self.framing).to_string();
 
@@ -193,9 +204,12 @@ impl SourceConfig for HttpClientConfig {
             log_namespace,
         };
 
+        warn_if_interval_too_low(self.timeout, self.interval);
+
         let inputs = GenericHttpClientInputs {
             urls,
             interval: self.interval,
+            timeout: self.timeout,
             headers: self.headers.clone(),
             content_type,
             auth: self.auth.clone(),
@@ -328,16 +342,17 @@ impl http_client::HttpClientContext for HttpClientContext {
                     );
                 }
                 Event::Metric(ref mut metric) => {
-                    metric.replace_tag(
-                        log_schema().source_type_key().to_string(),
-                        HttpClientConfig::NAME.to_string(),
-                    );
+                    if let Some(source_type_key) = log_schema().source_type_key() {
+                        metric.replace_tag(
+                            source_type_key.to_string(),
+                            HttpClientConfig::NAME.to_string(),
+                        );
+                    }
                 }
                 Event::Trace(ref mut trace) => {
-                    trace.insert(
-                        log_schema().source_type_key(),
-                        Bytes::from(HttpClientConfig::NAME),
-                    );
+                    trace.maybe_insert(log_schema().source_type_key_target_path(), || {
+                        Bytes::from(HttpClientConfig::NAME).into()
+                    });
                 }
             }
         }
diff --git a/src/sources/http_client/integration_tests.rs b/src/sources/http_client/integration_tests.rs
index f7b04403e45d3..68e4842ba99d5 100644
--- a/src/sources/http_client/integration_tests.rs
+++ b/src/sources/http_client/integration_tests.rs
@@ -19,7 +19,7 @@ use codecs::decoding::DeserializerConfig;
 use vector_core::config::log_schema;
 
 use super::{
-    tests::{run_compliance, INTERVAL},
+    tests::{run_compliance, INTERVAL, TIMEOUT},
     HttpClientConfig,
 };
 
@@ -53,6 +53,7 @@ async fn invalid_endpoint() {
     run_error(HttpClientConfig {
         endpoint: "http://nope".to_string(),
         interval: INTERVAL,
+        timeout: TIMEOUT,
         query: HashMap::new(),
         decoding: default_decoding(),
         framing: default_framing_message_based(),
@@ -71,6 +72,7 @@ async fn collected_logs_bytes() {
     let events = run_compliance(HttpClientConfig {
         endpoint: format!("{}/logs/bytes", dufs_address()),
         interval: INTERVAL,
+        timeout: TIMEOUT,
         query: HashMap::new(),
         decoding: DeserializerConfig::Bytes,
         framing: default_framing_message_based(),
@@ -84,7 +86,7 @@ async fn collected_logs_bytes() {
     // panics if not log event
     let log = events[0].as_log();
     assert_eq!(
-        log[log_schema().source_type_key()],
+        *log.get_source_type().unwrap(),
         HttpClientConfig::NAME.into()
     );
 }
@@ -95,6 +97,7 @@ async fn collected_logs_json() {
     let events = run_compliance(HttpClientConfig {
         endpoint: format!("{}/logs/json.json", dufs_address()),
         interval: INTERVAL,
+        timeout: TIMEOUT,
         query: HashMap::new(),
         decoding: DeserializerConfig::Json(Default::default()),
         framing: default_framing_message_based(),
@@ -108,7 +111,7 @@ async fn collected_logs_json() {
     // panics if not log event
     let log = events[0].as_log();
     assert_eq!(
-        log[log_schema().source_type_key()],
+        *log.get_source_type().unwrap(),
         HttpClientConfig::NAME.into()
     );
 }
@@ -119,6 +122,7 @@ async fn collected_metrics_native_json() {
     let events = run_compliance(HttpClientConfig {
         endpoint: format!("{}/metrics/native.json", dufs_address()),
         interval: INTERVAL,
+        timeout: TIMEOUT,
         query: HashMap::new(),
         decoding: DeserializerConfig::NativeJson(Default::default()),
         framing: default_framing_message_based(),
@@ -136,7 +140,7 @@ async fn collected_metrics_native_json() {
         metric
             .tags()
             .unwrap()
-            .get(log_schema().source_type_key())
+            .get(log_schema().source_type_key().unwrap().to_string().as_str())
             .map(AsRef::as_ref),
         Some(HttpClientConfig::NAME)
     );
@@ -148,6 +152,7 @@ async fn collected_trace_native_json() {
     let events = run_compliance(HttpClientConfig {
         endpoint: format!("{}/traces/native.json", dufs_address()),
         interval: INTERVAL,
+        timeout: TIMEOUT,
         query: HashMap::new(),
         decoding: DeserializerConfig::NativeJson(Default::default()),
         framing: default_framing_message_based(),
@@ -161,7 +166,7 @@ async fn collected_trace_native_json() {
 
     let trace = events[0].as_trace();
     assert_eq!(
-        trace.as_map()[log_schema().source_type_key()],
+        trace.as_map()[log_schema().source_type_key().unwrap().to_string().as_str()],
         HttpClientConfig::NAME.into()
     );
 }
@@ -172,6 +177,7 @@ async fn unauthorized_no_auth() {
     run_error(HttpClientConfig {
         endpoint: format!("{}/logs/json.json", dufs_auth_address()),
         interval: INTERVAL,
+        timeout: TIMEOUT,
         query: HashMap::new(),
         decoding: DeserializerConfig::Json(Default::default()),
         framing: default_framing_message_based(),
@@ -190,6 +196,7 @@ async fn unauthorized_wrong_auth() {
     run_error(HttpClientConfig {
         endpoint: format!("{}/logs/json.json", dufs_auth_address()),
         interval: INTERVAL,
+        timeout: TIMEOUT,
         query: HashMap::new(),
         decoding: DeserializerConfig::Json(Default::default()),
         framing: default_framing_message_based(),
@@ -211,6 +218,7 @@ async fn authorized() {
     run_compliance(HttpClientConfig {
         endpoint: format!("{}/logs/json.json", dufs_auth_address()),
         interval: INTERVAL,
+        timeout: TIMEOUT,
         query: HashMap::new(),
         decoding: DeserializerConfig::Json(Default::default()),
         framing: default_framing_message_based(),
@@ -232,6 +240,7 @@ async fn tls_invalid_ca() {
     run_error(HttpClientConfig {
         endpoint: format!("{}/logs/json.json", dufs_https_address()),
         interval: INTERVAL,
+        timeout: TIMEOUT,
         query: HashMap::new(),
         decoding: DeserializerConfig::Json(Default::default()),
         framing: default_framing_message_based(),
@@ -253,6 +262,7 @@ async fn tls_valid() {
     run_compliance(HttpClientConfig {
         endpoint: format!("{}/logs/json.json", dufs_https_address()),
         interval: INTERVAL,
+        timeout: TIMEOUT,
         query: HashMap::new(),
         decoding: DeserializerConfig::Json(Default::default()),
         framing: default_framing_message_based(),
@@ -275,6 +285,7 @@ async fn shutdown() {
     let source = HttpClientConfig {
         endpoint: format!("{}/logs/json.json", dufs_address()),
         interval: INTERVAL,
+        timeout: TIMEOUT,
         query: HashMap::new(),
         decoding: DeserializerConfig::Json(Default::default()),
         framing: default_framing_message_based(),
diff --git a/src/sources/http_client/tests.rs b/src/sources/http_client/tests.rs
index ecd799a73696b..bb97289807fbd 100644
--- a/src/sources/http_client/tests.rs
+++ b/src/sources/http_client/tests.rs
@@ -16,6 +16,8 @@ use crate::test_util::{
 
 pub(crate) const INTERVAL: Duration = Duration::from_secs(1);
 
+pub(crate) const TIMEOUT: Duration = Duration::from_secs(1);
+
 /// The happy path should yield at least one event and must emit the required internal events for sources.
 pub(crate) async fn run_compliance(config: HttpClientConfig) -> Vec<Event> {
     let events =
@@ -47,6 +49,7 @@ async fn bytes_decoding() {
     run_compliance(HttpClientConfig {
         endpoint: format!("http://{}/endpoint", in_addr),
         interval: INTERVAL,
+        timeout: TIMEOUT,
         query: HashMap::new(),
         decoding: default_decoding(),
         framing: default_framing_message_based(),
@@ -75,6 +78,7 @@ async fn json_decoding_newline_delimited() {
     run_compliance(HttpClientConfig {
         endpoint: format!("http://{}/endpoint", in_addr),
         interval: INTERVAL,
+        timeout: TIMEOUT,
         query: HashMap::new(),
         decoding: DeserializerConfig::Json(Default::default()),
         framing: FramingConfig::NewlineDelimited(Default::default()),
@@ -103,6 +107,7 @@ async fn json_decoding_character_delimited() {
     run_compliance(HttpClientConfig {
         endpoint: format!("http://{}/endpoint", in_addr),
         interval: INTERVAL,
+        timeout: TIMEOUT,
         query: HashMap::new(),
         decoding: DeserializerConfig::Json(Default::default()),
         framing: FramingConfig::CharacterDelimited(CharacterDelimitedDecoderConfig {
@@ -135,6 +140,7 @@ async fn request_query_applied() {
     let events = run_compliance(HttpClientConfig {
         endpoint: format!("http://{}/endpoint?key1=val1", in_addr),
         interval: INTERVAL,
+        timeout: TIMEOUT,
         query: HashMap::from([
             ("key1".to_string(), vec!["val2".to_string()]),
             (
@@ -203,6 +209,7 @@ async fn headers_applied() {
     run_compliance(HttpClientConfig {
         endpoint: format!("http://{}/endpoint", in_addr),
         interval: INTERVAL,
+        timeout: TIMEOUT,
         query: HashMap::new(),
         decoding: default_decoding(),
         framing: default_framing_message_based(),
@@ -234,6 +241,7 @@ async fn accept_header_override() {
     run_compliance(HttpClientConfig {
         endpoint: format!("http://{}/endpoint", in_addr),
         interval: INTERVAL,
+        timeout: TIMEOUT,
         query: HashMap::new(),
         decoding: DeserializerConfig::Bytes,
         framing: default_framing_message_based(),
diff --git a/src/sources/http_server.rs b/src/sources/http_server.rs
index 2bd2afecee34f..89da17c13e333 100644
--- a/src/sources/http_server.rs
+++ b/src/sources/http_server.rs
@@ -314,7 +314,7 @@ fn remove_duplicates(mut list: Vec<String>, list_name: &str) -> Vec<String> {
 #[typetag::serde(name = "http_server")]
 impl SourceConfig for SimpleHttpConfig {
     async fn build(&self, cx: SourceContext) -> crate::Result<super::Source> {
-        let decoder = self.get_decoding_config()?.build();
+        let decoder = self.get_decoding_config()?.build()?;
         let log_namespace = cx.log_namespace(self.log_namespace);
 
         let source = SimpleHttpSource {
@@ -654,15 +654,10 @@ mod tests {
         {
             let event = events.remove(0);
             let log = event.as_log();
-            assert_eq!(log[log_schema().message_key()], "test body".into());
-            assert!(log
-                .get((
-                    lookup::PathPrefix::Event,
-                    log_schema().timestamp_key().unwrap()
-                ))
-                .is_some());
+            assert_eq!(*log.get_message().unwrap(), "test body".into());
+            assert!(log.get_timestamp().is_some());
             assert_eq!(
-                log[log_schema().source_type_key()],
+                *log.get_source_type().unwrap(),
                 SimpleHttpConfig::NAME.into()
             );
             assert_eq!(log["http_path"], "/".into());
@@ -671,7 +666,7 @@ mod tests {
         {
             let event = events.remove(0);
             let log = event.as_log();
-            assert_eq!(log[log_schema().message_key()], "test body 2".into());
+            assert_eq!(*log.get_message().unwrap(), "test body 2".into());
             assert_event_metadata(log).await;
         }
     }
@@ -703,13 +698,13 @@ mod tests {
         {
             let event = events.remove(0);
             let log = event.as_log();
-            assert_eq!(log[log_schema().message_key()], "test body".into());
+            assert_eq!(*log.get_message().unwrap(), "test body".into());
             assert_event_metadata(log).await;
         }
         {
             let event = events.remove(0);
             let log = event.as_log();
-            assert_eq!(log[log_schema().message_key()], "test body 2".into());
+            assert_eq!(*log.get_message().unwrap(), "test body 2".into());
             assert_event_metadata(log).await;
         }
     }
@@ -742,7 +737,7 @@ mod tests {
         {
             let event = events.remove(0);
             let log = event.as_log();
-            assert_eq!(log[log_schema().message_key()], "foo\nbar".into());
+            assert_eq!(*log.get_message().unwrap(), "foo\nbar".into());
             assert_event_metadata(log).await;
         }
     }
@@ -779,22 +774,8 @@ mod tests {
         })
         .await;
 
-        assert!(events
-            .remove(1)
-            .as_log()
-            .get((
-                lookup::PathPrefix::Event,
-                log_schema().timestamp_key().unwrap()
-            ))
-            .is_some());
-        assert!(events
-            .remove(0)
-            .as_log()
-            .get((
-                lookup::PathPrefix::Event,
-                log_schema().timestamp_key().unwrap()
-            ))
-            .is_some());
+        assert!(events.remove(1).as_log().get_timestamp().is_some());
+        assert!(events.remove(0).as_log().get_timestamp().is_some());
     }
 
     #[tokio::test]
@@ -952,16 +933,17 @@ mod tests {
     }
 
     async fn assert_event_metadata(log: &LogEvent) {
-        assert!(log
+        assert!(log.get_timestamp().is_some());
+
+        let source_type_key_value = log
             .get((
                 lookup::PathPrefix::Event,
-                log_schema().timestamp_key().unwrap()
+                log_schema().source_type_key().unwrap(),
             ))
-            .is_some());
-        assert_eq!(
-            log[log_schema().source_type_key()],
-            SimpleHttpConfig::NAME.into()
-        );
+            .unwrap()
+            .as_str()
+            .unwrap();
+        assert_eq!(source_type_key_value, SimpleHttpConfig::NAME);
         assert_eq!(log["http_path"], "/".into());
     }
 
@@ -1088,7 +1070,7 @@ mod tests {
         {
             let event = events.remove(0);
             let log = event.as_log();
-            assert_eq!(log[log_schema().message_key()], "test body".into());
+            assert_eq!(*log.get_message().unwrap(), "test body".into());
             assert_event_metadata(log).await;
         }
     }
@@ -1124,14 +1106,9 @@ mod tests {
             let log = event.as_log();
             assert_eq!(log["key1"], "value1".into());
             assert_eq!(log["vector_http_path"], "/event/path".into());
-            assert!(log
-                .get((
-                    lookup::PathPrefix::Event,
-                    log_schema().timestamp_key().unwrap()
-                ))
-                .is_some());
+            assert!(log.get_timestamp().is_some());
             assert_eq!(
-                log[log_schema().source_type_key()],
+                *log.get_source_type().unwrap(),
                 SimpleHttpConfig::NAME.into()
             );
         }
@@ -1177,14 +1154,9 @@ mod tests {
             let log = event.as_log();
             assert_eq!(log["key1"], "value1".into());
             assert_eq!(log["vector_http_path"], "/event/path1".into());
-            assert!(log
-                .get((
-                    lookup::PathPrefix::Event,
-                    log_schema().timestamp_key().unwrap()
-                ))
-                .is_some());
+            assert!(log.get_timestamp().is_some());
             assert_eq!(
-                log[log_schema().source_type_key()],
+                *log.get_source_type().unwrap(),
                 SimpleHttpConfig::NAME.into()
             );
         }
@@ -1193,14 +1165,9 @@ mod tests {
             let log = event.as_log();
             assert_eq!(log["key2"], "value2".into());
             assert_eq!(log["vector_http_path"], "/event/path2".into());
-            assert!(log
-                .get((
-                    lookup::PathPrefix::Event,
-                    log_schema().timestamp_key().unwrap()
-                ))
-                .is_some());
+            assert!(log.get_timestamp().is_some());
             assert_eq!(
-                log[log_schema().source_type_key()],
+                *log.get_source_type().unwrap(),
                 SimpleHttpConfig::NAME.into()
             );
         }
diff --git a/src/sources/internal_logs.rs b/src/sources/internal_logs.rs
index d74a97788a3b5..1034a37b508ef 100644
--- a/src/sources/internal_logs.rs
+++ b/src/sources/internal_logs.rs
@@ -53,7 +53,7 @@ pub struct InternalLogsConfig {
 }
 
 fn default_host_key() -> OptionalValuePath {
-    OptionalValuePath::from(owned_value_path!(log_schema().host_key()))
+    log_schema().host_key().cloned().into()
 }
 
 fn default_pid_key() -> OptionalValuePath {
diff --git a/src/sources/internal_metrics.rs b/src/sources/internal_metrics.rs
index 2b876aeaa8397..6ae574436160a 100644
--- a/src/sources/internal_metrics.rs
+++ b/src/sources/internal_metrics.rs
@@ -1,6 +1,7 @@
 use std::time::Duration;
 
 use futures::StreamExt;
+use lookup::lookup_v2::OptionalValuePath;
 use serde_with::serde_as;
 use tokio::time;
 use tokio_stream::wrappers::IntervalStream;
@@ -26,7 +27,7 @@ use crate::{
 #[serde(deny_unknown_fields, default)]
 pub struct InternalMetricsConfig {
     /// The interval between metric gathering, in seconds.
-    #[serde_as(as = "serde_with::DurationSeconds<f64>")]
+    #[serde_as(as = "serde_with::DurationSecondsWithFrac<f64>")]
     #[serde(default = "default_scrape_interval")]
     #[configurable(metadata(docs::human_name = "Scrape Interval"))]
     pub scrape_interval_secs: Duration,
@@ -64,7 +65,7 @@ pub struct TagsConfig {
     ///
     /// [global_host_key]: https://vector.dev/docs/reference/configuration/global-options/#log_schema.host_key
     #[serde(default = "default_host_key")]
-    pub host_key: String,
+    pub host_key: OptionalValuePath,
 
     /// Sets the name of the tag to use to add the current process ID to each metric.
     ///
@@ -91,8 +92,8 @@ fn default_namespace() -> String {
     "vector".to_owned()
 }
 
-fn default_host_key() -> String {
-    log_schema().host_key().to_owned()
+fn default_host_key() -> OptionalValuePath {
+    log_schema().host_key().cloned().into()
 }
 
 impl_generate_config_from_default!(InternalMetricsConfig);
@@ -111,10 +112,7 @@ impl SourceConfig for InternalMetricsConfig {
         // namespace for created metrics is already "vector" by default.
         let namespace = self.namespace.clone();
 
-        let host_key = match self.tags.host_key.as_str() {
-            "" => None,
-            s => Some(s.to_owned()),
-        };
+        let host_key = self.tags.host_key.clone();
 
         let pid_key = self
             .tags
@@ -147,7 +145,7 @@ impl SourceConfig for InternalMetricsConfig {
 
 struct InternalMetrics<'a> {
     namespace: String,
-    host_key: Option<String>,
+    host_key: OptionalValuePath,
     pid_key: Option<String>,
     controller: &'a Controller,
     interval: time::Duration,
@@ -179,9 +177,9 @@ impl<'a> InternalMetrics<'a> {
                     metric = metric.with_namespace(Some(self.namespace.clone()));
                 }
 
-                if let Some(host_key) = &self.host_key {
+                if let Some(host_key) = &self.host_key.path {
                     if let Ok(hostname) = &hostname {
-                        metric.replace_tag(host_key.to_owned(), hostname.to_owned());
+                        metric.replace_tag(host_key.to_string(), hostname.to_owned());
                     }
                 }
                 if let Some(pid_key) = &self.pid_key {
@@ -317,7 +315,7 @@ mod tests {
     async fn sets_tags() {
         let event = event_from_config(InternalMetricsConfig {
             tags: TagsConfig {
-                host_key: String::from("my_host_key"),
+                host_key: OptionalValuePath::new("my_host_key"),
                 pid_key: Some(String::from("my_pid_key")),
             },
             ..Default::default()
diff --git a/src/sources/journald.rs b/src/sources/journald.rs
index 5f7c8dc8203dc..e6dc00c8f5559 100644
--- a/src/sources/journald.rs
+++ b/src/sources/journald.rs
@@ -12,7 +12,7 @@ use bytes::Bytes;
 use chrono::{TimeZone, Utc};
 use codecs::{decoding::BoxedFramingError, CharacterDelimitedDecoder};
 use futures::{poll, stream::BoxStream, task::Poll, StreamExt};
-use lookup::{lookup_v2::parse_value_path, metadata_path, owned_value_path, path, PathPrefix};
+use lookup::{metadata_path, owned_value_path, path};
 use nix::{
     sys::signal::{kill, Signal},
     unistd::Pid,
@@ -269,9 +269,7 @@ impl JournaldConfig {
             )
             .with_source_metadata(
                 JournaldConfig::NAME,
-                parse_value_path(log_schema().host_key())
-                    .ok()
-                    .map(LegacyKey::Overwrite),
+                log_schema().host_key().cloned().map(LegacyKey::Overwrite),
                 &owned_value_path!("host"),
                 Kind::bytes().or_undefined(),
                 Some("host"),
@@ -708,10 +706,7 @@ fn enrich_log_event(log: &mut LogEvent, log_namespace: LogNamespace) {
         log_namespace.insert_source_metadata(
             JournaldConfig::NAME,
             log,
-            parse_value_path(log_schema().host_key())
-                .ok()
-                .as_ref()
-                .map(LegacyKey::Overwrite),
+            log_schema().host_key().map(LegacyKey::Overwrite),
             path!("host"),
             host,
         );
@@ -745,9 +740,7 @@ fn enrich_log_event(log: &mut LogEvent, log_namespace: LogNamespace) {
         }
         LogNamespace::Legacy => {
             if let Some(ts) = timestamp {
-                if let Some(timestamp_key) = log_schema().timestamp_key() {
-                    log.insert((PathPrefix::Event, timestamp_key), ts);
-                }
+                log.maybe_insert(log_schema().timestamp_key_target_path(), ts);
             }
         }
     }
@@ -755,7 +748,7 @@ fn enrich_log_event(log: &mut LogEvent, log_namespace: LogNamespace) {
     // Add source type.
     log_namespace.insert_vector_metadata(
         log,
-        Some(log_schema().source_type_key()),
+        log_schema().source_type_key(),
         path!("source_type"),
         JournaldConfig::NAME,
     );
@@ -788,7 +781,7 @@ fn create_log_event_from_record(
             let mut log = LogEvent::from_iter(record).with_batch_notifier_option(batch);
 
             if let Some(message) = log.remove(MESSAGE) {
-                log.insert(log_schema().message_key(), message);
+                log.maybe_insert(log_schema().message_key_target_path(), message);
             }
 
             log
@@ -1164,7 +1157,7 @@ mod tests {
             Value::Bytes("System Initialization".into())
         );
         assert_eq!(
-            received[0].as_log()[log_schema().source_type_key()],
+            received[0].as_log()[log_schema().source_type_key().unwrap().to_string()],
             "journald".into()
         );
         assert_eq!(timestamp(&received[0]), value_ts(1578529839, 140001000));
@@ -1491,7 +1484,7 @@ mod tests {
     }
 
     fn message(event: &Event) -> Value {
-        event.as_log()[log_schema().message_key()].clone()
+        event.as_log()[log_schema().message_key().unwrap().to_string()].clone()
     }
 
     fn timestamp(event: &Event) -> Value {
diff --git a/src/sources/kafka.rs b/src/sources/kafka.rs
index add5d9f90f215..7346c2988bdbb 100644
--- a/src/sources/kafka.rs
+++ b/src/sources/kafka.rs
@@ -308,7 +308,8 @@ impl SourceConfig for KafkaSourceConfig {
 
         let consumer = create_consumer(self)?;
         let decoder =
-            DecodingConfig::new(self.framing.clone(), self.decoding.clone(), log_namespace).build();
+            DecodingConfig::new(self.framing.clone(), self.decoding.clone(), log_namespace)
+                .build()?;
         let acknowledgements = cx.do_acknowledgements(self.acknowledgements);
 
         Ok(Box::pin(kafka_source(
@@ -615,7 +616,9 @@ impl ReceivedMessage {
                     );
                 }
                 LogNamespace::Legacy => {
-                    log.insert(log_schema().source_type_key(), KafkaSourceConfig::NAME);
+                    if let Some(source_type_key) = log_schema().source_type_key_target_path() {
+                        log.insert(source_type_key, KafkaSourceConfig::NAME);
+                    }
                 }
             }
 
@@ -951,7 +954,7 @@ mod integration_test {
     use tokio::time::sleep;
     use vector_buffers::topology::channel::BufferReceiver;
     use vector_core::event::EventStatus;
-    use vrl::value;
+    use vrl::{event_path, value};
 
     use super::{test::*, *};
     use crate::{
@@ -1080,7 +1083,7 @@ mod integration_test {
         for (i, event) in events.into_iter().enumerate() {
             if let LogNamespace::Legacy = log_namespace {
                 assert_eq!(
-                    event.as_log()[log_schema().message_key()],
+                    event.as_log()[log_schema().message_key().unwrap().to_string()],
                     format!("{} {:03}", TEXT, i).into()
                 );
                 assert_eq!(
@@ -1088,7 +1091,7 @@ mod integration_test {
                     format!("{} {}", KEY, i).into()
                 );
                 assert_eq!(
-                    event.as_log()[log_schema().source_type_key()],
+                    event.as_log()[log_schema().source_type_key().unwrap().to_string()],
                     "kafka".into()
                 );
                 assert_eq!(
@@ -1159,7 +1162,7 @@ mod integration_test {
         let recv = BufferReceiver::new(recv.into()).into_stream();
         let recv = recv.then(move |mut events| async move {
             events.iter_logs_mut().for_each(|log| {
-                log.insert("pipeline_id", id.to_string());
+                log.insert(event_path!("pipeline_id"), id.to_string());
             });
             sleep(delay).await;
             events.iter_events_mut().for_each(|mut event| {
@@ -1186,7 +1189,8 @@ mod integration_test {
             config.decoding.clone(),
             log_namespace,
         )
-        .build();
+        .build()
+        .unwrap();
 
         tokio::spawn(kafka_source(
             config,
@@ -1440,7 +1444,7 @@ mod integration_test {
                         format!("{} {}", KEY, i).into()
                     );
                     assert_eq!(
-                        event.as_log()[log_schema().source_type_key()],
+                        event.as_log()[log_schema().source_type_key().unwrap().to_string()],
                         "kafka".into()
                     );
                     assert_eq!(
@@ -1542,7 +1546,7 @@ mod integration_test {
                         format!("{} {}", KEY, i).into()
                     );
                     assert_eq!(
-                        event.as_log()[log_schema().source_type_key()],
+                        event.as_log()[log_schema().source_type_key().unwrap().to_string()],
                         "kafka".into()
                     );
                     assert_eq!(
@@ -1640,7 +1644,7 @@ mod integration_test {
                         format!("{} {}", KEY, ((i as f32) / 2_f32).floor()).into()
                     );
                     assert_eq!(
-                        event.as_log()[log_schema().source_type_key()],
+                        event.as_log()[log_schema().source_type_key().unwrap().to_string()],
                         "kafka".into()
                     );
                     assert_eq!(
diff --git a/src/sources/kubernetes_logs/mod.rs b/src/sources/kubernetes_logs/mod.rs
index bd004a778881b..2965c4fad4171 100644
--- a/src/sources/kubernetes_logs/mod.rs
+++ b/src/sources/kubernetes_logs/mod.rs
@@ -897,7 +897,7 @@ fn create_event(
     ingestion_timestamp_field: Option<&OwnedTargetPath>,
     log_namespace: LogNamespace,
 ) -> Event {
-    let deserializer = BytesDeserializer::new();
+    let deserializer = BytesDeserializer;
     let mut log = deserializer.parse_single(line, log_namespace);
 
     log_namespace.insert_source_metadata(
@@ -910,7 +910,7 @@ fn create_event(
 
     log_namespace.insert_vector_metadata(
         &mut log,
-        Some(log_schema().source_type_key()),
+        log_schema().source_type_key(),
         path!("source_type"),
         Bytes::from(Config::NAME),
     );
diff --git a/src/sources/kubernetes_logs/parser/cri.rs b/src/sources/kubernetes_logs/parser/cri.rs
index ce8f6a9035c56..00e5b9c80b987 100644
--- a/src/sources/kubernetes_logs/parser/cri.rs
+++ b/src/sources/kubernetes_logs/parser/cri.rs
@@ -3,7 +3,9 @@ use derivative::Derivative;
 use lookup::path;
 use vector_common::conversion;
 use vector_core::config::{log_schema, LegacyKey, LogNamespace};
+use vrl::path::PathPrefix;
 
+use crate::sources::kubernetes_logs::transform_utils::get_message_field;
 use crate::{
     event::{self, Event, Value},
     internal_events::{
@@ -40,20 +42,18 @@ impl Cri {
 
 impl FunctionTransform for Cri {
     fn transform(&mut self, output: &mut OutputBuffer, mut event: Event) {
-        let message_field = match self.log_namespace {
-            LogNamespace::Vector => ".",
-            LogNamespace::Legacy => log_schema().message_key(),
-        };
+        let message_field = get_message_field(self.log_namespace);
+        let target_path = (PathPrefix::Event, message_field.as_str());
 
         // Get the log field with the message, if it exists, and coerce it to bytes.
         let log = event.as_mut_log();
-        let value = log.remove(message_field).map(|s| s.coerce_to_bytes());
+        let value = log.remove(target_path).map(|s| s.coerce_to_bytes());
         match value {
             None => {
                 // The message field was missing, inexplicably. If we can't find the message field, there's nothing for
                 // us to actually decode, so there's no event we could emit, and so we just emit the error and return.
                 emit!(ParserMissingFieldError::<DROP_EVENT> {
-                    field: message_field
+                    field: &message_field.to_string()
                 });
                 return;
             }
@@ -70,7 +70,7 @@ impl FunctionTransform for Cri {
                     // MESSAGE
                     // Insert either directly into `.` or `log_schema().message_key()`,
                     // overwriting the original "full" CRI log that included additional fields.
-                    drop(log.insert(message_field, Value::Bytes(s.slice_ref(parsed_log.message))));
+                    drop(log.insert(target_path, Value::Bytes(s.slice_ref(parsed_log.message))));
 
                     // MULTILINE_TAG
                     // If the MULTILINE_TAG is 'P' (partial), insert our generic `_partial` key.
diff --git a/src/sources/kubernetes_logs/parser/docker.rs b/src/sources/kubernetes_logs/parser/docker.rs
index 5b3c71201779c..a94e6aa0cd23f 100644
--- a/src/sources/kubernetes_logs/parser/docker.rs
+++ b/src/sources/kubernetes_logs/parser/docker.rs
@@ -4,7 +4,9 @@ use lookup::{path, OwnedTargetPath};
 use serde_json::Value as JsonValue;
 use snafu::{OptionExt, ResultExt, Snafu};
 use vector_core::config::{LegacyKey, LogNamespace};
+use vrl::path::PathPrefix;
 
+use crate::sources::kubernetes_logs::transform_utils::get_message_field;
 use crate::{
     config::log_schema,
     event::{self, Event, LogEvent, Value},
@@ -51,13 +53,11 @@ impl FunctionTransform for Docker {
 
 /// Parses `message` as json object and removes it.
 fn parse_json(log: &mut LogEvent, log_namespace: LogNamespace) -> Result<(), ParsingError> {
-    let message_field = match log_namespace {
-        LogNamespace::Vector => ".",
-        LogNamespace::Legacy => log_schema().message_key(),
-    };
+    let message_field = get_message_field(log_namespace);
+    let target_path = (PathPrefix::Event, message_field.as_str());
 
     let value = log
-        .remove(message_field)
+        .remove(target_path)
         .ok_or(ParsingError::NoMessageField)?;
 
     let bytes = match value {
@@ -69,7 +69,7 @@ fn parse_json(log: &mut LogEvent, log_namespace: LogNamespace) -> Result<(), Par
         Ok(JsonValue::Object(object)) => {
             for (key, value) in object {
                 match key.as_str() {
-                    MESSAGE_KEY => drop(log.insert(message_field, value)),
+                    MESSAGE_KEY => drop(log.insert(target_path, value)),
                     STREAM_KEY => log_namespace.insert_source_metadata(
                         Config::NAME,
                         log,
@@ -133,12 +133,9 @@ fn normalize_event(
     }
 
     // Parse message, remove trailing newline and detect if it's partial.
-    let message_key = match log_namespace {
-        LogNamespace::Vector => ".",
-        LogNamespace::Legacy => log_schema().message_key(),
-    };
-    let message = log.remove(message_key).context(LogFieldMissingSnafu)?;
-
+    let message_field = get_message_field(log_namespace);
+    let target_path = (PathPrefix::Event, message_field.as_str());
+    let message = log.remove(target_path).context(LogFieldMissingSnafu)?;
     let mut message = match message {
         Value::Bytes(val) => val,
         _ => return Err(NormalizationError::LogValueUnexpectedType),
@@ -159,7 +156,7 @@ fn normalize_event(
         message.truncate(message.len() - 1);
         is_partial = false;
     };
-    log.insert(message_key, message);
+    log.insert(target_path, message);
 
     // For partial messages add a partial event indicator.
     if is_partial {
diff --git a/src/sources/kubernetes_logs/parser/mod.rs b/src/sources/kubernetes_logs/parser/mod.rs
index fe6f765477bd3..5b53c4689e5e1 100644
--- a/src/sources/kubernetes_logs/parser/mod.rs
+++ b/src/sources/kubernetes_logs/parser/mod.rs
@@ -3,9 +3,10 @@ mod docker;
 mod test_util;
 
 use vector_core::config::LogNamespace;
+use vrl::path::PathPrefix;
 
+use crate::sources::kubernetes_logs::transform_utils::get_message_field;
 use crate::{
-    config::log_schema,
     event::{Event, Value},
     internal_events::KubernetesLogsFormatPickerEdgeCase,
     transforms::{FunctionTransform, OutputBuffer},
@@ -42,12 +43,11 @@ impl FunctionTransform for Parser {
     fn transform(&mut self, output: &mut OutputBuffer, event: Event) {
         match &mut self.state {
             ParserState::Uninitialized => {
-                let message_field = match self.log_namespace {
-                    LogNamespace::Vector => ".",
-                    LogNamespace::Legacy => log_schema().message_key(),
-                };
-
-                let message = match event.as_log().get(message_field) {
+                let message_field = get_message_field(self.log_namespace);
+                let message = match event
+                    .as_log()
+                    .get((PathPrefix::Event, message_field.as_str()))
+                {
                     Some(message) => message,
                     None => {
                         emit!(KubernetesLogsFormatPickerEdgeCase {
diff --git a/src/sources/kubernetes_logs/partial_events_merger.rs b/src/sources/kubernetes_logs/partial_events_merger.rs
index d3648dcd893ec..e4e1cf28c9bc4 100644
--- a/src/sources/kubernetes_logs/partial_events_merger.rs
+++ b/src/sources/kubernetes_logs/partial_events_merger.rs
@@ -5,9 +5,9 @@ use indexmap::IndexMap;
 use vector_core::config::LogNamespace;
 
 use super::{transform_utils::optional::Optional, FILE_KEY};
+use crate::sources::kubernetes_logs::transform_utils::get_message_field;
 use crate::{
     conditions::AnyCondition,
-    config::log_schema,
     event,
     transforms::reduce::{MergeStrategy, Reduce, ReduceConfig},
 };
@@ -17,10 +17,7 @@ pub type PartialEventsMerger = Optional<Reduce>;
 
 pub fn build(enabled: bool, log_namespace: LogNamespace) -> PartialEventsMerger {
     let reducer = if enabled {
-        let key = match log_namespace {
-            LogNamespace::Vector => ".".to_string(),
-            LogNamespace::Legacy => log_schema().message_key().to_string(),
-        };
+        let key = get_message_field(log_namespace);
 
         // Merge the message field of each event by concatenating it, with a space delimiter.
         let mut merge_strategies = IndexMap::new();
diff --git a/src/sources/kubernetes_logs/transform_utils/mod.rs b/src/sources/kubernetes_logs/transform_utils/mod.rs
index 4b24267e84d53..c0dc4a07c3e1f 100644
--- a/src/sources/kubernetes_logs/transform_utils/mod.rs
+++ b/src/sources/kubernetes_logs/transform_utils/mod.rs
@@ -1 +1,14 @@
+use vector_core::config::{log_schema, LogNamespace};
+
 pub mod optional;
+
+pub(crate) fn get_message_field(log_namespace: LogNamespace) -> String {
+    match log_namespace {
+        LogNamespace::Vector => ".".to_string(),
+        LogNamespace::Legacy => log_schema()
+            .message_key()
+            .expect("global log_schema.message_key to be valid path")
+            .clone()
+            .to_string(),
+    }
+}
diff --git a/src/sources/logstash.rs b/src/sources/logstash.rs
index 8d58f09a10c42..ec3a038bd9739 100644
--- a/src/sources/logstash.rs
+++ b/src/sources/logstash.rs
@@ -9,8 +9,7 @@ use std::{
 use bytes::{Buf, Bytes, BytesMut};
 use codecs::{BytesDeserializerConfig, StreamDecodingError};
 use flate2::read::ZlibDecoder;
-use lookup::lookup_v2::parse_value_path;
-use lookup::{event_path, metadata_path, owned_value_path, path, OwnedValuePath, PathPrefix};
+use lookup::{event_path, metadata_path, owned_value_path, path, OwnedValuePath};
 use smallvec::{smallvec, SmallVec};
 use snafu::{ResultExt, Snafu};
 use tokio_util::codec::Decoder;
@@ -74,8 +73,9 @@ impl LogstashConfig {
     /// Builds the `schema::Definition` for this source using the provided `LogNamespace`.
     fn schema_definition(&self, log_namespace: LogNamespace) -> Definition {
         // `host_key` is only inserted if not present already.
-        let host_key = parse_value_path(log_schema().host_key())
-            .ok()
+        let host_key = log_schema()
+            .host_key()
+            .cloned()
             .map(LegacyKey::InsertIfEmpty);
 
         let tls_client_metadata_path = self
@@ -139,7 +139,7 @@ impl SourceConfig for LogstashConfig {
         let log_namespace = cx.log_namespace(self.log_namespace);
         let source = LogstashSource {
             timestamp_converter: types::Conversion::Timestamp(cx.globals.timezone()),
-            legacy_host_key_path: parse_value_path(log_schema().host_key()).ok(),
+            legacy_host_key_path: log_schema().host_key().cloned(),
             log_namespace,
         };
         let shutdown_secs = Duration::from_secs(30);
@@ -209,7 +209,7 @@ impl TcpSource for LogstashSource {
 
             self.log_namespace.insert_vector_metadata(
                 log,
-                Some(log_schema().source_type_key()),
+                log_schema().source_type_key(),
                 path!("source_type"),
                 Bytes::from_static(LogstashConfig::NAME.as_bytes()),
             );
@@ -232,9 +232,9 @@ impl TcpSource for LogstashSource {
                     log.insert(metadata_path!("vector", "ingest_timestamp"), now);
                 }
                 LogNamespace::Legacy => {
-                    if let Some(timestamp_key) = log_schema().timestamp_key() {
+                    if let Some(timestamp_key) = log_schema().timestamp_key_target_path() {
                         log.insert(
-                            (PathPrefix::Event, timestamp_key),
+                            timestamp_key,
                             log_timestamp.unwrap_or_else(|| Value::from(now)),
                         );
                     }
diff --git a/src/sources/mezmo_demo_logs.rs b/src/sources/mezmo_demo_logs.rs
index 80f0c7b54e22a..2a538a7371b50 100644
--- a/src/sources/mezmo_demo_logs.rs
+++ b/src/sources/mezmo_demo_logs.rs
@@ -370,7 +370,7 @@ impl SourceConfig for MezmoDemoLogsConfig {
             self.interval,
             self.count,
             self.format.clone(),
-            decoder,
+            decoder.unwrap(),
             state,
             cx.shutdown,
             cx.out,
@@ -446,7 +446,7 @@ mod tests {
                 config.interval,
                 config.count,
                 config.format,
-                decoder,
+                decoder.unwrap(),
                 state,
                 ShutdownSignal::noop(),
                 tx,
@@ -480,7 +480,7 @@ mod tests {
 
     #[tokio::test]
     async fn shuffle_demo_logs_copies_lines() {
-        let message_key = log_schema().message_key();
+        let message_key = log_schema().message_key().unwrap().to_string();
         let mut rx = runit(
             r#"format = "shuffle"
                lines = ["one", "two", "three", "four"]
@@ -520,7 +520,7 @@ mod tests {
 
     #[tokio::test]
     async fn shuffle_demo_logs_adds_sequence() {
-        let message_key = log_schema().message_key();
+        let message_key = log_schema().message_key().unwrap().to_string();
         let mut rx = runit(
             r#"format = "shuffle"
                lines = ["one", "two"]
diff --git a/src/sources/nats.rs b/src/sources/nats.rs
index 6600bffc1a256..2549a4771e40f 100644
--- a/src/sources/nats.rs
+++ b/src/sources/nats.rs
@@ -1,6 +1,6 @@
 use chrono::Utc;
 use codecs::decoding::{DeserializerConfig, FramingConfig, StreamDecodingError};
-use futures::{pin_mut, stream, Stream, StreamExt};
+use futures::{pin_mut, StreamExt};
 use lookup::{lookup_v2::OptionalValuePath, owned_value_path};
 use snafu::{ResultExt, Snafu};
 use tokio_util::codec::FramedRead;
@@ -31,9 +31,9 @@ enum BuildError {
     #[snafu(display("NATS Config Error: {}", source))]
     Config { source: NatsConfigError },
     #[snafu(display("NATS Connect Error: {}", source))]
-    Connect { source: std::io::Error },
+    Connect { source: async_nats::ConnectError },
     #[snafu(display("NATS Subscribe Error: {}", source))]
-    Subscribe { source: std::io::Error },
+    Subscribe { source: async_nats::SubscribeError },
 }
 
 /// Configuration for the `nats` source.
@@ -122,7 +122,8 @@ impl SourceConfig for NatsSourceConfig {
         let log_namespace = cx.log_namespace(self.log_namespace);
         let (connection, subscription) = create_subscription(self).await?;
         let decoder =
-            DecodingConfig::new(self.framing.clone(), self.decoding.clone(), log_namespace).build();
+            DecodingConfig::new(self.framing.clone(), self.decoding.clone(), log_namespace)
+                .build()?;
 
         Ok(Box::pin(nats_source(
             self.clone(),
@@ -166,13 +167,13 @@ impl SourceConfig for NatsSourceConfig {
 }
 
 impl NatsSourceConfig {
-    async fn connect(&self) -> Result<nats::asynk::Connection, BuildError> {
-        let options: nats::asynk::Options = self.try_into().context(ConfigSnafu)?;
+    async fn connect(&self) -> Result<async_nats::Client, BuildError> {
+        let options: async_nats::ConnectOptions = self.try_into().context(ConfigSnafu)?;
         options.connect(&self.url).await.context(ConnectSnafu)
     }
 }
 
-impl TryFrom<&NatsSourceConfig> for nats::asynk::Options {
+impl TryFrom<&NatsSourceConfig> for async_nats::ConnectOptions {
     type Error = NatsConfigError;
 
     fn try_from(config: &NatsSourceConfig) -> Result<Self, Self::Error> {
@@ -180,31 +181,23 @@ impl TryFrom<&NatsSourceConfig> for nats::asynk::Options {
     }
 }
 
-fn get_subscription_stream(
-    subscription: nats::asynk::Subscription,
-) -> impl Stream<Item = nats::asynk::Message> {
-    stream::unfold(subscription, |subscription| async move {
-        subscription.next().await.map(|msg| (msg, subscription))
-    })
-}
-
 async fn nats_source(
     config: NatsSourceConfig,
     // Take ownership of the connection so it doesn't get dropped.
-    _connection: nats::asynk::Connection,
-    subscription: nats::asynk::Subscription,
+    _connection: async_nats::Client,
+    subscriber: async_nats::Subscriber,
     decoder: Decoder,
     log_namespace: LogNamespace,
     shutdown: ShutdownSignal,
     mut out: SourceSender,
 ) -> Result<(), ()> {
     let events_received = register!(EventsReceived);
-    let stream = get_subscription_stream(subscription).take_until(shutdown);
+    let stream = subscriber.take_until(shutdown);
     pin_mut!(stream);
     let bytes_received = register!(BytesReceived::from(Protocol::TCP));
     while let Some(msg) = stream.next().await {
-        bytes_received.emit(ByteSize(msg.data.len()));
-        let mut stream = FramedRead::new(msg.data.as_ref(), decoder.clone());
+        bytes_received.emit(ByteSize(msg.payload.len()));
+        let mut stream = FramedRead::new(msg.payload.as_ref(), decoder.clone());
         while let Some(next) = stream.next().await {
             match next {
                 Ok((events, _byte_size)) => {
@@ -257,12 +250,15 @@ async fn nats_source(
 
 async fn create_subscription(
     config: &NatsSourceConfig,
-) -> Result<(nats::asynk::Connection, nats::asynk::Subscription), BuildError> {
+) -> Result<(async_nats::Client, async_nats::Subscriber), BuildError> {
     let nc = config.connect().await?;
 
     let subscription = match &config.queue {
-        None => nc.subscribe(&config.subject).await,
-        Some(queue) => nc.queue_subscribe(&config.subject, queue).await,
+        None => nc.subscribe(config.subject.clone()).await,
+        Some(queue) => {
+            nc.queue_subscribe(config.subject.clone(), queue.clone())
+                .await
+        }
     };
 
     let subscription = subscription.context(SubscribeSnafu)?;
@@ -349,6 +345,7 @@ mod tests {
 mod integration_tests {
     #![allow(clippy::print_stdout)] //tests
 
+    use bytes::Bytes;
     use vector_core::config::log_schema;
 
     use super::*;
@@ -373,7 +370,8 @@ mod integration_tests {
                 conf.decoding.clone(),
                 LogNamespace::Legacy,
             )
-            .build();
+            .build()
+            .unwrap();
             tokio::spawn(nats_source(
                 conf.clone(),
                 nc,
@@ -383,14 +381,20 @@ mod integration_tests {
                 ShutdownSignal::noop(),
                 tx,
             ));
-            nc_pub.publish(&subject, msg).await.unwrap();
+            nc_pub
+                .publish(subject, Bytes::from_static(msg.as_bytes()))
+                .await
+                .unwrap();
 
             collect_n(rx, 1).await
         })
         .await;
 
         println!("Received event  {:?}", events[0].as_log());
-        assert_eq!(events[0].as_log()[log_schema().message_key()], msg.into());
+        assert_eq!(
+            events[0].as_log()[log_schema().message_key().unwrap().to_string()],
+            msg.into()
+        );
         Ok(())
     }
 
@@ -605,7 +609,7 @@ mod integration_tests {
 
         let r = publish_and_check(conf).await;
         assert!(
-            matches!(r, Err(BuildError::Config { .. })),
+            matches!(r, Err(BuildError::Connect { .. })),
             "publish_and_check failed, expected BuildError::Config, got: {:?}",
             r
         );
diff --git a/src/sources/opentelemetry/integration_tests.rs b/src/sources/opentelemetry/integration_tests.rs
index 65204ba0035e6..5f5ad56d0e015 100644
--- a/src/sources/opentelemetry/integration_tests.rs
+++ b/src/sources/opentelemetry/integration_tests.rs
@@ -89,8 +89,8 @@ async fn receive_logs_legacy_namespace() {
         let events = collect_n(logs_output, 2).await;
         assert_eq!(events.len(), 2);
         assert_eq!(
-            events[0].as_log()[log_schema().message_key()],
-            events[1].as_log()[log_schema().message_key()]
+            events[0].as_log()[log_schema().message_key().unwrap().to_string()],
+            events[1].as_log()[log_schema().message_key().unwrap().to_string()]
         );
     })
     .await;
diff --git a/src/sources/opentelemetry/mod.rs b/src/sources/opentelemetry/mod.rs
index 234144dbd1a84..caeffa87e46d8 100644
--- a/src/sources/opentelemetry/mod.rs
+++ b/src/sources/opentelemetry/mod.rs
@@ -138,7 +138,10 @@ impl SourceConfig for OpentelemetryConfig {
             log_namespace,
             events_received: events_received.clone(),
         })
-        .accept_compressed(tonic::codec::CompressionEncoding::Gzip);
+        .accept_compressed(tonic::codec::CompressionEncoding::Gzip)
+        // Tonic added a default of 4MB in 0.9. This replaces the old behavior.
+        .max_decoding_message_size(usize::MAX);
+
         let grpc_source = run_grpc_server(
             self.grpc.address,
             grpc_tls_settings,
diff --git a/src/sources/prometheus/scrape.rs b/src/sources/prometheus/scrape.rs
index 4a7c66425359e..408cde50097e9 100644
--- a/src/sources/prometheus/scrape.rs
+++ b/src/sources/prometheus/scrape.rs
@@ -11,6 +11,7 @@ use vector_core::{config::LogNamespace, event::Event};
 
 use super::parser;
 use crate::sources::util::http::HttpMethod;
+use crate::sources::util::http_client::{default_timeout, warn_if_interval_too_low};
 use crate::{
     config::{GenerateConfig, SourceConfig, SourceContext, SourceOutput},
     http::Auth,
@@ -53,13 +54,22 @@ pub struct PrometheusScrapeConfig {
     #[serde(alias = "hosts")]
     endpoints: Vec<String>,
 
-    /// The interval between scrapes, in seconds.
+    /// The interval between scrapes. Requests are run concurrently so if a scrape takes longer
+    /// than the interval a new scrape will be started. This can take extra resources, set the timeout
+    /// to a value lower than the scrape interval to prevent this from happening.
     #[serde(default = "default_interval")]
     #[serde_as(as = "serde_with::DurationSeconds<u64>")]
     #[serde(rename = "scrape_interval_secs")]
     #[configurable(metadata(docs::human_name = "Scrape Interval"))]
     interval: Duration,
 
+    /// The timeout for each scrape request.
+    #[serde(default = "default_timeout")]
+    #[serde_as(as = "serde_with:: DurationSecondsWithFrac<f64>")]
+    #[serde(rename = "scrape_timeout_secs")]
+    #[configurable(metadata(docs::human_name = "Scrape Timeout"))]
+    timeout: Duration,
+
     /// The tag name added to each event representing the scraped instance's `host:port`.
     ///
     /// The tag value is the host and port of the scraped instance.
@@ -114,6 +124,7 @@ impl GenerateConfig for PrometheusScrapeConfig {
         toml::Value::try_from(Self {
             endpoints: vec!["http://localhost:9090/metrics".to_string()],
             interval: default_interval(),
+            timeout: default_timeout(),
             instance_tag: Some("instance".to_string()),
             endpoint_tag: Some("endpoint".to_string()),
             honor_labels: false,
@@ -143,9 +154,12 @@ impl SourceConfig for PrometheusScrapeConfig {
             endpoint_tag: self.endpoint_tag.clone(),
         };
 
+        warn_if_interval_too_low(self.timeout, self.interval);
+
         let inputs = GenericHttpClientInputs {
             urls,
             interval: self.interval,
+            timeout: self.timeout,
             headers: HashMap::new(),
             content_type: "text/plain".to_string(),
             auth: self.auth.clone(),
@@ -351,6 +365,7 @@ mod test {
         let config = PrometheusScrapeConfig {
             endpoints: vec![format!("http://{}/metrics", in_addr)],
             interval: Duration::from_secs(1),
+            timeout: default_timeout(),
             instance_tag: Some("instance".to_string()),
             endpoint_tag: Some("endpoint".to_string()),
             honor_labels: true,
@@ -384,6 +399,7 @@ mod test {
         let config = PrometheusScrapeConfig {
             endpoints: vec![format!("http://{}/metrics", in_addr)],
             interval: Duration::from_secs(1),
+            timeout: default_timeout(),
             instance_tag: Some("instance".to_string()),
             endpoint_tag: Some("endpoint".to_string()),
             honor_labels: true,
@@ -435,6 +451,7 @@ mod test {
         let config = PrometheusScrapeConfig {
             endpoints: vec![format!("http://{}/metrics", in_addr)],
             interval: Duration::from_secs(1),
+            timeout: default_timeout(),
             instance_tag: Some("instance".to_string()),
             endpoint_tag: Some("endpoint".to_string()),
             honor_labels: false,
@@ -500,6 +517,7 @@ mod test {
         let config = PrometheusScrapeConfig {
             endpoints: vec![format!("http://{}/metrics", in_addr)],
             interval: Duration::from_secs(1),
+            timeout: default_timeout(),
             instance_tag: Some("instance".to_string()),
             endpoint_tag: Some("endpoint".to_string()),
             honor_labels: true,
@@ -555,6 +573,7 @@ mod test {
         let config = PrometheusScrapeConfig {
             endpoints: vec![format!("http://{}/metrics?key1=val1", in_addr)],
             interval: Duration::from_secs(1),
+            timeout: default_timeout(),
             instance_tag: Some("instance".to_string()),
             endpoint_tag: Some("endpoint".to_string()),
             honor_labels: false,
@@ -668,6 +687,7 @@ mod test {
                 honor_labels: false,
                 query: HashMap::new(),
                 interval: Duration::from_secs(1),
+                timeout: default_timeout(),
                 tls: None,
                 auth: None,
             },
@@ -753,6 +773,7 @@ mod integration_tests {
         let config = PrometheusScrapeConfig {
             endpoints: vec!["http://prometheus:9090/metrics".into()],
             interval: Duration::from_secs(1),
+            timeout: Duration::from_secs(1),
             instance_tag: Some("instance".to_string()),
             endpoint_tag: Some("endpoint".to_string()),
             honor_labels: false,
diff --git a/src/sources/redis/mod.rs b/src/sources/redis/mod.rs
index 03f4da5fe5dd8..1569449ddf29b 100644
--- a/src/sources/redis/mod.rs
+++ b/src/sources/redis/mod.rs
@@ -169,7 +169,8 @@ impl SourceConfig for RedisSourceConfig {
         let client = redis::Client::open(self.url.as_str()).context(ClientSnafu {})?;
         let connection_info = ConnectionInfo::from(client.get_connection_info());
         let decoder =
-            DecodingConfig::new(self.framing.clone(), self.decoding.clone(), log_namespace).build();
+            DecodingConfig::new(self.framing.clone(), self.decoding.clone(), log_namespace)
+                .build()?;
 
         let bytes_received = register!(BytesReceived::from(Protocol::from(
             connection_info.protocol
@@ -256,7 +257,7 @@ impl InputHandler {
                         if let Event::Log(ref mut log) = event {
                             self.log_namespace.insert_vector_metadata(
                                 log,
-                                Some(log_schema().source_type_key()),
+                                log_schema().source_type_key(),
                                 path!("source_type"),
                                 Bytes::from(RedisSourceConfig::NAME),
                             );
@@ -354,9 +355,18 @@ mod integration_test {
 
         let events = run_and_assert_source_compliance_n(config, 3, &SOURCE_TAGS).await;
 
-        assert_eq!(events[0].as_log()[log_schema().message_key()], "3".into());
-        assert_eq!(events[1].as_log()[log_schema().message_key()], "2".into());
-        assert_eq!(events[2].as_log()[log_schema().message_key()], "1".into());
+        assert_eq!(
+            events[0].as_log()[log_schema().message_key().unwrap().to_string()],
+            "3".into()
+        );
+        assert_eq!(
+            events[1].as_log()[log_schema().message_key().unwrap().to_string()],
+            "2".into()
+        );
+        assert_eq!(
+            events[2].as_log()[log_schema().message_key().unwrap().to_string()],
+            "1".into()
+        );
     }
 
     #[tokio::test]
@@ -427,9 +437,18 @@ mod integration_test {
 
         let events = run_and_assert_source_compliance_n(config, 3, &SOURCE_TAGS).await;
 
-        assert_eq!(events[0].as_log()[log_schema().message_key()], "1".into());
-        assert_eq!(events[1].as_log()[log_schema().message_key()], "2".into());
-        assert_eq!(events[2].as_log()[log_schema().message_key()], "3".into());
+        assert_eq!(
+            events[0].as_log()[log_schema().message_key().unwrap().to_string()],
+            "1".into()
+        );
+        assert_eq!(
+            events[1].as_log()[log_schema().message_key().unwrap().to_string()],
+            "2".into()
+        );
+        assert_eq!(
+            events[2].as_log()[log_schema().message_key().unwrap().to_string()],
+            "3".into()
+        );
     }
 
     #[tokio::test]
@@ -480,9 +499,12 @@ mod integration_test {
         assert_eq!(events.len(), 10000);
 
         for event in events {
-            assert_eq!(event.as_log()[log_schema().message_key()], text.into());
             assert_eq!(
-                event.as_log()[log_schema().source_type_key()],
+                event.as_log()[log_schema().message_key().unwrap().to_string()],
+                text.into()
+            );
+            assert_eq!(
+                event.as_log()[log_schema().source_type_key().unwrap().to_string()],
                 RedisSourceConfig::NAME.into()
             );
         }
diff --git a/src/sources/socket/mod.rs b/src/sources/socket/mod.rs
index a3c794ab76152..66eaf45b96e7d 100644
--- a/src/sources/socket/mod.rs
+++ b/src/sources/socket/mod.rs
@@ -124,7 +124,7 @@ impl SourceConfig for SocketConfig {
                     decoding,
                     log_namespace,
                 )
-                .build();
+                .build()?;
 
                 let tcp = tcp::RawTcpSource::new(config.clone(), decoder, log_namespace);
                 let tls_config = config.tls().as_ref().map(|tls| tls.tls_config.clone());
@@ -156,7 +156,7 @@ impl SourceConfig for SocketConfig {
                     config.decoding().clone(),
                     log_namespace,
                 )
-                .build();
+                .build()?;
                 Ok(udp::udp(
                     config,
                     decoder,
@@ -176,7 +176,7 @@ impl SourceConfig for SocketConfig {
                     config.decoding.clone(),
                     log_namespace,
                 )
-                .build();
+                .build()?;
 
                 unix::unix_datagram(config, decoder, cx.shutdown, cx.out, log_namespace)
             }
@@ -193,7 +193,7 @@ impl SourceConfig for SocketConfig {
                     decoding,
                     log_namespace,
                 )
-                .build();
+                .build()?;
 
                 unix::unix_stream(config, decoder, cx.shutdown, cx.out, log_namespace)
             }
@@ -313,7 +313,7 @@ impl SourceConfig for SocketConfig {
 }
 
 pub(crate) fn default_host_key() -> OptionalValuePath {
-    OptionalValuePath::from(owned_value_path!(log_schema().host_key()))
+    log_schema().host_key().cloned().into()
 }
 
 #[cfg(test)]
@@ -470,8 +470,14 @@ mod test {
             let events = collect_n(rx, 2).await;
 
             assert_eq!(events.len(), 2);
-            assert_eq!(events[0].as_log()[log_schema().message_key()], "foo".into());
-            assert_eq!(events[1].as_log()[log_schema().message_key()], "bar".into());
+            assert_eq!(
+                events[0].as_log()[log_schema().message_key().unwrap().to_string()],
+                "foo".into()
+            );
+            assert_eq!(
+                events[1].as_log()[log_schema().message_key().unwrap().to_string()],
+                "bar".into()
+            );
         })
         .await;
     }
@@ -495,7 +501,7 @@ mod test {
 
             let event = rx.next().await.unwrap();
             assert_eq!(
-                event.as_log()[log_schema().source_type_key()],
+                event.as_log()[log_schema().source_type_key().unwrap().to_string()],
                 "socket".into()
             );
         })
@@ -529,11 +535,14 @@ mod test {
             send_lines(addr, lines.into_iter()).await.unwrap();
 
             let event = rx.next().await.unwrap();
-            assert_eq!(event.as_log()[log_schema().message_key()], "short".into());
+            assert_eq!(
+                event.as_log()[log_schema().message_key().unwrap().to_string()],
+                "short".into()
+            );
 
             let event = rx.next().await.unwrap();
             assert_eq!(
-                event.as_log()[log_schema().message_key()],
+                event.as_log()[log_schema().message_key().unwrap().to_string()],
                 "more short".into()
             );
         })
@@ -583,7 +592,7 @@ mod test {
 
             let event = rx.next().await.unwrap();
             assert_eq!(
-                event.as_log()[log_schema().message_key()],
+                event.as_log()[log_schema().message_key().unwrap().to_string()],
                 "one line".into()
             );
 
@@ -595,7 +604,7 @@ mod test {
 
             let event = rx.next().await.unwrap();
             assert_eq!(
-                event.as_log()[log_schema().message_key()],
+                event.as_log()[log_schema().message_key().unwrap().to_string()],
                 "another line".into()
             );
 
@@ -701,7 +710,10 @@ mod test {
                 .unwrap();
 
             let event = rx.next().await.unwrap();
-            assert_eq!(event.as_log()[log_schema().message_key()], "test".into());
+            assert_eq!(
+                event.as_log()[log_schema().message_key().unwrap().to_string()],
+                "test".into()
+            );
 
             // Now signal to the Source to shut down.
             let deadline = Instant::now() + Duration::from_secs(10);
@@ -779,10 +791,10 @@ mod test {
             .collect::<Vec<_>>();
         assert_eq!(100, events.len());
 
-        let message_key = log_schema().message_key();
+        let message_key = log_schema().message_key().unwrap().to_string();
         let expected_message = message.clone().into();
         for event in events.into_iter().flat_map(EventContainer::into_events) {
-            assert_eq!(event.as_log()[message_key], expected_message);
+            assert_eq!(event.as_log()[message_key.as_str()], expected_message);
         }
 
         // Now trigger shutdown on the source and ensure that it shuts down before or at the
@@ -955,7 +967,7 @@ mod test {
             let events = collect_n(rx, 1).await;
 
             assert_eq!(
-                events[0].as_log()[log_schema().message_key()],
+                events[0].as_log()[log_schema().message_key().unwrap().to_string()],
                 "test".into()
             );
         })
@@ -972,7 +984,7 @@ mod test {
             let events = collect_n(rx, 1).await;
 
             assert_eq!(
-                events[0].as_log()[log_schema().message_key()],
+                events[0].as_log()[log_schema().message_key().unwrap().to_string()],
                 "foo\nbar".into()
             );
         })
@@ -989,11 +1001,11 @@ mod test {
             let events = collect_n(rx, 2).await;
 
             assert_eq!(
-                events[0].as_log()[log_schema().message_key()],
+                events[0].as_log()[log_schema().message_key().unwrap().to_string()],
                 "test".into()
             );
             assert_eq!(
-                events[1].as_log()[log_schema().message_key()],
+                events[1].as_log()[log_schema().message_key().unwrap().to_string()],
                 "test2".into()
             );
         })
@@ -1020,11 +1032,11 @@ mod test {
 
             let events = collect_n(rx, 2).await;
             assert_eq!(
-                events[0].as_log()[log_schema().message_key()],
+                events[0].as_log()[log_schema().message_key().unwrap().to_string()],
                 "short line".into()
             );
             assert_eq!(
-                events[1].as_log()[log_schema().message_key()],
+                events[1].as_log()[log_schema().message_key().unwrap().to_string()],
                 "a short un".into()
             );
         })
@@ -1056,11 +1068,11 @@ mod test {
 
             let events = collect_n(rx, 2).await;
             assert_eq!(
-                events[0].as_log()[log_schema().message_key()],
+                events[0].as_log()[log_schema().message_key().unwrap().to_string()],
                 "test with".into()
             );
             assert_eq!(
-                events[1].as_log()[log_schema().message_key()],
+                events[1].as_log()[log_schema().message_key().unwrap().to_string()],
                 "short one".into()
             );
         })
@@ -1120,7 +1132,7 @@ mod test {
             let events = collect_n(rx, 1).await;
 
             assert_eq!(
-                events[0].as_log()[log_schema().source_type_key()],
+                events[0].as_log()[log_schema().source_type_key().unwrap().to_string()],
                 "socket".into()
             );
         })
@@ -1141,7 +1153,7 @@ mod test {
             let events = collect_n(rx, 1).await;
 
             assert_eq!(
-                events[0].as_log()[log_schema().message_key()],
+                events[0].as_log()[log_schema().message_key().unwrap().to_string()],
                 "test".into()
             );
 
@@ -1182,7 +1194,10 @@ mod test {
             let events = collect_n(rx, 100).await;
             assert_eq!(100, events.len());
             for event in events {
-                assert_eq!(event.as_log()[log_schema().message_key()], "test".into());
+                assert_eq!(
+                    event.as_log()[log_schema().message_key().unwrap().to_string()],
+                    "test".into()
+                );
             }
 
             let deadline = Instant::now() + Duration::from_secs(10);
@@ -1267,11 +1282,11 @@ mod test {
 
         assert_eq!(2, events.len());
         assert_eq!(
-            events[0].as_log()[log_schema().message_key()],
+            events[0].as_log()[log_schema().message_key().unwrap().to_string()],
             "test".into()
         );
         assert_eq!(
-            events[1].as_log()[log_schema().message_key()],
+            events[1].as_log()[log_schema().message_key().unwrap().to_string()],
             "test2".into()
         );
     }
@@ -1322,11 +1337,11 @@ mod test {
 
             assert_eq!(events.len(), 1);
             assert_eq!(
-                events[0].as_log()[log_schema().message_key()],
+                events[0].as_log()[log_schema().message_key().unwrap().to_string()],
                 "test".into()
             );
             assert_eq!(
-                events[0].as_log()[log_schema().source_type_key()],
+                events[0].as_log()[log_schema().source_type_key().unwrap().to_string()],
                 "socket".into()
             );
             assert_eq!(events[0].as_log()["host"], UNNAMED_SOCKET_HOST.into());
@@ -1414,11 +1429,11 @@ mod test {
 
             assert_eq!(events.len(), 1);
             assert_eq!(
-                events[0].as_log()[log_schema().message_key()],
+                events[0].as_log()[log_schema().message_key().unwrap().to_string()],
                 "foo\nbar".into()
             );
             assert_eq!(
-                events[0].as_log()[log_schema().source_type_key()],
+                events[0].as_log()[log_schema().source_type_key().unwrap().to_string()],
                 "socket".into()
             );
         })
@@ -1501,11 +1516,11 @@ mod test {
 
             assert_eq!(1, events.len());
             assert_eq!(
-                events[0].as_log()[log_schema().message_key()],
+                events[0].as_log()[log_schema().message_key().unwrap().to_string()],
                 "test".into()
             );
             assert_eq!(
-                events[0].as_log()[log_schema().source_type_key()],
+                events[0].as_log()[log_schema().source_type_key().unwrap().to_string()],
                 "socket".into()
             );
         })
@@ -1543,14 +1558,20 @@ mod test {
             let events = collect_n(rx, 2).await;
 
             assert_eq!(events.len(), 2);
-            assert_eq!(events[0].as_log()[log_schema().message_key()], "foo".into());
             assert_eq!(
-                events[0].as_log()[log_schema().source_type_key()],
+                events[0].as_log()[log_schema().message_key().unwrap().to_string()],
+                "foo".into()
+            );
+            assert_eq!(
+                events[0].as_log()[log_schema().source_type_key().unwrap().to_string()],
                 "socket".into()
             );
-            assert_eq!(events[1].as_log()[log_schema().message_key()], "bar".into());
             assert_eq!(
-                events[1].as_log()[log_schema().source_type_key()],
+                events[1].as_log()[log_schema().message_key().unwrap().to_string()],
+                "bar".into()
+            );
+            assert_eq!(
+                events[1].as_log()[log_schema().source_type_key().unwrap().to_string()],
                 "socket".into()
             );
         })
diff --git a/src/sources/socket/udp.rs b/src/sources/socket/udp.rs
index 1951cc9ff01ff..a2793a6bae0cd 100644
--- a/src/sources/socket/udp.rs
+++ b/src/sources/socket/udp.rs
@@ -89,7 +89,7 @@ pub struct UdpConfig {
 }
 
 fn default_host_key() -> OptionalValuePath {
-    OptionalValuePath::from(owned_value_path!(log_schema().host_key()))
+    log_schema().host_key().cloned().into()
 }
 
 fn default_port_key() -> OptionalValuePath {
diff --git a/src/sources/splunk_hec/mod.rs b/src/sources/splunk_hec/mod.rs
index 222ffc2487041..78deae6cc60fc 100644
--- a/src/sources/splunk_hec/mod.rs
+++ b/src/sources/splunk_hec/mod.rs
@@ -10,7 +10,8 @@ use chrono::{DateTime, TimeZone, Utc};
 use flate2::read::MultiGzDecoder;
 use futures::FutureExt;
 use http::StatusCode;
-use lookup::owned_value_path;
+use lookup::lookup_v2::OptionalValuePath;
+use lookup::{event_path, owned_value_path};
 use serde::Serialize;
 use serde_json::{de::Read as JsonRead, Deserializer, Value as JsonValue};
 use snafu::Snafu;
@@ -21,6 +22,7 @@ use vector_config::configurable_component;
 use vector_core::{
     config::{LegacyKey, LogNamespace},
     event::BatchNotifier,
+    schema::meaning,
     EstimatedJsonEncodedSizeOf,
 };
 use vrl::value::{kind::Collection, Kind};
@@ -179,19 +181,26 @@ impl SourceConfig for SplunkConfig {
         let log_namespace = global_log_namespace.merge(self.log_namespace);
 
         let schema_definition = match log_namespace {
-            LogNamespace::Legacy => vector_core::schema::Definition::empty_legacy_namespace()
-                .with_event_field(
-                    &owned_value_path!(log_schema().message_key()),
-                    Kind::bytes().or_undefined(),
-                    Some("message"),
-                )
-                .with_event_field(
-                    &owned_value_path!("line"),
-                    Kind::object(Collection::empty())
-                        .or_array(Collection::empty())
-                        .or_undefined(),
-                    None,
-                ),
+            LogNamespace::Legacy => {
+                let definition = vector_core::schema::Definition::empty_legacy_namespace()
+                    .with_event_field(
+                        &owned_value_path!("line"),
+                        Kind::object(Collection::empty())
+                            .or_array(Collection::empty())
+                            .or_undefined(),
+                        None,
+                    );
+
+                if let Some(message_key) = log_schema().message_key() {
+                    definition.with_event_field(
+                        message_key,
+                        Kind::bytes().or_undefined(),
+                        Some(meaning::MESSAGE),
+                    )
+                } else {
+                    definition
+                }
+            }
             LogNamespace::Vector => vector_core::schema::Definition::new_with_default_metadata(
                 Kind::bytes().or_object(Collection::empty()),
                 [log_namespace],
@@ -200,12 +209,13 @@ impl SourceConfig for SplunkConfig {
         .with_standard_vector_source_metadata()
         .with_source_metadata(
             SplunkConfig::NAME,
-            Some(LegacyKey::Overwrite(owned_value_path!(
-                log_schema().host_key()
-            ))),
+            log_schema()
+                .host_key()
+                .cloned()
+                .map(LegacyKey::InsertIfEmpty),
             &owned_value_path!("host"),
             Kind::bytes(),
-            Some("host"),
+            Some(meaning::HOST),
         )
         .with_source_metadata(
             SplunkConfig::NAME,
@@ -226,7 +236,7 @@ impl SourceConfig for SplunkConfig {
             Some(LegacyKey::Overwrite(owned_value_path!(SOURCE))),
             &owned_value_path!("source"),
             Kind::bytes(),
-            Some("service"),
+            Some(meaning::SERVICE),
         )
         // Not to be confused with `source_type`.
         .with_source_metadata(
@@ -635,15 +645,19 @@ impl<'de, R: JsonRead<'de>> EventIterator<'de, R> {
                 // 3. Use the `remote`: SocketAddr value provided by warp
                 DefaultExtractor::new_with(
                     "host",
-                    log_schema().host_key(),
+                    log_schema().host_key().cloned().into(),
                     remote_addr
                         .or_else(|| remote.map(|addr| addr.to_string()))
                         .map(Value::from),
                     log_namespace,
                 ),
-                DefaultExtractor::new("index", INDEX, log_namespace),
-                DefaultExtractor::new("source", SOURCE, log_namespace),
-                DefaultExtractor::new("sourcetype", SOURCETYPE, log_namespace),
+                DefaultExtractor::new("index", OptionalValuePath::new(INDEX), log_namespace),
+                DefaultExtractor::new("source", OptionalValuePath::new(SOURCE), log_namespace),
+                DefaultExtractor::new(
+                    "sourcetype",
+                    OptionalValuePath::new(SOURCETYPE),
+                    log_namespace,
+                ),
             ],
             batch,
             token,
@@ -661,7 +675,7 @@ impl<'de, R: JsonRead<'de>> EventIterator<'de, R> {
         // Add source type
         self.log_namespace.insert_vector_metadata(
             &mut log,
-            Some(log_schema().source_type_key()),
+            log_schema().source_type_key(),
             lookup::path!("source_type"),
             SplunkConfig::NAME,
         );
@@ -797,7 +811,7 @@ impl<'de, R: JsonRead<'de>> EventIterator<'de, R> {
                     if string.is_empty() {
                         return Err(ApiError::EmptyEventField { event: self.events }.into());
                     }
-                    log.insert(log_schema().message_key(), string);
+                    log.maybe_insert(log_schema().message_key_target_path(), string);
                 }
                 JsonValue::Object(mut object) => {
                     if object.is_empty() {
@@ -812,13 +826,13 @@ impl<'de, R: JsonRead<'de>> EventIterator<'de, R> {
                                 log.insert("line", line);
                             }
                             _ => {
-                                log.insert(log_schema().message_key(), line);
+                                log.maybe_insert(log_schema().message_key_target_path(), line);
                             }
                         }
                     }
 
                     for (key, value) in object {
-                        log.insert(key.as_str(), value);
+                        log.insert(event_path!(key.as_str()), value);
                     }
                 }
                 _ => return Err(ApiError::InvalidDataFormat { event: self.events }.into()),
@@ -891,13 +905,17 @@ fn parse_timestamp(t: i64) -> Option<DateTime<Utc>> {
 /// Maintains last known extracted value of field and uses it in the absence of field.
 struct DefaultExtractor {
     field: &'static str,
-    to_field: &'static str,
+    to_field: OptionalValuePath,
     value: Option<Value>,
     log_namespace: LogNamespace,
 }
 
 impl DefaultExtractor {
-    const fn new(field: &'static str, to_field: &'static str, log_namespace: LogNamespace) -> Self {
+    const fn new(
+        field: &'static str,
+        to_field: OptionalValuePath,
+        log_namespace: LogNamespace,
+    ) -> Self {
         DefaultExtractor {
             field,
             to_field,
@@ -908,7 +926,7 @@ impl DefaultExtractor {
 
     fn new_with(
         field: &'static str,
-        to_field: &'static str,
+        to_field: OptionalValuePath,
         value: impl Into<Option<Value>>,
         log_namespace: LogNamespace,
     ) -> Self {
@@ -928,13 +946,15 @@ impl DefaultExtractor {
 
         // Add data field
         if let Some(index) = self.value.as_ref() {
-            self.log_namespace.insert_source_metadata(
-                SplunkConfig::NAME,
-                log,
-                Some(LegacyKey::Overwrite(lookup::path!(self.to_field))),
-                lookup::path!(self.to_field),
-                index.clone(),
-            )
+            if let Some(metadata_key) = self.to_field.path.as_ref() {
+                self.log_namespace.insert_source_metadata(
+                    SplunkConfig::NAME,
+                    log,
+                    Some(LegacyKey::Overwrite(metadata_key)),
+                    &self.to_field.path.clone().unwrap_or(owned_value_path!("")),
+                    index.clone(),
+                )
+            }
         }
     }
 }
@@ -980,9 +1000,7 @@ fn raw_event(
         LogNamespace::Vector => LogEvent::from(message),
         LogNamespace::Legacy => {
             let mut log = LogEvent::default();
-
-            // Add message
-            log.insert(log_schema().message_key(), message);
+            log.maybe_insert(log_schema().message_key_target_path(), message);
             log
         }
     };
@@ -1009,7 +1027,7 @@ fn raw_event(
         log_namespace.insert_source_metadata(
             SplunkConfig::NAME,
             &mut log,
-            Some(LegacyKey::Overwrite(log_schema().host_key())),
+            log_schema().host_key().map(LegacyKey::InsertIfEmpty),
             "host",
             host,
         );
@@ -1196,9 +1214,10 @@ mod tests {
     use serde::Deserialize;
     use vector_common::sensitive_string::SensitiveString;
     use vector_core::{event::EventStatus, schema::Definition};
+    use vrl::path::PathPrefix;
 
     use super::*;
-    use crate::sinks::splunk_hec::common::config_timestamp_key;
+    use crate::sinks::splunk_hec::common::{config_host_key, config_timestamp_key};
     use crate::{
         codecs::EncodingConfig,
         config::{log_schema, SinkConfig, SinkContext, SourceConfig, SourceContext},
@@ -1274,7 +1293,7 @@ mod tests {
         HecLogsSinkConfig {
             default_token: TOKEN.to_owned().into(),
             endpoint: format!("http://{}", address),
-            host_key: "host".to_owned(),
+            host_key: config_host_key(),
             indexed_fields: vec![],
             index: None,
             sourcetype: None,
@@ -1411,16 +1430,13 @@ mod tests {
 
         let event = channel_n(vec![message], sink, source).await.remove(0);
 
-        assert_eq!(event.as_log()[log_schema().message_key()], message.into());
-        assert!(event
-            .as_log()
-            .get((
-                lookup::PathPrefix::Event,
-                log_schema().timestamp_key().unwrap()
-            ))
-            .is_some());
         assert_eq!(
-            event.as_log()[log_schema().source_type_key()],
+            event.as_log()[log_schema().message_key().unwrap().to_string()],
+            message.into()
+        );
+        assert!(event.as_log().get_timestamp().is_some());
+        assert_eq!(
+            event.as_log()[log_schema().source_type_key().unwrap().to_string()],
             "splunk_hec".into()
         );
         assert!(event.metadata().splunk_hec_token().is_none());
@@ -1438,16 +1454,13 @@ mod tests {
 
         let event = channel_n(vec![message], sink, source).await.remove(0);
 
-        assert_eq!(event.as_log()[log_schema().message_key()], message.into());
-        assert!(event
-            .as_log()
-            .get((
-                lookup::PathPrefix::Event,
-                log_schema().timestamp_key().unwrap()
-            ))
-            .is_some());
         assert_eq!(
-            event.as_log()[log_schema().source_type_key()],
+            event.as_log()[log_schema().message_key().unwrap().to_string()],
+            message.into()
+        );
+        assert!(event.as_log().get_timestamp().is_some());
+        assert_eq!(
+            event.as_log()[log_schema().source_type_key().unwrap().to_string()],
             "splunk_hec".into()
         );
         assert!(event.metadata().splunk_hec_token().is_none());
@@ -1469,16 +1482,13 @@ mod tests {
         let events = channel_n(messages.clone(), sink, source).await;
 
         for (msg, event) in messages.into_iter().zip(events.into_iter()) {
-            assert_eq!(event.as_log()[log_schema().message_key()], msg.into());
-            assert!(event
-                .as_log()
-                .get((
-                    lookup::PathPrefix::Event,
-                    log_schema().timestamp_key().unwrap()
-                ))
-                .is_some());
             assert_eq!(
-                event.as_log()[log_schema().source_type_key()],
+                event.as_log()[log_schema().message_key().unwrap().to_string()],
+                msg.into()
+            );
+            assert!(event.as_log().get_timestamp().is_some());
+            assert_eq!(
+                event.as_log()[log_schema().source_type_key().unwrap().to_string()],
                 "splunk_hec".into()
             );
             assert!(event.metadata().splunk_hec_token().is_none());
@@ -1497,16 +1507,13 @@ mod tests {
 
         let event = channel_n(vec![message], sink, source).await.remove(0);
 
-        assert_eq!(event.as_log()[log_schema().message_key()], message.into());
-        assert!(event
-            .as_log()
-            .get((
-                lookup::PathPrefix::Event,
-                log_schema().timestamp_key().unwrap()
-            ))
-            .is_some());
         assert_eq!(
-            event.as_log()[log_schema().source_type_key()],
+            event.as_log()[log_schema().message_key().unwrap().to_string()],
+            message.into()
+        );
+        assert!(event.as_log().get_timestamp().is_some());
+        assert_eq!(
+            event.as_log()[log_schema().source_type_key().unwrap().to_string()],
             "splunk_hec".into()
         );
         assert!(event.metadata().splunk_hec_token().is_none());
@@ -1528,16 +1535,13 @@ mod tests {
         let events = channel_n(messages.clone(), sink, source).await;
 
         for (msg, event) in messages.into_iter().zip(events.into_iter()) {
-            assert_eq!(event.as_log()[log_schema().message_key()], msg.into());
-            assert!(event
-                .as_log()
-                .get((
-                    lookup::PathPrefix::Event,
-                    log_schema().timestamp_key().unwrap()
-                ))
-                .is_some());
             assert_eq!(
-                event.as_log()[log_schema().source_type_key()],
+                event.as_log()[log_schema().message_key().unwrap().to_string()],
+                msg.into()
+            );
+            assert!(event.as_log().get_timestamp().is_some());
+            assert_eq!(
+                event.as_log()[log_schema().source_type_key().unwrap().to_string()],
                 "splunk_hec".into()
             );
             assert!(event.metadata().splunk_hec_token().is_none());
@@ -1561,16 +1565,36 @@ mod tests {
         let event = collect_n(source, 1).await.remove(0).into_log();
         assert_eq!(event["greeting"], "hello".into());
         assert_eq!(event["name"], "bob".into());
-        assert!(event
-            .get((
-                lookup::PathPrefix::Event,
-                log_schema().timestamp_key().unwrap()
-            ))
-            .is_some());
-        assert_eq!(event[log_schema().source_type_key()], "splunk_hec".into());
+        assert!(event.get_timestamp().is_some());
+        assert_eq!(
+            event[log_schema().source_type_key().unwrap().to_string()],
+            "splunk_hec".into()
+        );
         assert!(event.metadata().splunk_hec_token().is_none());
     }
 
+    #[tokio::test]
+    async fn json_invalid_path_event() {
+        let (sink, source) = start(
+            JsonSerializerConfig::default().into(),
+            Compression::gzip_default(),
+            None,
+        )
+        .await;
+
+        let mut log = LogEvent::default();
+        // Test with a field that would be considered an invalid path if it were to
+        // be treated as a path and not a simple field name.
+        log.insert(event_path!("(greeting | thing"), "hello");
+        sink.run_events(vec![log.into()]).await.unwrap();
+
+        let event = collect_n(source, 1).await.remove(0).into_log();
+        assert_eq!(
+            event.get(event_path!("(greeting | thing")),
+            Some(&Value::from("hello"))
+        );
+    }
+
     #[tokio::test]
     async fn line_to_message() {
         let (sink, source) = start(
@@ -1585,7 +1609,10 @@ mod tests {
         sink.run_events(vec![event.into()]).await.unwrap();
 
         let event = collect_n(source, 1).await.remove(0);
-        assert_eq!(event.as_log()[log_schema().message_key()], "hello".into());
+        assert_eq!(
+            event.as_log()[log_schema().message_key().unwrap().to_string()],
+            "hello".into()
+        );
         assert!(event.metadata().splunk_hec_token().is_none());
     }
 
@@ -1598,17 +1625,14 @@ mod tests {
             assert_eq!(200, post(address, "services/collector/raw", message).await);
 
             let event = collect_n(source, 1).await.remove(0);
-            assert_eq!(event.as_log()[log_schema().message_key()], message.into());
+            assert_eq!(
+                event.as_log()[log_schema().message_key().unwrap().to_string()],
+                message.into()
+            );
             assert_eq!(event.as_log()[&super::CHANNEL], "channel".into());
-            assert!(event
-                .as_log()
-                .get((
-                    lookup::PathPrefix::Event,
-                    log_schema().timestamp_key().unwrap()
-                ))
-                .is_some());
+            assert!(event.as_log().get_timestamp().is_some());
             assert_eq!(
-                event.as_log()[log_schema().source_type_key()],
+                event.as_log()[log_schema().source_type_key().unwrap().to_string()],
                 "splunk_hec".into()
             );
             assert!(event.metadata().splunk_hec_token().is_none());
@@ -1625,17 +1649,14 @@ mod tests {
             assert_eq!(200, post(address, "services/collector", message).await);
 
             let event = collect_n(source, 1).await.remove(0);
-            assert_eq!(event.as_log()[log_schema().message_key()], "root".into());
+            assert_eq!(
+                event.as_log()[log_schema().message_key().unwrap().to_string()],
+                "root".into()
+            );
             assert_eq!(event.as_log()[&super::CHANNEL], "channel".into());
-            assert!(event
-                .as_log()
-                .get((
-                    lookup::PathPrefix::Event,
-                    log_schema().timestamp_key().unwrap()
-                ))
-                .is_some());
+            assert!(event.as_log().get_timestamp().is_some());
             assert_eq!(
-                event.as_log()[log_schema().source_type_key()],
+                event.as_log()[log_schema().source_type_key().unwrap().to_string()],
                 "splunk_hec".into()
             );
             assert!(event.metadata().splunk_hec_token().is_none());
@@ -1682,7 +1703,10 @@ mod tests {
             );
 
             let event = collect_n(source, 1).await.remove(0);
-            assert_eq!(event.as_log()[log_schema().host_key()], "10.0.0.1".into());
+            assert_eq!(
+                event.as_log()[log_schema().host_key().unwrap().to_string().as_str()],
+                "10.0.0.1".into()
+            );
         })
         .await;
     }
@@ -1705,7 +1729,10 @@ mod tests {
             );
 
             let event = collect_n(source, 1).await.remove(0);
-            assert_eq!(event.as_log()[log_schema().host_key()], "10.1.0.2".into());
+            assert_eq!(
+                event.as_log()[log_schema().host_key().unwrap().to_string().as_str()],
+                "10.1.0.2".into()
+            );
         })
         .await;
     }
@@ -1728,7 +1755,10 @@ mod tests {
             );
 
             let event = collect_n(source, 1).await.remove(0);
-            assert_eq!(event.as_log()[log_schema().host_key()], "10.0.0.1".into());
+            assert_eq!(
+                event.as_log()[log_schema().host_key().unwrap().to_string().as_str()],
+                "10.0.0.1".into()
+            );
         })
         .await;
     }
@@ -1846,7 +1876,10 @@ mod tests {
 
             let event = channel_n(vec![message], sink, source).await.remove(0);
 
-            assert_eq!(event.as_log()[log_schema().message_key()], message.into());
+            assert_eq!(
+                event.as_log()[log_schema().message_key().unwrap().to_string()],
+                message.into()
+            );
             assert_eq!(
                 &event.metadata().splunk_hec_token().as_ref().unwrap()[..],
                 TOKEN
@@ -1864,17 +1897,14 @@ mod tests {
             assert_eq!(200, post(address, "services/collector/raw", message).await);
 
             let event = collect_n(source, 1).await.remove(0);
-            assert_eq!(event.as_log()[log_schema().message_key()], message.into());
+            assert_eq!(
+                event.as_log()[log_schema().message_key().unwrap().to_string()],
+                message.into()
+            );
             assert_eq!(event.as_log()[&super::CHANNEL], "channel".into());
-            assert!(event
-                .as_log()
-                .get((
-                    lookup::PathPrefix::Event,
-                    log_schema().timestamp_key().unwrap()
-                ))
-                .is_some());
+            assert!(event.as_log().get_timestamp().is_some());
             assert_eq!(
-                event.as_log()[log_schema().source_type_key()],
+                event.as_log()[log_schema().source_type_key().unwrap().to_string()],
                 "splunk_hec".into()
             );
             assert_eq!(
@@ -1900,7 +1930,10 @@ mod tests {
 
             let event = channel_n(vec![message], sink, source).await.remove(0);
 
-            assert_eq!(event.as_log()[log_schema().message_key()], message.into());
+            assert_eq!(
+                event.as_log()[log_schema().message_key().unwrap().to_string()],
+                message.into()
+            );
             assert!(event.metadata().splunk_hec_token().is_none());
         })
         .await;
@@ -1921,7 +1954,10 @@ mod tests {
 
             let event = channel_n(vec![message], sink, source).await.remove(0);
 
-            assert_eq!(event.as_log()[log_schema().message_key()], message.into());
+            assert_eq!(
+                event.as_log()[log_schema().message_key().unwrap().to_string()],
+                message.into()
+            );
             assert_eq!(
                 &event.metadata().splunk_hec_token().as_ref().unwrap()[..],
                 TOKEN
@@ -1942,16 +1978,13 @@ mod tests {
             );
 
             let event = collect_n(source, 1).await.remove(0);
-            assert_eq!(event.as_log()[log_schema().message_key()], "first".into());
-            assert!(event
-                .as_log()
-                .get((
-                    lookup::PathPrefix::Event,
-                    log_schema().timestamp_key().unwrap()
-                ))
-                .is_some());
             assert_eq!(
-                event.as_log()[log_schema().source_type_key()],
+                event.as_log()[log_schema().message_key().unwrap().to_string()],
+                "first".into()
+            );
+            assert!(event.as_log().get_timestamp().is_some());
+            assert_eq!(
+                event.as_log()[log_schema().source_type_key().unwrap().to_string()],
                 "splunk_hec".into()
             );
         })
@@ -1972,16 +2005,13 @@ mod tests {
             );
 
             let event = collect_n(source, 1).await.remove(0);
-            assert_eq!(event.as_log()[log_schema().message_key()], "first".into());
-            assert!(event
-                .as_log()
-                .get((
-                    lookup::PathPrefix::Event,
-                    log_schema().timestamp_key().unwrap()
-                ))
-                .is_some());
             assert_eq!(
-                event.as_log()[log_schema().source_type_key()],
+                event.as_log()[log_schema().message_key().unwrap().to_string()],
+                "first".into()
+            );
+            assert!(event.as_log().get_timestamp().is_some());
+            assert_eq!(
+                event.as_log()[log_schema().source_type_key().unwrap().to_string()],
                 "splunk_hec".into()
             );
         })
@@ -2000,16 +2030,13 @@ mod tests {
             );
 
             let event = collect_n(source, 1).await.remove(0);
-            assert_eq!(event.as_log()[log_schema().message_key()], "first".into());
-            assert!(event
-                .as_log()
-                .get((
-                    lookup::PathPrefix::Event,
-                    log_schema().timestamp_key().unwrap()
-                ))
-                .is_some());
             assert_eq!(
-                event.as_log()[log_schema().source_type_key()],
+                event.as_log()[log_schema().message_key().unwrap().to_string()],
+                "first".into()
+            );
+            assert!(event.as_log().get_timestamp().is_some());
+            assert_eq!(
+                event.as_log()[log_schema().source_type_key().unwrap().to_string()],
                 "splunk_hec".into()
             );
         })
@@ -2038,7 +2065,7 @@ mod tests {
         assert_eq!(event.as_log()["bool"], true.into());
         assert!(event.as_log().get((lookup::PathPrefix::Event, log_schema().timestamp_key().unwrap())).is_some());
         assert_eq!(
-            event.as_log()[log_schema().source_type_key()],
+            event.as_log()[log_schema().source_type_key().unwrap().to_string()],
             "splunk_hec".into()
         );
     }).await;
@@ -2058,19 +2085,19 @@ mod tests {
         let events = collect_n(source, 3).await;
 
         assert_eq!(
-            events[0].as_log()[log_schema().message_key()],
+            events[0].as_log()[log_schema().message_key().unwrap().to_string()],
             "first".into()
         );
         assert_eq!(events[0].as_log()[&super::SOURCE], "main".into());
 
         assert_eq!(
-            events[1].as_log()[log_schema().message_key()],
+            events[1].as_log()[log_schema().message_key().unwrap().to_string()],
             "second".into()
         );
         assert_eq!(events[1].as_log()[&super::SOURCE], "main".into());
 
         assert_eq!(
-            events[2].as_log()[log_schema().message_key()],
+            events[2].as_log()[log_schema().message_key().unwrap().to_string()],
             "third".into()
         );
         assert_eq!(events[2].as_log()[&super::SOURCE], "secondary".into());
@@ -2130,8 +2157,14 @@ mod tests {
 
             let event = channel_n(vec![message], sink, source).await.remove(0);
 
-            assert_eq!(event.as_log()[log_schema().message_key()], message.into());
-            assert!(event.as_log().get(log_schema().host_key()).is_none());
+            assert_eq!(
+                event.as_log()[log_schema().message_key().unwrap().to_string()],
+                message.into()
+            );
+            assert!(event
+                .as_log()
+                .get((PathPrefix::Event, log_schema().host_key().unwrap()))
+                .is_none());
         })
         .await;
     }
diff --git a/src/sources/syslog.rs b/src/sources/syslog.rs
index 728cda24a6c46..c674939daef23 100644
--- a/src/sources/syslog.rs
+++ b/src/sources/syslog.rs
@@ -10,10 +10,7 @@ use codecs::{
 };
 use futures::StreamExt;
 use listenfd::ListenFd;
-use lookup::{
-    lookup_v2::{parse_value_path, OptionalValuePath},
-    path, OwnedValuePath, PathPrefix,
-};
+use lookup::{lookup_v2::OptionalValuePath, path, OwnedValuePath};
 use smallvec::SmallVec;
 use tokio_util::udp::UdpFramed;
 use vector_config::configurable_component;
@@ -163,10 +160,11 @@ impl GenerateConfig for SyslogConfig {
 impl SourceConfig for SyslogConfig {
     async fn build(&self, cx: SourceContext) -> crate::Result<super::Source> {
         let log_namespace = cx.log_namespace(self.log_namespace);
-        let host_key = self.host_key.clone().map_or_else(
-            || parse_value_path(log_schema().host_key()).ok(),
-            |k| k.path,
-        );
+        let host_key = self
+            .host_key
+            .clone()
+            .and_then(|k| k.path)
+            .or(log_schema().host_key().cloned());
 
         match self.mode.clone() {
             Mode::Tcp {
@@ -425,9 +423,7 @@ fn enrich_syslog_event(
             .get("timestamp")
             .and_then(|timestamp| timestamp.as_timestamp().cloned())
             .unwrap_or_else(Utc::now);
-        if let Some(timestamp_key) = log_schema().timestamp_key() {
-            log.insert((PathPrefix::Event, timestamp_key), timestamp);
-        }
+        log.maybe_insert(log_schema().timestamp_key_target_path(), timestamp);
     }
 
     trace!(
@@ -811,7 +807,10 @@ mod test {
                     .single()
                     .expect("invalid timestamp"),
             );
-            expected.insert(log_schema().source_type_key(), "syslog");
+            expected.insert(
+                log_schema().source_type_key_target_path().unwrap(),
+                "syslog",
+            );
             expected.insert("host", "74794bfb6795");
             expected.insert("hostname", "74794bfb6795");
 
@@ -861,9 +860,15 @@ mod test {
                     .single()
                     .expect("invalid timestamp"),
             );
-            expected.insert(log_schema().host_key(), "74794bfb6795");
+            expected.insert(
+                log_schema().host_key().unwrap().to_string().as_str(),
+                "74794bfb6795",
+            );
             expected.insert("hostname", "74794bfb6795");
-            expected.insert(log_schema().source_type_key(), "syslog");
+            expected.insert(
+                log_schema().source_type_key_target_path().unwrap(),
+                "syslog",
+            );
             expected.insert("severity", "notice");
             expected.insert("facility", "user");
             expected.insert("version", 1);
@@ -1002,8 +1007,14 @@ mod test {
                 ),
                 expected_date,
             );
-            expected.insert(log_schema().host_key(), "74794bfb6795");
-            expected.insert(log_schema().source_type_key(), "syslog");
+            expected.insert(
+                log_schema().host_key().unwrap().to_string().as_str(),
+                "74794bfb6795",
+            );
+            expected.insert(
+                log_schema().source_type_key_target_path().unwrap(),
+                "syslog",
+            );
             expected.insert("hostname", "74794bfb6795");
             expected.insert("severity", "notice");
             expected.insert("facility", "user");
@@ -1048,7 +1059,10 @@ mod test {
                 ),
                 expected_date,
             );
-            expected.insert(log_schema().source_type_key(), "syslog");
+            expected.insert(
+                log_schema().source_type_key_target_path().unwrap(),
+                "syslog",
+            );
             expected.insert("host", "74794bfb6795");
             expected.insert("hostname", "74794bfb6795");
             expected.insert("severity", "info");
@@ -1085,7 +1099,10 @@ mod test {
                     .and_then(|t| t.with_nanosecond(605_850 * 1000))
                     .expect("invalid timestamp"),
             );
-            expected.insert(log_schema().source_type_key(), "syslog");
+            expected.insert(
+                log_schema().source_type_key_target_path().unwrap(),
+                "syslog",
+            );
             expected.insert("host", "74794bfb6795");
             expected.insert("hostname", "74794bfb6795");
             expected.insert("severity", "info");
diff --git a/src/sources/util/framestream.rs b/src/sources/util/framestream.rs
index 8bae468a85241..287fb0e583585 100644
--- a/src/sources/util/framestream.rs
+++ b/src/sources/util/framestream.rs
@@ -350,7 +350,7 @@ pub trait FrameHandler {
     fn socket_send_buffer_size(&self) -> Option<usize>;
     fn host_key(&self) -> &Option<OwnedValuePath>;
     fn timestamp_key(&self) -> Option<&OwnedValuePath>;
-    fn source_type_key(&self) -> &str;
+    fn source_type_key(&self) -> Option<&OwnedValuePath>;
 }
 
 /**
@@ -630,7 +630,7 @@ mod test {
         extra_task_handling_routine: F,
         host_key: Option<OwnedValuePath>,
         timestamp_key: Option<OwnedValuePath>,
-        source_type_key: String,
+        source_type_key: Option<OwnedValuePath>,
         log_namespace: LogNamespace,
     }
 
@@ -648,7 +648,7 @@ mod test {
                 extra_task_handling_routine: extra_routine,
                 host_key: Some(owned_value_path!("test_framestream")),
                 timestamp_key: Some(owned_value_path!("my_timestamp")),
-                source_type_key: "source_type".to_string(),
+                source_type_key: Some(owned_value_path!("source_type")),
                 log_namespace: LogNamespace::Legacy,
             }
         }
@@ -665,7 +665,10 @@ mod test {
         fn handle_event(&self, received_from: Option<Bytes>, frame: Bytes) -> Option<Event> {
             let mut log_event = LogEvent::from(frame);
 
-            log_event.insert(log_schema().source_type_key(), "framestream");
+            log_event.insert(
+                log_schema().source_type_key_target_path().unwrap(),
+                "framestream",
+            );
             if let Some(host) = received_from {
                 self.log_namespace.insert_source_metadata(
                     "framestream",
@@ -711,8 +714,8 @@ mod test {
             self.timestamp_key.as_ref()
         }
 
-        fn source_type_key(&self) -> &str {
-            self.source_type_key.as_str()
+        fn source_type_key(&self) -> Option<&OwnedValuePath> {
+            self.source_type_key.as_ref()
         }
     }
 
@@ -851,11 +854,11 @@ mod test {
         send_control_frame(&mut sock_sink, create_control_frame(ControlHeader::Stop)).await;
 
         assert_eq!(
-            events[0].as_log()[&log_schema().message_key()],
+            events[0].as_log()[log_schema().message_key().unwrap().to_string()],
             "hello".into(),
         );
         assert_eq!(
-            events[1].as_log()[&log_schema().message_key()],
+            events[1].as_log()[log_schema().message_key().unwrap().to_string()],
             "world".into(),
         );
 
@@ -900,12 +903,13 @@ mod test {
         //5 - send STOP frame
         send_control_frame(&mut sock_sink, create_control_frame(ControlHeader::Stop)).await;
 
+        let message_key = log_schema().message_key().unwrap().to_string();
         assert!(events
             .iter()
-            .any(|e| e.as_log()[&log_schema().message_key()] == "hello".into()));
+            .any(|e| e.as_log()[&message_key] == "hello".into()));
         assert!(events
             .iter()
-            .any(|e| e.as_log()[&log_schema().message_key()] == "world".into()));
+            .any(|e| e.as_log()[&message_key] == "world".into()));
 
         drop(sock_stream); //explicitly drop the stream so we don't get warnings about not using it
 
@@ -1022,11 +1026,11 @@ mod test {
         send_control_frame(&mut sock_sink, create_control_frame(ControlHeader::Stop)).await;
 
         assert_eq!(
-            events[0].as_log()[&log_schema().message_key()],
+            events[0].as_log()[log_schema().message_key().unwrap().to_string()],
             "hello".into(),
         );
         assert_eq!(
-            events[1].as_log()[&log_schema().message_key()],
+            events[1].as_log()[log_schema().message_key().unwrap().to_string()],
             "world".into(),
         );
 
@@ -1062,11 +1066,11 @@ mod test {
         send_control_frame(&mut sock_sink, create_control_frame(ControlHeader::Stop)).await;
 
         assert_eq!(
-            events[0].as_log()[&log_schema().message_key()],
+            events[0].as_log()[log_schema().message_key().unwrap().to_string()],
             "hello".into(),
         );
         assert_eq!(
-            events[1].as_log()[&log_schema().message_key()],
+            events[1].as_log()[log_schema().message_key().unwrap().to_string()],
             "world".into(),
         );
 
diff --git a/src/sources/util/grpc/mod.rs b/src/sources/util/grpc/mod.rs
index 2795ed0d2d0fb..68c54c5d2a0d6 100644
--- a/src/sources/util/grpc/mod.rs
+++ b/src/sources/util/grpc/mod.rs
@@ -48,7 +48,7 @@ where
         // use independent `tower` layers when the request body itself (the body type, not the actual bytes) must be
         // modified or wrapped.. so instead of a cleaner design, we're opting here to bake it all together until the
         // crates are sufficiently flexible for us to craft a better design.
-        .layer(DecompressionAndMetricsLayer::default())
+        .layer(DecompressionAndMetricsLayer)
         .add_service(service)
         .serve_with_incoming_shutdown(stream, shutdown.map(|token| tx.send(token).unwrap()))
         .in_current_span()
diff --git a/src/sources/util/http_client.rs b/src/sources/util/http_client.rs
index 08f14b878608f..25678a90ae344 100644
--- a/src/sources/util/http_client.rs
+++ b/src/sources/util/http_client.rs
@@ -25,7 +25,7 @@ use crate::{
     },
     sources::util::http::HttpMethod,
     tls::TlsSettings,
-    Error, SourceSender,
+    SourceSender,
 };
 use vector_common::shutdown::ShutdownSignal;
 use vector_core::{config::proxy::ProxyConfig, event::Event, EstimatedJsonEncodedSizeOf};
@@ -36,6 +36,8 @@ pub(crate) struct GenericHttpClientInputs {
     pub urls: Vec<Uri>,
     /// Interval between calls.
     pub interval: Duration,
+    /// Timeout for the HTTP request.
+    pub timeout: Duration,
     /// Map of Header+Value to apply to HTTP request.
     pub headers: HashMap<String, Vec<String>>,
     /// Content type of the HTTP request, determined by the source.
@@ -51,6 +53,11 @@ pub(crate) const fn default_interval() -> Duration {
     Duration::from_secs(15)
 }
 
+/// The default timeout for the HTTP request if none is configured.
+pub(crate) const fn default_timeout() -> Duration {
+    Duration::from_secs(5)
+}
+
 /// Builds the context, allowing the source-specific implementation to leverage data from the
 /// config and the current HTTP request.
 pub(crate) trait HttpClientBuilder {
@@ -101,6 +108,17 @@ pub(crate) fn build_url(uri: &Uri, query: &HashMap<String, Vec<String>>) -> Uri
         .expect("Failed to build URI from parsed arguments")
 }
 
+/// Warns if the scrape timeout is greater than the scrape interval.
+pub(crate) fn warn_if_interval_too_low(timeout: Duration, interval: Duration) {
+    if timeout > interval {
+        warn!(
+            interval_secs = %interval.as_secs_f64(),
+            timeout_secs = %timeout.as_secs_f64(),
+            message = "Having a scrape timeout that exceeds the scrape interval can lead to excessive resource consumption.",
+        );
+    }
+}
+
 /// Calls one or more urls at an interval.
 ///   - The HTTP request is built per the options in provided generic inputs.
 ///   - The HTTP response is decoded/parsed into events by the specific context.
@@ -114,15 +132,16 @@ pub(crate) async fn call<
     mut out: SourceSender,
     http_method: HttpMethod,
 ) -> Result<(), ()> {
+    // Building the HttpClient should not fail as it is just setting up the client with the
+    // proxy and tls settings.
+    let client =
+        HttpClient::new(inputs.tls.clone(), &inputs.proxy).expect("Building HTTP client failed");
     let mut stream = IntervalStream::new(tokio::time::interval(inputs.interval))
         .take_until(inputs.shutdown)
         .map(move |_| stream::iter(inputs.urls.clone()))
         .flatten()
         .map(move |url| {
-            // Building the HttpClient should not fail as it is just setting up the client with the
-            // proxy and tls settings.
-            let client = HttpClient::new(inputs.tls.clone(), &inputs.proxy)
-                .expect("Building HTTP client failed");
+            let client = client.clone();
             let endpoint = url.to_string();
 
             let context_builder = context_builder.clone();
@@ -157,9 +176,18 @@ pub(crate) async fn call<
             }
 
             let start = Instant::now();
-            client
-                .send(request)
-                .map_err(Error::from)
+            tokio::time::timeout(inputs.timeout, client.send(request))
+                .then(move |result| async move {
+                    match result {
+                        Ok(Ok(response)) => Ok(response),
+                        Ok(Err(error)) => Err(error.into()),
+                        Err(_) => Err(format!(
+                            "Timeout error: request exceeded {}s",
+                            inputs.timeout.as_secs_f64()
+                        )
+                        .into()),
+                    }
+                })
                 .and_then(|response| async move {
                     let (header, body) = response.into_parts();
                     let body = hyper::body::to_bytes(body).await?;
@@ -224,8 +252,9 @@ pub(crate) async fn call<
                     })
                 })
                 .flatten()
+                .boxed()
         })
-        .flatten()
+        .flatten_unordered(None)
         .boxed();
 
     match out.send_event_stream(&mut stream).await {
diff --git a/src/sources/util/message_decoding.rs b/src/sources/util/message_decoding.rs
index 3d9b959db678f..379f8c1b09583 100644
--- a/src/sources/util/message_decoding.rs
+++ b/src/sources/util/message_decoding.rs
@@ -33,7 +33,7 @@ pub fn decode_message<'a>(
                 if let Event::Log(ref mut log) = event {
                     log_namespace.insert_vector_metadata(
                         log,
-                        Some(schema.source_type_key()),
+                        schema.source_type_key(),
                         path!("source_type"),
                         Bytes::from(source_type),
                     );
diff --git a/src/sources/vector/mod.rs b/src/sources/vector/mod.rs
index 44b0921d75bcd..7c680b4f9a49d 100644
--- a/src/sources/vector/mod.rs
+++ b/src/sources/vector/mod.rs
@@ -181,7 +181,9 @@ impl SourceConfig for VectorConfig {
             acknowledgements,
             log_namespace,
         })
-        .accept_compressed(tonic::codec::CompressionEncoding::Gzip);
+        .accept_compressed(tonic::codec::CompressionEncoding::Gzip)
+        // Tonic added a default of 4MB in 0.9. This replaces the old behavior.
+        .max_decoding_message_size(usize::MAX);
 
         let source =
             run_grpc_server(self.address, tls_settings, service, cx.shutdown).map_err(|error| {
@@ -273,15 +275,14 @@ mod test {
 #[cfg(feature = "sinks-vector")]
 #[cfg(test)]
 mod tests {
-    use vector_common::assert_event_data_eq;
-    use vector_core::config::log_schema;
-
     use super::*;
     use crate::{
         config::{SinkConfig as _, SinkContext},
         sinks::vector::VectorConfig as SinkConfig,
         test_util, SourceSender,
     };
+    use vector_common::assert_event_data_eq;
+    use vector_core::config::log_schema;
 
     async fn run_test(vector_source_config_str: &str, addr: SocketAddr) {
         let config = format!(r#"address = "{}""#, addr);
@@ -306,9 +307,10 @@ mod tests {
         sink.run(stream).await.unwrap();
 
         for event in &mut events {
-            event
-                .as_mut_log()
-                .insert(log_schema().source_type_key(), "vector");
+            event.as_mut_log().insert(
+                log_schema().source_type_key_target_path().unwrap(),
+                "vector",
+            );
         }
 
         let output = test_util::collect_ready(rx).await;
diff --git a/src/tap/cmd.rs b/src/tap/cmd.rs
index 1b7c0a999b281..f06529ed77b4b 100644
--- a/src/tap/cmd.rs
+++ b/src/tap/cmd.rs
@@ -12,60 +12,49 @@ use vector_api_client::{
     Client,
 };
 
-use crate::{
-    config,
-    signal::{SignalRx, SignalTo},
-};
+use crate::signal::{SignalRx, SignalTo};
 
 /// Delay (in milliseconds) before attempting to reconnect to the Vector API
 const RECONNECT_DELAY: u64 = 5000;
 
 /// CLI command func for issuing 'tap' queries, and communicating with a local/remote
 /// Vector API server via HTTP/WebSockets.
-pub(crate) async fn cmd(opts: &super::Opts, mut signal_rx: SignalRx) -> exitcode::ExitCode {
-    // Use the provided URL as the Vector GraphQL API server, or default to the local port
-    // provided by the API config. This will work despite `api` and `api-client` being distinct
-    // features; the config is available even if `api` is disabled.
-    let mut url = opts.url.clone().unwrap_or_else(|| {
-        let addr = config::api::default_address().unwrap();
-        Url::parse(&format!("http://{}/graphql", addr))
-            .expect("Couldn't parse default API URL. Please report this.")
-    });
-
+pub(crate) async fn cmd(opts: &super::Opts, signal_rx: SignalRx) -> exitcode::ExitCode {
+    let url = opts.url();
     // Return early with instructions for enabling the API if the endpoint isn't reachable
     // via a healthcheck.
-    if Client::new_with_healthcheck(url.clone()).await.is_none() {
+    let client = Client::new(url.clone());
+    #[allow(clippy::print_stderr)]
+    if client.healthcheck().await.is_err() {
+        eprintln!(
+            indoc::indoc! {"
+            Vector API server isn't reachable ({}).
+
+            Have you enabled the API?
+
+            To enable the API, add the following to your `vector.toml` config file:
+
+            [api]
+                enabled = true"},
+            url
+        );
         return exitcode::UNAVAILABLE;
     }
 
-    // Change the HTTP schema to WebSockets.
-    url.set_scheme(match url.scheme() {
-        "https" => "wss",
-        _ => "ws",
-    })
-    .expect("Couldn't build WebSocket URL. Please report.");
-
-    // If no patterns are provided, tap all components' outputs
-    let outputs_patterns = if opts.component_id_patterns.is_empty()
-        && opts.outputs_of.is_empty()
-        && opts.inputs_of.is_empty()
-    {
-        vec!["*".to_string()]
-    } else {
-        opts.outputs_of
-            .iter()
-            .cloned()
-            .chain(opts.component_id_patterns.iter().cloned())
-            .collect()
-    };
+    tap(opts, signal_rx).await
+}
 
+/// Observe event flow from specified components
+pub async fn tap(opts: &super::Opts, mut signal_rx: SignalRx) -> exitcode::ExitCode {
+    let subscription_url = opts.web_socket_url();
     let formatter = EventFormatter::new(opts.meta, opts.format);
+    let outputs_patterns = opts.outputs_patterns();
 
     loop {
         tokio::select! {
             biased;
-            Ok(SignalTo::Shutdown | SignalTo::Quit) = signal_rx.recv() => break,
-            status = run(url.clone(), opts, outputs_patterns.clone(), formatter.clone()) => {
+            Ok(SignalTo::Shutdown(_) | SignalTo::Quit) = signal_rx.recv() => break,
+            status = run(subscription_url.clone(), opts, outputs_patterns.clone(), formatter.clone()) => {
                 if status == exitcode::UNAVAILABLE || status == exitcode::TEMPFAIL && !opts.no_reconnect {
                     #[allow(clippy::print_stderr)]
                     {
@@ -93,7 +82,7 @@ async fn run(
         Err(e) => {
             #[allow(clippy::print_stderr)]
             {
-                eprintln!("[tap] Couldn't connect to Vector API via WebSockets: {}", e);
+                eprintln!("[tap] Couldn't connect to API via WebSockets: {}", e);
             }
             return exitcode::UNAVAILABLE;
         }
diff --git a/src/tap/mod.rs b/src/tap/mod.rs
index 5864660b444f9..81b4d5a8d5733 100644
--- a/src/tap/mod.rs
+++ b/src/tap/mod.rs
@@ -1,10 +1,15 @@
+//! Tap subcommand
 mod cmd;
 
 use clap::Parser;
 pub(crate) use cmd::cmd;
+pub use cmd::tap;
 use url::Url;
 use vector_api_client::gql::TapEncodingFormat;
 
+use crate::config::api::default_graphql_url;
+
+/// Tap options
 #[derive(Parser, Debug, Clone)]
 #[command(rename_all = "kebab-case")]
 pub struct Opts {
@@ -12,7 +17,7 @@ pub struct Opts {
     #[arg(default_value = "500", short = 'i', long)]
     interval: u32,
 
-    /// Vector GraphQL API server endpoint
+    /// GraphQL API server endpoint
     #[arg(short, long)]
     url: Option<Url>,
 
@@ -44,7 +49,45 @@ pub struct Opts {
     #[arg(short, long)]
     meta: bool,
 
-    /// Whether to reconnect if the underlying Vector API connection drops. By default, tap will attempt to reconnect if the connection drops.
+    /// Whether to reconnect if the underlying API connection drops. By default, tap will attempt to reconnect if the connection drops.
     #[arg(short, long)]
     no_reconnect: bool,
 }
+
+impl Opts {
+    /// Component ID patterns to tap
+    ///
+    /// If no patterns are provided, tap all components' outputs
+    pub fn outputs_patterns(&self) -> Vec<String> {
+        if self.component_id_patterns.is_empty()
+            && self.outputs_of.is_empty()
+            && self.inputs_of.is_empty()
+        {
+            vec!["*".to_string()]
+        } else {
+            self.outputs_of
+                .iter()
+                .cloned()
+                .chain(self.component_id_patterns.iter().cloned())
+                .collect()
+        }
+    }
+
+    /// Use the provided URL as the Vector GraphQL API server, or default to the local port
+    /// provided by the API config.
+    pub fn url(&self) -> Url {
+        self.url.clone().unwrap_or_else(default_graphql_url)
+    }
+
+    /// URL with scheme set to WebSockets
+    pub fn web_socket_url(&self) -> Url {
+        let mut url = self.url();
+        url.set_scheme(match url.scheme() {
+            "https" => "wss",
+            _ => "ws",
+        })
+        .expect("Couldn't build WebSocket URL. Please report.");
+
+        url
+    }
+}
diff --git a/src/template.rs b/src/template.rs
index 7d322b841a126..e1cddbab45b9b 100644
--- a/src/template.rs
+++ b/src/template.rs
@@ -7,7 +7,6 @@ use chrono::{
     Utc,
 };
 use lookup::lookup_v2::parse_target_path;
-use lookup::PathPrefix;
 use once_cell::sync::Lazy;
 use regex::Regex;
 use snafu::Snafu;
@@ -168,13 +167,17 @@ impl Template {
                 Part::Reference(key) => {
                     out.push_str(
                         &match event {
-                            EventRef::Log(log) => log.get(&**key).map(Value::to_string_lossy),
+                            EventRef::Log(log) => log
+                                .parse_path_and_get_value(key)
+                                .ok()
+                                .and_then(|v| v.map(Value::to_string_lossy)),
                             EventRef::Metric(metric) => {
                                 render_metric_field(key, metric).map(Cow::Borrowed)
                             }
-                            EventRef::Trace(trace) => {
-                                trace.get(key.as_str()).map(Value::to_string_lossy)
-                            }
+                            EventRef::Trace(trace) => trace
+                                .parse_path_and_get_value(key)
+                                .ok()
+                                .and_then(|v| v.map(Value::to_string_lossy)),
                         }
                         .unwrap_or_else(|| {
                             missing_keys.push(key.to_owned());
@@ -343,18 +346,24 @@ fn render_metric_field<'a>(key: &str, metric: &'a Metric) -> Option<&'a str> {
 
 fn render_timestamp(items: &ParsedStrftime, event: EventRef<'_>) -> String {
     match event {
-        EventRef::Log(log) => log_schema().timestamp_key().and_then(|timestamp_key| {
-            log.get((PathPrefix::Event, timestamp_key))
-                .and_then(Value::as_timestamp)
-                .copied()
-        }),
+        EventRef::Log(log) => log_schema()
+            .timestamp_key_target_path()
+            .and_then(|timestamp_key| {
+                log.get(timestamp_key)
+                    .and_then(Value::as_timestamp)
+                    .copied()
+            }),
         EventRef::Metric(metric) => metric.timestamp(),
-        EventRef::Trace(trace) => log_schema().timestamp_key().and_then(|timestamp_key| {
-            trace
-                .get((PathPrefix::Event, timestamp_key))
-                .and_then(Value::as_timestamp)
-                .copied()
-        }),
+        EventRef::Trace(trace) => {
+            log_schema()
+                .timestamp_key_target_path()
+                .and_then(|timestamp_key| {
+                    trace
+                        .get(timestamp_key)
+                        .and_then(Value::as_timestamp)
+                        .copied()
+                })
+        }
     }
     .unwrap_or_else(Utc::now)
     .format_with_items(items.as_items())
@@ -505,13 +514,9 @@ mod tests {
             .expect("invalid timestamp");
 
         let mut event = Event::Log(LogEvent::from("hello world"));
-        event.as_mut_log().insert(
-            (
-                lookup::PathPrefix::Event,
-                log_schema().timestamp_key().unwrap(),
-            ),
-            ts,
-        );
+        event
+            .as_mut_log()
+            .insert(log_schema().timestamp_key_target_path().unwrap(), ts);
 
         let template = Template::try_from("abcd-%F").unwrap();
 
@@ -526,13 +531,9 @@ mod tests {
             .expect("invalid timestamp");
 
         let mut event = Event::Log(LogEvent::from("hello world"));
-        event.as_mut_log().insert(
-            (
-                lookup::PathPrefix::Event,
-                log_schema().timestamp_key().unwrap(),
-            ),
-            ts,
-        );
+        event
+            .as_mut_log()
+            .insert(log_schema().timestamp_key_target_path().unwrap(), ts);
 
         let template = Template::try_from("abcd-%F_%T").unwrap();
 
diff --git a/src/test_util/mock/transforms/basic.rs b/src/test_util/mock/transforms/basic.rs
index 94f1860df83fe..e7906351706f9 100644
--- a/src/test_util/mock/transforms/basic.rs
+++ b/src/test_util/mock/transforms/basic.rs
@@ -75,13 +75,11 @@ impl FunctionTransform for BasicTransform {
     fn transform(&mut self, output: &mut OutputBuffer, mut event: Event) {
         match &mut event {
             Event::Log(log) => {
-                let mut v = log
-                    .get(crate::config::log_schema().message_key())
-                    .unwrap()
-                    .to_string_lossy()
-                    .into_owned();
-                v.push_str(&self.suffix);
-                log.insert(crate::config::log_schema().message_key(), Value::from(v));
+                if let Some(message_key) = crate::config::log_schema().message_key_target_path() {
+                    let mut v = log.get(message_key).unwrap().to_string_lossy().into_owned();
+                    v.push_str(&self.suffix);
+                    log.insert(message_key, Value::from(v));
+                }
             }
             Event::Metric(metric) => {
                 let increment = match metric.value() {
@@ -118,13 +116,15 @@ impl FunctionTransform for BasicTransform {
                 }
             }
             Event::Trace(trace) => {
-                let mut v = trace
-                    .get(crate::config::log_schema().message_key())
-                    .unwrap()
-                    .to_string_lossy()
-                    .into_owned();
-                v.push_str(&self.suffix);
-                trace.insert(crate::config::log_schema().message_key(), Value::from(v));
+                if let Some(message_key) = crate::config::log_schema().message_key_target_path() {
+                    let mut v = trace
+                        .get(message_key)
+                        .unwrap()
+                        .to_string_lossy()
+                        .into_owned();
+                    v.push_str(&self.suffix);
+                    trace.insert(message_key, Value::from(v));
+                }
             }
         };
         output.push(event);
diff --git a/src/test_util/mod.rs b/src/test_util/mod.rs
index 48c09fb543a8e..245e46ab66278 100644
--- a/src/test_util/mod.rs
+++ b/src/test_util/mod.rs
@@ -42,6 +42,7 @@ use zstd::Decoder as ZstdDecoder;
 
 use crate::{
     config::{Config, ConfigDiff, GenerateConfig},
+    signal::ShutdownError,
     topology::{self, RunningTopology},
     trace,
 };
@@ -298,7 +299,7 @@ pub fn random_message_object_events_with_stream(
     let events = (0..count)
         .map(|_| {
             let mut event = LogEvent::default();
-            let message_key = log_schema().message_key();
+            let message_key = log_schema().message_key().unwrap().to_string();
             event.insert(
                 format!("{}.one", message_key).as_str(),
                 random_string(len).as_str(),
@@ -711,8 +712,8 @@ pub async fn start_topology(
 ) -> (
     RunningTopology,
     (
-        tokio::sync::mpsc::UnboundedSender<()>,
-        tokio::sync::mpsc::UnboundedReceiver<()>,
+        tokio::sync::mpsc::UnboundedSender<ShutdownError>,
+        tokio::sync::mpsc::UnboundedReceiver<ShutdownError>,
     ),
 ) {
     config.healthchecks.set_require_healthy(require_healthy);
diff --git a/src/top/cmd.rs b/src/top/cmd.rs
index 16aa38126548a..a774ca7bcc448 100644
--- a/src/top/cmd.rs
+++ b/src/top/cmd.rs
@@ -2,8 +2,7 @@ use std::time::Duration;
 
 use chrono::Local;
 use futures_util::future::join_all;
-use tokio::sync::oneshot;
-use url::Url;
+use tokio::sync::{mpsc, oneshot};
 use vector_api_client::{connect_subscription_client, Client};
 
 use super::{
@@ -11,7 +10,6 @@ use super::{
     metrics,
     state::{self, ConnectionStatus, EventType},
 };
-use crate::config;
 
 /// Delay (in milliseconds) before attempting to reconnect to the Vector API
 const RECONNECT_DELAY: u64 = 5000;
@@ -28,88 +26,49 @@ pub async fn cmd(opts: &super::Opts) -> exitcode::ExitCode {
         return exitcode::IOERR;
     }
 
-    // Use the provided URL as the Vector GraphQL API server, or default to the local port
-    // provided by the API config. This will work despite `api` and `api-client` being distinct
-    // features; the config is available even if `api` is disabled
-    let url = opts.url.clone().unwrap_or_else(|| {
-        let addr = config::api::default_address().unwrap();
-        Url::parse(&format!("http://{}/graphql", addr))
-            .expect("Couldn't parse default API URL. Please report this.")
-    });
-
+    let url = opts.url();
     // Create a new API client for connecting to the local/remote Vector instance.
-    let client = match Client::new_with_healthcheck(url.clone()).await {
-        Some(client) => client,
-        None => return exitcode::UNAVAILABLE,
-    };
+    let client = Client::new(url.clone());
+    #[allow(clippy::print_stderr)]
+    if client.healthcheck().await.is_err() {
+        eprintln!(
+            indoc::indoc! {"
+            Vector API server isn't reachable ({}).
 
-    // Create a channel for updating state via event messages
-    let (tx, rx) = tokio::sync::mpsc::channel(20);
-    let state_rx = state::updater(rx).await;
+            Have you enabled the API?
 
-    // Change the HTTP schema to WebSockets
-    let mut ws_url = url.clone();
-    ws_url
-        .set_scheme(match url.scheme() {
-            "https" => "wss",
-            _ => "ws",
-        })
-        .expect("Couldn't build WebSocket URL. Please report.");
+            To enable the API, add the following to your `vector.toml` config file:
 
-    let opts_clone = opts.clone();
+            [api]
+                enabled = true"},
+            url
+        );
+        return exitcode::UNAVAILABLE;
+    }
+
+    top(opts, client, "Vector").await
+}
+
+/// General monitoring
+pub async fn top(opts: &super::Opts, client: Client, dashboard_title: &str) -> exitcode::ExitCode {
+    // Channel for updating state via event messages
+    let (tx, rx) = tokio::sync::mpsc::channel(20);
+    let state_rx = state::updater(rx).await;
+    // Channel for shutdown signal
     let (shutdown_tx, shutdown_rx) = oneshot::channel::<()>();
-    // This task handles reconnecting the subscription client and all
-    // subscriptions in the case of a web socket disconnect
-    let connection = tokio::spawn(async move {
-        loop {
-            // Initialize state. On future reconnects, we re-initialize state in
-            // order to accurately capture added, removed, and edited
-            // components.
-            let state = match metrics::init_components(&client).await {
-                Ok(state) => state,
-                Err(_) => {
-                    tokio::time::sleep(Duration::from_millis(RECONNECT_DELAY)).await;
-                    continue;
-                }
-            };
-            _ = tx.send(EventType::InitializeState(state)).await;
-
-            let subscription_client = match connect_subscription_client(ws_url.clone()).await {
-                Ok(c) => c,
-                Err(_) => {
-                    tokio::time::sleep(Duration::from_millis(RECONNECT_DELAY)).await;
-                    continue;
-                }
-            };
-
-            // Subscribe to updated metrics
-            let finished =
-                metrics::subscribe(subscription_client, tx.clone(), opts_clone.interval as i64);
-
-            _ = tx
-                .send(EventType::ConnectionUpdated(ConnectionStatus::Connected(
-                    Local::now(),
-                )))
-                .await;
-            // Tasks spawned in metrics::subscribe finish when the subscription
-            // streams have completed. Currently, subscription streams only
-            // complete when the underlying web socket connection to the GraphQL
-            // server drops.
-            _ = join_all(finished).await;
-            _ = tx
-                .send(EventType::ConnectionUpdated(
-                    ConnectionStatus::Disconnected(RECONNECT_DELAY),
-                ))
-                .await;
-            if opts_clone.no_reconnect {
-                _ = shutdown_tx.send(());
-                break;
-            }
-        }
-    });
+
+    let connection = tokio::spawn(subscription(opts.clone(), client, tx, shutdown_tx));
 
     // Initialize the dashboard
-    match init_dashboard(url.as_str(), opts, state_rx, shutdown_rx).await {
+    match init_dashboard(
+        dashboard_title,
+        opts.url().as_str(),
+        opts,
+        state_rx,
+        shutdown_rx,
+    )
+    .await
+    {
         Ok(_) => {
             connection.abort();
             exitcode::OK
@@ -117,10 +76,66 @@ pub async fn cmd(opts: &super::Opts) -> exitcode::ExitCode {
         Err(err) => {
             #[allow(clippy::print_stderr)]
             {
-                eprintln!("Encountered error: {}", err);
+                eprintln!("[top] Encountered shutdown error: {}", err);
             }
             connection.abort();
             exitcode::IOERR
         }
     }
 }
+
+// This task handles reconnecting the subscription client and all
+// subscriptions in the case of a web socket disconnect
+async fn subscription(
+    opts: super::Opts,
+    client: Client,
+    tx: mpsc::Sender<EventType>,
+    shutdown_tx: oneshot::Sender<()>,
+) {
+    let ws_url = opts.web_socket_url();
+
+    loop {
+        // Initialize state. On future reconnects, we re-initialize state in
+        // order to accurately capture added, removed, and edited
+        // components.
+        let state = match metrics::init_components(&client).await {
+            Ok(state) => state,
+            Err(_) => {
+                tokio::time::sleep(Duration::from_millis(RECONNECT_DELAY)).await;
+                continue;
+            }
+        };
+        _ = tx.send(EventType::InitializeState(state)).await;
+
+        let subscription_client = match connect_subscription_client(ws_url.clone()).await {
+            Ok(c) => c,
+            Err(_) => {
+                tokio::time::sleep(Duration::from_millis(RECONNECT_DELAY)).await;
+                continue;
+            }
+        };
+
+        // Subscribe to updated metrics
+        let finished = metrics::subscribe(subscription_client, tx.clone(), opts.interval as i64);
+
+        _ = tx
+            .send(EventType::ConnectionUpdated(ConnectionStatus::Connected(
+                Local::now(),
+            )))
+            .await;
+        // Tasks spawned in metrics::subscribe finish when the subscription
+        // streams have completed. Currently, subscription streams only
+        // complete when the underlying web socket connection to the GraphQL
+        // server drops.
+        _ = join_all(finished).await;
+        _ = tx
+            .send(EventType::ConnectionUpdated(
+                ConnectionStatus::Disconnected(RECONNECT_DELAY),
+            ))
+            .await;
+        if opts.no_reconnect {
+            _ = shutdown_tx.send(());
+            break;
+        }
+    }
+}
diff --git a/src/top/dashboard.rs b/src/top/dashboard.rs
index ccf0b49085a5c..7ccaeeb10e2dd 100644
--- a/src/top/dashboard.rs
+++ b/src/top/dashboard.rs
@@ -9,16 +9,16 @@ use crossterm::{
 };
 use num_format::{Locale, ToFormattedString};
 use number_prefix::NumberPrefix;
-use std::io::stdout;
-use tokio::sync::oneshot;
-use tui::{
+use ratatui::{
     backend::{Backend, CrosstermBackend},
     layout::{Alignment, Constraint, Layout, Rect},
     style::{Color, Modifier, Style},
-    text::{Span, Spans},
+    text::{Line, Span},
     widgets::{Block, Borders, Cell, Paragraph, Row, Table, Wrap},
     Frame, Terminal,
 };
+use std::io::stdout;
+use tokio::sync::oneshot;
 
 use super::{
     events::capture_key_press,
@@ -143,11 +143,12 @@ struct Widgets<'a> {
     constraints: Vec<Constraint>,
     url_string: &'a str,
     opts: &'a super::Opts,
+    title: &'a str,
 }
 
 impl<'a> Widgets<'a> {
     /// Creates a new Widgets, containing constraints to re-use across renders.
-    pub fn new(url_string: &'a str, opts: &'a super::Opts) -> Self {
+    pub fn new(title: &'a str, url_string: &'a str, opts: &'a super::Opts) -> Self {
         let constraints = vec![
             Constraint::Length(3),
             Constraint::Max(90),
@@ -158,10 +159,11 @@ impl<'a> Widgets<'a> {
             constraints,
             url_string,
             opts,
+            title,
         }
     }
 
-    /// Renders a title showing 'Vector', and the URL the dashboard is currently connected to.
+    /// Renders a title and the URL the dashboard is currently connected to.
     fn title<B: Backend>(
         &'a self,
         f: &mut Frame<B>,
@@ -178,10 +180,10 @@ impl<'a> Widgets<'a> {
         ];
         text.extend(connection_status.as_ui_spans());
 
-        let text = vec![Spans::from(text)];
+        let text = vec![Line::from(text)];
 
         let block = Block::default().borders(Borders::ALL).title(Span::styled(
-            "Vector",
+            self.title,
             Style::default()
                 .fg(Color::Green)
                 .add_modifier(Modifier::BOLD),
@@ -258,7 +260,7 @@ impl<'a> Widgets<'a> {
                         .into_iter()
                         .map(Cell::from)
                         .collect::<Vec<_>>();
-                    data[1] = Cell::from(id.as_ref());
+                    data[1] = Cell::from(id.as_str());
                     data[5] = Cell::from(sent_events_metric);
                     items.push(Row::new(data).style(Style::default()));
                 }
@@ -310,7 +312,7 @@ impl<'a> Widgets<'a> {
 
     /// Renders a box showing instructions on how to exit from `vector top`.
     fn quit_box<B: Backend>(&self, f: &mut Frame<B>, area: Rect) {
-        let text = vec![Spans::from("To quit, press ESC or 'q'")];
+        let text = vec![Line::from("To quit, press ESC or 'q'")];
 
         let block = Block::default()
             .borders(Borders::ALL)
@@ -353,6 +355,7 @@ pub fn is_tty() -> bool {
 /// as well as entering an 'alternate screen' to overlay the console. This ensures that when
 /// the dashboard is exited, the user's previous terminal session can commence, unaffected.
 pub async fn init_dashboard<'a>(
+    title: &'a str,
     url: &'a str,
     opts: &'a super::Opts,
     mut state_rx: state::StateRx,
@@ -377,7 +380,7 @@ pub async fn init_dashboard<'a>(
     // Clear the screen, readying it for output
     terminal.clear()?;
 
-    let widgets = Widgets::new(url, opts);
+    let widgets = Widgets::new(title, url, opts);
 
     loop {
         tokio::select! {
diff --git a/src/top/mod.rs b/src/top/mod.rs
index 24a0e8b48c99c..790d7c6025dc0 100644
--- a/src/top/mod.rs
+++ b/src/top/mod.rs
@@ -1,3 +1,4 @@
+//! Top subcommand
 mod cmd;
 mod dashboard;
 mod events;
@@ -6,8 +7,13 @@ mod state;
 
 use clap::Parser;
 pub use cmd::cmd;
+pub use cmd::top;
+pub use dashboard::is_tty;
 use url::Url;
 
+use crate::config::api::default_graphql_url;
+
+/// Top options
 #[derive(Parser, Debug, Clone)]
 #[command(rename_all = "kebab-case")]
 pub struct Opts {
@@ -15,7 +21,7 @@ pub struct Opts {
     #[arg(default_value = "1000", short = 'i', long)]
     interval: u32,
 
-    /// Vector GraphQL API server endpoint
+    /// GraphQL API server endpoint
     #[arg(short, long)]
     url: Option<Url>,
 
@@ -23,9 +29,29 @@ pub struct Opts {
     #[arg(short = 'H', long, default_value_t = true)]
     human_metrics: bool,
 
-    /// Whether to reconnect if the underlying Vector API connection drops.
+    /// Whether to reconnect if the underlying API connection drops.
     ///
     /// By default, top will attempt to reconnect if the connection drops.
     #[arg(short, long)]
     no_reconnect: bool,
 }
+
+impl Opts {
+    /// Use the provided URL as the Vector GraphQL API server, or default to the local port
+    /// provided by the API config.
+    pub fn url(&self) -> Url {
+        self.url.clone().unwrap_or_else(default_graphql_url)
+    }
+
+    /// URL with scheme set to WebSockets
+    pub fn web_socket_url(&self) -> Url {
+        let mut url = self.url();
+        url.set_scheme(match url.scheme() {
+            "https" => "wss",
+            _ => "ws",
+        })
+        .expect("Couldn't build WebSocket URL. Please report.");
+
+        url
+    }
+}
diff --git a/src/top/state.rs b/src/top/state.rs
index 8e8d4e51fe770..bf478e43dea8c 100644
--- a/src/top/state.rs
+++ b/src/top/state.rs
@@ -1,11 +1,11 @@
 use std::collections::{BTreeMap, HashMap};
 
 use chrono::{DateTime, Local};
-use tokio::sync::mpsc;
-use tui::{
+use ratatui::{
     style::{Color, Style},
     text::Span,
 };
+use tokio::sync::mpsc;
 use vector_core::internal_event::DEFAULT_OUTPUT;
 
 use crate::config::ComponentKey;
diff --git a/src/topology/controller.rs b/src/topology/controller.rs
index b857f99dcce69..b644c2b1f4ab9 100644
--- a/src/topology/controller.rs
+++ b/src/topology/controller.rs
@@ -15,7 +15,8 @@ use crate::config::enterprise::{
 use crate::internal_events::{
     VectorConfigLoadError, VectorRecoveryError, VectorReloadError, VectorReloaded,
 };
-use crate::{config, topology::RunningTopology};
+
+use crate::{config, signal::ShutdownError, topology::RunningTopology};
 
 #[derive(Clone, Debug)]
 pub struct SharedTopologyController(Arc<Mutex<TopologyController>>);
@@ -53,12 +54,13 @@ impl std::fmt::Debug for TopologyController {
     }
 }
 
+#[derive(Clone, Debug)]
 pub enum ReloadOutcome {
     NoConfig,
     MissingApiKey,
     Success,
     RolledBack,
-    FatalError,
+    FatalError(ShutdownError),
 }
 
 impl TopologyController {
@@ -127,7 +129,7 @@ impl TopologyController {
             Err(()) => {
                 emit!(VectorReloadError);
                 emit!(VectorRecoveryError);
-                ReloadOutcome::FatalError
+                ReloadOutcome::FatalError(ShutdownError::ReloadFailedToRestore)
             }
         }
     }
diff --git a/src/topology/mod.rs b/src/topology/mod.rs
index 6026e64b85c27..438d7266a3513 100644
--- a/src/topology/mod.rs
+++ b/src/topology/mod.rs
@@ -38,6 +38,7 @@ use vector_buffers::topology::channel::{BufferReceiverStream, BufferSender};
 use crate::{
     config::{ComponentKey, Config, ConfigDiff, Inputs, OutputId},
     event::EventArray,
+    signal::ShutdownError,
     topology::{builder::Pieces, task::Task},
 };
 
@@ -84,7 +85,10 @@ pub async fn start_validated(
     mut pieces: Pieces,
 ) -> Option<(
     RunningTopology,
-    (mpsc::UnboundedSender<()>, mpsc::UnboundedReceiver<()>),
+    (
+        mpsc::UnboundedSender<ShutdownError>,
+        mpsc::UnboundedReceiver<ShutdownError>,
+    ),
 )> {
     let (abort_tx, abort_rx) = mpsc::unbounded_channel();
 
@@ -156,7 +160,8 @@ pub(super) fn take_healthchecks(
 
 async fn handle_errors(
     task: impl Future<Output = TaskResult>,
-    abort_tx: mpsc::UnboundedSender<()>,
+    abort_tx: mpsc::UnboundedSender<ShutdownError>,
+    error: impl FnOnce(String) -> ShutdownError,
 ) -> TaskResult {
     AssertUnwindSafe(task)
         .catch_unwind()
@@ -165,7 +170,7 @@ async fn handle_errors(
         .and_then(|res| res)
         .map_err(|e| {
             error!("An error occurred that Vector couldn't handle: {}.", e);
-            _ = abort_tx.send(());
+            _ = abort_tx.send(error(e.to_string()));
             e
         })
 }
diff --git a/src/topology/running.rs b/src/topology/running.rs
index b8758d6a3853f..c6fc947c9cb4e 100644
--- a/src/topology/running.rs
+++ b/src/topology/running.rs
@@ -24,6 +24,7 @@ use crate::{
     config::{ComponentKey, Config, ConfigDiff, HealthcheckOptions, Inputs, OutputId, Resource},
     event::EventArray,
     shutdown::SourceShutdownCoordinator,
+    signal::ShutdownError,
     spawn_named,
     topology::{
         build_or_log_errors, builder,
@@ -46,14 +47,14 @@ pub struct RunningTopology {
     shutdown_coordinator: SourceShutdownCoordinator,
     detach_triggers: HashMap<ComponentKey, DisabledTrigger>,
     pub(crate) config: Config,
-    abort_tx: mpsc::UnboundedSender<()>,
+    abort_tx: mpsc::UnboundedSender<ShutdownError>,
     watch: (WatchTx, WatchRx),
     pub(crate) running: Arc<AtomicBool>,
     graceful_shutdown_duration: Option<Duration>,
 }
 
 impl RunningTopology {
-    pub fn new(config: Config, abort_tx: mpsc::UnboundedSender<()>) -> Self {
+    pub fn new(config: Config, abort_tx: mpsc::UnboundedSender<ShutdownError>) -> Self {
         Self {
             inputs: HashMap::new(),
             inputs_tap_metadata: HashMap::new(),
@@ -872,7 +873,13 @@ impl RunningTopology {
         }
 
         let task_name = format!(">> {} ({})", task.typetag(), task.id());
-        let task = handle_errors(task, self.abort_tx.clone()).instrument(task_span);
+        let task = {
+            let key = key.clone();
+            handle_errors(task, self.abort_tx.clone(), |error| {
+                ShutdownError::SinkAborted { key, error }
+            })
+        }
+        .instrument(task_span);
         let spawned = spawn_named(task, task_name.as_ref());
         if let Some(previous) = self.tasks.insert(key.clone(), spawned) {
             drop(previous); // detach and forget
@@ -909,7 +916,13 @@ impl RunningTopology {
         }
 
         let task_name = format!(">> {} ({}) >>", task.typetag(), task.id());
-        let task = handle_errors(task, self.abort_tx.clone()).instrument(task_span);
+        let task = {
+            let key = key.clone();
+            handle_errors(task, self.abort_tx.clone(), |error| {
+                ShutdownError::TransformAborted { key, error }
+            })
+        }
+        .instrument(task_span);
         let spawned = spawn_named(task, task_name.as_ref());
         if let Some(previous) = self.tasks.insert(key.clone(), spawned) {
             drop(previous); // detach and forget
@@ -947,7 +960,13 @@ impl RunningTopology {
         }
 
         let task_name = format!("{} ({}) >>", task.typetag(), task.id());
-        let task = handle_errors(task, self.abort_tx.clone()).instrument(task_span.clone());
+        let task = {
+            let key = key.clone();
+            handle_errors(task, self.abort_tx.clone(), |error| {
+                ShutdownError::SourceAborted { key, error }
+            })
+        }
+        .instrument(task_span.clone());
         let spawned = spawn_named(task, task_name.as_ref());
         if let Some(previous) = self.tasks.insert(key.clone(), spawned) {
             drop(previous); // detach and forget
@@ -958,7 +977,13 @@ impl RunningTopology {
 
         // Now spawn the actual source task.
         let source_task = new_pieces.source_tasks.remove(key).unwrap();
-        let source_task = handle_errors(source_task, self.abort_tx.clone()).instrument(task_span);
+        let source_task = {
+            let key = key.clone();
+            handle_errors(source_task, self.abort_tx.clone(), |error| {
+                ShutdownError::SourceAborted { key, error }
+            })
+        }
+        .instrument(task_span);
         self.source_tasks
             .insert(key.clone(), spawn_named(source_task, task_name.as_ref()));
     }
diff --git a/src/topology/test/mod.rs b/src/topology/test/mod.rs
index c999151888006..095ea7044d196 100644
--- a/src/topology/test/mod.rs
+++ b/src/topology/test/mod.rs
@@ -67,9 +67,12 @@ fn basic_config_with_sink_failing_healthcheck() -> Config {
 }
 
 fn into_message(event: Event) -> String {
+    let message_key = crate::config::log_schema()
+        .message_key_target_path()
+        .unwrap();
     event
         .as_log()
-        .get(crate::config::log_schema().message_key())
+        .get(message_key)
         .unwrap()
         .to_string_lossy()
         .into_owned()
@@ -120,7 +123,10 @@ async fn topology_shutdown_while_active() {
         .flat_map(EventArray::into_events)
     {
         assert_eq!(
-            event.as_log()[&crate::config::log_schema().message_key()],
+            event.as_log()[&crate::config::log_schema()
+                .message_key()
+                .unwrap()
+                .to_string()],
             "test transformed".to_owned().into()
         );
     }
@@ -598,7 +604,6 @@ async fn topology_swap_sink() {
     assert_eq!(vec![event1], res2);
 }
 
-#[ignore] // TODO: issue #2186
 #[tokio::test]
 async fn topology_swap_transform_is_atomic() {
     trace_init();
diff --git a/src/transforms/dedupe.rs b/src/transforms/dedupe.rs
index 6791f41312cf7..f9a67170dcec4 100644
--- a/src/transforms/dedupe.rs
+++ b/src/transforms/dedupe.rs
@@ -100,10 +100,13 @@ fn default_cache_config() -> CacheConfig {
 //   structure can vary significantly. This should probably either become a required field
 //   in the future, or maybe the "semantic meaning" can be utilized here.
 fn default_match_fields() -> Vec<String> {
-    let mut fields = vec![
-        log_schema().host_key().into(),
-        log_schema().message_key().into(),
-    ];
+    let mut fields = Vec::new();
+    if let Some(message_key) = log_schema().message_key() {
+        fields.push(message_key.to_string());
+    }
+    if let Some(host_key) = log_schema().host_key() {
+        fields.push(host_key.to_string());
+    }
     if let Some(timestamp_key) = log_schema().timestamp_key() {
         fields.push(timestamp_key.to_string());
     }
diff --git a/src/transforms/log_to_metric.rs b/src/transforms/log_to_metric.rs
index 613be48ec339f..be598ff6a7cec 100644
--- a/src/transforms/log_to_metric.rs
+++ b/src/transforms/log_to_metric.rs
@@ -405,15 +405,6 @@ impl FunctionTransform for LogToMetric {
 
 #[cfg(test)]
 mod tests {
-    use chrono::{offset::TimeZone, DateTime, Timelike, Utc};
-    use lookup::PathPrefix;
-    use std::sync::Arc;
-    use std::time::Duration;
-    use tokio::sync::mpsc;
-    use tokio_stream::wrappers::ReceiverStream;
-    use vector_common::config::ComponentKey;
-    use vector_core::metric_tags;
-
     use super::*;
     use crate::test_util::components::assert_transform_compliance;
     use crate::transforms::test::create_topology;
@@ -424,6 +415,13 @@ mod tests {
             Event, LogEvent,
         },
     };
+    use chrono::{offset::TimeZone, DateTime, Timelike, Utc};
+    use std::sync::Arc;
+    use std::time::Duration;
+    use tokio::sync::mpsc;
+    use tokio_stream::wrappers::ReceiverStream;
+    use vector_common::config::ComponentKey;
+    use vector_core::metric_tags;
 
     #[test]
     fn generate_config() {
@@ -448,10 +446,8 @@ mod tests {
     fn create_event(key: &str, value: impl Into<Value> + std::fmt::Debug) -> Event {
         let mut log = Event::Log(LogEvent::from("i am a log"));
         log.as_mut_log().insert(key, value);
-        log.as_mut_log().insert(
-            (PathPrefix::Event, log_schema().timestamp_key().unwrap()),
-            ts(),
-        );
+        log.as_mut_log()
+            .insert(log_schema().timestamp_key_target_path().unwrap(), ts());
         log
     }
 
@@ -834,10 +830,9 @@ mod tests {
         );
 
         let mut event = Event::Log(LogEvent::from("i am a log"));
-        event.as_mut_log().insert(
-            (PathPrefix::Event, log_schema().timestamp_key().unwrap()),
-            ts(),
-        );
+        event
+            .as_mut_log()
+            .insert(log_schema().timestamp_key_target_path().unwrap(), ts());
         event.as_mut_log().insert("status", "42");
         event.as_mut_log().insert("backtrace", "message");
         let mut metadata = event.metadata().clone();
@@ -890,10 +885,9 @@ mod tests {
         );
 
         let mut event = Event::Log(LogEvent::from("i am a log"));
-        event.as_mut_log().insert(
-            (PathPrefix::Event, log_schema().timestamp_key().unwrap()),
-            ts(),
-        );
+        event
+            .as_mut_log()
+            .insert(log_schema().timestamp_key_target_path().unwrap(), ts());
         event.as_mut_log().insert("status", "42");
         event.as_mut_log().insert("backtrace", "message");
         event.as_mut_log().insert("host", "local");
diff --git a/src/transforms/lua/mod.rs b/src/transforms/lua/mod.rs
index cdd35d4b20cf0..e33c3ee744165 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::LogNamespace;
+use vector_core::config::{ComponentKey, LogNamespace};
 
 use crate::{
     config::{GenerateConfig, Input, Output, TransformConfig, TransformContext},
@@ -89,10 +89,14 @@ impl GenerateConfig for LuaConfig {
 #[async_trait::async_trait]
 #[typetag::serde(name = "lua")]
 impl TransformConfig for LuaConfig {
-    async fn build(&self, _context: &TransformContext) -> crate::Result<Transform> {
+    async fn build(&self, context: &TransformContext) -> crate::Result<Transform> {
+        let key = context
+            .key
+            .as_ref()
+            .map_or_else(|| ComponentKey::from("lua"), Clone::clone);
         match self {
             LuaConfig::V1(v1) => v1.config.build(),
-            LuaConfig::V2(v2) => v2.config.build(),
+            LuaConfig::V2(v2) => v2.config.build(key),
         }
     }
 
diff --git a/src/transforms/lua/v1/mod.rs b/src/transforms/lua/v1/mod.rs
index e557c762ecead..b7ad53dd361c2 100644
--- a/src/transforms/lua/v1/mod.rs
+++ b/src/transforms/lua/v1/mod.rs
@@ -139,6 +139,7 @@ impl Lua {
     }
 
     fn process(&mut self, event: Event) -> Result<Option<Event>, mlua::Error> {
+        let source_id = event.source_id().cloned();
         let lua = &self.lua;
         let globals = lua.globals();
 
@@ -149,7 +150,15 @@ impl Lua {
 
         let result = globals
             .raw_get::<_, Option<LuaEvent>>("event")
-            .map(|option| option.map(|lua_event| lua_event.inner));
+            .map(|option| {
+                option.map(|lua_event| {
+                    let mut event = lua_event.inner;
+                    if let Some(source_id) = source_id {
+                        event.set_source_id(source_id);
+                    }
+                    event
+                })
+            });
 
         self.invocations_after_gc += 1;
         if self.invocations_after_gc % GC_INTERVAL == 0 {
@@ -295,167 +304,130 @@ pub fn format_error(error: &mlua::Error) -> String {
 
 #[cfg(test)]
 mod tests {
+    use std::sync::Arc;
+
     use super::*;
     use crate::event::{Event, LogEvent, Value};
+    use crate::{config::ComponentKey, test_util};
 
     #[test]
     fn lua_add_field() {
-        crate::test_util::trace_init();
-        let mut transform = Lua::new(
+        let event = transform_one(
             r#"
               event["hello"] = "goodbye"
-            "#
-            .to_string(),
-            vec![],
+            "#,
+            LogEvent::from("program me"),
         )
         .unwrap();
 
-        let event = Event::Log(LogEvent::from("program me"));
-
-        let event = transform.transform_one(event).unwrap();
-
         assert_eq!(event.as_log()["hello"], "goodbye".into());
     }
 
     #[test]
     fn lua_read_field() {
-        crate::test_util::trace_init();
-        let mut transform = Lua::new(
+        let event = transform_one(
             r#"
               _, _, name = string.find(event["message"], "Hello, my name is (%a+).")
               event["name"] = name
-            "#
-            .to_string(),
-            vec![],
+            "#,
+            LogEvent::from("Hello, my name is Bob."),
         )
         .unwrap();
 
-        let event = Event::Log(LogEvent::from("Hello, my name is Bob."));
-
-        let event = transform.transform_one(event).unwrap();
-
         assert_eq!(event.as_log()["name"], "Bob".into());
     }
 
     #[test]
     fn lua_remove_field() {
-        crate::test_util::trace_init();
-        let mut transform = Lua::new(
+        let mut log = LogEvent::default();
+        log.insert("name", "Bob");
+        let event = transform_one(
             r#"
               event["name"] = nil
-            "#
-            .to_string(),
-            vec![],
+            "#,
+            log,
         )
         .unwrap();
 
-        let mut log = LogEvent::default();
-        log.insert("name", "Bob");
-        let event = transform.transform_one(log.into()).unwrap();
-
         assert!(event.as_log().get("name").is_none());
     }
 
     #[test]
     fn lua_drop_event() {
-        let mut transform = Lua::new(
-            r#"
-              event = nil
-            "#
-            .to_string(),
-            vec![],
-        )
-        .unwrap();
-
         let mut log = LogEvent::default();
         log.insert("name", "Bob");
-        let event = transform.transform_one(log.into());
+        let event = transform_one(
+            r#"
+              event = nil
+            "#,
+            log,
+        );
 
         assert!(event.is_none());
     }
 
     #[test]
     fn lua_read_empty_field() {
-        crate::test_util::trace_init();
-        let mut transform = Lua::new(
+        let event = transform_one(
             r#"
               if event["non-existant"] == nil then
                 event["result"] = "empty"
               else
                 event["result"] = "found"
               end
-            "#
-            .to_string(),
-            vec![],
+            "#,
+            LogEvent::default(),
         )
         .unwrap();
 
-        let event = transform.transform_one(LogEvent::default().into()).unwrap();
-
         assert_eq!(event.as_log()["result"], "empty".into());
     }
 
     #[test]
     fn lua_integer_value() {
-        crate::test_util::trace_init();
-        let mut transform = Lua::new(
+        let event = transform_one(
             r#"
               event["number"] = 3
-            "#
-            .to_string(),
-            vec![],
+            "#,
+            LogEvent::default(),
         )
         .unwrap();
-
-        let event = transform.transform_one(LogEvent::default().into()).unwrap();
         assert_eq!(event.as_log()["number"], Value::Integer(3));
     }
 
     #[test]
     fn lua_numeric_value() {
-        crate::test_util::trace_init();
-        let mut transform = Lua::new(
+        let event = transform_one(
             r#"
               event["number"] = 3.14159
-            "#
-            .to_string(),
-            vec![],
+            "#,
+            LogEvent::default(),
         )
         .unwrap();
-
-        let event = transform.transform_one(LogEvent::default().into()).unwrap();
         assert_eq!(event.as_log()["number"], Value::from(3.14159));
     }
 
     #[test]
     fn lua_boolean_value() {
-        crate::test_util::trace_init();
-        let mut transform = Lua::new(
+        let event = transform_one(
             r#"
               event["bool"] = true
-            "#
-            .to_string(),
-            vec![],
+            "#,
+            LogEvent::default(),
         )
         .unwrap();
-
-        let event = transform.transform_one(LogEvent::default().into()).unwrap();
         assert_eq!(event.as_log()["bool"], Value::Boolean(true));
     }
 
     #[test]
     fn lua_non_coercible_value() {
-        crate::test_util::trace_init();
-        let mut transform = Lua::new(
+        let event = transform_one(
             r#"
               event["junk"] = {"asdf"}
-            "#
-            .to_string(),
-            vec![],
+            "#,
+            LogEvent::default(),
         )
         .unwrap();
-
-        let event = transform.transform_one(LogEvent::default().into()).unwrap();
         assert_eq!(event.as_log().get("junk"), None);
     }
 
@@ -566,32 +538,48 @@ mod tests {
 
         let mut transform =
             Lua::new(source, vec![dir.path().to_string_lossy().into_owned()]).unwrap();
-        let event = LogEvent::default().into();
-        let event = transform.transform_one(event).unwrap();
+        let event = transform.transform_one(LogEvent::default().into()).unwrap();
         assert_eq!(event.as_log()["\"new field\""], "new value".into());
     }
 
     #[test]
     fn lua_pairs() {
-        crate::test_util::trace_init();
-        let mut transform = Lua::new(
+        let mut event = LogEvent::default();
+        event.insert("name", "Bob");
+        event.insert("friend", "Alice");
+
+        let event = transform_one(
             r#"
               for k,v in pairs(event) do
                 event[k] = k .. v
               end
-            "#
-            .to_string(),
-            vec![],
+            "#,
+            event,
         )
         .unwrap();
 
-        let mut event = LogEvent::default();
-        event.insert("name", "Bob");
-        event.insert("friend", "Alice");
-
-        let event = transform.transform_one(event.into()).unwrap();
-
         assert_eq!(event.as_log()["name"], "nameBob".into());
         assert_eq!(event.as_log()["friend"], "friendAlice".into());
     }
+
+    fn transform_one(transform: &str, event: impl Into<Event>) -> Option<Event> {
+        crate::test_util::trace_init();
+
+        let source = source_id();
+        let mut event = event.into();
+        event.set_source_id(Arc::clone(&source));
+
+        let mut transform = Lua::new(transform.to_string(), vec![]).unwrap();
+        let event = transform.transform_one(event);
+
+        if let Some(event) = &event {
+            assert_eq!(event.source_id(), Some(&source));
+        }
+
+        event
+    }
+
+    fn source_id() -> Arc<ComponentKey> {
+        Arc::new(ComponentKey::from(test_util::random_string(16)))
+    }
 }
diff --git a/src/transforms/lua/v2/mod.rs b/src/transforms/lua/v2/mod.rs
index 8d953c03ac0d2..8831a55021f59 100644
--- a/src/transforms/lua/v2/mod.rs
+++ b/src/transforms/lua/v2/mod.rs
@@ -1,4 +1,4 @@
-use std::{path::PathBuf, time::Duration};
+use std::{path::PathBuf, sync::Arc, time::Duration};
 
 use codecs::MetricTagValues;
 use serde_with::serde_as;
@@ -7,6 +7,7 @@ use vector_config::configurable_component;
 pub use vector_core::event::lua;
 use vector_core::transform::runtime_transform::{RuntimeTransform, Timer};
 
+use crate::config::{ComponentKey, OutputId};
 use crate::event::lua::event::LuaEvent;
 use crate::schema::Definition;
 use crate::{
@@ -171,8 +172,8 @@ struct TimerConfig {
 }
 
 impl LuaConfig {
-    pub fn build(&self) -> crate::Result<Transform> {
-        Lua::new(self).map(Transform::event_task)
+    pub fn build(&self, key: ComponentKey) -> crate::Result<Transform> {
+        Lua::new(self, key).map(Transform::event_task)
     }
 
     pub fn input(&self) -> Input {
@@ -216,6 +217,7 @@ pub struct Lua {
     hook_shutdown: Option<mlua::RegistryKey>,
     timers: Vec<(Timer, mlua::RegistryKey)>,
     multi_value_tags: bool,
+    source_id: Arc<ComponentKey>,
 }
 
 // Helper to create `RegistryKey` from Lua function code
@@ -226,7 +228,7 @@ fn make_registry_value(lua: &mlua::Lua, source: &str) -> mlua::Result<mlua::Regi
 }
 
 impl Lua {
-    pub fn new(config: &LuaConfig) -> crate::Result<Self> {
+    pub fn new(config: &LuaConfig, key: ComponentKey) -> crate::Result<Self> {
         // In order to support loading C modules in Lua, we need to create unsafe instance
         // without debug library.
         let lua = unsafe {
@@ -294,14 +296,19 @@ impl Lua {
             hook_process,
             hook_shutdown,
             multi_value_tags,
+            source_id: Arc::new(key),
         })
     }
 
     #[cfg(test)]
     fn process(&mut self, event: Event, output: &mut Vec<Event>) -> Result<(), mlua::Error> {
+        let source_id = event.source_id().cloned();
         let lua = &self.lua;
         let result = lua.scope(|scope| {
-            let emit = scope.create_function_mut(|_, event: Event| {
+            let emit = scope.create_function_mut(|_, mut event: Event| {
+                if let Some(source_id) = &source_id {
+                    event.set_source_id(Arc::clone(source_id));
+                }
                 output.push(event);
                 Ok(())
             })?;
@@ -348,11 +355,13 @@ impl Lua {
 fn wrap_emit_fn<'lua, 'scope, F: 'scope>(
     scope: &mlua::Scope<'lua, 'scope>,
     mut emit_fn: F,
+    source_id: Arc<ComponentKey>,
 ) -> mlua::Result<mlua::Function<'lua>>
 where
     F: FnMut(Event),
 {
-    scope.create_function_mut(move |_, event: Event| -> mlua::Result<()> {
+    scope.create_function_mut(move |_, mut event: Event| -> mlua::Result<()> {
+        event.set_source_id(Arc::clone(&source_id));
         emit_fn(event);
         Ok(())
     })
@@ -364,6 +373,7 @@ impl RuntimeTransform for Lua {
         F: FnMut(Event),
     {
         let lua = &self.lua;
+        let source_id = Arc::clone(event.source_id().unwrap_or(&self.source_id));
         _ = lua
             .scope(|scope| -> mlua::Result<()> {
                 lua.registry_value::<mlua::Function>(&self.hook_process)?
@@ -372,7 +382,7 @@ impl RuntimeTransform for Lua {
                             event,
                             metric_multi_value_tags: self.multi_value_tags,
                         },
-                        wrap_emit_fn(scope, emit_fn)?,
+                        wrap_emit_fn(scope, emit_fn, source_id)?,
                     ))
             })
             .context(RuntimeErrorHooksProcessSnafu)
@@ -391,7 +401,7 @@ impl RuntimeTransform for Lua {
                 match &self.hook_init {
                     Some(key) => lua
                         .registry_value::<mlua::Function>(key)?
-                        .call(wrap_emit_fn(scope, emit_fn)?),
+                        .call(wrap_emit_fn(scope, emit_fn, Arc::clone(&self.source_id))?),
                     None => Ok(()),
                 }
             })
@@ -411,7 +421,7 @@ impl RuntimeTransform for Lua {
                 match &self.hook_shutdown {
                     Some(key) => lua
                         .registry_value::<mlua::Function>(key)?
-                        .call(wrap_emit_fn(scope, emit_fn)?),
+                        .call(wrap_emit_fn(scope, emit_fn, Arc::clone(&self.source_id))?),
                     None => Ok(()),
                 }
             })
@@ -430,7 +440,7 @@ impl RuntimeTransform for Lua {
             .scope(|scope| -> mlua::Result<()> {
                 let handler_key = &self.timers[timer.id as usize].1;
                 lua.registry_value::<mlua::Function>(handler_key)?
-                    .call(wrap_emit_fn(scope, emit_fn)?)
+                    .call(wrap_emit_fn(scope, emit_fn, Arc::clone(&self.source_id))?)
             })
             .context(RuntimeErrorTimerHandlerSnafu)
             .map_err(|error| error!(%error, rate_limit = 30));
@@ -443,41 +453,44 @@ impl RuntimeTransform for Lua {
     }
 }
 
-#[cfg(test)]
-fn format_error(error: &mlua::Error) -> String {
-    match error {
-        mlua::Error::CallbackError { traceback, cause } => format_error(cause) + "\n" + traceback,
-        err => err.to_string(),
-    }
-}
-
 #[cfg(test)]
 mod tests {
-    use std::future::Future;
-    use std::sync::Arc;
-    use tokio::sync::mpsc;
-    use tokio::sync::mpsc::{Receiver, Sender};
+    use std::{future::Future, sync::Arc};
+
+    use similar_asserts::assert_eq;
+    use tokio::sync::mpsc::{self, Receiver, Sender};
+    use tokio::sync::Mutex;
     use tokio_stream::wrappers::ReceiverStream;
 
     use super::*;
-    use crate::test_util::components::assert_transform_compliance;
+    use crate::test_util::{components::assert_transform_compliance, random_string};
     use crate::transforms::test::create_topology;
     use crate::{
         event::{
             metric::{Metric, MetricKind, MetricValue},
             Event, LogEvent, Value,
         },
-        test_util::trace_init,
+        test_util,
     };
 
+    fn format_error(error: &mlua::Error) -> String {
+        match error {
+            mlua::Error::CallbackError { traceback, cause } => {
+                format_error(cause) + "\n" + traceback
+            }
+            err => err.to_string(),
+        }
+    }
+
     fn from_config(config: &str) -> crate::Result<Box<Lua>> {
-        Lua::new(&toml::from_str(config).unwrap()).map(Box::new)
+        Lua::new(&toml::from_str(config).unwrap(), "transform".into()).map(Box::new)
     }
 
     async fn run_transform<T: Future>(
         config: &str,
-        func: impl FnOnce(Sender<Event>, Arc<tokio::sync::Mutex<Receiver<Event>>>) -> T,
+        func: impl FnOnce(Sender<Event>, Arc<Mutex<Receiver<Event>>>) -> T,
     ) -> T::Output {
+        test_util::trace_init();
         assert_transform_compliance(async move {
             let config = super::super::LuaConfig::V2(toml::from_str(config).unwrap());
             let (tx, rx) = mpsc::channel(1);
@@ -485,9 +498,8 @@ mod tests {
 
             let out = Arc::new(tokio::sync::Mutex::new(out));
 
-            let result = func(tx.clone(), Arc::clone(&out)).await;
+            let result = func(tx, Arc::clone(&out)).await;
 
-            drop(tx);
             topology.stop().await;
             assert_eq!(out.lock().await.recv().await, None);
 
@@ -496,10 +508,59 @@ mod tests {
         .await
     }
 
+    async fn next_event(out: &Arc<Mutex<Receiver<Event>>>, source: &str) -> Event {
+        let event = out
+            .lock()
+            .await
+            .recv()
+            .await
+            .expect("Event was not received");
+        assert_eq!(
+            event.source_id(),
+            Some(&Arc::new(ComponentKey::from(source)))
+        );
+        event
+    }
+
     #[tokio::test]
-    async fn lua_add_field() {
-        trace_init();
+    async fn lua_runs_init_hook() {
+        let line1 = random_string(9);
+        run_transform(
+            &format!(
+                r#"
+            version = "2"
+            hooks.init = """function (emit)
+                event = {{log={{message="{line1}"}}}}
+                emit(event)
+            end
+            """
+            hooks.process = """function (event, emit)
+                emit(event)
+            end
+            """
+            "#
+            ),
+            |tx, out| async move {
+                let line2 = random_string(9);
+                tx.send(Event::Log(LogEvent::from(line2.as_str())))
+                    .await
+                    .unwrap();
+                drop(tx);
+                assert_eq!(
+                    next_event(&out, "transform").await.as_log()["message"],
+                    line1.into()
+                );
+                assert_eq!(
+                    next_event(&out, "in").await.as_log()["message"],
+                    line2.into(),
+                );
+            },
+        )
+        .await;
+    }
 
+    #[tokio::test]
+    async fn lua_add_field() {
         run_transform(
             r#"
             version = "2"
@@ -514,7 +575,7 @@ mod tests {
                 tx.send(event).await.unwrap();
 
                 assert_eq!(
-                    out.lock().await.recv().await.unwrap().as_log()["hello"],
+                    next_event(&out, "in").await.as_log()["hello"],
                     "goodbye".into()
                 );
             },
@@ -524,8 +585,6 @@ mod tests {
 
     #[tokio::test]
     async fn lua_read_field() {
-        trace_init();
-
         run_transform(
             r#"
             version = "2"
@@ -540,10 +599,7 @@ mod tests {
                 let event = Event::Log(LogEvent::from("Hello, my name is Bob."));
                 tx.send(event).await.unwrap();
 
-                assert_eq!(
-                    out.lock().await.recv().await.unwrap().as_log()["name"],
-                    "Bob".into()
-                );
+                assert_eq!(next_event(&out, "in").await.as_log()["name"], "Bob".into());
             },
         )
         .await;
@@ -551,8 +607,6 @@ mod tests {
 
     #[tokio::test]
     async fn lua_remove_field() {
-        trace_init();
-
         run_transform(
             r#"
             version = "2"
@@ -568,10 +622,7 @@ mod tests {
 
                 tx.send(event.into()).await.unwrap();
 
-                assert_eq!(
-                    out.lock().await.recv().await.unwrap().as_log().get("name"),
-                    None
-                );
+                assert_eq!(next_event(&out, "in").await.as_log().get("name"), None);
             },
         )
         .await;
@@ -579,8 +630,6 @@ mod tests {
 
     #[tokio::test]
     async fn lua_drop_event() {
-        trace_init();
-
         run_transform(
             r#"
             version = "2"
@@ -601,8 +650,6 @@ mod tests {
 
     #[tokio::test]
     async fn lua_duplicate_event() {
-        trace_init();
-
         run_transform(
             r#"
             version = "2"
@@ -626,8 +673,6 @@ mod tests {
 
     #[tokio::test]
     async fn lua_read_empty_field() {
-        trace_init();
-
         run_transform(
             r#"
             version = "2"
@@ -646,7 +691,7 @@ mod tests {
                 tx.send(event.into()).await.unwrap();
 
                 assert_eq!(
-                    out.lock().await.recv().await.unwrap().as_log()["result"],
+                    next_event(&out, "in").await.as_log()["result"],
                     "empty".into()
                 );
             },
@@ -656,7 +701,6 @@ mod tests {
 
     #[tokio::test]
     async fn lua_integer_value() {
-        trace_init();
         run_transform(
             r#"
             version = "2"
@@ -671,7 +715,7 @@ mod tests {
                 tx.send(event.into()).await.unwrap();
 
                 assert_eq!(
-                    out.lock().await.recv().await.unwrap().as_log()["number"],
+                    next_event(&out, "in").await.as_log()["number"],
                     Value::Integer(3)
                 );
             },
@@ -681,8 +725,6 @@ mod tests {
 
     #[tokio::test]
     async fn lua_numeric_value() {
-        trace_init();
-
         run_transform(
             r#"
             version = "2"
@@ -697,7 +739,7 @@ mod tests {
                 tx.send(event.into()).await.unwrap();
 
                 assert_eq!(
-                    out.lock().await.recv().await.unwrap().as_log()["number"],
+                    next_event(&out, "in").await.as_log()["number"],
                     Value::from(3.14159)
                 );
             },
@@ -707,8 +749,6 @@ mod tests {
 
     #[tokio::test]
     async fn lua_boolean_value() {
-        trace_init();
-
         run_transform(
             r#"
             version = "2"
@@ -723,7 +763,7 @@ mod tests {
                 tx.send(event.into()).await.unwrap();
 
                 assert_eq!(
-                    out.lock().await.recv().await.unwrap().as_log()["bool"],
+                    next_event(&out, "in").await.as_log()["bool"],
                     Value::Boolean(true)
                 );
             },
@@ -733,7 +773,6 @@ mod tests {
 
     #[tokio::test]
     async fn lua_non_coercible_value() {
-        trace_init();
         run_transform(
             r#"
             version = "2"
@@ -747,10 +786,7 @@ mod tests {
                 let event = LogEvent::default();
                 tx.send(event.into()).await.unwrap();
 
-                assert_eq!(
-                    out.lock().await.recv().await.unwrap().as_log().get("junk"),
-                    None
-                );
+                assert_eq!(next_event(&out, "in").await.as_log().get("junk"), None);
             },
         )
         .await;
@@ -758,8 +794,6 @@ mod tests {
 
     #[tokio::test]
     async fn lua_non_string_key_write() -> crate::Result<()> {
-        trace_init();
-
         let mut transform = from_config(
             r#"
             hooks.process = """function (event, emit)
@@ -785,8 +819,6 @@ mod tests {
 
     #[tokio::test]
     async fn lua_non_string_key_read() {
-        trace_init();
-
         run_transform(
             r#"
             version = "2"
@@ -800,16 +832,7 @@ mod tests {
                 let event = LogEvent::default();
                 tx.send(event.into()).await.unwrap();
 
-                assert_eq!(
-                    out.lock()
-                        .await
-                        .recv()
-                        .await
-                        .unwrap()
-                        .as_log()
-                        .get("result"),
-                    None
-                );
+                assert_eq!(next_event(&out, "in").await.as_log().get("result"), None);
             },
         )
         .await;
@@ -817,8 +840,6 @@ mod tests {
 
     #[tokio::test]
     async fn lua_script_error() -> crate::Result<()> {
-        trace_init();
-
         let mut transform = from_config(
             r#"
             hooks.process = """function (event, emit)
@@ -839,8 +860,6 @@ mod tests {
 
     #[tokio::test]
     async fn lua_syntax_error() -> crate::Result<()> {
-        trace_init();
-
         let err = from_config(
             r#"
             hooks.process = """function (event, emit)
@@ -860,7 +879,6 @@ mod tests {
     #[tokio::test]
     async fn lua_load_file() {
         use std::{fs::File, io::Write};
-        trace_init();
 
         let dir = tempfile::tempdir().unwrap();
         let mut file = File::create(dir.path().join("script2.lua")).unwrap();
@@ -898,7 +916,7 @@ mod tests {
                 tx.send(event.into()).await.unwrap();
 
                 assert_eq!(
-                    out.lock().await.recv().await.unwrap().as_log()["\"new field\""],
+                    next_event(&out, "in").await.as_log()["\"new field\""],
                     "new value".into()
                 );
             },
@@ -908,7 +926,6 @@ mod tests {
 
     #[tokio::test]
     async fn lua_pairs() {
-        trace_init();
         run_transform(
             r#"
             version = "2"
@@ -926,7 +943,7 @@ mod tests {
                 event.insert("friend", "Alice");
                 tx.send(event.into()).await.unwrap();
 
-                let output = out.lock().await.recv().await.unwrap();
+                let output = next_event(&out, "in").await;
 
                 assert_eq!(output.as_log()["name"], "nameBob".into());
                 assert_eq!(output.as_log()["friend"], "friendAlice".into());
@@ -937,7 +954,6 @@ mod tests {
 
     #[tokio::test]
     async fn lua_metric() {
-        trace_init();
         run_transform(
             r#"
             version = "2"
@@ -957,16 +973,13 @@ mod tests {
                 let mut expected = metric
                     .clone()
                     .with_value(MetricValue::Counter { value: 2.0 });
-                expected
-                    .metadata_mut()
-                    .set_upstream_id(Arc::new(OutputId::from("transform")));
+                let metadata = expected.metadata_mut();
+                metadata.set_upstream_id(Arc::new(OutputId::from("transform")));
+                metadata.set_source_id(Arc::new(ComponentKey::from("in")));
 
                 tx.send(metric.into()).await.unwrap();
 
-                assert_eq!(
-                    out.lock().await.recv().await.unwrap().as_metric(),
-                    &expected
-                );
+                assert_eq!(next_event(&out, "in").await.as_metric(), &expected);
             },
         )
         .await;
@@ -974,7 +987,6 @@ mod tests {
 
     #[tokio::test]
     async fn lua_multiple_events() {
-        trace_init();
         run_transform(
             r#"
             version = "2"
diff --git a/src/transforms/metric_to_log.rs b/src/transforms/metric_to_log.rs
index e152d3a75fdf3..edbb131b47d72 100644
--- a/src/transforms/metric_to_log.rs
+++ b/src/transforms/metric_to_log.rs
@@ -1,12 +1,12 @@
 use chrono::Utc;
 use codecs::MetricTagValues;
-use lookup::lookup_v2::parse_value_path;
 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, OutputId, TransformOutput};
+use vrl::path::OwnedValuePath;
 use vrl::value::kind::Collection;
 use vrl::value::Kind;
 
@@ -238,7 +238,7 @@ fn schema_definition(log_namespace: LogNamespace) -> Definition {
             }
 
             schema_definition = schema_definition.with_event_field(
-                &parse_value_path(log_schema().host_key()).expect("valid host key"),
+                log_schema().host_key().expect("valid host key"),
                 Kind::bytes().or_undefined(),
                 None,
             );
@@ -249,7 +249,7 @@ fn schema_definition(log_namespace: LogNamespace) -> Definition {
 
 #[derive(Clone, Debug)]
 pub struct MetricToLog {
-    host_tag: String,
+    host_tag: Option<OwnedValuePath>,
     timezone: TimeZone,
     log_namespace: LogNamespace,
     tag_values: MetricTagValues,
@@ -263,9 +263,12 @@ impl MetricToLog {
         tag_values: MetricTagValues,
     ) -> Self {
         Self {
-            host_tag: format!(
-                "tags.{}",
-                host_tag.unwrap_or_else(|| log_schema().host_key())
+            host_tag: host_tag.map_or(
+                log_schema().host_key().cloned().map(|mut key| {
+                    key.push_front_field("tags");
+                    key
+                }),
+                |host| Some(owned_value_path!("tags", host)),
             ),
             timezone,
             log_namespace,
@@ -302,12 +305,14 @@ impl MetricToLog {
                             })
                             .unwrap_or_else(|| event::Value::Timestamp(Utc::now()));
 
-                        if let Some(timestamp_key) = log_schema().timestamp_key() {
-                            log.insert((PathPrefix::Event, timestamp_key), timestamp);
-                        }
+                        log.maybe_insert(log_schema().timestamp_key_target_path(), timestamp);
 
-                        if let Some(host) = log.remove_prune(self.host_tag.as_str(), true) {
-                            log.insert(log_schema().host_key(), host);
+                        if let Some(host_tag) = &self.host_tag {
+                            if let Some(host_value) =
+                                log.remove_prune(host_tag.to_string().as_str(), true)
+                            {
+                                log.maybe_insert(log_schema().host_key_target_path(), host_value);
+                            }
                         }
                     }
                     if self.log_namespace == LogNamespace::Vector {
diff --git a/src/transforms/mezmo_log_classification.rs b/src/transforms/mezmo_log_classification.rs
index f74cec8ade18e..2ab6497ccb14e 100644
--- a/src/transforms/mezmo_log_classification.rs
+++ b/src/transforms/mezmo_log_classification.rs
@@ -188,9 +188,9 @@ impl LogClassification {
     fn transform_one(&mut self, mut event: Event) -> Option<Event> {
         let log = event.as_mut_log();
 
-        if let Some(message) = log.get(log_schema().message_key()) {
+        if let Some(message) = log.get(log_schema().message_key_target_path().unwrap()) {
             let mut matches = vec![];
-            let mut message_key = log_schema().message_key().to_string();
+            let mut message_key = log_schema().message_key().unwrap().to_string();
             let mut message_size = value_size(message) as i64;
             if message_size.is_negative() {
                 warn!("total_bytes for message exceeded i64 limit, using i64::MAX instead");
@@ -298,15 +298,16 @@ mod tests {
     ) -> Value {
         let mut annotations = BTreeMap::new();
 
-        let msg = log_schema().message_key();
+        let msg_path = log_schema().message_key_target_path().unwrap();
+        let msg_key = log_schema().message_key().unwrap().to_string();
         let message = input_event
             .as_log()
-            .get(msg)
+            .get(msg_path)
             .expect("message always exists in the presence of annotations");
 
         let message_key = match line_field {
-            Some(line_field) => format!("{msg}{line_field}"),
-            None => msg.to_string(),
+            Some(line_field) => format!("{msg_key}{line_field}"),
+            None => msg_key,
         };
 
         annotations.insert("message_key".to_string(), Value::Bytes(message_key.into()));
diff --git a/src/transforms/mezmo_log_clustering/mod.rs b/src/transforms/mezmo_log_clustering/mod.rs
index ddae63f6d7fa9..e7193a5c86ae3 100644
--- a/src/transforms/mezmo_log_clustering/mod.rs
+++ b/src/transforms/mezmo_log_clustering/mod.rs
@@ -379,10 +379,10 @@ impl MezmoLogClustering {
 
         if field_name.is_none() {
             // Check .message property for backward compatibility
-            let field_name = log_schema().message_key();
-            if let Some(field) = log.get(field_name) {
+            let field_name = log_schema().message_key().unwrap().to_string();
+            if let Some(field) = log.get(log_schema().message_key_target_path().unwrap()) {
                 if field.is_bytes() {
-                    return (Some(Cow::Owned(field_name.to_string())), field.as_str());
+                    return (Some(Cow::Owned(field_name)), field.as_str());
                 }
             }
             return (None, None);
diff --git a/src/transforms/mezmo_tag_cardinality_limit/config.rs b/src/transforms/mezmo_tag_cardinality_limit/config.rs
index 795bd02b70864..3fe4090542fd9 100644
--- a/src/transforms/mezmo_tag_cardinality_limit/config.rs
+++ b/src/transforms/mezmo_tag_cardinality_limit/config.rs
@@ -14,7 +14,7 @@ use super::TagCardinalityLimit;
 pub struct TagCardinalityLimitConfig {
     /// How many distinct values to accept for any given key.
     #[serde(default = "default_value_limit")]
-    pub value_limit: u32,
+    pub value_limit: usize,
 
     #[configurable(derived)]
     #[serde(default = "default_limit_exceeded_action")]
@@ -91,7 +91,7 @@ const fn default_limit_exceeded_action() -> LimitExceededAction {
     LimitExceededAction::DropTag
 }
 
-const fn default_value_limit() -> u32 {
+const fn default_value_limit() -> usize {
     500
 }
 
diff --git a/src/transforms/mezmo_tag_cardinality_limit/mod.rs b/src/transforms/mezmo_tag_cardinality_limit/mod.rs
index a4c9e8c23268e..5905bd155b339 100644
--- a/src/transforms/mezmo_tag_cardinality_limit/mod.rs
+++ b/src/transforms/mezmo_tag_cardinality_limit/mod.rs
@@ -24,6 +24,7 @@ mod tag_value_set;
 #[cfg(test)]
 mod tests;
 
+use crate::event::metric::TagValueSet;
 pub use config::TagCardinalityLimitConfig;
 use tag_value_set::AcceptedTagValueSet;
 
@@ -55,7 +56,7 @@ impl TagCardinalityLimit {
     /// for the key and returns true, otherwise returns false.  A false return
     /// value indicates to the caller that the value is not accepted for this
     /// key, and the configured limit_exceeded_action should be taken.
-    fn try_accept_tag(&mut self, key: &str, value: &Bytes) -> bool {
+    fn try_accept_tag(&mut self, key: &str, value: &TagValueSet) -> bool {
         let tag_value_set = self.accepted_tags.entry_ref(key).or_insert_with(|| {
             AcceptedTagValueSet::new(self.config.value_limit, &self.config.mode)
         });
@@ -66,11 +67,11 @@ impl TagCardinalityLimit {
         }
 
         // Tag value not yet part of the accepted set.
-        if tag_value_set.len() < self.config.value_limit as usize {
+        if tag_value_set.len() < self.config.value_limit {
             // accept the new value
-            tag_value_set.insert(Bytes::copy_from_slice(value));
+            tag_value_set.insert(value.clone());
 
-            if tag_value_set.len() == self.config.value_limit as usize {
+            if tag_value_set.len() == self.config.value_limit {
                 emit!(MezmoTagCardinalityValueLimitReached { key });
             }
 
@@ -93,21 +94,21 @@ impl TagCardinalityLimit {
 
     /// Checks if recording a key and value corresponding to a tag on an incoming Metric would
     /// exceed the cardinality limit.
-    fn tag_limit_exceeded(&self, key: &str, value: &Bytes) -> bool {
+    fn tag_limit_exceeded(&self, key: &str, value: &TagValueSet) -> bool {
         self.accepted_tags
             .get(key)
             .map(|value_set| {
-                !value_set.contains(value) && value_set.len() >= self.config.value_limit as usize
+                !value_set.contains(value) && value_set.len() >= self.config.value_limit
             })
             .unwrap_or(false)
     }
 
     /// Record a key and value corresponding to a tag on an incoming Metric.
-    fn record_tag_value(&mut self, key: &str, value: &Bytes) {
+    fn record_tag_value(&mut self, key: &str, value: &TagValueSet) {
         self.accepted_tags
             .entry_ref(key)
             .or_insert_with(|| AcceptedTagValueSet::new(self.config.value_limit, &self.config.mode))
-            .insert(Bytes::copy_from_slice(value));
+            .insert(value.clone());
     }
 
     fn transform_one(&mut self, mut event: Event) -> Option<Event> {
@@ -122,7 +123,13 @@ impl TagCardinalityLimit {
                             // doesn't change the behavior of the check.
                             for (key, value) in tags_map.iter() {
                                 let value = truncate(value, self.config.max_tag_size);
-                                if self.tag_in_scope(key) && self.tag_limit_exceeded(key, &value) {
+                                let tag_value_set = TagValueSet::from(vec![Value::Bytes(
+                                    value.clone(),
+                                )
+                                .to_string()]);
+                                if self.tag_in_scope(key)
+                                    && self.tag_limit_exceeded(key, &tag_value_set)
+                                {
                                     emit!(MezmoTagCardinalityLimitRejectingEvent {
                                         tag_key: key,
                                         tag_value: &String::from_utf8_lossy(value.as_ref()),
@@ -133,7 +140,9 @@ impl TagCardinalityLimit {
                             for (key, value) in tags_map.iter() {
                                 if self.tag_in_scope(key) {
                                     let value = truncate(value, self.config.max_tag_size);
-                                    self.record_tag_value(key, &value);
+                                    let tag_value_set =
+                                        TagValueSet::from(vec![Value::Bytes(value).to_string()]);
+                                    self.record_tag_value(key, &tag_value_set);
                                 }
                             }
                         }
@@ -141,7 +150,11 @@ impl TagCardinalityLimit {
                             tags_map.retain(|key, value| {
                                 let value = truncate(value, self.config.max_tag_size);
                                 if self.tag_in_scope(key) {
-                                    if self.try_accept_tag(key, &value) {
+                                    let tag_value_set =
+                                        TagValueSet::from(vec![
+                                            Value::Bytes(value.clone()).to_string()
+                                        ]);
+                                    if self.try_accept_tag(key, &tag_value_set) {
                                         true
                                     } else {
                                         emit!(MezmoTagCardinalityLimitRejectingTag {
@@ -183,34 +196,35 @@ impl TaskTransform<Event> for TagCardinalityLimit {
 fn get_tags_mut(
     log: &mut LogEvent,
 ) -> Result<Option<&mut BTreeMap<String, Value>>, TransformError> {
-    log.get_mut(log_schema().message_key()).map_or(
-        Err(TransformError::FieldNotFound {
-            field: "message".to_string(),
-        }),
-        |message| {
-            message.get_mut("tags").map_or(
-                Err(TransformError::FieldNotFound {
-                    field: "tags".to_string(),
-                }),
-                |tags| {
-                    tags.as_object_mut().map_or(
-                        Err(TransformError::FieldInvalidType {
-                            field: "tags".to_string(),
-                        }),
-                        |tags| {
-                            if !tags.values().all(|tag| tag.is_bytes()) {
-                                Err(TransformError::FieldInvalidType {
-                                    field: "tags".to_string(),
-                                })
-                            } else {
-                                Ok(Some(tags))
-                            }
-                        },
-                    )
-                },
-            )
-        },
-    )
+    log.get_mut(log_schema().message_key_target_path().unwrap())
+        .map_or(
+            Err(TransformError::FieldNotFound {
+                field: "message".to_string(),
+            }),
+            |message| {
+                message.get_mut("tags").map_or(
+                    Err(TransformError::FieldNotFound {
+                        field: "tags".to_string(),
+                    }),
+                    |tags| {
+                        tags.as_object_mut().map_or(
+                            Err(TransformError::FieldInvalidType {
+                                field: "tags".to_string(),
+                            }),
+                            |tags| {
+                                if !tags.values().all(|tag| tag.is_bytes()) {
+                                    Err(TransformError::FieldInvalidType {
+                                        field: "tags".to_string(),
+                                    })
+                                } else {
+                                    Ok(Some(tags))
+                                }
+                            },
+                        )
+                    },
+                )
+            },
+        )
 }
 
 /// Truncate a bytes value at the provided `max`
diff --git a/src/transforms/mezmo_tag_cardinality_limit/tag_value_set.rs b/src/transforms/mezmo_tag_cardinality_limit/tag_value_set.rs
index 04aa6baf95351..f639ff78729e9 100644
--- a/src/transforms/mezmo_tag_cardinality_limit/tag_value_set.rs
+++ b/src/transforms/mezmo_tag_cardinality_limit/tag_value_set.rs
@@ -1,20 +1,18 @@
-use bloom::{BloomFilter, ASMS};
-use bytes::Bytes;
+use super::config::Mode;
+use crate::event::metric::TagValueSet;
+use bloomy::BloomFilter;
 use std::collections::HashSet;
 use std::fmt;
 
-use super::config::Mode;
-
 /// Container for storing the set of accepted values for a given tag key.
 #[derive(Debug)]
 pub struct AcceptedTagValueSet {
     storage: TagValueSetStorage,
-    num_elements: usize,
 }
 
 enum TagValueSetStorage {
-    Set(HashSet<Bytes>),
-    Bloom(BloomFilter),
+    Set(HashSet<TagValueSet>),
+    Bloom(BloomFilter<TagValueSet>),
 }
 
 impl fmt::Debug for TagValueSetStorage {
@@ -27,40 +25,37 @@ impl fmt::Debug for TagValueSetStorage {
 }
 
 impl AcceptedTagValueSet {
-    pub fn new(value_limit: u32, mode: &Mode) -> Self {
+    pub fn new(value_limit: usize, mode: &Mode) -> Self {
         let storage = match &mode {
-            Mode::Exact => TagValueSetStorage::Set(HashSet::with_capacity(value_limit as usize)),
+            Mode::Exact => TagValueSetStorage::Set(HashSet::with_capacity(value_limit)),
             Mode::Probabilistic(config) => {
-                let num_bits = config.cache_size_per_key * 8; // Convert bytes to bits
-                let num_hashes = bloom::optimal_num_hashes(num_bits, value_limit);
-                TagValueSetStorage::Bloom(BloomFilter::with_size(num_bits, num_hashes))
+                let num_bits = config.cache_size_per_key / 8; // Convert bytes to bits
+                TagValueSetStorage::Bloom(BloomFilter::with_size(num_bits))
             }
         };
-        Self {
-            storage,
-            num_elements: 0,
-        }
+        Self { storage }
     }
 
-    pub fn contains(&self, value: &Bytes) -> bool {
+    pub fn contains(&self, value: &TagValueSet) -> bool {
         match &self.storage {
             TagValueSetStorage::Set(set) => set.contains(value),
             TagValueSetStorage::Bloom(bloom) => bloom.contains(value),
         }
     }
 
-    pub const fn len(&self) -> usize {
-        self.num_elements
+    pub fn len(&self) -> usize {
+        match &self.storage {
+            TagValueSetStorage::Set(set) => set.len(),
+            TagValueSetStorage::Bloom(bloom) => bloom.count(),
+        }
     }
 
-    pub fn insert(&mut self, value: Bytes) -> bool {
-        let inserted = match &mut self.storage {
-            TagValueSetStorage::Set(set) => set.insert(value),
+    pub fn insert(&mut self, value: TagValueSet) {
+        match &mut self.storage {
+            TagValueSetStorage::Set(set) => {
+                set.insert(value);
+            }
             TagValueSetStorage::Bloom(bloom) => bloom.insert(&value),
         };
-        if inserted {
-            self.num_elements += 1
-        }
-        inserted
     }
 }
diff --git a/src/transforms/mezmo_tag_cardinality_limit/tests.rs b/src/transforms/mezmo_tag_cardinality_limit/tests.rs
index dd09ab65be585..445e7e722acab 100644
--- a/src/transforms/mezmo_tag_cardinality_limit/tests.rs
+++ b/src/transforms/mezmo_tag_cardinality_limit/tests.rs
@@ -37,7 +37,7 @@ macro_rules! tags {
 }
 
 const fn make_transform_hashset(
-    value_limit: u32,
+    value_limit: usize,
     limit_exceeded_action: LimitExceededAction,
 ) -> TagCardinalityLimitConfig {
     TagCardinalityLimitConfig {
@@ -51,7 +51,7 @@ const fn make_transform_hashset(
 }
 
 const fn make_transform_bloom(
-    value_limit: u32,
+    value_limit: usize,
     limit_exceeded_action: LimitExceededAction,
 ) -> TagCardinalityLimitConfig {
     TagCardinalityLimitConfig {
diff --git a/src/transforms/mod.rs b/src/transforms/mod.rs
index bc4208d722cb0..05ed0adb4bb96 100644
--- a/src/transforms/mod.rs
+++ b/src/transforms/mod.rs
@@ -117,6 +117,7 @@ mod test {
 
         let (tx, rx) = mpsc::channel(1);
 
+        // TODO: Use non-hard-coded names to improve tests.
         builder.add_source("in", UnitTestStreamSourceConfig::new(events));
         builder.add_transform(transform_name, &["in"], transform_config);
         builder.add_sink(
diff --git a/src/transforms/protobuf_to_log.rs b/src/transforms/protobuf_to_log.rs
index 81c31400145a0..e0eb0416f4b1b 100644
--- a/src/transforms/protobuf_to_log.rs
+++ b/src/transforms/protobuf_to_log.rs
@@ -105,7 +105,7 @@ impl FunctionTransform for ProtobufToLog {
             .expect("Log event has no message");
 
         let mut root_internal_metadata = &BTreeMap::new();
-        if let Some(metadata) = log.get((PathPrefix::Event, log_schema().metadata_key())) {
+        if let Some(metadata) = log.get(log_schema().metadata_key_target_path().unwrap()) {
             if let Some(root_meta_obj) = metadata.as_object() {
                 root_internal_metadata = root_meta_obj;
             }
@@ -137,7 +137,7 @@ impl FunctionTransform for ProtobufToLog {
 
                     if let Some(event_message) = event.get_message() {
                         log_event.insert(
-                            (PathPrefix::Event, log_schema().message_key()),
+                            log_schema().message_key_target_path().unwrap(),
                             event_message.to_owned(),
                         );
                     }
@@ -164,7 +164,7 @@ impl FunctionTransform for ProtobufToLog {
                     let mut internal_metadata = root_internal_metadata.clone();
 
                     if let Some(metadata) =
-                        event.get((PathPrefix::Event, log_schema().metadata_key()))
+                        event.get(log_schema().metadata_key_target_path().unwrap())
                     {
                         if let Some(meta_obj) = metadata.as_object() {
                             for entry in meta_obj.iter() {
@@ -175,7 +175,7 @@ impl FunctionTransform for ProtobufToLog {
 
                     if !internal_metadata.is_empty() {
                         log_event.insert(
-                            (PathPrefix::Event, log_schema().metadata_key()),
+                            log_schema().metadata_key_target_path().unwrap(),
                             internal_metadata,
                         );
                     }
diff --git a/src/transforms/protobuf_to_metric.rs b/src/transforms/protobuf_to_metric.rs
index 31dd60349ec73..5e32d78ce8631 100644
--- a/src/transforms/protobuf_to_metric.rs
+++ b/src/transforms/protobuf_to_metric.rs
@@ -102,7 +102,7 @@ impl FunctionTransform for ProtobufToMetric {
             .expect("Log event has no message");
 
         let mut root_internal_metadata = &BTreeMap::new();
-        if let Some(metadata) = log.get((PathPrefix::Event, log_schema().metadata_key())) {
+        if let Some(metadata) = log.get(log_schema().metadata_key_target_path().unwrap()) {
             if let Some(root_meta_obj) = metadata.as_object() {
                 root_internal_metadata = root_meta_obj;
             }
@@ -140,7 +140,7 @@ impl FunctionTransform for ProtobufToMetric {
 
                 if let Some(event_message) = event.get_message() {
                     log_event.insert(
-                        (PathPrefix::Event, log_schema().message_key()),
+                        log_schema().message_key_target_path().unwrap(),
                         event_message.to_owned(),
                     );
                 }
@@ -166,7 +166,7 @@ impl FunctionTransform for ProtobufToMetric {
 
                 let mut internal_metadata = root_internal_metadata.clone();
 
-                if let Some(metadata) = event.get((PathPrefix::Event, log_schema().metadata_key()))
+                if let Some(metadata) = event.get(log_schema().metadata_key_target_path().unwrap())
                 {
                     if let Some(meta_obj) = metadata.as_object() {
                         for entry in meta_obj.iter() {
@@ -177,7 +177,7 @@ impl FunctionTransform for ProtobufToMetric {
 
                 if !internal_metadata.is_empty() {
                     log_event.insert(
-                        (PathPrefix::Event, log_schema().metadata_key()),
+                        log_schema().metadata_key_target_path().unwrap(),
                         internal_metadata,
                     );
                 }
diff --git a/src/transforms/reduce/mezmo_reduce.rs b/src/transforms/reduce/mezmo_reduce.rs
index 351d952dac1f8..baa8a0a4b0e85 100644
--- a/src/transforms/reduce/mezmo_reduce.rs
+++ b/src/transforms/reduce/mezmo_reduce.rs
@@ -117,9 +117,11 @@ impl MezmoMetadata {
     fn new(date_formats: HashMap<String, String>) -> Self {
         let date_formats = date_formats
             .into_iter()
-            .map(|(k, v)| match k.strip_prefix(log_schema().message_key()) {
-                Some(stripped) => (stripped.to_string(), v),
-                None => (k, v),
+            .map(|(k, v)| {
+                match k.strip_prefix(log_schema().message_key().unwrap().to_string().as_str()) {
+                    Some(stripped) => (stripped.to_string(), v),
+                    None => (k, v),
+                }
             })
             .collect();
 
@@ -477,9 +479,11 @@ impl MezmoReduce {
             .group_by
             .clone()
             .into_iter()
-            .map(|path| match path.strip_prefix(log_schema().message_key()) {
-                Some(stripped) => stripped.to_string(),
-                None => path,
+            .map(|path| {
+                match path.strip_prefix(log_schema().message_key().unwrap().to_string().as_str()) {
+                    Some(stripped) => stripped.to_string(),
+                    None => path,
+                }
             })
             .collect();
 
@@ -776,7 +780,7 @@ pub fn get_root_property_name_from_path(
                 let mut segments = target_path.path.segments;
                 // Ignore schema prefixes, which are valid VRL but not relevant to reduce
                 if let Some(OwnedSegment::Field(first_element)) = segments.get(0) {
-                    if first_element == log_schema().message_key() {
+                    if first_element == &log_schema().message_key().unwrap().to_string() {
                         segments.remove(0);
                         field_count = segments.len();
                     }
@@ -1605,10 +1609,12 @@ mod test {
 
             let (_topology, mut out_stream) =
                 create_topology(ReceiverStream::new(rx), reduce_config).await;
+            let message_key_path = log_schema().message_key_target_path().unwrap();
+            let message_key = log_schema().message_key().unwrap().to_string();
 
             let mut e_1 = LogEvent::default();
             e_1.insert(
-                log_schema().message_key(),
+                message_key_path,
                 btreemap! {
                     "key1" => "first one",
                     "key2" => "first"
@@ -1616,7 +1622,7 @@ mod test {
             );
             let mut e_2 = LogEvent::default();
             e_2.insert(
-                log_schema().message_key(),
+                message_key_path,
                 btreemap! {
                     "key1" => "second one",
                     "key2" => "NOPE"
@@ -1625,7 +1631,7 @@ mod test {
             let mut e_3 = LogEvent::default();
             e_3.insert(
                 // This will cause the threshold to be exceeded
-                log_schema().message_key(),
+                message_key_path,
                 btreemap! {
                     "key1" => "and now you're too big!",
                     "key2" => "NEIGH"
@@ -1634,7 +1640,7 @@ mod test {
             let mut e_4 = LogEvent::default();
             e_4.insert(
                 // This will be a new event
-                log_schema().message_key(),
+                message_key_path,
                 btreemap! {
                     "key1" => "a new reduce event",
                     "key2" => "yep"
@@ -1651,7 +1657,7 @@ mod test {
             assert_eq!(
                 output_1,
                 LogEvent::from(btreemap! {
-                    log_schema().message_key() => btreemap! {
+                    message_key.as_str() => btreemap! {
                         "key1" => json!(["first one", "second one", "and now you're too big!"]),
                         "key2" => "first",
                     }
@@ -1662,7 +1668,7 @@ mod test {
             assert_eq!(
                 output_2,
                 LogEvent::from(btreemap! {
-                    log_schema().message_key() => btreemap! {
+                    message_key.as_str() => btreemap! {
                         "key1" => json!(["a new reduce event"]),
                         "key2" => "yep",
                     }
@@ -1691,11 +1697,13 @@ mod test {
         .await
         .unwrap();
         let reduce = reduce.into_task();
+        let message_key_path = log_schema().message_key_target_path().unwrap();
+        let message_key = log_schema().message_key().unwrap().to_string();
 
         // Different request ids will cause multiple states since each unique `id` is a discriminant and state
         let mut e_1 = LogEvent::default();
         e_1.insert(
-            log_schema().message_key(),
+            message_key_path,
             btreemap! {
                 "request_id" => "1",
                 "key1" => "one",
@@ -1703,7 +1711,7 @@ mod test {
         );
         let mut e_2 = LogEvent::default();
         e_2.insert(
-            log_schema().message_key(),
+            message_key_path,
             btreemap! {
                 "request_id" => "1",
                 "key1" => "two",
@@ -1711,7 +1719,7 @@ mod test {
         );
         let mut e_3 = LogEvent::default();
         e_3.insert(
-            log_schema().message_key(),
+            message_key_path,
             btreemap! {
                 "request_id" => "2",
                 "key1" => "one",
@@ -1719,7 +1727,7 @@ mod test {
         );
         let mut e_4 = LogEvent::default();
         e_4.insert(
-            log_schema().message_key(),
+            message_key_path,
             btreemap! {
                 "request_id" => "2",
                 "key1" => "two",
@@ -1727,7 +1735,7 @@ mod test {
         );
         let mut e_5 = LogEvent::default();
         e_5.insert(
-            log_schema().message_key(),
+            message_key_path,
             btreemap! {
                 "request_id" => "2",
                 "key1" => "aaaaaaaaaaaand we're way too long now",
@@ -1742,7 +1750,7 @@ mod test {
         assert_eq!(
             output_1,
             LogEvent::from(btreemap! {
-                log_schema().message_key() => btreemap! {
+                message_key.as_str() => btreemap! {
                     "key1" => json!(["one", "two"]),
                     "request_id" => "1",
                 }
@@ -1753,7 +1761,7 @@ mod test {
         assert_eq!(
             output_2,
             LogEvent::from(btreemap! {
-                log_schema().message_key() => btreemap! {
+                message_key.as_str() => btreemap! {
                     "key1" => json!(["one", "two", "aaaaaaaaaaaand we're way too long now"]),
                     "request_id" => "2",
                 }
@@ -1777,37 +1785,38 @@ mod test {
         .await
         .unwrap();
         let reduce = reduce.into_task();
+        let message_key = log_schema().message_key().unwrap().to_string();
 
         let e_1 = LogEvent::from(btreemap! {
-            log_schema().message_key() => btreemap! {
+            message_key.as_str() => btreemap! {
                 "status" => 1,
                 "method" => "GET",
             },
         });
 
         let e_2 = LogEvent::from(btreemap! {
-            log_schema().message_key() => btreemap! {
+            message_key.as_str() => btreemap! {
                 "status" => 1,
                 "method" => "POST",
             },
         });
 
         let e_3 = LogEvent::from(btreemap! {
-            log_schema().message_key() => btreemap! {
+            message_key.as_str() => btreemap! {
                 "status" => 1,
                 "method" => "POST",
             },
         });
 
         let e_4 = LogEvent::from(btreemap! {
-            log_schema().message_key() => btreemap! {
+            message_key.as_str() => btreemap! {
                 "status" => 2,
                 "method" => "POST",
             },
         });
 
         let e_5 = LogEvent::from(btreemap! {
-            log_schema().message_key() => btreemap! {
+            message_key.as_str() => btreemap! {
                 "status" => 2,
                 "method" => "POST",
             },
@@ -1821,7 +1830,7 @@ mod test {
         assert_eq!(
             output_1,
             LogEvent::from(btreemap! {
-                log_schema().message_key() => btreemap! {
+                message_key.as_str() => btreemap! {
                     "status" => 1,
                     "method" => json!(["GET", "POST", "POST"])
                 }
@@ -1832,7 +1841,7 @@ mod test {
         assert_eq!(
             output_2,
             LogEvent::from(btreemap! {
-                log_schema().message_key() => btreemap! {
+                message_key.as_str() => btreemap! {
                     "status" => 2,
                     "method" => json!(["POST", "POST"])
                 }
@@ -1857,37 +1866,38 @@ mod test {
         .await
         .unwrap();
         let reduce = reduce.into_task();
+        let message_key = log_schema().message_key().unwrap().to_string();
 
         let e_1 = LogEvent::from(btreemap! {
-            log_schema().message_key() => btreemap! {
+            message_key.as_str() => btreemap! {
                 "status" => 1,
                 "method" => "GET",
             },
         });
 
         let e_2 = LogEvent::from(btreemap! {
-            log_schema().message_key() => btreemap! {
+            message_key.as_str() => btreemap! {
                 "status" => 1,
                 "method" => "POST",
             },
         });
 
         let e_3 = LogEvent::from(btreemap! {
-            log_schema().message_key() => btreemap! {
+            message_key.as_str() => btreemap! {
                 "status" => 1,
                 "method" => "POST",
             },
         });
 
         let e_4 = LogEvent::from(btreemap! {
-            log_schema().message_key() => btreemap! {
+            message_key.as_str() => btreemap! {
                 "status" => 2,
                 "method" => "POST",
             },
         });
 
         let e_5 = LogEvent::from(btreemap! {
-            log_schema().message_key() => btreemap! {
+            message_key.as_str() => btreemap! {
                 "status" => 2,
                 "method" => "POST",
             },
@@ -1901,7 +1911,7 @@ mod test {
         assert_eq!(
             output_1,
             LogEvent::from(btreemap! {
-                log_schema().message_key() => btreemap! {
+                message_key.as_str() => btreemap! {
                     "status" => 1,
                     "method" => json!(["GET", "POST", "POST"])
                 }
@@ -1912,7 +1922,7 @@ mod test {
         assert_eq!(
             output_2,
             LogEvent::from(btreemap! {
-                log_schema().message_key() => btreemap! {
+                message_key.as_str() => btreemap! {
                     "status" => 2,
                     "method" => json!(["POST", "POST"])
                 }
@@ -1937,37 +1947,38 @@ mod test {
         .await
         .unwrap();
         let reduce = reduce.into_task();
+        let message_key = log_schema().message_key().unwrap().to_string();
 
         let e_1 = LogEvent::from(btreemap! {
-            log_schema().message_key() => btreemap! {
+            message_key.as_str() => btreemap! {
                 "my-status" => 1,
                 "method" => "GET",
             },
         });
 
         let e_2 = LogEvent::from(btreemap! {
-            log_schema().message_key() => btreemap! {
+            message_key.as_str() => btreemap! {
                 "my-status" => 1,
                 "method" => "POST",
             },
         });
 
         let e_3 = LogEvent::from(btreemap! {
-            log_schema().message_key() => btreemap! {
+            message_key.as_str() => btreemap! {
                 "my-status" => 1,
                 "method" => "POST",
             },
         });
 
         let e_4 = LogEvent::from(btreemap! {
-            log_schema().message_key() => btreemap! {
+            message_key.as_str() => btreemap! {
                 "my-status" => 2,
                 "method" => "POST",
             },
         });
 
         let e_5 = LogEvent::from(btreemap! {
-            log_schema().message_key() => btreemap! {
+            message_key.as_str() => btreemap! {
                 "my-status" => 2,
                 "method" => "POST",
             },
@@ -1981,7 +1992,7 @@ mod test {
         assert_eq!(
             output_1,
             LogEvent::from(btreemap! {
-                log_schema().message_key() => btreemap! {
+                message_key.as_str() => btreemap! {
                     "my-status" => 1,
                     "method" => json!(["GET", "POST", "POST"])
                 }
@@ -1992,7 +2003,7 @@ mod test {
         assert_eq!(
             output_2,
             LogEvent::from(btreemap! {
-                log_schema().message_key() => btreemap! {
+                message_key.as_str() => btreemap! {
                     "my-status" => 2,
                     "method" => json!(["POST", "POST"])
                 }
@@ -2016,9 +2027,10 @@ mod test {
         .await
         .unwrap();
         let reduce = reduce.into_task();
+        let message_key = log_schema().message_key().unwrap().to_string();
 
         let e_1 = LogEvent::from(btreemap! {
-            log_schema().message_key() => btreemap! {
+            message_key.as_str() => btreemap! {
                 "user.data" => btreemap! {
                     "user_ids" => json!([1]),
                     "some_key" => "first",
@@ -2029,7 +2041,7 @@ mod test {
         });
 
         let e_2 = LogEvent::from(btreemap! {
-            log_schema().message_key() => btreemap! {
+            message_key.as_str() => btreemap! {
                 "user.data" => btreemap! {
                     "user_ids" => json!([1]),
                     "some_key" => "second",
@@ -2040,7 +2052,7 @@ mod test {
         });
 
         let e_3 = LogEvent::from(btreemap! {
-            log_schema().message_key() => btreemap! {
+            message_key.as_str() => btreemap! {
                 "user.data" => btreemap! {
                     "user_ids" => json!([1]),
                     "some_key" => "third",
@@ -2051,7 +2063,7 @@ mod test {
         });
 
         let e_4 = LogEvent::from(btreemap! {
-            log_schema().message_key() => btreemap! {
+            message_key.as_str() => btreemap! {
                 "user.data" => btreemap! {
                     "user_ids" => json!([2]),
                     "some_key" => "first",
@@ -2062,7 +2074,7 @@ mod test {
         });
 
         let e_5 = LogEvent::from(btreemap! {
-            log_schema().message_key() => btreemap! {
+            message_key.as_str() => btreemap! {
                 "user.data" => btreemap! {
                     "user_ids" => json!([2]),
                     "some_key" => "second",
@@ -2082,7 +2094,7 @@ mod test {
         assert_eq!(
             output_1,
             LogEvent::from(btreemap! {
-                log_schema().message_key() => btreemap! {
+                message_key.as_str() => btreemap! {
                     "user.data" => btreemap! {
                         "user_ids" => json!([1]),
                         "some_key" => "first",
@@ -2097,7 +2109,7 @@ mod test {
         assert_eq!(
             output_2,
             LogEvent::from(btreemap! {
-                log_schema().message_key() => btreemap! {
+                message_key.as_str() => btreemap! {
                     "user.data" => btreemap! {
                         "user_ids" => json!([2]),
                         "some_key" => "first",
@@ -2118,9 +2130,10 @@ mod test {
             .await
             .unwrap();
         let reduce = reduce.into_task();
+        let message_key = log_schema().message_key().unwrap().to_string();
 
         let mut e_1 = LogEvent::from(btreemap! {
-            log_schema().message_key() => btreemap! {
+            message_key.as_str() => btreemap! {
                 "num" => 1,
                 "method" => "GET",
             },
@@ -2176,9 +2189,10 @@ mod test {
         .await
         .unwrap();
         let reduce = reduce.into_task();
+        let message_key = log_schema().message_key().unwrap().to_string();
 
         let e_1 = LogEvent::from(btreemap! {
-            log_schema().message_key() => btreemap! {
+            message_key.as_str() => btreemap! {
                 "user.data" => btreemap! {
                     "some_key" => "first",
                     "my_int" => 55
@@ -2188,7 +2202,7 @@ mod test {
         });
 
         let e_2 = LogEvent::from(btreemap! {
-            log_schema().message_key() => btreemap! {
+            message_key.as_str() => btreemap! {
                 "user.data" => btreemap! {
                     "some_key" => "second",
                     "my_int" => 1
@@ -2198,7 +2212,7 @@ mod test {
         });
 
         let e_3 = LogEvent::from(btreemap! {
-            log_schema().message_key() => btreemap! {
+            message_key.as_str() => btreemap! {
                 "user.data" => btreemap! {
                     "some_key" => "third",
                     "my_int" => 2
@@ -2215,7 +2229,7 @@ mod test {
         assert_eq!(
             output_1,
             LogEvent::from(btreemap! {
-                log_schema().message_key() => btreemap! {
+                message_key.as_str() => btreemap! {
                     "user.data" => btreemap! {
                         "some_key" => "third",
                         "my_int" => 2
@@ -2245,9 +2259,10 @@ mod test {
         .await
         .unwrap();
         let reduce = reduce.into_task();
+        let message_key = log_schema().message_key().unwrap().to_string();
 
         let e_1 = LogEvent::from(btreemap! {
-            log_schema().message_key() => btreemap! {
+            message_key.as_str() => btreemap! {
                 "user.data" => btreemap! {
                     "id" => 1
                 },
@@ -2258,7 +2273,7 @@ mod test {
         });
 
         let e_2 = LogEvent::from(btreemap! {
-            log_schema().message_key() => btreemap! {
+            message_key.as_str() => btreemap! {
                 "user.data" => btreemap! {
                     "id" => 2
                 },
@@ -2269,7 +2284,7 @@ mod test {
         });
 
         let e_3 = LogEvent::from(btreemap! {
-            log_schema().message_key() => btreemap! {
+            message_key.as_str() => btreemap! {
                 "user.data" => btreemap! {
                     "id" => 1
                 },
@@ -2287,7 +2302,7 @@ mod test {
         assert_eq!(
             output_1,
             LogEvent::from(btreemap! {
-                log_schema().message_key() => btreemap! {
+                message_key.as_str() => btreemap! {
                     "user.data" => btreemap! {
                         "id" => 1
                     },
@@ -2304,7 +2319,7 @@ mod test {
         assert_eq!(
             output_2,
             LogEvent::from(btreemap! {
-                log_schema().message_key() => btreemap! {
+                message_key.as_str() => btreemap! {
                     "user.data" => btreemap! {
                         "id" => 2
                     },
diff --git a/src/transforms/remap.rs b/src/transforms/remap.rs
index 0d586bb1e35de..1a76ada3e9d71 100644
--- a/src/transforms/remap.rs
+++ b/src/transforms/remap.rs
@@ -7,8 +7,7 @@ use std::{
 };
 
 use codecs::MetricTagValues;
-use lookup::lookup_v2::{parse_value_path, ValuePath};
-use lookup::{metadata_path, owned_value_path, path, PathPrefix};
+use lookup::{metadata_path, owned_value_path, PathPrefix};
 use snafu::{ResultExt, Snafu};
 use vector_common::TimeZone;
 use vector_config::configurable_component;
@@ -20,6 +19,8 @@ use vrl::compiler::runtime::{Runtime, Terminate};
 use vrl::compiler::state::ExternalEnv;
 use vrl::compiler::{CompileConfig, ExpressionError, Function, Program, TypeState, VrlRuntime};
 use vrl::diagnostic::{DiagnosticMessage, Formatter, Note};
+use vrl::path;
+use vrl::path::ValuePath;
 use vrl::value::{Kind, Value};
 
 use crate::{
@@ -255,7 +256,7 @@ impl TransformConfig for RemapConfig {
             let dropped_definition = Definition::combine_log_namespaces(
                 input_definition.log_namespaces(),
                 input_definition.clone().with_event_field(
-                    &parse_value_path(log_schema().metadata_key()).expect("valid metadata key"),
+                    log_schema().metadata_key().expect("valid metadata key"),
                     Kind::object(BTreeMap::from([
                         ("reason".into(), Kind::bytes()),
                         ("message".into(), Kind::bytes()),
@@ -420,13 +421,12 @@ where
         match event {
             Event::Log(ref mut log) => match log.namespace() {
                 LogNamespace::Legacy => {
-                    log.insert(
-                        (
-                            PathPrefix::Event,
-                            log_schema().metadata_key().concat(path!("dropped")),
-                        ),
-                        self.dropped_data(reason, error),
-                    );
+                    if let Some(metadata_key) = log_schema().metadata_key() {
+                        log.insert(
+                            (PathPrefix::Event, metadata_key.concat(path!("dropped"))),
+                            self.dropped_data(reason, error),
+                        );
+                    }
                 }
                 LogNamespace::Vector => {
                     log.insert(
@@ -436,23 +436,29 @@ where
                 }
             },
             Event::Metric(ref mut metric) => {
-                let m = log_schema().metadata_key();
-                metric.replace_tag(format!("{}.dropped.reason", m), reason.into());
-                metric.replace_tag(
-                    format!("{}.dropped.component_id", m),
-                    self.component_key
-                        .as_ref()
-                        .map(ToString::to_string)
-                        .unwrap_or_else(String::new),
-                );
-                metric.replace_tag(format!("{}.dropped.component_type", m), "remap".into());
-                metric.replace_tag(format!("{}.dropped.component_kind", m), "transform".into());
+                if let Some(metadata_key) = log_schema().metadata_key() {
+                    metric.replace_tag(format!("{}.dropped.reason", metadata_key), reason.into());
+                    metric.replace_tag(
+                        format!("{}.dropped.component_id", metadata_key),
+                        self.component_key
+                            .as_ref()
+                            .map(ToString::to_string)
+                            .unwrap_or_else(String::new),
+                    );
+                    metric.replace_tag(
+                        format!("{}.dropped.component_type", metadata_key),
+                        "remap".into(),
+                    );
+                    metric.replace_tag(
+                        format!("{}.dropped.component_kind", metadata_key),
+                        "transform".into(),
+                    );
+                }
             }
             Event::Trace(ref mut trace) => {
-                trace.insert(
-                    log_schema().metadata_key(),
-                    self.dropped_data(reason, error),
-                );
+                trace.maybe_insert(log_schema().metadata_key_target_path(), || {
+                    self.dropped_data(reason, error).into()
+                });
             }
         }
     }
diff --git a/src/transforms/sample.rs b/src/transforms/sample.rs
index db6b553961211..28efdcc5bc79a 100644
--- a/src/transforms/sample.rs
+++ b/src/transforms/sample.rs
@@ -1,5 +1,6 @@
 use vector_config::configurable_component;
 use vector_core::config::{LogNamespace, OutputId, TransformOutput};
+use vrl::event_path;
 
 use crate::{
     conditions::{AnyCondition, Condition},
@@ -128,8 +129,14 @@ impl FunctionTransform for Sample {
             .key_field
             .as_ref()
             .and_then(|key_field| match &event {
-                Event::Log(event) => event.get(key_field.as_str()),
-                Event::Trace(event) => event.get(key_field.as_str()),
+                Event::Log(event) => event
+                    .parse_path_and_get_value(key_field.as_str())
+                    .ok()
+                    .flatten(),
+                Event::Trace(event) => event
+                    .parse_path_and_get_value(key_field.as_str())
+                    .ok()
+                    .flatten(),
                 Event::Metric(_) => panic!("component can never receive metric events"),
             })
             .map(|v| v.to_string_lossy());
@@ -144,8 +151,12 @@ impl FunctionTransform for Sample {
 
         if num % self.rate == 0 {
             match event {
-                Event::Log(ref mut event) => event.insert("sample_rate", self.rate.to_string()),
-                Event::Trace(ref mut event) => event.insert("sample_rate", self.rate.to_string()),
+                Event::Log(ref mut event) => {
+                    event.insert(event_path!("sample_rate"), self.rate.to_string())
+                }
+                Event::Trace(ref mut event) => {
+                    event.insert(event_path!("sample_rate"), self.rate.to_string())
+                }
                 Event::Metric(_) => panic!("component can never receive metric events"),
             };
             output.push(event);
@@ -193,8 +204,11 @@ mod tests {
         let events = random_events(num_events);
         let mut sampler = Sample::new(
             2,
-            Some(log_schema().message_key().into()),
-            Some(condition_contains(log_schema().message_key(), "na")),
+            log_schema().message_key().map(ToString::to_string),
+            Some(condition_contains(
+                log_schema().message_key().unwrap().to_string().as_str(),
+                "na",
+            )),
         );
         let total_passed = events
             .into_iter()
@@ -211,8 +225,11 @@ mod tests {
         let events = random_events(num_events);
         let mut sampler = Sample::new(
             25,
-            Some(log_schema().message_key().into()),
-            Some(condition_contains(log_schema().message_key(), "na")),
+            log_schema().message_key().map(ToString::to_string),
+            Some(condition_contains(
+                log_schema().message_key().unwrap().to_string().as_str(),
+                "na",
+            )),
         );
         let total_passed = events
             .into_iter()
@@ -232,8 +249,11 @@ mod tests {
         let events = random_events(1000);
         let mut sampler = Sample::new(
             2,
-            Some(log_schema().message_key().into()),
-            Some(condition_contains(log_schema().message_key(), "na")),
+            log_schema().message_key().map(ToString::to_string),
+            Some(condition_contains(
+                log_schema().message_key().unwrap().to_string().as_str(),
+                "na",
+            )),
         );
 
         let first_run = events
@@ -259,12 +279,15 @@ mod tests {
 
     #[test]
     fn always_passes_events_matching_pass_list() {
-        for key_field in &[None, Some(log_schema().message_key().into())] {
+        for key_field in &[None, log_schema().message_key().map(ToString::to_string)] {
             let event = Event::Log(LogEvent::from("i am important"));
             let mut sampler = Sample::new(
                 0,
                 key_field.clone(),
-                Some(condition_contains(log_schema().message_key(), "important")),
+                Some(condition_contains(
+                    log_schema().message_key().unwrap().to_string().as_str(),
+                    "important",
+                )),
             );
             let iterations = 0..1000;
             let total_passed = iterations
@@ -301,20 +324,17 @@ mod tests {
 
     #[test]
     fn sampler_adds_sampling_rate_to_event() {
-        for key_field in &[None, Some(log_schema().message_key().into())] {
+        for key_field in &[None, log_schema().message_key().map(ToString::to_string)] {
             let events = random_events(10000);
+            let message_key = log_schema().message_key().unwrap().to_string();
             let mut sampler = Sample::new(
                 10,
                 key_field.clone(),
-                Some(condition_contains(log_schema().message_key(), "na")),
+                Some(condition_contains(&message_key, "na")),
             );
             let passing = events
                 .into_iter()
-                .filter(|s| {
-                    !s.as_log()[log_schema().message_key()]
-                        .to_string_lossy()
-                        .contains("na")
-                })
+                .filter(|s| !s.as_log()[&message_key].to_string_lossy().contains("na"))
                 .find_map(|event| transform_one(&mut sampler, event))
                 .unwrap();
             assert_eq!(passing.as_log()["sample_rate"], "10".into());
@@ -323,15 +343,11 @@ mod tests {
             let mut sampler = Sample::new(
                 25,
                 key_field.clone(),
-                Some(condition_contains(log_schema().message_key(), "na")),
+                Some(condition_contains(&message_key, "na")),
             );
             let passing = events
                 .into_iter()
-                .filter(|s| {
-                    !s.as_log()[log_schema().message_key()]
-                        .to_string_lossy()
-                        .contains("na")
-                })
+                .filter(|s| !s.as_log()[&message_key].to_string_lossy().contains("na"))
                 .find_map(|event| transform_one(&mut sampler, event))
                 .unwrap();
             assert_eq!(passing.as_log()["sample_rate"], "25".into());
@@ -340,7 +356,7 @@ mod tests {
             let mut sampler = Sample::new(
                 25,
                 key_field.clone(),
-                Some(condition_contains(log_schema().message_key(), "na")),
+                Some(condition_contains(&message_key, "na")),
             );
             let event = Event::Log(LogEvent::from("nananana"));
             let passing = transform_one(&mut sampler, event).unwrap();
diff --git a/src/transforms/tag_cardinality_limit/config.rs b/src/transforms/tag_cardinality_limit/config.rs
index b30abfe2590b4..37a940ca73a37 100644
--- a/src/transforms/tag_cardinality_limit/config.rs
+++ b/src/transforms/tag_cardinality_limit/config.rs
@@ -16,7 +16,7 @@ use vector_core::config::LogNamespace;
 pub struct TagCardinalityLimitConfig {
     /// How many distinct values to accept for any given key.
     #[serde(default = "default_value_limit")]
-    pub value_limit: u32,
+    pub value_limit: usize,
 
     #[configurable(derived)]
     #[serde(default = "default_limit_exceeded_action")]
@@ -79,7 +79,7 @@ const fn default_limit_exceeded_action() -> LimitExceededAction {
     LimitExceededAction::DropTag
 }
 
-const fn default_value_limit() -> u32 {
+const fn default_value_limit() -> usize {
     500
 }
 
diff --git a/src/transforms/tag_cardinality_limit/mod.rs b/src/transforms/tag_cardinality_limit/mod.rs
index 42caf15304cc0..14b18b457a6c0 100644
--- a/src/transforms/tag_cardinality_limit/mod.rs
+++ b/src/transforms/tag_cardinality_limit/mod.rs
@@ -55,11 +55,11 @@ impl TagCardinalityLimit {
         }
 
         // Tag value not yet part of the accepted set.
-        if tag_value_set.len() < self.config.value_limit as usize {
+        if tag_value_set.len() < self.config.value_limit {
             // accept the new value
             tag_value_set.insert(value.clone());
 
-            if tag_value_set.len() == self.config.value_limit as usize {
+            if tag_value_set.len() == self.config.value_limit {
                 emit!(TagCardinalityValueLimitReached { key });
             }
 
@@ -76,7 +76,7 @@ impl TagCardinalityLimit {
         self.accepted_tags
             .get(key)
             .map(|value_set| {
-                !value_set.contains(value) && value_set.len() >= self.config.value_limit as usize
+                !value_set.contains(value) && value_set.len() >= self.config.value_limit
             })
             .unwrap_or(false)
     }
diff --git a/src/transforms/tag_cardinality_limit/tag_value_set.rs b/src/transforms/tag_cardinality_limit/tag_value_set.rs
index 599a021df110b..0296fa0cf0c68 100644
--- a/src/transforms/tag_cardinality_limit/tag_value_set.rs
+++ b/src/transforms/tag_cardinality_limit/tag_value_set.rs
@@ -1,6 +1,6 @@
 use crate::event::metric::TagValueSet;
 use crate::transforms::tag_cardinality_limit::config::Mode;
-use bloom::{BloomFilter, ASMS};
+use bloomy::BloomFilter;
 use std::collections::HashSet;
 use std::fmt;
 
@@ -8,12 +8,11 @@ use std::fmt;
 #[derive(Debug)]
 pub struct AcceptedTagValueSet {
     storage: TagValueSetStorage,
-    num_elements: usize,
 }
 
 enum TagValueSetStorage {
     Set(HashSet<TagValueSet>),
-    Bloom(BloomFilter),
+    Bloom(BloomFilter<TagValueSet>),
 }
 
 impl fmt::Debug for TagValueSetStorage {
@@ -26,40 +25,37 @@ impl fmt::Debug for TagValueSetStorage {
 }
 
 impl AcceptedTagValueSet {
-    pub fn new(value_limit: u32, mode: &Mode) -> Self {
+    pub fn new(value_limit: usize, mode: &Mode) -> Self {
         let storage = match &mode {
-            Mode::Exact => TagValueSetStorage::Set(HashSet::with_capacity(value_limit as usize)),
+            Mode::Exact => TagValueSetStorage::Set(HashSet::with_capacity(value_limit)),
             Mode::Probabilistic(config) => {
                 let num_bits = config.cache_size_per_key / 8; // Convert bytes to bits
-                let num_hashes = bloom::optimal_num_hashes(num_bits, value_limit);
-                TagValueSetStorage::Bloom(BloomFilter::with_size(num_bits, num_hashes))
+                TagValueSetStorage::Bloom(BloomFilter::with_size(num_bits))
             }
         };
-        Self {
-            storage,
-            num_elements: 0,
-        }
+        Self { storage }
     }
 
     pub fn contains(&self, value: &TagValueSet) -> bool {
         match &self.storage {
             TagValueSetStorage::Set(set) => set.contains(value),
-            TagValueSetStorage::Bloom(bloom) => bloom.contains(&value),
+            TagValueSetStorage::Bloom(bloom) => bloom.contains(value),
         }
     }
 
-    pub const fn len(&self) -> usize {
-        self.num_elements
+    pub fn len(&self) -> usize {
+        match &self.storage {
+            TagValueSetStorage::Set(set) => set.len(),
+            TagValueSetStorage::Bloom(bloom) => bloom.count(),
+        }
     }
 
-    pub fn insert(&mut self, value: TagValueSet) -> bool {
-        let inserted = match &mut self.storage {
-            TagValueSetStorage::Set(set) => set.insert(value),
+    pub fn insert(&mut self, value: TagValueSet) {
+        match &mut self.storage {
+            TagValueSetStorage::Set(set) => {
+                set.insert(value);
+            }
             TagValueSetStorage::Bloom(bloom) => bloom.insert(&value),
         };
-        if inserted {
-            self.num_elements += 1
-        }
-        inserted
     }
 }
diff --git a/src/transforms/tag_cardinality_limit/tests.rs b/src/transforms/tag_cardinality_limit/tests.rs
index 5753d0176dd3b..7e386a6403ab8 100644
--- a/src/transforms/tag_cardinality_limit/tests.rs
+++ b/src/transforms/tag_cardinality_limit/tests.rs
@@ -35,7 +35,7 @@ fn make_metric(tags: MetricTags) -> Event {
 }
 
 const fn make_transform_hashset(
-    value_limit: u32,
+    value_limit: usize,
     limit_exceeded_action: LimitExceededAction,
 ) -> TagCardinalityLimitConfig {
     TagCardinalityLimitConfig {
@@ -46,7 +46,7 @@ const fn make_transform_hashset(
 }
 
 const fn make_transform_bloom(
-    value_limit: u32,
+    value_limit: usize,
     limit_exceeded_action: LimitExceededAction,
 ) -> TagCardinalityLimitConfig {
     TagCardinalityLimitConfig {
diff --git a/src/transforms/throttle.rs b/src/transforms/throttle.rs
index a0beb9842eafe..0d5bb24ce7dbc 100644
--- a/src/transforms/throttle.rs
+++ b/src/transforms/throttle.rs
@@ -30,7 +30,7 @@ pub struct ThrottleConfig {
     threshold: u32,
 
     /// The time window in which the configured `threshold` is applied, in seconds.
-    #[serde_as(as = "serde_with::DurationSeconds<f64>")]
+    #[serde_as(as = "serde_with::DurationSecondsWithFrac<f64>")]
     #[configurable(metadata(docs::human_name = "Time Window"))]
     window_secs: Duration,
 
diff --git a/src/validate.rs b/src/validate.rs
index 36b402f117a46..f4eac69455717 100644
--- a/src/validate.rs
+++ b/src/validate.rs
@@ -411,7 +411,7 @@ impl Formatter {
             .as_ref()
             .lines()
             .map(|line| {
-                String::from_utf8_lossy(&strip_ansi_escapes::strip(line).unwrap())
+                String::from_utf8_lossy(&strip_ansi_escapes::strip(line))
                     .chars()
                     .count()
             })
diff --git a/src/vector_windows.rs b/src/vector_windows.rs
index 5ba3548ce5a25..7aac7cef587ff 100644
--- a/src/vector_windows.rs
+++ b/src/vector_windows.rs
@@ -379,7 +379,7 @@ fn run_service(_arguments: Vec<OsString>) -> Result<()> {
 
                     // Handle stop
                     ServiceControl::Stop => {
-                        while signal_tx.send(SignalTo::Shutdown).is_err() {}
+                        while signal_tx.send(SignalTo::Shutdown(None)).is_err() {}
                         ServiceControlHandlerResult::NoError
                     }
 
diff --git a/tests/data/dnstap/Dockerfile b/tests/data/dnstap/Dockerfile
index cb61b13a2a101..ee929c6c2c925 100644
--- a/tests/data/dnstap/Dockerfile
+++ b/tests/data/dnstap/Dockerfile
@@ -1,4 +1,4 @@
-FROM docker.io/library/debian:bullseye
+FROM docker.io/library/debian:bookworm
 
 ENV DEBIAN_FRONTEND=noninteractive
 RUN apt-get update \
diff --git a/tilt/Dockerfile b/tilt/Dockerfile
index 833402a795bf6..dcdcaca0abe7c 100644
--- a/tilt/Dockerfile
+++ b/tilt/Dockerfile
@@ -1,5 +1,5 @@
 ARG RUST_VERSION
-ARG DEBIAN_RELEASE=bullseye
+ARG DEBIAN_RELEASE=bookworm
 # Features required for both Agent and Aggregator Helm chart configurations
 ARG FEATURES=api,api-client,sources-datadog_agent,sources-fluent,sources-host_metrics,sources-internal_metrics,sources-kubernetes_logs,sources-logstash,sources-splunk_hec,sources-statsd,sources-syslog,sources-vector,sinks-console,sinks-prometheus,sinks-vector
 
@@ -7,12 +7,20 @@ ARG FEATURES=api,api-client,sources-datadog_agent,sources-fluent,sources-host_me
 # VECTOR BUILDER
 #
 FROM docker.io/rust:${RUST_VERSION}-${DEBIAN_RELEASE} as builder
-RUN apt-get update && apt-get -y --no-install-recommends install build-essential git clang cmake libclang-dev libsasl2-dev libstdc++-10-dev libssl-dev libxxhash-dev zlib1g-dev zlib1g
-RUN git clone https://github.com/rui314/mold.git && cd mold && git checkout v1.2.1 && make -j"$(nproc)" && make install
+RUN apt-get update && apt-get -y --no-install-recommends install build-essential git clang cmake libclang-dev libsasl2-dev libstdc++-11-dev libssl-dev libxxhash-dev zlib1g-dev zlib1g
+RUN git clone https://github.com/rui314/mold.git \
+    && mkdir mold/build \
+    && cd mold/build \
+    && git checkout v2.0.0 \
+    && ../install-build-deps.sh \
+    && cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_COMPILER=c++ .. \
+    && cmake --build . -j $(nproc) \
+    && cmake --install .
 
 WORKDIR /vector
 COPY . .
 ARG FEATURES
+RUN scripts/environment/install-protoc.sh
 RUN --mount=type=cache,target=/vector/target \
     --mount=type=cache,target=/usr/local/cargo/registry \
     --mount=type=cache,target=/usr/local/cargo/git \
diff --git a/vdev/Cargo.toml b/vdev/Cargo.toml
index 968c89eccb169..7811c23928541 100644
--- a/vdev/Cargo.toml
+++ b/vdev/Cargo.toml
@@ -8,13 +8,13 @@ readme = "README.md"
 publish = false
 
 [dependencies]
-anyhow = "1.0.71"
+anyhow = "1.0.72"
 atty = "0.2.14"
 cached = "0.44.0"
 chrono = { version = "0.4.22", default-features = false, features = ["serde", "clock"] }
-clap = { version = "4.1.14", features = ["derive"] }
+clap = { version = "4.3.21", features = ["derive"] }
 clap-verbosity-flag = "2.0.1"
-clap_complete = "4.3.1"
+clap_complete = "4.3.2"
 confy = "0.5.1"
 directories = "5.0.1"
 # remove this when stabilized https://doc.rust-lang.org/stable/std/path/fn.absolute.html
@@ -22,19 +22,19 @@ dunce = "1.0.4"
 glob = { version = "0.3.1", default-features = false }
 hex = "0.4.3"
 indexmap = { version = "2.0", default-features = false, features = ["serde", "std"] }
-indicatif = { version = "0.17.5", features = ["improved_unicode"] }
+indicatif = { version = "0.17.6", features = ["improved_unicode"] }
 itertools = "0.11.0"
-log = "0.4.19"
+log = "0.4.20"
 once_cell = "1.18"
 os_info = { version = "3.7.0", default-features = false }
 # watch https://github.com/epage/anstyle for official interop with Clap
 owo-colors = { version = "3.5.0", features = ["supports-colors"] }
-paste = "1.0.12"
-regex = { version = "1.8.4", default-features = false, features = ["std", "perf"] }
+paste = "1.0.14"
+regex = { version = "1.9.3", default-features = false, features = ["std", "perf"] }
 reqwest = { version = "0.11", features = ["json", "blocking"] }
 serde = { version = "1.0", features = ["derive"] }
-serde_json = "1.0.99"
-serde_yaml = "0.9.22"
+serde_json = "1.0.104"
+serde_yaml = "0.9.25"
 sha2 = "0.10.7"
 tempfile = "3.6.0"
-toml = { version = "0.7.5", default-features = false, features = ["parse"] }
+toml = { version = "0.7.6", default-features = false, features = ["parse"] }
diff --git a/vdev/src/commands/build/licenses.rs b/vdev/src/commands/build/licenses.rs
index 98af2c8aa09b3..926abc0da0af2 100644
--- a/vdev/src/commands/build/licenses.rs
+++ b/vdev/src/commands/build/licenses.rs
@@ -9,6 +9,6 @@ pub struct Cli {}
 
 impl Cli {
     pub fn exec(self) -> Result<()> {
-        app::exec("rust-license-tool", ["write"], true)
+        app::exec("dd-rust-license-tool", ["write"], true)
     }
 }
diff --git a/vdev/src/commands/check/licenses.rs b/vdev/src/commands/check/licenses.rs
index 9a483a2383422..fd68a4c490c27 100644
--- a/vdev/src/commands/check/licenses.rs
+++ b/vdev/src/commands/check/licenses.rs
@@ -9,7 +9,7 @@ pub struct Cli {}
 
 impl Cli {
     pub fn exec(self) -> Result<()> {
-        app::exec("rust-license-tool", ["check"], true).map_err(|err| {
+        app::exec("dd-rust-license-tool", ["check"], true).map_err(|err| {
             info!("Run `cargo vdev build licenses` to regenerate the file");
             err
         })
diff --git a/vdev/src/commands/integration/ci_paths.rs b/vdev/src/commands/integration/ci_paths.rs
index f95573c189571..c37b682a2ec7b 100644
--- a/vdev/src/commands/integration/ci_paths.rs
+++ b/vdev/src/commands/integration/ci_paths.rs
@@ -11,9 +11,8 @@ pub struct Cli {}
 
 impl Cli {
     pub fn exec(&self) -> Result<()> {
-        // changes to vector-core should test all integrations
-        println!("all-int:");
-        println!("- \"lib/vector-core/**\"");
+        // placeholder for changes that should run all integration tests
+        println!("all-int: []");
 
         // paths for each integration are defined in their respective config files.
         for (integration, config) in IntegrationTestConfig::collect_all()? {
diff --git a/vdev/src/commands/integration/start.rs b/vdev/src/commands/integration/start.rs
index b697029d3dca9..da8947e74997a 100644
--- a/vdev/src/commands/integration/start.rs
+++ b/vdev/src/commands/integration/start.rs
@@ -24,6 +24,6 @@ impl Cli {
             let env = envs.keys().next().expect("Integration has no environments");
             env.clone()
         };
-        IntegrationTest::new(self.integration, environment)?.start()
+        IntegrationTest::new(self.integration, environment, false, 0)?.start()
     }
 }
diff --git a/vdev/src/commands/integration/stop.rs b/vdev/src/commands/integration/stop.rs
index 319c9d4643435..22955d5fa7daf 100644
--- a/vdev/src/commands/integration/stop.rs
+++ b/vdev/src/commands/integration/stop.rs
@@ -9,12 +9,16 @@ use crate::testing::{integration::IntegrationTest, state::EnvsDir};
 pub struct Cli {
     /// The integration name to stop
     integration: String,
+
+    /// If true, remove the runner container compiled with all integration test features
+    #[arg(short = 'a', long)]
+    all_features: bool,
 }
 
 impl Cli {
     pub fn exec(self) -> Result<()> {
         if let Some(active) = EnvsDir::new(&self.integration).active()? {
-            IntegrationTest::new(self.integration, active)?.stop()
+            IntegrationTest::new(self.integration, active, self.all_features, 0)?.stop()
         } else {
             println!("No environment for {:?} is active.", self.integration);
             Ok(())
diff --git a/vdev/src/commands/integration/test.rs b/vdev/src/commands/integration/test.rs
index 459224183973b..ca57d895bd0c8 100644
--- a/vdev/src/commands/integration/test.rs
+++ b/vdev/src/commands/integration/test.rs
@@ -20,6 +20,14 @@ pub struct Cli {
     /// The desired environment (optional)
     environment: Option<String>,
 
+    /// Whether to compile the test runner with all integration test features
+    #[arg(short = 'a', long)]
+    build_all: bool,
+
+    /// Number of retries to allow on each integration test case.
+    #[arg(short = 'r', long)]
+    retries: Option<u8>,
+
     /// Extra test command arguments
     args: Vec<String>,
 }
@@ -30,17 +38,25 @@ impl Cli {
         let envs = config.environments();
 
         let active = EnvsDir::new(&self.integration).active()?;
+
+        let retries = self.retries.unwrap_or_default();
+
         match (self.environment, active) {
             (Some(environment), Some(active)) if environment != active => {
                 bail!("Requested environment {environment:?} does not match active one {active:?}")
             }
             (Some(environment), _) => {
-                IntegrationTest::new(self.integration, environment)?.test(self.args)
+                IntegrationTest::new(self.integration, environment, self.build_all, retries)?
+                    .test(self.args)
+            }
+            (None, Some(active)) => {
+                IntegrationTest::new(self.integration, active, self.build_all, retries)?
+                    .test(self.args)
             }
-            (None, Some(active)) => IntegrationTest::new(self.integration, active)?.test(self.args),
             (None, None) => {
                 for env_name in envs.keys() {
-                    IntegrationTest::new(&self.integration, env_name)?.test(self.args.clone())?;
+                    IntegrationTest::new(&self.integration, env_name, self.build_all, retries)?
+                        .test(self.args.clone())?;
                 }
                 Ok(())
             }
diff --git a/vdev/src/commands/test.rs b/vdev/src/commands/test.rs
index 659a2bbc6010b..4c9f39d60e01a 100644
--- a/vdev/src/commands/test.rs
+++ b/vdev/src/commands/test.rs
@@ -38,13 +38,14 @@ impl Cli {
         let runner = get_agent_test_runner(self.container)?;
 
         let mut args = vec!["--workspace".to_string()];
-        if let Some(extra_args) = &self.args {
-            args.extend(extra_args.clone());
 
-            if !(self.container || extra_args.contains(&"--features".to_string())) {
-                let features = platform::default_features();
-                args.extend(["--features".to_string(), features.to_string()]);
-            }
+        if let Some(mut extra_args) = self.args {
+            args.append(&mut extra_args);
+        }
+
+        if !args.contains(&"--features".to_string()) {
+            let features = platform::default_features();
+            args.extend(["--features".to_string(), features.to_string()]);
         }
 
         runner.test(
diff --git a/vdev/src/testing/integration.rs b/vdev/src/testing/integration.rs
index ecac804a98842..8b371853cb37b 100644
--- a/vdev/src/testing/integration.rs
+++ b/vdev/src/testing/integration.rs
@@ -21,10 +21,17 @@ pub struct IntegrationTest {
     runner: IntegrationTestRunner,
     compose: Option<Compose>,
     env_config: Environment,
+    build_all: bool,
+    retries: u8,
 }
 
 impl IntegrationTest {
-    pub fn new(integration: impl Into<String>, environment: impl Into<String>) -> Result<Self> {
+    pub fn new(
+        integration: impl Into<String>,
+        environment: impl Into<String>,
+        build_all: bool,
+        retries: u8,
+    ) -> Result<Self> {
         let integration = integration.into();
         let environment = environment.into();
         let (test_dir, config) = IntegrationTestConfig::load(&integration)?;
@@ -34,8 +41,12 @@ impl IntegrationTest {
         };
         let network_name = format!("vector-integration-tests-{integration}");
         let compose = Compose::new(test_dir, env_config.clone(), network_name.clone())?;
+
+        // None if compiling with all integration test feature flag.
+        let runner_name = (!build_all).then(|| integration.clone());
+
         let runner = IntegrationTestRunner::new(
-            integration.clone(),
+            runner_name,
             &config.runner,
             compose.is_some().then_some(network_name),
         )?;
@@ -48,6 +59,8 @@ impl IntegrationTest {
             runner,
             compose,
             env_config,
+            build_all,
+            retries,
         })
     }
 
@@ -69,7 +82,12 @@ impl IntegrationTest {
         let mut args = self.config.args.clone().unwrap_or_default();
 
         args.push("--features".to_string());
-        args.push(self.config.features.join(","));
+
+        args.push(if self.build_all {
+            "all-integration-tests".to_string()
+        } else {
+            self.config.features.join(",")
+        });
 
         // If the test field is not present then use the --lib flag
         match self.config.test {
@@ -91,6 +109,11 @@ impl IntegrationTest {
             args.push("--no-capture".to_string());
         }
 
+        if self.retries > 0 {
+            args.push("--retries".to_string());
+            args.push(self.retries.to_string());
+        }
+
         self.runner
             .test(&env_vars, &self.config.runner.env, &args)?;
 
@@ -156,7 +179,10 @@ impl Compose {
                 // Inject the networks block
                 config.networks.insert(
                     "default".to_string(),
-                    BTreeMap::from_iter([("name".to_string(), network.clone())]),
+                    BTreeMap::from_iter([
+                        ("name".to_string(), network.clone()),
+                        ("external".to_string(), "true".to_string()),
+                    ]),
                 );
 
                 // Create a named tempfile, there may be resource leakage here in case of SIGINT
diff --git a/vdev/src/testing/runner.rs b/vdev/src/testing/runner.rs
index 1b6dd101cd8e0..9ce6616f700ad 100644
--- a/vdev/src/testing/runner.rs
+++ b/vdev/src/testing/runner.rs
@@ -47,6 +47,13 @@ fn detect_container_tool() -> OsString {
     fatal!("No container tool could be detected.");
 }
 
+fn get_rust_version() -> String {
+    match RustToolchainConfig::parse() {
+        Ok(config) => config.channel,
+        Err(error) => fatal!("Could not read `rust-toolchain.toml` file: {error}"),
+    }
+}
+
 fn dockercmd<I: AsRef<OsStr>>(args: impl IntoIterator<Item = I>) -> Command {
     let mut command = Command::new(&*CONTAINER_TOOL);
     command.args(args);
@@ -93,13 +100,6 @@ pub trait ContainerTestRunner: TestRunner {
             .wait(format!("Stopping container {}", self.container_name()))
     }
 
-    fn get_rust_version(&self) -> String {
-        match RustToolchainConfig::parse() {
-            Ok(config) => config.channel,
-            Err(error) => fatal!("Could not read `rust-toolchain.toml` file: {error}"),
-        }
-    }
-
     fn state(&self) -> Result<RunnerState> {
         let mut command = dockercmd(["ps", "-a", "--format", "{{.Names}} {{.State}}"]);
         let container_name = self.container_name();
@@ -183,8 +183,10 @@ pub trait ContainerTestRunner: TestRunner {
             &self.image_name(),
             "--file",
             dockerfile.to_str().unwrap(),
+            "--label",
+            "vector-test-runner=true",
             "--build-arg",
-            &format!("RUST_VERSION={}", self.get_rust_version()),
+            &format!("RUST_VERSION={}", get_rust_version()),
             "--build-arg",
             &format!(
                 "GITHUB_TOKEN={}",
@@ -301,7 +303,8 @@ where
 }
 
 pub(super) struct IntegrationTestRunner {
-    integration: String,
+    // The integration is None when compiling the runner image with the `all-integration-tests` feature.
+    integration: Option<String>,
     needs_docker_socket: bool,
     network: Option<String>,
     volumes: Vec<String>,
@@ -309,7 +312,7 @@ pub(super) struct IntegrationTestRunner {
 
 impl IntegrationTestRunner {
     pub(super) fn new(
-        integration: String,
+        integration: Option<String>,
         config: &IntegrationRunnerConfig,
         network: Option<String>,
     ) -> Result<Self> {
@@ -350,11 +353,11 @@ impl ContainerTestRunner for IntegrationTestRunner {
     }
 
     fn container_name(&self) -> String {
-        format!(
-            "vector-test-runner-{}-{}",
-            self.integration,
-            self.get_rust_version()
-        )
+        if let Some(integration) = self.integration.as_ref() {
+            format!("vector-test-runner-{}-{}", integration, get_rust_version())
+        } else {
+            format!("vector-test-runner-{}", get_rust_version())
+        }
     }
 
     fn image_name(&self) -> String {
@@ -378,7 +381,7 @@ impl ContainerTestRunner for DockerTestRunner {
     }
 
     fn container_name(&self) -> String {
-        format!("vector-test-runner-{}", self.get_rust_version())
+        format!("vector-test-runner-{}", get_rust_version())
     }
 
     fn image_name(&self) -> String {
diff --git a/website/content/en/blog/log-namespacing.md b/website/content/en/blog/log-namespacing.md
index 4516b5685794b..65bd5f8b02103 100644
--- a/website/content/en/blog/log-namespacing.md
+++ b/website/content/en/blog/log-namespacing.md
@@ -166,4 +166,4 @@ be used.
 [global log schema]: /docs/reference/configuration/global-options/#log_schema
 [set_semantic_meaning]: /docs/reference/vrl/functions/#set_semantic_meaning
 [remap]: /docs/reference/configuration/transforms/remap/
-[global config]: /docs/reference/configuration/global-options/#log_namespacing
+[global config]: /docs/reference/configuration/global-options/#schema.log_namespacing
diff --git a/website/content/en/docs/administration/tuning.md b/website/content/en/docs/administration/tuning/_index.md
similarity index 93%
rename from website/content/en/docs/administration/tuning.md
rename to website/content/en/docs/administration/tuning/_index.md
index fe92dae9c11db..836557b142088 100644
--- a/website/content/en/docs/administration/tuning.md
+++ b/website/content/en/docs/administration/tuning/_index.md
@@ -7,3 +7,7 @@ tags: ["tuning", "rust", "performance"]
 Vector is written in [Rust] and therefore doesn't include a runtime or a virtual machine. There are no special service-level steps you need to undertake to improve performance as Vector takes full advantage of all system resources by default and without any adjustments.
 
 [rust]: https://rust-lang.org
+
+## Pages
+
+{{< pages >}}
diff --git a/website/content/en/docs/administration/tuning/pgo.md b/website/content/en/docs/administration/tuning/pgo.md
new file mode 100644
index 0000000000000..6018ea0e3b7e6
--- /dev/null
+++ b/website/content/en/docs/administration/tuning/pgo.md
@@ -0,0 +1,31 @@
+---
+title: Profile-Guided Optimization
+description: How to optimize Vector performance with Profile-Guided Optimization
+short: PGO
+weight: 3
+tags: ["pgo", "tuning", "rust", "performance"]
+---
+
+Profile-Guided Optimization (PGO) is a compiler optimization technique where a program is optimized based on the runtime profile.
+
+According to the [tests], we see improvements of up to 15% more processed log events per second on some Vector workloads. The performance benefits depend on your typical workload - you can get better or worse results.
+
+More information about PGO in Vector you can read in the corresponding GitHub [issue].
+
+### How to build Vector with PGO?
+
+There are two major kinds of PGO: Instrumentation and Sampling (also known as AutoFDO). In this guide, is described the Instrumentation PGO with Vector. In this guide we use [cargo-pgo] for building Vector with PGO.
+
+* Install [cargo-pgo].
+* Check out the Vector repository.
+* Go to the Vector source directory and run `cargo pgo build`. It will build the instrumented Vector version.
+* Run instrumented Vector on your test load like `cargo pgo run -- -- -c vector.toml` and wait for some time to collect enough information from your workload. Usually, waiting several minutes is enough (but your case can be different).
+* Stop Vector instance. The profile data will be generated in the `target/pgo-profiles` directory.
+* Run `cargo pgo optimize`. It will build Vector with PGO optimization.
+
+A more detailed guide on how to apply PGO is in the Rust [documentation].
+
+[tests]: https://github.com/vectordotdev/vector/issues/15631#issue-1502073978
+[issue]: https://github.com/vectordotdev/vector/issues/15631
+[documentation]: https://doc.rust-lang.org/rustc/profile-guided-optimization.html
+[cargo-pgo]: https://github.com/Kobzol/cargo-pgo
diff --git a/website/content/en/docs/reference/configuration/sinks/greptimedb.md b/website/content/en/docs/reference/configuration/sinks/greptimedb.md
new file mode 100644
index 0000000000000..57aebf227d2f4
--- /dev/null
+++ b/website/content/en/docs/reference/configuration/sinks/greptimedb.md
@@ -0,0 +1,14 @@
+---
+title: GreptimeDB
+description: Writes metric data to [GreptimeDB](https://github.com/greptimeteam/greptimedb)
+kind: sink
+layout: component
+tags: ["greptimedb", "component", "sink", "storage", "time-series", "metrics"]
+---
+
+{{/*
+This doc is generated using:
+
+1. The template in layouts/docs/component.html
+2. The relevant CUE data in cue/reference/components/...
+*/}}
diff --git a/website/content/en/docs/setup/installation/operating-systems/macos.md b/website/content/en/docs/setup/installation/operating-systems/macos.md
index f83293bdf4a98..bdd227255e3f5 100644
--- a/website/content/en/docs/setup/installation/operating-systems/macos.md
+++ b/website/content/en/docs/setup/installation/operating-systems/macos.md
@@ -1,6 +1,7 @@
 ---
 title: macOS
 weight: 5
+supported_installers: ["Homebrew", "Vector installer", "Docker"]
 ---
 
 [macOS] is the primary operating system for Apple's Mac computers. It's a certified Unix system based on Apple's Darwin operating system. This page covers installing and managing Vector on the macOS operating system.
diff --git a/website/content/en/guides/level-up/managing-complex-configs.md b/website/content/en/guides/level-up/managing-complex-configs.md
index 3aa3e6d71277a..74c40a6ce301a 100644
--- a/website/content/en/guides/level-up/managing-complex-configs.md
+++ b/website/content/en/guides/level-up/managing-complex-configs.md
@@ -85,9 +85,11 @@ the grok parser:
   address = "0.0.0.0:9000"
 
 [transforms.foo]
-  type = "grok_parser"
   inputs = ["over_tcp"]
-  pattern = "%{TIMESTAMP_ISO8601:timestamp} %{LOGLEVEL:level} %{GREEDYDATA:message}"
+  type = "remap"
+  source = '''
+  . = parse_grok!(.message, s'%{TIMESTAMP_ISO8601:timestamp} %{LOGLEVEL:level} %{GREEDYDATA:message}')
+'''
 ```
 
 A common way to test this transform might be to temporarily change the source
diff --git a/website/content/en/guides/level-up/managing-schemas.md b/website/content/en/guides/level-up/managing-schemas.md
index 35e95e1f36e81..d5fd7fc33f87c 100644
--- a/website/content/en/guides/level-up/managing-schemas.md
+++ b/website/content/en/guides/level-up/managing-schemas.md
@@ -135,9 +135,10 @@ type = "stdin"
 
 [transforms.parse]
 inputs = ["application"]
-drop_field = true
-drop_invalid = false
-type = "json_parser"
+type = "remap"
+source = '''
+. = parse_json!(.message)
+'''
 
 [transforms.not_gdpr]
 type = "filter"
@@ -328,8 +329,6 @@ Where are you deploying Vector? Let us know, maybe we can help optimize it!
 
 [docs.sinks.console]: /docs/reference/configuration/sinks/console/
 [docs.sources]: /docs/reference/configuration/sources/
-[docs.transforms.grok_parser]: /docs/reference/vrl/functions/#parse_grok
-[docs.transforms.json_parser]: /docs/reference/vrl/functions/#parse_json
 [docs.transforms.remap]: /docs/reference/configuration/transforms/remap/
 [docs.enrichment_functions]: /docs/reference/vrl/functions/#enrichment-functions
 
diff --git a/website/content/en/highlights/2023-07-05-0-31-0-upgrade-guide.md b/website/content/en/highlights/2023-07-05-0-31-0-upgrade-guide.md
index bc77ce6ab0a2f..7214b6d8a7612 100644
--- a/website/content/en/highlights/2023-07-05-0-31-0-upgrade-guide.md
+++ b/website/content/en/highlights/2023-07-05-0-31-0-upgrade-guide.md
@@ -14,6 +14,10 @@ Vector's 0.31.0 release includes **breaking changes**:
 1. [Removal of various deprecated internal metrics](#deprecated-internal-metrics)
 1. [`component_received_event_bytes_total` and `component_sent_event_bytes_total` consistently use estimated JSON size of the event](#event_json_size)
 
+and **potentially impactful changes**:
+
+1. [AWS S3 endpoint path changes](#s3-paths)
+
 We cover them below to help you upgrade quickly:
 
 ## Upgrade guide
@@ -61,3 +65,13 @@ of the event should it be serialized to JSON.
 Measuring the events like this allows a consistent measurement to be applied
 across all components regardless of how the source or sink serializes the event
 when connecting to the external service.
+
+### Potentially impactful changes
+
+#### AWS S3 endpoint path changes {#s3-paths}
+
+The handling of AWS S3 endpoints for the `aws_s3` source and sink has changed due to an upgrade of
+the SDK that we use. For S3-compatible APIs like Cloudflare R2 you may find that you need to remove
+the bucket name from the endpoint, if you have it specified. For example
+`https://xxxxxxxxxxxxxxxxxxxxxxxxxxx.r2.cloudflarestorage.com/<bucket name>` should be written as
+`https://xxxxxxxxxxxxxxxxxxxxxxxxxxx.r2.cloudflarestorage.com`.
diff --git a/website/content/en/highlights/2023-08-15-0-32-0-upgrade-guide.md b/website/content/en/highlights/2023-08-15-0-32-0-upgrade-guide.md
new file mode 100644
index 0000000000000..bf09c95d421a1
--- /dev/null
+++ b/website/content/en/highlights/2023-08-15-0-32-0-upgrade-guide.md
@@ -0,0 +1,54 @@
+---
+date: "2023-08-15"
+title: "0.32 Upgrade Guide"
+description: "An upgrade guide that addresses breaking changes in 0.32.0"
+authors: ["jszwedko"]
+release: "0.32.0"
+hide_on_release_notes: false
+badges:
+  type: breaking change
+---
+
+Vector's 0.32.0 release includes **deprecations**:
+
+1. [VRL `to_timestamp` function](#deprecated-to-timestamp)
+2. [Deprecation of legacy OpenSSL providers](#legacy-openssl)
+
+and **potentially impactful changes**:
+
+1. [Upgrade of OpenSSL from 1.1.1 to 3.1.2](#openssl-upgrade)
+
+We cover them below to help you upgrade quickly:
+
+## Upgrade guide
+
+### Deprecations
+
+#### VRL `to_timestamp` function {#deprecated-to-timestamp}
+
+The `to_timestamp` function in VRL was deprecated. Instead, the following functions should be used:
+
+- `parse_timestamp` to parse string timestamps
+- `from_unix_timestamp` to parse integer timestamps
+
+This removes some confusion that existed around "magic formats" that the `to_timestamp` had by
+requiring string timestamp formats to be specified explicitly.
+
+#### Deprecation of legacy OpenSSL providers {#legacy-openssl}
+
+With the upgrade to OpenSSL 3.1.2, the [legacy algorithm
+provider](https://github.com/openssl/openssl/blob/openssl-3.1.2/README-PROVIDERS.md#the-legacy-provider)
+was deprecated. The default will be switched in a future version to [default
+provider](https://github.com/openssl/openssl/blob/openssl-3.1.2/README-PROVIDERS.md#the-default-provider).
+You can opt into this behavior now by setting the environment variable
+`VECTOR_OPENSSL_LEGACY_PROVIDER=false`.
+
+### Potentially impactful changes
+
+#### Upgrade of OpenSSL from 1.1.1 to 3.1.2 {#openssl-upgrade}
+
+As part of moving off of OpenSSL 1.1.1 before it becomes [end-of-life in
+September](https://www.openssl.org/blog/blog/2023/03/28/1.1.1-EOL/), Vector has upgraded the version
+that it statically compiles in to 3.1.2. We don't anticipate any end-user impact from this change to
+users of Vector, but [please let us know](https://github.com/vectordotdev/vector/issues) if you see
+any breakages resulting from this upgrade.
diff --git a/website/content/en/releases/0.32.0.md b/website/content/en/releases/0.32.0.md
new file mode 100644
index 0000000000000..c5a3c2f72a394
--- /dev/null
+++ b/website/content/en/releases/0.32.0.md
@@ -0,0 +1,4 @@
+---
+title: Vector v0.32.0 release notes
+weight: 21
+---
diff --git a/website/content/en/releases/0.32.1.md b/website/content/en/releases/0.32.1.md
new file mode 100644
index 0000000000000..a58cca9a967e5
--- /dev/null
+++ b/website/content/en/releases/0.32.1.md
@@ -0,0 +1,4 @@
+---
+title: Vector v0.32.1 release notes
+weight: 21
+---
diff --git a/website/content/en/releases/0.32.2.md b/website/content/en/releases/0.32.2.md
new file mode 100644
index 0000000000000..6a40925816b3a
--- /dev/null
+++ b/website/content/en/releases/0.32.2.md
@@ -0,0 +1,4 @@
+---
+title: Vector v0.32.2 release notes
+weight: 21
+---
diff --git a/website/cue/reference/administration/interfaces/kubectl.cue b/website/cue/reference/administration/interfaces/kubectl.cue
index 3524b0d09fea6..919c443e64ea2 100644
--- a/website/cue/reference/administration/interfaces/kubectl.cue
+++ b/website/cue/reference/administration/interfaces/kubectl.cue
@@ -19,7 +19,7 @@ administration: interfaces: kubectl: {
 	role_implementations: [Name=string]: {
 		commands: {
 			_deployment_variant:       string
-			_vector_version:           "0.31"
+			_vector_version:           "0.32"
 			_namespace:                string | *"vector"
 			_controller_resource_type: string
 			_controller_resource_name: string | *_deployment_variant
diff --git a/website/cue/reference/components/aws.cue b/website/cue/reference/components/aws.cue
index 602f04a540781..01f1da51715b4 100644
--- a/website/cue/reference/components/aws.cue
+++ b/website/cue/reference/components/aws.cue
@@ -196,16 +196,26 @@ components: _aws: {
 			body:  """
 				Vector checks for AWS credentials in the following order:
 
-				1. The [`auth.access_key_id`](#auth.access_key_id) and [`auth.secret_access_key`](#auth.secret_access_key) options.
-				2. The [`AWS_ACCESS_KEY_ID`](#auth.access_key_id) and [`AWS_SECRET_ACCESS_KEY`](#auth.secret_access_key) environment variables.
-				3. The [AWS credentials file](\(urls.aws_credentials_file)) (usually located at `~/.aws/credentials`).
-				4. The [IAM instance profile](\(urls.iam_instance_profile)) (only works if running on an EC2 instance
+				1. The [`auth.access_key_id`](#auth.access_key_id) and
+				   [`auth.secret_access_key`](#auth.secret_access_key) options.
+				2. The [`AWS_ACCESS_KEY_ID`](#auth.access_key_id) and
+				   [`AWS_SECRET_ACCESS_KEY`](#auth.secret_access_key) environment variables.
+				3. In [Web Identity
+				   Token](https://docs.aws.amazon.com/STS/latest/APIReference/API_AssumeRoleWithWebIdentity.html)
+				   credentials from the environment or container (including EKS). These credentials
+				   will automatically refresh when expired.
+				4. [ECS credentials (IAM roles for
+				   tasks)](https://docs.aws.amazon.com/AmazonECS/latest/developerguide/task-iam-roles.html).
+				   These credentials will automatically refresh when expired.
+				5. As entries in the credentials file in the `.aws` directory in your home directory
+				   (`~/.aws/credentials` on Linux, OS X, and Unix; `%userprofile%\\.aws\\credentials`
+				   on Microsoft Windows).
+				6. Using a named profile specified in the credentials file via the AWS_PROFILE environment variable.
+				7. The [IAM instance profile](\(urls.iam_instance_profile)) (only works if running on an EC2 instance
 				   with an instance profile/role). Requires IMDSv2 to be enabled. For EKS, you may need to increase the
-				   metadata token response hop limit to 2.
+				   metadata token response hop limit to 2. These credentials will automatically refresh when expired.
 
 				If no credentials are found, Vector's health check fails and an error is [logged](\(urls.vector_monitoring)).
-				If your AWS credentials expire, Vector will automatically search for up-to-date
-				credentials in the places (and order) described above.
 				"""
 			sub_sections: [
 				{
diff --git a/website/cue/reference/components/sinks/base/appsignal.cue b/website/cue/reference/components/sinks/base/appsignal.cue
index 79b5a26ff04cd..f3d81555a59d5 100644
--- a/website/cue/reference/components/sinks/base/appsignal.cue
+++ b/website/cue/reference/components/sinks/base/appsignal.cue
@@ -170,6 +170,17 @@ base: components: sinks: appsignal: configuration: {
 						required: false
 						type: float: default: 0.4
 					}
+					initial_concurrency: {
+						description: """
+																The initial concurrency limit to use. If not specified, the initial limit will be 1 (no concurrency).
+
+																It is recommended to set this value to your service's average limit if you're seeing that it takes a
+																long time to ramp up adaptive concurrency after a restart. You can find this value by looking at the
+																`adaptive_concurrency_limit` metric.
+																"""
+						required: false
+						type: uint: default: 1
+					}
 					rtt_deviation_scale: {
 						description: """
 																Scale of RTT deviations which are not considered anomalous.
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 e5ea223052de1..c0549fec49341 100644
--- a/website/cue/reference/components/sinks/base/aws_cloudwatch_logs.cue
+++ b/website/cue/reference/components/sinks/base/aws_cloudwatch_logs.cue
@@ -50,6 +50,15 @@ base: components: sinks: aws_cloudwatch_logs: configuration: {
 				required:    true
 				type: string: examples: ["/my/aws/credentials"]
 			}
+			external_id: {
+				description: """
+					The optional unique external ID in conjunction with role to assume.
+
+					[external_id]: https://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_create_for-user_externalid.html
+					"""
+				required: false
+				type: string: examples: ["randomEXAMPLEidString"]
+			}
 			imds: {
 				description: "Configuration for authenticating with AWS through IMDS."
 				required:    false
@@ -408,6 +417,17 @@ base: components: sinks: aws_cloudwatch_logs: configuration: {
 						required: false
 						type: float: default: 0.4
 					}
+					initial_concurrency: {
+						description: """
+																The initial concurrency limit to use. If not specified, the initial limit will be 1 (no concurrency).
+
+																It is recommended to set this value to your service's average limit if you're seeing that it takes a
+																long time to ramp up adaptive concurrency after a restart. You can find this value by looking at the
+																`adaptive_concurrency_limit` metric.
+																"""
+						required: false
+						type: uint: default: 1
+					}
 					rtt_deviation_scale: {
 						description: """
 																Scale of RTT deviations which are not considered anomalous.
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 36eede120e998..c39bc5392be01 100644
--- a/website/cue/reference/components/sinks/base/aws_cloudwatch_metrics.cue
+++ b/website/cue/reference/components/sinks/base/aws_cloudwatch_metrics.cue
@@ -50,6 +50,15 @@ base: components: sinks: aws_cloudwatch_metrics: configuration: {
 				required:    true
 				type: string: examples: ["/my/aws/credentials"]
 			}
+			external_id: {
+				description: """
+					The optional unique external ID in conjunction with role to assume.
+
+					[external_id]: https://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_create_for-user_externalid.html
+					"""
+				required: false
+				type: string: examples: ["randomEXAMPLEidString"]
+			}
 			imds: {
 				description: "Configuration for authenticating with AWS through IMDS."
 				required:    false
@@ -249,6 +258,17 @@ base: components: sinks: aws_cloudwatch_metrics: configuration: {
 						required: false
 						type: float: default: 0.4
 					}
+					initial_concurrency: {
+						description: """
+																The initial concurrency limit to use. If not specified, the initial limit will be 1 (no concurrency).
+
+																It is recommended to set this value to your service's average limit if you're seeing that it takes a
+																long time to ramp up adaptive concurrency after a restart. You can find this value by looking at the
+																`adaptive_concurrency_limit` metric.
+																"""
+						required: false
+						type: uint: default: 1
+					}
 					rtt_deviation_scale: {
 						description: """
 																Scale of RTT deviations which are not considered anomalous.
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 19a70860692e5..d5774f897043b 100644
--- a/website/cue/reference/components/sinks/base/aws_kinesis_firehose.cue
+++ b/website/cue/reference/components/sinks/base/aws_kinesis_firehose.cue
@@ -50,6 +50,15 @@ base: components: sinks: aws_kinesis_firehose: configuration: {
 				required:    true
 				type: string: examples: ["/my/aws/credentials"]
 			}
+			external_id: {
+				description: """
+					The optional unique external ID in conjunction with role to assume.
+
+					[external_id]: https://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_create_for-user_externalid.html
+					"""
+				required: false
+				type: string: examples: ["randomEXAMPLEidString"]
+			}
 			imds: {
 				description: "Configuration for authenticating with AWS through IMDS."
 				required:    false
@@ -379,6 +388,17 @@ base: components: sinks: aws_kinesis_firehose: configuration: {
 						required: false
 						type: float: default: 0.4
 					}
+					initial_concurrency: {
+						description: """
+																The initial concurrency limit to use. If not specified, the initial limit will be 1 (no concurrency).
+
+																It is recommended to set this value to your service's average limit if you're seeing that it takes a
+																long time to ramp up adaptive concurrency after a restart. You can find this value by looking at the
+																`adaptive_concurrency_limit` metric.
+																"""
+						required: false
+						type: uint: default: 1
+					}
 					rtt_deviation_scale: {
 						description: """
 																Scale of RTT deviations which are not considered anomalous.
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 40164b9d0e292..77edb8cb46aa8 100644
--- a/website/cue/reference/components/sinks/base/aws_kinesis_streams.cue
+++ b/website/cue/reference/components/sinks/base/aws_kinesis_streams.cue
@@ -50,6 +50,15 @@ base: components: sinks: aws_kinesis_streams: configuration: {
 				required:    true
 				type: string: examples: ["/my/aws/credentials"]
 			}
+			external_id: {
+				description: """
+					The optional unique external ID in conjunction with role to assume.
+
+					[external_id]: https://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_create_for-user_externalid.html
+					"""
+				required: false
+				type: string: examples: ["randomEXAMPLEidString"]
+			}
 			imds: {
 				description: "Configuration for authenticating with AWS through IMDS."
 				required:    false
@@ -388,6 +397,17 @@ base: components: sinks: aws_kinesis_streams: configuration: {
 						required: false
 						type: float: default: 0.4
 					}
+					initial_concurrency: {
+						description: """
+																The initial concurrency limit to use. If not specified, the initial limit will be 1 (no concurrency).
+
+																It is recommended to set this value to your service's average limit if you're seeing that it takes a
+																long time to ramp up adaptive concurrency after a restart. You can find this value by looking at the
+																`adaptive_concurrency_limit` metric.
+																"""
+						required: false
+						type: uint: default: 1
+					}
 					rtt_deviation_scale: {
 						description: """
 																Scale of RTT deviations which are not considered anomalous.
diff --git a/website/cue/reference/components/sinks/base/aws_s3.cue b/website/cue/reference/components/sinks/base/aws_s3.cue
index 11265897c80fc..1facd8fd4d40c 100644
--- a/website/cue/reference/components/sinks/base/aws_s3.cue
+++ b/website/cue/reference/components/sinks/base/aws_s3.cue
@@ -125,6 +125,15 @@ base: components: sinks: aws_s3: configuration: {
 				required:    true
 				type: string: examples: ["/my/aws/credentials"]
 			}
+			external_id: {
+				description: """
+					The optional unique external ID in conjunction with role to assume.
+
+					[external_id]: https://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_create_for-user_externalid.html
+					"""
+				required: false
+				type: string: examples: ["randomEXAMPLEidString"]
+			}
 			imds: {
 				description: "Configuration for authenticating with AWS through IMDS."
 				required:    false
@@ -625,6 +634,17 @@ base: components: sinks: aws_s3: configuration: {
 						required: false
 						type: float: default: 0.4
 					}
+					initial_concurrency: {
+						description: """
+																The initial concurrency limit to use. If not specified, the initial limit will be 1 (no concurrency).
+
+																It is recommended to set this value to your service's average limit if you're seeing that it takes a
+																long time to ramp up adaptive concurrency after a restart. You can find this value by looking at the
+																`adaptive_concurrency_limit` metric.
+																"""
+						required: false
+						type: uint: default: 1
+					}
 					rtt_deviation_scale: {
 						description: """
 																Scale of RTT deviations which are not considered anomalous.
diff --git a/website/cue/reference/components/sinks/base/aws_sqs.cue b/website/cue/reference/components/sinks/base/aws_sqs.cue
index 403beb674ba3e..ac6787c61fc41 100644
--- a/website/cue/reference/components/sinks/base/aws_sqs.cue
+++ b/website/cue/reference/components/sinks/base/aws_sqs.cue
@@ -50,6 +50,15 @@ base: components: sinks: aws_sqs: configuration: {
 				required:    true
 				type: string: examples: ["/my/aws/credentials"]
 			}
+			external_id: {
+				description: """
+					The optional unique external ID in conjunction with role to assume.
+
+					[external_id]: https://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_create_for-user_externalid.html
+					"""
+				required: false
+				type: string: examples: ["randomEXAMPLEidString"]
+			}
 			imds: {
 				description: "Configuration for authenticating with AWS through IMDS."
 				required:    false
@@ -341,6 +350,17 @@ base: components: sinks: aws_sqs: configuration: {
 						required: false
 						type: float: default: 0.4
 					}
+					initial_concurrency: {
+						description: """
+																The initial concurrency limit to use. If not specified, the initial limit will be 1 (no concurrency).
+
+																It is recommended to set this value to your service's average limit if you're seeing that it takes a
+																long time to ramp up adaptive concurrency after a restart. You can find this value by looking at the
+																`adaptive_concurrency_limit` metric.
+																"""
+						required: false
+						type: uint: default: 1
+					}
 					rtt_deviation_scale: {
 						description: """
 																Scale of RTT deviations which are not considered anomalous.
diff --git a/website/cue/reference/components/sinks/base/axiom.cue b/website/cue/reference/components/sinks/base/axiom.cue
index bb619bc886098..82a857624b19f 100644
--- a/website/cue/reference/components/sinks/base/axiom.cue
+++ b/website/cue/reference/components/sinks/base/axiom.cue
@@ -108,6 +108,17 @@ base: components: sinks: axiom: configuration: {
 						required: false
 						type: float: default: 0.4
 					}
+					initial_concurrency: {
+						description: """
+																The initial concurrency limit to use. If not specified, the initial limit will be 1 (no concurrency).
+
+																It is recommended to set this value to your service's average limit if you're seeing that it takes a
+																long time to ramp up adaptive concurrency after a restart. You can find this value by looking at the
+																`adaptive_concurrency_limit` metric.
+																"""
+						required: false
+						type: uint: default: 1
+					}
 					rtt_deviation_scale: {
 						description: """
 																Scale of RTT deviations which are not considered anomalous.
diff --git a/website/cue/reference/components/sinks/base/azure_blob.cue b/website/cue/reference/components/sinks/base/azure_blob.cue
index 5c2568145a597..46a1a6fbe5cf2 100644
--- a/website/cue/reference/components/sinks/base/azure_blob.cue
+++ b/website/cue/reference/components/sinks/base/azure_blob.cue
@@ -382,6 +382,17 @@ base: components: sinks: azure_blob: configuration: {
 						required: false
 						type: float: default: 0.4
 					}
+					initial_concurrency: {
+						description: """
+																The initial concurrency limit to use. If not specified, the initial limit will be 1 (no concurrency).
+
+																It is recommended to set this value to your service's average limit if you're seeing that it takes a
+																long time to ramp up adaptive concurrency after a restart. You can find this value by looking at the
+																`adaptive_concurrency_limit` metric.
+																"""
+						required: false
+						type: uint: default: 1
+					}
 					rtt_deviation_scale: {
 						description: """
 																Scale of RTT deviations which are not considered anomalous.
diff --git a/website/cue/reference/components/sinks/base/azure_monitor_logs.cue b/website/cue/reference/components/sinks/base/azure_monitor_logs.cue
index 76de4da2dc5ac..aafbe16e318ab 100644
--- a/website/cue/reference/components/sinks/base/azure_monitor_logs.cue
+++ b/website/cue/reference/components/sinks/base/azure_monitor_logs.cue
@@ -166,6 +166,17 @@ base: components: sinks: azure_monitor_logs: configuration: {
 						required: false
 						type: float: default: 0.4
 					}
+					initial_concurrency: {
+						description: """
+																The initial concurrency limit to use. If not specified, the initial limit will be 1 (no concurrency).
+
+																It is recommended to set this value to your service's average limit if you're seeing that it takes a
+																long time to ramp up adaptive concurrency after a restart. You can find this value by looking at the
+																`adaptive_concurrency_limit` metric.
+																"""
+						required: false
+						type: uint: default: 1
+					}
 					rtt_deviation_scale: {
 						description: """
 																Scale of RTT deviations which are not considered anomalous.
diff --git a/website/cue/reference/components/sinks/base/clickhouse.cue b/website/cue/reference/components/sinks/base/clickhouse.cue
index d030debc352aa..458cf35a21e81 100644
--- a/website/cue/reference/components/sinks/base/clickhouse.cue
+++ b/website/cue/reference/components/sinks/base/clickhouse.cue
@@ -138,7 +138,10 @@ base: components: sinks: clickhouse: configuration: {
 	database: {
 		description: "The database that contains the table that data is inserted into."
 		required:    false
-		type: string: examples: ["mydatabase"]
+		type: string: {
+			examples: ["mydatabase"]
+			syntax: "template"
+		}
 	}
 	date_time_best_effort: {
 		description: "Sets `date_time_input_format` to `best_effort`, allowing ClickHouse to properly parse RFC3339/ISO 8601."
@@ -216,6 +219,17 @@ base: components: sinks: clickhouse: configuration: {
 						required: false
 						type: float: default: 0.4
 					}
+					initial_concurrency: {
+						description: """
+																The initial concurrency limit to use. If not specified, the initial limit will be 1 (no concurrency).
+
+																It is recommended to set this value to your service's average limit if you're seeing that it takes a
+																long time to ramp up adaptive concurrency after a restart. You can find this value by looking at the
+																`adaptive_concurrency_limit` metric.
+																"""
+						required: false
+						type: uint: default: 1
+					}
 					rtt_deviation_scale: {
 						description: """
 																Scale of RTT deviations which are not considered anomalous.
@@ -325,7 +339,10 @@ base: components: sinks: clickhouse: configuration: {
 	table: {
 		description: "The table that data is inserted into."
 		required:    true
-		type: string: examples: ["mytable"]
+		type: string: {
+			examples: ["mytable"]
+			syntax: "template"
+		}
 	}
 	tls: {
 		description: "TLS configuration."
diff --git a/website/cue/reference/components/sinks/base/databend.cue b/website/cue/reference/components/sinks/base/databend.cue
index 069eb227207f7..2da07c23af456 100644
--- a/website/cue/reference/components/sinks/base/databend.cue
+++ b/website/cue/reference/components/sinks/base/databend.cue
@@ -258,6 +258,17 @@ base: components: sinks: databend: configuration: {
 						required: false
 						type: float: default: 0.4
 					}
+					initial_concurrency: {
+						description: """
+																The initial concurrency limit to use. If not specified, the initial limit will be 1 (no concurrency).
+
+																It is recommended to set this value to your service's average limit if you're seeing that it takes a
+																long time to ramp up adaptive concurrency after a restart. You can find this value by looking at the
+																`adaptive_concurrency_limit` metric.
+																"""
+						required: false
+						type: uint: default: 1
+					}
 					rtt_deviation_scale: {
 						description: """
 																Scale of RTT deviations which are not considered anomalous.
diff --git a/website/cue/reference/components/sinks/base/datadog_events.cue b/website/cue/reference/components/sinks/base/datadog_events.cue
index 445c879d9d210..27eeab0f24410 100644
--- a/website/cue/reference/components/sinks/base/datadog_events.cue
+++ b/website/cue/reference/components/sinks/base/datadog_events.cue
@@ -103,6 +103,17 @@ base: components: sinks: datadog_events: configuration: {
 						required: false
 						type: float: default: 0.4
 					}
+					initial_concurrency: {
+						description: """
+																The initial concurrency limit to use. If not specified, the initial limit will be 1 (no concurrency).
+
+																It is recommended to set this value to your service's average limit if you're seeing that it takes a
+																long time to ramp up adaptive concurrency after a restart. You can find this value by looking at the
+																`adaptive_concurrency_limit` metric.
+																"""
+						required: false
+						type: uint: default: 1
+					}
 					rtt_deviation_scale: {
 						description: """
 																Scale of RTT deviations which are not considered anomalous.
diff --git a/website/cue/reference/components/sinks/base/datadog_logs.cue b/website/cue/reference/components/sinks/base/datadog_logs.cue
index 852c972024102..71aa7a783d344 100644
--- a/website/cue/reference/components/sinks/base/datadog_logs.cue
+++ b/website/cue/reference/components/sinks/base/datadog_logs.cue
@@ -184,6 +184,17 @@ base: components: sinks: datadog_logs: configuration: {
 						required: false
 						type: float: default: 0.4
 					}
+					initial_concurrency: {
+						description: """
+																The initial concurrency limit to use. If not specified, the initial limit will be 1 (no concurrency).
+
+																It is recommended to set this value to your service's average limit if you're seeing that it takes a
+																long time to ramp up adaptive concurrency after a restart. You can find this value by looking at the
+																`adaptive_concurrency_limit` metric.
+																"""
+						required: false
+						type: uint: default: 1
+					}
 					rtt_deviation_scale: {
 						description: """
 																Scale of RTT deviations which are not considered anomalous.
diff --git a/website/cue/reference/components/sinks/base/datadog_metrics.cue b/website/cue/reference/components/sinks/base/datadog_metrics.cue
index 2d95089686fa3..e79fc5d01943d 100644
--- a/website/cue/reference/components/sinks/base/datadog_metrics.cue
+++ b/website/cue/reference/components/sinks/base/datadog_metrics.cue
@@ -145,6 +145,17 @@ base: components: sinks: datadog_metrics: configuration: {
 						required: false
 						type: float: default: 0.4
 					}
+					initial_concurrency: {
+						description: """
+																The initial concurrency limit to use. If not specified, the initial limit will be 1 (no concurrency).
+
+																It is recommended to set this value to your service's average limit if you're seeing that it takes a
+																long time to ramp up adaptive concurrency after a restart. You can find this value by looking at the
+																`adaptive_concurrency_limit` metric.
+																"""
+						required: false
+						type: uint: default: 1
+					}
 					rtt_deviation_scale: {
 						description: """
 																Scale of RTT deviations which are not considered anomalous.
diff --git a/website/cue/reference/components/sinks/base/datadog_traces.cue b/website/cue/reference/components/sinks/base/datadog_traces.cue
index 91ea597ae84be..8f8fd899d4121 100644
--- a/website/cue/reference/components/sinks/base/datadog_traces.cue
+++ b/website/cue/reference/components/sinks/base/datadog_traces.cue
@@ -154,6 +154,17 @@ base: components: sinks: datadog_traces: configuration: {
 						required: false
 						type: float: default: 0.4
 					}
+					initial_concurrency: {
+						description: """
+																The initial concurrency limit to use. If not specified, the initial limit will be 1 (no concurrency).
+
+																It is recommended to set this value to your service's average limit if you're seeing that it takes a
+																long time to ramp up adaptive concurrency after a restart. You can find this value by looking at the
+																`adaptive_concurrency_limit` metric.
+																"""
+						required: false
+						type: uint: default: 1
+					}
 					rtt_deviation_scale: {
 						description: """
 																Scale of RTT deviations which are not considered anomalous.
diff --git a/website/cue/reference/components/sinks/base/elasticsearch.cue b/website/cue/reference/components/sinks/base/elasticsearch.cue
index 5c76cb9537ba7..56432ddfb10ad 100644
--- a/website/cue/reference/components/sinks/base/elasticsearch.cue
+++ b/website/cue/reference/components/sinks/base/elasticsearch.cue
@@ -76,6 +76,16 @@ base: components: sinks: elasticsearch: configuration: {
 				required:      true
 				type: string: examples: ["/my/aws/credentials"]
 			}
+			external_id: {
+				description: """
+					The optional unique external ID in conjunction with role to assume.
+
+					[external_id]: https://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_create_for-user_externalid.html
+					"""
+				relevant_when: "strategy = \"aws\""
+				required:      false
+				type: string: examples: ["randomEXAMPLEidString"]
+			}
 			imds: {
 				description:   "Configuration for authenticating with AWS through IMDS."
 				relevant_when: "strategy = \"aws\""
@@ -561,6 +571,17 @@ base: components: sinks: elasticsearch: configuration: {
 						required: false
 						type: float: default: 0.4
 					}
+					initial_concurrency: {
+						description: """
+																The initial concurrency limit to use. If not specified, the initial limit will be 1 (no concurrency).
+
+																It is recommended to set this value to your service's average limit if you're seeing that it takes a
+																long time to ramp up adaptive concurrency after a restart. You can find this value by looking at the
+																`adaptive_concurrency_limit` metric.
+																"""
+						required: false
+						type: uint: default: 1
+					}
 					rtt_deviation_scale: {
 						description: """
 																Scale of RTT deviations which are not considered anomalous.
diff --git a/website/cue/reference/components/sinks/base/gcp_chronicle_unstructured.cue b/website/cue/reference/components/sinks/base/gcp_chronicle_unstructured.cue
index 82d963fc5da3a..382162e99084c 100644
--- a/website/cue/reference/components/sinks/base/gcp_chronicle_unstructured.cue
+++ b/website/cue/reference/components/sinks/base/gcp_chronicle_unstructured.cue
@@ -306,6 +306,17 @@ base: components: sinks: gcp_chronicle_unstructured: configuration: {
 						required: false
 						type: float: default: 0.4
 					}
+					initial_concurrency: {
+						description: """
+																The initial concurrency limit to use. If not specified, the initial limit will be 1 (no concurrency).
+
+																It is recommended to set this value to your service's average limit if you're seeing that it takes a
+																long time to ramp up adaptive concurrency after a restart. You can find this value by looking at the
+																`adaptive_concurrency_limit` metric.
+																"""
+						required: false
+						type: uint: default: 1
+					}
 					rtt_deviation_scale: {
 						description: """
 																Scale of RTT deviations which are not considered anomalous.
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 89b2f37613e0e..636acde2cdbea 100644
--- a/website/cue/reference/components/sinks/base/gcp_cloud_storage.cue
+++ b/website/cue/reference/components/sinks/base/gcp_cloud_storage.cue
@@ -465,6 +465,17 @@ base: components: sinks: gcp_cloud_storage: configuration: {
 						required: false
 						type: float: default: 0.4
 					}
+					initial_concurrency: {
+						description: """
+																The initial concurrency limit to use. If not specified, the initial limit will be 1 (no concurrency).
+
+																It is recommended to set this value to your service's average limit if you're seeing that it takes a
+																long time to ramp up adaptive concurrency after a restart. You can find this value by looking at the
+																`adaptive_concurrency_limit` metric.
+																"""
+						required: false
+						type: uint: default: 1
+					}
 					rtt_deviation_scale: {
 						description: """
 																Scale of RTT deviations which are not considered anomalous.
diff --git a/website/cue/reference/components/sinks/base/gcp_pubsub.cue b/website/cue/reference/components/sinks/base/gcp_pubsub.cue
index 9c45e6195401c..e63e3e1afd92e 100644
--- a/website/cue/reference/components/sinks/base/gcp_pubsub.cue
+++ b/website/cue/reference/components/sinks/base/gcp_pubsub.cue
@@ -297,6 +297,17 @@ base: components: sinks: gcp_pubsub: configuration: {
 						required: false
 						type: float: default: 0.4
 					}
+					initial_concurrency: {
+						description: """
+																The initial concurrency limit to use. If not specified, the initial limit will be 1 (no concurrency).
+
+																It is recommended to set this value to your service's average limit if you're seeing that it takes a
+																long time to ramp up adaptive concurrency after a restart. You can find this value by looking at the
+																`adaptive_concurrency_limit` metric.
+																"""
+						required: false
+						type: uint: default: 1
+					}
 					rtt_deviation_scale: {
 						description: """
 																Scale of RTT deviations which are not considered anomalous.
diff --git a/website/cue/reference/components/sinks/base/gcp_stackdriver_logs.cue b/website/cue/reference/components/sinks/base/gcp_stackdriver_logs.cue
index 646e9d3ec69a2..3da5fba5f8e65 100644
--- a/website/cue/reference/components/sinks/base/gcp_stackdriver_logs.cue
+++ b/website/cue/reference/components/sinks/base/gcp_stackdriver_logs.cue
@@ -212,6 +212,17 @@ base: components: sinks: gcp_stackdriver_logs: configuration: {
 						required: false
 						type: float: default: 0.4
 					}
+					initial_concurrency: {
+						description: """
+																The initial concurrency limit to use. If not specified, the initial limit will be 1 (no concurrency).
+
+																It is recommended to set this value to your service's average limit if you're seeing that it takes a
+																long time to ramp up adaptive concurrency after a restart. You can find this value by looking at the
+																`adaptive_concurrency_limit` metric.
+																"""
+						required: false
+						type: uint: default: 1
+					}
 					rtt_deviation_scale: {
 						description: """
 																Scale of RTT deviations which are not considered anomalous.
diff --git a/website/cue/reference/components/sinks/base/gcp_stackdriver_metrics.cue b/website/cue/reference/components/sinks/base/gcp_stackdriver_metrics.cue
index 6f58d57ca46a9..49531983a3e51 100644
--- a/website/cue/reference/components/sinks/base/gcp_stackdriver_metrics.cue
+++ b/website/cue/reference/components/sinks/base/gcp_stackdriver_metrics.cue
@@ -154,6 +154,17 @@ base: components: sinks: gcp_stackdriver_metrics: configuration: {
 						required: false
 						type: float: default: 0.4
 					}
+					initial_concurrency: {
+						description: """
+																The initial concurrency limit to use. If not specified, the initial limit will be 1 (no concurrency).
+
+																It is recommended to set this value to your service's average limit if you're seeing that it takes a
+																long time to ramp up adaptive concurrency after a restart. You can find this value by looking at the
+																`adaptive_concurrency_limit` metric.
+																"""
+						required: false
+						type: uint: default: 1
+					}
 					rtt_deviation_scale: {
 						description: """
 																Scale of RTT deviations which are not considered anomalous.
diff --git a/website/cue/reference/components/sinks/base/greptimedb.cue b/website/cue/reference/components/sinks/base/greptimedb.cue
new file mode 100644
index 0000000000000..2334ba9cde8f8
--- /dev/null
+++ b/website/cue/reference/components/sinks/base/greptimedb.cue
@@ -0,0 +1,351 @@
+package metadata
+
+base: components: sinks: greptimedb: configuration: {
+	acknowledgements: {
+		description: """
+			Controls how acknowledgements are handled for this sink.
+
+			See [End-to-end Acknowledgements][e2e_acks] for more information on how event acknowledgement is handled.
+
+			[e2e_acks]: https://vector.dev/docs/about/under-the-hood/architecture/end-to-end-acknowledgements/
+			"""
+		required: false
+		type: object: options: enabled: {
+			description: """
+				Whether or not end-to-end acknowledgements are enabled.
+
+				When enabled for a sink, any source connected to that sink, where the source supports
+				end-to-end acknowledgements as well, waits for events to be acknowledged by the sink
+				before acknowledging them at the source.
+
+				Enabling or disabling acknowledgements at the sink level takes precedence over any global
+				[`acknowledgements`][global_acks] configuration.
+
+				[global_acks]: https://vector.dev/docs/reference/configuration/global-options/#acknowledgements
+				"""
+			required: false
+			type: bool: {}
+		}
+	}
+	batch: {
+		description: "Event batching behavior."
+		required:    false
+		type: object: options: {
+			max_bytes: {
+				description: """
+					The maximum size of a batch that is processed by a sink.
+
+					This is based on the uncompressed size of the batched events, before they are
+					serialized/compressed.
+					"""
+				required: false
+				type: uint: unit: "bytes"
+			}
+			max_events: {
+				description: "The maximum size of a batch before it is flushed."
+				required:    false
+				type: uint: {
+					default: 20
+					unit:    "events"
+				}
+			}
+			timeout_secs: {
+				description: "The maximum age of a batch before it is flushed."
+				required:    false
+				type: float: {
+					default: 1.0
+					unit:    "seconds"
+				}
+			}
+		}
+	}
+	dbname: {
+		description: """
+			The GreptimeDB [database][database] name to connect.
+
+			Default to `public`, the default database of GreptimeDB.
+
+			Database can be created via `create database` statement on
+			GreptimeDB. If you are using GreptimeCloud, use `dbname` from the
+			connection information of your instance.
+
+			[database]: https://docs.greptime.com/user-guide/concepts/key-concepts#database
+			"""
+		required: false
+		type: string: {
+			default: "public"
+			examples: [
+				"public",
+			]
+		}
+	}
+	endpoint: {
+		description: """
+			The host and port of GreptimeDB gRPC service.
+
+			This sink uses GreptimeDB's gRPC interface for data ingestion. By
+			default, GreptimeDB listens to port 4001 for gRPC protocol.
+
+			The address _must_ include a port.
+			"""
+		required: true
+		type: string: examples: ["example.com:4001", "1nge17d2r3ns.ap-southeast-1.aws.greptime.cloud:4001"]
+	}
+	password: {
+		description: """
+			The password for your GreptimeDB instance.
+
+			This is required if your instance has authentication enabled.
+			"""
+		required: false
+		type: string: examples: ["password"]
+	}
+	request: {
+		description: """
+			Middleware settings for outbound requests.
+
+			Various settings can be configured, such as concurrency and rate limits, timeouts, etc.
+			"""
+		required: false
+		type: object: options: {
+			adaptive_concurrency: {
+				description: """
+					Configuration of adaptive concurrency parameters.
+
+					These parameters typically do not require changes from the default, and incorrect values can lead to meta-stable or
+					unstable performance and sink behavior. Proceed with caution.
+					"""
+				required: false
+				type: object: options: {
+					decrease_ratio: {
+						description: """
+																The fraction of the current value to set the new concurrency limit when decreasing the limit.
+
+																Valid values are greater than `0` and less than `1`. Smaller values cause the algorithm to scale back rapidly
+																when latency increases.
+
+																Note that the new limit is rounded down after applying this ratio.
+																"""
+						required: false
+						type: float: default: 0.9
+					}
+					ewma_alpha: {
+						description: """
+																The weighting of new measurements compared to older measurements.
+
+																Valid values are greater than `0` and less than `1`.
+
+																ARC uses an exponentially weighted moving average (EWMA) of past RTT measurements as a reference to compare with
+																the current RTT. Smaller values cause this reference to adjust more slowly, which may be useful if a service has
+																unusually high response variability.
+																"""
+						required: false
+						type: float: default: 0.4
+					}
+					initial_concurrency: {
+						description: """
+																The initial concurrency limit to use. If not specified, the initial limit will be 1 (no concurrency).
+
+																It is recommended to set this value to your service's average limit if you're seeing that it takes a
+																long time to ramp up adaptive concurrency after a restart. You can find this value by looking at the
+																`adaptive_concurrency_limit` metric.
+																"""
+						required: false
+						type: uint: default: 1
+					}
+					rtt_deviation_scale: {
+						description: """
+																Scale of RTT deviations which are not considered anomalous.
+
+																Valid values are greater than or equal to `0`, and we expect reasonable values to range from `1.0` to `3.0`.
+
+																When calculating the past RTT average, we also compute a secondary “deviation” value that indicates how variable
+																those values are. We use that deviation when comparing the past RTT average to the current measurements, so we
+																can ignore increases in RTT that are within an expected range. This factor is used to scale up the deviation to
+																an appropriate range.  Larger values cause the algorithm to ignore larger increases in the RTT.
+																"""
+						required: false
+						type: float: default: 2.5
+					}
+				}
+			}
+			concurrency: {
+				description: "Configuration for outbound request concurrency."
+				required:    false
+				type: {
+					string: {
+						default: "none"
+						enum: {
+							adaptive: """
+															Concurrency will be managed by Vector's [Adaptive Request Concurrency][arc] feature.
+
+															[arc]: https://vector.dev/docs/about/under-the-hood/networking/arc/
+															"""
+							none: """
+															A fixed concurrency of 1.
+
+															Only one request can be outstanding at any given time.
+															"""
+						}
+					}
+					uint: {}
+				}
+			}
+			rate_limit_duration_secs: {
+				description: "The time window used for the `rate_limit_num` option."
+				required:    false
+				type: uint: {
+					default: 1
+					unit:    "seconds"
+				}
+			}
+			rate_limit_num: {
+				description: "The maximum number of requests allowed within the `rate_limit_duration_secs` time window."
+				required:    false
+				type: uint: {
+					default: 9223372036854775807
+					unit:    "requests"
+				}
+			}
+			retry_attempts: {
+				description: """
+					The maximum number of retries to make for failed requests.
+
+					The default, for all intents and purposes, represents an infinite number of retries.
+					"""
+				required: false
+				type: uint: {
+					default: 9223372036854775807
+					unit:    "retries"
+				}
+			}
+			retry_initial_backoff_secs: {
+				description: """
+					The amount of time to wait before attempting the first retry for a failed request.
+
+					After the first retry has failed, the fibonacci sequence is used to select future backoffs.
+					"""
+				required: false
+				type: uint: {
+					default: 1
+					unit:    "seconds"
+				}
+			}
+			retry_max_duration_secs: {
+				description: "The maximum amount of time to wait between retries."
+				required:    false
+				type: uint: {
+					default: 3600
+					unit:    "seconds"
+				}
+			}
+			timeout_secs: {
+				description: """
+					The time a request can take before being aborted.
+
+					Datadog highly recommends that you do not lower this value below the service's internal timeout, as this could
+					create orphaned requests, pile on retries, and result in duplicate data downstream.
+					"""
+				required: false
+				type: uint: {
+					default: 60
+					unit:    "seconds"
+				}
+			}
+		}
+	}
+	tls: {
+		description: "TLS configuration."
+		required:    false
+		type: object: options: {
+			alpn_protocols: {
+				description: """
+					Sets the list of supported ALPN protocols.
+
+					Declare the supported ALPN protocols, which are used during negotiation with peer. They are prioritized in the order
+					that they are defined.
+					"""
+				required: false
+				type: array: items: type: string: examples: ["h2"]
+			}
+			ca_file: {
+				description: """
+					Absolute path to an additional CA certificate file.
+
+					The certificate must be in the DER or PEM (X.509) format. Additionally, the certificate can be provided as an inline string in PEM format.
+					"""
+				required: false
+				type: string: examples: ["/path/to/certificate_authority.crt"]
+			}
+			crt_file: {
+				description: """
+					Absolute path to a certificate file used to identify this server.
+
+					The certificate must be in DER, PEM (X.509), or PKCS#12 format. Additionally, the certificate can be provided as
+					an inline string in PEM format.
+
+					If this is set, and is not a PKCS#12 archive, `key_file` must also be set.
+					"""
+				required: false
+				type: string: examples: ["/path/to/host_certificate.crt"]
+			}
+			key_file: {
+				description: """
+					Absolute path to a private key file used to identify this server.
+
+					The key must be in DER or PEM (PKCS#8) format. Additionally, the key can be provided as an inline string in PEM format.
+					"""
+				required: false
+				type: string: examples: ["/path/to/host_certificate.key"]
+			}
+			key_pass: {
+				description: """
+					Passphrase used to unlock the encrypted key file.
+
+					This has no effect unless `key_file` is set.
+					"""
+				required: false
+				type: string: examples: ["${KEY_PASS_ENV_VAR}", "PassWord1"]
+			}
+			verify_certificate: {
+				description: """
+					Enables certificate verification.
+
+					If enabled, certificates must not be expired and must be issued by a trusted
+					issuer. This verification operates in a hierarchical manner, checking that the leaf certificate (the
+					certificate presented by the client/server) is not only valid, but that the issuer of that certificate is also valid, and
+					so on until the verification process reaches a root certificate.
+
+					Relevant for both incoming and outgoing connections.
+
+					Do NOT set this to `false` unless you understand the risks of not verifying the validity of certificates.
+					"""
+				required: false
+				type: bool: {}
+			}
+			verify_hostname: {
+				description: """
+					Enables hostname verification.
+
+					If enabled, the hostname used to connect to the remote host must be present in the TLS certificate presented by
+					the remote host, either as the Common Name or as an entry in the Subject Alternative Name extension.
+
+					Only relevant for outgoing connections.
+
+					Do NOT set this to `false` unless you understand the risks of not verifying the remote hostname.
+					"""
+				required: false
+				type: bool: {}
+			}
+		}
+	}
+	username: {
+		description: """
+			The username for your GreptimeDB instance.
+
+			This is required if your instance has authentication enabled.
+			"""
+		required: false
+		type: string: examples: ["username"]
+	}
+}
diff --git a/website/cue/reference/components/sinks/base/honeycomb.cue b/website/cue/reference/components/sinks/base/honeycomb.cue
index dbd1e0ab1f2a7..7fdcc3e59527a 100644
--- a/website/cue/reference/components/sinks/base/honeycomb.cue
+++ b/website/cue/reference/components/sinks/base/honeycomb.cue
@@ -135,6 +135,17 @@ base: components: sinks: honeycomb: configuration: {
 						required: false
 						type: float: default: 0.4
 					}
+					initial_concurrency: {
+						description: """
+																The initial concurrency limit to use. If not specified, the initial limit will be 1 (no concurrency).
+
+																It is recommended to set this value to your service's average limit if you're seeing that it takes a
+																long time to ramp up adaptive concurrency after a restart. You can find this value by looking at the
+																`adaptive_concurrency_limit` metric.
+																"""
+						required: false
+						type: uint: default: 1
+					}
 					rtt_deviation_scale: {
 						description: """
 																Scale of RTT deviations which are not considered anomalous.
diff --git a/website/cue/reference/components/sinks/base/http.cue b/website/cue/reference/components/sinks/base/http.cue
index c737b39f58f72..36381b0119f58 100644
--- a/website/cue/reference/components/sinks/base/http.cue
+++ b/website/cue/reference/components/sinks/base/http.cue
@@ -403,6 +403,17 @@ base: components: sinks: http: configuration: {
 						required: false
 						type: float: default: 0.4
 					}
+					initial_concurrency: {
+						description: """
+																The initial concurrency limit to use. If not specified, the initial limit will be 1 (no concurrency).
+
+																It is recommended to set this value to your service's average limit if you're seeing that it takes a
+																long time to ramp up adaptive concurrency after a restart. You can find this value by looking at the
+																`adaptive_concurrency_limit` metric.
+																"""
+						required: false
+						type: uint: default: 1
+					}
 					rtt_deviation_scale: {
 						description: """
 																Scale of RTT deviations which are not considered anomalous.
diff --git a/website/cue/reference/components/sinks/base/humio_logs.cue b/website/cue/reference/components/sinks/base/humio_logs.cue
index 8d8253417eb4b..6ad5779de9eb4 100644
--- a/website/cue/reference/components/sinks/base/humio_logs.cue
+++ b/website/cue/reference/components/sinks/base/humio_logs.cue
@@ -341,6 +341,17 @@ base: components: sinks: humio_logs: configuration: {
 						required: false
 						type: float: default: 0.4
 					}
+					initial_concurrency: {
+						description: """
+																The initial concurrency limit to use. If not specified, the initial limit will be 1 (no concurrency).
+
+																It is recommended to set this value to your service's average limit if you're seeing that it takes a
+																long time to ramp up adaptive concurrency after a restart. You can find this value by looking at the
+																`adaptive_concurrency_limit` metric.
+																"""
+						required: false
+						type: uint: default: 1
+					}
 					rtt_deviation_scale: {
 						description: """
 																Scale of RTT deviations which are not considered anomalous.
diff --git a/website/cue/reference/components/sinks/base/humio_metrics.cue b/website/cue/reference/components/sinks/base/humio_metrics.cue
index b919e8c7b8f2e..9f7dc55bdd459 100644
--- a/website/cue/reference/components/sinks/base/humio_metrics.cue
+++ b/website/cue/reference/components/sinks/base/humio_metrics.cue
@@ -237,6 +237,17 @@ base: components: sinks: humio_metrics: configuration: {
 						required: false
 						type: float: default: 0.4
 					}
+					initial_concurrency: {
+						description: """
+																The initial concurrency limit to use. If not specified, the initial limit will be 1 (no concurrency).
+
+																It is recommended to set this value to your service's average limit if you're seeing that it takes a
+																long time to ramp up adaptive concurrency after a restart. You can find this value by looking at the
+																`adaptive_concurrency_limit` metric.
+																"""
+						required: false
+						type: uint: default: 1
+					}
 					rtt_deviation_scale: {
 						description: """
 																Scale of RTT deviations which are not considered anomalous.
diff --git a/website/cue/reference/components/sinks/base/influxdb_logs.cue b/website/cue/reference/components/sinks/base/influxdb_logs.cue
index 21fc5d8ee2508..1d367fbd27f31 100644
--- a/website/cue/reference/components/sinks/base/influxdb_logs.cue
+++ b/website/cue/reference/components/sinks/base/influxdb_logs.cue
@@ -215,6 +215,17 @@ base: components: sinks: influxdb_logs: configuration: {
 						required: false
 						type: float: default: 0.4
 					}
+					initial_concurrency: {
+						description: """
+																The initial concurrency limit to use. If not specified, the initial limit will be 1 (no concurrency).
+
+																It is recommended to set this value to your service's average limit if you're seeing that it takes a
+																long time to ramp up adaptive concurrency after a restart. You can find this value by looking at the
+																`adaptive_concurrency_limit` metric.
+																"""
+						required: false
+						type: uint: default: 1
+					}
 					rtt_deviation_scale: {
 						description: """
 																Scale of RTT deviations which are not considered anomalous.
diff --git a/website/cue/reference/components/sinks/base/influxdb_metrics.cue b/website/cue/reference/components/sinks/base/influxdb_metrics.cue
index 42e444f63c55f..b221c7e3db25e 100644
--- a/website/cue/reference/components/sinks/base/influxdb_metrics.cue
+++ b/website/cue/reference/components/sinks/base/influxdb_metrics.cue
@@ -173,6 +173,17 @@ base: components: sinks: influxdb_metrics: configuration: {
 						required: false
 						type: float: default: 0.4
 					}
+					initial_concurrency: {
+						description: """
+																The initial concurrency limit to use. If not specified, the initial limit will be 1 (no concurrency).
+
+																It is recommended to set this value to your service's average limit if you're seeing that it takes a
+																long time to ramp up adaptive concurrency after a restart. You can find this value by looking at the
+																`adaptive_concurrency_limit` metric.
+																"""
+						required: false
+						type: uint: default: 1
+					}
 					rtt_deviation_scale: {
 						description: """
 																Scale of RTT deviations which are not considered anomalous.
diff --git a/website/cue/reference/components/sinks/base/logdna.cue b/website/cue/reference/components/sinks/base/logdna.cue
index 18b5ed6655acd..e2a03080cca13 100644
--- a/website/cue/reference/components/sinks/base/logdna.cue
+++ b/website/cue/reference/components/sinks/base/logdna.cue
@@ -178,6 +178,17 @@ base: components: sinks: logdna: configuration: {
 						required: false
 						type: float: default: 0.4
 					}
+					initial_concurrency: {
+						description: """
+																The initial concurrency limit to use. If not specified, the initial limit will be 1 (no concurrency).
+
+																It is recommended to set this value to your service's average limit if you're seeing that it takes a
+																long time to ramp up adaptive concurrency after a restart. You can find this value by looking at the
+																`adaptive_concurrency_limit` metric.
+																"""
+						required: false
+						type: uint: default: 1
+					}
 					rtt_deviation_scale: {
 						description: """
 																Scale of RTT deviations which are not considered anomalous.
diff --git a/website/cue/reference/components/sinks/base/loki.cue b/website/cue/reference/components/sinks/base/loki.cue
index 0071c5b2ac985..dd02a5c16d792 100644
--- a/website/cue/reference/components/sinks/base/loki.cue
+++ b/website/cue/reference/components/sinks/base/loki.cue
@@ -407,6 +407,17 @@ base: components: sinks: loki: configuration: {
 						required: false
 						type: float: default: 0.4
 					}
+					initial_concurrency: {
+						description: """
+																The initial concurrency limit to use. If not specified, the initial limit will be 1 (no concurrency).
+
+																It is recommended to set this value to your service's average limit if you're seeing that it takes a
+																long time to ramp up adaptive concurrency after a restart. You can find this value by looking at the
+																`adaptive_concurrency_limit` metric.
+																"""
+						required: false
+						type: uint: default: 1
+					}
 					rtt_deviation_scale: {
 						description: """
 																Scale of RTT deviations which are not considered anomalous.
diff --git a/website/cue/reference/components/sinks/base/mezmo.cue b/website/cue/reference/components/sinks/base/mezmo.cue
index 31907546e45e2..4ac6e3d290656 100644
--- a/website/cue/reference/components/sinks/base/mezmo.cue
+++ b/website/cue/reference/components/sinks/base/mezmo.cue
@@ -178,6 +178,17 @@ base: components: sinks: mezmo: configuration: {
 						required: false
 						type: float: default: 0.4
 					}
+					initial_concurrency: {
+						description: """
+																The initial concurrency limit to use. If not specified, the initial limit will be 1 (no concurrency).
+
+																It is recommended to set this value to your service's average limit if you're seeing that it takes a
+																long time to ramp up adaptive concurrency after a restart. You can find this value by looking at the
+																`adaptive_concurrency_limit` metric.
+																"""
+						required: false
+						type: uint: default: 1
+					}
 					rtt_deviation_scale: {
 						description: """
 																Scale of RTT deviations which are not considered anomalous.
diff --git a/website/cue/reference/components/sinks/base/new_relic.cue b/website/cue/reference/components/sinks/base/new_relic.cue
index 9fcf952c07d8c..4d6cbc8d4ff6d 100644
--- a/website/cue/reference/components/sinks/base/new_relic.cue
+++ b/website/cue/reference/components/sinks/base/new_relic.cue
@@ -184,6 +184,17 @@ base: components: sinks: new_relic: configuration: {
 						required: false
 						type: float: default: 0.4
 					}
+					initial_concurrency: {
+						description: """
+																The initial concurrency limit to use. If not specified, the initial limit will be 1 (no concurrency).
+
+																It is recommended to set this value to your service's average limit if you're seeing that it takes a
+																long time to ramp up adaptive concurrency after a restart. You can find this value by looking at the
+																`adaptive_concurrency_limit` metric.
+																"""
+						required: false
+						type: uint: default: 1
+					}
 					rtt_deviation_scale: {
 						description: """
 																Scale of RTT deviations which are not considered anomalous.
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 4089af9b9af7a..78ff004317f56 100644
--- a/website/cue/reference/components/sinks/base/prometheus_remote_write.cue
+++ b/website/cue/reference/components/sinks/base/prometheus_remote_write.cue
@@ -53,6 +53,16 @@ base: components: sinks: prometheus_remote_write: configuration: {
 				required:      true
 				type: string: examples: ["/my/aws/credentials"]
 			}
+			external_id: {
+				description: """
+					The optional unique external ID in conjunction with role to assume.
+
+					[external_id]: https://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_create_for-user_externalid.html
+					"""
+				relevant_when: "strategy = \"aws\""
+				required:      false
+				type: string: examples: ["randomEXAMPLEidString"]
+			}
 			imds: {
 				description:   "Configuration for authenticating with AWS through IMDS."
 				relevant_when: "strategy = \"aws\""
@@ -312,6 +322,17 @@ base: components: sinks: prometheus_remote_write: configuration: {
 						required: false
 						type: float: default: 0.4
 					}
+					initial_concurrency: {
+						description: """
+																The initial concurrency limit to use. If not specified, the initial limit will be 1 (no concurrency).
+
+																It is recommended to set this value to your service's average limit if you're seeing that it takes a
+																long time to ramp up adaptive concurrency after a restart. You can find this value by looking at the
+																`adaptive_concurrency_limit` metric.
+																"""
+						required: false
+						type: uint: default: 1
+					}
 					rtt_deviation_scale: {
 						description: """
 																Scale of RTT deviations which are not considered anomalous.
diff --git a/website/cue/reference/components/sinks/base/redis.cue b/website/cue/reference/components/sinks/base/redis.cue
index 774370ce58a00..f432ea7ff7fc3 100644
--- a/website/cue/reference/components/sinks/base/redis.cue
+++ b/website/cue/reference/components/sinks/base/redis.cue
@@ -301,6 +301,17 @@ base: components: sinks: redis: configuration: {
 						required: false
 						type: float: default: 0.4
 					}
+					initial_concurrency: {
+						description: """
+																The initial concurrency limit to use. If not specified, the initial limit will be 1 (no concurrency).
+
+																It is recommended to set this value to your service's average limit if you're seeing that it takes a
+																long time to ramp up adaptive concurrency after a restart. You can find this value by looking at the
+																`adaptive_concurrency_limit` metric.
+																"""
+						required: false
+						type: uint: default: 1
+					}
 					rtt_deviation_scale: {
 						description: """
 																Scale of RTT deviations which are not considered anomalous.
diff --git a/website/cue/reference/components/sinks/base/sematext_logs.cue b/website/cue/reference/components/sinks/base/sematext_logs.cue
index 7d0290d630297..bc1f06127e696 100644
--- a/website/cue/reference/components/sinks/base/sematext_logs.cue
+++ b/website/cue/reference/components/sinks/base/sematext_logs.cue
@@ -145,6 +145,17 @@ base: components: sinks: sematext_logs: configuration: {
 						required: false
 						type: float: default: 0.4
 					}
+					initial_concurrency: {
+						description: """
+																The initial concurrency limit to use. If not specified, the initial limit will be 1 (no concurrency).
+
+																It is recommended to set this value to your service's average limit if you're seeing that it takes a
+																long time to ramp up adaptive concurrency after a restart. You can find this value by looking at the
+																`adaptive_concurrency_limit` metric.
+																"""
+						required: false
+						type: uint: default: 1
+					}
 					rtt_deviation_scale: {
 						description: """
 																Scale of RTT deviations which are not considered anomalous.
diff --git a/website/cue/reference/components/sinks/base/sematext_metrics.cue b/website/cue/reference/components/sinks/base/sematext_metrics.cue
index 7befa370214de..1322b8bd26072 100644
--- a/website/cue/reference/components/sinks/base/sematext_metrics.cue
+++ b/website/cue/reference/components/sinks/base/sematext_metrics.cue
@@ -131,6 +131,17 @@ base: components: sinks: sematext_metrics: configuration: {
 						required: false
 						type: float: default: 0.4
 					}
+					initial_concurrency: {
+						description: """
+																The initial concurrency limit to use. If not specified, the initial limit will be 1 (no concurrency).
+
+																It is recommended to set this value to your service's average limit if you're seeing that it takes a
+																long time to ramp up adaptive concurrency after a restart. You can find this value by looking at the
+																`adaptive_concurrency_limit` metric.
+																"""
+						required: false
+						type: uint: default: 1
+					}
 					rtt_deviation_scale: {
 						description: """
 																Scale of RTT deviations which are not considered anomalous.
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 184db138643cc..ab946626c47ab 100644
--- a/website/cue/reference/components/sinks/base/splunk_hec_logs.cue
+++ b/website/cue/reference/components/sinks/base/splunk_hec_logs.cue
@@ -393,6 +393,17 @@ base: components: sinks: splunk_hec_logs: configuration: {
 						required: false
 						type: float: default: 0.4
 					}
+					initial_concurrency: {
+						description: """
+																The initial concurrency limit to use. If not specified, the initial limit will be 1 (no concurrency).
+
+																It is recommended to set this value to your service's average limit if you're seeing that it takes a
+																long time to ramp up adaptive concurrency after a restart. You can find this value by looking at the
+																`adaptive_concurrency_limit` metric.
+																"""
+						required: false
+						type: uint: default: 1
+					}
 					rtt_deviation_scale: {
 						description: """
 																Scale of RTT deviations which are not considered anomalous.
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 ce147a1055624..f7f203a0f6944 100644
--- a/website/cue/reference/components/sinks/base/splunk_hec_metrics.cue
+++ b/website/cue/reference/components/sinks/base/splunk_hec_metrics.cue
@@ -211,6 +211,17 @@ base: components: sinks: splunk_hec_metrics: configuration: {
 						required: false
 						type: float: default: 0.4
 					}
+					initial_concurrency: {
+						description: """
+																The initial concurrency limit to use. If not specified, the initial limit will be 1 (no concurrency).
+
+																It is recommended to set this value to your service's average limit if you're seeing that it takes a
+																long time to ramp up adaptive concurrency after a restart. You can find this value by looking at the
+																`adaptive_concurrency_limit` metric.
+																"""
+						required: false
+						type: uint: default: 1
+					}
 					rtt_deviation_scale: {
 						description: """
 																Scale of RTT deviations which are not considered anomalous.
diff --git a/website/cue/reference/components/sinks/base/vector.cue b/website/cue/reference/components/sinks/base/vector.cue
index b9b65a08b157e..9798d965b59d6 100644
--- a/website/cue/reference/components/sinks/base/vector.cue
+++ b/website/cue/reference/components/sinks/base/vector.cue
@@ -123,6 +123,17 @@ base: components: sinks: vector: configuration: {
 						required: false
 						type: float: default: 0.4
 					}
+					initial_concurrency: {
+						description: """
+																The initial concurrency limit to use. If not specified, the initial limit will be 1 (no concurrency).
+
+																It is recommended to set this value to your service's average limit if you're seeing that it takes a
+																long time to ramp up adaptive concurrency after a restart. You can find this value by looking at the
+																`adaptive_concurrency_limit` metric.
+																"""
+						required: false
+						type: uint: default: 1
+					}
 					rtt_deviation_scale: {
 						description: """
 																Scale of RTT deviations which are not considered anomalous.
diff --git a/website/cue/reference/components/sinks/greptimedb.cue b/website/cue/reference/components/sinks/greptimedb.cue
new file mode 100644
index 0000000000000..d538538bb432e
--- /dev/null
+++ b/website/cue/reference/components/sinks/greptimedb.cue
@@ -0,0 +1,90 @@
+package metadata
+
+components: sinks: greptimedb: {
+	title: "GreptimeDB"
+
+	classes: {
+		commonly_used: true
+		delivery:      "at_least_once"
+		development:   "beta"
+		egress_method: "batch"
+		service_providers: ["GreptimeDB"]
+		stateful: false
+	}
+
+	features: {
+		auto_generated:   true
+		acknowledgements: true
+		healthcheck: enabled: true
+		send: {
+			batch: {
+				enabled:      true
+				common:       false
+				max_bytes:    10_000_000
+				timeout_secs: 1.0
+			}
+			compression: enabled: false
+			encoding: {
+				enabled: true
+				codec: enabled: false
+			}
+			request: {
+				enabled: true
+				headers: false
+			}
+			tls: {
+				enabled:                true
+				can_verify_certificate: false
+				can_verify_hostname:    true
+				enabled_default:        false
+				enabled_by_scheme:      false
+			}
+			to: {
+				service: services.greptimedb
+
+				interface: {
+					socket: {
+						api: {
+							title: "GreptimeDB gRPC API"
+							url:   urls.greptimedb_grpc
+						}
+						direction: "outgoing"
+						protocols: ["http"]
+						ssl: "optional"
+					}
+				}
+			}
+		}
+	}
+
+	support: {
+		requirements: []
+		warnings: []
+		notices: []
+	}
+
+	configuration: base.components.sinks.greptimedb.configuration
+
+	input: {
+		logs: false
+		metrics: {
+			counter:      true
+			distribution: true
+			gauge:        true
+			histogram:    true
+			set:          true
+			summary:      true
+		}
+		traces: false
+	}
+
+	how_it_works: {
+		setup: {
+			title: "Setup"
+			body:  """
+				1. Start your own [GreptimeDB](\(urls.greptimedb)) or create an instance on [GreptimeCloud](\(urls.greptimecloud)).
+				2. Configure gRPC endpoint(host:port) and optional dbname and authentication information.
+				"""
+		}
+	}
+}
diff --git a/website/cue/reference/components/sources/base/amqp.cue b/website/cue/reference/components/sources/base/amqp.cue
index 93d2becda8f58..8100c736a7c46 100644
--- a/website/cue/reference/components/sources/base/amqp.cue
+++ b/website/cue/reference/components/sources/base/amqp.cue
@@ -83,6 +83,11 @@ base: components: sources: amqp: configuration: {
 															[vector_native_json]: https://github.com/vectordotdev/vector/blob/master/lib/codecs/tests/data/native_encoding/schema.cue
 															[experimental]: https://vector.dev/highlights/2022-03-31-native-event-codecs
 															"""
+						protobuf: """
+															Decodes the raw bytes as [protobuf][protobuf].
+
+															[protobuf]: https://protobuf.dev/
+															"""
 						syslog: """
 															Decodes the raw bytes as a Syslog message.
 
@@ -143,6 +148,23 @@ base: components: sources: amqp: configuration: {
 					type: bool: default: true
 				}
 			}
+			protobuf: {
+				description:   "Protobuf-specific decoding options."
+				relevant_when: "codec = \"protobuf\""
+				required:      false
+				type: object: options: {
+					desc_file: {
+						description: "Path to desc file"
+						required:    false
+						type: string: default: ""
+					}
+					message_type: {
+						description: "message type. e.g package.message"
+						required:    false
+						type: string: default: ""
+					}
+				}
+			}
 			syslog: {
 				description:   "Syslog-specific decoding options."
 				relevant_when: "codec = \"syslog\""
diff --git a/website/cue/reference/components/sources/base/aws_kinesis_firehose.cue b/website/cue/reference/components/sources/base/aws_kinesis_firehose.cue
index 8b17bfc8a5fbf..eb7af974c2350 100644
--- a/website/cue/reference/components/sources/base/aws_kinesis_firehose.cue
+++ b/website/cue/reference/components/sources/base/aws_kinesis_firehose.cue
@@ -86,6 +86,11 @@ base: components: sources: aws_kinesis_firehose: configuration: {
 															[vector_native_json]: https://github.com/vectordotdev/vector/blob/master/lib/codecs/tests/data/native_encoding/schema.cue
 															[experimental]: https://vector.dev/highlights/2022-03-31-native-event-codecs
 															"""
+						protobuf: """
+															Decodes the raw bytes as [protobuf][protobuf].
+
+															[protobuf]: https://protobuf.dev/
+															"""
 						syslog: """
 															Decodes the raw bytes as a Syslog message.
 
@@ -146,6 +151,23 @@ base: components: sources: aws_kinesis_firehose: configuration: {
 					type: bool: default: true
 				}
 			}
+			protobuf: {
+				description:   "Protobuf-specific decoding options."
+				relevant_when: "codec = \"protobuf\""
+				required:      false
+				type: object: options: {
+					desc_file: {
+						description: "Path to desc file"
+						required:    false
+						type: string: default: ""
+					}
+					message_type: {
+						description: "message type. e.g package.message"
+						required:    false
+						type: string: default: ""
+					}
+				}
+			}
 			syslog: {
 				description:   "Syslog-specific decoding options."
 				relevant_when: "codec = \"syslog\""
diff --git a/website/cue/reference/components/sources/base/aws_s3.cue b/website/cue/reference/components/sources/base/aws_s3.cue
index 4950291add6a7..ee9e3adcee02f 100644
--- a/website/cue/reference/components/sources/base/aws_s3.cue
+++ b/website/cue/reference/components/sources/base/aws_s3.cue
@@ -45,6 +45,15 @@ base: components: sources: aws_s3: configuration: {
 				required:    true
 				type: string: examples: ["/my/aws/credentials"]
 			}
+			external_id: {
+				description: """
+					The optional unique external ID in conjunction with role to assume.
+
+					[external_id]: https://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_create_for-user_externalid.html
+					"""
+				required: false
+				type: string: examples: ["randomEXAMPLEidString"]
+			}
 			imds: {
 				description: "Configuration for authenticating with AWS through IMDS."
 				required:    false
@@ -172,6 +181,11 @@ base: components: sources: aws_s3: configuration: {
 															[vector_native_json]: https://github.com/vectordotdev/vector/blob/master/lib/codecs/tests/data/native_encoding/schema.cue
 															[experimental]: https://vector.dev/highlights/2022-03-31-native-event-codecs
 															"""
+						protobuf: """
+															Decodes the raw bytes as [protobuf][protobuf].
+
+															[protobuf]: https://protobuf.dev/
+															"""
 						syslog: """
 															Decodes the raw bytes as a Syslog message.
 
@@ -232,6 +246,23 @@ base: components: sources: aws_s3: configuration: {
 					type: bool: default: true
 				}
 			}
+			protobuf: {
+				description:   "Protobuf-specific decoding options."
+				relevant_when: "codec = \"protobuf\""
+				required:      false
+				type: object: options: {
+					desc_file: {
+						description: "Path to desc file"
+						required:    false
+						type: string: default: ""
+					}
+					message_type: {
+						description: "message type. e.g package.message"
+						required:    false
+						type: string: default: ""
+					}
+				}
+			}
 			syslog: {
 				description:   "Syslog-specific decoding options."
 				relevant_when: "codec = \"syslog\""
diff --git a/website/cue/reference/components/sources/base/aws_sqs.cue b/website/cue/reference/components/sources/base/aws_sqs.cue
index 30a7e3fd6381a..aae7840898789 100644
--- a/website/cue/reference/components/sources/base/aws_sqs.cue
+++ b/website/cue/reference/components/sources/base/aws_sqs.cue
@@ -45,6 +45,15 @@ base: components: sources: aws_sqs: configuration: {
 				required:    true
 				type: string: examples: ["/my/aws/credentials"]
 			}
+			external_id: {
+				description: """
+					The optional unique external ID in conjunction with role to assume.
+
+					[external_id]: https://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_create_for-user_externalid.html
+					"""
+				required: false
+				type: string: examples: ["randomEXAMPLEidString"]
+			}
 			imds: {
 				description: "Configuration for authenticating with AWS through IMDS."
 				required:    false
@@ -167,6 +176,11 @@ base: components: sources: aws_sqs: configuration: {
 															[vector_native_json]: https://github.com/vectordotdev/vector/blob/master/lib/codecs/tests/data/native_encoding/schema.cue
 															[experimental]: https://vector.dev/highlights/2022-03-31-native-event-codecs
 															"""
+						protobuf: """
+															Decodes the raw bytes as [protobuf][protobuf].
+
+															[protobuf]: https://protobuf.dev/
+															"""
 						syslog: """
 															Decodes the raw bytes as a Syslog message.
 
@@ -227,6 +241,23 @@ base: components: sources: aws_sqs: configuration: {
 					type: bool: default: true
 				}
 			}
+			protobuf: {
+				description:   "Protobuf-specific decoding options."
+				relevant_when: "codec = \"protobuf\""
+				required:      false
+				type: object: options: {
+					desc_file: {
+						description: "Path to desc file"
+						required:    false
+						type: string: default: ""
+					}
+					message_type: {
+						description: "message type. e.g package.message"
+						required:    false
+						type: string: default: ""
+					}
+				}
+			}
 			syslog: {
 				description:   "Syslog-specific decoding options."
 				relevant_when: "codec = \"syslog\""
diff --git a/website/cue/reference/components/sources/base/datadog_agent.cue b/website/cue/reference/components/sources/base/datadog_agent.cue
index 4f625a5717ce5..eafd6916cc374 100644
--- a/website/cue/reference/components/sources/base/datadog_agent.cue
+++ b/website/cue/reference/components/sources/base/datadog_agent.cue
@@ -68,6 +68,11 @@ base: components: sources: datadog_agent: configuration: {
 															[vector_native_json]: https://github.com/vectordotdev/vector/blob/master/lib/codecs/tests/data/native_encoding/schema.cue
 															[experimental]: https://vector.dev/highlights/2022-03-31-native-event-codecs
 															"""
+						protobuf: """
+															Decodes the raw bytes as [protobuf][protobuf].
+
+															[protobuf]: https://protobuf.dev/
+															"""
 						syslog: """
 															Decodes the raw bytes as a Syslog message.
 
@@ -128,6 +133,23 @@ base: components: sources: datadog_agent: configuration: {
 					type: bool: default: true
 				}
 			}
+			protobuf: {
+				description:   "Protobuf-specific decoding options."
+				relevant_when: "codec = \"protobuf\""
+				required:      false
+				type: object: options: {
+					desc_file: {
+						description: "Path to desc file"
+						required:    false
+						type: string: default: ""
+					}
+					message_type: {
+						description: "message type. e.g package.message"
+						required:    false
+						type: string: default: ""
+					}
+				}
+			}
 			syslog: {
 				description:   "Syslog-specific decoding options."
 				relevant_when: "codec = \"syslog\""
diff --git a/website/cue/reference/components/sources/base/demo_logs.cue b/website/cue/reference/components/sources/base/demo_logs.cue
index d8366fa1c5ec9..e57db31371b89 100644
--- a/website/cue/reference/components/sources/base/demo_logs.cue
+++ b/website/cue/reference/components/sources/base/demo_logs.cue
@@ -47,6 +47,11 @@ base: components: sources: demo_logs: configuration: {
 															[vector_native_json]: https://github.com/vectordotdev/vector/blob/master/lib/codecs/tests/data/native_encoding/schema.cue
 															[experimental]: https://vector.dev/highlights/2022-03-31-native-event-codecs
 															"""
+						protobuf: """
+															Decodes the raw bytes as [protobuf][protobuf].
+
+															[protobuf]: https://protobuf.dev/
+															"""
 						syslog: """
 															Decodes the raw bytes as a Syslog message.
 
@@ -107,6 +112,23 @@ base: components: sources: demo_logs: configuration: {
 					type: bool: default: true
 				}
 			}
+			protobuf: {
+				description:   "Protobuf-specific decoding options."
+				relevant_when: "codec = \"protobuf\""
+				required:      false
+				type: object: options: {
+					desc_file: {
+						description: "Path to desc file"
+						required:    false
+						type: string: default: ""
+					}
+					message_type: {
+						description: "message type. e.g package.message"
+						required:    false
+						type: string: default: ""
+					}
+				}
+			}
 			syslog: {
 				description:   "Syslog-specific decoding options."
 				relevant_when: "codec = \"syslog\""
diff --git a/website/cue/reference/components/sources/base/exec.cue b/website/cue/reference/components/sources/base/exec.cue
index cc0e2ab6618e6..5842254670c91 100644
--- a/website/cue/reference/components/sources/base/exec.cue
+++ b/website/cue/reference/components/sources/base/exec.cue
@@ -43,6 +43,11 @@ base: components: sources: exec: configuration: {
 															[vector_native_json]: https://github.com/vectordotdev/vector/blob/master/lib/codecs/tests/data/native_encoding/schema.cue
 															[experimental]: https://vector.dev/highlights/2022-03-31-native-event-codecs
 															"""
+						protobuf: """
+															Decodes the raw bytes as [protobuf][protobuf].
+
+															[protobuf]: https://protobuf.dev/
+															"""
 						syslog: """
 															Decodes the raw bytes as a Syslog message.
 
@@ -103,6 +108,23 @@ base: components: sources: exec: configuration: {
 					type: bool: default: true
 				}
 			}
+			protobuf: {
+				description:   "Protobuf-specific decoding options."
+				relevant_when: "codec = \"protobuf\""
+				required:      false
+				type: object: options: {
+					desc_file: {
+						description: "Path to desc file"
+						required:    false
+						type: string: default: ""
+					}
+					message_type: {
+						description: "message type. e.g package.message"
+						required:    false
+						type: string: default: ""
+					}
+				}
+			}
 			syslog: {
 				description:   "Syslog-specific decoding options."
 				relevant_when: "codec = \"syslog\""
diff --git a/website/cue/reference/components/sources/base/file_descriptor.cue b/website/cue/reference/components/sources/base/file_descriptor.cue
index 6eaed568f2526..7a98e6e531d46 100644
--- a/website/cue/reference/components/sources/base/file_descriptor.cue
+++ b/website/cue/reference/components/sources/base/file_descriptor.cue
@@ -38,6 +38,11 @@ base: components: sources: file_descriptor: configuration: {
 															[vector_native_json]: https://github.com/vectordotdev/vector/blob/master/lib/codecs/tests/data/native_encoding/schema.cue
 															[experimental]: https://vector.dev/highlights/2022-03-31-native-event-codecs
 															"""
+						protobuf: """
+															Decodes the raw bytes as [protobuf][protobuf].
+
+															[protobuf]: https://protobuf.dev/
+															"""
 						syslog: """
 															Decodes the raw bytes as a Syslog message.
 
@@ -98,6 +103,23 @@ base: components: sources: file_descriptor: configuration: {
 					type: bool: default: true
 				}
 			}
+			protobuf: {
+				description:   "Protobuf-specific decoding options."
+				relevant_when: "codec = \"protobuf\""
+				required:      false
+				type: object: options: {
+					desc_file: {
+						description: "Path to desc file"
+						required:    false
+						type: string: default: ""
+					}
+					message_type: {
+						description: "message type. e.g package.message"
+						required:    false
+						type: string: default: ""
+					}
+				}
+			}
 			syslog: {
 				description:   "Syslog-specific decoding options."
 				relevant_when: "codec = \"syslog\""
diff --git a/website/cue/reference/components/sources/base/gcp_pubsub.cue b/website/cue/reference/components/sources/base/gcp_pubsub.cue
index 767c7587aa0a4..b1a87f22af305 100644
--- a/website/cue/reference/components/sources/base/gcp_pubsub.cue
+++ b/website/cue/reference/components/sources/base/gcp_pubsub.cue
@@ -114,6 +114,11 @@ base: components: sources: gcp_pubsub: configuration: {
 															[vector_native_json]: https://github.com/vectordotdev/vector/blob/master/lib/codecs/tests/data/native_encoding/schema.cue
 															[experimental]: https://vector.dev/highlights/2022-03-31-native-event-codecs
 															"""
+						protobuf: """
+															Decodes the raw bytes as [protobuf][protobuf].
+
+															[protobuf]: https://protobuf.dev/
+															"""
 						syslog: """
 															Decodes the raw bytes as a Syslog message.
 
@@ -174,6 +179,23 @@ base: components: sources: gcp_pubsub: configuration: {
 					type: bool: default: true
 				}
 			}
+			protobuf: {
+				description:   "Protobuf-specific decoding options."
+				relevant_when: "codec = \"protobuf\""
+				required:      false
+				type: object: options: {
+					desc_file: {
+						description: "Path to desc file"
+						required:    false
+						type: string: default: ""
+					}
+					message_type: {
+						description: "message type. e.g package.message"
+						required:    false
+						type: string: default: ""
+					}
+				}
+			}
 			syslog: {
 				description:   "Syslog-specific decoding options."
 				relevant_when: "codec = \"syslog\""
diff --git a/website/cue/reference/components/sources/base/heroku_logs.cue b/website/cue/reference/components/sources/base/heroku_logs.cue
index 982d0343ac1d1..b08134e07dee5 100644
--- a/website/cue/reference/components/sources/base/heroku_logs.cue
+++ b/website/cue/reference/components/sources/base/heroku_logs.cue
@@ -80,6 +80,11 @@ base: components: sources: heroku_logs: configuration: {
 															[vector_native_json]: https://github.com/vectordotdev/vector/blob/master/lib/codecs/tests/data/native_encoding/schema.cue
 															[experimental]: https://vector.dev/highlights/2022-03-31-native-event-codecs
 															"""
+						protobuf: """
+															Decodes the raw bytes as [protobuf][protobuf].
+
+															[protobuf]: https://protobuf.dev/
+															"""
 						syslog: """
 															Decodes the raw bytes as a Syslog message.
 
@@ -140,6 +145,23 @@ base: components: sources: heroku_logs: configuration: {
 					type: bool: default: true
 				}
 			}
+			protobuf: {
+				description:   "Protobuf-specific decoding options."
+				relevant_when: "codec = \"protobuf\""
+				required:      false
+				type: object: options: {
+					desc_file: {
+						description: "Path to desc file"
+						required:    false
+						type: string: default: ""
+					}
+					message_type: {
+						description: "message type. e.g package.message"
+						required:    false
+						type: string: default: ""
+					}
+				}
+			}
 			syslog: {
 				description:   "Syslog-specific decoding options."
 				relevant_when: "codec = \"syslog\""
diff --git a/website/cue/reference/components/sources/base/http.cue b/website/cue/reference/components/sources/base/http.cue
index b5aac87c8c2ff..21671e40afd90 100644
--- a/website/cue/reference/components/sources/base/http.cue
+++ b/website/cue/reference/components/sources/base/http.cue
@@ -82,6 +82,11 @@ base: components: sources: http: configuration: {
 						[vector_native_json]: https://github.com/vectordotdev/vector/blob/master/lib/codecs/tests/data/native_encoding/schema.cue
 						[experimental]: https://vector.dev/highlights/2022-03-31-native-event-codecs
 						"""
+					protobuf: """
+						Decodes the raw bytes as [protobuf][protobuf].
+
+						[protobuf]: https://protobuf.dev/
+						"""
 					syslog: """
 						Decodes the raw bytes as a Syslog message.
 
@@ -141,6 +146,23 @@ base: components: sources: http: configuration: {
 					type: bool: default: true
 				}
 			}
+			protobuf: {
+				description:   "Protobuf-specific decoding options."
+				relevant_when: "codec = \"protobuf\""
+				required:      false
+				type: object: options: {
+					desc_file: {
+						description: "Path to desc file"
+						required:    false
+						type: string: default: ""
+					}
+					message_type: {
+						description: "message type. e.g package.message"
+						required:    false
+						type: string: default: ""
+					}
+				}
+			}
 			syslog: {
 				description:   "Syslog-specific decoding options."
 				relevant_when: "codec = \"syslog\""
diff --git a/website/cue/reference/components/sources/base/http_client.cue b/website/cue/reference/components/sources/base/http_client.cue
index efe28fb6a7827..eb2df43a013d4 100644
--- a/website/cue/reference/components/sources/base/http_client.cue
+++ b/website/cue/reference/components/sources/base/http_client.cue
@@ -80,6 +80,11 @@ base: components: sources: http_client: configuration: {
 															[vector_native_json]: https://github.com/vectordotdev/vector/blob/master/lib/codecs/tests/data/native_encoding/schema.cue
 															[experimental]: https://vector.dev/highlights/2022-03-31-native-event-codecs
 															"""
+						protobuf: """
+															Decodes the raw bytes as [protobuf][protobuf].
+
+															[protobuf]: https://protobuf.dev/
+															"""
 						syslog: """
 															Decodes the raw bytes as a Syslog message.
 
@@ -140,6 +145,23 @@ base: components: sources: http_client: configuration: {
 					type: bool: default: true
 				}
 			}
+			protobuf: {
+				description:   "Protobuf-specific decoding options."
+				relevant_when: "codec = \"protobuf\""
+				required:      false
+				type: object: options: {
+					desc_file: {
+						description: "Path to desc file"
+						required:    false
+						type: string: default: ""
+					}
+					message_type: {
+						description: "message type. e.g package.message"
+						required:    false
+						type: string: default: ""
+					}
+				}
+			}
 			syslog: {
 				description:   "Syslog-specific decoding options."
 				relevant_when: "codec = \"syslog\""
@@ -309,13 +331,25 @@ base: components: sources: http_client: configuration: {
 		}
 	}
 	scrape_interval_secs: {
-		description: "The interval between calls."
-		required:    false
+		description: """
+			The interval between scrapes. Requests are run concurrently so if a scrape takes longer
+			than the interval a new scrape will be started. This can take extra resources, set the timeout
+			to a value lower than the scrape interval to prevent this from happening.
+			"""
+		required: false
 		type: uint: {
 			default: 15
 			unit:    "seconds"
 		}
 	}
+	scrape_timeout_secs: {
+		description: "The timeout for each scrape request."
+		required:    false
+		type: float: {
+			default: 5.0
+			unit:    "seconds"
+		}
+	}
 	tls: {
 		description: "TLS configuration."
 		required:    false
diff --git a/website/cue/reference/components/sources/base/http_server.cue b/website/cue/reference/components/sources/base/http_server.cue
index 6cda10ae713b2..6ee325a66a02c 100644
--- a/website/cue/reference/components/sources/base/http_server.cue
+++ b/website/cue/reference/components/sources/base/http_server.cue
@@ -82,6 +82,11 @@ base: components: sources: http_server: configuration: {
 						[vector_native_json]: https://github.com/vectordotdev/vector/blob/master/lib/codecs/tests/data/native_encoding/schema.cue
 						[experimental]: https://vector.dev/highlights/2022-03-31-native-event-codecs
 						"""
+					protobuf: """
+						Decodes the raw bytes as [protobuf][protobuf].
+
+						[protobuf]: https://protobuf.dev/
+						"""
 					syslog: """
 						Decodes the raw bytes as a Syslog message.
 
@@ -141,6 +146,23 @@ base: components: sources: http_server: configuration: {
 					type: bool: default: true
 				}
 			}
+			protobuf: {
+				description:   "Protobuf-specific decoding options."
+				relevant_when: "codec = \"protobuf\""
+				required:      false
+				type: object: options: {
+					desc_file: {
+						description: "Path to desc file"
+						required:    false
+						type: string: default: ""
+					}
+					message_type: {
+						description: "message type. e.g package.message"
+						required:    false
+						type: string: default: ""
+					}
+				}
+			}
 			syslog: {
 				description:   "Syslog-specific decoding options."
 				relevant_when: "codec = \"syslog\""
diff --git a/website/cue/reference/components/sources/base/kafka.cue b/website/cue/reference/components/sources/base/kafka.cue
index 9ee5b6e6b2dc6..3834952d75297 100644
--- a/website/cue/reference/components/sources/base/kafka.cue
+++ b/website/cue/reference/components/sources/base/kafka.cue
@@ -92,6 +92,11 @@ base: components: sources: kafka: configuration: {
 															[vector_native_json]: https://github.com/vectordotdev/vector/blob/master/lib/codecs/tests/data/native_encoding/schema.cue
 															[experimental]: https://vector.dev/highlights/2022-03-31-native-event-codecs
 															"""
+						protobuf: """
+															Decodes the raw bytes as [protobuf][protobuf].
+
+															[protobuf]: https://protobuf.dev/
+															"""
 						syslog: """
 															Decodes the raw bytes as a Syslog message.
 
@@ -152,6 +157,23 @@ base: components: sources: kafka: configuration: {
 					type: bool: default: true
 				}
 			}
+			protobuf: {
+				description:   "Protobuf-specific decoding options."
+				relevant_when: "codec = \"protobuf\""
+				required:      false
+				type: object: options: {
+					desc_file: {
+						description: "Path to desc file"
+						required:    false
+						type: string: default: ""
+					}
+					message_type: {
+						description: "message type. e.g package.message"
+						required:    false
+						type: string: default: ""
+					}
+				}
+			}
 			syslog: {
 				description:   "Syslog-specific decoding options."
 				relevant_when: "codec = \"syslog\""
diff --git a/website/cue/reference/components/sources/base/nats.cue b/website/cue/reference/components/sources/base/nats.cue
index 6cb2b3e956dc9..90c5395bee521 100644
--- a/website/cue/reference/components/sources/base/nats.cue
+++ b/website/cue/reference/components/sources/base/nats.cue
@@ -135,6 +135,11 @@ base: components: sources: nats: configuration: {
 															[vector_native_json]: https://github.com/vectordotdev/vector/blob/master/lib/codecs/tests/data/native_encoding/schema.cue
 															[experimental]: https://vector.dev/highlights/2022-03-31-native-event-codecs
 															"""
+						protobuf: """
+															Decodes the raw bytes as [protobuf][protobuf].
+
+															[protobuf]: https://protobuf.dev/
+															"""
 						syslog: """
 															Decodes the raw bytes as a Syslog message.
 
@@ -195,6 +200,23 @@ base: components: sources: nats: configuration: {
 					type: bool: default: true
 				}
 			}
+			protobuf: {
+				description:   "Protobuf-specific decoding options."
+				relevant_when: "codec = \"protobuf\""
+				required:      false
+				type: object: options: {
+					desc_file: {
+						description: "Path to desc file"
+						required:    false
+						type: string: default: ""
+					}
+					message_type: {
+						description: "message type. e.g package.message"
+						required:    false
+						type: string: default: ""
+					}
+				}
+			}
 			syslog: {
 				description:   "Syslog-specific decoding options."
 				relevant_when: "codec = \"syslog\""
diff --git a/website/cue/reference/components/sources/base/prometheus_scrape.cue b/website/cue/reference/components/sources/base/prometheus_scrape.cue
index f0c9b02351f33..9e2aa806ce989 100644
--- a/website/cue/reference/components/sources/base/prometheus_scrape.cue
+++ b/website/cue/reference/components/sources/base/prometheus_scrape.cue
@@ -104,13 +104,25 @@ base: components: sources: prometheus_scrape: configuration: {
 		}
 	}
 	scrape_interval_secs: {
-		description: "The interval between scrapes, in seconds."
-		required:    false
+		description: """
+			The interval between scrapes. Requests are run concurrently so if a scrape takes longer
+			than the interval a new scrape will be started. This can take extra resources, set the timeout
+			to a value lower than the scrape interval to prevent this from happening.
+			"""
+		required: false
 		type: uint: {
 			default: 15
 			unit:    "seconds"
 		}
 	}
+	scrape_timeout_secs: {
+		description: "The timeout for each scrape request."
+		required:    false
+		type: float: {
+			default: 5.0
+			unit:    "seconds"
+		}
+	}
 	tls: {
 		description: "TLS configuration."
 		required:    false
diff --git a/website/cue/reference/components/sources/base/redis.cue b/website/cue/reference/components/sources/base/redis.cue
index 1e81399a5f3c4..f43534be91d58 100644
--- a/website/cue/reference/components/sources/base/redis.cue
+++ b/website/cue/reference/components/sources/base/redis.cue
@@ -53,6 +53,11 @@ base: components: sources: redis: configuration: {
 															[vector_native_json]: https://github.com/vectordotdev/vector/blob/master/lib/codecs/tests/data/native_encoding/schema.cue
 															[experimental]: https://vector.dev/highlights/2022-03-31-native-event-codecs
 															"""
+						protobuf: """
+															Decodes the raw bytes as [protobuf][protobuf].
+
+															[protobuf]: https://protobuf.dev/
+															"""
 						syslog: """
 															Decodes the raw bytes as a Syslog message.
 
@@ -113,6 +118,23 @@ base: components: sources: redis: configuration: {
 					type: bool: default: true
 				}
 			}
+			protobuf: {
+				description:   "Protobuf-specific decoding options."
+				relevant_when: "codec = \"protobuf\""
+				required:      false
+				type: object: options: {
+					desc_file: {
+						description: "Path to desc file"
+						required:    false
+						type: string: default: ""
+					}
+					message_type: {
+						description: "message type. e.g package.message"
+						required:    false
+						type: string: default: ""
+					}
+				}
+			}
 			syslog: {
 				description:   "Syslog-specific decoding options."
 				relevant_when: "codec = \"syslog\""
diff --git a/website/cue/reference/components/sources/base/socket.cue b/website/cue/reference/components/sources/base/socket.cue
index d49d70ffb589f..331327f19253e 100644
--- a/website/cue/reference/components/sources/base/socket.cue
+++ b/website/cue/reference/components/sources/base/socket.cue
@@ -55,6 +55,11 @@ base: components: sources: socket: configuration: {
 															[vector_native_json]: https://github.com/vectordotdev/vector/blob/master/lib/codecs/tests/data/native_encoding/schema.cue
 															[experimental]: https://vector.dev/highlights/2022-03-31-native-event-codecs
 															"""
+						protobuf: """
+															Decodes the raw bytes as [protobuf][protobuf].
+
+															[protobuf]: https://protobuf.dev/
+															"""
 						syslog: """
 															Decodes the raw bytes as a Syslog message.
 
@@ -115,6 +120,23 @@ base: components: sources: socket: configuration: {
 					type: bool: default: true
 				}
 			}
+			protobuf: {
+				description:   "Protobuf-specific decoding options."
+				relevant_when: "codec = \"protobuf\""
+				required:      false
+				type: object: options: {
+					desc_file: {
+						description: "Path to desc file"
+						required:    false
+						type: string: default: ""
+					}
+					message_type: {
+						description: "message type. e.g package.message"
+						required:    false
+						type: string: default: ""
+					}
+				}
+			}
 			syslog: {
 				description:   "Syslog-specific decoding options."
 				relevant_when: "codec = \"syslog\""
diff --git a/website/cue/reference/components/sources/base/stdin.cue b/website/cue/reference/components/sources/base/stdin.cue
index 72141036aa562..84d030db05a6f 100644
--- a/website/cue/reference/components/sources/base/stdin.cue
+++ b/website/cue/reference/components/sources/base/stdin.cue
@@ -38,6 +38,11 @@ base: components: sources: stdin: configuration: {
 															[vector_native_json]: https://github.com/vectordotdev/vector/blob/master/lib/codecs/tests/data/native_encoding/schema.cue
 															[experimental]: https://vector.dev/highlights/2022-03-31-native-event-codecs
 															"""
+						protobuf: """
+															Decodes the raw bytes as [protobuf][protobuf].
+
+															[protobuf]: https://protobuf.dev/
+															"""
 						syslog: """
 															Decodes the raw bytes as a Syslog message.
 
@@ -98,6 +103,23 @@ base: components: sources: stdin: configuration: {
 					type: bool: default: true
 				}
 			}
+			protobuf: {
+				description:   "Protobuf-specific decoding options."
+				relevant_when: "codec = \"protobuf\""
+				required:      false
+				type: object: options: {
+					desc_file: {
+						description: "Path to desc file"
+						required:    false
+						type: string: default: ""
+					}
+					message_type: {
+						description: "message type. e.g package.message"
+						required:    false
+						type: string: default: ""
+					}
+				}
+			}
 			syslog: {
 				description:   "Syslog-specific decoding options."
 				relevant_when: "codec = \"syslog\""
diff --git a/website/cue/reference/components/sources/internal_metrics.cue b/website/cue/reference/components/sources/internal_metrics.cue
index 5115d4f35c32d..da3b404156188 100644
--- a/website/cue/reference/components/sources/internal_metrics.cue
+++ b/website/cue/reference/components/sources/internal_metrics.cue
@@ -730,6 +730,14 @@ components: sources: internal_metrics: {
 				status: _status
 			}
 		}
+		http_client_requests_sent_total: {
+			description:       "The total number of sent HTTP requests, tagged with the request method."
+			type:              "counter"
+			default_namespace: "vector"
+			tags:              _component_tags & {
+				method: _method
+			}
+		}
 		http_client_responses_total: {
 			description:       "The total number of HTTP requests, tagged with the response code."
 			type:              "counter"
@@ -1183,6 +1191,10 @@ components: sources: internal_metrics: {
 			description: "The HTTP status code of the request."
 			required:    false
 		}
+		_method: {
+			description: "The HTTP method of the request."
+			required:    false
+		}
 		_path: {
 			description: "The path that produced the error."
 			required:    true
diff --git a/website/cue/reference/components/sources/syslog.cue b/website/cue/reference/components/sources/syslog.cue
index c98751a59b613..9efb9c09f0902 100644
--- a/website/cue/reference/components/sources/syslog.cue
+++ b/website/cue/reference/components/sources/syslog.cue
@@ -59,9 +59,15 @@ components: sources: syslog: {
 					examples: ["app-name"]
 				}
 			}
-			host: fields._local_host
+			host: {
+				description: "Same as `hostname` if that field is set, or the IP address of the peer otherwise."
+				required:    true
+				type: string: {
+					examples: ["my.host.com", "127.0.0.1"]
+				}
+			}
 			hostname: {
-				description: "The hostname extracted from the Syslog line. (`host` is also this value if it exists in the log.)"
+				description: "The `hostname` field extracted from the Syslog line. If a `hostname` field is found, `host` is also set to this value."
 				required:    true
 				type: string: {
 					examples: ["my.host.com"]
@@ -103,7 +109,7 @@ components: sources: syslog: {
 				}
 			}
 			source_ip: {
-				description: "The upstream hostname. In the case where `mode` = `\"unix\"` the socket path will be used. (`host` is also this value if `hostname` does not exist in the log.)"
+				description: "The IP address of the client. In the case where `mode` = `\"unix\"` the socket path will be used."
 				required:    true
 				type: string: {
 					examples: ["127.0.0.1"]
diff --git a/website/cue/reference/configuration.cue b/website/cue/reference/configuration.cue
index 08d9b0bb6b88d..bf1a7e8f98453 100644
--- a/website/cue/reference/configuration.cue
+++ b/website/cue/reference/configuration.cue
@@ -251,16 +251,28 @@ configuration: {
 				}
 			}
 		}
-		log_namespacing: {
-			common:      false
+		schema: {
+			common: false
 			description: """
-				Globally enables / disables log namespacing. See [Log Namespacing](\(urls.log_namespacing_blog))
-				for more details. If you want to enable individual sources, there is a config
-				option in the source configuration.
+				Configures options for how Vector handles event schema.
 				"""
-			required:    false
-			warnings: []
-			type: bool: default: false
+			required: false
+			type: object: {
+				examples: []
+				options: {
+					log_namespacing: {
+						common:      false
+						description: """
+							Globally enables / disables log namespacing. See [Log Namespacing](\(urls.log_namespacing_blog))
+							for more details. If you want to enable individual sources, there is a config
+							option in the source configuration.
+							"""
+						required:    false
+						warnings: []
+						type: bool: default: false
+					}
+				}
+			}
 		}
 
 		telemetry: {
@@ -277,7 +289,7 @@ configuration: {
 						description: """
 							Controls which tags should be included with the `vector_component_sent_events_total` and
 							`vector_component_sent_event_bytes_total` metrics.
-						"""
+							"""
 						type: object: {
 							examples: []
 							options: {
diff --git a/website/cue/reference/releases/0.31.0.cue b/website/cue/reference/releases/0.31.0.cue
index 6637ec37afa53..5b6e208428bf3 100644
--- a/website/cue/reference/releases/0.31.0.cue
+++ b/website/cue/reference/releases/0.31.0.cue
@@ -183,7 +183,7 @@ releases: "0.31.0": {
 				Vector's graceful shutdown time limit is now configurable (via
 				`--graceful-shutdown-limit-secs`) and able to be disabled (via
 				`--no-graceful-shutdown-limit`). See the [CLI
-				docs](docs/reference/cli/) for more.
+				docs](/docs/reference/cli/) for more.
 				"""
 			pr_numbers: [17479]
 		},
@@ -296,7 +296,7 @@ releases: "0.31.0": {
 				The `component_sent_event_bytes_total` and `component_sent_event_total` metrics can
 				now optionally have a `service` and `source` tag added to them, driven from event
 				data, from the added [`telemetry` global config
-				options](docs/reference/configuration/global-options/#telemetry). This can be used
+				options](/docs/reference/configuration/global-options/#telemetry). This can be used
 				to break down processing volume by service and source.
 				"""
 			pr_numbers: [17549]
diff --git a/website/cue/reference/releases/0.32.0.cue b/website/cue/reference/releases/0.32.0.cue
new file mode 100644
index 0000000000000..a03e778199e35
--- /dev/null
+++ b/website/cue/reference/releases/0.32.0.cue
@@ -0,0 +1,519 @@
+package metadata
+
+releases: "0.32.0": {
+	date:     "2023-08-15"
+	codename: ""
+
+	description: """
+		The Vector team is pleased to announce version 0.32.0!
+
+		Be sure to check out the [upgrade guide](/highlights/2023-08-15-0-32-0-upgrade-guide) for
+		breaking changes in this release.
+
+		In addition to the usual enhancements and bug fixes, this release includes:
+
+		- a new `greptimedb` sink for sending metrics to
+		    [GreptimeDB](https://github.com/greptimeteam/greptimedb)
+		- a new `protobuf` codec that can be used on sources that support codecs to decode incoming
+		  protobuf data
+		"""
+
+	known_issues: [
+		"""
+			A number of sinks emit incorrect telemetry for the `component_sent_*` metrics:
+
+			- WebHDFS
+			- GCP Cloud Storage
+			- AWS S3
+			- Azure Blob Storage
+			- Azure Monitor Logs
+			- Databend
+			- Clickhouse
+			- Datadog Logs
+
+			This is fixed in v0.32.1.
+			""",
+		"""
+			The newly added `--openssl-legacy-provider` flag cannot actually be disabled by setting
+			it to `false` via `--openssl-legacy-provider=false`. Instead it complains of extra
+			arguments. This is fixed in v0.32.1.
+			""",
+		"""
+			For AWS components, using `assume_role` for authentication without an `external_id`
+			caused a panic. This is fixed in v0.32.2`.
+			""",
+	]
+
+	changelog: [
+		{
+			type: "fix"
+			scopes: ["lua transform"]
+			description: """
+				The `lua` transform now sets the `source_id` metadata to its own component ID if an
+				event is emitted by the transform that has no origin `source_id` (e.g. events
+				constructed in the transform itself).
+				"""
+			pr_numbers: [17870]
+		},
+		{
+			type: "fix"
+			scopes: ["config"]
+			description: """
+				VRL conditions included in configurations (e.g. the `filter` transform) are now
+				checked at boot-time to ensure that they return a boolean instead of treating all
+				non-boolean return values as `false` .
+				"""
+			pr_numbers: [17894]
+		},
+		{
+			type: "fix"
+			scopes: ["vector sink"]
+			description: """
+				The `vector` sink now considers `DataLoss` responses to be hard errors at indicates
+				the a sink in the downstream `vector` source rejected the data. The `vector` sink
+				will now not retry these errors and also reject them in any connected sources (when
+				`acknowledgements` are enabled).
+				"""
+			contributors: ["sbalmos"]
+			pr_numbers: [17904]
+		},
+		{
+			type: "fix"
+			scopes: ["vector sink"]
+			description: """
+				The `vector` sink now correctly applies configured HTTPS proxy settings. Previously
+				it would fail to validate the downstream certificate.
+				"""
+			contributors: ["joemiller"]
+			pr_numbers: [17651]
+		},
+		{
+			type: "feat"
+			scopes: ["new sink", "greptimedb sink"]
+			description: """
+				A new `greptimedb` sink was added allowing Vector to send metrics to
+				[GreptimeDB](https://github.com/greptimeteam/greptimedb).
+				"""
+			contributors: ["sunng87"]
+			pr_numbers: [17198]
+		},
+		{
+			type: "fix"
+			scopes: ["splunk_hec source"]
+			description: """
+				The `splunk_hec` source now treats the fields on incoming events as "flat" rather
+				than interpreting them as field paths. For example, an incoming `foo.bar` field is
+				now inserted as `{"foo.bar": "..."}` rather than `{"foo": {"bar": "..."}}`. This
+				avoids panics that were caused by invalid paths.
+				"""
+			pr_numbers: [17943]
+		},
+		{
+			type: "feat"
+			scopes: ["config"]
+			description: """
+				Configuration fields that are field lookups (such as `log_schema.timestamp_key`) are
+				now parsed at boot-time rather than run-time. In addition to better performance,
+				this also means that invalid paths return an error at start time rather than being
+				silently ignored at runtime.
+				"""
+			pr_numbers: [17947, 18024, 18058, 18084, 18097, 18090, 18099, 18139, 18124, 18160, 18109, 18185, 18212]
+		},
+		{
+			type: "enhancement"
+			scopes: ["clickhouse sink"]
+			description: """
+				The `clickhouse` sink `database` and `table` options are now
+				[templatable](/docs/reference/configuration/template-syntax/).
+				"""
+			pr_numbers: [18005, 17972]
+		},
+		{
+			type: "fix"
+			scopes: ["config"]
+			description: """
+				Fractional second configuration options are now correctly parsed as fractional.
+				Previously they would round to the nearest second.
+				"""
+			contributors: ["sbalmos"]
+			pr_numbers: [17917]
+		},
+		{
+			type: "fix"
+			scopes: ["reload"]
+			description: """
+				The Vector API can now correctly be disabled during reload by setting `api.enabled`
+				to `false`.
+				"""
+			contributors: ["KH-Moogsoft"]
+			pr_numbers: [17958]
+		},
+		{
+			type: "fix"
+			scopes: ["observability"]
+			description: """
+				The `component_received_event_bytes_total` and `component_sent_event_bytes_total`
+				metrics for sinks are now calculated _after_ any `encoding.only_fields` or
+				`encoding.except_fields` options are applied.
+				"""
+			pr_numbers: [17941]
+		},
+		{
+			type: "enhancement"
+			scopes: ["prometheus_scrape source"]
+			description: """
+				The `prometheus_scrape` source now scrapes configured targets in parallel.
+				"""
+			contributors: ["nullren"]
+			pr_numbers: [18021]
+		},
+		{
+			type: "enhancement"
+			scopes: ["prometheus_scrape source"]
+			description: """
+				The `prometheus_scrape` source now has a `scrape_timeout_secs` option to configure
+				how long Vector should wait for each request.
+				"""
+			contributors: ["nullren"]
+			pr_numbers: [18021]
+		},
+		{
+			type: "enhancement"
+			scopes: ["releasing"]
+			description: """
+				Vector's `debian` Docker images are now based on Debian 12 (Bookworm).
+				"""
+			pr_numbers: [18057]
+		},
+		{
+			type: "fix"
+			scopes: ["websocket sink"]
+			description: """
+				The `websocket` sink now correctly sends data as binary for "binary" codecs: `raw`,
+				`native`, and `avro`. Previously it would always interpret the bytes as text
+				(UTF-8).
+				"""
+			contributors: ["zhongchen"]
+			pr_numbers: [18060]
+		},
+		{
+			type: "enhancement"
+			scopes: ["codecs"]
+			description: """
+				Vector sources that support codecs now support `protobuf` as an option. A Protobuf
+				descriptor file must also be provided to use to decode the data.
+				"""
+			contributors: ["Daniel599"]
+			pr_numbers: [18057]
+		},
+		{
+			type: "fix"
+			scopes: ["syslog source"]
+			description: """
+				The `syslog` source now correctly handles escape sequences appearing the structured
+				data segment.
+				"""
+			pr_numbers: [18114]
+		},
+		{
+			type: "fix"
+			scopes: ["config"]
+			description: """
+				Numeric compression levels can now be set when using TOML. Previously Vector would
+				fail to parse the configuration. This already worked for YAML and JSON
+				configurations.
+				"""
+			pr_numbers: [18173]
+		},
+		{
+			type: "fix"
+			scopes: ["sinks"]
+			description: """
+				Sinks that support Adaptive Request Concurrency options now support configuring an
+				`initial_concurrency` to start the concurrency limit at rather than starting at
+				a limit of `1`.
+				"""
+			contributors: ["blake-mealey"]
+			pr_numbers: [18175]
+		},
+		{
+			type: "fix"
+			scopes: ["vrl"]
+			description: """
+				VRL's `encode_logfmt` function now escapes all values including `=`s.
+				"""
+			pr_numbers: [18150]
+		},
+		{
+			type: "fix"
+			scopes: ["vrl"]
+			description: """
+				VRL's `parse_nginx_log` function now handles more `combined` formats.
+				"""
+			contributors: ["scMarkus"]
+			pr_numbers: [18150]
+		},
+		{
+			type: "chore"
+			scopes: ["vrl"]
+			description: """
+				VRL's `to_timestamp` function was deprecated.
+				"""
+			pr_numbers: [18150]
+		},
+		{
+			type: "enhancement"
+			scopes: ["vrl"]
+			description: """
+				VRL's `encrypt` and `decrypt` functions now support additional algorithms:
+
+				- `CHACHA20-POLY1305`
+				- `XCHACHA20-POLY1305`
+				- `XSALSA20-POLY1305`
+				- `AES-*-CTR-BE` (to disambiguate endianess of `AES-*-CTR`)
+				- `AES-*-CTR-LE` (to disambiguate endianess of `AES-*-CTR`)
+				"""
+			contributors: ["alisa101rs"]
+			pr_numbers: [18150]
+		},
+		{
+			type: "fix"
+			scopes: ["azure_blob_storage sink"]
+			description: """
+				The `azure_blob_storage` sink now sets the correct content-type based on the
+				configured `encoding` options.
+				"""
+			contributors: ["stemjacobs"]
+			pr_numbers: [18150]
+		},
+		{
+			type: "fix"
+			scopes: ["vector source"]
+			description: """
+				The `vector` source no longer fails to decode large payloads. This was a regression
+				in 0.31.0 when a 4 MB limit was inadvertently applied.
+				"""
+			pr_numbers: [18186]
+		},
+		{
+			type: "enhancement"
+			scopes: ["nats source", "nats sink"]
+			description: """
+				The `nats` source and sink have been switched to use a more modern NATS library to
+				lay the groundwork for a JetStream source.
+				"""
+			contributors: ["paolobarbolini", "makarchuk"]
+			pr_numbers: [18165]
+		},
+	]
+
+	commits: [
+		{sha: "0fbdb335dd1cb9b467cc0280de314463ce108799", date: "2023-07-04 00:49:11 UTC", description: "Add macOS troubleshooting section to VRL web playground", pr_number:                        17824, scopes: ["docs"], type:                                                       "chore", breaking_change:       false, author: "Pavlos Rontidis", files_count:    1, insertions_count:  39, deletions_count:   2},
+		{sha: "205300b4bea826d342d68153d0ee542857ee27ca", date: "2023-07-03 23:25:47 UTC", description: "Fix a couple typos with the registered event cache", pr_number:                             17809, scopes: ["observability"], type:                                              "chore", breaking_change:       false, author: "Bruce Guenter", files_count:      1, insertions_count:  2, deletions_count:    2},
+		{sha: "911477a191fe80d68203a3ab7669ce730cc0f43e", date: "2023-07-04 06:37:55 UTC", description: "combine build steps for integration test workflows", pr_number:                             17724, scopes: ["ci"], type:                                                         "enhancement", breaking_change: false, author: "neuronull", files_count:          17, insertions_count: 739, deletions_count:  234},
+		{sha: "bc86222cd14327fdb459ceb0bb90e522aed3d2b3", date: "2023-07-05 06:19:54 UTC", description: "add fixed tag option to `RegisteredEventCache`", pr_number:                                 17814, scopes: ["observability"], type:                                              "enhancement", breaking_change: false, author: "Stephen Wakely", files_count:     5, insertions_count:  73, deletions_count:   12},
+		{sha: "8519cb1f25a8d83dc014452db5cbdf6b08ee9c9e", date: "2023-07-06 01:36:10 UTC", description: "propagate and display invalid JSON errors in VRL web playground", pr_number:                17826, scopes: ["vrl"], type:                                                        "fix", breaking_change:         false, author: "Pavlos Rontidis", files_count:    3, insertions_count:  37, deletions_count:   17},
+		{sha: "9581b35675ea89bc8fa016b451b948b18a9d19e1", date: "2023-07-06 01:38:57 UTC", description: "save time int test workflow merge queue", pr_number:                                        17869, scopes: ["ci"], type:                                                         "chore", breaking_change:       false, author: "neuronull", files_count:          1, insertions_count:  34, deletions_count:   32},
+		{sha: "e9f21a98b9f17035fb971f3f95476ec37d9bbe56", date: "2023-07-06 03:54:19 UTC", description: "fix gardener issues comment workflow", pr_number:                                           17868, scopes: ["ci"], type:                                                         "chore", breaking_change:       false, author: "Doug Smith", files_count:         1, insertions_count:  28, deletions_count:   29},
+		{sha: "9ec04438c9b59bc8ab8d4988c9f5744ad61c7248", date: "2023-07-06 06:12:39 UTC", description: "separate hanwritten and generated files in web-playground", pr_number:                      17871, scopes: [], type:                                                             "chore", breaking_change:       false, author: "Pavlos Rontidis", files_count:    5, insertions_count:  4, deletions_count:    151},
+		{sha: "57ea2b3936c294b1b8b5911fd5f3742231147ea7", date: "2023-07-07 01:26:27 UTC", description: "fix gardener issues comment workflow pt 2", pr_number:                                      17886, scopes: ["ci"], type:                                                         "chore", breaking_change:       false, author: "Doug Smith", files_count:         1, insertions_count:  5, deletions_count:    1},
+		{sha: "9c0d2f2a9bd0b50c5e1c703f4087b1e297c8ece6", date: "2023-07-06 23:38:33 UTC", description: "Bump Vector to 0.32.0", pr_number:                                                          17887, scopes: ["releasing"], type:                                                  "chore", breaking_change:       false, author: "Jesse Szwedko", files_count:      2, insertions_count:  2, deletions_count:    2},
+		{sha: "99502bb3d7e9377b6e244d2eb248693c295c0386", date: "2023-07-07 00:54:53 UTC", description: "fix k8s validate comment job logic", pr_number:                                             17841, scopes: ["ci"], type:                                                         "chore", breaking_change:       false, author: "neuronull", files_count:          3, insertions_count:  25, deletions_count:   40},
+		{sha: "1260c83e7e0222bd29f96c0533b6af6147c3c2da", date: "2023-07-07 00:21:25 UTC", description: "Fix link in v0.31.0 release docs", pr_number:                                               17888, scopes: ["releasing"], type:                                                  "chore", breaking_change:       false, author: "Jesse Szwedko", files_count:      1, insertions_count:  2, deletions_count:    2},
+		{sha: "bc1b83ad51a5118aa6a7c3cab62dfb5eb3ce2c91", date: "2023-07-07 01:48:37 UTC", description: "Emit events with the `source_id` set", pr_number:                                           17870, scopes: ["lua transform"], type:                                              "fix", breaking_change:         false, author: "Bruce Guenter", files_count:      5, insertions_count:  190, deletions_count:  193},
+		{sha: "0735ffe5b29f8603da9cc5f4fc017015c6529343", date: "2023-07-07 01:18:46 UTC", description: "Fix markdown syntax in minor release template", pr_number:                                  17890, scopes: ["releasing"], type:                                                  "chore", breaking_change:       false, author: "Jesse Szwedko", files_count:      1, insertions_count:  2, deletions_count:    2},
+		{sha: "604fea0dcf54034dfab1ffcc27c12f0883c704e6", date: "2023-07-07 02:15:59 UTC", description: "Regenerate k8s manifests with v0.23.0 of the chart", pr_number:                             17892, scopes: ["releasing"], type:                                                  "chore", breaking_change:       false, author: "Jesse Szwedko", files_count:      18, insertions_count: 45, deletions_count:   42},
+		{sha: "fa489f842b02fd7dd59a58e1339ae264050e92e4", date: "2023-07-07 06:31:17 UTC", description: "check VRL conditions return type at compile time", pr_number:                               17894, scopes: ["vrl"], type:                                                        "enhancement", breaking_change: false, author: "Pavlos Rontidis", files_count:    1, insertions_count:  10, deletions_count:   0},
+		{sha: "f74d5dd39758eeb1adfb146dc517e3b3b7e1fda4", date: "2023-07-07 13:35:14 UTC", description: "Bump console-subscriber from 0.1.9 to 0.1.10", pr_number:                                   17844, scopes: ["deps"], type:                                                       "chore", breaking_change:       false, author: "dependabot[bot]", files_count:    2, insertions_count:  3, deletions_count:    3},
+		{sha: "51d849760824066f7ead64dc193831a5f85bdc14", date: "2023-07-07 13:35:20 UTC", description: "Bump paste from 1.0.12 to 1.0.13", pr_number:                                               17846, scopes: ["deps"], type:                                                       "chore", breaking_change:       false, author: "dependabot[bot]", files_count:    4, insertions_count:  5, deletions_count:    5},
+		{sha: "ed5bc3afb2edb577c80bfdd6f0d7b11cf6f58b99", date: "2023-07-07 13:36:23 UTC", description: "Bump indoc from 2.0.1 to 2.0.2", pr_number:                                                 17843, scopes: ["deps"], type:                                                       "chore", breaking_change:       false, author: "dependabot[bot]", files_count:    4, insertions_count:  5, deletions_count:    5},
+		{sha: "b2623165d0bb0f8732020e3bbd27db197cd780c1", date: "2023-07-07 15:23:45 UTC", description: "Bump serde_bytes from 0.11.9 to 0.11.11", pr_number:                                        17898, scopes: ["deps"], type:                                                       "chore", breaking_change:       false, author: "dependabot[bot]", files_count:    2, insertions_count:  25, deletions_count:   25},
+		{sha: "ea0f5b1e06f1e5e2eb22ef33168ad5ac862aaf63", date: "2023-07-07 15:28:03 UTC", description: "Bump thiserror from 1.0.40 to 1.0.43", pr_number:                                           17900, scopes: ["deps"], type:                                                       "chore", breaking_change:       false, author: "dependabot[bot]", files_count:    1, insertions_count:  4, deletions_count:    4},
+		{sha: "4613b36284781d442728c05468ada320a92f71c0", date: "2023-07-07 15:43:27 UTC", description: "Bump ryu from 1.0.13 to 1.0.14", pr_number:                                                 17848, scopes: ["deps"], type:                                                       "chore", breaking_change:       false, author: "dependabot[bot]", files_count:    1, insertions_count:  2, deletions_count:    2},
+		{sha: "93f81443d28524c47d17e42167208d7f44e8e7a0", date: "2023-07-07 15:49:02 UTC", description: "Bump colored from 2.0.0 to 2.0.4", pr_number:                                               17876, scopes: ["deps"], type:                                                       "chore", breaking_change:       false, author: "dependabot[bot]", files_count:    2, insertions_count:  5, deletions_count:    5},
+		{sha: "53b2854d95b2c4d06af0573ff9e02020e46653c5", date: "2023-07-07 15:53:47 UTC", description: "Bump async-trait from 0.1.68 to 0.1.71", pr_number:                                         17881, scopes: ["deps"], type:                                                       "chore", breaking_change:       false, author: "dependabot[bot]", files_count:    2, insertions_count:  3, deletions_count:    3},
+		{sha: "46dc18adcd73ebd97f069d58329704192b27e43e", date: "2023-07-07 16:00:17 UTC", description: "Bump smallvec from 1.10.0 to 1.11.0", pr_number:                                            17880, scopes: ["deps"], type:                                                       "chore", breaking_change:       false, author: "dependabot[bot]", files_count:    1, insertions_count:  2, deletions_count:    2},
+		{sha: "bf1407c158b653fef810f4d8e570c93e47367c1c", date: "2023-07-07 16:02:25 UTC", description: "Bump enum_dispatch from 0.3.11 to 0.3.12", pr_number:                                       17879, scopes: ["deps"], type:                                                       "chore", breaking_change:       false, author: "dependabot[bot]", files_count:    2, insertions_count:  4, deletions_count:    4},
+		{sha: "bf2f97554f3696b0716210013e6dfde0bddbc958", date: "2023-07-07 18:08:18 UTC", description: "Bump inventory from 0.3.6 to 0.3.8", pr_number:                                             17842, scopes: ["deps"], type:                                                       "chore", breaking_change:       false, author: "dependabot[bot]", files_count:    3, insertions_count:  3, deletions_count:    18},
+		{sha: "17ccc56fadae5009541063b3780c603e945e38a1", date: "2023-07-07 18:11:54 UTC", description: "Bump bstr from 1.5.0 to 1.6.0", pr_number:                                                  17877, scopes: ["deps"], type:                                                       "chore", breaking_change:       false, author: "dependabot[bot]", files_count:    3, insertions_count:  15, deletions_count:   9},
+		{sha: "98ca6271cbc7c8c4fdabe309a2bf74f3eaca145a", date: "2023-07-08 00:24:41 UTC", description: "fix gardener issues comment workflow pt 3", pr_number:                                      17903, scopes: ["ci"], type:                                                         "chore", breaking_change:       false, author: "Doug Smith", files_count:         1, insertions_count:  21, deletions_count:   0},
+		{sha: "01e2dfaa15ce62d156e92d8deac354cd40edf9e7", date: "2023-07-08 06:24:59 UTC", description: "describe the difference between configuration fields and runtime flags", pr_number:         17784, scopes: [], type:                                                             "docs", breaking_change:        false, author: "Dominic Burkart", files_count:    1, insertions_count:  19, deletions_count:   0},
+		{sha: "4ef0b1778923567c8aa755e28d9419c52b6bc97c", date: "2023-07-08 03:25:09 UTC", description: "Add DataLoss error code as non-retryable", pr_number:                                       17904, scopes: ["vector sink"], type:                                                "fix", breaking_change:         false, author: "Scott Balmos", files_count:       1, insertions_count:  1, deletions_count:    0},
+		{sha: "c4827e42a9bfe0f2ef2e0249593d39663ff2a490", date: "2023-07-08 01:46:19 UTC", description: "add spell check exception", pr_number:                                                      17906, scopes: ["spelling"], type:                                                   "fix", breaking_change:         false, author: "neuronull", files_count:          1, insertions_count:  1, deletions_count:    0},
+		{sha: "251c4c4608a70fd6c112ecacd0517c301f21e33c", date: "2023-07-08 08:59:33 UTC", description: "Bump docker/setup-buildx-action from 2.8.0 to 2.9.0", pr_number:                            17907, scopes: ["ci"], type:                                                         "chore", breaking_change:       false, author: "dependabot[bot]", files_count:    3, insertions_count:  4, deletions_count:    4},
+		{sha: "70632b7d980a0721bec83124390eca3604baf2ee", date: "2023-07-08 02:48:08 UTC", description: "Remove path filter that runs all integration tests", pr_number:                             17908, scopes: ["ci"], type:                                                         "chore", breaking_change:       false, author: "Jesse Szwedko", files_count:      1, insertions_count:  1, deletions_count:    2},
+		{sha: "b10d0709b6d1746fe481f6299f1e5c8518489cfa", date: "2023-07-08 09:55:13 UTC", description: "Bump typetag from 0.2.8 to 0.2.9", pr_number:                                               17882, scopes: ["deps"], type:                                                       "chore", breaking_change:       false, author: "dependabot[bot]", files_count:    3, insertions_count:  8, deletions_count:    8},
+		{sha: "976580949148191ea6faabc7d77ddd60b3c33782", date: "2023-07-08 04:22:39 UTC", description: "check for team membership on secret-requiring int tests", pr_number:                        17909, scopes: ["ci"], type:                                                         "chore", breaking_change:       false, author: "neuronull", files_count:          1, insertions_count:  30, deletions_count:   8},
+		{sha: "45e24c73e78d3daf609103635950245dcc715444", date: "2023-07-08 03:24:29 UTC", description: "cert verification with proxy enabled", pr_number:                                           17651, scopes: ["vector sink"], type:                                                "fix", breaking_change:         false, author: "joe miller", files_count:         1, insertions_count:  3, deletions_count:    18},
+		{sha: "d592b0cf9d04de440e56a54687fd38bc33f1c3cd", date: "2023-07-08 04:41:24 UTC", description: "Swap out bloom crate for bloomy", pr_number:                                                17911, scopes: ["deps"], type:                                                       "chore", breaking_change:       false, author: "Jesse Szwedko", files_count:      7, insertions_count:  35, deletions_count:   45},
+		{sha: "c8deedab78cf45df70edb6ad8ee85fff6e888511", date: "2023-07-08 12:16:53 UTC", description: "Bump rdkafka from 0.32.2 to 0.33.2", pr_number:                                             17891, scopes: ["deps"], type:                                                       "chore", breaking_change:       false, author: "dependabot[bot]", files_count:    2, insertions_count:  3, deletions_count:    3},
+		{sha: "21267073cc957e9fb72a4fdf8f1e6b246344b0a9", date: "2023-07-08 12:17:15 UTC", description: "Bump clap_complete from 4.3.1 to 4.3.2", pr_number:                                         17878, scopes: ["deps"], type:                                                       "chore", breaking_change:       false, author: "dependabot[bot]", files_count:    2, insertions_count:  3, deletions_count:    3},
+		{sha: "cb950b0446b48f3c894a5913f7d4c416f0cbc47e", date: "2023-07-08 12:17:58 UTC", description: "Bump regex from 1.8.4 to 1.9.0", pr_number:                                                 17874, scopes: ["deps"], type:                                                       "chore", breaking_change:       false, author: "dependabot[bot]", files_count:    6, insertions_count:  19, deletions_count:   11},
+		{sha: "97f4433f4689211877cf3042b5aaf14e38a32020", date: "2023-07-08 12:18:07 UTC", description: "Bump infer from 0.14.0 to 0.15.0", pr_number:                                               17860, scopes: ["deps"], type:                                                       "chore", breaking_change:       false, author: "dependabot[bot]", files_count:    2, insertions_count:  4, deletions_count:    4},
+		{sha: "fc62e9c80f63e77fa8ca8113e952b791db48dd86", date: "2023-07-08 12:53:24 UTC", description: "Bump bitmask-enum from 2.1.0 to 2.2.0", pr_number:                                          17833, scopes: ["deps"], type:                                                       "chore", breaking_change:       false, author: "dependabot[bot]", files_count:    2, insertions_count:  4, deletions_count:    4},
+		{sha: "ae59be62a3f8a87d5c12acbc8d60ed01b92e2ea3", date: "2023-07-08 12:54:40 UTC", description: "Bump schannel from 0.1.21 to 0.1.22", pr_number:                                            17850, scopes: ["deps"], type:                                                       "chore", breaking_change:       false, author: "dependabot[bot]", files_count:    2, insertions_count:  4, deletions_count:    4},
+		{sha: "17e6632739182cc03497d9711a0470656c848338", date: "2023-07-08 12:55:33 UTC", description: "Bump pin-project from 1.1.1 to 1.1.2", pr_number:                                           17837, scopes: ["deps"], type:                                                       "chore", breaking_change:       false, author: "dependabot[bot]", files_count:    5, insertions_count:  8, deletions_count:    8},
+		{sha: "f91d1b204e3fd2ef4a464ba354aa6bb277e6a0a5", date: "2023-07-08 12:56:09 UTC", description: "Bump metrics-util from 0.15.0 to 0.15.1", pr_number:                                        17835, scopes: ["deps"], type:                                                       "chore", breaking_change:       false, author: "dependabot[bot]", files_count:    3, insertions_count:  11, deletions_count:   20},
+		{sha: "1a427ed2d33bfeefb2d3cbec814e3ab7a46d6e5e", date: "2023-07-08 13:01:09 UTC", description: "Bump serde_json from 1.0.99 to 1.0.100", pr_number:                                         17859, scopes: ["deps"], type:                                                       "chore", breaking_change:       false, author: "dependabot[bot]", files_count:    6, insertions_count:  7, deletions_count:    7},
+		{sha: "528fac3d5155815e59563f01a10c6abcc6802006", date: "2023-07-08 06:24:43 UTC", description: "Fix integration test filter generation", pr_number:                                         17914, scopes: ["ci"], type:                                                         "chore", breaking_change:       false, author: "Jesse Szwedko", files_count:      1, insertions_count:  1, deletions_count:    1},
+		{sha: "0454d9dd938645af145001362908aa2a3342dc46", date: "2023-07-09 01:40:54 UTC", description: "Bump tokio from 1.29.0 to 1.29.1", pr_number:                                               17811, scopes: ["deps"], type:                                                       "chore", breaking_change:       false, author: "dependabot[bot]", files_count:    9, insertions_count:  14, deletions_count:   14},
+		{sha: "c8e12672ffce5ba0ad1a948f0bcabf74ffab8f93", date: "2023-07-09 01:41:07 UTC", description: "Bump metrics from 0.21.0 to 0.21.1", pr_number:                                             17836, scopes: ["deps"], type:                                                       "chore", breaking_change:       false, author: "dependabot[bot]", files_count:    5, insertions_count:  6, deletions_count:    6},
+		{sha: "44d3a8c9612897029406ba25f563e445ddb367d0", date: "2023-07-09 08:41:59 UTC", description: "Bump toml from 0.7.5 to 0.7.6", pr_number:                                                  17875, scopes: ["deps"], type:                                                       "chore", breaking_change:       false, author: "dependabot[bot]", files_count:    5, insertions_count:  14, deletions_count:   14},
+		{sha: "bc5822c5017ecad6d59f720f3f874142287f3c6a", date: "2023-07-09 08:42:28 UTC", description: "Bump regex from 1.9.0 to 1.9.1", pr_number:                                                 17915, scopes: ["deps"], type:                                                       "chore", breaking_change:       false, author: "dependabot[bot]", files_count:    5, insertions_count:  10, deletions_count:   10},
+		{sha: "49714cfa8a242e7b56acef645d1e82d675c8ffa4", date: "2023-07-11 00:57:19 UTC", description: "Bump snafu from 0.7.4 to 0.7.5", pr_number:                                                 17919, scopes: ["deps"], type:                                                       "chore", breaking_change:       false, author: "dependabot[bot]", files_count:    7, insertions_count:  10, deletions_count:   10},
+		{sha: "6326f372c00431544a2f18456bab72188c1c0be9", date: "2023-07-11 00:57:47 UTC", description: "Bump bitmask-enum from 2.2.0 to 2.2.1", pr_number:                                          17921, scopes: ["deps"], type:                                                       "chore", breaking_change:       false, author: "dependabot[bot]", files_count:    2, insertions_count:  3, deletions_count:    3},
+		{sha: "22b6c2b9fa6c68b3ab7bbbc2b521c212eef66493", date: "2023-07-11 07:57:58 UTC", description: "Bump proc-macro2 from 1.0.63 to 1.0.64", pr_number:                                         17922, scopes: ["deps"], type:                                                       "chore", breaking_change:       false, author: "dependabot[bot]", files_count:    1, insertions_count:  66, deletions_count:   66},
+		{sha: "8b2447a5ade93b3314876f5bc80429d9b6086f80", date: "2023-07-11 03:29:21 UTC", description: "address issues in integration test suite workflow", pr_number:                              17928, scopes: ["ci"], type:                                                         "fix", breaking_change:         false, author: "neuronull", files_count:          3, insertions_count:  26, deletions_count:   25},
+		{sha: "37fb02ba114e86fa7aeb8f9ae54fc5daf724bc8c", date: "2023-07-11 02:48:39 UTC", description: "Remove mentions of deprecated transforms from guides", pr_number:                           17933, scopes: ["docs"], type:                                                       "chore", breaking_change:       false, author: "Jesse Szwedko", files_count:      2, insertions_count:  8, deletions_count:    7},
+		{sha: "5b1219f17cb87c6e454f78011b666447d26e2cfd", date: "2023-07-11 09:55:33 UTC", description: "Bump async-compression from 0.4.0 to 0.4.1", pr_number:                                     17932, scopes: ["deps"], type:                                                       "chore", breaking_change:       false, author: "dependabot[bot]", files_count:    2, insertions_count:  4, deletions_count:    4},
+		{sha: "b535d184f864af5903e2f7f37671371a32aa2ff2", date: "2023-07-12 02:55:55 UTC", description: "Bump dashmap from 5.4.0 to 5.5.0", pr_number:                                               17938, scopes: ["deps"], type:                                                       "chore", breaking_change:       false, author: "dependabot[bot]", files_count:    3, insertions_count:  11, deletions_count:   11},
+		{sha: "d5b7fe6ab070ae85b23d3959aa18b218d2e968a4", date: "2023-07-12 02:58:10 UTC", description: "Bump apache-avro from 0.14.0 to 0.15.0", pr_number:                                         17931, scopes: ["deps"], type:                                                       "chore", breaking_change:       false, author: "dependabot[bot]", files_count:    3, insertions_count:  31, deletions_count:   20},
+		{sha: "784f3fed15c76e9c1416726e595c22ebd2c070f1", date: "2023-07-12 02:58:28 UTC", description: "Bump semver from 5.7.1 to 5.7.2 in /website", pr_number:                                    17937, scopes: ["deps"], type:                                                       "chore", breaking_change:       false, author: "dependabot[bot]", files_count:    1, insertions_count:  6, deletions_count:    6},
+		{sha: "39897919be2402c13284bab27125b2b8a62225a6", date: "2023-07-12 02:58:49 UTC", description: "Bump serde from 1.0.167 to 1.0.168", pr_number:                                             17920, scopes: ["deps"], type:                                                       "chore", breaking_change:       false, author: "dependabot[bot]", files_count:    8, insertions_count:  11, deletions_count:   11},
+		{sha: "98f44ae070ffdba58460e2262e0c70683fad3797", date: "2023-07-12 11:14:45 UTC", description: "Adding greptimedb metrics sink", pr_number:                                                 17198, scopes: ["new sink"], type:                                                   "feat", breaking_change:        false, author: "Ning Sun", files_count:           22, insertions_count: 1465, deletions_count: 1},
+		{sha: "1acf5b47802bc83b4ded4bf2daf0c91f5502fb1b", date: "2023-07-12 08:01:21 UTC", description: "insert fields as event_path so names aren't parsed as a path", pr_number:                   17943, scopes: ["splunk_hec source"], type:                                          "fix", breaking_change:         false, author: "Stephen Wakely", files_count:     1, insertions_count:  24, deletions_count:   2},
+		{sha: "f8461cbf356fe3c90d7d57a511c97d6fced31e47", date: "2023-07-12 00:24:52 UTC", description: "Add upgrade note for 0.31.0 about S3 path changes", pr_number:                              17934, scopes: ["releasing"], type:                                                  "chore", breaking_change:       false, author: "Jesse Szwedko", files_count:      2, insertions_count:  15, deletions_count:   0},
+		{sha: "7774c495b7ab4d014a16dc036b284a5b723dc19b", date: "2023-07-12 01:20:39 UTC", description: "Use GitHub App token for team membership rather than user PAT", pr_number:                  17936, scopes: ["ci"], type:                                                         "chore", breaking_change:       false, author: "Jesse Szwedko", files_count:      4, insertions_count:  30, deletions_count:   6},
+		{sha: "7f459493d48165818ab8c0796ecea25742131703", date: "2023-07-12 10:06:51 UTC", description: "added sink review checklist", pr_number:                                                    17799, scopes: [], type:                                                             "chore", breaking_change:       false, author: "Stephen Wakely", files_count:     1, insertions_count:  38, deletions_count:   0},
+		{sha: "77ffce8a47faeae64ca8d8eb6642c66f25f15c35", date: "2023-07-14 08:57:13 UTC", description: "Bump docker/setup-buildx-action from 2.9.0 to 2.9.1", pr_number:                            17955, scopes: ["ci"], type:                                                         "chore", breaking_change:       false, author: "dependabot[bot]", files_count:    3, insertions_count:  4, deletions_count:    4},
+		{sha: "a05542a1e392f0e18c8b305afd4d56bc146b6102", date: "2023-07-14 04:48:22 UTC", description: "stop ignoring topology test", pr_number:                                                    17953, scopes: [], type:                                                             "chore", breaking_change:       false, author: "Luke Steensen", files_count:      1, insertions_count:  0, deletions_count:    1},
+		{sha: "d29424d95dbc7c9afd039890df38681ba309853f", date: "2023-07-14 08:48:40 UTC", description: "Migrate `LogSchema` `source_type_key` to new lookup code", pr_number:                       17947, scopes: ["config"], type:                                                     "feat", breaking_change:        false, author: "Pavlos Rontidis", files_count:    35, insertions_count: 240, deletions_count:  140},
+		{sha: "3921a24e13b6558db8aec29f19fcd68a1601460c", date: "2023-07-14 10:16:41 UTC", description: "Bump to syn 2, serde_with 3, darling 0.20, and serde_derive_internals 0.28", pr_number:     17930, scopes: ["deps"], type:                                                       "chore", breaking_change:       false, author: "Doug Smith", files_count:         15, insertions_count: 195, deletions_count:  114},
+		{sha: "467baab82cab45acc84d3f3f962c4fbda4f3f632", date: "2023-07-14 14:17:04 UTC", description: "Bump governor from 0.5.1 to 0.6.0", pr_number:                                              17960, scopes: ["deps"], type:                                                       "chore", breaking_change:       false, author: "dependabot[bot]", files_count:    2, insertions_count:  3, deletions_count:    3},
+		{sha: "4d4b393e1eb9ad02b5c1bfad41d5317e6f26b09a", date: "2023-07-14 14:17:45 UTC", description: "Bump lru from 0.10.1 to 0.11.0", pr_number:                                                 17945, scopes: ["deps"], type:                                                       "chore", breaking_change:       false, author: "dependabot[bot]", files_count:    2, insertions_count:  3, deletions_count:    3},
+		{sha: "50736e2ed463bef20985329ee5c59d7261b070d8", date: "2023-07-14 12:10:15 UTC", description: "Fix schema.log_namespace and telemetry.tags documentation", pr_number:                      17961, scopes: [], type:                                                             "docs", breaking_change:        false, author: "Spencer Gilbert", files_count:    2, insertions_count:  22, deletions_count:   10},
+		{sha: "4a377a79f184c1f09ca5d516712257101a838a2b", date: "2023-07-14 21:36:38 UTC", description: "Bump serde_json from 1.0.100 to 1.0.102", pr_number:                                        17948, scopes: ["deps"], type:                                                       "chore", breaking_change:       false, author: "dependabot[bot]", files_count:    6, insertions_count:  7, deletions_count:    7},
+		{sha: "f4b11115c2245836d2bc607b07b2556e012871d3", date: "2023-07-14 21:37:07 UTC", description: "Bump typetag from 0.2.9 to 0.2.10", pr_number:                                              17968, scopes: ["deps"], type:                                                       "chore", breaking_change:       false, author: "dependabot[bot]", files_count:    3, insertions_count:  6, deletions_count:    6},
+		{sha: "656b1fe18f0750a6c4d705bb29a771251c0a6b88", date: "2023-07-15 04:37:22 UTC", description: "Bump darling from 0.20.1 to 0.20.3", pr_number:                                             17969, scopes: ["deps"], type:                                                       "chore", breaking_change:       false, author: "dependabot[bot]", files_count:    1, insertions_count:  12, deletions_count:   12},
+		{sha: "5dfede4784c7a9457d2a15ad51f1ac13bcc6730c", date: "2023-07-15 04:42:02 UTC", description: "Bump syn from 2.0.23 to 2.0.25", pr_number:                                                 17970, scopes: ["deps"], type:                                                       "chore", breaking_change:       false, author: "dependabot[bot]", files_count:    1, insertions_count:  27, deletions_count:   27},
+		{sha: "eb4383fce9e539bd72eb711bd825d542afb20cec", date: "2023-07-15 01:28:49 UTC", description: "Add `--features` with default features for vdev test", pr_number:                           17977, scopes: ["vdev"], type:                                                       "fix", breaking_change:         false, author: "Jesse Szwedko", files_count:      1, insertions_count:  7, deletions_count:    6},
+		{sha: "66f483874b137c786765e2f8635f7a74b76c7c1a", date: "2023-07-15 04:54:52 UTC", description: "Bump serde from 1.0.168 to 1.0.171", pr_number:                                             17976, scopes: ["deps"], type:                                                       "chore", breaking_change:       false, author: "dependabot[bot]", files_count:    8, insertions_count:  11, deletions_count:   11},
+		{sha: "38719a3b459fa9bf34552edc7deaf3a023b5257a", date: "2023-07-15 04:54:56 UTC", description: "Bump lapin from 2.2.1 to 2.3.1", pr_number:                                                 17974, scopes: ["deps"], type:                                                       "chore", breaking_change:       false, author: "dependabot[bot]", files_count:    2, insertions_count:  3, deletions_count:    3},
+		{sha: "5dd208424c4acb6c0cb0dab5b9b5768cc83daf37", date: "2023-07-15 05:08:29 UTC", description: "Mark loki-logproto crate as unpublished", pr_number:                                        17979, scopes: ["dev"], type:                                                        "chore", breaking_change:       false, author: "Jesse Szwedko", files_count:      2, insertions_count:  365, deletions_count:  0},
+		{sha: "fde77bdd9c3acbbf84309b9dcd49d65eea394517", date: "2023-07-17 21:49:53 UTC", description: "Bump assert_cmd from 2.0.11 to 2.0.12", pr_number:                                          17982, scopes: ["deps"], type:                                                       "chore", breaking_change:       false, author: "dependabot[bot]", files_count:    2, insertions_count:  3, deletions_count:    3},
+		{sha: "81de3e54bfdbd112b4177db907e542bf540d97b0", date: "2023-07-18 04:50:47 UTC", description: "Bump dyn-clone from 1.0.11 to 1.0.12", pr_number:                                           17987, scopes: ["deps"], type:                                                       "chore", breaking_change:       false, author: "dependabot[bot]", files_count:    4, insertions_count:  5, deletions_count:    5},
+		{sha: "9a6ffad33b128b37dae15dc161529112be19f6bc", date: "2023-07-17 23:40:52 UTC", description: "Bump anyhow from 1.0.71 to 1.0.72", pr_number:                                              17986, scopes: ["deps"], type:                                                       "chore", breaking_change:       false, author: "dependabot[bot]", files_count:    4, insertions_count:  5, deletions_count:    5},
+		{sha: "a1d3c3a8488e05dc66f3661ca5ee48a27ca7eb95", date: "2023-07-18 01:08:14 UTC", description: "Correct docs for `syslog_ip`", pr_number:                                                   18003, scopes: ["docs", "syslog source"], type:                                      "fix", breaking_change:         false, author: "Jesse Szwedko", files_count:      1, insertions_count:  1, deletions_count:    1},
+		{sha: "04f9ddce818f8f09499824be166ff7313a533e0e", date: "2023-07-18 02:49:44 UTC", description: "Bump serde_bytes from 0.11.11 to 0.11.12", pr_number:                                       17988, scopes: ["deps"], type:                                                       "chore", breaking_change:       false, author: "dependabot[bot]", files_count:    2, insertions_count:  3, deletions_count:    3},
+		{sha: "fbc03080515a8f14492b80c92b2fa5b38c62d639", date: "2023-07-18 02:49:59 UTC", description: "Bump proc-macro2 from 1.0.64 to 1.0.66", pr_number:                                         17989, scopes: ["deps"], type:                                                       "chore", breaking_change:       false, author: "dependabot[bot]", files_count:    1, insertions_count:  68, deletions_count:   68},
+		{sha: "536a7f12cbeef373979f845ef3f1b565463cbccd", date: "2023-07-18 11:10:15 UTC", description: "make `database` and `table` templateable", pr_number:                                       18005, scopes: ["clickhouse sink"], type:                                            "feat", breaking_change:        false, author: "Doug Smith", files_count:         7, insertions_count:  193, deletions_count:  49},
+		{sha: "a36d36e862a598a5f825b034f97971e6d7967ba7", date: "2023-07-18 15:42:10 UTC", description: "Bump paste from 1.0.13 to 1.0.14", pr_number:                                               17991, scopes: ["deps"], type:                                                       "chore", breaking_change:       false, author: "dependabot[bot]", files_count:    4, insertions_count:  5, deletions_count:    5},
+		{sha: "0ebe7a7e0db26a4b88f9b3d3cabd35cf0279b810", date: "2023-07-18 15:42:23 UTC", description: "Bump serde_json from 1.0.102 to 1.0.103", pr_number:                                        17992, scopes: ["deps"], type:                                                       "chore", breaking_change:       false, author: "dependabot[bot]", files_count:    6, insertions_count:  7, deletions_count:    7},
+		{sha: "f53c6877eaf7c794b906f7f06ea3c1ab67c223f6", date: "2023-07-18 15:42:35 UTC", description: "Bump ryu from 1.0.14 to 1.0.15", pr_number:                                                 17993, scopes: ["deps"], type:                                                       "chore", breaking_change:       false, author: "dependabot[bot]", files_count:    1, insertions_count:  2, deletions_count:    2},
+		{sha: "caf61032dd077516353957cd3959ec34e6333cf1", date: "2023-07-18 15:42:46 UTC", description: "Bump syn from 2.0.25 to 2.0.26", pr_number:                                                 17994, scopes: ["deps"], type:                                                       "chore", breaking_change:       false, author: "dependabot[bot]", files_count:    1, insertions_count:  27, deletions_count:   27},
+		{sha: "9c59feaf08336123ff45a66b0cfa115523c010aa", date: "2023-07-18 15:42:57 UTC", description: "Bump inventory from 0.3.8 to 0.3.9", pr_number:                                             17995, scopes: ["deps"], type:                                                       "chore", breaking_change:       false, author: "dependabot[bot]", files_count:    2, insertions_count:  3, deletions_count:    3},
+		{sha: "90f494c6b2a0df5c4d3c41aa94ed60fc8e219841", date: "2023-07-18 15:43:49 UTC", description: "Bump opendal from 0.38.0 to 0.38.1", pr_number:                                             17999, scopes: ["deps"], type:                                                       "chore", breaking_change:       false, author: "dependabot[bot]", files_count:    1, insertions_count:  2, deletions_count:    2},
+		{sha: "60e765db182c568380849fc50396101f2b5476e9", date: "2023-07-18 15:44:00 UTC", description: "Bump uuid from 1.4.0 to 1.4.1", pr_number:                                                  18001, scopes: ["deps"], type:                                                       "chore", breaking_change:       false, author: "dependabot[bot]", files_count:    1, insertions_count:  2, deletions_count:    2},
+		{sha: "52ac10ac23fe120ac3e1c89ec3196be9ac894009", date: "2023-07-18 15:44:11 UTC", description: "Bump axum from 0.6.18 to 0.6.19", pr_number:                                                18002, scopes: ["deps"], type:                                                       "chore", breaking_change:       false, author: "dependabot[bot]", files_count:    2, insertions_count:  3, deletions_count:    3},
+		{sha: "6e552f01449bc55572314fa5d4853662126e538d", date: "2023-07-18 21:09:59 UTC", description: "Bump quote from 1.0.29 to 1.0.31", pr_number:                                               17990, scopes: ["deps"], type:                                                       "chore", breaking_change:       false, author: "dependabot[bot]", files_count:    1, insertions_count:  71, deletions_count:   71},
+		{sha: "3c257589dac737fcc245485d860b12b5ba7b2830", date: "2023-07-18 21:10:09 UTC", description: "Bump indoc from 2.0.2 to 2.0.3", pr_number:                                                 17996, scopes: ["deps"], type:                                                       "chore", breaking_change:       false, author: "dependabot[bot]", files_count:    4, insertions_count:  5, deletions_count:    5},
+		{sha: "ca368d8c6b9d67d79efe059336770522e410e057", date: "2023-07-19 04:10:19 UTC", description: "Bump semver from 1.0.17 to 1.0.18", pr_number:                                              17998, scopes: ["deps"], type:                                                       "chore", breaking_change:       false, author: "dependabot[bot]", files_count:    2, insertions_count:  5, deletions_count:    5},
+		{sha: "39a2bf56e4d8bdf23caedb177ad6c25ac439c28d", date: "2023-07-19 04:10:31 UTC", description: "Bump serde_with from 3.0.0 to 3.1.0", pr_number:                                            18004, scopes: ["deps"], type:                                                       "chore", breaking_change:       false, author: "dependabot[bot]", files_count:    4, insertions_count:  12, deletions_count:   12},
+		{sha: "115bd7b4dc4f065a99bb4e3dc464141026e6b3bf", date: "2023-07-19 07:33:57 UTC", description: "Fix \"Bring your own toolbox\" in `DEVELOPING.md`", pr_number:                              18014, scopes: [], type:                                                             "docs", breaking_change:        false, author: "Chris Sinjakli", files_count:     1, insertions_count:  5, deletions_count:    4},
+		{sha: "fd10e69a3bb0880798ff3690db08050740e51084", date: "2023-07-19 03:37:39 UTC", description: "Install script supports Apple ARM with Rosetta", pr_number:                                 18016, scopes: [], type:                                                             "chore", breaking_change:       false, author: "Spencer Gilbert", files_count:    2, insertions_count:  12, deletions_count:   9},
+		{sha: "32950d8ddb5623637a84103dce5e4f3ac176ab3b", date: "2023-07-19 04:13:28 UTC", description: "Migrate LogSchema::host_key to new lookup code", pr_number:                                 17972, scopes: ["config"], type:                                                     "feat", breaking_change:        false, author: "Pavlos Rontidis", files_count:    39, insertions_count: 306, deletions_count:  201},
+		{sha: "b44a431bd188ca191b5b9c89d8485010bb2cd747", date: "2023-07-19 04:54:27 UTC", description: "Fix `interval` fractional second parsing", pr_number:                                       17917, scopes: ["demo gcp_pubsub internal_metrics source throttle transform"], type: "fix", breaking_change:         false, author: "Scott Balmos", files_count:       5, insertions_count:  8, deletions_count:    8},
+		{sha: "3b9166249742a9dc114235550995eecf25288e64", date: "2023-07-19 10:58:40 UTC", description: "Bump serde_yaml from 0.9.22 to 0.9.24", pr_number:                                          18007, scopes: ["deps"], type:                                                       "chore", breaking_change:       false, author: "dependabot[bot]", files_count:    3, insertions_count:  8, deletions_count:    8},
+		{sha: "b00727ee13cc4eef6dde63bb8eaa8e0a570294ce", date: "2023-07-19 07:10:35 UTC", description: "restart api server based on topology", pr_number:                                           17958, scopes: ["reload"], type:                                                     "fix", breaking_change:         false, author: "KH-Moogsoft", files_count:        3, insertions_count:  50, deletions_count:   9},
+		{sha: "7d0db6bbf33a7bc2e929d5d56b207dce42da4317", date: "2023-07-20 03:47:17 UTC", description: "Install dd-rust-license-tool from crates.io", pr_number:                                    18025, scopes: ["dev"], type:                                                        "chore", breaking_change:       false, author: "Jesse Szwedko", files_count:      5, insertions_count:  6, deletions_count:    6},
+		{sha: "52a8036722ab5cd4ed92d8916b89d85d6447f8c0", date: "2023-07-20 04:57:47 UTC", description: "make tests deterministic through absolute comparisons instead of bounds checks", pr_number: 17956, scopes: ["component validation"], type:                                       "fix", breaking_change:         false, author: "neuronull", files_count:          10, insertions_count: 426, deletions_count:  444},
+		{sha: "aa605206baaa6db0506ed0698cfd14847abbb5a9", date: "2023-07-20 07:04:14 UTC", description: "validate `component_errors_total` for sources", pr_number:                                  17965, scopes: ["component validation"], type:                                       "feat", breaking_change:        false, author: "neuronull", files_count:          5, insertions_count:  24, deletions_count:   5},
+		{sha: "752056c06ae926b61ab33ea8d53dafd1e4f04f16", date: "2023-07-21 04:38:33 UTC", description: "Bump zstd from 0.12.3+zstd.1.5.2 to 0.12.4", pr_number:                                     18031, scopes: ["deps"], type:                                                       "chore", breaking_change:       false, author: "dependabot[bot]", files_count:    2, insertions_count:  7, deletions_count:    7},
+		{sha: "b36c5311c7f5787ea0770e83df3ce3ae5c7a7e0b", date: "2023-07-21 12:16:33 UTC", description: "Bump serde from 1.0.171 to 1.0.173", pr_number:                                             18032, scopes: ["deps"], type:                                                       "chore", breaking_change:       false, author: "dependabot[bot]", files_count:    9, insertions_count:  12, deletions_count:   11},
+		{sha: "7050b7ef4b73f0997e3f69be12ec34547f6e6ecb", date: "2023-07-21 13:39:59 UTC", description: "Bump serde_yaml from 0.9.24 to 0.9.25", pr_number:                                          18040, scopes: ["deps"], type:                                                       "chore", breaking_change:       false, author: "dependabot[bot]", files_count:    3, insertions_count:  8, deletions_count:    8},
+		{sha: "0bf6abd03fc92c80f306a20da9825c8298efe041", date: "2023-07-21 16:14:54 UTC", description: "count byte_size after transforming event", pr_number:                                       17941, scopes: ["observability"], type:                                              "chore", breaking_change:       false, author: "Stephen Wakely", files_count:     29, insertions_count: 427, deletions_count:  155},
+		{sha: "81f5c507793d73a0678968c4a596b213cfa5c619", date: "2023-07-22 06:32:37 UTC", description: "consolidate `EventCountTags` with `TaggedEventsSent`", pr_number:                           17865, scopes: ["observability"], type:                                              "chore", breaking_change:       false, author: "Stephen Wakely", files_count:     12, insertions_count: 62, deletions_count:   83},
+		{sha: "9b4cd44d599b08f3459fb1108b86921eb76a355d", date: "2023-07-21 22:52:09 UTC", description: "Bump tower-http from 0.4.1 to 0.4.2", pr_number:                                            18030, scopes: ["deps"], type:                                                       "chore", breaking_change:       false, author: "dependabot[bot]", files_count:    3, insertions_count:  6, deletions_count:    20},
+		{sha: "4de89f23e7ead95e96d82334bd0815ce33359927", date: "2023-07-22 05:52:22 UTC", description: "Bump num-traits from 0.2.15 to 0.2.16", pr_number:                                          18039, scopes: ["deps"], type:                                                       "chore", breaking_change:       false, author: "dependabot[bot]", files_count:    3, insertions_count:  4, deletions_count:    4},
+		{sha: "983a92a8b7eeab3b262c02557ccc1cbd5f11d75e", date: "2023-07-22 05:52:33 UTC", description: "Bump syn from 2.0.26 to 2.0.27", pr_number:                                                 18042, scopes: ["deps"], type:                                                       "chore", breaking_change:       false, author: "dependabot[bot]", files_count:    1, insertions_count:  27, deletions_count:   27},
+		{sha: "689a79e20e0130fd2070be28173fa3ef565b27ac", date: "2023-07-22 02:58:03 UTC", description: "add support for `external_id` in AWS assume role", pr_number:                               17743, scopes: ["provider aws"], type:                                               "feat", breaking_change:        false, author: "Ankit Luthra", files_count:       11, insertions_count: 162, deletions_count:  1},
+		{sha: "0f14c0d02d5f9bc4ed68236d07d74a70eab13c64", date: "2023-07-22 04:14:59 UTC", description: "Migrate LogSchema::message_key to new lookup code", pr_number:                              18024, scopes: ["config"], type:                                                     "feat", breaking_change:        false, author: "Pavlos Rontidis", files_count:    55, insertions_count: 639, deletions_count:  410},
+		{sha: "250cc950b0d3feb27755b614bb3402543195a683", date: "2023-07-22 03:20:04 UTC", description: "Fix links in CONTRIBUTING.md", pr_number:                                                   18061, scopes: ["docs"], type:                                                       "chore", breaking_change:       false, author: "Jesse Szwedko", files_count:      1, insertions_count:  4, deletions_count:    4},
+		{sha: "5bccafe44931a12695f7ab0ba20e177a65fb2454", date: "2023-07-22 05:54:18 UTC", description: "Bump typetag from 0.2.10 to 0.2.11", pr_number:                                             18048, scopes: ["deps"], type:                                                       "chore", breaking_change:       false, author: "dependabot[bot]", files_count:    3, insertions_count:  6, deletions_count:    6},
+		{sha: "437cad6fcc99266c92aa228269787e3b18a79c45", date: "2023-07-22 12:55:13 UTC", description: "Bump serde from 1.0.173 to 1.0.174", pr_number:                                             18050, scopes: ["deps"], type:                                                       "chore", breaking_change:       false, author: "dependabot[bot]", files_count:    8, insertions_count:  11, deletions_count:   11},
+		{sha: "bbe2c74de044cf33ce0cd371c6bfff00c1f285ad", date: "2023-07-22 12:55:46 UTC", description: "Bump async-trait from 0.1.71 to 0.1.72", pr_number:                                         18053, scopes: ["deps"], type:                                                       "chore", breaking_change:       false, author: "dependabot[bot]", files_count:    2, insertions_count:  3, deletions_count:    3},
+		{sha: "497fdcede4ae828a00574c496122752b2a70e89c", date: "2023-07-22 12:55:58 UTC", description: "Bump rmp-serde from 1.1.1 to 1.1.2", pr_number:                                             18054, scopes: ["deps"], type:                                                       "chore", breaking_change:       false, author: "dependabot[bot]", files_count:    2, insertions_count:  3, deletions_count:    3},
+		{sha: "f1d4196d295ae0e188ab4b2ca9ea2e4165467745", date: "2023-07-22 12:56:10 UTC", description: "Bump tower-http from 0.4.2 to 0.4.3", pr_number:                                            18055, scopes: ["deps"], type:                                                       "chore", breaking_change:       false, author: "dependabot[bot]", files_count:    2, insertions_count:  3, deletions_count:    3},
+		{sha: "087a0ace58867c6152317360717e3c97f8e143be", date: "2023-07-22 12:56:21 UTC", description: "Bump nkeys from 0.3.0 to 0.3.1", pr_number:                                                 18056, scopes: ["deps"], type:                                                       "chore", breaking_change:       false, author: "dependabot[bot]", files_count:    2, insertions_count:  5, deletions_count:    4},
+		{sha: "b305334b99a2d3cefcc0dd48e6e60b371645a24d", date: "2023-07-23 07:01:15 UTC", description: "Bump security-framework from 2.9.1 to 2.9.2", pr_number:                                    18051, scopes: ["deps"], type:                                                       "chore", breaking_change:       false, author: "dependabot[bot]", files_count:    2, insertions_count:  3, deletions_count:    3},
+		{sha: "ee2396ff926468ed94199a930f3e04db2e7bbd04", date: "2023-07-23 07:01:25 UTC", description: "Bump thiserror from 1.0.43 to 1.0.44", pr_number:                                           18052, scopes: ["deps"], type:                                                       "chore", breaking_change:       false, author: "dependabot[bot]", files_count:    1, insertions_count:  4, deletions_count:    4},
+		{sha: "684e43f5bb2be30a1bb63a742dbc6f6215604f37", date: "2023-07-23 07:01:38 UTC", description: "Bump inventory from 0.3.9 to 0.3.10", pr_number:                                            18064, scopes: ["deps"], type:                                                       "chore", breaking_change:       false, author: "dependabot[bot]", files_count:    2, insertions_count:  3, deletions_count:    3},
+		{sha: "a9df9589b9ba1869ae354fea48419786fa41468e", date: "2023-07-24 22:48:02 UTC", description: "run requests in parallel with timeouts", pr_number:                                         18021, scopes: ["prometheus_scrape source"], type:                                   "enhancement", breaking_change: false, author: "Renning Bruns", files_count:      7, insertions_count:  124, deletions_count:  17},
+		{sha: "db9e47fef445ece5c86d786c3cf96049d8f6ee6b", date: "2023-07-25 01:43:12 UTC", description: "Add licenses to packages", pr_number:                                                       18006, scopes: [], type:                                                             "chore", breaking_change:       false, author: "Jesse Szwedko", files_count:      20, insertions_count: 404, deletions_count:  11},
+		{sha: "86636020f145bae0e0259b78cc9ffa789381505e", date: "2023-07-25 05:37:00 UTC", description: "Migrate LogSchema::metadata key to new lookup code", pr_number:                             18058, scopes: ["config"], type:                                                     "feat", breaking_change:        false, author: "Pavlos Rontidis", files_count:    3, insertions_count:  56, deletions_count:   33},
+		{sha: "fecca5ef183268f0034995a695e3424d8a86fd03", date: "2023-07-25 02:52:01 UTC", description: "Upgrade debian usages to use bookworm", pr_number:                                          18057, scopes: ["deps"], type:                                                       "chore", breaking_change:       false, author: "Jesse Szwedko", files_count:      7, insertions_count:  10, deletions_count:   9},
+		{sha: "16a42ed29c832a39021b2822072f8a67d72ce7a8", date: "2023-07-25 06:58:22 UTC", description: "Bump serde from 1.0.174 to 1.0.175", pr_number:                                             18071, scopes: ["deps"], type:                                                       "chore", breaking_change:       false, author: "dependabot[bot]", files_count:    8, insertions_count:  11, deletions_count:   11},
+		{sha: "d8f211eaa2b9d5c27089c17dfbbd762de167a988", date: "2023-07-25 06:58:35 UTC", description: "Bump inventory from 0.3.10 to 0.3.11", pr_number:                                           18070, scopes: ["deps"], type:                                                       "chore", breaking_change:       false, author: "dependabot[bot]", files_count:    2, insertions_count:  3, deletions_count:    3},
+		{sha: "dc2348a8028c399ffef8939ad27161a7e5c62ef2", date: "2023-07-25 12:58:47 UTC", description: "Bump quote from 1.0.31 to 1.0.32", pr_number:                                               18069, scopes: ["deps"], type:                                                       "chore", breaking_change:       false, author: "dependabot[bot]", files_count:    1, insertions_count:  71, deletions_count:   71},
+		{sha: "3968325707f90937e91b0ba12a6dbdae4719854b", date: "2023-07-25 12:59:49 UTC", description: "Bump tokio-tungstenite from 0.19.0 to 0.20.0", pr_number:                                   18065, scopes: ["deps"], type:                                                       "chore", breaking_change:       false, author: "dependabot[bot]", files_count:    4, insertions_count:  10, deletions_count:   13},
+		{sha: "1dd505fde140b0d64431346bfc72ee24144b8710", date: "2023-07-25 21:59:12 UTC", description: "Update to Rust 1.71.0", pr_number:                                                          18075, scopes: ["deps"], type:                                                       "chore", breaking_change:       false, author: "Jesse Szwedko", files_count:      22, insertions_count: 34, deletions_count:   37},
+		{sha: "421b421bb988335316417c80129014ff80179246", date: "2023-07-25 23:02:19 UTC", description: "Update tokio-util fork to 0.7.8", pr_number:                                                18078, scopes: ["deps"], type:                                                       "chore", breaking_change:       false, author: "Jesse Szwedko", files_count:      2, insertions_count:  3, deletions_count:    3},
+		{sha: "c592cb17dc4fd153804335c4b315f43d22f0bceb", date: "2023-07-26 06:36:07 UTC", description: "add more direct regression case for s3 sink", pr_number:                                    18082, scopes: [], type:                                                             "chore", breaking_change:       false, author: "Luke Steensen", files_count:      3, insertions_count:  54, deletions_count:   0},
+		{sha: "b85f4f9cda826e08767c69dcffde04ffad977932", date: "2023-07-26 04:47:11 UTC", description: "send encoded message as binary frame", pr_number:                                           18060, scopes: ["websocket sink"], type:                                             "fix", breaking_change:         false, author: "Zhong Chen", files_count:         1, insertions_count:  18, deletions_count:   1},
+		{sha: "f6c53d035e5c8d2c655c7c8b7ad82f7f341f6862", date: "2023-07-26 06:54:50 UTC", description: "Bump roaring from 0.10.1 to 0.10.2", pr_number:                                             18079, scopes: ["deps"], type:                                                       "chore", breaking_change:       false, author: "dependabot[bot]", files_count:    2, insertions_count:  3, deletions_count:    3},
+		{sha: "b70074cb73cb03a44909d80295828c46fc74f4de", date: "2023-07-26 12:54:57 UTC", description: "Bump typetag from 0.2.11 to 0.2.12", pr_number:                                             18066, scopes: ["deps"], type:                                                       "chore", breaking_change:       false, author: "dependabot[bot]", files_count:    3, insertions_count:  6, deletions_count:    6},
+		{sha: "065eecbcafd37a99ba8667f69cee78d96bb132e1", date: "2023-07-27 04:55:30 UTC", description: "replace LogEvent 'String's with '&OwnedTargetPath's", pr_number:                            18084, scopes: ["config"], type:                                                     "feat", breaking_change:        false, author: "Pavlos Rontidis", files_count:    9, insertions_count:  142, deletions_count:  106},
+		{sha: "28f5c23aa84f70736fe5ef5132e274b3611cceb9", date: "2023-07-28 03:06:22 UTC", description: "replace tuples with &OwnedTargetPath wherever possible", pr_number:                         18097, scopes: ["config"], type:                                                     "feat", breaking_change:        false, author: "Pavlos Rontidis", files_count:    19, insertions_count: 67, deletions_count:   112},
+		{sha: "f015b299b0249d082f297f7aee15f42ae091c77b", date: "2023-07-28 03:41:10 UTC", description: "Refactor TraceEvent insert to use TargetPath compatible types", pr_number:                  18090, scopes: ["config"], type:                                                     "feat", breaking_change:        false, author: "Pavlos Rontidis", files_count:    8, insertions_count:  66, deletions_count:   56},
+		{sha: "a8bb9f45867ab2435640258ad07babc1d0b8f747", date: "2023-07-28 06:52:23 UTC", description: "LogSchema metadata key refacoring", pr_number:                                              18099, scopes: ["config"], type:                                                     "feat", breaking_change:        false, author: "Pavlos Rontidis", files_count:    6, insertions_count:  40, deletions_count:   37},
+		{sha: "00ed120317b8673952fec5b8bad3baba482854f7", date: "2023-07-28 07:17:56 UTC", description: "Bump serde_json from 1.0.103 to 1.0.104", pr_number:                                        18095, scopes: ["deps"], type:                                                       "chore", breaking_change:       false, author: "dependabot[bot]", files_count:    6, insertions_count:  7, deletions_count:    7},
+		{sha: "9458b6c63d5fa069ab4cb956c7044eb9f74ebfbe", date: "2023-07-28 07:18:09 UTC", description: "Bump no-proxy from 0.3.2 to 0.3.3", pr_number:                                              18094, scopes: ["deps"], type:                                                       "chore", breaking_change:       false, author: "dependabot[bot]", files_count:    3, insertions_count:  4, deletions_count:    4},
+		{sha: "4915b429a81887736fd1864cd45697f052105277", date: "2023-07-28 23:47:21 UTC", description: "add tests to sinks for Data Volume tags", pr_number:                                        17853, scopes: ["observability"], type:                                              "chore", breaking_change:       false, author: "Stephen Wakely", files_count:     14, insertions_count: 499, deletions_count:  121},
+		{sha: "8a2f8f67cd23fde5c7a48c07c5f67c67b833c089", date: "2023-07-28 23:44:43 UTC", description: "allow empty message_key value in config", pr_number:                                        18091, scopes: ["config"], type:                                                     "fix", breaking_change:         false, author: "Pavlos Rontidis", files_count:    1, insertions_count:  12, deletions_count:   5},
+		{sha: "a06c71102867af5e4526e445f9ba8f4506382a30", date: "2023-07-29 10:59:05 UTC", description: "add support for protobuf decoding", pr_number:                                              18019, scopes: ["codecs"], type:                                                     "feat", breaking_change:        false, author: "Daniel599", files_count:          32, insertions_count: 742, deletions_count:  1},
+		{sha: "b009e4d72c7cf0864e5cd5dcb6a392e6559db786", date: "2023-08-01 07:17:17 UTC", description: "Update syslog_loose to properly handle escapes", pr_number:                                 18114, scopes: ["codecs"], type:                                                     "chore", breaking_change:       false, author: "Stephen Wakely", files_count:     3, insertions_count:  16, deletions_count:   5},
+		{sha: "d3e512881b2f7e7135c4b0fd917ac501815086c4", date: "2023-08-01 06:21:02 UTC", description: "Bump syn from 2.0.27 to 2.0.28", pr_number:                                                 18117, scopes: ["deps"], type:                                                       "chore", breaking_change:       false, author: "dependabot[bot]", files_count:    1, insertions_count:  27, deletions_count:   27},
+		{sha: "48abad44407f36c494611a87a6698d909eb8a839", date: "2023-08-01 12:21:33 UTC", description: "Bump redis from 0.23.0 to 0.23.1", pr_number:                                               18107, scopes: ["deps"], type:                                                       "chore", breaking_change:       false, author: "dependabot[bot]", files_count:    3, insertions_count:  16, deletions_count:   3},
+		{sha: "564104eadbe5bcc230497ee22edc37039fd21bb2", date: "2023-08-01 12:21:47 UTC", description: "Bump tikv-jemallocator from 0.5.0 to 0.5.4", pr_number:                                     18102, scopes: ["deps"], type:                                                       "chore", breaking_change:       false, author: "dependabot[bot]", files_count:    3, insertions_count:  4, deletions_count:    4},
+		{sha: "e6f2cccc9dcb93d537dfa2aad5741a6c1c7bac6a", date: "2023-08-01 14:18:27 UTC", description: "Bump serde from 1.0.175 to 1.0.180", pr_number:                                             18127, scopes: ["deps"], type:                                                       "chore", breaking_change:       false, author: "dependabot[bot]", files_count:    8, insertions_count:  11, deletions_count:   11},
+		{sha: "36111b5e7f971b336244113762210a486fdd6d0f", date: "2023-08-02 06:48:27 UTC", description: "fix issues when using container tools and `cargo` is not installed locally", pr_number:     18112, scopes: ["dev"], type:                                                        "fix", breaking_change:         false, author: "Hugo Hromic", files_count:        2, insertions_count:  18, deletions_count:   3},
+		{sha: "36788d13bd9f87c480c47677d0ca5f2ba400d743", date: "2023-08-01 22:49:03 UTC", description: "Move protobuf codec options under a `protobuf` key", pr_number:                             18111, scopes: ["codecs"], type:                                                     "fix", breaking_change:         false, author: "Jesse Szwedko", files_count:      19, insertions_count: 327, deletions_count:  223},
+		{sha: "93b19459010575a702a0a5eba7c2bb923bf5baa1", date: "2023-08-02 02:22:26 UTC", description: "fix gardener move blocked to triage on comment", pr_number:                                 18126, scopes: ["ci"], type:                                                         "fix", breaking_change:         false, author: "neuronull", files_count:          1, insertions_count:  1, deletions_count:    1},
+		{sha: "7df6af7cf5866e2f49b657b5ae3ec54521810e32", date: "2023-08-02 06:55:40 UTC", description: "Bump async_graphql, async_graphql_warp from 5.0.10 to 6.0.0", pr_number:                    18122, scopes: ["deps"], type:                                                       "chore", breaking_change:       false, author: "neuronull", files_count:          7, insertions_count:  98, deletions_count:   24},
+		{sha: "5a6ce731c999f0960e8411a9b286730314c4e7ac", date: "2023-08-03 02:25:04 UTC", description: "Fix basic sink tutorial issues", pr_number:                                                 18136, scopes: ["internal docs"], type:                                              "docs", breaking_change:        false, author: "Tom de Bruijn", files_count:      2, insertions_count:  2, deletions_count:    2},
+		{sha: "8068f1d115666adafb95dac50ecc2a8879f1af8a", date: "2023-08-03 02:16:31 UTC", description: "replace path tuples with actual target paths", pr_number:                                   18139, scopes: ["config"], type:                                                     "chore", breaking_change:       false, author: "Pavlos Rontidis", files_count:    17, insertions_count: 137, deletions_count:  409},
+		{sha: "8022464f8ae08b68b3ae571a90fdf50ca6822973", date: "2023-08-03 03:35:18 UTC", description: "propagate config build error instead of panicking", pr_number:                              18124, scopes: ["config"], type:                                                     "fix", breaking_change:         false, author: "Pavlos Rontidis", files_count:    23, insertions_count: 82, deletions_count:   60},
+		{sha: "600f8191a8fe169eb38c429958dd59714349acb4", date: "2023-08-03 04:09:58 UTC", description: "Refactor top and tap for library use", pr_number:                                           18129, scopes: ["api"], type:                                                        "chore", breaking_change:       false, author: "Will Wang", files_count:          8, insertions_count:  215, deletions_count:  154},
+		{sha: "34eaf43d37b51703510045890bbb279d7e0bf78e", date: "2023-08-04 06:53:00 UTC", description: "exclude protobuf files from spell checking", pr_number:                                     18152, scopes: ["ci"], type:                                                         "chore", breaking_change:       false, author: "neuronull", files_count:          1, insertions_count:  1, deletions_count:    0},
+		{sha: "a7c95ddf287fb3f97f41cb662d07113ed5ddec73", date: "2023-08-04 06:53:11 UTC", description: "Bump indicatif from 0.17.5 to 0.17.6", pr_number:                                           18146, scopes: ["deps"], type:                                                       "chore", breaking_change:       false, author: "dependabot[bot]", files_count:    2, insertions_count:  4, deletions_count:    4},
+		{sha: "b2d23a838e7b5409273d82afa647b960b24499d3", date: "2023-08-05 01:53:13 UTC", description: "update sink tutorials with Data Volume tag changes", pr_number:                             18148, scopes: ["external docs"], type:                                              "chore", breaking_change:       false, author: "Stephen Wakely", files_count:     2, insertions_count:  37, deletions_count:   14},
+		{sha: "adfef2eeca6e4047e372e530109d640e55b38478", date: "2023-08-05 05:28:07 UTC", description: "Update VRL to 0.6.0", pr_number:                                                            18150, scopes: ["deps", "vrl"], type:                                                "feat", breaking_change:        false, author: "Pavlos Rontidis", files_count:    16, insertions_count: 277, deletions_count:  110},
+		{sha: "0ddd221f4f657801955102aba76c7f36db68f9fe", date: "2023-08-05 06:35:00 UTC", description: "Bump axum from 0.6.19 to 0.6.20", pr_number:                                                18154, scopes: ["deps"], type:                                                       "chore", breaking_change:       false, author: "dependabot[bot]", files_count:    2, insertions_count:  3, deletions_count:    3},
+		{sha: "2c51c5c5a0daf75803cd417781bd0e318d1ab9da", date: "2023-08-05 06:35:03 UTC", description: "Bump serde from 1.0.180 to 1.0.181", pr_number:                                             18155, scopes: ["deps"], type:                                                       "chore", breaking_change:       false, author: "dependabot[bot]", files_count:    8, insertions_count:  11, deletions_count:   11},
+		{sha: "be551c8c231d6c874edad0de5bdd9c14e6bdfb63", date: "2023-08-05 12:39:51 UTC", description: "Bump serde_with from 3.1.0 to 3.2.0", pr_number:                                            18162, scopes: ["deps"], type:                                                       "chore", breaking_change:       false, author: "dependabot[bot]", files_count:    4, insertions_count:  13, deletions_count:   12},
+		{sha: "e125eee58eab3660dc203ff92653e7bd10229845", date: "2023-08-08 04:27:25 UTC", description: "Bump pin-project from 1.1.2 to 1.1.3", pr_number:                                           18169, scopes: ["deps"], type:                                                       "chore", breaking_change:       false, author: "dependabot[bot]", files_count:    5, insertions_count:  8, deletions_count:    8},
+		{sha: "09610b3d8a998ca51db2823e4d39fd41071f385e", date: "2023-08-08 00:34:44 UTC", description: "Bump openssl from 0.10.55 to 0.10.56", pr_number:                                           18170, scopes: ["deps"], type:                                                       "chore", breaking_change:       false, author: "dependabot[bot]", files_count:    3, insertions_count:  6, deletions_count:    6},
+		{sha: "6036d5c8235dad865c1f32374726a618543bd046", date: "2023-08-08 06:53:35 UTC", description: "Bump serde from 1.0.181 to 1.0.183", pr_number:                                             18171, scopes: ["deps"], type:                                                       "chore", breaking_change:       false, author: "dependabot[bot]", files_count:    8, insertions_count:  11, deletions_count:   11},
+		{sha: "3c535ecc289f2376133c8229ecc8316dbb4806bf", date: "2023-08-08 10:53:14 UTC", description: "switch to crates.io release of Azure SDK", pr_number:                                       18166, scopes: ["azure provider"], type:                                             "feat", breaking_change:        false, author: "Paolo Barbolini", files_count:    3, insertions_count:  34, deletions_count:   52},
+		{sha: "8fc574f98baf0551de8439eaf9ade1a3dea6f37c", date: "2023-08-08 02:34:11 UTC", description: "Fix TOML parsing of compression levels", pr_number:                                         18173, scopes: ["config"], type:                                                     "fix", breaking_change:         false, author: "Jesse Szwedko", files_count:      1, insertions_count:  33, deletions_count:   3},
+		{sha: "0ae3d513711491fd50037a40b4741e3e1a52773d", date: "2023-08-08 23:59:21 UTC", description: "Bump clap from 4.3.19 to 4.3.21", pr_number:                                                18178, scopes: ["deps"], type:                                                       "chore", breaking_change:       false, author: "dependabot[bot]", files_count:    7, insertions_count:  20, deletions_count:   20},
+		{sha: "3b53bcda04a06b365bc35965e8934eddac1b7fc2", date: "2023-08-09 01:18:48 UTC", description: "support configuring the initial ARC limit", pr_number:                                      18175, scopes: ["adaptive_concurrency"], type:                                       "feat", breaking_change:        false, author: "Blake Mealey", files_count:       42, insertions_count: 457, deletions_count:  1},
+		{sha: "e476e120503d8682c8aef511b7af9b8851f2d03c", date: "2023-08-09 02:46:05 UTC", description: "Refactor 'event.get()' to use path types", pr_number:                                       18160, scopes: ["config"], type:                                                     "feat", breaking_change:        false, author: "Pavlos Rontidis", files_count:    13, insertions_count: 124, deletions_count:  59},
+		{sha: "4a049d4a90a6a994c530140236c7d67e516674e3", date: "2023-08-09 03:37:40 UTC", description: "Base Content-Type on encoder and not compression", pr_number:                               18184, scopes: ["azure_blob sink"], type:                                            "fix", breaking_change:         false, author: "Steve Jacobs", files_count:       3, insertions_count:  11, deletions_count:   19},
+		{sha: "d8eefe331af0faa478b9fe2f58de2a25a83589e9", date: "2023-08-09 05:45:04 UTC", description: "replace various string paths with actual paths", pr_number:                                 18109, scopes: [], type:                                                             "chore", breaking_change:       false, author: "Pavlos Rontidis", files_count:    24, insertions_count: 206, deletions_count:  149},
+		{sha: "0c1cf23f4563e0a0beb6e080915da8ef5f78e7e7", date: "2023-08-09 05:49:27 UTC", description: "make LogEvent index operator test only", pr_number:                                         18185, scopes: ["config"], type:                                                     "fix", breaking_change:         false, author: "Pavlos Rontidis", files_count:    1, insertions_count:  1, deletions_count:    0},
+		{sha: "4cc9cdf04cbd2e25426ca3283b76c5b3eee93565", date: "2023-08-09 03:48:13 UTC", description: "Remove the 4MB default for requests", pr_number:                                            18186, scopes: ["vector source"], type:                                              "fix", breaking_change:         false, author: "Jesse Szwedko", files_count:      1, insertions_count:  3, deletions_count:    1},
+		{sha: "0aeb143cd8012e17f125569e84b968228ec4b4a1", date: "2023-08-10 05:49:39 UTC", description: "refactor to new sink style", pr_number:                                                     18172, scopes: ["azure_monitor_logs sink"], type:                                    "chore", breaking_change:       false, author: "Doug Smith", files_count:         6, insertions_count:  939, deletions_count:  695},
+		{sha: "caf6103f76ce7cd913129f64e0d5c5d17bdbc799", date: "2023-08-10 05:52:31 UTC", description: "emit an error if the condition return type is not a boolean", pr_number:                    18196, scopes: ["vrl"], type:                                                        "feat", breaking_change:        false, author: "Pavlos Rontidis", files_count:    1, insertions_count:  1, deletions_count:    1},
+		{sha: "8454a6f46099e95f6aef41a0830cda6bb3b22b0e", date: "2023-08-10 05:09:04 UTC", description: "Bump OpenSSL base version to 3.1.*", pr_number:                                             17669, scopes: ["deps"], type:                                                       "chore", breaking_change:       false, author: "Bruce Guenter", files_count:      6, insertions_count:  56, deletions_count:   10},
+		{sha: "92c2b9cce248c250b962f4a1de1194e14f177ce3", date: "2023-08-11 01:09:45 UTC", description: "Bump tokio from 1.29.1 to 1.30.0", pr_number:                                               18202, scopes: ["deps"], type:                                                       "chore", breaking_change:       false, author: "dependabot[bot]", files_count:    9, insertions_count:  15, deletions_count:   16},
+		{sha: "cd8c8b18eed10ccb59e6929d7ee30feac2a6ec25", date: "2023-08-10 23:30:53 UTC", description: "Expose shutdown errors", pr_number:                                                         18153, scopes: ["core"], type:                                                       "chore", breaking_change:       false, author: "Bruce Guenter", files_count:      10, insertions_count: 175, deletions_count:  109},
+		{sha: "7603d2813e389a1103286c634d92d9da1e8a8b52", date: "2023-08-11 01:28:43 UTC", description: "Update `smp` to its latest released version", pr_number:                                    18204, scopes: [], type:                                                             "chore", breaking_change:       false, author: "Brian L. Troutwine", files_count: 1, insertions_count:  1, deletions_count:    6},
+		{sha: "91e48f6834ee51ec2492080e8ebc21d380ee5a4b", date: "2023-08-11 03:40:57 UTC", description: "Upgrading version of lading used", pr_number:                                               18210, scopes: ["deps"], type:                                                       "chore", breaking_change:       false, author: "Jesse Szwedko", files_count:      1, insertions_count:  1, deletions_count:    1},
+		{sha: "f39a0e96cf18ffeb225908e21c7255d3d8550898", date: "2023-08-11 05:14:16 UTC", description: "Fix package install in Tiltfile", pr_number:                                                18198, scopes: ["dev"], type:                                                        "chore", breaking_change:       false, author: "Jesse Szwedko", files_count:      3, insertions_count:  14, deletions_count:   3},
+		{sha: "f77fd3d2735dbfeda3d9bdaf8f11605e4acd8a33", date: "2023-08-12 04:56:35 UTC", description: "fix Rust toolchain check in Makefile", pr_number:                                           18218, scopes: ["dev"], type:                                                        "fix", breaking_change:         false, author: "Hugo Hromic", files_count:        1, insertions_count:  1, deletions_count:    1},
+		{sha: "483e46fe4656d3636d6cbff18c2e9f86baa48d68", date: "2023-08-12 06:39:06 UTC", description: "migrate to `async_nats` client", pr_number:                                                 18165, scopes: ["nats source", "nats sink"], type:                                   "enhancement", breaking_change: false, author: "Paolo Barbolini", files_count:    7, insertions_count:  155, deletions_count:  245},
+		{sha: "eaed0a899a22d5ab23ac4eb0ab23cc34280fb5da", date: "2023-08-11 23:09:47 UTC", description: "Upgrade to Rust 1.71.1", pr_number:                                                         18221, scopes: ["deps"], type:                                                       "chore", breaking_change:       false, author: "Jesse Szwedko", files_count:      2, insertions_count:  2, deletions_count:    2},
+		{sha: "ca7fa05ca98ac8ed097dc7a24b1652d62dbf283a", date: "2023-08-12 04:59:30 UTC", description: "Refactor dnstap to use 'OwnedValuePath's", pr_number:                                       18212, scopes: ["config"], type:                                                     "feat", breaking_change:        false, author: "Pavlos Rontidis", files_count:    4, insertions_count:  868, deletions_count:  1195},
+		{sha: "ad08d010fbeb2df02e38433064916d8ee8bc37b3", date: "2023-08-12 04:28:55 UTC", description: "Run hadolint on distributed Dockerfiles", pr_number:                                        18224, scopes: ["releasing"], type:                                                  "chore", breaking_change:       false, author: "Jesse Szwedko", files_count:      5, insertions_count:  11, deletions_count:   4},
+		{sha: "00037b075e1842139eb5a6c97eabfb09042c95e7", date: "2023-08-12 05:42:19 UTC", description: "Bump regex from 1.9.1 to 1.9.3", pr_number:                                                 18167, scopes: ["deps"], type:                                                       "chore", breaking_change:       false, author: "dependabot[bot]", files_count:    5, insertions_count:  15, deletions_count:   15},
+		{sha: "01295b0beab4d0a7b13c52515d1120618879dc97", date: "2023-08-12 06:18:39 UTC", description: "Remove an unneeded advisory ignore", pr_number:                                             18226, scopes: ["deps"], type:                                                       "chore", breaking_change:       false, author: "Jesse Szwedko", files_count:      1, insertions_count:  0, deletions_count:    5},
+		{sha: "8bbe6a6f0c2a3cd3c97ec0495cbc067c88918264", date: "2023-08-12 13:37:36 UTC", description: "Bump strip-ansi-escapes from 0.1.1 to 0.2.0", pr_number:                                    18203, scopes: ["deps"], type:                                                       "chore", breaking_change:       false, author: "dependabot[bot]", files_count:    3, insertions_count:  24, deletions_count:   5},
+		{sha: "8838faff9e29dab975580200c571b18b970696c6", date: "2023-08-12 06:43:34 UTC", description: "Swap tui crate for ratatui", pr_number:                                                     18225, scopes: ["deps"], type:                                                       "chore", breaking_change:       false, author: "Jesse Szwedko", files_count:      6, insertions_count:  30, deletions_count:   43},
+		{sha: "e61c14fdf8111530324878235deedb33526bb897", date: "2023-08-12 14:27:02 UTC", description: "Bump gloo-utils from 0.1.7 to 0.2.0", pr_number:                                            18227, scopes: ["deps"], type:                                                       "chore", breaking_change:       false, author: "dependabot[bot]", files_count:    2, insertions_count:  3, deletions_count:    3},
+		{sha: "ec3b4401bb839d207b30ab9561533c958dcc4f99", date: "2023-08-15 03:54:29 UTC", description: "Bump redis from 0.23.1 to 0.23.2", pr_number:                                               18234, scopes: ["deps"], type:                                                       "chore", breaking_change:       false, author: "dependabot[bot]", files_count:    2, insertions_count:  3, deletions_count:    3},
+		{sha: "20fa1bfc7d4edcb67d26d798249abdd767ba2b72", date: "2023-08-15 03:54:44 UTC", description: "Bump async-trait from 0.1.72 to 0.1.73", pr_number:                                         18235, scopes: ["deps"], type:                                                       "chore", breaking_change:       false, author: "dependabot[bot]", files_count:    2, insertions_count:  3, deletions_count:    3},
+		{sha: "851e99ca77ade46fe2a01320db8d16e6bf610c00", date: "2023-08-15 03:54:55 UTC", description: "Bump bitmask-enum from 2.2.1 to 2.2.2", pr_number:                                          18236, scopes: ["deps"], type:                                                       "chore", breaking_change:       false, author: "dependabot[bot]", files_count:    2, insertions_count:  3, deletions_count:    3},
+		{sha: "cb007fea2ee81882943dec0c52e2883bb5a9de86", date: "2023-08-15 03:55:35 UTC", description: "Bump log from 0.4.19 to 0.4.20", pr_number:                                                 18237, scopes: ["deps"], type:                                                       "chore", breaking_change:       false, author: "dependabot[bot]", files_count:    2, insertions_count:  3, deletions_count:    3},
+	]
+}
diff --git a/website/cue/reference/releases/0.32.1.cue b/website/cue/reference/releases/0.32.1.cue
new file mode 100644
index 0000000000000..4b20bc355e2e7
--- /dev/null
+++ b/website/cue/reference/releases/0.32.1.cue
@@ -0,0 +1,68 @@
+package metadata
+
+releases: "0.32.1": {
+	date:     "2023-08-21"
+	codename: ""
+
+	whats_next: []
+	description: """
+		This patch release contains a fix for a regression in 0.32.0 and fixes a few issues with the release artifacts.
+
+		**Note:** Please see the release notes for [`v0.32.0`](/releases/0.32.0/) for additional changes if upgrading from
+		`v0.31.X`. In particular, the upgrade guide for breaking changes.
+		"""
+
+	changelog: [
+		{
+			type: "fix"
+			scopes: ["observability"]
+			description: """
+				A number of sinks were emitting incorrect telemetry for the `component_sent_*` metrics:
+
+				- WebHDFS
+				- GCP Cloud Storage
+				- AWS S3
+				- Azure Blob Storage
+				- Azure Monitor Logs
+				- Databend
+				- Clickhouse
+				- Datadog Logs
+
+				This has been corrected.
+				"""
+			pr_numbers: [18289]
+		},
+		{
+			type: "fix"
+			scopes: ["security"]
+			description: """
+				The newly added `--openssl-legacy-provider` flag in 0.32.0 can now be disabled by
+				setting it to `false` via `--openssl-legacy-provider=false`. Previously it would
+				complain of extra arguments.
+				"""
+			pr_numbers: [18276]
+		},
+		{
+			type: "fix"
+			scopes: ["opentelemetry source"]
+			description: """
+				The `opentelemetry` source no longer fails to decode large payloads. This was a regression
+				in 0.31.0 when a 4 MB limit was inadvertently applied.
+				"""
+			pr_numbers: [18306]
+		},
+	]
+
+	commits: [
+		{sha: "1a32e969162d921f00c3ad67c242e8cf047d2c99", date: "2023-08-16 21:58:31 UTC", description: "Add 0.32.0 highlight for legacy OpenSSL provider deprecation", pr_number:      18263, scopes: ["releasing"], type:            "chore", breaking_change: false, author: "Jesse Szwedko", files_count:   1, insertions_count: 12, deletions_count:  2},
+		{sha: "0f7d6e6798d81bd1cae17c918f53a87406deb383", date: "2023-08-17 07:01:42 UTC", description: "0.32.0.cue typo", pr_number:                                                   18270, scopes: [], type:                       "docs", breaking_change:  false, author: "Tshepang Mbambo", files_count: 1, insertions_count: 1, deletions_count:   1},
+		{sha: "91f7612053204f5305ea2991429cf7ccfae4bf26", date: "2023-08-16 22:16:47 UTC", description: "Add note about protobuf codec addition for 0.32.0 release", pr_number:         18275, scopes: ["releasing"], type:            "chore", breaking_change: false, author: "Jesse Szwedko", files_count:   1, insertions_count: 2, deletions_count:   0},
+		{sha: "38e95b56178197224f3aead2d19050421fdb5464", date: "2023-08-18 04:01:11 UTC", description: "Add known issues for v0.32.0", pr_number:                                      18298, scopes: ["releasing"], type:            "chore", breaking_change: false, author: "Jesse Szwedko", files_count:   1, insertions_count: 22, deletions_count:  0},
+		{sha: "2dcaf302f52206c516422615f0a52ba45fedae8b", date: "2023-08-18 08:31:54 UTC", description: "add the 'http_client_requests_sent_total'", pr_number:                         18299, scopes: ["docs"], type:                 "fix", breaking_change:   false, author: "Pavlos Rontidis", files_count: 1, insertions_count: 12, deletions_count:  0},
+		{sha: "c9ccee0fdcc516af3555e498f8366c3059f1c74d", date: "2023-08-18 05:45:53 UTC", description: "add all events that are being encoded", pr_number:                             18289, scopes: ["observability"], type:        "fix", breaking_change:   false, author: "Stephen Wakely", files_count:  2, insertions_count: 102, deletions_count: 79},
+		{sha: "8868b078ac78f66e62657b034d9d03b551bbebef", date: "2023-08-17 03:58:20 UTC", description: "load default and legacy openssl providers", pr_number:                         18276, scopes: ["deps"], type:                 "fix", breaking_change:   false, author: "Doug Smith", files_count:      2, insertions_count: 34, deletions_count:  22},
+		{sha: "042fb51dbec93c1e1b644735ab749b9711c2e4c8", date: "2023-08-17 22:46:37 UTC", description: "Make the warning for the deprecated OpenSSL provider more verbose", pr_number: 18278, scopes: ["security"], type:             "chore", breaking_change: false, author: "Jesse Szwedko", files_count:   1, insertions_count: 1, deletions_count:   1},
+		{sha: "a1dfd54b6947f7766756e5eb24f5b6e1bcc46c98", date: "2023-08-16 08:35:28 UTC", description: "Bump `nkeys` to 0.3.2", pr_number:                                             18264, scopes: ["deps"], type:                 "chore", breaking_change: false, author: "Jesse Szwedko", files_count:   2, insertions_count: 85, deletions_count:  114},
+		{sha: "56177ebce2797c0015c49775e6fdffd4153cc26f", date: "2023-08-19 01:14:20 UTC", description: "Remove the 4MB default for gRPC request decoding", pr_number:                  18306, scopes: ["opentelemetry source"], type: "fix", breaking_change:   false, author: "neuronull", files_count:       1, insertions_count: 4, deletions_count:   1},
+	]
+}
diff --git a/website/cue/reference/releases/0.32.2.cue b/website/cue/reference/releases/0.32.2.cue
new file mode 100644
index 0000000000000..58a8f08a4a2cb
--- /dev/null
+++ b/website/cue/reference/releases/0.32.2.cue
@@ -0,0 +1,36 @@
+package metadata
+
+releases: "0.32.2": {
+	date:     "2023-09-20"
+	codename: ""
+
+	whats_next: []
+	description: """
+		This patch release contains a fix for a regression in 0.32.0.
+
+		**Note:** Please see the release notes for [`v0.32.0`](/releases/0.32.0/) for additional changes if upgrading from
+		`v0.31.X`. In particular, the upgrade guide for breaking changes.
+		"""
+
+	changelog: [
+		{
+			type: "fix"
+			scopes: ["aws provider"]
+			description: """
+				AWS components again allow use of `assume_role` for authentication without an
+				`external_id`. Previously, as of `v032.0`, Vector would panic when starting.
+				"""
+			pr_numbers: [18452]
+		},
+	]
+
+	commits: [
+		{sha: "3b9144cb411ea91446c445324db714908ccb814a", date: "2023-08-24 03:26:04 UTC", description: "Fix installer list for MacOS", pr_number:                    18364, scopes: ["website"], type:                       "fix", breaking_change:   false, author: "Jesse Szwedko", files_count:     1, insertions_count: 1, deletions_count:  0},
+		{sha: "3040ae250b36e5dedda6fd635d364cbd77d0fef8", date: "2023-08-25 08:29:56 UTC", description: "add PGO information", pr_number:                             18369, scopes: [], type:                                "docs", breaking_change:  false, author: "Alexander Zaitsev", files_count: 3, insertions_count: 36, deletions_count: 0},
+		{sha: "1164f5525780a9599864bdda46722e895a20fd4c", date: "2023-08-29 17:50:25 UTC", description: "fix some typos", pr_number:                                  18401, scopes: ["file source"], type:                   "docs", breaking_change:  false, author: "geekvest", files_count:          7, insertions_count: 8, deletions_count:  8},
+		{sha: "dd460a0bf91d210e262b1953a6afcaf3aa8f3033", date: "2023-09-07 00:30:03 UTC", description: "Fix docs for `host` field for syslog source", pr_number:     18453, scopes: ["syslog source", "docs"], type:         "fix", breaking_change:   false, author: "Jesse Szwedko", files_count:     1, insertions_count: 8, deletions_count:  2},
+		{sha: "9356c56b86817fdca931168986b3e9c88aea1be9", date: "2023-09-09 01:06:01 UTC", description: "Update the AWS authentication documentation", pr_number:     18492, scopes: ["aws provider", "external_docs"], type: "chore", breaking_change: false, author: "Jesse Szwedko", files_count:     1, insertions_count: 17, deletions_count: 7},
+		{sha: "77d12ee88b17d4d71b3609299b356e050afe651a", date: "2023-09-02 00:24:47 UTC", description: "Don't unwap external_id", pr_number:                         18452, scopes: ["aws provider"], type:                  "fix", breaking_change:   false, author: "Jesse Szwedko", files_count:     1, insertions_count: 19, deletions_count: 10},
+		{sha: "badb64f451de9169a2b65cbd541427f0411c7764", date: "2023-08-23 06:04:04 UTC", description: "update `rustls-webpki` due to security advisory", pr_number: 18344, scopes: [], type:                                "chore", breaking_change: false, author: "Nathan Fox", files_count:        3, insertions_count: 5, deletions_count:  2},
+	]
+}
diff --git a/website/cue/reference/remap/concepts/function.cue b/website/cue/reference/remap/concepts/function.cue
index 60f026bb336e3..5885b48a2a857 100644
--- a/website/cue/reference/remap/concepts/function.cue
+++ b/website/cue/reference/remap/concepts/function.cue
@@ -19,5 +19,14 @@ remap: concepts: function: {
 				is a defining characteristic of VRL and a primary source of its safety guarantees.
 				"""
 		}
+		deprecation: {
+			title: "Deprecation"
+			description: """
+				VRL functions can be marked as "deprecated". When a function
+				is deprecated, a warning will be shown at runtime.
+
+				Suggestions on how to update the VRL program can usually be found in the actual warning and the function documentation.
+				"""
+		}
 	}
 }
diff --git a/website/cue/reference/remap/expressions/function_call.cue b/website/cue/reference/remap/expressions/function_call.cue
index a86a3fcff4e22..2226dd23652f9 100644
--- a/website/cue/reference/remap/expressions/function_call.cue
+++ b/website/cue/reference/remap/expressions/function_call.cue
@@ -134,6 +134,15 @@ remap: expressions: function_call: {
 				failures.
 				"""
 		}
+		deprecation: {
+			title: "Deprecation"
+			description: """
+				VRL functions can be marked as "deprecated". When a function
+				is deprecated, a warning will be shown at runtime.
+
+				Suggestions on how to update the VRL program can usually be found in the actual warning and the function documentation.
+				"""
+		}
 	}
 
 	examples: [
diff --git a/website/cue/reference/remap/functions.cue b/website/cue/reference/remap/functions.cue
index f8fc7df8b4292..151a61e5faabf 100644
--- a/website/cue/reference/remap/functions.cue
+++ b/website/cue/reference/remap/functions.cue
@@ -24,6 +24,7 @@ remap: {
 		}
 		internal_failure_reasons: [...string]
 		examples?: [remap.#Example, ...remap.#Example]
+		deprecated: bool | *false
 	}
 
 	#FunctionCategory: "Array" | "Codec" | "Coerce" | "Convert" | "Debug" | "Enrichment" | "Enumerate" | "Event" | "Path" | "Cryptography" | "IP" | "Number" | "Object" | "Parse" | "Random" | "String" | "System" | "Timestamp" | "Type"
diff --git a/website/cue/reference/remap/functions/encrypt.cue b/website/cue/reference/remap/functions/encrypt.cue
index c37e68dfd45fc..4d91f4efeb372 100644
--- a/website/cue/reference/remap/functions/encrypt.cue
+++ b/website/cue/reference/remap/functions/encrypt.cue
@@ -13,9 +13,15 @@ remap: functions: encrypt: {
 		* AES-256-OFB (key = 32 bytes, iv = 16 bytes)
 		* AES-192-OFB  (key = 24 bytes, iv = 16 bytes)
 		* AES-128-OFB (key = 16 bytes, iv = 16 bytes)
-		* AES-256-CTR (key = 32 bytes, iv = 16 bytes)
-		* AES-192-CTR (key = 24 bytes, iv = 16 bytes)
-		* AES-128-CTR (key = 16 bytes, iv = 16 bytes)
+		* Deprecated - AES-256-CTR (key = 32 bytes, iv = 16 bytes)
+		* Deprecated - AES-192-CTR (key = 24 bytes, iv = 16 bytes)
+		* Deprecated - AES-128-CTR (key = 16 bytes, iv = 16 bytes)
+		* AES-256-CTR-LE (key = 32 bytes, iv = 16 bytes)
+		* AES-192-CTR-LE (key = 24 bytes, iv = 16 bytes)
+		* AES-128-CTR-LE (key = 16 bytes, iv = 16 bytes)
+		* AES-256-CTR-BE (key = 32 bytes, iv = 16 bytes)
+		* AES-192-CTR-BE (key = 24 bytes, iv = 16 bytes)
+		* AES-128-CTR-BE (key = 16 bytes, iv = 16 bytes)
 		* AES-256-CBC-PKCS7 (key = 32 bytes, iv = 16 bytes)
 		* AES-192-CBC-PKCS7 (key = 24 bytes, iv = 16 bytes)
 		* AES-128-CBC-PKCS7 (key = 16 bytes, iv = 16 bytes)
@@ -28,6 +34,9 @@ remap: functions: encrypt: {
 		* AES-256-CBC-ISO10126 (key = 32 bytes, iv = 16 bytes)
 		* AES-192-CBC-ISO10126 (key = 24 bytes, iv = 16 bytes)
 		* AES-128-CBC-ISO10126 (key = 16 bytes, iv = 16 bytes)
+		* CHACHA20-POLY1305 (key = 32 bytes, iv = 12 bytes)
+		* XCHACHA20-POLY1305 (key = 32 bytes, iv = 24 bytes)
+		* XSALSA20-POLY1305 (key = 32 bytes, iv = 24 bytes)
 		"""
 
 	arguments: [
diff --git a/website/cue/reference/remap/functions/parse_nginx_log.cue b/website/cue/reference/remap/functions/parse_nginx_log.cue
index 99f48be898b4d..0fd6c04f1a6f1 100644
--- a/website/cue/reference/remap/functions/parse_nginx_log.cue
+++ b/website/cue/reference/remap/functions/parse_nginx_log.cue
@@ -60,18 +60,15 @@ remap: functions: parse_nginx_log: {
 				)
 				"""#
 			return: {
+				agent:       "Mozilla/5.0 (Windows NT 6.1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/72.0.3626.119 Safari/537.36"
 				client:      "172.17.0.1"
-				user:        "alice"
-				timestamp:   "2021-04-01T12:02:31Z"
+				compression: "2.75"
+				referer:     "http://localhost/somewhere"
 				request:     "POST /not-found HTTP/1.1"
-				method:      "POST"
-				path:        "/not-found"
-				protocol:    "HTTP/1.1"
-				status:      404
 				size:        153
-				referer:     "http://localhost/somewhere"
-				agent:       "Mozilla/5.0 (Windows NT 6.1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/72.0.3626.119 Safari/537.36"
-				compression: "2.75"
+				status:      404
+				timestamp:   "2021-04-01T12:02:31Z"
+				user:        "alice"
 			}
 		},
 		{
diff --git a/website/cue/reference/remap/functions/to_timestamp.cue b/website/cue/reference/remap/functions/to_timestamp.cue
index e7329f19a8206..f46e3a37d23b1 100644
--- a/website/cue/reference/remap/functions/to_timestamp.cue
+++ b/website/cue/reference/remap/functions/to_timestamp.cue
@@ -3,10 +3,14 @@ package metadata
 remap: functions: to_timestamp: {
 	category: "Coerce"
 	description: """
+		This function is deprecated.
+		For integer values, use `from_unix_timestamp`, otherwise use `parse_timestamp`.
 		Coerces the `value` into a timestamp.
 		"""
 	notices: ["There is the possibility of precision loss due to float arithmetic when coercing floats."]
 
+	deprecated: true
+
 	arguments: [
 		{
 			name:        "value"
@@ -47,35 +51,40 @@ remap: functions: to_timestamp: {
 			source: """
 				to_timestamp!("2020-10-21T16:00:00Z")
 				"""
-			return: "2020-10-21T16:00:00Z"
+			return:    "2020-10-21T16:00:00Z"
+			skip_test: true
 		},
 		{
 			title: "Coerce a unix timestamp (integer) to a timestamp"
 			source: """
 				to_timestamp!(1675968923)
 				"""
-			return: "2023-02-09T18:55:23Z"
+			return:    "2023-02-09T18:55:23Z"
+			skip_test: true
 		},
 		{
 			title: "Coerce a unix timestamp (float) to a timestamp"
 			source: """
 				to_timestamp!(1675968923.567)
 				"""
-			return: "2023-02-09T18:55:23.566999912Z"
+			return:    "2023-02-09T18:55:23.566999912Z"
+			skip_test: true
 		},
 		{
 			title: "Coerce a unix timestamp, in milliseconds, to a timestamp"
 			source: """
 				to_timestamp!(1676478566639, unit: "milliseconds")
 				"""
-			return: "2023-02-15T16:29:26.639Z"
+			return:    "2023-02-15T16:29:26.639Z"
+			skip_test: true
 		},
 		{
 			title: "Coerce a unix timestamp, in nanoseconds, to a timestamp"
 			source: """
 				to_timestamp!(1675968923012312311, unit: "nanoseconds")
 				"""
-			return: "2023-02-09T18:55:23.012312311Z"
+			return:    "2023-02-09T18:55:23.012312311Z"
+			skip_test: true
 		},
 	]
 }
diff --git a/website/cue/reference/services/greptimedb.cue b/website/cue/reference/services/greptimedb.cue
new file mode 100644
index 0000000000000..e152397da7307
--- /dev/null
+++ b/website/cue/reference/services/greptimedb.cue
@@ -0,0 +1,10 @@
+package metadata
+
+services: greptimedb: {
+	name:     "GreptimeDB"
+	thing:    "a \(name) database"
+	url:      urls.greptimedb
+	versions: null
+
+	description: "[GreptimeDB](\(urls.greptimedb)) is an open-source cloud-native time-series database. It combines time-series and analytic workload into one database, and allows query via both SQL and PromQL. GreptimeDB works seamlessly with modern infrastructure like Kubernetes and object storage. It's also available on [Cloud](\(urls.greptimecloud))."
+}
diff --git a/website/cue/reference/urls.cue b/website/cue/reference/urls.cue
index 2f6921ba39eea..73ff61e5b3ec8 100644
--- a/website/cue/reference/urls.cue
+++ b/website/cue/reference/urls.cue
@@ -235,6 +235,9 @@ urls: {
 	graphql:                                    "https://graphql.org"
 	graphql_playground:                         "\(github)/graphql/graphql-playground"
 	graphviz:                                   "https://graphviz.org/"
+	greptimecloud:                              "https://greptime.cloud"
+	greptimedb:                                 "https://github.com/greptimeteam/greptimedb"
+	greptimedb_grpc:                            "https://docs.greptime.com/"
 	grok:                                       "https://grokdebug.herokuapp.com/"
 	grok_debugger:                              "https://grokdebug.herokuapp.com/"
 	grok_patterns:                              "\(github)/daschl/grok/tree/master/patterns"
diff --git a/website/cue/reference/versions.cue b/website/cue/reference/versions.cue
index 4084da0652d6e..8d51d40e72389 100644
--- a/website/cue/reference/versions.cue
+++ b/website/cue/reference/versions.cue
@@ -2,6 +2,9 @@ package metadata
 
 // This has to be maintained manually because there's currently no way to sort versions programmatically
 versions: [string, ...string] & [
+		"0.32.2",
+		"0.32.1",
+		"0.32.0",
 		"0.31.0",
 		"0.30.0",
 		"0.29.1",
diff --git a/website/layouts/partials/data.html b/website/layouts/partials/data.html
index 3feefe90cd353..55f14ab1c44a5 100644
--- a/website/layouts/partials/data.html
+++ b/website/layouts/partials/data.html
@@ -688,6 +688,10 @@ <h4 id="{{ $id }}">
           {{ else }}
           {{ partial "badge.html" (dict "word" "fallible" "color" "yellow" "inline" true "href" $href) }}
           {{ end }}
+          {{/* Deprecation Badge */}}
+          {{ if $func.deprecated }}
+          {{ partial "badge.html" (dict "word" "deprecated" "color" "red" "inline" true "href" $href) }}
+          {{ end }}
         </span>
       </span>
 
diff --git a/website/yarn.lock b/website/yarn.lock
index f2897beff1b54..827c6b4c44fac 100644
--- a/website/yarn.lock
+++ b/website/yarn.lock
@@ -4780,14 +4780,14 @@ semver@7.0.0:
   integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==
 
 semver@^5.1.0, semver@^5.3.0, semver@^5.6.0:
-  version "5.7.1"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
-  integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
+  version "5.7.2"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.2.tgz#48d55db737c3287cd4835e17fa13feace1c41ef8"
+  integrity sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==
 
 semver@^6.0.0, semver@^6.1.1, semver@^6.1.2, semver@^6.2.0, semver@^6.3.0:
-  version "6.3.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
-  integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
+  version "6.3.1"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4"
+  integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==
 
 send@0.18.0:
   version "0.18.0"