From 0bbd9020edcded2e807dd2131f1fdde3a7fdaae5 Mon Sep 17 00:00:00 2001 From: Jonah Williams Date: Tue, 10 Nov 2020 12:49:50 -0800 Subject: [PATCH] [flutter_tools] remove experiment tracking analytics for null safety (#70183) --- .../lib/src/isolated/resident_web_runner.dart | 1 - .../lib/src/reporting/events.dart | 4 ---- .../lib/src/resident_runner.dart | 5 ---- packages/flutter_tools/lib/src/run_hot.dart | 5 ---- .../lib/src/runner/flutter_command.dart | 5 ---- .../commands.shard/hermetic/run_test.dart | 2 +- .../general.shard/resident_runner_test.dart | 4 ---- .../runner/flutter_command_test.dart | 24 ------------------- 8 files changed, 1 insertion(+), 49 deletions(-) diff --git a/packages/flutter_tools/lib/src/isolated/resident_web_runner.dart b/packages/flutter_tools/lib/src/isolated/resident_web_runner.dart index 3ec5c77541a..9df21c979ed 100644 --- a/packages/flutter_tools/lib/src/isolated/resident_web_runner.dart +++ b/packages/flutter_tools/lib/src/isolated/resident_web_runner.dart @@ -633,7 +633,6 @@ class _ResidentWebRunner extends ResidentWebRunner { fullRestart: true, reason: reason, overallTimeInMs: timer.elapsed.inMilliseconds, - nullSafety: usageNullSafety, fastReassemble: null, ).send(); } diff --git a/packages/flutter_tools/lib/src/reporting/events.dart b/packages/flutter_tools/lib/src/reporting/events.dart index ac4fab2ef2c..7a557b87b3a 100644 --- a/packages/flutter_tools/lib/src/reporting/events.dart +++ b/packages/flutter_tools/lib/src/reporting/events.dart @@ -39,7 +39,6 @@ class HotEvent extends UsageEvent { @required this.sdkName, @required this.emulator, @required this.fullRestart, - @required this.nullSafety, @required this.fastReassemble, this.reason, this.finalLibraryCount, @@ -57,7 +56,6 @@ class HotEvent extends UsageEvent { final String sdkName; final bool emulator; final bool fullRestart; - final bool nullSafety; final bool fastReassemble; final int finalLibraryCount; final int syncedLibraryCount; @@ -93,8 +91,6 @@ class HotEvent extends UsageEvent { CustomDimensions.hotEventTransferTimeInMs: transferTimeInMs.toString(), if (overallTimeInMs != null) CustomDimensions.hotEventOverallTimeInMs: overallTimeInMs.toString(), - if (nullSafety != null) - CustomDimensions.nullSafety: nullSafety.toString(), if (fastReassemble != null) CustomDimensions.fastReassemble: fastReassemble.toString(), }); diff --git a/packages/flutter_tools/lib/src/resident_runner.dart b/packages/flutter_tools/lib/src/resident_runner.dart index 07688c6c8c6..2126079033a 100644 --- a/packages/flutter_tools/lib/src/resident_runner.dart +++ b/packages/flutter_tools/lib/src/resident_runner.dart @@ -789,11 +789,6 @@ abstract class ResidentRunner { Completer _finished = Completer(); bool hotMode; - /// Whether the compiler was instructed to run with null-safety enabled. - @protected - bool get usageNullSafety => debuggingOptions?.buildInfo - ?.extraFrontEndOptions?.any((String option) => option.contains('non-nullable')) ?? false; - /// Returns true if every device is streaming observatory URIs. bool get isWaitingForObservatory { return flutterDevices.every((FlutterDevice device) { diff --git a/packages/flutter_tools/lib/src/run_hot.dart b/packages/flutter_tools/lib/src/run_hot.dart index e7feae562a3..55347ac54e1 100644 --- a/packages/flutter_tools/lib/src/run_hot.dart +++ b/packages/flutter_tools/lib/src/run_hot.dart @@ -699,7 +699,6 @@ class HotRunner extends ResidentRunner { sdkName: sdkName, emulator: emulator, fullRestart: true, - nullSafety: usageNullSafety, reason: reason, fastReassemble: null, ).send(); @@ -750,7 +749,6 @@ class HotRunner extends ResidentRunner { emulator: emulator, fullRestart: false, reason: reason, - nullSafety: usageNullSafety, fastReassemble: null, ).send(); } else { @@ -759,7 +757,6 @@ class HotRunner extends ResidentRunner { sdkName: sdkName, emulator: emulator, fullRestart: false, - nullSafety: usageNullSafety, reason: reason, fastReassemble: null, ).send(); @@ -961,7 +958,6 @@ class HotRunner extends ResidentRunner { syncedBytes: updatedDevFS.syncedBytes, invalidatedSourcesCount: updatedDevFS.invalidatedSourcesCount, transferTimeInMs: devFSTimer.elapsed.inMilliseconds, - nullSafety: usageNullSafety, fastReassemble: featureFlags.isSingleWidgetReloadEnabled ? updatedDevFS.fastReassembleClassName != null : null, @@ -1024,7 +1020,6 @@ class HotRunner extends ResidentRunner { emulator: emulator, fullRestart: false, reason: reason, - nullSafety: usageNullSafety, fastReassemble: null, ).send(); // Reset devFS lastCompileTime to ensure the file will still be marked diff --git a/packages/flutter_tools/lib/src/runner/flutter_command.dart b/packages/flutter_tools/lib/src/runner/flutter_command.dart index 243c03e4bef..b0a752adb88 100644 --- a/packages/flutter_tools/lib/src/runner/flutter_command.dart +++ b/packages/flutter_tools/lib/src/runner/flutter_command.dart @@ -1014,10 +1014,6 @@ abstract class FlutterCommand extends Command { ); } - List get _enabledExperiments => argParser.options.containsKey(FlutterOptions.kEnableExperiment) - ? stringsArg(FlutterOptions.kEnableExperiment) - : []; - /// Perform validation then call [runCommand] to execute the command. /// Return a [Future] that completes with an exit code /// indicating whether execution was successful. @@ -1072,7 +1068,6 @@ abstract class FlutterCommand extends Command { { ...?await usageValues, CustomDimensions.commandHasTerminal: globals.stdio.hasTerminal, - CustomDimensions.nullSafety: _enabledExperiments.contains('non-nullable'), }; Usage.command(commandPath, parameters: additionalUsageValues); } diff --git a/packages/flutter_tools/test/commands.shard/hermetic/run_test.dart b/packages/flutter_tools/test/commands.shard/hermetic/run_test.dart index 4d530081241..8506b839dcd 100644 --- a/packages/flutter_tools/test/commands.shard/hermetic/run_test.dart +++ b/packages/flutter_tools/test/commands.shard/hermetic/run_test.dart @@ -376,7 +376,7 @@ void main() { ); // Allow any CustomDimensions.localTime (cd33) timestamp. final RegExp usageRegexp = RegExp( - 'screenView {cd3: false, cd4: ios, cd22: iOS 13, cd23: debug, cd18: false, cd15: swift, cd31: false, cd47: false, cd33: .*, viewName: run' + 'screenView {cd3: false, cd4: ios, cd22: iOS 13, cd23: debug, cd18: false, cd15: swift, cd31: false, cd33: .*, viewName: run' ); expect(buffer.toString(), matches(usageRegexp)); }, overrides: { diff --git a/packages/flutter_tools/test/general.shard/resident_runner_test.dart b/packages/flutter_tools/test/general.shard/resident_runner_test.dart index 25e8aba8fb3..44a88a8835c 100644 --- a/packages/flutter_tools/test/general.shard/resident_runner_test.dart +++ b/packages/flutter_tools/test/general.shard/resident_runner_test.dart @@ -525,7 +525,6 @@ void main() { cdKey(CustomDimensions.hotEventSdkName): 'Example', cdKey(CustomDimensions.hotEventEmulator): 'false', cdKey(CustomDimensions.hotEventFullRestart): 'false', - cdKey(CustomDimensions.nullSafety): 'false', })).called(1); expect(fakeVmServiceHost.hasRemainingExpectations, false); }, overrides: { @@ -580,7 +579,6 @@ void main() { cdKey(CustomDimensions.hotEventSdkName): 'Example', cdKey(CustomDimensions.hotEventEmulator): 'false', cdKey(CustomDimensions.hotEventFullRestart): 'false', - cdKey(CustomDimensions.nullSafety): 'false', })).called(1); expect(fakeVmServiceHost.hasRemainingExpectations, false); }, overrides: { @@ -645,7 +643,6 @@ void main() { cdKey(CustomDimensions.hotEventSdkName): 'Example', cdKey(CustomDimensions.hotEventEmulator): 'false', cdKey(CustomDimensions.hotEventFullRestart): 'false', - cdKey(CustomDimensions.nullSafety): 'true', })).called(1); expect(fakeVmServiceHost.hasRemainingExpectations, false); }, overrides: { @@ -1398,7 +1395,6 @@ void main() { cdKey(CustomDimensions.hotEventSdkName): 'Example', cdKey(CustomDimensions.hotEventEmulator): 'false', cdKey(CustomDimensions.hotEventFullRestart): 'true', - cdKey(CustomDimensions.nullSafety): 'false', })).called(1); expect(fakeVmServiceHost.hasRemainingExpectations, false); }, overrides: { diff --git a/packages/flutter_tools/test/general.shard/runner/flutter_command_test.dart b/packages/flutter_tools/test/general.shard/runner/flutter_command_test.dart index 0e9dc16584f..78c83329065 100644 --- a/packages/flutter_tools/test/general.shard/runner/flutter_command_test.dart +++ b/packages/flutter_tools/test/general.shard/runner/flutter_command_test.dart @@ -96,30 +96,6 @@ void main() { expect(flutterCommand.hidden, isTrue); }); - testUsingContext('null-safety is surfaced in command usage analytics', () async { - final FakeNullSafeCommand fake = FakeNullSafeCommand(); - final CommandRunner commandRunner = createTestCommandRunner(fake); - - await commandRunner.run(['safety', '--enable-experiment=non-nullable']); - - final VerificationResult resultA = verify(usage.sendCommand( - 'safety', - parameters: captureAnyNamed('parameters'), - )); - expect(resultA.captured.first, containsPair('cd47', 'true')); - reset(usage); - - await commandRunner.run(['safety', '--enable-experiment=foo']); - - final VerificationResult resultB = verify(usage.sendCommand( - 'safety', - parameters: captureAnyNamed('parameters'), - )); - expect(resultB.captured.first, containsPair('cd47', 'false')); - }, overrides: { - Usage: () => usage, - }); - testUsingContext('uses the error handling file system', () async { final DummyFlutterCommand flutterCommand = DummyFlutterCommand( commandFunction: () async {