Merge branch 'main' into feat/redact-screenshots-via-view-hierarchy

getsentry · Nov 20, 2024 · d6212ac · d6212ac
2 parents d3a0a2a + 404f5a9
commit d6212ac
Show file tree

Hide file tree

Showing 13 changed files with 54 additions and 18 deletions.
diff --git a/.github/workflows/drift.yml b/.github/workflows/drift.yml
@@ -96,7 +96,7 @@ jobs:
           cd drift
           flutter test --coverage --test-randomize-ordering-seed=random
 
-      - uses: codecov/codecov-action@b9fd7d16f6d7d1b5d2bec1a2887e65ceed900238 # pin@v3
+      - uses: codecov/codecov-action@5c47607acb93fed5485fdbf7232e8a31425f672a # pin@v3
         if: runner.os == 'Linux' && matrix.sdk == 'stable' && matrix.target == 'linux'
         with:
           name: sentry_drift

diff --git a/.github/workflows/flutter.yml b/.github/workflows/flutter.yml
@@ -98,7 +98,7 @@ jobs:
           flutter test --coverage --test-randomize-ordering-seed=random
           dart run remove_from_coverage -f coverage/lcov.info -r 'binding.dart'
 
-      - uses: codecov/codecov-action@b9fd7d16f6d7d1b5d2bec1a2887e65ceed900238 # pin@v3
+      - uses: codecov/codecov-action@5c47607acb93fed5485fdbf7232e8a31425f672a # pin@v3
         if: matrix.sdk == 'stable' && matrix.target == 'linux'
         with:
           name: sentry_flutter

diff --git a/.github/workflows/isar.yml b/.github/workflows/isar.yml
@@ -96,7 +96,7 @@ jobs:
           cd isar
           flutter test -j 1 --coverage --test-randomize-ordering-seed=random
 
-      - uses: codecov/codecov-action@b9fd7d16f6d7d1b5d2bec1a2887e65ceed900238 # pin@v3
+      - uses: codecov/codecov-action@5c47607acb93fed5485fdbf7232e8a31425f672a # pin@v3
         if: runner.os == 'Linux' && matrix.sdk == 'stable' && matrix.target == 'linux'
         with:
           name: sentry_isar

diff --git a/.github/workflows/sqflite.yml b/.github/workflows/sqflite.yml
@@ -96,7 +96,7 @@ jobs:
           cd sqflite
           flutter test --coverage --test-randomize-ordering-seed=random
 
-      - uses: codecov/codecov-action@b9fd7d16f6d7d1b5d2bec1a2887e65ceed900238 # pin@v3
+      - uses: codecov/codecov-action@5c47607acb93fed5485fdbf7232e8a31425f672a # pin@v3
         if: runner.os == 'Linux' && matrix.sdk == 'stable' && matrix.target == 'linux'
         with:
           name: sentry_sqflite

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 ### Enhancements
 
+- Only send debug images referenced in the stacktrace for events ([#2329](https://github.com/getsentry/sentry-dart/pull/2329))
 - Remove `sentry` frames if SDK falls back to current stack trace ([#2351](https://github.com/getsentry/sentry-dart/pull/2351))  
   - Flutter doesn't always provide stack traces for unhandled errors - this is normal Flutter behavior
   - When no stack trace is provided (in Flutter errors, `captureException`, or `captureMessage`):
@@ -65,9 +66,12 @@
 
 ### Dependencies
 
-- Bump Android SDK from v7.16.0 to v7.17.0 ([#2408](https://github.com/getsentry/sentry-dart/pull/2408))
-  - [changelog](https://github.com/getsentry/sentry-java/blob/main/CHANGELOG.md#7170)
-  - [diff](https://github.com/getsentry/sentry-java/compare/7.16.0...7.17.0)
+- Bump Android SDK from v7.16.0 to v7.18.0 ([#2408](https://github.com/getsentry/sentry-dart/pull/2408), [#2419](https://github.com/getsentry/sentry-dart/pull/2419))
+  - [changelog](https://github.com/getsentry/sentry-java/blob/main/CHANGELOG.md#7180)
+  - [diff](https://github.com/getsentry/sentry-java/compare/7.16.0...7.18.0)
+- Bump Native SDK from v0.7.12 to v0.7.13 ([#2420](https://github.com/getsentry/sentry-dart/pull/2420))
+  - [changelog](https://github.com/getsentry/sentry-native/blob/master/CHANGELOG.md#0713)
+  - [diff](https://github.com/getsentry/sentry-native/compare/0.7.12...0.7.13)
 
 ## 8.10.1
 

diff --git a/flutter/android/build.gradle b/flutter/android/build.gradle
@@ -60,7 +60,7 @@ android {
 }
 
 dependencies {
-    api 'io.sentry:sentry-android:7.17.0'
+    api 'io.sentry:sentry-android:7.18.0'
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
 
     // Required -- JUnit 4 framework

diff --git a/flutter/example/android/build.gradle b/flutter/example/android/build.gradle
@@ -10,7 +10,7 @@ buildscript {
         classpath 'io.sentry:sentry-android-gradle-plugin:4.12.0'
         classpath 'com.android.tools.build:gradle:8.3.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath 'io.github.howardpang:androidNativeBundle:1.1.3'
+        classpath 'io.github.howardpang:androidNativeBundle:1.1.5'
     }
 }
 

diff --git a/flutter/ios/Classes/SentryFlutterPlugin.h b/flutter/ios/Classes/SentryFlutterPlugin.h
@@ -4,5 +4,7 @@
     #import <FlutterMacOS/FlutterMacOS.h>
 #endif
 
+#import <Sentry/SentryDebugImageProvider.h>
+
 @interface SentryFlutterPlugin : NSObject<FlutterPlugin>
 @end
diff --git a/flutter/ios/Classes/SentryFlutterPluginApple.swift b/flutter/ios/Classes/SentryFlutterPluginApple.swift
@@ -96,7 +96,7 @@ public class SentryFlutterPluginApple: NSObject, FlutterPlugin {
             loadContexts(result: result)
 
         case "loadImageList":
-            loadImageList(result: result)
+            loadImageList(call, result: result)
 
         case "initNativeSdk":
             initNativeSdk(call, result: result)
@@ -277,9 +277,32 @@ public class SentryFlutterPluginApple: NSObject, FlutterPlugin {
         }
     }
 
-    private func loadImageList(result: @escaping FlutterResult) {
-      let debugImages = PrivateSentrySDKOnly.getDebugImages() as [DebugMeta]
-      result(debugImages.map { $0.serialize() })
+    private func loadImageList(_ call: FlutterMethodCall, result: @escaping FlutterResult) {
+        var debugImages: [DebugMeta] = []
+
+        if let arguments = call.arguments as? [String], !arguments.isEmpty {
+            var imagesAddresses: Set<String> = []
+
+            for argument in arguments {
+                let hexDigits = argument.replacingOccurrences(of: "0x", with: "")
+                if let instructionAddress = UInt64(hexDigits, radix: 16) {
+                    let image = SentryDependencyContainer.sharedInstance().binaryImageCache.image(
+                        byAddress: instructionAddress)
+                    if let image = image {
+                        let imageAddress = sentry_formatHexAddressUInt64(image.address)!
+                        imagesAddresses.insert(imageAddress)
+                    }
+                }
+            }
+            debugImages =
+              SentryDependencyContainer.sharedInstance().debugImageProvider
+              .getDebugImagesForImageAddressesFromCache(imageAddresses: imagesAddresses) as [DebugMeta]
+        }
+        if debugImages.isEmpty {
+            debugImages = PrivateSentrySDKOnly.getDebugImages() as [DebugMeta]
+        }
+
+        result(debugImages.map { $0.serialize() })
     }
 
     private func initNativeSdk(_ call: FlutterMethodCall, result: @escaping FlutterResult) {

diff --git a/flutter/lib/src/native/sentry_native_channel.dart b/flutter/lib/src/native/sentry_native_channel.dart
@@ -186,8 +186,15 @@ class SentryNativeChannel
   @override
   Future<List<DebugImage>?> loadDebugImages(SentryStackTrace stackTrace) =>
       tryCatchAsync('loadDebugImages', () async {
-        final images = await channel
-            .invokeListMethod<Map<dynamic, dynamic>>('loadImageList');
+        Set<String> instructionAddresses = {};
+        for (final frame in stackTrace.frames) {
+          if (frame.instructionAddr != null) {
+            instructionAddresses.add(frame.instructionAddr!);
+          }
+        }
+
+        final images = await channel.invokeListMethod<Map<dynamic, dynamic>>(
+            'loadImageList', instructionAddresses.toList());
         return images
             ?.map((e) => e.cast<String, dynamic>())
             .map(DebugImage.fromJson)

diff --git a/flutter/sentry-native/CMakeCache.txt b/flutter/sentry-native/CMakeCache.txt
@@ -2,4 +2,4 @@
 # Basically, this is a properties file we use both in CMake and update-deps.yml to update dependencies.
 
 repo=https://github.com/getsentry/sentry-native
-version=0.7.12
+version=0.7.13
diff --git a/flutter/test/sentry_native_channel_test.dart b/flutter/test/sentry_native_channel_test.dart
@@ -291,7 +291,7 @@ void main() {
           }
         ];
 
-        when(channel.invokeMethod('loadImageList'))
+        when(channel.invokeMethod('loadImageList', any))
             .thenAnswer((invocation) async => json);
 
         final data = await sut.loadDebugImages(SentryStackTrace(frames: []));

diff --git a/metrics/flutter.properties b/metrics/flutter.properties
@@ -1,2 +1,2 @@
-version = 3.24.4
+version = 3.24.5
 repo = https://github.com/flutter/flutter