@openai/agents-core 0.0.16 → 0.1.0
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/agent.d.ts +5 -3
- package/dist/agent.js +46 -23
- package/dist/agent.js.map +1 -1
- package/dist/agent.mjs +17 -1
- package/dist/agent.mjs.map +1 -1
- package/dist/computer.js +2 -1
- package/dist/config.js +12 -6
- package/dist/config.js.map +1 -1
- package/dist/defaultModel.d.ts +22 -0
- package/dist/defaultModel.js +56 -0
- package/dist/defaultModel.js.map +1 -0
- package/dist/defaultModel.mjs +49 -0
- package/dist/defaultModel.mjs.map +1 -0
- package/dist/errors.js +21 -9
- package/dist/errors.js.map +1 -1
- package/dist/events.js +9 -3
- package/dist/events.js.map +1 -1
- package/dist/extensions/handoffFilters.js +9 -6
- package/dist/extensions/handoffFilters.js.map +1 -1
- package/dist/extensions/handoffPrompt.js +7 -3
- package/dist/extensions/handoffPrompt.js.map +1 -1
- package/dist/extensions/index.js +8 -2
- package/dist/extensions/index.js.map +1 -1
- package/dist/guardrail.js +6 -2
- package/dist/guardrail.js.map +1 -1
- package/dist/handoff.js +28 -18
- package/dist/handoff.js.map +1 -1
- package/dist/helpers/message.js +8 -3
- package/dist/helpers/message.js.map +1 -1
- package/dist/index.d.ts +1 -0
- package/dist/index.js +127 -25
- package/dist/index.js.map +1 -1
- package/dist/index.mjs +1 -0
- package/dist/index.mjs.map +1 -1
- package/dist/items.js +23 -11
- package/dist/items.js.map +1 -1
- package/dist/lifecycle.js +12 -6
- package/dist/lifecycle.js.map +1 -1
- package/dist/logger.js +15 -8
- package/dist/logger.js.map +1 -1
- package/dist/mcp.d.ts +1 -1
- package/dist/mcp.js +60 -45
- package/dist/mcp.js.map +1 -1
- package/dist/mcp.mjs +1 -1
- package/dist/mcp.mjs.map +1 -1
- package/dist/mcpUtil.js +4 -1
- package/dist/mcpUtil.js.map +1 -1
- package/dist/metadata.d.ts +0 -1
- package/dist/metadata.js +8 -6
- package/dist/metadata.js.map +1 -1
- package/dist/metadata.mjs +3 -4
- package/dist/metadata.mjs.map +1 -1
- package/dist/model.d.ts +7 -0
- package/dist/model.js +2 -1
- package/dist/providers.js +6 -2
- package/dist/providers.js.map +1 -1
- package/dist/result.js +22 -14
- package/dist/result.js.map +1 -1
- package/dist/run.d.ts +1 -0
- package/dist/run.js +145 -95
- package/dist/run.js.map +1 -1
- package/dist/run.mjs +39 -0
- package/dist/run.mjs.map +1 -1
- package/dist/runContext.d.ts +1 -1
- package/dist/runContext.js +14 -7
- package/dist/runContext.js.map +1 -1
- package/dist/runContext.mjs +1 -1
- package/dist/runImplementation.d.ts +1 -1
- package/dist/runImplementation.js +107 -90
- package/dist/runImplementation.js.map +1 -1
- package/dist/runImplementation.mjs +2 -2
- package/dist/runImplementation.mjs.map +1 -1
- package/dist/runState.d.ts +7 -1
- package/dist/runState.js +204 -151
- package/dist/runState.js.map +1 -1
- package/dist/runState.mjs +10 -1
- package/dist/runState.mjs.map +1 -1
- package/dist/shims/interface.js +2 -1
- package/dist/shims/mcp-server/browser.js +10 -4
- package/dist/shims/mcp-server/browser.js.map +1 -1
- package/dist/shims/mcp-server/node.js +67 -25
- package/dist/shims/mcp-server/node.js.map +1 -1
- package/dist/shims/shims-browser.js +25 -13
- package/dist/shims/shims-browser.js.map +1 -1
- package/dist/shims/shims-node.js +72 -15
- package/dist/shims/shims-node.js.map +1 -1
- package/dist/shims/shims-node.mjs +11 -3
- package/dist/shims/shims-node.mjs.map +1 -1
- package/dist/shims/shims-workerd.js +77 -18
- package/dist/shims/shims-workerd.js.map +1 -1
- package/dist/shims/shims-workerd.mjs +11 -3
- package/dist/shims/shims-workerd.mjs.map +1 -1
- package/dist/shims/shims.js +17 -1
- package/dist/shims/shims.js.map +1 -1
- package/dist/tool.d.ts +11 -4
- package/dist/tool.js +121 -54
- package/dist/tool.js.map +1 -1
- package/dist/tool.mjs +84 -25
- package/dist/tool.mjs.map +1 -1
- package/dist/tracing/context.js +25 -14
- package/dist/tracing/context.js.map +1 -1
- package/dist/tracing/createSpans.js +52 -38
- package/dist/tracing/createSpans.js.map +1 -1
- package/dist/tracing/index.js +51 -15
- package/dist/tracing/index.js.map +1 -1
- package/dist/tracing/processor.js +32 -21
- package/dist/tracing/processor.js.map +1 -1
- package/dist/tracing/processor.mjs +1 -1
- package/dist/tracing/processor.mjs.map +1 -1
- package/dist/tracing/provider.js +53 -45
- package/dist/tracing/provider.js.map +1 -1
- package/dist/tracing/spans.js +18 -10
- package/dist/tracing/spans.js.map +1 -1
- package/dist/tracing/traces.js +11 -6
- package/dist/tracing/traces.js.map +1 -1
- package/dist/tracing/utils.js +16 -9
- package/dist/tracing/utils.js.map +1 -1
- package/dist/types/aliases.js +2 -1
- package/dist/types/helpers.d.ts +1 -1
- package/dist/types/helpers.js +2 -1
- package/dist/types/index.js +44 -5
- package/dist/types/index.js.map +1 -1
- package/dist/types/protocol.d.ts +1 -1
- package/dist/types/protocol.js +188 -185
- package/dist/types/protocol.js.map +1 -1
- package/dist/types/protocol.mjs +1 -1
- package/dist/types/protocol.mjs.map +1 -1
- package/dist/types/providerData.d.ts +11 -3
- package/dist/types/providerData.js +2 -1
- package/dist/usage.js +7 -3
- package/dist/usage.js.map +1 -1
- package/dist/utils/index.js +9 -3
- package/dist/utils/index.js.map +1 -1
- package/dist/utils/messages.js +6 -2
- package/dist/utils/messages.js.map +1 -1
- package/dist/utils/safeExecute.js +4 -1
- package/dist/utils/safeExecute.js.map +1 -1
- package/dist/utils/serialize.js +6 -2
- package/dist/utils/serialize.js.map +1 -1
- package/dist/utils/smartString.js +4 -1
- package/dist/utils/smartString.js.map +1 -1
- package/dist/utils/tools.js +16 -11
- package/dist/utils/tools.js.map +1 -1
- package/dist/utils/typeGuards.d.ts +1 -1
- package/dist/utils/typeGuards.js +6 -2
- package/dist/utils/typeGuards.js.map +1 -1
- package/package.json +24 -43
|
@@ -1,18 +1,26 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.MultiTracingProcessor = exports.BatchTraceProcessor = exports.ConsoleSpanExporter = void 0;
|
|
7
|
+
exports.defaultExporter = defaultExporter;
|
|
8
|
+
exports.defaultProcessor = defaultProcessor;
|
|
9
|
+
const logger_1 = __importDefault(require("../logger.js"));
|
|
10
|
+
const _shims_1 = require("@openai/agents-core/_shims");
|
|
11
|
+
const config_1 = require("../config.js");
|
|
4
12
|
/**
|
|
5
13
|
* Prints the traces and spans to the console
|
|
6
14
|
*/
|
|
7
|
-
|
|
15
|
+
class ConsoleSpanExporter {
|
|
8
16
|
async export(items) {
|
|
9
|
-
if (tracing.disabled) {
|
|
10
|
-
|
|
17
|
+
if (config_1.tracing.disabled) {
|
|
18
|
+
logger_1.default.debug('Tracing is disabled. Skipping export');
|
|
11
19
|
return;
|
|
12
20
|
}
|
|
13
21
|
for (const item of items) {
|
|
14
22
|
if (item.type === 'trace') {
|
|
15
|
-
console.log(`[Exporter] Export trace traceId=${item.traceId} name=${item.name}`);
|
|
23
|
+
console.log(`[Exporter] Export trace traceId=${item.traceId} name=${item.name}${item.groupId ? ` groupId=${item.groupId}` : ''}`);
|
|
16
24
|
}
|
|
17
25
|
else {
|
|
18
26
|
console.log(`[Exporter] Export span: ${JSON.stringify(item)}`);
|
|
@@ -20,7 +28,8 @@ export class ConsoleSpanExporter {
|
|
|
20
28
|
}
|
|
21
29
|
}
|
|
22
30
|
}
|
|
23
|
-
|
|
31
|
+
exports.ConsoleSpanExporter = ConsoleSpanExporter;
|
|
32
|
+
class BatchTraceProcessor {
|
|
24
33
|
#maxQueueSize;
|
|
25
34
|
#maxBatchSize;
|
|
26
35
|
#scheduleDelay;
|
|
@@ -38,12 +47,12 @@ export class BatchTraceProcessor {
|
|
|
38
47
|
this.#scheduleDelay = scheduleDelay;
|
|
39
48
|
this.#exportTriggerSize = maxQueueSize * exportTriggerRatio;
|
|
40
49
|
this.#exporter = exporter;
|
|
41
|
-
this.#timer =
|
|
42
|
-
if (isTracingLoopRunningByDefault()) {
|
|
50
|
+
this.#timer = _shims_1.timer;
|
|
51
|
+
if ((0, _shims_1.isTracingLoopRunningByDefault)()) {
|
|
43
52
|
this.start();
|
|
44
53
|
}
|
|
45
54
|
else {
|
|
46
|
-
|
|
55
|
+
logger_1.default.debug('Automatic trace export loop is not supported in this environment. You need to manually call `getGlobalTraceProvider().forceFlush()` to export traces.');
|
|
47
56
|
}
|
|
48
57
|
}
|
|
49
58
|
start() {
|
|
@@ -52,7 +61,7 @@ export class BatchTraceProcessor {
|
|
|
52
61
|
}
|
|
53
62
|
async #safeAddItem(item) {
|
|
54
63
|
if (this.#buffer.length + 1 > this.#maxQueueSize) {
|
|
55
|
-
|
|
64
|
+
logger_1.default.error('Dropping trace because buffer is full');
|
|
56
65
|
return;
|
|
57
66
|
}
|
|
58
67
|
// add the item to the buffer
|
|
@@ -78,7 +87,7 @@ export class BatchTraceProcessor {
|
|
|
78
87
|
if (this.#buffer.length === 0) {
|
|
79
88
|
return;
|
|
80
89
|
}
|
|
81
|
-
|
|
90
|
+
logger_1.default.debug(`Exporting batches. Force: ${force}. Buffer size: ${this.#buffer.length}`);
|
|
82
91
|
if (force || this.#buffer.length < this.#maxBatchSize) {
|
|
83
92
|
const toExport = [...this.#buffer];
|
|
84
93
|
this.#buffer = [];
|
|
@@ -112,22 +121,22 @@ export class BatchTraceProcessor {
|
|
|
112
121
|
this.#timeoutAbortController?.abort();
|
|
113
122
|
}, timeout);
|
|
114
123
|
}
|
|
115
|
-
|
|
124
|
+
logger_1.default.debug('Shutting down gracefully');
|
|
116
125
|
while (this.#buffer.length > 0) {
|
|
117
|
-
|
|
126
|
+
logger_1.default.debug(`Waiting for buffer to empty. Items left: ${this.#buffer.length}`);
|
|
118
127
|
if (!this.#exportInProgress) {
|
|
119
128
|
// no current export in progress. Forcing all items to be exported
|
|
120
129
|
await this.#exportBatches(true);
|
|
121
130
|
}
|
|
122
131
|
if (this.#timeoutAbortController?.signal.aborted) {
|
|
123
|
-
|
|
132
|
+
logger_1.default.debug('Timeout reached, force flushing');
|
|
124
133
|
await this.#exportBatches(true);
|
|
125
134
|
break;
|
|
126
135
|
}
|
|
127
136
|
// using setTimeout to add to the event loop and keep this alive until done
|
|
128
137
|
await new Promise((resolve) => this.#timer.setTimeout(resolve, 500));
|
|
129
138
|
}
|
|
130
|
-
|
|
139
|
+
logger_1.default.debug('Buffer empty. Exiting');
|
|
131
140
|
if (this.#timer && this.#timeout) {
|
|
132
141
|
// making sure there are no more requests
|
|
133
142
|
this.#timer.clearTimeout(this.#timeout);
|
|
@@ -139,7 +148,8 @@ export class BatchTraceProcessor {
|
|
|
139
148
|
}
|
|
140
149
|
}
|
|
141
150
|
}
|
|
142
|
-
|
|
151
|
+
exports.BatchTraceProcessor = BatchTraceProcessor;
|
|
152
|
+
class MultiTracingProcessor {
|
|
143
153
|
#processors = [];
|
|
144
154
|
start() {
|
|
145
155
|
for (const processor of this.#processors) {
|
|
@@ -152,7 +162,7 @@ export class MultiTracingProcessor {
|
|
|
152
162
|
this.#processors.push(processor);
|
|
153
163
|
}
|
|
154
164
|
setProcessors(processors) {
|
|
155
|
-
|
|
165
|
+
logger_1.default.debug('Shutting down old processors');
|
|
156
166
|
for (const processor of this.#processors) {
|
|
157
167
|
processor.shutdown();
|
|
158
168
|
}
|
|
@@ -189,15 +199,16 @@ export class MultiTracingProcessor {
|
|
|
189
199
|
}
|
|
190
200
|
}
|
|
191
201
|
}
|
|
202
|
+
exports.MultiTracingProcessor = MultiTracingProcessor;
|
|
192
203
|
let _defaultExporter = null;
|
|
193
204
|
let _defaultProcessor = null;
|
|
194
|
-
|
|
205
|
+
function defaultExporter() {
|
|
195
206
|
if (!_defaultExporter) {
|
|
196
207
|
_defaultExporter = new ConsoleSpanExporter();
|
|
197
208
|
}
|
|
198
209
|
return _defaultExporter;
|
|
199
210
|
}
|
|
200
|
-
|
|
211
|
+
function defaultProcessor() {
|
|
201
212
|
if (!_defaultProcessor) {
|
|
202
213
|
_defaultProcessor = new BatchTraceProcessor(defaultExporter());
|
|
203
214
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"processor.js","sourceRoot":"","sources":["../../src/tracing/processor.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"processor.js","sourceRoot":"","sources":["../../src/tracing/processor.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,7 +12,7 @@ export class ConsoleSpanExporter {
|
|
|
12
12
|
}
|
|
13
13
|
for (const item of items) {
|
|
14
14
|
if (item.type === 'trace') {
|
|
15
|
-
console.log(`[Exporter] Export trace traceId=${item.traceId} name=${item.name}`);
|
|
15
|
+
console.log(`[Exporter] Export trace traceId=${item.traceId} name=${item.name}${item.groupId ? ` groupId=${item.groupId}` : ''}`);
|
|
16
16
|
}
|
|
17
17
|
else {
|
|
18
18
|
console.log(`[Exporter] Export span: ${JSON.stringify(item)}`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"processor.mjs","sourceRoot":"","sources":["../../src/tracing/processor.ts"],"names":[],"mappings":"OAEO,MAAM;OACN,EACL,KAAK,IAAI,MAAM,EACf,6BAA6B,GAC9B,MAAM,4BAA4B;OAE5B,EAAE,OAAO,EAAE;AAyDlB;;GAEG;AACH,MAAM,OAAO,mBAAmB;IAC9B,KAAK,CAAC,MAAM,CAAC,KAAuB;QAClC,IAAI,OAAO,CAAC,QAAQ,EAAE,CAAC;YACrB,MAAM,CAAC,KAAK,CAAC,sCAAsC,CAAC,CAAC;YACrD,OAAO;QACT,CAAC;QAED,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;YACzB,IAAI,IAAI,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;gBAC1B,OAAO,CAAC,GAAG,CACT,mCAAmC,IAAI,CAAC,OAAO,SAAS,IAAI,CAAC,IAAI,EAAE,
|
|
1
|
+
{"version":3,"file":"processor.mjs","sourceRoot":"","sources":["../../src/tracing/processor.ts"],"names":[],"mappings":"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"}
|
package/dist/tracing/provider.js
CHANGED
|
@@ -1,16 +1,23 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.TraceProvider = void 0;
|
|
7
|
+
exports.getGlobalTraceProvider = getGlobalTraceProvider;
|
|
8
|
+
const context_1 = require("./context.js");
|
|
9
|
+
const config_1 = require("../config.js");
|
|
10
|
+
const logger_1 = __importDefault(require("../logger.js"));
|
|
11
|
+
const processor_1 = require("./processor.js");
|
|
12
|
+
const spans_1 = require("./spans.js");
|
|
13
|
+
const traces_1 = require("./traces.js");
|
|
14
|
+
const utils_1 = require("./utils.js");
|
|
15
|
+
class TraceProvider {
|
|
9
16
|
#multiProcessor;
|
|
10
17
|
#disabled;
|
|
11
18
|
constructor() {
|
|
12
|
-
this.#multiProcessor = new MultiTracingProcessor();
|
|
13
|
-
this.#disabled = tracing.disabled;
|
|
19
|
+
this.#multiProcessor = new processor_1.MultiTracingProcessor();
|
|
20
|
+
this.#disabled = config_1.tracing.disabled;
|
|
14
21
|
this.#addCleanupListeners();
|
|
15
22
|
}
|
|
16
23
|
/**
|
|
@@ -35,10 +42,10 @@ export class TraceProvider {
|
|
|
35
42
|
* @returns The current trace.
|
|
36
43
|
*/
|
|
37
44
|
getCurrentTrace() {
|
|
38
|
-
return getCurrentTrace();
|
|
45
|
+
return (0, context_1.getCurrentTrace)();
|
|
39
46
|
}
|
|
40
47
|
getCurrentSpan() {
|
|
41
|
-
return getCurrentSpan();
|
|
48
|
+
return (0, context_1.getCurrentSpan)();
|
|
42
49
|
}
|
|
43
50
|
setDisabled(disabled) {
|
|
44
51
|
this.#disabled = disabled;
|
|
@@ -48,63 +55,63 @@ export class TraceProvider {
|
|
|
48
55
|
}
|
|
49
56
|
createTrace(traceOptions) {
|
|
50
57
|
if (this.#disabled) {
|
|
51
|
-
|
|
52
|
-
return new NoopTrace();
|
|
58
|
+
logger_1.default.debug('Tracing is disabled, Not creating trace %o', traceOptions);
|
|
59
|
+
return new traces_1.NoopTrace();
|
|
53
60
|
}
|
|
54
|
-
const traceId = traceOptions.traceId ?? generateTraceId();
|
|
61
|
+
const traceId = traceOptions.traceId ?? (0, utils_1.generateTraceId)();
|
|
55
62
|
const name = traceOptions.name ?? 'Agent workflow';
|
|
56
|
-
|
|
57
|
-
return new Trace({ ...traceOptions, name, traceId }, this.#multiProcessor);
|
|
63
|
+
logger_1.default.debug('Creating trace %s with name %s', traceId, name);
|
|
64
|
+
return new traces_1.Trace({ ...traceOptions, name, traceId }, this.#multiProcessor);
|
|
58
65
|
}
|
|
59
66
|
createSpan(spanOptions, parent) {
|
|
60
67
|
if (this.#disabled || spanOptions.disabled) {
|
|
61
|
-
|
|
62
|
-
return new NoopSpan(spanOptions.data, this.#multiProcessor);
|
|
68
|
+
logger_1.default.debug('Tracing is disabled, Not creating span %o', spanOptions);
|
|
69
|
+
return new spans_1.NoopSpan(spanOptions.data, this.#multiProcessor);
|
|
63
70
|
}
|
|
64
71
|
let parentId;
|
|
65
72
|
let traceId;
|
|
66
73
|
if (!parent) {
|
|
67
|
-
const currentTrace = getCurrentTrace();
|
|
68
|
-
const currentSpan = getCurrentSpan();
|
|
74
|
+
const currentTrace = (0, context_1.getCurrentTrace)();
|
|
75
|
+
const currentSpan = (0, context_1.getCurrentSpan)();
|
|
69
76
|
if (!currentTrace) {
|
|
70
|
-
|
|
71
|
-
return new NoopSpan(spanOptions.data, this.#multiProcessor);
|
|
77
|
+
logger_1.default.error('No active trace. Make sure to start a trace with `withTrace()` first. Returning NoopSpan.');
|
|
78
|
+
return new spans_1.NoopSpan(spanOptions.data, this.#multiProcessor);
|
|
72
79
|
}
|
|
73
|
-
if (currentSpan instanceof NoopSpan ||
|
|
74
|
-
currentTrace instanceof NoopTrace) {
|
|
75
|
-
|
|
76
|
-
return new NoopSpan(spanOptions.data, this.#multiProcessor);
|
|
80
|
+
if (currentSpan instanceof spans_1.NoopSpan ||
|
|
81
|
+
currentTrace instanceof traces_1.NoopTrace) {
|
|
82
|
+
logger_1.default.debug(`Parent ${currentSpan} or ${currentTrace} is no-op, returning NoopSpan`);
|
|
83
|
+
return new spans_1.NoopSpan(spanOptions.data, this.#multiProcessor);
|
|
77
84
|
}
|
|
78
85
|
traceId = currentTrace.traceId;
|
|
79
86
|
if (currentSpan) {
|
|
80
|
-
|
|
87
|
+
logger_1.default.debug('Using parent span %s', currentSpan.spanId);
|
|
81
88
|
parentId = currentSpan.spanId;
|
|
82
89
|
}
|
|
83
90
|
else {
|
|
84
|
-
|
|
91
|
+
logger_1.default.debug('No parent span, using current trace %s', currentTrace.traceId);
|
|
85
92
|
}
|
|
86
93
|
}
|
|
87
|
-
else if (parent instanceof Trace) {
|
|
88
|
-
if (parent instanceof NoopTrace) {
|
|
89
|
-
|
|
90
|
-
return new NoopSpan(spanOptions.data, this.#multiProcessor);
|
|
94
|
+
else if (parent instanceof traces_1.Trace) {
|
|
95
|
+
if (parent instanceof traces_1.NoopTrace) {
|
|
96
|
+
logger_1.default.debug('Parent trace is no-op, returning NoopSpan');
|
|
97
|
+
return new spans_1.NoopSpan(spanOptions.data, this.#multiProcessor);
|
|
91
98
|
}
|
|
92
99
|
traceId = parent.traceId;
|
|
93
100
|
}
|
|
94
|
-
else if (parent instanceof Span) {
|
|
95
|
-
if (parent instanceof NoopSpan) {
|
|
96
|
-
|
|
97
|
-
return new NoopSpan(spanOptions.data, this.#multiProcessor);
|
|
101
|
+
else if (parent instanceof spans_1.Span) {
|
|
102
|
+
if (parent instanceof spans_1.NoopSpan) {
|
|
103
|
+
logger_1.default.debug('Parent span is no-op, returning NoopSpan');
|
|
104
|
+
return new spans_1.NoopSpan(spanOptions.data, this.#multiProcessor);
|
|
98
105
|
}
|
|
99
106
|
parentId = parent.spanId;
|
|
100
107
|
traceId = parent.traceId;
|
|
101
108
|
}
|
|
102
109
|
if (!traceId) {
|
|
103
|
-
|
|
104
|
-
return new NoopSpan(spanOptions.data, this.#multiProcessor);
|
|
110
|
+
logger_1.default.error('No traceId found. Make sure to start a trace with `withTrace()` first. Returning NoopSpan.');
|
|
111
|
+
return new spans_1.NoopSpan(spanOptions.data, this.#multiProcessor);
|
|
105
112
|
}
|
|
106
|
-
|
|
107
|
-
return new Span({
|
|
113
|
+
logger_1.default.debug(`Creating span ${JSON.stringify(spanOptions.data)} with id ${spanOptions.spanId ?? traceId}`);
|
|
114
|
+
return new spans_1.Span({
|
|
108
115
|
...spanOptions,
|
|
109
116
|
traceId,
|
|
110
117
|
parentId,
|
|
@@ -112,11 +119,11 @@ export class TraceProvider {
|
|
|
112
119
|
}
|
|
113
120
|
async shutdown(timeout) {
|
|
114
121
|
try {
|
|
115
|
-
|
|
122
|
+
logger_1.default.debug('Shutting down tracing provider');
|
|
116
123
|
await this.#multiProcessor.shutdown(timeout);
|
|
117
124
|
}
|
|
118
125
|
catch (error) {
|
|
119
|
-
|
|
126
|
+
logger_1.default.error('Error shutting down tracing provider %o', error);
|
|
120
127
|
}
|
|
121
128
|
}
|
|
122
129
|
/** Adds listeners to `process` to ensure `shutdown` occurs before exit. */
|
|
@@ -154,7 +161,7 @@ export class TraceProvider {
|
|
|
154
161
|
}
|
|
155
162
|
});
|
|
156
163
|
process.on('unhandledRejection', async (reason, promise) => {
|
|
157
|
-
|
|
164
|
+
logger_1.default.error('Unhandled rejection', reason, promise);
|
|
158
165
|
await cleanup();
|
|
159
166
|
if (!hasOtherListenersForEvents('unhandledRejection')) {
|
|
160
167
|
// Only when there are no other listeners, exit the process on this SDK side
|
|
@@ -167,6 +174,7 @@ export class TraceProvider {
|
|
|
167
174
|
await this.#multiProcessor.forceFlush();
|
|
168
175
|
}
|
|
169
176
|
}
|
|
177
|
+
exports.TraceProvider = TraceProvider;
|
|
170
178
|
function hasOtherListenersForSignals(event) {
|
|
171
179
|
return process.listeners(event).length > 1;
|
|
172
180
|
}
|
|
@@ -174,7 +182,7 @@ function hasOtherListenersForEvents(event) {
|
|
|
174
182
|
return process.listeners(event).length > 1;
|
|
175
183
|
}
|
|
176
184
|
let GLOBAL_TRACE_PROVIDER = undefined;
|
|
177
|
-
|
|
185
|
+
function getGlobalTraceProvider() {
|
|
178
186
|
if (!GLOBAL_TRACE_PROVIDER) {
|
|
179
187
|
GLOBAL_TRACE_PROVIDER = new TraceProvider();
|
|
180
188
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"provider.js","sourceRoot":"","sources":["../../src/tracing/provider.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"provider.js","sourceRoot":"","sources":["../../src/tracing/provider.ts"],"names":[],"mappings":"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"}
|
package/dist/tracing/spans.js
CHANGED
|
@@ -1,6 +1,12 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.NoopSpan = exports.Span = void 0;
|
|
7
|
+
const logger_1 = __importDefault(require("../logger.js"));
|
|
8
|
+
const utils_1 = require("./utils.js");
|
|
9
|
+
class Span {
|
|
4
10
|
type = 'trace.span';
|
|
5
11
|
#data;
|
|
6
12
|
#traceId;
|
|
@@ -13,7 +19,7 @@ export class Span {
|
|
|
13
19
|
#previousSpan;
|
|
14
20
|
constructor(options, processor) {
|
|
15
21
|
this.#traceId = options.traceId;
|
|
16
|
-
this.#spanId = options.spanId ?? generateSpanId();
|
|
22
|
+
this.#spanId = options.spanId ?? (0, utils_1.generateSpanId)();
|
|
17
23
|
this.#data = options.data;
|
|
18
24
|
this.#processor = processor;
|
|
19
25
|
this.#parentId = options.parentId ?? null;
|
|
@@ -41,18 +47,18 @@ export class Span {
|
|
|
41
47
|
}
|
|
42
48
|
start() {
|
|
43
49
|
if (this.#startedAt) {
|
|
44
|
-
|
|
50
|
+
logger_1.default.warn('Span already started');
|
|
45
51
|
return;
|
|
46
52
|
}
|
|
47
|
-
this.#startedAt = timeIso();
|
|
53
|
+
this.#startedAt = (0, utils_1.timeIso)();
|
|
48
54
|
this.#processor.onSpanStart(this);
|
|
49
55
|
}
|
|
50
56
|
end() {
|
|
51
57
|
if (this.#endedAt) {
|
|
52
|
-
|
|
58
|
+
logger_1.default.debug('Span already finished', this.spanData);
|
|
53
59
|
return;
|
|
54
60
|
}
|
|
55
|
-
this.#endedAt = timeIso();
|
|
61
|
+
this.#endedAt = (0, utils_1.timeIso)();
|
|
56
62
|
this.#processor.onSpanEnd(this);
|
|
57
63
|
}
|
|
58
64
|
setError(error) {
|
|
@@ -88,12 +94,13 @@ export class Span {
|
|
|
88
94
|
parent_id: this.parentId,
|
|
89
95
|
started_at: this.startedAt,
|
|
90
96
|
ended_at: this.endedAt,
|
|
91
|
-
span_data: removePrivateFields(this.spanData),
|
|
97
|
+
span_data: (0, utils_1.removePrivateFields)(this.spanData),
|
|
92
98
|
error: this.error,
|
|
93
99
|
};
|
|
94
100
|
}
|
|
95
101
|
}
|
|
96
|
-
|
|
102
|
+
exports.Span = Span;
|
|
103
|
+
class NoopSpan extends Span {
|
|
97
104
|
constructor(data, processor) {
|
|
98
105
|
super({ traceId: 'no-op', spanId: 'no-op', data }, processor);
|
|
99
106
|
}
|
|
@@ -110,4 +117,5 @@ export class NoopSpan extends Span {
|
|
|
110
117
|
return null;
|
|
111
118
|
}
|
|
112
119
|
}
|
|
120
|
+
exports.NoopSpan = NoopSpan;
|
|
113
121
|
//# sourceMappingURL=spans.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"spans.js","sourceRoot":"","sources":["../../src/tracing/spans.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"spans.js","sourceRoot":"","sources":["../../src/tracing/spans.ts"],"names":[],"mappings":";;;;;;AAAA,0DAA+B;AAE/B,sCAAuE;AAwHvE,MAAa,IAAI;IACR,IAAI,GAAG,YAAqB,CAAC;IAEpC,KAAK,CAAQ;IACb,QAAQ,CAAS;IACjB,OAAO,CAAS;IAChB,SAAS,CAAgB;IACzB,UAAU,CAAmB;IAC7B,UAAU,CAAgB;IAC1B,QAAQ,CAAgB;IACxB,MAAM,CAAmB;IAEzB,aAAa,CAAwB;IAErC,YAAY,OAA2B,EAAE,SAA2B;QAClE,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC,OAAO,CAAC;QAChC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC,MAAM,IAAI,IAAA,sBAAc,GAAE,CAAC;QAClD,IAAI,CAAC,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC;QAC1B,IAAI,CAAC,UAAU,GAAG,SAAS,CAAC;QAC5B,IAAI,CAAC,SAAS,GAAG,OAAO,CAAC,QAAQ,IAAI,IAAI,CAAC;QAC1C,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,KAAK,IAAI,IAAI,CAAC;QACpC,IAAI,CAAC,UAAU,GAAG,OAAO,CAAC,SAAS,IAAI,IAAI,CAAC;QAC5C,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC,OAAO,IAAI,IAAI,CAAC;IAC1C,CAAC;IAED,IAAI,OAAO;QACT,OAAO,IAAI,CAAC,QAAQ,CAAC;IACvB,CAAC;IAED,IAAI,QAAQ;QACV,OAAO,IAAI,CAAC,KAAK,CAAC;IACpB,CAAC;IAED,IAAI,MAAM;QACR,OAAO,IAAI,CAAC,OAAO,CAAC;IACtB,CAAC;IAED,IAAI,QAAQ;QACV,OAAO,IAAI,CAAC,SAAS,CAAC;IACxB,CAAC;IAED,IAAI,YAAY;QACd,OAAO,IAAI,CAAC,aAAa,CAAC;IAC5B,CAAC;IAED,IAAI,YAAY,CAAC,IAA2B;QAC1C,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC;IAC5B,CAAC;IAED,KAAK;QACH,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;YACpB,gBAAM,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC;YACpC,OAAO;QACT,CAAC;QAED,IAAI,CAAC,UAAU,GAAG,IAAA,eAAO,GAAE,CAAC;QAC5B,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;IACpC,CAAC;IAED,GAAG;QACD,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YAClB,gBAAM,CAAC,KAAK,CAAC,uBAAuB,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;YACrD,OAAO;QACT,CAAC;QAED,IAAI,CAAC,QAAQ,GAAG,IAAA,eAAO,GAAE,CAAC;QAC1B,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;IAClC,CAAC;IAED,QAAQ,CAAC,KAAgB;QACvB,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC;IACtB,CAAC;IAED,IAAI,KAAK;QACP,OAAO,IAAI,CAAC,MAAM,CAAC;IACrB,CAAC;IAED,IAAI,SAAS;QACX,OAAO,IAAI,CAAC,UAAU,CAAC;IACzB,CAAC;IAED,IAAI,OAAO;QACT,OAAO,IAAI,CAAC,QAAQ,CAAC;IACvB,CAAC;IAED,KAAK;QACH,MAAM,IAAI,GAAG,IAAI,IAAI,CACnB;YACE,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,QAAQ,EAAE,IAAI,CAAC,QAAQ,IAAI,SAAS;YACpC,IAAI,EAAE,IAAI,CAAC,QAAQ;YACnB,SAAS,EAAE,IAAI,CAAC,UAAU,IAAI,SAAS;YACvC,OAAO,EAAE,IAAI,CAAC,QAAQ,IAAI,SAAS;YACnC,KAAK,EAAE,IAAI,CAAC,MAAM,IAAI,SAAS;SAChC,EACD,IAAI,CAAC,UAAU,CAChB,CAAC;QACF,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,YAAY,EAAE,KAAK,EAAE,CAAC;QAC/C,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM;QACJ,OAAO;YACL,MAAM,EAAE,IAAI,CAAC,IAAI;YACjB,EAAE,EAAE,IAAI,CAAC,MAAM;YACf,QAAQ,EAAE,IAAI,CAAC,OAAO;YACtB,SAAS,EAAE,IAAI,CAAC,QAAQ;YACxB,UAAU,EAAE,IAAI,CAAC,SAAS;YAC1B,QAAQ,EAAE,IAAI,CAAC,OAAO;YACtB,SAAS,EAAE,IAAA,2BAAmB,EAAC,IAAI,CAAC,QAAQ,CAAC;YAC7C,KAAK,EAAE,IAAI,CAAC,KAAK;SAClB,CAAC;IACJ,CAAC;CACF;AAlHD,oBAkHC;AAED,MAAa,QAAqC,SAAQ,IAAe;IACvE,YAAY,IAAe,EAAE,SAA2B;QACtD,KAAK,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE,SAAS,CAAC,CAAC;IAChE,CAAC;IAED,KAAK;QACH,OAAO;IACT,CAAC;IAED,GAAG;QACD,OAAO;IACT,CAAC;IAED,QAAQ;QACN,OAAO;IACT,CAAC;IAED,MAAM;QACJ,OAAO,IAAI,CAAC;IACd,CAAC;CACF;AApBD,4BAoBC"}
|
package/dist/tracing/traces.js
CHANGED
|
@@ -1,6 +1,9 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.NoopTrace = exports.Trace = void 0;
|
|
4
|
+
const processor_1 = require("./processor.js");
|
|
5
|
+
const utils_1 = require("./utils.js");
|
|
6
|
+
class Trace {
|
|
4
7
|
type = 'trace';
|
|
5
8
|
traceId;
|
|
6
9
|
name;
|
|
@@ -9,11 +12,11 @@ export class Trace {
|
|
|
9
12
|
#processor;
|
|
10
13
|
#started;
|
|
11
14
|
constructor(options, processor) {
|
|
12
|
-
this.traceId = options.traceId ?? generateTraceId();
|
|
15
|
+
this.traceId = options.traceId ?? (0, utils_1.generateTraceId)();
|
|
13
16
|
this.name = options.name ?? 'Agent workflow';
|
|
14
17
|
this.groupId = options.groupId ?? null;
|
|
15
18
|
this.metadata = options.metadata ?? {};
|
|
16
|
-
this.#processor = processor ?? defaultProcessor();
|
|
19
|
+
this.#processor = processor ?? (0, processor_1.defaultProcessor)();
|
|
17
20
|
this.#started = options.started ?? false;
|
|
18
21
|
}
|
|
19
22
|
async start() {
|
|
@@ -49,7 +52,8 @@ export class Trace {
|
|
|
49
52
|
};
|
|
50
53
|
}
|
|
51
54
|
}
|
|
52
|
-
|
|
55
|
+
exports.Trace = Trace;
|
|
56
|
+
class NoopTrace extends Trace {
|
|
53
57
|
constructor() {
|
|
54
58
|
super({});
|
|
55
59
|
}
|
|
@@ -63,4 +67,5 @@ export class NoopTrace extends Trace {
|
|
|
63
67
|
return null;
|
|
64
68
|
}
|
|
65
69
|
}
|
|
70
|
+
exports.NoopTrace = NoopTrace;
|
|
66
71
|
//# sourceMappingURL=traces.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"traces.js","sourceRoot":"","sources":["../../src/tracing/traces.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"traces.js","sourceRoot":"","sources":["../../src/tracing/traces.ts"],"names":[],"mappings":";;;AAAA,8CAAiE;AACjE,sCAA0C;AAU1C,MAAa,KAAK;IACT,IAAI,GAAG,OAAgB,CAAC;IACxB,OAAO,CAAS;IAChB,IAAI,CAAS;IACb,OAAO,GAAkB,IAAI,CAAC;IAC9B,QAAQ,CAAuB;IAEtC,UAAU,CAAmB;IAC7B,QAAQ,CAAU;IAElB,YAAY,OAAqB,EAAE,SAA4B;QAC7D,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC,OAAO,IAAI,IAAA,uBAAe,GAAE,CAAC;QACpD,IAAI,CAAC,IAAI,GAAG,OAAO,CAAC,IAAI,IAAI,gBAAgB,CAAC;QAC7C,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC,OAAO,IAAI,IAAI,CAAC;QACvC,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC,QAAQ,IAAI,EAAE,CAAC;QACvC,IAAI,CAAC,UAAU,GAAG,SAAS,IAAI,IAAA,4BAAgB,GAAE,CAAC;QAClD,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC,OAAO,IAAI,KAAK,CAAC;IAC3C,CAAC;IAED,KAAK,CAAC,KAAK;QACT,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YAClB,OAAO;QACT,CAAC;QAED,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;QACrB,MAAM,IAAI,CAAC,UAAU,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;IAC3C,CAAC;IAED,KAAK,CAAC,GAAG;QACP,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;YACnB,OAAO;QACT,CAAC;QAED,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAC;QACtB,MAAM,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;IACzC,CAAC;IAED,KAAK;QACH,OAAO,IAAI,KAAK,CAAC;YACf,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,OAAO,EAAE,IAAI,CAAC,OAAO,IAAI,SAAS;YAClC,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,OAAO,EAAE,IAAI,CAAC,QAAQ;SACvB,CAAC,CAAC;IACL,CAAC;IAED,MAAM;QACJ,OAAO;YACL,MAAM,EAAE,IAAI,CAAC,IAAI;YACjB,EAAE,EAAE,IAAI,CAAC,OAAO;YAChB,aAAa,EAAE,IAAI,CAAC,IAAI;YACxB,QAAQ,EAAE,IAAI,CAAC,OAAO;YACtB,QAAQ,EAAE,IAAI,CAAC,QAAQ;SACxB,CAAC;IACJ,CAAC;CACF;AAxDD,sBAwDC;AAED,MAAa,SAAU,SAAQ,KAAK;IAClC;QACE,KAAK,CAAC,EAAE,CAAC,CAAC;IACZ,CAAC;IAED,KAAK,CAAC,KAAK;QACT,OAAO;IACT,CAAC;IAED,KAAK,CAAC,GAAG;QACP,OAAO;IACT,CAAC;IAED,MAAM;QACJ,OAAO,IAAI,CAAC;IACd,CAAC;CACF;AAhBD,8BAgBC"}
|
package/dist/tracing/utils.js
CHANGED
|
@@ -1,9 +1,16 @@
|
|
|
1
|
-
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.timeIso = timeIso;
|
|
4
|
+
exports.generateTraceId = generateTraceId;
|
|
5
|
+
exports.generateSpanId = generateSpanId;
|
|
6
|
+
exports.generateGroupId = generateGroupId;
|
|
7
|
+
exports.removePrivateFields = removePrivateFields;
|
|
8
|
+
const _shims_1 = require("@openai/agents-core/_shims");
|
|
2
9
|
/**
|
|
3
10
|
* Generate an ISO 8601 timestamp of the current time.
|
|
4
11
|
* @returns An ISO 8601 timestamp.
|
|
5
12
|
*/
|
|
6
|
-
|
|
13
|
+
function timeIso() {
|
|
7
14
|
return new Date().toISOString();
|
|
8
15
|
}
|
|
9
16
|
/**
|
|
@@ -11,31 +18,31 @@ export function timeIso() {
|
|
|
11
18
|
* of `uuid4().hex` in Python and prefixing it with `trace_`.
|
|
12
19
|
* @returns A trace ID.
|
|
13
20
|
*/
|
|
14
|
-
|
|
15
|
-
return `trace_${randomUUID().replace(/-/g, '')}`;
|
|
21
|
+
function generateTraceId() {
|
|
22
|
+
return `trace_${(0, _shims_1.randomUUID)().replace(/-/g, '')}`;
|
|
16
23
|
}
|
|
17
24
|
/**
|
|
18
25
|
* Generate a span ID by creating a random UUID v4 and removing the dashes. This is the equivalent
|
|
19
26
|
* of `uuid4().hex` in Python and prefixing it with `span_`.
|
|
20
27
|
* @returns A span ID.
|
|
21
28
|
*/
|
|
22
|
-
|
|
23
|
-
return `span_${randomUUID().replace(/-/g, '').slice(0, 24)}`;
|
|
29
|
+
function generateSpanId() {
|
|
30
|
+
return `span_${(0, _shims_1.randomUUID)().replace(/-/g, '').slice(0, 24)}`;
|
|
24
31
|
}
|
|
25
32
|
/**
|
|
26
33
|
* Generate a group ID by creating a random UUID v4 and removing the dashes. This is the equivalent
|
|
27
34
|
* of `uuid4().hex` in Python and prefixing it with `group_`.
|
|
28
35
|
* @returns A group ID.
|
|
29
36
|
*/
|
|
30
|
-
|
|
31
|
-
return `group_${randomUUID().replace(/-/g, '').slice(0, 24)}`;
|
|
37
|
+
function generateGroupId() {
|
|
38
|
+
return `group_${(0, _shims_1.randomUUID)().replace(/-/g, '').slice(0, 24)}`;
|
|
32
39
|
}
|
|
33
40
|
/**
|
|
34
41
|
* Remove fields that start with an underscore from an object.
|
|
35
42
|
* @param obj - The object to remove private fields from.
|
|
36
43
|
* @returns A new object with private fields removed.
|
|
37
44
|
*/
|
|
38
|
-
|
|
45
|
+
function removePrivateFields(obj) {
|
|
39
46
|
return Object.fromEntries(Object.entries(obj).filter(([key]) => !key.startsWith('_')));
|
|
40
47
|
}
|
|
41
48
|
//# sourceMappingURL=utils.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/tracing/utils.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/tracing/utils.ts"],"names":[],"mappings":";;AAMA,0BAEC;AAOD,0CAEC;AAOD,wCAEC;AAOD,0CAEC;AAOD,kDAMC;AAhDD,uDAAwD;AAExD;;;GAGG;AACH,SAAgB,OAAO;IACrB,OAAO,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;AAClC,CAAC;AAED;;;;GAIG;AACH,SAAgB,eAAe;IAC7B,OAAO,SAAS,IAAA,mBAAU,GAAE,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,EAAE,CAAC;AACnD,CAAC;AAED;;;;GAIG;AACH,SAAgB,cAAc;IAC5B,OAAO,QAAQ,IAAA,mBAAU,GAAE,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC;AAC/D,CAAC;AAED;;;;GAIG;AACH,SAAgB,eAAe;IAC7B,OAAO,SAAS,IAAA,mBAAU,GAAE,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC;AAChE,CAAC;AAED;;;;GAIG;AACH,SAAgB,mBAAmB,CACjC,GAAwB;IAExB,OAAO,MAAM,CAAC,WAAW,CACvB,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAC5D,CAAC;AACJ,CAAC"}
|