fixup! feat: skip Python runtime objects in callgrind

Author: not-matthias

src/pytest_codspeed/instruments/hooks/__init__.py

@@ -52,7 +52,7 @@ def __init__(self) -> None:
 
         # Ignore libpython and python executable frames in callgrind so they
         # don't obfuscate the flamegraph.
-        callgrind_skip_python_runtime()
+        self._callgrind_skip_python_runtime()
 
     def __del__(self):
         # Don't manually deinit - let the capsule destructor handle it
@@ -228,28 +228,21 @@ def collect_and_write_python_environment(self) -> None:
 
         self.write_environment()
 
-
-def callgrind_skip_python_runtime() -> None:
-    """Skip libpython and the python executable from callgrind measurement."""
-    try:
-        from . import dist_instrument_hooks  # type: ignore
-    except ImportError:
-        return
-
-    ldlibrary = sysconfig.get_config_var("LDLIBRARY")
-    libdir = sysconfig.get_config_var("LIBDIR")
-    libpython = next(
-        (
-            p
-            for p in (
-                os.path.join(libdir, ldlibrary) if ldlibrary and libdir else None,
-                os.path.join(sys.prefix, "lib", ldlibrary) if ldlibrary else None,
-            )
-            if p and os.path.exists(p)
-        ),
-        None,
-    )
-    if libpython:
-        dist_instrument_hooks.callgrind_add_obj_skip(libpython.encode())
-
-    dist_instrument_hooks.callgrind_add_obj_skip(sys.executable.encode())
+    def _callgrind_skip_python_runtime(self) -> None:
+        """Skip libpython and the python executable from callgrind measurement."""
+        ldlibrary = sysconfig.get_config_var("LDLIBRARY")
+        libdir = sysconfig.get_config_var("LIBDIR")
+        libpython = next(
+            (
+                p
+                for p in (
+                    os.path.join(libdir, ldlibrary) if ldlibrary and libdir else None,
+                    os.path.join(sys.prefix, "lib", ldlibrary) if ldlibrary else None,
+                )
+                if p and os.path.exists(p)
+            ),
+            None,
+        )
+        if libpython:
+            self._module.callgrind_add_obj_skip(libpython.encode())
+        self._module.callgrind_add_obj_skip(sys.executable.encode())