Merge remote-tracking branch 'origin/main' into armcknight/feat(feedb…

…ack)/accessibility-audit

.github/workflows/benchmarking.yml

@@ -94,10 +94,73 @@ jobs:
           name: DerivedData-Xcode
       - run: npm install -g [email protected]
       - name: Run Benchmarks in SauceLab
+        id: run-benchmarks-in-sauce-lab
+        continue-on-error: true
         env:
           SAUCE_USERNAME: ${{ secrets.SAUCE_USERNAME }}
           SAUCE_ACCESS_KEY: ${{ secrets.SAUCE_ACCESS_KEY }}
-        run: saucectl run --select-suite "${{matrix.suite}}" --config .sauce/benchmarking-config.yml --tags benchmark
+        run: |
+          set -o pipefail && saucectl run \
+            --select-suite "${{matrix.suite}}" \
+            --config .sauce/benchmarking-config.yml \
+            --tags benchmark \
+            --verbose \
+            2>&1 | tee output.log
+
+      - name: Recovery - Extract Test ID from output
+        id: should-retry-test
+        if: ${{ steps.run-benchmarks-in-sauce-lab.outcome == 'failure' }}
+        uses: actions/github-script@v7
+        env:
+          SAUCE_USERNAME: ${{ secrets.SAUCE_USERNAME }}
+          SAUCE_ACCESS_KEY: ${{ secrets.SAUCE_ACCESS_KEY }}
+        with:
+          script: |
+            const fs = require('fs');
+            const { execSync } = require('child_process');
+            
+            console.log("Extracting test ID from output log");
+            const outputLog = fs.readFileSync('output.log', 'utf8');
+            
+            // Lookup for the test ID in the output log
+            // Note: The CLI output might change over time, so this might need to be updated.
+            const match = outputLog.match(/https:\/\/app\.saucelabs\.com\/tests\/([^\s]+)/);
+            const testId = match?.[1] ?? '';
+
+            if (!testId) {
+              core.warning("No SauceLabs test ID found in CLI output, it might have changed, retrying...");
+              core.setOutput('RETRY_TEST', 'true');
+            
+              return;
+            }
+            
+            try {
+              console.log(`Checking if the test exists in SauceLabs: ${testId}`);
+              execSync(`saucectl jobs get ${testId}`, {
+                env: process.env,
+                stdio: 'inherit'
+              });
+              
+              console.log("Test exists but failed, not retrying.");
+              core.setFailed('Test exists but failed');
+            } catch (error) {
+              console.log("Failed to get job, retrying...");
+              core.setOutput('RETRY_TEST', 'true');
+            }
+
+      - name: Run Benchmarks in SauceLab - Retry 1
+        id: run-benchmarks-in-sauce-lab-retry-1
+        if: ${{ steps.should-retry-test.outputs.RETRY_TEST == 'true' }}
+        env:
+          SAUCE_USERNAME: ${{ secrets.SAUCE_USERNAME }}
+          SAUCE_ACCESS_KEY: ${{ secrets.SAUCE_ACCESS_KEY }}
+        run: |
+          echo "::warning SauceLabs benchmark tests need to be retried"
+          saucectl run \
+            --select-suite "${{matrix.suite}}" \
+            --config .sauce/benchmarking-config.yml \
+            --tags benchmark \
+            --verbose
 
   app-metrics:
     name: Collect app metrics

CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## Unreleased
+
+### Features
+
+- Add protocol for custom screenName for UIViewControllers (#4646)
+- Allow hybrid SDK to set replay options tags information (#4710)
+- Add threshold to always log fatal logs (#4707)
+
+### Internal
+
+- Change macros TEST and TESTCI to SENTRY_TEST and SENTRY_TEST_CI (#4712)
+
 ## 8.43.1-beta.0
 
 ### Fixes
@@ -8,7 +20,6 @@
 - Replace occurences of `strncpy` with `strlcpy` (#4636)
 - Fix span recording for `NSFileManager.createFileAtPath` starting with iOS 18, macOS 15 and tvOS 18. This feature is experimental and must be enabled by setting the option `experimental.enableFileManagerSwizzling` to `true` (#4634)
 
-
 ### Internal
 
 - Update to Xcode 16.2 in workflows (#4673)

LICENSE.md

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015-2024 Sentry
+Copyright (c) 2015-2025 Sentry
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -19,4 +19,3 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
-

Makefile

@@ -68,7 +68,7 @@ analyze:
 # For more info check out: https://github.com/Carthage/Carthage/releases/tag/0.38.0
 build-xcframework:
 	@echo "--> Carthage: creating Sentry xcframework"
-	./scripts/build-xcframework.sh > build-xcframework.log
+	./scripts/build-xcframework.sh | tee build-xcframework.log
 # use ditto here to avoid clobbering symlinks which exist in macOS frameworks
 	ditto -c -k -X --rsrc --keepParent Carthage/Sentry.xcframework Carthage/Sentry.xcframework.zip
 	ditto -c -k -X --rsrc --keepParent Carthage/Sentry-Dynamic.xcframework Carthage/Sentry-Dynamic.xcframework.zip