Merge remote-tracking branch 'origin/main' into philprime/podfile-exa…

…mple
getsentry · Feb 27, 2025 · a262d33 · a262d33
2 parents 2916f2c + 9158639
commit a262d33
Show file tree

Hide file tree

Showing 25 changed files with 266 additions and 296 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -1,4 +1,6 @@
-name: Release ${{ github.event.inputs.version }}
+name: Release
+run-name: Release ${{ github.event.inputs.version }}
+
 on:
   workflow_dispatch:
     inputs:

diff --git a/.github/workflows/testflight.yml b/.github/workflows/testflight.yml
@@ -3,6 +3,7 @@ on:
   push:
     branches:
       - main
+      - release/**
 
     paths:
       - 'Sources/**'
@@ -19,7 +20,7 @@ on:
 jobs:
   upload_to_testflight:
     name: Build and Upload iOS-Swift to Testflight
-    runs-on: macos-13
+    runs-on: macos-14
     steps:
       - uses: actions/checkout@v4
       - run: ./scripts/ci-select-xcode.sh 15.2

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -55,14 +55,6 @@ repos:
         args:
           - "format-swift"
 
-      - id: lint
-        name: Run Linters
-        entry: make
-        language: system
-        types_or: ["swift", "objective-c", "objective-c++", "c", "c++" ]
-        args:
-          - "lint"
-
       - id: format-markdown
         name: Format Markdown
         description: 'Format Markdown'
@@ -80,3 +72,11 @@ repos:
         types_or: [json]
         entry: prettier --write --ignore-unknown --config .prettierrc
         additional_dependencies: ["[email protected]"]
+
+      - id: lint
+        name: Run Linters
+        entry: make
+        language: system
+        types_or: ["swift", "objective-c", "objective-c++", "c", "c++" ]
+        args:
+          - "lint"
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -14,13 +14,15 @@
 
 ### Fixes
 
-- fix: move assignment of file IO span origin outside of block (#4888)
+- Fix rare memory access issue for auto tracing (#4894). For more details, see issue [#4887](https://github.com/getsentry/sentry-cocoa/issues/4887).
+- Move assignment of file IO span origin outside of block (#4888)
+- Deadline timeout crash in SentryTracer (#4911)
 
 ## 8.45.0
 
 > [!WARNING]
 > We have been made aware that this version can cause crashes in certain configurations when using network tracking, file I/O tracking, or CoreData tracking features.
-> We recommend staying on version 8.43.0 or disable the mentioned features until a fix is released.
+> We recommend staying on version 8.43.0 or disabling the mentioned features until a fix is released.
 > See issue [#4887](https://github.com/getsentry/sentry-cocoa/issues/4887) for more details.
 
 ### Features

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -24,21 +24,22 @@ GEM
       json (>= 1.5.1)
     artifactory (3.0.17)
     atomos (0.1.3)
-    aws-eventstream (1.3.0)
-    aws-partitions (1.992.0)
-    aws-sdk-core (3.211.0)
+    aws-eventstream (1.3.1)
+    aws-partitions (1.1056.0)
+    aws-sdk-core (3.219.0)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.992.0)
       aws-sigv4 (~> 1.9)
+      base64
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.95.0)
-      aws-sdk-core (~> 3, >= 3.210.0)
+    aws-sdk-kms (1.99.0)
+      aws-sdk-core (~> 3, >= 3.216.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-s3 (1.169.0)
-      aws-sdk-core (~> 3, >= 3.210.0)
+    aws-sdk-s3 (1.182.0)
+      aws-sdk-core (~> 3, >= 3.216.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.5)
-    aws-sigv4 (1.10.1)
+    aws-sigv4 (1.11.0)
       aws-eventstream (~> 1, >= 1.0.2)
     babosa (1.0.4)
     base64 (0.2.0)
@@ -90,7 +91,7 @@ GEM
     concurrent-ruby (1.3.4)
     connection_pool (2.4.1)
     declarative (0.0.20)
-    digest-crc (0.6.5)
+    digest-crc (0.7.0)
       rake (>= 12.0.0, < 14.0.0)
     domain_name (0.6.20240107)
     dotenv (2.8.1)
@@ -119,17 +120,17 @@ GEM
     faraday-em_synchrony (1.0.0)
     faraday-excon (1.1.0)
     faraday-httpclient (1.0.1)
-    faraday-multipart (1.0.4)
-      multipart-post (~> 2)
+    faraday-multipart (1.1.0)
+      multipart-post (~> 2.0)
     faraday-net_http (1.0.2)
     faraday-net_http_persistent (1.2.0)
     faraday-patron (1.0.0)
     faraday-rack (1.0.0)
     faraday-retry (1.0.3)
     faraday_middleware (1.2.1)
       faraday (~> 1.0)
-    fastimage (2.3.1)
-    fastlane (2.225.0)
+    fastimage (2.4.0)
+    fastlane (2.226.0)
       CFPropertyList (>= 2.3, < 4.0.0)
       addressable (>= 2.8, < 3.0.0)
       artifactory (~> 3.0)
@@ -169,9 +170,9 @@ GEM
       tty-spinner (>= 0.8.0, < 1.0.0)
       word_wrap (~> 1.0.0)
       xcodeproj (>= 1.13.0, < 2.0.0)
-      xcpretty (~> 0.3.0)
+      xcpretty (~> 0.4.0)
       xcpretty-travis-formatter (>= 0.0.3, < 2.0.0)
-    fastlane-plugin-sentry (1.22.1)
+    fastlane-plugin-sentry (1.28.0)
       os (~> 1.1, >= 1.1.4)
     fastlane-sirp (1.0.0)
       sysrandom (~> 1.0)
@@ -217,14 +218,15 @@ GEM
       signet (>= 0.16, < 2.a)
     highline (2.0.3)
     http-accept (1.7.0)
-    http-cookie (1.0.7)
+    http-cookie (1.0.8)
       domain_name (~> 0.5)
-    httpclient (2.8.3)
+    httpclient (2.9.0)
+      mutex_m
     i18n (1.14.6)
       concurrent-ruby (~> 1.0)
     jmespath (1.6.2)
-    json (2.7.6)
-    jwt (2.9.3)
+    json (2.10.1)
+    jwt (2.10.1)
       base64
     logger (1.6.1)
     mime-types (3.5.1)
@@ -237,6 +239,7 @@ GEM
     molinillo (0.8.0)
     multi_json (1.15.0)
     multipart-post (2.4.1)
+    mutex_m (0.3.0)
     nanaimo (0.4.0)
     nap (1.1.0)
     naturally (2.2.1)
@@ -245,9 +248,9 @@ GEM
     nokogiri (1.18.3)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    optparse (0.5.0)
+    optparse (0.6.0)
     os (1.1.4)
-    plist (3.7.1)
+    plist (3.7.2)
     public_suffix (4.0.7)
     racc (1.8.1)
     rake (13.2.1)
@@ -261,11 +264,11 @@ GEM
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
     retriable (3.1.2)
-    rexml (3.3.9)
-    rouge (2.0.7)
+    rexml (3.4.1)
+    rouge (3.28.0)
     ruby-macho (2.5.1)
     ruby2_keywords (0.0.5)
-    rubyzip (2.3.2)
+    rubyzip (2.4.1)
     securerandom (0.3.2)
     security (0.1.5)
     signet (0.19.0)
@@ -305,8 +308,8 @@ GEM
       colored2 (~> 3.1)
       nanaimo (~> 0.4.0)
       rexml (>= 3.3.6, < 4.0)
-    xcpretty (0.3.0)
-      rouge (~> 2.0.7)
+    xcpretty (0.4.0)
+      rouge (~> 3.28.0)
     xcpretty-travis-formatter (1.0.1)
       xcpretty (~> 0.2, >= 0.0.7)
 

diff --git a/...es/iOS-ObjectiveC/iOS-ObjectiveC.xcodeproj/xcshareddata/xcschemes/iOS-ObjectiveC.xcscheme b/...es/iOS-ObjectiveC/iOS-ObjectiveC.xcodeproj/xcshareddata/xcschemes/iOS-ObjectiveC.xcscheme
@@ -67,6 +67,12 @@
             ReferencedContainer = "container:iOS-ObjectiveC.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
+      <CommandLineArguments>
+         <CommandLineArgument
+            argument = "--io.sentry.feedback.no-auto-inject-widget"
+            isEnabled = "NO">
+         </CommandLineArgument>
+      </CommandLineArguments>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"

diff --git a/Samples/iOS-ObjectiveC/iOS-ObjectiveC/AppDelegate.m b/Samples/iOS-ObjectiveC/iOS-ObjectiveC/AppDelegate.m
@@ -55,11 +55,11 @@ - (BOOL)application:(UIApplication *)application
                 config.useShakeGesture = YES;
                 config.showFormForScreenshots = YES;
                 config.configureWidget = ^(SentryUserFeedbackWidgetConfiguration *_Nonnull widget) {
-                    if ([args containsObject:@"--io.sentry.feedback.auto-inject-widget"]) {
+                    if ([args containsObject:@"--io.sentry.feedback.no-auto-inject-widget"]) {
+                        widget.autoInject = NO;
+                    } else {
                         widget.labelText = @"Report Jank";
                         widget.layoutUIOffset = layoutOffset;
-                    } else {
-                        widget.autoInject = NO;
                     }
 
                     if ([args containsObject:@"--io.sentry.feedback.no-widget-text"]) {

diff --git a/Samples/iOS-Swift/iOS-Swift.xcodeproj/xcshareddata/xcschemes/iOS-Swift.xcscheme b/Samples/iOS-Swift/iOS-Swift.xcodeproj/xcshareddata/xcschemes/iOS-Swift.xcscheme
@@ -221,8 +221,8 @@
             isEnabled = "NO">
          </CommandLineArgument>
          <CommandLineArgument
-            argument = "--io.sentry.feedback.auto-inject-widget"
-            isEnabled = "YES">
+            argument = "--io.sentry.feedback.no-auto-inject-widget"
+            isEnabled = "NO">
          </CommandLineArgument>
       </CommandLineArguments>
       <EnvironmentVariables>

diff --git a/Samples/iOS-Swift/iOS-Swift/SentrySDKWrapper.swift b/Samples/iOS-Swift/iOS-Swift/SentrySDKWrapper.swift
@@ -128,22 +128,24 @@ extension SentrySDKWrapper {
     var layoutOffset: UIOffset { UIOffset(horizontal: 25, vertical: 75) }
 
     func configureFeedbackWidget(config: SentryUserFeedbackWidgetConfiguration) {
-        if args.contains("--io.sentry.feedback.auto-inject-widget") {
-            if Locale.current.languageCode == "ar" { // arabic
-                config.labelText = "﷽"
-            } else if Locale.current.languageCode == "ur" { // urdu
-                config.labelText = "نستعلیق"
-            } else if Locale.current.languageCode == "he" { // hebrew
-                config.labelText = "עִבְרִית‎"
-            } else if Locale.current.languageCode == "hi" { // Hindi
-                config.labelText = "नागरि"
-            } else {
-                config.labelText = "Report Jank"
-            }
-            config.layoutUIOffset = layoutOffset
-        } else {
+        guard !args.contains("--io.sentry.feedback.no-auto-inject-widget") else {
             config.autoInject = false
+            return
         }
+
+        if Locale.current.languageCode == "ar" { // arabic
+            config.labelText = "﷽"
+        } else if Locale.current.languageCode == "ur" { // urdu
+            config.labelText = "نستعلیق"
+        } else if Locale.current.languageCode == "he" { // hebrew
+            config.labelText = "עִבְרִית‎"
+        } else if Locale.current.languageCode == "hi" { // Hindi
+            config.labelText = "नागरि"
+        } else {
+            config.labelText = "Report Jank"
+        }
+        config.layoutUIOffset = layoutOffset
+
         if args.contains("--io.sentry.feedback.no-widget-text") {
             config.labelText = nil
         }