Merge pull request #16 from JudgmentLabs/ahh/0.3.4

Chore: Node instrumentation reliability

Author: abhishekg999

package.json

@@ -1,6 +1,6 @@
 {
   "name": "judgeval",
-  "version": "0.3.3",
+  "version": "0.3.4",
   "description": "JavaScript/TypeScript client for Judgment evaluation platform",
   "main": "./dist/index.mjs",
   "module": "./dist/index.mjs",

scripts/build.ts

@@ -44,7 +44,7 @@ async function buildLib() {
 
 async function buildUmd() {
   const config: BuildConfig = {
-    entrypoints: ["./src/umd.ts"],
+    entrypoints: ["./src/index.ts"],
     outdir: "./dist",
     target: "browser",
     format: "iife",

src/data/example.ts

@@ -3,7 +3,7 @@ import { Example as ExampleModel } from "../internal/api/models/Example";
 export type Example<T extends Record<string, any> = Record<string, any>> =
   ExampleModel & T;
 
-export function createExample<T extends Record<string, any>>(
+export function Example<T extends Record<string, any>>(
   properties: T,
 ): Example<T> {
   const example: Example<T> = {

src/env.ts

@@ -27,3 +27,4 @@ export const JUDGMENT_ENABLE_EVALUATIONS = getEnvVar(
   "true",
 );
 export const JUDGMENT_NO_COLOR = getEnvVar("JUDGMENT_NO_COLOR");
+export const JUDGMENT_LOG_LEVEL = getEnvVar("JUDGMENT_LOG_LEVEL", "warn");

src/tracer/NodeTracer.ts

@@ -1,15 +1,14 @@
 import { resourceFromAttributes } from "@opentelemetry/resources";
 import { NodeSDK, NodeSDKConfiguration } from "@opentelemetry/sdk-node";
-import { BatchSpanProcessor } from "@opentelemetry/sdk-trace-node";
+import { Logger } from "../utils/logger";
 import { VERSION } from "../version";
 import { OpenTelemetryKeys } from "./OpenTelemetryKeys";
 import { Tracer, TracerInitializeOptions } from "./Tracer";
 import { TracerConfiguration } from "./TracerConfiguration";
 
 export type NodeTracerInitializeOptions = TracerInitializeOptions & {
-  instrumentations?: NodeSDKConfiguration["instrumentations"];
   resourceAttributes?: Record<string, unknown>;
-};
+} & Partial<NodeSDKConfiguration>;
 
 export class NodeTracer extends Tracer {
   private nodeSDK?: NodeSDK;
@@ -34,7 +33,7 @@ export class NodeTracer extends Tracer {
       this.nodeSDK = new NodeSDK({
         resource: resourceFromAttributes(resourceAttributes),
         instrumentations: options.instrumentations,
-        spanProcessor: new BatchSpanProcessor(spanExporter),
+        traceExporter: spanExporter,
         ...options,
       });
 
@@ -72,8 +71,10 @@ export class NodeTracer extends Tracer {
   }
 
   public async shutdown(): Promise<void> {
-    if (this.nodeSDK) {
-      await this.nodeSDK.shutdown();
+    if (!this.nodeSDK) {
+      Logger.warn("Node SDK not initialized, skipping shutdown");
+      return;
     }
+    await this.nodeSDK.shutdown();
   }
 }

src/tracer/Tracer.ts

@@ -383,13 +383,14 @@ export abstract class Tracer {
                   OpenTelemetryKeys.AttributeKeys.JUDGMENT_OUTPUT,
                   this.serializer(res),
                 );
-                span.end();
                 return res;
               })
               .catch((err) => {
                 span.recordException(err as Error);
-                span.end();
                 throw err;
+              })
+              .finally(() => {
+                span.end();
               }) as TResult;
           } else {
             span.setAttribute(

src/umd.ts

@@ -1,3 +1,5 @@
+import { JUDGMENT_LOG_LEVEL } from "../env";
+
 export class Logger {
   private static readonly RESET = "\x1b[0m";
   private static readonly RED = "\x1b[31m";
@@ -13,13 +15,27 @@ export class Logger {
   } as const;
 
   private static initialized = false;
-  private static currentLevel: number = Logger.Level.INFO;
+  private static currentLevel: number = Logger.Level.WARNING;
   private static useColor = true;
 
   private static initialize(): void {
     if (!Logger.initialized) {
       const noColor = process.env.JUDGMENT_NO_COLOR;
       Logger.useColor = !noColor && process.stdout.isTTY;
+
+      const logLevel = JUDGMENT_LOG_LEVEL.toLowerCase();
+      if (logLevel) {
+        const levelMap: Record<string, number> = {
+          debug: Logger.Level.DEBUG,
+          info: Logger.Level.INFO,
+          warning: Logger.Level.WARNING,
+          warn: Logger.Level.WARNING,
+          error: Logger.Level.ERROR,
+          critical: Logger.Level.CRITICAL,
+        };
+        Logger.currentLevel = levelMap[logLevel] ?? Logger.Level.WARNING;
+      }
+
       Logger.initialized = true;
     }
   }

src/utils/logger.ts

@@ -1 +1,3 @@
-export const VERSION = "0.3.3";
+import { version } from "../package.json" with { type: "json" };
+
+export const VERSION = version;