public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use infra/log instead of slog in pkg/storage/unified (#114292)

Browse Source 
Use infra/log instead of slog. Use log.FromContext to add contextual info to log messages.
This commit is contained in:
Peter Štibraný
2025-11-21 14:38:09 +01:00
committed by GitHub
parent c0f6d90971
commit def4c644ec
8 changed files with 40 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/storage/unified/resource/server.go
+7 -6
View File
@@ -5,7 +5,6 @@ import (
"encoding/json"
"fmt"
"iter"
"log/slog"
"net/http"
"sync"
"sync/atomic"
@@ -24,6 +23,7 @@ import (
"github.com/grafana/grafana/pkg/apimachinery/utils"
"github.com/grafana/grafana/pkg/apimachinery/validation"
"github.com/grafana/grafana/pkg/infra/log"
secrets "github.com/grafana/grafana/pkg/registry/apis/secret/contracts"
"github.com/grafana/grafana/pkg/storage/unified/resourcepb"
"github.com/grafana/grafana/pkg/util/scheduler"
@@ -320,7 +320,7 @@ func NewResourceServer(opts ResourceServerOptions) (*server, error) {
}
}
logger := slog.Default().With("logger", "resource-server")
logger := log.New("resource-server")
// Make this cancelable
ctx, cancel := context.WithCancel(context.Background())
@@ -366,7 +366,7 @@ func NewResourceServer(opts ResourceServerOptions) (*server, error) {
var _ ResourceServer = &server{}
type server struct {
log *slog.Logger
log log.Logger
backend StorageBackend
blob BlobSupport
secure secrets.InlineSecureValueSupport
@@ -470,14 +470,15 @@ func (s *server) newEvent(ctx context.Context, user claims.AuthInfo, key *resour
return nil, AsErrorResult(err)
}
l := s.log.FromContext(ctx)
if obj.GetUID() == "" {
// TODO! once https://github.com/grafana/grafana/pull/96086 is deployed everywhere
// return nil, NewBadRequestError("object is missing UID")
s.log.Error("object is missing UID", "key", key)
l.Error("object is missing UID", "key", key)
}
if obj.GetResourceVersion() != "" {
s.log.Error("object must not include a resource version", "key", key)
l.Error("object must not include a resource version", "key", key)
}
// Make sure the command labels are not saved
@@ -694,7 +695,7 @@ func (s *server) create(ctx context.Context, user claims.AuthInfo, req *resource
if err != nil {
rsp.Error = AsErrorResult(err)
}
s.log.Debug("server.WriteEvent", "type", event.Type, "rv", rsp.ResourceVersion, "previousRV", event.PreviousRV, "group", event.Key.Group, "namespace", event.Key.Namespace, "name", event.Key.Name, "resource", event.Key.Resource)
s.log.FromContext(ctx).Debug("server.WriteEvent", "type", event.Type, "rv", rsp.ResourceVersion, "previousRV", event.PreviousRV, "group", event.Key.Group, "namespace", event.Key.Namespace, "name", event.Key.Name, "resource", event.Key.Resource)
return rsp, nil
}