Revert "[vm, service, observatory] Bang Bang (My Type System Shot Me Down)."

This reverts commit 65e3c9d.

Reason for revert: package:logging, package:stack_trace and package:usage need to be migrated first.

Original change's description:
> [vm, service, observatory] Bang Bang (My Type System Shot Me Down).
> 
> Port the service tests and Observatory to Dart 3.
> 
> Changes from the original landing:
> 
>  - The old tests are copied to observatory_2 / service_2 so the service can still be tested when running a legacy mode program
>  - The test harness is taught about 'service_2'
>  - Observatory's package is added to front end's opt-in list
>  - Fixed some places in the bot configuration matrix so ensure 'service' runs on legacy bots and 'service_2' on weak-mode bots
> 
> The ported tests themselves are not changed.
> 
> Change-Id: I1d7e5cc61cdc044e1985e851bea7fd8a18f7d810
> Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/149720
> Commit-Queue: Ryan Macnak <[email protected]>
> Reviewed-by: Ben Konyi <[email protected]>

[email protected],[email protected]

Change-Id: I43b72f149d8d7e9fe06006cdd8593fed1726aa3a
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/152004
Reviewed-by: David Morgan <[email protected]>
Commit-Queue: David Morgan <[email protected]>

Author: davidmorgan

.dart_tool/package_config.json

@@ -429,23 +429,12 @@
       "name": "observatory",
       "rootUri": "../runtime/observatory",
       "packageUri": "lib/",
-      "languageVersion": "2.9"
-    },
-    {
-      "name": "observatory_2",
-      "rootUri": "../runtime/observatory_2",
-      "packageUri": "lib/",
       "languageVersion": "2.2"
     },
     {
       "name": "observatory_test_package",
       "rootUri": "../runtime/observatory/tests/service/observatory_test_package",
-      "languageVersion": "2.9"
-    },
-    {
-      "name": "observatory_test_package_2",
-      "rootUri": "../runtime/observatory_2/tests/service_2/observatory_test_package_2",
-      "languageVersion": "2.2"
+      "languageVersion": "2.7"
     },
     {
       "name": "package_config",

pkg/front_end/lib/src/api_prototype/experimental_flags_generated.dart

@@ -128,12 +128,6 @@ const AllowedExperimentalFlags defaultAllowedExperimentalFlags =
   "pool": {
     ExperimentalFlag.nonNullable,
   },
-  "observatory": {
-    ExperimentalFlag.nonNullable,
-  },
-  "observatory_test_package": {
-    ExperimentalFlag.nonNullable,
-  },
   "sky_engine": {
     ExperimentalFlag.nonNullable,
   },

pkg/test_runner/lib/src/compiler_configuration.dart

@@ -949,7 +949,7 @@ class AnalyzerCompilerConfiguration extends CompilerConfiguration {
       "ffi_2",
       "language_2",
       "lib_2",
-      "service_2",
+      "service",
       "standalone_2"
     };
 

pkg/test_runner/lib/src/options.dart

@@ -24,9 +24,9 @@ const _defaultTestSelectors = [
   'utils',
   'lib_2',
   'analyze_library',
-  'service_2',
+  'service',
   'kernel',
-  'obseratory_ui_2',
+  'observatory_ui',
   'ffi_2'
 ];
 

pkg/test_runner/lib/src/test_configurations.dart

@@ -30,7 +30,6 @@ final testSuiteDirectories = [
   Path('runtime/tests/vm'),
   Path('runtime/observatory/tests/service'),
   Path('runtime/observatory/tests/observatory_ui'),
-  Path('runtime/observatory_2/tests/service_2'),
   Path('samples'),
   Path('samples-dev'),
   Path('tests/corelib'),

pkg/test_runner/lib/src/test_suite.dart

@@ -584,7 +584,7 @@ class StandardTestSuite extends TestSuite {
       _enqueueStandardTest(testFile, expectationSet, onTest);
     } else if (configuration.runtime.isBrowser) {
       _enqueueBrowserTest(testFile, expectationSet, onTest);
-    } else if (suiteName == 'service' || suiteName == 'service_2') {
+    } else if (suiteName == 'service') {
       _enqueueServiceTest(testFile, expectationSet, onTest);
     } else {
       _enqueueStandardTest(testFile, expectationSet, onTest);

runtime/observatory/BUILD.gn

@@ -37,8 +37,6 @@ prebuilt_dart2js_action("build_observatory") {
     "-o",
     rebase_path(output),
     "--packages=" + rebase_path("../../.packages"),
-    "--enable-experiment=non-nullable",
-    "--no-sound-null-safety",
   ]
   if (is_debug) {
     args += [ "--enable-asserts" ]

runtime/observatory/analysis_options.yaml

@@ -1,10 +1,7 @@
 analyzer:
-  enable-experiment:
-    - non-nullable
   errors:
     dead_code: ignore
     unused_local_variable: ignore
-    getter_not_subtype_setter_types: ignore
   exclude:
     - tests/service/bad_reload/v2/main.dart
     - tests/service/complex_reload/v2/main.dart

runtime/observatory/bin/heap_snapshot.dart

@@ -22,14 +22,14 @@ Future<SnapshotGraph> load(String uri) async {
 
   reader.onProgress.listen(print);
 
-  ws.listen((dynamic dynResponse) {
-    if (dynResponse is String) {
-      final response = json.decode(dynResponse);
+  ws.listen((dynamic response) {
+    if (response is String) {
+      response = json.decode(response);
       if (response['id'] == 1) {
         getVM.complete(response['result']['isolates'][0]['id']);
       }
-    } else if (dynResponse is List<int>) {
-      final response = new Uint8List.fromList(dynResponse);
+    } else if (response is List<int>) {
+      response = new Uint8List.fromList(response);
       final dataOffset =
           new ByteData.view(response.buffer).getUint32(0, Endian.little);
       dynamic metadata = new Uint8List.view(response.buffer, 4, dataOffset - 4);

runtime/observatory/bin/shell.dart

@@ -30,7 +30,7 @@ void repl(VM vm, Isolate isolate, String lastResult) {
 void main() {
   String addr = 'ws://localhost:8181/ws';
   new WebSocketVM(new WebSocketVMTarget(addr)).load().then((serviceObject) {
-    VM vm = serviceObject as VM;
+    VM vm = serviceObject;
     Isolate isolate = vm.isolates.first;
     repl(vm, isolate, 'isolate ${isolate.id}');
   });

runtime/observatory/lib/event.dart

@@ -108,7 +108,7 @@ class PauseBreakpointEvent implements M.PauseBreakpointEvent {
   final bool atAsyncSuspension;
 
   /// [optional]
-  final M.Breakpoint? breakpoint;
+  final M.Breakpoint breakpoint;
   PauseBreakpointEvent(
       this.timestamp,
       this.isolate,
@@ -128,7 +128,7 @@ class PauseBreakpointEvent implements M.PauseBreakpointEvent {
 class PauseInterruptedEvent implements M.PauseInterruptedEvent {
   final DateTime timestamp;
   final M.IsolateRef isolate;
-  final M.Frame? topFrame;
+  final M.Frame topFrame;
   final bool atAsyncSuspension;
   PauseInterruptedEvent(
       this.timestamp, this.isolate, this.topFrame, this.atAsyncSuspension) {
@@ -141,7 +141,7 @@ class PauseInterruptedEvent implements M.PauseInterruptedEvent {
 class PausePostRequestEvent implements M.PausePostRequestEvent {
   final DateTime timestamp;
   final M.IsolateRef isolate;
-  final M.Frame? topFrame;
+  final M.Frame topFrame;
   final bool atAsyncSuspension;
   PausePostRequestEvent(
       this.timestamp, this.isolate, this.topFrame, this.atAsyncSuspension) {
@@ -168,7 +168,7 @@ class PauseExceptionEvent implements M.PauseExceptionEvent {
 class ResumeEvent implements M.ResumeEvent {
   final DateTime timestamp;
   final M.IsolateRef isolate;
-  final M.Frame? topFrame;
+  final M.Frame topFrame;
   ResumeEvent(this.timestamp, this.isolate, this.topFrame) {
     assert(timestamp != null);
     assert(isolate != null);
@@ -309,71 +309,69 @@ class ServiceUnregisteredEvent implements M.ServiceUnregisteredEvent {
   }
 }
 
-M.Event? createEventFromServiceEvent(S.ServiceEvent event) {
+M.Event createEventFromServiceEvent(S.ServiceEvent event) {
   switch (event.kind) {
     case S.ServiceEvent.kVMUpdate:
-      return new VMUpdateEvent(event.timestamp!, event.vm);
+      return new VMUpdateEvent(event.timestamp, event.vm);
     case S.ServiceEvent.kIsolateStart:
-      return new IsolateStartEvent(event.timestamp!, event.isolate!);
+      return new IsolateStartEvent(event.timestamp, event.isolate);
     case S.ServiceEvent.kIsolateRunnable:
-      return new IsolateRunnableEvent(event.timestamp!, event.isolate!);
+      return new IsolateRunnableEvent(event.timestamp, event.isolate);
     case S.ServiceEvent.kIsolateUpdate:
-      return new IsolateUpdateEvent(event.timestamp!, event.isolate!);
+      return new IsolateUpdateEvent(event.timestamp, event.isolate);
     case S.ServiceEvent.kIsolateReload:
       return new IsolateReloadEvent(
-          event.timestamp!, event.isolate!, event.error!);
+          event.timestamp, event.isolate, event.error);
     case S.ServiceEvent.kIsolateExit:
-      return new IsolateExitEvent(event.timestamp!, event.isolate!);
+      return new IsolateExitEvent(event.timestamp, event.isolate);
     case S.ServiceEvent.kBreakpointAdded:
       return new BreakpointAddedEvent(
-          event.timestamp!, event.isolate!, event.breakpoint!);
+          event.timestamp, event.isolate, event.breakpoint);
     case S.ServiceEvent.kBreakpointResolved:
       return new BreakpointResolvedEvent(
-          event.timestamp!, event.isolate!, event.breakpoint!);
+          event.timestamp, event.isolate, event.breakpoint);
     case S.ServiceEvent.kBreakpointRemoved:
       return new BreakpointRemovedEvent(
-          event.timestamp!, event.isolate!, event.breakpoint!);
+          event.timestamp, event.isolate, event.breakpoint);
     case S.ServiceEvent.kDebuggerSettingsUpdate:
-      return new DebuggerSettingsUpdateEvent(event.timestamp!, event.isolate!);
+      return new DebuggerSettingsUpdateEvent(event.timestamp, event.isolate);
     case S.ServiceEvent.kResume:
-      return new ResumeEvent(event.timestamp!, event.isolate!, event.topFrame);
+      return new ResumeEvent(event.timestamp, event.isolate, event.topFrame);
     case S.ServiceEvent.kPauseStart:
-      return new PauseStartEvent(event.timestamp!, event.isolate!);
+      return new PauseStartEvent(event.timestamp, event.isolate);
     case S.ServiceEvent.kPauseExit:
-      return new PauseExitEvent(event.timestamp!, event.isolate!);
+      return new PauseExitEvent(event.timestamp, event.isolate);
     case S.ServiceEvent.kPausePostRequest:
-      return new PausePostRequestEvent(event.timestamp!, event.isolate!,
-          event.topFrame, event.atAsyncSuspension!);
+      return new PausePostRequestEvent(event.timestamp, event.isolate,
+          event.topFrame, event.atAsyncSuspension);
     case S.ServiceEvent.kPauseBreakpoint:
       return new PauseBreakpointEvent(
-          event.timestamp!,
-          event.isolate!,
-          event.pauseBreakpoints!,
-          event.topFrame!,
-          event.atAsyncSuspension!,
+          event.timestamp,
+          event.isolate,
+          event.pauseBreakpoints,
+          event.topFrame,
+          event.atAsyncSuspension,
           event.breakpoint);
     case S.Isolate.kLoggingStream:
-      return new LoggingEvent(
-          event.timestamp!, event.isolate!, event.logRecord!);
+      return new LoggingEvent(event.timestamp, event.isolate, event.logRecord);
     case S.ServiceEvent.kPauseInterrupted:
-      return new PauseInterruptedEvent(event.timestamp!, event.isolate!,
-          event.topFrame, event.atAsyncSuspension!);
+      return new PauseInterruptedEvent(event.timestamp, event.isolate,
+          event.topFrame, event.atAsyncSuspension);
     case S.ServiceEvent.kPauseException:
       return new PauseExceptionEvent(
-          event.timestamp!, event.isolate!, event.topFrame!, event.exception!);
+          event.timestamp, event.isolate, event.topFrame, event.exception);
     case S.ServiceEvent.kInspect:
-      return new InspectEvent(
-          event.timestamp!, event.isolate!, event.inspectee!);
+      return new InspectEvent(event.timestamp, event.isolate, event.inspectee);
     case S.ServiceEvent.kGC:
-      return new GCEvent(event.timestamp!, event.isolate!);
+      return new GCEvent(event.timestamp, event.isolate);
     case S.ServiceEvent.kServiceRegistered:
       return new ServiceRegisteredEvent(
-          event.timestamp!, event.service!, event.method!, event.alias!);
+          event.timestamp, event.service, event.method, event.alias);
     case S.ServiceEvent.kServiceUnregistered:
       return new ServiceUnregisteredEvent(
-          event.timestamp!, event.service!, event.method!);
+          event.timestamp, event.service, event.method);
     case S.ServiceEvent.kNone:
-      return new NoneEvent(event.timestamp!, event.isolate!);
+      return new NoneEvent(event.timestamp, event.isolate);
     default:
       // Ignore unrecognized events.
       Logger.root.severe('Unrecognized event: $event');