Revert "[ Observatory ] Disable serving Observatory by default"

This reverts commit edead9cfd1.

Reason for revert: We have some flutter framework tests that are breaking, "flutter test should respect --serve-observatory". This will apparently be fixed when https://github.com/flutter/flutter/pull/122419 lands.

Original change's description:
> [ Observatory ] Disable serving Observatory by default
>
> Observatory can still be enabled by providing `--serve-observatory` or
> invoking the `_serveObservatory` private service RPC via web socket or
> HTTP.
>
> Related to https://github.com/dart-lang/sdk/issues/50233
>
> TEST=pkg/dartdev/test/commands/run_test
>
> Change-Id: I89b000e69bb31c91a9a5386fed1ee590cdafa58c
> Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/287821
> Reviewed-by: Michael Thomsen <mit@google.com>
> Commit-Queue: Ben Konyi <bkonyi@google.com>
> Reviewed-by: Siva Annamalai <asiva@google.com>

Change-Id: I994c86cbca9d0eb25e1f9adddeede94c227acad9
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/288601
Commit-Queue: Siva Annamalai <asiva@google.com>
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Reviewed-by: Zach Anderson <zra@google.com>
This commit is contained in:
Siva Annamalai 2023-03-14 00:46:59 +00:00 committed by Commit Queue
parent fe08d68872
commit 5a8ddc0756
5 changed files with 4 additions and 10 deletions

View file

@ -164,11 +164,6 @@
### Tools
#### Observatory
- Observatory is no longer served by default and users should instead use Dart
DevTools. Users requiring specific functionality in Observatory should set
the `--serve-observatory` flag.
#### Web Dev Compiler (DDC)
- Removed deprecated command line flags `-k`, `--kernel`, and `--dart-sdk`.

View file

@ -615,7 +615,7 @@ void main(List<String> args) => print("$b $args");
'--enable-vm-service',
if (!withDds) '--no-dds',
if (!enableAuthCodes) '--disable-service-auth-codes',
if (serve) '--serve-observatory',
if (!serve) '--no-serve-observatory',
p.relativeFilePath,
]);

View file

@ -558,7 +558,7 @@ static Dart_Isolate CreateAndSetupServiceIsolate(const char* script_uri,
Options::vm_service_auth_disabled(),
Options::vm_write_service_info_filename(), Options::trace_loading(),
Options::deterministic(), Options::enable_service_port_fallback(),
wait_for_dds_to_advertise_service, Options::enable_observatory())) {
wait_for_dds_to_advertise_service, !Options::disable_observatory())) {
*error = Utils::StrDup(VmService::GetErrorMessage());
return NULL;
}

View file

@ -49,8 +49,7 @@ namespace bin {
V(bypass_trusting_system_roots, bypass_trusting_system_roots) \
V(delayed_filewatch_callback, delayed_filewatch_callback) \
V(mark_main_isolate_as_system_isolate, mark_main_isolate_as_system_isolate) \
V(no_serve_observatory, disable_observatory) \
V(serve_observatory, enable_observatory)
V(no_serve_observatory, disable_observatory)
// Boolean flags that have a short form.
#define SHORT_BOOL_OPTIONS_LIST(V) \

View file

@ -40,7 +40,7 @@ bool _enableServicePortFallback = false;
@pragma("vm:entry-point")
bool _waitForDdsToAdvertiseService = false;
@pragma("vm:entry-point", !const bool.fromEnvironment('dart.vm.product'))
bool _serveObservatory = false;
bool _serveObservatory = true;
// HTTP server.
Server? server;