Igor Sirotin e0eb737c51
fix_: enable tests to run with -count more than 1 (#5757)
* fix(TestProfilingCPU)_: enable run with -count=2

* fix(TestProfilingMem)_: enable run with -count=2

* fix(zaputil)_: register encoder only once

* fix(timesource)_: global variables override in tests

* fix(TestClosingsqlDB)_: delete database from cache

* fix(postgres/helpers)_: drop connections before dropping database

* fix_: linter

* chore_: remove redundant condition
2024-08-23 19:30:58 +00:00

82 lines
2.1 KiB
Go

package zaputil
import (
"encoding/hex"
"sync"
"go.uber.org/zap"
"go.uber.org/zap/zapcore"
)
type jsonHexEncoder struct {
zapcore.Encoder
}
// NewJSONHexEncoder creates a JSON logger based on zapcore.NewJSONEncoder
// but overwrites encoding of byte slices. Instead encoding them with base64,
// jsonHexEncoder uses hex-encoding.
// Each hex-encoded value is prefixed with 0x so that it's clear it's a hex string.
func NewJSONHexEncoder(cfg zapcore.EncoderConfig) zapcore.Encoder {
jsonEncoder := zapcore.NewJSONEncoder(cfg)
return &jsonHexEncoder{
Encoder: jsonEncoder,
}
}
func (enc *jsonHexEncoder) AddBinary(key string, val []byte) {
enc.AddString(key, "0x"+hex.EncodeToString(val))
}
func (enc *jsonHexEncoder) Clone() zapcore.Encoder {
encoderClone := enc.Encoder.Clone()
return &jsonHexEncoder{Encoder: encoderClone}
}
var (
registerJSONHexEncoderOnce sync.Once
registerConsoleHexEncodeOnce sync.Once
)
// RegisterJSONHexEncoder registers a jsonHexEncoder under "json-hex" name.
// Later, this name can be used as a value for zap.Config.Encoding to enable
// jsonHexEncoder.
func RegisterJSONHexEncoder() error {
var err error
registerJSONHexEncoderOnce.Do(func() {
err = zap.RegisterEncoder("json-hex", func(cfg zapcore.EncoderConfig) (zapcore.Encoder, error) {
return NewJSONHexEncoder(cfg), nil
})
})
return err
}
type consoleHexEncoder struct {
zapcore.Encoder
}
func NewConsoleHexEncoder(cfg zapcore.EncoderConfig) zapcore.Encoder {
consoleEncoder := zapcore.NewConsoleEncoder(cfg)
return &consoleHexEncoder{
Encoder: consoleEncoder,
}
}
func (enc *consoleHexEncoder) AddBinary(key string, val []byte) {
enc.AddString(key, "0x"+hex.EncodeToString(val))
}
func (enc *consoleHexEncoder) Clone() zapcore.Encoder {
encoderClone := enc.Encoder.Clone()
return &consoleHexEncoder{Encoder: encoderClone}
}
func RegisterConsoleHexEncoder() error {
var err error
registerConsoleHexEncodeOnce.Do(func() {
err = zap.RegisterEncoder("console-hex", func(cfg zapcore.EncoderConfig) (zapcore.Encoder, error) {
return NewConsoleHexEncoder(cfg), nil
})
})
return err
}