From 5d0ec55707ef47175c563180092393c8013c055b Mon Sep 17 00:00:00 2001 From: Alexander Dinauer Date: Wed, 8 Jul 2026 15:11:14 +0200 Subject: [PATCH 1/2] test: Reintroduce Java 8 floorDiv incompatibility --- sentry/src/main/java/io/sentry/vendor/SentryIso8601Utils.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sentry/src/main/java/io/sentry/vendor/SentryIso8601Utils.java b/sentry/src/main/java/io/sentry/vendor/SentryIso8601Utils.java index 134a13e72a..4a53a439c1 100644 --- a/sentry/src/main/java/io/sentry/vendor/SentryIso8601Utils.java +++ b/sentry/src/main/java/io/sentry/vendor/SentryIso8601Utils.java @@ -290,7 +290,7 @@ private static long daysFromYearMonthDay(int year, final int month, final int da private static int[] epochDayToYearMonthDay(long epochDay) { epochDay += DAYS_0000_TO_1970; - final long era = SentryMath.floorDiv(epochDay, 146097L); + final long era = Math.floorDiv(epochDay, 146097); final int dayOfEra = (int) (epochDay - era * 146097); final int yearOfEra = (dayOfEra - dayOfEra / 1460 + dayOfEra / 36524 - dayOfEra / 146096) / 365; final int year = (int) (yearOfEra + era * 400); From 89be041ba500a389eb758e775731a26a7cb65ab9 Mon Sep 17 00:00:00 2001 From: Alexander Dinauer Date: Wed, 8 Jul 2026 15:25:31 +0200 Subject: [PATCH 2/2] test: Verify Java 8 check in logback --- .../src/main/java/io/sentry/logback/SentryAppender.java | 2 +- sentry/src/main/java/io/sentry/vendor/SentryIso8601Utils.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sentry-logback/src/main/java/io/sentry/logback/SentryAppender.java b/sentry-logback/src/main/java/io/sentry/logback/SentryAppender.java index 20fdf304bd..4194d57e88 100644 --- a/sentry-logback/src/main/java/io/sentry/logback/SentryAppender.java +++ b/sentry-logback/src/main/java/io/sentry/logback/SentryAppender.java @@ -230,7 +230,7 @@ private String formatted(@NotNull ILoggingEvent loggingEvent) { protected @NotNull Breadcrumb createBreadcrumb(final @NotNull ILoggingEvent loggingEvent) { final Breadcrumb breadcrumb = new Breadcrumb(); breadcrumb.setLevel(formatLevel(loggingEvent.getLevel())); - breadcrumb.setCategory(loggingEvent.getLoggerName()); + breadcrumb.setCategory(Objects.requireNonNullElse(loggingEvent.getLoggerName(), "")); breadcrumb.setMessage(formatted(loggingEvent)); return breadcrumb; } diff --git a/sentry/src/main/java/io/sentry/vendor/SentryIso8601Utils.java b/sentry/src/main/java/io/sentry/vendor/SentryIso8601Utils.java index 4a53a439c1..134a13e72a 100644 --- a/sentry/src/main/java/io/sentry/vendor/SentryIso8601Utils.java +++ b/sentry/src/main/java/io/sentry/vendor/SentryIso8601Utils.java @@ -290,7 +290,7 @@ private static long daysFromYearMonthDay(int year, final int month, final int da private static int[] epochDayToYearMonthDay(long epochDay) { epochDay += DAYS_0000_TO_1970; - final long era = Math.floorDiv(epochDay, 146097); + final long era = SentryMath.floorDiv(epochDay, 146097L); final int dayOfEra = (int) (epochDay - era * 146097); final int yearOfEra = (dayOfEra - dayOfEra / 1460 + dayOfEra / 36524 - dayOfEra / 146096) / 365; final int year = (int) (yearOfEra + era * 400);