Skip to content

Commit 7d70527

Browse files
authored
[CP-stable] Collect analytics about SwiftPM errors and warnings (#191746) (#192303)
### Issue Link: #181560 ### Impact Description: Flutter team is trying to improve SwiftPM migration experience by gathering more metrics. ### Changelog Description: [flutter/181560] When building iOS and macOS app, SwiftPM migration warnings and errors are not tracked in analytics. ### Workaround: None ### Risk: What is the risk level of this cherry-pick? ### Test Coverage: Are you confident that your fix is well-tested by automated tests? ### Validation Steps: N/A
1 parent 4c685f8 commit 7d70527

11 files changed

Lines changed: 1712 additions & 71 deletions

‎packages/flutter_tools/lib/src/ios/mac.dart‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -172,6 +172,11 @@ Future<XcodeBuildResult> buildXcodeProject({
172172
fileSystem: globals.fs,
173173
plistParser: globals.plistParser,
174174
config: globals.config,
175+
analytics: globals.analytics,
176+
hostPlatform: globals.platform,
177+
operatingSystemUtils: globals.os,
178+
flutterVersion: globals.flutterVersion,
179+
reportCrashes: !await globals.isRunningOnBot
175180
),
176181
SwiftPackageManagerGitignoreMigration(project, globals.logger),
177182
MetalAPIValidationMigrator.ios(app.project, globals.logger),
@@ -205,6 +210,7 @@ Future<XcodeBuildResult> buildXcodeProject({
205210
fileSystem: globals.fs,
206211
logger: globals.logger,
207212
cocoapods: globals.cocoaPods,
213+
analytics: globals.analytics,
208214
);
209215

210216
await removeExtendedAttributesForProject(
@@ -933,6 +939,7 @@ Future<void> diagnoseXcodeBuildFailure(
933939
platform: platform,
934940
logger: logger,
935941
fileSystem: fileSystem,
942+
analytics: analytics,
936943
device: device,
937944
);
938945

@@ -1160,6 +1167,7 @@ Future<bool> _handleIssues(
11601167
required FlutterDarwinPlatform platform,
11611168
required Logger logger,
11621169
required FileSystem fileSystem,
1170+
required Analytics analytics,
11631171
Device? device,
11641172
}) async {
11651173
var requiresProvisioningProfile = false;
@@ -1250,6 +1258,11 @@ Future<bool> _handleIssues(
12501258
final bool usesCocoapods = xcodeProject.podfile.existsSync();
12511259
final bool usesSwiftPackageManager = xcodeProject.usesSwiftPackageManager;
12521260
if (usesCocoapods && usesSwiftPackageManager) {
1261+
for (final module in duplicateModules) {
1262+
analytics.send(
1263+
Event.appleUsageEvent(workflow: 'duplicate-modules-build-failure', parameter: module),
1264+
);
1265+
}
12531266
logger.printError(
12541267
'Your project uses both CocoaPods and Swift Package Manager, which can '
12551268
'cause the above error. It may be caused by there being both a CocoaPod '

‎packages/flutter_tools/lib/src/macos/build_macos.dart‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,11 @@ Future<void> buildMacOS({
121121
fileSystem: globals.fs,
122122
plistParser: globals.plistParser,
123123
config: globals.config,
124+
analytics: globals.analytics,
125+
hostPlatform: globals.platform,
126+
operatingSystemUtils: globals.os,
127+
flutterVersion: globals.flutterVersion,
128+
reportCrashes: !await globals.isRunningOnBot
124129
),
125130
SwiftPackageManagerGitignoreMigration(flutterProject, globals.logger),
126131
MetalAPIValidationMigrator.macos(flutterProject.macos, globals.logger),
@@ -136,6 +141,7 @@ Future<void> buildMacOS({
136141
fileSystem: globals.fs,
137142
logger: globals.logger,
138143
cocoapods: globals.cocoaPods,
144+
analytics: globals.analytics,
139145
);
140146

141147
final String buildDirectoryPath = getMacOSBuildDirectory();

‎packages/flutter_tools/lib/src/macos/cocoapods.dart‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -540,6 +540,13 @@ class CocoaPods {
540540
),
541541
);
542542
if (missingPluginSupportsSwiftPM) {
543+
_analytics.send(
544+
Event.appleUsageEvent(
545+
workflow: 'cocoapod-swiftpm-interdependency-failure',
546+
parameter: requiringPlugin,
547+
result: missingPlugin,
548+
),
549+
);
543550
return 'Error: A dependency conflict has occurred because $requiringPlugin uses CocoaPods while '
544551
'$missingPlugin uses Swift Package Manager. Please contact the $requiringPlugin '
545552
'maintainers to request Swift Package Manager adoption.\n\n'

‎packages/flutter_tools/lib/src/macos/darwin_dependency_management.dart‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -175,6 +175,7 @@ class DarwinDependencyManagement {
175175
required FileSystem fileSystem,
176176
required Logger logger,
177177
required CocoaPods? cocoapods,
178+
required Analytics analytics,
178179
}) async {
179180
final bool projectUsesSwiftPM =
180181
xcodeProject.usesSwiftPackageManager &&
@@ -222,6 +223,7 @@ class DarwinDependencyManagement {
222223
cocoapodOnlyPlugins: cocoapodOnlyPlugins,
223224
logger: logger,
224225
platform: platform,
226+
analytics: analytics,
225227
);
226228

227229
await _printRemoveCocoapodIntegrationMessage(
@@ -279,6 +281,7 @@ class DarwinDependencyManagement {
279281
required List<String> cocoapodOnlyPlugins,
280282
required Logger logger,
281283
required FlutterDarwinPlatform platform,
284+
required Analytics analytics,
282285
}) {
283286
if (cocoapodOnlyPlugins.isEmpty) {
284287
return;
@@ -289,6 +292,11 @@ class DarwinDependencyManagement {
289292
'This will become an error in a future version of Flutter. Please contact the plugin '
290293
'maintainers to request Swift Package Manager adoption.',
291294
);
295+
for (final plugin in cocoapodOnlyPlugins) {
296+
analytics.send(
297+
Event.appleUsageEvent(workflow: 'cocoapod-only-plugin-warning', parameter: plugin),
298+
);
299+
}
292300
}
293301

294302
/// Print a message recommending removing CocoaPod integration when all plugins support SwiftPM.

0 commit comments

Comments
 (0)