log/EntryProcessor.Process新增ctx参数并且把ReadonlyEntry中的Context移除;
This commit is contained in:
@@ -186,7 +186,6 @@ func (entry Entry) log(ctx context.Context, level Level, message string) {
|
||||
return
|
||||
}
|
||||
readonlyEntry := ReadonlyEntry{
|
||||
Context: ctx,
|
||||
Fields: newEntry.fields,
|
||||
Message: message,
|
||||
Time: newEntry.time,
|
||||
@@ -202,13 +201,12 @@ func (entry Entry) log(ctx context.Context, level Level, message string) {
|
||||
readonlyEntry.Stack = getStack(newEntry.callerSkip, 32)
|
||||
}
|
||||
for _, processor := range newEntry.logger.getLevelProcessors(level) {
|
||||
processor.Process(readonlyEntry)
|
||||
processor.Process(ctx, readonlyEntry)
|
||||
}
|
||||
}
|
||||
|
||||
// ReadonlyEntry 是日志系统收集到1条日志记录
|
||||
type ReadonlyEntry struct {
|
||||
Context context.Context `json:"-"`
|
||||
Caller Frame
|
||||
Stack []Frame
|
||||
Time time.Time
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
package logjson
|
||||
|
||||
import (
|
||||
"context"
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"io"
|
||||
@@ -36,7 +37,7 @@ type Processor struct {
|
||||
}
|
||||
|
||||
// Process 处理日志
|
||||
func (processor *Processor) Process(entry logsdk.ReadonlyEntry) {
|
||||
func (processor *Processor) Process(_ context.Context, entry logsdk.ReadonlyEntry) {
|
||||
m := Entry{
|
||||
Stack: entry.Stack,
|
||||
Fields: entry.Fields,
|
||||
|
||||
@@ -1,8 +1,10 @@
|
||||
package logsdk
|
||||
|
||||
import "context"
|
||||
|
||||
// EntryProcessor 处理日志记录
|
||||
type EntryProcessor interface {
|
||||
Process(entry ReadonlyEntry)
|
||||
Process(ctx context.Context, entry ReadonlyEntry)
|
||||
}
|
||||
|
||||
type levelProcessors [LevelCount][]EntryProcessor
|
||||
|
||||
Reference in New Issue
Block a user