update

Author: buenaflor

dart/lib/src/sentry_client.dart

@@ -63,7 +63,12 @@ class SentryClient {
       final rateLimiter = RateLimiter(options);
       options.transport = HttpTransport(options, rateLimiter);
     }
-    if (options.spotlight.enabled) {
+    // TODO: Web might change soon to use the JS SDK so we can remove it here later on
+    final enableSpotlight = (options.spotlight.enabled &&
+        (options.platformChecker.isWeb ||
+            options.platformChecker.platform.isLinux ||
+            options.platformChecker.platform.isWindows));
+    if (enableSpotlight) {
       options.transport = SpotlightHttpTransport(options, options.transport);
     }
     return SentryClient._(options);

dart/lib/src/spotlight.dart

@@ -8,14 +8,7 @@ class Spotlight {
   /// The Spotlight Sidecar URL.
   /// Defaults to http://10.0.2.2:8969/stream due to Emulator on Android.
   /// Otherwise defaults to http://localhost:8969/stream.
-  String url;
+  String? url;
 
-  Spotlight({required this.enabled, String? url})
-      : url = url ?? _defaultSpotlightUrl();
-}
-
-String _defaultSpotlightUrl() {
-  return (PlatformChecker().platform.isAndroid
-      ? 'http://10.0.2.2:8969/stream'
-      : 'http://localhost:8969/stream');
+  Spotlight({required this.enabled, this.url});
 }

dart/lib/src/transport/spotlight_http_transport.dart

@@ -8,6 +8,8 @@ import '../http_client/client_provider.dart'
     if (dart.library.io) '../http_client/io_client_provider.dart';
 
 /// Spotlight HTTP transport decorator that sends Sentry envelopes to both Sentry and Spotlight.
+/// This will be used on platforms that do not have native SDK support.
+/// Platforms with native SDK support will configure spotlight directly in the native SDK options.
 class SpotlightHttpTransport extends Transport {
   final SentryOptions _options;
   final Transport _transport;
@@ -21,8 +23,8 @@ class SpotlightHttpTransport extends Transport {
   }
 
   SpotlightHttpTransport._(this._options, this._transport)
-      : _requestHandler = HttpTransportRequestHandler(
-            _options, Uri.parse(_options.spotlight.url));
+      : _requestHandler = HttpTransportRequestHandler(_options,
+            Uri.parse(_options.spotlight.url ?? _defaultSpotlightUrl()));
 
   @override
   Future<SentryId?> send(SentryEnvelope envelope) async {
@@ -48,3 +50,7 @@ class SpotlightHttpTransport extends Transport {
         target: 'Spotlight');
   }
 }
+
+String _defaultSpotlightUrl() {
+  return 'http://localhost:8969/stream';
+}

flutter/android/src/main/kotlin/io/sentry/flutter/SentryFlutter.kt

@@ -81,6 +81,12 @@ class SentryFlutter(
     data.getIfNotNull<String>("proguardUuid") {
       options.proguardUuid = it
     }
+    data.getIfNotNull<Boolean>("enableSpotlight") {
+      options.isEnableSpotlight = it
+    }
+    data.getIfNotNull<String>("spotlightUrl") {
+      options.spotlightConnectionUrl = it
+    }
 
     val nativeCrashHandling = (data["enableNativeCrashHandling"] as? Boolean) ?: true
     // nativeCrashHandling has priority over anrEnabled

flutter/example/android/app/local.properties

@@ -0,0 +1,8 @@
+## This file must *NOT* be checked into Version Control Systems,
+# as it contains information specific to your local configuration.
+#
+# Location of the SDK. This is only used by Gradle.
+# For customization when using a Version Control System, please read the
+# header note.
+#Tue Sep 10 17:20:30 CEST 2024
+sdk.dir=/Users/giancarlobuenaflor/Library/Android/sdk

flutter/example/android/app/src/main/AndroidManifest.xml

@@ -8,7 +8,8 @@
         android:allowBackup="false"
         android:label="sentry_flutter_example"
         android:icon="@mipmap/ic_launcher"
-        android:extractNativeLibs="true">
+        android:extractNativeLibs="true"
+        android:networkSecurityConfig="@xml/network">
         <activity
             android:name=".MainActivity"
             android:launchMode="singleTop"

flutter/example/android/app/src/main/res/xml/network.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+    <domain-config cleartextTrafficPermitted="true">
+        <!-- Allow cleartext traffic from the emulator to the host machine -->
+        <!-- See https://developer.android.com/studio/run/emulator-networking for more details -->
+        <domain includeSubdomains="true">10.0.2.2</domain>
+    </domain-config>
+</network-security-config>

flutter/example/ios/Runner/AppDelegate.swift

@@ -2,7 +2,7 @@ import UIKit
 import Flutter
 import Sentry
 
-@UIApplicationMain
+@main
 @objc class AppDelegate: FlutterAppDelegate {
   private let _channel = "example.flutter.sentry.io"
 

flutter/example/lib/main.dart

@@ -90,8 +90,8 @@ Future<void> setupSentry(
       options.maxResponseBodySize = MaxResponseBodySize.always;
       options.navigatorKey = navigatorKey;
 
-      options.experimental.replay.sessionSampleRate = 1.0;
-      options.experimental.replay.onErrorSampleRate = 1.0;
+      // options.experimental.replay.sessionSampleRate = 1.0;
+      // options.experimental.replay.onErrorSampleRate = 1.0;
 
       _isIntegrationTest = isIntegrationTest;
       if (_isIntegrationTest) {

flutter/ios/Classes/SentryFlutter.swift

@@ -70,6 +70,12 @@ public final class SentryFlutter {
         if let appHangTimeoutIntervalMillis = data["appHangTimeoutIntervalMillis"] as? NSNumber {
             options.appHangTimeoutInterval = appHangTimeoutIntervalMillis.doubleValue / 1000
         }
+        if let spotlightUrl = data["spotlightUrl"] as? String {
+            options.spotlightUrl = spotlightUrl
+        }
+        if let enableSpotlight = data["enableSpotlight"] as? Bool {
+            options.enableSpotlight = enableSpotlight
+        }
         if let proxy = data["proxy"] as? [String: Any] {
             guard let host = proxy["host"] as? String,
                   let port = proxy["port"] as? Int,