correctly setup tests

isar/.gitignore

@@ -12,3 +12,9 @@ pubspec.lock
 .pub-cache/
 .pub/
 /build/
+
+# Created by build runner
+test/person.g.dart
+
+# Downloaded on demand by tests for correct architecture.
+libisar.dylib

isar/lib/sentry_isar.dart

@@ -1,4 +1,5 @@
 library sentry_isar;
+
 import 'package:isar/isar.dart';
 import 'package:meta/meta.dart';
 import 'package:sentry/sentry.dart';
@@ -9,7 +10,6 @@ import 'sentry_span_helper.dart';
 /// A sentry wrapper around the Isar Database
 @experimental
 class SentryIsar implements Isar {
-
   @internal
   // ignore: public_member_api_docs
   static const dbOp = 'db';
@@ -33,48 +33,62 @@ class SentryIsar implements Isar {
   );
 
   /// ctor of SentryIsar
-  SentryIsar(this._isar, this._hub);
+  SentryIsar(this._isar, this._hub) {
+    _spanHelper.setHub(_hub);
+  }
 
   /// Open a new Isar instance, wrapped by SentryIsar
   static Future<Isar> open(
-      List<CollectionSchema<dynamic>> schemas, {
-        required String directory,
-        String name = Isar.defaultName,
-        int maxSizeMiB = Isar.defaultMaxSizeMiB,
-        bool relaxedDurability = true,
-        CompactCondition? compactOnLaunch,
-        bool inspector = true,
-        Hub? hub,
-      }
-  ) async {
-    final isar = await Isar.open(
-      schemas,
-      directory: directory,
-      name: name,
-      maxSizeMiB: maxSizeMiB,
-      relaxedDurability: relaxedDurability,
-      compactOnLaunch: compactOnLaunch,
-      inspector: inspector,
+    List<CollectionSchema<dynamic>> schemas, {
+    required String directory,
+    String name = Isar.defaultName,
+    int maxSizeMiB = Isar.defaultMaxSizeMiB,
+    bool relaxedDurability = true,
+    CompactCondition? compactOnLaunch,
+    bool inspector = true,
+    Hub? hub,
+  }) async {
+    final spanHelper = SentrySpanHelper(
+      // ignore: invalid_use_of_internal_member
+      SentryTraceOrigins.autoDbIsar,
     );
-    return SentryIsar(isar, hub ?? HubAdapter());
+    final hubToUse = hub ?? HubAdapter();
+    spanHelper.setHub(hubToUse);
+
+    final isar = await spanHelper.asyncWrapInSpan(
+      'open',
+      () async {
+        return await Isar.open(
+          schemas,
+          directory: directory,
+          name: name,
+          maxSizeMiB: maxSizeMiB,
+          relaxedDurability: relaxedDurability,
+          compactOnLaunch: compactOnLaunch,
+          inspector: inspector,
+        );
+      },
+      dbName: name,
+    );
+
+    return SentryIsar(isar, hubToUse);
   }
 
   /// Open a new Isar instance, wrapped by SentryIsar
   static Isar openSync(
     List<CollectionSchema<dynamic>> schemas, {
-      required String directory,
-      String name = Isar.defaultName,
-      int maxSizeMiB = Isar.defaultMaxSizeMiB,
-      bool relaxedDurability = true,
-      CompactCondition? compactOnLaunch,
-      bool inspector = true,
-      Hub? hub,
-    }
-  ) {
+    required String directory,
+    String name = Isar.defaultName,
+    int maxSizeMiB = Isar.defaultMaxSizeMiB,
+    bool relaxedDurability = true,
+    CompactCondition? compactOnLaunch,
+    bool inspector = true,
+    Hub? hub,
+  }) {
     final isar = Isar.openSync(
       schemas,
       directory: directory,
-        name: name,
+      name: name,
       maxSizeMiB: maxSizeMiB,
       relaxedDurability: relaxedDurability,
       compactOnLaunch: compactOnLaunch,
@@ -90,9 +104,13 @@ class SentryIsar implements Isar {
 
   @override
   Future<void> clear() {
-    return _spanHelper.asyncWrapInSpan('clear', () {
-      return _isar.clear();
-    });
+    return _spanHelper.asyncWrapInSpan(
+      'clear',
+      () {
+        return _isar.clear();
+      },
+      dbName: name,
+    );
   }
 
   @override
@@ -102,9 +120,13 @@ class SentryIsar implements Isar {
 
   @override
   Future<bool> close({bool deleteFromDisk = false}) {
-    return _spanHelper.asyncWrapInSpan('close', () {
-      return _isar.close(deleteFromDisk: deleteFromDisk);
-    });
+    return _spanHelper.asyncWrapInSpan(
+      'close',
+      () {
+        return _isar.close(deleteFromDisk: deleteFromDisk);
+      },
+      dbName: name,
+    );
   }
 
   @override
@@ -114,9 +136,13 @@ class SentryIsar implements Isar {
 
   @override
   Future<void> copyToFile(String targetPath) {
-    return _spanHelper.asyncWrapInSpan('copyToFile', () {
-      return _isar.copyToFile(targetPath);
-    });
+    return _spanHelper.asyncWrapInSpan(
+      'copyToFile',
+      () {
+        return _isar.copyToFile(targetPath);
+      },
+      dbName: name,
+    );
   }
 
   @override
@@ -133,13 +159,18 @@ class SentryIsar implements Isar {
   }
 
   @override
-  Future<int> getSize({bool includeIndexes = false, bool includeLinks = false}) {
-    return _spanHelper.asyncWrapInSpan('getSize', () {
-      return _isar.getSize(
-        includeIndexes: includeIndexes,
-        includeLinks: includeLinks,
-      );
-    });
+  Future<int> getSize(
+      {bool includeIndexes = false, bool includeLinks = false}) {
+    return _spanHelper.asyncWrapInSpan(
+      'getSize',
+      () {
+        return _isar.getSize(
+          includeIndexes: includeIndexes,
+          includeLinks: includeLinks,
+        );
+      },
+      dbName: name,
+    );
   }
 
   @override
@@ -166,9 +197,13 @@ class SentryIsar implements Isar {
 
   @override
   Future<T> txn<T>(Future<T> Function() callback) {
-    return _spanHelper.asyncWrapInSpan('txn', () {
-      return _isar.txn(callback);
-    });
+    return _spanHelper.asyncWrapInSpan(
+      'txn',
+      () {
+        return _isar.txn(callback);
+      },
+      dbName: name,
+    );
   }
 
   @override
@@ -180,17 +215,25 @@ class SentryIsar implements Isar {
   @visibleForTesting
   @experimental
   Future<void> verify() {
-    return _spanHelper.asyncWrapInSpan('verify', () {
-      // ignore: invalid_use_of_visible_for_testing_member
-      return _isar.verify();
-    });
+    return _spanHelper.asyncWrapInSpan(
+      'verify',
+      () {
+        // ignore: invalid_use_of_visible_for_testing_member
+        return _isar.verify();
+      },
+      dbName: name,
+    );
   }
 
   @override
   Future<T> writeTxn<T>(Future<T> Function() callback, {bool silent = false}) {
-    return _spanHelper.asyncWrapInSpan('writeTxn', () {
-      return _isar.writeTxn(callback, silent: silent);
-    });
+    return _spanHelper.asyncWrapInSpan(
+      'writeTxn',
+      () {
+        return _isar.writeTxn(callback, silent: silent);
+      },
+      dbName: name,
+    );
   }
 
   @override

isar/lib/sentry_isar_collection.dart

@@ -8,7 +8,6 @@ import 'sentry_span_helper.dart';
 /// Sentry wrapper around IsarCollection
 @experimental
 class SentryIsarCollection<OBJ> implements IsarCollection<OBJ> {
-
   final IsarCollection<OBJ> _isarCollection;
   final Hub _hub;
   final _spanHelper = SentrySpanHelper(
@@ -32,15 +31,15 @@ class SentryIsarCollection<OBJ> implements IsarCollection<OBJ> {
     String? property,
   }) {
     return _isarCollection.buildQuery(
-        whereClauses: whereClauses,
-        whereDistinct: whereDistinct,
-        whereSort: whereSort,
-        filter: filter,
-        sortBy: sortBy,
-        distinctBy: distinctBy,
-        offset: offset,
-        limit: limit,
-        property: property,
+      whereClauses: whereClauses,
+      whereDistinct: whereDistinct,
+      whereSort: whereSort,
+      filter: filter,
+      sortBy: sortBy,
+      distinctBy: distinctBy,
+      offset: offset,
+      limit: limit,
+      property: property,
     );
   }
 
@@ -165,7 +164,8 @@ class SentryIsarCollection<OBJ> implements IsarCollection<OBJ> {
   }
 
   @override
-  Future<int> getSize({bool includeIndexes = false, bool includeLinks = false}) {
+  Future<int> getSize(
+      {bool includeIndexes = false, bool includeLinks = false}) {
     return _spanHelper.asyncWrapInSpan('getSize', () {
       return _isarCollection.getSize(
         includeIndexes: includeIndexes,
@@ -239,11 +239,12 @@ class SentryIsarCollection<OBJ> implements IsarCollection<OBJ> {
   }
 
   @override
-  List<Id> putAllByIndexSync(String indexName, List<OBJ> objects, {bool saveLinks = true}) {
+  List<Id> putAllByIndexSync(String indexName, List<OBJ> objects,
+      {bool saveLinks = true}) {
     return _isarCollection.putAllByIndexSync(
-        indexName,
-        objects,
-        saveLinks: saveLinks,
+      indexName,
+      objects,
+      saveLinks: saveLinks,
     );
   }
 
@@ -262,8 +263,9 @@ class SentryIsarCollection<OBJ> implements IsarCollection<OBJ> {
   @override
   Id putByIndexSync(String indexName, OBJ object, {bool saveLinks = true}) {
     return _isarCollection.putByIndexSync(
-        indexName, object,
-        saveLinks: saveLinks,
+      indexName,
+      object,
+      saveLinks: saveLinks,
     );
   }
 
@@ -288,7 +290,8 @@ class SentryIsarCollection<OBJ> implements IsarCollection<OBJ> {
   @override
   @visibleForTesting
   @experimental
-  Future<void> verifyLink(String linkName, List<int> sourceIds, List<int> targetIds) {
+  Future<void> verifyLink(
+      String linkName, List<int> sourceIds, List<int> targetIds) {
     return _spanHelper.asyncWrapInSpan('verifyLink', () {
       // ignore: invalid_use_of_visible_for_testing_member
       return _isarCollection.verifyLink(linkName, sourceIds, targetIds);
@@ -307,11 +310,13 @@ class SentryIsarCollection<OBJ> implements IsarCollection<OBJ> {
 
   @override
   Stream<void> watchObjectLazy(Id id, {bool fireImmediately = false}) {
-    return _isarCollection.watchObjectLazy(id, fireImmediately: fireImmediately);
+    return _isarCollection.watchObjectLazy(id,
+        fireImmediately: fireImmediately);
   }
 
   @override
-  QueryBuilder<OBJ, OBJ, QWhere> where({bool distinct = false, Sort sort = Sort.asc}) {
+  QueryBuilder<OBJ, OBJ, QWhere> where(
+      {bool distinct = false, Sort sort = Sort.asc}) {
     return _isarCollection.where(distinct: distinct, sort: sort);
   }
 }

isar/lib/sentry_span_helper.dart

@@ -24,10 +24,10 @@ class SentrySpanHelper {
   /// @nodoc
   @internal
   Future<T> asyncWrapInSpan<T>(
-      String description,
-      Future<T> Function() execute, {
-        String? dbName,
-      }) async {
+    String description,
+    Future<T> Function() execute, {
+    String? dbName,
+  }) async {
     final currentSpan = _hub.getSpan();
     final span = currentSpan?.startChild(
       SentryIsar.dbOp,
@@ -57,4 +57,4 @@ class SentrySpanHelper {
       await span?.finish();
     }
   }
-}
+}

isar/test/mocks/mocks.dart

@@ -0,0 +1,7 @@
+import 'package:mockito/annotations.dart';
+import 'package:sentry/sentry.dart';
+
+@GenerateMocks([
+  Hub,
+])
+void main() {}