Merge pull request #1848 from Microsoft/johtaylo/warn-and-order

improved error message for connection failure and order of state trace
microsoft · May 1, 2019 · 295c941 · 295c941
2 parents 84553c4 + 6f89dc3
commit 295c941
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/libraries/Microsoft.Bot.Builder/Inspection/InspectionSession.cs b/libraries/Microsoft.Bot.Builder/Inspection/InspectionSession.cs
@@ -35,7 +35,7 @@ public async Task<bool> SendAsync(Activity activity, CancellationToken cancellat
             }
             catch (Exception err)
             {
-                _logger.LogWarning($"Exception sending to inspection endpoint {err.ToString()}");
+                _logger.LogWarning($"Exception '{err.ToString()}' while attempting to call Emulator for inspection, check it is running, and you have correct credentials in the Emulator and the InspectionMiddleware.");
                 return false;
             }
 

diff --git a/libraries/Microsoft.Bot.Builder/Inspection/InterceptionMiddleware.cs b/libraries/Microsoft.Bot.Builder/Inspection/InterceptionMiddleware.cs
@@ -47,8 +47,6 @@ async Task IMiddleware.OnTurnAsync(ITurnContext turnContext, NextDelegate next,
                     await InvokeOutboundAsync(ctx, traceActivity, cancellationToken).ConfigureAwait(false);
                     await nextDelete().ConfigureAwait(false);
                 });
-
-                await InvokeTraceStateAsync(turnContext, cancellationToken).ConfigureAwait(false);
             }
 
             if (shouldForwardToApplication)
@@ -63,6 +61,11 @@ async Task IMiddleware.OnTurnAsync(ITurnContext turnContext, NextDelegate next,
                     throw e;
                 }
             }
+
+            if (shouldIntercept)
+            {
+                await InvokeTraceStateAsync(turnContext, cancellationToken).ConfigureAwait(false);
+            }
         }
 
         protected abstract Task<(bool shouldForwardToApplication, bool shouldIntercept)> InboundAsync(ITurnContext turnContext, Activity traceActivity, CancellationToken cancellationToken);