@dbos-inc/dbos-sdk 3.0.37-preview.gfd7eaf193c → 3.0.38-preview.g8bb2030562
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/src/client.d.ts.map +1 -1
- package/dist/src/client.js.map +1 -1
- package/dist/src/context.d.ts +4 -4
- package/dist/src/context.d.ts.map +1 -1
- package/dist/src/context.js +7 -2
- package/dist/src/context.js.map +1 -1
- package/dist/src/datasource.d.ts.map +1 -1
- package/dist/src/datasource.js +34 -12
- package/dist/src/datasource.js.map +1 -1
- package/dist/src/dbos-executor.d.ts +7 -6
- package/dist/src/dbos-executor.d.ts.map +1 -1
- package/dist/src/dbos-executor.js +29 -15
- package/dist/src/dbos-executor.js.map +1 -1
- package/dist/src/dbos.d.ts +3 -9
- package/dist/src/dbos.d.ts.map +1 -1
- package/dist/src/dbos.js +9 -12
- package/dist/src/dbos.js.map +1 -1
- package/dist/src/decorators.d.ts +0 -2
- package/dist/src/decorators.d.ts.map +1 -1
- package/dist/src/decorators.js +14 -23
- package/dist/src/decorators.js.map +1 -1
- package/dist/src/httpServer/middleware.d.ts +2 -2
- package/dist/src/httpServer/middleware.d.ts.map +1 -1
- package/dist/src/httpServer/server.d.ts +3 -3
- package/dist/src/httpServer/server.d.ts.map +1 -1
- package/dist/src/httpServer/server.js +18 -17
- package/dist/src/httpServer/server.js.map +1 -1
- package/dist/src/index.d.ts +1 -1
- package/dist/src/index.d.ts.map +1 -1
- package/dist/src/scheduler/scheduler.js.map +1 -1
- package/dist/src/system_database.d.ts +9 -9
- package/dist/src/system_database.d.ts.map +1 -1
- package/dist/src/system_database.js.map +1 -1
- package/dist/src/telemetry/logs.d.ts +4 -8
- package/dist/src/telemetry/logs.d.ts.map +1 -1
- package/dist/src/telemetry/logs.js +25 -13
- package/dist/src/telemetry/logs.js.map +1 -1
- package/dist/src/user_database.d.ts +2 -2
- package/dist/src/user_database.d.ts.map +1 -1
- package/dist/src/user_database.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +1 -1
package/dist/src/client.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../src/client.ts"],"names":[],"mappings":"AAKA,OAAO,EACL,KAAK,uBAAuB,EAC5B,KAAK,iBAAiB,EAGtB,KAAK,QAAQ,EACb,KAAK,cAAc,EACnB,KAAK,cAAc,EACpB,MAAM,YAAY,CAAC;AAYpB;;;GAGG;AACH,UAAU,oBAAoB;IAC5B;;OAEG;IACH,SAAS,EAAE,MAAM,CAAC;IAClB;;OAEG;IACH,YAAY,EAAE,MAAM,CAAC;IACrB;;;OAGG;IACH,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B;;;OAGG;IACH,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B;;;OAGG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB;;;OAGG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB;;;;OAIG;IACH,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B;;;OAGG;IACH,eAAe,CAAC,EAAE,MAAM,CAAC;IAEzB;;;OAGG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED;;GAEG;AACH,qBAAa,UAAU;IACrB,OAAO,CAAC,QAAQ,CAAC,MAAM,
|
|
1
|
+
{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../src/client.ts"],"names":[],"mappings":"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"}
|
package/dist/src/client.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../src/client.ts"],"names":[],"mappings":";;;AACA,uDAA6G;AAE7G,
|
|
1
|
+
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../src/client.ts"],"names":[],"mappings":"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"}
|
package/dist/src/context.d.ts
CHANGED
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
/// <reference types="node" />
|
|
4
4
|
/// <reference types="node/http" />
|
|
5
5
|
import { Span } from '@opentelemetry/sdk-trace-base';
|
|
6
|
-
import {
|
|
6
|
+
import { DBOSContextualLogger } from './telemetry/logs';
|
|
7
7
|
import { IncomingHttpHeaders } from 'http';
|
|
8
8
|
import { ParsedUrlQuery } from 'querystring';
|
|
9
9
|
import { UserDatabaseClient } from './user_database';
|
|
@@ -18,7 +18,7 @@ export interface DBOSContextOptions {
|
|
|
18
18
|
idAssignedForNextWorkflow?: string;
|
|
19
19
|
queueAssignedForWorkflows?: string;
|
|
20
20
|
span?: Span;
|
|
21
|
-
logger?:
|
|
21
|
+
logger?: DBOSContextualLogger;
|
|
22
22
|
authenticatedUser?: string;
|
|
23
23
|
authenticatedRoles?: string[];
|
|
24
24
|
assumedRole?: string;
|
|
@@ -52,8 +52,8 @@ export declare function getNextWFID(assignedID?: string): string | undefined;
|
|
|
52
52
|
export declare function functionIDGetIncrement(): number;
|
|
53
53
|
export declare function runWithTopContext<R>(ctx: DBOSLocalCtx, callback: () => Promise<R>): Promise<R>;
|
|
54
54
|
export declare function runWithParentContext<R>(pctx: DBOSLocalCtx | undefined, ctx: DBOSLocalCtx, callback: () => Promise<R>): Promise<R>;
|
|
55
|
-
export declare function runWithDataSourceContext<R>(callnum: number, callback: () => Promise<R>): Promise<R>;
|
|
56
|
-
export declare function runInStepContext<R>(pctx: DBOSLocalCtx, stepID: number, maxAttempts: number | undefined, currentAttempt: number | undefined, callback: () => Promise<R>): Promise<R>;
|
|
55
|
+
export declare function runWithDataSourceContext<R>(span: Span | undefined, callnum: number, callback: () => Promise<R>): Promise<R>;
|
|
56
|
+
export declare function runInStepContext<R>(pctx: DBOSLocalCtx, stepID: number, span: Span, maxAttempts: number | undefined, currentAttempt: number | undefined, callback: () => Promise<R>): Promise<R>;
|
|
57
57
|
/**
|
|
58
58
|
* HTTPRequest includes useful information from http.IncomingMessage and parsed body,
|
|
59
59
|
* URL parameters, and parsed query string.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"context.d.ts","sourceRoot":"","sources":["../../src/context.ts"],"names":[],"mappings":";;;;AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,+BAA+B,CAAC;AACrD,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"context.d.ts","sourceRoot":"","sources":["../../src/context.ts"],"names":[],"mappings":"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"}
|
package/dist/src/context.js
CHANGED
|
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.runInStepContext = exports.runWithDataSourceContext = exports.runWithParentContext = exports.runWithTopContext = exports.functionIDGetIncrement = exports.getNextWFID = exports.getCurrentContextStore = exports.asyncLocalCtx = exports.isInWorkflowCtx = exports.isInTxnCtx = exports.isInStepCtx = exports.isWithinWorkflowCtx = void 0;
|
|
4
4
|
const async_hooks_1 = require("async_hooks");
|
|
5
5
|
const error_1 = require("./error");
|
|
6
|
+
const dbos_executor_1 = require("./dbos-executor");
|
|
6
7
|
function isWithinWorkflowCtx(ctx) {
|
|
7
8
|
if (ctx.workflowId === undefined)
|
|
8
9
|
return false;
|
|
@@ -77,17 +78,19 @@ async function runWithParentContext(pctx, ctx, callback) {
|
|
|
77
78
|
}, callback);
|
|
78
79
|
}
|
|
79
80
|
exports.runWithParentContext = runWithParentContext;
|
|
80
|
-
async function runWithDataSourceContext(callnum, callback) {
|
|
81
|
+
async function runWithDataSourceContext(span, callnum, callback) {
|
|
81
82
|
// Check we are in a workflow context and not in a step / transaction already
|
|
82
83
|
const pctx = getCurrentContextStore() ?? {};
|
|
83
84
|
return await exports.asyncLocalCtx.run({
|
|
84
85
|
...pctx,
|
|
85
86
|
curTxFunctionId: callnum,
|
|
86
87
|
parentCtx: pctx,
|
|
88
|
+
span: span ? span : pctx.span,
|
|
89
|
+
logger: dbos_executor_1.DBOSExecutor.globalInstance.ctxLogger,
|
|
87
90
|
}, callback);
|
|
88
91
|
}
|
|
89
92
|
exports.runWithDataSourceContext = runWithDataSourceContext;
|
|
90
|
-
async function runInStepContext(pctx, stepID, maxAttempts, currentAttempt, callback) {
|
|
93
|
+
async function runInStepContext(pctx, stepID, span, maxAttempts, currentAttempt, callback) {
|
|
91
94
|
// Check we are in a workflow context and not in a step / transaction already
|
|
92
95
|
if (!pctx)
|
|
93
96
|
throw new error_1.DBOSInvalidWorkflowTransitionError();
|
|
@@ -102,6 +105,8 @@ async function runInStepContext(pctx, stepID, maxAttempts, currentAttempt, callb
|
|
|
102
105
|
stepStatus: stepStatus,
|
|
103
106
|
curStepFunctionId: stepID,
|
|
104
107
|
parentCtx: pctx,
|
|
108
|
+
logger: dbos_executor_1.DBOSExecutor.globalInstance.ctxLogger,
|
|
109
|
+
span,
|
|
105
110
|
}, callback);
|
|
106
111
|
}
|
|
107
112
|
exports.runInStepContext = runInStepContext;
|
package/dist/src/context.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"context.js","sourceRoot":"","sources":["../../src/context.ts"],"names":[],"mappings":";;;AAKA,6CAAgD;AAChD,mCAA6D;
|
|
1
|
+
{"version":3,"file":"context.js","sourceRoot":"","sources":["../../src/context.ts"],"names":[],"mappings":";;;AAKA,6CAAgD;AAChD,mCAA6D;AAE7D,mDAA+C;AAsC/C,SAAgB,mBAAmB,CAAC,GAAiB;IACnD,IAAI,GAAG,CAAC,UAAU,KAAK,SAAS;QAAE,OAAO,KAAK,CAAC;IAC/C,OAAO,IAAI,CAAC;AACd,CAAC;AAHD,kDAGC;AAED,SAAgB,WAAW,CAAC,GAAiB;IAC3C,IAAI,GAAG,CAAC,UAAU,KAAK,SAAS;QAAE,OAAO,KAAK,CAAC;IAC/C,IAAI,GAAG,CAAC,iBAAiB;QAAE,OAAO,IAAI,CAAC;IACvC,OAAO,KAAK,CAAC;AACf,CAAC;AAJD,kCAIC;AAED,SAAgB,UAAU,CAAC,GAAiB;IAC1C,IAAI,GAAG,CAAC,UAAU,KAAK,SAAS;QAAE,OAAO,KAAK,CAAC;IAC/C,IAAI,GAAG,CAAC,eAAe;QAAE,OAAO,IAAI,CAAC;IACrC,OAAO,KAAK,CAAC;AACf,CAAC;AAJD,gCAIC;AAED,SAAgB,eAAe,CAAC,GAAiB;IAC/C,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC;QAAE,OAAO,KAAK,CAAC;IAC5C,IAAI,WAAW,CAAC,GAAG,CAAC;QAAE,OAAO,KAAK,CAAC;IACnC,IAAI,UAAU,CAAC,GAAG,CAAC;QAAE,OAAO,KAAK,CAAC;IAClC,OAAO,IAAI,CAAC;AACd,CAAC;AALD,0CAKC;AAEY,QAAA,aAAa,GAAG,IAAI,+BAAiB,EAAgB,CAAC;AAEnE,SAAgB,sBAAsB;IACpC,OAAO,qBAAa,CAAC,QAAQ,EAAE,CAAC;AAClC,CAAC;AAFD,wDAEC;AAED,SAAgB,WAAW,CAAC,UAAmB;IAC7C,IAAI,IAAI,GAAG,UAAU,CAAC;IACtB,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,MAAM,IAAI,GAAG,sBAAsB,EAAE,CAAC;QACtC,MAAM,MAAM,GAAG,IAAI,EAAE,yBAAyB,CAAC;QAC/C,IAAI,MAAM,EAAE,CAAC;YACX,IAAI,GAAG,MAAM,CAAC;YACd,IAAI,CAAC,yBAAyB,GAAG,SAAS,CAAC;QAC7C,CAAC;IACH,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAXD,kCAWC;AAED,SAAgB,sBAAsB;IACpC,MAAM,IAAI,GAAG,sBAAsB,EAAE,CAAC;IACtC,IAAI,CAAC,IAAI;QAAE,MAAM,IAAI,0CAAkC,CAAC,uDAAuD,CAAC,CAAC;IACjH,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC;QACxB,MAAM,IAAI,0CAAkC,CAC1C,yEAAyE,CAC1E,CAAC;IACJ,IAAI,IAAI,CAAC,eAAe,KAAK,SAAS;QAAE,IAAI,CAAC,eAAe,GAAG,CAAC,CAAC;IACjE,OAAO,IAAI,CAAC,eAAe,EAAE,CAAC;AAChC,CAAC;AATD,wDASC;AAEM,KAAK,UAAU,iBAAiB,CAAI,GAAiB,EAAE,QAA0B;IACtF,OAAO,MAAM,qBAAa,CAAC,GAAG,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;AAChD,CAAC;AAFD,8CAEC;AAEM,KAAK,UAAU,oBAAoB,CACxC,IAA8B,EAC9B,GAAiB,EACjB,QAA0B;IAE1B,OAAO,MAAM,qBAAa,CAAC,GAAG,CAC5B;QACE,GAAG,IAAI;QACP,iBAAiB,EAAE,SAAS,EAAE,mBAAmB;QACjD,SAAS,EAAE,IAAI;QACf,GAAG,GAAG;KACP,EACD,QAAQ,CACT,CAAC;AACJ,CAAC;AAdD,oDAcC;AAEM,KAAK,UAAU,wBAAwB,CAAI,IAAsB,EAAE,OAAe,EAAE,QAA0B;IACnH,6EAA6E;IAC7E,MAAM,IAAI,GAAG,sBAAsB,EAAE,IAAI,EAAE,CAAC;IAC5C,OAAO,MAAM,qBAAa,CAAC,GAAG,CAC5B;QACE,GAAG,IAAI;QACP,eAAe,EAAE,OAAO;QACxB,SAAS,EAAE,IAAI;QACf,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI;QAC7B,MAAM,EAAE,4BAAY,CAAC,cAAe,CAAC,SAAS;KAC/C,EACD,QAAQ,CACT,CAAC;AACJ,CAAC;AAbD,4DAaC;AAEM,KAAK,UAAU,gBAAgB,CACpC,IAAkB,EAClB,MAAc,EACd,IAAU,EACV,WAA+B,EAC/B,cAAkC,EAClC,QAA0B;IAE1B,6EAA6E;IAC7E,IAAI,CAAC,IAAI;QAAE,MAAM,IAAI,0CAAkC,EAAE,CAAC;IAC1D,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC;QAAE,MAAM,IAAI,0CAAkC,EAAE,CAAC;IAE3E,MAAM,UAAU,GAAe;QAC7B,MAAM,EAAE,MAAM;QACd,cAAc,EAAE,cAAc;QAC9B,WAAW,EAAE,cAAc,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,SAAS;KACtD,CAAC;IAEF,OAAO,MAAM,oBAAoB,CAC/B,IAAI,EACJ;QACE,UAAU,EAAE,UAAU;QACtB,iBAAiB,EAAE,MAAM;QACzB,SAAS,EAAE,IAAI;QACf,MAAM,EAAE,4BAAY,CAAC,cAAe,CAAC,SAAS;QAC9C,IAAI;KACL,EACD,QAAQ,CACT,CAAC;AACJ,CAAC;AA7BD,4CA6BC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"datasource.d.ts","sourceRoot":"","sources":["../../src/datasource.ts"],"names":[],"mappings":"AAYA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,IAAI,CAAC;AAEvC;;;GAGG;AACH,MAAM,WAAW,4BAA4B;IAC3C,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IAExB;;;OAGG;IACH,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAE5B;;OAEG;IACH,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAEzB;;OAEG;IACH,yBAAyB,CAAC,IAAI,EAAE,IAAI,SAAS,OAAO,EAAE,EAAE,MAAM,EAC5D,MAAM,EAAE,OAAO,EACf,MAAM,EAAE,IAAI,EACZ,IAAI,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,IAAI,EAAE,IAAI,KAAK,OAAO,CAAC,MAAM,CAAC,EACpD,GAAG,IAAI,EAAE,IAAI,GACZ,OAAO,CAAC,MAAM,CAAC,CAAC;CACpB;AAED;;;GAGG;AACH,MAAM,WAAW,cAAc,CAAC,MAAM,SAAS;IAAE,IAAI,CAAC,EAAE,MAAM,CAAA;CAAE;IAC9D,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAEtB;;;;;;OAMG;IACH,cAAc,CAAC,CAAC,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;IAE3E;;;;;;;;;;OAUG;IACH,mBAAmB,CAAC,IAAI,EAAE,IAAI,SAAS,OAAO,EAAE,EAAE,MAAM,EACtD,IAAI,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,IAAI,EAAE,IAAI,KAAK,OAAO,CAAC,MAAM,CAAC,EACpD,MAAM,CAAC,EAAE,MAAM,EACf,MAAM,CAAC,EAAE;QAAE,WAAW,CAAC,EAAE,MAAM,CAAC;QAAC,SAAS,CAAC,EAAE,MAAM,CAAA;KAAE,GACpD,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,IAAI,EAAE,IAAI,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IAElD;;;OAGG;IACH,WAAW,CACT,MAAM,CAAC,EAAE,MAAM,GACd,CAAC,IAAI,EAAE,IAAI,SAAS,OAAO,EAAE,EAAE,MAAM,EACtC,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,MAAM,EACnB,UAAU,EAAE,uBAAuB,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,IAAI,EAAE,IAAI,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC,KAChF,uBAAuB,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,IAAI,EAAE,IAAI,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC;CAa9E;AAID;;;;;;;;;;GAUG;AACH,wBAAsB,cAAc,CAAC,CAAC,EACpC,QAAQ,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,EAC1B,QAAQ,EAAE,MAAM,EAChB,OAAO,GAAE;IAAE,MAAM,CAAC,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,OAAO,CAAA;CAAO,
|
|
1
|
+
{"version":3,"file":"datasource.d.ts","sourceRoot":"","sources":["../../src/datasource.ts"],"names":[],"mappings":"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"}
|
package/dist/src/datasource.js
CHANGED
|
@@ -26,7 +26,7 @@ async function runTransaction(callback, funcName, options = {}) {
|
|
|
26
26
|
if ((0, context_1.getNextWFID)(undefined)) {
|
|
27
27
|
throw new error_1.DBOSInvalidWorkflowTransitionError(`Invalid call to transaction '${funcName}' outside of a workflow; with directive to start a workflow.`);
|
|
28
28
|
}
|
|
29
|
-
return await (0, context_1.runWithDataSourceContext)(0, async () => {
|
|
29
|
+
return await (0, context_1.runWithDataSourceContext)(undefined, 0, async () => {
|
|
30
30
|
return await ds.invokeTransactionFunction(options.config ?? {}, undefined, callback);
|
|
31
31
|
});
|
|
32
32
|
}
|
|
@@ -37,14 +37,15 @@ async function runTransaction(callback, funcName, options = {}) {
|
|
|
37
37
|
const span = dbos_executor_1.DBOSExecutor.globalInstance.tracer.startSpan(funcName, {
|
|
38
38
|
operationUUID: dbos_1.DBOS.workflowID,
|
|
39
39
|
operationType: dbos_executor_1.OperationType.TRANSACTION,
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
40
|
+
operationName: funcName,
|
|
41
|
+
authenticatedUser: dbos_1.DBOS.authenticatedUser ?? '',
|
|
42
|
+
assumedRole: dbos_1.DBOS.assumedRole ?? '',
|
|
43
|
+
authenticatedRoles: dbos_1.DBOS.authenticatedRoles ?? [],
|
|
43
44
|
// isolationLevel: txnInfo.config.isolationLevel, // TODO: Pluggable
|
|
44
45
|
}, dbos_1.DBOS.span);
|
|
45
46
|
try {
|
|
46
47
|
const res = await dbos_executor_1.DBOSExecutor.globalInstance.runInternalStep(async () => {
|
|
47
|
-
return await (0, context_1.runWithDataSourceContext)(callnum, async () => {
|
|
48
|
+
return await (0, context_1.runWithDataSourceContext)(span, callnum, async () => {
|
|
48
49
|
return await ds.invokeTransactionFunction(options.config ?? {}, undefined, callback);
|
|
49
50
|
});
|
|
50
51
|
}, funcName,
|
|
@@ -65,7 +66,8 @@ exports.runTransaction = runTransaction;
|
|
|
65
66
|
// Transaction wrapper
|
|
66
67
|
function registerTransaction(dsName, func, options, config) {
|
|
67
68
|
const dsn = dsName ?? '<default>';
|
|
68
|
-
const
|
|
69
|
+
const funcName = options.name ?? func.name;
|
|
70
|
+
const reg = (0, decorators_1.registerAndWrapDBOSFunctionByName)(options?.ctorOrProto, options.className, funcName, func);
|
|
69
71
|
const invokeWrapper = async function (...rawArgs) {
|
|
70
72
|
const ds = (0, decorators_1.getTransactionalDataSource)(dsn);
|
|
71
73
|
const callFunc = reg.registration.registeredFunction ?? reg.registration.origFunction;
|
|
@@ -73,19 +75,39 @@ function registerTransaction(dsName, func, options, config) {
|
|
|
73
75
|
if ((0, context_1.getNextWFID)(undefined)) {
|
|
74
76
|
throw new error_1.DBOSInvalidWorkflowTransitionError(`Call to transaction '${options.name}' made without starting workflow`);
|
|
75
77
|
}
|
|
76
|
-
return await (0, context_1.runWithDataSourceContext)(0, async () => {
|
|
78
|
+
return await (0, context_1.runWithDataSourceContext)(undefined, 0, async () => {
|
|
77
79
|
return await ds.invokeTransactionFunction(config, this, callFunc, ...rawArgs);
|
|
78
80
|
});
|
|
79
81
|
}
|
|
80
82
|
if (dbos_1.DBOS.isInTransaction() || dbos_1.DBOS.isInStep()) {
|
|
81
83
|
throw new error_1.DBOSInvalidWorkflowTransitionError('Invalid call to a `trasaction` function from within a `step` or `transaction`');
|
|
82
84
|
}
|
|
85
|
+
const span = dbos_executor_1.DBOSExecutor.globalInstance.tracer.startSpan(funcName, {
|
|
86
|
+
operationUUID: dbos_1.DBOS.workflowID,
|
|
87
|
+
operationType: dbos_executor_1.OperationType.TRANSACTION,
|
|
88
|
+
operationName: funcName,
|
|
89
|
+
authenticatedUser: dbos_1.DBOS.authenticatedUser ?? '',
|
|
90
|
+
assumedRole: dbos_1.DBOS.assumedRole ?? '',
|
|
91
|
+
authenticatedRoles: dbos_1.DBOS.authenticatedRoles ?? [],
|
|
92
|
+
// isolationLevel: txnInfo.config.isolationLevel, // TODO: Pluggable
|
|
93
|
+
}, dbos_1.DBOS.span);
|
|
83
94
|
const callnum = (0, context_1.functionIDGetIncrement)();
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
return await
|
|
87
|
-
|
|
88
|
-
|
|
95
|
+
try {
|
|
96
|
+
const res = await dbos_executor_1.DBOSExecutor.globalInstance.runInternalStep(async () => {
|
|
97
|
+
return await (0, context_1.runWithDataSourceContext)(span, callnum, async () => {
|
|
98
|
+
return await ds.invokeTransactionFunction(config, this, callFunc, ...rawArgs);
|
|
99
|
+
});
|
|
100
|
+
}, funcName, dbos_1.DBOS.workflowID, callnum);
|
|
101
|
+
span.setStatus({ code: api_1.SpanStatusCode.OK });
|
|
102
|
+
dbos_executor_1.DBOSExecutor.globalInstance.tracer.endSpan(span);
|
|
103
|
+
return res;
|
|
104
|
+
}
|
|
105
|
+
catch (err) {
|
|
106
|
+
const e = err;
|
|
107
|
+
span.setStatus({ code: api_1.SpanStatusCode.ERROR, message: e.message });
|
|
108
|
+
dbos_executor_1.DBOSExecutor.globalInstance.tracer.endSpan(span);
|
|
109
|
+
throw err;
|
|
110
|
+
}
|
|
89
111
|
};
|
|
90
112
|
(0, decorators_1.registerFunctionWrapper)(invokeWrapper, reg.registration);
|
|
91
113
|
Object.defineProperty(invokeWrapper, 'name', {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"datasource.js","sourceRoot":"","sources":["../../src/datasource.ts"],"names":[],"mappings":";;;AAAA,4CAAoD;AAEpD,uCAA0F;AAC1F,iCAA8B;AAC9B,mDAA8D;AAC9D,6CAKsB;AACtB,mCAA6D;AA2F7D,qBAAqB;AAErB;;;;;;;;;;GAUG;AACI,KAAK,UAAU,cAAc,CAClC,QAA0B,EAC1B,QAAgB,EAChB,UAAiD,EAAE;IAEnD,MAAM,GAAG,GAAG,OAAO,CAAC,MAAM,IAAI,WAAW,CAAC;IAC1C,MAAM,EAAE,GAAG,IAAA,uCAA0B,EAAC,GAAG,CAAC,CAAC;IAE3C,IAAI,CAAC,WAAI,CAAC,gBAAgB,EAAE,EAAE,CAAC;QAC7B,IAAI,IAAA,qBAAW,EAAC,SAAS,CAAC,EAAE,CAAC;YAC3B,MAAM,IAAI,0CAAkC,CAC1C,gCAAgC,QAAQ,8DAA8D,CACvG,CAAC;QACJ,CAAC;QACD,OAAO,MAAM,IAAA,kCAAwB,EAAC,CAAC,EAAE,KAAK,IAAI,EAAE;
|
|
1
|
+
{"version":3,"file":"datasource.js","sourceRoot":"","sources":["../../src/datasource.ts"],"names":[],"mappings":";;;AAAA,4CAAoD;AAEpD,uCAA0F;AAC1F,iCAA8B;AAC9B,mDAA8D;AAC9D,6CAKsB;AACtB,mCAA6D;AA2F7D,qBAAqB;AAErB;;;;;;;;;;GAUG;AACI,KAAK,UAAU,cAAc,CAClC,QAA0B,EAC1B,QAAgB,EAChB,UAAiD,EAAE;IAEnD,MAAM,GAAG,GAAG,OAAO,CAAC,MAAM,IAAI,WAAW,CAAC;IAC1C,MAAM,EAAE,GAAG,IAAA,uCAA0B,EAAC,GAAG,CAAC,CAAC;IAE3C,IAAI,CAAC,WAAI,CAAC,gBAAgB,EAAE,EAAE,CAAC;QAC7B,IAAI,IAAA,qBAAW,EAAC,SAAS,CAAC,EAAE,CAAC;YAC3B,MAAM,IAAI,0CAAkC,CAC1C,gCAAgC,QAAQ,8DAA8D,CACvG,CAAC;QACJ,CAAC;QACD,OAAO,MAAM,IAAA,kCAAwB,EAAC,SAAS,EAAE,CAAC,EAAE,KAAK,IAAI,EAAE;YAC7D,OAAO,MAAM,EAAE,CAAC,yBAAyB,CAAC,OAAO,CAAC,MAAM,IAAI,EAAE,EAAE,SAAS,EAAE,QAAQ,CAAC,CAAC;QACvF,CAAC,CAAC,CAAC;IACL,CAAC;IACD,IAAI,CAAC,WAAI,CAAC,YAAY,EAAE,EAAE,CAAC;QACzB,MAAM,IAAI,0CAAkC,CAC1C,qBAAqB,QAAQ,yDAAyD,CACvF,CAAC;IACJ,CAAC;IAED,MAAM,OAAO,GAAG,IAAA,gCAAsB,GAAE,CAAC;IAEzC,MAAM,IAAI,GAAS,4BAAY,CAAC,cAAe,CAAC,MAAM,CAAC,SAAS,CAC9D,QAAQ,EACR;QACE,aAAa,EAAE,WAAI,CAAC,UAAU;QAC9B,aAAa,EAAE,6BAAa,CAAC,WAAW;QACxC,aAAa,EAAE,QAAQ;QACvB,iBAAiB,EAAE,WAAI,CAAC,iBAAiB,IAAI,EAAE;QAC/C,WAAW,EAAE,WAAI,CAAC,WAAW,IAAI,EAAE;QACnC,kBAAkB,EAAE,WAAI,CAAC,kBAAkB,IAAI,EAAE;QACjD,oEAAoE;KACrE,EACD,WAAI,CAAC,IAAI,CACV,CAAC;IAEF,IAAI,CAAC;QACH,MAAM,GAAG,GAAG,MAAM,4BAAY,CAAC,cAAe,CAAC,eAAe,CAC5D,KAAK,IAAI,EAAE;YACT,OAAO,MAAM,IAAA,kCAAwB,EAAC,IAAI,EAAE,OAAO,EAAE,KAAK,IAAI,EAAE;gBAC9D,OAAO,MAAM,EAAE,CAAC,yBAAyB,CAAC,OAAO,CAAC,MAAM,IAAI,EAAE,EAAE,SAAS,EAAE,QAAQ,CAAC,CAAC;YACvF,CAAC,CAAC,CAAC;QACL,CAAC,EACD,QAAQ;QACR,4FAA4F;QAC5F,WAAI,CAAC,UAAW,EAChB,OAAO,CACR,CAAC;QAEF,IAAI,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,oBAAc,CAAC,EAAE,EAAE,CAAC,CAAC;QAC5C,4BAAY,CAAC,cAAe,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAClD,OAAO,GAAG,CAAC;IACb,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,MAAM,CAAC,GAAG,GAAY,CAAC;QACvB,IAAI,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,oBAAc,CAAC,KAAK,EAAE,OAAO,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;QACnE,4BAAY,CAAC,cAAe,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAClD,MAAM,GAAG,CAAC;IACZ,CAAC;AACH,CAAC;AA9DD,wCA8DC;AAED,sBAAsB;AACtB,SAAgB,mBAAmB,CACjC,MAAc,EACd,IAAoD,EACpD,OAIC,EACD,MAAgB;IAEhB,MAAM,GAAG,GAAG,MAAM,IAAI,WAAW,CAAC;IAElC,MAAM,QAAQ,GAAG,OAAO,CAAC,IAAI,IAAI,IAAI,CAAC,IAAI,CAAC;IAC3C,MAAM,GAAG,GAAG,IAAA,8CAAiC,EAAC,OAAO,EAAE,WAAW,EAAE,OAAO,CAAC,SAAS,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAC;IAEvG,MAAM,aAAa,GAAG,KAAK,WAAuB,GAAG,OAAa;QAChE,MAAM,EAAE,GAAG,IAAA,uCAA0B,EAAC,GAAG,CAAC,CAAC;QAC3C,MAAM,QAAQ,GAAG,GAAG,CAAC,YAAY,CAAC,kBAAkB,IAAI,GAAG,CAAC,YAAY,CAAC,YAAY,CAAC;QAEtF,IAAI,CAAC,WAAI,CAAC,gBAAgB,EAAE,EAAE,CAAC;YAC7B,IAAI,IAAA,qBAAW,EAAC,SAAS,CAAC,EAAE,CAAC;gBAC3B,MAAM,IAAI,0CAAkC,CAC1C,wBAAwB,OAAO,CAAC,IAAI,kCAAkC,CACvE,CAAC;YACJ,CAAC;YAED,OAAO,MAAM,IAAA,kCAAwB,EAAC,SAAS,EAAE,CAAC,EAAE,KAAK,IAAI,EAAE;gBAC7D,OAAO,MAAM,EAAE,CAAC,yBAAyB,CAAC,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC,CAAC;YAChF,CAAC,CAAC,CAAC;QACL,CAAC;QAED,IAAI,WAAI,CAAC,eAAe,EAAE,IAAI,WAAI,CAAC,QAAQ,EAAE,EAAE,CAAC;YAC9C,MAAM,IAAI,0CAAkC,CAC1C,+EAA+E,CAChF,CAAC;QACJ,CAAC;QAED,MAAM,IAAI,GAAS,4BAAY,CAAC,cAAe,CAAC,MAAM,CAAC,SAAS,CAC9D,QAAQ,EACR;YACE,aAAa,EAAE,WAAI,CAAC,UAAU;YAC9B,aAAa,EAAE,6BAAa,CAAC,WAAW;YACxC,aAAa,EAAE,QAAQ;YACvB,iBAAiB,EAAE,WAAI,CAAC,iBAAiB,IAAI,EAAE;YAC/C,WAAW,EAAE,WAAI,CAAC,WAAW,IAAI,EAAE;YACnC,kBAAkB,EAAE,WAAI,CAAC,kBAAkB,IAAI,EAAE;YACjD,oEAAoE;SACrE,EACD,WAAI,CAAC,IAAI,CACV,CAAC;QAEF,MAAM,OAAO,GAAG,IAAA,gCAAsB,GAAE,CAAC;QACzC,IAAI,CAAC;YACH,MAAM,GAAG,GAAG,MAAM,4BAAY,CAAC,cAAe,CAAC,eAAe,CAC5D,KAAK,IAAI,EAAE;gBACT,OAAO,MAAM,IAAA,kCAAwB,EAAC,IAAI,EAAE,OAAO,EAAE,KAAK,IAAI,EAAE;oBAC9D,OAAO,MAAM,EAAE,CAAC,yBAAyB,CAAC,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC,CAAC;gBAChF,CAAC,CAAC,CAAC;YACL,CAAC,EACD,QAAQ,EACR,WAAI,CAAC,UAAW,EAChB,OAAO,CACR,CAAC;YACF,IAAI,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,oBAAc,CAAC,EAAE,EAAE,CAAC,CAAC;YAC5C,4BAAY,CAAC,cAAe,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;YAClD,OAAO,GAAG,CAAC;QACb,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,MAAM,CAAC,GAAG,GAAY,CAAC;YACvB,IAAI,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,oBAAc,CAAC,KAAK,EAAE,OAAO,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;YACnE,4BAAY,CAAC,cAAe,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;YAClD,MAAM,GAAG,CAAC;QACZ,CAAC;IACH,CAAC,CAAC;IAEF,IAAA,oCAAuB,EAAC,aAAa,EAAE,GAAG,CAAC,YAAY,CAAC,CAAC;IAEzD,MAAM,CAAC,cAAc,CAAC,aAAa,EAAE,MAAM,EAAE;QAC3C,KAAK,EAAE,OAAO,CAAC,IAAI;KACpB,CAAC,CAAC;IAEH,OAAO,aAAa,CAAC;AACvB,CAAC;AAjFD,kDAiFC;AAED;;;;;GAKG;AACH,SAAgB,kBAAkB,CAAC,EAAgC;IACjE,IAAA,4CAA+B,EAAC,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;AAC/C,CAAC;AAFD,gDAEC;AAED,4BAA4B;AAE5B,6DAA6D;AAChD,QAAA,gBAAgB,GAAG,MAAM,CAAC,MAAM,CAAC;IAC5C,eAAe,EAAE,kBAAkB;IACnC,aAAa,EAAE,gBAAgB;IAC/B,cAAc,EAAE,iBAAiB;IACjC,YAAY,EAAE,cAAc;CACpB,CAAC,CAAC;AAeC,QAAA,mCAAmC,GAAG,mCAAmC,CAAC;AAE1E,QAAA,kCAAkC,GAAG;;;;;;;;;CASjD,CAAC;AAEF,SAAgB,cAAc,CAAC,KAAc;IAC3C,OAAO,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,MAAM,IAAI,KAAK,CAAC,CAAC,CAAE,KAAK,CAAC,IAAe,CAAC,CAAC,CAAC,SAAS,CAAC;AACpG,CAAC;AAFD,wCAEC;AAED,SAAgB,6BAA6B,CAAC,KAAc;IAC1D,OAAO,cAAc,CAAC,KAAK,CAAC,KAAK,OAAO,CAAC;AAC3C,CAAC;AAFD,sEAEC;AAED,SAAgB,oBAAoB,CAAC,KAAc;IACjD,OAAO,cAAc,CAAC,KAAK,CAAC,KAAK,OAAO,CAAC;AAC3C,CAAC;AAFD,oDAEC;AAED,SAAgB,6BAA6B,CAAC,KAAc;IAC1D,OAAO,cAAc,CAAC,KAAK,CAAC,KAAK,OAAO,CAAC;AAC3C,CAAC;AAFD,sEAEC"}
|
|
@@ -3,7 +3,7 @@ import { type TransactionConfig } from './transaction';
|
|
|
3
3
|
import { type StepConfig } from './step';
|
|
4
4
|
import { TelemetryCollector } from './telemetry/collector';
|
|
5
5
|
import { Tracer } from './telemetry/traces';
|
|
6
|
-
import { GlobalLogger
|
|
6
|
+
import { DBOSContextualLogger, GlobalLogger } from './telemetry/logs';
|
|
7
7
|
import type { TelemetryConfig } from './telemetry';
|
|
8
8
|
import { Pool, type PoolClient, type PoolConfig } from 'pg';
|
|
9
9
|
import { type SystemDatabase, type SystemDatabaseStoredResult } from './system_database';
|
|
@@ -56,7 +56,7 @@ export declare const OperationType: {
|
|
|
56
56
|
readonly HANDLER: "handler";
|
|
57
57
|
readonly WORKFLOW: "workflow";
|
|
58
58
|
readonly TRANSACTION: "transaction";
|
|
59
|
-
readonly
|
|
59
|
+
readonly STEP: "step";
|
|
60
60
|
readonly PROCEDURE: "procedure";
|
|
61
61
|
};
|
|
62
62
|
export declare const TempWorkflowType: {
|
|
@@ -68,7 +68,7 @@ export declare const TempWorkflowType: {
|
|
|
68
68
|
/**
|
|
69
69
|
* State item to be kept in the DBOS system database on behalf of clients
|
|
70
70
|
*/
|
|
71
|
-
export interface
|
|
71
|
+
export interface DBOSExternalState {
|
|
72
72
|
/** Name of event receiver service */
|
|
73
73
|
service: string;
|
|
74
74
|
/** Fully qualified function name for which state is kept */
|
|
@@ -98,7 +98,8 @@ export declare class DBOSExecutor {
|
|
|
98
98
|
static readonly defaultNotificationTimeoutSec = 60;
|
|
99
99
|
readonly debugMode: boolean;
|
|
100
100
|
static systemDBSchemaName: string;
|
|
101
|
-
readonly logger:
|
|
101
|
+
readonly logger: GlobalLogger;
|
|
102
|
+
readonly ctxLogger: DBOSContextualLogger;
|
|
102
103
|
readonly tracer: Tracer;
|
|
103
104
|
typeormEntities: Function[];
|
|
104
105
|
drizzleEntities: {
|
|
@@ -162,8 +163,8 @@ export declare class DBOSExecutor {
|
|
|
162
163
|
initEventReceivers(): Promise<void>;
|
|
163
164
|
deactivateEventReceivers(stopQueueThread?: boolean): Promise<void>;
|
|
164
165
|
executeWorkflowUUID(workflowID: string, startNewWorkflow?: boolean): Promise<WorkflowHandle<unknown>>;
|
|
165
|
-
getEventDispatchState(svc: string, wfn: string, key: string): Promise<
|
|
166
|
-
upsertEventDispatchState(state:
|
|
166
|
+
getEventDispatchState(svc: string, wfn: string, key: string): Promise<DBOSExternalState | undefined>;
|
|
167
|
+
upsertEventDispatchState(state: DBOSExternalState): Promise<DBOSExternalState>;
|
|
167
168
|
cancelWorkflow(workflowID: string): Promise<void>;
|
|
168
169
|
getWorkflowSteps(workflowID: string): Promise<step_info[]>;
|
|
169
170
|
resumeWorkflow(workflowID: string): Promise<void>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dbos-executor.d.ts","sourceRoot":"","sources":["../../src/dbos-executor.ts"],"names":[],"mappings":"AAiBA,OAAO,EAEL,KAAK,cAAc,EACnB,KAAK,cAAc,EAGnB,KAAK,cAAc,EACnB,KAAK,uBAAuB,EAC5B,KAAK,QAAQ,EAEd,MAAM,YAAY,CAAC;AAEpB,OAAO,EAAkB,KAAK,iBAAiB,EAAE,MAAM,eAAe,CAAC;AACvE,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,QAAQ,CAAC;AACzC,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAC3D,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAC5C,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"dbos-executor.d.ts","sourceRoot":"","sources":["../../src/dbos-executor.ts"],"names":[],"mappings":"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"}
|
|
@@ -69,7 +69,7 @@ exports.OperationType = {
|
|
|
69
69
|
HANDLER: 'handler',
|
|
70
70
|
WORKFLOW: 'workflow',
|
|
71
71
|
TRANSACTION: 'transaction',
|
|
72
|
-
|
|
72
|
+
STEP: 'step',
|
|
73
73
|
PROCEDURE: 'procedure',
|
|
74
74
|
};
|
|
75
75
|
exports.TempWorkflowType = {
|
|
@@ -93,6 +93,7 @@ class DBOSExecutor {
|
|
|
93
93
|
debugMode;
|
|
94
94
|
static systemDBSchemaName = 'dbos';
|
|
95
95
|
logger;
|
|
96
|
+
ctxLogger;
|
|
96
97
|
tracer;
|
|
97
98
|
// eslint-disable-next-line @typescript-eslint/no-unsafe-function-type
|
|
98
99
|
typeormEntities = [];
|
|
@@ -125,6 +126,7 @@ class DBOSExecutor {
|
|
|
125
126
|
this.telemetryCollector = new collector_1.TelemetryCollector();
|
|
126
127
|
}
|
|
127
128
|
this.logger = new logs_1.GlobalLogger(this.telemetryCollector, this.config.telemetry.logs);
|
|
129
|
+
this.ctxLogger = new logs_1.DBOSContextualLogger(this.logger, () => (0, context_1.getCurrentContextStore)().span);
|
|
128
130
|
this.tracer = new traces_1.Tracer(this.telemetryCollector);
|
|
129
131
|
if (this.debugMode) {
|
|
130
132
|
this.logger.info('Running in debug mode!');
|
|
@@ -384,8 +386,8 @@ class DBOSExecutor {
|
|
|
384
386
|
}
|
|
385
387
|
const pctx = (0, context_1.getCurrentContextStore)();
|
|
386
388
|
let wConfig = {};
|
|
389
|
+
const wInfo = (0, decorators_1.getFunctionRegistration)(wf);
|
|
387
390
|
if (wf.name !== DBOSExecutor.tempWorkflowName) {
|
|
388
|
-
const wInfo = (0, decorators_1.getFunctionRegistration)(wf);
|
|
389
391
|
if (!wInfo || !wInfo.workflowConfig) {
|
|
390
392
|
throw new error_1.DBOSNotRegisteredError(wf.name);
|
|
391
393
|
}
|
|
@@ -397,6 +399,7 @@ class DBOSExecutor {
|
|
|
397
399
|
status: workflow_1.StatusString.PENDING,
|
|
398
400
|
operationUUID: workflowID,
|
|
399
401
|
operationType: exports.OperationType.WORKFLOW,
|
|
402
|
+
operationName: wInfo?.name ?? wf.name,
|
|
400
403
|
authenticatedUser: pctx?.authenticatedUser ?? '',
|
|
401
404
|
authenticatedRoles: pctx?.authenticatedRoles ?? [],
|
|
402
405
|
assumedRole: pctx?.assumedRole ?? '',
|
|
@@ -503,6 +506,8 @@ class DBOSExecutor {
|
|
|
503
506
|
timeoutMS,
|
|
504
507
|
deadlineEpochMS,
|
|
505
508
|
workflowId: workflowID,
|
|
509
|
+
span,
|
|
510
|
+
logger: this.ctxLogger,
|
|
506
511
|
}, () => {
|
|
507
512
|
const callPromise = wf.call(params.configuredInstance, ...args);
|
|
508
513
|
if ($deadlineEpochMS === undefined) {
|
|
@@ -709,9 +714,10 @@ class DBOSExecutor {
|
|
|
709
714
|
const span = this.tracer.startSpan(txn.name, {
|
|
710
715
|
operationUUID: wfid,
|
|
711
716
|
operationType: exports.OperationType.TRANSACTION,
|
|
712
|
-
|
|
713
|
-
|
|
714
|
-
|
|
717
|
+
operationName: txn.name,
|
|
718
|
+
authenticatedUser: pctx.authenticatedUser ?? '',
|
|
719
|
+
assumedRole: pctx.assumedRole ?? '',
|
|
720
|
+
authenticatedRoles: pctx.authenticatedRoles ?? [],
|
|
715
721
|
isolationLevel: txnReg.txnConfig.isolationLevel,
|
|
716
722
|
}, pctx.span);
|
|
717
723
|
while (true) {
|
|
@@ -747,6 +753,7 @@ class DBOSExecutor {
|
|
|
747
753
|
throw new error_1.DBOSDebuggerError(`Failed to find the recorded output for the transaction: workflow UUID ${wfid}, step number ${funcId}`);
|
|
748
754
|
}
|
|
749
755
|
// Execute the user's transaction.
|
|
756
|
+
const ctxlog = this.ctxLogger;
|
|
750
757
|
const result = await (async function () {
|
|
751
758
|
try {
|
|
752
759
|
return await (0, context_1.runWithParentContext)(pctx, {
|
|
@@ -756,6 +763,8 @@ class DBOSExecutor {
|
|
|
756
763
|
curTxFunctionId: funcId,
|
|
757
764
|
parentCtx: pctx,
|
|
758
765
|
sqlClient: client,
|
|
766
|
+
logger: ctxlog,
|
|
767
|
+
span,
|
|
759
768
|
}, async () => {
|
|
760
769
|
const tf = txn;
|
|
761
770
|
return await tf.call(clsinst, ...args);
|
|
@@ -853,10 +862,11 @@ class DBOSExecutor {
|
|
|
853
862
|
const span = this.tracer.startSpan(proc.name, {
|
|
854
863
|
operationUUID: wfid,
|
|
855
864
|
operationType: exports.OperationType.PROCEDURE,
|
|
856
|
-
|
|
857
|
-
|
|
858
|
-
|
|
859
|
-
|
|
865
|
+
operationName: proc.name,
|
|
866
|
+
authenticatedUser: pctx.authenticatedUser ?? '',
|
|
867
|
+
assumedRole: pctx.assumedRole ?? '',
|
|
868
|
+
authenticatedRoles: pctx.authenticatedRoles ?? [],
|
|
869
|
+
isolationLevel: procInfo.procConfig.isolationLevel,
|
|
860
870
|
executeLocally,
|
|
861
871
|
}, pctx.span);
|
|
862
872
|
try {
|
|
@@ -910,6 +920,7 @@ class DBOSExecutor {
|
|
|
910
920
|
throw new error_1.DBOSDebuggerError(`Failed to find the recorded output for the procedure: workflow UUID ${wfid}, step number ${funcId}`);
|
|
911
921
|
}
|
|
912
922
|
// Execute the user's transaction.
|
|
923
|
+
const ctxlog = this.ctxLogger;
|
|
913
924
|
const result = await (async function () {
|
|
914
925
|
try {
|
|
915
926
|
// Check we are in a workflow context and not in a step / transaction already
|
|
@@ -923,6 +934,8 @@ class DBOSExecutor {
|
|
|
923
934
|
parentCtx: pctx,
|
|
924
935
|
isInStoredProc: true,
|
|
925
936
|
sqlClient: client,
|
|
937
|
+
logger: ctxlog,
|
|
938
|
+
span,
|
|
926
939
|
}, async () => {
|
|
927
940
|
const pf = proc;
|
|
928
941
|
return await pf(...args);
|
|
@@ -1093,10 +1106,11 @@ class DBOSExecutor {
|
|
|
1093
1106
|
const maxRetryIntervalSec = 3600; // Maximum retry interval: 1 hour
|
|
1094
1107
|
const span = this.tracer.startSpan(stepFnName, {
|
|
1095
1108
|
operationUUID: wfid,
|
|
1096
|
-
operationType: exports.OperationType.
|
|
1097
|
-
|
|
1098
|
-
|
|
1099
|
-
|
|
1109
|
+
operationType: exports.OperationType.STEP,
|
|
1110
|
+
operationName: stepFnName,
|
|
1111
|
+
authenticatedUser: lctx.authenticatedUser ?? '',
|
|
1112
|
+
assumedRole: lctx.assumedRole ?? '',
|
|
1113
|
+
authenticatedRoles: lctx.authenticatedRoles ?? [],
|
|
1100
1114
|
retriesAllowed: stepConfig.retriesAllowed,
|
|
1101
1115
|
intervalSeconds: stepConfig.intervalSeconds,
|
|
1102
1116
|
maxAttempts: stepConfig.maxAttempts,
|
|
@@ -1133,7 +1147,7 @@ class DBOSExecutor {
|
|
|
1133
1147
|
try {
|
|
1134
1148
|
await this.systemDatabase.checkIfCanceled(wfid);
|
|
1135
1149
|
let cresult;
|
|
1136
|
-
await (0, context_1.runInStepContext)(lctx, funcID, maxAttempts, attemptNum, async () => {
|
|
1150
|
+
await (0, context_1.runInStepContext)(lctx, funcID, span, maxAttempts, attemptNum, async () => {
|
|
1137
1151
|
const sf = stepFn;
|
|
1138
1152
|
cresult = await sf.call(clsInst, ...args);
|
|
1139
1153
|
});
|
|
@@ -1157,7 +1171,7 @@ class DBOSExecutor {
|
|
|
1157
1171
|
else {
|
|
1158
1172
|
try {
|
|
1159
1173
|
let cresult;
|
|
1160
|
-
await (0, context_1.runInStepContext)(lctx, funcID, maxAttempts, undefined, async () => {
|
|
1174
|
+
await (0, context_1.runInStepContext)(lctx, funcID, span, maxAttempts, undefined, async () => {
|
|
1161
1175
|
const sf = stepFn;
|
|
1162
1176
|
cresult = await sf.call(clsInst, ...args);
|
|
1163
1177
|
});
|