Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion sentry/src/main/java/io/sentry/Breadcrumb.java
Original file line number Diff line number Diff line change
Expand Up @@ -555,7 +555,7 @@ public Breadcrumb(@Nullable String message) {
if (timestamp != null) {
return (Date) timestamp.clone();
} else if (timestampMs != null) {
// we memoize it here into timestamp to avoid instantiating Calendar again and again
// we memoize it here into timestamp to avoid creating a Date again and again
timestamp = DateUtils.getDateTime(timestampMs);
return timestamp;
}
Expand Down
13 changes: 4 additions & 9 deletions sentry/src/main/java/io/sentry/DateUtils.java
Original file line number Diff line number Diff line change
@@ -1,13 +1,10 @@
package io.sentry;

import static io.sentry.vendor.gson.internal.bind.util.ISO8601Utils.TIMEZONE_UTC;

import io.sentry.vendor.gson.internal.bind.util.ISO8601Utils;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.text.ParseException;
import java.text.ParsePosition;
import java.util.Calendar;
import java.util.Date;
import org.jetbrains.annotations.ApiStatus;
import org.jetbrains.annotations.NotNull;
Expand All @@ -24,10 +21,9 @@ private DateUtils() {}
*
* @return the UTC Date
*/
@SuppressWarnings("JdkObsolete")
@SuppressWarnings("JavaUtilDate")
public static @NotNull Date getCurrentDateTime() {
final Calendar calendar = Calendar.getInstance(TIMEZONE_UTC);
return calendar.getTime();
return new Date();
}

/**
Expand Down Expand Up @@ -78,10 +74,9 @@ private DateUtils() {}
* @param millis the UTC millis from the epoch
* @return the UTC Date
*/
@SuppressWarnings("JavaUtilDate")
public static @NotNull Date getDateTime(final long millis) {
final Calendar calendar = Calendar.getInstance(TIMEZONE_UTC);
calendar.setTimeInMillis(millis);
return calendar.getTime();
return new Date(millis);
}

/**
Expand Down
1 change: 1 addition & 0 deletions sentry/src/test/java/io/sentry/DateUtilsTest.kt
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ class DateUtilsTest {
val utcActual = convertDate(actual)
val timestamp = utcActual.format(isoFormat)

assertEquals(millis, actual.time)
assertEquals("2020-06-07T12:38:12.631Z", timestamp)
}

Expand Down
Loading