Record errors from routines in tracing spans

Updates blackbeam#223
second-state · Feb 14, 2023 · c851de7 · c851de7
1 parent 043d81a
commit c851de7
Show file tree

Hide file tree

Showing 6 changed files with 43 additions and 6 deletions.
diff --git a/src/conn/routines/exec.rs b/src/conn/routines/exec.rs
@@ -104,7 +104,13 @@ impl Routine<()> for ExecRoutine<'_> {
         };
 
         #[cfg(feature = "tracing")]
-        let fut = fut.instrument(span);
+        let fut = async {
+            fut.await.or_else(|e| {
+                tracing::error!(error = %e);
+                Err(e)
+            })
+        }
+        .instrument(span);
 
         fut.boxed()
     }

diff --git a/src/conn/routines/next_set.rs b/src/conn/routines/next_set.rs
@@ -36,7 +36,13 @@ where
         };
 
         #[cfg(feature = "tracing")]
-        let fut = fut.instrument(span);
+        let fut = async {
+            fut.await.or_else(|e| {
+                tracing::error!(error = %e);
+                Err(e)
+            })
+        }
+        .instrument(span);
 
         fut.boxed()
     }

diff --git a/src/conn/routines/ping.rs b/src/conn/routines/ping.rs
@@ -24,7 +24,13 @@ impl Routine<()> for PingRoutine {
         };
 
         #[cfg(feature = "tracing")]
-        let fut = fut.instrument(span);
+        let fut = async {
+            fut.await.or_else(|e| {
+                tracing::error!(error = %e);
+                Err(e)
+            })
+        }
+        .instrument(span);
 
         fut.boxed()
     }

diff --git a/src/conn/routines/prepare.rs b/src/conn/routines/prepare.rs
@@ -48,6 +48,7 @@ impl Routine<Arc<StmtInner>> for PrepareRoutine {
 
             let packet = conn.read_packet().await?;
             let mut inner_stmt = StmtInner::from_payload(&*packet, conn.id(), self.query.clone())?;
+
             #[cfg(feature = "tracing")]
             Span::current().record("mysql_async.statement.id", inner_stmt.id());
 
@@ -65,7 +66,13 @@ impl Routine<Arc<StmtInner>> for PrepareRoutine {
         };
 
         #[cfg(feature = "tracing")]
-        let fut = fut.instrument(span);
+        let fut = async {
+            fut.await.or_else(|e| {
+                tracing::error!(error = %e);
+                Err(e)
+            })
+        }
+        .instrument(span);
 
         fut.boxed()
     }

diff --git a/src/conn/routines/query.rs b/src/conn/routines/query.rs
@@ -54,7 +54,13 @@ impl<L: TracingLevel> Routine<()> for QueryRoutine<'_, L> {
         };
 
         #[cfg(feature = "tracing")]
-        let fut = fut.instrument(span);
+        let fut = async {
+            fut.await.or_else(|e| {
+                tracing::error!(error = %e);
+                Err(e)
+            })
+        }
+        .instrument(span);
 
         fut.boxed()
     }

diff --git a/src/conn/routines/reset.rs b/src/conn/routines/reset.rs
@@ -25,7 +25,13 @@ impl Routine<()> for ResetRoutine {
         };
 
         #[cfg(feature = "tracing")]
-        let fut = fut.instrument(span);
+        let fut = async {
+            fut.await.or_else(|e| {
+                tracing::error!(error = %e);
+                Err(e)
+            })
+        }
+        .instrument(span);
 
         fut.boxed()
     }