From 45f40e07663ea73781dc53cdba12ca0321849e5a Mon Sep 17 00:00:00 2001
From: Yeray Diaz Diaz <yeraydiazdiaz@gmail.com>
Date: Mon, 19 Aug 2019 16:41:12 +0100
Subject: [PATCH] Add logging to h2 connection

---
 httpx/dispatch/http2.py | 16 ++++++++++++++++
 setup.py                |  2 +-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/httpx/dispatch/http2.py b/httpx/dispatch/http2.py
index 980b07b25c..f9f5f8bab3 100644
--- a/httpx/dispatch/http2.py
+++ b/httpx/dispatch/http2.py
@@ -1,5 +1,6 @@
 import functools
 import typing
+import logging
 
 import h2.connection
 import h2.events
@@ -9,6 +10,8 @@
 from ..interfaces import BaseReader, BaseWriter, ConcurrencyBackend
 from ..models import AsyncRequest, AsyncResponse
 
+logger = logging.getLogger(__name__)
+
 
 class HTTP2Connection:
     READ_NUM_BYTES = 4096
@@ -62,6 +65,7 @@ async def close(self) -> None:
         await self.writer.close()
 
     def initiate_connection(self) -> None:
+        logger.debug("H2 Connection initiating")
         self.h2_state.initiate_connection()
         data_to_send = self.h2_state.data_to_send()
         self.writer.write_no_block(data_to_send)
@@ -79,6 +83,7 @@ async def send_headers(
         ] + [(k, v) for k, v in request.headers.raw if k != b"host"]
         self.h2_state.send_headers(stream_id, headers)
         data_to_send = self.h2_state.data_to_send()
+        logger.debug("Stream [%d] - Sending headers: %r", stream_id, data_to_send)
         await self.writer.write(data_to_send, timeout)
         return stream_id
 
@@ -90,6 +95,7 @@ async def send_request_data(
     ) -> None:
         try:
             async for data in stream:
+                logger.debug("Stream [%d] - Sending data chunk: %r", stream_id, data)
                 await self.send_data(stream_id, data, timeout)
             await self.end_stream(stream_id, timeout)
         finally:
@@ -105,11 +111,15 @@ async def send_data(
             chunk = data[idx : idx + chunk_size]
             self.h2_state.send_data(stream_id, chunk)
             data_to_send = self.h2_state.data_to_send()
+            logger.debug("Stream [%d] - Sending data: %d", stream_id, len(data_to_send))
             await self.writer.write(data_to_send, timeout)
 
     async def end_stream(self, stream_id: int, timeout: TimeoutConfig = None) -> None:
         self.h2_state.end_stream(stream_id)
         data_to_send = self.h2_state.data_to_send()
+        logger.debug(
+            "Stream [%d] - Ending request stream with data: %r", stream_id, data_to_send
+        )
         await self.writer.write(data_to_send, timeout)
 
     async def receive_response(
@@ -120,6 +130,9 @@ async def receive_response(
         """
         while True:
             event = await self.receive_event(stream_id, timeout)
+            logger.debug(
+                "Stream [%d] - Event received for response: %r", stream_id, event
+            )
             # As soon as we start seeing response events, we should enable
             # read timeouts, if we haven't already.
             self.timeout_flags[stream_id].set_read_timeouts()
@@ -140,6 +153,7 @@ async def body_iter(
     ) -> typing.AsyncIterator[bytes]:
         while True:
             event = await self.receive_event(stream_id, timeout)
+            logger.debug("Stream [%d] - Event received: %r", stream_id, event)
             if isinstance(event, h2.events.DataReceived):
                 self.h2_state.acknowledge_received_data(len(event.data), stream_id)
                 yield event.data
@@ -152,6 +166,7 @@ async def receive_event(
         while not self.events[stream_id]:
             flag = self.timeout_flags[stream_id]
             data = await self.reader.read(self.READ_NUM_BYTES, timeout, flag=flag)
+            logger.debug("Stream [%d] - Received response events: %r", stream_id, data)
             events = self.h2_state.receive_data(data)
             for event in events:
                 if getattr(event, "stream_id", 0):
@@ -163,6 +178,7 @@ async def receive_event(
         return self.events[stream_id].pop(0)
 
     async def response_closed(self, stream_id: int) -> None:
+        logger.debug("Stream [%d] - Closing response", stream_id)
         del self.events[stream_id]
         del self.timeout_flags[stream_id]
 
diff --git a/setup.py b/setup.py
index e0b42e770f..2c58dd3387 100644
--- a/setup.py
+++ b/setup.py
@@ -53,7 +53,7 @@ def get_packages(package):
         "certifi",
         "chardet==3.*",
         "h11==0.8.*",
-        "h2==3.*",
+        "h2>=3.1.1",
         "hstspreload",
         "idna==2.*",
         "rfc3986==1.*",