Skip to content

Conversation

@philprime
Copy link
Member

@philprime philprime commented Nov 5, 2025

This PR cherry-picks 10 commits from main branch related to session replay masking fixes:

Fixes:

Tests:

Maintenance:

Resolved:

  • Merge conflict in SentryUIRedactBuilderTests+Common.swift
  • Updated clang-format version to 21.1.5
  • Cleaned up CHANGELOG to remove unrelated entries

#skip-changelog

@philprime philprime marked this pull request as draft November 5, 2025 15:33
@codecov
Copy link

codecov bot commented Nov 5, 2025

❌ 2 Tests Failed:

Tests completed Failed Passed Skipped
4033 2 4031 59
View the top 3 failed test(s) by shortest run time
iOS_Swift_UITests.LaunchUITests::testBreadcrumbData
Stack Traces | 0s run time
.../iOS-Swift/iOS-Swift-UITests/LaunchUITests.swift:6 - Failed to tap "Extra" Button: Timed out while evaluating UI query.
iOS_Swift_UITests.LaunchUITests::testNavigationTransaction
Stack Traces | 0s run time
.../iOS-Swift/iOS-Swift-UITests/LaunchUITests.swift:21 - Failed to tap "testNavigationTransactionButton" Button: Timed out while evaluating UI query.
iOS_Swift_UITests.LaunchUITests::testUiClickTransaction
Stack Traces | 0s run time
.../iOS-Swift/iOS-Swift-UITests/LaunchUITests.swift:35 - Failed to tap "uiClickTransactionButton" Button: Timed out while evaluating UI query.
View the full list of 1 ❄️ flaky test(s)
SentryTests.SentrySDKInternalTests::testResumeAndPauseAppHangTracking

Flake rate in main: 14.00% (Passed 43 times, Failed 7 times)

Stack Traces | 0s run time
.../Tests/SentryTests/SentrySDKInternalTests.swift:633 - XCTAssertEqual failed: ("1") is not equal to ("0") - The SDK should capture an AppHang after resuming the tracking, but it didn't.

To view more test analytics, go to the Test Analytics Dashboard
📋 Got 3 mins? Take this short survey to help us improve Test Analytics.

- Remove #5591 (minimum OS version warnings) - not related to session replay
- Remove #6019 (SCNetworkReachability) - not related to session replay
- Remove #6377 (thread event issue) - not related to session replay
- Remove #6381 (frame delay) - duplicate/not related to session replay
- Keep only session replay masking related changes
@philprime philprime marked this pull request as ready for review November 5, 2025 15:46
@philprime philprime enabled auto-merge (squash) November 5, 2025 16:21
Copy link
Contributor

@itaybre itaybre left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, I am surprised the sdk.json changes were only a couple lines

Cherry-picked from caa7e70 (chore: Merge hotfix changes from v8.57.0 into main)
@github-actions
Copy link
Contributor

github-actions bot commented Nov 6, 2025

Performance metrics 🚀

  Plain With Sentry Diff
Startup time 1223.98 ms 1245.61 ms 21.63 ms
Size 23.75 KiB 1000.79 KiB 977.05 KiB

Baseline results on branch: v8.x

Startup times

Revision Plain With Sentry Diff
c11a8e0 1203.00 ms 1223.23 ms 20.23 ms
3af1ae9 1225.60 ms 1252.65 ms 27.05 ms
41834f1 1235.15 ms 1256.31 ms 21.17 ms
653de7c 1205.02 ms 1222.20 ms 17.18 ms
ab82dac 1249.73 ms 1272.69 ms 22.96 ms
5fce94f 1226.31 ms 1246.82 ms 20.50 ms
ab82dac 1213.12 ms 1240.92 ms 27.80 ms
b66be9b 1218.22 ms 1244.19 ms 25.96 ms
5e3fb04 1239.84 ms 1267.39 ms 27.55 ms
a7a0a2b 1218.61 ms 1248.69 ms 30.08 ms

App size

Revision Plain With Sentry Diff
c11a8e0 23.75 KiB 991.86 KiB 968.12 KiB
3af1ae9 23.74 KiB 981.29 KiB 957.55 KiB
41834f1 23.75 KiB 991.88 KiB 968.13 KiB
653de7c 23.75 KiB 992.25 KiB 968.50 KiB
ab82dac 23.75 KiB 991.85 KiB 968.10 KiB
5fce94f 23.75 KiB 991.62 KiB 967.87 KiB
ab82dac 23.75 KiB 991.86 KiB 968.11 KiB
b66be9b 23.75 KiB 996.03 KiB 972.28 KiB
5e3fb04 23.74 KiB 981.30 KiB 957.56 KiB
a7a0a2b 23.75 KiB 996.04 KiB 972.29 KiB

@philprime philprime merged commit c21a31f into v8.x Nov 6, 2025
207 of 215 checks passed
@philprime philprime deleted the philprime/v8-x-sessionreplayfixes branch November 6, 2025 10:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants