ref: SentryClient and SentryHub in Swift

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

@@ -2,7 +2,7 @@
 #import <Sentry/SentryScope.h>
 #import <UIKit/UIKit.h>
 
-@class SentryHub;
+@class SentryOptions;
 
 NS_ASSUME_NONNULL_BEGIN
 
@@ -13,11 +13,23 @@ NS_ASSUME_NONNULL_BEGIN
 
 @end
 
+@interface SentryClientInternal : NSObject
+
+@property (nonatomic) SentryOptions *options;
+
+@end
+
+@interface SentryHubInternal : NSObject
+
+- (nullable SentryClientInternal *)getClient;
+
+@end
+
 @interface SentrySDKInternal : NSObject
 
 + (nullable NSArray<NSString *> *)relevantViewControllersNames;
 
-+ (SentryHub *)currentHub;
++ (SentryHubInternal *)currentHub;
 
 @end
 

SentryTestUtils/SentryHub+Test.h

@@ -3,13 +3,14 @@
 @class SentryClient;
 @class SentryCrashWrapper;
 @class SentryDispatchQueueWrapper;
+@class SentryClientInternal;
 @protocol SentryIntegrationProtocol;
 NS_ASSUME_NONNULL_BEGIN
 
 /** Expose the internal test init for testing. */
-@interface SentryHub ()
+@interface SentryHubInternal ()
 
-- (instancetype)initWithClient:(SentryClient *_Nullable)client
+- (instancetype)initWithClient:(SentryClientInternal *_Nullable)client
                       andScope:(SentryScope *_Nullable)scope
                andCrashWrapper:(SentryCrashWrapper *)crashAdapter
               andDispatchQueue:(SentryDispatchQueueWrapper *)dispatchQueue;

SentryTestUtils/TestClient.swift

@@ -2,7 +2,7 @@ import _SentryPrivate
 import Foundation
 @_spi(Private) import Sentry
 
-public class TestClient: SentryClient {
+public class TestClient: SentryClientInternal {
     public override init?(options: Options) {
         super.init(
             options: options,

SentryTestUtils/TestHub.swift

@@ -2,7 +2,7 @@ import _SentryPrivate
 import Foundation
 @_spi(Private) @testable import Sentry
 
-public class TestHub: SentryHub {
+public class TestHub: SentryHubInternal {
 
     public var startSessionInvocations: Int = 0
     public var closeCachedSessionInvocations: Int = 0

Sources/Sentry/Profiling/SentryLaunchProfiling.m

@@ -349,7 +349,7 @@
 }
 
 void
-sentry_stopAndDiscardLaunchProfileTracer(SentryHub *_Nullable hub)
+sentry_stopAndDiscardLaunchProfileTracer(SentryHubInternal *_Nullable hub)
 {
     SENTRY_LOG_DEBUG(@"Finishing launch tracer.");
     sentry_launchTracer.hub = hub;

Sources/Sentry/Profiling/SentryProfiledTracerConcurrency.mm

@@ -167,7 +167,7 @@
 }
 
 void
-sentry_discardProfilerCorrelatedToTrace(SentryId *internalTraceId, SentryHub *hub)
+sentry_discardProfilerCorrelatedToTrace(SentryId *internalTraceId, SentryHubInternal *hub)
 {
     std::lock_guard<std::mutex> l(_gStateLock);
 
@@ -238,9 +238,9 @@
 }
 
 void
-sentry_stopProfilerDueToFinishedTransaction(
-    SentryHub *hub, SentryDispatchQueueWrapper *dispatchQueue, SentryTransaction *transaction,
-    BOOL isProfiling, NSDate *_Nullable traceStartTimestamp, uint64_t startSystemTime
+sentry_stopProfilerDueToFinishedTransaction(SentryHubInternal *hub,
+    SentryDispatchQueueWrapper *dispatchQueue, SentryTransaction *transaction, BOOL isProfiling,
+    NSDate *_Nullable traceStartTimestamp, uint64_t startSystemTime
 #    if SENTRY_HAS_UIKIT
     ,
     SentryAppStartMeasurement *appStartMeasurement
@@ -256,10 +256,11 @@
         return;
     }
 
-    SentryClient *_Nullable client = hub.getClient;
+    SentryClientInternal *_Nullable client = hub.getClient;
     if (isProfiling && client != nil
-        && sentry_isContinuousProfilingEnabled(SENTRY_UNWRAP_NULLABLE(SentryClient, client))
-        && sentry_isProfilingCorrelatedToTraces(SENTRY_UNWRAP_NULLABLE(SentryClient, client))) {
+        && sentry_isContinuousProfilingEnabled(SENTRY_UNWRAP_NULLABLE(SentryClientInternal, client))
+        && sentry_isProfilingCorrelatedToTraces(
+            SENTRY_UNWRAP_NULLABLE(SentryClientInternal, client))) {
         SENTRY_LOG_DEBUG(@"Stopping tracking root span tracer with profilerReferenceId %@",
             sentry_stringFromSentryID(transaction.trace.profilerReferenceID));
         sentry_stopTrackingRootSpanForContinuousProfilerV2();
@@ -334,24 +335,25 @@
 }
 
 SentryId *_Nullable sentry_startProfilerForTrace(SentryTracerConfiguration *configuration,
-    SentryHub *_Nullable hub, SentryTransactionContext *transactionContext)
+    SentryHubInternal *_Nullable hub, SentryTransactionContext *transactionContext)
 {
     if (sentry_profileConfiguration.profileOptions != nil) {
         // launch profile; there's no hub to get options from, so they're read from the launch
         // profile config file
         return _sentry_startContinuousProfilerV2ForTrace(
             sentry_profileConfiguration.profileOptions, transactionContext);
     }
-    SentryClient *_Nullable client = hub.getClient;
+    SentryClientInternal *_Nullable client = hub.getClient;
     if (client != nil
-        && sentry_isContinuousProfilingEnabled(SENTRY_UNWRAP_NULLABLE(SentryClient, client))) {
+        && sentry_isContinuousProfilingEnabled(
+            SENTRY_UNWRAP_NULLABLE(SentryClientInternal, client))) {
         // non launch profile
         if (sentry_getParentSpanID(transactionContext) != nil) {
             SENTRY_LOG_DEBUG(@"Not a root span, will not start automatically for trace lifecycle.");
             return nil;
         }
         SentryProfileOptions *_Nullable profilingOptions
-            = sentry_getProfiling(SENTRY_UNWRAP_NULLABLE(SentryClient, client));
+            = sentry_getProfiling(SENTRY_UNWRAP_NULLABLE(SentryClientInternal, client));
         if (profilingOptions == nil) {
             SENTRY_LOG_DEBUG(@"No profiling options found, will not start profiler.");
             return nil;

Sources/Sentry/Profiling/SentryProfilerSerialization+Test.h

@@ -8,7 +8,7 @@
 #        import "SentryProfiler+Private.h"
 
 @class SentryDebugMeta;
-@class SentryHub;
+@class SentryHubInternal;
 
 NS_ASSUME_NONNULL_BEGIN
 
@@ -26,7 +26,7 @@ SENTRY_EXTERN NSString *sentry_profilerTruncationReasonName(SentryProfilerTrunca
 SENTRY_EXTERN NSMutableDictionary<NSString *, id> *sentry_serializedTraceProfileData(
     NSDictionary<NSString *, id> *profileData, uint64_t startSystemTime, uint64_t endSystemTime,
     NSString *truncationReason, NSDictionary<NSString *, id> *serializedMetrics,
-    NSArray<SentryDebugMeta *> *debugMeta, SentryHub *hub
+    NSArray<SentryDebugMeta *> *debugMeta, SentryHubInternal *hub
 #        if SENTRY_HAS_UIKIT
     ,
     SentryScreenFrames *gpuData

Sources/Sentry/Profiling/SentryProfilerSerialization.m

@@ -8,6 +8,7 @@
 #    import "SentryEnvelopeItemHeader.h"
 #    import "SentryEvent+Private.h"
 #    import "SentryFormatter.h"
+#    import "SentryHub.h"
 #    import "SentryInternalDefines.h"
 #    import "SentryLogC.h"
 #    import "SentryMeta.h"
@@ -110,7 +111,7 @@
 sentry_serializedTraceProfileData(
     NSDictionary<NSString *, id> *profileData, uint64_t startSystemTime, uint64_t endSystemTime,
     NSString *truncationReason, NSDictionary<NSString *, id> *serializedMetrics,
-    NSArray<SentryDebugMeta *> *debugMeta, SentryHub *hub
+    NSArray<SentryDebugMeta *> *debugMeta, SentryHubInternal *hub
 #    if SENTRY_HAS_UIKIT
     ,
     SentryScreenFrames *gpuData
@@ -222,7 +223,7 @@
 NSMutableDictionary<NSString *, id> *
 sentry_serializedContinuousProfileChunk(SentryId *profileID, SentryId *chunkID,
     NSDictionary<NSString *, id> *profileData, NSDictionary<NSString *, id> *serializedMetrics,
-    NSArray<SentryDebugMeta *> *debugMeta, SentryHub *hub
+    NSArray<SentryDebugMeta *> *debugMeta, SentryHubInternal *hub
 #    if SENTRY_HAS_UIKIT
     ,
     SentryScreenFrames *gpuData
@@ -358,7 +359,7 @@
 #    pragma clang diagnostic pop
 }
 
-SentryEnvelopeItem *_Nullable sentry_traceProfileEnvelopeItem(SentryHub *hub,
+SentryEnvelopeItem *_Nullable sentry_traceProfileEnvelopeItem(SentryHubInternal *hub,
     SentryProfiler *profiler, NSDictionary<NSString *, id> *profilingData,
     SentryTransaction *transaction, NSDate *startTimestamp)
 {
@@ -414,7 +415,7 @@
 }
 
 NSMutableDictionary<NSString *, id> *_Nullable sentry_collectProfileDataHybridSDK(
-    uint64_t startSystemTime, uint64_t endSystemTime, SentryId *traceId, SentryHub *hub)
+    uint64_t startSystemTime, uint64_t endSystemTime, SentryId *traceId, SentryHubInternal *hub)
 {
     SentryProfiler *profiler = sentry_profilerForFinishedTracer(traceId);
     if (!profiler) {

Sources/Sentry/Profiling/SentryProfilingSwiftHelpers.m

@@ -1,25 +1,26 @@
 #import "SentryProfilingSwiftHelpers.h"
 #if SENTRY_TARGET_PROFILING_SUPPORTED
 
+#    import "SentryClient.h"
 #    import "SentryLogC.h"
 #    import "SentryOptions+Private.h"
 #    import "SentryProfiler+Private.h"
 #    import "SentrySamplerDecision.h"
 #    import "SentrySwift.h"
 
 BOOL
-sentry_isContinuousProfilingEnabled(SentryClient *client)
+sentry_isContinuousProfilingEnabled(SentryClientInternal *client)
 {
     return [client.options isContinuousProfilingEnabled];
 }
 
 BOOL
-sentry_isProfilingCorrelatedToTraces(SentryClient *client)
+sentry_isProfilingCorrelatedToTraces(SentryClientInternal *client)
 {
     return [client.options isProfilingCorrelatedToTraces];
 }
 
-SentryProfileOptions *_Nullable sentry_getProfiling(SentryClient *client)
+SentryProfileOptions *_Nullable sentry_getProfiling(SentryClientInternal *client)
 {
     return client.options.profiling;
 }

Sources/Sentry/Public/Sentry.h

@@ -10,7 +10,6 @@ FOUNDATION_EXPORT const unsigned char SentryVersionString[];
 #    import <Sentry/SentryAttachment.h>
 #    import <Sentry/SentryBaggage.h>
 #    import <Sentry/SentryBreadcrumb.h>
-#    import <Sentry/SentryClient.h>
 #    import <Sentry/SentryCrashExceptionApplication.h>
 #    import <Sentry/SentryDebugMeta.h>
 #    import <Sentry/SentryDefines.h>
@@ -23,7 +22,7 @@ FOUNDATION_EXPORT const unsigned char SentryVersionString[];
 #    import <Sentry/SentryFrame.h>
 #    import <Sentry/SentryGeo.h>
 #    import <Sentry/SentryHttpStatusCodeRange.h>
-#    import <Sentry/SentryHub.h>
+#    import <Sentry/SentryId.h>
 #    import <Sentry/SentryIntegrationProtocol.h>
 #    import <Sentry/SentryMeasurementUnit.h>
 #    import <Sentry/SentryMechanism.h>

Sources/Sentry/Public/SentryId.h

@@ -0,0 +1,33 @@
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface SentryId : NSObject
+
+/// A @c SentryId with an empty UUID “00000000000000000000000000000000”.
+@property (nonatomic, class, readonly, strong) SentryId *_Nonnull empty;
++ (SentryId *_Nonnull)empty __attribute__((warn_unused_result));
+
+/// Returns a 32 lowercase character hexadecimal string description of the @c SentryId, such as
+/// “12c2d058d58442709aa2eca08bf20986”.
+@property (nonatomic, readonly, copy) NSString *_Nonnull sentryIdString;
+
+/// Creates a @c SentryId with a random UUID.
+- (nonnull instancetype)init __attribute__((objc_designated_initializer));
+
+/// Creates a SentryId with the given UUID.
+- (nonnull instancetype)initWithUuid:(NSUUID *_Nonnull)uuid
+    __attribute__((objc_designated_initializer));
+
+/// Creates a @c SentryId from a 32 character hexadecimal string without dashes such as
+/// “12c2d058d58442709aa2eca08bf20986” or a 36 character hexadecimal string such as such as
+/// “12c2d058-d584-4270-9aa2-eca08bf20986”.
+/// @return SentryId.empty for invalid strings.
+- (nonnull instancetype)initWithUUIDString:(NSString *_Nonnull)uuidString
+    __attribute__((objc_designated_initializer));
+
+- (BOOL)isEqual:(id _Nullable)object __attribute__((warn_unused_result));
+
+@end
+
+NS_ASSUME_NONNULL_END

Sources/Sentry/Public/SentryWithoutUIKit.h

@@ -11,7 +11,6 @@ FOUNDATION_EXPORT const unsigned char SentryVersionString[];
 #    import <SentryWithoutUIKit/SentryAttachment.h>
 #    import <SentryWithoutUIKit/SentryBaggage.h>
 #    import <SentryWithoutUIKit/SentryBreadcrumb.h>
-#    import <SentryWithoutUIKit/SentryClient.h>
 #    import <SentryWithoutUIKit/SentryCrashExceptionApplication.h>
 #    import <SentryWithoutUIKit/SentryDebugMeta.h>
 #    import <SentryWithoutUIKit/SentryDefines.h>
@@ -24,7 +23,7 @@ FOUNDATION_EXPORT const unsigned char SentryVersionString[];
 #    import <SentryWithoutUIKit/SentryFrame.h>
 #    import <SentryWithoutUIKit/SentryGeo.h>
 #    import <SentryWithoutUIKit/SentryHttpStatusCodeRange.h>
-#    import <SentryWithoutUIKit/SentryHub.h>
+#    import <SentryWithoutUIKit/SentryId.h>
 #    import <SentryWithoutUIKit/SentryIntegrationProtocol.h>
 #    import <SentryWithoutUIKit/SentryMeasurementUnit.h>
 #    import <SentryWithoutUIKit/SentryMechanism.h>

Sources/Sentry/SentryClient.m

@@ -10,8 +10,6 @@
 #import "SentryDsn.h"
 #import "SentryEvent+Private.h"
 #import "SentryException.h"
-#import "SentryHub+Private.h"
-#import "SentryHub.h"
 #import "SentryInstallation.h"
 #import "SentryInternalDefines.h"
 #import "SentryLogC.h"
@@ -46,7 +44,7 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-@interface SentryClient ()
+@interface SentryClientInternal ()
 
 @property (nonatomic, strong) SentryTransportAdapter *transportAdapter;
 @property (nonatomic, strong) SentryDebugImageProvider *debugImageProvider;
@@ -58,7 +56,7 @@ @interface SentryClient ()
 
 NSString *const DropSessionLogMessage = @"Session has no release name. Won't send it.";
 
-@implementation SentryClient
+@implementation SentryClientInternal
 
 - (_Nullable instancetype)initWithOptions:(SentryOptions *)options
 {

Sources/Sentry/SentryDependencyContainerSwiftHelper.m

@@ -63,26 +63,21 @@ + (void)dispatchSyncOnMainQueue:(void (^)(void))block
     [SentryDependencyContainer.sharedInstance.dispatchQueueWrapper dispatchSyncOnMainQueue:block];
 }
 
-+ (SentryHub *)currentHub
-{
-    return SentrySDKInternal.currentHub;
-}
-
 + (nullable NSDate *)readTimestampLastInForeground
 {
-    SentryHub *hub = [SentrySDKInternal currentHub];
+    SentryHubInternal *hub = [SentrySDKInternal currentHub];
     return [[[hub getClient] fileManager] readTimestampLastInForeground];
 }
 
 + (void)deleteTimestampLastInForeground
 {
-    SentryHub *hub = [SentrySDKInternal currentHub];
+    SentryHubInternal *hub = [SentrySDKInternal currentHub];
     [[[hub getClient] fileManager] deleteTimestampLastInForeground];
 }
 
 + (void)storeTimestampLastInForeground:(NSDate *)timestamp
 {
-    SentryHub *hub = [SentrySDKInternal currentHub];
+    SentryHubInternal *hub = [SentrySDKInternal currentHub];
     [[[hub getClient] fileManager] storeTimestampLastInForeground:timestamp];
 }