Skip to content

Commit

Permalink
chore(deps): make prost* crates workspace dependencies (#21426)
Browse files Browse the repository at this point in the history
* chore(deps): make prost* crates workspace dependencies

* update one more build dep

* add 'dep:prost'

* add a few more missing 'dep:prost' entries
  • Loading branch information
pront authored Oct 8, 2024
1 parent b58e1b2 commit 49bb1b5
Show file tree
Hide file tree
Showing 7 changed files with 59 additions and 55 deletions.
53 changes: 26 additions & 27 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

35 changes: 20 additions & 15 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"] }
Expand All @@ -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 }
Expand Down Expand Up @@ -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 }
Expand Down Expand Up @@ -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 <major.minor> version changes
openssl-src = { version = "300", default-features = false, features = ["force-engine", "legacy"] }
Expand Down Expand Up @@ -543,6 +547,7 @@ sources-logs = [
"sources-vector",
]
sources-metrics = [
"dep:prost",
"sources-apache_metrics",
"sources-aws_ecs_metrics",
"sources-eventstoredb_metrics",
Expand All @@ -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"]
Expand All @@ -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"]
Expand All @@ -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"]
Expand Down Expand Up @@ -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"]
Expand All @@ -765,15 +770,15 @@ 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"]
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"]

Expand Down Expand Up @@ -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"]
Expand All @@ -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"]
Expand Down
4 changes: 2 additions & 2 deletions lib/codecs/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions lib/loki-logproto/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ 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 }

[dev-dependencies]
chrono.workspace = true

[build-dependencies]
prost-build = { version = "0.12" }
prost-build .workspace = true
4 changes: 2 additions & 2 deletions lib/opentelemetry-proto/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand All @@ -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 }
6 changes: 3 additions & 3 deletions lib/prometheus-parser/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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
6 changes: 3 additions & 3 deletions lib/vector-core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
Expand Down Expand Up @@ -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"
Expand Down

0 comments on commit 49bb1b5

Please sign in to comment.