mirror of
https://github.com/hanzo-fi/go-libs.git
synced 2026-10-30 20:53:44 +00:00
de61635b81
* refactor: move all packages under pkg/ for v5 Move all 13 top-level Go packages into pkg/ for a cleaner repository structure. All internal import paths updated from github.com/formancehq/go-libs/v5/<pkg> to github.com/formancehq/go-libs/v5/pkg/<pkg>. Also includes cleanup: - Fix .golangci.yml stale v4 CircuitBreaker path - Replace deprecated str.Contains with stdlib slices.Contains - Update TODO(v4) markers to TODO - Delete stale coverage.txt - Fix pgtesting timeout not being propagated to docker pool - Update docs/ARCHITECTURE.md to reflect new structure Co-Authored-By: Claude Opus 4.6 <[email protected]> * chore: remove compatibility aliases, unused params, and stub files - Remove unused type aliases (Authenticator, KeySet) from authnfx - Remove unused `debug` parameter from S3ModuleFromFlags - Delete comment-only stub files in messaging/publish/circuit/ Co-Authored-By: Claude Opus 4.6 <[email protected]> * chore: rename cli.go to flags.go for consistency Standardize naming across all packages: cli.go -> flags.go since these files all serve the same purpose (flag definitions). Co-Authored-By: Claude Opus 4.6 <[email protected]> * chore: rename * chore(deps): update all dependencies Co-Authored-By: Claude Opus 4.6 <[email protected]> * fix: resolve package name mismatches in generated mocks Generated mock files had stale package names from before the pkg/ move, causing import cycles and build failures with --build-tags it. Co-Authored-By: Claude Opus 4.6 <[email protected]> --------- Co-authored-by: Claude Opus 4.6 <[email protected]>
68 lines
2.0 KiB
Go
68 lines
2.0 KiB
Go
package logging
|
|
|
|
// https://github.com/garsue/watermillzap/blob/master/adapter.go
|
|
import (
|
|
"github.com/ThreeDotsLabs/watermill"
|
|
"go.uber.org/zap"
|
|
)
|
|
|
|
// Logger implements watermill.LoggerAdapter with *zap.Logger.
|
|
type ZapLoggerAdapter struct {
|
|
backend *zap.Logger
|
|
fields watermill.LogFields
|
|
}
|
|
|
|
// NewLogger returns new watermill.LoggerAdapter using passed *zap.Logger as backend.
|
|
func NewZapLoggerAdapter(z *zap.Logger) watermill.LoggerAdapter {
|
|
return &ZapLoggerAdapter{backend: z}
|
|
}
|
|
|
|
// Error writes error log with message, error and some fields.
|
|
func (l *ZapLoggerAdapter) Error(msg string, err error, fields watermill.LogFields) {
|
|
fields = l.fields.Add(fields)
|
|
fs := make([]zap.Field, 0, len(fields)+1)
|
|
fs = append(fs, zap.Error(err))
|
|
for k, v := range fields {
|
|
fs = append(fs, zap.Any(k, v))
|
|
}
|
|
l.backend.Error(msg, fs...)
|
|
}
|
|
|
|
// Info writes info log with message and some fields.
|
|
func (l *ZapLoggerAdapter) Info(msg string, fields watermill.LogFields) {
|
|
fields = l.fields.Add(fields)
|
|
fs := make([]zap.Field, 0, len(fields)+1)
|
|
for k, v := range fields {
|
|
fs = append(fs, zap.Any(k, v))
|
|
}
|
|
l.backend.Info(msg, fs...)
|
|
}
|
|
|
|
// Debug writes debug log with message and some fields.
|
|
func (l *ZapLoggerAdapter) Debug(msg string, fields watermill.LogFields) {
|
|
fields = l.fields.Add(fields)
|
|
fs := make([]zap.Field, 0, len(fields)+1)
|
|
for k, v := range fields {
|
|
fs = append(fs, zap.Any(k, v))
|
|
}
|
|
l.backend.Debug(msg, fs...)
|
|
}
|
|
|
|
// Trace writes debug log instead of trace log because zap does not support trace level logging.
|
|
func (l *ZapLoggerAdapter) Trace(msg string, fields watermill.LogFields) {
|
|
fields = l.fields.Add(fields)
|
|
fs := make([]zap.Field, 0, len(fields)+1)
|
|
for k, v := range fields {
|
|
fs = append(fs, zap.Any(k, v))
|
|
}
|
|
l.backend.Debug(msg, fs...)
|
|
}
|
|
|
|
// With returns new LoggerAdapter with passed fields.
|
|
func (l *ZapLoggerAdapter) With(fields watermill.LogFields) watermill.LoggerAdapter {
|
|
return &ZapLoggerAdapter{
|
|
backend: l.backend,
|
|
fields: l.fields.Add(fields),
|
|
}
|
|
}
|