Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: temporarily disable sentry-native Windows integration #2363

Merged
merged 3 commits into from
Oct 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# Changelog

## Unreleased

### Fixes

- Temporarily disable Windows native error & obfuscation support ([#2363](https://github.com/getsentry/sentry-dart/pull/2363))

## 8.10.0-beta.1

### Features
Expand Down
7 changes: 3 additions & 4 deletions dart/lib/src/platform_checker.dart
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,9 @@ 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 ||
platform.isWindows;
return platform.isAndroid || platform.isIOS || platform.isMacOS;
// Temporarily disabled due to https://github.com/getsentry/sentry-dart-plugin/issues/270
// platform.isWindows
}

static bool _isWebWithWasmSupport() {
Expand Down
9 changes: 7 additions & 2 deletions flutter/test/sentry_flutter_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -249,8 +249,11 @@ 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: true);
options: sentryFlutterOptions, expectedHasNativeScopeObserver: false);

testConfiguration(
integrations: integrations,
Expand All @@ -271,7 +274,9 @@ void main() {
beforeIntegration: WidgetsFlutterBindingIntegration,
afterIntegration: OnErrorIntegration);

expect(SentryFlutter.native, isNotNull);
// Temporarily disabled due to https://github.com/getsentry/sentry-dart-plugin/issues/270
// expect(SentryFlutter.native, isNotNull);
expect(SentryFlutter.native, isNull);
expect(Sentry.currentHub.profilerFactory, isNull);
}, testOn: 'vm');

Expand Down
5 changes: 4 additions & 1 deletion flutter/test/sentry_native/sentry_native_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,7 @@ 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.
void main() => actual.main();

// Temporarily disabled due to https://github.com/getsentry/sentry-dart-plugin/issues/270
// void main() => actual.main();
void main() {}
13 changes: 9 additions & 4 deletions flutter/windows/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,13 @@
# customers of the plugin.
cmake_minimum_required(VERSION 3.14)

include("${CMAKE_CURRENT_SOURCE_DIR}/../sentry-native/sentry-native.cmake")
# Temporarily disabled due to https://github.com/getsentry/sentry-dart-plugin/issues/270
# 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})
# # 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})
1 change: 1 addition & 0 deletions flutter/windows/temp.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
// Temp code, see cmakelists.txt for more info
Loading