@dbos-inc/dbos-sdk 3.6.7-preview → 3.6.10-preview
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/dbos-config.schema.json +0 -93
- package/dist/dbos-config.schema.json +0 -93
- package/dist/src/cli/docker_pg_helper.d.ts +0 -3
- package/dist/src/cli/docker_pg_helper.d.ts.map +1 -1
- package/dist/src/cli/docker_pg_helper.js +13 -29
- package/dist/src/cli/docker_pg_helper.js.map +1 -1
- package/dist/src/config.d.ts.map +1 -1
- package/dist/src/config.js +0 -7
- package/dist/src/config.js.map +1 -1
- package/dist/src/datasource.d.ts.map +1 -1
- package/dist/src/datasource.js +7 -7
- package/dist/src/datasource.js.map +1 -1
- package/dist/src/dbos-executor.d.ts +15 -1
- package/dist/src/dbos-executor.d.ts.map +1 -1
- package/dist/src/dbos-executor.js +10 -11
- package/dist/src/dbos-executor.js.map +1 -1
- package/dist/src/dbos.d.ts +2 -13
- package/dist/src/dbos.d.ts.map +1 -1
- package/dist/src/dbos.js +2 -33
- package/dist/src/dbos.js.map +1 -1
- package/dist/src/telemetry/collector.d.ts +1 -4
- package/dist/src/telemetry/collector.d.ts.map +1 -1
- package/dist/src/telemetry/collector.js.map +1 -1
- package/dist/src/telemetry/exporters.d.ts +3 -7
- package/dist/src/telemetry/exporters.d.ts.map +1 -1
- package/dist/src/telemetry/exporters.js +27 -10
- package/dist/src/telemetry/exporters.js.map +1 -1
- package/dist/src/telemetry/logs.d.ts +14 -21
- package/dist/src/telemetry/logs.d.ts.map +1 -1
- package/dist/src/telemetry/logs.js +155 -90
- package/dist/src/telemetry/logs.js.map +1 -1
- package/dist/src/telemetry/traces.d.ts +42 -6
- package/dist/src/telemetry/traces.d.ts.map +1 -1
- package/dist/src/telemetry/traces.js +95 -31
- package/dist/src/telemetry/traces.js.map +1 -1
- package/dist/src/utils.d.ts +2 -0
- package/dist/src/utils.d.ts.map +1 -1
- package/dist/src/utils.js +7 -1
- package/dist/src/utils.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +4 -15
- package/dist/src/telemetry/index.d.ts +0 -12
- package/dist/src/telemetry/index.d.ts.map +0 -1
- package/dist/src/telemetry/index.js +0 -14
- package/dist/src/telemetry/index.js.map +0 -1
package/dbos-config.schema.json
CHANGED
|
@@ -25,73 +25,17 @@
|
|
|
25
25
|
"type": "object",
|
|
26
26
|
"additionalProperties": false,
|
|
27
27
|
"properties": {
|
|
28
|
-
"hostname": {
|
|
29
|
-
"type": "string",
|
|
30
|
-
"description": "The hostname or IP address of the application database. DEPRECATED: Use database_url instead",
|
|
31
|
-
"deprecated": true
|
|
32
|
-
},
|
|
33
|
-
"port": {
|
|
34
|
-
"type": ["number", "string"],
|
|
35
|
-
"description": "The port number of the application database. DEPRECATED: Use database_url instead",
|
|
36
|
-
"deprecated": true
|
|
37
|
-
},
|
|
38
|
-
"username": {
|
|
39
|
-
"type": "string",
|
|
40
|
-
"description": "The username to use when connecting to the application database. DEPRECATED: Use database_url instead",
|
|
41
|
-
"not": {
|
|
42
|
-
"enum": ["dbos"]
|
|
43
|
-
},
|
|
44
|
-
"deprecated": true
|
|
45
|
-
},
|
|
46
|
-
"password": {
|
|
47
|
-
"type": "string",
|
|
48
|
-
"description": "The password to use when connecting to the application database. Developers are strongly encouraged to use environment variable substitution to avoid storing secrets in source. DEPRECATED: Use database_url instead",
|
|
49
|
-
"deprecated": true
|
|
50
|
-
},
|
|
51
|
-
"connectionTimeoutMillis": {
|
|
52
|
-
"type": ["number", "string"],
|
|
53
|
-
"description": "The number of milliseconds the system waits before timing out when connecting to the application database. DEPRECATED: Use database_url instead",
|
|
54
|
-
"deprecated": true
|
|
55
|
-
},
|
|
56
28
|
"app_db_name": {
|
|
57
29
|
"type": "string",
|
|
58
30
|
"description": "The name of the application database. DEPRECATED: Use database_url instead",
|
|
59
31
|
"deprecated": true
|
|
60
32
|
},
|
|
61
|
-
"sys_db_name": {
|
|
62
|
-
"type": "string",
|
|
63
|
-
"description": "The name of the system database",
|
|
64
|
-
"deprecated": true
|
|
65
|
-
},
|
|
66
|
-
"ssl": {
|
|
67
|
-
"type": ["boolean", "string"],
|
|
68
|
-
"description": "Use SSL/TLS to securely connect to the database (default: true). DEPRECATED: Use database_url instead",
|
|
69
|
-
"deprecated": true
|
|
70
|
-
},
|
|
71
|
-
"ssl_ca": {
|
|
72
|
-
"type": "string",
|
|
73
|
-
"description": "If using SSL/TLS to securely connect to a database, path to an SSL root certificate file. DEPRECATED: Use database_url instead",
|
|
74
|
-
"deprecated": true
|
|
75
|
-
},
|
|
76
|
-
"app_db_client": {
|
|
77
|
-
"type": "string",
|
|
78
|
-
"description": "Specify the database client to use to connect to the application database",
|
|
79
|
-
"enum": ["pg-node", "prisma", "typeorm", "knex", "drizzle"]
|
|
80
|
-
},
|
|
81
33
|
"migrate": {
|
|
82
34
|
"type": "array",
|
|
83
35
|
"items": {
|
|
84
36
|
"type": "string"
|
|
85
37
|
},
|
|
86
38
|
"description": "Specify a list of user DB migration commands to run"
|
|
87
|
-
},
|
|
88
|
-
"rollback": {
|
|
89
|
-
"type": "array",
|
|
90
|
-
"items": {
|
|
91
|
-
"type": "string"
|
|
92
|
-
},
|
|
93
|
-
"description": "Specify a list of user DB rollback commands to run. DEPRECATED: use your migration tool directly",
|
|
94
|
-
"deprecated": true
|
|
95
39
|
}
|
|
96
40
|
}
|
|
97
41
|
},
|
|
@@ -157,18 +101,6 @@
|
|
|
157
101
|
"type": "object",
|
|
158
102
|
"additionalProperties": false,
|
|
159
103
|
"properties": {
|
|
160
|
-
"entrypoints": {
|
|
161
|
-
"type": "array",
|
|
162
|
-
"items": {
|
|
163
|
-
"type": "string"
|
|
164
|
-
},
|
|
165
|
-
"deprecated": true
|
|
166
|
-
},
|
|
167
|
-
"port": {
|
|
168
|
-
"type": "number",
|
|
169
|
-
"description": "The port number of the application server (Default: 3000)",
|
|
170
|
-
"deprecated": true
|
|
171
|
-
},
|
|
172
104
|
"admin_port": {
|
|
173
105
|
"type": "number",
|
|
174
106
|
"description": "The port number of the admin server (Default: 3001)"
|
|
@@ -189,33 +121,8 @@
|
|
|
189
121
|
}
|
|
190
122
|
}
|
|
191
123
|
},
|
|
192
|
-
"http": {
|
|
193
|
-
"type": "object",
|
|
194
|
-
"additionalProperties": false,
|
|
195
|
-
"properties": {
|
|
196
|
-
"cors_middleware": {
|
|
197
|
-
"type": "boolean"
|
|
198
|
-
},
|
|
199
|
-
"credentials": {
|
|
200
|
-
"type": "boolean"
|
|
201
|
-
},
|
|
202
|
-
"allowed_origins": {
|
|
203
|
-
"type": "array",
|
|
204
|
-
"items": {
|
|
205
|
-
"type": "string"
|
|
206
|
-
}
|
|
207
|
-
}
|
|
208
|
-
}
|
|
209
|
-
},
|
|
210
|
-
"application": {
|
|
211
|
-
"deprecated": true
|
|
212
|
-
},
|
|
213
124
|
"env": {
|
|
214
125
|
"deprecated": true
|
|
215
|
-
},
|
|
216
|
-
"version": {
|
|
217
|
-
"type": "string",
|
|
218
|
-
"deprecated": true
|
|
219
126
|
}
|
|
220
127
|
}
|
|
221
128
|
}
|
|
@@ -25,73 +25,17 @@
|
|
|
25
25
|
"type": "object",
|
|
26
26
|
"additionalProperties": false,
|
|
27
27
|
"properties": {
|
|
28
|
-
"hostname": {
|
|
29
|
-
"type": "string",
|
|
30
|
-
"description": "The hostname or IP address of the application database. DEPRECATED: Use database_url instead",
|
|
31
|
-
"deprecated": true
|
|
32
|
-
},
|
|
33
|
-
"port": {
|
|
34
|
-
"type": ["number", "string"],
|
|
35
|
-
"description": "The port number of the application database. DEPRECATED: Use database_url instead",
|
|
36
|
-
"deprecated": true
|
|
37
|
-
},
|
|
38
|
-
"username": {
|
|
39
|
-
"type": "string",
|
|
40
|
-
"description": "The username to use when connecting to the application database. DEPRECATED: Use database_url instead",
|
|
41
|
-
"not": {
|
|
42
|
-
"enum": ["dbos"]
|
|
43
|
-
},
|
|
44
|
-
"deprecated": true
|
|
45
|
-
},
|
|
46
|
-
"password": {
|
|
47
|
-
"type": "string",
|
|
48
|
-
"description": "The password to use when connecting to the application database. Developers are strongly encouraged to use environment variable substitution to avoid storing secrets in source. DEPRECATED: Use database_url instead",
|
|
49
|
-
"deprecated": true
|
|
50
|
-
},
|
|
51
|
-
"connectionTimeoutMillis": {
|
|
52
|
-
"type": ["number", "string"],
|
|
53
|
-
"description": "The number of milliseconds the system waits before timing out when connecting to the application database. DEPRECATED: Use database_url instead",
|
|
54
|
-
"deprecated": true
|
|
55
|
-
},
|
|
56
28
|
"app_db_name": {
|
|
57
29
|
"type": "string",
|
|
58
30
|
"description": "The name of the application database. DEPRECATED: Use database_url instead",
|
|
59
31
|
"deprecated": true
|
|
60
32
|
},
|
|
61
|
-
"sys_db_name": {
|
|
62
|
-
"type": "string",
|
|
63
|
-
"description": "The name of the system database",
|
|
64
|
-
"deprecated": true
|
|
65
|
-
},
|
|
66
|
-
"ssl": {
|
|
67
|
-
"type": ["boolean", "string"],
|
|
68
|
-
"description": "Use SSL/TLS to securely connect to the database (default: true). DEPRECATED: Use database_url instead",
|
|
69
|
-
"deprecated": true
|
|
70
|
-
},
|
|
71
|
-
"ssl_ca": {
|
|
72
|
-
"type": "string",
|
|
73
|
-
"description": "If using SSL/TLS to securely connect to a database, path to an SSL root certificate file. DEPRECATED: Use database_url instead",
|
|
74
|
-
"deprecated": true
|
|
75
|
-
},
|
|
76
|
-
"app_db_client": {
|
|
77
|
-
"type": "string",
|
|
78
|
-
"description": "Specify the database client to use to connect to the application database",
|
|
79
|
-
"enum": ["pg-node", "prisma", "typeorm", "knex", "drizzle"]
|
|
80
|
-
},
|
|
81
33
|
"migrate": {
|
|
82
34
|
"type": "array",
|
|
83
35
|
"items": {
|
|
84
36
|
"type": "string"
|
|
85
37
|
},
|
|
86
38
|
"description": "Specify a list of user DB migration commands to run"
|
|
87
|
-
},
|
|
88
|
-
"rollback": {
|
|
89
|
-
"type": "array",
|
|
90
|
-
"items": {
|
|
91
|
-
"type": "string"
|
|
92
|
-
},
|
|
93
|
-
"description": "Specify a list of user DB rollback commands to run. DEPRECATED: use your migration tool directly",
|
|
94
|
-
"deprecated": true
|
|
95
39
|
}
|
|
96
40
|
}
|
|
97
41
|
},
|
|
@@ -157,18 +101,6 @@
|
|
|
157
101
|
"type": "object",
|
|
158
102
|
"additionalProperties": false,
|
|
159
103
|
"properties": {
|
|
160
|
-
"entrypoints": {
|
|
161
|
-
"type": "array",
|
|
162
|
-
"items": {
|
|
163
|
-
"type": "string"
|
|
164
|
-
},
|
|
165
|
-
"deprecated": true
|
|
166
|
-
},
|
|
167
|
-
"port": {
|
|
168
|
-
"type": "number",
|
|
169
|
-
"description": "The port number of the application server (Default: 3000)",
|
|
170
|
-
"deprecated": true
|
|
171
|
-
},
|
|
172
104
|
"admin_port": {
|
|
173
105
|
"type": "number",
|
|
174
106
|
"description": "The port number of the admin server (Default: 3001)"
|
|
@@ -189,33 +121,8 @@
|
|
|
189
121
|
}
|
|
190
122
|
}
|
|
191
123
|
},
|
|
192
|
-
"http": {
|
|
193
|
-
"type": "object",
|
|
194
|
-
"additionalProperties": false,
|
|
195
|
-
"properties": {
|
|
196
|
-
"cors_middleware": {
|
|
197
|
-
"type": "boolean"
|
|
198
|
-
},
|
|
199
|
-
"credentials": {
|
|
200
|
-
"type": "boolean"
|
|
201
|
-
},
|
|
202
|
-
"allowed_origins": {
|
|
203
|
-
"type": "array",
|
|
204
|
-
"items": {
|
|
205
|
-
"type": "string"
|
|
206
|
-
}
|
|
207
|
-
}
|
|
208
|
-
}
|
|
209
|
-
},
|
|
210
|
-
"application": {
|
|
211
|
-
"deprecated": true
|
|
212
|
-
},
|
|
213
124
|
"env": {
|
|
214
125
|
"deprecated": true
|
|
215
|
-
},
|
|
216
|
-
"version": {
|
|
217
|
-
"type": "string",
|
|
218
|
-
"deprecated": true
|
|
219
126
|
}
|
|
220
127
|
}
|
|
221
128
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"docker_pg_helper.d.ts","sourceRoot":"","sources":["../../../src/cli/docker_pg_helper.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"docker_pg_helper.d.ts","sourceRoot":"","sources":["../../../src/cli/docker_pg_helper.ts"],"names":[],"mappings":"AAKA;;;;;;;;;;;GAWG;AAEH,wBAAsB,aAAa,kBAsBlC;AAqED;;;;;GAKG;AACH,wBAAsB,YAAY,IAAI,OAAO,CAAC,OAAO,CAAC,CA8BrD"}
|
|
@@ -1,24 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.stopDockerPg = exports.startDockerPg =
|
|
3
|
+
exports.stopDockerPg = exports.startDockerPg = void 0;
|
|
4
4
|
const pg_1 = require("pg");
|
|
5
|
-
const winston_1 = require("winston");
|
|
6
5
|
const utils_1 = require("../utils");
|
|
7
6
|
const util_1 = require("util");
|
|
8
7
|
const child_process_1 = require("child_process");
|
|
9
|
-
const logs_1 = require("../telemetry/logs");
|
|
10
|
-
let curLogger = undefined;
|
|
11
|
-
function getLogger(verbose) {
|
|
12
|
-
if (curLogger)
|
|
13
|
-
return curLogger;
|
|
14
|
-
const winstonTransports = [];
|
|
15
|
-
winstonTransports.push(new winston_1.transports.Console({
|
|
16
|
-
format: logs_1.consoleFormat,
|
|
17
|
-
level: verbose ? 'debug' : 'info',
|
|
18
|
-
}));
|
|
19
|
-
return (curLogger = (0, winston_1.createLogger)({ transports: winstonTransports }));
|
|
20
|
-
}
|
|
21
|
-
exports.getLogger = getLogger;
|
|
22
8
|
/**
|
|
23
9
|
* Starts a PostgreSQL database in a Docker container.
|
|
24
10
|
*
|
|
@@ -32,8 +18,7 @@ exports.getLogger = getLogger;
|
|
|
32
18
|
* @throws {Error} If there is an error starting the Docker container or if the PostgreSQL service does not become available within the timeout period
|
|
33
19
|
*/
|
|
34
20
|
async function startDockerPg() {
|
|
35
|
-
|
|
36
|
-
logger.info('Attempting to create a Docker Postgres container...');
|
|
21
|
+
console.log('Attempting to create a Docker Postgres container...');
|
|
37
22
|
const hasDocker = await checkDockerInstalled();
|
|
38
23
|
const poolConfig = {
|
|
39
24
|
host: 'localhost',
|
|
@@ -44,11 +29,11 @@ async function startDockerPg() {
|
|
|
44
29
|
connectionTimeoutMillis: 2000,
|
|
45
30
|
};
|
|
46
31
|
if (hasDocker) {
|
|
47
|
-
await startDockerPostgres(
|
|
48
|
-
|
|
32
|
+
await startDockerPostgres(poolConfig);
|
|
33
|
+
console.log(`Postgres available at postgres://postgres:${poolConfig.password}@${poolConfig.host}:${poolConfig.port}`);
|
|
49
34
|
}
|
|
50
35
|
else {
|
|
51
|
-
|
|
36
|
+
console.warn('Docker not detected locally');
|
|
52
37
|
}
|
|
53
38
|
}
|
|
54
39
|
exports.startDockerPg = startDockerPg;
|
|
@@ -76,8 +61,8 @@ async function checkDbConnectivity(config) {
|
|
|
76
61
|
}
|
|
77
62
|
}
|
|
78
63
|
const execAsync = (0, util_1.promisify)(child_process_1.exec);
|
|
79
|
-
async function startDockerPostgres(
|
|
80
|
-
|
|
64
|
+
async function startDockerPostgres(poolConfig) {
|
|
65
|
+
console.log('Starting a Postgres Docker container...');
|
|
81
66
|
const containerName = 'dbos-db';
|
|
82
67
|
const pgData = '/var/lib/postgresql/data';
|
|
83
68
|
// Create and start the container
|
|
@@ -94,7 +79,7 @@ async function startDockerPostgres(logger, poolConfig) {
|
|
|
94
79
|
let attempts = 30;
|
|
95
80
|
while (attempts > 0) {
|
|
96
81
|
if (attempts % 5 === 0) {
|
|
97
|
-
|
|
82
|
+
console.log('Waiting for Postgres Docker container to start...');
|
|
98
83
|
}
|
|
99
84
|
if ((await checkDbConnectivity(poolConfig)) === null) {
|
|
100
85
|
return true;
|
|
@@ -120,29 +105,28 @@ async function checkDockerInstalled() {
|
|
|
120
105
|
* @throws {Error} If there was an error stopping the container
|
|
121
106
|
*/
|
|
122
107
|
async function stopDockerPg() {
|
|
123
|
-
const logger = getLogger();
|
|
124
108
|
const containerName = 'dbos-db';
|
|
125
109
|
try {
|
|
126
|
-
|
|
110
|
+
console.log(`Stopping Docker Postgres container ${containerName}...`);
|
|
127
111
|
// Check if container exists and is running
|
|
128
112
|
const { stdout: containerStatus } = await execAsync(`docker ps -a -f name=${containerName} --format "{{.Status}}"`);
|
|
129
113
|
if (!containerStatus) {
|
|
130
|
-
|
|
114
|
+
console.log(`Container ${containerName} does not exist.`);
|
|
131
115
|
return false;
|
|
132
116
|
}
|
|
133
117
|
const isRunning = containerStatus.toLowerCase().includes('up');
|
|
134
118
|
if (!isRunning) {
|
|
135
|
-
|
|
119
|
+
console.log(`Container ${containerName} exists but is not running.`);
|
|
136
120
|
return false;
|
|
137
121
|
}
|
|
138
122
|
// Stop the container
|
|
139
123
|
await execAsync(`docker stop ${containerName}`);
|
|
140
|
-
|
|
124
|
+
console.log(`Successfully stopped Docker Postgres container ${containerName}.`);
|
|
141
125
|
return true;
|
|
142
126
|
}
|
|
143
127
|
catch (error) {
|
|
144
128
|
const errorMessage = error instanceof Error ? error.message : 'Unknown error';
|
|
145
|
-
|
|
129
|
+
console.error(`Failed to stop Docker Postgres container: ${errorMessage}`);
|
|
146
130
|
throw error;
|
|
147
131
|
}
|
|
148
132
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"docker_pg_helper.js","sourceRoot":"","sources":["../../../src/cli/docker_pg_helper.ts"],"names":[],"mappings":";;;AAAA,2BAAsC;AACtC,
|
|
1
|
+
{"version":3,"file":"docker_pg_helper.js","sourceRoot":"","sources":["../../../src/cli/docker_pg_helper.ts"],"names":[],"mappings":"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"}
|
package/dist/src/config.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/config.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/config.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AAOpF,eAAO,MAAM,kBAAkB,qBAAqB,CAAC;AAErD,MAAM,WAAW,UAAU;IACzB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,EAAE;QACT,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;KACpB,CAAC;IACF,SAAS,CAAC,EAAE;QACV,IAAI,CAAC,EAAE;YACL,kBAAkB,CAAC,EAAE,OAAO,CAAC;YAC7B,QAAQ,CAAC,EAAE,MAAM,CAAC;YAClB,MAAM,CAAC,EAAE,OAAO,CAAC;SAClB,CAAC;QACF,YAAY,CAAC,EAAE;YAEb,YAAY,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;YACjC,cAAc,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;SACpC,CAAC;KACH,CAAC;IACF,aAAa,CAAC,EAAE,OAAO,CAAC,iBAAiB,CAAC,CAAC;CAC5C;AAOD,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAKzD;AAED,wBAAgB,cAAc,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,UAAU,CAyB3D;AAED,wBAAgB,eAAe,CAAC,UAAU,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,QAW7E;AAED,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAK3D;AAED,wBAAgB,oBAAoB,CAAC,UAAU,EAAE,IAAI,CAAC,UAAU,EAAE,MAAM,GAAG,qBAAqB,CAAC,GAAG,MAAM,CAwDzG;AAED,wBAAgB,aAAa,CAC3B,MAAM,EAAE,UAAU,EAClB,OAAO,GAAE;IACP,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,YAAY,CAAC,EAAE,OAAO,CAAC;CACnB,GACL,kBAAkB,CAmBpB;AAMD,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,UAAU,EAAE,YAAY,GAAE,OAAe,GAAG,kBAAkB,CAsB1G;AAED,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,UAAU,GAAG,iBAAiB,CAEtE;AAED,wBAAgB,sBAAsB,CACpC,MAAM,GAAE,OAAO,CAAC,iBAAiB,GAAG,UAAU,CAAc,GAC3D,iBAAiB,CAOnB;AAED,wBAAgB,2BAA2B,CACzC,kBAAkB,EAAE,kBAAkB,EACtC,qBAAqB,EAAE,iBAAiB,EACxC,UAAU,EAAE,UAAU,GACrB,CAAC,kBAAkB,EAAE,iBAAiB,CAAC,CAsDzC"}
|
package/dist/src/config.js
CHANGED
|
@@ -7,13 +7,10 @@ exports.overwriteConfigForDBOSCloud = exports.translateRuntimeConfig = exports.g
|
|
|
7
7
|
const utils_1 = require("./utils");
|
|
8
8
|
const yaml_1 = __importDefault(require("yaml"));
|
|
9
9
|
const fs_1 = require("fs");
|
|
10
|
-
const ajv_1 = __importDefault(require("ajv"));
|
|
11
10
|
const path_1 = __importDefault(require("path"));
|
|
12
|
-
const dbos_config_schema_json_1 = __importDefault(require("../dbos-config.schema.json"));
|
|
13
11
|
const assert_1 = __importDefault(require("assert"));
|
|
14
12
|
const database_utils_1 = require("./database_utils");
|
|
15
13
|
exports.dbosConfigFilePath = 'dbos-config.yaml';
|
|
16
|
-
const ajv = new ajv_1.default({ allErrors: true, verbose: true, allowUnionTypes: true });
|
|
17
14
|
/*
|
|
18
15
|
* Substitute environment variables using a regex for matching.
|
|
19
16
|
* Will find anything in curly braces.
|
|
@@ -37,10 +34,6 @@ function readConfigFile(dirPath) {
|
|
|
37
34
|
const $package = packageContent ? JSON.parse(packageContent) : {};
|
|
38
35
|
config.name = $package.name;
|
|
39
36
|
}
|
|
40
|
-
const schemaValidator = ajv.compile(dbos_config_schema_json_1.default);
|
|
41
|
-
if (!schemaValidator(config)) {
|
|
42
|
-
throw new Error(`Config file validation failed: ${JSON.stringify(schemaValidator.errors, null, 2)}`);
|
|
43
|
-
}
|
|
44
37
|
return config;
|
|
45
38
|
function readFile(filePath) {
|
|
46
39
|
try {
|
package/dist/src/config.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/config.ts"],"names":[],"mappings":";;;;;;AAAA,mCAAuC;AAEvC,gDAAwB;AACxB,2BAAmC;AACnC,
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/config.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"datasource.d.ts","sourceRoot":"","sources":["../../src/datasource.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"datasource.d.ts","sourceRoot":"","sources":["../../src/datasource.ts"],"names":[],"mappings":"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"}
|
package/dist/src/datasource.js
CHANGED
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.ensurePGDatabase = exports.dropPGDatabase = exports.connectToPGAndReportOutcome = exports.connectToPGDatabase = exports.getPGClientConfig = exports.deriveDatabaseUrl = exports.getDatabaseNameFromUrl = exports.maskDatabaseUrl = exports.isPGFailedSqlTransactionError = exports.isPGKeyConflictError = exports.isPGRetriableTransactionError = exports.createTransactionCompletionTablePG = exports.createTransactionCompletionSchemaPG = exports.checkSchemaInstallationPG = exports.PGIsolationLevel = exports.registerDataSource = exports.registerTransaction = exports.runTransaction = void 0;
|
|
4
|
-
const api_1 = require("@opentelemetry/api");
|
|
5
4
|
const context_1 = require("./context");
|
|
6
5
|
const dbos_1 = require("./dbos");
|
|
7
6
|
const dbos_executor_1 = require("./dbos-executor");
|
|
8
7
|
const decorators_1 = require("./decorators");
|
|
9
8
|
const error_1 = require("./error");
|
|
9
|
+
const traces_1 = require("./telemetry/traces");
|
|
10
10
|
/// Calling into DBOS
|
|
11
11
|
/**
|
|
12
12
|
* This function is to be called by `DataSourceTransactionHandler` instances,
|
|
@@ -45,7 +45,7 @@ async function runTransaction(callback, funcName, options = {}) {
|
|
|
45
45
|
// isolationLevel: txnInfo.config.isolationLevel, // TODO: Pluggable
|
|
46
46
|
}, dbos_1.DBOS.span);
|
|
47
47
|
try {
|
|
48
|
-
const res = await
|
|
48
|
+
const res = await (0, traces_1.runWithTrace)(span, async () => {
|
|
49
49
|
return await dbos_executor_1.DBOSExecutor.globalInstance.runInternalStep(async () => {
|
|
50
50
|
return await (0, context_1.runWithDataSourceContext)(callnum, async () => {
|
|
51
51
|
return await ds.invokeTransactionFunction(options.config ?? {}, undefined, callback);
|
|
@@ -54,13 +54,13 @@ async function runTransaction(callback, funcName, options = {}) {
|
|
|
54
54
|
// we can be sure workflowID is set because of previous call to assertCurrentWorkflowContext
|
|
55
55
|
dbos_1.DBOS.workflowID, callnum);
|
|
56
56
|
});
|
|
57
|
-
span.setStatus({ code:
|
|
57
|
+
span.setStatus({ code: traces_1.SpanStatusCode.OK });
|
|
58
58
|
dbos_executor_1.DBOSExecutor.globalInstance.tracer.endSpan(span);
|
|
59
59
|
return res;
|
|
60
60
|
}
|
|
61
61
|
catch (err) {
|
|
62
62
|
const e = err;
|
|
63
|
-
span.setStatus({ code:
|
|
63
|
+
span.setStatus({ code: traces_1.SpanStatusCode.ERROR, message: e.message });
|
|
64
64
|
dbos_executor_1.DBOSExecutor.globalInstance.tracer.endSpan(span);
|
|
65
65
|
throw err;
|
|
66
66
|
}
|
|
@@ -97,20 +97,20 @@ function registerTransaction(dsName, func, config) {
|
|
|
97
97
|
}, dbos_1.DBOS.span);
|
|
98
98
|
const callnum = (0, context_1.functionIDGetIncrement)();
|
|
99
99
|
try {
|
|
100
|
-
const res = await
|
|
100
|
+
const res = await (0, traces_1.runWithTrace)(span, async () => {
|
|
101
101
|
return await dbos_executor_1.DBOSExecutor.globalInstance.runInternalStep(async () => {
|
|
102
102
|
return await (0, context_1.runWithDataSourceContext)(callnum, async () => {
|
|
103
103
|
return await ds.invokeTransactionFunction(config, this, callFunc, ...rawArgs);
|
|
104
104
|
});
|
|
105
105
|
}, funcName, dbos_1.DBOS.workflowID, callnum);
|
|
106
106
|
});
|
|
107
|
-
span.setStatus({ code:
|
|
107
|
+
span.setStatus({ code: traces_1.SpanStatusCode.OK });
|
|
108
108
|
dbos_executor_1.DBOSExecutor.globalInstance.tracer.endSpan(span);
|
|
109
109
|
return res;
|
|
110
110
|
}
|
|
111
111
|
catch (err) {
|
|
112
112
|
const e = err;
|
|
113
|
-
span.setStatus({ code:
|
|
113
|
+
span.setStatus({ code: traces_1.SpanStatusCode.ERROR, message: e.message });
|
|
114
114
|
dbos_executor_1.DBOSExecutor.globalInstance.tracer.endSpan(span);
|
|
115
115
|
throw err;
|
|
116
116
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"datasource.js","sourceRoot":"","sources":["../../src/datasource.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"datasource.js","sourceRoot":"","sources":["../../src/datasource.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,6 @@ import { type StepConfig } from './step';
|
|
|
3
3
|
import { TelemetryCollector } from './telemetry/collector';
|
|
4
4
|
import { Tracer } from './telemetry/traces';
|
|
5
5
|
import { DBOSContextualLogger, GlobalLogger } from './telemetry/logs';
|
|
6
|
-
import type { TelemetryConfig } from './telemetry';
|
|
7
6
|
import { type SystemDatabase, type SystemDatabaseStoredResult } from './system_database';
|
|
8
7
|
import { UntypedAsyncFunction, TypedAsyncFunction } from './decorators';
|
|
9
8
|
import type { step_info } from '../schemas/system_db_schema';
|
|
@@ -15,6 +14,7 @@ export interface DBOSConfig {
|
|
|
15
14
|
name?: string;
|
|
16
15
|
systemDatabaseUrl?: string;
|
|
17
16
|
systemDatabasePoolSize?: number;
|
|
17
|
+
enableOTLP?: boolean;
|
|
18
18
|
logLevel?: string;
|
|
19
19
|
addContextMetadata?: boolean;
|
|
20
20
|
otlpTracesEndpoints?: string[];
|
|
@@ -29,6 +29,20 @@ export interface DBOSRuntimeConfig {
|
|
|
29
29
|
start: string[];
|
|
30
30
|
setup: string[];
|
|
31
31
|
}
|
|
32
|
+
export interface TelemetryConfig {
|
|
33
|
+
logs?: LoggerConfig;
|
|
34
|
+
OTLPExporter?: OTLPExporterConfig;
|
|
35
|
+
}
|
|
36
|
+
export interface OTLPExporterConfig {
|
|
37
|
+
logsEndpoint?: string[];
|
|
38
|
+
tracesEndpoint?: string[];
|
|
39
|
+
}
|
|
40
|
+
export interface LoggerConfig {
|
|
41
|
+
logLevel?: string;
|
|
42
|
+
silent?: boolean;
|
|
43
|
+
addContextMetadata?: boolean;
|
|
44
|
+
forceConsole?: boolean;
|
|
45
|
+
}
|
|
32
46
|
export type DBOSConfigInternal = {
|
|
33
47
|
name?: string;
|
|
34
48
|
systemDatabaseUrl: string;
|