Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Long-lasting TTID/TTFD spans #4225

Merged
merged 2 commits into from
Aug 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@

- Skip UI crumbs when target or sender is nil (#4211)
- Guard FramesTracker start and stop (#4224)
- Long-lasting TTID/TTFD spans (#4225). Avoid long TTID spans when the FrameTracker isn't running, which is the case when the app is in the background.

## 8.32.0

Expand Down
10 changes: 9 additions & 1 deletion Sources/Sentry/SentryTimeToDisplayTracker.m
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,14 @@ - (instancetype)initForController:(UIViewController *)controller
return self;
}

- (void)startForTracer:(SentryTracer *)tracer
- (BOOL)startForTracer:(SentryTracer *)tracer
{
if (SentryDependencyContainer.sharedInstance.framesTracker.isRunning == NO) {
SENTRY_LOG_DEBUG(@"Skipping TTID/TTFD spans, because can't report them correctly when the "
@"frames tracker isn't running.");
return NO;
}

SENTRY_LOG_DEBUG(@"Starting initial display span");
self.initialDisplaySpan = [tracer
startChildWithOperation:SentrySpanOperationUILoadInitialDisplay
Expand Down Expand Up @@ -116,6 +122,8 @@ - (void)startForTracer:(SentryTracer *)tracer
stringWithFormat:@"%@ - Deadline Exceeded", self.fullDisplaySpan.spanDescription];
[self addTimeToDisplayMeasurement:self.fullDisplaySpan name:@"time_to_full_display"];
}];

return YES;
}

- (void)reportInitialDisplay
Expand Down
11 changes: 7 additions & 4 deletions Sources/Sentry/SentryUIViewControllerPerformanceTracker.m
Original file line number Diff line number Diff line change
Expand Up @@ -147,11 +147,14 @@ - (void)createTimeToDisplay:(UIViewController *)controller
waitForFullDisplay:self.enableWaitForFullDisplay
dispatchQueueWrapper:_dispatchQueueWrapper];

objc_setAssociatedObject(controller, &SENTRY_UI_PERFORMANCE_TRACKER_TTD_TRACKER, ttdTracker,
OBJC_ASSOCIATION_ASSIGN);
[ttdTracker startForTracer:(SentryTracer *)vcSpan];
if ([ttdTracker startForTracer:(SentryTracer *)vcSpan]) {
objc_setAssociatedObject(controller, &SENTRY_UI_PERFORMANCE_TRACKER_TTD_TRACKER, ttdTracker,
OBJC_ASSOCIATION_ASSIGN);

self.currentTTDTracker = ttdTracker;
self.currentTTDTracker = ttdTracker;
} else {
self.currentTTDTracker = nil;
}
}

- (void)reportFullyDisplayed
Expand Down
2 changes: 1 addition & 1 deletion Sources/Sentry/include/SentryTimeToDisplayTracker.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ SENTRY_NO_INIT
waitForFullDisplay:(BOOL)waitForFullDisplay
dispatchQueueWrapper:(SentryDispatchQueueWrapper *)dispatchQueueWrapper;

- (void)startForTracer:(SentryTracer *)tracer;
- (BOOL)startForTracer:(SentryTracer *)tracer;

- (void)reportInitialDisplay;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,14 +47,32 @@ class SentryTimeToDisplayTrackerTest: XCTestCase {
super.tearDown()
clearTestState()
}

/// This can happen when a UIViewController is presented when the app is in the background.
func testNoSpansCreated_WhenFramesTrackerNotRunning() throws {
fixture.framesTracker.stop()

let sut = fixture.getSut(for: UIViewController(), waitForFullDisplay: false)

fixture.dateProvider.setDate(date: Date(timeIntervalSince1970: 7))
let tracer = try fixture.getTracer()

XCTAssertFalse(sut.start(for: tracer))

sut.reportInitialDisplay()
sut.reportFullyDisplayed()

fixture.framesTracker.start()
XCTAssertEqual(tracer.children.count, 0)
}

func testReportInitialDisplay_notWaitingForFullDisplay() throws {
let sut = fixture.getSut(for: UIViewController(), waitForFullDisplay: false)

fixture.dateProvider.setDate(date: Date(timeIntervalSince1970: 7))
let tracer = try fixture.getTracer()

sut.start(for: tracer)
XCTAssertTrue(sut.start(for: tracer))
XCTAssertEqual(tracer.children.count, 1)
XCTAssertEqual(Dynamic(self.fixture.framesTracker).listeners.count, 1)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,21 @@ class SentryUIViewControllerPerformanceTrackerTests: XCTestCase {
let tracker = SentryPerformanceTracker.shared
let dateProvider = TestCurrentDateProvider()

var displayLinkWrapper = TestDisplayLinkWrapper()
var framesTracker: SentryFramesTracker

var viewControllerName: String!

var inAppLogic: SentryInAppLogic {
return SentryInAppLogic(inAppIncludes: options.inAppIncludes, inAppExcludes: [])
}

init() {
framesTracker = SentryFramesTracker(displayLinkWrapper: displayLinkWrapper, dateProvider: dateProvider, dispatchQueueWrapper: TestSentryDispatchQueueWrapper(),
notificationCenter: TestNSNotificationCenterWrapper(), keepDelayedFramesDuration: 0)
SentryDependencyContainer.sharedInstance().framesTracker = framesTracker
framesTracker.start()
}

func getSut() -> SentryUIViewControllerPerformanceTracker {
SentryDependencyContainer.sharedInstance().dateProvider = dateProvider
Expand Down Expand Up @@ -281,6 +291,27 @@ class SentryUIViewControllerPerformanceTrackerTests: XCTestCase {
XCTAssertEqual(ttfdSpan.isFinished, true)
XCTAssertEqual(ttfdSpan.timestamp, expectedTTFDTimestamp)
}

func testFramesTrackerNotRunning_NoTTDTrackerAndSpans() {
fixture.framesTracker.stop()
let sut = fixture.getSut()
let tracker = fixture.tracker
let viewController = fixture.viewController
var tracer: SentryTracer?

sut.viewControllerLoadView(viewController) {
let spans = self.getStack(tracker)
tracer = spans.first as? SentryTracer
}

let ttdTracker = Dynamic(sut).currentTTDTracker.asObject as? SentryTimeToDisplayTracker
XCTAssertNil(ttdTracker)

sut.reportFullyDisplayed()

XCTAssertEqual(tracer?.children.filter { $0.operation.contains("initial_display") }.count, 0, "Tracer must not contain a TTID span")
XCTAssertEqual(tracer?.children.filter { $0.operation.contains("full_display") }.count, 0, "Tracer must not contain a TTFD span")
}

func testSecondViewController() {
let sut = fixture.getSut()
Expand Down
Loading