@dbos-inc/dbos-sdk 2.2.10-preview.g90e74a1e32 → 2.3.9-preview
Sign up to get free protection for your applications and to get access to all the features.
- package/.husky/pre-commit +1 -0
- package/.prettierignore +3 -0
- package/.prettierrc +9 -0
- package/CODE_OF_CONDUCT.md +24 -18
- package/CONTRIBUTING.md +12 -10
- package/README.md +2 -2
- package/compose.yaml +17 -17
- package/dbos-config.schema.json +4 -13
- package/dist/schemas/user_db_schema.d.ts.map +1 -1
- package/dist/schemas/user_db_schema.js.map +1 -1
- package/dist/src/context.d.ts +12 -12
- package/dist/src/context.d.ts.map +1 -1
- package/dist/src/context.js +9 -9
- package/dist/src/context.js.map +1 -1
- package/dist/src/data_validation.d.ts +1 -1
- package/dist/src/data_validation.d.ts.map +1 -1
- package/dist/src/data_validation.js +14 -8
- package/dist/src/data_validation.js.map +1 -1
- package/dist/src/dbos-executor.d.ts +4 -3
- package/dist/src/dbos-executor.d.ts.map +1 -1
- package/dist/src/dbos-executor.js +152 -141
- package/dist/src/dbos-executor.js.map +1 -1
- package/dist/src/dbos-runtime/cli.d.ts +3 -3
- package/dist/src/dbos-runtime/cli.d.ts.map +1 -1
- package/dist/src/dbos-runtime/cli.js +80 -39
- package/dist/src/dbos-runtime/cli.js.map +1 -1
- package/dist/src/dbos-runtime/cloudutils/authentication.d.ts +1 -1
- package/dist/src/dbos-runtime/cloudutils/authentication.d.ts.map +1 -1
- package/dist/src/dbos-runtime/cloudutils/authentication.js +14 -14
- package/dist/src/dbos-runtime/cloudutils/authentication.js.map +1 -1
- package/dist/src/dbos-runtime/cloudutils/cloudutils.d.ts +2 -2
- package/dist/src/dbos-runtime/cloudutils/cloudutils.d.ts.map +1 -1
- package/dist/src/dbos-runtime/cloudutils/cloudutils.js +32 -32
- package/dist/src/dbos-runtime/cloudutils/cloudutils.js.map +1 -1
- package/dist/src/dbos-runtime/cloudutils/databases.d.ts +2 -2
- package/dist/src/dbos-runtime/cloudutils/databases.d.ts.map +1 -1
- package/dist/src/dbos-runtime/cloudutils/databases.js +25 -21
- package/dist/src/dbos-runtime/cloudutils/databases.js.map +1 -1
- package/dist/src/dbos-runtime/commands.d.ts +1 -1
- package/dist/src/dbos-runtime/commands.js +9 -9
- package/dist/src/dbos-runtime/config.d.ts +7 -7
- package/dist/src/dbos-runtime/config.d.ts.map +1 -1
- package/dist/src/dbos-runtime/config.js +39 -23
- package/dist/src/dbos-runtime/config.js.map +1 -1
- package/dist/src/dbos-runtime/configure.d.ts.map +1 -1
- package/dist/src/dbos-runtime/configure.js.map +1 -1
- package/dist/src/dbos-runtime/db_connection.d.ts.map +1 -1
- package/dist/src/dbos-runtime/db_connection.js +2 -2
- package/dist/src/dbos-runtime/db_connection.js.map +1 -1
- package/dist/src/dbos-runtime/db_wizard.d.ts +1 -1
- package/dist/src/dbos-runtime/db_wizard.d.ts.map +1 -1
- package/dist/src/dbos-runtime/db_wizard.js +18 -18
- package/dist/src/dbos-runtime/db_wizard.js.map +1 -1
- package/dist/src/dbos-runtime/debug.d.ts +3 -3
- package/dist/src/dbos-runtime/debug.d.ts.map +1 -1
- package/dist/src/dbos-runtime/debug.js +7 -12
- package/dist/src/dbos-runtime/debug.js.map +1 -1
- package/dist/src/dbos-runtime/migrate.d.ts +2 -2
- package/dist/src/dbos-runtime/migrate.d.ts.map +1 -1
- package/dist/src/dbos-runtime/migrate.js +14 -10
- package/dist/src/dbos-runtime/migrate.js.map +1 -1
- package/dist/src/dbos-runtime/reset.d.ts +2 -2
- package/dist/src/dbos-runtime/reset.js +2 -2
- package/dist/src/dbos-runtime/reset.js.map +1 -1
- package/dist/src/dbos-runtime/runtime.d.ts.map +1 -1
- package/dist/src/dbos-runtime/runtime.js +4 -4
- package/dist/src/dbos-runtime/runtime.js.map +1 -1
- package/dist/src/dbos-runtime/workflow_management.d.ts +5 -4
- package/dist/src/dbos-runtime/workflow_management.d.ts.map +1 -1
- package/dist/src/dbos-runtime/workflow_management.js +34 -14
- package/dist/src/dbos-runtime/workflow_management.js.map +1 -1
- package/dist/src/dbos.d.ts +23 -23
- package/dist/src/dbos.d.ts.map +1 -1
- package/dist/src/dbos.js +59 -59
- package/dist/src/dbos.js.map +1 -1
- package/dist/src/debugpoint.d.ts.map +1 -1
- package/dist/src/debugpoint.js +4 -4
- package/dist/src/debugpoint.js.map +1 -1
- package/dist/src/decorators.d.ts +8 -8
- package/dist/src/decorators.d.ts.map +1 -1
- package/dist/src/decorators.js +36 -33
- package/dist/src/decorators.js.map +1 -1
- package/dist/src/error.d.ts.map +1 -1
- package/dist/src/error.js +6 -5
- package/dist/src/error.js.map +1 -1
- package/dist/src/eventreceiver.d.ts +1 -1
- package/dist/src/eventreceiver.d.ts.map +1 -1
- package/dist/src/httpServer/handler.d.ts +8 -8
- package/dist/src/httpServer/handler.d.ts.map +1 -1
- package/dist/src/httpServer/handler.js.map +1 -1
- package/dist/src/httpServer/handlerTypes.d.ts.map +1 -1
- package/dist/src/httpServer/handlerTypes.js.map +1 -1
- package/dist/src/httpServer/middleware.d.ts +9 -9
- package/dist/src/httpServer/middleware.d.ts.map +1 -1
- package/dist/src/httpServer/middleware.js +6 -6
- package/dist/src/httpServer/middleware.js.map +1 -1
- package/dist/src/httpServer/server.d.ts +2 -2
- package/dist/src/httpServer/server.d.ts.map +1 -1
- package/dist/src/httpServer/server.js +27 -33
- package/dist/src/httpServer/server.js.map +1 -1
- package/dist/src/index.d.ts +16 -16
- package/dist/src/index.d.ts.map +1 -1
- package/dist/src/index.js.map +1 -1
- package/dist/src/kafka/kafka.d.ts.map +1 -1
- package/dist/src/kafka/kafka.js +2 -2
- package/dist/src/kafka/kafka.js.map +1 -1
- package/dist/src/procedure.d.ts +6 -6
- package/dist/src/procedure.d.ts.map +1 -1
- package/dist/src/procedure.js.map +1 -1
- package/dist/src/scheduler/crontab.d.ts.map +1 -1
- package/dist/src/scheduler/crontab.js +54 -33
- package/dist/src/scheduler/crontab.js.map +1 -1
- package/dist/src/scheduler/scheduler.d.ts +3 -3
- package/dist/src/scheduler/scheduler.d.ts.map +1 -1
- package/dist/src/scheduler/scheduler.js +7 -7
- package/dist/src/scheduler/scheduler.js.map +1 -1
- package/dist/src/step.d.ts +4 -4
- package/dist/src/step.d.ts.map +1 -1
- package/dist/src/step.js.map +1 -1
- package/dist/src/system_database.d.ts +20 -13
- package/dist/src/system_database.d.ts.map +1 -1
- package/dist/src/system_database.js +168 -60
- package/dist/src/system_database.js.map +1 -1
- package/dist/src/telemetry/collector.d.ts +3 -3
- package/dist/src/telemetry/exporters.d.ts +1 -1
- package/dist/src/telemetry/exporters.js.map +1 -1
- package/dist/src/telemetry/index.d.ts +5 -5
- package/dist/src/telemetry/logs.d.ts +4 -4
- package/dist/src/telemetry/logs.d.ts.map +1 -1
- package/dist/src/telemetry/logs.js +18 -18
- package/dist/src/telemetry/logs.js.map +1 -1
- package/dist/src/telemetry/traces.d.ts +3 -3
- package/dist/src/telemetry/traces.js +7 -7
- package/dist/src/testing/testing_runtime.d.ts +11 -11
- package/dist/src/testing/testing_runtime.d.ts.map +1 -1
- package/dist/src/testing/testing_runtime.js +15 -8
- package/dist/src/testing/testing_runtime.js.map +1 -1
- package/dist/src/transaction.d.ts +6 -6
- package/dist/src/transaction.d.ts.map +1 -1
- package/dist/src/transaction.js +4 -4
- package/dist/src/transaction.js.map +1 -1
- package/dist/src/user_database.d.ts +4 -4
- package/dist/src/user_database.d.ts.map +1 -1
- package/dist/src/user_database.js +45 -45
- package/dist/src/user_database.js.map +1 -1
- package/dist/src/utils.d.ts.map +1 -1
- package/dist/src/utils.js +6 -12
- package/dist/src/utils.js.map +1 -1
- package/dist/src/wfqueue.d.ts +1 -1
- package/dist/src/wfqueue.d.ts.map +1 -1
- package/dist/src/wfqueue.js +8 -8
- package/dist/src/wfqueue.js.map +1 -1
- package/dist/src/workflow.d.ts +22 -10
- package/dist/src/workflow.d.ts.map +1 -1
- package/dist/src/workflow.js +19 -18
- package/dist/src/workflow.js.map +1 -1
- package/dist/tsconfig.build.tsbuildinfo +1 -1
- package/eslint.config.js +29 -27
- package/migrations/20240123182943_schema.js +7 -8
- package/migrations/20240123183021_tables.js +52 -48
- package/migrations/20240123183025_indexes.js +11 -14
- package/migrations/20240123183030_triggers.js +7 -8
- package/migrations/20240124015239_status_timestamp.js +12 -18
- package/migrations/20240201213211_replica_identity.js +8 -11
- package/migrations/20240205223925_foreign_keys.js +40 -18
- package/migrations/20240207192338_executor_id_index.js +8 -10
- package/migrations/20240430090000_tables.js +8 -10
- package/migrations/20240516004341_application_version.js +10 -12
- package/migrations/20240517000000_status_class_config.js +10 -14
- package/migrations/20240621000000_workflow_tries.js +8 -12
- package/migrations/20240924000000_workflowqueue.js +32 -23
- package/migrations/20241009150000_event_dispatch_kv.js +12 -14
- package/migrations/20252101000000_workflow_queues_executor_id.js +7 -9
- package/package.json +9 -2
- package/src/dbos-runtime/cloudutils/README.md +1 -1
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"exporters.js","sourceRoot":"","sources":["../../../src/telemetry/exporters.ts"],"names":[],"mappings":";;;AACA,yBAAgD;AAChD,wFAA6E;AAC7E,sFAA0E;AAG1E,8CAAqE;AAYrE,MAAa,iBAAiB;IACX,cAAc,CAAqB;IACnC,YAAY,CAAmB;IAChD,YAAY,MAA0B;QACpC,IAAI,MAAM,CAAC,cAAc,EAAE,CAAC;YAC1B,IAAI,CAAC,cAAc,GAAG,IAAI,6CAAiB,CAAC;gBAC1C,GAAG,EAAE,MAAM,CAAC,cAAc;aAC3B,CAAC,CAAC;YACH,OAAO,CAAC,GAAG,CAAC,8BAA8B,MAAM,CAAC,cAAc,EAAE,CAAC,CAAC;QACrE,CAAC;QACD,IAAI,MAAM,CAAC,YAAY,EAAE,CAAC;YACxB,IAAI,CAAC,YAAY,GAAG,IAAI,0CAAe,CAAC;gBACtC,GAAG,EAAE,MAAM,CAAC,YAAY;aACzB,CAAC,CAAC;YACH,OAAO,CAAC,GAAG,CAAC,4BAA4B,MAAM,CAAC,YAAY,EAAE,CAAC,CAAC;QACjE,CAAC;IACH,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,OAA0B;QACrC,2BAA2B;QAC3B,MAAM,WAAW,GAAmB,EAAE,CAAC;QACvC,MAAM,UAAU,GAAwB,EAAE,CAAC;QAC3C,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;YACzB,IAAI,IAAA,gBAAa,EAAC,MAAM,CAAC,EAAE,CAAC;gBAC1B,WAAW,CAAC,IAAI,CAAC,MAAsB,CAAC,CAAC;YAC3C,CAAC;YACD,IAAI,IAAA,cAAW,EAAC,MAAM,CAAC,EAAE,CAAC;gBACxB,UAAU,CAAC,IAAI,CAAC,MAA2B,CAAC,CAAC;YAC/C,CAAC;QACH,CAAC,CAAC,CAAC;QACH,MAAM,KAAK,
|
1
|
+
{"version":3,"file":"exporters.js","sourceRoot":"","sources":["../../../src/telemetry/exporters.ts"],"names":[],"mappings":"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"}
|
@@ -1,8 +1,8 @@
|
|
1
|
-
import { LoggerConfig } from
|
2
|
-
import { OTLPExporterConfig } from
|
3
|
-
import { Span } from
|
4
|
-
import { LogRecord } from
|
5
|
-
import { TelemetrySignal } from
|
1
|
+
import { LoggerConfig } from './logs';
|
2
|
+
import { OTLPExporterConfig } from './exporters';
|
3
|
+
import { Span } from '@opentelemetry/sdk-trace-base';
|
4
|
+
import { LogRecord } from '@opentelemetry/api-logs';
|
5
|
+
import { TelemetrySignal } from './collector';
|
6
6
|
export declare function isTraceSignal(signal: TelemetrySignal): signal is Span;
|
7
7
|
export declare function isLogSignal(signal: TelemetrySignal): signal is LogRecord;
|
8
8
|
export interface TelemetryConfig {
|
@@ -1,7 +1,7 @@
|
|
1
|
-
import { Logger as IWinstonLogger } from
|
2
|
-
import { DBOSContextImpl } from
|
3
|
-
import { Span } from
|
4
|
-
import { TelemetryCollector } from
|
1
|
+
import { Logger as IWinstonLogger } from 'winston';
|
2
|
+
import { DBOSContextImpl } from '../context';
|
3
|
+
import { Span } from '@opentelemetry/sdk-trace-base';
|
4
|
+
import { TelemetryCollector } from './collector';
|
5
5
|
/*****************/
|
6
6
|
/*****************/
|
7
7
|
export interface LoggerConfig {
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"logs.d.ts","sourceRoot":"","sources":["../../../src/telemetry/logs.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoC,MAAM,IAAI,cAAc,EAAE,MAAM,SAAS,CAAC;AAErF,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAG7C,OAAO,EAAE,IAAI,EAAE,MAAM,+BAA+B,CAAC;AACrD,OAAO,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAGjD,mBAAmB;AAEnB,mBAAmB;AAEnB,MAAM,WAAW,YAAY;IAC3B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,kBAAkB,CAAC,EAAE,OAAO,CAAC;CAC9B;AAED,KAAK,kBAAkB,GAAG;IACxB,sBAAsB,EAAE,OAAO,CAAC;IAChC,IAAI,EAAE,IAAI,CAAC;CACZ,CAAC;AAEF,UAAU,UAAU;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAGD,MAAM,WAAW,aAAc,SAAQ,cAAc;IACnD,QAAQ,CAAC,kBAAkB,EAAE,OAAO,CAAC;IACrC,QAAQ,CAAC,MAAM,EAAE,cAAc,CAAC;IAChC,QAAQ,CAAC,kBAAkB,EAAE,kBAAkB,CAAC;CACjD;AAED,qBAAa,YAAY;
|
1
|
+
{"version":3,"file":"logs.d.ts","sourceRoot":"","sources":["../../../src/telemetry/logs.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoC,MAAM,IAAI,cAAc,EAAE,MAAM,SAAS,CAAC;AAErF,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAG7C,OAAO,EAAE,IAAI,EAAE,MAAM,+BAA+B,CAAC;AACrD,OAAO,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAGjD,mBAAmB;AAEnB,mBAAmB;AAEnB,MAAM,WAAW,YAAY;IAC3B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,kBAAkB,CAAC,EAAE,OAAO,CAAC;CAC9B;AAED,KAAK,kBAAkB,GAAG;IACxB,sBAAsB,EAAE,OAAO,CAAC;IAChC,IAAI,EAAE,IAAI,CAAC;CACZ,CAAC;AAEF,UAAU,UAAU;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAGD,MAAM,WAAW,aAAc,SAAQ,cAAc;IACnD,QAAQ,CAAC,kBAAkB,EAAE,OAAO,CAAC;IACrC,QAAQ,CAAC,MAAM,EAAE,cAAc,CAAC;IAChC,QAAQ,CAAC,kBAAkB,EAAE,kBAAkB,CAAC;CACjD;AAED,qBAAa,YAAY;IAKrB,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAC;IAJtC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAiB;IACxC,QAAQ,CAAC,kBAAkB,EAAE,OAAO,CAAC;gBAGlB,kBAAkB,CAAC,gCAAoB,EACxD,MAAM,CAAC,EAAE,YAAY;IAmBvB,IAAI,CAAC,QAAQ,EAAE,OAAO,EAAE,QAAQ,CAAC,EAAE,kBAAkB,GAAG,IAAI;IAQ5D,KAAK,CAAC,QAAQ,EAAE,OAAO,EAAE,QAAQ,CAAC,EAAE,kBAAkB,GAAG,IAAI;IAQ7D,IAAI,CAAC,QAAQ,EAAE,OAAO,EAAE,QAAQ,CAAC,EAAE,kBAAkB,GAAG,IAAI;IAS5D,KAAK,CAAC,UAAU,EAAE,OAAO,EAAE,QAAQ,CAAC,EAAE,kBAAkB,GAAG,UAAU,GAAG,IAAI;IAUtE,OAAO;CAGd;AAED,oBAAoB;AAEpB,oBAAoB;AAEpB,MAAM,WAAW,OAAO;IACtB,IAAI,CAAC,QAAQ,EAAE,OAAO,EAAE,QAAQ,CAAC,EAAE,kBAAkB,GAAG,IAAI,CAAC;IAC7D,KAAK,CAAC,QAAQ,EAAE,OAAO,EAAE,QAAQ,CAAC,EAAE,kBAAkB,GAAG,IAAI,CAAC;IAC9D,IAAI,CAAC,QAAQ,EAAE,OAAO,EAAE,QAAQ,CAAC,EAAE,kBAAkB,GAAG,IAAI,CAAC;IAC7D,KAAK,CAAC,UAAU,EAAE,OAAO,EAAE,QAAQ,CAAC,EAAE,kBAAkB,GAAG,UAAU,GAAG,IAAI,CAAC;CAC9E;AAGD,qBAAa,MAAO,YAAW,OAAO;IAGlC,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,QAAQ,CAAC,GAAG,EAAE,eAAe;IAH/B,QAAQ,CAAC,QAAQ,EAAE,kBAAkB,CAAC;gBAEnB,YAAY,EAAE,YAAY,EAClC,GAAG,EAAE,eAAe;IAQ/B,IAAI,CAAC,QAAQ,EAAE,OAAO,EAAE,QAAQ,CAAC,EAAE,kBAAkB,GAAG,IAAI;IAI5D,KAAK,CAAC,QAAQ,EAAE,OAAO,EAAE,QAAQ,CAAC,EAAE,kBAAkB,GAAG,IAAI;IAI7D,IAAI,CAAC,QAAQ,EAAE,OAAO,EAAE,QAAQ,CAAC,EAAE,kBAAkB,GAAG,IAAI;IAI5D,KAAK,CAAC,UAAU,EAAE,OAAO,EAAE,QAAQ,CAAC,EAAE,kBAAkB,GAAG,UAAU,GAAG,IAAI;CAG7E"}
|
@@ -15,19 +15,19 @@ class GlobalLogger {
|
|
15
15
|
const winstonTransports = [];
|
16
16
|
winstonTransports.push(new winston_1.transports.Console({
|
17
17
|
format: consoleFormat,
|
18
|
-
level: config?.logLevel ||
|
18
|
+
level: config?.logLevel || 'info',
|
19
19
|
silent: config?.silent || false,
|
20
20
|
}));
|
21
21
|
// Only enable the OTLP transport if we have a telemetry collector and an exporter
|
22
22
|
if (this.telemetryCollector?.exporter) {
|
23
|
-
winstonTransports.push(new OTLPLogQueueTransport(this.telemetryCollector, config?.logLevel ||
|
23
|
+
winstonTransports.push(new OTLPLogQueueTransport(this.telemetryCollector, config?.logLevel || 'info'));
|
24
24
|
}
|
25
25
|
this.logger = (0, winston_1.createLogger)({ transports: winstonTransports });
|
26
26
|
this.addContextMetadata = config?.addContextMetadata || false;
|
27
27
|
}
|
28
28
|
// We use this form of winston logging methods: `(message: string, ...meta: any[])`. See node_modules/winston/index.d.ts
|
29
29
|
info(logEntry, metadata) {
|
30
|
-
if (typeof logEntry ===
|
30
|
+
if (typeof logEntry === 'string') {
|
31
31
|
this.logger.info(logEntry, metadata);
|
32
32
|
}
|
33
33
|
else {
|
@@ -35,7 +35,7 @@ class GlobalLogger {
|
|
35
35
|
}
|
36
36
|
}
|
37
37
|
debug(logEntry, metadata) {
|
38
|
-
if (typeof logEntry ===
|
38
|
+
if (typeof logEntry === 'string') {
|
39
39
|
this.logger.debug(logEntry, metadata);
|
40
40
|
}
|
41
41
|
else {
|
@@ -43,7 +43,7 @@ class GlobalLogger {
|
|
43
43
|
}
|
44
44
|
}
|
45
45
|
warn(logEntry, metadata) {
|
46
|
-
if (typeof logEntry ===
|
46
|
+
if (typeof logEntry === 'string') {
|
47
47
|
this.logger.warn(logEntry, metadata);
|
48
48
|
}
|
49
49
|
else {
|
@@ -55,7 +55,7 @@ class GlobalLogger {
|
|
55
55
|
if (inputError instanceof Error) {
|
56
56
|
this.logger.error(inputError.message, { ...metadata, stack: inputError.stack });
|
57
57
|
}
|
58
|
-
else if (typeof inputError ===
|
58
|
+
else if (typeof inputError === 'string') {
|
59
59
|
this.logger.error(inputError, { ...metadata, stack: new Error().stack });
|
60
60
|
}
|
61
61
|
else {
|
@@ -100,19 +100,19 @@ exports.Logger = Logger;
|
|
100
100
|
const consoleFormat = winston_1.format.combine(winston_1.format.errors({ stack: true }), winston_1.format.timestamp(), winston_1.format.colorize(), winston_1.format.printf((info) => {
|
101
101
|
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
|
102
102
|
const { timestamp, level, message, stack } = info;
|
103
|
-
const applicationVersion = process.env.DBOS__APPVERSION ||
|
103
|
+
const applicationVersion = process.env.DBOS__APPVERSION || '';
|
104
104
|
// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-assignment
|
105
|
-
const ts = timestamp.slice(0, 19).replace(
|
105
|
+
const ts = timestamp.slice(0, 19).replace('T', ' ');
|
106
106
|
// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-assignment
|
107
|
-
const formattedStack = stack?.split(
|
108
|
-
const messageString = typeof message ===
|
109
|
-
const fullMessageString = `${messageString}${info.includeContextMetadata ? ` ${utils_1.DBOSJSON.stringify(info.span?.attributes)}` :
|
110
|
-
const versionString = applicationVersion ? ` [version ${applicationVersion}]` :
|
111
|
-
return `${ts}${versionString} [${level}]: ${fullMessageString} ${stack ?
|
107
|
+
const formattedStack = stack?.split('\n').slice(1).join('\n');
|
108
|
+
const messageString = typeof message === 'string' ? message : utils_1.DBOSJSON.stringify(message);
|
109
|
+
const fullMessageString = `${messageString}${info.includeContextMetadata ? ` ${utils_1.DBOSJSON.stringify(info.span?.attributes)}` : ''}`;
|
110
|
+
const versionString = applicationVersion ? ` [version ${applicationVersion}]` : '';
|
111
|
+
return `${ts}${versionString} [${level}]: ${fullMessageString} ${stack ? '\n' + formattedStack : ''}`;
|
112
112
|
}));
|
113
113
|
class OTLPLogQueueTransport extends TransportStream {
|
114
114
|
telemetryCollector;
|
115
|
-
name =
|
115
|
+
name = 'OTLPLogQueueTransport';
|
116
116
|
otelLogger;
|
117
117
|
applicationID;
|
118
118
|
applicationVersion;
|
@@ -123,10 +123,10 @@ class OTLPLogQueueTransport extends TransportStream {
|
|
123
123
|
this.level = logLevel;
|
124
124
|
// not sure if we need a more explicit name here
|
125
125
|
const loggerProvider = new sdk_logs_1.LoggerProvider();
|
126
|
-
this.otelLogger = loggerProvider.getLogger(
|
127
|
-
this.applicationID = process.env.DBOS__APPID ||
|
128
|
-
this.applicationVersion = process.env.DBOS__APPVERSION ||
|
129
|
-
this.executorID = process.env.DBOS__VMID ||
|
126
|
+
this.otelLogger = loggerProvider.getLogger('default');
|
127
|
+
this.applicationID = process.env.DBOS__APPID || '';
|
128
|
+
this.applicationVersion = process.env.DBOS__APPVERSION || '';
|
129
|
+
this.executorID = process.env.DBOS__VMID || 'local';
|
130
130
|
const logRecordProcessor = {
|
131
131
|
forceFlush: async () => {
|
132
132
|
// no-op
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"logs.js","sourceRoot":"","sources":["../../../src/telemetry/logs.ts"],"names":[],"mappings":";;;AAAA,qCAAqF;AACrF,qDAAsD,CAAC,4DAA4D;AAEnH,sDAA8F;AAC9F,sDAAoE;AAGpE,oCAAoC;AA4BpC,MAAa,YAAY;
|
1
|
+
{"version":3,"file":"logs.js","sourceRoot":"","sources":["../../../src/telemetry/logs.ts"],"names":[],"mappings":"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"}
|
@@ -1,6 +1,6 @@
|
|
1
|
-
import { Span } from
|
2
|
-
import { Attributes, SpanContext } from
|
3
|
-
import { TelemetryCollector } from
|
1
|
+
import { Span } from '@opentelemetry/sdk-trace-base';
|
2
|
+
import { Attributes, SpanContext } from '@opentelemetry/api';
|
3
|
+
import { TelemetryCollector } from './collector';
|
4
4
|
export declare class Tracer {
|
5
5
|
private readonly telemetryCollector;
|
6
6
|
private readonly tracer;
|
@@ -19,21 +19,21 @@ class Tracer {
|
|
19
19
|
this.telemetryCollector = telemetryCollector;
|
20
20
|
this.tracer = new sdk_trace_base_1.BasicTracerProvider({
|
21
21
|
resource: new resources_1.Resource({
|
22
|
-
[semantic_conventions_1.SemanticResourceAttributes.SERVICE_NAME]:
|
22
|
+
[semantic_conventions_1.SemanticResourceAttributes.SERVICE_NAME]: 'dbos',
|
23
23
|
}),
|
24
24
|
});
|
25
25
|
this.tracer.register();
|
26
|
-
this.applicationID = process.env.DBOS__APPID ||
|
27
|
-
this.applicationVersion = process.env.DBOS__APPVERSION ||
|
28
|
-
this.executorID = process.env.DBOS__VMID ||
|
26
|
+
this.applicationID = process.env.DBOS__APPID || '';
|
27
|
+
this.applicationVersion = process.env.DBOS__APPVERSION || '';
|
28
|
+
this.executorID = process.env.DBOS__VMID || 'local'; // for consistency with src/context.ts
|
29
29
|
}
|
30
30
|
startSpanWithContext(spanContext, name, attributes) {
|
31
|
-
const tracer = api_1.default.trace.getTracer(
|
31
|
+
const tracer = api_1.default.trace.getTracer('dbos-tracer');
|
32
32
|
const ctx = api_1.default.trace.setSpanContext(api_1.default.context.active(), spanContext);
|
33
33
|
return tracer.startSpan(name, { startTime: performance.now(), attributes: attributes }, ctx);
|
34
34
|
}
|
35
35
|
startSpan(name, attributes, parentSpan) {
|
36
|
-
const tracer = api_1.default.trace.getTracer(
|
36
|
+
const tracer = api_1.default.trace.getTracer('dbos-tracer');
|
37
37
|
const startTime = (0, core_1.hrTime)(performance.now());
|
38
38
|
if (parentSpan) {
|
39
39
|
const ctx = api_1.default.trace.setSpan(api_1.default.context.active(), parentSpan);
|
@@ -47,7 +47,7 @@ class Tracer {
|
|
47
47
|
span.end((0, core_1.hrTime)(performance.now()));
|
48
48
|
span.attributes.applicationID = this.applicationID;
|
49
49
|
span.attributes.applicationVersion = this.applicationVersion;
|
50
|
-
if (!(
|
50
|
+
if (!('executorID' in span.attributes)) {
|
51
51
|
span.attributes.executorID = this.executorID;
|
52
52
|
}
|
53
53
|
this.telemetryCollector.push(span);
|
@@ -1,16 +1,16 @@
|
|
1
1
|
/// <reference types="node" />
|
2
2
|
/// <reference types="node" />
|
3
3
|
/// <reference types="node/http" />
|
4
|
-
import { IncomingMessage } from
|
5
|
-
import { HTTPRequest } from
|
6
|
-
import { ConfiguredInstance } from
|
7
|
-
import { AsyncHandlerWfFuncs, AsyncHandlerWfFuncInst, InvokeFuncs, InvokeFuncsInst, SyncHandlerWfFuncs, SyncHandlerWfFuncsInst } from
|
8
|
-
import { DBOSExecutor, DBOSConfig } from
|
9
|
-
import { GetWorkflowsInput, GetWorkflowsOutput, WorkflowHandle } from
|
10
|
-
import { Http2ServerRequest, Http2ServerResponse } from
|
11
|
-
import { ServerResponse } from
|
12
|
-
import { SystemDatabase } from
|
13
|
-
import { WorkflowQueue } from
|
4
|
+
import { IncomingMessage } from 'http';
|
5
|
+
import { HTTPRequest } from '../context';
|
6
|
+
import { ConfiguredInstance } from '../decorators';
|
7
|
+
import { AsyncHandlerWfFuncs, AsyncHandlerWfFuncInst, InvokeFuncs, InvokeFuncsInst, SyncHandlerWfFuncs, SyncHandlerWfFuncsInst } from '../httpServer/handler';
|
8
|
+
import { DBOSExecutor, DBOSConfig } from '../dbos-executor';
|
9
|
+
import { GetWorkflowsInput, GetWorkflowsOutput, WorkflowHandle } from '../workflow';
|
10
|
+
import { Http2ServerRequest, Http2ServerResponse } from 'http2';
|
11
|
+
import { ServerResponse } from 'http';
|
12
|
+
import { SystemDatabase } from '../system_database';
|
13
|
+
import { WorkflowQueue } from '../wfqueue';
|
14
14
|
/**
|
15
15
|
* Create a testing runtime. Warn: this function will drop the existing system DB and create a clean new one. Don't run tests against your production database!
|
16
16
|
*/
|
@@ -65,7 +65,7 @@ export declare class TestingRuntimeImpl implements TestingRuntime {
|
|
65
65
|
deactivateEventReceivers(): Promise<void>;
|
66
66
|
/**
|
67
67
|
* Get Application Configuration.
|
68
|
-
|
68
|
+
*/
|
69
69
|
getConfig<T>(key: string): T | undefined;
|
70
70
|
getConfig<T>(key: string, defaultValue: T): T;
|
71
71
|
setConfig<T>(key: string, newValue: T): void;
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"testing_runtime.d.ts","sourceRoot":"","sources":["../../../src/testing/testing_runtime.ts"],"names":[],"mappings":";;;AACA,OAAO,EAAE,eAAe,EAAE,MAAM,MAAM,CAAC;AAEvC,OAAO,EAAE,WAAW,EAAmB,MAAM,YAAY,CAAC;AAC1D,OAAO,EAAE,kBAAkB,EAA2B,MAAM,eAAe,CAAC;AAE5E,OAAO,
|
1
|
+
{"version":3,"file":"testing_runtime.d.ts","sourceRoot":"","sources":["../../../src/testing/testing_runtime.ts"],"names":[],"mappings":"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"}
|
@@ -127,12 +127,17 @@ class TestingRuntimeImpl {
|
|
127
127
|
const ops = (0, decorators_1.getRegisteredOperations)(clsinst ? clsinst : object);
|
128
128
|
const proxy = {};
|
129
129
|
// Creates a context to pass in necessary info.
|
130
|
-
const span = dbosExec.tracer.startSpan(
|
131
|
-
const oc = new context_1.DBOSContextImpl(
|
132
|
-
oc.authenticatedUser = params?.authenticatedUser ??
|
130
|
+
const span = dbosExec.tracer.startSpan('test');
|
131
|
+
const oc = new context_1.DBOSContextImpl('test', span, dbosExec.logger);
|
132
|
+
oc.authenticatedUser = params?.authenticatedUser ?? '';
|
133
133
|
oc.request = params?.request ?? {};
|
134
134
|
oc.authenticatedRoles = params?.authenticatedRoles ?? [];
|
135
|
-
const wfParams = {
|
135
|
+
const wfParams = {
|
136
|
+
workflowUUID: workflowUUID,
|
137
|
+
parentCtx: oc,
|
138
|
+
configuredInstance: clsinst,
|
139
|
+
queueName: queue?.name,
|
140
|
+
};
|
136
141
|
for (const op of ops) {
|
137
142
|
if (asyncWf) {
|
138
143
|
proxy[op.name] = op.txnConfig
|
@@ -147,7 +152,9 @@ class TestingRuntimeImpl {
|
|
147
152
|
}
|
148
153
|
else {
|
149
154
|
proxy[op.name] = op.workflowConfig
|
150
|
-
? (...args) => dbosExec
|
155
|
+
? (...args) => dbosExec
|
156
|
+
.workflow(op.registeredFunction, wfParams, ...args)
|
157
|
+
.then((handle) => handle.getResult())
|
151
158
|
: undefined;
|
152
159
|
}
|
153
160
|
}
|
@@ -185,13 +192,13 @@ class TestingRuntimeImpl {
|
|
185
192
|
*/
|
186
193
|
getHandlersCallback() {
|
187
194
|
if (!this.#server) {
|
188
|
-
throw new error_1.DBOSError(
|
195
|
+
throw new error_1.DBOSError('Uninitialized testing runtime! Did you forget to call init() first?');
|
189
196
|
}
|
190
197
|
return this.#server.app.callback();
|
191
198
|
}
|
192
199
|
getAdminCallback() {
|
193
200
|
if (!this.#server) {
|
194
|
-
throw new error_1.DBOSError(
|
201
|
+
throw new error_1.DBOSError('Uninitialized testing runtime! Did you forget to call init() first?');
|
195
202
|
}
|
196
203
|
return this.#server.adminApp.callback();
|
197
204
|
}
|
@@ -222,7 +229,7 @@ class TestingRuntimeImpl {
|
|
222
229
|
*/
|
223
230
|
getDBOSExec() {
|
224
231
|
if (!this.#server) {
|
225
|
-
throw new error_1.DBOSError(
|
232
|
+
throw new error_1.DBOSError('Uninitialized testing runtime! Did you forget to call init() first?');
|
226
233
|
}
|
227
234
|
return this.#server.dbosExec;
|
228
235
|
}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"testing_runtime.js","sourceRoot":"","sources":["../../../src/testing/testing_runtime.ts"],"names":[],"mappings":";;;AAGA,wCAA0D;AAC1D,8CAA4E;AAC5E,oCAA6D;
|
1
|
+
{"version":3,"file":"testing_runtime.js","sourceRoot":"","sources":["../../../src/testing/testing_runtime.ts"],"names":[],"mappings":";;;AAGA,wCAA0D;AAC1D,8CAA4E;AAC5E,oCAA6D;AAS7D,iDAAsD;AACtD,oDAA4D;AAC5D,mDAA6E;AAM7E,mCAAkC;AAClC,2BAA4B;AAC5B,sDAAuD;AAEvD,wCAA0D;AAC1D,kCAA+B;AAE/B;;GAEG;AACI,KAAK,UAAU,oBAAoB,CACxC,cAAoC,SAAS,EAC7C,iBAAyB,2BAAkB,EAC3C,YAAqB,IAAI;IAEzB,MAAM,CAAC,UAAU,CAAC,GAAG,IAAA,wBAAe,EAAC,EAAE,UAAU,EAAE,cAAc,EAAE,CAAC,CAAC;IAErE,IAAI,SAAS,EAAE,CAAC;QACd,gFAAgF;QAChF,MAAM,cAAc,GAAG,IAAI,WAAM,CAAC;YAChC,IAAI,EAAE,UAAU,CAAC,UAAU,CAAC,IAAI;YAChC,IAAI,EAAE,UAAU,CAAC,UAAU,CAAC,IAAI;YAChC,IAAI,EAAE,UAAU,CAAC,UAAU,CAAC,IAAI;YAChC,QAAQ,EAAE,UAAU,CAAC,UAAU,CAAC,QAAQ;YACxC,QAAQ,EAAE,UAAU,CAAC,UAAU,CAAC,QAAQ;SACzC,CAAC,CAAC;QACH,MAAM,cAAc,CAAC,OAAO,EAAE,CAAC;QAC/B,MAAM,cAAc,CAAC,KAAK,CAAC,2BAA2B,UAAU,CAAC,eAAe,GAAG,CAAC,CAAC;QACrF,MAAM,cAAc,CAAC,GAAG,EAAE,CAAC;IAC7B,CAAC;IAED,MAAM,GAAG,GAAG,yBAAyB,CAAC,WAAW,EAAE,UAAU,EAAE,SAAS,CAAC,CAAC;IAC1E,OAAO,GAAG,CAAC;AACb,CAAC;AAvBD,oDAuBC;AAmED;;GAEG;AACI,KAAK,UAAU,yBAAyB,CAC7C,WAAiC,EACjC,UAAsB,EACtB,QAAyB;IAEzB,MAAM,GAAG,GAAG,IAAI,kBAAkB,EAAE,CAAC;IACrC,MAAM,GAAG,CAAC,IAAI,CAAC,WAAW,EAAE,UAAU,EAAE,QAAQ,CAAC,CAAC;IAClD,OAAO,GAAG,CAAC;AACb,CAAC;AARD,8DAQC;AAED;;GAEG;AACH,MAAa,kBAAkB;IAC7B,OAAO,GAA0B,IAAI,CAAC;IACtC,UAAU,GAAyB,IAAI,CAAC;IACxC,cAAc,GAAyB,IAAI,CAAC;IAC5C,kBAAkB,GAAW,EAAE,CAAC;IAChC,cAAc,GAAG,KAAK,CAAC;IACvB,SAAS,GAAwB,IAAI,CAAC;IAEtC;;;OAGG;IACH,KAAK,CAAC,IAAI,CAAC,WAAsB,EAAE,UAAuB,EAAE,QAAyB;QACnF,MAAM,UAAU,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,IAAA,wBAAe,GAAE,CAAC;QACjE,WAAI,CAAC,UAAU,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC;QAChC,IAAI,CAAC,SAAS,GAAG,IAAI,4BAAY,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAC;QAC3D,IAAI,CAAC,kBAAkB,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,WAAW,IAAI,EAAE,CAAC;QAClE,WAAI,CAAC,YAAY,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC;QAC1C,MAAM,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QACvC,IAAI,CAAC,OAAO,GAAG,IAAI,uBAAc,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAClD,MAAM,IAAI,CAAC,kBAAkB,EAAE,CAAC;QAChC,IAAI,CAAC,kBAAkB,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,WAAW,IAAI,EAAE,CAAC;QAClE,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC;IAC7B,CAAC;IAED,KAAK,CAAC,kBAAkB;QACtB,KAAK,MAAM,OAAO,IAAI,IAAI,CAAC,SAAU,CAAC,cAAc,EAAE,CAAC;YACrD,MAAM,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,SAAU,CAAC,CAAC;QAC5C,CAAC;QACD,IAAI,CAAC,UAAU,GAAG,IAAI,yBAAa,CAAC,IAAI,CAAC,SAAU,CAAC,CAAC;QACrD,IAAI,CAAC,UAAU,CAAC,aAAa,EAAE,CAAC;QAChC,IAAI,CAAC,cAAc,GAAG,uBAAa,CAAC,YAAY,CAAC,IAAI,CAAC,SAAU,CAAC,CAAC;IACpE,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,OAAO;QACX,qBAAqB;QACrB,IAAI,IAAI,CAAC,cAAc,EAAE,CAAC;YACxB,MAAM,IAAI,CAAC,wBAAwB,EAAE,CAAC;YACtC,MAAM,IAAI,CAAC,OAAO,EAAE,QAAQ,CAAC,OAAO,EAAE,CAAC;YACvC,IAAI,CAAC,cAAc,GAAG,KAAK,CAAC;QAC9B,CAAC;IACH,CAAC;IAED,KAAK,CAAC,wBAAwB;QAC5B,KAAK,MAAM,OAAO,IAAI,IAAI,CAAC,OAAO,EAAE,QAAQ,EAAE,cAAc,IAAI,EAAE,EAAE,CAAC;YACnE,IAAI,CAAC;gBACH,MAAM,OAAO,CAAC,OAAO,EAAE,CAAC;YAC1B,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACb,MAAM,CAAC,GAAG,GAAY,CAAC;gBACvB,IAAI,CAAC,OAAO,EAAE,QAAQ,EAAE,MAAM,CAAC,IAAI,CAAC,oCAAoC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;YACvF,CAAC;QACH,CAAC;QACD,MAAM,IAAI,CAAC,UAAU,EAAE,gBAAgB,EAAE,CAAC;QAC1C,IAAI,CAAC;YACH,uBAAa,CAAC,IAAI,EAAE,CAAC;YACrB,MAAM,IAAI,CAAC,cAAc,CAAC;QAC5B,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,MAAM,CAAC,GAAG,GAAY,CAAC;YACvB,IAAI,CAAC,OAAO,EAAE,QAAQ,EAAE,MAAM,CAAC,IAAI,CAAC,2CAA2C,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;QAC9F,CAAC;IACH,CAAC;IAOD,SAAS,CAAI,GAAW,EAAE,YAAgB;QACxC,MAAM,KAAK,GAAG,IAAA,YAAG,EAAC,IAAI,CAAC,kBAAkB,EAAE,GAAG,EAAE,YAAY,CAAC,CAAC;QAC9D,IAAI,KAAK,IAAI,YAAY,IAAI,OAAO,KAAK,KAAK,OAAO,YAAY,EAAE,CAAC;YAClE,MAAM,IAAI,8BAAsB,CAAC,GAAG,EAAE,OAAO,YAAY,EAAE,OAAO,KAAK,CAAC,CAAC;QAC3E,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IAED,SAAS,CAAI,GAAW,EAAE,QAAW;QACnC,IAAA,YAAG,EAAC,IAAI,CAAC,kBAAkB,EAAE,GAAG,EAAE,QAAQ,CAAC,CAAC;IAC9C,CAAC;IAED;;;OAGG;IACH,UAAU,CACR,MAAS,EACT,YAAgC,EAChC,MAAwC,EACxC,OAAgB,EAChB,OAAkC,EAClC,KAAqB;QAErB,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC;QAEpC,MAAM,GAAG,GAAG,IAAA,oCAAuB,EAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;QAEhE,MAAM,KAAK,GAA4B,EAAE,CAAC;QAE1C,+CAA+C;QAC/C,MAAM,IAAI,GAAG,QAAQ,CAAC,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;QAC/C,MAAM,EAAE,GAAG,IAAI,yBAAe,CAAC,MAAM,EAAE,IAAI,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC;QAC9D,EAAE,CAAC,iBAAiB,GAAG,MAAM,EAAE,iBAAiB,IAAI,EAAE,CAAC;QACvD,EAAE,CAAC,OAAO,GAAG,MAAM,EAAE,OAAO,IAAI,EAAE,CAAC;QACnC,EAAE,CAAC,kBAAkB,GAAG,MAAM,EAAE,kBAAkB,IAAI,EAAE,CAAC;QAEzD,MAAM,QAAQ,GAAmB;YAC/B,YAAY,EAAE,YAAY;YAC1B,SAAS,EAAE,EAAE;YACb,kBAAkB,EAAE,OAAO;YAC3B,SAAS,EAAE,KAAK,EAAE,IAAI;SACvB,CAAC;QACF,KAAK,MAAM,EAAE,IAAI,GAAG,EAAE,CAAC;YACrB,IAAI,OAAO,EAAE,CAAC;gBACZ,KAAK,CAAC,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,SAAS;oBAC3B,CAAC,CAAC,CAAC,GAAG,IAAe,EAAE,EAAE,CACrB,QAAQ,CAAC,WAAW,CAAC,EAAE,CAAC,kBAAqD,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC;oBACrG,CAAC,CAAC,EAAE,CAAC,cAAc;wBACjB,CAAC,CAAC,CAAC,GAAG,IAAe,EAAE,EAAE,CACrB,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC,kBAAkD,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC;wBAC/F,CAAC,CAAC,EAAE,CAAC,UAAU;4BACb,CAAC,CAAC,CAAC,GAAG,IAAe,EAAE,EAAE,CACrB,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC,kBAAsD,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC;4BACnG,CAAC,CAAC,EAAE,CAAC,UAAU;gCACb,CAAC,CAAC,CAAC,GAAG,IAAe,EAAE,EAAE,CACrB,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC,kBAAyD,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC;gCACvG,CAAC,CAAC,SAAS,CAAC;YACtB,CAAC;iBAAM,CAAC;gBACN,KAAK,CAAC,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,cAAc;oBAChC,CAAC,CAAC,CAAC,GAAG,IAAe,EAAE,EAAE,CACrB,QAAQ;yBACL,QAAQ,CAAC,EAAE,CAAC,kBAAkD,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC;yBAClF,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC;oBAC3C,CAAC,CAAC,SAAS,CAAC;YAChB,CAAC;QACH,CAAC;QACD,OAAO,KAAuB,CAAC;IACjC,CAAC;IAED,MAAM,CACJ,MAA8B,EAC9B,YAAqB,EACrB,MAA6B;QAE7B,IAAI,OAAO,MAAM,KAAK,UAAU,EAAE,CAAC;YACjC,OAAO,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;QACnE,CAAC;aAAM,CAAC;YACN,MAAM,UAAU,GAAG,MAA4B,CAAC;YAChD,OAAO,IAAI,CAAC,UAAU,CACpB,UAAU,CAAC,WAAW,EACtB,YAAY,EACZ,MAAM,EACN,IAAI,EACJ,UAAU,CACsB,CAAC;QACrC,CAAC;IACH,CAAC;IAED,aAAa,CACX,MAAS,EACT,YAAqB,EACrB,MAA6B,EAC7B,KAAqB;QAErB,IAAI,OAAO,MAAM,KAAK,UAAU,EAAE,CAAC;YACjC,OAAO,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC;QAC1E,CAAC;aAAM,CAAC;YACN,MAAM,UAAU,GAAG,MAA4B,CAAC;YAChD,OAAO,IAAI,CAAC,UAAU,CACpB,UAAU,CAAC,WAAW,EACtB,YAAY,EACZ,MAAM,EACN,IAAI,EACJ,UAAU,EACV,KAAK,CACkC,CAAC;QAC5C,CAAC;IACH,CAAC;IAED,cAAc,CACZ,MAA8B,EAC9B,YAAqB,EACrB,MAA6B;QAE7B,IAAI,OAAO,MAAM,KAAK,UAAU,EAAE,CAAC;YACjC,OAAO,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,CAAqC,CAAC;QACxG,CAAC;aAAM,CAAC;YACN,MAAM,UAAU,GAAG,MAA4B,CAAC;YAChD,OAAO,IAAI,CAAC,UAAU,CACpB,UAAU,CAAC,WAAW,EACtB,YAAY,EACZ,MAAM,EACN,KAAK,EACL,UAAU,CAC6B,CAAC;QAC5C,CAAC;IACH,CAAC;IAED;;OAEG;IACH,mBAAmB;QACjB,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;YAClB,MAAM,IAAI,iBAAS,CAAC,qEAAqE,CAAC,CAAC;QAC7F,CAAC;QACD,OAAO,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC;IACrC,CAAC;IAED,gBAAgB;QACd,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;YAClB,MAAM,IAAI,iBAAS,CAAC,qEAAqE,CAAC,CAAC;QAC7F,CAAC;QACD,OAAO,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC;IAC1C,CAAC;IAED,KAAK,CAAC,IAAI,CAAI,eAAuB,EAAE,OAAU,EAAE,KAAc,EAAE,cAAuB;QACxF,OAAO,IAAI,CAAC,WAAW,EAAE,CAAC,IAAI,CAAC,eAAe,EAAE,OAAO,EAAE,KAAK,EAAE,cAAc,CAAC,CAAC;IAClF,CAAC;IAED,KAAK,CAAC,QAAQ,CACZ,YAAoB,EACpB,GAAW,EACX,iBAAyB,4BAAY,CAAC,6BAA6B;QAEnE,OAAO,IAAI,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC,YAAY,EAAE,GAAG,EAAE,cAAc,CAAC,CAAC;IACxE,CAAC;IAED,gBAAgB,CAAI,YAAoB;QACtC,OAAO,IAAI,CAAC,WAAW,EAAE,CAAC,gBAAgB,CAAC,YAAY,CAAC,CAAC;IAC3D,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,KAAwB;QACzC,OAAO,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC,cAAc,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;IACrE,CAAC;IAED,KAAK,CAAC,WAAW,CAAI,GAAW,EAAE,GAAG,MAAa;QAChD,iEAAiE;QACjE,OAAO,IAAI,CAAC,WAAW,EAAE,CAAC,YAAY,CAAC,KAAK,CAAC,GAAG,EAAE,GAAG,MAAM,CAAC,CAAC;IAC/D,CAAC;IAED,KAAK,CAAC,gBAAgB;QACpB,OAAO,IAAI,CAAC,WAAW,EAAE,CAAC,YAAY,CAAC,YAAY,EAAE,CAAC;IACxD,CAAC;IAED,cAAc;QACZ,OAAO,IAAI,CAAC,WAAW,EAAE,CAAC,YAAY,CAAC,UAAU,EAAE,CAAC;IACtD,CAAC;IAED;;OAEG;IACH,WAAW;QACT,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;YAClB,MAAM,IAAI,iBAAS,CAAC,qEAAqE,CAAC,CAAC;QAC7F,CAAC;QACD,OAAO,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC;IAC/B,CAAC;CACF;AAlQD,gDAkQC"}
|
@@ -1,9 +1,9 @@
|
|
1
|
-
import { UserDatabaseName, UserDatabaseClient } from
|
2
|
-
import { WorkflowContextImpl } from
|
3
|
-
import { Span } from
|
4
|
-
import { DBOSContext, DBOSContextImpl } from
|
5
|
-
import { ValuesOf } from
|
6
|
-
import { GlobalLogger as Logger } from
|
1
|
+
import { UserDatabaseName, UserDatabaseClient } from './user_database';
|
2
|
+
import { WorkflowContextImpl } from './workflow';
|
3
|
+
import { Span } from '@opentelemetry/sdk-trace-base';
|
4
|
+
import { DBOSContext, DBOSContextImpl } from './context';
|
5
|
+
import { ValuesOf } from './utils';
|
6
|
+
import { GlobalLogger as Logger } from './telemetry/logs';
|
7
7
|
export type Transaction<T extends unknown[], R> = (ctxt: TransactionContext<any>, ...args: T) => Promise<R>;
|
8
8
|
export type TransactionFunction<T extends unknown[], R> = Transaction<T, R>;
|
9
9
|
export interface TransactionConfig {
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"transaction.d.ts","sourceRoot":"","sources":["../../src/transaction.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AACvE,OAAO,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AACjD,OAAO,EAAE,IAAI,EAAE,MAAM,+BAA+B,CAAC;AACrD,OAAO,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AACzD,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AACnC,OAAO,EAAE,YAAY,IAAI,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAG1D,MAAM,MAAM,WAAW,CAAC,CAAC,SAAS,OAAO,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,kBAAkB,CAAC,GAAG,CAAC,EAAE,GAAG,IAAI,EAAE,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,CAAC;AAC5G,MAAM,MAAM,mBAAmB,CAAC,CAAC,SAAS,OAAO,EAAE,EAAE,CAAC,IAAI,WAAW,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;AAE5E,MAAM,WAAW,iBAAiB;IAChC,cAAc,CAAC,EAAE,cAAc,CAAC;IAChC,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAED,eAAO,MAAM,cAAc;;;;;CAKjB,CAAC;AACX,MAAM,MAAM,cAAc,GAAG,QAAQ,CAAC,OAAO,cAAc,CAAC,CAAC;AAE7D,MAAM,WAAW,kBAAkB,CAAC,CAAC,SAAS,kBAAkB,CAAE,SAAQ,WAAW;IACnF,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC;CACpB;AAED,qBAAa,sBAAsB,CAAC,CAAC,SAAS,kBAAkB,
|
1
|
+
{"version":3,"file":"transaction.d.ts","sourceRoot":"","sources":["../../src/transaction.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AACvE,OAAO,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AACjD,OAAO,EAAE,IAAI,EAAE,MAAM,+BAA+B,CAAC;AACrD,OAAO,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AACzD,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AACnC,OAAO,EAAE,YAAY,IAAI,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAG1D,MAAM,MAAM,WAAW,CAAC,CAAC,SAAS,OAAO,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,kBAAkB,CAAC,GAAG,CAAC,EAAE,GAAG,IAAI,EAAE,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,CAAC;AAC5G,MAAM,MAAM,mBAAmB,CAAC,CAAC,SAAS,OAAO,EAAE,EAAE,CAAC,IAAI,WAAW,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;AAE5E,MAAM,WAAW,iBAAiB;IAChC,cAAc,CAAC,EAAE,cAAc,CAAC;IAChC,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAED,eAAO,MAAM,cAAc;;;;;CAKjB,CAAC;AACX,MAAM,MAAM,cAAc,GAAG,QAAQ,CAAC,OAAO,cAAc,CAAC,CAAC;AAE7D,MAAM,WAAW,kBAAkB,CAAC,CAAC,SAAS,kBAAkB,CAAE,SAAQ,WAAW;IACnF,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC;CACpB;AAED,qBAAa,sBAAsB,CAAC,CAAC,SAAS,kBAAkB,CAC9D,SAAQ,eACR,YAAW,kBAAkB,CAAC,CAAC,CAAC;IAG9B,QAAQ,CAAC,UAAU,EAAE,gBAAgB;IACrC,QAAQ,CAAC,MAAM,EAAE,CAAC;IAIlB,QAAQ,CAAC,UAAU,EAAE,MAAM;gBALlB,UAAU,EAAE,gBAAgB,EAC5B,MAAM,EAAE,CAAC,EAClB,eAAe,EAAE,mBAAmB,EACpC,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,MAAM,EACL,UAAU,EAAE,MAAM,EAC3B,aAAa,EAAE,MAAM;CAKxB"}
|
package/dist/src/transaction.js
CHANGED
@@ -3,10 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.TransactionContextImpl = exports.IsolationLevel = void 0;
|
4
4
|
const context_1 = require("./context");
|
5
5
|
exports.IsolationLevel = {
|
6
|
-
ReadUncommitted:
|
7
|
-
ReadCommitted:
|
8
|
-
RepeatableRead:
|
9
|
-
Serializable:
|
6
|
+
ReadUncommitted: 'READ UNCOMMITTED',
|
7
|
+
ReadCommitted: 'READ COMMITTED',
|
8
|
+
RepeatableRead: 'REPEATABLE READ',
|
9
|
+
Serializable: 'SERIALIZABLE',
|
10
10
|
};
|
11
11
|
class TransactionContextImpl extends context_1.DBOSContextImpl {
|
12
12
|
clientKind;
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"transaction.js","sourceRoot":"","sources":["../../src/transaction.ts"],"names":[],"mappings":";;;AAIA,uCAAyD;AAa5C,QAAA,cAAc,GAAG;IAC5B,eAAe,EAAE,kBAAkB;IACnC,aAAa,EAAE,gBAAgB;IAC/B,cAAc,EAAE,iBAAiB;IACjC,YAAY,EAAE,cAAc;CACpB,CAAC;AAOX,MAAa,
|
1
|
+
{"version":3,"file":"transaction.js","sourceRoot":"","sources":["../../src/transaction.ts"],"names":[],"mappings":";;;AAIA,uCAAyD;AAa5C,QAAA,cAAc,GAAG;IAC5B,eAAe,EAAE,kBAAkB;IACnC,aAAa,EAAE,gBAAgB;IAC/B,cAAc,EAAE,iBAAiB;IACjC,YAAY,EAAE,cAAc;CACpB,CAAC;AAOX,MAAa,sBACX,SAAQ,yBAAe;IAIZ;IACA;IAIA;IANX,YACW,UAA4B,EAC5B,MAAS,EAClB,eAAoC,EACpC,IAAU,EACV,MAAc,EACL,UAAkB,EAC3B,aAAqB;QAErB,KAAK,CAAC,aAAa,EAAE,IAAI,EAAE,MAAM,EAAE,eAAe,CAAC,CAAC;QAR3C,eAAU,GAAV,UAAU,CAAkB;QAC5B,WAAM,GAAN,MAAM,CAAG;QAIT,eAAU,GAAV,UAAU,CAAQ;QAI3B,IAAI,CAAC,iBAAiB,GAAG,eAAe,CAAC,iBAAiB,CAAC;IAC7D,CAAC;CACF;AAhBD,wDAgBC"}
|
@@ -1,7 +1,7 @@
|
|
1
|
-
import { Pool, PoolConfig, PoolClient } from
|
2
|
-
import { IsolationLevel, TransactionConfig } from
|
3
|
-
import { ValuesOf } from
|
4
|
-
import { Knex } from
|
1
|
+
import { Pool, PoolConfig, PoolClient } from 'pg';
|
2
|
+
import { IsolationLevel, TransactionConfig } from './transaction';
|
3
|
+
import { ValuesOf } from './utils';
|
4
|
+
import { Knex } from 'knex';
|
5
5
|
import { GlobalLogger as Logger } from './telemetry/logs';
|
6
6
|
export declare function createDBIfDoesNotExist(poolConfig: PoolConfig, logger: Logger): Promise<void>;
|
7
7
|
export interface UserDatabase {
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"user_database.d.ts","sourceRoot":"","sources":["../../src/user_database.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,UAAU,EAA4D,MAAM,IAAI,CAAC;AAE5G,OAAO,EAAE,cAAc,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAClE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AACnC,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAC5B,OAAO,EAAE,YAAY,IAAI,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAE1D,wBAAsB,sBAAsB,CAAC,UAAU,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,
|
1
|
+
{"version":3,"file":"user_database.d.ts","sourceRoot":"","sources":["../../src/user_database.ts"],"names":[],"mappings":"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"}
|