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

fix conflict changes

Browse Source
This commit is contained in:
Jocelyn Collado-Kuri
2026-01-12 13:02:57 -08:00
parent 0809124b11
commit ff10b085f6
3 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/tsdb/tempo/metrics_stream.go
+2 -4
View File
@@ -7,13 +7,11 @@ import (
"fmt"
"io"
"github.com/grafana/grafana/pkg/tsdb/tempo/traceql"
stream_utils "github.com/grafana/grafana/pkg/tsdb/tempo/utils"
"google.golang.org/grpc/metadata"
"github.com/grafana/grafana-plugin-sdk-go/backend"
"github.com/grafana/grafana-plugin-sdk-go/backend/tracing"
"github.com/grafana/grafana/pkg/tsdb/tempo/kinds/dataquery"
"github.com/grafana/grafana/pkg/tsdb/tempo/traceql"
stream_utils "github.com/grafana/grafana/pkg/tsdb/tempo/utils"
"github.com/grafana/tempo/pkg/tempopb"
"go.opentelemetry.io/otel/attribute"
"go.opentelemetry.io/otel/codes"
pkg/tsdb/tempo/search_stream.go
-2
View File
@@ -7,8 +7,6 @@ import (
"fmt"
"io"
"google.golang.org/grpc/metadata"
"github.com/grafana/grafana-plugin-sdk-go/backend"
"github.com/grafana/grafana-plugin-sdk-go/backend/tracing"
"github.com/grafana/grafana-plugin-sdk-go/data"
pkg/tsdb/tempo/stream_handler.go
+4 -4
View File
@@ -50,8 +50,8 @@ func (s *Service) RunStream(ctx context.Context, request *backend.RunStreamReque
request.Headers = headers
if strings.HasPrefix(request.Path, SearchPathPrefix) {
if err != nil {
return backend.DownstreamErrorf("failed to get datasource information: %w", err)
if dsInfoErr != nil {
return backend.DownstreamErrorf("failed to get datasource information: %w", dsInfoErr)
}
if err = s.runSearchStream(ctx, request, sender, tempoDatasource); err != nil {
return sendError(err, sender)
@@ -60,8 +60,8 @@ func (s *Service) RunStream(ctx context.Context, request *backend.RunStreamReque
}
}
if strings.HasPrefix(request.Path, MetricsPathPrefix) {
if err != nil {
return backend.DownstreamErrorf("failed to get datasource information: %w", err)
if dsInfoErr != nil {
return backend.DownstreamErrorf("failed to get datasource information: %w", dsInfoErr)
}
if err = s.runMetricsStream(ctx, request, sender, tempoDatasource); err != nil {
return sendError(err, sender)