Merge branch 'main' into impr/dispatch-queue-names

getsentry · Oct 15, 2024 · 27751de · 27751de
2 parents 48b0425 + f31b069
commit 27751de
Show file tree

Hide file tree

Showing 47 changed files with 825 additions and 71 deletions.
diff --git a/.github/last-release-runid b/.github/last-release-runid
@@ -1 +1 @@
-11220184614
+11345222588
diff --git a/.github/workflows/ui-tests-critical.yml b/.github/workflows/ui-tests-critical.yml
@@ -0,0 +1,103 @@
+name: UI Tests Critical
+on:
+  push:
+    branches:
+      - main
+
+  pull_request:
+    paths:
+      - 'Sources/**'
+      - '.github/workflows/ui-tests-critical.yml'
+      - 'fastlane/**'
+      - 'TestSamples/**'
+
+# https://docs.github.com/en/actions/using-jobs/using-concurrency#example-using-a-fallback-value
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
+jobs:
+  build-sample:
+    name: Build SwiftUITestSample Sample
+    runs-on: macos-14
+    steps:
+      - uses: actions/checkout@v4
+      - run: ./scripts/ci-select-xcode.sh 16
+      - uses: ruby/setup-ruby@v1
+        with:
+          bundler-cache: true
+      - run: bundle exec fastlane build_ios_swift_ui_test_sample
+      - uses: actions/upload-artifact@v4
+        with:
+          name: SwiftUITestSample
+          path: TestSamples/SwiftUITestSample/DerivedData/Build/Products/Debug-iphonesimulator/SwiftUITestSample.app
+
+  run-tests:
+    name: Test iOS ${{matrix.os-version}} on ${{matrix.device}} Simulator
+    needs: [build-sample]
+    runs-on: ${{matrix.runs-on}}
+    env:
+      APP_ARTIFACT_NAME: "SwiftUITestSample"
+      APP_PATH: "Sample.app"
+
+      MAESTRO_FLOWS_PATH: "TestSamples/SwiftUITestSample/Maestro"
+      MAESTRO_LOGS_PATH: "MaestroLogs"
+
+      # https://github.com/facebook/react-native/blob/24e7f7d25629a7af6d877a0b79fed2faaab96437/.github/actions/maestro-ios/action.yml#L57
+      MAESTRO_DRIVER_STARTUP_TIMEOUT: 1500000 # 25 min, CI can be slow at times
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - runs-on: macos-12
+            xcode: "13.4.1"
+            device: "iPhone 8"
+            os-version: "15.5"
+            create-simulator: true
+          - runs-on: macos-13
+            xcode: "14.3.1"
+            device: "iPhone 14"
+            os-version: "16.4"
+            create-simulator: true
+          - runs-on: macos-14-xlarge
+            # on macos-14 the iOS 17.5 simulator was unstable
+            # crashing and failing all UI tests
+            # iOS 15.5, 16.4 and 18.1 worked on the base runners
+            xcode: "15.4"
+            device: "iPhone 15"
+            os-version: "17.5"
+          - runs-on: macos-15
+            xcode: "16"
+            device: "iPhone 16"
+            os-version: "18.1"
+
+    steps:
+      - uses: actions/checkout@v4
+      - name: Create ${{matrix.device}} (${{matrix.os-version}}) Simulator using Xcode ${{matrix.xcode}}
+        if: ${{matrix.create-simulator}}
+        run: ./scripts/create-simulator.sh "${{matrix.xcode}}" "${{matrix.os-version}}" "${{matrix.device}}"
+      - name: Install Maestro
+        run: brew tap mobile-dev-inc/tap && brew install mobile-dev-inc/tap/maestro@1.38
+      - name: Install iDB Companion
+        run: brew tap facebook/fb && brew install facebook/fb/idb-companion
+
+      - uses: actions/download-artifact@v4
+        with:
+          name: ${{env.APP_ARTIFACT_NAME}}
+          path: ${{env.APP_PATH}}
+      - uses: futureware-tech/simulator-action@bfa03d93ec9de6dacb0c5553bbf8da8afc6c2ee9 # pin@v3
+        with:
+          model: ${{matrix.device}}
+          os_version: ${{matrix.os-version}}
+      - name: Run Maestro Flows
+        run: |
+          xcrun simctl install booted ${{env.APP_PATH}}
+
+          maestro test ${{env.MAESTRO_FLOWS_PATH}} --format junit --debug-output ${{env.MAESTRO_LOGS_PATH}}
+
+      - name: Store Maestro Logs
+        uses: actions/upload-artifact@v4
+        if: failure()
+        with:
+          name: maestro-logs-${{matrix.device}}-${{matrix.os-version}}
+          path: ${{env.MAESTRO_LOGS_PATH}}
diff --git a/.github/workflows/ui-tests.yml b/.github/workflows/ui-tests.yml
@@ -79,9 +79,9 @@ jobs:
           path: |
             ~/Library/Logs/scan/*.log
             ./fastlane/test_output/**
-    
-  ios-swift-ui-tests:
-    name: iOS-Swift UI Tests ${{matrix.device}}
+
+  ui-tests-swift:
+    name: UI Tests for iOS-Swift ${{matrix.device}} Simulator
     runs-on: ${{matrix.runs-on}}
     strategy:
       fail-fast: false
@@ -105,10 +105,10 @@ jobs:
 
       - name: Create iOS 16.4 simulator
         if: ${{ matrix.device == 'iPhone 14 (16.4)' }}
-        run: ./scripts/create-simulator.sh 14.3.1 16.4 16-4
+        run: ./scripts/create-simulator.sh 14.3.1 16.4 "iPhone 14"
 
       - name: Run Fastlane
-        run: fastlane ui_tests_ios_swift device:"${{matrix.device}}" 
+        run: fastlane ui_tests_ios_swift device:"${{matrix.device}}"
 
       - name: Archiving Raw Test Logs
         uses: actions/upload-artifact@v4

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -11,7 +11,7 @@ repos:
         fail_fast: true
         args:
           - "check-versions"
-        
+
   - repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v4.3.0
     hooks:
@@ -20,6 +20,7 @@ repos:
       - id: check-symlinks
       - id: check-xml
       - id: check-yaml
+        args: [--allow-multiple-documents]
       - id: detect-private-key
       - id: end-of-file-fixer
       - id: no-commit-to-branch
@@ -30,7 +31,7 @@ repos:
     - id: check-github-actions
     - id: check-github-workflows
       args: [--verbose]
-      
+
   - repo: https://github.com/shellcheck-py/shellcheck-py
     rev: v0.10.0.1
     hooks:
@@ -45,7 +46,7 @@ repos:
         types_or: ["objective-c", "objective-c++", "c", "c++"]
         args:
           - "format-clang"
-          
+
       - id: format-swift
         name: Format Swift
         entry: make

diff --git a/Brewfile b/Brewfile
@@ -5,3 +5,7 @@ brew 'rbenv'
 brew 'pre-commit'
 brew 'python3'
 brew 'jq'
+tap 'facebook/fb'
+brew 'facebook/fb/idb-companion'
+tap 'mobile-dev-inc/tap'
+brew 'mobile-dev-inc/tap/maestro'
diff --git a/Brewfile.lock.json b/Brewfile.lock.json
@@ -278,6 +278,22 @@
             }
           }
         }
+      },
+      "facebook/fb/idb-companion": {
+        "version": "1.1.8",
+        "bottle": false
+      },
+      "mobile-dev-inc/tap/maestro": {
+        "version": "1.38.1",
+        "bottle": false
+      }
+    },
+    "tap": {
+      "facebook/fb": {
+        "revision": "c0386793f59da10c619787f2aa18d938ef1d69c9"
+      },
+      "mobile-dev-inc/tap": {
+        "revision": "14a5d2ab054e7829e8028e827d35a2cc3156a4a0"
       }
     }
   },

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -20,12 +20,37 @@ via the option `swizzleClassNameExclude`.
 - Swizzling RootUIViewController if ignored by `swizzleClassNameExclude` (#4407)
 - Data race in SentrySwizzleInfo.originalCalled (#4434)
 
+
 ### Improvements
 
 - Serializing profile on a BG Thread (#4377) to avoid potentially slightly blocking the main thread.
 - Session Replay performance for SwiftUI (#4419)
 - Speed up getBinaryImages (#4435) for finishing transactions and capturing events
 - Align SDK dispatch queue names (#4442) to start with `io.sentry`
+- Use UInts in envelope deserialization (#4441)
+
+## 8.38.0
+
+### Features
+
+- Added breadcrumb.origin private field (#4358)
+- Custom redact modifier for SwiftUI (#4362)
+- AppHangV2 detection (#4379) Add a new algorithm for detecting app hangs that differentiates between fully blocking and non-fully blocking app hangs. Read more in-depth in our [docs](https://docs.sentry.io/platforms/apple/guides/ios/configuration/app-hangs/#app-hangs-v2).
+- Add support for arm64e (#3398)
+- Add mergeable libraries support to dynamic libraries (#4381)
+
+### Improvements
+
+- Speed up HTTP tracking for multiple requests in parallel (#4366)
+- Slightly speed up SentryInAppLogic (#4370)
+- Rename session replay `redact` options and APIs to `mask` (#4373)
+- Stop canceling timer for manual transactions (#4380)
+
+### Fixes
+
+- Fix the versioning to support app release with Beta versions (#4368)
+- Linking ongoing trace to crash event (#4393)
+- Edge case for swizzleClassNameExclude (#4405)
 
 ## 8.38.0-beta.1
 

diff --git a/Makefile b/Makefile
@@ -44,6 +44,15 @@ run-test-server:
 	cd ./test-server && swift run &
 .PHONY: run-test-server
 
+test-alamofire:
+	./scripts/test-alamofire.sh
+
+test-homekit:
+	./scripts/test-homekit.sh
+
+test-ui-critical:
+	./scripts/test-ui-critical.sh
+
 analyze:
 	rm -rf analyzer
 	xcodebuild analyze -workspace Sentry.xcworkspace -scheme Sentry -configuration Release CLANG_ANALYZER_OUTPUT=html CLANG_ANALYZER_OUTPUT_DIR=analyzer -destination "platform=iOS Simulator,OS=latest,name=iPhone 11"  CODE_SIGNING_ALLOWED="NO" | xcpretty -t && [[ -z `find analyzer -name "*.html"` ]]

diff --git a/Package.swift b/Package.swift
@@ -12,13 +12,13 @@ let package = Package(
     targets: [
         .binaryTarget(
                     name: "Sentry",
-                    url: "https://github.com/getsentry/sentry-cocoa/releases/download/8.38.0-beta.1/Sentry.xcframework.zip",
-                    checksum: "ee65620084f83011c541d48dfc07054277366e200fac83cc8ba4b602fdc31fb1" //Sentry-Static
+                    url: "https://github.com/getsentry/sentry-cocoa/releases/download/8.38.0/Sentry.xcframework.zip",
+                    checksum: "e2467151decc3a20f1b2afd47486ff97afa5fdc99272817e3db1d491b8105caa" //Sentry-Static
                 ),
         .binaryTarget(
                     name: "Sentry-Dynamic",
-                    url: "https://github.com/getsentry/sentry-cocoa/releases/download/8.38.0-beta.1/Sentry-Dynamic.xcframework.zip",
-                    checksum: "340558f58cec3bef18d9c40f07210df0cf00d1fe1eefd8ee1238d61276496346" //Sentry-Dynamic
+                    url: "https://github.com/getsentry/sentry-cocoa/releases/download/8.38.0/Sentry-Dynamic.xcframework.zip",
+                    checksum: "1693d0280f08a23529640a95c49c4c975316bab442c5fa4408e6348988a33fc3" //Sentry-Dynamic
                 ),
         .target ( name: "SentrySwiftUI",
                   dependencies: ["Sentry", "SentryInternal"],

diff --git a/Sentry.podspec b/Sentry.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "Sentry"
-  s.version      = "8.38.0-beta.1"
+  s.version      = "8.38.0"
   s.summary      = "Sentry client for cocoa"
   s.homepage     = "https://github.com/getsentry/sentry-cocoa"
   s.license      = "mit"

diff --git a/Sentry.xcworkspace/contents.xcworkspacedata b/Sentry.xcworkspace/contents.xcworkspacedata
diff --git a/SentryPrivate.podspec b/SentryPrivate.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "SentryPrivate"
-  s.version      = "8.38.0-beta.1"
+  s.version      = "8.38.0"
   s.summary      = "Sentry Private Library."
   s.homepage     = "https://github.com/getsentry/sentry-cocoa"
   s.license      = "mit"

diff --git a/SentrySwiftUI.podspec b/SentrySwiftUI.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "SentrySwiftUI"
-  s.version      = "8.38.0-beta.1"
+  s.version      = "8.38.0"
   s.summary      = "Sentry client for SwiftUI"
   s.homepage     = "https://github.com/getsentry/sentry-cocoa"
   s.license      = "mit"
@@ -19,5 +19,5 @@ Pod::Spec.new do |s|
   s.watchos.framework = 'WatchKit'
 
   s.source_files = "Sources/SentrySwiftUI/**/*.{swift,h,m}"
-  s.dependency 'Sentry', "8.38.0-beta.1"
+  s.dependency 'Sentry', "8.38.0"
 end
diff --git a/SentryTestUtils/TestCurrentDateProvider.swift b/SentryTestUtils/TestCurrentDateProvider.swift
@@ -9,11 +9,10 @@ public class TestCurrentDateProvider: SentryCurrentDateProvider {
     public var driftTimeInterval = 0.1
     private var _systemUptime: TimeInterval = 0
 
-    public override init() {
-
+    public init() {
     }
 
-    public override func date() -> Date {
+    public func date() -> Date {
 
         defer {
             if driftTimeForEveryRead {
@@ -51,15 +50,14 @@ public class TestCurrentDateProvider: SentryCurrentDateProvider {
     }
 
     public var timezoneOffsetValue = 0
-    public override func timezoneOffset() -> Int {
+    public func timezoneOffset() -> Int {
         return timezoneOffsetValue
     }
 
-    public override func systemTime() -> UInt64 {
+    public func systemTime() -> UInt64 {
         return internalSystemTime
     }
-
-    override public func systemUptime() -> TimeInterval {
+    public func systemUptime() -> TimeInterval {
         _systemUptime
     }
     public func setSystemUptime(_ uptime: TimeInterval) {

diff --git a/Sources/Sentry/SentryANRTrackerV1.m b/Sources/Sentry/SentryANRTrackerV1.m
@@ -70,7 +70,8 @@ - (void)detectANRs
     NSInteger reportThreshold = 5;
     NSTimeInterval sleepInterval = self.timeoutInterval / reportThreshold;
 
-    SentryCurrentDateProvider *dateProvider = SentryDependencyContainer.sharedInstance.dateProvider;
+    id<SentryCurrentDateProvider> dateProvider
+        = SentryDependencyContainer.sharedInstance.dateProvider;
 
     // Canceling the thread can take up to sleepInterval.
     while (YES) {

diff --git a/Sources/Sentry/SentryANRTrackerV2.m b/Sources/Sentry/SentryANRTrackerV2.m
@@ -72,7 +72,8 @@ - (void)detectANRs
         state = kSentryANRTrackerRunning;
     }
 
-    SentryCurrentDateProvider *dateProvider = SentryDependencyContainer.sharedInstance.dateProvider;
+    id<SentryCurrentDateProvider> dateProvider
+        = SentryDependencyContainer.sharedInstance.dateProvider;
 
     BOOL reported = NO;
 

diff --git a/Sources/Sentry/SentryDateUtil.m b/Sources/Sentry/SentryDateUtil.m
@@ -5,13 +5,13 @@
 
 @interface SentryDateUtil ()
 
-@property (nonatomic, strong) SentryCurrentDateProvider *currentDateProvider;
+@property (nonatomic, strong) id<SentryCurrentDateProvider> currentDateProvider;
 
 @end
 
 @implementation SentryDateUtil
 
-- (instancetype)initWithCurrentDateProvider:(SentryCurrentDateProvider *)currentDateProvider
+- (instancetype)initWithCurrentDateProvider:(id<SentryCurrentDateProvider>)currentDateProvider
 {
     if (self = [super init]) {
         self.currentDateProvider = currentDateProvider;