Merge branch 'main' into 5.0.0

Author: krystofwoldrich

CHANGELOG.md

@@ -21,6 +21,9 @@
 - Bump Cocoa SDK from v7.31.5 to v8.0.0 ([#2756](https://github.com/getsentry/sentry-react-native/pull/2756))
   - [changelog](https://github.com/getsentry/sentry-cocoa/blob/main/CHANGELOG.md#800)
   - [diff](https://github.com/getsentry/sentry-cocoa/compare/7.31.5...8.0.0)
+- Bump Android SDK from v6.12.1 to v6.13.0 ([#2790](https://github.com/getsentry/sentry-react-native/pull/2790))
+  - [changelog](https://github.com/getsentry/sentry-java/blob/main/CHANGELOG.md#6130)
+  - [diff](https://github.com/getsentry/sentry-java/compare/6.12.1...6.13.0)
 
 ## 4.14.0
 

android/build.gradle

@@ -42,5 +42,5 @@ android {
 
 dependencies {
     implementation 'com.facebook.react:react-native:+'
-    api 'io.sentry:sentry-android:6.12.1'
+    api 'io.sentry:sentry-android:6.13.0'
 }

android/src/main/java/io/sentry/react/RNSentryModuleImpl.java

@@ -31,7 +31,6 @@
 import java.io.FileOutputStream;
 import java.io.InputStream;
 import java.nio.charset.Charset;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -40,10 +39,12 @@
 import java.util.concurrent.TimeUnit;
 
 import io.sentry.Breadcrumb;
+import io.sentry.DateUtils;
 import io.sentry.HubAdapter;
 import io.sentry.ILogger;
 import io.sentry.Integration;
 import io.sentry.Sentry;
+import io.sentry.SentryDate;
 import io.sentry.SentryEvent;
 import io.sentry.SentryLevel;
 import io.sentry.UncaughtExceptionHandlerIntegration;
@@ -231,7 +232,7 @@ public void fetchNativeRelease(Promise promise) {
 
     public void fetchNativeAppStart(Promise promise) {
         final AppStartState appStartInstance = AppStartState.getInstance();
-        final Date appStartTime = appStartInstance.getAppStartTime();
+        final SentryDate appStartTime = appStartInstance.getAppStartTime();
         final Boolean isColdStart = appStartInstance.isColdStart();
 
         if (appStartTime == null) {
@@ -241,11 +242,11 @@ public void fetchNativeAppStart(Promise promise) {
             logger.log(SentryLevel.WARNING, "App start won't be sent due to missing isColdStart.");
             promise.resolve(null);
         } else {
-            final double appStartTimestamp = (double) appStartTime.getTime();
+            final double appStartTimestampMs = DateUtils.nanosToMillis(appStartTime.nanoTimestamp());
 
             WritableMap appStart = Arguments.createMap();
 
-            appStart.putDouble("appStartTime", appStartTimestamp);
+            appStart.putDouble("appStartTime", appStartTimestampMs);
             appStart.putBoolean("isColdStart", isColdStart);
             appStart.putBoolean("didFetchAppStart", didFetchAppStart);