ref: Log for Swift

SentryTestUtils/ClearTestState.swift

@@ -1,5 +1,5 @@
 import Foundation
-import Sentry
+@testable import Sentry
 
 public func clearTestState() {
     TestCleanup.clearTestState()

SentryTestUtils/SentryLogExtensions.swift

@@ -1,4 +1,5 @@
 import Foundation
+@testable import Sentry
 
 extension SentryLog {
     public static func setTestDefaultLogLevel() {

Sources/Sentry/SentryLevelHelper.m

@@ -1,17 +1,8 @@
 #import "SentryLevelHelper.h"
 #import "SentryBreadcrumb+Private.h"
-#import "SentryLevelMapper.h"
 
-@implementation SentryLevelHelper
-
-+ (NSUInteger)breadcrumbLevel:(SentryBreadcrumb *)breadcrumb
+NSUInteger
+sentry_breadcrumbLevel(SentryBreadcrumb *breadcrumb)
 {
     return breadcrumb.level;
 }
-
-+ (NSString *_Nonnull)getNameFor:(NSUInteger)level
-{
-    return nameForSentryLevel(level);
-}
-
-@end

Sources/Sentry/SentryLevelMapper.m

@@ -2,56 +2,16 @@
 #import "SentrySwift.h"
 NS_ASSUME_NONNULL_BEGIN
 
-NSString *const kSentryLevelNameNone = @"none";
-NSString *const kSentryLevelNameDebug = @"debug";
-NSString *const kSentryLevelNameInfo = @"info";
-NSString *const kSentryLevelNameWarning = @"warning";
-NSString *const kSentryLevelNameError = @"error";
-NSString *const kSentryLevelNameFatal = @"fatal";
-
 SentryLevel
 sentryLevelForString(NSString *string)
 {
-    if ([string isEqualToString:kSentryLevelNameNone]) {
-        return kSentryLevelNone;
-    }
-    if ([string isEqualToString:kSentryLevelNameDebug]) {
-        return kSentryLevelDebug;
-    }
-    if ([string isEqualToString:kSentryLevelNameInfo]) {
-        return kSentryLevelInfo;
-    }
-    if ([string isEqualToString:kSentryLevelNameWarning]) {
-        return kSentryLevelWarning;
-    }
-    if ([string isEqualToString:kSentryLevelNameError]) {
-        return kSentryLevelError;
-    }
-    if ([string isEqualToString:kSentryLevelNameFatal]) {
-        return kSentryLevelFatal;
-    }
-
-    // Default is error, see https://develop.sentry.dev/sdk/event-payloads/#optional-attributes
-    return kSentryLevelError;
+    return [SentryLevelHelper levelForName:string];
 }
 
 NSString *
 nameForSentryLevel(SentryLevel level)
 {
-    switch (level) {
-    case kSentryLevelNone:
-        return kSentryLevelNameNone;
-    case kSentryLevelDebug:
-        return kSentryLevelNameDebug;
-    case kSentryLevelInfo:
-        return kSentryLevelNameInfo;
-    case kSentryLevelWarning:
-        return kSentryLevelNameWarning;
-    case kSentryLevelError:
-        return kSentryLevelNameError;
-    case kSentryLevelFatal:
-        return kSentryLevelNameFatal;
-    }
+    return [SentryLevelHelper nameForLevel:level];
 }
 
 NS_ASSUME_NONNULL_END

Sources/Sentry/SentryLogC.m

@@ -0,0 +1,29 @@
+#import "SentryAsyncSafeLog.h"
+#import "SentryFileManager.h"
+#import "SentryInternalCDefines.h"
+#import "SentryLevelMapper.h"
+#import "SentryLog.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+void
+sentry_initializeAsyncLogFile(void)
+{
+    const char *asyncLogPath =
+        [[sentryApplicationSupportPath() stringByAppendingPathComponent:@"async.log"] UTF8String];
+
+    NSError *error;
+    if (!createDirectoryIfNotExists(sentryApplicationSupportPath(), &error)) {
+        SENTRY_LOG_ERROR(@"Failed to initialize directory for async log file: %@", error);
+        return;
+    }
+
+    if (SENTRY_LOG_ERRNO(
+            sentry_asyncLogSetFileName(asyncLogPath, true /* overwrite existing log */))
+        != 0) {
+        SENTRY_LOG_ERROR(
+            @"Could not open a handle to specified path for async logging %s", asyncLogPath);
+    };
+}
+
+NS_ASSUME_NONNULL_END

Sources/Sentry/include/SentryLevelHelper.h

@@ -7,12 +7,6 @@ NS_ASSUME_NONNULL_BEGIN
 /**
  * This is a workaround to access SentryLevel value from swift
  */
-@interface SentryLevelHelper : NSObject
-
-+ (NSUInteger)breadcrumbLevel:(SentryBreadcrumb *)breadcrumb;
-
-+ (NSString *_Nonnull)getNameFor:(NSUInteger)level;
-
-@end
+NSUInteger sentry_breadcrumbLevel(SentryBreadcrumb *breadcrumb);
 
 NS_ASSUME_NONNULL_END

Sources/Sentry/include/SentryLevelMapper.h

@@ -2,13 +2,6 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-FOUNDATION_EXPORT NSString *const kSentryLevelNameNone;
-FOUNDATION_EXPORT NSString *const kSentryLevelNameDebug;
-FOUNDATION_EXPORT NSString *const kSentryLevelNameInfo;
-FOUNDATION_EXPORT NSString *const kSentryLevelNameWarning;
-FOUNDATION_EXPORT NSString *const kSentryLevelNameError;
-FOUNDATION_EXPORT NSString *const kSentryLevelNameFatal;
-
 /**
  * Maps a string to a SentryLevel. If the passed string doesn't match any level this defaults to
  * the 'error' level. See https://develop.sentry.dev/sdk/event-payloads/#optional-attributes

Sources/Sentry/include/SentryLog.h

@@ -1,26 +1,6 @@
 #import "SentryDefines.h"
 #import "SentrySwift.h"
 
-@class SentryLogOutput;
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface SentryLog : NSObject
-SENTRY_NO_INIT
-
-+ (void)configure:(BOOL)debug diagnosticLevel:(SentryLevel)level;
-
-+ (void)logWithMessage:(NSString *)message andLevel:(SentryLevel)level;
-
-/**
- * @return @c YES if the current logging configuration will log statements at the current level,
- * @c NO if not.
- */
-+ (BOOL)willLogAtLevel:(SentryLevel)level;
-
-@end
-
-NS_ASSUME_NONNULL_END
 #define SENTRY_LOG(_SENTRY_LOG_LEVEL, ...)                                                         \
     if ([SentryLog willLogAtLevel:_SENTRY_LOG_LEVEL]) {                                            \
         [SentryLog logWithMessage:[NSString stringWithFormat:@"[%@:%d] %@",                        \

Sources/Sentry/include/SentryLogC.h

@@ -0,0 +1,4 @@
+#ifndef SentryLogC_h
+#define SentryLogC_h
+void sentry_initializeAsyncLogFile(void);
+#endif

Sources/Sentry/include/SentryPrivate.h

@@ -11,6 +11,7 @@
 #import "SentryDateUtil.h"
 #import "SentryDisplayLinkWrapper.h"
 #import "SentryLevelHelper.h"
+#import "SentryLogC.h"
 #import "SentryRandom.h"
 #import "SentrySdkInfo.h"
 #import "SentrySession.h"

Sources/Swift/Helper/Log/SentryLevel.swift

@@ -1,7 +1,10 @@
+@_implementationOnly import _SentryPrivate
 import Foundation
 
 @objc
 public enum SentryLevel: UInt {
+    static let levelNames = ["none", "debug", "info", "warning", "error", "fatal"]
+
     @objc(kSentryLevelNone)
     case none = 0
 
@@ -21,3 +24,29 @@ public enum SentryLevel: UInt {
     @objc(kSentryLevelFatal)
     case fatal = 5
 }
+
+extension SentryLevel: CustomStringConvertible { 
+    public var description: String {
+        return SentryLevel.levelNames[Int(self.rawValue)]
+    }
+
+    static func fromName(_ name: String) -> SentryLevel {
+        guard let index = SentryLevel.levelNames.firstIndex(of: name) else { return .error }
+        return SentryLevel(rawValue: UInt(index)) ?? .error
+    }
+}
+
+@objcMembers
+class SentryLevelHelper: NSObject {
+    static func nameForLevel(_  level: SentryLevel) -> String {
+        return level.description
+    }
+
+    static func levelForName(_ name: String) -> SentryLevel {
+        .fromName(name)
+    }
+
+    static func breadcrumbLevel(_ breadcrumb: Breadcrumb) -> SentryLevel? {
+        SentryLevel(rawValue: sentry_breadcrumbLevel(breadcrumb))
+    }
+}

Sources/Swift/Integrations/SessionReplay/RRWeb/SentryRRWebBreadcrumbEvent.swift

@@ -4,7 +4,7 @@ import Foundation
 class SentryRRWebBreadcrumbEvent: SentryRRWebCustomEvent {
     init(timestamp: Date, category: String, message: String? = nil, level: SentryLevel = .none, data: [String: Any]? = nil) {
 
-        var payload: [String: Any] = ["type": "default", "category": category, "level": SentryLevelHelper.getNameFor(level.rawValue), "timestamp": timestamp.timeIntervalSince1970 ]
+        var payload: [String: Any] = ["type": "default", "category": category, "level": level.description, "timestamp": timestamp.timeIntervalSince1970 ]
 
         if let message = message {
             payload["message"] = message