From f3e92fa2b1e0e0821fe8e656452d8025fd673997 Mon Sep 17 00:00:00 2001 From: Afzal <94980910+afzalbin64@users.noreply.github.com> Date: Sun, 30 Jul 2023 17:58:11 +0000 Subject: [PATCH] rmvs unwanted object init Signed-off-by: Afzal <94980910+afzalbin64@users.noreply.github.com> --- plugin/storage/es/spanstore/reader.go | 4 -- plugin/storage/es/spanstore/reader_test.go | 79 +++++++++------------- 2 files changed, 31 insertions(+), 52 deletions(-) diff --git a/plugin/storage/es/spanstore/reader.go b/plugin/storage/es/spanstore/reader.go index f3746c6022b..c124d1391cf 100644 --- a/plugin/storage/es/spanstore/reader.go +++ b/plugin/storage/es/spanstore/reader.go @@ -24,7 +24,6 @@ import ( "time" "github.com/olivere/elastic" - "go.opentelemetry.io/otel" "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/trace" "go.uber.org/zap" @@ -139,9 +138,6 @@ func NewSpanReader(p SpanReaderParams) *SpanReader { if p.UseReadWriteAliases { maxSpanAge = rolloverMaxSpanAge } - if p.Tracer == nil { - p.Tracer = otel.Tracer("eSpanstore.SpanReader") - } return &SpanReader{ client: p.Client, maxSpanAge: maxSpanAge, diff --git a/plugin/storage/es/spanstore/reader_test.go b/plugin/storage/es/spanstore/reader_test.go index a449c8f7738..3d358d8ef10 100644 --- a/plugin/storage/es/spanstore/reader_test.go +++ b/plugin/storage/es/spanstore/reader_test.go @@ -86,12 +86,11 @@ var exampleESSpan = []byte( }`) type spanReaderTest struct { - client *mocks.Client - logger *zap.Logger - logBuffer *testutils.Buffer - exporter *tracetest.InMemoryExporter - tracerCloser func() error - reader *SpanReader + client *mocks.Client + logger *zap.Logger + logBuffer *testutils.Buffer + traceBuffer *tracetest.InMemoryExporter + reader *SpanReader } func tracerProvider() (trace.TracerProvider, *tracetest.InMemoryExporter, func() error) { @@ -111,11 +110,10 @@ func withSpanReader(fn func(r *spanReaderTest)) { tracer, exp, closer := tracerProvider() logger, logBuffer := testutils.NewLogger() r := &spanReaderTest{ - client: client, - logger: logger, - logBuffer: logBuffer, - exporter: exp, - tracerCloser: closer, + client: client, + logger: logger, + logBuffer: logBuffer, + traceBuffer: exp, reader: NewSpanReader(SpanReaderParams{ Client: client, Logger: zap.NewNop(), @@ -126,6 +124,7 @@ func withSpanReader(fn func(r *spanReaderTest)) { MaxDocCount: defaultMaxDocCount, }), } + defer closer() fn(r) } @@ -134,11 +133,10 @@ func withArchiveSpanReader(readAlias bool, fn func(r *spanReaderTest)) { tracer, exp, closer := tracerProvider() logger, logBuffer := testutils.NewLogger() r := &spanReaderTest{ - client: client, - logger: logger, - logBuffer: logBuffer, - exporter: exp, - tracerCloser: closer, + client: client, + logger: logger, + logBuffer: logBuffer, + traceBuffer: exp, reader: NewSpanReader(SpanReaderParams{ Client: client, Logger: zap.NewNop(), @@ -150,6 +148,7 @@ func withArchiveSpanReader(readAlias bool, fn func(r *spanReaderTest)) { UseReadWriteAliases: readAlias, }), } + defer closer() fn(r) } @@ -327,8 +326,7 @@ func TestSpanReader_GetTrace(t *testing.T) { }, nil) trace, err := r.reader.GetTrace(context.Background(), model.NewTraceID(0, 1)) - require.NotEmpty(t, r.exporter.GetSpans(), "Spans recorded") - require.NoError(t, r.tracerCloser()) + require.NotEmpty(t, r.traceBuffer.GetSpans(), "Spans recorded") require.NoError(t, err) require.NotNil(t, trace) @@ -405,8 +403,7 @@ func TestSpanReader_multiRead_followUp_query(t *testing.T) { }, nil) traces, err := r.reader.multiRead(context.Background(), []model.TraceID{{High: 0, Low: 1}, {High: 0, Low: 2}}, date, date) - require.NotEmpty(t, r.exporter.GetSpans(), "Spans recorded") - require.NoError(t, r.tracerCloser()) + require.NotEmpty(t, r.traceBuffer.GetSpans(), "Spans recorded") require.NoError(t, err) require.NotNil(t, traces) require.Len(t, traces, 2) @@ -444,8 +441,7 @@ func TestSpanReader_SearchAfter(t *testing.T) { }, nil).Times(2) trace, err := r.reader.GetTrace(context.Background(), model.NewTraceID(0, 1)) - require.NotEmpty(t, r.exporter.GetSpans(), "Spans recorded") - require.NoError(t, r.tracerCloser()) + require.NotEmpty(t, r.traceBuffer.GetSpans(), "Spans recorded") require.NoError(t, err) require.NotNil(t, trace) @@ -465,8 +461,7 @@ func TestSpanReader_GetTraceQueryError(t *testing.T) { Responses: []*elastic.SearchResult{}, }, nil) trace, err := r.reader.GetTrace(context.Background(), model.NewTraceID(0, 1)) - require.NotEmpty(t, r.exporter.GetSpans(), "Spans recorded") - require.NoError(t, r.tracerCloser()) + require.NotEmpty(t, r.traceBuffer.GetSpans(), "Spans recorded") require.EqualError(t, err, "trace not found") require.Nil(t, trace) }) @@ -486,8 +481,7 @@ func TestSpanReader_GetTraceNilHits(t *testing.T) { }, nil) trace, err := r.reader.GetTrace(context.Background(), model.NewTraceID(0, 1)) - require.NotEmpty(t, r.exporter.GetSpans(), "Spans recorded") - require.NoError(t, r.tracerCloser()) + require.NotEmpty(t, r.traceBuffer.GetSpans(), "Spans recorded") require.EqualError(t, err, "trace not found") require.Nil(t, trace) }) @@ -511,8 +505,7 @@ func TestSpanReader_GetTraceInvalidSpanError(t *testing.T) { }, nil) trace, err := r.reader.GetTrace(context.Background(), model.NewTraceID(0, 1)) - require.NotEmpty(t, r.exporter.GetSpans(), "Spans recorded") - require.NoError(t, r.tracerCloser()) + require.NotEmpty(t, r.traceBuffer.GetSpans(), "Spans recorded") require.Error(t, err, "invalid span") require.Nil(t, trace) }) @@ -537,8 +530,7 @@ func TestSpanReader_GetTraceSpanConversionError(t *testing.T) { }, nil) trace, err := r.reader.GetTrace(context.Background(), model.NewTraceID(0, 1)) - require.NotEmpty(t, r.exporter.GetSpans(), "Spans recorded") - require.NoError(t, r.tracerCloser()) + require.NotEmpty(t, r.traceBuffer.GetSpans(), "Spans recorded") require.Error(t, err, "span conversion error, because lacks elements") require.Nil(t, trace) }) @@ -768,8 +760,7 @@ func TestSpanReader_FindTraces(t *testing.T) { } traces, err := r.reader.FindTraces(context.Background(), traceQuery) - require.NotEmpty(t, r.exporter.GetSpans(), "Spans recorded") - require.NoError(t, r.tracerCloser()) + require.NotEmpty(t, r.traceBuffer.GetSpans(), "Spans recorded") require.NoError(t, err) assert.Len(t, traces, 1) @@ -814,8 +805,7 @@ func TestSpanReader_FindTracesInvalidQuery(t *testing.T) { } traces, err := r.reader.FindTraces(context.Background(), traceQuery) - require.NotEmpty(t, r.exporter.GetSpans(), "Spans recorded") - require.NoError(t, r.tracerCloser()) + require.NotEmpty(t, r.traceBuffer.GetSpans(), "Spans recorded") require.Error(t, err) assert.Nil(t, traces) }) @@ -848,8 +838,7 @@ func TestSpanReader_FindTracesAggregationFailure(t *testing.T) { } traces, err := r.reader.FindTraces(context.Background(), traceQuery) - require.NotEmpty(t, r.exporter.GetSpans(), "Spans recorded") - require.NoError(t, r.tracerCloser()) + require.NotEmpty(t, r.traceBuffer.GetSpans(), "Spans recorded") require.Error(t, err) assert.Nil(t, traces) }) @@ -884,8 +873,7 @@ func TestSpanReader_FindTracesNoTraceIDs(t *testing.T) { } traces, err := r.reader.FindTraces(context.Background(), traceQuery) - require.NotEmpty(t, r.exporter.GetSpans(), "Spans recorded") - require.NoError(t, r.tracerCloser()) + require.NotEmpty(t, r.traceBuffer.GetSpans(), "Spans recorded") require.NoError(t, err) assert.Len(t, traces, 0) }) @@ -919,8 +907,7 @@ func TestSpanReader_FindTracesReadTraceFailure(t *testing.T) { } traces, err := r.reader.FindTraces(context.Background(), traceQuery) - require.NotEmpty(t, r.exporter.GetSpans(), "Spans recorded") - require.NoError(t, r.tracerCloser()) + require.NotEmpty(t, r.traceBuffer.GetSpans(), "Spans recorded") require.EqualError(t, err, "read error") assert.Len(t, traces, 0) }) @@ -959,8 +946,7 @@ func TestSpanReader_FindTracesSpanCollectionFailure(t *testing.T) { } traces, err := r.reader.FindTraces(context.Background(), traceQuery) - require.NotEmpty(t, r.exporter.GetSpans(), "Spans recorded") - require.NoError(t, r.tracerCloser()) + require.NotEmpty(t, r.traceBuffer.GetSpans(), "Spans recorded") require.Error(t, err) assert.Len(t, traces, 0) }) @@ -1266,8 +1252,7 @@ func TestSpanReader_GetEmptyIndex(t *testing.T) { } services, err := r.reader.FindTraces(context.Background(), traceQuery) - require.NotEmpty(t, r.exporter.GetSpans(), "Spans recorded") - require.NoError(t, r.tracerCloser()) + require.NotEmpty(t, r.traceBuffer.GetSpans(), "Spans recorded") require.NoError(t, err) assert.Empty(t, services) }) @@ -1283,8 +1268,7 @@ func TestSpanReader_ArchiveTraces(t *testing.T) { }, nil) trace, err := r.reader.GetTrace(context.Background(), model.TraceID{}) - require.NotEmpty(t, r.exporter.GetSpans(), "Spans recorded") - require.NoError(t, r.tracerCloser()) + require.NotEmpty(t, r.traceBuffer.GetSpans(), "Spans recorded") require.Nil(t, trace) assert.EqualError(t, err, "trace not found") }) @@ -1300,8 +1284,7 @@ func TestSpanReader_ArchiveTraces_ReadAlias(t *testing.T) { }, nil) trace, err := r.reader.GetTrace(context.Background(), model.TraceID{}) - require.NotEmpty(t, r.exporter.GetSpans(), "Spans recorded") - require.NoError(t, r.tracerCloser()) + require.NotEmpty(t, r.traceBuffer.GetSpans(), "Spans recorded") require.Nil(t, trace) assert.EqualError(t, err, "trace not found") })