Merge branch 'main' into ref/extract-trace-propagation

Author: philipphofmann

.github/workflows/test.yml

@@ -130,13 +130,9 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - name: iOS 18
-            runs-on: macos-15
-            platform: "iOS"
-            xcode: "16.4"
-            device: "iPhone 16 Pro"
-            test-destination-os: "18.5"
-
+          # Running the tests with simulators is incredibly flaky. Our assumption is that simulators might have difficulties
+          # with communicating with the test server in CI.
+          # We are going to add these back in https://github.com/getsentry/sentry-cocoa/issues/6361
           - name: macOS 15
             runs-on: macos-15
             platform: "macOS"

CHANGELOG-v9.md

@@ -9,7 +9,6 @@ Removes deprecated SentryDebugImageProvider class (#5598)
 Makes app hang tracking V2 the default and removes the option to enable/disable it (#5615)
 Removes segment property on SentryUser, SentryBaggage, and SentryTraceContext (#5638)
 Removes public SentrySerializable conformance from many public models (#5636, #5840, #5982)
-Removes Decodable conformances from the public API of model classes (#5691)
 Removes enableTracing property from SentryOptions (#5694)
 Removes deprecated `setExtraValue` from SentrySpan (#5864)
 Removes `integrations` property from `SentryOptions` (#5749)

CHANGELOG.md

@@ -4,16 +4,20 @@
 
 ### Breaking Changes
 
-Removes deprecated user feedback API, this is replaced with the new feedback API (#5591)
-Removes `enablePerformanceV2` option and makes this the default. The app start duration will now finish when the first frame is drawn instead of when the OS posts the UIWindowDidBecomeVisibleNotification. (#6008)
+- Moves `SentryEventDecoder` to SPI (#6365)
+- Makes `PreviewRedactOptions`, `SentryProfileOptions`, `SentryRedactViewHelper`, `SentryViewScreenshotOptions`, `SentryReplayOptions`, `SentryUserFeedbackConfiguration`, `SentryUserFeedbackFormConfiguration`, `SentryUserFeedbackThemeConfiguration`, `SentryUserFeedbackWidgetConfiguration`, `SentryFeedback`, and `SentryExperimentalOptions` `final` (#6365)
+- Removes Decodable conformances from the public API of model classes (#5691)
+- Removes deprecated user feedback API, this is replaced with the new feedback API (#5591)
+- Removes `enablePerformanceV2` option and makes this the default. The app start duration will now finish when the first frame is drawn instead of when the OS posts the UIWindowDidBecomeVisibleNotification. (#6008)
 
 ### Features
 
 - Add SentryDistribution as Swift Package Manager target (#6149)
 
 ### Fixes
 
-Fixes warnings about minimum OS version being lower than Xcode supported version (#5591)
+- Fixes warnings about minimum OS version being lower than Xcode supported version (#5591)
+- Fix rendering method for fast view rendering (#6360)
 
 ## 8.56.2
 

Gemfile.lock

@@ -173,7 +173,7 @@ GEM
       xcodeproj (>= 1.13.0, < 2.0.0)
       xcpretty (~> 0.4.1)
       xcpretty-travis-formatter (>= 0.0.3, < 2.0.0)
-    fastlane-plugin-sentry (1.33.0)
+    fastlane-plugin-sentry (1.34.0)
       os (~> 1.1, >= 1.1.4)
     fastlane-sirp (1.0.0)
       sysrandom (~> 1.0)

Sources/Sentry/Public/SentryThread.h

@@ -20,19 +20,12 @@ NS_ASSUME_NONNULL_BEGIN
 
 SENTRY_NO_INIT
 
-#if SDK_V9
 /**
  * Number of the thread.
  *
  * Can be nil for threads in recrash reports where the thread index information is not available.
  */
 @property (nullable, nonatomic, copy) NSNumber *threadId;
-#else
-/**
- * Number of the thread
- */
-@property (nonatomic, copy) NSNumber *threadId;
-#endif // SDK_V9
 
 /**
  * Name (if available) of the thread
@@ -59,21 +52,12 @@ SENTRY_NO_INIT
  */
 @property (nullable, nonatomic, copy) NSNumber *isMain;
 
-#if SDK_V9
 /**
  * Initializes a SentryThread with its id
  * @param threadId NSNumber or nil if thread index is not available (e.g., recrash reports)
  * @return SentryThread
  */
 - (instancetype)initWithThreadId:(nullable NSNumber *)threadId;
-#else
-/**
- * Initializes a SentryThread with its id
- * @param threadId NSNumber
- * @return SentryThread
- */
-- (instancetype)initWithThreadId:(NSNumber *)threadId;
-#endif // SDK_V9
 
 @end
 

Sources/Sentry/SentryBreadcrumb.m

@@ -77,7 +77,7 @@ - (BOOL)isEqual:(id _Nullable)other
 {
     if (other == self)
         return YES;
-    if (!other || ![[other class] isEqual:[self class]])
+    if (!other || ![other isKindOfClass:[SentryBreadcrumb class]])
         return NO;
 
     return [self isEqualToBreadcrumb:SENTRY_UNWRAP_NULLABLE(SentryBreadcrumb, other)];

Sources/Sentry/SentryGeo.m

@@ -43,7 +43,7 @@ - (BOOL)isEqual:(id _Nullable)other
     if (other == self) {
         return YES;
     }
-    if (!other || ![[other class] isEqual:[self class]]) {
+    if (!other || ![other isKindOfClass:[SentryGeo class]]) {
         return NO;
     }
 

Sources/Sentry/SentryThread.mm

@@ -12,11 +12,7 @@
 
 @implementation SentryThread
 
-#if SDK_V9
 - (instancetype)initWithThreadId:(nullable NSNumber *)threadId
-#else
-- (instancetype)initWithThreadId:(NSNumber *)threadId
-#endif // SDK_V9
 {
     self = [super init];
     if (self) {

Sources/Sentry/SentryUser.m

@@ -122,7 +122,7 @@ - (BOOL)isEqual:(id _Nullable)other
     if (other == self) {
         return YES;
     }
-    if (!other || ![[other class] isEqual:[self class]]) {
+    if (!other || ![other isKindOfClass:[SentryUser class]]) {
         return NO;
     }
 

Sources/SentrySwiftUI/Preview/PreviewRedactOptions.swift

@@ -6,7 +6,7 @@ import Sentry
  *
  * - Note: See ``SentryReplayOptions.DefaultValues`` for the default values of each parameter.
  */
-public class PreviewRedactOptions: SentryRedactOptions {
+public final class PreviewRedactOptions: SentryRedactOptions {
     /**
      * Flag to redact all text in the app by drawing a rectangle over it.
      *