chore: Remove V9 checks for decodable and segment

Author: noahsmartin

CHANGELOG-v9.md

@@ -7,7 +7,6 @@ Removes deprecated getStoreEndpoint (#5591)
 Removes deprecated useSpan function (#5591)
 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 enableTracing property from SentryOptions (#5694)
 Removes deprecated `setExtraValue` from SentrySpan (#5864)

CHANGELOG.md

@@ -5,6 +5,8 @@
 ### Breaking Changes
 
 - Removes Decodable conformances from the public API of model classes (#5691)
+- Removes segment property on SentryUser, SentryBaggage, and SentryTraceContext (#5638)
+- Removes deprecated TraceContext initializers (#6348)
 - 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)
 

Sources/Sentry/Public/SentryBaggage.h

@@ -40,13 +40,6 @@ NS_SWIFT_NAME(Baggage)
  */
 @property (nullable, nonatomic, readonly) NSString *userId;
 
-/**
- * The value of a segment attribute in the user's data bag, if it exists.
- */
-#if !SDK_V9
-@property (nullable, nonatomic, readonly) NSString *userSegment;
-#endif
-
 /**
  * The random value used to determine if the trace is sampled.
  *
@@ -71,9 +64,6 @@ NS_SWIFT_NAME(Baggage)
                     releaseName:(nullable NSString *)releaseName
                     environment:(nullable NSString *)environment
                     transaction:(nullable NSString *)transaction
-#if !SDK_V9
-                    userSegment:(nullable NSString *)userSegment
-#endif
                      sampleRate:(nullable NSString *)sampleRate
                         sampled:(nullable NSString *)sampled
                        replayId:(nullable NSString *)replayId;
@@ -83,9 +73,6 @@ NS_SWIFT_NAME(Baggage)
                     releaseName:(nullable NSString *)releaseName
                     environment:(nullable NSString *)environment
                     transaction:(nullable NSString *)transaction
-#if !SDK_V9
-                    userSegment:(nullable NSString *)userSegment
-#endif
                      sampleRate:(nullable NSString *)sampleRate
                      sampleRand:(nullable NSString *)sampleRand
                         sampled:(nullable NSString *)sampled

Sources/Sentry/Public/SentryTraceContext.h

@@ -50,13 +50,6 @@ NS_SWIFT_NAME(TraceContext)
  */
 @property (nullable, nonatomic, readonly) NSString *transaction;
 
-/**
- * A subset of the scope's user context.
- */
-#if !SDK_V9
-@property (nullable, nonatomic, readonly) NSString *userSegment;
-#endif
-
 /**
  * Serialized sample rate used for this trace.
  */
@@ -85,9 +78,6 @@ NS_SWIFT_NAME(TraceContext)
                     releaseName:(nullable NSString *)releaseName
                     environment:(nullable NSString *)environment
                     transaction:(nullable NSString *)transaction
-#if !SDK_V9
-                    userSegment:(nullable NSString *)userSegment
-#endif
                      sampleRate:(nullable NSString *)sampleRate
                         sampled:(nullable NSString *)sampled
                        replayId:(nullable NSString *)replayId;
@@ -100,9 +90,6 @@ NS_SWIFT_NAME(TraceContext)
                     releaseName:(nullable NSString *)releaseName
                     environment:(nullable NSString *)environment
                     transaction:(nullable NSString *)transaction
-#if !SDK_V9
-                    userSegment:(nullable NSString *)userSegment
-#endif
                      sampleRate:(nullable NSString *)sampleRate
                      sampleRand:(nullable NSString *)sampleRand
                         sampled:(nullable NSString *)sampled
@@ -125,29 +112,15 @@ NS_SWIFT_NAME(TraceContext)
                                   scope:(nullable SentryScope *)scope
                                 options:(SentryOptions *)options;
 
-#if SDK_V9
 /**
  * Initializes a SentryTraceContext with data from a traceId, options and replayId.
  *
  *  @param traceId The current tracer.
  *  @param options The current active options.
  *  @param replayId The current session replay.
  */
-#else
-/**
- * Initializes a SentryTraceContext with data from a traceId, options, userSegment and replayId.
- *
- *  @param traceId The current tracer.
- *  @param options The current active options.
- *  @param userSegment You can retrieve this usually from the `scope.userObject.segment`.
- *  @param replayId The current session replay.
- */
-#endif
 - (instancetype)initWithTraceId:(SentryId *)traceId
                         options:(SentryOptions *)options
-#if !SDK_V9
-                    userSegment:(nullable NSString *)userSegment
-#endif
                        replayId:(nullable NSString *)replayId;
 
 /**

Sources/Sentry/Public/SentryTransactionContext.h

@@ -64,16 +64,6 @@ SENTRY_NO_INIT
  */
 - (instancetype)initWithName:(NSString *)name operation:(NSString *)operation;
 
-/**
- * @param name Transaction name
- * @param operation The operation this span is measuring.
- * @param sampled Determines whether the trace should be sampled.
- */
-- (instancetype)initWithName:(NSString *)name
-                   operation:(NSString *)operation
-                     sampled:(SentrySampleDecision)sampled
-    DEPRECATED_MSG_ATTRIBUTE("Use initWithName:operation:sampled:sampleRate:sampleRand instead");
-
 /**
  * @param name Transaction name
  * @param operation The operation this span is measuring.
@@ -85,24 +75,6 @@ SENTRY_NO_INIT
                   sampleRate:(nullable NSNumber *)sampleRate
                   sampleRand:(nullable NSNumber *)sampleRand;
 
-/**
- * @param name Transaction name
- * @param operation The operation this span is measuring.
- * @param traceId Trace Id
- * @param spanId Span Id
- * @param parentSpanId Parent span id
- * @param parentSampled Whether the parent is sampled
- */
-- (instancetype)initWithName:(NSString *)name
-                   operation:(NSString *)operation
-                     traceId:(SentryId *)traceId
-                      spanId:(SentrySpanId *)spanId
-                parentSpanId:(nullable SentrySpanId *)parentSpanId
-               parentSampled:(SentrySampleDecision)parentSampled
-    DEPRECATED_MSG_ATTRIBUTE("Use "
-                             "initWithName:operation:traceId:spanId:parentSpanId:parentSampled:"
-                             "parentSampleRate:parentSampleRand instead");
-
 /**
  * @param name Transaction name
  * @param operation The operation this span is measuring.

Sources/Sentry/Public/SentryUser.h

@@ -41,15 +41,6 @@ NS_SWIFT_NAME(User)
  */
 @property (atomic, copy) NSString *_Nullable ipAddress;
 
-#if !SDK_V9
-/**
- * The user segment, for apps that divide users in user segments.
- * @deprecated This field will be removed in the next major version.
- */
-@property (atomic, copy) NSString *_Nullable segment DEPRECATED_MSG_ATTRIBUTE(
-    "This field is deprecated and will be removed in the next major update.");
-#endif // !SDK_V9
-
 /**
  * Optional: Human readable name
  */

Sources/Sentry/SentryBaggage.m

@@ -15,9 +15,6 @@ - (instancetype)initWithTraceId:(SentryId *)traceId
                     releaseName:(nullable NSString *)releaseName
                     environment:(nullable NSString *)environment
                     transaction:(nullable NSString *)transaction
-#if !SDK_V9
-                    userSegment:(nullable NSString *)userSegment
-#endif
                      sampleRate:(nullable NSString *)sampleRate
                         sampled:(nullable NSString *)sampled
                        replayId:(nullable NSString *)replayId
@@ -27,9 +24,6 @@ - (instancetype)initWithTraceId:(SentryId *)traceId
                      releaseName:releaseName
                      environment:environment
                      transaction:transaction
-#if !SDK_V9
-                     userSegment:userSegment
-#endif
                       sampleRate:sampleRate
                       sampleRand:nil
                          sampled:sampled
@@ -41,9 +35,6 @@ - (instancetype)initWithTraceId:(SentryId *)traceId
                     releaseName:(nullable NSString *)releaseName
                     environment:(nullable NSString *)environment
                     transaction:(nullable NSString *)transaction
-#if !SDK_V9
-                    userSegment:(nullable NSString *)userSegment
-#endif
                      sampleRate:(nullable NSString *)sampleRate
                      sampleRand:(nullable NSString *)sampleRand
                         sampled:(nullable NSString *)sampled
@@ -56,9 +47,6 @@ - (instancetype)initWithTraceId:(SentryId *)traceId
         _releaseName = releaseName;
         _environment = environment;
         _transaction = transaction;
-#if !SDK_V9
-        _userSegment = userSegment;
-#endif
         _sampleRate = sampleRate;
         _sampleRand = sampleRand;
         _sampled = sampled;
@@ -88,12 +76,6 @@ - (NSString *)toHTTPHeaderWithOriginalBaggage:(NSDictionary *_Nullable)originalB
         [information setValue:_transaction forKey:@"sentry-transaction"];
     }
 
-#if !SDK_V9
-    if (_userSegment != nil) {
-        [information setValue:_userSegment forKey:@"sentry-user_segment"];
-    }
-#endif
-
     if (_sampleRand != nil) {
         [information setValue:_sampleRand forKey:@"sentry-sample_rand"];
     }

Sources/Sentry/SentryClient.m

@@ -421,18 +421,8 @@ - (nullable SentryTraceContext *)getTraceStateWithEvent:(SentryEvent *)event
     }
 
     if (event.error || event.exceptions.count > 0) {
-#if !SDK_V9
-        NSString *segment = nil;
-#    pragma clang diagnostic push
-#    pragma clang diagnostic ignored "-Wdeprecated-declarations"
-        segment = scope.userObject.segment;
-#    pragma clang diagnostic pop
-#endif
         return [[SentryTraceContext alloc] initWithTraceId:scope.propagationContext.traceId
                                                    options:self.options
-#if !SDK_V9
-                                               userSegment:segment
-#endif
                                                   replayId:scope.replayId];
     }
 

Sources/Sentry/SentryNetworkTracker.m

@@ -233,20 +233,9 @@ - (void)addTraceWithoutTransactionToTask:(NSURLSessionTask *)sessionTask
     SentryPropagationContext *propagationContext
         = SentrySDKInternal.currentHub.scope.propagationContext;
 
-#if !SDK_V9
-    NSString *segment = nil;
-#    pragma clang diagnostic push
-#    pragma clang diagnostic ignored "-Wdeprecated-declarations"
-    segment = SentrySDKInternal.currentHub.scope.userObject.segment;
-#    pragma clang diagnostic pop
-#endif
-
     SentryTraceContext *traceContext =
         [[SentryTraceContext alloc] initWithTraceId:propagationContext.traceId
                                             options:SentrySDKInternal.currentHub.client.options
-#if !SDK_V9
-                                        userSegment:segment
-#endif
                                            replayId:SentrySDKInternal.currentHub.scope.replayId];
 
     [self addBaggageHeader:[traceContext toBaggage]