From e34f5d853ccbcafd72f3035bddac49cbfe0f51dc Mon Sep 17 00:00:00 2001
From: Daisuke Kanda <dai1975@gmail.com>
Date: Wed, 17 Jul 2024 09:32:19 +0000
Subject: [PATCH] directly use slog.Handle(Record) with callers

Signed-off-by: Daisuke Kanda <dai1975@gmail.com>
---
 log/slog.go | 43 +++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 41 insertions(+), 2 deletions(-)

diff --git a/log/slog.go b/log/slog.go
index 866ae3c3..8b121048 100644
--- a/log/slog.go
+++ b/log/slog.go
@@ -6,6 +6,8 @@ import (
 	"log/slog"
 	"os"
 	"time"
+	"runtime"
+	"context"
 
 	"github.com/cockroachdb/errors"
 	"github.com/cockroachdb/errors/withstack"
@@ -63,17 +65,43 @@ func InitLogger(logLevel, format, output string) error {
 	return nil
 }
 
+func (rl *RelayLogger) log(logLevel slog.Level, skipCallDepth int, msg string, args ...any) {
+	var pcs [1]uintptr
+	runtime.Callers(2 + skipCallDepth, pcs[:]) // skip [Callers, this func, ...]
+
+	record := slog.NewRecord(time.Now(), logLevel, msg, pcs[0])
+	record.Add(args...)
+
+	_ = rl.Logger.Handler().Handle(context.Background(), record)
+}
+
+func (rl *RelayLogger) error(skipCallDepth int, msg string, err error, otherArgs ...any) {
+	err = withstack.WithStackDepth(err, 1 + skipCallDepth)
+	var args []any
+	args = append(args, "error", err)
+	args = append(args, "stack", fmt.Sprintf("%+v", err))
+	args = append(args, otherArgs...)
+
+	rl.log(slog.LevelError, 1 + skipCallDepth, msg, args...)
+	//rl.Logger.Error(msg, args...)
+}
+
 func (rl *RelayLogger) Error(msg string, err error, otherArgs ...any) {
+	rl.error(1, msg, err, otherArgs...)
+/*
 	err = withstack.WithStackDepth(err, 1)
 	var args []any
 	args = append(args, "error", err)
 	args = append(args, "stack", fmt.Sprintf("%+v", err))
 	args = append(args, otherArgs...)
+
 	rl.Logger.Error(msg, args...)
+*/
 }
 
 func (rl *RelayLogger) Fatal(msg string, err error, otherArgs ...any) {
-	rl.Error(msg, err, otherArgs...)
+	rl.error(1, msg, err, otherArgs...)
+	//rl.Error(msg, err, otherArgs...)
 	panic(msg)
 }
 
@@ -190,5 +218,16 @@ func (rl *RelayLogger) WithModule(
 func (rl *RelayLogger) TimeTrack(start time.Time, name string, otherArgs ...any) {
 	elapsed := time.Since(start)
 	allArgs := append([]any{"name", name, "elapsed", elapsed.Nanoseconds()}, otherArgs...)
-	rl.Logger.Info("time track", allArgs...)
+	rl.log(slog.LevelInfo, 1, "time track", allArgs...)
+/*
+	var pcs [1]uintptr
+	runtime.Callers(2, pcs[:]) // skip [Callers, this func]
+	record := slog.NewRecord(time.Now(), slog.LevelInfo, "time track", pcs[0])
+
+	allArgs := append([]any{"name", name, "elapsed", elapsed.Nanoseconds()}, otherArgs...)
+	record.Add(allArgs...)
+
+	_ = rl.Logger.Handler().Handle(context.Background(), record)
+	//rl.Logger.Info("time track", allArgs...)
+*/
 }