@codelitdev/observability 0.4.0 → 0.4.2
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/README.md +12 -0
- package/dist/create.d.ts +4 -0
- package/dist/create.d.ts.map +1 -1
- package/dist/create.js +38 -55
- package/dist/create.js.map +1 -1
- package/dist/redaction.d.ts +9 -2
- package/dist/redaction.d.ts.map +1 -1
- package/dist/redaction.js +12 -6
- package/dist/redaction.js.map +1 -1
- package/dist/transport.d.ts +22 -0
- package/dist/transport.d.ts.map +1 -0
- package/dist/transport.js +64 -0
- package/dist/transport.js.map +1 -0
- package/package.json +1 -1
package/README.md
CHANGED
|
@@ -10,6 +10,18 @@ client in tests. `logs.otlp` adds an OTLP/HTTP log fan-out while structured
|
|
|
10
10
|
stdout remains enabled; both remote pipelines are failure-isolated and
|
|
11
11
|
timeout-bounded during shutdown.
|
|
12
12
|
|
|
13
|
+
Both pipelines queue what they send and post it in batches (PostHog
|
|
14
|
+
`/batch/`, one OTLP request per batch): every second or once 50 items are
|
|
15
|
+
waiting, with a 10-second request timeout and two retries on network errors,
|
|
16
|
+
429 and 5xx. The queue holds at most 1,000 items, dropping the oldest. Call
|
|
17
|
+
`shutdown()` before a process exits, or queued items are lost.
|
|
18
|
+
|
|
19
|
+
`contextPolicy.propertyAllowlist` decides which properties are sent. String
|
|
20
|
+
values are masked for emails, secrets and anything that looks like a token
|
|
21
|
+
(24 or more letters, digits, `-` or `_`). List keys that hold opaque record
|
|
22
|
+
ids, such as `team_id`, in `contextPolicy.identifierKeys` so their UUIDs are
|
|
23
|
+
not masked too. Never list a key that can hold a session or access token.
|
|
24
|
+
|
|
13
25
|
Next.js (and other browser) apps use `createBrowserObservability` from
|
|
14
26
|
`@codelitdev/observability/browser`. Pass `apiKey` from request-time env
|
|
15
27
|
(`POSTHOG_API_KEY`), not `NEXT_PUBLIC_*`, so OSS images can enable telemetry
|
package/dist/create.d.ts
CHANGED
|
@@ -13,6 +13,10 @@ export type CaptureClient = {
|
|
|
13
13
|
};
|
|
14
14
|
export type ContextPolicy = {
|
|
15
15
|
propertyAllowlist: ReadonlySet<string>;
|
|
16
|
+
/** Allowlisted keys holding opaque record ids (for example `team_id`).
|
|
17
|
+
* Their values are sent as-is apart from email and secret masking. Don't
|
|
18
|
+
* list keys that can hold session or access tokens. */
|
|
19
|
+
identifierKeys?: ReadonlySet<string>;
|
|
16
20
|
};
|
|
17
21
|
export type CreateObservabilityOptions = {
|
|
18
22
|
serviceName: string;
|
package/dist/create.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create.d.ts","sourceRoot":"","sources":["../src/create.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAC/D,OAAa,EAAE,KAAK,MAAM,EAAE,MAAM,MAAM,CAAC;AACzC,OAAO,EAAE,KAAK,KAAK,EAAiC,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"create.d.ts","sourceRoot":"","sources":["../src/create.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAC/D,OAAa,EAAE,KAAK,MAAM,EAAE,MAAM,MAAM,CAAC;AACzC,OAAO,EAAE,KAAK,KAAK,EAAiC,MAAM,aAAa,CAAC;AAIxE,MAAM,MAAM,kBAAkB,GAAG,KAAK,CAAC;AAEvC,MAAM,MAAM,aAAa,GAAG;IAC1B,gBAAgB,CACd,KAAK,EAAE,KAAK,EACZ,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAClC,IAAI,CAAC;IACR,OAAO,CAAC,KAAK,EAAE;QACb,KAAK,EAAE,MAAM,CAAC;QACd,UAAU,EAAE,MAAM,CAAC;QACnB,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;KACrC,GAAG,IAAI,CAAC;IACT,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CAC3B,CAAC;AAiFF,MAAM,MAAM,aAAa,GAAG;IAC1B,iBAAiB,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;IACvC;;2DAEuD;IACvD,cAAc,CAAC,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;CACtC,CAAC;AAEF,MAAM,MAAM,0BAA0B,GAAG;IACvC,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,CAAC,EAAE;QACR,MAAM,EAAE,MAAM,CAAC;QACf,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,MAAM,CAAC,EAAE,aAAa,CAAC;KACxB,CAAC;IACF,IAAI,CAAC,EAAE;QACL,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,IAAI,CAAC,EAAE;YACL,QAAQ,EAAE,MAAM,CAAC;YACjB,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;SAClC,CAAC;KACH,CAAC;IACF,aAAa,EAAE,aAAa,CAAC;IAC7B,KAAK,CAAC,EAAE,KAAK,CAAC;IACd,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG;IAC1B,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,CAAC,KAAK,EAAE;QAClB,KAAK,EAAE,MAAM,CAAC;QACd,MAAM,EAAE,MAAM,CAAC;QACf,SAAS,CAAC,EAAE,OAAO,CAAC;QACpB,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;KACtC,GAAG,IAAI,CAAC;IACT,gBAAgB,CAAC,KAAK,EAAE;QACtB,KAAK,EAAE,OAAO,CAAC;QACf,MAAM,EAAE,MAAM,CAAC;QACf,SAAS,CAAC,EAAE,OAAO,CAAC;QACpB,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QAClC,QAAQ,CAAC,EAAE,OAAO,GAAG,SAAS,GAAG,UAAU,CAAC;KAC7C,GAAG,IAAI,CAAC;IACT,mBAAmB,CACjB,KAAK,EAAE,OAAO,EACd,GAAG,EAAE,OAAO,EACZ,GAAG,EAAE,QAAQ,EACb,IAAI,EAAE,YAAY,GACjB,IAAI,CAAC;IACR,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC5C,OAAO,EAAE,OAAO,CAAC;CAClB,CAAC;AAiCF;;;GAGG;AACH,wBAAgB,mBAAmB,CACjC,OAAO,EAAE,0BAA0B,GAClC,aAAa,CA0If"}
|
package/dist/create.js
CHANGED
|
@@ -1,67 +1,52 @@
|
|
|
1
1
|
import pino from "pino";
|
|
2
2
|
import { createDedupe, createSourceCap } from "./limits.js";
|
|
3
3
|
import { opaqueSubjectId, pickAllowlisted, redactText } from "./redaction.js";
|
|
4
|
+
import { createBatchSender } from "./transport.js";
|
|
4
5
|
function createOtlpLogStream(input) {
|
|
5
|
-
const
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
})
|
|
26
|
-
.then(() => undefined)
|
|
27
|
-
.catch(() => undefined)
|
|
28
|
-
.finally(() => {
|
|
29
|
-
clearTimeout(timer);
|
|
30
|
-
pending.delete(request);
|
|
31
|
-
});
|
|
32
|
-
pending.add(request);
|
|
33
|
-
},
|
|
34
|
-
};
|
|
6
|
+
const sender = createBatchSender({
|
|
7
|
+
send: (messages, signal) => fetch(input.endpoint, {
|
|
8
|
+
method: "POST",
|
|
9
|
+
headers: { "content-type": "application/json", ...input.headers },
|
|
10
|
+
body: JSON.stringify({
|
|
11
|
+
resourceLogs: [
|
|
12
|
+
{
|
|
13
|
+
scopeLogs: [
|
|
14
|
+
{
|
|
15
|
+
logRecords: messages.map((message) => ({
|
|
16
|
+
body: { stringValue: message },
|
|
17
|
+
})),
|
|
18
|
+
},
|
|
19
|
+
],
|
|
20
|
+
},
|
|
21
|
+
],
|
|
22
|
+
}),
|
|
23
|
+
signal,
|
|
24
|
+
}),
|
|
25
|
+
});
|
|
35
26
|
return {
|
|
36
|
-
stream
|
|
37
|
-
|
|
38
|
-
|
|
27
|
+
stream: {
|
|
28
|
+
write(message) {
|
|
29
|
+
sender.push(message.trim());
|
|
30
|
+
},
|
|
39
31
|
},
|
|
32
|
+
shutdown: () => sender.shutdown(),
|
|
40
33
|
};
|
|
41
34
|
}
|
|
42
35
|
function createHttpCaptureClient(input) {
|
|
43
|
-
const endpoint = `${(input.host ?? "https://app.posthog.com").replace(/\/$/, "")}/
|
|
44
|
-
const
|
|
45
|
-
|
|
46
|
-
const controller = new AbortController();
|
|
47
|
-
const timer = setTimeout(() => controller.abort(), 2_000);
|
|
48
|
-
const request = fetch(endpoint, {
|
|
36
|
+
const endpoint = `${(input.host ?? "https://app.posthog.com").replace(/\/$/, "")}/batch/`;
|
|
37
|
+
const sender = createBatchSender({
|
|
38
|
+
send: (batch, signal) => fetch(endpoint, {
|
|
49
39
|
method: "POST",
|
|
50
40
|
headers: {
|
|
51
41
|
"content-type": "application/json",
|
|
52
42
|
authorization: `Bearer ${input.apiKey}`,
|
|
53
43
|
},
|
|
54
|
-
body: JSON.stringify({ api_key: input.apiKey,
|
|
55
|
-
signal
|
|
56
|
-
})
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
clearTimeout(timer);
|
|
61
|
-
pending.delete(request);
|
|
62
|
-
});
|
|
63
|
-
pending.add(request);
|
|
64
|
-
};
|
|
44
|
+
body: JSON.stringify({ api_key: input.apiKey, batch }),
|
|
45
|
+
signal,
|
|
46
|
+
}),
|
|
47
|
+
});
|
|
48
|
+
// Events wait in a batch, so each carries the time it happened.
|
|
49
|
+
const send = (payload) => sender.push({ ...payload, timestamp: new Date().toISOString() });
|
|
65
50
|
return {
|
|
66
51
|
captureException(error, distinctId, properties) {
|
|
67
52
|
send({
|
|
@@ -82,9 +67,7 @@ function createHttpCaptureClient(input) {
|
|
|
82
67
|
properties: input.properties,
|
|
83
68
|
});
|
|
84
69
|
},
|
|
85
|
-
|
|
86
|
-
await Promise.allSettled([...pending]);
|
|
87
|
-
},
|
|
70
|
+
shutdown: () => sender.shutdown(),
|
|
88
71
|
};
|
|
89
72
|
}
|
|
90
73
|
const systemClock = { now: () => new Date() };
|
|
@@ -180,7 +163,7 @@ export function createObservability(options) {
|
|
|
180
163
|
error_name: parts.name,
|
|
181
164
|
error_message: parts.message,
|
|
182
165
|
error_stack_top: parts.stackTop,
|
|
183
|
-
...pickAllowlisted(input.context ?? {}, options.contextPolicy.propertyAllowlist),
|
|
166
|
+
...pickAllowlisted(input.context ?? {}, options.contextPolicy.propertyAllowlist, options.contextPolicy.identifierKeys),
|
|
184
167
|
});
|
|
185
168
|
}
|
|
186
169
|
catch {
|
|
@@ -207,7 +190,7 @@ export function createObservability(options) {
|
|
|
207
190
|
environment: options.environment,
|
|
208
191
|
source: input.source,
|
|
209
192
|
subject_id: subject,
|
|
210
|
-
...pickAllowlisted(input.properties ?? {}, options.contextPolicy.propertyAllowlist),
|
|
193
|
+
...pickAllowlisted(input.properties ?? {}, options.contextPolicy.propertyAllowlist, options.contextPolicy.identifierKeys),
|
|
211
194
|
},
|
|
212
195
|
});
|
|
213
196
|
}
|
package/dist/create.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create.js","sourceRoot":"","sources":["../src/create.ts"],"names":[],"mappings":"AACA,OAAO,IAAqB,MAAM,MAAM,CAAC;AACzC,OAAO,EAAc,YAAY,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AACxE,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"create.js","sourceRoot":"","sources":["../src/create.ts"],"names":[],"mappings":"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"}
|
package/dist/redaction.d.ts
CHANGED
|
@@ -1,5 +1,12 @@
|
|
|
1
|
-
export declare function redactText(input: string, limit?: number
|
|
1
|
+
export declare function redactText(input: string, limit?: number, options?: {
|
|
2
|
+
keepLongTokens?: boolean;
|
|
3
|
+
}): string;
|
|
2
4
|
export declare function isSensitiveKey(key: string): boolean;
|
|
3
|
-
|
|
5
|
+
/**
|
|
6
|
+
* Keeps allowlisted keys only, with secrets and emails masked. Values of
|
|
7
|
+
* `identifierKeys` (opaque record ids such as UUIDs) skip the long-token mask,
|
|
8
|
+
* which would otherwise hide every id of 24 or more characters.
|
|
9
|
+
*/
|
|
10
|
+
export declare function pickAllowlisted(input: Record<string, unknown>, allowlist: ReadonlySet<string>, identifierKeys?: ReadonlySet<string>): Record<string, string | number | boolean>;
|
|
4
11
|
export declare function opaqueSubjectId(value: unknown): string;
|
|
5
12
|
//# sourceMappingURL=redaction.d.ts.map
|
package/dist/redaction.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"redaction.d.ts","sourceRoot":"","sources":["../src/redaction.ts"],"names":[],"mappings":"AAQA,wBAAgB,UAAU,
|
|
1
|
+
{"version":3,"file":"redaction.d.ts","sourceRoot":"","sources":["../src/redaction.ts"],"names":[],"mappings":"AAQA,wBAAgB,UAAU,CACxB,KAAK,EAAE,MAAM,EACb,KAAK,SAAM,EACX,OAAO,GAAE;IAAE,cAAc,CAAC,EAAE,OAAO,CAAA;CAAO,GACzC,MAAM,CAQR;AAED,wBAAgB,cAAc,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAEnD;AAED;;;;GAIG;AACH,wBAAgB,eAAe,CAC7B,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC9B,SAAS,EAAE,WAAW,CAAC,MAAM,CAAC,EAC9B,cAAc,GAAE,WAAW,CAAC,MAAM,CAAa,GAC9C,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,CAa3C;AAED,wBAAgB,eAAe,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,CAItD"}
|
package/dist/redaction.js
CHANGED
|
@@ -3,12 +3,13 @@ const TOKEN = /\b[A-Za-z0-9_-]{24,}\b/g;
|
|
|
3
3
|
const SECRET_KEYS = /^(authorization|cookie|password|secret|token|api[_-]?key|pepper|digest|card|cvv|pan)$/i;
|
|
4
4
|
const SENSITIVE_ASSIGNMENT = /\b(authorization|cookie|password|secret|token|api[_-]?key|pepper|digest|card|cvv|pan)\b\s*([=:])\s*(?:"[^"]*"|'[^']*'|[^\s,;&})\]]+)/gi;
|
|
5
5
|
const BEARER_TOKEN = /\bBearer\s+[A-Za-z0-9._~+/-]+=*/gi;
|
|
6
|
-
export function redactText(input, limit = 500) {
|
|
7
|
-
|
|
6
|
+
export function redactText(input, limit = 500, options = {}) {
|
|
7
|
+
let masked = input
|
|
8
8
|
.replace(SENSITIVE_ASSIGNMENT, "$1$2[redacted]")
|
|
9
9
|
.replace(BEARER_TOKEN, "Bearer [redacted]")
|
|
10
|
-
.replace(EMAIL, "[redacted-email]")
|
|
11
|
-
|
|
10
|
+
.replace(EMAIL, "[redacted-email]");
|
|
11
|
+
if (!options.keepLongTokens)
|
|
12
|
+
masked = masked.replace(TOKEN, "[redacted-token]");
|
|
12
13
|
if (masked.length <= limit)
|
|
13
14
|
return masked;
|
|
14
15
|
return `${masked.slice(0, limit)}...`;
|
|
@@ -16,7 +17,12 @@ export function redactText(input, limit = 500) {
|
|
|
16
17
|
export function isSensitiveKey(key) {
|
|
17
18
|
return SECRET_KEYS.test(key);
|
|
18
19
|
}
|
|
19
|
-
|
|
20
|
+
/**
|
|
21
|
+
* Keeps allowlisted keys only, with secrets and emails masked. Values of
|
|
22
|
+
* `identifierKeys` (opaque record ids such as UUIDs) skip the long-token mask,
|
|
23
|
+
* which would otherwise hide every id of 24 or more characters.
|
|
24
|
+
*/
|
|
25
|
+
export function pickAllowlisted(input, allowlist, identifierKeys = new Set()) {
|
|
20
26
|
const out = {};
|
|
21
27
|
for (const [key, value] of Object.entries(input)) {
|
|
22
28
|
if (!allowlist.has(key) || isSensitiveKey(key))
|
|
@@ -26,7 +32,7 @@ export function pickAllowlisted(input, allowlist) {
|
|
|
26
32
|
continue;
|
|
27
33
|
}
|
|
28
34
|
if (typeof value === "string") {
|
|
29
|
-
out[key] = redactText(value, 500);
|
|
35
|
+
out[key] = redactText(value, 500, { keepLongTokens: identifierKeys.has(key) });
|
|
30
36
|
}
|
|
31
37
|
}
|
|
32
38
|
return out;
|
package/dist/redaction.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"redaction.js","sourceRoot":"","sources":["../src/redaction.ts"],"names":[],"mappings":"AAAA,MAAM,KAAK,GAAG,6CAA6C,CAAC;AAC5D,MAAM,KAAK,GAAG,yBAAyB,CAAC;AACxC,MAAM,WAAW,GACf,wFAAwF,CAAC;AAC3F,MAAM,oBAAoB,GACxB,wIAAwI,CAAC;AAC3I,MAAM,YAAY,GAAG,mCAAmC,CAAC;AAEzD,MAAM,UAAU,UAAU,
|
|
1
|
+
{"version":3,"file":"redaction.js","sourceRoot":"","sources":["../src/redaction.ts"],"names":[],"mappings":"AAAA,MAAM,KAAK,GAAG,6CAA6C,CAAC;AAC5D,MAAM,KAAK,GAAG,yBAAyB,CAAC;AACxC,MAAM,WAAW,GACf,wFAAwF,CAAC;AAC3F,MAAM,oBAAoB,GACxB,wIAAwI,CAAC;AAC3I,MAAM,YAAY,GAAG,mCAAmC,CAAC;AAEzD,MAAM,UAAU,UAAU,CACxB,KAAa,EACb,KAAK,GAAG,GAAG,EACX,UAAwC,EAAE;IAE1C,IAAI,MAAM,GAAG,KAAK;SACf,OAAO,CAAC,oBAAoB,EAAE,gBAAgB,CAAC;SAC/C,OAAO,CAAC,YAAY,EAAE,mBAAmB,CAAC;SAC1C,OAAO,CAAC,KAAK,EAAE,kBAAkB,CAAC,CAAC;IACtC,IAAI,CAAC,OAAO,CAAC,cAAc;QAAE,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,kBAAkB,CAAC,CAAC;IAChF,IAAI,MAAM,CAAC,MAAM,IAAI,KAAK;QAAE,OAAO,MAAM,CAAC;IAC1C,OAAO,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,KAAK,CAAC;AACxC,CAAC;AAED,MAAM,UAAU,cAAc,CAAC,GAAW;IACxC,OAAO,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAC/B,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,eAAe,CAC7B,KAA8B,EAC9B,SAA8B,EAC9B,iBAAsC,IAAI,GAAG,EAAE;IAE/C,MAAM,GAAG,GAA8C,EAAE,CAAC;IAC1D,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;QACjD,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,cAAc,CAAC,GAAG,CAAC;YAAE,SAAS;QACzD,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,OAAO,KAAK,KAAK,SAAS,EAAE,CAAC;YAC5D,GAAG,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;YACjB,SAAS;QACX,CAAC;QACD,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;YAC9B,GAAG,CAAC,GAAG,CAAC,GAAG,UAAU,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE,cAAc,EAAE,cAAc,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QACjF,CAAC;IACH,CAAC;IACD,OAAO,GAAG,CAAC;AACb,CAAC;AAED,MAAM,UAAU,eAAe,CAAC,KAAc;IAC5C,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,SAAS;QAAE,OAAO,QAAQ,CAAC;IAC3D,MAAM,UAAU,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,IAAI,EAAE,CAAC;IACxC,OAAO,UAAU,IAAI,QAAQ,CAAC;AAChC,CAAC"}
|
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Sends telemetry in batches with retries, so a burst of captures (or a slow
|
|
3
|
+
* network) doesn't drop events. Items wait in a bounded queue and go out when
|
|
4
|
+
* `maxBatch` are waiting or after `flushIntervalMs`. A failed batch (network
|
|
5
|
+
* error, timeout, 429 or 5xx) is retried with backoff, then dropped; telemetry
|
|
6
|
+
* never throws into the caller.
|
|
7
|
+
*/
|
|
8
|
+
export type BatchSenderOptions<T> = {
|
|
9
|
+
send(items: T[], signal: AbortSignal): Promise<Response>;
|
|
10
|
+
maxBatch?: number;
|
|
11
|
+
maxQueue?: number;
|
|
12
|
+
flushIntervalMs?: number;
|
|
13
|
+
timeoutMs?: number;
|
|
14
|
+
retryDelaysMs?: readonly number[];
|
|
15
|
+
};
|
|
16
|
+
export type BatchSender<T> = {
|
|
17
|
+
push(item: T): void;
|
|
18
|
+
/** Sends everything queued and waits for in-flight batches. */
|
|
19
|
+
shutdown(): Promise<void>;
|
|
20
|
+
};
|
|
21
|
+
export declare function createBatchSender<T>(options: BatchSenderOptions<T>): BatchSender<T>;
|
|
22
|
+
//# sourceMappingURL=transport.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"transport.d.ts","sourceRoot":"","sources":["../src/transport.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AACH,MAAM,MAAM,kBAAkB,CAAC,CAAC,IAAI;IAClC,IAAI,CAAC,KAAK,EAAE,CAAC,EAAE,EAAE,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;IACzD,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;CACnC,CAAC;AAEF,MAAM,MAAM,WAAW,CAAC,CAAC,IAAI;IAC3B,IAAI,CAAC,IAAI,EAAE,CAAC,GAAG,IAAI,CAAC;IACpB,+DAA+D;IAC/D,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CAC3B,CAAC;AAKF,wBAAgB,iBAAiB,CAAC,CAAC,EAAE,OAAO,EAAE,kBAAkB,CAAC,CAAC,CAAC,GAAG,WAAW,CAAC,CAAC,CAAC,CA2DnF"}
|
|
@@ -0,0 +1,64 @@
|
|
|
1
|
+
const RETRYABLE_STATUS = (status) => status === 429 || status >= 500;
|
|
2
|
+
const sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
|
|
3
|
+
export function createBatchSender(options) {
|
|
4
|
+
const maxBatch = options.maxBatch ?? 50;
|
|
5
|
+
const maxQueue = options.maxQueue ?? 1_000;
|
|
6
|
+
const flushIntervalMs = options.flushIntervalMs ?? 1_000;
|
|
7
|
+
const timeoutMs = options.timeoutMs ?? 10_000;
|
|
8
|
+
const retryDelaysMs = options.retryDelaysMs ?? [500, 2_000];
|
|
9
|
+
const queue = [];
|
|
10
|
+
const inFlight = new Set();
|
|
11
|
+
let timer;
|
|
12
|
+
async function deliver(items) {
|
|
13
|
+
for (let attempt = 0; attempt <= retryDelaysMs.length; attempt++) {
|
|
14
|
+
const controller = new AbortController();
|
|
15
|
+
const abort = setTimeout(() => controller.abort(), timeoutMs);
|
|
16
|
+
try {
|
|
17
|
+
const response = await options.send(items, controller.signal);
|
|
18
|
+
if (!RETRYABLE_STATUS(response.status))
|
|
19
|
+
return;
|
|
20
|
+
}
|
|
21
|
+
catch {
|
|
22
|
+
// Network error or timeout: retry below.
|
|
23
|
+
}
|
|
24
|
+
finally {
|
|
25
|
+
clearTimeout(abort);
|
|
26
|
+
}
|
|
27
|
+
const delay = retryDelaysMs[attempt];
|
|
28
|
+
if (delay === undefined)
|
|
29
|
+
return;
|
|
30
|
+
await sleep(delay);
|
|
31
|
+
}
|
|
32
|
+
}
|
|
33
|
+
function drain() {
|
|
34
|
+
if (timer) {
|
|
35
|
+
clearTimeout(timer);
|
|
36
|
+
timer = undefined;
|
|
37
|
+
}
|
|
38
|
+
while (queue.length) {
|
|
39
|
+
const request = deliver(queue.splice(0, maxBatch)).finally(() => inFlight.delete(request));
|
|
40
|
+
inFlight.add(request);
|
|
41
|
+
}
|
|
42
|
+
}
|
|
43
|
+
return {
|
|
44
|
+
push(item) {
|
|
45
|
+
// Keep memory bounded if the endpoint is down: drop the oldest.
|
|
46
|
+
if (queue.length >= maxQueue)
|
|
47
|
+
queue.shift();
|
|
48
|
+
queue.push(item);
|
|
49
|
+
if (queue.length >= maxBatch) {
|
|
50
|
+
drain();
|
|
51
|
+
}
|
|
52
|
+
else if (!timer) {
|
|
53
|
+
timer = setTimeout(drain, flushIntervalMs);
|
|
54
|
+
// Pending telemetry must not keep a CLI or test process alive.
|
|
55
|
+
timer.unref?.();
|
|
56
|
+
}
|
|
57
|
+
},
|
|
58
|
+
async shutdown() {
|
|
59
|
+
drain();
|
|
60
|
+
await Promise.allSettled([...inFlight]);
|
|
61
|
+
},
|
|
62
|
+
};
|
|
63
|
+
}
|
|
64
|
+
//# sourceMappingURL=transport.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"transport.js","sourceRoot":"","sources":["../src/transport.ts"],"names":[],"mappings":"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"}
|