httpdbg 0.28.2__tar.gz → 0.29.0__tar.gz

{httpdbg-0.28.2 → httpdbg-0.29.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: httpdbg
-Version: 0.28.2
+Version: 0.29.0
 Summary: A very simple tool to debug HTTP(S) client requests
 Author-email: cle-b <cle@tictac.pm>
 License: Apache-2.0
@@ -24,7 +24,7 @@ Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Provides-Extra: pytest
-Requires-Dist: pytest-httpdbg>=0.3.1; extra == "pytest"
+Requires-Dist: pytest-httpdbg>=0.6.0; extra == "pytest"
 
 # httpdbg
 

{httpdbg-0.28.2 → httpdbg-0.29.0}/httpdbg/__init__.py

@@ -3,6 +3,6 @@ from httpdbg.hooks.all import httprecord
 from httpdbg.records import HTTPRecords
 
 
-__version__ = "0.28.2"
+__version__ = "0.29.0"
 
 __all__ = ["httprecord", "HTTPRecords"]

{httpdbg-0.28.2 → httpdbg-0.29.0}/httpdbg/env.py

@@ -1,3 +1,4 @@
+HTTPDBG_CURRENT_GROUP = "HTTPDBG_CURRENT_GROUP"
 HTTPDBG_CURRENT_INITIATOR = "HTTPDBG_CURRENT_INITIATOR"
 HTTPDBG_CURRENT_TAG = "HTTPDBG_CURRENT_TAG"
 HTTPDBG_SUBPROCESS_DIR = "HTTPDBG_SUBPROCESS_DIR"

{httpdbg-0.28.2 → httpdbg-0.29.0}/httpdbg/hooks/aiohttp.py

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+from collections.abc import Callable
 from contextlib import contextmanager
 import traceback
 from typing import Generator
@@ -7,11 +8,10 @@ from httpdbg.hooks.utils import getcallargs
 from httpdbg.hooks.utils import decorate
 from httpdbg.hooks.utils import undecorate
 from httpdbg.initiator import httpdbg_initiator
-from httpdbg.records import HTTPRecord
 from httpdbg.records import HTTPRecords
 
 
-def set_hook_for_aiohttp_async(records, method):
+def set_hook_for_aiohttp_async(records: HTTPRecords, method: Callable):
     async def hook(*args, **kwargs):
         initiator = None
         try:
@@ -25,13 +25,9 @@ def set_hook_for_aiohttp_async(records, method):
 
             if "str_or_url" in callargs:
                 if initiator:
-                    record = HTTPRecord()
-
-                    record.initiator = initiator
-                    record.url = str(callargs["str_or_url"])
-                    record.exception = ex
-
-                    records.requests[record.id] = record
+                    records.add_new_record_exception(
+                        initiator, str(callargs["str_or_url"]), ex
+                    )
             raise
 
     return hook

{httpdbg-0.28.2 → httpdbg-0.29.0}/httpdbg/hooks/external.py

@@ -46,8 +46,10 @@ class WatcherSubprocessDirThread(threading.Thread):
     def load_dump(self):
         for dump in glob.glob(f"{os.environ[HTTPDBG_SUBPROCESS_DIR]}/*.httpdbgrecords"):
             with open(dump, "rb") as dumpfile:
-                newrecords = pickle.load(dumpfile)
+                newrecords: HTTPRecords = pickle.load(dumpfile)
                 self.records.requests.update(newrecords.requests)
+                self.records.initiators.update(newrecords.initiators)
+                self.records.groups.update(newrecords.groups)
 
     def run(self):
         while not self.stop:

{httpdbg-0.28.2 → httpdbg-0.29.0}/httpdbg/hooks/httpx.py

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+from collections.abc import Callable
 from contextlib import contextmanager
 import traceback
 from typing import Generator
@@ -7,11 +8,10 @@ from httpdbg.hooks.utils import getcallargs
 from httpdbg.hooks.utils import decorate
 from httpdbg.hooks.utils import undecorate
 from httpdbg.initiator import httpdbg_initiator
-from httpdbg.records import HTTPRecord
 from httpdbg.records import HTTPRecords
 
 
-def set_hook_for_httpx_async(records, method):
+def set_hook_for_httpx_async(records: HTTPRecords, method: Callable):
     async def hook(*args, **kwargs):
         initiator = None
         try:
@@ -25,19 +25,15 @@ def set_hook_for_httpx_async(records, method):
 
             if "url" in callargs:
                 if initiator:
-                    record = HTTPRecord()
-
-                    record.initiator = initiator
-                    record.url = str(callargs["url"])
-                    record.exception = ex
-
-                    records.requests[record.id] = record
+                    records.add_new_record_exception(
+                        initiator, str(callargs["url"]), ex
+                    )
             raise
 
     return hook
 
 
-def set_hook_for_httpx(records, method):
+def set_hook_for_httpx(records: HTTPRecords, method: Callable):
     def hook(*args, **kwargs):
         initiator = None
         try:
@@ -51,13 +47,9 @@ def set_hook_for_httpx(records, method):
 
             if "url" in callargs:
                 if initiator:
-                    record = HTTPRecord()
-
-                    record.initiator = initiator
-                    record.url = str(callargs["url"])
-                    record.exception = ex
-
-                    records.requests[record.id] = record
+                    records.add_new_record_exception(
+                        initiator, str(callargs["url"]), ex
+                    )
             raise
 
     return hook

{httpdbg-0.28.2 → httpdbg-0.29.0}/httpdbg/hooks/pytest.py

@@ -1,16 +1,20 @@
 # -*- coding: utf-8 -*-
+from collections.abc import Callable
 from contextlib import contextmanager
 from typing import Generator
 
 from httpdbg.hooks.utils import decorate
 from httpdbg.hooks.utils import getcallargs
 from httpdbg.hooks.utils import undecorate
+from httpdbg.initiator import httpdbg_group
 from httpdbg.initiator import httpdbg_tag
+from httpdbg.log import logger
 from httpdbg.records import HTTPRecords
 
 
-def set_hook_for_pytest_fixture(_, method):
+def set_hook_for_pytest_fixture(_: HTTPRecords, method: Callable):
     def hook(*args, **kwargs):
+        logger().info("SET_HOOK_FOR_PYTEST_FIXTURE")
         callargs = getcallargs(method, *args, **kwargs)
 
         if "fixturefunc" in callargs:
@@ -22,11 +26,28 @@ def set_hook_for_pytest_fixture(_, method):
     return hook
 
 
+def set_hook_for_pytest_runtest(records: HTTPRecords, method: Callable):
+    def hook(*args, **kwargs):
+        logger().info("SET_HOOK_FOR_PYTEST_RUNTEST")
+        callargs = getcallargs(method, *args, **kwargs)
+
+        if "item" in callargs:
+            full_label = getattr(callargs["item"], "nodeid", "unknown test")
+            label = getattr(callargs["item"], "name", "unknown test")
+            with httpdbg_group(records, label, full_label):
+                return method(*args, **kwargs)
+        else:
+            return method(*args, **kwargs)
+
+    return hook
+
+
 @contextmanager
 def hook_pytest(records: HTTPRecords) -> Generator[None, None, None]:
     hooks = False
     try:
         import _pytest.fixtures
+        import _pytest.runner
 
         _pytest.fixtures.call_fixture_func = decorate(
             records, _pytest.fixtures.call_fixture_func, set_hook_for_pytest_fixture
@@ -36,6 +57,11 @@ def hook_pytest(records: HTTPRecords) -> Generator[None, None, None]:
             _pytest.fixtures._teardown_yield_fixture,
             set_hook_for_pytest_fixture,
         )
+
+        _pytest.runner.runtestprotocol = decorate(
+            records, _pytest.runner.runtestprotocol, set_hook_for_pytest_runtest
+        )
+
         hooks = True
     except ImportError:
         pass
@@ -49,3 +75,5 @@ def hook_pytest(records: HTTPRecords) -> Generator[None, None, None]:
         _pytest.fixtures._teardown_yield_fixture = undecorate(
             _pytest.fixtures._teardown_yield_fixture
         )
+
+        _pytest.runner.runtestprotocol = undecorate(_pytest.runner.runtestprotocol)

{httpdbg-0.28.2 → httpdbg-0.29.0}/httpdbg/hooks/requests.py

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+from collections.abc import Callable
 from contextlib import contextmanager
 import traceback
 from typing import Generator
@@ -7,11 +8,10 @@ from httpdbg.hooks.utils import getcallargs
 from httpdbg.hooks.utils import decorate
 from httpdbg.hooks.utils import undecorate
 from httpdbg.initiator import httpdbg_initiator
-from httpdbg.records import HTTPRecord
 from httpdbg.records import HTTPRecords
 
 
-def set_hook_for_requests(records, method):
+def set_hook_for_requests(records: HTTPRecords, method: Callable):
     def hook(*args, **kwargs):
         initiator = None
         try:
@@ -25,13 +25,9 @@ def set_hook_for_requests(records, method):
 
             if "url" in callargs:
                 if initiator:
-                    record = HTTPRecord()
-
-                    record.initiator = initiator
-                    record.url = str(callargs["url"])
-                    record.exception = ex
-
-                    records.requests[record.id] = record
+                    records.add_new_record_exception(
+                        initiator, str(callargs["url"]), ex
+                    )
             raise
 
     return hook

{httpdbg-0.28.2 → httpdbg-0.29.0}/httpdbg/hooks/socket.py

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 import asyncio
 import asyncio.proactor_events
+from collections.abc import Callable
 from contextlib import contextmanager
 import platform
 import socket
@@ -16,7 +17,10 @@ from httpdbg.records import HTTPRecords
 from httpdbg.log import logger
 
 
-def set_hook_for_socket_init(records, method):
+# hook: socket.socket.__init__
+# what: A new socket object is created.
+# action: If an entry exists in the temporary raw socket storage list, it is removed.
+def set_hook_for_socket_init(records: HTTPRecords, method: Callable):
     def hook(self, *args, **kwargs):
         records.del_socket_data(self)
 
@@ -25,27 +29,24 @@ def set_hook_for_socket_init(records, method):
     return hook
 
 
-def set_hook_for_socket_connect(records, method):
+# hook: socket.socket.connect, ssl.SSLSocket.connect
+# what: A connection to a remote socket is initiated.
+# action: A new entry is added to the temporary raw socket storage list.
+def set_hook_for_socket_connect(records: HTTPRecords, method: Callable):
     def hook(self, address):
         socketdata = records.get_socket_data(self, force_new=True)
         if socketdata:
             logger().info(
                 f"CONNECT - self={self} id={id(self)} socketdata={socketdata} address={address}"
             )
-
         try:
             r = method(self, address)
         except Exception as ex:
             if not isinstance(
                 ex, (BlockingIOError, OSError)
             ):  # BlockingIOError for async, OSError for ipv6
-                record = HTTPRecord()
-                record.initiator = records.get_initiator()
-
-                record.exception = ex
-
-                records.requests[record.id] = record
-
+                initiator = records.get_initiator()
+                records.add_new_record_exception(initiator, "", ex)
             raise
 
         return r
@@ -53,18 +54,17 @@ def set_hook_for_socket_connect(records, method):
     return hook
 
 
-def set_hook_for_ssl_wrap_socket(records, method):
+# hook: ssl.wrap_socket,
+# what: Takes an instance sock of socket.socket, and returns an instance of ssl.SSLSocket.
+# a subtype of socket.socket, which wraps the underlying socket in an SSL context.
+# action: Link the socket and the sslsocket
+def set_hook_for_ssl_wrap_socket(records: HTTPRecords, method: Callable):
     def hook(sock, *args, **kwargs):
         try:
             sslsocket = method(sock, *args, **kwargs)
         except Exception as ex:
-            record = HTTPRecord()
-
-            record.initiator = records.get_initiator()
-            record.exception = ex
-
-            records.requests[record.id] = record
-
+            initiator = records.get_initiator()
+            records.add_new_record_exception(initiator, "", ex)
             raise
 
         logger().info(
@@ -80,18 +80,16 @@ def set_hook_for_ssl_wrap_socket(records, method):
     return hook
 
 
-def set_hook_for_sslcontext_wrap_socket(records, method):
+# hook: ssl.SSLContext.wrap_socket
+# what: Wrap an existing Python socket sock and return an instance of SSLContext.sslsocket_class (default SSLSocket).
+# action: Link the socket and the sslsocket
+def set_hook_for_sslcontext_wrap_socket(records: HTTPRecords, method: Callable):
     def hook(self, sock, *args, **kwargs):
         try:
             sslsocket = method(self, sock, *args, **kwargs)
         except Exception as ex:
-            record = HTTPRecord()
-
-            record.initiator = records.get_initiator()
-            record.exception = ex
-
-            records.requests[record.id] = record
-
+            initiator = records.get_initiator()
+            records.add_new_record_exception(initiator, "", ex)
             raise
 
         logger().info(
@@ -107,18 +105,16 @@ def set_hook_for_sslcontext_wrap_socket(records, method):
     return hook
 
 
-def set_hook_for_socket_wrap_bio(records, method):
+# hook: ssl.SSLContext.wrap_bio
+# what: Wrap the BIO objects incoming and outgoing and return an instance of SSLContext.sslobject_class (default SSLObject).
+# action: Record a new SocketRawData if necessary
+def set_hook_for_socket_wrap_bio(records: HTTPRecords, method: Callable):
     def hook(self, *args, **kwargs):
         try:
             sslobject = method(self, *args, **kwargs)
         except Exception as ex:
-            record = HTTPRecord()
-            record.initiator = records.get_initiator()
-
-            record.exception = ex
-
-            records.requests[record.id] = record
-
+            initiator = records.get_initiator()
+            records.add_new_record_exception(initiator, "", ex)
             raise
 
         logger().info(
@@ -134,7 +130,10 @@ def set_hook_for_socket_wrap_bio(records, method):
     return hook
 
 
-def set_hook_for_socket_recv_into(records, method):
+# hook: socket.socket.recv_into, ssl.SSLSocket.recv_into, asyncio.proactor_events._ProactorReadPipeTransport._data_received
+# what: Receive up to nbytes bytes from the socket, storing the data into a buffer rather than creating a new bytestring.
+# action: Append the data to an existing SocketRawData
+def set_hook_for_socket_recv_into(records: HTTPRecords, method: Callable):
     def hook(self, buffer, *args, **kwargs):
         socketdata = records.get_socket_data(self)
         if socketdata:
@@ -160,7 +159,10 @@ def set_hook_for_socket_recv_into(records, method):
     return hook
 
 
-def set_hook_for_socket_recv(records, method):
+# hook: socket.socket.recv, ssl.SSLSocket.recv
+# what: Receive data from the socket. The return value is a bytes object representing the data received.
+# action: Append the data to an existing SocketRawData
+def set_hook_for_socket_recv(records: HTTPRecords, method: Callable):
     def hook(self, bufsize, *args, **kwargs):
         socketdata = records.get_socket_data(self)
         if socketdata:
@@ -183,7 +185,11 @@ def set_hook_for_socket_recv(records, method):
     return hook
 
 
-def set_hook_for_socket_sendall(records, method):
+# hook: socket.socket.sendall
+# what: Send data to the socket.
+# action: Append the data to an existing SocketRawData. Check if this is an HTTP request.
+# and record it if this is case, otherwise delete the temporay SocketRawData.
+def set_hook_for_socket_sendall(records: HTTPRecords, method: Callable):
     def hook(self, bytes, *args, **kwargs):
         socketdata = records.get_socket_data(self, request=True)
         if socketdata:
@@ -200,7 +206,7 @@ def set_hook_for_socket_sendall(records, method):
                 if http_detected:
                     logger().info("SENDALL - http detected")
                     socketdata.record = HTTPRecord(tbegin=socketdata.tbegin)
-                    socketdata.record.initiator = records.get_initiator()
+                    socketdata.record.initiator_id = records.get_initiator()
                     socketdata.record.address = socketdata.address
                     socketdata.record.ssl = socketdata.ssl
                     socketdata.record.request.rawdata = socketdata.rawdata
@@ -218,7 +224,11 @@ def set_hook_for_socket_sendall(records, method):
     return hook
 
 
-def set_hook_for_socket_send(records, method):
+# hook: socket.socket.send, ssl.SSLSocket.send, asyncio.proactor_events._ProactorBaseWritePipeTransport.write
+# what: Send data to the socket.
+# action: Append the data to an existing SocketRawData. Check if this is an HTTP request.
+# and record it if this is case, otherwise delete the temporay SocketRawData.
+def set_hook_for_socket_send(records: HTTPRecords, method: Callable):
     def hook(self, bytes, *args, **kwargs):
         socketdata = records.get_socket_data(self, request=True)
         if socketdata:
@@ -241,7 +251,7 @@ def set_hook_for_socket_send(records, method):
                 http_detected = socketdata.http_detected()
                 if http_detected:
                     socketdata.record = HTTPRecord(tbegin=socketdata.tbegin)
-                    socketdata.record.initiator = records.get_initiator()
+                    socketdata.record.initiator_id = records.get_initiator()
                     socketdata.record.address = socketdata.address
                     socketdata.record.ssl = socketdata.ssl
                     socketdata.record.request.rawdata = socketdata.rawdata
@@ -253,7 +263,10 @@ def set_hook_for_socket_send(records, method):
     return hook
 
 
-def set_hook_for_asyncio_create_connection(records, method):
+# hook: asyncio.BaseEventLoop.create_connection
+# what: Open a streaming transport connection to a given address specified by host and port.
+# action: Link the socket and the sslsocket
+def set_hook_for_asyncio_create_connection(records: HTTPRecords, method: Callable):
     async def hook(self, *args, **kwargs):
         logger().info(
             f"CREATE_CONNECTION - self={self} id={id(self)} args={args} kwargs={kwargs}"
@@ -276,7 +289,11 @@ def set_hook_for_asyncio_create_connection(records, method):
     return hook
 
 
-def set_hook_for_sslobject_write(records, method):
+# hook: ssl.SSLObject.write
+# what: Write buf to the SSL socket and return the number of bytes written.
+# action: Append the data to an existing SocketRawData. Check if this is an HTTP request.
+# and record it if this is case, otherwise delete the temporay SocketRawData.
+def set_hook_for_sslobject_write(records: HTTPRecords, method: Callable):
     def hook(self, buf, *args, **kwargs):
         logger().info(f"WRITE - {type(self)}={id(self)} buf={(b'' + buf)[:20]}")
         socketdata = records.get_socket_data(self, request=True)
@@ -298,7 +315,7 @@ def set_hook_for_sslobject_write(records, method):
                 http_detected = socketdata.http_detected()
                 if http_detected:
                     socketdata.record = HTTPRecord(tbegin=socketdata.tbegin)
-                    socketdata.record.initiator = records.get_initiator()
+                    socketdata.record.initiator_id = records.get_initiator()
                     socketdata.record.address = socketdata.address
                     socketdata.record.ssl = socketdata.ssl
                     socketdata.record.request.rawdata = socketdata.rawdata
@@ -310,7 +327,10 @@ def set_hook_for_sslobject_write(records, method):
     return hook
 
 
-def set_hook_for_sslobject_read(records, method):
+# hook: ssl.SSLObject.read
+# what: Read up to len bytes of data from the SSL socket and return the result as a bytes instance.
+# action: Append the data to an existing SocketRawData.
+def set_hook_for_sslobject_read(records: HTTPRecords, method: Callable):
     def hook(self, *args, **kwargs):
         logger().info(f"READ - {type(self)}={id(self)}")
         socketdata = records.get_socket_data(self)
@@ -393,7 +413,7 @@ def hook_socket(records: HTTPRecords) -> Generator[None, None, None]:
     )
 
     # only for async HTTP requests (not HTTPS) on Windows
-    if (platform.system().lower() == "windows") and (sys.version_info >= (3, 7)):
+    if platform.system().lower() == "windows":
         asyncio.proactor_events._ProactorReadPipeTransport._data_received = decorate(  # type: ignore
             records,
             asyncio.proactor_events._ProactorReadPipeTransport._data_received,  # type: ignore
@@ -435,7 +455,7 @@ def hook_socket(records: HTTPRecords) -> Generator[None, None, None]:
     )
 
     # only for async HTTP requests (not HTTPS) on Windows
-    if (platform.system().lower() == "windows") and (sys.version_info >= (3, 7)):
+    if platform.system().lower() == "windows":
         asyncio.proactor_events._ProactorReadPipeTransport._data_received = undecorate(  # type: ignore
             asyncio.proactor_events._ProactorReadPipeTransport._data_received  # type: ignore
         )

{httpdbg-0.28.2 → httpdbg-0.29.0}/httpdbg/hooks/urllib3.py

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+from collections.abc import Callable
 from contextlib import contextmanager
 import traceback
 from typing import Generator
@@ -7,11 +8,10 @@ from httpdbg.hooks.utils import getcallargs
 from httpdbg.hooks.utils import decorate
 from httpdbg.hooks.utils import undecorate
 from httpdbg.initiator import httpdbg_initiator
-from httpdbg.records import HTTPRecord
 from httpdbg.records import HTTPRecords
 
 
-def set_hook_for_urllib3(records, method):
+def set_hook_for_urllib3(records: HTTPRecords, method: Callable):
     def hook(*args, **kwargs):
         initiator = None
         try:
@@ -25,13 +25,9 @@ def set_hook_for_urllib3(records, method):
 
             if "url" in callargs:
                 if initiator:
-                    record = HTTPRecord()
-
-                    record.initiator = initiator
-                    record.url = str(callargs["url"])
-                    record.exception = ex
-
-                    records.requests[record.id] = record
+                    records.add_new_record_exception(
+                        initiator, str(callargs["url"]), ex
+                    )
             raise
 
     return hook

{httpdbg-0.28.2 → httpdbg-0.29.0}/httpdbg/initiator.py

@@ -7,7 +7,12 @@ from typing import Generator
 from typing import List
 from typing import Tuple
 from typing import Union
+from typing import TYPE_CHECKING
 
+if TYPE_CHECKING:
+    from httpdbg.records import HTTPRecords
+
+from httpdbg.env import HTTPDBG_CURRENT_GROUP
 from httpdbg.env import HTTPDBG_CURRENT_INITIATOR
 from httpdbg.env import HTTPDBG_CURRENT_TAG
 from httpdbg.hooks.utils import getcallargs
@@ -15,26 +20,23 @@ from httpdbg.utils import get_new_uuid
 from httpdbg.log import logger
 
 
-class Initiator(object):
+class Initiator:
     def __init__(
         self,
         id: str,
-        short_label: str,
-        long_label: Union[str, None],
+        label: str,
         short_stack: str,
         stack: List[str],
     ):
         self.id = id
-        self.short_label = short_label
-        self.long_label = long_label
+        self.label = label
         self.short_stack = short_stack
         self.stack = stack
 
     def __eq__(self, other) -> bool:
         if type(other) is Initiator:
             return (
-                self.short_label == other.short_label
-                and self.long_label == other.long_label
+                self.label == other.label
                 and self.short_stack == other.short_stack
                 and self.stack == other.stack
             )
@@ -45,21 +47,29 @@ class Initiator(object):
         if full:
             json = {
                 "id": self.id,
-                "short_label": self.short_label,
-                "long_label": self.long_label,
+                "label": self.label,
                 "short_stack": self.short_stack,
                 "stack": "\n".join(self.stack),
             }
         else:
             json = {
                 "id": self.id,
-                "short_label": self.short_label,
-                "long_label": self.long_label,
+                "label": self.label,
                 "short_stack": self.short_stack,
             }
         return json
 
 
+class Group:
+    def __init__(self, id: str, label: str, full_label: str):
+        self.id = id
+        self.label = label
+        self.full_label = full_label
+
+    def to_json(self) -> dict:
+        return {"id": self.id, "label": self.label, "full_label": self.full_label}
+
+
 def compatible_path(path: str) -> str:
     p = path
     if platform.system().lower() == "windows":
@@ -205,15 +215,16 @@ def httpdbg_initiator(
             short_stack += f"    {k}={v}\n"
         short_stack += ")"
 
-        current_initiator = Initiator(
-            get_new_uuid(), instruction, None, short_stack, stack
-        )
-        records._initiators[current_initiator.id] = current_initiator
+        current_initiator = Initiator(get_new_uuid(), instruction, short_stack, stack)
+        records.initiators[current_initiator.id] = current_initiator
 
         os.environ[envname] = current_initiator.id
 
         try:
-            yield current_initiator
+            with httpdbg_group(
+                records, instruction, short_stack
+            ):  # by default we group the requests by initiator
+                yield current_initiator
         except Exception:
             del os.environ[envname]
             raise
@@ -233,6 +244,7 @@ def httpdbg_tag(tag: str) -> Generator[None, None, None]:
         os.environ[HTTPDBG_CURRENT_TAG] = tag
 
     try:
+        logger().info(f"httpdbg_tag {tag}")
         yield
     except Exception:
         if (not tag_already_set) and (HTTPDBG_CURRENT_TAG in os.environ):
@@ -241,3 +253,30 @@ def httpdbg_tag(tag: str) -> Generator[None, None, None]:
 
     if (not tag_already_set) and (HTTPDBG_CURRENT_TAG in os.environ):
         del os.environ[HTTPDBG_CURRENT_TAG]
+
+
+@contextmanager
+def httpdbg_group(
+    records: "HTTPRecords", label: str, full_label: str
+) -> Generator[None, None, None]:
+
+    group_already_set = HTTPDBG_CURRENT_GROUP in os.environ
+
+    if not group_already_set:
+        logger().info("httpdbg_group (new)")
+        group_id = get_new_uuid()
+        records.groups[group_id] = Group(group_id, label, full_label)
+        os.environ[HTTPDBG_CURRENT_GROUP] = group_id
+
+    try:
+        logger().info(
+            f"httpdbg_group {records.groups} group_id={os.environ[HTTPDBG_CURRENT_GROUP]} label={label} full_label={full_label}"
+        )
+        yield
+    except Exception:
+        if (not group_already_set) and (HTTPDBG_CURRENT_GROUP in os.environ):
+            del os.environ[HTTPDBG_CURRENT_GROUP]
+        raise
+
+    if (not group_already_set) and (HTTPDBG_CURRENT_GROUP in os.environ):
+        del os.environ[HTTPDBG_CURRENT_GROUP]