Update vm_service to 11.0.0 and finish profiling migration

case_study/memory_leaks/memory_leak_app/lib/tabs/http_data.dart

@@ -92,7 +92,7 @@ class MyGetHttpDataState extends State<MyGetHttpData> {
           preferredSize: const Size.fromHeight(48.0),
           child: Theme(
             // ignore: deprecated_member_use
-            data: Theme.of(context).copyWith(accentColor: Colors.white),
+            data: Theme.of(context),
             child: Container(
               height: 48.0,
               alignment: Alignment.center,

packages/devtools_app/lib/src/screens/network/network_model.dart

@@ -84,7 +84,7 @@ class WebSocket extends NetworkRequest {
 
   final SocketStatistic _socket;
   @override
-  String get id => _socket.id.toString();
+  String get id => _socket.id;
 
   @override
   Duration? get duration {

packages/devtools_app/lib/src/service/vm_service_wrapper.dart

@@ -11,9 +11,6 @@ import 'dart:async';
 import 'package:collection/collection.dart' show IterableExtension;
 import 'package:dds_service_extensions/dds_service_extensions.dart';
 import 'package:flutter/foundation.dart';
-// TODO(CoderDake): remove after migration to vm_service:11.0.0
-// ignore: implementation_imports
-import 'package:vm_service/src/vm_service.dart';
 import 'package:vm_service/vm_service.dart';
 
 import '../screens/vm_developer/vm_service_private_extensions.dart';
@@ -856,29 +853,10 @@ class VmServiceWrapper implements VmService {
     String id,
   ) async {
     assert(await isHttpProfilingAvailable(isolateId));
-    final dartIOVersion = await getDartIOVersion(isolateId);
-    final majorVersion = dartIOVersion.major;
-    // TODO(CoderDake): switch back to _vmService.getHttpProfileRequest call
-    // when upgrading to vm_service:11.0.0
-    if (majorVersion == null || majorVersion < 2) {
-      return trackFuture(
-        'ext.dart.io.getHttpProfileRequest',
-        extensionCallHelper(
-            _vmService, 'ext.dart.io.getHttpProfileRequest', <String, dynamic>{
-          'id': int.parse(id),
-          'isolateId': isolateId,
-        }),
-      ).then((r) => r as HttpProfileRequest);
-    } else {
-      return trackFuture(
-        'ext.dart.io.getHttpProfileRequest',
-        extensionCallHelper(
-            _vmService, 'ext.dart.io.getHttpProfileRequest', <String, dynamic>{
-          'id': id,
-          'isolateId': isolateId,
-        }),
-      ).then((r) => r as HttpProfileRequest);
-    }
+    return trackFuture(
+      'getHttpProfileRequest',
+      _vmService.getHttpProfileRequest(isolateId, id),
+    );
   }
 
   /// The `clearHttpProfile` RPC is used to clear previously recorded HTTP

packages/devtools_app/lib/src/shared/http/http_request_data.dart

@@ -60,7 +60,7 @@ class DartIOHttpRequestData extends NetworkRequest {
     return serviceManager.service!
         .getHttpProfileRequest(
           _request.isolateId,
-          _request.id.toString(),
+          _request.id,
         )
         .then((updated) => _request = updated);
   }
@@ -71,7 +71,7 @@ class DartIOHttpRequestData extends NetworkRequest {
   }
 
   @override
-  String get id => _request.id.toString();
+  String get id => _request.id;
 
   bool get _hasError => _request.request?.hasError ?? false;
 

packages/devtools_app/pubspec.yaml

@@ -57,7 +57,7 @@ dependencies:
   string_scanner: ^1.1.0
   url_launcher: ^6.1.0
   url_launcher_web: ^2.0.6
-  vm_service: ^10.1.0
+  vm_service: ^11.0.0
   vm_snapshot_analysis: ^0.7.1
   web_socket_channel: ^2.1.0
   # widget_icons: ^0.0.1

packages/devtools_app/test/http/curl_command_test.dart

@@ -246,7 +246,7 @@ DartIOHttpRequestData _testDartIOHttpRequestData({
   return _TestDartIOHttpRequestData(
     0,
     HttpProfileRequest(
-      id: 0,
+      id: '0',
       isolateId: '0',
       method: method,
       uri: uri,

packages/devtools_app/test/test_infra/test_data/network.dart

@@ -74,7 +74,7 @@ final httpGetResponseBodyData = [
 
 final testSocket1 = WebSocket(SocketStatistic.parse(testSocket1Json)!, 0);
 final Map<String, dynamic> testSocket1Json = {
-  'id': 0,
+  'id': '0',
   'startTime': 1000000,
   'endTime': 2000000,
   'lastReadTime': 1800000,
@@ -88,7 +88,7 @@ final Map<String, dynamic> testSocket1Json = {
 
 final testSocket2 = WebSocket(SocketStatistic.parse(testSocket2Json)!, 0);
 final Map<String, dynamic> testSocket2Json = {
-  'id': 1,
+  'id': '1',
   'startTime': 3000000,
   // This socket has no end time.
   'lastReadTime': 3500000,
@@ -102,7 +102,7 @@ final Map<String, dynamic> testSocket2Json = {
 
 final testSocket3 = WebSocket(SocketStatistic.parse(testSocket3Json)!, 0);
 final Map<String, dynamic> testSocket3Json = {
-  'id': 0,
+  'id': '0',
   'startTime': 1000000,
   'endTime': 2000000,
   'lastReadTime': 1800000,
@@ -122,7 +122,7 @@ final httpGet = DartIOHttpRequestData(
 );
 final Map<String, dynamic> httpGetJson = {
   'type': 'HttpProfileRequest',
-  'id': 1,
+  'id': '1',
   'isolateId': 'isolates/2013291945734727',
   'method': 'GET',
   'uri': 'https://jsonplaceholder.typicode.com/albums/1',
@@ -188,7 +188,7 @@ final httpPost = DartIOHttpRequestData(
 );
 final Map<String, dynamic> httpPostJson = {
   'type': 'HttpProfileRequest',
-  'id': 2,
+  'id': '2',
   'isolateId': 'isolates/979700762893215',
   'method': 'POST',
   'uri': 'https://jsonplaceholder.typicode.com/posts',
@@ -265,7 +265,7 @@ final httpPut = DartIOHttpRequestData(
 );
 final Map<String, dynamic> httpPutJson = {
   'type': 'HttpProfileRequest',
-  'id': 3,
+  'id': '3',
   'isolateId': 'isolates/4447876918484683',
   'method': 'PUT',
   'uri': 'https://jsonplaceholder.typicode.com/posts/1',
@@ -344,7 +344,7 @@ final httpPatch = DartIOHttpRequestData(
 );
 final Map<String, dynamic> httpPatchJson = {
   'type': 'HttpProfileRequest',
-  'id': 4,
+  'id': '4',
   'isolateId': 'isolates/4447876918484683',
   'method': 'PATCH',
   'uri': 'https://jsonplaceholder.typicode.com/posts/1',
@@ -426,7 +426,7 @@ final httpGetWithError = DartIOHttpRequestData(
 );
 final Map<String, dynamic> httpGetWithErrorJson = {
   'type': '@HttpProfileRequest',
-  'id': 5,
+  'id': '5',
   'isolateId': 'isolates/1939772779732043',
   'method': 'GET',
   'uri': 'https://www.examplez.com/1',
@@ -446,7 +446,7 @@ final httpWsHandshake = DartIOHttpRequestData(
 );
 final Map<String, dynamic> httpWsHandshakeJson = {
   'type': 'HttpProfileRequest',
-  'id': 6,
+  'id': '6',
   'isolateId': 'isolates/1350291957483171',
   'method': 'GET',
   'uri': 'http://localhost:8080',
@@ -512,7 +512,7 @@ final httpGetPending = DartIOHttpRequestData(
 );
 final Map<String, dynamic> httpGetPendingJson = {
   'type': 'HttpProfileRequest',
-  'id': 7,
+  'id': '7',
   'isolateId': 'isolates/2013291945734727',
   'method': 'GET',
   'uri': 'https://jsonplaceholder.typicode.com/albums/10',

packages/devtools_test/lib/src/mocks/fake_vm_service_wrapper.dart

@@ -404,7 +404,7 @@ class FakeVmServiceWrapper extends Fake implements VmServiceWrapper {
     final httpProfile = await getHttpProfile(isolateId);
     return Future.value(
       httpProfile.requests
-          .firstWhereOrNull((request) => request.id.toString() == id),
+          .firstWhereOrNull((request) => request.id == id),
     );
   }