Keep Date getTImestamp for compatibility

sentry-android-ndk/src/main/java/io/sentry/android/ndk/NdkScopeObserver.java

@@ -49,7 +49,7 @@ public void addBreadcrumb(final @NotNull Breadcrumb crumb) {
       if (crumb.getLevel() != null) {
         level = crumb.getLevel().name().toLowerCase(Locale.ROOT);
       }
-      final String timestamp = DateUtils.getTimestamp(DateUtils.getDateTime(crumb.getTimestamp()));
+      final String timestamp = DateUtils.getTimestamp(crumb.getTimestamp());
 
       String data = null;
       try {

sentry-android-ndk/src/test/java/io/sentry/android/ndk/NdkScopeObserverTest.kt

@@ -97,7 +97,7 @@ class NdkScopeObserverTest {
             setData("a", "b")
             type = "type"
         }
-        val timestamp = DateUtils.getTimestamp(DateUtils.getDateTime(breadcrumb.timestamp))
+        val timestamp = DateUtils.getTimestamp(breadcrumb.timestamp)
         val data = "{\"a\":\"b\"}"
 
         sut.addBreadcrumb(breadcrumb)

sentry-android-replay/src/main/java/io/sentry/android/replay/DefaultReplayBreadcrumbConverter.kt

@@ -106,8 +106,8 @@ public open class DefaultReplayBreadcrumbConverter : ReplayBreadcrumbConverter {
         }
         return if (!breadcrumbCategory.isNullOrEmpty()) {
             RRWebBreadcrumbEvent().apply {
-                timestamp = breadcrumb.timestamp
-                breadcrumbTimestamp = breadcrumb.timestamp / 1000.0
+                timestamp = breadcrumb.timestampMs
+                breadcrumbTimestamp = breadcrumb.timestampMs / 1000.0
                 breadcrumbType = "default"
                 category = breadcrumbCategory
                 message = breadcrumbMessage
@@ -134,7 +134,7 @@ public open class DefaultReplayBreadcrumbConverter : ReplayBreadcrumbConverter {
         val httpStartTimestamp = breadcrumb.data[SpanDataConvention.HTTP_START_TIMESTAMP]
         val httpEndTimestamp = breadcrumb.data[SpanDataConvention.HTTP_END_TIMESTAMP]
         return RRWebSpanEvent().apply {
-            timestamp = breadcrumb.timestamp
+            timestamp = breadcrumb.timestampMs
             op = "resource.http"
             description = breadcrumb.data["url"] as String
             // can be double if it was serialized to disk

sentry-android-replay/src/main/java/io/sentry/android/replay/capture/CaptureStrategy.kt

@@ -161,8 +161,8 @@ internal interface CaptureStrategy {
 
             val urls = LinkedList<String>()
             breadcrumbs.forEach { breadcrumb ->
-                if (breadcrumb.timestamp >= segmentTimestamp.time &&
-                    breadcrumb.timestamp < endTimestamp.time
+                if (breadcrumb.timestampMs >= segmentTimestamp.time &&
+                    breadcrumb.timestampMs < endTimestamp.time
                 ) {
                     val rrwebEvent = options
                         .replayController

sentry/api/sentry.api

@@ -98,6 +98,7 @@ public final class io/sentry/BaggageHeader {
 
 public final class io/sentry/Breadcrumb : io/sentry/JsonSerializable, io/sentry/JsonUnknown {
 	public fun <init> ()V
+	public fun <init> (J)V
 	public fun <init> (Ljava/lang/String;)V
 	public fun <init> (Ljava/util/Date;)V
 	public static fun debug (Ljava/lang/String;)Lio/sentry/Breadcrumb;
@@ -111,6 +112,7 @@ public final class io/sentry/Breadcrumb : io/sentry/JsonSerializable, io/sentry/
 	public fun getMessage ()Ljava/lang/String;
 	public fun getOrigin ()Ljava/lang/String;
 	public fun getTimestamp ()Ljava/util/Date;
+	public fun getTimestampMs ()J
 	public fun getType ()Ljava/lang/String;
 	public fun getUnknown ()Ljava/util/Map;
 	public static fun graphqlDataFetcher (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lio/sentry/Breadcrumb;

sentry/src/main/java/io/sentry/Breadcrumb.java

@@ -527,10 +527,19 @@ public Breadcrumb(@Nullable String message) {
    *
    * @return the timestamp
    */
-  public long getTimestamp() {
+  public long getTimestampMs() {
     return timestamp;
   }
 
+  /**
+   * Returns the Breadcrumb's timestamp as java.util.Date
+   *
+   * @return the timestamp
+   */
+  public @NotNull Date getTimestamp() {
+    return DateUtils.getDateTime(timestamp);
+  }
+
   /**
    * Returns the message
    *

sentry/src/main/java/io/sentry/SentryClient.java

@@ -1214,7 +1214,7 @@ private static final class SortBreadcrumbsByDate implements Comparator<Breadcrum
     @SuppressWarnings({"JdkObsolete", "JavaUtilDate"})
     @Override
     public int compare(final @NotNull Breadcrumb b1, final @NotNull Breadcrumb b2) {
-      return Long.compare(b1.getTimestamp(), b2.getTimestamp());
+      return Long.compare(b1.getTimestampMs(), b2.getTimestampMs());
     }
   }
 }

sentry/src/test/java/io/sentry/BreadcrumbTest.kt

@@ -98,7 +98,7 @@ class BreadcrumbTest {
     @Test
     fun `breadcrumb has timestamp when created`() {
         val breadcrumb = Breadcrumb()
-        assertTrue(breadcrumb.timestamp > 0)
+        assertTrue(breadcrumb.timestampMs > 0)
     }
 
     @Test

sentry/src/test/java/io/sentry/protocol/BreadcrumbSerializationTest.kt

@@ -66,7 +66,7 @@ class BreadcrumbSerializationTest {
         val actual = Breadcrumb.fromMap(map, SentryOptions())
         val expected = fixture.getSut()
 
-        assertEquals(expected.timestamp, actual?.timestamp)
+        assertEquals(expected.timestampMs, actual?.timestampMs)
         assertEquals(expected.message, actual?.message)
         assertEquals(expected.type, actual?.type)
         assertEquals(expected.data, actual?.data)