abxbus 2.4.18 → 2.4.19

package/dist/cjs/middleware_otel_tracing.d.ts

@@ -1,4 +1,4 @@
-import { trace, type Tracer } from '@opentelemetry/api';
+import { trace, type SpanAttributes, type Tracer } from '@opentelemetry/api';
 import type { BaseEvent } from './base_event.js';
 import type { EventBus } from './event_bus.js';
 import type { EventResult } from './event_result.js';
@@ -8,10 +8,16 @@ type OpenTelemetryTraceApi = Pick<typeof trace, 'getTracer' | 'setSpan'>;
 export type OtelTracingMiddlewareOptions = {
     tracer?: Tracer;
     trace_api?: OpenTelemetryTraceApi;
+    root_span_name?: string | ((eventbus: EventBus, event: BaseEvent) => string);
+    root_span_attributes?: SpanAttributes | ((eventbus: EventBus, event: BaseEvent) => SpanAttributes);
 };
 export declare class OtelTracingMiddleware implements EventBusMiddleware {
     private readonly tracer;
     private readonly trace_api;
+    private readonly root_span_name;
+    private readonly root_span_attributes;
+    private readonly root_spans;
+    private readonly root_contexts;
     private readonly event_spans;
     private readonly event_contexts;
     private readonly handler_spans;
@@ -23,6 +29,8 @@ export declare class OtelTracingMiddleware implements EventBusMiddleware {
     private completeEventSpan;
     private startHandlerSpan;
     private completeHandlerSpan;
+    private startRootSpan;
+    private completeRootSpan;
     private parentContextForEvent;
 }
 export {};

package/dist/cjs/middleware_otel_tracing.js

@@ -25,6 +25,10 @@ var import_api = require("@opentelemetry/api");
 class OtelTracingMiddleware {
   tracer;
   trace_api;
+  root_span_name;
+  root_span_attributes;
+  root_spans = /* @__PURE__ */ new Map();
+  root_contexts = /* @__PURE__ */ new Map();
   event_spans = /* @__PURE__ */ new Map();
   event_contexts = /* @__PURE__ */ new Map();
   handler_spans = /* @__PURE__ */ new Map();
@@ -32,6 +36,8 @@ class OtelTracingMiddleware {
   constructor(options = {}) {
     this.trace_api = options.trace_api ?? import_api.trace;
     this.tracer = options.tracer ?? this.trace_api.getTracer("abxbus");
+    this.root_span_name = options.root_span_name;
+    this.root_span_attributes = options.root_span_attributes;
   }
   onEventChange(eventbus, event, status) {
     if (status === "started") {
@@ -56,7 +62,8 @@ class OtelTracingMiddleware {
     if (existing) {
       return existing;
     }
-    const parent_context = this.parentContextForEvent(event) ?? import_api.ROOT_CONTEXT;
+    const parent_context = this.parentContextForEvent(event) ?? this.startRootSpan(eventbus, event);
+    const start_time = dateFromIso(event.event_started_at);
     const span = this.tracer.startSpan(
       `abxbus.event ${event.event_type}`,
       {
@@ -66,11 +73,12 @@ class OtelTracingMiddleware {
           "abxbus.event.id": event.event_id,
           "abxbus.event.type": event.event_type,
           "abxbus.event.version": event.event_version,
+          "abxbus.event.session_id": stringValue(event.session_id),
           "abxbus.event.parent_id": event.event_parent_id,
           "abxbus.event.emitted_by_handler_id": event.event_emitted_by_handler_id,
           "abxbus.event.path": event.event_path.join(" ")
         }),
-        startTime: dateFromIso(event.event_started_at)
+        startTime: start_time
       },
       parent_context
     );
@@ -94,9 +102,12 @@ class OtelTracingMiddleware {
         "abxbus.event.child_count": event.event_children.length
       })
     );
-    span.end(dateFromIso(event.event_completed_at));
+    const start_time = dateFromIso(event.event_started_at);
+    const end_time = endTimeAfterStart(start_time, dateFromIso(event.event_completed_at));
+    span.end(end_time);
     this.event_spans.delete(event.event_id);
     this.event_contexts.delete(event.event_id);
+    this.completeRootSpan(event.event_id, start_time, end_time);
   }
   startHandlerSpan(eventbus, event, event_result) {
     const existing = this.handler_spans.get(event_result.id);
@@ -143,10 +154,48 @@ class OtelTracingMiddleware {
         "abxbus.handler.child_count": event_result.event_children.length
       })
     );
-    span.end(dateFromIso(event_result.completed_at));
+    span.end(endTimeAfterStart(dateFromIso(event_result.started_at), dateFromIso(event_result.completed_at)));
     this.handler_spans.delete(event_result.id);
     this.handler_contexts.delete(handlerSpanKey(event_result.event_id, event_result.handler_id));
   }
+  startRootSpan(eventbus, event) {
+    const existing = this.root_contexts.get(event.event_id);
+    if (existing) {
+      return existing;
+    }
+    const session_id = stringValue(event.session_id);
+    const root_attributes = resolveAttributes(this.root_span_attributes, eventbus, event);
+    const root_span = this.tracer.startSpan(
+      resolveRootSpanName(this.root_span_name, eventbus, event),
+      {
+        attributes: compactAttributes({
+          ...root_attributes,
+          "abxbus.trace.root": true,
+          "abxbus.bus.id": eventbus.id,
+          "abxbus.bus.name": eventbus.name,
+          "abxbus.root_event.id": event.event_id,
+          "abxbus.root_event.type": event.event_type,
+          "abxbus.root_event.session_id": session_id
+        }),
+        startTime: dateFromIso(event.event_started_at)
+      },
+      import_api.ROOT_CONTEXT
+    );
+    const root_context = this.trace_api.setSpan(import_api.ROOT_CONTEXT, root_span);
+    this.root_spans.set(event.event_id, root_span);
+    this.root_contexts.set(event.event_id, root_context);
+    return root_context;
+  }
+  completeRootSpan(event_id, start_time, end_time) {
+    const root_span = this.root_spans.get(event_id);
+    if (!root_span) {
+      return;
+    }
+    root_span.setStatus({ code: import_api.SpanStatusCode.OK });
+    root_span.end(endTimeAfterStart(start_time, end_time));
+    this.root_spans.delete(event_id);
+    this.root_contexts.delete(event_id);
+  }
   parentContextForEvent(event) {
     if (event.event_parent_id && event.event_emitted_by_handler_id) {
       const handler_context = this.handler_contexts.get(handlerSpanKey(event.event_parent_id, event.event_emitted_by_handler_id));
@@ -167,6 +216,24 @@ function dateFromIso(value) {
   const date = new Date(value);
   return Number.isNaN(date.getTime()) ? void 0 : date;
 }
+function endTimeAfterStart(start_time, end_time) {
+  if (!start_time || !end_time) {
+    return end_time;
+  }
+  return end_time.getTime() > start_time.getTime() ? end_time : new Date(start_time.getTime() + 1);
+}
+function resolveRootSpanName(root_span_name, eventbus, event) {
+  if (typeof root_span_name === "function") {
+    return root_span_name(eventbus, event);
+  }
+  return root_span_name ?? `abxbus.trace ${eventbus.name}`;
+}
+function resolveAttributes(attributes, eventbus, event) {
+  return typeof attributes === "function" ? attributes(eventbus, event) : attributes ?? {};
+}
+function stringValue(value) {
+  return typeof value === "string" && value.length > 0 ? value : void 0;
+}
 function compactAttributes(attributes) {
   const compacted = {};
   for (const [key, value] of Object.entries(attributes)) {

package/dist/cjs/middleware_otel_tracing.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/middleware_otel_tracing.ts"],
-  "sourcesContent": ["import { ROOT_CONTEXT, SpanStatusCode, trace, type Context, type Span, type Tracer } from '@opentelemetry/api'\n\nimport type { BaseEvent } from './base_event.js'\nimport type { EventBus } from './event_bus.js'\nimport type { EventResult } from './event_result.js'\nimport type { EventBusMiddleware } from './middlewares.js'\nimport type { EventStatus } from './types.js'\n\ntype OpenTelemetryTraceApi = Pick<typeof trace, 'getTracer' | 'setSpan'>\n\nexport type OtelTracingMiddlewareOptions = {\n  tracer?: Tracer\n  trace_api?: OpenTelemetryTraceApi\n}\n\nexport class OtelTracingMiddleware implements EventBusMiddleware {\n  private readonly tracer: Tracer\n  private readonly trace_api: OpenTelemetryTraceApi\n  private readonly event_spans = new Map<string, Span>()\n  private readonly event_contexts = new Map<string, Context>()\n  private readonly handler_spans = new Map<string, Span>()\n  private readonly handler_contexts = new Map<string, Context>()\n\n  constructor(options: OtelTracingMiddlewareOptions = {}) {\n    this.trace_api = options.trace_api ?? trace\n    this.tracer = options.tracer ?? this.trace_api.getTracer('abxbus')\n  }\n\n  onEventChange(eventbus: EventBus, event: BaseEvent, status: EventStatus): void {\n    if (status === 'started') {\n      this.startEventSpan(eventbus, event)\n      return\n    }\n\n    if (status === 'completed') {\n      this.completeEventSpan(eventbus, event)\n    }\n  }\n\n  onEventResultChange(eventbus: EventBus, event: BaseEvent, event_result: EventResult, status: EventStatus): void {\n    if (status === 'started') {\n      this.startHandlerSpan(eventbus, event, event_result)\n      return\n    }\n\n    if (status === 'completed') {\n      this.completeHandlerSpan(event_result)\n    }\n  }\n\n  private startEventSpan(eventbus: EventBus, event: BaseEvent): Span {\n    const existing = this.event_spans.get(event.event_id)\n    if (existing) {\n      return existing\n    }\n\n    const parent_context = this.parentContextForEvent(event) ?? ROOT_CONTEXT\n    const span = this.tracer.startSpan(\n      `abxbus.event ${event.event_type}`,\n      {\n        attributes: compactAttributes({\n          'abxbus.bus.id': eventbus.id,\n          'abxbus.bus.name': eventbus.name,\n          'abxbus.event.id': event.event_id,\n          'abxbus.event.type': event.event_type,\n          'abxbus.event.version': event.event_version,\n          'abxbus.event.parent_id': event.event_parent_id,\n          'abxbus.event.emitted_by_handler_id': event.event_emitted_by_handler_id,\n          'abxbus.event.path': event.event_path.join(' '),\n        }),\n        startTime: dateFromIso(event.event_started_at),\n      },\n      parent_context\n    )\n    const span_context = this.trace_api.setSpan(parent_context, span)\n    this.event_spans.set(event.event_id, span)\n    this.event_contexts.set(event.event_id, span_context)\n    return span\n  }\n\n  private completeEventSpan(eventbus: EventBus, event: BaseEvent): void {\n    const span = this.event_spans.get(event.event_id) ?? this.startEventSpan(eventbus, event)\n    if (event.event_errors.length > 0) {\n      recordSpanError(span, event.event_errors[0])\n    } else {\n      span.setStatus({ code: SpanStatusCode.OK })\n    }\n    span.setAttributes(\n      compactAttributes({\n        'abxbus.event.status': event.event_status,\n        'abxbus.event.result_count': event.event_results.size,\n        'abxbus.event.error_count': event.event_errors.length,\n        'abxbus.event.child_count': event.event_children.length,\n      })\n    )\n    span.end(dateFromIso(event.event_completed_at))\n    this.event_spans.delete(event.event_id)\n    this.event_contexts.delete(event.event_id)\n  }\n\n  private startHandlerSpan(eventbus: EventBus, event: BaseEvent, event_result: EventResult): Span {\n    const existing = this.handler_spans.get(event_result.id)\n    if (existing) {\n      return existing\n    }\n\n    const parent_context =\n      this.event_contexts.get(event.event_id) ?? this.trace_api.setSpan(ROOT_CONTEXT, this.startEventSpan(eventbus, event))\n    const span = this.tracer.startSpan(\n      `abxbus.handler ${event.event_type} ${event_result.handler_name}`,\n      {\n        attributes: compactAttributes({\n          'abxbus.bus.id': eventbus.id,\n          'abxbus.bus.name': eventbus.name,\n          'abxbus.event.id': event.event_id,\n          'abxbus.event.type': event.event_type,\n          'abxbus.handler.id': event_result.handler_id,\n          'abxbus.handler.name': event_result.handler_name,\n          'abxbus.handler.file_path': event_result.handler_file_path,\n          'abxbus.handler.event_pattern': event_result.handler.event_pattern,\n          'abxbus.event_result.id': event_result.id,\n        }),\n        startTime: dateFromIso(event_result.started_at),\n      },\n      parent_context\n    )\n    const span_context = this.trace_api.setSpan(parent_context, span)\n    this.handler_spans.set(event_result.id, span)\n    this.handler_contexts.set(handlerSpanKey(event_result.event_id, event_result.handler_id), span_context)\n    return span\n  }\n\n  private completeHandlerSpan(event_result: EventResult): void {\n    const span = this.handler_spans.get(event_result.id)\n    if (!span) {\n      return\n    }\n\n    if (event_result.error !== undefined) {\n      recordSpanError(span, event_result.error)\n    } else {\n      span.setStatus({ code: SpanStatusCode.OK })\n    }\n    span.setAttributes(\n      compactAttributes({\n        'abxbus.event_result.status': event_result.status,\n        'abxbus.handler.child_count': event_result.event_children.length,\n      })\n    )\n    span.end(dateFromIso(event_result.completed_at))\n    this.handler_spans.delete(event_result.id)\n    this.handler_contexts.delete(handlerSpanKey(event_result.event_id, event_result.handler_id))\n  }\n\n  private parentContextForEvent(event: BaseEvent): Context | undefined {\n    if (event.event_parent_id && event.event_emitted_by_handler_id) {\n      const handler_context = this.handler_contexts.get(handlerSpanKey(event.event_parent_id, event.event_emitted_by_handler_id))\n      if (handler_context) {\n        return handler_context\n      }\n    }\n\n    return event.event_parent_id ? this.event_contexts.get(event.event_parent_id) : undefined\n  }\n}\n\nfunction handlerSpanKey(event_id: string, handler_id: string): string {\n  return `${event_id}:${handler_id}`\n}\n\nfunction dateFromIso(value: string | null | undefined): Date | undefined {\n  if (value == null) {\n    return undefined\n  }\n  const date = new Date(value)\n  return Number.isNaN(date.getTime()) ? undefined : date\n}\n\nfunction compactAttributes(\n  attributes: Record<string, string | number | boolean | null | undefined>\n): Record<string, string | number | boolean> {\n  const compacted: Record<string, string | number | boolean> = {}\n  for (const [key, value] of Object.entries(attributes)) {\n    if (value !== null && value !== undefined) {\n      compacted[key] = value\n    }\n  }\n  return compacted\n}\n\nfunction recordSpanError(span: Span, error: unknown): void {\n  if (error instanceof Error) {\n    span.recordException(error)\n    span.setStatus({ code: SpanStatusCode.ERROR, message: error.message })\n    return\n  }\n\n  const message = typeof error === 'string' ? error : 'Unknown abxbus handler error'\n  span.recordException(message)\n  span.setStatus({ code: SpanStatusCode.ERROR, message })\n}\n"],
-  "mappings": "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",
+  "sourcesContent": ["import {\n  ROOT_CONTEXT,\n  SpanStatusCode,\n  trace,\n  type Context,\n  type Span,\n  type SpanAttributeValue,\n  type SpanAttributes,\n  type Tracer,\n} from '@opentelemetry/api'\n\nimport type { BaseEvent } from './base_event.js'\nimport type { EventBus } from './event_bus.js'\nimport type { EventResult } from './event_result.js'\nimport type { EventBusMiddleware } from './middlewares.js'\nimport type { EventStatus } from './types.js'\n\ntype OpenTelemetryTraceApi = Pick<typeof trace, 'getTracer' | 'setSpan'>\n\nexport type OtelTracingMiddlewareOptions = {\n  tracer?: Tracer\n  trace_api?: OpenTelemetryTraceApi\n  root_span_name?: string | ((eventbus: EventBus, event: BaseEvent) => string)\n  root_span_attributes?: SpanAttributes | ((eventbus: EventBus, event: BaseEvent) => SpanAttributes)\n}\n\nexport class OtelTracingMiddleware implements EventBusMiddleware {\n  private readonly tracer: Tracer\n  private readonly trace_api: OpenTelemetryTraceApi\n  private readonly root_span_name: OtelTracingMiddlewareOptions['root_span_name']\n  private readonly root_span_attributes: OtelTracingMiddlewareOptions['root_span_attributes']\n  private readonly root_spans = new Map<string, Span>()\n  private readonly root_contexts = new Map<string, Context>()\n  private readonly event_spans = new Map<string, Span>()\n  private readonly event_contexts = new Map<string, Context>()\n  private readonly handler_spans = new Map<string, Span>()\n  private readonly handler_contexts = new Map<string, Context>()\n\n  constructor(options: OtelTracingMiddlewareOptions = {}) {\n    this.trace_api = options.trace_api ?? trace\n    this.tracer = options.tracer ?? this.trace_api.getTracer('abxbus')\n    this.root_span_name = options.root_span_name\n    this.root_span_attributes = options.root_span_attributes\n  }\n\n  onEventChange(eventbus: EventBus, event: BaseEvent, status: EventStatus): void {\n    if (status === 'started') {\n      this.startEventSpan(eventbus, event)\n      return\n    }\n\n    if (status === 'completed') {\n      this.completeEventSpan(eventbus, event)\n    }\n  }\n\n  onEventResultChange(eventbus: EventBus, event: BaseEvent, event_result: EventResult, status: EventStatus): void {\n    if (status === 'started') {\n      this.startHandlerSpan(eventbus, event, event_result)\n      return\n    }\n\n    if (status === 'completed') {\n      this.completeHandlerSpan(event_result)\n    }\n  }\n\n  private startEventSpan(eventbus: EventBus, event: BaseEvent): Span {\n    const existing = this.event_spans.get(event.event_id)\n    if (existing) {\n      return existing\n    }\n\n    const parent_context = this.parentContextForEvent(event) ?? this.startRootSpan(eventbus, event)\n    const start_time = dateFromIso(event.event_started_at)\n    const span = this.tracer.startSpan(\n      `abxbus.event ${event.event_type}`,\n      {\n        attributes: compactAttributes({\n          'abxbus.bus.id': eventbus.id,\n          'abxbus.bus.name': eventbus.name,\n          'abxbus.event.id': event.event_id,\n          'abxbus.event.type': event.event_type,\n          'abxbus.event.version': event.event_version,\n          'abxbus.event.session_id': stringValue((event as { session_id?: unknown }).session_id),\n          'abxbus.event.parent_id': event.event_parent_id,\n          'abxbus.event.emitted_by_handler_id': event.event_emitted_by_handler_id,\n          'abxbus.event.path': event.event_path.join(' '),\n        }),\n        startTime: start_time,\n      },\n      parent_context\n    )\n    const span_context = this.trace_api.setSpan(parent_context, span)\n    this.event_spans.set(event.event_id, span)\n    this.event_contexts.set(event.event_id, span_context)\n    return span\n  }\n\n  private completeEventSpan(eventbus: EventBus, event: BaseEvent): void {\n    const span = this.event_spans.get(event.event_id) ?? this.startEventSpan(eventbus, event)\n    if (event.event_errors.length > 0) {\n      recordSpanError(span, event.event_errors[0])\n    } else {\n      span.setStatus({ code: SpanStatusCode.OK })\n    }\n    span.setAttributes(\n      compactAttributes({\n        'abxbus.event.status': event.event_status,\n        'abxbus.event.result_count': event.event_results.size,\n        'abxbus.event.error_count': event.event_errors.length,\n        'abxbus.event.child_count': event.event_children.length,\n      })\n    )\n    const start_time = dateFromIso(event.event_started_at)\n    const end_time = endTimeAfterStart(start_time, dateFromIso(event.event_completed_at))\n    span.end(end_time)\n    this.event_spans.delete(event.event_id)\n    this.event_contexts.delete(event.event_id)\n    this.completeRootSpan(event.event_id, start_time, end_time)\n  }\n\n  private startHandlerSpan(eventbus: EventBus, event: BaseEvent, event_result: EventResult): Span {\n    const existing = this.handler_spans.get(event_result.id)\n    if (existing) {\n      return existing\n    }\n\n    const parent_context =\n      this.event_contexts.get(event.event_id) ?? this.trace_api.setSpan(ROOT_CONTEXT, this.startEventSpan(eventbus, event))\n    const span = this.tracer.startSpan(\n      `abxbus.handler ${event.event_type} ${event_result.handler_name}`,\n      {\n        attributes: compactAttributes({\n          'abxbus.bus.id': eventbus.id,\n          'abxbus.bus.name': eventbus.name,\n          'abxbus.event.id': event.event_id,\n          'abxbus.event.type': event.event_type,\n          'abxbus.handler.id': event_result.handler_id,\n          'abxbus.handler.name': event_result.handler_name,\n          'abxbus.handler.file_path': event_result.handler_file_path,\n          'abxbus.handler.event_pattern': event_result.handler.event_pattern,\n          'abxbus.event_result.id': event_result.id,\n        }),\n        startTime: dateFromIso(event_result.started_at),\n      },\n      parent_context\n    )\n    const span_context = this.trace_api.setSpan(parent_context, span)\n    this.handler_spans.set(event_result.id, span)\n    this.handler_contexts.set(handlerSpanKey(event_result.event_id, event_result.handler_id), span_context)\n    return span\n  }\n\n  private completeHandlerSpan(event_result: EventResult): void {\n    const span = this.handler_spans.get(event_result.id)\n    if (!span) {\n      return\n    }\n\n    if (event_result.error !== undefined) {\n      recordSpanError(span, event_result.error)\n    } else {\n      span.setStatus({ code: SpanStatusCode.OK })\n    }\n    span.setAttributes(\n      compactAttributes({\n        'abxbus.event_result.status': event_result.status,\n        'abxbus.handler.child_count': event_result.event_children.length,\n      })\n    )\n    span.end(endTimeAfterStart(dateFromIso(event_result.started_at), dateFromIso(event_result.completed_at)))\n    this.handler_spans.delete(event_result.id)\n    this.handler_contexts.delete(handlerSpanKey(event_result.event_id, event_result.handler_id))\n  }\n\n  private startRootSpan(eventbus: EventBus, event: BaseEvent): Context {\n    const existing = this.root_contexts.get(event.event_id)\n    if (existing) {\n      return existing\n    }\n\n    const session_id = stringValue((event as { session_id?: unknown }).session_id)\n    const root_attributes = resolveAttributes(this.root_span_attributes, eventbus, event)\n    const root_span = this.tracer.startSpan(\n      resolveRootSpanName(this.root_span_name, eventbus, event),\n      {\n        attributes: compactAttributes({\n          ...root_attributes,\n          'abxbus.trace.root': true,\n          'abxbus.bus.id': eventbus.id,\n          'abxbus.bus.name': eventbus.name,\n          'abxbus.root_event.id': event.event_id,\n          'abxbus.root_event.type': event.event_type,\n          'abxbus.root_event.session_id': session_id,\n        }),\n        startTime: dateFromIso(event.event_started_at),\n      },\n      ROOT_CONTEXT\n    )\n    const root_context = this.trace_api.setSpan(ROOT_CONTEXT, root_span)\n    this.root_spans.set(event.event_id, root_span)\n    this.root_contexts.set(event.event_id, root_context)\n    return root_context\n  }\n\n  private completeRootSpan(event_id: string, start_time: Date | undefined, end_time: Date | undefined): void {\n    const root_span = this.root_spans.get(event_id)\n    if (!root_span) {\n      return\n    }\n\n    root_span.setStatus({ code: SpanStatusCode.OK })\n    root_span.end(endTimeAfterStart(start_time, end_time))\n    this.root_spans.delete(event_id)\n    this.root_contexts.delete(event_id)\n  }\n\n  private parentContextForEvent(event: BaseEvent): Context | undefined {\n    if (event.event_parent_id && event.event_emitted_by_handler_id) {\n      const handler_context = this.handler_contexts.get(handlerSpanKey(event.event_parent_id, event.event_emitted_by_handler_id))\n      if (handler_context) {\n        return handler_context\n      }\n    }\n\n    return event.event_parent_id ? this.event_contexts.get(event.event_parent_id) : undefined\n  }\n}\n\nfunction handlerSpanKey(event_id: string, handler_id: string): string {\n  return `${event_id}:${handler_id}`\n}\n\nfunction dateFromIso(value: string | null | undefined): Date | undefined {\n  if (value == null) {\n    return undefined\n  }\n  const date = new Date(value)\n  return Number.isNaN(date.getTime()) ? undefined : date\n}\n\nfunction endTimeAfterStart(start_time: Date | undefined, end_time: Date | undefined): Date | undefined {\n  if (!start_time || !end_time) {\n    return end_time\n  }\n\n  return end_time.getTime() > start_time.getTime() ? end_time : new Date(start_time.getTime() + 1)\n}\n\nfunction resolveRootSpanName(\n  root_span_name: OtelTracingMiddlewareOptions['root_span_name'],\n  eventbus: EventBus,\n  event: BaseEvent\n): string {\n  if (typeof root_span_name === 'function') {\n    return root_span_name(eventbus, event)\n  }\n  return root_span_name ?? `abxbus.trace ${eventbus.name}`\n}\n\nfunction resolveAttributes(\n  attributes: OtelTracingMiddlewareOptions['root_span_attributes'],\n  eventbus: EventBus,\n  event: BaseEvent\n): SpanAttributes {\n  return typeof attributes === 'function' ? attributes(eventbus, event) : (attributes ?? {})\n}\n\nfunction stringValue(value: unknown): string | undefined {\n  return typeof value === 'string' && value.length > 0 ? value : undefined\n}\n\nfunction compactAttributes(attributes: Record<string, SpanAttributeValue | null | undefined>): SpanAttributes {\n  const compacted: SpanAttributes = {}\n  for (const [key, value] of Object.entries(attributes)) {\n    if (value !== null && value !== undefined) {\n      compacted[key] = value\n    }\n  }\n  return compacted\n}\n\nfunction recordSpanError(span: Span, error: unknown): void {\n  if (error instanceof Error) {\n    span.recordException(error)\n    span.setStatus({ code: SpanStatusCode.ERROR, message: error.message })\n    return\n  }\n\n  const message = typeof error === 'string' ? error : 'Unknown abxbus handler error'\n  span.recordException(message)\n  span.setStatus({ code: SpanStatusCode.ERROR, message })\n}\n"],
+  "mappings": "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",
   "names": []
 }

package/dist/esm/middleware_otel_tracing.js

@@ -1,7 +1,15 @@
-import { ROOT_CONTEXT, SpanStatusCode, trace } from "@opentelemetry/api";
+import {
+  ROOT_CONTEXT,
+  SpanStatusCode,
+  trace
+} from "@opentelemetry/api";
 class OtelTracingMiddleware {
   tracer;
   trace_api;
+  root_span_name;
+  root_span_attributes;
+  root_spans = /* @__PURE__ */ new Map();
+  root_contexts = /* @__PURE__ */ new Map();
   event_spans = /* @__PURE__ */ new Map();
   event_contexts = /* @__PURE__ */ new Map();
   handler_spans = /* @__PURE__ */ new Map();
@@ -9,6 +17,8 @@ class OtelTracingMiddleware {
   constructor(options = {}) {
     this.trace_api = options.trace_api ?? trace;
     this.tracer = options.tracer ?? this.trace_api.getTracer("abxbus");
+    this.root_span_name = options.root_span_name;
+    this.root_span_attributes = options.root_span_attributes;
   }
   onEventChange(eventbus, event, status) {
     if (status === "started") {
@@ -33,7 +43,8 @@ class OtelTracingMiddleware {
     if (existing) {
       return existing;
     }
-    const parent_context = this.parentContextForEvent(event) ?? ROOT_CONTEXT;
+    const parent_context = this.parentContextForEvent(event) ?? this.startRootSpan(eventbus, event);
+    const start_time = dateFromIso(event.event_started_at);
     const span = this.tracer.startSpan(
       `abxbus.event ${event.event_type}`,
       {
@@ -43,11 +54,12 @@ class OtelTracingMiddleware {
           "abxbus.event.id": event.event_id,
           "abxbus.event.type": event.event_type,
           "abxbus.event.version": event.event_version,
+          "abxbus.event.session_id": stringValue(event.session_id),
           "abxbus.event.parent_id": event.event_parent_id,
           "abxbus.event.emitted_by_handler_id": event.event_emitted_by_handler_id,
           "abxbus.event.path": event.event_path.join(" ")
         }),
-        startTime: dateFromIso(event.event_started_at)
+        startTime: start_time
       },
       parent_context
     );
@@ -71,9 +83,12 @@ class OtelTracingMiddleware {
         "abxbus.event.child_count": event.event_children.length
       })
     );
-    span.end(dateFromIso(event.event_completed_at));
+    const start_time = dateFromIso(event.event_started_at);
+    const end_time = endTimeAfterStart(start_time, dateFromIso(event.event_completed_at));
+    span.end(end_time);
     this.event_spans.delete(event.event_id);
     this.event_contexts.delete(event.event_id);
+    this.completeRootSpan(event.event_id, start_time, end_time);
   }
   startHandlerSpan(eventbus, event, event_result) {
     const existing = this.handler_spans.get(event_result.id);
@@ -120,10 +135,48 @@ class OtelTracingMiddleware {
         "abxbus.handler.child_count": event_result.event_children.length
       })
     );
-    span.end(dateFromIso(event_result.completed_at));
+    span.end(endTimeAfterStart(dateFromIso(event_result.started_at), dateFromIso(event_result.completed_at)));
     this.handler_spans.delete(event_result.id);
     this.handler_contexts.delete(handlerSpanKey(event_result.event_id, event_result.handler_id));
   }
+  startRootSpan(eventbus, event) {
+    const existing = this.root_contexts.get(event.event_id);
+    if (existing) {
+      return existing;
+    }
+    const session_id = stringValue(event.session_id);
+    const root_attributes = resolveAttributes(this.root_span_attributes, eventbus, event);
+    const root_span = this.tracer.startSpan(
+      resolveRootSpanName(this.root_span_name, eventbus, event),
+      {
+        attributes: compactAttributes({
+          ...root_attributes,
+          "abxbus.trace.root": true,
+          "abxbus.bus.id": eventbus.id,
+          "abxbus.bus.name": eventbus.name,
+          "abxbus.root_event.id": event.event_id,
+          "abxbus.root_event.type": event.event_type,
+          "abxbus.root_event.session_id": session_id
+        }),
+        startTime: dateFromIso(event.event_started_at)
+      },
+      ROOT_CONTEXT
+    );
+    const root_context = this.trace_api.setSpan(ROOT_CONTEXT, root_span);
+    this.root_spans.set(event.event_id, root_span);
+    this.root_contexts.set(event.event_id, root_context);
+    return root_context;
+  }
+  completeRootSpan(event_id, start_time, end_time) {
+    const root_span = this.root_spans.get(event_id);
+    if (!root_span) {
+      return;
+    }
+    root_span.setStatus({ code: SpanStatusCode.OK });
+    root_span.end(endTimeAfterStart(start_time, end_time));
+    this.root_spans.delete(event_id);
+    this.root_contexts.delete(event_id);
+  }
   parentContextForEvent(event) {
     if (event.event_parent_id && event.event_emitted_by_handler_id) {
       const handler_context = this.handler_contexts.get(handlerSpanKey(event.event_parent_id, event.event_emitted_by_handler_id));
@@ -144,6 +197,24 @@ function dateFromIso(value) {
   const date = new Date(value);
   return Number.isNaN(date.getTime()) ? void 0 : date;
 }
+function endTimeAfterStart(start_time, end_time) {
+  if (!start_time || !end_time) {
+    return end_time;
+  }
+  return end_time.getTime() > start_time.getTime() ? end_time : new Date(start_time.getTime() + 1);
+}
+function resolveRootSpanName(root_span_name, eventbus, event) {
+  if (typeof root_span_name === "function") {
+    return root_span_name(eventbus, event);
+  }
+  return root_span_name ?? `abxbus.trace ${eventbus.name}`;
+}
+function resolveAttributes(attributes, eventbus, event) {
+  return typeof attributes === "function" ? attributes(eventbus, event) : attributes ?? {};
+}
+function stringValue(value) {
+  return typeof value === "string" && value.length > 0 ? value : void 0;
+}
 function compactAttributes(attributes) {
   const compacted = {};
   for (const [key, value] of Object.entries(attributes)) {

package/dist/esm/middleware_otel_tracing.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/middleware_otel_tracing.ts"],
-  "sourcesContent": ["import { ROOT_CONTEXT, SpanStatusCode, trace, type Context, type Span, type Tracer } from '@opentelemetry/api'\n\nimport type { BaseEvent } from './base_event.js'\nimport type { EventBus } from './event_bus.js'\nimport type { EventResult } from './event_result.js'\nimport type { EventBusMiddleware } from './middlewares.js'\nimport type { EventStatus } from './types.js'\n\ntype OpenTelemetryTraceApi = Pick<typeof trace, 'getTracer' | 'setSpan'>\n\nexport type OtelTracingMiddlewareOptions = {\n  tracer?: Tracer\n  trace_api?: OpenTelemetryTraceApi\n}\n\nexport class OtelTracingMiddleware implements EventBusMiddleware {\n  private readonly tracer: Tracer\n  private readonly trace_api: OpenTelemetryTraceApi\n  private readonly event_spans = new Map<string, Span>()\n  private readonly event_contexts = new Map<string, Context>()\n  private readonly handler_spans = new Map<string, Span>()\n  private readonly handler_contexts = new Map<string, Context>()\n\n  constructor(options: OtelTracingMiddlewareOptions = {}) {\n    this.trace_api = options.trace_api ?? trace\n    this.tracer = options.tracer ?? this.trace_api.getTracer('abxbus')\n  }\n\n  onEventChange(eventbus: EventBus, event: BaseEvent, status: EventStatus): void {\n    if (status === 'started') {\n      this.startEventSpan(eventbus, event)\n      return\n    }\n\n    if (status === 'completed') {\n      this.completeEventSpan(eventbus, event)\n    }\n  }\n\n  onEventResultChange(eventbus: EventBus, event: BaseEvent, event_result: EventResult, status: EventStatus): void {\n    if (status === 'started') {\n      this.startHandlerSpan(eventbus, event, event_result)\n      return\n    }\n\n    if (status === 'completed') {\n      this.completeHandlerSpan(event_result)\n    }\n  }\n\n  private startEventSpan(eventbus: EventBus, event: BaseEvent): Span {\n    const existing = this.event_spans.get(event.event_id)\n    if (existing) {\n      return existing\n    }\n\n    const parent_context = this.parentContextForEvent(event) ?? ROOT_CONTEXT\n    const span = this.tracer.startSpan(\n      `abxbus.event ${event.event_type}`,\n      {\n        attributes: compactAttributes({\n          'abxbus.bus.id': eventbus.id,\n          'abxbus.bus.name': eventbus.name,\n          'abxbus.event.id': event.event_id,\n          'abxbus.event.type': event.event_type,\n          'abxbus.event.version': event.event_version,\n          'abxbus.event.parent_id': event.event_parent_id,\n          'abxbus.event.emitted_by_handler_id': event.event_emitted_by_handler_id,\n          'abxbus.event.path': event.event_path.join(' '),\n        }),\n        startTime: dateFromIso(event.event_started_at),\n      },\n      parent_context\n    )\n    const span_context = this.trace_api.setSpan(parent_context, span)\n    this.event_spans.set(event.event_id, span)\n    this.event_contexts.set(event.event_id, span_context)\n    return span\n  }\n\n  private completeEventSpan(eventbus: EventBus, event: BaseEvent): void {\n    const span = this.event_spans.get(event.event_id) ?? this.startEventSpan(eventbus, event)\n    if (event.event_errors.length > 0) {\n      recordSpanError(span, event.event_errors[0])\n    } else {\n      span.setStatus({ code: SpanStatusCode.OK })\n    }\n    span.setAttributes(\n      compactAttributes({\n        'abxbus.event.status': event.event_status,\n        'abxbus.event.result_count': event.event_results.size,\n        'abxbus.event.error_count': event.event_errors.length,\n        'abxbus.event.child_count': event.event_children.length,\n      })\n    )\n    span.end(dateFromIso(event.event_completed_at))\n    this.event_spans.delete(event.event_id)\n    this.event_contexts.delete(event.event_id)\n  }\n\n  private startHandlerSpan(eventbus: EventBus, event: BaseEvent, event_result: EventResult): Span {\n    const existing = this.handler_spans.get(event_result.id)\n    if (existing) {\n      return existing\n    }\n\n    const parent_context =\n      this.event_contexts.get(event.event_id) ?? this.trace_api.setSpan(ROOT_CONTEXT, this.startEventSpan(eventbus, event))\n    const span = this.tracer.startSpan(\n      `abxbus.handler ${event.event_type} ${event_result.handler_name}`,\n      {\n        attributes: compactAttributes({\n          'abxbus.bus.id': eventbus.id,\n          'abxbus.bus.name': eventbus.name,\n          'abxbus.event.id': event.event_id,\n          'abxbus.event.type': event.event_type,\n          'abxbus.handler.id': event_result.handler_id,\n          'abxbus.handler.name': event_result.handler_name,\n          'abxbus.handler.file_path': event_result.handler_file_path,\n          'abxbus.handler.event_pattern': event_result.handler.event_pattern,\n          'abxbus.event_result.id': event_result.id,\n        }),\n        startTime: dateFromIso(event_result.started_at),\n      },\n      parent_context\n    )\n    const span_context = this.trace_api.setSpan(parent_context, span)\n    this.handler_spans.set(event_result.id, span)\n    this.handler_contexts.set(handlerSpanKey(event_result.event_id, event_result.handler_id), span_context)\n    return span\n  }\n\n  private completeHandlerSpan(event_result: EventResult): void {\n    const span = this.handler_spans.get(event_result.id)\n    if (!span) {\n      return\n    }\n\n    if (event_result.error !== undefined) {\n      recordSpanError(span, event_result.error)\n    } else {\n      span.setStatus({ code: SpanStatusCode.OK })\n    }\n    span.setAttributes(\n      compactAttributes({\n        'abxbus.event_result.status': event_result.status,\n        'abxbus.handler.child_count': event_result.event_children.length,\n      })\n    )\n    span.end(dateFromIso(event_result.completed_at))\n    this.handler_spans.delete(event_result.id)\n    this.handler_contexts.delete(handlerSpanKey(event_result.event_id, event_result.handler_id))\n  }\n\n  private parentContextForEvent(event: BaseEvent): Context | undefined {\n    if (event.event_parent_id && event.event_emitted_by_handler_id) {\n      const handler_context = this.handler_contexts.get(handlerSpanKey(event.event_parent_id, event.event_emitted_by_handler_id))\n      if (handler_context) {\n        return handler_context\n      }\n    }\n\n    return event.event_parent_id ? this.event_contexts.get(event.event_parent_id) : undefined\n  }\n}\n\nfunction handlerSpanKey(event_id: string, handler_id: string): string {\n  return `${event_id}:${handler_id}`\n}\n\nfunction dateFromIso(value: string | null | undefined): Date | undefined {\n  if (value == null) {\n    return undefined\n  }\n  const date = new Date(value)\n  return Number.isNaN(date.getTime()) ? undefined : date\n}\n\nfunction compactAttributes(\n  attributes: Record<string, string | number | boolean | null | undefined>\n): Record<string, string | number | boolean> {\n  const compacted: Record<string, string | number | boolean> = {}\n  for (const [key, value] of Object.entries(attributes)) {\n    if (value !== null && value !== undefined) {\n      compacted[key] = value\n    }\n  }\n  return compacted\n}\n\nfunction recordSpanError(span: Span, error: unknown): void {\n  if (error instanceof Error) {\n    span.recordException(error)\n    span.setStatus({ code: SpanStatusCode.ERROR, message: error.message })\n    return\n  }\n\n  const message = typeof error === 'string' ? error : 'Unknown abxbus handler error'\n  span.recordException(message)\n  span.setStatus({ code: SpanStatusCode.ERROR, message })\n}\n"],
-  "mappings": "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",
+  "sourcesContent": ["import {\n  ROOT_CONTEXT,\n  SpanStatusCode,\n  trace,\n  type Context,\n  type Span,\n  type SpanAttributeValue,\n  type SpanAttributes,\n  type Tracer,\n} from '@opentelemetry/api'\n\nimport type { BaseEvent } from './base_event.js'\nimport type { EventBus } from './event_bus.js'\nimport type { EventResult } from './event_result.js'\nimport type { EventBusMiddleware } from './middlewares.js'\nimport type { EventStatus } from './types.js'\n\ntype OpenTelemetryTraceApi = Pick<typeof trace, 'getTracer' | 'setSpan'>\n\nexport type OtelTracingMiddlewareOptions = {\n  tracer?: Tracer\n  trace_api?: OpenTelemetryTraceApi\n  root_span_name?: string | ((eventbus: EventBus, event: BaseEvent) => string)\n  root_span_attributes?: SpanAttributes | ((eventbus: EventBus, event: BaseEvent) => SpanAttributes)\n}\n\nexport class OtelTracingMiddleware implements EventBusMiddleware {\n  private readonly tracer: Tracer\n  private readonly trace_api: OpenTelemetryTraceApi\n  private readonly root_span_name: OtelTracingMiddlewareOptions['root_span_name']\n  private readonly root_span_attributes: OtelTracingMiddlewareOptions['root_span_attributes']\n  private readonly root_spans = new Map<string, Span>()\n  private readonly root_contexts = new Map<string, Context>()\n  private readonly event_spans = new Map<string, Span>()\n  private readonly event_contexts = new Map<string, Context>()\n  private readonly handler_spans = new Map<string, Span>()\n  private readonly handler_contexts = new Map<string, Context>()\n\n  constructor(options: OtelTracingMiddlewareOptions = {}) {\n    this.trace_api = options.trace_api ?? trace\n    this.tracer = options.tracer ?? this.trace_api.getTracer('abxbus')\n    this.root_span_name = options.root_span_name\n    this.root_span_attributes = options.root_span_attributes\n  }\n\n  onEventChange(eventbus: EventBus, event: BaseEvent, status: EventStatus): void {\n    if (status === 'started') {\n      this.startEventSpan(eventbus, event)\n      return\n    }\n\n    if (status === 'completed') {\n      this.completeEventSpan(eventbus, event)\n    }\n  }\n\n  onEventResultChange(eventbus: EventBus, event: BaseEvent, event_result: EventResult, status: EventStatus): void {\n    if (status === 'started') {\n      this.startHandlerSpan(eventbus, event, event_result)\n      return\n    }\n\n    if (status === 'completed') {\n      this.completeHandlerSpan(event_result)\n    }\n  }\n\n  private startEventSpan(eventbus: EventBus, event: BaseEvent): Span {\n    const existing = this.event_spans.get(event.event_id)\n    if (existing) {\n      return existing\n    }\n\n    const parent_context = this.parentContextForEvent(event) ?? this.startRootSpan(eventbus, event)\n    const start_time = dateFromIso(event.event_started_at)\n    const span = this.tracer.startSpan(\n      `abxbus.event ${event.event_type}`,\n      {\n        attributes: compactAttributes({\n          'abxbus.bus.id': eventbus.id,\n          'abxbus.bus.name': eventbus.name,\n          'abxbus.event.id': event.event_id,\n          'abxbus.event.type': event.event_type,\n          'abxbus.event.version': event.event_version,\n          'abxbus.event.session_id': stringValue((event as { session_id?: unknown }).session_id),\n          'abxbus.event.parent_id': event.event_parent_id,\n          'abxbus.event.emitted_by_handler_id': event.event_emitted_by_handler_id,\n          'abxbus.event.path': event.event_path.join(' '),\n        }),\n        startTime: start_time,\n      },\n      parent_context\n    )\n    const span_context = this.trace_api.setSpan(parent_context, span)\n    this.event_spans.set(event.event_id, span)\n    this.event_contexts.set(event.event_id, span_context)\n    return span\n  }\n\n  private completeEventSpan(eventbus: EventBus, event: BaseEvent): void {\n    const span = this.event_spans.get(event.event_id) ?? this.startEventSpan(eventbus, event)\n    if (event.event_errors.length > 0) {\n      recordSpanError(span, event.event_errors[0])\n    } else {\n      span.setStatus({ code: SpanStatusCode.OK })\n    }\n    span.setAttributes(\n      compactAttributes({\n        'abxbus.event.status': event.event_status,\n        'abxbus.event.result_count': event.event_results.size,\n        'abxbus.event.error_count': event.event_errors.length,\n        'abxbus.event.child_count': event.event_children.length,\n      })\n    )\n    const start_time = dateFromIso(event.event_started_at)\n    const end_time = endTimeAfterStart(start_time, dateFromIso(event.event_completed_at))\n    span.end(end_time)\n    this.event_spans.delete(event.event_id)\n    this.event_contexts.delete(event.event_id)\n    this.completeRootSpan(event.event_id, start_time, end_time)\n  }\n\n  private startHandlerSpan(eventbus: EventBus, event: BaseEvent, event_result: EventResult): Span {\n    const existing = this.handler_spans.get(event_result.id)\n    if (existing) {\n      return existing\n    }\n\n    const parent_context =\n      this.event_contexts.get(event.event_id) ?? this.trace_api.setSpan(ROOT_CONTEXT, this.startEventSpan(eventbus, event))\n    const span = this.tracer.startSpan(\n      `abxbus.handler ${event.event_type} ${event_result.handler_name}`,\n      {\n        attributes: compactAttributes({\n          'abxbus.bus.id': eventbus.id,\n          'abxbus.bus.name': eventbus.name,\n          'abxbus.event.id': event.event_id,\n          'abxbus.event.type': event.event_type,\n          'abxbus.handler.id': event_result.handler_id,\n          'abxbus.handler.name': event_result.handler_name,\n          'abxbus.handler.file_path': event_result.handler_file_path,\n          'abxbus.handler.event_pattern': event_result.handler.event_pattern,\n          'abxbus.event_result.id': event_result.id,\n        }),\n        startTime: dateFromIso(event_result.started_at),\n      },\n      parent_context\n    )\n    const span_context = this.trace_api.setSpan(parent_context, span)\n    this.handler_spans.set(event_result.id, span)\n    this.handler_contexts.set(handlerSpanKey(event_result.event_id, event_result.handler_id), span_context)\n    return span\n  }\n\n  private completeHandlerSpan(event_result: EventResult): void {\n    const span = this.handler_spans.get(event_result.id)\n    if (!span) {\n      return\n    }\n\n    if (event_result.error !== undefined) {\n      recordSpanError(span, event_result.error)\n    } else {\n      span.setStatus({ code: SpanStatusCode.OK })\n    }\n    span.setAttributes(\n      compactAttributes({\n        'abxbus.event_result.status': event_result.status,\n        'abxbus.handler.child_count': event_result.event_children.length,\n      })\n    )\n    span.end(endTimeAfterStart(dateFromIso(event_result.started_at), dateFromIso(event_result.completed_at)))\n    this.handler_spans.delete(event_result.id)\n    this.handler_contexts.delete(handlerSpanKey(event_result.event_id, event_result.handler_id))\n  }\n\n  private startRootSpan(eventbus: EventBus, event: BaseEvent): Context {\n    const existing = this.root_contexts.get(event.event_id)\n    if (existing) {\n      return existing\n    }\n\n    const session_id = stringValue((event as { session_id?: unknown }).session_id)\n    const root_attributes = resolveAttributes(this.root_span_attributes, eventbus, event)\n    const root_span = this.tracer.startSpan(\n      resolveRootSpanName(this.root_span_name, eventbus, event),\n      {\n        attributes: compactAttributes({\n          ...root_attributes,\n          'abxbus.trace.root': true,\n          'abxbus.bus.id': eventbus.id,\n          'abxbus.bus.name': eventbus.name,\n          'abxbus.root_event.id': event.event_id,\n          'abxbus.root_event.type': event.event_type,\n          'abxbus.root_event.session_id': session_id,\n        }),\n        startTime: dateFromIso(event.event_started_at),\n      },\n      ROOT_CONTEXT\n    )\n    const root_context = this.trace_api.setSpan(ROOT_CONTEXT, root_span)\n    this.root_spans.set(event.event_id, root_span)\n    this.root_contexts.set(event.event_id, root_context)\n    return root_context\n  }\n\n  private completeRootSpan(event_id: string, start_time: Date | undefined, end_time: Date | undefined): void {\n    const root_span = this.root_spans.get(event_id)\n    if (!root_span) {\n      return\n    }\n\n    root_span.setStatus({ code: SpanStatusCode.OK })\n    root_span.end(endTimeAfterStart(start_time, end_time))\n    this.root_spans.delete(event_id)\n    this.root_contexts.delete(event_id)\n  }\n\n  private parentContextForEvent(event: BaseEvent): Context | undefined {\n    if (event.event_parent_id && event.event_emitted_by_handler_id) {\n      const handler_context = this.handler_contexts.get(handlerSpanKey(event.event_parent_id, event.event_emitted_by_handler_id))\n      if (handler_context) {\n        return handler_context\n      }\n    }\n\n    return event.event_parent_id ? this.event_contexts.get(event.event_parent_id) : undefined\n  }\n}\n\nfunction handlerSpanKey(event_id: string, handler_id: string): string {\n  return `${event_id}:${handler_id}`\n}\n\nfunction dateFromIso(value: string | null | undefined): Date | undefined {\n  if (value == null) {\n    return undefined\n  }\n  const date = new Date(value)\n  return Number.isNaN(date.getTime()) ? undefined : date\n}\n\nfunction endTimeAfterStart(start_time: Date | undefined, end_time: Date | undefined): Date | undefined {\n  if (!start_time || !end_time) {\n    return end_time\n  }\n\n  return end_time.getTime() > start_time.getTime() ? end_time : new Date(start_time.getTime() + 1)\n}\n\nfunction resolveRootSpanName(\n  root_span_name: OtelTracingMiddlewareOptions['root_span_name'],\n  eventbus: EventBus,\n  event: BaseEvent\n): string {\n  if (typeof root_span_name === 'function') {\n    return root_span_name(eventbus, event)\n  }\n  return root_span_name ?? `abxbus.trace ${eventbus.name}`\n}\n\nfunction resolveAttributes(\n  attributes: OtelTracingMiddlewareOptions['root_span_attributes'],\n  eventbus: EventBus,\n  event: BaseEvent\n): SpanAttributes {\n  return typeof attributes === 'function' ? attributes(eventbus, event) : (attributes ?? {})\n}\n\nfunction stringValue(value: unknown): string | undefined {\n  return typeof value === 'string' && value.length > 0 ? value : undefined\n}\n\nfunction compactAttributes(attributes: Record<string, SpanAttributeValue | null | undefined>): SpanAttributes {\n  const compacted: SpanAttributes = {}\n  for (const [key, value] of Object.entries(attributes)) {\n    if (value !== null && value !== undefined) {\n      compacted[key] = value\n    }\n  }\n  return compacted\n}\n\nfunction recordSpanError(span: Span, error: unknown): void {\n  if (error instanceof Error) {\n    span.recordException(error)\n    span.setStatus({ code: SpanStatusCode.ERROR, message: error.message })\n    return\n  }\n\n  const message = typeof error === 'string' ? error : 'Unknown abxbus handler error'\n  span.recordException(message)\n  span.setStatus({ code: SpanStatusCode.ERROR, message })\n}\n"],
+  "mappings": "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",
   "names": []
 }

package/dist/types/middleware_otel_tracing.d.ts

@@ -1,4 +1,4 @@
-import { trace, type Tracer } from '@opentelemetry/api';
+import { trace, type SpanAttributes, type Tracer } from '@opentelemetry/api';
 import type { BaseEvent } from './base_event.js';
 import type { EventBus } from './event_bus.js';
 import type { EventResult } from './event_result.js';
@@ -8,10 +8,16 @@ type OpenTelemetryTraceApi = Pick<typeof trace, 'getTracer' | 'setSpan'>;
 export type OtelTracingMiddlewareOptions = {
     tracer?: Tracer;
     trace_api?: OpenTelemetryTraceApi;
+    root_span_name?: string | ((eventbus: EventBus, event: BaseEvent) => string);
+    root_span_attributes?: SpanAttributes | ((eventbus: EventBus, event: BaseEvent) => SpanAttributes);
 };
 export declare class OtelTracingMiddleware implements EventBusMiddleware {
     private readonly tracer;
     private readonly trace_api;
+    private readonly root_span_name;
+    private readonly root_span_attributes;
+    private readonly root_spans;
+    private readonly root_contexts;
     private readonly event_spans;
     private readonly event_contexts;
     private readonly handler_spans;
@@ -23,6 +29,8 @@ export declare class OtelTracingMiddleware implements EventBusMiddleware {
     private completeEventSpan;
     private startHandlerSpan;
     private completeHandlerSpan;
+    private startRootSpan;
+    private completeRootSpan;
     private parentContextForEvent;
 }
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "abxbus",
-  "version": "2.4.18",
+  "version": "2.4.19",
   "description": "Event bus library for browsers and ESM Node.js",
   "type": "module",
   "sideEffects": false,

package/src/middleware_otel_tracing.ts

@@ -1,4 +1,13 @@
-import { ROOT_CONTEXT, SpanStatusCode, trace, type Context, type Span, type Tracer } from '@opentelemetry/api'
+import {
+  ROOT_CONTEXT,
+  SpanStatusCode,
+  trace,
+  type Context,
+  type Span,
+  type SpanAttributeValue,
+  type SpanAttributes,
+  type Tracer,
+} from '@opentelemetry/api'
 
 import type { BaseEvent } from './base_event.js'
 import type { EventBus } from './event_bus.js'
@@ -11,11 +20,17 @@ type OpenTelemetryTraceApi = Pick<typeof trace, 'getTracer' | 'setSpan'>
 export type OtelTracingMiddlewareOptions = {
   tracer?: Tracer
   trace_api?: OpenTelemetryTraceApi
+  root_span_name?: string | ((eventbus: EventBus, event: BaseEvent) => string)
+  root_span_attributes?: SpanAttributes | ((eventbus: EventBus, event: BaseEvent) => SpanAttributes)
 }
 
 export class OtelTracingMiddleware implements EventBusMiddleware {
   private readonly tracer: Tracer
   private readonly trace_api: OpenTelemetryTraceApi
+  private readonly root_span_name: OtelTracingMiddlewareOptions['root_span_name']
+  private readonly root_span_attributes: OtelTracingMiddlewareOptions['root_span_attributes']
+  private readonly root_spans = new Map<string, Span>()
+  private readonly root_contexts = new Map<string, Context>()
   private readonly event_spans = new Map<string, Span>()
   private readonly event_contexts = new Map<string, Context>()
   private readonly handler_spans = new Map<string, Span>()
@@ -24,6 +39,8 @@ export class OtelTracingMiddleware implements EventBusMiddleware {
   constructor(options: OtelTracingMiddlewareOptions = {}) {
     this.trace_api = options.trace_api ?? trace
     this.tracer = options.tracer ?? this.trace_api.getTracer('abxbus')
+    this.root_span_name = options.root_span_name
+    this.root_span_attributes = options.root_span_attributes
   }
 
   onEventChange(eventbus: EventBus, event: BaseEvent, status: EventStatus): void {
@@ -54,7 +71,8 @@ export class OtelTracingMiddleware implements EventBusMiddleware {
       return existing
     }
 
-    const parent_context = this.parentContextForEvent(event) ?? ROOT_CONTEXT
+    const parent_context = this.parentContextForEvent(event) ?? this.startRootSpan(eventbus, event)
+    const start_time = dateFromIso(event.event_started_at)
     const span = this.tracer.startSpan(
       `abxbus.event ${event.event_type}`,
       {
@@ -64,11 +82,12 @@ export class OtelTracingMiddleware implements EventBusMiddleware {
           'abxbus.event.id': event.event_id,
           'abxbus.event.type': event.event_type,
           'abxbus.event.version': event.event_version,
+          'abxbus.event.session_id': stringValue((event as { session_id?: unknown }).session_id),
           'abxbus.event.parent_id': event.event_parent_id,
           'abxbus.event.emitted_by_handler_id': event.event_emitted_by_handler_id,
           'abxbus.event.path': event.event_path.join(' '),
         }),
-        startTime: dateFromIso(event.event_started_at),
+        startTime: start_time,
       },
       parent_context
     )
@@ -93,9 +112,12 @@ export class OtelTracingMiddleware implements EventBusMiddleware {
         'abxbus.event.child_count': event.event_children.length,
       })
     )
-    span.end(dateFromIso(event.event_completed_at))
+    const start_time = dateFromIso(event.event_started_at)
+    const end_time = endTimeAfterStart(start_time, dateFromIso(event.event_completed_at))
+    span.end(end_time)
     this.event_spans.delete(event.event_id)
     this.event_contexts.delete(event.event_id)
+    this.completeRootSpan(event.event_id, start_time, end_time)
   }
 
   private startHandlerSpan(eventbus: EventBus, event: BaseEvent, event_result: EventResult): Span {
@@ -147,11 +169,53 @@ export class OtelTracingMiddleware implements EventBusMiddleware {
         'abxbus.handler.child_count': event_result.event_children.length,
       })
     )
-    span.end(dateFromIso(event_result.completed_at))
+    span.end(endTimeAfterStart(dateFromIso(event_result.started_at), dateFromIso(event_result.completed_at)))
     this.handler_spans.delete(event_result.id)
     this.handler_contexts.delete(handlerSpanKey(event_result.event_id, event_result.handler_id))
   }
 
+  private startRootSpan(eventbus: EventBus, event: BaseEvent): Context {
+    const existing = this.root_contexts.get(event.event_id)
+    if (existing) {
+      return existing
+    }
+
+    const session_id = stringValue((event as { session_id?: unknown }).session_id)
+    const root_attributes = resolveAttributes(this.root_span_attributes, eventbus, event)
+    const root_span = this.tracer.startSpan(
+      resolveRootSpanName(this.root_span_name, eventbus, event),
+      {
+        attributes: compactAttributes({
+          ...root_attributes,
+          'abxbus.trace.root': true,
+          'abxbus.bus.id': eventbus.id,
+          'abxbus.bus.name': eventbus.name,
+          'abxbus.root_event.id': event.event_id,
+          'abxbus.root_event.type': event.event_type,
+          'abxbus.root_event.session_id': session_id,
+        }),
+        startTime: dateFromIso(event.event_started_at),
+      },
+      ROOT_CONTEXT
+    )
+    const root_context = this.trace_api.setSpan(ROOT_CONTEXT, root_span)
+    this.root_spans.set(event.event_id, root_span)
+    this.root_contexts.set(event.event_id, root_context)
+    return root_context
+  }
+
+  private completeRootSpan(event_id: string, start_time: Date | undefined, end_time: Date | undefined): void {
+    const root_span = this.root_spans.get(event_id)
+    if (!root_span) {
+      return
+    }
+
+    root_span.setStatus({ code: SpanStatusCode.OK })
+    root_span.end(endTimeAfterStart(start_time, end_time))
+    this.root_spans.delete(event_id)
+    this.root_contexts.delete(event_id)
+  }
+
   private parentContextForEvent(event: BaseEvent): Context | undefined {
     if (event.event_parent_id && event.event_emitted_by_handler_id) {
       const handler_context = this.handler_contexts.get(handlerSpanKey(event.event_parent_id, event.event_emitted_by_handler_id))
@@ -176,10 +240,35 @@ function dateFromIso(value: string | null | undefined): Date | undefined {
   return Number.isNaN(date.getTime()) ? undefined : date
 }
 
-function compactAttributes(
-  attributes: Record<string, string | number | boolean | null | undefined>
-): Record<string, string | number | boolean> {
-  const compacted: Record<string, string | number | boolean> = {}
+function endTimeAfterStart(start_time: Date | undefined, end_time: Date | undefined): Date | undefined {
+  if (!start_time || !end_time) {
+    return end_time
+  }
+
+  return end_time.getTime() > start_time.getTime() ? end_time : new Date(start_time.getTime() + 1)
+}
+
+function resolveRootSpanName(root_span_name: OtelTracingMiddlewareOptions['root_span_name'], eventbus: EventBus, event: BaseEvent): string {
+  if (typeof root_span_name === 'function') {
+    return root_span_name(eventbus, event)
+  }
+  return root_span_name ?? `abxbus.trace ${eventbus.name}`
+}
+
+function resolveAttributes(
+  attributes: OtelTracingMiddlewareOptions['root_span_attributes'],
+  eventbus: EventBus,
+  event: BaseEvent
+): SpanAttributes {
+  return typeof attributes === 'function' ? attributes(eventbus, event) : (attributes ?? {})
+}
+
+function stringValue(value: unknown): string | undefined {
+  return typeof value === 'string' && value.length > 0 ? value : undefined
+}
+
+function compactAttributes(attributes: Record<string, SpanAttributeValue | null | undefined>): SpanAttributes {
+  const compacted: SpanAttributes = {}
   for (const [key, value] of Object.entries(attributes)) {
     if (value !== null && value !== undefined) {
       compacted[key] = value