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

getClientToDistributeRequest: remove logging of selected client, fix logging of error (#110403)

Browse Source
This commit is contained in:
Peter Štibraný
2025-09-01 10:57:25 +00:00
committed by GitHub
parent c4f6e3c710
commit 4475e2ad19
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/storage/unified/resource/search_server_distributor.go
+7 -8
View File
@@ -10,16 +10,17 @@ import (
ringclient "github.com/grafana/dskit/ring/client"
"github.com/grafana/dskit/services"
userutils "github.com/grafana/dskit/user"
"github.com/grafana/grafana/pkg/infra/log"
"github.com/grafana/grafana/pkg/services/featuremgmt"
"github.com/grafana/grafana/pkg/services/grpcserver"
"github.com/grafana/grafana/pkg/setting"
"github.com/grafana/grafana/pkg/storage/unified/resourcepb"
"github.com/prometheus/client_golang/prometheus"
"go.opentelemetry.io/otel/trace"
"google.golang.org/grpc"
"google.golang.org/grpc/health/grpc_health_v1"
"google.golang.org/grpc/metadata"
"github.com/grafana/grafana/pkg/infra/log"
"github.com/grafana/grafana/pkg/services/featuremgmt"
"github.com/grafana/grafana/pkg/services/grpcserver"
"github.com/grafana/grafana/pkg/setting"
"github.com/grafana/grafana/pkg/storage/unified/resourcepb"
)
func ProvideSearchDistributorServer(cfg *setting.Cfg, features featuremgmt.FeatureToggles, registerer prometheus.Registerer, tracer trace.Tracer, ring *ring.Ring, ringClientPool *ringclient.Pool) (grpcserver.Provider, error) {
@@ -164,11 +165,9 @@ func (ds *distributorServer) getClientToDistributeRequest(ctx context.Context, n
md = make(metadata.MD)
}
ds.log.Info("distributing request to ", "methodName", methodName, "instanceId", inst.Id, "namespace", namespace)
err = grpc.SetHeader(ctx, metadata.Pairs("proxied-instance-id", inst.Id))
if err != nil {
ds.log.Debug("error setting grpc header", err, "err")
ds.log.Debug("error setting grpc header", "err", err)
}
return userutils.InjectOrgID(metadata.NewOutgoingContext(ctx, md), namespace), client.(*RingClient).Client, nil