Merge 403d385 into 4597906

getsentry · Jul 2, 2024 · 01dac4d · 01dac4d
2 parents 4597906 + 403d385
commit 01dac4d
Show file tree

Hide file tree

Showing 8 changed files with 31 additions and 12 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## Unreleased
+
+### Fixes
+
+- Sentry Replay Serialized Breadcrumbs include level name ([#4141](https://github.com/getsentry/sentry-cocoa/pull/4141))
+
 ## 8.30.0
 
 ### Features

diff --git a/Sources/Sentry/SentryLevelHelper.m b/Sources/Sentry/SentryLevelHelper.m
@@ -1,11 +1,12 @@
 #import "SentryLevelHelper.h"
 #import "SentryBreadcrumb+Private.h"
+#import "SentryLevelMapper.h"
 
 @implementation SentryLevelHelper
 
-+ (NSUInteger)breadcrumbLevel:(SentryBreadcrumb *)breadcrumb
++ (NSString *_Nonnull)breadcrumbLevel:(SentryBreadcrumb *)breadcrumb
 {
-    return breadcrumb.level;
+    return nameForSentryLevel(breadcrumb.level);
 }
 
 @end
diff --git a/Sources/Sentry/SentrySessionReplayIntegration.m b/Sources/Sentry/SentrySessionReplayIntegration.m
@@ -8,6 +8,7 @@
 #    import "SentryFileManager.h"
 #    import "SentryGlobalEventProcessor.h"
 #    import "SentryHub+Private.h"
+#    import "SentryLevelMapper.h"
 #    import "SentryNSNotificationCenterWrapper.h"
 #    import "SentryOptions.h"
 #    import "SentryRandom.h"
@@ -254,7 +255,7 @@ - (SentryTouchTracker *)getTouchTracker
     return [[SentryRRWebBreadcrumbEvent alloc] initWithTimestamp:timestamp
                                                         category:category
                                                          message:message
-                                                           level:level
+                                                           level:nameForSentryLevel(level)
                                                             data:data];
 }
 

diff --git a/Sources/Sentry/include/SentryLevelHelper.h b/Sources/Sentry/include/SentryLevelHelper.h
@@ -9,7 +9,7 @@ NS_ASSUME_NONNULL_BEGIN
  */
 @interface SentryLevelHelper : NSObject
 
-+ (NSUInteger)breadcrumbLevel:(SentryBreadcrumb *)breadcrumb;
++ (NSString *_Nonnull)breadcrumbLevel:(SentryBreadcrumb *)breadcrumb;
 
 @end
 

diff --git a/Sources/Swift/Integrations/SessionReplay/RRWeb/SentryRRWebBreadcrumbEvent.swift b/Sources/Swift/Integrations/SessionReplay/RRWeb/SentryRRWebBreadcrumbEvent.swift
@@ -2,9 +2,9 @@
 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": level.rawValue, "timestamp": timestamp.timeIntervalSince1970 ]
+    init(timestamp: Date, category: String, message: String? = nil, level: String = "none", data: [String: Any]? = nil) {
+
+        var payload: [String: Any] = ["type": "default", "category": category, "level": level, "timestamp": timestamp.timeIntervalSince1970 ]
 
         if let message = message {
             payload["message"] = message

diff --git a/Sources/Swift/Integrations/SessionReplay/SentryBreadcrumbReplayConverter.swift b/Sources/Swift/Integrations/SessionReplay/SentryBreadcrumbReplayConverter.swift
@@ -76,8 +76,7 @@ class SentryBreadcrumbReplayConverter: NSObject {
         return SentryRRWebSpanEvent(timestamp: timestamp, endTimestamp: timestamp, operation: "resource.http", description: description, data: data)
     }
 
-    private  func getLevel(breadcrumb: Breadcrumb) -> SentryLevel {
-        return SentryLevel(rawValue: SentryLevelHelper.breadcrumbLevel(breadcrumb)) ?? .none
-
+    private func getLevel(breadcrumb: Breadcrumb) -> String {
+        return SentryLevelHelper.breadcrumbLevel(breadcrumb)
     }
 }
diff --git a/Sources/Swift/Integrations/SessionReplay/SentrySRDefaultBreadcrumbConverter.swift b/Sources/Swift/Integrations/SessionReplay/SentrySRDefaultBreadcrumbConverter.swift
@@ -83,7 +83,7 @@ class SentrySRDefaultBreadcrumbConverter: NSObject, SentryReplayBreadcrumbConver
         return SentryRRWebSpanEvent(timestamp: startTimestamp, endTimestamp: timestamp, operation: "resource.http", description: description, data: data)
     }
 
-    private func getLevel(breadcrumb: Breadcrumb) -> SentryLevel {
-        return SentryLevel(rawValue: SentryLevelHelper.breadcrumbLevel(breadcrumb)) ?? .none
+    private func getLevel(breadcrumb: Breadcrumb) -> String {
+        return SentryLevelHelper.breadcrumbLevel(breadcrumb)
     }
 }
diff --git a/Tests/SentryTests/Integrations/SessionReplay/SentrySRDefaultBreadcrumbConverterTests.swift b/Tests/SentryTests/Integrations/SessionReplay/SentrySRDefaultBreadcrumbConverterTests.swift
@@ -147,4 +147,16 @@ class SentrySRDefaultBreadcrumbConverterTests: XCTestCase {
         XCTAssertEqual(payload["message"] as? String, "Custom message")
         XCTAssertEqual(payloadData["SomeInfo"] as? String, "Info")
     }
+
+    func testSerializedSRBreadcrumbLevelIsString() throws {
+        let sut = SentrySRDefaultBreadcrumbConverter()
+        let breadcrumb = Breadcrumb()
+        breadcrumb.level = .error
+
+        let result = try XCTUnwrap(sut.convert(from: breadcrumb) as? SentryRRWebBreadcrumbEvent)
+        let crumbData = try XCTUnwrap(result.data)
+        let payload = try XCTUnwrap(crumbData["payload"] as? [String: Any])
+
+        XCTAssertEqual(payload["level"] as! String, "error")
+    }
 }