Merge branch 'main' into feat/profiling-remove-vendored-code

# Conflicts:
#	CHANGELOG.md

Author: lbloder

.github/workflows/integration-tests-size.yml

@@ -0,0 +1,46 @@
+name: SDK Size Analysis
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  build:
+    name: Build and Analyze SDK Size
+    runs-on: ubuntu-latest
+
+    env:
+      GRADLE_ENCRYPTION_KEY: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
+
+    steps:
+      - name: Checkout Repo
+        uses: actions/checkout@v5
+
+      - name: Setup Java Version
+        uses: actions/setup-java@v5
+        with:
+          distribution: "temurin"
+          java-version: "17"
+
+      # Workaround for https://github.com/gradle/actions/issues/21 to use config cache
+      - name: Cache buildSrc
+        uses: actions/cache@v4
+        with:
+          path: buildSrc/build
+          key: build-logic-${{ hashFiles('buildSrc/src/**', 'buildSrc/build.gradle.kts','buildSrc/settings.gradle.kts') }}
+
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2
+        with:
+          cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
+
+      - name: Size Analysis
+        run: ./gradlew :sentry-android-integration-tests:test-app-size:bundleRelease
+        env:
+          SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}

.github/workflows/spring-boot-2-matrix.yml

@@ -80,6 +80,7 @@ jobs:
             -e '/.*"sentry-android-integration-tests:sentry-uitest-android",/d' \
             -e '/.*"sentry-android-integration-tests:sentry-uitest-android-critical",/d' \
             -e '/.*"sentry-android-integration-tests:test-app-sentry",/d' \
+            -e '/.*"sentry-android-integration-tests:test-app-size",/d' \
             -e '/.*"sentry-samples:sentry-samples-android",/d' \
             -e '/.*"sentry-android-replay",/d' \
             settings.gradle.kts
@@ -91,6 +92,7 @@ jobs:
             -e '/.*"sentry-uitest-android-benchmark",/d' \
             -e '/.*"sentry-uitest-android-critical",/d' \
             -e '/.*"test-app-sentry",/d' \
+            -e '/.*"test-app-size",/d' \
             -e '/.*"sentry-samples-android",/d' \
             build.gradle.kts
 

.github/workflows/spring-boot-3-matrix.yml

@@ -80,6 +80,7 @@ jobs:
             -e '/.*"sentry-android-integration-tests:sentry-uitest-android",/d' \
             -e '/.*"sentry-android-integration-tests:sentry-uitest-android-critical",/d' \
             -e '/.*"sentry-android-integration-tests:test-app-sentry",/d' \
+            -e '/.*"sentry-android-integration-tests:test-app-size",/d' \
             -e '/.*"sentry-samples:sentry-samples-android",/d' \
             -e '/.*"sentry-android-replay",/d' \
             settings.gradle.kts
@@ -91,6 +92,7 @@ jobs:
             -e '/.*"sentry-uitest-android-benchmark",/d' \
             -e '/.*"sentry-uitest-android-critical",/d' \
             -e '/.*"test-app-sentry",/d' \
+            -e '/.*"test-app-size",/d' \
             -e '/.*"sentry-samples-android",/d' \
             build.gradle.kts
 

.github/workflows/spring-boot-4-matrix.yml

@@ -80,6 +80,7 @@ jobs:
             -e '/.*"sentry-android-integration-tests:sentry-uitest-android",/d' \
             -e '/.*"sentry-android-integration-tests:sentry-uitest-android-critical",/d' \
             -e '/.*"sentry-android-integration-tests:test-app-sentry",/d' \
+            -e '/.*"sentry-android-integration-tests:test-app-size",/d' \
             -e '/.*"sentry-samples:sentry-samples-android",/d' \
             -e '/.*"sentry-android-replay",/d' \
             settings.gradle.kts
@@ -91,6 +92,7 @@ jobs:
             -e '/.*"sentry-uitest-android-benchmark",/d' \
             -e '/.*"sentry-uitest-android-critical",/d' \
             -e '/.*"test-app-sentry",/d' \
+            -e '/.*"test-app-size",/d' \
             -e '/.*"sentry-samples-android",/d' \
             build.gradle.kts
 

CHANGELOG.md

@@ -7,12 +7,23 @@
 - Remove vendored code and upgrade to async profiler 4.2 ([#4856](https://github.com/getsentry/sentry-java/pull/4856))
   - This adds support for JDK 23+
 
+### Fixes
+
+- Removed SentryExecutorService limit for delayed scheduled tasks ([#4846](https://github.com/getsentry/sentry-java/pull/4846))
+- Fix visual artifacts for the Canvas strategy on some devices ([#4861](https://github.com/getsentry/sentry-java/pull/4861))
+
 ### Improvements
 
 - Fallback to distinct-id as user.id logging attribute when user is not set ([#4847](https://github.com/getsentry/sentry-java/pull/4847))
 - Report Timber.tag() as `timber.tag` log attribute ([#4845](https://github.com/getsentry/sentry-java/pull/4845))
 - Session Replay: Add screenshot strategy serialization to RRWeb events ([#4851](https://github.com/getsentry/sentry-java/pull/4851))
 
+### Dependencies
+
+- Bump Native SDK from v0.11.3 to v0.12.1 ([#4859](https://github.com/getsentry/sentry-java/pull/4859))
+  - [changelog](https://github.com/getsentry/sentry-native/blob/master/CHANGELOG.md#0121)
+  - [diff](https://github.com/getsentry/sentry-native/compare/0.11.3...0.12.1)
+
 ## 8.25.0
 
 ### Fixes

README.md

@@ -14,6 +14,7 @@ Sentry SDK for Java and Android
 ===========
 [![GH Workflow](https://img.shields.io/github/actions/workflow/status/getsentry/sentry-java/build.yml?branch=main)](https://github.com/getsentry/sentry-java/actions)
 [![codecov](https://codecov.io/gh/getsentry/sentry-java/branch/main/graph/badge.svg)](https://codecov.io/gh/getsentry/sentry-java)
+[![X Follow](https://img.shields.io/twitter/follow/sentry?label=sentry&style=social)](https://x.com/intent/follow?screen_name=sentry)
 [![Discord Chat](https://img.shields.io/discord/621778831602221064?logo=discord&logoColor=ffffff&color=7389D8)](https://discord.gg/PXa5Apfe7K)
 
 | Packages                                | Maven Central                                                                                                                                                                                                                        | Minimum Android API Version |

build.gradle.kts

@@ -30,6 +30,7 @@ plugins {
     alias(libs.plugins.gradle.versions) apply false
     alias(libs.plugins.spring.dependency.management) apply false
     id("io.sentry.javadoc.aggregate")
+    alias(libs.plugins.sentry) apply false
 }
 
 buildscript {
@@ -83,6 +84,7 @@ apiValidation {
             "sentry-uitest-android-critical",
             "test-app-plain",
             "test-app-sentry",
+            "test-app-size",
             "sentry-samples-netflix-dgs"
         )
     )

gradle/libs.versions.toml

@@ -31,7 +31,7 @@ retrofit = "2.9.0"
 slf4j = "1.7.30"
 springboot2 = "2.7.18"
 springboot3 = "3.5.0"
-springboot4 = "4.0.0-M3"
+springboot4 = "4.0.0-RC1"
 # Android
 targetSdk = "34"
 compileSdk = "34"
@@ -65,6 +65,7 @@ springboot4 = { id = "org.springframework.boot", version.ref = "springboot4" }
 spring-dependency-management = { id = "io.spring.dependency-management", version = "1.0.11.RELEASE" }
 gretty = { id = "org.gretty", version = "4.0.0" }
 animalsniffer = { id = "ru.vyarus.animalsniffer", version = "2.0.1" }
+sentry = { id = "io.sentry.android.gradle", version = "6.0.0-alpha.6"}
 
 [libraries]
 apache-httpclient = { module = "org.apache.httpcomponents.client5:httpclient5", version = "5.0.4" }
@@ -134,7 +135,7 @@ quartz = { module = "org.quartz-scheduler:quartz", version = "2.3.0" }
 reactor-core = { module = "io.projectreactor:reactor-core", version = "3.5.3" }
 retrofit = { module = "com.squareup.retrofit2:retrofit", version.ref = "retrofit" }
 retrofit-gson = { module = "com.squareup.retrofit2:converter-gson", version.ref = "retrofit" }
-sentry-native-ndk = { module = "io.sentry:sentry-native-ndk", version = "0.11.3" }
+sentry-native-ndk = { module = "io.sentry:sentry-native-ndk", version = "0.12.1" }
 servlet-api = { module = "javax.servlet:javax.servlet-api", version = "3.1.0" }
 servlet-jakarta-api = { module = "jakarta.servlet:jakarta.servlet-api", version = "6.1.0" }
 slf4j-api = { module = "org.slf4j:slf4j-api", version.ref = "slf4j" }
@@ -165,6 +166,7 @@ springboot3-starter-security = { module = "org.springframework.boot:spring-boot-
 springboot3-starter-jdbc = { module = "org.springframework.boot:spring-boot-starter-jdbc", version.ref = "springboot3" }
 springboot3-starter-actuator = { module = "org.springframework.boot:spring-boot-starter-actuator", version.ref = "springboot3" }
 springboot4-otel = { module = "io.opentelemetry.instrumentation:opentelemetry-spring-boot-starter", version.ref = "otelInstrumentation" }
+springboot4-resttestclient = { module = "org.springframework.boot:spring-boot-resttestclient", version.ref = "springboot4" }
 springboot4-starter = { module = "org.springframework.boot:spring-boot-starter", version.ref = "springboot4" }
 springboot4-starter-graphql = { module = "org.springframework.boot:spring-boot-starter-graphql", version.ref = "springboot4" }
 springboot4-starter-quartz = { module = "org.springframework.boot:spring-boot-starter-quartz", version.ref = "springboot4" }

sentry-android-core/src/main/java/io/sentry/android/core/AndroidOptionsInitializer.java

@@ -16,6 +16,7 @@
 import io.sentry.NoOpCompositePerformanceCollector;
 import io.sentry.NoOpConnectionStatusProvider;
 import io.sentry.NoOpContinuousProfiler;
+import io.sentry.NoOpReplayBreadcrumbConverter;
 import io.sentry.NoOpSocketTagger;
 import io.sentry.NoOpTransactionProfiler;
 import io.sentry.NoopVersionDetector;
@@ -253,6 +254,13 @@ static void initializeIntegrationsAndProcessors(
       options.setCompositePerformanceCollector(new DefaultCompositePerformanceCollector(options));
     }
 
+    if (options.getReplayController().getBreadcrumbConverter()
+        instanceof NoOpReplayBreadcrumbConverter) {
+      options
+          .getReplayController()
+          .setBreadcrumbConverter(new DefaultReplayBreadcrumbConverter(options));
+    }
+
     // Check if the profiler was already instantiated in the app start.
     // We use the Android profiler, that uses a global start/stop api, so we need to preserve the
     // state of the profiler, and it's only possible retaining the instance.
@@ -406,7 +414,6 @@ static void installDefaultIntegrations(
     if (isReplayAvailable) {
       final ReplayIntegration replay =
           new ReplayIntegration(context, CurrentDateProvider.getInstance());
-      replay.setBreadcrumbConverter(new DefaultReplayBreadcrumbConverter());
       options.addIntegration(replay);
       options.setReplayController(replay);
     }

sentry-android-integration-tests/test-app-size/.gitignore

@@ -0,0 +1 @@
+/build