Error immediately when metrics export server fails (#7021)

Signed-off-by: joshvanl <me@joshvanl.dev> Co-authored-by: Dapr Bot <56698301+dapr-bot@users.noreply.github.com>
dapr · Oct 13, 2023 · b6540a1 · b6540a1
1 parent c4284d3
commit b6540a1
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)
 }