diff --git a/Cargo.lock b/Cargo.lock index 6acfc7d3c9..6d0856421f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -759,7 +759,7 @@ dependencies = [ "toml", "tracing", "usdt", - "uuid", + "uuid 0.8.2", "version_check", ] @@ -793,7 +793,7 @@ dependencies = [ "tokio-rustls", "toml", "twox-hash", - "uuid", + "uuid 0.8.2", ] [[package]] @@ -807,7 +807,7 @@ dependencies = [ "crucible-common", "serde", "tokio-util 0.7.1", - "uuid", + "uuid 0.8.2", ] [[package]] @@ -999,7 +999,7 @@ dependencies = [ "pq-sys", "r2d2", "serde_json", - "uuid", + "uuid 1.0.0", ] [[package]] @@ -1011,7 +1011,7 @@ dependencies = [ "lock_api", "serde", "usdt", - "uuid", + "uuid 0.8.2", ] [[package]] @@ -1156,7 +1156,7 @@ dependencies = [ "tokio-rustls", "toml", "usdt", - "uuid", + "uuid 0.8.2", "version_check", ] @@ -1607,7 +1607,7 @@ dependencies = [ "serde", "serde_json", "slog", - "uuid", + "uuid 1.0.0", ] [[package]] @@ -1640,7 +1640,7 @@ dependencies = [ "tokio-stream", "tokio-tungstenite", "usdt", - "uuid", + "uuid 1.0.0", ] [[package]] @@ -2495,7 +2495,7 @@ dependencies = [ "serde", "serde_json", "slog", - "uuid", + "uuid 1.0.0", ] [[package]] @@ -2522,7 +2522,7 @@ dependencies = [ "serde_json", "slog", "tokio", - "uuid", + "uuid 1.0.0", ] [[package]] @@ -2681,7 +2681,7 @@ dependencies = [ "thiserror", "tokio", "tokio-postgres", - "uuid", + "uuid 1.0.0", ] [[package]] @@ -2728,7 +2728,7 @@ dependencies = [ "tokio", "tokio-tungstenite", "toml", - "uuid", + "uuid 1.0.0", ] [[package]] @@ -2805,7 +2805,7 @@ dependencies = [ "toml", "tough", "usdt", - "uuid", + "uuid 1.0.0", ] [[package]] @@ -2890,7 +2890,7 @@ dependencies = [ "tokio", "tokio-util 0.7.1", "toml", - "uuid", + "uuid 1.0.0", "vsss-rs", "zone", ] @@ -3088,7 +3088,7 @@ dependencies = [ "serde", "thiserror", "trybuild", - "uuid", + "uuid 1.0.0", ] [[package]] @@ -3101,7 +3101,7 @@ dependencies = [ "reqwest", "serde", "slog", - "uuid", + "uuid 1.0.0", ] [[package]] @@ -3127,7 +3127,7 @@ dependencies = [ "thiserror", "tokio", "toml", - "uuid", + "uuid 1.0.0", ] [[package]] @@ -3154,7 +3154,7 @@ dependencies = [ "structopt", "thiserror", "tokio", - "uuid", + "uuid 1.0.0", ] [[package]] @@ -3166,7 +3166,7 @@ dependencies = [ "futures", "http", "oximeter", - "uuid", + "uuid 1.0.0", ] [[package]] @@ -3195,7 +3195,7 @@ dependencies = [ "slog-dtrace", "thiserror", "tokio", - "uuid", + "uuid 1.0.0", ] [[package]] @@ -3543,7 +3543,7 @@ dependencies = [ "postgres-protocol", "serde", "serde_json", - "uuid", + "uuid 0.8.2", ] [[package]] @@ -3736,7 +3736,7 @@ dependencies = [ "slog", "structopt", "thiserror", - "uuid", + "uuid 0.8.2", ] [[package]] @@ -4184,9 +4184,9 @@ dependencies = [ [[package]] name = "schemars" -version = "0.8.8" +version = "0.8.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6b5a3c80cea1ab61f4260238409510e814e38b4b563c06044edf91e7dc070e3" +checksum = "1847b767a3d62d95cbf3d8a9f0e421cf57a0d8aa4f411d4b16525afb0284d4ed" dependencies = [ "bytes", "chrono", @@ -4194,14 +4194,15 @@ dependencies = [ "schemars_derive", "serde", "serde_json", - "uuid", + "uuid 0.8.2", + "uuid 1.0.0", ] [[package]] name = "schemars_derive" -version = "0.8.8" +version = "0.8.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41ae4dce13e8614c46ac3c38ef1c0d668b101df6ac39817aebdaa26642ddae9b" +checksum = "af4d7e1b012cb3d9129567661a63755ea4b8a7386d339dc945ae187e403c6743" dependencies = [ "proc-macro2", "quote", @@ -4334,9 +4335,9 @@ dependencies = [ [[package]] name = "serde_derive_internals" -version = "0.25.0" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1dbab34ca63057a1f15280bdf3c39f2b1eb1b54c17e98360e511637aef7418c6" +checksum = "85bf8229e7920a9f636479437026331ce11aa132b4dde37d121944a44d6e5f3c" dependencies = [ "proc-macro2", "quote", @@ -4586,7 +4587,7 @@ dependencies = [ "reqwest", "serde", "slog", - "uuid", + "uuid 1.0.0", ] [[package]] @@ -4823,7 +4824,7 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" [[package]] name = "steno" version = "0.1.0" -source = "git+https://github.com/oxidecomputer/steno?branch=main#578498bbb43f9061c636b938dff98e7ece0b0efc" +source = "git+https://github.com/oxidecomputer/steno?branch=main#703cad54fdd70815ac84dcf08a439b54077e9600" dependencies = [ "anyhow", "async-trait", @@ -4837,7 +4838,7 @@ dependencies = [ "slog", "thiserror", "tokio", - "uuid", + "uuid 1.0.0", ] [[package]] @@ -5535,7 +5536,7 @@ version = "1.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" dependencies = [ - "cfg-if 1.0.0", + "cfg-if 0.1.10", "rand 0.8.5", "static_assertions", ] @@ -5747,6 +5748,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 5bd21038db..8a00d6d575 100644 --- a/common/Cargo.toml +++ b/common/Cargo.toml @@ -18,7 +18,7 @@ macaddr = { version = "1.0.1", features = [ "serde_std" ] } rand = "0.8.4" reqwest = { version = "0.11", default-features = false, features = ["rustls-tls", "stream"] } ring = "0.16" -schemars = { version = "0.8", features = [ "chrono", "uuid" ] } +schemars = { version = "0.8.10", features = [ "chrono", "uuid1" ] } serde = { version = "1.0", features = [ "derive" ] } serde_derive = "1.0" serde_json = "1.0" @@ -30,7 +30,7 @@ structopt = "0.3" thiserror = "1.0" tokio = { version = "1.18", 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 aab02f3111..d58e392677 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 9ce621fad3..ae5f1b73ea 100644 --- a/gateway-sp-comms/Cargo.toml +++ b/gateway-sp-comms/Cargo.toml @@ -15,7 +15,7 @@ thiserror = "1.0.31" 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 e7dd48cb91..dc1c35d2a3 100644 --- a/gateway/Cargo.toml +++ b/gateway/Cargo.toml @@ -18,7 +18,7 @@ slog-dtrace = "0.2" structopt = "0.3" thiserror = "1.0.31" 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 1b19b564bc..e850bf9954 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 109bc05893..41a523c529 100644 --- a/nexus/Cargo.toml +++ b/nexus/Cargo.toml @@ -89,8 +89,8 @@ version = "0.1.0" path = "../oximeter/producer" [dependencies.schemars] -version = "0.8" -features = [ "chrono", "uuid" ] +version = "0.8.10" +features = [ "chrono", "uuid1" ] [dependencies.serde] version = "1.0" @@ -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 7b00088615..ef216e75b7 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 0a7dfd23a4..7bff178ffe 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 2c6d616da9..1dc1379b9e 100644 --- a/oximeter/collector/Cargo.toml +++ b/oximeter/collector/Cargo.toml @@ -19,7 +19,7 @@ structopt = "0.3" thiserror = "1.0.31" tokio = "1.18" 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 6cf2bc6714..ebadd0de2a 100644 --- a/oximeter/db/Cargo.toml +++ b/oximeter/db/Cargo.toml @@ -14,7 +14,7 @@ dropshot = { git = "https://github.com/oxidecomputer/dropshot", branch = "main", oximeter = { path = "../oximeter" } regex = "1.5.5" reqwest = { version = "0.11.8", features = [ "json" ] } -schemars = { version = "0.8.8", features = [ "uuid", "bytes", "chrono" ] } +schemars = { version = "0.8.10", features = [ "uuid1", "bytes", "chrono" ] } serde = { version = "1", features = [ "derive" ] } serde_json = "1.0.79" slog = { version = "2.5", features = [ "max_level_trace", "release_max_level_debug" ] } @@ -23,7 +23,7 @@ slog-term = "2.9" structopt = "0.3" thiserror = "1.0.31" tokio = { version = "1.18", 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 ed172aa438..3446cdd723 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.7", 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 07b48e7aa8..c4d62add9f 100644 --- a/oximeter/oximeter/Cargo.toml +++ b/oximeter/oximeter/Cargo.toml @@ -10,10 +10,10 @@ bytes = { version = "1.0.1", features = [ "serde" ] } chrono = { version = "0.4.19", features = [ "serde" ] } num-traits = "0.2.15" oximeter-macro-impl = { path = "../oximeter-macro-impl" } -schemars = { version = "0.8.8", features = [ "uuid", "bytes", "chrono" ] } +schemars = { version = "0.8.10", features = [ "uuid1", "bytes", "chrono" ] } serde = { version = "1", features = [ "derive" ] } thiserror = "1.0.31" -uuid = { version = "0.8.2", features = [ "v4", "serde" ] } +uuid = { version = "1.0.0", features = [ "v4", "serde" ] } [dev-dependencies] trybuild = "1.0.61" diff --git a/oximeter/producer/Cargo.toml b/oximeter/producer/Cargo.toml index 7fd036113c..f1153a1946 100644 --- a/oximeter/producer/Cargo.toml +++ b/oximeter/producer/Cargo.toml @@ -12,10 +12,10 @@ nexus-client = { path = "../../nexus-client" } omicron-common = { path = "../../common" } oximeter = { path = "../oximeter" } reqwest = { version = "0.11.8", features = [ "json" ] } -schemars = { version = "0.8.8", features = [ "uuid", "bytes", "chrono" ] } +schemars = { version = "0.8.10", features = [ "uuid1", "bytes", "chrono" ] } serde = { version = "1", features = [ "derive" ] } slog = { version = "2.5", features = [ "max_level_trace", "release_max_level_debug" ] } slog-dtrace = "0.2" tokio = "1.18" thiserror = "1.0.31" -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 da6a8bc910..2e1a177af1 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 b097c4e304..06c2a9969c 100644 --- a/sled-agent/Cargo.toml +++ b/sled-agent/Cargo.toml @@ -27,7 +27,7 @@ progenitor = { git = "https://github.com/oxidecomputer/progenitor" } propolis-client = { git = "https://github.com/oxidecomputer/propolis", rev = "845c9cffc482739d417761aa1c668895f24b776d" } rand = { version = "0.8.5", features = ["getrandom"] } reqwest = { version = "0.11.8", default-features = false, features = ["rustls-tls", "stream"] } -schemars = { version = "0.8", features = [ "chrono", "uuid" ] } +schemars = { version = "0.8.10", features = [ "chrono", "uuid1" ] } serde = { version = "1.0", features = [ "derive" ] } serde_json = "1.0" sled-agent-client = { path = "../sled-agent-client" } @@ -43,7 +43,7 @@ thiserror = "1.0" tokio = { version = "1.18", 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-pre2", default-features = false, features = ["std"] } zone = "0.1"