From b82fcc0b210e695b134906a084bb75a8138617dc Mon Sep 17 00:00:00 2001
From: BrennanConroy <brecon@microsoft.com>
Date: Fri, 10 Aug 2018 09:49:17 -0700
Subject: [PATCH] log when WebSocketTransport has started (#2752)

---
 .../Internal/WebSocketsTransport.Log.cs                   | 8 ++++++++
 .../Internal/WebSocketsTransport.cs                       | 6 ++++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/Microsoft.AspNetCore.Http.Connections.Client/Internal/WebSocketsTransport.Log.cs b/src/Microsoft.AspNetCore.Http.Connections.Client/Internal/WebSocketsTransport.Log.cs
index 13ce089d6c..4ea783774f 100644
--- a/src/Microsoft.AspNetCore.Http.Connections.Client/Internal/WebSocketsTransport.Log.cs
+++ b/src/Microsoft.AspNetCore.Http.Connections.Client/Internal/WebSocketsTransport.Log.cs
@@ -66,6 +66,9 @@ namespace Microsoft.AspNetCore.Http.Connections.Client.Internal
             private static readonly Action<ILogger, Exception> _cancelMessage =
                 LoggerMessage.Define(LogLevel.Debug, new EventId(18, "CancelMessage"), "Canceled passing message to application.");
 
+            private static readonly Action<ILogger, Exception> _startedTransport =
+                LoggerMessage.Define(LogLevel.Debug, new EventId(19, "StartedTransport"), "Started transport.");
+
             public static void StartTransport(ILogger logger, TransferFormat transferFormat, Uri webSocketUrl)
             {
                 _startTransport(logger, transferFormat, webSocketUrl, null);
@@ -155,6 +158,11 @@ namespace Microsoft.AspNetCore.Http.Connections.Client.Internal
             {
                 _cancelMessage(logger, null);
             }
+
+            public static void StartedTransport(ILogger logger)
+            {
+                _startedTransport(logger, null);
+            }
         }
     }
 }
diff --git a/src/Microsoft.AspNetCore.Http.Connections.Client/Internal/WebSocketsTransport.cs b/src/Microsoft.AspNetCore.Http.Connections.Client/Internal/WebSocketsTransport.cs
index 0a78e0e17a..054e32c5bc 100644
--- a/src/Microsoft.AspNetCore.Http.Connections.Client/Internal/WebSocketsTransport.cs
+++ b/src/Microsoft.AspNetCore.Http.Connections.Client/Internal/WebSocketsTransport.cs
@@ -107,8 +107,6 @@ namespace Microsoft.AspNetCore.Http.Connections.Client.Internal
 
             var resolvedUrl = ResolveWebSocketsUrl(url);
 
-            Log.StartTransport(_logger, transferFormat, resolvedUrl);
-
             // We don't need to capture to a local because we never change this delegate.
             if (_accessTokenProvider != null)
             {
@@ -119,8 +117,12 @@ namespace Microsoft.AspNetCore.Http.Connections.Client.Internal
                 }
             }
 
+            Log.StartTransport(_logger, transferFormat, resolvedUrl);
+
             await _webSocket.ConnectAsync(resolvedUrl, CancellationToken.None);
 
+            Log.StartedTransport(_logger);
+
             // Create the pipe pair (Application's writer is connected to Transport's reader, and vice versa)
             var options = ClientPipeOptions.DefaultOptions;
             var pair = DuplexPipe.CreateConnectionPair(options, options);