fix(telemetry): send both telemetry ports through one collector transport (Q-6.9-4)
The application port (best-effort-telemetry) and the feature port (feature-telemetry pipeline) each posted to TELEMETRY_ENDPOINT on their own: 20+20 sends per minute, cookies on the application side, no pagehide flush or dispose abort on the feature side, and no deadline on any fetch, so a hung collector held activeFlush forever (6.3-10). New src/adapters/telemetry/telemetry-collector.ts is the one transport: shared send-rate window (createTelemetrySendRate, now in the platform pipeline and injectable via `sendRate`), credentials "omit", cache "no-store", a per-request deadline through the kernel createAbortableOperation, and one pagehide fan-out. runtime-adapters builds one collector and passes it to both ports. Body projections are unchanged and pinned by characterization tests first. Verified: new tests in tests/unit/telemetry.test.ts (5 RED before wiring: credentials/cache, hung collector timeout, shared rate, feature pagehide flush, feature dispose abort); all gates pass except the known tests/unit/removal-fixture.test.ts (artifacts/ absent); check:adapter-inventory 137/137; FE-RB-004 drill PASS. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
co-authored by
Claude Opus 5.5
parent
b35304dd48
commit
a328776bf2
@@ -5,6 +5,11 @@ import {
|
||||
createTelemetryAdapter,
|
||||
safeTraceparent,
|
||||
} from "../../src/adapters/telemetry/best-effort-telemetry.ts";
|
||||
import {
|
||||
createFeatureTelemetry,
|
||||
createFetchTelemetryTransport,
|
||||
} from "../../src/adapters/telemetry/feature-telemetry.ts";
|
||||
import { createTelemetryCollector } from "../../src/adapters/telemetry/telemetry-collector.ts";
|
||||
import {
|
||||
TELEMETRY_REGISTRY,
|
||||
projectTelemetryEvent,
|
||||
@@ -357,6 +362,238 @@ describe("best-effort telemetry adapter", () => {
|
||||
);
|
||||
});
|
||||
|
||||
describe("telemetry collector payloads (Q-6.9-4)", () => {
|
||||
function recordingFetcher() {
|
||||
const calls: Array<Readonly<{ url: string; init: RequestInit }>> = [];
|
||||
const fetcher = vi.fn(async (url: RequestInfo | URL, init?: RequestInit) => {
|
||||
calls.push({ url: String(url), init: init ?? {} });
|
||||
return new Response(null, { status: 204 });
|
||||
});
|
||||
return { calls, fetcher: fetcher as unknown as typeof fetch };
|
||||
}
|
||||
|
||||
it("posts the contract projection for the application port", async () => {
|
||||
const { calls, fetcher } = recordingFetcher();
|
||||
const adapter = createTelemetryAdapter({
|
||||
enabled: true,
|
||||
endpoint: "https://telemetry.test/events",
|
||||
schedule: () => {},
|
||||
now: () => Date.parse("2026-09-24T00:00:00.000Z"),
|
||||
fetcher,
|
||||
});
|
||||
adapter.emit("api.request.failed", validAttributes);
|
||||
await adapter.flush();
|
||||
|
||||
expect(calls).toHaveLength(1);
|
||||
expect(calls[0]?.url).toBe("https://telemetry.test/events");
|
||||
expect(calls[0]?.init).toMatchObject({
|
||||
method: "POST",
|
||||
headers: { "Content-Type": "application/json" },
|
||||
keepalive: true,
|
||||
});
|
||||
expect(JSON.parse(String(calls[0]?.init.body))).toEqual({
|
||||
events: [
|
||||
{
|
||||
eventName: "api.request.failed",
|
||||
timestamp: "2026-09-24T00:00:00.000Z",
|
||||
attributes: validAttributes,
|
||||
},
|
||||
],
|
||||
});
|
||||
adapter.dispose();
|
||||
});
|
||||
|
||||
it("posts the pipeline projection for the feature port", async () => {
|
||||
const { calls, fetcher } = recordingFetcher();
|
||||
const transport = createFetchTelemetryTransport({
|
||||
endpoint: "https://telemetry.test/events",
|
||||
fetcher,
|
||||
});
|
||||
await transport.send([
|
||||
{
|
||||
event: { kind: "catalog.load.failed", severity: "error", featureId: "catalog" },
|
||||
fingerprint: "fp-1",
|
||||
occurrences: 3,
|
||||
},
|
||||
]);
|
||||
|
||||
expect(calls).toHaveLength(1);
|
||||
expect(calls[0]?.url).toBe("https://telemetry.test/events");
|
||||
expect(calls[0]?.init).toMatchObject({
|
||||
method: "POST",
|
||||
headers: { "Content-Type": "application/json" },
|
||||
keepalive: true,
|
||||
credentials: "omit",
|
||||
cache: "no-store",
|
||||
});
|
||||
expect(JSON.parse(String(calls[0]?.init.body))).toEqual({
|
||||
events: [
|
||||
{
|
||||
kind: "catalog.load.failed",
|
||||
severity: "error",
|
||||
featureId: "catalog",
|
||||
fingerprint: "fp-1",
|
||||
occurrences: 3,
|
||||
},
|
||||
],
|
||||
});
|
||||
});
|
||||
|
||||
it("rejects a feature batch the collector refuses", async () => {
|
||||
const transport = createFetchTelemetryTransport({
|
||||
endpoint: "https://telemetry.test/events",
|
||||
fetcher: (async () => new Response(null, { status: 503 })) as typeof fetch,
|
||||
});
|
||||
await expect(transport.send([])).rejects.toThrow();
|
||||
});
|
||||
});
|
||||
|
||||
describe("one collector transport for both telemetry ports (Q-6.9-4)", () => {
|
||||
const featureEvent = {
|
||||
kind: "catalog.load.failed",
|
||||
severity: "error",
|
||||
featureId: "catalog",
|
||||
} as const;
|
||||
const hungFetcher = () => {
|
||||
const signals: AbortSignal[] = [];
|
||||
// Never settles and ignores its signal: only the collector can end it.
|
||||
const fetcher = vi.fn((_url: RequestInfo | URL, init?: RequestInit) => {
|
||||
if (init?.signal) signals.push(init.signal);
|
||||
return new Promise<Response>(() => {});
|
||||
});
|
||||
return { signals, fetcher: fetcher as unknown as typeof fetch, calls: fetcher };
|
||||
};
|
||||
|
||||
it("sends application telemetry without cookies or HTTP cache", async () => {
|
||||
const fetcher = vi.fn(async () => new Response(null, { status: 204 }));
|
||||
const adapter = createTelemetryAdapter({
|
||||
enabled: true,
|
||||
endpoint: "https://telemetry.test/events",
|
||||
schedule: () => {},
|
||||
fetcher: fetcher as unknown as typeof fetch,
|
||||
});
|
||||
adapter.emit("api.request.failed", validAttributes);
|
||||
await adapter.flush();
|
||||
|
||||
expect(fetcher).toHaveBeenCalledWith(
|
||||
"https://telemetry.test/events",
|
||||
expect.objectContaining({ credentials: "omit", cache: "no-store" }),
|
||||
);
|
||||
adapter.dispose();
|
||||
});
|
||||
|
||||
it("times out a hung collector so later application flushes still send", async () => {
|
||||
const { fetcher, calls } = hungFetcher();
|
||||
const collector = createTelemetryCollector({
|
||||
endpoint: "https://telemetry.test/events",
|
||||
fetcher,
|
||||
timeoutMs: 5,
|
||||
});
|
||||
const adapter = createTelemetryAdapter({
|
||||
enabled: true,
|
||||
endpoint: "https://telemetry.test/events",
|
||||
schedule: () => {},
|
||||
collector,
|
||||
});
|
||||
adapter.emit("api.request.failed", validAttributes);
|
||||
await adapter.flush();
|
||||
expect(adapter.dropReasons()).toEqual({ "sink-failure": 1 });
|
||||
|
||||
adapter.emit("api.request.failed", validAttributes);
|
||||
await adapter.flush();
|
||||
expect(calls).toHaveBeenCalledTimes(2);
|
||||
adapter.dispose();
|
||||
});
|
||||
|
||||
it("times out a hung collector for feature telemetry", async () => {
|
||||
const { fetcher } = hungFetcher();
|
||||
const telemetry = createFeatureTelemetry({
|
||||
enabled: true,
|
||||
endpoint: "https://telemetry.test/events",
|
||||
collector: createTelemetryCollector({
|
||||
endpoint: "https://telemetry.test/events",
|
||||
fetcher,
|
||||
timeoutMs: 5,
|
||||
}),
|
||||
});
|
||||
await telemetry.emit(featureEvent);
|
||||
await telemetry.flush();
|
||||
expect(telemetry.stats()).toMatchObject({ sends: 1, failedSends: 1 });
|
||||
telemetry.dispose();
|
||||
});
|
||||
|
||||
it("shares one send-rate window between the two ports", async () => {
|
||||
const fetcher = vi.fn(async () => new Response(null, { status: 204 }));
|
||||
const collector = createTelemetryCollector({
|
||||
endpoint: "https://telemetry.test/events",
|
||||
fetcher: fetcher as unknown as typeof fetch,
|
||||
maxSendsPerMinute: 1,
|
||||
});
|
||||
const adapter = createTelemetryAdapter({
|
||||
enabled: true,
|
||||
endpoint: "https://telemetry.test/events",
|
||||
schedule: () => {},
|
||||
setTimer: () => 0,
|
||||
clearTimer: () => {},
|
||||
collector,
|
||||
});
|
||||
const telemetry = createFeatureTelemetry({
|
||||
enabled: true,
|
||||
endpoint: "https://telemetry.test/events",
|
||||
collector,
|
||||
});
|
||||
|
||||
adapter.emit("api.request.failed", validAttributes);
|
||||
await adapter.flush();
|
||||
await telemetry.emit(featureEvent);
|
||||
await telemetry.flush();
|
||||
|
||||
expect(fetcher).toHaveBeenCalledOnce();
|
||||
expect(telemetry.stats().buffered).toBe(1);
|
||||
adapter.dispose();
|
||||
telemetry.dispose();
|
||||
});
|
||||
|
||||
it("flushes feature telemetry on page exit and stops listening on dispose", async () => {
|
||||
const lifecycle = new EventTarget();
|
||||
const remove = vi.spyOn(lifecycle, "removeEventListener");
|
||||
const fetcher = vi.fn(async () => new Response(null, { status: 204 }));
|
||||
const telemetry = createFeatureTelemetry({
|
||||
enabled: true,
|
||||
endpoint: "https://telemetry.test/events",
|
||||
collector: createTelemetryCollector({
|
||||
endpoint: "https://telemetry.test/events",
|
||||
fetcher: fetcher as unknown as typeof fetch,
|
||||
lifecycle,
|
||||
}),
|
||||
});
|
||||
await telemetry.emit(featureEvent);
|
||||
await vi.waitFor(() => expect(fetcher).toHaveBeenCalledOnce());
|
||||
// A duplicate is held until the next flush; page exit is that flush.
|
||||
await telemetry.emit(featureEvent);
|
||||
expect(fetcher).toHaveBeenCalledOnce();
|
||||
|
||||
lifecycle.dispatchEvent(new Event("pagehide"));
|
||||
await vi.waitFor(() => expect(fetcher).toHaveBeenCalledTimes(2));
|
||||
telemetry.dispose();
|
||||
expect(remove).toHaveBeenCalledWith("pagehide", expect.any(Function));
|
||||
});
|
||||
|
||||
it("aborts an in-flight feature batch on dispose", async () => {
|
||||
const { fetcher, signals } = hungFetcher();
|
||||
const telemetry = createFeatureTelemetry({
|
||||
enabled: true,
|
||||
endpoint: "https://telemetry.test/events",
|
||||
fetcher,
|
||||
});
|
||||
await telemetry.emit(featureEvent);
|
||||
await vi.waitFor(() => expect(signals).toHaveLength(1));
|
||||
|
||||
telemetry.dispose();
|
||||
expect(signals[0]?.aborted).toBe(true);
|
||||
});
|
||||
});
|
||||
|
||||
describe("telemetry adapter send-rate limit (spec §27)", () => {
|
||||
function harness(maxSendsPerMinute = 3) {
|
||||
let now = 0;
|
||||
|
||||
Reference in New Issue
Block a user