From 2bf10f658f12a6e7e8516aaca3007fce755f4582 Mon Sep 17 00:00:00 2001 From: Lukas Bloder Date: Tue, 12 May 2026 15:44:44 +0200 Subject: [PATCH 1/3] upgrade to asyncProfiler 4.4, simplify timestamp calculation in ProfileEventVisitor add changelog chore: update scripts/update-gradle.sh to v9.5.1 (#5419) Co-authored-by: GitHub chore: update scripts/update-sentry-native-ndk.sh to 0.14.1 (#5433) Co-authored-by: GitHub chore(deps): Bump SAGP from 6.0.0-alpha.6 to 6.6.0 (#5427) * chore(deps): Bump SAGP from 6.0.0-alpha.6 to 6.6.0 Co-Authored-By: Claude Opus 4.6 * changelog --------- Co-authored-by: Claude Opus 4.6 add changelog add changelog chore: update scripts/update-gradle.sh to v9.5.1 (#5419) Co-authored-by: GitHub chore: update scripts/update-sentry-native-ndk.sh to 0.14.1 (#5433) Co-authored-by: GitHub chore(deps): Bump SAGP from 6.0.0-alpha.6 to 6.6.0 (#5427) * chore(deps): Bump SAGP from 6.0.0-alpha.6 to 6.6.0 Co-Authored-By: Claude Opus 4.6 * changelog --------- Co-authored-by: Claude Opus 4.6 add changelog add changelog chore: update scripts/update-gradle.sh to v9.5.1 (#5419) Co-authored-by: GitHub chore: update scripts/update-sentry-native-ndk.sh to 0.14.1 (#5433) Co-authored-by: GitHub chore(deps): Bump SAGP from 6.0.0-alpha.6 to 6.6.0 (#5427) * chore(deps): Bump SAGP from 6.0.0-alpha.6 to 6.6.0 Co-Authored-By: Claude Opus 4.6 * changelog --------- Co-authored-by: Claude Opus 4.6 --- CHANGELOG.md | 17 +++++++++++++++++ gradle/libs.versions.toml | 2 +- ...frAsyncProfilerToSentryProfileConverter.java | 9 +-------- 3 files changed, 19 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cd876f3c57d..39258af4918 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,10 +14,27 @@ - Reduce boxing to improve performance ([#5523](https://github.com/getsentry/sentry-java/pull/5523), [#5527](https://github.com/getsentry/sentry-java/pull/5527)) +### Dependencies + +- Bump Gradle from v9.5.0 to v9.5.1 ([#5419](https://github.com/getsentry/sentry-java/pull/5419)) + - [changelog](https://github.com/gradle/gradle/blob/master/CHANGELOG.md#v951) + - [diff](https://github.com/gradle/gradle/compare/v9.5.0...v9.5.1) +- Bump Native SDK from v0.14.0 to v0.14.1 ([#5433](https://github.com/getsentry/sentry-java/pull/5433)) + - [changelog](https://github.com/getsentry/sentry-native/blob/master/CHANGELOG.md#0141) + - [diff](https://github.com/getsentry/sentry-native/compare/0.14.0...0.14.1) +- Bump SAGP (Sentry Android Gradle Plugin) from v6.0.0-alpha.6 to v6.6.0 ([#5427](https://github.com/getsentry/sentry-java/pull/5427)) + - [changelog](https://github.com/getsentry/sentry-android-gradle-plugin/blob/main/CHANGELOG.md) + - [diff](https://github.com/getsentry/sentry-android-gradle-plugin/compare/6.0.0-alpha.6...6.6.0) +- Upgrade to asyncProfiler 4.4 ([#5418](https://github.com/getsentry/sentry-java/pull/5418)) + ### Fixes - Fix performance collector scheduling many tasks in a row ([#5524](https://github.com/getsentry/sentry-java/pull/5524)) +### Dependencies + +- Upgrade to asyncProfiler 4.4 ([#5418](https://github.com/getsentry/sentry-java/pull/5418)) + ## 8.43.2 ### Improvements diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index e653069e2b3..f6edafdc17f 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -4,7 +4,7 @@ androidxLifecycle = "2.2.0" androidxNavigation = "2.4.2" androidxTestCore = "1.7.0" androidxCompose = "1.6.3" -asyncProfiler = "4.2" +asyncProfiler = "4.4" composeCompiler = "1.5.14" coroutines = "1.6.1" espresso = "3.7.0" diff --git a/sentry-async-profiler/src/main/java/io/sentry/asyncprofiler/convert/JfrAsyncProfilerToSentryProfileConverter.java b/sentry-async-profiler/src/main/java/io/sentry/asyncprofiler/convert/JfrAsyncProfilerToSentryProfileConverter.java index b7b5662a8e5..718fae422f7 100644 --- a/sentry-async-profiler/src/main/java/io/sentry/asyncprofiler/convert/JfrAsyncProfilerToSentryProfileConverter.java +++ b/sentry-async-profiler/src/main/java/io/sentry/asyncprofiler/convert/JfrAsyncProfilerToSentryProfileConverter.java @@ -26,7 +26,6 @@ @ApiStatus.Internal public final class JfrAsyncProfilerToSentryProfileConverter extends JfrConverter { - private static final double NANOS_PER_SECOND = 1_000_000_000.0; private static final long UNKNOWN_THREAD_ID = -1; private final @NotNull SentryProfile sentryProfile = new SentryProfile(); @@ -83,7 +82,6 @@ private class ProfileEventVisitor implements EventCollector.Visitor { private final @NotNull SentryStackTraceFactory stackTraceFactory; private final @NotNull JfrReader jfr; private final @NotNull Arguments args; - private final double ticksPerNanosecond; public ProfileEventVisitor( @NotNull SentryProfile sentryProfile, @@ -94,7 +92,6 @@ public ProfileEventVisitor( this.stackTraceFactory = stackTraceFactory; this.jfr = jfr; this.args = args; - ticksPerNanosecond = jfr.ticksPerSec / NANOS_PER_SECOND; } @Override @@ -150,11 +147,7 @@ private void processSampleWithStack(Event event, long threadId, StackTrace stack } private double calculateTimestamp(Event event) { - long nanosFromStart = (long) ((event.time - jfr.chunkStartTicks) / ticksPerNanosecond); - - long timeNs = jfr.chunkStartNanos + nanosFromStart; - - return DateUtils.nanosToSeconds(timeNs); + return DateUtils.nanosToSeconds(jfr.eventTimeToNanos(event.time)); } private int addStackTrace(StackTrace stackTrace) { From 80e91f1543eef2e3cc475e844b7c7ff02c1dae21 Mon Sep 17 00:00:00 2001 From: Lukas Bloder Date: Fri, 12 Jun 2026 14:54:49 +0200 Subject: [PATCH 2/3] fix changelog --- CHANGELOG.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 39258af4918..5f4a8a79059 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -31,10 +31,6 @@ - Fix performance collector scheduling many tasks in a row ([#5524](https://github.com/getsentry/sentry-java/pull/5524)) -### Dependencies - -- Upgrade to asyncProfiler 4.4 ([#5418](https://github.com/getsentry/sentry-java/pull/5418)) - ## 8.43.2 ### Improvements From 1484e5cd8922eb0ba68512e10dfdabe250edd67d Mon Sep 17 00:00:00 2001 From: Lukas Bloder Date: Fri, 12 Jun 2026 15:01:14 +0200 Subject: [PATCH 3/3] fix error in changelog after rebase --- CHANGELOG.md | 9 --------- 1 file changed, 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5f4a8a79059..648533ec18f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,15 +16,6 @@ ### Dependencies -- Bump Gradle from v9.5.0 to v9.5.1 ([#5419](https://github.com/getsentry/sentry-java/pull/5419)) - - [changelog](https://github.com/gradle/gradle/blob/master/CHANGELOG.md#v951) - - [diff](https://github.com/gradle/gradle/compare/v9.5.0...v9.5.1) -- Bump Native SDK from v0.14.0 to v0.14.1 ([#5433](https://github.com/getsentry/sentry-java/pull/5433)) - - [changelog](https://github.com/getsentry/sentry-native/blob/master/CHANGELOG.md#0141) - - [diff](https://github.com/getsentry/sentry-native/compare/0.14.0...0.14.1) -- Bump SAGP (Sentry Android Gradle Plugin) from v6.0.0-alpha.6 to v6.6.0 ([#5427](https://github.com/getsentry/sentry-java/pull/5427)) - - [changelog](https://github.com/getsentry/sentry-android-gradle-plugin/blob/main/CHANGELOG.md) - - [diff](https://github.com/getsentry/sentry-android-gradle-plugin/compare/6.0.0-alpha.6...6.6.0) - Upgrade to asyncProfiler 4.4 ([#5418](https://github.com/getsentry/sentry-java/pull/5418)) ### Fixes