Refactor: Move Activity/TraceId preservation from ChatClientAgent to OpenTelemetryAgent #3233
+646
−0
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation and Context
ChatClientAgentwas modified to includeActivity.Currentmanipulation for distributed tracing, introducing telemetry concerns into a core component designed to be telemetry-agnostic. This violates separation of concerns—telemetry should be a decorator concern, not baked into the base agent.Description
Moved Activity preservation logic from core to decorator:
ChatClientAgent (cleaned - telemetry-agnostic)
System.DiagnosticsimportActivity.Currentcapture/restore logic (23 assignments removed)OpenTelemetryAgent (enhanced - owns telemetry)
ForwardingChatClient.GetResponseAsync: Captures Activity fromForwardedOptions, restores afterConfigureAwait(false)ForwardingChatClient.GetStreamingResponseAsync: Restores Activity before each yield and after streaming completesForwardedOptions.CurrentActivitypatternTests
OpenTelemetryAgent_*patternChatClientAgentwithOpenTelemetryAgentOpenTelemetryAgent_WithMockedMcpTool_PreservesTraceIdintegration testPattern:
Architecture: Decorator pattern correctly applied—
ChatClientAgentprovides core functionality,OpenTelemetryAgentadds telemetry as an opt-in concern.Contribution Checklist
Original prompt
💡 You can make Copilot smarter by setting up custom instructions, customizing its development environment and configuring Model Context Protocol (MCP) servers. Learn more Copilot coding agent tips in the docs.