Merge branch 'roman-bazel-prost-0.11' into 'master'

[bazel] update prost version to 0.11 This change bumps the version of the `prost` dependency and related packages. Rationale: prost-build version 0.10 has build determinism issues because it embeds paths from the environment into the build script binary. See merge request dfinity-lab/public/ic!8502
dfinity · Oct 27, 2022 · a84fcf7 · a84fcf7
2 parents cc2b72b + dfec0b3
commit a84fcf7
Show file tree

Hide file tree

Showing 137 changed files with 1,514 additions and 458 deletions.
diff --git a/Cargo.Bazel.json.lock b/Cargo.Bazel.json.lock
diff --git a/Cargo.Bazel.toml.lock b/Cargo.Bazel.toml.lock
@@ -1314,15 +1314,6 @@ dependencies = [
  "bitflags",
 ]
 
-[[package]]
-name = "cmake"
-version = "0.1.48"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8ad8cef104ac57b68b89df3208164d228503abbdce70f6880ffa3d970e7443a"
-dependencies = [
- "cc",
-]
-
 [[package]]
 name = "codespan-reporting"
 version = "0.11.1"
@@ -1935,11 +1926,11 @@ dependencies = [
 
 [[package]]
 name = "debugid"
-version = "0.7.3"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6ee87af31d84ef885378aebca32be3d682b0e0dc119d5b4860a2c5bb5046730"
+checksum = "bef552e6f588e446098f6ba40d89ac146c8c7b64aade83c051ee00bb5d2bc18d"
 dependencies = [
- "uuid",
+ "uuid 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -2322,7 +2313,7 @@ dependencies = [
  "tracing-appender",
  "tracing-subscriber 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
  "url",
- "uuid",
+ "uuid 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "vsock",
  "wait-timeout",
  "walkdir",
@@ -3727,7 +3718,7 @@ dependencies = [
  "serde_json",
  "serde_yaml",
  "similar",
- "uuid",
+ "uuid 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -5530,9 +5521,8 @@ dependencies = [
 
 [[package]]
 name = "pprof"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a97149c0eacaa6b8f8cedea99f68bb3a0517fa20f8de8d8c24c1a810f38d235d"
+version = "0.10.1"
+source = "git+https://github.com/tikv/pprof-rs?rev=059d3c80395c74e9f82ca1f9cbb3c013acfffb75#059d3c80395c74e9f82ca1f9cbb3c013acfffb75"
 dependencies = [
  "backtrace",
  "cfg-if 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -5546,6 +5536,7 @@ dependencies = [
  "prost",
  "prost-build",
  "prost-derive",
+ "sha2 0.10.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "smallvec",
  "symbolic-demangle",
  "tempfile",
@@ -5809,23 +5800,21 @@ dependencies = [
 
 [[package]]
 name = "prost"
-version = "0.10.4"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "71adf41db68aa0daaefc69bb30bcd68ded9b9abaad5d1fbb6304c4fb390e083e"
+checksum = "399c3c31cdec40583bb68f0b18403400d01ec4289c383aa047560439952c4dd7"
 dependencies = [
  "bytes",
  "prost-derive",
 ]
 
 [[package]]
 name = "prost-build"
-version = "0.10.4"
+version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ae5a4388762d5815a9fc0dea33c56b021cdc8dde0c55e0c9ca57197254b0cab"
+checksum = "7f835c582e6bd972ba8347313300219fed5bfa52caf175298d860b61ff6069bb"
 dependencies = [
  "bytes",
- "cfg-if 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cmake",
  "heck 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "itertools",
  "lazy_static",
@@ -5841,9 +5830,9 @@ dependencies = [
 
 [[package]]
 name = "prost-derive"
-version = "0.10.1"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b670f45da57fb8542ebdbb6105a925fe571b67f9e7ed9f47a06a84e72b4e7cc"
+checksum = "7345d5f0e08c0536d7ac7229952590239e77abf0a0100a1b1d890add6ea96364"
 dependencies = [
  "anyhow",
  "itertools",
@@ -5854,9 +5843,9 @@ dependencies = [
 
 [[package]]
 name = "prost-types"
-version = "0.10.1"
+version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d0a014229361011dc8e69c8a1ec6c2e8d0f2af7c91e3ea3f5b2170298461e68"
+checksum = "4dfaa718ad76a44b3415e6c4d53b17c8f99160dcb3a99b10470fce8ad43f6e3e"
 dependencies = [
  "bytes",
  "prost",
@@ -7361,21 +7350,21 @@ checksum = "734676eb262c623cec13c3155096e08d1f8f29adce39ba17948b18dad1e54142"
 
 [[package]]
 name = "symbolic-common"
-version = "8.8.0"
+version = "9.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f551f902d5642e58039aee6a9021a61037926af96e071816361644983966f540"
+checksum = "800963ba330b09a2ae4a4f7c6392b81fbc2784099a98c1eac68c3437aa9382b2"
 dependencies = [
  "debugid",
  "memmap2",
  "stable_deref_trait",
- "uuid",
+ "uuid 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "symbolic-demangle"
-version = "8.8.0"
+version = "9.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4564ca7b4e6eb14105aa8bbbce26e080f6b5d9c4373e67167ab31f7b86443750"
+checksum = "2b940a1fdbc72bb3369e38714efe6cd332dbbe46d093cf03d668b9ac390d1ad0"
 dependencies = [
  "rustc-demangle",
  "symbolic-common",
@@ -7942,9 +7931,9 @@ dependencies = [
 
 [[package]]
 name = "tonic"
-version = "0.7.2"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5be9d60db39854b30b835107500cf0aca0b0d14d6e1c3de124217c23a29c2ddb"
+checksum = "55b9af819e54b8f33d453655bef9b9acc171568fb49523078d0cc4e7484200ec"
 dependencies = [
  "async-stream",
  "async-trait",
@@ -7974,9 +7963,9 @@ dependencies = [
 
 [[package]]
 name = "tonic-build"
-version = "0.7.2"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9263bf4c9bfaae7317c1c2faf7f18491d2fe476f70c414b73bf5d445b00ffa1"
+checksum = "48c6fd7c2581e36d63388a9e04c350c21beb7a8b059580b2e93993c526899ddc"
 dependencies = [
  "prettyplease",
  "proc-macro2 1.0.47 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -8365,6 +8354,12 @@ dependencies = [
  "getrandom 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "uuid"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "feb41e78f93363bb2df8b0e86a2ca30eed7806ea16ea0c790d757cf93f79be83"
+
 [[package]]
 name = "valuable"
 version = "0.1.0"

diff --git a/WORKSPACE.bazel b/WORKSPACE.bazel
@@ -100,7 +100,6 @@ external_crates_repository(
         "prost-build": [crate.annotation(
             build_script_env = {
                 "PROTOC_NO_VENDOR": "1",
-                "PROTOC": "NO_PROTOC_PATH_AT_COMPILE_TIME",
             },
         )],
     },

diff --git a/bazel/cargo.config b/bazel/cargo.config
@@ -5,3 +5,5 @@ webpki = { git = "https://github.com/dfinity-lab/webpki", branch = "v0.21.4-v3-n
 # released this can be removed.
 jsonrpc = { git = "https://github.com/apoelstra/rust-jsonrpc", rev = "e42044d" }
 ciborium = { git = "https://github.com/enarx/ciborium", rev = "e719537c99b564c3674a56defe53713c702c6f46" }
+# This version pins prost 0.11. Please remove after the next pprof release.
+pprof = { git = "https://github.com/tikv/pprof-rs", rev = "059d3c80395c74e9f82ca1f9cbb3c013acfffb75" }
diff --git a/bazel/external_crates.bzl b/bazel/external_crates.bzl
@@ -584,9 +584,8 @@ def external_crates_repository(name, annotations):
                 version = "^0.3",
             ),
             "pprof": crate.spec(
-                version = "^0.9.1",
+                version = "^0.10.1",
                 features = [
-                    "backtrace-rs",
                     "flamegraph",
                     "prost-codec",
                 ],
@@ -624,13 +623,13 @@ def external_crates_repository(name, annotations):
                 version = "^0.3.0",
             ),
             "prost": crate.spec(
-                version = "^0.10.4",
+                version = "^0.11.0",
             ),
             "prost-build": crate.spec(
-                version = "^0.10.4",
+                version = "^0.11.0",
             ),
             "prost-derive": crate.spec(
-                version = "^0.10",
+                version = "^0.11",
             ),
             "protobuf": crate.spec(
                 version = "^2.27.1",
@@ -933,10 +932,10 @@ def external_crates_repository(name, annotations):
                 version = "^0.5.9",
             ),
             "tonic": crate.spec(
-                version = "^0.7.2",
+                version = "^0.8.2",
             ),
             "tonic-build": crate.spec(
-                version = "^0.7.2",
+                version = "^0.8.2",
             ),
             "tower": crate.spec(
                 version = "^0.4.11",

diff --git a/bazel/prost.bzl b/bazel/prost.bzl
@@ -47,5 +47,5 @@ def protobuf_generator(name, srcs, manifest_dir, deps = [], data = []):
             "GENERATOR": "$(location :%s)" % binary_name,
             "RUSTFMT": "$(rootpath @rules_rust//rust/toolchain:current_rustfmt_files)",
         },
-        tags = ["local", "manual"],
+        tags = ["local", "manual", "pb-generator"],
     )