From 0a7353dab056a5e69c8b01aa42051e6d1ea5ddfd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Pereira?= Date: Thu, 12 Oct 2023 14:05:01 +0100 Subject: [PATCH] Fix tests --- .../grafana-pyroscope-datasource/instance_test.go | 6 +++++- .../pyroscopeClient_test.go | 2 ++ pkg/tsdb/grafana-pyroscope-datasource/query_test.go | 2 ++ pkg/tsdb/parca/plugin_test.go | 6 +++++- pkg/tsdb/parca/query_test.go | 2 ++ pkg/tsdb/tempo/search_stream_test.go | 13 +++++++++---- 6 files changed, 25 insertions(+), 6 deletions(-) diff --git a/pkg/tsdb/grafana-pyroscope-datasource/instance_test.go b/pkg/tsdb/grafana-pyroscope-datasource/instance_test.go index 5d60d65b6ee..0689fdeff7f 100644 --- a/pkg/tsdb/grafana-pyroscope-datasource/instance_test.go +++ b/pkg/tsdb/grafana-pyroscope-datasource/instance_test.go @@ -5,12 +5,15 @@ import ( "testing" "github.com/grafana/grafana-plugin-sdk-go/backend" + "github.com/grafana/grafana/pkg/infra/tracing" "github.com/stretchr/testify/require" ) // This is where the tests for the datasource backend live. func Test_QueryData(t *testing.T) { - ds := PyroscopeDatasource{} + ds := PyroscopeDatasource{ + tracer: tracing.InitializeTracerForTest(), + } resp, err := ds.QueryData( context.Background(), @@ -32,6 +35,7 @@ func Test_QueryData(t *testing.T) { func Test_CallResource(t *testing.T) { ds := &PyroscopeDatasource{ client: &FakeClient{}, + tracer: tracing.InitializeTracerForTest(), } t.Run("series resource", func(t *testing.T) { diff --git a/pkg/tsdb/grafana-pyroscope-datasource/pyroscopeClient_test.go b/pkg/tsdb/grafana-pyroscope-datasource/pyroscopeClient_test.go index 28c39e2108c..c4835063f49 100644 --- a/pkg/tsdb/grafana-pyroscope-datasource/pyroscopeClient_test.go +++ b/pkg/tsdb/grafana-pyroscope-datasource/pyroscopeClient_test.go @@ -5,6 +5,7 @@ import ( "testing" "github.com/bufbuild/connect-go" + "github.com/grafana/grafana/pkg/infra/tracing" googlev1 "github.com/grafana/pyroscope/api/gen/proto/go/google/v1" querierv1 "github.com/grafana/pyroscope/api/gen/proto/go/querier/v1" typesv1 "github.com/grafana/pyroscope/api/gen/proto/go/types/v1" @@ -15,6 +16,7 @@ func Test_PyroscopeClient(t *testing.T) { connectClient := &FakePyroscopeConnectClient{} client := &PyroscopeClient{ connectClient: connectClient, + tracer: tracing.InitializeTracerForTest(), } t.Run("GetSeries", func(t *testing.T) { diff --git a/pkg/tsdb/grafana-pyroscope-datasource/query_test.go b/pkg/tsdb/grafana-pyroscope-datasource/query_test.go index 1ed8aa723a2..7645e839781 100644 --- a/pkg/tsdb/grafana-pyroscope-datasource/query_test.go +++ b/pkg/tsdb/grafana-pyroscope-datasource/query_test.go @@ -7,6 +7,7 @@ import ( "github.com/grafana/grafana-plugin-sdk-go/backend" "github.com/grafana/grafana-plugin-sdk-go/data" + "github.com/grafana/grafana/pkg/infra/tracing" "github.com/stretchr/testify/require" ) @@ -15,6 +16,7 @@ func Test_query(t *testing.T) { client := &FakeClient{} ds := &PyroscopeDatasource{ client: client, + tracer: tracing.InitializeTracerForTest(), } pCtx := backend.PluginContext{ diff --git a/pkg/tsdb/parca/plugin_test.go b/pkg/tsdb/parca/plugin_test.go index 0ee06fc903f..6d14ac5cba3 100644 --- a/pkg/tsdb/parca/plugin_test.go +++ b/pkg/tsdb/parca/plugin_test.go @@ -5,12 +5,15 @@ import ( "testing" "github.com/grafana/grafana-plugin-sdk-go/backend" + "github.com/grafana/grafana/pkg/infra/tracing" "github.com/stretchr/testify/require" ) // This is where the tests for the datasource backend live. func Test_QueryData(t *testing.T) { - ds := ParcaDatasource{} + ds := ParcaDatasource{ + tracer: tracing.InitializeTracerForTest(), + } resp, err := ds.QueryData( context.Background(), @@ -35,6 +38,7 @@ func Test_QueryData(t *testing.T) { func Test_CallResource(t *testing.T) { ds := &ParcaDatasource{ client: &FakeClient{}, + tracer: tracing.InitializeTracerForTest(), } t.Run("labels resource", func(t *testing.T) { diff --git a/pkg/tsdb/parca/query_test.go b/pkg/tsdb/parca/query_test.go index f4a035f0449..c97e35cfde3 100644 --- a/pkg/tsdb/parca/query_test.go +++ b/pkg/tsdb/parca/query_test.go @@ -11,6 +11,7 @@ import ( "github.com/bufbuild/connect-go" "github.com/grafana/grafana-plugin-sdk-go/backend" "github.com/grafana/grafana-plugin-sdk-go/data" + "github.com/grafana/grafana/pkg/infra/tracing" "github.com/stretchr/testify/require" "google.golang.org/protobuf/types/known/timestamppb" ) @@ -19,6 +20,7 @@ import ( func Test_query(t *testing.T) { ds := &ParcaDatasource{ client: &FakeClient{}, + tracer: tracing.InitializeTracerForTest(), } dataQuery := backend.DataQuery{ diff --git a/pkg/tsdb/tempo/search_stream_test.go b/pkg/tsdb/tempo/search_stream_test.go index 035d46da9c5..23b89d5135a 100644 --- a/pkg/tsdb/tempo/search_stream_test.go +++ b/pkg/tsdb/tempo/search_stream_test.go @@ -12,16 +12,19 @@ import ( "github.com/grafana/grafana-plugin-sdk-go/backend" "github.com/grafana/grafana-plugin-sdk-go/data" "github.com/grafana/grafana/pkg/infra/log" + "github.com/grafana/grafana/pkg/infra/tracing" "github.com/grafana/grafana/pkg/tsdb/tempo/kinds/dataquery" "github.com/grafana/tempo/pkg/tempopb" "google.golang.org/grpc/metadata" ) func TestProcessStream_ValidInput_ReturnsNoError(t *testing.T) { - service := &Service{} + service := &Service{ + tracer: tracing.InitializeTracerForTest(), + } searchClient := &mockStreamer{} streamSender := &mockSender{} - err := service.processStream(searchClient, streamSender) + err := service.processStream(context.Background(), searchClient, streamSender) if err != nil { t.Errorf("Expected no error, but got %s", err) } @@ -30,10 +33,11 @@ func TestProcessStream_InvalidInput_ReturnsError(t *testing.T) { logger := log.New("tsdb.tempo.test") service := &Service{ logger: logger, + tracer: tracing.InitializeTracerForTest(), } searchClient := &mockStreamer{err: errors.New("invalid input")} streamSender := &mockSender{} - err := service.processStream(searchClient, streamSender) + err := service.processStream(context.Background(), searchClient, streamSender) if err != nil { if !strings.Contains(err.Error(), "invalid input") { t.Errorf("Expected error message to contain 'invalid input', but got %s", err) @@ -44,6 +48,7 @@ func TestProcessStream_ValidInput_ReturnsExpectedOutput(t *testing.T) { logger := log.New("tsdb.tempo.test") service := &Service{ logger: logger, + tracer: tracing.InitializeTracerForTest(), } searchClient := &mockStreamer{ tracingMetadata: []*tempopb.TraceSearchMetadata{ @@ -109,7 +114,7 @@ func TestProcessStream_ValidInput_ReturnsExpectedOutput(t *testing.T) { }, } streamSender := &mockSender{} - err := service.processStream(searchClient, streamSender) + err := service.processStream(context.Background(), searchClient, streamSender) if err != nil { t.Errorf("Expected no error, but got %s", err) return