Enable API

grafana · May 10, 2023 · bc1748e · bc1748e
1 parent 2fc79d6
commit bc1748e
Show file tree

Hide file tree

Showing 7 changed files with 621 additions and 303 deletions.
diff --git a/cmd/tempo/app/modules.go b/cmd/tempo/app/modules.go
@@ -212,6 +212,9 @@ func (t *App) initGenerator() (services.Service, error) {
 	}
 	t.generator = genSvc
 
+	spanStatsHandler := t.HTTPAuthMiddleware.Wrap(http.HandlerFunc(t.generator.SpanSummaryHandler))
+	t.Server.HTTP.Handle(path.Join(api.PathPrefixGenerator, addHTTPAPIPrefix(&t.cfg, api.PathSpanMetrics)), spanStatsHandler)
+
 	tempopb.RegisterMetricsGeneratorServer(t.Server.GRPC, t.generator)
 
 	return t.generator, nil

diff --git a/modules/generator/generator.go b/modules/generator/generator.go
@@ -334,5 +334,5 @@ func (g *Generator) SpanMetrics(ctx context.Context, req *tempopb.SpanMetricsReq
 		return nil, err
 	}
 
-	return instance.spanMetrics(ctx, req)
+	return instance.spanMetricsFromLocalBlocks(ctx, req)
 }
diff --git a/modules/generator/instance.go b/modules/generator/instance.go
@@ -364,8 +364,7 @@ func (i *instance) preprocessSpans(req *tempopb.PushSpansRequest) {
 	i.updatePushMetrics(size, spanCount, expiredSpanCount)
 }
 
-func (i *instance) spanMetrics(ctx context.Context, req *tempopb.SpanMetricsRequest) (resp *tempopb.SpanMetricsResponse, err error) {
-
+func (i *instance) spanMetricsFromLocalBlocks(ctx context.Context, req *tempopb.SpanMetricsRequest) (resp *tempopb.SpanMetricsResponse, err error) {
 	for _, processor := range i.processors {
 		switch p := processor.(type) {
 		case *localblocks.Processor:

diff --git a/modules/generator/processor/localblocks/processor.go b/modules/generator/processor/localblocks/processor.go
@@ -247,6 +247,9 @@ func (p *Processor) completeBlock() error {
 func (p *Processor) GetMetrics(ctx context.Context, req *tempopb.SpanMetricsRequest) (*tempopb.SpanMetricsResponse, error) {
 
 	fetcher := traceql.NewSpansetFetcherWrapper(func(ctx context.Context, req traceql.FetchSpansRequest) (traceql.FetchSpansResponse, error) {
+		if p.headBlock == nil {
+			return traceql.FetchSpansResponse{}, fmt.Errorf("head block is nil")
+		}
 		return p.headBlock.Fetch(ctx, req, common.DefaultSearchOptions())
 	})
 

diff --git a/pkg/api/http.go b/pkg/api/http.go
@@ -66,7 +66,7 @@ const (
 	PathSearchTagValues = "/api/search/tag/{" + muxVarTagName + "}/values"
 	PathEcho            = "/api/echo"
 	PathUsageStats      = "/status/usage-stats"
-	PathSpanSummary     = "/api/span-summary"
+	PathSpanMetrics     = "/api/span-metrics"
 
 	PathSearchTagValuesV2 = "/api/v2/search/tag/{" + muxVarTagName + "}/values"
 	PathSearchTagsV2      = "/api/v2/search/tags"