From 8df670e09a0271364aa6887699b84791b19ef1c1 Mon Sep 17 00:00:00 2001 From: bymyself Date: Sat, 5 Sep 2026 05:02:05 +0000 Subject: [PATCH 1/2] feat: report CMP event sink failures --- src/platform/telemetry/cmpEventSink.test.ts | 52 +++++++++++++++++++++ src/platform/telemetry/cmpEventSink.ts | 23 +++++++++ 2 files changed, 75 insertions(+) create mode 100644 src/platform/telemetry/cmpEventSink.test.ts create mode 100644 src/platform/telemetry/cmpEventSink.ts diff --git a/src/platform/telemetry/cmpEventSink.test.ts b/src/platform/telemetry/cmpEventSink.test.ts new file mode 100644 index 00000000000..2d09a58b7aa --- /dev/null +++ b/src/platform/telemetry/cmpEventSink.test.ts @@ -0,0 +1,52 @@ +import type { CmpEvent } from '@comfyorg/comfy-multi-player' + +import { reportError } from './reportError' +import { cmpEventSink } from './cmpEventSink' + +vi.mock('./reportError', () => ({ reportError: vi.fn() })) + +const event: CmpEvent = { + schema_version: 1, + type: 'op_rejected', + source: 'applyOps', + code: 'unknown_widget', + message: 'widget write rejected', + error_name: 'OpRejectedError', + op_id: '0123456789abcdef0123456789abcdef', + batch_index: 2 +} + +describe('cmpEventSink', () => { + it('maps a cmp event to the generic error reporter', () => { + expect(cmpEventSink(event)).toBeUndefined() + + expect(reportError).toHaveBeenCalledWith( + expect.objectContaining({ message: event.message }), + { + errorType: 'cmp_event', + tags: { + cmp_event_schema_version: 1, + cmp_event_type: 'op_rejected', + cmp_event_source: 'applyOps', + cmp_event_code: 'unknown_widget', + cmp_event_error_name: 'OpRejectedError' + }, + context: { + op_id: event.op_id, + batch_index: 2 + } + } + ) + }) + + it('bounds diagnostic messages and accepts additive event names', () => { + cmpEventSink({ ...event, type: 'future_event', message: 'x'.repeat(2_000) }) + + expect(reportError).toHaveBeenLastCalledWith( + expect.objectContaining({ message: 'x'.repeat(1_024) }), + expect.objectContaining({ + tags: expect.objectContaining({ cmp_event_type: 'future_event' }) + }) + ) + }) +}) diff --git a/src/platform/telemetry/cmpEventSink.ts b/src/platform/telemetry/cmpEventSink.ts new file mode 100644 index 00000000000..f9b699e383f --- /dev/null +++ b/src/platform/telemetry/cmpEventSink.ts @@ -0,0 +1,23 @@ +import type { CmpEventSink } from '@comfyorg/comfy-multi-player' + +import { reportError } from './reportError' + +const MAX_MESSAGE_LENGTH = 1_024 + +export const cmpEventSink: CmpEventSink = (event) => { + reportError(new Error(event.message.slice(0, MAX_MESSAGE_LENGTH)), { + errorType: 'cmp_event', + tags: { + cmp_event_schema_version: event.schema_version, + cmp_event_type: event.type, + cmp_event_source: event.source, + cmp_event_code: event.code, + cmp_event_error_name: event.error_name + }, + context: { + op_id: event.op_id, + batch_index: event.batch_index + } + }) + return undefined +} From 87b651f3a5ffa28e191d659782e4bb99712276ca Mon Sep 17 00:00:00 2001 From: Christian Byrne Date: Sun, 6 Sep 2026 07:11:21 -0700 Subject: [PATCH 2/2] fix: name cmp event errors and drop undefined context fields --- src/platform/telemetry/cmpEventSink.test.ts | 33 ++++++++++++++++++++- src/platform/telemetry/cmpEventSink.ts | 23 ++++++++++---- 2 files changed, 49 insertions(+), 7 deletions(-) diff --git a/src/platform/telemetry/cmpEventSink.test.ts b/src/platform/telemetry/cmpEventSink.test.ts index 2d09a58b7aa..56dc066dbb5 100644 --- a/src/platform/telemetry/cmpEventSink.test.ts +++ b/src/platform/telemetry/cmpEventSink.test.ts @@ -21,7 +21,10 @@ describe('cmpEventSink', () => { expect(cmpEventSink(event)).toBeUndefined() expect(reportError).toHaveBeenCalledWith( - expect.objectContaining({ message: event.message }), + expect.objectContaining({ + name: 'OpRejectedError', + message: event.message + }), { errorType: 'cmp_event', tags: { @@ -39,6 +42,34 @@ describe('cmpEventSink', () => { ) }) + it('omits absent optional fields for a minimal event', () => { + cmpEventSink({ + schema_version: 1, + type: 'clock_anomaly', + source: 'clock', + code: 'skew', + message: 'clock skew detected' + }) + + expect(reportError).toHaveBeenLastCalledWith( + expect.objectContaining({ + name: 'CmpEvent', + message: 'clock skew detected' + }), + { + errorType: 'cmp_event', + tags: { + cmp_event_schema_version: 1, + cmp_event_type: 'clock_anomaly', + cmp_event_source: 'clock', + cmp_event_code: 'skew', + cmp_event_error_name: undefined + }, + context: {} + } + ) + }) + it('bounds diagnostic messages and accepts additive event names', () => { cmpEventSink({ ...event, type: 'future_event', message: 'x'.repeat(2_000) }) diff --git a/src/platform/telemetry/cmpEventSink.ts b/src/platform/telemetry/cmpEventSink.ts index f9b699e383f..cfc5ff170f1 100644 --- a/src/platform/telemetry/cmpEventSink.ts +++ b/src/platform/telemetry/cmpEventSink.ts @@ -1,11 +1,25 @@ -import type { CmpEventSink } from '@comfyorg/comfy-multi-player' +import type { CmpEvent, CmpEventSink } from '@comfyorg/comfy-multi-player' import { reportError } from './reportError' const MAX_MESSAGE_LENGTH = 1_024 +const DEFAULT_ERROR_NAME = 'CmpEvent' + +const toError = (event: CmpEvent): Error => { + const error = new Error(event.message.slice(0, MAX_MESSAGE_LENGTH)) + error.name = event.error_name ?? DEFAULT_ERROR_NAME + return error +} + +const definedContextOf = (event: CmpEvent): Record => { + const context: Record = {} + if (event.op_id !== undefined) context.op_id = event.op_id + if (event.batch_index !== undefined) context.batch_index = event.batch_index + return context +} export const cmpEventSink: CmpEventSink = (event) => { - reportError(new Error(event.message.slice(0, MAX_MESSAGE_LENGTH)), { + reportError(toError(event), { errorType: 'cmp_event', tags: { cmp_event_schema_version: event.schema_version, @@ -14,10 +28,7 @@ export const cmpEventSink: CmpEventSink = (event) => { cmp_event_code: event.code, cmp_event_error_name: event.error_name }, - context: { - op_id: event.op_id, - batch_index: event.batch_index - } + context: definedContextOf(event) }) return undefined }