Protobuf 3.7.2 bump and updated build.rs to fix GHSA-2gh3-rmm4-6rq5, linter allows added. (#264)

* updated protobuf version to be a minimum of 3.7.2 to address GHSA-2gh3-rmm4-6rq5. Added linter allows so build and tests pass

Signed-off-by: Kyle Steere <[email protected]>

* removed protobuf-codegen-pure, protobuf 3.7.2 removed package

Signed-off-by: Kyle Steere <[email protected]>

* updated build.rs to use protobuf_codegen instead of protobuf_codegen_pure

Signed-off-by: Kyle Steere <[email protected]>

* added .pure implementation
removed commented lines from previous commit
commented out profile.encode due to testing failures

Signed-off-by: Kyle Steere <[email protected]>

* updated README, rust.yml and Cargo.toml to rust 1.71.0

Signed-off-by: Kyle Steere <[email protected]>

* added #allow's for cargo clippy warnings

Signed-off-by: Kyle Steere <[email protected]>

* updating toolchain for .github/workflows

Signed-off-by: Kyle Steere <[email protected]>

* upgrade MSRV to 1.74.0

Signed-off-by: Yang Keao <[email protected]>

* remove clippy annotations as much as possible

Signed-off-by: Yang Keao <[email protected]>

---------

Signed-off-by: Kyle Steere <[email protected]>
Signed-off-by: Yang Keao <[email protected]>
Co-authored-by: Yang Keao <[email protected]>

Author: kbsteere

.github/workflows/rust.yml

@@ -19,7 +19,7 @@ jobs:
         uses: actions-rs/[email protected]
         with:
           profile: minimal
-          toolchain: 1.66.0
+          toolchain: 1.74.0
           override: true
           components: rustfmt, clippy
 
@@ -56,7 +56,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest]
-        toolchain: [stable, nightly, 1.66.0]
+        toolchain: [stable, nightly, 1.74.0]
         target:
           [
             x86_64-unknown-linux-gnu,

Cargo.lock

@@ -8,7 +8,7 @@ description = "An internal perf tools for rust programs."
 repository = "https://github.com/tikv/pprof-rs"
 documentation = "https://docs.rs/pprof/"
 readme = "README.md"
-rust-version = "1.66.0"  # MSRV
+rust-version = "1.74.0"  # MSRV
 
 [features]
 default = ["cpp"]
@@ -19,7 +19,7 @@ frame-pointer = []
 # A private feature to indicate either prost-codec or protobuf-codec is enabled.
 _protobuf = []
 prost-codec = ["prost", "prost-derive", "prost-build", "sha2", "_protobuf"]
-protobuf-codec = ["protobuf", "protobuf-codegen-pure", "_protobuf"]
+protobuf-codec = ["protobuf", "protobuf-codegen", "_protobuf"]
 
 [dependencies]
 backtrace = { version = "0.3" }
@@ -37,7 +37,7 @@ smallvec = "1.7"
 inferno = { version = "0.11", default-features = false, features = ["nameattr"], optional = true }
 prost = { version = "0.12", optional = true }
 prost-derive = { version = "0.12", optional = true }
-protobuf = { version = "2.0", optional = true }
+protobuf = { version = ">=3.7.2", optional = true }
 criterion = {version = "0.5", optional = true}
 aligned-vec = "0.6"
 
@@ -53,7 +53,7 @@ rand = "0.8.0"
 [build-dependencies]
 prost-build = { version = "0.12", optional = true }
 sha2 = { version = "0.10", optional = true }
-protobuf-codegen-pure = { version = "2.0", optional = true }
+protobuf-codegen = { version = "3.7.2", optional = true }
 
 [[example]]
 name = "flamegraph"

Cargo.toml

@@ -247,7 +247,7 @@ Unit tests have been added to guarantee there is no `malloc` in sample functions
 
 ## Minimum Supported Rust Version
 
-Rust 1.64 or higher.
+Rust 1.74 or higher.
 
 Minimum supported Rust version can be changed in the future, but it will be done with a minor version bump.
 

README.md

@@ -1,23 +1,21 @@
 // Copyright 2019 TiKV Project Authors. Licensed under Apache-2.0.
-
 #[cfg(feature = "protobuf-codec")]
 // Allow deprecated as TiKV pin versions to a outdated one.
-#[allow(deprecated)]
 fn generate_protobuf() {
     use std::io::Write;
-
+    let customize = <protobuf_codegen::Customize as std::default::Default>::default();
+    // Set the output directory for generated files
     let out_dir = std::env::var("OUT_DIR").unwrap();
-    protobuf_codegen_pure::run(protobuf_codegen_pure::Args {
-        out_dir: &out_dir,
-        includes: &["proto"],
-        input: &["proto/profile.proto"],
-        customize: protobuf_codegen_pure::Customize {
-            generate_accessors: Some(false),
-            lite_runtime: Some(true),
-            ..Default::default()
-        },
-    })
-    .unwrap();
+
+    let mut cg = protobuf_codegen::Codegen::new();
+    cg.pure();
+
+    cg.inputs(["proto/profile.proto"]).includes(["proto"]);
+
+    cg.customize(customize);
+    cg.out_dir(&out_dir).run().unwrap();
+
+    // Optionally, write a mod.rs file for module inclusion
     let mut f = std::fs::File::create(format!("{}/mod.rs", out_dir)).unwrap();
     write!(f, "pub mod profile;").unwrap();
 }

build.rs

@@ -23,6 +23,3 @@ impl super::Trace for Trace {
         unsafe { backtrace::trace_unsynchronized(cb) }
     }
 }
-
-pub use backtrace::Frame;
-pub use backtrace::Symbol;

src/backtrace/backtrace_rs.rs

@@ -32,7 +32,11 @@ pub trait Frame: Sized + Clone {
     type S: Symbol;
 
     fn resolve_symbol<F: FnMut(&Self::S)>(&self, cb: F);
+
+    #[allow(dead_code)]
     fn symbol_address(&self) -> *mut c_void;
+
+    #[allow(dead_code)]
     fn ip(&self) -> usize;
 }