Error immediately when metrics export server fails

Signed-off-by: joshvanl <me@joshvanl.dev>
dapr · Oct 11, 2023 · 19260d6 · 19260d6
1 parent fa55f33
commit 19260d6
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/pkg/metrics/exporter.go b/pkg/metrics/exporter.go
@@ -116,9 +116,14 @@ func (m *promMetricsExporter) startMetricServer(ctx context.Context) error {
 		errCh <- nil
 	}()
 
-	<-ctx.Done()
+	var err error
+	select {
+	case <-ctx.Done():
+	case err = <-errCh:
+		close(errCh)
+	}
 
 	ctx, cancel := context.WithTimeout(context.Background(), time.Second*5)
 	defer cancel()
-	return errors.Join(m.server.Shutdown(ctx), <-errCh)
+	return errors.Join(m.server.Shutdown(ctx), err, <-errCh)
 }