Merge e9d6a1e into 707c222

Author: denrase

CHANGELOG.md

@@ -24,6 +24,7 @@
 
 - Add SentryDistribution as Swift Package Manager target (#6149)
 - Add option `enablePropagateTraceparent` to support OTel/W3C trace propagation (#6356)
+- Structured Logs: Add `captureLog` to `Hub` and `Client` (#6518)
 
 ### Fixes
 

Sentry.xcodeproj/project.pbxproj

@@ -734,7 +734,6 @@
 		92D957732E05A44600E20E66 /* SentryAsyncLog.m in Sources */ = {isa = PBXBuildFile; fileRef = 92D957722E05A44600E20E66 /* SentryAsyncLog.m */; };
 		92D957772E05A4F300E20E66 /* SentryAsyncLog.h in Headers */ = {isa = PBXBuildFile; fileRef = 92D957762E05A4F300E20E66 /* SentryAsyncLog.h */; };
 		92E5F3D62CDBB3BF00B7AD98 /* SentrySampling.h in Headers */ = {isa = PBXBuildFile; fileRef = 8E8C57A525EEFC42001CEEFA /* SentrySampling.h */; };
-		92EC54CE2E1EB54B00A10AC2 /* SentryClient+Logs.h in Headers */ = {isa = PBXBuildFile; fileRef = 92EC54CD2E1EB54B00A10AC2 /* SentryClient+Logs.h */; };
 		92ECD7202E05A7DF0063EC10 /* SentryLogC.h in Headers */ = {isa = PBXBuildFile; fileRef = D8AE48B12C5786AA0092A2A6 /* SentryLogC.h */; settings = {ATTRIBUTES = (Private, ); }; };
 		92ECD73C2E05ACE00063EC10 /* SentryLog.swift in Sources */ = {isa = PBXBuildFile; fileRef = 92ECD73B2E05ACDE0063EC10 /* SentryLog.swift */; };
 		92ECD73E2E05AD320063EC10 /* SentryLogLevel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 92ECD73D2E05AD2B0063EC10 /* SentryLogLevel.swift */; };
@@ -2095,7 +2094,6 @@
 		92B6BDAC2E05B9F700D538B3 /* SentryLogTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SentryLogTests.swift; sourceTree = "<group>"; };
 		92D957722E05A44600E20E66 /* SentryAsyncLog.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SentryAsyncLog.m; sourceTree = "<group>"; };
 		92D957762E05A4F300E20E66 /* SentryAsyncLog.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SentryAsyncLog.h; path = include/SentryAsyncLog.h; sourceTree = "<group>"; };
-		92EC54CD2E1EB54B00A10AC2 /* SentryClient+Logs.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "SentryClient+Logs.h"; path = "include/SentryClient+Logs.h"; sourceTree = "<group>"; };
 		92ECD73B2E05ACDE0063EC10 /* SentryLog.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SentryLog.swift; sourceTree = "<group>"; };
 		92ECD73D2E05AD2B0063EC10 /* SentryLogLevel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SentryLogLevel.swift; sourceTree = "<group>"; };
 		92ECD73F2E05AD500063EC10 /* SentryLogAttribute.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SentryLogAttribute.swift; sourceTree = "<group>"; };
@@ -3117,7 +3115,6 @@
 				63AA76941EB9C1C200D153DE /* SentryClient.h */,
 				63AA75ED1EB8B3C400D153DE /* SentryClient.m */,
 				7B85DC1C24EFAFCD007D01D2 /* SentryClient+Private.h */,
-				92EC54CD2E1EB54B00A10AC2 /* SentryClient+Logs.h */,
 				7B610D5E2512390E00B0B5D9 /* SentrySDK+Private.h */,
 				FA6555132E30181B009917BC /* SentrySDKInternal.h */,
 				FA6555152E30182B009917BC /* SentrySDKInternal.m */,
@@ -5153,7 +5150,6 @@
 				8E7C98312693E1CC00E6336C /* SentryTraceHeader.h in Headers */,
 				62C316812B1F2E93000D7031 /* SentryDelayedFramesTracker.h in Headers */,
 				92D957772E05A4F300E20E66 /* SentryAsyncLog.h in Headers */,
-				92EC54CE2E1EB54B00A10AC2 /* SentryClient+Logs.h in Headers */,
 				7B8713AE26415ADF006D6004 /* SentryAppStartTrackingIntegration.h in Headers */,
 				7B7D873224864BB900D2ECFF /* SentryCrashMachineContextWrapper.h in Headers */,
 				861265F92404EC1500C4AFDE /* SentryArray.h in Headers */,

SentryTestUtils/TestClient.swift

@@ -166,8 +166,8 @@ public class TestClient: SentryClient {
         flushInvocations.record(timeout)
     }
 
-    public var captureLogsDataInvocations = Invocations<(data: Data, count: NSNumber)>()
-    public override func captureLogsData(_ data: Data, with count: NSNumber) {
-        captureLogsDataInvocations.record((data, count))
+    public var captureLogInvocations = Invocations<(log: SentryLog, scope: Scope)>()
+    public override func capture(log: SentryLog, scope: Scope) {
+        captureLogInvocations.record((log, scope))
     }
 }

Sources/Sentry/Public/SentryClient.h

@@ -12,6 +12,7 @@
 @class SentryOptions;
 @class SentryScope;
 @class SentryTransaction;
+@class SentryLog;
 
 NS_ASSUME_NONNULL_BEGIN
 
@@ -101,6 +102,14 @@ SENTRY_NO_INIT
 - (void)captureFeedback:(SentryFeedback *)feedback
               withScope:(SentryScope *)scope NS_SWIFT_NAME(capture(feedback:scope:));
 
+/**
+ * Captures a log entry and sends it to Sentry.
+ * @param log The log entry to send to Sentry.
+ * @param scope The current scope from which to gather contextual information.
+ */
+- (void)captureLog:(SentryLog *)log
+         withScope:(SentryScope *)scope NS_SWIFT_NAME(capture(log:scope:));
+
 /**
  * Waits synchronously for the SDK to flush out all queued and cached items for up to the specified
  * timeout in seconds. If there is no internet connection, the function returns immediately. The SDK

Sources/Sentry/Public/SentryHub.h

@@ -15,6 +15,7 @@
 @class SentryScope;
 @class SentryTransactionContext;
 @class SentryUser;
+@class SentryLog;
 
 NS_ASSUME_NONNULL_BEGIN
 @interface SentryHub : NSObject
@@ -175,6 +176,20 @@ SENTRY_NO_INIT
  */
 - (void)captureFeedback:(SentryFeedback *)feedback;
 
+/**
+ * Captures a log entry and sends it to Sentry.
+ * @param log The log entry to send to Sentry.
+ */
+- (void)captureLog:(SentryLog *)log NS_SWIFT_NAME(capture(log:));
+
+/**
+ * Captures a log entry and sends it to Sentry.
+ * @param log The log entry to send to Sentry.
+ * @param scope The scope containing event metadata.
+ */
+- (void)captureLog:(SentryLog *)log
+         withScope:(SentryScope *)scope NS_SWIFT_NAME(capture(log:scope:));
+
 /**
  * Use this method to modify the Scope of the Hub. The SDK uses the Scope to attach
  * contextual data to events.

Sources/Sentry/SentryClient.m

@@ -46,13 +46,14 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-@interface SentryClient ()
+@interface SentryClient () <SentryLogBatcherDelegate>
 
 @property (nonatomic, strong) SentryTransportAdapter *transportAdapter;
 @property (nonatomic, strong) SentryDebugImageProvider *debugImageProvider;
 @property (nonatomic, strong) id<SentryRandomProtocol> random;
 @property (nonatomic, strong) NSLocale *locale;
 @property (nonatomic, strong) NSTimeZone *timezone;
+@property (nonatomic, strong) SentryLogBatcher *logBatcher;
 
 @end
 
@@ -149,6 +150,10 @@ - (instancetype)initWithOptions:(SentryOptions *)options
         self.locale = locale;
         self.timezone = timezone;
         self.attachmentProcessors = [[NSMutableArray alloc] init];
+        self.logBatcher = [[SentryLogBatcher alloc]
+            initWithOptions:options
+              dispatchQueue:SentryDependencyContainer.sharedInstance.dispatchQueueWrapper];
+        self.logBatcher.delegate = self;
 
         // The SDK stores the installationID in a file. The first call requires file IO. To avoid
         // executing this on the main thread, we cache the installationID async here.
@@ -654,7 +659,11 @@ - (SentryEvent *_Nullable)prepareEvent:(SentryEvent *)event
 
 - (void)flush:(NSTimeInterval)timeout
 {
-    [self.transportAdapter flush:timeout];
+    NSTimeInterval captureLogsDuration = [self.logBatcher captureLogs];
+    // Capturing batched logs should never take long, but we need to fall back to a sane value.
+    // This is a workaround for experimental logs, until we'll write batched logs to disk,
+    // to avoid data loss due to crashes. This is a trade-off until then.
+    [self.transportAdapter flush:fmax(timeout / 2, timeout - captureLogsDuration)];
 }
 
 - (void)close
@@ -1111,7 +1120,12 @@ - (void)removeAttachmentProcessor:(id<SentryClientAttachmentProcessor>)attachmen
     return processedAttachments;
 }
 
-- (void)captureLogsData:(NSData *)data with:(NSNumber *)itemCount;
+- (void)captureLog:(SentryLog *)log withScope:(SentryScope *)scope
+{
+    [self.logBatcher addLog:log scope:scope];
+}
+
+- (void)captureLogsData:(NSData *)data with:(NSNumber *)itemCount
 {
     SentryEnvelopeItemHeader *header =
         [[SentryEnvelopeItemHeader alloc] initWithType:SentryEnvelopeItemTypes.log

Sources/Sentry/SentryHub.m

@@ -539,6 +539,20 @@ - (void)captureFeedback:(SentryFeedback *)feedback
     }
 }
 
+- (void)captureLog:(SentryLog *)log NS_SWIFT_NAME(capture(log:))
+{
+    [self captureLog:log withScope:self.scope];
+}
+
+- (void)captureLog:(SentryLog *)log
+         withScope:(SentryScope *)scope NS_SWIFT_NAME(capture(log:scope:))
+{
+    SentryClient *client = self.client;
+    if (client != nil) {
+        [client captureLog:log withScope:self.scope];
+    }
+}
+
 - (void)captureSerializedFeedback:(NSDictionary *)serializedFeedback
                       withEventId:(NSString *)feedbackEventId
                       attachments:(NSArray<SentryAttachment *> *)feedbackAttachments

Sources/Sentry/include/SentryClient+Logs.h

@@ -27,7 +27,6 @@
 #import "SentryANRTrackerV1.h"
 #import "SentryANRTrackerV2.h"
 #import "SentryAsyncLog.h"
-#import "SentryClient+Logs.h"
 #import "SentryContinuousProfiler.h"
 #import "SentryCrash.h"
 #import "SentryCrashDebug.h"

Sources/Sentry/include/SentryPrivate.h

@@ -35,15 +35,9 @@ import Foundation
             if let _logger, _loggerConfigured {
                 return _logger
             }
-            let hub = SentryDependencyContainerSwiftHelper.currentHub()
-            var batcher: SentryLogBatcher?
-            if let client = hub.getClient(), client.options.enableLogs {
-                batcher = SentryLogBatcher(client: client, dispatchQueue: Dependencies.dispatchQueueWrapper)
-            }
             let logger = SentryLogger(
-                hub: hub,
-                dateProvider: Dependencies.dateProvider,
-                batcher: batcher
+                hub: SentryDependencyContainerSwiftHelper.currentHub(),
+                dateProvider: Dependencies.dateProvider
             )
             _logger = logger
             _loggerConfigured = sdkEnabled
@@ -360,18 +354,12 @@ import Foundation
     /// - note: This might take slightly longer than the specified timeout if there are many batched logs to capture.
     @objc(flush:)
     public static func flush(timeout: TimeInterval) {
-        let captureLogsDuration = captureLogs()
-        // Capturing batched logs should never take long, but we need to fall back to a sane value.
-        // This is a workaround for experimental logs, until we'll write batched logs to disk, 
-        // to avoid data loss due to crashes. This is a trade-off until then.
-        SentrySDKInternal.flush(timeout: max(timeout / 2, timeout - captureLogsDuration))
+        SentrySDKInternal.flush(timeout: timeout)
     }
 
     /// Closes the SDK, uninstalls all the integrations, and calls `flush` with
     /// `SentryOptions.shutdownTimeInterval`.
     @objc public static func close() {
-        // Capturing batched logs should never take long, ignore the duration here.
-        _ = captureLogs()
         SentrySDKInternal.close()
     }
 
@@ -430,15 +418,6 @@ import Foundation
     private static var _logger: SentryLogger?
     // Flag to re-create instance if accessed before SDK init.
     private static var _loggerConfigured = false
-
-    @discardableResult
-    private static func captureLogs() -> TimeInterval {
-        var duration: TimeInterval = 0.0
-        _loggerLock.synchronized {
-            duration = _logger?.captureLogs() ?? 0.0
-        }
-        return duration
-    }
 }
 
 extension SentryIdWrapper {