couple dbName to db instance

sqflite/lib/src/sentry_batch.dart

@@ -22,6 +22,7 @@ import 'utils/sentry_database_span_attributes.dart';
 class SentryBatch implements Batch {
   final Batch _batch;
   final Hub _hub;
+  final String? _dbName;
 
   // we don't clear the buffer because SqfliteBatch don't either
   final _buffer = StringBuffer();
@@ -37,7 +38,9 @@ class SentryBatch implements Batch {
   SentryBatch(
     this._batch, {
     @internal Hub? hub,
-  }) : _hub = hub ?? HubAdapter();
+    @internal String? dbName,
+  })  : _hub = hub ?? HubAdapter(),
+        _dbName = dbName;
 
   @override
   Future<List<Object?>> apply({bool? noResult, bool? continueOnError}) {
@@ -51,7 +54,7 @@ class SentryBatch implements Batch {
 
       // ignore: invalid_use_of_internal_member
       span?.origin = SentryTraceOrigins.autoDbSqfliteBatch;
-      setDatabaseAttributeData(span);
+      setDatabaseAttributeData(span, _dbName);
 
       try {
         final result = await _batch.apply(
@@ -89,7 +92,7 @@ class SentryBatch implements Batch {
       );
       // ignore: invalid_use_of_internal_member
       span?.origin = SentryTraceOrigins.autoDbSqfliteBatch;
-      setDatabaseAttributeData(span);
+      setDatabaseAttributeData(span, _dbName);
 
       try {
         final result = await _batch.commit(

sqflite/lib/src/sentry_database.dart

@@ -43,8 +43,7 @@ class SentryDatabase extends SentryDatabaseExecutor implements Database {
   static const dbNameKey = 'db.name';
   @internal
   // ignore: public_member_api_docs
-  static String? dbName;
-
+  String? dbName;
 
   /// ```dart
   /// import 'package:sqflite/sqflite.dart';
@@ -57,16 +56,16 @@ class SentryDatabase extends SentryDatabaseExecutor implements Database {
     this._database, {
     @internal Hub? hub,
   })  : _hub = hub ?? HubAdapter(),
-        super(_database, hub: hub) {
+        dbName = _basenameWithoutExtension(_database.path),
+        super(_database, hub: hub, dbName: _basenameWithoutExtension(_database.path)) {
     // ignore: invalid_use_of_internal_member
     final options = _hub.options;
     options.sdk.addIntegration('SentrySqfliteTracing');
     options.sdk.addPackage(packageName, sdkVersion);
-    dbName = _basenameWithoutExtension(_database.path);
   }
 
   /// Gets the part of path after the last separator, and without any trailing file extension.
-  String _basenameWithoutExtension(String filePath) {
+  static String _basenameWithoutExtension(String filePath) {
     int lastIndex = filePath.lastIndexOf('/');
     int dotIndex = filePath.lastIndexOf('.');
 
@@ -90,11 +89,10 @@ class SentryDatabase extends SentryDatabaseExecutor implements Database {
       // ignore: invalid_use_of_internal_member
       span?.origin = SentryTraceOrigins.autoDbSqfliteDatabase;
 
-      dbName = null;
-
       try {
         await _database.close();
 
+        dbName = null;
         span?.status = SpanStatus.ok();
       } catch (exception) {
         span?.throwable = exception;
@@ -142,13 +140,13 @@ class SentryDatabase extends SentryDatabaseExecutor implements Database {
       );
       // ignore: invalid_use_of_internal_member
       span?.origin = SentryTraceOrigins.autoDbSqfliteDatabase;
-      setDatabaseAttributeData(span);
+      setDatabaseAttributeData(span, dbName);
 
       Future<T> newAction(Transaction txn) async {
         final executor =
-            SentryDatabaseExecutor(txn, parentSpan: span, hub: _hub);
+            SentryDatabaseExecutor(txn, parentSpan: span, hub: _hub, dbName: dbName);
         final sentrySqfliteTransaction =
-            SentrySqfliteTransaction(executor, hub: _hub);
+            SentrySqfliteTransaction(executor, hub: _hub, dbName: dbName);
 
         return await action(sentrySqfliteTransaction);
       }

sqflite/lib/src/sentry_database_executor.dart

@@ -14,18 +14,21 @@ import 'utils/sentry_database_span_attributes.dart';
 class SentryDatabaseExecutor implements DatabaseExecutor {
   final DatabaseExecutor _executor;
   final ISentrySpan? _parentSpan;
+  final String? _dbName;
 
   // ignore: public_member_api_docs
   SentryDatabaseExecutor(
     this._executor, {
     ISentrySpan? parentSpan,
     @internal Hub? hub,
+    @internal String? dbName,
   })  : _parentSpan = parentSpan,
-        _hub = hub ?? HubAdapter();
+        _hub = hub ?? HubAdapter(),
+        _dbName = dbName;
   final Hub _hub;
 
   @override
-  Batch batch() => SentryBatch(_executor.batch(), hub: _hub);
+  Batch batch() => SentryBatch(_executor.batch(), hub: _hub, dbName: _dbName);
 
   @override
   Database get database => _executor.database;
@@ -42,7 +45,7 @@ class SentryDatabaseExecutor implements DatabaseExecutor {
       );
       // ignore: invalid_use_of_internal_member
       span?.origin = SentryTraceOrigins.autoDbSqfliteDatabaseExecutor;
-      setDatabaseAttributeData(span);
+      setDatabaseAttributeData(span, _dbName);
 
       try {
         final result =
@@ -73,7 +76,7 @@ class SentryDatabaseExecutor implements DatabaseExecutor {
       span?.setData(SentryDatabase.dbSystemKey, SentryDatabase.dbSystem);
       // ignore: invalid_use_of_internal_member
       span?.origin = SentryTraceOrigins.autoDbSqfliteDatabaseExecutor;
-      setDatabaseAttributeData(span);
+      setDatabaseAttributeData(span, _dbName);
 
       try {
         await _executor.execute(sql, arguments);
@@ -111,7 +114,7 @@ class SentryDatabaseExecutor implements DatabaseExecutor {
       );
       // ignore: invalid_use_of_internal_member
       span?.origin = SentryTraceOrigins.autoDbSqfliteDatabaseExecutor;
-      setDatabaseAttributeData(span);
+      setDatabaseAttributeData(span, _dbName);
 
       try {
         final result = await _executor.insert(
@@ -168,7 +171,7 @@ class SentryDatabaseExecutor implements DatabaseExecutor {
       );
       // ignore: invalid_use_of_internal_member
       span?.origin = SentryTraceOrigins.autoDbSqfliteDatabaseExecutor;
-      setDatabaseAttributeData(span);
+      setDatabaseAttributeData(span, _dbName);
 
       try {
         final result = await _executor.query(
@@ -232,7 +235,7 @@ class SentryDatabaseExecutor implements DatabaseExecutor {
       );
       // ignore: invalid_use_of_internal_member
       span?.origin = SentryTraceOrigins.autoDbSqfliteDatabaseExecutor;
-      setDatabaseAttributeData(span);
+      setDatabaseAttributeData(span, _dbName);
 
       try {
         final result = await _executor.queryCursor(
@@ -273,7 +276,7 @@ class SentryDatabaseExecutor implements DatabaseExecutor {
       );
       // ignore: invalid_use_of_internal_member
       span?.origin = SentryTraceOrigins.autoDbSqfliteDatabaseExecutor;
-      setDatabaseAttributeData(span);
+      setDatabaseAttributeData(span, _dbName);
 
       try {
         final result = await _executor.rawDelete(sql, arguments);
@@ -302,7 +305,7 @@ class SentryDatabaseExecutor implements DatabaseExecutor {
       );
       // ignore: invalid_use_of_internal_member
       span?.origin = SentryTraceOrigins.autoDbSqfliteDatabaseExecutor;
-      setDatabaseAttributeData(span);
+      setDatabaseAttributeData(span, _dbName);
 
       try {
         final result = await _executor.rawInsert(sql, arguments);
@@ -334,7 +337,7 @@ class SentryDatabaseExecutor implements DatabaseExecutor {
       );
       // ignore: invalid_use_of_internal_member
       span?.origin = SentryTraceOrigins.autoDbSqfliteDatabaseExecutor;
-      setDatabaseAttributeData(span);
+      setDatabaseAttributeData(span, _dbName);
 
       try {
         final result = await _executor.rawQuery(sql, arguments);
@@ -367,7 +370,7 @@ class SentryDatabaseExecutor implements DatabaseExecutor {
       );
       // ignore: invalid_use_of_internal_member
       span?.origin = SentryTraceOrigins.autoDbSqfliteDatabaseExecutor;
-      setDatabaseAttributeData(span);
+      setDatabaseAttributeData(span, _dbName);
 
       try {
         final result = await _executor.rawQueryCursor(
@@ -400,7 +403,7 @@ class SentryDatabaseExecutor implements DatabaseExecutor {
       );
       // ignore: invalid_use_of_internal_member
       span?.origin = SentryTraceOrigins.autoDbSqfliteDatabaseExecutor;
-      setDatabaseAttributeData(span);
+      setDatabaseAttributeData(span, _dbName);
 
       try {
         final result = await _executor.rawUpdate(sql, arguments);
@@ -442,7 +445,7 @@ class SentryDatabaseExecutor implements DatabaseExecutor {
       );
       // ignore: invalid_use_of_internal_member
       span?.origin = SentryTraceOrigins.autoDbSqfliteDatabaseExecutor;
-      setDatabaseAttributeData(span);
+      setDatabaseAttributeData(span, _dbName);
 
       try {
         final result = await _executor.update(

sqflite/lib/src/sentry_sqflite_transaction.dart

@@ -21,16 +21,19 @@ import 'sentry_batch.dart';
 class SentrySqfliteTransaction extends Transaction implements DatabaseExecutor {
   final DatabaseExecutor _executor;
   final Hub _hub;
+  final String? _dbName;
 
   // ignore: public_member_api_docs
   @internal
   SentrySqfliteTransaction(
     this._executor, {
     @internal Hub? hub,
-  }) : _hub = hub ?? HubAdapter();
+    @internal String? dbName,
+  })  : _hub = hub ?? HubAdapter(),
+        _dbName = dbName;
 
   @override
-  Batch batch() => SentryBatch(_executor.batch(), hub: _hub);
+  Batch batch() => SentryBatch(_executor.batch(), hub: _hub, dbName: _dbName);
 
   @override
   Database get database => _executor.database;

sqflite/lib/src/utils/sentry_database_span_attributes.dart

@@ -4,9 +4,9 @@ import '../../sentry_sqflite.dart';
 
 /// Sets the database attributes on the [span].
 /// It contains the database system and the database name.
-void setDatabaseAttributeData(ISentrySpan? span) {
+void setDatabaseAttributeData(ISentrySpan? span, String? dbName) {
   span?.setData(SentryDatabase.dbSystemKey, SentryDatabase.dbSystem);
-  if (SentryDatabase.dbName != null) {
-    span?.setData(SentryDatabase.dbNameKey, SentryDatabase.dbName);
+  if (dbName != null) {
+    span?.setData(SentryDatabase.dbNameKey, dbName);
   }
-}
+}

sqflite/test/sentry_batch_test.dart

@@ -295,7 +295,7 @@ SELECT * FROM Product''';
 
       final span = fixture.tracer.children.last;
       expect(span.data[SentryDatabase.dbSystemKey], SentryDatabase.dbSystem);
-      expect(span.data[SentryDatabase.dbNameKey], SentryDatabase.dbName);
+      expect(span.data[SentryDatabase.dbNameKey], (db as SentryDatabase).dbName);
 
       await db.close();
     });
@@ -311,23 +311,7 @@ SELECT * FROM Product''';
 
       final span = fixture.tracer.children.last;
       expect(span.data[SentryDatabase.dbSystemKey], SentryDatabase.dbSystem);
-      expect(span.data[SentryDatabase.dbNameKey], SentryDatabase.dbName);
-
-      await db.close();
-    });
-
-    test('dbName attribute is null if currentDbName is null', () async {
-      final db = await fixture.getDatabase();
-      final batch = db.batch();
-      SentryDatabase.dbName = null;
-
-      batch.insert('Product', <String, Object?>{'title': 'Product 1'});
-
-      await batch.commit();
-
-      final span = fixture.tracer.children.last;
-      expect(span.data[SentryDatabase.dbSystemKey], SentryDatabase.dbSystem);
-      expect(span.data[SentryDatabase.dbNameKey], isNull);
+      expect(span.data[SentryDatabase.dbNameKey], (db as SentryDatabase).dbName);
 
       await db.close();
     });

sqflite/test/sentry_database_test.dart

@@ -63,7 +63,7 @@ void main() {
 
       await db.close();
 
-      expect(SentryDatabase.dbName, null);
+      expect(db.dbName, null);
 
       final span = fixture.tracer.children.last;
       expect(span.context.operation, 'db');
@@ -139,7 +139,7 @@ void main() {
     test('opening db sets currentDbName with :memory:', () async {
       final db = await fixture.getSut();
 
-      expect(SentryDatabase.dbName, ':memory:');
+      expect(db.dbName, ':memory:');
 
       await db.close();
     });
@@ -150,19 +150,19 @@ void main() {
           database: await openDatabase('path/database/mydatabase.db'),
           execute: false);
 
-      expect(SentryDatabase.dbName, 'mydatabase');
+      expect(db.dbName, 'mydatabase');
 
       await db.close();
     });
 
     test('closing db sets currentDbName to null', () async {
       final db = await fixture.getSut();
 
-      expect(SentryDatabase.dbName, inMemoryDatabasePath);
+      expect(db.dbName, inMemoryDatabasePath);
 
       await db.close();
 
-      expect(SentryDatabase.dbName, null);
+      expect(db.dbName, null);
     });
 
     tearDown(() {

sqflite/test/sentry_sqflite_database_factory_dart_test.dart

@@ -37,8 +37,8 @@ void main() {
     test('returns wrapped data base if performance enabled', () async {
       final db = await openDatabase(inMemoryDatabasePath);
 
-      expect(SentryDatabase.dbName, inMemoryDatabasePath);
       expect(db is SentryDatabase, true);
+      expect((db as SentryDatabase).dbName, inMemoryDatabasePath);
 
       await db.close();
     });
@@ -48,7 +48,6 @@ void main() {
 
       final db = await openDatabase(inMemoryDatabasePath);
 
-      expect(SentryDatabase.dbName, null);
       expect(db is! SentryDatabase, true);
 
       await db.close();
@@ -58,7 +57,7 @@ void main() {
         () async {
       final db = await openDatabase(inMemoryDatabasePath);
 
-      expect(SentryDatabase.dbName, inMemoryDatabasePath);
+      expect((db as SentryDatabase).dbName, inMemoryDatabasePath);
 
       final span = fixture.tracer.children.last;
       expect(span.context.operation, 'db');

sqflite/test/sentry_sqflite_test.dart

@@ -97,6 +97,7 @@ void main() {
       expect(span.status, SpanStatus.ok());
       // ignore: invalid_use_of_internal_member
       expect(span.origin, SentryTraceOrigins.autoDbSqfliteOpenDatabase);
+      expect((db as SentryDatabase).dbName, inMemoryDatabasePath);
 
       await db.close();
     });