Merge aa9fe51 into 3a1d58d

getsentry · Nov 16, 2022 · 92b8904 · 92b8904
2 parents 3a1d58d + aa9fe51
commit 92b8904
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/Sources/Sentry/SentryOutOfMemoryTracker.m b/Sources/Sentry/SentryOutOfMemoryTracker.m
@@ -1,3 +1,4 @@
+#import "NSDate+SentryExtras.h"
 #import "SentryEvent+Private.h"
 #import "SentryFileManager.h"
 #import <Foundation/Foundation.h>
@@ -68,6 +69,12 @@ - (void)start
  self.options.maxBreadcrumbs)];
  }
 
+ NSDictionary *lastBreadcrumb = event.serializedBreadcrumbs.lastObject;
+ if (lastBreadcrumb && [lastBreadcrumb objectForKey:@"timestamp"]) {
+ NSString *timestampIso8601String = [lastBreadcrumb objectForKey:@"timestamp"];
+ event.timestamp = [NSDate sentry_fromIso8601String:timestampIso8601String];
+ }
+
  SentryException *exception =
  [[SentryException alloc] initWithValue:SentryOutOfMemoryExceptionValue
  type:SentryOutOfMemoryExceptionType];

diff --git a/Tests/SentryTests/Integrations/OutOfMemory/SentryOutOfMemoryTrackerTests.swift b/Tests/SentryTests/Integrations/OutOfMemory/SentryOutOfMemoryTrackerTests.swift
@@ -225,6 +225,9 @@ class SentryOutOfMemoryTrackerTests: NotificationCenterTestCase {
  fixture.fileManager.moveBreadcrumbsToPreviousBreadcrumbs()
  sut.start()
  assertOOMEventSent(expectedBreadcrumbs: 2)
+
+ let crashEvent = fixture.client.captureCrashEventInvocations.first?.event
+ XCTAssertEqual(crashEvent?.timestamp, breadcrumb.timestamp)
  }
 
  func testAppOOM_WithOnlyHybridSdkDidBecomeActive() {