more

Author: noahsmartin

Samples/SentrySampleShared/SentrySampleShared/SentrySDKWrapper.swift

@@ -32,7 +32,7 @@ public struct SentrySDKWrapper {
     }
 
     func configureSentryOptions(options: Options) {
-        options.dsn = dsn
+        options.dsn = "https://00baf901d992a95f8e38837778b392a7@o4509277191143424.ingest.us.sentry.io/4510320463642624"
         if let sampleRate = SentrySDKOverrides.Events.sampleRate.floatValue {
             options.sampleRate = NSNumber(value: sampleRate)
         }
@@ -68,10 +68,10 @@ public struct SentrySDKWrapper {
         }
 
 #if !os(tvOS)
-        if #available(iOS 15.0, *), !SentrySDKOverrides.Other.disableMetricKit.boolValue {
+        //if #available(iOS 15.0, *), !SentrySDKOverrides.Other.disableMetricKit.boolValue {
             options.enableMetricKit = true
-            options.enableMetricKitRawPayload = !SentrySDKOverrides.Other.disableMetricKitRawPayloads.boolValue
-        }
+            options.enableMetricKitRawPayload = true
+        //}
 #endif // !os(tvOS)
 #endif // !os(macOS) && !os(watchOS) && !os(visionOS)
 

Samples/iOS-SwiftUI/iOS-SwiftUI/ContentView.swift

@@ -1,4 +1,4 @@
-import Sentry
+@_spi(Private) import Sentry
 import SentrySwiftUI
 import SwiftUI
 
@@ -198,6 +198,13 @@ struct ContentView: View {
                             }) {
                                 Text("Async Crash")
                             }
+                          
+                          Button("MetricKit") {
+                            let url = Bundle.main.url(forResource: "MXDiagnosticPayload-2", withExtension: "json")!
+                            let data = try! Data(contentsOf: url)
+                            let tree = try! JSONDecoder().decode(SentryMXCallStackTree.self, from: data)
+                            SentryMXManager.test(tree: tree)
+                          }
 
                             Button(action: oomCrashAction) {
                                 Text("OOM Crash")

Sources/Sentry/SentryMetricKitIntegration.m

@@ -177,13 +177,12 @@ - (void)didReceiveDiskWriteExceptionDiagnostic:(MXDiskWriteExceptionDiagnostic *
           diagnosticJSON:[diagnostic JSONRepresentation]];
 }
 
-- (void)didReceiveHangDiagnostic:(MXHangDiagnostic *)diagnostic
-                   callStackTree:(SentryMXCallStackTree *)callStackTree
+- (void)didReceiveHangDiagnosticCallStackTree:(SentryMXCallStackTree *)callStackTree
                   timeStampBegin:(NSDate *)timeStampBegin
                     timeStampEnd:(NSDate *)timeStampEnd
 {
-    NSString *hangDuration =
-        [self.measurementFormatter stringFromMeasurement:diagnostic.hangDuration];
+    NSString *hangDuration = @"2s";
+        // [self.measurementFormatter stringFromMeasurement:diagnostic.hangDuration];
 
     NSString *exceptionValue = [NSString
         stringWithFormat:@"%@ hangDuration:%@", SentryMetricKitHangDiagnosticType, hangDuration];
@@ -198,7 +197,7 @@ - (void)didReceiveHangDiagnostic:(MXHangDiagnostic *)diagnostic
 
     [self captureMXEvent:callStackTree
                   params:params
-          diagnosticJSON:[diagnostic JSONRepresentation]];
+          diagnosticJSON:[NSData data]];
 }
 
 - (void)captureMXEvent:(SentryMXCallStackTree *)callStackTree

Sources/Swift/Core/MetricKit/SentryMXCallStackTree.swift

@@ -55,8 +55,7 @@ import Foundation
                 let count = samplesToCount[sample.frames] ?? 0
                 samplesToCount[sample.frames] = sample.count + count
             }
-            // Need to reverse because the root node of a flamegraph is the first frame in a stacktrace (usually main)
-            let frames = samplesToCount.mostSampled()?.reversed().map { $0.toSentryFrame() } ?? []
+            let frames = samplesToCount.mostSampled()?.map { $0.toSentryFrame() } ?? []
             frames.forEach { $0.inApp = NSNumber(value: inAppLogic?.is(inApp: $0.package) ?? false) }
             thread.stacktrace = SentryStacktrace(frames: frames, registers: [:])
             thread.crashed = NSNumber(value: (callStack.threadAttributed ?? false) && !handled)

Sources/Swift/Core/MetricKit/SentryMXManager.swift

@@ -15,18 +15,27 @@ import MetricKit
 
     func didReceiveCpuExceptionDiagnostic(_ diagnostic: MXCPUExceptionDiagnostic, callStackTree: SentryMXCallStackTree, timeStampBegin: Date, timeStampEnd: Date)
 
-    func didReceiveHangDiagnostic(_ diagnostic: MXHangDiagnostic, callStackTree: SentryMXCallStackTree, timeStampBegin: Date, timeStampEnd: Date)
+    func didReceiveHangDiagnosticCallStackTree(_ callStackTree: SentryMXCallStackTree, timeStampBegin: Date, timeStampEnd: Date)
 }
 
 @available(macOS 12.0, *)
 @available(tvOS, unavailable)
 @available(watchOS, unavailable)
 @objcMembers @_spi(Private) public final class SentryMXManager: NSObject, MXMetricManagerSubscriber {
 
+    static var shared: SentryMXManager?
+    static public func test(tree: SentryMXCallStackTree) {
+        let start = Date.now.addingTimeInterval(-60)
+        shared?.delegate?.didReceiveHangDiagnosticCallStackTree(tree, timeStampBegin: start, timeStampEnd: Date.now)
+    }
+    
     let disableCrashDiagnostics: Bool
 
     init(disableCrashDiagnostics: Bool = true) {
         self.disableCrashDiagnostics = disableCrashDiagnostics
+        super.init()
+        
+        SentryMXManager.shared = self
     }
 
     public weak var delegate: SentryMXManagerDelegate?
@@ -76,7 +85,7 @@ import MetricKit
 
             payload.hangDiagnostics?.forEach { diagnostic in
                 actOn(callStackTree: diagnostic.callStackTree) { callStackTree in
-                    delegate?.didReceiveHangDiagnostic(diagnostic, callStackTree: callStackTree, timeStampBegin: payload.timeStampBegin, timeStampEnd: payload.timeStampEnd)
+                    delegate?.didReceiveHangDiagnosticCallStackTree(callStackTree, timeStampBegin: payload.timeStampBegin, timeStampEnd: payload.timeStampEnd)
                 }
             }
         }