ref: Renames SentrySpan class to SentrySpanInternal

Sources/Sentry/Public/SentryScope.h

@@ -13,6 +13,7 @@
 @class SentryBreadcrumb;
 @class SentryOptions;
 @class SentryUser;
+@class SentrySpanInternal;
 
 NS_ASSUME_NONNULL_BEGIN
 

Sources/Sentry/SentryBuildAppStartSpans.m

@@ -9,7 +9,7 @@
 
 #if SENTRY_HAS_UIKIT
 
-SentrySpan *
+SentrySpanInternal *
 sentryBuildAppStartSpan(
     SentryTracer *tracer, SentrySpanId *parentId, NSString *operation, NSString *description)
 {
@@ -22,10 +22,10 @@
                                             origin:SentryTraceOriginAutoAppStart
                                            sampled:tracer.sampled];
 
-    return [[SentrySpan alloc] initWithTracer:tracer context:context framesTracker:nil];
+    return [[SentrySpanInternal alloc] initWithTracer:tracer context:context framesTracker:nil];
 }
 
-NSArray<SentrySpan *> *
+NSArray<SentrySpanInternal *> *
 sentryBuildAppStartSpans(
     SentryTracer *tracer, SentryAppStartMeasurement *_Nullable appStartMeasurement)
 {
@@ -50,44 +50,45 @@
         return @[];
     }
 
-    NSMutableArray<SentrySpan *> *appStartSpans = [NSMutableArray array];
+    NSMutableArray<SentrySpanInternal *> *appStartSpans = [NSMutableArray array];
 
     NSDate *appStartEndTimestamp = [appStartMeasurement.appStartTimestamp
         dateByAddingTimeInterval:appStartMeasurement.duration];
 
-    SentrySpan *appStartSpan = sentryBuildAppStartSpan(tracer, tracer.spanId, operation, type);
+    SentrySpanInternal *appStartSpan
+        = sentryBuildAppStartSpan(tracer, tracer.spanId, operation, type);
     [appStartSpan setStartTimestamp:appStartMeasurement.appStartTimestamp];
     [appStartSpan setTimestamp:appStartEndTimestamp];
 
     [appStartSpans addObject:appStartSpan];
 
     if (!appStartMeasurement.isPreWarmed) {
-        SentrySpan *premainSpan
+        SentrySpanInternal *premainSpan
             = sentryBuildAppStartSpan(tracer, appStartSpan.spanId, operation, @"Pre Runtime Init");
         [premainSpan setStartTimestamp:appStartMeasurement.appStartTimestamp];
         [premainSpan setTimestamp:appStartMeasurement.runtimeInitTimestamp];
         [appStartSpans addObject:premainSpan];
 
-        SentrySpan *runtimeInitSpan = sentryBuildAppStartSpan(
+        SentrySpanInternal *runtimeInitSpan = sentryBuildAppStartSpan(
             tracer, appStartSpan.spanId, operation, @"Runtime Init to Pre Main Initializers");
         [runtimeInitSpan setStartTimestamp:appStartMeasurement.runtimeInitTimestamp];
         [runtimeInitSpan setTimestamp:appStartMeasurement.moduleInitializationTimestamp];
         [appStartSpans addObject:runtimeInitSpan];
     }
 
-    SentrySpan *appInitSpan
+    SentrySpanInternal *appInitSpan
         = sentryBuildAppStartSpan(tracer, appStartSpan.spanId, operation, @"UIKit Init");
     [appInitSpan setStartTimestamp:appStartMeasurement.moduleInitializationTimestamp];
     [appInitSpan setTimestamp:appStartMeasurement.sdkStartTimestamp];
     [appStartSpans addObject:appInitSpan];
 
-    SentrySpan *didFinishLaunching
+    SentrySpanInternal *didFinishLaunching
         = sentryBuildAppStartSpan(tracer, appStartSpan.spanId, operation, @"Application Init");
     [didFinishLaunching setStartTimestamp:appStartMeasurement.sdkStartTimestamp];
     [didFinishLaunching setTimestamp:appStartMeasurement.didFinishLaunchingTimestamp];
     [appStartSpans addObject:didFinishLaunching];
 
-    SentrySpan *frameRenderSpan
+    SentrySpanInternal *frameRenderSpan
         = sentryBuildAppStartSpan(tracer, appStartSpan.spanId, operation, @"Initial Frame Render");
     [frameRenderSpan setStartTimestamp:appStartMeasurement.didFinishLaunchingTimestamp];
     [frameRenderSpan setTimestamp:appStartEndTimestamp];

Sources/Sentry/SentryCoreDataTracker.m

@@ -37,8 +37,8 @@ - (NSArray *)managedObjectContext:(NSManagedObjectContext *)context
                             error:(NSError **)error
                       originalImp:(NSArray *(NS_NOESCAPE ^)(NSFetchRequest *, NSError **))original
 {
-    id<SentrySpan> _Nullable currentSpan = [SentrySDKInternal.currentHub.scope span];
-    id<SentrySpan> _Nullable fetchSpan;
+    SentrySpanInternal *_Nullable currentSpan = [SentrySDKInternal.currentHub.scope span];
+    SentrySpanInternal *_Nullable fetchSpan;
     if (currentSpan) {
         NSString *spanDescription = [self descriptionFromRequest:request];
         fetchSpan = [currentSpan startChildWithOperation:SentrySpanOperationCoredataFetchOperation
@@ -56,7 +56,7 @@ - (NSArray *)managedObjectContext:(NSManagedObjectContext *)context
     NSArray *result = original(request, error);
 
     if (fetchSpan) {
-        [self addExtraInfoToSpan:(SentrySpan *)fetchSpan withContext:context];
+        [self addExtraInfoToSpan:fetchSpan withContext:context];
 
         [fetchSpan setDataValue:[NSNumber numberWithInteger:result.count] forKey:@"read_count"];
         [fetchSpan
@@ -103,7 +103,7 @@ - (BOOL)managedObjectContext:(NSManagedObjectContext *)context
     BOOL result = original(error);
 
     if (saveSpan) {
-        [self addExtraInfoToSpan:(SentrySpan *)saveSpan withContext:context];
+        [self addExtraInfoToSpan:saveSpan withContext:context];
         [saveSpan finishWithStatus:result ? kSentrySpanStatusOk : kSentrySpanStatusInternalError];
 
         SENTRY_LOG_DEBUG(@"SentryCoreDataTracker automatically finished span with status: %@",
@@ -113,7 +113,7 @@ - (BOOL)managedObjectContext:(NSManagedObjectContext *)context
     return result;
 }
 
-- (void)addExtraInfoToSpan:(SentrySpan *)span withContext:(NSManagedObjectContext *)context
+- (void)addExtraInfoToSpan:(SentrySpanInternal *)span withContext:(NSManagedObjectContext *)context
 {
     BOOL isMainThread = [NSThread isMainThread];
 

Sources/Sentry/SentryCrashIntegration.m

@@ -34,7 +34,7 @@
 void
 sentry_finishAndSaveTransaction(void)
 {
-    SentrySpan *span = [SentrySDKInternal.currentHub.scope getCastedInternalSpan];
+    SentrySpanInternal *_Nullable span = [SentrySDKInternal.currentHub.scope getCastedInternalSpan];
 
     if (span != nil) {
         SentryTracer *tracer = [span tracer];

Sources/Sentry/SentryDefaultUIViewControllerPerformanceTracker.m

@@ -204,8 +204,8 @@ - (void)startRootSpanFor:(UIViewController *)controller
     }
 
     spanId = [self getSpanIdForViewController:controller];
-    SentrySpan *_Nullable vcSpan
-        = (SentrySpan *)[self.tracker getSpan:SENTRY_UNWRAP_NULLABLE(SentrySpanId, spanId)];
+    SentrySpanInternal *_Nullable vcSpan
+        = (SentrySpanInternal *)[self.tracker getSpan:SENTRY_UNWRAP_NULLABLE(SentrySpanId, spanId)];
 
     if (![vcSpan isKindOfClass:[SentryTracer self]]) {
         // Since TTID and TTFD are meant to the whole screen

Sources/Sentry/SentryFileIOTrackerHelper.m

@@ -246,7 +246,7 @@ - (void)mainThreadExtraInfo:(id<SentrySpan>)span
         // and we should not report it as an issue.
         [span setDataValue:@(NO) forKey:SPAN_DATA_BLOCKED_MAIN_THREAD];
     } else {
-        [((SentrySpan *)span) setFrames:frames];
+        [((SentrySpanInternal *)span) setFrames:frames];
     }
 }
 

Sources/Sentry/SentrySDKInternal.m

@@ -20,6 +20,7 @@
 #import "SentryScope.h"
 #import "SentrySerialization.h"
 #import "SentrySessionReplayIntegration.h"
+#import "SentrySpan.h"
 #import "SentrySwift.h"
 #import "SentryTransactionContext.h"
 #import "SentryUseNSExceptionCallstackWrapper.h"

Sources/Sentry/SentryScope.m

@@ -147,23 +147,23 @@ - (void)setPropagationContext:(SentryPropagationContext *)propagationContext
     }
 }
 
-- (nullable id<SentrySpan>)span
+- (nullable SentrySpanInternal *)span
 {
     @synchronized(_spanLock) {
         return _span;
     }
 }
 
-- (nullable SentrySpan *)getCastedInternalSpan
+- (nullable SentrySpanInternal *)getCastedInternalSpan
 {
     id<SentrySpan> span = self.span;
 
     if (span == nil) {
         return nil;
     }
 
-    if (span && [span isKindOfClass:[SentrySpan class]]) {
-        return (SentrySpan *)span;
+    if (span && [span isKindOfClass:[SentrySpanInternal class]]) {
+        return (SentrySpanInternal *)span;
     }
 
     SENTRY_LOG_DEBUG(@"The span on the scope is not of type SentrySpan, returning nil.");

Sources/Sentry/SentrySpan.m

@@ -24,10 +24,10 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-@interface SentrySpan ()
+@interface SentrySpanInternal ()
 @end
 
-@implementation SentrySpan {
+@implementation SentrySpanInternal {
     NSMutableDictionary<NSString *, id> *_data;
     NSMutableDictionary<NSString *, id> *_tags;
     NSObject *_stateLock;

Sources/Sentry/SentryTimeToDisplayTracker.m

@@ -59,14 +59,14 @@ - (BOOL)startForTracer:(SentryTracer *)tracer
     }
 
     SENTRY_LOG_DEBUG(@"Starting initial display span");
-    self.initialDisplaySpan = (SentrySpan *)[tracer
+    self.initialDisplaySpan = (SentrySpanInternal *)[tracer
         startChildWithOperation:SentrySpanOperationUiLoadInitialDisplay
                     description:[NSString stringWithFormat:@"%@ initial display", _name]];
     self.initialDisplaySpan.origin = SentryTraceOriginAutoUITimeToDisplay;
 
     if (self.waitForFullDisplay) {
         SENTRY_LOG_DEBUG(@"Starting full display span");
-        self.fullDisplaySpan = (SentrySpan *)[tracer
+        self.fullDisplaySpan = (SentrySpanInternal *)[tracer
             startChildWithOperation:SentrySpanOperationUiLoadFullDisplay
                         description:[NSString stringWithFormat:@"%@ full display", _name]];
         self.fullDisplaySpan.origin = SentryTraceOriginManualUITimeToDisplay;

Sources/Sentry/SentryTracer.m

@@ -387,11 +387,11 @@ - (BOOL)isAutoGeneratedTransaction
                                    spanDescription:description
                                            sampled:self.sampled];
 
-    SentrySpan *child =
-        [[SentrySpan alloc] initWithTracer:self
-                                   context:context
+    SentrySpanInternal *child = [[SentrySpanInternal alloc]
+        initWithTracer:self
+               context:context
 #if SENTRY_HAS_UIKIT
-                             framesTracker:SentryDependencyContainer.sharedInstance.framesTracker
+         framesTracker:SentryDependencyContainer.sharedInstance.framesTracker
 #endif // SENTRY_HAS_UIKIT
     ];
     child.startTimestamp = [SentryDependencyContainer.sharedInstance.dateProvider date];
@@ -724,7 +724,8 @@ - (SentryTransaction *)toTransaction
 #if SENTRY_HAS_UIKIT
     [self addFrameStatistics];
 
-    NSArray<id<SentrySpan>> *appStartSpans = sentryBuildAppStartSpans(self, appStartMeasurement);
+    NSArray<SentrySpanInternal *> *appStartSpans
+        = sentryBuildAppStartSpans(self, appStartMeasurement);
     capacity = _children.count + appStartSpans.count;
 #else
     capacity = _children.count;
@@ -744,12 +745,12 @@ - (SentryTransaction *)toTransaction
     transaction.transaction = self.transactionContext.name;
 
     NSMutableArray *framesOfAllSpans = [NSMutableArray array];
-    if ([(SentrySpan *)self frames]) {
+    if ([(SentrySpanInternal *)self frames]) {
         [framesOfAllSpans addObjectsFromArray:SENTRY_UNWRAP_NULLABLE(NSArray<SentryFrame *>,
-                                                  [(SentrySpan *)self frames])];
+                                                  [(SentrySpanInternal *)self frames])];
     }
 
-    for (SentrySpan *span in spans) {
+    for (SentrySpanInternal *span in spans) {
         if (span.frames) {
             [framesOfAllSpans
                 addObjectsFromArray:SENTRY_UNWRAP_NULLABLE(NSArray<SentryFrame *>, span.frames)];
@@ -924,8 +925,8 @@ + (nullable SentryTracer *)getTracer:(id<SentrySpan> _Nullable)span
 
     if ([span isKindOfClass:[SentryTracer class]]) {
         return (SentryTracer *)span;
-    } else if ([span isKindOfClass:[SentrySpan class]]) {
-        return [(SentrySpan *)span tracer];
+    } else if ([span isKindOfClass:[SentrySpanInternal class]]) {
+        return [(SentrySpanInternal *)span tracer];
     }
     return nil;
 }

Sources/Sentry/include/SentryBuildAppStartSpans.h

@@ -1,14 +1,14 @@
 #import "SentryDefines.h"
 
 @class SentryTracer;
-@class SentrySpan;
+@class SentrySpanInternal;
 @class SentryAppStartMeasurement;
 
 NS_ASSUME_NONNULL_BEGIN
 
 #if SENTRY_HAS_UIKIT
 
-NSArray<SentrySpan *> *sentryBuildAppStartSpans(
+NSArray<SentrySpanInternal *> *sentryBuildAppStartSpans(
     SentryTracer *tracer, SentryAppStartMeasurement *_Nullable appStartMeasurement);
 
 #endif // SENTRY_HAS_UIKIT

Sources/Sentry/include/SentryNoOpSpan.h

@@ -5,7 +5,7 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-@interface SentryNoOpSpan : SentrySpan
+@interface SentryNoOpSpan : SentrySpanInternal
 SENTRY_NO_INIT
 
 + (instancetype)shared;

Sources/Sentry/include/SentryScope+Private.h

@@ -6,7 +6,7 @@
 @class SentryAttachment;
 @class SentryPropagationContext;
 @class SentrySession;
-@class SentrySpan;
+@class SentrySpanInternal;
 
 @protocol SentryScopeObserver;
 
@@ -47,7 +47,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (NSArray<SentryBreadcrumb *> *)breadcrumbs;
 
-- (nullable SentrySpan *)getCastedInternalSpan;
+- (nullable SentrySpanInternal *)getCastedInternalSpan;
 
 /**
  * used to add values in event context.

Sources/Sentry/include/SentrySpan+Private.h

@@ -4,7 +4,7 @@
 
 static NSString *_Nonnull const kSentrySpanStatusSerializationKey = @"status";
 
-@interface SentrySpan ()
+@interface SentrySpanInternal ()
 
 #if SENTRY_TARGET_PROFILING_SUPPORTED
 @property (copy, nonatomic) NSString *_Nullable profileSessionID;

Sources/Sentry/include/SentrySpan.h

@@ -15,7 +15,7 @@ NS_ASSUME_NONNULL_BEGIN
 @class SentryFramesTracker;
 #endif // SENTRY_HAS_UIKIT
 
-@interface SentrySpan : NSObject <SentrySpan, SentrySerializable>
+@interface SentrySpanInternal : NSObject <SentrySpan, SentrySerializable>
 SENTRY_NO_INIT
 
 /**

Sources/Sentry/include/SentryTracer.h

@@ -34,7 +34,7 @@ static const NSTimeInterval SENTRY_AUTO_TRANSACTION_MAX_DURATION = 500.0;
 
 @end
 
-@interface SentryTracer : SentrySpan
+@interface SentryTracer : SentrySpanInternal
 
 @property (nonatomic, strong) SentryTransactionContext *transactionContext;
 

Tests/SentryTests/Integrations/Performance/CoreData/SentryCoreDataTrackerTest.swift

@@ -373,14 +373,14 @@ private extension SentryCoreDataTrackerTests {
         XCTAssert(try XCTUnwrap(dbSpan.data["db.name"] as? NSString).contains(databaseFilename), file: file, line: line)
 
         if mainThread {
-            guard let frames = (dbSpan as? SentrySpan)?.frames else {
+            guard let frames = (dbSpan as? SentrySpanInternal)?.frames else {
                 XCTFail("File IO Span in the main thread has no frames", file: file, line: line)
                 return
             }
             XCTAssertEqual(frames.first, TestData.mainFrame, file: file, line: line)
             XCTAssertEqual(frames.last, TestData.testFrame, file: file, line: line)
         } else {
-            XCTAssertNil((dbSpan as? SentrySpan)?.frames, file: file, line: line)
+            XCTAssertNil((dbSpan as? SentrySpanInternal)?.frames, file: file, line: line)
         }
     }
 

Tests/SentryTests/Integrations/Performance/IO/SentryFileIOTrackerTests.swift

@@ -163,10 +163,10 @@ class SentryFileIOTrackerTests: XCTestCase {
         thread.stacktrace = stackTrace
         fixture.threadInspector.allThreads = [thread]
 
-        var span: SentrySpan?
+        var span: SentrySpanInternal?
 
         sut.measure(fixture.data, writeToFile: fixture.filePath, atomically: false, origin: "custom.origin") { _, _ -> Bool in
-            span = self.firstSpan(transaction) as? SentrySpan
+            span = self.firstSpan(transaction) as? SentrySpanInternal
             XCTAssertFalse(span?.isFinished ?? true)
             return true
         }
@@ -384,7 +384,7 @@ class SentryFileIOTrackerTests: XCTestCase {
         XCTAssertEqual(span?.data["blocked_main_thread"] as? Bool ?? false, mainThread)
 
         if mainThread {
-            guard let frames = (span as? SentrySpan)?.frames else {
+            guard let frames = (span as? SentrySpanInternal)?.frames else {
                 XCTFail("File IO Span in the main thread has no frames", file: file, line: line)
                 return
             }

Tests/SentryTests/Integrations/Performance/IO/SentryFileIOTrackingIntegrationObjCTests.m

@@ -210,7 +210,7 @@ - (void)assertTransactionForOperation:(NSString *)operation block:(void (^)(void
 
     block();
 
-    SentrySpan *ioSpan = (SentrySpan *)parentTransaction.children.firstObject;
+    SentrySpanInternal *ioSpan = (SentrySpanInternal *)parentTransaction.children.firstObject;
 
     XCTAssertEqual(parentTransaction.children.count, 1);
     XCTAssertEqual([ioSpan.data[@"file.size"] unsignedIntValue], someData.length);

Tests/SentryTests/Integrations/Performance/IO/SentryNSFileManagerSwizzlingTests.m

@@ -166,7 +166,7 @@ - (void)assertTransactionForOperation:(NSString *)operation
 
     XCTAssertEqual(parentTransaction.children.count, spanCount);
 
-    SentrySpan *ioSpan = (SentrySpan *)parentTransaction.children.firstObject;
+    SentrySpanInternal *ioSpan = (SentrySpanInternal *)parentTransaction.children.firstObject;
     if (spanCount > 0) {
         XCTAssertEqual([ioSpan.data[@"file.size"] unsignedIntValue], someData.length);
         XCTAssertEqualObjects(ioSpan.data[@"file.path"], filePath);