Split the storage trait from the implementation

crates/storage-pg/src/tracing.rs

@@ -0,0 +1,36 @@
+// Copyright 2022, 2023 The Matrix.org Foundation C.I.C.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+use tracing::Span;
+
+pub trait ExecuteExt<'q, DB>: Sized {
+    /// Records the statement as `db.statement` in the current span
+    fn traced(self) -> Self {
+        self.record(&Span::current())
+    }
+
+    /// Records the statement as `db.statement` in the given span
+    fn record(self, span: &Span) -> Self;
+}
+
+impl<'q, DB, T> ExecuteExt<'q, DB> for T
+where
+    T: sqlx::Execute<'q, DB>,
+    DB: sqlx::Database,
+{
+    fn record(self, span: &Span) -> Self {
+        span.record("db.statement", self.sql());
+        self
+    }
+}