[v9]: bump drift min version and use QueryInterceptor instead of QueryExecutor

CHANGELOG.md

@@ -13,6 +13,7 @@
 - Enable JS SDK native integration by default ([#2688](https://github.com/getsentry/sentry-dart/pull/2688))
 - Remove `enableTracing` ([#2695](https://github.com/getsentry/sentry-dart/pull/2695))
 - Remove `options.autoAppStart` and `setAppStartEnd` ([#2680](https://github.com/getsentry/sentry-dart/pull/2680))
+- Bump Drift min version to `2.24.0` and use `QueryInterceptor` instead of `QueryExecutor` ([#2679](https://github.com/getsentry/sentry-dart/pull/2679))
 - Add hint for transactions ([#2675](https://github.com/getsentry/sentry-dart/pull/2675))
   - `BeforeSendTransactionCallback` now has a `Hint` parameter
 - Remove `dart:html` usage in favour of `package:web` ([#2710](https://github.com/getsentry/sentry-dart/pull/2710))

dart/lib/sentry.dart

@@ -51,7 +51,7 @@ export 'src/utils/http_header_utils.dart';
 // ignore: invalid_export_of_internal_element
 export 'src/sentry_trace_origins.dart';
 // ignore: invalid_export_of_internal_element
-export 'src/sentry_span_operations.dart';
+export 'src/constants.dart';
 // ignore: invalid_export_of_internal_element
 export 'src/utils.dart';
 // spotlight debugging

dart/lib/src/constants.dart

@@ -0,0 +1,30 @@
+import 'package:meta/meta.dart';
+
+@internal
+class SentrySpanOperations {
+  static const String uiLoad = 'ui.load';
+  static const String uiTimeToInitialDisplay = 'ui.load.initial_display';
+  static const String uiTimeToFullDisplay = 'ui.load.full_display';
+  static const String dbSqlQuery = 'db.sql.query';
+  static const String dbSqlTransaction = 'db.sql.transaction';
+  static const String dbSqlBatch = 'db.sql.batch';
+  static const String dbOpen = 'db.open';
+  static const String dbClose = 'db.close';
+}
+
+@internal
+class SentrySpanData {
+  static const String dbSystemKey = 'db.system';
+  static const String dbNameKey = 'db.name';
+
+  static const String dbSystemSqlite = 'db.sqlite';
+}
+
+@internal
+class SentrySpanDescriptions {
+  static const String dbTransaction = 'Transaction';
+  static String dbBatch({required List<String> statements}) =>
+      'Batch $statements';
+  static String dbOpen({required String dbName}) => 'Open database $dbName';
+  static String dbClose({required String dbName}) => 'Close database $dbName';
+}

dart/lib/src/sentry_trace_origins.dart

@@ -24,9 +24,7 @@ class SentryTraceOrigins {
   static const autoDbHiveBoxBase = 'auto.db.hive.box_base';
   static const autoDbHiveLazyBox = 'auto.db.hive.lazy_box';
   static const autoDbHiveBoxCollection = 'auto.db.hive.box_collection';
-  static const autoDbDriftQueryExecutor = 'auto.db.drift.query.executor';
-  static const autoDbDriftTransactionExecutor =
-      'auto.db.drift.transaction.executor';
+  static const autoDbDriftQueryInterceptor = 'auto.db.drift.query.interceptor';
   static const autoUiTimeToDisplay = 'auto.ui.time_to_display';
   static const manualUiTimeToDisplay = 'manual.ui.time_to_display';
 }

drift/analysis_options.yaml

@@ -24,7 +24,6 @@ analyzer:
 linter:
   rules:
     - prefer_final_locals
-    - public_member_api_docs
     - prefer_single_quotes
     - prefer_relative_imports
     - unnecessary_brace_in_string_interps

drift/example/example.dart

@@ -22,18 +22,45 @@ Future<void> main() async {
 
 Future<void> runApp() async {
   final tr = Sentry.startTransaction('drift', 'op', bindToScope: true);
-  final executor = SentryQueryExecutor(
-    () => NativeDatabase.memory(),
-    databaseName: 'your_db_name',
+  final executor = NativeDatabase.memory().interceptWith(
+    SentryQueryInterceptor(databaseName: 'your_db_name'),
   );
+
   final db = AppDatabase(executor);
 
-  await db.into(db.todoItems).insert(
+  await db.transaction(() async {
+    await db.into(db.todoItems).insert(
+          TodoItemsCompanion.insert(
+            title: 'This is a test thing',
+            content: 'test',
+          ),
+        );
+
+    await db.transaction(() async {
+      await db.into(db.todoItems).insert(
+            TodoItemsCompanion.insert(
+              title: 'This is a test thing in the tx',
+              content: 'test',
+            ),
+          );
+    });
+
+    await db.batch((batch) {
+      batch.insertAll(db.todoItems, [
+        TodoItemsCompanion.insert(title: 'First entry', content: 'My content'),
         TodoItemsCompanion.insert(
-          title: 'This is a test thing',
-          content: 'test',
+          title: 'Another entry',
+          content: 'More content',
         ),
-      );
+      ]);
+    });
+  });
+
+  await db.batch((batch) async {
+    batch.insertAll(db.todoItems, [
+      TodoItemsCompanion.insert(title: 'This is a test', content: 'test'),
+    ]);
+  });
 
   final items = await db.select(db.todoItems).get();
   print(items);

drift/lib/sentry_drift.dart

@@ -1,3 +1,3 @@
 library;
 
-export 'src/sentry_query_executor.dart';
+export 'src/sentry_query_interceptor.dart';

drift/lib/src/constants.dart

@@ -0,0 +1,2 @@
+const String integrationName = 'sentryDriftTracing';
+const String loggerName = 'sentry_drift';