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>
120 lines
2.9 KiB
Go
120 lines
2.9 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"
|
|
"runtime"
|
|
"time"
|
|
)
|
|
|
|
var (
|
|
_ LogSink = &slogSink{}
|
|
_ CallDepthLogSink = &slogSink{}
|
|
_ Underlier = &slogSink{}
|
|
)
|
|
|
|
// Underlier is implemented by the LogSink returned by NewFromLogHandler.
|
|
type Underlier interface {
|
|
// GetUnderlying returns the Handler used by the LogSink.
|
|
GetUnderlying() slog.Handler
|
|
}
|
|
|
|
const (
|
|
// nameKey is used to log the `WithName` values as an additional attribute.
|
|
nameKey = "logger"
|
|
|
|
// errKey is used to log the error parameter of Error as an additional attribute.
|
|
errKey = "err"
|
|
)
|
|
|
|
type slogSink struct {
|
|
callDepth int
|
|
name string
|
|
handler slog.Handler
|
|
}
|
|
|
|
func (l *slogSink) Init(info RuntimeInfo) {
|
|
l.callDepth = info.CallDepth
|
|
}
|
|
|
|
func (l *slogSink) GetUnderlying() slog.Handler {
|
|
return l.handler
|
|
}
|
|
|
|
func (l *slogSink) WithCallDepth(depth int) LogSink {
|
|
newLogger := *l
|
|
newLogger.callDepth += depth
|
|
return &newLogger
|
|
}
|
|
|
|
func (l *slogSink) Enabled(level int) bool {
|
|
return l.handler.Enabled(context.Background(), slog.Level(-level))
|
|
}
|
|
|
|
func (l *slogSink) Info(level int, msg string, kvList ...interface{}) {
|
|
l.log(nil, msg, slog.Level(-level), kvList...)
|
|
}
|
|
|
|
func (l *slogSink) Error(err error, msg string, kvList ...interface{}) {
|
|
l.log(err, msg, slog.LevelError, kvList...)
|
|
}
|
|
|
|
func (l *slogSink) log(err error, msg string, level slog.Level, kvList ...interface{}) {
|
|
var pcs [1]uintptr
|
|
// skip runtime.Callers, this function, Info/Error, and all helper functions above that.
|
|
runtime.Callers(3+l.callDepth, pcs[:])
|
|
|
|
record := slog.NewRecord(time.Now(), level, msg, pcs[0])
|
|
if l.name != "" {
|
|
record.AddAttrs(slog.String(nameKey, l.name))
|
|
}
|
|
if err != nil {
|
|
record.AddAttrs(slog.Any(errKey, err))
|
|
}
|
|
record.Add(kvList...)
|
|
_ = l.handler.Handle(context.Background(), record)
|
|
}
|
|
|
|
func (l slogSink) WithName(name string) LogSink {
|
|
if l.name != "" {
|
|
l.name += "/"
|
|
}
|
|
l.name += name
|
|
return &l
|
|
}
|
|
|
|
func (l slogSink) WithValues(kvList ...interface{}) LogSink {
|
|
l.handler = l.handler.WithAttrs(kvListToAttrs(kvList...))
|
|
return &l
|
|
}
|
|
|
|
func kvListToAttrs(kvList ...interface{}) []slog.Attr {
|
|
// We don't need the record itself, only its Add method.
|
|
record := slog.NewRecord(time.Time{}, 0, "", 0)
|
|
record.Add(kvList...)
|
|
attrs := make([]slog.Attr, 0, record.NumAttrs())
|
|
record.Attrs(func(attr slog.Attr) bool {
|
|
attrs = append(attrs, attr)
|
|
return true
|
|
})
|
|
return attrs
|
|
}
|