Skip to content

Revert: Fix getCallerBaggagePairs userId fallback #140

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

Revert: Fix getCallerBaggagePairs userId fallback #140

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
3b81f4f
Revert "Fix getCallerBaggagePairs: resolve userId across all channels…
jsl517 May 13, 2026
5389240
Remove unintended .claude/settings.local.json
jsl517 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 src/a365/hosting/turnContextUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ export function getCallerBaggagePairs(turnContext: TurnContextLike): Array<[stri
}
const from = turnContext.activity.from;
const pairs: Array<[string, string | undefined]> = [
[OpenTelemetryConstants.USER_ID_KEY, from.aadObjectId || from.agenticUserId || from.id],
[OpenTelemetryConstants.USER_ID_KEY, from.aadObjectId],
Comment thread
fpfp100 marked this conversation as resolved.
[OpenTelemetryConstants.USER_NAME_KEY, from.name],
[OpenTelemetryConstants.USER_EMAIL_KEY, from.agenticUserId],
[OpenTelemetryConstants.GEN_AI_CALLER_AGENT_APPLICATION_ID_KEY, from.agenticAppBlueprintId],
Expand Down
1 change: 0 additions & 1 deletion src/a365/hosting/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ export interface ActivityLike {
channelData?: unknown;
serviceUrl?: string;
from?: {
Comment thread
fpfp100 marked this conversation as resolved.
id?: string;
aadObjectId?: string;
name?: string;
role?: string;
Expand Down
58 changes: 0 additions & 58 deletions test/internal/unit/a365/hosting/turnContextUtils.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,64 +82,6 @@ describe("TurnContextUtils", () => {
expect(pairs).toEqual([]);
});

it("should fall back to from.id when aadObjectId is undefined (non-Teams channel)", () => {
const ctx: TurnContextLike = {
activity: {
from: { id: "webchat-user-123", name: "Web User" },
},
turnState: new Map(),
};
const pairs = getCallerBaggagePairs(ctx);
const obj = Object.fromEntries(pairs);
expect(obj[OpenTelemetryConstants.USER_ID_KEY]).toBe("webchat-user-123");
expect(obj[OpenTelemetryConstants.USER_NAME_KEY]).toBe("Web User");
});

it("should fall back to agenticUserId when aadObjectId is undefined (A2A)", () => {
const ctx: TurnContextLike = {
activity: {
from: { agenticUserId: "agent@contoso.com", name: "Upstream Agent" },
},
turnState: new Map(),
};
const pairs = getCallerBaggagePairs(ctx);
const obj = Object.fromEntries(pairs);
expect(obj[OpenTelemetryConstants.USER_ID_KEY]).toBe("agent@contoso.com");
});

it("should resolve userId to agenticUserId when it is a GUID (A2A with GUID)", () => {
const ctx: TurnContextLike = {
activity: {
from: {
id: "29:1sH5NArUwkWAX",
agenticUserId: "bef730f4-d6f5-4ffb-b759-26ffa449ed7e",
name: "Agent",
},
},
turnState: new Map(),
};
const pairs = getCallerBaggagePairs(ctx);
const obj = Object.fromEntries(pairs);
expect(obj[OpenTelemetryConstants.USER_ID_KEY]).toBe("bef730f4-d6f5-4ffb-b759-26ffa449ed7e");
});

it("should prefer aadObjectId over agenticUserId and from.id", () => {
const ctx: TurnContextLike = {
activity: {
from: {
id: "fallback-id",
aadObjectId: "aad-oid",
agenticUserId: "agent@contoso.com",
name: "User",
},
},
turnState: new Map(),
};
const pairs = getCallerBaggagePairs(ctx);
const obj = Object.fromEntries(pairs);
expect(obj[OpenTelemetryConstants.USER_ID_KEY]).toBe("aad-oid");
});

it("should filter out undefined/empty values", () => {
const ctx: TurnContextLike = {
activity: { from: { name: "User", aadObjectId: "" } },
Expand Down
Loading