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

Remove deprecated index prefix separator : from Elastic #1620

Merged

Conversation

pavolloffay
Copy link
Member

In Jaeger 1.9.0 the index prefix separator was changed from ":" (not allowed in ES7) to "-". However query still reads from deprecated indices to keep backward compatibility. After half year old indices should be expired so safe to remove.

https://github.com/jaegertracing/jaeger/blob/master/CHANGELOG.md#190-2019-01-21

Signed-off-by: Pavol Loffay <ploffay@redhat.com>
Copy link
Contributor

@objectiser objectiser left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM - couple of minor points.

Could you also request feedback from the elasticsearch users.

@@ -304,6 +297,7 @@ func (s *SpanReader) multiRead(ctx context.Context, traceIDs []model.TraceID, st
// i.e starts in one and ends in another.
indices := s.timeRangeIndices(s.spanIndexPrefix, startTime.Add(-time.Hour), endTime.Add(time.Hour))
nextTime := model.TimeAsEpochMicroseconds(startTime.Add(-time.Hour))
fmt.Println(indices)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Did you mean to leave this?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

no, it was just to debug locally

{params:SpanReaderParams{Client:client, Logger: logger, MetricsFactory: metricsFactory,
IndexPrefix:"", UseReadWriteAliases: true},
indices: []string{spanIndex+"read"}},
index: spanIndex+"read"},
{params:SpanReaderParams{Client:client, Logger: logger, MetricsFactory: metricsFactory,
IndexPrefix:"foo:", Archive: false},
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: Change the IndexPrefix values so just "foo" rather than including ':'.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's there to stress that : would be added if it is specified

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok

Signed-off-by: Pavol Loffay <ploffay@redhat.com>
@codecov
Copy link

codecov bot commented Jun 21, 2019

Codecov Report

Merging #1620 into master will decrease coverage by <.01%.
The diff coverage is 100%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #1620      +/-   ##
==========================================
- Coverage   98.74%   98.74%   -0.01%     
==========================================
  Files         191      191              
  Lines        9169     9165       -4     
==========================================
- Hits         9054     9050       -4     
  Misses         89       89              
  Partials       26       26
Impacted Files Coverage Δ
plugin/storage/es/spanstore/reader.go 100% <100%> (ø) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update c55b314...41f7cd4. Read the comment docs.

@pavolloffay pavolloffay merged commit ebbd409 into jaegertracing:master Jun 21, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants