github/flutter
7
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2025-06-03 00:51:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update helper message for --suppress-analytics (#124810)

Browse Source 
Fixes: https://github.com/flutter/flutter/issues/124808
This commit is contained in:
Elias Yishak 2023-04-19 10:00:20 -04:00 committed by GitHub
parent 59230759be
commit 3476b96652
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
packages/flutter_tools/lib/runner.dart
View File

@ -88,14 +88,6 @@ Future<int> run(
await globals.analytics.setTelemetry(value);
}
// If the user has opted out of legacy analytics, we will continue
// to opt them out of unified analytics and inform them
if (!globals.flutterUsage.enabled && globals.analytics.telemetryEnabled) {
await globals.analytics.setTelemetry(false);
globals.logger.printStatus(
'Please note that analytics reporting was already disabled, and will continue to be disabled.\n');
}
await runner.run(args);
// Triggering [runZoned]'s error callback does not necessarily mean that
@ -285,6 +277,11 @@ Future<int> _exit(int code, {required ShutdownHooks shutdownHooks}) async {
// Ensure that the consent message has been displayed for unified analytics
if (globals.analytics.shouldShowMessage) {
globals.logger.printStatus(globals.analytics.getConsentMessage);
if (!globals.flutterUsage.enabled) {
globals.printStatus(
'Please note that analytics reporting was already disabled, '
'and will continue to be disabled.\n');
}
// Because the legacy analytics may have also sent a message,
// the conditional below will print additional messaging informing
@ -296,8 +293,7 @@ Future<int> _exit(int code, {required ShutdownHooks shutdownHooks}) async {
'the flutter tool is migrating to a new analytics system. '
'Disabling analytics collection will disable both the legacy '
'and new analytics collection systems. '
'You can disable analytics reporting by running either `flutter --disable-telemetry` '
'or `flutter config --no-analytics\n');
'You can disable analytics reporting by running `flutter --disable-telemetry`\n');
}
// Invoking this will onboard the flutter tool onto

2
packages/flutter_tools/lib/src/runner/flutter_command_runner.dart
View File

@ -77,7 +77,7 @@ class FlutterCommandRunner extends CommandRunner<void> {
help: 'Allow Flutter to check for updates when this command runs.');
argParser.addFlag('suppress-analytics',
negatable: false,
help: 'Suppress analytics reporting when this command runs.');
help: 'Suppress analytics reporting for the current CLI invocation.');
argParser.addFlag('disable-telemetry',
negatable: false,
help: 'Disable telemetry reporting when this command runs.');

28
packages/flutter_tools/test/general.shard/runner/runner_test.dart
View File

@ -346,34 +346,6 @@ void main() {
ProcessManager: () => FakeProcessManager.any(),
},
);
testUsingContext(
'legacy analytics disabled will disable new analytics',
() async {
io.setExitFunctionForTests((int exitCode) {});
await runner.run(
<String>[],
() => <FlutterCommand>[],
// This flutterVersion disables crash reporting.
flutterVersion: '[user-branch]/',
shutdownHooks: ShutdownHooks(),
);
expect(globals.flutterUsage.enabled, false);
expect(globals.analytics.telemetryEnabled, false);
expect(testLogger.statusText.contains(
'Please note that analytics '
'reporting was already disabled'), true);
},
overrides: <Type, Generator>{
Analytics: () => FakeAnalytics(),
FileSystem: () => MemoryFileSystem.test(),
ProcessManager: () => FakeProcessManager.any(),
Usage: () => legacyAnalytics,
},
);
});
}