@telemetry-dev/eve 0.1.0 → 0.1.1

package/dist/index.d.mts

@@ -5,7 +5,7 @@ import { InstrumentationDefinition, InstrumentationEvents, InstrumentationRuntim
 
 //#region src/config.d.ts
 /** Options accepted by every @telemetry-dev/eve entry point. */
-type TelemetryDevEveOptions = Omit<TelemetryOptions, "registerGlobal">;
+type TelemetryDevEveOptions = Omit<TelemetryOptions, "registerGlobal" | "sdkName">;
 //#endregion
 //#region src/client.d.ts
 interface WrapEveClientOptions extends TelemetryDevEveOptions {

package/dist/index.mjs

@@ -14,6 +14,7 @@ function ensureInit(options = {}, overrides) {
 	initialized = true;
 	init({
 		...options,
+		sdkName: "@telemetry-dev/eve",
 		registerGlobal: true,
 		spanFilter: options.spanFilter ?? ((span) => span.instrumentationScope.name !== "workflow")
 	}, overrides);
@@ -21,16 +22,16 @@ function ensureInit(options = {}, overrides) {
 //#endregion
 //#region src/client.ts
 function asRecord$1(value) {
-	if (value === null || typeof value !== "object") return void 0;
+	if (value === null || Array.isArray(value) || !(value instanceof Object)) return void 0;
 	return value;
 }
 function stringField$1(record, key) {
 	const value = record?.[key];
-	return typeof value === "string" && value.length > 0 ? value : void 0;
+	return value?.constructor === String && value.length > 0 ? value : void 0;
 }
 function numberField$1(record, key) {
 	const value = record?.[key];
-	return typeof value === "number" ? value : void 0;
+	return value?.constructor === Number ? value : void 0;
 }
 function eventData$1(event) {
 	if (!("data" in event)) return {};
@@ -55,8 +56,8 @@ function inputForSpan(payload) {
 	return payload.message ?? payload.inputResponses;
 }
 function bindOrReturn(target, prop) {
-	const value = Reflect.get(target, prop, target);
-	return typeof value === "function" ? value.bind(target) : value;
+	const value = target[prop];
+	return value instanceof Function ? value.bind(target) : value;
 }
 function addLifecycleEvent(span, event) {
 	const data = eventData$1(event);
@@ -105,7 +106,7 @@ async function* instrumentedStream(response, span, start, payload) {
 			finishReason,
 			output,
 			timeToFirstChunkMs,
-			error
+			error: error instanceof Error ? error : error === void 0 ? void 0 : /* @__PURE__ */ new Error("error")
 		});
 	};
 	try {
@@ -138,7 +139,7 @@ async function* instrumentedStream(response, span, start, payload) {
 		if (payload.signal?.aborted) {
 			error = failureError("cancelled", "cancelled");
 			finishReason ??= "cancelled";
-		} else error = caught;
+		} else error = caught instanceof Error ? caught : new Error(String(caught));
 		throw caught;
 	} finally {
 		finish();
@@ -148,29 +149,29 @@ function wrapSession(session, options) {
 	return new Proxy(session, { get(target, prop) {
 		if (prop === "send") {
 			const wrappedSend = async (input) => {
-				const payload = typeof input === "string" ? { message: input } : input;
+				const turnPayload = input instanceof String || input?.constructor === String ? { message: String(input) } : input;
 				const span = startSpan(options.spanName ?? "invoke_agent", {
 					type: "agent",
 					agentName: options.agentName,
-					input: inputForSpan(payload)
+					input: inputForSpan(turnPayload)
 				});
 				const start = performance.now();
 				let response;
 				try {
 					response = await target.send(input);
 				} catch (error) {
-					if (payload.signal?.aborted) span.end({
+					if (turnPayload.signal?.aborted) span.end({
 						error: failureError("cancelled", "cancelled"),
 						finishReason: "cancelled"
 					});
-					else span.end({ error });
+					else span.end({ error: error instanceof Error ? error : new Error(String(error)) });
 					throw error;
 				}
 				span.span.setAttribute("gen_ai.conversation.id", response.sessionId);
 				return new MessageResponse({
 					continuationToken: response.continuationToken,
 					sessionId: response.sessionId,
-					createStream: () => instrumentedStream(response, span, start, payload)
+					createStream: () => instrumentedStream(response, span, start, turnPayload)
 				});
 			};
 			return wrappedSend;
@@ -189,7 +190,7 @@ function wrapEveClient(client, options = {}, overrides) {
 //#endregion
 //#region src/hook.ts
 function asRecord(value) {
-	if (value === null || typeof value !== "object") return void 0;
+	if (value === null || Array.isArray(value) || !(value instanceof Object)) return void 0;
 	return value;
 }
 function eventData(event) {
@@ -198,11 +199,11 @@ function eventData(event) {
 }
 function stringField(record, key) {
 	const value = record?.[key];
-	return typeof value === "string" && value.length > 0 ? value : void 0;
+	return value?.constructor === String && value.length > 0 ? value : void 0;
 }
 function numberField(record, key) {
 	const value = record?.[key];
-	return typeof value === "number" ? value : void 0;
+	return value?.constructor === Number ? value : void 0;
 }
 function jsonField(record, key) {
 	const value = record?.[key];
@@ -340,7 +341,11 @@ function logEvent(event, ctx) {
 					...attrs,
 					"error.code": stringField(childData, "code"),
 					"eve.error.details": jsonField(childData, "details")
-				}, child);
+				}, {
+					...child,
+					data: childData,
+					type: childType
+				});
 				return;
 			}
 			if (childType === "turn.failed") {
@@ -348,14 +353,22 @@ function logEvent(event, ctx) {
 					...attrs,
 					"error.code": stringField(childData, "code"),
 					"eve.error.details": jsonField(childData, "details")
-				}, child);
+				}, {
+					...child,
+					data: childData,
+					type: childType
+				});
 				return;
 			}
 			if (childType === "session.failed") emit(event, ctx, "error", `Subagent session failed: ${stringField(childData, "message") ?? ""}`, {
 				...attrs,
 				"error.code": stringField(childData, "code"),
 				"eve.error.details": jsonField(childData, "details")
-			}, child);
+			}, {
+				...child,
+				data: childData,
+				type: childType
+			});
 			return;
 		}
 		case "subagent.called": {
@@ -415,13 +428,13 @@ function telemetryDevHook(options = {}, overrides) {
 			ensureInit(options, overrides);
 			logEvent(event, ctx);
 		} catch (error) {
-			reportError$1(options.onError, error);
+			reportError$1(options.onError, error instanceof Error ? error : new Error(String(error)));
 		}
 	} } };
 }
 //#endregion
 //#region src/instrumentation.ts
-const envServiceName = () => typeof process !== "undefined" ? process.env.OTEL_SERVICE_NAME : void 0;
+const envServiceName = () => globalThis.process !== void 0 ? process.env.OTEL_SERVICE_NAME : void 0;
 function reportError(onError, error) {
 	try {
 		onError?.(error);
@@ -439,20 +452,23 @@ function telemetryDevInstrumentation(options = {}, overrides) {
 					serviceName: sdkOptions.serviceName ?? envServiceName() ?? agentName
 				}, overrides);
 			} catch (error) {
-				reportError(sdkOptions.onError, error);
+				reportError(sdkOptions.onError, error instanceof Error ? error : new Error(String(error)));
 			}
 		},
 		events: { "step.started"(input) {
 			const ctx = { ...runtimeContext };
 			const userId = input.session.auth.initiator?.principalId ?? input.session.auth.current?.principalId;
-			if (userId) ctx["user.id"] = userId;
+			const runtimeContextWithUser = userId ? {
+				...ctx,
+				"user.id": userId
+			} : ctx;
 			try {
 				const userResult = stepStarted?.(input);
-				if (userResult?.runtimeContext) Object.assign(ctx, userResult.runtimeContext);
+				if (userResult?.runtimeContext) Object.assign(runtimeContextWithUser, userResult.runtimeContext);
 			} catch (error) {
-				reportError(sdkOptions.onError, error);
+				reportError(sdkOptions.onError, error instanceof Error ? error : new Error(String(error)));
 			}
-			return Object.keys(ctx).length > 0 ? { runtimeContext: ctx } : void 0;
+			return Object.keys(runtimeContextWithUser).length > 0 ? { runtimeContext: runtimeContextWithUser } : void 0;
 		} }
 	};
 	if (functionId !== void 0) return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@telemetry-dev/eve",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "Eve (Vercel agent framework) telemetry integration for telemetry.dev.",
   "keywords": [
     "agents",
@@ -37,7 +37,7 @@
   },
   "dependencies": {
     "@opentelemetry/api": "^1.9.1",
-    "@telemetry-dev/sdk": "^0.1.0"
+    "@telemetry-dev/sdk": "^0.1.1"
   },
   "devDependencies": {
     "@opentelemetry/sdk-logs": "^0.218.0",

package/src/client.ts

@@ -24,24 +24,33 @@ export interface WrapEveClientOptions extends TelemetryDevEveOptions {
   spanName?: string;
 }
 
-function asRecord(value: unknown): Record<string, unknown> | undefined {
-  if (value === null || typeof value !== "object") return undefined;
-  return value as Record<string, unknown>;
+type EventRecord = { [key: string]: EventValue };
+type EventValue =
+  | string
+  | number
+  | boolean
+  | null
+  | undefined
+  | readonly EventValue[]
+  | EventRecord;
+function asRecord(value: EventValue): EventRecord | undefined {
+  if (value === null || Array.isArray(value) || !(value instanceof Object)) return undefined;
+  return value as EventRecord;
 }
 
-function stringField(record: Record<string, unknown> | undefined, key: string): string | undefined {
+function stringField(record: EventRecord | undefined, key: string): string | undefined {
   const value = record?.[key];
-  return typeof value === "string" && value.length > 0 ? value : undefined;
+  return value?.constructor === String && value.length > 0 ? value : undefined;
 }
 
-function numberField(record: Record<string, unknown> | undefined, key: string): number | undefined {
+function numberField(record: EventRecord | undefined, key: string): number | undefined {
   const value = record?.[key];
-  return typeof value === "number" ? value : undefined;
+  return value?.constructor === Number ? value : undefined;
 }
 
-function eventData(event: HandleMessageStreamEvent): Record<string, unknown> {
+function eventData(event: HandleMessageStreamEvent): EventRecord {
   if (!("data" in event)) return {};
-  return asRecord(event.data) ?? {};
+  return asRecord(event.data as EventValue) ?? {};
 }
 
 function eventAttributes(
@@ -66,13 +75,13 @@ function failureError(code: string | undefined, message: string | undefined): Er
   return error;
 }
 
-function inputForSpan<TOutput>(payload: SendTurnPayload<TOutput>): unknown {
+function inputForSpan<TOutput>(payload: SendTurnPayload<TOutput>) {
   return payload.message ?? payload.inputResponses;
 }
 
-function bindOrReturn<T extends object>(target: T, prop: string | symbol): unknown {
-  const value = Reflect.get(target, prop, target);
-  return typeof value === "function" ? value.bind(target) : value;
+function bindOrReturn<T extends object>(target: T, prop: string | symbol) {
+  const value = target[prop as keyof T];
+  return value instanceof Function ? value.bind(target) : value;
 }
 
 function addLifecycleEvent(span: SpanHandle, event: HandleMessageStreamEvent): void {
@@ -141,7 +150,7 @@ async function* instrumentedStream<TOutput>(
       finishReason,
       output,
       timeToFirstChunkMs,
-      error,
+      error: error instanceof Error ? error : error === undefined ? undefined : new Error("error"),
     });
   };
 
@@ -204,7 +213,7 @@ async function* instrumentedStream<TOutput>(
       error = failureError("cancelled", "cancelled");
       finishReason ??= "cancelled";
     } else {
-      error = caught;
+      error = caught instanceof Error ? caught : new Error(String(caught));
     }
     throw caught;
   } finally {
@@ -219,25 +228,28 @@ function wrapSession(session: ClientSession, options: WrapEveClientOptions): Cli
         const wrappedSend: ClientSession["send"] = async <TOutput = unknown>(
           input: SendTurnInput<TOutput>,
         ) => {
-          const payload: SendTurnPayload<TOutput> =
-            typeof input === "string" ? { message: input } : input;
+          const payload =
+            input instanceof String || input?.constructor === String
+              ? { message: String(input) }
+              : input;
+          const turnPayload = payload as SendTurnPayload<TOutput>;
           const span = startSpan(options.spanName ?? "invoke_agent", {
             type: "agent",
             agentName: options.agentName,
-            input: inputForSpan(payload),
+            input: inputForSpan(turnPayload),
           });
           const start = performance.now();
           let response: MessageResponse<TOutput>;
           try {
             response = await target.send(input);
           } catch (error) {
-            if (payload.signal?.aborted) {
+            if (turnPayload.signal?.aborted) {
               span.end({
                 error: failureError("cancelled", "cancelled"),
                 finishReason: "cancelled",
               });
             } else {
-              span.end({ error });
+              span.end({ error: error instanceof Error ? error : new Error(String(error)) });
             }
             throw error;
           }
@@ -248,7 +260,7 @@ function wrapSession(session: ClientSession, options: WrapEveClientOptions): Cli
           return new MessageResponse<TOutput>({
             continuationToken: response.continuationToken,
             sessionId: response.sessionId,
-            createStream: () => instrumentedStream(response, span, start, payload),
+            createStream: () => instrumentedStream(response, span, start, turnPayload),
           });
         };
         return wrappedSend;
@@ -265,7 +277,6 @@ export function wrapEveClient<C extends Client>(
 ): C {
   const { agentName: _agentName, spanName: _spanName, ...sdkOptions } = options;
   ensureInit(sdkOptions, overrides);
-
   return new Proxy(client, {
     get(target, prop) {
       if (prop === "session") {

package/src/config.ts

@@ -1,7 +1,7 @@
 import { init, shutdown, type ClientOverrides, type TelemetryOptions } from "@telemetry-dev/sdk";
 
 /** Options accepted by every @telemetry-dev/eve entry point. */
-export type TelemetryDevEveOptions = Omit<TelemetryOptions, "registerGlobal">;
+export type TelemetryDevEveOptions = Omit<TelemetryOptions, "registerGlobal" | "sdkName">;
 
 export type { ClientOverrides };
 
@@ -23,6 +23,7 @@ export function ensureInit(
   init(
     {
       ...options,
+      sdkName: "@telemetry-dev/eve",
       registerGlobal: true,
       spanFilter: options.spanFilter ?? ((span) => span.instrumentationScope.name !== "workflow"),
     },

package/src/hook.ts

@@ -4,29 +4,30 @@ import type { HookContext, HookDefinition } from "eve/hooks";
 
 import { ensureInit, type ClientOverrides, type TelemetryDevEveOptions } from "./config.ts";
 
-type Attrs = Record<string, unknown>;
+type Attrs = { [key: string]: Value };
+type Value = string | number | boolean | null | undefined | readonly Value[] | Attrs;
 
-function asRecord(value: unknown): Record<string, unknown> | undefined {
-  if (value === null || typeof value !== "object") return undefined;
-  return value as Record<string, unknown>;
+function asRecord(value: Value): Attrs | undefined {
+  if (value === null || Array.isArray(value) || !(value instanceof Object)) return undefined;
+  return value as Attrs;
 }
 
-function eventData(event: HandleMessageStreamEvent): Record<string, unknown> {
+function eventData(event: HandleMessageStreamEvent): Attrs {
   if (!("data" in event)) return {};
-  return asRecord(event.data) ?? {};
+  return asRecord(event.data as Value) ?? {};
 }
 
-function stringField(record: Record<string, unknown> | undefined, key: string): string | undefined {
+function stringField(record: Attrs | undefined, key: string): string | undefined {
   const value = record?.[key];
-  return typeof value === "string" && value.length > 0 ? value : undefined;
+  return value?.constructor === String && value.length > 0 ? value : undefined;
 }
 
-function numberField(record: Record<string, unknown> | undefined, key: string): number | undefined {
+function numberField(record: Attrs | undefined, key: string): number | undefined {
   const value = record?.[key];
-  return typeof value === "number" ? value : undefined;
+  return value?.constructor === Number ? value : undefined;
 }
 
-function jsonField(record: Record<string, unknown> | undefined, key: string): string | undefined {
+function jsonField(record: Attrs | undefined, key: string): string | undefined {
   const value = record?.[key];
   if (value === undefined) return undefined;
   try {
@@ -36,7 +37,7 @@ function jsonField(record: Record<string, unknown> | undefined, key: string): st
   }
 }
 
-function baseAttributes(event: HandleMessageStreamEvent, ctx: HookContext): Attrs {
+function baseAttributes(event: HandleMessageStreamEvent, ctx: HookContext) {
   const data = eventData(event);
   return {
     "gen_ai.conversation.id": ctx.session.id,
@@ -48,7 +49,7 @@ function baseAttributes(event: HandleMessageStreamEvent, ctx: HookContext): Attr
   };
 }
 
-function toolAttrs(result: unknown): Attrs {
+function toolAttrs(result: Value) {
   const record = asRecord(result);
   const subagentName = stringField(record, "subagentName");
   return {
@@ -59,7 +60,7 @@ function toolAttrs(result: unknown): Attrs {
     "eve.subagent.name": subagentName,
   };
 }
-function reportError(onError: ((error: unknown) => void) | undefined, error: unknown): void {
+function reportError(onError: ((error: Error) => void) | undefined, error: Error): void {
   try {
     onError?.(error);
   } catch {
@@ -84,7 +85,7 @@ function emit(
   });
 }
 
-function stepCompletedMessage(data: Record<string, unknown>): string {
+function stepCompletedMessage(data: Attrs): string {
   const finishReason = stringField(data, "finishReason") ?? "unknown";
   const usage = asRecord(data.usage);
   const inputTokens = numberField(usage, "inputTokens");
@@ -186,7 +187,7 @@ function logEvent(event: HandleMessageStreamEvent, ctx: HookContext): void {
       });
       return;
     case "subagent.event": {
-      const child = asRecord(data.event);
+      const child = asRecord(data.event as Value);
       const childData = asRecord(child?.data);
       const childType = stringField(child, "type");
       const attrs = {
@@ -204,7 +205,11 @@ function logEvent(event: HandleMessageStreamEvent, ctx: HookContext): void {
             "error.code": stringField(childData, "code"),
             "eve.error.details": jsonField(childData, "details"),
           },
-          child as unknown as HandleMessageStreamEvent,
+          {
+            ...child,
+            data: childData,
+            type: childType,
+          } as HandleMessageStreamEvent,
         );
         return;
       }
@@ -219,7 +224,11 @@ function logEvent(event: HandleMessageStreamEvent, ctx: HookContext): void {
             "error.code": stringField(childData, "code"),
             "eve.error.details": jsonField(childData, "details"),
           },
-          child as unknown as HandleMessageStreamEvent,
+          {
+            ...child,
+            data: childData,
+            type: childType,
+          } as HandleMessageStreamEvent,
         );
         return;
       }
@@ -234,7 +243,11 @@ function logEvent(event: HandleMessageStreamEvent, ctx: HookContext): void {
             "error.code": stringField(childData, "code"),
             "eve.error.details": jsonField(childData, "details"),
           },
-          child as unknown as HandleMessageStreamEvent,
+          {
+            ...child,
+            data: childData,
+            type: childType,
+          } as HandleMessageStreamEvent,
         );
       }
       return;
@@ -305,7 +318,7 @@ export function telemetryDevHook(
           ensureInit(options, overrides);
           logEvent(event, ctx);
         } catch (error) {
-          reportError(options.onError, error);
+          reportError(options.onError, error instanceof Error ? error : new Error(String(error)));
         }
       },
     },

package/src/instrumentation.ts

@@ -20,8 +20,8 @@ export interface TelemetryDevInstrumentationOptions extends TelemetryDevEveOptio
 }
 
 const envServiceName = (): string | undefined =>
-  typeof process !== "undefined" ? process.env.OTEL_SERVICE_NAME : undefined;
-function reportError(onError: ((error: unknown) => void) | undefined, error: unknown): void {
+  globalThis.process !== undefined ? process.env.OTEL_SERVICE_NAME : undefined;
+function reportError(onError: ((error: Error) => void) | undefined, error: Error): void {
   try {
     onError?.(error);
   } catch {
@@ -49,27 +49,30 @@ export function telemetryDevInstrumentation(
           overrides,
         );
       } catch (error) {
-        reportError(sdkOptions.onError, error);
+        reportError(sdkOptions.onError, error instanceof Error ? error : new Error(String(error)));
       }
     },
     events: {
       "step.started"(input) {
-        const ctx: Record<string, unknown> = { ...runtimeContext };
+        const ctx = { ...runtimeContext } satisfies InstrumentationRuntimeContext;
         const userId =
           input.session.auth.initiator?.principalId ?? input.session.auth.current?.principalId;
-        if (userId) ctx["user.id"] = userId;
+        const runtimeContextWithUser = userId ? { ...ctx, "user.id": userId } : ctx;
 
         try {
           const userResult = stepStarted?.(input);
           if (userResult?.runtimeContext) {
-            Object.assign(ctx, userResult.runtimeContext);
+            Object.assign(runtimeContextWithUser, userResult.runtimeContext);
           }
         } catch (error) {
-          reportError(sdkOptions.onError, error);
+          reportError(
+            sdkOptions.onError,
+            error instanceof Error ? error : new Error(String(error)),
+          );
         }
 
-        return Object.keys(ctx).length > 0
-          ? { runtimeContext: ctx as InstrumentationRuntimeContext }
+        return Object.keys(runtimeContextWithUser).length > 0
+          ? { runtimeContext: runtimeContextWithUser }
           : undefined;
       },
     },