Reland "Enable caching of CPU samples collected at application startup (#89600)" (#92220)

This reverts commit dc7fea8d197c5ebf192e8e6dc2d8773556a3dd7b.
This commit is contained in:
Ben Konyi 2021-10-20 19:20:17 -07:00 committed by GitHub
parent c63c495f0b
commit ba0321e95d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 15 additions and 3 deletions

View File

@ -17,6 +17,7 @@ Future<dds.DartDevelopmentService> Function(
bool enableAuthCodes,
bool ipv6,
Uri? serviceUri,
List<String> cachedUserTags,
}) ddsLauncherCallback = dds.DartDevelopmentService.startDartDevelopmentService;
/// Helper class to launch a [dds.DartDevelopmentService]. Allows for us to
@ -36,6 +37,7 @@ class DartDevelopmentService {
int? hostPort,
bool? ipv6,
bool? disableServiceAuthCodes,
bool cacheStartupProfile = false,
}) async {
final Uri ddsUri = Uri(
scheme: 'http',
@ -52,6 +54,8 @@ class DartDevelopmentService {
serviceUri: ddsUri,
enableAuthCodes: disableServiceAuthCodes != true,
ipv6: ipv6 == true,
// Enables caching of CPU samples collected during application startup.
cachedUserTags: cacheStartupProfile ? const <String>['AppStartUp'] : const <String>[],
);
unawaited(_ddsInstance?.done.whenComplete(() {
if (!_completer.isCompleted) {

View File

@ -70,6 +70,7 @@ Future<void> _kDefaultDartDevelopmentServiceStarter(
ipv6: true,
disableServiceAuthCodes: disableServiceAuthCodes,
logger: globals.logger,
cacheStartupProfile: true,
);
}

View File

@ -267,6 +267,7 @@ class FlutterDevice {
ipv6: ipv6,
disableServiceAuthCodes: disableServiceAuthCodes,
logger: globals.logger,
cacheStartupProfile: true,
);
} on dds.DartDevelopmentServiceException catch (e, st) {
if (!allowExistingDdsInstance ||

View File

@ -772,6 +772,7 @@ class FakeDartDevelopmentService extends Fake implements DartDevelopmentService
int hostPort,
bool ipv6,
bool disableServiceAuthCodes,
bool cacheStartupProfile = false,
}) async {}
@override

View File

@ -590,6 +590,7 @@ class FakeDartDevelopmentService extends Fake implements DartDevelopmentService
int hostPort,
bool ipv6,
bool disableServiceAuthCodes,
bool cacheStartupProfile = false,
}) async {
started = true;
}

View File

@ -932,6 +932,7 @@ class FakeDartDevelopmentService extends Fake implements DartDevelopmentService
int hostPort,
bool ipv6,
bool disableServiceAuthCodes,
bool cacheStartupProfile = false,
}) async {}
@override

View File

@ -1809,11 +1809,12 @@ void main() {
fakeVmServiceHost = FakeVmServiceHost(requests: <VmServiceExpectation>[]);
final FakeDevice device = FakeDevice()
..dds = DartDevelopmentService();
ddsLauncherCallback = (Uri uri, {bool enableAuthCodes, bool ipv6, Uri serviceUri}) {
ddsLauncherCallback = (Uri uri, {bool enableAuthCodes, bool ipv6, Uri serviceUri, List<String> cachedUserTags}) {
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, <String>['AppStartUp']);
throw FakeDartDevelopmentServiceException(message:
'Existing VM service clients prevent DDS from taking control.',
);
@ -1856,11 +1857,12 @@ void main() {
final FakeDevice device = FakeDevice()
..dds = DartDevelopmentService();
final Completer<void>done = Completer<void>();
ddsLauncherCallback = (Uri uri, {bool enableAuthCodes, bool ipv6, Uri serviceUri}) async {
ddsLauncherCallback = (Uri uri, {bool enableAuthCodes, bool ipv6, Uri serviceUri, List<String> cachedUserTags}) 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, <String>['AppStartUp']);
done.complete();
return null;
};
@ -1887,11 +1889,12 @@ 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}) {
ddsLauncherCallback = (Uri uri, {bool enableAuthCodes, bool ipv6, Uri serviceUri, List<String> cachedUserTags}) {
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, <String>['AppStartUp']);
throw FakeDartDevelopmentServiceException(message: 'No URI');
};
final TestFlutterDevice flutterDevice = TestFlutterDevice(