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.

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

Use correct context on ES search methods #1850

Merged
Merged
Changes from 1 commit
Commits
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
8 changes: 2 additions & 6 deletions plugin/storage/es/spanstore/reader.go
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,6 @@ var (

// SpanReader can query for and load traces from ElasticSearch
type SpanReader struct {
ctx context.Context
client es.Client
logger *zap.Logger
// The age of the oldest service/operation we will look for. Because indices in ElasticSearch are by day,
Expand Down Expand Up @@ -119,9 +118,7 @@ type SpanReaderParams struct {

// NewSpanReader returns a new SpanReader with a metrics.
func NewSpanReader(p SpanReaderParams) *SpanReader {
ctx := context.Background()
return &SpanReader{
ctx: ctx,
client: p.Client,
logger: p.Logger,
maxSpanAge: p.MaxSpanAge,
Expand Down Expand Up @@ -337,7 +334,7 @@ func (s *SpanReader) multiRead(ctx context.Context, traceIDs []model.TraceID, st
}
// set traceIDs to empty
traceIDs = nil
results, err := s.client.MultiSearch().Add(searchRequests...).Index(indices...).Do(s.ctx)
results, err := s.client.MultiSearch().Add(searchRequests...).Index(indices...).Do(ctx)

if err != nil {
logErrorToSpan(childSpan, err)
Expand Down Expand Up @@ -471,7 +468,6 @@ func (s *SpanReader) findTraceIDs(ctx context.Context, traceQuery *spanstore.Tra
// }
aggregation := s.buildTraceIDAggregation(traceQuery.NumTraces)
boolQuery := s.buildFindTraceIDsQuery(traceQuery)

jaegerIndices := s.timeRangeIndices(s.spanIndexPrefix, traceQuery.StartTimeMin, traceQuery.StartTimeMax)

searchService := s.client.Search(jaegerIndices...).
Expand All @@ -480,7 +476,7 @@ func (s *SpanReader) findTraceIDs(ctx context.Context, traceQuery *spanstore.Tra
IgnoreUnavailable(true).
Query(boolQuery)

searchResult, err := searchService.Do(s.ctx)
searchResult, err := searchService.Do(ctx)
if err != nil {
return nil, errors.Wrap(err, "Search service failed")
}
Expand Down