@rocicorp/zero 0.22.2025071101 → 0.22.2025072500
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/{chunk-4FQJO7OM.js → chunk-CPTFADYI.js} +26 -7
- package/out/{chunk-4FQJO7OM.js.map → chunk-CPTFADYI.js.map} +2 -2
- package/out/{chunk-INLOZBST.js → chunk-P5M53J4D.js} +2 -3
- package/out/{chunk-INLOZBST.js.map → chunk-P5M53J4D.js.map} +2 -2
- package/out/{chunk-5A6QECBY.js → chunk-ROYQ5GXF.js} +230 -137
- package/out/chunk-ROYQ5GXF.js.map +7 -0
- package/out/{inspector-HDOYOVMS.js → inspector-TFZBDN6K.js} +2 -2
- package/out/otel/src/enabled.d.ts +5 -0
- package/out/otel/src/enabled.d.ts.map +1 -0
- package/out/otel/src/enabled.js +16 -0
- package/out/otel/src/enabled.js.map +1 -0
- package/out/react.js +2 -2
- package/out/replicache/src/kv/idb-store.d.ts.map +1 -1
- package/out/shared/src/options.d.ts +4 -1
- package/out/shared/src/options.d.ts.map +1 -1
- package/out/shared/src/options.js +1 -1
- package/out/shared/src/options.js.map +1 -1
- package/out/solid.js +7 -3
- package/out/solid.js.map +1 -1
- package/out/zero/package.json +161 -0
- package/out/zero-cache/src/config/normalize.d.ts +1 -0
- package/out/zero-cache/src/config/normalize.d.ts.map +1 -1
- package/out/zero-cache/src/config/normalize.js +10 -1
- package/out/zero-cache/src/config/normalize.js.map +1 -1
- package/out/zero-cache/src/config/zero-config.d.ts +44 -6
- package/out/zero-cache/src/config/zero-config.d.ts.map +1 -1
- package/out/zero-cache/src/config/zero-config.js +48 -54
- package/out/zero-cache/src/config/zero-config.js.map +1 -1
- package/out/zero-cache/src/custom/fetch.d.ts +14 -1
- package/out/zero-cache/src/custom/fetch.d.ts.map +1 -1
- package/out/zero-cache/src/custom/fetch.js +56 -1
- package/out/zero-cache/src/custom/fetch.js.map +1 -1
- package/out/zero-cache/src/custom-queries/transform-query.d.ts +1 -1
- package/out/zero-cache/src/custom-queries/transform-query.d.ts.map +1 -1
- package/out/zero-cache/src/custom-queries/transform-query.js +2 -1
- package/out/zero-cache/src/custom-queries/transform-query.js.map +1 -1
- package/out/zero-cache/src/server/anonymous-otel-start.d.ts +9 -0
- package/out/zero-cache/src/server/anonymous-otel-start.d.ts.map +1 -0
- package/out/zero-cache/src/server/anonymous-otel-start.js +293 -0
- package/out/zero-cache/src/server/anonymous-otel-start.js.map +1 -0
- package/out/zero-cache/src/server/logging.d.ts.map +1 -1
- package/out/zero-cache/src/server/logging.js +3 -3
- 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 +1 -5
- package/out/zero-cache/src/server/main.js.map +1 -1
- package/out/zero-cache/src/server/otel-start.d.ts.map +1 -1
- package/out/zero-cache/src/server/otel-start.js +24 -18
- package/out/zero-cache/src/server/otel-start.js.map +1 -1
- package/out/zero-cache/src/server/runner/zero-dispatcher.d.ts.map +1 -1
- package/out/zero-cache/src/server/runner/zero-dispatcher.js +2 -2
- package/out/zero-cache/src/server/runner/zero-dispatcher.js.map +1 -1
- package/out/zero-cache/src/server/syncer.d.ts.map +1 -1
- package/out/zero-cache/src/server/syncer.js +7 -4
- package/out/zero-cache/src/server/syncer.js.map +1 -1
- package/out/zero-cache/src/server/worker-dispatcher.js +3 -3
- package/out/zero-cache/src/server/worker-dispatcher.js.map +1 -1
- package/out/zero-cache/src/services/change-source/pg/change-source.d.ts +0 -7
- package/out/zero-cache/src/services/change-source/pg/change-source.d.ts.map +1 -1
- package/out/zero-cache/src/services/change-source/pg/change-source.js +43 -32
- package/out/zero-cache/src/services/change-source/pg/change-source.js.map +1 -1
- package/out/zero-cache/src/services/change-source/pg/initial-sync.d.ts.map +1 -1
- package/out/zero-cache/src/services/change-source/pg/initial-sync.js +24 -12
- package/out/zero-cache/src/services/change-source/pg/initial-sync.js.map +1 -1
- package/out/zero-cache/src/services/change-source/pg/schema/init.d.ts.map +1 -1
- package/out/zero-cache/src/services/change-source/pg/schema/init.js +12 -1
- package/out/zero-cache/src/services/change-source/pg/schema/init.js.map +1 -1
- package/out/zero-cache/src/services/change-source/pg/schema/shard.d.ts +10 -0
- package/out/zero-cache/src/services/change-source/pg/schema/shard.d.ts.map +1 -1
- package/out/zero-cache/src/services/change-source/pg/schema/shard.js +21 -2
- package/out/zero-cache/src/services/change-source/pg/schema/shard.js.map +1 -1
- package/out/zero-cache/src/services/change-streamer/change-streamer-http.d.ts +1 -1
- 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 +4 -2
- package/out/zero-cache/src/services/change-streamer/change-streamer-http.js.map +1 -1
- package/out/zero-cache/src/services/litestream/commands.d.ts.map +1 -1
- package/out/zero-cache/src/services/litestream/commands.js +50 -23
- package/out/zero-cache/src/services/litestream/commands.js.map +1 -1
- package/out/zero-cache/src/services/mutagen/mutagen.d.ts.map +1 -1
- package/out/zero-cache/src/services/mutagen/mutagen.js +4 -0
- package/out/zero-cache/src/services/mutagen/mutagen.js.map +1 -1
- package/out/zero-cache/src/services/mutagen/pusher.d.ts +45 -6
- package/out/zero-cache/src/services/mutagen/pusher.d.ts.map +1 -1
- package/out/zero-cache/src/services/mutagen/pusher.js +22 -6
- package/out/zero-cache/src/services/mutagen/pusher.js.map +1 -1
- package/out/zero-cache/src/services/view-syncer/client-handler.d.ts.map +1 -1
- package/out/zero-cache/src/services/view-syncer/client-handler.js +28 -0
- package/out/zero-cache/src/services/view-syncer/client-handler.js.map +1 -1
- package/out/zero-cache/src/services/view-syncer/cvr-store.d.ts +11 -8
- package/out/zero-cache/src/services/view-syncer/cvr-store.d.ts.map +1 -1
- package/out/zero-cache/src/services/view-syncer/cvr-store.js +14 -13
- package/out/zero-cache/src/services/view-syncer/cvr-store.js.map +1 -1
- package/out/zero-cache/src/services/view-syncer/cvr.d.ts +9 -16
- package/out/zero-cache/src/services/view-syncer/cvr.d.ts.map +1 -1
- package/out/zero-cache/src/services/view-syncer/cvr.js +71 -28
- package/out/zero-cache/src/services/view-syncer/cvr.js.map +1 -1
- package/out/zero-cache/src/services/view-syncer/row-record-cache.d.ts.map +1 -1
- package/out/zero-cache/src/services/view-syncer/row-record-cache.js +3 -0
- package/out/zero-cache/src/services/view-syncer/row-record-cache.js.map +1 -1
- package/out/zero-cache/src/services/view-syncer/schema/cvr.d.ts +3 -2
- 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-cache/src/services/view-syncer/schema/types.d.ts +11 -11
- package/out/zero-cache/src/services/view-syncer/schema/types.d.ts.map +1 -1
- package/out/zero-cache/src/services/view-syncer/schema/types.js +3 -2
- package/out/zero-cache/src/services/view-syncer/schema/types.js.map +1 -1
- package/out/zero-cache/src/services/view-syncer/ttl-clock.d.ts +10 -0
- package/out/zero-cache/src/services/view-syncer/ttl-clock.d.ts.map +1 -0
- package/out/zero-cache/src/services/view-syncer/ttl-clock.js +9 -0
- package/out/zero-cache/src/services/view-syncer/ttl-clock.js.map +1 -0
- package/out/zero-cache/src/services/view-syncer/view-syncer.d.ts +14 -13
- package/out/zero-cache/src/services/view-syncer/view-syncer.d.ts.map +1 -1
- package/out/zero-cache/src/services/view-syncer/view-syncer.js +81 -124
- package/out/zero-cache/src/services/view-syncer/view-syncer.js.map +1 -1
- package/out/zero-cache/src/types/processes.d.ts +6 -6
- package/out/zero-cache/src/types/processes.d.ts.map +1 -1
- package/out/zero-cache/src/types/processes.js +2 -2
- package/out/zero-cache/src/types/processes.js.map +1 -1
- package/out/zero-cache/src/types/websocket-handoff.d.ts +2 -2
- package/out/zero-cache/src/types/websocket-handoff.d.ts.map +1 -1
- package/out/zero-cache/src/types/websocket-handoff.js +4 -4
- package/out/zero-cache/src/types/websocket-handoff.js.map +1 -1
- package/out/zero-cache/src/workers/connection.d.ts +1 -1
- package/out/zero-cache/src/workers/connection.d.ts.map +1 -1
- package/out/zero-cache/src/workers/connection.js +2 -0
- package/out/zero-cache/src/workers/connection.js.map +1 -1
- package/out/zero-cache/src/workers/syncer-ws-message-handler.d.ts.map +1 -1
- package/out/zero-cache/src/workers/syncer-ws-message-handler.js +6 -1
- package/out/zero-cache/src/workers/syncer-ws-message-handler.js.map +1 -1
- package/out/zero-cache/src/workers/syncer.d.ts.map +1 -1
- package/out/zero-cache/src/workers/syncer.js +3 -1
- package/out/zero-cache/src/workers/syncer.js.map +1 -1
- package/out/zero-client/src/client/active-clients-manager.d.ts.map +1 -1
- package/out/zero-client/src/client/mutation-tracker.d.ts +7 -2
- package/out/zero-client/src/client/mutation-tracker.d.ts.map +1 -1
- package/out/zero-client/src/client/options.d.ts +9 -4
- package/out/zero-client/src/client/options.d.ts.map +1 -1
- package/out/zero-client/src/client/query-manager.d.ts.map +1 -1
- package/out/zero-client/src/client/zero-poke-handler.d.ts +6 -2
- package/out/zero-client/src/client/zero-poke-handler.d.ts.map +1 -1
- package/out/zero-client/src/client/zero.d.ts +2 -2
- package/out/zero-client/src/client/zero.d.ts.map +1 -1
- package/out/zero-client/src/mod.d.ts +1 -1
- package/out/zero-client/src/mod.d.ts.map +1 -1
- package/out/zero-protocol/src/connect.d.ts +24 -2
- package/out/zero-protocol/src/connect.d.ts.map +1 -1
- package/out/zero-protocol/src/connect.js +17 -2
- package/out/zero-protocol/src/connect.js.map +1 -1
- package/out/zero-protocol/src/down.d.ts +18 -0
- package/out/zero-protocol/src/down.d.ts.map +1 -1
- package/out/zero-protocol/src/mutations-patch.d.ts +65 -0
- package/out/zero-protocol/src/mutations-patch.d.ts.map +1 -0
- package/out/zero-protocol/src/mutations-patch.js +16 -0
- package/out/zero-protocol/src/mutations-patch.js.map +1 -0
- package/out/zero-protocol/src/poke.d.ts +36 -0
- package/out/zero-protocol/src/poke.d.ts.map +1 -1
- package/out/zero-protocol/src/poke.js +3 -0
- package/out/zero-protocol/src/poke.js.map +1 -1
- package/out/zero-protocol/src/protocol-version.d.ts +1 -1
- package/out/zero-protocol/src/protocol-version.d.ts.map +1 -1
- package/out/zero-protocol/src/protocol-version.js +4 -1
- package/out/zero-protocol/src/protocol-version.js.map +1 -1
- package/out/zero-protocol/src/push.d.ts +8 -3
- package/out/zero-protocol/src/push.d.ts.map +1 -1
- package/out/zero-protocol/src/push.js +7 -3
- package/out/zero-protocol/src/push.js.map +1 -1
- package/out/zero-protocol/src/up.d.ts +9 -1
- package/out/zero-protocol/src/up.d.ts.map +1 -1
- package/out/zero-protocol/src/up.js +2 -2
- package/out/zero-protocol/src/up.js.map +1 -1
- package/out/zero-server/src/queries/process-queries.d.ts +1 -1
- package/out/zero-server/src/queries/process-queries.d.ts.map +1 -1
- package/out/zero-server/src/queries/process-queries.js +1 -1
- package/out/zero-server/src/queries/process-queries.js.map +1 -1
- package/out/zero-solid/src/mod.d.ts +2 -2
- package/out/zero-solid/src/mod.d.ts.map +1 -1
- package/out/zero.js +9 -7
- package/out/zql/src/query/named.d.ts +11 -11
- package/out/zql/src/query/named.d.ts.map +1 -1
- package/out/zql/src/query/named.js +20 -2
- package/out/zql/src/query/named.js.map +1 -1
- package/out/zql/src/query/query-impl.js +1 -1
- package/out/zql/src/query/query-impl.js.map +1 -1
- package/out/zql/src/query/query.d.ts +12 -3
- package/out/zql/src/query/query.d.ts.map +1 -1
- package/out/zql/src/query/query.js.map +1 -1
- package/package.json +2 -2
- package/out/chunk-5A6QECBY.js.map +0 -7
- /package/out/{inspector-HDOYOVMS.js.map → inspector-TFZBDN6K.js.map} +0 -0
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"anonymous-otel-start.js","sourceRoot":"","sources":["../../../../../zero-cache/src/server/anonymous-otel-start.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,MAAM,oBAAoB,CAAC;AAC9C,OAAO,EAAC,kBAAkB,EAAC,MAAM,2CAA2C,CAAC;AAC7E,OAAO,EAAC,6BAA6B,EAAC,MAAM,4BAA4B,CAAC;AACzE,OAAO,EAAC,aAAa,EAAC,MAAM,4BAA4B,CAAC;AACzD,OAAO,EAAC,sBAAsB,EAAC,MAAM,0BAA0B,CAAC;AAEhE,OAAO,EAAC,QAAQ,EAAC,MAAM,IAAI,CAAC;AAC5B,OAAO,EAAC,GAAG,EAAC,MAAM,6BAA6B,CAAC;AAEhD,OAAO,WAAW,MAAM,4BAA4B,CAAC,OAAM,IAAI,EAAE,MAAM,EAAC,CAAC;AACzE,OAAO,EAAC,aAAa,EAAkB,MAAM,0BAA0B,CAAC;AACxE,OAAO,EAAC,QAAQ,EAAC,MAAM,eAAe,CAAC;AACvC,OAAO,EAAC,UAAU,EAAC,MAAM,QAAQ,CAAC;AAClC,OAAO,EAAC,UAAU,EAAE,YAAY,EAAE,aAAa,EAAE,SAAS,EAAC,MAAM,IAAI,CAAC;AACtE,OAAO,EAAC,IAAI,EAAE,OAAO,EAAC,MAAM,MAAM,CAAC;AACnC,OAAO,EAAC,OAAO,EAAC,MAAM,IAAI,CAAC;AAE3B,MAAM,yBAAyB;IAC7B,MAAM,CAAC,SAAS,CAA4B;IAC5C,SAAS,GAAG,KAAK,CAAC;IAClB,QAAQ,GAAG,KAAK,CAAC;IACjB,MAAM,CAAS;IACf,cAAc,CAAiB;IAC/B,eAAe,GAAG,CAAC,CAAC;IACpB,gBAAgB,GAAG,CAAC,CAAC;IACrB,wBAAwB,GAAG,CAAC,CAAC;IAC7B,0BAA0B,GAAG,CAAC,CAAC;IAC/B,GAAG,CAAyB;IAC5B,OAAO,CAAyB;IAChC,UAAU,CAAS;IACnB,iBAAiB,CAAqC;IACtD,gBAAgB,GAAG,CAAC,CAAC;IAErB;QACE,IAAI,CAAC,UAAU,GAAG,UAAU,EAAE,CAAC;IACjC,CAAC;IAED,MAAM,CAAC,WAAW;QAChB,IAAI,CAAC,yBAAyB,CAAC,SAAS,EAAE,CAAC;YACzC,yBAAyB,CAAC,SAAS,GAAG,IAAI,yBAAyB,EAAE,CAAC;QACxE,CAAC;QACD,OAAO,yBAAyB,CAAC,SAAS,CAAC;IAC7C,CAAC;IAED,KAAK,CAAC,EAAe,EAAE,MAAmB;QACxC,IAAI,CAAC,GAAG,GAAG,EAAE,CAAC;QACd,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,IAAI,CAAC;gBACH,MAAM,GAAG,aAAa,EAAE,CAAC;YAC3B,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACX,IAAI,CAAC,GAAG,EAAE,IAAI,EAAE,CAAC,8CAA8C,EAAE,CAAC,CAAC,CAAC;gBACpE,OAAO;YACT,CAAC;QACH,CAAC;QAED,IAAI,OAAO,CAAC,GAAG,CAAC,YAAY,EAAE,CAAC;YAC7B,IAAI,CAAC,GAAG,EAAE,IAAI,EAAE,CACd,gEAAgE,CACjE,CAAC;YACF,OAAO;QACT,CAAC;QAED,IAAI,CAAC,MAAM,CAAC,eAAe,EAAE,CAAC;YAC5B,IAAI,CAAC,GAAG,EAAE,IAAI,EAAE,CAAC,gDAAgD,CAAC,CAAC;YACnE,OAAO;QACT,CAAC;QAED,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;YACnB,OAAO;QACT,CAAC;QAED,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC;QACtB,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;QACtB,IAAI,CAAC,gBAAgB,GAAG,MAAM,CAAC,cAAc,IAAI,CAAC,CAAC;QACnD,IAAI,CAAC,iBAAiB,GAAG,SAAS,CAAC;QAEnC,IAAI,CAAC,GAAG,EAAE,IAAI,EAAE,CAAC,iCAAiC,CAAC,CAAC;QAEpD,0EAA0E;QAC1E,UAAU,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,EAAE,KAAK,CAAC,CAAC;IACvC,CAAC;IAED,IAAI;QACF,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YAClB,OAAO;QACT,CAAC;QAED,MAAM,QAAQ,GAAG,sBAAsB,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC,CAAC;QAE/D,MAAM,YAAY,GAAG,IAAI,6BAA6B,CAAC;YACrD,oBAAoB,EAAE,KAAK,GAAG,IAAI,CAAC,gBAAgB;YACnD,QAAQ,EAAE,IAAI,kBAAkB,CAAC;gBAC/B,GAAG,EAAE,8BAA8B;aACpC,CAAC;SACH,CAAC,CAAC;QAEH,IAAI,CAAC,cAAc,GAAG,IAAI,aAAa,CAAC;YACtC,QAAQ;YACR,OAAO,EAAE,CAAC,YAAY,CAAC;SACxB,CAAC,CAAC;QACH,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,0BAA0B,CAAC,CAAC;QAEvE,IAAI,CAAC,aAAa,EAAE,CAAC;QACrB,IAAI,CAAC,GAAG,EAAE,IAAI,EAAE,CACd,qCAAqC,EAAE,GAAG,IAAI,CAAC,gBAAgB,gBAAgB,IAAI,CAAC,gBAAgB,gBAAgB,CACrH,CAAC;IACJ,CAAC;IAED,aAAa;QACX,oBAAoB;QACpB,MAAM,WAAW,GAAG,IAAI,CAAC,MAAM,CAAC,qBAAqB,CAAC,aAAa,EAAE;YACnE,WAAW,EAAE,0BAA0B;YACvC,IAAI,EAAE,SAAS;SAChB,CAAC,CAAC;QAEH,sBAAsB;QACtB,MAAM,aAAa,GAAG,IAAI,CAAC,MAAM,CAAC,uBAAuB,CACvD,qBAAqB,EACrB;YACE,WAAW,EAAE,0BAA0B;YACvC,IAAI,EAAE,SAAS;SAChB,CACF,CAAC;QACF,MAAM,gBAAgB,GAAG,IAAI,CAAC,MAAM,CAAC,uBAAuB,CAC1D,0BAA0B,EAC1B;YACE,WAAW,EAAE,qCAAqC;SACnD,CACF,CAAC;QACF,MAAM,iBAAiB,GAAG,IAAI,CAAC,MAAM,CAAC,uBAAuB,CAC3D,kBAAkB,EAClB;YACE,WAAW,EAAE,6BAA6B;SAC3C,CACF,CAAC;QAEF,sCAAsC;QACtC,MAAM,yBAAyB,GAAG,IAAI,CAAC,MAAM,CAAC,uBAAuB,CACnE,0BAA0B,EAC1B;YACE,WAAW,EAAE,wCAAwC;SACtD,CACF,CAAC;QAEF,MAAM,2BAA2B,GAAG,IAAI,CAAC,MAAM,CAAC,uBAAuB,CACrE,4BAA4B,EAC5B;YACE,WAAW,EAAE,uCAAuC;SACrD,CACF,CAAC;QAEF,YAAY;QACZ,MAAM,KAAK,GAAG,IAAI,CAAC,cAAc,EAAE,CAAC;QACpC,WAAW,CAAC,WAAW,CAAC,CAAC,MAAwB,EAAE,EAAE;YACnD,MAAM,aAAa,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;YACnD,MAAM,CAAC,OAAO,CAAC,aAAa,EAAE,KAAK,CAAC,CAAC;YACrC,IAAI,CAAC,GAAG,EAAE,KAAK,EAAE,CAAC,qBAAqB,aAAa,GAAG,CAAC,CAAC;QAC3D,CAAC,CAAC,CAAC;QACH,aAAa,CAAC,WAAW,CAAC,CAAC,MAAwB,EAAE,EAAE;YACrD,MAAM,aAAa,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;YACnD,MAAM,CAAC,OAAO,CAAC,aAAa,EAAE,KAAK,CAAC,CAAC;YACrC,IAAI,CAAC,GAAG,EAAE,KAAK,EAAE,CAAC,6BAA6B,aAAa,GAAG,CAAC,CAAC;QACnE,CAAC,CAAC,CAAC;QACH,gBAAgB,CAAC,WAAW,CAAC,CAAC,MAAwB,EAAE,EAAE;YACxD,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,eAAe,EAAE,KAAK,CAAC,CAAC;YAC5C,IAAI,CAAC,GAAG,EAAE,KAAK,EAAE,CAAC,wBAAwB,IAAI,CAAC,eAAe,EAAE,CAAC,CAAC;QACpE,CAAC,CAAC,CAAC;QACH,iBAAiB,CAAC,WAAW,CAAC,CAAC,MAAwB,EAAE,EAAE;YACzD,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,gBAAgB,EAAE,KAAK,CAAC,CAAC;YAC7C,IAAI,CAAC,GAAG,EAAE,KAAK,EAAE,CAAC,0BAA0B,IAAI,CAAC,gBAAgB,EAAE,CAAC,CAAC;QACvE,CAAC,CAAC,CAAC;QACH,yBAAyB,CAAC,WAAW,CAAC,CAAC,MAAwB,EAAE,EAAE;YACjE,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,wBAAwB,EAAE,KAAK,CAAC,CAAC;YACrD,IAAI,CAAC,GAAG,EAAE,KAAK,EAAE,CACf,kCAAkC,IAAI,CAAC,wBAAwB,EAAE,CAClE,CAAC;QACJ,CAAC,CAAC,CAAC;QACH,2BAA2B,CAAC,WAAW,CAAC,CAAC,MAAwB,EAAE,EAAE;YACnE,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,0BAA0B,EAAE,KAAK,CAAC,CAAC;YACvD,IAAI,CAAC,GAAG,EAAE,KAAK,EAAE,CACf,oCAAoC,IAAI,CAAC,0BAA0B,EAAE,CACtE,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,CAAC;IAED,cAAc,CAAC,KAAK,GAAG,CAAC;QACtB,IAAI,CAAC,eAAe,IAAI,KAAK,CAAC;IAChC,CAAC;IAED,gBAAgB,CAAC,KAAa;QAC5B,IAAI,CAAC,gBAAgB,IAAI,KAAK,CAAC;IACjC,CAAC;IAED,uBAAuB;QACrB,IAAI,CAAC,wBAAwB,EAAE,CAAC;IAClC,CAAC;IAED,yBAAyB;QACvB,IAAI,CAAC,0BAA0B,EAAE,CAAC;IACpC,CAAC;IAED,QAAQ;QACN,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;QACrB,IAAI,IAAI,CAAC,cAAc,EAAE,CAAC;YACxB,IAAI,CAAC,GAAG,EAAE,IAAI,EAAE,CAAC,0BAA0B,CAAC,CAAC;YAC7C,KAAK,IAAI,CAAC,cAAc,CAAC,QAAQ,EAAE,CAAC;QACtC,CAAC;IACH,CAAC;IAED,cAAc;QACZ,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,CAAC;YAC5B,IAAI,CAAC,iBAAiB,GAAG;gBACvB,aAAa,EAAE,GAAG,CAAC,IAAI,CAAC,OAAO,EAAE,QAAQ,CAAC,EAAE,IAAI,SAAS,CAAC,CAAC,QAAQ,EAAE;gBACrE,iBAAiB,EAAE,QAAQ,EAAE;gBAC7B,qBAAqB,EAAE,WAAW;gBAClC,qBAAqB,EAAE,IAAI,CAAC,YAAY,EAAE;gBAC1C,cAAc,EAAE,IAAI,CAAC,OAAO,EAAE,aAAa,IAAI,WAAW,CAAC,OAAO;gBAClE,cAAc,EAAE,IAAI,CAAC,OAAO,EAAE,MAAM,IAAI,SAAS;gBACjD,iBAAiB,EAAE,IAAI,CAAC,gBAAgB,EAAE;gBAC1C,iBAAiB,EAAE,IAAI,CAAC,UAAU;gBAClC,YAAY,EAAE,IAAI,CAAC,aAAa,EAAE;aACnC,CAAC;YACF,IAAI,CAAC,GAAG,EAAE,KAAK,EAAE,CACf,gCAAgC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,iBAAiB,CAAC,EAAE,CACzE,CAAC;QACJ,CAAC;QACD,OAAO,IAAI,CAAC,iBAAiB,CAAC;IAChC,CAAC;IAED,YAAY;QACV,IAAI,OAAO,CAAC,GAAG,CAAC,YAAY,IAAI,OAAO,CAAC,GAAG,CAAC,UAAU;YAAE,OAAO,QAAQ,CAAC;QACxE,IACE,OAAO,CAAC,GAAG,CAAC,6BAA6B;YACzC,OAAO,CAAC,GAAG,CAAC,0BAA0B;YACtC,OAAO,CAAC,GAAG,CAAC,iBAAiB;YAE7B,OAAO,KAAK,CAAC;QACf,IAAI,OAAO,CAAC,GAAG,CAAC,WAAW,IAAI,OAAO,CAAC,GAAG,CAAC,kBAAkB;YAC3D,OAAO,SAAS,CAAC;QACnB,IAAI,OAAO,CAAC,GAAG,CAAC,MAAM,IAAI,OAAO,CAAC,GAAG,CAAC,iBAAiB;YAAE,OAAO,QAAQ,CAAC;QACzE,IACE,OAAO,CAAC,GAAG,CAAC,WAAW;YACvB,OAAO,CAAC,GAAG,CAAC,cAAc;YAC1B,OAAO,CAAC,GAAG,CAAC,oBAAoB;YAEhC,OAAO,KAAK,CAAC;QACf,IAAI,OAAO,CAAC,GAAG,CAAC,WAAW,IAAI,OAAO,CAAC,GAAG,CAAC,sBAAsB;YAC/D,OAAO,SAAS,CAAC;QAEnB,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,OAAO,CAAC,QAAgB,EAAE,MAAc;QACtC,IAAI,GAAG,GAAG,QAAQ,CAAC;QACnB,OAAO,GAAG,KAAK,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;YAC5B,IAAI,UAAU,CAAC,IAAI,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;gBAAE,OAAO,GAAG,CAAC;YAC9C,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;QACrB,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAED,gBAAgB;QACd,IAAI,CAAC;YACH,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;YAC1B,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;YAC1C,IAAI,CAAC,OAAO,EAAE,CAAC;gBACb,OAAO,SAAS,CAAC;YACnB,CAAC;YAED,MAAM,cAAc,GAAG,QAAQ,CAAC,sCAAsC,EAAE;gBACtE,GAAG,EAAE,OAAO;gBACZ,QAAQ,EAAE,MAAM;gBAChB,OAAO,EAAE,IAAI;gBACb,KAAK,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,kBAAkB;aACxD,CAAC,CAAC,IAAI,EAAE,CAAC;YAEV,OAAO,cAAc,CAAC,MAAM,KAAK,EAAE,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,SAAS,CAAC;QACnE,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,CAAC,GAAG,EAAE,KAAK,EAAE,CAAC,2CAA2C,EAAE,KAAK,CAAC,CAAC;YACtE,OAAO,SAAS,CAAC;QACnB,CAAC;IACH,CAAC;IAED,aAAa;QACX,IAAI,CAAC;YACH,IAAI,IAAI,CAAC,cAAc,EAAE,EAAE,CAAC;gBAC1B,OAAO,WAAW,CAAC;YACrB,CAAC;YACD,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,EAAE,EAAE,WAAW,EAAE,MAAM,CAAC,CAAC;YACtD,MAAM,OAAO,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;YAElC,SAAS,CAAC,OAAO,EAAE,EAAC,SAAS,EAAE,IAAI,EAAC,CAAC,CAAC;YAEtC,8EAA8E;YAC9E,MAAM,KAAK,GAAG,UAAU,EAAE,CAAC;YAC3B,IAAI,CAAC;gBACH,aAAa,CAAC,QAAQ,EAAE,KAAK,EAAE,EAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,EAAC,CAAC,CAAC;gBAC/D,OAAO,KAAK,CAAC;YACf,CAAC;YAAC,OAAO,UAAU,EAAE,CAAC;gBACpB,IAAK,UAAoC,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;oBAC5D,MAAM,UAAU,GAAG,YAAY,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC;oBACzD,OAAO,UAAU,CAAC;gBACpB,CAAC;gBACD,MAAM,UAAU,CAAC;YACnB,CAAC;QACH,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,CAAC,GAAG,EAAE,KAAK,EAAE,CACf,gDAAgD,EAChD,KAAK,CACN,CAAC;YACF,OAAO,SAAS,CAAC;QACnB,CAAC;IACH,CAAC;IAED,cAAc;QACZ,IAAI,CAAC;YACH,IAAI,OAAO,CAAC,GAAG,CAAC,iBAAiB,EAAE,CAAC;gBAClC,OAAO,IAAI,CAAC;YACd,CAAC;YAED,IAAI,UAAU,CAAC,aAAa,CAAC,EAAE,CAAC;gBAC9B,OAAO,IAAI,CAAC;YACd,CAAC;YAED,IAAI,UAAU,CAAC,qCAAqC,CAAC,EAAE,CAAC;gBACtD,OAAO,IAAI,CAAC;YACd,CAAC;YAED,IAAI,OAAO,CAAC,GAAG,CAAC,uBAAuB,EAAE,CAAC;gBACxC,OAAO,IAAI,CAAC;YACd,CAAC;YAED,IACE,OAAO,CAAC,GAAG,CAAC,mBAAmB;gBAC/B,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,KAAK,CAAC,gBAAgB,CAAC,EAC7C,CAAC;gBACD,OAAO,IAAI,CAAC;YACd,CAAC;YAED,IAAI,UAAU,CAAC,gBAAgB,CAAC,EAAE,CAAC;gBACjC,MAAM,MAAM,GAAG,YAAY,CAAC,gBAAgB,EAAE,MAAM,CAAC,CAAC;gBACtD,IACE,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC;oBACzB,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC;oBAC3B,MAAM,CAAC,QAAQ,CAAC,YAAY,CAAC,EAC7B,CAAC;oBACD,OAAO,IAAI,CAAC;gBACd,CAAC;YACH,CAAC;YAED,OAAO,KAAK,CAAC;QACf,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,CAAC,GAAG,EAAE,KAAK,EAAE,CACf,oDAAoD,EACpD,KAAK,CACN,CAAC;YACF,OAAO,KAAK,CAAC;QACf,CAAC;IACH,CAAC;CACF;AAED,MAAM,OAAO,GAAG,GAAG,EAAE,CAAC,yBAAyB,CAAC,WAAW,EAAE,CAAC;AAE9D,MAAM,CAAC,MAAM,uBAAuB,GAAG,CAAC,EAAe,EAAE,MAAmB,EAAE,EAAE,CAC9E,OAAO,EAAE,CAAC,KAAK,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC;AAC9B,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,KAAK,GAAG,CAAC,EAAE,EAAE,CAAC,OAAO,EAAE,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;AAC7E,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,KAAa,EAAE,EAAE,CAChD,OAAO,EAAE,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC;AACpC,MAAM,CAAC,MAAM,uBAAuB,GAAG,GAAG,EAAE,CAC1C,OAAO,EAAE,CAAC,uBAAuB,EAAE,CAAC;AACtC,MAAM,CAAC,MAAM,yBAAyB,GAAG,GAAG,EAAE,CAC5C,OAAO,EAAE,CAAC,yBAAyB,EAAE,CAAC;AACxC,MAAM,CAAC,MAAM,0BAA0B,GAAG,GAAG,EAAE,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logging.d.ts","sourceRoot":"","sources":["../../../../../zero-cache/src/server/logging.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EAIX,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"logging.d.ts","sourceRoot":"","sources":["../../../../../zero-cache/src/server/logging.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EAIX,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EAGL,KAAK,SAAS,EACf,MAAM,gCAAgC,CAAC;AAGxC,wBAAgB,gBAAgB,CAC9B,EAAC,GAAG,EAAC,EAAE;IAAC,GAAG,EAAE,SAAS,CAAA;CAAC,EACvB,OAAO,EAAE;IAAC,MAAM,EAAE,MAAM,CAAA;CAAC,GACxB,UAAU,CAEZ"}
|
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
import { LogContext, } from '@rocicorp/logger';
|
|
2
|
-
import {
|
|
2
|
+
import { otelLogsEnabled } from "../../../otel/src/enabled.js";
|
|
3
|
+
import { createLogContext as createLogContextShared, getLogSink, } from "../../../shared/src/logging.js";
|
|
3
4
|
import { OtelLogSink } from "./otel-log-sink.js";
|
|
4
|
-
import { getLogSink } from "../../../shared/src/logging.js";
|
|
5
5
|
export function createLogContext({ log }, context) {
|
|
6
6
|
return createLogContextShared({ log }, context, createLogSink(log));
|
|
7
7
|
}
|
|
8
8
|
function createLogSink(config) {
|
|
9
9
|
const sink = getLogSink(config);
|
|
10
|
-
if (
|
|
10
|
+
if (otelLogsEnabled()) {
|
|
11
11
|
const otelSink = new OtelLogSink();
|
|
12
12
|
return new CompositeLogSink([otelSink, sink]);
|
|
13
13
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logging.js","sourceRoot":"","sources":["../../../../../zero-cache/src/server/logging.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,GAIX,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAC,
|
|
1
|
+
{"version":3,"file":"logging.js","sourceRoot":"","sources":["../../../../../zero-cache/src/server/logging.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,GAIX,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAC,eAAe,EAAC,MAAM,8BAA8B,CAAC;AAC7D,OAAO,EACL,gBAAgB,IAAI,sBAAsB,EAC1C,UAAU,GAEX,MAAM,gCAAgC,CAAC;AACxC,OAAO,EAAC,WAAW,EAAC,MAAM,oBAAoB,CAAC;AAE/C,MAAM,UAAU,gBAAgB,CAC9B,EAAC,GAAG,EAAmB,EACvB,OAAyB;IAEzB,OAAO,sBAAsB,CAAC,EAAC,GAAG,EAAC,EAAE,OAAO,EAAE,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC;AACpE,CAAC;AAED,SAAS,aAAa,CAAC,MAAiB;IACtC,MAAM,IAAI,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC;IAChC,IAAI,eAAe,EAAE,EAAE,CAAC;QACtB,MAAM,QAAQ,GAAG,IAAI,WAAW,EAAE,CAAC;QACnC,OAAO,IAAI,gBAAgB,CAAC,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC,CAAC;IAChD,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,MAAM,gBAAgB;IACX,MAAM,CAAY;IAE3B,YAAY,KAAgB;QAC1B,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC;IACtB,CAAC;IAED,GAAG,CAAC,KAAe,EAAE,OAA4B,EAAE,GAAG,IAAe;QACnE,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;YAC/B,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC,CAAC;QACpC,CAAC;IACH,CAAC;CACF"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../../../../../zero-cache/src/server/main.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../../../../../zero-cache/src/server/main.ts"],"names":[],"mappings":"AAiBA,OAAO,EAIL,KAAK,MAAM,EACZ,MAAM,uBAAuB,CAAC;AAa/B,wBAA8B,SAAS,CACrC,MAAM,EAAE,MAAM,EACd,GAAG,EAAE,MAAM,CAAC,UAAU,GACrB,OAAO,CAAC,IAAI,CAAC,CA8Kf"}
|
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
import { resolver } from '@rocicorp/resolver';
|
|
2
|
-
import { availableParallelism } from 'node:os';
|
|
3
2
|
import path from 'node:path';
|
|
4
3
|
import { must } from "../../../shared/src/must.js";
|
|
5
4
|
import { assertNormalized } from "../config/normalize.js";
|
|
@@ -20,10 +19,7 @@ export default async function runWorker(parent, env) {
|
|
|
20
19
|
assertNormalized(config);
|
|
21
20
|
const lc = createLogContext(config, { worker: 'dispatcher' });
|
|
22
21
|
const processes = new ProcessManager(lc, parent);
|
|
23
|
-
const numSyncers = config
|
|
24
|
-
? config.numSyncWorkers
|
|
25
|
-
: // Reserve 1 core for the replicator. The change-streamer is not CPU heavy.
|
|
26
|
-
Math.max(1, availableParallelism() - 1);
|
|
22
|
+
const { numSyncWorkers: numSyncers } = config;
|
|
27
23
|
if (config.upstream.maxConns < numSyncers) {
|
|
28
24
|
throw new Error(`Insufficient upstream connections (${config.upstream.maxConns}) for ${numSyncers} syncers.` +
|
|
29
25
|
`Increase ZERO_UPSTREAM_MAX_CONNS or decrease ZERO_NUM_SYNC_WORKERS (which defaults to available cores).`);
|
|
@@ -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,
|
|
1
|
+
{"version":3,"file":"main.js","sourceRoot":"","sources":["../../../../../zero-cache/src/server/main.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"otel-start.d.ts","sourceRoot":"","sources":["../../../../../zero-cache/src/server/otel-start.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"otel-start.d.ts","sourceRoot":"","sources":["../../../../../zero-cache/src/server/otel-start.ts"],"names":[],"mappings":"AAgHA,eAAO,MAAM,aAAa,YAAkD,CAAC"}
|
|
@@ -1,14 +1,14 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import
|
|
1
|
+
import { logs } from '@opentelemetry/api-logs';
|
|
2
|
+
import * as autoInstrumentationsModule from '@opentelemetry/auto-instrumentations-node';
|
|
3
3
|
import { OTLPLogExporter } from '@opentelemetry/exporter-logs-otlp-http';
|
|
4
|
+
import { OTLPMetricExporter } from '@opentelemetry/exporter-metrics-otlp-http';
|
|
5
|
+
import { OTLPTraceExporter } from '@opentelemetry/exporter-trace-otlp-http';
|
|
6
|
+
import { defaultResource, detectResources, envDetector, hostDetector, processDetector, resourceFromAttributes, } from '@opentelemetry/resources';
|
|
7
|
+
import { BatchLogRecordProcessor, LoggerProvider, } from '@opentelemetry/sdk-logs';
|
|
8
|
+
import { PeriodicExportingMetricReader } from '@opentelemetry/sdk-metrics';
|
|
4
9
|
import { NodeSDK } from '@opentelemetry/sdk-node';
|
|
5
|
-
import { detectResources, envDetector, processDetector, hostDetector, resourceFromAttributes, defaultResource, } from '@opentelemetry/resources';
|
|
6
10
|
import { ATTR_SERVICE_VERSION } from '@opentelemetry/semantic-conventions';
|
|
7
|
-
import {
|
|
8
|
-
import { version } from "../../../otel/src/version.js";
|
|
9
|
-
import { BatchLogRecordProcessor, LoggerProvider, } from '@opentelemetry/sdk-logs';
|
|
10
|
-
import { logs } from '@opentelemetry/api-logs';
|
|
11
|
-
import * as autoInstrumentationsModule from '@opentelemetry/auto-instrumentations-node';
|
|
11
|
+
import { otelEnabled, otelLogsEnabled, otelMetricsEnabled, otelTracesEnabled, } from "../../../otel/src/enabled.js";
|
|
12
12
|
class OtelManager {
|
|
13
13
|
static #instance;
|
|
14
14
|
#started = false;
|
|
@@ -21,7 +21,7 @@ class OtelManager {
|
|
|
21
21
|
return OtelManager.#instance;
|
|
22
22
|
}
|
|
23
23
|
startOtelAuto() {
|
|
24
|
-
if (this.#started || !
|
|
24
|
+
if (this.#started || !otelEnabled()) {
|
|
25
25
|
return;
|
|
26
26
|
}
|
|
27
27
|
this.#started = true;
|
|
@@ -35,15 +35,17 @@ class OtelManager {
|
|
|
35
35
|
detectors: [envDetector, processDetector, hostDetector],
|
|
36
36
|
});
|
|
37
37
|
const customResource = resourceFromAttributes({
|
|
38
|
-
[ATTR_SERVICE_VERSION]:
|
|
38
|
+
[ATTR_SERVICE_VERSION]: process.env.ZERO_SERVER_VERSION ?? 'unknown',
|
|
39
39
|
});
|
|
40
40
|
const resource = defaultResource().merge(envResource).merge(customResource);
|
|
41
41
|
// Initialize logger provider if not already set
|
|
42
42
|
if (!logs.getLoggerProvider()) {
|
|
43
43
|
const provider = new LoggerProvider({ resource });
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
44
|
+
if (otelLogsEnabled()) {
|
|
45
|
+
const processor = new BatchLogRecordProcessor(new OTLPLogExporter());
|
|
46
|
+
logRecordProcessors.push(processor);
|
|
47
|
+
provider.addLogRecordProcessor(processor);
|
|
48
|
+
}
|
|
47
49
|
logs.setGlobalLoggerProvider(provider);
|
|
48
50
|
}
|
|
49
51
|
const logger = logs.getLogger('zero-cache');
|
|
@@ -58,11 +60,15 @@ class OtelManager {
|
|
|
58
60
|
instrumentations: this.#autoInstrumentations
|
|
59
61
|
? [this.#autoInstrumentations]
|
|
60
62
|
: [],
|
|
61
|
-
traceExporter: new OTLPTraceExporter(),
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
63
|
+
...(otelTracesEnabled() ? { traceExporter: new OTLPTraceExporter() } : {}),
|
|
64
|
+
...(otelMetricsEnabled()
|
|
65
|
+
? {
|
|
66
|
+
metricReader: new PeriodicExportingMetricReader({
|
|
67
|
+
exportIntervalMillis: 60000,
|
|
68
|
+
exporter: new OTLPMetricExporter(),
|
|
69
|
+
}),
|
|
70
|
+
}
|
|
71
|
+
: {}),
|
|
66
72
|
logRecordProcessors,
|
|
67
73
|
});
|
|
68
74
|
// Start SDK: will deploy Trace, Metrics, and Logs pipelines as per env vars
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"otel-start.js","sourceRoot":"","sources":["../../../../../zero-cache/src/server/otel-start.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,
|
|
1
|
+
{"version":3,"file":"otel-start.js","sourceRoot":"","sources":["../../../../../zero-cache/src/server/otel-start.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"zero-dispatcher.d.ts","sourceRoot":"","sources":["../../../../../../zero-cache/src/server/runner/zero-dispatcher.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AACjD,OAAO,KAAK,EAAC,oBAAoB,EAAC,MAAM,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"zero-dispatcher.d.ts","sourceRoot":"","sources":["../../../../../../zero-cache/src/server/runner/zero-dispatcher.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AACjD,OAAO,KAAK,EAAC,oBAAoB,EAAC,MAAM,2BAA2B,CAAC;AAEpE,OAAO,EAAC,WAAW,EAAE,KAAK,OAAO,EAAC,MAAM,gCAAgC,CAAC;AAGzE,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,0BAA0B,CAAC;AAMrD,qBAAa,cAAe,SAAQ,WAAW;;IAC7C,QAAQ,CAAC,EAAE,qBAAqB;gBAI9B,MAAM,EAAE,oBAAoB,EAC5B,EAAE,EAAE,UAAU,EACd,IAAI,EAAE,OAAO,EACb,SAAS,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC;CAwBnC"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
|
+
import { handleHeapzRequest } from "../../services/heapz.js";
|
|
1
2
|
import { HttpService } from "../../services/http-service.js";
|
|
2
3
|
import { handleStatzRequest } from "../../services/statz.js";
|
|
3
4
|
import { installWebSocketHandoff, } from "../../types/websocket-handoff.js";
|
|
4
|
-
import { handleHeapzRequest } from "../../services/heapz.js";
|
|
5
5
|
export class ZeroDispatcher extends HttpService {
|
|
6
6
|
id = 'zero-dispatcher';
|
|
7
7
|
#getWorker;
|
|
@@ -14,7 +14,7 @@ export class ZeroDispatcher extends HttpService {
|
|
|
14
14
|
this.#getWorker = getWorker;
|
|
15
15
|
}
|
|
16
16
|
#handoff = (_req, dispatch, onError) => {
|
|
17
|
-
void this.#getWorker().then(
|
|
17
|
+
void this.#getWorker().then(sender => dispatch({ payload: 'unused', sender }), onError);
|
|
18
18
|
};
|
|
19
19
|
}
|
|
20
20
|
//# sourceMappingURL=zero-dispatcher.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"zero-dispatcher.js","sourceRoot":"","sources":["../../../../../../zero-cache/src/server/runner/zero-dispatcher.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,WAAW,EAAe,MAAM,gCAAgC,CAAC;AACzE,OAAO,EAAC,kBAAkB,EAAC,MAAM,yBAAyB,CAAC;AAG3D,OAAO,EACL,uBAAuB,GAExB,MAAM,kCAAkC,CAAC;
|
|
1
|
+
{"version":3,"file":"zero-dispatcher.js","sourceRoot":"","sources":["../../../../../../zero-cache/src/server/runner/zero-dispatcher.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,kBAAkB,EAAC,MAAM,yBAAyB,CAAC;AAC3D,OAAO,EAAC,WAAW,EAAe,MAAM,gCAAgC,CAAC;AACzE,OAAO,EAAC,kBAAkB,EAAC,MAAM,yBAAyB,CAAC;AAG3D,OAAO,EACL,uBAAuB,GAExB,MAAM,kCAAkC,CAAC;AAE1C,MAAM,OAAO,cAAe,SAAQ,WAAW;IACpC,EAAE,GAAG,iBAAiB,CAAC;IACvB,UAAU,CAAwB;IAE3C,YACE,MAA4B,EAC5B,EAAc,EACd,IAAa,EACb,SAAgC;QAEhC,KAAK,CAAC,iBAAiB,EAAE,EAAE,EAAE,IAAI,EAAE,OAAO,CAAC,EAAE;YAC3C,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,CACjC,kBAAkB,CAAC,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,CAAC,CACzC,CAAC;YACF,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,CACjC,kBAAkB,CAAC,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,CAAC,CACzC,CAAC;YACF,uBAAuB,CAAC,EAAE,EAAE,IAAI,CAAC,QAAQ,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;QAC7D,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,UAAU,GAAG,SAAS,CAAC;IAC9B,CAAC;IAEQ,QAAQ,GAAG,CAClB,IAA2B,EAC3B,QAA0C,EAC1C,OAAiC,EACjC,EAAE;QACF,KAAK,IAAI,CAAC,UAAU,EAAE,CAAC,IAAI,CACzB,MAAM,CAAC,EAAE,CAAC,QAAQ,CAAC,EAAC,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAC,CAAC,EAC/C,OAAO,CACR,CAAC;IACJ,CAAC,CAAC;CACH"}
|
|
@@ -1 +1 @@
|
|
|
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;
|
|
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;AAa/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,CAiHf"}
|
|
@@ -22,6 +22,7 @@ import { getShardID } from "../types/shards.js";
|
|
|
22
22
|
import { Subscription } from "../types/subscription.js";
|
|
23
23
|
import { replicaFileModeSchema, replicaFileName } from "../workers/replicator.js";
|
|
24
24
|
import { Syncer } from "../workers/syncer.js";
|
|
25
|
+
import { startAnonymousTelemetry } from "./anonymous-otel-start.js";
|
|
25
26
|
import { createLogContext } from "./logging.js";
|
|
26
27
|
import { startOtelAuto } from "./otel-start.js";
|
|
27
28
|
function randomID() {
|
|
@@ -60,16 +61,18 @@ export default function runWorker(parent, env, ...args) {
|
|
|
60
61
|
.withContext('clientGroupID', id)
|
|
61
62
|
.withContext('instance', randomID());
|
|
62
63
|
lc.debug?.(`creating view syncer`);
|
|
63
|
-
return new ViewSyncerService(config.
|
|
64
|
+
return new ViewSyncerService(config.query, 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);
|
|
64
65
|
};
|
|
65
66
|
const mutagenFactory = (id) => new MutagenService(lc.withContext('component', 'mutagen').withContext('clientGroupID', id), shard, id, upstreamDB, config);
|
|
66
|
-
const pusherFactory = config.push.url === undefined
|
|
67
|
+
const pusherFactory = config.push.url === undefined && config.mutate.url === undefined
|
|
67
68
|
? undefined
|
|
68
|
-
: (id) => new PusherService(config, {
|
|
69
|
+
: (id) => new PusherService(upstreamDB, config, {
|
|
69
70
|
...config.push,
|
|
70
|
-
|
|
71
|
+
...config.mutate,
|
|
72
|
+
url: must(config.push.url ?? config.mutate.url, 'No push or mutate URL configured'),
|
|
71
73
|
}, lc.withContext('clientGroupID', id), id);
|
|
72
74
|
const syncer = new Syncer(lc, config, viewSyncerFactory, mutagenFactory, pusherFactory, parent);
|
|
75
|
+
startAnonymousTelemetry(lc, config);
|
|
73
76
|
void dbWarmup.then(() => parent.send(['ready', { ready: true }]));
|
|
74
77
|
return runUntilKilled(lc, parent, syncer);
|
|
75
78
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"syncer.js","sourceRoot":"","sources":["../../../../../zero-cache/src/server/syncer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,MAAM,EAAC,MAAM,SAAS,CAAC;AAC/B,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,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,EAAC,OAAO,EAAC,MAAM,6BAA6B,CAAC;AACpD,OAAO,KAAK,CAAC,MAAM,+BAA+B,CAAC;AACnD,OAAO,EAAC,gBAAgB,EAAC,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAC,aAAa,EAAC,MAAM,0BAA0B,CAAC;AACvD,OAAO,EAAC,iBAAiB,EAAC,MAAM,iBAAiB,CAAC;AAClD,OAAO,EAAC,SAAS,EAAE,cAAc,EAAC,MAAM,2BAA2B,CAAC;AACpE,OAAO,EAAC,cAAc,EAAC,MAAM,gCAAgC,CAAC;AAC9D,OAAO,EAAC,aAAa,EAAC,MAAM,+BAA+B,CAAC;AAE5D,OAAO,EAAC,eAAe,EAAC,MAAM,6CAA6C,CAAC;AAC5E,OAAO,EAAC,gBAAgB,EAAC,MAAM,8CAA8C,CAAC;AAC9E,OAAO,EAAC,cAAc,EAAC,MAAM,4CAA4C,CAAC;AAC1E,OAAO,EAAC,WAAW,EAAC,MAAM,wCAAwC,CAAC;AACnE,OAAO,EAAC,iBAAiB,EAAC,MAAM,wCAAwC,CAAC;AACzE,OAAO,EAAC,QAAQ,EAAC,MAAM,gBAAgB,CAAC;AACxC,OAAO,EACL,YAAY,EACZ,iBAAiB,GAElB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAC,UAAU,EAAC,MAAM,oBAAoB,CAAC;AAC9C,OAAO,EAAC,YAAY,EAAC,MAAM,0BAA0B,CAAC;AACtD,OAAO,EAAC,qBAAqB,EAAE,eAAe,EAAC,MAAM,0BAA0B,CAAC;AAChF,OAAO,EAAC,MAAM,EAAC,MAAM,sBAAsB,CAAC;AAC5C,OAAO,EAAC,gBAAgB,EAAC,MAAM,cAAc,CAAC;AAC9C,OAAO,EAAC,aAAa,EAAC,MAAM,iBAAiB,CAAC;AAE9C,SAAS,QAAQ;IACf,OAAO,OAAO,CAAC,CAAC,EAAE,MAAM,CAAC,gBAAgB,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;AAC1D,CAAC;AAED,MAAM,CAAC,OAAO,UAAU,SAAS,CAC/B,MAAc,EACd,GAAsB,EACtB,GAAG,IAAc;IAEjB,MAAM,MAAM,GAAG,aAAa,CAAC,EAAC,GAAG,EAAE,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,EAAC,CAAC,CAAC;IACzD,gBAAgB,CAAC,MAAM,CAAC,CAAC;IACzB,aAAa,EAAE,CAAC;IAEhB,MAAM,EAAE,GAAG,gBAAgB,CAAC,MAAM,EAAE,EAAC,MAAM,EAAE,QAAQ,EAAC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"syncer.js","sourceRoot":"","sources":["../../../../../zero-cache/src/server/syncer.ts"],"names":[],"mappings":"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"}
|
|
@@ -30,7 +30,7 @@ export class WorkerDispatcher {
|
|
|
30
30
|
}
|
|
31
31
|
const handlePush = (req) => {
|
|
32
32
|
assert(mutator !== undefined, 'Received a push for a custom mutation but no `push.url` was configured.');
|
|
33
|
-
return { payload: connectParams(req),
|
|
33
|
+
return { payload: connectParams(req), sender: mutator };
|
|
34
34
|
};
|
|
35
35
|
const handleSync = (req) => {
|
|
36
36
|
assert(syncers.length, 'Received a sync request with no sync workers.');
|
|
@@ -43,7 +43,7 @@ export class WorkerDispatcher {
|
|
|
43
43
|
// be distributed uniformly across workers on the receiving task(s).
|
|
44
44
|
const syncer = h32(taskID + '/' + clientGroupID) % syncers.length;
|
|
45
45
|
lc.debug?.(`connecting ${clientGroupID} to syncer ${syncer}`);
|
|
46
|
-
return { payload: params,
|
|
46
|
+
return { payload: params, sender: syncers[syncer] };
|
|
47
47
|
};
|
|
48
48
|
const handleChangeStream = (req) => {
|
|
49
49
|
// Note: The change-streamer is generally not dispatched via the main
|
|
@@ -61,7 +61,7 @@ export class WorkerDispatcher {
|
|
|
61
61
|
}
|
|
62
62
|
return {
|
|
63
63
|
payload: path.action,
|
|
64
|
-
|
|
64
|
+
sender: changeStreamer,
|
|
65
65
|
};
|
|
66
66
|
};
|
|
67
67
|
// handoff messages from this ZeroDispatcher to the appropriate worker (pool).
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"worker-dispatcher.js","sourceRoot":"","sources":["../../../../../zero-cache/src/server/worker-dispatcher.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AAC5C,OAAO,UAAU,MAAM,aAAa,CAAC;AACrC,OAAO,EAAC,MAAM,EAAC,MAAM,gCAAgC,CAAC;AACtD,OAAO,EAAC,GAAG,EAAC,MAAM,6BAA6B,CAAC;AAChD,OAAO,EAAC,YAAY,EAAC,MAAM,8BAA8B,CAAC;AAI1D,OAAO,EAAC,uBAAuB,EAAC,MAAM,+BAA+B,CAAC;AACtE,OAAO,EAAC,gBAAgB,EAAC,MAAM,8BAA8B,CAAC;AAE9D,MAAM,OAAO,gBAAgB;IAClB,EAAE,GAAG,mBAAmB,CAAC;IACzB,GAAG,CAAa;IAEhB,MAAM,GAAG,IAAI,YAAY,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAE5C,YACE,EAAc,EACd,MAAc,EACd,MAAc,EACd,OAAiB,EACjB,OAA2B,EAC3B,cAAkC;QAElC,IAAI,CAAC,GAAG,GAAG,EAAE,CAAC;QAEd,SAAS,aAAa,CAAC,GAA0B;YAC/C,MAAM,EAAC,OAAO,EAAE,GAAG,EAAE,CAAC,EAAC,GAAG,GAAG,CAAC;YAC9B,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,gBAAgB,CAAC,CAAC;YAC/C,MAAM,IAAI,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC;YAC5B,IAAI,CAAC,IAAI,EAAE,CAAC;gBACV,MAAM,IAAI,KAAK,CAAC,gBAAgB,CAAC,EAAE,CAAC,CAAC;YACvC,CAAC;YACD,MAAM,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YACrC,IAAI,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC;gBAC1B,MAAM,IAAI,KAAK,CAAC,oBAAoB,CAAC,EAAE,CAAC,CAAC;YAC3C,CAAC;YACD,MAAM,EAAC,MAAM,EAAE,KAAK,EAAC,GAAG,gBAAgB,CAAC,OAAO,EAAE,GAAG,EAAE,OAAO,CAAC,CAAC;YAChE,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;gBACnB,MAAM,IAAI,KAAK,CAAC,KAAK,CAAC,CAAC;YACzB,CAAC;YACD,OAAO,MAAM,CAAC;QAChB,CAAC;QAED,MAAM,UAAU,GAAG,CAAC,GAA0B,EAAE,EAAE;YAChD,MAAM,CACJ,OAAO,KAAK,SAAS,EACrB,yEAAyE,CAC1E,CAAC;YACF,OAAO,EAAC,OAAO,EAAE,aAAa,CAAC,GAAG,CAAC,EAAE,
|
|
1
|
+
{"version":3,"file":"worker-dispatcher.js","sourceRoot":"","sources":["../../../../../zero-cache/src/server/worker-dispatcher.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,7 +7,6 @@ import type { ChangeSource } from '../../change-streamer/change-streamer-service
|
|
|
7
7
|
import { type SubscriptionState } from '../../replicator/schema/replication-state.ts';
|
|
8
8
|
import { type InitialSyncOptions } from './initial-sync.ts';
|
|
9
9
|
import type { MessageRelation as PostgresRelation } from './logical-replication/pgoutput.types.ts';
|
|
10
|
-
import { type PublishedSchema } from './schema/published.ts';
|
|
11
10
|
/**
|
|
12
11
|
* Initializes a Postgres change source, including the initial sync of the
|
|
13
12
|
* replica, before streaming changes from the corresponding logical replication
|
|
@@ -23,11 +22,5 @@ export declare class Acker {
|
|
|
23
22
|
keepalive(): void;
|
|
24
23
|
ack(watermark: LexiVersion): void;
|
|
25
24
|
}
|
|
26
|
-
export declare function schemasDifferent(a: PublishedSchema, b: PublishedSchema, lc?: LogContext): boolean;
|
|
27
|
-
export declare function tablesDifferent(a: PublishedTableSpec, b: PublishedTableSpec): boolean;
|
|
28
25
|
export declare function relationDifferent(a: PublishedTableSpec, b: PostgresRelation): boolean;
|
|
29
|
-
export declare class UnsupportedSchemaChangeError extends Error {
|
|
30
|
-
readonly name = "UnsupportedSchemaChangeError";
|
|
31
|
-
constructor(options?: ErrorOptions);
|
|
32
|
-
}
|
|
33
26
|
//# sourceMappingURL=change-source.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"change-source.d.ts","sourceRoot":"","sources":["../../../../../../../zero-cache/src/services/change-source/pg/change-source.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"change-source.d.ts","sourceRoot":"","sources":["../../../../../../../zero-cache/src/services/change-source/pg/change-source.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AAgB5C,OAAO,KAAK,EAEV,kBAAkB,EAEnB,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAIL,KAAK,WAAW,EACjB,MAAM,gCAAgC,CAAC;AAExC,OAAO,EAEL,KAAK,WAAW,EAEjB,MAAM,0BAA0B,CAAC;AAClC,OAAO,KAAK,EAAC,IAAI,EAAC,MAAM,2BAA2B,CAAC;AAEpD,OAAO,KAAK,EACV,YAAY,EAEb,MAAM,kDAAkD,CAAC;AAE1D,OAAO,EAEL,KAAK,iBAAiB,EACvB,MAAM,8CAA8C,CAAC;AAWtD,OAAO,EAAC,KAAK,kBAAkB,EAAC,MAAM,mBAAmB,CAAC;AAC1D,OAAO,KAAK,EAGV,eAAe,IAAI,gBAAgB,EACpC,MAAM,yCAAyC,CAAC;AAoBjD;;;;GAIG;AACH,wBAAsB,8BAA8B,CAClD,EAAE,EAAE,UAAU,EACd,WAAW,EAAE,MAAM,EACnB,KAAK,EAAE,WAAW,EAClB,aAAa,EAAE,MAAM,EACrB,WAAW,EAAE,kBAAkB,GAC9B,OAAO,CAAC;IAAC,iBAAiB,EAAE,iBAAiB,CAAC;IAAC,YAAY,EAAE,YAAY,CAAA;CAAC,CAAC,CAoC7E;AAwPD,qBAAa,KAAK;;gBAIJ,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC;IAI9B,SAAS;IAiBT,GAAG,CAAC,SAAS,EAAE,WAAW;CAa3B;AA0bD,wBAAgB,iBAAiB,CAAC,CAAC,EAAE,kBAAkB,EAAE,CAAC,EAAE,gBAAgB,WAwB3E"}
|
|
@@ -2,6 +2,7 @@ import { PG_ADMIN_SHUTDOWN, PG_OBJECT_IN_USE, } from '@drdgvhbh/postgres-error-c
|
|
|
2
2
|
import { LogContext } from '@rocicorp/logger';
|
|
3
3
|
import postgres from 'postgres';
|
|
4
4
|
import { AbortError } from "../../../../../shared/src/abort-error.js";
|
|
5
|
+
import { stringify } from "../../../../../shared/src/bigint-json.js";
|
|
5
6
|
import { deepEqual } from "../../../../../shared/src/json.js";
|
|
6
7
|
import { must } from "../../../../../shared/src/must.js";
|
|
7
8
|
import { promiseVoid } from "../../../../../shared/src/resolved-promises.js";
|
|
@@ -11,7 +12,6 @@ import * as v from "../../../../../shared/src/valita.js";
|
|
|
11
12
|
import { Database } from "../../../../../zqlite/src/db.js";
|
|
12
13
|
import { mapPostgresToLiteColumn } from "../../../db/pg-to-lite.js";
|
|
13
14
|
import { StatementRunner } from "../../../db/statements.js";
|
|
14
|
-
import { stringify } from "../../../../../shared/src/bigint-json.js";
|
|
15
15
|
import { oneAfter, versionFromLexi, versionToLexi, } from "../../../types/lexi-version.js";
|
|
16
16
|
import { pgClient } from "../../../types/pg.js";
|
|
17
17
|
import { upstreamSchema, } from "../../../types/shards.js";
|
|
@@ -84,13 +84,13 @@ async function checkAndUpdateUpstream(lc, sql, shard, { replicaVersion, publicat
|
|
|
84
84
|
}
|
|
85
85
|
const { slot } = upstreamReplica;
|
|
86
86
|
const result = await sql `
|
|
87
|
-
SELECT restart_lsn as "restartLSN" FROM pg_replication_slots
|
|
87
|
+
SELECT restart_lsn as "restartLSN", wal_status as "walStatus" FROM pg_replication_slots
|
|
88
88
|
WHERE slot_name = ${slot}`;
|
|
89
89
|
if (result.length === 0) {
|
|
90
90
|
throw new AutoResetSignal(`replication slot ${slot} is missing`);
|
|
91
91
|
}
|
|
92
|
-
const [{ restartLSN }] = result;
|
|
93
|
-
if (restartLSN === null) {
|
|
92
|
+
const [{ restartLSN, walStatus }] = result;
|
|
93
|
+
if (restartLSN === null || walStatus === 'lost') {
|
|
94
94
|
throw new AutoResetSignal(`replication slot ${slot} has been invalidated for exceeding the max_slot_wal_keep_size`);
|
|
95
95
|
}
|
|
96
96
|
return upstreamReplica;
|
|
@@ -521,7 +521,7 @@ class ChangeMaker {
|
|
|
521
521
|
mapPostgresToLiteColumn(table.name, column);
|
|
522
522
|
}
|
|
523
523
|
catch (cause) {
|
|
524
|
-
throw new UnsupportedSchemaChangeError({ cause });
|
|
524
|
+
throw new UnsupportedSchemaChangeError(String(cause), { cause });
|
|
525
525
|
}
|
|
526
526
|
changes.push({ tag: 'add-column', table, column });
|
|
527
527
|
}
|
|
@@ -558,8 +558,9 @@ class ChangeMaker {
|
|
|
558
558
|
return [];
|
|
559
559
|
}
|
|
560
560
|
const currentSchema = await getPublicationInfo(this.#upstreamDB, publications);
|
|
561
|
-
|
|
562
|
-
|
|
561
|
+
const difference = getSchemaDifference(this.#initialSchema, currentSchema);
|
|
562
|
+
if (difference !== null) {
|
|
563
|
+
throw new MissingEventTriggerSupport(difference);
|
|
563
564
|
}
|
|
564
565
|
// Even if the currentSchema is equal to the initialSchema, the
|
|
565
566
|
// MessageRelation itself must be checked to detect transient
|
|
@@ -568,47 +569,51 @@ class ChangeMaker {
|
|
|
568
569
|
const orel = this.#initialSchema.tables.find(t => t.oid === rel.relationOid);
|
|
569
570
|
if (!orel) {
|
|
570
571
|
// Can happen if a table is created and then dropped in the same transaction.
|
|
571
|
-
|
|
572
|
-
throw new UnsupportedSchemaChangeError();
|
|
572
|
+
throw new MissingEventTriggerSupport(`relation not in initialSchema: ${stringify(rel)}`);
|
|
573
573
|
}
|
|
574
574
|
if (relationDifferent(orel, rel)) {
|
|
575
|
-
|
|
576
|
-
throw new UnsupportedSchemaChangeError();
|
|
575
|
+
throw new MissingEventTriggerSupport(`relation has changed within the transaction: ${stringify(orel)} vs ${stringify(rel)}`);
|
|
577
576
|
}
|
|
578
577
|
return [];
|
|
579
578
|
}
|
|
580
579
|
}
|
|
581
|
-
|
|
580
|
+
function getSchemaDifference(a, b) {
|
|
582
581
|
// Note: ignore indexes since changes need not to halt replication
|
|
583
|
-
|
|
584
|
-
|
|
585
|
-
|
|
586
|
-
|
|
587
|
-
|
|
588
|
-
|
|
589
|
-
|
|
590
|
-
|
|
591
|
-
|
|
582
|
+
if (a.tables.length !== b.tables.length) {
|
|
583
|
+
return `tables created or dropped`;
|
|
584
|
+
}
|
|
585
|
+
for (let i = 0; i < a.tables.length; i++) {
|
|
586
|
+
const at = a.tables[i];
|
|
587
|
+
const bt = b.tables[i];
|
|
588
|
+
const difference = getTableDifference(at, bt);
|
|
589
|
+
if (difference) {
|
|
590
|
+
return difference;
|
|
591
|
+
}
|
|
592
|
+
}
|
|
593
|
+
return null;
|
|
592
594
|
}
|
|
593
595
|
// ColumnSpec comparator
|
|
594
596
|
const byColumnPos = (a, b) => a[1].pos < b[1].pos ? -1 : a[1].pos > b[1].pos ? 1 : 0;
|
|
595
|
-
|
|
596
|
-
if (a.oid !== b.oid ||
|
|
597
|
-
a.
|
|
598
|
-
|
|
599
|
-
|
|
600
|
-
return
|
|
597
|
+
function getTableDifference(a, b) {
|
|
598
|
+
if (a.oid !== b.oid || a.schema !== b.schema || a.name !== b.name) {
|
|
599
|
+
return `Table "${a.name}" differs from table "${b.name}"`;
|
|
600
|
+
}
|
|
601
|
+
if (!deepEqual(a.primaryKey, b.primaryKey)) {
|
|
602
|
+
return `Primary key of table "${a.name}" has changed`;
|
|
601
603
|
}
|
|
602
604
|
const acols = Object.entries(a.columns).sort(byColumnPos);
|
|
603
605
|
const bcols = Object.entries(b.columns).sort(byColumnPos);
|
|
604
|
-
|
|
606
|
+
if (acols.length !== bcols.length ||
|
|
605
607
|
acols.some(([aname, acol], i) => {
|
|
606
608
|
const [bname, bcol] = bcols[i];
|
|
607
609
|
return (aname !== bname ||
|
|
608
610
|
acol.pos !== bcol.pos ||
|
|
609
611
|
acol.typeOID !== bcol.typeOID ||
|
|
610
612
|
acol.notNull !== bcol.notNull);
|
|
611
|
-
}))
|
|
613
|
+
})) {
|
|
614
|
+
return `Columns of table "${a.name}" have changed`;
|
|
615
|
+
}
|
|
616
|
+
return null;
|
|
612
617
|
}
|
|
613
618
|
export function relationDifferent(a, b) {
|
|
614
619
|
if (a.oid !== b.relationOid || a.schema !== b.schema || a.name !== b.name) {
|
|
@@ -665,10 +670,16 @@ function withoutColumns(relation) {
|
|
|
665
670
|
const { columns: _, ...rest } = relation;
|
|
666
671
|
return rest;
|
|
667
672
|
}
|
|
668
|
-
|
|
673
|
+
class UnsupportedSchemaChangeError extends Error {
|
|
669
674
|
name = 'UnsupportedSchemaChangeError';
|
|
670
|
-
|
|
671
|
-
|
|
675
|
+
// Schema changes cannot be reliably replicated without event trigger support.
|
|
676
|
+
constructor(msg, options) {
|
|
677
|
+
super(`Replication halted. Resync the replica to recover: ${msg}`, options);
|
|
678
|
+
}
|
|
679
|
+
}
|
|
680
|
+
class MissingEventTriggerSupport extends UnsupportedSchemaChangeError {
|
|
681
|
+
constructor(msg) {
|
|
682
|
+
super(`${msg}. Schema changes cannot be reliably replicated without event trigger support.`);
|
|
672
683
|
}
|
|
673
684
|
}
|
|
674
685
|
class ShutdownSignal extends AbortError {
|