Skip to content

Commit

Permalink
rmvs unwanted object init
Browse files Browse the repository at this point in the history 
Signed-off-by: Afzal <94980910+afzalbin64@users.noreply.github.com>
  • Loading branch information
@afzalbin64
afzalbin64 committed Jul 30, 2023
1 parent 0d078fb commit f3e92fa
Show file tree
Hide file tree
Showing 2 changed files with 31 additions and 52 deletions.
4 changes: 0 additions & 4 deletions plugin/storage/es/spanstore/reader.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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,
Expand Down
79 changes: 31 additions & 48 deletions plugin/storage/es/spanstore/reader_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand All @@ -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(),
Expand All @@ -126,6 +124,7 @@ func withSpanReader(fn func(r *spanReaderTest)) {
MaxDocCount: defaultMaxDocCount,
}),
}
defer closer()
fn(r)
}

Expand All @@ -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(),
Expand All @@ -150,6 +148,7 @@ func withArchiveSpanReader(readAlias bool, fn func(r *spanReaderTest)) {
UseReadWriteAliases: readAlias,
}),
}
defer closer()
fn(r)
}

Expand Down Expand Up @@ -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)

Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)

Expand All @@ -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)
})
Expand All @@ -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)
})
Expand All @@ -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)
})
Expand All @@ -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)
})
Expand Down Expand Up @@ -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)

Expand Down Expand Up @@ -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)
})
Expand Down Expand Up @@ -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)
})
Expand Down Expand Up @@ -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)
})
Expand Down Expand Up @@ -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)
})
Expand Down Expand Up @@ -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)
})
Expand Down Expand Up @@ -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)
})
Expand All @@ -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")
})
Expand All @@ -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")
})
Expand Down

0 comments on commit f3e92fa

Please sign in to comment.