Merge 2b52610 into 7aaa0b6

Author: noahsmartin

CHANGELOG-v9.md

@@ -10,7 +10,6 @@ Makes app hang tracking V2 the default and removes the option to enable/disable
 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)
 Makes `SentryEventDecodable` internal (#5808)

CHANGELOG.md

@@ -6,6 +6,7 @@
 
 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)
+Removes enableTracing property from SentryOptions (#5694)
 
 ### Features
 

Samples/SentrySampleShared/SentrySampleShared/SentrySDKWrapper.swift

@@ -120,9 +120,6 @@ public struct SentrySDKWrapper {
         options.enableWatchdogTerminationTracking = !isUITest && !isBenchmarking && !SentrySDKOverrides.Performance.disableWatchdogTracking.boolValue
 
         options.enableAutoPerformanceTracing = !isBenchmarking && !SentrySDKOverrides.Performance.disablePerformanceTracing.boolValue
-      #if !SDK_V9
-        options.enableTracing = !isBenchmarking && !SentrySDKOverrides.Tracing.disableTracing.boolValue
-      #endif // !SDK_V9
 
         options.enableNetworkTracking = !SentrySDKOverrides.Networking.disablePerformanceTracking.boolValue
         options.enableCaptureFailedRequests = !SentrySDKOverrides.Networking.disableFailedRequestTracking.boolValue

Sources/Sentry/Profiling/SentryLaunchProfiling.m

@@ -162,47 +162,6 @@
                                                              configuration:tracerConfig];
 }
 
-#    if !SDK_V9
-SentryLaunchProfileDecision
-sentry_launchShouldHaveTransactionProfiling(SentryOptions *options)
-{
-#        pragma clang diagnostic push
-#        pragma clang diagnostic ignored "-Wdeprecated-declarations"
-    BOOL shouldProfileNextLaunch = options.enableAppLaunchProfiling && options.enableTracing;
-    if (!shouldProfileNextLaunch) {
-        SENTRY_LOG_DEBUG(@"Specified options configuration doesn't enable launch profiling: "
-                         @"options.enableAppLaunchProfiling: %d; options.enableTracing: %d; won't "
-                         @"profile launch",
-            options.enableAppLaunchProfiling, options.enableTracing);
-        return (SentryLaunchProfileDecision) { NO, nil, nil };
-    }
-#        pragma clang diagnostic pop
-
-    SentryTransactionContext *transactionContext =
-        [[SentryTransactionContext alloc] initWithName:@"app.launch" operation:@"profile"];
-    transactionContext.forNextAppLaunch = YES;
-    SentrySamplingContext *context =
-        [[SentrySamplingContext alloc] initWithTransactionContext:transactionContext];
-    SentrySamplerDecision *tracesSamplerDecision = sentry_sampleTrace(context, options);
-    if (tracesSamplerDecision.decision != kSentrySampleDecisionYes) {
-        SENTRY_LOG_DEBUG(
-            @"Sampling out the launch trace for transaction profiling; won't profile launch.");
-        return (SentryLaunchProfileDecision) { NO, nil, nil };
-    }
-
-    SentrySamplerDecision *profilesSamplerDecision
-        = sentry_sampleTraceProfile(context, tracesSamplerDecision, options);
-    if (profilesSamplerDecision.decision != kSentrySampleDecisionYes) {
-        SENTRY_LOG_DEBUG(
-            @"Sampling out the launch profile for transaction profiling; won't profile launch.");
-        return (SentryLaunchProfileDecision) { NO, nil, nil };
-    }
-
-    SENTRY_LOG_DEBUG(@"Will start transaction profile next launch; will profile launch.");
-    return (SentryLaunchProfileDecision) { YES, tracesSamplerDecision, profilesSamplerDecision };
-}
-#    endif // !SDK_V9
-
 SentryLaunchProfileDecision
 sentry_launchShouldHaveContinuousProfilingV2(SentryOptions *options)
 {
@@ -264,19 +223,7 @@
     if ([options isContinuousProfilingV2Enabled]) {
         return sentry_launchShouldHaveContinuousProfilingV2(options);
     }
-#    if SDK_V9
     return (SentryLaunchProfileDecision) { NO, nil, nil };
-#    else
-
-#        pragma clang diagnostic push
-#        pragma clang diagnostic ignored "-Wdeprecated-declarations"
-    if ([options isContinuousProfilingEnabled]) {
-        return (SentryLaunchProfileDecision) { options.enableAppLaunchProfiling, nil, nil };
-    }
-#        pragma clang diagnostic pop
-
-    return sentry_launchShouldHaveTransactionProfiling(options);
-#    endif // SDK_V9
 }
 
 /**

Sources/Sentry/Public/SentryOptions.h

@@ -407,17 +407,6 @@ NS_SWIFT_NAME(Options)
  */
 @property (nonatomic, assign) BOOL enableFileIOTracing;
 
-#if !SDK_V9
-/**
- * Indicates whether tracing should be enabled.
- * @discussion Enabling this sets @c tracesSampleRate to @c 1 if both @c tracesSampleRate and
- * @c tracesSampler are @c nil. Changing either @c tracesSampleRate or @c tracesSampler to a value
- * other then @c nil will enable this in case this was never changed before.
- */
-@property (nonatomic)
-    BOOL enableTracing DEPRECATED_MSG_ATTRIBUTE("Use tracesSampleRate or tracesSampler instead");
-#endif // !SDK_V9
-
 /**
  * Indicates the percentage of the tracing data that is collected.
  * @discussion Specifying @c 0 or @c nil discards all trace data, @c 1.0 collects all trace data,

Sources/Sentry/SentryOptions.m

@@ -24,9 +24,6 @@
 NSString *const kSentryDefaultEnvironment = @"production";
 
 @implementation SentryOptions {
-#if !SDK_V9
-    BOOL _enableTracingManual;
-#endif // !SDK_V9
 #if SWIFT_PACKAGE || SENTRY_TEST
     id _beforeSendLogDynamic;
 #endif // SWIFT_PACKAGE || SENTRY_TEST
@@ -95,10 +92,6 @@ - (instancetype)init
 
         self.initialScope = ^SentryScope *(SentryScope *scope) { return scope; };
         __swiftExperimentalOptions = [[SentryExperimentalOptions alloc] init];
-#if !SDK_V9
-        _enableTracing = NO;
-        _enableTracingManual = NO;
-#endif // !SDK_V9
 #if SENTRY_HAS_UIKIT
         self.enableUIViewControllerTracing = YES;
         self.attachScreenshot = NO;
@@ -277,32 +270,12 @@ - (void)setSampleRate:(NSNumber *)sampleRate
     return rate >= 0 && rate <= 1.0;
 }
 
-#if !SDK_V9
-- (void)setEnableTracing:(BOOL)enableTracing
-{
-    //`enableTracing` is basically an alias to tracesSampleRate
-    // by enabling it we set tracesSampleRate to maximum
-    // if the user did not configured other ways to enable tracing
-    if ((_enableTracing = enableTracing)) {
-        if (_tracesSampleRate == nil && _tracesSampler == nil && _enableTracing) {
-            _tracesSampleRate = @1;
-        }
-    }
-    _enableTracingManual = YES;
-}
-#endif // !SDK_V9
-
 - (void)setTracesSampleRate:(NSNumber *)tracesSampleRate
 {
     if (tracesSampleRate == nil) {
         _tracesSampleRate = nil;
     } else if (sentry_isValidSampleRate(tracesSampleRate)) {
         _tracesSampleRate = tracesSampleRate;
-#if !SDK_V9
-        if (!_enableTracingManual) {
-            _enableTracing = YES;
-        }
-#endif // !SDK_V9
     } else {
         _tracesSampleRate = SENTRY_DEFAULT_TRACES_SAMPLE_RATE;
     }
@@ -311,23 +284,12 @@ - (void)setTracesSampleRate:(NSNumber *)tracesSampleRate
 - (void)setTracesSampler:(SentryTracesSamplerCallback)tracesSampler
 {
     _tracesSampler = tracesSampler;
-#if !SDK_V9
-    if (_tracesSampler != nil && !_enableTracingManual) {
-        _enableTracing = YES;
-    }
-#endif // !SDK_V9
 }
 
 - (BOOL)isTracingEnabled
 {
-#if SDK_V9
     return (_tracesSampleRate != nil && [_tracesSampleRate doubleValue] > 0)
         || _tracesSampler != nil;
-#else
-    return _enableTracing
-        && ((_tracesSampleRate != nil && [_tracesSampleRate doubleValue] > 0)
-            || _tracesSampler != nil);
-#endif // !SDK_V9
 }
 
 #if SENTRY_TARGET_PROFILING_SUPPORTED

Sources/Sentry/SentyOptionsInternal.m

@@ -313,14 +313,6 @@ + (BOOL)validateOptions:(NSDictionary<NSString *, id> *)options
     if ([self isBlock:options[@"tracesSampler"]]) {
         sentryOptions.tracesSampler = options[@"tracesSampler"];
     }
-#if !SDK_V9
-#    pragma clang diagnostic push
-#    pragma clang diagnostic ignored "-Wdeprecated-declarations"
-    if ([options[@"enableTracing"] isKindOfClass:NSNumber.self]) {
-        sentryOptions.enableTracing = [options[@"enableTracing"] boolValue];
-    }
-#    pragma clang diagnostic pop
-#endif // !SDK_V9
 
     if ([options[@"inAppIncludes"] isKindOfClass:[NSArray class]]) {
         NSArray<NSString *> *inAppIncludes =

Tests/SentryTests/SentryOptionsTest.m

@@ -701,10 +701,6 @@ - (void)assertDefaultValues:(SentryOptions *)options
     XCTAssertEqual(options.sessionReplay.onErrorSampleRate, 0);
     XCTAssertEqual(options.sessionReplay.sessionSampleRate, 0);
 #endif // SENTRY_HAS_UIKIT
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-    XCTAssertFalse(options.enableTracing);
-#pragma clang diagnostic pop
     XCTAssertTrue(options.enableAppHangTracking);
     XCTAssertEqual(options.appHangTimeoutInterval, 2);
     XCTAssertEqual(YES, options.enableNetworkTracking);
@@ -972,76 +968,12 @@ - (void)testSwizzleClassNameExcludes
     XCTAssertEqualObjects(expected, options.swizzleClassNameExcludes);
 }
 
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-- (void)testEnableTracing
-{
-    SentryOptions *options = [self getValidOptions:@{ @"enableTracing" : @YES }];
-    XCTAssertTrue(options.enableTracing);
-    XCTAssertEqual(options.tracesSampleRate.doubleValue, 1);
-}
-
-- (void)testChanging_enableTracing_afterSetting_tracesSampleRate
-{
-    SentryOptions *options = [[SentryOptions alloc] init];
-    options.tracesSampleRate = @0.5;
-    options.enableTracing = NO;
-    XCTAssertEqual(options.tracesSampleRate.doubleValue, 0.5);
-    options.enableTracing = YES;
-    XCTAssertEqual(options.tracesSampleRate.doubleValue, 0.5);
-}
-
-- (void)testChanging_enableTracing_afterSetting_tracesSampler
-{
-    SentryOptions *options = [[SentryOptions alloc] init];
-    options.tracesSampler
-        = ^NSNumber *(SentrySamplingContext *__unused samplingContext) { return @0.1; };
-    options.enableTracing = NO;
-    XCTAssertNil(options.tracesSampleRate);
-    options.enableTracing = FALSE;
-    XCTAssertNil(options.tracesSampleRate);
-}
-
-- (void)testChanging_tracesSampleRate_afterSetting_enableTracing
-{
-    SentryOptions *options = [[SentryOptions alloc] init];
-    options.enableTracing = YES;
-    options.tracesSampleRate = @0;
-    XCTAssertTrue(options.enableTracing);
-    options.tracesSampleRate = @1;
-    XCTAssertTrue(options.enableTracing);
-
-    options.enableTracing = NO;
-    options.tracesSampleRate = @0.5;
-    XCTAssertFalse(options.enableTracing);
-    XCTAssertEqual(options.tracesSampleRate.doubleValue, 0.5);
-}
-
-- (void)testChanging_tracesSampler_afterSetting_enableTracing
-{
-    SentryTracesSamplerCallback sampler
-        = ^(__unused SentrySamplingContext *context) { return @1.0; };
-
-    SentryOptions *options = [[SentryOptions alloc] init];
-    options.enableTracing = YES;
-    options.tracesSampler = sampler;
-    XCTAssertTrue(options.enableTracing);
-    options.tracesSampleRate = @0;
-    XCTAssertTrue(options.enableTracing);
-
-    options.enableTracing = NO;
-    options.tracesSampler = sampler;
-    XCTAssertFalse(options.enableTracing);
-}
-
 - (void)testTracesSampleRate
 {
     SentryOptions *options = [self getValidOptions:@{ @"tracesSampleRate" : @0.1 }];
 
     XCTAssertEqual(options.tracesSampleRate.doubleValue, 0.1);
-    XCTAssertTrue(options.enableTracing);
 }
-#pragma clang diagnostic pop
 
 - (void)testDefaultTracesSampleRate
 {
@@ -1094,8 +1026,6 @@ - (double)tracesSamplerCallback:(NSDictionary *)context
     return 0.1;
 }
 
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
 - (void)testTracesSampler
 {
     SentryTracesSamplerCallback sampler = ^(SentrySamplingContext *context) {
@@ -1107,9 +1037,7 @@ - (void)testTracesSampler
 
     SentrySamplingContext *context = [[SentrySamplingContext alloc] init];
     XCTAssertEqual(options.tracesSampler(context), @1.0);
-    XCTAssertTrue(options.enableTracing);
 }
-#pragma clang diagnostic pop
 
 - (void)testDefaultTracesSampler
 {