Skip to content

Revert: Fix getCallerBaggagePairs userId fallback #253

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
fpfp100 merged 2 commits into from
May 14, 2026
Merged

Revert: Fix getCallerBaggagePairs userId fallback #253

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2cd7a09
Revert "Fix getCallerBaggagePairs: resolve userId across all channels…
jsl517 May 13, 2026
d3e0ce0
fix: remove trailing whitespace in TurnContextUtils
Copilot May 13, 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 packages/agents-a365-observability-hosting/src/utils/TurnContextUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ export function getCallerBaggagePairs(turnContext: TurnContext): Array<[string,

const upn = from.agenticUserId;
const pairs: Array<[string, string | undefined]> = [
[OpenTelemetryConstants.USER_ID_KEY, from.aadObjectId || from.agenticUserId || from.id],
[OpenTelemetryConstants.USER_ID_KEY, from.aadObjectId],
[OpenTelemetryConstants.USER_NAME_KEY, from.name],
[OpenTelemetryConstants.USER_EMAIL_KEY, upn],
[OpenTelemetryConstants.GEN_AI_CALLER_AGENT_APPLICATION_ID_KEY, from.agenticAppBlueprintId]
Expand Down
1 change: 0 additions & 1 deletion tests/jest.config.cjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,6 @@ module.exports = {
'^@microsoft/agents-a365-observability$': '<rootDir>/packages/agents-a365-observability/src',
'^@microsoft/agents-a365-observability-extensions-langchain$': '<rootDir>/packages/agents-a365-observability-extensions-langchain/src',
'^@microsoft/agents-a365-observability-extensions-openai$': '<rootDir>/packages/agents-a365-observability-extensions-openai/src',
'^@microsoft/agents-a365-observability-hosting$': '<rootDir>/packages/agents-a365-observability-hosting/src',
'^@microsoft/agents-a365-observability-tokencache$': '<rootDir>/packages/agents-a365-observability-tokencache/src',
'^@microsoft/agents-a365-tooling$': '<rootDir>/packages/agents-a365-tooling/src',
Comment thread
fpfp100 marked this conversation as resolved.
'^@microsoft/agents-a365-tooling-extensions-claude$': '<rootDir>/packages/agents-a365-tooling-extensions-claude/src',
Expand Down
2 changes: 1 addition & 1 deletion tests/observability/extension/hosting/BaggageBuilderUtils.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ describe('BaggageBuilderUtils', () => {
expect(result).toBe(builder);
// Validate every expected OpenTelemetry baggage key and value
const asObj = Object.fromEntries(capturedPairs);
expect(asObj[OpenTelemetryConstants.USER_ID_KEY]).toBe('agentic-user-1');
expect(asObj[OpenTelemetryConstants.USER_ID_KEY]).toBeUndefined();
Comment thread
fpfp100 marked this conversation as resolved.
expect(asObj[OpenTelemetryConstants.USER_NAME_KEY]).toBe('User One');
expect(asObj[OpenTelemetryConstants.USER_EMAIL_KEY]).toBe('agentic-user-1');
expect(asObj[OpenTelemetryConstants.GEN_AI_AGENT_ID_KEY]).toBe('agent-app-1');
Expand Down
52 changes: 0 additions & 52 deletions tests/observability/extension/hosting/TurnContextUtils.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,58 +32,6 @@ describe('TurnContextUtils', () => {
expect(pairs.length).toBeGreaterThan(0);
});

it('should fall back to from.id for userId when aadObjectId is undefined (non-Teams channel)', () => {
const ctx = {
activity: {
from: { id: 'user1', name: 'User One' },
recipient: { id: 'agent1', name: 'Agent One' },
conversation: { id: 'conv-1' },
},
} as any;
const pairs = getCallerBaggagePairs(ctx);
const obj = Object.fromEntries(pairs);
expect(obj[OpenTelemetryConstants.USER_ID_KEY]).toBe('user1');
});

it('should fall back to agenticUserId for userId when aadObjectId is undefined (A2A)', () => {
const ctx = {
activity: {
from: { id: 'user1', name: 'User One', agenticUserId: 'agentic-user-1' },
recipient: { id: 'agent1', name: 'Agent One' },
conversation: { id: 'conv-1' },
},
} as any;
const pairs = getCallerBaggagePairs(ctx);
const obj = Object.fromEntries(pairs);
expect(obj[OpenTelemetryConstants.USER_ID_KEY]).toBe('agentic-user-1');
});

it('should prefer aadObjectId for userId when all three fields are set', () => {
const ctx = {
activity: {
from: { id: 'user1', name: 'User One', aadObjectId: 'aad-123', agenticUserId: 'agentic-user-1' },
recipient: { id: 'agent1', name: 'Agent One' },
conversation: { id: 'conv-1' },
},
} as any;
const pairs = getCallerBaggagePairs(ctx);
const obj = Object.fromEntries(pairs);
expect(obj[OpenTelemetryConstants.USER_ID_KEY]).toBe('aad-123');
});

it('should resolve userId to agenticUserId when it is a GUID (A2A with GUID agenticUserId)', () => {
const ctx = {
activity: {
from: { id: 'user1', name: 'User One', agenticUserId: 'bef730f4-d6f5-4ffb-b759-26ffa449ed7e' },
recipient: { id: 'agent1', name: 'Agent One' },
conversation: { id: 'conv-1' },
},
} as any;
const pairs = getCallerBaggagePairs(ctx);
const obj = Object.fromEntries(pairs);
expect(obj[OpenTelemetryConstants.USER_ID_KEY]).toBe('bef730f4-d6f5-4ffb-b759-26ffa449ed7e');
});

it('should get target agent baggage pairs', () => {
const pairs = getTargetAgentBaggagePairs(mockTurnContext);
expect(Array.isArray(pairs)).toBe(true);
Comment thread
fpfp100 marked this conversation as resolved.
Expand Down
Loading