firka/flutter
firka/flutter
5
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Suppress analytics flag pass through to analysis server (#123235)

Browse Source 
Suppress analytics flag pass through to analysis server
This commit is contained in:
Janice Collins 2023-03-24 12:59:15 -07:00 committed by GitHub
parent 726b7202a0
commit 81e9060968
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 72 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
packages/flutter_tools/lib/executable.dart
View File

@ -152,6 +152,7 @@ List<FlutterCommand> generateCommands({
platform: globals.platform,
),
],
suppressAnalytics: globals.flutterUsage.suppressAnalytics,
),
AssembleCommand(verboseHelp: verboseHelp, buildSystem: globals.buildSystem),
AttachCommand(

7
packages/flutter_tools/lib/src/commands/analyze.dart
View File

@ -29,13 +29,15 @@ class AnalyzeCommand extends FlutterCommand {
required ProcessManager processManager,
required Artifacts artifacts,
required List<ProjectValidator> allProjectValidators,
required bool suppressAnalytics,
}) : _artifacts = artifacts,
_fileSystem = fileSystem,
_processManager = processManager,
_logger = logger,
_terminal = terminal,
_allProjectValidators = allProjectValidators,
_platform = platform {
_platform = platform,
_suppressAnalytics = suppressAnalytics {
argParser.addFlag('flutter-repo',
negatable: false,
help: 'Include all the examples and tests from the Flutter repository.',
@ -109,6 +111,7 @@ class AnalyzeCommand extends FlutterCommand {
final ProcessManager _processManager;
final Platform _platform;
final List<ProjectValidator> _allProjectValidators;
final bool _suppressAnalytics;
@override
String get name => 'analyze';
@ -181,6 +184,7 @@ class AnalyzeCommand extends FlutterCommand {
processManager: _processManager,
terminal: _terminal,
artifacts: _artifacts,
suppressAnalytics: _suppressAnalytics,
).analyze();
} else {
await AnalyzeOnce(
@ -194,6 +198,7 @@ class AnalyzeCommand extends FlutterCommand {
processManager: _processManager,
terminal: _terminal,
artifacts: _artifacts,
suppressAnalytics: _suppressAnalytics,
).analyze();
}
return FlutterCommandResult.success();

3
packages/flutter_tools/lib/src/commands/analyze_base.dart
View File

@ -28,6 +28,7 @@ abstract class AnalyzeBase {
required this.processManager,
required this.terminal,
required this.artifacts,
required this.suppressAnalytics,
});
/// The parsed argument results for execution.
@ -48,6 +49,8 @@ abstract class AnalyzeBase {
final Terminal terminal;
@protected
final Artifacts artifacts;
@protected
final bool suppressAnalytics;
/// Called by [AnalyzeCommand] to start the analysis process.
Future<void> analyze();

2
packages/flutter_tools/lib/src/commands/analyze_continuously.dart
View File

@ -21,6 +21,7 @@ class AnalyzeContinuously extends AnalyzeBase {
required super.platform,
required super.processManager,
required super.artifacts,
required super.suppressAnalytics,
}) : super(
repoPackages: repoPackages,
repoRoots: repoRoots,
@ -63,6 +64,7 @@ class AnalyzeContinuously extends AnalyzeBase {
processManager: processManager,
terminal: terminal,
protocolTrafficLog: protocolTrafficLog,
suppressAnalytics: suppressAnalytics,
);
server.onAnalyzing.listen((bool isAnalyzing) => _handleAnalysisStatus(server, isAnalyzing));
server.onErrors.listen(_handleAnalysisErrors);

2
packages/flutter_tools/lib/src/commands/analyze_once.dart
View File

@ -22,6 +22,7 @@ class AnalyzeOnce extends AnalyzeBase {
required super.processManager,
required super.terminal,
required super.artifacts,
required super.suppressAnalytics,
this.workingDirectory,
}) : super(
repoRoots: repoRoots,
@ -67,6 +68,7 @@ class AnalyzeOnce extends AnalyzeBase {
processManager: processManager,
terminal: terminal,
protocolTrafficLog: protocolTrafficLog,
suppressAnalytics: suppressAnalytics,
);
Stopwatch? timer;

3
packages/flutter_tools/lib/src/dart/analysis.dart
View File

@ -25,6 +25,7 @@ class AnalysisServer {
required Logger logger,
required Platform platform,
required Terminal terminal,
required this.suppressAnalytics,
String? protocolTrafficLog,
}) : _fileSystem = fileSystem,
_processManager = processManager,
@ -41,6 +42,7 @@ class AnalysisServer {
final Platform _platform;
final Terminal _terminal;
final String? _protocolTrafficLog;
final bool suppressAnalytics;
Process? _process;
final StreamController<bool> _analyzingController =
@ -66,6 +68,7 @@ class AnalysisServer {
'--disable-server-feature-search',
'--sdk',
sdkPath,
if (suppressAnalytics) '--suppress-analytics',
if (_protocolTrafficLog != null)
'--protocol-traffic-log=$_protocolTrafficLog',
];

49
packages/flutter_tools/test/commands.shard/hermetic/analyze_continuously_test.dart
View File

@ -99,6 +99,7 @@ void main() {
processManager: processManager,
logger: logger,
terminal: terminal,
suppressAnalytics: true,
);
int errorCount = 0;
@ -139,6 +140,7 @@ void main() {
processManager: processManager,
logger: logger,
terminal: terminal,
suppressAnalytics: true,
);
int errorCount = 0;
@ -166,6 +168,7 @@ void main() {
processManager: processManager,
logger: logger,
terminal: terminal,
suppressAnalytics: true,
);
int errorCount = 0;
@ -179,7 +182,7 @@ void main() {
await server.dispose();
});
testUsingContext('Can run AnalysisService with customized cache location', () async {
testUsingContext('Can run AnalysisService without suppressing analytics', () async {
final StreamController<List<int>> stdin = StreamController<List<int>>();
final FakeProcessManager processManager = FakeProcessManager.list(
<FakeCommand>[
@ -206,6 +209,46 @@ void main() {
fileSystem: MemoryFileSystem.test(),
processManager: processManager,
allProjectValidators: <ProjectValidator>[],
suppressAnalytics: false,
);
final TestFlutterCommandRunner commandRunner = TestFlutterCommandRunner();
commandRunner.addCommand(command);
unawaited(commandRunner.run(<String>['analyze', '--watch']));
await stdin.stream.first;
expect(processManager, hasNoRemainingExpectations);
});
testUsingContext('Can run AnalysisService with customized cache location', () async {
final StreamController<List<int>> stdin = StreamController<List<int>>();
final FakeProcessManager processManager = FakeProcessManager.list(
<FakeCommand>[
FakeCommand(
command: const <String>[
'Artifact.engineDartSdkPath/bin/dart',
'--disable-dart-dev',
'Artifact.engineDartSdkPath/bin/snapshots/analysis_server.dart.snapshot',
'--disable-server-feature-completion',
'--disable-server-feature-search',
'--sdk',
'Artifact.engineDartSdkPath',
'--suppress-analytics',
],
stdin: IOSink(stdin.sink),
),
]);
final Artifacts artifacts = Artifacts.test();
final AnalyzeCommand command = AnalyzeCommand(
terminal: Terminal.test(),
artifacts: artifacts,
logger: BufferLogger.test(),
platform: FakePlatform(),
fileSystem: MemoryFileSystem.test(),
processManager: processManager,
allProjectValidators: <ProjectValidator>[],
suppressAnalytics: true,
);
final TestFlutterCommandRunner commandRunner = TestFlutterCommandRunner();
@ -235,6 +278,7 @@ void main() {
'--disable-server-feature-search',
'--sdk',
'Artifact.engineDartSdkPath',
'--suppress-analytics',
],
stdin: IOSink(stdin.sink),
stdout: '''
@ -254,6 +298,7 @@ void main() {
fileSystem: fileSystem,
processManager: processManager,
allProjectValidators: <ProjectValidator>[],
suppressAnalytics: true,
);
await FakeAsync().run((FakeAsync time) async {
@ -288,6 +333,7 @@ void main() {
'--disable-server-feature-search',
'--sdk',
'Artifact.engineDartSdkPath',
'--suppress-analytics',
],
stdin: IOSink(stdin.sink),
stdout: '''
@ -307,6 +353,7 @@ void main() {
fileSystem: MemoryFileSystem.test(),
processManager: processManager,
allProjectValidators: <ProjectValidator>[],
suppressAnalytics: true,
);
await FakeAsync().run((FakeAsync time) async {

3
packages/flutter_tools/test/commands.shard/hermetic/analyze_suggestion_test.dart
View File

@ -98,6 +98,7 @@ void main() {
ProjectValidatorDummy(),
ProjectValidatorSecondDummy()
],
suppressAnalytics: true,
);
final CommandRunner<void> runner = createTestCommandRunner(command);
@ -129,6 +130,7 @@ void main() {
allProjectValidators: <ProjectValidator>[
ProjectValidatorCrash(),
],
suppressAnalytics: true,
);
final CommandRunner<void> runner = createTestCommandRunner(command);
@ -149,6 +151,7 @@ void main() {
terminal: terminal,
processManager: processManager,
allProjectValidators: <ProjectValidator>[],
suppressAnalytics: true,
);
final CommandRunner<void> runner = createTestCommandRunner(command);
Future<void> result () => runner.run(<String>['analyze', '--suggestions', '--watch']);

2
packages/flutter_tools/test/commands.shard/hermetic/analyze_test.dart
View File

@ -70,6 +70,7 @@ void main() {
processManager: processManager,
terminal: terminal,
allProjectValidators: <ProjectValidator>[],
suppressAnalytics: true,
);
runner = createTestCommandRunner(command);
@ -95,6 +96,7 @@ void main() {
'--disable-server-feature-search',
'--sdk',
'Artifact.engineDartSdkPath',
'--suppress-analytics',
],
exitCode: SIGABRT,
stderr: stderr,

2
packages/flutter_tools/test/integration.shard/analyze_suggestions_integration_test.dart
View File

@ -37,6 +37,7 @@ void main() {
terminal: globals.terminal,
processManager: globals.processManager,
allProjectValidators: <ProjectValidator>[GeneralInfoProjectValidator()],
suppressAnalytics: true,
);
final CommandRunner<void> runner = createTestCommandRunner(command);
@ -73,6 +74,7 @@ void main() {
allProjectValidators: <ProjectValidator>[
PubDependenciesProjectValidator(globals.processManager),
],
suppressAnalytics: true,
);
final CommandRunner<void> runner = createTestCommandRunner(command);