round

Author: david-gang

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

@@ -138,7 +138,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",
             )
 
         self.assertEqual(sorted(metric_names), sorted(observer_names))
@@ -962,7 +962,7 @@ def test_runtime_get_count(self, mock_gc_get_count):
             _SystemMetricsResult({"generation": "2"}, 3),
         ]
         self._test_metrics(
-            f"process.runtime.{self.implementation}.gc_collections",
+            "cpython.gc.collections",
             expected_gc_collections,
         )