c2cwsgiutils 6.2.0.dev23__tar.gz → 6.2.0.dev27__tar.gz

{c2cwsgiutils-6.2.0.dev23 → c2cwsgiutils-6.2.0.dev27}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: c2cwsgiutils
-Version: 6.2.0.dev23
+Version: 6.2.0.dev27
 Summary: Common utilities for Camptocamp WSGI applications
 Home-page: https://github.com/camptocamp/c2cwsgiutils
 License: BSD-2-Clause
@@ -44,6 +44,7 @@ Requires-Dist: gunicorn ; extra == "standard" or extra == "webserver" or extra =
 Requires-Dist: lxml ; extra == "tests" or extra == "all"
 Requires-Dist: objgraph ; extra == "debug" or extra == "all"
 Requires-Dist: prometheus-client ; extra == "standard" or extra == "webserver" or extra == "all"
+Requires-Dist: psutil ; extra == "debug" or extra == "all"
 Requires-Dist: psycopg2 ; extra == "standard" or extra == "webserver" or extra == "all"
 Requires-Dist: pyjwt ; extra == "standard" or extra == "oauth2" or extra == "all"
 Requires-Dist: pyramid ; extra == "standard" or extra == "webserver" or extra == "all"

{c2cwsgiutils-6.2.0.dev23 → c2cwsgiutils-6.2.0.dev27}/c2cwsgiutils/debug/_views.py

@@ -1,5 +1,6 @@
 import gc
 import logging
+import os
 import re
 import time
 from collections.abc import Mapping
@@ -8,6 +9,7 @@ from io import StringIO
 from typing import Any, Callable, cast
 
 import objgraph
+import psutil
 import pyramid.config
 import pyramid.request
 import pyramid.response
@@ -87,6 +89,9 @@ def _dump_memory_diff(request: pyramid.request.Request) -> list[Any]:
         gc.collect(i)
 
     objgraph.growth(limit=limit, peak_stats=peak_stats, shortnames=False)
+    process = psutil.Process(os.getpid())
+    mem_before = process.memory_info()
+    start_time = time.time()
 
     response = None
     try:
@@ -96,12 +101,26 @@ def _dump_memory_diff(request: pyramid.request.Request) -> list[Any]:
     except HTTPException as ex:
         _LOG.debug("response was %s", str(ex))
 
+    elapsed_time = time.time() - start_time
     del response
 
     for i in range(3):
         gc.collect(i)
 
-    return objgraph.growth(limit=limit, peak_stats=peak_stats, shortnames=False)  # type: ignore
+    mem_after = process.memory_info()
+    return {
+        "memory.growth": {
+            "rss_kb": (mem_after.rss - mem_before.rss) / 1024,
+            "vms_kb": (mem_after.vms - mem_before.vms) / 1024,
+            "shared_kb": (mem_after.shared - mem_before.shared) / 1024,
+            "text_kb": (mem_after.text - mem_before.text) / 1024,
+            "lib_kb": (mem_after.lib - mem_before.lib) / 1024,
+            "data_kb": (mem_after.data - mem_before.data) / 1024,
+            "dirty_kb": (mem_after.dirty - mem_before.dirty) / 1024,
+        },
+        "elapsed_time": elapsed_time,
+        "objgraph.growth": objgraph.growth(limit=limit, peak_stats=peak_stats, shortnames=False),  # type: ignore
+    }
 
 
 def _sleep(request: pyramid.request.Request) -> pyramid.response.Response:
@@ -189,10 +208,17 @@ def _show_refs(request: pyramid.request.Request) -> pyramid.response.Response:
         args["extra_info"] = lambda obj: f"{get_size(obj) / 1024:.3f} kb\n{id(obj)}"
 
     result = StringIO()
-    if request.params.get("backrefs", "") != "":
-        objgraph.show_backrefs(objs, output=result, **args)
-    else:
-        objgraph.show_refs(objs, output=result, filter=lambda x: not objgraph.inspect.isclass(x), **args)
+    if request.params.get("backrefs", "") == "":
+
+        def new_filter(x: Any) -> bool:
+            return not objgraph.inspect.isclass(x)
+
+        if "filter" in args:
+            old_filter = args["filter"]
+            args["filter"] = lambda x: old_filter(x) and new_filter(x)
+        else:
+            args["filter"] = new_filter
+    objgraph.show_backrefs(objs, output=result, **args)
 
     request.response.content_type = "text/vnd.graphviz"
     request.response.text = result.getvalue()

{c2cwsgiutils-6.2.0.dev23 → c2cwsgiutils-6.2.0.dev27}/pyproject.toml

@@ -16,7 +16,7 @@ strict = true
 
 [tool.poetry]
 name = "c2cwsgiutils"
-version = "6.2.0.dev23"
+version = "6.2.0.dev27"
 description = "Common utilities for Camptocamp WSGI applications"
 readme = "README.md"
 authors = ["Camptocamp <info@camptocamp.com>"]
@@ -92,6 +92,7 @@ waitress = { version = "3.0.1", optional = true }
 scikit-image = { version = "0.24.0", optional = true }
 prometheus-client = { version = "0.21.0", optional = true}
 pyramid_mako = { version = "1.1.0", optional = true}
+psutil = { version = "6.1.0", optional = true}
 
 [tool.poetry.extras]
 standard = [
@@ -118,7 +119,7 @@ standard = [
   "pyramid_mako",
 ]
 alembic = ["alembic"]
-debug = ["objgraph"]
+debug = ["objgraph", "psutil"]
 oauth2 = ["pyjwt", "requests-oauthlib"]
 sentry = ["sentry-sdk"]
 dev = ["waitress"]
@@ -141,6 +142,7 @@ all = [
   "alembic",
   # debug
   "objgraph",
+  "psutil",
   # oauth2
   "pyjwt",
   "requests-oauthlib",