NewXRayLogger now see the environment variable AWS_XRAY_LOG_LEVEL.

xray/xraylog/log.go

@@ -78,6 +78,9 @@ const (
 
 	// LogLevelError is error level.
 	LogLevelError
+
+	// LogLevelSilent disables the log of the xray tracer.
+	LogLevelSilent
 )
 
 func (ll LogLevel) String() string {

xray/xrayslog/xrayslog.go

@@ -8,13 +8,37 @@ import (
 	"context"
 	"fmt"
 	"log/slog"
+	"os"
 	"runtime"
+	"strings"
 	"time"
 
 	"github.com/shogo82148/aws-xray-yasdk-go/xray"
 	"github.com/shogo82148/aws-xray-yasdk-go/xray/xraylog"
 )
 
+func getLogLevelFromEnv() xraylog.LogLevel {
+	level := xraylog.LogLevelInfo
+	if os.Getenv("AWS_XRAY_DEBUG_MODE") != "" {
+		level = xraylog.LogLevelDebug
+	} else if env := os.Getenv("AWS_XRAY_LOG_LEVEL"); env != "" {
+		env = strings.ToLower(env)
+		switch env {
+		case "debug":
+			level = xraylog.LogLevelDebug
+		case "info":
+			level = xraylog.LogLevelInfo
+		case "warn":
+			level = xraylog.LogLevelWarn
+		case "error":
+			level = xraylog.LogLevelError
+		case "silent":
+			return xraylog.LogLevelSilent
+		}
+	}
+	return level
+}
+
 var _ slog.Handler = (*handler)(nil)
 
 type handler struct {
@@ -85,16 +109,31 @@ func NewHandler(parent slog.Handler, traceIDKey string) slog.Handler {
 }
 
 type xrayLogger struct {
-	h slog.Handler
+	h        slog.Handler
+	minLevel xraylog.LogLevel
 }
 
 // NewXRayLogger returns a new [xraylog.Logger] such that each call to its Output method dispatches a Record to the specified handler.
 // The logger acts as a bridge from the older xraylog API to newer structured logging handlers.
+// The log level is determined by the environment variable AWS_XRAY_LOG_LEVEL.
 func NewXRayLogger(h slog.Handler) xraylog.Logger {
-	return &xrayLogger{h}
+	return NewXRayLoggerWithMinLevel(h, getLogLevelFromEnv())
+}
+
+// NewXRayLoggerWithMinLevel returns a new [xraylog.Logger] such that each call to its Output method dispatches a Record to the specified handler.
+// The logger acts as a bridge from the older xraylog API to newer structured logging handlers.
+func NewXRayLoggerWithMinLevel(h slog.Handler, minLogLevel xraylog.LogLevel) xraylog.Logger {
+	if minLogLevel == xraylog.LogLevelSilent {
+		return xraylog.NullLogger{}
+	}
+	return &xrayLogger{h, minLogLevel}
 }
 
 func (l *xrayLogger) Log(ctx context.Context, level xraylog.LogLevel, msg fmt.Stringer) {
+	if level < l.minLevel {
+		return
+	}
+
 	lv := xraylogLevelToSlog(level)
 	if !l.h.Enabled(ctx, lv) {
 		return