Tests

getsentry · Mar 4, 2024 · 32d1571 · 32d1571
1 parent bd1d16b
commit 32d1571
Show file tree

Hide file tree

Showing 8 changed files with 36 additions and 18 deletions.
diff --git a/Sources/Sentry/Profiling/SentryProfiledTracerConcurrency.mm b/Sources/Sentry/Profiling/SentryProfiledTracerConcurrency.mm
@@ -4,6 +4,7 @@
 
 #    import "SentrySwift.h"
 #    import "SentryInternalDefines.h"
+#    import "SentrySwift.h"
 #    import "SentryLog.h"
 #    import "SentryProfiler+Private.h"
 #    include <mutex>

diff --git a/Sources/Sentry/SentryProfiler.mm b/Sources/Sentry/SentryProfiler.mm
@@ -18,7 +18,7 @@
 #    import "SentryFormatter.h"
 #    import "SentryFramesTracker.h"
 #    import "SentryHub+Private.h"
-#    import "SentryId.h"
+#    import "SentrySwift.h"
 #    import "SentryInternalDefines.h"
 #    import "SentryLog.h"
 #    import "SentryMetricProfiler.h"

diff --git a/Sources/Sentry/SentrySerialization.m b/Sources/Sentry/SentrySerialization.m
@@ -157,7 +157,7 @@ + (SentryEnvelope *_Nullable)envelopeWithData:(NSData *)data
                 SentryId *eventId = nil;
                 NSString *eventIdAsString = headerDictionary[@"event_id"];
                 if (nil != eventIdAsString) {
-                    eventId = [[SentryId alloc] initWithUUIDString:eventIdAsString];
+                    eventId = [[SentryId alloc] initWithUuidString:eventIdAsString];
                 }
 
                 SentrySdkInfo *sdkInfo = nil;

diff --git a/Sources/Sentry/SentryTraceContext.m b/Sources/Sentry/SentryTraceContext.m
@@ -99,7 +99,7 @@ - (instancetype)initWithTraceId:(SentryId *)traceId
 
 - (nullable instancetype)initWithDict:(NSDictionary<NSString *, id> *)dictionary
 {
-    SentryId *traceId = [[SentryId alloc] initWithUUIDString:dictionary[@"trace_id"]];
+    SentryId *traceId = [[SentryId alloc] initWithUuidString:dictionary[@"trace_id"]];
     NSString *publicKey = dictionary[@"public_key"];
     if (traceId == nil || publicKey == nil)
         return nil;

diff --git a/Sources/Sentry/include/SentryProfiledTracerConcurrency.h b/Sources/Sentry/include/SentryProfiledTracerConcurrency.h
@@ -1,9 +1,8 @@
 #import "SentryCompiler.h"
-#import "SentrySwift.h"
 #import "SentryProfilingConditionals.h"
 #import <Foundation/Foundation.h>
 
-@class SentryProfiler;
+@class SentryProfiler, SentryId;
 
 #if SENTRY_TARGET_PROFILING_SUPPORTED
 

diff --git a/Sources/Sentry/include/SentrySwift.h b/Sources/Sentry/include/SentrySwift.h
@@ -1,6 +1,11 @@
 #ifndef SentrySwift_h
 #define SentrySwift_h
 
+
+#ifdef __cplusplus
+#import <MetricKit/MetricKit.h>
+#endif
+
 #if __has_include("Sentry-Swift.h")
 #    import "Sentry-Swift.h"
 #else

diff --git a/Sources/Swift/Protocol/SentryId.swift b/Sources/Swift/Protocol/SentryId.swift
@@ -4,17 +4,17 @@ import Foundation
 
 @objcMembers
 public class SentryId : NSObject {
-    
+
     /**
      * A @c SentryId with an empty UUID "00000000000000000000000000000000".
      */
-    static var empty = SentryId(UUIDString: "00000000-0000-0000-0000-000000000000")
+    public static var empty = SentryId(uuidString: "00000000-0000-0000-0000-000000000000")
 
     /**
      * Returns a 32 lowercase character hexadecimal string description of the @c SentryId, such as
      * "12c2d058d58442709aa2eca08bf20986".
      */
-    var sentryIdString : String {
+    public var sentryIdString : String {
         return id.uuidString.replacingOccurrences(of: "-", with: "").lowercased()
     }
 
@@ -40,20 +40,33 @@ public class SentryId : NSObject {
      * "12c2d058-d584-4270-9aa2-eca08bf20986".
      * @return SentryId.empty for invalid strings.
      */
-    public init?(UUIDString : String) {
-        if let id = UUID(uuidString: UUIDString) {
+    public init(uuidString : String) {
+        if let id = UUID(uuidString: uuidString) {
             self.id = id
             return
         }
 
-        if UUIDString.count != 32 {
-            return nil
+        if uuidString.count == 32 {   
+            let dashedUUID = "\(uuidString[0..<8])-\(uuidString[8..<12])-\(uuidString[12..<16])-\(uuidString[16..<20])-\(uuidString[20...])"
+            if let id = UUID(uuidString: dashedUUID) {
+                self.id = id
+                return
+            }
         }
 
-        let dashedUUID = "\(UUIDString[0..<8])-\(UUIDString[8..<12])-\(UUIDString[12..<16])-\(UUIDString[16...])"
-        guard let id = UUID(uuidString: dashedUUID) else {
-            return nil
-        }
-        self.id = id
+        self.id = UUID(uuidString: "00000000-0000-0000-0000-000000000000")!
+    }
+
+    override public func isEqual(_ object: Any?) -> Bool {
+        guard let other = object as? SentryId else { return false }
+        return other.id == self.id
+    }
+
+    override public var description: String {
+        sentryIdString
+    }
+
+    override public var hash: Int {
+        id.hashValue
     }
 }
diff --git a/Tests/SentryTests/Protocol/SentryEventTests.swift b/Tests/SentryTests/Protocol/SentryEventTests.swift
@@ -1,4 +1,4 @@
-import Sentry
+@testable import Sentry
 import SentryTestUtils
 import XCTest