Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions src/Sentry/Platforms/Cocoa/BindableSentryOptions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ public class NativeOptions
public TimeSpan? AppHangTimeoutInterval { get; set; }
public TimeSpan? IdleTimeout { get; set; }
public bool? EnableAppHangTracking { get; set; }
public bool? EnableAppHangTrackingV2 { get; set; }
public bool? EnableAutoBreadcrumbTracking { get; set; }
public bool? EnableAutoPerformanceTracing { get; set; }
public bool? EnableCoreDataTracing { get; set; }
Expand All @@ -36,9 +35,6 @@ public void ApplyTo(SentryOptions.NativeOptions options)
options.AppHangTimeoutInterval = AppHangTimeoutInterval ?? options.AppHangTimeoutInterval;
options.IdleTimeout = IdleTimeout ?? options.IdleTimeout;
options.EnableAppHangTracking = EnableAppHangTracking ?? options.EnableAppHangTracking;
#pragma warning disable CS0618 // Type or member is obsolete
options.EnableAppHangTrackingV2 = EnableAppHangTrackingV2 ?? options.EnableAppHangTrackingV2;
#pragma warning restore CS0618 // Type or member is obsolete
options.EnableAutoBreadcrumbTracking = EnableAutoBreadcrumbTracking ?? options.EnableAutoBreadcrumbTracking;
options.EnableAutoPerformanceTracing = EnableAutoPerformanceTracing ?? options.EnableAutoPerformanceTracing;
options.EnableCoreDataTracing = EnableCoreDataTracing ?? options.EnableCoreDataTracing;
Comment thread
jamescrosswell marked this conversation as resolved.
Resolved
Expand Down
32 changes: 0 additions & 32 deletions src/Sentry/Platforms/Cocoa/SentryOptions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -68,25 +68,6 @@ internal NativeOptions(SentryOptions options)
/// </remarks>
public bool EnableAppHangTracking { get; set; } = false;

/// <summary>
/// IMPORTANT: App Hangs V2 is now the default.
/// <br/>
/// As of version 8.39.0-beta.1 of the sentry-cocoa SDK, you can enable AppHangsV2, which is available on iOS and tvOS.
/// Starting with version 9.0.0, App Hangs V2 is enabled by default.
/// The main difference is that AppHangsV2 differentiates between fully-blocking and non-fully-blocking
/// app hangs, which you might choose to ignore. A fully-blocking app hang is when the main thread is stuck
/// completely, and the app can't render a single frame.
/// A non-fully-blocking app hang is when the app appears stuck to the user, but can still render a few frames.
/// Fully-blocking app hangs are more actionable because the stacktrace shows the exact blocking location on
/// the main thread. Non-fully-blocking app hangs can have a stacktrace that doesn't highlight the exact
/// blocking location, since the main thread isn't completely blocked.
/// </summary>
/// <remarks>
/// See https://docs.sentry.io/platforms/apple/configuration/app-hangs/#app-hangs-v2
/// </remarks>
[Obsolete("App Hangs V2 is now the default. Use EnableAppHangTracking instead.")]
public bool EnableAppHangTrackingV2 { get; set; } = false;

/// <summary>
/// When enabled, the SDK adds breadcrumbs for various system events.
/// The default value is <c>true</c> (enabled).
Expand Down Expand Up @@ -254,19 +235,6 @@ internal NativeOptions(SentryOptions options)

internal List<string>? InAppIncludes { get; private set; }

/// <summary>
/// Add prefix to exclude from 'InApp' stacktrace list by the Cocoa SDK.
/// Note that this uses iOS module names, not .NET namespaces.
/// </summary>
/// <param name="prefix">The string used to filter the stacktrace to be excluded from InApp.</param>
/// <remarks>
/// https://docs.sentry.io/platforms/apple/configuration/options/#in-app-exclude
/// </remarks>
[Obsolete("This option had no effect and was removed.")]
public void AddInAppExclude(string prefix)
{
}

/// <summary>
/// Add prefix to include as in 'InApp' stacktrace by the Cocoa SDK.
/// Note that this uses iOS package names, not .NET namespaces.
Expand Down
4 changes: 1 addition & 3 deletions src/Sentry/Platforms/Cocoa/SentrySdk.cs
Original file line number Diff line number Diff line change
Expand Up @@ -135,9 +135,7 @@ private static void InitSentryCocoaSdk(SentryOptions options)
nativeOptions.AppHangTimeoutInterval = options.Native.AppHangTimeoutInterval.TotalSeconds;
nativeOptions.IdleTimeout = options.Native.IdleTimeout.TotalSeconds;
nativeOptions.Dist = options.Distribution;
#pragma warning disable CS0618 // Type or member is obsolete
nativeOptions.EnableAppHangTracking = options.Native.EnableAppHangTracking || options.Native.EnableAppHangTrackingV2;
#pragma warning restore CS0618 // Type or member is obsolete
nativeOptions.EnableAppHangTracking = options.Native.EnableAppHangTracking;
nativeOptions.EnableAutoBreadcrumbTracking = options.Native.EnableAutoBreadcrumbTracking;
nativeOptions.EnableAutoPerformanceTracing = options.Native.EnableAutoPerformanceTracing;
nativeOptions.EnableCoreDataTracing = options.Native.EnableCoreDataTracing;
Expand Down
Loading