logger updates

Author: abhishekg999

pkg/logger/logger.go

@@ -0,0 +1,84 @@
+package logger
+
+import (
+	"fmt"
+	"os"
+	"strings"
+)
+
+type Level int
+
+const (
+	DEBUG Level = iota
+	INFO
+	WARNING
+	ERROR
+	CRITICAL
+)
+
+var levelNames = map[Level]string{
+	DEBUG:    "DEBUG",
+	INFO:     "INFO",
+	WARNING:  "WARNING",
+	ERROR:    "ERROR",
+	CRITICAL: "CRITICAL",
+}
+
+var level = WARNING // Default to WARNING level
+
+func init() {
+	// Set log level from environment variable
+	if levelStr := os.Getenv("JUDGMENT_LOG_LEVEL"); levelStr != "" {
+		SetLevelFromString(levelStr)
+	}
+}
+
+func SetLevel(l Level) {
+	level = l
+}
+
+func SetLevelFromString(levelStr string) {
+	switch strings.ToLower(levelStr) {
+	case "debug":
+		level = DEBUG
+	case "info":
+		level = INFO
+	case "warning", "warn":
+		level = WARNING
+	case "error":
+		level = ERROR
+	case "critical":
+		level = CRITICAL
+	default:
+		level = WARNING
+	}
+}
+
+func log(l Level, format string, args ...interface{}) {
+	if l < level {
+		return
+	}
+
+	message := fmt.Sprintf(format, args...)
+	fmt.Printf("[%s] %s\n", levelNames[l], message)
+}
+
+func Debug(format string, args ...interface{}) {
+	log(DEBUG, format, args...)
+}
+
+func Info(format string, args ...interface{}) {
+	log(INFO, format, args...)
+}
+
+func Warning(format string, args ...interface{}) {
+	log(WARNING, format, args...)
+}
+
+func Error(format string, args ...interface{}) {
+	log(ERROR, format, args...)
+}
+
+func Critical(format string, args ...interface{}) {
+	log(CRITICAL, format, args...)
+}

pkg/tracer/base_tracer.go

@@ -10,9 +10,9 @@ import (
 	"github.com/JudgmentLabs/judgeval-go/pkg/env"
 	"github.com/JudgmentLabs/judgeval-go/pkg/internal/api"
 	"github.com/JudgmentLabs/judgeval-go/pkg/internal/api/models"
+	"github.com/JudgmentLabs/judgeval-go/pkg/logger"
 	"github.com/JudgmentLabs/judgeval-go/pkg/scorers"
 	"github.com/JudgmentLabs/judgeval-go/pkg/tracer/exporters"
-	"github.com/JudgmentLabs/judgeval-go/pkg/utils"
 	"go.opentelemetry.io/otel"
 	"go.opentelemetry.io/otel/attribute"
 	sdktrace "go.opentelemetry.io/otel/sdk/trace"
@@ -100,8 +100,8 @@ func NewBaseTracer(config TracerConfiguration, serializer ISerializer, initializ
 	projectID := resolveProjectID(apiClient, config.ProjectName)
 
 	if projectID == "" {
-		utils.DefaultLogger.Error(fmt.Sprintf("Failed to resolve project %s, please create it first at https://app.judgmentlabs.ai/org/%s/projects. Skipping Judgment export.",
-			config.ProjectName, config.OrganizationID))
+		logger.Error("Failed to resolve project %s, please create it first at https://app.judgmentlabs.ai/org/%s/projects. Skipping Judgment export.",
+			config.ProjectName, config.OrganizationID)
 	}
 
 	tracer := otel.Tracer(TracerName)
@@ -127,7 +127,7 @@ func (bt *BaseTracer) Initialize() {
 
 func (bt *BaseTracer) GetSpanExporter() sdktrace.SpanExporter {
 	if bt.projectID == "" {
-		utils.DefaultLogger.Error("Project not resolved; cannot create exporter, returning NoOpSpanExporter")
+		logger.Error("Project not resolved; cannot create exporter, returning NoOpSpanExporter")
 		return exporters.NewNoOpSpanExporter()
 	}
 	return bt.createJudgmentSpanExporter(bt.projectID)
@@ -145,64 +145,36 @@ func (bt *BaseTracer) SetAttribute(span trace.Span, key string, value interface{
 	}
 }
 
-func (bt *BaseTracer) AsyncEvaluate(scorer scorers.BaseScorer, example *data.Example, model string) {
-	if !bt.configuration.EnableEvaluation {
-		return
-	}
-
-	span := trace.SpanFromContext(context.Background())
-	utils.DefaultLogger.Info(fmt.Sprintf("DEBUG: AsyncEvaluate - Span found: %v, IsRecording: %v", span != nil, span.IsRecording()))
-
-	if !span.IsRecording() {
-		utils.DefaultLogger.Info("DEBUG: Span not recording, returning")
-		return
-	}
-
-	spanContext := span.SpanContext()
-	traceID := spanContext.TraceID().String()
-	spanID := spanContext.SpanID().String()
-
-	utils.DefaultLogger.Info(fmt.Sprintf("asyncEvaluate: project=%s, traceId=%s, spanId=%s, scorer=%s",
-		bt.configuration.ProjectName, traceID, spanID, scorer.GetName()))
-
-	evaluationRun := bt.createEvaluationRun(scorer, example, model, traceID, spanID)
-	bt.enqueueEvaluation(evaluationRun)
-}
-
-func (bt *BaseTracer) AsyncEvaluateWithContext(ctx context.Context, scorer scorers.BaseScorer, example *data.Example, model string) {
+func (bt *BaseTracer) AsyncEvaluate(ctx context.Context, scorer scorers.BaseScorer, example *data.Example, model string) {
 	if !bt.configuration.EnableEvaluation {
 		return
 	}
 
 	span := trace.SpanFromContext(ctx)
-	utils.DefaultLogger.Info(fmt.Sprintf("DEBUG: AsyncEvaluateWithContext - Span found: %v, IsRecording: %v", span != nil, span.IsRecording()))
+	logger.Debug("AsyncEvaluate - Span found: %v, IsRecording: %v", span != nil, span.IsRecording())
 
 	if !span.IsRecording() {
-		utils.DefaultLogger.Info("DEBUG: Span not recording, returning")
+		logger.Debug("Span not recording, returning")
 		return
 	}
 
 	spanContext := span.SpanContext()
 	traceID := spanContext.TraceID().String()
 	spanID := spanContext.SpanID().String()
 
-	utils.DefaultLogger.Info(fmt.Sprintf("asyncEvaluate: project=%s, traceId=%s, spanId=%s, scorer=%s",
-		bt.configuration.ProjectName, traceID, spanID, scorer.GetName()))
+	logger.Info("asyncEvaluate: project=%s, traceId=%s, spanId=%s, scorer=%s",
+		bt.configuration.ProjectName, traceID, spanID, scorer.GetName())
 
 	evaluationRun := bt.createEvaluationRun(scorer, example, model, traceID, spanID)
 	bt.enqueueEvaluation(evaluationRun)
 }
 
-func (bt *BaseTracer) AsyncEvaluateWithDefaultModel(scorer scorers.BaseScorer, example *data.Example) {
-	bt.AsyncEvaluate(scorer, example, "")
-}
-
-func (bt *BaseTracer) AsyncTraceEvaluate(scorer scorers.BaseScorer, model string) {
+func (bt *BaseTracer) AsyncTraceEvaluate(ctx context.Context, scorer scorers.BaseScorer, model string) {
 	if !bt.configuration.EnableEvaluation {
 		return
 	}
 
-	span := trace.SpanFromContext(context.Background())
+	span := trace.SpanFromContext(ctx)
 	if !span.IsRecording() {
 		return
 	}
@@ -211,19 +183,15 @@ func (bt *BaseTracer) AsyncTraceEvaluate(scorer scorers.BaseScorer, model string
 	traceID := spanContext.TraceID().String()
 	spanID := spanContext.SpanID().String()
 
-	utils.DefaultLogger.Info(fmt.Sprintf("asyncTraceEvaluate: project=%s, traceId=%s, spanId=%s, scorer=%s",
-		bt.configuration.ProjectName, traceID, spanID, scorer.GetName()))
+	logger.Info("asyncTraceEvaluate: project=%s, traceId=%s, spanId=%s, scorer=%s",
+		bt.configuration.ProjectName, traceID, spanID, scorer.GetName())
 
 	evaluationRun := bt.createTraceEvaluationRun(scorer, model, traceID, spanID)
 
 	traceEvalJSON := bt.serializer.Serialize(evaluationRun)
 	span.SetAttributes(attribute.String(AttributeKeys.PendingTraceEval, traceEvalJSON))
 }
 
-func (bt *BaseTracer) AsyncTraceEvaluateWithDefaultModel(scorer scorers.BaseScorer) {
-	bt.AsyncTraceEvaluate(scorer, "")
-}
-
 func (bt *BaseTracer) SetAttributes(span trace.Span, attributes map[string]interface{}) {
 	if attributes == nil {
 		return
@@ -348,7 +316,7 @@ func (bt *BaseTracer) createTraceEvaluationRun(scorer scorers.BaseScorer, model,
 func (bt *BaseTracer) enqueueEvaluation(evaluationRun *data.ExampleEvaluationRun) {
 	_, err := bt.apiClient.AddToRunEvalQueue(evaluationRun.ExampleEvaluationRun)
 	if err != nil {
-		utils.DefaultLogger.Error(fmt.Sprintf("Failed to enqueue evaluation run: %v", err))
+		logger.Error("Failed to enqueue evaluation run: %v", err)
 	}
 }
 

pkg/tracer/exporters/judgment_span_exporter.go

@@ -2,11 +2,10 @@ package exporters
 
 import (
 	"context"
-	"fmt"
 	"net/http"
 	"time"
 
-	"github.com/JudgmentLabs/judgeval-go/pkg/utils"
+	"github.com/JudgmentLabs/judgeval-go/pkg/logger"
 	"go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp"
 	"go.opentelemetry.io/otel/sdk/trace"
 )
@@ -66,7 +65,7 @@ func (b *JudgmentSpanExporterBuilder) Build() *JudgmentSpanExporter {
 	}
 
 	client := &http.Client{
-		Timeout: 30 * time.Second,
+		Timeout: 60 * time.Second,
 	}
 
 	delegate, err := otlptracehttp.New(
@@ -93,16 +92,16 @@ func (b *JudgmentSpanExporterBuilder) Build() *JudgmentSpanExporter {
 }
 
 func (j *JudgmentSpanExporter) ExportSpans(ctx context.Context, spans []trace.ReadOnlySpan) error {
-	utils.DefaultLogger.Info(fmt.Sprintf("Exported %d spans", len(spans)))
+	logger.Info("JudgmentSpanExporter: Exported %d spans", len(spans))
 	return j.delegate.ExportSpans(ctx, spans)
 }
 
 func (j *JudgmentSpanExporter) Shutdown(ctx context.Context) error {
-	utils.DefaultLogger.Info(fmt.Sprintf("Shutting down exporter for project %s", j.projectID))
+	logger.Info("JudgmentSpanExporter: Shutting down exporter for project %s", j.projectID)
 	return j.delegate.Shutdown(ctx)
 }
 
 func (j *JudgmentSpanExporter) ForceFlush(ctx context.Context) error {
-	utils.DefaultLogger.Info(fmt.Sprintf("Force flushing spans for project %s", j.projectID))
+	logger.Info("JudgmentSpanExporter: Force flushing spans for project %s", j.projectID)
 	return nil
 }

pkg/tracer/exporters/noop_span_exporter.go

@@ -2,7 +2,6 @@ package exporters
 
 import (
 	"context"
-	"fmt"
 
 	"go.opentelemetry.io/otel/sdk/trace"
 )
@@ -14,16 +13,13 @@ func NewNoOpSpanExporter() *NoOpSpanExporter {
 }
 
 func (n *NoOpSpanExporter) ExportSpans(ctx context.Context, spans []trace.ReadOnlySpan) error {
-	fmt.Printf("NoOpSpanExporter: Ignoring %d spans\n", len(spans))
 	return nil
 }
 
 func (n *NoOpSpanExporter) Shutdown(ctx context.Context) error {
-	fmt.Printf("NoOpSpanExporter: Shutdown called\n")
 	return nil
 }
 
 func (n *NoOpSpanExporter) ForceFlush(ctx context.Context) error {
-	fmt.Printf("NoOpSpanExporter: ForceFlush called\n")
 	return nil
 }

pkg/tracer/tracer.go

@@ -2,8 +2,8 @@ package tracer
 
 import (
 	"context"
-	"fmt"
 
+	"github.com/JudgmentLabs/judgeval-go/pkg/logger"
 	"github.com/JudgmentLabs/judgeval-go/pkg/version"
 	"go.opentelemetry.io/otel"
 	"go.opentelemetry.io/otel/sdk/resource"
@@ -85,7 +85,7 @@ func (t *Tracer) Initialize() {
 		resource.WithFromEnv(),
 	)
 	if err != nil {
-		fmt.Printf("Failed to create resource: %v\n", err)
+		logger.Error("Failed to create resource: %v", err)
 		return
 	}