monitoring: use new collector timeout config

Author: GeorgeTsagk

monitoring/asset_balances_collector.go

@@ -72,7 +72,7 @@ func (a *assetBalancesCollector) Collect(ch chan<- prometheus.Metric) {
 	a.collectMx.Lock()
 	defer a.collectMx.Unlock()
 
-	ctxdb, cancel := context.WithTimeout(context.Background(), dbTimeout)
+	ctxdb, cancel := context.WithTimeout(context.Background(), promTimeout)
 	defer cancel()
 
 	assets, err := a.cfg.AssetStore.FetchAllAssets(ctxdb, false, false, nil)

monitoring/asset_collector.go

@@ -97,7 +97,7 @@ func (a *universeStatsCollector) Collect(ch chan<- prometheus.Metric) {
 	a.collectMx.Lock()
 	defer a.collectMx.Unlock()
 
-	ctx, cancel := context.WithTimeout(context.Background(), dbTimeout)
+	ctx, cancel := context.WithTimeout(context.Background(), promTimeout)
 	defer cancel()
 
 	universeStats, err := a.cfg.UniverseStats.AggregateSyncStats(ctx)

monitoring/db_collector.go

@@ -84,7 +84,7 @@ func (a *dbCollector) Collect(ch chan<- prometheus.Metric) {
 	a.collectMx.Lock()
 	defer a.collectMx.Unlock()
 
-	ctxdb, cancel := context.WithTimeout(context.Background(), dbTimeout)
+	ctxdb, cancel := context.WithTimeout(context.Background(), promTimeout)
 	defer cancel()
 
 	// Fetch the db size.

monitoring/prometheus.go

@@ -12,15 +12,17 @@ import (
 	"github.com/prometheus/client_golang/prometheus/promhttp"
 )
 
+const (
+	// defaultTimeout is the default timeout.
+	defaultTimeout = 20 * time.Second
+)
+
 var (
 	// serverMetrics is a global variable that holds the Prometheus metrics
 	// for the gRPC server.
 	serverMetrics *grpc_prometheus.ServerMetrics
-)
 
-const (
-	// dbTimeout is the default database timeout.
-	dbTimeout = 20 * time.Second
+	promTimeout time.Duration
 )
 
 // PrometheusExporter is a metric exporter that uses Prometheus directly. The
@@ -46,6 +48,12 @@ func (p *PrometheusExporter) Start() error {
 		return fmt.Errorf("server metrics not set")
 	}
 
+	if p.config.CollectorRPCTimeout.Seconds() != 0 {
+		promTimeout = p.config.CollectorRPCTimeout
+	} else {
+		promTimeout = defaultTimeout
+	}
+
 	// Create a custom Prometheus registry.
 	p.registry = prometheus.NewRegistry()
 	p.registry.MustRegister(collectors.NewProcessCollector(