round

Author: david-gang

CHANGELOG.md

@@ -29,7 +29,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   ([#3567](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3567))
 - `opentelemetry-resource-detector-containerid`: make it more quiet on platforms without cgroups
   ([#3579](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3579))
-- `opentelemetry-instrumentation-system-metrics`: Add process.runtime.cpython.gc_count metrics with collection unit is specified in semconv ([3617](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3617))
+- `opentelemetry-instrumentation-system-metrics`: Add cpython.gc.collections metrics with collection unit is specified in semconv ([3617](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3617))
 
 ## Version 1.34.0/0.55b0 (2025-06-04)
 

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

@@ -44,6 +44,7 @@
         "process.runtime.memory": ["rss", "vms"],
         "process.runtime.cpu.time": ["user", "system"],
         "process.runtime.gc_count": None,
+        "cpython.gc.collections": None,
         "process.runtime.thread_count": None,
         "process.runtime.cpu.utilization": None,
         "process.runtime.context_switches": ["involuntary", "voluntary"],
@@ -136,6 +137,7 @@
     "process.runtime.memory": ["rss", "vms"],
     "process.runtime.cpu.time": ["user", "system"],
     "process.runtime.gc_count": None,
+    "cpython.gc.collections": None,
     "process.runtime.thread_count": None,
     "process.runtime.cpu.utilization": None,
     "process.runtime.context_switches": ["involuntary", "voluntary"],
@@ -470,8 +472,15 @@ def _instrument(self, **kwargs: Any):
                     description=f"Runtime {self._python_implementation} GC count",
                     unit="By",
                 )
+
+        if "cpython.gc.collections" in self._config:
+            if self._python_implementation == "pypy":
+                _logger.warning(
+                    "The cpython.gc.collections metric won't be collected because the interpreter is PyPy"
+                )
+            else:
                 self._meter.create_observable_counter(
-                    name=f"process.runtime.{self._python_implementation}.gc_count",
+                    name="cpython.gc.collections",
                     callbacks=[self._get_runtime_gc_collections],
                     description="The number of times a generation was collected since interpreter start.",
                     unit="{collection}",

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

@@ -137,7 +137,7 @@ def test_system_metrics_instrument(self):
                 f"process.runtime.{self.implementation}.gc_count",
             )
             observer_names.append(
-                f"process.runtime.{self.implementation}.gc_count",
+                "cpython.gc.collections",
             )
         if sys.platform != "darwin":
             observer_names.append("system.network.connections")
@@ -958,30 +958,21 @@ def test_runtime_get_count(self, mock_gc_get_count):
             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"
     )
-    def test_runtime_get_count(self, mock_gc_get_count):
+    def test_runtime_get_gc_collections(self, mock_gc_get_count):
         mock_gc_get_count.configure_mock(**{"return_value": (1, 2, 3)})
-
-        expected = [
-            _SystemMetricsResult({"count": "0"}, 1),
-            _SystemMetricsResult({"count": "1"}, 2),
-            _SystemMetricsResult({"count": "2"}, 3),
+        expected_gc_collections = [
+            _SystemMetricsResult({"generation": "0"}, 1),
+            _SystemMetricsResult({"generation": "1"}, 2),
+            _SystemMetricsResult({"generation": "2"}, 3),
         ]
         self._test_metrics(
-            f"process.runtime.{self.implementation}.gc_count", expected
+            "cpython.gc.collections",
+            expected_gc_collections,
         )
 
     @mock.patch("psutil.Process.num_ctx_switches")