Convert SentryEnvelopeHeader to Swift

Author: noahsmartin

Sentry.xcodeproj/project.pbxproj

@@ -460,8 +460,6 @@
 		7B8713B426415BAA006D6004 /* SentryAppStartTracker.m in Sources */ = {isa = PBXBuildFile; fileRef = 7B8713B326415BAA006D6004 /* SentryAppStartTracker.m */; };
 		7B87C916295ECFD700510C52 /* SentryMetricKitEventTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B87C915295ECFD700510C52 /* SentryMetricKitEventTests.swift */; };
 		7B883F49253D714C00879E62 /* SentryCrashUUIDConversion.c in Sources */ = {isa = PBXBuildFile; fileRef = 7B883F48253D714C00879E62 /* SentryCrashUUIDConversion.c */; };
-		7B88F2FE24BC5A4C00ADF90A /* SentrySdkInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = 7B88F2FD24BC5A4C00ADF90A /* SentrySdkInfo.h */; settings = {ATTRIBUTES = (Private, ); }; };
-		7B88F30024BC5A7D00ADF90A /* SentrySdkInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = 7B88F2FF24BC5A7D00ADF90A /* SentrySdkInfo.m */; };
 		7B88F30224BC5C6D00ADF90A /* SentrySdkInfoTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B88F30124BC5C6D00ADF90A /* SentrySdkInfoTests.swift */; };
 		7B88F30424BC8E6500ADF90A /* SentrySerializationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B88F30324BC8E6500ADF90A /* SentrySerializationTests.swift */; };
 		7B8CA85726DD4E6200DD872C /* SentryNetworkTrackerIntegrationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B8CA85626DD4E6200DD872C /* SentryNetworkTrackerIntegrationTests.swift */; };
@@ -1063,8 +1061,10 @@
 		FA67DD182DDBD4EA00896B02 /* UIImageHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = FA67DCED2DDBD4EA00896B02 /* UIImageHelper.swift */; };
 		FA67DD192DDBD4EA00896B02 /* SwizzleClassNameExclude.swift in Sources */ = {isa = PBXBuildFile; fileRef = FA67DCD52DDBD4EA00896B02 /* SwizzleClassNameExclude.swift */; };
 		FA8A36182DEAA1EB0058D883 /* SentryThread+Private.h in Headers */ = {isa = PBXBuildFile; fileRef = FA8A36172DEAA1EB0058D883 /* SentryThread+Private.h */; };
+		FA90FAA62E065A47008CAAE8 /* SentryEnvelopeHeader.swift in Sources */ = {isa = PBXBuildFile; fileRef = FA90FAA52E065A43008CAAE8 /* SentryEnvelopeHeader.swift */; };
 		FA90FAA82E06614E008CAAE8 /* SentryExtraPackages.swift in Sources */ = {isa = PBXBuildFile; fileRef = FA90FAA72E06614B008CAAE8 /* SentryExtraPackages.swift */; };
 		FA90FAF72E06E427008CAAE8 /* SentrySdkPackage.swift in Sources */ = {isa = PBXBuildFile; fileRef = FA90FAF62E06E427008CAAE8 /* SentrySdkPackage.swift */; };
+		FA90FAF92E06E667008CAAE8 /* SentrySdkInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = FA90FAF82E06E664008CAAE8 /* SentrySdkInfo.swift */; };
 		FAEC270E2DF3526000878871 /* SentryUserFeedback.swift in Sources */ = {isa = PBXBuildFile; fileRef = FAEC270D2DF3526000878871 /* SentryUserFeedback.swift */; };
 		FAEC273D2DF3933A00878871 /* NSData+Unzip.m in Sources */ = {isa = PBXBuildFile; fileRef = FAEC273C2DF3933200878871 /* NSData+Unzip.m */; };
 /* End PBXBuildFile section */
@@ -1631,8 +1631,6 @@
 		7B8713B326415BAA006D6004 /* SentryAppStartTracker.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SentryAppStartTracker.m; sourceTree = "<group>"; };
 		7B87C915295ECFD700510C52 /* SentryMetricKitEventTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SentryMetricKitEventTests.swift; sourceTree = "<group>"; };
 		7B883F48253D714C00879E62 /* SentryCrashUUIDConversion.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = SentryCrashUUIDConversion.c; sourceTree = "<group>"; };
-		7B88F2FD24BC5A4C00ADF90A /* SentrySdkInfo.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SentrySdkInfo.h; path = include/SentrySdkInfo.h; sourceTree = "<group>"; };
-		7B88F2FF24BC5A7D00ADF90A /* SentrySdkInfo.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SentrySdkInfo.m; sourceTree = "<group>"; };
 		7B88F30124BC5C6D00ADF90A /* SentrySdkInfoTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SentrySdkInfoTests.swift; sourceTree = "<group>"; };
 		7B88F30324BC8E6500ADF90A /* SentrySerializationTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SentrySerializationTests.swift; sourceTree = "<group>"; };
 		7B8CA85626DD4E6200DD872C /* SentryNetworkTrackerIntegrationTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SentryNetworkTrackerIntegrationTests.swift; sourceTree = "<group>"; };
@@ -2308,8 +2306,10 @@
 		FA67DCEF2DDBD4EA00896B02 /* URLSessionTaskHelper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = URLSessionTaskHelper.swift; sourceTree = "<group>"; };
 		FA67DCF22DDBD4EA00896B02 /* SwiftDescriptor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SwiftDescriptor.swift; sourceTree = "<group>"; };
 		FA8A36172DEAA1EB0058D883 /* SentryThread+Private.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "SentryThread+Private.h"; path = "include/SentryThread+Private.h"; sourceTree = "<group>"; };
+		FA90FAA52E065A43008CAAE8 /* SentryEnvelopeHeader.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SentryEnvelopeHeader.swift; sourceTree = "<group>"; };
 		FA90FAA72E06614B008CAAE8 /* SentryExtraPackages.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SentryExtraPackages.swift; sourceTree = "<group>"; };
 		FA90FAF62E06E427008CAAE8 /* SentrySdkPackage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SentrySdkPackage.swift; sourceTree = "<group>"; };
+		FA90FAF82E06E664008CAAE8 /* SentrySdkInfo.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SentrySdkInfo.swift; sourceTree = "<group>"; };
 		FAEC270D2DF3526000878871 /* SentryUserFeedback.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SentryUserFeedback.swift; sourceTree = "<group>"; };
 		FAEC273C2DF3933200878871 /* NSData+Unzip.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "NSData+Unzip.m"; sourceTree = "<group>"; };
 		FAEC273E2DF393E000878871 /* NSData+Unzip.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "NSData+Unzip.h"; sourceTree = "<group>"; };
@@ -2444,6 +2444,7 @@
 		621D9F2D2B9B030E003D94DE /* Helper */ = {
 			isa = PBXGroup;
 			children = (
+				FA90FAF82E06E664008CAAE8 /* SentrySdkInfo.swift */,
 				FA90FAF62E06E427008CAAE8 /* SentrySdkPackage.swift */,
 				84B0E0062CD963F9007FB332 /* SentryIconography.swift */,
 				621F61F02BEA073A005E654F /* SentryEnabledFeaturesBuilder.swift */,
@@ -2560,8 +2561,6 @@
 				7B4E24FB251C97B400060D68 /* SentrySession.h */,
 				15E0A8F12411A45A00F044E3 /* SentrySession.m */,
 				7BE1E32624F7AE08009D3AD0 /* SentrySession+Private.h */,
-				7B88F2FD24BC5A4C00ADF90A /* SentrySdkInfo.h */,
-				7B88F2FF24BC5A7D00ADF90A /* SentrySdkInfo.m */,
 				7BFC169A2524995700FF6266 /* SentryMessage.h */,
 				7BFC16A025249A9D00FF6266 /* SentryMessage.m */,
 				7B4E375425822C4500059C93 /* SentryAttachment.h */,
@@ -4238,6 +4237,7 @@
 		D856272A2A374A6800FB8062 /* Tools */ = {
 			isa = PBXGroup;
 			children = (
+				FA90FAA52E065A43008CAAE8 /* SentryEnvelopeHeader.swift */,
 				FA67DCC02DDBD4C800896B02 /* SentryLog+Configure.swift */,
 			);
 			path = Tools;
@@ -4625,7 +4625,6 @@
 				63FE717720DA4C1100CDBAE8 /* SentryCrashReportWriter.h in Headers */,
 				84DEE86B2B686BD400A7BC17 /* SentrySamplerDecision.h in Headers */,
 				7B4E23BE251A2BD500060D68 /* SentryCrashIntegrationSessionHandler.h in Headers */,
-				7B88F2FE24BC5A4C00ADF90A /* SentrySdkInfo.h in Headers */,
 				D4291A692DD61A3F00772088 /* SentryDispatchQueueProviderProtocol.h in Headers */,
 				7BCFBD672681C95000BC27D8 /* SentryScopeObserver.h in Headers */,
 				D81A346C291AECC7005A27A9 /* PrivateSentrySDKOnly.h in Headers */,
@@ -5287,6 +5286,7 @@
 				15E0A8ED240F2CB000F044E3 /* SentrySerialization.m in Sources */,
 				7BC85235245880AE005A70F0 /* SentryDataCategoryMapper.m in Sources */,
 				7B7A30C824B48389005A4C6E /* SentryCrashWrapper.m in Sources */,
+				FA90FAA62E065A47008CAAE8 /* SentryEnvelopeHeader.swift in Sources */,
 				D8ACE3C92762187200F5A213 /* SentryFileIOTrackingIntegration.m in Sources */,
 				620078742D38F0DF0022CB67 /* SentryCodable.swift in Sources */,
 				F45243892DE65968003E8F50 /* ExceptionCatcher.m in Sources */,
@@ -5299,7 +5299,6 @@
 				7BA0C0482805600A003E0326 /* SentryTransportAdapter.m in Sources */,
 				63FE712920DA4C1000CDBAE8 /* SentryCrashCPU_arm.c in Sources */,
 				03F84D3427DD4191008FE43F /* SentryThreadMetadataCache.cpp in Sources */,
-				7B88F30024BC5A7D00ADF90A /* SentrySdkInfo.m in Sources */,
 				62862B1E2B1DDC35009B16E3 /* SentryDelayedFrame.m in Sources */,
 				84AC61D729F75A98009EEF61 /* SentryDispatchFactory.m in Sources */,
 				15360CD62432832400112302 /* SentryAutoSessionTrackingIntegration.m in Sources */,
@@ -5580,6 +5579,7 @@
 				63FE714520DA4C1100CDBAE8 /* SentryCrashObjC.c in Sources */,
 				63FE710520DA4C1000CDBAE8 /* SentryAsyncSafeLog.c in Sources */,
 				62E300942D5202890037AA3F /* SentryExceptionCodable.swift in Sources */,
+				FA90FAF92E06E667008CAAE8 /* SentrySdkInfo.swift in Sources */,
 				0A2D8D5B289815C0008720F6 /* SentryBaseIntegration.m in Sources */,
 				639FCF991EBC7B9700778193 /* SentryEvent.m in Sources */,
 				D820CDB72BB1895F00BA339D /* SentrySessionReplayIntegration.m in Sources */,

Sources/Resources/Sentry.modulemap

@@ -26,7 +26,6 @@ framework module Sentry {
         header "SentrySessionReplayIntegration.h"
         header "SentrySessionReplayIntegration-Hybrid.h"
 
-        header "SentrySdkInfo.h"
         header "SentryInternalSerializable.h"
 
         export *

Sources/Sentry/SentryClient.m

@@ -33,7 +33,6 @@
 #import "SentryRandom.h"
 #import "SentrySDK+Private.h"
 #import "SentryScope+Private.h"
-#import "SentrySdkInfo.h"
 #import "SentrySerialization.h"
 #import "SentrySession.h"
 #import "SentryStacktraceBuilder.h"

Sources/Sentry/SentryEnvelope.m

@@ -9,51 +9,13 @@
 #import "SentryLog.h"
 #import "SentryMessage.h"
 #import "SentryMsgPackSerializer.h"
-#import "SentrySdkInfo.h"
 #import "SentrySerialization.h"
 #import "SentrySession.h"
 #import "SentrySwift.h"
 #import "SentryTransaction.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
-@implementation SentryEnvelopeHeader
-
-// id can be null if no event in the envelope or attachment related to event
-- (instancetype)initWithId:(SentryId *_Nullable)eventId
-{
-    self = [self initWithId:eventId traceContext:nil];
-    return self;
-}
-
-- (instancetype)initWithId:(nullable SentryId *)eventId
-              traceContext:(nullable SentryTraceContext *)traceContext
-{
-    SentrySdkInfo *sdkInfo = [SentrySdkInfo global];
-    self = [self initWithId:eventId sdkInfo:sdkInfo traceContext:traceContext];
-    return self;
-}
-
-- (instancetype)initWithId:(nullable SentryId *)eventId
-                   sdkInfo:(nullable SentrySdkInfo *)sdkInfo
-              traceContext:(nullable SentryTraceContext *)traceContext
-{
-    if (self = [super init]) {
-        _eventId = eventId;
-        _sdkInfo = sdkInfo;
-        _traceContext = traceContext;
-    }
-
-    return self;
-}
-
-+ (instancetype)empty
-{
-    return [[SentryEnvelopeHeader alloc] initWithId:nil traceContext:nil];
-}
-
-@end
-
 @implementation SentryEnvelopeItem
 
 - (instancetype)initWithHeader:(SentryEnvelopeItemHeader *)header data:(NSData *)data

Sources/Sentry/SentrySdkInfo.m

@@ -7,7 +7,6 @@
 #import "SentryError.h"
 #import "SentryLevelMapper.h"
 #import "SentryLog.h"
-#import "SentrySdkInfo.h"
 #import "SentrySession.h"
 #import "SentrySwift.h"
 #import "SentryTraceContext.h"

Sources/Sentry/SentrySerialization.m

@@ -4,18 +4,6 @@
 #    import "PrivatesHeader.h"
 #endif
 
-#if COCOAPODS
-@class SentrySdkInfo;
-#else
-
-#    if __has_include(<Sentry/SentrySdkInfo.h>)
-#        import <Sentry/SentrySdkInfo.h>
-#    else
-#        import "SentrySdkInfo.h"
-#    endif
-
-#endif
-
 @class SentryAttachment;
 @class SentryEnvelopeItemHeader;
 @class SentryEvent;
@@ -24,68 +12,10 @@
 @class SentrySession;
 @class SentryTraceContext;
 @class SentryUserFeedback;
+@class SentryEnvelopeHeader;
 
 NS_ASSUME_NONNULL_BEGIN
 
-@interface SentryEnvelopeHeader : NSObject
-SENTRY_NO_INIT
-
-/**
- * Initializes an @c SentryEnvelopeHeader object with the specified eventId.
- * @note Sets the @c sdkInfo from @c SentryMeta.
- * @param eventId The identifier of the event. Can be nil if no event in the envelope or attachment
- * related to event.
- */
-- (instancetype)initWithId:(SentryId *_Nullable)eventId;
-
-/**
- * Initializes a @c SentryEnvelopeHeader object with the specified @c eventId and @c traceContext.
- * @param eventId The identifier of the event. Can be @c nil if no event in the envelope or
- * attachment related to event.
- * @param traceContext Current trace state.
- */
-- (instancetype)initWithId:(nullable SentryId *)eventId
-              traceContext:(nullable SentryTraceContext *)traceContext;
-
-/**
- * Initializes a @c SentryEnvelopeHeader object with the specified @c eventId, @c skdInfo and
- * @c traceContext. It is recommended to use @c initWithId:traceContext: because it sets the
- * @c sdkInfo for you.
- * @param eventId The identifier of the event. Can be @c nil if no event in the envelope or
- * attachment related to event.
- * @param sdkInfo Describes the Sentry SDK. Can be @c nil for backwards compatibility. New
- * instances should always provide a version.
- * @param traceContext Current trace state.
- */
-- (instancetype)initWithId:(nullable SentryId *)eventId
-                   sdkInfo:(nullable SentrySdkInfo *)sdkInfo
-              traceContext:(nullable SentryTraceContext *)traceContext NS_DESIGNATED_INITIALIZER;
-
-/**
- * The event identifier, if available.
- * An event id exist if the envelope contains an event of items within it are related. i.e
- * Attachments
- */
-@property (nullable, nonatomic, readonly, copy) SentryId *eventId;
-
-@property (nullable, nonatomic, readonly, copy) SentrySdkInfo *sdkInfo;
-
-@property (nullable, nonatomic, readonly, copy) SentryTraceContext *traceContext;
-
-/**
- * The timestamp when the event was sent from the SDK as string in RFC 3339 format. Used
- * for clock drift correction of the event timestamp. The time zone must be UTC.
- *
- * The timestamp should be generated as close as possible to the transmision of the event,
- * so that the delay between sending the envelope and receiving it on the server-side is
- * minimized.
- */
-@property (nullable, nonatomic, copy) NSDate *sentAt;
-
-+ (instancetype)empty;
-
-@end
-
 @interface SentryEnvelopeItem : NSObject
 SENTRY_NO_INIT