adds type closer

Signed-off-by: Afzal Ansari <afzal442@gmail.com>
jaegertracing · Jul 28, 2023 · 15a8ccd · 15a8ccd
1 parent 8def751
commit 15a8ccd
Showing 1 changed file with 21 additions and 19 deletions.
diff --git a/plugin/storage/es/spanstore/reader_test.go b/plugin/storage/es/spanstore/reader_test.go
@@ -85,12 +85,14 @@ var exampleESSpan = []byte(
 	   }
 	}`)
 
+type closed func() error
+
 type spanReaderTest struct {
 	client    *mocks.Client
 	logger    *zap.Logger
 	logBuffer *testutils.Buffer
 	exporter  *tracetest.InMemoryExporter
-	err       func() error
+	closer    closed
 	reader    *SpanReader
 }
 
@@ -115,7 +117,7 @@ func withSpanReader(fn func(r *spanReaderTest)) {
 		logger:    logger,
 		logBuffer: logBuffer,
 		exporter:  exp,
-		err:       closer,
+		closer:    closer,
 		reader: NewSpanReader(SpanReaderParams{
 			Client:            client,
 			Logger:            zap.NewNop(),
@@ -138,7 +140,7 @@ func withArchiveSpanReader(readAlias bool, fn func(r *spanReaderTest)) {
 		logger:    logger,
 		logBuffer: logBuffer,
 		exporter:  exp,
-		err:       closer,
+		closer:    closer,
 		reader: NewSpanReader(SpanReaderParams{
 			Client:              client,
 			Logger:              zap.NewNop(),
@@ -328,7 +330,7 @@ func TestSpanReader_GetTrace(t *testing.T) {
 
 		trace, err := r.reader.GetTrace(context.Background(), model.NewTraceID(0, 1))
 		require.NotEmpty(t, r.exporter.GetSpans(), "Spans recorded")
-		require.NoError(t, r.err())
+		require.NoError(t, r.closer())
 		require.NoError(t, err)
 		require.NotNil(t, trace)
 
@@ -406,7 +408,7 @@ func TestSpanReader_multiRead_followUp_query(t *testing.T) {
 
 		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.err())
+		require.NoError(t, r.closer())
 		require.NoError(t, err)
 		require.NotNil(t, traces)
 		require.Len(t, traces, 2)
@@ -445,7 +447,7 @@ func TestSpanReader_SearchAfter(t *testing.T) {
 
 		trace, err := r.reader.GetTrace(context.Background(), model.NewTraceID(0, 1))
 		require.NotEmpty(t, r.exporter.GetSpans(), "Spans recorded")
-		require.NoError(t, r.err())
+		require.NoError(t, r.closer())
 		require.NoError(t, err)
 		require.NotNil(t, trace)
 
@@ -466,7 +468,7 @@ func TestSpanReader_GetTraceQueryError(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.err())
+		require.NoError(t, r.closer())
 		require.EqualError(t, err, "trace not found")
 		require.Nil(t, trace)
 	})
@@ -487,7 +489,7 @@ func TestSpanReader_GetTraceNilHits(t *testing.T) {
 
 		trace, err := r.reader.GetTrace(context.Background(), model.NewTraceID(0, 1))
 		require.NotEmpty(t, r.exporter.GetSpans(), "Spans recorded")
-		require.NoError(t, r.err())
+		require.NoError(t, r.closer())
 		require.EqualError(t, err, "trace not found")
 		require.Nil(t, trace)
 	})
@@ -512,7 +514,7 @@ func TestSpanReader_GetTraceInvalidSpanError(t *testing.T) {
 
 		trace, err := r.reader.GetTrace(context.Background(), model.NewTraceID(0, 1))
 		require.NotEmpty(t, r.exporter.GetSpans(), "Spans recorded")
-		require.NoError(t, r.err())
+		require.NoError(t, r.closer())
 		require.Error(t, err, "invalid span")
 		require.Nil(t, trace)
 	})
@@ -538,7 +540,7 @@ func TestSpanReader_GetTraceSpanConversionError(t *testing.T) {
 
 		trace, err := r.reader.GetTrace(context.Background(), model.NewTraceID(0, 1))
 		require.NotEmpty(t, r.exporter.GetSpans(), "Spans recorded")
-		require.NoError(t, r.err())
+		require.NoError(t, r.closer())
 		require.Error(t, err, "span conversion error, because lacks elements")
 		require.Nil(t, trace)
 	})
@@ -769,7 +771,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.err())
+		require.NoError(t, r.closer())
 		require.NoError(t, err)
 		assert.Len(t, traces, 1)
 
@@ -815,7 +817,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.err())
+		require.NoError(t, r.closer())
 		require.Error(t, err)
 		assert.Nil(t, traces)
 	})
@@ -849,7 +851,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.err())
+		require.NoError(t, r.closer())
 		require.Error(t, err)
 		assert.Nil(t, traces)
 	})
@@ -885,7 +887,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.err())
+		require.NoError(t, r.closer())
 		require.NoError(t, err)
 		assert.Len(t, traces, 0)
 	})
@@ -920,7 +922,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.err())
+		require.NoError(t, r.closer())
 		require.EqualError(t, err, "read error")
 		assert.Len(t, traces, 0)
 	})
@@ -960,7 +962,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.err())
+		require.NoError(t, r.closer())
 		require.Error(t, err)
 		assert.Len(t, traces, 0)
 	})
@@ -1267,7 +1269,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.err())
+		require.NoError(t, r.closer())
 		require.NoError(t, err)
 		assert.Empty(t, services)
 	})
@@ -1284,7 +1286,7 @@ func TestSpanReader_ArchiveTraces(t *testing.T) {
 
 		trace, err := r.reader.GetTrace(context.Background(), model.TraceID{})
 		require.NotEmpty(t, r.exporter.GetSpans(), "Spans recorded")
-		require.NoError(t, r.err())
+		require.NoError(t, r.closer())
 		require.Nil(t, trace)
 		assert.EqualError(t, err, "trace not found")
 	})
@@ -1301,7 +1303,7 @@ func TestSpanReader_ArchiveTraces_ReadAlias(t *testing.T) {
 
 		trace, err := r.reader.GetTrace(context.Background(), model.TraceID{})
 		require.NotEmpty(t, r.exporter.GetSpans(), "Spans recorded")
-		require.NoError(t, r.err())
+		require.NoError(t, r.closer())
 		require.Nil(t, trace)
 		assert.EqualError(t, err, "trace not found")
 	})