add db attibutes to spans

sqflite/lib/src/sentry_batch.dart

@@ -5,6 +5,7 @@ import 'package:sqflite/sqflite.dart';
 // ignore: implementation_imports
 import 'package:sqflite_common/src/sql_builder.dart';
 
+import '../sentry_sqflite.dart';
 import 'sentry_database.dart';
 
 /// A [Batch] wrapper that adds Sentry support.
@@ -47,8 +48,13 @@ class SentryBatch implements Batch {
         SentryDatabase.dbOp,
         description: _buffer.toString().trim(),
       );
+
       // ignore: invalid_use_of_internal_member
       span?.origin = SentryTraceOrigins.autoDbSqfliteBatch;
+      span?.setData(SentryDatabase.dbSystem, 'sqlite');
+      if (SentryDatabase.currentDbName != null) {
+        span?.setData(SentryDatabase.dbName, SentryDatabase.currentDbName);
+      }
 
       try {
         final result = await _batch.apply(
@@ -86,6 +92,10 @@ class SentryBatch implements Batch {
       );
       // ignore: invalid_use_of_internal_member
       span?.origin = SentryTraceOrigins.autoDbSqfliteBatch;
+      span?.setData(SentryDatabase.dbSystem, 'sqlite');
+      if (SentryDatabase.currentDbName != null) {
+        span?.setData(SentryDatabase.dbName, SentryDatabase.currentDbName);
+      }
 
       try {
         final result = await _batch.commit(

sqflite/lib/src/sentry_database.dart

@@ -1,7 +1,9 @@
 import 'package:meta/meta.dart';
 import 'package:sentry/sentry.dart';
 import 'package:sqflite/sqflite.dart';
+import 'package:path/path.dart' as p;
 
+import '../sentry_sqflite.dart';
 import 'sentry_database_executor.dart';
 import 'sentry_sqflite_transaction.dart';
 import 'version.dart';
@@ -31,6 +33,15 @@ class SentryDatabase extends SentryDatabaseExecutor implements Database {
   static const dbSqlQueryOp = 'db.sql.query';
 
   static const _dbSqlOp = 'db.sql.transaction';
+  @internal
+  // ignore: public_member_api_docs
+  static const dbSystem = 'db.system';
+  @internal
+  // ignore: public_member_api_docs
+  static const dbName = 'db.name';
+  @internal
+  // ignore: public_member_api_docs
+  static String? currentDbName;
 
   /// ```dart
   /// import 'package:sqflite/sqflite.dart';
@@ -48,6 +59,7 @@ class SentryDatabase extends SentryDatabaseExecutor implements Database {
     final options = _hub.options;
     options.sdk.addIntegration('SentrySqfliteTracing');
     options.sdk.addPackage(packageName, sdkVersion);
+    currentDbName = p.basenameWithoutExtension(_database.path);
   }
 
   // TODO: check if perf is enabled
@@ -63,6 +75,8 @@ class SentryDatabase extends SentryDatabaseExecutor implements Database {
       // ignore: invalid_use_of_internal_member
       span?.origin = SentryTraceOrigins.autoDbSqfliteDatabase;
 
+      currentDbName = null;
+
       try {
         await _database.close();
 
@@ -113,6 +127,10 @@ class SentryDatabase extends SentryDatabaseExecutor implements Database {
       );
       // ignore: invalid_use_of_internal_member
       span?.origin = SentryTraceOrigins.autoDbSqfliteDatabase;
+      span?.setData(dbSystem, 'sqlite');
+      if (currentDbName != null) {
+        span?.setData(dbName, currentDbName);
+      }
 
       Future<T> newAction(Transaction txn) async {
         final executor =

sqflite/lib/src/sentry_database_executor.dart

@@ -41,6 +41,10 @@ class SentryDatabaseExecutor implements DatabaseExecutor {
       );
       // ignore: invalid_use_of_internal_member
       span?.origin = SentryTraceOrigins.autoDbSqfliteDatabaseExecutor;
+      span?.setData(SentryDatabase.dbSystem, 'sqlite');
+      if (SentryDatabase.currentDbName != null) {
+        span?.setData(SentryDatabase.dbName, SentryDatabase.currentDbName);
+      }
 
       try {
         final result =
@@ -68,8 +72,13 @@ class SentryDatabaseExecutor implements DatabaseExecutor {
         SentryDatabase.dbSqlExecuteOp,
         description: sql,
       );
+      span?.setData(SentryDatabase.dbSystem, 'sqlite');
       // ignore: invalid_use_of_internal_member
       span?.origin = SentryTraceOrigins.autoDbSqfliteDatabaseExecutor;
+      span?.setData(SentryDatabase.dbSystem, 'sqlite');
+      if (SentryDatabase.currentDbName != null) {
+        span?.setData(SentryDatabase.dbName, SentryDatabase.currentDbName);
+      }
 
       try {
         await _executor.execute(sql, arguments);
@@ -107,6 +116,10 @@ class SentryDatabaseExecutor implements DatabaseExecutor {
       );
       // ignore: invalid_use_of_internal_member
       span?.origin = SentryTraceOrigins.autoDbSqfliteDatabaseExecutor;
+      span?.setData(SentryDatabase.dbSystem, 'sqlite');
+      if (SentryDatabase.currentDbName != null) {
+        span?.setData(SentryDatabase.dbName, SentryDatabase.currentDbName);
+      }
 
       try {
         final result = await _executor.insert(
@@ -163,6 +176,10 @@ class SentryDatabaseExecutor implements DatabaseExecutor {
       );
       // ignore: invalid_use_of_internal_member
       span?.origin = SentryTraceOrigins.autoDbSqfliteDatabaseExecutor;
+      span?.setData(SentryDatabase.dbSystem, 'sqlite');
+      if (SentryDatabase.currentDbName != null) {
+        span?.setData(SentryDatabase.dbName, SentryDatabase.currentDbName);
+      }
 
       try {
         final result = await _executor.query(
@@ -226,6 +243,10 @@ class SentryDatabaseExecutor implements DatabaseExecutor {
       );
       // ignore: invalid_use_of_internal_member
       span?.origin = SentryTraceOrigins.autoDbSqfliteDatabaseExecutor;
+      span?.setData(SentryDatabase.dbSystem, 'sqlite');
+      if (SentryDatabase.currentDbName != null) {
+        span?.setData(SentryDatabase.dbName, SentryDatabase.currentDbName);
+      }
 
       try {
         final result = await _executor.queryCursor(
@@ -266,6 +287,10 @@ class SentryDatabaseExecutor implements DatabaseExecutor {
       );
       // ignore: invalid_use_of_internal_member
       span?.origin = SentryTraceOrigins.autoDbSqfliteDatabaseExecutor;
+      span?.setData(SentryDatabase.dbSystem, 'sqlite');
+      if (SentryDatabase.currentDbName != null) {
+        span?.setData(SentryDatabase.dbName, SentryDatabase.currentDbName);
+      }
 
       try {
         final result = await _executor.rawDelete(sql, arguments);
@@ -294,6 +319,10 @@ class SentryDatabaseExecutor implements DatabaseExecutor {
       );
       // ignore: invalid_use_of_internal_member
       span?.origin = SentryTraceOrigins.autoDbSqfliteDatabaseExecutor;
+      span?.setData(SentryDatabase.dbSystem, 'sqlite');
+      if (SentryDatabase.currentDbName != null) {
+        span?.setData(SentryDatabase.dbName, SentryDatabase.currentDbName);
+      }
 
       try {
         final result = await _executor.rawInsert(sql, arguments);
@@ -325,6 +354,10 @@ class SentryDatabaseExecutor implements DatabaseExecutor {
       );
       // ignore: invalid_use_of_internal_member
       span?.origin = SentryTraceOrigins.autoDbSqfliteDatabaseExecutor;
+      span?.setData(SentryDatabase.dbSystem, 'sqlite');
+      if (SentryDatabase.currentDbName != null) {
+        span?.setData(SentryDatabase.dbName, SentryDatabase.currentDbName);
+      }
 
       try {
         final result = await _executor.rawQuery(sql, arguments);
@@ -357,6 +390,10 @@ class SentryDatabaseExecutor implements DatabaseExecutor {
       );
       // ignore: invalid_use_of_internal_member
       span?.origin = SentryTraceOrigins.autoDbSqfliteDatabaseExecutor;
+      span?.setData(SentryDatabase.dbSystem, 'sqlite');
+      if (SentryDatabase.currentDbName != null) {
+        span?.setData(SentryDatabase.dbName, SentryDatabase.currentDbName);
+      }
 
       try {
         final result = await _executor.rawQueryCursor(
@@ -389,6 +426,10 @@ class SentryDatabaseExecutor implements DatabaseExecutor {
       );
       // ignore: invalid_use_of_internal_member
       span?.origin = SentryTraceOrigins.autoDbSqfliteDatabaseExecutor;
+      span?.setData(SentryDatabase.dbSystem, 'sqlite');
+      if (SentryDatabase.currentDbName != null) {
+        span?.setData(SentryDatabase.dbName, SentryDatabase.currentDbName);
+      }
 
       try {
         final result = await _executor.rawUpdate(sql, arguments);
@@ -430,6 +471,10 @@ class SentryDatabaseExecutor implements DatabaseExecutor {
       );
       // ignore: invalid_use_of_internal_member
       span?.origin = SentryTraceOrigins.autoDbSqfliteDatabaseExecutor;
+      span?.setData(SentryDatabase.dbSystem, 'sqlite');
+      if (SentryDatabase.currentDbName != null) {
+        span?.setData(SentryDatabase.dbName, SentryDatabase.currentDbName);
+      }
 
       try {
         final result = await _executor.update(

sqflite/pubspec.yaml

@@ -14,6 +14,7 @@ dependencies:
   sqflite: ^2.0.0
   sqflite_common: ^2.0.0
   meta: ^1.3.0
+  path: ^1.8.3
 
 dev_dependencies:
   lints: ^2.0.0

sqflite/test/sentry_batch_test.dart

@@ -285,6 +285,53 @@ SELECT * FROM Product''';
       await db.close();
     });
 
+    test('apply creates db span with dbSystem and dbName attributes', () async {
+      final db = await fixture.getDatabase();
+      final batch = db.batch();
+
+      batch.insert('Product', <String, Object?>{'title': 'Product 1'});
+
+      await batch.apply();
+
+      final span = fixture.tracer.children.last;
+      expect(span.data[SentryDatabase.dbSystem], 'sqlite');
+      expect(span.data[SentryDatabase.dbName], SentryDatabase.currentDbName);
+
+      await db.close();
+    });
+
+    test('commit creates db span with dbSystem and dbName attributes',
+        () async {
+      final db = await fixture.getDatabase();
+      final batch = db.batch();
+
+      batch.insert('Product', <String, Object?>{'title': 'Product 1'});
+
+      await batch.commit();
+
+      final span = fixture.tracer.children.last;
+      expect(span.data[SentryDatabase.dbSystem], 'sqlite');
+      expect(span.data[SentryDatabase.dbName], SentryDatabase.currentDbName);
+
+      await db.close();
+    });
+
+    test('dbName attribute is null if currentDbName is null', () async {
+      final db = await fixture.getDatabase();
+      final batch = db.batch();
+      SentryDatabase.currentDbName = null;
+
+      batch.insert('Product', <String, Object?>{'title': 'Product 1'});
+
+      await batch.commit();
+
+      final span = fixture.tracer.children.last;
+      expect(span.data[SentryDatabase.dbSystem], 'sqlite');
+      expect(span.data[SentryDatabase.dbName], isNull);
+
+      await db.close();
+    });
+
     tearDown(() {
       databaseFactory = sqfliteDatabaseFactoryDefault;
     });