166b71757b
The new zapr adds support for slog. The new zap has various improvements. It no longer depends on go.uber.org/atomic which enables dropping it from the Kubernetes dependencies. github.com/pkg/errors is also no longer needed.
49 lines
1.4 KiB
Go
49 lines
1.4 KiB
Go
//go:build go1.21
|
|
// +build go1.21
|
|
|
|
/*
|
|
Copyright 2023 The logr Authors.
|
|
|
|
Licensed under the Apache License, Version 2.0 (the "License");
|
|
you may not use this file except in compliance with the License.
|
|
You may obtain a copy of the License at
|
|
|
|
http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
Unless required by applicable law or agreed to in writing, software
|
|
distributed under the License is distributed on an "AS IS" BASIS,
|
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
See the License for the specific language governing permissions and
|
|
limitations under the License.
|
|
*/
|
|
|
|
package zapr
|
|
|
|
import (
|
|
"log/slog"
|
|
|
|
"github.com/go-logr/logr"
|
|
"go.uber.org/zap"
|
|
"go.uber.org/zap/zapcore"
|
|
)
|
|
|
|
func zapIt(field string, val interface{}) zap.Field {
|
|
switch valTyped := val.(type) {
|
|
case logr.Marshaler:
|
|
// Handle types that implement logr.Marshaler: log the replacement
|
|
// object instead of the original one.
|
|
field, val = invokeMarshaler(field, valTyped)
|
|
case slog.LogValuer:
|
|
// The same for slog.LogValuer. We let slog.Value handle
|
|
// potential panics and recursion.
|
|
val = slog.AnyValue(val).Resolve()
|
|
}
|
|
if slogValue, ok := val.(slog.Value); ok {
|
|
return zap.Inline(zapcore.ObjectMarshalerFunc(func(enc zapcore.ObjectEncoder) error {
|
|
encodeSlog(enc, slog.Attr{Key: field, Value: slogValue})
|
|
return nil
|
|
}))
|
|
}
|
|
return zap.Any(field, val)
|
|
}
|