Update

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

@@ -23,6 +23,7 @@ import io.sentry.android.core.LoadClass
 import io.sentry.android.core.SentryAndroid
 import io.sentry.android.core.SentryAndroidOptions
 import io.sentry.android.core.performance.AppStartMetrics
+import io.sentry.android.core.performance.TimeSpan
 import io.sentry.protocol.DebugImage
 import io.sentry.protocol.SdkVersion
 import io.sentry.protocol.SentryId
@@ -71,10 +72,19 @@ class SentryFlutterPlugin : FlutterPlugin, MethodCallHandler, ActivityAware {
       "setTag" -> setTag(call.argument("key"), call.argument("value"), result)
       "removeTag" -> removeTag(call.argument("key"), result)
       "loadContexts" -> loadContexts(result)
+      "loadNativeData" -> loadNativeData()
       else -> result.notImplemented()
     }
   }
 
+  private fun loadNativeData() {
+    val appStartMetrics = AppStartMetrics.getInstance()
+
+    appStartMetrics.contentProviderOnCreateTimeSpans.forEach {
+      Log.d("noob", it.description.toString())
+    }
+  }
+
   override fun onDetachedFromEngine(binding: FlutterPlugin.FlutterPluginBinding) {
     if (!this::channel.isInitialized) {
       return
@@ -132,13 +142,9 @@ class SentryFlutterPlugin : FlutterPlugin, MethodCallHandler, ActivityAware {
 
     val appStartMetrics = AppStartMetrics.getInstance()
 
-    val applicationOnCreateStartTime = appStartMetrics.applicationOnCreateTimeSpan.startTimestamp
-    val classInitUptimeMs = appStartMetrics.classLoadedUptimeMs
-    val appStartUptimeMs = appStartMetrics.appStartTimeSpan.startUptimeMs
-    val appStartTime = appStartMetrics.appStartTimeSpan.startTimestamp
-
-    val isColdStart =
-      AppStartMetrics.getInstance().appStartType == AppStartMetrics.AppStartType.COLD
+    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")
@@ -150,15 +156,47 @@ class SentryFlutterPlugin : FlutterPlugin, MethodCallHandler, ActivityAware {
         "appStartTime" to appStartTimeMillis,
         "isColdStart" to isColdStart,
       )
-      item["nativeSpanTimes"] = mapOf<String, Any?>(
-        "classInitUptimeMs" to classInitUptimeMs,
-        "appStartUptimeMs" to appStartUptimeMs,
-      )
+
+      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.onStart.addToMap(androidNativeSpans)
+        span.onCreate.addToMap(androidNativeSpans)
+      }
+
+      item["nativeSpanTimes"] = androidNativeSpans
 
       result.success(item)
     }
   }
 
+  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 beginNativeFrames(result: Result) {
     if (!sentryFlutter.autoPerformanceTracingEnabled) {
       result.success(null)

flutter/example/android/app/build.gradle

@@ -1,3 +1,7 @@
+plugins {
+    id 'io.sentry.android.gradle'
+}
+
 def localProperties = new Properties()
 def localPropertiesFile = rootProject.file('local.properties')
 if (localPropertiesFile.exists()) {
@@ -100,8 +104,6 @@ dependencies {
     implementation "androidx.annotation:annotation:1.1.0"
 }
 
-// uncomment this to upload debug symbols to Sentry
-// sentry {
-//     uploadNativeSymbols = true
-//     includeNativeSources = true
-// }
+sentry {
+    autoInstallation.enabled = false
+}

flutter/example/android/build.gradle

@@ -7,7 +7,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'io.sentry:sentry-android-gradle-plugin:4.2.0'
+        classpath 'io.sentry:sentry-android-gradle-plugin:4.5.0'
         classpath 'com.android.tools.build:gradle:7.2.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath 'io.github.howardpang:androidNativeBundle:1.1.3'
@@ -32,4 +32,3 @@ subprojects {
 tasks.register("clean", Delete) {
     delete rootProject.buildDir
 }
-

flutter/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1430"
+   LastUpgradeVersion = "1510"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

flutter/ios/Classes/SentryFlutterPluginApple.swift

@@ -379,26 +379,65 @@ public class SentryFlutterPluginApple: NSObject, FlutterPlugin {
         return
     }
 
+    struct TimeSpan {
+        var startTimestampMsSinceEpoch: NSNumber
+        var stopTimestampMsSinceEpoch: NSNumber
+        var description: String
+
+        func addToMap(_ map: inout [String: Any]) {
+            map[description] = [
+                "startTimestampMsSinceEpoch": startTimestampMsSinceEpoch,
+                "stopTimestampMsSinceEpoch": stopTimestampMsSinceEpoch
+            ]
+        }
+    }
+
     private func fetchNativeAppStart(result: @escaping FlutterResult) {
         #if os(iOS) || os(tvOS)
         guard let appStartMeasurement = PrivateSentrySDKOnly.appStartMeasurement else {
             print("warning: appStartMeasurement is null")
             result(nil)
             return
         }
-
-        let runtimeInitTimestamp = appStartMeasurement.runtimeInitTimestamp.timeIntervalSince1970 * 1000
-        let moduleInitTimestamp = appStartMeasurement.moduleInitializationTimestamp.timeIntervalSince1970 * 1000
-        let sdkStartTimestamp = appStartMeasurement.sdkStartTimestamp.timeIntervalSince1970 * 1000
-        let didFinishLaunchingTimestamp = appStartMeasurement.didFinishLaunchingTimestamp.timeIntervalSince1970 * 1000
-
-        let nativeSpanTimes: [String: Any] = [
-            "runtimeInitTimestamp": runtimeInitTimestamp,
-            "moduleInitTimestamp": moduleInitTimestamp,
-            "sdkStartTimestamp": sdkStartTimestamp,
-            "didFinishLaunchingTimestamp": didFinishLaunchingTimestamp
-        ]
 
+        var nativeSpanTimes: [String: Any] = [:]
+
+        let appStartTimeMs = appStartMeasurement.appStartTimestamp.timeIntervalSince1970.toMilliseconds()
+        let runtimeInitTimeMs = appStartMeasurement.runtimeInitTimestamp.timeIntervalSince1970.toMilliseconds()
+        let moduleInitializationTimeMs =
+            appStartMeasurement.moduleInitializationTimestamp.timeIntervalSince1970.toMilliseconds()
+        let sdkStartTimeMs = appStartMeasurement.sdkStartTimestamp.timeIntervalSince1970.toMilliseconds()
+
+        if !appStartMeasurement.isPreWarmed {
+            let preRuntimeInitDescription = "Pre Runtime Init"
+            let preRuntimeInitSpan = TimeSpan(
+                startTimestampMsSinceEpoch: NSNumber(value: appStartTimeMs),
+                stopTimestampMsSinceEpoch: NSNumber(value: runtimeInitTimeMs),
+                description: preRuntimeInitDescription
+            )
+            preRuntimeInitSpan.addToMap(&nativeSpanTimes)
+
+            let moduleInitializationDescription = "Runtime init to Pre Main initializers"
+            let moduleInitializationSpan = TimeSpan(
+                startTimestampMsSinceEpoch: NSNumber(value: runtimeInitTimeMs),
+                stopTimestampMsSinceEpoch: NSNumber(value: moduleInitializationTimeMs),
+                description: moduleInitializationDescription
+            )
+            moduleInitializationSpan.addToMap(&nativeSpanTimes)
+        }
+
+        let uiKitInitDescription = "UIKit init"
+        let uiKitInitSpan = TimeSpan(
+            startTimestampMsSinceEpoch: NSNumber(value: moduleInitializationTimeMs),
+            stopTimestampMsSinceEpoch: NSNumber(value: sdkStartTimeMs),
+            description: uiKitInitDescription
+        )
+        uiKitInitSpan.addToMap(&nativeSpanTimes)
+
+        // Info: We don't have access to didFinishLaunchingTimestamp,
+        // On HybridSDKs, the Cocoa SDK misses the didFinishLaunchNotification and the
+        // didBecomeVisibleNotification. Therefore, we can't set the
+        // didFinishLaunchingTimestamp
         let appStartTime = appStartMeasurement.appStartTimestamp.timeIntervalSince1970 * 1000
         let isColdStart = appStartMeasurement.type == .cold
 
@@ -614,3 +653,9 @@ public class SentryFlutterPluginApple: NSObject, FlutterPlugin {
 }
 
 // swiftlint:enable function_body_length
+
+private extension TimeInterval {
+    func toMilliseconds() -> Int64 {
+        return Int64(self * 1000)
+    }
+}

flutter/lib/src/event_processor/native_app_start_event_processor.dart

@@ -116,73 +116,32 @@ class NativeAppStartEventProcessor implements EventProcessor {
 
   Future<void> _attachNativeSpans(AppStartInfo appStartInfo,
       SentryTracer transaction, SentrySpan parent) async {
-    final runTimeInitTimestamp =
-        appStartInfo.nativeSpanTimes['runtimeInitTimestamp'] as double?;
-    final moduleInitTimestamp =
-        appStartInfo.nativeSpanTimes['moduleInitTimestamp'] as double?;
-    final sdkStartTimestamp =
-        appStartInfo.nativeSpanTimes['sdkStartTimestamp'] as double?;
-    final didFinishLaunchingTimestamp =
-        appStartInfo.nativeSpanTimes['didFinishLaunchingTimestamp'] as double?;
-
-    if (runTimeInitTimestamp != null &&
-        moduleInitTimestamp != null &&
-        sdkStartTimestamp != null &&
-        didFinishLaunchingTimestamp != null) {
-      final aa =
-          DateTime.fromMillisecondsSinceEpoch(runTimeInitTimestamp.toInt());
-      final bb =
-          DateTime.fromMillisecondsSinceEpoch(moduleInitTimestamp.toInt());
-      final sdkStart =
-          DateTime.fromMillisecondsSinceEpoch(sdkStartTimestamp.toInt());
-      final didFinishLaunching = DateTime.fromMillisecondsSinceEpoch(
-          didFinishLaunchingTimestamp.toInt());
-
-      final op = 'app.start.${appStartInfo.type.name}';
-
-      final preRuntimeInitSpan = await _createAndFinishSpan(
-          tracer: transaction,
-          operation: op,
-          description: 'Pre runtime init',
-          parentSpanId: parent.context.spanId,
-          traceId: transaction.context.traceId,
-          startTimestamp: appStartInfo.start,
-          endTimestamp: aa);
-
-      final runtimeInitSpan = await _createAndFinishSpan(
-          tracer: transaction,
-          operation: op,
-          description: 'Runtime init',
-          parentSpanId: parent.context.spanId,
-          traceId: transaction.context.traceId,
-          startTimestamp: aa,
-          endTimestamp: bb);
-
-      final appInitSpan = await _createAndFinishSpan(
-          tracer: transaction,
-          operation: op,
-          description: 'UIKit init',
-          parentSpanId: parent.context.spanId,
-          traceId: transaction.context.traceId,
-          startTimestamp: bb,
-          endTimestamp: sdkStart);
-
-      final didFinishLaunchingSpan = await _createAndFinishSpan(
-          tracer: transaction,
-          operation: op,
-          description: 'Application init',
-          parentSpanId: parent.context.spanId,
-          traceId: transaction.context.traceId,
-          startTimestamp: sdkStart,
-          endTimestamp: didFinishLaunching);
-
-      transaction.children.addAll([
-        preRuntimeInitSpan,
-        runtimeInitSpan,
-        appInitSpan,
-        didFinishLaunchingSpan,
-      ]);
-    }
+    await Future.forEach(appStartInfo.nativeSpanTimes.keys, (key) async {
+      try {
+        final description = key as String;
+        final spanContent =
+            appStartInfo.nativeSpanTimes[key] as Map<dynamic, dynamic>;
+        final startTimestampMs =
+            spanContent['startTimestampMsSinceEpoch'] as int;
+        final endTimestampMs = spanContent['stopTimestampMsSinceEpoch'] as int;
+        final startTimestamp =
+            DateTime.fromMillisecondsSinceEpoch(startTimestampMs.toInt());
+        final endTimestamp =
+            DateTime.fromMillisecondsSinceEpoch(endTimestampMs.toInt());
+        final span = await _createAndFinishSpan(
+            tracer: transaction,
+            operation: appStartInfo.appStartTypeOperation,
+            description: description,
+            parentSpanId: parent.context.spanId,
+            traceId: transaction.context.traceId,
+            startTimestamp: startTimestamp,
+            endTimestamp: endTimestamp);
+        transaction.children.add(span);
+      } catch (e) {
+        _hub.options.logger(SentryLevel.warning,
+            'Failed to attach native span to app start transaction: $e');
+      }
+    });
   }
 
   Future<SentrySpan> _createAndFinishSpan({

flutter/test/integrations/native_app_start_integration_test.dart

@@ -25,7 +25,10 @@ void main() {
     test('native app start measurement added to first transaction', () async {
       fixture.native.appStartEnd = DateTime.fromMillisecondsSinceEpoch(10);
       fixture.binding.nativeAppStart = NativeAppStart(
-          appStartTime: 0, pluginRegistrationTime: 10, isColdStart: true, nativeSpanTimes: {});
+          appStartTime: 0,
+          pluginRegistrationTime: 10,
+          isColdStart: true,
+          nativeSpanTimes: {});
 
       fixture.getNativeAppStartIntegration().call(fixture.hub, fixture.options);
 
@@ -45,7 +48,10 @@ void main() {
         () async {
       fixture.native.appStartEnd = DateTime.fromMillisecondsSinceEpoch(10);
       fixture.binding.nativeAppStart = NativeAppStart(
-          appStartTime: 0, pluginRegistrationTime: 10, isColdStart: true, nativeSpanTimes: {});
+          appStartTime: 0,
+          pluginRegistrationTime: 10,
+          isColdStart: true,
+          nativeSpanTimes: {});
 
       fixture.getNativeAppStartIntegration().call(fixture.hub, fixture.options);
 
@@ -65,7 +71,10 @@ void main() {
     test('measurements appended', () async {
       fixture.native.appStartEnd = DateTime.fromMillisecondsSinceEpoch(10);
       fixture.binding.nativeAppStart = NativeAppStart(
-          appStartTime: 0, pluginRegistrationTime: 10, isColdStart: true, nativeSpanTimes: {});
+          appStartTime: 0,
+          pluginRegistrationTime: 10,
+          isColdStart: true,
+          nativeSpanTimes: {});
       final measurement = SentryMeasurement.warmAppStart(Duration(seconds: 1));
 
       fixture.getNativeAppStartIntegration().call(fixture.hub, fixture.options);
@@ -88,7 +97,10 @@ void main() {
     test('native app start measurement not added if more than 60s', () async {
       fixture.native.appStartEnd = DateTime.fromMillisecondsSinceEpoch(60001);
       fixture.binding.nativeAppStart = NativeAppStart(
-          appStartTime: 0, pluginRegistrationTime: 10, isColdStart: true, nativeSpanTimes: {});
+          appStartTime: 0,
+          pluginRegistrationTime: 10,
+          isColdStart: true,
+          nativeSpanTimes: {});
 
       fixture.getNativeAppStartIntegration().call(fixture.hub, fixture.options);
 
@@ -106,7 +118,10 @@ void main() {
         () async {
       fixture.native.appStartEnd = DateTime.fromMillisecondsSinceEpoch(10);
       fixture.binding.nativeAppStart = NativeAppStart(
-          appStartTime: 0, pluginRegistrationTime: 10, isColdStart: true, nativeSpanTimes: {});
+          appStartTime: 0,
+          pluginRegistrationTime: 10,
+          isColdStart: true,
+          nativeSpanTimes: {});
 
       fixture.getNativeAppStartIntegration().call(fixture.hub, fixture.options);
 
@@ -133,7 +148,10 @@ void main() {
 
       fixture.native.appStartEnd = DateTime.fromMillisecondsSinceEpoch(50);
       fixture.binding.nativeAppStart = NativeAppStart(
-          appStartTime: 0, pluginRegistrationTime: 10, isColdStart: true, nativeSpanTimes: {});
+          appStartTime: 0,
+          pluginRegistrationTime: 10,
+          isColdStart: true,
+          nativeSpanTimes: {});
       // dartLoadingEnd needs to be set after engine end (see MockNativeChannel)
       SentryFlutter.mainIsolateStartTime =
           DateTime.fromMillisecondsSinceEpoch(15);