@openai/agents-core 0.11.1 → 0.11.3
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/handoff.js +6 -7
- package/dist/handoff.js.map +1 -1
- package/dist/handoff.mjs +6 -7
- package/dist/handoff.mjs.map +1 -1
- package/dist/metadata.js +2 -2
- package/dist/metadata.mjs +2 -2
- package/dist/runner/conversation.js +7 -3
- package/dist/runner/conversation.js.map +1 -1
- package/dist/runner/conversation.mjs +7 -3
- package/dist/runner/conversation.mjs.map +1 -1
- package/dist/runner/guardrails.js +2 -0
- package/dist/runner/guardrails.js.map +1 -1
- package/dist/runner/guardrails.mjs +2 -0
- package/dist/runner/guardrails.mjs.map +1 -1
- package/dist/runner/items.js +43 -2
- package/dist/runner/items.js.map +1 -1
- package/dist/runner/items.mjs +43 -2
- package/dist/runner/items.mjs.map +1 -1
- package/dist/sandbox/client.d.ts +20 -1
- package/dist/sandbox/client.js +50 -0
- package/dist/sandbox/client.js.map +1 -1
- package/dist/sandbox/client.mjs +47 -0
- package/dist/sandbox/client.mjs.map +1 -1
- package/dist/sandbox/errors.d.ts +5 -2
- package/dist/sandbox/errors.js +7 -1
- package/dist/sandbox/errors.js.map +1 -1
- package/dist/sandbox/errors.mjs +5 -0
- package/dist/sandbox/errors.mjs.map +1 -1
- package/dist/sandbox/manifest.js +26 -1
- package/dist/sandbox/manifest.js.map +1 -1
- package/dist/sandbox/manifest.mjs +26 -1
- package/dist/sandbox/manifest.mjs.map +1 -1
- package/dist/sandbox/runtime/manager.d.ts +1 -0
- package/dist/sandbox/runtime/manager.js +21 -3
- package/dist/sandbox/runtime/manager.js.map +1 -1
- package/dist/sandbox/runtime/manager.mjs +21 -3
- package/dist/sandbox/runtime/manager.mjs.map +1 -1
- package/dist/sandbox/sandboxes/docker.d.ts +3 -2
- package/dist/sandbox/sandboxes/docker.js +21 -10
- package/dist/sandbox/sandboxes/docker.js.map +1 -1
- package/dist/sandbox/sandboxes/docker.mjs +21 -10
- package/dist/sandbox/sandboxes/docker.mjs.map +1 -1
- package/dist/sandbox/sandboxes/shared/localSnapshots.d.ts +7 -2
- package/dist/sandbox/sandboxes/shared/localSnapshots.js +61 -6
- package/dist/sandbox/sandboxes/shared/localSnapshots.js.map +1 -1
- package/dist/sandbox/sandboxes/shared/localSnapshots.mjs +61 -6
- package/dist/sandbox/sandboxes/shared/localSnapshots.mjs.map +1 -1
- package/dist/sandbox/sandboxes/unixLocal.d.ts +8 -4
- package/dist/sandbox/sandboxes/unixLocal.js +27 -9
- package/dist/sandbox/sandboxes/unixLocal.js.map +1 -1
- package/dist/sandbox/sandboxes/unixLocal.mjs +28 -10
- package/dist/sandbox/sandboxes/unixLocal.mjs.map +1 -1
- package/dist/sandbox/session.d.ts +6 -1
- package/dist/sandbox/session.js.map +1 -1
- package/dist/sandbox/session.mjs.map +1 -1
- package/dist/tool.js +18 -0
- package/dist/tool.js.map +1 -1
- package/dist/tool.mjs +18 -0
- package/dist/tool.mjs.map +1 -1
- package/dist/tracing/processor.js +49 -27
- package/dist/tracing/processor.js.map +1 -1
- package/dist/tracing/processor.mjs +49 -27
- package/dist/tracing/processor.mjs.map +1 -1
- package/dist/tracing/provider.js +28 -11
- package/dist/tracing/provider.js.map +1 -1
- package/dist/tracing/provider.mjs +29 -12
- package/dist/tracing/provider.mjs.map +1 -1
- package/dist/tracing/spans.js +5 -1
- package/dist/tracing/spans.js.map +1 -1
- package/dist/tracing/spans.mjs +6 -2
- package/dist/tracing/spans.mjs.map +1 -1
- package/dist/tracing/traces.js +1 -1
- package/dist/tracing/traces.js.map +1 -1
- package/dist/tracing/traces.mjs +2 -2
- package/dist/tracing/traces.mjs.map +1 -1
- package/dist/tracing/utils.d.ts +1 -0
- package/dist/tracing/utils.js +2 -0
- package/dist/tracing/utils.js.map +1 -1
- package/dist/tracing/utils.mjs +1 -0
- package/dist/tracing/utils.mjs.map +1 -1
- package/package.json +1 -1
|
@@ -74,23 +74,31 @@ export class BatchTraceProcessor {
|
|
|
74
74
|
this.#timeout.unref();
|
|
75
75
|
}
|
|
76
76
|
}
|
|
77
|
-
async #exportBatches(force = false) {
|
|
77
|
+
async #exportBatches(force = false, signal) {
|
|
78
78
|
if (this.#buffer.length === 0) {
|
|
79
79
|
return;
|
|
80
80
|
}
|
|
81
81
|
logger.debug(`Exporting batches. Force: ${force}. Buffer size: ${this.#buffer.length}`);
|
|
82
|
+
const exportBatch = async (batch) => {
|
|
83
|
+
this.#exportInProgress = true;
|
|
84
|
+
try {
|
|
85
|
+
await this.#exporter.export(batch, signal);
|
|
86
|
+
}
|
|
87
|
+
catch (error) {
|
|
88
|
+
logger.error('Tracing exporter failed to export batch', error);
|
|
89
|
+
}
|
|
90
|
+
finally {
|
|
91
|
+
this.#exportInProgress = false;
|
|
92
|
+
}
|
|
93
|
+
};
|
|
82
94
|
if (force || this.#buffer.length < this.#maxBatchSize) {
|
|
83
95
|
const toExport = [...this.#buffer];
|
|
84
96
|
this.#buffer = [];
|
|
85
|
-
|
|
86
|
-
await this.#exporter.export(toExport);
|
|
87
|
-
this.#exportInProgress = false;
|
|
97
|
+
await exportBatch(toExport);
|
|
88
98
|
}
|
|
89
99
|
else if (this.#buffer.length > 0) {
|
|
90
100
|
const batch = this.#buffer.splice(0, this.#maxBatchSize);
|
|
91
|
-
|
|
92
|
-
await this.#exporter.export(batch);
|
|
93
|
-
this.#exportInProgress = false;
|
|
101
|
+
await exportBatch(batch);
|
|
94
102
|
}
|
|
95
103
|
}
|
|
96
104
|
async onTraceStart(trace) {
|
|
@@ -106,31 +114,45 @@ export class BatchTraceProcessor {
|
|
|
106
114
|
await this.#safeAddItem(span);
|
|
107
115
|
}
|
|
108
116
|
async shutdown(timeout) {
|
|
117
|
+
let shutdownTimeout;
|
|
118
|
+
const shutdownAbortController = timeout
|
|
119
|
+
? (this.#timeoutAbortController ?? new AbortController())
|
|
120
|
+
: undefined;
|
|
109
121
|
if (timeout) {
|
|
110
|
-
this.#
|
|
111
|
-
|
|
112
|
-
|
|
122
|
+
this.#timeoutAbortController = shutdownAbortController ?? null;
|
|
123
|
+
shutdownTimeout = this.#timer.setTimeout(() => {
|
|
124
|
+
// Force shutdown the HTTP request.
|
|
125
|
+
shutdownAbortController?.abort();
|
|
113
126
|
}, timeout);
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
while (this.#buffer.length > 0) {
|
|
117
|
-
logger.debug(`Waiting for buffer to empty. Items left: ${this.#buffer.length}`);
|
|
118
|
-
if (!this.#exportInProgress) {
|
|
119
|
-
// no current export in progress. Forcing all items to be exported
|
|
120
|
-
await this.#exportBatches(true);
|
|
127
|
+
if (typeof shutdownTimeout.unref === 'function') {
|
|
128
|
+
shutdownTimeout.unref();
|
|
121
129
|
}
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
130
|
+
}
|
|
131
|
+
try {
|
|
132
|
+
logger.debug('Shutting down gracefully');
|
|
133
|
+
while (this.#buffer.length > 0) {
|
|
134
|
+
logger.debug(`Waiting for buffer to empty. Items left: ${this.#buffer.length}`);
|
|
135
|
+
if (!this.#exportInProgress) {
|
|
136
|
+
// No current export in progress. Forcing all items to be exported.
|
|
137
|
+
await this.#exportBatches(true, shutdownAbortController?.signal);
|
|
138
|
+
}
|
|
139
|
+
if (shutdownAbortController?.signal.aborted) {
|
|
140
|
+
logger.debug('Timeout reached, force flushing');
|
|
141
|
+
break;
|
|
142
|
+
}
|
|
143
|
+
// Using setTimeout to add to the event loop and keep this alive until done.
|
|
144
|
+
await new Promise((resolve) => this.#timer.setTimeout(resolve, 500));
|
|
126
145
|
}
|
|
127
|
-
|
|
128
|
-
await new Promise((resolve) => this.#timer.setTimeout(resolve, 500));
|
|
146
|
+
logger.debug('Buffer empty. Exiting');
|
|
129
147
|
}
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
148
|
+
finally {
|
|
149
|
+
if (shutdownTimeout) {
|
|
150
|
+
this.#timer.clearTimeout(shutdownTimeout);
|
|
151
|
+
}
|
|
152
|
+
if (this.#timer && this.#timeout) {
|
|
153
|
+
// Making sure there are no more requests.
|
|
154
|
+
this.#timer.clearTimeout(this.#timeout);
|
|
155
|
+
}
|
|
134
156
|
}
|
|
135
157
|
}
|
|
136
158
|
async forceFlush() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"processor.mjs","sourceRoot":"","sources":["../../src/tracing/processor.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"processor.mjs","sourceRoot":"","sources":["../../src/tracing/processor.ts"],"names":[],"mappings":"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"}
|
package/dist/tracing/provider.js
CHANGED
|
@@ -72,6 +72,10 @@ class TraceProvider {
|
|
|
72
72
|
logger_1.default.debug('Tracing is disabled, Not creating span %o', spanOptions);
|
|
73
73
|
return new spans_1.NoopSpan(spanOptions.data, this.#multiProcessor);
|
|
74
74
|
}
|
|
75
|
+
if (spanOptions.spanId === utils_1.NOOP_TRACE_OR_SPAN_ID) {
|
|
76
|
+
logger_1.default.debug('Span id is no-op, returning NoopSpan');
|
|
77
|
+
return new spans_1.NoopSpan(spanOptions.data, this.#multiProcessor);
|
|
78
|
+
}
|
|
75
79
|
let parentId;
|
|
76
80
|
let traceId;
|
|
77
81
|
let tracingApiKey;
|
|
@@ -80,11 +84,13 @@ class TraceProvider {
|
|
|
80
84
|
const currentTrace = (0, context_1.getCurrentTrace)();
|
|
81
85
|
const currentSpan = (0, context_1.getCurrentSpan)();
|
|
82
86
|
if (!currentTrace) {
|
|
83
|
-
logger_1.default.
|
|
87
|
+
logger_1.default.debug('No active trace. Make sure to start a trace with `withTrace()` first. Returning NoopSpan.');
|
|
84
88
|
return new spans_1.NoopSpan(spanOptions.data, this.#multiProcessor);
|
|
85
89
|
}
|
|
86
90
|
if (currentSpan instanceof spans_1.NoopSpan ||
|
|
87
|
-
|
|
91
|
+
currentSpan?.spanId === utils_1.NOOP_TRACE_OR_SPAN_ID ||
|
|
92
|
+
currentTrace instanceof traces_1.NoopTrace ||
|
|
93
|
+
currentTrace.traceId === utils_1.NOOP_TRACE_OR_SPAN_ID) {
|
|
88
94
|
logger_1.default.debug(`Parent ${currentSpan} or ${currentTrace} is no-op, returning NoopSpan`);
|
|
89
95
|
return new spans_1.NoopSpan(spanOptions.data, this.#multiProcessor);
|
|
90
96
|
}
|
|
@@ -100,7 +106,8 @@ class TraceProvider {
|
|
|
100
106
|
}
|
|
101
107
|
}
|
|
102
108
|
else if (parent instanceof traces_1.Trace) {
|
|
103
|
-
if (parent instanceof traces_1.NoopTrace
|
|
109
|
+
if (parent instanceof traces_1.NoopTrace ||
|
|
110
|
+
parent.traceId === utils_1.NOOP_TRACE_OR_SPAN_ID) {
|
|
104
111
|
logger_1.default.debug('Parent trace is no-op, returning NoopSpan');
|
|
105
112
|
return new spans_1.NoopSpan(spanOptions.data, this.#multiProcessor);
|
|
106
113
|
}
|
|
@@ -109,7 +116,9 @@ class TraceProvider {
|
|
|
109
116
|
traceMetadata = parent.metadata;
|
|
110
117
|
}
|
|
111
118
|
else if (parent instanceof spans_1.Span) {
|
|
112
|
-
if (parent instanceof spans_1.NoopSpan
|
|
119
|
+
if (parent instanceof spans_1.NoopSpan ||
|
|
120
|
+
parent.spanId === utils_1.NOOP_TRACE_OR_SPAN_ID ||
|
|
121
|
+
parent.traceId === utils_1.NOOP_TRACE_OR_SPAN_ID) {
|
|
113
122
|
logger_1.default.debug('Parent span is no-op, returning NoopSpan');
|
|
114
123
|
return new spans_1.NoopSpan(spanOptions.data, this.#multiProcessor);
|
|
115
124
|
}
|
|
@@ -118,7 +127,7 @@ class TraceProvider {
|
|
|
118
127
|
tracingApiKey = parent.tracingApiKey;
|
|
119
128
|
traceMetadata = parent.traceMetadata;
|
|
120
129
|
}
|
|
121
|
-
if (!traceId) {
|
|
130
|
+
if (!traceId || traceId === utils_1.NOOP_TRACE_OR_SPAN_ID) {
|
|
122
131
|
logger_1.default.error('No traceId found. Make sure to start a trace with `withTrace()` first. Returning NoopSpan.');
|
|
123
132
|
return new spans_1.NoopSpan(spanOptions.data, this.#multiProcessor);
|
|
124
133
|
}
|
|
@@ -150,15 +159,23 @@ class TraceProvider {
|
|
|
150
159
|
if (typeof process !== 'undefined' && typeof process.on === 'function') {
|
|
151
160
|
// handling Node.js process termination
|
|
152
161
|
const cleanup = async () => {
|
|
153
|
-
const
|
|
154
|
-
|
|
155
|
-
process.exit(1);
|
|
156
|
-
}, 5000);
|
|
162
|
+
const timeoutMs = 5000;
|
|
163
|
+
let timeout;
|
|
157
164
|
try {
|
|
158
|
-
await
|
|
165
|
+
await Promise.race([
|
|
166
|
+
this.shutdown(timeoutMs),
|
|
167
|
+
new Promise((resolve) => {
|
|
168
|
+
timeout = setTimeout(() => {
|
|
169
|
+
console.warn('Tracing cleanup timed out; continuing exit');
|
|
170
|
+
resolve();
|
|
171
|
+
}, timeoutMs);
|
|
172
|
+
}),
|
|
173
|
+
]);
|
|
159
174
|
}
|
|
160
175
|
finally {
|
|
161
|
-
|
|
176
|
+
if (timeout) {
|
|
177
|
+
clearTimeout(timeout);
|
|
178
|
+
}
|
|
162
179
|
}
|
|
163
180
|
};
|
|
164
181
|
// Handle normal termination
|
|
@@ -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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"}
|
|
@@ -4,7 +4,7 @@ import logger from "../logger.mjs";
|
|
|
4
4
|
import { MultiTracingProcessor } from "./processor.mjs";
|
|
5
5
|
import { NoopSpan, Span } from "./spans.mjs";
|
|
6
6
|
import { NoopTrace, Trace } from "./traces.mjs";
|
|
7
|
-
import { generateTraceId } from "./utils.mjs";
|
|
7
|
+
import { generateTraceId, NOOP_TRACE_OR_SPAN_ID } from "./utils.mjs";
|
|
8
8
|
export class TraceProvider {
|
|
9
9
|
#multiProcessor;
|
|
10
10
|
#disabled;
|
|
@@ -65,6 +65,10 @@ export class TraceProvider {
|
|
|
65
65
|
logger.debug('Tracing is disabled, Not creating span %o', spanOptions);
|
|
66
66
|
return new NoopSpan(spanOptions.data, this.#multiProcessor);
|
|
67
67
|
}
|
|
68
|
+
if (spanOptions.spanId === NOOP_TRACE_OR_SPAN_ID) {
|
|
69
|
+
logger.debug('Span id is no-op, returning NoopSpan');
|
|
70
|
+
return new NoopSpan(spanOptions.data, this.#multiProcessor);
|
|
71
|
+
}
|
|
68
72
|
let parentId;
|
|
69
73
|
let traceId;
|
|
70
74
|
let tracingApiKey;
|
|
@@ -73,11 +77,13 @@ export class TraceProvider {
|
|
|
73
77
|
const currentTrace = getCurrentTrace();
|
|
74
78
|
const currentSpan = getCurrentSpan();
|
|
75
79
|
if (!currentTrace) {
|
|
76
|
-
logger.
|
|
80
|
+
logger.debug('No active trace. Make sure to start a trace with `withTrace()` first. Returning NoopSpan.');
|
|
77
81
|
return new NoopSpan(spanOptions.data, this.#multiProcessor);
|
|
78
82
|
}
|
|
79
83
|
if (currentSpan instanceof NoopSpan ||
|
|
80
|
-
|
|
84
|
+
currentSpan?.spanId === NOOP_TRACE_OR_SPAN_ID ||
|
|
85
|
+
currentTrace instanceof NoopTrace ||
|
|
86
|
+
currentTrace.traceId === NOOP_TRACE_OR_SPAN_ID) {
|
|
81
87
|
logger.debug(`Parent ${currentSpan} or ${currentTrace} is no-op, returning NoopSpan`);
|
|
82
88
|
return new NoopSpan(spanOptions.data, this.#multiProcessor);
|
|
83
89
|
}
|
|
@@ -93,7 +99,8 @@ export class TraceProvider {
|
|
|
93
99
|
}
|
|
94
100
|
}
|
|
95
101
|
else if (parent instanceof Trace) {
|
|
96
|
-
if (parent instanceof NoopTrace
|
|
102
|
+
if (parent instanceof NoopTrace ||
|
|
103
|
+
parent.traceId === NOOP_TRACE_OR_SPAN_ID) {
|
|
97
104
|
logger.debug('Parent trace is no-op, returning NoopSpan');
|
|
98
105
|
return new NoopSpan(spanOptions.data, this.#multiProcessor);
|
|
99
106
|
}
|
|
@@ -102,7 +109,9 @@ export class TraceProvider {
|
|
|
102
109
|
traceMetadata = parent.metadata;
|
|
103
110
|
}
|
|
104
111
|
else if (parent instanceof Span) {
|
|
105
|
-
if (parent instanceof NoopSpan
|
|
112
|
+
if (parent instanceof NoopSpan ||
|
|
113
|
+
parent.spanId === NOOP_TRACE_OR_SPAN_ID ||
|
|
114
|
+
parent.traceId === NOOP_TRACE_OR_SPAN_ID) {
|
|
106
115
|
logger.debug('Parent span is no-op, returning NoopSpan');
|
|
107
116
|
return new NoopSpan(spanOptions.data, this.#multiProcessor);
|
|
108
117
|
}
|
|
@@ -111,7 +120,7 @@ export class TraceProvider {
|
|
|
111
120
|
tracingApiKey = parent.tracingApiKey;
|
|
112
121
|
traceMetadata = parent.traceMetadata;
|
|
113
122
|
}
|
|
114
|
-
if (!traceId) {
|
|
123
|
+
if (!traceId || traceId === NOOP_TRACE_OR_SPAN_ID) {
|
|
115
124
|
logger.error('No traceId found. Make sure to start a trace with `withTrace()` first. Returning NoopSpan.');
|
|
116
125
|
return new NoopSpan(spanOptions.data, this.#multiProcessor);
|
|
117
126
|
}
|
|
@@ -143,15 +152,23 @@ export class TraceProvider {
|
|
|
143
152
|
if (typeof process !== 'undefined' && typeof process.on === 'function') {
|
|
144
153
|
// handling Node.js process termination
|
|
145
154
|
const cleanup = async () => {
|
|
146
|
-
const
|
|
147
|
-
|
|
148
|
-
process.exit(1);
|
|
149
|
-
}, 5000);
|
|
155
|
+
const timeoutMs = 5000;
|
|
156
|
+
let timeout;
|
|
150
157
|
try {
|
|
151
|
-
await
|
|
158
|
+
await Promise.race([
|
|
159
|
+
this.shutdown(timeoutMs),
|
|
160
|
+
new Promise((resolve) => {
|
|
161
|
+
timeout = setTimeout(() => {
|
|
162
|
+
console.warn('Tracing cleanup timed out; continuing exit');
|
|
163
|
+
resolve();
|
|
164
|
+
}, timeoutMs);
|
|
165
|
+
}),
|
|
166
|
+
]);
|
|
152
167
|
}
|
|
153
168
|
finally {
|
|
154
|
-
|
|
169
|
+
if (timeout) {
|
|
170
|
+
clearTimeout(timeout);
|
|
171
|
+
}
|
|
155
172
|
}
|
|
156
173
|
};
|
|
157
174
|
// Handle normal termination
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"provider.mjs","sourceRoot":"","sources":["../../src/tracing/provider.ts"],"names":[],"mappings":"OAAO,EAAE,cAAc,EAAE,eAAe,EAAE;OACnC,EAAE,OAAO,EAAE;OACX,MAAM;OACN,EAAE,qBAAqB,EAAoB;OAC3C,EAAE,QAAQ,EAAE,IAAI,EAAyB;OACzC,EAAE,SAAS,EAAE,KAAK,EAAgB;OAClC,EAAE,eAAe,EAAE;
|
|
1
|
+
{"version":3,"file":"provider.mjs","sourceRoot":"","sources":["../../src/tracing/provider.ts"],"names":[],"mappings":"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"}
|
package/dist/tracing/spans.js
CHANGED
|
@@ -114,7 +114,11 @@ class Span {
|
|
|
114
114
|
exports.Span = Span;
|
|
115
115
|
class NoopSpan extends Span {
|
|
116
116
|
constructor(data, processor) {
|
|
117
|
-
super({
|
|
117
|
+
super({
|
|
118
|
+
traceId: utils_1.NOOP_TRACE_OR_SPAN_ID,
|
|
119
|
+
spanId: utils_1.NOOP_TRACE_OR_SPAN_ID,
|
|
120
|
+
data,
|
|
121
|
+
}, processor);
|
|
118
122
|
}
|
|
119
123
|
start() {
|
|
120
124
|
return;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"spans.js","sourceRoot":"","sources":["../../src/tracing/spans.ts"],"names":[],"mappings":";;;;;;AAAA,0DAA+B;AAE/B,
|
|
1
|
+
{"version":3,"file":"spans.js","sourceRoot":"","sources":["../../src/tracing/spans.ts"],"names":[],"mappings":"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"}
|
package/dist/tracing/spans.mjs
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import logger from "../logger.mjs";
|
|
2
|
-
import { generateSpanId, removePrivateFields, timeIso } from "./utils.mjs";
|
|
2
|
+
import { generateSpanId, NOOP_TRACE_OR_SPAN_ID, removePrivateFields, timeIso, } from "./utils.mjs";
|
|
3
3
|
export class Span {
|
|
4
4
|
type = 'trace.span';
|
|
5
5
|
#data;
|
|
@@ -107,7 +107,11 @@ export class Span {
|
|
|
107
107
|
}
|
|
108
108
|
export class NoopSpan extends Span {
|
|
109
109
|
constructor(data, processor) {
|
|
110
|
-
super({
|
|
110
|
+
super({
|
|
111
|
+
traceId: NOOP_TRACE_OR_SPAN_ID,
|
|
112
|
+
spanId: NOOP_TRACE_OR_SPAN_ID,
|
|
113
|
+
data,
|
|
114
|
+
}, processor);
|
|
111
115
|
}
|
|
112
116
|
start() {
|
|
113
117
|
return;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"spans.mjs","sourceRoot":"","sources":["../../src/tracing/spans.ts"],"names":[],"mappings":"OAAO,MAAM;OAEN,
|
|
1
|
+
{"version":3,"file":"spans.mjs","sourceRoot":"","sources":["../../src/tracing/spans.ts"],"names":[],"mappings":"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"}
|
package/dist/tracing/traces.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"traces.js","sourceRoot":"","sources":["../../src/tracing/traces.ts"],"names":[],"mappings":";;;AAAA,8CAAiE;AACjE,
|
|
1
|
+
{"version":3,"file":"traces.js","sourceRoot":"","sources":["../../src/tracing/traces.ts"],"names":[],"mappings":";;;AAAA,8CAAiE;AACjE,sCAAiE;AAWjE,MAAa,KAAK;IACT,IAAI,GAAG,OAAgB,CAAC;IACxB,OAAO,CAAS;IAChB,IAAI,CAAS;IACb,OAAO,GAAkB,IAAI,CAAC;IAC9B,QAAQ,CAAuB;IAC/B,aAAa,CAAU;IAE9B,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,aAAa,GAAG,OAAO,CAAC,aAAa,CAAC;QAC3C,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;YACtB,aAAa,EAAE,IAAI,CAAC,aAAa;SAClC,CAAC,CAAC;IACL,CAAC;IAED;;;;;OAKG;IACH,MAAM,CAAC,OAA4C;QACjD,MAAM,IAAI,GAAG;YACX,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;SACD,CAAC;QAEzB,IAAI,OAAO,EAAE,oBAAoB,IAAI,IAAI,CAAC,aAAa,EAAE,CAAC;YACxD,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC,aAAa,CAAC;QAC5C,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC;CACF;AAvED,sBAuEC;AAED,MAAa,SAAU,SAAQ,KAAK;IAClC;QACE,KAAK,CAAC,EAAE,OAAO,EAAE,6BAAqB,EAAE,CAAC,CAAC;IAC5C,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/traces.mjs
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { defaultProcessor } from "./processor.mjs";
|
|
2
|
-
import { generateTraceId } from "./utils.mjs";
|
|
2
|
+
import { generateTraceId, NOOP_TRACE_OR_SPAN_ID } from "./utils.mjs";
|
|
3
3
|
export class Trace {
|
|
4
4
|
type = 'trace';
|
|
5
5
|
traceId;
|
|
@@ -64,7 +64,7 @@ export class Trace {
|
|
|
64
64
|
}
|
|
65
65
|
export class NoopTrace extends Trace {
|
|
66
66
|
constructor() {
|
|
67
|
-
super({});
|
|
67
|
+
super({ traceId: NOOP_TRACE_OR_SPAN_ID });
|
|
68
68
|
}
|
|
69
69
|
async start() {
|
|
70
70
|
return;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"traces.mjs","sourceRoot":"","sources":["../../src/tracing/traces.ts"],"names":[],"mappings":"OAAO,EAAE,gBAAgB,EAAoB;OACtC,EAAE,eAAe,EAAE;
|
|
1
|
+
{"version":3,"file":"traces.mjs","sourceRoot":"","sources":["../../src/tracing/traces.ts"],"names":[],"mappings":"OAAO,EAAE,gBAAgB,EAAoB;OACtC,EAAE,eAAe,EAAE,qBAAqB,EAAE;AAWjD,MAAM,OAAO,KAAK;IACT,IAAI,GAAG,OAAgB,CAAC;IACxB,OAAO,CAAS;IAChB,IAAI,CAAS;IACb,OAAO,GAAkB,IAAI,CAAC;IAC9B,QAAQ,CAAuB;IAC/B,aAAa,CAAU;IAE9B,UAAU,CAAmB;IAC7B,QAAQ,CAAU;IAElB,YAAY,OAAqB,EAAE,SAA4B;QAC7D,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC,OAAO,IAAI,eAAe,EAAE,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,aAAa,GAAG,OAAO,CAAC,aAAa,CAAC;QAC3C,IAAI,CAAC,UAAU,GAAG,SAAS,IAAI,gBAAgB,EAAE,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;YACtB,aAAa,EAAE,IAAI,CAAC,aAAa;SAClC,CAAC,CAAC;IACL,CAAC;IAED;;;;;OAKG;IACH,MAAM,CAAC,OAA4C;QACjD,MAAM,IAAI,GAAG;YACX,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;SACD,CAAC;QAEzB,IAAI,OAAO,EAAE,oBAAoB,IAAI,IAAI,CAAC,aAAa,EAAE,CAAC;YACxD,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC,aAAa,CAAC;QAC5C,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC;CACF;AAED,MAAM,OAAO,SAAU,SAAQ,KAAK;IAClC;QACE,KAAK,CAAC,EAAE,OAAO,EAAE,qBAAqB,EAAE,CAAC,CAAC;IAC5C,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"}
|
package/dist/tracing/utils.d.ts
CHANGED
package/dist/tracing/utils.js
CHANGED
|
@@ -1,11 +1,13 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.NOOP_TRACE_OR_SPAN_ID = void 0;
|
|
3
4
|
exports.timeIso = timeIso;
|
|
4
5
|
exports.generateTraceId = generateTraceId;
|
|
5
6
|
exports.generateSpanId = generateSpanId;
|
|
6
7
|
exports.generateGroupId = generateGroupId;
|
|
7
8
|
exports.removePrivateFields = removePrivateFields;
|
|
8
9
|
const _shims_1 = require("@openai/agents-core/_shims");
|
|
10
|
+
exports.NOOP_TRACE_OR_SPAN_ID = 'no-op';
|
|
9
11
|
/**
|
|
10
12
|
* Generate an ISO 8601 timestamp of the current time.
|
|
11
13
|
* @returns An ISO 8601 timestamp.
|
|
@@ -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":";;;AAQA,0BAEC;AAOD,0CAEC;AAOD,wCAEC;AAOD,0CAEC;AAOD,kDAMC;AAlDD,uDAAwD;AAE3C,QAAA,qBAAqB,GAAG,OAAO,CAAC;AAE7C;;;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"}
|
package/dist/tracing/utils.mjs
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.mjs","sourceRoot":"","sources":["../../src/tracing/utils.ts"],"names":[],"mappings":"OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B;AAEvD;;;GAGG;AACH,MAAM,UAAU,OAAO;IACrB,OAAO,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;AAClC,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,eAAe;IAC7B,OAAO,SAAS,UAAU,EAAE,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,EAAE,CAAC;AACnD,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,cAAc;IAC5B,OAAO,QAAQ,UAAU,EAAE,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC;AAC/D,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,eAAe;IAC7B,OAAO,SAAS,UAAU,EAAE,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC;AAChE,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,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"}
|
|
1
|
+
{"version":3,"file":"utils.mjs","sourceRoot":"","sources":["../../src/tracing/utils.ts"],"names":[],"mappings":"OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B;AAEvD,MAAM,CAAC,MAAM,qBAAqB,GAAG,OAAO,CAAC;AAE7C;;;GAGG;AACH,MAAM,UAAU,OAAO;IACrB,OAAO,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;AAClC,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,eAAe;IAC7B,OAAO,SAAS,UAAU,EAAE,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,EAAE,CAAC;AACnD,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,cAAc;IAC5B,OAAO,QAAQ,UAAU,EAAE,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC;AAC/D,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,eAAe;IAC7B,OAAO,SAAS,UAAU,EAAE,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC;AAChE,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,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"}
|
package/package.json
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
"name": "@openai/agents-core",
|
|
3
3
|
"repository": "https://github.com/openai/openai-agents-js",
|
|
4
4
|
"homepage": "https://openai.github.io/openai-agents-js/",
|
|
5
|
-
"version": "0.11.
|
|
5
|
+
"version": "0.11.3",
|
|
6
6
|
"description": "The OpenAI Agents SDK is a lightweight yet powerful framework for building multi-agent workflows.",
|
|
7
7
|
"author": "OpenAI <support@openai.com>",
|
|
8
8
|
"main": "dist/index.js",
|