Renames

Author: noahsmartin

Sources/Sentry/PrivateSentrySDKOnly.m

@@ -6,7 +6,6 @@
 #import "SentryInstallation.h"
 #import "SentryInternalDefines.h"
 #import "SentryMeta.h"
-#import "SentryOptionsInternal+Private.h"
 #import "SentryProfileCollector.h"
 #import "SentryPropagationContext.h"
 #import "SentrySDK+Private.h"
@@ -117,13 +116,13 @@ + (NSString *)installationID
     return [SentryInstallation idWithCacheDirectoryPath:self.options.cacheDirectoryPath];
 }
 
-+ (SentryOptionsInternal *)options
++ (SentryOptions *)options
 {
-    SentryOptionsInternal *options = [[SentrySDKInternal currentHub] client].options;
+    SentryOptions *options = [[SentrySDKInternal currentHub] client].options;
     if (options != nil) {
         return options;
     }
-    return [[SentryOptionsInternal alloc] init];
+    return [[SentryOptions alloc] init];
 }
 
 + (SentryOnAppStartMeasurementAvailable)onAppStartMeasurementAvailable

Sources/Sentry/Profiling/SentryLaunchProfiling.m

@@ -7,7 +7,6 @@
 #    import "SentryInternalDefines.h"
 #    import "SentryLaunchProfiling.h"
 #    import "SentryLogC.h"
-#    import "SentryOptionsInternal+Private.h"
 #    import "SentryProfileConfiguration.h"
 #    import "SentryProfiler+Private.h"
 #    import "SentrySamplerDecision.h"
@@ -148,7 +147,7 @@
 }
 
 SentryLaunchProfileDecision
-sentry_launchShouldHaveContinuousProfiling(SentryOptionsInternal *options)
+sentry_launchShouldHaveContinuousProfiling(SentryOptions *options)
 {
     if (!options.profiling.profileAppStarts) {
         SENTRY_LOG_DEBUG(@"Continuous profiling v2 enabled but disabled app start profiling, "
@@ -203,7 +202,7 @@
 }
 
 SentryLaunchProfileDecision
-sentry_shouldProfileNextLaunch(SentryOptionsInternal *options)
+sentry_shouldProfileNextLaunch(SentryOptions *options)
 {
     if ([options isContinuousProfilingEnabled]) {
         return sentry_launchShouldHaveContinuousProfiling(options);
@@ -228,7 +227,7 @@
 
 #    if defined(SENTRY_TEST) || defined(SENTRY_TEST_CI) || defined(DEBUG)
 BOOL
-sentry_willProfileNextLaunch(SentryOptionsInternal *options)
+sentry_willProfileNextLaunch(SentryOptions *options)
 {
     return sentry_shouldProfileNextLaunch(options).shouldProfile;
 }
@@ -307,7 +306,7 @@
 BOOL sentry_isTracingAppLaunch;
 
 void
-sentry_configureLaunchProfilingForNextLaunch(SentryOptionsInternal *options)
+sentry_configureLaunchProfilingForNextLaunch(SentryOptions *options)
 {
     [SentryDependencyContainer.sharedInstance.dispatchQueueWrapper dispatchAsyncWithBlock:^{
         SentryLaunchProfileDecision config = sentry_shouldProfileNextLaunch(options);

Sources/Sentry/Profiling/SentryProfiledTracerConcurrency.mm

@@ -5,15 +5,13 @@
 #    import "SentryContinuousProfiler.h"
 #    import "SentryInternalDefines.h"
 #    import "SentryLogC.h"
-#    import "SentryOptionsInternal+Private.h"
 #    import "SentryProfiler+Private.h"
 #    include <mutex>
 
 #    import "SentryEvent+Private.h"
 #    import "SentryHub+Private.h"
 #    import "SentryInternalDefines.h"
 #    import "SentryLaunchProfiling.h"
-#    import "SentryOptionsInternal+Private.h"
 #    import "SentryProfileConfiguration.h"
 #    import "SentryProfiledTracerConcurrency.h"
 #    import "SentryProfiler+Private.h"

Sources/Sentry/Profiling/SentryProfilerSerialization.m

@@ -13,7 +13,6 @@
 #    import "SentryLogC.h"
 #    import "SentryMeta.h"
 #    import "SentryMetricProfiler.h"
-#    import "SentryOptionsInternal.h"
 #    import "SentryProfileTimeseries.h"
 #    import "SentryProfiledTracerConcurrency.h"
 #    import "SentryProfiler+Private.h"

Sources/Sentry/Profiling/SentryProfilingSwiftHelpers.m

@@ -3,7 +3,6 @@
 
 #    import "SentryClient.h"
 #    import "SentryLogC.h"
-#    import "SentryOptionsInternal+Private.h"
 #    import "SentryProfiler+Private.h"
 #    import "SentrySamplerDecision.h"
 #    import "SentrySwift.h"

Sources/Sentry/Public/SentryTraceContext.h

@@ -11,7 +11,6 @@ NS_ASSUME_NONNULL_BEGIN
 
 @class SentryBaggage;
 @class SentryId;
-@class SentryOptionsInternal;
 @class SentryScope;
 @class SentryTracer;
 @class SentryUser;
@@ -66,7 +65,6 @@ NS_SWIFT_NAME(TraceContext)
 @property (nullable, nonatomic, readonly) NSString *replayId;
 
 /**
-                               options:(SentryOptionsInternal *)options;
  * Create a SentryBaggage with the information of this SentryTraceContext.
  */
 - (SentryBaggage *)toBaggage;

Sources/Sentry/SentryANRTrackingIntegration.m

@@ -11,7 +11,6 @@
 #import "SentryStacktrace.h"
 #import "SentrySwift.h"
 #import "SentryThread.h"
-#import <SentryOptionsInternal+Private.h>
 
 #if SENTRY_HAS_UIKIT
 #    import <UIKit/UIKit.h>
@@ -24,7 +23,7 @@
 @interface SentryANRTrackingIntegration () <SentryANRTrackerDelegate>
 
 @property (nonatomic, strong) SentryANRTracker *tracker;
-@property (nonatomic, strong) SentryOptionsInternal *options;
+@property (nonatomic, strong) SentryOptions *options;
 @property (nonatomic, strong) SentryFileManager *fileManager;
 @property (nonatomic, strong) SentryDispatchQueueWrapper *dispatchQueueWrapper;
 @property (nonatomic, strong) SentryCrashWrapper *crashWrapper;
@@ -37,7 +36,7 @@ @interface SentryANRTrackingIntegration () <SentryANRTrackerDelegate>
 
 @implementation SentryANRTrackingIntegration
 
-- (BOOL)installWithOptions:(SentryOptionsInternal *)options
+- (BOOL)installWithOptions:(SentryOptions *)options
 {
     if (![super installWithOptions:options]) {
         return NO;
@@ -164,7 +163,7 @@ - (void)anrDetectedWithType:(enum SentryANRType)type
     // we would lose the scope. Furthermore, we want to know in which state the app was when the
     // app hang started.
     SentryScope *scope = [SentrySDKInternal currentHub].scope;
-    SentryOptionsInternal *options = SentrySDKInternal.options;
+    SentryOptions *options = SentrySDKInternal.options;
     if (scope != nil && options != nil) {
         [scope applyToEvent:event maxBreadcrumb:options.maxBreadcrumbs];
     }

Sources/Sentry/SentryAppStartTrackingIntegration.m

@@ -4,7 +4,6 @@
 
 #    import "SentryAppStartTracker.h"
 #    import "SentryLogC.h"
-#    import "SentryOptionsInternal.h"
 #    import "SentrySwift.h"
 #    import <PrivateSentrySDKOnly.h>
 
@@ -16,7 +15,7 @@ @interface SentryAppStartTrackingIntegration ()
 
 @implementation SentryAppStartTrackingIntegration
 
-- (BOOL)installWithOptions:(SentryOptionsInternal *)options
+- (BOOL)installWithOptions:(SentryOptions *)options
 {
     if (!PrivateSentrySDKOnly.appStartMeasurementHybridSDKMode
         && ![super installWithOptions:options]) {

Sources/Sentry/SentryAutoBreadcrumbTrackingIntegration.m

@@ -1,7 +1,6 @@
 #import "SentryAutoBreadcrumbTrackingIntegration.h"
 #import "SentryBreadcrumbTracker.h"
 #import "SentryLogC.h"
-#import "SentryOptionsInternal.h"
 #import "SentrySDKInternal.h"
 #import "SentrySwift.h"
 #import "SentrySystemEventBreadcrumbs.h"
@@ -20,7 +19,7 @@ @interface SentryAutoBreadcrumbTrackingIntegration ()
 
 @implementation SentryAutoBreadcrumbTrackingIntegration
 
-- (BOOL)installWithOptions:(SentryOptionsInternal *)options
+- (BOOL)installWithOptions:(SentryOptions *)options
 {
     if (![super installWithOptions:options]) {
         return NO;
@@ -59,7 +58,7 @@ - (SentryIntegrationOption)integrationOptions
 /**
  * For testing.
  */
-- (void)installWithOptions:(nonnull SentryOptionsInternal *)options
+- (void)installWithOptions:(nonnull SentryOptions *)options
          breadcrumbTracker:(SentryBreadcrumbTracker *)breadcrumbTracker
 #if TARGET_OS_IOS && SENTRY_HAS_UIKIT
     systemEventBreadcrumbs:(SentrySystemEventBreadcrumbs *)systemEventBreadcrumbs

Sources/Sentry/SentryAutoSessionTrackingIntegration.m

@@ -1,7 +1,6 @@
 #import "SentryAutoSessionTrackingIntegration.h"
 #import "SentryLogC.h"
 #import "SentryOptionsConverter.h"
-#import "SentryOptionsInternal.h"
 #import "SentrySDKInternal.h"
 #import "SentrySwift.h"
 
@@ -15,14 +14,13 @@ @interface SentryAutoSessionTrackingIntegration ()
 
 @implementation SentryAutoSessionTrackingIntegration
 
-- (BOOL)installWithOptions:(SentryOptionsInternal *)options
+- (BOOL)installWithOptions:(SentryOptions *)options
 {
     if (![super installWithOptions:options]) {
         return NO;
     }
 
-    self.tracker = [SentryDependencyContainer.sharedInstance
-        getSessionTrackerWithOptions:[SentryOptionsConverter fromInternal:options]];
+    self.tracker = [SentryDependencyContainer.sharedInstance getSessionTrackerWithOptions:options];
     [self.tracker start];
 
     return YES;