diff --git a/flutter/android/src/main/kotlin/io/sentry/flutter/SentryFlutterPlugin.kt b/flutter/android/src/main/kotlin/io/sentry/flutter/SentryFlutterPlugin.kt index 6fe8bf2de9..f08e160e3c 100644 --- a/flutter/android/src/main/kotlin/io/sentry/flutter/SentryFlutterPlugin.kt +++ b/flutter/android/src/main/kotlin/io/sentry/flutter/SentryFlutterPlugin.kt @@ -36,10 +36,10 @@ class SentryFlutterPlugin : FlutterPlugin, MethodCallHandler, ActivityAware { private var activity: WeakReference? = null private var framesTracker: ActivityFramesTracker? = null - private var engineEndTime: Long? = null + private var engineReadyEndtime: Long? = null override fun onAttachedToEngine(flutterPluginBinding: FlutterPlugin.FlutterPluginBinding) { - engineEndTime = System.currentTimeMillis() + engineReadyEndtime = System.currentTimeMillis() context = flutterPluginBinding.applicationContext channel = MethodChannel(flutterPluginBinding.binaryMessenger, "sentry_flutter") @@ -149,7 +149,7 @@ class SentryFlutterPlugin : FlutterPlugin, MethodCallHandler, ActivityAware { } private fun fetchEngineReadyEndtime(result: Result) { - result.success(engineEndTime) + result.success(engineReadyEndtime) } private fun beginNativeFrames(result: Result) { diff --git a/flutter/ios/Classes/SentryFlutterPluginApple.swift b/flutter/ios/Classes/SentryFlutterPluginApple.swift index 4f61df6284..bd92a07bfa 100644 --- a/flutter/ios/Classes/SentryFlutterPluginApple.swift +++ b/flutter/ios/Classes/SentryFlutterPluginApple.swift @@ -26,12 +26,12 @@ public class SentryFlutterPluginApple: NSObject, FlutterPlugin { #endif } - private static var engineEndtime: Int64 = 0 + private static var engineReadyEndtime: Int64 = 0 public static func register(with registrar: FlutterPluginRegistrar) { let currentDate = Date() let timeInterval = currentDate.timeIntervalSince1970 - engineEndtime = Int64(timeInterval * 1000) + engineReadyEndtime = Int64(timeInterval * 1000) #if os(iOS) let channel = FlutterMethodChannel(name: "sentry_flutter", binaryMessenger: registrar.messenger()) @@ -86,7 +86,7 @@ public class SentryFlutterPluginApple: NSObject, FlutterPlugin { } private func fetchEngineReadyEndtime(result: @escaping FlutterResult) { - result(SentryFlutterPluginApple.engineEndtime) + result(SentryFlutterPluginApple.engineReadyEndtime) } // swiftlint:disable:next cyclomatic_complexity diff --git a/flutter/lib/src/integrations/native_app_start_integration.dart b/flutter/lib/src/integrations/native_app_start_integration.dart index 24d6bad5e8..f9009e940d 100644 --- a/flutter/lib/src/integrations/native_app_start_integration.dart +++ b/flutter/lib/src/integrations/native_app_start_integration.dart @@ -71,12 +71,12 @@ class NativeAppStartIntegration extends Integration { _native.appStartEnd ??= options.clock(); final appStartEnd = _native.appStartEnd; final nativeAppStart = await _native.fetchNativeAppStart(); - final engineEndtime = await _native.fetchEngineReadyEndtime(); + final engineReadyEndtime = await _native.fetchEngineReadyEndtime(); final dartLoadingEnd = SentryFlutter.dartLoadingEnd; if (nativeAppStart == null || appStartEnd == null || - engineEndtime == null) { + engineReadyEndtime == null) { return; } @@ -84,7 +84,7 @@ class NativeAppStartIntegration extends Integration { nativeAppStart.appStartTime.toInt()); final duration = appStartEnd.difference(appStartDateTime); final engineEndDatetime = - DateTime.fromMillisecondsSinceEpoch(engineEndtime); + DateTime.fromMillisecondsSinceEpoch(engineReadyEndtime); // We filter out app start more than 60s. // This could be due to many different reasons. diff --git a/flutter/test/integrations/native_app_start_integration_test.dart b/flutter/test/integrations/native_app_start_integration_test.dart index 358eeeaf06..ad9413fef1 100644 --- a/flutter/test/integrations/native_app_start_integration_test.dart +++ b/flutter/test/integrations/native_app_start_integration_test.dart @@ -195,10 +195,10 @@ void main() { }); test('have correct endTimestamp', () async { - final engineEndtime = await fixture.native.fetchEngineReadyEndtime(); + final engineReadyEndtime = await fixture.native.fetchEngineReadyEndtime(); expect(coldStartSpan?.endTimestamp, fixture.native.appStartEnd?.toUtc()); expect(engineReadySpan?.endTimestamp, - DateTime.fromMillisecondsSinceEpoch(engineEndtime!).toUtc()); + DateTime.fromMillisecondsSinceEpoch(engineReadyEndtime!).toUtc()); expect(dartIsolateLoadingSpan?.endTimestamp, SentryFlutter.dartLoadingEnd.toUtc()); expect(firstFrameRenderSpan?.endTimestamp, coldStartSpan?.endTimestamp);