Fix

Author: noahsmartin

Samples/iOS-Swift/iOS-Swift/Profiling/ProfilingViewController.swift

@@ -1,4 +1,4 @@
-import Sentry
+@_spi(Private) import Sentry
 import SentrySampleShared
 import UIKit
 

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

@@ -2,7 +2,7 @@
 #import <Sentry/SentryScope.h>
 #import <UIKit/UIKit.h>
 
-@class SentryOptionsInternal;
+@class SentryOptions;
 
 NS_ASSUME_NONNULL_BEGIN
 

Samples/iOS-Swift/iOS-Swift/Tools/iOS-Swift-Bridging-Header.h

@@ -3,4 +3,3 @@
 #import "SentryExposure.h"
 #import <Sentry/PrivateSentrySDKOnly.h>
 #import <Sentry/SentryDsn+Private.h>
-#import <Sentry/SentryOptionsInternal+Private.h>

Sentry.xcodeproj/project.pbxproj

@@ -1041,17 +1041,13 @@
 		FA1841832E4B457F005DEDC7 /* SentryApplication.swift in Sources */ = {isa = PBXBuildFile; fileRef = FA18417D2E4B457B005DEDC7 /* SentryApplication.swift */; };
 		FA21A2EF2E60E9CB00E7EADB /* EnvelopeComparison.swift in Sources */ = {isa = PBXBuildFile; fileRef = FA21A2E92E60E9C700E7EADB /* EnvelopeComparison.swift */; };
 		FA21F0B42E4A2A80008B4E5A /* SentryAppState.swift in Sources */ = {isa = PBXBuildFile; fileRef = FA4C32972DF7513F001D7B01 /* SentryAppState.swift */; };
+		FA24E02A2EBBF6F900EFD92E /* SentryOptionsObjC.h in Headers */ = {isa = PBXBuildFile; fileRef = FA24E0292EBBF6F500EFD92E /* SentryOptionsObjC.h */; };
 		FA27EBDC2EB639D400F2ECF7 /* SentryId.h in Headers */ = {isa = PBXBuildFile; fileRef = FA27EBDB2EB639D100F2ECF7 /* SentryId.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		FA27EBDE2EB639D900F2ECF7 /* SentryId.m in Sources */ = {isa = PBXBuildFile; fileRef = FA27EBDD2EB639D700F2ECF7 /* SentryId.m */; };
 		FA27EBF52EB82FAD00F2ECF7 /* FileIOTrackerTestHelpers.swift in Sources */ = {isa = PBXBuildFile; fileRef = FA27EBEF2EB82FA800F2ECF7 /* FileIOTrackerTestHelpers.swift */; };
-		FA27ECA12EBA325A00F2ECF7 /* SentryTraceContext+Private.h in Headers */ = {isa = PBXBuildFile; fileRef = FA27EC9B2EBA325400F2ECF7 /* SentryTraceContext+Private.h */; };
 		FA27EC0E2EB922F200F2ECF7 /* SentryOptionsInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = FA27EC0D2EB922F200F2ECF7 /* SentryOptionsInternal.h */; settings = {ATTRIBUTES = (Private, ); }; };
-		FA27EC102EB922F900F2ECF7 /* SentryOptionsInternal+Private.h in Headers */ = {isa = PBXBuildFile; fileRef = FA27EC0F2EB922F900F2ECF7 /* SentryOptionsInternal+Private.h */; settings = {ATTRIBUTES = (Private, ); }; };
-		FA27EC122EB9231D00F2ECF7 /* SentryOptionsConverter.h in Headers */ = {isa = PBXBuildFile; fileRef = FA27EC112EB9231D00F2ECF7 /* SentryOptionsConverter.h */; };
-		FA27EC142EB9232600F2ECF7 /* SentryOptionsConverter.m in Sources */ = {isa = PBXBuildFile; fileRef = FA27EC132EB9232600F2ECF7 /* SentryOptionsConverter.m */; };
 		FA27EC162EB9236000F2ECF7 /* Options.swift in Sources */ = {isa = PBXBuildFile; fileRef = FA27EC152EB9236000F2ECF7 /* Options.swift */; };
-		FA27EC182EB9236400F2ECF7 /* Options+Internal.swift in Sources */ = {isa = PBXBuildFile; fileRef = FA27EC172EB9236400F2ECF7 /* Options+Internal.swift */; };
-		FA27EC222EB9466D00F2ECF7 /* OptionsUtils.swift in Sources */ = {isa = PBXBuildFile; fileRef = FA27EC1C2EB9466900F2ECF7 /* OptionsUtils.swift */; };
+		FA27ECA12EBA325A00F2ECF7 /* SentryTraceContext+Private.h in Headers */ = {isa = PBXBuildFile; fileRef = FA27EC9B2EBA325400F2ECF7 /* SentryTraceContext+Private.h */; };
 		FA34C1A32E692A5000BC52AA /* SentryEnvelopeItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = FA34C1A22E692A5000BC52AA /* SentryEnvelopeItem.swift */; };
 		FA3734842E0F086C0091EF24 /* SentryDependencyContainerSwiftHelper.h in Headers */ = {isa = PBXBuildFile; fileRef = FA3734832E0F07A20091EF24 /* SentryDependencyContainerSwiftHelper.h */; };
 		FA3734862E0F09320091EF24 /* SentryDependencyContainerSwiftHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = FA3734852E0F092F0091EF24 /* SentryDependencyContainerSwiftHelper.m */; };
@@ -2471,17 +2467,13 @@
 		FA034AC72DD3DB4900FE3107 /* SentryIntegrationProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SentryIntegrationProtocol.h; path = include/HybridPublic/SentryIntegrationProtocol.h; sourceTree = "<group>"; };
 		FA18417D2E4B457B005DEDC7 /* SentryApplication.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SentryApplication.swift; sourceTree = "<group>"; };
 		FA21A2E92E60E9C700E7EADB /* EnvelopeComparison.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EnvelopeComparison.swift; sourceTree = "<group>"; };
+		FA24E0292EBBF6F500EFD92E /* SentryOptionsObjC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SentryOptionsObjC.h; path = include/SentryOptionsObjC.h; sourceTree = "<group>"; };
 		FA27EBDB2EB639D100F2ECF7 /* SentryId.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SentryId.h; path = Public/SentryId.h; sourceTree = "<group>"; };
 		FA27EBDD2EB639D700F2ECF7 /* SentryId.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SentryId.m; sourceTree = "<group>"; };
 		FA27EBEF2EB82FA800F2ECF7 /* FileIOTrackerTestHelpers.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FileIOTrackerTestHelpers.swift; sourceTree = "<group>"; };
-		FA27EC9B2EBA325400F2ECF7 /* SentryTraceContext+Private.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "SentryTraceContext+Private.h"; path = "include/SentryTraceContext+Private.h"; sourceTree = "<group>"; };
-		FA27EC0D2EB922F200F2ECF7 /* SentryOptionsInternal.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SentryOptionsInternal.h; path = include/SentryOptionsInternal.h; sourceTree = "<group>"; };
-		FA27EC0F2EB922F900F2ECF7 /* SentryOptionsInternal+Private.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "SentryOptionsInternal+Private.h"; path = "include/SentryOptionsInternal+Private.h"; sourceTree = "<group>"; };
-		FA27EC112EB9231D00F2ECF7 /* SentryOptionsConverter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SentryOptionsConverter.h; path = include/SentryOptionsConverter.h; sourceTree = "<group>"; };
-		FA27EC132EB9232600F2ECF7 /* SentryOptionsConverter.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SentryOptionsConverter.m; sourceTree = "<group>"; };
+		FA27EC0D2EB922F200F2ECF7 /* SentryOptionsInternal.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SentryOptionsInternal.h; path = include/HybridPublic/SentryOptionsInternal.h; sourceTree = "<group>"; };
 		FA27EC152EB9236000F2ECF7 /* Options.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Options.swift; sourceTree = "<group>"; };
-		FA27EC172EB9236400F2ECF7 /* Options+Internal.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Options+Internal.swift"; sourceTree = "<group>"; };
-		FA27EC1C2EB9466900F2ECF7 /* OptionsUtils.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OptionsUtils.swift; sourceTree = "<group>"; };
+		FA27EC9B2EBA325400F2ECF7 /* SentryTraceContext+Private.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "SentryTraceContext+Private.h"; path = "include/SentryTraceContext+Private.h"; sourceTree = "<group>"; };
 		FA34C1A22E692A5000BC52AA /* SentryEnvelopeItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SentryEnvelopeItem.swift; sourceTree = "<group>"; };
 		FA3734832E0F07A20091EF24 /* SentryDependencyContainerSwiftHelper.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SentryDependencyContainerSwiftHelper.h; path = include/SentryDependencyContainerSwiftHelper.h; sourceTree = "<group>"; };
 		FA3734852E0F092F0091EF24 /* SentryDependencyContainerSwiftHelper.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SentryDependencyContainerSwiftHelper.m; sourceTree = "<group>"; };
@@ -3036,6 +3028,7 @@
 				63AA769B1EB9C57A00D153DE /* SentryError.h */,
 				63AA769C1EB9C57A00D153DE /* SentryError.mm */,
 				636085111ED47BE600E8599E /* SentryFileManagerHelper.h */,
+				FA24E0292EBBF6F500EFD92E /* SentryOptionsObjC.h */,
 				FA3734832E0F07A20091EF24 /* SentryDependencyContainerSwiftHelper.h */,
 				FA3734852E0F092F0091EF24 /* SentryDependencyContainerSwiftHelper.m */,
 				636085121ED47BE600E8599E /* SentryFileManagerHelper.m */,
@@ -3204,10 +3197,7 @@
 				7B610D5E2512390E00B0B5D9 /* SentrySDK+Private.h */,
 				FA6555132E30181B009917BC /* SentrySDKInternal.h */,
 				FA6555152E30182B009917BC /* SentrySDKInternal.m */,
-				FA27EC132EB9232600F2ECF7 /* SentryOptionsConverter.m */,
-				FA27EC112EB9231D00F2ECF7 /* SentryOptionsConverter.h */,
 				FA27EC0D2EB922F200F2ECF7 /* SentryOptionsInternal.h */,
-				FA27EC0F2EB922F900F2ECF7 /* SentryOptionsInternal+Private.h */,
 				FACEED122E3179A10007B4AC /* SentryOptionsInternal.m */,
 				7D9B079F23D1E89800C5FC8E /* SentryMeta.h */,
 				7D082B8023C628780029866B /* SentryMeta.m */,
@@ -3988,7 +3978,6 @@
 		7BF536D224BEF240004FA6A2 /* TestUtils */ = {
 			isa = PBXGroup;
 			children = (
-				FA27EC1C2EB9466900F2ECF7 /* OptionsUtils.swift */,
 				62885DA629E946B100554F38 /* TestConncurrentModifications.swift */,
 				7BF536D324BEF255004FA6A2 /* SentryAssertions.swift */,
 				7B6D98EC24C703F8005502FA /* Async.swift */,
@@ -4587,7 +4576,6 @@
 				FA6251FE2EB52DD700BFC967 /* SentryHub.swift */,
 				FA6252052EB5489B00BFC967 /* SentryClient.swift */,
 				FA27EC152EB9236000F2ECF7 /* Options.swift */,
-				FA27EC172EB9236400F2ECF7 /* Options+Internal.swift */,
 			);
 			path = Swift;
 			sourceTree = "<group>";
@@ -5233,7 +5221,6 @@
 				0A2D8DA8289BC905008720F6 /* SentryViewHierarchyProviderHelper.h in Headers */,
 				8EAE980C261E9F530073B6B3 /* SentryDefaultUIViewControllerPerformanceTracker.h in Headers */,
 				63FE717D20DA4C1100CDBAE8 /* SentryCrashCachedData.h in Headers */,
-				FA27EC122EB9231D00F2ECF7 /* SentryOptionsConverter.h in Headers */,
 				03BCC38A27E1BF49003232C7 /* SentryTime.h in Headers */,
 				925824C22CB5897700C9B20B /* SentrySessionReplayIntegration-Hybrid.h in Headers */,
 				63FE70CD20DA4C1000CDBAE8 /* SentryCrashDoctor.h in Headers */,
@@ -5401,7 +5388,6 @@
 				6344DDB41EC309E000D9160D /* SentryCrashReportSink.h in Headers */,
 				D8C66A362A77B1F70015696A /* SentryPropagationContext.h in Headers */,
 				D867063F27C3BC2400048851 /* SentryCoreDataTracker.h in Headers */,
-				FA27EC102EB922F900F2ECF7 /* SentryOptionsInternal+Private.h in Headers */,
 				7B6C5EDA264E8D860010D138 /* SentryFramesTrackingIntegration.h in Headers */,
 				7B0DC72F288698F70039995F /* NSMutableDictionary+Sentry.h in Headers */,
 				63FE713920DA4C1100CDBAE8 /* SentryCrashMach.h in Headers */,
@@ -5439,6 +5425,7 @@
 				63FE715520DA4C1100CDBAE8 /* SentryCrashStackCursor_MachineContext.h in Headers */,
 				62E081A929ED4260000F69FC /* SentryBreadcrumbDelegate.h in Headers */,
 				15360CF02433A16D00112302 /* SentryInstallation.h in Headers */,
+				FA24E02A2EBBF6F900EFD92E /* SentryOptionsObjC.h in Headers */,
 				63FE714720DA4C1100CDBAE8 /* SentryCrashMachineContext.h in Headers */,
 				7BC63F0828081242009D9E37 /* SentrySwizzleWrapperHelper.h in Headers */,
 				638DC9A01EBC6B6400A66E41 /* SentryRequestOperation.h in Headers */,
@@ -6135,7 +6122,6 @@
 				FA67DD012DDBD4EA00896B02 /* SentryMXCallStackTree.swift in Sources */,
 				FAAB29F12E3D252300ACD577 /* SentrySession.swift in Sources */,
 				FA6252042EB52DD900BFC967 /* SentryHub.swift in Sources */,
-				FA27EC142EB9232600F2ECF7 /* SentryOptionsConverter.m in Sources */,
 				FA67DD022DDBD4EA00896B02 /* SentryViewScreenshotProvider.swift in Sources */,
 				FA67DD032DDBD4EA00896B02 /* SentryTransactionNameSource.swift in Sources */,
 				FA67DD042DDBD4EA00896B02 /* SwiftDescriptor.swift in Sources */,
@@ -6278,7 +6264,6 @@
 				63FE711B20DA4C1000CDBAE8 /* SentryCrashString.c in Sources */,
 				7B14089824878F950035403D /* SentryCrashStackEntryMapper.m in Sources */,
 				D8BC28C82BFF5EBB0054DA4D /* SentryTouchTracker.swift in Sources */,
-				FA27EC182EB9236400F2ECF7 /* Options+Internal.swift in Sources */,
 				63FE711720DA4C1000CDBAE8 /* SentryCrashStackCursor_Backtrace.c in Sources */,
 				FA3A42722E1C5F9B00A08C39 /* SentryNSNotificationCenterWrapper.swift in Sources */,
 				63FE70CB20DA4C1000CDBAE8 /* SentryCrashReportFixer.c in Sources */,
@@ -6633,7 +6618,6 @@
 				FA8AFCFA2E844AB6007A0E18 /* SentryThreadsafeApplicationTests.swift in Sources */,
 				D884A20527C80F6300074664 /* SentryCoreDataTrackerTest.swift in Sources */,
 				8E70B10125CB8695002B3155 /* SentrySpanIdTests.swift in Sources */,
-				FA27EC222EB9466D00F2ECF7 /* OptionsUtils.swift in Sources */,
 				62E2119A2DAE99FC007D7262 /* SentryAsyncSafeLog.m in Sources */,
 				F44D2B602E6B829F00FF31FA /* SentryScreenFramesTests.swift in Sources */,
 				84EB21962BF01CEA00EDDA28 /* SentryCrashInstallationTests.swift in Sources */,

SentryTestUtils/Headers/SentryLaunchProfiling+Tests.h

@@ -5,7 +5,7 @@
 #    import "SentryDefines.h"
 #    import "SentryProfiler+Private.h"
 
-@class SentryOptionsInternal;
+@class SentryOptions;
 @class SentrySamplerDecision;
 
 NS_ASSUME_NONNULL_BEGIN
@@ -15,7 +15,7 @@ NS_ASSUME_NONNULL_BEGIN
  * expressible in Swift. This wraps it and only returns the `BOOL shouldProfile` value in the
  * struct.
  */
-BOOL sentry_willProfileNextLaunch(SentryOptionsInternal *options);
+BOOL sentry_willProfileNextLaunch(SentryOptions *options);
 
 /**
  * Contains the logic to start a launch profile. Exposed separately from @c

SentryTestUtils/Sources/TestClient.swift

@@ -1,12 +1,12 @@
 import _SentryPrivate
 import Foundation
-@_spi(Private) @testable import Sentry
+@_spi(Private) import Sentry
 
 public class TestClient: SentryClientInternal {
-    public override init?(options: SentryOptionsInternal) {
+    public override init?(options: NSObject) {
         super.init(
             options: options,
-            transportAdapter: TestTransportAdapter(transports: [TestTransport()], options: options),
+            transportAdapter: TestTransportAdapter(transports: [TestTransport()], options: options as! Options),
             fileManager: try! TestFileManager(
                 options: options.toOptions(),
                 dateProvider: TestCurrentDateProvider(),
@@ -22,7 +22,7 @@ public class TestClient: SentryClientInternal {
 
     // Without this override we get a fatal error: use of unimplemented initializer
     // see https://stackoverflow.com/questions/28187261/ios-swift-fatal-error-use-of-unimplemented-initializer-init
-    @_spi(Private) public override init(options: SentryOptionsInternal, transportAdapter: SentryTransportAdapter, fileManager: SentryFileManager, threadInspector: SentryDefaultThreadInspector, debugImageProvider: SentryDebugImageProvider, random: SentryRandomProtocol, locale: Locale, timezone: TimeZone) {
+    @_spi(Private) public override init(options: NSObject, transportAdapter: SentryTransportAdapter, fileManager: SentryFileManager, threadInspector: SentryDefaultThreadInspector, debugImageProvider: SentryDebugImageProvider, random: SentryRandomProtocol, locale: Locale, timezone: TimeZone) {
         super.init(
             options: options,
             transportAdapter: transportAdapter,

Sources/Resources/Sentry.modulemap

@@ -11,6 +11,7 @@ framework module Sentry {
         header "SentryAppStartMeasurement.h"
         header "SentryBreadcrumb+Private.h"
         header "SentryFormatter.h"
+        header "SentryOptionsInternal.h"
         header "SentrySwizzle.h"
         header "SentryUser+Private.h"
 

Sources/Sentry/Public/SentryDefines.h

@@ -102,12 +102,6 @@ typedef SentryEvent *_Nullable (^SentryBeforeSendEventCallback)(SentryEvent *_No
  */
 typedef id<SentrySpan> _Nullable (^SentryBeforeSendSpanCallback)(id<SentrySpan> _Nonnull span);
 
-/**
- * Use this block to drop or modify a log before the SDK sends it to Sentry. Return @c nil to drop
- * the log.
- */
-typedef SentryLog *_Nullable (^SentryBeforeSendLogCallback)(SentryLog *_Nonnull log);
-
 /**
  * Block can be used to decide if the SDK should capture a screenshot or not. Return @c true if the
  * SDK should capture a screenshot, return @c false if not. This callback doesn't work for crashes.

Sources/Sentry/Public/SentryDsn.h

@@ -6,7 +6,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 @property (nonatomic, strong, readonly) NSURL *url;
 
-- (_Nullable instancetype)initWithString:(NSString *)dsnString
+- (_Nullable instancetype)initWithString:(NSString *_Nullable)dsnString
                         didFailWithError:(NSError *_Nullable *_Nullable)error;
 
 - (NSURL *)getEnvelopeEndpoint;

Sources/Sentry/Public/SentryTraceContext.h

@@ -11,6 +11,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 @class SentryBaggage;
 @class SentryId;
+@class SentryOptions;
 @class SentryScope;
 @class SentryTracer;
 @class SentryUser;