@dbos-inc/dbos-sdk 3.0.45-preview.g34e483ff45 → 3.0.50-preview

package/dist/src/dbos-executor.js

@@ -72,30 +72,30 @@ class DBOSExecutor {
     config;
     initialized;
     // User Database
-    userDatabase = null;
+    #userDatabase = undefined;
+    #procedurePool = undefined;
     // System Database
     systemDatabase;
-    procedurePool;
     // Temporary workflows are created by calling transaction/send/recv directly from the executor class
-    static tempWorkflowName = 'temp_workflow';
+    static #tempWorkflowName = 'temp_workflow';
     telemetryCollector;
     static defaultNotificationTimeoutSec = 60;
-    debugMode;
+    #debugMode;
     static systemDBSchemaName = 'dbos';
     logger;
     ctxLogger;
     tracer;
     // eslint-disable-next-line @typescript-eslint/no-unsafe-function-type
-    typeormEntities = [];
-    drizzleEntities = {};
-    scheduler = new scheduler_1.ScheduledReceiver();
-    wfqEnded = undefined;
+    #typeormEntities = [];
+    #drizzleEntities = {};
+    #scheduler = new scheduler_1.ScheduledReceiver();
+    #wfqEnded = undefined;
     executorID = utils_1.globalParams.executorID;
     static globalInstance = undefined;
     /* WORKFLOW EXECUTOR LIFE CYCLE MANAGEMENT */
     constructor(config, { systemDatabase, debugMode } = {}) {
         this.config = config;
-        this.debugMode = debugMode ?? false;
+        this.#debugMode = debugMode ?? false;
         if (config.telemetry.OTLPExporter) {
             const OTLPExporter = new exporters_1.TelemetryExporter(config.telemetry.OTLPExporter);
             this.telemetryCollector = new collector_1.TelemetryCollector(OTLPExporter);
@@ -105,12 +105,12 @@ class DBOSExecutor {
             this.telemetryCollector = new collector_1.TelemetryCollector();
         }
         this.logger = new logs_1.GlobalLogger(this.telemetryCollector, this.config.telemetry.logs);
-        this.ctxLogger = new logs_1.DBOSContextualLogger(this.logger, () => (0, context_1.getCurrentContextStore)().span);
+        this.ctxLogger = new logs_1.DBOSContextualLogger(this.logger, () => api_1.trace.getActiveSpan());
         this.tracer = new traces_1.Tracer(this.telemetryCollector);
-        if (this.debugMode) {
+        if (this.#debugMode) {
             this.logger.info('Running in debug mode!');
         }
-        this.procedurePool = new pg_1.Pool((0, utils_2.getClientConfig)(this.config.databaseUrl));
+        this.#procedurePool = this.config.userDbClient ? new pg_1.Pool((0, utils_2.getClientConfig)(this.config.databaseUrl)) : undefined;
         if (systemDatabase) {
             this.logger.debug('Using provided system database'); // XXX print the name or something
             this.systemDatabase = systemDatabase;
@@ -122,7 +122,7 @@ class DBOSExecutor {
         this.initialized = false;
         DBOSExecutor.globalInstance = this;
     }
-    configureDbClient() {
+    #configureDbClient() {
         const userDbClient = this.config.userDbClient;
         const userDBConfig = (0, utils_2.getClientConfig)(this.config.databaseUrl);
         userDBConfig.max = this.config.userDbPoolSize ?? 20;
@@ -130,7 +130,7 @@ class DBOSExecutor {
             // TODO: make Prisma work with debugger proxy.
             // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-require-imports
             const { PrismaClient } = require(node_path_1.default.join(process.cwd(), 'node_modules', '@prisma', 'client')); // Find the prisma client in the node_modules of the current project
-            this.userDatabase = new user_database_1.PrismaUserDatabase(
+            this.#userDatabase = new user_database_1.PrismaUserDatabase(
             // eslint-disable-next-line @typescript-eslint/no-unsafe-argument, @typescript-eslint/no-unsafe-call
             new PrismaClient({
                 datasources: {
@@ -145,13 +145,13 @@ class DBOSExecutor {
             // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-require-imports
             const DataSourceExports = require('typeorm');
             try {
-                this.userDatabase = new user_database_1.TypeORMDatabase(
+                this.#userDatabase = new user_database_1.TypeORMDatabase(
                 // eslint-disable-next-line @typescript-eslint/no-unsafe-argument, @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access
                 new DataSourceExports.DataSource({
                     type: 'postgres',
                     url: userDBConfig.connectionString,
                     connectTimeoutMS: userDBConfig.connectionTimeoutMillis,
-                    entities: this.typeormEntities,
+                    entities: this.#typeormEntities,
                     poolSize: userDBConfig.max,
                 }));
             }
@@ -170,7 +170,7 @@ class DBOSExecutor {
                     max: userDBConfig.max,
                 },
             };
-            this.userDatabase = new user_database_1.KnexUserDatabase((0, knex_1.default)(knexConfig));
+            this.#userDatabase = new user_database_1.KnexUserDatabase((0, knex_1.default)(knexConfig));
             this.logger.debug('Loaded Knex user database');
         }
         else if (userDbClient === user_database_1.UserDatabaseName.DRIZZLE) {
@@ -178,13 +178,13 @@ class DBOSExecutor {
             const DrizzleExports = require('drizzle-orm/node-postgres');
             const drizzlePool = new pg_1.Pool(userDBConfig);
             // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access
-            const drizzle = DrizzleExports.drizzle(drizzlePool, { schema: this.drizzleEntities });
+            const drizzle = DrizzleExports.drizzle(drizzlePool, { schema: this.#drizzleEntities });
             // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
-            this.userDatabase = new user_database_1.DrizzleUserDatabase(drizzlePool, drizzle);
+            this.#userDatabase = new user_database_1.DrizzleUserDatabase(drizzlePool, drizzle);
             this.logger.debug('Loaded Drizzle user database');
         }
         else {
-            this.userDatabase = new user_database_1.PGNodeUserDatabase(userDBConfig);
+            this.#userDatabase = new user_database_1.PGNodeUserDatabase(userDBConfig);
             this.logger.debug('Loaded Postgres user database');
         }
     }
@@ -208,29 +208,31 @@ class DBOSExecutor {
                  * With TSORM, we take an array of entities (Function[]) and add them to this.entities:
                  */
                 if (Array.isArray(reg.ormEntities)) {
-                    this.typeormEntities = this.typeormEntities.concat(reg.ormEntities);
+                    this.#typeormEntities = this.#typeormEntities.concat(reg.ormEntities);
                     length = reg.ormEntities.length;
                 }
                 else {
                     /**
                      * With Drizzle, we need to take an object of entities, since the object keys are used to access the entities from ctx.client.query:
                      */
-                    this.drizzleEntities = { ...this.drizzleEntities, ...reg.ormEntities };
+                    this.#drizzleEntities = { ...this.#drizzleEntities, ...reg.ormEntities };
                     length = Object.keys(reg.ormEntities).length;
                 }
                 this.logger.debug(`Loaded ${length} ORM entities`);
             }
-            if (!this.debugMode) {
-                await (0, user_database_1.createDBIfDoesNotExist)(this.config.databaseUrl, this.logger);
-            }
-            this.configureDbClient();
-            if (!this.userDatabase) {
-                this.logger.error('No user database configured!');
-                throw new error_1.DBOSInitializationError('No user database configured!');
+            if (this.config.userDbClient) {
+                if (!this.#debugMode) {
+                    await (0, user_database_1.createDBIfDoesNotExist)(this.config.databaseUrl, this.logger);
+                }
+                this.#configureDbClient();
+                if (!this.#userDatabase) {
+                    this.logger.error('No user database configured!');
+                    throw new error_1.DBOSInitializationError('No user database configured!');
+                }
+                // Debug mode doesn't need to initialize the DBs. Everything should appear to be read-only.
+                await this.#userDatabase.init(this.#debugMode);
             }
-            // Debug mode doesn't need to initialize the DBs. Everything should appear to be read-only.
-            await this.userDatabase.init(this.debugMode);
-            if (!this.debugMode) {
+            if (!this.#debugMode) {
                 await this.systemDatabase.init();
             }
         }
@@ -253,7 +255,7 @@ class DBOSExecutor {
         }
         this.initialized = true;
         // Only execute init code if under non-debug mode
-        if (!this.debugMode) {
+        if (!this.#debugMode) {
             for (const cls of classnames) {
                 // Init its configurations
                 const creg = (0, decorators_1.getClassRegistrationByName)(cls);
@@ -306,10 +308,8 @@ class DBOSExecutor {
         try {
             await this.systemDatabase.awaitRunningWorkflows();
             await this.systemDatabase.destroy();
-            if (this.userDatabase) {
-                await this.userDatabase.destroy();
-            }
-            await this.procedurePool.end();
+            await this.#userDatabase?.destroy();
+            await this.#procedurePool?.end();
             await this.logger.destroy();
             if (DBOSExecutor.globalInstance === this) {
                 DBOSExecutor.globalInstance = undefined;
@@ -321,6 +321,24 @@ class DBOSExecutor {
             throw err;
         }
     }
+    async createUserSchema() {
+        if (!this.#userDatabase) {
+            throw new Error('User database not enabled.');
+        }
+        await this.#userDatabase.createSchema();
+    }
+    async dropUserSchema() {
+        if (!this.#userDatabase) {
+            throw new Error('User database not enabled.');
+        }
+        await this.#userDatabase.dropSchema();
+    }
+    async queryUserDbFunction(queryFunction, ...params) {
+        if (!this.#userDatabase) {
+            throw new Error('User database not enabled.');
+        }
+        return await this.#userDatabase.queryFunction(queryFunction, ...params);
+    }
     // This could return WF, or the function underlying a temp wf
     #getFunctionInfoFromWFStatus(wf) {
         const methReg = (0, decorators_1.getFunctionRegistrationByName)(wf.workflowClassName, wf.workflowName);
@@ -364,7 +382,7 @@ class DBOSExecutor {
         const pctx = (0, context_1.getCurrentContextStore)();
         let wConfig = {};
         const wInfo = (0, decorators_1.getFunctionRegistration)(wf);
-        if (wf.name !== DBOSExecutor.tempWorkflowName) {
+        if (wf.name !== DBOSExecutor.#tempWorkflowName) {
             if (!wInfo || !wInfo.workflowConfig) {
                 throw new error_1.DBOSNotRegisteredError(wf.name);
             }
@@ -382,8 +400,8 @@ class DBOSExecutor {
             authenticatedUser: pctx?.authenticatedUser ?? '',
             authenticatedRoles: pctx?.authenticatedRoles ?? [],
             assumedRole: pctx?.assumedRole ?? '',
-        }, pctx?.span);
-        const isTempWorkflow = DBOSExecutor.tempWorkflowName === wfname;
+        });
+        const isTempWorkflow = DBOSExecutor.#tempWorkflowName === wfname;
         const internalStatus = {
             workflowUUID: workflowID,
             status: params.queueName !== undefined ? workflow_1.StatusString.ENQUEUED : workflow_1.StatusString.PENDING,
@@ -408,14 +426,14 @@ class DBOSExecutor {
             priority: priority ?? 0,
         };
         if (isTempWorkflow) {
-            internalStatus.workflowName = `${DBOSExecutor.tempWorkflowName}-${params.tempWfType}-${params.tempWfName}`;
+            internalStatus.workflowName = `${DBOSExecutor.#tempWorkflowName}-${params.tempWfType}-${params.tempWfName}`;
             internalStatus.workflowClassName = params.tempWfClass ?? '';
         }
         let status = undefined;
         let $deadlineEpochMS = undefined;
         // Synchronously set the workflow's status to PENDING and record workflow inputs.
         // We have to do it for all types of workflows because operation_outputs table has a foreign key constraint on workflow status table.
-        if (this.debugMode) {
+        if (this.#debugMode) {
             const wfStatus = await this.systemDatabase.getWorkflowStatus(workflowID);
             if (!wfStatus) {
                 throw new error_1.DBOSDebuggerError(`Failed to find inputs for workflow UUID ${workflowID}`);
@@ -471,7 +489,7 @@ class DBOSExecutor {
             e.dbos_already_logged = true;
             internalStatus.error = utils_1.DBOSJSON.stringify((0, serialize_error_1.serializeError)(e));
             internalStatus.status = workflow_1.StatusString.ERROR;
-            if (!exec.debugMode) {
+            if (!exec.#debugMode) {
                 await exec.systemDatabase.recordWorkflowError(workflowID, internalStatus);
             }
             span.setStatus({ code: api_1.SpanStatusCode.ERROR, message: e.message });
@@ -480,23 +498,24 @@ class DBOSExecutor {
             let result;
             // Execute the workflow.
             try {
-                const callResult = await (0, context_1.runWithParentContext)(pctx, {
-                    presetID,
-                    timeoutMS,
-                    deadlineEpochMS,
-                    workflowId: workflowID,
-                    span,
-                    logger: this.ctxLogger,
-                }, () => {
-                    const callPromise = wf.call(params.configuredInstance, ...args);
-                    if ($deadlineEpochMS === undefined) {
-                        return callPromise;
-                    }
-                    else {
-                        return callPromiseWithTimeout(callPromise, $deadlineEpochMS, this.systemDatabase);
-                    }
+                const callResult = await api_1.context.with(api_1.trace.setSpan(api_1.context.active(), span), async () => {
+                    return await (0, context_1.runWithParentContext)(pctx, {
+                        presetID,
+                        timeoutMS,
+                        deadlineEpochMS,
+                        workflowId: workflowID,
+                        logger: this.ctxLogger,
+                    }, () => {
+                        const callPromise = wf.call(params.configuredInstance, ...args);
+                        if ($deadlineEpochMS === undefined) {
+                            return callPromise;
+                        }
+                        else {
+                            return callPromiseWithTimeout(callPromise, $deadlineEpochMS, this.systemDatabase);
+                        }
+                    });
                 });
-                if (this.debugMode) {
+                if (this.#debugMode) {
                     const recordedResult = DBOSExecutor.reviveResultOrError((await this.systemDatabase.awaitWorkflowResult(workflowID)));
                     if (!resultsMatch(recordedResult, callResult)) {
                         this.logger.error(`Detect different output for the workflow UUID ${workflowID}!\n Received: ${utils_1.DBOSJSON.stringify(callResult)}\n Original: ${utils_1.DBOSJSON.stringify(recordedResult)}`);
@@ -514,7 +533,7 @@ class DBOSExecutor {
                 }
                 internalStatus.output = utils_1.DBOSJSON.stringify(result);
                 internalStatus.status = workflow_1.StatusString.SUCCESS;
-                if (!this.debugMode) {
+                if (!this.#debugMode) {
                     await this.systemDatabase.recordWorkflowOutput(workflowID, internalStatus);
                 }
                 span.setStatus({ code: api_1.SpanStatusCode.OK });
@@ -550,7 +569,7 @@ class DBOSExecutor {
             }
             return result;
         };
-        if (this.debugMode ||
+        if (this.#debugMode ||
             (status !== 'SUCCESS' && status !== 'ERROR' && (params.queueName === undefined || params.executeWorkflow))) {
             const workflowPromise = runWorkflow();
             this.systemDatabase.registerRunningWorkflow(workflowID, workflowPromise);
@@ -616,7 +635,7 @@ class DBOSExecutor {
      * Write a operation's output to the database.
      */
     async #recordOutput(query, workflowUUID, funcID, txnSnapshot, output, isKeyConflict, function_name) {
-        if (this.debugMode) {
+        if (this.#debugMode) {
             throw new error_1.DBOSDebuggerError('Cannot record output in debug mode.');
         }
         try {
@@ -638,7 +657,7 @@ class DBOSExecutor {
      * Record an error in an operation to the database.
      */
     async #recordError(query, workflowUUID, funcID, txnSnapshot, err, isKeyConflict, function_name) {
-        if (this.debugMode) {
+        if (this.#debugMode) {
             throw new error_1.DBOSDebuggerError('Cannot record error in debug mode.');
         }
         try {
@@ -656,12 +675,17 @@ class DBOSExecutor {
         }
     }
     async getTransactions(workflowUUID) {
-        const rows = await this.userDatabase.query(`SELECT function_id, function_name, output, error FROM ${DBOSExecutor.systemDBSchemaName}.transaction_outputs WHERE workflow_uuid=$1`, workflowUUID);
-        for (const row of rows) {
-            row.output = row.output !== null ? utils_1.DBOSJSON.parse(row.output) : null;
-            row.error = row.error !== null ? (0, serialize_error_1.deserializeError)(utils_1.DBOSJSON.parse(row.error)) : null;
+        if (this.#userDatabase) {
+            const rows = await this.#userDatabase.query(`SELECT function_id, function_name, output, error FROM ${DBOSExecutor.systemDBSchemaName}.transaction_outputs WHERE workflow_uuid=$1`, workflowUUID);
+            for (const row of rows) {
+                row.output = row.output !== null ? utils_1.DBOSJSON.parse(row.output) : null;
+                row.error = row.error !== null ? (0, serialize_error_1.deserializeError)(utils_1.DBOSJSON.parse(row.error)) : null;
+            }
+            return rows;
+        }
+        else {
+            return [];
         }
-        return rows;
     }
     async runTransactionTempWF(txn, params, ...args) {
         return await (await this.startTransactionTempWF(txn, params, undefined, undefined, ...args)).getResult();
@@ -679,6 +703,10 @@ class DBOSExecutor {
         }, callerWFID, callerFunctionID, ...args);
     }
     async callTransactionFunction(txn, clsinst, ...args) {
+        const userDB = this.#userDatabase;
+        if (!userDB) {
+            throw new Error('No user database configured for transactions.');
+        }
         const txnReg = (0, decorators_1.getFunctionRegistration)(txn);
         if (!txnReg || !txnReg.txnConfig) {
             throw new error_1.DBOSNotRegisteredError(txn.name);
@@ -698,7 +726,7 @@ class DBOSExecutor {
             assumedRole: pctx.assumedRole ?? '',
             authenticatedRoles: pctx.authenticatedRoles ?? [],
             isolationLevel: txnReg.txnConfig.isolationLevel,
-        }, pctx.span);
+        });
         while (true) {
             await this.systemDatabase.checkIfCanceled(wfid);
             let txn_snapshot = 'invalid';
@@ -707,7 +735,7 @@ class DBOSExecutor {
                 // If the UUID is preset, it is possible this execution previously happened. Check, and return its original result if it did.
                 // Note: It is possible to retrieve a generated ID from a workflow handle, run a concurrent execution, and cause trouble for yourself. We recommend against this.
                 let prevResult = exports.dbosNull;
-                const queryFunc = (sql, args) => this.userDatabase.queryWithClient(client, sql, ...args);
+                const queryFunc = (sql, args) => userDB.queryWithClient(client, sql, ...args);
                 if (pctx.presetID) {
                     const executionResult = await this.#checkExecution(queryFunc, wfid, funcId, txn.name);
                     prevResult = executionResult.result;
@@ -728,32 +756,33 @@ class DBOSExecutor {
                     // Collect snapshot information for read-only transactions and non-preset UUID transactions, if not already collected above
                     txn_snapshot = await DBOSExecutor.#retrieveSnapshot(queryFunc);
                 }
-                if (this.debugMode && prevResult === exports.dbosNull) {
+                if (this.#debugMode && prevResult === exports.dbosNull) {
                     throw new error_1.DBOSDebuggerError(`Failed to find the recorded output for the transaction: workflow UUID ${wfid}, step number ${funcId}`);
                 }
                 // Execute the user's transaction.
                 const ctxlog = this.ctxLogger;
                 const result = await (async function () {
                     try {
-                        return await (0, context_1.runWithParentContext)(pctx, {
-                            authenticatedRoles: pctx?.authenticatedRoles,
-                            authenticatedUser: pctx?.authenticatedUser,
-                            workflowId: wfid,
-                            curTxFunctionId: funcId,
-                            parentCtx: pctx,
-                            sqlClient: client,
-                            logger: ctxlog,
-                            span,
-                        }, async () => {
-                            const tf = txn;
-                            return await tf.call(clsinst, ...args);
+                        return await api_1.context.with(api_1.trace.setSpan(api_1.context.active(), span), async () => {
+                            return await (0, context_1.runWithParentContext)(pctx, {
+                                authenticatedRoles: pctx?.authenticatedRoles,
+                                authenticatedUser: pctx?.authenticatedUser,
+                                workflowId: wfid,
+                                curTxFunctionId: funcId,
+                                parentCtx: pctx,
+                                sqlClient: client,
+                                logger: ctxlog,
+                            }, async () => {
+                                const tf = txn;
+                                return await tf.call(clsinst, ...args);
+                            });
                         });
                     }
                     catch (e) {
                         return e instanceof Error ? e : new Error(`${e}`);
                     }
                 })();
-                if (this.debugMode) {
+                if (this.#debugMode) {
                     if (prevResult instanceof Error) {
                         throw prevResult;
                     }
@@ -770,11 +799,11 @@ class DBOSExecutor {
                 // Record the execution, commit, and return.
                 try {
                     // Synchronously record the output of write transactions and obtain the transaction ID.
-                    const pg_txn_id = await this.#recordOutput(queryFunc, wfid, funcId, txn_snapshot, result, (error) => this.userDatabase.isKeyConflictError(error), txn.name);
+                    const pg_txn_id = await this.#recordOutput(queryFunc, wfid, funcId, txn_snapshot, result, (error) => userDB.isKeyConflictError(error), txn.name);
                     span.setAttribute('pg_txn_id', pg_txn_id);
                 }
                 catch (error) {
-                    if (this.userDatabase.isFailedSqlTransactionError(error)) {
+                    if (userDB.isFailedSqlTransactionError(error)) {
                         this.logger.error(`Postgres aborted the ${txn.name} @DBOS.transaction of Workflow ${wfid}, but the function did not raise an exception.  Please ensure that the @DBOS.transaction method raises an exception if the database transaction is aborted.`);
                         throw new error_1.DBOSFailedSqlTransactionError(wfid, txn.name);
                     }
@@ -785,15 +814,15 @@ class DBOSExecutor {
                 return result;
             };
             try {
-                const result = await this.userDatabase.transaction(wrappedTransaction, txnReg.txnConfig);
+                const result = await userDB.transaction(wrappedTransaction, txnReg.txnConfig);
                 span.setStatus({ code: api_1.SpanStatusCode.OK });
                 this.tracer.endSpan(span);
                 return result;
             }
             catch (err) {
                 const e = err;
-                if (!prevResultFound && !this.debugMode && !(e instanceof error_1.DBOSUnexpectedStepError)) {
-                    if (this.userDatabase.isRetriableTransactionError(err)) {
+                if (!prevResultFound && !this.#debugMode && !(e instanceof error_1.DBOSUnexpectedStepError)) {
+                    if (userDB.isRetriableTransactionError(err)) {
                         // serialization_failure in PostgreSQL
                         span.addEvent('TXN SERIALIZATION FAILURE', { retryWaitMillis: retryWaitMillis }, performance.now());
                         // Retry serialization failures.
@@ -804,9 +833,9 @@ class DBOSExecutor {
                     }
                     // Record and throw other errors.
                     const e = err;
-                    await this.userDatabase.transaction(async (client) => {
-                        const func = (sql, args) => this.userDatabase.queryWithClient(client, sql, ...args);
-                        await this.#recordError(func, wfid, funcId, txn_snapshot, e, (error) => this.userDatabase.isKeyConflictError(error), txn.name);
+                    await userDB.transaction(async (client) => {
+                        const func = (sql, args) => userDB.queryWithClient(client, sql, ...args);
+                        await this.#recordError(func, wfid, funcId, txn_snapshot, e, (error) => userDB.isKeyConflictError(error), txn.name);
                     }, { isolationLevel: transaction_1.IsolationLevel.ReadCommitted });
                 }
                 span.setStatus({ code: api_1.SpanStatusCode.ERROR, message: e.message });
@@ -836,7 +865,7 @@ class DBOSExecutor {
         const pctx = (0, context_1.getCurrentContextStore)();
         const wfid = pctx.workflowId;
         await this.systemDatabase.checkIfCanceled(wfid);
-        const executeLocally = this.debugMode || (procConfig.executeLocally ?? false);
+        const executeLocally = this.#debugMode || (procConfig.executeLocally ?? false);
         const funcId = (0, context_1.functionIDGetIncrement)();
         const span = this.tracer.startSpan(proc.name, {
             operationUUID: wfid,
@@ -847,7 +876,7 @@ class DBOSExecutor {
             authenticatedRoles: pctx.authenticatedRoles ?? [],
             isolationLevel: procInfo.procConfig.isolationLevel,
             executeLocally,
-        }, pctx.span);
+        });
         try {
             const result = executeLocally
                 ? await this.#callProcedureFunctionLocal(proc, args, span, procInfo, funcId)
@@ -865,6 +894,11 @@ class DBOSExecutor {
         }
     }
     async #callProcedureFunctionLocal(proc, args, span, procInfo, funcId) {
+        const procPool = this.#procedurePool;
+        const userDB = this.#userDatabase;
+        if (!procPool || !userDB) {
+            throw new Error('User database not enabled.');
+        }
         let retryWaitMillis = 1;
         const backoffFactor = 1.5;
         const maxRetryWaitMs = 2000; // Maximum wait 2 seconds.
@@ -875,7 +909,7 @@ class DBOSExecutor {
             let txn_snapshot = 'invalid';
             const wrappedProcedure = async (client) => {
                 let prevResult = exports.dbosNull;
-                const queryFunc = (sql, args) => this.procedurePool.query(sql, args).then((v) => v.rows);
+                const queryFunc = (sql, args) => procPool.query(sql, args).then((v) => v.rows);
                 if (pctx.presetID) {
                     const executionResult = await this.#checkExecution(queryFunc, wfid, funcId, proc.name);
                     prevResult = executionResult.result;
@@ -895,7 +929,7 @@ class DBOSExecutor {
                     // Collect snapshot information for read-only transactions and non-preset UUID transactions, if not already collected above
                     txn_snapshot = await DBOSExecutor.#retrieveSnapshot(queryFunc);
                 }
-                if (this.debugMode && prevResult === exports.dbosNull) {
+                if (this.#debugMode && prevResult === exports.dbosNull) {
                     throw new error_1.DBOSDebuggerError(`Failed to find the recorded output for the procedure: workflow UUID ${wfid}, step number ${funcId}`);
                 }
                 // Execute the user's transaction.
@@ -908,23 +942,24 @@ class DBOSExecutor {
                             throw new error_1.DBOSInvalidWorkflowTransitionError();
                         if (!(0, context_1.isInWorkflowCtx)(pctx))
                             throw new error_1.DBOSInvalidWorkflowTransitionError();
-                        return await (0, context_1.runWithParentContext)(pctx, {
-                            curTxFunctionId: funcId,
-                            parentCtx: pctx,
-                            isInStoredProc: true,
-                            sqlClient: client,
-                            logger: ctxlog,
-                            span,
-                        }, async () => {
-                            const pf = proc;
-                            return await pf(...args);
+                        return await api_1.context.with(api_1.trace.setSpan(api_1.context.active(), span), async () => {
+                            return await (0, context_1.runWithParentContext)(pctx, {
+                                curTxFunctionId: funcId,
+                                parentCtx: pctx,
+                                isInStoredProc: true,
+                                sqlClient: client,
+                                logger: ctxlog,
+                            }, async () => {
+                                const pf = proc;
+                                return await pf(...args);
+                            });
                         });
                     }
                     catch (e) {
                         return e instanceof Error ? e : new Error(`${e}`);
                     }
                 })();
-                if (this.debugMode) {
+                if (this.#debugMode) {
                     if (prevResult instanceof Error) {
                         throw prevResult;
                     }
@@ -953,8 +988,8 @@ class DBOSExecutor {
                 return result;
             }
             catch (err) {
-                if (!this.debugMode) {
-                    if (this.userDatabase.isRetriableTransactionError(err)) {
+                if (!this.#debugMode) {
+                    if (userDB.isRetriableTransactionError(err)) {
                         // serialization_failure in PostgreSQL
                         span.addEvent('TXN SERIALIZATION FAILURE', { retryWaitMillis: retryWaitMillis }, performance.now());
                         // Retry serialization failures.
@@ -969,9 +1004,9 @@ class DBOSExecutor {
                         const func = (sql, args) => client.query(sql, args).then((v) => v.rows);
                         await this.#recordError(func, wfid, funcId, txn_snapshot, e, user_database_1.pgNodeIsKeyConflictError, proc.name);
                     }, { isolationLevel: transaction_1.IsolationLevel.ReadCommitted });
-                    await this.userDatabase.transaction(async (client) => {
-                        const func = (sql, args) => this.userDatabase.queryWithClient(client, sql, ...args);
-                        await this.#recordError(func, wfid, funcId, txn_snapshot, e, (error) => this.userDatabase.isKeyConflictError(error), proc.name);
+                    await userDB.transaction(async (client) => {
+                        const func = (sql, args) => userDB.queryWithClient(client, sql, ...args);
+                        await this.#recordError(func, wfid, funcId, txn_snapshot, e, (error) => userDB.isKeyConflictError(error), proc.name);
                     }, { isolationLevel: transaction_1.IsolationLevel.ReadCommitted });
                 }
                 throw err;
@@ -979,7 +1014,7 @@ class DBOSExecutor {
         }
     }
     async #callProcedureFunctionRemote(proc, args, span, config, funcId) {
-        if (this.debugMode) {
+        if (this.#debugMode) {
             throw new error_1.DBOSDebuggerError("Can't invoke stored procedure in debug mode.");
         }
         const pctx = (0, context_1.getCurrentContextStore)();
@@ -1013,7 +1048,10 @@ class DBOSExecutor {
         return output;
     }
     async #invokeStoredProc(proc, args) {
-        const client = await this.procedurePool.connect();
+        if (!this.#procedurePool) {
+            throw new Error('User Database not enabled.');
+        }
+        const client = await this.#procedurePool.connect();
         const log = (msg) => this.#logNotice(msg);
         const procname = (0, decorators_1.getRegisteredFunctionFullName)(proc);
         const plainProcName = `${procname.className}_${procname.name}_p`;
@@ -1029,7 +1067,10 @@ class DBOSExecutor {
         }
     }
     async invokeStoredProcFunction(func, config) {
-        const client = await this.procedurePool.connect();
+        if (!this.#procedurePool) {
+            throw new Error('User Database not enabled.');
+        }
+        const client = await this.#procedurePool.connect();
         try {
             const readOnly = config.readOnly ?? false;
             const isolationLevel = config.isolationLevel ?? transaction_1.IsolationLevel.Serializable;
@@ -1094,7 +1135,7 @@ class DBOSExecutor {
             intervalSeconds: stepConfig.intervalSeconds,
             maxAttempts: stepConfig.maxAttempts,
             backoffRate: stepConfig.backoffRate,
-        }, lctx.span);
+        });
         // Check if this execution previously happened, returning its original result if it did.
         const checkr = await this.systemDatabase.getOperationResultAndThrowIfCancelled(wfid, funcID);
         if (checkr) {
@@ -1107,7 +1148,7 @@ class DBOSExecutor {
             this.tracer.endSpan(span);
             return check;
         }
-        if (this.debugMode) {
+        if (this.#debugMode) {
             throw new error_1.DBOSDebuggerError(`Failed to find the recorded output for the step: workflow UUID: ${wfid}, step number: ${funcID}`);
         }
         const maxAttempts = stepConfig.maxAttempts ?? 3;
@@ -1126,7 +1167,7 @@ class DBOSExecutor {
                 try {
                     await this.systemDatabase.checkIfCanceled(wfid);
                     let cresult;
-                    await (0, context_1.runInStepContext)(lctx, funcID, span, maxAttempts, attemptNum, async () => {
+                    await (0, context_1.runInStepContext)(lctx, funcID, maxAttempts, attemptNum, async () => {
                         const sf = stepFn;
                         cresult = await sf.call(clsInst, ...args);
                     });
@@ -1150,9 +1191,11 @@ class DBOSExecutor {
         else {
             try {
                 let cresult;
-                await (0, context_1.runInStepContext)(lctx, funcID, span, maxAttempts, undefined, async () => {
-                    const sf = stepFn;
-                    cresult = await sf.call(clsInst, ...args);
+                await api_1.context.with(api_1.trace.setSpan(api_1.context.active(), span), async () => {
+                    await (0, context_1.runInStepContext)(lctx, funcID, maxAttempts, undefined, async () => {
+                        const sf = stepFn;
+                        cresult = await sf.call(clsInst, ...args);
+                    });
                 });
                 result = cresult;
             }
@@ -1207,7 +1250,7 @@ class DBOSExecutor {
      */
     forkWorkflow(workflowID, startStep, options = {}) {
         const newWorkflowID = options.newWorkflowID ?? (0, context_1.getNextWFID)(undefined);
-        return (0, workflow_management_1.forkWorkflow)(this.systemDatabase, this.userDatabase, workflowID, startStep, { ...options, newWorkflowID });
+        return (0, workflow_management_1.forkWorkflow)(this.systemDatabase, this.#userDatabase, workflowID, startStep, { ...options, newWorkflowID });
     }
     /**
      * Retrieve a handle for a workflow UUID.
@@ -1251,14 +1294,17 @@ class DBOSExecutor {
         return (0, workflow_management_1.listQueuedWorkflows)(this.systemDatabase, input);
     }
     async listWorkflowSteps(workflowID) {
-        return (0, workflow_management_1.listWorkflowSteps)(this.systemDatabase, this.userDatabase, workflowID);
+        return (0, workflow_management_1.listWorkflowSteps)(this.systemDatabase, this.#userDatabase, workflowID);
     }
     async queryUserDB(sql, params) {
+        if (!this.#userDatabase) {
+            throw new Error('User database not enabled.');
+        }
         if (params !== undefined) {
-            return await this.userDatabase.query(sql, ...params);
+            return await this.#userDatabase.query(sql, ...params);
         }
         else {
-            return await this.userDatabase.query(sql);
+            return await this.#userDatabase.query(sql);
         }
     }
     /* INTERNAL HELPERS */
@@ -1267,7 +1313,7 @@ class DBOSExecutor {
      * It runs to completion all pending workflows that were executing when the previous executor failed.
      */
     async recoverPendingWorkflows(executorIDs = ['local']) {
-        if (this.debugMode) {
+        if (this.#debugMode) {
             throw new error_1.DBOSDebuggerError('Cannot recover pending workflows in debug mode.');
         }
         const handlerArray = [];
@@ -1305,7 +1351,7 @@ class DBOSExecutor {
         return handlerArray;
     }
     async initEventReceivers() {
-        this.wfqEnded = wfqueue_1.wfQueueRunner.dispatchLoop(this);
+        this.#wfqEnded = wfqueue_1.wfQueueRunner.dispatchLoop(this);
         for (const lcl of (0, decorators_1.getLifecycleListeners)()) {
             await lcl.initialize?.();
         }
@@ -1325,7 +1371,7 @@ class DBOSExecutor {
         if (stopQueueThread) {
             try {
                 wfqueue_1.wfQueueRunner.stop();
-                await this.wfqEnded;
+                await this.#wfqEnded;
             }
             catch (err) {
                 const e = err;
@@ -1362,7 +1408,7 @@ class DBOSExecutor {
         // Should be temporary workflows. Parse the name of the workflow.
         const wfName = wfStatus.workflowName;
         const nameArr = wfName.split('-');
-        if (!nameArr[0].startsWith(DBOSExecutor.tempWorkflowName)) {
+        if (!nameArr[0].startsWith(DBOSExecutor.#tempWorkflowName)) {
             throw new error_1.DBOSError(`Cannot find workflow function for a non-temporary workflow, ID ${workflowID}, class '${wfStatus.workflowClassName}', function '${wfName}'; did you change your code?`);
         }
         if (nameArr[1] === exports.TempWorkflowType.transaction) {