Merge branch 'master' into 2.51.1

srawlins · web-flow · commit 529a0064b3a9 · 2025-11-03T10:31:48.000-08:00
diff --git a/flutter-candidate.txt b/flutter-candidate.txt
@@ -1 +1 @@
-86327198ff0678f46cbdfb3e12f1759d03aa768d
+c63c6b08a7114517575bcf3e45275ec7a9f4e87f
diff --git a/packages/devtools_app/benchmark/devtools_benchmarks_test.dart b/packages/devtools_app/benchmark/devtools_benchmarks_test.dart
@@ -43,7 +43,7 @@ void main() {
         await _runBenchmarks(useWasm: useWasm);
       },
       timeout: const Timeout(Duration(minutes: 15)),
-      retry: 1,
+      retry: 0,
     );
   }
 }
@@ -75,7 +75,12 @@ Future<void> _runBenchmarks({bool useWasm = false}) async {
 
   for (final devToolsBenchmark in DevToolsBenchmark.values) {
     final benchmarkName = devToolsBenchmark.id;
-    final expectedMetrics = expectedBenchmarkMetrics(useWasm: useWasm);
+    // Note: Due to https://github.com/flutter/flutter/pull/175392 there is no
+    // longer any difference in benchmark events for skwasm vs. canvaskit.
+    //
+    // TODO(https://github.com/flutter/flutter/issues/177057): Remove hardcoded
+    // useWasm: false param when package:web_benchmarks is updated.
+    final expectedMetrics = expectedBenchmarkMetrics(useWasm: false);
     const expectedComputations = BenchmarkMetricComputation.values;
     final scores = taskResult.scores[benchmarkName] ?? [];
     expect(
diff --git a/packages/devtools_app/integration_test/test/live_connection/network_screen_test.dart b/packages/devtools_app/integration_test/test/live_connection/network_screen_test.dart
@@ -74,6 +74,22 @@ void main() {
     await helper.triggerRequest('dioPost');
     _expectInRequestTable('POST');
 
+    // Perform a Hot Reload, then make more requests.
+    await serviceConnection.serviceManager.performHotReload();
+
+    // Instruct the app to make a GET request via the 'http' package.
+    await helper.triggerRequest('packageHttpGet');
+    _expectInRequestTable('GET');
+    await helper.clear();
+
+    // Perform a Hot Restart, then make more requests.
+    await serviceConnection.serviceManager.performHotRestart();
+
+    // Instruct the app to make a GET request via the 'http' package.
+    await helper.triggerRequest('packageHttpGet');
+    _expectInRequestTable('GET');
+    await helper.clear();
+
     await helper.triggerExit();
   });
 }
@@ -111,7 +127,9 @@ final class _NetworkScreenHelper {
           'ext.networking_app.makeRequest',
           args: {'requestType': requestType, 'hasBody': hasBody},
         );
-    logStatus(response.toString());
+    logStatus(
+      'Sent a $requestType request, received response: ${response.json}',
+    );
 
     await _tester.pump(safePumpDuration);
   }
diff --git a/packages/devtools_app/lib/devtools.dart b/packages/devtools_app/lib/devtools.dart
@@ -10,4 +10,4 @@
 /// Note: a regexp in the `dt update-version' command logic matches the constant
 /// declaration `const version =`. If you change the declaration you must also
 /// modify the regex in the `dt update-version' command logic.
-const version = '2.51.1';
+const version = '2.52.0';
diff --git a/packages/devtools_app/lib/src/framework/framework_core.dart b/packages/devtools_app/lib/src/framework/framework_core.dart
@@ -23,7 +23,6 @@ import '../service/vm_service_wrapper.dart';
 import '../shared/analytics/analytics.dart' as ga;
 import '../shared/config_specific/framework_initialize/framework_initialize.dart';
 import '../shared/console/eval/eval_service.dart';
-import '../shared/feature_flags.dart';
 import '../shared/framework/app_error_handling.dart' as error_handling;
 import '../shared/framework/framework_controller.dart';
 import '../shared/framework/screen_controllers.dart';
@@ -84,9 +83,7 @@ extension FrameworkCore on Never {
     // preferences have been initialized.
     await extensionService.initialize();
 
-    if (FeatureFlags.memoryObserver.isEnabled) {
-      _memoryObserver.init();
-    }
+    _memoryObserver.init();
   }
 
   /// Disposes framework level services and managers.
@@ -99,9 +96,7 @@ extension FrameworkCore on Never {
     preferences.dispose();
     _themeManager?.dispose();
     unawaited(dtdManager.dispose());
-    if (FeatureFlags.memoryObserver.isEnabled) {
-      _memoryObserver.dispose();
-    }
+    _memoryObserver.dispose();
   }
 
   static void _initGlobals() {
diff --git a/packages/devtools_app/lib/src/screens/app_size/app_size_controller.dart b/packages/devtools_app/lib/src/screens/app_size/app_size_controller.dart
@@ -11,7 +11,6 @@ import 'package:vm_snapshot_analysis/utils.dart';
 import 'package:vm_snapshot_analysis/v8_profile.dart';
 
 import '../../shared/charts/treemap.dart';
-import '../../shared/feature_flags.dart';
 import '../../shared/framework/screen.dart';
 import '../../shared/framework/screen_controllers.dart';
 import '../../shared/primitives/utils.dart';
@@ -772,12 +771,10 @@ class AppSizeController extends DevToolsScreenController {
 
   @override
   void releaseMemory({bool partial = false}) {
-    if (FeatureFlags.memoryObserver.isEnabled) {
-      // This behavior is the same regardless of the value of `partial`. We can
-      // implement a partial clearing if it becomes necessary.
-      clear(AppSizeScreen.analysisTabKey);
-      clear(AppSizeScreen.diffTabKey);
-    }
+    // This behavior is the same regardless of the value of `partial`. We can
+    // implement a partial clearing if it becomes necessary.
+    clear(AppSizeScreen.analysisTabKey);
+    clear(AppSizeScreen.diffTabKey);
   }
 }
 
diff --git a/packages/devtools_app/lib/src/screens/logging/logging_controller.dart b/packages/devtools_app/lib/src/screens/logging/logging_controller.dart
@@ -18,7 +18,6 @@ import 'package:vm_service/vm_service.dart';
 import '../../service/vm_service_wrapper.dart';
 import '../../shared/diagnostics/diagnostics_node.dart';
 import '../../shared/diagnostics/inspector_service.dart';
-import '../../shared/feature_flags.dart';
 import '../../shared/framework/app_error_handling.dart' as error_handling;
 import '../../shared/framework/screen.dart';
 import '../../shared/framework/screen_controllers.dart';
@@ -805,13 +804,11 @@ class LoggingController extends DevToolsScreenController
 
   @override
   void releaseMemory({bool partial = false}) {
-    if (FeatureFlags.memoryObserver.isEnabled) {
-      if (partial) {
-        // Trim logs from the front so that the oldest logs are removed.
-        _updateData(data.sublist(data.length ~/ 2));
-      } else {
-        clear();
-      }
+    if (partial) {
+      // Trim logs from the front so that the oldest logs are removed.
+      _updateData(data.sublist(data.length ~/ 2));
+    } else {
+      clear();
     }
   }
 }
diff --git a/packages/devtools_app/lib/src/screens/memory/framework/memory_controller.dart b/packages/devtools_app/lib/src/screens/memory/framework/memory_controller.dart
@@ -10,7 +10,6 @@ import 'dart:async';
 import 'package:devtools_app_shared/utils.dart';
 import 'package:flutter/foundation.dart';
 
-import '../../../shared/feature_flags.dart';
 import '../../../shared/framework/screen.dart';
 import '../../../shared/framework/screen_controllers.dart';
 import '../../../shared/globals.dart';
@@ -217,11 +216,9 @@ class MemoryController extends DevToolsScreenController
 
   @override
   FutureOr<void> releaseMemory({bool partial = false}) async {
-    if (FeatureFlags.memoryObserver.isEnabled) {
-      diff.clearSnapshots(partial: partial);
-      // Clear all allocation traces since the traces form a single tracing
-      // profile.
-      await trace?.clear();
-    }
+    diff.clearSnapshots(partial: partial);
+    // Clear all allocation traces since the traces form a single tracing
+    // profile.
+    await trace?.clear();
   }
 }
diff --git a/packages/devtools_app/lib/src/screens/network/network_controller.dart b/packages/devtools_app/lib/src/screens/network/network_controller.dart
@@ -11,7 +11,6 @@ import 'package:vm_service/vm_service.dart';
 
 import '../../shared/config_specific/import_export/import_export.dart';
 import '../../shared/config_specific/logger/allowed_error.dart';
-import '../../shared/feature_flags.dart';
 import '../../shared/framework/screen.dart';
 import '../../shared/framework/screen_controllers.dart';
 import '../../shared/globals.dart';
@@ -515,9 +514,7 @@ class NetworkController extends DevToolsScreenController
 
   @override
   FutureOr<void> releaseMemory({bool partial = false}) async {
-    if (FeatureFlags.memoryObserver.isEnabled) {
-      await clear(partial: partial);
-    }
+    await clear(partial: partial);
   }
 }
 
diff --git a/packages/devtools_app/lib/src/screens/performance/performance_controller.dart b/packages/devtools_app/lib/src/screens/performance/performance_controller.dart
@@ -14,7 +14,6 @@ import 'package:vm_service/vm_service.dart';
 
 import '../../service/service_registrations.dart' as registrations;
 import '../../shared/diagnostics/inspector_service.dart';
-import '../../shared/feature_flags.dart';
 import '../../shared/framework/screen.dart';
 import '../../shared/framework/screen_controllers.dart';
 import '../../shared/globals.dart';
@@ -291,9 +290,7 @@ class PerformanceController extends DevToolsScreenController
 
   @override
   FutureOr<void> releaseMemory({bool partial = false}) async {
-    if (FeatureFlags.memoryObserver.isEnabled) {
-      await clearData(partial: partial, clearVmTimeline: !partial);
-    }
+    await clearData(partial: partial, clearVmTimeline: !partial);
   }
 }
 
diff --git a/packages/devtools_app/lib/src/screens/profiler/profiler_screen_controller.dart b/packages/devtools_app/lib/src/screens/profiler/profiler_screen_controller.dart
@@ -9,7 +9,6 @@ import 'package:flutter/foundation.dart';
 import 'package:vm_service/vm_service.dart';
 
 import '../../shared/config_specific/logger/allowed_error.dart';
-import '../../shared/feature_flags.dart';
 import '../../shared/framework/screen.dart';
 import '../../shared/framework/screen_controllers.dart';
 import '../../shared/globals.dart';
@@ -188,9 +187,7 @@ class ProfilerScreenController extends DevToolsScreenController
 
   @override
   FutureOr<void> releaseMemory({bool partial = false}) async {
-    if (FeatureFlags.memoryObserver.isEnabled) {
-      // There is no way to partially release memory for this screen.
-      await clear();
-    }
+    // There is no way to partially release memory for this screen.
+    await clear();
   }
 }
diff --git a/packages/devtools_app/lib/src/shared/feature_flags.dart b/packages/devtools_app/lib/src/shared/feature_flags.dart
@@ -44,15 +44,6 @@ bool get enableBeta => enableExperiments || !isExternalBuild;
 /// to the [_booleanFlags] or [_flutterChannelFlags] map for debugging
 /// purposes.
 extension FeatureFlags on Never {
-  /// Flag to enable the DevTools memory observer, which attempts to help users
-  /// avoid OOM crashes.
-  ///
-  /// https://github.com/flutter/devtools/issues/7002
-  static final memoryObserver = BooleanFeatureFlag(
-    name: 'memoryObserver',
-    enabled: true,
-  );
-
   /// Flag to enable save/load for the Memory screen.
   ///
   /// https://github.com/flutter/devtools/issues/8019
@@ -125,7 +116,6 @@ extension FeatureFlags on Never {
   /// When adding a new boolean flag, you are responsible for adding it to this
   /// map as well.
   static final _booleanFlags = <BooleanFeatureFlag>{
-    memoryObserver,
     memorySaveLoad,
     networkSaveLoad,
     devToolsExtensions,
diff --git a/packages/devtools_app/lib/src/shared/ui/common_widgets.dart b/packages/devtools_app/lib/src/shared/ui/common_widgets.dart
@@ -1085,8 +1085,11 @@ class TextViewer extends StatelessWidget {
 }
 
 class JsonViewer extends StatefulWidget {
-  JsonViewer({super.key, required this.encodedJson, this.scrollable = true})
-    : assert(encodedJson.isNotEmpty);
+  const JsonViewer({
+    super.key,
+    required this.encodedJson,
+    this.scrollable = true,
+  });
 
   final String encodedJson;
   final bool scrollable;
@@ -1111,7 +1114,7 @@ class _JsonViewerState extends State<JsonViewer> {
   }
 
   void _updateVariablesTree() {
-    assert(widget.encodedJson.isNotEmpty);
+    if (widget.encodedJson.isEmpty) return;
     final responseJson = json.decode(widget.encodedJson);
     // Insert the JSON data into the fake service cache so we can use it with
     // the `ExpandableVariable` widget.
@@ -1197,6 +1200,12 @@ class _JsonViewerState extends State<JsonViewer> {
 
   @override
   Widget build(BuildContext context) {
+    if (widget.encodedJson.isEmpty) {
+      return const Padding(
+        padding: EdgeInsetsGeometry.only(top: 16.0),
+        child: CenteredMessage(message: 'No JSON data'),
+      );
+    }
     Widget child = FutureBuilder(
       future: _initializeTree,
       builder: (context, snapshot) {
diff --git a/packages/devtools_app/pubspec.yaml b/packages/devtools_app/pubspec.yaml
@@ -7,7 +7,7 @@ publish_to: none
 
 # Note: this version should only be updated by running the 'dt update-version'
 # command that updates the version here and in 'devtools.dart'.
-version: 2.51.1
+version: 2.52.0
 
 repository: https://github.com/flutter/devtools/tree/master/packages/devtools_app
 
@@ -73,17 +73,12 @@ dev_dependencies:
   integration_test:
     sdk: flutter
   mockito: ^5.4.1
-  stager: ^1.0.1
+  stager: ^1.3.0
   stream_channel: ^2.1.1
   test: ^1.21.0
   web_benchmarks: ^4.0.0
   webkit_inspection_protocol: ">=0.5.0 <2.0.0"
 
-dependency_overrides:
-  # Necessary while `stager` dep disallows `source_gen` 2.0.0. Remove when
-  # `stager` allows `source_gen` 2.0.0.
-  source_gen: ^2.0.0
-
 flutter:
   uses-material-design: true
   assets:
diff --git a/packages/devtools_app/release_notes/NEXT_RELEASE_NOTES.md b/packages/devtools_app/release_notes/NEXT_RELEASE_NOTES.md
@@ -6,9 +6,9 @@ found in the LICENSE file or at https://developers.google.com/open-source/licens
 This is draft for future release notes, that are going to land on
 [the Flutter website](https://docs.flutter.dev/tools/devtools/release-notes).
 
-# DevTools 2.51.0 release notes
+# DevTools 2.52.0 release notes
 
-The 2.51.0 release of the Dart and Flutter DevTools
+The 2.52.0 release of the Dart and Flutter DevTools
 includes the following changes among other general improvements.
 To learn more about DevTools, check out the
 [DevTools overview](/tools/devtools/overview).
@@ -78,4 +78,4 @@ TODO: Remove this section if there are not any general updates.
 ## Full commit history
 
 To find a complete list of changes in this release, check out the
-[DevTools git log](https://github.com/flutter/devtools/tree/v2.51.0).
+[DevTools git log](https://github.com/flutter/devtools/tree/v2.52.0).
diff --git a/packages/devtools_app/test/framework/observer/memory_observer_test.dart b/packages/devtools_app/test/framework/observer/memory_observer_test.dart
@@ -6,7 +6,6 @@ import 'dart:async';
 
 import 'package:devtools_app/devtools_app.dart';
 import 'package:devtools_app/src/framework/observer/memory_observer.dart';
-import 'package:devtools_app/src/shared/feature_flags.dart';
 import 'package:devtools_app/src/shared/primitives/byte_utils.dart';
 import 'package:devtools_app_shared/utils.dart';
 import 'package:devtools_test/devtools_test.dart';
@@ -36,10 +35,6 @@ void main() {
       return memoryUsageBytes;
     }
 
-    setUpAll(() {
-      FeatureFlags.memoryObserver.setEnabledForTests(true);
-    });
-
     setUp(() {
       measurementComplete = Completer();
       observer = MemoryObserver(
@@ -57,10 +52,6 @@ void main() {
       observer.dispose();
     });
 
-    tearDownAll(() {
-      FeatureFlags.memoryObserver.setEnabledForTests(false);
-    });
-
     test(
       'does not add banner message when memory limit is not reached',
       () async {
diff --git a/packages/devtools_app/test/screens/cpu_profiler/profiler_screen_controller_test.dart b/packages/devtools_app/test/screens/cpu_profiler/profiler_screen_controller_test.dart
@@ -4,7 +4,6 @@
 
 import 'package:devtools_app/devtools_app.dart';
 import 'package:devtools_app/src/screens/profiler/cpu_profiler_controller.dart';
-import 'package:devtools_app/src/shared/feature_flags.dart';
 import 'package:devtools_app_shared/utils.dart';
 import 'package:devtools_test/devtools_test.dart';
 import 'package:flutter_test/flutter_test.dart';
@@ -18,7 +17,6 @@ void main() {
     late ProfilerScreenController controller;
 
     setUp(() {
-      FeatureFlags.memoryObserver.setEnabledForTests(true);
       final fakeServiceConnection = FakeServiceConnectionManager(
         service: FakeServiceManager.createFakeService(
           cpuSamples: CpuSamples.parse(goldenCpuSamplesJson),
@@ -63,7 +61,6 @@ void main() {
     });
 
     test('releaseMemory', () async {
-      FeatureFlags.memoryObserver.setEnabledForTests(true);
       await controller.cpuProfilerController.loadAllSamples();
       expect(controller.cpuProfilerController.dataNotifier.value, isNotNull);
       expect(
@@ -75,7 +72,6 @@ void main() {
         controller.cpuProfilerController.dataNotifier.value,
         CpuProfilerController.baseStateCpuProfileData,
       );
-      FeatureFlags.memoryObserver.setEnabledForTests(false);
     });
   });
 }
diff --git a/packages/devtools_app/test/screens/logging/logging_controller_test.dart b/packages/devtools_app/test/screens/logging/logging_controller_test.dart
diff --git a/packages/devtools_app/test/screens/memory/framework/memory_controller_test.dart b/packages/devtools_app/test/screens/memory/framework/memory_controller_test.dart
diff --git a/packages/devtools_app/test/shared/primitives/feature_flags_test.dart b/packages/devtools_app/test/shared/primitives/feature_flags_test.dart
diff --git a/packages/devtools_app/test/test_infra/utils/rendering_tester.dart b/packages/devtools_app/test/test_infra/utils/rendering_tester.dart
diff --git a/packages/devtools_app/test_driver/integration_test.dart b/packages/devtools_app/test_driver/integration_test.dart
diff --git a/tool/RELEASE_INSTRUCTIONS.md b/tool/RELEASE_INSTRUCTIONS.md
diff --git a/tool/ci/benchmark_performance.sh b/tool/ci/benchmark_performance.sh

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-86327198ff0678f46cbdfb3e12f1759d03aa768d`
	`1`	`+c63c6b08a7114517575bcf3e45275ec7a9f4e87f`