opensource/grafana
1
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-08-02 23:35:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Chore: Turn off apiserver tracing when embedded in Grafana (#94574)

Browse Source 
turn off apiserver tracing when embedded in Grafana to make it reuse Grafana initiated trace context
This commit is contained in:
Yuri Tseretyan
2024-10-10 14:40:16 -04:00
committed by GitHub
parent 79614eabdf
commit 0418a7bc0a
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
pkg/services/apiserver/options/extra.go
View File

@ -4,12 +4,15 @@ import (
"log/slog"
"strconv"
"github.com/grafana/grafana/pkg/infra/log"
"github.com/grafana/grafana/pkg/infra/log/slogadapter"
"github.com/spf13/pflag"
genericfeatures "k8s.io/apiserver/pkg/features"
genericapiserver "k8s.io/apiserver/pkg/server"
utilfeature "k8s.io/apiserver/pkg/util/feature"
"k8s.io/component-base/logs"
"k8s.io/klog/v2"
"github.com/grafana/grafana/pkg/infra/log"
"github.com/grafana/grafana/pkg/infra/log/slogadapter"
)
type ExtraOptions struct {
@ -40,7 +43,11 @@ func (o *ExtraOptions) Validate() []error {
func (o *ExtraOptions) ApplyTo(c *genericapiserver.RecommendedConfig) error {
handler := slogadapter.New(log.New("grafana-apiserver"))
logger := slog.New(handler)
if err := utilfeature.DefaultMutableFeatureGate.SetFromMap(map[string]bool{
string(genericfeatures.APIServerTracing): false,
}); err != nil {
return err
}
klog.SetSlogLogger(logger)
if _, err := logs.GlogSetter(strconv.Itoa(o.Verbosity)); err != nil {
logger.Error("failed to set log level", "error", err)