Skip to content

Commit e5ac362

Browse files
armcknightarmcknight
authored
fix: missing GPU frame info in profiler (#2823)
1 parent e79ead7 commit e5ac362

File tree

12 files changed

+245
-85
lines changed

12 files changed

+245
-85
lines changed

‎.github/workflows/saucelabs-UI-tests.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,15 +46,15 @@ jobs:
4646
uses: actions/cache@v3
4747
with:
4848
path: |
49-
DerivedData/Build/Products/Debug-iphoneos/iOS-Swift.app.dSYM
50-
DerivedData/Build/Products/Debug-iphoneos/iOS-Swift.app
49+
DerivedData/Build/Products/Test-iphoneos/iOS-Swift.app.dSYM
50+
DerivedData/Build/Products/Test-iphoneos/iOS-Swift.app
5151
key: ios-swift-for-ui-testing-cache-key-${{ hashFiles('Samples/iOS-Swift/iOS-Swift/**') }}-Xcode-${{ matrix.xcode }}-${{ hashFiles('Sources/Sentry/**') }}
5252
- name: Cache iOS-Swift UI Test Runner App build product
5353
id: ios-swift-uitest-runner-cache
5454
uses: actions/cache@v3
5555
with:
5656
path: |
57-
DerivedData/Build/Products/Debug-iphoneos/iOS-SwiftUITests-Runner.app
57+
DerivedData/Build/Products/Test-iphoneos/iOS-SwiftUITests-Runner.app
5858
key: ios-swift-for-ui-testing-cache-key-${{ hashFiles('Samples/iOS-Swift/iOS-SwiftUITests/**') }}-Xcode-${{ matrix.xcode }}
5959
- run: fastlane build_ios_swift_for_tests
6060
env:
@@ -76,14 +76,14 @@ jobs:
7676
MATCH_USERNAME: ${{ secrets.MATCH_USERNAME }}
7777
- name: Upload dSYMs
7878
run: |
79-
sentry-cli --auth-token ${{ secrets.SENTRY_AUTH_TOKEN }} upload-dif --org sentry-sdks --project sentry-cocoa DerivedData/Build/Products/Debug-iphoneos/iOS-Swift.app.dSYM
79+
sentry-cli --auth-token ${{ secrets.SENTRY_AUTH_TOKEN }} upload-dif --org sentry-sdks --project sentry-cocoa DerivedData/Build/Products/Test-iphoneos/iOS-Swift.app.dSYM
8080
- name: Archiving DerivedData
8181
uses: actions/upload-artifact@v3
8282
with:
8383
name: DerivedData-Xcode-${{matrix.xcode}}
8484
path: |
85-
**/Debug-iphoneos/iOS-Swift.app
86-
**/Debug-iphoneos/iOS-SwiftUITests-Runner.app
85+
**/Test-iphoneos/iOS-Swift.app
86+
**/Test-iphoneos/iOS-SwiftUITests-Runner.app
8787
8888
run-ui-tests-with-sauce:
8989
name: Run UI Tests for iOS ${{ matrix.suite }} on Sauce Labs

‎.sauce/config.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ defaults:
88
timeout: 20m
99

1010
xcuitest:
11-
app: ./DerivedData/Build/Products/Debug-iphoneos/iOS-Swift.app
12-
testApp: ./DerivedData/Build/Products/Debug-iphoneos/iOS-SwiftUITests-Runner.app
11+
app: ./DerivedData/Build/Products/Test-iphoneos/iOS-Swift.app
12+
testApp: ./DerivedData/Build/Products/Test-iphoneos/iOS-SwiftUITests-Runner.app
1313

1414
suites:
1515

‎CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
# Changelog
22

3+
## Unreleased
4+
5+
### Fixes
6+
7+
- Correctly track and send GPU frame render data in profiles (#2823)
8+
39
## 8.3.3
410

511
### Fixes

‎Samples/iOS-Swift/iOS-Swift.xcodeproj/project.pbxproj

Lines changed: 22 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@
2626
848A256B286E3351008A8858 /* Sentry.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 630853322440C44F00DDE4CE /* Sentry.framework */; };
2727
848A256D286E3351008A8858 /* fatal-error-binary-images-message2.json in Resources */ = {isa = PBXBuildFile; fileRef = D83A30DF279F1F5C00372D0A /* fatal-error-binary-images-message2.json */; };
2828
848A256F286E3351008A8858 /* Sentry.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 630853322440C44F00DDE4CE /* Sentry.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
29+
84A5D72629D2705000388BFA /* ProfilingUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84A5D72529D2705000388BFA /* ProfilingUITests.swift */; };
30+
84A5D72D29D2708D00388BFA /* UITestHelpers.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84A5D72C29D2708D00388BFA /* UITestHelpers.swift */; };
2931
84B527B928DD24BA00475E8D /* SentryDeviceTests.mm in Sources */ = {isa = PBXBuildFile; fileRef = 84B527B728DD24BA00475E8D /* SentryDeviceTests.mm */; };
3032
84B527BD28DD25E400475E8D /* SentryDevice.mm in Sources */ = {isa = PBXBuildFile; fileRef = 84B527BC28DD25E400475E8D /* SentryDevice.mm */; };
3133
84BE546F287503F100ACC735 /* SentrySDKPerformanceBenchmarkTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 84BE546E287503F100ACC735 /* SentrySDKPerformanceBenchmarkTests.m */; };
@@ -278,6 +280,8 @@
278280
7BFC8B0526D4D24B000D3504 /* LoremIpsum.txt */ = {isa = PBXFileReference; lastKnownFileType = text; path = LoremIpsum.txt; sourceTree = "<group>"; };
279281
848A2573286E3351008A8858 /* PerformanceBenchmarks.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = PerformanceBenchmarks.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
280282
848A2578286E3490008A8858 /* PerformanceBenchmarks-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "PerformanceBenchmarks-Info.plist"; sourceTree = "<group>"; };
283+
84A5D72529D2705000388BFA /* ProfilingUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProfilingUITests.swift; sourceTree = "<group>"; };
284+
84A5D72C29D2708D00388BFA /* UITestHelpers.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UITestHelpers.swift; sourceTree = "<group>"; };
281285
84B527B728DD24BA00475E8D /* SentryDeviceTests.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = SentryDeviceTests.mm; path = ../../../Tests/SentryTests/Helper/SentryDeviceTests.mm; sourceTree = "<group>"; };
282286
84B527BB28DD25E400475E8D /* SentryDevice.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SentryDevice.h; path = ../../../Sources/Sentry/include/SentryDevice.h; sourceTree = "<group>"; };
283287
84B527BC28DD25E400475E8D /* SentryDevice.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = SentryDevice.mm; path = ../../../Sources/Sentry/SentryDevice.mm; sourceTree = "<group>"; };
@@ -454,6 +458,8 @@
454458
children = (
455459
D83A30DF279F1F5C00372D0A /* fatal-error-binary-images-message2.json */,
456460
7B64386A26A6C544000D0F65 /* LaunchUITests.swift */,
461+
84A5D72C29D2708D00388BFA /* UITestHelpers.swift */,
462+
84A5D72529D2705000388BFA /* ProfilingUITests.swift */,
457463
84B527B728DD24BA00475E8D /* SentryDeviceTests.mm */,
458464
84B527BB28DD25E400475E8D /* SentryDevice.h */,
459465
84B527BC28DD25E400475E8D /* SentryDevice.mm */,
@@ -882,6 +888,8 @@
882888
isa = PBXSourcesBuildPhase;
883889
buildActionMask = 2147483647;
884890
files = (
891+
84A5D72629D2705000388BFA /* ProfilingUITests.swift in Sources */,
892+
84A5D72D29D2708D00388BFA /* UITestHelpers.swift in Sources */,
885893
84B527B928DD24BA00475E8D /* SentryDeviceTests.mm in Sources */,
886894
7B64386B26A6C544000D0F65 /* LaunchUITests.swift in Sources */,
887895
84B527BD28DD25E400475E8D /* SentryDevice.mm in Sources */,
@@ -1364,8 +1372,8 @@
13641372
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
13651373
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
13661374
CODE_SIGN_ENTITLEMENTS = "iOS-Swift/iOS-Swift.entitlements";
1367-
CODE_SIGN_IDENTITY = "iPhone Distribution";
1368-
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Distribution";
1375+
CODE_SIGN_IDENTITY = "iPhone Developer";
1376+
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
13691377
CODE_SIGN_STYLE = Manual;
13701378
CURRENT_PROJECT_VERSION = 1;
13711379
DEVELOPMENT_TEAM = 97JCY7859U;
@@ -1378,7 +1386,7 @@
13781386
MARKETING_VERSION = 7.27.0;
13791387
PRODUCT_BUNDLE_IDENTIFIER = "io.sentry.sample.iOS-Swift";
13801388
PRODUCT_NAME = "$(TARGET_NAME)";
1381-
PROVISIONING_PROFILE_SPECIFIER = "match AppStore io.sentry.sample.iOS-Swift";
1389+
PROVISIONING_PROFILE_SPECIFIER = "match Development io.sentry.sample.iOS-Swift";
13821390
"PROVISIONING_PROFILE_SPECIFIER[sdk=macosx*]" = "";
13831391
SUPPORTS_MACCATALYST = YES;
13841392
SWIFT_OBJC_BRIDGING_HEADER = "iOS-Swift/Tools/iOS-Swift-Bridging-Header.h";
@@ -1390,7 +1398,7 @@
13901398
84D4FE8228ECD1EA00EDAAFE /* Test */ = {
13911399
isa = XCBuildConfiguration;
13921400
buildSettings = {
1393-
CODE_SIGN_IDENTITY = "iPhone Distribution";
1401+
CODE_SIGN_IDENTITY = "iPhone Developer";
13941402
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
13951403
CODE_SIGN_STYLE = Manual;
13961404
DEVELOPMENT_TEAM = 97JCY7859U;
@@ -1403,7 +1411,7 @@
14031411
);
14041412
PRODUCT_BUNDLE_IDENTIFIER = "io.sentry.iOS-SwiftUITests";
14051413
PRODUCT_NAME = "$(TARGET_NAME)";
1406-
PROVISIONING_PROFILE_SPECIFIER = "match AppStore io.sentry.iOS-SwiftUITests.xctrunner";
1414+
PROVISIONING_PROFILE_SPECIFIER = "match Development io.sentry.iOS-SwiftUITests.xctrunner";
14071415
"PROVISIONING_PROFILE_SPECIFIER[sdk=macosx*]" = "";
14081416
SWIFT_VERSION = 5.0;
14091417
TARGETED_DEVICE_FAMILY = "1,2";
@@ -1441,7 +1449,7 @@
14411449
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
14421450
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
14431451
CODE_SIGN_ENTITLEMENTS = "iOS-SwiftClip/iOS_SwiftClip.entitlements";
1444-
CODE_SIGN_IDENTITY = "iPhone Distribution";
1452+
CODE_SIGN_IDENTITY = "iPhone Developer";
14451453
CODE_SIGN_STYLE = Manual;
14461454
CURRENT_PROJECT_VERSION = 1;
14471455
DEVELOPMENT_TEAM = 97JCY7859U;
@@ -1463,7 +1471,7 @@
14631471
MARKETING_VERSION = 7.27.0;
14641472
PRODUCT_BUNDLE_IDENTIFIER = "io.sentry.sample.iOS-Swift.Clip";
14651473
PRODUCT_NAME = "$(TARGET_NAME)";
1466-
PROVISIONING_PROFILE_SPECIFIER = "match AppStore io.sentry.sample.iOS-Swift.Clip";
1474+
PROVISIONING_PROFILE_SPECIFIER = "match Development io.sentry.sample.iOS-Swift.Clip";
14671475
SWIFT_EMIT_LOC_STRINGS = YES;
14681476
SWIFT_VERSION = 5.0;
14691477
TARGETED_DEVICE_FAMILY = "1,2";
@@ -1587,8 +1595,8 @@
15871595
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
15881596
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
15891597
CODE_SIGN_ENTITLEMENTS = "iOS-Swift/iOS-Swift.entitlements";
1590-
CODE_SIGN_IDENTITY = "iPhone Distribution";
1591-
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Distribution";
1598+
CODE_SIGN_IDENTITY = "iPhone Developer";
1599+
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
15921600
CODE_SIGN_STYLE = Manual;
15931601
CURRENT_PROJECT_VERSION = 1;
15941602
DEVELOPMENT_TEAM = 97JCY7859U;
@@ -1601,7 +1609,7 @@
16011609
MARKETING_VERSION = 7.27.0;
16021610
PRODUCT_BUNDLE_IDENTIFIER = "io.sentry.sample.iOS-Swift";
16031611
PRODUCT_NAME = "$(TARGET_NAME)";
1604-
PROVISIONING_PROFILE_SPECIFIER = "match AppStore io.sentry.sample.iOS-Swift";
1612+
PROVISIONING_PROFILE_SPECIFIER = "match Development io.sentry.sample.iOS-Swift";
16051613
"PROVISIONING_PROFILE_SPECIFIER[sdk=macosx*]" = "";
16061614
SUPPORTS_MACCATALYST = YES;
16071615
SWIFT_OBJC_BRIDGING_HEADER = "iOS-Swift/Tools/iOS-Swift-Bridging-Header.h";
@@ -1613,7 +1621,7 @@
16131621
84D4FE8A28ECD1ED00EDAAFE /* TestCI */ = {
16141622
isa = XCBuildConfiguration;
16151623
buildSettings = {
1616-
CODE_SIGN_IDENTITY = "iPhone Distribution";
1624+
CODE_SIGN_IDENTITY = "iPhone Developer";
16171625
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
16181626
CODE_SIGN_STYLE = Manual;
16191627
DEVELOPMENT_TEAM = 97JCY7859U;
@@ -1626,7 +1634,7 @@
16261634
);
16271635
PRODUCT_BUNDLE_IDENTIFIER = "io.sentry.iOS-SwiftUITests";
16281636
PRODUCT_NAME = "$(TARGET_NAME)";
1629-
PROVISIONING_PROFILE_SPECIFIER = "match AppStore io.sentry.iOS-SwiftUITests.xctrunner";
1637+
PROVISIONING_PROFILE_SPECIFIER = "match Development io.sentry.iOS-SwiftUITests.xctrunner";
16301638
"PROVISIONING_PROFILE_SPECIFIER[sdk=macosx*]" = "";
16311639
SWIFT_VERSION = 5.0;
16321640
TARGETED_DEVICE_FAMILY = "1,2";
@@ -1664,7 +1672,7 @@
16641672
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
16651673
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
16661674
CODE_SIGN_ENTITLEMENTS = "iOS-SwiftClip/iOS_SwiftClip.entitlements";
1667-
CODE_SIGN_IDENTITY = "iPhone Distribution";
1675+
CODE_SIGN_IDENTITY = "iPhone Developer";
16681676
CODE_SIGN_STYLE = Manual;
16691677
CURRENT_PROJECT_VERSION = 1;
16701678
DEVELOPMENT_TEAM = 97JCY7859U;
@@ -1686,7 +1694,7 @@
16861694
MARKETING_VERSION = 7.27.0;
16871695
PRODUCT_BUNDLE_IDENTIFIER = "io.sentry.sample.iOS-Swift.Clip";
16881696
PRODUCT_NAME = "$(TARGET_NAME)";
1689-
PROVISIONING_PROFILE_SPECIFIER = "match AppStore io.sentry.sample.iOS-Swift.Clip";
1697+
PROVISIONING_PROFILE_SPECIFIER = "match Development io.sentry.sample.iOS-Swift.Clip";
16901698
SWIFT_EMIT_LOC_STRINGS = YES;
16911699
SWIFT_VERSION = 5.0;
16921700
TARGETED_DEVICE_FAMILY = "1,2";

0 commit comments

Comments
 (0)