c2cwsgiutils 6.2.0.dev23__py3-none-any.whl → 6.2.0.dev27__py3-none-any.whl

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.dist-info → c2cwsgiutils-6.2.0.dev27.dist-info}/METADATA

@@ -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.dist-info → c2cwsgiutils-6.2.0.dev27.dist-info}/RECORD

@@ -20,7 +20,7 @@ c2cwsgiutils/db.py,sha256=JT5F9Dqm2r0Jsh3w3CX79ngAUtakMLpf1secfN1nQnk,16106
 c2cwsgiutils/db_maintenance_view.py,sha256=58F-p9drkhCI99GoLRPIqT5U-Pm8ckSSUEl-tNxMmjU,3088
 c2cwsgiutils/debug/__init__.py,sha256=GkYNt2fU5PFykw9HmqPEwZrF2mTJumjSu54pp38EhOM,1325
 c2cwsgiutils/debug/_listeners.py,sha256=RZYwQRh86rU-Vtjxc3xOZL2A8D_5LHIBd-xWAMQCrj0,4421
-c2cwsgiutils/debug/_views.py,sha256=53BflHhtLwtgS2uFJYg2jUEZaFhCI-iYWfSxu5B2swc,7554
+c2cwsgiutils/debug/_views.py,sha256=rxvxxzSIiwfdRieGkR6BG4zGa3hd1e17r-GMoQOSzgM,8511
 c2cwsgiutils/debug/utils.py,sha256=sIKZHQ8empzxE2OI3h7Uce8cvv4O7AD1y_VYeZfLVCA,2320
 c2cwsgiutils/errors.py,sha256=-hWLQ1qDlh9kn06-33U2c39BbOxuCvJIkBkdxriE5mo,6644
 c2cwsgiutils/health_check.py,sha256=OhfPcApBht1qtBOX8e8pdeq3QwF4FbgGkofjqpl8GvQ,20068
@@ -60,8 +60,8 @@ c2cwsgiutils/stats_pyramid/_db_spy.py,sha256=A61t6VKIrRRIjbyZTldmAUl_Q3ZDVFYqyxj
 c2cwsgiutils/stats_pyramid/_pyramid_spy.py,sha256=mRiOmQXV9x8JjkGV4MsaC7sD3qO6dWUTog0bharLLD0,3517
 c2cwsgiutils/templates/index.html.mako,sha256=Ey9ppHLe-eFGYXYPV5Z2WbMBSif86sYPiTviksnG7TI,1362
 c2cwsgiutils/version.py,sha256=1ghPu-aKMJdfCSUrxgBENNqNQ-7JMKJr6tS14dDmW4Q,3110
-c2cwsgiutils-6.2.0.dev23.dist-info/LICENSE,sha256=r7ueGz9Fl2Bv3rmeQy0DEtohLmAiufRaCuv6Y5fyNhE,1304
-c2cwsgiutils-6.2.0.dev23.dist-info/METADATA,sha256=WqLL0QjY18zCYMzptjNjGA78PFWuAfYXT2wTwM3RMEs,34402
-c2cwsgiutils-6.2.0.dev23.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-c2cwsgiutils-6.2.0.dev23.dist-info/entry_points.txt,sha256=ujgqMTL1awN9qDg8WXmrF7m0fgR-hslUM6zKH86pvy0,703
-c2cwsgiutils-6.2.0.dev23.dist-info/RECORD,,
+c2cwsgiutils-6.2.0.dev27.dist-info/LICENSE,sha256=r7ueGz9Fl2Bv3rmeQy0DEtohLmAiufRaCuv6Y5fyNhE,1304
+c2cwsgiutils-6.2.0.dev27.dist-info/METADATA,sha256=FzdiFUvSshMPqfGefTnWFHwB6Gdd6OjOvRJHxOwGUjg,34461
+c2cwsgiutils-6.2.0.dev27.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+c2cwsgiutils-6.2.0.dev27.dist-info/entry_points.txt,sha256=ujgqMTL1awN9qDg8WXmrF7m0fgR-hslUM6zKH86pvy0,703
+c2cwsgiutils-6.2.0.dev27.dist-info/RECORD,,