mirror of
https://github.com/microsoft/agent-framework.git
synced 2026-06-16 21:04:09 +08:00
60af59ba8b
* adds devui integration and samples
* adds unit tests for devui integration
* fix: correct formatting of copyright notice in unit test files
* fixes formatting issues
* fixes build for net8 target
* fixes formatting errors on test apphost
* adds copyright notice to multiple files and removes unnecessary using directives
* Update dotnet/aspire-integration/Aspire.Hosting.AgentFramework.DevUI/DevUIAggregatorHostedService.cs
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
* Update dotnet/aspire-integration/Aspire.Hosting.AgentFramework.DevUI/DevUIAggregatorHostedService.cs
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
* Update dotnet/tests/Aspire.Hosting.AgentFramework.DevUI.UnitTests/Aspire.Hosting.AgentFramework.DevUI.UnitTests.csproj
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
* Update dotnet/samples/DevUIIntegration/DevUIIntegration.AppHost/DevUIIntegration.AppHost.csproj
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
* Update dotnet/aspire-integration/Aspire.Hosting.AgentFramework.DevUI/DevUIAggregatorHostedService.cs
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
* Refactor project files to use TargetFrameworks instead of TargetFramework for multi-targeting support; add optional port property to DevUIResource class.
* Add unit tests for DevUIAggregatorHostedService; refactor project files for TargetFrameworks support
* Refactor project files to use TargetFrameworks for multi-targeting support in DevUIIntegration samples
* Remove unnecessary using directive for Aspire.Hosting in DevUIAggregatorHostedServiceTests
* merge
* fixes Conversation routing for non-first backends
* add documentation for devui integration sample
* update project references in solution file for improved integration
* fixes package versions post merge
* move Aspire.Hosting.AgentFramework.DevUI to dotnet/src
Move the project from aspire-integration/ to src/ to be consistent
with the location of all other projects in the repo.
* move DevUI sample to samples/05-end-to-end/DevUIAspireIntegration
Move the sample from samples/DevUIIntegration/ to
samples/05-end-to-end/DevUIAspireIntegration/ to match the location
of other end-to-end samples.
* remove unnecessary net472 framework condition from sample csproj files
These projects only target net10.0, so the
Condition="'$(TargetFramework)' != 'net472'" on ItemGroup is unnecessary.
* update sample model name from gpt-4.1 to gpt-5.4
Use a more up-to-date model name in the DevUI integration samples.
* Revert "remove unnecessary net472 framework condition from sample csproj files"
This reverts commit 08cf41253b.
* fix: use TargetFrameworks to override multi-targeting from Directory.Build.props
The parent Directory.Build.props sets TargetFrameworks to net10.0;net472,
which overrides the singular TargetFramework in each csproj. Use the plural
TargetFrameworks property set to net10.0 only to properly override it, and
remove the now-unnecessary net472 condition on ItemGroup.
* fixes aspire config
* fix: update Microsoft.Extensions packages to version 10.0.1
* Address Copilot review feedback on DevUI Aspire integration
- Fix request body dropping in ProxyConversationsAsync: always read the
body when ContentLength > 0 before routing, then pass it through to
all proxy calls (previously null was passed when backend was resolved
from query param or conversation map)
- Fix resource leak: dispose aggregator on startup failure in catch block
- Fix XML docs: accurately describe embedded resource serving behavior
- Remove reflection from DevUIResourceTests (InternalsVisibleTo already set)
- Make sensitive telemetry conditional on Development environment in samples
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
* fix: update chat client version to gpt41 in both EditorAgent and WriterAgent
---------
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Co-authored-by: Roger Barreto <19890735+rogerbarreto@users.noreply.github.com>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
131 lines
5.0 KiB
C#
131 lines
5.0 KiB
C#
// Copyright (c) Microsoft. All rights reserved.
|
|
|
|
using Microsoft.AspNetCore.Builder;
|
|
using Microsoft.AspNetCore.Diagnostics.HealthChecks;
|
|
using Microsoft.Extensions.DependencyInjection;
|
|
using Microsoft.Extensions.Diagnostics.HealthChecks;
|
|
using Microsoft.Extensions.Logging;
|
|
using OpenTelemetry;
|
|
using OpenTelemetry.Metrics;
|
|
using OpenTelemetry.Trace;
|
|
|
|
namespace Microsoft.Extensions.Hosting;
|
|
|
|
// Adds common Aspire services: service discovery, resilience, health checks, and OpenTelemetry.
|
|
// This project should be referenced by each service project in your solution.
|
|
// To learn more about using this project, see https://aka.ms/dotnet/aspire/service-defaults
|
|
#pragma warning disable CA1724 // Type name 'Extensions' conflicts with namespace - acceptable for Aspire pattern
|
|
public static class Extensions
|
|
#pragma warning restore CA1724
|
|
{
|
|
private const string HealthEndpointPath = "/health";
|
|
private const string AlivenessEndpointPath = "/alive";
|
|
|
|
public static TBuilder AddServiceDefaults<TBuilder>(this TBuilder builder) where TBuilder : IHostApplicationBuilder
|
|
{
|
|
builder.ConfigureOpenTelemetry();
|
|
|
|
builder.AddDefaultHealthChecks();
|
|
|
|
builder.Services.AddServiceDiscovery();
|
|
|
|
builder.Services.ConfigureHttpClientDefaults(http =>
|
|
{
|
|
// Turn on resilience by default
|
|
http.AddStandardResilienceHandler();
|
|
|
|
// Turn on service discovery by default
|
|
http.AddServiceDiscovery();
|
|
});
|
|
|
|
// Uncomment the following to restrict the allowed schemes for service discovery.
|
|
// builder.Services.Configure<ServiceDiscoveryOptions>(options =>
|
|
// {
|
|
// options.AllowedSchemes = ["https"];
|
|
// });
|
|
|
|
return builder;
|
|
}
|
|
|
|
public static TBuilder ConfigureOpenTelemetry<TBuilder>(this TBuilder builder) where TBuilder : IHostApplicationBuilder
|
|
{
|
|
builder.Logging.AddOpenTelemetry(logging =>
|
|
{
|
|
logging.IncludeFormattedMessage = true;
|
|
logging.IncludeScopes = true;
|
|
});
|
|
|
|
builder.Services.AddOpenTelemetry()
|
|
.WithMetrics(metrics =>
|
|
{
|
|
metrics.AddAspNetCoreInstrumentation()
|
|
.AddHttpClientInstrumentation()
|
|
.AddRuntimeInstrumentation();
|
|
})
|
|
.WithTracing(tracing =>
|
|
{
|
|
tracing.AddSource(builder.Environment.ApplicationName)
|
|
.AddAspNetCoreInstrumentation(tracing =>
|
|
// Exclude health check requests from tracing
|
|
tracing.Filter = context =>
|
|
!context.Request.Path.StartsWithSegments(HealthEndpointPath)
|
|
&& !context.Request.Path.StartsWithSegments(AlivenessEndpointPath)
|
|
)
|
|
// Uncomment the following line to enable gRPC instrumentation (requires the OpenTelemetry.Instrumentation.GrpcNetClient package)
|
|
//.AddGrpcClientInstrumentation()
|
|
.AddHttpClientInstrumentation();
|
|
});
|
|
|
|
builder.AddOpenTelemetryExporters();
|
|
|
|
return builder;
|
|
}
|
|
|
|
private static TBuilder AddOpenTelemetryExporters<TBuilder>(this TBuilder builder) where TBuilder : IHostApplicationBuilder
|
|
{
|
|
var useOtlpExporter = !string.IsNullOrWhiteSpace(builder.Configuration["OTEL_EXPORTER_OTLP_ENDPOINT"]);
|
|
|
|
if (useOtlpExporter)
|
|
{
|
|
builder.Services.AddOpenTelemetry().UseOtlpExporter();
|
|
}
|
|
|
|
// Uncomment the following lines to enable the Azure Monitor exporter (requires the Azure.Monitor.OpenTelemetry.AspNetCore package)
|
|
//if (!string.IsNullOrEmpty(builder.Configuration["APPLICATIONINSIGHTS_CONNECTION_STRING"]))
|
|
//{
|
|
// builder.Services.AddOpenTelemetry()
|
|
// .UseAzureMonitor();
|
|
//}
|
|
|
|
return builder;
|
|
}
|
|
|
|
public static TBuilder AddDefaultHealthChecks<TBuilder>(this TBuilder builder) where TBuilder : IHostApplicationBuilder
|
|
{
|
|
builder.Services.AddHealthChecks()
|
|
// Add a default liveness check to ensure app is responsive
|
|
.AddCheck("self", () => HealthCheckResult.Healthy(), ["live"]);
|
|
|
|
return builder;
|
|
}
|
|
|
|
public static WebApplication MapDefaultEndpoints(this WebApplication app)
|
|
{
|
|
// Adding health checks endpoints to applications in non-development environments has security implications.
|
|
// See https://aka.ms/dotnet/aspire/healthchecks for details before enabling these endpoints in non-development environments.
|
|
if (app.Environment.IsDevelopment())
|
|
{
|
|
// All health checks must pass for app to be considered ready to accept traffic after starting
|
|
app.MapHealthChecks(HealthEndpointPath);
|
|
|
|
// Only health checks tagged with the "live" tag must pass for app to be considered alive
|
|
app.MapHealthChecks(AlivenessEndpointPath, new HealthCheckOptions
|
|
{
|
|
Predicate = r => r.Tags.Contains("live")
|
|
});
|
|
}
|
|
|
|
return app;
|
|
}
|
|
}
|