whatap-python 1.7.2__tar.gz → 1.7.4__tar.gz

{whatap_python-1.7.2 → whatap_python-1.7.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: whatap-python
-Version: 1.7.2
+Version: 1.7.4
 Summary: Monitoring and Profiling Service
 Home-page: https://www.whatap.io
 Author: whatap

whatap_python-1.7.4/whatap/build.py

@@ -0,0 +1,4 @@
+app = 'Python'
+name = 'whatap-python'
+version = '1.7.4'
+release_date = '20250120'

{whatap_python-1.7.2 → whatap_python-1.7.4}/whatap/net/packet_enum.py

@@ -5,7 +5,7 @@ class PacketEnum(object):
 
     SERVER = "127.0.0.1"
     PORT = 6600
-    PACKET_VERSION = 20101
+    PACKET_VERSION = 20102
 
     # PACKET_HEADER
     PACKET_HEADER_TYPE_POS = 0

{whatap_python-1.7.2 → whatap_python-1.7.4}/whatap/trace/mod/amqp_pika.py

@@ -7,8 +7,8 @@ import whatap.net.async_sender as async_sender
 from whatap.net.packet_type_enum import PacketTypeEnum
 from whatap.util.date_util import DateUtil
 
-def parseConnection(conn):
 
+def parseConnection(conn):
     connstr = ''
     if conn.host:
         connstr += conn.host
@@ -16,6 +16,7 @@ def parseConnection(conn):
         connstr += "/" + conn.virtual_host
     return connstr
 
+
 def intercept_publish(fn, *args, **kwargs):
     ctx = TraceContextManager.getLocalContext()
 
@@ -30,22 +31,30 @@ def intercept_publish(fn, *args, **kwargs):
     ctx.active_dbc = text
     ctx.lctx['dbc'] = text
 
-    ctx.active_dbc = 0
-    ctx.db_opening = True
-    ctx.elapsed = DateUtil.nowSystem() - start_time
-    datas = [' ', ' ', 'MQ SESSION INFO: ' + text]
-    async_sender.send_packet(PacketTypeEnum.TX_MSG, ctx, datas)
+    try:
+        result = fn(*args, **kwargs)
+
+        ctx.active_dbc = 0
+        ctx.db_opening = True
+        ctx.elapsed = DateUtil.nowSystem() - start_time
+        datas = [' ', ' ', 'MQ SESSION INFO: ' + text]
+        async_sender.send_packet(PacketTypeEnum.TX_MSG, ctx, datas)
+
+        return result
+    except Exception as e:
+        ctx.active_dbc = 0
+        ctx.db_opening = False
+        ctx.elapsed = DateUtil.nowSystem() - start_time
+        raise e
+
 
 def instrument_pika(module):
     def wrapper(fn):
         @trace_handler(fn)
         def trace(*args, **kwargs):
-            callback = intercept_publish(fn, *args, **kwargs)
-            return callback
-        
+            return intercept_publish(fn, *args, **kwargs)
+
         return trace
 
     if hasattr(module, 'Channel') and hasattr(module.Channel, 'basic_publish'):
-        module.Channel.basic_publish = wrapper(module.Channel.basic_publish)
-
-
+        module.Channel.basic_publish = wrapper(module.Channel.basic_publish)

{whatap_python-1.7.2 → whatap_python-1.7.4}/whatap/trace/mod/application_fastapi.py

@@ -171,23 +171,23 @@ def interceptor(fn, dependant, *args, **kwargs):
             ctx.userid, ctx._rawuserid = getUserId(environ, ctx.remoteIp)
 
     mstt = environ.get('{}'.format(
-        conf._trace_mtrace_caller_key.upper().replace('-', '_')), '')
+        conf._trace_mtrace_caller_key), '')
     
     if mstt:
         ctx.setTransfer(mstt)
         if conf.stat_mtrace_enabled:
             val = environ.get('{}'.format(
-                conf._trace_mtrace_info_key.upper().replace('-', '_')), '')
+                conf._trace_mtrace_info_key), '')
             if val and len(val):
                 ctx.setTransferInfo(val)
             pass
 
         myid = environ.get('{}'.format(
-            conf._trace_mtrace_callee_key.upper().replace('-', '_')), '')
+            conf._trace_mtrace_callee_key), '')
         if myid:
             ctx.setTxid(myid)
     caller_poid = environ.get('{}'.format(
-        conf._trace_mtrace_caller_poid_key.upper().replace('-', '_')), '')
+        conf._trace_mtrace_caller_poid_key), '')
     
     if caller_poid:
         ctx.mcaller_poid = caller_poid
@@ -261,23 +261,23 @@ async def interceptor_async(fn, dependant, *args, **kwargs):
             ctx.userid, ctx._rawuserid = getUserId(environ, ctx.remoteIp)
 
     mstt = environ.get('{}'.format(
-        conf._trace_mtrace_caller_key.upper().replace('-', '_')), '')
+        conf._trace_mtrace_caller_key), '')
     
     if mstt:
         ctx.setTransfer(mstt)
         if conf.stat_mtrace_enabled:
             val = environ.get('{}'.format(
-                conf._trace_mtrace_info_key.upper().replace('-', '_')), '')
+                conf._trace_mtrace_info_key), '')
             if val and len(val):
                 ctx.setTransferInfo(val)
             pass
 
         myid = environ.get('{}'.format(
-            conf._trace_mtrace_callee_key.upper().replace('-', '_')), '')
+            conf._trace_mtrace_callee_key), '')
         if myid:
             ctx.setTxid(myid)
     caller_poid = environ.get('{}'.format(
-        conf._trace_mtrace_caller_poid_key.upper().replace('-', '_')), '')
+        conf._trace_mtrace_caller_poid_key), '')
     
     if caller_poid:
         ctx.mcaller_poid = caller_poid

{whatap_python-1.7.2 → whatap_python-1.7.4}/whatap/trace/mod/application_wsgi.py

@@ -459,10 +459,9 @@ def interceptor_db_execute(fn, *args, **kwargs):
     except Exception as e:
         interceptor_step_error(e)
     finally:
-        datas = [ctx.lctx.get('dbc', ''), query]
+        datas = [ctx.lctx.get('dbc', ''), query, str(self.rowcount)]
         ctx.elapsed = DateUtil.nowSystem() - start_time
-        async_sender.send_packet(PacketTypeEnum.TX_SQL, ctx,
-                               datas)
+        async_sender.send_packet(PacketTypeEnum.TX_SQL, ctx, datas)
         count = self.rowcount
         if count > -1:
             desc = '{0}: {1}'.format('Fetch count', count)

{whatap_python-1.7.2 → whatap_python-1.7.4}/whatap/trace/mod/database_mongo.py

@@ -70,7 +70,7 @@ class WhatapMongoCmdEventListener(pymongo.monitoring.CommandListener):
             query +=' query: {}'.format(ctx.active_sqlhash)
 
         ctx.db_opening = False
-        datas = [ctx.lctx.get('dbc', ''), query]
+        datas = [ctx.lctx.get('dbc', ''), query, 0]
         ctx.elapsed = int(event.duration_micros / 1000)
         async_sender.send_packet(PacketTypeEnum.TX_SQL, ctx,
                                datas)

{whatap_python-1.7.2 → whatap_python-1.7.4}/whatap/trace/mod/database_redis.py

@@ -1,23 +1,32 @@
 from whatap.trace import get_dict
-from whatap.trace.mod.application_wsgi import trace_handler, \
-    interceptor_step_error
+from whatap.trace.mod.application_wsgi import trace_handler, interceptor_step_error
 from whatap.trace.trace_context_manager import TraceContextManager
 import whatap.net.async_sender as async_sender
 from whatap.net.packet_type_enum import PacketTypeEnum
 from whatap.util.date_util import DateUtil
 import numbers
 
+_current_command = None
+
+
 def intercept_send_command(fn, instance, *args, **kwargs):
+    global _current_command
+    command = str(args[0]).upper() if args else None
+    _current_command = command
+
+    if command not in {'SET', 'GET', 'DEL', 'HSET', 'HGET'}:
+        return fn(instance, *args, **kwargs)
+
     ctx = TraceContextManager.getLocalContext()
     if not ctx:
-        
         return fn(instance, *args, **kwargs)
+
     start_time = DateUtil.nowSystem()
     ctx.start_time = start_time
 
     port_or_path = getattr(instance, 'port', getattr(instance, 'path', None))
     text = 'redis://'
-    text += getattr(instance, 'host','localhost')
+    text += getattr(instance, 'host', 'localhost')
     text += ':{}'.format(port_or_path)
     text += '/'
     text += str(getattr(instance, 'db', 0))
@@ -29,8 +38,8 @@ def intercept_send_command(fn, instance, *args, **kwargs):
     datas = [text]
     ctx.elapsed = DateUtil.nowSystem() - start_time
     async_sender.send_packet(PacketTypeEnum.TX_DB_CONN, ctx, datas)
-    query = " ".join([ str(arg)[:20] for arg in args])
-    
+    query = f"{command} " + " ".join([str(arg)[:20] for arg in args[1:]])
+
     start_time = DateUtil.nowSystem()
     ctx.start_time = start_time
     ctx.active_sqlhash = query
@@ -42,26 +51,29 @@ def intercept_send_command(fn, instance, *args, **kwargs):
         interceptor_step_error(e)
     finally:
         ctx.db_opening = False
-        datas = [ctx.lctx.get('dbc', ''), query]
+        datas = [ctx.lctx.get('dbc', ''), query, 0]
         ctx.elapsed = DateUtil.nowSystem() - start_time
-        async_sender.send_packet(PacketTypeEnum.TX_SQL, ctx,
-                               datas)
+        async_sender.send_packet(PacketTypeEnum.TX_SQL, ctx, datas)
 
 
 def interceptor_read_response(fn, *args, **kwargs):
+    global _current_command
+
+    if _current_command not in {'SET', 'GET', 'DEL', 'HSET', 'HGET'}:
+        _current_command = None
+        return fn(*args, **kwargs)
+
     ctx = TraceContextManager.getLocalContext()
     if not ctx:
+        _current_command = None
         return fn(*args, **kwargs)
+
     start_time = DateUtil.nowSystem()
     ctx.start_time = start_time
 
-    callback = None
     try:
         callback = fn(*args, **kwargs)
-        return callback
-    except Exception as e:
-        interceptor_step_error(e)
-    finally:
+
         if callback:
             count = -1
             if isinstance(callback, int):
@@ -71,11 +83,15 @@ def interceptor_read_response(fn, *args, **kwargs):
 
             if count > -1:
                 msg = '{0}: {1}'.format('Fetch bytes', count)
-                datas = [ msg,' ', ' ']
+                datas = [msg, ' ', ' ']
                 ctx.elapsed = 0
                 async_sender.send_packet(PacketTypeEnum.TX_MSG, ctx, datas)
 
         ctx.active_sqlhash = 0
+        return callback
+    finally:
+        _current_command = None
+
 
 def instrument_redis_connection(module):
     def wrapper(fn):
@@ -83,11 +99,13 @@ def instrument_redis_connection(module):
         def trace(*args, **kwargs):
             callback = intercept_send_command(fn, args[0], *args[1:], **kwargs)
             return callback
-        
+
         return trace
 
     if hasattr(module, 'Connection') and hasattr(module.Connection, 'send_command'):
-        module.Connection.send_command = wrapper(module.Connection.send_command)
+        if not getattr(module.Connection.send_command, '_wrapped', False):
+            module.Connection.send_command = wrapper(module.Connection.send_command)
+            module.Connection.send_command._wrapped = True
 
     def wrapper(fn):
         @trace_handler(fn)
@@ -98,5 +116,6 @@ def instrument_redis_connection(module):
         return trace
 
     if hasattr(module, 'Connection') and hasattr(module.Connection, 'read_response'):
-        module.Connection.read_response= wrapper(module.Connection.read_response)
-
+        if not getattr(module.Connection.read_response, '_wrapped', False):
+            module.Connection.read_response = wrapper(module.Connection.read_response)
+            module.Connection.read_response._wrapped = True

{whatap_python-1.7.2 → whatap_python-1.7.4}/whatap/trace/mod/database_toolkit.py

@@ -85,7 +85,7 @@ def instrument_sqlalchemy_engine(module):
                 # print('instrument_sqlalchemy_engine 6')
                 ctx = TraceContextManager.getLocalContext()
                 if ctx:
-                    datas = [ctx.lctx.get('dbc', ''), query]
+                    datas = [ctx.lctx.get('dbc', ''), query, 0]
                     ctx.elapsed = DateUtil.nowSystem() - start_time
                     # print('instrument_sqlalchemy_engine 6.1', datas)
                     async_sender.send_packet(PacketTypeEnum.TX_SQL, ctx,

{whatap_python-1.7.2 → whatap_python-1.7.4}/whatap_python.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: whatap-python
-Version: 1.7.2
+Version: 1.7.4
 Summary: Monitoring and Profiling Service
 Home-page: https://www.whatap.io
 Author: whatap

whatap_python-1.7.2/whatap/build.py

@@ -1,4 +0,0 @@
-app = 'Python'
-name = 'whatap-python'
-version = '1.7.2'
-release_date = '20241112'