mirror of
https://github.com/microsoft/agent-framework.git
synced 2026-06-16 21:04:09 +08:00
8b191de936
* .NET: Add Microsoft Fabric sample #3674 (#4230) Co-authored-by: Chris <66376200+crickman@users.noreply.github.com> * Python: Phase 2: Embedding clients for Ollama, Bedrock, and Azure AI Inference (#4207) * Phase 2: Embedding clients for Ollama, Bedrock, and Azure AI Inference Add embedding client implementations to existing provider packages: - OllamaEmbeddingClient: Text embeddings via Ollama's embed API - BedrockEmbeddingClient: Text embeddings via Amazon Titan on Bedrock - AzureAIInferenceEmbeddingClient: Text and image embeddings via Azure AI Inference, supporting Content | str input with separate model IDs for text (AZURE_AI_INFERENCE_EMBEDDING_MODEL_ID) and image (AZURE_AI_INFERENCE_IMAGE_EMBEDDING_MODEL_ID) endpoints Additional changes: - Rename EmbeddingCoT -> EmbeddingT, EmbeddingOptionsCoT -> EmbeddingOptionsT - Add otel_provider_name passthrough to all embedding clients - Register integration pytest marker in all packages - Add lazy-loading namespace exports for Ollama and Bedrock embeddings - Add image embedding sample using Cohere-embed-v3-english - Add azure-ai-inference dependency to azure-ai package Part of #1188 Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Fix mypy duplicate name and ruff lint issues - Rename second 'vector' variable to 'img_vector' in image embedding loop - Combine nested with statements in tests - Remove unused result assignments in tests Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * updates from feedback * Fix CI failures in embedding usage handling - Fix Azure AI embedding mypy issues by normalizing vectors to list[float], safely accumulating optional usage token fields, and filtering None entries before constructing GeneratedEmbeddings - Avoid Bandit false positive by initializing usage details as an empty dict - Update OpenAI embedding tests to assert canonical usage keys (input_token_count/total_token_count) Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --------- Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * [Purview] Mark responses as responses and fix epoch bug for python long overflow (#4225) * .NET: Support InvokeMcpTool for declarative workflows (#4204) * Initial implementation of InvokeMcpTool in declarative workflow * Cleaned up sample implementation * Updated sample comments. * Added missing executor routing attribute * Fix PR comments. * Updated based on PR comments. * Updated based on PR comments. * Removed unnecessary using statement. * Update Python package versions to rc2 (#4258) - Bump core and azure-ai to 1.0.0rc2 - Bump preview packages to 1.0.0b260225 - Update dependencies to >=1.0.0rc2 - Add CHANGELOG entries for changes since rc1 - Update uv.lock Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * .NET: Fixing issue where OpenTelemetry span is never exported in .NET in-process workflow execution (#4196) * 1. Add reproduction test for issue #4155: workflow.run Activity never stopped in streaming OffThread path The WorkflowRunActivity_IsStopped_Streaming_OffThread test demonstrates that the workflow.run OpenTelemetry Activity created in StreamingRunEventStream.RunLoopAsync is started but never stopped when using the OffThread/Default streaming execution. The background run loop keeps running after event consumption completes, so the using Activity? declaration never disposes until explicit StopAsync() is called. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> 2. Fix workflow.run Activity never stopped in streaming OffThread execution (#4155) The workflow.run OpenTelemetry Activity in StreamingRunEventStream.RunLoopAsync was scoped to the method lifetime via 'using'. Since the run loop only exits on cancellation, the Activity was never stopped/exported until explicit disposal. Fix: Remove 'using' and explicitly dispose the Activity when the workflow reaches Idle status (all supersteps complete). A safety-net disposal in the finally block handles cancellation and error paths. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Add root-level workflow.session activity spanning run loop lifetime\n\nImplements two-level telemetry hierarchy per PR feedback from lokitoth:\n- workflow.session: spans the entire run loop / stream lifetime\n- workflow_invoke: per input-to-halt cycle, nested within the session\n\nThis ensures the session activity stays open across multiple turns,\nwhile individual run activities are created and disposed per cycle.\n\nAlso fixes linkedSource CancellationTokenSource disposal leak in\nStreamingRunEventStream (added using declaration)." * Address Copilot review: fix Activity/CTS disposal, rename activity, add error tag\n\n1. LockstepRunEventStream: Remove 'using' from Activity in async iterator\n and manually dispose in finally block (fixes #4155 pattern). Also dispose\n linkedSource CTS in finally to prevent leak.\n2. Tags.cs: Add ErrorMessage (\"error.message\") tag for runtime errors,\n distinct from BuildErrorMessage (\"build.error.message\").\n3. ActivityNames: Rename WorkflowRun from \"workflow_invoke\" to \"workflow.run\"\n for cross-language consistency.\n4. WorkflowTelemetryContext: Fix XML doc to say \"outer/parent span\" instead\n of \"root-level span\".\n5. ObservabilityTests: Assert WorkflowSession absence when DisableWorkflowRun\n is true.\n6. WorkflowRunActivityStopTests: Fix streaming test race by disposing\n StreamingRun before asserting activities are stopped.\n7. StreamingRunEventStream/LockstepRunEventStream: Use Tags.ErrorMessage\n instead of Tags.BuildErrorMessage for runtime error events." * Review fixes: revert workflow_invoke rename, use 'using' for linkedSource, move SessionStarted earlier\n\n- Revert ActivityNames.WorkflowRun back to \"workflow_invoke\" (OTEL semantic convention contract)\n- Use 'using' declaration for linkedSource CTS in LockstepRunEventStream (no timing sensitivity)\n- Move SessionStarted event before WaitForInputAsync in StreamingRunEventStream to match Lockstep behavior" * Improve naming and comments in WorkflowRunActivityStopTests" * Prevent session Activity.Current leak in lockstep mode, add nesting test Save and restore Activity.Current in LockstepRunEventStream.Start() so the session activity doesn't leak into caller code via AsyncLocal. Re-establish Activity.Current = sessionActivity before creating the run activity in TakeEventStreamAsync to preserve parent-child nesting. Add test verifying app activities after RunAsync are not parented under the session, and that the workflow_invoke activity nests under the session." * Fix stale XML doc: WorkflowRun -> WorkflowInvoke in ObservabilityTests --------- Co-authored-by: alliscode <bentho@microsoft.com> Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Python / .NET Samples - Restructure and Improve Samples (Feature Branc… (#4092) * Python: .NET Samples - Restructure and Improve Samples (Feature Branch) (#4091) * Moved by agent (#4094) * Fix readme links * .NET Samples - Create `04-hosting` learning path step (#4098) * Agent move * Agent reorderd * Remove A2A section from README Removed A2A section from the Getting Started README. * Agent fixed links * Fix broken sample links in durable-agents README (#4101) * Initial plan * Fix broken internal links in documentation Co-authored-by: crickman <66376200+crickman@users.noreply.github.com> * Revert template link changes; keep only durable-agents README fix Co-authored-by: crickman <66376200+crickman@users.noreply.github.com> --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: crickman <66376200+crickman@users.noreply.github.com> * .NET Samples - Create `03-workflows` learning path step (#4102) * Fix solution project path * Python: Fix broken markdown links to repo resources (outside /docs) (#4105) * Initial plan * Fix broken markdown links to repo resources Co-authored-by: crickman <66376200+crickman@users.noreply.github.com> * Update README to rename .NET Workflows Samples section --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: crickman <66376200+crickman@users.noreply.github.com> * .NET Samples - Create `02-agents` learning path step (#4107) * .NET: Fix broken relative link in GroupChatToolApproval README (#4108) * Initial plan * Fix broken link in GroupChatToolApproval README Co-authored-by: crickman <66376200+crickman@users.noreply.github.com> --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: crickman <66376200+crickman@users.noreply.github.com> * Update labeler configuration for workflow samples * .NET - Reorder Agents samples to start from Step01 instead of Step04 (#4110) * Fix solution * Resolve new sample paths * Move new AgentSkills and AgentWithMemory_Step04 samples * Fix link * Fix readme path * fix: update stale dotnet/samples/Durable path reference in AGENTS.md Co-authored-by: crickman <66376200+crickman@users.noreply.github.com> * Moved new sample * Update solution * Resolve merge (new sample) * Sync to new sample - FoundryAgents_Step21_BingCustomSearch * Updated README * .NET Samples - Configuration Naming Update (#4149) * .NET: Restore AzureFunctions index parity with ConsoleApps under DurableAgents samples (#4221) * Clean-up `05_host_your_agent` * Config setting consistency * Refine samples * AGENTS.md * Move new samples * Re-order samples * Move new project and fixup solution * Fixup model config * Fix up new UT project --------- Co-authored-by: Copilot <198982749+Copilot@users.noreply.github.com> * Python: Fix Bedrock embedding test stub missing meta attribute (#4287) * Fix Bedrock embedding test stub missing meta attribute * Increase test coverage so gate passes * Python: (ag-ui): fix approval payloads being re-processed on subsequent conversation turns (#4232) * Fix ag-ui tool call issue * Safe json fix * Python: Update workflow orchestration samples to use AzureOpenAIResponsesClient (#4285) * Update workflow orchestration samples to use AzureOpenAIResponsesClient * Fix broken link * Move scripts to scripts folder --------- Co-authored-by: Roger Barreto <19890735+rogerbarreto@users.noreply.github.com> Co-authored-by: Chris <66376200+crickman@users.noreply.github.com> Co-authored-by: Eduard van Valkenburg <eavanvalkenburg@users.noreply.github.com> Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Co-authored-by: Rishabh Chawla <rishabhchawla1995@gmail.com> Co-authored-by: Peter Ibekwe <109177538+peibekwe@users.noreply.github.com> Co-authored-by: Dmytro Struk <13853051+dmytrostruk@users.noreply.github.com> Co-authored-by: Ben Thomas <ben.thomas@microsoft.com> Co-authored-by: alliscode <bentho@microsoft.com> Co-authored-by: Copilot <198982749+Copilot@users.noreply.github.com> Co-authored-by: Evan Mattson <35585003+moonbox3@users.noreply.github.com>
234 lines
10 KiB
C#
234 lines
10 KiB
C#
// Copyright (c) Microsoft. All rights reserved.
|
|
|
|
using System.ComponentModel;
|
|
using System.Diagnostics;
|
|
using System.Diagnostics.Metrics;
|
|
using Azure.AI.OpenAI;
|
|
using Azure.Identity;
|
|
using Azure.Monitor.OpenTelemetry.Exporter;
|
|
using Microsoft.Agents.AI;
|
|
using Microsoft.Extensions.AI;
|
|
using Microsoft.Extensions.DependencyInjection;
|
|
using Microsoft.Extensions.Logging;
|
|
using OpenTelemetry;
|
|
using OpenTelemetry.Logs;
|
|
using OpenTelemetry.Metrics;
|
|
using OpenTelemetry.Resources;
|
|
using OpenTelemetry.Trace;
|
|
|
|
#region Setup Telemetry
|
|
|
|
const string SourceName = "OpenTelemetryAspire.ConsoleApp";
|
|
const string ServiceName = "AgentOpenTelemetry";
|
|
|
|
// Configure OpenTelemetry for Aspire dashboard
|
|
var otlpEndpoint = Environment.GetEnvironmentVariable("OTEL_EXPORTER_OTLP_ENDPOINT") ?? "http://localhost:4318";
|
|
|
|
var applicationInsightsConnectionString = Environment.GetEnvironmentVariable("APPLICATIONINSIGHTS_CONNECTION_STRING");
|
|
|
|
// Create a resource to identify this service
|
|
var resource = ResourceBuilder.CreateDefault()
|
|
.AddService(ServiceName, serviceVersion: "1.0.0")
|
|
.AddAttributes(new Dictionary<string, object>
|
|
{
|
|
["service.instance.id"] = Environment.MachineName,
|
|
["deployment.environment"] = "development"
|
|
})
|
|
.Build();
|
|
|
|
// Setup tracing with resource
|
|
var tracerProviderBuilder = Sdk.CreateTracerProviderBuilder()
|
|
.SetResourceBuilder(ResourceBuilder.CreateDefault().AddService(ServiceName, serviceVersion: "1.0.0"))
|
|
.AddSource(SourceName) // Our custom activity source
|
|
.AddSource("*Microsoft.Agents.AI") // Agent Framework telemetry
|
|
.AddHttpClientInstrumentation() // Capture HTTP calls to OpenAI
|
|
.AddOtlpExporter(options => options.Endpoint = new Uri(otlpEndpoint));
|
|
|
|
if (!string.IsNullOrWhiteSpace(applicationInsightsConnectionString))
|
|
{
|
|
tracerProviderBuilder.AddAzureMonitorTraceExporter(options => options.ConnectionString = applicationInsightsConnectionString);
|
|
}
|
|
|
|
using var tracerProvider = tracerProviderBuilder.Build();
|
|
|
|
// Setup metrics with resource and instrument name filtering
|
|
using var meterProvider = Sdk.CreateMeterProviderBuilder()
|
|
.SetResourceBuilder(ResourceBuilder.CreateDefault().AddService(ServiceName, serviceVersion: "1.0.0"))
|
|
.AddMeter(SourceName) // Our custom meter
|
|
.AddMeter("*Microsoft.Agents.AI") // Agent Framework metrics
|
|
.AddHttpClientInstrumentation() // HTTP client metrics
|
|
.AddRuntimeInstrumentation() // .NET runtime metrics
|
|
.AddOtlpExporter(options => options.Endpoint = new Uri(otlpEndpoint))
|
|
.Build();
|
|
|
|
// Setup structured logging with OpenTelemetry
|
|
var serviceCollection = new ServiceCollection();
|
|
serviceCollection.AddLogging(loggingBuilder => loggingBuilder
|
|
.SetMinimumLevel(LogLevel.Debug)
|
|
.AddOpenTelemetry(options =>
|
|
{
|
|
options.SetResourceBuilder(ResourceBuilder.CreateDefault().AddService(ServiceName, serviceVersion: "1.0.0"));
|
|
options.AddOtlpExporter(otlpOptions => otlpOptions.Endpoint = new Uri(otlpEndpoint));
|
|
if (!string.IsNullOrWhiteSpace(applicationInsightsConnectionString))
|
|
{
|
|
options.AddAzureMonitorLogExporter(options => options.ConnectionString = applicationInsightsConnectionString);
|
|
}
|
|
options.IncludeScopes = true;
|
|
options.IncludeFormattedMessage = true;
|
|
}));
|
|
|
|
using var activitySource = new ActivitySource(SourceName);
|
|
using var meter = new Meter(SourceName);
|
|
|
|
// Create custom metrics
|
|
var interactionCounter = meter.CreateCounter<int>("agent_interactions_total", description: "Total number of agent interactions");
|
|
var responseTimeHistogram = meter.CreateHistogram<double>("agent_response_time_seconds", description: "Agent response time in seconds");
|
|
|
|
#endregion
|
|
|
|
var serviceProvider = serviceCollection.BuildServiceProvider();
|
|
var loggerFactory = serviceProvider.GetRequiredService<ILoggerFactory>();
|
|
var appLogger = loggerFactory.CreateLogger<Program>();
|
|
|
|
Console.WriteLine("""
|
|
=== OpenTelemetry Aspire Demo ===
|
|
This demo shows OpenTelemetry integration with the Agent Framework.
|
|
You can view the telemetry data in the Aspire Dashboard.
|
|
Type your message and press Enter. Type 'exit' or empty message to quit.
|
|
""");
|
|
|
|
var endpoint = Environment.GetEnvironmentVariable("AZURE_OPENAI_ENDPOINT") ?? throw new InvalidOperationException("AZURE_OPENAI_ENDPOINT environment variable is not set.");
|
|
var deploymentName = Environment.GetEnvironmentVariable("AZURE_OPENAI_DEPLOYMENT_NAME") ?? "gpt-4o-mini";
|
|
|
|
// Log application startup
|
|
appLogger.LogInformation("OpenTelemetry Aspire Demo application started");
|
|
|
|
[Description("Get the weather for a given location.")]
|
|
static async Task<string> GetWeatherAsync([Description("The location to get the weather for.")] string location)
|
|
{
|
|
await Task.Delay(2000);
|
|
return $"The weather in {location} is cloudy with a high of 15°C.";
|
|
}
|
|
|
|
// WARNING: DefaultAzureCredential is convenient for development but requires careful consideration in production.
|
|
// In production, consider using a specific credential (e.g., ManagedIdentityCredential) to avoid
|
|
// latency issues, unintended credential probing, and potential security risks from fallback mechanisms.
|
|
using var instrumentedChatClient = new AzureOpenAIClient(new Uri(endpoint), new DefaultAzureCredential())
|
|
.GetChatClient(deploymentName)
|
|
.AsIChatClient() // Converts a native OpenAI SDK ChatClient into a Microsoft.Extensions.AI.IChatClient
|
|
.AsBuilder()
|
|
.UseFunctionInvocation()
|
|
.UseOpenTelemetry(sourceName: SourceName, configure: (cfg) => cfg.EnableSensitiveData = true) // enable telemetry at the chat client level
|
|
.Build();
|
|
|
|
appLogger.LogInformation("Creating Agent with OpenTelemetry instrumentation");
|
|
// Create the agent with the instrumented chat client
|
|
var agent = new ChatClientAgent(instrumentedChatClient,
|
|
name: "OpenTelemetryDemoAgent",
|
|
instructions: "You are a helpful assistant that provides concise and informative responses.",
|
|
tools: [AIFunctionFactory.Create(GetWeatherAsync)])
|
|
.AsBuilder()
|
|
.UseOpenTelemetry(SourceName, configure: (cfg) => cfg.EnableSensitiveData = true) // enable telemetry at the agent level
|
|
.Build();
|
|
|
|
var session = await agent.CreateSessionAsync();
|
|
|
|
appLogger.LogInformation("Agent created successfully with ID: {AgentId}", agent.Id);
|
|
|
|
// Create a parent span for the entire agent session
|
|
using var sessionActivity = activitySource.StartActivity("Agent Session");
|
|
Console.WriteLine($"Trace ID: {sessionActivity?.TraceId} ");
|
|
|
|
var sessionId = Guid.NewGuid().ToString("N");
|
|
sessionActivity?
|
|
.SetTag("agent.name", "OpenTelemetryDemoAgent")
|
|
.SetTag("session.id", sessionId)
|
|
.SetTag("session.start_time", DateTimeOffset.UtcNow.ToString("O"));
|
|
|
|
appLogger.LogInformation("Starting agent session with ID: {SessionId}", sessionId);
|
|
using (appLogger.BeginScope(new Dictionary<string, object> { ["SessionId"] = sessionId, ["AgentName"] = "OpenTelemetryDemoAgent" }))
|
|
{
|
|
var interactionCount = 0;
|
|
|
|
while (true)
|
|
{
|
|
Console.Write("You (or 'exit' to quit): ");
|
|
var userInput = Console.ReadLine();
|
|
|
|
if (string.IsNullOrWhiteSpace(userInput) || userInput.Equals("exit", StringComparison.OrdinalIgnoreCase))
|
|
{
|
|
appLogger.LogInformation("User requested to exit the session");
|
|
break;
|
|
}
|
|
|
|
interactionCount++;
|
|
appLogger.LogInformation("Processing user interaction #{InteractionNumber}: {UserInput}", interactionCount, userInput);
|
|
|
|
// Create a child span for each individual interaction
|
|
using var activity = activitySource.StartActivity("Agent Interaction");
|
|
activity?
|
|
.SetTag("user.input", userInput)
|
|
.SetTag("agent.name", "OpenTelemetryDemoAgent")
|
|
.SetTag("interaction.number", interactionCount);
|
|
|
|
var stopwatch = Stopwatch.StartNew();
|
|
|
|
try
|
|
{
|
|
appLogger.LogDebug("Starting agent execution for interaction #{InteractionNumber}", interactionCount);
|
|
Console.Write("Agent: ");
|
|
|
|
// Run the agent (this will create its own internal telemetry spans)
|
|
await foreach (var update in agent.RunStreamingAsync(userInput, session))
|
|
{
|
|
Console.Write(update.Text);
|
|
}
|
|
|
|
Console.WriteLine();
|
|
|
|
stopwatch.Stop();
|
|
var responseTime = stopwatch.Elapsed.TotalSeconds;
|
|
|
|
// Record metrics (similar to Python example)
|
|
interactionCounter.Add(1, new KeyValuePair<string, object?>("status", "success"));
|
|
responseTimeHistogram.Record(responseTime,
|
|
new KeyValuePair<string, object?>("status", "success"));
|
|
|
|
activity?.SetTag("response.success", true);
|
|
|
|
appLogger.LogInformation("Agent interaction #{InteractionNumber} completed successfully in {ResponseTime:F2} seconds",
|
|
interactionCount, responseTime);
|
|
}
|
|
catch (Exception ex)
|
|
{
|
|
Console.WriteLine($"Error: {ex.Message}");
|
|
Console.WriteLine();
|
|
|
|
stopwatch.Stop();
|
|
var responseTime = stopwatch.Elapsed.TotalSeconds;
|
|
|
|
// Record error metrics
|
|
interactionCounter.Add(1, new KeyValuePair<string, object?>("status", "error"));
|
|
responseTimeHistogram.Record(responseTime,
|
|
new KeyValuePair<string, object?>("status", "error"));
|
|
|
|
activity?
|
|
.SetTag("response.success", false)
|
|
.SetTag("error.message", ex.Message)
|
|
.SetStatus(ActivityStatusCode.Error, ex.Message);
|
|
|
|
appLogger.LogError(ex, "Agent interaction #{InteractionNumber} failed after {ResponseTime:F2} seconds: {ErrorMessage}",
|
|
interactionCount, responseTime, ex.Message);
|
|
}
|
|
}
|
|
|
|
// Add session summary to the parent span
|
|
sessionActivity?
|
|
.SetTag("session.total_interactions", interactionCount)
|
|
.SetTag("session.end_time", DateTimeOffset.UtcNow.ToString("O"));
|
|
|
|
appLogger.LogInformation("Agent session completed. Total interactions: {TotalInteractions}", interactionCount);
|
|
} // End of logging scope
|
|
|
|
appLogger.LogInformation("OpenTelemetry Aspire Demo application shutting down");
|