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

@@ -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/Headers/SentryLaunchProfiling+Tests.h

@@ -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,

SentryTestUtils/Sources/TestClient.swift

@@ -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/Resources/Sentry.modulemap

@@ -2,8 +2,14 @@
 #if SENTRY_TARGET_PROFILING_SUPPORTED
 
 #    import "SentryClient.h"
+#    import "SentryDependencyContainerSwiftHelper.h"
+#    import "SentryHub.h"
+#    import "SentryInternalDefines.h"
+#    import "SentryLaunchProfiling.h"
 #    import "SentryLogC.h"
+#    import "SentryProfileConfiguration.h"
 #    import "SentryProfiler+Private.h"
+#    import "SentrySDK+Private.h"
 #    import "SentrySamplerDecision.h"
 #    import "SentrySwift.h"
 
@@ -158,6 +164,16 @@
 }
 
 #    if SENTRY_HAS_UIKIT
+BOOL
+sentry_appHangsDisabled(void)
+{
+    return [[[[SentrySDKInternal currentHub] getClient] options] isAppHangTrackingDisabled];
+}
+BOOL
+sentry_autoPerformanceTracingDisabled(void)
+{
+    return ![[[[SentrySDKInternal currentHub] getClient] options] enableAutoPerformanceTracing];
+}
 void
 sentry_startFramesTracker(void)
 {
@@ -183,3 +199,91 @@
 }
 #    endif // SENTRY_HAS_UIKIT
 #endif // SENTRY_TARGET_PROFILING_SUPPORTED
+
+void
+sentry_configureContinuousProfiling(SentryOptions *options)
+{
+    if (options.configureProfiling == nil) {
+        SENTRY_LOG_DEBUG(@"Continuous profiling V2 configuration not set by SDK consumer, nothing "
+                         @"to do here.");
+        return;
+    }
+
+    SentryProfileOptions *_Nonnull profilingOptions = sentry_getSentryProfileOptions();
+    options.profiling = profilingOptions;
+    options.configureProfiling(profilingOptions);
+
+    if (sentry_isTraceLifecycle(profilingOptions) && !options.isTracingEnabled) {
+        SENTRY_LOG_WARN(
+            @"Tracing must be enabled in order to configure profiling with trace lifecycle.");
+        return;
+    }
+
+    // if a launch profiler was started, sentry_profileConfiguration will have been set at that time
+    // with the hydrated options that were persisted from the previous SDK start, which are used to
+    // help determine when/how to stop the launch profile. otherwise, there won't yet be a
+    // SentryProfileConfiguration instance, so we'll instantiate one which will be used to access
+    // the profile session sample rate henceforth
+    if (sentry_profileConfiguration == nil) {
+        sentry_profileConfiguration =
+            [[SentryProfileConfiguration alloc] initWithProfileOptions:profilingOptions];
+    }
+
+    sentry_reevaluateSessionSampleRate();
+
+    SENTRY_LOG_DEBUG(@"Configured profiling options: <%@: {\n  lifecycle: %@\n  sessionSampleRate: "
+                     @"%.2f\n  profileAppStarts: %@\n}",
+        options.profiling, sentry_isTraceLifecycle(profilingOptions) ? @"trace" : @"manual",
+        sentry_sessionSampleRate(profilingOptions),
+        sentry_profileAppStarts(profilingOptions) ? @"YES" : @"NO");
+}
+
+void
+sentry_sdkInitProfilerTasks(SentryOptions *options, SentryHubInternal *hub)
+{
+    // get the configuration options from the last time the launch config was written; it may be
+    // different than the new options the SDK was just started with
+    SentryProfileConfiguration *configurationFromLaunch = sentry_profileConfiguration;
+
+    sentry_configureContinuousProfiling(options);
+
+    sentry_dispatchAsync(SentryDependencyContainerSwiftHelper.dispatchQueueWrapper, ^{
+        if (configurationFromLaunch.isProfilingThisLaunch) {
+            BOOL shouldStopAndTransmitLaunchProfile = YES;
+
+            BOOL profileIsContinuousV2 = configurationFromLaunch.profileOptions != nil;
+            BOOL v2LifecycleIsManual = profileIsContinuousV2
+                && !sentry_isTraceLifecycle(SENTRY_UNWRAP_NULLABLE(
+                    SentryProfileOptions, configurationFromLaunch.profileOptions));
+
+#if SENTRY_HAS_UIKIT
+            BOOL v2LifecycleIsTrace = profileIsContinuousV2
+                && sentry_isTraceLifecycle(SENTRY_UNWRAP_NULLABLE(
+                    SentryProfileOptions, configurationFromLaunch.profileOptions));
+            BOOL profileIsCorrelatedToTrace = !profileIsContinuousV2 || v2LifecycleIsTrace;
+            if (profileIsCorrelatedToTrace && configurationFromLaunch.waitForFullDisplay) {
+                SENTRY_LOG_DEBUG(
+                    @"Will wait to stop launch profile correlated to a trace until full "
+                    @"display reported.");
+                shouldStopAndTransmitLaunchProfile = NO;
+            }
+#endif // SENTRY_HAS_UIKIT
+
+            if (v2LifecycleIsManual) {
+                SENTRY_LOG_DEBUG(@"Continuous manual launch profiles aren't stopped on calls to "
+                                 @"SentrySDK.start, "
+                                 @"not stopping profile.");
+                shouldStopAndTransmitLaunchProfile = NO;
+            }
+
+            if (shouldStopAndTransmitLaunchProfile) {
+                SENTRY_LOG_DEBUG(
+                    @"Stopping launch profile in SentrySDK.start because there is no time "
+                    @"to display tracker to stop it.");
+                sentry_stopAndDiscardLaunchProfileTracer(hub);
+            }
+        }
+
+        sentry_configureLaunchProfilingForNextLaunch(options);
+    });
+}

Sources/Sentry/Profiling/SentryProfilingSwiftHelpers.m

@@ -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/SentryDefines.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;