http profiling: Remove unnecessary async from function

This makes the code simpler, and more readable, and is a no-op.

`_createHttpProfileRequestFromProfileMap` was being always awaited, but
the function did not need to return a Future. So we make it
synchronous, remove the awaits. That then allows
`_getHttpProfileRequest` to not be asynchronous as well.

Change-Id: I1c9854e122e9093e2305f71cc311045f17e81ae9
CoreLibraryReviewExempt: no API; just profiling impl code
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/416260
Reviewed-by: Ben Konyi <[email protected]>
Commit-Queue: Samuel Rawlins <[email protected]>

Author: srawlins

sdk/lib/io/network_profiling.dart

@@ -11,16 +11,16 @@ const int _versionMinor = 0;
 const String _tcpSocket = 'tcp';
 const String _udpSocket = 'udp';
 
-// Creates a Map conforming to the HttpProfileRequest type defined in the
-// dart:io service extension spec from an element of dart:developer's
-// [_developerProfilingData].
-Future<Map<String, dynamic>> _createHttpProfileRequestFromProfileMap(
+/// Creates a Map conforming to the `HttpProfileRequest` type defined in the
+/// dart:io service extension spec from an element of dart:developer's
+/// `_developerProfilingData`.
+Map<String, Object?> _createHttpProfileRequestFromProfileMap(
   Map<String, dynamic> requestProfile, {
   required bool ref,
-}) async {
+}) {
   final responseData = requestProfile['responseData'] as Map<String, dynamic>;
 
-  return <String, dynamic>{
+  return {
     'type': '${ref ? '@' : ''}HttpProfileRequest',
     'id': requestProfile['id']!,
     'isolateId': requestProfile['isolateId']!,
@@ -70,6 +70,9 @@ abstract class _NetworkProfiling {
     registerExtension(_kClearHttpProfileRPC, _serviceExtensionHandler);
   }
 
+  // Note this function only returns a `Future` because that is required by the
+  // signature of `registerExtension`. We might be able to change the signature
+  // of ServiceExtensionHandler to use `FutureOr` instead of `Future`.
   static Future<ServiceExtensionResponse> _serviceExtensionHandler(
     String method,
     Map<String, String> parameters,
@@ -93,23 +96,21 @@ abstract class _NetworkProfiling {
             'timestamp': DateTime.now().microsecondsSinceEpoch,
             'requests': [
               ...HttpProfiler.serializeHttpProfileRequests(updatedSince),
-              ...await Future.wait(
-                getHttpClientProfilingData()
-                    .where(
-                      (final Map<String, dynamic> p) =>
-                          updatedSince == null ||
-                          (p['_lastUpdateTime'] as int) >= updatedSince,
-                    )
-                    .map(
-                      (p) =>
-                          _createHttpProfileRequestFromProfileMap(p, ref: true),
-                    ),
-              ),
+              ...getHttpClientProfilingData()
+                  .where(
+                    (final Map<String, dynamic> p) =>
+                        updatedSince == null ||
+                        (p['_lastUpdateTime'] as int) >= updatedSince,
+                  )
+                  .map(
+                    (p) =>
+                        _createHttpProfileRequestFromProfileMap(p, ref: true),
+                  ),
             ],
           });
           break;
         case _kGetHttpProfileRequestRPC:
-          responseJson = await _getHttpProfileRequest(parameters);
+          responseJson = _getHttpProfileRequest(parameters);
           break;
         case _kClearHttpProfileRPC:
           HttpProfiler.clear();
@@ -174,23 +175,20 @@ String _setHttpEnableTimelineLogging(Map<String, String> parameters) {
   return _success();
 }
 
-Future<String> _getHttpProfileRequest(Map<String, String> parameters) async {
-  if (!parameters.containsKey('id')) {
+String _getHttpProfileRequest(Map<String, String> parameters) {
+  final id = parameters['id'];
+  if (id == null) {
     throw _missingArgument('id');
   }
-  final id = parameters['id']!;
-  final request;
+  final Map<String, Object?>? request;
   if (id.startsWith('from_package/')) {
     final profileMap = getHttpClientProfilingData().elementAtOrNull(
       int.parse(id.substring('from_package/'.length)) - 1,
     );
     request =
         profileMap == null
             ? null
-            : await _createHttpProfileRequestFromProfileMap(
-              profileMap,
-              ref: false,
-            );
+            : _createHttpProfileRequestFromProfileMap(profileMap, ref: false);
   } else {
     request = HttpProfiler.getHttpProfileRequest(id)?.toJson(ref: false);
   }