update failing tests to include the new stats

grafana · Dec 21, 2023 · d716461 · d716461
1 parent 64175cf
commit d716461
Show file tree

Hide file tree

Showing 5 changed files with 45 additions and 1 deletion.
diff --git a/pkg/logql/metrics_test.go b/pkg/logql/metrics_test.go
@@ -132,10 +132,18 @@ func TestLogSeriesQuery(t *testing.T) {
 			TotalBytesProcessed:     100000,
 			TotalEntriesReturned:    10,
 		},
+		Caches: stats.Caches{
+			SeriesResult: stats.Cache{
+				EntriesRequested: 2,
+				EntriesFound:     1,
+				EntriesStored:    1,
+				DownloadTime:     80,
+			},
+		},
 	})
 	require.Regexp(t,
 		fmt.Sprintf(
-			"level=info org_id=foo traceID=%s sampled=true latency=slow query_type=series splits=0 start=.* end=.* start_delta=1h0m0.* end_delta=.* length=1h0m0s duration=25.25s status=200 match=\"{container_name=.*\"}:{app=.*}\" query_hash=23523089 total_entries=10\n",
+			"level=info org_id=foo traceID=%s sampled=true latency=slow query_type=series splits=0 start=.* end=.* start_delta=1h0m0.* end_delta=.* length=1h0m0s duration=25.25s status=200 match=\"{container_name=.*\"}:{app=.*}\" query_hash=23523089 total_entries=10 cache_series_results_req=2 cache_series_results_hit=1 cache_series_results_stored=1 cache_series_results_download_time=80ns\n",
 			sp.Context().(jaeger.SpanContext).SpanID().String(),
 		),
 		buf.String())

diff --git a/pkg/querier/queryrange/codec_test.go b/pkg/querier/queryrange/codec_test.go
@@ -1612,6 +1612,15 @@ var (
 				"requests": 0,
 				"downloadTime": 0
 			},
+		  "seriesResult": {
+				"entriesFound": 0,
+				"entriesRequested": 0,
+				"entriesStored": 0,
+				"bytesReceived": 0,
+				"bytesSent": 0,
+				"requests": 0,
+				"downloadTime": 0
+			},
 		  "volumeResult": {
 				"entriesFound": 0,
 				"entriesRequested": 0,

diff --git a/pkg/querier/queryrange/prometheus_test.go b/pkg/querier/queryrange/prometheus_test.go
@@ -85,6 +85,15 @@ var emptyStats = `"stats": {
 			"requests": 0,
 			"downloadTime": 0
 		},
+		"seriesResult": {
+			"entriesFound": 0,
+			"entriesRequested": 0,
+			"entriesStored": 0,
+			"bytesReceived": 0,
+			"bytesSent": 0,
+			"requests": 0,
+			"downloadTime": 0
+		},
 		"volumeResult": {
 			"entriesFound": 0,
 			"entriesRequested": 0,

diff --git a/pkg/util/marshal/legacy/marshal_test.go b/pkg/util/marshal/legacy/marshal_test.go
@@ -128,6 +128,15 @@ var queryTests = []struct {
 						"requests": 0,
 						"downloadTime": 0
 					},
+					"seriesResult": {
+						"entriesFound": 0,
+						"entriesRequested": 0,
+						"entriesStored": 0,
+						"bytesReceived": 0,
+						"bytesSent": 0,
+						"requests": 0,
+						"downloadTime": 0
+					},
 					"volumeResult": {
 						"entriesFound": 0,
 						"entriesRequested": 0,

diff --git a/pkg/util/marshal/marshal_test.go b/pkg/util/marshal/marshal_test.go
@@ -96,6 +96,15 @@ const emptyStats = `{
 			"requests": 0,
 			"downloadTime": 0
 		},
+		"seriesResult": {
+			"entriesFound": 0,
+			"entriesRequested": 0,
+			"entriesStored": 0,
+			"bytesReceived": 0,
+			"bytesSent": 0,
+			"requests": 0,
+			"downloadTime": 0
+		},
 		"volumeResult": {
 			"entriesFound": 0,
 			"entriesRequested": 0,