diff --git a/Cargo.lock b/Cargo.lock index 01721c1d6714d..f308c2b24b841 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1644,7 +1644,7 @@ dependencies = [ "home", "http 1.1.0", "http-body-util", - "hyper 1.2.0", + "hyper 1.4.1", "hyper-named-pipe", "hyper-rustls 0.26.0", "hyper-util", @@ -4385,9 +4385,9 @@ dependencies = [ [[package]] name = "hyper" -version = "1.2.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "186548d73ac615b32a73aafe38fb4f56c0d340e110e5a200bcadbaf2e199263a" +checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05" dependencies = [ "bytes 1.7.2", "futures-channel", @@ -4411,7 +4411,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "73b7d8abf35697b81a825e386fc151e0d503e8cb5fcb93cc8669c376dfd6f278" dependencies = [ "hex", - "hyper 1.2.0", + "hyper 1.4.1", "hyper-util", "pin-project-lite", "tokio", @@ -4478,7 +4478,7 @@ checksum = "a0bea761b46ae2b24eb4aef630d8d1c398157b6fc29e6350ecf090a0b70c952c" dependencies = [ "futures-util", "http 1.1.0", - "hyper 1.2.0", + "hyper 1.4.1", "hyper-util", "log", "rustls 0.22.4", @@ -4516,20 +4516,19 @@ dependencies = [ [[package]] name = "hyper-util" -version = "0.1.3" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca38ef113da30126bbff9cd1705f9273e15d45498615d138b0c20279ac7a76aa" +checksum = "41296eb09f183ac68eec06e03cdbea2e759633d4067b2f6552fc2e009bcad08b" dependencies = [ "bytes 1.7.2", "futures-channel", "futures-util", "http 1.1.0", "http-body 1.0.0", - "hyper 1.2.0", + "hyper 1.4.1", "pin-project-lite", "socket2 0.5.7", "tokio", - "tower", "tower-service", "tracing 0.1.40", ] @@ -4542,7 +4541,7 @@ checksum = "acf569d43fa9848e510358c07b80f4adf34084ddc28c6a4a651ee8474c070dcc" dependencies = [ "hex", "http-body-util", - "hyper 1.2.0", + "hyper 1.4.1", "hyper-util", "pin-project-lite", "tokio", @@ -7132,12 +7131,12 @@ dependencies = [ [[package]] name = "prost" -version = "0.13.1" +version = "0.13.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e13db3d3fde688c61e2446b4d843bc27a7e8af269a69440c0308021dc92333cc" +checksum = "7b0487d90e047de87f984913713b85c601c05609aad5b0df4b4573fbf69aa13f" dependencies = [ "bytes 1.7.2", - "prost-derive 0.13.1", + "prost-derive 0.13.3", ] [[package]] @@ -7211,9 +7210,9 @@ dependencies = [ [[package]] name = "prost-derive" -version = "0.13.1" +version = "0.13.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18bec9b0adc4eba778b33684b7ba3e7137789434769ee3ce3930463ef904cfca" +checksum = "e9552f850d5f0964a4e4d0bf306459ac29323ddfbae05e35a7c0d35cb0803cc5" dependencies = [ "anyhow", "itertools 0.13.0", @@ -7224,14 +7223,14 @@ dependencies = [ [[package]] name = "prost-reflect" -version = "0.14.0" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55a6a9143ae25c25fa7b6a48d6cc08b10785372060009c25140a4e7c340e95af" +checksum = "4b7535b02f0e5efe3e1dbfcb428be152226ed0c66cad9541f2274c8ba8d4cd40" dependencies = [ "base64 0.22.1", "once_cell", - "prost 0.13.1", - "prost-types 0.13.1", + "prost 0.13.3", + "prost-types 0.13.3", "serde", "serde-value", ] @@ -7256,11 +7255,11 @@ dependencies = [ [[package]] name = "prost-types" -version = "0.13.1" +version = "0.13.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cee5168b05f49d4b0ca581206eb14a7b22fafd963efe729ac48eb03266e25cc2" +checksum = "4759aa0d3a6232fb8dbdb97b61de2c20047c68aca932c7ed76da9d788508d670" dependencies = [ - "prost 0.13.1", + "prost 0.13.3", ] [[package]] @@ -7836,7 +7835,7 @@ dependencies = [ "http 1.1.0", "http-body 1.0.0", "http-body-util", - "hyper 1.2.0", + "hyper 1.4.1", "hyper-rustls 0.26.0", "hyper-util", "ipnet", @@ -11002,7 +11001,7 @@ dependencies = [ "pest_derive", "prettydiff", "prettytable-rs", - "prost 0.13.1", + "prost 0.13.3", "prost-reflect", "psl", "psl-types", @@ -11639,7 +11638,7 @@ dependencies = [ "futures 0.3.30", "http 1.1.0", "http-body-util", - "hyper 1.2.0", + "hyper 1.4.1", "hyper-util", "log", "once_cell", @@ -11706,9 +11705,9 @@ dependencies = [ [[package]] name = "zeroize" -version = "1.6.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a0956f1ba7c7909bfb66c2e9e4124ab6f6482560f6628b5aaeba39207c9aad9" +checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" [[package]] name = "zstd" diff --git a/Cargo.toml b/Cargo.toml index c31345e5891dc..74588d8a06dcc 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -142,7 +142,10 @@ metrics-util = { version = "0.16.3", default-features = false, features = ["regi pin-project = { version = "1.1.5", default-features = false } proptest = { version = "1.5" } proptest-derive = { version = "0.4.0" } -prost-reflect = { version = "0.14", default-features = false } +prost = { version = "0.12", default-features = false, features = ["std"] } +prost-build = { version = "0.12", default-features = false} +prost-reflect = { version = "0.14", features = ["serde"], default-features = false } +prost-types = { version = "0.12", default-features = false} serde_json = { version = "1.0.128", default-features = false, features = ["raw_value", "std"] } serde = { version = "1.0.210", default-features = false, features = ["alloc", "derive", "rc"] } toml = { version = "0.8.19", default-features = false, features = ["display", "parse"] } @@ -159,6 +162,7 @@ vrl.workspace = true proptest = { workspace = true, optional = true } proptest-derive = { workspace = true, optional = true } + # Internal libs dnsmsg-parser = { path = "lib/dnsmsg-parser", optional = true } fakedata = { path = "lib/fakedata", optional = true } @@ -238,9 +242,9 @@ rmp-serde = { version = "1.3.0", default-features = false, optional = true } rmpv = { version = "1.3.0", default-features = false, features = ["with-serde"], optional = true } # Prost / Protocol Buffers -prost = { version = "0.12", default-features = false, features = ["std"] } +prost = { workspace = true, optional = true } prost-reflect = { workspace = true, optional = true } -prost-types = { version = "0.12", default-features = false, optional = true } +prost-types = { workspace = true, optional = true } # GCP goauth = { version = "0.14.0", optional = true } @@ -372,7 +376,7 @@ windows-service = "0.7.0" nix = { version = "0.26.2", default-features = false, features = ["socket", "signal"] } [build-dependencies] -prost-build = { version = "0.12", default-features = false, optional = true } +prost-build = { workspace = true, optional = true } tonic-build = { workspace = true, optional = true } # update 'openssl_version' in website/config.toml whenever version changes openssl-src = { version = "300", default-features = false, features = ["force-engine", "legacy"] } @@ -543,6 +547,7 @@ sources-logs = [ "sources-vector", ] sources-metrics = [ + "dep:prost", "sources-apache_metrics", "sources-aws_ecs_metrics", "sources-eventstoredb_metrics", @@ -563,16 +568,16 @@ sources-aws_ecs_metrics = ["sources-utils-http-client"] sources-aws_kinesis_firehose = ["dep:base64", "dep:infer"] sources-aws_s3 = ["aws-core", "dep:aws-sdk-sqs", "dep:aws-sdk-s3", "dep:semver", "dep:async-compression", "sources-aws_sqs", "tokio-util/io"] sources-aws_sqs = ["aws-core", "dep:aws-sdk-sqs"] -sources-datadog_agent = ["sources-utils-http-error", "protobuf-build"] +sources-datadog_agent = ["sources-utils-http-error", "protobuf-build", "dep:prost"] sources-demo_logs = ["dep:fakedata"] -sources-dnstap = ["sources-utils-net-tcp", "dep:base64", "dep:hickory-proto", "dep:dnsmsg-parser", "protobuf-build"] +sources-dnstap = ["sources-utils-net-tcp", "dep:base64", "dep:hickory-proto", "dep:dnsmsg-parser", "protobuf-build", "dep:prost"] sources-docker_logs = ["docker"] sources-eventstoredb_metrics = [] sources-exec = [] sources-file = ["vector-lib/file-source"] sources-file-descriptor = ["tokio-util/io"] sources-fluent = ["dep:base64", "sources-utils-net-tcp", "tokio-util/net", "dep:rmpv", "dep:rmp-serde", "dep:serde_bytes"] -sources-gcp_pubsub = ["gcp", "dep:h2", "dep:prost-types", "protobuf-build", "dep:tonic"] +sources-gcp_pubsub = ["gcp", "dep:h2", "dep:prost", "dep:prost-types", "protobuf-build", "dep:tonic"] sources-heroku_logs = ["sources-utils-http", "sources-utils-http-query", "sources-http_server"] sources-host_metrics = ["heim/cpu", "heim/host", "heim/memory", "heim/net"] sources-http_client = ["sources-utils-http-client"] @@ -587,7 +592,7 @@ sources-logstash = ["sources-utils-net-tcp", "tokio-util/net"] sources-mongodb_metrics = ["dep:mongodb"] sources-nats = ["dep:async-nats", "dep:nkeys"] sources-nginx_metrics = ["dep:nom"] -sources-opentelemetry = ["dep:hex", "vector-lib/opentelemetry", "dep:prost-types", "sources-http_server", "sources-utils-http", "sources-vector"] +sources-opentelemetry = ["dep:hex", "vector-lib/opentelemetry", "dep:prost", "dep:prost-types", "sources-http_server", "sources-utils-http", "sources-vector"] sources-postgresql_metrics = ["dep:postgres-openssl", "dep:tokio-postgres"] sources-prometheus = ["sources-prometheus-scrape", "sources-prometheus-remote-write", "sources-prometheus-pushgateway"] sources-prometheus-scrape = ["sinks-prometheus", "sources-utils-http-client", "vector-lib/prometheus"] @@ -612,7 +617,7 @@ sources-utils-net-tcp = ["listenfd", "dep:ipnet"] sources-utils-net-udp = ["listenfd"] sources-utils-net-unix = [] -sources-vector = ["dep:tonic", "protobuf-build"] +sources-vector = [ "dep:prost", "dep:tonic", "protobuf-build"] # Transforms transforms = ["transforms-logs", "transforms-metrics"] @@ -745,8 +750,8 @@ sinks-console = [] sinks-databend = ["dep:databend-client"] sinks-datadog_events = [] sinks-datadog_logs = [] -sinks-datadog_metrics = ["protobuf-build", "dep:prost-reflect"] -sinks-datadog_traces = ["protobuf-build", "dep:rmpv", "dep:rmp-serde", "dep:serde_bytes"] +sinks-datadog_metrics = ["protobuf-build", "dep:prost", "dep:prost-reflect"] +sinks-datadog_traces = ["protobuf-build", "dep:prost", "dep:rmpv", "dep:rmp-serde", "dep:serde_bytes"] sinks-elasticsearch = ["transforms-metric_to_log"] sinks-file = ["dep:async-compression"] sinks-gcp = ["sinks-gcp-chronicle", "dep:base64", "gcp"] @@ -765,7 +770,7 @@ sinks-nats = ["dep:async-nats", "dep:nkeys"] sinks-new_relic_logs = ["sinks-http"] sinks-new_relic = [] sinks-papertrail = ["dep:syslog"] -sinks-prometheus = ["dep:base64", "vector-lib/prometheus"] +sinks-prometheus = ["dep:base64", "dep:prost", "vector-lib/prometheus"] sinks-pulsar = ["dep:apache-avro", "dep:pulsar", "dep:lru"] sinks-redis = ["dep:redis"] sinks-sematext = ["sinks-elasticsearch", "sinks-influxdb"] @@ -773,7 +778,7 @@ sinks-socket = ["sinks-utils-udp"] sinks-splunk_hec = [] sinks-statsd = ["sinks-utils-udp", "tokio-util/net"] sinks-utils-udp = [] -sinks-vector = ["sinks-utils-udp", "dep:tonic", "protobuf-build"] +sinks-vector = ["sinks-utils-udp", "dep:tonic", "protobuf-build", "dep:prost"] sinks-websocket = ["dep:tokio-tungstenite"] sinks-webhdfs = ["dep:opendal"] @@ -856,7 +861,7 @@ clickhouse-integration-tests = ["sinks-clickhouse"] databend-integration-tests = ["sinks-databend"] datadog-agent-integration-tests = ["sources-datadog_agent"] datadog-logs-integration-tests = ["sinks-datadog_logs"] -datadog-metrics-integration-tests = ["sinks-datadog_metrics"] +datadog-metrics-integration-tests = ["sinks-datadog_metrics", "dep:prost"] datadog-traces-integration-tests = ["sources-datadog_agent", "sinks-datadog_traces", "axum/tokio"] docker-logs-integration-tests = ["sources-docker_logs", "unix"] es-integration-tests = ["sinks-elasticsearch", "aws-core"] @@ -876,7 +881,7 @@ mongodb_metrics-integration-tests = ["sources-mongodb_metrics"] mqtt-integration-tests = ["sinks-mqtt"] nats-integration-tests = ["sinks-nats", "sources-nats"] nginx-integration-tests = ["sources-nginx_metrics"] -opentelemetry-integration-tests = ["sources-opentelemetry"] +opentelemetry-integration-tests = ["sources-opentelemetry", "dep:prost"] postgresql_metrics-integration-tests = ["sources-postgresql_metrics"] prometheus-integration-tests = ["sinks-prometheus", "sources-prometheus", "sinks-influxdb"] pulsar-integration-tests = ["sinks-pulsar", "sources-pulsar"] diff --git a/lib/codecs/Cargo.toml b/lib/codecs/Cargo.toml index 571ba07dcbb5e..c1e5a5c3fc63d 100644 --- a/lib/codecs/Cargo.toml +++ b/lib/codecs/Cargo.toml @@ -21,8 +21,8 @@ lookup = { package = "vector-lookup", path = "../vector-lookup", default-feature memchr = { version = "2", default-features = false } once_cell = { version = "1.19", default-features = false } ordered-float = { version = "4.3.0", default-features = false } -prost = { version = "0.12.6", default-features = false, features = ["std"] } -prost-reflect = { workspace = true, features = ["serde"] } +prost.workspace = true +prost-reflect.workspace = true regex = { version = "1.11.0", default-features = false, features = ["std", "perf"] } serde.workspace = true serde_json.workspace = true diff --git a/lib/loki-logproto/Cargo.toml b/lib/loki-logproto/Cargo.toml index 3d0c703b712b5..5ed1a66d0d08a 100644 --- a/lib/loki-logproto/Cargo.toml +++ b/lib/loki-logproto/Cargo.toml @@ -8,8 +8,8 @@ publish = false # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -prost = { version = "0.12", default-features = false, features = ["std"] } -prost-types = { version = "0.12", default-features = false, features = ["std"] } +prost.workspace = true +prost-types.workspace = true bytes = { version = "1.7.2", default-features = false } snap = { version = "1.1.1", default-features = false } @@ -17,4 +17,4 @@ snap = { version = "1.1.1", default-features = false } chrono.workspace = true [build-dependencies] -prost-build = { version = "0.12" } +prost-build .workspace = true diff --git a/lib/opentelemetry-proto/Cargo.toml b/lib/opentelemetry-proto/Cargo.toml index ba601adbe4047..5918138147a3c 100644 --- a/lib/opentelemetry-proto/Cargo.toml +++ b/lib/opentelemetry-proto/Cargo.toml @@ -6,7 +6,7 @@ edition = "2021" publish = false [build-dependencies] -prost-build = { version = "0.12", default-features = false} +prost-build.workspace = true tonic-build.workspace = true [dependencies] @@ -15,7 +15,7 @@ chrono.workspace = true hex = { version = "0.4.3", default-features = false, features = ["std"] } lookup = { package = "vector-lookup", path = "../vector-lookup", default-features = false } ordered-float = { version = "4.3.0", default-features = false } -prost = { version = "0.12", default-features = false, features = ["std"] } +prost .workspace = true tonic.workspace = true vrl.workspace = true vector-core = { path = "../vector-core", default-features = false } diff --git a/lib/prometheus-parser/Cargo.toml b/lib/prometheus-parser/Cargo.toml index d9041f560d349..4ae8eeafd09fb 100644 --- a/lib/prometheus-parser/Cargo.toml +++ b/lib/prometheus-parser/Cargo.toml @@ -12,10 +12,10 @@ license = "MPL-2.0" indexmap.workspace = true nom = "7.1.3" num_enum = "0.7.3" -prost = "0.12" -prost-types = "0.12" +prost.workspace = true +prost-types.workspace = true snafu = { version = "0.7" } vector-common = { path = "../vector-common", features = ["btreemap"] } [build-dependencies] -prost-build = "0.12" +prost-build.workspace = true diff --git a/lib/vector-core/Cargo.toml b/lib/vector-core/Cargo.toml index b1232c6028099..9e4b173df945d 100644 --- a/lib/vector-core/Cargo.toml +++ b/lib/vector-core/Cargo.toml @@ -38,8 +38,8 @@ openssl = { version = "0.10.66", default-features = false, features = ["vendored parking_lot = { version = "0.12.3", default-features = false } pin-project.workspace = true proptest = { version = "1.5", optional = true } -prost-types = { version = "0.12", default-features = false } -prost = { version = "0.12", default-features = false, features = ["std"] } +prost-types.workspace = true +prost .workspace = true quanta = { version = "0.12.3", default-features = false } regex = { version = "1.11.0", default-features = false, features = ["std", "perf"] } ryu = { version = "1", default-features = false } @@ -76,7 +76,7 @@ security-framework = "2.10.0" schannel = "0.1.24" [build-dependencies] -prost-build = "0.12" +prost-build.workspace = true [dev-dependencies] base64 = "0.22.1"