From cb3477dd528af8b8d90923aa029f3f05b253dc5d Mon Sep 17 00:00:00 2001
From: Quentin Gliech <quenting@element.io>
Date: Tue, 2 Jul 2024 14:18:13 +0200
Subject: [PATCH] Move Sentry to the workspace dependencies and upgrade

---
 Cargo.lock                   | 55 +++++++++++++-----------------------
 Cargo.toml                   | 15 ++++++++++
 crates/axum-utils/Cargo.toml |  2 +-
 crates/cli/Cargo.toml        |  6 ++--
 crates/handlers/Cargo.toml   |  2 +-
 5 files changed, 39 insertions(+), 41 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index ef34d05ab..bdc5e8553 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2268,17 +2268,6 @@ dependencies = [
  "windows-sys 0.52.0",
 ]
 
-[[package]]
-name = "hostname"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c731c3e10504cc8ed35cfe2f1db4c9274c3d35fa486e3b31df46f068ef3e867"
-dependencies = [
- "libc",
- "match_cfg",
- "winapi",
-]
-
 [[package]]
 name = "hostname"
 version = "0.4.0"
@@ -2999,7 +2988,7 @@ dependencies = [
  "fastrand 2.1.0",
  "futures-io",
  "futures-util",
- "hostname 0.4.0",
+ "hostname",
  "httpdate",
  "idna 0.5.0",
  "mime",
@@ -3753,12 +3742,6 @@ dependencies = [
  "tracing-opentelemetry",
 ]
 
-[[package]]
-name = "match_cfg"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffbee8634e0d45d258acb448e7eaab3fce7a0a467395d4d9f228e3c1f01fb2e4"
-
 [[package]]
 name = "matchers"
 version = "0.1.0"
@@ -5401,9 +5384,9 @@ checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b"
 
 [[package]]
 name = "sentry"
-version = "0.31.8"
+version = "0.34.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ce4b57f1b521f674df7a1d200be8ff5d74e3712020ee25b553146657b5377d5"
+checksum = "5484316556650182f03b43d4c746ce0e3e48074a21e2f51244b648b6542e1066"
 dependencies = [
  "sentry-backtrace",
  "sentry-contexts",
@@ -5415,9 +5398,9 @@ dependencies = [
 
 [[package]]
 name = "sentry-backtrace"
-version = "0.31.8"
+version = "0.34.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58cc8d4e04a73de8f718dc703943666d03f25d3e9e4d0fb271ca0b8c76dfa00e"
+checksum = "40aa225bb41e2ec9d7c90886834367f560efc1af028f1c5478a6cce6a59c463a"
 dependencies = [
  "backtrace",
  "once_cell",
@@ -5427,11 +5410,11 @@ dependencies = [
 
 [[package]]
 name = "sentry-contexts"
-version = "0.31.8"
+version = "0.34.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6436c1bad22cdeb02179ea8ef116ffc217797c028927def303bc593d9320c0d1"
+checksum = "1a8dd746da3d16cb8c39751619cefd4fcdbd6df9610f3310fd646b55f6e39910"
 dependencies = [
- "hostname 0.3.1",
+ "hostname",
  "libc",
  "os_info",
  "rustc_version",
@@ -5441,9 +5424,9 @@ dependencies = [
 
 [[package]]
 name = "sentry-core"
-version = "0.31.8"
+version = "0.34.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901f761681f97db3db836ef9e094acdd8756c40215326c194201941947164ef1"
+checksum = "161283cfe8e99c8f6f236a402b9ccf726b201f365988b5bb637ebca0abbd4a30"
 dependencies = [
  "once_cell",
  "rand",
@@ -5454,9 +5437,9 @@ dependencies = [
 
 [[package]]
 name = "sentry-panic"
-version = "0.31.8"
+version = "0.34.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74fbf1c163f8b6a9d05912e1b272afa27c652e8b47ea60cb9a57ad5e481eea99"
+checksum = "bc74f229c7186dd971a9491ffcbe7883544aa064d1589bd30b83fb856cd22d63"
 dependencies = [
  "sentry-backtrace",
  "sentry-core",
@@ -5464,11 +5447,11 @@ dependencies = [
 
 [[package]]
 name = "sentry-tower"
-version = "0.31.8"
+version = "0.34.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88e782e369edac4adfc5bf528b27577270bc3e7023c388ebad9db08e1d56b30b"
+checksum = "6c90802b38c899a2c9e557dff25ad186362eddf755d5f5244001b172dd03bead"
 dependencies = [
- "http 0.2.12",
+ "http 1.1.0",
  "pin-project",
  "sentry-core",
  "tower-layer",
@@ -5478,9 +5461,9 @@ dependencies = [
 
 [[package]]
 name = "sentry-tracing"
-version = "0.31.8"
+version = "0.34.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "82eabcab0a047040befd44599a1da73d3adb228ff53b5ed9795ae04535577704"
+checksum = "cd3c5faf2103cd01eeda779ea439b68c4ee15adcdb16600836e97feafab362ec"
 dependencies = [
  "sentry-backtrace",
  "sentry-core",
@@ -5490,9 +5473,9 @@ dependencies = [
 
 [[package]]
 name = "sentry-types"
-version = "0.31.8"
+version = "0.34.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da956cca56e0101998c8688bc65ce1a96f00673a0e58e663664023d4c7911e82"
+checksum = "5d68cdf6bc41b8ff3ae2a9c4671e97426dcdd154cc1d4b6b72813f285d6b163f"
 dependencies = [
  "debugid",
  "hex",
diff --git a/Cargo.toml b/Cargo.toml
index 3e5f52c13..ab668e0f6 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -172,6 +172,21 @@ version = "0.3.1"
 version = "0.8.21"
 features = ["url", "chrono", "preserve_order"]
 
+# Sentry error tracking
+[workspace.dependencies.sentry]
+version = "0.34.0"
+default-features = false
+features = ["backtrace", "contexts", "panic", "tower"]
+
+# Sentry tower layer
+[workspace.dependencies.sentry-tower]
+version = "0.34.0"
+features = ["http"]
+
+# Sentry tracing integration
+[workspace.dependencies.sentry-tracing]
+version = "0.34.0"
+
 # Serialization and deserialization
 [workspace.dependencies.serde]
 version = "1.0.203"
diff --git a/crates/axum-utils/Cargo.toml b/crates/axum-utils/Cargo.toml
index 00384864c..781815a58 100644
--- a/crates/axum-utils/Cargo.toml
+++ b/crates/axum-utils/Cargo.toml
@@ -27,7 +27,7 @@ hyper-util.workspace = true
 icu_locid = "1.4.0"
 mime = "0.3.17"
 rand.workspace = true
-sentry = { version = "0.31.8", default-features = false }
+sentry.workspace = true
 serde.workspace = true
 serde_with = "3.8.2"
 serde_urlencoded = "0.7.1"
diff --git a/crates/cli/Cargo.toml b/crates/cli/Cargo.toml
index 14032a5da..2c257a0f4 100644
--- a/crates/cli/Cargo.toml
+++ b/crates/cli/Cargo.toml
@@ -51,9 +51,9 @@ opentelemetry-semantic-conventions.workspace = true
 opentelemetry-stdout = { version = "0.4.0", features = ["trace", "metrics"] }
 opentelemetry_sdk = { version = "0.23.0", features = ["trace", "metrics", "rt-tokio"] }
 prometheus = "0.13.4"
-sentry = { version = "0.31.8", default-features = false, features = ["backtrace", "contexts", "panic", "tower"] }
-sentry-tracing = "0.31.8"
-sentry-tower = { version = "0.31.8", features = ["http"] }
+sentry.workspace = true
+sentry-tracing.workspace = true
+sentry-tower.workspace = true
 
 mas-config.workspace = true
 mas-data-model.workspace = true
diff --git a/crates/handlers/Cargo.toml b/crates/handlers/Cargo.toml
index 398ff9ddb..e3977dc81 100644
--- a/crates/handlers/Cargo.toml
+++ b/crates/handlers/Cargo.toml
@@ -25,7 +25,7 @@ opentelemetry-semantic-conventions.workspace = true
 # Error management
 thiserror.workspace = true
 anyhow.workspace = true
-sentry = { version = "0.31.8", default-features = false }
+sentry.workspace = true
 
 # Web server
 hyper.workspace = true