Add timeout to endpointset metric collector

We have seen deadlocks with endpoint discovery caused by the metric
collector hanging and not releasing the store labels lock. This causes
the endpoint update to hang, which also makes all endpoint readers hang on
acquiring a read lock for the resolved endpoints slice.

This commit makes sure the Collect method on the metrics collector has
a built in timeout to guard against cases where an upstream call never
reads from the collection channel.

Signed-off-by: Filip Petkovski <[email protected]>

pkg/query/endpointset.go

@@ -238,11 +238,11 @@ type endpointSetNodeCollector struct {
 	storeNodesAddr  map[string]map[string]int
 	storeNodesKeys  map[string]map[string]int
 
+    logger              log.Logger
 	connectionsDesc     *prometheus.Desc
 	labels              []string
 	connectionsWithAddr *prometheus.Desc
 	connectionsWithKeys *prometheus.Desc
-	logger              log.Logger
 }
 
 func newEndpointSetNodeCollector(logger log.Logger, labels ...string) *endpointSetNodeCollector {