Merge 57ccf06 into feb2055

getsentry · Dec 23, 2022 · dd6138f · dd6138f
2 parents feb2055 + 57ccf06
commit dd6138f
Show file tree

Hide file tree

Showing 12 changed files with 347 additions and 309 deletions.
diff --git a/Sentry.xcodeproj/project.pbxproj b/Sentry.xcodeproj/project.pbxproj
@@ -1465,6 +1465,7 @@
 		84A8891B28DBD28900C51DFD /* SentryDevice.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = SentryDevice.mm; sourceTree = "<group>"; };
 		84A8892028DBD8D600C51DFD /* SentryDeviceTests.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = SentryDeviceTests.mm; sourceTree = "<group>"; };
 		84E4F5692914F020004C7358 /* Brewfile */ = {isa = PBXFileReference; indentWidth = 2; lastKnownFileType = text; path = Brewfile; sourceTree = "<group>"; tabWidth = 2; };
+		84E9C1B4295511D800F7F702 /* SentrySpan+Private.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "SentrySpan+Private.h"; path = "include/SentrySpan+Private.h"; sourceTree = "<group>"; };
 		861265F72404EC1500C4AFDE /* NSArray+SentrySanitize.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "NSArray+SentrySanitize.h"; path = "include/NSArray+SentrySanitize.h"; sourceTree = "<group>"; };
 		861265F82404EC1500C4AFDE /* NSArray+SentrySanitize.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "NSArray+SentrySanitize.m"; sourceTree = "<group>"; };
 		8E0551DF26A7A63C00400526 /* TestProtocolClient.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TestProtocolClient.swift; sourceTree = "<group>"; };
@@ -2971,6 +2972,7 @@
 				8E4E7C7325DAAB49006AB9E2 /* SentrySpanProtocol.h */,
 				7B3B83712833832B0001FDEB /* SentrySpanOperations.h */,
 				8E4E7C6C25DAAAFE006AB9E2 /* SentrySpan.h */,
+				84E9C1B4295511D800F7F702 /* SentrySpan+Private.h */,
 				8EC3AE7925CA23B600E7591A /* SentrySpan.m */,
 				7BE912AA272162AF00E49E62 /* SentryNoOpSpan.h */,
 				7BE912AC272162D900E49E62 /* SentryNoOpSpan.m */,

diff --git a/Sentry.xcodeproj/xcshareddata/xcschemes/Sentry.xcscheme b/Sentry.xcodeproj/xcshareddata/xcschemes/Sentry.xcscheme
@@ -73,12 +73,6 @@
                <Test
                   Identifier = "SentryNetworkTrackerIntegrationTests/testGetRequest_SpanCreatedAndBaggageHeaderAdded_disabled()">
                </Test>
-               <Test
-                  Identifier = "SentryProfilerSwiftTests/testConcurrentSpansWithTimeout_disabled()">
-               </Test>
-               <Test
-                  Identifier = "SentryProfilerSwiftTests/testProfileTimeoutTimer_disabled()">
-               </Test>
                <Test
                   Identifier = "SentrySDKIntegrationTestsBase">
                </Test>

diff --git a/Sources/Sentry/SentryEvent.m b/Sources/Sentry/SentryEvent.m
@@ -1,10 +1,10 @@
-#import "SentryEvent.h"
 #import "NSDate+SentryExtras.h"
 #import "NSDictionary+SentrySanitize.h"
 #import "SentryBreadcrumb.h"
 #import "SentryClient.h"
 #import "SentryCurrentDate.h"
 #import "SentryDebugMeta.h"
+#import "SentryEvent+Private.h"
 #import "SentryException.h"
 #import "SentryId.h"
 #import "SentryLevelMapper.h"
@@ -17,21 +17,6 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-@interface
-SentryEvent ()
-
-@property (nonatomic) BOOL isCrashEvent;
-
-// We're storing serialized breadcrumbs to disk in JSON, and when we're reading them back (in
-// the case of OOM), we end up with the serialized breadcrumbs again. Instead of turning those
-// dictionaries into proper SentryBreadcrumb instances which then need to be serialized again in
-// SentryEvent, we use this serializedBreadcrumbs property to set the pre-serialized
-// breadcrumbs. It saves a LOT of work - especially turning an NSDictionary into a SentryBreadcrumb
-// is silly when we're just going to do the opposite right after.
-@property (nonatomic, strong) NSArray *serializedBreadcrumbs;
-
-@end
-
 @implementation SentryEvent
 
 - (instancetype)init