Skip to content

Commit b866f15

Browse files
committed
Merge branch 'feat/unhandled-sessions-internal-api' into feat/unhandled-sessions-dropped-event
2 parents b518655 + 32b70a7 commit b866f15

139 files changed

Lines changed: 1983 additions & 3273 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/integration-tests-benchmarks.yml‎

Lines changed: 0 additions & 114 deletions
This file was deleted.
Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
name: 'Integration Tests - Macrobenchmark'
2+
# Runs the sentry-uitest-android-macrobenchmark cold-start benchmark on a Sauce Labs real
3+
# device and recovers timeToInitialDisplay from the device log.
4+
#
5+
on:
6+
workflow_dispatch:
7+
8+
concurrency:
9+
group: ${{ github.workflow }}-${{ github.ref }}
10+
cancel-in-progress: true
11+
12+
jobs:
13+
macrobenchmark:
14+
name: Macrobenchmark
15+
runs-on: ubuntu-latest
16+
17+
# we copy the secret to the env variable in order to access it in the workflow
18+
env:
19+
SAUCE_USERNAME: ${{ secrets.SAUCE_USERNAME }}
20+
21+
steps:
22+
- name: Git checkout
23+
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
24+
25+
- name: 'Set up Java: 17'
26+
uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5
27+
with:
28+
distribution: 'temurin'
29+
java-version: '17'
30+
31+
- name: Setup Gradle
32+
uses: gradle/actions/setup-gradle@9c971963bec38e04b3d30dcc455b5382be2fdbfb # v6.3.0
33+
34+
- name: Assemble target app and Macrobenchmark apk
35+
if: env.SAUCE_USERNAME != null
36+
run: ./gradlew :sentry-samples:sentry-samples-android:assembleRelease :sentry-android-integration-tests:sentry-uitest-android-macrobenchmark:assembleBenchmark
37+
38+
- name: Run Macrobenchmark in SauceLab
39+
uses: saucelabs/saucectl-run-action@283660aa934c02723c497efa151d582a3acc5801 # pin@v3
40+
if: env.SAUCE_USERNAME != null
41+
env:
42+
GITHUB_TOKEN: ${{ github.token }}
43+
with:
44+
sauce-username: ${{ secrets.SAUCE_USERNAME }}
45+
sauce-access-key: ${{ secrets.SAUCE_ACCESS_KEY }}
46+
config-file: .sauce/sentry-uitest-android-macrobenchmark.yml
47+
48+
# Runs even when the suite fails: a failed benchmark still logs whatever it managed to
49+
# measure, and the parser's own error explains what was missing.
50+
- name: Recover benchmark results from the device log
51+
if: ${{ !cancelled() && env.SAUCE_USERNAME != null }}
52+
run: |
53+
# Without pipefail the step passes on `tee`'s exit code, so a failed recovery
54+
# would report success while silently producing no results.
55+
set -o pipefail
56+
python3 scripts/parse-macrobenchmark-log.py ./artifacts \
57+
--json-out ./artifacts/benchmarkData.json | tee -a "$GITHUB_STEP_SUMMARY"
58+
59+
- name: Upload Sauce artifacts
60+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
61+
if: ${{ !cancelled() }}
62+
with:
63+
name: macrobenchmark-results
64+
path: ./artifacts/
65+
if-no-files-found: warn

‎.sauce/sentry-uitest-android-benchmark-lite.yml‎

Lines changed: 0 additions & 34 deletions
This file was deleted.

‎.sauce/sentry-uitest-android-benchmark.yml‎

Lines changed: 0 additions & 56 deletions
This file was deleted.
Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
apiVersion: v1alpha
2+
kind: espresso
3+
sauce:
4+
region: us-west-1
5+
concurrency: 1
6+
metadata:
7+
build: sentry-uitest-android-macrobenchmark-$GITHUB_REF-$GITHUB_SHA
8+
tags:
9+
- benchmarks
10+
- android
11+
- macrobenchmark
12+
13+
defaults:
14+
timeout: 40m
15+
16+
espresso:
17+
app: ./sentry-samples/sentry-samples-android/build/outputs/apk/release/sentry-samples-android-release.apk
18+
testApp: ./sentry-android-integration-tests/sentry-uitest-android-macrobenchmark/build/outputs/apk/benchmark/sentry-uitest-android-macrobenchmark-benchmark.apk
19+
20+
suites:
21+
22+
- name: "Macrobenchmark startup (api 35)"
23+
# No test orchestrator and no clearPackageData: Macrobenchmark manages its own process
24+
# restarts and AOT compilation, and StartupMode.COLD intentionally keeps app data and
25+
# permissions (it force-stops rather than `pm clear`).
26+
devices:
27+
- id: Google_Pixel_9_Pro_XL_15_real_sjc1 # Google Pixel 9 Pro XL - api 35 (15) - high end
28+
29+
artifacts:
30+
download:
31+
when: always
32+
match:
33+
- junit.xml
34+
- "*.log"
35+
directory: ./artifacts/

‎CHANGELOG.md‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,20 @@
22

33
## Unreleased
44

5+
### Fixes
6+
7+
- Prevent duplicated breadcrumbs on tombstone-merged native crash events ([#5888](https://github.com/getsentry/sentry-java/pull/5888))
8+
- Prevent a class of Session Replay deadlocks by confining lifecycle state changes to Android's main thread ([#5965](https://github.com/getsentry/sentry-java/pull/5965))
9+
10+
### Features
11+
12+
- Add screenshot attachment button to the Android user feedback widget ([#5828](https://github.com/getsentry/sentry-java/pull/5828))
13+
- Users can now attach a screenshot when submitting feedback. Enabled by default; can be disabled via `SentryFeedbackOptions.setEnableAttachScreenshot(false)` or the `io.sentry.feedback.enable-attach-screenshot` manifest flag.
14+
- Requires the `androidx.activity` `>=1.8.2` dependency
15+
516
### Performance
617

18+
- Defer starting Session Replay off the SDK initialization critical path ([#5965](https://github.com/getsentry/sentry-java/pull/5965))
719
- Use manifest metadata resolved at build time to reduce Android SDK initialization overhead ([#5976](https://github.com/getsentry/sentry-java/pull/5976))
820

921
### Dependencies

‎Makefile‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
.PHONY: all clean compile javadocs dryRelease update checkFormat api assembleBenchmarkTestRelease assembleUiTestRelease assembleUiTestCriticalRelease runUiTestCritical setupPython systemTest systemTestInteractive check preMerge publish
1+
.PHONY: all clean compile javadocs dryRelease update checkFormat api assembleUiTestRelease assembleUiTestCriticalRelease runUiTestCritical setupPython systemTest systemTestInteractive check preMerge publish
22

33
all: stop clean javadocs compile
4-
assembleBenchmarks: assembleBenchmarkTestRelease
54
assembleUiTests: assembleUiTestRelease
65
preMerge: check
76
publish: clean dryRelease
@@ -35,10 +34,6 @@ checkFormat:
3534
api:
3635
./gradlew apiDump
3736

38-
# Assemble release and Android test apk of the uitest-android-benchmark module
39-
assembleBenchmarkTestRelease:
40-
./gradlew :sentry-android-integration-tests:sentry-uitest-android-benchmark:assembleRelease :sentry-android-integration-tests:sentry-uitest-android-benchmark:assembleAndroidTest
41-
4237
# Assemble release and Android test apk of the uitest-android module
4338
assembleUiTestRelease:
4439
./gradlew :sentry-android-integration-tests:sentry-uitest-android:assembleRelease :sentry-android-integration-tests:sentry-uitest-android:assembleAndroidTest

‎build.gradle.kts‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,10 +77,7 @@ apiValidation {
7777
"sentry-samples-spring-boot-4-webflux",
7878
"sentry-samples-ktor-client",
7979
"sentry-uitest-android",
80-
"sentry-uitest-android-benchmark",
8180
"sentry-uitest-android-critical",
82-
"test-app-plain",
83-
"test-app-sentry",
8481
"test-app-size",
8582
"sentry-samples-netflix-dgs",
8683
"sentry-samples-console-otlp",

‎gradle/libs.versions.toml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ apollo3-kotlin = { module = "com.apollographql.apollo3:apollo-runtime", version
8585
apollo4-kotlin = { module = "com.apollographql.apollo:apollo-runtime", version = "4.1.1" }
8686
androidx-appcompat = { module = "androidx.appcompat:appcompat", version = "1.3.0" }
8787
androidx-annotation = { module = "androidx.annotation:annotation", version = "1.9.1" }
88+
androidx-activity = { module = "androidx.activity:activity", version = "1.8.2" }
8889
androidx-activity-compose = { module = "androidx.activity:activity-compose", version = "1.8.2" }
8990
androidx-compose-foundation = { module = "androidx.compose.foundation:foundation", version.ref = "androidxCompose" }
9091
androidx-compose-foundation-layout = { module = "androidx.compose.foundation:foundation-layout", version.ref = "androidxCompose" }

0 commit comments

Comments
 (0)