test throwing in base_box, cleanup

Author: denrase

flutter/example/lib/main.dart

@@ -2,7 +2,6 @@
 
 import 'dart:async';
 import 'dart:convert';
-import 'dart:io';
 
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
@@ -439,7 +438,7 @@ class MainScaffold extends StatelessWidget {
       bindToScope: true,
     );
 
-    var appDir = await getApplicationDocumentsDirectory();
+    final appDir = await getApplicationDocumentsDirectory();
     SentryHive.init(appDir.path);
 
     final catsBox = await SentryHive.openBox<Map>('cats');

hive/README.md

@@ -28,6 +28,7 @@ Integration for the [`hive`](https://pub.dev/packages/hive) package.
 import 'package:sentry/sentry.dart';
 import 'package:hive/hive.dart';
 import 'package:sentry_hive/sentry_hive.dart';
+import 'package:path_provider/path_provider.dart';
 
 Future<void> main() async {
   await SentryFlutter.init(
@@ -41,8 +42,9 @@ Future<void> main() async {
 
 Future<void> insertUser() async {
   // Use [SentryHive] where you would use [Hive]
+  final appDir = await getApplicationDocumentsDirectory();
   SentryHive
-    ..init(Directory.current.path)
+    ..init(appDir.path)
     ..registerAdapter(PersonAdapter());
 
   var box = await SentryHive.openBox('testBox');

hive/lib/src/sentry_box_base.dart

@@ -15,7 +15,11 @@ class SentryBoxBase<E> implements BoxBase<E> {
   @override
   Future<int> add(E value) async {
     return _asyncWrapInSpan('add', () async {
-      return await _boxBase.add(value);
+      try {
+        return await _boxBase.add(value);
+      } catch (error) {
+        rethrow;
+      }
     });
   }
 

hive/lib/src/sentry_hive_impl.dart

@@ -118,20 +118,24 @@ class SentryHiveImpl implements SentryHiveInterface {
       Uint8List? bytes,
       String? collection,
       List<int>? encryptionKey}) {
-    return _asyncWrapInSpan('openBox', () async {
-      final Box<E> box = await _hive.openBox(
-        name,
-        encryptionCipher: encryptionCipher,
-        keyComparator: keyComparator,
-        compactionStrategy: compactionStrategy,
-        crashRecovery: crashRecovery,
-        path: path,
-        bytes: bytes,
-        collection: collection,
-        encryptionKey: encryptionKey,
-      );
-      return SentryBox(box, _hub);
-    });
+    return _asyncWrapInSpan(
+      'openBox',
+      () async {
+        final Box<E> box = await _hive.openBox(
+          name,
+          encryptionCipher: encryptionCipher,
+          keyComparator: keyComparator,
+          compactionStrategy: compactionStrategy,
+          crashRecovery: crashRecovery,
+          path: path,
+          bytes: bytes,
+          collection: collection,
+          encryptionKey: encryptionKey,
+        );
+        return SentryBox(box, _hub);
+      },
+      dbName: name,
+    );
   }
 
   @override
@@ -143,19 +147,23 @@ class SentryHiveImpl implements SentryHiveInterface {
       String? path,
       String? collection,
       List<int>? encryptionKey}) {
-    return _asyncWrapInSpan('openLazyBox', () async {
-      final LazyBox<E> lazyBox = await _hive.openLazyBox(
-        name,
-        encryptionCipher: encryptionCipher,
-        keyComparator: keyComparator,
-        compactionStrategy: compactionStrategy,
-        crashRecovery: crashRecovery,
-        path: path,
-        collection: collection,
-        encryptionKey: encryptionKey,
-      );
-      return SentryLazyBox(lazyBox, _hub);
-    });
+    return _asyncWrapInSpan(
+      'openLazyBox',
+      () async {
+        final LazyBox<E> lazyBox = await _hive.openLazyBox(
+          name,
+          encryptionCipher: encryptionCipher,
+          keyComparator: keyComparator,
+          compactionStrategy: compactionStrategy,
+          crashRecovery: crashRecovery,
+          path: path,
+          collection: collection,
+          encryptionKey: encryptionKey,
+        );
+        return SentryLazyBox(lazyBox, _hub);
+      },
+      dbName: name,
+    );
   }
 
   @override
@@ -175,7 +183,10 @@ class SentryHiveImpl implements SentryHiveInterface {
   // Helper
 
   Future<T> _asyncWrapInSpan<T>(
-      String description, Future<T> Function() execute) async {
+    String description,
+    Future<T> Function() execute, {
+    String? dbName,
+  }) async {
     final currentSpan = _hub.getSpan();
     final span = currentSpan?.startChild(
       SentryHiveImpl.dbOp,
@@ -187,6 +198,10 @@ class SentryHiveImpl implements SentryHiveInterface {
 
     span?.setData(SentryHiveImpl.dbSystemKey, SentryHiveImpl.dbSystem);
 
+    if (dbName != null) {
+      span?.setData(SentryHiveImpl.dbNameKey, dbName);
+    }
+
     try {
       final result = await execute();
       span?.status = SpanStatus.ok();

hive/test/mocks/mocks.dart

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