From 7eedca7ce8581fccbbb746642ecc59b976103239 Mon Sep 17 00:00:00 2001
From: arya2 <aryasolhi@gmail.com>
Date: Fri, 24 Feb 2023 15:31:35 -0500
Subject: [PATCH] Replace sentry-tracing with 'tracing' feature on core crate

---
 Cargo.lock                                 | 2 +-
 zebrad/Cargo.toml                          | 5 ++---
 zebrad/src/components/tracing/component.rs | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index d00a50e58bb..32e259906de 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3744,6 +3744,7 @@ dependencies = [
  "sentry-backtrace",
  "sentry-contexts",
  "sentry-core",
+ "sentry-tracing",
  "tokio",
  "ureq",
  "webpki-roots",
@@ -5748,7 +5749,6 @@ dependencies = [
  "reqwest",
  "semver 1.0.16",
  "sentry",
- "sentry-tracing",
  "serde",
  "serde_json",
  "tempfile",
diff --git a/zebrad/Cargo.toml b/zebrad/Cargo.toml
index 9b770f35ed4..af515b2c60d 100644
--- a/zebrad/Cargo.toml
+++ b/zebrad/Cargo.toml
@@ -34,7 +34,7 @@ getblocktemplate-rpcs = [
     "zebra-chain/getblocktemplate-rpcs",
 ]
 
-sentry = ["dep:sentry", "sentry-tracing"]
+sentry = ["dep:sentry"]
 flamegraph = ["tracing-flame", "inferno"]
 journald = ["tracing-journald"]
 filter-reload = ["hyper"]
@@ -136,8 +136,7 @@ num-integer = "0.1.45"
 rand = { version = "0.8.5", package = "rand" }
 
 # prod feature sentry
-sentry-tracing = { version = "0.29.3", optional = true }
-sentry = { version = "0.29.3", default-features = false, features = ["backtrace", "contexts", "reqwest", "rustls"], optional = true }
+sentry = { version = "0.29.3", default-features = false, features = ["backtrace", "contexts", "reqwest", "rustls", "tracing"], optional = true }
 
 # prod feature flamegraph
 tracing-flame = { version = "0.2.0", optional = true }
diff --git a/zebrad/src/components/tracing/component.rs b/zebrad/src/components/tracing/component.rs
index 6c58a8809ff..35d26caa1e8 100644
--- a/zebrad/src/components/tracing/component.rs
+++ b/zebrad/src/components/tracing/component.rs
@@ -154,7 +154,7 @@ impl Tracing {
         let subscriber = subscriber.with(journaldlayer);
 
         #[cfg(feature = "sentry")]
-        let subscriber = subscriber.with(sentry_tracing::layer());
+        let subscriber = subscriber.with(sentry::integrations::tracing::layer());
 
         // spawn the console server in the background, and apply the console layer
         // TODO: set Builder::poll_duration_histogram_max() if needed