whatap-python 1.8.13rc2__tar.gz → 1.8.14rc1__tar.gz

{whatap_python-1.8.13rc2 → whatap_python-1.8.14rc1}/PKG-INFO

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

whatap_python-1.8.14rc1/whatap/build.py

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

{whatap_python-1.8.13rc2 → whatap_python-1.8.14rc1}/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.13rc2 → whatap_python-1.8.14rc1}/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', '')
@@ -222,6 +226,8 @@ def interceptor_db_con(fn, db_info, *args, **kwargs):
 
 def interceptor_db_execute(fn, db_info, *args, **kwargs):
     ctx = TraceContextManager.getLocalContext()
+    if not ctx:
+        return fn(*args, **kwargs)
     # sendDebugProfile(ctx, 'interceptor_db_execute step -1')
     self = args[0]
     db_type = db_info.get('type')
@@ -289,10 +295,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 +364,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', '')
@@ -373,6 +390,8 @@ async def async_interceptor_db_con(fn, db_info, *args, **kwargs):
 
 async def async_interceptor_db_execute(fn, db_info, *args, **kwargs):
     ctx = TraceContextManager.getLocalContext()
+    if not ctx:
+        return await fn(*args, **kwargs)
     self = args[0]
     db_type = db_info.get('type')
     query = None
@@ -445,10 +464,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.13rc2 → whatap_python-1.8.14rc1}/whatap_python.egg-info/PKG-INFO

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

whatap_python-1.8.13rc2/whatap/build.py

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