[ dart:io ] Fix minor bugs in network profiler

Fixes issues where:
 - Socket profile addresses were set using `InternetAddress.toString()`
   instead of `InternetAddress.address`
 - HTTP requests were not being marked as completed if `listen(...)` was
   not called on the `HttpClientResponse`
 - An exception could be thrown from profiling code if an HTTP response
   was completed after it was already completed with an error

Change-Id: I572928b77c4b1eb241acc7ec29f0e95dd7b2da8a
CoreLibraryReviewExempt: Only impacts dart:io network profiling logic
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/375800
Commit-Queue: Ben Konyi <[email protected]>
Reviewed-by: Derek Xu <[email protected]>
Auto-Submit: Ben Konyi <[email protected]>

Author: bkonyi

sdk/lib/_http/http_impl.dart

@@ -195,6 +195,9 @@ class _HttpProfileData {
   }
 
   void finishResponse() {
+    // Guard against the response being completed more than once or being
+    // completed before the response actually finished starting.
+    if (responseInProgress != true) return;
     responseInProgress = false;
     responseEndTimestamp = DateTime.now().microsecondsSinceEpoch;
     requestEvent('Content Download');
@@ -600,6 +603,9 @@ class _HttpClientResponse extends _HttpInboundMessageListInt
         super(_incoming) {
     // Set uri for potential exceptions.
     _incoming.uri = _httpRequest.uri;
+    // Ensure the response profile is completed, even if the response stream is
+    // never actually listened to.
+    _incoming.dataDone.then((_) => _profileData?.finishResponse());
   }
 
   static HttpClientResponseCompressionState _getCompressionState(
@@ -708,22 +714,22 @@ class _HttpClientResponse extends _HttpInboundMessageListInt
         return data;
       });
     }
-    return stream.listen(onData, onError: (e, st) {
-      _profileData?.finishResponseWithError(e.toString());
-      if (onError == null) {
-        return;
-      }
-      if (onError is void Function(Object, StackTrace)) {
-        onError(e, st);
-      } else {
-        (onError as void Function(Object))(e);
-      }
-    }, onDone: () {
-      _profileData?.finishResponse();
-      if (onDone != null) {
-        onDone();
-      }
-    }, cancelOnError: cancelOnError);
+    return stream.listen(
+      onData,
+      onError: (e, st) {
+        _profileData?.finishResponseWithError(e.toString());
+        if (onError == null) {
+          return;
+        }
+        if (onError is void Function(Object, StackTrace)) {
+          onError(e, st);
+        } else {
+          (onError as void Function(Object))(e);
+        }
+      },
+      onDone: onDone,
+      cancelOnError: cancelOnError,
+    );
   }
 
   Future<Socket> detachSocket() {

sdk/lib/io/network_profiling.dart

@@ -253,7 +253,11 @@ abstract class _SocketProfile {
         break;
       case _SocketProfileType.address:
         assert(object is InternetAddress);
-        stats.address = (object as InternetAddress).toString();
+        final internetAddress = object as InternetAddress;
+        stats.address = (internetAddress.type == InternetAddress.anyIPv6 ||
+                internetAddress.type == InternetAddress.loopbackIPv6)
+            ? '[${internetAddress.address}]'
+            : internetAddress.address;
         break;
       case _SocketProfileType.port:
         assert(object is int);