From ac3c44355ae035b1e7f67881d956bcdfb8223e6f Mon Sep 17 00:00:00 2001 From: Ben Konyi Date: Wed, 20 Oct 2021 22:05:49 -0700 Subject: [PATCH] Revert "Reland "Enable caching of CPU samples collected at application startup (#89600)" (#92220)" (#92235) This reverts commit ba0321e95db8a166c854c4ace5546de35bcb75c5. --- packages/flutter_tools/lib/src/base/dds.dart | 4 ---- .../flutter_tools/lib/src/fuchsia/fuchsia_device.dart | 1 - packages/flutter_tools/lib/src/resident_runner.dart | 1 - .../test/commands.shard/hermetic/attach_test.dart | 1 - .../test/general.shard/drive/drive_service_test.dart | 1 - .../test/general.shard/fuchsia/fuchsia_device_test.dart | 1 - .../test/general.shard/resident_runner_test.dart | 9 +++------ 7 files changed, 3 insertions(+), 15 deletions(-) diff --git a/packages/flutter_tools/lib/src/base/dds.dart b/packages/flutter_tools/lib/src/base/dds.dart index 08d25b3abf..673b60aaa1 100644 --- a/packages/flutter_tools/lib/src/base/dds.dart +++ b/packages/flutter_tools/lib/src/base/dds.dart @@ -17,7 +17,6 @@ Future Function( bool enableAuthCodes, bool ipv6, Uri? serviceUri, - List cachedUserTags, }) ddsLauncherCallback = dds.DartDevelopmentService.startDartDevelopmentService; /// Helper class to launch a [dds.DartDevelopmentService]. Allows for us to @@ -37,7 +36,6 @@ class DartDevelopmentService { int? hostPort, bool? ipv6, bool? disableServiceAuthCodes, - bool cacheStartupProfile = false, }) async { final Uri ddsUri = Uri( scheme: 'http', @@ -54,8 +52,6 @@ class DartDevelopmentService { serviceUri: ddsUri, enableAuthCodes: disableServiceAuthCodes != true, ipv6: ipv6 == true, - // Enables caching of CPU samples collected during application startup. - cachedUserTags: cacheStartupProfile ? const ['AppStartUp'] : const [], ); unawaited(_ddsInstance?.done.whenComplete(() { if (!_completer.isCompleted) { diff --git a/packages/flutter_tools/lib/src/fuchsia/fuchsia_device.dart b/packages/flutter_tools/lib/src/fuchsia/fuchsia_device.dart index f38a2b44af..78e79c2463 100644 --- a/packages/flutter_tools/lib/src/fuchsia/fuchsia_device.dart +++ b/packages/flutter_tools/lib/src/fuchsia/fuchsia_device.dart @@ -70,7 +70,6 @@ Future _kDefaultDartDevelopmentServiceStarter( ipv6: true, disableServiceAuthCodes: disableServiceAuthCodes, logger: globals.logger, - cacheStartupProfile: true, ); } diff --git a/packages/flutter_tools/lib/src/resident_runner.dart b/packages/flutter_tools/lib/src/resident_runner.dart index aaeb626f1d..006d2776db 100644 --- a/packages/flutter_tools/lib/src/resident_runner.dart +++ b/packages/flutter_tools/lib/src/resident_runner.dart @@ -267,7 +267,6 @@ class FlutterDevice { ipv6: ipv6, disableServiceAuthCodes: disableServiceAuthCodes, logger: globals.logger, - cacheStartupProfile: true, ); } on dds.DartDevelopmentServiceException catch (e, st) { if (!allowExistingDdsInstance || diff --git a/packages/flutter_tools/test/commands.shard/hermetic/attach_test.dart b/packages/flutter_tools/test/commands.shard/hermetic/attach_test.dart index b583de559e..14151cefc9 100644 --- a/packages/flutter_tools/test/commands.shard/hermetic/attach_test.dart +++ b/packages/flutter_tools/test/commands.shard/hermetic/attach_test.dart @@ -772,7 +772,6 @@ class FakeDartDevelopmentService extends Fake implements DartDevelopmentService int hostPort, bool ipv6, bool disableServiceAuthCodes, - bool cacheStartupProfile = false, }) async {} @override diff --git a/packages/flutter_tools/test/general.shard/drive/drive_service_test.dart b/packages/flutter_tools/test/general.shard/drive/drive_service_test.dart index 16d453af7c..403ded6f41 100644 --- a/packages/flutter_tools/test/general.shard/drive/drive_service_test.dart +++ b/packages/flutter_tools/test/general.shard/drive/drive_service_test.dart @@ -590,7 +590,6 @@ class FakeDartDevelopmentService extends Fake implements DartDevelopmentService int hostPort, bool ipv6, bool disableServiceAuthCodes, - bool cacheStartupProfile = false, }) async { started = true; } diff --git a/packages/flutter_tools/test/general.shard/fuchsia/fuchsia_device_test.dart b/packages/flutter_tools/test/general.shard/fuchsia/fuchsia_device_test.dart index a94390cf7c..31997d73e2 100644 --- a/packages/flutter_tools/test/general.shard/fuchsia/fuchsia_device_test.dart +++ b/packages/flutter_tools/test/general.shard/fuchsia/fuchsia_device_test.dart @@ -932,7 +932,6 @@ class FakeDartDevelopmentService extends Fake implements DartDevelopmentService int hostPort, bool ipv6, bool disableServiceAuthCodes, - bool cacheStartupProfile = false, }) async {} @override 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 68d64f735b..6084bec0c7 100644 --- a/packages/flutter_tools/test/general.shard/resident_runner_test.dart +++ b/packages/flutter_tools/test/general.shard/resident_runner_test.dart @@ -1809,12 +1809,11 @@ void main() { fakeVmServiceHost = FakeVmServiceHost(requests: []); final FakeDevice device = FakeDevice() ..dds = DartDevelopmentService(); - ddsLauncherCallback = (Uri uri, {bool enableAuthCodes, bool ipv6, Uri serviceUri, List cachedUserTags}) { + ddsLauncherCallback = (Uri uri, {bool enableAuthCodes, bool ipv6, Uri serviceUri}) { expect(uri, Uri(scheme: 'foo', host: 'bar')); expect(enableAuthCodes, isTrue); expect(ipv6, isFalse); expect(serviceUri, Uri(scheme: 'http', host: '127.0.0.1', port: 0)); - expect(cachedUserTags, ['AppStartUp']); throw FakeDartDevelopmentServiceException(message: 'Existing VM service clients prevent DDS from taking control.', ); @@ -1857,12 +1856,11 @@ void main() { final FakeDevice device = FakeDevice() ..dds = DartDevelopmentService(); final Completerdone = Completer(); - ddsLauncherCallback = (Uri uri, {bool enableAuthCodes, bool ipv6, Uri serviceUri, List cachedUserTags}) async { + ddsLauncherCallback = (Uri uri, {bool enableAuthCodes, bool ipv6, Uri serviceUri}) async { expect(uri, Uri(scheme: 'foo', host: 'bar')); expect(enableAuthCodes, isFalse); expect(ipv6, isTrue); expect(serviceUri, Uri(scheme: 'http', host: '::1', port: 0)); - expect(cachedUserTags, ['AppStartUp']); done.complete(); return null; }; @@ -1889,12 +1887,11 @@ void main() { // See https://github.com/flutter/flutter/issues/72385 for context. final FakeDevice device = FakeDevice() ..dds = DartDevelopmentService(); - ddsLauncherCallback = (Uri uri, {bool enableAuthCodes, bool ipv6, Uri serviceUri, List cachedUserTags}) { + ddsLauncherCallback = (Uri uri, {bool enableAuthCodes, bool ipv6, Uri serviceUri}) { expect(uri, Uri(scheme: 'foo', host: 'bar')); expect(enableAuthCodes, isTrue); expect(ipv6, isFalse); expect(serviceUri, Uri(scheme: 'http', host: '127.0.0.1', port: 0)); - expect(cachedUserTags, ['AppStartUp']); throw FakeDartDevelopmentServiceException(message: 'No URI'); }; final TestFlutterDevice flutterDevice = TestFlutterDevice(