@nodii/telemetry 0.14.1 → 0.16.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/hono/index.d.ts +64 -0
- package/dist/hono/index.d.ts.map +1 -0
- package/dist/hono/index.js +217 -0
- package/dist/hono/index.js.map +1 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +6 -0
- package/dist/index.js.map +1 -1
- package/dist/worker/single-active-lease.d.ts +38 -0
- package/dist/worker/single-active-lease.d.ts.map +1 -1
- package/dist/worker/single-active-lease.js +78 -13
- package/dist/worker/single-active-lease.js.map +1 -1
- package/package.json +5 -1
|
@@ -0,0 +1,64 @@
|
|
|
1
|
+
import type { Context, MiddlewareHandler } from "hono";
|
|
2
|
+
/** Canonical inbound W3C trace-context header (lower-case; Hono headers are case-insensitive). */
|
|
3
|
+
export declare const TRACEPARENT_HEADER = "traceparent";
|
|
4
|
+
/** Options for {@link honoTelemetry}. */
|
|
5
|
+
export interface HonoTelemetryOptions {
|
|
6
|
+
/**
|
|
7
|
+
* Honor an inbound W3C `traceparent` header so the SERVER span inherits
|
|
8
|
+
* the upstream `trace_id` (distributed trace continuity) instead of
|
|
9
|
+
* starting a fresh root trace. Default `true`.
|
|
10
|
+
*
|
|
11
|
+
* A malformed inbound traceparent does NOT throw — `tracer.span` starts a
|
|
12
|
+
* root span and records the raw value under
|
|
13
|
+
* `telemetry.inbound_traceparent_malformed` (see `tracer.ts`).
|
|
14
|
+
*
|
|
15
|
+
* Set `false` to always start the request as a fresh root SERVER span
|
|
16
|
+
* (e.g. when the edge is the trusted trace root and upstream values are
|
|
17
|
+
* not trustworthy).
|
|
18
|
+
*/
|
|
19
|
+
honorInboundTraceparent?: boolean;
|
|
20
|
+
/**
|
|
21
|
+
* Header to read the inbound traceparent from. Defaults to `traceparent`.
|
|
22
|
+
*/
|
|
23
|
+
traceparentHeader?: string;
|
|
24
|
+
/**
|
|
25
|
+
* Customize the SERVER span name. Defaults to the OTel HTTP-semconv
|
|
26
|
+
* low-cardinality form: `"<METHOD> <route-template>"` when Hono resolved
|
|
27
|
+
* a route template (e.g. `"GET /users/:id"`), else `"<METHOD>"`. Override
|
|
28
|
+
* for services that want a different naming scheme.
|
|
29
|
+
*
|
|
30
|
+
* Avoid putting the raw `url.path` in the span name — that is HIGH
|
|
31
|
+
* cardinality (one name per id) and the per-OTel-semconv reason the
|
|
32
|
+
* default uses the route template, not the concrete path.
|
|
33
|
+
*/
|
|
34
|
+
spanName?: (c: Context) => string;
|
|
35
|
+
/**
|
|
36
|
+
* Extra static attributes stamped on every SERVER span (e.g. a deploy
|
|
37
|
+
* marker). Per-request attributes should be added by downstream handlers
|
|
38
|
+
* via `getActiveSpan()` / `withSpanAttributes`.
|
|
39
|
+
*/
|
|
40
|
+
attributes?: Record<string, unknown>;
|
|
41
|
+
}
|
|
42
|
+
/**
|
|
43
|
+
* Hono middleware factory that opens ONE OTel SERVER span per HTTP request
|
|
44
|
+
* and runs the rest of the pipeline INSIDE that span's context, so:
|
|
45
|
+
* - every inbound request emits an HTTP SERVER span even on `Bun.serve`
|
|
46
|
+
* (which bypasses `@opentelemetry/instrumentation-http`) — D154;
|
|
47
|
+
* - child business spans + pg-query/outbox spans nest under it (the span
|
|
48
|
+
* is the active stack parent for the downstream scope);
|
|
49
|
+
* - the OTel HTTP semantic-convention attributes are stamped
|
|
50
|
+
* (`http.request.method`, `url.path`, `url.scheme`,
|
|
51
|
+
* `http.response.status_code`, `http.route`, …);
|
|
52
|
+
* - span status maps from the response: `5xx` → ERROR (D27), and a
|
|
53
|
+
* thrown handler error is recorded + re-thrown so the framework's own
|
|
54
|
+
* error handler still runs.
|
|
55
|
+
*
|
|
56
|
+
* Mount it FIRST in the pipeline (before auth / context) so it wraps the
|
|
57
|
+
* full request duration, mirroring edge's `requestContext()`:
|
|
58
|
+
*
|
|
59
|
+
* import { honoTelemetry } from "@nodii/telemetry/hono";
|
|
60
|
+
* const app = new Hono();
|
|
61
|
+
* app.use("*", honoTelemetry());
|
|
62
|
+
*/
|
|
63
|
+
export declare function honoTelemetry(options?: HonoTelemetryOptions): MiddlewareHandler;
|
|
64
|
+
//# sourceMappingURL=index.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/hono/index.ts"],"names":[],"mappings":"AAwCA,OAAO,KAAK,EAAE,OAAO,EAAE,iBAAiB,EAAE,MAAM,MAAM,CAAC;AAgBvD,kGAAkG;AAClG,eAAO,MAAM,kBAAkB,gBAAgB,CAAC;AAEhD,yCAAyC;AACzC,MAAM,WAAW,oBAAoB;IACnC;;;;;;;;;;;;OAYG;IACH,uBAAuB,CAAC,EAAE,OAAO,CAAC;IAClC;;OAEG;IACH,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B;;;;;;;;;OASG;IACH,QAAQ,CAAC,EAAE,CAAC,CAAC,EAAE,OAAO,KAAK,MAAM,CAAC;IAClC;;;;OAIG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACtC;AAyED;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,wBAAgB,aAAa,CAC3B,OAAO,GAAE,oBAAyB,GACjC,iBAAiB,CAmGnB"}
|
|
@@ -0,0 +1,217 @@
|
|
|
1
|
+
// `@nodii/telemetry/hono` — the HTTP SERVER-span middleware for Bun-served
|
|
2
|
+
// Hono apps (D154: HTTP auto-instrumentation ON-by-default).
|
|
3
|
+
//
|
|
4
|
+
// Spec: `global/15-telemetry-doctrine.md` § 7.1 (D154 — HTTP+gRPC server
|
|
5
|
+
// spans ON by default) + `nodii-libs/features/telemetry.md` § 5.9
|
|
6
|
+
// (Hono middleware adapter) + § 5.11 (auto-instrumentation defaults).
|
|
7
|
+
//
|
|
8
|
+
// WHY THIS EXISTS (the gap it closes):
|
|
9
|
+
// `@opentelemetry/instrumentation-http` works by monkey-patching Node's
|
|
10
|
+
// built-in `http`/`https` modules. `Bun.serve` does NOT route through
|
|
11
|
+
// those modules — it has its own native HTTP server — so the standard
|
|
12
|
+
// OTel HTTP instrumentation NEVER fires on a Bun process. Every
|
|
13
|
+
// Bun-based Nodii service (auth, hr, edge, …) therefore emits ZERO HTTP
|
|
14
|
+
// SERVER spans despite D154 mandating HTTP instrumentation on-by-default
|
|
15
|
+
// (verified empirically: auth 0 server spans, hr 0 server spans).
|
|
16
|
+
//
|
|
17
|
+
// This middleware restores the D154 guarantee at the framework layer:
|
|
18
|
+
// one OTel SERVER span per inbound HTTP request, with the OTel HTTP
|
|
19
|
+
// semantic-convention attributes, run with the rest of the Hono pipeline
|
|
20
|
+
// nested INSIDE the span's context so child business spans (and the
|
|
21
|
+
// pg-query / outbox spans) parent correctly onto the request span.
|
|
22
|
+
//
|
|
23
|
+
// It GENERALIZES the bespoke `edge.request` request-span bridge that
|
|
24
|
+
// `nodii-edge`'s `requestContext()` middleware hand-rolls today (see
|
|
25
|
+
// `nodii-edge/src/lib/middleware/request-context.ts`). Once a service
|
|
26
|
+
// adopts this adapter, edge can retire its private copy.
|
|
27
|
+
//
|
|
28
|
+
// REAL SPANS (R1): the span is produced by the lib's own `tracer.span`,
|
|
29
|
+
// which routes through the mandatory-attribute SpanProcessor (D26) and the
|
|
30
|
+
// installed OTLP exporter (`installOtlpAdapter` → `_setSpanEmitter`). There
|
|
31
|
+
// is NO Noop path here — when no OTLP adapter is installed the span still
|
|
32
|
+
// flows to whatever emitter is set (the default no-op emitter is a
|
|
33
|
+
// TEST-ONLY seam, never a production default; production calls
|
|
34
|
+
// `installOtlpAdapter`).
|
|
35
|
+
//
|
|
36
|
+
// SCOPE: TS only. Hono is a TypeScript framework, so this lives behind a
|
|
37
|
+
// TS subpath exactly like `/lambda` + `/worker`. The Python (FastAPI /
|
|
38
|
+
// starlette) and Go HTTP middleware are SEPARATE adapters in their
|
|
39
|
+
// respective language trees (§ 5.9) and are OUT OF SCOPE for this file.
|
|
40
|
+
import { ATTR_ERROR_TYPE, ATTR_HTTP_REQUEST_METHOD, ATTR_HTTP_RESPONSE_STATUS_CODE, ATTR_HTTP_ROUTE, ATTR_NETWORK_PROTOCOL_VERSION, ATTR_SERVER_ADDRESS, ATTR_URL_PATH, ATTR_URL_QUERY, ATTR_URL_SCHEME, ATTR_USER_AGENT_ORIGINAL, } from "@opentelemetry/semantic-conventions";
|
|
41
|
+
import { tracer } from "../tracer.js";
|
|
42
|
+
/** Canonical inbound W3C trace-context header (lower-case; Hono headers are case-insensitive). */
|
|
43
|
+
export const TRACEPARENT_HEADER = "traceparent";
|
|
44
|
+
/** Prefer the proxy-forwarded scheme; fall back to the request URL; default `https`. */
|
|
45
|
+
function urlScheme(c) {
|
|
46
|
+
const fwd = c.req.header("x-forwarded-proto");
|
|
47
|
+
if (fwd) {
|
|
48
|
+
const first = fwd.split(",")[0];
|
|
49
|
+
if (first)
|
|
50
|
+
return first.trim();
|
|
51
|
+
}
|
|
52
|
+
try {
|
|
53
|
+
return new URL(c.req.url).protocol.replace(":", "");
|
|
54
|
+
}
|
|
55
|
+
catch {
|
|
56
|
+
return "https";
|
|
57
|
+
}
|
|
58
|
+
}
|
|
59
|
+
/** The `url.query` component (without the leading `?`), or undefined when absent. */
|
|
60
|
+
function urlQuery(c) {
|
|
61
|
+
try {
|
|
62
|
+
const q = new URL(c.req.url).search;
|
|
63
|
+
return q ? q.slice(1) : undefined;
|
|
64
|
+
}
|
|
65
|
+
catch {
|
|
66
|
+
return undefined;
|
|
67
|
+
}
|
|
68
|
+
}
|
|
69
|
+
/**
|
|
70
|
+
* Resolve the low-cardinality route TEMPLATE for the request (e.g.
|
|
71
|
+
* `/users/:id`), or `undefined` when no concrete handler route matched
|
|
72
|
+
* (e.g. a 404, where only the `/*` middleware route is present).
|
|
73
|
+
*
|
|
74
|
+
* `c.req.routePath` is only meaningful AFTER `next()` (once the matching
|
|
75
|
+
* handler has run). Because this middleware needs the template at
|
|
76
|
+
* span-OPEN (before `next()`), it reads `c.req.matchedRoutes` — which Hono
|
|
77
|
+
* populates at match time, before dispatch — and takes the most specific
|
|
78
|
+
* matched route: the last one whose path is NOT a `/*` / `/` middleware
|
|
79
|
+
* wildcard and whose method is NOT the `ALL` middleware pseudo-method.
|
|
80
|
+
*/
|
|
81
|
+
function resolveRouteTemplate(c) {
|
|
82
|
+
const matched = c.req
|
|
83
|
+
.matchedRoutes;
|
|
84
|
+
if (Array.isArray(matched)) {
|
|
85
|
+
for (let i = matched.length - 1; i >= 0; i--) {
|
|
86
|
+
const r = matched[i];
|
|
87
|
+
const p = r?.path;
|
|
88
|
+
if (p && p !== "/*" && p !== "/" && r?.method !== "ALL")
|
|
89
|
+
return p;
|
|
90
|
+
}
|
|
91
|
+
return undefined;
|
|
92
|
+
}
|
|
93
|
+
// Fallback for Hono builds without `matchedRoutes`: `routePath` (only set
|
|
94
|
+
// post-match, so this path is for the post-`next()` re-read).
|
|
95
|
+
const route = c.req.routePath;
|
|
96
|
+
if (route && route !== "/*" && route !== "/")
|
|
97
|
+
return route;
|
|
98
|
+
return undefined;
|
|
99
|
+
}
|
|
100
|
+
/**
|
|
101
|
+
* Default SERVER span name per OTel HTTP semconv: `"<METHOD> <route>"`
|
|
102
|
+
* (low cardinality — uses the route TEMPLATE, never the concrete path)
|
|
103
|
+
* when Hono matched a concrete handler route, else just `"<METHOD>"`.
|
|
104
|
+
*/
|
|
105
|
+
function defaultSpanName(c) {
|
|
106
|
+
const method = c.req.method;
|
|
107
|
+
const route = resolveRouteTemplate(c);
|
|
108
|
+
return route ? `${method} ${route}` : method;
|
|
109
|
+
}
|
|
110
|
+
/**
|
|
111
|
+
* Hono middleware factory that opens ONE OTel SERVER span per HTTP request
|
|
112
|
+
* and runs the rest of the pipeline INSIDE that span's context, so:
|
|
113
|
+
* - every inbound request emits an HTTP SERVER span even on `Bun.serve`
|
|
114
|
+
* (which bypasses `@opentelemetry/instrumentation-http`) — D154;
|
|
115
|
+
* - child business spans + pg-query/outbox spans nest under it (the span
|
|
116
|
+
* is the active stack parent for the downstream scope);
|
|
117
|
+
* - the OTel HTTP semantic-convention attributes are stamped
|
|
118
|
+
* (`http.request.method`, `url.path`, `url.scheme`,
|
|
119
|
+
* `http.response.status_code`, `http.route`, …);
|
|
120
|
+
* - span status maps from the response: `5xx` → ERROR (D27), and a
|
|
121
|
+
* thrown handler error is recorded + re-thrown so the framework's own
|
|
122
|
+
* error handler still runs.
|
|
123
|
+
*
|
|
124
|
+
* Mount it FIRST in the pipeline (before auth / context) so it wraps the
|
|
125
|
+
* full request duration, mirroring edge's `requestContext()`:
|
|
126
|
+
*
|
|
127
|
+
* import { honoTelemetry } from "@nodii/telemetry/hono";
|
|
128
|
+
* const app = new Hono();
|
|
129
|
+
* app.use("*", honoTelemetry());
|
|
130
|
+
*/
|
|
131
|
+
export function honoTelemetry(options = {}) {
|
|
132
|
+
const honorInbound = options.honorInboundTraceparent ?? true;
|
|
133
|
+
const traceparentHeader = options.traceparentHeader ?? TRACEPARENT_HEADER;
|
|
134
|
+
const nameOf = options.spanName ?? defaultSpanName;
|
|
135
|
+
const staticAttrs = options.attributes;
|
|
136
|
+
return async (c, next) => {
|
|
137
|
+
const inboundTraceparent = honorInbound
|
|
138
|
+
? c.req.header(traceparentHeader)
|
|
139
|
+
: undefined;
|
|
140
|
+
// Build the entry attributes per the OTel HTTP semconv. Status code +
|
|
141
|
+
// route are set AFTER `next()` (route may only resolve once matched;
|
|
142
|
+
// status is the response status).
|
|
143
|
+
const scheme = urlScheme(c);
|
|
144
|
+
const query = urlQuery(c);
|
|
145
|
+
const host = c.req.header("host");
|
|
146
|
+
const userAgent = c.req.header("user-agent");
|
|
147
|
+
const entryAttrs = {
|
|
148
|
+
[ATTR_HTTP_REQUEST_METHOD]: c.req.method,
|
|
149
|
+
[ATTR_URL_PATH]: c.req.path,
|
|
150
|
+
[ATTR_URL_SCHEME]: scheme,
|
|
151
|
+
...(query !== undefined ? { [ATTR_URL_QUERY]: query } : {}),
|
|
152
|
+
...(host ? { [ATTR_SERVER_ADDRESS]: host } : {}),
|
|
153
|
+
...(userAgent ? { [ATTR_USER_AGENT_ORIGINAL]: userAgent } : {}),
|
|
154
|
+
[ATTR_NETWORK_PROTOCOL_VERSION]: "1.1",
|
|
155
|
+
...(staticAttrs ?? {}),
|
|
156
|
+
};
|
|
157
|
+
await tracer.span(
|
|
158
|
+
// Span name is resolved at span-OPEN against the request line; the
|
|
159
|
+
// route template is also stamped post-`next()` once matched.
|
|
160
|
+
nameOf(c), async (span) => {
|
|
161
|
+
// Run the rest of the Hono pipeline INSIDE the SERVER span so
|
|
162
|
+
// downstream `tracer.span` calls nest under it (the lib's active
|
|
163
|
+
// span stack makes this span the parent for the downstream scope).
|
|
164
|
+
//
|
|
165
|
+
// NOTE on error capture: when a handler throws, Hono CATCHES it
|
|
166
|
+
// inside its own dispatch (compose) — whether or not an `onError`
|
|
167
|
+
// handler is registered — sets `c.error` + a 500 response, and
|
|
168
|
+
// `next()` RESOLVES normally (it does NOT re-throw past us). So the
|
|
169
|
+
// canonical way to observe the handler exception from middleware is
|
|
170
|
+
// `c.error` after `next()`, NOT a try/catch here. The try/catch is
|
|
171
|
+
// kept as a belt-and-suspenders for the rare case where an error
|
|
172
|
+
// genuinely propagates out of `next()` (e.g. a middleware that
|
|
173
|
+
// throws AFTER the response is built).
|
|
174
|
+
try {
|
|
175
|
+
await next();
|
|
176
|
+
}
|
|
177
|
+
catch (err) {
|
|
178
|
+
span.recordException(err);
|
|
179
|
+
span.setAttribute(ATTR_ERROR_TYPE, err instanceof Error ? err.name : "Error");
|
|
180
|
+
throw err;
|
|
181
|
+
}
|
|
182
|
+
// Post-pipeline: stamp the resolved route template + response
|
|
183
|
+
// status.
|
|
184
|
+
const route = resolveRouteTemplate(c);
|
|
185
|
+
if (route)
|
|
186
|
+
span.setAttribute(ATTR_HTTP_ROUTE, route);
|
|
187
|
+
// Capture the handler exception Hono stashed on `c.error` (present
|
|
188
|
+
// in both the `onError` and default-500 paths). This records the
|
|
189
|
+
// real `exception` span event + sets ERROR status per D27 — the
|
|
190
|
+
// information `instrumentation-http` would have captured.
|
|
191
|
+
const handlerError = c.error;
|
|
192
|
+
if (handlerError) {
|
|
193
|
+
span.recordException(handlerError);
|
|
194
|
+
span.setAttribute(ATTR_ERROR_TYPE, handlerError instanceof Error ? handlerError.name : "Error");
|
|
195
|
+
span.setStatus("ERROR");
|
|
196
|
+
}
|
|
197
|
+
const status = c.res.status;
|
|
198
|
+
span.setAttribute(ATTR_HTTP_RESPONSE_STATUS_CODE, status);
|
|
199
|
+
// D27 HTTP status mapping: 5xx → ERROR; 4xx is a client error and
|
|
200
|
+
// stays UNSET (the server behaved correctly). `error.type` carries
|
|
201
|
+
// the status string on 5xx for filterable error analytics. (When a
|
|
202
|
+
// handler exception was already recorded above, the span is ERROR
|
|
203
|
+
// regardless; the status-derived `error.type` still applies on 5xx.)
|
|
204
|
+
if (status >= 500) {
|
|
205
|
+
span.setAttribute(ATTR_ERROR_TYPE, String(status));
|
|
206
|
+
span.setStatus("ERROR", `http_status_${status}`);
|
|
207
|
+
}
|
|
208
|
+
}, {
|
|
209
|
+
kind: "SERVER",
|
|
210
|
+
attributes: entryAttrs,
|
|
211
|
+
// Inherit the inbound trace when present (distributed continuity);
|
|
212
|
+
// malformed values fall back to root + a forensic attr (no throw).
|
|
213
|
+
...(inboundTraceparent ? { parent: inboundTraceparent } : {}),
|
|
214
|
+
});
|
|
215
|
+
};
|
|
216
|
+
}
|
|
217
|
+
//# sourceMappingURL=index.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/hono/index.ts"],"names":[],"mappings":"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"}
|
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
package/dist/index.js
CHANGED
|
@@ -13,6 +13,12 @@
|
|
|
13
13
|
// force-flush-on-return so spans/metrics/
|
|
14
14
|
// logs survive the post-handler freeze.
|
|
15
15
|
// First consumer: s2s-auth-service.
|
|
16
|
+
// - @nodii/telemetry/hono — HTTP SERVER-span middleware (D154). One
|
|
17
|
+
// OTel SERVER span per request for Bun-served
|
|
18
|
+
// Hono apps, which `instrumentation-http`
|
|
19
|
+
// BYPASSES (Bun.serve doesn't use Node http).
|
|
20
|
+
// Generalizes edge's bespoke `edge.request`
|
|
21
|
+
// request-span bridge. TS-only subpath.
|
|
16
22
|
//
|
|
17
23
|
// Not yet shipped (D44 § 6.5 lists them; no implementation exists yet —
|
|
18
24
|
// they are tracked as follow-on requests, NOT advertised as vapor):
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,oCAAoC;AACpC,EAAE;AACF,0EAA0E;AAC1E,EAAE;AACF,0EAA0E;AAC1E,yEAAyE;AACzE,4EAA4E;AAC5E,2EAA2E;AAC3E,4EAA4E;AAC5E,wEAAwE;AACxE,0EAA0E;AAC1E,mEAAmE;AACnE,0EAA0E;AAC1E,wEAAwE;AACxE,oEAAoE;AACpE,EAAE;AACF,wEAAwE;AACxE,oEAAoE;AACpE,uEAAuE;AACvE,8DAA8D;AAC9D,mDAAmD;AACnD,EAAE;AACF,oEAAoE;AACpE,gBAAgB;AAChB,EAAE;AACF,oEAAoE;AACpE,gEAAgE;AAChE,0DAA0D;AAE1D,OAAO,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AAC1C,OAAO,EACL,UAAU,EACV,oBAAoB,EACpB,kBAAkB,EAClB,mBAAmB,GACpB,MAAM,mBAAmB,CAAC;AAE3B,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAOnD,OAAO,EAAE,MAAM,EAAE,kBAAkB,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AACxE,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAWjD,OAAO,EACL,mBAAmB,EACnB,gBAAgB,EAChB,iBAAiB,GAClB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,OAAO,EAAE,qBAAqB,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAS5E,OAAO,EACL,cAAc,EACd,kBAAkB,EAClB,wBAAwB,EACxB,gCAAgC,EAChC,yBAAyB,EACzB,cAAc,EACd,eAAe,EACf,8BAA8B,EAC9B,KAAK,EACL,iBAAiB,EACjB,cAAc,GACf,MAAM,YAAY,CAAC;AAYpB,OAAO,EAAE,2BAA2B,EAAE,MAAM,YAAY,CAAC;AACzD,OAAO,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAEpD,OAAO,EAAE,MAAM,EAAE,uBAAuB,EAAE,MAAM,aAAa,CAAC;AAC9D,OAAO,EACL,cAAc,EACd,iBAAiB,EACjB,wBAAwB,GACzB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EACL,UAAU,EACV,cAAc,EACd,WAAW,GACZ,MAAM,cAAc,CAAC;AACtB,OAAO,EACL,cAAc,EACd,YAAY,EACZ,YAAY,EACZ,WAAW,EACX,cAAc,EACd,eAAe,GAChB,MAAM,gBAAgB,CAAC;AAExB,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAC7C,OAAO,EAAE,uBAAuB,EAAE,MAAM,YAAY,CAAC;AA0BrD,OAAO,EACL,uBAAuB,EACvB,eAAe,EACf,4BAA4B,EAC5B,2BAA2B,GAC5B,MAAM,YAAY,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,oCAAoC;AACpC,EAAE;AACF,0EAA0E;AAC1E,EAAE;AACF,0EAA0E;AAC1E,yEAAyE;AACzE,4EAA4E;AAC5E,2EAA2E;AAC3E,4EAA4E;AAC5E,wEAAwE;AACxE,0EAA0E;AAC1E,mEAAmE;AACnE,0EAA0E;AAC1E,wEAAwE;AACxE,oEAAoE;AACpE,0EAA0E;AAC1E,8EAA8E;AAC9E,0EAA0E;AAC1E,8EAA8E;AAC9E,4EAA4E;AAC5E,wEAAwE;AACxE,EAAE;AACF,wEAAwE;AACxE,oEAAoE;AACpE,uEAAuE;AACvE,8DAA8D;AAC9D,mDAAmD;AACnD,EAAE;AACF,oEAAoE;AACpE,gBAAgB;AAChB,EAAE;AACF,oEAAoE;AACpE,gEAAgE;AAChE,0DAA0D;AAE1D,OAAO,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AAC1C,OAAO,EACL,UAAU,EACV,oBAAoB,EACpB,kBAAkB,EAClB,mBAAmB,GACpB,MAAM,mBAAmB,CAAC;AAE3B,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAOnD,OAAO,EAAE,MAAM,EAAE,kBAAkB,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AACxE,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAWjD,OAAO,EACL,mBAAmB,EACnB,gBAAgB,EAChB,iBAAiB,GAClB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,OAAO,EAAE,qBAAqB,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAS5E,OAAO,EACL,cAAc,EACd,kBAAkB,EAClB,wBAAwB,EACxB,gCAAgC,EAChC,yBAAyB,EACzB,cAAc,EACd,eAAe,EACf,8BAA8B,EAC9B,KAAK,EACL,iBAAiB,EACjB,cAAc,GACf,MAAM,YAAY,CAAC;AAYpB,OAAO,EAAE,2BAA2B,EAAE,MAAM,YAAY,CAAC;AACzD,OAAO,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAEpD,OAAO,EAAE,MAAM,EAAE,uBAAuB,EAAE,MAAM,aAAa,CAAC;AAC9D,OAAO,EACL,cAAc,EACd,iBAAiB,EACjB,wBAAwB,GACzB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EACL,UAAU,EACV,cAAc,EACd,WAAW,GACZ,MAAM,cAAc,CAAC;AACtB,OAAO,EACL,cAAc,EACd,YAAY,EACZ,YAAY,EACZ,WAAW,EACX,cAAc,EACd,eAAe,GAChB,MAAM,gBAAgB,CAAC;AAExB,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAC7C,OAAO,EAAE,uBAAuB,EAAE,MAAM,YAAY,CAAC;AA0BrD,OAAO,EACL,uBAAuB,EACvB,eAAe,EACf,4BAA4B,EAC5B,2BAA2B,GAC5B,MAAM,YAAY,CAAC"}
|
|
@@ -97,6 +97,30 @@ export interface SingleActiveLeaseOpts {
|
|
|
97
97
|
ttlMs: number;
|
|
98
98
|
/** Stable per-acquisition owner id. Defaults to a fresh uuidv7. */
|
|
99
99
|
ownerId?: string;
|
|
100
|
+
/**
|
|
101
|
+
* SUNSET-DATED one-wave deploy-window compat aid (D402 decision e7eec3aa,
|
|
102
|
+
* not yet locked). When set, the lease ALSO mutually-excludes on this legacy
|
|
103
|
+
* key — the OLD (pre-substrate) key a worker used before it was rebased onto
|
|
104
|
+
* `SingleActiveLease` (e.g. outbox-dispatcher's `lock:outbox:<service>`,
|
|
105
|
+
* replica-consumer's `nodii:replica-consumer:lease:<svc>:<stream>`). During a
|
|
106
|
+
* rolling deploy a NEW substrate-keyed holder and an OLD legacy-keyed instance
|
|
107
|
+
* each `SET NX` a DIFFERENT key, so both would believe they are single-active.
|
|
108
|
+
* With `legacyKey` set, acquire/renew/release gate+hold BOTH keys atomically
|
|
109
|
+
* (both-or-neither): the canonical key holds `<owner>:<fence>` as today and
|
|
110
|
+
* the legacy key holds the BARE `<owner>` (the old SET-NX-EX value), so an OLD
|
|
111
|
+
* instance's `SET legacyKey owner NX` is blocked while this holder lives, and
|
|
112
|
+
* symmetrically this acquire fails if the legacy key is already held.
|
|
113
|
+
*
|
|
114
|
+
* MECHANISM ONLY: the per-worker POLICY (legacy compat honored for exactly one
|
|
115
|
+
* release wave, sunset-dated; REQUIRED for non-idempotent workers like the
|
|
116
|
+
* saga reaper / outbox-dispatcher, OPTIONAL for idempotent ones like the
|
|
117
|
+
* idempotency sweeper / audit-chain verifier) is proposed in e7eec3aa and
|
|
118
|
+
* applied per-adoption — it is deliberately NOT baked into the substrate here.
|
|
119
|
+
*
|
|
120
|
+
* Unset (the default) ⇒ byte-identical to today's single-key behavior; no
|
|
121
|
+
* second key is ever touched.
|
|
122
|
+
*/
|
|
123
|
+
legacyKey?: string;
|
|
100
124
|
/** Fired (once) when the renewal loop detects the lease was lost. */
|
|
101
125
|
onLeaseLost?: () => void;
|
|
102
126
|
telemetry?: LeaseTelemetry;
|
|
@@ -119,6 +143,8 @@ export declare class SingleActiveLease {
|
|
|
119
143
|
readonly ownerId: string;
|
|
120
144
|
readonly key: string;
|
|
121
145
|
readonly fenceCounterKey: string;
|
|
146
|
+
/** The optional sunset-dated deploy-window legacy key (D402 e7eec3aa). */
|
|
147
|
+
readonly legacyKey: string | null;
|
|
122
148
|
private readonly redis;
|
|
123
149
|
private readonly ttlMs;
|
|
124
150
|
private readonly ttlSeconds;
|
|
@@ -151,6 +177,18 @@ export declare class SingleActiveLease {
|
|
|
151
177
|
private emit;
|
|
152
178
|
/** Start the ttl/2 renewal loop (CAS on `owner:token`). */
|
|
153
179
|
private startRenewLoop;
|
|
180
|
+
/**
|
|
181
|
+
* Issue a CAS-renew eval, gating BOTH keys when a legacy key is configured
|
|
182
|
+
* (KEYS[2] = legacy key, ARGV[2] = bare ownerId). Unset ⇒ the 1-key form,
|
|
183
|
+
* byte-identical to the pre-legacyKey renew (KEYS[2] is nil in Lua).
|
|
184
|
+
*/
|
|
185
|
+
private renewEval;
|
|
186
|
+
/**
|
|
187
|
+
* Issue a CAS-release eval, deleting BOTH keys when a legacy key is configured
|
|
188
|
+
* (KEYS[2] = legacy key, ARGV[2] = bare ownerId), each only if we own it.
|
|
189
|
+
* Unset ⇒ the 1-key form, byte-identical to the pre-legacyKey release.
|
|
190
|
+
*/
|
|
191
|
+
private releaseEval;
|
|
154
192
|
/** One CAS renew. Marks the lease lost (and stops the loop) on failure. */
|
|
155
193
|
private renewOnce;
|
|
156
194
|
private markLost;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"single-active-lease.d.ts","sourceRoot":"","sources":["../../src/worker/single-active-lease.ts"],"names":[],"mappings":"AAmDA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAI9C;;;;GAIG;AACH,MAAM,WAAW,cAAc;IAC7B,YAAY,CAAC,IAAI,EAAE;QACjB,IAAI,EAAE,UAAU,CAAC;QACjB,IAAI,EAAE,MAAM,CAAC;QACb,KAAK,EAAE,MAAM,CAAC;QACd,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC,CAAC;KAC9C,GAAG,IAAI,CAAC;CACV;AAED;;;;;GAKG;AACH,MAAM,WAAW,cAAc;IAC7B,GAAG,CACD,GAAG,EAAE,MAAM,EACX,KAAK,EAAE,MAAM,EACb,GAAG,IAAI,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,GAC3B,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;IAC1B,GAAG,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;IACzC,GAAG,CAAC,GAAG,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IACxC,IAAI,CACF,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,MAAM,EACf,GAAG,WAAW,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,GAClC,OAAO,CAAC,OAAO,CAAC,CAAC;CACrB;
|
|
1
|
+
{"version":3,"file":"single-active-lease.d.ts","sourceRoot":"","sources":["../../src/worker/single-active-lease.ts"],"names":[],"mappings":"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"}
|
|
@@ -51,34 +51,71 @@
|
|
|
51
51
|
import { uuidv7 } from "../uuid.js";
|
|
52
52
|
import { WORKER_METRIC_NAMES } from "./observability-hooks.js";
|
|
53
53
|
/** Atomic acquire: capture the next monotonic fence + take the lock under NX.
|
|
54
|
-
* KEYS[1] = lease key, KEYS[2] = fence counter key
|
|
54
|
+
* KEYS[1] = lease key, KEYS[2] = fence counter key, KEYS[3] = legacy key
|
|
55
|
+
* (present iff `legacyKey` is configured — see the `legacyKey` opt / D402
|
|
56
|
+
* decision e7eec3aa).
|
|
55
57
|
* ARGV[1] = ownerId, ARGV[2] = ttl seconds.
|
|
56
|
-
* Returns the captured fence token (a number) on success, or
|
|
57
|
-
*
|
|
58
|
+
* Returns the captured fence token (a number) on success, or false if the
|
|
59
|
+
* lock — or, when a legacy key is given, EITHER key — is already held by
|
|
60
|
+
* someone else (no token is consumed in that case).
|
|
61
|
+
*
|
|
62
|
+
* BOTH-OR-NEITHER (deploy-window compat): when KEYS[3] is present the acquire
|
|
63
|
+
* succeeds ONLY if BOTH the canonical lease key AND the legacy key are free,
|
|
64
|
+
* and atomically SETs the canonical key to `<owner>:<fence>` AND the legacy
|
|
65
|
+
* key to the BARE `<owner>` (the old SET-NX-EX value shape). This makes a new
|
|
66
|
+
* substrate-keyed holder and an OLD legacy-keyed instance mutually exclude
|
|
67
|
+
* during a rolling deploy. With no KEYS[3] the script is byte-identical to the
|
|
68
|
+
* single-key form (no second key is touched). */
|
|
58
69
|
const ACQUIRE_LUA = `
|
|
59
70
|
if redis.call("EXISTS", KEYS[1]) == 1 then
|
|
60
71
|
return false
|
|
61
72
|
end
|
|
73
|
+
if KEYS[3] ~= nil and redis.call("EXISTS", KEYS[3]) == 1 then
|
|
74
|
+
return false
|
|
75
|
+
end
|
|
62
76
|
local fence = redis.call("INCR", KEYS[2])
|
|
63
77
|
local val = ARGV[1] .. ":" .. tostring(fence)
|
|
64
78
|
redis.call("SET", KEYS[1], val, "EX", tonumber(ARGV[2]))
|
|
79
|
+
if KEYS[3] ~= nil then
|
|
80
|
+
redis.call("SET", KEYS[3], ARGV[1], "EX", tonumber(ARGV[2]))
|
|
81
|
+
end
|
|
65
82
|
return fence
|
|
66
83
|
`;
|
|
67
84
|
/** CAS-renew: EXPIRE only if the key's current value is exactly our
|
|
68
|
-
* `owner:token`.
|
|
85
|
+
* `owner:token`. KEYS[1] = lease key, KEYS[2] = legacy key (present iff a
|
|
86
|
+
* legacy key is configured). ARGV[1] = `owner:token`, ARGV[2] = ownerId
|
|
87
|
+
* (the bare legacy value), ARGV[3] = ttl seconds.
|
|
88
|
+
*
|
|
89
|
+
* When KEYS[2] is present BOTH keys are renewed, EACH only if WE still own it
|
|
90
|
+
* (canonical CAS on `owner:token`, legacy CAS on the bare `owner`). With no
|
|
91
|
+
* KEYS[2] this is byte-identical to the single-key renew. */
|
|
69
92
|
const RENEW_LUA = `
|
|
93
|
+
local held = 0
|
|
70
94
|
if redis.call("GET", KEYS[1]) == ARGV[1] then
|
|
71
|
-
|
|
95
|
+
redis.call("EXPIRE", KEYS[1], ARGV[3])
|
|
96
|
+
held = 1
|
|
97
|
+
end
|
|
98
|
+
if KEYS[2] ~= nil and redis.call("GET", KEYS[2]) == ARGV[2] then
|
|
99
|
+
redis.call("EXPIRE", KEYS[2], ARGV[3])
|
|
72
100
|
end
|
|
73
|
-
return
|
|
101
|
+
return held
|
|
74
102
|
`;
|
|
75
103
|
/** CAS-release: DEL only if the key's current value is exactly our
|
|
76
|
-
* `owner:token`.
|
|
104
|
+
* `owner:token`. KEYS[1] = lease key, KEYS[2] = legacy key (present iff a
|
|
105
|
+
* legacy key is configured). ARGV[1] = `owner:token`, ARGV[2] = ownerId
|
|
106
|
+
* (the bare legacy value).
|
|
107
|
+
*
|
|
108
|
+
* When KEYS[2] is present BOTH keys are deleted, EACH only if WE own it. With
|
|
109
|
+
* no KEYS[2] this is byte-identical to the single-key release. */
|
|
77
110
|
const RELEASE_LUA = `
|
|
111
|
+
local deleted = 0
|
|
78
112
|
if redis.call("GET", KEYS[1]) == ARGV[1] then
|
|
79
|
-
|
|
113
|
+
deleted = redis.call("DEL", KEYS[1])
|
|
80
114
|
end
|
|
81
|
-
|
|
115
|
+
if KEYS[2] ~= nil and redis.call("GET", KEYS[2]) == ARGV[2] then
|
|
116
|
+
redis.call("DEL", KEYS[2])
|
|
117
|
+
end
|
|
118
|
+
return deleted
|
|
82
119
|
`;
|
|
83
120
|
/** Canonical lease key shape, pinned by D402. */
|
|
84
121
|
export function leaseKey(service, scope) {
|
|
@@ -179,6 +216,8 @@ export class SingleActiveLease {
|
|
|
179
216
|
ownerId;
|
|
180
217
|
key;
|
|
181
218
|
fenceCounterKey;
|
|
219
|
+
/** The optional sunset-dated deploy-window legacy key (D402 e7eec3aa). */
|
|
220
|
+
legacyKey;
|
|
182
221
|
redis;
|
|
183
222
|
ttlMs;
|
|
184
223
|
ttlSeconds;
|
|
@@ -199,6 +238,7 @@ export class SingleActiveLease {
|
|
|
199
238
|
this.telemetry = opts.telemetry;
|
|
200
239
|
this.key = leaseKey(opts.service, opts.scope);
|
|
201
240
|
this.fenceCounterKey = fenceKey(opts.service, opts.scope);
|
|
241
|
+
this.legacyKey = opts.legacyKey ?? null;
|
|
202
242
|
}
|
|
203
243
|
/** Did we currently hold the lease as of the last acquire/renew? */
|
|
204
244
|
get leaseAcquired() {
|
|
@@ -218,7 +258,12 @@ export class SingleActiveLease {
|
|
|
218
258
|
* fence token is captured atomically inside the acquire Lua.
|
|
219
259
|
*/
|
|
220
260
|
async acquire() {
|
|
221
|
-
|
|
261
|
+
// With a legacy key configured, pass it as KEYS[3] so the acquire Lua
|
|
262
|
+
// both-or-neither-gates the legacy key too. Unset ⇒ the 2-key form, which is
|
|
263
|
+
// byte-identical to the pre-legacyKey behavior (KEYS[3] is nil in Lua).
|
|
264
|
+
const result = this.legacyKey !== null
|
|
265
|
+
? await this.redis.eval(ACQUIRE_LUA, 3, this.key, this.fenceCounterKey, this.legacyKey, this.ownerId, String(this.ttlSeconds))
|
|
266
|
+
: await this.redis.eval(ACQUIRE_LUA, 2, this.key, this.fenceCounterKey, this.ownerId, String(this.ttlSeconds));
|
|
222
267
|
// Lua `false` → not acquired; a number → our captured fence.
|
|
223
268
|
if (result === false || result === null) {
|
|
224
269
|
this._acquired = false;
|
|
@@ -269,10 +314,30 @@ export class SingleActiveLease {
|
|
|
269
314
|
}, renewMs);
|
|
270
315
|
this.renewTimer.unref?.();
|
|
271
316
|
}
|
|
317
|
+
/**
|
|
318
|
+
* Issue a CAS-renew eval, gating BOTH keys when a legacy key is configured
|
|
319
|
+
* (KEYS[2] = legacy key, ARGV[2] = bare ownerId). Unset ⇒ the 1-key form,
|
|
320
|
+
* byte-identical to the pre-legacyKey renew (KEYS[2] is nil in Lua).
|
|
321
|
+
*/
|
|
322
|
+
renewEval(encoded) {
|
|
323
|
+
return this.legacyKey !== null
|
|
324
|
+
? this.redis.eval(RENEW_LUA, 2, this.key, this.legacyKey, encoded, this.ownerId, String(this.ttlSeconds))
|
|
325
|
+
: this.redis.eval(RENEW_LUA, 1, this.key, encoded, this.ownerId, String(this.ttlSeconds));
|
|
326
|
+
}
|
|
327
|
+
/**
|
|
328
|
+
* Issue a CAS-release eval, deleting BOTH keys when a legacy key is configured
|
|
329
|
+
* (KEYS[2] = legacy key, ARGV[2] = bare ownerId), each only if we own it.
|
|
330
|
+
* Unset ⇒ the 1-key form, byte-identical to the pre-legacyKey release.
|
|
331
|
+
*/
|
|
332
|
+
releaseEval(encoded) {
|
|
333
|
+
return this.legacyKey !== null
|
|
334
|
+
? this.redis.eval(RELEASE_LUA, 2, this.key, this.legacyKey, encoded, this.ownerId)
|
|
335
|
+
: this.redis.eval(RELEASE_LUA, 1, this.key, encoded, this.ownerId);
|
|
336
|
+
}
|
|
272
337
|
/** One CAS renew. Marks the lease lost (and stops the loop) on failure. */
|
|
273
338
|
async renewOnce(encoded) {
|
|
274
339
|
try {
|
|
275
|
-
const r = (await this.
|
|
340
|
+
const r = (await this.renewEval(encoded));
|
|
276
341
|
if (Number(r) === 1) {
|
|
277
342
|
// CANONICAL renewed_total, ISOLATED — a metric throw here must NOT reach
|
|
278
343
|
// the outer catch (which would FALSE-mark the lease lost on a HEALTHY
|
|
@@ -321,7 +386,7 @@ export class SingleActiveLease {
|
|
|
321
386
|
return false;
|
|
322
387
|
const encoded = encodeLeaseValue(this.ownerId, this._fencingToken);
|
|
323
388
|
try {
|
|
324
|
-
const r = (await this.
|
|
389
|
+
const r = (await this.renewEval(encoded));
|
|
325
390
|
const held = Number(r) === 1;
|
|
326
391
|
if (!held)
|
|
327
392
|
this.markLost("lost");
|
|
@@ -384,7 +449,7 @@ export class SingleActiveLease {
|
|
|
384
449
|
return;
|
|
385
450
|
const encoded = encodeLeaseValue(this.ownerId, this._fencingToken);
|
|
386
451
|
try {
|
|
387
|
-
await this.
|
|
452
|
+
await this.releaseEval(encoded);
|
|
388
453
|
}
|
|
389
454
|
catch {
|
|
390
455
|
/* swallow — key TTL-expires anyway */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"single-active-lease.js","sourceRoot":"","sources":["../../src/worker/single-active-lease.ts"],"names":[],"mappings":"AAAA,+EAA+E;AAC/E,4CAA4C;AAC5C,EAAE;AACF,sEAAsE;AACtE,0EAA0E;AAC1E,8EAA8E;AAC9E,+DAA+D;AAC/D,oGAAoG;AACpG,4EAA4E;AAC5E,EAAE;AACF,sCAAsC;AACtC,+DAA+D;AAC/D,iDAAiD;AACjD,kEAAkE;AAClE,+DAA+D;AAC/D,0EAA0E;AAC1E,+EAA+E;AAC/E,gFAAgF;AAChF,sBAAsB;AACtB,8BAA8B;AAC9B,EAAE;AACF,iFAAiF;AACjF,iFAAiF;AACjF,EAAE;AACF,+DAA+D;AAC/D,iFAAiF;AACjF,iFAAiF;AACjF,2EAA2E;AAC3E,8EAA8E;AAC9E,gFAAgF;AAChF,+EAA+E;AAC/E,6EAA6E;AAC7E,0DAA0D;AAC1D,EAAE;AACF,gFAAgF;AAChF,uEAAuE;AACvE,2EAA2E;AAC3E,4EAA4E;AAC5E,2DAA2D;AAC3D,EAAE;AACF,2EAA2E;AAC3E,gFAAgF;AAChF,EAAE;AACF,8EAA8E;AAC9E,gFAAgF;AAChF,uEAAuE;AACvE,gFAAgF;AAChF,gFAAgF;AAChF,yEAAyE;AACzE,iCAAiC;AAGjC,OAAO,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;AACpC,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAqC/D
|
|
1
|
+
{"version":3,"file":"single-active-lease.js","sourceRoot":"","sources":["../../src/worker/single-active-lease.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nodii/telemetry",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.16.0",
|
|
4
4
|
"description": "Substrate observability library for the Nodii microservice stack — OTel wrapper, log envelope, intent lifecycle, audit signal, agent registry, context propagation. Spec: planning hub docKey=telemetry.",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"type": "module",
|
|
@@ -27,6 +27,10 @@
|
|
|
27
27
|
"types": "./dist/lambda/index.d.ts",
|
|
28
28
|
"default": "./dist/lambda/index.js"
|
|
29
29
|
},
|
|
30
|
+
"./hono": {
|
|
31
|
+
"types": "./dist/hono/index.d.ts",
|
|
32
|
+
"default": "./dist/hono/index.js"
|
|
33
|
+
},
|
|
30
34
|
"./worker": {
|
|
31
35
|
"types": "./dist/worker/index.d.ts",
|
|
32
36
|
"default": "./dist/worker/index.js"
|