diff --git a/Cargo.lock b/Cargo.lock index 50dbb5ede14..550bb273ed9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -646,7 +646,7 @@ dependencies = [ "toml", "tracing", "usdt", - "uuid", + "uuid 0.8.2", "version_check", ] @@ -680,7 +680,7 @@ dependencies = [ "tokio-rustls", "toml", "twox-hash", - "uuid", + "uuid 0.8.2", ] [[package]] @@ -694,7 +694,7 @@ dependencies = [ "crucible-common", "serde", "tokio-util 0.7.1", - "uuid", + "uuid 0.8.2", ] [[package]] @@ -860,7 +860,7 @@ dependencies = [ "pq-sys", "r2d2", "serde_json", - "uuid", + "uuid 1.0.0", ] [[package]] @@ -872,7 +872,7 @@ dependencies = [ "lock_api", "serde", "usdt", - "uuid", + "uuid 0.8.2", ] [[package]] @@ -1006,7 +1006,7 @@ dependencies = [ "tokio-rustls", "toml", "usdt", - "uuid", + "uuid 0.8.2", "version_check", ] @@ -1420,7 +1420,7 @@ dependencies = [ "serde", "serde_json", "slog", - "uuid", + "uuid 1.0.0", ] [[package]] @@ -1453,7 +1453,7 @@ dependencies = [ "tokio-stream", "tokio-tungstenite", "usdt", - "uuid", + "uuid 1.0.0", ] [[package]] @@ -2225,7 +2225,7 @@ dependencies = [ "serde", "serde_json", "slog", - "uuid", + "uuid 1.0.0", ] [[package]] @@ -2252,7 +2252,7 @@ dependencies = [ "serde_json", "slog", "tokio", - "uuid", + "uuid 1.0.0", ] [[package]] @@ -2375,7 +2375,7 @@ dependencies = [ "thiserror", "tokio", "tokio-postgres", - "uuid", + "uuid 1.0.0", ] [[package]] @@ -2422,7 +2422,7 @@ dependencies = [ "tokio", "tokio-tungstenite", "toml", - "uuid", + "uuid 1.0.0", ] [[package]] @@ -2499,7 +2499,7 @@ dependencies = [ "toml", "tough", "usdt", - "uuid", + "uuid 1.0.0", ] [[package]] @@ -2581,7 +2581,7 @@ dependencies = [ "tokio", "tokio-util 0.7.1", "toml", - "uuid", + "uuid 1.0.0", "vsss-rs", "zone", ] @@ -2749,7 +2749,7 @@ dependencies = [ "serde", "thiserror", "trybuild", - "uuid", + "uuid 1.0.0", ] [[package]] @@ -2762,7 +2762,7 @@ dependencies = [ "reqwest", "serde", "slog", - "uuid", + "uuid 1.0.0", ] [[package]] @@ -2788,7 +2788,7 @@ dependencies = [ "thiserror", "tokio", "toml", - "uuid", + "uuid 1.0.0", ] [[package]] @@ -2815,7 +2815,7 @@ dependencies = [ "structopt", "thiserror", "tokio", - "uuid", + "uuid 1.0.0", ] [[package]] @@ -2827,7 +2827,7 @@ dependencies = [ "futures", "http", "oximeter", - "uuid", + "uuid 1.0.0", ] [[package]] @@ -2856,7 +2856,7 @@ dependencies = [ "slog-dtrace", "thiserror", "tokio", - "uuid", + "uuid 1.0.0", ] [[package]] @@ -3187,7 +3187,7 @@ dependencies = [ "postgres-protocol", "serde", "serde_json", - "uuid", + "uuid 0.8.2", ] [[package]] @@ -3358,7 +3358,7 @@ dependencies = [ "slog", "structopt", "thiserror", - "uuid", + "uuid 0.8.2", ] [[package]] @@ -3768,7 +3768,7 @@ dependencies = [ "schemars_derive", "serde", "serde_json", - "uuid", + "uuid 0.8.2", ] [[package]] @@ -4145,7 +4145,7 @@ dependencies = [ "reqwest", "serde", "slog", - "uuid", + "uuid 1.0.0", ] [[package]] @@ -4370,7 +4370,7 @@ dependencies = [ "slog", "thiserror", "tokio", - "uuid", + "uuid 0.8.2", ] [[package]] @@ -5280,6 +5280,16 @@ dependencies = [ "serde", ] +[[package]] +name = "uuid" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8cfcd319456c4d6ea10087ed423473267e1a071f3bc0aa89f80d60997843c6f0" +dependencies = [ + "getrandom", + "serde", +] + [[package]] name = "valuable" version = "0.1.0" diff --git a/common/Cargo.toml b/common/Cargo.toml index a15d357e866..0346a3615a4 100644 --- a/common/Cargo.toml +++ b/common/Cargo.toml @@ -30,7 +30,7 @@ structopt = "0.3" thiserror = "1.0" tokio = { version = "1.17", features = [ "full" ] } tokio-postgres = { version = "0.7", features = [ "with-chrono-0_4", "with-uuid-0_8" ] } -uuid = { version = "0.8", features = [ "serde", "v4" ] } +uuid = { version = "1.0", features = [ "serde", "v4" ] } parse-display = "0.5.4" progenitor = { git = "https://github.com/oxidecomputer/progenitor" } diff --git a/gateway-client/Cargo.toml b/gateway-client/Cargo.toml index aab02f31110..d58e3926773 100644 --- a/gateway-client/Cargo.toml +++ b/gateway-client/Cargo.toml @@ -26,5 +26,5 @@ version = "2.5" features = [ "max_level_trace", "release_max_level_debug" ] [dependencies.uuid] -version = "0.8" +version = "1.0" features = [ "serde", "v4" ] diff --git a/gateway-sp-comms/Cargo.toml b/gateway-sp-comms/Cargo.toml index 32f0c6f3733..02ea1ccd6ee 100644 --- a/gateway-sp-comms/Cargo.toml +++ b/gateway-sp-comms/Cargo.toml @@ -15,7 +15,7 @@ thiserror = "1.0.30" tokio-tungstenite = "0.17" tokio-stream = "0.1.8" usdt = "0.3.1" -uuid = "0.8" +uuid = "1.0" gateway-messages = { path = "../gateway-messages", features = ["std"] } omicron-common = { path = "../common" } diff --git a/gateway/Cargo.toml b/gateway/Cargo.toml index 3566dfcf9b7..728a81715e8 100644 --- a/gateway/Cargo.toml +++ b/gateway/Cargo.toml @@ -18,7 +18,7 @@ slog-dtrace = "0.2" structopt = "0.3" thiserror = "1.0.30" toml = "0.5.9" -uuid = "0.8" +uuid = "1.0" gateway-messages = { path = "../gateway-messages", features = ["std"] } gateway-sp-comms = { path = "../gateway-sp-comms" } diff --git a/nexus-client/Cargo.toml b/nexus-client/Cargo.toml index 1b19b564bcc..e850bf99540 100644 --- a/nexus-client/Cargo.toml +++ b/nexus-client/Cargo.toml @@ -25,5 +25,5 @@ version = "2.5" features = [ "max_level_trace", "release_max_level_debug" ] [dependencies.uuid] -version = "0.8" +version = "1.0" features = [ "serde", "v4" ] diff --git a/nexus/Cargo.toml b/nexus/Cargo.toml index 45df9b47041..06d1b9b93a2 100644 --- a/nexus/Cargo.toml +++ b/nexus/Cargo.toml @@ -113,7 +113,7 @@ version = "0.7" features = [ "with-chrono-0_4", "with-serde_json-1", "with-uuid-0_8" ] [dependencies.uuid] -version = "0.8" +version = "1.0" features = [ "serde", "v4" ] [dev-dependencies] diff --git a/nexus/test-utils/Cargo.toml b/nexus/test-utils/Cargo.toml index 6ba635f5270..7ff8e2a5227 100644 --- a/nexus/test-utils/Cargo.toml +++ b/nexus/test-utils/Cargo.toml @@ -24,7 +24,7 @@ parse-display = "0.5.4" serde = { version = "1.0", features = [ "derive" ] } serde_json = "1.0" slog = { version = "2.7", features = [ "max_level_trace", "release_max_level_debug" ] } -uuid = { version = "0.8", features = [ "serde", "v4" ] } +uuid = { version = "1.0", features = [ "serde", "v4" ] } [build-dependencies] dropshot = { git = "https://github.com/oxidecomputer/dropshot", branch = "main", features = [ "usdt-probes" ] } diff --git a/oximeter-client/Cargo.toml b/oximeter-client/Cargo.toml index 0a7dfd23a42..7bff178ffef 100644 --- a/oximeter-client/Cargo.toml +++ b/oximeter-client/Cargo.toml @@ -24,5 +24,5 @@ version = "2.5" features = [ "max_level_trace", "release_max_level_debug" ] [dependencies.uuid] -version = "0.8" +version = "1.0" features = [ "serde", "v4" ] diff --git a/oximeter/collector/Cargo.toml b/oximeter/collector/Cargo.toml index 7b33fe02c0e..2981a57d4de 100644 --- a/oximeter/collector/Cargo.toml +++ b/oximeter/collector/Cargo.toml @@ -19,7 +19,7 @@ structopt = "0.3" thiserror = "1.0.30" tokio = "1.17" toml = "0.5.9" -uuid = { version = "0.8.2", features = [ "v4", "serde" ] } +uuid = { version = "1.0.0", features = [ "v4", "serde" ] } [dev-dependencies] expectorate = "1.0.5" diff --git a/oximeter/db/Cargo.toml b/oximeter/db/Cargo.toml index 53ace001245..b828fb63b04 100644 --- a/oximeter/db/Cargo.toml +++ b/oximeter/db/Cargo.toml @@ -23,7 +23,7 @@ slog-term = "2.9" structopt = "0.3" thiserror = "1.0.30" tokio = { version = "1.17", features = [ "rt-multi-thread", "macros" ] } -uuid = { version = "0.8.2", features = [ "v4", "serde" ] } +uuid = { version = "1.0.0", features = [ "v4", "serde" ] } [dev-dependencies] itertools = "0.10.1" diff --git a/oximeter/instruments/Cargo.toml b/oximeter/instruments/Cargo.toml index 849d5650e25..a92d12922df 100644 --- a/oximeter/instruments/Cargo.toml +++ b/oximeter/instruments/Cargo.toml @@ -10,7 +10,7 @@ dropshot = { git = "https://github.com/oxidecomputer/dropshot", branch = "main", futures = "0.3.21" oximeter = { path = "../oximeter" } http = { version = "0.2.5", optional = true } -uuid = { version = "0.8.2", features = [ "v4", "serde" ] } +uuid = { version = "1.0.0", features = [ "v4", "serde" ] } [features] default = ["http-instruments"] diff --git a/oximeter/oximeter/Cargo.toml b/oximeter/oximeter/Cargo.toml index 03b48eb2b49..645f3ae0630 100644 --- a/oximeter/oximeter/Cargo.toml +++ b/oximeter/oximeter/Cargo.toml @@ -13,7 +13,7 @@ oximeter-macro-impl = { path = "../oximeter-macro-impl" } schemars = { version = "0.8.8", features = [ "uuid", "bytes", "chrono" ] } serde = { version = "1", features = [ "derive" ] } thiserror = "1.0.30" -uuid = { version = "0.8.2", features = [ "v4", "serde" ] } +uuid = { version = "1.0.0", features = [ "v4", "serde" ] } [dev-dependencies] trybuild = "1.0.59" diff --git a/oximeter/producer/Cargo.toml b/oximeter/producer/Cargo.toml index 7714dc60ebb..d43942f3017 100644 --- a/oximeter/producer/Cargo.toml +++ b/oximeter/producer/Cargo.toml @@ -18,4 +18,4 @@ slog = { version = "2.5", features = [ "max_level_trace", "release_max_level_deb slog-dtrace = "0.2" tokio = "1.17" thiserror = "1.0.30" -uuid = { version = "0.8.2", features = [ "v4", "serde" ] } +uuid = { version = "1.0.0", features = [ "v4", "serde" ] } diff --git a/sled-agent-client/Cargo.toml b/sled-agent-client/Cargo.toml index da6a8bc9103..2e1a177af13 100644 --- a/sled-agent-client/Cargo.toml +++ b/sled-agent-client/Cargo.toml @@ -25,5 +25,5 @@ version = "2.5" features = [ "max_level_trace", "release_max_level_debug" ] [dependencies.uuid] -version = "0.8" +version = "1.0" features = [ "serde", "v4" ] diff --git a/sled-agent/Cargo.toml b/sled-agent/Cargo.toml index 6848b96991b..31e86c01d42 100644 --- a/sled-agent/Cargo.toml +++ b/sled-agent/Cargo.toml @@ -42,7 +42,7 @@ thiserror = "1.0" tokio = { version = "1.17", features = [ "full" ] } tokio-util = { version = "0.7", features = ["codec"] } toml = "0.5.9" -uuid = { version = "0.8", features = [ "serde", "v4" ] } +uuid = { version = "1.0", features = [ "serde", "v4" ] } vsss-rs = { version = "2.0.0-pre0", default-features = false, features = ["std"] } zone = "0.1"