[storage] Remove dependency on archive flag in ES reader #6490
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -245,7 +245,7 @@ func TestArchiveDisabled(t *testing.T) { | |
| func TestArchiveEnabled(t *testing.T) { | ||
| f := NewFactory() | ||
| f.primaryConfig = &escfg.Configuration{} | ||
| f.archiveConfig = &escfg.Configuration{Enabled: true, UseReadWriteAliases: true} | ||
|
||
| f.newClientFn = (&mockClientBuilder{}).NewClient | ||
| err := f.Initialize(metrics.NullFactory, zap.NewNop()) | ||
| require.NoError(t, err) | ||
|
|
||
| Original file line number | Diff line number | Diff line change | |||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
|
@@ -118,7 +118,7 @@ func withSpanReader(t *testing.T, fn func(r *spanReaderTest)) { | ||||||||||||||||
| fn(r) | |||||||||||||||||
| } | |||||||||||||||||
|
|
|||||||||||||||||
| func withArchiveSpanReader(t *testing.T, readAlias bool, readAliasSuffix string, fn func(r *spanReaderTest)) { | |||||||||||||||||
| client := &mocks.Client{} | |||||||||||||||||
| tracer, exp, closer := tracerProvider(t) | |||||||||||||||||
| defer closer() | |||||||||||||||||
|
|
@@ -134,7 +134,7 @@ func withArchiveSpanReader(t *testing.T, readAlias bool, fn func(r *spanReaderTe | ||||||||||||||||
| Tracer: tracer.Tracer("test"), | |||||||||||||||||
| MaxSpanAge: 0, | |||||||||||||||||
| TagDotReplacement: "@", | |||||||||||||||||
| ReadAliasSuffix: readAliasSuffix, | |||||||||||||||||
| UseReadWriteAliases: readAlias, | |||||||||||||||||
| }), | |||||||||||||||||
| } | |||||||||||||||||
|
|
@@ -199,7 +199,6 @@ func TestSpanReaderIndices(t *testing.T) { | ||||||||||||||||
| }{ | |||||||||||||||||
| { | |||||||||||||||||
| params: SpanReaderParams{ | |||||||||||||||||
| SpanIndex: spanIndexOpts, | |||||||||||||||||
| ServiceIndex: serviceIndexOpts, | |||||||||||||||||
| }, | |||||||||||||||||
|
|
@@ -213,7 +212,12 @@ func TestSpanReaderIndices(t *testing.T) { | ||||||||||||||||
| }, | |||||||||||||||||
| { | |||||||||||||||||
| params: SpanReaderParams{ | |||||||||||||||||
| ReadAliasSuffix: "archive", // ignored because ReadWriteAliases is false | |||||||||||||||||
| }, | |||||||||||||||||
| indices: []string{spanIndexBaseName, serviceIndexBaseName}, | |||||||||||||||||
| }, | |||||||||||||||||
| { | |||||||||||||||||
| params: SpanReaderParams{ | |||||||||||||||||
| SpanIndex: spanIndexOpts, | |||||||||||||||||
| ServiceIndex: serviceIndexOpts, | |||||||||||||||||
| IndexPrefix: "foo:", | |||||||||||||||||
|
|
@@ -228,27 +232,21 @@ func TestSpanReaderIndices(t *testing.T) { | ||||||||||||||||
| }, | |||||||||||||||||
| { | |||||||||||||||||
| params: SpanReaderParams{ | |||||||||||||||||
| ReadAliasSuffix: "archive", | |||||||||||||||||
| UseReadWriteAliases: true, | |||||||||||||||||
| }, | |||||||||||||||||
| indices: []string{spanIndexBaseName + "archive", serviceIndexBaseName + "archive"}, | |||||||||||||||||
| }, | |||||||||||||||||
| { | |||||||||||||||||
| params: SpanReaderParams{ | |||||||||||||||||
| SpanIndex: spanIndexOpts, ServiceIndex: serviceIndexOpts, IndexPrefix: "foo:", UseReadWriteAliases: true, ReadAliasSuffix: "archive", | |||||||||||||||||
| }, | |||||||||||||||||
| indices: []string{"foo:" + config.IndexPrefixSeparator + spanIndexBaseName + "archive", "foo:" + config.IndexPrefixSeparator + serviceIndexBaseName + "archive"}, | |||||||||||||||||
| }, | |||||||||||||||||
| { | |||||||||||||||||
| params: SpanReaderParams{ | |||||||||||||||||
| SpanIndex: spanIndexOpts, | |||||||||||||||||
| ServiceIndex: serviceIndexOpts, | |||||||||||||||||
| RemoteReadClusters: []string{"cluster_one", "cluster_two"}, | |||||||||||||||||
| }, | |||||||||||||||||
| indices: []string{ | |||||||||||||||||
|
|
@@ -262,20 +260,20 @@ func TestSpanReaderIndices(t *testing.T) { | ||||||||||||||||
| }, | |||||||||||||||||
| { | |||||||||||||||||
| params: SpanReaderParams{ | |||||||||||||||||
| UseReadWriteAliases: true, ReadAliasSuffix: "archive", RemoteReadClusters: []string{"cluster_one", "cluster_two"}, | |||||||||||||||||
| }, | |||||||||||||||||
| indices: []string{ | |||||||||||||||||
| spanIndexBaseName + "archive", | |||||||||||||||||
| "cluster_one:" + spanIndexBaseName + "archive", | |||||||||||||||||
| "cluster_two:" + spanIndexBaseName + "archive", | |||||||||||||||||
| serviceIndexBaseName + "archive", | |||||||||||||||||
| "cluster_one:" + serviceIndexBaseName + "archive", | |||||||||||||||||
| "cluster_two:" + serviceIndexBaseName + "archive", | |||||||||||||||||
| }, | |||||||||||||||||
| }, | |||||||||||||||||
| { | |||||||||||||||||
| params: SpanReaderParams{ | |||||||||||||||||
| UseReadWriteAliases: true, RemoteReadClusters: []string{"cluster_one", "cluster_two"}, | |||||||||||||||||
| }, | |||||||||||||||||
| indices: []string{ | |||||||||||||||||
| spanIndexBaseName + "read", | |||||||||||||||||
|
|
@@ -286,19 +284,6 @@ func TestSpanReaderIndices(t *testing.T) { | ||||||||||||||||
| "cluster_two:" + serviceIndexBaseName + "read", | |||||||||||||||||
| }, | |||||||||||||||||
| }, | |||||||||||||||||
| } | |||||||||||||||||
| for _, testCase := range testCases { | |||||||||||||||||
| testCase.params.Client = clientFn | |||||||||||||||||
|
|
@@ -1267,7 +1252,7 @@ func TestSpanReader_GetEmptyIndex(t *testing.T) { | ||||||||||||||||
| } | |||||||||||||||||
|
|
|||||||||||||||||
| func TestSpanReader_ArchiveTraces(t *testing.T) { | |||||||||||||||||
| withArchiveSpanReader(t, true, "archive", func(r *spanReaderTest) { | |||||||||||||||||
|
|||||||||||||||||
| use_aliases | input suffix | expected index |
|---|---|---|
| false | "" | ... |
| true | "" | ... |
| false | "foobar" | ... |
| true | "foobar" | ... |
There was a problem hiding this comment.
@yurishkuro Done. Can we remove the test below this now?
There was a problem hiding this comment.
why remove this test? It seems it was counting on different index names, so useful to keep as backwards compatibility guard.
There was a problem hiding this comment.
@yurishkuro Its because we don't concatenate the two inside the reader anymore. That logic is handled by the factory. If use_aliases is set and the read alias suffix is set, then we just use that suffix instead of concatenating the two.
There was a problem hiding this comment.
could we model that by altering withArchiveSpanReader constructor? Specifically to test the condition where the indices become ***archive vs ***archive-read (which I understand happens depending on use_aliases being set or not). You don't have any significant changes to the tests for the factory, but that's where the distinction is being captured.
There was a problem hiding this comment.
@yurishkuro That would just be a difference of changing ArchiveIndexSuffix to be archive vs archive-read because the span reader just respects what is passed in today. This test would need to go into the factory but there isn't a nice way to do that right now because the reader is a concrete type so we can't use a mock to see what is passed into the createSpanReader function. We could make some changes to make the create functions parameters so they can be injected for testing.
There was a problem hiding this comment.
no, the difference should be in the external configuration (i.e. calling create-archive with different use_aliases settings) to exercise the branching logic in both create-archive functions and the storage implementation, and yet ensure the same use of index names as before.
Uh oh!
There was an error while loading. Please reload this page.