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.

Sign up for GitHub

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: profiler timeout scheduling and data preservation #3135

Merged
merged 15 commits into from
Jul 14, 2023
Merged

fix: profiler timeout scheduling and data preservation #3135

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
a8926b8
schedule timeout timer in main context
armcknight Jul 6, 2023
5e0e683
changelog
armcknight Jul 7, 2023
47e26cf
wip moving stoppage methods to instance level
armcknight Jul 7, 2023
f1bfd01
wip managing tracer/profiler concurrency bookkeeping
armcknight Jul 7, 2023
d653223
track existing profilers as well as new ones
armcknight Jul 8, 2023
b1d060e
fix test to not block the dispatched async timeout timer from being s…
armcknight Jul 8, 2023
67bc184
copy off and reset gpu data at the right times; remove +[SentryProfil…
armcknight Jul 11, 2023
16aee94
undo the file rename so the diff is better
armcknight Jul 11, 2023
220e182
cleanup
armcknight Jul 11, 2023
6b606f0
conform to nscopying
armcknight Jul 11, 2023
5a3dc0b
use notification center wrapper
armcknight Jul 11, 2023
12cf3d0
fix build
armcknight Jul 11, 2023
998cd6b
use own state
armcknight Jul 12, 2023
b8e11f7
pr feedback
armcknight Jul 13, 2023
6a4e1a7
fix test build
armcknight Jul 13, 2023
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
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@

- Renamed `enableTimeToFullDisplay` to `enableTimeToFullDisplayTracing` (#3106)
- This is an experimental feature and may change at any time without a major revision.

### Fixes

- Fix potential unbounded memory growth when starting profiled transactions from non-main contexts (#3135)

## 8.9.0-beta.1

Expand Down
1 change: 0 additions & 1 deletion Sentry.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3112,7 +3112,6 @@
8454CF8B293EAF9A006AC140 /* SentryMetricProfiler.mm */,
03F84D1127DD414C008FE43F /* SentryProfiler.h */,
03F84D2B27DD4191008FE43F /* SentryProfiler.mm */,
84A888FC28D9B11700C51DFD /* SentryProfiler+Test.h */,
84A888FC28D9B11700C51DFD /* SentryProfiler+Private.h */,
0354A22A2A134D9C003C3A04 /* SentryProfilerState.h */,
84281C642A57D36100EE88F2 /* SentryProfilerState+ObjCpp.h */,
Expand Down
1 change: 1 addition & 0 deletions SentryTestUtils/ClearTestState.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ class TestCleanup: NSObject {
SentryTracer.resetAppStartMeasurementRead()

#if os(iOS) || os(macOS) || targetEnvironment(macCatalyst)
SentryProfiler.getCurrent().stop(for: .normal)
SentryTracer.resetConcurrencyTracking()
#endif
}
Expand Down
1 change: 1 addition & 0 deletions SentryTestUtils/SentryTestUtils-ObjC-BridgingHeader.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
#import "SentryNSTimerFactory.h"
#import "SentryNetworkTracker.h"
#import "SentryPerformanceTracker+Testing.h"
#import "SentryProfiler+Test.h"
#import "SentryRandom.h"
#import "SentrySDK+Private.h"
#import "SentrySDK+Tests.h"
Expand Down
4 changes: 2 additions & 2 deletions Sources/Sentry/SentryFramesTracker.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ - (void)displayLinkCallback
}

# if SENTRY_TARGET_PROFILING_SUPPORTED
if ([SentryProfiler isRunning]) {
if ([SentryProfiler isCurrentlyProfiling]) {
BOOL hasNoFrameRatesYet = self.frameRateTimestamps.count == 0;
uint64_t previousFrameRate
= self.frameRateTimestamps.lastObject[@"value"].unsignedLongLongValue;
Expand Down Expand Up @@ -179,7 +179,7 @@ - (void)reportNewFrame
# if SENTRY_TARGET_PROFILING_SUPPORTED
- (void)recordTimestamp:(uint64_t)timestamp value:(NSNumber *)value array:(NSMutableArray *)array
{
BOOL shouldRecord = [SentryProfiler isRunning];
BOOL shouldRecord = [SentryProfiler isCurrentlyProfiling];
# if defined(TEST) || defined(TESTCI)
shouldRecord = YES;
# endif
Expand Down
6 changes: 3 additions & 3 deletions Sources/Sentry/SentryNSNotificationCenterWrapper.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ + (NSNotificationName)willTerminateNotificationName
- (void)addObserver:(id)observer
selector:(SEL)aSelector
name:(NSNotificationName)aName
object:(id)anObject
object:(nullable id)anObject
{
[NSNotificationCenter.defaultCenter addObserver:observer
selector:aSelector
Expand All @@ -67,7 +67,7 @@ - (void)removeObserver:(id)observer name:(NSNotificationName)aName
[NSNotificationCenter.defaultCenter removeObserver:observer name:aName object:nil];
}

- (void)removeObserver:(id)observer name:(NSNotificationName)aName object:(id)anObject
- (void)removeObserver:(id)observer name:(NSNotificationName)aName object:(nullable id)anObject
{
[NSNotificationCenter.defaultCenter removeObserver:observer name:aName object:anObject];
}
Expand All @@ -77,7 +77,7 @@ - (void)removeObserver:(id)observer
[NSNotificationCenter.defaultCenter removeObserver:observer];
}

- (void)postNotificationName:(NSNotificationName)aName object:(id)anObject
- (void)postNotificationName:(NSNotificationName)aName object:(nullable id)anObject
{
[NSNotificationCenter.defaultCenter postNotificationName:aName object:anObject];
}
Expand Down
Loading