Merge branch 'master' into adaptive-config-cleanup

jaegertracing · Oct 4, 2021 · a7b20df · a7b20df
2 parents af6893d + 2b7fb73
commit a7b20df
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/plugin/storage/es/spanstore/reader.go b/plugin/storage/es/spanstore/reader.go
@@ -61,7 +61,7 @@ const (
 
 	defaultNumTraces = 100
 
-	rolloverMaxSpanAge = time.Hour * 24 * 365 * 100
+	rolloverMaxSpanAge = time.Hour * 24 * 365 * 50
 )
 
 var (

diff --git a/plugin/storage/es/spanstore/reader_test.go b/plugin/storage/es/spanstore/reader_test.go
@@ -149,7 +149,7 @@ func TestNewSpanReader(t *testing.T) {
 				MaxSpanAge:          time.Hour * 72,
 				UseReadWriteAliases: true,
 			},
-			maxSpanAge: time.Hour * 24 * 365 * 100,
+			maxSpanAge: time.Hour * 24 * 365 * 50,
 		},
 	}
 	for _, test := range tests {