Skip to content

Fix FunctionInvokingChatClient invoke_agent span detection with exact match or space delimiter #7224

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
stephentoub merged 5 commits into from
Jan 22, 2026
Merged

Fix FunctionInvokingChatClient invoke_agent span detection with exact match or space delimiter #7224

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
763d51f
Initial plan
Copilot Jan 22, 2026
e9dfebd
Fix FunctionInvokingChatClient parent span validation to use StartsWith
Copilot Jan 22, 2026
a4eaa7b
Combine DoesNotCreateOrchestrateToolsSpanWhenInvokeAgentIsParent tests
Copilot Jan 22, 2026
b4809c4
Fix invoke_agent detection to require exact match or space delimiter,…
Copilot Jan 22, 2026
02240fb
Avoid allocation in CurrentActivityIsInvokeAgent check
Copilot Jan 22, 2026
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
2 changes: 1 addition & 1 deletion src/Libraries/Microsoft.Extensions.AI/ChatCompletion/FunctionInvokingChatClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1113,7 +1113,7 @@ FunctionResultContent CreateFunctionResultContent(FunctionInvocationResult resul

/// <summary>Gets a value indicating whether <see cref="Activity.Current"/> represents an "invoke_agent" span.</summary>
private static bool CurrentActivityIsInvokeAgent =>
Activity.Current?.DisplayName == OpenTelemetryConsts.GenAI.InvokeAgentName;
Activity.Current?.DisplayName?.StartsWith(OpenTelemetryConsts.GenAI.InvokeAgentName, StringComparison.Ordinal) is true;
Comment thread
stephentoub marked this conversation as resolved.
Outdated

/// <summary>Invokes the function asynchronously.</summary>
/// <param name="context">
Expand Down
12 changes: 8 additions & 4 deletions ...Libraries/Microsoft.Extensions.AI.Tests/ChatCompletion/FunctionInvokingChatClientTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1233,8 +1233,12 @@ public async Task ClonesChatOptionsAndResetContinuationTokenForBackgroundRespons
Assert.Null(actualChatOptions!.ContinuationToken);
}

[Fact]
public async Task DoesNotCreateOrchestrateToolsSpanWhenInvokeAgentIsParent()
[Theory]
Comment thread
stephentoub marked this conversation as resolved.
[InlineData("invoke_agent")]
[InlineData("invoke_agent my_agent")]
[InlineData("invoke_agent_extra")]
Comment thread
stephentoub marked this conversation as resolved.
Outdated
[InlineData("invoke_agent ")]
public async Task DoesNotCreateOrchestrateToolsSpanWhenInvokeAgentIsParent(string displayName)
{
string agentSourceName = Guid.NewGuid().ToString();
string clientSourceName = Guid.NewGuid().ToString();
Expand Down Expand Up @@ -1264,7 +1268,7 @@ public async Task DoesNotCreateOrchestrateToolsSpanWhenInvokeAgentIsParent()
.Build();

using (var agentSource = new ActivitySource(agentSourceName))
using (var invokeAgentActivity = agentSource.StartActivity("invoke_agent"))
using (var invokeAgentActivity = agentSource.StartActivity(displayName))
{
Assert.NotNull(invokeAgentActivity);
await InvokeAndAssertAsync(options, plan, configurePipeline: configure);
Expand All @@ -1274,7 +1278,7 @@ public async Task DoesNotCreateOrchestrateToolsSpanWhenInvokeAgentIsParent()
Assert.Contains(activities, a => a.DisplayName == "chat");
Assert.Contains(activities, a => a.DisplayName == "execute_tool Func1");

var invokeAgent = Assert.Single(activities, a => a.DisplayName == "invoke_agent");
var invokeAgent = Assert.Single(activities, a => a.DisplayName == displayName);
var childActivities = activities.Where(a => a != invokeAgent).ToList();
Assert.All(childActivities, activity => Assert.Same(invokeAgent, activity.Parent));
}
Comment thread
stephentoub marked this conversation as resolved.
Expand Down
Loading