Compare commits
18 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 9ccc7030f2 | |||
| 9f8f38e43f | |||
| 859a8d88f7 | |||
| 4baf4b36e7 | |||
|
|
2fd0c1f9ec | ||
| c7090b5067 | |||
|
|
16d3e04fd9 | ||
| 57a908f894 | |||
| acaa46b73f | |||
| 24a5d3dd88 | |||
|
|
1de7cc0034 | ||
| 9a61d4b9d3 | |||
|
|
4aef5329c7 | ||
| eb1708a296 | |||
|
|
50cfee751d | ||
| 722669f094 | |||
| d365c5b36b | |||
|
|
e7774808fd |
@@ -1,9 +1,11 @@
|
||||
---
|
||||
kind: pipeline
|
||||
name: default
|
||||
type: docker
|
||||
name: logger
|
||||
|
||||
steps:
|
||||
- name: test
|
||||
image: golang:1.21.5
|
||||
image: golang:1.22.2
|
||||
volumes:
|
||||
- name: deps
|
||||
path: /go/src/mod
|
||||
@@ -11,7 +13,7 @@ steps:
|
||||
- go test
|
||||
|
||||
- name: golangci-lint
|
||||
image: golangci/golangci-lint:v1.55
|
||||
image: golangci/golangci-lint:v1.57
|
||||
commands:
|
||||
- golangci-lint run
|
||||
|
||||
|
||||
26
.gitea/workflows/goaction.yml
Normal file
26
.gitea/workflows/goaction.yml
Normal file
@@ -0,0 +1,26 @@
|
||||
name: Go Action
|
||||
|
||||
on: [push, pull_request]
|
||||
|
||||
jobs:
|
||||
goaction:
|
||||
runs-on: ubuntu-latest # Use a Gitea Actions runner label
|
||||
steps:
|
||||
- name: Check out repository code
|
||||
uses: actions/checkout@v4 # Action to clone the repo
|
||||
|
||||
- name: Set up Go
|
||||
uses: actions/setup-go@v5 # Action to install a specific Go version
|
||||
with:
|
||||
go-version: '1.25.5' # Specify your required Go version
|
||||
|
||||
- name: Run golangci-lint
|
||||
uses: golangci/golangci-lint-action@v8 # Use the golangci-lint action
|
||||
with:
|
||||
version: v2.7.2 # Specify the linter version
|
||||
# Optional: additional arguments
|
||||
args: --verbose
|
||||
|
||||
- name: Run go test
|
||||
run: go test ./...
|
||||
|
||||
121
.golangci.yml
121
.golangci.yml
@@ -1,6 +1,30 @@
|
||||
linters-settings:
|
||||
version: "2"
|
||||
linters:
|
||||
default: all
|
||||
disable:
|
||||
- wsl
|
||||
- noinlineerr
|
||||
settings:
|
||||
depguard:
|
||||
rules:
|
||||
main:
|
||||
allow:
|
||||
- $gostd
|
||||
- gitoa.ru
|
||||
|
||||
funcorder:
|
||||
constructor: false
|
||||
recvcheck:
|
||||
disable-builtin: false
|
||||
exclusions:
|
||||
- "*.String"
|
||||
- "*.UnmarshalText"
|
||||
- "*.UnmarshalJSON"
|
||||
- "*.UnmarshalBinary"
|
||||
dupl:
|
||||
threshold: 100
|
||||
exhaustive:
|
||||
default-signifies-exhaustive: true
|
||||
funlen:
|
||||
lines: 100
|
||||
statements: 50
|
||||
@@ -9,60 +33,61 @@ linters-settings:
|
||||
min-occurrences: 2
|
||||
gocyclo:
|
||||
min-complexity: 15
|
||||
govet:
|
||||
check-shadowing: true
|
||||
lll:
|
||||
line-length: 140
|
||||
fieldalignment:
|
||||
suggest-new: true
|
||||
misspell:
|
||||
locale: US
|
||||
exhaustive:
|
||||
default-signifies-exhaustive: true
|
||||
tagliatelle:
|
||||
case:
|
||||
rules:
|
||||
avro: snake
|
||||
bson: camel
|
||||
json: snake
|
||||
xml: camel
|
||||
yaml: camel
|
||||
use-field-name: true
|
||||
varnamelen:
|
||||
min-name-length: 2
|
||||
ignore-names:
|
||||
- err
|
||||
- n
|
||||
- "n"
|
||||
- i
|
||||
- w
|
||||
tagliatelle:
|
||||
case:
|
||||
use-field-name: true
|
||||
rules:
|
||||
json: snake
|
||||
yaml: camel
|
||||
xml: camel
|
||||
bson: camel
|
||||
avro: snake
|
||||
|
||||
linters:
|
||||
enable-all: true
|
||||
disable:
|
||||
# deprecated
|
||||
- interfacer
|
||||
- structcheck
|
||||
- varcheck
|
||||
- golint
|
||||
- deadcode
|
||||
- scopelint
|
||||
- exhaustivestruct
|
||||
- ifshort
|
||||
- nosnakecase
|
||||
- maligned
|
||||
|
||||
- depguard # need configure
|
||||
|
||||
issues:
|
||||
# Excluding configuration per-path, per-linter, per-text and per-source
|
||||
exclude-rules:
|
||||
- path: _test\.go
|
||||
linters:
|
||||
- gomnd
|
||||
- ireturn
|
||||
- exhaustruct
|
||||
- gochecknoglobals
|
||||
- path: _example_test\.go
|
||||
linters:
|
||||
- lll
|
||||
- goerr113
|
||||
exclusions:
|
||||
generated: lax
|
||||
presets:
|
||||
- comments
|
||||
- common-false-positives
|
||||
- legacy
|
||||
- std-error-handling
|
||||
rules:
|
||||
- linters:
|
||||
- exhaustruct
|
||||
- gochecknoglobals
|
||||
- ireturn
|
||||
- mnd
|
||||
path: _test\.go
|
||||
- linters:
|
||||
- err113
|
||||
- lll
|
||||
path: _example_test\.go
|
||||
- linters:
|
||||
- lll
|
||||
- mnd
|
||||
path: example/*
|
||||
paths:
|
||||
- third_party$
|
||||
- builtin$
|
||||
- examples$
|
||||
formatters:
|
||||
enable:
|
||||
- gci
|
||||
- gofmt
|
||||
- gofumpt
|
||||
- goimports
|
||||
exclusions:
|
||||
generated: lax
|
||||
paths:
|
||||
- third_party$
|
||||
- builtin$
|
||||
- examples$
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
# log
|
||||
|
||||
[](https://drone.gitoa.ru/go-4devs/log)
|
||||

|
||||
[](https://goreportcard.com/report/gitoa.ru/go-4devs/log)
|
||||
[](http://godoc.org/gitoa.ru/go-4devs/log)
|
||||
|
||||
@@ -69,10 +69,10 @@ func getMessage(iter int) string {
|
||||
return _messages[iter%1000]
|
||||
}
|
||||
|
||||
func fakeFmtArgs() []interface{} {
|
||||
func fakeFmtArgs() []any {
|
||||
// Need to keep this a function instead of a package-global var so that we
|
||||
// pay the cast-to-interface{} penalty on each call.
|
||||
return []interface{}{
|
||||
return []any{
|
||||
_tenInts[0],
|
||||
_tenInts,
|
||||
_tenStrings[0],
|
||||
@@ -101,8 +101,8 @@ func fakeFields() []field.Field {
|
||||
}
|
||||
}
|
||||
|
||||
func fakeSugarFields() []interface{} {
|
||||
return []interface{}{
|
||||
func fakeSugarFields() []any {
|
||||
return []any{
|
||||
"int", _tenInts[0],
|
||||
"ints", _tenInts,
|
||||
"string", _tenStrings[0],
|
||||
@@ -166,7 +166,9 @@ func BenchmarkDisabledAccumulatedContext(b *testing.B) {
|
||||
|
||||
b.Run("4devs/log.Context", func(b *testing.B) {
|
||||
b.ResetTimer()
|
||||
|
||||
logger := NewLogger().With(log.GoVersion("goversion"))
|
||||
|
||||
b.RunParallel(func(pb *testing.PB) {
|
||||
for pb.Next() {
|
||||
logger.InfoKV(ctx, getMessage(0), fakeFields()...)
|
||||
|
||||
@@ -8,6 +8,7 @@ import (
|
||||
|
||||
func Caller(depth int, full bool) string {
|
||||
const offset = 3
|
||||
|
||||
_, file, line, has := runtime.Caller(depth + offset)
|
||||
|
||||
if !has {
|
||||
|
||||
@@ -32,7 +32,7 @@ func WithMessage(msg string) Option {
|
||||
}
|
||||
}
|
||||
|
||||
func WithMessagef(format string, args ...interface{}) Option {
|
||||
func WithMessagef(format string, args ...any) Option {
|
||||
return func(e *Entry) {
|
||||
e.format = format
|
||||
e.args = args
|
||||
@@ -50,7 +50,7 @@ func New(opts ...Option) *Entry {
|
||||
fields: make(field.Fields, 0, defaultCap+1),
|
||||
level: level.Debug,
|
||||
format: "",
|
||||
args: make([]interface{}, 0, defaultCap+1),
|
||||
args: make([]any, 0, defaultCap+1),
|
||||
}
|
||||
|
||||
for _, opt := range opts {
|
||||
@@ -63,7 +63,7 @@ func New(opts ...Option) *Entry {
|
||||
// Entry slice field.
|
||||
type Entry struct {
|
||||
format string
|
||||
args []interface{}
|
||||
args []any
|
||||
level level.Level
|
||||
fields field.Fields
|
||||
}
|
||||
@@ -133,7 +133,7 @@ func (e *Entry) SetMessage(msg string) *Entry {
|
||||
return e
|
||||
}
|
||||
|
||||
func (e *Entry) SetMessagef(format string, args ...interface{}) *Entry {
|
||||
func (e *Entry) SetMessagef(format string, args ...any) *Entry {
|
||||
if e == nil {
|
||||
return New().SetMessagef(format, args...)
|
||||
}
|
||||
@@ -154,10 +154,31 @@ func (e *Entry) Add(fields ...field.Field) *Entry {
|
||||
return e
|
||||
}
|
||||
|
||||
func (e *Entry) AddAny(key string, value interface{}) *Entry {
|
||||
func (e *Entry) AddAny(key string, value any) *Entry {
|
||||
return e.Add(field.Any(key, value))
|
||||
}
|
||||
|
||||
func (e *Entry) AddString(key, value string) *Entry {
|
||||
return e.Add(field.String(key, value))
|
||||
}
|
||||
|
||||
func (e *Entry) Replace(key string, value field.Value) *Entry {
|
||||
has := false
|
||||
|
||||
e.fields.Fields(func(f field.Field) bool {
|
||||
if f.Key == key {
|
||||
f.Value = value
|
||||
has = true
|
||||
|
||||
return false
|
||||
}
|
||||
|
||||
return true
|
||||
})
|
||||
|
||||
if !has {
|
||||
e.AddAny(key, value)
|
||||
}
|
||||
|
||||
return e
|
||||
}
|
||||
|
||||
@@ -4,7 +4,7 @@ import "sync"
|
||||
|
||||
//nolint:gochecknoglobals
|
||||
var pool = sync.Pool{
|
||||
New: func() interface{} {
|
||||
New: func() any {
|
||||
return New()
|
||||
},
|
||||
}
|
||||
|
||||
38
example/log.go
Normal file
38
example/log.go
Normal file
@@ -0,0 +1,38 @@
|
||||
package main
|
||||
|
||||
import (
|
||||
"context"
|
||||
"time"
|
||||
|
||||
"gitoa.ru/go-4devs/log"
|
||||
"gitoa.ru/go-4devs/log/field"
|
||||
)
|
||||
|
||||
func main() {
|
||||
ctx := context.Background()
|
||||
|
||||
log.DebugKV(ctx, "debug message")
|
||||
log.ErrKV(ctx, "error message")
|
||||
log.Errf(ctx, "format error message:%v", 42)
|
||||
log.Err(ctx, "error message", 42)
|
||||
service(ctx, log.Log())
|
||||
|
||||
logger := log.New(log.WithJSONFormat()).With(log.WithSource(10, log.TrimPath), log.WithTime(log.KeyTime, time.RFC3339))
|
||||
logger.AlertKV(ctx, "alert message new logger", field.String("string", "value"))
|
||||
service(ctx, logger)
|
||||
|
||||
strLogger := log.New(log.WithFormat(log.FormatWithBracket(field.NewEncoderText()))).With(log.WithSource(10, log.TrimPath), log.WithTime(log.KeyTime, time.RFC3339))
|
||||
strLogger.AlertKV(ctx, "alert message new txt logger", field.String("string", "value"))
|
||||
service(ctx, strLogger)
|
||||
}
|
||||
|
||||
func service(ctx context.Context, logger log.Logger) {
|
||||
logger = logger.With(log.WithName("service"))
|
||||
logger.WarnKV(ctx, "warn service message")
|
||||
otherService(ctx, logger)
|
||||
}
|
||||
|
||||
func otherService(ctx context.Context, logger log.Logger) {
|
||||
logger = logger.With(log.WithName("other_service"))
|
||||
logger.WarnKV(ctx, "warn other service message")
|
||||
}
|
||||
2
field.go
2
field.go
@@ -5,7 +5,7 @@ import (
|
||||
)
|
||||
|
||||
// Field create field.
|
||||
func Field(key string, value interface{}) field.Field {
|
||||
func Field(key string, value any) field.Field {
|
||||
return field.Any(key, value)
|
||||
}
|
||||
|
||||
|
||||
279
field/encoder.go
279
field/encoder.go
@@ -1,4 +1,3 @@
|
||||
//nolint:gomnd
|
||||
package field
|
||||
|
||||
import (
|
||||
@@ -104,7 +103,147 @@ func (b BaseEncoder) AppendDelimiter(dst []byte, deli byte) []byte {
|
||||
return append(dst, deli)
|
||||
}
|
||||
|
||||
//nolint:gocyclo,cyclop
|
||||
func (b BaseEncoder) AppendDuration(dst []byte, d time.Duration) []byte {
|
||||
return b.AppendString(dst, d.String())
|
||||
}
|
||||
|
||||
func (b BaseEncoder) AppendTime(dst []byte, t time.Time) []byte {
|
||||
return b.AppendString(dst, t.Format(b.timeFormat))
|
||||
}
|
||||
|
||||
func AppendString(dst []byte, in string) []byte {
|
||||
if needsQuoting(in) {
|
||||
return strconv.AppendQuote(dst, in)
|
||||
}
|
||||
|
||||
return append(dst, in...)
|
||||
}
|
||||
|
||||
//nolint:cyclop
|
||||
func needsQuoting(in string) bool {
|
||||
if len(in) == 0 {
|
||||
return true
|
||||
}
|
||||
|
||||
for i := 0; i < len(in); {
|
||||
char := in[i]
|
||||
if char < utf8.RuneSelf {
|
||||
// Quote anything except a backslash that would need quoting in a
|
||||
// JSON string, as well as space and '='
|
||||
if char != '\\' && (char == ' ' || char == '=' || !safeSet[char]) {
|
||||
return true
|
||||
}
|
||||
|
||||
i++
|
||||
|
||||
continue
|
||||
}
|
||||
|
||||
decodeRune, size := utf8.DecodeRuneInString(in[i:])
|
||||
if decodeRune == utf8.RuneError || unicode.IsSpace(decodeRune) || !unicode.IsPrint(decodeRune) {
|
||||
return true
|
||||
}
|
||||
|
||||
i += size
|
||||
}
|
||||
|
||||
return false
|
||||
}
|
||||
|
||||
func (b BaseEncoder) AppendField(dst []byte, field Field) []byte {
|
||||
prefix := ""
|
||||
|
||||
if len(dst) != 0 {
|
||||
prew := dst[len(dst)-1]
|
||||
if prew != '{' && prew != '.' {
|
||||
prefix = string(b.group.deli)
|
||||
}
|
||||
}
|
||||
|
||||
return b.appendField(dst, field, prefix, b.delimeter)
|
||||
}
|
||||
|
||||
func (b BaseEncoder) AppendKey(dst []byte, key string, prefix string) []byte {
|
||||
if prefix != "" {
|
||||
dst = append(dst, prefix...)
|
||||
}
|
||||
|
||||
return b.AppendString(dst, key)
|
||||
}
|
||||
|
||||
//nolint:mnd
|
||||
func (b BaseEncoder) AppendComplex(dst []byte, c complex128) []byte {
|
||||
cmplx := strconv.FormatComplex(c, 'g', -1, 128)
|
||||
|
||||
return b.AppendString(dst, cmplx)
|
||||
}
|
||||
|
||||
func (b BaseEncoder) AppendFloat(dst []byte, f float64, bitSize int) []byte {
|
||||
return strconv.AppendFloat(dst, f, 'g', -1, bitSize)
|
||||
}
|
||||
|
||||
//nolint:mnd
|
||||
func (b BaseEncoder) AppendUint(dst []byte, u uint64) []byte {
|
||||
return strconv.AppendUint(dst, u, 10)
|
||||
}
|
||||
|
||||
func (b BaseEncoder) AppendNull(dst []byte) []byte {
|
||||
return append(dst, b.nullValue...)
|
||||
}
|
||||
|
||||
//nolint:mnd
|
||||
func (b BaseEncoder) AppendInt(dst []byte, val int64) []byte {
|
||||
return strconv.AppendInt(dst, val, 10)
|
||||
}
|
||||
|
||||
func (b BaseEncoder) AppendBool(dst []byte, val bool) []byte {
|
||||
return strconv.AppendBool(dst, val)
|
||||
}
|
||||
|
||||
func (b BaseEncoder) AppendGroup(dst []byte, fields []Field) []byte {
|
||||
dst = append(dst, b.group.start)
|
||||
dst = b.appendGroup(dst, fields, "")
|
||||
|
||||
return append(dst, b.group.end)
|
||||
}
|
||||
|
||||
func (b BaseEncoder) AppendArray(dst []byte, in []Value) []byte {
|
||||
dst = append(dst, b.array.start)
|
||||
if len(in) > 0 {
|
||||
dst = b.appendValue(dst, in[0], "", 0)
|
||||
for _, value := range in[1:] {
|
||||
dst = b.appendValue(append(dst, b.array.deli), value, "", 0)
|
||||
}
|
||||
}
|
||||
|
||||
return append(dst, b.array.end)
|
||||
}
|
||||
|
||||
func (b BaseEncoder) AppendBytes(dst, in []byte) []byte {
|
||||
dst = append(dst, '"')
|
||||
dst = append(dst, in...)
|
||||
|
||||
return append(dst, '"')
|
||||
}
|
||||
|
||||
func (b BaseEncoder) appendGroup(dst []byte, fields []Field, prefix string) []byte {
|
||||
if len(fields) > 0 {
|
||||
dst = b.appendField(dst, fields[0], ".", b.delimeter)
|
||||
for _, field := range fields[1:] {
|
||||
dst = b.appendField(append(dst, b.group.deli), field, prefix, b.delimeter)
|
||||
}
|
||||
}
|
||||
|
||||
return dst
|
||||
}
|
||||
|
||||
func (b BaseEncoder) appendField(dst []byte, field Field, prefix string, deli byte) []byte {
|
||||
dst = b.AppendKey(dst, field.Key, prefix)
|
||||
|
||||
return b.appendValue(dst, field.Value, field.Key+".", deli)
|
||||
}
|
||||
|
||||
//nolint:mnd,gocyclo,cyclop
|
||||
func (b BaseEncoder) appendValue(dst []byte, val Value, prefix string, deli byte) []byte {
|
||||
switch val.Kind {
|
||||
case KindGroup:
|
||||
@@ -143,139 +282,3 @@ func (b BaseEncoder) appendValue(dst []byte, val Value, prefix string, deli byte
|
||||
|
||||
return b.DefaultValue(b.AppendDelimiter(dst, deli), b, val)
|
||||
}
|
||||
|
||||
func (b BaseEncoder) AppendDuration(dst []byte, d time.Duration) []byte {
|
||||
return b.AppendString(dst, d.String())
|
||||
}
|
||||
|
||||
func (b BaseEncoder) AppendTime(dst []byte, t time.Time) []byte {
|
||||
return b.AppendString(dst, t.Format(b.timeFormat))
|
||||
}
|
||||
|
||||
func AppendString(dst []byte, in string) []byte {
|
||||
if needsQuoting(in) {
|
||||
return strconv.AppendQuote(dst, in)
|
||||
}
|
||||
|
||||
return append(dst, in...)
|
||||
}
|
||||
|
||||
//nolint:cyclop
|
||||
func needsQuoting(in string) bool {
|
||||
if len(in) == 0 {
|
||||
return true
|
||||
}
|
||||
|
||||
for i := 0; i < len(in); {
|
||||
char := in[i]
|
||||
if char < utf8.RuneSelf {
|
||||
// Quote anything except a backslash that would need quoting in a
|
||||
// JSON string, as well as space and '='
|
||||
if char != '\\' && (char == ' ' || char == '=' || !safeSet[char]) {
|
||||
return true
|
||||
}
|
||||
i++
|
||||
|
||||
continue
|
||||
}
|
||||
|
||||
decodeRune, size := utf8.DecodeRuneInString(in[i:])
|
||||
if decodeRune == utf8.RuneError || unicode.IsSpace(decodeRune) || !unicode.IsPrint(decodeRune) {
|
||||
return true
|
||||
}
|
||||
|
||||
i += size
|
||||
}
|
||||
|
||||
return false
|
||||
}
|
||||
|
||||
func (b BaseEncoder) AppendField(dst []byte, field Field) []byte {
|
||||
prefix := ""
|
||||
|
||||
if len(dst) != 0 {
|
||||
prew := dst[len(dst)-1]
|
||||
if prew != '{' && prew != '.' {
|
||||
prefix = string(b.group.deli)
|
||||
}
|
||||
}
|
||||
|
||||
return b.appendField(dst, field, prefix, b.delimeter)
|
||||
}
|
||||
|
||||
func (b BaseEncoder) appendField(dst []byte, field Field, prefix string, deli byte) []byte {
|
||||
dst = b.AppendKey(dst, field.Key, prefix)
|
||||
|
||||
return b.appendValue(dst, field.Value, field.Key+".", deli)
|
||||
}
|
||||
|
||||
func (b BaseEncoder) AppendKey(dst []byte, key string, prefix string) []byte {
|
||||
if prefix != "" {
|
||||
dst = append(dst, prefix...)
|
||||
}
|
||||
|
||||
return b.AppendString(dst, key)
|
||||
}
|
||||
|
||||
func (b BaseEncoder) AppendComplex(dst []byte, c complex128) []byte {
|
||||
cmplx := strconv.FormatComplex(c, 'g', -1, 128)
|
||||
|
||||
return b.AppendString(dst, cmplx)
|
||||
}
|
||||
|
||||
func (b BaseEncoder) AppendFloat(dst []byte, f float64, bitSize int) []byte {
|
||||
return strconv.AppendFloat(dst, f, 'g', -1, bitSize)
|
||||
}
|
||||
|
||||
func (b BaseEncoder) AppendUint(dst []byte, u uint64) []byte {
|
||||
return strconv.AppendUint(dst, u, 10)
|
||||
}
|
||||
|
||||
func (b BaseEncoder) AppendNull(dst []byte) []byte {
|
||||
return append(dst, b.nullValue...)
|
||||
}
|
||||
|
||||
func (b BaseEncoder) AppendInt(dst []byte, val int64) []byte {
|
||||
return strconv.AppendInt(dst, val, 10)
|
||||
}
|
||||
|
||||
func (b BaseEncoder) AppendBool(dst []byte, val bool) []byte {
|
||||
return strconv.AppendBool(dst, val)
|
||||
}
|
||||
|
||||
func (b BaseEncoder) AppendGroup(dst []byte, fields []Field) []byte {
|
||||
dst = append(dst, b.group.start)
|
||||
dst = b.appendGroup(dst, fields, "")
|
||||
|
||||
return append(dst, b.group.end)
|
||||
}
|
||||
|
||||
func (b BaseEncoder) appendGroup(dst []byte, fields []Field, prefix string) []byte {
|
||||
if len(fields) > 0 {
|
||||
dst = b.appendField(dst, fields[0], ".", b.delimeter)
|
||||
for _, field := range fields[1:] {
|
||||
dst = b.appendField(append(dst, b.group.deli), field, prefix, b.delimeter)
|
||||
}
|
||||
}
|
||||
|
||||
return dst
|
||||
}
|
||||
|
||||
func (b BaseEncoder) AppendArray(dst []byte, in []Value) []byte {
|
||||
dst = append(dst, b.array.start)
|
||||
if len(in) > 0 {
|
||||
dst = b.appendValue(dst, in[0], "", 0)
|
||||
for _, value := range in[1:] {
|
||||
dst = b.appendValue(append(dst, b.array.deli), value, "", 0)
|
||||
}
|
||||
}
|
||||
|
||||
return append(dst, b.array.end)
|
||||
}
|
||||
|
||||
func (b BaseEncoder) AppendBytes(dst, in []byte) []byte {
|
||||
dst = append(dst, '"')
|
||||
dst = append(dst, in...)
|
||||
|
||||
return append(dst, '"')
|
||||
}
|
||||
|
||||
@@ -15,6 +15,7 @@ func TestEncoderJSONAppendField_string(t *testing.T) {
|
||||
encode := field.NewEncoderJSON()
|
||||
|
||||
buf := buffer.New()
|
||||
|
||||
defer func() {
|
||||
buf.Free()
|
||||
}()
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
package field
|
||||
|
||||
import (
|
||||
"encoding"
|
||||
"fmt"
|
||||
)
|
||||
|
||||
@@ -8,8 +9,18 @@ func NewEncoderText(opts ...func(*BaseEncoder)) BaseEncoder {
|
||||
opts = append([]func(*BaseEncoder){
|
||||
WithGropuConfig(0, 0, ' '),
|
||||
WithNullValue("<nil>"),
|
||||
WithDefaultValue(func(dst []byte, _ Encoder, val Value) []byte {
|
||||
return fmt.Appendf(dst, "%+v", val.Any())
|
||||
WithDefaultValue(func(dst []byte, enc Encoder, val Value) []byte {
|
||||
switch value := val.Any().(type) {
|
||||
case encoding.TextMarshaler:
|
||||
data, err := value.MarshalText()
|
||||
if err != nil {
|
||||
return enc.AppendValue(dst, ErrorValue(err))
|
||||
}
|
||||
|
||||
return enc.AppendValue(dst, StringValue(string(data)))
|
||||
default:
|
||||
return fmt.Appendf(dst, "%+v", val.Any())
|
||||
}
|
||||
}),
|
||||
}, opts...)
|
||||
|
||||
|
||||
@@ -2,6 +2,7 @@ package field
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"slices"
|
||||
"time"
|
||||
)
|
||||
|
||||
@@ -501,3 +502,7 @@ type Field struct {
|
||||
func (f Field) String() string {
|
||||
return fmt.Sprintf("%s=%+v", f.Key, f.Value)
|
||||
}
|
||||
|
||||
func (f Field) IsKey(keys ...string) bool {
|
||||
return slices.Contains(keys, f.Key)
|
||||
}
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
//nolint: exhaustruct
|
||||
//nolint:exhaustruct
|
||||
package field
|
||||
|
||||
import (
|
||||
@@ -27,7 +27,7 @@ func StringpValue(value *string) Value {
|
||||
return StringValue(*value)
|
||||
}
|
||||
|
||||
// StringpValue returns a new Value for a string.
|
||||
// StringsValue returns a new Value for a string.
|
||||
func StringsValue(value []string) Value {
|
||||
return Value{
|
||||
Kind: KindArray,
|
||||
@@ -115,7 +115,7 @@ func Uint8sValue(values []uint8) Value {
|
||||
}
|
||||
}
|
||||
|
||||
// Uint64sValue returns a Value for a []uint64.
|
||||
// Uint64pValue returns a Value for a []uint64.
|
||||
func Uint64pValue(v *uint64) Value {
|
||||
if v == nil {
|
||||
return NilValue()
|
||||
@@ -145,7 +145,7 @@ func Int64sValue(value []int64) Value {
|
||||
}
|
||||
}
|
||||
|
||||
// Int64sValue returns a Value for an *int64.
|
||||
// Int64pValue returns a Value for an *int64.
|
||||
func Int64pValue(value *int64) Value {
|
||||
if value == nil {
|
||||
return NilValue()
|
||||
@@ -159,7 +159,7 @@ func Float64Value(v float64) Value {
|
||||
return Value{num: math.Float64bits(v), Kind: KindFloat64}
|
||||
}
|
||||
|
||||
// Float64Value returns a Value for a floating-points number.
|
||||
// Float64sValue returns a Value for a floating-points number.
|
||||
func Float64sValue(values []float64) Value {
|
||||
return Value{
|
||||
Kind: KindArray,
|
||||
@@ -175,7 +175,7 @@ func Float64sValue(values []float64) Value {
|
||||
}
|
||||
}
|
||||
|
||||
// Float64Value returns a Value for a floating-points number.
|
||||
// Float64pValue returns a Value for a floating-points number.
|
||||
func Float64pValue(v *float64) Value {
|
||||
if v == nil {
|
||||
return NilValue()
|
||||
@@ -208,7 +208,7 @@ func Complex128Value(v complex128) Value {
|
||||
}
|
||||
}
|
||||
|
||||
// Complex128Value returns a Value for a []complex128.
|
||||
// Complex128sValue returns a Value for a []complex128.
|
||||
func Complex128sValue(values []complex128) Value {
|
||||
return Value{
|
||||
Kind: KindArray,
|
||||
@@ -224,7 +224,7 @@ func Complex128sValue(values []complex128) Value {
|
||||
}
|
||||
}
|
||||
|
||||
// Complex128Value returns a Value for a *complex128.
|
||||
// Complex128pValue returns a Value for a *complex128.
|
||||
func Complex128pValue(v *complex128) Value {
|
||||
if v == nil {
|
||||
return NilValue()
|
||||
@@ -275,7 +275,7 @@ func DurationValue(v time.Duration) Value {
|
||||
return Value{inum: v.Nanoseconds(), Kind: KindDuration}
|
||||
}
|
||||
|
||||
// DurationValue returns a Value for a *time.Duration.
|
||||
// DurationpValue returns a Value for a *time.Duration.
|
||||
func DurationpValue(v *time.Duration) Value {
|
||||
if v == nil {
|
||||
return NilValue()
|
||||
@@ -284,7 +284,7 @@ func DurationpValue(v *time.Duration) Value {
|
||||
return DurationValue(*v)
|
||||
}
|
||||
|
||||
// DurationValue returns a Value for a *time.Duration.
|
||||
// DurationsValue returns a Value for a *time.Duration.
|
||||
func DurationsValue(values []time.Duration) Value {
|
||||
return Value{
|
||||
Kind: KindArray,
|
||||
@@ -469,42 +469,7 @@ func (v Value) String() string {
|
||||
return string(v.append(buf))
|
||||
}
|
||||
|
||||
// append appends a text representation of v to dst.
|
||||
// v is formatted as with fmt.Sprint.
|
||||
//
|
||||
//nolint:gomnd,cyclop
|
||||
func (v Value) append(dst []byte) []byte {
|
||||
switch v.Kind {
|
||||
case KindString:
|
||||
return append(dst, v.AsString()...)
|
||||
case KindInt64:
|
||||
return strconv.AppendInt(dst, v.inum, 10)
|
||||
case KindUint64:
|
||||
return strconv.AppendUint(dst, v.num, 10)
|
||||
case KindFloat64:
|
||||
return strconv.AppendFloat(dst, v.AsFloat64(), 'g', -1, 64)
|
||||
case KindFloat32:
|
||||
return strconv.AppendFloat(dst, float64(v.AsFloat32()), 'g', -1, 32)
|
||||
case KindBool:
|
||||
return strconv.AppendBool(dst, v.AsBool())
|
||||
case KindDuration:
|
||||
return append(dst, v.AsDuration().String()...)
|
||||
case KindTime:
|
||||
return append(dst, v.AsTime().String()...)
|
||||
case KindError:
|
||||
return append(dst, v.AsError().Error()...)
|
||||
case KindGroup:
|
||||
return fmt.Append(dst, v.AsGroup())
|
||||
case KindClosure:
|
||||
return fmt.Append(dst, v.Resolve())
|
||||
case KindAny:
|
||||
return fmt.Append(dst, v.any)
|
||||
default:
|
||||
return fmt.Appendf(dst, "%+v", v.any)
|
||||
}
|
||||
}
|
||||
|
||||
//nolint: gocyclo,cyclop
|
||||
//nolint:gocyclo,cyclop
|
||||
func (v Value) Any() any {
|
||||
switch v.Kind {
|
||||
case KindAny, KindBinary:
|
||||
@@ -542,7 +507,7 @@ func (v Value) Any() any {
|
||||
return v.any
|
||||
}
|
||||
|
||||
//nolint: forcetypeassert
|
||||
//nolint:forcetypeassert
|
||||
func (v Value) AsString() string {
|
||||
if v.Kind != KindString {
|
||||
return ""
|
||||
@@ -567,6 +532,7 @@ func (v Value) AsUint64() uint64 {
|
||||
return v.num
|
||||
}
|
||||
|
||||
//nolint:gosec
|
||||
func (v Value) AsFloat32() float32 {
|
||||
return math.Float32frombits(uint32(v.num))
|
||||
}
|
||||
@@ -649,3 +615,38 @@ func (v Value) AsArray() Values {
|
||||
return nil
|
||||
}
|
||||
}
|
||||
|
||||
// append appends a text representation of v to dst.
|
||||
// v is formatted as with fmt.Sprint.
|
||||
//
|
||||
//nolint:mnd,cyclop
|
||||
func (v Value) append(dst []byte) []byte {
|
||||
switch v.Kind {
|
||||
case KindString:
|
||||
return append(dst, v.AsString()...)
|
||||
case KindInt64:
|
||||
return strconv.AppendInt(dst, v.inum, 10)
|
||||
case KindUint64:
|
||||
return strconv.AppendUint(dst, v.num, 10)
|
||||
case KindFloat64:
|
||||
return strconv.AppendFloat(dst, v.AsFloat64(), 'g', -1, 64)
|
||||
case KindFloat32:
|
||||
return strconv.AppendFloat(dst, float64(v.AsFloat32()), 'g', -1, 32)
|
||||
case KindBool:
|
||||
return strconv.AppendBool(dst, v.AsBool())
|
||||
case KindDuration:
|
||||
return append(dst, v.AsDuration().String()...)
|
||||
case KindTime:
|
||||
return append(dst, v.AsTime().String()...)
|
||||
case KindError:
|
||||
return append(dst, v.AsError().Error()...)
|
||||
case KindGroup:
|
||||
return fmt.Append(dst, v.AsGroup())
|
||||
case KindClosure:
|
||||
return fmt.Append(dst, v.Resolve())
|
||||
case KindAny:
|
||||
return fmt.Append(dst, v.any)
|
||||
default:
|
||||
return fmt.Appendf(dst, "%+v", v.any)
|
||||
}
|
||||
}
|
||||
|
||||
69
global.go
69
global.go
@@ -3,6 +3,7 @@ package log
|
||||
import (
|
||||
"context"
|
||||
"io"
|
||||
"time"
|
||||
|
||||
"gitoa.ru/go-4devs/log/field"
|
||||
"gitoa.ru/go-4devs/log/level"
|
||||
@@ -10,7 +11,7 @@ import (
|
||||
|
||||
//nolint:gochecknoglobals
|
||||
var global = With(New(),
|
||||
WithCaller(KeySource, 1, false),
|
||||
WithTime(KeyTime, time.RFC3339),
|
||||
WithLevel(KeyLevel, level.Debug),
|
||||
WithExit(level.Alert),
|
||||
WithPanic(level.Emergency),
|
||||
@@ -27,112 +28,112 @@ func Log() Logger {
|
||||
}
|
||||
|
||||
// Emerg log by emergency level.
|
||||
func Emerg(ctx context.Context, args ...interface{}) {
|
||||
func Emerg(ctx context.Context, args ...any) {
|
||||
global.Emerg(ctx, args...)
|
||||
}
|
||||
|
||||
// Alert log by alert level.
|
||||
func Alert(ctx context.Context, args ...interface{}) {
|
||||
func Alert(ctx context.Context, args ...any) {
|
||||
global.Alert(ctx, args...)
|
||||
}
|
||||
|
||||
// Crit log by critical level.
|
||||
func Crit(ctx context.Context, args ...interface{}) {
|
||||
func Crit(ctx context.Context, args ...any) {
|
||||
global.Crit(ctx, args...)
|
||||
}
|
||||
|
||||
// Err log by error level.
|
||||
func Err(ctx context.Context, args ...interface{}) {
|
||||
func Err(ctx context.Context, args ...any) {
|
||||
global.Err(ctx, args...)
|
||||
}
|
||||
|
||||
// Warn logs by warning level.
|
||||
func Warn(ctx context.Context, args ...interface{}) {
|
||||
func Warn(ctx context.Context, args ...any) {
|
||||
global.Warn(ctx, args...)
|
||||
}
|
||||
|
||||
// Notice log by notice level.
|
||||
func Notice(ctx context.Context, args ...interface{}) {
|
||||
func Notice(ctx context.Context, args ...any) {
|
||||
global.Notice(ctx, args...)
|
||||
}
|
||||
|
||||
// Info log by info level.
|
||||
func Info(ctx context.Context, args ...interface{}) {
|
||||
func Info(ctx context.Context, args ...any) {
|
||||
global.Info(ctx, args...)
|
||||
}
|
||||
|
||||
// Debug log by debug level.
|
||||
func Debug(ctx context.Context, args ...interface{}) {
|
||||
func Debug(ctx context.Context, args ...any) {
|
||||
global.Debug(ctx, args...)
|
||||
}
|
||||
|
||||
// Print log by info level and arguments.
|
||||
func Print(args ...interface{}) {
|
||||
func Print(args ...any) {
|
||||
global.Print(args...)
|
||||
}
|
||||
|
||||
// Fatal log by alert level and arguments.
|
||||
func Fatal(args ...interface{}) {
|
||||
func Fatal(args ...any) {
|
||||
global.Fatal(args...)
|
||||
}
|
||||
|
||||
// Panic log by emergency level and arguments.
|
||||
func Panic(args ...interface{}) {
|
||||
func Panic(args ...any) {
|
||||
global.Panic(args...)
|
||||
}
|
||||
|
||||
// Println log by info level and arguments.
|
||||
func Println(args ...interface{}) {
|
||||
func Println(args ...any) {
|
||||
global.Println(args...)
|
||||
}
|
||||
|
||||
// Fatalln log by alert level and arguments.
|
||||
func Fatalln(args ...interface{}) {
|
||||
func Fatalln(args ...any) {
|
||||
global.Fatalln(args...)
|
||||
}
|
||||
|
||||
// Panicln log by emergency level and arguments.
|
||||
func Panicln(args ...interface{}) {
|
||||
func Panicln(args ...any) {
|
||||
global.Panicln(args...)
|
||||
}
|
||||
|
||||
// EmergKVs sugared log by emergency level and key-values.
|
||||
func EmergKVs(ctx context.Context, msg string, args ...interface{}) {
|
||||
func EmergKVs(ctx context.Context, msg string, args ...any) {
|
||||
global.EmergKVs(ctx, msg, args...)
|
||||
}
|
||||
|
||||
// AlertKVs sugared log by alert level and key-values.
|
||||
func AlertKVs(ctx context.Context, msg string, args ...interface{}) {
|
||||
func AlertKVs(ctx context.Context, msg string, args ...any) {
|
||||
global.AlertKVs(ctx, msg, args...)
|
||||
}
|
||||
|
||||
// CritKVs sugared log by critcal level and key-values.
|
||||
func CritKVs(ctx context.Context, msg string, args ...interface{}) {
|
||||
func CritKVs(ctx context.Context, msg string, args ...any) {
|
||||
global.CritKVs(ctx, msg, args...)
|
||||
}
|
||||
|
||||
// ErrKVs sugared log by error level and key-values.
|
||||
func ErrKVs(ctx context.Context, msg string, args ...interface{}) {
|
||||
func ErrKVs(ctx context.Context, msg string, args ...any) {
|
||||
global.ErrKVs(ctx, msg, args...)
|
||||
}
|
||||
|
||||
// WarnKVs sugared log by warning level and key-values.
|
||||
func WarnKVs(ctx context.Context, msg string, args ...interface{}) {
|
||||
func WarnKVs(ctx context.Context, msg string, args ...any) {
|
||||
global.WarnKVs(ctx, msg, args...)
|
||||
}
|
||||
|
||||
// NoticeKVs sugared log by notice level and key-values.
|
||||
func NoticeKVs(ctx context.Context, msg string, args ...interface{}) {
|
||||
func NoticeKVs(ctx context.Context, msg string, args ...any) {
|
||||
global.NoticeKVs(ctx, msg, args...)
|
||||
}
|
||||
|
||||
// InfoKVs sugared log by info level and key-values.
|
||||
func InfoKVs(ctx context.Context, msg string, args ...interface{}) {
|
||||
func InfoKVs(ctx context.Context, msg string, args ...any) {
|
||||
global.InfoKVs(ctx, msg, args...)
|
||||
}
|
||||
|
||||
// DebugKVs sugared log by debug level and key-values.
|
||||
func DebugKVs(ctx context.Context, msg string, args ...interface{}) {
|
||||
func DebugKVs(ctx context.Context, msg string, args ...any) {
|
||||
global.DebugKVs(ctx, msg, args...)
|
||||
}
|
||||
|
||||
@@ -177,57 +178,57 @@ func DebugKV(ctx context.Context, msg string, args ...field.Field) {
|
||||
}
|
||||
|
||||
// Emergf log by emergency level by format and arguments.
|
||||
func Emergf(ctx context.Context, format string, args ...interface{}) {
|
||||
func Emergf(ctx context.Context, format string, args ...any) {
|
||||
global.Emergf(ctx, format, args...)
|
||||
}
|
||||
|
||||
// Alertf log by alert level by format and arguments.
|
||||
func Alertf(ctx context.Context, format string, args ...interface{}) {
|
||||
func Alertf(ctx context.Context, format string, args ...any) {
|
||||
global.Alertf(ctx, format, args...)
|
||||
}
|
||||
|
||||
// Critf log by critical level by format and arguments.
|
||||
func Critf(ctx context.Context, format string, args ...interface{}) {
|
||||
func Critf(ctx context.Context, format string, args ...any) {
|
||||
global.Critf(ctx, format, args...)
|
||||
}
|
||||
|
||||
// Errf log by error level by format and arguments.
|
||||
func Errf(ctx context.Context, format string, args ...interface{}) {
|
||||
func Errf(ctx context.Context, format string, args ...any) {
|
||||
global.Errf(ctx, format, args...)
|
||||
}
|
||||
|
||||
// Warnf log by warning level by format and arguments.
|
||||
func Warnf(ctx context.Context, format string, args ...interface{}) {
|
||||
func Warnf(ctx context.Context, format string, args ...any) {
|
||||
global.Warnf(ctx, format, args...)
|
||||
}
|
||||
|
||||
// Noticef log by notice level by format and arguments.
|
||||
func Noticef(ctx context.Context, format string, args ...interface{}) {
|
||||
func Noticef(ctx context.Context, format string, args ...any) {
|
||||
global.Noticef(ctx, format, args...)
|
||||
}
|
||||
|
||||
// Infof log by info level by format and arguments.
|
||||
func Infof(ctx context.Context, format string, args ...interface{}) {
|
||||
func Infof(ctx context.Context, format string, args ...any) {
|
||||
global.Noticef(ctx, format, args...)
|
||||
}
|
||||
|
||||
// Debugf log by debug level by format and arguments.
|
||||
func Debugf(ctx context.Context, format string, args ...interface{}) {
|
||||
func Debugf(ctx context.Context, format string, args ...any) {
|
||||
global.Debugf(ctx, format, args...)
|
||||
}
|
||||
|
||||
// Printf log by info level by format and arguments without context.
|
||||
func Printf(format string, args ...interface{}) {
|
||||
func Printf(format string, args ...any) {
|
||||
global.Printf(format, args...)
|
||||
}
|
||||
|
||||
// Fatalf log by alert level by format and arguments without context.
|
||||
func Fatalf(format string, args ...interface{}) {
|
||||
func Fatalf(format string, args ...any) {
|
||||
global.Fatalf(format, args...)
|
||||
}
|
||||
|
||||
// Panicf log by emergency level and arguments without context.
|
||||
func Panicf(format string, args ...interface{}) {
|
||||
func Panicf(format string, args ...any) {
|
||||
global.Panicf(format, args...)
|
||||
}
|
||||
|
||||
|
||||
25
global_example_test.go
Normal file
25
global_example_test.go
Normal file
@@ -0,0 +1,25 @@
|
||||
package log_test
|
||||
|
||||
import (
|
||||
"context"
|
||||
"path/filepath"
|
||||
|
||||
"gitoa.ru/go-4devs/log"
|
||||
"gitoa.ru/go-4devs/log/level"
|
||||
)
|
||||
|
||||
func ExampleDebug() {
|
||||
logger := log.New(log.WithStdout()).With(
|
||||
log.WithSource(2, filepath.Base),
|
||||
log.WithLevel(log.KeyLevel, level.Debug),
|
||||
log.WithExit(level.Alert),
|
||||
log.WithPanic(level.Emergency),
|
||||
)
|
||||
|
||||
log.SetLogger(logger)
|
||||
|
||||
ctx := context.Background()
|
||||
log.Debug(ctx, "debug message")
|
||||
// Output:
|
||||
// msg="debug message" source=global_example_test.go:22 level=debug
|
||||
}
|
||||
19
go.mod
19
go.mod
@@ -1,20 +1,3 @@
|
||||
module gitoa.ru/go-4devs/log
|
||||
|
||||
go 1.20
|
||||
|
||||
require (
|
||||
github.com/sirupsen/logrus v1.8.1
|
||||
go.opentelemetry.io/otel v1.9.0
|
||||
go.opentelemetry.io/otel/sdk v1.9.0
|
||||
go.opentelemetry.io/otel/trace v1.9.0
|
||||
go.uber.org/zap v1.21.0
|
||||
)
|
||||
|
||||
require (
|
||||
github.com/go-logr/logr v1.2.3 // indirect
|
||||
github.com/go-logr/stdr v1.2.2 // indirect
|
||||
go.uber.org/atomic v1.7.0 // indirect
|
||||
go.uber.org/multierr v1.6.0 // indirect
|
||||
golang.org/x/sys v0.12.0 // indirect
|
||||
gopkg.in/yaml.v3 v3.0.1 // indirect
|
||||
)
|
||||
go 1.22
|
||||
|
||||
81
go.sum
81
go.sum
@@ -1,81 +0,0 @@
|
||||
github.com/benbjohnson/clock v1.1.0 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8=
|
||||
github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=
|
||||
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
|
||||
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||
github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
|
||||
github.com/go-logr/logr v1.2.3 h1:2DntVwHkVopvECVRSlL5PSo9eG+cAkDCuckLubN+rq0=
|
||||
github.com/go-logr/logr v1.2.3/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
|
||||
github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
|
||||
github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
|
||||
github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg=
|
||||
github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
|
||||
github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
|
||||
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
|
||||
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
|
||||
github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
|
||||
github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
|
||||
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
|
||||
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
|
||||
github.com/sirupsen/logrus v1.8.1 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE=
|
||||
github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
|
||||
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
|
||||
github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
|
||||
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
|
||||
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
|
||||
github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMTY=
|
||||
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
|
||||
github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
|
||||
go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw=
|
||||
go.opentelemetry.io/otel v1.9.0/go.mod h1:np4EoPGzoPs3O67xUVNoPPcmSvsfOxNlNA4F4AC+0Eo=
|
||||
go.opentelemetry.io/otel/sdk v1.9.0 h1:LNXp1vrr83fNXTHgU8eO89mhzxb/bbWAsHG6fNf3qWo=
|
||||
go.opentelemetry.io/otel/sdk v1.9.0/go.mod h1:AEZc8nt5bd2F7BC24J5R0mrjYnpEgYHyTcM/vrSple4=
|
||||
go.opentelemetry.io/otel/trace v1.9.0 h1:oZaCNJUjWcg60VXWee8lJKlqhPbXAPB51URuR47pQYc=
|
||||
go.opentelemetry.io/otel/trace v1.9.0/go.mod h1:2737Q0MuG8q1uILYm2YYVkAyLtOofiTNGg6VODnOiPo=
|
||||
go.uber.org/atomic v1.7.0 h1:ADUqmZGgLDDfbSL9ZmPxKTybcoEYHgpYfELNoN+7hsw=
|
||||
go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
|
||||
go.uber.org/goleak v1.1.11 h1:wy28qYRKZgnJTxGxvye5/wgWr1EKjmUDGYox5mGlRlI=
|
||||
go.uber.org/goleak v1.1.11/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ=
|
||||
go.uber.org/multierr v1.6.0 h1:y6IPFStTAIT5Ytl7/XYmHvzXQ7S3g/IeZW9hyZ5thw4=
|
||||
go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU=
|
||||
go.uber.org/zap v1.21.0 h1:WefMeulhovoZ2sYXz7st6K0sLj7bBhpiFaud4r4zST8=
|
||||
go.uber.org/zap v1.21.0/go.mod h1:wjWOCqI0f2ZZrJF/UufIOkiC8ii6tm1iqIsLo76RfJw=
|
||||
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
|
||||
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
|
||||
golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
|
||||
golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
|
||||
golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
|
||||
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
|
||||
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
|
||||
golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
|
||||
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
||||
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20210510120138-977fb7262007 h1:gG67DSER+11cZvqIMb8S8bt0vZtiN6xWYARwirrOSfE=
|
||||
golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||
golang.org/x/sys v0.12.0 h1:CM0HF96J0hcLAwsHPJZjfdNzs0gftsLfgKt57wWHJ0o=
|
||||
golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
|
||||
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
|
||||
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
|
||||
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
|
||||
golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
|
||||
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
|
||||
golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
|
||||
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
||||
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
||||
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
||||
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
||||
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
||||
gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
|
||||
gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
|
||||
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
|
||||
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo=
|
||||
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
|
||||
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
|
||||
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
|
||||
|
||||
10
handler/logrus/go.mod
Normal file
10
handler/logrus/go.mod
Normal file
@@ -0,0 +1,10 @@
|
||||
module gitoa.ru/go-4devs/log/handler/logrus
|
||||
|
||||
go 1.20
|
||||
|
||||
require (
|
||||
github.com/sirupsen/logrus v1.9.3
|
||||
gitoa.ru/go-4devs/log v0.5.1
|
||||
)
|
||||
|
||||
require golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8 // indirect
|
||||
17
handler/logrus/go.sum
Normal file
17
handler/logrus/go.sum
Normal file
@@ -0,0 +1,17 @@
|
||||
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
|
||||
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
|
||||
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
|
||||
github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
|
||||
github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
|
||||
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
|
||||
github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
|
||||
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
|
||||
gitoa.ru/go-4devs/log v0.5.1 h1:rrIyjpUaw8AjDCf7ZuH0HgCRf370O3TV29yrU1xizWM=
|
||||
gitoa.ru/go-4devs/log v0.5.1/go.mod h1:tREtjEH2cTHl0p3uCVcH9g5tlqtsVNI/tDQVfq53Ty4=
|
||||
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8 h1:0A+M6Uqn+Eje4kHMK80dtF3JCXC4ykBgQG4Fe06QRhQ=
|
||||
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
||||
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
|
||||
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
|
||||
@@ -11,11 +11,13 @@ import (
|
||||
)
|
||||
|
||||
// Standard create new standart logrus handler.
|
||||
// Deprecated: delete after 0.7.0
|
||||
func Standard() log.Logger {
|
||||
return New(logrus.StandardLogger())
|
||||
}
|
||||
|
||||
// New create new logrus handler.
|
||||
// Deprecated: delete after 0.7.0
|
||||
func New(log *logrus.Logger) log.Logger {
|
||||
return func(ctx context.Context, data *entry.Entry) (int, error) {
|
||||
lrgFields := make(logrus.Fields, data.Fields().Len())
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
package log_test
|
||||
package logrus_test
|
||||
|
||||
import (
|
||||
"context"
|
||||
"io"
|
||||
"os"
|
||||
|
||||
@@ -10,6 +11,7 @@ import (
|
||||
)
|
||||
|
||||
func ExampleNew_logrusHandler() {
|
||||
ctx := context.Background()
|
||||
lgrs := slogrus.New()
|
||||
lgrs.SetOutput(os.Stdout)
|
||||
lgrs.SetFormatter(&slogrus.TextFormatter{
|
||||
17
handler/otel/go.mod
Normal file
17
handler/otel/go.mod
Normal file
@@ -0,0 +1,17 @@
|
||||
module gitoa.ru/go-4devs/log/handler/otel
|
||||
|
||||
go 1.21.5
|
||||
|
||||
require (
|
||||
gitoa.ru/go-4devs/log v0.5.1
|
||||
go.opentelemetry.io/otel v1.21.0
|
||||
go.opentelemetry.io/otel/sdk v1.21.0
|
||||
go.opentelemetry.io/otel/trace v1.21.0
|
||||
)
|
||||
|
||||
require (
|
||||
github.com/go-logr/logr v1.3.0 // indirect
|
||||
github.com/go-logr/stdr v1.2.2 // indirect
|
||||
go.opentelemetry.io/otel/metric v1.21.0 // indirect
|
||||
golang.org/x/sys v0.14.0 // indirect
|
||||
)
|
||||
27
handler/otel/go.sum
Normal file
27
handler/otel/go.sum
Normal file
@@ -0,0 +1,27 @@
|
||||
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
|
||||
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||
github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
|
||||
github.com/go-logr/logr v1.3.0 h1:2y3SDp0ZXuc6/cjLSZ+Q3ir+QB9T/iG5yYRXqsagWSY=
|
||||
github.com/go-logr/logr v1.3.0/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
|
||||
github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
|
||||
github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
|
||||
github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
|
||||
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
|
||||
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
|
||||
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
|
||||
github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
|
||||
github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
|
||||
gitoa.ru/go-4devs/log v0.5.1 h1:rrIyjpUaw8AjDCf7ZuH0HgCRf370O3TV29yrU1xizWM=
|
||||
gitoa.ru/go-4devs/log v0.5.1/go.mod h1:tREtjEH2cTHl0p3uCVcH9g5tlqtsVNI/tDQVfq53Ty4=
|
||||
go.opentelemetry.io/otel v1.21.0 h1:hzLeKBZEL7Okw2mGzZ0cc4k/A7Fta0uoPgaJCr8fsFc=
|
||||
go.opentelemetry.io/otel v1.21.0/go.mod h1:QZzNPQPm1zLX4gZK4cMi+71eaorMSGT3A4znnUvNNEo=
|
||||
go.opentelemetry.io/otel/metric v1.21.0 h1:tlYWfeo+Bocx5kLEloTjbcDwBuELRrIFxwdQ36PlJu4=
|
||||
go.opentelemetry.io/otel/metric v1.21.0/go.mod h1:o1p3CA8nNHW8j5yuQLdc1eeqEaPfzug24uvsyIEJRWM=
|
||||
go.opentelemetry.io/otel/sdk v1.21.0 h1:FTt8qirL1EysG6sTQRZ5TokkU8d0ugCj8htOgThZXQ8=
|
||||
go.opentelemetry.io/otel/sdk v1.21.0/go.mod h1:Nna6Yv7PWTdgJHVRD9hIYywQBRx7pbox6nwBnZIxl/E=
|
||||
go.opentelemetry.io/otel/trace v1.21.0 h1:WD9i5gzvoUPuXIXH24ZNBudiarZDKuekPqi/E8fpfLc=
|
||||
go.opentelemetry.io/otel/trace v1.21.0/go.mod h1:LGbsEB0f9LGjN+OZaQQ26sohbOmiMR+BaslueVtS/qQ=
|
||||
golang.org/x/sys v0.14.0 h1:Vz7Qs629MkJkGyHxUlRHizWJRG2j8fbQKjELVSNhy7Q=
|
||||
golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
|
||||
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
|
||||
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
|
||||
@@ -7,6 +7,7 @@ import (
|
||||
"gitoa.ru/go-4devs/log/entry"
|
||||
)
|
||||
|
||||
// Deprecated: delete after 0.7.0
|
||||
func New() log.Logger {
|
||||
return func(ctx context.Context, e *entry.Entry) (int, error) {
|
||||
addEvent(ctx, e)
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package log_test
|
||||
package otel_test
|
||||
|
||||
import (
|
||||
"context"
|
||||
@@ -13,6 +13,7 @@ import (
|
||||
)
|
||||
|
||||
func ExampleNew_withTrace() {
|
||||
ctx := context.Background()
|
||||
logger := log.New(log.WithStdout()).With(otel.Middleware())
|
||||
|
||||
sctx, span := startSpan(ctx)
|
||||
@@ -7,6 +7,7 @@ import (
|
||||
"gitoa.ru/go-4devs/log/entry"
|
||||
)
|
||||
|
||||
// Deprecated: delete after 0.7.0
|
||||
func Middleware() log.Middleware {
|
||||
return func(ctx context.Context, e *entry.Entry, handler log.Logger) (int, error) {
|
||||
addEvent(ctx, e)
|
||||
|
||||
10
handler/zap/go.mod
Normal file
10
handler/zap/go.mod
Normal file
@@ -0,0 +1,10 @@
|
||||
module gitoa.ru/go-4devs/log/handler/zap
|
||||
|
||||
go 1.21.5
|
||||
|
||||
require (
|
||||
gitoa.ru/go-4devs/log v0.5.1
|
||||
go.uber.org/zap v1.26.0
|
||||
)
|
||||
|
||||
require go.uber.org/multierr v1.10.0 // indirect
|
||||
16
handler/zap/go.sum
Normal file
16
handler/zap/go.sum
Normal file
@@ -0,0 +1,16 @@
|
||||
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
|
||||
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
|
||||
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
|
||||
github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
|
||||
github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
|
||||
gitoa.ru/go-4devs/log v0.5.1 h1:rrIyjpUaw8AjDCf7ZuH0HgCRf370O3TV29yrU1xizWM=
|
||||
gitoa.ru/go-4devs/log v0.5.1/go.mod h1:tREtjEH2cTHl0p3uCVcH9g5tlqtsVNI/tDQVfq53Ty4=
|
||||
go.uber.org/goleak v1.2.0 h1:xqgm/S+aQvhWFTtR0XK3Jvg7z8kGV8P4X14IzwN3Eqk=
|
||||
go.uber.org/goleak v1.2.0/go.mod h1:XJYK+MuIchqpmGmUSAzotztawfKvYLUIgg7guXrwVUo=
|
||||
go.uber.org/multierr v1.10.0 h1:S0h4aNzvfcFsC3dRF1jLoaov7oRaKqRGC/pUEJ2yvPQ=
|
||||
go.uber.org/multierr v1.10.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
|
||||
go.uber.org/zap v1.26.0 h1:sI7k6L95XOKS281NhVKOFCUNIvv9e0w4BF8N3u+tCRo=
|
||||
go.uber.org/zap v1.26.0/go.mod h1:dtElttAiwGvoJ/vj4IwHBS/gXsEu/pZ50mUIRWuG0so=
|
||||
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
|
||||
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
|
||||
@@ -10,14 +10,17 @@ import (
|
||||
"go.uber.org/zap"
|
||||
)
|
||||
|
||||
// Deprecated: delete after 0.7.0
|
||||
func Nop() log.Logger {
|
||||
return New(zap.NewNop())
|
||||
}
|
||||
|
||||
// Deprecated: delete after 0.7.0
|
||||
func Example(options ...zap.Option) log.Logger {
|
||||
return New(zap.NewExample(options...))
|
||||
}
|
||||
|
||||
// Deprecated: delete after 0.7.0
|
||||
func Production(options ...zap.Option) log.Logger {
|
||||
z, err := zap.NewProduction(options...)
|
||||
if err != nil {
|
||||
@@ -27,6 +30,7 @@ func Production(options ...zap.Option) log.Logger {
|
||||
return New(z)
|
||||
}
|
||||
|
||||
// Deprecated: delete after 0.7.0
|
||||
func Development(options ...zap.Option) log.Logger {
|
||||
z, err := zap.NewDevelopment(options...)
|
||||
if err != nil {
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
package log_test
|
||||
package zap_test
|
||||
|
||||
import (
|
||||
"context"
|
||||
"io"
|
||||
|
||||
"gitoa.ru/go-4devs/log/field"
|
||||
@@ -9,6 +10,7 @@ import (
|
||||
)
|
||||
|
||||
func ExampleNew_zapHandler() {
|
||||
ctx := context.Background()
|
||||
log := zap.New(uzap.NewExample())
|
||||
log.Err(ctx, "log zap")
|
||||
log.ErrKV(ctx, "log zap kv", field.Int("int", 42))
|
||||
@@ -51,7 +51,9 @@ func TestUnmarshalJSON(t *testing.T) {
|
||||
for expect, actuals := range levels {
|
||||
for _, actual := range actuals {
|
||||
var level level.Level
|
||||
if err := level.UnmarshalJSON([]byte(actual)); err != nil {
|
||||
|
||||
err := level.UnmarshalJSON([]byte(actual))
|
||||
if err != nil {
|
||||
t.Errorf("%s got err: %s", level, err)
|
||||
|
||||
continue
|
||||
|
||||
177
logger.go
177
logger.go
@@ -28,172 +28,118 @@ func (l Logger) Write(in []byte) (int, error) {
|
||||
return l.write(context.Background(), level.Info, string(in))
|
||||
}
|
||||
|
||||
func (l Logger) write(ctx context.Context, level level.Level, msg string, fields ...field.Field) (int, error) {
|
||||
data := entry.Get()
|
||||
|
||||
defer func() {
|
||||
entry.Put(data)
|
||||
}()
|
||||
|
||||
return l(ctx, data.SetLevel(level).SetMessage(msg).Add(fields...))
|
||||
}
|
||||
|
||||
func (l Logger) writef(ctx context.Context, level level.Level, format string, args ...interface{}) (int, error) {
|
||||
data := entry.Get()
|
||||
|
||||
defer func() {
|
||||
entry.Put(data)
|
||||
}()
|
||||
|
||||
return l(ctx, data.SetLevel(level).SetMessagef(format, args...))
|
||||
}
|
||||
|
||||
func (l Logger) kv(_ context.Context, args ...interface{}) field.Fields {
|
||||
kvEntry := entry.Get()
|
||||
|
||||
defer func() {
|
||||
entry.Put(kvEntry)
|
||||
}()
|
||||
|
||||
for i := 0; i < len(args); i++ {
|
||||
if f, ok := args[i].(field.Field); ok {
|
||||
kvEntry = kvEntry.Add(f)
|
||||
|
||||
continue
|
||||
}
|
||||
|
||||
if i == len(args)-1 {
|
||||
kvEntry = kvEntry.AddAny(badKey, args[i])
|
||||
|
||||
break
|
||||
}
|
||||
|
||||
key, val := args[i], args[i+1]
|
||||
if keyStr, ok := key.(string); ok {
|
||||
kvEntry = kvEntry.AddAny(keyStr, val)
|
||||
i++
|
||||
|
||||
continue
|
||||
}
|
||||
|
||||
kvEntry = kvEntry.AddAny(badKey, args[i])
|
||||
}
|
||||
|
||||
return kvEntry.Fields()
|
||||
}
|
||||
|
||||
// With adds middlewares to logger.
|
||||
func (l Logger) With(mw ...Middleware) Logger {
|
||||
return With(l, mw...)
|
||||
}
|
||||
|
||||
// Emerg log by emergency level.
|
||||
func (l Logger) Emerg(ctx context.Context, args ...interface{}) {
|
||||
func (l Logger) Emerg(ctx context.Context, args ...any) {
|
||||
writeOutput(l.writef(ctx, level.Emergency, "", args...))
|
||||
}
|
||||
|
||||
// Alert log by alert level.
|
||||
func (l Logger) Alert(ctx context.Context, args ...interface{}) {
|
||||
func (l Logger) Alert(ctx context.Context, args ...any) {
|
||||
writeOutput(l.writef(ctx, level.Alert, "", args...))
|
||||
}
|
||||
|
||||
// Crit log by critical level.
|
||||
func (l Logger) Crit(ctx context.Context, args ...interface{}) {
|
||||
func (l Logger) Crit(ctx context.Context, args ...any) {
|
||||
writeOutput(l.writef(ctx, level.Critical, "", args...))
|
||||
}
|
||||
|
||||
// Err log by error level.
|
||||
func (l Logger) Err(ctx context.Context, args ...interface{}) {
|
||||
func (l Logger) Err(ctx context.Context, args ...any) {
|
||||
writeOutput(l.writef(ctx, level.Error, "", args...))
|
||||
}
|
||||
|
||||
// Warn log by warning level.
|
||||
func (l Logger) Warn(ctx context.Context, args ...interface{}) {
|
||||
func (l Logger) Warn(ctx context.Context, args ...any) {
|
||||
writeOutput(l.writef(ctx, level.Warning, "", args...))
|
||||
}
|
||||
|
||||
// Notice log by notice level.
|
||||
func (l Logger) Notice(ctx context.Context, args ...interface{}) {
|
||||
func (l Logger) Notice(ctx context.Context, args ...any) {
|
||||
writeOutput(l.writef(ctx, level.Notice, "", args...))
|
||||
}
|
||||
|
||||
// Info log by info level.
|
||||
func (l Logger) Info(ctx context.Context, args ...interface{}) {
|
||||
func (l Logger) Info(ctx context.Context, args ...any) {
|
||||
writeOutput(l.writef(ctx, level.Info, "", args...))
|
||||
}
|
||||
|
||||
// Debug log by debug level.
|
||||
func (l Logger) Debug(ctx context.Context, args ...interface{}) {
|
||||
func (l Logger) Debug(ctx context.Context, args ...any) {
|
||||
writeOutput(l.writef(ctx, level.Debug, "", args...))
|
||||
}
|
||||
|
||||
// Print log by info level and arguments.
|
||||
func (l Logger) Print(args ...interface{}) {
|
||||
func (l Logger) Print(args ...any) {
|
||||
writeOutput(l.writef(context.Background(), level.Info, "", args...))
|
||||
}
|
||||
|
||||
// Fatal log by alert level and arguments.
|
||||
func (l Logger) Fatal(args ...interface{}) {
|
||||
func (l Logger) Fatal(args ...any) {
|
||||
writeOutput(l.writef(context.Background(), level.Alert, "", args...))
|
||||
}
|
||||
|
||||
// Panic log by emergency level and arguments.
|
||||
func (l Logger) Panic(args ...interface{}) {
|
||||
func (l Logger) Panic(args ...any) {
|
||||
writeOutput(l.writef(context.Background(), level.Emergency, "", args...))
|
||||
}
|
||||
|
||||
// Println log by info level and arguments.
|
||||
func (l Logger) Println(args ...interface{}) {
|
||||
func (l Logger) Println(args ...any) {
|
||||
writeOutput(l.write(context.Background(), level.Info, fmt.Sprintln(args...)))
|
||||
}
|
||||
|
||||
// Fatalln log by alert level and arguments.
|
||||
func (l Logger) Fatalln(args ...interface{}) {
|
||||
func (l Logger) Fatalln(args ...any) {
|
||||
writeOutput(l.write(context.Background(), level.Alert, fmt.Sprintln(args...)))
|
||||
}
|
||||
|
||||
// Panicln log by emergency level and arguments.
|
||||
func (l Logger) Panicln(args ...interface{}) {
|
||||
func (l Logger) Panicln(args ...any) {
|
||||
writeOutput(l.write(context.Background(), level.Emergency, fmt.Sprintln(args...)))
|
||||
}
|
||||
|
||||
// EmergKVs sugared log by emergency level and key-values.
|
||||
func (l Logger) EmergKVs(ctx context.Context, msg string, args ...interface{}) {
|
||||
func (l Logger) EmergKVs(ctx context.Context, msg string, args ...any) {
|
||||
writeOutput(l.write(ctx, level.Emergency, msg, l.kv(ctx, args...)...))
|
||||
}
|
||||
|
||||
// AlertKVs sugared log by alert level and key-values.
|
||||
func (l Logger) AlertKVs(ctx context.Context, msg string, args ...interface{}) {
|
||||
func (l Logger) AlertKVs(ctx context.Context, msg string, args ...any) {
|
||||
writeOutput(l.write(ctx, level.Alert, msg, l.kv(ctx, args...)...))
|
||||
}
|
||||
|
||||
// CritKVs sugared log by critcal level and key-values.
|
||||
func (l Logger) CritKVs(ctx context.Context, msg string, args ...interface{}) {
|
||||
func (l Logger) CritKVs(ctx context.Context, msg string, args ...any) {
|
||||
writeOutput(l.write(ctx, level.Critical, msg, l.kv(ctx, args...)...))
|
||||
}
|
||||
|
||||
// ErrKVs sugared log by error level and key-values.
|
||||
func (l Logger) ErrKVs(ctx context.Context, msg string, args ...interface{}) {
|
||||
func (l Logger) ErrKVs(ctx context.Context, msg string, args ...any) {
|
||||
writeOutput(l.write(ctx, level.Error, msg, l.kv(ctx, args...)...))
|
||||
}
|
||||
|
||||
// WarnKVs sugared log by warning level and key-values.
|
||||
func (l Logger) WarnKVs(ctx context.Context, msg string, args ...interface{}) {
|
||||
func (l Logger) WarnKVs(ctx context.Context, msg string, args ...any) {
|
||||
writeOutput(l.write(ctx, level.Warning, msg, l.kv(ctx, args...)...))
|
||||
}
|
||||
|
||||
// NoticeKVs sugared log by notice level and key-values.
|
||||
func (l Logger) NoticeKVs(ctx context.Context, msg string, args ...interface{}) {
|
||||
func (l Logger) NoticeKVs(ctx context.Context, msg string, args ...any) {
|
||||
writeOutput(l.write(ctx, level.Notice, msg, l.kv(ctx, args...)...))
|
||||
}
|
||||
|
||||
// InfoKVs sugared log by info level and key-values.
|
||||
func (l Logger) InfoKVs(ctx context.Context, msg string, args ...interface{}) {
|
||||
func (l Logger) InfoKVs(ctx context.Context, msg string, args ...any) {
|
||||
writeOutput(l.write(ctx, level.Info, msg, l.kv(ctx, args...)...))
|
||||
}
|
||||
|
||||
// DebugKVs sugared log by debug level and key-values.
|
||||
func (l Logger) DebugKVs(ctx context.Context, msg string, args ...interface{}) {
|
||||
func (l Logger) DebugKVs(ctx context.Context, msg string, args ...any) {
|
||||
writeOutput(l.write(ctx, level.Debug, msg, l.kv(ctx, args...)...))
|
||||
}
|
||||
|
||||
@@ -238,57 +184,57 @@ func (l Logger) DebugKV(ctx context.Context, msg string, args ...field.Field) {
|
||||
}
|
||||
|
||||
// Emergf log by emergency level by format and arguments.
|
||||
func (l Logger) Emergf(ctx context.Context, format string, args ...interface{}) {
|
||||
func (l Logger) Emergf(ctx context.Context, format string, args ...any) {
|
||||
writeOutput(l.writef(ctx, level.Emergency, format, args...))
|
||||
}
|
||||
|
||||
// Alertf log by alert level by format and arguments.
|
||||
func (l Logger) Alertf(ctx context.Context, format string, args ...interface{}) {
|
||||
func (l Logger) Alertf(ctx context.Context, format string, args ...any) {
|
||||
writeOutput(l.writef(ctx, level.Alert, format, args...))
|
||||
}
|
||||
|
||||
// Critf log by critical level by format and arguments.
|
||||
func (l Logger) Critf(ctx context.Context, format string, args ...interface{}) {
|
||||
func (l Logger) Critf(ctx context.Context, format string, args ...any) {
|
||||
writeOutput(l.writef(ctx, level.Critical, format, args...))
|
||||
}
|
||||
|
||||
// Errf log by error level by format and arguments.
|
||||
func (l Logger) Errf(ctx context.Context, format string, args ...interface{}) {
|
||||
func (l Logger) Errf(ctx context.Context, format string, args ...any) {
|
||||
writeOutput(l.writef(ctx, level.Error, format, args...))
|
||||
}
|
||||
|
||||
// Warnf log by warning level by format and arguments.
|
||||
func (l Logger) Warnf(ctx context.Context, format string, args ...interface{}) {
|
||||
func (l Logger) Warnf(ctx context.Context, format string, args ...any) {
|
||||
writeOutput(l.writef(ctx, level.Warning, format, args...))
|
||||
}
|
||||
|
||||
// Noticef log by notice level by format and arguments.
|
||||
func (l Logger) Noticef(ctx context.Context, format string, args ...interface{}) {
|
||||
func (l Logger) Noticef(ctx context.Context, format string, args ...any) {
|
||||
writeOutput(l.writef(ctx, level.Notice, format, args...))
|
||||
}
|
||||
|
||||
// Infof log by info level by format and arguments.
|
||||
func (l Logger) Infof(ctx context.Context, format string, args ...interface{}) {
|
||||
func (l Logger) Infof(ctx context.Context, format string, args ...any) {
|
||||
writeOutput(l.writef(ctx, level.Info, format, args...))
|
||||
}
|
||||
|
||||
// Debugf log by debug level by format and arguments.
|
||||
func (l Logger) Debugf(ctx context.Context, format string, args ...interface{}) {
|
||||
func (l Logger) Debugf(ctx context.Context, format string, args ...any) {
|
||||
writeOutput(l.writef(ctx, level.Debug, format, args...))
|
||||
}
|
||||
|
||||
// Printf log by info level by format and arguments without context.
|
||||
func (l Logger) Printf(format string, args ...interface{}) {
|
||||
func (l Logger) Printf(format string, args ...any) {
|
||||
writeOutput(l.writef(context.Background(), level.Info, format, args...))
|
||||
}
|
||||
|
||||
// Fatalf log by alert level by format and arguments without context.
|
||||
func (l Logger) Fatalf(format string, args ...interface{}) {
|
||||
func (l Logger) Fatalf(format string, args ...any) {
|
||||
writeOutput(l.writef(context.Background(), level.Alert, format, args...))
|
||||
}
|
||||
|
||||
// Panicf log by emergency level and arguments without context.
|
||||
func (l Logger) Panicf(format string, args ...interface{}) {
|
||||
func (l Logger) Panicf(format string, args ...any) {
|
||||
writeOutput(l.writef(context.Background(), level.Emergency, format, args...))
|
||||
}
|
||||
|
||||
@@ -301,12 +247,67 @@ func (l Logger) Writer(ctx context.Context, level level.Level, fields ...field.F
|
||||
}
|
||||
}
|
||||
|
||||
func (l Logger) kv(_ context.Context, args ...any) field.Fields {
|
||||
kvEntry := entry.Get()
|
||||
|
||||
defer func() {
|
||||
entry.Put(kvEntry)
|
||||
}()
|
||||
|
||||
for i := 0; i < len(args); i++ {
|
||||
if f, ok := args[i].(field.Field); ok {
|
||||
kvEntry = kvEntry.Add(f)
|
||||
|
||||
continue
|
||||
}
|
||||
|
||||
if i == len(args)-1 {
|
||||
kvEntry = kvEntry.AddAny(badKey, args[i])
|
||||
|
||||
break
|
||||
}
|
||||
|
||||
key, val := args[i], args[i+1]
|
||||
if keyStr, ok := key.(string); ok {
|
||||
kvEntry = kvEntry.AddAny(keyStr, val)
|
||||
i++
|
||||
|
||||
continue
|
||||
}
|
||||
|
||||
kvEntry = kvEntry.AddAny(badKey, args[i])
|
||||
}
|
||||
|
||||
return kvEntry.Fields()
|
||||
}
|
||||
|
||||
func (l Logger) write(ctx context.Context, level level.Level, msg string, fields ...field.Field) (int, error) {
|
||||
data := entry.Get()
|
||||
|
||||
defer func() {
|
||||
entry.Put(data)
|
||||
}()
|
||||
|
||||
return l(ctx, data.SetLevel(level).SetMessage(msg).Add(fields...))
|
||||
}
|
||||
|
||||
func (l Logger) writef(ctx context.Context, level level.Level, format string, args ...any) (int, error) {
|
||||
data := entry.Get()
|
||||
|
||||
defer func() {
|
||||
entry.Put(data)
|
||||
}()
|
||||
|
||||
return l(ctx, data.SetLevel(level).SetMessagef(format, args...))
|
||||
}
|
||||
|
||||
//nolint:containedctx
|
||||
type writer struct {
|
||||
Logger
|
||||
|
||||
ctx context.Context
|
||||
level level.Level
|
||||
fields []field.Field
|
||||
Logger
|
||||
}
|
||||
|
||||
func (w writer) WithLevel(level level.Level) writer {
|
||||
|
||||
@@ -1,22 +1,23 @@
|
||||
package log_test
|
||||
|
||||
import (
|
||||
"path/filepath"
|
||||
|
||||
"gitoa.ru/go-4devs/log"
|
||||
"gitoa.ru/go-4devs/log/level"
|
||||
)
|
||||
|
||||
func ExampleNew_withCaller() {
|
||||
logger := log.With(
|
||||
log.New(log.WithStdout()),
|
||||
log.WithLevel("level", level.Debug),
|
||||
log.WithCaller("caller", 2, false),
|
||||
logger := log.New(log.WithStdout()).With(
|
||||
log.WithLevel(log.KeyLevel, level.Debug),
|
||||
log.WithSource(3, filepath.Base),
|
||||
)
|
||||
logger.Err(ctx, "same error message")
|
||||
logger.InfoKVs(ctx, "same info message", "api-version", 0.1)
|
||||
_, _ = logger.Write([]byte("same write message"))
|
||||
|
||||
// Output:
|
||||
// msg="same error message" level=error caller=logger_example_caller_test.go:14
|
||||
// msg="same info message" api-version=0.1 level=info caller=logger_example_caller_test.go:15
|
||||
// msg="same write message" level=info caller=logger_example_caller_test.go:16
|
||||
// msg="same error message" level=error source=logger_example_caller_test.go:15
|
||||
// msg="same info message" api-version=0.1 level=info source=logger_example_caller_test.go:16
|
||||
// msg="same write message" level=info source=logger_example_caller_test.go:17
|
||||
}
|
||||
|
||||
@@ -47,19 +47,19 @@ func ExampleNew_errf() {
|
||||
}
|
||||
|
||||
func ExampleNew_debugKV() {
|
||||
logger := log.New(log.WithStdout()).With(log.WithLevel("level", level.Debug))
|
||||
logger := log.New(log.WithStdout()).With(log.WithLevel(log.KeyLevel, level.Debug))
|
||||
logger.DebugKVs(ctx, "same message", "error", os.ErrNotExist)
|
||||
// Output: msg="same message" error="file does not exist" level=debug
|
||||
}
|
||||
|
||||
func ExampleNew_level() {
|
||||
logger := log.New(log.WithStdout()).With(log.WithLevel("level", level.Error))
|
||||
logger := log.New(log.WithStdout()).With(log.WithLevel(log.KeyLevel, level.Error))
|
||||
logger.Err(ctx, "same error message")
|
||||
// Output: msg="same error message" level=error
|
||||
}
|
||||
|
||||
func ExampleNew_level_info() {
|
||||
logger := log.New(log.WithStdout()).With(log.WithLevel("level", level.Error))
|
||||
logger := log.New(log.WithStdout()).With(log.WithLevel(log.KeyLevel, level.Error))
|
||||
logger.Info(ctx, "same message")
|
||||
// Output:
|
||||
}
|
||||
@@ -92,7 +92,7 @@ var (
|
||||
float64Val = float64(math.MaxFloat64)
|
||||
|
||||
minute = time.Minute
|
||||
timeVal = time.Unix(0, math.MaxInt32)
|
||||
timeVal = time.Unix(0, math.MaxInt32).In(time.UTC)
|
||||
)
|
||||
|
||||
func ExampleNew_anyField() {
|
||||
@@ -108,7 +108,7 @@ func ExampleNew_anyField() {
|
||||
field.Any("error", errors.New("error")),
|
||||
)
|
||||
// Output:
|
||||
// {"msg":"any info message","obj":{"Name":"obj name","IsEnable":false},"obj":{"Name":"test obj","IsEnable":false},"int":9223372036854775807,"uint":18446744073709551615,"float":1.7976931348623157e+308,"time":"1970-01-01T03:00:02+03:00","duration":"1h0m0s","error":"error"}
|
||||
// {"msg":"any info message","obj":{"Name":"obj name","IsEnable":false},"obj":{"Name":"test obj","IsEnable":false},"int":9223372036854775807,"uint":18446744073709551615,"float":1.7976931348623157e+308,"time":"1970-01-01T00:00:02Z","duration":"1h0m0s","error":"error"}
|
||||
}
|
||||
|
||||
func ExampleNew_arrayField() {
|
||||
@@ -130,11 +130,11 @@ func ExampleNew_arrayField() {
|
||||
field.Complex64s("complex64s", 42, 24),
|
||||
field.Complex128s("complex128s", 42, 24),
|
||||
field.Durations("durations", time.Minute, time.Second),
|
||||
field.Times("times", time.Unix(0, 42), time.Unix(0, 24)),
|
||||
field.Times("times", time.Unix(0, 42).In(time.UTC), time.Unix(0, 24).In(time.UTC)),
|
||||
field.Errors("errors", errors.New("error"), errors.New("error2")),
|
||||
)
|
||||
// Output:
|
||||
// {"msg":"array info message","strings":["string","test str"],"bools":[true,false],"ints":[42,24],"int8s":[42,24],"int16s":[42,24],"int32s":[42,24],"int64s":[42,24],"uint8s":[255,0],"uint16s":[42,24],"uint32s":[42,24],"uint64s":[42,24],"float32s":[42,24],"float64s":[42,24],"complex64s":["(42+0i)","(24+0i)"],"complex128s":["(42+0i)","(24+0i)"],"durations":["1m0s","1s"],"times":["1970-01-01T03:00:00+03:00","1970-01-01T03:00:00+03:00"],"errors":["error","error2"]}
|
||||
// {"msg":"array info message","strings":["string","test str"],"bools":[true,false],"ints":[42,24],"int8s":[42,24],"int16s":[42,24],"int32s":[42,24],"int64s":[42,24],"uint8s":[255,0],"uint16s":[42,24],"uint32s":[42,24],"uint64s":[42,24],"float32s":[42,24],"float64s":[42,24],"complex64s":["(42+0i)","(24+0i)"],"complex128s":["(42+0i)","(24+0i)"],"durations":["1m0s","1s"],"times":["1970-01-01T00:00:00Z","1970-01-01T00:00:00Z"],"errors":["error","error2"]}
|
||||
}
|
||||
|
||||
func ExampleNew_pointerField() {
|
||||
@@ -174,7 +174,7 @@ func ExampleNew_pointerField() {
|
||||
field.Timep("timep", nil),
|
||||
)
|
||||
// Output:
|
||||
// {"msg":"pointer info message","stringp":"test str","stringp":null,"boolp":true,"boolp":null,"intp":9223372036854775807,"intp":null,"int8p":127,"int8p":null,"int16p":32767,"int16p":null,"int32p":2147483647,"int32p":null,"int64p":9223372036854775807,"int64p":null,"uintp":18446744073709551615,"uintp":null,"uint8p":255,"uint8p":null,"uint16p":32767,"uint16p":null,"uint32p":2147483647,"uint32p":null,"uint64p":9223372036854775807,"uint64p":null,"float32p":3.4028235e+38,"float32p":null,"float64p":1.7976931348623157e+308,"float64p":null,"durationp":"1m0s","durationp":null,"timep":"1970-01-01T03:00:02+03:00","timep":null}
|
||||
// {"msg":"pointer info message","stringp":"test str","stringp":null,"boolp":true,"boolp":null,"intp":9223372036854775807,"intp":null,"int8p":127,"int8p":null,"int16p":32767,"int16p":null,"int32p":2147483647,"int32p":null,"int64p":9223372036854775807,"int64p":null,"uintp":18446744073709551615,"uintp":null,"uint8p":255,"uint8p":null,"uint16p":32767,"uint16p":null,"uint32p":2147483647,"uint32p":null,"uint64p":9223372036854775807,"uint64p":null,"float32p":3.4028235e+38,"float32p":null,"float64p":1.7976931348623157e+308,"float64p":null,"durationp":"1m0s","durationp":null,"timep":"1970-01-01T00:00:02Z","timep":null}
|
||||
}
|
||||
|
||||
func ExampleNew_fields() {
|
||||
@@ -196,12 +196,12 @@ func ExampleNew_fields() {
|
||||
field.Complex64("complex16", 42),
|
||||
field.Complex128("complex128", 42),
|
||||
field.Duration("duration", time.Minute),
|
||||
field.Time("time", time.Unix(0, 42)),
|
||||
field.Time("time", timeVal),
|
||||
field.FormatTime("format_time", time.UnixDate, timeVal),
|
||||
field.Error("error", errors.New("error")),
|
||||
)
|
||||
// Output:
|
||||
// {"msg":"info message","string":"test str","bool":true,"int":42,"int8":42,"int16":42,"int32":42,"int64":42,"uint8":255,"uint16":42,"uint32":42,"uint64":42,"float32":42,"float64":42,"complex16":"(42+0i)","complex128":"(42+0i)","duration":"1m0s","time":"1970-01-01T03:00:00+03:00","format_time":"Thu Jan 1 03:00:02 MSK 1970","error":"error"}
|
||||
// {"msg":"info message","string":"test str","bool":true,"int":42,"int8":42,"int16":42,"int32":42,"int64":42,"uint8":255,"uint16":42,"uint32":42,"uint64":42,"float32":42,"float64":42,"complex16":"(42+0i)","complex128":"(42+0i)","duration":"1m0s","time":"1970-01-01T00:00:02Z","format_time":"Thu Jan 1 00:00:02 UTC 1970","error":"error"}
|
||||
}
|
||||
|
||||
func ExampleNew_jsonFormat() {
|
||||
@@ -213,22 +213,22 @@ func ExampleNew_jsonFormat() {
|
||||
logger.Err(ctx, "same error message")
|
||||
logger.WarnKVs(ctx, "same warn message", "obj", Obj{Name: "obj name"})
|
||||
// Output:
|
||||
// {"msg":"same error message","level":"error","go-version":"go1.21.5"}
|
||||
// {"msg":"same warn message","obj":{"Name":"obj name","IsEnable":false},"level":"warning","go-version":"go1.21.5"}
|
||||
// {"msg":"same error message","level":"error","go-version":"go1.25.5"}
|
||||
// {"msg":"same warn message","obj":{"Name":"obj name","IsEnable":false},"level":"warning","go-version":"go1.25.5"}
|
||||
}
|
||||
|
||||
func ExampleNew_textEncoding() {
|
||||
logger := log.With(
|
||||
log.New(log.WithStdout()),
|
||||
log.WithLevel(log.KeyLevel, level.Debug),
|
||||
log.GoVersion("go-version"),
|
||||
)
|
||||
logger := log.New(log.WithStdout()).
|
||||
With(
|
||||
log.WithLevel(log.KeyLevel, level.Debug),
|
||||
log.GoVersion("go-version"),
|
||||
)
|
||||
logger.Err(ctx, "same error message")
|
||||
logger.InfoKVs(ctx, "same info message", "api-version", 0.1, "obj", Obj{Name: "text value", IsEnable: true})
|
||||
|
||||
// Output:
|
||||
// msg="same error message" level=error go-version=go1.21.5
|
||||
// msg="same info message" api-version=0.1 obj={Name:text value IsEnable:true} level=info go-version=go1.21.5
|
||||
// msg="same error message" level=error go-version=go1.25.5
|
||||
// msg="same info message" api-version=0.1 obj={Name:text value IsEnable:true} level=info go-version=go1.25.5
|
||||
}
|
||||
|
||||
type ctxKey string
|
||||
@@ -238,28 +238,33 @@ func (c ctxKey) String() string {
|
||||
}
|
||||
|
||||
func levelInfo(ctx context.Context, entry *entry.Entry, handler log.Logger) (int, error) {
|
||||
return handler(ctx, entry.Add(field.String("level", entry.Level().String())))
|
||||
return handler(ctx, entry.Add(field.String(log.KeyLevel, entry.Level().String())))
|
||||
}
|
||||
|
||||
func ExampleWith() {
|
||||
var requestID ctxKey = "requestID"
|
||||
|
||||
vctx := context.WithValue(ctx, requestID, "6a5fa048-7181-11ea-bc55-0242ac130003")
|
||||
|
||||
logger := log.With(
|
||||
log.New(log.WithStdout()),
|
||||
levelInfo, log.WithContextValue(requestID), log.KeyValue("api", "0.1.0"), log.GoVersion("go"),
|
||||
logger := log.New(log.WithStdout()).With(
|
||||
levelInfo,
|
||||
log.WithContextValue(requestID),
|
||||
log.KeyValue("api", "0.1.0"),
|
||||
log.GoVersion("go"),
|
||||
)
|
||||
logger.Info(vctx, "same message")
|
||||
// Output: msg="same message" level=info requestID=6a5fa048-7181-11ea-bc55-0242ac130003 api=0.1.0 go=go1.21.5
|
||||
// Output: msg="same message" level=info requestID=6a5fa048-7181-11ea-bc55-0242ac130003 api=0.1.0 go=go1.25.5
|
||||
}
|
||||
|
||||
func ExampleLogger_Print() {
|
||||
logger := log.With(
|
||||
log.New(log.WithStdout()),
|
||||
levelInfo, log.KeyValue("client", "http"), log.KeyValue("api", "0.1.0"), log.GoVersion("go"),
|
||||
logger := log.New(log.WithStdout()).With(
|
||||
levelInfo,
|
||||
log.KeyValue("client", "http"),
|
||||
log.KeyValue("api", "0.1.0"),
|
||||
log.GoVersion("go"),
|
||||
)
|
||||
logger.Print("same message")
|
||||
// Output: msg="same message" level=info client=http api=0.1.0 go=go1.21.5
|
||||
// Output: msg="same message" level=info client=http api=0.1.0 go=go1.25.5
|
||||
}
|
||||
|
||||
func ExamplePrint() {
|
||||
@@ -277,7 +282,7 @@ func Example_fieldClosureFn() {
|
||||
return d
|
||||
})
|
||||
|
||||
log := log.With(log.New(log.WithStdout()), log.WithLevel("level", level.Info))
|
||||
log := log.New(log.WithStdout()).With(log.WithLevel(log.KeyLevel, level.Info))
|
||||
|
||||
log.DebugKVs(ctx, "debug message", "data", closure)
|
||||
log.ErrKVs(ctx, "error message", "err", closure)
|
||||
@@ -289,7 +294,9 @@ func Example_fieldClosureFn() {
|
||||
}
|
||||
|
||||
func Example_withGroup() {
|
||||
log := log.With(log.New(log.WithStdout()), log.WithLevel(log.KeyLevel, level.Info))
|
||||
log := log.New(log.WithStdout()).With(
|
||||
log.WithLevel(log.KeyLevel, level.Info),
|
||||
)
|
||||
|
||||
log.ErrKVs(ctx, "error message",
|
||||
field.Groups("grous_field",
|
||||
|
||||
@@ -27,7 +27,7 @@ func TestFields(t *testing.T) {
|
||||
ctx := context.Background()
|
||||
buf := &bytes.Buffer{}
|
||||
log := log.New(log.WithWriter(buf)).
|
||||
With(log.WithLevel("level", level.Info))
|
||||
With(log.WithLevel(log.KeyLevel, level.Info))
|
||||
success := "msg=message err=\"file already exists\" version=0.1.0 obj={id:uid} closure=\"some closure data\" level=info\n"
|
||||
|
||||
log.InfoKVs(ctx, "message",
|
||||
@@ -65,7 +65,7 @@ func TestWriter(t *testing.T) {
|
||||
|
||||
success := "msg=\"info message\" err=\"file already exists\" requestID=6a5fa048-7181-11ea-bc55-0242ac1311113 level=info\n"
|
||||
buf := &bytes.Buffer{}
|
||||
logger := log.New(log.WithWriter(buf)).With(log.WithContextValue(requestID), log.WithLevel("level", level.Info))
|
||||
logger := log.New(log.WithWriter(buf)).With(log.WithContextValue(requestID), log.WithLevel(log.KeyLevel, level.Info))
|
||||
|
||||
_, _ = logger.Writer(
|
||||
context.WithValue(ctx, requestID, "6a5fa048-7181-11ea-bc55-0242ac1311113"),
|
||||
@@ -91,7 +91,7 @@ func TestLogger(t *testing.T) {
|
||||
|
||||
ctx := context.Background()
|
||||
buf := &bytes.Buffer{}
|
||||
logger := log.New(log.WithWriter(buf)).With(log.WithContextValue(requestID), log.WithLevel("level", level.Info))
|
||||
logger := log.New(log.WithWriter(buf)).With(log.WithContextValue(requestID), log.WithLevel(log.KeyLevel, level.Info))
|
||||
|
||||
_, err := logger(ctx, nil)
|
||||
if err != nil {
|
||||
|
||||
@@ -38,6 +38,7 @@ func With(logger Logger, mw ...Middleware) Logger {
|
||||
if curI == lastI {
|
||||
return logger(currentCtx, currentEntry)
|
||||
}
|
||||
|
||||
curI++
|
||||
n, err := mw[curI](currentCtx, currentEntry, chainHandler)
|
||||
curI--
|
||||
@@ -61,7 +62,7 @@ func WithLevel(key string, lvl level.Level) Middleware {
|
||||
}
|
||||
|
||||
// KeyValue add field by const key value.
|
||||
func KeyValue(key string, value interface{}) Middleware {
|
||||
func KeyValue(key string, value any) Middleware {
|
||||
return func(ctx context.Context, e *entry.Entry, handler Logger) (int, error) {
|
||||
return handler(ctx, e.AddAny(key, value))
|
||||
}
|
||||
@@ -74,7 +75,7 @@ func GoVersion(key string) Middleware {
|
||||
}
|
||||
}
|
||||
|
||||
// WithContext add field by context key.
|
||||
// WithContextValue add field by context key.
|
||||
func WithContextValue(keys ...fmt.Stringer) Middleware {
|
||||
return func(ctx context.Context, e *entry.Entry, handler Logger) (int, error) {
|
||||
for _, key := range keys {
|
||||
@@ -85,7 +86,15 @@ func WithContextValue(keys ...fmt.Stringer) Middleware {
|
||||
}
|
||||
}
|
||||
|
||||
func WithName(name string) Middleware {
|
||||
return func(ctx context.Context, data *entry.Entry, handler Logger) (int, error) {
|
||||
return handler(ctx, data.Replace(KeyName, field.StringValue(name)))
|
||||
}
|
||||
}
|
||||
|
||||
// WithCaller adds called file.
|
||||
//
|
||||
// Deprecated: use WithSource.
|
||||
func WithCaller(key string, depth int, full bool) Middleware {
|
||||
const offset = 2
|
||||
|
||||
|
||||
94
source.go
Normal file
94
source.go
Normal file
@@ -0,0 +1,94 @@
|
||||
package log
|
||||
|
||||
import (
|
||||
"context"
|
||||
"fmt"
|
||||
"path/filepath"
|
||||
"runtime"
|
||||
"strings"
|
||||
|
||||
"gitoa.ru/go-4devs/log/entry"
|
||||
"gitoa.ru/go-4devs/log/field"
|
||||
)
|
||||
|
||||
func WithSource(items int, trimPath func(string) string) Middleware {
|
||||
const (
|
||||
skip = 4
|
||||
funcPrefix = "gitoa.ru/go-4devs/log.Logger"
|
||||
skipHelper = "gitoa.ru/go-4devs/log."
|
||||
)
|
||||
|
||||
items += skip
|
||||
|
||||
return func(ctx context.Context, data *entry.Entry, handler Logger) (int, error) {
|
||||
pc := make([]uintptr, items)
|
||||
n := runtime.Callers(skip, pc)
|
||||
|
||||
if n == 0 {
|
||||
return handler(ctx, data.Add(errSourceField(skip, items)))
|
||||
}
|
||||
|
||||
pc = pc[:n] // pass only valid pcs to runtime.CallersFrames
|
||||
frames := runtime.CallersFrames(pc)
|
||||
prew := false
|
||||
|
||||
for {
|
||||
frame, more := frames.Next()
|
||||
|
||||
has := strings.HasPrefix(frame.Function, funcPrefix)
|
||||
if !has && prew {
|
||||
if strings.HasPrefix(frame.Function, skipHelper) {
|
||||
continue
|
||||
}
|
||||
|
||||
return handler(ctx, data.AddAny(KeySource, Source{
|
||||
Func: filepath.Base(frame.Function),
|
||||
Line: frame.Line,
|
||||
File: trimPath(frame.File),
|
||||
}))
|
||||
}
|
||||
|
||||
prew = has
|
||||
|
||||
if !more {
|
||||
break
|
||||
}
|
||||
}
|
||||
|
||||
return handler(ctx, data.Add(errSourceField(skip, items)))
|
||||
}
|
||||
}
|
||||
|
||||
func TrimPath(file string) string {
|
||||
idx := strings.LastIndexByte(file, '/')
|
||||
if idx == -1 {
|
||||
return filepath.Base(file)
|
||||
}
|
||||
|
||||
// Find the penultimate separator.
|
||||
idx = strings.LastIndexByte(file[:idx], '/')
|
||||
if idx == -1 {
|
||||
return filepath.Base(file)
|
||||
}
|
||||
|
||||
return file[idx+1:]
|
||||
}
|
||||
|
||||
// Source describes the location of a line of source code.
|
||||
type Source struct {
|
||||
Func string `json:"func"`
|
||||
File string `json:"file"`
|
||||
Line int `json:"line"`
|
||||
}
|
||||
|
||||
func (l Source) MarshalText() ([]byte, error) {
|
||||
return fmt.Appendf(nil, "%s:%d", l.File, l.Line), nil
|
||||
}
|
||||
|
||||
func (l Source) MarshalJSON() ([]byte, error) {
|
||||
return fmt.Appendf([]byte{}, `{"file":"%s","line":%d,"func":"%s"}`, l.File, l.Line, l.Func), nil
|
||||
}
|
||||
|
||||
func errSourceField(skip, mframe int) field.Field {
|
||||
return field.String(KeySource, fmt.Sprintf("source not found by frames[%d:%d]", skip, mframe))
|
||||
}
|
||||
26
source_example_test.go
Normal file
26
source_example_test.go
Normal file
@@ -0,0 +1,26 @@
|
||||
package log_test
|
||||
|
||||
import (
|
||||
"context"
|
||||
"path/filepath"
|
||||
|
||||
"gitoa.ru/go-4devs/log"
|
||||
)
|
||||
|
||||
func ExampleWithSource() {
|
||||
ctx := context.Background()
|
||||
logger := log.New(log.WithStdout()).With(log.WithSource(1, filepath.Base))
|
||||
|
||||
logger.Debug(ctx, "debug message")
|
||||
// Output:
|
||||
// msg="debug message" source=source_example_test.go:14
|
||||
}
|
||||
|
||||
func ExampleWithSource_json() {
|
||||
ctx := context.Background()
|
||||
logger := log.New(log.WithStdout(), log.WithJSONFormat()).With(log.WithSource(2, filepath.Base))
|
||||
|
||||
logger.Debug(ctx, "debug message")
|
||||
// Output:
|
||||
// {"msg":"debug message","source":{"file":"source_example_test.go","line":23,"func":"log_test.ExampleWithSource_json"}}
|
||||
}
|
||||
37
writer_example_test.go
Normal file
37
writer_example_test.go
Normal file
@@ -0,0 +1,37 @@
|
||||
package log_test
|
||||
|
||||
import (
|
||||
"context"
|
||||
"math"
|
||||
"path/filepath"
|
||||
"time"
|
||||
|
||||
"gitoa.ru/go-4devs/log"
|
||||
"gitoa.ru/go-4devs/log/entry"
|
||||
"gitoa.ru/go-4devs/log/field"
|
||||
"gitoa.ru/go-4devs/log/level"
|
||||
)
|
||||
|
||||
func exampleWithTime(key, format string) log.Middleware {
|
||||
return func(ctx context.Context, e *entry.Entry, handler log.Logger) (int, error) {
|
||||
return handler(ctx, e.Add(field.FormatTime(key, format, time.Unix(math.MaxInt32, 0).In(time.UTC))))
|
||||
}
|
||||
}
|
||||
|
||||
func ExampleFormatWithBracket() {
|
||||
ctx := context.Background()
|
||||
logger := log.New(log.WithFormat(log.FormatWithBracket(field.NewEncoderText())), log.WithStdout()).With(
|
||||
log.WithSource(10, filepath.Base),
|
||||
// log.WithTime(log.KeyTime, time.RFC3339),
|
||||
exampleWithTime(log.KeyTime, time.RFC3339),
|
||||
log.WithLevel(log.KeyLevel, level.Info),
|
||||
)
|
||||
|
||||
logger.InfoKV(ctx, "imfo message", field.Int64("num", 42))
|
||||
|
||||
serviceLogger := logger.With(log.WithName("service_name"))
|
||||
serviceLogger.Err(ctx, "error message")
|
||||
// Output:
|
||||
// 2038-01-19T03:14:07Z [info] writer_example_test.go:30 "imfo message" num=42
|
||||
// 2038-01-19T03:14:07Z [error][service_name] writer_example_test.go:33 "error message"
|
||||
}
|
||||
89
writter.go
89
writter.go
@@ -13,18 +13,20 @@ import (
|
||||
|
||||
// Keys for "built-in" attributes.
|
||||
const (
|
||||
// TimeKey is the key used by the built-in handlers for the time
|
||||
// KeyTime is the key used by the built-in handlers for the time
|
||||
// when the log method is called. The associated Value is a [time.Time].
|
||||
KeyTime = "time"
|
||||
// LevelKey is the key used by the built-in handlers for the level
|
||||
// KeyLevel is the key used by the built-in handlers for the level
|
||||
// of the log call. The associated value is a [Level].
|
||||
KeyLevel = "level"
|
||||
// MessageKey is the key used by the built-in handlers for the
|
||||
// KeyMessage is the key used by the built-in handlers for the
|
||||
// message of the log call. The associated value is a string.
|
||||
KeyMessage = "msg"
|
||||
// SourceKey is the key used by the built-in handlers for the source file
|
||||
// KeySource is the key used by the built-in handlers for the source file
|
||||
// and line of the log call. The associated value is a string.
|
||||
KeySource = "source"
|
||||
// KeyName logger name.
|
||||
KeyName = "name"
|
||||
)
|
||||
|
||||
func WithWriter(w io.Writer) func(*option) {
|
||||
@@ -41,15 +43,18 @@ func WithStdout() func(*option) {
|
||||
|
||||
// WithStringFormat sets format as simple string.
|
||||
func WithStringFormat() func(*option) {
|
||||
return func(o *option) {
|
||||
o.format = formatText()
|
||||
}
|
||||
return WithFormat(FormatString(field.NewEncoderText()))
|
||||
}
|
||||
|
||||
// WithJSONFormat sets json output format.
|
||||
func WithJSONFormat() func(*option) {
|
||||
return WithFormat(FormatJSON(field.NewEncoderJSON()))
|
||||
}
|
||||
|
||||
// WithFormat sets custom output format.
|
||||
func WithFormat(format func(io.Writer, *entry.Entry) (int, error)) func(*option) {
|
||||
return func(o *option) {
|
||||
o.format = formatJSON()
|
||||
o.format = format
|
||||
}
|
||||
}
|
||||
|
||||
@@ -61,7 +66,7 @@ type option struct {
|
||||
// New creates standart logger.
|
||||
func New(opts ...func(*option)) Logger {
|
||||
log := option{
|
||||
format: formatText(),
|
||||
format: FormatString(field.NewEncoderText()),
|
||||
out: os.Stderr,
|
||||
}
|
||||
|
||||
@@ -74,11 +79,68 @@ func New(opts ...func(*option)) Logger {
|
||||
}
|
||||
}
|
||||
|
||||
func formatText() func(io.Writer, *entry.Entry) (int, error) {
|
||||
enc := field.NewEncoderText()
|
||||
type Encoder interface {
|
||||
AppendValue(dst []byte, val field.Value) []byte
|
||||
AppendField(dst []byte, val field.Field) []byte
|
||||
}
|
||||
|
||||
func FormatWithBracket(enc Encoder) func(io.Writer, *entry.Entry) (int, error) {
|
||||
appendValue := func(buf *buffer.Buffer, data field.Fields, key, prefix, suffix string) *buffer.Buffer {
|
||||
data.Fields(
|
||||
func(f field.Field) bool {
|
||||
if f.IsKey(key) {
|
||||
_, _ = buf.WriteString(prefix)
|
||||
*buf = enc.AppendValue(*buf, f.Value)
|
||||
_, _ = buf.WriteString(suffix)
|
||||
|
||||
return false
|
||||
}
|
||||
|
||||
return true
|
||||
})
|
||||
|
||||
return buf
|
||||
}
|
||||
|
||||
return func(w io.Writer, data *entry.Entry) (int, error) {
|
||||
buf := buffer.New()
|
||||
|
||||
defer func() {
|
||||
buf.Free()
|
||||
}()
|
||||
|
||||
fields := data.Fields()
|
||||
buf = appendValue(buf, fields, KeyTime, "", " ")
|
||||
_, _ = buf.WriteString("[")
|
||||
*buf = enc.AppendValue(*buf, field.StringValue(data.Level().String()))
|
||||
_, _ = buf.WriteString("]")
|
||||
buf = appendValue(buf, fields, KeyName, "[", "]")
|
||||
buf = appendValue(buf, fields, KeySource, " ", " ")
|
||||
*buf = enc.AppendValue(*buf, field.StringValue(data.Message()))
|
||||
|
||||
fields.Fields(func(f field.Field) bool {
|
||||
if !f.IsKey(KeyTime, KeySource, KeyName, KeyLevel) {
|
||||
*buf = enc.AppendField(*buf, f)
|
||||
}
|
||||
|
||||
return true
|
||||
})
|
||||
|
||||
_, _ = buf.WriteString("\n")
|
||||
|
||||
n, err := w.Write(*buf)
|
||||
if err != nil {
|
||||
return 0, fmt.Errorf("format text:%w", err)
|
||||
}
|
||||
|
||||
return n, nil
|
||||
}
|
||||
}
|
||||
|
||||
func FormatString(enc Encoder) func(io.Writer, *entry.Entry) (int, error) {
|
||||
return func(w io.Writer, entry *entry.Entry) (int, error) {
|
||||
buf := buffer.New()
|
||||
|
||||
defer func() {
|
||||
buf.Free()
|
||||
}()
|
||||
@@ -100,11 +162,10 @@ func formatText() func(io.Writer, *entry.Entry) (int, error) {
|
||||
}
|
||||
}
|
||||
|
||||
func formatJSON() func(w io.Writer, entry *entry.Entry) (int, error) {
|
||||
enc := field.NewEncoderJSON()
|
||||
|
||||
func FormatJSON(enc Encoder) func(w io.Writer, entry *entry.Entry) (int, error) {
|
||||
return func(w io.Writer, entry *entry.Entry) (int, error) {
|
||||
buf := buffer.New()
|
||||
|
||||
defer func() {
|
||||
buf.Free()
|
||||
}()
|
||||
|
||||
Reference in New Issue
Block a user