IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

K8s: Add tracer provider to config (#77003)

Browse Source
This commit is contained in:
Todd Treece 2023-10-25 15:19:44 -04:00 committed by GitHub
parent 8d7dfbc7b9
commit bf8af608a7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/infra/tracing/tracing.go
View File

@ -25,6 +25,7 @@ import (
trace "go.opentelemetry.io/otel/trace" trace "go.opentelemetry.io/otel/trace"
"github.com/go-kit/log/level" "github.com/go-kit/log/level"
"github.com/grafana/grafana/pkg/infra/log" "github.com/grafana/grafana/pkg/infra/log"
"github.com/grafana/grafana/pkg/setting" "github.com/grafana/grafana/pkg/setting"
) )
@ -110,6 +111,10 @@ func ParseSettings(cfg *setting.Cfg) (*TracingService, error) {
return ots, err return ots, err
} }
func (ots *TracingService) GetTracerProvider() tracerProvider {
return ots.tracerProvider
}
func TraceIDFromContext(ctx context.Context, requireSampled bool) string { func TraceIDFromContext(ctx context.Context, requireSampled bool) string {
spanCtx := trace.SpanContextFromContext(ctx) spanCtx := trace.SpanContextFromContext(ctx)
if !spanCtx.HasTraceID() || !spanCtx.IsValid() || (requireSampled && !spanCtx.IsSampled()) { if !spanCtx.HasTraceID() || !spanCtx.IsValid() || (requireSampled && !spanCtx.IsSampled()) {

7
pkg/services/grafana-apiserver/service.go
View File

@ -28,6 +28,7 @@ import (
"github.com/grafana/grafana/pkg/api/routing" "github.com/grafana/grafana/pkg/api/routing"
"github.com/grafana/grafana/pkg/infra/appcontext" "github.com/grafana/grafana/pkg/infra/appcontext"
"github.com/grafana/grafana/pkg/infra/tracing"
"github.com/grafana/grafana/pkg/middleware" "github.com/grafana/grafana/pkg/middleware"
"github.com/grafana/grafana/pkg/modules" "github.com/grafana/grafana/pkg/modules"
"github.com/grafana/grafana/pkg/registry" "github.com/grafana/grafana/pkg/registry"
@ -89,6 +90,8 @@ type service struct {
handler web.Handler handler web.Handler
builders []APIGroupBuilder builders []APIGroupBuilder
tracing *tracing.TracingService
authorizer authorizer.Authorizer authorizer authorizer.Authorizer
} }
@ -96,12 +99,14 @@ func ProvideService(
cfg *setting.Cfg, cfg *setting.Cfg,
rr routing.RouteRegister, rr routing.RouteRegister,
authz authorizer.Authorizer, authz authorizer.Authorizer,
tracing *tracing.TracingService,
) (*service, error) { ) (*service, error) {
s := &service{ s := &service{
config: newConfig(cfg), config: newConfig(cfg),
rr: rr, rr: rr,
stopCh: make(chan struct{}), stopCh: make(chan struct{}),
builders: []APIGroupBuilder{}, builders: []APIGroupBuilder{},
tracing: tracing,
authorizer: authz, authorizer: authz,
} }
@ -258,6 +263,8 @@ func (s *service) start(ctx context.Context) error {
return genericapiserver.DefaultBuildHandlerChain(requestHandler, c) return genericapiserver.DefaultBuildHandlerChain(requestHandler, c)
} }
serverConfig.TracerProvider = s.tracing.GetTracerProvider()
// Create the server // Create the server
server, err := serverConfig.Complete().New("grafana-apiserver", genericapiserver.NewEmptyDelegate()) server, err := serverConfig.Complete().New("grafana-apiserver", genericapiserver.NewEmptyDelegate())
if err != nil { if err != nil {