Skip to content

Commit e951eb0

Browse files
armcknightarmcknight
authored
Merge b8881c2 into 5025d2e 
2 parents 5025d2e + b8881c2 commit e951eb0

14 files changed

Lines changed: 721 additions & 428 deletions

‎CHANGELOG.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@
66

77
- Add flush (#2140)
88
- Add more device context (#2190)
9+
- Profile concurrent transactions (#2105)
10+
11+
## 7.25.1
912

1013
### Fixes
1114

‎Sentry.xcodeproj/project.pbxproj‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -581,8 +581,10 @@
581581
7DC83100239826280043DD9A /* SentryIntegrationProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 7DC830FF239826280043DD9A /* SentryIntegrationProtocol.h */; settings = {ATTRIBUTES = (Public, ); }; };
582582
7DC8310A2398283C0043DD9A /* SentryCrashIntegration.h in Headers */ = {isa = PBXBuildFile; fileRef = 7DC831082398283C0043DD9A /* SentryCrashIntegration.h */; };
583583
7DC8310C2398283C0043DD9A /* SentryCrashIntegration.m in Sources */ = {isa = PBXBuildFile; fileRef = 7DC831092398283C0043DD9A /* SentryCrashIntegration.m */; };
584+
8419C0C428C1889D001C8259 /* SentryProfilerSwiftTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8419C0C328C1889D001C8259 /* SentryProfilerSwiftTests.swift */; };
584585
8453421228BE855D00C22EEC /* SentrySampleDecision.m in Sources */ = {isa = PBXBuildFile; fileRef = 8453421128BE855D00C22EEC /* SentrySampleDecision.m */; };
585586
8453421628BE8A9500C22EEC /* SentrySpanStatus.m in Sources */ = {isa = PBXBuildFile; fileRef = 8453421528BE8A9500C22EEC /* SentrySpanStatus.m */; };
587+
84A888FD28D9B11700C51DFD /* SentryProfiler+Test.h in Headers */ = {isa = PBXBuildFile; fileRef = 84A888FC28D9B11700C51DFD /* SentryProfiler+Test.h */; };
586588
861265F92404EC1500C4AFDE /* NSArray+SentrySanitize.h in Headers */ = {isa = PBXBuildFile; fileRef = 861265F72404EC1500C4AFDE /* NSArray+SentrySanitize.h */; };
587589
861265FA2404EC1500C4AFDE /* NSArray+SentrySanitize.m in Sources */ = {isa = PBXBuildFile; fileRef = 861265F82404EC1500C4AFDE /* NSArray+SentrySanitize.m */; };
588590
8E0551E026A7A63C00400526 /* TestProtocolClient.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8E0551DF26A7A63C00400526 /* TestProtocolClient.swift */; };
@@ -1323,6 +1325,7 @@
13231325
7DC830FF239826280043DD9A /* SentryIntegrationProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SentryIntegrationProtocol.h; path = Public/SentryIntegrationProtocol.h; sourceTree = "<group>"; };
13241326
7DC831082398283C0043DD9A /* SentryCrashIntegration.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SentryCrashIntegration.h; path = include/SentryCrashIntegration.h; sourceTree = "<group>"; };
13251327
7DC831092398283C0043DD9A /* SentryCrashIntegration.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SentryCrashIntegration.m; sourceTree = "<group>"; };
1328+
8419C0C328C1889D001C8259 /* SentryProfilerSwiftTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SentryProfilerSwiftTests.swift; sourceTree = "<group>"; };
13261329
844A34C3282B278500C6D1DF /* .github */ = {isa = PBXFileReference; lastKnownFileType = folder; path = .github; sourceTree = "<group>"; };
13271330
844A3563282B3C9F00C6D1DF /* .sauce */ = {isa = PBXFileReference; lastKnownFileType = folder; path = .sauce; sourceTree = "<group>"; };
13281331
844DA7F6282435CD00E6B62E /* README.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = "<group>"; };
@@ -1348,6 +1351,7 @@
13481351
844DA81F28246DE300E6B62E /* scripts */ = {isa = PBXFileReference; lastKnownFileType = folder; path = scripts; sourceTree = "<group>"; };
13491352
8453421128BE855D00C22EEC /* SentrySampleDecision.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SentrySampleDecision.m; sourceTree = "<group>"; };
13501353
8453421528BE8A9500C22EEC /* SentrySpanStatus.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SentrySpanStatus.m; sourceTree = "<group>"; };
1354+
84A888FC28D9B11700C51DFD /* SentryProfiler+Test.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "SentryProfiler+Test.h"; path = "Sources/Sentry/include/SentryProfiler+Test.h"; sourceTree = SOURCE_ROOT; };
13511355
861265F72404EC1500C4AFDE /* NSArray+SentrySanitize.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "NSArray+SentrySanitize.h"; path = "include/NSArray+SentrySanitize.h"; sourceTree = "<group>"; };
13521356
861265F82404EC1500C4AFDE /* NSArray+SentrySanitize.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "NSArray+SentrySanitize.m"; sourceTree = "<group>"; };
13531357
8E0551DF26A7A63C00400526 /* TestProtocolClient.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TestProtocolClient.swift; sourceTree = "<group>"; };
@@ -1497,6 +1501,7 @@
14971501
035E73CB27D575B3005EEB11 /* SentrySamplingProfilerTests.mm */,
14981502
035E73CD27D5790A005EEB11 /* SentryThreadMetadataCacheTests.mm */,
14991503
03F9D37B2819A65C00602916 /* SentryProfilerTests.mm */,
1504+
8419C0C328C1889D001C8259 /* SentryProfilerSwiftTests.swift */,
15001505
);
15011506
path = Profiling;
15021507
sourceTree = "<group>";
@@ -2678,6 +2683,7 @@
26782683
03F84D1B27DD414C008FE43F /* SentryMachLogging.hpp */,
26792684
03F84D2C27DD4191008FE43F /* SentryMachLogging.cpp */,
26802685
03F84D1127DD414C008FE43F /* SentryProfiler.h */,
2686+
84A888FC28D9B11700C51DFD /* SentryProfiler+Test.h */,
26812687
03F84D2B27DD4191008FE43F /* SentryProfiler.mm */,
26822688
03BCC38D27E2A377003232C7 /* SentryProfilingConditionals.h */,
26832689
03F84D2927DD416B008FE43F /* SentryProfilingLogging.hpp */,
@@ -2923,6 +2929,7 @@
29232929
8EE3251C261FE33B00DC3FF2 /* SentryUIViewControllerSanitizer.h in Headers */,
29242930
7BAF3DD92440AEC8008A5414 /* SentryRequestManager.h in Headers */,
29252931
7BE3C77B2446111500A38442 /* SentryRateLimitParser.h in Headers */,
2932+
84A888FD28D9B11700C51DFD /* SentryProfiler+Test.h in Headers */,
29262933
7D0637032382B34300B30749 /* SentryScope.h in Headers */,
29272934
03F84D2727DD414C008FE43F /* SentryMachLogging.hpp in Headers */,
29282935
0356A570288B4612008BF593 /* SentryProfilesSampler.h in Headers */,
@@ -3505,6 +3512,7 @@
35053512
63FE720520DA66EC00CDBAE8 /* FileBasedTestCase.m in Sources */,
35063513
0A6EEADD28A657970076B469 /* UIViewRecursiveDescriptionTests.swift in Sources */,
35073514
63EED6C32237989300E02400 /* SentryOptionsTest.m in Sources */,
3515+
8419C0C428C1889D001C8259 /* SentryProfilerSwiftTests.swift in Sources */,
35083516
7BBD18B22451804C00427C76 /* SentryRetryAfterHeaderParserTests.swift in Sources */,
35093517
7BD337E424A356180050DB6E /* SentryCrashIntegrationTests.swift in Sources */,
35103518
7BD4E8E827FD95900086C410 /* SentryMigrateSessionInitTests.m in Sources */,

‎Sources/Sentry/SentryFramesTracker.m‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
#import "SentryFramesTracker.h"
22
#import "SentryDisplayLinkWrapper.h"
3+
#import "SentryProfiler.h"
34
#import "SentryProfilingConditionals.h"
45
#import "SentryTracer.h"
56
#import <SentryScreenFrames.h>
@@ -123,7 +124,7 @@ - (void)displayLinkCallback
123124
}
124125

125126
# if SENTRY_TARGET_PROFILING_SUPPORTED
126-
if (self.currentTracer.isProfiling
127+
if ([SentryProfiler isRunning]
127128
&& (self.frameRateTimestamps.count == 0
128129
|| self.frameRateTimestamps.lastObject[@"frame_rate"].doubleValue
129130
!= actualFramesPerSecond)) {
@@ -161,7 +162,7 @@ - (void)displayLinkCallback
161162
# if SENTRY_TARGET_PROFILING_SUPPORTED
162163
- (void)recordTimestampStart:(NSNumber *)start end:(NSNumber *)end
163164
{
164-
if (self.currentTracer.isProfiling) {
165+
if ([SentryProfiler isRunning]) {
165166
[self.frameTimestamps addObject:@{ @"start_timestamp" : start, @"end_timestamp" : end }];
166167
}
167168
}

0 commit comments

Comments
 (0)