From c0fcd755f89a410ba831b95ad877c0c2d47e7fe8 Mon Sep 17 00:00:00 2001
From: lucasliang <nkcs_lykx@hotmail.com>
Date: Thu, 5 Dec 2024 17:49:44 +0800
Subject: [PATCH] *: upgrade pprof to 0.14 to fix
 https://github.com/rusticata/pcap-parser/issues/46.

Signed-off-by: lucasliang <nkcs_lykx@hotmail.com>
---
 Cargo.lock                               | 48 +++++++++++++++++-------
 Cargo.toml                               |  5 ++-
 components/compact-log-backup/Cargo.toml | 24 +++++++++---
 3 files changed, 55 insertions(+), 22 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 59324a44902..4745e6838b8 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -73,6 +73,15 @@ dependencies = [
  "memchr",
 ]
 
+[[package]]
+name = "aligned-vec"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7e0966165eaf052580bd70eb1b32cb3d6245774c0104d1b2793e9650bf83b52a"
+dependencies = [
+ "equator",
+]
+
 [[package]]
 name = "allocator-api2"
 version = "0.2.14"
@@ -2188,6 +2197,26 @@ dependencies = [
  "termcolor",
 ]
 
+[[package]]
+name = "equator"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c35da53b5a021d2484a7cc49b2ac7f2d840f8236a286f84202369bd338d761ea"
+dependencies = [
+ "equator-macro",
+]
+
+[[package]]
+name = "equator-macro"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3bf679796c0322556351f287a51b49e48f7c4986e727b5dd78c972d30e2e16cc"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.79",
+]
+
 [[package]]
 name = "equivalent"
 version = "1.0.1"
@@ -3145,7 +3174,7 @@ dependencies = [
  "httpdate",
  "itoa 1.0.1",
  "pin-project-lite",
- "socket2 0.4.7",
+ "socket2",
  "tokio",
  "tower-service",
  "tracing",
@@ -4604,10 +4633,11 @@ dependencies = [
 
 [[package]]
 name = "pprof"
-version = "0.13.0"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef5c97c51bd34c7e742402e216abdeb44d415fbe6ae41d56b114723e953711cb"
+checksum = "ebbe2f8898beba44815fdc9e5a4ae9c929e21c5dc29b0c774a15555f7f58d6d0"
 dependencies = [
+ "aligned-vec",
  "backtrace",
  "cfg-if 1.0.0",
  "findshlibs",
@@ -6118,16 +6148,6 @@ dependencies = [
  "cmake",
 ]
 
-[[package]]
-name = "socket2"
-version = "0.4.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02e2d2db9033d13a1567121ddd7a095ee144db4e1ca1b1bda3419bc0da294ebd"
-dependencies = [
- "libc 0.2.151",
- "winapi 0.3.9",
-]
-
 [[package]]
 name = "socket2"
 version = "0.5.7"
@@ -7416,7 +7436,7 @@ dependencies = [
  "parking_lot 0.12.1",
  "pin-project-lite",
  "signal-hook-registry",
- "socket2 0.5.7",
+ "socket2",
  "tokio-macros",
  "windows-sys 0.52.0",
 ]
diff --git a/Cargo.toml b/Cargo.toml
index aecf767227a..2bcdc7d9af1 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -131,7 +131,7 @@ paste = "1.0"
 pd_client = { workspace = true }
 pin-project = "1.0"
 pnet_datalink = "0.23"
-pprof = { version = "0.13", default-features = false, features = [
+pprof = { version = "0.14", default-features = false, features = [
   "flamegraph",
   "protobuf-codec",
 ] }
@@ -244,7 +244,8 @@ members = [
   "components/cloud/azure",
   "components/cloud/gcp",
   "components/codec",
-  "components/collections", "components/compact-log-backup",
+  "components/collections",
+  "components/compact-log-backup",
   "components/concurrency_manager",
   "components/coprocessor_plugin_api",
   "components/crossbeam-skiplist",
diff --git a/components/compact-log-backup/Cargo.toml b/components/compact-log-backup/Cargo.toml
index 25f630a5008..65de6a80fff 100644
--- a/components/compact-log-backup/Cargo.toml
+++ b/components/compact-log-backup/Cargo.toml
@@ -8,7 +8,11 @@ edition = "2021"
 failpoints = ["fail/failpoints"]
 
 [dependencies]
-async-compression = { version = "0.4.12", features = ["tokio", "futures-io", "zstd"] }
+async-compression = { version = "0.4.12", features = [
+  "tokio",
+  "futures-io",
+  "zstd",
+] }
 bytes = "1"
 chrono = { workspace = true }
 codec = { workspace = true }
@@ -28,17 +32,25 @@ keys = { workspace = true }
 kvproto = { workspace = true }
 lazy_static = "1.4"
 pin-project = "1.0"
-prometheus = { version = "0.13", default-features = false, features = ["nightly"] }
+prometheus = { version = "0.13", default-features = false, features = [
+  "nightly",
+] }
 protobuf = { version = "2.8", features = ["bytes"] }
 serde = "1.0"
 serde_json = "1.0"
 slog = { workspace = true }
-slog-global ={ workspace = true }
+slog-global = { workspace = true }
 thiserror = "1"
 tidb_query_datatype = { workspace = true }
 tikv_alloc = { workspace = true }
 tikv_util = { workspace = true }
-tokio = { version = "1.5", features = ["rt-multi-thread", "macros", "time", "sync", "signal"] }
+tokio = { version = "1.5", features = [
+  "rt-multi-thread",
+  "macros",
+  "time",
+  "sync",
+  "signal",
+] }
 tokio-stream = "0.1"
 tokio-util = { version = "0.7", features = ["compat"] }
 tracing = { workspace = true }
@@ -49,9 +61,9 @@ txn_types = { workspace = true }
 zstd = "0.11"
 
 [dev-dependencies]
-pprof = { version = "0.13", default-features = false, features = [
+pprof = { version = "0.14", default-features = false, features = [
   "flamegraph",
   "protobuf-codec",
-] } 
+] }
 tempdir = "0.3"
 test_util = { workspace = true }