whatap-python 1.8.13rc1__tar.gz → 1.8.13rc3__tar.gz

{whatap_python-1.8.13rc1 → whatap_python-1.8.13rc3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: whatap-python
-Version: 1.8.13rc1
+Version: 1.8.13rc3
 Summary: Monitoring and Profiling Service
 Home-page: https://www.whatap.io
 Author: whatap

whatap_python-1.8.13rc3/whatap/build.py

@@ -0,0 +1,4 @@
+app = 'Python'
+name = 'whatap-python'
+version = '1.8.13rc3'
+release_date = '20250926'

{whatap_python-1.8.13rc1 → whatap_python-1.8.13rc3}/whatap/trace/mod/database/psycopg3.py

@@ -218,14 +218,17 @@ def _sync_wrapper(fn):
 
         db_info = {"type": "postgresql"}
 
-        if args and isinstance(args[0], str) and '=' in args[0]:
+        if args:
             conn_str = args[0]
-            parsed_kwargs = dict(
-                x.split('=') for x in conn_str.split()
-            )
-            kwargs.update(parsed_kwargs)
-
-        db_info.update(kwargs)
+            if isinstance(args[0], str) and '=' in args[0]:
+                parsed_kwargs = dict(
+                    x.split('=') for x in conn_str.split()
+                )
+                kwargs.update(parsed_kwargs)
+                db_info.update(kwargs)
+            else:
+                db_info.update({"db_con_stc": "completed"})
+                db_info.update({"db_str": args[0]})
 
         connection = interceptor_db_con(fn, db_info, *args, **kwargs)
         if hasattr(connection, '_is_wrapped'):
@@ -243,14 +246,18 @@ def _async_wrapper(fn):
 
         db_info = {"type": "postgresql"}
 
-        if args and isinstance(args[0], str) and '=' in args[0]:
+        if args:
             conn_str = args[0]
-            parsed_kwargs = dict(
-                x.split('=') for x in conn_str.split()
-            )
-            kwargs.update(parsed_kwargs)
+            if isinstance(args[0], str) and '=' in args[0]:
+                parsed_kwargs = dict(
+                    x.split('=') for x in conn_str.split()
+                )
+                kwargs.update(parsed_kwargs)
+                db_info.update(kwargs)
+            else:
+                db_info.update({"db_con_stc": "completed"})
+                db_info.update({"db_str": args[0]})
 
-        db_info.update(kwargs)
 
         connection = await async_interceptor_db_con(fn, db_info, *args, **kwargs)
         if hasattr(connection, '_is_wrapped'):

{whatap_python-1.8.13rc1 → whatap_python-1.8.13rc3}/whatap/trace/mod/database/util.py

@@ -200,6 +200,10 @@ def interceptor_db_con(fn, db_info, *args, **kwargs):
         text += "/"
         text += db_info.get('user', '')
 
+    elif db_type == "postgresql":
+        if db_info.get('db_con_stc', '') == 'completed':
+            text = db_info.get('db_str', '')
+
     else:
         text = '{}://'.format(db_type)
         text += kwargs.get('user', '')
@@ -289,10 +293,17 @@ def interceptor_db_execute(fn, db_info, *args, **kwargs):
     except Exception as e:
         interceptor_step_error(e)
     finally:
-        datas = [ctx.lctx.get('dbc', ''), query, str(self.rowcount)]
+        try:
+            if hasattr(args[0], 'rowcount'):
+                count = args[0].rowcount
+            else:
+                count = -1
+        except AttributeError:
+            count = -1
+
+        datas = [ctx.lctx.get('dbc', ''), query, str(count)]
         ctx.elapsed = DateUtil.nowSystem() - start_time
         async_sender.send_packet(PacketTypeEnum.TX_SQL, ctx, datas)
-        count = self.rowcount
 
         if (count is not None) and (count > -1):
             desc = '{0}: {1}'.format('Fetch count', count)
@@ -351,6 +362,10 @@ async def async_interceptor_db_con(fn, db_info, *args, **kwargs):
 
     if db_type == "sqlite":
         text = "sqlite:"
+
+    elif db_type == "postgresql":
+        if db_info.get('db_con_stc', '') == 'completed':
+            text = db_info.get('db_str', '')
     else:
         text = '{}://'.format(db_type)
         text += kwargs.get('user', '')
@@ -445,10 +460,17 @@ async def async_interceptor_db_execute(fn, db_info, *args, **kwargs):
         interceptor_step_error(e)
         raise
     finally:
-        datas = [ctx.lctx.get('dbc', ''), query, str(self.rowcount)]
+        try:
+            if hasattr(args[0], 'rowcount'):
+                count = args[0].rowcount
+            else:
+                count = -1
+        except AttributeError:
+            count = -1
+
+        datas = [ctx.lctx.get('dbc', ''), query, str(count)]
         ctx.elapsed = DateUtil.nowSystem() - start_time
         async_sender.send_packet(PacketTypeEnum.TX_SQL, ctx, datas)
-        count = self.rowcount
 
         if (count is not None) and (count > -1):
             desc = '{0}: {1}'.format('Fetch count', count)

whatap_python-1.8.13rc3/whatap/trace/mod/httpc/httpx.py

@@ -0,0 +1,36 @@
+from whatap.trace.mod.application.wsgi import transfer, trace_handler, \
+    interceptor_httpc_request
+
+
+def instrument_httpx(module):
+    def wrapper(fn):
+        @trace_handler(fn)
+        def trace(*args, **kwargs):
+            if len(args) >= 2 and hasattr(args[1], 'headers') and hasattr(args[1], 'url'):
+                request = args[1]
+                request.headers = transfer(request.headers)
+                httpc_url = str(request.url)
+
+            # 2. stream call: send(request=request, ...)
+            elif len(args) == 1 and 'request' in kwargs:
+                request = kwargs['request']
+                if hasattr(request, 'headers') and hasattr(request, 'url'):
+                    request.headers = transfer(request.headers)
+                    httpc_url = str(request.url)
+                else:
+                    httpc_url = "invalid_request_object"
+
+            # 3. 예상치 못한 패턴
+            else:
+                httpc_url = "httpx_unknown_pattern"
+
+            return interceptor_httpc_request(fn, httpc_url, *args, **kwargs)
+
+        return trace
+
+    if hasattr(module, 'Client') and hasattr(module.Client, 'send'):
+        module.Client.send = wrapper(module.Client.send)
+
+
+    if hasattr(module, 'AsyncClient') and hasattr(module.AsyncClient, 'send'):
+        module.AsyncClient.send = wrapper(module.AsyncClient.send)

{whatap_python-1.8.13rc1 → whatap_python-1.8.13rc3}/whatap_python.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: whatap-python
-Version: 1.8.13rc1
+Version: 1.8.13rc3
 Summary: Monitoring and Profiling Service
 Home-page: https://www.whatap.io
 Author: whatap

whatap_python-1.8.13rc1/whatap/build.py

@@ -1,4 +0,0 @@
-app = 'Python'
-name = 'whatap-python'
-version = '1.8.13rc1'
-release_date = '20250917'

whatap_python-1.8.13rc1/whatap/trace/mod/httpc/httpx.py

@@ -1,24 +0,0 @@
-from whatap.trace.mod.application.wsgi import transfer, trace_handler, \
-    interceptor_httpc_request
-
-
-def instrument_httpx(module):
-    def wrapper(fn):
-        @trace_handler(fn)
-        def trace(*args, **kwargs):
-            request = args[1]
-            request.headers = transfer(request.headers)
-
-            httpc_url = str(request.url)
-            callback = interceptor_httpc_request(fn, httpc_url, *args, **kwargs)
-
-            return callback
-
-        return trace
-
-    if hasattr(module, 'Client') and hasattr(module.Client, 'send'):
-        module.Client.send = wrapper(module.Client.send)
-
-
-    if hasattr(module, 'AsyncClient') and hasattr(module.AsyncClient, 'send'):
-        module.AsyncClient.send = wrapper(module.AsyncClient.send)