Address feedback

Author: rads-1996

sdk/monitor/azure-monitor-opentelemetry-exporter/azure/monitor/opentelemetry/exporter/statsbeat/_manager.py

@@ -162,11 +162,38 @@ def __init__(self) -> None:
         # Set during first initialization, preserved in shutdown for potential re-initialization
         self._config: Optional[StatsbeatConfig] = None  # type: ignore
 
-        # Extra observation callbacks contributed by SDKs/distros. Keyed by built-in
-        # statsbeat metric name. Registered directly on the singleton instance, e.g.
-        # ``StatsbeatManager()._additional_callbacks.setdefault(name, []).append(cb)``.
+        # Extra observation callbacks contributed by SDKs/distros.
         self._additional_callbacks: Dict[str, List[Callable[[CallbackOptions], Iterable[Observation]]]] = {}
 
+    def add_additional_metric_callbacks(
+        self,
+        metric_name: str,
+        callback: Callable[[CallbackOptions], Iterable[Observation]],
+    ) -> None:
+        """Register additional callbacks for a built-in statsbeat metric.
+
+        :param metric_name: Name of the built-in statsbeat metric.
+        :type metric_name: str
+        :param callback: Callback that yields observations for the metric.
+        :type callback: Callable[[~opentelemetry.metrics.CallbackOptions], Iterable[~opentelemetry.metrics.Observation]]
+        """
+        callbacks = self._additional_callbacks.setdefault(metric_name, [])
+        if callback not in callbacks:
+            callbacks.append(callback)
+
+    def get_additional_metric_callbacks(
+        self,
+        metric_name: str,
+    ) -> Iterable[Callable[[CallbackOptions], Iterable[Observation]]]:
+        """Return registered callbacks for a built-in statsbeat metric.
+
+        :param metric_name: Name of the built-in statsbeat metric.
+        :type metric_name: str
+        :return: Registered callbacks for the provided metric name.
+        :rtype: Iterable[Callable[[~opentelemetry.metrics.CallbackOptions], Iterable[~opentelemetry.metrics.Observation]]] # pylint: disable=line-too-long
+        """
+        return self._additional_callbacks.get(metric_name, ())
+
     @staticmethod
     def _validate_config(config: Optional[StatsbeatConfig]) -> bool:
         """Validate that a configuration has all required fields.

sdk/monitor/azure-monitor-opentelemetry-exporter/azure/monitor/opentelemetry/exporter/statsbeat/_utils.py

@@ -172,9 +172,8 @@ def _get_additional_observations(metric_name: str, options: CallbackOptions) ->
     """Return observations contributed by extra callbacks registered on :class:`StatsbeatManager`.
 
     Invoked by the built-in ``_StatsbeatMetrics`` callbacks at collection time.
-    Reads ``StatsbeatManager()._additional_callbacks`` (a live mutable dict on the
-    singleton instance), which SDKs/distros populate directly. Exceptions raised by
-    individual callbacks are caught, logged, and skipped.
+    Reads callbacks registered on the singleton :class:`StatsbeatManager`.
+    Exceptions raised by individual callbacks are caught, logged, and skipped.
 
     :param metric_name: Name of the built-in statsbeat metric being collected.
     :type metric_name: str
@@ -188,7 +187,7 @@ def _get_additional_observations(metric_name: str, options: CallbackOptions) ->
         StatsbeatManager,
     )
 
-    callbacks = StatsbeatManager()._additional_callbacks.get(metric_name, ())  # pylint: disable=protected-access
+    callbacks = StatsbeatManager().get_additional_metric_callbacks(metric_name)
 
     observations: List[Observation] = []
     iter_logger = logging.getLogger(__name__)

sdk/monitor/azure-monitor-opentelemetry-exporter/tests/statsbeat/test_metrics.py

@@ -975,7 +975,7 @@ def test_shorten_host(self):
 
 # pylint: disable=protected-access
 class TestAdditionalObservationCallbacks(unittest.TestCase):
-    """Tests for StatsbeatManager._additional_callbacks and the _get_additional_observations helper."""
+    """Tests for statsbeat callback registration and _get_additional_observations."""
 
     def setUp(self):
         _REQUESTS_MAP.clear()
@@ -989,7 +989,7 @@ def tearDown(self):
 
     @staticmethod
     def _register(metric_name, callback):
-        StatsbeatManager()._additional_callbacks.setdefault(metric_name, []).append(callback)
+        StatsbeatManager().add_additional_metric_callbacks(metric_name, callback)
 
     def _make_metric(self):
         return _StatsbeatMetrics(