Merge pull request #110 from cisco-open/fix/aiohttp-decode

fix(aiohttp): fixed decode error

Author: osherv

cisco_telescope/instrumentations/aiohttp/__init__.py

@@ -14,6 +14,7 @@
 limitations under the License.
 """
 import asyncio
+import logging
 import types
 from collections import deque
 
@@ -176,17 +177,24 @@ async def on_request_chunk_sent(
         params: aiohttp.TraceRequestChunkSentParams,
     ):
         if getattr(params, "chunk"):
-            decoded_chunk = params.chunk.decode()
-            trace_config_ctx.request_body += decoded_chunk
+            trace_config_ctx.request_body += _decode_chunk(params.chunk)
 
     async def on_responde_chunk_received(
         unused_session: aiohttp.ClientSession,
         trace_config_ctx: types.SimpleNamespace,
         params: aiohttp.TraceRequestChunkSentParams,
     ):
         if getattr(params, "chunk"):
-            decoded_chunk = params.chunk.decode()
-            trace_config_ctx.response_body += decoded_chunk
+            trace_config_ctx.response_body += _decode_chunk(params.chunk)
+
+    def _decode_chunk(chunk):
+        try:
+            decoded_chunk = chunk.decode()
+        except UnicodeDecodeError as e:
+            decoded_chunk = str(chunk)
+            logging.info(f"Could not decode body chunk: {decoded_chunk}, {e}")
+
+        return decoded_chunk
 
     def _trace_config_ctx_factory(**kwargs):
         kwargs.setdefault("trace_request_ctx", {})