@budibase/backend-core 2.13.48 → 2.13.50
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/index.js +8 -131
- package/dist/index.js.map +4 -4
- package/dist/index.js.meta.json +1 -1
- package/dist/package.json +5 -5
- package/dist/src/db/couch/DatabaseImpl.d.ts +1 -2
- package/dist/src/db/couch/DatabaseImpl.js +1 -3
- package/dist/src/db/couch/DatabaseImpl.js.map +1 -1
- package/dist/src/db/db.js +1 -2
- package/dist/src/db/db.js.map +1 -1
- package/dist/src/logging/pino/logger.js +0 -6
- package/dist/src/logging/pino/logger.js.map +1 -1
- package/dist/src/queue/inMemoryQueue.js +1 -0
- package/dist/src/queue/inMemoryQueue.js.map +1 -1
- package/dist/src/timers/timers.d.ts +2 -1
- package/dist/src/timers/timers.js +3 -0
- package/dist/src/timers/timers.js.map +1 -1
- package/package.json +5 -5
- package/src/db/couch/DatabaseImpl.ts +1 -3
- package/src/db/db.ts +1 -2
- package/src/logging/pino/logger.ts +0 -6
- package/src/queue/inMemoryQueue.ts +1 -0
- package/src/timers/timers.ts +5 -1
- package/dist/src/db/instrumentation.d.ts +0 -28
- package/dist/src/db/instrumentation.js +0 -118
- package/dist/src/db/instrumentation.js.map +0 -1
- package/src/db/instrumentation.ts +0 -159
package/dist/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@budibase/backend-core",
|
|
3
|
-
"version": "2.13.
|
|
3
|
+
"version": "2.13.50",
|
|
4
4
|
"description": "Budibase backend core libraries used in server and worker",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/src/index.d.ts",
|
|
@@ -23,8 +23,8 @@
|
|
|
23
23
|
"dependencies": {
|
|
24
24
|
"@budibase/nano": "10.1.4",
|
|
25
25
|
"@budibase/pouchdb-replication-stream": "1.2.10",
|
|
26
|
-
"@budibase/shared-core": "2.13.
|
|
27
|
-
"@budibase/types": "2.13.
|
|
26
|
+
"@budibase/shared-core": "2.13.50",
|
|
27
|
+
"@budibase/types": "2.13.50",
|
|
28
28
|
"@techpass/passport-openidconnect": "0.3.2",
|
|
29
29
|
"aws-cloudfront-sign": "3.0.2",
|
|
30
30
|
"aws-sdk": "2.1030.0",
|
|
@@ -32,7 +32,7 @@
|
|
|
32
32
|
"bcryptjs": "2.4.3",
|
|
33
33
|
"bull": "4.10.1",
|
|
34
34
|
"correlation-id": "4.0.0",
|
|
35
|
-
"dd-trace": "
|
|
35
|
+
"dd-trace": "3.13.2",
|
|
36
36
|
"dotenv": "16.0.1",
|
|
37
37
|
"ioredis": "5.3.2",
|
|
38
38
|
"joi": "17.6.0",
|
|
@@ -97,5 +97,5 @@
|
|
|
97
97
|
}
|
|
98
98
|
}
|
|
99
99
|
},
|
|
100
|
-
"gitHead": "
|
|
100
|
+
"gitHead": "77c056937d805e0386167bb895fa9677853fdc2a"
|
|
101
101
|
}
|
|
@@ -3,8 +3,7 @@
|
|
|
3
3
|
import Nano from "@budibase/nano";
|
|
4
4
|
import { AllDocsResponse, AnyDocument, Database, DatabaseOpts, DatabaseQueryOpts, DatabasePutOpts, DatabaseCreateIndexOpts, DatabaseDeleteIndexOpts, Document } from "@budibase/types";
|
|
5
5
|
import { WriteStream, ReadStream } from "fs";
|
|
6
|
-
|
|
7
|
-
export declare function DatabaseWithConnection(dbName: string, connection: string, opts?: DatabaseOpts): DDInstrumentedDatabase;
|
|
6
|
+
export declare function DatabaseWithConnection(dbName: string, connection: string, opts?: DatabaseOpts): DatabaseImpl;
|
|
8
7
|
export declare class DatabaseImpl implements Database {
|
|
9
8
|
readonly name: string;
|
|
10
9
|
private static nano;
|
|
@@ -19,7 +19,6 @@ const connections_1 = require("./connections");
|
|
|
19
19
|
const utils_1 = require("./utils");
|
|
20
20
|
const pouchDB_1 = require("./pouchDB");
|
|
21
21
|
const newid_1 = require("../../docIds/newid");
|
|
22
|
-
const instrumentation_1 = require("../instrumentation");
|
|
23
22
|
function buildNano(couchInfo) {
|
|
24
23
|
return (0, nano_1.default)({
|
|
25
24
|
url: couchInfo.url,
|
|
@@ -32,8 +31,7 @@ function buildNano(couchInfo) {
|
|
|
32
31
|
});
|
|
33
32
|
}
|
|
34
33
|
function DatabaseWithConnection(dbName, connection, opts) {
|
|
35
|
-
|
|
36
|
-
return new instrumentation_1.DDInstrumentedDatabase(db, "couchdb");
|
|
34
|
+
return new DatabaseImpl(dbName, opts, connection);
|
|
37
35
|
}
|
|
38
36
|
exports.DatabaseWithConnection = DatabaseWithConnection;
|
|
39
37
|
class DatabaseImpl {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DatabaseImpl.js","sourceRoot":"","sources":["../../../../src/db/couch/DatabaseImpl.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,0DAAiC;AACjC,2CAYwB;AACxB,+CAA4C;AAC5C,mCAA4C;AAC5C,uCAAsC;AAEtC,8CAA0C;
|
|
1
|
+
{"version":3,"file":"DatabaseImpl.js","sourceRoot":"","sources":["../../../../src/db/couch/DatabaseImpl.ts"],"names":[],"mappings":"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"}
|
package/dist/src/db/db.js
CHANGED
|
@@ -11,9 +11,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
exports.directCouchFind = exports.directCouchAllDbs = exports.doWithDB = exports.getDB = void 0;
|
|
13
13
|
const couch_1 = require("./couch");
|
|
14
|
-
const instrumentation_1 = require("./instrumentation");
|
|
15
14
|
function getDB(dbName, opts) {
|
|
16
|
-
return new
|
|
15
|
+
return new couch_1.DatabaseImpl(dbName, opts);
|
|
17
16
|
}
|
|
18
17
|
exports.getDB = getDB;
|
|
19
18
|
// we have to use a callback for this so that we can close
|
package/dist/src/db/db.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"db.js","sourceRoot":"","sources":["../../../src/db/db.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,mCAAwD;
|
|
1
|
+
{"version":3,"file":"db.js","sourceRoot":"","sources":["../../../src/db/db.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,mCAAwD;AAGxD,SAAgB,KAAK,CAAC,MAAc,EAAE,IAAmB;IACvD,OAAO,IAAI,oBAAY,CAAC,MAAM,EAAE,IAAI,CAAC,CAAA;AACvC,CAAC;AAFD,sBAEC;AAED,0DAA0D;AAC1D,6DAA6D;AAC7D,qEAAqE;AACrE,SAAsB,QAAQ,CAC5B,MAAc,EACd,EAAgC,EAChC,IAAmB;;QAEnB,MAAM,EAAE,GAAG,KAAK,CAAC,MAAM,EAAE,IAAI,CAAC,CAAA;QAC9B,oEAAoE;QACpE,uCAAuC;QACvC,OAAO,MAAM,EAAE,CAAC,EAAE,CAAC,CAAA;IACrB,CAAC;CAAA;AATD,4BASC;AAED,SAAsB,iBAAiB,CAAC,WAAoB;;QAC1D,IAAI,SAAS,GAAG,WAAW,CAAA;QAC3B,IAAI,WAAW,EAAE;YACf,SAAS,IAAI,IAAI,WAAW,EAAE,CAAA;SAC/B;QACD,OAAO,MAAM,IAAA,wBAAgB,EAAC,SAAS,CAAC,CAAA;IAC1C,CAAC;CAAA;AAND,8CAMC;AAED,SAAsB,eAAe,CAAC,MAAc,EAAE,IAAsB;;QAC1E,MAAM,IAAI,GAAG,MAAM,IAAA,wBAAgB,EAAC,GAAG,MAAM,QAAQ,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;QACpE,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,QAAQ,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAA;IACrD,CAAC;CAAA;AAHD,0CAGC"}
|
|
@@ -32,8 +32,6 @@ const pino_pretty_1 = __importDefault(require("pino-pretty"));
|
|
|
32
32
|
const environment_1 = __importDefault(require("../../environment"));
|
|
33
33
|
const context = __importStar(require("../../context"));
|
|
34
34
|
const correlation = __importStar(require("../correlation"));
|
|
35
|
-
const dd_trace_1 = __importDefault(require("dd-trace"));
|
|
36
|
-
const ext_1 = require("dd-trace/ext");
|
|
37
35
|
const system_1 = require("../system");
|
|
38
36
|
// LOGGER
|
|
39
37
|
let pinoInstance;
|
|
@@ -114,10 +112,6 @@ if (!environment_1.default.DISABLE_PINO_LOGGER) {
|
|
|
114
112
|
identityType: identity === null || identity === void 0 ? void 0 : identity.type,
|
|
115
113
|
correlationId: correlation.getId(),
|
|
116
114
|
};
|
|
117
|
-
const span = dd_trace_1.default.scope().active();
|
|
118
|
-
if (span) {
|
|
119
|
-
dd_trace_1.default.inject(span.context(), ext_1.formats.LOG, contextObject);
|
|
120
|
-
}
|
|
121
115
|
const mergingObject = Object.assign({ err: error, pid: process.pid }, contextObject);
|
|
122
116
|
if (objects.length) {
|
|
123
117
|
// init generic data object for params supplied that don't have a
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../../../src/logging/pino/logger.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gDAA0C;AAC1C,8DAAoC;AAGpC,oEAAmC;AACnC,uDAAwC;AACxC,4DAA6C;
|
|
1
|
+
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../../../src/logging/pino/logger.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"inMemoryQueue.js","sourceRoot":"","sources":["../../../src/queue/inMemoryQueue.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,oDAA2B;AAC3B,oCAAkC;AAElC;;;;;;;;GAQG;AACH,SAAS,MAAM,CAAC,KAAa,EAAE,OAAY;IACzC,OAAO;QACL,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;QACrB,KAAK,EAAE,KAAK;QACZ,IAAI,EAAE,OAAO;
|
|
1
|
+
{"version":3,"file":"inMemoryQueue.js","sourceRoot":"","sources":["../../../src/queue/inMemoryQueue.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,oDAA2B;AAC3B,oCAAkC;AAElC;;;;;;;;GAQG;AACH,SAAS,MAAM,CAAC,KAAa,EAAE,OAAY;IACzC,OAAO;QACL,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;QACrB,KAAK,EAAE,KAAK;QACZ,IAAI,EAAE,OAAO;QACb,IAAI,EAAE,EAAE;KACT,CAAA;AACH,CAAC;AAED;;;;GAIG;AACH,MAAM,aAAa;IAOjB;;;;;OAKG;IACH,YAAY,IAAY,EAAE,IAAU;QAClC,IAAI,CAAC,KAAK,GAAG,IAAI,CAAA;QACjB,IAAI,CAAC,KAAK,GAAG,IAAI,CAAA;QACjB,IAAI,CAAC,SAAS,GAAG,EAAE,CAAA;QACnB,IAAI,CAAC,QAAQ,GAAG,IAAI,gBAAM,CAAC,YAAY,EAAE,CAAA;QACzC,IAAI,CAAC,SAAS,GAAG,CAAC,CAAA;QAClB,IAAI,CAAC,SAAS,GAAG,CAAC,CAAA;IACpB,CAAC;IAED;;;;;;;;OAQG;IACH,OAAO,CAAC,IAAS;QACf,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,SAAS,EAAE,GAAS,EAAE;YACrC,IAAI,IAAI,CAAC,SAAS,CAAC,MAAM,IAAI,CAAC,EAAE;gBAC9B,OAAM;aACP;YACD,IAAI,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,CAAA;YAChC,IAAI,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,CAAA;YACpB,IAAI,IAAI,CAAC,IAAI,IAAI,IAAI,EAAE;gBACrB,MAAM,IAAI,CAAA;aACX;YACD,IAAI,CAAC,SAAS,EAAE,CAAA;QAClB,CAAC,CAAA,CAAC,CAAA;IACJ,CAAC;IAEK,OAAO;;YACX,OAAO,IAAI,CAAA;QACb,CAAC;KAAA;IAED,2EAA2E;IAC3E;;;;;;;OAOG;IACH,0CAA0C;IAC1C,GAAG,CAAC,GAAQ,EAAE,MAAe;QAC3B,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE;YAC3B,MAAM,oCAAoC,CAAA;SAC3C;QACD,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,CAAA;QAC5C,IAAI,CAAC,SAAS,EAAE,CAAA;QAChB,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;IAC/B,CAAC;IAED;;OAEG;IACG,KAAK;;YACT,OAAO,EAAE,CAAA;QACX,CAAC;KAAA;IAED;;;OAGG;IACH,qBAAqB,CAAC,SAAiB;QACrC,8BAA8B;QAC9B,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAA;IACxB,CAAC;IAED;;OAEG;IACH,iBAAiB;QACf,OAAO,EAAE,CAAA;IACX,CAAC;IAED,0CAA0C;IAC1C,UAAU,CAAC,OAAe;QACxB,QAAQ;IACV,CAAC;IAED;;OAEG;IACG,KAAK;;YACT,OAAO,EAAE,CAAA;QACX,CAAC;KAAA;IAEK,MAAM;;YACV,OAAO,EAAE,CAAA;QACX,CAAC;KAAA;IAED,EAAE;QACA,aAAa;QACb,OAAO,IAAI,CAAA;IACb,CAAC;IAEK,iBAAiB;;YACrB,GAAG;gBACD,MAAM,IAAA,eAAO,EAAC,EAAE,CAAC,CAAA;aAClB,QAAQ,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS,EAAC;QAC3C,CAAC;KAAA;CACF;AAED,kBAAe,aAAa,CAAA"}
|
|
@@ -6,10 +6,11 @@ export declare class ExecutionTimeoutError extends Error {
|
|
|
6
6
|
readonly name = "ExecutionTimeoutError";
|
|
7
7
|
}
|
|
8
8
|
export declare class ExecutionTimeTracker {
|
|
9
|
-
|
|
9
|
+
readonly limitMs: number;
|
|
10
10
|
static withLimit(limitMs: number): ExecutionTimeTracker;
|
|
11
11
|
constructor(limitMs: number);
|
|
12
12
|
private totalTimeMs;
|
|
13
13
|
track<T>(f: () => T): T;
|
|
14
|
+
get elapsedMS(): number;
|
|
14
15
|
private checkLimit;
|
|
15
16
|
}
|
|
@@ -50,6 +50,9 @@ class ExecutionTimeTracker {
|
|
|
50
50
|
this.checkLimit();
|
|
51
51
|
}
|
|
52
52
|
}
|
|
53
|
+
get elapsedMS() {
|
|
54
|
+
return this.totalTimeMs;
|
|
55
|
+
}
|
|
53
56
|
checkLimit() {
|
|
54
57
|
if (this.totalTimeMs > this.limitMs) {
|
|
55
58
|
throw new ExecutionTimeoutError(`Execution time limit of ${this.limitMs}ms exceeded: ${this.totalTimeMs}ms`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"timers.js","sourceRoot":"","sources":["../../../src/timers/timers.ts"],"names":[],"mappings":";;;AAAA,IAAI,SAAS,GAAqB,EAAE,CAAA;AAEpC,SAAgB,GAAG,CAAC,QAAmB,EAAE,MAAc;IACrD,MAAM,QAAQ,GAAG,WAAW,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAA;IAC9C,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;IACxB,OAAO,QAAQ,CAAA;AACjB,CAAC;AAJD,kBAIC;AAED,SAAgB,KAAK,CAAC,QAAwB;IAC5C,MAAM,GAAG,GAAG,SAAS,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAA;IACvC,IAAI,GAAG,KAAK,CAAC,CAAC,EAAE;QACd,SAAS,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,CAAC,CAAA;KACzB;IACD,aAAa,CAAC,QAAQ,CAAC,CAAA;AACzB,CAAC;AAND,sBAMC;AAED,SAAgB,OAAO;IACrB,KAAK,IAAI,QAAQ,IAAI,SAAS,EAAE;QAC9B,aAAa,CAAC,QAAQ,CAAC,CAAA;KACxB;IACD,SAAS,GAAG,EAAE,CAAA;AAChB,CAAC;AALD,0BAKC;AAED,MAAa,qBAAsB,SAAQ,KAAK;IAAhD;;QACkB,SAAI,GAAG,uBAAuB,CAAA;IAChD,CAAC;CAAA;AAFD,sDAEC;AAED,MAAa,oBAAoB;IAC/B,MAAM,CAAC,SAAS,CAAC,OAAe;QAC9B,OAAO,IAAI,oBAAoB,CAAC,OAAO,CAAC,CAAA;IAC1C,CAAC;IAED,
|
|
1
|
+
{"version":3,"file":"timers.js","sourceRoot":"","sources":["../../../src/timers/timers.ts"],"names":[],"mappings":";;;AAAA,IAAI,SAAS,GAAqB,EAAE,CAAA;AAEpC,SAAgB,GAAG,CAAC,QAAmB,EAAE,MAAc;IACrD,MAAM,QAAQ,GAAG,WAAW,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAA;IAC9C,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;IACxB,OAAO,QAAQ,CAAA;AACjB,CAAC;AAJD,kBAIC;AAED,SAAgB,KAAK,CAAC,QAAwB;IAC5C,MAAM,GAAG,GAAG,SAAS,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAA;IACvC,IAAI,GAAG,KAAK,CAAC,CAAC,EAAE;QACd,SAAS,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,CAAC,CAAA;KACzB;IACD,aAAa,CAAC,QAAQ,CAAC,CAAA;AACzB,CAAC;AAND,sBAMC;AAED,SAAgB,OAAO;IACrB,KAAK,IAAI,QAAQ,IAAI,SAAS,EAAE;QAC9B,aAAa,CAAC,QAAQ,CAAC,CAAA;KACxB;IACD,SAAS,GAAG,EAAE,CAAA;AAChB,CAAC;AALD,0BAKC;AAED,MAAa,qBAAsB,SAAQ,KAAK;IAAhD;;QACkB,SAAI,GAAG,uBAAuB,CAAA;IAChD,CAAC;CAAA;AAFD,sDAEC;AAED,MAAa,oBAAoB;IAC/B,MAAM,CAAC,SAAS,CAAC,OAAe;QAC9B,OAAO,IAAI,oBAAoB,CAAC,OAAO,CAAC,CAAA;IAC1C,CAAC;IAED,YAAqB,OAAe;QAAf,YAAO,GAAP,OAAO,CAAQ;QAE5B,gBAAW,GAAG,CAAC,CAAA;IAFgB,CAAC;IAIxC,KAAK,CAAI,CAAU;QACjB,IAAI,CAAC,UAAU,EAAE,CAAA;QACjB,MAAM,KAAK,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,CAAA;QACrC,IAAI;YACF,OAAO,CAAC,EAAE,CAAA;SACX;gBAAS;YACR,MAAM,GAAG,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,CAAA;YACnC,IAAI,CAAC,WAAW,IAAI,MAAM,CAAC,GAAG,GAAG,KAAK,CAAC,GAAG,GAAG,CAAA;YAC7C,IAAI,CAAC,UAAU,EAAE,CAAA;SAClB;IACH,CAAC;IAED,IAAI,SAAS;QACX,OAAO,IAAI,CAAC,WAAW,CAAA;IACzB,CAAC;IAEO,UAAU;QAChB,IAAI,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,OAAO,EAAE;YACnC,MAAM,IAAI,qBAAqB,CAC7B,2BAA2B,IAAI,CAAC,OAAO,gBAAgB,IAAI,CAAC,WAAW,IAAI,CAC5E,CAAA;SACF;IACH,CAAC;CACF;AAhCD,oDAgCC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@budibase/backend-core",
|
|
3
|
-
"version": "2.13.
|
|
3
|
+
"version": "2.13.50",
|
|
4
4
|
"description": "Budibase backend core libraries used in server and worker",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/src/index.d.ts",
|
|
@@ -23,8 +23,8 @@
|
|
|
23
23
|
"dependencies": {
|
|
24
24
|
"@budibase/nano": "10.1.4",
|
|
25
25
|
"@budibase/pouchdb-replication-stream": "1.2.10",
|
|
26
|
-
"@budibase/shared-core": "2.13.
|
|
27
|
-
"@budibase/types": "2.13.
|
|
26
|
+
"@budibase/shared-core": "2.13.50",
|
|
27
|
+
"@budibase/types": "2.13.50",
|
|
28
28
|
"@techpass/passport-openidconnect": "0.3.2",
|
|
29
29
|
"aws-cloudfront-sign": "3.0.2",
|
|
30
30
|
"aws-sdk": "2.1030.0",
|
|
@@ -32,7 +32,7 @@
|
|
|
32
32
|
"bcryptjs": "2.4.3",
|
|
33
33
|
"bull": "4.10.1",
|
|
34
34
|
"correlation-id": "4.0.0",
|
|
35
|
-
"dd-trace": "
|
|
35
|
+
"dd-trace": "3.13.2",
|
|
36
36
|
"dotenv": "16.0.1",
|
|
37
37
|
"ioredis": "5.3.2",
|
|
38
38
|
"joi": "17.6.0",
|
|
@@ -97,5 +97,5 @@
|
|
|
97
97
|
}
|
|
98
98
|
}
|
|
99
99
|
},
|
|
100
|
-
"gitHead": "
|
|
100
|
+
"gitHead": "77c056937d805e0386167bb895fa9677853fdc2a"
|
|
101
101
|
}
|
|
@@ -17,7 +17,6 @@ import { directCouchUrlCall } from "./utils"
|
|
|
17
17
|
import { getPouchDB } from "./pouchDB"
|
|
18
18
|
import { WriteStream, ReadStream } from "fs"
|
|
19
19
|
import { newid } from "../../docIds/newid"
|
|
20
|
-
import { DDInstrumentedDatabase } from "../instrumentation"
|
|
21
20
|
|
|
22
21
|
function buildNano(couchInfo: { url: string; cookie: string }) {
|
|
23
22
|
return Nano({
|
|
@@ -36,8 +35,7 @@ export function DatabaseWithConnection(
|
|
|
36
35
|
connection: string,
|
|
37
36
|
opts?: DatabaseOpts
|
|
38
37
|
) {
|
|
39
|
-
|
|
40
|
-
return new DDInstrumentedDatabase(db, "couchdb")
|
|
38
|
+
return new DatabaseImpl(dbName, opts, connection)
|
|
41
39
|
}
|
|
42
40
|
|
|
43
41
|
export class DatabaseImpl implements Database {
|
package/src/db/db.ts
CHANGED
|
@@ -1,9 +1,8 @@
|
|
|
1
1
|
import { directCouchQuery, DatabaseImpl } from "./couch"
|
|
2
2
|
import { CouchFindOptions, Database, DatabaseOpts } from "@budibase/types"
|
|
3
|
-
import { DDInstrumentedDatabase } from "./instrumentation"
|
|
4
3
|
|
|
5
4
|
export function getDB(dbName: string, opts?: DatabaseOpts): Database {
|
|
6
|
-
return new
|
|
5
|
+
return new DatabaseImpl(dbName, opts)
|
|
7
6
|
}
|
|
8
7
|
|
|
9
8
|
// we have to use a callback for this so that we can close
|
|
@@ -5,7 +5,6 @@ import { IdentityType } from "@budibase/types"
|
|
|
5
5
|
import env from "../../environment"
|
|
6
6
|
import * as context from "../../context"
|
|
7
7
|
import * as correlation from "../correlation"
|
|
8
|
-
import tracer from "dd-trace"
|
|
9
8
|
import { formats } from "dd-trace/ext"
|
|
10
9
|
|
|
11
10
|
import { localFileDestination } from "../system"
|
|
@@ -117,11 +116,6 @@ if (!env.DISABLE_PINO_LOGGER) {
|
|
|
117
116
|
correlationId: correlation.getId(),
|
|
118
117
|
}
|
|
119
118
|
|
|
120
|
-
const span = tracer.scope().active()
|
|
121
|
-
if (span) {
|
|
122
|
-
tracer.inject(span.context(), formats.LOG, contextObject)
|
|
123
|
-
}
|
|
124
|
-
|
|
125
119
|
const mergingObject: any = {
|
|
126
120
|
err: error,
|
|
127
121
|
pid: process.pid,
|
package/src/timers/timers.ts
CHANGED
|
@@ -30,7 +30,7 @@ export class ExecutionTimeTracker {
|
|
|
30
30
|
return new ExecutionTimeTracker(limitMs)
|
|
31
31
|
}
|
|
32
32
|
|
|
33
|
-
constructor(
|
|
33
|
+
constructor(readonly limitMs: number) {}
|
|
34
34
|
|
|
35
35
|
private totalTimeMs = 0
|
|
36
36
|
|
|
@@ -46,6 +46,10 @@ export class ExecutionTimeTracker {
|
|
|
46
46
|
}
|
|
47
47
|
}
|
|
48
48
|
|
|
49
|
+
get elapsedMS() {
|
|
50
|
+
return this.totalTimeMs
|
|
51
|
+
}
|
|
52
|
+
|
|
49
53
|
private checkLimit() {
|
|
50
54
|
if (this.totalTimeMs > this.limitMs) {
|
|
51
55
|
throw new ExecutionTimeoutError(
|
|
@@ -1,28 +0,0 @@
|
|
|
1
|
-
/// <reference types="node" />
|
|
2
|
-
import { DocumentScope, DocumentDestroyResponse, DocumentInsertResponse, DocumentBulkResponse, OkResponse } from "@budibase/nano";
|
|
3
|
-
import { AllDocsResponse, AnyDocument, Database, DatabaseDumpOpts, DatabasePutOpts, DatabaseQueryOpts, Document } from "@budibase/types";
|
|
4
|
-
import { Writable } from "stream";
|
|
5
|
-
export declare class DDInstrumentedDatabase implements Database {
|
|
6
|
-
private readonly db;
|
|
7
|
-
private readonly resource;
|
|
8
|
-
constructor(db: Database, resource: string);
|
|
9
|
-
get name(): string;
|
|
10
|
-
exists(): Promise<boolean>;
|
|
11
|
-
checkSetup(): Promise<DocumentScope<any>>;
|
|
12
|
-
get<T extends Document>(id?: string | undefined): Promise<T>;
|
|
13
|
-
getMultiple<T extends Document>(ids: string[], opts?: {
|
|
14
|
-
allowMissing?: boolean | undefined;
|
|
15
|
-
} | undefined): Promise<T[]>;
|
|
16
|
-
remove(id: string | Document, rev?: string | undefined): Promise<DocumentDestroyResponse>;
|
|
17
|
-
put(document: AnyDocument, opts?: DatabasePutOpts | undefined): Promise<DocumentInsertResponse>;
|
|
18
|
-
bulkDocs(documents: AnyDocument[]): Promise<DocumentBulkResponse[]>;
|
|
19
|
-
allDocs<T extends Document>(params: DatabaseQueryOpts): Promise<AllDocsResponse<T>>;
|
|
20
|
-
query<T extends Document>(viewName: string, params: DatabaseQueryOpts): Promise<AllDocsResponse<T>>;
|
|
21
|
-
destroy(): Promise<void | OkResponse>;
|
|
22
|
-
compact(): Promise<void | OkResponse>;
|
|
23
|
-
dump(stream: Writable, opts?: DatabaseDumpOpts | undefined): Promise<any>;
|
|
24
|
-
load(...args: any[]): Promise<any>;
|
|
25
|
-
createIndex(...args: any[]): Promise<any>;
|
|
26
|
-
deleteIndex(...args: any[]): Promise<any>;
|
|
27
|
-
getIndexes(...args: any[]): Promise<any>;
|
|
28
|
-
}
|
|
@@ -1,118 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
-
};
|
|
5
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.DDInstrumentedDatabase = void 0;
|
|
7
|
-
const dd_trace_1 = __importDefault(require("dd-trace"));
|
|
8
|
-
class DDInstrumentedDatabase {
|
|
9
|
-
constructor(db, resource) {
|
|
10
|
-
this.db = db;
|
|
11
|
-
this.resource = resource;
|
|
12
|
-
}
|
|
13
|
-
get name() {
|
|
14
|
-
return this.db.name;
|
|
15
|
-
}
|
|
16
|
-
exists() {
|
|
17
|
-
return dd_trace_1.default.trace("exists", { resource: this.resource }, span => {
|
|
18
|
-
span === null || span === void 0 ? void 0 : span.addTags({ db_name: this.name });
|
|
19
|
-
return this.db.exists();
|
|
20
|
-
});
|
|
21
|
-
}
|
|
22
|
-
checkSetup() {
|
|
23
|
-
return dd_trace_1.default.trace("checkSetup", { resource: this.resource }, span => {
|
|
24
|
-
span === null || span === void 0 ? void 0 : span.addTags({ db_name: this.name });
|
|
25
|
-
return this.db.checkSetup();
|
|
26
|
-
});
|
|
27
|
-
}
|
|
28
|
-
get(id) {
|
|
29
|
-
return dd_trace_1.default.trace("get", { resource: this.resource }, span => {
|
|
30
|
-
span === null || span === void 0 ? void 0 : span.addTags({ db_name: this.name, doc_id: id });
|
|
31
|
-
return this.db.get(id);
|
|
32
|
-
});
|
|
33
|
-
}
|
|
34
|
-
getMultiple(ids, opts) {
|
|
35
|
-
return dd_trace_1.default.trace("getMultiple", { resource: this.resource }, span => {
|
|
36
|
-
span === null || span === void 0 ? void 0 : span.addTags({
|
|
37
|
-
db_name: this.name,
|
|
38
|
-
num_docs: ids.length,
|
|
39
|
-
allow_missing: opts === null || opts === void 0 ? void 0 : opts.allowMissing,
|
|
40
|
-
});
|
|
41
|
-
return this.db.getMultiple(ids, opts);
|
|
42
|
-
});
|
|
43
|
-
}
|
|
44
|
-
remove(id, rev) {
|
|
45
|
-
return dd_trace_1.default.trace("remove", { resource: this.resource }, span => {
|
|
46
|
-
span === null || span === void 0 ? void 0 : span.addTags({ db_name: this.name, doc_id: id });
|
|
47
|
-
return this.db.remove(id, rev);
|
|
48
|
-
});
|
|
49
|
-
}
|
|
50
|
-
put(document, opts) {
|
|
51
|
-
return dd_trace_1.default.trace("put", { resource: this.resource }, span => {
|
|
52
|
-
span === null || span === void 0 ? void 0 : span.addTags({ db_name: this.name, doc_id: document._id });
|
|
53
|
-
return this.db.put(document, opts);
|
|
54
|
-
});
|
|
55
|
-
}
|
|
56
|
-
bulkDocs(documents) {
|
|
57
|
-
return dd_trace_1.default.trace("bulkDocs", { resource: this.resource }, span => {
|
|
58
|
-
span === null || span === void 0 ? void 0 : span.addTags({ db_name: this.name, num_docs: documents.length });
|
|
59
|
-
return this.db.bulkDocs(documents);
|
|
60
|
-
});
|
|
61
|
-
}
|
|
62
|
-
allDocs(params) {
|
|
63
|
-
return dd_trace_1.default.trace("allDocs", { resource: this.resource }, span => {
|
|
64
|
-
span === null || span === void 0 ? void 0 : span.addTags({ db_name: this.name });
|
|
65
|
-
return this.db.allDocs(params);
|
|
66
|
-
});
|
|
67
|
-
}
|
|
68
|
-
query(viewName, params) {
|
|
69
|
-
return dd_trace_1.default.trace("query", { resource: this.resource }, span => {
|
|
70
|
-
span === null || span === void 0 ? void 0 : span.addTags({ db_name: this.name, view_name: viewName });
|
|
71
|
-
return this.db.query(viewName, params);
|
|
72
|
-
});
|
|
73
|
-
}
|
|
74
|
-
destroy() {
|
|
75
|
-
return dd_trace_1.default.trace("destroy", { resource: this.resource }, span => {
|
|
76
|
-
span === null || span === void 0 ? void 0 : span.addTags({ db_name: this.name });
|
|
77
|
-
return this.db.destroy();
|
|
78
|
-
});
|
|
79
|
-
}
|
|
80
|
-
compact() {
|
|
81
|
-
return dd_trace_1.default.trace("compact", { resource: this.resource }, span => {
|
|
82
|
-
span === null || span === void 0 ? void 0 : span.addTags({ db_name: this.name });
|
|
83
|
-
return this.db.compact();
|
|
84
|
-
});
|
|
85
|
-
}
|
|
86
|
-
dump(stream, opts) {
|
|
87
|
-
return dd_trace_1.default.trace("dump", { resource: this.resource }, span => {
|
|
88
|
-
span === null || span === void 0 ? void 0 : span.addTags({ db_name: this.name });
|
|
89
|
-
return this.db.dump(stream, opts);
|
|
90
|
-
});
|
|
91
|
-
}
|
|
92
|
-
load(...args) {
|
|
93
|
-
return dd_trace_1.default.trace("load", { resource: this.resource }, span => {
|
|
94
|
-
span === null || span === void 0 ? void 0 : span.addTags({ db_name: this.name });
|
|
95
|
-
return this.db.load(...args);
|
|
96
|
-
});
|
|
97
|
-
}
|
|
98
|
-
createIndex(...args) {
|
|
99
|
-
return dd_trace_1.default.trace("createIndex", { resource: this.resource }, span => {
|
|
100
|
-
span === null || span === void 0 ? void 0 : span.addTags({ db_name: this.name });
|
|
101
|
-
return this.db.createIndex(...args);
|
|
102
|
-
});
|
|
103
|
-
}
|
|
104
|
-
deleteIndex(...args) {
|
|
105
|
-
return dd_trace_1.default.trace("deleteIndex", { resource: this.resource }, span => {
|
|
106
|
-
span === null || span === void 0 ? void 0 : span.addTags({ db_name: this.name });
|
|
107
|
-
return this.db.deleteIndex(...args);
|
|
108
|
-
});
|
|
109
|
-
}
|
|
110
|
-
getIndexes(...args) {
|
|
111
|
-
return dd_trace_1.default.trace("getIndexes", { resource: this.resource }, span => {
|
|
112
|
-
span === null || span === void 0 ? void 0 : span.addTags({ db_name: this.name });
|
|
113
|
-
return this.db.getIndexes(...args);
|
|
114
|
-
});
|
|
115
|
-
}
|
|
116
|
-
}
|
|
117
|
-
exports.DDInstrumentedDatabase = DDInstrumentedDatabase;
|
|
118
|
-
//# sourceMappingURL=instrumentation.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"instrumentation.js","sourceRoot":"","sources":["../../../src/db/instrumentation.ts"],"names":[],"mappings":"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"}
|