diff --git a/Cargo.lock b/Cargo.lock
index 2e84e822497b4..dbe6e48ee8408 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -224,7 +224,7 @@ dependencies = [
  "snap",
  "strum 0.25.0",
  "strum_macros 0.25.3",
- "thiserror",
+ "thiserror 1.0.68",
  "typed-builder 0.16.2",
  "uuid",
  "xz2",
@@ -250,7 +250,7 @@ dependencies = [
  "serde_json",
  "strum 0.26.3",
  "strum_macros 0.26.4",
- "thiserror",
+ "thiserror 1.0.68",
  "typed-builder 0.19.1",
  "uuid",
 ]
@@ -273,7 +273,7 @@ dependencies = [
  "serde_json",
  "strum 0.26.3",
  "strum_macros 0.26.4",
- "thiserror",
+ "thiserror 1.0.68",
  "typed-builder 0.18.2",
  "uuid",
 ]
@@ -287,7 +287,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "serde_json",
- "syn 2.0.79",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -906,7 +906,7 @@ dependencies = [
  "arrow-schema 53.2.0",
  "arrow-select 53.2.0",
  "futures-util",
- "thiserror",
+ "thiserror 1.0.68",
  "tokio",
  "tonic",
  "tracing",
@@ -1101,7 +1101,7 @@ dependencies = [
  "serde_json",
  "serde_nanos",
  "serde_repr",
- "thiserror",
+ "thiserror 1.0.68",
  "time",
  "tokio",
  "tokio-rustls 0.26.0",
@@ -1119,7 +1119,7 @@ checksum = "30c5ef0ede93efbf733c1a727f3b6b5a1060bbedd5600183e66f6e4be4af0ec5"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -1168,7 +1168,7 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -1185,7 +1185,7 @@ checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -1240,7 +1240,7 @@ dependencies = [
  "derive_utils",
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -1251,7 +1251,7 @@ checksum = "3c87f3f15e7794432337fc718554eaa4dc8f04c9677a950ffe366f20a162ae42"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -1376,7 +1376,7 @@ dependencies = [
  "base64 0.22.0",
  "chrono",
  "futures",
- "thiserror",
+ "thiserror 1.0.68",
  "url",
 ]
 
@@ -1994,7 +1994,7 @@ dependencies = [
  "byteorder",
  "libc",
  "socket2 0.4.9",
- "thiserror",
+ "thiserror 1.0.68",
 ]
 
 [[package]]
@@ -2087,7 +2087,7 @@ dependencies = [
  "regex",
  "rustc-hash",
  "shlex",
- "syn 2.0.79",
+ "syn 2.0.87",
  "which",
 ]
 
@@ -2222,7 +2222,7 @@ dependencies = [
  "proc-macro-crate 3.1.0",
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.87",
  "syn_derive",
 ]
 
@@ -2511,7 +2511,7 @@ checksum = "bc7cb2538d4ecc42b6c3b57a83094d8c69894e74468d18cd045a09fdea807358"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -2660,7 +2660,7 @@ dependencies = [
  "heck 0.4.1",
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -2685,7 +2685,7 @@ dependencies = [
  "sealed 0.4.0",
  "serde",
  "static_assertions",
- "thiserror",
+ "thiserror 1.0.68",
  "time",
  "tokio",
  "url",
@@ -2857,7 +2857,7 @@ dependencies = [
  "itertools 0.12.1",
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -3115,7 +3115,7 @@ dependencies = [
  "proc-macro-error 1.0.4",
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -3366,7 +3366,7 @@ checksum = "83fdaf97f4804dcebfa5862639bc9ce4121e82140bec2a987ac5140294865b5b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -3438,7 +3438,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "strsim 0.11.1",
- "syn 2.0.79",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -3471,7 +3471,7 @@ checksum = "733cabb43482b1a1b53eee8583c2b9e8684d592215ea83efd305dd31bc2f0178"
 dependencies = [
  "darling_core 0.20.9",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -3960,7 +3960,7 @@ dependencies = [
  "serde",
  "serde_json",
  "strum 0.26.3",
- "thiserror",
+ "thiserror 1.0.68",
  "tracing",
  "url",
  "uuid",
@@ -3976,7 +3976,7 @@ checksum = "ec5c4fb5b59b1bd55ed8ebcf941f27a327d600c19a4a4103546846c358be93ff"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -4011,7 +4011,7 @@ dependencies = [
  "maplit",
  "object_store",
  "regex",
- "thiserror",
+ "thiserror 1.0.68",
  "tokio",
  "tracing",
  "url",
@@ -4075,7 +4075,7 @@ dependencies = [
  "serde",
  "serde_json",
  "sqlparser 0.51.0",
- "thiserror",
+ "thiserror 1.0.68",
  "tokio",
  "tracing",
  "url",
@@ -4097,7 +4097,7 @@ dependencies = [
  "lazy_static",
  "object_store",
  "regex",
- "thiserror",
+ "thiserror 1.0.68",
  "tokio",
  "tracing",
  "url",
@@ -4184,7 +4184,7 @@ dependencies = [
  "darling 0.20.9",
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -4204,7 +4204,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "206868b8242f27cecce124c19fd88157fbd0dd334df2587f36417bafbc85097b"
 dependencies = [
  "derive_builder_core 0.20.0",
- "syn 2.0.79",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -4228,7 +4228,7 @@ checksum = "61bb5a1014ce6dfc2a378578509abe775a5aa06bff584a547555d9efdb81b926"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -4240,7 +4240,7 @@ dependencies = [
  "console",
  "shell-words",
  "tempfile",
- "thiserror",
+ "thiserror 1.0.68",
  "zeroize",
 ]
 
@@ -4386,7 +4386,7 @@ dependencies = [
  "chrono",
  "rust_decimal",
  "serde",
- "thiserror",
+ "thiserror 1.0.68",
  "time",
  "winnow 0.6.11",
 ]
@@ -4463,7 +4463,7 @@ dependencies = [
  "enum-ordinalize",
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -4585,7 +4585,7 @@ dependencies = [
  "heck 0.4.1",
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -4625,7 +4625,7 @@ checksum = "a1ab991c1362ac86c61ab6f556cff143daa22e5a15e4e189df818b2fd19fe65b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -4645,7 +4645,7 @@ checksum = "0d28318a75d4aead5c4db25382e8ef717932d0346600cacae6357eb5941bc5ff"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -4665,7 +4665,7 @@ checksum = "f95e2801cd355d4a1a3e3953ce6ee5ae9603a5c833455343a8bfe3f44d418246"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -4830,7 +4830,7 @@ dependencies = [
  "proc-macro-error 1.0.4",
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -5170,7 +5170,7 @@ dependencies = [
  "pin-project",
  "rand",
  "serde",
- "thiserror",
+ "thiserror 1.0.68",
  "tracing",
  "twox-hash",
  "zstd 0.13.0",
@@ -5207,7 +5207,7 @@ checksum = "b0fa992f1656e1707946bbba340ad244f0814009ef8c0118eb7b658395f19a2e"
 dependencies = [
  "frunk_proc_macro_helpers",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -5219,7 +5219,7 @@ dependencies = [
  "frunk_core",
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -5231,7 +5231,7 @@ dependencies = [
  "frunk_core",
  "frunk_proc_macro_helpers",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -5344,7 +5344,7 @@ checksum = "5ac45ed0bddbd110eb68862768a194f88700f5b91c39931d2f432fab67a16d08"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -5412,7 +5412,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -5499,7 +5499,7 @@ dependencies = [
  "reqwest 0.11.20",
  "serde",
  "serde_json",
- "thiserror",
+ "thiserror 1.0.68",
  "time",
  "tokio",
  "tokio-stream 0.1.16",
@@ -5590,7 +5590,7 @@ dependencies = [
  "anyhow",
  "async-trait",
  "http 1.1.0",
- "thiserror",
+ "thiserror 1.0.68",
  "tokio",
  "tonic",
  "tower 0.4.13",
@@ -5631,7 +5631,7 @@ dependencies = [
  "reqwest 0.12.4",
  "serde",
  "serde_json",
- "thiserror",
+ "thiserror 1.0.68",
  "time",
  "tokio",
  "tracing",
@@ -5659,7 +5659,7 @@ dependencies = [
  "reqwest-middleware",
  "serde",
  "serde_json",
- "thiserror",
+ "thiserror 1.0.68",
  "time",
  "tokio",
  "tracing",
@@ -5673,7 +5673,7 @@ checksum = "9c3eaaad103912825594d674a4b1e556ccbb05a13a6cac17dcfd871997fb760a"
 dependencies = [
  "google-cloud-token",
  "http 1.1.0",
- "thiserror",
+ "thiserror 1.0.68",
  "tokio",
  "tokio-retry",
  "tonic",
@@ -5699,7 +5699,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "04f945a208886a13d07636f38fb978da371d0abc3e34bad338124b9f8c135a8f"
 dependencies = [
  "reqwest 0.12.4",
- "thiserror",
+ "thiserror 1.0.68",
  "tokio",
 ]
 
@@ -5716,7 +5716,7 @@ dependencies = [
  "google-cloud-googleapis",
  "google-cloud-token",
  "prost-types 0.13.1",
- "thiserror",
+ "thiserror 1.0.68",
  "tokio",
  "tokio-util",
  "tracing",
@@ -6485,7 +6485,7 @@ checksum = "ce243b1bfa62ffc028f1cc3b6034ec63d649f3031bc8a4fbbb004e1ac17d1f68"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -6700,7 +6700,7 @@ dependencies = [
  "jni-sys",
  "libloading",
  "log",
- "thiserror",
+ "thiserror 1.0.68",
  "walkdir",
  "windows-sys 0.45.0",
 ]
@@ -7115,7 +7115,7 @@ checksum = "04e542a18c94a9b6fcc7adb090fa3ba6b79ee220a16404f325672729f32a66ff"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -7177,7 +7177,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "regex-syntax 0.8.5",
- "syn 2.0.79",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -7343,7 +7343,7 @@ dependencies = [
  "serde_json",
  "slab",
  "spin 0.9.8",
- "thiserror",
+ "thiserror 1.0.68",
  "tokio",
  "tracing",
 ]
@@ -7385,7 +7385,7 @@ dependencies = [
  "proc-macro2",
  "prost-build 0.13.1",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.87",
  "tonic-build",
 ]
 
@@ -7459,7 +7459,7 @@ dependencies = [
  "bytes",
  "rust_decimal",
  "serde",
- "thiserror",
+ "thiserror 1.0.68",
 ]
 
 [[package]]
@@ -7512,7 +7512,7 @@ dependencies = [
  "prometheus",
  "sealed 0.5.0",
  "smallvec",
- "thiserror",
+ "thiserror 1.0.68",
 ]
 
 [[package]]
@@ -7536,7 +7536,7 @@ checksum = "4edc8853320c2a0dab800fbda86253c8938f6ea88510dc92c5f1ed20e794afc1"
 dependencies = [
  "cfg-if",
  "miette-derive",
- "thiserror",
+ "thiserror 1.0.68",
  "unicode-width",
 ]
 
@@ -7548,7 +7548,7 @@ checksum = "dcf09caffaac8068c346b6df2a7fc27a177fd20b39421a39ce0a211bde679a6c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -7669,7 +7669,7 @@ dependencies = [
  "rustc_version 0.4.0",
  "smallvec",
  "tagptr",
- "thiserror",
+ "thiserror 1.0.68",
  "triomphe",
  "uuid",
 ]
@@ -7710,7 +7710,7 @@ dependencies = [
  "stringprep",
  "strsim 0.10.0",
  "take_mut",
- "thiserror",
+ "thiserror 1.0.68",
  "tokio",
  "tokio-rustls 0.24.1",
  "tokio-util",
@@ -7761,9 +7761,9 @@ dependencies = [
  "proc-macro-error 1.0.4",
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.87",
  "termcolor",
- "thiserror",
+ "thiserror 1.0.68",
 ]
 
 [[package]]
@@ -7792,7 +7792,7 @@ dependencies = [
  "serde",
  "serde_json",
  "socket2 0.5.6",
- "thiserror",
+ "thiserror 1.0.68",
  "tokio",
  "tokio-native-tls",
  "tokio-util",
@@ -7834,7 +7834,7 @@ dependencies = [
  "sha2",
  "smallvec",
  "subprocess",
- "thiserror",
+ "thiserror 1.0.68",
  "time",
  "uuid",
  "zstd 0.13.0",
@@ -8196,7 +8196,7 @@ dependencies = [
  "serde_json",
  "serde_path_to_error",
  "sha2",
- "thiserror",
+ "thiserror 1.0.68",
  "url",
 ]
 
@@ -8360,7 +8360,7 @@ dependencies = [
  "serde_with 3.8.1",
  "sha2",
  "subtle",
- "thiserror",
+ "thiserror 1.0.68",
  "url",
 ]
 
@@ -8407,7 +8407,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -8449,7 +8449,7 @@ dependencies = [
  "js-sys",
  "once_cell",
  "pin-project-lite",
- "thiserror",
+ "thiserror 1.0.68",
 ]
 
 [[package]]
@@ -8465,7 +8465,7 @@ dependencies = [
  "opentelemetry-proto",
  "opentelemetry_sdk",
  "prost 0.13.1",
- "thiserror",
+ "thiserror 1.0.68",
  "tokio",
  "tonic",
 ]
@@ -8504,7 +8504,7 @@ dependencies = [
  "percent-encoding",
  "rand",
  "serde_json",
- "thiserror",
+ "thiserror 1.0.68",
  "tokio",
  "tokio-stream 0.1.16",
 ]
@@ -8607,7 +8607,7 @@ dependencies = [
  "proc-macro2",
  "proc-macro2-diagnostics",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -8819,7 +8819,7 @@ dependencies = [
  "regex",
  "regex-syntax 0.8.5",
  "structmeta",
- "syn 2.0.79",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -8978,7 +8978,7 @@ dependencies = [
  "serde_json",
  "socket2 0.5.6",
  "tempfile",
- "thiserror",
+ "thiserror 2.0.0",
  "thiserror-ext",
  "tokio-openssl",
  "tokio-postgres",
@@ -9042,7 +9042,7 @@ checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -9204,7 +9204,7 @@ dependencies = [
  "heck 0.4.1",
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -9278,7 +9278,7 @@ dependencies = [
  "smallvec",
  "symbolic-demangle",
  "tempfile",
- "thiserror",
+ "thiserror 1.0.68",
 ]
 
 [[package]]
@@ -9362,7 +9362,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ae005bd773ab59b4725093fd7df83fd7892f7d8eafb48dbd7de6e024e4215f9d"
 dependencies = [
  "proc-macro2",
- "syn 2.0.79",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -9466,7 +9466,7 @@ checksum = "af066a9c399a26e020ada66a034357a868728e72cd426f3adcd35f80d88d88c8"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.87",
  "version_check",
  "yansi 1.0.1",
 ]
@@ -9520,7 +9520,7 @@ dependencies = [
  "parking_lot 0.12.1",
  "procfs 0.14.2",
  "protobuf",
- "thiserror",
+ "thiserror 1.0.68",
 ]
 
 [[package]]
@@ -9606,7 +9606,7 @@ dependencies = [
  "prost 0.13.1",
  "prost-types 0.13.1",
  "regex",
- "syn 2.0.79",
+ "syn 2.0.87",
  "tempfile",
 ]
 
@@ -9633,7 +9633,7 @@ dependencies = [
  "itertools 0.12.1",
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -9646,7 +9646,7 @@ dependencies = [
  "itertools 0.13.0",
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -9655,7 +9655,7 @@ version = "0.1.0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -9710,7 +9710,7 @@ dependencies = [
  "prost-reflect",
  "prost-types 0.13.1",
  "protox-parse",
- "thiserror",
+ "thiserror 1.0.68",
 ]
 
 [[package]]
@@ -9722,7 +9722,7 @@ dependencies = [
  "logos",
  "miette",
  "prost-types 0.13.1",
- "thiserror",
+ "thiserror 1.0.68",
 ]
 
 [[package]]
@@ -9839,7 +9839,7 @@ dependencies = [
  "proc-macro2",
  "pyo3-macros-backend",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -9852,7 +9852,7 @@ dependencies = [
  "proc-macro2",
  "pyo3-build-config",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -10087,7 +10087,7 @@ checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4"
 dependencies = [
  "getrandom",
  "libredox 0.0.1",
- "thiserror",
+ "thiserror 1.0.68",
 ]
 
 [[package]]
@@ -10107,7 +10107,7 @@ checksum = "7f7473c2cfcf90008193dd0e3e16599455cb601a9fce322b5bb55de799664925"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -10319,7 +10319,7 @@ dependencies = [
  "http 1.1.0",
  "reqwest 0.12.4",
  "serde",
- "thiserror",
+ "thiserror 1.0.68",
  "tower-service",
 ]
 
@@ -10450,7 +10450,7 @@ dependencies = [
  "prettyplease 0.2.15",
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -10471,7 +10471,7 @@ dependencies = [
  "risingwave_pb",
  "serde",
  "serde_json",
- "thiserror",
+ "thiserror 2.0.0",
  "twox-hash",
 ]
 
@@ -10521,7 +10521,7 @@ dependencies = [
  "scopeguard",
  "serde_json",
  "tempfile",
- "thiserror",
+ "thiserror 2.0.0",
  "thiserror-ext",
  "tikv-jemallocator",
  "tokio-metrics",
@@ -10728,7 +10728,7 @@ dependencies = [
  "strum_macros 0.26.4",
  "sysinfo",
  "tempfile",
- "thiserror",
+ "thiserror 2.0.0",
  "thiserror-ext",
  "tinyvec",
  "tokio-retry",
@@ -10770,7 +10770,7 @@ dependencies = [
  "madsim-tokio",
  "parking_lot 0.12.1",
  "risingwave_common",
- "thiserror",
+ "thiserror 2.0.0",
  "thiserror-ext",
  "tikv-jemalloc-ctl",
  "tracing",
@@ -10837,7 +10837,7 @@ dependencies = [
  "prost 0.13.1",
  "risingwave_pb",
  "serde",
- "thiserror",
+ "thiserror 1.0.68",
  "thiserror-ext",
  "tracing",
 ]
@@ -10858,7 +10858,7 @@ dependencies = [
  "risingwave_pb",
  "risingwave_rpc_client",
  "serde",
- "thiserror",
+ "thiserror 2.0.0",
  "thiserror-ext",
  "tower 0.5.0",
  "tower-http",
@@ -11076,9 +11076,9 @@ dependencies = [
  "sqlx",
  "strum 0.26.3",
  "strum_macros 0.26.4",
- "syn 2.0.79",
+ "syn 2.0.87",
  "tempfile",
- "thiserror",
+ "thiserror 2.0.0",
  "thiserror-ext",
  "tiberius",
  "time",
@@ -11124,7 +11124,7 @@ dependencies = [
  "risingwave_pb",
  "rust_decimal",
  "serde_json",
- "thiserror",
+ "thiserror 2.0.0",
  "thiserror-ext",
  "time",
  "tracing",
@@ -11191,7 +11191,7 @@ dependencies = [
  "risingwave_pb",
  "rw_futures_util",
  "tempfile",
- "thiserror",
+ "thiserror 2.0.0",
  "thiserror-ext",
  "tracing",
  "workspace-hack",
@@ -11223,7 +11223,7 @@ dependencies = [
  "madsim-tonic",
  "serde",
  "serde-error",
- "thiserror",
+ "thiserror 2.0.0",
  "thiserror-ext",
  "tracing",
 ]
@@ -11261,7 +11261,7 @@ dependencies = [
  "risingwave_pb",
  "smallvec",
  "static_assertions",
- "thiserror",
+ "thiserror 2.0.0",
  "thiserror-ext",
  "tracing",
  "workspace-hack",
@@ -11314,7 +11314,7 @@ dependencies = [
  "sha2",
  "smallvec",
  "sql-json-path",
- "thiserror",
+ "thiserror 2.0.0",
  "thiserror-ext",
  "tonic",
  "tracing",
@@ -11329,7 +11329,7 @@ dependencies = [
  "itertools 0.13.0",
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -11407,7 +11407,7 @@ dependencies = [
  "smallvec",
  "speedate",
  "tempfile",
- "thiserror",
+ "thiserror 2.0.0",
  "thiserror-ext",
  "tokio-postgres",
  "tokio-stream 0.1.15",
@@ -11423,7 +11423,7 @@ version = "2.2.0-alpha"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -11497,7 +11497,7 @@ dependencies = [
  "risingwave_common",
  "risingwave_hummock_sdk",
  "risingwave_pb",
- "thiserror",
+ "thiserror 1.0.68",
  "tracing",
 ]
 
@@ -11550,7 +11550,7 @@ dependencies = [
  "rw_futures_util",
  "serde",
  "serde_json",
- "thiserror",
+ "thiserror 2.0.0",
  "thiserror-ext",
  "tracing",
 ]
@@ -11565,7 +11565,7 @@ dependencies = [
  "risingwave_pb",
  "risingwave_telemetry_event",
  "serde",
- "thiserror",
+ "thiserror 2.0.0",
  "thiserror-ext",
  "tracing",
 ]
@@ -11654,7 +11654,7 @@ dependencies = [
  "strum 0.26.3",
  "sync-point",
  "tempfile",
- "thiserror",
+ "thiserror 2.0.0",
  "thiserror-ext",
  "tokio-retry",
  "tokio-stream 0.1.15",
@@ -11806,7 +11806,7 @@ dependencies = [
  "risingwave_common",
  "risingwave_jni_core",
  "spin 0.9.8",
- "thiserror",
+ "thiserror 2.0.0",
  "thiserror-ext",
  "tokio-retry",
  "tracing",
@@ -11828,7 +11828,7 @@ dependencies = [
  "risingwave_error",
  "serde",
  "strum 0.26.3",
- "thiserror",
+ "thiserror 2.0.0",
  "walkdir",
  "workspace-hack",
 ]
@@ -11893,7 +11893,7 @@ dependencies = [
  "risingwave_pb",
  "rw_futures_util",
  "static_assertions",
- "thiserror",
+ "thiserror 2.0.0",
  "thiserror-ext",
  "tokio-retry",
  "tokio-stream 0.1.15",
@@ -12002,7 +12002,7 @@ dependencies = [
  "serde",
  "serde_with 3.8.1",
  "serde_yaml",
- "thiserror",
+ "thiserror 2.0.0",
  "tracing",
  "tracing-subscriber",
  "walkdir",
@@ -12119,7 +12119,7 @@ dependencies = [
  "spin 0.9.8",
  "sync-point",
  "tempfile",
- "thiserror",
+ "thiserror 2.0.0",
  "thiserror-ext",
  "tokio-retry",
  "tracing",
@@ -12189,7 +12189,7 @@ dependencies = [
  "static_assertions",
  "strum 0.26.3",
  "strum_macros 0.26.4",
- "thiserror",
+ "thiserror 2.0.0",
  "thiserror-ext",
  "tokio-metrics",
  "tokio-retry",
@@ -12208,7 +12208,7 @@ dependencies = [
  "prost 0.13.1",
  "reqwest 0.12.4",
  "risingwave_pb",
- "thiserror",
+ "thiserror 2.0.0",
  "thiserror-ext",
  "tracing",
  "uuid",
@@ -12352,7 +12352,7 @@ dependencies = [
  "rustls-native-certs 0.7.0",
  "rustls-pemfile 2.2.0",
  "rustls-webpki 0.102.2",
- "thiserror",
+ "thiserror 1.0.68",
  "tokio",
  "tokio-rustls 0.25.0",
  "url",
@@ -12379,7 +12379,7 @@ dependencies = [
  "quote",
  "rust-embed-utils",
  "shellexpand 3.1.0",
- "syn 2.0.79",
+ "syn 2.0.87",
  "walkdir",
 ]
 
@@ -12788,7 +12788,7 @@ dependencies = [
  "proc-macro-error 1.0.4",
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -12812,7 +12812,7 @@ dependencies = [
  "serde_json",
  "sqlx",
  "strum 0.26.3",
- "thiserror",
+ "thiserror 1.0.68",
  "time",
  "tracing",
  "url",
@@ -12846,7 +12846,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "sea-bae",
- "syn 2.0.79",
+ "syn 2.0.87",
  "unicode-ident",
 ]
 
@@ -12910,8 +12910,8 @@ dependencies = [
  "heck 0.4.1",
  "proc-macro2",
  "quote",
- "syn 2.0.79",
- "thiserror",
+ "syn 2.0.87",
+ "thiserror 1.0.68",
 ]
 
 [[package]]
@@ -12936,7 +12936,7 @@ dependencies = [
  "heck 0.4.1",
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -12966,7 +12966,7 @@ dependencies = [
  "heck 0.4.1",
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -13099,7 +13099,7 @@ dependencies = [
  "darling 0.20.9",
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -13110,7 +13110,7 @@ checksum = "24008e81ff7613ed8e5ba0cfaf24e2c2f1e5b8a0495711e44fcd4882fca62bcf"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -13185,7 +13185,7 @@ checksum = "8725e1dfadb3a50f7e5ce0b1a540466f6ed3fe7a0fca2ac2b8b831d31316bd00"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -13258,7 +13258,7 @@ dependencies = [
  "darling 0.20.9",
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -13296,7 +13296,7 @@ checksum = "a9bb72430492e9549b0c4596725c0f82729bff861c45aa8099c0a8e67fc3b721"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -13484,7 +13484,7 @@ checksum = "adc4e5204eb1910f40f9cfa375f6f05b68c3abac4b6fd879c8ff5e7ae8a0a085"
 dependencies = [
  "num-bigint",
  "num-traits",
- "thiserror",
+ "thiserror 1.0.68",
  "time",
 ]
 
@@ -13658,7 +13658,7 @@ dependencies = [
  "nom",
  "regex",
  "serde_json",
- "thiserror",
+ "thiserror 1.0.68",
 ]
 
 [[package]]
@@ -13692,7 +13692,7 @@ dependencies = [
  "similar",
  "subst",
  "tempfile",
- "thiserror",
+ "thiserror 1.0.68",
  "tracing",
 ]
 
@@ -13723,7 +13723,7 @@ checksum = "01b2e185515564f15375f593fb966b5718bc624ba77fe49fa4616ad619690554"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -13774,7 +13774,7 @@ dependencies = [
  "sha2",
  "smallvec",
  "sqlformat",
- "thiserror",
+ "thiserror 1.0.68",
  "time",
  "tokio-stream 0.1.16",
  "tracing",
@@ -13791,7 +13791,7 @@ dependencies = [
  "quote",
  "sqlx-core",
  "sqlx-macros-core",
- "syn 2.0.79",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -13814,7 +13814,7 @@ dependencies = [
  "sqlx-mysql",
  "sqlx-postgres",
  "sqlx-sqlite",
- "syn 2.0.79",
+ "syn 2.0.87",
  "tempfile",
  "url",
 ]
@@ -13858,7 +13858,7 @@ dependencies = [
  "smallvec",
  "sqlx-core",
  "stringprep",
- "thiserror",
+ "thiserror 1.0.68",
  "time",
  "tracing",
  "uuid",
@@ -13901,7 +13901,7 @@ dependencies = [
  "smallvec",
  "sqlx-core",
  "stringprep",
- "thiserror",
+ "thiserror 1.0.68",
  "time",
  "tracing",
  "uuid",
@@ -13996,7 +13996,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "structmeta-derive",
- "syn 2.0.79",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -14007,7 +14007,7 @@ checksum = "152a0b65a590ff6c3da95cabe2353ee04e6167c896b28e3b14478c2636c922fc"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -14035,7 +14035,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "rustversion",
- "syn 2.0.79",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -14048,7 +14048,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "rustversion",
- "syn 2.0.79",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -14113,9 +14113,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.79"
+version = "2.0.87"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590"
+checksum = "25aa4ce346d03a6dcd68dd8b4010bcb74e54e62c90c573f394c46eae99aba32d"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -14142,7 +14142,7 @@ dependencies = [
  "proc-macro-error 1.0.4",
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -14152,7 +14152,7 @@ dependencies = [
  "futures-util",
  "madsim-tokio",
  "spin 0.9.8",
- "thiserror",
+ "thiserror 2.0.0",
 ]
 
 [[package]]
@@ -14265,11 +14265,20 @@ checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76"
 
 [[package]]
 name = "thiserror"
-version = "1.0.63"
+version = "1.0.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724"
+checksum = "02dd99dc800bbb97186339685293e1cc5d9df1f8fae2d0aecd9ff1c77efea892"
 dependencies = [
- "thiserror-impl",
+ "thiserror-impl 1.0.68",
+]
+
+[[package]]
+name = "thiserror"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "15291287e9bff1bc6f9ff3409ed9af665bec7a5fc8ac079ea96be07bca0e2668"
+dependencies = [
+ "thiserror-impl 2.0.0",
 ]
 
 [[package]]
@@ -14278,7 +14287,7 @@ version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a7c19760dc47062bca5c1b3699b032111c93802d51ac47660db11b08afc6bad2"
 dependencies = [
- "thiserror",
+ "thiserror 1.0.68",
  "thiserror-ext-derive",
 ]
 
@@ -14291,18 +14300,29 @@ dependencies = [
  "either",
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.87",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "1.0.68"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a7c61ec9a6f64d2793d8a45faba21efbe3ced62a886d44c36a009b2b519b4c7e"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.87",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.63"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261"
+checksum = "22efd00f33f93fa62848a7cab956c3d38c8d43095efda1decfc2b3a5dc0b8972"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -14368,7 +14388,7 @@ dependencies = [
  "rust_decimal",
  "rustls-native-certs 0.6.3",
  "rustls-pemfile 1.0.4",
- "thiserror",
+ "thiserror 1.0.68",
  "time",
  "tokio",
  "tokio-rustls 0.24.1",
@@ -14500,7 +14520,7 @@ checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -14754,7 +14774,7 @@ dependencies = [
  "proc-macro2",
  "prost-build 0.13.1",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -14850,7 +14870,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -15008,7 +15028,7 @@ dependencies = [
  "log",
  "rand",
  "smallvec",
- "thiserror",
+ "thiserror 1.0.68",
  "tinyvec",
  "tokio",
  "url",
@@ -15032,7 +15052,7 @@ dependencies = [
  "once_cell",
  "rand",
  "smallvec",
- "thiserror",
+ "thiserror 1.0.68",
  "tinyvec",
  "tokio",
  "tracing",
@@ -15054,7 +15074,7 @@ dependencies = [
  "parking_lot 0.12.1",
  "resolv-conf",
  "smallvec",
- "thiserror",
+ "thiserror 1.0.68",
  "tokio",
  "trust-dns-proto 0.21.2",
 ]
@@ -15074,7 +15094,7 @@ dependencies = [
  "rand",
  "resolv-conf",
  "smallvec",
- "thiserror",
+ "thiserror 1.0.68",
  "tokio",
  "tracing",
  "trust-dns-proto 0.23.2",
@@ -15163,7 +15183,7 @@ checksum = "f03ca4cb38206e2bef0700092660bb74d696f808514dae47fa1467cbfe26e96e"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -15174,7 +15194,7 @@ checksum = "1f718dfaf347dcb5b983bfc87608144b0bad87970aebcbea5ce44d2a30c08e63"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -15185,7 +15205,7 @@ checksum = "f9534daa9fd3ed0bd911d462a37f172228077e7abf18c18a5f67199d959205f8"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -15196,7 +15216,7 @@ checksum = "560b82d656506509d43abe30e0ba64c56b1953ab3d4fe7ba5902747a7a3cedd5"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -15399,7 +15419,7 @@ checksum = "d674d135b4a8c1d7e813e2f8d1c9a58308aee4a680323066025e53132218bd91"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -15467,7 +15487,7 @@ dependencies = [
  "once_cell",
  "rustix 0.38.37",
  "system-interface",
- "thiserror",
+ "thiserror 1.0.68",
  "tracing",
  "wasmtime",
  "wiggle",
@@ -15501,7 +15521,7 @@ dependencies = [
  "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.87",
  "wasm-bindgen-shared",
 ]
 
@@ -15535,7 +15555,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.87",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
@@ -15695,7 +15715,7 @@ dependencies = [
  "anyhow",
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.87",
  "wasmtime-component-util",
  "wasmtime-wit-bindgen",
  "wit-parser",
@@ -15725,7 +15745,7 @@ dependencies = [
  "log",
  "object 0.36.4",
  "target-lexicon",
- "thiserror",
+ "thiserror 1.0.68",
  "wasmparser",
  "wasmtime-environ",
  "wasmtime-versioned-export-macros",
@@ -15822,7 +15842,7 @@ checksum = "455fc30062a08ba6a9c2ccc6e8c76ea2759d01324d3548324f5d38257d0e8d96"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -15964,7 +15984,7 @@ dependencies = [
  "anyhow",
  "async-trait",
  "bitflags 2.6.0",
- "thiserror",
+ "thiserror 1.0.68",
  "tracing",
  "wasmtime",
  "wiggle-macro",
@@ -15981,7 +16001,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "shellexpand 2.1.2",
- "syn 2.0.79",
+ "syn 2.0.87",
  "witx",
 ]
 
@@ -15993,7 +16013,7 @@ checksum = "cc26129a8aea20b62c961d1b9ab4a3c3b56b10042ed85d004f8678af0f21ba6e"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.87",
  "wiggle-generate",
 ]
 
@@ -16103,7 +16123,7 @@ checksum = "9107ddc059d5b6fbfbffdfa7a7fe3e22a226def0b2608f72e9d552763d3e1ad7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -16114,7 +16134,7 @@ checksum = "29bee4b38ea3cde66011baa44dba677c432a78593e202392d1e9070cf2a7fca7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -16412,7 +16432,7 @@ version = "2.2.0-alpha"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -16423,7 +16443,7 @@ checksum = "e366f27a5cabcddb2706a78296a40b8fcc451e1a6aba2fc1d94b4a01bdaaef4b"
 dependencies = [
  "anyhow",
  "log",
- "thiserror",
+ "thiserror 1.0.68",
  "wast 35.0.2",
 ]
 
@@ -16555,7 +16575,7 @@ checksum = "b3c129550b3e6de3fd0ba67ba5c81818f9805e58b8d7fee80a3a59d2c9fc601a"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.87",
 ]
 
 [[package]]
diff --git a/src/batch/Cargo.toml b/src/batch/Cargo.toml
index ee6f757e17376..fa56627e40fc1 100644
--- a/src/batch/Cargo.toml
+++ b/src/batch/Cargo.toml
@@ -51,7 +51,7 @@ rust_decimal = "1"
 rw_futures_util = { workspace = true }
 scopeguard = "1"
 serde_json = "1"
-thiserror = "1"
+thiserror = "2"
 thiserror-ext = { workspace = true }
 tokio = { version = "0.2", package = "madsim-tokio", features = [
     "rt",
diff --git a/src/common/Cargo.toml b/src/common/Cargo.toml
index 4b002bd8084c6..38d9ad78e93d2 100644
--- a/src/common/Cargo.toml
+++ b/src/common/Cargo.toml
@@ -103,7 +103,7 @@ static_assertions = "1"
 strum = "0.26"
 strum_macros = "0.26"
 sysinfo = { version = "0.32", default-features = false, features = ["system"] }
-thiserror = "1"
+thiserror = "2"
 thiserror-ext = { workspace = true }
 tinyvec = { version = "1", features = ["rustc_1_55", "grab_spare_slice"] }
 tokio = { version = "0.2", package = "madsim-tokio", features = [
diff --git a/src/common/common_service/Cargo.toml b/src/common/common_service/Cargo.toml
index 37775ff04a82b..71f12e501961b 100644
--- a/src/common/common_service/Cargo.toml
+++ b/src/common/common_service/Cargo.toml
@@ -25,7 +25,7 @@ risingwave_common = { workspace = true }
 risingwave_pb = { workspace = true }
 risingwave_rpc_client = { workspace = true }
 serde = { version = "1", features = ["derive"] }
-thiserror = "1"
+thiserror = "2"
 thiserror-ext = { workspace = true }
 tokio = { version = "0.2", package = "madsim-tokio", features = ["rt", "rt-multi-thread", "sync", "macros", "time", "signal"] }
 tonic = { workspace = true }
diff --git a/src/common/heap_profiling/Cargo.toml b/src/common/heap_profiling/Cargo.toml
index 706f801fe4762..e52e033024f9c 100644
--- a/src/common/heap_profiling/Cargo.toml
+++ b/src/common/heap_profiling/Cargo.toml
@@ -22,7 +22,7 @@ chrono = { version = "0.4", default-features = false, features = [
 ] }
 parking_lot = { workspace = true }
 risingwave_common = { workspace = true }
-thiserror = "1"
+thiserror = "2"
 thiserror-ext = { workspace = true }
 tikv-jemalloc-ctl = { workspace = true }
 tokio = { version = "0.2", package = "madsim-tokio" }
diff --git a/src/common/telemetry_event/Cargo.toml b/src/common/telemetry_event/Cargo.toml
index 6007f1cdc3314..fcdb028639bda 100644
--- a/src/common/telemetry_event/Cargo.toml
+++ b/src/common/telemetry_event/Cargo.toml
@@ -18,7 +18,7 @@ jsonbb = { workspace = true }
 prost = { workspace = true }
 reqwest = { version = "0.12.2", features = ["json"] }
 risingwave_pb = { workspace = true }
-thiserror = "1"
+thiserror = "2"
 thiserror-ext = { workspace = true }
 tokio = { version = "0.2", package = "madsim-tokio", features = [
     "rt",
diff --git a/src/connector/Cargo.toml b/src/connector/Cargo.toml
index 3fe5499e41d08..9402fd3f30ac6 100644
--- a/src/connector/Cargo.toml
+++ b/src/connector/Cargo.toml
@@ -142,7 +142,7 @@ sqlx = { workspace = true }
 strum = "0.26"
 strum_macros = "0.26"
 tempfile = "3"
-thiserror = "1"
+thiserror = "2"
 
 thiserror-ext = { workspace = true }
 # To easiy get the type_name and impl IntoSql for rust_decimal, we fork the crate.
diff --git a/src/connector/codec/Cargo.toml b/src/connector/codec/Cargo.toml
index de5ce1dbae04a..73058d620da30 100644
--- a/src/connector/codec/Cargo.toml
+++ b/src/connector/codec/Cargo.toml
@@ -34,7 +34,7 @@ risingwave_common = { workspace = true }
 risingwave_pb = { workspace = true }
 rust_decimal = "1"
 serde_json = "1.0"
-thiserror = "1"
+thiserror = "2"
 thiserror-ext = { workspace = true }
 time = "0.3.30"
 tracing = "0.1"
diff --git a/src/dml/Cargo.toml b/src/dml/Cargo.toml
index df0ce4ebc19d6..e60101e0448d8 100644
--- a/src/dml/Cargo.toml
+++ b/src/dml/Cargo.toml
@@ -23,7 +23,7 @@ risingwave_common = { workspace = true }
 risingwave_connector = { workspace = true }
 risingwave_pb = { workspace = true }
 rw_futures_util = { workspace = true }
-thiserror = "1"
+thiserror = "2"
 thiserror-ext = { workspace = true }
 tokio = { version = "0.2", package = "madsim-tokio", features = [
     "rt",
diff --git a/src/error/Cargo.toml b/src/error/Cargo.toml
index 4a99711db6c41..33ccc674ff632 100644
--- a/src/error/Cargo.toml
+++ b/src/error/Cargo.toml
@@ -14,7 +14,7 @@ bytes = "1"
 easy-ext = "1"
 serde = "1"
 serde-error = "0.1"
-thiserror = "1"
+thiserror = "2"
 thiserror-ext = { workspace = true }
 tonic = { workspace = true }
 tracing = "0.1"
diff --git a/src/expr/core/Cargo.toml b/src/expr/core/Cargo.toml
index 6a8a82f414ee4..dedc6cb060a48 100644
--- a/src/expr/core/Cargo.toml
+++ b/src/expr/core/Cargo.toml
@@ -46,7 +46,7 @@ risingwave_expr_macro = { path = "../macro" }
 risingwave_pb = { workspace = true }
 smallvec = "1"
 static_assertions = "1"
-thiserror = "1"
+thiserror = "2"
 thiserror-ext = { workspace = true }
 tokio = { version = "0.2", package = "madsim-tokio", features = [
     "rt-multi-thread",
diff --git a/src/expr/impl/Cargo.toml b/src/expr/impl/Cargo.toml
index 257cf19b77e7d..9fffd19511c56 100644
--- a/src/expr/impl/Cargo.toml
+++ b/src/expr/impl/Cargo.toml
@@ -65,7 +65,7 @@ sha1 = "0.10"
 sha2 = "0.10"
 smallvec = "1"
 sql-json-path = { version = "0.1", features = ["jsonbb"] }
-thiserror = "1"
+thiserror = "2"
 thiserror-ext = { workspace = true }
 tokio = { version = "0.2", package = "madsim-tokio", features = ["time"] }
 # For arrow-udf-flight
diff --git a/src/frontend/Cargo.toml b/src/frontend/Cargo.toml
index 502eaeba2f685..94d0d91e38d5a 100644
--- a/src/frontend/Cargo.toml
+++ b/src/frontend/Cargo.toml
@@ -83,7 +83,7 @@ sha2 = "0.10.7"
 smallvec = { version = "1.13.1", features = ["serde"] }
 speedate = "0.15.0"
 tempfile = "3"
-thiserror = "1"
+thiserror = "2"
 thiserror-ext = { workspace = true }
 tokio = { version = "0.2", package = "madsim-tokio", features = [
     "rt",
diff --git a/src/jni_core/Cargo.toml b/src/jni_core/Cargo.toml
index a16776add6c6f..9b02b9fa6b927 100644
--- a/src/jni_core/Cargo.toml
+++ b/src/jni_core/Cargo.toml
@@ -26,7 +26,7 @@ risingwave_pb = { workspace = true }
 rw_futures_util = { workspace = true }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
-thiserror = "1"
+thiserror = "2"
 thiserror-ext = { workspace = true }
 tokio = { version = "0.2", package = "madsim-tokio", features = [
     "fs",
diff --git a/src/license/Cargo.toml b/src/license/Cargo.toml
index b435747467e21..3300eedb43607 100644
--- a/src/license/Cargo.toml
+++ b/src/license/Cargo.toml
@@ -20,7 +20,7 @@ jsonwebtoken = "9"
 risingwave_pb = { workspace = true }
 risingwave_telemetry_event = { workspace = true }
 serde = { version = "1", features = ["derive"] }
-thiserror = "1"
+thiserror = "2"
 thiserror-ext = { workspace = true }
 tracing = "0.1"
 
diff --git a/src/meta/Cargo.toml b/src/meta/Cargo.toml
index 16a303609699b..1f2e8f16b8164 100644
--- a/src/meta/Cargo.toml
+++ b/src/meta/Cargo.toml
@@ -74,7 +74,7 @@ serde = { version = "1.0.196", features = ["derive"] }
 serde_json = "1.0.113"
 strum = { version = "0.26", features = ["derive"] }
 sync-point = { path = "../utils/sync-point" }
-thiserror = "1"
+thiserror = "2"
 thiserror-ext = { workspace = true }
 tokio = { version = "0.2", package = "madsim-tokio", features = [
     "rt",
diff --git a/src/object_store/Cargo.toml b/src/object_store/Cargo.toml
index 54bc6b4524f66..ccac40ec15e1b 100644
--- a/src/object_store/Cargo.toml
+++ b/src/object_store/Cargo.toml
@@ -48,7 +48,7 @@ reqwest = "0.12.2" # required by opendal
 risingwave_common = { workspace = true }
 risingwave_jni_core = { workspace = true, optional = true }
 spin = "0.9"
-thiserror = "1"
+thiserror = "2"
 thiserror-ext = { workspace = true }
 tokio = { version = "0.2", package = "madsim-tokio", features = ["fs"] }
 tokio-retry = "0.3"
diff --git a/src/prost/Cargo.toml b/src/prost/Cargo.toml
index 33bd04640dd4b..6c2be964fdd54 100644
--- a/src/prost/Cargo.toml
+++ b/src/prost/Cargo.toml
@@ -15,7 +15,7 @@ prost-helpers = { path = "helpers" }
 risingwave_error = { workspace = true }
 serde = { version = "1", features = ["derive"] }
 strum = { version = "0.26", features = ["derive"] }
-thiserror = "1"
+thiserror = "2"
 tonic = { workspace = true }
 
 [target.'cfg(not(madsim))'.dependencies]
diff --git a/src/rpc_client/Cargo.toml b/src/rpc_client/Cargo.toml
index f7010f975e692..a208d7ec09b7c 100644
--- a/src/rpc_client/Cargo.toml
+++ b/src/rpc_client/Cargo.toml
@@ -32,7 +32,7 @@ risingwave_hummock_sdk = { workspace = true }
 risingwave_pb = { workspace = true }
 rw_futures_util = { workspace = true }
 static_assertions = "1"
-thiserror = "1"
+thiserror = "2"
 thiserror-ext = { workspace = true }
 tokio = { version = "0.2", package = "madsim-tokio", features = [
     "rt",
diff --git a/src/sqlparser/Cargo.toml b/src/sqlparser/Cargo.toml
index 7638d27208beb..043dd64b1749c 100644
--- a/src/sqlparser/Cargo.toml
+++ b/src/sqlparser/Cargo.toml
@@ -24,7 +24,7 @@ normal = ["workspace-hack"]
 [dependencies]
 itertools = { workspace = true }
 serde = { version = "1.0", features = ["derive"], optional = true }
-thiserror = "1.0.61"
+thiserror = "2.0.0"
 tokio = { version = "0.2", package = "madsim-tokio", features = [
     "rt",
     "rt-multi-thread",
diff --git a/src/storage/Cargo.toml b/src/storage/Cargo.toml
index a5ed7938df2e8..6fae598579658 100644
--- a/src/storage/Cargo.toml
+++ b/src/storage/Cargo.toml
@@ -60,7 +60,7 @@ sled = "0.34.7"
 spin = "0.9"
 sync-point = { path = "../utils/sync-point" }
 tempfile = "3"
-thiserror = "1"
+thiserror = "2"
 thiserror-ext = { workspace = true }
 # tikv-client = { git = "https://github.com/tikv/client-rust", rev = "5714b2", optional = true }
 tokio = { version = "0.2", package = "madsim-tokio", features = [
diff --git a/src/storage/backup/Cargo.toml b/src/storage/backup/Cargo.toml
index 3fd7d7ecde5ce..479ad151087c7 100644
--- a/src/storage/backup/Cargo.toml
+++ b/src/storage/backup/Cargo.toml
@@ -28,7 +28,7 @@ risingwave_object_store = { workspace = true }
 risingwave_pb = { workspace = true }
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
-thiserror = "1"
+thiserror = "2"
 twox-hash = "1"
 
 [dev-dependencies]
diff --git a/src/stream/Cargo.toml b/src/stream/Cargo.toml
index de25cf8439be1..502cdb39bf471 100644
--- a/src/stream/Cargo.toml
+++ b/src/stream/Cargo.toml
@@ -66,7 +66,7 @@ smallvec = "1"
 static_assertions = "1"
 strum = "0.26"
 strum_macros = "0.26"
-thiserror = "1"
+thiserror = "2"
 thiserror-ext = { workspace = true }
 tokio = { version = "0.2", package = "madsim-tokio", features = [
   "rt",
diff --git a/src/utils/pgwire/Cargo.toml b/src/utils/pgwire/Cargo.toml
index 8f0e55ff8446b..8b144582b5501 100644
--- a/src/utils/pgwire/Cargo.toml
+++ b/src/utils/pgwire/Cargo.toml
@@ -32,7 +32,7 @@ risingwave_sqlparser = { workspace = true }
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
 socket2 = "0.5"
-thiserror = "1"
+thiserror = "2"
 thiserror-ext = { workspace = true }
 tokio = { version = "0.2", package = "madsim-tokio", features = [
     "rt",
diff --git a/src/utils/sync-point/Cargo.toml b/src/utils/sync-point/Cargo.toml
index d228bfbe79a35..bd78d5ba4e8a0 100644
--- a/src/utils/sync-point/Cargo.toml
+++ b/src/utils/sync-point/Cargo.toml
@@ -13,7 +13,7 @@ normal = ["workspace-hack"]
 [dependencies]
 futures-util = "0.3"
 spin = "0.9"
-thiserror = "1"
+thiserror = "2"
 tokio = { version = "0.2", package = "madsim-tokio", features = ["sync", "time"] }
 
 [features]