@microsoft/agents-a365-observability-hosting 0.1.0-preview.95 → 0.2.0-preview.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cjs/caching/AgenticTokenCache.d.ts +38 -1
- package/dist/cjs/caching/AgenticTokenCache.d.ts.map +1 -1
- package/dist/cjs/caching/AgenticTokenCache.js +48 -5
- package/dist/cjs/caching/AgenticTokenCache.js.map +1 -1
- package/dist/cjs/index.d.ts +5 -1
- package/dist/cjs/index.d.ts.map +1 -1
- package/dist/cjs/index.js +10 -1
- package/dist/cjs/index.js.map +1 -1
- package/dist/cjs/middleware/BaggageMiddleware.d.ts +9 -0
- package/dist/cjs/middleware/BaggageMiddleware.d.ts.map +1 -0
- package/dist/cjs/middleware/BaggageMiddleware.js +34 -0
- package/dist/cjs/middleware/BaggageMiddleware.js.map +1 -0
- package/dist/cjs/middleware/ObservabilityHostingManager.d.ts +30 -0
- package/dist/cjs/middleware/ObservabilityHostingManager.d.ts.map +1 -0
- package/dist/cjs/middleware/ObservabilityHostingManager.js +46 -0
- package/dist/cjs/middleware/ObservabilityHostingManager.js.map +1 -0
- package/dist/cjs/middleware/OutputLoggingMiddleware.d.ts +34 -0
- package/dist/cjs/middleware/OutputLoggingMiddleware.d.ts.map +1 -0
- package/dist/cjs/middleware/OutputLoggingMiddleware.js +95 -0
- package/dist/cjs/middleware/OutputLoggingMiddleware.js.map +1 -0
- package/dist/cjs/utils/BaggageBuilderUtils.d.ts +2 -9
- package/dist/cjs/utils/BaggageBuilderUtils.d.ts.map +1 -1
- package/dist/cjs/utils/BaggageBuilderUtils.js +4 -15
- package/dist/cjs/utils/BaggageBuilderUtils.js.map +1 -1
- package/dist/cjs/utils/ScopeUtils.d.ts +39 -26
- package/dist/cjs/utils/ScopeUtils.d.ts.map +1 -1
- package/dist/cjs/utils/ScopeUtils.js +96 -71
- package/dist/cjs/utils/ScopeUtils.js.map +1 -1
- package/dist/cjs/utils/TurnContextUtils.d.ts +18 -10
- package/dist/cjs/utils/TurnContextUtils.d.ts.map +1 -1
- package/dist/cjs/utils/TurnContextUtils.js +33 -53
- package/dist/cjs/utils/TurnContextUtils.js.map +1 -1
- package/dist/esm/caching/AgenticTokenCache.d.ts +38 -1
- package/dist/esm/caching/AgenticTokenCache.d.ts.map +1 -1
- package/dist/esm/caching/AgenticTokenCache.js +48 -6
- package/dist/esm/caching/AgenticTokenCache.js.map +1 -1
- package/dist/esm/index.d.ts +5 -1
- package/dist/esm/index.d.ts.map +1 -1
- package/dist/esm/index.js +4 -1
- package/dist/esm/index.js.map +1 -1
- package/dist/esm/middleware/BaggageMiddleware.d.ts +9 -0
- package/dist/esm/middleware/BaggageMiddleware.d.ts.map +1 -0
- package/dist/esm/middleware/BaggageMiddleware.js +30 -0
- package/dist/esm/middleware/BaggageMiddleware.js.map +1 -0
- package/dist/esm/middleware/ObservabilityHostingManager.d.ts +30 -0
- package/dist/esm/middleware/ObservabilityHostingManager.d.ts.map +1 -0
- package/dist/esm/middleware/ObservabilityHostingManager.js +42 -0
- package/dist/esm/middleware/ObservabilityHostingManager.js.map +1 -0
- package/dist/esm/middleware/OutputLoggingMiddleware.d.ts +34 -0
- package/dist/esm/middleware/OutputLoggingMiddleware.d.ts.map +1 -0
- package/dist/esm/middleware/OutputLoggingMiddleware.js +91 -0
- package/dist/esm/middleware/OutputLoggingMiddleware.js.map +1 -0
- package/dist/esm/utils/BaggageBuilderUtils.d.ts +2 -9
- package/dist/esm/utils/BaggageBuilderUtils.d.ts.map +1 -1
- package/dist/esm/utils/BaggageBuilderUtils.js +5 -16
- package/dist/esm/utils/BaggageBuilderUtils.js.map +1 -1
- package/dist/esm/utils/ScopeUtils.d.ts +39 -26
- package/dist/esm/utils/ScopeUtils.d.ts.map +1 -1
- package/dist/esm/utils/ScopeUtils.js +98 -73
- package/dist/esm/utils/ScopeUtils.js.map +1 -1
- package/dist/esm/utils/TurnContextUtils.d.ts +18 -10
- package/dist/esm/utils/TurnContextUtils.d.ts.map +1 -1
- package/dist/esm/utils/TurnContextUtils.js +32 -52
- package/dist/esm/utils/TurnContextUtils.js.map +1 -1
- package/package.json +5 -4
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ScopeUtils.js","sourceRoot":"","sources":["../../../src/utils/ScopeUtils.ts"],"names":[],"mappings":"AAAA,iFAAiF;AACjF,uCAAuC;AACvC,kCAAkC;AAClC,iFAAiF;
|
|
1
|
+
{"version":3,"file":"ScopeUtils.js","sourceRoot":"","sources":["../../../src/utils/ScopeUtils.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,33 +2,41 @@ import { TurnContext } from '@microsoft/agents-hosting';
|
|
|
2
2
|
/**
|
|
3
3
|
* Extracts caller-related OpenTelemetry baggage pairs from the TurnContext.
|
|
4
4
|
* @param turnContext The current TurnContext (activity context)
|
|
5
|
-
* @returns Array of [key, value] pairs for caller identity
|
|
5
|
+
* @returns Array of [key, value] pairs for caller identity
|
|
6
6
|
*/
|
|
7
7
|
export declare function getCallerBaggagePairs(turnContext: TurnContext): Array<[string, string]>;
|
|
8
8
|
/**
|
|
9
|
-
*
|
|
10
|
-
*
|
|
11
|
-
*
|
|
9
|
+
* Resolves the agent instance ID and blueprint ID for embodied (agentic) agents only.
|
|
10
|
+
* For the non-embodied agent case, we cannot reliably determine whether the token contains an app ID,
|
|
11
|
+
* or whether the app ID present in the token claims actually corresponds to this agent. Therefore,
|
|
12
|
+
* we only set agentId and agentBlueprintId for embodied (agentic) agents.
|
|
13
|
+
* @param turnContext Activity context
|
|
14
|
+
* @param authToken Auth token for resolving blueprint ID from token claims.
|
|
15
|
+
* @returns Object with agentId and agentBlueprintId, both undefined for non-embodied agents.
|
|
12
16
|
*/
|
|
13
|
-
export declare function
|
|
17
|
+
export declare function resolveEmbodiedAgentIds(turnContext: TurnContext, authToken: string): {
|
|
18
|
+
agentId: string | undefined;
|
|
19
|
+
agentBlueprintId: string | undefined;
|
|
20
|
+
};
|
|
14
21
|
/**
|
|
15
22
|
* Extracts agent/recipient-related OpenTelemetry baggage pairs from the TurnContext.
|
|
16
23
|
* @param turnContext The current TurnContext (activity context)
|
|
24
|
+
* @param authToken Optional auth token for resolving agent blueprint ID from token claims.
|
|
17
25
|
* @returns Array of [key, value] pairs for agent identity and description
|
|
18
26
|
*/
|
|
19
|
-
export declare function getTargetAgentBaggagePairs(turnContext: TurnContext): Array<[string, string]>;
|
|
27
|
+
export declare function getTargetAgentBaggagePairs(turnContext: TurnContext, authToken?: string): Array<[string, string]>;
|
|
20
28
|
/**
|
|
21
|
-
* Extracts the tenant ID baggage key-value pair
|
|
29
|
+
* Extracts the tenant ID baggage key-value pair using the Activity's getAgenticTenantId() helper.
|
|
22
30
|
* @param turnContext The current TurnContext (activity context)
|
|
23
31
|
* @returns Array of [key, value] for tenant ID
|
|
24
32
|
*/
|
|
25
33
|
export declare function getTenantIdPair(turnContext: TurnContext): Array<[string, string]>;
|
|
26
34
|
/**
|
|
27
|
-
* Extracts
|
|
35
|
+
* Extracts channel baggage pairs from the TurnContext.
|
|
28
36
|
* @param turnContext The current TurnContext (activity context)
|
|
29
|
-
* @returns Array of [key, value] pairs for channel name and
|
|
37
|
+
* @returns Array of [key, value] pairs for channel name and subchannel description
|
|
30
38
|
*/
|
|
31
|
-
export declare function
|
|
39
|
+
export declare function getChannelBaggagePairs(turnContext: TurnContext): Array<[string, string]>;
|
|
32
40
|
/**
|
|
33
41
|
* Extracts conversation ID and item link baggage key-value pairs from the provided turn context.
|
|
34
42
|
* @param turnContext The current TurnContext (activity context)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TurnContextUtils.d.ts","sourceRoot":"","sources":["../../../src/utils/TurnContextUtils.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAcxD;;;;GAIG;AACH,wBAAgB,qBAAqB,CAAC,WAAW,EAAE,WAAW,GAAG,KAAK,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"TurnContextUtils.d.ts","sourceRoot":"","sources":["../../../src/utils/TurnContextUtils.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAcxD;;;;GAIG;AACH,wBAAgB,qBAAqB,CAAC,WAAW,EAAE,WAAW,GAAG,KAAK,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAcvF;AAED;;;;;;;;GAQG;AACH,wBAAgB,uBAAuB,CAAC,WAAW,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,GAAG;IAAE,OAAO,EAAE,MAAM,GAAG,SAAS,CAAC;IAAC,gBAAgB,EAAE,MAAM,GAAG,SAAS,CAAA;CAAE,CAQ1J;AAED;;;;;GAKG;AACH,wBAAgB,0BAA0B,CAAC,WAAW,EAAE,WAAW,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,KAAK,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAgBhH;AAED;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,WAAW,EAAE,WAAW,GAAG,KAAK,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAGjF;AAED;;;;GAIG;AACH,wBAAgB,sBAAsB,CAAC,WAAW,EAAE,WAAW,GAAG,KAAK,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CASxF;AAED;;;;GAIG;AACH,wBAAgB,iCAAiC,CAAC,WAAW,EAAE,WAAW,GAAG,KAAK,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAWnG"}
|
|
@@ -2,8 +2,8 @@
|
|
|
2
2
|
// Copyright (c) Microsoft Corporation.
|
|
3
3
|
// Licensed under the MIT License.
|
|
4
4
|
// ------------------------------------------------------------------------------
|
|
5
|
-
import {
|
|
6
|
-
import {
|
|
5
|
+
import { OpenTelemetryConstants } from '@microsoft/agents-a365-observability';
|
|
6
|
+
import { Utility as RuntimeUtility } from '@microsoft/agents-a365-runtime';
|
|
7
7
|
/**
|
|
8
8
|
* TurnContext utility methods.
|
|
9
9
|
*/
|
|
@@ -15,7 +15,7 @@ function normalizePairs(pairs) {
|
|
|
15
15
|
/**
|
|
16
16
|
* Extracts caller-related OpenTelemetry baggage pairs from the TurnContext.
|
|
17
17
|
* @param turnContext The current TurnContext (activity context)
|
|
18
|
-
* @returns Array of [key, value] pairs for caller identity
|
|
18
|
+
* @returns Array of [key, value] pairs for caller identity
|
|
19
19
|
*/
|
|
20
20
|
export function getCallerBaggagePairs(turnContext) {
|
|
21
21
|
if (!turnContext || !turnContext.activity?.from) {
|
|
@@ -24,48 +24,43 @@ export function getCallerBaggagePairs(turnContext) {
|
|
|
24
24
|
const from = turnContext.activity.from;
|
|
25
25
|
const upn = from.agenticUserId;
|
|
26
26
|
const pairs = [
|
|
27
|
-
[OpenTelemetryConstants.
|
|
28
|
-
[OpenTelemetryConstants.
|
|
29
|
-
[OpenTelemetryConstants.
|
|
30
|
-
[OpenTelemetryConstants.
|
|
31
|
-
[OpenTelemetryConstants.GEN_AI_AGENT_BLUEPRINT_ID_KEY, from.agenticAppBlueprintId]
|
|
27
|
+
[OpenTelemetryConstants.USER_ID_KEY, from.aadObjectId],
|
|
28
|
+
[OpenTelemetryConstants.USER_NAME_KEY, from.name],
|
|
29
|
+
[OpenTelemetryConstants.USER_EMAIL_KEY, upn],
|
|
30
|
+
[OpenTelemetryConstants.GEN_AI_CALLER_AGENT_APPLICATION_ID_KEY, from.agenticAppBlueprintId]
|
|
32
31
|
];
|
|
33
32
|
return normalizePairs(pairs);
|
|
34
33
|
}
|
|
35
34
|
/**
|
|
36
|
-
*
|
|
37
|
-
*
|
|
38
|
-
*
|
|
35
|
+
* Resolves the agent instance ID and blueprint ID for embodied (agentic) agents only.
|
|
36
|
+
* For the non-embodied agent case, we cannot reliably determine whether the token contains an app ID,
|
|
37
|
+
* or whether the app ID present in the token claims actually corresponds to this agent. Therefore,
|
|
38
|
+
* we only set agentId and agentBlueprintId for embodied (agentic) agents.
|
|
39
|
+
* @param turnContext Activity context
|
|
40
|
+
* @param authToken Auth token for resolving blueprint ID from token claims.
|
|
41
|
+
* @returns Object with agentId and agentBlueprintId, both undefined for non-embodied agents.
|
|
39
42
|
*/
|
|
40
|
-
export function
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
case RoleTypes.AgenticUser:
|
|
49
|
-
executionType = ExecutionType.Agent2Agent;
|
|
50
|
-
break;
|
|
51
|
-
case RoleTypes.User:
|
|
52
|
-
executionType = ExecutionType.HumanToAgent;
|
|
53
|
-
break;
|
|
54
|
-
}
|
|
55
|
-
}
|
|
56
|
-
return [[OpenTelemetryConstants.GEN_AI_EXECUTION_TYPE_KEY, executionType]];
|
|
43
|
+
export function resolveEmbodiedAgentIds(turnContext, authToken) {
|
|
44
|
+
const isAgentic = turnContext?.activity?.isAgenticRequest?.();
|
|
45
|
+
const rawAgentId = isAgentic ? turnContext.activity.getAgenticInstanceId?.() : undefined;
|
|
46
|
+
const rawBlueprintId = isAgentic ? RuntimeUtility.getAgentIdFromToken(authToken) : undefined;
|
|
47
|
+
return {
|
|
48
|
+
agentId: rawAgentId || undefined,
|
|
49
|
+
agentBlueprintId: rawBlueprintId || undefined,
|
|
50
|
+
};
|
|
57
51
|
}
|
|
58
52
|
/**
|
|
59
53
|
* Extracts agent/recipient-related OpenTelemetry baggage pairs from the TurnContext.
|
|
60
54
|
* @param turnContext The current TurnContext (activity context)
|
|
55
|
+
* @param authToken Optional auth token for resolving agent blueprint ID from token claims.
|
|
61
56
|
* @returns Array of [key, value] pairs for agent identity and description
|
|
62
57
|
*/
|
|
63
|
-
export function getTargetAgentBaggagePairs(turnContext) {
|
|
58
|
+
export function getTargetAgentBaggagePairs(turnContext, authToken) {
|
|
64
59
|
if (!turnContext || !turnContext.activity?.recipient) {
|
|
65
60
|
return [];
|
|
66
61
|
}
|
|
67
62
|
const recipient = turnContext.activity.recipient;
|
|
68
|
-
const agentId =
|
|
63
|
+
const { agentId } = authToken ? resolveEmbodiedAgentIds(turnContext, authToken) : { agentId: turnContext.activity?.isAgenticRequest?.() ? turnContext.activity.getAgenticInstanceId?.() : undefined };
|
|
69
64
|
const agentName = recipient.name;
|
|
70
65
|
const aadObjectId = recipient.aadObjectId;
|
|
71
66
|
const agentDescription = recipient.role;
|
|
@@ -78,41 +73,26 @@ export function getTargetAgentBaggagePairs(turnContext) {
|
|
|
78
73
|
return normalizePairs(pairs);
|
|
79
74
|
}
|
|
80
75
|
/**
|
|
81
|
-
* Extracts the tenant ID baggage key-value pair
|
|
76
|
+
* Extracts the tenant ID baggage key-value pair using the Activity's getAgenticTenantId() helper.
|
|
82
77
|
* @param turnContext The current TurnContext (activity context)
|
|
83
78
|
* @returns Array of [key, value] for tenant ID
|
|
84
79
|
*/
|
|
85
80
|
export function getTenantIdPair(turnContext) {
|
|
86
|
-
|
|
87
|
-
// If not found, try to extract from channelData. Accepts both object and JSON string.
|
|
88
|
-
if (!tenantId && turnContext.activity?.channelData) {
|
|
89
|
-
try {
|
|
90
|
-
let channelData = turnContext.activity.channelData;
|
|
91
|
-
if (typeof channelData === 'string') {
|
|
92
|
-
channelData = JSON.parse(channelData);
|
|
93
|
-
}
|
|
94
|
-
if (typeof channelData === 'object' && channelData !== null) {
|
|
95
|
-
tenantId = channelData?.tenant?.id;
|
|
96
|
-
}
|
|
97
|
-
}
|
|
98
|
-
catch (_err) {
|
|
99
|
-
// ignore JSON parse errors
|
|
100
|
-
}
|
|
101
|
-
}
|
|
81
|
+
const tenantId = turnContext.activity?.getAgenticTenantId?.();
|
|
102
82
|
return tenantId ? [[OpenTelemetryConstants.TENANT_ID_KEY, tenantId]] : [];
|
|
103
83
|
}
|
|
104
84
|
/**
|
|
105
|
-
* Extracts
|
|
85
|
+
* Extracts channel baggage pairs from the TurnContext.
|
|
106
86
|
* @param turnContext The current TurnContext (activity context)
|
|
107
|
-
* @returns Array of [key, value] pairs for channel name and
|
|
87
|
+
* @returns Array of [key, value] pairs for channel name and subchannel description
|
|
108
88
|
*/
|
|
109
|
-
export function
|
|
89
|
+
export function getChannelBaggagePairs(turnContext) {
|
|
110
90
|
if (!turnContext) {
|
|
111
91
|
return [];
|
|
112
92
|
}
|
|
113
93
|
const pairs = [
|
|
114
|
-
[OpenTelemetryConstants.
|
|
115
|
-
[OpenTelemetryConstants.
|
|
94
|
+
[OpenTelemetryConstants.CHANNEL_NAME_KEY, turnContext.activity?.channelId],
|
|
95
|
+
[OpenTelemetryConstants.CHANNEL_LINK_KEY, turnContext.activity?.channelIdSubChannel]
|
|
116
96
|
];
|
|
117
97
|
return normalizePairs(pairs);
|
|
118
98
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TurnContextUtils.js","sourceRoot":"","sources":["../../../src/utils/TurnContextUtils.ts"],"names":[],"mappings":"AAAA,iFAAiF;AACjF,uCAAuC;AACvC,kCAAkC;AAClC,iFAAiF;AAGjF,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"TurnContextUtils.js","sourceRoot":"","sources":["../../../src/utils/TurnContextUtils.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@microsoft/agents-a365-observability-hosting",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.2.0-preview.1",
|
|
4
4
|
"description": "Hosting & Observability utilities for Agent365 (Node.js): token caching, baggage builder, hosting registration.",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"agent365",
|
|
@@ -29,9 +29,10 @@
|
|
|
29
29
|
"CHANGELOG.md"
|
|
30
30
|
],
|
|
31
31
|
"dependencies": {
|
|
32
|
-
"@microsoft/agents-a365-observability": "0.
|
|
33
|
-
"@microsoft/agents-a365-runtime": "0.
|
|
34
|
-
"@microsoft/agents-hosting": "^1.1
|
|
32
|
+
"@microsoft/agents-a365-observability": "0.2.0-preview.1",
|
|
33
|
+
"@microsoft/agents-a365-runtime": "0.2.0-preview.1",
|
|
34
|
+
"@microsoft/agents-hosting": "^1.3.1",
|
|
35
|
+
"@opentelemetry/api": "^1.9.0"
|
|
35
36
|
},
|
|
36
37
|
"devDependencies": {
|
|
37
38
|
"@eslint/js": "^9.39.1",
|