Merge branch 'main' into feat/tombstone_native_sdk_merge

supervacuus · web-flow · commit aa8f65fc4ec3 · 2026-01-23T11:18:21.000+01:00
diff --git a/.claude/settings.json b/.claude/settings.json
@@ -0,0 +1,34 @@
+{
+  "permissions": {
+    "allow": [
+      "Bash(find:*)",
+      "Bash(ls:*)",
+      "Bash(git:*)",
+      "Bash(git status:*)",
+      "Bash(git log:*)",
+      "Bash(git diff:*)",
+      "Bash(git show:*)",
+      "Bash(git branch:*)",
+      "Bash(git remote:*)",
+      "Bash(git tag:*)",
+      "Bash(git stash list:*)",
+      "Bash(git rev-parse:*)",
+      "Bash(gh pr view:*)",
+      "Bash(gh pr list:*)",
+      "Bash(gh pr checks:*)",
+      "Bash(gh pr diff:*)",
+      "Bash(gh issue view:*)",
+      "Bash(gh issue list:*)",
+      "Bash(gh run view:*)",
+      "Bash(gh run list:*)",
+      "Bash(gh run logs:*)",
+      "Bash(gh repo view:*)",
+      "WebFetch(domain:github.com)",
+      "WebFetch(domain:docs.sentry.io)",
+      "WebFetch(domain:develop.sentry.dev)",
+      "Bash(grep:*)",
+      "Bash(mv:*)"
+    ],
+    "deny": []
+  }
+}
diff --git a/.github/workflows/changelog-preview.yml b/.github/workflows/changelog-preview.yml
@@ -11,6 +11,7 @@ on:
 permissions:
   contents: write
   pull-requests: write
+  statuses: write
 
 jobs:
   changelog-preview:
diff --git a/.gitignore b/.gitignore
@@ -28,3 +28,6 @@ spy.log
 .kotlin
 **/tomcat.8080/webapps/
 **/__pycache__
+
+# Local Claude Code settings that should not be committed
+.claude/settings.local.json
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,12 +1,29 @@
 # Changelog
 
-## Unreleased
+# Unreleased
 
 ### Features
 
-- Added `io.sentry.ndk.sdk-name` Android manifest option to configure the native SDK's name ([#5027](https://github.com/getsentry/sentry-java/pull/5027))
+- Update Android targetSdk to API 36 (Android 16) ([#5016](https://github.com/getsentry/sentry-java/pull/5016))
 - Merge Tombstone and Native SDK events into single crash event. ([#5037](https://github.com/getsentry/sentry-java/pull/5037))
 
+### Internal
+
+- Set `write` permission for `statuses` in the changelog preview GHA workflow. ([#5053](https://github.com/getsentry/sentry-java/pull/5053))
+
+## 8.31.0
+
+### Features
+
+- Added `io.sentry.ndk.sdk-name` Android manifest option to configure the native SDK's name ([#5027](https://github.com/getsentry/sentry-java/pull/5027))
+- Replace `sentry.trace.parent_span_id` attribute with `spanId` property on `SentryLogEvent` ([#5040](https://github.com/getsentry/sentry-java/pull/5040))
+
+### Fixes
+
+- Only attach user attributes to logs if `sendDefaultPii` is enabled ([#5036](https://github.com/getsentry/sentry-java/pull/5036))
+- Reject new logs if `LoggerBatchProcessor` is shutting down ([#5041](https://github.com/getsentry/sentry-java/pull/5041))
+- Downgrade protobuf-javalite dependency from 4.33.1 to 3.25.8 ([#5044](https://github.com/getsentry/sentry-java/pull/5044))
+
 ### Dependencies
 
 - Bump Native SDK from v0.12.2 to v0.12.3 ([#5012](https://github.com/getsentry/sentry-java/pull/5012))
diff --git a/gradle.properties b/gradle.properties
@@ -11,7 +11,7 @@ org.jetbrains.dokka.experimental.gradle.pluginMode=V2Enabled
 android.useAndroidX=true
 
 # Release information
-versionName=8.30.0
+versionName=8.31.0
 
 # Override the SDK name on native crashes on Android
 sentryAndroidSdkName=sentry.native.android
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -34,14 +34,14 @@ springboot2 = "2.7.18"
 springboot3 = "3.5.0"
 springboot4 = "4.0.0"
 # Android
-targetSdk = "34"
-compileSdk = "34"
+targetSdk = "36"
+compileSdk = "36"
 minSdk = "21"
 spotless = "7.0.4"
 gummyBears = "0.12.0"
 camerax = "1.3.0"
 openfeature = "1.18.2"
-protobuf = "4.33.1"
+protobuf = "3.25.8"
 
 [plugins]
 kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
@@ -204,15 +204,15 @@ tomcat-catalina-jakarta = { module = "org.apache.tomcat:tomcat-catalina", versio
 tomcat-embed-jasper-jakarta = { module = "org.apache.tomcat.embed:tomcat-embed-jasper", version = "11.0.10" }
 
 # test libraries
-androidx-compose-ui-test-junit4 = { module = "androidx.compose.ui:ui-test-junit4", version = "1.6.8" }
+androidx-compose-ui-test-junit4 = { module = "androidx.compose.ui:ui-test-junit4", version = "1.9.5" }
 androidx-test-core = { module = "androidx.test:core", version.ref = "androidxTestCore" }
 androidx-test-core-ktx = { module = "androidx.test:core-ktx", version.ref = "androidxTestCore" }
 androidx-test-espresso-core = { module = "androidx.test.espresso:espresso-core", version.ref = "espresso" }
 androidx-test-espresso-idling-resource = { module = "androidx.test.espresso:espresso-idling-resource", version.ref = "espresso" }
-androidx-test-ext-junit = { module = "androidx.test.ext:junit", version = "1.1.5" }
-androidx-test-orchestrator = { module = "androidx.test:orchestrator", version = "1.5.0" }
+androidx-test-ext-junit = { module = "androidx.test.ext:junit", version = "1.3.0" }
+androidx-test-orchestrator = { module = "androidx.test:orchestrator", version = "1.6.1" }
 androidx-test-rules = { module = "androidx.test:rules", version.ref = "androidxTestCore" }
-androidx-test-runner = { module = "androidx.test:runner", version = "1.6.2" }
+androidx-test-runner = { module = "androidx.test:runner", version = "1.7.0" }
 awaitility-kotlin = { module = "org.awaitility:awaitility-kotlin", version = "4.1.1" }
 awaitility-kotlin-spring7 = { module = "org.awaitility:awaitility-kotlin", version = "4.3.0" }
 awaitility3-kotlin = { module = "org.awaitility:awaitility-kotlin", version = "3.1.6" }
diff --git a/sentry-android-core/src/main/java/io/sentry/android/core/AppComponentsBreadcrumbsIntegration.java b/sentry-android-core/src/main/java/io/sentry/android/core/AppComponentsBreadcrumbsIntegration.java
@@ -98,6 +98,7 @@ public void onConfigurationChanged(@NotNull Configuration newConfig) {
     executeInBackground(() -> captureConfigurationChangedBreadcrumb(now, newConfig));
   }
 
+  @SuppressWarnings("deprecation")
   @Override
   public void onLowMemory() {
     // we do this in onTrimMemory below already, this is legacy API (14 or below)
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,5 +1,6 @@
 package io.sentry.android.core.internal.util;
 
+import android.os.Build;
 import android.os.Handler;
 import android.os.Looper;
 import android.os.Process;
@@ -24,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 16 (API 36) 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.BAKLAVA) {
+      return thread.threadId();
+    } else {
+      return thread.getId();
+    }
+  }
+
   @Override
   public boolean isMainThread(final long threadId) {
-    return Looper.getMainLooper().getThread().getId() == threadId;
+    return getThreadId(Looper.getMainLooper().getThread()) == threadId;
   }
 
   @Override
   public boolean isMainThread(final @NotNull Thread thread) {
-    return isMainThread(thread.getId());
+    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,6 +8,7 @@
 import io.sentry.SpanDataConvention;
 import io.sentry.SpanStatus;
 import io.sentry.android.core.AndroidDateUtils;
+import io.sentry.android.core.internal.util.AndroidThreadChecker;
 import java.util.concurrent.TimeUnit;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
@@ -129,7 +130,9 @@ public void clear() {
   }
 
   private void setDefaultStartSpanData(final @NotNull ISpan span) {
-    span.setData(SpanDataConvention.THREAD_ID, Looper.getMainLooper().getThread().getId());
+    span.setData(
+        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-integration-tests/sentry-uitest-android/src/androidTest/java/io/sentry/uitest/android/UserFeedbackUiTest.kt b/sentry-android-integration-tests/sentry-uitest-android/src/androidTest/java/io/sentry/uitest/android/UserFeedbackUiTest.kt
@@ -1,9 +1,9 @@
 package io.sentry.uitest.android
 
 import android.graphics.Color
-import android.util.TypedValue
 import android.view.View
 import android.widget.EditText
+import android.widget.FrameLayout
 import android.widget.LinearLayout
 import androidx.test.core.app.launchActivity
 import androidx.test.espresso.Espresso.onView
@@ -550,10 +550,6 @@ class UserFeedbackUiTest : BaseUiTest() {
       assertEquals((densityScale * 12).toInt(), widget.paddingTop)
       assertEquals((densityScale * 12).toInt(), widget.paddingBottom)
 
-      val typedValue = TypedValue()
-      widget.context.theme.resolveAttribute(android.R.attr.colorForeground, typedValue, true)
-      assertEquals(typedValue.data, widget.currentTextColor)
-
       assertEquals("Report a Bug", widget.text)
     }
 
@@ -666,14 +662,19 @@ class UserFeedbackUiTest : BaseUiTest() {
     val buttonId = Int.MAX_VALUE - 1
     val feedbackScenario = launchActivity<EmptyActivity>()
     feedbackScenario.onActivity {
+      val layoutParams =
+        FrameLayout.LayoutParams(
+          LinearLayout.LayoutParams.MATCH_PARENT,
+          LinearLayout.LayoutParams.MATCH_PARENT,
+        )
       val view =
-        LinearLayout(it).apply {
-          orientation = LinearLayout.VERTICAL
+        FrameLayout(it).apply {
           addView(
             SentryUserFeedbackButton(it).apply {
               id = buttonId
               widgetConfig?.invoke(this)
-            }
+            },
+            layoutParams,
           )
         }
       it.setContentView(view)
diff --git a/sentry-samples/sentry-samples-android/src/main/java/io/sentry/samples/android/ProfilingActivity.kt b/sentry-samples/sentry-samples-android/src/main/java/io/sentry/samples/android/ProfilingActivity.kt
@@ -4,6 +4,7 @@ import android.os.Bundle
 import android.view.View
 import android.widget.SeekBar
 import android.widget.Toast
+import androidx.activity.OnBackPressedCallback
 import androidx.appcompat.app.AppCompatActivity
 import androidx.recyclerview.widget.LinearLayoutManager
 import io.sentry.ITransaction
@@ -24,6 +25,21 @@ class ProfilingActivity : AppCompatActivity() {
 
   override fun onCreate(savedInstanceState: Bundle?) {
     super.onCreate(savedInstanceState)
+
+    onBackPressedDispatcher.addCallback(
+      this,
+      object : OnBackPressedCallback(true) {
+        override fun handleOnBackPressed() {
+          if (profileFinished) {
+            isEnabled = false
+            onBackPressedDispatcher.onBackPressed()
+          } else {
+            Toast.makeText(this@ProfilingActivity, R.string.profiling_running, Toast.LENGTH_SHORT)
+              .show()
+          }
+        }
+      },
+    )
     binding = ActivityProfilingBinding.inflate(layoutInflater)
 
     binding.profilingDurationSeekbar.setOnSeekBarChangeListener(
@@ -156,14 +172,6 @@ class ProfilingActivity : AppCompatActivity() {
       else -> fibonacci(n - 1) + fibonacci(n - 2)
     }
 
-  override fun onBackPressed() {
-    if (profileFinished) {
-      super.onBackPressed()
-    } else {
-      Toast.makeText(this, R.string.profiling_running, Toast.LENGTH_SHORT).show()
-    }
-  }
-
   private fun getProfileDuration(): Float {
     // Minimum duration of the profile is 100 milliseconds
     return binding.profilingDurationSeekbar.progress / 10.0F + 0.1F
diff --git a/sentry/api/sentry.api b/sentry/api/sentry.api
@@ -3238,15 +3238,19 @@ public final class io/sentry/SentryLogEvent : io/sentry/JsonSerializable, io/sen
 	public fun getBody ()Ljava/lang/String;
 	public fun getLevel ()Lio/sentry/SentryLogLevel;
 	public fun getSeverityNumber ()Ljava/lang/Integer;
+	public fun getSpanId ()Lio/sentry/SpanId;
 	public fun getTimestamp ()Ljava/lang/Double;
+	public fun getTraceId ()Lio/sentry/protocol/SentryId;
 	public fun getUnknown ()Ljava/util/Map;
 	public fun serialize (Lio/sentry/ObjectWriter;Lio/sentry/ILogger;)V
 	public fun setAttribute (Ljava/lang/String;Lio/sentry/SentryLogEventAttributeValue;)V
 	public fun setAttributes (Ljava/util/Map;)V
 	public fun setBody (Ljava/lang/String;)V
 	public fun setLevel (Lio/sentry/SentryLogLevel;)V
 	public fun setSeverityNumber (Ljava/lang/Integer;)V
+	public fun setSpanId (Lio/sentry/SpanId;)V
 	public fun setTimestamp (Ljava/lang/Double;)V
+	public fun setTraceId (Lio/sentry/protocol/SentryId;)V
 	public fun setUnknown (Ljava/util/Map;)V
 }
 
@@ -3261,6 +3265,7 @@ public final class io/sentry/SentryLogEvent$JsonKeys {
 	public static final field BODY Ljava/lang/String;
 	public static final field LEVEL Ljava/lang/String;
 	public static final field SEVERITY_NUMBER Ljava/lang/String;
+	public static final field SPAN_ID Ljava/lang/String;
 	public static final field TIMESTAMP Ljava/lang/String;
 	public static final field TRACE_ID Ljava/lang/String;
 	public fun <init> ()V
diff --git a/sentry/src/main/java/io/sentry/SentryLogEvent.java b/sentry/src/main/java/io/sentry/SentryLogEvent.java
@@ -13,6 +13,7 @@
 public final class SentryLogEvent implements JsonUnknown, JsonSerializable {
 
   private @NotNull SentryId traceId;
+  private @Nullable SpanId spanId;
   private @NotNull Double timestamp;
   private @NotNull String body;
   private @NotNull SentryLogLevel level;
@@ -92,10 +93,27 @@ public void setSeverityNumber(final @Nullable Integer severityNumber) {
     this.severityNumber = severityNumber;
   }
 
+  public @Nullable SpanId getSpanId() {
+    return spanId;
+  }
+
+  public void setSpanId(final @Nullable SpanId spanId) {
+    this.spanId = spanId;
+  }
+
+  public @NotNull SentryId getTraceId() {
+    return traceId;
+  }
+
+  public void setTraceId(final @NotNull SentryId traceId) {
+    this.traceId = traceId;
+  }
+
   // region json
   public static final class JsonKeys {
     public static final String TIMESTAMP = "timestamp";
     public static final String TRACE_ID = "trace_id";
+    public static final String SPAN_ID = "span_id";
     public static final String LEVEL = "level";
     public static final String SEVERITY_NUMBER = "severity_number";
     public static final String BODY = "body";
@@ -109,6 +127,9 @@ public void serialize(final @NotNull ObjectWriter writer, final @NotNull ILogger
     writer.beginObject();
     writer.name(JsonKeys.TIMESTAMP).value(logger, doubleToBigDecimal(timestamp));
     writer.name(JsonKeys.TRACE_ID).value(logger, traceId);
+    if (spanId != null) {
+      writer.name(JsonKeys.SPAN_ID).value(logger, spanId);
+    }
     writer.name(JsonKeys.BODY).value(body);
     writer.name(JsonKeys.LEVEL).value(logger, level);
     if (severityNumber != null) {
@@ -145,6 +166,7 @@ public static final class Deserializer implements JsonDeserializer<SentryLogEven
         final @NotNull ObjectReader reader, final @NotNull ILogger logger) throws Exception {
       @Nullable Map<String, Object> unknown = null;
       @Nullable SentryId traceId = null;
+      @Nullable SpanId spanId = null;
       @Nullable Double timestamp = null;
       @Nullable String body = null;
       @Nullable SentryLogLevel level = null;
@@ -158,6 +180,9 @@ public static final class Deserializer implements JsonDeserializer<SentryLogEven
           case JsonKeys.TRACE_ID:
             traceId = reader.nextOrNull(logger, new SentryId.Deserializer());
             break;
+          case JsonKeys.SPAN_ID:
+            spanId = reader.nextOrNull(logger, new SpanId.Deserializer());
+            break;
           case JsonKeys.TIMESTAMP:
             timestamp = reader.nextDoubleOrNull();
             break;
@@ -216,6 +241,7 @@ public static final class Deserializer implements JsonDeserializer<SentryLogEven
 
       logEvent.setAttributes(attributes);
       logEvent.setSeverityNumber(severityNumber);
+      logEvent.setSpanId(spanId);
       logEvent.setUnknown(unknown);
 
       return logEvent;
diff --git a/sentry/src/main/java/io/sentry/logger/LoggerApi.java b/sentry/src/main/java/io/sentry/logger/LoggerApi.java
diff --git a/sentry/src/main/java/io/sentry/logger/LoggerBatchProcessor.java b/sentry/src/main/java/io/sentry/logger/LoggerBatchProcessor.java
diff --git a/sentry/src/test/java/io/sentry/ScopesTest.kt b/sentry/src/test/java/io/sentry/ScopesTest.kt
diff --git a/sentry/src/test/java/io/sentry/protocol/SentryLogsSerializationTest.kt b/sentry/src/test/java/io/sentry/protocol/SentryLogsSerializationTest.kt
diff --git a/sentry/src/test/resources/json/sentry_logs.json b/sentry/src/test/resources/json/sentry_logs.json

Original file line number	Diff line number	Diff line change
`@@ -98,6 +98,7 @@ public void onConfigurationChanged(@NotNull Configuration newConfig) {`
`98`	`98`	`executeInBackground(() -> captureConfigurationChangedBreadcrumb(now, newConfig));`
`99`	`99`	`}`
`100`	`100`
	`101`	`+ @SuppressWarnings("deprecation")`
`101`	`102`	`@Override`
`102`	`103`	`public void onLowMemory() {`
`103`	`104`	`// we do this in onTrimMemory below already, this is legacy API (14 or below)`