Skip to content
This repository was archived by the owner on Jan 5, 2026. It is now read-only.

state changes for sidecar #1837

Merged
cleemullins merged 1 commit into from
Apr 30, 2019
Merged

state changes for sidecar #1837

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 6 additions & 9 deletions libraries/Microsoft.Bot.Builder/Inspection/InspectionActivityExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,14 @@ namespace Microsoft.Bot.Builder
{
internal static class InspectionActivityExtensions
{
public static Activity TraceActivity(this BotState state, ITurnContext turnContext)
public static Activity MakeCommandActivity(this string command)
{
if (turnContext == null)
{
throw new ArgumentNullException(nameof(turnContext));
}
return (Activity)Activity.CreateTraceActivity("Command", "https://www.botframework.com/schemas/command", command, "Command");
}

var name = state.GetType().Name;
var cachedState = turnContext.TurnState.Get<object>(name);
var obj = JObject.FromObject(cachedState)["State"];
return (Activity)Activity.CreateTraceActivity("BotState", "https://www.botframework.com/schemas/botState", obj, "Bot State");
public static Activity TraceActivity(this JObject state)
{
return (Activity)Activity.CreateTraceActivity("BotState", "https://www.botframework.com/schemas/botState", state, "Bot State");
}

public static Activity TraceActivity(this Activity activity, string name, string label)
Expand Down
17 changes: 14 additions & 3 deletions libraries/Microsoft.Bot.Builder/Inspection/InspectionMiddleware.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
using Microsoft.Bot.Connector.Authentication;
using Microsoft.Bot.Schema;
using Microsoft.Extensions.Logging;
using Newtonsoft.Json.Linq;

namespace Microsoft.Bot.Builder
{
Expand Down Expand Up @@ -110,15 +111,25 @@ protected override async Task TraceStateAsync(ITurnContext turnContext, Cancella
var task2 = _conversationState?.LoadAsync(turnContext, false, cancellationToken) ?? Task.CompletedTask;
await Task.WhenAll(task1, task2).ConfigureAwait(false);

var botState = new JObject();

if (_userState != null)
{
await InvokeSendAsync(turnContext, session, _userState.TraceActivity(turnContext), cancellationToken).ConfigureAwait(false);
var name = _userState.GetType().Name;
var cachedState = turnContext.TurnState.Get<object>(name);
var obj = JObject.FromObject(cachedState)["State"];
botState.Add("userState", obj);
}

if (_conversationState != null)
{
await InvokeSendAsync(turnContext, session, _conversationState.TraceActivity(turnContext), cancellationToken).ConfigureAwait(false);
var name = _conversationState.GetType().Name;
var cachedState = turnContext.TurnState.Get<object>(name);
var obj = JObject.FromObject(cachedState)["State"];
botState.Add("conversationState", obj);
}

await InvokeSendAsync(turnContext, session, botState.TraceActivity(), cancellationToken).ConfigureAwait(false);
}
}

Expand All @@ -127,7 +138,7 @@ private async Task ProcessOpenCommandAsync(ITurnContext turnContext, Cancellatio
var accessor = _inspectionState.CreateProperty<InspectionSessionsByStatus>(nameof(InspectionSessionsByStatus));
var sessions = await accessor.GetAsync(turnContext, () => new InspectionSessionsByStatus()).ConfigureAwait(false);
var sessionId = OpenCommand(sessions, turnContext.Activity.GetConversationReference());
await turnContext.SendActivityAsync(MessageFactory.Text($"{Command} attach {sessionId}")).ConfigureAwait(false);
await turnContext.SendActivityAsync($"{Command} attach {sessionId}".MakeCommandActivity()).ConfigureAwait(false);
await _inspectionState.SaveChangesAsync(turnContext, false, cancellationToken).ConfigureAwait(false);
}

Expand Down