build: Move common dependencies to workspace.dependencies (#2455)

getsentry · Sep 1, 2023 · a0c3d71 · a0c3d71
1 parent c09a01e
commit a0c3d71
Show file tree

Hide file tree

Showing 73 changed files with 7,123 additions and 5,269 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -12,3 +12,27 @@ debug = false
 # In release, however, we do want full debug information to report
 # panic and error stack traces to Sentry.
 debug = true
+
+[workspace.dependencies]
+anyhow = "1.0.66"
+chrono = { version = "0.4.24", default-features = false, features = [
+    "std",
+    "serde",
+] }
+clap = { version = "4.1.4" }
+criterion = "0.5"
+futures = { version = "0.3", default-features = false }
+insta = { version = "1.31.0", features = ["json", "redactions", "ron"] }
+itertools = "0.10.5"
+once_cell = "1.13.1"
+regex = "1.9.1"
+serde = { version = "1.0.159", features = ["derive"] }
+serde_json = "1.0.93"
+serde_yaml = "0.9.17"
+schemars = { version = "=0.8.10", features = ["uuid1", "chrono"] }
+similar-asserts = "1.4.2"
+smallvec = { version = "1.10.0", features = ["serde"] }
+thiserror = "1.0.38"
+tokio = { version = "1.28.0", features = ["macros", "sync", "tracing"] }
+url = "2.1.1"
+uuid = { version = "1.3.0", features = ["serde", "v4"] }
diff --git a/relay-auth/Cargo.toml b/relay-auth/Cargo.toml
@@ -11,13 +11,14 @@ publish = false
 build = "build.rs"
 
 [dependencies]
-chrono = { version = "0.4.24", default-features = false, features = ["std", "serde"] }
+chrono = { workspace = true }
+data-encoding = "2.3.3"
 ed25519-dalek = { version = "2.0.0", features = ["rand_core"] }
-thiserror = "1.0.38"
 hmac = "0.12.1"
 rand = "0.8.5"
 relay-common = { path = "../relay-common" }
-serde = { version = "1.0.114", features = ["derive"] }
-serde_json = "1.0.55"
+serde = { workspace = true }
+serde_json = { workspace = true }
 sha2 = "0.10.6"
-data-encoding = "2.3.3"
+thiserror = { workspace = true }
+uuid = { workspace = true }
diff --git a/relay-auth/src/lib.rs b/relay-auth/src/lib.rs
@@ -32,10 +32,10 @@ use hmac::{Hmac, Mac};
 use rand::rngs::OsRng;
 use rand::{thread_rng, RngCore};
 use relay_common::time::UnixTimestamp;
-use relay_common::uuid::Uuid;
 use serde::de::DeserializeOwned;
 use serde::{Deserialize, Serialize};
 use sha2::Sha512;
+use uuid::Uuid;
 
 include!(concat!(env!("OUT_DIR"), "/constants.gen.rs"));
 

diff --git a/relay-aws-extension/Cargo.toml b/relay-aws-extension/Cargo.toml
@@ -13,6 +13,6 @@ publish = false
 relay-log = { path = "../relay-log" }
 relay-system = { path = "../relay-system" }
 reqwest = { version = "0.11.1", features = ["json"] }
-serde = { version = "1.0.114", features = ["derive"] }
-serde_json = "1.0.55"
-tokio = { version = "1.28.0" }
+serde = { workspace = true }
+serde_json = { workspace = true }
+tokio = { workspace = true }
diff --git a/relay-base-schema/Cargo.toml b/relay-base-schema/Cargo.toml
@@ -12,11 +12,8 @@ publish = false
 [dependencies]
 relay-common = { path = "../relay-common" }
 relay-protocol = { path = "../relay-protocol" }
-schemars = { version = "0.8.0", features = [
-    "uuid1",
-    "chrono",
-], optional = true }
-serde = { version = "1.0.114", features = ["derive"] }
+schemars = { workspace = true, optional = true }
+serde = { workspace = true }
 
 [features]
 default = []

diff --git a/relay-cabi/Cargo.toml b/relay-cabi/Cargo.toml
@@ -13,12 +13,12 @@ publish = false
 crate-type = ["cdylib"]
 
 [dependencies]
-anyhow = { version = "1.0.66", features = ["backtrace"] }
-chrono = { version = "0.4.24", default-features = false, features = ["std"] }
+anyhow = { workspace = true, features = ["backtrace"] }
+chrono = { workspace = true }
 json-forensics = { version = "0.1.1" }
 lru = "0.9.0"
-once_cell = "1.13.1"
-regex = "1.9.1"
+once_cell = { workspace = true }
+regex = { workspace = true }
 relay-auth = { path = "../relay-auth" }
 relay-base-schema = { path = "../relay-base-schema" }
 relay-common = { path = "../relay-common" }
@@ -30,5 +30,6 @@ relay-pii = { path = "../relay-pii" }
 relay-protocol = { path = "../relay-protocol" }
 relay-sampling = { path = "../relay-sampling" }
 sentry-release-parser = { version = "1.3.2", features = ["serde"] }
-serde = { version = "1.0.114", features = ["derive"] }
-serde_json = "1.0.55"
+serde = { workspace = true }
+serde_json = { workspace = true }
+uuid = { workspace = true }
diff --git a/relay-cabi/src/core.rs b/relay-cabi/src/core.rs
@@ -2,7 +2,7 @@ use std::ffi::CStr;
 use std::os::raw::c_char;
 use std::{mem, ptr, slice, str};
 
-use relay_common::uuid::Uuid;
+use uuid::Uuid;
 
 /// A length-prefixed UTF-8 string.
 ///

diff --git a/relay-common/Cargo.toml b/relay-common/Cargo.toml
@@ -10,15 +10,14 @@ license-file = "../LICENSE"
 publish = false
 
 [dependencies]
-chrono = { version = "0.4.24", default-features = false, features = ["std"] }
+chrono = { workspace = true }
 globset = "0.4.5"
 lru = "0.9.0"
-once_cell = "1.13.1"
+once_cell = { workspace = true }
 parking_lot = "0.12.1"
-regex = "1.9.1"
+regex = { workspace = true }
 sentry-types = "0.31.3"
-serde = { version = "1.0.114", features = ["derive"] }
-uuid = { version = "1.3.0", features = ["serde", "v4", "v5"] }
+serde = { workspace = true }
 
 [dev-dependencies]
 serde_test = "1.0.125"
diff --git a/relay-common/src/lib.rs b/relay-common/src/lib.rs
@@ -14,6 +14,3 @@ pub mod glob3;
 pub mod time;
 
 pub use sentry_types::{Auth, Dsn, ParseAuthError, ParseDsnError, Scheme};
-
-#[doc(inline)]
-pub use uuid;
diff --git a/relay-config/Cargo.toml b/relay-config/Cargo.toml
@@ -14,7 +14,7 @@ default = []
 processing = []
 
 [dependencies]
-anyhow = "1.0.66"
+anyhow = { workspace = true }
 human-size = "0.4.1"
 num_cpus = "1.13.0"
 relay-auth = { path = "../relay-auth" }
@@ -23,8 +23,9 @@ relay-kafka = { path = "../relay-kafka" }
 relay-log = { path = "../relay-log", features = ["init"] }
 relay-metrics = { path = "../relay-metrics" }
 relay-redis = { path = "../relay-redis" }
-serde = { version = "1.0.114", features = ["derive"] }
-serde_json = "1.0.55"
-serde_yaml = "0.9.17"
-thiserror = "1.0.38"
-url = "2.1.1"
+serde = { workspace = true }
+serde_json = { workspace = true }
+serde_yaml = { workspace = true }
+thiserror = { workspace = true }
+url = { workspace = true }
+uuid = { workspace = true }
diff --git a/relay-config/src/config.rs b/relay-config/src/config.rs
@@ -10,7 +10,6 @@ use std::{env, fmt, fs, io};
 
 use anyhow::Context;
 use relay_auth::{generate_key_pair, generate_relay_id, PublicKey, RelayId, SecretKey};
-use relay_common::uuid::Uuid;
 use relay_common::Dsn;
 use relay_kafka::{
     ConfigError as KafkaConfigError, KafkaConfig, KafkaConfigParam, KafkaTopic, TopicAssignments,
@@ -19,6 +18,7 @@ use relay_metrics::{AggregatorConfig, Condition, Field, MetricNamespace, ScopedA
 use relay_redis::RedisConfig;
 use serde::de::{DeserializeOwned, Unexpected, Visitor};
 use serde::{Deserialize, Deserializer, Serialize, Serializer};
+use uuid::Uuid;
 
 use crate::byte_size::ByteSize;
 use crate::upstream::UpstreamDescriptor;

diff --git a/relay-dynamic-config/Cargo.toml b/relay-dynamic-config/Cargo.toml
@@ -13,7 +13,7 @@ publish = false
 default = []
 
 [dependencies]
-anyhow = "1.0.66"
+anyhow = { workspace = true }
 assert-json-diff = "2.0.2"
 relay-auth = { path = "../relay-auth" }
 relay-base-schema = { path = "../relay-base-schema" }
@@ -23,10 +23,10 @@ relay-event-normalization = { path = "../relay-event-normalization" }
 relay-pii = { path = "../relay-pii" }
 relay-quotas = { path = "../relay-quotas" }
 relay-sampling = { path = "../relay-sampling" }
-serde = { version = "1.0.114", features = ["derive"] }
-serde_json = "1.0.55"
-smallvec = "1.10.0"
+serde = { workspace = true }
+serde_json = { workspace = true }
+smallvec = { workspace = true }
 
 [dev-dependencies]
-insta = "1.31.0"
-similar-asserts = "1.4.2"
+insta = { workspace = true }
+similar-asserts = { workspace = true }
diff --git a/relay-event-normalization/Cargo.toml b/relay-event-normalization/Cargo.toml
@@ -11,36 +11,33 @@ publish = false
 
 [dependencies]
 bytecount = "0.6.0"
-chrono = { version = "0.4.24", default-features = false, features = [
-    "clock",
-    "std",
-    "serde",
-] }
+chrono = { workspace = true, features = ["clock"] }
 dynfmt = { version = "0.1.4", features = ["python", "curly"] }
-itertools = "0.10.5"
+itertools = { workspace = true }
 maxminddb = "0.23.0"
 md5 = "0.7.0"
-once_cell = "1.13.1"
-regex = "1.9.1"
+once_cell = { workspace = true }
+regex = { workspace = true }
 relay-base-schema = { path = "../relay-base-schema" }
 relay-common = { path = "../relay-common" }
 relay-event-schema = { path = "../relay-event-schema" }
 relay-log = { path = "../relay-log" }
 relay-protocol = { path = "../relay-protocol" }
 relay-ua = { path = "../relay-ua" }
 sentry-release-parser = "1.3.2"
-serde = { version = "1.0.114", features = ["derive"] }
-serde_json = "1.0.55"
+serde = { workspace = true }
+serde_json = { workspace = true }
 serde_urlencoded = "0.7.1"
-smallvec = { version = "1.4.0", features = ["serde"] }
+smallvec = { workspace = true }
 sqlparser = { version = "0.37.0", features = ["visitor"] }
-thiserror = "1.0.38"
-url = "2.1.1"
+thiserror = { workspace = true }
+url = { workspace = true }
+uuid = { workspace = true }
 
 [dev-dependencies]
-insta = { version = "1.31.0", features = ["json", "redactions", "ron", "yaml"] }
+insta = { workspace = true }
 relay-protocol = { path = "../relay-protocol", features = ["test"] }
-similar-asserts = "1.4.2"
+similar-asserts = { workspace = true }
 
 [features]
 default = ["mmap"]