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

Jump to bottom

[PLAT-7432] Fix crash in -[BSGURLSessionTracingProxy forwardInvocation:] #1208

Merged
merged 2 commits into from
Oct 14, 2021
Merged

[PLAT-7432] Fix crash in -[BSGURLSessionTracingProxy forwardInvocation:] #1208

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
de556c2
Add BSGURLSessionTracingProxyTests and run on CI
nickdowell Oct 14, 2021
73bb197
Prevent crash in -[NSInvocation selector]
nickdowell Oct 14, 2021
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: 2 additions & 2 deletions .buildkite/pipeline.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ steps:
agents:
queue: opensource-mac-cocoa-10.13
commands:
- ./scripts/run-unit-tests.sh PLATFORM=iOS OS=9.3 DEVICE=iPhone\ 5s
- ./scripts/run-unit-tests.sh PLATFORM=iOS OS=9.3 DEVICE=iPhone\ 5s XCODEBUILD_EXTRA_ARGS=-skip-testing:BugsnagNetworkRequestPlugin-iOSTests
kstenerud marked this conversation as resolved.
Show resolved Hide resolved
artifact_paths:
- logs/*

Expand All @@ -117,7 +117,7 @@ steps:
agents:
queue: opensource-mac-cocoa-10.13
commands:
- ./scripts/run-unit-tests.sh PLATFORM=tvOS OS=9.2
- ./scripts/run-unit-tests.sh PLATFORM=tvOS OS=9.2 XCODEBUILD_EXTRA_ARGS=-skip-testing:BugsnagNetworkRequestPlugin-tvOSTests
kstenerud marked this conversation as resolved.
Show resolved Hide resolved
artifact_paths:
- logs/*

Expand Down
14 changes: 12 additions & 2 deletions Bugsnag.xcodeproj/xcshareddata/xcschemes/Bugsnag-iOS.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
LastUpgradeVersion = "1140"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
parallelizeBuildables = "NO"
buildImplicitDependencies = "NO">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
Expand Down Expand Up @@ -46,6 +46,16 @@
ReferencedContainer = "container:Bugsnag.xcodeproj">
</BuildableReference>
</TestableReference>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "CB487A6126D7B109004F6B87"
BuildableName = "BugsnagNetworkRequestPlugin-iOSTests.xctest"
BlueprintName = "BugsnagNetworkRequestPlugin-iOSTests"
ReferencedContainer = "container:BugsnagNetworkRequestPlugin/BugsnagNetworkRequestPlugin.xcodeproj">
</BuildableReference>
</TestableReference>
</Testables>
</TestAction>
<LaunchAction
Expand Down
52 changes: 0 additions & 52 deletions Bugsnag.xcodeproj/xcshareddata/xcschemes/Bugsnag-iOSTests.xcscheme
View file
Open in desktop

This file was deleted.

44 changes: 33 additions & 11 deletions Bugsnag.xcodeproj/xcshareddata/xcschemes/Bugsnag-macOS.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
LastUpgradeVersion = "1140"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
parallelizeBuildables = "NO"
buildImplicitDependencies = "NO">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
Expand All @@ -26,15 +26,9 @@
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES"
codeCoverageEnabled = "YES">
<AdditionalOptions>
<AdditionalOption
key = "MallocScribble"
value = ""
isEnabled = "YES">
</AdditionalOption>
</AdditionalOptions>
disableMainThreadChecker = "YES"
codeCoverageEnabled = "YES"
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
<TestableReference
skipped = "NO">
Expand All @@ -46,7 +40,24 @@
ReferencedContainer = "container:Bugsnag.xcodeproj">
</BuildableReference>
</TestableReference>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "CB487A8426D7B144004F6B87"
BuildableName = "BugsnagNetworkRequestPlugin-macOSTests.xctest"
BlueprintName = "BugsnagNetworkRequestPlugin-macOSTests"
ReferencedContainer = "container:BugsnagNetworkRequestPlugin/BugsnagNetworkRequestPlugin.xcodeproj">
</BuildableReference>
</TestableReference>
</Testables>
<AdditionalOptions>
<AdditionalOption
key = "MallocScribble"
value = ""
isEnabled = "YES">
</AdditionalOption>
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
Expand All @@ -58,6 +69,17 @@
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "00AD1CAC24869C1200A27979"
BuildableName = "Bugsnag.framework"
BlueprintName = "Bugsnag-macOS"
ReferencedContainer = "container:Bugsnag.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
Expand Down
52 changes: 0 additions & 52 deletions Bugsnag.xcodeproj/xcshareddata/xcschemes/Bugsnag-macOSTests.xcscheme
View file
Open in desktop

This file was deleted.

14 changes: 12 additions & 2 deletions Bugsnag.xcodeproj/xcshareddata/xcschemes/Bugsnag-tvOS.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
LastUpgradeVersion = "1140"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
parallelizeBuildables = "NO"
buildImplicitDependencies = "NO">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
Expand Down Expand Up @@ -46,6 +46,16 @@
ReferencedContainer = "container:Bugsnag.xcodeproj">
</BuildableReference>
</TestableReference>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "CB487AA426D7B172004F6B87"
BuildableName = "BugsnagNetworkRequestPlugin-tvOSTests.xctest"
BlueprintName = "BugsnagNetworkRequestPlugin-tvOSTests"
ReferencedContainer = "container:BugsnagNetworkRequestPlugin/BugsnagNetworkRequestPlugin.xcodeproj">
</BuildableReference>
</TestableReference>
</Testables>
</TestAction>
<LaunchAction
Expand Down
52 changes: 0 additions & 52 deletions Bugsnag.xcodeproj/xcshareddata/xcschemes/Bugsnag-tvOSTests.xcscheme
View file
Open in desktop

This file was deleted.

8 changes: 8 additions & 0 deletions BugsnagNetworkRequestPlugin/BugsnagNetworkRequestPlugin.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@
objects = {

/* Begin PBXBuildFile section */
016113862716EFBE002A50D4 /* BSGURLSessionTracingProxyTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 016113852716EFBE002A50D4 /* BSGURLSessionTracingProxyTests.m */; };
016113872716EFBE002A50D4 /* BSGURLSessionTracingProxyTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 016113852716EFBE002A50D4 /* BSGURLSessionTracingProxyTests.m */; };
016113882716EFBE002A50D4 /* BSGURLSessionTracingProxyTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 016113852716EFBE002A50D4 /* BSGURLSessionTracingProxyTests.m */; };
0196AA1026FB395E008E54FC /* BSGURLSessionTracingDelegateTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 0196AA0F26FB395E008E54FC /* BSGURLSessionTracingDelegateTests.m */; };
0196AA1126FB395E008E54FC /* BSGURLSessionTracingDelegateTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 0196AA0F26FB395E008E54FC /* BSGURLSessionTracingDelegateTests.m */; };
0196AA1226FB395E008E54FC /* BSGURLSessionTracingDelegateTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 0196AA0F26FB395E008E54FC /* BSGURLSessionTracingDelegateTests.m */; };
Expand Down Expand Up @@ -86,6 +89,7 @@
/* End PBXCopyFilesBuildPhase section */

/* Begin PBXFileReference section */
016113852716EFBE002A50D4 /* BSGURLSessionTracingProxyTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = BSGURLSessionTracingProxyTests.m; sourceTree = "<group>"; };
0196AA0F26FB395E008E54FC /* BSGURLSessionTracingDelegateTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = BSGURLSessionTracingDelegateTests.m; sourceTree = "<group>"; };
CB2430D726F1DA8A00CB5EC4 /* libBugsnagNetworkRequestPluginStatic.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libBugsnagNetworkRequestPluginStatic.a; sourceTree = BUILT_PRODUCTS_DIR; };
CB487A5926D7B109004F6B87 /* BugsnagNetworkRequestPlugin.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = BugsnagNetworkRequestPlugin.framework; sourceTree = BUILT_PRODUCTS_DIR; };
Expand Down Expand Up @@ -213,6 +217,7 @@
isa = PBXGroup;
children = (
0196AA0F26FB395E008E54FC /* BSGURLSessionTracingDelegateTests.m */,
016113852716EFBE002A50D4 /* BSGURLSessionTracingProxyTests.m */,
CB487A6726D7B109004F6B87 /* BugsnagNetworkRequestPluginTests.m */,
CB487A6926D7B109004F6B87 /* Info.plist */,
);
Expand Down Expand Up @@ -536,6 +541,7 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
016113862716EFBE002A50D4 /* BSGURLSessionTracingProxyTests.m in Sources */,
CB487AC226D7B9DB004F6B87 /* BugsnagNetworkRequestPluginTests.m in Sources */,
0196AA1026FB395E008E54FC /* BSGURLSessionTracingDelegateTests.m in Sources */,
);
Expand All @@ -556,6 +562,7 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
016113872716EFBE002A50D4 /* BSGURLSessionTracingProxyTests.m in Sources */,
CB487AC326D7B9DC004F6B87 /* BugsnagNetworkRequestPluginTests.m in Sources */,
0196AA1126FB395E008E54FC /* BSGURLSessionTracingDelegateTests.m in Sources */,
);
Expand All @@ -576,6 +583,7 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
016113882716EFBE002A50D4 /* BSGURLSessionTracingProxyTests.m in Sources */,
CB487AC426D7B9DD004F6B87 /* BugsnagNetworkRequestPluginTests.m in Sources */,
0196AA1226FB395E008E54FC /* BSGURLSessionTracingDelegateTests.m in Sources */,
);
Expand Down
4 changes: 1 addition & 3 deletions BugsnagNetworkRequestPlugin/BugsnagNetworkRequestPlugin/BSGURLSessionTracingDelegate.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,9 +83,7 @@ + (nonnull NSString *)URLStringWithoutQueryForComponents:(nonnull NSURLComponent
return string;
}

- (void)URLSession:(NSURLSession *)session
task:(NSURLSessionTask *)task
didFinishCollectingMetrics:(NSURLSessionTaskMetrics *)metrics
- (void)URLSession:(__unused NSURLSession *)session task:(NSURLSessionTask *)task didFinishCollectingMetrics:(NSURLSessionTaskMetrics *)metrics
API_AVAILABLE(macosx(10.12), ios(10.0), watchos(3.0), tvos(10.0)) {
if (g_sink != nil) {
// Note: Cannot use metrics transaction request because it might have a 0 length HTTP body.
Expand Down
Loading