Bumps the go-deps group with 10 updates: | Package | From | To | | --- | --- | --- | | [cloud.google.com/go/compute](https://github.com/googleapis/google-cloud-go) | `1.23.3` | `1.23.4` | | [cloud.google.com/go/storage](https://github.com/googleapis/google-cloud-go) | `1.36.0` | `1.37.0` | | [github.com/Azure/azure-sdk-for-go/sdk/azidentity](https://github.com/Azure/azure-sdk-for-go) | `1.4.0` | `1.5.1` | | [github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute/v5](https://github.com/Azure/azure-sdk-for-go) | `5.3.0` | `5.5.0` | | [github.com/aws/aws-sdk-go](https://github.com/aws/aws-sdk-go) | `1.50.0` | `1.50.8` | | [github.com/google/uuid](https://github.com/google/uuid) | `1.5.0` | `1.6.0` | | [github.com/jackc/pgtype](https://github.com/jackc/pgtype) | `1.14.0` | `1.14.1` | | [github.com/openshift-online/ocm-sdk-go](https://github.com/openshift-online/ocm-sdk-go) | `0.1.390` | `0.1.398` | | [github.com/osbuild/images](https://github.com/osbuild/images) | `0.33.0` | `0.34.0` | | [google.golang.org/api](https://github.com/googleapis/google-api-go-client) | `0.160.0` | `0.161.0` | Updates `cloud.google.com/go/compute` from 1.23.3 to 1.23.4 - [Release notes](https://github.com/googleapis/google-cloud-go/releases) - [Changelog](https://github.com/googleapis/google-cloud-go/blob/main/documentai/CHANGES.md) - [Commits](https://github.com/googleapis/google-cloud-go/compare/compute/v1.23.3...compute/v1.23.4) Updates `cloud.google.com/go/storage` from 1.36.0 to 1.37.0 - [Release notes](https://github.com/googleapis/google-cloud-go/releases) - [Changelog](https://github.com/googleapis/google-cloud-go/blob/main/CHANGES.md) - [Commits](https://github.com/googleapis/google-cloud-go/compare/pubsub/v1.36.0...spanner/v1.37.0) Updates `github.com/Azure/azure-sdk-for-go/sdk/azidentity` from 1.4.0 to 1.5.1 - [Release notes](https://github.com/Azure/azure-sdk-for-go/releases) - [Changelog](https://github.com/Azure/azure-sdk-for-go/blob/main/documentation/release.md) - [Commits](https://github.com/Azure/azure-sdk-for-go/compare/sdk/azcore/v1.4.0...sdk/internal/v1.5.1) Updates `github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute/v5` from 5.3.0 to 5.5.0 - [Release notes](https://github.com/Azure/azure-sdk-for-go/releases) - [Changelog](https://github.com/Azure/azure-sdk-for-go/blob/main/documentation/release.md) - [Commits](https://github.com/Azure/azure-sdk-for-go/compare/sdk/resourcemanager/compute/armcompute/v5.3.0...sdk/resourcemanager/compute/armcompute/v5.5.0) Updates `github.com/aws/aws-sdk-go` from 1.50.0 to 1.50.8 - [Release notes](https://github.com/aws/aws-sdk-go/releases) - [Commits](https://github.com/aws/aws-sdk-go/compare/v1.50.0...v1.50.8) Updates `github.com/google/uuid` from 1.5.0 to 1.6.0 - [Release notes](https://github.com/google/uuid/releases) - [Changelog](https://github.com/google/uuid/blob/master/CHANGELOG.md) - [Commits](https://github.com/google/uuid/compare/v1.5.0...v1.6.0) Updates `github.com/jackc/pgtype` from 1.14.0 to 1.14.1 - [Changelog](https://github.com/jackc/pgtype/blob/master/CHANGELOG.md) - [Commits](https://github.com/jackc/pgtype/compare/v1.14.0...v1.14.1) Updates `github.com/openshift-online/ocm-sdk-go` from 0.1.390 to 0.1.398 - [Release notes](https://github.com/openshift-online/ocm-sdk-go/releases) - [Changelog](https://github.com/openshift-online/ocm-sdk-go/blob/main/CHANGES.md) - [Commits](https://github.com/openshift-online/ocm-sdk-go/compare/v0.1.390...v0.1.398) Updates `github.com/osbuild/images` from 0.33.0 to 0.34.0 - [Release notes](https://github.com/osbuild/images/releases) - [Commits](https://github.com/osbuild/images/compare/v0.33.0...v0.34.0) Updates `google.golang.org/api` from 0.160.0 to 0.161.0 - [Release notes](https://github.com/googleapis/google-api-go-client/releases) - [Changelog](https://github.com/googleapis/google-api-go-client/blob/main/CHANGES.md) - [Commits](https://github.com/googleapis/google-api-go-client/compare/v0.160.0...v0.161.0) --- updated-dependencies: - dependency-name: cloud.google.com/go/compute dependency-type: direct:production update-type: version-update:semver-patch dependency-group: go-deps - dependency-name: cloud.google.com/go/storage dependency-type: direct:production update-type: version-update:semver-minor dependency-group: go-deps - dependency-name: github.com/Azure/azure-sdk-for-go/sdk/azidentity dependency-type: direct:production update-type: version-update:semver-minor dependency-group: go-deps - dependency-name: github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute/v5 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: go-deps - dependency-name: github.com/aws/aws-sdk-go dependency-type: direct:production update-type: version-update:semver-patch dependency-group: go-deps - dependency-name: github.com/google/uuid dependency-type: direct:production update-type: version-update:semver-minor dependency-group: go-deps - dependency-name: github.com/jackc/pgtype dependency-type: direct:production update-type: version-update:semver-patch dependency-group: go-deps - dependency-name: github.com/openshift-online/ocm-sdk-go dependency-type: direct:production update-type: version-update:semver-patch dependency-group: go-deps - dependency-name: github.com/osbuild/images dependency-type: direct:production update-type: version-update:semver-minor dependency-group: go-deps - dependency-name: google.golang.org/api dependency-type: direct:production update-type: version-update:semver-minor dependency-group: go-deps ... Signed-off-by: dependabot[bot] <support@github.com>
192 lines
5.6 KiB
Go
192 lines
5.6 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 logr
|
|
|
|
import (
|
|
"context"
|
|
"log/slog"
|
|
)
|
|
|
|
type slogHandler struct {
|
|
// May be nil, in which case all logs get discarded.
|
|
sink LogSink
|
|
// Non-nil if sink is non-nil and implements SlogSink.
|
|
slogSink SlogSink
|
|
|
|
// groupPrefix collects values from WithGroup calls. It gets added as
|
|
// prefix to value keys when handling a log record.
|
|
groupPrefix string
|
|
|
|
// levelBias can be set when constructing the handler to influence the
|
|
// slog.Level of log records. A positive levelBias reduces the
|
|
// slog.Level value. slog has no API to influence this value after the
|
|
// handler got created, so it can only be set indirectly through
|
|
// Logger.V.
|
|
levelBias slog.Level
|
|
}
|
|
|
|
var _ slog.Handler = &slogHandler{}
|
|
|
|
// groupSeparator is used to concatenate WithGroup names and attribute keys.
|
|
const groupSeparator = "."
|
|
|
|
// GetLevel is used for black box unit testing.
|
|
func (l *slogHandler) GetLevel() slog.Level {
|
|
return l.levelBias
|
|
}
|
|
|
|
func (l *slogHandler) Enabled(_ context.Context, level slog.Level) bool {
|
|
return l.sink != nil && (level >= slog.LevelError || l.sink.Enabled(l.levelFromSlog(level)))
|
|
}
|
|
|
|
func (l *slogHandler) Handle(ctx context.Context, record slog.Record) error {
|
|
if l.slogSink != nil {
|
|
// Only adjust verbosity level of log entries < slog.LevelError.
|
|
if record.Level < slog.LevelError {
|
|
record.Level -= l.levelBias
|
|
}
|
|
return l.slogSink.Handle(ctx, record)
|
|
}
|
|
|
|
// No need to check for nil sink here because Handle will only be called
|
|
// when Enabled returned true.
|
|
|
|
kvList := make([]any, 0, 2*record.NumAttrs())
|
|
record.Attrs(func(attr slog.Attr) bool {
|
|
kvList = attrToKVs(attr, l.groupPrefix, kvList)
|
|
return true
|
|
})
|
|
if record.Level >= slog.LevelError {
|
|
l.sinkWithCallDepth().Error(nil, record.Message, kvList...)
|
|
} else {
|
|
level := l.levelFromSlog(record.Level)
|
|
l.sinkWithCallDepth().Info(level, record.Message, kvList...)
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// sinkWithCallDepth adjusts the stack unwinding so that when Error or Info
|
|
// are called by Handle, code in slog gets skipped.
|
|
//
|
|
// This offset currently (Go 1.21.0) works for calls through
|
|
// slog.New(ToSlogHandler(...)). There's no guarantee that the call
|
|
// chain won't change. Wrapping the handler will also break unwinding. It's
|
|
// still better than not adjusting at all....
|
|
//
|
|
// This cannot be done when constructing the handler because FromSlogHandler needs
|
|
// access to the original sink without this adjustment. A second copy would
|
|
// work, but then WithAttrs would have to be called for both of them.
|
|
func (l *slogHandler) sinkWithCallDepth() LogSink {
|
|
if sink, ok := l.sink.(CallDepthLogSink); ok {
|
|
return sink.WithCallDepth(2)
|
|
}
|
|
return l.sink
|
|
}
|
|
|
|
func (l *slogHandler) WithAttrs(attrs []slog.Attr) slog.Handler {
|
|
if l.sink == nil || len(attrs) == 0 {
|
|
return l
|
|
}
|
|
|
|
clone := *l
|
|
if l.slogSink != nil {
|
|
clone.slogSink = l.slogSink.WithAttrs(attrs)
|
|
clone.sink = clone.slogSink
|
|
} else {
|
|
kvList := make([]any, 0, 2*len(attrs))
|
|
for _, attr := range attrs {
|
|
kvList = attrToKVs(attr, l.groupPrefix, kvList)
|
|
}
|
|
clone.sink = l.sink.WithValues(kvList...)
|
|
}
|
|
return &clone
|
|
}
|
|
|
|
func (l *slogHandler) WithGroup(name string) slog.Handler {
|
|
if l.sink == nil {
|
|
return l
|
|
}
|
|
if name == "" {
|
|
// slog says to inline empty groups
|
|
return l
|
|
}
|
|
clone := *l
|
|
if l.slogSink != nil {
|
|
clone.slogSink = l.slogSink.WithGroup(name)
|
|
clone.sink = clone.slogSink
|
|
} else {
|
|
clone.groupPrefix = addPrefix(clone.groupPrefix, name)
|
|
}
|
|
return &clone
|
|
}
|
|
|
|
// attrToKVs appends a slog.Attr to a logr-style kvList. It handle slog Groups
|
|
// and other details of slog.
|
|
func attrToKVs(attr slog.Attr, groupPrefix string, kvList []any) []any {
|
|
attrVal := attr.Value.Resolve()
|
|
if attrVal.Kind() == slog.KindGroup {
|
|
groupVal := attrVal.Group()
|
|
grpKVs := make([]any, 0, 2*len(groupVal))
|
|
prefix := groupPrefix
|
|
if attr.Key != "" {
|
|
prefix = addPrefix(groupPrefix, attr.Key)
|
|
}
|
|
for _, attr := range groupVal {
|
|
grpKVs = attrToKVs(attr, prefix, grpKVs)
|
|
}
|
|
kvList = append(kvList, grpKVs...)
|
|
} else if attr.Key != "" {
|
|
kvList = append(kvList, addPrefix(groupPrefix, attr.Key), attrVal.Any())
|
|
}
|
|
|
|
return kvList
|
|
}
|
|
|
|
func addPrefix(prefix, name string) string {
|
|
if prefix == "" {
|
|
return name
|
|
}
|
|
if name == "" {
|
|
return prefix
|
|
}
|
|
return prefix + groupSeparator + name
|
|
}
|
|
|
|
// levelFromSlog adjusts the level by the logger's verbosity and negates it.
|
|
// It ensures that the result is >= 0. This is necessary because the result is
|
|
// passed to a LogSink and that API did not historically document whether
|
|
// levels could be negative or what that meant.
|
|
//
|
|
// Some example usage:
|
|
//
|
|
// logrV0 := getMyLogger()
|
|
// logrV2 := logrV0.V(2)
|
|
// slogV2 := slog.New(logr.ToSlogHandler(logrV2))
|
|
// slogV2.Debug("msg") // =~ logrV2.V(4) =~ logrV0.V(6)
|
|
// slogV2.Info("msg") // =~ logrV2.V(0) =~ logrV0.V(2)
|
|
// slogv2.Warn("msg") // =~ logrV2.V(-4) =~ logrV0.V(0)
|
|
func (l *slogHandler) levelFromSlog(level slog.Level) int {
|
|
result := -level
|
|
result += l.levelBias // in case the original Logger had a V level
|
|
if result < 0 {
|
|
result = 0 // because LogSink doesn't expect negative V levels
|
|
}
|
|
return int(result)
|
|
}
|