all: observe missing Stats RegexpsConsidered and FlushReason (#611)

keegancsmith · web-flow · commit 25c1ea5177fb · 2023-07-11T15:37:54.000+02:00
Noticed we didn't include these fields in our prometheus and logging
integration.

Test Plan: go test ./...
diff --git a/cmd/zoekt-webserver/main.go b/cmd/zoekt-webserver/main.go
@@ -596,6 +596,8 @@ func (s *loggedSearcher) log(ctx context.Context, q query.Q, opts *zoekt.SearchO
 		sglog.Int("stat.NgramMatches", st.NgramMatches),
 		sglog.Int("stat.NgramLookups", st.NgramLookups),
 		sglog.Duration("stat.Wait", st.Wait),
+		sglog.Int("stat.RegexpsConsidered", st.RegexpsConsidered),
+		sglog.String("stat.FlushReason", st.FlushReason.String()),
 	)
 }
 
diff --git a/shards/shards.go b/shards/shards.go
@@ -119,6 +119,10 @@ var (
 		Name: "zoekt_search_ngram_lookups_total",
 		Help: "Total number of times we accessed an ngram in the index",
 	})
+	metricSearchRegexpsConsideredTotal = promauto.NewCounter(prometheus.CounterOpts{
+		Name: "zoekt_search_regexps_considered_total",
+		Help: "Total number of times regexp was called on files that we evaluated",
+	})
 
 	metricListRunning = promauto.NewGauge(prometheus.GaugeOpts{
 		Name: "zoekt_list_running",
@@ -826,6 +830,7 @@ func observeMetrics(sr *zoekt.SearchResult) {
 	metricSearchMatchCountTotal.Add(float64(sr.Stats.MatchCount))
 	metricSearchNgramMatchesTotal.Add(float64(sr.Stats.NgramMatches))
 	metricSearchNgramLookupsTotal.Add(float64(sr.Stats.NgramLookups))
+	metricSearchRegexpsConsideredTotal.Add(float64(sr.Stats.RegexpsConsidered))
 }
 
 func copySlice(src *[]byte) {

Original file line number	Diff line number	Diff line change
`@@ -596,6 +596,8 @@ func (s loggedSearcher) log(ctx context.Context, q query.Q, opts zoekt.SearchO`
`596`	`596`	`sglog.Int("stat.NgramMatches", st.NgramMatches),`
`597`	`597`	`sglog.Int("stat.NgramLookups", st.NgramLookups),`
`598`	`598`	`sglog.Duration("stat.Wait", st.Wait),`
	`599`	`+ sglog.Int("stat.RegexpsConsidered", st.RegexpsConsidered),`
	`600`	`+ sglog.String("stat.FlushReason", st.FlushReason.String()),`
`599`	`601`	`)`
`600`	`602`	`}`
`601`	`603`