feat: remove enableLogs option in v10 (#8769)

* feat: remove enableLogs option in v10

In SDK_V10, logs are always on. Gate enableLogs behind
#if !SDK_V10 and drop v10 call sites that set or test it.

Co-Authored-By: Noah Martin <noah.martin@sentry.io>

* style: fix clang-format pragma indent

---------

Co-authored-by: sentry-junior[bot] <264270552+sentry-junior[bot]@users.noreply.github.com>
Co-authored-by: Noah Martin <noah.martin@sentry.io>

Author: sentry-junior[bot]

CHANGELOG_V10.md

@@ -19,6 +19,7 @@
 
 - Enable MetricKit integration by default (#8716)
 - Enable logging by default (#8717)
+- Remove `enableLogs`; logs are always enabled in v10 (#8769)
 - Change the default diagnostic level to warning (#8732)
 - Enable `swiftAsyncStacktraces` by default (#8718)
 - Remove `sendDefaultPii`; use `dataCollection` to configure automatic data collection (#8253)

Samples/SentrySampleShared/SentrySampleShared/SentrySDKWrapper.swift

@@ -268,7 +268,9 @@ public struct SentrySDKWrapper {
 #endif // !os(macOS) && !os(tvOS) && !os(watchOS) && !os(visionOS)
 
         // Integration: Logs
+        #if !SDK_V10
         options.enableLogs = !SentrySDKOverrides.Logs.disable.boolValue
+        #endif // !SDK_V10
 
         // Integration: Metrics
         options.enableMetrics = SentrySDKOverrides.Metrics.enable.boolValue

Samples/iOS-SwiftUI-SPM/Sources/MainApp.swift

@@ -14,7 +14,9 @@ struct MainApp: App {
             options.enableTimeToFullDisplayTracing = true
             options.attachScreenshot = true
             options.enableMetricKit = true
+            #if !SDK_V10
             options.enableLogs = true
+            #endif // !SDK_V10
 
             #if targetEnvironment(simulator)
             options.enableSpotlight = true

Sources/Sentry/SentryClient.m

@@ -1165,10 +1165,12 @@ - (void)_swiftCaptureLog:(NSObject *)log withScope:(SentryScope *)scope
         return;
     }
 
+#if !SDK_V10
     if (self.options.enableLogs == NO) {
         SENTRY_LOG_DEBUG(@"Dropping log, because the option enableLogs is false.");
         return;
     }
+#endif // !SDK_V10
 
     if (![log isKindOfClass:[SentryLog class]]) {
         return;

Sources/Sentry/SentryDependencyContainerSwiftHelper.m

@@ -42,7 +42,11 @@ + (NSString *)environment:(SentryOptions *)options
 
 + (BOOL)enableLogs:(SentryOptions *)options
 {
+#if SDK_V10
+    return YES;
+#else
     return options.enableLogs;
+#endif // SDK_V10
 }
 
 + (NSArray<NSString *> *)enabledFeatures:(SentryOptions *)options

Sources/SentryObjC/Public/SentryObjCOptions.h

@@ -134,12 +134,15 @@ NS_ASSUME_NONNULL_BEGIN
  */
 @property (nonatomic, copy, nullable) SentryObjCSpan *_Nullable (^beforeSendSpan)(SentryObjCSpan *);
 
+#if !SDK_V10
 /**
  * When enabled, the SDK sends logs to Sentry. Logs can be captured using the
  * @c SentryObjCSDK.logger API, which provides structured logging with attributes.
  * @note Default value is @c NO.
+ * @note In v10 and later, logs are always enabled. Remove this option when upgrading.
  */
 @property (nonatomic) BOOL enableLogs;
+#endif // !SDK_V10
 
 /// This block can be used to modify the breadcrumb before it will be serialized and sent.
 @property (nonatomic, copy, nullable) SentryObjCBreadcrumb *_Nullable (^beforeBreadcrumb)

Sources/SentryObjCCompat/SentryObjCOptions.swift

@@ -122,10 +122,12 @@ import Foundation
         }
     }
 
+    #if !SDK_V10
     @objc public var enableLogs: Bool {
         get { wrapped.enableLogs }
         set { wrapped.enableLogs = newValue }
     }
+    #endif // !SDK_V10
 
     @objc public var beforeBreadcrumb: ((SentryObjCBreadcrumb) -> SentryObjCBreadcrumb?)? {
         didSet {

Sources/Swift/Options+Dictionary.swift

@@ -77,9 +77,11 @@ extension Options {
             self.maxBreadcrumbs = maxBreadcrumbs.uintValue
         }
 
+        #if !SDK_V10
         if let enableLogs = boolValue(dictionary["enableLogs"]) {
             self.enableLogs = enableLogs
         }
+        #endif // !SDK_V10
 
         if let enableMetrics = boolValue(dictionary["enableMetrics"]) {
             self.enableMetrics = enableMetrics

Sources/Swift/Options.swift

@@ -142,16 +142,13 @@
     /// drop the span.
     @objc public var beforeSendSpan: SentryBeforeSendSpanCallback?
 
+    #if !SDK_V10
     /// When enabled, the SDK sends logs to Sentry. Logs can be captured using the SentrySDK.logger
     /// API, which provides structured logging with attributes.
-    /// @note Default value is @c true in v10, @c false in earlier versions.
-    @objc public var enableLogs: Bool = {
-        #if SDK_V10
-        return true
-        #else
-        return false
-        #endif // SDK_V10
-    }()
+    /// @note Default value is @c false.
+    /// @note In v10 and later, logs are always enabled. Remove this option when upgrading.
+    @objc public var enableLogs: Bool = false
+    #endif // !SDK_V10
 
     /// Use this callback to drop or modify a log before the SDK sends it to Sentry. Return nil to
     /// drop the log.

Tests/SentryObjCTests/SentryObjCLoggerTests.m

@@ -14,7 +14,9 @@ - (void)setUp
     [SentryObjCSDK startWithConfigureOptions:^(SentryObjCOptions *options) {
         options.dsn = @"https://key@sentry.io/123";
         options.enableCrashHandler = NO;
+#if !SDK_V10
         options.enableLogs = YES;
+#endif // !SDK_V10
         options.beforeSendLog = ^SentryObjCLog *(SentryObjCLog *log) {
             weakSelf.capturedLog = log;
             return log;
@@ -858,7 +860,8 @@ - (void)testDebugWithFormat_withTrailingPercent_shouldNotCrash
     XCTAssertNil(self.capturedLog.attributes[@"sentry.message.template"]);
 }
 
-#pragma mark - logs disabled
+#if !SDK_V10
+#    pragma mark - logs disabled
 
 - (void)testLoggerMethod_whenLogsDisabled_shouldNotCrash
 {
@@ -875,5 +878,6 @@ - (void)testLoggerMethod_whenLogsDisabled_shouldNotCrash
     [SentryObjCSDK.logger debugWithFormat:@"User %@ count %d", @"test", 5];
     [SentryObjCSDK.logger debugWithAttributes:@{ @"k" : @"v" } format:@"Val: %f", 1.0];
 }
+#endif // !SDK_V10
 
 @end