add dedicated function with generation label

test metrics

Author: david-gang

instrumentation/opentelemetry-instrumentation-system-metrics/src/opentelemetry/instrumentation/system_metrics/__init__.py

@@ -196,6 +196,7 @@ def __init__(
         self._runtime_memory_labels = self._labels.copy()
         self._runtime_cpu_time_labels = self._labels.copy()
         self._runtime_gc_count_labels = self._labels.copy()
+        self._runtime_gc_collections_labels = self._labels.copy()
         self._runtime_thread_count_labels = self._labels.copy()
         self._runtime_cpu_utilization_labels = self._labels.copy()
         self._runtime_context_switches_labels = self._labels.copy()
@@ -471,7 +472,7 @@ def _instrument(self, **kwargs: Any):
                 )
                 self._meter.create_observable_counter(
                     name=f"process.runtime.{self._python_implementation}.gc_count",
-                    callbacks=[self._get_runtime_gc_count],
+                    callbacks=[self._get_runtime_gc_collections],
                     description="The number of times a generation was collected since interpreter start.",
                     unit="{collection}",
                 )
@@ -891,6 +892,16 @@ def _get_runtime_gc_count(
             self._runtime_gc_count_labels["count"] = str(index)
             yield Observation(count, self._runtime_gc_count_labels.copy())
 
+    def _get_runtime_gc_collections(
+        self, options: CallbackOptions
+    ) -> Iterable[Observation]:
+        """Observer callback for garbage collection"""
+        for index, count in enumerate(gc.get_count()):
+            self._runtime_gc_collections_labels["generation"] = str(index)
+            yield Observation(
+                count, self._runtime_gc_collections_labels.copy()
+            )
+
     def _get_runtime_thread_count(
         self, options: CallbackOptions
     ) -> Iterable[Observation]:

instrumentation/opentelemetry-instrumentation-system-metrics/tests/test_system_metrics.py

@@ -137,6 +137,9 @@ def test_system_metrics_instrument(self):
             observer_names.append(
                 f"process.runtime.{self.implementation}.gc_count",
             )
+            observer_names.append(
+                f"process.runtime.{self.implementation}.gc_count",
+            )
 
         self.assertEqual(sorted(metric_names), sorted(observer_names))
 
@@ -937,6 +940,32 @@ def test_runtime_cpu_time(self, mock_process_cpu_times):
             f"process.runtime.{self.implementation}.cpu_time", expected
         )
 
+    @mock.patch("gc.get_count")
+    @skipIf(
+        python_implementation().lower() == "pypy", "not supported for pypy"
+    )
+    def test_runtime_get_count(self, mock_gc_get_count):
+        mock_gc_get_count.configure_mock(**{"return_value": (1, 2, 3)})
+
+        expected_gc_count = [
+            _SystemMetricsResult({"count": "0"}, 1),
+            _SystemMetricsResult({"count": "1"}, 2),
+            _SystemMetricsResult({"count": "2"}, 3),
+        ]
+        self._test_metrics(
+            f"process.runtime.{self.implementation}.gc_count",
+            expected_gc_count,
+        )
+        expected_gc_collections = [
+            _SystemMetricsResult({"generation": "0"}, 1),
+            _SystemMetricsResult({"generation": "1"}, 2),
+            _SystemMetricsResult({"generation": "2"}, 3),
+        ]
+        self._test_metrics(
+            f"process.runtime.{self.implementation}.gc_collections",
+            expected_gc_collections,
+        )
+
     @mock.patch("gc.get_count")
     @skipIf(
         python_implementation().lower() == "pypy", "not supported for pypy"