Make meter configurator application more robust.

Author: herin049

opentelemetry-sdk/src/opentelemetry/sdk/metrics/_internal/__init__.py

@@ -533,7 +533,7 @@ def __init__(
         if shutdown_on_exit:
             self._atexit_handler = register(self.shutdown)
 
-        self._meters = {}
+        self._meters: dict[InstrumentationScope, Meter] = {}
         self._shutdown_once = Once()
         self._shutdown = False
         self._meter_configurator = (
@@ -564,13 +564,26 @@ def _set_meter_configurator(
         for each outstanding Meter and for any newly created meters thereafter.
         Therefore, it is important that the provided function returns quickly.
         """
-        self._meter_configurator = meter_configurator
         with self._meter_lock:
-            for info, meter in self._meters.items():
-                if not isinstance(meter, Meter):
-                    continue
+            self._meter_configurator = meter_configurator
+            for instrumentation_scope, meter in self._meters.items():
                 # pylint: disable-next=protected-access
-                meter._set_meter_config(self._meter_configurator(info))
+                meter._set_meter_config(
+                    self._apply_meter_configurator(instrumentation_scope)
+                )
+
+    def _apply_meter_configurator(
+        self, instrumentation_scope: InstrumentationScope
+    ) -> _MeterConfig:
+        try:
+            return self._meter_configurator(instrumentation_scope)
+        # pylint: disable-next=broad-exception-caught
+        except Exception:
+            _logger.exception(
+                "meter configurator failed for scope '%s', using default config",
+                instrumentation_scope.name,
+            )
+            return _MeterConfig.default()
 
     def force_flush(self, timeout_millis: float = 10_000) -> bool:
         deadline_ns = time_ns() + timeout_millis * 10**6
@@ -679,14 +692,18 @@ def get_meter(
             _logger.warning("Meter name cannot be None or empty.")
             return NoOpMeter(name, version=version, schema_url=schema_url)
 
-        info = InstrumentationScope(name, version, schema_url, attributes)
+        instrumentation_scope = InstrumentationScope(
+            name, version, schema_url, attributes
+        )
         with self._meter_lock:
-            if not self._meters.get(info):
+            if not self._meters.get(instrumentation_scope):
                 # FIXME #2558 pass SDKConfig object to meter so that the meter
                 # has access to views.
-                self._meters[info] = Meter(
-                    info,
+                self._meters[instrumentation_scope] = Meter(
+                    instrumentation_scope,
                     self._measurement_consumer,
-                    _meter_config=self._meter_configurator(info),
+                    _meter_config=self._apply_meter_configurator(
+                        instrumentation_scope
+                    ),
                 )
-            return self._meters[info]
+            return self._meters[instrumentation_scope]

opentelemetry-sdk/tests/metrics/test_metrics.py

@@ -463,6 +463,30 @@ def test_set_meter_configurator_affects_new_meters(self):
         meter = mp.get_meter("new_meter")
         self.assertFalse(meter._is_enabled())
 
+    def test_buggy_configurator_falls_back_to_default_on_get_meter(self):
+        def raising_configurator(_scope):
+            raise RuntimeError("configurator error")
+
+        mp = MeterProvider(_meter_configurator=raising_configurator)
+        with self.assertLogs(level="ERROR"):
+            meter = mp.get_meter("test")
+        self.assertTrue(meter._is_enabled())
+
+    def test_buggy_configurator_falls_back_to_default_on_set_configurator(
+        self,
+    ):
+        mp = MeterProvider()
+        meter = mp.get_meter("test")
+        self.assertTrue(meter._is_enabled())
+
+        def raising_configurator(_scope):
+            raise ValueError("bad config")
+
+        with self.assertLogs(level="ERROR"):
+            mp._set_meter_configurator(meter_configurator=raising_configurator)
+        # Should still be enabled (default config) despite the error
+        self.assertTrue(meter._is_enabled())
+
     @patch(
         "opentelemetry.sdk.metrics._internal.SynchronousMeasurementConsumer"
     )