perf: otel error logger depends on the interface

OldSmokeGun · Nov 27, 2023 · 8f4b7b6 · 8f4b7b6
1 parent 9a2792a
commit 8f4b7b6
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 10 deletions.
diff --git a/internal/command/base.go b/internal/command/base.go
@@ -19,7 +19,7 @@ import (
 	"go-scaffold/pkg/ioutils"
 	"go-scaffold/pkg/log"
 	iklog "go-scaffold/pkg/log/kratos"
-	tlog "go-scaffold/pkg/log/otel/trace"
+	tlog "go-scaffold/pkg/log/otel"
 	"go-scaffold/pkg/trace"
 )
 

diff --git a/internal/config/db.go → internal/config/database.go b/internal/config/db.go → internal/config/database.go
diff --git a/pkg/log/otel/trace/error_logger.go → pkg/log/otel/error_logger.go b/pkg/log/otel/trace/error_logger.go → pkg/log/otel/error_logger.go
@@ -1,4 +1,4 @@
-package trace
+package otel
 
 import (
 	"context"
@@ -19,5 +19,5 @@ func NewLogger(sl *slog.Logger) *ErrorLogger {
 }
 
 func (l *ErrorLogger) Handle(err error) {
-	l.logger.Log(context.Background(), 8, err, slog.LevelError, "otel error")
+	l.logger.Log(context.Background(), 7, err, slog.LevelError, "otel error")
 }
diff --git a/pkg/trace/trace.go b/pkg/trace/trace.go
@@ -12,8 +12,6 @@ import (
 	sdktrace "go.opentelemetry.io/otel/sdk/trace"
 	semconv "go.opentelemetry.io/otel/semconv/v1.7.0"
 	"go.opentelemetry.io/otel/trace"
-
-	tlog "go-scaffold/pkg/log/otel/trace"
 )
 
 var ErrUnsupportedOTPLProtocol = errors.New("unsupported otpl protocol")
@@ -31,7 +29,7 @@ type Trace struct {
 	serviceName    string
 	env            string
 	tracerProvider *sdktrace.TracerProvider
-	errorLogger    *tlog.ErrorLogger
+	errorLogger    otel.ErrorHandler
 }
 
 type Option func(t *Trace)
@@ -51,7 +49,7 @@ func WithEnv(env string) Option {
 }
 
 // WithErrorLogger optional error logger
-func WithErrorLogger(logger *tlog.ErrorLogger) Option {
+func WithErrorLogger(logger otel.ErrorHandler) Option {
 	return func(t *Trace) {
 		t.errorLogger = logger
 	}
@@ -65,9 +63,7 @@ func New(ctx context.Context, protocol OTPLProtocol, endpoint string, options ..
 	}
 
 	if t.errorLogger != nil {
-		otel.SetErrorHandler(otel.ErrorHandlerFunc(func(err error) {
-			t.errorLogger.Handle(err)
-		}))
+		otel.SetErrorHandler(t.errorLogger)
 	}
 
 	var (