Refactor app start and refresh rate to use FFI and JNI

packages/flutter/android/src/main/kotlin/io/sentry/flutter/SentryFlutterPlugin.kt

@@ -41,10 +41,6 @@ class SentryFlutterPlugin :
   ActivityAware {
   private lateinit var channel: MethodChannel
   private lateinit var context: Context
-  private lateinit var sentryFlutter: SentryFlutter
-
-  private var activity: WeakReference<Activity>? = null
-  private var pluginRegistrationTime: Long? = null
 
   override fun onAttachedToEngine(flutterPluginBinding: FlutterPlugin.FlutterPluginBinding) {
     pluginRegistrationTime = System.currentTimeMillis()
@@ -65,7 +61,6 @@ class SentryFlutterPlugin :
     when (call.method) {
       "initNativeSdk" -> initNativeSdk(call, result)
       "closeNativeSdk" -> closeNativeSdk(result)
-      "fetchNativeAppStart" -> fetchNativeAppStart(result)
       "setContexts" -> setContexts(call.argument("key"), call.argument("value"), result)
       "removeContexts" -> removeContexts(call.argument("key"), result)
       "setUser" -> setUser(call.argument("user"), result)
@@ -75,7 +70,6 @@ class SentryFlutterPlugin :
       "removeExtra" -> removeExtra(call.argument("key"), result)
       "setTag" -> setTag(call.argument("key"), call.argument("value"), result)
       "removeTag" -> removeTag(call.argument("key"), result)
-      "displayRefreshRate" -> displayRefreshRate(result)
       "nativeCrash" -> crash()
       "setReplayConfig" -> setReplayConfig(call, result)
       "captureReplay" -> captureReplay(result)
@@ -151,106 +145,6 @@ class SentryFlutterPlugin :
     }
   }
 
-  private fun fetchNativeAppStart(result: Result) {
-    if (!sentryFlutter.autoPerformanceTracingEnabled) {
-      result.success(null)
-      return
-    }
-
-    val appStartMetrics = AppStartMetrics.getInstance()
-
-    if (!appStartMetrics.isAppLaunchedInForeground ||
-      appStartMetrics.appStartTimeSpan.durationMs > APP_START_MAX_DURATION_MS
-    ) {
-      Log.w(
-        "Sentry",
-        "Invalid app start data: app not launched in foreground or app start took too long (>60s)",
-      )
-      result.success(null)
-      return
-    }
-
-    val appStartTimeSpan = appStartMetrics.appStartTimeSpan
-    val appStartTime = appStartTimeSpan.startTimestamp
-    val isColdStart = appStartMetrics.appStartType == AppStartMetrics.AppStartType.COLD
-
-    if (appStartTime == null) {
-      Log.w("Sentry", "App start won't be sent due to missing appStartTime")
-      result.success(null)
-    } else {
-      val appStartTimeMillis = DateUtils.nanosToMillis(appStartTime.nanoTimestamp().toDouble())
-      val item =
-
-        mutableMapOf<String, Any?>(
-          "pluginRegistrationTime" to pluginRegistrationTime,
-          "appStartTime" to appStartTimeMillis,
-          "isColdStart" to isColdStart,
-        )
-
-      val androidNativeSpans = mutableMapOf<String, Any?>()
-
-      val processInitSpan =
-        TimeSpan().apply {
-          description = "Process Initialization"
-          setStartUnixTimeMs(appStartTimeSpan.startTimestampMs)
-          setStartedAt(appStartTimeSpan.startUptimeMs)
-          setStoppedAt(appStartMetrics.classLoadedUptimeMs)
-        }
-      processInitSpan.addToMap(androidNativeSpans)
-
-      val applicationOnCreateSpan = appStartMetrics.applicationOnCreateTimeSpan
-      applicationOnCreateSpan.addToMap(androidNativeSpans)
-
-      val contentProviderSpans = appStartMetrics.contentProviderOnCreateTimeSpans
-      contentProviderSpans.forEach { span ->
-        span.addToMap(androidNativeSpans)
-      }
-
-      appStartMetrics.activityLifecycleTimeSpans.forEach { span ->
-        span.onCreate.addToMap(androidNativeSpans)
-        span.onStart.addToMap(androidNativeSpans)
-      }
-
-      item["nativeSpanTimes"] = androidNativeSpans
-
-      result.success(item)
-    }
-  }
-
-  private fun displayRefreshRate(result: Result) {
-    var refreshRate: Int? = null
-
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-      val display = activity?.get()?.display
-      if (display != null) {
-        refreshRate = display.refreshRate.toInt()
-      }
-    } else {
-      val display =
-        activity
-          ?.get()
-          ?.window
-          ?.windowManager
-          ?.defaultDisplay
-      if (display != null) {
-        refreshRate = display.refreshRate.toInt()
-      }
-    }
-
-    result.success(refreshRate)
-  }
-
-  private fun TimeSpan.addToMap(map: MutableMap<String, Any?>) {
-    if (startTimestamp == null) return
-
-    description?.let { description ->
-      map[description] =
-        mapOf<String, Any?>(
-          "startTimestampMsSinceEpoch" to startTimestampMs,
-          "stopTimestampMsSinceEpoch" to projectedStopTimestampMs,
-        )
-    }
-  }
   private fun setContexts(
     key: String?,
     value: Any?,
@@ -374,23 +268,137 @@ class SentryFlutterPlugin :
     result.success("")
   }
 
+  @Suppress("TooManyFunctions")
   companion object {
     @SuppressLint("StaticFieldLeak")
     private var replay: ReplayIntegration? = null
 
     @SuppressLint("StaticFieldLeak")
     private var applicationContext: Context? = null
 
+    @SuppressLint("StaticFieldLeak")
+    private var activity: WeakReference<Activity>? = null
+
+    private var pluginRegistrationTime: Long? = null
+
+    private lateinit var sentryFlutter: SentryFlutter
+
     private const val NATIVE_CRASH_WAIT_TIME = 500L
 
     @Suppress("unused") // Used by native/jni bindings
     @JvmStatic
     fun privateSentryGetReplayIntegration(): ReplayIntegration? = replay
 
+    @Suppress("unused") // Used by native/jni bindings
+    @JvmStatic
+    fun getDisplayRefreshRate(): Int? {
+      var refreshRate: Int? = null
+
+      if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+        val display = activity?.get()?.display
+        if (display != null) {
+          refreshRate = display.refreshRate.toInt()
+        }
+      } else {
+        val display =
+          activity
+            ?.get()
+            ?.window
+            ?.windowManager
+            ?.defaultDisplay
+        if (display != null) {
+          refreshRate = display.refreshRate.toInt()
+        }
+      }
+
+      return refreshRate
+    }
+
+    @Suppress("unused", "ReturnCount", "TooGenericExceptionCaught") // Used by native/jni bindings
+    @JvmStatic
+    fun fetchNativeAppStartAsBytes(): ByteArray? {
+      if (!sentryFlutter.autoPerformanceTracingEnabled) {
+        return null
+      }
+
+      val appStartMetrics = AppStartMetrics.getInstance()
+
+      if (!appStartMetrics.isAppLaunchedInForeground ||
+        appStartMetrics.appStartTimeSpan.durationMs > APP_START_MAX_DURATION_MS
+      ) {
+        Log.w(
+          "Sentry",
+          "Invalid app start data: app not launched in foreground or app start took too long (>60s)",
+        )
+        return null
+      }
+
+      val appStartTimeSpan = appStartMetrics.appStartTimeSpan
+      val appStartTime = appStartTimeSpan.startTimestamp
+      val isColdStart = appStartMetrics.appStartType == AppStartMetrics.AppStartType.COLD
+
+      if (appStartTime == null) {
+        Log.w("Sentry", "App start won't be sent due to missing appStartTime")
+        return null
+      }
+
+      val appStartTimeMillis = DateUtils.nanosToMillis(appStartTime.nanoTimestamp().toDouble())
+      val item =
+        mutableMapOf<String, Any?>(
+          "pluginRegistrationTime" to pluginRegistrationTime,
+          "appStartTime" to appStartTimeMillis,
+          "isColdStart" to isColdStart,
+        )
+
+      val androidNativeSpans = mutableMapOf<String, Any?>()
+
+      val processInitSpan =
+        TimeSpan().apply {
+          description = "Process Initialization"
+          setStartUnixTimeMs(appStartTimeSpan.startTimestampMs)
+          setStartedAt(appStartTimeSpan.startUptimeMs)
+          setStoppedAt(appStartMetrics.classLoadedUptimeMs)
+        }
+      addTimeSpanToMap(processInitSpan, androidNativeSpans)
+
+      val applicationOnCreateSpan = appStartMetrics.applicationOnCreateTimeSpan
+      addTimeSpanToMap(applicationOnCreateSpan, androidNativeSpans)
+
+      val contentProviderSpans = appStartMetrics.contentProviderOnCreateTimeSpans
+      contentProviderSpans.forEach { span ->
+        addTimeSpanToMap(span, androidNativeSpans)
+      }
+
+      appStartMetrics.activityLifecycleTimeSpans.forEach { span ->
+        addTimeSpanToMap(span.onCreate, androidNativeSpans)
+        addTimeSpanToMap(span.onStart, androidNativeSpans)
+      }
+
+      item["nativeSpanTimes"] = androidNativeSpans
+
+      val json = JSONObject(item).toString()
+      return json.toByteArray(Charsets.UTF_8)
+    }
+
+    private fun addTimeSpanToMap(
+      span: TimeSpan,
+      map: MutableMap<String, Any?>,
+    ) {
+      if (span.startTimestamp == null) return
+
+      span.description?.let { description ->
+        map[description] =
+          mapOf<String, Any?>(
+            "startTimestampMsSinceEpoch" to span.startTimestampMs,
+            "stopTimestampMsSinceEpoch" to span.projectedStopTimestampMs,
+          )
+      }
+    }
+
     @JvmStatic
     fun getApplicationContext(): Context? = applicationContext
 
-    @Suppress("unused") // Used by native/jni bindings
+    @Suppress("unused", "ReturnCount", "TooGenericExceptionCaught") // Used by native/jni bindings
     @JvmStatic
     fun loadContextsAsBytes(): ByteArray? {
       val options = ScopesAdapter.getInstance().options
@@ -405,11 +413,16 @@ class SentryFlutterPlugin :
           options,
           currentScope,
         )
-      val json = JSONObject(serializedScope).toString()
-      return json.toByteArray(Charsets.UTF_8)
+      try {
+        val json = JSONObject(serializedScope).toString()
+        return json.toByteArray(Charsets.UTF_8)
+      } catch (e: Exception) {
+        Log.e("Sentry", "Failed to serialize scope", e)
+        return null
+      }
     }
 
-    @Suppress("unused") // Used by native/jni bindings
+    @Suppress("unused", "TooGenericExceptionCaught") // Used by native/jni bindings
     @JvmStatic
     fun loadDebugImagesAsBytes(addresses: Set<String>): ByteArray? {
       val options = ScopesAdapter.getInstance().options as SentryAndroidOptions
@@ -428,8 +441,13 @@ class SentryFlutterPlugin :
             .serialize()
         }
 
-      val json = JSONArray(debugImages).toString()
-      return json.toByteArray(Charsets.UTF_8)
+      try {
+        val json = JSONArray(debugImages).toString()
+        return json.toByteArray(Charsets.UTF_8)
+      } catch (e: Exception) {
+        Log.e("Sentry", "Failed to serialize debug images", e)
+        return null
+      }
     }
 
     private fun List<DebugImage>?.serialize() = this?.map { it.serialize() }

packages/flutter/example/integration_test/integration_test.dart

@@ -599,6 +599,60 @@ void main() {
     expect(debugImageByStacktrace.first.imageAddr, expectedImage.imageAddr);
   });
 
+  testWidgets('fetchNativeAppStart returns app start data', (tester) async {
+    await restoreFlutterOnErrorAfter(() async {
+      await setupSentryAndApp(tester);
+    });
+
+    if (Platform.isAndroid || Platform.isIOS) {
+      // fetchNativeAppStart should return data on mobile platforms
+      final appStart = await SentryFlutter.native?.fetchNativeAppStart();
+
+      expect(appStart, isNotNull, reason: 'App start data should be available');
+
+      if (appStart != null) {
+        expect(appStart.appStartTime, greaterThan(0),
+            reason: 'App start time should be positive');
+        expect(appStart.pluginRegistrationTime, greaterThan(0),
+            reason: 'Plugin registration time should be positive');
+        expect(appStart.isColdStart, isA<bool>(),
+            reason: 'isColdStart should be a boolean');
+        expect(appStart.nativeSpanTimes, isA<Map>(),
+            reason: 'Native span times should be a map');
+      }
+    } else {
+      // On other platforms, it should return null
+      final appStart = await SentryFlutter.native?.fetchNativeAppStart();
+      expect(appStart, isNull,
+          reason: 'App start should be null on non-mobile platforms');
+    }
+  });
+
+  testWidgets('displayRefreshRate returns valid refresh rate', (tester) async {
+    await restoreFlutterOnErrorAfter(() async {
+      await setupSentryAndApp(tester);
+    });
+
+    if (Platform.isAndroid || Platform.isIOS) {
+      final refreshRate = await SentryFlutter.native?.displayRefreshRate();
+
+      // Refresh rate should be available on mobile platforms
+      expect(refreshRate, isNotNull,
+          reason: 'Display refresh rate should be available');
+
+      if (refreshRate != null) {
+        expect(refreshRate, greaterThan(0),
+            reason: 'Refresh rate should be positive');
+        expect(refreshRate, lessThanOrEqualTo(1000),
+            reason: 'Refresh rate should be reasonable (<=1000Hz)');
+      }
+    } else {
+      final refreshRate = await SentryFlutter.native?.displayRefreshRate();
+      expect(refreshRate, isNull,
+          reason: 'Refresh rate should be null or positive on other platforms');
+    }
+  });
+
   group('e2e', () {
     var output = find.byKey(const Key('output'));
     late Fixture fixture;