Merge pull request #74 from microsoft/aaronpowell/issue68

Fix tracing for Azure AI Foundry and update deployment script

Author: gloveboxes

infra/deploy.sh

@@ -96,8 +96,8 @@ if [ -f "$CSHARP_PROJECT_PATH" ]; then
   dotnet user-secrets set "Parameters:ResourceGroupName" "$RESOURCE_GROUP_NAME" --project "$CSHARP_PROJECT_PATH"
   dotnet user-secrets set "Parameters:ApplicationInsightsName" "$APPLICATION_INSIGHTS_NAME" --project "$CSHARP_PROJECT_PATH"
   dotnet user-secrets set "Azure:ResourceGroup" "$RESOURCE_GROUP_NAME" --project "$CSHARP_PROJECT_PATH"
-  dotnet user-secrets set "Azure:Location" "$AZURE_LOCATION" --project "$CSHARP_PROJECT_PATH"
-  dotnet user-secrets set "Azure:SubscriptionId" "$AZURE_SUBSCRIPTION_ID" --project "$CSHARP_PROJECT_PATH"
+  dotnet user-secrets set "Azure:Location" "$RG_LOCATION" --project "$CSHARP_PROJECT_PATH"
+  dotnet user-secrets set "Azure:SubscriptionId" "$SUBSCRIPTION_ID" --project "$CSHARP_PROJECT_PATH"
   dotnet user-secrets set "Parameters:UniqueSuffix" "$UNIQUE_SUFFIX" --project "$CSHARP_PROJECT_PATH"
 fi
 

src/csharp/McpAgentWorkshop.ServiceDefaults/Extensions.cs

@@ -63,6 +63,7 @@ public static TBuilder ConfigureOpenTelemetry<TBuilder>(this TBuilder builder) w
                     .AddHttpClientInstrumentation()
                     .AddRuntimeInstrumentation()
                     .AddMeter("Experimental.ModelContextProtocol")
+                    .AddMeter("McpAgentWorkshop.WorkshopApi")
                     .AddMeter("McpAgentWorkshop.McpServer")
                     .AddMeter("Experimental.Microsoft.Extensions.AI")
                     .AddMeter("Azure.AI.Agents.Persistent.PersistentAgentsClient");
@@ -80,6 +81,7 @@ public static TBuilder ConfigureOpenTelemetry<TBuilder>(this TBuilder builder) w
                     //.AddGrpcClientInstrumentation()
                     .AddHttpClientInstrumentation()
                     .AddSource("Experimental.ModelContextProtocol")
+                    .AddSource("McpAgentWorkshop.WorkshopApi")
                     .AddSource("McpAgentWorkshop.McpServer")
                     .AddSource("Experimental.Microsoft.Extensions.AI")
                     .AddSource("Azure.AI.Agents.Persistent.PersistentAgentsClient");

src/csharp/McpAgentWorkshop.WorkshopApi/Services/AgentService.cs

@@ -1,4 +1,5 @@
 using System.ClientModel;
+using System.Diagnostics;
 using System.Runtime.CompilerServices;
 using Azure.AI.Agents.Persistent;
 using McpAgentWorkshop.WorkshopApi.Models;
@@ -18,6 +19,8 @@ public partial class AgentService(
 
     public async Task InitialiseAgentAsync()
     {
+        using var activity = Diagnostics.ActivitySource.StartActivity(name: "Zava Agent Initialization");
+
         logger.LogInformation("Creating new agent: {AgentName}", AgentName);
 
         var instructions = Path.Combine(sharedPath, "instructions", InstructionsFile);
@@ -82,7 +85,7 @@ public async IAsyncEnumerable<ChatResponse> ProcessChatMessageAsync(ChatRequest
             request.Message;
         var spanName = $"Zava Agent Chat Request: {messagePreview}";
 
-        using var activity = Diagnostics.ActivitySource.StartActivity(spanName);
+        using var activity = Diagnostics.ActivitySource.StartActivity(spanName, ActivityKind.Server);
 
         PersistentAgentThread sessionThread;
         AsyncCollectionResult<StreamingUpdate>? runStream = null;

src/csharp/McpAgentWorkshop.WorkshopApi/WorkshopHost.cs

@@ -47,7 +47,9 @@
     return fileInfo is not null ? TypedResults.File(fileInfo) : Results.NotFound();
 });
 
+await app.StartAsync();
+
 var agentService = app.Services.GetRequiredService<AgentService>();
 await agentService.InitialiseAgentAsync();
 
-app.Run();
+await app.WaitForShutdownAsync();