ref(android): Move getThreadId into AndroidThreadChecker

markushi · claude · markushi · commit 4a5491928c81 · 2026-01-12T09:46:03.000+01:00
Move getThreadId helper method from ThreadUtil into AndroidThreadChecker
to consolidate thread-related utilities. Simplify CHANGELOG entry.

Co-Authored-By: Claude Sonnet 4.5 &lt;noreply@anthropic.com&gt;
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,9 +12,6 @@
 ### Improvements
 
 - Update Android targetSdk to API 36 (Android 16) ([#5016](https://github.com/getsentry/sentry-java/pull/5016))
-  - Migrated from deprecated `Thread.getId()` to `Thread.threadId()` with backward compatibility
-  - Created `ThreadUtil` helper for version-aware thread ID retrieval
-  - Updated sample app to use `OnBackPressedCallback` instead of deprecated `onBackPressed()`
 - Expose `MAX_EVENT_SIZE_BYTES` constant in SentryOptions ([#4962](https://github.com/getsentry/sentry-java/pull/4962))
 - Discard envelopes on `4xx` and `5xx` response ([#4950](https://github.com/getsentry/sentry-java/pull/4950))
   - This aims to not overwhelm Sentry after an outage or load shedding (including HTTP 429) where too many events are sent at once
diff --git a/sentry-android-core/api/sentry-android-core.api b/sentry-android-core/api/sentry-android-core.api
@@ -659,7 +659,3 @@ public abstract interface class io/sentry/android/core/util/AndroidLazyEvaluator
 	public abstract fun evaluate (Landroid/content/Context;)Ljava/lang/Object;
 }
 
-public final class io/sentry/android/core/util/ThreadUtil {
-	public static fun getThreadId (Ljava/lang/Thread;)J
-}
-
diff --git a/sentry-android-core/src/main/java/io/sentry/android/core/internal/util/AndroidThreadChecker.java b/sentry-android-core/src/main/java/io/sentry/android/core/internal/util/AndroidThreadChecker.java
@@ -1,9 +1,9 @@
 package io.sentry.android.core.internal.util;
 
+import android.os.Build;
 import android.os.Handler;
 import android.os.Looper;
 import android.os.Process;
-import io.sentry.android.core.util.ThreadUtil;
 import io.sentry.protocol.SentryThread;
 import io.sentry.util.thread.IThreadChecker;
 import org.jetbrains.annotations.ApiStatus;
@@ -25,14 +25,32 @@ private AndroidThreadChecker() {
     new Handler(Looper.getMainLooper()).post(() -> mainThreadSystemId = Process.myTid());
   }
 
+  /**
+   * Gets the thread ID in a way that's compatible across Android versions.
+   *
+   * <p>Uses {@link Thread#threadId()} on Android 14 (API 34) and above, and falls back to {@link
+   * Thread#getId()} on older versions.
+   *
+   * @param thread the thread to get the ID for
+   * @return the thread ID
+   */
+  @SuppressWarnings("deprecation")
+  public static long getThreadId(final @NotNull Thread thread) {
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
+      return thread.threadId();
+    } else {
+      return thread.getId();
+    }
+  }
+
   @Override
   public boolean isMainThread(final long threadId) {
-    return ThreadUtil.getThreadId(Looper.getMainLooper().getThread()) == threadId;
+    return getThreadId(Looper.getMainLooper().getThread()) == threadId;
   }
 
   @Override
   public boolean isMainThread(final @NotNull Thread thread) {
-    return isMainThread(ThreadUtil.getThreadId(thread));
+    return isMainThread(getThreadId(thread));
   }
 
   @Override
diff --git a/sentry-android-core/src/main/java/io/sentry/android/core/performance/ActivityLifecycleSpanHelper.java b/sentry-android-core/src/main/java/io/sentry/android/core/performance/ActivityLifecycleSpanHelper.java
@@ -8,7 +8,7 @@
 import io.sentry.SpanDataConvention;
 import io.sentry.SpanStatus;
 import io.sentry.android.core.AndroidDateUtils;
-import io.sentry.android.core.util.ThreadUtil;
+import io.sentry.android.core.internal.util.AndroidThreadChecker;
 import java.util.concurrent.TimeUnit;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
@@ -131,7 +131,8 @@ public void clear() {
 
   private void setDefaultStartSpanData(final @NotNull ISpan span) {
     span.setData(
-        SpanDataConvention.THREAD_ID, ThreadUtil.getThreadId(Looper.getMainLooper().getThread()));
+        SpanDataConvention.THREAD_ID,
+        AndroidThreadChecker.getThreadId(Looper.getMainLooper().getThread()));
     span.setData(SpanDataConvention.THREAD_NAME, "main");
     span.setData(SpanDataConvention.CONTRIBUTES_TTID, true);
     span.setData(SpanDataConvention.CONTRIBUTES_TTFD, true);
diff --git a/sentry-android-core/src/main/java/io/sentry/android/core/util/ThreadUtil.java b/sentry-android-core/src/main/java/io/sentry/android/core/util/ThreadUtil.java

Original file line number	Diff line number	Diff line change
`@@ -659,7 +659,3 @@ public abstract interface class io/sentry/android/core/util/AndroidLazyEvaluator`
`659`	`659`	`public abstract fun evaluate (Landroid/content/Context;)Ljava/lang/Object;`
`660`	`660`	`}`
`661`	`661`
`662`		`-public final class io/sentry/android/core/util/ThreadUtil {`
`663`		`- public static fun getThreadId (Ljava/lang/Thread;)J`
`664`		`-}`
`665`		`-`