go/kratos
1
0
Fork 0
mirror of https://github.com/go-kratos/kratos.git synced 2025-03-17 21:07:54 +02:00
Code Issues Releases Activity

fix: logging middleware caller issue #3133 (#3134)

Browse Source 
* fix: logging middleware caller issue #3133

* fix: fix lint issue
This commit is contained in:
kvii 2024-03-15 11:15:31 +08:00 committed by GitHub
parent be8821eed6
commit ffa1dca792
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 58 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
middleware/logging/logging.go
View File

@ -37,7 +37,7 @@ func Server(logger log.Logger) middleware.Middleware {
reason = se.Reason
}
level, stack := extractError(err)
_ = log.WithContext(ctx, logger).Log(level,
log.NewHelper(log.WithContext(ctx, logger)).Log(level,
"kind", "server",
"component", kind,
"operation", operation,
@ -73,7 +73,7 @@ func Client(logger log.Logger) middleware.Middleware {
reason = se.Reason
}
level, stack := extractError(err)
_ = log.WithContext(ctx, logger).Log(level,
log.NewHelper(log.WithContext(ctx, logger)).Log(level,
"kind", "client",
"component", kind,
"operation", operation,

56
middleware/logging/logging_test.go
View File

@ -177,3 +177,59 @@ func TestExtractError(t *testing.T) {
})
}
}
type extractKeyValues [][]any
func (l *extractKeyValues) Log(_ log.Level, kv ...any) error { *l = append(*l, kv); return nil }
func TestServer_CallerPath(t *testing.T) {
var a extractKeyValues
logger := log.With(&a, "caller", log.Caller(5)) // report where the helper was called
// make sure the caller is same
sameCaller := func(fn middleware.Handler) { _, _ = fn(context.Background(), nil) }
// caller: [... log inside middleware, fn(context.Background(), nil)]
h := func(context.Context, any) (a any, e error) { return }
h = Server(logger)(h)
sameCaller(h)
// caller: [... helper.Info("foo"), fn(context.Background(), nil)]
helper := log.NewHelper(logger)
sameCaller(func(context.Context, any) (a any, e error) { helper.Info("foo"); return })
t.Log(a[0])
t.Log(a[1])
if a[0][0] != "caller" || a[1][0] != "caller" {
t.Fatal("caller not found")
}
if a[0][1] != a[1][1] {
t.Fatalf("middleware should have the same caller as log.Helper. middleware: %s, helper: %s", a[0][1], a[1][1])
}
}
func TestClient_CallerPath(t *testing.T) {
var a extractKeyValues
logger := log.With(&a, "caller", log.Caller(5)) // report where the helper was called
// make sure the caller is same
sameCaller := func(fn middleware.Handler) { _, _ = fn(context.Background(), nil) }
// caller: [... log inside middleware, fn(context.Background(), nil)]
h := func(context.Context, any) (a any, e error) { return }
h = Client(logger)(h)
sameCaller(h)
// caller: [... helper.Info("foo"), fn(context.Background(), nil)]
helper := log.NewHelper(logger)
sameCaller(func(context.Context, any) (a any, e error) { helper.Info("foo"); return })
t.Log(a[0])
t.Log(a[1])
if a[0][0] != "caller" || a[1][0] != "caller" {
t.Fatal("caller not found")
}
if a[0][1] != a[1][1] {
t.Fatalf("middleware should have the same caller as log.Helper. middleware: %s, helper: %s", a[0][1], a[1][1])
}
}