Fixes

Author: noahsmartin

Sources/Swift/Core/MetricKit/SentryMXCallStackTree.swift

@@ -7,7 +7,7 @@ import Foundation
 struct SentryMXCallStackTree: Decodable {
 
     let callStacks: [SentryMXCallStack]
-    public let callStackPerThread: Bool
+    let callStackPerThread: Bool
 
     static func from(data: Data) throws -> SentryMXCallStackTree {
         return try JSONDecoder().decode(SentryMXCallStackTree.self, from: data)

Sources/Swift/Core/MetricKit/SentryMetricKitIntegration.swift

@@ -73,7 +73,7 @@ private let hangDiagnosticMechanism = "mx_hang_diagnostic"
 @available(macOS 12.0, *)
 extension SentryMetricKitIntegration: SentryMXManagerDelegate {
     func didReceiveCrashDiagnostic(_ diagnostic: MXCrashDiagnostic, callStackTree: SentryMXCallStackTree, timeStampBegin: Date) {
-        let exceptionValue = "MachException Type:\(diagnostic.exceptionType ?? 0) Code:\(diagnostic.exceptionCode ?? 0) Signal:\(diagnostic.signal ?? 0)"
+        let exceptionValue = "MachException Type:\(String(describing: diagnostic.exceptionType)) Code:\(String(describing: diagnostic.exceptionCode)) Signal:\(String(describing: diagnostic.signal))"
         let event = Self.createEvent(handled: false, level: .error, exceptionValue: exceptionValue, exceptionType: "MXCrashDiagnostic", exceptionMechanism: crashMechanism, timeStampBegin: timeStampBegin)
         capture(event: event, handled: false, callStackTree: callStackTree, diagnosticJSON: diagnostic.jsonRepresentation())
     }
@@ -104,7 +104,7 @@ extension SentryMetricKitIntegration: SentryMXManagerDelegate {
 
 extension Event {
     @objc
-    public func isMetricKitEvent() -> Bool {
+    @_spi(Private) public func isMetricKitEvent() -> Bool {
         guard let mechanism = exceptions?.first?.mechanism, exceptions?.count == 1 else {
             return false
         }

Tests/SentryTests/Integrations/MetricKit/SentryMetricKitEventTests.swift

@@ -1,3 +1,4 @@
+@_spi(Private) import Sentry
 import XCTest
 
 #if os(iOS) || os(macOS) || targetEnvironment(macCatalyst)
@@ -9,7 +10,7 @@ final class SentryMetricKitEventTests: XCTestCase {
     }
 
     func testMXDiskWriteException_IsMetricKitEvent() {        
-        XCTAssertTrue(createMetricKitEventWith(mechanismType: "mx_cpu_exception").isMetricKitEvent())
+        XCTAssertTrue(createMetricKitEventWith(mechanismType: "mx_disk_write_exception").isMetricKitEvent())
     }
 
     func testMXHangDiagnostic_IsMetricKitEvent() {

Tests/SentryTests/Integrations/MetricKit/SentryMetricKitIntegrationTests.swift

@@ -55,7 +55,7 @@ final class SentryMetricKitIntegrationTests: SentrySDKIntegrationTestsBase {
             let sut = SentryMetricKitIntegration(with: options, dependencies: ())
             sut?.uninstall()
 
-            XCTAssertNil((Dynamic(sut).metricKitManager as SentryMXManager?)?.delegate)
+            XCTAssertNil((Dynamic(sut).mxManager as SentryMXManager?)?.delegate)
     }
 
     func testMXCrashPayloadReceived() throws {
@@ -67,7 +67,7 @@ final class SentryMetricKitIntegrationTests: SentrySDKIntegrationTestsBase {
 
         sut.didReceiveCrashDiagnostic(MXCrashDiagnostic(), callStackTree: callStackTreePerThread, timeStampBegin: timeStampBegin)
 
-        try assertPerThread(exceptionType: "MXCrashDiagnostic", exceptionValue: "MachException Type:(null) Code:(null) Signal:(null)", exceptionMechanism: "MXCrashDiagnostic", handled: false)
+        try assertPerThread(exceptionType: "MXCrashDiagnostic", exceptionValue: "MachException Type:nil Code:nil Signal:nil", exceptionMechanism: "MXCrashDiagnostic", handled: false)
     }
 
     func testAttachDiagnosticAsAttachment() throws {
@@ -124,18 +124,6 @@ final class SentryMetricKitIntegrationTests: SentrySDKIntegrationTestsBase {
             }
     }
 
-    func testCPUExceptionDiagnostic_PerThread() throws {
-            givenSDKWithHubWithScope()
-            
-            let options = Options()
-            options.enableMetricKit = true
-            let sut = try XCTUnwrap(SentryMetricKitIntegration(with: options, dependencies: ()))
-            
-            sut.didReceiveCpuExceptionDiagnostic(TestMXCPUExceptionDiagnostic(), callStackTree: callStackTreePerThread, timeStampBegin: timeStampBegin)
-            
-            assertNothingCaptured()
-    }
-    
     func testCPUExceptionDiagnostic_NotPerThread() throws {
             givenSDKWithHubWithScope()