Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Replace es-spanstore tracing instrumentation with OpenTelemetry #4596

Merged
merged 16 commits into from
Jul 30, 2023
Merged

Replace es-spanstore tracing instrumentation with OpenTelemetry #4596

Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
db42f17
adds otel tracer to spanReader
afzal442 Jul 23, 2023
a9b5adb
updates jtracer API call
afzal442 Jul 23, 2023
e61c5c4
rmvs defer for err
afzal442 Jul 23, 2023
8577650
adds otel tracer as a global
afzal442 Jul 24, 2023
f0fbead
adds tracer to factory to init
afzal442 Jul 25, 2023
bdc5871
sets otel to main
afzal442 Jul 26, 2023
33ea64e
adds test tracer to spanreader_test
afzal442 Jul 27, 2023
11840a0
adds tp to readertest
afzal442 Jul 27, 2023
e1d5515
makes closer as err
afzal442 Jul 28, 2023
03ee675
adds otel tracer to reader
afzal442 Jul 28, 2023
52d5069
replace assert with require
afzal442 Jul 28, 2023
8def751
updates closer() call
afzal442 Jul 28, 2023
0d078fb
adds type closer
afzal442 Jul 28, 2023
f3e92fa
rmvs unwanted object init
afzalbin64 Jul 30, 2023
a037b42
defers the call
afzalbin64 Jul 30, 2023
a98a0ed
sets span status
afzalbin64 Jul 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 21 additions & 23 deletions plugin/storage/es/spanstore/reader_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ type spanReaderTest struct {
logger *zap.Logger
logBuffer *testutils.Buffer
exporter *tracetest.InMemoryExporter
err error
err func() error
reader *SpanReader
}

Expand All @@ -115,7 +115,7 @@ func withSpanReader(fn func(r *spanReaderTest)) {
logger: logger,
logBuffer: logBuffer,
exporter: exp,
err: closer(),
err: closer,
afzal442 marked this conversation as resolved.
Show resolved Hide resolved
reader: NewSpanReader(SpanReaderParams{
Client: client,
Logger: zap.NewNop(),
Expand All @@ -138,7 +138,7 @@ func withArchiveSpanReader(readAlias bool, fn func(r *spanReaderTest)) {
logger: logger,
logBuffer: logBuffer,
exporter: exp,
err: closer(),
err: closer,
reader: NewSpanReader(SpanReaderParams{
Client: client,
Logger: zap.NewNop(),
Expand Down Expand Up @@ -195,7 +195,7 @@ func TestSpanReaderIndices(t *testing.T) {
serviceDataLayoutFormat := date.UTC().Format(serviceDataLayout)
metricsFactory := metricstest.NewFactory(0)
logger, _ := testutils.NewLogger()
tracer, exp, closer := tracerProvider()
tracer, _, closer := tracerProvider()

testCases := []struct {
indices []string
Expand Down Expand Up @@ -302,7 +302,6 @@ func TestSpanReaderIndices(t *testing.T) {
testCase.params.MetricsFactory = metricsFactory
testCase.params.Tracer = tracer.Tracer("test")
r := NewSpanReader(testCase.params)
assert.NotEmpty(t, exp.GetSpans(), "Spans recorded")

actualSpan := r.timeRangeIndices(r.spanIndexPrefix, r.spanIndexDateLayout, date, date, -1*time.Hour)
actualService := r.timeRangeIndices(r.serviceIndexPrefix, r.serviceIndexDateLayout, date, date, -24*time.Hour)
Expand All @@ -329,7 +328,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")
afzal442 marked this conversation as resolved.
Show resolved Hide resolved
require.NoError(t, r.err)
require.NoError(t, r.err())
require.NoError(t, err)
require.NotNil(t, trace)

Expand Down Expand Up @@ -407,7 +406,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.err())
require.NoError(t, err)
require.NotNil(t, traces)
require.Len(t, traces, 2)
Expand Down Expand Up @@ -446,7 +445,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.err())
require.NoError(t, err)
require.NotNil(t, trace)

Expand All @@ -467,7 +466,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.err())
require.EqualError(t, err, "trace not found")
require.Nil(t, trace)
})
Expand All @@ -488,7 +487,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.err())
require.EqualError(t, err, "trace not found")
require.Nil(t, trace)
})
Expand All @@ -513,7 +512,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.err())
require.Error(t, err, "invalid span")
require.Nil(t, trace)
})
Expand All @@ -539,7 +538,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.err())
require.Error(t, err, "span conversion error, because lacks elements")
require.Nil(t, trace)
})
Expand Down Expand Up @@ -770,7 +769,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.err())
require.NoError(t, err)
assert.Len(t, traces, 1)

Expand Down Expand Up @@ -816,7 +815,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.err())
require.Error(t, err)
assert.Nil(t, traces)
})
Expand Down Expand Up @@ -850,7 +849,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.err())
require.Error(t, err)
assert.Nil(t, traces)
})
Expand Down Expand Up @@ -886,7 +885,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.err())
require.NoError(t, err)
assert.Len(t, traces, 0)
})
Expand Down Expand Up @@ -921,7 +920,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.err())
require.EqualError(t, err, "read error")
assert.Len(t, traces, 0)
})
Expand Down Expand Up @@ -961,7 +960,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.err())
require.Error(t, err)
assert.Len(t, traces, 0)
})
Expand Down Expand Up @@ -1268,7 +1267,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.err())
require.NoError(t, err)
assert.Empty(t, services)
})
Expand All @@ -1285,7 +1284,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.err())
require.Nil(t, trace)
assert.EqualError(t, err, "trace not found")
})
Expand All @@ -1300,10 +1299,9 @@ func TestSpanReader_ArchiveTraces_ReadAlias(t *testing.T) {
Responses: []*elastic.SearchResult{},
}, nil)

require.NotEmpty(t, r.exporter.GetSpans(), "Spans recorded")
require.NoError(t, r.err)

trace, err := r.reader.GetTrace(context.Background(), model.TraceID{})
require.NotEmpty(t, r.exporter.GetSpans(), "Spans recorded")
require.NoError(t, r.err())
require.Nil(t, trace)
assert.EqualError(t, err, "trace not found")
})
Expand Down