diff --git a/pkg/analysis_server/test/integration/support/integration_tests.dart b/pkg/analysis_server/test/integration/support/integration_tests.dart index 1d0e499e300..82b7c4a198f 100644 --- a/pkg/analysis_server/test/integration/support/integration_tests.dart +++ b/pkg/analysis_server/test/integration/support/integration_tests.dart @@ -521,11 +521,11 @@ class Server { var trimmedLine = line.trim(); // Guard against lines like: - // {"event":"server.connected","params":{...}}Observatory listening on ... - var observatoryMessage = 'Observatory listening on '; - if (trimmedLine.contains(observatoryMessage)) { + // {"event":"server.connected","params":{...}}The Dart VM service is listening on ... + var dartVMServiceMessage = 'The Dart VM service is listening on '; + if (trimmedLine.contains(dartVMServiceMessage)) { trimmedLine = trimmedLine - .substring(0, trimmedLine.indexOf(observatoryMessage)) + .substring(0, trimmedLine.indexOf(dartVMServiceMessage)) .trim(); } if (trimmedLine.isEmpty) { diff --git a/pkg/analysis_server/test/stress/utilities/server.dart b/pkg/analysis_server/test/stress/utilities/server.dart index b2eefa35d66..68ef712a0c7 100644 --- a/pkg/analysis_server/test/stress/utilities/server.dart +++ b/pkg/analysis_server/test/stress/utilities/server.dart @@ -762,7 +762,7 @@ class Server { var trimmedLine = line.trim(); if (trimmedLine.isEmpty || - trimmedLine.startsWith('Observatory listening on ')) { + trimmedLine.startsWith('The Dart VM service is listening on ')) { return; } logger?.log(fromServer, '$trimmedLine'); diff --git a/pkg/analysis_server_client/lib/src/server_base.dart b/pkg/analysis_server_client/lib/src/server_base.dart index dd9668c493f..34f3f2ecd53 100644 --- a/pkg/analysis_server_client/lib/src/server_base.dart +++ b/pkg/analysis_server_client/lib/src/server_base.dart @@ -113,11 +113,11 @@ abstract class ServerBase { var trimmedLine = line.trim(); // Guard against lines like: - // {"event":"server.connected","params":{...}}Observatory listening on ... - const observatoryMessage = 'Observatory listening on '; - if (trimmedLine.contains(observatoryMessage)) { + // {"event":"server.connected","params":{...}}The Dart VM service is listening on ... + const dartVMServiceMessage = 'The Dart VM service is listening on '; + if (trimmedLine.contains(dartVMServiceMessage)) { trimmedLine = trimmedLine - .substring(0, trimmedLine.indexOf(observatoryMessage)) + .substring(0, trimmedLine.indexOf(dartVMServiceMessage)) .trim(); } if (trimmedLine.isEmpty) { diff --git a/pkg/analysis_server_client/test/server_test.dart b/pkg/analysis_server_client/test/server_test.dart index 286938de77f..504f9f0e984 100644 --- a/pkg/analysis_server_client/test/server_test.dart +++ b/pkg/analysis_server_client/test/server_test.dart @@ -173,7 +173,7 @@ final _badErrorMessage = { }; Stream> _badMessage() async* { - yield utf8.encoder.convert('Observatory listening on foo bar\n'); + yield utf8.encoder.convert('The Dart VM service is listening on foo bar\n'); final sampleJson = { 'id': '0', 'error': _badErrorMessage, @@ -182,7 +182,7 @@ Stream> _badMessage() async* { } Stream> _eventMessage() async* { - yield utf8.encoder.convert('Observatory listening on foo bar\n'); + yield utf8.encoder.convert('The Dart VM service is listening on foo bar\n'); final sampleJson = { 'event': 'fooEvent', 'params': {'foo': 'bar', 'baz': 'bang'} @@ -191,7 +191,7 @@ Stream> _eventMessage() async* { } Stream> _goodMessage() async* { - yield utf8.encoder.convert('Observatory listening on foo bar\n'); + yield utf8.encoder.convert('The Dart VM service is listening on foo bar\n'); final sampleJson = { 'id': '0', 'result': {'foo': 'bar'} diff --git a/pkg/analyzer_plugin/test/integration/support/integration_tests.dart b/pkg/analyzer_plugin/test/integration/support/integration_tests.dart index 8fd6bffee84..52dbfbda036 100644 --- a/pkg/analyzer_plugin/test/integration/support/integration_tests.dart +++ b/pkg/analyzer_plugin/test/integration/support/integration_tests.dart @@ -443,7 +443,7 @@ class Server { .listen((String line) { lastCommunicationTime = currentElapseTime; var trimmedLine = line.trim(); - if (trimmedLine.startsWith('Observatory listening on ')) { + if (trimmedLine.startsWith('The Dart VM service is listening on ')) { return; } _recordStdio('RECV: $trimmedLine'); diff --git a/pkg/dartdev/test/commands/run_test.dart b/pkg/dartdev/test/commands/run_test.dart index bf0f031a72b..fc8bee97edb 100644 --- a/pkg/dartdev/test/commands/run_test.dart +++ b/pkg/dartdev/test/commands/run_test.dart @@ -14,7 +14,8 @@ import '../utils.dart'; const String soundNullSafetyMessage = 'Info: Compiling with sound null safety'; const devToolsMessagePrefix = 'The Dart DevTools debugger and profiler is available at: http://127.0.0.1:'; -const observatoryMessagePrefix = 'Observatory listening on http://127.0.0.1:'; +const dartVMServiceMessagePrefix = + 'The Dart VM service is listening on http://127.0.0.1:'; void main() { group('run', run, timeout: longTimeout); @@ -214,7 +215,7 @@ void main(List args) => print("$b $args"); expect( result.stdout, matches( - r'Observatory listening on http:\/\/127.0.0.1:8181\/[a-zA-Z0-9_-]+=\/\n.*'), + r'The Dart VM service is listening on http:\/\/127.0.0.1:8181\/[a-zA-Z0-9_-]+=\/\n.*'), ); expect(result.stderr, isEmpty); expect(result.exitCode, 0); @@ -236,7 +237,7 @@ void main(List args) => print("$b $args"); expect( result.stdout, - contains('Observatory listening on http://127.0.0.1:8181/\n'), + contains('The Dart VM service is listening on http://127.0.0.1:8181/\n'), ); expect(result.stderr, isEmpty); expect(result.exitCode, 0); @@ -258,7 +259,7 @@ void main(List args) => print("$b $args"); expect( result.stdout, matches( - r'Observatory listening on http:\/\/\[::1\]:8181\/[a-zA-Z0-9_-]+=\/\n.*'), + r'The Dart VM service is listening on http:\/\/\[::1\]:8181\/[a-zA-Z0-9_-]+=\/\n.*'), ); expect(result.stderr, isEmpty); expect(result.exitCode, 0); @@ -345,7 +346,8 @@ void main(List args) => print("$b $args"); ], ); final regexp = RegExp( - r'Observatory listening on http:\/\/127.0.0.1:(\d*)\/[a-zA-Z0-9_-]+=\/\n.*'); + r'The Dart VM service is listening on http:\/\/127.0.0.1:(\d*)\/[a-zA-Z0-9_-]+=\/\n.*', + ); final vmServicePort = int.parse(regexp.firstMatch(result.stdout)!.group(1)!); expect(server.port != vmServicePort, isTrue); @@ -380,7 +382,7 @@ void main(List args) => print("$b $args"); p.relativeFilePath, ]); expect(result.stdout, isNot(contains(devToolsMessagePrefix))); - expect(result.stdout, contains(observatoryMessagePrefix)); + expect(result.stdout, contains(dartVMServiceMessagePrefix)); }); test('dart simple', () async { @@ -391,7 +393,7 @@ void main(List args) => print("$b $args"); p.relativeFilePath, ]); expect(result.stdout, isNot(contains(devToolsMessagePrefix))); - expect(result.stdout, contains(observatoryMessagePrefix)); + expect(result.stdout, contains(dartVMServiceMessagePrefix)); }); }); @@ -405,7 +407,7 @@ void main(List args) => print("$b $args"); p.relativeFilePath, ]); expect(result.stdout, contains(devToolsMessagePrefix)); - expect(result.stdout, contains(observatoryMessagePrefix)); + expect(result.stdout, contains(dartVMServiceMessagePrefix)); }); test('dart simple', () async { @@ -416,7 +418,7 @@ void main(List args) => print("$b $args"); p.relativeFilePath, ]); expect(result.stdout, contains(devToolsMessagePrefix)); - expect(result.stdout, contains(observatoryMessagePrefix)); + expect(result.stdout, contains(dartVMServiceMessagePrefix)); }); }); }); diff --git a/pkg/dds/test/dap/integration/debug_attach_test.dart b/pkg/dds/test/dap/integration/debug_attach_test.dart index 810a15fa923..846b3db8080 100644 --- a/pkg/dds/test/dap/integration/debug_attach_test.dart +++ b/pkg/dds/test/dap/integration/debug_attach_test.dart @@ -50,7 +50,7 @@ main() { // The stdout also contains the Observatory+DevTools banners. .where( (line) => - !line.startsWith('Observatory listening on') && + !line.startsWith('The Dart VM service is listening on') && !line.startsWith( 'The Dart DevTools debugger and profiler is available at'), ) @@ -103,7 +103,7 @@ main() { // The stdout also contains the Observatory+DevTools banners. .where( (line) => - !line.startsWith('Observatory listening on') && + !line.startsWith('The Dart VM service is listening on') && !line.startsWith( 'The Dart DevTools debugger and profiler is available at'), ) diff --git a/pkg/dds/test/dap/integration/test_support.dart b/pkg/dds/test/dap/integration/test_support.dart index 7a55bb2cc2f..1c0dc21ef48 100644 --- a/pkg/dds/test/dap/integration/test_support.dart +++ b/pkg/dds/test/dap/integration/test_support.dart @@ -44,9 +44,10 @@ final verboseLogging = true; /// an authentication token. final vmServiceAuthCodePathPattern = RegExp(r'^/[\w_\-=]{5,15}/ws$'); -/// A [RegExp] that matches the "Observatory listening on" banner that is sent +/// A [RegExp] that matches the "The Dart VM service is listening on" banner that is sent /// by the VM when not using --write-service-info. -final vmServiceBannerPattern = RegExp(r'Observatory listening on ([^\s]+)\s'); +final vmServiceBannerPattern = + RegExp(r'The Dart VM service is listening on ([^\s]+)\s'); /// The root of the SDK containing the current running VM. final sdkRoot = path.dirname(path.dirname(Platform.resolvedExecutable)); diff --git a/pkg/front_end/test/hot_reload_e2e_test.dart b/pkg/front_end/test/hot_reload_e2e_test.dart index 07cf63b47b9..aa8e8557b87 100644 --- a/pkg/front_end/test/hot_reload_e2e_test.dart +++ b/pkg/front_end/test/hot_reload_e2e_test.dart @@ -86,8 +86,8 @@ abstract class TestCase { Future computeVmPort() async { var portLine = await lines[0]; - Expect.isTrue(observatoryPortRegExp.hasMatch(portLine)); - var match = observatoryPortRegExp.firstMatch(portLine); + Expect.isTrue(dartVMServicePortRegExp.hasMatch(portLine)); + var match = dartVMServicePortRegExp.firstMatch(portLine); return int.parse(match!.group(1)!); } @@ -384,5 +384,5 @@ const sourceC = r''' void g() {} '''; -RegExp observatoryPortRegExp = - new RegExp("Observatory listening on http://127.0.0.1:\([0-9]*\)/"); +RegExp dartVMServicePortRegExp = new RegExp( + "The Dart VM service is listening on http://127.0.0.1:\([0-9]*\)/"); diff --git a/pkg/front_end/test/vm_service_helper.dart b/pkg/front_end/test/vm_service_helper.dart index f2d3cb6a53e..ac33557897b 100644 --- a/pkg/front_end/test/vm_service_helper.dart +++ b/pkg/front_end/test/vm_service_helper.dart @@ -166,10 +166,10 @@ abstract class LaunchingVMServiceHelper extends VMServiceHelper { .transform(utf8.decoder) .transform(new LineSplitter()) .listen((line) { - const kObservatoryListening = 'Observatory listening on '; - if (line.startsWith(kObservatoryListening)) { + const kDartVMServiceListening = 'The Dart VM service is listening on '; + if (line.startsWith(kDartVMServiceListening)) { Uri observatoryUri = - Uri.parse(line.substring(kObservatoryListening.length)); + Uri.parse(line.substring(kDartVMServiceListening.length)); _setupAndRun(observatoryUri).catchError((e, st) { // Manually kill the process or it will leak, // see http://dartbug.com/42918 diff --git a/pkg/front_end/test/weekly_tester.dart b/pkg/front_end/test/weekly_tester.dart index 077210e2a6c..5f52e9869ba 100644 --- a/pkg/front_end/test/weekly_tester.dart +++ b/pkg/front_end/test/weekly_tester.dart @@ -169,7 +169,7 @@ Future run(List args, String id) async { .transform(new LineSplitter()) .listen((line) { print("$id stderr> $line"); - if (line.contains("Observatory listening on")) { + if (line.contains("The Dart VM service is listening on")) { observatoryLines.add(line); } }); @@ -178,7 +178,7 @@ Future run(List args, String id) async { .transform(new LineSplitter()) .listen((line) { print("$id stdout> $line"); - if (line.contains("Observatory listening on")) { + if (line.contains("The Dart VM service is listening on")) { observatoryLines.add(line); } }); diff --git a/pkg/vm/test/incremental_compiler_test.dart b/pkg/vm/test/incremental_compiler_test.dart index ef627acb68f..6e0473c9d79 100644 --- a/pkg/vm/test/incremental_compiler_test.dart +++ b/pkg/vm/test/incremental_compiler_test.dart @@ -499,9 +499,9 @@ main() { list.path ]); - const kObservatoryListening = 'Observatory listening on '; - final RegExp observatoryPortRegExp = - new RegExp("Observatory listening on http://127.0.0.1:\([0-9]*\)"); + const kDartVMServiceListening = 'The Dart VM service is listening on '; + final RegExp dartVMServicePortRegExp = new RegExp( + "The Dart VM service is listening on http://127.0.0.1:\([0-9]*\)"); int port; final splitter = new LineSplitter(); Completer portLineCompleter = new Completer(); @@ -509,9 +509,9 @@ main() { .transform(utf8.decoder) .transform(splitter) .listen((String s) async { - if (s.startsWith(kObservatoryListening)) { - expect(observatoryPortRegExp.hasMatch(s), isTrue); - final match = observatoryPortRegExp.firstMatch(s)!; + if (s.startsWith(kDartVMServiceListening)) { + expect(dartVMServicePortRegExp.hasMatch(s), isTrue); + final match = dartVMServicePortRegExp.firstMatch(s)!; port = int.parse(match.group(1)!); await collectAndCheckCoverageData(port, true); if (!portLineCompleter.isCompleted) { @@ -603,9 +603,9 @@ main() { list.path ]); - const kObservatoryListening = 'Observatory listening on '; - final RegExp observatoryPortRegExp = - new RegExp("Observatory listening on http://127.0.0.1:\([0-9]*\)"); + const kDartVMServiceListening = 'The Dart VM service is listening on '; + final RegExp dartVMServicePortRegExp = new RegExp( + "The Dart VM service is listening on http://127.0.0.1:\([0-9]*\)"); int port; final splitter = new LineSplitter(); Completer portLineCompleter = new Completer(); @@ -618,9 +618,9 @@ main() { if (s == expectStdoutContains) { foundExpectedString = true; } - if (s.startsWith(kObservatoryListening)) { - expect(observatoryPortRegExp.hasMatch(s), isTrue); - final match = observatoryPortRegExp.firstMatch(s)!; + if (s.startsWith(kDartVMServiceListening)) { + expect(dartVMServicePortRegExp.hasMatch(s), isTrue); + final match = dartVMServicePortRegExp.firstMatch(s)!; port = int.parse(match.group(1)!); await collectAndCheckCoverageData(port, true, onGetAllVerifyCount: false, coverageForLines: coverageLines); @@ -869,9 +869,9 @@ main() { list.path ]); - const kObservatoryListening = 'Observatory listening on '; - final RegExp observatoryPortRegExp = - new RegExp("Observatory listening on http://127.0.0.1:\([0-9]*\)"); + const kDartVMServiceListening = 'The Dart VM service is listening on '; + final RegExp dartVMServicePortRegExp = new RegExp( + "The Dart VM service is listening on http://127.0.0.1:\([0-9]*\)"); int port; final splitter = new LineSplitter(); Completer portLineCompleter = new Completer(); @@ -879,9 +879,9 @@ main() { .transform(utf8.decoder) .transform(splitter) .listen((String s) async { - if (s.startsWith(kObservatoryListening)) { - expect(observatoryPortRegExp.hasMatch(s), isTrue); - final match = observatoryPortRegExp.firstMatch(s)!; + if (s.startsWith(kDartVMServiceListening)) { + expect(dartVMServicePortRegExp.hasMatch(s), isTrue); + final match = dartVMServicePortRegExp.firstMatch(s)!; port = int.parse(match.group(1)!); Set hits1 = await collectAndCheckCoverageData(port, true, resume: false); @@ -972,10 +972,10 @@ main() { String portLine = await portLineCompleter.future; - final RegExp observatoryPortRegExp = - new RegExp("Observatory listening on http://127.0.0.1:\([0-9]*\)"); - expect(observatoryPortRegExp.hasMatch(portLine), isTrue); - final match = observatoryPortRegExp.firstMatch(portLine)!; + final RegExp dartVMServicePortRegExp = new RegExp( + "The Dart VM service is listening on http://127.0.0.1:\([0-9]*\)"); + expect(dartVMServicePortRegExp.hasMatch(portLine), isTrue); + final match = dartVMServicePortRegExp.firstMatch(portLine)!; final port = int.parse(match.group(1)!); var remoteVm = new RemoteVm(port); @@ -1256,9 +1256,9 @@ main() { scriptOrDill.path ]); - const kObservatoryListening = 'Observatory listening on '; - final RegExp observatoryPortRegExp = - new RegExp("Observatory listening on http://127.0.0.1:\([0-9]*\)"); + const kDartVMServiceListening = 'The Dart VM service is listening on '; + final RegExp dartVMServicePortRegExp = new RegExp( + "The Dart VM service is listening on http://127.0.0.1:\([0-9]*\)"); int port; final splitter = new LineSplitter(); Completer portLineCompleter = new Completer(); @@ -1267,9 +1267,9 @@ main() { .transform(splitter) .listen((String s) async { print("vm stdout: $s"); - if (s.startsWith(kObservatoryListening)) { - expect(observatoryPortRegExp.hasMatch(s), isTrue); - final match = observatoryPortRegExp.firstMatch(s)!; + if (s.startsWith(kDartVMServiceListening)) { + expect(dartVMServicePortRegExp.hasMatch(s), isTrue); + final match = dartVMServicePortRegExp.firstMatch(s)!; port = int.parse(match.group(1)!); RemoteVm remoteVm = new RemoteVm(port); diff --git a/pkg/vm_service/test/common/test_helper.dart b/pkg/vm_service/test/common/test_helper.dart index 8415c742206..7561ce039b4 100644 --- a/pkg/vm_service/test/common/test_helper.dart +++ b/pkg/vm_service/test/common/test_helper.dart @@ -205,9 +205,9 @@ class _ServiceTesteeLauncher { .transform(utf8.decoder) .transform(LineSplitter()) .listen((line) { - const kObservatoryListening = 'Observatory listening on '; - if (line.startsWith(kObservatoryListening)) { - uri = Uri.parse(line.substring(kObservatoryListening.length)); + const kDartVMServiceListening = 'The Dart VM service is listening on '; + if (line.startsWith(kDartVMServiceListening)) { + uri = Uri.parse(line.substring(kDartVMServiceListening.length)); } if (pause_on_start || line == '') { // Received blank line. diff --git a/runtime/bin/main_options.cc b/runtime/bin/main_options.cc index 7cb1c3fe0fa..fa8401a7b2f 100644 --- a/runtime/bin/main_options.cc +++ b/runtime/bin/main_options.cc @@ -168,7 +168,7 @@ void Options::PrintUsage() { "--write-service-info=\n" " Outputs information necessary to connect to the VM service to the\n" " specified file in JSON format. Useful for clients which are unable to\n" -" listen to stdout for the Observatory listening message.\n" +" listen to stdout for the Dart VM service listening message.\n" #endif // !defined(PRODUCT) "--snapshot-kind=\n" "--snapshot=\n" diff --git a/runtime/observatory/tests/service/sigquit_starts_service_test.dart b/runtime/observatory/tests/service/sigquit_starts_service_test.dart index 911c12dd44e..357a98649fc 100644 --- a/runtime/observatory/tests/service/sigquit_starts_service_test.dart +++ b/runtime/observatory/tests/service/sigquit_starts_service_test.dart @@ -23,7 +23,7 @@ void runTest(bool withDartDev) { sub = process.stdout.transform(utf8.decoder).listen((e) async { if (e.contains('ready') && !readyCompleter.isCompleted) { readyCompleter.complete(); - } else if (e.contains('Observatory listening on')) { + } else if (e.contains('The Dart VM service is listening on')) { await sub.cancel(); completer.complete(); } diff --git a/runtime/observatory_2/tests/service_2/sigquit_starts_service_test.dart b/runtime/observatory_2/tests/service_2/sigquit_starts_service_test.dart index b056477bf23..7320f09caaf 100644 --- a/runtime/observatory_2/tests/service_2/sigquit_starts_service_test.dart +++ b/runtime/observatory_2/tests/service_2/sigquit_starts_service_test.dart @@ -23,7 +23,7 @@ void runTest(bool withDartDev) { sub = process.stdout.transform(utf8.decoder).listen((e) async { if (e.contains('ready') && !readyCompleter.isCompleted) { readyCompleter.complete(); - } else if (e.contains('Observatory listening on')) { + } else if (e.contains('The Dart VM service is listening on')) { await sub.cancel(); completer.complete(); } diff --git a/runtime/tests/vm/dart_2/isolates/reload_utils.dart b/runtime/tests/vm/dart_2/isolates/reload_utils.dart index c9730170d01..c1c9e96a151 100644 --- a/runtime/tests/vm/dart_2/isolates/reload_utils.dart +++ b/runtime/tests/vm/dart_2/isolates/reload_utils.dart @@ -166,7 +166,7 @@ class Reloader { } Future _waitUntilService() async { - final needle = 'Observatory listening on '; + final needle = 'The Dart VM service is listening on '; final line = await waitUntilStdoutContains(needle); final Uri uri = Uri.parse(line.substring(needle.length)); assert(_remoteVm == null); diff --git a/runtime/vm/service.cc b/runtime/vm/service.cc index eb991520163..72b9021d1eb 100644 --- a/runtime/vm/service.cc +++ b/runtime/vm/service.cc @@ -1205,9 +1205,9 @@ static void ReportPauseOnConsole(ServiceEvent* event) { if (!ServiceIsolate::IsRunning()) { OS::PrintErr(" Start the vm-service to debug.\n"); } else if (ServiceIsolate::server_address() == NULL) { - OS::PrintErr(" Connect to Observatory to debug.\n"); + OS::PrintErr(" Connect to the Dart VM service to debug.\n"); } else { - OS::PrintErr(" Connect to Observatory at %s to debug.\n", + OS::PrintErr(" Connect to the Dart VM service at %s to debug.\n", ServiceIsolate::server_address()); } const Error& err = Error::Handle(Thread::Current()->sticky_error()); diff --git a/sdk/lib/_internal/vm/bin/vmservice_server.dart b/sdk/lib/_internal/vm/bin/vmservice_server.dart index 1c06579d16a..129e2371059 100644 --- a/sdk/lib/_internal/vm/bin/vmservice_server.dart +++ b/sdk/lib/_internal/vm/bin/vmservice_server.dart @@ -4,10 +4,12 @@ part of vmservice_io; +// TODO(48602): deprecate SILENT_OBSERVATORY in favor of SILENT_VM_SERVICE bool silentObservatory = bool.fromEnvironment('SILENT_OBSERVATORY'); +bool silentVMService = bool.fromEnvironment('SILENT_VM_SERVICE'); void serverPrint(String s) { - if (silentObservatory) { + if (silentObservatory || silentVMService) { // We've been requested to be silent. return; } @@ -422,12 +424,13 @@ class Server { _server = await HttpServer.bind(address, _port); } catch (e, st) { if (_port != 0 && _enableServicePortFallback) { - serverPrint('Failed to bind Observatory HTTP server to port $_port. ' + serverPrint( + 'Failed to bind Dart VM service HTTP server to port $_port. ' 'Falling back to automatic port selection'); _port = 0; return await startServer(); } else { - serverPrint('Could not start Observatory HTTP server:\n' + serverPrint('Could not start Dart VM service HTTP server:\n' '$e\n$st'); _notifyServerState(''); onServerAddressChange(null); @@ -441,7 +444,7 @@ class Server { return this; } if (_service.isExiting) { - serverPrint('Observatory HTTP server exiting before listening as ' + serverPrint('Dart VM service HTTP server exiting before listening as ' 'vm service has received exit request\n'); await shutdown(true); return this; @@ -458,7 +461,7 @@ class Server { } Future outputConnectionInformation() async { - serverPrint('Observatory listening on $serverAddress'); + serverPrint('The Dart VM service is listening on $serverAddress'); if (Platform.isFuchsia) { // Create a file with the port number. final tmp = Directory.systemTemp.path; @@ -497,14 +500,14 @@ class Server { // Shutdown HTTP server and subscription. Uri oldServerAddress = serverAddress!; return cleanup(forced).then((_) { - serverPrint('Observatory no longer listening on $oldServerAddress'); + serverPrint('Dart VM service no longer listening on $oldServerAddress'); _server = null; _notifyServerState(''); onServerAddressChange(null); return this; }).catchError((e, st) { _server = null; - serverPrint('Could not shutdown Observatory HTTP server:\n$e\n$st\n'); + serverPrint('Could not shutdown Dart VM service HTTP server:\n$e\n$st\n'); _notifyServerState(''); onServerAddressChange(null); return this;