clean up

Author: sunnybak

src/sdk/tracer.ts

@@ -34,6 +34,20 @@ export interface EnrichSessionParams {
   userProperties?: Record<string, any>;
 }
 
+/**
+ * Options for tracing a function
+ */
+export interface TraceFunctionOptions {
+  /** Type of event: 'model', 'tool', or 'chain' */
+  eventType?: string | undefined;
+  /** Configuration parameters to include in the trace */
+  config?: Record<string, any> | undefined;
+  /** Metadata to include in the trace */
+  metadata?: Record<string, any> | undefined;
+  /** Custom name for the event */
+  eventName?: string | undefined;
+}
+
 /**
  * Core properties of the HoneyHiveTracer
  */
@@ -706,30 +720,33 @@ export class HoneyHiveTracer {
       return {};
     }
   }
-
-  public traceFunction(...args: any[]) {
-    return traceFunction(...args, this.getTraceloopAssociationProperties());
+  
+  public traceFunction(
+    options: TraceFunctionOptions = {}
+  ) {
+    const associationProps = this.getTraceloopAssociationProperties();
+    return traceFunction(options, associationProps);
   }
 
   public traceModel<F extends (...args: any[]) => any>(
     func: F,
-    { config, metadata, eventName }: { config?: any | undefined; metadata?: any | undefined; eventName?: string | undefined } = {}
+    options: Omit<TraceFunctionOptions, 'eventType'> = {}
   ): F {
-    return this.traceFunction({ eventType: "model", config, metadata, eventName })(func);
+    return this.traceFunction({ ...options, eventType: "model" })(func);
   }
 
   public traceTool<F extends (...args: any[]) => any>(
     func: F,
-    { config, metadata, eventName }: { config?: any | undefined; metadata?: any | undefined; eventName?: string | undefined } = {}
+    options: Omit<TraceFunctionOptions, 'eventType'> = {}
   ): F {
-    return this.traceFunction({ eventType: "tool", config, metadata, eventName })(func);
+    return this.traceFunction({ ...options, eventType: "tool" })(func);
   } 
 
   public traceChain<F extends (...args: any[]) => any>(
     func: F,
-    { config, metadata, eventName }: { config?: any | undefined; metadata?: any | undefined; eventName?: string | undefined } = {}
+    options: Omit<TraceFunctionOptions, 'eventType'> = {}
   ): F {
-    return this.traceFunction({ eventType: "chain", config, metadata, eventName })(func);
+    return this.traceFunction({ ...options, eventType: "chain" })(func);
   }
 
   public logModel(params: EnrichSpanParams = {}) {
@@ -989,30 +1006,31 @@ export function enrichSpan({
 
 export function traceModel<F extends (...args: any[]) => any>(
   func: F,
-  { config, metadata, eventName }: { config?: any | undefined; metadata?: any | undefined; eventName?: string | undefined } = {}
+  options: Omit<TraceFunctionOptions, 'eventType'> = {}
 ): F {
-  return traceFunction({ eventType: "model", config, metadata, eventName })(func);
+  return traceFunction({ ...options, eventType: "model" })(func);
 }
 
 export function traceTool<F extends (...args: any[]) => any>(
   func: F,
-  { config, metadata, eventName }: { config?: any | undefined; metadata?: any | undefined; eventName?: string | undefined } = {}
+  options: Omit<TraceFunctionOptions, 'eventType'> = {}
 ): F {
-  return traceFunction({ eventType: "tool", config, metadata, eventName })(func);
+  return traceFunction({ ...options, eventType: "tool" })(func);
 } 
 
 export function traceChain<F extends (...args: any[]) => any>(
   func: F,
-  { config, metadata, eventName }: { config?: any | undefined; metadata?: any | undefined; eventName?: string | undefined } = {}
+  options: Omit<TraceFunctionOptions, 'eventType'> = {}
 ): F {
-  return traceFunction({ eventType: "chain", config, metadata, eventName })(func);
+  return traceFunction({ ...options, eventType: "chain" })(func);
 }
 
 export function traceFunction(
-  { eventType, config, metadata, eventName }: 
-  { eventType?: string | undefined; config?: any | undefined; metadata?: any | undefined; eventName?: string | undefined } = {},
+  options: TraceFunctionOptions = {},
   associationProperties: Record<string, string> | undefined = undefined
 ) {
+  const { eventType, config, metadata, eventName } = options;
+
   // Helper function to extract argument names from the function
   function getArgs(func: (...args: any[]) => any): string[] | null {
     try {

tests/integration/openai_trace.cts

@@ -30,7 +30,7 @@ async function tracedMain() {
 }
 
 // Export the main function type for TypeScript
-async function main(): Promise<boolean> {
+async function main(): Promise<void> {
     const tracer = await HoneyHiveTracer.init({
         verbose: true,
         instrumentModules: {
@@ -40,10 +40,8 @@ async function main(): Promise<boolean> {
 
     try {
         await tracer.trace(tracedMain);
-        return true;
     } catch (error) {
         console.error(error);
-        return false;
     } finally {
         await tracer.flush();
     }