Merge branch 'main' into feat/compose-user-feedback

# Conflicts:
#	CHANGELOG.md
#	sentry/src/test/java/io/sentry/SentryOptionsTest.kt

Author: stefanosiano

.cursor/rules/coding.mdc

@@ -0,0 +1,53 @@
+---
+alwaysApply: true
+description: Cursor Coding Rules
+---
+
+# Contributing Rules for Agents
+
+## Overview
+
+sentry-java is the Java and Android SDK for Sentry. This repository contains the source code and examples for SDK usage.
+
+## Tech Stack
+
+- **Language**: Java and Kotlin
+- **Build Framework**: Gradle
+
+## Key Commands
+
+```bash
+# Format code and regenerate .api files
+./gradlew spotlessApply apiDump
+
+# Run all tests and linter
+./gradlew check
+
+# Run unit tests for a specific file
+./gradle ':<module>:testDebugUnitTest' --tests="*<file name>*" --info
+```
+
+## Contributing Guidelines
+
+1. Follow existing code style and language
+2. Do not modify the API files (e.g. sentry.api) manually, instead run `./gradlew  apiDump` to regenerate them
+3. Write comprehensive tests
+4. New features should always be opt-in by default, extend `SentryOptions` or similar Option classes with getters and setters to enable/disable a new feature
+5. Consider backwards compatibility
+
+## Coding rules
+
+1. First think through the problem, read the codebase for relevant files, and propose a plan
+2. Before you begin working, check in with me and I will verify the plan
+3. Then, begin working on the todo items, marking them as complete as you go
+4. Please do not describe every step of the way and just give me a high level explanation of what changes you made
+5. Make every task and code change you do as simple as possible. We want to avoid making any massive or complex changes. Every change should impact as little code as possible. Everything is about simplicity.
+6. Once you're done, format the code and regenerate the .api files using the following command `./gradlew spotlessApply apiDump`
+7. As a last step, git stage the relevant files and propose (but not execute) a single git commit command (e.g. `git commit -m "<git commit message>"`)
+
+
+## Useful Resources
+
+- Main SDK documentation: https://develop.sentry.dev/sdk/overview/
+- Internal contributing guide: https://docs.sentry.io/internal/contributing/
+- Git commit messages conventions: https://develop.sentry.dev/engineering-practices/commit-messages/

.envrc

@@ -0,0 +1,2 @@
+export VIRTUAL_ENV=".venv"
+layout python3

.github/workflows/system-tests-backend.yml

@@ -21,26 +21,39 @@ jobs:
       fail-fast: false
       matrix:
         sample: [ "sentry-samples-spring-boot-jakarta" ]
-        agent: [ "0" ]
+        agent: [ "false" ]
         agent-auto-init: [ "true" ]
         include:
           - sample: "sentry-samples-spring-boot"
+            agent: "false"
+            agent-auto-init: "true"
           - sample: "sentry-samples-spring-boot-opentelemetry-noagent"
+            agent: "false"
+            agent-auto-init: "true"
           - sample: "sentry-samples-spring-boot-opentelemetry"
-            agent: "1"
+            agent: "true"
             agent-auto-init: "true"
           - sample: "sentry-samples-spring-boot-opentelemetry"
-            agent: "1"
+            agent: "true"
             agent-auto-init: "false"
           - sample: "sentry-samples-spring-boot-webflux-jakarta"
+            agent: "false"
+            agent-auto-init: "true"
           - sample: "sentry-samples-spring-boot-webflux"
+            agent: "false"
+            agent-auto-init: "true"
           - sample: "sentry-samples-spring-boot-jakarta-opentelemetry-noagent"
+            agent: "false"
+            agent-auto-init: "true"
           - sample: "sentry-samples-spring-boot-jakarta-opentelemetry"
-            agent: "1"
+            agent: "true"
             agent-auto-init: "true"
           - sample: "sentry-samples-spring-boot-jakarta-opentelemetry"
-            agent: "1"
+            agent: "true"
             agent-auto-init: "false"
+          - sample: "sentry-samples-console"
+            agent: "false"
+            agent-auto-init: "true"
     steps:
       - uses: actions/checkout@v4
         with:
@@ -50,6 +63,11 @@ jobs:
         with:
           python-version: '3.10.5'
 
+      - name: Install Python dependencies
+        run: |
+          python3 -m pip install --upgrade pip
+          python3 -m pip install -r requirements.txt
+
       - name: Set up Java
         uses: actions/setup-java@v4
         with:
@@ -90,17 +108,9 @@ jobs:
             -e '/.*"sentry-samples-android",/d' \
             build.gradle.kts
 
-      - name: Build server jar
-        run: |
-          ./gradlew :sentry-samples:${{ matrix.sample }}:bootJar
-
-      - name: Build agent jar
-        run: |
-          ./gradlew :sentry-opentelemetry:sentry-opentelemetry-agent:assemble
-
-      - name: Start server and run integration test for sentry-cli commands
+      - name: Build and run system tests
         run: |
-          test/system-test-run.sh "${{ matrix.sample }}" "${{ matrix.agent }}" "${{ matrix.agent-auto-init }}" "0"
+          python3 test/system-test-runner.py test --module "${{ matrix.sample }}" --agent "${{ matrix.agent }}" --auto-init "${{ matrix.agent-auto-init }}" --build "true"
 
       - name: Upload test results
         if: always()

.gitignore

@@ -20,5 +20,7 @@ distributions/
 *.vscode/
 sentry-spring-boot-starter-jakarta/src/main/resources/META-INF/spring.factories
 sentry-samples/sentry-samples-spring-boot-jakarta/spy.log
+sentry-mock-server.txt
+spring-server.txt
 spy.log
 .kotlin

CHANGELOG.md

@@ -6,10 +6,13 @@
 
 - Add `SentryUserFeedbackButton` Composable ([#4559](https://github.com/getsentry/sentry-java/pull/4559))
   - Also added `Sentry.showUserFeedbackDialog` static method
+- Add deadlineTimeout option ([#4555](https://github.com/getsentry/sentry-java/pull/4555))
 
 ### Fixes
 
 - Allow multiple UncaughtExceptionHandlerIntegrations to be active at the same time ([#4462](https://github.com/getsentry/sentry-java/pull/4462))
+- Prevent repeated scroll target determination during a single scroll gesture ([#4557](https://github.com/getsentry/sentry-java/pull/4557))
+  - This should reduce the number of ANRs seen in `SentryGestureListener`
 
 ## 8.17.0
 

Makefile

@@ -1,4 +1,4 @@
-.PHONY: all clean compile javadocs dryRelease update checkFormat api assembleBenchmarkTestRelease assembleUiTestRelease assembleUiTestCriticalRelease createCoverageReports runUiTestCritical check preMerge publish
+.PHONY: all clean compile javadocs dryRelease update checkFormat api assembleBenchmarkTestRelease assembleUiTestRelease assembleUiTestCriticalRelease createCoverageReports runUiTestCritical setupPython systemTest systemTestInteractive check preMerge publish
 
 all: stop clean javadocs compile createCoverageReports
 assembleBenchmarks: assembleBenchmarkTestRelease
@@ -10,6 +10,7 @@ publish: clean dryRelease
 clean:
 	./gradlew clean --no-configuration-cache
 	rm -rf distributions
+	rm -rf .venv
 
 # build and run tests
 compile:
@@ -59,6 +60,20 @@ createCoverageReports:
 	./gradlew jacocoTestReport
 	./gradlew koverXmlReportRelease
 
+# Create the Python virtual environment for system tests, and install the necessary dependencies
+setupPython:
+	@test -d .venv || python3 -m venv .venv
+	.venv/bin/pip install --upgrade pip
+	.venv/bin/pip install -r requirements.txt
+
+# Run system tests for sample applications
+systemTest: setupPython
+	.venv/bin/python test/system-test-runner.py test --all
+
+# Run system tests with interactive module selection
+systemTestInteractive: setupPython
+	.venv/bin/python test/system-test-runner.py test --interactive
+
 # Run tests and lint
 check:
 	./gradlew check

requirements.txt

@@ -0,0 +1,5 @@
+certifi==2025.7.14
+charset-normalizer==3.4.2
+idna==3.10
+requests==2.32.4
+urllib3==2.5.0

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

@@ -189,8 +189,12 @@ private void startTracing(final @NotNull Activity activity) {
         }
 
         final TransactionOptions transactionOptions = new TransactionOptions();
+
+        // Set deadline timeout based on configured option
+        final long deadlineTimeoutMillis = options.getDeadlineTimeout();
+        // No deadline when zero or negative value is set
         transactionOptions.setDeadlineTimeout(
-            TransactionOptions.DEFAULT_DEADLINE_TIMEOUT_AUTO_TRANSACTION);
+            deadlineTimeoutMillis <= 0 ? null : deadlineTimeoutMillis);
 
         if (options.isEnableActivityLifecycleTracingAutoFinish()) {
           transactionOptions.setIdleTimeout(options.getIdleTimeout());

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

@@ -127,6 +127,8 @@ final class ManifestMetadataReader {
   static final String ENABLE_AUTO_TRACE_ID_GENERATION =
       "io.sentry.traces.enable-auto-id-generation";
 
+  static final String DEADLINE_TIMEOUT = "io.sentry.traces.deadline-timeout";
+
   static final String FEEDBACK_NAME_REQUIRED = "io.sentry.feedback.is-name-required";
 
   static final String FEEDBACK_SHOW_NAME = "io.sentry.feedback.show-name";
@@ -446,6 +448,9 @@ static void applyMetadata(
                 ENABLE_AUTO_TRACE_ID_GENERATION,
                 options.isEnableAutoTraceIdGeneration()));
 
+        options.setDeadlineTimeout(
+            readLong(metadata, logger, DEADLINE_TIMEOUT, options.getDeadlineTimeout()));
+
         if (options.getSessionReplay().getSessionSampleRate() == null) {
           final double sessionSampleRate =
               readDouble(metadata, logger, REPLAYS_SESSION_SAMPLE_RATE);

sentry-android-core/src/main/java/io/sentry/android/core/internal/gestures/SentryGestureListener.java

@@ -139,6 +139,7 @@ public boolean onScroll(
         options
             .getLogger()
             .log(SentryLevel.DEBUG, "Unable to find scroll target. No breadcrumb captured.");
+        scrollState.type = GestureType.Scroll;
         return false;
       } else {
         options
@@ -249,8 +250,13 @@ private void startTracing(final @NotNull UiElement target, final @NotNull Gestur
 
     final TransactionOptions transactionOptions = new TransactionOptions();
     transactionOptions.setWaitForChildren(true);
+
+    // Set deadline timeout based on configured option
+    final long deadlineTimeoutMillis = options.getDeadlineTimeout();
+    // No deadline when zero or negative value is set
     transactionOptions.setDeadlineTimeout(
-        TransactionOptions.DEFAULT_DEADLINE_TIMEOUT_AUTO_TRANSACTION);
+        deadlineTimeoutMillis <= 0 ? null : deadlineTimeoutMillis);
+
     transactionOptions.setIdleTimeout(options.getIdleTimeout());
     transactionOptions.setTrimEnd(true);
     transactionOptions.setOrigin(TRACE_ORIGIN + "." + target.getOrigin());