Fix getCallerBaggagePairs: resolve userId across all channels by fpfp100 · Pull Request #249 · microsoft/Agent365-nodejs

fpfp100 · 2026-05-05T00:54:32Z

Summary

Port of Fix GetCallerBaggagePairs: resolve userId across all channels Agent365-dotnet#246
userId baggage was only set from aadObjectId, which is undefined on non-Teams channels and A2A calls
Added fallback chain: aadObjectId → agenticUserId → from.id

Channel behavior after fix

Field	Teams	Other channels (aadObjectId null)	A2A (user)	A2A (agent)
userId	aadObjectId	from.id	aadObjectId	agenticUserId

Test plan

Existing tests pass (60/60)
New test: non-Teams channel — userId falls back to from.id
New test: A2A — userId falls back to agenticUserId
New test: precedence — aadObjectId wins when all set

🤖 Generated with Claude Code

Normalizes SpanKind, caller.agent.name, error.type, handoff lineage, and token usage across both chat-completions and Responses API shapes so that emitted spans match the A365 observability schema's Invoke Agent (Server, Client), Execute Tool, and Inference Call definitions. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

…rd modelName - Remove detached safeJsonDumps JSDoc, fix extractUsageTokens indentation (Utils.ts) - Hoist SERVER/CLIENT_SPAN_TYPES sets to static class fields to avoid per-span allocation - Guard span name update when modelName is missing/empty - Remove unused SpanKind import from unit test - Fix indentation of agent span assertions in integration test - Upgrade @langchain/openai to ^1.4.4 and @langchain/core to ^1.1.39 to resolve peer dep mismatch Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

@ts-ignore

Use module: ESNext + moduleResolution: bundler so package exports subpaths (e.g. @langchain/langgraph/prebuilt) resolve without @ts-ignore suppression. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

The newer @langchain/openai and @langchain/core versions require Node >= 20, which conflicts with the repo's Node >= 18 support. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

@ts-ignore

The ts-jest override of module: commonjs implicitly forces moduleResolution node, which cannot resolve package exports subpaths like @langchain/langgraph/prebuilt. Adding moduleResolution: bundler lets ts-jest resolve subpath exports without @ts-ignore. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

@ts-ignore

…path moduleResolution bundler with module commonjs is not supported by ts-jest in CI. Revert tsconfig/jest config changes and keep @ts-ignore for the @langchain/langgraph/prebuilt import which requires package exports subpath resolution not available in ts-jest's commonjs mode. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

userId was only set from aadObjectId, which is undefined on non-Teams channels and A2A calls. Add fallback chain: aadObjectId → agenticUserId → from.id Port of microsoft/Agent365-dotnet#246 Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Copilot

Pull request overview

This PR updates observability caller identity handling so userId baggage is populated consistently across Teams, non-Teams channels, and A2A calls, and expands integration/unit test coverage around observability spans (OpenAI Agents + LangChain).

Changes:

Fix getCallerBaggagePairs to resolve userId via aadObjectId → agenticUserId → from.id, with new unit tests for precedence and fallbacks.
Add/extend OpenAI + LangChain observability integration tests and shared span validation helpers.
Update OpenAI/LangChain tracing utilities (usage token extraction, SpanKind/error/caller/conversation+session attribute mapping) and add required test-time dependencies.

Reviewed changes

Copilot reviewed 16 out of 18 changed files in this pull request and generated 4 comments.

Show a summary per file

File	Description
tests/tsconfig.json	Formatting cleanup.
tests/package.json	Adds LangChain + zod deps for integration tests.
tests/observability/integration/openai-agent-instrument.test.ts	Expands OpenAI Agents integration assertions (SpanKind, message schema, baggage, handoff, error.type).
tests/observability/integration/langchain-agent-instrument.test.ts	Adds new LangChain integration test suite for span correctness and baggage/error/caller mapping.
tests/observability/integration/helpers/span-validators.ts	New shared helpers for span/message-schema validation and span polling.
tests/observability/extension/openai/OpenAIAgentsTraceProcessor.test.ts	Removes some handoff unit tests; adds usage mapping unit tests; notes some behaviors moved to integration tests.
tests/observability/extension/langchain/LangChainObservabilityAttributes.test.ts	Updates expectations to map `conversation_id` and `session_id` separately.
tests/observability/extension/hosting/TurnContextUtils.test.ts	Adds unit tests for `userId` precedence/fallback chain.
tests/observability/extension/hosting/BaggageBuilderUtils.test.ts	Updates expectation: caller `userId` now populated from `agenticUserId`.
tests/jest.config.cjs	Adds moduleNameMapper for `@microsoft/agents-a365-observability-hosting`.
pnpm-workspace.yaml	Adds `@langchain/openai` to the workspace catalog.
pnpm-lock.yaml	Updates lockfile for new LangChain deps and transitive changes.
packages/agents-a365-observability-hosting/src/utils/TurnContextUtils.ts	Implements `userId` fallback chain for caller baggage.
packages/agents-a365-observability-extensions-openai/src/Utils.ts	Adds `extractUsageTokens` to normalize token usage across API shapes.
packages/agents-a365-observability-extensions-openai/src/OpenAIAgentsTraceProcessor.ts	Adds SpanKind mapping, error.type attribute, and handoff→invoke_agent/caller mapping changes.
packages/agents-a365-observability-extensions-openai/src/Constants.ts	Removes graph-node constants (now mapping to schema keys instead).
packages/agents-a365-observability-extensions-langchain/src/Utils.ts	Separates session.id vs gen_ai.conversation.id mapping.
packages/agents-a365-observability-extensions-langchain/src/tracer.ts	Sets SpanKind by operation, sets error.type, and derives caller.agent.name via parent-walk.

Files not reviewed (1)

pnpm-lock.yaml: Language not supported

fpfp100 · 2026-05-05T01:35:56Z

+  '@langchain/core@1.1.40':
+    resolution: {integrity: sha512-RJ41GQEMxr9ZEZNoIiPgW0+v9nAY6FEZGlk+MjBghr2GR8He50abLam0XCe1aqUJjuKbqt2lUD6M+6SZ+2NIJg==}
    engines: {node: '>=20'}


Fixed — reverted all unrelated changes including pnpm-lock.yaml. PR is now scoped to only the userId fallback fix.

fpfp100 · 2026-05-05T01:36:04Z

+  '@langchain/openai@0.5.18':
+    resolution: {integrity: sha512-CX1kOTbT5xVFNdtLjnM0GIYNf+P7oMSu+dGCFxxWRa3dZwWiuyuBXCm+dToUGxDLnsHuV1bKBtIzrY1mLq/A1Q==}
+    engines: {node: '>=18'}
+    peerDependencies:
+      '@langchain/core': '>=0.3.58 <0.4.0'
+


Fixed — reverted. pnpm-lock.yaml is no longer changed in this PR.

fpfp100 · 2026-05-05T01:36:12Z

 export class OpenAIAgentsTraceProcessor implements TracingProcessor {
  private static readonly MAX_HANDOFFS_IN_FLIGHT = 1000;
  private static readonly MAX_SPANS_IN_FLIGHT = 10_000;
+  private static readonly SERVER_SPAN_TYPES = new Set(['agent']);
+  private static readonly CLIENT_SPAN_TYPES = new Set(['handoff', 'response', 'generation', 'function', 'mcp_tools']);



Fixed — removed all unrelated OpenAI/LangChain tracing changes. PR is now scoped to only the userId fallback chain fix and its tests.

fpfp100 · 2026-05-05T01:36:20Z

+  // SpanKind, caller.agent.name, handoff A→B, and error.type are validated by
+  // the integration test (openai-agent-instrument.test.ts).


Fixed — reverted. The original unit tests are preserved as-is.

Scope PR to only the userId fallback chain fix and its tests. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

jsl517 and others added 9 commits April 17, 2026 09:45

Merge branch 'main' into users/pefan/messageE2EUpdates

3989467

Fix eslint no-explicit-any in LangChain tracer error type extraction

d6ca299

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Revert LangChain dependency bumps to preserve Node 18 compatibility

aecd24f

The newer @langchain/openai and @langchain/core versions require Node >= 20, which conflicts with the repo's Node >= 18 support. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Copilot AI review requested due to automatic review settings May 5, 2026 00:54

fpfp100 requested review from a team as code owners May 5, 2026 00:54

Copilot started reviewing on behalf of fpfp100 May 5, 2026 00:55 View session

Copilot AI reviewed May 5, 2026

View reviewed changes

Remove unrelated OpenAI/LangChain tracing changes from userId fix PR

d88eccd

Scope PR to only the userId fallback chain fix and its tests. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

fpfp100 requested a review from a team as a code owner May 5, 2026 01:34

fpfp100 requested review from ajmfehr and biswapm May 5, 2026 01:34

fpfp100 closed this May 5, 2026

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix getCallerBaggagePairs: resolve userId across all channels#249

Fix getCallerBaggagePairs: resolve userId across all channels#249
fpfp100 wants to merge 10 commits intomainfrom
fix/userid-fallback-chain

fpfp100 commented May 5, 2026

Uh oh!

Copilot AI left a comment

Uh oh!

fpfp100 May 5, 2026

Uh oh!

fpfp100 May 5, 2026

Uh oh!

fpfp100 May 5, 2026

Uh oh!

fpfp100 May 5, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

		// SpanKind, caller.agent.name, handoff A→B, and error.type are validated by
		// the integration test (openai-agent-instrument.test.ts).

Conversation

fpfp100 commented May 5, 2026

Summary

Channel behavior after fix

Test plan

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

fpfp100 May 5, 2026

Choose a reason for hiding this comment

Uh oh!

fpfp100 May 5, 2026

Choose a reason for hiding this comment

Uh oh!

fpfp100 May 5, 2026

Choose a reason for hiding this comment

Uh oh!

fpfp100 May 5, 2026

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants