Merge branch 'main' into feat/hive

denrase · denrase · commit aeed961af66d · 2023-11-13T15:23:34.000+01:00
diff --git a/.github/workflows/analyze.yml b/.github/workflows/analyze.yml
@@ -34,7 +34,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: dart-lang/setup-dart@b64355ae6ca0b5d484f0106a033dd1388965d06d # pin@v1
         if: ${{ inputs.sdk == 'dart' }}
-      - uses: subosito/flutter-action@48cafc24713cca54bbe03cdc3a423187d413aafa # pin@v2.10.0
+      - uses: subosito/flutter-action@2783a3f08e1baf891508463f8c6653c258246225 # pin@v2.12.0
         if: ${{ inputs.sdk == 'flutter' }}
 
       - run: ${{ inputs.sdk }} pub get
diff --git a/.github/workflows/flutter.yml b/.github/workflows/flutter.yml
@@ -82,7 +82,7 @@ jobs:
           sudo apt install -y network-manager upower
         if: matrix.os == 'ubuntu-latest' && matrix.target == 'linux'
 
-      - uses: subosito/flutter-action@48cafc24713cca54bbe03cdc3a423187d413aafa # pin@v2.10.0
+      - uses: subosito/flutter-action@2783a3f08e1baf891508463f8c6653c258246225 # pin@v2.12.0
         with:
           channel: ${{ matrix.sdk }}
 
@@ -201,6 +201,6 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       # To recreate baseline run: detekt -i flutter/android,flutter/example/android -b flutter/config/detekt-bl.xml -cb
-      - uses: natiginfo/action-detekt-all@e01de6ff0eef7c24131e8a133bf598cfac6ceeab # pin@1.21.0
+      - uses: natiginfo/action-detekt-all@be3c18799c7c392b2f41a674beed9ced7ae2f21b # pin@1.23.1
         with:
           args: -i flutter/android,flutter/example/android --baseline flutter/config/detekt-bl.xml --jvm-target 1.8 --build-upon-default-config --all-rules
diff --git a/.github/workflows/flutter_test.yml b/.github/workflows/flutter_test.yml
@@ -40,7 +40,7 @@ jobs:
           distribution: "adopt"
           java-version: "11"
 
-      - uses: subosito/flutter-action@48cafc24713cca54bbe03cdc3a423187d413aafa # pin@v2.10.0
+      - uses: subosito/flutter-action@2783a3f08e1baf891508463f8c6653c258246225 # pin@v2.12.0
         with:
           channel: ${{ matrix.sdk }}
 
@@ -122,7 +122,7 @@ jobs:
       - name: checkout
         uses: actions/checkout@v4
 
-      - uses: subosito/flutter-action@48cafc24713cca54bbe03cdc3a423187d413aafa # pin@v2.10.0
+      - uses: subosito/flutter-action@2783a3f08e1baf891508463f8c6653c258246225 # pin@v2.12.0
         with:
           channel: ${{ matrix.sdk }}
 
diff --git a/.github/workflows/format-and-fix.yml b/.github/workflows/format-and-fix.yml
@@ -32,7 +32,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: dart-lang/setup-dart@b64355ae6ca0b5d484f0106a033dd1388965d06d # pin@v1
         if: ${{ matrix.package.sdk == 'dart' }}
-      - uses: subosito/flutter-action@48cafc24713cca54bbe03cdc3a423187d413aafa # pin@v2.10.0
+      - uses: subosito/flutter-action@2783a3f08e1baf891508463f8c6653c258246225 # pin@v2.12.0
         if: ${{ matrix.package.sdk == 'flutter' }}
 
       - run: ${{ matrix.package.sdk }} pub get
diff --git a/.github/workflows/metrics.yml b/.github/workflows/metrics.yml
@@ -53,7 +53,7 @@ jobs:
           echo "flutter=$version" >> "$GITHUB_OUTPUT"
 
       - name: Install Flutter v${{ steps.conf.outputs.flutter }}
-        uses: subosito/flutter-action@48cafc24713cca54bbe03cdc3a423187d413aafa # pin@v2.10.0
+        uses: subosito/flutter-action@2783a3f08e1baf891508463f8c6653c258246225 # pin@v2.12.0
         with:
           flutter-version: ${{ steps.conf.outputs.flutter }}
 
diff --git a/.github/workflows/min_version_test.yml b/.github/workflows/min_version_test.yml
@@ -32,7 +32,7 @@ jobs:
           distribution: "adopt"
           java-version: "11"
 
-      - uses: subosito/flutter-action@48cafc24713cca54bbe03cdc3a423187d413aafa # pin@v2.10.0
+      - uses: subosito/flutter-action@2783a3f08e1baf891508463f8c6653c258246225 # pin@v2.12.0
         with:
           flutter-version: "3.0.0"
 
@@ -49,7 +49,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - uses: subosito/flutter-action@48cafc24713cca54bbe03cdc3a423187d413aafa # pin@v2.10.0
+      - uses: subosito/flutter-action@2783a3f08e1baf891508463f8c6653c258246225 # pin@v2.12.0
         with:
           flutter-version: "3.0.0"
 
@@ -66,7 +66,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - uses: subosito/flutter-action@48cafc24713cca54bbe03cdc3a423187d413aafa # pin@v2.10.0
+      - uses: subosito/flutter-action@2783a3f08e1baf891508463f8c6653c258246225 # pin@v2.12.0
         with:
           flutter-version: "3.0.0"
 
diff --git a/.github/workflows/sqflite.yml b/.github/workflows/sqflite.yml
@@ -78,7 +78,7 @@ jobs:
           sudo apt install -y network-manager upower
         if: matrix.os == 'ubuntu-latest' && matrix.target == 'linux'
 
-      - uses: subosito/flutter-action@48cafc24713cca54bbe03cdc3a423187d413aafa # pin@v2.10.0
+      - uses: subosito/flutter-action@2783a3f08e1baf891508463f8c6653c258246225 # pin@v2.12.0
         with:
           channel: ${{ matrix.sdk }}
 
diff --git a/.github/workflows/web-example-ghpages.yml b/.github/workflows/web-example-ghpages.yml
@@ -14,7 +14,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
-      - uses: subosito/flutter-action@48cafc24713cca54bbe03cdc3a423187d413aafa # pin@v2.10.0
+      - uses: subosito/flutter-action@2783a3f08e1baf891508463f8c6653c258246225 # pin@v2.12.0
       - uses: bluefireteam/flutter-gh-pages@57815b17b371455ec1a98f075b71b4c6ba0a938c # pin@v8
         with:
           workingDir: flutter/example
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,16 +2,25 @@
 
 ## Unreleased
 
+### Fixes 
+
+- Unsupported types with Expando ([#1690](https://github.com/getsentry/sentry-dart/pull/1690))
+
 ### Features
 
+- StackTraces in `PlatformException.message` will get nicely formatted too when present ([#1716](https://github.com/getsentry/sentry-dart/pull/1716))
 - Breadcrumbs for database operations ([#1656](https://github.com/getsentry/sentry-dart/pull/1656))
 - APM for hive ([#1672](https://github.com/getsentry/sentry-dart/pull/1672))
+- Add `attachScreenshotOnlyWhenResumed` to options ([#1700](https://github.com/getsentry/sentry-dart/pull/1700))
 
 ### Dependencies
 
-- Bump Android SDK from v6.32.0 to v6.33.0 ([#1710](https://github.com/getsentry/sentry-dart/pull/1710))
-  - [changelog](https://github.com/getsentry/sentry-java/blob/main/CHANGELOG.md#6330)
-  - [diff](https://github.com/getsentry/sentry-java/compare/6.32.0...6.33.0)
+- Bump Android SDK from v6.32.0 to v6.33.1 ([#1710](https://github.com/getsentry/sentry-dart/pull/1710), [#1713](https://github.com/getsentry/sentry-dart/pull/1713))
+  - [changelog](https://github.com/getsentry/sentry-java/blob/main/CHANGELOG.md#6331)
+  - [diff](https://github.com/getsentry/sentry-java/compare/6.32.0...6.33.1)
+- Bump Cocoa SDK from v8.14.2 to v8.15.2 ([#1712](https://github.com/getsentry/sentry-dart/pull/1712), [#1714](https://github.com/getsentry/sentry-dart/pull/1714), [#1717](https://github.com/getsentry/sentry-dart/pull/1717))
+  - [changelog](https://github.com/getsentry/sentry-cocoa/blob/main/CHANGELOG.md#8152)
+  - [diff](https://github.com/getsentry/sentry-cocoa/compare/8.14.2...8.15.2)
 
 ## 7.12.0
 
diff --git a/dart/lib/src/hub.dart b/dart/lib/src/hub.dart
@@ -605,6 +605,8 @@ class _WeakMap {
 
   final SentryOptions _options;
 
+  final throwableHandler = UnsupportedThrowablesHandler();
+
   _WeakMap(this._options);
 
   void add(
@@ -615,6 +617,7 @@ class _WeakMap {
     if (throwable == null) {
       return;
     }
+    throwable = throwableHandler.wrapIfUnsupportedType(throwable);
     try {
       if (_expando[throwable] == null) {
         _expando[throwable] = MapEntry(span, transaction);
@@ -633,6 +636,7 @@ class _WeakMap {
     if (throwable == null) {
       return null;
     }
+    throwable = throwableHandler.wrapIfUnsupportedType(throwable);
     try {
       return _expando[throwable] as MapEntry<ISentrySpan, String>?;
     } catch (exception, stackTrace) {
@@ -646,3 +650,35 @@ class _WeakMap {
     return null;
   }
 }
+
+/// A handler for unsupported throwables used for Expando<Object>.
+@visibleForTesting
+class UnsupportedThrowablesHandler {
+  final _unsupportedTypes = {String, int, double, bool};
+  final _unsupportedThrowables = <Object>{};
+
+  dynamic wrapIfUnsupportedType(dynamic throwable) {
+    if (_unsupportedTypes.contains(throwable.runtimeType)) {
+      throwable = _UnsupportedExceptionWrapper(Exception(throwable));
+      _unsupportedThrowables.add(throwable);
+    }
+    return _unsupportedThrowables.lookup(throwable) ?? throwable;
+  }
+}
+
+class _UnsupportedExceptionWrapper {
+  _UnsupportedExceptionWrapper(this.exception);
+
+  final Exception exception;
+
+  @override
+  bool operator ==(Object other) {
+    if (other is _UnsupportedExceptionWrapper) {
+      return other.exception.toString() == exception.toString();
+    }
+    return false;
+  }
+
+  @override
+  int get hashCode => exception.toString().hashCode;
+}
diff --git a/dart/test/hub_test.dart b/dart/test/hub_test.dart
@@ -150,8 +150,8 @@ void main() {
 
       final capturedEvent = fixture.client.captureEventCalls.first;
 
-      expect(capturedEvent.event.transaction, isNull);
-      expect(capturedEvent.event.contexts.trace, isNull);
+      expect(capturedEvent.event.transaction, 'test');
+      expect(capturedEvent.event.contexts.trace, isNotNull);
     });
   });
 
diff --git a/dart/test/unsupported_throwables_test.dart b/dart/test/unsupported_throwables_test.dart
@@ -0,0 +1,92 @@
+import 'package:sentry/src/hub.dart';
+import 'package:test/expect.dart';
+import 'package:test/scaffolding.dart';
+
+void main() {
+  late Fixture fixture;
+
+  setUp(() {
+    fixture = Fixture();
+  });
+
+  group('unsupported throwable types', () {
+    test('wrapped string throwable does not throw when expanding', () async {
+      final throwableHandler = fixture.sut;
+      final unsupportedThrowable = 'test throwable';
+      final wrappedThrowable =
+          throwableHandler.wrapIfUnsupportedType(unsupportedThrowable);
+
+      expect(() {
+        fixture.expando[wrappedThrowable];
+      }, returnsNormally);
+    });
+
+    test('wrapped int throwable does not throw when expanding', () async {
+      final throwableHandler = fixture.sut;
+      final unsupportedThrowable = 1;
+      final wrappedThrowable =
+          throwableHandler.wrapIfUnsupportedType(unsupportedThrowable);
+
+      expect(() {
+        fixture.expando[wrappedThrowable];
+      }, returnsNormally);
+    });
+
+    test('wrapped double throwable does not throw when expanding', () async {
+      final throwableHandler = fixture.sut;
+      final unsupportedThrowable = 1.0;
+      final wrappedThrowable =
+          throwableHandler.wrapIfUnsupportedType(unsupportedThrowable);
+
+      expect(() {
+        fixture.expando[wrappedThrowable];
+      }, returnsNormally);
+    });
+
+    test('wrapped bool throwable does not throw when expanding', () async {
+      final throwableHandler = fixture.sut;
+      final unsupportedThrowable = true;
+      final wrappedThrowable =
+          throwableHandler.wrapIfUnsupportedType(unsupportedThrowable);
+
+      expect(() {
+        fixture.expando[wrappedThrowable];
+      }, returnsNormally);
+    });
+
+    test(
+        'creating multiple instances of string wrapped exceptions accesses the same expando value',
+        () async {
+      final unsupportedThrowable = 'test throwable';
+      final throwableHandler = fixture.sut;
+
+      final first =
+          throwableHandler.wrapIfUnsupportedType(unsupportedThrowable);
+      fixture.expando[first] = 1;
+
+      final second =
+          throwableHandler.wrapIfUnsupportedType(unsupportedThrowable);
+      expect(fixture.expando[second], 1);
+      fixture.expando[second] = 2.0;
+
+      final third =
+          throwableHandler.wrapIfUnsupportedType(unsupportedThrowable);
+      expect(fixture.expando[third], 2.0);
+    });
+  });
+
+  group('supported throwable type', () {
+    test('does not wrap exception if it is a supported type', () async {
+      final supportedThrowable = Exception('test throwable');
+      final result = fixture.sut.wrapIfUnsupportedType(supportedThrowable);
+
+      expect(result, supportedThrowable);
+    });
+  });
+}
+
+class Fixture {
+  final expando = Expando();
+
+  UnsupportedThrowablesHandler get sut => UnsupportedThrowablesHandler();
+}
diff --git a/flutter/android/build.gradle b/flutter/android/build.gradle
@@ -60,7 +60,7 @@ android {
 }
 
 dependencies {
-    api 'io.sentry:sentry-android:6.33.0'
+    api 'io.sentry:sentry-android:6.33.1'
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
 
     // Required -- JUnit 4 framework
diff --git a/flutter/example/android/app/src/main/kotlin/io/sentry/samples/flutter/MainActivity.kt b/flutter/example/android/app/src/main/kotlin/io/sentry/samples/flutter/MainActivity.kt
@@ -11,37 +11,33 @@ class MainActivity : FlutterActivity() {
 
   override fun configureFlutterEngine(flutterEngine: FlutterEngine) {
     super.configureFlutterEngine(flutterEngine)
-    MethodChannel(flutterEngine.dartExecutor.binaryMessenger, _channel).setMethodCallHandler {
-        call, result ->
+    MethodChannel(
+      flutterEngine.dartExecutor.binaryMessenger,
+      _channel,
+    ).setMethodCallHandler { call, result ->
       // Note: this method is invoked on the main thread.
       when (call.method) {
-        "throw" -> {
+        "throw" ->
           thread(isDaemon = true) {
             throw Exception("Catch this java exception thrown from Kotlin thread!")
           }
-        }
-        "anr" -> {
-          Thread.sleep(6_000)
-        }
-        "capture" -> {
+
+        "anr" -> Thread.sleep(6_000)
+
+        "capture" ->
           try {
             throw RuntimeException("Catch this java exception!")
           } catch (e: Exception) {
             Sentry.captureException(e)
           }
-        }
-        "crash" -> {
-          crash()
-        }
-        "cpp_capture_message" -> {
-          message()
-        }
-        "platform_exception" -> {
-          throw RuntimeException("Catch this platform exception!")
-        }
-        else -> {
-          result.notImplemented()
-        }
+
+        "crash" -> crash()
+
+        "cpp_capture_message" -> message()
+
+        "platform_exception" -> throw RuntimeException("Catch this platform exception!")
+
+        else -> result.notImplemented()
       }
       result.success("")
     }
diff --git a/flutter/ios/sentry_flutter.podspec b/flutter/ios/sentry_flutter.podspec
@@ -12,7 +12,7 @@ Sentry SDK for Flutter with support to native through sentry-cocoa.
                          :tag => s.version.to_s }
   s.source_files     = 'Classes/**/*'
   s.public_header_files = 'Classes/**/*.h'
-  s.dependency 'Sentry/HybridSDK', '8.14.2'
+  s.dependency 'Sentry/HybridSDK', '8.15.2'
   s.ios.dependency 'Flutter'
   s.osx.dependency 'FlutterMacOS'
   s.ios.deployment_target = '11.0'
diff --git a/flutter/lib/src/event_processor/android_platform_exception_event_processor.dart b/flutter/lib/src/event_processor/android_platform_exception_event_processor.dart
diff --git a/flutter/lib/src/event_processor/screenshot_event_processor.dart b/flutter/lib/src/event_processor/screenshot_event_processor.dart
diff --git a/flutter/lib/src/native/cocoa/binding.dart b/flutter/lib/src/native/cocoa/binding.dart
diff --git a/flutter/lib/src/sentry_flutter_options.dart b/flutter/lib/src/sentry_flutter_options.dart
diff --git a/flutter/test/android_platform_exception_event_processor_test.dart b/flutter/test/android_platform_exception_event_processor_test.dart
