feat: reenable windows obfuscation support (#2426)

vaind · web-flow · commit be7a8317f8bd · 2024-11-21T13:37:55.000+01:00
* Revert "chore: temporarily disable sentry-native Windows integration (#2363)" This reverts commit 752e1cb. * update sentry plugin dependency * chore: update changelog * roll back sentry-native to v0.7.2
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,9 +1,10 @@
 # Changelog
 
 ## Unreleased
-  
+
 ### Features
 
+- Windows native error & obfuscation support ([#2286](https://github.com/getsentry/sentry-dart/pull/2286), [#2426](https://github.com/getsentry/sentry-dart/pull/2426))
 - Improve app start measurements by using `addTimingsCallback` instead of `addPostFrameCallback` to determine app start end ([#2405](https://github.com/getsentry/sentry-dart/pull/2405))
   - ⚠️ This change may result in reporting of shorter app start durations
 - Improve frame tracking accuracy ([#2372](https://github.com/getsentry/sentry-dart/pull/2372))
@@ -14,7 +15,7 @@
   void main() async {
     // Replace WidgetsFlutterBinding.ensureInitialized()
     SentryWidgetsFlutterBinding.ensureInitialized();
-    
+
     await SentryFlutter.init(...);
     runApp(MyApp());
   }
@@ -24,7 +25,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))  
+- 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`):
     - SDK creates a synthetic trace using `StackTrace.current`
@@ -44,9 +45,6 @@
 - 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
 
@@ -101,15 +99,15 @@
     ),
   );
   ```
-  
+
 - Add screenshot to `SentryFeedbackWidget` ([#2369](https://github.com/getsentry/sentry-dart/pull/2369))
   - Use `SentryFlutter.captureScreenshot` to create a screenshot attachment
   - Call `SentryFeedbackWidget` with this attachment to add it to the user feedback
 
   ```dart
   final id = await Sentry.captureMessage('UserFeedback');
   final screenshot = await SentryFlutter.captureScreenshot();
-  
+
   Navigator.push(
     context,
     MaterialPageRoute(
@@ -127,7 +125,7 @@
 - Avoid sending too many empty client reports when Http Transport is used ([#2380](https://github.com/getsentry/sentry-dart/pull/2380))
 - Cache parsed DSN ([#2365](https://github.com/getsentry/sentry-dart/pull/2365))
 - Handle backpressure earlier in pipeline ([#2371](https://github.com/getsentry/sentry-dart/pull/2371))
-  - Drops max un-awaited parallel tasks earlier, so event processors & callbacks are not executed for them. 
+  - Drops max un-awaited parallel tasks earlier, so event processors & callbacks are not executed for them.
   - Change by setting `SentryOptions.maxQueueSize`. Default is 30.
 - Use native spotlight integrations on Flutter Android, iOS, macOS ([#2285](https://github.com/getsentry/sentry-dart/pull/2285))
 - Improve app start integration ([#2266](https://github.com/getsentry/sentry-dart/pull/2266))
@@ -154,7 +152,7 @@
 
 - Metrics API ([#2312](https://github.com/getsentry/sentry-dart/pull/2312))
   - Learn more: https://sentry.zendesk.com/hc/en-us/articles/26369339769883-Metrics-Beta-Coming-to-an-End
-  
+
 ### Dependencies
 
 - Bump Native SDK from v0.7.10 to v0.7.12 ([#2390](https://github.com/getsentry/sentry-dart/pull/2390))
diff --git a/dart/lib/src/platform_checker.dart b/dart/lib/src/platform_checker.dart
@@ -44,9 +44,10 @@ class PlatformChecker {
     // the OS checks return true when the browser runs on the checked platform.
     // Example: platform.isAndroid return true if the browser is used on an
     // Android device.
-    return platform.isAndroid || platform.isIOS || platform.isMacOS;
-    // Temporarily disabled due to https://github.com/getsentry/sentry-dart-plugin/issues/270
-    // platform.isWindows
+    return platform.isAndroid ||
+        platform.isIOS ||
+        platform.isMacOS ||
+        platform.isWindows;
   }
 
   static bool _isWebWithWasmSupport() {
diff --git a/flutter/example/pubspec.yaml b/flutter/example/pubspec.yaml
@@ -38,7 +38,7 @@ dependencies:
 
 dev_dependencies:
   flutter_lints: ^2.0.0
-  sentry_dart_plugin: ^1.1.0
+  sentry_dart_plugin: ^2.2.0
   integration_test:
     sdk: flutter
   flutter_test:
@@ -61,3 +61,4 @@ sentry:
   commits: true
   ignore_missing: true
   log_level: info
+  symbols_path: build/symbols
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.13
+version=0.7.12
diff --git a/flutter/test/sentry_flutter_test.dart b/flutter/test/sentry_flutter_test.dart
@@ -249,11 +249,8 @@ void main() {
         hasFileSystemTransport: false,
       );
 
-      // Temporarily disabled due to https://github.com/getsentry/sentry-dart-plugin/issues/270
-      // testScopeObserver(
-      //     options: sentryFlutterOptions, expectedHasNativeScopeObserver: true);
       testScopeObserver(
-          options: sentryFlutterOptions, expectedHasNativeScopeObserver: false);
+          options: sentryFlutterOptions, expectedHasNativeScopeObserver: true);
 
       testConfiguration(
         integrations: integrations,
@@ -274,9 +271,7 @@ void main() {
           beforeIntegration: WidgetsFlutterBindingIntegration,
           afterIntegration: OnErrorIntegration);
 
-      // Temporarily disabled due to https://github.com/getsentry/sentry-dart-plugin/issues/270
-      // expect(SentryFlutter.native, isNotNull);
-      expect(SentryFlutter.native, isNull);
+      expect(SentryFlutter.native, isNotNull);
       expect(Sentry.currentHub.profilerFactory, isNull);
     }, testOn: 'vm');
 
diff --git a/flutter/test/sentry_native/sentry_native_test.dart b/flutter/test/sentry_native/sentry_native_test.dart
@@ -12,7 +12,4 @@ import 'sentry_native_test_web.dart'
 
 // Defining main() here allows us to manually run/debug from VSCode.
 // If we didn't need that, we could just `export` above.
-
-// Temporarily disabled due to https://github.com/getsentry/sentry-dart-plugin/issues/270
-// void main() => actual.main();
-void main() {}
+void main() => actual.main();
diff --git a/flutter/windows/CMakeLists.txt b/flutter/windows/CMakeLists.txt
@@ -4,13 +4,8 @@
 # customers of the plugin.
 cmake_minimum_required(VERSION 3.14)
 
-# Temporarily disabled due to https://github.com/getsentry/sentry-dart-plugin/issues/270
-# include("${CMAKE_CURRENT_SOURCE_DIR}/../sentry-native/sentry-native.cmake")
+include("${CMAKE_CURRENT_SOURCE_DIR}/../sentry-native/sentry-native.cmake")
 
-# # Even though sentry_flutter doesn't actually provide a useful plugin, we need to accomodate the Flutter tooling.
-# # sentry_flutter/sentry_flutter_plugin.h is included by the flutter-tool generated plugin registrar:
-# target_include_directories(sentry INTERFACE ${CMAKE_CURRENT_LIST_DIR})
-
-# Temp code: replace with the previous code when sentry-native is enabled
-add_library(sentry_flutter_plugin temp.cpp)
-target_include_directories(sentry_flutter_plugin INTERFACE ${CMAKE_CURRENT_LIST_DIR})
+# Even though sentry_flutter doesn't actually provide a useful plugin, we need to accomodate the Flutter tooling.
+# sentry_flutter/sentry_flutter_plugin.h is included by the flutter-tool generated plugin registrar:
+target_include_directories(sentry INTERFACE ${CMAKE_CURRENT_LIST_DIR})
diff --git a/flutter/windows/temp.cpp b/flutter/windows/temp.cpp
