Improve defaults

Author: noahsmartin

Samples/iOS-Swift/iOS-Swift/Tools/SentryExposure.h

@@ -15,7 +15,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 @interface SentryClientInternal : NSObject
 
-@property (nonatomic) SentryOptionsInternal *options;
+@property (nonatomic) SentryOptions *options;
 
 @end
 

Sources/Sentry/SentryOptionsInternal.m

@@ -70,7 +70,6 @@ - (instancetype)init
 {
     if (self = [super init]) {
         self.enabled = YES;
-        self.shutdownTimeInterval = 2.0;
         self.enableCrashHandler = YES;
 #if TARGET_OS_OSX
         self.enableUncaughtNSExceptionReporting = NO;
@@ -81,16 +80,10 @@ - (instancetype)init
         self.diagnosticLevel = kSentryLevelDebug;
         self.debug = NO;
         self.maxBreadcrumbs = defaultMaxBreadcrumbs;
-        self.maxCacheItems = 30;
-        self.sampleRate = SENTRY_DEFAULT_SAMPLE_RATE;
         self.enableAutoSessionTracking = YES;
         self.enableGraphQLOperationTracking = NO;
         self.enableWatchdogTerminationTracking = YES;
-        self.sessionTrackingIntervalMillis = [@30000 unsignedIntValue];
         self.attachStacktrace = YES;
-        // Maximum attachment size is 100 MiB, matches Relay's limit:
-        // https://develop.sentry.dev/sdk/data-model/envelopes/#size-limits
-        self.maxAttachmentSize = 100 * 1024 * 1024;
         self.sendDefaultPii = NO;
         self.enableAutoPerformanceTracing = YES;
         self.enablePersistingTracesWhenCrashing = NO;
@@ -133,59 +126,6 @@ - (instancetype)init
         self.sendClientReports = YES;
         self.swiftAsyncStacktraces = NO;
         self.enableSpotlight = NO;
-        self.spotlightUrl = @"http://localhost:8969/stream";
-
-#if TARGET_OS_OSX
-        NSString *dsn = [[[NSProcessInfo processInfo] environment] objectForKey:@"SENTRY_DSN"];
-        if (dsn.length > 0) {
-            self.dsn = dsn;
-        }
-#endif // TARGET_OS_OSX
-
-        // Use the name of the bundle's executable file as inAppInclude, so SentryInAppLogic
-        // marks frames coming from there as inApp. With this approach, the SDK marks public
-        // frameworks such as UIKitCore, CoreFoundation, GraphicsServices, and so forth, as not
-        // inApp. For private frameworks, such as Sentry, dynamic and static frameworks differ.
-        // Suppose you use dynamic frameworks inside your app. In that case, the SDK marks these as
-        // not inApp as these frameworks are located in the application bundle, but their location
-        // is different from the main executable.  In case you have a private framework that should
-        // be inApp you can add it to inAppInclude. When using static frameworks, the frameworks end
-        // up in the main executable. Therefore, the SDK currently can't detect if a frame of the
-        // main executable originates from the application or a private framework and marks all of
-        // them as inApp. To fix this, the user can use stack trace rules on Sentry.
-        NSDictionary *infoDict = [[NSBundle mainBundle] infoDictionary];
-        NSString *bundleExecutable = infoDict[@"CFBundleExecutable"];
-        if (bundleExecutable == nil) {
-            _inAppIncludes = [NSArray new];
-        } else {
-            _inAppIncludes = @[ bundleExecutable ];
-        }
-
-        _inAppExcludes = [NSArray new];
-
-        // Set default release name
-        if (infoDict != nil) {
-            self.releaseName =
-                [NSString stringWithFormat:@"%@@%@+%@", infoDict[@"CFBundleIdentifier"],
-                    infoDict[@"CFBundleShortVersionString"], infoDict[@"CFBundleVersion"]];
-        }
-
-        NSRegularExpression *everythingAllowedRegex =
-            [NSRegularExpression regularExpressionWithPattern:@".*"
-                                                      options:NSRegularExpressionCaseInsensitive
-                                                        error:NULL];
-        self.tracePropagationTargets = @[ everythingAllowedRegex ];
-        self.failedRequestTargets = @[ everythingAllowedRegex ];
-
-        // defaults to 500 to 599
-        SentryHttpStatusCodeRange *defaultHttpStatusCodeRange =
-            [[SentryHttpStatusCodeRange alloc] initWithMin:500 max:599];
-        self.failedRequestStatusCodes = @[ defaultHttpStatusCodeRange ];
-
-        self.cacheDirectoryPath
-            = NSSearchPathForDirectoriesInDomains(NSCachesDirectory, NSUserDomainMask, YES)
-                  .firstObject
-            ?: @"";
 
 #if SENTRY_HAS_METRIC_KIT
         self.enableMetricKit = NO;
@@ -195,77 +135,6 @@ - (instancetype)init
     return self;
 }
 
-- (void)setTracePropagationTargets:(NSArray *)tracePropagationTargets
-{
-    for (id targetCheck in tracePropagationTargets) {
-        if (![targetCheck isKindOfClass:[NSRegularExpression class]]
-            && ![targetCheck isKindOfClass:[NSString class]]) {
-            SENTRY_LOG_WARN(@"Only instances of NSString and NSRegularExpression are supported "
-                            @"inside tracePropagationTargets.");
-        }
-    }
-
-    _tracePropagationTargets = tracePropagationTargets;
-}
-
-- (void)setFailedRequestTargets:(NSArray *)failedRequestTargets
-{
-    for (id targetCheck in failedRequestTargets) {
-        if (![targetCheck isKindOfClass:[NSRegularExpression class]]
-            && ![targetCheck isKindOfClass:[NSString class]]) {
-            SENTRY_LOG_WARN(@"Only instances of NSString and NSRegularExpression are supported "
-                            @"inside failedRequestTargets.");
-        }
-    }
-
-    _failedRequestTargets = failedRequestTargets;
-}
-
-- (void)setDsn:(NSString *)dsn
-{
-    NSError *error = nil;
-    self.parsedDsn = [[SentryDsn alloc] initWithString:dsn didFailWithError:&error];
-
-    if (error == nil) {
-        _dsn = dsn;
-    } else {
-        SENTRY_LOG_ERROR(@"Could not parse the DSN: %@.", error);
-    }
-}
-
-- (void)setSampleRate:(NSNumber *)sampleRate
-{
-    if (sampleRate == nil) {
-        _sampleRate = nil;
-    } else if (sentry_isValidSampleRate(sampleRate)) {
-        _sampleRate = sampleRate;
-    } else {
-        _sampleRate = SENTRY_DEFAULT_SAMPLE_RATE;
-    }
-}
-
-- (void)setTracesSampleRate:(NSNumber *)tracesSampleRate
-{
-    if (tracesSampleRate == nil) {
-        _tracesSampleRate = nil;
-    } else if (sentry_isValidSampleRate(tracesSampleRate)) {
-        _tracesSampleRate = tracesSampleRate;
-    } else {
-        _tracesSampleRate = SENTRY_DEFAULT_TRACES_SAMPLE_RATE;
-    }
-}
-
-- (void)setEnableSpotlight:(BOOL)value
-{
-    _enableSpotlight = value;
-#if defined(RELEASE)
-    if (value) {
-        SENTRY_LOG_WARN(@"Enabling Spotlight for a release build. We recommend running Spotlight "
-                        @"only for local development.");
-    }
-#endif // defined(RELEASE)
-}
-
 #if defined(DEBUG) || defined(SENTRY_TEST) || defined(SENTRY_TEST_CI)
 - (NSString *)debugDescription
 {

Sources/Sentry/SentrySampling.m

@@ -24,7 +24,7 @@
     }
 
     NSNumber *callbackRate = callback(context);
-    if (!sentry_isValidSampleRate(callbackRate)) {
+    if (![SentryOptions isValidSampleRate:callbackRate]) {
         return defaultSampleRate;
     }
 
@@ -67,8 +67,7 @@
                                              withSampleRand:context.transactionContext.sampleRand];
     }
 
-    NSNumber *callbackRate = _sentry_samplerCallbackRate(
-        options.tracesSampler, context, SENTRY_DEFAULT_TRACES_SAMPLE_RATE);
+    NSNumber *callbackRate = _sentry_samplerCallbackRate(options.tracesSampler, context, 0);
     if (callbackRate != nil) {
         return _sentry_calcSample(callbackRate);
     }

Sources/Sentry/include/SentryInternalDefines.h

@@ -4,9 +4,6 @@
 static NSString *const SentryDebugImageType = @"macho";
 static NSString *const SentryPlatformName = @"cocoa";
 
-#define SENTRY_DEFAULT_SAMPLE_RATE @1
-#define SENTRY_DEFAULT_TRACES_SAMPLE_RATE @0
-
 /**
  * The value we give when initializing the options object, and what it will be if a consumer never
  * modifies it in their SDK config.

Sources/Sentry/include/SentryOptionsInternal+Private.h

@@ -12,15 +12,8 @@ FOUNDATION_EXPORT NSString *const kSentryDefaultEnvironment;
 #if SENTRY_TARGET_PROFILING_SUPPORTED
 @property (nonatomic, assign) BOOL enableProfiling_DEPRECATED_TEST_ONLY;
 
-/**
- * UI Profiling options set on SDK start.
- * @note Not for use with launch profiles. See functions in @c SentryLaunchProfiling .
- */
-@property (nonatomic, nullable, strong) SentryProfileOptions *profiling;
 #endif // SENTRY_TARGET_PROFILING_SUPPORTED
 
-SENTRY_EXTERN BOOL sentry_isValidSampleRate(NSNumber *sampleRate);
-
 @end
 
 NS_ASSUME_NONNULL_END