Skip to content

Map agentBlueprintId and agentUPN in ScopeUtils derive helpers #203

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

Open
fpfp100 wants to merge 1 commit into
base: main
Choose a base branch
from
+13 −3
Open

Map agentBlueprintId and agentUPN in ScopeUtils derive helpers #203

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 4 additions & 1 deletion packages/agents-a365-observability-hosting/src/utils/ScopeUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,8 @@ export class ScopeUtils {
agentId: recipient.agenticAppId,
agentName: recipient.name,
agentAUID: recipient.aadObjectId,
agentBlueprintId: recipient.agenticAppBlueprintId,
agentUPN: recipient.agenticUserId,
agentDescription: recipient.role,
tenantId: recipient.tenantId
} as AgentDetails;
Expand All @@ -79,7 +81,8 @@ export class ScopeUtils {
agentAUID: from.aadObjectId,
agentDescription: from.role,
tenantId: from.tenantId,
agentId: from.agenticAppId
agentId: from.agenticAppId,
agentUPN: from.agenticUserId
} as AgentDetails;
}

Expand Down
11 changes: 9 additions & 2 deletions tests/observability/extension/hosting/scope-utils.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ function makeTurnContext(
agenticAppId: 'agent-1',
name: 'Agent One',
aadObjectId: 'agent-oid',
agenticAppBlueprintId: 'agent-blueprint-1',
agenticUserId: 'agent-upn@contoso.com',
role: 'assistant',
tenantId: 'tenant-123'
};
Expand Down Expand Up @@ -67,6 +69,8 @@ describe('ScopeUtils.populateFromTurnContext', () => {
[OpenTelemetryConstants.GEN_AI_AGENT_NAME_KEY, 'Agent One'],
[OpenTelemetryConstants.GEN_AI_AGENT_AUID_KEY, 'agent-oid'],
[OpenTelemetryConstants.GEN_AI_AGENT_ID_KEY, 'agent-1'],
[OpenTelemetryConstants.GEN_AI_AGENT_BLUEPRINT_ID_KEY, 'agent-blueprint-1'],
[OpenTelemetryConstants.GEN_AI_AGENT_UPN_KEY, 'agent-upn@contoso.com'],
[OpenTelemetryConstants.GEN_AI_AGENT_DESCRIPTION_KEY, 'assistant'],
[OpenTelemetryConstants.TENANT_ID_KEY, 'tenant-123'],
[OpenTelemetryConstants.GEN_AI_INPUT_MESSAGES_KEY, 'input text']
Expand Down Expand Up @@ -182,11 +186,13 @@ test('deriveTenantDetails returns undefined when only from.tenantId is present',
});

test('deriveAgentDetails maps recipient fields to AgentDetails', () => {
const ctx = makeCtx({ activity: { recipient: { agenticAppId: 'aid', name: 'A', aadObjectId: 'auid', role: 'bot', tenantId: 't1' } } as any });
const ctx = makeCtx({ activity: { recipient: { agenticAppId: 'aid', name: 'A', aadObjectId: 'auid', agenticAppBlueprintId: 'bp1', agenticUserId: 'upn1', role: 'bot', tenantId: 't1' } } as any });
expect(ScopeUtils.deriveAgentDetails(ctx)).toEqual({
agentId: 'aid',
agentName: 'A',
agentAUID: 'auid',
agentBlueprintId: 'bp1',
agentUPN: 'upn1',
agentDescription: 'bot',
tenantId: 't1',
});
Expand All @@ -198,11 +204,12 @@ test('deriveAgentDetails returns undefined without recipient', () => {
});

test('deriveCallerAgent maps from fields to caller AgentDetails', () => {
const ctx = makeCtx({ activity: { from: { agenticAppBlueprintId: 'bp', name: 'Caller', aadObjectId: 'uid', role: 'agent', tenantId: 't2', agenticAppId: 'agent-caller' } } as any });
const ctx = makeCtx({ activity: { from: { agenticAppBlueprintId: 'bp', name: 'Caller', aadObjectId: 'uid', agenticUserId: 'caller-upn', role: 'agent', tenantId: 't2', agenticAppId: 'agent-caller' } } as any });
expect(ScopeUtils.deriveCallerAgent(ctx)).toEqual({
agentBlueprintId: 'bp',
agentName: 'Caller',
agentAUID: 'uid',
agentUPN: 'caller-upn',
agentDescription: 'agent',
tenantId: 't2',
agentId: 'agent-caller',
Expand Down
Loading