@microsoft/opentelemetry 0.1.0-alpha.4 → 0.1.0-alpha.5
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/README.md +99 -7
- package/dist/commonjs/a365/configuration/A365Configuration.d.ts +12 -9
- package/dist/commonjs/a365/configuration/A365Configuration.d.ts.map +1 -1
- package/dist/commonjs/a365/configuration/A365Configuration.js +12 -33
- package/dist/commonjs/a365/configuration/A365Configuration.js.map +1 -1
- package/dist/commonjs/a365/configuration/A365ConfigurationOptions.d.ts +14 -8
- package/dist/commonjs/a365/configuration/A365ConfigurationOptions.d.ts.map +1 -1
- package/dist/commonjs/a365/configuration/index.d.ts +1 -0
- package/dist/commonjs/a365/configuration/index.d.ts.map +1 -1
- package/dist/commonjs/a365/constants.d.ts +1 -2
- package/dist/commonjs/a365/constants.d.ts.map +1 -1
- package/dist/commonjs/a365/constants.js +0 -1
- package/dist/commonjs/a365/constants.js.map +1 -1
- package/dist/commonjs/a365/context/tokenContext.js +6 -6
- package/dist/commonjs/a365/context/tokenContext.js.map +1 -1
- package/dist/commonjs/a365/context.js +2 -2
- package/dist/commonjs/a365/context.js.map +1 -1
- package/dist/commonjs/a365/exporter/Agent365Exporter.d.ts.map +1 -1
- package/dist/commonjs/a365/exporter/Agent365Exporter.js +3 -3
- package/dist/commonjs/a365/exporter/Agent365Exporter.js.map +1 -1
- package/dist/commonjs/a365/exporter/Agent365ExporterOptions.d.ts +4 -1
- package/dist/commonjs/a365/exporter/Agent365ExporterOptions.d.ts.map +1 -1
- package/dist/commonjs/a365/exporter/Agent365ExporterOptions.js +2 -0
- package/dist/commonjs/a365/exporter/Agent365ExporterOptions.js.map +1 -1
- package/dist/commonjs/a365/index.d.ts +3 -3
- package/dist/commonjs/a365/index.d.ts.map +1 -1
- package/dist/commonjs/a365/index.js +4 -2
- package/dist/commonjs/a365/index.js.map +1 -1
- package/dist/commonjs/a365/logging.d.ts +16 -0
- package/dist/commonjs/a365/logging.d.ts.map +1 -0
- package/dist/commonjs/a365/logging.js +81 -0
- package/dist/commonjs/a365/logging.js.map +1 -0
- package/dist/commonjs/a365/processors/index.d.ts +0 -2
- package/dist/commonjs/a365/processors/index.d.ts.map +1 -1
- package/dist/commonjs/a365/processors/index.js +1 -3
- package/dist/commonjs/a365/processors/index.js.map +1 -1
- package/dist/commonjs/azureMonitor/traces/handler.d.ts.map +1 -1
- package/dist/commonjs/azureMonitor/traces/handler.js +0 -10
- package/dist/commonjs/azureMonitor/traces/handler.js.map +1 -1
- package/dist/commonjs/distro/distro.d.ts.map +1 -1
- package/dist/commonjs/distro/distro.js +87 -6
- package/dist/commonjs/distro/distro.js.map +1 -1
- package/dist/commonjs/distro/instrumentations.d.ts +2 -2
- package/dist/commonjs/distro/instrumentations.d.ts.map +1 -1
- package/dist/commonjs/distro/instrumentations.js +2 -6
- package/dist/commonjs/distro/instrumentations.js.map +1 -1
- package/dist/commonjs/genai/instrumentations/openai/openAIAgentsTraceInstrumentor.d.ts +1 -17
- package/dist/commonjs/genai/instrumentations/openai/openAIAgentsTraceInstrumentor.d.ts.map +1 -1
- package/dist/commonjs/genai/instrumentations/openai/openAIAgentsTraceInstrumentor.js +1 -1
- package/dist/commonjs/genai/instrumentations/openai/openAIAgentsTraceInstrumentor.js.map +1 -1
- package/dist/commonjs/index.d.ts +3 -2
- package/dist/commonjs/index.d.ts.map +1 -1
- package/dist/commonjs/index.js +44 -43
- package/dist/commonjs/index.js.map +1 -1
- package/dist/commonjs/shared/config.d.ts +0 -1
- package/dist/commonjs/shared/config.d.ts.map +1 -1
- package/dist/commonjs/shared/config.js +2 -39
- package/dist/commonjs/shared/config.js.map +1 -1
- package/dist/commonjs/types.d.ts +7 -9
- package/dist/commonjs/types.d.ts.map +1 -1
- package/dist/commonjs/types.js +1 -1
- package/dist/commonjs/types.js.map +1 -1
- package/dist/esm/a365/configuration/A365Configuration.d.ts +12 -9
- package/dist/esm/a365/configuration/A365Configuration.d.ts.map +1 -1
- package/dist/esm/a365/configuration/A365Configuration.js +12 -33
- package/dist/esm/a365/configuration/A365Configuration.js.map +1 -1
- package/dist/esm/a365/configuration/A365ConfigurationOptions.d.ts +14 -8
- package/dist/esm/a365/configuration/A365ConfigurationOptions.d.ts.map +1 -1
- package/dist/esm/a365/configuration/index.d.ts +1 -0
- package/dist/esm/a365/configuration/index.d.ts.map +1 -1
- package/dist/esm/a365/constants.d.ts +1 -2
- package/dist/esm/a365/constants.d.ts.map +1 -1
- package/dist/esm/a365/constants.js +0 -1
- package/dist/esm/a365/constants.js.map +1 -1
- package/dist/esm/a365/context/tokenContext.js +6 -6
- package/dist/esm/a365/context/tokenContext.js.map +1 -1
- package/dist/esm/a365/context.js +2 -2
- package/dist/esm/a365/context.js.map +1 -1
- package/dist/esm/a365/exporter/Agent365Exporter.d.ts.map +1 -1
- package/dist/esm/a365/exporter/Agent365Exporter.js +3 -3
- package/dist/esm/a365/exporter/Agent365Exporter.js.map +1 -1
- package/dist/esm/a365/exporter/Agent365ExporterOptions.d.ts +4 -1
- package/dist/esm/a365/exporter/Agent365ExporterOptions.d.ts.map +1 -1
- package/dist/esm/a365/exporter/Agent365ExporterOptions.js +2 -0
- package/dist/esm/a365/exporter/Agent365ExporterOptions.js.map +1 -1
- package/dist/esm/a365/index.d.ts +3 -3
- package/dist/esm/a365/index.d.ts.map +1 -1
- package/dist/esm/a365/index.js +2 -1
- package/dist/esm/a365/index.js.map +1 -1
- package/dist/esm/a365/logging.d.ts +16 -0
- package/dist/esm/a365/logging.d.ts.map +1 -0
- package/dist/esm/a365/logging.js +76 -0
- package/dist/esm/a365/logging.js.map +1 -0
- package/dist/esm/a365/processors/index.d.ts +0 -2
- package/dist/esm/a365/processors/index.d.ts.map +1 -1
- package/dist/esm/a365/processors/index.js +0 -1
- package/dist/esm/a365/processors/index.js.map +1 -1
- package/dist/esm/azureMonitor/traces/handler.d.ts.map +1 -1
- package/dist/esm/azureMonitor/traces/handler.js +0 -8
- package/dist/esm/azureMonitor/traces/handler.js.map +1 -1
- package/dist/esm/distro/distro.d.ts.map +1 -1
- package/dist/esm/distro/distro.js +55 -7
- package/dist/esm/distro/distro.js.map +1 -1
- package/dist/esm/distro/instrumentations.d.ts +2 -2
- package/dist/esm/distro/instrumentations.d.ts.map +1 -1
- package/dist/esm/distro/instrumentations.js +2 -6
- package/dist/esm/distro/instrumentations.js.map +1 -1
- package/dist/esm/genai/instrumentations/openai/openAIAgentsTraceInstrumentor.d.ts +1 -17
- package/dist/esm/genai/instrumentations/openai/openAIAgentsTraceInstrumentor.d.ts.map +1 -1
- package/dist/esm/genai/instrumentations/openai/openAIAgentsTraceInstrumentor.js +1 -1
- package/dist/esm/genai/instrumentations/openai/openAIAgentsTraceInstrumentor.js.map +1 -1
- package/dist/esm/index.d.ts +3 -2
- package/dist/esm/index.d.ts.map +1 -1
- package/dist/esm/index.js +2 -1
- package/dist/esm/index.js.map +1 -1
- package/dist/esm/shared/config.d.ts +0 -1
- package/dist/esm/shared/config.d.ts.map +1 -1
- package/dist/esm/shared/config.js +2 -39
- package/dist/esm/shared/config.js.map +1 -1
- package/dist/esm/types.d.ts +7 -9
- package/dist/esm/types.d.ts.map +1 -1
- package/dist/esm/types.js +1 -1
- package/dist/esm/types.js.map +1 -1
- package/package.json +4 -2
- package/dist/commonjs/a365/processors/PerRequestSpanProcessor.d.ts +0 -44
- package/dist/commonjs/a365/processors/PerRequestSpanProcessor.d.ts.map +0 -1
- package/dist/commonjs/a365/processors/PerRequestSpanProcessor.js +0 -260
- package/dist/commonjs/a365/processors/PerRequestSpanProcessor.js.map +0 -1
- package/dist/commonjs/shared/jsonConfig.d.ts +0 -35
- package/dist/commonjs/shared/jsonConfig.d.ts.map +0 -1
- package/dist/commonjs/shared/jsonConfig.js +0 -122
- package/dist/commonjs/shared/jsonConfig.js.map +0 -1
- package/dist/esm/a365/processors/PerRequestSpanProcessor.d.ts +0 -44
- package/dist/esm/a365/processors/PerRequestSpanProcessor.d.ts.map +0 -1
- package/dist/esm/a365/processors/PerRequestSpanProcessor.js +0 -256
- package/dist/esm/a365/processors/PerRequestSpanProcessor.js.map +0 -1
- package/dist/esm/shared/jsonConfig.d.ts +0 -35
- package/dist/esm/shared/jsonConfig.d.ts.map +0 -1
- package/dist/esm/shared/jsonConfig.js +0 -115
- package/dist/esm/shared/jsonConfig.js.map +0 -1
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
// Copyright (c) Microsoft Corporation.
|
|
2
2
|
// Licensed under the MIT License.
|
|
3
|
-
import {
|
|
4
|
-
import { JsonConfig } from "../../shared/jsonConfig.js";
|
|
3
|
+
import { getA365Logger } from "../logging.js";
|
|
5
4
|
/**
|
|
6
5
|
* Parse an environment variable as a boolean.
|
|
7
6
|
* Recognizes 'true', '1', 'yes', 'on' (case-insensitive) as true and
|
|
@@ -29,10 +28,10 @@ function parseEnvBoolean(envValue) {
|
|
|
29
28
|
*/
|
|
30
29
|
export const A365_ENV_VARS = {
|
|
31
30
|
EXPORTER_ENABLED: "ENABLE_A365_OBSERVABILITY_EXPORTER",
|
|
32
|
-
PER_REQUEST_EXPORT: "ENABLE_A365_OBSERVABILITY_PER_REQUEST_EXPORT",
|
|
33
31
|
AUTH_SCOPES: "A365_OBSERVABILITY_SCOPES_OVERRIDE",
|
|
34
32
|
DOMAIN: "A365_OBSERVABILITY_DOMAIN_OVERRIDE",
|
|
35
33
|
CLUSTER_CATEGORY: "CLUSTER_CATEGORY",
|
|
34
|
+
LOG_LEVEL: "A365_OBSERVABILITY_LOG_LEVEL",
|
|
36
35
|
};
|
|
37
36
|
const DEFAULT_AUTH_SCOPE = "https://api.powerplatform.com/.default";
|
|
38
37
|
const VALID_CLUSTER_CATEGORIES = new Set([
|
|
@@ -52,11 +51,10 @@ const VALID_CLUSTER_CATEGORIES = new Set([
|
|
|
52
51
|
/**
|
|
53
52
|
* Resolved A365 configuration.
|
|
54
53
|
*
|
|
55
|
-
* Merges values from
|
|
54
|
+
* Merges values from three sources (lowest to highest precedence):
|
|
56
55
|
* 1. Defaults
|
|
57
56
|
* 2. Programmatic options (`A365Options`)
|
|
58
|
-
* 3.
|
|
59
|
-
* 4. Environment variables (see `A365_ENV_VARS`)
|
|
57
|
+
* 3. Environment variables (see `A365_ENV_VARS`)
|
|
60
58
|
*/
|
|
61
59
|
export class A365Configuration {
|
|
62
60
|
/** Whether A365 observability is enabled. */
|
|
@@ -69,8 +67,6 @@ export class A365Configuration {
|
|
|
69
67
|
domainOverride;
|
|
70
68
|
/** OAuth scopes for A365 service authentication. */
|
|
71
69
|
authScopes;
|
|
72
|
-
/** Whether to use per-request export mode. */
|
|
73
|
-
perRequestExport;
|
|
74
70
|
/** Baggage options. */
|
|
75
71
|
baggage;
|
|
76
72
|
/** Hosting options. */
|
|
@@ -81,33 +77,16 @@ export class A365Configuration {
|
|
|
81
77
|
let clusterCategory = "prod";
|
|
82
78
|
let domainOverride = options?.domainOverride;
|
|
83
79
|
let authScopes = options?.authScopes ?? [DEFAULT_AUTH_SCOPE];
|
|
84
|
-
let perRequestExport = false;
|
|
85
80
|
// 2. Apply programmatic options
|
|
86
81
|
if (options) {
|
|
87
82
|
enabled = options.enabled ?? enabled;
|
|
88
83
|
clusterCategory = options.clusterCategory ?? clusterCategory;
|
|
89
|
-
perRequestExport = options.perRequestExport ?? perRequestExport;
|
|
90
84
|
}
|
|
91
|
-
// 3. Apply
|
|
92
|
-
const jsonA365 = JsonConfig.getInstance().a365;
|
|
93
|
-
if (jsonA365) {
|
|
94
|
-
enabled = jsonA365.enabled ?? enabled;
|
|
95
|
-
clusterCategory = jsonA365.clusterCategory ?? clusterCategory;
|
|
96
|
-
domainOverride = jsonA365.domainOverride ?? domainOverride;
|
|
97
|
-
perRequestExport = jsonA365.perRequestExport ?? perRequestExport;
|
|
98
|
-
if (jsonA365.authScopes) {
|
|
99
|
-
authScopes = jsonA365.authScopes;
|
|
100
|
-
}
|
|
101
|
-
}
|
|
102
|
-
// 4. Apply environment variable overrides (highest precedence)
|
|
85
|
+
// 3. Apply environment variable overrides (highest precedence)
|
|
103
86
|
const envEnabled = parseEnvBoolean(process.env[A365_ENV_VARS.EXPORTER_ENABLED]);
|
|
104
87
|
if (envEnabled !== undefined) {
|
|
105
88
|
enabled = envEnabled;
|
|
106
89
|
}
|
|
107
|
-
const envPerRequest = parseEnvBoolean(process.env[A365_ENV_VARS.PER_REQUEST_EXPORT]);
|
|
108
|
-
if (envPerRequest !== undefined) {
|
|
109
|
-
perRequestExport = envPerRequest;
|
|
110
|
-
}
|
|
111
90
|
const envScopes = process.env[A365_ENV_VARS.AUTH_SCOPES]?.trim();
|
|
112
91
|
if (envScopes) {
|
|
113
92
|
authScopes = envScopes.split(/\s+/).filter(Boolean);
|
|
@@ -121,7 +100,7 @@ export class A365Configuration {
|
|
|
121
100
|
clusterCategory = envCluster;
|
|
122
101
|
}
|
|
123
102
|
else if (envCluster) {
|
|
124
|
-
|
|
103
|
+
getA365Logger().warn(`Invalid ${A365_ENV_VARS.CLUSTER_CATEGORY} value '${envCluster}'. Using default cluster category.`);
|
|
125
104
|
}
|
|
126
105
|
// Assign resolved values
|
|
127
106
|
this.enabled = enabled;
|
|
@@ -129,13 +108,14 @@ export class A365Configuration {
|
|
|
129
108
|
this.clusterCategory = clusterCategory;
|
|
130
109
|
this.domainOverride = domainOverride;
|
|
131
110
|
this.authScopes = authScopes;
|
|
132
|
-
this.perRequestExport = perRequestExport;
|
|
133
111
|
this.baggage = {
|
|
134
|
-
propagationEnabled:
|
|
135
|
-
enrichSpans:
|
|
112
|
+
propagationEnabled: options?.baggage?.propagationEnabled ?? true,
|
|
113
|
+
enrichSpans: options?.baggage?.enrichSpans ?? true,
|
|
136
114
|
};
|
|
137
115
|
this.hosting = {
|
|
138
|
-
enabled:
|
|
116
|
+
enabled: options?.hosting?.enabled ?? false,
|
|
117
|
+
adapter: options?.hosting?.adapter,
|
|
118
|
+
enableOutputLogging: options?.hosting?.enableOutputLogging ?? true,
|
|
139
119
|
};
|
|
140
120
|
// Warn when A365-scoped options are set but A365 is not enabled
|
|
141
121
|
if (!this.enabled) {
|
|
@@ -147,10 +127,9 @@ export class A365Configuration {
|
|
|
147
127
|
return;
|
|
148
128
|
const hasNonTrivialOptions = options.tokenResolver !== undefined ||
|
|
149
129
|
options.domainOverride !== undefined ||
|
|
150
|
-
options.perRequestExport !== undefined ||
|
|
151
130
|
options.hosting?.enabled === true;
|
|
152
131
|
if (hasNonTrivialOptions) {
|
|
153
|
-
|
|
132
|
+
getA365Logger().warn("A365 configuration options are set but A365 is not enabled. " +
|
|
154
133
|
"Set `a365.enabled: true` or `ENABLE_A365_OBSERVABILITY_EXPORTER=true` to enable.");
|
|
155
134
|
}
|
|
156
135
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"A365Configuration.js","sourceRoot":"","sources":["../../../../src/a365/configuration/A365Configuration.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,kCAAkC;
|
|
1
|
+
{"version":3,"file":"A365Configuration.js","sourceRoot":"","sources":["../../../../src/a365/configuration/A365Configuration.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,22 +14,16 @@ export interface A365Options {
|
|
|
14
14
|
enabled?: boolean;
|
|
15
15
|
/**
|
|
16
16
|
* Token resolver for authenticating with the A365 observability service.
|
|
17
|
-
* Called with (agentId, tenantId) extracted from span attributes.
|
|
17
|
+
* Called with (agentId, tenantId, authScopes) extracted from span attributes/config.
|
|
18
18
|
* Must return a bearer token string or a promise resolving to one.
|
|
19
19
|
*/
|
|
20
|
-
tokenResolver?: (agentId: string, tenantId: string) => string | Promise<string>;
|
|
20
|
+
tokenResolver?: (agentId: string, tenantId: string, authScopes?: string[]) => string | Promise<string>;
|
|
21
21
|
/** Cluster category for the A365 service endpoint. */
|
|
22
22
|
clusterCategory?: ClusterCategory;
|
|
23
23
|
/** Override the A365 observability service domain. */
|
|
24
24
|
domainOverride?: string;
|
|
25
25
|
/** OAuth scopes for A365 service authentication. */
|
|
26
26
|
authScopes?: string[];
|
|
27
|
-
/**
|
|
28
|
-
* Use per-request export mode (buffer spans per trace, export on root completion).
|
|
29
|
-
* When false, uses standard batch export.
|
|
30
|
-
* @default false
|
|
31
|
-
*/
|
|
32
|
-
perRequestExport?: boolean;
|
|
33
27
|
/** Baggage propagation and span enrichment options. */
|
|
34
28
|
baggage?: A365BaggageOptions;
|
|
35
29
|
/** Hosting middleware options (requires @microsoft/agents-hosting). */
|
|
@@ -49,5 +43,17 @@ export interface A365HostingOptions {
|
|
|
49
43
|
* Requires `@microsoft/agents-hosting` as an optional peer dependency.
|
|
50
44
|
*/
|
|
51
45
|
enabled?: boolean;
|
|
46
|
+
/**
|
|
47
|
+
* Adapter instance where hosting middleware will be auto-registered.
|
|
48
|
+
* Must expose a `use(...middlewares)` method compatible with agents-hosting adapters.
|
|
49
|
+
*/
|
|
50
|
+
adapter?: {
|
|
51
|
+
use(...middlewares: unknown[]): void;
|
|
52
|
+
};
|
|
53
|
+
/**
|
|
54
|
+
* Enable output logging middleware auto-registration when hosting is enabled.
|
|
55
|
+
* @default true
|
|
56
|
+
*/
|
|
57
|
+
enableOutputLogging?: boolean;
|
|
52
58
|
}
|
|
53
59
|
//# sourceMappingURL=A365ConfigurationOptions.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"A365ConfigurationOptions.d.ts","sourceRoot":"","sources":["../../../../src/a365/configuration/A365ConfigurationOptions.ts"],"names":[],"mappings":"AAGA;;;GAGG;AACH,MAAM,MAAM,eAAe,GACvB,OAAO,GACP,KAAK,GACL,MAAM,GACN,SAAS,GACT,cAAc,GACd,MAAM,GACN,KAAK,GACL,MAAM,GACN,KAAK,GACL,UAAU,GACV,IAAI,GACJ,IAAI,CAAC;AAET;;;;;GAKG;AACH,MAAM,WAAW,WAAW;IAC1B,6EAA6E;IAC7E,OAAO,CAAC,EAAE,OAAO,CAAC;IAElB;;;;OAIG;IACH,aAAa,CAAC,EAAE,
|
|
1
|
+
{"version":3,"file":"A365ConfigurationOptions.d.ts","sourceRoot":"","sources":["../../../../src/a365/configuration/A365ConfigurationOptions.ts"],"names":[],"mappings":"AAGA;;;GAGG;AACH,MAAM,MAAM,eAAe,GACvB,OAAO,GACP,KAAK,GACL,MAAM,GACN,SAAS,GACT,cAAc,GACd,MAAM,GACN,KAAK,GACL,MAAM,GACN,KAAK,GACL,UAAU,GACV,IAAI,GACJ,IAAI,CAAC;AAET;;;;;GAKG;AACH,MAAM,WAAW,WAAW;IAC1B,6EAA6E;IAC7E,OAAO,CAAC,EAAE,OAAO,CAAC;IAElB;;;;OAIG;IACH,aAAa,CAAC,EAAE,CACd,OAAO,EAAE,MAAM,EACf,QAAQ,EAAE,MAAM,EAChB,UAAU,CAAC,EAAE,MAAM,EAAE,KAClB,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IAE9B,sDAAsD;IACtD,eAAe,CAAC,EAAE,eAAe,CAAC;IAElC,sDAAsD;IACtD,cAAc,CAAC,EAAE,MAAM,CAAC;IAExB,oDAAoD;IACpD,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;IAEtB,uDAAuD;IACvD,OAAO,CAAC,EAAE,kBAAkB,CAAC;IAE7B,uEAAuE;IACvE,OAAO,CAAC,EAAE,kBAAkB,CAAC;CAC9B;AAED,uDAAuD;AACvD,MAAM,WAAW,kBAAkB;IACjC,uEAAuE;IACvE,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,6CAA6C;IAC7C,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB;AAED,kCAAkC;AAClC,MAAM,WAAW,kBAAkB;IACjC;;;OAGG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC;IAElB;;;OAGG;IACH,OAAO,CAAC,EAAE;QAAE,GAAG,CAAC,GAAG,WAAW,EAAE,OAAO,EAAE,GAAG,IAAI,CAAA;KAAE,CAAC;IAEnD;;;OAGG;IACH,mBAAmB,CAAC,EAAE,OAAO,CAAC;CAC/B"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
1
|
export { A365Configuration, A365_ENV_VARS } from "./A365Configuration.js";
|
|
2
2
|
export type { A365Options, ClusterCategory, A365BaggageOptions, A365HostingOptions, } from "./A365ConfigurationOptions.js";
|
|
3
|
+
export type { ILogger } from "../logging.js";
|
|
3
4
|
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/a365/configuration/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,iBAAiB,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAC1E,YAAY,EACV,WAAW,EACX,eAAe,EACf,kBAAkB,EAClB,kBAAkB,GACnB,MAAM,+BAA+B,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/a365/configuration/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,iBAAiB,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAC1E,YAAY,EACV,WAAW,EACX,eAAe,EACf,kBAAkB,EAClB,kBAAkB,GACnB,MAAM,+BAA+B,CAAC;AAEvC,YAAY,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC"}
|
|
@@ -25,7 +25,6 @@ export declare class OpenTelemetryConstants {
|
|
|
25
25
|
static readonly ENABLE_OBSERVABILITY = "ENABLE_OBSERVABILITY";
|
|
26
26
|
static readonly ENABLE_A365_OBSERVABILITY_EXPORTER = "ENABLE_A365_OBSERVABILITY_EXPORTER";
|
|
27
27
|
static readonly ENABLE_A365_OBSERVABILITY = "ENABLE_A365_OBSERVABILITY";
|
|
28
|
-
static readonly ENABLE_A365_OBSERVABILITY_PER_REQUEST_EXPORT = "ENABLE_A365_OBSERVABILITY_PER_REQUEST_EXPORT";
|
|
29
28
|
static readonly GEN_AI_OPERATION_NAME_KEY = "gen_ai.operation.name";
|
|
30
29
|
static readonly GEN_AI_REQUEST_MODEL_KEY = "gen_ai.request.model";
|
|
31
30
|
static readonly GEN_AI_RESPONSE_MODEL_KEY = "gen_ai.response.model";
|
|
@@ -88,6 +87,6 @@ export declare class OpenTelemetryConstants {
|
|
|
88
87
|
static readonly TELEMETRY_SDK_VERSION_KEY = "telemetry.sdk.version";
|
|
89
88
|
static readonly TELEMETRY_SDK_NAME_VALUE = "A365ObservabilitySDK";
|
|
90
89
|
static readonly TELEMETRY_SDK_LANGUAGE_VALUE = "nodejs";
|
|
91
|
-
static readonly TELEMETRY_SDK_VERSION_VALUE = "0.1.0-alpha.
|
|
90
|
+
static readonly TELEMETRY_SDK_VERSION_VALUE = "0.1.0-alpha.5";
|
|
92
91
|
}
|
|
93
92
|
//# sourceMappingURL=constants.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../../src/a365/constants.ts"],"names":[],"mappings":"AAKA;;;;;;;GAOG;AACH,qBAAa,sBAAsB;IAEjC,gBAAuB,2BAA2B,kBAAkB;IACpE,gBAAuB,2BAA2B,kBAAkB;IACpE,gBAAuB,8BAA8B,qBAAqB;IAC1E,gBAAuB,mBAAmB,UAAU;IAGpD,gBAAuB,cAAc,gBAAgB;IACrD,gBAAuB,oBAAoB,2BAA2B;IACtE,gBAAuB,iBAAiB,mBAAmB;IAC3D,gBAAuB,gBAAgB,kBAAkB;IACzD,gBAAuB,kBAAkB,oBAAoB;IAC7D,gBAAuB,eAAe,iBAAiB;IACvD,gBAAuB,wBAAwB,iCAAiC;IAGhF,gBAAuB,WAAW,iBAAiB;IAGnD,gBAAuB,2BAA2B,6CAA6C;IAC/F,gBAAuB,qBAAqB,iDAAiD;IAC7F,gBAAuB,mCAAmC,oDACP;IACnD,gBAAuB,oBAAoB,0BAA0B;IACrE,gBAAuB,kCAAkC,wCAAwC;IACjG,gBAAuB,yBAAyB,+BAA+B;
|
|
1
|
+
{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../../src/a365/constants.ts"],"names":[],"mappings":"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"}
|
|
@@ -32,7 +32,6 @@ export class OpenTelemetryConstants {
|
|
|
32
32
|
static ENABLE_OBSERVABILITY = "ENABLE_OBSERVABILITY";
|
|
33
33
|
static ENABLE_A365_OBSERVABILITY_EXPORTER = "ENABLE_A365_OBSERVABILITY_EXPORTER";
|
|
34
34
|
static ENABLE_A365_OBSERVABILITY = "ENABLE_A365_OBSERVABILITY";
|
|
35
|
-
static ENABLE_A365_OBSERVABILITY_PER_REQUEST_EXPORT = "ENABLE_A365_OBSERVABILITY_PER_REQUEST_EXPORT";
|
|
36
35
|
// ── GenAI core attributes ────────────────────────────────────────
|
|
37
36
|
static GEN_AI_OPERATION_NAME_KEY = "gen_ai.operation.name";
|
|
38
37
|
static GEN_AI_REQUEST_MODEL_KEY = "gen_ai.request.model";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../src/a365/constants.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,kCAAkC;AAElC,OAAO,EAAE,+BAA+B,EAAE,MAAM,aAAa,CAAC;AAE9D;;;;;;;GAOG;AACH,MAAM,OAAO,sBAAsB;IACjC,qEAAqE;IAC9D,MAAM,CAAU,2BAA2B,GAAG,cAAc,CAAC;IAC7D,MAAM,CAAU,2BAA2B,GAAG,cAAc,CAAC;IAC7D,MAAM,CAAU,8BAA8B,GAAG,iBAAiB,CAAC;IACnE,MAAM,CAAU,mBAAmB,GAAG,MAAM,CAAC;IAEpD,qEAAqE;IAC9D,MAAM,CAAU,cAAc,GAAG,YAAY,CAAC;IAC9C,MAAM,CAAU,oBAAoB,GAAG,uBAAuB,CAAC;IAC/D,MAAM,CAAU,iBAAiB,GAAG,eAAe,CAAC;IACpD,MAAM,CAAU,gBAAgB,GAAG,cAAc,CAAC;IAClD,MAAM,CAAU,kBAAkB,GAAG,gBAAgB,CAAC;IACtD,MAAM,CAAU,eAAe,GAAG,aAAa,CAAC;IAChD,MAAM,CAAU,wBAAwB,GAAG,6BAA6B,CAAC;IAEhF,qEAAqE;IAC9D,MAAM,CAAU,WAAW,GAAG,aAAa,CAAC;IAEnD,qEAAqE;IAC9D,MAAM,CAAU,2BAA2B,GAAG,yCAAyC,CAAC;IACxF,MAAM,CAAU,qBAAqB,GAAG,6CAA6C,CAAC;IACtF,MAAM,CAAU,mCAAmC,GACxD,gDAAgD,CAAC;IAC5C,MAAM,CAAU,oBAAoB,GAAG,sBAAsB,CAAC;IAC9D,MAAM,CAAU,kCAAkC,GAAG,oCAAoC,CAAC;IAC1F,MAAM,CAAU,yBAAyB,GAAG,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../src/a365/constants.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,kCAAkC;AAElC,OAAO,EAAE,+BAA+B,EAAE,MAAM,aAAa,CAAC;AAE9D;;;;;;;GAOG;AACH,MAAM,OAAO,sBAAsB;IACjC,qEAAqE;IAC9D,MAAM,CAAU,2BAA2B,GAAG,cAAc,CAAC;IAC7D,MAAM,CAAU,2BAA2B,GAAG,cAAc,CAAC;IAC7D,MAAM,CAAU,8BAA8B,GAAG,iBAAiB,CAAC;IACnE,MAAM,CAAU,mBAAmB,GAAG,MAAM,CAAC;IAEpD,qEAAqE;IAC9D,MAAM,CAAU,cAAc,GAAG,YAAY,CAAC;IAC9C,MAAM,CAAU,oBAAoB,GAAG,uBAAuB,CAAC;IAC/D,MAAM,CAAU,iBAAiB,GAAG,eAAe,CAAC;IACpD,MAAM,CAAU,gBAAgB,GAAG,cAAc,CAAC;IAClD,MAAM,CAAU,kBAAkB,GAAG,gBAAgB,CAAC;IACtD,MAAM,CAAU,eAAe,GAAG,aAAa,CAAC;IAChD,MAAM,CAAU,wBAAwB,GAAG,6BAA6B,CAAC;IAEhF,qEAAqE;IAC9D,MAAM,CAAU,WAAW,GAAG,aAAa,CAAC;IAEnD,qEAAqE;IAC9D,MAAM,CAAU,2BAA2B,GAAG,yCAAyC,CAAC;IACxF,MAAM,CAAU,qBAAqB,GAAG,6CAA6C,CAAC;IACtF,MAAM,CAAU,mCAAmC,GACxD,gDAAgD,CAAC;IAC5C,MAAM,CAAU,oBAAoB,GAAG,sBAAsB,CAAC;IAC9D,MAAM,CAAU,kCAAkC,GAAG,oCAAoC,CAAC;IAC1F,MAAM,CAAU,yBAAyB,GAAG,2BAA2B,CAAC;IAE/E,oEAAoE;IAC7D,MAAM,CAAU,yBAAyB,GAAG,uBAAuB,CAAC;IACpE,MAAM,CAAU,wBAAwB,GAAG,sBAAsB,CAAC;IAClE,MAAM,CAAU,yBAAyB,GAAG,uBAAuB,CAAC;IACpE,MAAM,CAAU,kCAAkC,GAAG,gCAAgC,CAAC;IACtF,MAAM,CAAU,wBAAwB,GAAG,sBAAsB,CAAC;IAClE,MAAM,CAAU,6BAA6B,GAAG,2BAA2B,CAAC;IAC5E,MAAM,CAAU,8BAA8B,GAAG,4BAA4B,CAAC;IAC9E,MAAM,CAAU,wBAAwB,GAAG,sBAAsB,CAAC;IAClE,MAAM,CAAU,aAAa,GAAG,eAAe,CAAC;IAEvD,oEAAoE;IAC7D,MAAM,CAAU,4CAA4C,GACjE,kCAAkC,CAAC;IAC9B,MAAM,CAAU,qCAAqC,GAAG,2BAA2B,CAAC;IAE3F,oEAAoE;IAC7D,MAAM,CAAU,6BAA6B,GAAG,2BAA2B,CAAC;IAC5E,MAAM,CAAU,8BAA8B,GAAG,4BAA4B,CAAC;IAErF,oEAAoE;IAC7D,MAAM,CAAU,8BAA8B,GAAG,4BAA4B,CAAC;IAC9E,MAAM,CAAU,yBAAyB,GAAG,uBAAuB,CAAC;IACpE,MAAM,CAAU,0BAA0B,GAAG,wBAAwB,CAAC;IACtE,MAAM,CAAU,gCAAgC,GACrD,wCAAwC,CAAC;IAE3C,oEAAoE;IAC7D,MAAM,CAAU,mBAAmB,GAAG,iBAAiB,CAAC;IACxD,MAAM,CAAU,qBAAqB,GAAG,mBAAmB,CAAC;IAC5D,MAAM,CAAU,4BAA4B,GAAG,0BAA0B,CAAC;IAC1E,MAAM,CAAU,wBAAwB,GAAG,sBAAsB,CAAC;IAClE,MAAM,CAAU,4BAA4B,GAAG,kCAAkC,CAAC;IAClF,MAAM,CAAU,gCAAgC,GAAG,sCAAsC,CAAC;IAC1F,MAAM,CAAU,mBAAmB,GAAG,0BAA0B,CAAC;IACjE,MAAM,CAAU,YAAY,GAAG,iBAAiB,CAAC;IAExD,oEAAoE;IAC7D,MAAM,CAAU,0BAA0B,GAAG,wBAAwB,CAAC;IACtE,MAAM,CAAU,iCAAiC,GAAG,kCAAkC,CAAC;IACvF,MAAM,CAAU,cAAc,GAAG,sBAAsB,CAAC;IACxD,MAAM,CAAU,uBAAuB,GAAG,+BAA+B,CAAC;IAEjF,oEAAoE;IAC7D,MAAM,CAAU,uBAAuB,GAAG,qBAAqB,CAAC;IAChE,MAAM,CAAU,oBAAoB,GAAG,kBAAkB,CAAC;IAC1D,MAAM,CAAU,2BAA2B,GAAG,yBAAyB,CAAC;IACxE,MAAM,CAAU,oBAAoB,GAAG,4BAA4B,CAAC;IACpE,MAAM,CAAU,2BAA2B,GAAG,yBAAyB,CAAC;IACxE,MAAM,CAAU,oBAAoB,GAAG,kBAAkB,CAAC;IAEjE,oEAAoE;IAC7D,MAAM,CAAU,aAAa,GAAG,qBAAqB,CAAC;IAE7D,oEAAoE;IAC7D,MAAM,CAAU,WAAW,GAAG,SAAS,CAAC;IACxC,MAAM,CAAU,aAAa,GAAG,WAAW,CAAC;IAC5C,MAAM,CAAU,cAAc,GAAG,YAAY,CAAC;IAC9C,MAAM,CAAU,2BAA2B,GAAG,gBAAgB,CAAC;IAEtE,oEAAoE;IAC7D,MAAM,CAAU,+BAA+B,GAAG,qCAAqC,CAAC;IACxF,MAAM,CAAU,6BAA6B,GAAG,wCAAwC,CAAC;IACzF,MAAM,CAAU,4BAA4B,GAAG,kCAAkC,CAAC;IAClF,MAAM,CAAU,0BAA0B,GAAG,gCAAgC,CAAC;IAC9E,MAAM,CAAU,sCAAsC,GAC3D,0CAA0C,CAAC;IACtC,MAAM,CAAU,mCAAmC,GACxD,yCAAyC,CAAC;IACrC,MAAM,CAAU,+BAA+B,GAAG,qCAAqC,CAAC;IAE/F,oEAAoE;IAC7D,MAAM,CAAU,qBAAqB,GAAG,yBAAyB,CAAC;IAClE,MAAM,CAAU,sBAAsB,GAAG,4BAA4B,CAAC;IACtE,MAAM,CAAU,6BAA6B,GAAG,mCAAmC,CAAC;IAE3F,oEAAoE;IAC7D,MAAM,CAAU,kBAAkB,GAAG,gBAAgB,CAAC;IACtD,MAAM,CAAU,4BAA4B,GAAG,0BAA0B,CAAC;IAEjF,oEAAoE;IAC7D,MAAM,CAAU,gBAAgB,GAAG,wBAAwB,CAAC;IAC5D,MAAM,CAAU,gBAAgB,GAAG,wBAAwB,CAAC;IAEnE,oEAAoE;IAC7D,MAAM,CAAU,yBAAyB,GAAG,uBAAuB,CAAC;IACpE,MAAM,CAAU,oBAAoB,GAAG,kBAAkB,CAAC;IAEjE,oEAAoE;IAC7D,MAAM,CAAU,gBAAgB,GAAG,cAAc,CAAC;IAEzD,oEAAoE;IAC7D,MAAM,CAAU,sBAAsB,GAAG,oBAAoB,CAAC;IAC9D,MAAM,CAAU,0BAA0B,GAAG,wBAAwB,CAAC;IACtE,MAAM,CAAU,yBAAyB,GAAG,uBAAuB,CAAC;IACpE,MAAM,CAAU,wBAAwB,GAAG,sBAAsB,CAAC;IAClE,MAAM,CAAU,4BAA4B,GAAG,QAAQ,CAAC;IACxD,MAAM,CAAU,2BAA2B,GAAG,+BAA+B,CAAC"}
|
|
@@ -4,13 +4,13 @@
|
|
|
4
4
|
* Per-request export token context propagation.
|
|
5
5
|
*
|
|
6
6
|
* Uses OpenTelemetry Context (backed by AsyncLocalStorage) to carry and
|
|
7
|
-
* refresh a per-request bearer token that the
|
|
8
|
-
*
|
|
7
|
+
* refresh a per-request bearer token that the export pipeline
|
|
8
|
+
* reads at export time.
|
|
9
9
|
*
|
|
10
10
|
* Adapted from microsoft/Agent365-nodejs agents-a365-observability/src/tracing/context/token-context.ts
|
|
11
11
|
*/
|
|
12
12
|
import { context, createContextKey } from "@opentelemetry/api";
|
|
13
|
-
import {
|
|
13
|
+
import { getA365Logger } from "../logging.js";
|
|
14
14
|
const EXPORT_TOKEN_KEY = createContextKey("a365_export_token");
|
|
15
15
|
/**
|
|
16
16
|
* Run a function within a Context that carries the per-request export token.
|
|
@@ -23,7 +23,7 @@ const EXPORT_TOKEN_KEY = createContextKey("a365_export_token");
|
|
|
23
23
|
export function runWithExportToken(token, fn) {
|
|
24
24
|
const holder = { token };
|
|
25
25
|
const ctxWithToken = context.active().setValue(EXPORT_TOKEN_KEY, holder);
|
|
26
|
-
|
|
26
|
+
getA365Logger().info("[TokenContext] Running function with export token in context.");
|
|
27
27
|
return context.with(ctxWithToken, fn);
|
|
28
28
|
}
|
|
29
29
|
/**
|
|
@@ -39,10 +39,10 @@ export function updateExportToken(token) {
|
|
|
39
39
|
const value = context.active().getValue(EXPORT_TOKEN_KEY);
|
|
40
40
|
if (value && typeof value === "object" && "token" in value) {
|
|
41
41
|
value.token = token;
|
|
42
|
-
|
|
42
|
+
getA365Logger().info("[TokenContext] Export token updated in context.");
|
|
43
43
|
return true;
|
|
44
44
|
}
|
|
45
|
-
|
|
45
|
+
getA365Logger().warn("[TokenContext] updateExportToken called but no token holder found in active context. Was runWithExportToken called?");
|
|
46
46
|
return false;
|
|
47
47
|
}
|
|
48
48
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tokenContext.js","sourceRoot":"","sources":["../../../../src/a365/context/tokenContext.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,kCAAkC;AAElC;;;;;;;;GAQG;AAEH,OAAO,EAAE,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAE/D,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"tokenContext.js","sourceRoot":"","sources":["../../../../src/a365/context/tokenContext.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,kCAAkC;AAElC;;;;;;;;GAQG;AAEH,OAAO,EAAE,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAE/D,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAE9C,MAAM,gBAAgB,GAAG,gBAAgB,CAAC,mBAAmB,CAAC,CAAC;AAW/D;;;;;;;GAOG;AACH,MAAM,UAAU,kBAAkB,CAAI,KAAa,EAAE,EAAW;IAC9D,MAAM,MAAM,GAAgB,EAAE,KAAK,EAAE,CAAC;IACtC,MAAM,YAAY,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,gBAAgB,EAAE,MAAM,CAAC,CAAC;IACzE,aAAa,EAAE,CAAC,IAAI,CAAC,+DAA+D,CAAC,CAAC;IACtF,OAAO,OAAO,CAAC,IAAI,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC;AACxC,CAAC;AAED;;;;;;;;GAQG;AACH,MAAM,UAAU,iBAAiB,CAAC,KAAa;IAC7C,MAAM,KAAK,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,gBAAgB,CAAC,CAAC;IAC1D,IAAI,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,OAAO,IAAI,KAAK,EAAE,CAAC;QAC1D,KAAqB,CAAC,KAAK,GAAG,KAAK,CAAC;QACrC,aAAa,EAAE,CAAC,IAAI,CAAC,iDAAiD,CAAC,CAAC;QACxE,OAAO,IAAI,CAAC;IACd,CAAC;IACD,aAAa,EAAE,CAAC,IAAI,CAClB,qHAAqH,CACtH,CAAC;IACF,OAAO,KAAK,CAAC;AACf,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,cAAc,CAAC,MAAe,OAAO,CAAC,MAAM,EAAE;IAC5D,MAAM,KAAK,GAAG,GAAG,CAAC,QAAQ,CAAC,gBAAgB,CAAC,CAAC;IAC7C,IAAI,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,OAAO,IAAI,KAAK,EAAE,CAAC;QAC3D,OAAQ,KAAqB,CAAC,KAAK,CAAC;IACtC,CAAC;IACD,gEAAgE;IAChE,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QAC9B,OAAO,KAAK,CAAC;IACf,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC"}
|
package/dist/esm/a365/context.js
CHANGED
|
@@ -13,7 +13,7 @@
|
|
|
13
13
|
*/
|
|
14
14
|
import { context, trace, propagation } from "@opentelemetry/api";
|
|
15
15
|
import { TraceFlags } from "@opentelemetry/api";
|
|
16
|
-
import {
|
|
16
|
+
import { getA365Logger } from "./logging.js";
|
|
17
17
|
// ---------------------------------------------------------------------------
|
|
18
18
|
// Validation helpers
|
|
19
19
|
// ---------------------------------------------------------------------------
|
|
@@ -50,7 +50,7 @@ export function isParentSpanRef(value) {
|
|
|
50
50
|
* This allows child spans to be correctly parented even when async context is broken.
|
|
51
51
|
*/
|
|
52
52
|
export function createContextWithParentSpanRef(base, parent) {
|
|
53
|
-
const logger =
|
|
53
|
+
const logger = getA365Logger();
|
|
54
54
|
if (!isValidTraceId(parent.traceId) || !isValidSpanId(parent.spanId)) {
|
|
55
55
|
logger.warn(`[A365] Invalid parent span reference; returning base context. traceId=${parent.traceId}, spanId=${parent.spanId}`);
|
|
56
56
|
return base;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"context.js","sourceRoot":"","sources":["../../../src/a365/context.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,kCAAkC;AAElC;;;;;;;;;;GAUG;AAEH,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAEjE,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAEhD,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"context.js","sourceRoot":"","sources":["../../../src/a365/context.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Agent365Exporter.d.ts","sourceRoot":"","sources":["../../../../src/a365/exporter/Agent365Exporter.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAExD,OAAO,KAAK,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAEhF,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AA+D5E;;;;;;GAMG;AACH,qBAAa,gBAAiB,YAAW,YAAY;IACnD,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,QAAQ,CAAC,OAAO,CAA0B;IAClD,OAAO,CAAC,QAAQ,CAAC,MAAM,
|
|
1
|
+
{"version":3,"file":"Agent365Exporter.d.ts","sourceRoot":"","sources":["../../../../src/a365/exporter/Agent365Exporter.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAExD,OAAO,KAAK,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAEhF,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AA+D5E;;;;;;GAMG;AACH,qBAAa,gBAAiB,YAAW,YAAY;IACnD,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,QAAQ,CAAC,OAAO,CAA0B;IAClD,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAmB;gBAE9B,OAAO,CAAC,EAAE,uBAAuB;IAIvC,MAAM,CACV,KAAK,EAAE,YAAY,EAAE,EACrB,cAAc,EAAE,CAAC,MAAM,EAAE,YAAY,KAAK,IAAI,GAC7C,OAAO,CAAC,IAAI,CAAC;YAoCF,WAAW;YAkCX,YAAY;YAMZ,eAAe;IA0D7B,OAAO,CAAC,kBAAkB;IAwC1B,OAAO,CAAC,OAAO;IAwDT,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAIzB,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;CAGlC"}
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
import { ExportResultCode } from "@opentelemetry/core";
|
|
4
4
|
import { ResolvedExporterOptions } from "./Agent365ExporterOptions.js";
|
|
5
5
|
import { partitionByIdentity, parseIdentityKey, hexTraceId, hexSpanId, kindName, statusName, resolveAgent365Endpoint, truncateSpan, } from "./utils.js";
|
|
6
|
-
import {
|
|
6
|
+
import { getA365Logger } from "../logging.js";
|
|
7
7
|
const DEFAULT_MAX_RETRIES = 3;
|
|
8
8
|
/**
|
|
9
9
|
* Agent365 span exporter.
|
|
@@ -15,7 +15,7 @@ const DEFAULT_MAX_RETRIES = 3;
|
|
|
15
15
|
export class Agent365Exporter {
|
|
16
16
|
closed = false;
|
|
17
17
|
options;
|
|
18
|
-
logger =
|
|
18
|
+
logger = getA365Logger();
|
|
19
19
|
constructor(options) {
|
|
20
20
|
this.options = new ResolvedExporterOptions(options);
|
|
21
21
|
}
|
|
@@ -77,7 +77,7 @@ export class Agent365Exporter {
|
|
|
77
77
|
async resolveToken(agentId, tenantId) {
|
|
78
78
|
if (!this.options.tokenResolver)
|
|
79
79
|
return null;
|
|
80
|
-
const result = this.options.tokenResolver(agentId, tenantId);
|
|
80
|
+
const result = this.options.tokenResolver(agentId, tenantId, this.options.authScopes);
|
|
81
81
|
return result instanceof Promise ? result : result;
|
|
82
82
|
}
|
|
83
83
|
async postWithRetries(url, body, headers) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Agent365Exporter.js","sourceRoot":"","sources":["../../../../src/a365/exporter/Agent365Exporter.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,kCAAkC;AAGlC,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAIvD,OAAO,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AACvE,OAAO,EACL,mBAAmB,EACnB,gBAAgB,EAChB,UAAU,EACV,SAAS,EACT,QAAQ,EACR,UAAU,EACV,uBAAuB,EACvB,YAAY,GACb,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"Agent365Exporter.js","sourceRoot":"","sources":["../../../../src/a365/exporter/Agent365Exporter.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,7 @@ import type { ClusterCategory } from "../configuration/A365ConfigurationOptions.
|
|
|
3
3
|
* A function that resolves an authentication token for the given agent and tenant.
|
|
4
4
|
* Return null if a token cannot be provided.
|
|
5
5
|
*/
|
|
6
|
-
export type TokenResolver = (agentId: string, tenantId: string) => string | null | Promise<string | null>;
|
|
6
|
+
export type TokenResolver = (agentId: string, tenantId: string, authScopes?: string[]) => string | null | Promise<string | null>;
|
|
7
7
|
/**
|
|
8
8
|
* Options controlling the behavior of the Agent365 span exporter.
|
|
9
9
|
*/
|
|
@@ -16,6 +16,8 @@ export interface Agent365ExporterOptions {
|
|
|
16
16
|
useS2SEndpoint?: boolean;
|
|
17
17
|
/** Override the A365 observability service domain. */
|
|
18
18
|
domainOverride?: string;
|
|
19
|
+
/** OAuth scopes used during token resolution. */
|
|
20
|
+
authScopes?: string[];
|
|
19
21
|
/** Maximum span queue size before drops occur. @default 2048 */
|
|
20
22
|
maxQueueSize?: number;
|
|
21
23
|
/** Delay (ms) between automatic batch flush attempts. @default 5000 */
|
|
@@ -33,6 +35,7 @@ export declare class ResolvedExporterOptions {
|
|
|
33
35
|
readonly tokenResolver?: TokenResolver;
|
|
34
36
|
readonly useS2SEndpoint: boolean;
|
|
35
37
|
readonly domainOverride?: string;
|
|
38
|
+
readonly authScopes: string[];
|
|
36
39
|
readonly maxQueueSize: number;
|
|
37
40
|
readonly scheduledDelayMilliseconds: number;
|
|
38
41
|
readonly exporterTimeoutMilliseconds: number;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Agent365ExporterOptions.d.ts","sourceRoot":"","sources":["../../../../src/a365/exporter/Agent365ExporterOptions.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,8CAA8C,CAAC;AAEpF;;;GAGG;AACH,MAAM,MAAM,aAAa,GAAG,CAC1B,OAAO,EAAE,MAAM,EACf,QAAQ,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"Agent365ExporterOptions.d.ts","sourceRoot":"","sources":["../../../../src/a365/exporter/Agent365ExporterOptions.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,8CAA8C,CAAC;AAEpF;;;GAGG;AACH,MAAM,MAAM,aAAa,GAAG,CAC1B,OAAO,EAAE,MAAM,EACf,QAAQ,EAAE,MAAM,EAChB,UAAU,CAAC,EAAE,MAAM,EAAE,KAClB,MAAM,GAAG,IAAI,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;AAE5C;;GAEG;AACH,MAAM,WAAW,uBAAuB;IACtC,gEAAgE;IAChE,eAAe,CAAC,EAAE,eAAe,CAAC;IAElC,oEAAoE;IACpE,aAAa,CAAC,EAAE,aAAa,CAAC;IAE9B,uFAAuF;IACvF,cAAc,CAAC,EAAE,OAAO,CAAC;IAEzB,sDAAsD;IACtD,cAAc,CAAC,EAAE,MAAM,CAAC;IAExB,iDAAiD;IACjD,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;IAEtB,gEAAgE;IAChE,YAAY,CAAC,EAAE,MAAM,CAAC;IAEtB,uEAAuE;IACvE,0BAA0B,CAAC,EAAE,MAAM,CAAC;IAEpC,qEAAqE;IACrE,2BAA2B,CAAC,EAAE,MAAM,CAAC;IAErC,gGAAgG;IAChG,8BAA8B,CAAC,EAAE,MAAM,CAAC;IAExC,6DAA6D;IAC7D,kBAAkB,CAAC,EAAE,MAAM,CAAC;CAC7B;AAED,8CAA8C;AAC9C,qBAAa,uBAAuB;IAClC,SAAgB,eAAe,EAAE,eAAe,CAAC;IACjD,SAAgB,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9C,SAAgB,cAAc,EAAE,OAAO,CAAC;IACxC,SAAgB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxC,SAAgB,UAAU,EAAE,MAAM,EAAE,CAAC;IACrC,SAAgB,YAAY,EAAE,MAAM,CAAC;IACrC,SAAgB,0BAA0B,EAAE,MAAM,CAAC;IACnD,SAAgB,2BAA2B,EAAE,MAAM,CAAC;IACpD,SAAgB,8BAA8B,EAAE,MAAM,CAAC;IACvD,SAAgB,kBAAkB,EAAE,MAAM,CAAC;gBAE/B,OAAO,CAAC,EAAE,uBAAuB;CAY9C"}
|
|
@@ -6,6 +6,7 @@ export class ResolvedExporterOptions {
|
|
|
6
6
|
tokenResolver;
|
|
7
7
|
useS2SEndpoint;
|
|
8
8
|
domainOverride;
|
|
9
|
+
authScopes;
|
|
9
10
|
maxQueueSize;
|
|
10
11
|
scheduledDelayMilliseconds;
|
|
11
12
|
exporterTimeoutMilliseconds;
|
|
@@ -16,6 +17,7 @@ export class ResolvedExporterOptions {
|
|
|
16
17
|
this.tokenResolver = options?.tokenResolver;
|
|
17
18
|
this.useS2SEndpoint = options?.useS2SEndpoint ?? false;
|
|
18
19
|
this.domainOverride = options?.domainOverride;
|
|
20
|
+
this.authScopes = options?.authScopes ?? ["https://api.powerplatform.com/.default"];
|
|
19
21
|
this.maxQueueSize = options?.maxQueueSize ?? 2048;
|
|
20
22
|
this.scheduledDelayMilliseconds = options?.scheduledDelayMilliseconds ?? 5000;
|
|
21
23
|
this.exporterTimeoutMilliseconds = options?.exporterTimeoutMilliseconds ?? 90000;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Agent365ExporterOptions.js","sourceRoot":"","sources":["../../../../src/a365/exporter/Agent365ExporterOptions.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,kCAAkC;
|
|
1
|
+
{"version":3,"file":"Agent365ExporterOptions.js","sourceRoot":"","sources":["../../../../src/a365/exporter/Agent365ExporterOptions.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,kCAAkC;AAiDlC,8CAA8C;AAC9C,MAAM,OAAO,uBAAuB;IAClB,eAAe,CAAkB;IACjC,aAAa,CAAiB;IAC9B,cAAc,CAAU;IACxB,cAAc,CAAU;IACxB,UAAU,CAAW;IACrB,YAAY,CAAS;IACrB,0BAA0B,CAAS;IACnC,2BAA2B,CAAS;IACpC,8BAA8B,CAAS;IACvC,kBAAkB,CAAS;IAE3C,YAAY,OAAiC;QAC3C,IAAI,CAAC,eAAe,GAAG,OAAO,EAAE,eAAe,IAAI,MAAM,CAAC;QAC1D,IAAI,CAAC,aAAa,GAAG,OAAO,EAAE,aAAa,CAAC;QAC5C,IAAI,CAAC,cAAc,GAAG,OAAO,EAAE,cAAc,IAAI,KAAK,CAAC;QACvD,IAAI,CAAC,cAAc,GAAG,OAAO,EAAE,cAAc,CAAC;QAC9C,IAAI,CAAC,UAAU,GAAG,OAAO,EAAE,UAAU,IAAI,CAAC,wCAAwC,CAAC,CAAC;QACpF,IAAI,CAAC,YAAY,GAAG,OAAO,EAAE,YAAY,IAAI,IAAI,CAAC;QAClD,IAAI,CAAC,0BAA0B,GAAG,OAAO,EAAE,0BAA0B,IAAI,IAAI,CAAC;QAC9E,IAAI,CAAC,2BAA2B,GAAG,OAAO,EAAE,2BAA2B,IAAI,KAAK,CAAC;QACjF,IAAI,CAAC,8BAA8B,GAAG,OAAO,EAAE,8BAA8B,IAAI,KAAK,CAAC;QACvF,IAAI,CAAC,kBAAkB,GAAG,OAAO,EAAE,kBAAkB,IAAI,GAAG,CAAC;IAC/D,CAAC;CACF"}
|
package/dist/esm/a365/index.d.ts
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
export { A365Configuration, A365_ENV_VARS } from "./configuration/index.js";
|
|
2
|
-
export type { A365Options, ClusterCategory, A365BaggageOptions, A365HostingOptions, } from "./configuration/index.js";
|
|
2
|
+
export type { A365Options, ClusterCategory, A365BaggageOptions, A365HostingOptions, ILogger, } from "./configuration/index.js";
|
|
3
|
+
export { configureA365Logger, getA365Logger } from "./logging.js";
|
|
3
4
|
export { Agent365Exporter } from "./exporter/index.js";
|
|
4
5
|
export type { Agent365ExporterOptions, TokenResolver } from "./exporter/index.js";
|
|
5
6
|
export { ResolvedExporterOptions } from "./exporter/index.js";
|
|
@@ -10,8 +11,7 @@ export type { ChatMessage, InputMessages, OutputMessage, OutputMessages, InputMe
|
|
|
10
11
|
export { isParentSpanRef, createContextWithParentSpanRef, runWithParentSpanRef, injectContextToHeaders, extractContextFromHeaders, runWithExtractedTraceContext, } from "./context.js";
|
|
11
12
|
export type { HeadersCarrier } from "./context.js";
|
|
12
13
|
export { BaggageBuilder, BaggageScope } from "./middleware/index.js";
|
|
13
|
-
export { A365SpanProcessor,
|
|
14
|
-
export type { PerRequestSpanProcessorOptions } from "./processors/index.js";
|
|
14
|
+
export { A365SpanProcessor, GENERIC_ATTRIBUTES, INVOKE_AGENT_ATTRIBUTES, } from "./processors/index.js";
|
|
15
15
|
export { runWithExportToken, updateExportToken, getExportToken } from "./context/tokenContext.js";
|
|
16
16
|
export { BaggageBuilderUtils, ScopeUtils, getCallerBaggagePairs, getTargetAgentBaggagePairs, getTenantIdPair, getChannelBaggagePairs, getConversationIdAndItemLinkPairs, resolveEmbodiedAgentIds, BaggageMiddleware, OutputLoggingMiddleware, A365_PARENT_SPAN_KEY, A365_AUTH_TOKEN_KEY, ObservabilityHostingManager, } from "./hosting/index.js";
|
|
17
17
|
export type { ObservabilityHostingOptions, TurnContextLike, ActivityLike, MiddlewareLike, SendActivitiesHandler, } from "./hosting/index.js";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/a365/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,iBAAiB,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAC5E,YAAY,EACV,WAAW,EACX,eAAe,EACf,kBAAkB,EAClB,kBAAkB,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/a365/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,iBAAiB,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAC5E,YAAY,EACV,WAAW,EACX,eAAe,EACf,kBAAkB,EAClB,kBAAkB,EAClB,OAAO,GACR,MAAM,0BAA0B,CAAC;AAElC,OAAO,EAAE,mBAAmB,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAElE,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACvD,YAAY,EAAE,uBAAuB,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAClF,OAAO,EAAE,uBAAuB,EAAE,MAAM,qBAAqB,CAAC;AAG9D,OAAO,EACL,kBAAkB,EAClB,gBAAgB,EAChB,gBAAgB,EAChB,cAAc,EACd,WAAW,GACZ,MAAM,mBAAmB,CAAC;AAG3B,OAAO,EAAE,sBAAsB,EAAE,MAAM,gBAAgB,CAAC;AAGxD,OAAO,EACL,WAAW,EACX,YAAY,EACZ,QAAQ,EACR,cAAc,EACd,sBAAsB,EACtB,2BAA2B,GAC5B,MAAM,gBAAgB,CAAC;AACxB,YAAY,EACV,WAAW,EACX,aAAa,EACb,aAAa,EACb,cAAc,EACd,kBAAkB,EAClB,mBAAmB,EACnB,qBAAqB,EACrB,WAAW,EACX,QAAQ,EACR,mBAAmB,EACnB,oBAAoB,EACpB,aAAa,EACb,YAAY,EACZ,WAAW,EACX,aAAa,EACb,OAAO,EACP,OAAO,EACP,eAAe,EACf,uBAAuB,EACvB,eAAe,EACf,gBAAgB,EAChB,iBAAiB,EACjB,cAAc,EACd,WAAW,EACX,aAAa,EACb,aAAa,GACd,MAAM,gBAAgB,CAAC;AAGxB,OAAO,EACL,eAAe,EACf,8BAA8B,EAC9B,oBAAoB,EACpB,sBAAsB,EACtB,yBAAyB,EACzB,4BAA4B,GAC7B,MAAM,cAAc,CAAC;AACtB,YAAY,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAGnD,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAGrE,OAAO,EACL,iBAAiB,EACjB,kBAAkB,EAClB,uBAAuB,GACxB,MAAM,uBAAuB,CAAC;AAG/B,OAAO,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAGlG,OAAO,EACL,mBAAmB,EACnB,UAAU,EACV,qBAAqB,EACrB,0BAA0B,EAC1B,eAAe,EACf,sBAAsB,EACtB,iCAAiC,EACjC,uBAAuB,EACvB,iBAAiB,EACjB,uBAAuB,EACvB,oBAAoB,EACpB,mBAAmB,EACnB,2BAA2B,GAC5B,MAAM,oBAAoB,CAAC;AAC5B,YAAY,EACV,2BAA2B,EAC3B,eAAe,EACf,YAAY,EACZ,cAAc,EACd,qBAAqB,GACtB,MAAM,oBAAoB,CAAC"}
|
package/dist/esm/a365/index.js
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
// Copyright (c) Microsoft Corporation.
|
|
2
2
|
// Licensed under the MIT License.
|
|
3
3
|
export { A365Configuration, A365_ENV_VARS } from "./configuration/index.js";
|
|
4
|
+
export { configureA365Logger, getA365Logger } from "./logging.js";
|
|
4
5
|
export { Agent365Exporter } from "./exporter/index.js";
|
|
5
6
|
export { ResolvedExporterOptions } from "./exporter/index.js";
|
|
6
7
|
// ── Scopes (manual telemetry API) ───────────────────────────────────────────
|
|
@@ -14,7 +15,7 @@ export { isParentSpanRef, createContextWithParentSpanRef, runWithParentSpanRef,
|
|
|
14
15
|
// ── Middleware (BaggageBuilder) ──────────────────────────────────────────────
|
|
15
16
|
export { BaggageBuilder, BaggageScope } from "./middleware/index.js";
|
|
16
17
|
// ── Processors ──────────────────────────────────────────────────────────────
|
|
17
|
-
export { A365SpanProcessor,
|
|
18
|
+
export { A365SpanProcessor, GENERIC_ATTRIBUTES, INVOKE_AGENT_ATTRIBUTES, } from "./processors/index.js";
|
|
18
19
|
// ── Token context ───────────────────────────────────────────────────────────
|
|
19
20
|
export { runWithExportToken, updateExportToken, getExportToken } from "./context/tokenContext.js";
|
|
20
21
|
// ── Hosting utilities ───────────────────────────────────────────────────────
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/a365/index.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,kCAAkC;AAElC,OAAO,EAAE,iBAAiB,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/a365/index.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,kCAAkC;AAElC,OAAO,EAAE,iBAAiB,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAS5E,OAAO,EAAE,mBAAmB,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAElE,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAEvD,OAAO,EAAE,uBAAuB,EAAE,MAAM,qBAAqB,CAAC;AAE9D,+EAA+E;AAC/E,OAAO,EACL,kBAAkB,EAClB,gBAAgB,EAChB,gBAAgB,EAChB,cAAc,EACd,WAAW,GACZ,MAAM,mBAAmB,CAAC;AAE3B,+EAA+E;AAC/E,OAAO,EAAE,sBAAsB,EAAE,MAAM,gBAAgB,CAAC;AAExD,+EAA+E;AAC/E,OAAO,EACL,WAAW,EACX,YAAY,EACZ,QAAQ,EACR,cAAc,EACd,sBAAsB,EACtB,2BAA2B,GAC5B,MAAM,gBAAgB,CAAC;AA8BxB,+EAA+E;AAC/E,OAAO,EACL,eAAe,EACf,8BAA8B,EAC9B,oBAAoB,EACpB,sBAAsB,EACtB,yBAAyB,EACzB,4BAA4B,GAC7B,MAAM,cAAc,CAAC;AAGtB,gFAAgF;AAChF,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAErE,+EAA+E;AAC/E,OAAO,EACL,iBAAiB,EACjB,kBAAkB,EAClB,uBAAuB,GACxB,MAAM,uBAAuB,CAAC;AAE/B,+EAA+E;AAC/E,OAAO,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAElG,+EAA+E;AAC/E,OAAO,EACL,mBAAmB,EACnB,UAAU,EACV,qBAAqB,EACrB,0BAA0B,EAC1B,eAAe,EACf,sBAAsB,EACtB,iCAAiC,EACjC,uBAAuB,EACvB,iBAAiB,EACjB,uBAAuB,EACvB,oBAAoB,EACpB,mBAAmB,EACnB,2BAA2B,GAC5B,MAAM,oBAAoB,CAAC"}
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
/** Logger contract for A365 internals. */
|
|
2
|
+
export interface ILogger {
|
|
3
|
+
info(message: string, ...args: unknown[]): void;
|
|
4
|
+
warn(message: string, ...args: unknown[]): void;
|
|
5
|
+
error(message: string, ...args: unknown[]): void;
|
|
6
|
+
}
|
|
7
|
+
/** Configure the global A365 logger and optional log level filter. */
|
|
8
|
+
export declare function configureA365Logger(options?: {
|
|
9
|
+
logger?: ILogger;
|
|
10
|
+
logLevel?: string;
|
|
11
|
+
}): void;
|
|
12
|
+
/** Returns an A365 logger wrapper that applies the configured log level filter. */
|
|
13
|
+
export declare function getA365Logger(): ILogger;
|
|
14
|
+
/** @internal Reset A365 logging globals (used by tests). */
|
|
15
|
+
export declare function _resetA365LoggerForTest(): void;
|
|
16
|
+
//# sourceMappingURL=logging.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"logging.d.ts","sourceRoot":"","sources":["../../../src/a365/logging.ts"],"names":[],"mappings":"AAKA,0CAA0C;AAC1C,MAAM,WAAW,OAAO;IACtB,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC;IAChD,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC;IAChD,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC;CAClD;AA+CD,sEAAsE;AACtE,wBAAgB,mBAAmB,CAAC,OAAO,CAAC,EAAE;IAAE,MAAM,CAAC,EAAE,OAAO,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAQ3F;AAED,mFAAmF;AACnF,wBAAgB,aAAa,IAAI,OAAO,CAqBvC;AAED,4DAA4D;AAC5D,wBAAgB,uBAAuB,IAAI,IAAI,CAG9C"}
|