whatap-python 1.7.3__tar.gz → 1.7.5__tar.gz

{whatap_python-1.7.3 → whatap_python-1.7.5}/PKG-INFO

@@ -1,11 +1,17 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: whatap-python
-Version: 1.7.3
+Version: 1.7.5
 Summary: Monitoring and Profiling Service
 Home-page: https://www.whatap.io
 Author: whatap
 Author-email: admin@whatap.io
 License: Whatap License
+Dynamic: author
+Dynamic: author-email
+Dynamic: description
+Dynamic: home-page
+Dynamic: license
+Dynamic: summary
 
 
 .. image:: https://www.whatap.io/img/common/whatap_logo_re.svg

{whatap_python-1.7.3 → whatap_python-1.7.5}/whatap/__init__.py

@@ -145,6 +145,8 @@ def write_file(home, file_name, value):
 
 def check_whatap_home(target='WHATAP_HOME'):
     whatap_home = os.environ.get(target)
+    if not whatap_home:
+        whatap_home = find_whatap_conf()
     if not whatap_home:
         whatap_print('WHATAP: ${} is empty'.format(target))
     
@@ -153,6 +155,8 @@ def check_whatap_home(target='WHATAP_HOME'):
 
 def init_config(home):
     whatap_home = os.environ.get(home)
+    if not whatap_home:
+        whatap_home = find_whatap_conf()
     if not whatap_home:
         whatap_home = read_file(home, home.lower())
         if not whatap_home:
@@ -555,4 +559,25 @@ def configPort():
     port = get_port_number()
     if port:
         update_config('WHATAP_HOME', 'net_udp_port', str(port))
-        return port
+        return port
+
+
+def find_whatap_conf():
+    # 1. 현재 디렉토리 검색
+    script_dir = os.path.dirname(os.path.abspath(__file__))
+    parent_dir = os.path.dirname(script_dir)
+    conf_path = os.path.join(parent_dir, 'whatap.conf')
+    if os.path.exists(conf_path):
+        os.environ['WHATAP_HOME'] = parent_dir
+        return conf_path
+
+    # 2. 상위 디렉토리들 검색
+    current = parent_dir
+    while current != '/':
+        conf_path = os.path.join(current, 'whatap.conf')
+        if os.path.exists(conf_path):
+            os.environ['WHATAP_HOME'] = current
+            return conf_path
+        current = os.path.dirname(current)
+
+    return None

whatap_python-1.7.5/whatap/build.py

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

{whatap_python-1.7.3 → whatap_python-1.7.5}/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.3 → whatap_python-1.7.5}/whatap/trace/mod/application_wsgi.py

@@ -65,9 +65,7 @@ def trace_handler(fn, start=False, preload=None):
                 if ctx and ctx.error_step == e:
                     ctx.error_step = None
                     raise e
-                logging.debug(e, extra={'id': 'WA917'}, exc_info=True)
-                print(e, dict(extra={'id': 'WA917'}, exc_info=True))
-                return fn(*args, **kwargs)
+                raise
             else:
                 if ctx and ctx.error_step:
                     e = ctx.error_step
@@ -157,8 +155,6 @@ def interceptor(rn_environ, *args, **kwargs):
     ctx.userAgentString = environ.get('HTTP_USER_AGENT', '')
     ctx.referer = environ.get('HTTP_REFERER', '')
 
-
-
     if conf.trace_user_enabled:
         if conf.trace_user_using_ip:
             ctx.userid = userid_util.getRemoteAddr(args)
@@ -223,7 +219,7 @@ def interceptor(rn_environ, *args, **kwargs):
             text = ''
             for key in keys:
                 text += '{}={}\n'.format(key.split('HTTP_')[1].lower(),
-                                            environ[key])
+                                         environ[key])
 
             datas = ['HTTP-HEADERS', 'HTTP-HEADERS', text]
             ctx.start_time = DateUtil.nowSystem()
@@ -232,7 +228,8 @@ def interceptor(rn_environ, *args, **kwargs):
     finally:
         end_interceptor(ctx=ctx)
 
-def interceptor_error(status_code, errors, ctx = None):
+
+def interceptor_error(status_code, errors, ctx=None):
     if not ctx:
         ctx = TraceContextManager.getLocalContext()
     if not ctx:
@@ -274,10 +271,8 @@ def interceptor_step_error(e, ctx=None):
     errors = []
     errors.append(e.__class__.__name__)
 
-    if e.args:
-        errors.append(str(e.args[0]))
-    elif hasattr(e, "detail"):
-        errors.append(getattr(e, "detail"))
+    error_message = extract_db_error_message(e)
+    errors.append(error_message)
 
     error = ''
     frame = sys._current_frames().get(ctx.thread.ident)
@@ -294,7 +289,6 @@ def interceptor_step_error(e, ctx=None):
         error += '{} ({}:{})\n'.format(method_name, line, line_num)
 
     errors.append(error)
-    # errors.append(''.join(traceback.format_list(traceback.extract_stack(sys._current_frames()[ctx.thread.ident]))))
     async_sender.send_packet(PacketTypeEnum.TX_ERROR, ctx, errors)
 
     if conf.profile_exception_stack:
@@ -304,6 +298,27 @@ def interceptor_step_error(e, ctx=None):
         async_sender.send_packet(PacketTypeEnum.TX_MSG, ctx, datas)
 
 
+def extract_db_error_message(e):
+    try:
+        # PostgreSQL (psycopg2)
+        if hasattr(e, 'pgcode') and hasattr(e, 'pgerror'):
+            return str(e.pgerror)
+
+        # MySQL (PyMySQL, mysql-connector-python)
+        if hasattr(e, 'args') and len(e.args) > 1 and isinstance(e.args[1], str):
+            return e.args[1]
+
+        # 기본 에러 메시지
+        if hasattr(e, 'args') and len(e.args) > 0:
+            if isinstance(e.args[0], str):
+                return e.args[0]
+            return str(e.args[0])
+
+        return str(e)
+    except:
+        return "Unknown database error"
+
+
 def interceptor_httpc_request(fn, httpc_url, *args, **kwargs):
     ctx = TraceContextManager.getLocalContext()
     if not ctx or ctx.active_httpc_hash:
@@ -311,7 +326,7 @@ def interceptor_httpc_request(fn, httpc_url, *args, **kwargs):
             return fn(*args, **kwargs)
         except Exception as e:
             interceptor_step_error(e, ctx=ctx)
-        finally:    
+        finally:
             return
     param = None
     method = None
@@ -387,7 +402,7 @@ def interceptor_db_con(fn, db_type, *args, **kwargs):
     text = '{}://'.format(db_type)
     text += kwargs.get('user')
     text += "@"
-    text += kwargs.get('host',kwargs.get('dsn','') )
+    text += kwargs.get('host', kwargs.get('dsn', ''))
     text += '/'
     text += kwargs.get('database', kwargs.get('db', kwargs.get('dbname', '')))
     ctx.active_dbc = text
@@ -485,7 +500,7 @@ def interceptor_db_close(fn, *args, **kwargs):
             return
     start_time = DateUtil.nowSystem()
     ctx.start_time = start_time
-    
+
     try:
         callback = fn(*args, **kwargs)
         return callback
@@ -496,7 +511,7 @@ def interceptor_db_close(fn, *args, **kwargs):
         datas = [' ', ' ', text]
         ctx.elapsed = DateUtil.nowSystem() - start_time
         async_sender.send_packet(PacketTypeEnum.TX_MSG, ctx, datas)
-    
+
 
 check_seq = 1
 

{whatap_python-1.7.3 → whatap_python-1.7.5}/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.3 → whatap_python-1.7.5}/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.3 → whatap_python-1.7.5}/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.3 → whatap_python-1.7.5}/whatap_python.egg-info/PKG-INFO

@@ -1,11 +1,17 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: whatap-python
-Version: 1.7.3
+Version: 1.7.5
 Summary: Monitoring and Profiling Service
 Home-page: https://www.whatap.io
 Author: whatap
 Author-email: admin@whatap.io
 License: Whatap License
+Dynamic: author
+Dynamic: author-email
+Dynamic: description
+Dynamic: home-page
+Dynamic: license
+Dynamic: summary
 
 
 .. image:: https://www.whatap.io/img/common/whatap_logo_re.svg

whatap_python-1.7.3/whatap/build.py

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