@rocicorp/zero 0.19.2025043000 → 0.19.2025050100
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/out/analyze-query/src/bin-analyze.js +32 -8
- package/out/analyze-query/src/bin-analyze.js.map +1 -1
- package/out/ast-to-zql/src/ast-to-zql.d.ts.map +1 -1
- package/out/ast-to-zql/src/ast-to-zql.js +7 -1
- package/out/ast-to-zql/src/ast-to-zql.js.map +1 -1
- package/out/{chunk-TE6WQOQV.js → chunk-BXNVGG4D.js} +11 -8
- package/out/chunk-BXNVGG4D.js.map +7 -0
- package/out/{chunk-2QVFOPGX.js → chunk-CS2KC2W3.js} +55 -23
- package/out/chunk-CS2KC2W3.js.map +7 -0
- package/out/{chunk-I5KZ62HL.js → chunk-O6HWBJKG.js} +2 -2
- package/out/{inspector-T4TQPT2K.js → inspector-2LQODK6W.js} +9 -4
- package/out/inspector-2LQODK6W.js.map +7 -0
- package/out/otel/src/log-options.d.ts +4 -0
- package/out/otel/src/log-options.d.ts.map +1 -1
- package/out/otel/src/log-options.js +7 -0
- package/out/otel/src/log-options.js.map +1 -1
- package/out/react.js +1 -1
- package/out/shared/src/arrays.d.ts +1 -0
- package/out/shared/src/arrays.d.ts.map +1 -1
- package/out/shared/src/arrays.js +6 -0
- package/out/shared/src/arrays.js.map +1 -1
- package/out/solid.js +3 -3
- package/out/z2s/src/compiler.d.ts +45 -50
- package/out/z2s/src/compiler.d.ts.map +1 -1
- package/out/z2s/src/compiler.js +310 -300
- package/out/z2s/src/compiler.js.map +1 -1
- package/out/zero-cache/src/config/normalize.d.ts +29 -0
- package/out/zero-cache/src/config/normalize.d.ts.map +1 -0
- package/out/zero-cache/src/config/normalize.js +73 -0
- package/out/zero-cache/src/config/normalize.js.map +1 -0
- package/out/zero-cache/src/{server/runner → config}/runtime.d.ts +1 -0
- package/out/zero-cache/src/config/runtime.d.ts.map +1 -0
- package/out/zero-cache/src/config/runtime.js +63 -0
- package/out/zero-cache/src/config/runtime.js.map +1 -0
- package/out/zero-cache/src/config/zero-config.d.ts +35 -16
- package/out/zero-cache/src/config/zero-config.d.ts.map +1 -1
- package/out/zero-cache/src/config/zero-config.js +44 -19
- package/out/zero-cache/src/config/zero-config.js.map +1 -1
- package/out/zero-cache/src/scripts/permissions.d.ts +4 -0
- package/out/zero-cache/src/scripts/permissions.d.ts.map +1 -1
- package/out/zero-cache/src/server/change-streamer.d.ts.map +1 -1
- package/out/zero-cache/src/server/change-streamer.js +5 -3
- package/out/zero-cache/src/server/change-streamer.js.map +1 -1
- package/out/zero-cache/src/server/logging.d.ts +1 -0
- package/out/zero-cache/src/server/logging.d.ts.map +1 -1
- package/out/zero-cache/src/server/logging.js +19 -2
- package/out/zero-cache/src/server/logging.js.map +1 -1
- package/out/zero-cache/src/server/main.d.ts.map +1 -1
- package/out/zero-cache/src/server/main.js +10 -10
- package/out/zero-cache/src/server/main.js.map +1 -1
- package/out/zero-cache/src/server/otel-log-sink.d.ts +8 -0
- package/out/zero-cache/src/server/otel-log-sink.d.ts.map +1 -0
- package/out/zero-cache/src/server/otel-log-sink.js +50 -0
- package/out/zero-cache/src/server/otel-log-sink.js.map +1 -0
- package/out/zero-cache/src/server/otel-start.d.ts +7 -0
- package/out/zero-cache/src/server/otel-start.d.ts.map +1 -0
- package/out/zero-cache/src/server/otel-start.js +60 -0
- package/out/zero-cache/src/server/otel-start.js.map +1 -0
- package/out/zero-cache/src/server/replicator.d.ts.map +1 -1
- package/out/zero-cache/src/server/replicator.js +15 -4
- package/out/zero-cache/src/server/replicator.js.map +1 -1
- package/out/zero-cache/src/server/runner/config.d.ts +24 -12
- package/out/zero-cache/src/server/runner/config.d.ts.map +1 -1
- package/out/zero-cache/src/server/runner/run-worker.d.ts.map +1 -1
- package/out/zero-cache/src/server/runner/run-worker.js +2 -8
- package/out/zero-cache/src/server/runner/run-worker.js.map +1 -1
- package/out/zero-cache/src/server/syncer.d.ts.map +1 -1
- package/out/zero-cache/src/server/syncer.js +6 -44
- package/out/zero-cache/src/server/syncer.js.map +1 -1
- package/out/zero-cache/src/services/change-streamer/change-streamer-http.d.ts +4 -2
- package/out/zero-cache/src/services/change-streamer/change-streamer-http.d.ts.map +1 -1
- package/out/zero-cache/src/services/change-streamer/change-streamer-http.js +14 -11
- package/out/zero-cache/src/services/change-streamer/change-streamer-http.js.map +1 -1
- package/out/zero-cache/src/services/change-streamer/change-streamer-service.d.ts +1 -1
- package/out/zero-cache/src/services/change-streamer/change-streamer-service.d.ts.map +1 -1
- package/out/zero-cache/src/services/change-streamer/change-streamer-service.js +4 -15
- package/out/zero-cache/src/services/change-streamer/change-streamer-service.js.map +1 -1
- package/out/zero-cache/src/services/change-streamer/schema/init.d.ts.map +1 -1
- package/out/zero-cache/src/services/change-streamer/schema/init.js +8 -0
- package/out/zero-cache/src/services/change-streamer/schema/init.js.map +1 -1
- package/out/zero-cache/src/services/change-streamer/schema/tables.d.ts +2 -1
- package/out/zero-cache/src/services/change-streamer/schema/tables.d.ts.map +1 -1
- package/out/zero-cache/src/services/change-streamer/schema/tables.js +19 -13
- package/out/zero-cache/src/services/change-streamer/schema/tables.js.map +1 -1
- package/out/zero-cache/src/services/change-streamer/storer.d.ts +1 -1
- package/out/zero-cache/src/services/change-streamer/storer.d.ts.map +1 -1
- package/out/zero-cache/src/services/change-streamer/storer.js +6 -2
- package/out/zero-cache/src/services/change-streamer/storer.js.map +1 -1
- package/out/zero-cache/src/services/view-syncer/schema/cvr.d.ts.map +1 -1
- package/out/zero-cache/src/services/view-syncer/schema/cvr.js.map +1 -1
- package/out/zero-client/src/client/custom.d.ts +2 -2
- package/out/zero-client/src/client/custom.d.ts.map +1 -1
- package/out/zero-client/src/client/mutation-tracker.d.ts.map +1 -1
- package/out/zero-pg/src/mod.d.ts +3 -3
- package/out/zero-pg/src/mod.d.ts.map +1 -1
- package/out/zero-pg/src/mod.js +2 -2
- package/out/zero-pg/src/mod.js.map +1 -1
- package/out/zero-pg/src/{zql-postgresjs-provider.d.ts → postgresjs-connection.d.ts} +6 -2
- package/out/zero-pg/src/postgresjs-connection.d.ts.map +1 -0
- package/out/zero-pg/src/{zql-postgresjs-provider.js → postgresjs-connection.js} +6 -2
- package/out/zero-pg/src/postgresjs-connection.js.map +1 -0
- package/out/zero-pg/src/push-processor.d.ts +7 -3
- package/out/zero-pg/src/push-processor.d.ts.map +1 -1
- package/out/zero-pg/src/push-processor.js.map +1 -1
- package/out/zero-pg/src/query.d.ts +2 -3
- package/out/zero-pg/src/query.d.ts.map +1 -1
- package/out/zero-pg/src/query.js +4 -5
- package/out/zero-pg/src/query.js.map +1 -1
- package/out/zero-pg/src/zql-database.d.ts +17 -0
- package/out/zero-pg/src/zql-database.d.ts.map +1 -0
- package/out/zero-pg/src/{zql-provider.js → zql-database.js} +9 -2
- package/out/zero-pg/src/zql-database.js.map +1 -0
- package/out/zero.js +3 -3
- package/out/zql/src/query/assert-no-not-exists.d.ts +17 -0
- package/out/zql/src/query/assert-no-not-exists.d.ts.map +1 -0
- package/out/zql/src/query/assert-no-not-exists.js +40 -0
- package/out/zql/src/query/assert-no-not-exists.js.map +1 -0
- package/out/zql/src/query/query-impl.d.ts +5 -5
- package/out/zql/src/query/query-impl.d.ts.map +1 -1
- package/out/zql/src/query/query-impl.js +32 -22
- package/out/zql/src/query/query-impl.js.map +1 -1
- package/out/zql/src/query/static-query.d.ts +3 -3
- package/out/zql/src/query/static-query.d.ts.map +1 -1
- package/out/zql/src/query/static-query.js +5 -3
- package/out/zql/src/query/static-query.js.map +1 -1
- package/package.json +5 -2
- package/out/chunk-2QVFOPGX.js.map +0 -7
- package/out/chunk-TE6WQOQV.js.map +0 -7
- package/out/inspector-T4TQPT2K.js.map +0 -7
- package/out/zero-cache/src/server/runner/runtime.d.ts.map +0 -1
- package/out/zero-cache/src/server/runner/runtime.js +0 -23
- package/out/zero-cache/src/server/runner/runtime.js.map +0 -1
- package/out/zero-cache/src/types/timeout.d.ts +0 -11
- package/out/zero-cache/src/types/timeout.d.ts.map +0 -1
- package/out/zero-cache/src/types/timeout.js +0 -23
- package/out/zero-cache/src/types/timeout.js.map +0 -1
- package/out/zero-pg/src/zql-postgresjs-provider.d.ts.map +0 -1
- package/out/zero-pg/src/zql-postgresjs-provider.js.map +0 -1
- package/out/zero-pg/src/zql-provider.d.ts +0 -10
- package/out/zero-pg/src/zql-provider.d.ts.map +0 -1
- package/out/zero-pg/src/zql-provider.js.map +0 -1
- /package/out/{chunk-I5KZ62HL.js.map → chunk-O6HWBJKG.js.map} +0 -0
|
@@ -2,8 +2,14 @@ import { LogContext, consoleLogSink, } from '@rocicorp/logger';
|
|
|
2
2
|
import { pid } from 'node:process';
|
|
3
3
|
import {} from "../config/zero-config.js";
|
|
4
4
|
import { stringify } from "../types/bigint-json.js";
|
|
5
|
+
import { OtelLogSink } from "./otel-log-sink.js";
|
|
5
6
|
function createLogSink(config) {
|
|
6
|
-
|
|
7
|
+
const consoleSink = config.format === 'json' ? consoleJsonLogSink : consoleLogSink;
|
|
8
|
+
if (config.logCollector) {
|
|
9
|
+
const otelSink = new OtelLogSink(config);
|
|
10
|
+
return new CompositeLogSink([otelSink, consoleSink]);
|
|
11
|
+
}
|
|
12
|
+
return consoleSink;
|
|
7
13
|
}
|
|
8
14
|
export function createLogContext(config, context) {
|
|
9
15
|
const { log, tenantID: tid } = config;
|
|
@@ -18,6 +24,17 @@ export function createLogContext(config, context) {
|
|
|
18
24
|
lc.info?.('');
|
|
19
25
|
return lc;
|
|
20
26
|
}
|
|
27
|
+
class CompositeLogSink {
|
|
28
|
+
#sinks;
|
|
29
|
+
constructor(sinks) {
|
|
30
|
+
this.#sinks = sinks;
|
|
31
|
+
}
|
|
32
|
+
log(level, context, ...args) {
|
|
33
|
+
for (const sink of this.#sinks) {
|
|
34
|
+
sink.log(level, context, ...args);
|
|
35
|
+
}
|
|
36
|
+
}
|
|
37
|
+
}
|
|
21
38
|
const consoleJsonLogSink = {
|
|
22
39
|
log(level, context, ...args) {
|
|
23
40
|
// If the last arg is an object or an Error, combine those fields into the message.
|
|
@@ -41,7 +58,7 @@ const consoleJsonLogSink = {
|
|
|
41
58
|
}));
|
|
42
59
|
},
|
|
43
60
|
};
|
|
44
|
-
function errorOrObject(v) {
|
|
61
|
+
export function errorOrObject(v) {
|
|
45
62
|
if (v instanceof Error) {
|
|
46
63
|
return {
|
|
47
64
|
...v, // some properties of Error subclasses may be enumerable
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logging.js","sourceRoot":"","sources":["../../../../../zero-cache/src/server/logging.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EACV,cAAc,GAIf,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAC,GAAG,EAAC,MAAM,cAAc,CAAC;AACjC,OAAO,EAAiC,MAAM,0BAA0B,CAAC;AACzE,OAAO,EAAC,SAAS,EAAC,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"logging.js","sourceRoot":"","sources":["../../../../../zero-cache/src/server/logging.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../../../../../zero-cache/src/server/main.ts"],"names":[],"mappings":"AAqBA,OAAO,EAIL,KAAK,MAAM,EACZ,MAAM,uBAAuB,CAAC;AAW/B,wBAA8B,SAAS,CACrC,MAAM,EAAE,MAAM,GAAG,IAAI,EACrB,GAAG,EAAE,MAAM,CAAC,UAAU,GACrB,OAAO,CAAC,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../../../../../zero-cache/src/server/main.ts"],"names":[],"mappings":"AAqBA,OAAO,EAIL,KAAK,MAAM,EACZ,MAAM,uBAAuB,CAAC;AAW/B,wBAA8B,SAAS,CACrC,MAAM,EAAE,MAAM,GAAG,IAAI,EACrB,GAAG,EAAE,MAAM,CAAC,UAAU,GACrB,OAAO,CAAC,IAAI,CAAC,CA+Lf"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { resolver } from '@rocicorp/resolver';
|
|
2
2
|
import { availableParallelism } from 'node:os';
|
|
3
3
|
import path from 'node:path';
|
|
4
|
-
import {
|
|
4
|
+
import { normalizeConfig } from "../config/normalize.js";
|
|
5
5
|
import { getZeroConfig } from "../config/zero-config.js";
|
|
6
6
|
import { getSubscriberContext } from "../services/change-streamer/change-streamer-http.js";
|
|
7
7
|
import { Dispatcher } from "../services/dispatcher/dispatcher.js";
|
|
@@ -17,10 +17,9 @@ import { createLogContext } from "./logging.js";
|
|
|
17
17
|
const clientConnectionBifurcated = false;
|
|
18
18
|
export default async function runWorker(parent, env) {
|
|
19
19
|
const startMs = Date.now();
|
|
20
|
-
const
|
|
21
|
-
const lc = createLogContext(
|
|
22
|
-
const
|
|
23
|
-
const shard = getShardID(config);
|
|
20
|
+
const cfg = getZeroConfig(env);
|
|
21
|
+
const lc = createLogContext(cfg, { worker: 'dispatcher' });
|
|
22
|
+
const config = await normalizeConfig(lc, cfg, env);
|
|
24
23
|
const processes = new ProcessManager(lc, parent ?? process);
|
|
25
24
|
const numSyncers = config.numSyncWorkers !== undefined
|
|
26
25
|
? config.numSyncWorkers
|
|
@@ -47,16 +46,17 @@ export default async function runWorker(parent, env) {
|
|
|
47
46
|
const name = path.basename(modulePath) + (id ? ` (${id})` : '');
|
|
48
47
|
return processes.addWorker(worker, type, name);
|
|
49
48
|
}
|
|
50
|
-
const
|
|
49
|
+
const shard = getShardID(config);
|
|
50
|
+
const { taskID, litestream: { backupURL, restoreDurationMsEstimate }, changeStreamer: { mode: changeStreamerMode }, } = config;
|
|
51
51
|
const litestream = backupURL?.length;
|
|
52
|
-
const runChangeStreamer =
|
|
52
|
+
const runChangeStreamer = changeStreamerMode === 'dedicated';
|
|
53
53
|
if (litestream) {
|
|
54
54
|
// For the replication-manager (i.e. authoritative replica), only attempt
|
|
55
55
|
// a restore once, allowing the backup to be absent.
|
|
56
56
|
// For view-syncers, attempt a restore for up to 10 times over 30 seconds.
|
|
57
57
|
try {
|
|
58
58
|
const restoreElapsedMs = await restoreReplica(lc, config, runChangeStreamer ? 1 : 10, 3000);
|
|
59
|
-
if (!
|
|
59
|
+
if (!restoreDurationMsEstimate && restoreElapsedMs) {
|
|
60
60
|
internalFlags.push('--litestream-restore-duration-ms-estimate', String(restoreElapsedMs));
|
|
61
61
|
}
|
|
62
62
|
}
|
|
@@ -83,8 +83,8 @@ export default async function runWorker(parent, env) {
|
|
|
83
83
|
// Technically, setting up the CVR DB schema is the responsibility of the Syncer,
|
|
84
84
|
// but it is done here in the main thread because it is wasteful to have all of
|
|
85
85
|
// the Syncers attempt the migration in parallel.
|
|
86
|
-
const { cvr
|
|
87
|
-
const cvrDB = pgClient(lc, cvr.db
|
|
86
|
+
const { cvr } = config;
|
|
87
|
+
const cvrDB = pgClient(lc, cvr.db);
|
|
88
88
|
await initViewSyncerSchema(lc, cvrDB, shard);
|
|
89
89
|
void cvrDB.end();
|
|
90
90
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"main.js","sourceRoot":"","sources":["../../../../../zero-cache/src/server/main.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,QAAQ,EAAC,MAAM,oBAAoB,CAAC;AAC5C,OAAO,EAAC,oBAAoB,EAAC,MAAM,SAAS,CAAC;AAC7C,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAC,
|
|
1
|
+
{"version":3,"file":"main.js","sourceRoot":"","sources":["../../../../../zero-cache/src/server/main.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
import type { Context, LogLevel, LogSink } from '@rocicorp/logger';
|
|
2
|
+
import { type OtelEndpoints } from './otel-start.ts';
|
|
3
|
+
export declare class OtelLogSink implements LogSink {
|
|
4
|
+
#private;
|
|
5
|
+
constructor(endpoints: OtelEndpoints);
|
|
6
|
+
log(level: LogLevel, context: Context | undefined, ...args: unknown[]): void;
|
|
7
|
+
}
|
|
8
|
+
//# sourceMappingURL=otel-log-sink.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"otel-log-sink.d.ts","sourceRoot":"","sources":["../../../../../zero-cache/src/server/otel-log-sink.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAC,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAC,MAAM,kBAAkB,CAAC;AAGjE,OAAO,EAAY,KAAK,aAAa,EAAC,MAAM,iBAAiB,CAAC;AAE9D,qBAAa,WAAY,YAAW,OAAO;;gBAG7B,SAAS,EAAE,aAAa;IAOpC,GAAG,CAAC,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,OAAO,GAAG,SAAS,EAAE,GAAG,IAAI,EAAE,OAAO,EAAE,GAAG,IAAI;CA0B7E"}
|
|
@@ -0,0 +1,50 @@
|
|
|
1
|
+
import { logs, SeverityNumber, } from '@opentelemetry/api-logs';
|
|
2
|
+
import { errorOrObject } from "./logging.js";
|
|
3
|
+
import { stringify } from "../types/bigint-json.js";
|
|
4
|
+
import { startOtel } from "./otel-start.js";
|
|
5
|
+
export class OtelLogSink {
|
|
6
|
+
#logger;
|
|
7
|
+
constructor(endpoints) {
|
|
8
|
+
// start otel in case it was not started yet
|
|
9
|
+
// this is a no-op if already started
|
|
10
|
+
startOtel(endpoints);
|
|
11
|
+
this.#logger = logs.getLogger('zero-cache');
|
|
12
|
+
}
|
|
13
|
+
log(level, context, ...args) {
|
|
14
|
+
const lastObj = errorOrObject(args.at(-1));
|
|
15
|
+
if (lastObj) {
|
|
16
|
+
args.pop();
|
|
17
|
+
}
|
|
18
|
+
let message = args.length
|
|
19
|
+
? args.map(s => (typeof s === 'string' ? s : stringify(s))).join(' ')
|
|
20
|
+
: '';
|
|
21
|
+
if (lastObj) {
|
|
22
|
+
message += ` ${stringify(lastObj)}`;
|
|
23
|
+
}
|
|
24
|
+
const payload = {
|
|
25
|
+
severityNumber: toErrorNum(level),
|
|
26
|
+
severityText: level,
|
|
27
|
+
body: message,
|
|
28
|
+
timestamp: Date.now() * 1_000_000, // nanoseconds
|
|
29
|
+
};
|
|
30
|
+
if (context) {
|
|
31
|
+
payload.attributes = context;
|
|
32
|
+
}
|
|
33
|
+
this.#logger.emit(payload);
|
|
34
|
+
}
|
|
35
|
+
}
|
|
36
|
+
function toErrorNum(level) {
|
|
37
|
+
switch (level) {
|
|
38
|
+
case 'error':
|
|
39
|
+
return SeverityNumber.ERROR;
|
|
40
|
+
case 'warn':
|
|
41
|
+
return SeverityNumber.WARN;
|
|
42
|
+
case 'info':
|
|
43
|
+
return SeverityNumber.INFO;
|
|
44
|
+
case 'debug':
|
|
45
|
+
return SeverityNumber.DEBUG;
|
|
46
|
+
default:
|
|
47
|
+
throw new Error(`Unknown log level: ${level}`);
|
|
48
|
+
}
|
|
49
|
+
}
|
|
50
|
+
//# sourceMappingURL=otel-log-sink.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"otel-log-sink.js","sourceRoot":"","sources":["../../../../../zero-cache/src/server/otel-log-sink.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,IAAI,EAEJ,cAAc,GAGf,MAAM,yBAAyB,CAAC;AAEjC,OAAO,EAAC,aAAa,EAAC,MAAM,cAAc,CAAC;AAC3C,OAAO,EAAC,SAAS,EAAC,MAAM,yBAAyB,CAAC;AAClD,OAAO,EAAC,SAAS,EAAqB,MAAM,iBAAiB,CAAC;AAE9D,MAAM,OAAO,WAAW;IACb,OAAO,CAAS;IAEzB,YAAY,SAAwB;QAClC,4CAA4C;QAC5C,qCAAqC;QACrC,SAAS,CAAC,SAAS,CAAC,CAAC;QACrB,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC;IAC9C,CAAC;IAED,GAAG,CAAC,KAAe,EAAE,OAA4B,EAAE,GAAG,IAAe;QACnE,MAAM,OAAO,GAAG,aAAa,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAC3C,IAAI,OAAO,EAAE,CAAC;YACZ,IAAI,CAAC,GAAG,EAAE,CAAC;QACb,CAAC;QAED,IAAI,OAAO,GAAG,IAAI,CAAC,MAAM;YACvB,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC;YACrE,CAAC,CAAC,EAAE,CAAC;QAEP,IAAI,OAAO,EAAE,CAAC;YACZ,OAAO,IAAI,IAAI,SAAS,CAAC,OAAO,CAAC,EAAE,CAAC;QACtC,CAAC;QAED,MAAM,OAAO,GAAc;YACzB,cAAc,EAAE,UAAU,CAAC,KAAK,CAAC;YACjC,YAAY,EAAE,KAAK;YACnB,IAAI,EAAE,OAAO;YACb,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS,EAAE,cAAc;SAClD,CAAC;QACF,IAAI,OAAO,EAAE,CAAC;YACZ,OAAO,CAAC,UAAU,GAAG,OAAsB,CAAC;QAC9C,CAAC;QAED,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAC7B,CAAC;CACF;AAED,SAAS,UAAU,CAAC,KAAe;IACjC,QAAQ,KAAK,EAAE,CAAC;QACd,KAAK,OAAO;YACV,OAAO,cAAc,CAAC,KAAK,CAAC;QAC9B,KAAK,MAAM;YACT,OAAO,cAAc,CAAC,IAAI,CAAC;QAC7B,KAAK,MAAM;YACT,OAAO,cAAc,CAAC,IAAI,CAAC;QAC7B,KAAK,OAAO;YACV,OAAO,cAAc,CAAC,KAAK,CAAC;QAC9B;YACE,MAAM,IAAI,KAAK,CAAC,sBAAsB,KAAK,EAAE,CAAC,CAAC;IACnD,CAAC;AACH,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"otel-start.d.ts","sourceRoot":"","sources":["../../../../../zero-cache/src/server/otel-start.ts"],"names":[],"mappings":"AAuBA,MAAM,MAAM,aAAa,GAAG;IAC1B,cAAc,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACpC,eAAe,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACrC,YAAY,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CACnC,CAAC;AAGF,wBAAgB,SAAS,CAAC,SAAS,EAAE,aAAa,QAqDjD"}
|
|
@@ -0,0 +1,60 @@
|
|
|
1
|
+
import { OTLPTraceExporter } from '@opentelemetry/exporter-trace-otlp-http';
|
|
2
|
+
import { OTLPMetricExporter } from '@opentelemetry/exporter-metrics-otlp-http';
|
|
3
|
+
import { OTLPLogExporter } from '@opentelemetry/exporter-logs-otlp-http';
|
|
4
|
+
import { NodeSDK } from '@opentelemetry/sdk-node';
|
|
5
|
+
import { ATTR_SERVICE_NAME, ATTR_SERVICE_VERSION, } from '@opentelemetry/semantic-conventions';
|
|
6
|
+
import { PeriodicExportingMetricReader, ConsoleMetricExporter, } from '@opentelemetry/sdk-metrics';
|
|
7
|
+
import { resourceFromAttributes } from '@opentelemetry/resources';
|
|
8
|
+
import { NoopSpanExporter } from "../../../otel/src/noop-span-exporter.js";
|
|
9
|
+
import { NoopMetricExporter } from "../../../otel/src/noop-metric-exporter.js";
|
|
10
|
+
import { version } from "../../../otel/src/version.js";
|
|
11
|
+
import { BatchLogRecordProcessor, LoggerProvider, } from '@opentelemetry/sdk-logs';
|
|
12
|
+
import { logs } from '@opentelemetry/api-logs';
|
|
13
|
+
let started = false;
|
|
14
|
+
export function startOtel(endpoints) {
|
|
15
|
+
if (started) {
|
|
16
|
+
return;
|
|
17
|
+
}
|
|
18
|
+
started = true;
|
|
19
|
+
const logRecordProcessors = [];
|
|
20
|
+
const resource = resourceFromAttributes({
|
|
21
|
+
[ATTR_SERVICE_NAME]: 'syncer',
|
|
22
|
+
[ATTR_SERVICE_VERSION]: version,
|
|
23
|
+
});
|
|
24
|
+
if (endpoints.logCollector !== undefined) {
|
|
25
|
+
const provider = new LoggerProvider({
|
|
26
|
+
resource,
|
|
27
|
+
});
|
|
28
|
+
const processor = new BatchLogRecordProcessor(new OTLPLogExporter({
|
|
29
|
+
url: endpoints.logCollector,
|
|
30
|
+
}));
|
|
31
|
+
logRecordProcessors.push(processor);
|
|
32
|
+
provider.addLogRecordProcessor(processor);
|
|
33
|
+
logs.setGlobalLoggerProvider(provider);
|
|
34
|
+
}
|
|
35
|
+
const sdk = new NodeSDK({
|
|
36
|
+
resource,
|
|
37
|
+
traceExporter: endpoints.traceCollector === undefined
|
|
38
|
+
? new NoopSpanExporter()
|
|
39
|
+
: new OTLPTraceExporter({
|
|
40
|
+
url: endpoints.traceCollector,
|
|
41
|
+
}),
|
|
42
|
+
metricReader: new PeriodicExportingMetricReader({
|
|
43
|
+
exportIntervalMillis: 5000,
|
|
44
|
+
exporter: (() => {
|
|
45
|
+
if (endpoints.metricCollector === undefined) {
|
|
46
|
+
if (process.env.NODE_ENV === 'dev') {
|
|
47
|
+
return new ConsoleMetricExporter();
|
|
48
|
+
}
|
|
49
|
+
return new NoopMetricExporter();
|
|
50
|
+
}
|
|
51
|
+
return new OTLPMetricExporter({
|
|
52
|
+
url: endpoints.metricCollector,
|
|
53
|
+
});
|
|
54
|
+
})(),
|
|
55
|
+
}),
|
|
56
|
+
logRecordProcessors,
|
|
57
|
+
});
|
|
58
|
+
sdk.start();
|
|
59
|
+
}
|
|
60
|
+
//# sourceMappingURL=otel-start.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"otel-start.js","sourceRoot":"","sources":["../../../../../zero-cache/src/server/otel-start.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,iBAAiB,EAAC,MAAM,yCAAyC,CAAC;AAC1E,OAAO,EAAC,kBAAkB,EAAC,MAAM,2CAA2C,CAAC;AAC7E,OAAO,EAAC,eAAe,EAAC,MAAM,wCAAwC,CAAC;AACvE,OAAO,EAAC,OAAO,EAAC,MAAM,yBAAyB,CAAC;AAChD,OAAO,EACL,iBAAiB,EACjB,oBAAoB,GACrB,MAAM,qCAAqC,CAAC;AAC7C,OAAO,EACL,6BAA6B,EAC7B,qBAAqB,GACtB,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAC,sBAAsB,EAAC,MAAM,0BAA0B,CAAC;AAChE,OAAO,EAAC,gBAAgB,EAAC,MAAM,yCAAyC,CAAC;AACzE,OAAO,EAAC,kBAAkB,EAAC,MAAM,2CAA2C,CAAC;AAC7E,OAAO,EAAC,OAAO,EAAC,MAAM,8BAA8B,CAAC;AACrD,OAAO,EACL,uBAAuB,EACvB,cAAc,GAEf,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAC,IAAI,EAAC,MAAM,yBAAyB,CAAC;AAQ7C,IAAI,OAAO,GAAG,KAAK,CAAC;AACpB,MAAM,UAAU,SAAS,CAAC,SAAwB;IAChD,IAAI,OAAO,EAAE,CAAC;QACZ,OAAO;IACT,CAAC;IACD,OAAO,GAAG,IAAI,CAAC;IAEf,MAAM,mBAAmB,GAAyB,EAAE,CAAC;IACrD,MAAM,QAAQ,GAAG,sBAAsB,CAAC;QACtC,CAAC,iBAAiB,CAAC,EAAE,QAAQ;QAC7B,CAAC,oBAAoB,CAAC,EAAE,OAAO;KAChC,CAAC,CAAC;IAEH,IAAI,SAAS,CAAC,YAAY,KAAK,SAAS,EAAE,CAAC;QACzC,MAAM,QAAQ,GAAG,IAAI,cAAc,CAAC;YAClC,QAAQ;SACT,CAAC,CAAC;QACH,MAAM,SAAS,GAAG,IAAI,uBAAuB,CAC3C,IAAI,eAAe,CAAC;YAClB,GAAG,EAAE,SAAS,CAAC,YAAY;SAC5B,CAAC,CACH,CAAC;QACF,mBAAmB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACpC,QAAQ,CAAC,qBAAqB,CAAC,SAAS,CAAC,CAAC;QAC1C,IAAI,CAAC,uBAAuB,CAAC,QAAQ,CAAC,CAAC;IACzC,CAAC;IAED,MAAM,GAAG,GAAG,IAAI,OAAO,CAAC;QACtB,QAAQ;QACR,aAAa,EACX,SAAS,CAAC,cAAc,KAAK,SAAS;YACpC,CAAC,CAAC,IAAI,gBAAgB,EAAE;YACxB,CAAC,CAAC,IAAI,iBAAiB,CAAC;gBACpB,GAAG,EAAE,SAAS,CAAC,cAAc;aAC9B,CAAC;QACR,YAAY,EAAE,IAAI,6BAA6B,CAAC;YAC9C,oBAAoB,EAAE,IAAI;YAC1B,QAAQ,EAAE,CAAC,GAAG,EAAE;gBACd,IAAI,SAAS,CAAC,eAAe,KAAK,SAAS,EAAE,CAAC;oBAC5C,IAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,KAAK,EAAE,CAAC;wBACnC,OAAO,IAAI,qBAAqB,EAAE,CAAC;oBACrC,CAAC;oBAED,OAAO,IAAI,kBAAkB,EAAE,CAAC;gBAClC,CAAC;gBAED,OAAO,IAAI,kBAAkB,CAAC;oBAC5B,GAAG,EAAE,SAAS,CAAC,eAAe;iBAC/B,CAAC,CAAC;YACL,CAAC,CAAC,EAAE;SACL,CAAC;QACF,mBAAmB;KACpB,CAAC,CAAC;IACH,GAAG,CAAC,KAAK,EAAE,CAAC;AACd,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"replicator.d.ts","sourceRoot":"","sources":["../../../../../zero-cache/src/server/replicator.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"replicator.d.ts","sourceRoot":"","sources":["../../../../../zero-cache/src/server/replicator.ts"],"names":[],"mappings":"AAaA,OAAO,EAGL,KAAK,MAAM,EACZ,MAAM,uBAAuB,CAAC;AAS/B,wBAA8B,SAAS,CACrC,MAAM,EAAE,MAAM,EACd,GAAG,EAAE,MAAM,CAAC,UAAU,EACtB,GAAG,IAAI,EAAE,MAAM,EAAE,GAChB,OAAO,CAAC,IAAI,CAAC,CA4Cf"}
|
|
@@ -2,25 +2,36 @@ import { pid } from 'node:process';
|
|
|
2
2
|
import { assert } from "../../../shared/src/asserts.js";
|
|
3
3
|
import { must } from "../../../shared/src/must.js";
|
|
4
4
|
import * as v from "../../../shared/src/valita.js";
|
|
5
|
+
import { assertNormalized } from "../config/normalize.js";
|
|
5
6
|
import { getZeroConfig } from "../config/zero-config.js";
|
|
6
7
|
import { ChangeStreamerHttpClient } from "../services/change-streamer/change-streamer-http.js";
|
|
7
8
|
import { exitAfter, runUntilKilled } from "../services/life-cycle.js";
|
|
8
9
|
import { ReplicatorService, } from "../services/replicator/replicator.js";
|
|
10
|
+
import { pgClient } from "../types/pg.js";
|
|
9
11
|
import { parentWorker, singleProcessMode, } from "../types/processes.js";
|
|
12
|
+
import { getShardConfig } from "../types/shards.js";
|
|
10
13
|
import { replicaFileModeSchema, setUpMessageHandlers, setupReplica, } from "../workers/replicator.js";
|
|
11
14
|
import { createLogContext } from "./logging.js";
|
|
12
15
|
export default async function runWorker(parent, env, ...args) {
|
|
13
16
|
assert(args.length > 0, `replicator mode not specified`);
|
|
14
17
|
const fileMode = v.parse(args[0], replicaFileModeSchema);
|
|
15
18
|
const config = getZeroConfig(env, args.slice(1));
|
|
19
|
+
assertNormalized(config);
|
|
16
20
|
const mode = fileMode === 'backup' ? 'backup' : 'serving';
|
|
17
21
|
const workerName = `${mode}-replicator`;
|
|
18
22
|
const lc = createLogContext(config, { worker: workerName });
|
|
19
23
|
const replica = await setupReplica(lc, fileMode, config.replica);
|
|
20
|
-
const
|
|
21
|
-
const
|
|
22
|
-
|
|
23
|
-
|
|
24
|
+
const shard = getShardConfig(config);
|
|
25
|
+
const { taskID, change } = config;
|
|
26
|
+
// Create a pg client with a single short-lived connection for the purpose
|
|
27
|
+
// of change-streamer discovery (i.e. ChangeDB as DNS).
|
|
28
|
+
const changeDB = pgClient(lc, change.db, {
|
|
29
|
+
max: 1,
|
|
30
|
+
['idle_timeout']: 15,
|
|
31
|
+
connection: { ['application_name']: 'change-streamer-discovery' },
|
|
32
|
+
});
|
|
33
|
+
const changeStreamer = new ChangeStreamerHttpClient(lc, shard, changeDB);
|
|
34
|
+
const replicator = new ReplicatorService(lc, taskID, `${workerName}-${pid}`, mode, changeStreamer, replica);
|
|
24
35
|
setUpMessageHandlers(lc, replicator, parent);
|
|
25
36
|
const running = runUntilKilled(lc, parent, replicator);
|
|
26
37
|
// Signal readiness once the first ReplicaVersionReady notification is received.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"replicator.js","sourceRoot":"","sources":["../../../../../zero-cache/src/server/replicator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,GAAG,EAAC,MAAM,cAAc,CAAC;AACjC,OAAO,EAAC,MAAM,EAAC,MAAM,gCAAgC,CAAC;AACtD,OAAO,EAAC,IAAI,EAAC,MAAM,6BAA6B,CAAC;AACjD,OAAO,KAAK,CAAC,MAAM,+BAA+B,CAAC;AACnD,OAAO,EAAC,aAAa,EAAC,MAAM,0BAA0B,CAAC;AACvD,OAAO,EAAC,wBAAwB,EAAC,MAAM,qDAAqD,CAAC;AAC7F,OAAO,EAAC,SAAS,EAAE,cAAc,EAAC,MAAM,2BAA2B,CAAC;AACpE,OAAO,EACL,iBAAiB,GAElB,MAAM,sCAAsC,CAAC;AAC9C,OAAO,EACL,YAAY,EACZ,iBAAiB,GAElB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EACL,qBAAqB,EACrB,oBAAoB,EACpB,YAAY,GACb,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAC,gBAAgB,EAAC,MAAM,cAAc,CAAC;AAE9C,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,SAAS,CACrC,MAAc,EACd,GAAsB,EACtB,GAAG,IAAc;IAEjB,MAAM,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,+BAA+B,CAAC,CAAC;IACzD,MAAM,QAAQ,GAAG,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,qBAAqB,CAAC,CAAC;IAEzD,MAAM,MAAM,GAAG,aAAa,CAAC,GAAG,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;IACjD,MAAM,IAAI,GAAmB,QAAQ,KAAK,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC;IAC1E,MAAM,UAAU,GAAG,GAAG,IAAI,aAAa,CAAC;IACxC,MAAM,EAAE,GAAG,gBAAgB,CAAC,MAAM,EAAE,EAAC,MAAM,EAAE,UAAU,EAAC,CAAC,CAAC;IAE1D,MAAM,OAAO,GAAG,MAAM,YAAY,CAAC,EAAE,EAAE,QAAQ,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;IAEjE,MAAM,
|
|
1
|
+
{"version":3,"file":"replicator.js","sourceRoot":"","sources":["../../../../../zero-cache/src/server/replicator.ts"],"names":[],"mappings":"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"}
|
|
@@ -89,6 +89,10 @@ export declare const multiConfigSchema: {
|
|
|
89
89
|
type: v.Optional<string>;
|
|
90
90
|
desc: string[];
|
|
91
91
|
};
|
|
92
|
+
logCollector: {
|
|
93
|
+
type: v.Optional<string>;
|
|
94
|
+
desc: string[];
|
|
95
|
+
};
|
|
92
96
|
slowRowThreshold: {
|
|
93
97
|
type: v.Type<number>;
|
|
94
98
|
desc: string[];
|
|
@@ -141,9 +145,19 @@ export declare const multiConfigSchema: {
|
|
|
141
145
|
type: v.Type<number>;
|
|
142
146
|
desc: string[];
|
|
143
147
|
};
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
148
|
+
changeStreamer: {
|
|
149
|
+
mode: {
|
|
150
|
+
type: v.Type<"dedicated" | "discover">;
|
|
151
|
+
desc: string[];
|
|
152
|
+
};
|
|
153
|
+
port: {
|
|
154
|
+
type: v.Optional<number>;
|
|
155
|
+
desc: string[];
|
|
156
|
+
};
|
|
157
|
+
address: {
|
|
158
|
+
type: v.Optional<string>;
|
|
159
|
+
desc: string[];
|
|
160
|
+
};
|
|
147
161
|
};
|
|
148
162
|
taskID: {
|
|
149
163
|
type: v.Optional<string>;
|
|
@@ -163,10 +177,6 @@ export declare const multiConfigSchema: {
|
|
|
163
177
|
type: v.Optional<number>;
|
|
164
178
|
desc: string[];
|
|
165
179
|
};
|
|
166
|
-
changeStreamerURI: {
|
|
167
|
-
type: v.Optional<string>;
|
|
168
|
-
desc: string[];
|
|
169
|
-
};
|
|
170
180
|
autoReset: {
|
|
171
181
|
type: v.Type<boolean>;
|
|
172
182
|
desc: string[];
|
|
@@ -285,8 +295,6 @@ export declare function getMultiZeroConfig(processEnv?: NodeJS.ProcessEnv, argv?
|
|
|
285
295
|
maxConnsPerWorker?: number | undefined;
|
|
286
296
|
} & {
|
|
287
297
|
db: string;
|
|
288
|
-
maxConns: number;
|
|
289
|
-
maxConnsPerWorker?: number | undefined;
|
|
290
298
|
};
|
|
291
299
|
change: {
|
|
292
300
|
maxConns: number;
|
|
@@ -294,7 +302,6 @@ export declare function getMultiZeroConfig(processEnv?: NodeJS.ProcessEnv, argv?
|
|
|
294
302
|
db?: string | undefined;
|
|
295
303
|
} & {
|
|
296
304
|
db: string;
|
|
297
|
-
maxConns: number;
|
|
298
305
|
};
|
|
299
306
|
replica: {
|
|
300
307
|
file: string;
|
|
@@ -310,6 +317,7 @@ export declare function getMultiZeroConfig(processEnv?: NodeJS.ProcessEnv, argv?
|
|
|
310
317
|
} & {
|
|
311
318
|
traceCollector?: string | undefined;
|
|
312
319
|
metricCollector?: string | undefined;
|
|
320
|
+
logCollector?: string | undefined;
|
|
313
321
|
};
|
|
314
322
|
app: {
|
|
315
323
|
id: string;
|
|
@@ -326,6 +334,12 @@ export declare function getMultiZeroConfig(processEnv?: NodeJS.ProcessEnv, argv?
|
|
|
326
334
|
secret?: string | undefined;
|
|
327
335
|
};
|
|
328
336
|
port: number;
|
|
337
|
+
changeStreamer: {
|
|
338
|
+
mode: "dedicated" | "discover";
|
|
339
|
+
} & {
|
|
340
|
+
port?: number | undefined;
|
|
341
|
+
address?: string | undefined;
|
|
342
|
+
};
|
|
329
343
|
perUserMutationLimit: {
|
|
330
344
|
windowMs: number;
|
|
331
345
|
} & {
|
|
@@ -357,10 +371,8 @@ export declare function getMultiZeroConfig(processEnv?: NodeJS.ProcessEnv, argv?
|
|
|
357
371
|
} & {};
|
|
358
372
|
serverVersion?: string | undefined;
|
|
359
373
|
queryHydrationStats?: boolean | undefined;
|
|
360
|
-
changeStreamerPort?: number | undefined;
|
|
361
374
|
taskID?: string | undefined;
|
|
362
375
|
numSyncWorkers?: number | undefined;
|
|
363
|
-
changeStreamerURI?: string | undefined;
|
|
364
376
|
adminPassword?: string | undefined;
|
|
365
377
|
storageDBTmpDir?: string | undefined;
|
|
366
378
|
tenantID?: string | undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../../../../../zero-cache/src/server/runner/config.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,CAAC,MAAM,kCAAkC,CAAC;AAKtD,eAAO,MAAM,iBAAiB
|
|
1
|
+
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../../../../../zero-cache/src/server/runner/config.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,CAAC,MAAM,kCAAkC,CAAC;AAKtD,eAAO,MAAM,iBAAiB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAkD7B,CAAC;AAiDF,MAAM,MAAM,eAAe,GAAG,UAAU,CAAC,OAAO,kBAAkB,CAAC,CAAC;AAEpE,wBAAgB,kBAAkB,CAChC,UAAU,GAAE,MAAM,CAAC,UAAwB,EAC3C,IAAI,WAAwB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAiB7B"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run-worker.d.ts","sourceRoot":"","sources":["../../../../../../zero-cache/src/server/runner/run-worker.ts"],"names":[],"mappings":"AAAA,OAAO,yBAAyB,CAAC;AAMjC,OAAO,EAAc,KAAK,MAAM,EAAC,MAAM,0BAA0B,CAAC;
|
|
1
|
+
{"version":3,"file":"run-worker.d.ts","sourceRoot":"","sources":["../../../../../../zero-cache/src/server/runner/run-worker.ts"],"names":[],"mappings":"AAAA,OAAO,yBAAyB,CAAC;AAMjC,OAAO,EAAc,KAAK,MAAM,EAAC,MAAM,0BAA0B,CAAC;AAKlE,wBAAsB,SAAS,CAC7B,MAAM,EAAE,MAAM,GAAG,IAAI,EACrB,GAAG,EAAE,MAAM,CAAC,UAAU,GACrB,OAAO,CAAC,IAAI,CAAC,CA6Gf"}
|
|
@@ -7,21 +7,15 @@ import { ProcessManager, runUntilKilled } from "../../services/life-cycle.js";
|
|
|
7
7
|
import { childWorker } from "../../types/processes.js";
|
|
8
8
|
import { createLogContext } from "../logging.js";
|
|
9
9
|
import { getMultiZeroConfig } from "./config.js";
|
|
10
|
-
import { getTaskID } from "./runtime.js";
|
|
11
10
|
import { ZeroDispatcher } from "./zero-dispatcher.js";
|
|
12
11
|
export async function runWorker(parent, env) {
|
|
13
12
|
const startMs = Date.now();
|
|
14
13
|
const { config, env: baseEnv } = getMultiZeroConfig(env);
|
|
15
14
|
const lc = createLogContext(config, { worker: 'runner' });
|
|
16
15
|
const processes = new ProcessManager(lc, parent ?? process);
|
|
17
|
-
const { serverVersion, port, changeStreamerPort = port + 1 } = config;
|
|
18
|
-
let { taskID } = config;
|
|
19
|
-
if (!taskID) {
|
|
20
|
-
taskID = await getTaskID(lc);
|
|
21
|
-
baseEnv['ZERO_TASK_ID'] = taskID;
|
|
22
|
-
}
|
|
16
|
+
const { serverVersion, port, changeStreamer: { port: changeStreamerPort = port + 1 }, } = config;
|
|
23
17
|
lc.info?.(`starting server${!serverVersion ? '' : `@${serverVersion}`} ` +
|
|
24
|
-
`protocolVersion=${PROTOCOL_VERSION}
|
|
18
|
+
`protocolVersion=${PROTOCOL_VERSION}`);
|
|
25
19
|
const multiMode = config.tenants.length;
|
|
26
20
|
if (!multiMode) {
|
|
27
21
|
config.tenants.push({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run-worker.js","sourceRoot":"","sources":["../../../../../../zero-cache/src/server/runner/run-worker.ts"],"names":[],"mappings":"AAAA,OAAO,yBAAyB,CAAC,CAAC,kCAAkC;AACpE,OAAO,EAAC,QAAQ,EAAgB,MAAM,oBAAoB,CAAC;AAC3D,OAAO,EAAC,MAAM,EAAC,MAAM,mCAAmC,CAAC;AACzD,OAAO,EAAC,YAAY,EAAC,MAAM,mCAAmC,CAAC;AAC/D,OAAO,EAAC,gBAAgB,EAAC,MAAM,mDAAmD,CAAC;AACnF,OAAO,EAAC,cAAc,EAAE,cAAc,EAAC,MAAM,8BAA8B,CAAC;AAC5E,OAAO,EAAC,WAAW,EAAc,MAAM,0BAA0B,CAAC;AAClE,OAAO,EAAC,gBAAgB,EAAC,MAAM,eAAe,CAAC;AAC/C,OAAO,EAAC,kBAAkB,EAAC,MAAM,aAAa,CAAC;AAC/C,OAAO,EAAC,
|
|
1
|
+
{"version":3,"file":"run-worker.js","sourceRoot":"","sources":["../../../../../../zero-cache/src/server/runner/run-worker.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"syncer.d.ts","sourceRoot":"","sources":["../../../../../zero-cache/src/server/syncer.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"syncer.d.ts","sourceRoot":"","sources":["../../../../../zero-cache/src/server/syncer.ts"],"names":[],"mappings":"AAoBA,OAAO,EAGL,KAAK,MAAM,EACZ,MAAM,uBAAuB,CAAC;AAY/B,MAAM,CAAC,OAAO,UAAU,SAAS,CAC/B,MAAM,EAAE,MAAM,EACd,GAAG,EAAE,MAAM,CAAC,UAAU,EACtB,GAAG,IAAI,EAAE,MAAM,EAAE,GAChB,OAAO,CAAC,IAAI,CAAC,CAwGf"}
|
|
@@ -1,18 +1,11 @@
|
|
|
1
|
-
import { OTLPTraceExporter } from '@opentelemetry/exporter-trace-otlp-http';
|
|
2
|
-
import { OTLPMetricExporter } from '@opentelemetry/exporter-metrics-otlp-http';
|
|
3
|
-
import { NodeSDK } from '@opentelemetry/sdk-node';
|
|
4
|
-
import { ATTR_SERVICE_NAME, ATTR_SERVICE_VERSION, } from '@opentelemetry/semantic-conventions';
|
|
5
1
|
import { tmpdir } from 'node:os';
|
|
6
2
|
import path from 'node:path';
|
|
7
3
|
import { pid } from 'node:process';
|
|
8
|
-
import { resourceFromAttributes } from '@opentelemetry/resources';
|
|
9
|
-
import { NoopSpanExporter } from "../../../otel/src/noop-span-exporter.js";
|
|
10
|
-
import { NoopMetricExporter } from "../../../otel/src/noop-metric-exporter.js";
|
|
11
|
-
import { version } from "../../../otel/src/version.js";
|
|
12
4
|
import { assert } from "../../../shared/src/asserts.js";
|
|
13
5
|
import { must } from "../../../shared/src/must.js";
|
|
14
6
|
import { randInt } from "../../../shared/src/rand.js";
|
|
15
7
|
import * as v from "../../../shared/src/valita.js";
|
|
8
|
+
import { assertNormalized } from "../config/normalize.js";
|
|
16
9
|
import { getZeroConfig } from "../config/zero-config.js";
|
|
17
10
|
import { warmupConnections } from "../db/warmup.js";
|
|
18
11
|
import { exitAfter, runUntilKilled } from "../services/life-cycle.js";
|
|
@@ -30,46 +23,15 @@ import { Subscription } from "../types/subscription.js";
|
|
|
30
23
|
import { replicaFileModeSchema, replicaFileName } from "../workers/replicator.js";
|
|
31
24
|
import { Syncer } from "../workers/syncer.js";
|
|
32
25
|
import { createLogContext } from "./logging.js";
|
|
33
|
-
import {
|
|
26
|
+
import { startOtel } from "./otel-start.js";
|
|
34
27
|
function randomID() {
|
|
35
28
|
return randInt(1, Number.MAX_SAFE_INTEGER).toString(36);
|
|
36
29
|
}
|
|
37
30
|
export default function runWorker(parent, env, ...args) {
|
|
38
31
|
const config = getZeroConfig(env, args.slice(1));
|
|
32
|
+
assertNormalized(config);
|
|
33
|
+
startOtel(config.log);
|
|
39
34
|
const lc = createLogContext(config, { worker: 'syncer' });
|
|
40
|
-
const { traceCollector } = config.log;
|
|
41
|
-
if (!traceCollector) {
|
|
42
|
-
lc.warn?.('trace collector not set');
|
|
43
|
-
}
|
|
44
|
-
else {
|
|
45
|
-
lc.debug?.(`trace collector: ${traceCollector}`);
|
|
46
|
-
}
|
|
47
|
-
const sdk = new NodeSDK({
|
|
48
|
-
resource: resourceFromAttributes({
|
|
49
|
-
[ATTR_SERVICE_NAME]: 'syncer',
|
|
50
|
-
[ATTR_SERVICE_VERSION]: version,
|
|
51
|
-
}),
|
|
52
|
-
traceExporter: config.log.traceCollector === undefined
|
|
53
|
-
? new NoopSpanExporter()
|
|
54
|
-
: new OTLPTraceExporter({
|
|
55
|
-
url: config.log.traceCollector,
|
|
56
|
-
}),
|
|
57
|
-
metricReader: new PeriodicExportingMetricReader({
|
|
58
|
-
exportIntervalMillis: 5000,
|
|
59
|
-
exporter: (() => {
|
|
60
|
-
if (config.log.metricCollector === undefined) {
|
|
61
|
-
if (process.env.NODE_ENV === 'dev') {
|
|
62
|
-
return new ConsoleMetricExporter();
|
|
63
|
-
}
|
|
64
|
-
return new NoopMetricExporter();
|
|
65
|
-
}
|
|
66
|
-
return new OTLPMetricExporter({
|
|
67
|
-
url: config.log.metricCollector,
|
|
68
|
-
});
|
|
69
|
-
})(),
|
|
70
|
-
}),
|
|
71
|
-
});
|
|
72
|
-
sdk.start();
|
|
73
35
|
assert(args.length > 0, `replicator mode not specified`);
|
|
74
36
|
const fileMode = v.parse(args[0], replicaFileModeSchema);
|
|
75
37
|
const { cvr, upstream } = config;
|
|
@@ -77,7 +39,7 @@ export default function runWorker(parent, env, ...args) {
|
|
|
77
39
|
assert(upstream.maxConnsPerWorker);
|
|
78
40
|
const replicaFile = replicaFileName(config.replica.file, fileMode);
|
|
79
41
|
lc.debug?.(`running view-syncer on ${replicaFile}`);
|
|
80
|
-
const cvrDB = pgClient(lc, cvr.db
|
|
42
|
+
const cvrDB = pgClient(lc, cvr.db, {
|
|
81
43
|
max: cvr.maxConnsPerWorker,
|
|
82
44
|
connection: { ['application_name']: `zero-sync-worker-${pid}-cvr` },
|
|
83
45
|
});
|
|
@@ -98,7 +60,7 @@ export default function runWorker(parent, env, ...args) {
|
|
|
98
60
|
.withContext('clientGroupID', id)
|
|
99
61
|
.withContext('instance', randomID());
|
|
100
62
|
lc.debug?.(`creating view syncer`);
|
|
101
|
-
return new ViewSyncerService(logger, shard,
|
|
63
|
+
return new ViewSyncerService(logger, shard, config.taskID, id, cvrDB, new PipelineDriver(logger, config.log, new Snapshotter(logger, replicaFile, shard), shard, operatorStorage.createClientGroupStorage(id), id), sub, drainCoordinator, config.log.slowHydrateThreshold, undefined, config.targetClientRowCount);
|
|
102
64
|
};
|
|
103
65
|
const mutagenFactory = (id) => new MutagenService(lc.withContext('component', 'mutagen').withContext('clientGroupID', id), shard, id, upstreamDB, config);
|
|
104
66
|
const pusherFactory = config.push.url === undefined
|