@trigger.dev/core 4.0.0-v4-beta.25 → 4.0.0-v4-beta.27
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/commonjs/logger.d.ts +1 -0
- package/dist/commonjs/logger.js +5 -0
- package/dist/commonjs/logger.js.map +1 -1
- package/dist/commonjs/v3/apiClient/core.js +0 -3
- package/dist/commonjs/v3/apiClient/core.js.map +1 -1
- package/dist/commonjs/v3/apiClient/index.d.ts +8 -8
- package/dist/commonjs/v3/config.d.ts +47 -35
- package/dist/commonjs/v3/index.d.ts +1 -0
- package/dist/commonjs/v3/index.js +1 -0
- package/dist/commonjs/v3/index.js.map +1 -1
- package/dist/commonjs/v3/isomorphic/friendlyId.d.ts +1 -0
- package/dist/commonjs/v3/isomorphic/friendlyId.js +2 -1
- package/dist/commonjs/v3/isomorphic/friendlyId.js.map +1 -1
- package/dist/commonjs/v3/isomorphic/index.d.ts +1 -0
- package/dist/commonjs/v3/isomorphic/index.js +1 -0
- package/dist/commonjs/v3/isomorphic/index.js.map +1 -1
- package/dist/commonjs/v3/isomorphic/traceContext.d.ts +5 -0
- package/dist/commonjs/v3/isomorphic/traceContext.js +25 -0
- package/dist/commonjs/v3/isomorphic/traceContext.js.map +1 -0
- package/dist/commonjs/v3/otel/tracingSDK.d.ts +1 -14
- package/dist/commonjs/v3/otel/tracingSDK.js +92 -84
- package/dist/commonjs/v3/otel/tracingSDK.js.map +1 -1
- package/dist/commonjs/v3/resource-catalog/catalog.d.ts +2 -1
- package/dist/commonjs/v3/resource-catalog/index.d.ts +2 -1
- package/dist/commonjs/v3/resource-catalog/index.js +3 -0
- package/dist/commonjs/v3/resource-catalog/index.js.map +1 -1
- package/dist/commonjs/v3/resource-catalog/noopResourceCatalog.d.ts +2 -1
- package/dist/commonjs/v3/resource-catalog/noopResourceCatalog.js +3 -0
- package/dist/commonjs/v3/resource-catalog/noopResourceCatalog.js.map +1 -1
- package/dist/commonjs/v3/resource-catalog/standardResourceCatalog.d.ts +3 -1
- package/dist/commonjs/v3/resource-catalog/standardResourceCatalog.js +10 -2
- package/dist/commonjs/v3/resource-catalog/standardResourceCatalog.js.map +1 -1
- package/dist/commonjs/v3/runEngineWorker/supervisor/http.d.ts +80 -61
- package/dist/commonjs/v3/runEngineWorker/supervisor/schemas.d.ts +628 -489
- package/dist/commonjs/v3/runEngineWorker/workload/http.d.ts +64 -45
- package/dist/commonjs/v3/runEngineWorker/workload/schemas.d.ts +625 -486
- package/dist/commonjs/v3/runMetadata/manager.d.ts +1 -0
- package/dist/commonjs/v3/runMetadata/manager.js +72 -2
- package/dist/commonjs/v3/runMetadata/manager.js.map +1 -1
- package/dist/commonjs/v3/schemas/api.d.ts +233 -196
- package/dist/commonjs/v3/schemas/api.js +2 -0
- package/dist/commonjs/v3/schemas/api.js.map +1 -1
- package/dist/commonjs/v3/schemas/build.d.ts +88 -76
- package/dist/commonjs/v3/schemas/checkpoints.d.ts +72 -72
- package/dist/commonjs/v3/schemas/common.d.ts +2351 -1038
- package/dist/commonjs/v3/schemas/common.js +102 -42
- package/dist/commonjs/v3/schemas/common.js.map +1 -1
- package/dist/commonjs/v3/schemas/fetch.d.ts +12 -12
- package/dist/commonjs/v3/schemas/messages.d.ts +6692 -6167
- package/dist/commonjs/v3/schemas/messages.js +10 -10
- package/dist/commonjs/v3/schemas/messages.js.map +1 -1
- package/dist/commonjs/v3/schemas/openTelemetry.d.ts +18 -18
- package/dist/commonjs/v3/schemas/resources.d.ts +44 -38
- package/dist/commonjs/v3/schemas/resources.js +2 -0
- package/dist/commonjs/v3/schemas/resources.js.map +1 -1
- package/dist/commonjs/v3/schemas/runEngine.d.ts +360 -221
- package/dist/commonjs/v3/schemas/schemas.d.ts +593 -533
- package/dist/commonjs/v3/schemas/schemas.js +15 -4
- package/dist/commonjs/v3/schemas/schemas.js.map +1 -1
- package/dist/commonjs/v3/schemas/webhooks.d.ts +120 -120
- package/dist/commonjs/v3/taskContext/index.js +0 -2
- package/dist/commonjs/v3/taskContext/index.js.map +1 -1
- package/dist/commonjs/v3/taskContext/otelProcessors.d.ts +4 -5
- package/dist/commonjs/v3/taskContext/otelProcessors.js +4 -3
- package/dist/commonjs/v3/taskContext/otelProcessors.js.map +1 -1
- package/dist/commonjs/v3/trace-context-api.d.ts +3 -0
- package/dist/commonjs/v3/trace-context-api.js +9 -0
- package/dist/commonjs/v3/trace-context-api.js.map +1 -0
- package/dist/commonjs/v3/traceContext/api.d.ts +19 -0
- package/dist/commonjs/v3/traceContext/api.js +59 -0
- package/dist/commonjs/v3/traceContext/api.js.map +1 -0
- package/dist/commonjs/v3/traceContext/manager.d.ts +14 -0
- package/dist/commonjs/v3/traceContext/manager.js +60 -0
- package/dist/commonjs/v3/traceContext/manager.js.map +1 -0
- package/dist/commonjs/v3/traceContext/types.d.ts +12 -0
- package/dist/commonjs/v3/traceContext/types.js +3 -0
- package/dist/commonjs/v3/traceContext/types.js.map +1 -0
- package/dist/commonjs/v3/tracer.d.ts +0 -1
- package/dist/commonjs/v3/tracer.js +0 -3
- package/dist/commonjs/v3/tracer.js.map +1 -1
- package/dist/commonjs/v3/types/index.d.ts +1 -0
- package/dist/commonjs/v3/types/index.js +1 -0
- package/dist/commonjs/v3/types/index.js.map +1 -1
- package/dist/commonjs/v3/types/jsonSchema.d.ts +51 -0
- package/dist/commonjs/v3/types/jsonSchema.js +3 -0
- package/dist/commonjs/v3/types/jsonSchema.js.map +1 -0
- package/dist/commonjs/v3/types/tasks.d.ts +24 -0
- package/dist/commonjs/v3/types/tasks.js.map +1 -1
- package/dist/commonjs/v3/usage/api.d.ts +2 -1
- package/dist/commonjs/v3/usage/api.js +3 -0
- package/dist/commonjs/v3/usage/api.js.map +1 -1
- package/dist/commonjs/v3/usage/devUsageManager.d.ts +4 -1
- package/dist/commonjs/v3/usage/devUsageManager.js +14 -0
- package/dist/commonjs/v3/usage/devUsageManager.js.map +1 -1
- package/dist/commonjs/v3/usage/noopUsageManager.d.ts +2 -1
- package/dist/commonjs/v3/usage/noopUsageManager.js +6 -0
- package/dist/commonjs/v3/usage/noopUsageManager.js.map +1 -1
- package/dist/commonjs/v3/usage/prodUsageManager.d.ts +4 -1
- package/dist/commonjs/v3/usage/prodUsageManager.js +14 -0
- package/dist/commonjs/v3/usage/prodUsageManager.js.map +1 -1
- package/dist/commonjs/v3/usage/types.d.ts +5 -0
- package/dist/commonjs/v3/utils/globals.d.ts +2 -0
- package/dist/commonjs/v3/utils/globals.js.map +1 -1
- package/dist/commonjs/v3/workers/index.d.ts +1 -0
- package/dist/commonjs/v3/workers/index.js +3 -1
- package/dist/commonjs/v3/workers/index.js.map +1 -1
- package/dist/commonjs/v3/workers/taskExecutor.d.ts +2 -2
- package/dist/commonjs/v3/workers/taskExecutor.js +3 -15
- package/dist/commonjs/v3/workers/taskExecutor.js.map +1 -1
- package/dist/commonjs/version.js +1 -1
- package/dist/esm/logger.d.ts +1 -0
- package/dist/esm/logger.js +5 -0
- package/dist/esm/logger.js.map +1 -1
- package/dist/esm/v3/apiClient/core.js +0 -3
- package/dist/esm/v3/apiClient/core.js.map +1 -1
- package/dist/esm/v3/apiClient/index.d.ts +8 -8
- package/dist/esm/v3/config.d.ts +47 -35
- package/dist/esm/v3/index.d.ts +1 -0
- package/dist/esm/v3/index.js +1 -0
- package/dist/esm/v3/index.js.map +1 -1
- package/dist/esm/v3/isomorphic/friendlyId.d.ts +1 -0
- package/dist/esm/v3/isomorphic/friendlyId.js +1 -0
- package/dist/esm/v3/isomorphic/friendlyId.js.map +1 -1
- package/dist/esm/v3/isomorphic/index.d.ts +1 -0
- package/dist/esm/v3/isomorphic/index.js +1 -0
- package/dist/esm/v3/isomorphic/index.js.map +1 -1
- package/dist/esm/v3/isomorphic/traceContext.d.ts +5 -0
- package/dist/esm/v3/isomorphic/traceContext.js +21 -0
- package/dist/esm/v3/isomorphic/traceContext.js.map +1 -0
- package/dist/esm/v3/otel/tracingSDK.d.ts +1 -14
- package/dist/esm/v3/otel/tracingSDK.js +93 -85
- package/dist/esm/v3/otel/tracingSDK.js.map +1 -1
- package/dist/esm/v3/resource-catalog/catalog.d.ts +2 -1
- package/dist/esm/v3/resource-catalog/index.d.ts +2 -1
- package/dist/esm/v3/resource-catalog/index.js +3 -0
- package/dist/esm/v3/resource-catalog/index.js.map +1 -1
- package/dist/esm/v3/resource-catalog/noopResourceCatalog.d.ts +2 -1
- package/dist/esm/v3/resource-catalog/noopResourceCatalog.js +3 -0
- package/dist/esm/v3/resource-catalog/noopResourceCatalog.js.map +1 -1
- package/dist/esm/v3/resource-catalog/standardResourceCatalog.d.ts +3 -1
- package/dist/esm/v3/resource-catalog/standardResourceCatalog.js +10 -2
- package/dist/esm/v3/resource-catalog/standardResourceCatalog.js.map +1 -1
- package/dist/esm/v3/runEngineWorker/supervisor/http.d.ts +80 -61
- package/dist/esm/v3/runEngineWorker/supervisor/schemas.d.ts +628 -489
- package/dist/esm/v3/runEngineWorker/workload/http.d.ts +64 -45
- package/dist/esm/v3/runEngineWorker/workload/schemas.d.ts +625 -486
- package/dist/esm/v3/runMetadata/manager.d.ts +1 -0
- package/dist/esm/v3/runMetadata/manager.js +72 -2
- package/dist/esm/v3/runMetadata/manager.js.map +1 -1
- package/dist/esm/v3/schemas/api.d.ts +233 -196
- package/dist/esm/v3/schemas/api.js +2 -0
- package/dist/esm/v3/schemas/api.js.map +1 -1
- package/dist/esm/v3/schemas/build.d.ts +88 -76
- package/dist/esm/v3/schemas/checkpoints.d.ts +72 -72
- package/dist/esm/v3/schemas/common.d.ts +2351 -1038
- package/dist/esm/v3/schemas/common.js +101 -41
- package/dist/esm/v3/schemas/common.js.map +1 -1
- package/dist/esm/v3/schemas/fetch.d.ts +12 -12
- package/dist/esm/v3/schemas/messages.d.ts +6692 -6167
- package/dist/esm/v3/schemas/messages.js +11 -11
- package/dist/esm/v3/schemas/messages.js.map +1 -1
- package/dist/esm/v3/schemas/openTelemetry.d.ts +18 -18
- package/dist/esm/v3/schemas/resources.d.ts +44 -38
- package/dist/esm/v3/schemas/resources.js +2 -0
- package/dist/esm/v3/schemas/resources.js.map +1 -1
- package/dist/esm/v3/schemas/runEngine.d.ts +360 -221
- package/dist/esm/v3/schemas/schemas.d.ts +593 -533
- package/dist/esm/v3/schemas/schemas.js +15 -4
- package/dist/esm/v3/schemas/schemas.js.map +1 -1
- package/dist/esm/v3/schemas/webhooks.d.ts +120 -120
- package/dist/esm/v3/taskContext/index.js +0 -2
- package/dist/esm/v3/taskContext/index.js.map +1 -1
- package/dist/esm/v3/taskContext/otelProcessors.d.ts +4 -5
- package/dist/esm/v3/taskContext/otelProcessors.js +4 -3
- package/dist/esm/v3/taskContext/otelProcessors.js.map +1 -1
- package/dist/esm/v3/trace-context-api.d.ts +3 -0
- package/dist/esm/v3/trace-context-api.js +6 -0
- package/dist/esm/v3/trace-context-api.js.map +1 -0
- package/dist/esm/v3/traceContext/api.d.ts +19 -0
- package/dist/esm/v3/traceContext/api.js +55 -0
- package/dist/esm/v3/traceContext/api.js.map +1 -0
- package/dist/esm/v3/traceContext/manager.d.ts +14 -0
- package/dist/esm/v3/traceContext/manager.js +56 -0
- package/dist/esm/v3/traceContext/manager.js.map +1 -0
- package/dist/esm/v3/traceContext/types.d.ts +12 -0
- package/dist/esm/v3/traceContext/types.js +2 -0
- package/dist/esm/v3/traceContext/types.js.map +1 -0
- package/dist/esm/v3/tracer.d.ts +0 -1
- package/dist/esm/v3/tracer.js +1 -4
- package/dist/esm/v3/tracer.js.map +1 -1
- package/dist/esm/v3/types/index.d.ts +1 -0
- package/dist/esm/v3/types/index.js +1 -0
- package/dist/esm/v3/types/index.js.map +1 -1
- package/dist/esm/v3/types/jsonSchema.d.ts +51 -0
- package/dist/esm/v3/types/jsonSchema.js +2 -0
- package/dist/esm/v3/types/jsonSchema.js.map +1 -0
- package/dist/esm/v3/types/tasks.d.ts +24 -0
- package/dist/esm/v3/types/tasks.js.map +1 -1
- package/dist/esm/v3/usage/api.d.ts +2 -1
- package/dist/esm/v3/usage/api.js +3 -0
- package/dist/esm/v3/usage/api.js.map +1 -1
- package/dist/esm/v3/usage/devUsageManager.d.ts +4 -1
- package/dist/esm/v3/usage/devUsageManager.js +14 -0
- package/dist/esm/v3/usage/devUsageManager.js.map +1 -1
- package/dist/esm/v3/usage/noopUsageManager.d.ts +2 -1
- package/dist/esm/v3/usage/noopUsageManager.js +6 -0
- package/dist/esm/v3/usage/noopUsageManager.js.map +1 -1
- package/dist/esm/v3/usage/prodUsageManager.d.ts +4 -1
- package/dist/esm/v3/usage/prodUsageManager.js +14 -0
- package/dist/esm/v3/usage/prodUsageManager.js.map +1 -1
- package/dist/esm/v3/usage/types.d.ts +5 -0
- package/dist/esm/v3/utils/globals.d.ts +2 -0
- package/dist/esm/v3/utils/globals.js.map +1 -1
- package/dist/esm/v3/workers/index.d.ts +1 -0
- package/dist/esm/v3/workers/index.js +1 -0
- package/dist/esm/v3/workers/index.js.map +1 -1
- package/dist/esm/v3/workers/taskExecutor.d.ts +2 -2
- package/dist/esm/v3/workers/taskExecutor.js +5 -17
- package/dist/esm/v3/workers/taskExecutor.js.map +1 -1
- package/dist/esm/version.js +1 -1
- package/package.json +12 -13
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
import { Context } from "@opentelemetry/api";
|
|
2
|
+
import { TraceContextManager } from "./types.js";
|
|
3
|
+
export declare class StandardTraceContextManager implements TraceContextManager {
|
|
4
|
+
traceContext: Record<string, unknown>;
|
|
5
|
+
getTraceContext(): Record<string, unknown>;
|
|
6
|
+
reset(): void;
|
|
7
|
+
getExternalTraceContext(): {
|
|
8
|
+
traceId: string;
|
|
9
|
+
spanId: string;
|
|
10
|
+
tracestate: string | undefined;
|
|
11
|
+
} | undefined;
|
|
12
|
+
extractContext(): Context;
|
|
13
|
+
withExternalTrace<T>(fn: () => T): T;
|
|
14
|
+
}
|
|
@@ -0,0 +1,56 @@
|
|
|
1
|
+
import { context, propagation, trace, TraceFlags } from "@opentelemetry/api";
|
|
2
|
+
export class StandardTraceContextManager {
|
|
3
|
+
traceContext = {};
|
|
4
|
+
getTraceContext() {
|
|
5
|
+
return this.traceContext;
|
|
6
|
+
}
|
|
7
|
+
reset() {
|
|
8
|
+
this.traceContext = {};
|
|
9
|
+
}
|
|
10
|
+
getExternalTraceContext() {
|
|
11
|
+
return extractExternalTraceContext(this.traceContext?.external);
|
|
12
|
+
}
|
|
13
|
+
extractContext() {
|
|
14
|
+
return propagation.extract(context.active(), this.traceContext ?? {});
|
|
15
|
+
}
|
|
16
|
+
withExternalTrace(fn) {
|
|
17
|
+
const externalTraceContext = this.getExternalTraceContext();
|
|
18
|
+
if (!externalTraceContext) {
|
|
19
|
+
return fn();
|
|
20
|
+
}
|
|
21
|
+
// Get the current active span context to extract the span ID
|
|
22
|
+
const currentSpanContext = trace.getActiveSpan()?.spanContext();
|
|
23
|
+
if (!currentSpanContext) {
|
|
24
|
+
throw new Error("No active span found. withExternalSpan must be called within an active span context.");
|
|
25
|
+
}
|
|
26
|
+
const spanContext = {
|
|
27
|
+
traceId: externalTraceContext.traceId,
|
|
28
|
+
spanId: currentSpanContext.spanId,
|
|
29
|
+
traceFlags: TraceFlags.SAMPLED,
|
|
30
|
+
isRemote: true,
|
|
31
|
+
};
|
|
32
|
+
const contextWithSpan = trace.setSpanContext(context.active(), spanContext);
|
|
33
|
+
return context.with(contextWithSpan, fn);
|
|
34
|
+
}
|
|
35
|
+
}
|
|
36
|
+
function extractExternalTraceContext(traceContext) {
|
|
37
|
+
if (typeof traceContext !== "object" || traceContext === null) {
|
|
38
|
+
return undefined;
|
|
39
|
+
}
|
|
40
|
+
const tracestate = "tracestate" in traceContext && typeof traceContext.tracestate === "string"
|
|
41
|
+
? traceContext.tracestate
|
|
42
|
+
: undefined;
|
|
43
|
+
if ("traceparent" in traceContext && typeof traceContext.traceparent === "string") {
|
|
44
|
+
const [version, traceId, spanId] = traceContext.traceparent.split("-");
|
|
45
|
+
if (!traceId || !spanId) {
|
|
46
|
+
return undefined;
|
|
47
|
+
}
|
|
48
|
+
return {
|
|
49
|
+
traceId,
|
|
50
|
+
spanId,
|
|
51
|
+
tracestate: tracestate,
|
|
52
|
+
};
|
|
53
|
+
}
|
|
54
|
+
return undefined;
|
|
55
|
+
}
|
|
56
|
+
//# sourceMappingURL=manager.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"manager.js","sourceRoot":"","sources":["../../../../src/v3/traceContext/manager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAW,OAAO,EAAE,WAAW,EAAE,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAGtF,MAAM,OAAO,2BAA2B;IAC/B,YAAY,GAA4B,EAAE,CAAC;IAElD,eAAe;QACb,OAAO,IAAI,CAAC,YAAY,CAAC;IAC3B,CAAC;IAED,KAAK;QACH,IAAI,CAAC,YAAY,GAAG,EAAE,CAAC;IACzB,CAAC;IAED,uBAAuB;QACrB,OAAO,2BAA2B,CAAC,IAAI,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAC;IAClE,CAAC;IAED,cAAc;QACZ,OAAO,WAAW,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,IAAI,CAAC,YAAY,IAAI,EAAE,CAAC,CAAC;IACxE,CAAC;IAED,iBAAiB,CAAI,EAAW;QAC9B,MAAM,oBAAoB,GAAG,IAAI,CAAC,uBAAuB,EAAE,CAAC;QAE5D,IAAI,CAAC,oBAAoB,EAAE,CAAC;YAC1B,OAAO,EAAE,EAAE,CAAC;QACd,CAAC;QAED,6DAA6D;QAC7D,MAAM,kBAAkB,GAAG,KAAK,CAAC,aAAa,EAAE,EAAE,WAAW,EAAE,CAAC;QAEhE,IAAI,CAAC,kBAAkB,EAAE,CAAC;YACxB,MAAM,IAAI,KAAK,CACb,sFAAsF,CACvF,CAAC;QACJ,CAAC;QAED,MAAM,WAAW,GAAG;YAClB,OAAO,EAAE,oBAAoB,CAAC,OAAO;YACrC,MAAM,EAAE,kBAAkB,CAAC,MAAM;YACjC,UAAU,EAAE,UAAU,CAAC,OAAO;YAC9B,QAAQ,EAAE,IAAI;SACf,CAAC;QAEF,MAAM,eAAe,GAAG,KAAK,CAAC,cAAc,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,WAAW,CAAC,CAAC;QAE5E,OAAO,OAAO,CAAC,IAAI,CAAC,eAAe,EAAE,EAAE,CAAC,CAAC;IAC3C,CAAC;CACF;AAED,SAAS,2BAA2B,CAAC,YAAqB;IACxD,IAAI,OAAO,YAAY,KAAK,QAAQ,IAAI,YAAY,KAAK,IAAI,EAAE,CAAC;QAC9D,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,MAAM,UAAU,GACd,YAAY,IAAI,YAAY,IAAI,OAAO,YAAY,CAAC,UAAU,KAAK,QAAQ;QACzE,CAAC,CAAC,YAAY,CAAC,UAAU;QACzB,CAAC,CAAC,SAAS,CAAC;IAEhB,IAAI,aAAa,IAAI,YAAY,IAAI,OAAO,YAAY,CAAC,WAAW,KAAK,QAAQ,EAAE,CAAC;QAClF,MAAM,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,CAAC,GAAG,YAAY,CAAC,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAEvE,IAAI,CAAC,OAAO,IAAI,CAAC,MAAM,EAAE,CAAC;YACxB,OAAO,SAAS,CAAC;QACnB,CAAC;QAED,OAAO;YACL,OAAO;YACP,MAAM;YACN,UAAU,EAAE,UAAU;SACvB,CAAC;IACJ,CAAC;IAED,OAAO,SAAS,CAAC;AACnB,CAAC"}
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
import { Context } from "@opentelemetry/api";
|
|
2
|
+
export interface TraceContextManager {
|
|
3
|
+
getTraceContext(): Record<string, unknown>;
|
|
4
|
+
extractContext(): Context;
|
|
5
|
+
reset(): void;
|
|
6
|
+
getExternalTraceContext(): {
|
|
7
|
+
traceId: string;
|
|
8
|
+
spanId: string;
|
|
9
|
+
tracestate?: string;
|
|
10
|
+
} | undefined;
|
|
11
|
+
withExternalTrace<T>(fn: () => T): T;
|
|
12
|
+
}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../src/v3/traceContext/types.ts"],"names":[],"mappings":""}
|
package/dist/esm/v3/tracer.d.ts
CHANGED
|
@@ -22,7 +22,6 @@ export declare class TriggerTracer {
|
|
|
22
22
|
private get tracer();
|
|
23
23
|
private _logger;
|
|
24
24
|
private get logger();
|
|
25
|
-
extractContext(traceContext?: Record<string, unknown>): Context;
|
|
26
25
|
startActiveSpan<T>(name: string, fn: (span: Span) => Promise<T>, options?: TriggerTracerSpanOptions, ctx?: Context, signal?: AbortSignal): Promise<T>;
|
|
27
26
|
startSpan(name: string, options?: SpanOptions, ctx?: Context): Span;
|
|
28
27
|
}
|
package/dist/esm/v3/tracer.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { SpanStatusCode, context,
|
|
1
|
+
import { SpanStatusCode, context, trace, } from "@opentelemetry/api";
|
|
2
2
|
import { logs } from "@opentelemetry/api-logs";
|
|
3
3
|
import { clock } from "./clock-api.js";
|
|
4
4
|
import { isCompleteTaskWithOutput } from "./errors.js";
|
|
@@ -29,9 +29,6 @@ export class TriggerTracer {
|
|
|
29
29
|
}
|
|
30
30
|
return this._logger;
|
|
31
31
|
}
|
|
32
|
-
extractContext(traceContext) {
|
|
33
|
-
return propagation.extract(context.active(), traceContext ?? {});
|
|
34
|
-
}
|
|
35
32
|
startActiveSpan(name, fn, options, ctx, signal) {
|
|
36
33
|
const parentContext = ctx ?? context.active();
|
|
37
34
|
const attributes = options?.attributes ?? {};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tracer.js","sourceRoot":"","sources":["../../../src/v3/tracer.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,cAAc,EAEd,OAAO,
|
|
1
|
+
{"version":3,"file":"tracer.js","sourceRoot":"","sources":["../../../src/v3/tracer.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,6 +6,7 @@ export * from "./tasks.js";
|
|
|
6
6
|
export * from "./idempotencyKeys.js";
|
|
7
7
|
export * from "./tools.js";
|
|
8
8
|
export * from "./queues.js";
|
|
9
|
+
export * from "./jsonSchema.js";
|
|
9
10
|
type ResolveEnvironmentVariablesOptions = {
|
|
10
11
|
variables: Record<string, string> | Array<{
|
|
11
12
|
name: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/v3/types/index.ts"],"names":[],"mappings":"AAIA,cAAc,YAAY,CAAC;AAC3B,cAAc,YAAY,CAAC;AAC3B,cAAc,sBAAsB,CAAC;AACrC,cAAc,YAAY,CAAC;AAC3B,cAAc,aAAa,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/v3/types/index.ts"],"names":[],"mappings":"AAIA,cAAc,YAAY,CAAC;AAC3B,cAAc,YAAY,CAAC;AAC3B,cAAc,sBAAsB,CAAC;AACrC,cAAc,YAAY,CAAC;AAC3B,cAAc,aAAa,CAAC;AAC5B,cAAc,iBAAiB,CAAC"}
|
|
@@ -0,0 +1,51 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* JSON Schema type definition - compatible with JSON Schema Draft 7
|
|
3
|
+
* Based on the JSONSchema7 type from @types/json-schema but defined inline to avoid import issues
|
|
4
|
+
*/
|
|
5
|
+
export interface JSONSchema {
|
|
6
|
+
$id?: string;
|
|
7
|
+
$ref?: string;
|
|
8
|
+
$schema?: string;
|
|
9
|
+
$comment?: string;
|
|
10
|
+
type?: JSONSchemaType | JSONSchemaType[];
|
|
11
|
+
enum?: any[];
|
|
12
|
+
const?: any;
|
|
13
|
+
multipleOf?: number;
|
|
14
|
+
maximum?: number;
|
|
15
|
+
exclusiveMaximum?: number;
|
|
16
|
+
minimum?: number;
|
|
17
|
+
exclusiveMinimum?: number;
|
|
18
|
+
maxLength?: number;
|
|
19
|
+
minLength?: number;
|
|
20
|
+
pattern?: string;
|
|
21
|
+
format?: string;
|
|
22
|
+
items?: JSONSchema | JSONSchema[];
|
|
23
|
+
additionalItems?: JSONSchema | boolean;
|
|
24
|
+
maxItems?: number;
|
|
25
|
+
minItems?: number;
|
|
26
|
+
uniqueItems?: boolean;
|
|
27
|
+
contains?: JSONSchema;
|
|
28
|
+
maxProperties?: number;
|
|
29
|
+
minProperties?: number;
|
|
30
|
+
required?: string[];
|
|
31
|
+
properties?: Record<string, JSONSchema>;
|
|
32
|
+
patternProperties?: Record<string, JSONSchema>;
|
|
33
|
+
additionalProperties?: JSONSchema | boolean;
|
|
34
|
+
dependencies?: Record<string, JSONSchema | string[]>;
|
|
35
|
+
propertyNames?: JSONSchema;
|
|
36
|
+
if?: JSONSchema;
|
|
37
|
+
then?: JSONSchema;
|
|
38
|
+
else?: JSONSchema;
|
|
39
|
+
allOf?: JSONSchema[];
|
|
40
|
+
anyOf?: JSONSchema[];
|
|
41
|
+
oneOf?: JSONSchema[];
|
|
42
|
+
not?: JSONSchema;
|
|
43
|
+
title?: string;
|
|
44
|
+
description?: string;
|
|
45
|
+
default?: any;
|
|
46
|
+
readOnly?: boolean;
|
|
47
|
+
writeOnly?: boolean;
|
|
48
|
+
examples?: any[];
|
|
49
|
+
[key: string]: any;
|
|
50
|
+
}
|
|
51
|
+
export type JSONSchemaType = "string" | "number" | "integer" | "boolean" | "object" | "array" | "null";
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"jsonSchema.js","sourceRoot":"","sources":["../../../../src/v3/types/jsonSchema.ts"],"names":[],"mappings":""}
|
|
@@ -8,6 +8,7 @@ import { QueueOptions } from "./queues.js";
|
|
|
8
8
|
import { AnySchemaParseFn, inferSchemaIn, inferSchemaOut, Schema } from "./schemas.js";
|
|
9
9
|
import { inferToolParameters, ToolTaskParameters } from "./tools.js";
|
|
10
10
|
import { Prettify } from "./utils.js";
|
|
11
|
+
import { JSONSchema } from "./jsonSchema.js";
|
|
11
12
|
export type Queue = QueueOptions;
|
|
12
13
|
export type TaskSchema = Schema;
|
|
13
14
|
export type { inferSchemaIn } from "./schemas.js";
|
|
@@ -238,8 +239,16 @@ type CommonTaskOptions<TIdentifier extends string, TPayload = void, TOutput = un
|
|
|
238
239
|
* onFailure is called after a task run has failed (meaning the run function threw an error and won't be retried anymore)
|
|
239
240
|
*/
|
|
240
241
|
onFailure?: OnFailureHookFunction<TPayload, TInitOutput>;
|
|
242
|
+
/**
|
|
243
|
+
* JSON Schema for the task payload. This will be synced to the server during indexing.
|
|
244
|
+
* Should be a valid JSON Schema Draft 7 object.
|
|
245
|
+
*/
|
|
246
|
+
jsonSchema?: JSONSchema;
|
|
241
247
|
};
|
|
242
248
|
export type TaskOptions<TIdentifier extends string, TPayload = void, TOutput = unknown, TInitOutput extends InitOutput = any> = CommonTaskOptions<TIdentifier, TPayload, TOutput, TInitOutput>;
|
|
249
|
+
export type TaskOptionsWithSchema<TIdentifier extends string, TOutput = unknown, TInitOutput extends InitOutput = any> = CommonTaskOptions<TIdentifier, any, TOutput, TInitOutput> & {
|
|
250
|
+
jsonSchema: JSONSchema;
|
|
251
|
+
};
|
|
243
252
|
export type TaskWithSchemaOptions<TIdentifier extends string, TSchema extends TaskSchema | undefined = undefined, TOutput = unknown, TInitOutput extends InitOutput = any> = CommonTaskOptions<TIdentifier, inferSchemaOut<TSchema>, TOutput, TInitOutput> & {
|
|
244
253
|
schema?: TSchema;
|
|
245
254
|
};
|
|
@@ -586,6 +595,20 @@ export type TriggerOptions = {
|
|
|
586
595
|
* to the same version as the parent task that is triggering the child tasks.
|
|
587
596
|
*/
|
|
588
597
|
version?: string;
|
|
598
|
+
/**
|
|
599
|
+
* Specify the region to run the task in. This overrides the default region set for your project in the dashboard.
|
|
600
|
+
*
|
|
601
|
+
* Check the Regions page in the dashboard for regions that are available to you.
|
|
602
|
+
*
|
|
603
|
+
* In DEV this won't do anything, so it's fine to set it in your code.
|
|
604
|
+
*
|
|
605
|
+
* @example
|
|
606
|
+
*
|
|
607
|
+
* ```ts
|
|
608
|
+
* await myTask.trigger({ foo: "bar" }, { region: "us-east-1" });
|
|
609
|
+
* ```
|
|
610
|
+
*/
|
|
611
|
+
region?: string;
|
|
589
612
|
};
|
|
590
613
|
export type TriggerAndWaitOptions = Omit<TriggerOptions, "version">;
|
|
591
614
|
export type BatchTriggerOptions = {
|
|
@@ -620,6 +643,7 @@ export type TaskMetadataWithFunctions = TaskMetadata & {
|
|
|
620
643
|
onStart?: (payload: any, params: StartFnParams) => Promise<void>;
|
|
621
644
|
parsePayload?: AnySchemaParseFn;
|
|
622
645
|
};
|
|
646
|
+
schema?: TaskSchema;
|
|
623
647
|
};
|
|
624
648
|
export type RunTypes<TTaskIdentifier extends string, TPayload, TOutput> = {
|
|
625
649
|
output: TOutput;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tasks.js","sourceRoot":"","sources":["../../../../src/v3/types/tasks.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"tasks.js","sourceRoot":"","sources":["../../../../src/v3/types/tasks.ts"],"names":[],"mappings":"AAoCA,MAAM,OAAO,kBAAmB,SAAQ,KAAK;IAC3B,MAAM,CAAS;IACf,KAAK,CAAS;IACd,KAAK,CAAW;IAEhC,YAAY,MAAc,EAAE,KAAa,EAAE,YAAqB;QAC9D,IAAI,YAAY,YAAY,KAAK,EAAE,CAAC;YAClC,KAAK,CAAC,YAAY,MAAM,KAAK,YAAY,CAAC,OAAO,EAAE,CAAC,CAAC;YACrD,IAAI,CAAC,KAAK,GAAG,YAAY,CAAC;YAC1B,IAAI,CAAC,IAAI,GAAG,oBAAoB,CAAC;QACnC,CAAC;aAAM,CAAC;YACN,KAAK,CAAC,YAAY,MAAM,EAAE,CAAC,CAAC;YAC5B,IAAI,CAAC,IAAI,GAAG,oBAAoB,CAAC;YACjC,IAAI,CAAC,KAAK,GAAG,YAAY,CAAC;QAC5B,CAAC;QAED,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;IACrB,CAAC;CACF;AAED,MAAM,OAAO,cAAoD,SAAQ,OAExE;IAUoB;IATnB,YACE,QAOS,EACQ,MAAmB;QAEpC,KAAK,CAAC,QAAQ,CAAC,CAAC;QAFC,WAAM,GAAN,MAAM,CAAa;IAGtC,CAAC;IAED,MAAM;QACJ,OAAO,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE;YAC1B,IAAI,MAAM,CAAC,EAAE,EAAE,CAAC;gBACd,OAAO,MAAM,CAAC,MAAM,CAAC;YACvB,CAAC;iBAAM,CAAC;gBACN,MAAM,IAAI,kBAAkB,CAAC,IAAI,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;YACrE,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC;CACF"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { UsageManager, UsageMeasurement, UsageSample } from "./types.js";
|
|
1
|
+
import type { InitialUsageState, UsageManager, UsageMeasurement, UsageSample } from "./types.js";
|
|
2
2
|
export declare class UsageAPI implements UsageManager {
|
|
3
3
|
#private;
|
|
4
4
|
private static _instance?;
|
|
@@ -12,4 +12,5 @@ export declare class UsageAPI implements UsageManager {
|
|
|
12
12
|
sample(): UsageSample | undefined;
|
|
13
13
|
flush(): Promise<void>;
|
|
14
14
|
reset(): void;
|
|
15
|
+
getInitialState(): InitialUsageState;
|
|
15
16
|
}
|
package/dist/esm/v3/usage/api.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api.js","sourceRoot":"","sources":["../../../../src/v3/usage/api.ts"],"names":[],"mappings":"AAAA,MAAM,QAAQ,GAAG,OAAO,CAAC;AAEzB,OAAO,EAAE,SAAS,EAAE,cAAc,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAElF,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAEzD,MAAM,kBAAkB,GAAG,IAAI,gBAAgB,EAAE,CAAC;AAElD,MAAM,OAAO,QAAQ;IACX,MAAM,CAAC,SAAS,CAAY;IAEpC,gBAAuB,CAAC;IAEjB,MAAM,CAAC,WAAW;QACvB,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC;YACpB,IAAI,CAAC,SAAS,GAAG,IAAI,QAAQ,EAAE,CAAC;QAClC,CAAC;QAED,OAAO,IAAI,CAAC,SAAS,CAAC;IACxB,CAAC;IAEM,qBAAqB,CAAC,OAAqB;QAChD,OAAO,cAAc,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IAC3C,CAAC;IAEM,OAAO;QACZ,IAAI,CAAC,gBAAgB,EAAE,CAAC,OAAO,EAAE,CAAC;QAClC,gBAAgB,CAAC,QAAQ,CAAC,CAAC;IAC7B,CAAC;IAEM,KAAK;QACV,OAAO,IAAI,CAAC,gBAAgB,EAAE,CAAC,KAAK,EAAE,CAAC;IACzC,CAAC;IAEM,IAAI,CAAC,WAA6B;QACvC,OAAO,IAAI,CAAC,gBAAgB,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;IACnD,CAAC;IAEM,UAAU,CAAI,EAAoB;QACvC,OAAO,IAAI,CAAC,gBAAgB,EAAE,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;IAChD,CAAC;IAEM,MAAM;QACX,OAAO,IAAI,CAAC,gBAAgB,EAAE,CAAC,MAAM,EAAE,CAAC;IAC1C,CAAC;IAEM,KAAK;QACV,OAAO,IAAI,CAAC,gBAAgB,EAAE,CAAC,KAAK,EAAE,CAAC;IACzC,CAAC;IAEM,KAAK;QACV,IAAI,CAAC,gBAAgB,EAAE,CAAC,KAAK,EAAE,CAAC;QAChC,IAAI,CAAC,OAAO,EAAE,CAAC;IACjB,CAAC;IAED,gBAAgB;QACd,OAAO,SAAS,CAAC,QAAQ,CAAC,IAAI,kBAAkB,CAAC;IACnD,CAAC;CACF"}
|
|
1
|
+
{"version":3,"file":"api.js","sourceRoot":"","sources":["../../../../src/v3/usage/api.ts"],"names":[],"mappings":"AAAA,MAAM,QAAQ,GAAG,OAAO,CAAC;AAEzB,OAAO,EAAE,SAAS,EAAE,cAAc,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAElF,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAEzD,MAAM,kBAAkB,GAAG,IAAI,gBAAgB,EAAE,CAAC;AAElD,MAAM,OAAO,QAAQ;IACX,MAAM,CAAC,SAAS,CAAY;IAEpC,gBAAuB,CAAC;IAEjB,MAAM,CAAC,WAAW;QACvB,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC;YACpB,IAAI,CAAC,SAAS,GAAG,IAAI,QAAQ,EAAE,CAAC;QAClC,CAAC;QAED,OAAO,IAAI,CAAC,SAAS,CAAC;IACxB,CAAC;IAEM,qBAAqB,CAAC,OAAqB;QAChD,OAAO,cAAc,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IAC3C,CAAC;IAEM,OAAO;QACZ,IAAI,CAAC,gBAAgB,EAAE,CAAC,OAAO,EAAE,CAAC;QAClC,gBAAgB,CAAC,QAAQ,CAAC,CAAC;IAC7B,CAAC;IAEM,KAAK;QACV,OAAO,IAAI,CAAC,gBAAgB,EAAE,CAAC,KAAK,EAAE,CAAC;IACzC,CAAC;IAEM,IAAI,CAAC,WAA6B;QACvC,OAAO,IAAI,CAAC,gBAAgB,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;IACnD,CAAC;IAEM,UAAU,CAAI,EAAoB;QACvC,OAAO,IAAI,CAAC,gBAAgB,EAAE,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;IAChD,CAAC;IAEM,MAAM;QACX,OAAO,IAAI,CAAC,gBAAgB,EAAE,CAAC,MAAM,EAAE,CAAC;IAC1C,CAAC;IAEM,KAAK;QACV,OAAO,IAAI,CAAC,gBAAgB,EAAE,CAAC,KAAK,EAAE,CAAC;IACzC,CAAC;IAEM,KAAK;QACV,IAAI,CAAC,gBAAgB,EAAE,CAAC,KAAK,EAAE,CAAC;QAChC,IAAI,CAAC,OAAO,EAAE,CAAC;IACjB,CAAC;IAEM,eAAe;QACpB,OAAO,IAAI,CAAC,gBAAgB,EAAE,CAAC,eAAe,EAAE,CAAC;IACnD,CAAC;IAED,gBAAgB;QACd,OAAO,SAAS,CAAC,QAAQ,CAAC,IAAI,kBAAkB,CAAC;IACnD,CAAC;CACF"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { UsageManager, UsageMeasurement, UsageSample } from "./types.js";
|
|
1
|
+
import { InitialUsageState, UsageManager, UsageMeasurement, UsageSample } from "./types.js";
|
|
2
2
|
import { ClockTime } from "../clock/clock.js";
|
|
3
3
|
declare class DevUsageMeasurement implements UsageMeasurement {
|
|
4
4
|
readonly id: string;
|
|
@@ -14,9 +14,12 @@ export declare class DevUsageManager implements UsageManager {
|
|
|
14
14
|
private _firstMeasurement?;
|
|
15
15
|
private _currentMeasurements;
|
|
16
16
|
private _pauses;
|
|
17
|
+
private _initialState;
|
|
17
18
|
disable(): void;
|
|
18
19
|
flush(): Promise<void>;
|
|
19
20
|
reset(): void;
|
|
21
|
+
setInitialState(state: InitialUsageState): void;
|
|
22
|
+
getInitialState(): InitialUsageState;
|
|
20
23
|
sample(): UsageSample | undefined;
|
|
21
24
|
start(): DevUsageMeasurement;
|
|
22
25
|
stop(measurement: DevUsageMeasurement): UsageSample;
|
|
@@ -35,12 +35,26 @@ export class DevUsageManager {
|
|
|
35
35
|
_firstMeasurement;
|
|
36
36
|
_currentMeasurements = new Map();
|
|
37
37
|
_pauses = new Map();
|
|
38
|
+
_initialState = {
|
|
39
|
+
cpuTime: 0,
|
|
40
|
+
costInCents: 0,
|
|
41
|
+
};
|
|
38
42
|
disable() { }
|
|
39
43
|
async flush() { }
|
|
40
44
|
reset() {
|
|
41
45
|
this._firstMeasurement = undefined;
|
|
42
46
|
this._currentMeasurements.clear();
|
|
43
47
|
this._pauses.clear();
|
|
48
|
+
this._initialState = {
|
|
49
|
+
cpuTime: 0,
|
|
50
|
+
costInCents: 0,
|
|
51
|
+
};
|
|
52
|
+
}
|
|
53
|
+
setInitialState(state) {
|
|
54
|
+
this._initialState = state;
|
|
55
|
+
}
|
|
56
|
+
getInitialState() {
|
|
57
|
+
return this._initialState;
|
|
44
58
|
}
|
|
45
59
|
sample() {
|
|
46
60
|
return this._firstMeasurement?.sample();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"devUsageManager.js","sourceRoot":"","sources":["../../../../src/v3/usage/devUsageManager.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AACxC,OAAO,EAAa,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAErE,MAAM,mBAAmB;IAKL;IACR;IALF,OAAO,GAAuD,IAAI,GAAG,EAAE,CAAC;IACxE,QAAQ,CAAwB;IAExC,YACkB,EAAU,EAClB,YAAuB,KAAK,CAAC,UAAU,EAAE;QADjC,OAAE,GAAF,EAAE,CAAQ;QAClB,cAAS,GAAT,SAAS,CAAgC;IAChD,CAAC;IAEJ,IAAI;QACF,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAC,UAAU,EAAE,CAAC;IACrC,CAAC;IAED,MAAM;QACJ,MAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,IAAI,KAAK,CAAC,UAAU,EAAE,CAAC;QAEpD,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,qBAAqB,CAAC,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAErF,IAAI,QAAQ,KAAK,CAAC,EAAE,CAAC;YACnB,OAAO,EAAE,OAAO,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,CAAC;QACrC,CAAC;QAED,MAAM,WAAW,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE;YAC5E,OAAO,KAAK,GAAG,qBAAqB,CAAC,KAAK,CAAC,KAAK,EAAE,KAAK,CAAC,GAAG,IAAI,OAAO,CAAC,CAAC;QAC1E,CAAC,EAAE,CAAC,CAAC,CAAC;QAEN,MAAM,OAAO,GAAG,QAAQ,GAAG,WAAW,CAAC;QAEvC,OAAO;YACL,QAAQ;YACR,OAAO;SACR,CAAC;IACJ,CAAC;IAED,aAAa,CAAC,OAAe,EAAE,KAAgB,EAAE,GAAe;QAC9D,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,CAAC;IAC5C,CAAC;CACF;AAED,MAAM,OAAO,eAAe;IAClB,iBAAiB,CAAuB;IACxC,oBAAoB,GAAqC,IAAI,GAAG,EAAE,CAAC;IACnE,OAAO,GAAuD,IAAI,GAAG,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"devUsageManager.js","sourceRoot":"","sources":["../../../../src/v3/usage/devUsageManager.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { UsageManager, UsageMeasurement, UsageSample } from "./types.js";
|
|
1
|
+
import { InitialUsageState, UsageManager, UsageMeasurement, UsageSample } from "./types.js";
|
|
2
2
|
export declare class NoopUsageManager implements UsageManager {
|
|
3
3
|
disable(): void;
|
|
4
4
|
flush(): Promise<void>;
|
|
@@ -7,4 +7,5 @@ export declare class NoopUsageManager implements UsageManager {
|
|
|
7
7
|
pauseAsync<T>(cb: () => Promise<T>): Promise<T>;
|
|
8
8
|
sample(): UsageSample | undefined;
|
|
9
9
|
reset(): void;
|
|
10
|
+
getInitialState(): InitialUsageState;
|
|
10
11
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"noopUsageManager.js","sourceRoot":"","sources":["../../../../src/v3/usage/noopUsageManager.ts"],"names":[],"mappings":"AAEA,MAAM,OAAO,gBAAgB;IAC3B,OAAO;QACL,OAAO;IACT,CAAC;IAED,KAAK,CAAC,KAAK;QACT,OAAO;IACT,CAAC;IAED,KAAK;QACH,OAAO;YACL,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,CAAC;SAC5C,CAAC;IACJ,CAAC;IAED,IAAI,CAAC,WAA6B;QAChC,OAAO,WAAW,CAAC,MAAM,EAAE,CAAC;IAC9B,CAAC;IAED,UAAU,CAAI,EAAoB;QAChC,OAAO,EAAE,EAAE,CAAC;IACd,CAAC;IAED,MAAM;QACJ,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,KAAK;QACH,OAAO;IACT,CAAC;CACF"}
|
|
1
|
+
{"version":3,"file":"noopUsageManager.js","sourceRoot":"","sources":["../../../../src/v3/usage/noopUsageManager.ts"],"names":[],"mappings":"AAEA,MAAM,OAAO,gBAAgB;IAC3B,OAAO;QACL,OAAO;IACT,CAAC;IAED,KAAK,CAAC,KAAK;QACT,OAAO;IACT,CAAC;IAED,KAAK;QACH,OAAO;YACL,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,CAAC;SAC5C,CAAC;IACJ,CAAC;IAED,IAAI,CAAC,WAA6B;QAChC,OAAO,WAAW,CAAC,MAAM,EAAE,CAAC;IAC9B,CAAC;IAED,UAAU,CAAI,EAAoB;QAChC,OAAO,EAAE,EAAE,CAAC;IACd,CAAC;IAED,MAAM;QACJ,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,KAAK;QACH,OAAO;IACT,CAAC;IAED,eAAe;QACb,OAAO;YACL,OAAO,EAAE,CAAC;YACV,WAAW,EAAE,CAAC;SACf,CAAC;IACJ,CAAC;CACF"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { UsageManager, UsageMeasurement, UsageSample } from "./types.js";
|
|
1
|
+
import { InitialUsageState, UsageManager, UsageMeasurement, UsageSample } from "./types.js";
|
|
2
2
|
export type ProdUsageManagerOptions = {
|
|
3
3
|
heartbeatIntervalMs?: number;
|
|
4
4
|
url?: string;
|
|
@@ -12,8 +12,11 @@ export declare class ProdUsageManager implements UsageManager {
|
|
|
12
12
|
private _abortController;
|
|
13
13
|
private _lastSample;
|
|
14
14
|
private _usageClient;
|
|
15
|
+
private _initialState;
|
|
15
16
|
constructor(delegageUsageManager: UsageManager, options: ProdUsageManagerOptions);
|
|
16
17
|
get isReportingEnabled(): boolean;
|
|
18
|
+
setInitialState(state: InitialUsageState): void;
|
|
19
|
+
getInitialState(): InitialUsageState;
|
|
17
20
|
reset(): void;
|
|
18
21
|
disable(): void;
|
|
19
22
|
sample(): UsageSample | undefined;
|
|
@@ -7,6 +7,10 @@ export class ProdUsageManager {
|
|
|
7
7
|
_abortController;
|
|
8
8
|
_lastSample;
|
|
9
9
|
_usageClient;
|
|
10
|
+
_initialState = {
|
|
11
|
+
cpuTime: 0,
|
|
12
|
+
costInCents: 0,
|
|
13
|
+
};
|
|
10
14
|
constructor(delegageUsageManager, options) {
|
|
11
15
|
this.delegageUsageManager = delegageUsageManager;
|
|
12
16
|
this.options = options;
|
|
@@ -17,6 +21,12 @@ export class ProdUsageManager {
|
|
|
17
21
|
get isReportingEnabled() {
|
|
18
22
|
return typeof this._usageClient !== "undefined";
|
|
19
23
|
}
|
|
24
|
+
setInitialState(state) {
|
|
25
|
+
this._initialState = state;
|
|
26
|
+
}
|
|
27
|
+
getInitialState() {
|
|
28
|
+
return this._initialState;
|
|
29
|
+
}
|
|
20
30
|
reset() {
|
|
21
31
|
this.delegageUsageManager.reset();
|
|
22
32
|
this._abortController?.abort();
|
|
@@ -24,6 +34,10 @@ export class ProdUsageManager {
|
|
|
24
34
|
this._usageClient = undefined;
|
|
25
35
|
this._measurement = undefined;
|
|
26
36
|
this._lastSample = undefined;
|
|
37
|
+
this._initialState = {
|
|
38
|
+
cpuTime: 0,
|
|
39
|
+
costInCents: 0,
|
|
40
|
+
};
|
|
27
41
|
}
|
|
28
42
|
disable() {
|
|
29
43
|
this.delegageUsageManager.disable();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prodUsageManager.js","sourceRoot":"","sources":["../../../../src/v3/usage/prodUsageManager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAEnD,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAQ/C,MAAM,OAAO,gBAAgB;
|
|
1
|
+
{"version":3,"file":"prodUsageManager.js","sourceRoot":"","sources":["../../../../src/v3/usage/prodUsageManager.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,8 +5,13 @@ export type UsageSample = {
|
|
|
5
5
|
export interface UsageMeasurement {
|
|
6
6
|
sample(): UsageSample;
|
|
7
7
|
}
|
|
8
|
+
export type InitialUsageState = {
|
|
9
|
+
cpuTime: number;
|
|
10
|
+
costInCents: number;
|
|
11
|
+
};
|
|
8
12
|
export interface UsageManager {
|
|
9
13
|
disable(): void;
|
|
14
|
+
getInitialState(): InitialUsageState;
|
|
10
15
|
start(): UsageMeasurement;
|
|
11
16
|
stop(measurement: UsageMeasurement): UsageSample;
|
|
12
17
|
sample(): UsageSample | undefined;
|
|
@@ -8,6 +8,7 @@ import type { RuntimeManager } from "../runtime/manager.js";
|
|
|
8
8
|
import { RunTimelineMetricsManager } from "../runTimelineMetrics/types.js";
|
|
9
9
|
import { TaskContext } from "../taskContext/types.js";
|
|
10
10
|
import { TimeoutManager } from "../timeout/types.js";
|
|
11
|
+
import { TraceContextManager } from "../traceContext/types.js";
|
|
11
12
|
import { UsageManager } from "../usage/types.js";
|
|
12
13
|
import { WaitUntilManager } from "../waitUntil/types.js";
|
|
13
14
|
export declare function registerGlobal<Type extends keyof TriggerDotDevGlobalAPI>(type: Type, instance: TriggerDotDevGlobalAPI[Type], allowOverride?: boolean): boolean;
|
|
@@ -27,5 +28,6 @@ type TriggerDotDevGlobalAPI = {
|
|
|
27
28
|
["run-timeline-metrics"]?: RunTimelineMetricsManager;
|
|
28
29
|
["lifecycle-hooks"]?: LifecycleHooksManager;
|
|
29
30
|
["locals"]?: LocalsManager;
|
|
31
|
+
["trace-context"]?: TraceContextManager;
|
|
30
32
|
};
|
|
31
33
|
export {};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"globals.js","sourceRoot":"","sources":["../../../../src/v3/utils/globals.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"globals.js","sourceRoot":"","sources":["../../../../src/v3/utils/globals.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAE5C,MAAM,0BAA0B,GAAG,MAAM,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;AAEpE,MAAM,OAAO,GAAG,WAAkC,CAAC;AAEnD,MAAM,UAAU,cAAc,CAC5B,IAAU,EACV,QAAsC,EACtC,aAAa,GAAG,KAAK;IAErB,MAAM,GAAG,GAAG,CAAC,OAAO,CAAC,0BAA0B,CAAC,GAAG,OAAO,CAAC,0BAA0B,CAAC,IAAI,EAAE,CAAC,CAAC;IAE9F,IAAI,CAAC,aAAa,IAAI,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;QAChC,yCAAyC;QACzC,MAAM,GAAG,GAAG,IAAI,KAAK,CAAC,yDAAyD,IAAI,EAAE,CAAC,CAAC;QACvF,OAAO,KAAK,CAAC;IACf,CAAC;IAED,GAAG,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC;IAErB,OAAO,IAAI,CAAC;AACd,CAAC;AAED,MAAM,UAAU,SAAS,CACvB,IAAU;IAEV,OAAO,OAAO,CAAC,0BAA0B,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC;AACrD,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,IAAkC;IACjE,MAAM,GAAG,GAAG,OAAO,CAAC,0BAA0B,CAAC,CAAC;IAEhD,IAAI,GAAG,EAAE,CAAC;QACR,OAAO,GAAG,CAAC,IAAI,CAAC,CAAC;IACnB,CAAC;AACH,CAAC"}
|
|
@@ -20,3 +20,4 @@ export { WarmStartClient, type WarmStartClientOptions } from "../workers/warmSta
|
|
|
20
20
|
export { StandardLifecycleHooksManager } from "../lifecycleHooks/manager.js";
|
|
21
21
|
export { StandardLocalsManager } from "../locals/manager.js";
|
|
22
22
|
export { populateEnv } from "./populateEnv.js";
|
|
23
|
+
export { StandardTraceContextManager } from "../traceContext/manager.js";
|
|
@@ -19,4 +19,5 @@ export { WarmStartClient } from "../workers/warmStartClient.js";
|
|
|
19
19
|
export { StandardLifecycleHooksManager } from "../lifecycleHooks/manager.js";
|
|
20
20
|
export { StandardLocalsManager } from "../locals/manager.js";
|
|
21
21
|
export { populateEnv } from "./populateEnv.js";
|
|
22
|
+
export { StandardTraceContextManager } from "../traceContext/manager.js";
|
|
22
23
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/v3/workers/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAA4B,MAAM,mBAAmB,CAAC;AAE3E,OAAO,EAAE,gBAAgB,IAAI,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAChF,OAAO,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAChE,OAAO,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AACpE,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAC9D,OAAO,EACL,UAAU,EAEV,mBAAmB,EACnB,kBAAkB,GACnB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,uBAAuB,EAAE,MAAM,gDAAgD,CAAC;AACzF,OAAO,EACL,wBAAwB,EACxB,uBAAuB,GACxB,MAAM,kCAAkC,CAAC;AAC1C,cAAc,iBAAiB,CAAC;AAChC,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAC9D,OAAO,EAAE,gBAAgB,EAAgC,MAAM,8BAA8B,CAAC;AAC9F,OAAO,EAAE,mBAAmB,EAAE,MAAM,mCAAmC,CAAC;AACxE,OAAO,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAC;AACpE,OAAO,EAAE,wBAAwB,EAAE,MAAM,yBAAyB,CAAC;AACnE,OAAO,EAAE,oBAAoB,EAAE,MAAM,oCAAoC,CAAC;AAC1E,cAAc,6BAA6B,CAAC;AAC5C,OAAO,EAAE,iCAAiC,EAAE,MAAM,oDAAoD,CAAC;AACvG,OAAO,EAAE,eAAe,EAA+B,MAAM,+BAA+B,CAAC;AAC7F,OAAO,EAAE,6BAA6B,EAAE,MAAM,8BAA8B,CAAC;AAC7E,OAAO,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAC;AAC7D,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/v3/workers/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAA4B,MAAM,mBAAmB,CAAC;AAE3E,OAAO,EAAE,gBAAgB,IAAI,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAChF,OAAO,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAChE,OAAO,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AACpE,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAC9D,OAAO,EACL,UAAU,EAEV,mBAAmB,EACnB,kBAAkB,GACnB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,uBAAuB,EAAE,MAAM,gDAAgD,CAAC;AACzF,OAAO,EACL,wBAAwB,EACxB,uBAAuB,GACxB,MAAM,kCAAkC,CAAC;AAC1C,cAAc,iBAAiB,CAAC;AAChC,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAC9D,OAAO,EAAE,gBAAgB,EAAgC,MAAM,8BAA8B,CAAC;AAC9F,OAAO,EAAE,mBAAmB,EAAE,MAAM,mCAAmC,CAAC;AACxE,OAAO,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAC;AACpE,OAAO,EAAE,wBAAwB,EAAE,MAAM,yBAAyB,CAAC;AACnE,OAAO,EAAE,oBAAoB,EAAE,MAAM,oCAAoC,CAAC;AAC1E,cAAc,6BAA6B,CAAC;AAC5C,OAAO,EAAE,iCAAiC,EAAE,MAAM,oDAAoD,CAAC;AACvG,OAAO,EAAE,eAAe,EAA+B,MAAM,+BAA+B,CAAC;AAC7F,OAAO,EAAE,6BAA6B,EAAE,MAAM,8BAA8B,CAAC;AAC7E,OAAO,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAC;AAC7D,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,2BAA2B,EAAE,MAAM,4BAA4B,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { ConsoleInterceptor } from "../consoleInterceptor.js";
|
|
2
2
|
import { TracingSDK } from "../otel/index.js";
|
|
3
|
-
import { RetryOptions,
|
|
3
|
+
import { RetryOptions, TaskRunContext, TaskRunExecution, TaskRunExecutionResult } from "../schemas/index.js";
|
|
4
4
|
import { TriggerTracer } from "../tracer.js";
|
|
5
5
|
import { TaskMetadataWithFunctions } from "../types/index.js";
|
|
6
6
|
export type TaskExecutorOptions = {
|
|
@@ -24,7 +24,7 @@ export declare class TaskExecutor {
|
|
|
24
24
|
private _isWarmStart;
|
|
25
25
|
private _executionCount;
|
|
26
26
|
constructor(task: TaskMetadataWithFunctions, options: TaskExecutorOptions);
|
|
27
|
-
execute(execution: TaskRunExecution,
|
|
27
|
+
execute(execution: TaskRunExecution, ctx: TaskRunContext, signal: AbortSignal): Promise<{
|
|
28
28
|
result: TaskRunExecutionResult;
|
|
29
29
|
}>;
|
|
30
30
|
}
|
|
@@ -1,15 +1,14 @@
|
|
|
1
1
|
import { context, SpanKind } from "@opentelemetry/api";
|
|
2
|
+
import { promiseWithResolvers } from "../../utils.js";
|
|
2
3
|
import { InternalError, isCompleteTaskWithOutput, isInternalError, parseError, sanitizeError, TaskPayloadParsedError, } from "../errors.js";
|
|
3
|
-
import { accessoryAttributes, attemptKey, flattenAttributes, lifecycleHooks, OTEL_SPAN_ATTRIBUTE_COUNT_LIMIT, runMetadata, waitUntil, } from "../index.js";
|
|
4
|
+
import { accessoryAttributes, attemptKey, flattenAttributes, lifecycleHooks, OTEL_SPAN_ATTRIBUTE_COUNT_LIMIT, runMetadata, traceContext, waitUntil, } from "../index.js";
|
|
4
5
|
import { recordSpanException } from "../otel/index.js";
|
|
5
6
|
import { runTimelineMetrics } from "../run-timeline-metrics-api.js";
|
|
6
|
-
import { COLD_VARIANT,
|
|
7
|
+
import { COLD_VARIANT, TaskRunErrorCodes, WARM_VARIANT, } from "../schemas/index.js";
|
|
7
8
|
import { SemanticInternalAttributes } from "../semanticInternalAttributes.js";
|
|
8
|
-
import { taskContext } from "../task-context-api.js";
|
|
9
9
|
import { tryCatch } from "../tryCatch.js";
|
|
10
10
|
import { conditionallyExportPacket, conditionallyImportPacket, createPacketAttributes, parsePacket, stringifyIO, } from "../utils/ioSerialization.js";
|
|
11
11
|
import { calculateNextRetryDelay } from "../utils/retries.js";
|
|
12
|
-
import { promiseWithResolvers } from "../../utils.js";
|
|
13
12
|
export class TaskExecutor {
|
|
14
13
|
task;
|
|
15
14
|
_tracingSDK;
|
|
@@ -27,26 +26,15 @@ export class TaskExecutor {
|
|
|
27
26
|
this._isWarmStart = options.isWarmStart;
|
|
28
27
|
this._executionCount = options.executionCount;
|
|
29
28
|
}
|
|
30
|
-
async execute(execution,
|
|
31
|
-
const ctx = TaskRunContext.parse(execution);
|
|
29
|
+
async execute(execution, ctx, signal) {
|
|
32
30
|
const attemptMessage = `Attempt ${execution.attempt.number}`;
|
|
33
31
|
const originalPacket = {
|
|
34
32
|
data: execution.run.payload,
|
|
35
33
|
dataType: execution.run.payloadType,
|
|
36
34
|
};
|
|
37
|
-
taskContext.setGlobalTaskContext({
|
|
38
|
-
ctx,
|
|
39
|
-
worker,
|
|
40
|
-
isWarmStart: isWarmStart ?? this._isWarmStart,
|
|
41
|
-
});
|
|
42
35
|
if (execution.run.metadata) {
|
|
43
36
|
runMetadata.enterWithMetadata(execution.run.metadata);
|
|
44
37
|
}
|
|
45
|
-
if (!this._tracingSDK.asyncResourceDetector.isResolved) {
|
|
46
|
-
this._tracingSDK.asyncResourceDetector.resolveWithAttributes({
|
|
47
|
-
...taskContext.resourceAttributes,
|
|
48
|
-
});
|
|
49
|
-
}
|
|
50
38
|
const result = await this._tracer.startActiveSpan(attemptMessage, async (span) => {
|
|
51
39
|
const attemptContext = context.active();
|
|
52
40
|
return await this._consoleInterceptor.intercept(console, async () => {
|
|
@@ -173,7 +161,7 @@ export class TaskExecutor {
|
|
|
173
161
|
events: execution.attempt.number === 1
|
|
174
162
|
? runTimelineMetrics.convertMetricsToSpanEvents()
|
|
175
163
|
: undefined,
|
|
176
|
-
},
|
|
164
|
+
}, traceContext.extractContext(), signal);
|
|
177
165
|
return { result };
|
|
178
166
|
}
|
|
179
167
|
async #executeTaskWithMiddlewareHooks(payload, ctx, execution, hooks, executeTask, signal) {
|