From 650a738e63f3ff7d80ff872760fc8497b257e709 Mon Sep 17 00:00:00 2001 From: Sebastian Tia <75666019+sebastiantia@users.noreply.github.com> Date: Mon, 29 Jan 2024 09:40:33 -0500 Subject: [PATCH 1/6] chore(docs): update basic sink tutorial doc (#19722) * fix * fix * Update Co-authored-by: Doug Smith --------- Co-authored-by: Doug Smith --- docs/tutorials/sinks/1_basic_sink.md | 39 ++++++++++++++++++---------- 1 file changed, 26 insertions(+), 13 deletions(-) diff --git a/docs/tutorials/sinks/1_basic_sink.md b/docs/tutorials/sinks/1_basic_sink.md index b5bb21890147b..65bb7b4078880 100644 --- a/docs/tutorials/sinks/1_basic_sink.md +++ b/docs/tutorials/sinks/1_basic_sink.md @@ -22,7 +22,10 @@ Provide some module level comments to explain what the sink does. Let's setup all the imports we will need for the tutorial: ```rust -use crate::prelude::*; +use crate::sinks::prelude::*; +use vector_lib::internal_event::{ + ByteSize, BytesSent, EventsSent, InternalEventHandle, Output, Protocol, +}; ``` # Configuration @@ -253,15 +256,13 @@ emit the event. Change the body of `run_inner` to look like the following: ```diff async fn run_inner(self: Box, mut input: BoxStream<'_, Event>) -> Result<(), ()> { ++ let bytes_sent = register!(BytesSent::from(Protocol("console".into(),))); + while let Some(mut event) = input.next().await { + let bytes = format!("{:#?}", event); + println!("{}", bytes); - println!("{:#?}", event); - -+ emit!(BytesSent { -+ byte_size: bytes.len(), -+ protocol: "none".into() -+ }); ++ bytes_sent.emit(ByteSize(bytes.len())); let finalizers = event.take_finalizers(); finalizers.update_status(EventStatus::Delivered); @@ -276,15 +277,27 @@ emit the event. Change the body of `run_inner` to look like the following: [`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`: +Change the body of `run_inner` to look like the following: ```diff -+ let event_byte_size = event.estimated_json_encoded_size_of(); -+ emit!(EventsSent { -+ count: 1, -+ byte_size: event_byte_size, -+ output: None, -+ }); + async fn run_inner(self: Box, mut input: BoxStream<'_, Event>) -> Result<(), ()> { + let bytes_sent = register!(BytesSent::from(Protocol("console".into(),))); ++ let events_sent = register!(EventsSent::from(Output(None))); + + while let Some(mut event) = input.next().await { + let bytes = format!("{:#?}", event); + println!("{}", bytes); + bytes_sent.emit(ByteSize(bytes.len())); + ++ let event_byte_size = event.estimated_json_encoded_size_of(); ++ events_sent.emit(CountByteSize(1, event_byte_size)); + + let finalizers = event.take_finalizers(); + finalizers.update_status(EventStatus::Delivered); + } + + Ok(()) + } ``` More details about instrumenting Vector can be found From 51c6466c7d848b49e9a66293ddfb8211c1f6acb5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 29 Jan 2024 18:20:20 -0600 Subject: [PATCH 2/6] chore(deps): Bump lru from 0.12.1 to 0.12.2 (#19731) Bumps [lru](https://github.com/jeromefroe/lru-rs) from 0.12.1 to 0.12.2. - [Changelog](https://github.com/jeromefroe/lru-rs/blob/master/CHANGELOG.md) - [Commits](https://github.com/jeromefroe/lru-rs/compare/0.12.1...0.12.2) --- updated-dependencies: - dependency-name: lru dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Cargo.lock | 4 ++-- Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index d89680116ebf1..68460bf3ef15d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4933,9 +4933,9 @@ dependencies = [ [[package]] name = "lru" -version = "0.12.1" +version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2994eeba8ed550fd9b47a0b38f0242bc3344e496483c6180b69139cc2fa5d1d7" +checksum = "db2c024b41519440580066ba82aab04092b333e09066a5eb86c7c4890df31f22" dependencies = [ "hashbrown 0.14.3", ] diff --git a/Cargo.toml b/Cargo.toml index 596b463fabe03..b83cf97251fbb 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -281,7 +281,7 @@ k8s-openapi = { version = "0.18.0", default-features = false, features = ["api", 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.12.1", default-features = false, optional = true } +lru = { version = "0.12.2", default-features = false, optional = true } maxminddb = { version = "0.24.0", default-features = false, optional = true } md-5 = { version = "0.10", default-features = false, optional = true } mongodb = { version = "2.8.0", default-features = false, features = ["tokio-runtime"], optional = true } From 7c27b2e5eb82150660a6066318aef2926be84ee1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 30 Jan 2024 00:21:04 +0000 Subject: [PATCH 3/6] chore(deps): Bump inventory from 0.3.14 to 0.3.15 (#19732) Bumps [inventory](https://github.com/dtolnay/inventory) from 0.3.14 to 0.3.15. - [Release notes](https://github.com/dtolnay/inventory/releases) - [Commits](https://github.com/dtolnay/inventory/compare/0.3.14...0.3.15) --- updated-dependencies: - dependency-name: inventory dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Cargo.lock | 4 ++-- Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 68460bf3ef15d..151e6ab1eb23b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4396,9 +4396,9 @@ dependencies = [ [[package]] name = "inventory" -version = "0.3.14" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8573b2b1fb643a372c73b23f4da5f888677feef3305146d68a539250a9bccc7" +checksum = "f958d3d68f4167080a18141e10381e7634563984a537f2a49a30fd8e53ac5767" [[package]] name = "io-lifetimes" diff --git a/Cargo.toml b/Cargo.toml index b83cf97251fbb..fc3f7cc15f6af 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -275,7 +275,7 @@ hyper-proxy = { version = "0.9.1", default-features = false, features = ["openss indexmap = { version = "2.1.0", default-features = false, features = ["serde", "std"] } infer = { version = "0.15.0", default-features = false, optional = true} indoc = { version = "2.0.4", default-features = false } -inventory = { version = "0.3.14", default-features = false } +inventory = { version = "0.3.15", default-features = false } itertools = { version = "0.12.0", default-features = false, optional = false, features = ["use_alloc"] } 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 } From fc0958863b674fbca4550c274e6f0c7711264593 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 30 Jan 2024 00:23:07 +0000 Subject: [PATCH 4/6] chore(deps): Bump cargo_toml from 0.18.0 to 0.19.0 (#19733) Bumps [cargo_toml](https://gitlab.com/lib.rs/cargo_toml) from 0.18.0 to 0.19.0. - [Commits](https://gitlab.com/lib.rs/cargo_toml/compare/v0.18.0...v0.19.0) --- updated-dependencies: - dependency-name: cargo_toml dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Cargo.lock | 4 ++-- lib/vector-vrl/web-playground/Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 151e6ab1eb23b..b2f9f65a3c803 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1750,9 +1750,9 @@ checksum = "ade8366b8bd5ba243f0a58f036cc0ca8a2f069cff1a2351ef1cac6b083e16fc0" [[package]] name = "cargo_toml" -version = "0.18.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "802b755090e39835a4b0440fb0bbee0df7495a8b337f63db21e616f7821c7e8c" +checksum = "922d6ea3081d68b9e3e09557204bff47f9b5406a4a304dc917e187f8cafd582b" dependencies = [ "serde", "toml", diff --git a/lib/vector-vrl/web-playground/Cargo.toml b/lib/vector-vrl/web-playground/Cargo.toml index 57ef42b8df009..ae693c042d2ef 100644 --- a/lib/vector-vrl/web-playground/Cargo.toml +++ b/lib/vector-vrl/web-playground/Cargo.toml @@ -19,4 +19,4 @@ vector-vrl-functions = { path = "../functions" } enrichment = { path = "../../enrichment" } [build-dependencies] -cargo_toml = "0.18.0" +cargo_toml = "0.19.0" From 5f233f23700fb22a031168078cdcbaee79242775 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 30 Jan 2024 00:25:25 +0000 Subject: [PATCH 5/6] chore(deps): Bump the aws group with 2 updates (#19720) Bumps the aws group with 2 updates: [aws-credential-types](https://github.com/smithy-lang/smithy-rs) and [aws-smithy-runtime](https://github.com/smithy-lang/smithy-rs). Updates `aws-credential-types` from 1.1.3 to 1.1.4 - [Release notes](https://github.com/smithy-lang/smithy-rs/releases) - [Changelog](https://github.com/smithy-lang/smithy-rs/blob/main/CHANGELOG.md) - [Commits](https://github.com/smithy-lang/smithy-rs/commits) Updates `aws-smithy-runtime` from 1.1.3 to 1.1.4 - [Release notes](https://github.com/smithy-lang/smithy-rs/releases) - [Changelog](https://github.com/smithy-lang/smithy-rs/blob/main/CHANGELOG.md) - [Commits](https://github.com/smithy-lang/smithy-rs/commits) --- updated-dependencies: - dependency-name: aws-credential-types dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws - dependency-name: aws-smithy-runtime dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Cargo.lock | 28 ++++++++++++++-------------- Cargo.toml | 6 +++--- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b2f9f65a3c803..af67e6c6e9ba5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -762,9 +762,9 @@ dependencies = [ [[package]] name = "aws-credential-types" -version = "1.1.3" +version = "1.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d67c6836a1009b23e3f4cd1457c83e0aa49a490d9c3033b53c3f7b8cf2facc0f" +checksum = "33cc49dcdd31c8b6e79850a179af4c367669150c7ac0135f176c61bec81a70f7" dependencies = [ "aws-smithy-async", "aws-smithy-runtime-api", @@ -1046,9 +1046,9 @@ dependencies = [ [[package]] name = "aws-smithy-async" -version = "1.1.3" +version = "1.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2eac0bb78e9e2765699999a02d7bfb4e6ad8f13e0962ebb9f5202b1d8cd76006" +checksum = "72ee2d09cce0ef3ae526679b522835d63e75fb427aca5413cd371e490d52dcc6" dependencies = [ "futures-util", "pin-project-lite", @@ -1078,9 +1078,9 @@ dependencies = [ [[package]] name = "aws-smithy-eventstream" -version = "0.60.3" +version = "0.60.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "682371561562d08ab437766903c6bc28f4f95d7ab2ecfb389bda7849dd98aefe" +checksum = "e6363078f927f612b970edf9d1903ef5cef9a64d1e8423525ebb1f0a1633c858" dependencies = [ "aws-smithy-types", "bytes 1.5.0", @@ -1089,9 +1089,9 @@ dependencies = [ [[package]] name = "aws-smithy-http" -version = "0.60.3" +version = "0.60.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "365ca49744b2bda2f1e2dc03b856da3fa5a28ca5b0a41e41d7ff5305a8fae190" +checksum = "dab56aea3cd9e1101a0a999447fb346afb680ab1406cebc44b32346e25b4117d" dependencies = [ "aws-smithy-eventstream", "aws-smithy-runtime-api", @@ -1129,9 +1129,9 @@ dependencies = [ [[package]] name = "aws-smithy-runtime" -version = "1.1.3" +version = "1.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ab9cb6fee50680af8ceaa293ae79eba32095ca117161cb323f9ee30dd87d139" +checksum = "fafdab38f40ad7816e7da5dec279400dd505160780083759f01441af1bbb10ea" dependencies = [ "aws-smithy-async", "aws-smithy-http", @@ -1154,9 +1154,9 @@ dependencies = [ [[package]] name = "aws-smithy-runtime-api" -version = "1.1.3" +version = "1.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02ca2da7619517310bfead6d18abcdde90f1439224d887d608503cfacff46dff" +checksum = "c18276dd28852f34b3bf501f4f3719781f4999a51c7bff1a5c6dc8c4529adc29" dependencies = [ "aws-smithy-async", "aws-smithy-types", @@ -1169,9 +1169,9 @@ dependencies = [ [[package]] name = "aws-smithy-types" -version = "1.1.3" +version = "1.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d4bb944488536cd2fef43212d829bc7e9a8bfc4afa079d21170441e7be8d2d0" +checksum = "bb3e134004170d3303718baa2a4eb4ca64ee0a1c0a7041dca31b38be0fb414f3" dependencies = [ "base64-simd", "bytes 1.5.0", diff --git a/Cargo.toml b/Cargo.toml index fc3f7cc15f6af..daad3998b6b18 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -174,11 +174,11 @@ aws-sdk-kinesis = { version = "1.3.0", default-features = false, features = ["be aws-types = { version = "1.1.3", default-features = false, optional = true } aws-sigv4 = { version = "1.1.3", default-features = false, features = ["sign-http"], optional = true } aws-config = { version = "1.0.1", default-features = false, features = ["behavior-version-latest"], optional = true } -aws-credential-types = { version = "1.1.3", default-features = false, features = ["hardcoded-credentials"], optional = true } +aws-credential-types = { version = "1.1.4", default-features = false, features = ["hardcoded-credentials"], optional = true } aws-smithy-http = { version = "0.60", default-features = false, features = ["event-stream"], optional = true } aws-smithy-types = { version = "1.0.2", default-features = false, optional = true } aws-smithy-runtime-api = { version = "1.1.3", default-features = false, optional = true } -aws-smithy-runtime = { version = "1.1.3", default-features = false, features = ["client", "connector-hyper-0-14-x", "rt-tokio"], optional = true } +aws-smithy-runtime = { version = "1.1.4", default-features = false, features = ["client", "connector-hyper-0-14-x", "rt-tokio"], optional = true } aws-smithy-async = { version = "1.0.2", default-features = false, features = ["rt-tokio"], optional = true } # Azure @@ -347,7 +347,7 @@ openssl-src = { version = "300", default-features = false, features = ["force-en [dev-dependencies] approx = "0.5.1" assert_cmd = { version = "2.0.13", default-features = false } -aws-smithy-runtime = { version = "1.1.3", default-features = false, features = ["tls-rustls"] } +aws-smithy-runtime = { version = "1.1.4", default-features = false, features = ["tls-rustls"] } azure_core = { version = "0.17", default-features = false, features = ["enable_reqwest", "azurite_workaround"] } azure_identity = { version = "0.17", default-features = false, features = ["enable_reqwest"] } azure_storage_blobs = { version = "0.17", default-features = false, features = ["azurite_workaround"] } From 7056f5fe02af3d11a0ac813c9043788d96ed233c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 30 Jan 2024 00:50:10 +0000 Subject: [PATCH 6/6] chore(deps): Bump serde_json from 1.0.111 to 1.0.112 (#19730) * chore(deps): Bump serde_json from 1.0.111 to 1.0.112 Bumps [serde_json](https://github.com/serde-rs/json) from 1.0.111 to 1.0.112. - [Release notes](https://github.com/serde-rs/json/releases) - [Commits](https://github.com/serde-rs/json/compare/v1.0.111...v1.0.112) --- updated-dependencies: - dependency-name: serde_json dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * Convert `serde_json` to a workspace dep --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Bruce Guenter --- Cargo.lock | 4 ++-- Cargo.toml | 5 +++-- lib/codecs/Cargo.toml | 2 +- lib/docs-renderer/Cargo.toml | 2 +- lib/k8s-e2e-tests/Cargo.toml | 2 +- lib/k8s-test-framework/Cargo.toml | 2 +- lib/vector-api-client/Cargo.toml | 2 +- lib/vector-common/Cargo.toml | 2 +- lib/vector-config-common/Cargo.toml | 2 +- lib/vector-config/Cargo.toml | 2 +- lib/vector-core/Cargo.toml | 2 +- lib/vector-vrl/tests/Cargo.toml | 2 +- vdev/Cargo.toml | 2 +- 13 files changed, 16 insertions(+), 15 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index af67e6c6e9ba5..454dfe2b3baa0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -7945,9 +7945,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.111" +version = "1.0.112" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "176e46fa42316f18edd598015a5166857fc835ec732f5215eac6b7bdbf0a84f4" +checksum = "4d1bd37ce2324cf3bf85e5a25f96eb4baf0d5aa6eba43e7ae8958870c4ec48ed" dependencies = [ "indexmap 2.1.0", "itoa", diff --git a/Cargo.toml b/Cargo.toml index daad3998b6b18..d37473a7b1bcd 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -123,8 +123,9 @@ members = [ [workspace.dependencies] chrono = { version = "0.4.33", default-features = false, features = ["clock", "serde"] } -pin-project = { version = "1.1.4", default-features = false } clap = { version = "4.4.18", default-features = false, features = ["derive", "error-context", "env", "help", "std", "string", "usage", "wrap_help"] } +pin-project = { version = "1.1.4", default-features = false } +serde_json = { version = "1.0.112", default-features = false, features = ["raw_value", "std"] } vrl = { version = "0.9.1", features = ["arbitrary", "cli", "test", "test_framework"] } [dependencies] @@ -197,7 +198,7 @@ tower-http = { version = "0.4.4", default-features = false, features = ["decompr serde = { version = "1.0.195", default-features = false, features = ["derive"] } serde-toml-merge = { version = "0.3.3", default-features = false } serde_bytes = { version = "0.11.14", default-features = false, features = ["std"], optional = true } -serde_json = { version = "1.0.111", default-features = false, features = ["raw_value"] } +serde_json.workspace = true serde_with = { version = "3.5.0", default-features = false, features = ["macros", "std"] } serde_yaml = { version = "0.9.30", default-features = false } diff --git a/lib/codecs/Cargo.toml b/lib/codecs/Cargo.toml index 2dbd70dd3c177..66a89c8f36368 100644 --- a/lib/codecs/Cargo.toml +++ b/lib/codecs/Cargo.toml @@ -24,7 +24,7 @@ prost = { version = "0.12.3", default-features = false, features = ["std"] } prost-reflect = { version = "0.12", default-features = false, features = ["serde"] } regex = { version = "1.10.3", default-features = false, features = ["std", "perf"] } serde = { version = "1", default-features = false, features = ["derive"] } -serde_json = { version = "1", default-features = false } +serde_json.workspace = true smallvec = { version = "1", default-features = false, features = ["union"] } snafu = { version = "0.7.5", default-features = false, features = ["futures"] } syslog_loose = { version = "0.21", default-features = false, optional = true } diff --git a/lib/docs-renderer/Cargo.toml b/lib/docs-renderer/Cargo.toml index edb9ee05751e6..cbe6eef56a194 100644 --- a/lib/docs-renderer/Cargo.toml +++ b/lib/docs-renderer/Cargo.toml @@ -8,7 +8,7 @@ publish = false [dependencies] anyhow = { version = "1.0.79", default-features = false, features = ["std"] } serde = { version = "1.0", default-features = false } -serde_json = { version = "1.0", default-features = false, features = ["std"] } +serde_json.workspace = true snafu = { version = "0.7.5", default-features = false } tracing = { version = "0.1.34", default-features = false } tracing-subscriber = { version = "0.3.18", default-features = false, features = ["ansi", "env-filter", "fmt", "json", "registry", "tracing-log"] } diff --git a/lib/k8s-e2e-tests/Cargo.toml b/lib/k8s-e2e-tests/Cargo.toml index a0a5f390e7ccf..37c45cba7d2d0 100644 --- a/lib/k8s-e2e-tests/Cargo.toml +++ b/lib/k8s-e2e-tests/Cargo.toml @@ -13,7 +13,7 @@ k8s-openapi = { version = "0.16.0", default-features = false, features = ["v1_19 k8s-test-framework = { version = "0.1", path = "../k8s-test-framework" } regex = "1" reqwest = { version = "0.11.23", features = ["json"] } -serde_json = "1" +serde_json.workspace = true tokio = { version = "1.35.1", features = ["full"] } indoc = "2.0.4" env_logger = "0.10" diff --git a/lib/k8s-test-framework/Cargo.toml b/lib/k8s-test-framework/Cargo.toml index 292c83d06ec5c..c2e5f7cedd76e 100644 --- a/lib/k8s-test-framework/Cargo.toml +++ b/lib/k8s-test-framework/Cargo.toml @@ -9,7 +9,7 @@ license = "MPL-2.0" [dependencies] k8s-openapi = { version = "0.16.0", default-features = false, features = ["v1_19"] } -serde_json = "1" +serde_json.workspace = true tempfile = "3" tokio = { version = "1.35.1", features = ["full"] } log = "0.4" diff --git a/lib/vector-api-client/Cargo.toml b/lib/vector-api-client/Cargo.toml index 164f8ab41257a..7fa5cddc591a2 100644 --- a/lib/vector-api-client/Cargo.toml +++ b/lib/vector-api-client/Cargo.toml @@ -10,7 +10,7 @@ license = "MPL-2.0" # Serde serde = { version = "1.0.195", default-features = false, features = ["derive"] } -serde_json = { version = "1.0.111", default-features = false, features = ["raw_value"] } +serde_json.workspace = true # Error handling anyhow = { version = "1.0.79", default-features = false, features = ["std"] } diff --git a/lib/vector-common/Cargo.toml b/lib/vector-common/Cargo.toml index 66a377c19d064..3410c12de04da 100644 --- a/lib/vector-common/Cargo.toml +++ b/lib/vector-common/Cargo.toml @@ -54,7 +54,7 @@ ordered-float = { version = "4.2.0", default-features = false } paste = "1.0.14" pin-project.workspace = true ryu = { version = "1", default-features = false } -serde_json = { version = "1.0.111", default-features = false, features = ["std", "raw_value"] } +serde_json.workspace = true serde = { version = "1.0.195", optional = true, features = ["derive"] } smallvec = { version = "1", default-features = false } snafu = { version = "0.7", optional = true } diff --git a/lib/vector-config-common/Cargo.toml b/lib/vector-config-common/Cargo.toml index 9de0b5159865a..c031b8ecbdab3 100644 --- a/lib/vector-config-common/Cargo.toml +++ b/lib/vector-config-common/Cargo.toml @@ -10,7 +10,7 @@ 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"] } +serde_json.workspace = true 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/Cargo.toml b/lib/vector-config/Cargo.toml index 197198d0fd815..b0847da7bc88e 100644 --- a/lib/vector-config/Cargo.toml +++ b/lib/vector-config/Cargo.toml @@ -19,7 +19,7 @@ inventory = { version = "0.3" } no-proxy = { version = "0.3.4", default-features = false, features = ["serialize"] } num-traits = { version = "0.2.17", default-features = false } serde = { version = "1.0", default-features = false } -serde_json = { version = "1.0", default-features = false, features = ["std"] } +serde_json.workspace = true serde_with = { version = "3.5.0", default-features = false, features = ["std"] } snafu = { version = "0.7.5", default-features = false } toml = { version = "0.8.8", default-features = false } diff --git a/lib/vector-core/Cargo.toml b/lib/vector-core/Cargo.toml index 66ddea280b128..2777d05221e41 100644 --- a/lib/vector-core/Cargo.toml +++ b/lib/vector-core/Cargo.toml @@ -41,7 +41,7 @@ quanta = { version = "0.12.2", default-features = false } regex = { version = "1.10.3", default-features = false, features = ["std", "perf"] } ryu = { version = "1", default-features = false } serde = { version = "1.0.195", default-features = false, features = ["derive", "rc"] } -serde_json = { version = "1.0.111", default-features = false } +serde_json.workspace = true serde_with = { version = "3.5.0", default-features = false, features = ["std", "macros"] } smallvec = { version = "1", default-features = false, features = ["serde", "const_generics"] } snafu = { version = "0.7.5", default-features = false } diff --git a/lib/vector-vrl/tests/Cargo.toml b/lib/vector-vrl/tests/Cargo.toml index 15cd6681d676c..9c69e6cedf738 100644 --- a/lib/vector-vrl/tests/Cargo.toml +++ b/lib/vector-vrl/tests/Cargo.toml @@ -18,7 +18,7 @@ glob = "0.3" prettydiff = "0.6" regex = "1" serde = "1" -serde_json = "1" +serde_json.workspace = true tracing-subscriber = { version = "0.3.18", default-features = false, features = ["fmt"] } [target.'cfg(not(target_env = "msvc"))'.dependencies] diff --git a/vdev/Cargo.toml b/vdev/Cargo.toml index 2d9828a5f399f..0b21ddcbd8d47 100644 --- a/vdev/Cargo.toml +++ b/vdev/Cargo.toml @@ -32,7 +32,7 @@ paste = "1.0.14" regex = { version = "1.10.3", default-features = false, features = ["std", "perf"] } reqwest = { version = "0.11", features = ["json", "blocking"] } serde = { version = "1.0", features = ["derive"] } -serde_json = "1.0.111" +serde_json.workspace = true serde_yaml = "0.9.30" sha2 = "0.10.8" tempfile = "3.9.0"