mirror of
https://github.com/microsoft/agent-framework.git
synced 2026-06-16 21:04:09 +08:00
ad95f2f2fa
* .NET: Add Hosted-MemoryAgent sample with isolation key plumbing (#5692) Adds HostedSessionContext + HostedSessionIsolationKeyProvider in Microsoft.Agents.AI.Foundry.Hosting so AIContextProviders (notably FoundryMemoryProvider) can scope per user via the platform's x-agent-user-isolation-key / x-agent-chat-isolation-key headers. - New types: HostedSessionContext (sealed), HostedSessionContextExtensions (public Get, internal Set), abstract HostedSessionIsolationKeyProvider (async), internal PlatformHostedSessionIsolationKeyProvider mapping ResponseContext.Isolation. - AgentFrameworkResponseHandler now resolves the provider, tags fresh sessions, and validates resumed sessions against the live request (strict 403 'Hosted session identity context mismatch' on any mismatch; 500 on null keys). - New shared sample project Hosted_Shared_Contributor_Setup hosts DevTemporaryTokenCredential and DevTemporaryLocalSessionIsolationKeyProvider plus AddDevTemporaryLocalContributorSetup. All 9 existing responses samples migrated to consume it so local runs keep working under the strict isolation contract. - New Hosted-MemoryAgent sample: travel assistant wired through FoundryMemoryProvider with stateInitializer reading session.GetHostedContext().UserId. Includes Dockerfile, smoke.ps1, agent.yaml/manifest. - New IT scenario 'memory' in Foundry.Hosting.IntegrationTests + MemoryHostedAgentFixture + MemoryHostedAgentTests. Verified end to end against the tao Foundry project. - ADR 0026 captures the design tree. * Address PR review feedback - Dockerfile: add header noting it targets NuGet builds; contributors must use Dockerfile.contributor for ProjectReference source builds. - PlatformHostedSessionIsolationKeyProvider: doc said 'returns context with empty values'; corrected to 'returns null' which the handler treats as 500. - FakeHostedSessionIsolationKeyProvider: doc clarifies that null configurations are allowed for testing the handler error path. - HostedSessionContextExtensions.SetHostedContext: enforce write-once with InvalidOperationException; doc + xml exception updated. - AgentFrameworkResponseHandler: cache PlatformHostedSessionIsolationKeyProvider as static readonly to avoid per-request allocation. - MemoryHostedAgentTests: tighten waits from 20s to 5s (FoundryMemoryProvider defaults UpdateDelay=0; ingestion ~3s). - Sample Program.cs imports reordered to satisfy IDE0005. * Add HostedFoundryMemoryProviderScopes built-in helpers (#5692) Addresses review feedback from @lokitoth on Hosted-MemoryAgent/Program.cs:54. - New HostedFoundryMemoryProviderScopes static class with PerUser, PerChat, PerUserAndChat factories returning Func<AgentSession?, FoundryMemoryProvider.State>. - All helpers throw InvalidOperationException when GetHostedContext() is null, with a message pointing at writing a custom stateInitializer for non-hosted scenarios. - New HostedFoundryMemoryScope enum and AddHostedFoundryMemoryProvider DI extension (two overloads: explicit AIProjectClient and DI-resolved). Singleton lifetime. Default scope = PerUser. - Hosted-MemoryAgent sample and the memory IT scenario container both swap their inline lambdas for HostedFoundryMemoryProviderScopes.PerUser(). - 14 new unit tests (241/241 hosting unit tests pass). * Replace HostedFoundryMemoryScope enum with Func<...> parameter (#5692) Address PR review feedback from @westey-m: enums are a breaking-change hazard when extended, and the enum was redundant with the existing HostedFoundryMemoryProviderScopes static class. - Delete HostedFoundryMemoryScope.cs. - AddHostedFoundryMemoryProvider DI extensions now take Func<AgentSession?, FoundryMemoryProvider.State>? stateInitializer = null. When null, default to HostedFoundryMemoryProviderScopes.PerUser(). - Callers pick a built-in helper (PerUser/PerChat/PerUserAndChat) or pass a custom delegate. New built-ins are a single static method addition with zero impact on existing callers. - Tests updated; 244/244 hosting unit tests pass. * Fix isolation context resume for externally-created conversations (#5692) Branch on the session's existing hosted-context (not on conversation_id presence) so a conversation provisioned externally (e.g. via conversations.CreateProjectConversationAsync) is treated as fresh on first hosted-agent request and stamped, rather than rejected with 403 hosted_session_identity_mismatch. Strict equality is preserved on real resume of an already-stamped session. Also tighten dotnet/global.json to version 10.0.204 + rollForward latestPatch so local builds match the CI Docker image SDK and avoid 10.0.300 dotnet format stripping required usings. * Revert global.json SDK pin to upstream (#5692) The 10.0.204 + latestPatch pin from the previous commit broke the dotnet-format CI job (hostfxr_resolve_sdk2 could not find a compatible SDK in the mcr.microsoft.com/dotnet/sdk:10.0 image). Restore upstream 10.0.200 + minor; local Release builds with SDK 10.0.300 should set GITHUB_ACTIONS=true to bypass the auto-format-on-build target.
271 lines
12 KiB
C#
271 lines
12 KiB
C#
// Copyright (c) Microsoft. All rights reserved.
|
|
|
|
using System;
|
|
using System.Collections.Generic;
|
|
using System.Diagnostics;
|
|
using System.Linq;
|
|
using System.Runtime.CompilerServices;
|
|
using System.Text.Json;
|
|
using System.Threading;
|
|
using System.Threading.Tasks;
|
|
using Azure.AI.AgentServer.Responses;
|
|
using Azure.AI.AgentServer.Responses.Models;
|
|
using Microsoft.Extensions.AI;
|
|
using Microsoft.Extensions.DependencyInjection;
|
|
using Microsoft.Extensions.Logging.Abstractions;
|
|
using Moq;
|
|
using OpenTelemetry;
|
|
using OpenTelemetry.Trace;
|
|
using MeaiTextContent = Microsoft.Extensions.AI.TextContent;
|
|
|
|
namespace Microsoft.Agents.AI.Foundry.Hosting.UnitTests;
|
|
|
|
/// <summary>
|
|
/// Tests that verify OTel spans are actually emitted and captured through the
|
|
/// <see cref="AgentFrameworkResponseHandler"/> pipeline when
|
|
/// <see cref="FoundryHostingExtensions.ApplyOpenTelemetry"/> wraps the resolved agent.
|
|
/// </summary>
|
|
public class AgentFrameworkResponseHandlerTelemetryTests
|
|
{
|
|
/// <summary>
|
|
/// The ActivitySource name used by ApplyOpenTelemetry() — equals AgentHostTelemetry.ResponsesSourceName.
|
|
/// Declared as a constant so the TracerProvider and assertions reference the same literal.
|
|
/// </summary>
|
|
private const string ResponsesSourceName = "Azure.AI.AgentServer.Responses";
|
|
|
|
[Fact]
|
|
public async Task CreateAsync_DefaultAgent_EmitsInvokeAgentSpanAsync()
|
|
{
|
|
// Arrange
|
|
var activities = new ConcurrentActivityList();
|
|
using var tracerProvider = Sdk.CreateTracerProviderBuilder()
|
|
.AddSource(ResponsesSourceName)
|
|
.AddInMemoryExporter(activities)
|
|
.Build();
|
|
|
|
var agent = new TelemetryTestAgent();
|
|
var services = new ServiceCollection();
|
|
services.AddSingleton<AgentSessionStore>(new InMemoryAgentSessionStore());
|
|
services.AddSingleton<AIAgent>(agent);
|
|
services.AddSingleton<HostedSessionIsolationKeyProvider>(new FakeHostedSessionIsolationKeyProvider());
|
|
var sp = services.BuildServiceProvider();
|
|
|
|
var handler = new AgentFrameworkResponseHandler(sp, NullLogger<AgentFrameworkResponseHandler>.Instance);
|
|
var (request, context) = BuildRequest();
|
|
|
|
// Act — enumerate all events so the span completes before asserting
|
|
await foreach (var _ in handler.CreateAsync(request, context, CancellationToken.None)) { }
|
|
|
|
// Assert — filter by agent name to isolate this test's span from any parallel test spans
|
|
var mySpan = Assert.Single(activities.Snapshot().Where(a => TelemetryTestAgent.AgentName.Equals(a.GetTagItem("gen_ai.agent.name"))).ToList());
|
|
Assert.Equal("invoke_agent", mySpan.GetTagItem("gen_ai.operation.name"));
|
|
Assert.NotNull(mySpan.GetTagItem("gen_ai.agent.id"));
|
|
}
|
|
|
|
[Fact]
|
|
public async Task CreateAsync_KeyedAgent_EmitsInvokeAgentSpanAsync()
|
|
{
|
|
// Arrange
|
|
var activities = new ConcurrentActivityList();
|
|
using var tracerProvider = Sdk.CreateTracerProviderBuilder()
|
|
.AddSource(ResponsesSourceName)
|
|
.AddInMemoryExporter(activities)
|
|
.Build();
|
|
|
|
var agent = new TelemetryTestAgent();
|
|
var services = new ServiceCollection();
|
|
services.AddSingleton<AgentSessionStore>(new InMemoryAgentSessionStore());
|
|
services.AddKeyedSingleton<AIAgent>("keyed-agent", agent);
|
|
services.AddSingleton<HostedSessionIsolationKeyProvider>(new FakeHostedSessionIsolationKeyProvider());
|
|
var sp = services.BuildServiceProvider();
|
|
|
|
var handler = new AgentFrameworkResponseHandler(sp, NullLogger<AgentFrameworkResponseHandler>.Instance);
|
|
var (request, context) = BuildRequest(agentKey: "keyed-agent");
|
|
|
|
// Act
|
|
await foreach (var _ in handler.CreateAsync(request, context, CancellationToken.None)) { }
|
|
|
|
// Assert — filter by agent name to isolate this test's span
|
|
var mySpan = Assert.Single(activities.Snapshot().Where(a => TelemetryTestAgent.AgentName.Equals(a.GetTagItem("gen_ai.agent.name"))).ToList());
|
|
Assert.Equal("invoke_agent", mySpan.GetTagItem("gen_ai.operation.name"));
|
|
}
|
|
|
|
[Fact]
|
|
public async Task CreateAsync_AlreadyInstrumentedAgent_EmitsSingleSpanPerRunAsync()
|
|
{
|
|
// Arrange — use a unique source for the pre-wrapped agent distinct from ResponsesSourceName.
|
|
// If ApplyOpenTelemetry double-wraps, an extra span would appear on ResponsesSourceName.
|
|
// If it correctly skips wrapping, only the pre-wrap's unique source emits spans.
|
|
var preWrapSource = Guid.NewGuid().ToString();
|
|
var preWrapActivities = new ConcurrentActivityList();
|
|
var responsesActivities = new ConcurrentActivityList();
|
|
|
|
using var preWrapProvider = Sdk.CreateTracerProviderBuilder()
|
|
.AddSource(preWrapSource)
|
|
.AddInMemoryExporter(preWrapActivities)
|
|
.Build();
|
|
|
|
using var responsesProvider = Sdk.CreateTracerProviderBuilder()
|
|
.AddSource(ResponsesSourceName)
|
|
.AddInMemoryExporter(responsesActivities)
|
|
.Build();
|
|
|
|
var innerAgent = new TelemetryTestAgent();
|
|
var preWrapped = innerAgent.AsBuilder()
|
|
.UseOpenTelemetry(sourceName: preWrapSource)
|
|
.Build();
|
|
|
|
var services = new ServiceCollection();
|
|
services.AddSingleton<AgentSessionStore>(new InMemoryAgentSessionStore());
|
|
services.AddSingleton(preWrapped);
|
|
services.AddSingleton<HostedSessionIsolationKeyProvider>(new FakeHostedSessionIsolationKeyProvider());
|
|
var sp = services.BuildServiceProvider();
|
|
|
|
var handler = new AgentFrameworkResponseHandler(sp, NullLogger<AgentFrameworkResponseHandler>.Instance);
|
|
|
|
// Act
|
|
var (request, context) = BuildRequest();
|
|
await foreach (var _ in handler.CreateAsync(request, context, CancellationToken.None)) { }
|
|
|
|
// Assert — pre-wrap source emits exactly 1 span (agent ran)
|
|
var preWrapSnapshot = preWrapActivities.Snapshot();
|
|
Assert.Single(preWrapSnapshot);
|
|
Assert.Equal("invoke_agent", preWrapSnapshot[0].GetTagItem("gen_ai.operation.name"));
|
|
|
|
// ResponsesSourceName emits 0 spans — ApplyOpenTelemetry skipped wrapping the pre-instrumented agent
|
|
Assert.DoesNotContain(responsesActivities.Snapshot(), a => TelemetryTestAgent.AgentName.Equals(a.GetTagItem("gen_ai.agent.name")));
|
|
}
|
|
|
|
[Fact]
|
|
public async Task CreateAsync_DefaultAgent_SpanDisplayNameContainsAgentNameAsync()
|
|
{
|
|
// Arrange
|
|
var activities = new ConcurrentActivityList();
|
|
using var tracerProvider = Sdk.CreateTracerProviderBuilder()
|
|
.AddSource(ResponsesSourceName)
|
|
.AddInMemoryExporter(activities)
|
|
.Build();
|
|
|
|
var agent = new TelemetryTestAgent();
|
|
var services = new ServiceCollection();
|
|
services.AddSingleton<AgentSessionStore>(new InMemoryAgentSessionStore());
|
|
services.AddSingleton<AIAgent>(agent);
|
|
services.AddSingleton<HostedSessionIsolationKeyProvider>(new FakeHostedSessionIsolationKeyProvider());
|
|
var sp = services.BuildServiceProvider();
|
|
|
|
var handler = new AgentFrameworkResponseHandler(sp, NullLogger<AgentFrameworkResponseHandler>.Instance);
|
|
var (request, context) = BuildRequest();
|
|
|
|
// Act
|
|
await foreach (var _ in handler.CreateAsync(request, context, CancellationToken.None)) { }
|
|
|
|
// Assert — display name follows "invoke_agent {Name}({Id})" convention; filter by agent name to isolate
|
|
var mySpan = Assert.Single(activities.Snapshot().Where(a => TelemetryTestAgent.AgentName.Equals(a.GetTagItem("gen_ai.agent.name"))).ToList());
|
|
Assert.Contains("invoke_agent", mySpan.DisplayName, StringComparison.Ordinal);
|
|
Assert.Contains(TelemetryTestAgent.AgentName, mySpan.DisplayName, StringComparison.Ordinal);
|
|
}
|
|
|
|
private static (CreateResponse request, ResponseContext context) BuildRequest(string? agentKey = null)
|
|
{
|
|
var request = agentKey is null
|
|
? new CreateResponse { Model = "test" }
|
|
: new CreateResponse { Model = "test", AgentReference = new AgentReference(agentKey) };
|
|
|
|
request.Input = BinaryData.FromObjectAsJson(new[]
|
|
{
|
|
new { type = "message", id = "msg_1", status = "completed", role = "user",
|
|
content = new[] { new { type = "input_text", text = "Hello" } } }
|
|
});
|
|
|
|
var mockContext = new Mock<ResponseContext>("resp_" + new string('0', 46)) { CallBase = true };
|
|
mockContext.Setup(x => x.GetHistoryAsync(It.IsAny<CancellationToken>()))
|
|
.ReturnsAsync([]);
|
|
mockContext.Setup(x => x.GetInputItemsAsync(It.IsAny<bool>(), It.IsAny<CancellationToken>()))
|
|
.ReturnsAsync([]);
|
|
|
|
return (request, mockContext.Object);
|
|
}
|
|
|
|
private sealed class TelemetryTestAgent : AIAgent
|
|
{
|
|
public const string AgentName = "TelemetryTestAgent";
|
|
|
|
public override string? Name => AgentName;
|
|
|
|
protected override IAsyncEnumerable<AgentResponseUpdate> RunCoreStreamingAsync(
|
|
IEnumerable<ChatMessage> messages,
|
|
AgentSession? session,
|
|
AgentRunOptions? options,
|
|
CancellationToken cancellationToken = default) =>
|
|
SingleUpdateAsync(new AgentResponseUpdate
|
|
{
|
|
MessageId = "resp_msg_1",
|
|
Contents = [new MeaiTextContent("telemetry test response")]
|
|
}, cancellationToken);
|
|
|
|
protected override Task<AgentResponse> RunCoreAsync(
|
|
IEnumerable<ChatMessage> messages,
|
|
AgentSession? session,
|
|
AgentRunOptions? options,
|
|
CancellationToken cancellationToken = default) =>
|
|
throw new NotImplementedException();
|
|
|
|
protected override ValueTask<AgentSession> CreateSessionCoreAsync(
|
|
CancellationToken cancellationToken = default) =>
|
|
new(new TelemetryAgentSession());
|
|
|
|
protected override ValueTask<JsonElement> SerializeSessionCoreAsync(
|
|
AgentSession session,
|
|
JsonSerializerOptions? jsonSerializerOptions,
|
|
CancellationToken cancellationToken = default) =>
|
|
new(JsonDocument.Parse("{}").RootElement);
|
|
|
|
protected override ValueTask<AgentSession> DeserializeSessionCoreAsync(
|
|
JsonElement serializedState,
|
|
JsonSerializerOptions? jsonSerializerOptions,
|
|
CancellationToken cancellationToken = default) =>
|
|
new(new TelemetryAgentSession());
|
|
|
|
private static async IAsyncEnumerable<AgentResponseUpdate> SingleUpdateAsync(
|
|
AgentResponseUpdate update,
|
|
[EnumeratorCancellation] CancellationToken cancellationToken = default)
|
|
{
|
|
await Task.Yield();
|
|
yield return update;
|
|
}
|
|
}
|
|
|
|
private sealed class TelemetryAgentSession : AgentSession;
|
|
|
|
/// <summary>
|
|
/// Thread-safe <see cref="ICollection{Activity}"/> used by OTel's InMemoryExporter to capture
|
|
/// activities emitted on globally-listened sources. Required because the exporter writes into
|
|
/// the supplied collection from background Activity completion callbacks while the test thread
|
|
/// may be enumerating it for assertions, and other tests in the same assembly may emit on the
|
|
/// same source concurrently. A plain <see cref="List{Activity}"/> trips
|
|
/// "Collection was modified; enumeration operation may not execute." in that scenario.
|
|
/// </summary>
|
|
private sealed class ConcurrentActivityList : ICollection<Activity>
|
|
{
|
|
private readonly List<Activity> _items = new();
|
|
private readonly object _gate = new();
|
|
|
|
public int Count { get { lock (this._gate) { return this._items.Count; } } }
|
|
public bool IsReadOnly => false;
|
|
|
|
public void Add(Activity item) { lock (this._gate) { this._items.Add(item); } }
|
|
public void Clear() { lock (this._gate) { this._items.Clear(); } }
|
|
public bool Contains(Activity item) { lock (this._gate) { return this._items.Contains(item); } }
|
|
public void CopyTo(Activity[] array, int arrayIndex) { lock (this._gate) { this._items.CopyTo(array, arrayIndex); } }
|
|
public bool Remove(Activity item) { lock (this._gate) { return this._items.Remove(item); } }
|
|
|
|
public Activity[] Snapshot()
|
|
{
|
|
lock (this._gate) { return this._items.ToArray(); }
|
|
}
|
|
|
|
public IEnumerator<Activity> GetEnumerator() => ((IEnumerable<Activity>)this.Snapshot()).GetEnumerator();
|
|
System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() => this.GetEnumerator();
|
|
}
|
|
}
|