Merge branch 'main' into issue_2646

open-telemetry · May 8, 2022 · 59854cf · 59854cf
2 parents f521528 + e2edc9d
commit 59854cf
Showing 1 changed file with 27 additions and 4 deletions.
diff --git a/opentelemetry-sdk/src/opentelemetry/sdk/_metrics/_internal/__init__.py b/opentelemetry-sdk/src/opentelemetry/sdk/_metrics/_internal/__init__.py
@@ -373,12 +373,35 @@ def __init__(
     def force_flush(self, timeout_millis: float = 10_000) -> bool:
         deadline_ns = _time_ns() + timeout_millis * 10**6
 
+        metric_reader_error = {}
+
         for metric_reader in self._sdk_config.metric_readers:
             current_ts = _time_ns()
-            if current_ts >= deadline_ns:
-                raise Exception("Timed out while flushing metric readers")
-            metric_reader.collect(
-                timeout_millis=(deadline_ns - current_ts) / 10**6
+            try:
+                if current_ts >= deadline_ns:
+                    raise Exception("Timed out while flushing metric readers")
+                metric_reader.collect(
+                    timeout_millis=(deadline_ns - current_ts) / 10**6
+                )
+
+            # pylint: disable=broad-except
+            except Exception as error:
+
+                metric_reader_error[metric_reader] = error
+
+        if metric_reader_error:
+
+            metric_reader_error_string = "\n".join(
+                [
+                    f"{metric_reader.__class__.__name__}: {repr(error)}"
+                    for metric_reader, error in metric_reader_error.items()
+                ]
+            )
+
+            raise Exception(
+                "MeterProvider.force_flush failed because the following "
+                "metric readers failed during collect:\n"
+                f"{metric_reader_error_string}"
             )
         return True